diff options
11704 files changed, 103903 insertions, 75544 deletions
diff --git a/.editorconfig b/.editorconfig index 6625cbf6981..7d0157a6c42 100644 --- a/.editorconfig +++ b/.editorconfig @@ -47,27 +47,17 @@ indent_style = space insert_final_newline = unset trim_trailing_whitespace = unset -[*.{key,ovpn}] +[*.{asc,key,ovpn}] insert_final_newline = unset end_of_line = unset +trim_trailing_whitespace = unset [*.lock] indent_size = unset -[deps.nix] -insert_final_newline = unset -[pkgs/tools/networking/dd-agent/*-deps.nix] -insert_final_newline = unset - [eggs.nix] trim_trailing_whitespace = unset -[gemset.nix] -insert_final_newline = unset - -[node-{composition,packages,packages-generated}.nix] -insert_final_newline = unset - [nixos/modules/services/networking/ircd-hybrid/*.{conf,in}] trim_trailing_whitespace = unset @@ -92,15 +82,6 @@ insert_final_newline = unset indent_style = unset trim_trailing_whitespace = unset -[pkgs/development/mobile/androidenv/generated/{addons,packages}.nix] -trim_trailing_whitespace = unset - -[pkgs/development/node-packages/composition.nix] -insert_final_newline = unset - -[pkgs/development/{perl-modules,ocaml-modules,tools/ocaml}/**] -indent_style = unset - [pkgs/servers/dict/wordnet_structures.py] trim_trailing_whitespace = unset diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 093239566ce..7d0681a720c 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -76,6 +76,7 @@ /pkgs/development/interpreters/python @FRidh /pkgs/development/python-modules @FRidh @jonringer /doc/languages-frameworks/python.section.md @FRidh +/pkgs/development/tools/poetry2nix @adisbladis # Haskell /pkgs/development/compilers/ghc @cdepillabout @@ -158,8 +159,8 @@ /nixos/modules/services/networking/ntp @thoughtpolice # Dhall -/pkgs/development/dhall-modules @Gabriel439 @Profpatsch -/pkgs/development/interpreters/dhall @Gabriel439 @Profpatsch +/pkgs/development/dhall-modules @Gabriel439 @Profpatsch @ehmry +/pkgs/development/interpreters/dhall @Gabriel439 @Profpatsch @ehmry # Idris /pkgs/development/idris-modules @Infinisil diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 8ec9d535332..bc43f80a060 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -37,7 +37,7 @@ under the terms of [COPYING](../COPYING), which is an MIT-like license. * Not start with the package name. * Not have a period at the end. * `meta.license` must be set and fit the upstream license. - * If there is no upstream license, `meta.license` should default to `stdenv.lib.licenses.unfree`. + * If there is no upstream license, `meta.license` should default to `lib.licenses.unfree`. * `meta.maintainers` must be set. See the nixpkgs manual for more details on [standard meta-attributes](https://nixos.org/nixpkgs/manual/#sec-standard-meta-attributes) and on how to [submit changes to nixpkgs](https://nixos.org/nixpkgs/manual/#chap-submitting-changes). @@ -57,6 +57,7 @@ Follow these steps to backport a change into a release branch in compliance with 3. Create a branch for your change, e.g. `git checkout -b backport`. 4. When the reason to backport is not obvious from the original commit message, use `git cherry-pick -xe <original commit>` and add a reason. Otherwise use `git cherry-pick -x <original commit>`. That's fine for minor version updates that only include security and bug fixes, commits that fixes an otherwise broken package or similar. Please also ensure the commits exists on the master branch; in the case of squashed or rebased merges, the commit hash will change and the new commits can be found in the merge message at the bottom of the master pull request. 5. Push to GitHub and open a backport pull request. Make sure to select the release branch (e.g. `release-20.09`) as the target branch of the pull request, and link to the pull request in which the original change was comitted to `master`. The pull request title should be the commit title with the release version as prefix, e.g. `[20.09]`. +6. When the backport pull request is merged and you have the necessary privileges you can also replace the label `9.needs: port to stable` with `8.has: port to stable` on the original pull request. This way maintainers can keep track of missing backports easier. ## Reviewing contributions diff --git a/.github/workflows/pending-set.yml b/.github/workflows/pending-set.yml index f59ac9439ea..944d1deefb9 100644 --- a/.github/workflows/pending-set.yml +++ b/.github/workflows/pending-set.yml @@ -16,5 +16,5 @@ jobs: -X POST \ -H "Accept: application/vnd.github.v3+json" \ -H "Authorization: token $GITHUB_TOKEN" \ - -d '{"state": "failure", "target_url": " ", "description": "This failed status will be cleared when ofborg finishes eval.", "context": "Wait for ofborg"}' \ + -d '{"state": "pending", "target_url": " ", "description": "This pending status will be cleared when ofborg starts eval.", "context": "Wait for ofborg"}' \ "https://api.github.com/repos/NixOS/nixpkgs/statuses/${{ github.event.pull_request.head.sha }}" diff --git a/doc/builders/packages/emacs.section.md b/doc/builders/packages/emacs.section.md index e9b89d086d6..b4723a22bb1 100644 --- a/doc/builders/packages/emacs.section.md +++ b/doc/builders/packages/emacs.section.md @@ -2,12 +2,12 @@ ## Configuring Emacs {#sec-emacs-config} -The Emacs package comes with some extra helpers to make it easier to configure. `emacsWithPackages` allows you to manage packages from ELPA. This means that you will not have to install that packages from within Emacs. For instance, if you wanted to use `company` `counsel`, `flycheck`, `ivy`, `magit`, `projectile`, and `use-package` you could use this as a `~/.config/nixpkgs/config.nix` override: +The Emacs package comes with some extra helpers to make it easier to configure. `emacs.pkgs.withPackages` allows you to manage packages from ELPA. This means that you will not have to install that packages from within Emacs. For instance, if you wanted to use `company` `counsel`, `flycheck`, `ivy`, `magit`, `projectile`, and `use-package` you could use this as a `~/.config/nixpkgs/config.nix` override: ```nix { packageOverrides = pkgs: with pkgs; { - myEmacs = emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [ + myEmacs = emacs.pkgs.withPackages (epkgs: (with epkgs.melpaStablePackages; [ company counsel flycheck @@ -84,7 +84,7 @@ You can install it like any other packages via `nix-env -iA myEmacs`. However, t (projectile-global-mode)) ''; - myEmacs = emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [ + myEmacs = emacs.pkgs.withPackages (epkgs: (with epkgs.melpaStablePackages; [ (runCommand "default.el" {} '' mkdir -p $out/share/emacs/site-lisp cp ${myEmacsConfig} $out/share/emacs/site-lisp/default.el @@ -103,14 +103,14 @@ You can install it like any other packages via `nix-env -iA myEmacs`. However, t This provides a fairly full Emacs start file. It will load in addition to the user's presonal config. You can always disable it by passing `-q` to the Emacs command. -Sometimes `emacsWithPackages` is not enough, as this package set has some priorities imposed on packages (with the lowest priority assigned to Melpa Unstable, and the highest for packages manually defined in `pkgs/top-level/emacs-packages.nix`). But you can't control this priorities when some package is installed as a dependency. You can override it on per-package-basis, providing all the required dependencies manually - but it's tedious and there is always a possibility that an unwanted dependency will sneak in through some other package. To completely override such a package you can use `overrideScope'`. +Sometimes `emacs.pkgs.withPackages` is not enough, as this package set has some priorities imposed on packages (with the lowest priority assigned to Melpa Unstable, and the highest for packages manually defined in `pkgs/top-level/emacs-packages.nix`). But you can't control this priorities when some package is installed as a dependency. You can override it on per-package-basis, providing all the required dependencies manually - but it's tedious and there is always a possibility that an unwanted dependency will sneak in through some other package. To completely override such a package you can use `overrideScope'`. ```nix overrides = self: super: rec { haskell-mode = self.melpaPackages.haskell-mode; ... }; -((emacsPackagesGen emacs).overrideScope' overrides).emacsWithPackages +((emacsPackagesFor emacs).overrideScope' overrides).emacs.pkgs.withPackages (p: with p; [ # here both these package will use haskell-mode of our own choice ghc-mod diff --git a/doc/contributing/coding-conventions.xml b/doc/contributing/coding-conventions.xml index cb6d60c2c13..9005a9ebafd 100644 --- a/doc/contributing/coding-conventions.xml +++ b/doc/contributing/coding-conventions.xml @@ -180,6 +180,12 @@ args.stdenv.mkDerivation (args // { </listitem> <listitem> <para> + Arguments should be listed in the order they are used, with the + exception of <varname>lib</varname>, which always goes first. + </para> + </listitem> + <listitem> + <para> Prefer using the top-level <varname>lib</varname> over its alias <literal>stdenv.lib</literal>. <varname>lib</varname> is unrelated to <varname>stdenv</varname>, and so <literal>stdenv.lib</literal> should only diff --git a/doc/contributing/contributing-to-documentation.xml b/doc/contributing/contributing-to-documentation.xml index b0266043775..132fa3816e3 100644 --- a/doc/contributing/contributing-to-documentation.xml +++ b/doc/contributing/contributing-to-documentation.xml @@ -12,7 +12,7 @@ xlink:href="https://github.com/NixOS/nixpkgs/tree/master/doc">doc</filename> sub <screen> <prompt>$ </prompt>cd /path/to/nixpkgs/doc <prompt>$ </prompt>nix-shell -<prompt>[nix-shell]$ </prompt>make +<prompt>[nix-shell]$ </prompt>make $makeFlags </screen> <para> If you experience problems, run <command>make debug</command> to help understand the docbook errors. diff --git a/doc/functions/library/attrsets.xml b/doc/functions/library/attrsets.xml index 3c5823c2589..7ef0d16624c 100644 --- a/doc/functions/library/attrsets.xml +++ b/doc/functions/library/attrsets.xml @@ -1711,4 +1711,43 @@ recursiveUpdate </example> </section> + <section xml:id="function-library-lib.attrsets.cartesianProductOfSets"> + <title><function>lib.attrsets.cartesianProductOfSets</function></title> + + <subtitle><literal>cartesianProductOfSets :: AttrSet -> [ AttrSet ]</literal> + </subtitle> + + <xi:include href="./locations.xml" xpointer="lib.attrsets.cartesianProductOfSets" /> + + <para> + Return the cartesian product of attribute set value combinations. + </para> + + <variablelist> + <varlistentry> + <term> + <varname>set</varname> + </term> + <listitem> + <para> + An attribute set with attributes that carry lists of values. + </para> + </listitem> + </varlistentry> + </variablelist> + + <example xml:id="function-library-lib.attrsets.cartesianProductOfSets-example"> + <title>Creating the cartesian product of a list of attribute values</title> +<programlisting><![CDATA[ +cartesianProductOfSets { a = [ 1 2 ]; b = [ 10 20 ]; } +=> [ + { a = 1; b = 10; } + { a = 1; b = 20; } + { a = 2; b = 10; } + { a = 2; b = 20; } + ] +]]></programlisting> + </example> + </section> + </section> diff --git a/doc/languages-frameworks/coq.section.md b/doc/languages-frameworks/coq.section.md index 5e16a4c546a..8f564c6e46b 100644 --- a/doc/languages-frameworks/coq.section.md +++ b/doc/languages-frameworks/coq.section.md @@ -42,8 +42,8 @@ It also takes other standard `mkDerivation` attributes, they are added as such, Here is a simple package example. It is a pure Coq library, thus it depends on Coq. It builds on the Mathematical Components library, thus it also takes some `mathcomp` derivations as `extraBuildInputs`. ```nix -{ coq, mkCoqDerivation, mathcomp, mathcomp-finmap, mathcomp-bigenough, - lib, version ? null }: +{ lib, mkCoqDerivation, version ? null +, coq, mathcomp, mathcomp-finmap, mathcomp-bigenough }: with lib; mkCoqDerivation { /* namePrefix leads to e.g. `name = coq8.11-mathcomp1.11-multinomials-1.5.2` */ namePrefix = [ "coq" "mathcomp" ]; diff --git a/doc/languages-frameworks/emscripten.section.md b/doc/languages-frameworks/emscripten.section.md index a5c15b43ac8..d391e038070 100644 --- a/doc/languages-frameworks/emscripten.section.md +++ b/doc/languages-frameworks/emscripten.section.md @@ -60,7 +60,7 @@ See the `zlib` example: stdenv = pkgs.emscriptenStdenv; }).overrideDerivation (old: rec { - buildInputs = old.buildInputs ++ [ pkgconfig ]; + buildInputs = old.buildInputs ++ [ pkg-config ]; # we need to reset this setting! NIX_CFLAGS_COMPILE=""; configurePhase = '' @@ -117,8 +117,8 @@ This `xmlmirror` example features a emscriptenPackage which is defined completel xmlmirror = pkgs.buildEmscriptenPackage rec { name = "xmlmirror"; - buildInputs = [ pkgconfig autoconf automake libtool gnumake libxml2 nodejs openjdk json_c ]; - nativeBuildInputs = [ pkgconfig zlib ]; + buildInputs = [ pkg-config autoconf automake libtool gnumake libxml2 nodejs openjdk json_c ]; + nativeBuildInputs = [ pkg-config zlib ]; src = pkgs.fetchgit { url = "https://gitlab.com/odfplugfest/xmlmirror.git"; diff --git a/doc/languages-frameworks/idris.section.md b/doc/languages-frameworks/idris.section.md index 2d06c4a19de..41e4f7ec312 100644 --- a/doc/languages-frameworks/idris.section.md +++ b/doc/languages-frameworks/idris.section.md @@ -69,11 +69,11 @@ prelude As an example of how a Nix expression for an Idris package can be created, here is the one for `idrisPackages.yaml`: ```nix -{ build-idris-package +{ lib +, build-idris-package , fetchFromGitHub , contrib , lightyear -, lib }: build-idris-package { name = "yaml"; @@ -94,11 +94,11 @@ build-idris-package { sha256 = "1g4pi0swmg214kndj85hj50ccmckni7piprsxfdzdfhg87s0avw7"; }; - meta = { + meta = with lib; { description = "Idris YAML lib"; homepage = "https://github.com/Heather/Idris.Yaml"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.brainrape ]; + license = licenses.mit; + maintainers = [ maintainers.brainrape ]; }; } ``` diff --git a/doc/languages-frameworks/maven.section.md b/doc/languages-frameworks/maven.section.md index 7a863c500bc..d66931e808d 100644 --- a/doc/languages-frameworks/maven.section.md +++ b/doc/languages-frameworks/maven.section.md @@ -116,7 +116,7 @@ The first step will be to build the Maven project as a fixed-output derivation i > Traditionally the Maven repository is at `~/.m2/repository`. We will override this to be the `$out` directory. ```nix -{ stdenv, lib, maven }: +{ lib, stdenv, maven }: stdenv.mkDerivation { name = "maven-repository"; buildInputs = [ maven ]; @@ -168,7 +168,7 @@ If your package uses _SNAPSHOT_ dependencies or _version ranges_; there is a str Regardless of which strategy is chosen above, the step to build the derivation is the same. ```nix -{ stdenv, lib, maven, callPackage }: +{ stdenv, maven, callPackage }: # pick a repository derivation, here we will use buildMaven let repository = callPackage ./build-maven-repository.nix { }; in stdenv.mkDerivation rec { @@ -222,7 +222,7 @@ We will read the Maven repository and flatten it to a single list. This list wil We make sure to provide this classpath to the `makeWrapper`. ```nix -{ stdenv, lib, maven, callPackage, makeWrapper, jre }: +{ stdenv, maven, callPackage, makeWrapper, jre }: let repository = callPackage ./build-maven-repository.nix { }; in stdenv.mkDerivation rec { @@ -298,7 +298,7 @@ Main-Class: Main We will modify the derivation above to add a symlink to our repository so that it's accessible to our JAR during the `installPhase`. ```nix -{ stdenv, lib, maven, callPackage, makeWrapper, jre }: +{ stdenv, maven, callPackage, makeWrapper, jre }: # pick a repository derivation, here we will use buildMaven let repository = callPackage ./build-maven-repository.nix { }; in stdenv.mkDerivation rec { diff --git a/doc/languages-frameworks/ocaml.section.md b/doc/languages-frameworks/ocaml.section.md index fa85a27e84f..9b92a80f471 100644 --- a/doc/languages-frameworks/ocaml.section.md +++ b/doc/languages-frameworks/ocaml.section.md @@ -32,11 +32,11 @@ buildDunePackage rec { propagatedBuildInputs = [ bigstringaf result ]; doCheck = true; - meta = { + meta = with lib; { homepage = "https://github.com/inhabitedtype/angstrom"; description = "OCaml parser combinators built for speed and memory efficiency"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ sternenseemann ]; + license = licenses.bsd3; + maintainers = with maintainers; [ sternenseemann ]; }; } ``` diff --git a/doc/languages-frameworks/perl.section.md b/doc/languages-frameworks/perl.section.md index 309d8ebcc2b..dcb7dcb77b6 100644 --- a/doc/languages-frameworks/perl.section.md +++ b/doc/languages-frameworks/perl.section.md @@ -110,7 +110,7 @@ ClassC3Componentised = buildPerlPackage rec { On Darwin, if a script has too many `-Idir` flags in its first line (its “shebang line”), it will not run. This can be worked around by calling the `shortenPerlShebang` function from the `postInstall` phase: ```nix -{ stdenv, lib, buildPerlPackage, fetchurl, shortenPerlShebang }: +{ lib, stdenv, buildPerlPackage, fetchurl, shortenPerlShebang }: ImageExifTool = buildPerlPackage { pname = "Image-ExifTool"; diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 2dea2cb1bcc..71193ed0cc0 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -610,6 +610,10 @@ Using the example above, the analagous pytestCheckHook usage would be: "download" "update" ]; + + disabledTestFiles = [ + "tests/test_failing.py" + ]; ``` This is expecially useful when tests need to be conditionallydisabled, diff --git a/doc/languages-frameworks/qt.section.md b/doc/languages-frameworks/qt.section.md index 6cfdc663550..b8b438e8858 100644 --- a/doc/languages-frameworks/qt.section.md +++ b/doc/languages-frameworks/qt.section.md @@ -1,77 +1,88 @@ # Qt {#sec-language-qt} -This section describes the differences between Nix expressions for Qt libraries and applications and Nix expressions for other C++ software. Some knowledge of the latter is assumed. +Writing Nix expressions for Qt libraries and applications is largely similar as for other C++ software. +This section assumes some knowledge of the latter. +There are two problems that the Nixpkgs Qt infrastructure addresses, +which are not shared by other C++ software: -There are primarily two problems which the Qt infrastructure is designed to address: ensuring consistent versioning of all dependencies and finding dependencies at runtime. +1. There are usually multiple supported versions of Qt in Nixpkgs. + All of a package's dependencies must be built with the same version of Qt. + This is similar to the version constraints imposed on interpreted languages like Python. +2. Qt makes extensive use of runtime dependency detection. + Runtime dependencies are made into build dependencies through wrappers. ## Nix expression for a Qt package (default.nix) {#qt-default-nix} ```{=docbook} <programlisting> -{ mkDerivation, lib, qtbase }: <co xml:id='qt-default-nix-co-1' /> +{ stdenv, lib, qtbase, wrapQtAppsHook }: <co xml:id='qt-default-nix-co-1' /> -mkDerivation { <co xml:id='qt-default-nix-co-2' /> +stdenv.mkDerivation { pname = "myapp"; version = "1.0"; - buildInputs = [ qtbase ]; <co xml:id='qt-default-nix-co-3' /> + buildInputs = [ qtbase ]; + nativeBuildInputs = [ wrapQtAppsHook ]; <co xml:id'qt-default-nix-co-2' /> } </programlisting> <calloutlist> <callout arearefs='qt-default-nix-co-1'> <para> - Import <literal>mkDerivation</literal> and Qt (such as <literal>qtbase</literal> modules directly. <emphasis>Do not</emphasis> import Qt package sets; the Qt versions of dependencies may not be coherent, causing build and runtime failures. + Import Qt modules directly, that is: <literal>qtbase</literal>, <literal>qtdeclarative</literal>, etc. + <emphasis>Do not</emphasis> import Qt package sets such as <literal>qt5</literal> + because the Qt versions of dependencies may not be coherent, causing build and runtime failures. </para> </callout> - <callout arearefs='qt-default-nix-co-2'> - <para> - Use <literal>mkDerivation</literal> instead of <literal>stdenv.mkDerivation</literal>. <literal>mkDerivation</literal> is a wrapper around <literal>stdenv.mkDerivation</literal> which applies some Qt-specific settings. This deriver accepts the same arguments as <literal>stdenv.mkDerivation</literal>; refer to <xref linkend='chap-stdenv' /> for details. - </para> - <para> - To use another deriver instead of <literal>stdenv.mkDerivation</literal>, use <literal>mkDerivationWith</literal>: -<programlisting> -mkDerivationWith myDeriver { - # ... -} -</programlisting> - If you cannot use <literal>mkDerivationWith</literal>, please refer to <xref linkend='qt-runtime-dependencies' />. - </para> - </callout> - <callout arearefs='qt-default-nix-co-3'> - <para> - <literal>mkDerivation</literal> accepts the same arguments as <literal>stdenv.mkDerivation</literal>, such as <literal>buildInputs</literal>. - </para> + <callout arearefs="qt-default-nix-co-2'> + <para> + All Qt packages must include <literal>wrapQtAppsHook</literal> in + <literal>nativeBuildInputs</literal>, or you must explicitly set + <literal>dontWrapQtApps</literal>. + </para> </callout> </calloutlist> ``` ## Locating runtime dependencies {#qt-runtime-dependencies} -Qt applications need to be wrapped to find runtime dependencies. If you cannot use `mkDerivation` or `mkDerivationWith` above, include `wrapQtAppsHook` in `nativeBuildInputs`: + +Qt applications must be wrapped to find runtime dependencies. +Include `wrapQtAppsHook` in `nativeBuildInputs`: ```nix +{ stdenv, wrapQtAppsHook }: + stdenv.mkDerivation { # ... - nativeBuildInputs = [ wrapQtAppsHook ]; } ``` -Entries added to `qtWrapperArgs` are used to modify the wrappers created by `wrapQtAppsHook`. The entries are passed as arguments to [wrapProgram executable makeWrapperArgs](#fun-wrapProgram). + +Add entries to `qtWrapperArgs` are to modify the wrappers created by +`wrapQtAppsHook`: ```nix -mkDerivation { - # ... +{ stdenv, wrapQtAppsHook }: +stdenv.mkDerivation { + # ... + nativeBuildInputs = [ wrapQtAppsHook ]; qtWrapperArgs = [ ''--prefix PATH : /path/to/bin'' ]; } ``` -Set `dontWrapQtApps` to stop applications from being wrapped automatically. It is required to wrap applications manually with `wrapQtApp`, using the syntax of [wrapProgram executable makeWrapperArgs](#fun-wrapProgram): +The entries are passed as arguments to [wrapProgram](#fun-wrapProgram). + +Set `dontWrapQtApps` to stop applications from being wrapped automatically. +Wrap programs manually with `wrapQtApp`, using the syntax of +[wrapProgram](#fun-wrapProgram): ```nix -mkDerivation { - # ... +{ stdenv, lib, wrapQtAppsHook }: +stdenv.mkDerivation { + # ... + nativeBuildInputs = [ wrapQtAppsHook ]; dontWrapQtApps = true; preFixup = '' wrapQtApp "$out/bin/myapp" --prefix PATH : /path/to/bin @@ -79,21 +90,16 @@ mkDerivation { } ``` -> Note: `wrapQtAppsHook` ignores files that are non-ELF executables. This means that scripts won't be automatically wrapped so you'll need to manually wrap them as previously mentioned. An example of when you'd always need to do this is with Python applications that use PyQT. +::: note +`wrapQtAppsHook` ignores files that are non-ELF executables. +This means that scripts won't be automatically wrapped so you'll need to manually wrap them as previously mentioned. +An example of when you'd always need to do this is with Python applications that use PyQt. +::: -Libraries are built with every available version of Qt. Use the `meta.broken` attribute to disable the package for unsupported Qt versions: - -```nix -mkDerivation { - # ... - - # Disable this library with Qt < 5.9.0 - meta.broken = builtins.compareVersions qtbase.version "5.9.0" < 0; -} -``` ## Adding a library to Nixpkgs -Qt libraries are added to `qt5-packages.nix` and are made available for every Qt -version supported. +Add Qt libraries to `qt5-packages.nix` to make them available for every +supported Qt version. + ### Example adding a Qt library {#qt-library-all-packages-nix} The following represents the contents of `qt5-packages.nix`. @@ -106,9 +112,23 @@ The following represents the contents of `qt5-packages.nix`. # ... } ``` + +Libraries are built with every available version of Qt. +Use the `meta.broken` attribute to disable the package for unsupported Qt versions: + +```nix +{ stdenv, lib, qtbase }: + +stdenv.mkDerivation { + # ... + # Disable this library with Qt < 5.9.0 + meta.broken = lib.versionOlder qtbase.version "5.9.0"; +} +``` + ## Adding an application to Nixpkgs -Applications that use Qt are also added to `qt5-packages.nix`. An alias is added -in the top-level `all-packages.nix` pointing to the package with the desired Qt5 version. +Add Qt applications to `qt5-packages.nix`. Add an alias to `all-packages.nix` +to select the Qt 5 version used for the application. ### Example adding a Qt application {#qt-application-all-packages-nix} diff --git a/doc/languages-frameworks/r.section.md b/doc/languages-frameworks/r.section.md index 32a39ade279..c420d112c91 100644 --- a/doc/languages-frameworks/r.section.md +++ b/doc/languages-frameworks/r.section.md @@ -32,14 +32,12 @@ However, if you'd like to add a file to your project source to make the environment available for other contributors, you can create a `default.nix` file like so: ```nix -let - pkgs = import <nixpkgs> {}; - stdenv = pkgs.stdenv; -in with pkgs; { +with import <nixpkgs> {}; +{ myProject = stdenv.mkDerivation { name = "myProject"; version = "1"; - src = if pkgs.lib.inNixShell then null else nix; + src = if lib.inNixShell then null else nix; buildInputs = with rPackages; [ R diff --git a/doc/languages-frameworks/ruby.section.md b/doc/languages-frameworks/ruby.section.md index e292b3110ff..aeec154586c 100644 --- a/doc/languages-frameworks/ruby.section.md +++ b/doc/languages-frameworks/ruby.section.md @@ -232,7 +232,7 @@ If you want to package a specific version, you can use the standard Gemfile synt Now you can also also make a `default.nix` that looks like this: ```nix -{ lib, bundlerApp }: +{ bundlerApp }: bundlerApp { pname = "mdl"; diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index 092e84461b8..8f6db28ab4d 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -19,6 +19,8 @@ or use Mozilla's [Rust nightlies overlay](#using-the-rust-nightlies-overlay). Rust applications are packaged by using the `buildRustPackage` helper from `rustPlatform`: ``` +{ lib, rustPlatform }: + rustPlatform.buildRustPackage rec { pname = "ripgrep"; version = "12.1.1"; @@ -226,8 +228,6 @@ source code in a reproducible way. If it is missing or out-of-date one can use the `cargoPatches` attribute to update or add it. ``` -{ lib, rustPlatform, fetchFromGitHub }: - rustPlatform.buildRustPackage rec { (...) cargoPatches = [ @@ -263,7 +263,7 @@ Now, the file produced by the call to `carnix`, called `hello.nix`, looks like: ``` # Generated by carnix 0.6.5: carnix -o hello.nix --src ./. Cargo.lock --standalone -{ lib, stdenv, buildRustCrate, fetchgit }: +{ stdenv, buildRustCrate, fetchgit }: let kernel = stdenv.buildPlatform.parsed.kernel.name; # ... (content skipped) in @@ -292,7 +292,7 @@ following nix file: ``` # Generated by carnix 0.6.5: carnix -o hello.nix --src ./. Cargo.lock --standalone -{ lib, stdenv, buildRustCrate, fetchgit }: +{ stdenv, buildRustCrate, fetchgit }: let kernel = stdenv.buildPlatform.parsed.kernel.name; # ... (content skipped) in @@ -480,7 +480,7 @@ stdenv.mkDerivation { rustc cargo # Example Build-time Additional Dependencies - pkgconfig + pkg-config ]; buildInputs = [ # Example Run-time Additional Dependencies @@ -522,7 +522,7 @@ stdenv.mkDerivation { latest.rustChannels.nightly.rust # Add some extra dependencies from `pkgs` - pkgconfig openssl + pkg-config openssl ]; # Set Environment Variables @@ -567,12 +567,13 @@ in the `~/.config/nixpkgs/overlays` directory. Add the following to your `configuration.nix`, `home-configuration.nix`, `shell.nix`, or similar: ``` - nixpkgs = { +{ pkgs ? import <nixpkgs> { overlays = [ (import (builtins.fetchTarball https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz)) # Further overlays go here ]; }; +}; ``` Note that this will fetch the latest overlay version when rebuilding your system. diff --git a/doc/shell.nix b/doc/shell.nix index 8ac2019f9d6..5fa2b442489 100644 --- a/doc/shell.nix +++ b/doc/shell.nix @@ -1,5 +1,3 @@ -{ pkgs ? import ../. {} }: -(import ./default.nix {}).overrideAttrs (x: { - buildInputs = x.buildInputs ++ [ pkgs.xmloscopy pkgs.ruby ]; - -}) +{ pkgs ? import ../. { } }: +(import ./default.nix { }).overrideAttrs +(x: { buildInputs = (x.buildInputs or [ ]) ++ [ pkgs.xmloscopy pkgs.ruby ]; }) diff --git a/doc/using/overlays.xml b/doc/using/overlays.xml index caacb0a0462..9ffbb4edd98 100644 --- a/doc/using/overlays.xml +++ b/doc/using/overlays.xml @@ -291,5 +291,40 @@ stdenv.mkDerivation { } </programlisting> </section> + <section xml:id="sec-overlays-alternatives-mpi"> + <title>Switching the MPI implementation</title> + <para> + All programs that are built with + <link xlink:href="https://en.wikipedia.org/wiki/Message_Passing_Interface">MPI</link> + support use the generic attribute <varname>mpi</varname> + as an input. At the moment Nixpkgs natively provides two different + MPI implementations: + <itemizedlist> + <listitem> + <para> + <link xlink:href="https://www.open-mpi.org/">Open MPI</link> + (default), attribute name <varname>openmpi</varname> + </para> + </listitem> + <listitem> + <para> + <link xlink:href="https://www.mpich.org/">MPICH</link>, + attribute name <varname>mpich</varname> + </para> + </listitem> + </itemizedlist> + </para> + <para> + To provide MPI enabled applications that use <literal>MPICH</literal>, instead + of the default <literal>Open MPI</literal>, simply use the following overlay: + </para> + <programlisting> +self: super: + +{ + mpi = self.mpich; +} + </programlisting> + </section> </section> </chapter> diff --git a/lib/attrsets.nix b/lib/attrsets.nix index d91d7a0cd47..0ce3aaeca45 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -183,6 +183,24 @@ rec { else []; + /* Return the cartesian product of attribute set value combinations. + + Example: + cartesianProductOfSets { a = [ 1 2 ]; b = [ 10 20 ]; } + => [ + { a = 1; b = 10; } + { a = 1; b = 20; } + { a = 2; b = 10; } + { a = 2; b = 20; } + ] + */ + cartesianProductOfSets = attrsOfLists: + lib.foldl' (listOfAttrs: attrName: + concatMap (attrs: + map (listValue: attrs // { ${attrName} = listValue; }) attrsOfLists.${attrName} + ) listOfAttrs + ) [{}] (attrNames attrsOfLists); + /* Utility function that creates a {name, value} pair as expected by builtins.listToAttrs. @@ -493,5 +511,4 @@ rec { zipWithNames = zipAttrsWithNames; zip = builtins.trace "lib.zip is deprecated, use lib.zipAttrsWith instead" zipAttrsWith; - } diff --git a/lib/debug.nix b/lib/debug.nix index ea6aed60ab4..e3ca3352397 100644 --- a/lib/debug.nix +++ b/lib/debug.nix @@ -148,6 +148,28 @@ rec { /* A combination of `traceVal` and `traceSeqN`. */ traceValSeqN = traceValSeqNFn id; + /* Trace the input and output of a function `f` named `name`, + both down to `depth`. + + This is useful for adding around a function call, + to see the before/after of values as they are transformed. + + Example: + traceFnSeqN 2 "id" (x: x) { a.b.c = 3; } + trace: { fn = "id"; from = { a.b = {…}; }; to = { a.b = {…}; }; } + => { a.b.c = 3; } + */ + traceFnSeqN = depth: name: f: v: + let res = f v; + in lib.traceSeqN + (depth + 1) + { + fn = name; + from = v; + to = res; + } + res; + # -- TESTING -- diff --git a/lib/default.nix b/lib/default.nix index f985266ed93..50320669e28 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -78,7 +78,7 @@ let zipAttrsWithNames zipAttrsWith zipAttrs recursiveUpdateUntil recursiveUpdate matchAttrs overrideExisting getOutput getBin getLib getDev getMan chooseDevOutputs zipWithNames zip - recurseIntoAttrs dontRecurseIntoAttrs; + recurseIntoAttrs dontRecurseIntoAttrs cartesianProductOfSets; inherit (self.lists) singleton forEach foldr fold foldl foldl' imap0 imap1 concatMap flatten remove findSingle findFirst any all count optional optionals toList range partition zipListsWith zipLists @@ -130,7 +130,7 @@ let assertMsg assertOneOf; inherit (self.debug) addErrorContextToAttrs traceIf traceVal traceValFn traceXMLVal traceXMLValMarked traceSeq traceSeqN traceValSeq - traceValSeqFn traceValSeqN traceValSeqNFn traceShowVal + traceValSeqFn traceValSeqN traceValSeqNFn traceFnSeqN traceShowVal traceShowValMarked showVal traceCall traceCall2 traceCall3 traceValIfNot runTests testAllTrue traceCallXml attrNamesToStr; inherit (self.misc) maybeEnv defaultMergeArg defaultMerge foldArgs diff --git a/lib/licenses.nix b/lib/licenses.nix index ebeb1377339..830cb95aff9 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -87,7 +87,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { beerware = spdx { spdxId = "Beerware"; - fullName = ''Beerware License''; + fullName = "Beerware License"; }; blueOak100 = spdx { @@ -100,6 +100,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { fullName = "BSD Zero Clause License"; }; + bsd1 = spdx { + spdxId = "BSD-1-Clause"; + fullName = "BSD 1-Clause License"; + }; + bsd2 = spdx { spdxId = "BSD-2-Clause"; fullName = ''BSD 2-clause "Simplified" License''; @@ -107,7 +112,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { bsd2Patent = spdx { spdxId = "BSD-2-Clause-Patent"; - fullName = ''BSD-2-Clause Plus Patent License''; + fullName = "BSD-2-Clause Plus Patent License"; }; bsd3 = spdx { diff --git a/lib/lists.nix b/lib/lists.nix index 06cee2eb112..56af4d9daa1 100644 --- a/lib/lists.nix +++ b/lib/lists.nix @@ -629,7 +629,9 @@ rec { crossLists (x:y: "${toString x}${toString y}") [[1 2] [3 4]] => [ "13" "14" "23" "24" ] */ - crossLists = f: foldl (fs: args: concatMap (f: map f args) fs) [f]; + crossLists = builtins.trace + "lib.crossLists is deprecated, use lib.cartesianProductOfSets instead" + (f: foldl (fs: args: concatMap (f: map f args) fs) [f]); /* Remove duplicate elements from the list. O(n^2) complexity. diff --git a/lib/modules.nix b/lib/modules.nix index 3f2bfd478b0..33a0d84a6d7 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -895,7 +895,7 @@ rec { fromOpt = getAttrFromPath from options; toOf = attrByPath to (abort "Renaming error: option `${showOption to}' does not exist."); - toType = let opt = attrByPath to {} options; in opt.type or null; + toType = let opt = attrByPath to {} options; in opt.type or (types.submodule {}); in { options = setAttrByPath from (mkOption { diff --git a/lib/systems/architectures.nix b/lib/systems/architectures.nix index 8e3a56b0d7c..ddc320d24e0 100644 --- a/lib/systems/architectures.nix +++ b/lib/systems/architectures.nix @@ -1,7 +1,7 @@ { lib }: rec { - # platform.gcc.arch to its features (as in /proc/cpuinfo) + # gcc.arch to its features (as in /proc/cpuinfo) features = { default = [ ]; # x86_64 Intel diff --git a/lib/systems/default.nix b/lib/systems/default.nix index 4edcbeb36f1..1bbe976c4d2 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -24,8 +24,6 @@ rec { # Either of these can be losslessly-extracted from `parsed` iff parsing succeeds. system = parse.doubleFromSystem final.parsed; config = parse.tripleFromSystem final.parsed; - # Just a guess, based on `system` - platform = platforms.select final; # Determine whether we are compatible with the provided CPU isCompatible = platform: parse.isCompatible final.parsed.cpu platform.parsed.cpu; # Derived meta-data @@ -79,12 +77,23 @@ rec { }; isStatic = final.isWasm || final.isRedox; - kernelArch = + # Just a guess, based on `system` + inherit + ({ + linux-kernel = args.linux-kernel or {}; + gcc = args.gcc or {}; + rustc = args.rust or {}; + } // platforms.select final) + linux-kernel gcc rustc; + + linuxArch = if final.isAarch32 then "arm" else if final.isAarch64 then "arm64" - else if final.isx86_32 then "x86" - else if final.isx86_64 then "x86" + else if final.isx86_32 then "i386" + else if final.isx86_64 then "x86_64" else if final.isMips then "mips" + else if final.isPower then "powerpc" + else if final.isRiscV then "riscv" else final.parsed.cpu.name; qemuArch = @@ -129,7 +138,7 @@ rec { else throw "Don't know how to run ${final.config} executables."; } // mapAttrs (n: v: v final.parsed) inspect.predicates - // mapAttrs (n: v: v final.platform.gcc.arch or "default") architectures.predicates + // mapAttrs (n: v: v final.gcc.arch or "default") architectures.predicates // args; in assert final.useAndroidPrebuilt -> final.isAndroid; assert lib.foldl diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index b0bc7dd1188..07327fa2273 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -24,6 +24,7 @@ let "x86_64-redox" + "powerpc64-linux" "powerpc64le-linux" "riscv32-linux" "riscv64-linux" @@ -72,7 +73,7 @@ in { darwin = filterDoubles predicates.isDarwin; freebsd = filterDoubles predicates.isFreeBSD; # Should be better, but MinGW is unclear. - gnu = filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnu; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabi; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabihf; }); + gnu = filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnu; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabi; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabihf; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.elfv1; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.elfv2; }); illumos = filterDoubles predicates.isSunOS; linux = filterDoubles predicates.isLinux; netbsd = filterDoubles predicates.isNetBSD; @@ -85,5 +86,5 @@ in { embedded = filterDoubles predicates.isNone; - mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "armv7a-linux" "aarch64-linux" "powerpc64le-linux"]; + mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "armv7a-linux" "aarch64-linux" "powerpc64-linux" "powerpc64le-linux"]; } diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 16002450f2d..8a43b86db70 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -7,7 +7,6 @@ let riscv = bits: { config = "riscv${bits}-unknown-linux-gnu"; - platform = platforms.riscv-multiplatform; }; in @@ -17,84 +16,81 @@ rec { # powernv = { config = "powerpc64le-unknown-linux-gnu"; - platform = platforms.powernv; }; musl-power = { config = "powerpc64le-unknown-linux-musl"; - platform = platforms.powernv; + }; + + ppc64-elfv1 = { + config = "powerpc64-unknown-linux-elfv1"; + }; + ppc64-elfv2 = { + config = "powerpc64-unknown-linux-elfv2"; + }; + ppc64 = ppc64-elfv2; # default to modern elfv2 + + ppc64-musl = { + config = "powerpc64-unknown-linux-musl"; + gcc = { abi = "elfv2"; }; # for gcc configuration }; sheevaplug = { config = "armv5tel-unknown-linux-gnueabi"; - platform = platforms.sheevaplug; - }; + } // platforms.sheevaplug; raspberryPi = { config = "armv6l-unknown-linux-gnueabihf"; - platform = platforms.raspberrypi; - }; + } // platforms.raspberrypi; remarkable1 = { config = "armv7l-unknown-linux-gnueabihf"; - platform = platforms.zero-gravitas; - }; + } // platforms.zero-gravitas; remarkable2 = { config = "armv7l-unknown-linux-gnueabihf"; - platform = platforms.zero-sugar; - }; + } // platforms.zero-sugar; armv7l-hf-multiplatform = { config = "armv7l-unknown-linux-gnueabihf"; - platform = platforms.armv7l-hf-multiplatform; }; aarch64-multiplatform = { config = "aarch64-unknown-linux-gnu"; - platform = platforms.aarch64-multiplatform; }; armv7a-android-prebuilt = { config = "armv7a-unknown-linux-androideabi"; sdkVer = "29"; ndkVer = "21"; - platform = platforms.armv7a-android; useAndroidPrebuilt = true; - }; + } // platforms.armv7a-android; aarch64-android-prebuilt = { config = "aarch64-unknown-linux-android"; sdkVer = "29"; ndkVer = "21"; - platform = platforms.aarch64-multiplatform; useAndroidPrebuilt = true; }; - scaleway-c1 = armv7l-hf-multiplatform // rec { - platform = platforms.scaleway-c1; - inherit (platform.gcc) fpu; - }; + scaleway-c1 = armv7l-hf-multiplatform // platforms.scaleway-c1; pogoplug4 = { config = "armv5tel-unknown-linux-gnueabi"; - platform = platforms.pogoplug4; - }; + } // platforms.pogoplug4; ben-nanonote = { config = "mipsel-unknown-linux-uclibc"; - platform = platforms.ben_nanonote; - }; + } // platforms.ben_nanonote; fuloongminipc = { config = "mipsel-unknown-linux-gnu"; - platform = platforms.fuloong2f_n32; - }; + } // platforms.fuloong2f_n32; muslpi = raspberryPi // { config = "armv6l-unknown-linux-musleabihf"; }; - aarch64-multiplatform-musl = aarch64-multiplatform // { + aarch64-multiplatform-musl = { config = "aarch64-unknown-linux-musl"; }; @@ -110,13 +106,11 @@ rec { riscv64-embedded = { config = "riscv64-none-elf"; libc = "newlib"; - platform = platforms.riscv-multiplatform; }; riscv32-embedded = { config = "riscv32-none-elf"; libc = "newlib"; - platform = platforms.riscv-multiplatform; }; mmix = { @@ -136,13 +130,11 @@ rec { vc4 = { config = "vc4-elf"; libc = "newlib"; - platform = {}; }; or1k = { config = "or1k-elf"; libc = "newlib"; - platform = {}; }; arm-embedded = { @@ -152,6 +144,12 @@ rec { armhf-embedded = { config = "arm-none-eabihf"; libc = "newlib"; + # GCC8+ does not build without this + # (https://www.mail-archive.com/gcc-bugs@gcc.gnu.org/msg552339.html): + gcc = { + arch = "armv5t"; + fpu = "vfp"; + }; }; aarch64-embedded = { @@ -200,41 +198,37 @@ rec { iphone64 = { config = "aarch64-apple-ios"; # config = "aarch64-apple-darwin14"; - sdkVer = "13.2"; - xcodeVer = "11.3.1"; + sdkVer = "14.3"; + xcodeVer = "12.3"; xcodePlatform = "iPhoneOS"; useiOSPrebuilt = true; - platform = {}; }; iphone32 = { config = "armv7a-apple-ios"; # config = "arm-apple-darwin10"; - sdkVer = "13.2"; - xcodeVer = "11.3.1"; + sdkVer = "14.3"; + xcodeVer = "12.3"; xcodePlatform = "iPhoneOS"; useiOSPrebuilt = true; - platform = {}; }; iphone64-simulator = { config = "x86_64-apple-ios"; # config = "x86_64-apple-darwin14"; - sdkVer = "13.2"; - xcodeVer = "11.3.1"; + sdkVer = "14.3"; + xcodeVer = "12.3"; xcodePlatform = "iPhoneSimulator"; useiOSPrebuilt = true; - platform = {}; }; iphone32-simulator = { config = "i686-apple-ios"; # config = "i386-apple-darwin11"; - sdkVer = "13.2"; - xcodeVer = "11.3.1"; + sdkVer = "14.3"; + xcodeVer = "12.3"; xcodePlatform = "iPhoneSimulator"; useiOSPrebuilt = true; - platform = {}; }; # @@ -245,7 +239,6 @@ rec { mingw32 = { config = "i686-w64-mingw32"; libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain - platform = {}; }; # 64 bit mingw-w64 @@ -253,7 +246,6 @@ rec { # That's the triplet they use in the mingw-w64 docs. config = "x86_64-w64-mingw32"; libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain - platform = {}; }; # BSDs @@ -275,6 +267,5 @@ rec { # Ghcjs ghcjs = { config = "js-unknown-ghcjs"; - platform = {}; }; } diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index a06ac0d11f7..8e012622ccd 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -337,10 +337,18 @@ rec { The "gnu" ABI is ambiguous on 32-bit ARM. Use "gnueabi" or "gnueabihf" instead. ''; } + { assertion = platform: platform.system != "powerpc64-linux"; + message = '' + The "gnu" ABI is ambiguous on big-endian 64-bit PPC. Use "elfv1" or "elfv2" instead. + ''; + } ]; }; gnuabi64 = { abi = "64"; }; + elfv1 = { abi = "elfv1"; }; + elfv2 = { abi = "elfv2"; }; + musleabi = { float = "soft"; }; musleabihf = { float = "hard"; }; musl = {}; @@ -444,6 +452,7 @@ rec { if lib.versionAtLeast (parsed.cpu.version or "0") "6" then abis.gnueabihf else abis.gnueabi + else if cpu == "powerpc64" then abis.elfv2 else abis.gnu else abis.unknown; }; diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix index fdd127e5541..f399c1873f5 100644 --- a/lib/systems/platforms.nix +++ b/lib/systems/platforms.nix @@ -1,39 +1,36 @@ { lib }: rec { - pcBase = { - name = "pc"; - kernelBaseConfig = "defconfig"; - # Build whatever possible as a module, if not stated in the extra config. - kernelAutoModules = true; - kernelTarget = "bzImage"; - }; - - pc64 = pcBase // { kernelArch = "x86_64"; }; - - pc32 = pcBase // { kernelArch = "i386"; }; - - pc32_simplekernel = pc32 // { - kernelAutoModules = false; + pc = { + linux-kernel = { + name = "pc"; + + baseConfig = "defconfig"; + # Build whatever possible as a module, if not stated in the extra config. + autoModules = true; + target = "bzImage"; + }; }; - pc64_simplekernel = pc64 // { - kernelAutoModules = false; + pc_simplekernel = lib.recursiveUpdate pc { + linux-kernel.autoModules = false; }; powernv = { - name = "PowerNV"; - kernelArch = "powerpc"; - kernelBaseConfig = "powernv_defconfig"; - kernelTarget = "zImage"; - kernelInstallTarget = "install"; - kernelFile = "vmlinux"; - kernelAutoModules = true; - # avoid driver/FS trouble arising from unusual page size - kernelExtraConfig = '' - PPC_64K_PAGES n - PPC_4K_PAGES y - IPV6 y - ''; + linux-kernel = { + name = "PowerNV"; + + baseConfig = "powernv_defconfig"; + target = "zImage"; + installTarget = "install"; + file = "vmlinux"; + autoModules = true; + # avoid driver/FS trouble arising from unusual page size + extraConfig = '' + PPC_64K_PAGES n + PPC_4K_PAGES y + IPV6 y + ''; + }; }; ## @@ -41,18 +38,121 @@ rec { ## pogoplug4 = { - name = "pogoplug4"; + linux-kernel = { + name = "pogoplug4"; + baseConfig = "multi_v5_defconfig"; + autoModules = false; + extraConfig = '' + # Ubi for the mtd + MTD_UBI y + UBIFS_FS y + UBIFS_FS_XATTR y + UBIFS_FS_ADVANCED_COMPR y + UBIFS_FS_LZO y + UBIFS_FS_ZLIB y + UBIFS_FS_DEBUG n + ''; + makeFlags = [ "LOADADDR=0x8000" ]; + target = "uImage"; + # TODO reenable once manual-config's config actually builds a .dtb and this is checked to be working + #DTB = true; + }; gcc = { arch = "armv5te"; }; + }; + + sheevaplug = { + linux-kernel = { + name = "sheevaplug"; + + baseConfig = "multi_v5_defconfig"; + autoModules = false; + extraConfig = '' + BLK_DEV_RAM y + BLK_DEV_INITRD y + BLK_DEV_CRYPTOLOOP m + BLK_DEV_DM m + DM_CRYPT m + MD y + REISERFS_FS m + BTRFS_FS m + XFS_FS m + JFS_FS m + EXT4_FS m + USB_STORAGE_CYPRESS_ATACB m + + # mv cesa requires this sw fallback, for mv-sha1 + CRYPTO_SHA1 y + # Fast crypto + CRYPTO_TWOFISH y + CRYPTO_TWOFISH_COMMON y + CRYPTO_BLOWFISH y + CRYPTO_BLOWFISH_COMMON y + + IP_PNP y + IP_PNP_DHCP y + NFS_FS y + ROOT_NFS y + TUN m + NFS_V4 y + NFS_V4_1 y + NFS_FSCACHE y + NFSD m + NFSD_V2_ACL y + NFSD_V3 y + NFSD_V3_ACL y + NFSD_V4 y + NETFILTER y + IP_NF_IPTABLES y + IP_NF_FILTER y + IP_NF_MATCH_ADDRTYPE y + IP_NF_TARGET_LOG y + IP_NF_MANGLE y + IPV6 m + VLAN_8021Q m + + CIFS y + CIFS_XATTR y + CIFS_POSIX y + CIFS_FSCACHE y + CIFS_ACL y + + WATCHDOG y + WATCHDOG_CORE y + ORION_WATCHDOG m + + ZRAM m + NETCONSOLE m + + # Disable OABI to have seccomp_filter (required for systemd) + # https://github.com/raspberrypi/firmware/issues/651 + OABI_COMPAT n + + # Fail to build + DRM n + SCSI_ADVANSYS n + USB_ISP1362_HCD n + SND_SOC n + SND_ALI5451 n + FB_SAVAGE n + SCSI_NSP32 n + ATA_SFF n + SUNGEM n + IRDA n + ATM_HE n + SCSI_ACARD n + BLK_DEV_CMD640_ENHANCED n + + FUSE_FS m + + # systemd uses cgroups + CGROUPS y + + # Latencytop + LATENCYTOP y - kernelMajor = "2.6"; - kernelBaseConfig = "multi_v5_defconfig"; - kernelArch = "arm"; - kernelAutoModules = false; - kernelExtraConfig = - '' # Ubi for the mtd MTD_UBI y UBIFS_FS y @@ -61,139 +161,36 @@ rec { UBIFS_FS_LZO y UBIFS_FS_ZLIB y UBIFS_FS_DEBUG n - ''; - kernelMakeFlags = [ "LOADADDR=0x8000" ]; - kernelTarget = "uImage"; - # TODO reenable once manual-config's config actually builds a .dtb and this is checked to be working - #kernelDTB = true; - }; - sheevaplug = { - name = "sheevaplug"; - kernelMajor = "2.6"; - kernelBaseConfig = "multi_v5_defconfig"; - kernelArch = "arm"; - kernelAutoModules = false; - kernelExtraConfig = '' - BLK_DEV_RAM y - BLK_DEV_INITRD y - BLK_DEV_CRYPTOLOOP m - BLK_DEV_DM m - DM_CRYPT m - MD y - REISERFS_FS m - BTRFS_FS m - XFS_FS m - JFS_FS m - EXT4_FS m - USB_STORAGE_CYPRESS_ATACB m - - # mv cesa requires this sw fallback, for mv-sha1 - CRYPTO_SHA1 y - # Fast crypto - CRYPTO_TWOFISH y - CRYPTO_TWOFISH_COMMON y - CRYPTO_BLOWFISH y - CRYPTO_BLOWFISH_COMMON y - - IP_PNP y - IP_PNP_DHCP y - NFS_FS y - ROOT_NFS y - TUN m - NFS_V4 y - NFS_V4_1 y - NFS_FSCACHE y - NFSD m - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - NETFILTER y - IP_NF_IPTABLES y - IP_NF_FILTER y - IP_NF_MATCH_ADDRTYPE y - IP_NF_TARGET_LOG y - IP_NF_MANGLE y - IPV6 m - VLAN_8021Q m - - CIFS y - CIFS_XATTR y - CIFS_POSIX y - CIFS_FSCACHE y - CIFS_ACL y - - WATCHDOG y - WATCHDOG_CORE y - ORION_WATCHDOG m - - ZRAM m - NETCONSOLE m - - # Disable OABI to have seccomp_filter (required for systemd) - # https://github.com/raspberrypi/firmware/issues/651 - OABI_COMPAT n - - # Fail to build - DRM n - SCSI_ADVANSYS n - USB_ISP1362_HCD n - SND_SOC n - SND_ALI5451 n - FB_SAVAGE n - SCSI_NSP32 n - ATA_SFF n - SUNGEM n - IRDA n - ATM_HE n - SCSI_ACARD n - BLK_DEV_CMD640_ENHANCED n - - FUSE_FS m - - # systemd uses cgroups - CGROUPS y - - # Latencytop - LATENCYTOP y - - # Ubi for the mtd - MTD_UBI y - UBIFS_FS y - UBIFS_FS_XATTR y - UBIFS_FS_ADVANCED_COMPR y - UBIFS_FS_LZO y - UBIFS_FS_ZLIB y - UBIFS_FS_DEBUG n - - # Kdb, for kernel troubles - KGDB y - KGDB_SERIAL_CONSOLE y - KGDB_KDB y - ''; - kernelMakeFlags = [ "LOADADDR=0x0200000" ]; - kernelTarget = "uImage"; - kernelDTB = true; # Beyond 3.10 + # Kdb, for kernel troubles + KGDB y + KGDB_SERIAL_CONSOLE y + KGDB_KDB y + ''; + makeFlags = [ "LOADADDR=0x0200000" ]; + target = "uImage"; + DTB = true; # Beyond 3.10 + }; gcc = { arch = "armv5te"; }; }; raspberrypi = { - name = "raspberrypi"; - kernelMajor = "2.6"; - kernelBaseConfig = "bcm2835_defconfig"; - kernelDTB = true; - kernelArch = "arm"; - kernelAutoModules = true; - kernelPreferBuiltin = true; - kernelExtraConfig = '' - # Disable OABI to have seccomp_filter (required for systemd) - # https://github.com/raspberrypi/firmware/issues/651 - OABI_COMPAT n - ''; - kernelTarget = "zImage"; + linux-kernel = { + name = "raspberrypi"; + + baseConfig = "bcm2835_defconfig"; + DTB = true; + autoModules = true; + preferBuiltin = true; + extraConfig = '' + # Disable OABI to have seccomp_filter (required for systemd) + # https://github.com/raspberrypi/firmware/issues/651 + OABI_COMPAT n + ''; + target = "zImage"; + }; gcc = { arch = "armv6"; fpu = "vfp"; @@ -204,13 +201,15 @@ rec { raspberrypi2 = armv7l-hf-multiplatform; zero-gravitas = { - name = "zero-gravitas"; - kernelBaseConfig = "zero-gravitas_defconfig"; - kernelArch = "arm"; - # kernelTarget verified by checking /boot on reMarkable 1 device - kernelTarget = "zImage"; - kernelAutoModules = false; - kernelDTB = true; + linux-kernel = { + name = "zero-gravitas"; + + baseConfig = "zero-gravitas_defconfig"; + # Target verified by checking /boot on reMarkable 1 device + target = "zImage"; + autoModules = false; + DTB = true; + }; gcc = { fpu = "neon"; cpu = "cortex-a9"; @@ -218,13 +217,15 @@ rec { }; zero-sugar = { - name = "zero-sugar"; - kernelBaseConfig = "zero-sugar_defconfig"; - kernelArch = "arm"; - kernelDTB = true; - kernelAutoModules = false; - kernelPreferBuiltin = true; - kernelTarget = "zImage"; + linux-kernel = { + name = "zero-sugar"; + + baseConfig = "zero-sugar_defconfig"; + DTB = true; + autoModules = false; + preferBuiltin = true; + target = "zImage"; + }; gcc = { cpu = "cortex-a7"; fpu = "neon-vfpv4"; @@ -232,7 +233,7 @@ rec { }; }; - scaleway-c1 = armv7l-hf-multiplatform // { + scaleway-c1 = lib.recursiveUpdate armv7l-hf-multiplatform { gcc = { cpu = "cortex-a9"; fpu = "vfpv3"; @@ -240,13 +241,11 @@ rec { }; utilite = { - name = "utilite"; - kernelMajor = "2.6"; - kernelBaseConfig = "multi_v7_defconfig"; - kernelArch = "arm"; - kernelAutoModules = false; - kernelExtraConfig = - '' + linux-kernel = { + name = "utilite"; + maseConfig = "multi_v7_defconfig"; + autoModules = false; + extraConfig = '' # Ubi for the mtd MTD_UBI y UBIFS_FS y @@ -256,35 +255,37 @@ rec { UBIFS_FS_ZLIB y UBIFS_FS_DEBUG n ''; - kernelMakeFlags = [ "LOADADDR=0x10800000" ]; - kernelTarget = "uImage"; - kernelDTB = true; + makeFlags = [ "LOADADDR=0x10800000" ]; + target = "uImage"; + DTB = true; + }; gcc = { cpu = "cortex-a9"; fpu = "neon"; }; }; - guruplug = sheevaplug // { + guruplug = lib.recursiveUpdate sheevaplug { # Define `CONFIG_MACH_GURUPLUG' (see # <http://kerneltrap.org/mailarchive/git-commits-head/2010/5/19/33618>) # and other GuruPlug-specific things. Requires the `guruplug-defconfig' # patch. - - kernelBaseConfig = "guruplug_defconfig"; + linux-kernel.baseConfig = "guruplug_defconfig"; }; - beaglebone = armv7l-hf-multiplatform // { - name = "beaglebone"; - kernelBaseConfig = "bb.org_defconfig"; - kernelAutoModules = false; - kernelExtraConfig = ""; # TBD kernel config - kernelTarget = "zImage"; + beaglebone = lib.recursiveUpdate armv7l-hf-multiplatform { + linux-kernel = { + name = "beaglebone"; + baseConfig = "bb.org_defconfig"; + autoModules = false; + extraConfig = ""; # TBD kernel config + target = "zImage"; + }; }; # https://developer.android.com/ndk/guides/abis#v7a - armv7a-android = { - name = "armeabi-v7a"; + armv7a-android = { + linux-kernel.name = "armeabi-v7a"; gcc = { arch = "armv7-a"; float-abi = "softfp"; @@ -293,30 +294,31 @@ rec { }; armv7l-hf-multiplatform = { - name = "armv7l-hf-multiplatform"; - kernelMajor = "2.6"; # Using "2.6" enables 2.6 kernel syscalls in glibc. - kernelBaseConfig = "multi_v7_defconfig"; - kernelArch = "arm"; - kernelDTB = true; - kernelAutoModules = true; - kernelPreferBuiltin = true; - kernelTarget = "zImage"; - kernelExtraConfig = '' - # Serial port for Raspberry Pi 3. Upstream forgot to add it to the ARMv7 defconfig. - SERIAL_8250_BCM2835AUX y - SERIAL_8250_EXTENDED y - SERIAL_8250_SHARE_IRQ y - - # Fix broken sunxi-sid nvmem driver. - TI_CPTS y - - # Hangs ODROID-XU4 - ARM_BIG_LITTLE_CPUIDLE n - - # Disable OABI to have seccomp_filter (required for systemd) - # https://github.com/raspberrypi/firmware/issues/651 - OABI_COMPAT n - ''; + linux-kernel = { + name = "armv7l-hf-multiplatform"; + Major = "2.6"; # Using "2.6" enables 2.6 kernel syscalls in glibc. + baseConfig = "multi_v7_defconfig"; + DTB = true; + autoModules = true; + PreferBuiltin = true; + target = "zImage"; + extraConfig = '' + # Serial port for Raspberry Pi 3. Upstream forgot to add it to the ARMv7 defconfig. + SERIAL_8250_BCM2835AUX y + SERIAL_8250_EXTENDED y + SERIAL_8250_SHARE_IRQ y + + # Fix broken sunxi-sid nvmem driver. + TI_CPTS y + + # Hangs ODROID-XU4 + ARM_BIG_LITTLE_CPUIDLE n + + # Disable OABI to have seccomp_filter (required for systemd) + # https://github.com/raspberrypi/firmware/issues/651 + OABI_COMPAT n + ''; + }; gcc = { # Some table about fpu flags: # http://community.arm.com/servlet/JiveServlet/showImage/38-1981-3827/blogentry-103749-004812900+1365712953_thumb.png @@ -341,35 +343,35 @@ rec { }; aarch64-multiplatform = { - name = "aarch64-multiplatform"; - kernelMajor = "2.6"; # Using "2.6" enables 2.6 kernel syscalls in glibc. - kernelBaseConfig = "defconfig"; - kernelArch = "arm64"; - kernelDTB = true; - kernelAutoModules = true; - kernelPreferBuiltin = true; - kernelExtraConfig = '' - # Raspberry Pi 3 stuff. Not needed for kernels >= 4.10. - ARCH_BCM2835 y - BCM2835_MBOX y - BCM2835_WDT y - RASPBERRYPI_FIRMWARE y - RASPBERRYPI_POWER y - SERIAL_8250_BCM2835AUX y - SERIAL_8250_EXTENDED y - SERIAL_8250_SHARE_IRQ y - - # Cavium ThunderX stuff. - PCI_HOST_THUNDER_ECAM y - - # Nvidia Tegra stuff. - PCI_TEGRA y - - # The default (=y) forces us to have the XHCI firmware available in initrd, - # which our initrd builder can't currently do easily. - USB_XHCI_TEGRA m - ''; - kernelTarget = "Image"; + linux-kernel = { + name = "aarch64-multiplatform"; + baseConfig = "defconfig"; + DTB = true; + autoModules = true; + preferBuiltin = true; + extraConfig = '' + # Raspberry Pi 3 stuff. Not needed for s >= 4.10. + ARCH_BCM2835 y + BCM2835_MBOX y + BCM2835_WDT y + RASPBERRYPI_FIRMWARE y + RASPBERRYPI_POWER y + SERIAL_8250_BCM2835AUX y + SERIAL_8250_EXTENDED y + SERIAL_8250_SHARE_IRQ y + + # Cavium ThunderX stuff. + PCI_HOST_THUNDER_ECAM y + + # Nvidia Tegra stuff. + PCI_TEGRA y + + # The default (=y) forces us to have the XHCI firmware available in initrd, + # which our initrd builder can't currently do easily. + USB_XHCI_TEGRA m + ''; + target = "Image"; + }; gcc = { arch = "armv8-a"; }; @@ -380,9 +382,9 @@ rec { ## ben_nanonote = { - name = "ben_nanonote"; - kernelMajor = "2.6"; - kernelArch = "mips"; + linux-kernel = { + name = "ben_nanonote"; + }; gcc = { arch = "mips32"; float = "soft"; @@ -390,76 +392,76 @@ rec { }; fuloong2f_n32 = { - name = "fuloong2f_n32"; - kernelMajor = "2.6"; - kernelBaseConfig = "lemote2f_defconfig"; - kernelArch = "mips"; - kernelAutoModules = false; - kernelExtraConfig = '' - MIGRATION n - COMPACTION n - - # nixos mounts some cgroup - CGROUPS y - - BLK_DEV_RAM y - BLK_DEV_INITRD y - BLK_DEV_CRYPTOLOOP m - BLK_DEV_DM m - DM_CRYPT m - MD y - REISERFS_FS m - EXT4_FS m - USB_STORAGE_CYPRESS_ATACB m - - IP_PNP y - IP_PNP_DHCP y - IP_PNP_BOOTP y - NFS_FS y - ROOT_NFS y - TUN m - NFS_V4 y - NFS_V4_1 y - NFS_FSCACHE y - NFSD m - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - - # Fail to build - DRM n - SCSI_ADVANSYS n - USB_ISP1362_HCD n - SND_SOC n - SND_ALI5451 n - FB_SAVAGE n - SCSI_NSP32 n - ATA_SFF n - SUNGEM n - IRDA n - ATM_HE n - SCSI_ACARD n - BLK_DEV_CMD640_ENHANCED n - - FUSE_FS m - - # Needed for udev >= 150 - SYSFS_DEPRECATED_V2 n - - VGA_CONSOLE n - VT_HW_CONSOLE_BINDING y - SERIAL_8250_CONSOLE y - FRAMEBUFFER_CONSOLE y - EXT2_FS y - EXT3_FS y - REISERFS_FS y - MAGIC_SYSRQ y - - # The kernel doesn't boot at all, with FTRACE - FTRACE n - ''; - kernelTarget = "vmlinux"; + linux-kernel = { + name = "fuloong2f_n32"; + baseConfig = "lemote2f_defconfig"; + autoModules = false; + extraConfig = '' + MIGRATION n + COMPACTION n + + # nixos mounts some cgroup + CGROUPS y + + BLK_DEV_RAM y + BLK_DEV_INITRD y + BLK_DEV_CRYPTOLOOP m + BLK_DEV_DM m + DM_CRYPT m + MD y + REISERFS_FS m + EXT4_FS m + USB_STORAGE_CYPRESS_ATACB m + + IP_PNP y + IP_PNP_DHCP y + IP_PNP_BOOTP y + NFS_FS y + ROOT_NFS y + TUN m + NFS_V4 y + NFS_V4_1 y + NFS_FSCACHE y + NFSD m + NFSD_V2_ACL y + NFSD_V3 y + NFSD_V3_ACL y + NFSD_V4 y + + # Fail to build + DRM n + SCSI_ADVANSYS n + USB_ISP1362_HCD n + SND_SOC n + SND_ALI5451 n + FB_SAVAGE n + SCSI_NSP32 n + ATA_SFF n + SUNGEM n + IRDA n + ATM_HE n + SCSI_ACARD n + BLK_DEV_CMD640_ENHANCED n + + FUSE_FS m + + # Needed for udev >= 150 + SYSFS_DEPRECATED_V2 n + + VGA_CONSOLE n + VT_HW_CONSOLE_BINDING y + SERIAL_8250_CONSOLE y + FRAMEBUFFER_CONSOLE y + EXT2_FS y + EXT3_FS y + REISERFS_FS y + MAGIC_SYSRQ y + + # The kernel doesn't boot at all, with FTRACE + FTRACE n + ''; + target = "vmlinux"; + }; gcc = { arch = "loongson2f"; float = "hard"; @@ -472,34 +474,36 @@ rec { ## riscv-multiplatform = { - name = "riscv-multiplatform"; - kernelArch = "riscv"; - kernelTarget = "vmlinux"; - kernelAutoModules = true; - kernelBaseConfig = "defconfig"; - kernelExtraConfig = '' - FTRACE n - SERIAL_OF_PLATFORM y - ''; + linux-kernel = { + name = "riscv-multiplatform"; + target = "vmlinux"; + autoModules = true; + baseConfig = "defconfig"; + extraConfig = '' + FTRACE n + SERIAL_OF_PLATFORM y + ''; + }; }; select = platform: # x86 - /**/ if platform.isx86_32 then pc32 - else if platform.isx86_64 then pc64 + /**/ if platform.isx86 then pc # ARM else if platform.isAarch32 then let version = platform.parsed.cpu.version or null; - in if version == null then pcBase + in if version == null then pc else if lib.versionOlder version "6" then sheevaplug else if lib.versionOlder version "7" then raspberrypi else armv7l-hf-multiplatform else if platform.isAarch64 then aarch64-multiplatform + else if platform.isRiscV then riscv-multiplatform + else if platform.parsed.cpu == lib.systems.parse.cpuTypes.mipsel then fuloong2f_n32 else if platform.parsed.cpu == lib.systems.parse.cpuTypes.powerpc64le then powernv - else pcBase; + else pc; } diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index 35a5801c724..0d249968402 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -660,4 +660,71 @@ runTests { expected = [ [ "foo" ] [ "foo" "<name>" "bar" ] [ "foo" "bar" ] ]; }; + testCartesianProductOfEmptySet = { + expr = cartesianProductOfSets {}; + expected = [ {} ]; + }; + + testCartesianProductOfOneSet = { + expr = cartesianProductOfSets { a = [ 1 2 3 ]; }; + expected = [ { a = 1; } { a = 2; } { a = 3; } ]; + }; + + testCartesianProductOfTwoSets = { + expr = cartesianProductOfSets { a = [ 1 ]; b = [ 10 20 ]; }; + expected = [ + { a = 1; b = 10; } + { a = 1; b = 20; } + ]; + }; + + testCartesianProductOfTwoSetsWithOneEmpty = { + expr = cartesianProductOfSets { a = [ ]; b = [ 10 20 ]; }; + expected = [ ]; + }; + + testCartesianProductOfThreeSets = { + expr = cartesianProductOfSets { + a = [ 1 2 3 ]; + b = [ 10 20 30 ]; + c = [ 100 200 300 ]; + }; + expected = [ + { a = 1; b = 10; c = 100; } + { a = 1; b = 10; c = 200; } + { a = 1; b = 10; c = 300; } + + { a = 1; b = 20; c = 100; } + { a = 1; b = 20; c = 200; } + { a = 1; b = 20; c = 300; } + + { a = 1; b = 30; c = 100; } + { a = 1; b = 30; c = 200; } + { a = 1; b = 30; c = 300; } + + { a = 2; b = 10; c = 100; } + { a = 2; b = 10; c = 200; } + { a = 2; b = 10; c = 300; } + + { a = 2; b = 20; c = 100; } + { a = 2; b = 20; c = 200; } + { a = 2; b = 20; c = 300; } + + { a = 2; b = 30; c = 100; } + { a = 2; b = 30; c = 200; } + { a = 2; b = 30; c = 300; } + + { a = 3; b = 10; c = 100; } + { a = 3; b = 10; c = 200; } + { a = 3; b = 10; c = 300; } + + { a = 3; b = 20; c = 100; } + { a = 3; b = 20; c = 200; } + { a = 3; b = 20; c = 300; } + + { a = 3; b = 30; c = 100; } + { a = 3; b = 30; c = 200; } + { a = 3; b = 30; c = 300; } + ]; + }; } diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index 309c5311361..f843d303e44 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -262,6 +262,13 @@ checkConfigOutput true config.value.mkbefore ./types-anything/mk-mods.nix checkConfigOutput 1 config.value.nested.foo ./types-anything/mk-mods.nix checkConfigOutput baz config.value.nested.bar.baz ./types-anything/mk-mods.nix +## types.functionTo +checkConfigOutput "input is input" config.result ./functionTo/trivial.nix +checkConfigOutput "a b" config.result ./functionTo/merging-list.nix +checkConfigError 'A definition for option .fun.\[function body\]. is not of type .string.. Definition values:\n- In .*wrong-type.nix' config.result ./functionTo/wrong-type.nix +checkConfigOutput "b a" config.result ./functionTo/list-order.nix +checkConfigOutput "a c" config.result ./functionTo/merging-attrs.nix + cat <<EOF ====== module tests ====== $pass Pass diff --git a/lib/tests/modules/functionTo/list-order.nix b/lib/tests/modules/functionTo/list-order.nix new file mode 100644 index 00000000000..77a1a43a84f --- /dev/null +++ b/lib/tests/modules/functionTo/list-order.nix @@ -0,0 +1,25 @@ + +{ lib, config, ... }: +let + inherit (lib) types; +in { + options = { + fun = lib.mkOption { + type = types.functionTo (types.listOf types.str); + }; + + result = lib.mkOption { + type = types.str; + default = toString (config.fun { + a = "a"; + b = "b"; + c = "c"; + }); + }; + }; + + config.fun = lib.mkMerge [ + (input: lib.mkAfter [ input.a ]) + (input: [ input.b ]) + ]; +} diff --git a/lib/tests/modules/functionTo/merging-attrs.nix b/lib/tests/modules/functionTo/merging-attrs.nix new file mode 100644 index 00000000000..97c015f928a --- /dev/null +++ b/lib/tests/modules/functionTo/merging-attrs.nix @@ -0,0 +1,27 @@ +{ lib, config, ... }: +let + inherit (lib) types; +in { + options = { + fun = lib.mkOption { + type = types.functionTo (types.attrsOf types.str); + }; + + result = lib.mkOption { + type = types.str; + default = toString (lib.attrValues (config.fun { + a = "a"; + b = "b"; + c = "c"; + })); + }; + }; + + config.fun = lib.mkMerge [ + (input: { inherit (input) a; }) + (input: { inherit (input) b; }) + (input: { + b = lib.mkForce input.c; + }) + ]; +} diff --git a/lib/tests/modules/functionTo/merging-list.nix b/lib/tests/modules/functionTo/merging-list.nix new file mode 100644 index 00000000000..15fcd2bdcc4 --- /dev/null +++ b/lib/tests/modules/functionTo/merging-list.nix @@ -0,0 +1,24 @@ +{ lib, config, ... }: +let + inherit (lib) types; +in { + options = { + fun = lib.mkOption { + type = types.functionTo (types.listOf types.str); + }; + + result = lib.mkOption { + type = types.str; + default = toString (config.fun { + a = "a"; + b = "b"; + c = "c"; + }); + }; + }; + + config.fun = lib.mkMerge [ + (input: [ input.a ]) + (input: [ input.b ]) + ]; +} diff --git a/lib/tests/modules/functionTo/trivial.nix b/lib/tests/modules/functionTo/trivial.nix new file mode 100644 index 00000000000..0962a0cf893 --- /dev/null +++ b/lib/tests/modules/functionTo/trivial.nix @@ -0,0 +1,17 @@ +{ lib, config, ... }: +let + inherit (lib) types; +in { + options = { + fun = lib.mkOption { + type = types.functionTo types.str; + }; + + result = lib.mkOption { + type = types.str; + default = config.fun "input"; + }; + }; + + config.fun = input: "input is ${input}"; +} diff --git a/lib/tests/modules/functionTo/wrong-type.nix b/lib/tests/modules/functionTo/wrong-type.nix new file mode 100644 index 00000000000..fd65b75088d --- /dev/null +++ b/lib/tests/modules/functionTo/wrong-type.nix @@ -0,0 +1,18 @@ + +{ lib, config, ... }: +let + inherit (lib) types; +in { + options = { + fun = lib.mkOption { + type = types.functionTo types.str; + }; + + result = lib.mkOption { + type = types.str; + default = config.fun 0; + }; + }; + + config.fun = input: input + 1; +} diff --git a/lib/tests/systems.nix b/lib/tests/systems.nix index eed7ee725bc..c0800df25ed 100644 --- a/lib/tests/systems.nix +++ b/lib/tests/systems.nix @@ -28,7 +28,7 @@ with lib.systems.doubles; lib.runTests { testredox = mseteq redox [ "x86_64-redox" ]; testgnu = mseteq gnu (linux /* ++ kfreebsd ++ ... */); testillumos = mseteq illumos [ "x86_64-solaris" ]; - testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64le-linux" ]; + testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64-linux" "powerpc64le-linux" ]; testnetbsd = mseteq netbsd [ "i686-netbsd" "x86_64-netbsd" ]; testopenbsd = mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ]; testwindows = mseteq windows [ "i686-cygwin" "x86_64-cygwin" "i686-windows" "x86_64-windows" ]; diff --git a/lib/types.nix b/lib/types.nix index ee891f8231b..d0a8e96149d 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -453,6 +453,17 @@ rec { functor = (defaultFunctor name) // { wrapped = elemType; }; }; + functionTo = elemType: mkOptionType { + name = "functionTo"; + description = "function that evaluates to a(n) ${elemType.name}"; + check = isFunction; + merge = loc: defs: + fnArgs: (mergeDefinitions (loc ++ [ "[function body]" ]) elemType (map (fn: { inherit (fn) file; value = fn.value fnArgs; }) defs)).mergedValue; + getSubOptions = elemType.getSubOptions; + getSubModules = elemType.getSubModules; + substSubModules = m: functionTo (elemType.substSubModules m); + }; + # A submodule (like typed attribute set). See NixOS manual. submodule = modules: submoduleWith { shorthandOnlyDefinesConfig = true; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 874cf13fad5..3adde0d14e4 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -610,6 +610,16 @@ githubId = 11699655; name = "Stanislas Lange"; }; + anhdle14 = { + name = "Le Anh Duc"; + email = "anhdle14@icloud.com"; + github = "anhdle14"; + githubId = 9645992; + keys = [{ + longkeyid = "rsa4096/0x0299AFF9ECBB5169"; + fingerprint = "AA4B 8EC3 F971 D350 482E 4E20 0299 AFF9 ECBB 5169"; + }]; + }; ankhers = { email = "me@ankhers.dev"; github = "ankhers"; @@ -858,6 +868,12 @@ githubId = 706854; name = "Etienne Laurin"; }; + attila-lendvai = { + name = "Attila Lendvai"; + email = "attila@lendvai.name"; + github = "attila-lendvai"; + githubId = 840345; + }; auntie = { email = "auntieNeo@gmail.com"; github = "auntieNeo"; @@ -960,6 +976,12 @@ email = "sivaraman.balaji@gmail.com"; name = "Balaji Sivaraman"; }; + baloo = { + email = "nixpkgs@superbaloo.net"; + github = "baloo"; + githubId = 59060; + name = "Arthur Gautier"; + }; balsoft = { email = "balsoft75@gmail.com"; github = "balsoft"; @@ -1020,6 +1042,12 @@ githubId = 1015044; name = "Brandon Carrell"; }; + bcc32 = { + email = "me@bcc32.com"; + github = "bcc32"; + githubId = 1239097; + name = "Aaron Zeng"; + }; bcdarwin = { email = "bcdarwin@gmail.com"; github = "bcdarwin"; @@ -1068,6 +1096,12 @@ githubId = 75972; name = "Ben Booth"; }; + berberman = { + email = "berberman@yandex.com"; + github = "berberman"; + githubId = 26041945; + name = "Potato Hatsue"; + }; berce = { email = "bert.moens@gmail.com"; github = "berce"; @@ -1567,6 +1601,12 @@ githubId = 33503784; name = "Yucheng Zhang"; }; + cheriimoya = { + email = "github@hausch.xyz"; + github = "cheriimoya"; + githubId = 28303440; + name = "Max Hausch"; + }; chessai = { email = "chessai1996@gmail.com"; github = "chessai"; @@ -1683,16 +1723,6 @@ githubId = 46303707; name = "Christian Lütke-Stetzkamp"; }; - 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"; github = "ckauhaus"; @@ -2021,6 +2051,12 @@ githubId = 23366017; name = "Dan Haraj"; }; + danielbarter = { + email = "danielbarter@gmail.com"; + github = "danielbarter"; + githubId = 8081722; + name = "Daniel Barter"; + }; danieldk = { email = "me@danieldk.eu"; github = "danieldk"; @@ -2565,6 +2601,12 @@ githubId = 119483; name = "Matthew Brown"; }; + eduardosm = { + email = "esm@eduardosm.net"; + github = "eduardosm"; + githubId = 761151; + name = "Eduardo Sánchez Muñoz"; + }; eduarrrd = { email = "e.bachmakov@gmail.com"; github = "eduarrrd"; @@ -3443,6 +3485,12 @@ fingerprint = "7FC7 98AB 390E 1646 ED4D 8F1F 797F 6238 68CD 00C2"; }]; }; + greizgh = { + email = "greizgh@ephax.org"; + github = "greizgh"; + githubId = 1313624; + name = "greizgh"; + }; greydot = { email = "lanablack@amok.cc"; github = "greydot"; @@ -3627,6 +3675,12 @@ githubId = 3656888; name = "hhm"; }; + higebu = { + name = "Yuya Kusakabe"; + email = "yuya.kusakabe@gmail.com"; + github = "higebu"; + githubId = 733288; + }; hinton = { email = "t@larkery.com"; name = "Tom Hinton"; @@ -3675,12 +3729,30 @@ githubId = 896431; name = "Chris Hodapp"; }; + holymonson = { + email = "holymonson@gmail.com"; + github = "holymonson"; + githubId = 902012; + name = "Monson Shao"; + }; hongchangwu = { email = "wuhc85@gmail.com"; github = "hongchangwu"; githubId = 362833; name = "Hongchang Wu"; }; + hoverbear = { + email = "operator+nix@hoverbear.org"; + github = "hoverbear"; + githubId = 130903; + name = "Ana Hobden"; + }; + holgerpeters = { + name = "Holger Peters"; + email = "holger.peters@posteo.de"; + github = "HolgerPeters"; + githubId = 4097049; + }; hrdinka = { email = "c.nix@hrdinka.at"; github = "hrdinka"; @@ -3771,6 +3843,12 @@ githubId = 7481521; name = "Balázs Lengyel"; }; + ilian = { + email = "ilian@tuta.io"; + github = "ilian"; + githubId = 25505957; + name = "Ilian"; + }; ilikeavocadoes = { email = "ilikeavocadoes@hush.com"; github = "ilikeavocadoes"; @@ -3863,6 +3941,12 @@ githubId = 4458; name = "Ivan Kozik"; }; + ivan-babrou = { + email = "nixpkgs@ivan.computer"; + name = "Ivan Babrou"; + github = "bobrik"; + githubId = 89186; + }; ivan-timokhin = { email = "nixpkgs@ivan.timokhin.name"; name = "Ivan Timokhin"; @@ -4007,6 +4091,12 @@ githubId = 45598; name = "William Casarin"; }; + jbcrail = { + name = "Joseph Crail"; + email = "jbcrail@gmail.com"; + github = "jbcrail"; + githubId = 6038; + }; jbedo = { email = "cu@cua0.org"; github = "jbedo"; @@ -4799,6 +4889,12 @@ github = "kmein"; githubId = 10352507; }; + kmicklas = { + email = "maintainer@kmicklas.com"; + name = "Ken Micklas"; + github = "kmicklas"; + githubId = 929096; + }; knairda = { email = "adrian@kummerlaender.eu"; name = "Adrian Kummerlaender"; @@ -4883,6 +4979,12 @@ githubId = 4032; name = "Kristoffer Thømt Ravneberg"; }; + kritnich = { + email = "kritnich@kritni.ch"; + github = "Kritnich"; + githubId = 22116767; + name = "Kritnich"; + }; kroell = { email = "nixosmainter@makroell.de"; github = "rokk4"; @@ -4942,6 +5044,10 @@ github = "kyleondy"; githubId = 1640900; name = "Kyle Ondy"; + keys = [{ + longkeyid = "rsa4096/0xDB0E3C33491F91C9"; + fingerprint = "3C79 9D26 057B 64E6 D907 B0AC DB0E 3C33 491F 91C9"; + }]; }; kylesferrazza = { name = "Kyle Sferrazza"; @@ -5104,12 +5210,24 @@ githubId = 42153076; name = "Alexey Nikashkin"; }; + lesuisse = { + email = "thomas@gerbet.me"; + github = "LeSuisse"; + githubId = 737767; + name = "Thomas Gerbet"; + }; lethalman = { email = "lucabru@src.gnome.org"; github = "lethalman"; githubId = 480920; name = "Luca Bruno"; }; + leungbk = { + email = "leungbk@mailfence.com"; + github = "leungbk"; + githubId = 29217594; + name = "Brian Leung"; + }; lewo = { email = "lewo@abesis.fr"; github = "nlewo"; @@ -5558,6 +5676,12 @@ email = "markus@wotringer.de"; name = "Markus Wotringer"; }; + marijanp = { + name = "Marijan Petričević"; + email = "marijan.petricevic94@gmail.com"; + github = "marijanp"; + githubId = 13599169; + }; marius851000 = { email = "mariusdavid@laposte.net"; name = "Marius David"; @@ -5592,6 +5716,12 @@ fingerprint = "B573 5118 0375 A872 FBBF 7770 B629 036B E399 EEE9"; }]; }; + mausch = { + email = "mauricioscheffer@gmail.com"; + github = "mausch"; + githubId = 95194; + name = "Mauricio Scheffer"; + }; matejc = { email = "cotman.matej@gmail.com"; github = "matejc"; @@ -6569,12 +6699,6 @@ github = "NobbZ"; githubId = 58951; }; - nocent = { - email = "nocent@protonmail.ch"; - github = "nocent"; - githubId = 25505957; - name = "nocent"; - }; nocoolnametom = { email = "nocoolnametom@gmail.com"; github = "nocoolnametom"; @@ -6663,6 +6787,12 @@ githubId = 7677321; name = "Paul Trehiou"; }; + nyanotech = { + name = "nyanotech"; + email = "nyanotechnology@gmail.com"; + github = "nyanotech"; + githubId = 33802077; + }; nyarly = { email = "nyarly@gmail.com"; github = "nyarly"; @@ -7101,6 +7231,16 @@ fingerprint = "A3A3 65AE 16ED A7A0 C29C 88F1 9712 452E 8BE3 372E"; }]; }; + pinpox = { + email = "mail@pablo.tools"; + github = "pinpox"; + githubId = 1719781; + name = "Pablo Ovelleiro Corral"; + keys = [{ + longkeyid = "sa4096/0x823A6154426408D3"; + fingerprint = "D03B 218C AE77 1F77 D7F9 20D9 823A 6154 4264 08D3"; + }]; + }; piotr = { email = "ppietrasa@gmail.com"; name = "Piotr Pietraszkiewicz"; @@ -7147,6 +7287,12 @@ githubId = 13000278; name = "Maksim Bronsky"; }; + PlushBeaver = { + name = "Dmitry Kozlyuk"; + email = "dmitry.kozliuk+nixpkgs@gmail.com"; + github = "PlushBeaver"; + githubId = 8988269; + }; pmahoney = { email = "pat@polycrystal.org"; github = "pmahoney"; @@ -7597,6 +7743,12 @@ githubId = 42433779; name = "Rémy Grünblatt"; }; + rguevara84 = { + email = "fuzztkd@gmail.com"; + github = "rguevara84"; + githubId = 12279531; + name = "Ricardo Guevara"; + }; rht = { email = "rhtbot@protonmail.com"; github = "rht"; @@ -8277,6 +8429,12 @@ githubId = 997855; name = "Narazaki Shuji"; }; + shofius = { + name = "Sam Hofius"; + email = "sam@samhofi.us"; + github = "kf5grd"; + githubId = 18297490; + }; shou = { email = "x+g@shou.io"; github = "Shou"; @@ -8515,6 +8673,12 @@ githubId = 7669898; name = "Katharina Fey"; }; + spease = { + email = "peasteven@gmail.com"; + github = "spease"; + githubId = 2825204; + name = "Steven Pease"; + }; spencerjanssen = { email = "spencerjanssen@gmail.com"; github = "spencerjanssen"; @@ -8545,6 +8709,12 @@ githubId = 36899624; name = "squalus"; }; + srapenne = { + email = "solene@perso.pw"; + github = "rapenne-s"; + githubId = 248016; + name = "Solène Rapenne"; + }; srghma = { email = "srghma@gmail.com"; github = "srghma"; @@ -8669,6 +8839,12 @@ githubId = 1315818; name = "Felix Bühler"; }; + stupremee = { + email = "jutus.k@protonmail.com"; + github = "Stupremee"; + githubId = 39732259; + name = "Justus K"; + }; suhr = { email = "suhr@i2pmail.org"; github = "suhr"; @@ -8681,6 +8857,12 @@ githubId = 2666479; name = "Y Nguyen"; }; + superherointj = { + name = "Sérgio G."; + email = "5861043+superherointj@users.noreply.github.com"; + github = "superherointj"; + githubId = 5861043; + }; SuperSandro2000 = { email = "sandro.jaeckel@gmail.com"; github = "SuperSandro2000"; @@ -8705,6 +8887,12 @@ githubId = 1040871; name = "Mathis Antony"; }; + svend = { + email = "svend@svends.net"; + github = "svend"; + githubId = 306190; + name = "Svend Sorensen"; + }; svrana = { email = "shaw@vranix.com"; github = "svrana"; @@ -9049,6 +9237,12 @@ githubId = 844343; name = "Thiago K. Okada"; }; + thibautmarty = { + email = "github@thibautmarty.fr"; + github = "ThibautMarty"; + githubId = 3268082; + name = "Thibaut Marty"; + }; thmzlt = { email = "git@thomazleite.com"; github = "thmzlt"; @@ -9309,6 +9503,12 @@ githubId = 303489; name = "Manuel Bärenz"; }; + tu-maurice = { + email = "valentin.gehrke+nixpkgs@zom.bi"; + github = "tu-maurice"; + githubId = 16151097; + name = "Valentin Gehrke"; + }; tv = { email = "tv@krebsco.de"; github = "4z3"; @@ -9648,6 +9848,10 @@ email = "oliver.huntuk@gmail.com"; name = "Oliver Hunt"; }; + vq = { + email = "vq@erq.se"; + name = "Daniel Nilsson"; + }; vrthra = { email = "rahul@gopinath.org"; github = "vrthra"; @@ -9754,6 +9958,12 @@ githubId = 43315; name = "William Roe"; }; + wldhx = { + email = "wldhx+nixpkgs@wldhx.me"; + github = "wldhx"; + githubId = 15619766; + name = "wldhx"; + }; wmertens = { email = "Wout.Mertens@gmail.com"; github = "wmertens"; diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index fb90e62769f..ac9f22d23fb 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -6,7 +6,7 @@ basexx,,,,, binaryheap,,,,,vcunat bit32,,,,lua5_1,lblasc busted,,,,, -cassowary,,,,,marsam +cassowary,,,,,marsam alerque cjson,lua-cjson,,,, compat53,,,,,vcunat cosmo,,,,,marsam diff --git a/maintainers/scripts/nix-generate-from-cpan.nix b/maintainers/scripts/nix-generate-from-cpan.nix index 5c4cf0f6c55..411e0d77feb 100644 --- a/maintainers/scripts/nix-generate-from-cpan.nix +++ b/maintainers/scripts/nix-generate-from-cpan.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, perl, perlPackages }: +{ stdenv, lib, makeWrapper, perl, perlPackages }: stdenv.mkDerivation { name = "nix-generate-from-cpan-3"; @@ -18,8 +18,8 @@ stdenv.mkDerivation { ''; meta = { - maintainers = with stdenv.lib.maintainers; [ eelco rycee ]; + maintainers = with lib.maintainers; [ eelco rycee ]; description = "Utility to generate a Nix expression for a Perl package from CPAN"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/maintainers/scripts/nixpkgs-lint.nix b/maintainers/scripts/nixpkgs-lint.nix index 6d99c94bf33..b0267281b38 100644 --- a/maintainers/scripts/nixpkgs-lint.nix +++ b/maintainers/scripts/nixpkgs-lint.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, perl, perlPackages }: +{ stdenv, lib, makeWrapper, perl, perlPackages }: stdenv.mkDerivation { name = "nixpkgs-lint-1"; @@ -15,9 +15,9 @@ stdenv.mkDerivation { wrapProgram $out/bin/nixpkgs-lint --set PERL5LIB $PERL5LIB ''; - meta = { - maintainers = [ stdenv.lib.maintainers.eelco ]; + meta = with lib; { + maintainers = [ maintainers.eelco ]; description = "A utility for Nixpkgs contributors to check Nixpkgs for common errors"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; }; } diff --git a/maintainers/scripts/update-luarocks-packages b/maintainers/scripts/update-luarocks-packages index 5c42080745e..da4d224bd33 100755 --- a/maintainers/scripts/update-luarocks-packages +++ b/maintainers/scripts/update-luarocks-packages @@ -66,7 +66,7 @@ nixpkgs$ ${0} ${GENERATED_NIXFILE} These packages are manually refined in lua-overrides.nix */ -{ self, stdenv, fetchurl, fetchgit, pkgs, ... } @ args: +{ self, stdenv, lib, fetchurl, fetchgit, pkgs, ... } @ args: self: super: with self; { diff --git a/nixos/doc/manual/configuration/linux-kernel.xml b/nixos/doc/manual/configuration/linux-kernel.xml index dbdcc941495..529ac1b1cd4 100644 --- a/nixos/doc/manual/configuration/linux-kernel.xml +++ b/nixos/doc/manual/configuration/linux-kernel.xml @@ -87,7 +87,7 @@ nixpkgs.config.packageOverrides = pkgs: You can edit the config with this snippet (by default <command>make menuconfig</command> won't work out of the box on nixos): <screen><![CDATA[ - nix-shell -E 'with import <nixpkgs> {}; kernelToOverride.overrideAttrs (o: {nativeBuildInputs=o.nativeBuildInputs ++ [ pkgconfig ncurses ];})' + nix-shell -E 'with import <nixpkgs> {}; kernelToOverride.overrideAttrs (o: {nativeBuildInputs=o.nativeBuildInputs ++ [ pkg-config ncurses ];})' ]]></screen> or you can let nixpkgs generate the configuration. Nixpkgs generates it via answering the interactive kernel utility <command>make config</command>. The diff --git a/nixos/doc/manual/configuration/profiles/qemu-guest.xml b/nixos/doc/manual/configuration/profiles/qemu-guest.xml index 5d055c45d2d..3ed97b94b51 100644 --- a/nixos/doc/manual/configuration/profiles/qemu-guest.xml +++ b/nixos/doc/manual/configuration/profiles/qemu-guest.xml @@ -11,8 +11,7 @@ </para> <para> - It makes virtio modules available on the initrd, sets the system time from - the hardware clock to work around a bug in qemu-kvm, and - <link linkend="opt-security.rngd.enable">enables rngd</link>. + It makes virtio modules available on the initrd and sets the system time from + the hardware clock to work around a bug in qemu-kvm. </para> </section> diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml index b33f6cf82b5..dd879702d7d 100644 --- a/nixos/doc/manual/configuration/x-windows.xml +++ b/nixos/doc/manual/configuration/x-windows.xml @@ -186,7 +186,7 @@ The driver has many options (see <xref linkend="ch-options"/>). For instance, the following disables tap-to-click behavior: <programlisting> -<xref linkend="opt-services.xserver.libinput.tapping"/> = false; +<xref linkend="opt-services.xserver.libinput.touchpad.tapping"/> = false; </programlisting> Note: the use of <literal>services.xserver.synaptics</literal> is deprecated since NixOS 17.09. diff --git a/nixos/doc/manual/contributing-to-this-manual.xml b/nixos/doc/manual/contributing-to-this-manual.xml index 935dd66bc14..137e04bb313 100644 --- a/nixos/doc/manual/contributing-to-this-manual.xml +++ b/nixos/doc/manual/contributing-to-this-manual.xml @@ -1,7 +1,7 @@ <chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="chap-contributing"> - <title>Contributing to this documentation</title> + <title>Contributing to this manual</title> <para> The DocBook sources of NixOS' manual are in the <filename xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/doc/manual"> diff --git a/nixos/doc/manual/preface.xml b/nixos/doc/manual/preface.xml index 6ac9ae7e786..0f7db6ef1a8 100644 --- a/nixos/doc/manual/preface.xml +++ b/nixos/doc/manual/preface.xml @@ -21,7 +21,11 @@ xlink:href="https://discourse.nixos.org">Discourse</literal> or on the <link xlink:href="irc://irc.freenode.net/#nixos"> - <literal>#nixos</literal> channel on Freenode</link>. Bugs should be + <literal>#nixos</literal> channel on Freenode</link>, or + consider + <link + xlink:href="#chap-contributing"> + contributing to this manual</link>. Bugs should be reported in <link xlink:href="https://github.com/NixOS/nixpkgs/issues">NixOS’ diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml index 2331375c2c2..4206f44f6c7 100644 --- a/nixos/doc/manual/release-notes/rl-2003.xml +++ b/nixos/doc/manual/release-notes/rl-2003.xml @@ -45,6 +45,15 @@ </listitem> <listitem> <para> + Grub is updated to 2.04, adding support for booting from F2FS filesystems and + Btrfs volumes using zstd compression. Note that some users have been unable +to boot after upgrading to 2.04 - for more information, please see <link +xlink:href="https://github.com/NixOS/nixpkgs/issues/61718#issuecomment-617618503">this + discussion</link>. + </para> + </listitem> + <listitem> + <para> Postgresql for NixOS service now defaults to v11. </para> </listitem> diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml index e46d1ca403f..f33b4ef919f 100644 --- a/nixos/doc/manual/release-notes/rl-2103.xml +++ b/nixos/doc/manual/release-notes/rl-2103.xml @@ -420,6 +420,26 @@ http://some.json-exporter.host:7979/probe?target=https://example.com/some/json/e </listitem> <listitem> <para> + The attribute <varname>mpi</varname> is now consistently used to + provide a default, system-wide MPI implementation. + The default implementation is openmpi, which has been used before by + all derivations affects by this change. + Note that all packages that have used <varname>mpi ? null</varname> in the input + for optional MPI builds, have been changed to the boolean input paramater + <varname>useMpi</varname> to enable building with MPI. + + Building all packages with <varname>mpich</varname> instead + of the default <varname>openmpi</varname> can now be achived like this: + <programlisting> +self: super: +{ + mpi = super.mpich; +} + </programlisting> + </para> + </listitem> + <listitem> + <para> The Searx module has been updated with the ability to configure the service declaratively and uWSGI integration. The option <literal>services.searx.configFile</literal> has been renamed @@ -430,6 +450,22 @@ http://some.json-exporter.host:7979/probe?target=https://example.com/some/json/e dynamically allocated uid. </para> </listitem> + <listitem> + <para> + The libinput module has been updated with the ability to configure mouse and touchpad settings separately. + The options in <literal>services.xserver.libinput</literal> have been renamed to <literal>services.xserver.libinput.touchpad</literal>, + while there is a new <literal>services.xserver.libinput.mouse</literal> for mouse related configuration. + </para> + <para> + Since touchpad options no longer apply to all devices, you may want to replicate your touchpad configuration in + mouse section. + </para> + </listitem> + <listitem> + <para> + ALSA OSS emulation (<varname>sound.enableOSSEmulation</varname>) is now disabled by default. + </para> + </listitem> </itemizedlist> </section> @@ -443,6 +479,14 @@ http://some.json-exporter.host:7979/probe?target=https://example.com/some/json/e <itemizedlist> <listitem> <para> + <literal>stdenv.lib</literal> has been deprecated and will break + eval in 21.11. Please use <literal>pkgs.lib</literal> instead. + See <link xlink:href="https://github.com/NixOS/nixpkgs/issues/108938">#108938</link> + for details. + </para> + </listitem> + <listitem> + <para> The Mailman NixOS module (<literal>services.mailman</literal>) has a new option <xref linkend="opt-services.mailman.enablePostfix" />, defaulting to true, that controls integration with Postfix. @@ -576,6 +620,15 @@ http://some.json-exporter.host:7979/probe?target=https://example.com/some/json/e </listitem> <listitem> <para> + In the ACME module, the data used to build the hash for the account + directory has changed to accomodate new features to reduce account + rate limit issues. This will trigger new account creation on the first + rebuild following this update. No issues are expected to arise from this, + thanks to the new account creation handling. + </para> + </listitem> + <listitem> + <para> <xref linkend="opt-users.users._name_.createHome" /> now always ensures home directory permissions to be <literal>0700</literal>. Permissions had previously been ignored for already existing home directories, possibly leaving them readable by others. The option's description was incorrect regarding ownership management and has been simplified greatly. @@ -592,6 +645,27 @@ http://some.json-exporter.host:7979/probe?target=https://example.com/some/json/e <literal>/etc/netgroup</literal> defines network-wide groups and may affect to setups using NIS. </para> </listitem> + <listitem> + <para> + Platforms, like <varname>stdenv.hostPlatform</varname>, no longer have a <varname>platform</varname> attribute. + It has been (mostly) flattoned away: + </para> + <itemizedlist> + <listitem><para><varname>platform.gcc</varname> is now <varname>gcc</varname></para></listitem> + <listitem><para><literal>platform.kernel*</literal> is now <literal>linux-kernel.*</literal></para></listitem> + </itemizedlist> + <para> + Additionally, <varname>platform.kernelArch</varname> moved to the top level as <varname>linuxArch</varname> to match the other <literal>*Arch</literal> variables. + </para> + <para> + The <varname>platform</varname> grouping of these things never meant anything, and was just a historial/implementation artifact that was overdue removal. + </para> + </listitem> + <listitem> + <para> + <varname>services.restic</varname> now uses a dedicated cache directory for every backup defined in <varname>services.restic.backups</varname>. The old global cache directory, <literal>/root/.cache/restic</literal>, is now unused and can be removed to free up disk space. + </para> + </listitem> </itemizedlist> </section> </section> diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index 3f50bb431c5..023d0791a5c 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -257,7 +257,8 @@ let format' = format; in let ''} echo "copying staging root to image..." - cptofs -p ${optionalString (partitionTableType != "none") "-P ${rootPartition}"} -t ${fsType} -i $diskImage $root/* / + cptofs -p ${optionalString (partitionTableType != "none") "-P ${rootPartition}"} -t ${fsType} -i $diskImage $root/* / || + (echo >&2 "ERROR: cptofs failed. diskSize might be too small for closure."; exit 1) ''; in pkgs.vmTools.runInLinuxVM ( pkgs.runCommand name diff --git a/nixos/modules/config/console.nix b/nixos/modules/config/console.nix index ab166760517..1339227f1e0 100644 --- a/nixos/modules/config/console.nix +++ b/nixos/modules/config/console.nix @@ -83,7 +83,7 @@ in packages = mkOption { type = types.listOf types.package; default = with pkgs.kbdKeymaps; [ dvp neo ]; - defaultText = ''with pkgs.kbdKeymaps; [ dvp neo ]''; + defaultText = "with pkgs.kbdKeymaps; [ dvp neo ]"; description = '' List of additional packages that provide console fonts, keymaps and other resources for virtual consoles use. diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix index 5b681ca5946..6e7b8c4b88a 100644 --- a/nixos/modules/config/fonts/fontconfig.nix +++ b/nixos/modules/config/fonts/fontconfig.nix @@ -436,7 +436,7 @@ in useEmbeddedBitmaps = mkOption { type = types.bool; default = false; - description = ''Use embedded bitmaps in fonts like Calibri.''; + description = "Use embedded bitmaps in fonts like Calibri."; }; }; diff --git a/nixos/modules/config/gnu.nix b/nixos/modules/config/gnu.nix index 93d13097019..255d9741ba7 100644 --- a/nixos/modules/config/gnu.nix +++ b/nixos/modules/config/gnu.nix @@ -1,11 +1,9 @@ { config, lib, pkgs, ... }: -with lib; - { options = { - gnu = mkOption { - type = types.bool; + gnu = lib.mkOption { + type = lib.types.bool; default = false; description = '' When enabled, GNU software is chosen by default whenever a there is @@ -15,7 +13,7 @@ with lib; }; }; - config = mkIf config.gnu { + config = lib.mkIf config.gnu { environment.systemPackages = with pkgs; # TODO: Adjust `requiredPackages' from `system-path.nix'. @@ -26,7 +24,7 @@ with lib; nano zile texinfo # for the stand-alone Info reader ] - ++ stdenv.lib.optional (!stdenv.isAarch32) grub2; + ++ lib.optional (!stdenv.isAarch32) grub2; # GNU GRUB, where available. diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix index feb76581a72..991b449d80b 100644 --- a/nixos/modules/config/i18n.nix +++ b/nixos/modules/config/i18n.nix @@ -84,7 +84,7 @@ with lib; environment.etc."locale.conf".source = pkgs.writeText "locale.conf" '' LANG=${config.i18n.defaultLocale} - ${concatStringsSep "\n" (mapAttrsToList (n: v: ''${n}=${v}'') config.i18n.extraLocaleSettings)} + ${concatStringsSep "\n" (mapAttrsToList (n: v: "${n}=${v}") config.i18n.extraLocaleSettings)} ''; }; diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix index c09588834cf..dba8977e482 100644 --- a/nixos/modules/config/networking.nix +++ b/nixos/modules/config/networking.nix @@ -58,6 +58,7 @@ in "2.nixos.pool.ntp.org" "3.nixos.pool.ntp.org" ]; + type = types.listOf types.str; description = '' The set of NTP servers from which to synchronise. ''; @@ -194,8 +195,7 @@ in ''; # /etc/netgroup: Network-wide groups. - netgroup.text = mkDefault '' - ''; + netgroup.text = mkDefault ""; # /etc/host.conf: resolver configuration file "host.conf".text = '' diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index a77524d75d8..c0e90a8c26e 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -183,7 +183,7 @@ in { config = mkOption { type = types.attrsOf types.unspecified; default = {}; - description = ''Config of the pulse daemon. See <literal>man pulse-daemon.conf</literal>.''; + description = "Config of the pulse daemon. See <literal>man pulse-daemon.conf</literal>."; example = literalExample ''{ realtime-scheduling = "yes"; }''; }; }; diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index e90a7d567d4..5b3e9a8ceb7 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -364,7 +364,7 @@ let count = mkOption { type = types.int; default = 1; - description = ''Count of subordinate user ids''; + description = "Count of subordinate user ids"; }; }; }; @@ -381,7 +381,7 @@ let count = mkOption { type = types.int; default = 1; - description = ''Count of subordinate group ids''; + description = "Count of subordinate group ids"; }; }; }; diff --git a/nixos/modules/config/xdg/portal.nix b/nixos/modules/config/xdg/portal.nix index 3c7cd729c60..80ec3126ca5 100644 --- a/nixos/modules/config/xdg/portal.nix +++ b/nixos/modules/config/xdg/portal.nix @@ -62,7 +62,7 @@ with lib; services.dbus.packages = packages; systemd.packages = packages; - environment.variables = { + environment.sessionVariables = { GTK_USE_PORTAL = mkIf cfg.gtkUsePortal "1"; XDG_DESKTOP_PORTAL_DIR = "${joinedPortals}/share/xdg-desktop-portal/portals"; }; diff --git a/nixos/modules/hardware/device-tree.nix b/nixos/modules/hardware/device-tree.nix index e0ab37bca63..4aa1d6369d1 100644 --- a/nixos/modules/hardware/device-tree.nix +++ b/nixos/modules/hardware/device-tree.nix @@ -68,11 +68,11 @@ let patchShebangs scripts/* substituteInPlace scripts/Makefile.lib \ --replace 'DTC_FLAGS += $(DTC_FLAGS_$(basetarget))' 'DTC_FLAGS += $(DTC_FLAGS_$(basetarget)) -@' - make ${pkgs.stdenv.hostPlatform.platform.kernelBaseConfig} ARCH="${pkgs.stdenv.hostPlatform.platform.kernelArch}" - make dtbs ARCH="${pkgs.stdenv.hostPlatform.platform.kernelArch}" + make ${pkgs.stdenv.hostPlatform.linux-kernel.baseConfig} ARCH="${pkgs.stdenv.hostPlatform.linuxArch}" + make dtbs ARCH="${pkgs.stdenv.hostPlatform.linuxArch}" ''; installPhase = '' - make dtbs_install INSTALL_DTBS_PATH=$out/dtbs ARCH="${pkgs.stdenv.hostPlatform.platform.kernelArch}" + make dtbs_install INSTALL_DTBS_PATH=$out/dtbs ARCH="${pkgs.stdenv.hostPlatform.linuxArch}" ''; }; @@ -115,7 +115,7 @@ in options = { hardware.deviceTree = { enable = mkOption { - default = pkgs.stdenv.hostPlatform.platform.kernelDTB or false; + default = pkgs.stdenv.hostPlatform.linux-kernel.DTB or false; type = types.bool; description = '' Build device tree files. These are used to describe the diff --git a/nixos/modules/hardware/network/ath-user-regd.nix b/nixos/modules/hardware/network/ath-user-regd.nix new file mode 100644 index 00000000000..b5ade5ed501 --- /dev/null +++ b/nixos/modules/hardware/network/ath-user-regd.nix @@ -0,0 +1,31 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + kernelVersion = config.boot.kernelPackages.kernel.version; + linuxKernelMinVersion = "5.8"; + kernelPatch = pkgs.kernelPatches.ath_regd_optional // { + extraConfig = '' + ATH_USER_REGD y + ''; + }; +in +{ + options.networking.wireless.athUserRegulatoryDomain = mkOption { + default = false; + type = types.bool; + description = '' + If enabled, sets the ATH_USER_REGD kernel config switch to true to + disable the enforcement of EEPROM regulatory restrictions for ath + drivers. Requires at least Linux ${linuxKernelMinVersion}. + ''; + }; + + config = mkIf config.networking.wireless.athUserRegulatoryDomain { + assertions = singleton { + assertion = lessThan 0 (builtins.compareVersions kernelVersion linuxKernelMinVersion); + message = "ATH_USER_REGD patch for kernels older than ${linuxKernelMinVersion} not ported yet!"; + }; + boot.kernelPatches = [ kernelPatch ]; + }; +} diff --git a/nixos/modules/hardware/nitrokey.nix b/nixos/modules/hardware/nitrokey.nix index 02e4c3f46f8..baa07203118 100644 --- a/nixos/modules/hardware/nitrokey.nix +++ b/nixos/modules/hardware/nitrokey.nix @@ -19,23 +19,9 @@ in nitrokey-app package, depending on your device and needs. ''; }; - - group = mkOption { - type = types.str; - default = "nitrokey"; - example = "wheel"; - description = '' - Grant access to Nitrokey devices to users in this group. - ''; - }; }; config = mkIf cfg.enable { - services.udev.packages = [ - (pkgs.nitrokey-udev-rules.override (attrs: - { inherit (cfg) group; } - )) - ]; - users.groups.${cfg.group} = {}; + services.udev.packages = [ pkgs.nitrokey-udev-rules ]; }; } diff --git a/nixos/modules/hardware/sensor/hddtemp.nix b/nixos/modules/hardware/sensor/hddtemp.nix new file mode 100644 index 00000000000..df3f75e229a --- /dev/null +++ b/nixos/modules/hardware/sensor/hddtemp.nix @@ -0,0 +1,81 @@ +{ config, lib, pkgs, ... }: +let + inherit (lib) mkIf mkOption types; + + cfg = config.hardware.sensor.hddtemp; + + wrapper = pkgs.writeShellScript "hddtemp-wrapper" '' + set -eEuo pipefail + + file=/var/lib/hddtemp/hddtemp.db + + drives=(${toString (map (e: ''$(realpath ${lib.escapeShellArg e}) '') cfg.drives)}) + + cp ${pkgs.hddtemp}/share/hddtemp/hddtemp.db $file + ${lib.concatMapStringsSep "\n" (e: "echo ${lib.escapeShellArg e} >> $file") cfg.dbEntries} + + exec ${pkgs.hddtemp}/bin/hddtemp ${lib.escapeShellArgs cfg.extraArgs} \ + --daemon \ + --unit=${cfg.unit} \ + --file=$file \ + ''${drives[@]} + ''; + +in +{ + meta.maintainers = with lib.maintainers; [ peterhoeg ]; + + ###### interface + + options = { + hardware.sensor.hddtemp = { + enable = mkOption { + description = '' + Enable this option to support HDD/SSD temperature sensors. + ''; + type = types.bool; + default = false; + }; + + drives = mkOption { + description = "List of drives to monitor. If you pass /dev/disk/by-path/* entries the symlinks will be resolved as hddtemp doesn't like names with colons."; + type = types.listOf types.str; + }; + + unit = mkOption { + description = "Celcius or Fahrenheit"; + type = types.enum [ "C" "F" ]; + default = "C"; + }; + + dbEntries = mkOption { + description = "Additional DB entries"; + type = types.listOf types.str; + default = [ ]; + }; + + extraArgs = mkOption { + description = "Additional arguments passed to the daemon."; + type = types.listOf types.str; + default = [ ]; + }; + }; + }; + + ###### implementation + + config = mkIf cfg.enable { + systemd.services.hddtemp = { + description = "HDD/SSD temperature"; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "forking"; + ExecStart = wrapper; + StateDirectory = "hddtemp"; + PrivateTmp = true; + ProtectHome = "tmpfs"; + ProtectSystem = "strict"; + }; + }; + }; +} diff --git a/nixos/modules/hardware/video/bumblebee.nix b/nixos/modules/hardware/video/bumblebee.nix index 2278c7b4061..b6af4f80445 100644 --- a/nixos/modules/hardware/video/bumblebee.nix +++ b/nixos/modules/hardware/video/bumblebee.nix @@ -40,7 +40,7 @@ in default = "wheel"; example = "video"; type = types.str; - description = ''Group for bumblebee socket''; + description = "Group for bumblebee socket"; }; connectDisplay = mkOption { diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index d1cf7d05c1b..97accc7b99a 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -5,36 +5,17 @@ with lib; let - - drivers = config.services.xserver.videoDrivers; - - # FIXME: should introduce an option like - # ‘hardware.video.nvidia.package’ for overriding the default NVIDIA - # driver. - nvidiaForKernel = kernelPackages: - if elem "nvidia" drivers then - kernelPackages.nvidia_x11 - else if elem "nvidiaBeta" drivers then - kernelPackages.nvidia_x11_beta - else if elem "nvidiaVulkanBeta" drivers then - kernelPackages.nvidia_x11_vulkan_beta - else if elem "nvidiaLegacy304" drivers then - kernelPackages.nvidia_x11_legacy304 - else if elem "nvidiaLegacy340" drivers then - kernelPackages.nvidia_x11_legacy340 - else if elem "nvidiaLegacy390" drivers then - kernelPackages.nvidia_x11_legacy390 - else null; - - nvidia_x11 = nvidiaForKernel config.boot.kernelPackages; - nvidia_libs32 = - if versionOlder nvidia_x11.version "391" then - ((nvidiaForKernel pkgs.pkgsi686Linux.linuxPackages).override { libsOnly = true; kernel = null; }).out - else - (nvidiaForKernel config.boot.kernelPackages).lib32; + nvidia_x11 = let + drivers = config.services.xserver.videoDrivers; + isDeprecated = str: (hasPrefix "nvidia" str) && (str != "nvidia"); + hasDeprecated = drivers: any isDeprecated drivers; + in if (hasDeprecated drivers) then + throw '' + Selecting an nvidia driver has been modified for NixOS 19.03. The version is now set using `hardware.nvidia.package`. + '' + else if (elem "nvidia" drivers) then cfg.package else null; enabled = nvidia_x11 != null; - cfg = config.hardware.nvidia; pCfg = cfg.prime; @@ -63,6 +44,15 @@ in ''; }; + hardware.nvidia.powerManagement.finegrained = mkOption { + type = types.bool; + default = false; + description = '' + Experimental power management of PRIME offload. For more information, see + the NVIDIA docs, chapter 22. PCI-Express runtime power management. + ''; + }; + hardware.nvidia.modesetting.enable = mkOption { type = types.bool; default = false; @@ -96,6 +86,16 @@ in ''; }; + hardware.nvidia.prime.amdgpuBusId = mkOption { + type = types.str; + default = ""; + example = "PCI:4:0:0"; + description = '' + Bus ID of the AMD APU. You can find it using lspci; for example if lspci + shows the AMD APU at "04:00.0", set this option to "PCI:4:0:0". + ''; + }; + hardware.nvidia.prime.sync.enable = mkOption { type = types.bool; default = false; @@ -151,9 +151,22 @@ in GPUs stay awake even during headless mode. ''; }; + + hardware.nvidia.package = lib.mkOption { + type = lib.types.package; + default = config.boot.kernelPackages.nvidiaPackages.stable; + defaultText = "config.boot.kernelPackages.nvidiaPackages.stable"; + description = '' + The NVIDIA X11 derivation to use. + ''; + example = "config.boot.kernelPackages.nvidiaPackages.legacy340"; + }; }; - config = mkIf enabled { + config = let + igpuDriver = if pCfg.intelBusId != "" then "modesetting" else "amdgpu"; + igpuBusId = if pCfg.intelBusId != "" then pCfg.intelBusId else pCfg.amdgpuBusId; + in mkIf enabled { assertions = [ { assertion = with config.services.xserver.displayManager; gdm.nvidiaWayland -> cfg.modesetting.enable; @@ -161,7 +174,13 @@ in } { - assertion = primeEnabled -> pCfg.nvidiaBusId != "" && pCfg.intelBusId != ""; + assertion = primeEnabled -> pCfg.intelBusId == "" || pCfg.amdgpuBusId == ""; + message = '' + You cannot configure both an Intel iGPU and an AMD APU. Pick the one corresponding to your processor. + ''; + } + { + assertion = primeEnabled -> pCfg.nvidiaBusId != "" && (pCfg.intelBusId != "" || pCfg.amdgpuBusId != ""); message = '' When NVIDIA PRIME is enabled, the GPU bus IDs must configured. ''; @@ -174,6 +193,14 @@ in assertion = !(syncCfg.enable && offloadCfg.enable); message = "Only one NVIDIA PRIME solution may be used at a time."; } + { + assertion = !(syncCfg.enable && cfg.powerManagement.finegrained); + message = "Sync precludes powering down the NVIDIA GPU."; + } + { + assertion = cfg.powerManagement.enable -> offloadCfg.enable; + message = "Fine-grained power management requires offload to be enabled."; + } ]; # If Optimus/PRIME is enabled, we: @@ -183,18 +210,22 @@ in # "nvidia" driver, in order to allow the X server to start without any outputs. # - Add a separate Device section for the Intel GPU, using the "modesetting" # driver and with the configured BusID. + # - OR add a separate Device section for the AMD APU, using the "amdgpu" + # driver and with the configures BusID. # - Reference that Device section from the ServerLayout section as an inactive # device. # - Configure the display manager to run specific `xrandr` commands which will - # configure/enable displays connected to the Intel GPU. + # configure/enable displays connected to the Intel iGPU / AMD APU. services.xserver.useGlamor = mkDefault offloadCfg.enable; - services.xserver.drivers = optional primeEnabled { - name = "modesetting"; + services.xserver.drivers = let + in optional primeEnabled { + name = igpuDriver; display = offloadCfg.enable; + modules = optional (igpuDriver == "amdgpu") [ pkgs.xorg.xf86videoamdgpu ]; deviceSection = '' - BusID "${pCfg.intelBusId}" + BusID "${igpuBusId}" ${optionalString syncCfg.enable ''Option "AccelMethod" "none"''} ''; } ++ singleton { @@ -205,6 +236,7 @@ in '' BusID "${pCfg.nvidiaBusId}" ${optionalString syncCfg.allowExternalGpu "Option \"AllowExternalGpus\""} + ${optionalString cfg.powerManagement.finegrained "Option \"NVreg_DynamicPowerManagement=0x02\""} ''; screenSection = '' @@ -214,14 +246,14 @@ in }; services.xserver.serverLayoutSection = optionalString syncCfg.enable '' - Inactive "Device-modesetting[0]" + Inactive "Device-${igpuDriver}[0]" '' + optionalString offloadCfg.enable '' Option "AllowNVIDIAGPUScreens" ''; services.xserver.displayManager.setupCommands = optionalString syncCfg.enable '' # Added by nvidia configuration module for Optimus/PRIME. - ${pkgs.xorg.xrandr}/bin/xrandr --setprovideroutputsource modesetting NVIDIA-0 + ${pkgs.xorg.xrandr}/bin/xrandr --setprovideroutputsource ${igpuDriver} NVIDIA-0 ${pkgs.xorg.xrandr}/bin/xrandr --auto ''; @@ -230,9 +262,9 @@ in }; hardware.opengl.package = mkIf (!offloadCfg.enable) nvidia_x11.out; - hardware.opengl.package32 = mkIf (!offloadCfg.enable) nvidia_libs32; + hardware.opengl.package32 = mkIf (!offloadCfg.enable) nvidia_x11.lib32; hardware.opengl.extraPackages = optional offloadCfg.enable nvidia_x11.out; - hardware.opengl.extraPackages32 = optional offloadCfg.enable nvidia_libs32; + hardware.opengl.extraPackages32 = optional offloadCfg.enable nvidia_x11.lib32; environment.systemPackages = [ nvidia_x11.bin nvidia_x11.settings ] ++ optionals nvidiaPersistencedEnabled [ nvidia_x11.persistenced ]; @@ -292,16 +324,37 @@ in boot.kernelParams = optional (offloadCfg.enable || cfg.modesetting.enable) "nvidia-drm.modeset=1" ++ optional cfg.powerManagement.enable "nvidia.NVreg_PreserveVideoMemoryAllocations=1"; - # Create /dev/nvidia-uvm when the nvidia-uvm module is loaded. services.udev.extraRules = '' + # Create /dev/nvidia-uvm when the nvidia-uvm module is loaded. KERNEL=="nvidia", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidiactl c $$(grep nvidia-frontend /proc/devices | cut -d \ -f 1) 255'" KERNEL=="nvidia_modeset", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-modeset c $$(grep nvidia-frontend /proc/devices | cut -d \ -f 1) 254'" KERNEL=="card*", SUBSYSTEM=="drm", DRIVERS=="nvidia", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia%n c $$(grep nvidia-frontend /proc/devices | cut -d \ -f 1) %n'" KERNEL=="nvidia_uvm", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-uvm c $$(grep nvidia-uvm /proc/devices | cut -d \ -f 1) 0'" KERNEL=="nvidia_uvm", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-uvm-tools c $$(grep nvidia-uvm /proc/devices | cut -d \ -f 1) 0'" + '' + optionalString cfg.powerManagement.finegrained '' + # Remove NVIDIA USB xHCI Host Controller devices, if present + ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x0c0330", ATTR{remove}="1" + + # Remove NVIDIA USB Type-C UCSI devices, if present + ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x0c8000", ATTR{remove}="1" + + # Remove NVIDIA Audio devices, if present + ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x040300", ATTR{remove}="1" + + # Enable runtime PM for NVIDIA VGA/3D controller devices on driver bind + ACTION=="bind", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x030000", TEST=="power/control", ATTR{power/control}="auto" + ACTION=="bind", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x030200", TEST=="power/control", ATTR{power/control}="auto" + + # Disable runtime PM for NVIDIA VGA/3D controller devices on driver unbind + ACTION=="unbind", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x030000", TEST=="power/control", ATTR{power/control}="on" + ACTION=="unbind", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x030200", TEST=="power/control", ATTR{power/control}="on" ''; + boot.extraModprobeConfig = mkIf cfg.powerManagement.finegrained '' + options nvidia "NVreg_DynamicPowerManagement=0x02" + ''; + boot.blacklistedKernelModules = [ "nouveau" "nvidiafb" ]; services.acpid.enable = true; diff --git a/nixos/modules/i18n/input-method/default.nix b/nixos/modules/i18n/input-method/default.nix index 2e7cfaab7b7..4649f9b862a 100644 --- a/nixos/modules/i18n/input-method/default.nix +++ b/nixos/modules/i18n/input-method/default.nix @@ -42,6 +42,7 @@ in <itemizedlist> <listitem><para>ibus: The intelligent input bus, extra input engines can be added using <literal>i18n.inputMethod.ibus.engines</literal>.</para></listitem> <listitem><para>fcitx: A customizable lightweight input method, extra input engines can be added using <literal>i18n.inputMethod.fcitx.engines</literal>.</para></listitem> + <listitem><para>fcitx5: The next generation of fcitx, addons (including engines, dictionaries, skins) can be added using <literal>i18n.inputMethod.fcitx5.addons</literal>.</para></listitem> <listitem><para>nabi: A Korean input method based on XIM. Nabi doesn't support Qt 5.</para></listitem> <listitem><para>uim: The universal input method, is a library with a XIM bridge. uim mainly support Chinese, Japanese and Korean.</para></listitem> <listitem><para>hime: An extremely easy-to-use input method framework.</para></listitem> diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index 43d20a556f8..1418420afcd 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -425,7 +425,12 @@ in }; isoImage.squashfsCompression = mkOption { - default = "xz -Xdict-size 100%"; + default = with pkgs.stdenv.targetPlatform; "xz -Xdict-size 100% " + + lib.optionalString (isx86_32 || isx86_64) "-Xbcj x86" + # Untested but should also reduce size for these platforms + + lib.optionalString (isAarch32 || isAarch64) "-Xbcj arm" + + lib.optionalString (isPowerPC) "-Xbcj powerpc" + + lib.optionalString (isSparc) "-Xbcj sparc"; description = '' Compression settings to use for the squashfs nix store. ''; diff --git a/nixos/modules/installer/netboot/netboot.nix b/nixos/modules/installer/netboot/netboot.nix index 95eba86bcb6..fa074fdfcc6 100644 --- a/nixos/modules/installer/netboot/netboot.nix +++ b/nixos/modules/installer/netboot/netboot.nix @@ -88,7 +88,7 @@ with lib; system.build.netbootIpxeScript = pkgs.writeTextDir "netboot.ipxe" '' #!ipxe - kernel ${pkgs.stdenv.hostPlatform.platform.kernelTarget} init=${config.system.build.toplevel}/init initrd=initrd ${toString config.boot.kernelParams} + kernel ${pkgs.stdenv.hostPlatform.linux-kernel.target} init=${config.system.build.toplevel}/init initrd=initrd ${toString config.boot.kernelParams} initrd initrd boot ''; diff --git a/nixos/modules/installer/tools/nixos-option/default.nix b/nixos/modules/installer/tools/nixos-option/default.nix index 753fd92c7bb..72eec3a3836 100644 --- a/nixos/modules/installer/tools/nixos-option/default.nix +++ b/nixos/modules/installer/tools/nixos-option/default.nix @@ -1,11 +1,11 @@ -{lib, stdenv, boost, cmake, pkgconfig, nix, ... }: +{lib, stdenv, boost, cmake, pkg-config, nix, ... }: stdenv.mkDerivation rec { name = "nixos-option"; src = ./.; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ boost nix ]; - meta = { - license = stdenv.lib.licenses.lgpl2Plus; - maintainers = with lib.maintainers; [ chkno ]; + meta = with lib; { + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ chkno ]; }; } diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index 0582812f92d..ada5f574856 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -28,17 +28,7 @@ let ]; }; - nixos-rebuild = - let fallback = import ./nix-fallback-paths.nix; in - makeProg { - name = "nixos-rebuild"; - src = ./nixos-rebuild.sh; - inherit (pkgs) runtimeShell; - nix = config.nix.package.out; - nix_x86_64_linux = fallback.x86_64-linux; - nix_i686_linux = fallback.i686-linux; - path = makeBinPath [ pkgs.jq ]; - }; + nixos-rebuild = pkgs.nixos-rebuild.override { nix = config.nix.package.out; }; nixos-generate-config = makeProg { name = "nixos-generate-config"; diff --git a/nixos/modules/misc/crashdump.nix b/nixos/modules/misc/crashdump.nix index 3c47e79d051..11dec37b3fa 100644 --- a/nixos/modules/misc/crashdump.nix +++ b/nixos/modules/misc/crashdump.nix @@ -26,6 +26,7 @@ in }; reservedMemory = mkOption { default = "128M"; + type = types.str; description = '' The amount of memory reserved for the crashdump kernel. If you choose a too high value, dmesg will mention diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index feb9c68301d..a0f5ce72f33 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -71,7 +71,7 @@ in #utmp = 29; # unused # ddclient = 30; # converted to DynamicUser = true davfs2 = 31; - #disnix = 33; # unused + #disnix = 33; # module removed osgi = 34; tor = 35; cups = 36; @@ -387,7 +387,7 @@ in utmp = 29; # ddclient = 30; # converted to DynamicUser = true davfs2 = 31; - disnix = 33; + #disnix = 33; # module removed osgi = 34; tor = 35; #cups = 36; # unused diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix index 426281c9412..1d2bc8c7281 100644 --- a/nixos/modules/misc/locate.nix +++ b/nixos/modules/misc/locate.nix @@ -215,7 +215,7 @@ in { '' else '' exec ${cfg.locate}/bin/updatedb \ - ${optionalString (cfg.localuser != null && ! isMLocate) ''--localuser=${cfg.localuser}''} \ + ${optionalString (cfg.localuser != null && ! isMLocate) "--localuser=${cfg.localuser}"} \ --output=${toString cfg.output} ${concatStringsSep " " cfg.extraFlags} ''; environment = optionalAttrs (!isMLocate) { diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index 25ac94b8e0f..8160bfef4a3 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -73,7 +73,7 @@ in } ''; type = pkgsType; - example = literalExample ''import <nixpkgs> {}''; + example = literalExample "import <nixpkgs> {}"; description = '' If set, the pkgs argument to all NixOS modules is the value of this option, extended with <code>nixpkgs.overlays</code>, if diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 953aeda568f..0d26b7300d0 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -46,12 +46,14 @@ ./hardware/cpu/intel-microcode.nix ./hardware/digitalbitbox.nix ./hardware/device-tree.nix + ./hardware/sensor/hddtemp.nix ./hardware/sensor/iio.nix ./hardware/keyboard/zsa.nix ./hardware/ksm.nix ./hardware/ledger.nix ./hardware/logitech.nix ./hardware/mcelog.nix + ./hardware/network/ath-user-regd.nix ./hardware/network/b43.nix ./hardware/network/intel-2200bg.nix ./hardware/nitrokey.nix @@ -169,6 +171,7 @@ ./programs/sway.nix ./programs/system-config-printer.nix ./programs/thefuck.nix + ./programs/tilp2.nix ./programs/tmux.nix ./programs/traceroute.nix ./programs/tsm-client.nix @@ -348,6 +351,7 @@ ./services/editors/emacs.nix ./services/editors/infinoted.nix ./services/games/factorio.nix + ./services/games/freeciv.nix ./services/games/minecraft-server.nix ./services/games/minetest-server.nix ./services/games/openarena.nix @@ -448,8 +452,6 @@ ./services/misc/devmon.nix ./services/misc/dictd.nix ./services/misc/dwm-status.nix - ./services/misc/dysnomia.nix - ./services/misc/disnix.nix ./services/misc/docker-registry.nix ./services/misc/domoticz.nix ./services/misc/errbot.nix @@ -608,6 +610,8 @@ ./services/networking/atftpd.nix ./services/networking/avahi-daemon.nix ./services/networking/babeld.nix + ./services/networking/bee.nix + ./services/networking/bee-clef.nix ./services/networking/biboumi.nix ./services/networking/bind.nix ./services/networking/bitcoind.nix @@ -633,6 +637,7 @@ ./services/networking/dnsdist.nix ./services/networking/dnsmasq.nix ./services/networking/ncdns.nix + ./services/networking/nomad.nix ./services/networking/ejabberd.nix ./services/networking/epmd.nix ./services/networking/ergo.nix @@ -724,6 +729,7 @@ ./services/networking/owamp.nix ./services/networking/pdnsd.nix ./services/networking/pixiecore.nix + ./services/networking/pleroma.nix ./services/networking/polipo.nix ./services/networking/powerdns.nix ./services/networking/pdns-recursor.nix @@ -870,10 +876,12 @@ ./services/web-apps/documize.nix ./services/web-apps/dokuwiki.nix ./services/web-apps/engelsystem.nix + ./services/web-apps/galene.nix ./services/web-apps/gerrit.nix ./services/web-apps/gotify-server.nix ./services/web-apps/grocy.nix ./services/web-apps/hedgedoc.nix + ./services/web-apps/hledger-web.nix ./services/web-apps/icingaweb2/icingaweb2.nix ./services/web-apps/icingaweb2/module-monitoring.nix ./services/web-apps/ihatemoney @@ -956,6 +964,7 @@ ./services/x11/urxvtd.nix ./services/x11/window-managers/awesome.nix ./services/x11/window-managers/default.nix + ./services/x11/window-managers/clfswm.nix ./services/x11/window-managers/fluxbox.nix ./services/x11/window-managers/icewm.nix ./services/x11/window-managers/bspwm.nix diff --git a/nixos/modules/profiles/all-hardware.nix b/nixos/modules/profiles/all-hardware.nix index 19f821ae17f..d460c52dbef 100644 --- a/nixos/modules/profiles/all-hardware.nix +++ b/nixos/modules/profiles/all-hardware.nix @@ -3,8 +3,10 @@ # enabled in the initrd. Its primary use is in the NixOS installation # CDs. -{ ... }: - +{ pkgs, lib,... }: +let + platform = pkgs.stdenv.hostPlatform; +in { # The initrd has to contain any module that might be necessary for @@ -42,7 +44,10 @@ "virtio_net" "virtio_pci" "virtio_blk" "virtio_scsi" "virtio_balloon" "virtio_console" # VMware support. - "mptspi" "vmw_balloon" "vmwgfx" "vmw_vmci" "vmw_vsock_vmci_transport" "vmxnet3" "vsock" + "mptspi" "vmxnet3" "vsock" + ] ++ lib.optional platform.isx86 "vmw_balloon" + ++ lib.optionals (!platform.isAarch64) [ # not sure where else they're missing + "vmw_vmci" "vmwgfx" "vmw_vsock_vmci_transport" # Hyper-V support. "hv_storvsc" diff --git a/nixos/modules/profiles/qemu-guest.nix b/nixos/modules/profiles/qemu-guest.nix index 0ea70107f71..d4335edfcf2 100644 --- a/nixos/modules/profiles/qemu-guest.nix +++ b/nixos/modules/profiles/qemu-guest.nix @@ -1,7 +1,7 @@ # Common configuration for virtual machines running under QEMU (using # virtio). -{ lib, ... }: +{ ... }: { boot.initrd.availableKernelModules = [ "virtio_net" "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_scsi" "9p" "9pnet_virtio" ]; @@ -14,6 +14,4 @@ # to the *boot time* of the host). hwclock -s ''; - - security.rngd.enable = lib.mkDefault false; } diff --git a/nixos/modules/programs/captive-browser.nix b/nixos/modules/programs/captive-browser.nix index 26db1675072..4d59ea8d0fd 100644 --- a/nixos/modules/programs/captive-browser.nix +++ b/nixos/modules/programs/captive-browser.nix @@ -27,14 +27,14 @@ in # the options below are the same as in "captive-browser.toml" browser = mkOption { type = types.str; - default = concatStringsSep " " [ ''${pkgs.chromium}/bin/chromium'' - ''--user-data-dir=''${XDG_DATA_HOME:-$HOME/.local/share}/chromium-captive'' + default = concatStringsSep " " [ "${pkgs.chromium}/bin/chromium" + "--user-data-dir=\${XDG_DATA_HOME:-$HOME/.local/share}/chromium-captive" ''--proxy-server="socks5://$PROXY"'' ''--host-resolver-rules="MAP * ~NOTFOUND , EXCLUDE localhost"'' - ''--no-first-run'' - ''--new-window'' - ''--incognito'' - ''http://cache.nixos.org/'' + "--no-first-run" + "--new-window" + "--incognito" + "http://cache.nixos.org/" ]; description = '' The shell (/bin/sh) command executed once the proxy starts. @@ -62,7 +62,7 @@ in socks5-addr = mkOption { type = types.str; default = "localhost:1666"; - description = ''the listen address for the SOCKS5 proxy server''; + description = "the listen address for the SOCKS5 proxy server"; }; bindInterface = mkOption { diff --git a/nixos/modules/programs/command-not-found/command-not-found.nix b/nixos/modules/programs/command-not-found/command-not-found.nix index 656c255fcb1..d8394bf73a2 100644 --- a/nixos/modules/programs/command-not-found/command-not-found.nix +++ b/nixos/modules/programs/command-not-found/command-not-found.nix @@ -80,6 +80,8 @@ in # Retry the command if we just installed it. if [ $? = 126 ]; then "$@" + else + return 127 fi else # Indicate than there was an error so ZSH falls back to its default handler diff --git a/nixos/modules/programs/fish.nix b/nixos/modules/programs/fish.nix index 34a0dc6a2df..392f06eb933 100644 --- a/nixos/modules/programs/fish.nix +++ b/nixos/modules/programs/fish.nix @@ -13,6 +13,27 @@ let (filterAttrs (k: v: v != null) cfg.shellAliases) ); + envShellInit = pkgs.writeText "shellInit" cfge.shellInit; + + envLoginShellInit = pkgs.writeText "loginShellInit" cfge.loginShellInit; + + envInteractiveShellInit = pkgs.writeText "interactiveShellInit" cfge.interactiveShellInit; + + sourceEnv = file: + if cfg.useBabelfish then + "source /etc/fish/${file}.fish" + else + '' + set fish_function_path ${pkgs.fishPlugins.foreign-env}/share/fish/vendor_functions.d $fish_function_path + fenv source /etc/fish/foreign-env/${file} > /dev/null + set -e fish_function_path[1] + ''; + + babelfishTranslate = path: name: + pkgs.runCommand "${name}.fish" { + nativeBuildInputs = [ pkgs.babelfish ]; + } "${pkgs.babelfish}/bin/babelfish < ${path} > $out;"; + in { @@ -29,6 +50,15 @@ in type = types.bool; }; + useBabelfish = mkOption { + type = types.bool; + default = false; + description = '' + If enabled, the configured environment will be translated to native fish using <link xlink:href="https://github.com/bouk/babelfish">babelfish</link>. + Otherwise, <link xlink:href="https://github.com/oh-my-fish/plugin-foreign-env">foreign-env</link> will be used. + ''; + }; + vendor.config.enable = mkOption { type = types.bool; default = true; @@ -105,72 +135,152 @@ in # Required for man completions documentation.man.generateCaches = lib.mkDefault true; - environment.etc."fish/foreign-env/shellInit".text = cfge.shellInit; - environment.etc."fish/foreign-env/loginShellInit".text = cfge.loginShellInit; - environment.etc."fish/foreign-env/interactiveShellInit".text = cfge.interactiveShellInit; - - environment.etc."fish/nixos-env-preinit.fish".text = '' - # This happens before $__fish_datadir/config.fish sets fish_function_path, so it is currently - # unset. We set it and then completely erase it, leaving its configuration to $__fish_datadir/config.fish - set fish_function_path ${pkgs.fishPlugins.foreign-env}/share/fish/vendor_functions.d $__fish_datadir/functions - - # source the NixOS environment config - if [ -z "$__NIXOS_SET_ENVIRONMENT_DONE" ] - fenv source ${config.system.build.setEnvironment} - end - - # clear fish_function_path so that it will be correctly set when we return to $__fish_datadir/config.fish - set -e fish_function_path - ''; - - environment.etc."fish/config.fish".text = '' - # /etc/fish/config.fish: DO NOT EDIT -- this file has been generated automatically. - - # if we haven't sourced the general config, do it - if not set -q __fish_nixos_general_config_sourced - set --prepend fish_function_path ${pkgs.fishPlugins.foreign-env}/share/fish/vendor_functions.d - fenv source /etc/fish/foreign-env/shellInit > /dev/null - set -e fish_function_path[1] - - ${cfg.shellInit} - - # and leave a note so we don't source this config section again from - # this very shell (children will source the general config anew) - set -g __fish_nixos_general_config_sourced 1 - end - - # if we haven't sourced the login config, do it - status --is-login; and not set -q __fish_nixos_login_config_sourced - and begin - set --prepend fish_function_path ${pkgs.fishPlugins.foreign-env}/share/fish/vendor_functions.d - fenv source /etc/fish/foreign-env/loginShellInit > /dev/null - set -e fish_function_path[1] - - ${cfg.loginShellInit} - - # and leave a note so we don't source this config section again from - # this very shell (children will source the general config anew) - set -g __fish_nixos_login_config_sourced 1 - end - - # if we haven't sourced the interactive config, do it - status --is-interactive; and not set -q __fish_nixos_interactive_config_sourced - and begin - ${fishAliases} - - set --prepend fish_function_path ${pkgs.fishPlugins.foreign-env}/share/fish/vendor_functions.d - fenv source /etc/fish/foreign-env/interactiveShellInit > /dev/null - set -e fish_function_path[1] - - ${cfg.promptInit} - ${cfg.interactiveShellInit} - - # and leave a note so we don't source this config section again from - # this very shell (children will source the general config anew, - # allowing configuration changes in, e.g, aliases, to propagate) - set -g __fish_nixos_interactive_config_sourced 1 - end - ''; + environment = mkMerge [ + (mkIf cfg.useBabelfish + { + etc."fish/setEnvironment.fish".source = babelfishTranslate config.system.build.setEnvironment "setEnvironment"; + etc."fish/shellInit.fish".source = babelfishTranslate envShellInit "shellInit"; + etc."fish/loginShellInit.fish".source = babelfishTranslate envLoginShellInit "loginShellInit"; + etc."fish/interactiveShellInit.fish".source = babelfishTranslate envInteractiveShellInit "interactiveShellInit"; + }) + + (mkIf (!cfg.useBabelfish) + { + etc."fish/foreign-env/shellInit".source = envShellInit; + etc."fish/foreign-env/loginShellInit".source = envLoginShellInit; + etc."fish/foreign-env/interactiveShellInit".source = envInteractiveShellInit; + }) + + { + etc."fish/nixos-env-preinit.fish".text = + if cfg.useBabelfish + then '' + # source the NixOS environment config + if [ -z "$__NIXOS_SET_ENVIRONMENT_DONE" ] + source /etc/fish/setEnvironment.fish + end + '' + else '' + # This happens before $__fish_datadir/config.fish sets fish_function_path, so it is currently + # unset. We set it and then completely erase it, leaving its configuration to $__fish_datadir/config.fish + set fish_function_path ${pkgs.fishPlugins.foreign-env}/share/fish/vendor_functions.d $__fish_datadir/functions + + # source the NixOS environment config + if [ -z "$__NIXOS_SET_ENVIRONMENT_DONE" ] + fenv source ${config.system.build.setEnvironment} + end + + # clear fish_function_path so that it will be correctly set when we return to $__fish_datadir/config.fish + set -e fish_function_path + ''; + } + + { + etc."fish/config.fish".text = '' + # /etc/fish/config.fish: DO NOT EDIT -- this file has been generated automatically. + + # if we haven't sourced the general config, do it + if not set -q __fish_nixos_general_config_sourced + ${sourceEnv "shellInit"} + + ${cfg.shellInit} + + # and leave a note so we don't source this config section again from + # this very shell (children will source the general config anew) + set -g __fish_nixos_general_config_sourced 1 + end + + # if we haven't sourced the login config, do it + status --is-login; and not set -q __fish_nixos_login_config_sourced + and begin + ${sourceEnv "loginShellInit"} + + ${cfg.loginShellInit} + + # and leave a note so we don't source this config section again from + # this very shell (children will source the general config anew) + set -g __fish_nixos_login_config_sourced 1 + end + + # if we haven't sourced the interactive config, do it + status --is-interactive; and not set -q __fish_nixos_interactive_config_sourced + and begin + ${fishAliases} + + ${sourceEnv "interactiveShellInit"} + + ${cfg.promptInit} + ${cfg.interactiveShellInit} + + # and leave a note so we don't source this config section again from + # this very shell (children will source the general config anew, + # allowing configuration changes in, e.g, aliases, to propagate) + set -g __fish_nixos_interactive_config_sourced 1 + end + ''; + } + + { + etc."fish/generated_completions".source = + let + patchedGenerator = pkgs.stdenv.mkDerivation { + name = "fish_patched-completion-generator"; + srcs = [ + "${pkgs.fish}/share/fish/tools/create_manpage_completions.py" + "${pkgs.fish}/share/fish/tools/deroff.py" + ]; + unpackCmd = "cp $curSrc $(basename $curSrc)"; + sourceRoot = "."; + patches = [ ./fish_completion-generator.patch ]; # to prevent collisions of identical completion files + dontBuild = true; + installPhase = '' + mkdir -p $out + cp * $out/ + ''; + preferLocalBuild = true; + allowSubstitutes = false; + }; + generateCompletions = package: pkgs.runCommand + "${package.name}_fish-completions" + ( + { + inherit package; + preferLocalBuild = true; + allowSubstitutes = false; + } + // optionalAttrs (package ? meta.priority) { meta.priority = package.meta.priority; } + ) + '' + mkdir -p $out + if [ -d $package/share/man ]; then + find $package/share/man -type f | xargs ${pkgs.python3.interpreter} ${patchedGenerator}/create_manpage_completions.py --directory $out >/dev/null + fi + ''; + in + pkgs.buildEnv { + name = "system_fish-completions"; + ignoreCollisions = true; + paths = map generateCompletions config.environment.systemPackages; + }; + } + + # include programs that bring their own completions + { + pathsToLink = [] + ++ optional cfg.vendor.config.enable "/share/fish/vendor_conf.d" + ++ optional cfg.vendor.completions.enable "/share/fish/vendor_completions.d" + ++ optional cfg.vendor.functions.enable "/share/fish/vendor_functions.d"; + } + + { systemPackages = [ pkgs.fish ]; } + + { + shells = [ + "/run/current-system/sw/bin/fish" + "${pkgs.fish}/bin/fish" + ]; + } + ]; programs.fish.interactiveShellInit = '' # add completions generated by NixOS to $fish_complete_path @@ -187,61 +297,6 @@ in end ''; - environment.etc."fish/generated_completions".source = - let - patchedGenerator = pkgs.stdenv.mkDerivation { - name = "fish_patched-completion-generator"; - srcs = [ - "${pkgs.fish}/share/fish/tools/create_manpage_completions.py" - "${pkgs.fish}/share/fish/tools/deroff.py" - ]; - unpackCmd = "cp $curSrc $(basename $curSrc)"; - sourceRoot = "."; - patches = [ ./fish_completion-generator.patch ]; # to prevent collisions of identical completion files - dontBuild = true; - installPhase = '' - mkdir -p $out - cp * $out/ - ''; - preferLocalBuild = true; - allowSubstitutes = false; - }; - generateCompletions = package: pkgs.runCommand - "${package.name}_fish-completions" - ( - { - inherit package; - preferLocalBuild = true; - allowSubstitutes = false; - } - // optionalAttrs (package ? meta.priority) { meta.priority = package.meta.priority; } - ) - '' - mkdir -p $out - if [ -d $package/share/man ]; then - find $package/share/man -type f | xargs ${pkgs.python3.interpreter} ${patchedGenerator}/create_manpage_completions.py --directory $out >/dev/null - fi - ''; - in - pkgs.buildEnv { - name = "system_fish-completions"; - ignoreCollisions = true; - paths = map generateCompletions config.environment.systemPackages; - }; - - # include programs that bring their own completions - environment.pathsToLink = [] - ++ optional cfg.vendor.config.enable "/share/fish/vendor_conf.d" - ++ optional cfg.vendor.completions.enable "/share/fish/vendor_completions.d" - ++ optional cfg.vendor.functions.enable "/share/fish/vendor_functions.d"; - - environment.systemPackages = [ pkgs.fish ]; - - environment.shells = [ - "/run/current-system/sw/bin/fish" - "${pkgs.fish}/bin/fish" - ]; - }; } diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix index 40af4d0ff5a..d4a7769bbd6 100644 --- a/nixos/modules/programs/ssh.nix +++ b/nixos/modules/programs/ssh.nix @@ -36,7 +36,7 @@ in askPassword = mkOption { type = types.str; default = "${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass"; - description = ''Program used by SSH to ask for passwords.''; + description = "Program used by SSH to ask for passwords."; }; forwardX11 = mkOption { diff --git a/nixos/modules/programs/tilp2.nix b/nixos/modules/programs/tilp2.nix new file mode 100644 index 00000000000..da9e32e3e6c --- /dev/null +++ b/nixos/modules/programs/tilp2.nix @@ -0,0 +1,28 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.programs.tilp2; + +in { + options.programs.tilp2 = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Enable tilp2 and udev rules for supported calculators. + ''; + }; + }; + + config = mkIf cfg.enable { + services.udev.packages = [ + pkgs.libticables2 + ]; + + environment.systemPackages = [ + pkgs.tilp2 + ]; + }; +} diff --git a/nixos/modules/programs/xss-lock.nix b/nixos/modules/programs/xss-lock.nix index 83ed7138640..ceb7259b3d7 100644 --- a/nixos/modules/programs/xss-lock.nix +++ b/nixos/modules/programs/xss-lock.nix @@ -11,7 +11,7 @@ in lockerCommand = mkOption { default = "${pkgs.i3lock}/bin/i3lock"; - example = literalExample ''''${pkgs.i3lock-fancy}/bin/i3lock-fancy''; + example = literalExample "\${pkgs.i3lock-fancy}/bin/i3lock-fancy"; type = types.separatedString " "; description = "Locker to be used with xsslock"; }; diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index 8e646ae1567..c33a92580d4 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -7,6 +7,11 @@ let numCerts = length (builtins.attrNames cfg.certs); _24hSecs = 60 * 60 * 24; + # Used to make unique paths for each cert/account config set + mkHash = with builtins; val: substring 0 20 (hashString "sha256" val); + mkAccountHash = acmeServer: data: mkHash "${toString acmeServer} ${data.keyType} ${data.email}"; + accountDirRoot = "/var/lib/acme/.lego/accounts/"; + # There are many services required to make cert renewals work. # They all follow a common structure: # - They inherit this commonServiceConfig @@ -19,7 +24,7 @@ let Type = "oneshot"; User = "acme"; Group = mkDefault "acme"; - UMask = 0027; + UMask = 0023; StateDirectoryMode = 750; ProtectSystem = "full"; PrivateTmp = true; @@ -54,23 +59,35 @@ let ''; }; - # Previously, all certs were owned by whatever user was configured in - # config.security.acme.certs.<cert>.user. Now everything is owned by and - # run by the acme user. - userMigrationService = { - description = "Fix owner and group of all ACME certificates"; - - script = with builtins; concatStringsSep "\n" (mapAttrsToList (cert: data: '' - for fixpath in /var/lib/acme/${escapeShellArg cert} /var/lib/acme/.lego/${escapeShellArg cert}; do + # Ensures that directories which are shared across all certs + # exist and have the correct user and group, since group + # is configurable on a per-cert basis. + userMigrationService = let + script = with builtins; '' + chown -R acme .lego/accounts + '' + (concatStringsSep "\n" (mapAttrsToList (cert: data: '' + for fixpath in ${escapeShellArg cert} .lego/${escapeShellArg cert}; do if [ -d "$fixpath" ]; then chmod -R u=rwX,g=rX,o= "$fixpath" chown -R acme:${data.group} "$fixpath" fi done - '') certConfigs); + '') certConfigs)); + in { + description = "Fix owner and group of all ACME certificates"; - # We don't want this to run every time a renewal happens - serviceConfig.RemainAfterExit = true; + serviceConfig = commonServiceConfig // { + # We don't want this to run every time a renewal happens + RemainAfterExit = true; + + # These StateDirectory entries negate the need for tmpfiles + StateDirectory = [ "acme" "acme/.lego" "acme/.lego/accounts" ]; + StateDirectoryMode = 755; + WorkingDirectory = "/var/lib/acme"; + + # Run the start script as root + ExecStart = "+" + (pkgs.writeShellScript "acme-fixperms" script); + }; }; certToConfig = cert: data: let @@ -101,11 +118,10 @@ let ${toString acmeServer} ${toString data.dnsProvider} ${toString data.ocspMustStaple} ${data.keyType} ''; - mkHash = with builtins; val: substring 0 20 (hashString "sha256" val); certDir = mkHash hashData; domainHash = mkHash "${concatStringsSep " " extraDomains} ${data.domain}"; - othersHash = mkHash "${toString acmeServer} ${data.keyType} ${data.email}"; - accountDir = "/var/lib/acme/.lego/accounts/" + othersHash; + accountHash = (mkAccountHash acmeServer data); + accountDir = accountDirRoot + accountHash; protocolOpts = if useDns then ( [ "--dns" data.dnsProvider ] @@ -142,9 +158,8 @@ let ); in { - inherit accountDir selfsignedDeps; + inherit accountHash cert selfsignedDeps; - webroot = data.webroot; group = data.group; renewTimer = { @@ -184,7 +199,10 @@ let StateDirectory = "acme/${cert}"; - BindPaths = "/var/lib/acme/.minica:/tmp/ca /var/lib/acme/${cert}:/tmp/${keyName}"; + BindPaths = [ + "/var/lib/acme/.minica:/tmp/ca" + "/var/lib/acme/${cert}:/tmp/${keyName}" + ]; }; # Working directory will be /tmp @@ -222,16 +240,22 @@ let serviceConfig = commonServiceConfig // { Group = data.group; - # AccountDir dir will be created by tmpfiles to ensure correct permissions - # And to avoid deletion during systemctl clean - # acme/.lego/${cert} is listed so that it is deleted during systemctl clean - StateDirectory = "acme/${cert} acme/.lego/${cert} acme/.lego/${cert}/${certDir}"; + # Keep in mind that these directories will be deleted if the user runs + # systemctl clean --what=state + # acme/.lego/${cert} is listed for this reason. + StateDirectory = [ + "acme/${cert}" + "acme/.lego/${cert}" + "acme/.lego/${cert}/${certDir}" + "acme/.lego/accounts/${accountHash}" + ]; # Needs to be space separated, but can't use a multiline string because that'll include newlines - BindPaths = - "${accountDir}:/tmp/accounts " + - "/var/lib/acme/${cert}:/tmp/out " + - "/var/lib/acme/.lego/${cert}/${certDir}:/tmp/certificates "; + BindPaths = [ + "${accountDir}:/tmp/accounts" + "/var/lib/acme/${cert}:/tmp/out" + "/var/lib/acme/.lego/${cert}/${certDir}:/tmp/certificates" + ]; # Only try loading the credentialsFile if the dns challenge is enabled EnvironmentFile = mkIf useDns data.credentialsFile; @@ -248,13 +272,18 @@ let # Working directory will be /tmp script = '' - set -euo pipefail + set -euxo pipefail + + ${optionalString (data.webroot != null) '' + # Ensure the webroot exists + mkdir -p '${data.webroot}/.well-known/acme-challenge' + chown 'acme:${data.group}' ${data.webroot}/{.well-known,.well-known/acme-challenge} + ''} echo '${domainHash}' > domainhash.txt # Check if we can renew - # Certificates and account credentials must exist - if [ -e 'certificates/${keyName}.key' -a -e 'certificates/${keyName}.crt' -a "$(ls -1 accounts)" ]; then + if [ -e 'certificates/${keyName}.key' -a -e 'certificates/${keyName}.crt' -a -n "$(ls -1 accounts)" ]; then # When domains are updated, there's no need to do a full # Lego run, but it's likely renew won't work if days is too low. @@ -317,7 +346,7 @@ let webroot = mkOption { type = types.nullOr types.str; default = null; - example = "/var/lib/acme/acme-challenges"; + example = "/var/lib/acme/acme-challenge"; description = '' Where the webroot of the HTTP vhost is located. <filename>.well-known/acme-challenge/</filename> directory @@ -550,12 +579,12 @@ in { example = literalExample '' { "example.com" = { - webroot = "/var/www/challenges/"; + webroot = "/var/lib/acme/acme-challenge/"; email = "foo@example.com"; extraDomainNames = [ "www.example.com" "foo.example.com" ]; }; "bar.example.com" = { - webroot = "/var/www/challenges/"; + webroot = "/var/lib/acme/acme-challenge/"; email = "bar@example.com"; }; } @@ -664,21 +693,33 @@ in { systemd.timers = mapAttrs' (cert: conf: nameValuePair "acme-${cert}" conf.renewTimer) certConfigs; - # .lego and .lego/accounts specified to fix any incorrect permissions - systemd.tmpfiles.rules = [ - "d /var/lib/acme/.lego - acme acme" - "d /var/lib/acme/.lego/accounts - acme acme" - ] ++ (unique (concatMap (conf: [ - "d ${conf.accountDir} - acme acme" - ] ++ (optional (conf.webroot != null) "d ${conf.webroot}/.well-known/acme-challenge - acme ${conf.group}") - ) (attrValues certConfigs))); - - # Create some targets which can be depended on to be "active" after cert renewals - systemd.targets = mapAttrs' (cert: conf: nameValuePair "acme-finished-${cert}" { - wantedBy = [ "default.target" ]; - requires = [ "acme-${cert}.service" ] ++ conf.selfsignedDeps; - after = [ "acme-${cert}.service" ] ++ conf.selfsignedDeps; - }) certConfigs; + systemd.targets = let + # Create some targets which can be depended on to be "active" after cert renewals + finishedTargets = mapAttrs' (cert: conf: nameValuePair "acme-finished-${cert}" { + wantedBy = [ "default.target" ]; + requires = [ "acme-${cert}.service" ] ++ conf.selfsignedDeps; + after = [ "acme-${cert}.service" ] ++ conf.selfsignedDeps; + }) certConfigs; + + # Create targets to limit the number of simultaneous account creations + # How it works: + # - Pick a "leader" cert service, which will be in charge of creating the account, + # and run first (requires + after) + # - Make all other cert services sharing the same account wait for the leader to + # finish before starting (requiredBy + before). + # Using a target here is fine - account creation is a one time event. Even if + # systemd clean --what=state is used to delete the account, so long as the user + # then runs one of the cert services, there won't be any issues. + accountTargets = mapAttrs' (hash: confs: let + leader = "acme-${(builtins.head confs).cert}.service"; + dependantServices = map (conf: "acme-${conf.cert}.service") (builtins.tail confs); + in nameValuePair "acme-account-${hash}" { + requiredBy = dependantServices; + before = dependantServices; + requires = [ leader ]; + after = [ leader ]; + }) (groupBy (conf: conf.accountHash) (attrValues certConfigs)); + in finishedTargets // accountTargets; }) ]; diff --git a/nixos/modules/security/acme.xml b/nixos/modules/security/acme.xml index f2481129172..a78ff05f2ea 100644 --- a/nixos/modules/security/acme.xml +++ b/nixos/modules/security/acme.xml @@ -115,15 +115,18 @@ services.nginx = { <programlisting> <xref linkend="opt-security.acme.acceptTerms" /> = true; <xref linkend="opt-security.acme.email" /> = "admin+acme@example.com"; + +# /var/lib/acme/.challenges must be writable by the ACME user +# and readable by the Nginx user. The easiest way to achieve +# this is to add the Nginx user to the ACME group. +<link linkend="opt-users.users._name_.extraGroups">users.users.nginx.extraGroups</link> = [ "acme" ]; + services.nginx = { <link linkend="opt-services.nginx.enable">enable</link> = true; <link linkend="opt-services.nginx.virtualHosts">virtualHosts</link> = { "acmechallenge.example.com" = { # Catchall vhost, will redirect users to HTTPS for all vhosts <link linkend="opt-services.nginx.virtualHosts._name_.serverAliases">serverAliases</link> = [ "*.example.com" ]; - # /var/lib/acme/.challenges must be writable by the ACME user - # and readable by the Nginx user. - # By default, this is the case. locations."/.well-known/acme-challenge" = { <link linkend="opt-services.nginx.virtualHosts._name_.locations._name_.root">root</link> = "/var/lib/acme/.challenges"; }; @@ -134,6 +137,7 @@ services.nginx = { }; } # Alternative config for Apache +<link linkend="opt-users.users._name_.extraGroups">users.users.wwwrun.extraGroups</link> = [ "acme" ]; services.httpd = { <link linkend="opt-services.httpd.enable">enable = true;</link> <link linkend="opt-services.httpd.virtualHosts">virtualHosts</link> = { @@ -162,6 +166,9 @@ services.httpd = { <xref linkend="opt-security.acme.certs"/>."foo.example.com" = { <link linkend="opt-security.acme.certs._name_.webroot">webroot</link> = "/var/lib/acme/.challenges"; <link linkend="opt-security.acme.certs._name_.email">email</link> = "foo@example.com"; + # Ensure that the web server you use can read the generated certs + # Take a look at the <link linkend="opt-services.nginx.group">group</link> option for the web server you choose. + <link linkend="opt-security.acme.certs._name_.group">group</link> = "nginx"; # Since we have a wildcard vhost to handle port 80, # we can generate certs for anything! # Just make sure your DNS resolves them. @@ -257,10 +264,11 @@ chmod 400 /var/lib/secrets/certs.secret <para> Should you need to regenerate a particular certificate in a hurry, such as when a vulnerability is found in Let's Encrypt, there is now a convenient - mechanism for doing so. Running <literal>systemctl clean acme-example.com.service</literal> - will remove all certificate files for the given domain, allowing you to then - <literal>systemctl start acme-example.com.service</literal> to generate fresh - ones. + mechanism for doing so. Running + <literal>systemctl clean --what=state acme-example.com.service</literal> + will remove all certificate files and the account data for the given domain, + allowing you to then <literal>systemctl start acme-example.com.service</literal> + to generate fresh ones. </para> </section> <section xml:id="module-security-acme-fix-jws"> diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix index de6213714ac..3cbf22fea7a 100644 --- a/nixos/modules/security/wrappers/default.nix +++ b/nixos/modules/security/wrappers/default.nix @@ -10,16 +10,8 @@ let (n: v: (if v ? program then v else v // {program=n;})) wrappers); - securityWrapper = pkgs.stdenv.mkDerivation { - name = "security-wrapper"; - phases = [ "installPhase" "fixupPhase" ]; - buildInputs = [ pkgs.libcap pkgs.libcap_ng pkgs.linuxHeaders ]; - hardeningEnable = [ "pie" ]; - installPhase = '' - mkdir -p $out/bin - $CC -Wall -O2 -DWRAPPER_DIR=\"${parentWrapperDir}\" \ - -lcap-ng -lcap ${./wrapper.c} -o $out/bin/security-wrapper - ''; + securityWrapper = pkgs.callPackage ./wrapper.nix { + inherit parentWrapperDir; }; ###### Activation script for the setcap wrappers diff --git a/nixos/modules/security/wrappers/wrapper.c b/nixos/modules/security/wrappers/wrapper.c index 494e9e93ac2..529669facda 100644 --- a/nixos/modules/security/wrappers/wrapper.c +++ b/nixos/modules/security/wrappers/wrapper.c @@ -4,15 +4,17 @@ #include <unistd.h> #include <sys/types.h> #include <sys/stat.h> +#include <sys/xattr.h> #include <fcntl.h> #include <dirent.h> #include <assert.h> #include <errno.h> #include <linux/capability.h> -#include <sys/capability.h> #include <sys/prctl.h> #include <limits.h> -#include <cap-ng.h> +#include <stdint.h> +#include <syscall.h> +#include <byteswap.h> // Make sure assertions are not compiled out, we use them to codify // invariants about this program and we want it to fail fast and @@ -23,182 +25,172 @@ extern char **environ; // The WRAPPER_DIR macro is supplied at compile time so that it cannot // be changed at runtime -static char * wrapperDir = WRAPPER_DIR; +static char *wrapper_dir = WRAPPER_DIR; // Wrapper debug variable name -static char * wrapperDebug = "WRAPPER_DEBUG"; - -// Update the capabilities of the running process to include the given -// capability in the Ambient set. -static void set_ambient_cap(cap_value_t cap) -{ - capng_get_caps_process(); - - if (capng_update(CAPNG_ADD, CAPNG_INHERITABLE, (unsigned long) cap)) - { - perror("cannot raise the capability into the Inheritable set\n"); - exit(1); +static char *wrapper_debug = "WRAPPER_DEBUG"; + +#define CAP_SETPCAP 8 + +#if __BYTE_ORDER == __BIG_ENDIAN +#define LE32_TO_H(x) bswap_32(x) +#else +#define LE32_TO_H(x) (x) +#endif + +int get_last_cap(unsigned *last_cap) { + FILE* file = fopen("/proc/sys/kernel/cap_last_cap", "r"); + if (file == NULL) { + int saved_errno = errno; + fprintf(stderr, "failed to open /proc/sys/kernel/cap_last_cap: %s\n", strerror(errno)); + return -saved_errno; } - - capng_apply(CAPNG_SELECT_CAPS); - - if (prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_RAISE, (unsigned long) cap, 0, 0)) - { - perror("cannot raise the capability into the Ambient set\n"); - exit(1); + int res = fscanf(file, "%u", last_cap); + if (res == EOF) { + int saved_errno = errno; + fprintf(stderr, "could not read number from /proc/sys/kernel/cap_last_cap: %s\n", strerror(errno)); + return -saved_errno; } + fclose(file); + return 0; } // Given the path to this program, fetch its configured capability set // (as set by `setcap ... /path/to/file`) and raise those capabilities // into the Ambient set. -static int make_caps_ambient(const char *selfPath) -{ - cap_t caps = cap_get_file(selfPath); +static int make_caps_ambient(const char *self_path) { + struct vfs_ns_cap_data data = {}; + int r = getxattr(self_path, "security.capability", &data, sizeof(data)); + + if (r < 0) { + if (errno == ENODATA) { + // no capabilities set + return 0; + } + fprintf(stderr, "cannot get capabilities for %s: %s", self_path, strerror(errno)); + return 1; + } - if(!caps) - { - if(getenv(wrapperDebug)) - fprintf(stderr, "no caps set or could not retrieve the caps for this file, not doing anything..."); + size_t size; + uint32_t version = LE32_TO_H(data.magic_etc) & VFS_CAP_REVISION_MASK; + switch (version) { + case VFS_CAP_REVISION_1: + size = VFS_CAP_U32_1; + break; + case VFS_CAP_REVISION_2: + case VFS_CAP_REVISION_3: + size = VFS_CAP_U32_3; + break; + default: + fprintf(stderr, "BUG! Unsupported capability version 0x%x on %s. Report to NixOS bugtracker\n", version, self_path); + return 1; + } - return 1; + const struct __user_cap_header_struct header = { + .version = _LINUX_CAPABILITY_VERSION_3, + .pid = getpid(), + }; + struct __user_cap_data_struct user_data[2] = {}; + + for (size_t i = 0; i < size; i++) { + // merge inheritable & permitted into one + user_data[i].permitted = user_data[i].inheritable = + LE32_TO_H(data.data[i].inheritable) | LE32_TO_H(data.data[i].permitted); } - // We use `cap_to_text` and iteration over the tokenized result - // string because, as of libcap's current release, there is no - // facility for retrieving an array of `cap_value_t`'s that can be - // given to `prctl` in order to lift that capability into the - // Ambient set. - // - // Some discussion was had around shot-gunning all of the - // capabilities we know about into the Ambient set but that has a - // security smell and I deemed the risk of the current - // implementation crashing the program to be lower than the risk - // of a privilege escalation security hole being introduced by - // raising all capabilities, even ones we didn't intend for the - // program, into the Ambient set. - // - // `cap_t` which is returned by `cap_get_*` is an opaque type and - // even if we could retrieve the bitmasks (which, as far as I can - // tell we cannot) in order to get the `cap_value_t` - // representation for each capability we would have to take the - // total number of capabilities supported and iterate over the - // sequence of integers up-to that maximum total, testing each one - // against the bitmask ((bitmask >> n) & 1) to see if it's set and - // aggregating each "capability integer n" that is set in the - // bitmask. - // - // That, combined with the fact that we can't easily get the - // bitmask anyway seemed much more brittle than fetching the - // `cap_t`, transforming it into a textual representation, - // tokenizing the string, and using `cap_from_name` on the token - // to get the `cap_value_t` that we need for `prctl`. There is - // indeed risk involved if the output string format of - // `cap_to_text` ever changes but at this time the combination of - // factors involving the below list have led me to the conclusion - // that the best implementation at this time is reading then - // parsing with *lots of documentation* about why we're doing it - // this way. - // - // 1. No explicit API for fetching an array of `cap_value_t`'s or - // for transforming a `cap_t` into such a representation - // 2. The risk of a crash is lower than lifting all capabilities - // into the Ambient set - // 3. libcap is depended on heavily in the Linux ecosystem so - // there is a high chance that the output representation of - // `cap_to_text` will not change which reduces our risk that - // this parsing step will cause a crash - // - // The preferred method, should it ever be available in the - // future, would be to use libcap API's to transform the result - // from a `cap_get_*` into an array of `cap_value_t`'s that can - // then be given to prctl. - // - // - Parnell - ssize_t capLen; - char* capstr = cap_to_text(caps, &capLen); - cap_free(caps); - - // TODO: For now, we assume that cap_to_text always starts its - // result string with " =" and that the first capability is listed - // immediately after that. We should verify this. - assert(capLen >= 2); - capstr += 2; - - char* saveptr = NULL; - for(char* tok = strtok_r(capstr, ",", &saveptr); tok; tok = strtok_r(NULL, ",", &saveptr)) - { - cap_value_t capnum; - if (cap_from_name(tok, &capnum)) - { - if(getenv(wrapperDebug)) - fprintf(stderr, "cap_from_name failed, skipping: %s", tok); - } - else if (capnum == CAP_SETPCAP) - { - // Check for the cap_setpcap capability, we set this on the - // wrapper so it can elevate the capabilities to the Ambient - // set but we do not want to propagate it down into the - // wrapped program. - // - // TODO: what happens if that's the behavior you want - // though???? I'm preferring a strict vs. loose policy here. - if(getenv(wrapperDebug)) - fprintf(stderr, "cap_setpcap in set, skipping it\n"); - } - else - { - set_ambient_cap(capnum); - - if(getenv(wrapperDebug)) - fprintf(stderr, "raised %s into the Ambient capability set\n", tok); - } + if (syscall(SYS_capset, &header, &user_data) < 0) { + fprintf(stderr, "failed to inherit capabilities: %s", strerror(errno)); + return 1; + } + unsigned last_cap; + r = get_last_cap(&last_cap); + if (r < 0) { + return 1; + } + uint64_t set = user_data[0].permitted | (uint64_t)user_data[1].permitted << 32; + for (unsigned cap = 0; cap < last_cap; cap++) { + if (!(set & (1ULL << cap))) { + continue; + } + + // Check for the cap_setpcap capability, we set this on the + // wrapper so it can elevate the capabilities to the Ambient + // set but we do not want to propagate it down into the + // wrapped program. + // + // TODO: what happens if that's the behavior you want + // though???? I'm preferring a strict vs. loose policy here. + if (cap == CAP_SETPCAP) { + if(getenv(wrapper_debug)) { + fprintf(stderr, "cap_setpcap in set, skipping it\n"); + } + continue; + } + if (prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_RAISE, (unsigned long) cap, 0, 0)) { + fprintf(stderr, "cannot raise the capability %d into the ambient set: %s\n", cap, strerror(errno)); + return 1; + } + if (getenv(wrapper_debug)) { + fprintf(stderr, "raised %d into the ambient capability set\n", cap); + } } - cap_free(capstr); return 0; } -int main(int argc, char * * argv) -{ - // I *think* it's safe to assume that a path from a symbolic link - // should safely fit within the PATH_MAX system limit. Though I'm - // not positive it's safe... - char selfPath[PATH_MAX]; - int selfPathSize = readlink("/proc/self/exe", selfPath, sizeof(selfPath)); - - assert(selfPathSize > 0); - - // Assert we have room for the zero byte, this ensures the path - // isn't being truncated because it's too big for the buffer. - // - // A better way to handle this might be to use something like the - // whereami library (https://github.com/gpakosz/whereami) or a - // loop that resizes the buffer and re-reads the link if the - // contents are being truncated. - assert(selfPathSize < sizeof(selfPath)); +int readlink_malloc(const char *p, char **ret) { + size_t l = FILENAME_MAX+1; + int r; + + for (;;) { + char *c = calloc(l, sizeof(char)); + if (!c) { + return -ENOMEM; + } + + ssize_t n = readlink(p, c, l-1); + if (n < 0) { + r = -errno; + free(c); + return r; + } + + if ((size_t) n < l-1) { + c[n] = 0; + *ret = c; + return 0; + } + + free(c); + l *= 2; + } +} - // Set the zero byte since readlink doesn't do that for us. - selfPath[selfPathSize] = '\0'; +int main(int argc, char **argv) { + char *self_path = NULL; + int self_path_size = readlink_malloc("/proc/self/exe", &self_path); + if (self_path_size < 0) { + fprintf(stderr, "cannot readlink /proc/self/exe: %s", strerror(-self_path_size)); + } // Make sure that we are being executed from the right location, - // i.e., `safeWrapperDir'. This is to prevent someone from creating + // i.e., `safe_wrapper_dir'. This is to prevent someone from creating // hard link `X' from some other location, along with a false // `X.real' file, to allow arbitrary programs from being executed // with elevated capabilities. - int len = strlen(wrapperDir); - if (len > 0 && '/' == wrapperDir[len - 1]) + int len = strlen(wrapper_dir); + if (len > 0 && '/' == wrapper_dir[len - 1]) --len; - assert(!strncmp(selfPath, wrapperDir, len)); - assert('/' == wrapperDir[0]); - assert('/' == selfPath[len]); + assert(!strncmp(self_path, wrapper_dir, len)); + assert('/' == wrapper_dir[0]); + assert('/' == self_path[len]); // Make *really* *really* sure that we were executed as - // `selfPath', and not, say, as some other setuid program. That + // `self_path', and not, say, as some other setuid program. That // is, our effective uid/gid should match the uid/gid of - // `selfPath'. + // `self_path'. struct stat st; - assert(lstat(selfPath, &st) != -1); + assert(lstat(self_path, &st) != -1); assert(!(st.st_mode & S_ISUID) || (st.st_uid == geteuid())); assert(!(st.st_mode & S_ISGID) || (st.st_gid == getegid())); @@ -207,33 +199,35 @@ int main(int argc, char * * argv) assert(!(st.st_mode & (S_IWGRP | S_IWOTH))); // Read the path of the real (wrapped) program from <self>.real. - char realFN[PATH_MAX + 10]; - int realFNSize = snprintf (realFN, sizeof(realFN), "%s.real", selfPath); - assert (realFNSize < sizeof(realFN)); + char real_fn[PATH_MAX + 10]; + int real_fn_size = snprintf(real_fn, sizeof(real_fn), "%s.real", self_path); + assert(real_fn_size < sizeof(real_fn)); - int fdSelf = open(realFN, O_RDONLY); - assert (fdSelf != -1); + int fd_self = open(real_fn, O_RDONLY); + assert(fd_self != -1); - char sourceProg[PATH_MAX]; - len = read(fdSelf, sourceProg, PATH_MAX); - assert (len != -1); - assert (len < sizeof(sourceProg)); - assert (len > 0); - sourceProg[len] = 0; + char source_prog[PATH_MAX]; + len = read(fd_self, source_prog, PATH_MAX); + assert(len != -1); + assert(len < sizeof(source_prog)); + assert(len > 0); + source_prog[len] = 0; - close(fdSelf); + close(fd_self); // Read the capabilities set on the wrapper and raise them in to - // the Ambient set so the program we're wrapping receives the + // the ambient set so the program we're wrapping receives the // capabilities too! - make_caps_ambient(selfPath); + if (make_caps_ambient(self_path) != 0) { + free(self_path); + return 1; + } + free(self_path); - execve(sourceProg, argv, environ); + execve(source_prog, argv, environ); fprintf(stderr, "%s: cannot run `%s': %s\n", - argv[0], sourceProg, strerror(errno)); + argv[0], source_prog, strerror(errno)); - exit(1); + return 1; } - - diff --git a/nixos/modules/security/wrappers/wrapper.nix b/nixos/modules/security/wrappers/wrapper.nix new file mode 100644 index 00000000000..e3620fb222d --- /dev/null +++ b/nixos/modules/security/wrappers/wrapper.nix @@ -0,0 +1,21 @@ +{ stdenv, linuxHeaders, parentWrapperDir, debug ? false }: +# For testing: +# $ nix-build -E 'with import <nixpkgs> {}; pkgs.callPackage ./wrapper.nix { parentWrapperDir = "/run/wrappers"; debug = true; }' +stdenv.mkDerivation { + name = "security-wrapper"; + buildInputs = [ linuxHeaders ]; + dontUnpack = true; + hardeningEnable = [ "pie" ]; + CFLAGS = [ + ''-DWRAPPER_DIR="${parentWrapperDir}"'' + ] ++ (if debug then [ + "-Werror" "-Og" "-g" + ] else [ + "-Wall" "-O2" + ]); + dontStrip = debug; + installPhase = '' + mkdir -p $out/bin + $CC $CFLAGS ${./wrapper.c} -o $out/bin/security-wrapper + ''; +} diff --git a/nixos/modules/services/amqp/activemq/default.nix b/nixos/modules/services/amqp/activemq/default.nix index 160dbddcd48..178b2f6e144 100644 --- a/nixos/modules/services/amqp/activemq/default.nix +++ b/nixos/modules/services/amqp/activemq/default.nix @@ -33,6 +33,7 @@ in { }; configurationDir = mkOption { default = "${activemq}/conf"; + type = types.str; description = '' The base directory for ActiveMQ's configuration. By default, this directory is searched for a file named activemq.xml, diff --git a/nixos/modules/services/audio/alsa.nix b/nixos/modules/services/audio/alsa.nix index 3fe76a16540..aff3fe2ba42 100644 --- a/nixos/modules/services/audio/alsa.nix +++ b/nixos/modules/services/audio/alsa.nix @@ -32,7 +32,7 @@ in enableOSSEmulation = mkOption { type = types.bool; - default = true; + default = false; description = '' Whether to enable ALSA OSS emulation (with certain cards sound mixing may not work!). ''; diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix index 2e5953dc6f4..9f01e29dd0e 100644 --- a/nixos/modules/services/audio/mpd.nix +++ b/nixos/modules/services/audio/mpd.nix @@ -74,7 +74,7 @@ in { musicDirectory = mkOption { type = with types; either path (strMatching "(http|https|nfs|smb)://.+"); default = "${cfg.dataDir}/music"; - defaultText = ''''${dataDir}/music''; + defaultText = "\${dataDir}/music"; description = '' The directory or NFS/SMB network share where MPD reads music from. If left as the default value this directory will automatically be created before @@ -86,7 +86,7 @@ in { playlistDirectory = mkOption { type = types.path; default = "${cfg.dataDir}/playlists"; - defaultText = ''''${dataDir}/playlists''; + defaultText = "\${dataDir}/playlists"; description = '' The directory where MPD stores playlists. If left as the default value this directory will automatically be created before the MPD server starts, @@ -155,7 +155,7 @@ in { dbFile = mkOption { type = types.nullOr types.str; default = "${cfg.dataDir}/tag_cache"; - defaultText = ''''${dataDir}/tag_cache''; + defaultText = "\${dataDir}/tag_cache"; description = '' The path to MPD's database. If set to <literal>null</literal> the parameter is omitted from the configuration. diff --git a/nixos/modules/services/backup/bacula.nix b/nixos/modules/services/backup/bacula.nix index 3d69a69038a..cc8b77cbfbe 100644 --- a/nixos/modules/services/backup/bacula.nix +++ b/nixos/modules/services/backup/bacula.nix @@ -1,5 +1,6 @@ { config, lib, pkgs, ... }: + # TODO: test configuration when building nixexpr (use -t parameter) # TODO: support sqlite3 (it's deprecate?) and mysql @@ -111,6 +112,7 @@ let { options = { password = mkOption { + type = types.str; # TODO: required? description = '' Specifies the password that must be supplied for the default Bacula @@ -130,6 +132,7 @@ let }; monitor = mkOption { + type = types.enum [ "no" "yes" ]; default = "no"; example = "yes"; description = '' @@ -150,6 +153,7 @@ let { options = { changerDevice = mkOption { + type = types.str; description = '' The specified name-string must be the generic SCSI device name of the autochanger that corresponds to the normal read/write Archive Device @@ -168,6 +172,7 @@ let }; changerCommand = mkOption { + type = types.str; description = '' The name-string specifies an external program to be called that will automatically change volumes as required by Bacula. Normally, this @@ -190,12 +195,13 @@ let }; devices = mkOption { - description = '' - ''; + description = ""; + type = types.listOf types.str; }; extraAutochangerConfig = mkOption { default = ""; + type = types.lines; description = '' Extra configuration to be passed in Autochanger directive. ''; @@ -212,6 +218,7 @@ let options = { archiveDevice = mkOption { # TODO: required? + type = types.str; description = '' The specified name-string gives the system file name of the storage device managed by this storage daemon. This will usually be the @@ -228,6 +235,7 @@ let mediaType = mkOption { # TODO: required? + type = types.str; description = '' The specified name-string names the type of media supported by this device, for example, <literal>DLT7000</literal>. Media type names are @@ -265,6 +273,7 @@ let extraDeviceConfig = mkOption { default = ""; + type = types.lines; description = '' Extra configuration to be passed in Device directive. ''; @@ -293,6 +302,7 @@ in { name = mkOption { default = "${config.networking.hostName}-fd"; + type = types.str; description = '' The client name that must be used by the Director when connecting. Generally, it is a good idea to use a name related to the machine so @@ -321,6 +331,7 @@ in { extraClientConfig = mkOption { default = ""; + type = types.lines; description = '' Extra configuration to be passed in Client directive. ''; @@ -332,6 +343,7 @@ in { extraMessagesConfig = mkOption { default = ""; + type = types.lines; description = '' Extra configuration to be passed in Messages directive. ''; @@ -352,6 +364,7 @@ in { name = mkOption { default = "${config.networking.hostName}-sd"; + type = types.str; description = '' Specifies the Name of the Storage daemon. ''; @@ -392,6 +405,7 @@ in { extraStorageConfig = mkOption { default = ""; + type = types.lines; description = '' Extra configuration to be passed in Storage directive. ''; @@ -403,6 +417,7 @@ in { extraMessagesConfig = mkOption { default = ""; + type = types.lines; description = '' Extra configuration to be passed in Messages directive. ''; @@ -424,6 +439,7 @@ in { name = mkOption { default = "${config.networking.hostName}-dir"; + type = types.str; description = '' The director name used by the system administrator. This directive is required. @@ -445,6 +461,7 @@ in { password = mkOption { # TODO: required? + type = types.str; description = '' Specifies the password that must be supplied for a Director. ''; @@ -452,6 +469,7 @@ in { extraMessagesConfig = mkOption { default = ""; + type = types.lines; description = '' Extra configuration to be passed in Messages directive. ''; @@ -462,6 +480,7 @@ in { extraDirectorConfig = mkOption { default = ""; + type = types.lines; description = '' Extra configuration to be passed in Director directive. ''; diff --git a/nixos/modules/services/backup/mysql-backup.nix b/nixos/modules/services/backup/mysql-backup.nix index 31d606b141a..506ded5e9e8 100644 --- a/nixos/modules/services/backup/mysql-backup.nix +++ b/nixos/modules/services/backup/mysql-backup.nix @@ -48,6 +48,7 @@ in }; user = mkOption { + type = types.str; default = defaultUser; description = '' User to be used to perform backup. @@ -56,12 +57,14 @@ in databases = mkOption { default = []; + type = types.listOf types.str; description = '' List of database names to dump. ''; }; location = mkOption { + type = types.path; default = "/var/backup/mysql"; description = '' Location to put the gzipped MySQL database dumps. @@ -70,6 +73,7 @@ in singleTransaction = mkOption { default = false; + type = types.bool; description = '' Whether to create database dump in a single transaction ''; diff --git a/nixos/modules/services/backup/postgresql-backup.nix b/nixos/modules/services/backup/postgresql-backup.nix index 428861a7598..f4bd3aa447e 100644 --- a/nixos/modules/services/backup/postgresql-backup.nix +++ b/nixos/modules/services/backup/postgresql-backup.nix @@ -48,6 +48,7 @@ in { startAt = mkOption { default = "*-*-* 01:15:00"; + type = types.str; description = '' This option defines (see <literal>systemd.time</literal> for format) when the databases should be dumped. @@ -70,6 +71,7 @@ in { databases = mkOption { default = []; + type = types.listOf types.str; description = '' List of database names to dump. ''; @@ -77,6 +79,7 @@ in { location = mkOption { default = "/var/backup/postgresql"; + type = types.path; description = '' Location to put the gzipped PostgreSQL database dumps. ''; diff --git a/nixos/modules/services/backup/restic.nix b/nixos/modules/services/backup/restic.nix index d869835bf07..573f0efa9da 100644 --- a/nixos/modules/services/backup/restic.nix +++ b/nixos/modules/services/backup/restic.nix @@ -243,9 +243,11 @@ in restartIfChanged = false; serviceConfig = { Type = "oneshot"; - ExecStart = [ "${resticCmd} backup ${concatStringsSep " " backup.extraBackupArgs} ${backupPaths}" ] ++ pruneCmd; + ExecStart = [ "${resticCmd} backup --cache-dir=%C/restic-backups-${name} ${concatStringsSep " " backup.extraBackupArgs} ${backupPaths}" ] ++ pruneCmd; User = backup.user; RuntimeDirectory = "restic-backups-${name}"; + CacheDirectory = "restic-backups-${name}"; + CacheDirectoryMode = "0700"; } // optionalAttrs (backup.s3CredentialsFile != null) { EnvironmentFile = backup.s3CredentialsFile; }; diff --git a/nixos/modules/services/backup/tarsnap.nix b/nixos/modules/services/backup/tarsnap.nix index d31b92abde0..8187042b4b8 100644 --- a/nixos/modules/services/backup/tarsnap.nix +++ b/nixos/modules/services/backup/tarsnap.nix @@ -354,7 +354,7 @@ in script = let tarsnap = ''tarsnap --configfile "/etc/tarsnap/${name}.conf"''; - lastArchive = ''$(${tarsnap} --list-archives | sort | tail -1)''; + lastArchive = "$(${tarsnap} --list-archives | sort | tail -1)"; run = ''${tarsnap} -x -f "${lastArchive}" ${optionalString cfg.verbose "-v"}''; in if (cfg.cachedir != null) then '' diff --git a/nixos/modules/services/cluster/hadoop/default.nix b/nixos/modules/services/cluster/hadoop/default.nix index bfb73f68371..41ac46e538e 100644 --- a/nixos/modules/services/cluster/hadoop/default.nix +++ b/nixos/modules/services/cluster/hadoop/default.nix @@ -7,6 +7,7 @@ with lib; options.services.hadoop = { coreSite = mkOption { default = {}; + type = types.attrsOf types.anything; example = literalExample '' { "fs.defaultFS" = "hdfs://localhost"; @@ -17,6 +18,7 @@ with lib; hdfsSite = mkOption { default = {}; + type = types.attrsOf types.anything; example = literalExample '' { "dfs.nameservices" = "namenode1"; @@ -27,6 +29,7 @@ with lib; mapredSite = mkOption { default = {}; + type = types.attrsOf types.anything; example = literalExample '' { "mapreduce.map.cpu.vcores" = "1"; @@ -37,6 +40,7 @@ with lib; yarnSite = mkOption { default = {}; + type = types.attrsOf types.anything; example = literalExample '' { "yarn.resourcemanager.ha.id" = "resourcemanager1"; @@ -50,8 +54,7 @@ with lib; default = pkgs.hadoop; defaultText = "pkgs.hadoop"; example = literalExample "pkgs.hadoop"; - description = '' - ''; + description = ""; }; }; diff --git a/nixos/modules/services/cluster/k3s/default.nix b/nixos/modules/services/cluster/k3s/default.nix index f0317fdbd16..e62fbc94415 100644 --- a/nixos/modules/services/cluster/k3s/default.nix +++ b/nixos/modules/services/cluster/k3s/default.nix @@ -47,6 +47,7 @@ in extraFlags = mkOption { description = "Extra flags to pass to the k3s command."; + type = types.str; default = ""; example = "--no-deploy traefik --cluster-cidr 10.24.0.0/16"; }; diff --git a/nixos/modules/services/cluster/kubernetes/kubelet.nix b/nixos/modules/services/cluster/kubernetes/kubelet.nix index 2b6e45ba1b9..479027f1b27 100644 --- a/nixos/modules/services/cluster/kubernetes/kubelet.nix +++ b/nixos/modules/services/cluster/kubernetes/kubelet.nix @@ -241,7 +241,17 @@ in description = "Kubernetes Kubelet Service"; wantedBy = [ "kubernetes.target" ]; after = [ "network.target" "docker.service" "kube-apiserver.service" ]; - path = with pkgs; [ gitMinimal openssh docker util-linux iproute ethtool thin-provisioning-tools iptables socat ] ++ top.path; + path = with pkgs; [ + gitMinimal + openssh + docker + util-linux + iproute + ethtool + thin-provisioning-tools + iptables + socat + ] ++ lib.optional config.boot.zfs.enabled config.boot.zfs.package ++ top.path; preStart = '' ${concatMapStrings (img: '' echo "Seeding docker image: ${img}" diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix index 302f058926c..7363441e538 100644 --- a/nixos/modules/services/computing/slurm/slurm.nix +++ b/nixos/modules/services/computing/slurm/slurm.nix @@ -14,8 +14,8 @@ let ClusterName=${cfg.clusterName} StateSaveLocation=${cfg.stateSaveLocation} SlurmUser=${cfg.user} - ${optionalString (cfg.controlMachine != null) ''controlMachine=${cfg.controlMachine}''} - ${optionalString (cfg.controlAddr != null) ''controlAddr=${cfg.controlAddr}''} + ${optionalString (cfg.controlMachine != null) "controlMachine=${cfg.controlMachine}"} + ${optionalString (cfg.controlAddr != null) "controlAddr=${cfg.controlAddr}"} ${toString (map (x: "NodeName=${x}\n") cfg.nodeName)} ${toString (map (x: "PartitionName=${x}\n") cfg.partitionName)} PlugStackConfig=${plugStackConfig}/plugstack.conf @@ -25,7 +25,7 @@ let plugStackConfig = pkgs.writeTextDir "plugstack.conf" '' - ${optionalString cfg.enableSrunX11 ''optional ${pkgs.slurm-spank-x11}/lib/x11.so''} + ${optionalString cfg.enableSrunX11 "optional ${pkgs.slurm-spank-x11}/lib/x11.so"} ${cfg.extraPlugstackConfig} ''; diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix index e1950b91382..a49f5f8100d 100644 --- a/nixos/modules/services/continuous-integration/buildbot/master.nix +++ b/nixos/modules/services/continuous-integration/buildbot/master.nix @@ -223,6 +223,7 @@ in { }; pythonPackages = mkOption { + type = types.functionTo (types.listOf types.package); default = pythonPackages: with pythonPackages; [ ]; defaultText = "pythonPackages: with pythonPackages; [ ]"; description = "Packages to add the to the PYTHONPATH of the buildbot process."; @@ -282,5 +283,5 @@ in { '') ]; - meta.maintainers = with lib.maintainers; [ nand0p mic92 ]; + meta.maintainers = with lib.maintainers; [ nand0p mic92 lopsided98 ]; } diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix index c358a5db77c..2c6d9530a6b 100644 --- a/nixos/modules/services/continuous-integration/gitlab-runner.nix +++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix @@ -66,10 +66,10 @@ let ++ optional service.debugTraceDisabled "--debug-trace-disabled" ++ map (e: "--env ${escapeShellArg e}") (mapAttrsToList (name: value: "${name}=${value}") service.environmentVariables) - ++ optionals (service.executor == "docker") ( + ++ optionals (hasPrefix "docker" service.executor) ( assert ( assertMsg (service.dockerImage != null) - "dockerImage option is required for docker executor (${name})"); + "dockerImage option is required for ${service.executor} executor (${name})"); [ "--docker-image ${service.dockerImage}" ] ++ optional service.dockerDisableCache "--docker-disable-cache" diff --git a/nixos/modules/services/continuous-integration/gocd-agent/default.nix b/nixos/modules/services/continuous-integration/gocd-agent/default.nix index 2e9e1c94857..8cae08bf1fa 100644 --- a/nixos/modules/services/continuous-integration/gocd-agent/default.nix +++ b/nixos/modules/services/continuous-integration/gocd-agent/default.nix @@ -90,6 +90,7 @@ in { }; startupOptions = mkOption { + type = types.listOf types.str; default = [ "-Xms${cfg.initialJavaHeapSize}" "-Xmx${cfg.maxJavaHeapMemory}" @@ -105,6 +106,7 @@ in { extraOptions = mkOption { default = [ ]; + type = types.listOf types.str; example = [ "-X debug" "-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5006" diff --git a/nixos/modules/services/continuous-integration/gocd-server/default.nix b/nixos/modules/services/continuous-integration/gocd-server/default.nix index 4fa41ac49ed..4c829664a0a 100644 --- a/nixos/modules/services/continuous-integration/gocd-server/default.nix +++ b/nixos/modules/services/continuous-integration/gocd-server/default.nix @@ -27,6 +27,7 @@ in { extraGroups = mkOption { default = [ ]; + type = types.listOf types.str; example = [ "wheel" "docker" ]; description = '' List of extra groups that the "gocd-server" user should be a part of. @@ -92,6 +93,7 @@ in { }; startupOptions = mkOption { + type = types.listOf types.str; default = [ "-Xms${cfg.initialJavaHeapSize}" "-Xmx${cfg.maxJavaHeapMemory}" @@ -113,6 +115,7 @@ in { extraOptions = mkOption { default = [ ]; + type = types.listOf types.str; example = [ "-X debug" "-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005" diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix index 252ca17006d..887a0cbf9a7 100644 --- a/nixos/modules/services/continuous-integration/hydra/default.nix +++ b/nixos/modules/services/continuous-integration/hydra/default.nix @@ -231,7 +231,7 @@ in users.users.hydra = { description = "Hydra"; group = "hydra"; - createHome = true; + # We don't enable `createHome` here because the creation of the home directory is handled by the hydra-init service below. home = baseDir; useDefaultShell = true; uid = config.ids.uids.hydra; diff --git a/nixos/modules/services/databases/couchdb.nix b/nixos/modules/services/databases/couchdb.nix index f385331e878..c99a7529213 100644 --- a/nixos/modules/services/databases/couchdb.nix +++ b/nixos/modules/services/databases/couchdb.nix @@ -16,8 +16,7 @@ let [admins] ${cfg.adminUser} = ${cfg.adminPass} '' else - '' - '') + (if useVersion2 then + "") + (if useVersion2 then '' [chttpd] '' else diff --git a/nixos/modules/services/databases/firebird.nix b/nixos/modules/services/databases/firebird.nix index 95837aa1cea..ed47f647edd 100644 --- a/nixos/modules/services/databases/firebird.nix +++ b/nixos/modules/services/databases/firebird.nix @@ -59,6 +59,7 @@ in port = mkOption { default = "3050"; + type = types.port; description = '' Port Firebird uses. ''; @@ -66,6 +67,7 @@ in user = mkOption { default = "firebird"; + type = types.str; description = '' User account under which firebird runs. ''; @@ -73,6 +75,7 @@ in baseDir = mkOption { default = "/var/db/firebird"; # ubuntu is using /var/lib/firebird/2.1/data/.. ? + type = types.str; description = '' Location containing data/ and system/ directories. data/ stores the databases, system/ stores the password database security2.fdb. @@ -114,7 +117,7 @@ in serviceConfig.User = cfg.user; serviceConfig.LogsDirectory = "firebird"; serviceConfig.LogsDirectoryMode = "0700"; - serviceConfig.ExecStart = ''${firebird}/bin/fbserver -d''; + serviceConfig.ExecStart = "${firebird}/bin/fbserver -d"; # TODO think about shutdown }; diff --git a/nixos/modules/services/databases/memcached.nix b/nixos/modules/services/databases/memcached.nix index f54bb6cc9b1..ca7b20eb049 100644 --- a/nixos/modules/services/databases/memcached.nix +++ b/nixos/modules/services/databases/memcached.nix @@ -17,39 +17,44 @@ in options = { services.memcached = { - enable = mkEnableOption "Memcached"; user = mkOption { + type = types.str; default = "memcached"; description = "The user to run Memcached as"; }; listen = mkOption { + type = types.str; default = "127.0.0.1"; - description = "The IP address to bind to"; + description = "The IP address to bind to."; }; port = mkOption { + type = types.port; default = 11211; - description = "The port to bind to"; + description = "The port to bind to."; }; enableUnixSocket = mkEnableOption "unix socket at /run/memcached/memcached.sock"; maxMemory = mkOption { + type = types.ints.unsigned; default = 64; description = "The maximum amount of memory to use for storage, in megabytes."; }; maxConnections = mkOption { + type = types.ints.unsigned; default = 1024; - description = "The maximum number of simultaneous connections"; + description = "The maximum number of simultaneous connections."; }; extraOptions = mkOption { + type = types.listOf types.str; default = []; - description = "A list of extra options that will be added as a suffix when running memcached"; + description = "A list of extra options that will be added as a suffix when running memcached."; }; }; diff --git a/nixos/modules/services/databases/mongodb.nix b/nixos/modules/services/databases/mongodb.nix index 4af0b9d44e1..db1e5fedf50 100644 --- a/nixos/modules/services/databases/mongodb.nix +++ b/nixos/modules/services/databases/mongodb.nix @@ -41,16 +41,19 @@ in }; user = mkOption { + type = types.str; default = "mongodb"; description = "User account under which MongoDB runs"; }; bind_ip = mkOption { + type = types.str; default = "127.0.0.1"; description = "IP to bind to"; }; quiet = mkOption { + type = types.bool; default = false; description = "quieter output"; }; @@ -68,16 +71,19 @@ in }; dbpath = mkOption { + type = types.str; default = "/var/db/mongodb"; description = "Location where MongoDB stores its files"; }; pidFile = mkOption { + type = types.str; default = "/run/mongodb.pid"; description = "Location of MongoDB pid file"; }; replSetName = mkOption { + type = types.str; default = ""; description = '' If this instance is part of a replica set, set its name here. @@ -86,6 +92,7 @@ in }; extraConfig = mkOption { + type = types.lines; default = ""; example = '' storage.journal.enabled: false diff --git a/nixos/modules/services/databases/neo4j.nix b/nixos/modules/services/databases/neo4j.nix index 09b453e7584..53760bb24c4 100644 --- a/nixos/modules/services/databases/neo4j.nix +++ b/nixos/modules/services/databases/neo4j.nix @@ -16,14 +16,14 @@ let ''} dbms.ssl.policy.${name}.client_auth=${conf.clientAuth} ${if length (splitString "/" conf.privateKey) > 1 then - ''dbms.ssl.policy.${name}.private_key=${conf.privateKey}'' + "dbms.ssl.policy.${name}.private_key=${conf.privateKey}" else - ''dbms.ssl.policy.${name}.private_key=${conf.baseDirectory}/${conf.privateKey}'' + "dbms.ssl.policy.${name}.private_key=${conf.baseDirectory}/${conf.privateKey}" } ${if length (splitString "/" conf.privateKey) > 1 then - ''dbms.ssl.policy.${name}.public_certificate=${conf.publicCertificate}'' + "dbms.ssl.policy.${name}.public_certificate=${conf.publicCertificate}" else - ''dbms.ssl.policy.${name}.public_certificate=${conf.baseDirectory}/${conf.publicCertificate}'' + "dbms.ssl.policy.${name}.public_certificate=${conf.baseDirectory}/${conf.publicCertificate}" } dbms.ssl.policy.${name}.revoked_dir=${conf.revokedDir} dbms.ssl.policy.${name}.tls_versions=${concatStringsSep "," conf.tlsVersions} diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix index 94a5c573768..f0efc659cff 100644 --- a/nixos/modules/services/databases/openldap.nix +++ b/nixos/modules/services/databases/openldap.nix @@ -244,7 +244,7 @@ in { }; }; - meta.maintainers = with lib.maintainters; [ mic92 kwohlfahrt ]; + meta.maintainers = with lib.maintainers; [ mic92 kwohlfahrt ]; config = mkIf cfg.enable { assertions = map (opt: { diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix index 9628d30e76a..117e6366225 100644 --- a/nixos/modules/services/databases/redis.nix +++ b/nixos/modules/services/databases/redis.nix @@ -122,12 +122,29 @@ in }; slaveOf = mkOption { - default = null; # { ip, port } - description = "An attribute set with two attributes: ip and port to which this redis instance acts as a slave."; + type = with types; nullOr (submodule ({ ... }: { + options = { + ip = mkOption { + type = str; + description = "IP of the Redis master"; + example = "192.168.1.100"; + }; + + port = mkOption { + type = port; + description = "port of the Redis master"; + default = 6379; + }; + }; + })); + + default = null; + description = "IP and port to which this redis instance acts as a slave."; example = { ip = "192.168.1.100"; port = 6379; }; }; masterAuth = mkOption { + type = with types; nullOr str; default = null; description = ''If the master is password protected (using the requirePass configuration) it is possible to tell the slave to authenticate before starting the replication synchronization diff --git a/nixos/modules/services/databases/virtuoso.nix b/nixos/modules/services/databases/virtuoso.nix index 6eb09e0a58f..8b01622ecb0 100644 --- a/nixos/modules/services/databases/virtuoso.nix +++ b/nixos/modules/services/databases/virtuoso.nix @@ -16,28 +16,33 @@ with lib; enable = mkEnableOption "Virtuoso Opensource database server"; config = mkOption { + type = types.lines; default = ""; description = "Extra options to put into Virtuoso configuration file."; }; parameters = mkOption { + type = types.lines; default = ""; description = "Extra options to put into [Parameters] section of Virtuoso configuration file."; }; listenAddress = mkOption { + type = types.str; default = "1111"; example = "myserver:1323"; description = "ip:port or port to listen on."; }; httpListenAddress = mkOption { + type = types.nullOr types.str; default = null; example = "myserver:8080"; description = "ip:port or port for Virtuoso HTTP server to listen on."; }; dirsAllowed = mkOption { + type = types.nullOr types.str; # XXX Maybe use a list in the future? default = null; example = "/www, /home/"; description = "A list of directories Virtuoso is allowed to access"; diff --git a/nixos/modules/services/desktops/gnome3/evolution-data-server.nix b/nixos/modules/services/desktops/gnome3/evolution-data-server.nix index bd62d16f61c..749f12b86bc 100644 --- a/nixos/modules/services/desktops/gnome3/evolution-data-server.nix +++ b/nixos/modules/services/desktops/gnome3/evolution-data-server.nix @@ -15,31 +15,45 @@ with lib; options = { services.gnome3.evolution-data-server = { - - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable Evolution Data Server, a collection of services for - storing addressbooks and calendars. - ''; + enable = mkEnableOption "Evolution Data Server, a collection of services for storing addressbooks and calendars."; + plugins = mkOption { + type = types.listOf types.package; + default = [ ]; + description = "Plugins for Evolution Data Server."; }; - }; + programs.evolution = { + enable = mkEnableOption "Evolution, a Personal information management application that provides integrated mail, calendaring and address book functionality."; + plugins = mkOption { + type = types.listOf types.package; + default = [ ]; + example = literalExample "[ pkgs.evolution-ews ]"; + description = "Plugins for Evolution."; + }; + }; }; - ###### implementation - config = mkIf config.services.gnome3.evolution-data-server.enable { - - environment.systemPackages = [ pkgs.gnome3.evolution-data-server ]; - - services.dbus.packages = [ pkgs.gnome3.evolution-data-server ]; - - systemd.packages = [ pkgs.gnome3.evolution-data-server ]; - - }; - + config = + let + bundle = pkgs.evolutionWithPlugins.override { inherit (config.services.gnome3.evolution-data-server) plugins; }; + in + mkMerge [ + (mkIf config.services.gnome3.evolution-data-server.enable { + environment.systemPackages = [ bundle ]; + + services.dbus.packages = [ bundle ]; + + systemd.packages = [ bundle ]; + }) + (mkIf config.programs.evolution.enable { + services.gnome3.evolution-data-server = { + enable = true; + plugins = [ pkgs.evolution ] ++ config.programs.evolution.plugins; + }; + services.gnome3.gnome-keyring.enable = true; + }) + ]; } diff --git a/nixos/modules/services/development/bloop.nix b/nixos/modules/services/development/bloop.nix index 226718a9e80..c1180a8bbdd 100644 --- a/nixos/modules/services/development/bloop.nix +++ b/nixos/modules/services/development/bloop.nix @@ -44,7 +44,7 @@ in { }; serviceConfig = { Type = "simple"; - ExecStart = ''${pkgs.bloop}/bin/bloop server''; + ExecStart = "${pkgs.bloop}/bin/bloop server"; Restart = "always"; }; }; diff --git a/nixos/modules/services/development/hoogle.nix b/nixos/modules/services/development/hoogle.nix index a661e3acae3..6d6c88b9b2a 100644 --- a/nixos/modules/services/development/hoogle.nix +++ b/nixos/modules/services/development/hoogle.nix @@ -25,6 +25,7 @@ in { }; packages = mkOption { + type = types.functionTo (types.listOf types.package); default = hp: []; defaultText = "hp: []"; example = "hp: with hp; [ text lens ]"; diff --git a/nixos/modules/services/editors/emacs.xml b/nixos/modules/services/editors/emacs.xml index 302aa1ed7c4..fd99ee9442c 100644 --- a/nixos/modules/services/editors/emacs.xml +++ b/nixos/modules/services/editors/emacs.xml @@ -156,7 +156,7 @@ $ ./result/bin/emacs let myEmacs = pkgs.emacs; <co xml:id="ex-emacsNix-2" /> - emacsWithPackages = (pkgs.emacsPackagesGen myEmacs).emacsWithPackages; <co xml:id="ex-emacsNix-3" /> + emacsWithPackages = (pkgs.emacsPackagesFor myEmacs).emacsWithPackages; <co xml:id="ex-emacsNix-3" /> in emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [ <co xml:id="ex-emacsNix-4" /> magit # ; Integrate git <C-x g> @@ -254,10 +254,10 @@ in <example xml:id="module-services-emacs-querying-packages"> <title>Querying Emacs packages</title> <programlisting><![CDATA[ -nix-env -f "<nixpkgs>" -qaP -A emacsPackages.elpaPackages -nix-env -f "<nixpkgs>" -qaP -A emacsPackages.melpaPackages -nix-env -f "<nixpkgs>" -qaP -A emacsPackages.melpaStablePackages -nix-env -f "<nixpkgs>" -qaP -A emacsPackages.orgPackages +nix-env -f "<nixpkgs>" -qaP -A emacs.pkgs.elpaPackages +nix-env -f "<nixpkgs>" -qaP -A emacs.pkgs.melpaPackages +nix-env -f "<nixpkgs>" -qaP -A emacs.pkgs.melpaStablePackages +nix-env -f "<nixpkgs>" -qaP -A emacs.pkgs.orgPackages ]]></programlisting> </example> </para> diff --git a/nixos/modules/services/editors/infinoted.nix b/nixos/modules/services/editors/infinoted.nix index 8b997ccbf66..10d868b7f16 100644 --- a/nixos/modules/services/editors/infinoted.nix +++ b/nixos/modules/services/editors/infinoted.nix @@ -141,14 +141,14 @@ in { install -o ${cfg.user} -g ${cfg.group} -m 0600 /dev/null /var/lib/infinoted/infinoted.conf cat >>/var/lib/infinoted/infinoted.conf <<EOF [infinoted] - ${optionalString (cfg.keyFile != null) ''key-file=${cfg.keyFile}''} - ${optionalString (cfg.certificateFile != null) ''certificate-file=${cfg.certificateFile}''} - ${optionalString (cfg.certificateChain != null) ''certificate-chain=${cfg.certificateChain}''} + ${optionalString (cfg.keyFile != null) "key-file=${cfg.keyFile}"} + ${optionalString (cfg.certificateFile != null) "certificate-file=${cfg.certificateFile}"} + ${optionalString (cfg.certificateChain != null) "certificate-chain=${cfg.certificateChain}"} port=${toString cfg.port} security-policy=${cfg.securityPolicy} root-directory=${cfg.rootDirectory} plugins=${concatStringsSep ";" cfg.plugins} - ${optionalString (cfg.passwordFile != null) ''password=$(head -n 1 ${cfg.passwordFile})''} + ${optionalString (cfg.passwordFile != null) "password=$(head -n 1 ${cfg.passwordFile})"} ${cfg.extraConfig} EOF diff --git a/nixos/modules/services/games/freeciv.nix b/nixos/modules/services/games/freeciv.nix new file mode 100644 index 00000000000..4923891a617 --- /dev/null +++ b/nixos/modules/services/games/freeciv.nix @@ -0,0 +1,187 @@ +{ config, lib, pkgs, ... }: +with lib; +let + cfg = config.services.freeciv; + inherit (config.users) groups; + rootDir = "/run/freeciv"; + argsFormat = { + type = with lib.types; let + valueType = nullOr (oneOf [ + bool int float str + (listOf valueType) + ]) // { + description = "freeciv-server params"; + }; + in valueType; + generate = name: value: + let mkParam = k: v: + if v == null then [] + else if isBool v then if v then [("--"+k)] else [] + else [("--"+k) v]; + mkParams = k: v: map (mkParam k) (if isList v then v else [v]); + in escapeShellArgs (concatLists (concatLists (mapAttrsToList mkParams value))); + }; +in +{ + options = { + services.freeciv = { + enable = mkEnableOption ''freeciv''; + settings = mkOption { + description = '' + Parameters of freeciv-server. + ''; + default = {}; + type = types.submodule { + freeformType = argsFormat.type; + options.Announce = mkOption { + type = types.enum ["IPv4" "IPv6" "none"]; + default = "none"; + description = "Announce game in LAN using given protocol."; + }; + options.auth = mkEnableOption "server authentication"; + options.Database = mkOption { + type = types.nullOr types.str; + apply = pkgs.writeText "auth.conf"; + default = '' + [fcdb] + backend="sqlite" + database="/var/lib/freeciv/auth.sqlite" + ''; + description = "Enable database connection with given configuration."; + }; + options.debug = mkOption { + type = types.ints.between 0 3; + default = 0; + description = "Set debug log level."; + }; + options.exit-on-end = mkEnableOption "exit instead of restarting when a game ends."; + options.Guests = mkEnableOption "guests to login if auth is enabled"; + options.Newusers = mkEnableOption "new users to login if auth is enabled"; + options.port = mkOption { + type = types.port; + default = 5556; + description = "Listen for clients on given port"; + }; + options.quitidle = mkOption { + type = types.nullOr types.int; + default = null; + description = "Quit if no players for given time in seconds."; + }; + options.read = mkOption { + type = types.lines; + apply = v: pkgs.writeTextDir "read.serv" v + "/read"; + default = '' + /fcdb lua sqlite_createdb() + ''; + description = "Startup script."; + }; + options.saves = mkOption { + type = types.nullOr types.str; + default = "/var/lib/freeciv/saves/"; + description = '' + Save games to given directory, + a sub-directory named after the starting date of the service + will me inserted to preserve older saves. + ''; + }; + }; + }; + openFirewall = mkEnableOption "opening the firewall for the port listening for clients"; + }; + }; + config = mkIf cfg.enable { + users.groups.freeciv = {}; + # Use with: + # journalctl -u freeciv.service -f -o cat & + # cat >/run/freeciv.stdin + # load saves/2020-11-14_05-22-27/freeciv-T0005-Y-3750-interrupted.sav.bz2 + systemd.sockets.freeciv = { + wantedBy = [ "sockets.target" ]; + socketConfig = { + ListenFIFO = "/run/freeciv.stdin"; + SocketGroup = groups.freeciv.name; + SocketMode = "660"; + RemoveOnStop = true; + }; + }; + systemd.services.freeciv = { + description = "Freeciv Service"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + environment.HOME = "/var/lib/freeciv"; + serviceConfig = { + Restart = "on-failure"; + RestartSec = "5s"; + StandardInput = "fd:freeciv.socket"; + StandardOutput = "journal"; + StandardError = "journal"; + ExecStart = pkgs.writeShellScript "freeciv-server" ('' + set -eux + savedir=$(date +%Y-%m-%d_%H-%M-%S) + '' + "${pkgs.freeciv}/bin/freeciv-server" + + " " + optionalString (cfg.settings.saves != null) + (concatStringsSep " " [ "--saves" "${escapeShellArg cfg.settings.saves}/$savedir" ]) + + " " + argsFormat.generate "freeciv-server" (cfg.settings // { saves = null; })); + DynamicUser = true; + # Create rootDir in the host's mount namespace. + RuntimeDirectory = [(baseNameOf rootDir)]; + RuntimeDirectoryMode = "755"; + StateDirectory = [ "freeciv" ]; + WorkingDirectory = "/var/lib/freeciv"; + # Avoid mounting rootDir in the own rootDir of ExecStart='s mount namespace. + InaccessiblePaths = ["-+${rootDir}"]; + # This is for BindPaths= and BindReadOnlyPaths= + # to allow traversal of directories they create in RootDirectory=. + UMask = "0066"; + RootDirectory = rootDir; + RootDirectoryStartOnly = true; + MountAPIVFS = true; + BindReadOnlyPaths = [ + builtins.storeDir + "/etc" + "/run" + ]; + # The following options are only for optimizing: + # systemd-analyze security freeciv + AmbientCapabilities = ""; + CapabilityBoundingSet = ""; + # ProtectClock= adds DeviceAllow=char-rtc r + DeviceAllow = ""; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateMounts = true; + PrivateNetwork = mkDefault false; + PrivateTmp = true; + PrivateUsers = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectSystem = "strict"; + RemoveIPC = true; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallFilter = [ + "@system-service" + # Groups in @system-service which do not contain a syscall listed by: + # perf stat -x, 2>perf.log -e 'syscalls:sys_enter_*' freeciv-server + # in tests, and seem likely not necessary for freeciv-server. + "~@aio" "~@chown" "~@ipc" "~@keyring" "~@memlock" + "~@resources" "~@setuid" "~@sync" "~@timer" + ]; + SystemCallArchitectures = "native"; + SystemCallErrorNumber = "EPERM"; + }; + }; + networking.firewall = mkIf cfg.openFirewall + { allowedTCPPorts = [ cfg.settings.port ]; }; + }; + meta.maintainers = with lib.maintainers; [ julm ]; +} diff --git a/nixos/modules/services/games/openarena.nix b/nixos/modules/services/games/openarena.nix index 8c014d78809..9c441e98b20 100644 --- a/nixos/modules/services/games/openarena.nix +++ b/nixos/modules/services/games/openarena.nix @@ -19,7 +19,7 @@ in extraFlags = mkOption { type = types.listOf types.str; default = []; - description = ''Extra flags to pass to <command>oa_ded</command>''; + description = "Extra flags to pass to <command>oa_ded</command>"; example = [ "+set dedicated 2" "+set sv_hostname 'My NixOS OpenArena Server'" diff --git a/nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix b/nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix index ec0457bbd58..556f6bbb419 100644 --- a/nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix +++ b/nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix @@ -19,18 +19,16 @@ nix-shell -E 'with import <nixpkgs> { }; brscan4-etc-files.override{netDevices=[ */ -with lib; - let addNetDev = nd: '' brsaneconfig4 -a \ name="${nd.name}" \ model="${nd.model}" \ - ${if (hasAttr "nodename" nd && nd.nodename != null) then + ${if (lib.hasAttr "nodename" nd && nd.nodename != null) then ''nodename="${nd.nodename}"'' else ''ip="${nd.ip}"''}''; - addAllNetDev = xs: concatStringsSep "\n" (map addNetDev xs); + addAllNetDev = xs: lib.concatStringsSep "\n" (map addNetDev xs); in stdenv.mkDerivation { @@ -61,11 +59,11 @@ stdenv.mkDerivation { dontStrip = true; dontPatchELF = true; - meta = { + meta = with lib; { description = "Brother brscan4 sane backend driver etc files"; homepage = "http://www.brother.com"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.unfree; - maintainers = with stdenv.lib.maintainers; [ jraygauthier ]; + platforms = platforms.linux; + license = licenses.unfree; + maintainers = with maintainers; [ jraygauthier ]; }; } diff --git a/nixos/modules/services/logging/logstash.nix b/nixos/modules/services/logging/logstash.nix index bf92425f998..a4fc315d080 100644 --- a/nixos/modules/services/logging/logstash.nix +++ b/nixos/modules/services/logging/logstash.nix @@ -100,7 +100,7 @@ in inputConfig = mkOption { type = types.lines; - default = ''generator { }''; + default = "generator { }"; description = "Logstash input configuration."; example = '' # Read from journal @@ -131,7 +131,7 @@ in outputConfig = mkOption { type = types.lines; - default = ''stdout { codec => rubydebug }''; + default = "stdout { codec => rubydebug }"; description = "Logstash output configuration."; example = '' redis { host => ["localhost"] data_type => "list" key => "logstash" codec => json } diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index 795a76f748a..63c0961b756 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -25,8 +25,6 @@ let clientRestrictions = concatStringsSep ", " (clientAccess ++ dnsBl); - smtpTlsSecurityLevel = if cfg.useDane then "dane" else "may"; - mainCf = let escape = replaceStrings ["$"] ["$$"]; mkList = items: "\n " + concatStringsSep ",\n " items; @@ -510,14 +508,6 @@ in ''; }; - useDane = mkOption { - type = types.bool; - default = false; - description = '' - Sets smtp_tls_security_level to "dane" rather than "may". See postconf(5) for details. - ''; - }; - sslCert = mkOption { type = types.str; default = ""; @@ -570,6 +560,7 @@ in transport = mkOption { default = ""; + type = types.lines; description = " Entries for the transport map, cf. man-page transport(8). "; @@ -583,6 +574,7 @@ in dnsBlacklistOverrides = mkOption { default = ""; + type = types.lines; description = "contents of check_client_access for overriding dnsBlacklists"; }; @@ -819,13 +811,13 @@ in // optionalAttrs cfg.enableHeaderChecks { header_checks = [ "regexp:/etc/postfix/header_checks" ]; } // optionalAttrs (cfg.tlsTrustedAuthorities != "") { smtp_tls_CAfile = cfg.tlsTrustedAuthorities; - smtp_tls_security_level = smtpTlsSecurityLevel; + smtp_tls_security_level = mkDefault "may"; } // optionalAttrs (cfg.sslCert != "") { smtp_tls_cert_file = cfg.sslCert; smtp_tls_key_file = cfg.sslKey; - smtp_tls_security_level = smtpTlsSecurityLevel; + smtp_tls_security_level = mkDefault "may"; smtpd_tls_cert_file = cfg.sslCert; smtpd_tls_key_file = cfg.sslKey; @@ -969,5 +961,9 @@ in imports = [ (mkRemovedOptionModule [ "services" "postfix" "sslCACert" ] "services.postfix.sslCACert was replaced by services.postfix.tlsTrustedAuthorities. In case you intend that your server should validate requested client certificates use services.postfix.extraConfig.") + + (mkChangedOptionModule [ "services" "postfix" "useDane" ] + [ "services" "postfix" "config" "smtp_tls_security_level" ] + (config: mkIf config.services.postfix.useDane "dane")) ]; } diff --git a/nixos/modules/services/mail/postgrey.nix b/nixos/modules/services/mail/postgrey.nix index 709f6b21aa0..7c206e3725e 100644 --- a/nixos/modules/services/mail/postgrey.nix +++ b/nixos/modules/services/mail/postgrey.nix @@ -163,7 +163,7 @@ in { systemd.services.postgrey = let bind-flag = if cfg.socket ? path then - ''--unix=${cfg.socket.path} --socketmode=${cfg.socket.mode}'' + "--unix=${cfg.socket.path} --socketmode=${cfg.socket.mode}" else ''--inet=${optionalString (cfg.socket.addr != null) (cfg.socket.addr + ":")}${toString cfg.socket.port}''; in { diff --git a/nixos/modules/services/misc/autofs.nix b/nixos/modules/services/misc/autofs.nix index 5e7c1e66828..541f0d2db19 100644 --- a/nixos/modules/services/misc/autofs.nix +++ b/nixos/modules/services/misc/autofs.nix @@ -52,6 +52,7 @@ in }; timeout = mkOption { + type = types.int; default = 600; description = "Set the global minimum timeout, in seconds, until directories are unmounted"; }; diff --git a/nixos/modules/services/misc/cgminer.nix b/nixos/modules/services/misc/cgminer.nix index fa9c8c54509..662570f9451 100644 --- a/nixos/modules/services/misc/cgminer.nix +++ b/nixos/modules/services/misc/cgminer.nix @@ -41,12 +41,14 @@ in }; user = mkOption { + type = types.str; default = "cgminer"; description = "User account under which cgminer runs"; }; pools = mkOption { default = []; # Run benchmark + type = types.listOf (types.attrsOf types.str); description = "List of pools where to mine"; example = [{ url = "http://p2pool.org:9332"; @@ -57,6 +59,7 @@ in hardware = mkOption { default = []; # Run without options + type = types.listOf (types.attrsOf (types.either types.str types.int)); description= "List of config options for every GPU"; example = [ { @@ -83,6 +86,7 @@ in config = mkOption { default = {}; + type = (types.either types.bool types.int); description = "Additional config"; example = { auto-fan = true; @@ -120,7 +124,7 @@ in wantedBy = [ "multi-user.target" ]; environment = { - LD_LIBRARY_PATH = ''/run/opengl-driver/lib:/run/opengl-driver-32/lib''; + LD_LIBRARY_PATH = "/run/opengl-driver/lib:/run/opengl-driver-32/lib"; DISPLAY = ":${toString config.services.xserver.display}"; GPU_MAX_ALLOC_PERCENT = "100"; GPU_USE_SYNC_OBJECTS = "1"; diff --git a/nixos/modules/services/misc/dictd.nix b/nixos/modules/services/misc/dictd.nix index d175854d2d1..6e796a3a1fc 100644 --- a/nixos/modules/services/misc/dictd.nix +++ b/nixos/modules/services/misc/dictd.nix @@ -27,7 +27,7 @@ in default = with pkgs.dictdDBs; [ wiktionary wordnet ]; defaultText = "with pkgs.dictdDBs; [ wiktionary wordnet ]"; example = literalExample "[ pkgs.dictdDBs.nld2eng ]"; - description = ''List of databases to make available.''; + description = "List of databases to make available."; }; }; diff --git a/nixos/modules/services/misc/disnix.nix b/nixos/modules/services/misc/disnix.nix deleted file mode 100644 index 41483d80a2d..00000000000 --- a/nixos/modules/services/misc/disnix.nix +++ /dev/null @@ -1,98 +0,0 @@ -# Disnix server -{ config, lib, pkgs, ... }: - -with lib; - -let - - cfg = config.services.disnix; - -in - -{ - - ###### interface - - options = { - - services.disnix = { - - enable = mkEnableOption "Disnix"; - - enableMultiUser = mkOption { - type = types.bool; - default = true; - description = "Whether to support multi-user mode by enabling the Disnix D-Bus service"; - }; - - useWebServiceInterface = mkEnableOption "the DisnixWebService interface running on Apache Tomcat"; - - package = mkOption { - type = types.path; - description = "The Disnix package"; - default = pkgs.disnix; - defaultText = "pkgs.disnix"; - }; - - enableProfilePath = mkEnableOption "exposing the Disnix profiles in the system's PATH"; - - profiles = mkOption { - type = types.listOf types.string; - default = [ "default" ]; - example = [ "default" ]; - description = "Names of the Disnix profiles to expose in the system's PATH"; - }; - }; - - }; - - ###### implementation - - config = mkIf cfg.enable { - dysnomia.enable = true; - - environment.systemPackages = [ pkgs.disnix ] ++ optional cfg.useWebServiceInterface pkgs.DisnixWebService; - environment.variables.PATH = lib.optionals cfg.enableProfilePath (map (profileName: "/nix/var/nix/profiles/disnix/${profileName}/bin" ) cfg.profiles); - - services.dbus.enable = true; - services.dbus.packages = [ pkgs.disnix ]; - - services.tomcat.enable = cfg.useWebServiceInterface; - services.tomcat.extraGroups = [ "disnix" ]; - services.tomcat.javaOpts = "${optionalString cfg.useWebServiceInterface "-Djava.library.path=${pkgs.libmatthew_java}/lib/jni"} "; - services.tomcat.sharedLibs = optional cfg.useWebServiceInterface "${pkgs.DisnixWebService}/share/java/DisnixConnection.jar" - ++ optional cfg.useWebServiceInterface "${pkgs.dbus_java}/share/java/dbus.jar"; - services.tomcat.webapps = optional cfg.useWebServiceInterface pkgs.DisnixWebService; - - users.groups.disnix.gid = config.ids.gids.disnix; - - systemd.services = { - disnix = mkIf cfg.enableMultiUser { - description = "Disnix server"; - wants = [ "dysnomia.target" ]; - wantedBy = [ "multi-user.target" ]; - after = [ "dbus.service" ] - ++ optional config.services.httpd.enable "httpd.service" - ++ optional config.services.mysql.enable "mysql.service" - ++ optional config.services.postgresql.enable "postgresql.service" - ++ optional config.services.tomcat.enable "tomcat.service" - ++ optional config.services.svnserve.enable "svnserve.service" - ++ optional config.services.mongodb.enable "mongodb.service" - ++ optional config.services.influxdb.enable "influxdb.service"; - - restartIfChanged = false; - - path = [ config.nix.package cfg.package config.dysnomia.package "/run/current-system/sw" ]; - - environment = { - HOME = "/root"; - } - // (if config.environment.variables ? DYSNOMIA_CONTAINERS_PATH then { inherit (config.environment.variables) DYSNOMIA_CONTAINERS_PATH; } else {}) - // (if config.environment.variables ? DYSNOMIA_MODULES_PATH then { inherit (config.environment.variables) DYSNOMIA_MODULES_PATH; } else {}); - - serviceConfig.ExecStart = "${cfg.package}/bin/disnix-service"; - }; - - }; - }; -} diff --git a/nixos/modules/services/misc/dysnomia.nix b/nixos/modules/services/misc/dysnomia.nix deleted file mode 100644 index eb94791fbbf..00000000000 --- a/nixos/modules/services/misc/dysnomia.nix +++ /dev/null @@ -1,257 +0,0 @@ -{pkgs, lib, config, ...}: - -with lib; - -let - cfg = config.dysnomia; - - printProperties = properties: - concatMapStrings (propertyName: - let - property = properties.${propertyName}; - in - if isList property then "${propertyName}=(${lib.concatMapStrings (elem: "\"${toString elem}\" ") (properties.${propertyName})})\n" - else "${propertyName}=\"${toString property}\"\n" - ) (builtins.attrNames properties); - - properties = pkgs.stdenv.mkDerivation { - name = "dysnomia-properties"; - buildCommand = '' - cat > $out << "EOF" - ${printProperties cfg.properties} - EOF - ''; - }; - - containersDir = pkgs.stdenv.mkDerivation { - name = "dysnomia-containers"; - buildCommand = '' - mkdir -p $out - cd $out - - ${concatMapStrings (containerName: - let - containerProperties = cfg.containers.${containerName}; - in - '' - cat > ${containerName} <<EOF - ${printProperties containerProperties} - type=${containerName} - EOF - '' - ) (builtins.attrNames cfg.containers)} - ''; - }; - - linkMutableComponents = {containerName}: - '' - mkdir ${containerName} - - ${concatMapStrings (componentName: - let - component = cfg.components.${containerName}.${componentName}; - in - "ln -s ${component} ${containerName}/${componentName}\n" - ) (builtins.attrNames (cfg.components.${containerName} or {}))} - ''; - - componentsDir = pkgs.stdenv.mkDerivation { - name = "dysnomia-components"; - buildCommand = '' - mkdir -p $out - cd $out - - ${concatMapStrings (containerName: - linkMutableComponents { inherit containerName; } - ) (builtins.attrNames cfg.components)} - ''; - }; - - dysnomiaFlags = { - enableApacheWebApplication = config.services.httpd.enable; - enableAxis2WebService = config.services.tomcat.axis2.enable; - enableDockerContainer = config.virtualisation.docker.enable; - enableEjabberdDump = config.services.ejabberd.enable; - enableMySQLDatabase = config.services.mysql.enable; - enablePostgreSQLDatabase = config.services.postgresql.enable; - enableTomcatWebApplication = config.services.tomcat.enable; - enableMongoDatabase = config.services.mongodb.enable; - enableSubversionRepository = config.services.svnserve.enable; - enableInfluxDatabase = config.services.influxdb.enable; - }; -in -{ - options = { - dysnomia = { - - enable = mkOption { - type = types.bool; - default = false; - description = "Whether to enable Dysnomia"; - }; - - enableAuthentication = mkOption { - type = types.bool; - default = false; - description = "Whether to publish privacy-sensitive authentication credentials"; - }; - - package = mkOption { - type = types.path; - description = "The Dysnomia package"; - }; - - properties = mkOption { - description = "An attribute set in which each attribute represents a machine property. Optionally, these values can be shell substitutions."; - default = {}; - }; - - containers = mkOption { - description = "An attribute set in which each key represents a container and each value an attribute set providing its configuration properties"; - default = {}; - }; - - components = mkOption { - description = "An atttribute set in which each key represents a container and each value an attribute set in which each key represents a component and each value a derivation constructing its initial state"; - default = {}; - }; - - extraContainerProperties = mkOption { - description = "An attribute set providing additional container settings in addition to the default properties"; - default = {}; - }; - - extraContainerPaths = mkOption { - description = "A list of paths containing additional container configurations that are added to the search folders"; - default = []; - }; - - extraModulePaths = mkOption { - description = "A list of paths containing additional modules that are added to the search folders"; - default = []; - }; - - enableLegacyModules = mkOption { - type = types.bool; - default = true; - description = "Whether to enable Dysnomia legacy process and wrapper modules"; - }; - }; - }; - - config = mkIf cfg.enable { - - environment.etc = { - "dysnomia/containers" = { - source = containersDir; - }; - "dysnomia/components" = { - source = componentsDir; - }; - "dysnomia/properties" = { - source = properties; - }; - }; - - environment.variables = { - DYSNOMIA_STATEDIR = "/var/state/dysnomia-nixos"; - DYSNOMIA_CONTAINERS_PATH = "${lib.concatMapStrings (containerPath: "${containerPath}:") cfg.extraContainerPaths}/etc/dysnomia/containers"; - DYSNOMIA_MODULES_PATH = "${lib.concatMapStrings (modulePath: "${modulePath}:") cfg.extraModulePaths}/etc/dysnomia/modules"; - }; - - environment.systemPackages = [ cfg.package ]; - - dysnomia.package = pkgs.dysnomia.override (origArgs: dysnomiaFlags // lib.optionalAttrs (cfg.enableLegacyModules) { - enableLegacy = builtins.trace '' - WARNING: Dysnomia has been configured to use the legacy 'process' and 'wrapper' - modules for compatibility reasons! If you rely on these modules, consider - migrating to better alternatives. - - More information: https://raw.githubusercontent.com/svanderburg/dysnomia/f65a9a84827bcc4024d6b16527098b33b02e4054/README-legacy.md - - If you have migrated already or don't rely on these Dysnomia modules, you can - disable legacy mode with the following NixOS configuration option: - - dysnomia.enableLegacyModules = false; - - In a future version of Dysnomia (and NixOS) the legacy option will go away! - '' true; - }); - - dysnomia.properties = { - hostname = config.networking.hostName; - inherit (config.nixpkgs.localSystem) system; - - supportedTypes = [ - "echo" - "fileset" - "process" - "wrapper" - - # These are not base modules, but they are still enabled because they work with technology that are always enabled in NixOS - "systemd-unit" - "sysvinit-script" - "nixos-configuration" - ] - ++ optional (dysnomiaFlags.enableApacheWebApplication) "apache-webapplication" - ++ optional (dysnomiaFlags.enableAxis2WebService) "axis2-webservice" - ++ optional (dysnomiaFlags.enableDockerContainer) "docker-container" - ++ optional (dysnomiaFlags.enableEjabberdDump) "ejabberd-dump" - ++ optional (dysnomiaFlags.enableInfluxDatabase) "influx-database" - ++ optional (dysnomiaFlags.enableMySQLDatabase) "mysql-database" - ++ optional (dysnomiaFlags.enablePostgreSQLDatabase) "postgresql-database" - ++ optional (dysnomiaFlags.enableTomcatWebApplication) "tomcat-webapplication" - ++ optional (dysnomiaFlags.enableMongoDatabase) "mongo-database" - ++ optional (dysnomiaFlags.enableSubversionRepository) "subversion-repository"; - }; - - dysnomia.containers = lib.recursiveUpdate ({ - process = {}; - wrapper = {}; - } - // lib.optionalAttrs (config.services.httpd.enable) { apache-webapplication = { - documentRoot = config.services.httpd.virtualHosts.localhost.documentRoot; - }; } - // lib.optionalAttrs (config.services.tomcat.axis2.enable) { axis2-webservice = {}; } - // lib.optionalAttrs (config.services.ejabberd.enable) { ejabberd-dump = { - ejabberdUser = config.services.ejabberd.user; - }; } - // lib.optionalAttrs (config.services.mysql.enable) { mysql-database = { - mysqlPort = config.services.mysql.port; - mysqlSocket = "/run/mysqld/mysqld.sock"; - } // lib.optionalAttrs cfg.enableAuthentication { - mysqlUsername = "root"; - }; - } - // lib.optionalAttrs (config.services.postgresql.enable) { postgresql-database = { - } // lib.optionalAttrs (cfg.enableAuthentication) { - postgresqlUsername = "postgres"; - }; - } - // lib.optionalAttrs (config.services.tomcat.enable) { tomcat-webapplication = { - tomcatPort = 8080; - }; } - // lib.optionalAttrs (config.services.mongodb.enable) { mongo-database = {}; } - // lib.optionalAttrs (config.services.influxdb.enable) { - influx-database = { - influxdbUsername = config.services.influxdb.user; - influxdbDataDir = "${config.services.influxdb.dataDir}/data"; - influxdbMetaDir = "${config.services.influxdb.dataDir}/meta"; - }; - } - // lib.optionalAttrs (config.services.svnserve.enable) { subversion-repository = { - svnBaseDir = config.services.svnserve.svnBaseDir; - }; }) cfg.extraContainerProperties; - - system.activationScripts.dysnomia = '' - mkdir -p /etc/systemd-mutable/system - if [ ! -f /etc/systemd-mutable/system/dysnomia.target ] - then - ( echo "[Unit]" - echo "Description=Services that are activated and deactivated by Dysnomia" - echo "After=final.target" - ) > /etc/systemd-mutable/system/dysnomia.target - fi - ''; - }; -} diff --git a/nixos/modules/services/misc/exhibitor.nix b/nixos/modules/services/misc/exhibitor.nix index f8c79f892da..28c98edf47a 100644 --- a/nixos/modules/services/misc/exhibitor.nix +++ b/nixos/modules/services/misc/exhibitor.nix @@ -185,7 +185,7 @@ in }; zkExtraCfg = mkOption { type = types.str; - default = ''initLimit=5&syncLimit=2&tickTime=2000''; + default = "initLimit=5&syncLimit=2&tickTime=2000"; description = '' Extra options to pass into Zookeeper ''; diff --git a/nixos/modules/services/misc/felix.nix b/nixos/modules/services/misc/felix.nix index 21740c8c0b7..8d438bb9eb1 100644 --- a/nixos/modules/services/misc/felix.nix +++ b/nixos/modules/services/misc/felix.nix @@ -27,11 +27,13 @@ in }; user = mkOption { + type = types.str; default = "osgi"; description = "User account under which Apache Felix runs."; }; group = mkOption { + type = types.str; default = "osgi"; description = "Group account under which Apache Felix runs."; }; diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix index ac702a05ee8..434e2d2429b 100644 --- a/nixos/modules/services/misc/gitea.nix +++ b/nixos/modules/services/misc/gitea.nix @@ -349,7 +349,7 @@ in { DOMAIN = cfg.domain; STATIC_ROOT_PATH = cfg.staticRootPath; - LFS_JWT_SECRET = "#jwtsecret#"; + LFS_JWT_SECRET = "#lfsjwtsecret#"; ROOT_URL = cfg.rootUrl; } (mkIf cfg.enableUnixSocket { @@ -381,6 +381,7 @@ in security = { SECRET_KEY = "#secretkey#"; + INTERNAL_TOKEN = "#internaltoken#"; INSTALL_LOCK = true; }; @@ -396,6 +397,10 @@ in mailer = mkIf (cfg.mailerPasswordFile != null) { PASSWD = "#mailerpass#"; }; + + oauth2 = { + JWT_SECRET = "#oauth2jwtsecret#"; + }; }; services.postgresql = optionalAttrs (usePostgresql && cfg.database.createDatabase) { @@ -453,12 +458,22 @@ in description = "gitea"; after = [ "network.target" ] ++ lib.optional usePostgresql "postgresql.service" ++ lib.optional useMysql "mysql.service"; wantedBy = [ "multi-user.target" ]; - path = [ gitea pkgs.gitAndTools.git ]; - + path = [ gitea pkgs.git ]; + + # In older versions the secret naming for JWT was kind of confusing. + # The file jwt_secret hold the value for LFS_JWT_SECRET and JWT_SECRET + # wasn't persistant at all. + # To fix that, there is now the file oauth2_jwt_secret containing the + # values for JWT_SECRET and the file jwt_secret gets renamed to + # lfs_jwt_secret. + # We have to consider this to stay compatible with older installations. preStart = let runConfig = "${cfg.stateDir}/custom/conf/app.ini"; secretKey = "${cfg.stateDir}/custom/conf/secret_key"; - jwtSecret = "${cfg.stateDir}/custom/conf/jwt_secret"; + oauth2JwtSecret = "${cfg.stateDir}/custom/conf/oauth2_jwt_secret"; + oldLfsJwtSecret = "${cfg.stateDir}/custom/conf/jwt_secret"; # old file for LFS_JWT_SECRET + lfsJwtSecret = "${cfg.stateDir}/custom/conf/lfs_jwt_secret"; # new file for LFS_JWT_SECRET + internalToken = "${cfg.stateDir}/custom/conf/internal_token"; in '' # copy custom configuration and generate a random secret key if needed ${optionalString (cfg.useWizard == false) '' @@ -468,24 +483,41 @@ in ${gitea}/bin/gitea generate secret SECRET_KEY > ${secretKey} fi - if [ ! -e ${jwtSecret} ]; then - ${gitea}/bin/gitea generate secret LFS_JWT_SECRET > ${jwtSecret} + # Migrate LFS_JWT_SECRET filename + if [[ -e ${oldLfsJwtSecret} && ! -e ${lfsJwtSecret} ]]; then + mv ${oldLfsJwtSecret} ${lfsJwtSecret} + fi + + if [ ! -e ${oauth2JwtSecret} ]; then + ${gitea}/bin/gitea generate secret JWT_SECRET > ${oauth2JwtSecret} + fi + + if [ ! -e ${lfsJwtSecret} ]; then + ${gitea}/bin/gitea generate secret LFS_JWT_SECRET > ${lfsJwtSecret} + fi + + if [ ! -e ${internalToken} ]; then + ${gitea}/bin/gitea generate secret INTERNAL_TOKEN > ${internalToken} fi - KEY="$(head -n1 ${secretKey})" + SECRETKEY="$(head -n1 ${secretKey})" DBPASS="$(head -n1 ${cfg.database.passwordFile})" - JWTSECRET="$(head -n1 ${jwtSecret})" + OAUTH2JWTSECRET="$(head -n1 ${oauth2JwtSecret})" + LFSJWTSECRET="$(head -n1 ${lfsJwtSecret})" + INTERNALTOKEN="$(head -n1 ${internalToken})" ${if (cfg.mailerPasswordFile == null) then '' MAILERPASSWORD="#mailerpass#" '' else '' MAILERPASSWORD="$(head -n1 ${cfg.mailerPasswordFile} || :)" ''} - sed -e "s,#secretkey#,$KEY,g" \ + sed -e "s,#secretkey#,$SECRETKEY,g" \ -e "s,#dbpass#,$DBPASS,g" \ - -e "s,#jwtsecret#,$JWTSECRET,g" \ + -e "s,#oauth2jwtsecret#,$OAUTH2JWTSECRET,g" \ + -e "s,#lfsjwtsecret#,$LFSJWTSECRET,g" \ + -e "s,#internaltoken#,$INTERNALTOKEN,g" \ -e "s,#mailerpass#,$MAILERPASSWORD,g" \ -i ${runConfig} - chmod 640 ${runConfig} ${secretKey} ${jwtSecret} + chmod 640 ${runConfig} ${secretKey} ${oauth2JwtSecret} ${lfsJwtSecret} ${internalToken} ''} # update all hooks' binary paths @@ -565,8 +597,7 @@ in users.groups.gitea = {}; warnings = - optional (cfg.database.password != "") '' - config.services.gitea.database.password will be stored as plaintext in the Nix store. Use database.passwordFile instead.'' ++ + optional (cfg.database.password != "") "config.services.gitea.database.password will be stored as plaintext in the Nix store. Use database.passwordFile instead." ++ optional (cfg.extraConfig != null) '' services.gitea.`extraConfig` is deprecated, please use services.gitea.`settings`. ''; diff --git a/nixos/modules/services/misc/gitit.nix b/nixos/modules/services/misc/gitit.nix index 1ec030549f9..f09565283f3 100644 --- a/nixos/modules/services/misc/gitit.nix +++ b/nixos/modules/services/misc/gitit.nix @@ -42,6 +42,7 @@ let }; extraPackages = mkOption { + type = types.functionTo (types.listOf types.package); default = self: []; example = literalExample '' haskellPackages: [ diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 35a9dccdff2..de4d1bf1987 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -736,7 +736,7 @@ in { environment = gitlabEnv; path = with pkgs; [ postgresqlPackage - gitAndTools.git + git ruby openssh nodejs @@ -764,7 +764,7 @@ in { path = with pkgs; [ openssh procps # See https://gitlab.com/gitlab-org/gitaly/issues/1562 - gitAndTools.git + git cfg.packages.gitaly.rubyEnv cfg.packages.gitaly.rubyEnv.wrappedRuby gzip @@ -806,7 +806,7 @@ in { wantedBy = [ "multi-user.target" ]; path = with pkgs; [ exiftool - gitAndTools.git + git gnutar gzip openssh @@ -854,7 +854,7 @@ in { environment = gitlabEnv; path = with pkgs; [ postgresqlPackage - gitAndTools.git + git openssh nodejs procps diff --git a/nixos/modules/services/misc/gitolite.nix b/nixos/modules/services/misc/gitolite.nix index 59cbdac319c..190ea9212d2 100644 --- a/nixos/modules/services/misc/gitolite.nix +++ b/nixos/modules/services/misc/gitolite.nix @@ -227,6 +227,6 @@ in }; environment.systemPackages = [ pkgs.gitolite pkgs.git ] - ++ optional cfg.enableGitAnnex pkgs.gitAndTools.git-annex; + ++ optional cfg.enableGitAnnex pkgs.git-annex; }); } diff --git a/nixos/modules/services/misc/ihaskell.nix b/nixos/modules/services/misc/ihaskell.nix index 684a242d738..c7332b87803 100644 --- a/nixos/modules/services/misc/ihaskell.nix +++ b/nixos/modules/services/misc/ihaskell.nix @@ -21,6 +21,7 @@ in }; extraPackages = mkOption { + type = types.functionTo (types.listOf types.package); default = self: []; example = literalExample '' haskellPackages: [ diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix index 3abb9b7d69c..8e3fa60206c 100644 --- a/nixos/modules/services/misc/matrix-synapse.nix +++ b/nixos/modules/services/misc/matrix-synapse.nix @@ -504,8 +504,7 @@ in { report_stats = mkOption { type = types.bool; default = false; - description = '' - ''; + description = ""; }; servers = mkOption { type = types.attrsOf (types.attrsOf types.str); diff --git a/nixos/modules/services/misc/matrix-synapse.xml b/nixos/modules/services/misc/matrix-synapse.xml index fbfa838b168..358b631eb48 100644 --- a/nixos/modules/services/misc/matrix-synapse.xml +++ b/nixos/modules/services/misc/matrix-synapse.xml @@ -69,6 +69,9 @@ in { # i.e. to delegate from the host being accessible as ${config.networking.domain} # to another host actually running the Matrix homeserver. "${config.networking.domain}" = { + <link linkend="opt-services.nginx.virtualHosts._name_.enableACME">enableACME</link> = true; + <link linkend="opt-services.nginx.virtualHosts._name_.forceSSL">forceSSL</link> = true; + <link linkend="opt-services.nginx.virtualHosts._name_.locations._name_.extraConfig">locations."= /.well-known/matrix/server".extraConfig</link> = let # use 443 instead of the default 8448 port to unite @@ -203,7 +206,7 @@ Success! <link linkend="opt-services.nginx.virtualHosts._name_.root">root</link> = pkgs.element-web.override { conf = { default_server_config."m.homeserver" = { - "base_url" = "${config.networking.domain}"; + "base_url" = "https://${fqdn}"; "server_name" = "${fqdn}"; }; }; diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 0eeff31d6c4..64bdbf159d5 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -587,10 +587,10 @@ in nix.systemFeatures = mkDefault ( [ "nixos-test" "benchmark" "big-parallel" "kvm" ] ++ - optionals (pkgs.hostPlatform.platform ? gcc.arch) ( - # a builder can run code for `platform.gcc.arch` and inferior architectures - [ "gccarch-${pkgs.hostPlatform.platform.gcc.arch}" ] ++ - map (x: "gccarch-${x}") lib.systems.architectures.inferiors.${pkgs.hostPlatform.platform.gcc.arch} + optionals (pkgs.hostPlatform ? gcc.arch) ( + # a builder can run code for `gcc.arch` and inferior architectures + [ "gccarch-${pkgs.hostPlatform.gcc.arch}" ] ++ + map (x: "gccarch-${x}") lib.systems.architectures.inferiors.${pkgs.hostPlatform.gcc.arch} ) ); diff --git a/nixos/modules/services/misc/octoprint.nix b/nixos/modules/services/misc/octoprint.nix index a69e6507305..5a64946f9f6 100644 --- a/nixos/modules/services/misc/octoprint.nix +++ b/nixos/modules/services/misc/octoprint.nix @@ -66,6 +66,7 @@ in }; plugins = mkOption { + type = types.functionTo (types.listOf types.package); default = plugins: []; defaultText = "plugins: []"; example = literalExample "plugins: with plugins; [ themeify stlviewer ]"; diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix index 1313bdaccc4..8b53eb471db 100644 --- a/nixos/modules/services/misc/redmine.nix +++ b/nixos/modules/services/misc/redmine.nix @@ -230,7 +230,7 @@ in production = { scm_subversion_command = "${pkgs.subversion}/bin/svn"; scm_mercurial_command = "${pkgs.mercurial}/bin/hg"; - scm_git_command = "${pkgs.gitAndTools.git}/bin/git"; + scm_git_command = "${pkgs.git}/bin/git"; scm_cvs_command = "${pkgs.cvs}/bin/cvs"; scm_bazaar_command = "${pkgs.breezy}/bin/bzr"; scm_darcs_command = "${pkgs.darcs}/bin/darcs"; @@ -299,7 +299,7 @@ in breezy cvs darcs - gitAndTools.git + git mercurial subversion ]; diff --git a/nixos/modules/services/misc/rippled.nix b/nixos/modules/services/misc/rippled.nix index ef34e3a779f..2fce3b9dc94 100644 --- a/nixos/modules/services/misc/rippled.nix +++ b/nixos/modules/services/misc/rippled.nix @@ -389,6 +389,7 @@ in extraConfig = mkOption { default = ""; + type = types.lines; description = '' Extra lines to be added verbatim to the rippled.cfg configuration file. ''; diff --git a/nixos/modules/services/misc/snapper.nix b/nixos/modules/services/misc/snapper.nix index 3560d08520b..a821b9b6bf6 100644 --- a/nixos/modules/services/misc/snapper.nix +++ b/nixos/modules/services/misc/snapper.nix @@ -48,6 +48,8 @@ in subvolume = "/home"; extraConfig = '' ALLOW_USERS="alice" + TIMELINE_CREATE=yes + TIMELINE_CLEANUP=yes ''; }; }; diff --git a/nixos/modules/services/misc/svnserve.nix b/nixos/modules/services/misc/svnserve.nix index f70e3ca7fef..5fa262ca3b9 100644 --- a/nixos/modules/services/misc/svnserve.nix +++ b/nixos/modules/services/misc/svnserve.nix @@ -24,6 +24,7 @@ in }; svnBaseDir = mkOption { + type = types.str; default = "/repos"; description = "Base directory from which Subversion repositories are accessed."; }; diff --git a/nixos/modules/services/misc/synergy.nix b/nixos/modules/services/misc/synergy.nix index 5b7cf3ac46c..7990a9f6f4c 100644 --- a/nixos/modules/services/misc/synergy.nix +++ b/nixos/modules/services/misc/synergy.nix @@ -23,12 +23,14 @@ in screenName = mkOption { default = ""; + type = types.str; description = '' Use the given name instead of the hostname to identify ourselves to the server. ''; }; serverAddress = mkOption { + type = types.str; description = '' The server address is of the form: [hostname][:port]. The hostname must be the address or hostname of the server. The @@ -46,10 +48,12 @@ in enable = mkEnableOption "the Synergy server (send keyboard and mouse events)"; configFile = mkOption { + type = types.path; default = "/etc/synergy-server.conf"; description = "The Synergy server configuration file."; }; screenName = mkOption { + type = types.str; default = ""; description = '' Use the given name instead of the hostname to identify @@ -57,6 +61,7 @@ in ''; }; address = mkOption { + type = types.str; default = ""; description = "Address on which to listen for clients."; }; diff --git a/nixos/modules/services/misc/weechat.nix b/nixos/modules/services/misc/weechat.nix index c6ff540ea12..b71250f62e0 100644 --- a/nixos/modules/services/misc/weechat.nix +++ b/nixos/modules/services/misc/weechat.nix @@ -20,6 +20,7 @@ in type = types.str; }; binary = mkOption { + type = types.path; description = "Binary to execute (by default \${weechat}/bin/weechat)."; example = literalExample '' ''${pkgs.weechat}/bin/weechat-headless diff --git a/nixos/modules/services/monitoring/apcupsd.nix b/nixos/modules/services/monitoring/apcupsd.nix index 75218aa1d46..1dccbc93edf 100644 --- a/nixos/modules/services/monitoring/apcupsd.nix +++ b/nixos/modules/services/monitoring/apcupsd.nix @@ -104,7 +104,7 @@ in hooks = mkOption { default = {}; example = { - doshutdown = ''# shell commands to notify that the computer is shutting down''; + doshutdown = "# shell commands to notify that the computer is shutting down"; }; type = types.attrsOf types.lines; description = '' diff --git a/nixos/modules/services/monitoring/grafana-image-renderer.nix b/nixos/modules/services/monitoring/grafana-image-renderer.nix index a010a5316ba..b8b95d846c6 100644 --- a/nixos/modules/services/monitoring/grafana-image-renderer.nix +++ b/nixos/modules/services/monitoring/grafana-image-renderer.nix @@ -122,7 +122,7 @@ in { timezone = config.time.timeZone; }; - services = { + service = { logging.level = mkIf cfg.verbose (mkDefault "debug"); metrics.enabled = mkDefault false; }; diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index 64d9d61950d..9213748d3c9 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -25,10 +25,10 @@ let graphiteApiConfig = pkgs.writeText "graphite-api.yaml" '' search_index: ${dataDir}/index - ${optionalString (config.time.timeZone != null) ''time_zone: ${config.time.timeZone}''} - ${optionalString (cfg.api.finders != []) ''finders:''} + ${optionalString (config.time.timeZone != null) "time_zone: ${config.time.timeZone}"} + ${optionalString (cfg.api.finders != []) "finders:"} ${concatMapStringsSep "\n" (f: " - " + f.moduleName) cfg.api.finders} - ${optionalString (cfg.api.functions != []) ''functions:''} + ${optionalString (cfg.api.functions != []) "functions:"} ${concatMapStringsSep "\n" (f: " - " + f) cfg.api.functions} ${cfg.api.extraConfig} ''; diff --git a/nixos/modules/services/monitoring/incron.nix b/nixos/modules/services/monitoring/incron.nix index 1789fd9f205..dc97af58562 100644 --- a/nixos/modules/services/monitoring/incron.nix +++ b/nixos/modules/services/monitoring/incron.nix @@ -67,7 +67,7 @@ in config = mkIf cfg.enable { warnings = optional (cfg.allow != null && cfg.deny != null) - ''If `services.incron.allow` is set then `services.incron.deny` will be ignored.''; + "If `services.incron.allow` is set then `services.incron.deny` will be ignored."; environment.systemPackages = [ pkgs.incron ]; diff --git a/nixos/modules/services/monitoring/netdata.nix b/nixos/modules/services/monitoring/netdata.nix index db51fdbd2c6..d5b679097b3 100644 --- a/nixos/modules/services/monitoring/netdata.nix +++ b/nixos/modules/services/monitoring/netdata.nix @@ -77,6 +77,7 @@ in { ''; }; extraPackages = mkOption { + type = types.functionTo (types.listOf types.package); default = ps: []; defaultText = "ps: []"; example = literalExample '' diff --git a/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix b/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix index 97210463027..a3b2b92bc34 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix @@ -20,7 +20,7 @@ in port = mkOption { type = types.int; default = 25826; - description = ''Network address on which to accept collectd binary network packets.''; + description = "Network address on which to accept collectd binary network packets."; }; listenAddress = mkOption { diff --git a/nixos/modules/services/monitoring/prometheus/exporters/nextcloud.nix b/nixos/modules/services/monitoring/prometheus/exporters/nextcloud.nix index aee6bd5e66c..ce7125bf5a8 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/nextcloud.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/nextcloud.nix @@ -46,11 +46,11 @@ in DynamicUser = false; ExecStart = '' ${pkgs.prometheus-nextcloud-exporter}/bin/nextcloud-exporter \ - -a ${cfg.listenAddress}:${toString cfg.port} \ - -u ${cfg.username} \ - -t ${cfg.timeout} \ - -l ${cfg.url} \ - -p ${escapeShellArg "@${cfg.passwordFile}"} \ + --addr ${cfg.listenAddress}:${toString cfg.port} \ + --username ${cfg.username} \ + --timeout ${cfg.timeout} \ + --server ${cfg.url} \ + --password ${escapeShellArg "@${cfg.passwordFile}"} \ ${concatStringsSep " \\\n " cfg.extraFlags} ''; }; diff --git a/nixos/modules/services/monitoring/telegraf.nix b/nixos/modules/services/monitoring/telegraf.nix index b341a9005c2..bc30ca3b77c 100644 --- a/nixos/modules/services/monitoring/telegraf.nix +++ b/nixos/modules/services/monitoring/telegraf.nix @@ -69,7 +69,7 @@ in { umask 077 ${pkgs.envsubst}/bin/envsubst -i "${configFile}" > /var/run/telegraf/config.toml ''); - ExecStart=''${cfg.package}/bin/telegraf -config ${finalConfigFile}''; + ExecStart="${cfg.package}/bin/telegraf -config ${finalConfigFile}"; ExecReload="${pkgs.coreutils}/bin/kill -HUP $MAINPID"; RuntimeDirectory = "telegraf"; User = "telegraf"; diff --git a/nixos/modules/services/monitoring/thanos.nix b/nixos/modules/services/monitoring/thanos.nix index 52dab28cf72..474ea4b2505 100644 --- a/nixos/modules/services/monitoring/thanos.nix +++ b/nixos/modules/services/monitoring/thanos.nix @@ -12,7 +12,7 @@ let }; optionToArgs = opt: v : optional (v != null) ''--${opt}="${toString v}"''; - flagToArgs = opt: v : optional v ''--${opt}''; + flagToArgs = opt: v : optional v "--${opt}"; listToArgs = opt: vs : map (v: ''--${opt}="${v}"'') vs; attrsToArgs = opt: kvs: mapAttrsToList (k: v: ''--${opt}=${k}=\"${v}\"'') kvs; @@ -67,7 +67,7 @@ let preferLocalBuild = true; json = builtins.toFile "${name}.json" (builtins.toJSON attrs); nativeBuildInputs = [ pkgs.remarshal ]; - } ''json2yaml -i $json -o $out''; + } "json2yaml -i $json -o $out"; thanos = cmd: "${cfg.package}/bin/thanos ${cmd}" + (let args = cfg.${cmd}.arguments; diff --git a/nixos/modules/services/monitoring/ups.nix b/nixos/modules/services/monitoring/ups.nix index a45e806d4ad..ae5097c5442 100644 --- a/nixos/modules/services/monitoring/ups.nix +++ b/nixos/modules/services/monitoring/ups.nix @@ -205,7 +205,7 @@ in after = [ "upsd.service" ]; wantedBy = [ "multi-user.target" ]; # TODO: replace 'root' by another username. - script = ''${pkgs.nut}/bin/upsdrvctl -u root start''; + script = "${pkgs.nut}/bin/upsdrvctl -u root start"; serviceConfig = { Type = "oneshot"; RemainAfterExit = true; diff --git a/nixos/modules/services/network-filesystems/ceph.nix b/nixos/modules/services/network-filesystems/ceph.nix index f2dc740fd88..632c3fb1059 100644 --- a/nixos/modules/services/network-filesystems/ceph.nix +++ b/nixos/modules/services/network-filesystems/ceph.nix @@ -48,7 +48,7 @@ let ExecStart = ''${ceph.out}/bin/${if daemonType == "rgw" then "radosgw" else "ceph-${daemonType}"} \ -f --cluster ${clusterName} --id ${daemonId}''; } // optionalAttrs (daemonType == "osd") { - ExecStartPre = ''${ceph.lib}/libexec/ceph/ceph-osd-prestart.sh --id ${daemonId} --cluster ${clusterName}''; + ExecStartPre = "${ceph.lib}/libexec/ceph/ceph-osd-prestart.sh --id ${daemonId} --cluster ${clusterName}"; RestartSec = "20s"; PrivateDevices = "no"; # osd needs disk access } // optionalAttrs ( daemonType == "mon") { @@ -353,7 +353,7 @@ in ]; warnings = optional (cfg.global.monInitialMembers == null) - ''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''; + "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 # Merge the extraConfig set for mgr daemons, as mgr don't have their own section diff --git a/nixos/modules/services/network-filesystems/netatalk.nix b/nixos/modules/services/network-filesystems/netatalk.nix index ca9d32311f5..33e851210bc 100644 --- a/nixos/modules/services/network-filesystems/netatalk.nix +++ b/nixos/modules/services/network-filesystems/netatalk.nix @@ -46,6 +46,7 @@ in enable = mkEnableOption "the Netatalk AFP fileserver"; port = mkOption { + type = types.port; default = 548; description = "TCP port to be used for AFP."; }; @@ -68,6 +69,7 @@ in }; path = mkOption { + type = types.str; default = ""; example = "afp-data"; description = "Share not the whole user home but this subdirectory path."; @@ -75,6 +77,7 @@ in basedirRegex = mkOption { example = "/home"; + type = types.str; description = "Regex which matches the parent directory of the user homes."; }; diff --git a/nixos/modules/services/network-filesystems/openafs/server.nix b/nixos/modules/services/network-filesystems/openafs/server.nix index d782f782165..4fce650b013 100644 --- a/nixos/modules/services/network-filesystems/openafs/server.nix +++ b/nixos/modules/services/network-filesystems/openafs/server.nix @@ -61,6 +61,7 @@ in { }; advertisedAddresses = mkOption { + type = types.listOf types.str; default = []; description = "List of IP addresses this server is advertised under. See NetInfo(5)"; }; diff --git a/nixos/modules/services/network-filesystems/rsyncd.nix b/nixos/modules/services/network-filesystems/rsyncd.nix index 9f1263ddff5..edac86eb0e3 100644 --- a/nixos/modules/services/network-filesystems/rsyncd.nix +++ b/nixos/modules/services/network-filesystems/rsyncd.nix @@ -46,6 +46,13 @@ in { ''; }; + socketActivated = mkOption { + default = false; + type = types.bool; + description = + "If enabled Rsync will be socket-activated rather than run persistently."; + }; + }; }; @@ -63,12 +70,55 @@ in { services.rsyncd.settings.global.port = toString cfg.port; - systemd.services.rsyncd = { - description = "Rsync daemon"; - wantedBy = [ "multi-user.target" ]; - serviceConfig.ExecStart = - "${pkgs.rsync}/bin/rsync --daemon --no-detach --config=${configFile}"; + systemd = let + serviceConfigSecurity = { + ProtectSystem = "full"; + PrivateDevices = "on"; + NoNewPrivileges = "on"; + }; + in { + services.rsync = { + enable = !cfg.socketActivated; + aliases = [ "rsyncd" ]; + + description = "fast remote file copy program daemon"; + after = [ "network.target" ]; + documentation = [ "man:rsync(1)" "man:rsyncd.conf(5)" ]; + + serviceConfig = serviceConfigSecurity // { + ExecStart = + "${pkgs.rsync}/bin/rsync --daemon --no-detach --config=${configFile}"; + RestartSec = 1; + }; + + wantedBy = [ "multi-user.target" ]; + }; + + services."rsync@" = { + description = "fast remote file copy program daemon"; + after = [ "network.target" ]; + + serviceConfig = serviceConfigSecurity // { + ExecStart = "${pkgs.rsync}/bin/rsync --daemon --config=${configFile}"; + StandardInput = "socket"; + StandardOutput = "inherit"; + StandardError = "journal"; + }; + }; + + sockets.rsync = { + enable = cfg.socketActivated; + + description = "socket for fast remote file copy program daemon"; + conflicts = [ "rsync.service" ]; + + listenStreams = [ (toString cfg.port) ]; + socketConfig.Accept = true; + + wantedBy = [ "sockets.target" ]; + }; }; + }; meta.maintainers = with lib.maintainers; [ ehmry ]; diff --git a/nixos/modules/services/network-filesystems/xtreemfs.nix b/nixos/modules/services/network-filesystems/xtreemfs.nix index 27a9fe847c5..6cc8a05ee00 100644 --- a/nixos/modules/services/network-filesystems/xtreemfs.nix +++ b/nixos/modules/services/network-filesystems/xtreemfs.nix @@ -92,6 +92,7 @@ in enable = mkEnableOption "XtreemFS"; homeDir = mkOption { + type = types.path; default = "/var/lib/xtreemfs"; description = '' XtreemFS home dir for the xtreemfs user. @@ -109,6 +110,7 @@ in uuid = mkOption { example = "eacb6bab-f444-4ebf-a06a-3f72d7465e40"; + type = types.str; description = '' Must be set to a unique identifier, preferably a UUID according to RFC 4122. UUIDs can be generated with `uuidgen` command, found in @@ -117,11 +119,13 @@ in }; port = mkOption { default = 32638; + type = types.port; description = '' The port to listen on for incoming connections (TCP). ''; }; address = mkOption { + type = types.str; example = "127.0.0.1"; default = ""; description = '' @@ -131,12 +135,14 @@ in }; httpPort = mkOption { default = 30638; + type = types.port; description = '' Specifies the listen port for the HTTP service that returns the status page. ''; }; syncMode = mkOption { + type = types.enum [ "ASYNC" "SYNC_WRITE_METADATA" "SYNC_WRITE" "FDATASYNC" "ASYNC" ]; default = "FSYNC"; example = "FDATASYNC"; description = '' @@ -229,6 +235,7 @@ in uuid = mkOption { example = "eacb6bab-f444-4ebf-a06a-3f72d7465e41"; + type = types.str; description = '' Must be set to a unique identifier, preferably a UUID according to RFC 4122. UUIDs can be generated with `uuidgen` command, found in @@ -237,12 +244,14 @@ in }; port = mkOption { default = 32636; + type = types.port; description = '' The port to listen on for incoming connections (TCP). ''; }; address = mkOption { example = "127.0.0.1"; + type = types.str; default = ""; description = '' If specified, it defines the interface to listen on. If not @@ -251,6 +260,7 @@ in }; httpPort = mkOption { default = 30636; + type = types.port; description = '' Specifies the listen port for the HTTP service that returns the status page. @@ -258,6 +268,7 @@ in }; syncMode = mkOption { default = "FSYNC"; + type = types.enum [ "ASYNC" "SYNC_WRITE_METADATA" "SYNC_WRITE" "FDATASYNC" "ASYNC" ]; example = "FDATASYNC"; description = '' The sync mode influences how operations are committed to the disk @@ -367,6 +378,7 @@ in uuid = mkOption { example = "eacb6bab-f444-4ebf-a06a-3f72d7465e42"; + type = types.str; description = '' Must be set to a unique identifier, preferably a UUID according to RFC 4122. UUIDs can be generated with `uuidgen` command, found in @@ -375,12 +387,14 @@ in }; port = mkOption { default = 32640; + type = types.port; description = '' The port to listen on for incoming connections (TCP and UDP). ''; }; address = mkOption { example = "127.0.0.1"; + type = types.str; default = ""; description = '' If specified, it defines the interface to listen on. If not @@ -389,6 +403,7 @@ in }; httpPort = mkOption { default = 30640; + type = types.port; description = '' Specifies the listen port for the HTTP service that returns the status page. diff --git a/nixos/modules/services/network-filesystems/yandex-disk.nix b/nixos/modules/services/network-filesystems/yandex-disk.nix index cc73f13bf77..a5b1f9d4ab6 100644 --- a/nixos/modules/services/network-filesystems/yandex-disk.nix +++ b/nixos/modules/services/network-filesystems/yandex-disk.nix @@ -46,12 +46,14 @@ in user = mkOption { default = null; + type = types.nullOr types.str; description = '' The user the yandex-disk daemon should run as. ''; }; directory = mkOption { + type = types.path; default = "/home/Yandex.Disk"; description = "The directory to use for Yandex.Disk storage"; }; diff --git a/nixos/modules/services/networking/amuled.nix b/nixos/modules/services/networking/amuled.nix index 1128ee2c3e6..39320643dd5 100644 --- a/nixos/modules/services/networking/amuled.nix +++ b/nixos/modules/services/networking/amuled.nix @@ -24,13 +24,15 @@ in }; dataDir = mkOption { - default = ''/home/${user}/''; + type = types.str; + default = "/home/${user}/"; description = '' The directory holding configuration, incoming and temporary files. ''; }; user = mkOption { + type = types.nullOr types.str; default = null; description = '' The user the AMule daemon should run as. diff --git a/nixos/modules/services/networking/babeld.nix b/nixos/modules/services/networking/babeld.nix index 90395dbd3c5..272c58ecd7f 100644 --- a/nixos/modules/services/networking/babeld.nix +++ b/nixos/modules/services/networking/babeld.nix @@ -69,6 +69,7 @@ in extraConfig = mkOption { default = ""; + type = types.lines; description = '' Options that will be copied to babeld.conf. See <citerefentry><refentrytitle>babeld</refentrytitle><manvolnum>8</manvolnum></citerefentry> for details. diff --git a/nixos/modules/services/networking/bee-clef.nix b/nixos/modules/services/networking/bee-clef.nix new file mode 100644 index 00000000000..719714b2898 --- /dev/null +++ b/nixos/modules/services/networking/bee-clef.nix @@ -0,0 +1,107 @@ +{ config, lib, pkgs, ... }: + +# NOTE for now nothing is installed into /etc/bee-clef/. the config files are used as read-only from the nix store. + +with lib; +let + cfg = config.services.bee-clef; +in { + meta = { + maintainers = with maintainers; [ attila-lendvai ]; + }; + + ### interface + + options = { + services.bee-clef = { + enable = mkEnableOption "clef external signer instance for Ethereum Swarm Bee"; + + dataDir = mkOption { + type = types.nullOr types.str; + default = "/var/lib/bee-clef"; + description = '' + Data dir for bee-clef. Beware that some helper scripts may not work when changed! + The service itself should work fine, though. + ''; + }; + + passwordFile = mkOption { + type = types.nullOr types.str; + default = "/var/lib/bee-clef/password"; + description = "Password file for bee-clef."; + }; + + user = mkOption { + type = types.str; + default = "bee-clef"; + description = '' + User the bee-clef daemon should execute under. + ''; + }; + + group = mkOption { + type = types.str; + default = "bee-clef"; + description = '' + Group the bee-clef daemon should execute under. + ''; + }; + }; + }; + + ### implementation + + config = mkIf cfg.enable { + # if we ever want to have rules.js under /etc/bee-clef/ + # environment.etc."bee-clef/rules.js".source = ${pkgs.bee-clef}/rules.js + + systemd.packages = [ pkgs.bee-clef ]; # include the upstream bee-clef.service file + + systemd.tmpfiles.rules = [ + "d '${cfg.dataDir}/' 0750 ${cfg.user} ${cfg.group}" + "d '${cfg.dataDir}/keystore' 0700 ${cfg.user} ${cfg.group}" + ]; + + systemd.services.bee-clef = { + path = [ + # these are needed for the ensure-clef-account script + pkgs.coreutils + pkgs.gnused + pkgs.gawk + ]; + + wantedBy = [ "bee.service" "multi-user.target" ]; + + serviceConfig = { + User = cfg.user; + Group = cfg.group; + ExecStartPre = ''${pkgs.bee-clef}/share/bee-clef/ensure-clef-account "${cfg.dataDir}" "${pkgs.bee-clef}/share/bee-clef/"''; + ExecStart = [ + "" # this hides/overrides what's in the original entry + "${pkgs.bee-clef}/share/bee-clef/bee-clef-service start" + ]; + ExecStop = [ + "" # this hides/overrides what's in the original entry + "${pkgs.bee-clef}/share/bee-clef/bee-clef-service stop" + ]; + Environment = [ + "CONFIGDIR=${cfg.dataDir}" + "PASSWORD_FILE=${cfg.passwordFile}" + ]; + }; + }; + + users.users = optionalAttrs (cfg.user == "bee-clef") { + bee-clef = { + group = cfg.group; + home = cfg.dataDir; + isSystemUser = true; + description = "Daemon user for the bee-clef service"; + }; + }; + + users.groups = optionalAttrs (cfg.group == "bee-clef") { + bee-clef = {}; + }; + }; +} diff --git a/nixos/modules/services/networking/bee.nix b/nixos/modules/services/networking/bee.nix new file mode 100644 index 00000000000..8a77ce23ab4 --- /dev/null +++ b/nixos/modules/services/networking/bee.nix @@ -0,0 +1,149 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + cfg = config.services.bee; + format = pkgs.formats.yaml {}; + configFile = format.generate "bee.yaml" cfg.settings; +in { + meta = { + # doc = ./bee.xml; + maintainers = with maintainers; [ attila-lendvai ]; + }; + + ### interface + + options = { + services.bee = { + enable = mkEnableOption "Ethereum Swarm Bee"; + + package = mkOption { + type = types.package; + default = pkgs.bee; + defaultText = "pkgs.bee"; + example = "pkgs.bee-unstable"; + description = "The package providing the bee binary for the service."; + }; + + settings = mkOption { + type = format.type; + description = '' + Ethereum Swarm Bee configuration. Refer to + <link xlink:href="https://gateway.ethswarm.org/bzz/docs.swarm.eth/docs/installation/configuration/"/> + for details on supported values. + ''; + }; + + daemonNiceLevel = mkOption { + type = types.int; + default = 0; + description = '' + Daemon process priority for bee. + 0 is the default Unix process priority, 19 is the lowest. + ''; + }; + + user = mkOption { + type = types.str; + default = "bee"; + description = '' + User the bee binary should execute under. + ''; + }; + + group = mkOption { + type = types.str; + default = "bee"; + description = '' + Group the bee binary should execute under. + ''; + }; + }; + }; + + ### implementation + + config = mkIf cfg.enable { + assertions = [ + { assertion = (hasAttr "password" cfg.settings) != true; + message = '' + `services.bee.settings.password` is insecure. Use `services.bee.settings.password-file` or `systemd.services.bee.serviceConfig.EnvironmentFile` instead. + ''; + } + { assertion = (hasAttr "swap-endpoint" cfg.settings) || (cfg.settings.swap-enable or true == false); + message = '' + In a swap-enabled network a working Ethereum blockchain node is required. You must specify one using `services.bee.settings.swap-endpoint`, or disable `services.bee.settings.swap-enable` = false. + ''; + } + ]; + + warnings = optional (! config.services.bee-clef.enable) "The bee service requires an external signer. Consider setting `config.services.bee-clef.enable` = true"; + + services.bee.settings = { + data-dir = lib.mkDefault "/var/lib/bee"; + password-file = lib.mkDefault "/var/lib/bee/password"; + clef-signer-enable = lib.mkDefault true; + clef-signer-endpoint = lib.mkDefault "/var/lib/bee-clef/clef.ipc"; + swap-endpoint = lib.mkDefault "https://rpc.slock.it/goerli"; + }; + + systemd.packages = [ cfg.package ]; # include the upstream bee.service file + + systemd.tmpfiles.rules = [ + "d '${cfg.settings.data-dir}' 0750 ${cfg.user} ${cfg.group}" + ]; + + systemd.services.bee = { + requires = optional config.services.bee-clef.enable + "bee-clef.service"; + + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + Nice = cfg.daemonNiceLevel; + User = cfg.user; + Group = cfg.group; + ExecStart = [ + "" # this hides/overrides what's in the original entry + "${cfg.package}/bin/bee --config=${configFile} start" + ]; + }; + + preStart = with cfg.settings; '' + if ! test -f ${password-file}; then + < /dev/urandom tr -dc _A-Z-a-z-0-9 2> /dev/null | head -c32 > ${password-file} + chmod 0600 ${password-file} + echo "Initialized ${password-file} from /dev/urandom" + fi + if [ ! -f ${data-dir}/keys/libp2p.key ]; then + ${cfg.package}/bin/bee init --config=${configFile} >/dev/null + echo " +Logs: journalctl -f -u bee.service + +Bee has SWAP enabled by default and it needs ethereum endpoint to operate. +It is recommended to use external signer with bee. +Check documentation for more info: +- SWAP https://docs.ethswarm.org/docs/installation/manual#swap-bandwidth-incentives +- External signer https://docs.ethswarm.org/docs/installation/bee-clef + +After you finish configuration run 'sudo bee-get-addr'." + fi + ''; + }; + + users.users = optionalAttrs (cfg.user == "bee") { + bee = { + group = cfg.group; + home = cfg.settings.data-dir; + isSystemUser = true; + description = "Daemon user for Ethereum Swarm Bee"; + extraGroups = optional config.services.bee-clef.enable + config.services.bee-clef.group; + }; + }; + + users.groups = optionalAttrs (cfg.group == "bee") { + bee = {}; + }; + }; +} diff --git a/nixos/modules/services/networking/bind.nix b/nixos/modules/services/networking/bind.nix index faad8863575..e507e8ce9ee 100644 --- a/nixos/modules/services/networking/bind.nix +++ b/nixos/modules/services/networking/bind.nix @@ -8,6 +8,35 @@ let bindUser = "named"; + bindZoneOptions = { + name = mkOption { + type = types.str; + description = "Name of the zone."; + }; + master = mkOption { + description = "Master=false means slave server"; + type = types.bool; + }; + file = mkOption { + type = types.either types.str types.path; + description = "Zone file resource records contain columns of data, separated by whitespace, that define the record."; + }; + masters = mkOption { + type = types.listOf types.str; + description = "List of servers for inclusion in stub and secondary zones."; + }; + slaves = mkOption { + type = types.listOf types.str; + description = "Addresses who may request zone transfers."; + default = []; + }; + extraConfig = mkOption { + type = types.str; + description = "Extra zone config to be appended at the end of the zone section."; + default = ""; + }; + }; + confFile = pkgs.writeText "named.conf" '' include "/etc/bind/rndc.key"; @@ -72,6 +101,7 @@ in cacheNetworks = mkOption { default = ["127.0.0.0/24"]; + type = types.listOf types.str; description = " What networks are allowed to use us as a resolver. Note that this is for recursive queries -- all networks are @@ -83,6 +113,7 @@ in blockedNetworks = mkOption { default = []; + type = types.listOf types.str; description = " What networks are just blocked. "; @@ -90,6 +121,7 @@ in ipv4Only = mkOption { default = false; + type = types.bool; description = " Only use ipv4, even if the host supports ipv6. "; @@ -97,6 +129,7 @@ in forwarders = mkOption { default = config.networking.nameservers; + type = types.listOf types.str; description = " List of servers we should forward requests to. "; @@ -120,10 +153,9 @@ in zones = mkOption { default = []; + type = types.listOf (types.submodule [ { options = bindZoneOptions; } ]); description = " List of zones we claim authority over. - master=false means slave server; slaves means addresses - who may request zone transfer. "; example = [{ name = "example.com"; diff --git a/nixos/modules/services/networking/bitlbee.nix b/nixos/modules/services/networking/bitlbee.nix index 9ebf382fce4..59ad9e54686 100644 --- a/nixos/modules/services/networking/bitlbee.nix +++ b/nixos/modules/services/networking/bitlbee.nix @@ -58,6 +58,7 @@ in }; interface = mkOption { + type = types.str; default = "127.0.0.1"; description = '' The interface the BitlBee deamon will be listening to. If `127.0.0.1', @@ -68,6 +69,7 @@ in portNumber = mkOption { default = 6667; + type = types.int; description = '' Number of the port BitlBee will be listening to. ''; @@ -142,6 +144,7 @@ in extraSettings = mkOption { default = ""; + type = types.lines; description = '' Will be inserted in the Settings section of the config file. ''; @@ -149,6 +152,7 @@ in extraDefaults = mkOption { default = ""; + type = types.lines; description = '' Will be inserted in the Default section of the config file. ''; diff --git a/nixos/modules/services/networking/cntlm.nix b/nixos/modules/services/networking/cntlm.nix index 5b5068e43d7..eea28e12ce0 100644 --- a/nixos/modules/services/networking/cntlm.nix +++ b/nixos/modules/services/networking/cntlm.nix @@ -36,19 +36,21 @@ in enable = mkEnableOption "cntlm, which starts a local proxy"; username = mkOption { + type = types.str; description = '' Proxy account name, without the possibility to include domain name ('at' sign is interpreted literally). ''; }; domain = mkOption { - description = ''Proxy account domain/workgroup name.''; + type = types.str; + description = "Proxy account domain/workgroup name."; }; password = mkOption { default = "/etc/cntlm.password"; type = types.str; - description = ''Proxy account password. Note: use chmod 0600 on /etc/cntlm.password for security.''; + description = "Proxy account password. Note: use chmod 0600 on /etc/cntlm.password for security."; }; netbios_hostname = mkOption { @@ -60,6 +62,7 @@ in }; proxy = mkOption { + type = types.listOf types.str; description = '' A list of NTLM/NTLMv2 authenticating HTTP proxies. @@ -75,11 +78,13 @@ in A list of domains where the proxy is skipped. ''; default = []; + type = types.listOf types.str; example = [ "*.example.com" "example.com" ]; }; port = mkOption { default = [3128]; + type = types.listOf types.port; description = "Specifies on which ports the cntlm daemon listens."; }; diff --git a/nixos/modules/services/networking/connman.nix b/nixos/modules/services/networking/connman.nix index 6ccc2dffb26..11f66b05df1 100644 --- a/nixos/modules/services/networking/connman.nix +++ b/nixos/modules/services/networking/connman.nix @@ -42,8 +42,7 @@ in { extraConfig = mkOption { type = types.lines; - default = '' - ''; + default = ""; description = '' Configuration lines appended to the generated connman configuration file. ''; diff --git a/nixos/modules/services/networking/consul.nix b/nixos/modules/services/networking/consul.nix index f7d2afead06..bfaea4e167c 100644 --- a/nixos/modules/services/networking/consul.nix +++ b/nixos/modules/services/networking/consul.nix @@ -99,6 +99,7 @@ in extraConfig = mkOption { default = { }; + type = types.attrsOf types.anything; description = '' Extra configuration options which are serialized to json and added to the config.json file. diff --git a/nixos/modules/services/networking/dnscrypt-wrapper.nix b/nixos/modules/services/networking/dnscrypt-wrapper.nix index ee7e9b0454d..89360f4bf37 100644 --- a/nixos/modules/services/networking/dnscrypt-wrapper.nix +++ b/nixos/modules/services/networking/dnscrypt-wrapper.nix @@ -83,7 +83,7 @@ let # correctly implement key rotation of dnscrypt-wrapper ephemeral keys. dnscrypt-proxy1 = pkgs.callPackage ({ stdenv, fetchFromGitHub, autoreconfHook - , pkgconfig, libsodium, ldns, openssl, systemd }: + , pkg-config, libsodium, ldns, openssl, systemd }: stdenv.mkDerivation rec { pname = "dnscrypt-proxy"; @@ -98,7 +98,7 @@ let configureFlags = optional stdenv.isLinux "--with-systemd"; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; # <ldns/ldns.h> depends on <openssl/ssl.h> buildInputs = [ libsodium openssl.dev ldns ] ++ optional stdenv.isLinux systemd; diff --git a/nixos/modules/services/networking/dnsdist.nix b/nixos/modules/services/networking/dnsdist.nix index 05c2bdef83e..3584915d0aa 100644 --- a/nixos/modules/services/networking/dnsdist.nix +++ b/nixos/modules/services/networking/dnsdist.nix @@ -26,8 +26,7 @@ in { extraConfig = mkOption { type = types.lines; - default = '' - ''; + default = ""; description = '' Extra lines to be added verbatim to dnsdist.conf. ''; diff --git a/nixos/modules/services/networking/flashpolicyd.nix b/nixos/modules/services/networking/flashpolicyd.nix index 7f25083307c..d3ac78430ca 100644 --- a/nixos/modules/services/networking/flashpolicyd.nix +++ b/nixos/modules/services/networking/flashpolicyd.nix @@ -50,6 +50,7 @@ in }; policy = mkOption { + type = types.lines; default = '' <?xml version="1.0"?> diff --git a/nixos/modules/services/networking/gateone.nix b/nixos/modules/services/networking/gateone.nix index 56f2ba21a12..3e3a3c1aa94 100644 --- a/nixos/modules/services/networking/gateone.nix +++ b/nixos/modules/services/networking/gateone.nix @@ -10,12 +10,12 @@ options = { pidDir = mkOption { default = "/run/gateone"; type = types.path; - description = ''Path of pid files for GateOne.''; + description = "Path of pid files for GateOne."; }; settingsDir = mkOption { default = "/var/lib/gateone"; type = types.path; - description = ''Path of configuration files for GateOne.''; + description = "Path of configuration files for GateOne."; }; }; }; diff --git a/nixos/modules/services/networking/gogoclient.nix b/nixos/modules/services/networking/gogoclient.nix index 99455b18314..1205321818b 100644 --- a/nixos/modules/services/networking/gogoclient.nix +++ b/nixos/modules/services/networking/gogoclient.nix @@ -28,6 +28,7 @@ in username = mkOption { default = ""; + type = types.str; description = '' Your Gateway6 login name, if any. ''; @@ -42,6 +43,7 @@ in }; server = mkOption { + type = types.str; default = "anonymous.freenet6.net"; example = "broker.freenet6.net"; description = "The Gateway6 server to be used."; diff --git a/nixos/modules/services/networking/gvpe.nix b/nixos/modules/services/networking/gvpe.nix index 92e87cd4640..b851facf1e3 100644 --- a/nixos/modules/services/networking/gvpe.nix +++ b/nixos/modules/services/networking/gvpe.nix @@ -3,7 +3,7 @@ {config, pkgs, lib, ...}: let - inherit (lib) mkOption mkIf; + inherit (lib) mkOption mkIf types; cfg = config.services.gvpe; @@ -46,12 +46,14 @@ in nodename = mkOption { default = null; + type = types.nullOr types.str; description ='' GVPE node name ''; }; configText = mkOption { default = null; + type = types.nullOr types.lines; example = '' tcp-port = 655 udp-port = 655 @@ -72,6 +74,7 @@ in }; configFile = mkOption { default = null; + type = types.nullOr types.path; example = "/root/my-gvpe-conf"; description = '' GVPE config file, if already present @@ -79,12 +82,14 @@ in }; ipAddress = mkOption { default = null; + type = types.nullOr types.str; description = '' IP address to assign to GVPE interface ''; }; subnet = mkOption { default = null; + type = types.nullOr types.str; example = "10.0.0.0/8"; description = '' IP subnet assigned to GVPE network @@ -92,6 +97,7 @@ in }; customIFSetup = mkOption { default = ""; + type = types.lines; description = '' Additional commands to apply in ifup script ''; diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix index 5d73038363a..f719ff59cc7 100644 --- a/nixos/modules/services/networking/hostapd.nix +++ b/nixos/modules/services/networking/hostapd.nix @@ -20,8 +20,8 @@ let ssid=${cfg.ssid} hw_mode=${cfg.hwMode} channel=${toString cfg.channel} - ${optionalString (cfg.countryCode != null) ''country_code=${cfg.countryCode}''} - ${optionalString (cfg.countryCode != null) ''ieee80211d=1''} + ${optionalString (cfg.countryCode != null) "country_code=${cfg.countryCode}"} + ${optionalString (cfg.countryCode != null) "ieee80211d=1"} # logging (debug level) logger_syslog=-1 @@ -68,6 +68,7 @@ in interface = mkOption { default = ""; example = "wlp2s0"; + type = types.str; description = '' The interfaces <command>hostapd</command> will use. ''; diff --git a/nixos/modules/services/networking/hylafax/modem-default.nix b/nixos/modules/services/networking/hylafax/modem-default.nix index 7529b5b0aaf..707b8209282 100644 --- a/nixos/modules/services/networking/hylafax/modem-default.nix +++ b/nixos/modules/services/networking/hylafax/modem-default.nix @@ -5,7 +5,7 @@ { TagLineFont = "etc/LiberationSans-25.pcf"; - TagLineLocale = ''en_US.UTF-8''; + TagLineLocale = "en_US.UTF-8"; AdminGroup = "root"; # groups that can change server config AnswerRotary = "fax"; # don't accept anything else but faxes @@ -16,7 +16,7 @@ SessionTracing = "0x78701"; UUCPLockDir = "/var/lock"; - SendPageCmd = ''${pkgs.coreutils}/bin/false''; # prevent pager transmit - SendUUCPCmd = ''${pkgs.coreutils}/bin/false''; # prevent UUCP transmit + SendPageCmd = "${pkgs.coreutils}/bin/false"; # prevent pager transmit + SendUUCPCmd = "${pkgs.coreutils}/bin/false"; # prevent UUCP transmit } diff --git a/nixos/modules/services/networking/hylafax/options.nix b/nixos/modules/services/networking/hylafax/options.nix index 9e28d09dffc..7f18c0d39ab 100644 --- a/nixos/modules/services/networking/hylafax/options.nix +++ b/nixos/modules/services/networking/hylafax/options.nix @@ -85,8 +85,8 @@ let # Otherwise, we use `false` to provoke # an error if hylafax tries to use it. c.sendmailPath = mkMerge [ - (mkIfDefault noWrapper ''${pkgs.coreutils}/bin/false'') - (mkIfDefault (!noWrapper) ''${wrapperDir}/${program}'') + (mkIfDefault noWrapper "${pkgs.coreutils}/bin/false") + (mkIfDefault (!noWrapper) "${wrapperDir}/${program}") ]; importDefaultConfig = file: lib.attrsets.mapAttrs @@ -121,7 +121,7 @@ in options.services.hylafax = { - enable = mkEnableOption ''HylaFAX server''; + enable = mkEnableOption "HylaFAX server"; autostart = mkOption { type = bool; @@ -139,28 +139,28 @@ in type = nullOr str1; default = null; example = "49"; - description = ''Country code for server and all modems.''; + description = "Country code for server and all modems."; }; areaCode = mkOption { type = nullOr str1; default = null; example = "30"; - description = ''Area code for server and all modems.''; + description = "Area code for server and all modems."; }; longDistancePrefix = mkOption { type = nullOr str; default = null; example = "0"; - description = ''Long distance prefix for server and all modems.''; + description = "Long distance prefix for server and all modems."; }; internationalPrefix = mkOption { type = nullOr str; default = null; example = "00"; - description = ''International prefix for server and all modems.''; + description = "International prefix for server and all modems."; }; spoolAreaPath = mkOption { @@ -267,7 +267,7 @@ in spoolExtraInit = mkOption { type = lines; default = ""; - example = ''chmod 0755 . # everyone may read my faxes''; + example = "chmod 0755 . # everyone may read my faxes"; description = '' Additional shell code that is executed within the spooling area directory right after its setup. @@ -345,7 +345,7 @@ in faxqclean.doneqMinutes = mkOption { type = int1; default = 15; - example = literalExample ''24*60''; + example = literalExample "24*60"; description = '' Set the job age threshold (in minutes) that controls how long @@ -355,7 +355,7 @@ in faxqclean.docqMinutes = mkOption { type = int1; default = 60; - example = literalExample ''24*60''; + example = literalExample "24*60"; description = '' Set the document age threshold (in minutes) that controls how long diff --git a/nixos/modules/services/networking/hylafax/systemd.nix b/nixos/modules/services/networking/hylafax/systemd.nix index b9b9b9dca4f..f63f7c97ad1 100644 --- a/nixos/modules/services/networking/hylafax/systemd.nix +++ b/nixos/modules/services/networking/hylafax/systemd.nix @@ -16,12 +16,12 @@ let mkLines = conf: (lib.concatLists (lib.flip lib.mapAttrsToList conf - (k: map (v: ''${k}: ${v}'') + (k: map (v: "${k}: ${v}") ))); include = mkLines { Include = conf.Include or []; }; other = mkLines ( conf // { Include = []; } ); in - pkgs.writeText ''hylafax-config${name}'' + pkgs.writeText "hylafax-config${name}" (concatStringsSep "\n" (include ++ other)); globalConfigPath = mkConfigFile "" cfg.faxqConfig; @@ -29,7 +29,7 @@ let modemConfigPath = let mkModemConfigFile = { config, name, ... }: - mkConfigFile ''.${name}'' + mkConfigFile ".${name}" (cfg.commonModemConfig // config); mkLine = { name, type, ... }@modem: '' # check if modem config file exists: @@ -81,7 +81,7 @@ let description = "HylaFAX queue manager sendq watch"; documentation = [ "man:faxq(8)" "man:sendq(5)" ]; wantedBy = [ "multi-user.target" ]; - pathConfig.PathExistsGlob = [ ''${cfg.spoolAreaPath}/sendq/q*'' ]; + pathConfig.PathExistsGlob = [ "${cfg.spoolAreaPath}/sendq/q*" ]; }; timers = mkMerge [ @@ -134,7 +134,7 @@ let exit 1 fi ''; - serviceConfig.ExecStop = ''${setupSpoolScript}''; + serviceConfig.ExecStop = "${setupSpoolScript}"; serviceConfig.RemainAfterExit = true; serviceConfig.Type = "oneshot"; unitConfig.RequiresMountsFor = [ cfg.spoolAreaPath ]; @@ -145,7 +145,7 @@ let documentation = [ "man:faxq(8)" ]; requires = [ "hylafax-spool.service" ]; after = [ "hylafax-spool.service" ]; - wants = mapModems ( { name, ... }: ''hylafax-faxgetty@${name}.service'' ); + wants = mapModems ( { name, ... }: "hylafax-faxgetty@${name}.service" ); wantedBy = mkIf cfg.autostart [ "multi-user.target" ]; serviceConfig.Type = "forking"; serviceConfig.ExecStart = ''${pkgs.hylafaxplus}/spool/bin/faxq -q "${cfg.spoolAreaPath}"''; @@ -155,7 +155,7 @@ let # stopped will always yield a failed send attempt: # The fax service is started when the job is created with # `sendfax`, but modems need some time to initialize. - serviceConfig.ExecStartPost = [ ''${waitFaxqScript}'' ]; + serviceConfig.ExecStartPost = [ "${waitFaxqScript}" ]; # faxquit fails if the pipe is already gone # (e.g. the service is already stopping) serviceConfig.ExecStop = ''-${pkgs.hylafaxplus}/spool/bin/faxquit -q "${cfg.spoolAreaPath}"''; @@ -186,7 +186,7 @@ let wantedBy = mkIf cfg.faxcron.enable.spoolInit requires; startAt = mkIf (cfg.faxcron.enable.frequency!=null) cfg.faxcron.enable.frequency; serviceConfig.ExecStart = concatStringsSep " " [ - ''${pkgs.hylafaxplus}/spool/bin/faxcron'' + "${pkgs.hylafaxplus}/spool/bin/faxcron" ''-q "${cfg.spoolAreaPath}"'' ''-info ${toString cfg.faxcron.infoDays}'' ''-log ${toString cfg.faxcron.logDays}'' @@ -202,18 +202,18 @@ let wantedBy = mkIf cfg.faxqclean.enable.spoolInit requires; startAt = mkIf (cfg.faxqclean.enable.frequency!=null) cfg.faxqclean.enable.frequency; serviceConfig.ExecStart = concatStringsSep " " [ - ''${pkgs.hylafaxplus}/spool/bin/faxqclean'' + "${pkgs.hylafaxplus}/spool/bin/faxqclean" ''-q "${cfg.spoolAreaPath}"'' - ''-v'' - (optionalString (cfg.faxqclean.archiving!="never") ''-a'') - (optionalString (cfg.faxqclean.archiving=="always") ''-A'') + "-v" + (optionalString (cfg.faxqclean.archiving!="never") "-a") + (optionalString (cfg.faxqclean.archiving=="always") "-A") ''-j ${toString (cfg.faxqclean.doneqMinutes*60)}'' ''-d ${toString (cfg.faxqclean.docqMinutes*60)}'' ]; }; mkFaxgettyService = { name, ... }: - lib.nameValuePair ''hylafax-faxgetty@${name}'' rec { + lib.nameValuePair "hylafax-faxgetty@${name}" rec { description = "HylaFAX faxgetty for %I"; documentation = [ "man:faxgetty(8)" ]; bindsTo = [ "dev-%i.device" ]; @@ -221,7 +221,7 @@ let after = bindsTo ++ requires; before = [ "hylafax-faxq.service" "getty.target" ]; unitConfig.StopWhenUnneeded = true; - unitConfig.AssertFileNotEmpty = ''${cfg.spoolAreaPath}/etc/config.%I''; + unitConfig.AssertFileNotEmpty = "${cfg.spoolAreaPath}/etc/config.%I"; serviceConfig.UtmpIdentifier = "%I"; serviceConfig.TTYPath = "/dev/%I"; serviceConfig.Restart = "always"; diff --git a/nixos/modules/services/networking/ircd-hybrid/default.nix b/nixos/modules/services/networking/ircd-hybrid/default.nix index 91d0bf437d6..0781159b6ee 100644 --- a/nixos/modules/services/networking/ircd-hybrid/default.nix +++ b/nixos/modules/services/networking/ircd-hybrid/default.nix @@ -40,6 +40,7 @@ in serverName = mkOption { default = "hades.arpa"; + type = types.str; description = " IRCD server name. "; @@ -47,6 +48,7 @@ in sid = mkOption { default = "0NL"; + type = types.str; description = " IRCD server unique ID in a net of servers. "; @@ -54,6 +56,7 @@ in description = mkOption { default = "Hybrid-7 IRC server."; + type = types.str; description = " IRCD server description. "; @@ -62,6 +65,7 @@ in rsaKey = mkOption { default = null; example = literalExample "/root/certificates/irc.key"; + type = types.nullOr types.path; description = " IRCD server RSA key. "; @@ -70,6 +74,7 @@ in certificate = mkOption { default = null; example = literalExample "/root/certificates/irc.pem"; + type = types.nullOr types.path; description = " IRCD server SSL certificate. There are some limitations - read manual. "; @@ -77,6 +82,7 @@ in adminEmail = mkOption { default = "<bit-bucket@example.com>"; + type = types.str; example = "<name@domain.tld>"; description = " IRCD server administrator e-mail. @@ -86,6 +92,7 @@ in extraIPs = mkOption { default = []; example = ["127.0.0.1"]; + type = types.listOf types.str; description = " Extra IP's to bind. "; @@ -93,6 +100,7 @@ in extraPort = mkOption { default = "7117"; + type = types.str; description = " Extra port to avoid filtering. "; diff --git a/nixos/modules/services/networking/kippo.nix b/nixos/modules/services/networking/kippo.nix index 553415a2f32..6fedb0a270f 100644 --- a/nixos/modules/services/networking/kippo.nix +++ b/nixos/modules/services/networking/kippo.nix @@ -17,37 +17,37 @@ in enable = mkOption { default = false; type = types.bool; - description = ''Enable the kippo honeypot ssh server.''; + description = "Enable the kippo honeypot ssh server."; }; port = mkOption { default = 2222; type = types.int; - description = ''TCP port number for kippo to bind to.''; + description = "TCP port number for kippo to bind to."; }; hostname = mkOption { default = "nas3"; type = types.str; - description = ''Hostname for kippo to present to SSH login''; + description = "Hostname for kippo to present to SSH login"; }; varPath = mkOption { default = "/var/lib/kippo"; type = types.path; - description = ''Path of read/write files needed for operation and configuration.''; + description = "Path of read/write files needed for operation and configuration."; }; logPath = mkOption { default = "/var/log/kippo"; type = types.path; - description = ''Path of log files needed for operation and configuration.''; + description = "Path of log files needed for operation and configuration."; }; pidPath = mkOption { default = "/run/kippo"; type = types.path; - description = ''Path of pid files needed for operation.''; + description = "Path of pid files needed for operation."; }; extraConfig = mkOption { default = ""; type = types.lines; - description = ''Extra verbatim configuration added to the end of kippo.cfg.''; + description = "Extra verbatim configuration added to the end of kippo.cfg."; }; }; diff --git a/nixos/modules/services/networking/mailpile.nix b/nixos/modules/services/networking/mailpile.nix index b79ee11d17d..4673a2580b6 100644 --- a/nixos/modules/services/networking/mailpile.nix +++ b/nixos/modules/services/networking/mailpile.nix @@ -21,11 +21,13 @@ in enable = mkEnableOption "Mailpile the mail client"; hostname = mkOption { + type = types.str; default = "localhost"; description = "Listen to this hostname or ip."; }; port = mkOption { - default = "33411"; + type = types.port; + default = 33411; description = "Listen on this port."; }; }; diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix index c6e5649ec47..b03630208df 100644 --- a/nixos/modules/services/networking/murmur.nix +++ b/nixos/modules/services/networking/murmur.nix @@ -109,6 +109,13 @@ in description = "Host to bind to. Defaults binding on all addresses."; }; + package = mkOption { + type = types.package; + default = pkgs.murmur; + defaultText = "pkgs.murmur"; + description = "Overridable attribute of the murmur package to use."; + }; + password = mkOption { type = types.str; default = ""; @@ -299,7 +306,7 @@ in Type = if forking then "forking" else "simple"; PIDFile = mkIf forking "/run/murmur/murmurd.pid"; EnvironmentFile = mkIf (cfg.environmentFile != null) cfg.environmentFile; - ExecStart = "${pkgs.murmur}/bin/murmurd -ini /run/murmur/murmurd.ini"; + ExecStart = "${cfg.package}/bin/murmurd -ini /run/murmur/murmurd.ini"; Restart = "always"; RuntimeDirectory = "murmur"; RuntimeDirectoryMode = "0700"; diff --git a/nixos/modules/services/networking/nomad.nix b/nixos/modules/services/networking/nomad.nix new file mode 100644 index 00000000000..9f1b443b89b --- /dev/null +++ b/nixos/modules/services/networking/nomad.nix @@ -0,0 +1,165 @@ +{ config, lib, pkgs, ... }: +with lib; +let + cfg = config.services.nomad; + format = pkgs.formats.json { }; +in +{ + ##### interface + options = { + services.nomad = { + enable = mkEnableOption "Nomad, a distributed, highly available, datacenter-aware scheduler"; + + package = mkOption { + type = types.package; + default = pkgs.nomad; + defaultText = "pkgs.nomad"; + description = '' + The package used for the Nomad agent and CLI. + ''; + }; + + extraPackages = mkOption { + type = types.listOf types.package; + default = [ ]; + description = '' + Extra packages to add to <envar>PATH</envar> for the Nomad agent process. + ''; + example = literalExample '' + with pkgs; [ cni-plugins ] + ''; + }; + + dropPrivileges = mkOption { + type = types.bool; + default = true; + description = '' + Whether the nomad agent should be run as a non-root nomad user. + ''; + }; + + enableDocker = mkOption { + type = types.bool; + default = true; + description = '' + Enable Docker support. Needed for Nomad's docker driver. + + Note that the docker group membership is effectively equivalent + to being root, see https://github.com/moby/moby/issues/9976. + ''; + }; + + extraSettingsPaths = mkOption { + type = types.listOf types.path; + default = []; + description = '' + Additional settings paths used to configure nomad. These can be files or directories. + ''; + example = literalExample '' + [ "/etc/nomad-mutable.json" "/run/keys/nomad-with-secrets.json" "/etc/nomad/config.d" ] + ''; + }; + + settings = mkOption { + type = format.type; + default = {}; + description = '' + Configuration for Nomad. See the <link xlink:href="https://www.nomadproject.io/docs/configuration">documentation</link> + for supported values. + + Notes about <literal>data_dir</literal>: + + If <literal>data_dir</literal> is set to a value other than the + default value of <literal>"/var/lib/nomad"</literal> it is the Nomad + cluster manager's responsibility to make sure that this directory + exists and has the appropriate permissions. + + Additionally, if <literal>dropPrivileges</literal> is + <literal>true</literal> then <literal>data_dir</literal> + <emphasis>cannot</emphasis> be customized. Setting + <literal>dropPrivileges</literal> to <literal>true</literal> enables + the <literal>DynamicUser</literal> feature of systemd which directly + manages and operates on <literal>StateDirectory</literal>. + ''; + example = literalExample '' + { + # A minimal config example: + server = { + enabled = true; + bootstrap_expect = 1; # for demo; no fault tolerance + }; + client = { + enabled = true; + }; + } + ''; + }; + }; + }; + + ##### implementation + config = mkIf cfg.enable { + services.nomad.settings = { + # Agrees with `StateDirectory = "nomad"` set below. + data_dir = mkDefault "/var/lib/nomad"; + }; + + environment = { + etc."nomad.json".source = format.generate "nomad.json" cfg.settings; + systemPackages = [ cfg.package ]; + }; + + systemd.services.nomad = { + description = "Nomad"; + wantedBy = [ "multi-user.target" ]; + wants = [ "network-online.target" ]; + after = [ "network-online.target" ]; + restartTriggers = [ config.environment.etc."nomad.json".source ]; + + path = cfg.extraPackages ++ (with pkgs; [ + # Client mode requires at least the following: + coreutils + iproute + iptables + ]); + + serviceConfig = mkMerge [ + { + DynamicUser = cfg.dropPrivileges; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + ExecStart = "${cfg.package}/bin/nomad agent -config=/etc/nomad.json" + + concatMapStrings (path: " -config=${path}") cfg.extraSettingsPaths; + KillMode = "process"; + KillSignal = "SIGINT"; + LimitNOFILE = 65536; + LimitNPROC = "infinity"; + OOMScoreAdjust = -1000; + Restart = "on-failure"; + RestartSec = 2; + TasksMax = "infinity"; + } + (mkIf cfg.enableDocker { + SupplementaryGroups = "docker"; # space-separated string + }) + (mkIf (cfg.settings.data_dir == "/var/lib/nomad") { + StateDirectory = "nomad"; + }) + ]; + + unitConfig = { + StartLimitIntervalSec = 10; + StartLimitBurst = 3; + }; + }; + + assertions = [ + { + assertion = cfg.dropPrivileges -> cfg.settings.data_dir == "/var/lib/nomad"; + message = "settings.data_dir must be equal to \"/var/lib/nomad\" if dropPrivileges is true"; + } + ]; + + # Docker support requires the Docker daemon to be running. + virtualisation.docker.enable = mkIf cfg.enableDocker true; + }; +} diff --git a/nixos/modules/services/networking/ntp/chrony.nix b/nixos/modules/services/networking/ntp/chrony.nix index e6fa48daf46..96c6444c23a 100644 --- a/nixos/modules/services/networking/ntp/chrony.nix +++ b/nixos/modules/services/networking/ntp/chrony.nix @@ -4,13 +4,14 @@ with lib; let cfg = config.services.chrony; + chronyPkg = cfg.package; - stateDir = "/var/lib/chrony"; + stateDir = cfg.directory; driftFile = "${stateDir}/chrony.drift"; keyFile = "${stateDir}/chrony.keys"; configFile = pkgs.writeText "chrony.conf" '' - ${concatMapStringsSep "\n" (server: "server " + server + " iburst") cfg.servers} + ${concatMapStringsSep "\n" (server: "server " + server + " " + cfg.serverOption + optionalString (cfg.enableNTS) " nts") cfg.servers} ${optionalString (cfg.initstepslew.enabled && (cfg.servers != [])) @@ -19,6 +20,7 @@ let driftfile ${driftFile} keyfile ${keyFile} + ${optionalString (cfg.enableNTS) "ntsdumpdir ${stateDir}"} ${optionalString (!config.time.hardwareClockInLocalTime) "rtconutc"} @@ -39,14 +41,48 @@ in ''; }; + package = mkOption { + type = types.package; + default = pkgs.chrony; + defaultText = "pkgs.chrony"; + description = '' + Which chrony package to use. + ''; + }; + servers = mkOption { default = config.networking.timeServers; + type = types.listOf types.str; description = '' The set of NTP servers from which to synchronise. ''; }; + serverOption = mkOption { + default = "iburst"; + type = types.enum [ "iburst" "offline" ]; + description = '' + Set option for server directives. + + Use "iburst" to rapidly poll on startup. Recommended if your machine + is consistently online. + + Use "offline" to prevent polling on startup. Recommended if your + machine boots offline or is otherwise frequently offline. + ''; + }; + + enableNTS = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable Network Time Security authentication. + Make sure it is supported by your selected NTP server(s). + ''; + }; + initstepslew = mkOption { + type = types.attrsOf (types.either types.bool types.int); default = { enabled = true; threshold = 1000; # by default, same threshold as 'ntpd -g' (1000s) @@ -58,6 +94,12 @@ in ''; }; + directory = mkOption { + type = types.str; + default = "/var/lib/chrony"; + description = "Directory where chrony state is stored."; + }; + extraConfig = mkOption { type = types.lines; default = ""; @@ -79,7 +121,7 @@ in config = mkIf cfg.enable { meta.maintainers = with lib.maintainers; [ thoughtpolice ]; - environment.systemPackages = [ pkgs.chrony ]; + environment.systemPackages = [ chronyPkg ]; users.groups.chrony.gid = config.ids.gids.chrony; @@ -109,12 +151,12 @@ in after = [ "network.target" ]; conflicts = [ "ntpd.service" "systemd-timesyncd.service" ]; - path = [ pkgs.chrony ]; + path = [ chronyPkg ]; unitConfig.ConditionCapability = "CAP_SYS_TIME"; serviceConfig = { Type = "simple"; - ExecStart = "${pkgs.chrony}/bin/chronyd ${chronyFlags}"; + ExecStart = "${chronyPkg}/bin/chronyd ${chronyFlags}"; ProtectHome = "yes"; ProtectSystem = "full"; diff --git a/nixos/modules/services/networking/ntp/ntpd.nix b/nixos/modules/services/networking/ntp/ntpd.nix index 51398851adc..861b0db01a4 100644 --- a/nixos/modules/services/networking/ntp/ntpd.nix +++ b/nixos/modules/services/networking/ntp/ntpd.nix @@ -79,6 +79,7 @@ in servers = mkOption { default = config.networking.timeServers; + type = types.listOf types.str; description = '' The set of NTP servers from which to synchronise. ''; diff --git a/nixos/modules/services/networking/owamp.nix b/nixos/modules/services/networking/owamp.nix index 637ed618b89..baf64347b09 100644 --- a/nixos/modules/services/networking/owamp.nix +++ b/nixos/modules/services/networking/owamp.nix @@ -10,7 +10,7 @@ in ###### interface options = { - services.owamp.enable = mkEnableOption ''Enable OWAMP server''; + services.owamp.enable = mkEnableOption "Enable OWAMP server"; }; diff --git a/nixos/modules/services/networking/pleroma.nix b/nixos/modules/services/networking/pleroma.nix new file mode 100644 index 00000000000..9b2bf9f6124 --- /dev/null +++ b/nixos/modules/services/networking/pleroma.nix @@ -0,0 +1,140 @@ +{ config, options, lib, pkgs, stdenv, ... }: +let + cfg = config.services.pleroma; +in { + options = { + services.pleroma = with lib; { + enable = mkEnableOption "pleroma"; + + package = mkOption { + type = types.package; + default = pkgs.pleroma-otp; + description = "Pleroma package to use."; + }; + + user = mkOption { + type = types.str; + default = "pleroma"; + description = "User account under which pleroma runs."; + }; + + group = mkOption { + type = types.str; + default = "pleroma"; + description = "Group account under which pleroma runs."; + }; + + stateDir = mkOption { + type = types.str; + default = "/var/lib/pleroma"; + readOnly = true; + description = "Directory where the pleroma service will save the uploads and static files."; + }; + + configs = mkOption { + type = with types; listOf str; + description = '' + Pleroma public configuration. + + This list gets appended from left to + right into /etc/pleroma/config.exs. Elixir evaluates its + configuration imperatively, meaning you can override a + setting by appending a new str to this NixOS option list. + + <emphasis>DO NOT STORE ANY PLEROMA SECRET + HERE</emphasis>, use + <link linkend="opt-services.pleroma.secretConfigFile">services.pleroma.secretConfigFile</link> + instead. + + This setting is going to be stored in a file part of + the Nix store. The Nix store being world-readable, it's not + the right place to store any secret + + Have a look to Pleroma section in the NixOS manual for more + informations. + ''; + }; + + secretConfigFile = mkOption { + type = types.str; + default = "/var/lib/pleroma/secrets.exs"; + description = '' + Path to the file containing your secret pleroma configuration. + + <emphasis>DO NOT POINT THIS OPTION TO THE NIX + STORE</emphasis>, the store being world-readable, it'll + compromise all your secrets. + ''; + }; + }; + }; + + config = lib.mkIf cfg.enable { + users = { + users."${cfg.user}" = { + description = "Pleroma user"; + home = cfg.stateDir; + extraGroups = [ cfg.group ]; + }; + groups."${cfg.group}" = {}; + }; + + environment.systemPackages = [ cfg.package ]; + + environment.etc."/pleroma/config.exs".text = '' + ${lib.concatMapStrings (x: "${x}") cfg.configs} + + # The lau/tzdata library is trying to download the latest + # timezone database in the OTP priv directory by default. + # This directory being in the store, it's read-only. + # Setting that up to a more appropriate location. + config :tzdata, :data_dir, "/var/lib/pleroma/elixir_tzdata_data" + + import_config "${cfg.secretConfigFile}" + ''; + + systemd.services.pleroma = { + description = "Pleroma social network"; + after = [ "network-online.target" "postgresql.service" ]; + wantedBy = [ "multi-user.target" ]; + restartTriggers = [ config.environment.etc."/pleroma/config.exs".source ]; + serviceConfig = { + User = cfg.user; + Group = cfg.group; + Type = "exec"; + WorkingDirectory = "~"; + StateDirectory = "pleroma pleroma/static pleroma/uploads"; + StateDirectoryMode = "700"; + + # Checking the conf file is there then running the database + # migration before each service start, just in case there are + # some pending ones. + # + # It's sub-optimal as we'll always run this, even if pleroma + # has not been updated. But the no-op process is pretty fast. + # Better be safe than sorry migration-wise. + ExecStartPre = + let preScript = pkgs.writers.writeBashBin "pleromaStartPre" + "${cfg.package}/bin/pleroma_ctl migrate"; + in "${preScript}/bin/pleromaStartPre"; + + ExecStart = "${cfg.package}/bin/pleroma start"; + ExecStop = "${cfg.package}/bin/pleroma stop"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + + # Systemd sandboxing directives. + # Taken from the upstream contrib systemd service at + # pleroma/installation/pleroma.service + PrivateTmp = true; + ProtectHome = true; + ProtectSystem = "full"; + PrivateDevices = false; + NoNewPrivileges = true; + CapabilityBoundingSet = "~CAP_SYS_ADMIN"; + }; + }; + + }; + meta.maintainers = with lib.maintainers; [ ninjatrappeur ]; + meta.doc = ./pleroma.xml; +} diff --git a/nixos/modules/services/networking/pleroma.xml b/nixos/modules/services/networking/pleroma.xml new file mode 100644 index 00000000000..9ab0be3d947 --- /dev/null +++ b/nixos/modules/services/networking/pleroma.xml @@ -0,0 +1,132 @@ +<chapter xmlns="http://docbook.org/ns/docbook" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:xi="http://www.w3.org/2001/XInclude" + version="5.0" + xml:id="module-services-pleroma"> + <title>Pleroma</title> + <para><link xlink:href="https://pleroma.social/">Pleroma</link> is a lightweight activity pub server.</para> + <section xml:id="module-services-pleroma-getting-started"> + <title>Quick Start</title> + <para>To get quickly started, you can use this sample NixOS configuration and adapt it to your use case.</para> + <para><programlisting> + { + security.acme = { + email = "root@tld"; + acceptTerms = true; + certs = { + "social.tld.com" = { + webroot = "/var/www/social.tld.com"; + email = "root@tld"; + group = "nginx"; + }; + }; + }; + services = { + pleroma = { + enable = true; + secretConfigFile = "/var/lib/pleroma/secrets.exs"; + configs = [ + '' + import Config + + config :pleroma, Pleroma.Web.Endpoint, + url: [host: "social.tld.com", scheme: "https", port: 443], + http: [ip: {127, 0, 0, 1}, port: 4000] + + config :pleroma, :instance, + name: "NixOS test pleroma server", + email: "pleroma@social.tld.com", + notify_email: "pleroma@social.tld.com", + limit: 5000, + registrations_open: true + + config :pleroma, :media_proxy, + enabled: false, + redirect_on_failure: true + #base_url: "https://cache.pleroma.social" + + config :pleroma, Pleroma.Repo, + adapter: Ecto.Adapters.Postgres, + username: "pleroma", + password: "${test-db-passwd}", + database: "pleroma", + hostname: "localhost", + pool_size: 10, + prepare: :named, + parameters: [ + plan_cache_mode: "force_custom_plan" + ] + + config :pleroma, :database, rum_enabled: false + config :pleroma, :instance, static_dir: "/var/lib/pleroma/static" + config :pleroma, Pleroma.Uploaders.Local, uploads: "/var/lib/pleroma/uploads" + config :pleroma, configurable_from_database: false + '' + ]; + }; + postgresql = { + enable = true; + package = pkgs.postgresql_12; + }; + nginx = { + enable = true; + addSSL = true; + sslCertificate = "/var/lib/acme/social.tld.com/fullchain.pem"; + sslCertificateKey = "/var/lib/acme/social.tld.com/key.pem"; + root = "/var/www/social.tld.com"; + # ACME endpoint + locations."/.well-known/acme-challenge" = { + root = "/var/www/social.tld.com/"; + }; + virtualHosts."social.tld.com" = { + addSSL = true; + locations."/" = { + proxyPass = "http://127.0.0.1:4000"; + extraConfig = '' + add_header 'Access-Control-Allow-Origin' '*' always; + add_header 'Access-Control-Allow-Methods' 'POST, PUT, DELETE, GET, PATCH, OPTIONS' always; + add_header 'Access-Control-Allow-Headers' 'Authorization, Content-Type, Idempotency-Key' always; + add_header 'Access-Control-Expose-Headers' 'Link, X-RateLimit-Reset, X-RateLimit-Limit, X-RateLimit-Remaining, X-Request-Id' always; + if ($request_method = OPTIONS) { + return 204; + } + add_header X-XSS-Protection "1; mode=block"; + add_header X-Permitted-Cross-Domain-Policies none; + add_header X-Frame-Options DENY; + add_header X-Content-Type-Options nosniff; + add_header Referrer-Policy same-origin; + add_header X-Download-Options noopen; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_set_header Host $host; + client_max_body_size 16m; + ''; + }; + }; + }; + }; + }; + </programlisting></para> + <para>Note that you'll need to seed your database and upload your pleroma secrets to the path pointed by <literal>config.pleroma.secretConfigFile</literal>. You can find more informations about how to do that in the <link linkend="module-services-pleroma-generate-config">next</link> section.</para> + </section> + <section xml:id="module-services-pleroma-generate-config"> + <title>Generating the Pleroma Config and Seed the Database</title> + + <para>Before using this service, you'll need to generate your +server configuration and its associated database seed. The +<literal>pleroma_ctl</literal> CLI utility can help you with that. You +can start with <literal>pleroma_ctl instance gen --output config.exs +--output-psql setup.psql</literal>, this will prompt you some +questions and will generate both your config file and database initial +migration. </para> +<para>For more details about this configuration format, please have a look at the <link xlink:href="https://docs-develop.pleroma.social/backend/configuration/cheatsheet/">upstream documentation</link>.</para> +<para>To seed your database, you can use the <literal>setup.psql</literal> file you just generated by running +<programlisting> + sudo -u postgres psql -f setup.psql +</programlisting></para> + <para>In regard of the pleroma service configuration you also just generated, you'll need to split it in two parts. The "public" part, which do not contain any secrets and thus can be safely stored in the Nix store and its "private" counterpart containing some secrets (database password, endpoint secret key, salts, etc.).</para> + + <para>The public part will live in your NixOS machine configuration in the <link linkend="opt-services.pleroma.configs">services.pleroma.configs</link> option. However, it's up to you to upload the secret pleroma configuration to the path pointed by <link linkend="opt-services.pleroma.secretConfigFile">services.pleroma.secretConfigFile</link>. You can do that manually or rely on a third party tool such as <link xlink:href="https://github.com/DBCDK/morph">Morph</link> or <link xlink:href="https://github.com/NixOS/nixops">NixOps</link>.</para> + </section> +</chapter> diff --git a/nixos/modules/services/networking/prayer.nix b/nixos/modules/services/networking/prayer.nix index f04dac01d9b..ae9258b2712 100644 --- a/nixos/modules/services/networking/prayer.nix +++ b/nixos/modules/services/networking/prayer.nix @@ -44,7 +44,8 @@ in enable = mkEnableOption "the prayer webmail http server"; port = mkOption { - default = "2080"; + default = 2080; + type = types.port; description = '' Port the prayer http server is listening to. ''; diff --git a/nixos/modules/services/networking/quassel.nix b/nixos/modules/services/networking/quassel.nix index da723ec86ad..bfbd3b46ab4 100644 --- a/nixos/modules/services/networking/quassel.nix +++ b/nixos/modules/services/networking/quassel.nix @@ -45,6 +45,7 @@ in }; interfaces = mkOption { + type = types.listOf types.str; default = [ "127.0.0.1" ]; description = '' The interfaces the Quassel daemon will be listening to. If `[ 127.0.0.1 ]', @@ -54,6 +55,7 @@ in }; portNumber = mkOption { + type = types.port; default = 4242; description = '' The port number the Quassel daemon will be listening to. @@ -61,7 +63,8 @@ in }; dataDir = mkOption { - default = ''/home/${user}/.config/quassel-irc.org''; + default = "/home/${user}/.config/quassel-irc.org"; + type = types.str; description = '' The directory holding configuration files, the SQlite database and the SSL Cert. ''; @@ -69,6 +72,7 @@ in user = mkOption { default = null; + type = types.nullOr types.str; description = '' The existing user the Quassel daemon should run as. If left empty, a default "quassel" user will be created. ''; diff --git a/nixos/modules/services/networking/radvd.nix b/nixos/modules/services/networking/radvd.nix index f4b00c9b356..53fac4b7b72 100644 --- a/nixos/modules/services/networking/radvd.nix +++ b/nixos/modules/services/networking/radvd.nix @@ -33,6 +33,7 @@ in }; services.radvd.config = mkOption { + type = types.lines; example = '' interface eth0 { diff --git a/nixos/modules/services/networking/sabnzbd.nix b/nixos/modules/services/networking/sabnzbd.nix index ff5aef7d1cb..43566dfd25c 100644 --- a/nixos/modules/services/networking/sabnzbd.nix +++ b/nixos/modules/services/networking/sabnzbd.nix @@ -18,16 +18,19 @@ in enable = mkEnableOption "the sabnzbd server"; configFile = mkOption { + type = types.path; default = "/var/lib/sabnzbd/sabnzbd.ini"; description = "Path to config file."; }; user = mkOption { default = "sabnzbd"; + type = types.str; description = "User to run the service as"; }; group = mkOption { + type = types.str; default = "sabnzbd"; description = "Group to run the service as"; }; diff --git a/nixos/modules/services/networking/searx.nix b/nixos/modules/services/networking/searx.nix index 85696beeba4..a515e4a3dc3 100644 --- a/nixos/modules/services/networking/searx.nix +++ b/nixos/modules/services/networking/searx.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ options, config, lib, pkgs, ... }: with lib; @@ -6,42 +6,14 @@ let runDir = "/run/searx"; cfg = config.services.searx; - hasEngines = - builtins.hasAttr "engines" cfg.settings && - cfg.settings.engines != { }; - - # Script to merge NixOS settings with - # the default settings.yml bundled in searx. - mergeConfig = '' + generateConfig = '' cd ${runDir} - # find the default settings.yml - default=$(find '${cfg.package}/' -name settings.yml) # write NixOS settings as JSON - cat <<'EOF' > settings.json + cat <<'EOF' > settings.yml ${builtins.toJSON cfg.settings} EOF - ${optionalString hasEngines '' - # extract and convert the default engines array to an object - ${pkgs.yq-go}/bin/yq r "$default" engines -j | \ - ${pkgs.jq}/bin/jq 'reduce .[] as $e ({}; .[$e.name] = $e)' \ - > engines.json - - # merge and update the NixOS engines with the newly created object - cp settings.json temp.json - ${pkgs.jq}/bin/jq -s '. as [$s, $e] | $s | .engines |= - ($e * . | to_entries | map (.value))' \ - temp.json engines.json > settings.json - - # clean up temporary files - rm {engines,temp}.json - ''} - - # merge the default and NixOS settings - ${pkgs.yq-go}/bin/yq m -P settings.json "$default" > settings.yml - rm settings.json - # substitute environment variables env -0 | while IFS='=' read -r -d ''' n v; do sed "s#@$n@#$v#g" -i settings.yml @@ -51,6 +23,12 @@ let chmod 400 settings.yml ''; + settingType = with types; (oneOf + [ bool int float str + (listOf settingType) + (attrsOf settingType) + ]) // { description = "JSON value"; }; + in { @@ -86,15 +64,16 @@ in }; settings = mkOption { - type = types.attrs; + type = types.attrsOf settingType; default = { }; example = literalExample '' { server.port = 8080; server.bind_address = "0.0.0.0"; server.secret_key = "@SEARX_SECRET_KEY@"; - engines.wolframalpha = - { shortcut = "wa"; + engines = lib.singleton + { name = "wolframalpha"; + shortcut = "wa"; api_key = "@WOLFRAM_API_KEY@"; engine = "wolframalpha_api"; }; @@ -155,9 +134,9 @@ in }; uwsgiConfig = mkOption { - type = types.attrs; + type = options.services.uwsgi.instance.type; default = { http = ":8080"; }; - example = lib.literalExample '' + example = literalExample '' { disable-logging = true; http = ":8080"; # serve via HTTP... @@ -199,7 +178,7 @@ in RuntimeDirectoryMode = "750"; } // optionalAttrs (cfg.environmentFile != null) { EnvironmentFile = builtins.toPath cfg.environmentFile; }; - script = mergeConfig; + script = generateConfig; }; systemd.services.searx = mkIf (!cfg.runInUwsgi) { @@ -221,6 +200,11 @@ in after = [ "searx-init.service" ]; }; + services.searx.settings = { + # merge NixOS settings with defaults settings.yml + use_default_settings = mkDefault true; + }; + services.uwsgi = mkIf (cfg.runInUwsgi) { enable = true; plugins = [ "python3" ]; @@ -241,6 +225,6 @@ in }; - meta.maintainers = with lib.maintainers; [ rnhmjoj ]; + meta.maintainers = with maintainers; [ rnhmjoj ]; } diff --git a/nixos/modules/services/networking/shairport-sync.nix b/nixos/modules/services/networking/shairport-sync.nix index b4b86a2d55b..ac526c0e9f6 100644 --- a/nixos/modules/services/networking/shairport-sync.nix +++ b/nixos/modules/services/networking/shairport-sync.nix @@ -28,6 +28,7 @@ in }; arguments = mkOption { + type = types.str; default = "-v -o pa"; description = '' Arguments to pass to the daemon. Defaults to a local pulseaudio @@ -36,6 +37,7 @@ in }; user = mkOption { + type = types.str; default = "shairport"; description = '' User account name under which to run shairport-sync. The account diff --git a/nixos/modules/services/networking/smokeping.nix b/nixos/modules/services/networking/smokeping.nix index 37ee2a80389..4470c18fd53 100644 --- a/nixos/modules/services/networking/smokeping.nix +++ b/nixos/modules/services/networking/smokeping.nix @@ -124,7 +124,8 @@ in }; hostName = mkOption { type = types.str; - default = config.networking.hostName; + default = config.networking.fqdn; + defaultText = "\${config.networking.fqdn}"; example = "somewhere.example.com"; description = "DNS name for the urls generated in the cgi."; }; @@ -156,6 +157,7 @@ in ownerEmail = mkOption { type = types.str; default = "no-reply@${cfg.hostName}"; + defaultText = "no-reply@\${hostName}"; example = "no-reply@yourdomain.com"; description = "Email contact for owner"; }; @@ -239,18 +241,18 @@ in targetConfig = mkOption { type = types.lines; default = '' - probe = FPing - menu = Top - title = Network Latency Grapher - remark = Welcome to the SmokePing website of xxx Company. \ - Here you will learn all about the latency of our network. - + Local - menu = Local - title = Local Network - ++ LocalMachine - menu = Local Machine - title = This host - host = localhost + probe = FPing + menu = Top + title = Network Latency Grapher + remark = Welcome to the SmokePing website of xxx Company. \ + Here you will learn all about the latency of our network. + + Local + menu = Local + title = Local Network + ++ LocalMachine + menu = Local Machine + title = This host + host = localhost ''; description = "Target configuration"; }; @@ -303,7 +305,7 @@ in ${cfg.package}/bin/smokeping --check --config=${configPath} ${cfg.package}/bin/smokeping --static --config=${configPath} ''; - script = ''${cfg.package}/bin/smokeping --config=${configPath} --nodaemon''; + script = "${cfg.package}/bin/smokeping --config=${configPath} --nodaemon"; }; systemd.services.thttpd = mkIf cfg.webService { wantedBy = [ "multi-user.target"]; diff --git a/nixos/modules/services/networking/ssh/lshd.nix b/nixos/modules/services/networking/ssh/lshd.nix index 41d0584080e..862ff7df054 100644 --- a/nixos/modules/services/networking/ssh/lshd.nix +++ b/nixos/modules/services/networking/ssh/lshd.nix @@ -29,6 +29,7 @@ in portNumber = mkOption { default = 22; + type = types.port; description = '' The port on which to listen for connections. ''; @@ -36,6 +37,7 @@ in interfaces = mkOption { default = []; + type = types.listOf types.str; description = '' List of network interfaces where listening for connections. When providing the empty list, `[]', lshd listens on all @@ -46,6 +48,7 @@ in hostKey = mkOption { default = "/etc/lsh/host-key"; + type = types.str; description = '' Path to the server's private key. Note that this key must have been created, e.g., using "lsh-keygen --server | @@ -56,29 +59,30 @@ in syslog = mkOption { type = types.bool; default = true; - description = ''Whether to enable syslog output.''; + description = "Whether to enable syslog output."; }; passwordAuthentication = mkOption { type = types.bool; default = true; - description = ''Whether to enable password authentication.''; + description = "Whether to enable password authentication."; }; publicKeyAuthentication = mkOption { type = types.bool; default = true; - description = ''Whether to enable public key authentication.''; + description = "Whether to enable public key authentication."; }; rootLogin = mkOption { type = types.bool; default = false; - description = ''Whether to enable remote root login.''; + description = "Whether to enable remote root login."; }; loginShell = mkOption { default = null; + type = types.nullOr types.str; description = '' If non-null, override the default login shell with the specified value. @@ -88,6 +92,7 @@ in srpKeyExchange = mkOption { default = false; + type = types.bool; description = '' Whether to enable SRP key exchange and user authentication. ''; @@ -96,16 +101,17 @@ in tcpForwarding = mkOption { type = types.bool; default = true; - description = ''Whether to enable TCP/IP forwarding.''; + description = "Whether to enable TCP/IP forwarding."; }; x11Forwarding = mkOption { type = types.bool; default = true; - description = ''Whether to enable X11 forwarding.''; + description = "Whether to enable X11 forwarding."; }; subsystems = mkOption { + type = types.listOf types.path; description = '' List of subsystem-path pairs, where the head of the pair denotes the subsystem name, and the tail denotes the path to diff --git a/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix b/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix index 1d1e0bd1ca1..8ae62931a8f 100644 --- a/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix +++ b/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix @@ -1273,7 +1273,7 @@ in { provided the user is prompted during an interactive <literal>--load-creds</literal> call. ''; - } ''Definition for a private key that's stored on a token/smartcard/TPM.''; + } "Definition for a private key that's stored on a token/smartcard/TPM."; }; diff --git a/nixos/modules/services/networking/supybot.nix b/nixos/modules/services/networking/supybot.nix index 7a62e04ec7c..332c3ced06f 100644 --- a/nixos/modules/services/networking/supybot.nix +++ b/nixos/modules/services/networking/supybot.nix @@ -64,13 +64,14 @@ in }; extraPackages = mkOption { + type = types.functionTo (types.listOf types.package); default = p: []; description = '' Extra Python packages available to supybot plugins. The value must be a function which receives the attrset defined in <varname>python3Packages</varname> as the sole argument. ''; - example = literalExample ''p: [ p.lxml p.requests ]''; + example = literalExample "p: [ p.lxml p.requests ]"; }; }; diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix index 39513987903..61482596763 100644 --- a/nixos/modules/services/networking/wpa_supplicant.nix +++ b/nixos/modules/services/networking/wpa_supplicant.nix @@ -14,8 +14,8 @@ let then ''"${psk}"'' else pskRaw; baseAuth = if key != null - then ''psk=${key}'' - else ''key_mgmt=NONE''; + then "psk=${key}" + else "key_mgmt=NONE"; in '' network={ ssid="${ssid}" diff --git a/nixos/modules/services/search/elasticsearch-curator.nix b/nixos/modules/services/search/elasticsearch-curator.nix index 9620c3e0b6d..bb2612322bb 100644 --- a/nixos/modules/services/search/elasticsearch-curator.nix +++ b/nixos/modules/services/search/elasticsearch-curator.nix @@ -55,6 +55,7 @@ in { }; actionYAML = mkOption { description = "curator action.yaml file contents, alternatively use curator-cli which takes a simple action command"; + type = types.lines; example = '' --- actions: diff --git a/nixos/modules/services/security/fprot.nix b/nixos/modules/services/security/fprot.nix index 3a0b08b3c6d..df60d553e85 100644 --- a/nixos/modules/services/security/fprot.nix +++ b/nixos/modules/services/security/fprot.nix @@ -16,16 +16,19 @@ in { description = '' product.data file. Defaults to the one supplied with installation package. ''; + type = types.path; }; frequency = mkOption { default = 30; + type = types.int; description = '' Update virus definitions every X minutes. ''; }; licenseKeyfile = mkOption { + type = types.path; description = '' License keyfile. Defaults to the one supplied with installation package. ''; diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix index 390dcfccfec..54c2c2dea23 100644 --- a/nixos/modules/services/security/tor.nix +++ b/nixos/modules/services/security/tor.nix @@ -909,8 +909,11 @@ in networking.firewall = mkIf cfg.openFirewall { allowedTCPPorts = - concatMap (o: optional (isInt o && o > 0 || o ? "port" && isInt o.port && o.port > 0) o.port) - (flatten [ + concatMap (o: + if isInt o && o > 0 then [o] + else if o ? "port" && isInt o.port && o.port > 0 then [o.port] + else [] + ) (flatten [ cfg.settings.ORPort cfg.settings.DirPort ]); diff --git a/nixos/modules/services/security/usbguard.nix b/nixos/modules/services/security/usbguard.nix index 71fd71a2cab..4cdb3a041b5 100644 --- a/nixos/modules/services/security/usbguard.nix +++ b/nixos/modules/services/security/usbguard.nix @@ -173,7 +173,7 @@ in serviceConfig = { Type = "simple"; - ExecStart = ''${cfg.package}/bin/usbguard-daemon -P -k -c ${daemonConfFile}''; + ExecStart = "${cfg.package}/bin/usbguard-daemon -P -k -c ${daemonConfFile}"; Restart = "on-failure"; StateDirectory = [ diff --git a/nixos/modules/services/security/vault.nix b/nixos/modules/services/security/vault.nix index 64622454b9d..5a20f6413b1 100644 --- a/nixos/modules/services/security/vault.nix +++ b/nixos/modules/services/security/vault.nix @@ -27,6 +27,11 @@ let ''} ${cfg.extraConfig} ''; + + allConfigPaths = [configFile] ++ cfg.extraSettingsPaths; + + configOptions = escapeShellArgs (concatMap (p: ["-config" p]) allConfigPaths); + in { @@ -84,7 +89,14 @@ in storageConfig = mkOption { type = types.nullOr types.lines; default = null; - description = "Storage configuration"; + description = '' + HCL configuration to insert in the storageBackend section. + + Confidential values should not be specified here because this option's + value is written to the Nix store, which is publicly readable. + Provide credentials and such in a separate file using + <xref linkend="opt-services.vault.extraSettingsPaths"/>. + ''; }; telemetryConfig = mkOption { @@ -98,6 +110,36 @@ in default = ""; description = "Extra text appended to <filename>vault.hcl</filename>."; }; + + extraSettingsPaths = mkOption { + type = types.listOf types.path; + default = []; + description = '' + Configuration files to load besides the immutable one defined by the NixOS module. + This can be used to avoid putting credentials in the Nix store, which can be read by any user. + + Each path can point to a JSON- or HCL-formatted file, or a directory + to be scanned for files with <literal>.hcl</literal> or + <literal>.json</literal> extensions. + + To upload the confidential file with NixOps, use for example: + + <programlisting><![CDATA[ + # https://releases.nixos.org/nixops/latest/manual/manual.html#opt-deployment.keys + deployment.keys."vault.hcl" = let db = import ./db-credentials.nix; in { + text = ${"''"} + storage "postgresql" { + connection_url = "postgres://''${db.username}:''${db.password}@host.example.com/exampledb?sslmode=verify-ca" + } + ${"''"}; + user = "vault"; + }; + services.vault.extraSettingsPaths = ["/run/keys/vault.hcl"]; + services.vault.storageBackend = "postgresql"; + users.users.vault.extraGroups = ["keys"]; + ]]></programlisting> + ''; + }; }; }; @@ -136,7 +178,7 @@ in serviceConfig = { User = "vault"; Group = "vault"; - ExecStart = "${cfg.package}/bin/vault server -config ${configFile}"; + ExecStart = "${cfg.package}/bin/vault server ${configOptions}"; ExecReload = "${pkgs.coreutils}/bin/kill -SIGHUP $MAINPID"; PrivateDevices = true; PrivateTmp = true; diff --git a/nixos/modules/services/system/cloud-init.nix b/nixos/modules/services/system/cloud-init.nix index 3518e0ee9dc..f83db30c1f0 100644 --- a/nixos/modules/services/system/cloud-init.nix +++ b/nixos/modules/services/system/cloud-init.nix @@ -98,7 +98,7 @@ in - final-message - power-state-change ''; - description = ''cloud-init configuration.''; + description = "cloud-init configuration."; }; }; diff --git a/nixos/modules/services/torrent/deluge.nix b/nixos/modules/services/torrent/deluge.nix index 45398cb2613..7ca4fdcf64d 100644 --- a/nixos/modules/services/torrent/deluge.nix +++ b/nixos/modules/services/torrent/deluge.nix @@ -41,6 +41,7 @@ in { openFilesLimit = mkOption { default = openFilesLimit; + type = types.either types.int types.str; description = '' Number of files to allow deluged to open. ''; diff --git a/nixos/modules/services/web-apps/dokuwiki.nix b/nixos/modules/services/web-apps/dokuwiki.nix index d9ebb3a9880..9567223ebc7 100644 --- a/nixos/modules/services/web-apps/dokuwiki.nix +++ b/nixos/modules/services/web-apps/dokuwiki.nix @@ -336,7 +336,7 @@ in locations."/" = { priority = 1; index = "doku.php"; - extraConfig = ''try_files $uri $uri/ @dokuwiki;''; + extraConfig = "try_files $uri $uri/ @dokuwiki;"; }; locations."@dokuwiki" = { diff --git a/nixos/modules/services/web-apps/galene.nix b/nixos/modules/services/web-apps/galene.nix new file mode 100644 index 00000000000..769490e915a --- /dev/null +++ b/nixos/modules/services/web-apps/galene.nix @@ -0,0 +1,178 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + cfg = config.services.galene; + defaultstateDir = "/var/lib/galene"; + defaultrecordingsDir = "${cfg.stateDir}/recordings"; + defaultgroupsDir = "${cfg.stateDir}/groups"; + defaultdataDir = "${cfg.stateDir}/data"; +in +{ + options = { + services.galene = { + enable = mkEnableOption "Galene Service."; + + stateDir = mkOption { + default = defaultstateDir; + type = types.str; + description = '' + The directory where Galene stores its internal state. If left as the default + value this directory will automatically be created before the Galene server + starts, otherwise the sysadmin is responsible for ensuring the directory + exists with appropriate ownership and permissions. + ''; + }; + + user = mkOption { + type = types.str; + default = "galene"; + description = "User account under which galene runs."; + }; + + group = mkOption { + type = types.str; + default = "galene"; + description = "Group under which galene runs."; + }; + + insecure = mkOption { + type = types.bool; + default = false; + description = '' + Whether Galene should listen in http or in https. If left as the default + value (false), Galene needs to be fed a private key and a certificate. + ''; + }; + + certFile = mkOption { + type = types.nullOr types.str; + default = null; + example = "/path/to/your/cert.pem"; + description = '' + Path to the server's certificate. The file is copied at runtime to + Galene's data directory where it needs to reside. + ''; + }; + + keyFile = mkOption { + type = types.nullOr types.str; + default = null; + example = "/path/to/your/key.pem"; + description = '' + Path to the server's private key. The file is copied at runtime to + Galene's data directory where it needs to reside. + ''; + }; + + httpAddress = mkOption { + type = types.str; + default = ""; + description = "HTTP listen address for galene."; + }; + + httpPort = mkOption { + type = types.port; + default = 8443; + description = "HTTP listen port."; + }; + + staticDir = mkOption { + type = types.str; + default = "${cfg.package.static}/static"; + example = "/var/lib/galene/static"; + description = "Web server directory."; + }; + + recordingsDir = mkOption { + type = types.str; + default = defaultrecordingsDir; + example = "/var/lib/galene/recordings"; + description = "Recordings directory."; + }; + + dataDir = mkOption { + type = types.str; + default = defaultdataDir; + example = "/var/lib/galene/data"; + description = "Data directory."; + }; + + groupsDir = mkOption { + type = types.str; + default = defaultgroupsDir; + example = "/var/lib/galene/groups"; + description = "Web server directory."; + }; + + package = mkOption { + default = pkgs.galene; + defaultText = "pkgs.galene"; + type = types.package; + description = '' + Package for running Galene. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + assertions = [ + { + assertion = cfg.insecure || (cfg.certFile != null && cfg.keyFile != null); + message = '' + Galene needs both certFile and keyFile defined for encryption, or + the insecure flag. + ''; + } + ]; + + systemd.services.galene = { + description = "galene"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + preStart = '' + install -m 700 -o '${cfg.user}' -g '${cfg.group}' ${cfg.certFile} ${cfg.dataDir}/cert.pem + install -m 700 -o '${cfg.user}' -g '${cfg.group}' ${cfg.keyFile} ${cfg.dataDir}/key.pem + ''; + + serviceConfig = mkMerge [ + { + Type = "simple"; + User = cfg.user; + Group = cfg.group; + WorkingDirectory = cfg.stateDir; + ExecStart = ''${cfg.package}/bin/galene \ + ${optionalString (cfg.insecure) "-insecure"} \ + -data ${cfg.dataDir} \ + -groups ${cfg.groupsDir} \ + -recordings ${cfg.recordingsDir} \ + -static ${cfg.staticDir}''; + Restart = "always"; + # Upstream Requirements + LimitNOFILE = 65536; + StateDirectory = [ ] ++ + optional (cfg.stateDir == defaultstateDir) "galene" ++ + optional (cfg.dataDir == defaultdataDir) "galene/data" ++ + optional (cfg.groupsDir == defaultgroupsDir) "galene/groups" ++ + optional (cfg.recordingsDir == defaultrecordingsDir) "galene/recordings"; + } + ]; + }; + + users.users = mkIf (cfg.user == "galene") + { + galene = { + description = "galene Service"; + group = cfg.group; + isSystemUser = true; + }; + }; + + users.groups = mkIf (cfg.group == "galene") { + galene = { }; + }; + }; + meta.maintainers = with lib.maintainers; [ rgrunbla ]; +} diff --git a/nixos/modules/services/web-apps/hledger-web.nix b/nixos/modules/services/web-apps/hledger-web.nix new file mode 100644 index 00000000000..43fc4daa177 --- /dev/null +++ b/nixos/modules/services/web-apps/hledger-web.nix @@ -0,0 +1,77 @@ +{ lib, pkgs, config, ... }: +with lib; +let + cfg = config.services.hledger-web; +in { + options.services.hledger-web = { + + enable = mkEnableOption "hledger-web service"; + + serveApi = mkEnableOption "Serve only the JSON web API, without the web UI."; + + host = mkOption { + type = types.str; + default = "127.0.0.1"; + description = '' + Address to listen on. + ''; + }; + + port = mkOption { + type = types.port; + default = 5000; + example = "80"; + description = '' + Port to listen on. + ''; + }; + + capabilities = mkOption { + type = types.commas; + default = "view"; + description = '' + Enable the view, add, and/or manage capabilities. E.g. view,add + ''; + }; + + journalFile = mkOption { + type = types.path; + example = "/home/hledger/.hledger.journal"; + description = '' + Input journal file. + ''; + }; + + baseUrl = mkOption { + type = with types; nullOr str; + default = null; + example = "https://example.org"; + description = '' + Base URL, when sharing over a network. + ''; + }; + }; + + config = mkIf cfg.enable { + systemd.services.hledger-web = { + description = "hledger-web - web-app for the hledger accounting tool."; + documentation = [ https://hledger.org/hledger-web.html ]; + wantedBy = [ "multi-user.target" ]; + after = [ "networking.target" ]; + serviceConfig = { + ExecStart = '' + ${pkgs.hledger-web}/bin/hledger-web \ + --host=${cfg.host} \ + --port=${toString cfg.port} \ + --file=${cfg.journalFile} \ + "--capabilities=${cfg.capabilities}" \ + ${optionalString (cfg.baseUrl != null) "--base-url=${cfg.baseUrl}"} \ + ${optionalString (cfg.serveApi) "--serve-api"} + ''; + Restart = "always"; + }; + }; + }; + + meta.maintainers = with lib.maintainers; [ marijanp ]; +} diff --git a/nixos/modules/services/web-apps/keycloak.nix b/nixos/modules/services/web-apps/keycloak.nix index bbb0c8d0483..a93e9327933 100644 --- a/nixos/modules/services/web-apps/keycloak.nix +++ b/nixos/modules/services/web-apps/keycloak.nix @@ -565,7 +565,7 @@ in assertions = [ { assertion = (cfg.databaseUseSSL && cfg.databaseType == "postgresql") -> (cfg.databaseCaCert != null); - message = ''A CA certificate must be specified (in 'services.keycloak.databaseCaCert') when PostgreSQL is used with SSL''; + message = "A CA certificate must be specified (in 'services.keycloak.databaseCaCert') when PostgreSQL is used with SSL"; } ]; diff --git a/nixos/modules/services/web-apps/mediawiki.nix b/nixos/modules/services/web-apps/mediawiki.nix index 0a5b6047bb5..1db1652022a 100644 --- a/nixos/modules/services/web-apps/mediawiki.nix +++ b/nixos/modules/services/web-apps/mediawiki.nix @@ -180,6 +180,7 @@ in }; name = mkOption { + type = types.str; default = "MediaWiki"; example = "Foobar Wiki"; description = "Name of the wiki."; diff --git a/nixos/modules/services/web-apps/moodle.nix b/nixos/modules/services/web-apps/moodle.nix index 8887136ea5e..ad1e55d62d1 100644 --- a/nixos/modules/services/web-apps/moodle.nix +++ b/nixos/modules/services/web-apps/moodle.nix @@ -84,7 +84,7 @@ in type = mkOption { type = types.enum [ "mysql" "pgsql" ]; default = "mysql"; - description = ''Database engine to use.''; + description = "Database engine to use."; }; host = mkOption { diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index da019aa2507..1b643bd3260 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -6,17 +6,19 @@ let cfg = config.services.nextcloud; fpm = config.services.phpfpm.pools.nextcloud; - phpPackage = - let - base = pkgs.php74; - in - base.buildEnv { - extensions = { enabled, all }: with all; - enabled ++ [ - apcu redis memcached imagick - ]; - extraConfig = phpOptionsStr; - }; + phpPackage = pkgs.php74.buildEnv { + extensions = { enabled, all }: + (with all; + enabled + ++ [ imagick ] # Always enabled + # Optionally enabled depending on caching settings + ++ optional cfg.caching.apcu apcu + ++ optional cfg.caching.redis redis + ++ optional cfg.caching.memcached memcached + ) + ++ cfg.phpExtraExtensions all; # Enabled by user + extraConfig = toKeyValue phpOptions; + }; toKeyValue = generators.toKeyValue { mkKeyValue = generators.mkKeyValueDefault {} " = "; @@ -27,7 +29,6 @@ let post_max_size = cfg.maxUploadSize; memory_limit = cfg.maxUploadSize; } // cfg.phpOptions; - phpOptionsStr = toKeyValue phpOptions; occ = pkgs.writeScriptBin "nextcloud-occ" '' #! ${pkgs.runtimeShell} @@ -116,6 +117,21 @@ in { ''; }; + phpExtraExtensions = mkOption { + type = with types; functionTo (listOf package); + default = all: []; + defaultText = "all: []"; + description = '' + Additional PHP extensions to use for nextcloud. + By default, only extensions necessary for a vanilla nextcloud installation are enabled, + but you may choose from the list of available extensions and add further ones. + This is sometimes necessary to be able to install a certain nextcloud app that has additional requirements. + ''; + example = literalExample '' + all: [ all.pdlib all.bz2 ] + ''; + }; + phpOptions = mkOption { type = types.attrsOf types.str; default = { @@ -511,7 +527,6 @@ in { pools.nextcloud = { user = "nextcloud"; group = "nextcloud"; - phpOptions = phpOptionsStr; phpPackage = phpPackage; phpEnv = { NEXTCLOUD_CONFIG_DIR = "${cfg.home}/config"; diff --git a/nixos/modules/services/web-apps/nextcloud.xml b/nixos/modules/services/web-apps/nextcloud.xml index f71c8df6c6d..6cbfda118c4 100644 --- a/nixos/modules/services/web-apps/nextcloud.xml +++ b/nixos/modules/services/web-apps/nextcloud.xml @@ -182,6 +182,17 @@ </para> </section> + <section xml:id="installing-apps-php-extensions-nextcloud"> + <title>Installing Apps and PHP extensions</title> + + <para> + Nextcloud apps are installed statefully through the web interface. + + Some apps may require extra PHP extensions to be installed. + This can be configured with the <xref linkend="opt-services.nextcloud.phpExtraExtensions" /> setting. + </para> + </section> + <section xml:id="module-services-nextcloud-maintainer-info"> <title>Maintainer information</title> diff --git a/nixos/modules/services/web-apps/trilium.nix b/nixos/modules/services/web-apps/trilium.nix index 3fa8dad0490..3a6ea02676a 100644 --- a/nixos/modules/services/web-apps/trilium.nix +++ b/nixos/modules/services/web-apps/trilium.nix @@ -85,7 +85,7 @@ in config = lib.mkIf cfg.enable (lib.mkMerge [ { - meta.maintainers = with lib.maintainers; [ kampka ]; + meta.maintainers = with lib.maintainers; [ ]; users.groups.trilium = {}; users.users.trilium = { diff --git a/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix b/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix index 173c0f8561c..394f9a30554 100644 --- a/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix +++ b/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix @@ -112,7 +112,7 @@ in acmeRoot = mkOption { type = types.str; - default = "/var/lib/acme/acme-challenges"; + default = "/var/lib/acme/acme-challenge"; description = "Directory for the acme challenge which is PUBLIC, don't put certs or keys in here"; }; diff --git a/nixos/modules/services/web-servers/caddy.nix b/nixos/modules/services/web-servers/caddy.nix index 297b7327339..6ecfc113ca2 100644 --- a/nixos/modules/services/web-servers/caddy.nix +++ b/nixos/modules/services/web-servers/caddy.nix @@ -20,8 +20,24 @@ let --config ${configFile} --adapter ${cfg.adapter} > $out ''; tlsJSON = pkgs.writeText "tls.json" (builtins.toJSON tlsConfig); - configJSON = pkgs.runCommand "caddy-config.json" { } '' - ${pkgs.jq}/bin/jq -s '.[0] * .[1]' ${adaptedConfig} ${tlsJSON} > $out + + # merge the TLS config options we expose with the ones originating in the Caddyfile + configJSON = + let tlsConfigMerge = '' + {"apps": + {"tls": + {"automation": + {"policies": + (if .[0].apps.tls.automation.policies == .[1]?.apps.tls.automation.policies + then .[0].apps.tls.automation.policies + else (.[0].apps.tls.automation.policies + .[1]?.apps.tls.automation.policies) + end) + } + } + } + }''; + in pkgs.runCommand "caddy-config.json" { } '' + ${pkgs.jq}/bin/jq -s '.[0] * ${tlsConfigMerge}' ${adaptedConfig} ${tlsJSON} > $out ''; in { imports = [ diff --git a/nixos/modules/services/web-servers/jboss/default.nix b/nixos/modules/services/web-servers/jboss/default.nix index ca5b8635fc0..d243e0f3f1b 100644 --- a/nixos/modules/services/web-servers/jboss/default.nix +++ b/nixos/modules/services/web-servers/jboss/default.nix @@ -31,32 +31,38 @@ in tempDir = mkOption { default = "/tmp"; + type = types.str; description = "Location where JBoss stores its temp files"; }; logDir = mkOption { default = "/var/log/jboss"; + type = types.str; description = "Location of the logfile directory of JBoss"; }; serverDir = mkOption { description = "Location of the server instance files"; default = "/var/jboss/server"; + type = types.str; }; deployDir = mkOption { description = "Location of the deployment files"; default = "/nix/var/nix/profiles/default/server/default/deploy/"; + type = types.str; }; libUrl = mkOption { default = "file:///nix/var/nix/profiles/default/server/default/lib"; description = "Location where the shared library JARs are stored"; + type = types.str; }; user = mkOption { default = "nobody"; description = "User account under which jboss runs."; + type = types.str; }; useJK = mkOption { diff --git a/nixos/modules/services/web-servers/lighttpd/default.nix b/nixos/modules/services/web-servers/lighttpd/default.nix index 7a3df26e47a..d1cb8a8dc25 100644 --- a/nixos/modules/services/web-servers/lighttpd/default.nix +++ b/nixos/modules/services/web-servers/lighttpd/default.nix @@ -193,7 +193,7 @@ in configText = mkOption { default = ""; type = types.lines; - example = ''...verbatim config file contents...''; + example = "...verbatim config file contents..."; description = '' Overridable config file contents to use for lighttpd. By default, use the contents automatically generated by NixOS. diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index d6f463be9e8..29cb7cedcb0 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -404,6 +404,7 @@ in logError = mkOption { default = "stderr"; + type = types.str; description = " Configures logging. The first parameter defines a file that will store the log. The diff --git a/nixos/modules/services/web-servers/nginx/location-options.nix b/nixos/modules/services/web-servers/nginx/location-options.nix index 5a7f5188b6c..d8c976f202f 100644 --- a/nixos/modules/services/web-servers/nginx/location-options.nix +++ b/nixos/modules/services/web-servers/nginx/location-options.nix @@ -52,7 +52,7 @@ with lib; default = false; example = true; description = '' - Whether to supporty proxying websocket connections with HTTP/1.1. + Whether to support proxying websocket connections with HTTP/1.1. ''; }; diff --git a/nixos/modules/services/web-servers/tomcat.nix b/nixos/modules/services/web-servers/tomcat.nix index 6d12925829f..13fe98402c6 100644 --- a/nixos/modules/services/web-servers/tomcat.nix +++ b/nixos/modules/services/web-servers/tomcat.nix @@ -74,6 +74,7 @@ in extraGroups = mkOption { default = []; + type = types.listOf types.str; example = [ "users" ]; description = "Defines extra groups to which the tomcat user belongs."; }; diff --git a/nixos/modules/services/web-servers/unit/default.nix b/nixos/modules/services/web-servers/unit/default.nix index 894271d1e55..2a264bf2e9a 100644 --- a/nixos/modules/services/web-servers/unit/default.nix +++ b/nixos/modules/services/web-servers/unit/default.nix @@ -28,10 +28,12 @@ in { description = "Group account under which unit runs."; }; stateDir = mkOption { + type = types.path; default = "/var/spool/unit"; description = "Unit data directory."; }; logDir = mkOption { + type = types.path; default = "/var/log/unit"; description = "Unit log directory."; }; diff --git a/nixos/modules/services/web-servers/uwsgi.nix b/nixos/modules/services/web-servers/uwsgi.nix index 506cd364a65..2dfc39c847a 100644 --- a/nixos/modules/services/web-servers/uwsgi.nix +++ b/nixos/modules/services/web-servers/uwsgi.nix @@ -209,6 +209,7 @@ in { KillSignal = "SIGQUIT"; AmbientCapabilities = cfg.capabilities; CapabilityBoundingSet = cfg.capabilities; + RuntimeDirectory = mkIf (cfg.runDir == "/run/uwsgi") "uwsgi"; }; }; diff --git a/nixos/modules/services/x11/clight.nix b/nixos/modules/services/x11/clight.nix index 4daf6d8d9db..873f425fb8b 100644 --- a/nixos/modules/services/x11/clight.nix +++ b/nixos/modules/services/x11/clight.nix @@ -11,14 +11,21 @@ let else if isBool v then boolToString v else if isString v then ''"${escape [''"''] v}"'' else if isList v then "[ " + concatMapStringsSep ", " toConf v + " ]" + else if isAttrs v then "\n{\n" + convertAttrs v + "\n}" else abort "clight.toConf: unexpected type (v = ${v})"; - clightConf = pkgs.writeText "clight.conf" - (concatStringsSep "\n" (mapAttrsToList - (name: value: "${toString name} = ${toConf value};") - (filterAttrs - (_: value: value != null) - cfg.settings))); + getSep = v: + if isAttrs v then ":" + else "="; + + convertAttrs = attrs: concatStringsSep "\n" (mapAttrsToList + (name: value: "${toString name} ${getSep value} ${toConf value};") + attrs); + + clightConf = pkgs.writeText "clight.conf" (convertAttrs + (filterAttrs + (_: value: value != null) + cfg.settings)); in { options.services.clight = { enable = mkOption { @@ -49,9 +56,10 @@ in { }; settings = let - validConfigTypes = with types; either int (either str (either bool float)); + validConfigTypes = with types; oneOf [ int str bool float ]; + collectionTypes = with types; oneOf [ validConfigTypes (listOf validConfigTypes) ]; in mkOption { - type = with types; attrsOf (nullOr (either validConfigTypes (listOf validConfigTypes))); + type = with types; attrsOf (nullOr (either collectionTypes (attrsOf collectionTypes))); default = {}; example = { captures = 20; gamma_long_transition = true; ac_capture_timeouts = [ 120 300 60 ]; }; description = '' @@ -69,10 +77,10 @@ in { services.upower.enable = true; services.clight.settings = { - gamma_temp = with cfg.temperature; mkDefault [ day night ]; + gamma.temp = with cfg.temperature; mkDefault [ day night ]; } // (optionalAttrs (config.location.provider == "manual") { - latitude = mkDefault config.location.latitude; - longitude = mkDefault config.location.longitude; + daytime.latitude = mkDefault config.location.latitude; + daytime.longitude = mkDefault config.location.longitude; }); services.geoclue2.appConfig.clightc = { diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index a404143a03d..14dcf009a7d 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -25,6 +25,7 @@ in sessionPath = mkOption { default = []; + type = types.listOf types.package; example = literalExample "[ pkgs.gnome3.gpaste ]"; description = '' Additional list of packages to be added to the session search path. diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index a36a47d376b..671301246a8 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -118,6 +118,7 @@ in sessionPath = mkOption { default = []; + type = types.listOf types.package; example = literalExample "[ pkgs.gnome3.gpaste ]"; description = '' Additional list of packages to be added to the session search path. diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index cf02a71248b..195da75e744 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -42,6 +42,7 @@ in sessionPath = mkOption { default = []; + type = types.listOf types.package; example = literalExample "[ pkgs.gnome3.gpaste ]"; description = '' Additional list of packages to be added to the session search path. diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index 6945a241f92..9fdbe753dad 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -444,8 +444,8 @@ in in # We will generate every possible pair of WM and DM. concatLists ( - crossLists - (dm: wm: let + builtins.map + ({dm, wm}: let sessionName = "${dm.name}${optionalString (wm.name != "none") ("+" + wm.name)}"; script = xsession dm wm; desktopNames = if dm ? desktopNames @@ -472,7 +472,7 @@ in providedSessions = [ sessionName ]; }) ) - [dms wms] + (cartesianProductOfSets { dm = dms; wm = wms; }) ); # Make xsessions and wayland sessions available in XDG_DATA_DIRS diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix index de932e6e840..9c1dc1d1c12 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix @@ -88,6 +88,7 @@ in cursorTheme = { package = mkOption { + type = types.package; default = pkgs.gnome3.adwaita-icon-theme; defaultText = "pkgs.gnome3.adwaita-icon-theme"; description = '' diff --git a/nixos/modules/services/x11/hardware/libinput.nix b/nixos/modules/services/x11/hardware/libinput.nix index 9548ecb8ef6..9b0757153cc 100644 --- a/nixos/modules/services/x11/hardware/libinput.nix +++ b/nixos/modules/services/x11/hardware/libinput.nix @@ -3,23 +3,18 @@ with lib; let cfg = config.services.xserver.libinput; - xorgBool = v: if v then "on" else "off"; -in { - options = { - - services.xserver.libinput = { - - enable = mkEnableOption "libinput"; + xorgBool = v: if v then "on" else "off"; + mkConfigForDevice = deviceType: { dev = mkOption { type = types.nullOr types.str; default = null; example = "/dev/input/event0"; description = '' - Path for touchpad device. Set to null to apply to any - auto-detected touchpad. + Path for ${deviceType} device. Set to null to apply to any + auto-detected ${deviceType}. ''; }; @@ -185,14 +180,64 @@ in { Option "DragLockButtons" "L1 B1 L2 B2" ''; description = '' - Additional options for libinput touchpad driver. See + Additional options for libinput ${deviceType} driver. See <citerefentry><refentrytitle>libinput</refentrytitle><manvolnum>4</manvolnum></citerefentry> for available options."; ''; }; - }; + mkX11ConfigForDevice = deviceType: matchIs: '' + Identifier "libinput ${deviceType} configuration" + MatchDriver "libinput" + MatchIs${matchIs} "${xorgBool true}" + ${optionalString (cfg.${deviceType}.dev != null) ''MatchDevicePath "${cfg.${deviceType}.dev}"''} + Option "AccelProfile" "${cfg.${deviceType}.accelProfile}" + ${optionalString (cfg.${deviceType}.accelSpeed != null) ''Option "AccelSpeed" "${cfg.${deviceType}.accelSpeed}"''} + ${optionalString (cfg.${deviceType}.buttonMapping != null) ''Option "ButtonMapping" "${cfg.${deviceType}.buttonMapping}"''} + ${optionalString (cfg.${deviceType}.calibrationMatrix != null) ''Option "CalibrationMatrix" "${cfg.${deviceType}.calibrationMatrix}"''} + ${optionalString (cfg.${deviceType}.clickMethod != null) ''Option "ClickMethod" "${cfg.${deviceType}.clickMethod}"''} + Option "LeftHanded" "${xorgBool cfg.${deviceType}.leftHanded}" + Option "MiddleEmulation" "${xorgBool cfg.${deviceType}.middleEmulation}" + Option "NaturalScrolling" "${xorgBool cfg.${deviceType}.naturalScrolling}" + ${optionalString (cfg.${deviceType}.scrollButton != null) ''Option "ScrollButton" "${toString cfg.${deviceType}.scrollButton}"''} + Option "ScrollMethod" "${cfg.${deviceType}.scrollMethod}" + Option "HorizontalScrolling" "${xorgBool cfg.${deviceType}.horizontalScrolling}" + Option "SendEventsMode" "${cfg.${deviceType}.sendEventsMode}" + Option "Tapping" "${xorgBool cfg.${deviceType}.tapping}" + Option "TappingDragLock" "${xorgBool cfg.${deviceType}.tappingDragLock}" + Option "DisableWhileTyping" "${xorgBool cfg.${deviceType}.disableWhileTyping}" + ${cfg.${deviceType}.additionalOptions} + ''; +in { + + imports = + (map (option: mkRenamedOptionModule ([ "services" "xserver" "libinput" option ]) [ "services" "xserver" "libinput" "touchpad" option ]) [ + "accelProfile" + "accelSpeed" + "buttonMapping" + "calibrationMatrix" + "clickMethod" + "leftHanded" + "middleEmulation" + "naturalScrolling" + "scrollButton" + "scrollMethod" + "horizontalScrolling" + "sendEventsMode" + "tapping" + "tappingDragLock" + "disableWhileTyping" + "additionalOptions" + ]); + + options = { + + services.xserver.libinput = { + enable = mkEnableOption "libinput"; + mouse = mkConfigForDevice "mouse"; + touchpad = mkConfigForDevice "touchpad"; + }; }; @@ -212,32 +257,10 @@ in { services.udev.packages = [ pkgs.libinput.out ]; - services.xserver.config = - '' - # General libinput configuration. - # See CONFIGURATION DETAILS section of man:libinput(4). - Section "InputClass" - Identifier "libinputConfiguration" - MatchDriver "libinput" - ${optionalString (cfg.dev != null) ''MatchDevicePath "${cfg.dev}"''} - Option "AccelProfile" "${cfg.accelProfile}" - ${optionalString (cfg.accelSpeed != null) ''Option "AccelSpeed" "${cfg.accelSpeed}"''} - ${optionalString (cfg.buttonMapping != null) ''Option "ButtonMapping" "${cfg.buttonMapping}"''} - ${optionalString (cfg.calibrationMatrix != null) ''Option "CalibrationMatrix" "${cfg.calibrationMatrix}"''} - ${optionalString (cfg.clickMethod != null) ''Option "ClickMethod" "${cfg.clickMethod}"''} - Option "LeftHanded" "${xorgBool cfg.leftHanded}" - Option "MiddleEmulation" "${xorgBool cfg.middleEmulation}" - Option "NaturalScrolling" "${xorgBool cfg.naturalScrolling}" - ${optionalString (cfg.scrollButton != null) ''Option "ScrollButton" "${toString cfg.scrollButton}"''} - Option "ScrollMethod" "${cfg.scrollMethod}" - Option "HorizontalScrolling" "${xorgBool cfg.horizontalScrolling}" - Option "SendEventsMode" "${cfg.sendEventsMode}" - Option "Tapping" "${xorgBool cfg.tapping}" - Option "TappingDragLock" "${xorgBool cfg.tappingDragLock}" - Option "DisableWhileTyping" "${xorgBool cfg.disableWhileTyping}" - ${cfg.additionalOptions} - EndSection - ''; + services.xserver.inputClassSections = [ + (mkX11ConfigForDevice "mouse" "Pointer") + (mkX11ConfigForDevice "touchpad" "Touchpad") + ]; assertions = [ # already present in synaptics.nix diff --git a/nixos/modules/services/x11/window-managers/clfswm.nix b/nixos/modules/services/x11/window-managers/clfswm.nix index 176c1f46127..171660c53ac 100644 --- a/nixos/modules/services/x11/window-managers/clfswm.nix +++ b/nixos/modules/services/x11/window-managers/clfswm.nix @@ -15,10 +15,10 @@ in services.xserver.windowManager.session = singleton { name = "clfswm"; start = '' - ${pkgs.clfswm}/bin/clfswm & + ${pkgs.lispPackages.clfswm}/bin/clfswm & waitPID=$! ''; }; - environment.systemPackages = [ pkgs.clfswm ]; + environment.systemPackages = [ pkgs.lispPackages.clfswm ]; }; } diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix index 87702c58727..9ca24310e56 100644 --- a/nixos/modules/services/x11/window-managers/default.nix +++ b/nixos/modules/services/x11/window-managers/default.nix @@ -13,6 +13,7 @@ in ./berry.nix ./bspwm.nix ./cwm.nix + ./clfswm.nix ./dwm.nix ./evilwm.nix ./exwm.nix diff --git a/nixos/modules/services/x11/window-managers/exwm.nix b/nixos/modules/services/x11/window-managers/exwm.nix index 88e13f4dbfb..4b707d39849 100644 --- a/nixos/modules/services/x11/window-managers/exwm.nix +++ b/nixos/modules/services/x11/window-managers/exwm.nix @@ -21,6 +21,7 @@ in enable = mkEnableOption "exwm"; loadScript = mkOption { default = "(require 'exwm)"; + type = types.lines; example = literalExample '' (require 'exwm) (exwm-enable) @@ -37,6 +38,7 @@ in description = "Enable an uncustomised exwm configuration."; }; extraPackages = mkOption { + type = types.functionTo (types.listOf types.package); default = self: []; example = literalExample '' epkgs: [ @@ -48,7 +50,7 @@ in description = '' Extra packages available to Emacs. The value must be a function which receives the attrset defined in - <varname>emacsPackages</varname> as the sole argument. + <varname>emacs.pkgs</varname> as the sole argument. ''; }; }; diff --git a/nixos/modules/services/x11/window-managers/xmonad.nix b/nixos/modules/services/x11/window-managers/xmonad.nix index 2bb4827be9d..fe8ed381251 100644 --- a/nixos/modules/services/x11/window-managers/xmonad.nix +++ b/nixos/modules/services/x11/window-managers/xmonad.nix @@ -53,6 +53,7 @@ in { }; extraPackages = mkOption { + type = types.functionTo (types.listOf types.package); default = self: []; defaultText = "self: []"; example = literalExample '' diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index eb8c4c17e98..8858559d8f2 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -441,6 +441,7 @@ in serverFlagsSection = mkOption { default = ""; + type = types.lines; example = '' Option "BlankTime" "0" @@ -649,7 +650,7 @@ in xorg.xprop xorg.xauth pkgs.xterm - pkgs.xdg_utils + pkgs.xdg-utils xorg.xf86inputevdev.out # get evdev.4 man page ] ++ optional (elem "virtualbox" cfg.videoDrivers) xorg.xrefresh; diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index 03d7e749323..b0f77ca3fb8 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -190,7 +190,7 @@ in system.boot.loader.kernelFile = mkOption { internal = true; - default = pkgs.stdenv.hostPlatform.platform.kernelTarget; + default = pkgs.stdenv.hostPlatform.linux-kernel.target; type = types.str; description = '' Name of the kernel file to be passed to the bootloader. diff --git a/nixos/modules/system/boot/binfmt.nix b/nixos/modules/system/boot/binfmt.nix index 9eeae0c3ef4..cbdf581d73a 100644 --- a/nixos/modules/system/boot/binfmt.nix +++ b/nixos/modules/system/boot/binfmt.nix @@ -20,8 +20,14 @@ let optionalString fixBinary "F"; in ":${name}:${type}:${offset'}:${magicOrExtension}:${mask'}:${interpreter}:${flags}"; - activationSnippet = name: { interpreter, ... }: - "ln -sf ${interpreter} /run/binfmt/${name}"; + activationSnippet = name: { interpreter, ... }: '' + rm -f /run/binfmt/${name} + cat > /run/binfmt/${name} << 'EOF' + #!${pkgs.bash}/bin/sh + exec -- ${interpreter} "$@" + EOF + chmod +x /run/binfmt/${name} + ''; getEmulator = system: (lib.systems.elaborate { inherit system; }).emulator pkgs; @@ -260,7 +266,7 @@ in { extra-platforms = ${toString (cfg.emulatedSystems ++ lib.optional pkgs.stdenv.hostPlatform.isx86_64 "i686-linux")} ''; nix.sandboxPaths = lib.mkIf (cfg.emulatedSystems != []) - ([ "/run/binfmt" ] ++ (map (system: dirOf (dirOf (getEmulator system))) cfg.emulatedSystems)); + ([ "/run/binfmt" "${pkgs.bash}" ] ++ (map (system: dirOf (dirOf (getEmulator system))) cfg.emulatedSystems)); environment.etc."binfmt.d/nixos.conf".source = builtins.toFile "binfmt_nixos.conf" (lib.concatStringsSep "\n" (lib.mapAttrsToList makeBinfmtLine config.boot.binfmt.registrations)); diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index ed7226331d7..9287852bacf 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -37,12 +37,10 @@ in boot.kernelPackages = mkOption { default = pkgs.linuxPackages; type = types.unspecified // { merge = mergeEqualOption; }; - apply = kernelPackages: kernelPackages.extend (self: super: { - kernel = super.kernel.override { - inherit randstructSeed; - kernelPatches = super.kernel.kernelPatches ++ kernelPatches; - features = lib.recursiveUpdate super.kernel.features features; - }; + apply = kernelPackages: pkgs.linuxPackagesFor (kernelPackages.kernel.override { + inherit randstructSeed; + kernelPatches = kernelPackages.kernel.kernelPatches ++ kernelPatches; + features = lib.recursiveUpdate kernelPackages.kernel.features features; }); # We don't want to evaluate all of linuxPackages for the manual # - some of it might not even evaluate correctly. diff --git a/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix b/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix index 2d27611946e..1437ab38770 100644 --- a/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix +++ b/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix @@ -12,9 +12,6 @@ let inherit (config.boot.loader.generationsDir) copyKernels; }; - # Temporary check, for nixos to cope both with nixpkgs stdenv-updates and trunk - inherit (pkgs.stdenv.hostPlatform) platform; - in { @@ -59,7 +56,7 @@ in system.build.installBootLoader = generationsDirBuilder; system.boot.loader.id = "generationsDir"; - system.boot.loader.kernelFile = platform.kernelTarget; + system.boot.loader.kernelFile = pkgs.stdenv.hostPlatform.linux-kernel.target; }; } diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index df5dfaa554b..289c2b19986 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -327,6 +327,26 @@ in ''; }; + extraInstallCommands = mkOption { + default = ""; + example = literalExample '' + # the example below generates detached signatures that GRUB can verify + # https://www.gnu.org/software/grub/manual/grub/grub.html#Using-digital-signatures + ''${pkgs.findutils}/bin/find /boot -not -path "/boot/efi/*" -type f -name '*.sig' -delete + old_gpg_home=$GNUPGHOME + export GNUPGHOME="$(mktemp -d)" + ''${pkgs.gnupg}/bin/gpg --import ''${priv_key} > /dev/null 2>&1 + ''${pkgs.findutils}/bin/find /boot -not -path "/boot/efi/*" -type f -exec ''${pkgs.gnupg}/bin/gpg --detach-sign "{}" \; > /dev/null 2>&1 + rm -rf $GNUPGHOME + export GNUPGHOME=$old_gpg_home + ''; + type = types.lines; + description = '' + Additional shell commands inserted in the bootloader installer + script after generating menu entries. + ''; + }; + extraPerEntryConfig = mkOption { default = ""; example = "root (hd0)"; @@ -715,7 +735,7 @@ in ${optionalString cfg.enableCryptodisk "export GRUB_ENABLE_CRYPTODISK=y"} '' + flip concatMapStrings cfg.mirroredBoots (args: '' ${pkgs.perl}/bin/perl ${install-grub-pl} ${grubConfig args} $@ - '')); + '') + cfg.extraInstallCommands); system.build.grub = grub; diff --git a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.nix b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.nix index 7eb52e3d021..64e106036ab 100644 --- a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.nix +++ b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.nix @@ -1,10 +1,9 @@ -{ pkgs, configTxt }: +{ pkgs, configTxt, firmware ? pkgs.raspberrypifw }: pkgs.substituteAll { src = ./raspberrypi-builder.sh; isExecutable = true; inherit (pkgs) bash; path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep]; - firmware = pkgs.raspberrypifw; - inherit configTxt; + inherit firmware configTxt; } diff --git a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix index ba936b26573..1023361f0b1 100644 --- a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix +++ b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix @@ -5,8 +5,6 @@ with lib; let cfg = config.boot.loader.raspberryPi; - inherit (pkgs.stdenv.hostPlatform) platform; - builderUboot = import ./uboot-builder.nix { inherit pkgs configTxt; inherit (cfg) version; }; builderGeneric = import ./raspberrypi-builder.nix { inherit pkgs configTxt; }; @@ -60,8 +58,7 @@ in version = mkOption { default = 2; type = types.enum [ 0 1 2 3 4 ]; - description = '' - ''; + description = ""; }; uboot = { @@ -103,6 +100,6 @@ in system.build.installBootLoader = builder; system.boot.loader.id = "raspberrypi"; - system.boot.loader.kernelFile = platform.kernelTarget; + system.boot.loader.kernelFile = pkgs.stdenv.hostPlatform.linux-kernel.target; }; } diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index abc1a0af48a..5b39f34200c 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -2,6 +2,13 @@ targetRoot=/mnt-root console=tty1 +verbose="@verbose@" + +info() { + if [[ -n "$verbose" ]]; then + echo "$@" + fi +} extraUtils="@extraUtils@" export LD_LIBRARY_PATH=@extraUtils@/lib @@ -55,7 +62,7 @@ EOF echo "Rebooting..." reboot -f else - echo "Continuing..." + info "Continuing..." fi } @@ -63,9 +70,9 @@ trap 'fail' 0 # Print a greeting. -echo -echo "[1;32m<<< NixOS Stage 1 >>>[0m" -echo +info +info "[1;32m<<< NixOS Stage 1 >>>[0m" +info # Make several required directories. mkdir -p /etc/udev @@ -210,14 +217,14 @@ ln -s @modulesClosure@/lib/modules /lib/modules ln -s @modulesClosure@/lib/firmware /lib/firmware echo @extraUtils@/bin/modprobe > /proc/sys/kernel/modprobe for i in @kernelModules@; do - echo "loading module $(basename $i)..." + info "loading module $(basename $i)..." modprobe $i done # Create device nodes in /dev. @preDeviceCommands@ -echo "running udev..." +info "running udev..." ln -sfn /proc/self/fd /dev/fd ln -sfn /proc/self/fd/0 /dev/stdin ln -sfn /proc/self/fd/1 /dev/stdout @@ -235,8 +242,7 @@ udevadm settle # XXX: Use case usb->lvm will still fail, usb->luks->lvm is covered @preLVMCommands@ - -echo "starting device mapper and LVM..." +info "starting device mapper and LVM..." lvm vgchange -ay if test -n "$debug1devices"; then fail; fi @@ -379,7 +385,7 @@ mountFS() { done fi - echo "mounting $device on $mountPoint..." + info "mounting $device on $mountPoint..." mkdir -p "/mnt-root$mountPoint" diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index cb9735ae04f..44287f3cf09 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -280,7 +280,7 @@ let inherit (config.system.build) earlyMountScript; - inherit (config.boot.initrd) checkJournalingFS + inherit (config.boot.initrd) checkJournalingFS verbose preLVMCommands preDeviceCommands postDeviceCommands postMountCommands preFailCommands kernelModules; resumeDevices = map (sd: if sd ? device then sd.device else "/dev/disk/by-label/${sd.label}") @@ -565,6 +565,23 @@ in description = "Names of supported filesystem types in the initial ramdisk."; }; + boot.initrd.verbose = mkOption { + default = true; + type = types.bool; + description = + '' + Verbosity of the initrd. Please note that disabling verbosity removes + only the mandatory messages generated by the NixOS scripts. For a + completely silent boot, you might also want to set the two following + configuration options: + + <itemizedlist> + <listitem><para><literal>boot.consoleLogLevel = 0;</literal></para></listitem> + <listitem><para><literal>boot.kernelParams = [ "quiet" "udev.log_priority=3" ];</literal></para></listitem> + </itemizedlist> + ''; + }; + boot.loader.supportsInitrdSecrets = mkOption { internal = true; default = false; diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index cbf9e7b49d3..6b672c7b2eb 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -263,7 +263,7 @@ let } (mkIf (config.preStart != "") { serviceConfig.ExecStartPre = - makeJobScript "${name}-pre-start" config.preStart; + [ (makeJobScript "${name}-pre-start" config.preStart) ]; }) (mkIf (config.script != "") { serviceConfig.ExecStart = @@ -271,7 +271,7 @@ let }) (mkIf (config.postStart != "") { serviceConfig.ExecStartPost = - makeJobScript "${name}-post-start" config.postStart; + [ (makeJobScript "${name}-post-start" config.postStart) ]; }) (mkIf (config.reload != "") { serviceConfig.ExecReload = diff --git a/nixos/modules/system/boot/timesyncd.nix b/nixos/modules/system/boot/timesyncd.nix index 35fb5578b07..692315dbe99 100644 --- a/nixos/modules/system/boot/timesyncd.nix +++ b/nixos/modules/system/boot/timesyncd.nix @@ -16,6 +16,7 @@ with lib; }; servers = mkOption { default = config.networking.timeServers; + type = types.listOf types.str; description = '' The set of NTP servers from which to synchronise. ''; diff --git a/nixos/modules/system/boot/tmp.nix b/nixos/modules/system/boot/tmp.nix index 837e308cbea..5bb299adb15 100644 --- a/nixos/modules/system/boot/tmp.nix +++ b/nixos/modules/system/boot/tmp.nix @@ -34,6 +34,7 @@ with lib; { what = "tmpfs"; where = "/tmp"; + type = "tmpfs"; mountConfig.Options = [ "mode=1777" "strictatime" "rw" "nosuid" "nodev" "size=50%" ]; } ]; diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index a055072f9c9..a9b5b134d88 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -7,8 +7,9 @@ let addCheckDesc = desc: elemType: check: types.addCheck elemType check // { description = "${elemType.description} (with check: ${desc})"; }; - nonEmptyStr = addCheckDesc "non-empty" types.str - (x: x != "" && ! (all (c: c == " " || c == "\t") (stringToCharacters x))); + + isNonEmpty = s: (builtins.match "[ \t\n]*" s) == null; + nonEmptyStr = addCheckDesc "non-empty" types.str isNonEmpty; fileSystems' = toposort fsBefore (attrValues config.fileSystems); @@ -28,10 +29,10 @@ let coreFileSystemOpts = { name, config, ... }: { options = { - mountPoint = mkOption { example = "/mnt/usb"; - type = nonEmptyStr; + type = addCheckDesc "non-empty without trailing slash" types.str + (s: isNonEmpty s && (builtins.match ".+/" s) == null); description = "Location of the mounted the file system."; }; diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 6becc696273..df867aa896f 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -17,20 +17,8 @@ let inInitrd = any (fs: fs == "zfs") config.boot.initrd.supportedFilesystems; inSystem = any (fs: fs == "zfs") config.boot.supportedFilesystems; - enableZfs = inInitrd || inSystem; - - kernel = config.boot.kernelPackages; - - packages = if config.boot.zfs.enableUnstable then { - zfs = kernel.zfsUnstable; - zfsUser = pkgs.zfsUnstable; - } else { - zfs = kernel.zfs; - zfsUser = pkgs.zfs; - }; - autosnapPkg = pkgs.zfstools.override { - zfs = packages.zfsUser; + zfs = cfgZfs.package; }; zfsAutoSnap = "${autosnapPkg}/bin/zfs-auto-snapshot"; @@ -111,6 +99,20 @@ in options = { boot.zfs = { + package = mkOption { + readOnly = true; + type = types.package; + default = if config.boot.zfs.enableUnstable then pkgs.zfsUnstable else pkgs.zfs; + description = "Configured ZFS userland tools package."; + }; + + enabled = mkOption { + readOnly = true; + type = types.bool; + default = inInitrd || inSystem; + description = "True if ZFS filesystem support is enabled"; + }; + enableUnstable = mkOption { type = types.bool; default = false; @@ -354,7 +356,7 @@ in ###### implementation config = mkMerge [ - (mkIf enableZfs { + (mkIf cfgZfs.enabled { assertions = [ { assertion = config.networking.hostId != null; @@ -366,20 +368,24 @@ in } ]; - virtualisation.lxd.zfsSupport = true; - boot = { kernelModules = [ "zfs" ]; - extraModulePackages = with packages; [ zfs ]; + + extraModulePackages = [ + (if config.boot.zfs.enableUnstable then + config.boot.kernelPackages.zfsUnstable + else + config.boot.kernelPackages.zfs) + ]; }; boot.initrd = mkIf inInitrd { kernelModules = [ "zfs" ] ++ optional (!cfgZfs.enableUnstable) "spl"; extraUtilsCommands = '' - copy_bin_and_libs ${packages.zfsUser}/sbin/zfs - copy_bin_and_libs ${packages.zfsUser}/sbin/zdb - copy_bin_and_libs ${packages.zfsUser}/sbin/zpool + copy_bin_and_libs ${cfgZfs.package}/sbin/zfs + copy_bin_and_libs ${cfgZfs.package}/sbin/zdb + copy_bin_and_libs ${cfgZfs.package}/sbin/zpool ''; extraUtilsCommandsTest = mkIf inInitrd '' @@ -433,7 +439,7 @@ in services.zfs.zed.settings = { ZED_EMAIL_PROG = mkDefault "${pkgs.mailutils}/bin/mail"; PATH = lib.makeBinPath [ - packages.zfsUser + cfgZfs.package pkgs.coreutils pkgs.curl pkgs.gawk @@ -461,18 +467,18 @@ in "vdev_clear-led.sh" ] ) - (file: { source = "${packages.zfsUser}/etc/${file}"; }) + (file: { source = "${cfgZfs.package}/etc/${file}"; }) // { "zfs/zed.d/zed.rc".text = zedConf; - "zfs/zpool.d".source = "${packages.zfsUser}/etc/zfs/zpool.d/"; + "zfs/zpool.d".source = "${cfgZfs.package}/etc/zfs/zpool.d/"; }; - system.fsPackages = [ packages.zfsUser ]; # XXX: needed? zfs doesn't have (need) a fsck - environment.systemPackages = [ packages.zfsUser ] + system.fsPackages = [ cfgZfs.package ]; # XXX: needed? zfs doesn't have (need) a fsck + environment.systemPackages = [ cfgZfs.package ] ++ optional cfgSnapshots.enable autosnapPkg; # so the user can run the command to see flags - services.udev.packages = [ packages.zfsUser ]; # to hook zvol naming, etc. - systemd.packages = [ packages.zfsUser ]; + services.udev.packages = [ cfgZfs.package ]; # to hook zvol naming, etc. + systemd.packages = [ cfgZfs.package ]; systemd.services = let getPoolFilesystems = pool: @@ -506,8 +512,8 @@ in environment.ZFS_FORCE = optionalString cfgZfs.forceImportAll "-f"; script = (importLib { # See comments at importLib definition. - zpoolCmd="${packages.zfsUser}/sbin/zpool"; - awkCmd="${pkgs.gawk}/bin/awk"; + zpoolCmd = "${cfgZfs.package}/sbin/zpool"; + zfsCmd = "${cfgZfs.package}/sbin/zfs"; inherit cfgZfs; }) + '' poolImported "${pool}" && exit @@ -561,7 +567,7 @@ in RemainAfterExit = true; }; script = '' - ${packages.zfsUser}/sbin/zfs set nixos:shutdown-time="$(date)" "${pool}" + ${cfgZfs.package}/sbin/zfs set nixos:shutdown-time="$(date)" "${pool}" ''; }; createZfsService = serv: @@ -587,7 +593,7 @@ in systemd.targets.zfs.wantedBy = [ "multi-user.target" ]; }) - (mkIf (enableZfs && cfgSnapshots.enable) { + (mkIf (cfgZfs.enabled && cfgSnapshots.enable) { systemd.services = let descr = name: if name == "frequent" then "15 mins" else if name == "hourly" then "hour" @@ -625,7 +631,7 @@ in }) snapshotNames); }) - (mkIf (enableZfs && cfgScrub.enable) { + (mkIf (cfgZfs.enabled && cfgScrub.enable) { systemd.services.zfs-scrub = { description = "ZFS pools scrubbing"; after = [ "zfs-import.target" ]; @@ -633,11 +639,11 @@ in Type = "oneshot"; }; script = '' - ${packages.zfsUser}/bin/zpool scrub ${ + ${cfgZfs.package}/bin/zpool scrub ${ if cfgScrub.pools != [] then (concatStringsSep " " cfgScrub.pools) else - "$(${packages.zfsUser}/bin/zpool list -H -o name)" + "$(${cfgZfs.package}/bin/zpool list -H -o name)" } ''; }; @@ -652,18 +658,20 @@ in }; }) - (mkIf (enableZfs && cfgTrim.enable) { + (mkIf (cfgZfs.enabled && cfgTrim.enable) { systemd.services.zpool-trim = { description = "ZFS pools trim"; after = [ "zfs-import.target" ]; - path = [ packages.zfsUser ]; + path = [ cfgZfs.package ]; startAt = cfgTrim.interval; # By default we ignore errors returned by the trim command, in case: # - HDDs are mixed with SSDs # - There is a SSDs in a pool that is currently trimmed. # - There are only HDDs and we would set the system in a degraded state - serviceConfig.ExecStart = ''${pkgs.runtimeShell} -c 'for pool in $(zpool list -H -o name); do zpool trim $pool; done || true' ''; + serviceConfig.ExecStart = "${pkgs.runtimeShell} -c 'for pool in $(zpool list -H -o name); do zpool trim $pool; done || true' "; }; + + systemd.timers.zpool-trim.timerConfig.Persistent = "yes"; }) ]; } diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index afb9c540416..f730ec82bdf 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -398,6 +398,24 @@ in ''; }; + networking.fqdn = mkOption { + readOnly = true; + type = types.str; + default = if (cfg.hostName != "" && cfg.domain != null) + then "${cfg.hostName}.${cfg.domain}" + else throw '' + The FQDN is required but cannot be determined. Please make sure that + both networking.hostName and networking.domain are set properly. + ''; + defaultText = literalExample ''''${networking.hostName}.''${networking.domain}''; + description = '' + The fully qualified domain name (FQDN) of this host. It is the result + of combining networking.hostName and networking.domain. Using this + option will result in an evaluation error if the hostname is empty or + no domain is specified. + ''; + }; + networking.hostId = mkOption { default = null; example = "4e98920d"; diff --git a/nixos/modules/virtualisation/azure-agent.nix b/nixos/modules/virtualisation/azure-agent.nix index 81413792eda..41f3fa0e664 100644 --- a/nixos/modules/virtualisation/azure-agent.nix +++ b/nixos/modules/virtualisation/azure-agent.nix @@ -146,7 +146,7 @@ in services.logrotate = { enable = true; - config = '' + extraConfig = '' /var/log/waagent.log { compress monthly diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix index ec257801b33..b1415bf021d 100644 --- a/nixos/modules/virtualisation/docker.nix +++ b/nixos/modules/virtualisation/docker.nix @@ -155,13 +155,12 @@ in users.groups.docker.gid = config.ids.gids.docker; systemd.packages = [ cfg.package ]; - # TODO: remove once docker 20.10 is released - systemd.enableUnifiedCgroupHierarchy = false; - systemd.services.docker = { wantedBy = optional cfg.enableOnBoot "multi-user.target"; + requires = [ "docker.socket" ]; environment = proxy_env; serviceConfig = { + Type = "notify"; ExecStart = [ "" '' @@ -215,13 +214,10 @@ in message = "Option enableNvidia requires 32bit support libraries"; }]; } - (mkIf cfg.enableNvidia { - environment.etc."nvidia-container-runtime/config.toml".source = "${pkgs.nvidia-docker}/etc/config.toml"; - }) ]); imports = [ - (mkRemovedOptionModule ["virtualisation" "docker" "socketActivation"] "This option was removed in favor of starting docker at boot") + (mkRemovedOptionModule ["virtualisation" "docker" "socketActivation"] "This option was removed and socket activation is now always active") ]; } diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index d172ae38fdc..e2332df611a 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -43,7 +43,7 @@ in system.build.googleComputeImage = import ../../lib/make-disk-image.nix { name = "google-compute-image"; postVM = '' - PATH=$PATH:${with pkgs; stdenv.lib.makeBinPath [ gnutar gzip ]} + PATH=$PATH:${with pkgs; lib.makeBinPath [ gnutar gzip ]} pushd $out mv $diskImage disk.raw tar -Szcf nixos-image-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}.raw.tar.gz disk.raw diff --git a/nixos/modules/virtualisation/lxd.nix b/nixos/modules/virtualisation/lxd.nix index 103e689abae..4b2adf4cc69 100644 --- a/nixos/modules/virtualisation/lxd.nix +++ b/nixos/modules/virtualisation/lxd.nix @@ -5,13 +5,12 @@ with lib; let - cfg = config.virtualisation.lxd; - zfsCfg = config.boot.zfs; - -in +in { + imports = [ + (mkRemovedOptionModule [ "virtualisation" "lxd" "zfsPackage" ] "Override zfs in an overlay instead to override it globally") + ]; -{ ###### interface options = { @@ -51,18 +50,10 @@ in ''; }; - zfsPackage = mkOption { - type = types.package; - default = with pkgs; if zfsCfg.enableUnstable then zfsUnstable else zfs; - defaultText = "pkgs.zfs"; - description = '' - The ZFS package to use with LXD. - ''; - }; - zfsSupport = mkOption { type = types.bool; - default = false; + default = config.boot.zfs.enabled; + defaultText = "config.boot.zfs.enabled"; description = '' Enables lxd to use zfs as a storage for containers. @@ -87,7 +78,6 @@ in }; ###### implementation - config = mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; @@ -110,7 +100,7 @@ in wantedBy = [ "multi-user.target" ]; after = [ "systemd-udev-settle.service" ]; - path = lib.optional cfg.zfsSupport cfg.zfsPackage; + path = lib.optional config.boot.zfs.enabled config.boot.zfs.package; preStart = '' mkdir -m 0755 -p /var/lib/lxc/rootfs diff --git a/nixos/modules/virtualisation/nixos-containers.nix b/nixos/modules/virtualisation/nixos-containers.nix index 757d73421b8..7bec1b1ff26 100644 --- a/nixos/modules/virtualisation/nixos-containers.nix +++ b/nixos/modules/virtualisation/nixos-containers.nix @@ -170,7 +170,7 @@ let ${concatStringsSep "\n" ( mapAttrsToList (name: cfg: - ''ip link del dev ${name} 2> /dev/null || true '' + "ip link del dev ${name} 2> /dev/null || true " ) cfg.extraVeths )} ''; @@ -185,7 +185,7 @@ let fi '' else - ''${ipcmd} add ${cfg.${attribute}} dev $ifaceHost''; + "${ipcmd} add ${cfg.${attribute}} dev $ifaceHost"; renderExtraVeth = name: cfg: if cfg.hostBridge != null then '' diff --git a/nixos/modules/virtualisation/oci-containers.nix b/nixos/modules/virtualisation/oci-containers.nix index ee9fe62187d..2dd15e3aba4 100644 --- a/nixos/modules/virtualisation/oci-containers.nix +++ b/nixos/modules/virtualisation/oci-containers.nix @@ -217,7 +217,7 @@ let environment = proxy_env; path = - if cfg.backend == "docker" then [ pkgs.docker ] + if cfg.backend == "docker" then [ config.virtualisation.docker.package ] else if cfg.backend == "podman" then [ config.virtualisation.podman.package ] else throw "Unhandled backend: ${cfg.backend}"; @@ -227,29 +227,30 @@ let ${cfg.backend} load -i ${container.imageFile} ''} ''; + + script = concatStringsSep " \\\n " ([ + "exec ${cfg.backend} run" + "--rm" + "--name=${escapeShellArg name}" + "--log-driver=${container.log-driver}" + ] ++ optional (container.entrypoint != null) + "--entrypoint=${escapeShellArg container.entrypoint}" + ++ (mapAttrsToList (k: v: "-e ${escapeShellArg k}=${escapeShellArg v}") container.environment) + ++ map (p: "-p ${escapeShellArg p}") container.ports + ++ optional (container.user != null) "-u ${escapeShellArg container.user}" + ++ map (v: "-v ${escapeShellArg v}") container.volumes + ++ optional (container.workdir != null) "-w ${escapeShellArg container.workdir}" + ++ map escapeShellArg container.extraOptions + ++ [container.image] + ++ map escapeShellArg container.cmd + ); + + preStop = "[ $SERVICE_RESULT = success ] || ${cfg.backend} stop ${name}"; postStop = "${cfg.backend} rm -f ${name} || true"; serviceConfig = { StandardOutput = "null"; StandardError = "null"; - ExecStart = concatStringsSep " \\\n " ([ - "${config.system.path}/bin/${cfg.backend} run" - "--rm" - "--name=${name}" - "--log-driver=${container.log-driver}" - ] ++ optional (container.entrypoint != null) - "--entrypoint=${escapeShellArg container.entrypoint}" - ++ (mapAttrsToList (k: v: "-e ${escapeShellArg k}=${escapeShellArg v}") container.environment) - ++ map (p: "-p ${escapeShellArg p}") container.ports - ++ optional (container.user != null) "-u ${escapeShellArg container.user}" - ++ map (v: "-v ${escapeShellArg v}") container.volumes - ++ optional (container.workdir != null) "-w ${escapeShellArg container.workdir}" - ++ map escapeShellArg container.extraOptions - ++ [container.image] - ++ map escapeShellArg container.cmd - ); - - ExecStop = ''${pkgs.bash}/bin/sh -c "[ $SERVICE_RESULT = success ] || ${cfg.backend} stop ${name}"''; ### There is no generalized way of supporting `reload` for docker ### containers. Some containers may respond well to SIGHUP sent to their diff --git a/nixos/modules/virtualisation/podman.nix b/nixos/modules/virtualisation/podman.nix index 36c0ca8dfea..98da5a096d9 100644 --- a/nixos/modules/virtualisation/podman.nix +++ b/nixos/modules/virtualisation/podman.nix @@ -2,7 +2,6 @@ let cfg = config.virtualisation.podman; toml = pkgs.formats.toml { }; - nvidia-docker = pkgs.nvidia-docker.override { containerRuntimePath = "${pkgs.runc}/bin/runc"; }; inherit (lib) mkOption types; @@ -100,8 +99,8 @@ in containersConf.extraConfig = lib.optionalString cfg.enableNvidia (builtins.readFile (toml.generate "podman.nvidia.containers.conf" { engine = { - conmon_env_vars = [ "PATH=${lib.makeBinPath [ nvidia-docker ]}" ]; - runtimes.nvidia = [ "${nvidia-docker}/bin/nvidia-container-runtime" ]; + conmon_env_vars = [ "PATH=${lib.makeBinPath [ pkgs.nvidia-podman ]}" ]; + runtimes.nvidia = [ "${pkgs.nvidia-podman}/bin/nvidia-container-runtime" ]; }; })); }; @@ -111,14 +110,7 @@ in assertion = cfg.dockerCompat -> !config.virtualisation.docker.enable; message = "Option dockerCompat conflicts with docker"; } - { - assertion = cfg.enableNvidia -> !config.virtualisation.docker.enableNvidia; - message = "Option enableNvidia conflicts with docker.enableNvidia"; - } ]; } - (lib.mkIf cfg.enableNvidia { - environment.etc."nvidia-container-runtime/config.toml".source = "${nvidia-docker}/etc/podman-config.toml"; - }) ]); } diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 447d1f091c8..bf3615f2fe7 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -136,10 +136,8 @@ let cp ${bootDisk}/efi-vars.fd "$NIX_EFI_VARS" || exit 1 chmod 0644 "$NIX_EFI_VARS" || exit 1 fi - '' else '' - ''} - '' else '' - ''} + '' else ""} + '' else ""} cd $TMPDIR idx=0 @@ -187,8 +185,7 @@ let efiVars=$out/efi-vars.fd cp ${efiVarsDefault} $efiVars chmod 0644 $efiVars - '' else '' - ''} + '' else ""} ''; buildInputs = [ pkgs.util-linux ]; QEMU_OPTS = "-nographic -serial stdio -monitor none" diff --git a/nixos/modules/virtualisation/railcar.nix b/nixos/modules/virtualisation/railcar.nix index 10464f62898..b603effef6e 100644 --- a/nixos/modules/virtualisation/railcar.nix +++ b/nixos/modules/virtualisation/railcar.nix @@ -105,7 +105,7 @@ in stateDir = mkOption { type = types.path; - default = ''/var/railcar''; + default = "/var/railcar"; description = "Railcar persistent state directory"; }; diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix index 5ad647769bb..5b57ca860da 100644 --- a/nixos/modules/virtualisation/xen-dom0.nix +++ b/nixos/modules/virtualisation/xen-dom0.nix @@ -57,7 +57,8 @@ in virtualisation.xen.bootParams = mkOption { - default = ""; + default = []; + type = types.listOf types.str; description = '' Parameters passed to the Xen hypervisor at boot time. @@ -68,6 +69,7 @@ in mkOption { default = 0; example = 512; + type = types.addCheck types.int (n: n >= 0); description = '' Amount of memory (in MiB) allocated to Domain 0 on boot. @@ -78,6 +80,7 @@ in virtualisation.xen.bridge = { name = mkOption { default = "xenbr0"; + type = types.str; description = '' Name of bridge the Xen domUs connect to. ''; diff --git a/nixos/release.nix b/nixos/release.nix index 1f5c1581269..109747945f7 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -79,7 +79,7 @@ let in tarball // { meta = { - description = "NixOS system tarball for ${system} - ${stdenv.hostPlatform.platform.name}"; + description = "NixOS system tarball for ${system} - ${stdenv.hostPlatform.linux-kernel.name}"; maintainers = map (x: lib.maintainers.${x}) maintainers; }; inherit config; @@ -105,7 +105,7 @@ let modules = makeModules module {}; }; build = configEvaled.config.system.build; - kernelTarget = configEvaled.pkgs.stdenv.hostPlatform.platform.kernelTarget; + kernelTarget = configEvaled.pkgs.stdenv.hostPlatform.linux-kernel.target; in pkgs.symlinkJoin { name = "netboot"; diff --git a/nixos/tests/acme.nix b/nixos/tests/acme.nix index eb152cf51a6..c6d393d9196 100644 --- a/nixos/tests/acme.nix +++ b/nixos/tests/acme.nix @@ -77,6 +77,27 @@ in import ./make-test-python.nix ({ lib, ... }: { after = [ "acme-a.example.test.service" "nginx-config-reload.service" ]; }; + # Test that account creation is collated into one service + specialisation.account-creation.configuration = { nodes, pkgs, lib, ... }: let + email = "newhostmaster@example.test"; + caDomain = nodes.acme.config.test-support.acme.caDomain; + # Exit 99 to make it easier to track if this is the reason a renew failed + testScript = '' + test -e accounts/${caDomain}/${email}/account.json || exit 99 + ''; + in { + security.acme.email = lib.mkForce email; + systemd.services."b.example.test".preStart = testScript; + systemd.services."c.example.test".preStart = testScript; + + services.nginx.virtualHosts."b.example.test" = (vhostBase pkgs) // { + enableACME = true; + }; + services.nginx.virtualHosts."c.example.test" = (vhostBase pkgs) // { + enableACME = true; + }; + }; + # Cert config changes will not cause the nginx configuration to change. # This tests that the reload service is correctly triggered. # It also tests that postRun is exec'd as root @@ -289,7 +310,7 @@ in import ./make-test-python.nix ({ lib, ... }: { acme.start() webserver.start() - acme.wait_for_unit("default.target") + acme.wait_for_unit("network-online.target") acme.wait_for_unit("pebble.service") client.succeed("curl https://${caDomain}:15000/roots/0 > /tmp/ca.crt") @@ -314,6 +335,15 @@ in import ./make-test-python.nix ({ lib, ... }: { check_issuer(webserver, "a.example.test", "pebble") check_connection(client, "a.example.test") + with subtest("Runs 1 cert for account creation before others"): + switch_to(webserver, "account-creation") + webserver.wait_for_unit("acme-finished-a.example.test.target") + check_connection(client, "a.example.test") + webserver.wait_for_unit("acme-finished-b.example.test.target") + webserver.wait_for_unit("acme-finished-c.example.test.target") + check_connection(client, "b.example.test") + check_connection(client, "c.example.test") + with subtest("Can reload web server when cert configuration changes"): switch_to(webserver, "cert-change") webserver.wait_for_unit("acme-finished-a.example.test.target") diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 7d83b952f94..712af93591d 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -81,6 +81,7 @@ in corerad = handleTest ./corerad.nix {}; couchdb = handleTest ./couchdb.nix {}; cri-o = handleTestOn ["x86_64-linux"] ./cri-o.nix {}; + custom-ca = handleTest ./custom-ca.nix {}; deluge = handleTest ./deluge.nix {}; dhparams = handleTest ./dhparams.nix {}; dnscrypt-proxy2 = handleTestOn ["x86_64-linux"] ./dnscrypt-proxy2.nix {}; @@ -147,6 +148,7 @@ in haproxy = handleTest ./haproxy.nix {}; hardened = handleTest ./hardened.nix {}; hedgedoc = handleTest ./hedgedoc.nix {}; + herbstluftwm = handleTest ./herbstluftwm.nix {}; installed-tests = pkgs.recurseIntoAttrs (handleTest ./installed-tests {}); oci-containers = handleTestOn ["x86_64-linux"] ./oci-containers.nix {}; # 9pnet_virtio used to mount /nix partition doesn't support @@ -154,6 +156,7 @@ in # not on other platforms. hibernate = handleTestOn ["x86_64-linux"] ./hibernate.nix {}; hitch = handleTest ./hitch {}; + hledger-web = handleTest ./hledger-web.nix {}; hocker-fetchdocker = handleTest ./hocker-fetchdocker {}; home-assistant = handleTest ./home-assistant.nix {}; hostname = handleTest ./hostname.nix {}; @@ -187,6 +190,7 @@ in kernel-latest = handleTest ./kernel-latest.nix {}; kernel-lts = handleTest ./kernel-lts.nix {}; kernel-testing = handleTest ./kernel-testing.nix {}; + kernel-latest-ath-user-regd = handleTest ./kernel-latest-ath-user-regd.nix {}; keycloak = discoverTests (import ./keycloak.nix); keymap = handleTest ./keymap.nix {}; knot = handleTest ./knot.nix {}; @@ -271,6 +275,7 @@ in nginx-variants = handleTest ./nginx-variants.nix {}; nix-ssh-serve = handleTest ./nix-ssh-serve.nix {}; nixos-generate-config = handleTest ./nixos-generate-config.nix {}; + nomad = handleTest ./nomad.nix {}; novacomd = handleTestOn ["x86_64-linux"] ./novacomd.nix {}; nsd = handleTest ./nsd.nix {}; nzbget = handleTest ./nzbget.nix {}; @@ -300,6 +305,7 @@ in php = handleTest ./php {}; pinnwand = handleTest ./pinnwand.nix {}; plasma5 = handleTest ./plasma5.nix {}; + pleroma = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./pleroma.nix {}; plotinus = handleTest ./plotinus.nix {}; podman = handleTestOn ["x86_64-linux"] ./podman.nix {}; postfix = handleTest ./postfix.nix {}; @@ -401,9 +407,11 @@ in unbound = handleTest ./unbound.nix {}; unit-php = handleTest ./web-servers/unit-php.nix {}; upnp = handleTest ./upnp.nix {}; + usbguard = handleTest ./usbguard.nix {}; uwsgi = handleTest ./uwsgi.nix {}; v2ray = handleTest ./v2ray.nix {}; vault = handleTest ./vault.nix {}; + vault-postgresql = handleTest ./vault-postgresql.nix {}; vector = handleTest ./vector.nix {}; victoriametrics = handleTest ./victoriametrics.nix {}; virtualbox = handleTestOn ["x86_64-linux"] ./virtualbox.nix {}; diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix index 795b93f6f54..8429d932ae6 100644 --- a/nixos/tests/chromium.nix +++ b/nixos/tests/chromium.nix @@ -1,10 +1,14 @@ { system ? builtins.currentSystem , config ? {} , pkgs ? import ../.. { inherit system config; } -, channelMap ? { - stable = pkgs.chromium; - beta = pkgs.chromiumBeta; - dev = pkgs.chromiumDev; +, channelMap ? { # Maps "channels" to packages + stable = pkgs.chromium; + beta = pkgs.chromiumBeta; + dev = pkgs.chromiumDev; + ungoogled = pkgs.ungoogled-chromium; + chrome-stable = pkgs.google-chrome; + chrome-beta = pkgs.google-chrome-beta; + chrome-dev = pkgs.google-chrome-dev; } }: @@ -14,7 +18,7 @@ with pkgs.lib; mapAttrs (channel: chromiumPkg: makeTest rec { name = "chromium-${channel}"; meta = { - maintainers = with maintainers; [ aszlig ]; + maintainers = with maintainers; [ aszlig primeos ]; # https://github.com/NixOS/hydra/issues/591#issuecomment-435125621 inherit (chromiumPkg.meta) timeout; }; @@ -47,7 +51,7 @@ mapAttrs (channel: chromiumPkg: makeTest rec { testScript = let xdo = name: text: let xdoScript = pkgs.writeText "${name}.xdo" text; - in "${pkgs.xdotool}/bin/xdotool '${xdoScript}'"; + in "${pkgs.xdotool}/bin/xdotool ${xdoScript}"; in '' import shlex from contextlib import contextmanager, _GeneratorContextManager @@ -58,101 +62,86 @@ mapAttrs (channel: chromiumPkg: makeTest rec { return "su - ${user} -c " + shlex.quote(cmd) + def get_browser_binary(): + """Returns the name of the browser binary.""" + pname = "${getName chromiumPkg.name}" + if pname.find("chromium") != -1: + return "chromium" # Same name for all channels and ungoogled-chromium + if pname == "google-chrome": + return "google-chrome-stable" + if pname == "google-chrome-dev": + return "google-chrome-unstable" + # For google-chrome-beta and as fallback: + return pname + + def create_new_win(): + """Creates a new Chromium window.""" with machine.nested("Creating a new Chromium window"): - machine.execute( + machine.wait_until_succeeds( ru( - "${xdo "new-window" '' + "${xdo "create_new_win-select_main_window" '' search --onlyvisible --name "startup done" windowfocus --sync windowactivate --sync ''}" ) ) - machine.execute( + machine.send_key("ctrl-n") + # Wait until the new window appears: + machine.wait_until_succeeds( ru( - "${xdo "new-window" '' - key Ctrl+n - ''}" - ) - ) - - - def close_win(): - def try_close(_): - machine.execute( - ru( - "${xdo "close-window" '' - search --onlyvisible --name "new tab" + "${xdo "create_new_win-wait_for_window" '' + search --onlyvisible --name "New Tab" windowfocus --sync windowactivate --sync ''}" ) ) - machine.execute( - ru( - "${xdo "close-window" '' - key Ctrl+w - ''}" - ) - ) - for _ in range(1, 20): - status, out = machine.execute( - ru( - "${xdo "wait-for-close" '' - search --onlyvisible --name "new tab" - ''}" - ) - ) - if status != 0: - return True - machine.sleep(1) - return False - - retry(try_close) - - - def wait_for_new_win(): - ret = False - with machine.nested("Waiting for new Chromium window to appear"): - for _ in range(1, 20): - status, out = machine.execute( - ru( - "${xdo "wait-for-window" '' - search --onlyvisible --name "new tab" - windowfocus --sync - windowactivate --sync - ''}" - ) - ) - if status == 0: - ret = True - machine.sleep(10) - break - machine.sleep(1) - return ret - def create_and_wait_for_new_win(): - for _ in range(1, 3): - create_new_win() - if wait_for_new_win(): - return True - assert False, "new window did not appear within 60 seconds" + def close_new_tab_win(): + """Closes the Chromium window with the title "New Tab".""" + machine.wait_until_succeeds( + ru( + "${xdo "close_new_tab_win-select_main_window" '' + search --onlyvisible --name "New Tab" + windowfocus --sync + windowactivate --sync + ''}" + ) + ) + machine.send_key("ctrl-w") + # Wait until the closed window disappears: + machine.wait_until_fails( + ru( + "${xdo "close_new_tab_win-wait_for_close" '' + search --onlyvisible --name "New Tab" + ''}" + ) + ) @contextmanager def test_new_win(description): - create_and_wait_for_new_win() + create_new_win() with machine.nested(description): yield - close_win() + # Close the newly created window: + machine.send_key("ctrl-w") machine.wait_for_x() url = "file://${startupHTML}" - machine.succeed(ru(f'ulimit -c unlimited; chromium "{url}" & disown')) + machine.succeed(ru(f'ulimit -c unlimited; "{get_browser_binary()}" "{url}" & disown')) + + if get_browser_binary().startswith("google-chrome"): + # Need to click away the first window: + machine.wait_for_text("Make Google Chrome the default browser") + machine.screenshot("google_chrome_default_browser_prompt") + machine.send_key("ret") + machine.wait_for_text("startup done") machine.wait_until_succeeds( ru( @@ -166,9 +155,11 @@ mapAttrs (channel: chromiumPkg: makeTest rec { ) ) - create_and_wait_for_new_win() + create_new_win() + # Optional: Wait for the new tab page to fully load before taking the screenshot: + machine.wait_for_text("Web Store") machine.screenshot("empty_windows") - close_win() + close_new_tab_win() machine.screenshot("startup_done") @@ -176,7 +167,7 @@ mapAttrs (channel: chromiumPkg: makeTest rec { machine.succeed( ru( "${xdo "type-url" '' - search --sync --onlyvisible --name "new tab" + search --sync --onlyvisible --name "New Tab" windowfocus --sync type --delay 1000 "chrome://sandbox" ''}" @@ -186,7 +177,7 @@ mapAttrs (channel: chromiumPkg: makeTest rec { machine.succeed( ru( "${xdo "submit-url" '' - search --sync --onlyvisible --name "new tab" + search --sync --onlyvisible --name "New Tab" windowfocus --sync key --delay 1000 Return ''}" @@ -198,7 +189,7 @@ mapAttrs (channel: chromiumPkg: makeTest rec { machine.succeed( ru( "${xdo "find-window" '' - search --sync --onlyvisible --name "sandbox status" + search --sync --onlyvisible --name "Sandbox Status" windowfocus --sync ''}" ) @@ -232,7 +223,7 @@ mapAttrs (channel: chromiumPkg: makeTest rec { machine.succeed( ru( "${xdo "find-window-after-copy" '' - search --onlyvisible --name "sandbox status" + search --onlyvisible --name "Sandbox Status" ''}" ) ) diff --git a/nixos/tests/cifs-utils.nix b/nixos/tests/cifs-utils.nix new file mode 100644 index 00000000000..98587b10d94 --- /dev/null +++ b/nixos/tests/cifs-utils.nix @@ -0,0 +1,12 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "cifs-utils"; + + machine = { pkgs, ... }: { environment.systemPackages = [ pkgs.cifs-utils ]; }; + + testScript = '' + machine.succeed("smbinfo -h") + machine.succeed("smb2-quota -h") + assert "${pkgs.cifs-utils.version}" in machine.succeed("cifs.upcall -v") + assert "${pkgs.cifs-utils.version}" in machine.succeed("mount.cifs -V") + ''; +}) diff --git a/nixos/tests/containers-tmpfs.nix b/nixos/tests/containers-tmpfs.nix index e1ab098e985..7ebf0d02a24 100644 --- a/nixos/tests/containers-tmpfs.nix +++ b/nixos/tests/containers-tmpfs.nix @@ -3,7 +3,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "containers-tmpfs"; meta = with pkgs.lib.maintainers; { - maintainers = [ kampka ]; + maintainers = [ ]; }; machine = diff --git a/nixos/tests/custom-ca.nix b/nixos/tests/custom-ca.nix new file mode 100644 index 00000000000..67f7b3ff1f1 --- /dev/null +++ b/nixos/tests/custom-ca.nix @@ -0,0 +1,161 @@ +# Checks that `security.pki` options are working in curl and the main browser +# engines: Gecko (via Firefox), Chromium, QtWebEngine (Falkon) and WebKitGTK +# (via Midori). The test checks that certificates issued by a custom trusted +# CA are accepted but those from an unknown CA are rejected. + +import ./make-test-python.nix ({ pkgs, lib, ... }: + +let + makeCert = { caName, domain }: pkgs.runCommand "example-cert" + { buildInputs = [ pkgs.gnutls ]; } + '' + mkdir $out + + # CA cert template + cat >ca.template <<EOF + organization = "${caName}" + cn = "${caName}" + expiration_days = 365 + ca + cert_signing_key + crl_signing_key + EOF + + # server cert template + cat >server.template <<EOF + organization = "An example company" + cn = "${domain}" + expiration_days = 30 + dns_name = "${domain}" + encryption_key + signing_key + EOF + + # generate CA keypair + certtool \ + --generate-privkey \ + --key-type rsa \ + --sec-param High \ + --outfile $out/ca.key + certtool \ + --generate-self-signed \ + --load-privkey $out/ca.key \ + --template ca.template \ + --outfile $out/ca.crt + + # generate server keypair + certtool \ + --generate-privkey \ + --key-type rsa \ + --sec-param High \ + --outfile $out/server.key + certtool \ + --generate-certificate \ + --load-privkey $out/server.key \ + --load-ca-privkey $out/ca.key \ + --load-ca-certificate $out/ca.crt \ + --template server.template \ + --outfile $out/server.crt + ''; + + example-good-cert = makeCert + { caName = "Example good CA"; + domain = "good.example.com"; + }; + + example-bad-cert = makeCert + { caName = "Unknown CA"; + domain = "bad.example.com"; + }; + +in + +{ + name = "custom-ca"; + meta.maintainers = with lib.maintainers; [ rnhmjoj ]; + + enableOCR = true; + + machine = { pkgs, ... }: + { imports = [ ./common/user-account.nix ./common/x11.nix ]; + + # chromium-based browsers refuse to run as root + test-support.displayManager.auto.user = "alice"; + # browsers may hang with the default memory + virtualisation.memorySize = "500"; + + networking.hosts."127.0.0.1" = [ "good.example.com" "bad.example.com" ]; + security.pki.certificateFiles = [ "${example-good-cert}/ca.crt" ]; + + services.nginx.enable = true; + services.nginx.virtualHosts."good.example.com" = + { onlySSL = true; + sslCertificate = "${example-good-cert}/server.crt"; + sslCertificateKey = "${example-good-cert}/server.key"; + locations."/".extraConfig = "return 200 'It works!';"; + }; + services.nginx.virtualHosts."bad.example.com" = + { onlySSL = true; + sslCertificate = "${example-bad-cert}/server.crt"; + sslCertificateKey = "${example-bad-cert}/server.key"; + locations."/".extraConfig = "return 200 'It does not work!';"; + }; + + environment.systemPackages = with pkgs; + [ xdotool firefox chromium falkon midori ]; + }; + + testScript = '' + def execute_as(user: str, cmd: str) -> Tuple[int, str]: + """ + Run a shell command as a specific user. + """ + return machine.execute(f"sudo -u {user} {cmd}") + + + def wait_for_window_as(user: str, cls: str) -> None: + """ + Wait until a X11 window of a given user appears. + """ + + def window_is_visible(last_try: bool) -> bool: + ret, stdout = execute_as(user, f"xdotool search --onlyvisible --class {cls}") + if last_try: + machine.log(f"Last chance to match {cls} on the window list") + return ret == 0 + + with machine.nested("Waiting for a window to appear"): + retry(window_is_visible) + + + machine.start() + + with subtest("Good certificate is trusted in curl"): + machine.wait_for_unit("nginx") + machine.wait_for_open_port(443) + machine.succeed("curl -fv https://good.example.com") + + with subtest("Unknown CA is untrusted in curl"): + machine.fail("curl -fv https://bad.example.com") + + browsers = ["firefox", "chromium", "falkon", "midori"] + errors = ["Security Risk", "not private", "Certificate Error", "Security"] + + machine.wait_for_x() + for browser, error in zip(browsers, errors): + with subtest("Good certificate is trusted in " + browser): + execute_as( + "alice", f"env P11_KIT_DEBUG=trust {browser} https://good.example.com & >&2" + ) + wait_for_window_as("alice", browser) + machine.wait_for_text("It works!") + machine.screenshot("good" + browser) + execute_as("alice", "xdotool key ctrl+w") # close tab + + with subtest("Unknown CA is untrusted in " + browser): + execute_as("alice", f"{browser} https://bad.example.com & >&2") + machine.wait_for_text(error) + machine.screenshot("bad" + browser) + machine.succeed("pkill " + browser) + ''; +}) diff --git a/nixos/tests/dnscrypt-wrapper/default.nix b/nixos/tests/dnscrypt-wrapper/default.nix index d5c09172308..1bdd064e113 100644 --- a/nixos/tests/dnscrypt-wrapper/default.nix +++ b/nixos/tests/dnscrypt-wrapper/default.nix @@ -31,6 +31,7 @@ import ../make-test-python.nix ({ pkgs, ... }: { client = { lib, ... }: { services.dnscrypt-proxy2.enable = true; + services.dnscrypt-proxy2.upstreamDefaults = false; services.dnscrypt-proxy2.settings = { server_names = [ "server" ]; static.server.stamp = "sdns://AQAAAAAAAAAAEDE5Mi4xNjguMS4xOjUzNTMgFEHYOv0SCKSuqR5CDYa7-58cCBuXO2_5uTSVU9wNQF0WMi5kbnNjcnlwdC1jZXJ0LnNlcnZlcg"; diff --git a/nixos/tests/git/hub.nix b/nixos/tests/git/hub.nix index 51ec3d5b412..4f3189861a0 100644 --- a/nixos/tests/git/hub.nix +++ b/nixos/tests/git/hub.nix @@ -6,12 +6,12 @@ import ../make-test-python.nix ({ pkgs, ...} : { nodes.hub = { pkgs, ... }: { - environment.systemPackages = [ pkgs.gitAndTools.hub ]; + environment.systemPackages = [ pkgs.hub ]; }; testScript = '' - assert "git version ${pkgs.git.version}\nhub version ${pkgs.gitAndTools.hub.version}\n" in hub.succeed("hub version") + assert "git version ${pkgs.git.version}\nhub version ${pkgs.hub.version}\n" in hub.succeed("hub version") assert "These GitHub commands are provided by hub" in hub.succeed("hub help") ''; }) diff --git a/nixos/tests/herbstluftwm.nix b/nixos/tests/herbstluftwm.nix new file mode 100644 index 00000000000..2c98cceee6a --- /dev/null +++ b/nixos/tests/herbstluftwm.nix @@ -0,0 +1,38 @@ +import ./make-test-python.nix ({ lib, ...} : { + name = "herbstluftwm"; + + meta = { + maintainers = with lib.maintainers; [ thibautmarty ]; + timeout = 30; + }; + + machine = { pkgs, lib, ... }: { + imports = [ ./common/x11.nix ./common/user-account.nix ]; + test-support.displayManager.auto.user = "alice"; + services.xserver.displayManager.defaultSession = lib.mkForce "none+herbstluftwm"; + services.xserver.windowManager.herbstluftwm.enable = true; + environment.systemPackages = [ pkgs.dzen2 ]; # needed for upstream provided panel + }; + + testScript = '' + with subtest("ensure x starts"): + machine.wait_for_x() + machine.wait_for_file("/home/alice/.Xauthority") + machine.succeed("xauth merge ~alice/.Xauthority") + + with subtest("ensure client is available"): + machine.succeed("herbstclient --version") + + with subtest("ensure keybindings are set"): + machine.wait_until_succeeds("herbstclient list_keybinds | grep xterm") + + with subtest("ensure panel starts"): + machine.wait_for_window("dzen title") + + with subtest("ensure we can open a new terminal"): + machine.send_key("alt-ret") + machine.wait_for_window(r"alice.*?machine") + machine.sleep(2) + machine.screenshot("terminal") + ''; +}) diff --git a/nixos/tests/hledger-web.nix b/nixos/tests/hledger-web.nix new file mode 100644 index 00000000000..378d819437d --- /dev/null +++ b/nixos/tests/hledger-web.nix @@ -0,0 +1,53 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: +let + journal = pkgs.writeText "test.journal" '' + 2010/01/10 Loan + assets:cash 500$ + income:loan -500$ + 2010/01/10 NixOS Foundation donation + expenses:donation 250$ + assets:cash -250$ + ''; +in +rec { + name = "hledger-web"; + meta.maintainers = with lib.maintainers; [ marijanp ]; + + nodes = { + server = { config, pkgs, ... }: rec { + services.hledger-web = { + host = "127.0.0.1"; + port = 5000; + enable = true; + journalFile = journal; + }; + networking.firewall.allowedTCPPorts = [ services.hledger-web.port ]; + }; + apiserver = { config, pkgs, ... }: rec { + services.hledger-web = { + host = "127.0.0.1"; + port = 5000; + enable = true; + serveApi = true; + journalFile = journal; + }; + networking.firewall.allowedTCPPorts = [ services.hledger-web.port ]; + }; + }; + + testScript = '' + start_all() + + server.wait_for_unit("hledger-web.service") + server.wait_for_open_port(5000) + with subtest("Check if web UI is accessible"): + page = server.succeed("curl -L http://127.0.0.1:5000") + assert "test.journal" in page + + apiserver.wait_for_unit("hledger-web.service") + apiserver.wait_for_open_port(5000) + with subtest("Check if the JSON API is served"): + transactions = apiserver.succeed("curl -L http://127.0.0.1:5000/transactions") + assert "NixOS Foundation donation" in transactions + ''; +}) diff --git a/nixos/tests/hostname.nix b/nixos/tests/hostname.nix index e598549ef1d..2e92b4259a6 100644 --- a/nixos/tests/hostname.nix +++ b/nixos/tests/hostname.nix @@ -7,9 +7,12 @@ with import ../lib/testing-python.nix { inherit system pkgs; }; with pkgs.lib; let - makeHostNameTest = hostName: domain: + makeHostNameTest = hostName: domain: fqdnOrNull: let fqdn = hostName + (optionalString (domain != null) ".${domain}"); + getStr = str: # maybeString2String + let res = builtins.tryEval str; + in if (res.success && res.value != null) then res.value else "null"; in makeTest { name = "hostname-${fqdn}"; @@ -26,13 +29,16 @@ let ]; }; - testScript = '' + testScript = { nodes, ... }: '' start_all() machine = ${hostName} machine.wait_for_unit("network-online.target") + # Test if NixOS computes the correct FQDN (either a FQDN or an error/null): + assert "${getStr nodes.machine.config.networking.fqdn}" == "${getStr fqdnOrNull}" + # The FQDN, domain name, and hostname detection should work as expected: assert "${fqdn}" == machine.succeed("hostname --fqdn").strip() assert "${optionalString (domain != null) domain}" == machine.succeed("dnsdomainname").strip() @@ -60,7 +66,7 @@ let in { - noExplicitDomain = makeHostNameTest "ahost" null; + noExplicitDomain = makeHostNameTest "ahost" null null; - explicitDomain = makeHostNameTest "ahost" "adomain"; + explicitDomain = makeHostNameTest "ahost" "adomain" "ahost.adomain"; } diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index de4bb399c16..789add331b7 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -76,8 +76,8 @@ let def assemble_qemu_flags(): flags = "-cpu max" ${if system == "x86_64-linux" - then ''flags += " -m 768"'' - else ''flags += " -m 512 -enable-kvm -machine virt,gic-version=host"'' + then ''flags += " -m 1024"'' + else ''flags += " -m 768 -enable-kvm -machine virt,gic-version=host"'' } return flags @@ -284,7 +284,9 @@ let extraInstallerConfig ]; + # builds stuff in the VM, needs more juice virtualisation.diskSize = 8 * 1024; + virtualisation.cores = 8; virtualisation.memorySize = 1536; # Use a small /dev/vdb as the root disk for the @@ -324,8 +326,8 @@ let ] ++ optional (bootLoader == "grub" && grubVersion == 1) pkgs.grub ++ optionals (bootLoader == "grub" && grubVersion == 2) [ - pkgs.grub2 - pkgs.grub2_efi + (pkgs.grub2.override { zfsSupport = true; }) + (pkgs.grub2_efi.override { zfsSupport = true; }) ]; nix.binaryCaches = mkForce [ ]; diff --git a/nixos/tests/kernel-latest-ath-user-regd.nix b/nixos/tests/kernel-latest-ath-user-regd.nix new file mode 100644 index 00000000000..11a3959e692 --- /dev/null +++ b/nixos/tests/kernel-latest-ath-user-regd.nix @@ -0,0 +1,17 @@ +import ./make-test-python.nix ({ pkgs, ...} : { + name = "kernel-latest-ath-user-regd"; + meta = with pkgs.lib.maintainers; { + maintainers = [ veehaitch ]; + }; + + machine = { pkgs, ... }: + { + boot.kernelPackages = pkgs.linuxPackages_latest; + networking.wireless.athUserRegulatoryDomain = true; + }; + + testScript = + '' + assert "CONFIG_ATH_USER_REGD=y" in machine.succeed("zcat /proc/config.gz") + ''; +}) diff --git a/nixos/tests/mpd.nix b/nixos/tests/mpd.nix index 63d15e813af..5c969fc9c91 100644 --- a/nixos/tests/mpd.nix +++ b/nixos/tests/mpd.nix @@ -107,7 +107,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: for track in tracks.splitlines(): server.succeed(f"{mpc} add {track}") - _, added_tracks = server.execute(f"{mpc} listall") + _, added_tracks = server.execute(f"{mpc} playlist") # Check we succeeded adding audio tracks to the playlist assert len(added_tracks.splitlines()) > 0 diff --git a/nixos/tests/nextcloud/basic.nix b/nixos/tests/nextcloud/basic.nix index 78142d37966..90050447042 100644 --- a/nixos/tests/nextcloud/basic.nix +++ b/nixos/tests/nextcloud/basic.nix @@ -42,6 +42,7 @@ in { enable = true; startAt = "20:00"; }; + phpExtraExtensions = all: [ all.bz2 ]; }; environment.systemPackages = [ cfg.services.nextcloud.occ ]; diff --git a/nixos/tests/nomad.nix b/nixos/tests/nomad.nix new file mode 100644 index 00000000000..51b11a8fef9 --- /dev/null +++ b/nixos/tests/nomad.nix @@ -0,0 +1,97 @@ +import ./make-test-python.nix ( + { lib, ... }: { + name = "nomad"; + nodes = { + default_server = { pkgs, lib, ... }: { + networking = { + interfaces.eth1.ipv4.addresses = lib.mkOverride 0 [{ + address = "192.168.1.1"; + prefixLength = 16; + }]; + }; + + environment.etc."nomad.custom.json".source = + (pkgs.formats.json { }).generate "nomad.custom.json" { + region = "universe"; + datacenter = "earth"; + }; + + services.nomad = { + enable = true; + + settings = { + server = { + enabled = true; + bootstrap_expect = 1; + }; + }; + + extraSettingsPaths = [ "/etc/nomad.custom.json" ]; + enableDocker = false; + }; + }; + + custom_state_dir_server = { pkgs, lib, ... }: { + networking = { + interfaces.eth1.ipv4.addresses = lib.mkOverride 0 [{ + address = "192.168.1.1"; + prefixLength = 16; + }]; + }; + + environment.etc."nomad.custom.json".source = + (pkgs.formats.json { }).generate "nomad.custom.json" { + region = "universe"; + datacenter = "earth"; + }; + + services.nomad = { + enable = true; + dropPrivileges = false; + + settings = { + data_dir = "/nomad/data/dir"; + server = { + enabled = true; + bootstrap_expect = 1; + }; + }; + + extraSettingsPaths = [ "/etc/nomad.custom.json" ]; + enableDocker = false; + }; + + systemd.services.nomad.serviceConfig.ExecStartPre = "${pkgs.writeShellScript "mk_data_dir" '' + set -euxo pipefail + + ${pkgs.coreutils}/bin/mkdir -p /nomad/data/dir + ''}"; + }; + }; + + testScript = '' + def test_nomad_server(server): + server.wait_for_unit("nomad.service") + + # wait for healthy server + server.wait_until_succeeds( + "[ $(nomad operator raft list-peers | grep true | wc -l) == 1 ]" + ) + + # wait for server liveness + server.succeed("[ $(nomad server members | grep -o alive | wc -l) == 1 ]") + + # check the region + server.succeed("nomad server members | grep -o universe") + + # check the datacenter + server.succeed("[ $(nomad server members | grep -o earth | wc -l) == 1 ]") + + + servers = [default_server, custom_state_dir_server] + + for server in servers: + test_nomad_server(server) + ''; + } +) diff --git a/nixos/tests/opentabletdriver.nix b/nixos/tests/opentabletdriver.nix index 832d4c25a54..fe345a7bec7 100644 --- a/nixos/tests/opentabletdriver.nix +++ b/nixos/tests/opentabletdriver.nix @@ -1,4 +1,6 @@ -import ./make-test-python.nix ( { pkgs, ... }: { +import ./make-test-python.nix ( { pkgs, ... }: let + testUser = "alice"; +in { name = "opentabletdriver"; meta = { maintainers = with pkgs.lib.maintainers; [ thiagokokada ]; @@ -10,7 +12,7 @@ import ./make-test-python.nix ( { pkgs, ... }: { ./common/user-account.nix ./common/x11.nix ]; - test-support.displayManager.auto.user = "alice"; + test-support.displayManager.auto.user = testUser; hardware.opentabletdriver.enable = true; }; @@ -18,10 +20,11 @@ import ./make-test-python.nix ( { pkgs, ... }: { '' machine.start() machine.wait_for_x() - machine.wait_for_unit("opentabletdriver.service", "alice") + machine.wait_for_unit("opentabletdriver.service", "${testUser}") - machine.succeed("cat /etc/udev/rules.d/30-opentabletdriver.rules") + machine.succeed("cat /etc/udev/rules.d/99-opentabletdriver.rules") # Will fail if service is not running - machine.succeed("otd detect") + # Needs to run as the same user that started the service + machine.succeed("su - ${testUser} -c 'otd detect'") ''; }) diff --git a/nixos/tests/pleroma.nix b/nixos/tests/pleroma.nix new file mode 100644 index 00000000000..797cac44f95 --- /dev/null +++ b/nixos/tests/pleroma.nix @@ -0,0 +1,265 @@ +/* + Pleroma E2E VM test. + + Abstract: + ========= + Using pleroma, postgresql, a local CA cert, a nginx reverse proxy + and a toot-based client, we're going to: + + 1. Provision a pleroma service from scratch (pleroma config + postgres db). + 2. Create a "jamy" admin user. + 3. Send a toot from this user. + 4. Send a upload from this user. + 5. Check the toot is part of the server public timeline + + Notes: + - We need a fully functional TLS setup without having any access to + the internet. We do that by issuing a self-signed cert, add this + self-cert to the hosts pki trust store and finally spoof the + hostnames using /etc/hosts. + - For this NixOS test, we *had* to store some DB-related and + pleroma-related secrets to the store. Keep in mind the store is + world-readable, it's the worst place possible to store *any* + secret. **DO NOT DO THIS IN A REAL WORLD DEPLOYMENT**. +*/ + +import ./make-test-python.nix ({ pkgs, ... }: + let + send-toot = pkgs.writeScriptBin "send-toot" '' + set -eux + # toot is using the requests library internally. This library + # sadly embed its own certificate store instead of relying on the + # system one. Overriding this pretty bad default behaviour. + export REQUESTS_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt + + export TOOT_LOGIN_CLI_PASSWORD="jamy-password" + toot login_cli -i "pleroma.nixos.test" -e "jamy@nixos.test" + echo "Login OK" + + # Send a toot then verify it's part of the public timeline + echo "y" | toot post "hello world Jamy here" + echo "Send toot OK" + echo "y" | toot timeline | grep -c "hello world Jamy here" + echo "Get toot from timeline OK" + + # Test file upload + echo "y" | toot upload ${db-seed} | grep -c "https://pleroma.nixos.test/media" + echo "File upload OK" + + echo "=====================================================" + echo "= SUCCESS =" + echo "= =" + echo "= We were able to sent a toot + a upload and =" + echo "= retrieve both of them in the public timeline. =" + echo "=====================================================" + ''; + + provision-db = pkgs.writeScriptBin "provision-db" '' + set -eux + sudo -u postgres psql -f ${db-seed} + ''; + + test-db-passwd = "SccZOvTGM//BMrpoQj68JJkjDkMGb4pHv2cECWiI+XhVe3uGJTLI0vFV/gDlZ5jJ"; + + /* For this NixOS test, we *had* to store this secret to the store. + Keep in mind the store is world-readable, it's the worst place + possible to store *any* secret. **DO NOT DO THIS IN A REAL WORLD + DEPLOYMENT**.*/ + db-seed = pkgs.writeText "provision.psql" '' + CREATE USER pleroma WITH ENCRYPTED PASSWORD '${test-db-passwd}'; + CREATE DATABASE pleroma OWNER pleroma; + \c pleroma; + --Extensions made by ecto.migrate that need superuser access + CREATE EXTENSION IF NOT EXISTS citext; + CREATE EXTENSION IF NOT EXISTS pg_trgm; + CREATE EXTENSION IF NOT EXISTS "uuid-ossp"; + ''; + + pleroma-conf = '' + import Config + + config :pleroma, Pleroma.Web.Endpoint, + url: [host: "pleroma.nixos.test", scheme: "https", port: 443], + http: [ip: {127, 0, 0, 1}, port: 4000] + + config :pleroma, :instance, + name: "NixOS test pleroma server", + email: "pleroma@nixos.test", + notify_email: "pleroma@nixos.test", + limit: 5000, + registrations_open: true + + config :pleroma, :media_proxy, + enabled: false, + redirect_on_failure: true + #base_url: "https://cache.pleroma.social" + + config :pleroma, Pleroma.Repo, + adapter: Ecto.Adapters.Postgres, + username: "pleroma", + password: "${test-db-passwd}", + database: "pleroma", + hostname: "localhost", + pool_size: 10, + prepare: :named, + parameters: [ + plan_cache_mode: "force_custom_plan" + ] + + config :pleroma, :database, rum_enabled: false + config :pleroma, :instance, static_dir: "/var/lib/pleroma/static" + config :pleroma, Pleroma.Uploaders.Local, uploads: "/var/lib/pleroma/uploads" + config :pleroma, configurable_from_database: false + ''; + + /* For this NixOS test, we *had* to store this secret to the store. + Keep in mind the store is world-readable, it's the worst place + possible to store *any* secret. **DO NOT DO THIS IN A REAL WORLD + DEPLOYMENT**. + In a real-word deployment, you'd handle this either by: + - manually upload your pleroma secrets to /var/lib/pleroma/secrets.exs + - use a deployment tool such as morph or NixOps to deploy your secrets. + */ + pleroma-conf-secret = pkgs.writeText "secrets.exs" '' + import Config + + config :joken, default_signer: "PS69/wMW7X6FIQPABt9lwvlZvgrJIncfiAMrK9J5mjVus/7/NJJi1DsDA1OghBE5" + + config :pleroma, Pleroma.Web.Endpoint, + secret_key_base: "NvfmU7lYaQrmmxt4NACm0AaAfN9t6WxsrX0NCB4awkGHvr1S7jyshlEmrjaPFhhq", + signing_salt: "3L41+BuJ" + + config :web_push_encryption, :vapid_details, + subject: "mailto:pleroma@nixos.test", + public_key: "BKjfNX9-UqAcncaNqERQtF7n9pKrB0-MO-juv6U5E5XQr_Tg5D-f8AlRjduAguDpyAngeDzG8MdrTejMSL4VF30", + private_key: "k7o9onKMQrgMjMb6l4fsxSaXO0BTNAer5MVSje3q60k" + ''; + + /* For this NixOS test, we *had* to store this secret to the store. + Keep in mind the store is world-readable, it's the worst place + possible to store *any* secret. **DO NOT DO THIS IN A REAL WORLD + DEPLOYMENT**. + In a real-word deployment, you'd handle this either by: + - manually upload your pleroma secrets to /var/lib/pleroma/secrets.exs + - use a deployment tool such as morph or NixOps to deploy your secrets. + */ + provision-secrets = pkgs.writeScriptBin "provision-secrets" '' + set -eux + cp "${pleroma-conf-secret}" "/var/lib/pleroma/secrets.exs" + chown pleroma:pleroma /var/lib/pleroma/secrets.exs + ''; + + /* For this NixOS test, we *had* to store this secret to the store. + Keep in mind the store is world-readable, it's the worst place + possible to store *any* secret. **DO NOT DO THIS IN A REAL WORLD + DEPLOYMENT**. + */ + provision-user = pkgs.writeScriptBin "provision-user" '' + set -eux + + # Waiting for pleroma to be up. + timeout 5m bash -c 'while [[ "$(curl -s -o /dev/null -w '%{http_code}' https://pleroma.nixos.test/api/v1/instance)" != "200" ]]; do sleep 2; done' + pleroma_ctl user new jamy jamy@nixos.test --password 'jamy-password' --moderator --admin -y + ''; + + tls-cert = pkgs.runCommandNoCC "selfSignedCerts" { buildInputs = [ pkgs.openssl ]; } '' + openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -subj '/CN=pleroma.nixos.test' + mkdir -p $out + cp key.pem cert.pem $out + ''; + + /* Toot is preventing users from feeding login_cli a password non + interactively. While it makes sense most of the times, it's + preventing us to login in this non-interactive test. This patch + introduce a TOOT_LOGIN_CLI_PASSWORD env variable allowing us to + provide a password to toot login_cli + + If https://github.com/ihabunek/toot/pull/180 gets merged at some + point, feel free to remove this patch. */ + custom-toot = pkgs.toot.overrideAttrs(old:{ + patches = [ (pkgs.fetchpatch { + url = "https://github.com/NinjaTrappeur/toot/commit/b4a4c30f41c0cb7e336714c2c4af9bc9bfa0c9f2.patch"; + sha256 = "sha256-0xxNwjR/fStLjjUUhwzCCfrghRVts+fc+fvVJqVcaFg="; + }) ]; + }); + + hosts = nodes: '' + ${nodes.pleroma.config.networking.primaryIPAddress} pleroma.nixos.test + ${nodes.client.config.networking.primaryIPAddress} client.nixos.test + ''; + in { + name = "pleroma"; + nodes = { + client = { nodes, pkgs, config, ... }: { + security.pki.certificateFiles = [ "${tls-cert}/cert.pem" ]; + networking.extraHosts = hosts nodes; + environment.systemPackages = with pkgs; [ + custom-toot + send-toot + ]; + }; + pleroma = { nodes, pkgs, config, ... }: { + security.pki.certificateFiles = [ "${tls-cert}/cert.pem" ]; + networking.extraHosts = hosts nodes; + networking.firewall.enable = false; + environment.systemPackages = with pkgs; [ + provision-db + provision-secrets + provision-user + ]; + services = { + pleroma = { + enable = true; + configs = [ + pleroma-conf + ]; + }; + postgresql = { + enable = true; + package = pkgs.postgresql_12; + }; + nginx = { + enable = true; + virtualHosts."pleroma.nixos.test" = { + addSSL = true; + sslCertificate = "${tls-cert}/cert.pem"; + sslCertificateKey = "${tls-cert}/key.pem"; + locations."/" = { + proxyPass = "http://127.0.0.1:4000"; + extraConfig = '' + add_header 'Access-Control-Allow-Origin' '*' always; + add_header 'Access-Control-Allow-Methods' 'POST, PUT, DELETE, GET, PATCH, OPTIONS' always; + add_header 'Access-Control-Allow-Headers' 'Authorization, Content-Type, Idempotency-Key' always; + add_header 'Access-Control-Expose-Headers' 'Link, X-RateLimit-Reset, X-RateLimit-Limit, X-RateLimit-Remaining, X-Request-Id' always; + if ($request_method = OPTIONS) { + return 204; + } + add_header X-XSS-Protection "1; mode=block"; + add_header X-Permitted-Cross-Domain-Policies none; + add_header X-Frame-Options DENY; + add_header X-Content-Type-Options nosniff; + add_header Referrer-Policy same-origin; + add_header X-Download-Options noopen; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_set_header Host $host; + client_max_body_size 16m; + ''; + }; + }; + }; + }; + }; + }; + + testScript = { nodes, ... }: '' + pleroma.wait_for_unit("postgresql.service") + pleroma.succeed("provision-db") + pleroma.succeed("provision-secrets") + pleroma.systemctl("restart pleroma.service") + pleroma.wait_for_unit("pleroma.service") + pleroma.succeed("provision-user") + client.succeed("send-toot") + ''; +}) diff --git a/nixos/tests/podman.nix b/nixos/tests/podman.nix index bccd2de7c9b..4985ff60365 100644 --- a/nixos/tests/podman.nix +++ b/nixos/tests/podman.nix @@ -61,6 +61,20 @@ import ./make-test-python.nix ( podman.succeed("podman stop sleeping") podman.succeed("podman rm sleeping") + # create systemd session for rootless + podman.succeed("loginctl enable-linger alice") + + with subtest("Run container rootless with runc"): + podman.succeed(su_cmd("tar cv --files-from /dev/null | podman import - scratchimg")) + podman.succeed( + su_cmd( + "podman run --runtime=runc -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10" + ) + ) + podman.succeed(su_cmd("podman ps | grep sleeping")) + podman.succeed(su_cmd("podman stop sleeping")) + podman.succeed(su_cmd("podman rm sleeping")) + with subtest("Run container rootless with crun"): podman.succeed(su_cmd("tar cv --files-from /dev/null | podman import - scratchimg")) podman.succeed( @@ -71,7 +85,6 @@ import ./make-test-python.nix ( podman.succeed(su_cmd("podman ps | grep sleeping")) podman.succeed(su_cmd("podman stop sleeping")) podman.succeed(su_cmd("podman rm sleeping")) - # As of 2020-11-20, the runc backend doesn't work with cgroupsv2 yet, so we don't run that test. with subtest("Run container rootless with the default backend"): podman.succeed(su_cmd("tar cv --files-from /dev/null | podman import - scratchimg")) diff --git a/nixos/tests/predictable-interface-names.nix b/nixos/tests/predictable-interface-names.nix index bab091d57ac..c0b472638a1 100644 --- a/nixos/tests/predictable-interface-names.nix +++ b/nixos/tests/predictable-interface-names.nix @@ -5,7 +5,11 @@ let inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest; -in pkgs.lib.listToAttrs (pkgs.lib.crossLists (predictable: withNetworkd: { + testCombinations = pkgs.lib.cartesianProductOfSets { + predictable = [true false]; + withNetworkd = [true false]; + }; +in pkgs.lib.listToAttrs (builtins.map ({ predictable, withNetworkd }: { name = pkgs.lib.optionalString (!predictable) "un" + "predictable" + pkgs.lib.optionalString withNetworkd "Networkd"; value = makeTest { @@ -30,4 +34,4 @@ in pkgs.lib.listToAttrs (pkgs.lib.crossLists (predictable: withNetworkd: { machine.${if predictable then "fail" else "succeed"}("ip link show eth0") ''; }; -}) [[true false] [true false]]) +}) testCombinations) diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index 8fcb0a7aa2c..89d17c9de8c 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -423,7 +423,7 @@ let exporterConfig = { enable = true; passwordFile = "/var/nextcloud-pwfile"; - url = "http://localhost/negative-space.xml"; + url = "http://localhost"; }; metricProvider = { systemd.services.nc-pwfile = let @@ -441,6 +441,7 @@ let basicAuth.nextcloud-exporter = "snakeoilpw"; locations."/" = { root = "${pkgs.prometheus-nextcloud-exporter.src}/serverinfo/testdata"; + tryFiles = "/negative-space.xml =404"; }; }; }; diff --git a/nixos/tests/rsyncd.nix b/nixos/tests/rsyncd.nix index 3639320f645..44464e42f28 100644 --- a/nixos/tests/rsyncd.nix +++ b/nixos/tests/rsyncd.nix @@ -2,24 +2,35 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "rsyncd"; meta.maintainers = with pkgs.lib.maintainers; [ ehmry ]; - nodes.machine.services.rsyncd = { - enable = true; - settings = { - global = { - "reverse lookup" = false; - "forward lookup" = false; + nodes = let + mkNode = socketActivated: + { config, ... }: { + networking.firewall.allowedTCPPorts = [ config.services.rsyncd.port ]; + services.rsyncd = { + enable = true; + inherit socketActivated; + settings = { + global = { + "reverse lookup" = false; + "forward lookup" = false; + }; + tmp = { + path = "/nix/store"; + comment = "test module"; + }; + }; + }; }; - tmp = { - path = "/nix/store"; - comment = "test module"; - }; - - }; + in { + a = mkNode false; + b = mkNode true; }; testScript = '' start_all() - machine.wait_for_unit("rsyncd") - machine.succeed("rsync localhost::") + a.wait_for_unit("rsync") + b.wait_for_unit("sockets.target") + b.succeed("rsync a::") + a.succeed("rsync b::") ''; }) diff --git a/nixos/tests/searx.nix b/nixos/tests/searx.nix index e5fee3466bf..7c28eea30d2 100644 --- a/nixos/tests/searx.nix +++ b/nixos/tests/searx.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "searx"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ rnhmjoj ]; }; @@ -22,13 +22,15 @@ import ./make-test-python.nix ({ pkgs, ...} : bind_address = "0.0.0.0"; secret_key = "@SEARX_SECRET_KEY@"; }; - settings.engines = { - wolframalpha = - { api_key = "@WOLFRAM_API_KEY@"; - engine = "wolframalpha_api"; - }; - startpage.shortcut = "start"; - }; + settings.engines = [ + { name = "wolframalpha"; + api_key = "@WOLFRAM_API_KEY@"; + engine = "wolframalpha_api"; + } + { name = "startpage"; + shortcut = "start"; + } + ]; }; }; @@ -39,6 +41,9 @@ import ./make-test-python.nix ({ pkgs, ...} : services.searx = { enable = true; + # searx refuses to run if unchanged + settings.server.secret_key = "somesecret"; + runInUwsgi = true; uwsgiConfig = { # serve using the uwsgi protocol @@ -76,8 +81,9 @@ import ./make-test-python.nix ({ pkgs, ...} : base.wait_for_unit("searx-init") base.wait_for_file("/run/searx/settings.yml") output = base.succeed( - "${pkgs.yq-go}/bin/yq r /run/searx/settings.yml" - " 'engines.(name==startpage).shortcut'" + "${pkgs.yq-go}/bin/yq eval" + " '.engines[] | select(.name==\"startpage\") | .shortcut'" + " /run/searx/settings.yml" ).strip() assert output == "start", "Settings not merged" @@ -106,4 +112,3 @@ import ./make-test-python.nix ({ pkgs, ...} : ) ''; }) - diff --git a/nixos/tests/slurm.nix b/nixos/tests/slurm.nix index 97e031a6279..3702d243b48 100644 --- a/nixos/tests/slurm.nix +++ b/nixos/tests/slurm.nix @@ -109,12 +109,12 @@ in { ensurePermissions = { "slurm_acct_db.*" = "ALL PRIVILEGES"; }; name = "slurm"; }]; - extraOptions = '' + settings.mysqld = { # recommendations from: https://slurm.schedmd.com/accounting.html#mysql-configuration - innodb_buffer_pool_size=1024M - innodb_log_file_size=64M - innodb_lock_wait_timeout=900 - ''; + innodb_buffer_pool_size="1024M"; + innodb_log_file_size="64M"; + innodb_lock_wait_timeout=900; + }; }; }; diff --git a/nixos/tests/smokeping.nix b/nixos/tests/smokeping.nix index 4ac672b814b..ccacf60cfe4 100644 --- a/nixos/tests/smokeping.nix +++ b/nixos/tests/smokeping.nix @@ -8,6 +8,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { sm = { ... }: { + networking.domain = "example.com"; # FQDN: sm.example.com services.smokeping = { enable = true; port = 8081; diff --git a/nixos/tests/usbguard.nix b/nixos/tests/usbguard.nix new file mode 100644 index 00000000000..cba905db44f --- /dev/null +++ b/nixos/tests/usbguard.nix @@ -0,0 +1,62 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "usbguard"; + meta = with pkgs.lib.maintainers; { + maintainers = [ tnias ]; + }; + + machine = + { ... }: + { + services.usbguard = { + enable = true; + IPCAllowedUsers = [ "alice" "root" ]; + + # As virtual USB devices get attached to the "QEMU USB Hub" we need to + # allow Hubs. Otherwise we would have to explicitly allow them too. + rules = '' + allow with-interface equals { 09:00:00 } + ''; + }; + imports = [ ./common/user-account.nix ]; + }; + + testScript = '' + # create a blank disk image for our fake USB stick + with open(machine.state_dir + "/usbstick.img", "wb") as stick: + stick.write(b"\x00" * (1024 * 1024)) + + # wait for machine to have started and the usbguard service to be up + machine.wait_for_unit("usbguard.service") + + with subtest("IPC access control"): + # User "alice" is allowed to access the IPC interface + machine.succeed("su alice -c 'usbguard list-devices'") + + # User "bob" is not allowed to access the IPC interface + machine.fail("su bob -c 'usbguard list-devices'") + + with subtest("check basic functionality"): + # at this point we expect that no USB HDD is connected + machine.fail("usbguard list-devices | grep -E 'QEMU USB HARDDRIVE'") + + # insert usb device + machine.send_monitor_command( + f"drive_add 0 id=stick,if=none,file={stick.name},format=raw" + ) + machine.send_monitor_command("device_add usb-storage,id=stick,drive=stick") + + # the attached USB HDD should show up after a short while + machine.wait_until_succeeds("usbguard list-devices | grep -E 'QEMU USB HARDDRIVE'") + + # at this point there should be a **blocked** USB HDD + machine.succeed("usbguard list-devices | grep -E 'block.*QEMU USB HARDDRIVE'") + machine.fail("usbguard list-devices | grep -E ' allow .*QEMU USB HARDDRIVE'") + + # allow storage devices + machine.succeed("usbguard allow-device 'with-interface { 08:*:* }'") + + # at this point there should be an **allowed** USB HDD + machine.succeed("usbguard list-devices | grep -E ' allow .*QEMU USB HARDDRIVE'") + machine.fail("usbguard list-devices | grep -E ' block .*QEMU USB HARDDRIVE'") + ''; +}) diff --git a/nixos/tests/vault-postgresql.nix b/nixos/tests/vault-postgresql.nix new file mode 100644 index 00000000000..a563aead22a --- /dev/null +++ b/nixos/tests/vault-postgresql.nix @@ -0,0 +1,70 @@ +/* This test checks that + - multiple config files can be loaded + - the storage backend can be in a file outside the nix store + as is required for security (required because while confidentiality is + always covered, availability isn't) + - the postgres integration works + */ +import ./make-test-python.nix ({ pkgs, ... }: +{ + name = "vault-postgresql"; + meta = with pkgs.lib.maintainers; { + maintainers = [ lnl7 roberth ]; + }; + machine = { lib, pkgs, ... }: { + virtualisation.memorySize = 512; + environment.systemPackages = [ pkgs.vault ]; + environment.variables.VAULT_ADDR = "http://127.0.0.1:8200"; + services.vault.enable = true; + services.vault.extraSettingsPaths = [ "/run/vault.hcl" ]; + + systemd.services.vault = { + after = [ + "postgresql.service" + ]; + # Try for about 10 minutes rather than the default of 5 attempts. + serviceConfig.RestartSec = 1; + serviceConfig.StartLimitBurst = 600; + }; + # systemd.services.vault.unitConfig.RequiresMountsFor = "/run/keys/"; + + services.postgresql.enable = true; + services.postgresql.initialScript = pkgs.writeText "init.psql" '' + CREATE USER vaultuser WITH ENCRYPTED PASSWORD 'thisisthepass'; + GRANT CONNECT ON DATABASE postgres TO vaultuser; + + -- https://www.vaultproject.io/docs/configuration/storage/postgresql + CREATE TABLE vault_kv_store ( + parent_path TEXT COLLATE "C" NOT NULL, + path TEXT COLLATE "C", + key TEXT COLLATE "C", + value BYTEA, + CONSTRAINT pkey PRIMARY KEY (path, key) + ); + CREATE INDEX parent_path_idx ON vault_kv_store (parent_path); + + GRANT SELECT, INSERT, UPDATE, DELETE ON ALL TABLES IN SCHEMA public TO vaultuser; + ''; + }; + + testScript = + '' + secretConfig = """ + storage "postgresql" { + connection_url = "postgres://vaultuser:thisisthepass@localhost/postgres?sslmode=disable" + } + """ + + start_all() + + machine.wait_for_unit("multi-user.target") + machine.succeed("cat >/root/vault.hcl <<EOF\n%s\nEOF\n" % secretConfig) + machine.succeed( + "install --owner vault --mode 0400 /root/vault.hcl /run/vault.hcl; rm /root/vault.hcl" + ) + machine.wait_for_unit("vault.service") + machine.wait_for_open_port(8200) + machine.succeed("vault operator init") + machine.succeed("vault status | grep Sealed | grep true") + ''; +}) diff --git a/nixos/tests/vault.nix b/nixos/tests/vault.nix index ffdc3957472..59bccbe2595 100644 --- a/nixos/tests/vault.nix +++ b/nixos/tests/vault.nix @@ -8,6 +8,7 @@ import ./make-test-python.nix ({ pkgs, ... }: environment.systemPackages = [ pkgs.vault ]; environment.variables.VAULT_ADDR = "http://127.0.0.1:8200"; services.vault.enable = true; + virtualisation.memorySize = 512; }; testScript = diff --git a/nixos/tests/zfs.nix b/nixos/tests/zfs.nix index 08a0867f1a8..03aa5e5399c 100644 --- a/nixos/tests/zfs.nix +++ b/nixos/tests/zfs.nix @@ -8,7 +8,7 @@ with import ../lib/testing-python.nix { inherit system pkgs; }; let makeZfsTest = name: - { kernelPackage ? pkgs.linuxPackages_latest + { kernelPackage ? if enableUnstable then pkgs.linuxPackages_latest else pkgs.linuxPackages , enableUnstable ? false , extraTest ? "" }: diff --git a/nixos/tests/zsh-history.nix b/nixos/tests/zsh-history.nix index caed45e851d..3109c3f6508 100644 --- a/nixos/tests/zsh-history.nix +++ b/nixos/tests/zsh-history.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "zsh-history"; meta = with pkgs.lib.maintainers; { - maintainers = [ kampka ]; + maintainers = [ ]; }; nodes.default = { ... }: { diff --git a/pkgs/applications/accessibility/contrast/default.nix b/pkgs/applications/accessibility/contrast/default.nix index 1d18f4a9230..689ad273575 100644 --- a/pkgs/applications/accessibility/contrast/default.nix +++ b/pkgs/applications/accessibility/contrast/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitLab , cairo , dbus @@ -10,7 +10,7 @@ , meson , ninja , pango -, pkgconfig +, pkg-config , python3 , rustc , rustPlatform @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec { gettext meson ninja - pkgconfig + pkg-config python3 wrapGAppsHook glib # for glib-compile-resources diff --git a/pkgs/applications/accessibility/dasher/default.nix b/pkgs/applications/accessibility/dasher/default.nix index 43844d0c66b..fe0d8fe8634 100644 --- a/pkgs/applications/accessibility/dasher/default.nix +++ b/pkgs/applications/accessibility/dasher/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub -, autoreconfHook, pkgconfig, wrapGAppsHook +, autoreconfHook, pkg-config, wrapGAppsHook , glib, gtk3, expat, gnome-doc-utils, which , at-spi2-core, dbus , libxslt, libxml2 @@ -29,7 +29,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook wrapGAppsHook - pkgconfig + pkg-config # doc generation gnome-doc-utils which diff --git a/pkgs/applications/accessibility/mousetweaks/default.nix b/pkgs/applications/accessibility/mousetweaks/default.nix index 769ea241de8..2ff36bb6833 100644 --- a/pkgs/applications/accessibility/mousetweaks/default.nix +++ b/pkgs/applications/accessibility/mousetweaks/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , glib, gtk3, gnome3, gsettings-desktop-schemas, wrapGAppsHook , libX11, libXtst, libXfixes, libXcursor }: @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "005fhmvb45sa9mq17dpa23n1xnspiissx5rnpiy7hiqmy3g5rg8f"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; buildInputs = [ glib gtk3 gsettings-desktop-schemas diff --git a/pkgs/applications/audio/AMB-plugins/default.nix b/pkgs/applications/audio/AMB-plugins/default.nix index 2e2af8f3a9a..8b03a97d128 100644 --- a/pkgs/applications/audio/AMB-plugins/default.nix +++ b/pkgs/applications/audio/AMB-plugins/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ladspaH +{ lib, stdenv, fetchurl, ladspaH }: stdenv.mkDerivation rec { @@ -20,14 +20,14 @@ stdenv.mkDerivation rec { preInstall="mkdir -p $out/lib/ladspa"; meta = { - description = ''A set of ambisonics ladspa plugins''; + description = "A set of ambisonics ladspa plugins"; longDescription = '' Mono and stereo to B-format panning, horizontal rotator, square, hexagon and cube decoders. ''; version = version; homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/ladspa/index.html"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.magnetophon ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/FIL-plugins/default.nix b/pkgs/applications/audio/FIL-plugins/default.nix index 253e724cd31..98fc3495d8f 100644 --- a/pkgs/applications/audio/FIL-plugins/default.nix +++ b/pkgs/applications/audio/FIL-plugins/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ladspaH +{ lib, stdenv, fetchurl, ladspaH }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { preInstall="mkdir -p $out/lib/ladspa"; meta = { - description = ''a four-band parametric equaliser, which has the nice property of being stable even while parameters are being changed''; + description = "a four-band parametric equaliser, which has the nice property of being stable even while parameters are being changed"; longDescription = '' Each section has an active/bypass switch, frequency, bandwidth and gain controls. There is also a global bypass switch and gain control. @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { ''; version = version; homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/ladspa/index.html"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.magnetophon ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/MMA/default.nix b/pkgs/applications/audio/MMA/default.nix index baeae7ae01f..ade595732c3 100644 --- a/pkgs/applications/audio/MMA/default.nix +++ b/pkgs/applications/audio/MMA/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, python3, alsaUtils, timidity }: +{ lib, stdenv, fetchurl, makeWrapper, python3, alsaUtils, timidity }: stdenv.mkDerivation rec { version = "20.12"; @@ -62,8 +62,8 @@ meta = { description = "Creates MIDI tracks for a soloist to perform over from a user supplied file containing chords"; homepage = "https://www.mellowood.ca/mma/index.html"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.magnetophon ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix index 35c9cda1821..4f76178a29d 100644 --- a/pkgs/applications/audio/a2jmidid/default.nix +++ b/pkgs/applications/audio/a2jmidid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, pkgconfig, alsaLib, dbus, libjack2 +{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, pkg-config, alsaLib, dbus, libjack2 , python3Packages , meson, ninja }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-WNt74tSWV8bY4TnpLp86PsnrjkqWynJJt3Ra4gZl2fQ="; }; - nativeBuildInputs = [ pkgconfig makeWrapper meson ninja ]; + nativeBuildInputs = [ pkg-config makeWrapper meson ninja ]; buildInputs = [ alsaLib dbus libjack2 ] ++ (with python3Packages; [ python dbus-python ]); diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix index a90051136cb..1c5fc571814 100644 --- a/pkgs/applications/audio/abcde/default.nix +++ b/pkgs/applications/audio/abcde/default.nix @@ -38,7 +38,7 @@ in for cmd in abcde cddb-tool abcde-musicbrainz-tool; do wrapProgram "$out/bin/$cmd" \ --prefix PERL5LIB : "$PERL5LIB" \ - --prefix PATH ":" ${stdenv.lib.makeBinPath [ + --prefix PATH ":" ${lib.makeBinPath [ "$out" which libcdio-paranoia cddiscid wget vorbis-tools id3v2 eyeD3 lame flac glyr ]} diff --git a/pkgs/applications/audio/adlplug/default.nix b/pkgs/applications/audio/adlplug/default.nix index cdf9e3e538e..ecc429de6b2 100644 --- a/pkgs/applications/audio/adlplug/default.nix +++ b/pkgs/applications/audio/adlplug/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, libjack2, alsaLib +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libjack2, alsaLib , freetype, libX11, libXrandr, libXinerama, libXext, libXcursor , fetchpatch, fmt , adlplugChip ? "-DADLplug_CHIP=OPL3" @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { libjack2 alsaLib freetype libX11 libXrandr libXinerama libXext libXcursor ]; - nativeBuildInputs = [ cmake pkgconfig fmt ]; + nativeBuildInputs = [ cmake pkg-config fmt ]; meta = with lib; { description = "OPL3 and OPN2 FM Chip Synthesizer"; diff --git a/pkgs/applications/audio/aeolus/default.nix b/pkgs/applications/audio/aeolus/default.nix index c4982025999..000108b6de1 100644 --- a/pkgs/applications/audio/aeolus/default.nix +++ b/pkgs/applications/audio/aeolus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libclthreads, zita-alsa-pcmi, alsaLib, libjack2 +{ lib, stdenv, fetchurl, libclthreads, zita-alsa-pcmi, alsaLib, libjack2 , libclxclient, libX11, libXft, readline }: @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { meta = { description = "Synthetized (not sampled) pipe organ emulator"; homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/aeolus/index.html"; - license = stdenv.lib.licenses.lgpl3; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.nico202 ]; + license = lib.licenses.lgpl3; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.nico202 ]; }; } diff --git a/pkgs/applications/audio/airwave/default.nix b/pkgs/applications/audio/airwave/default.nix index d541afd2de3..438159201de 100644 --- a/pkgs/applications/audio/airwave/default.nix +++ b/pkgs/applications/audio/airwave/default.nix @@ -22,7 +22,7 @@ let }; nativeBuildInputs = [ unzip ]; installPhase = "cp -r . $out"; - meta.license = stdenv.lib.licenses.unfree; + meta.license = lib.licenses.unfree; }; wine-wow64 = wine.override { diff --git a/pkgs/applications/audio/aj-snapshot/default.nix b/pkgs/applications/audio/aj-snapshot/default.nix index e4a196d0f6b..636314bf1ca 100644 --- a/pkgs/applications/audio/aj-snapshot/default.nix +++ b/pkgs/applications/audio/aj-snapshot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, jack2Full, minixml, pkgconfig }: +{ lib, stdenv, fetchurl, alsaLib, jack2Full, minixml, pkg-config }: stdenv.mkDerivation rec { name = packageName + "-" + version ; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { doCheck = false; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ alsaLib minixml jack2Full ]; meta = with lib; { diff --git a/pkgs/applications/audio/ams-lv2/default.nix b/pkgs/applications/audio/ams-lv2/default.nix index 99c3ca73607..88956a190c4 100644 --- a/pkgs/applications/audio/ams-lv2/default.nix +++ b/pkgs/applications/audio/ams-lv2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cairo, fftw, gtkmm2, lv2, lvtk, pkgconfig +{ lib, stdenv, fetchFromGitHub, cairo, fftw, gtkmm2, lv2, lvtk, pkg-config , wafHook, python3 }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1lz2mvk4gqsyf92yxd3aaldx0d0qi28h4rnnvsaz4ls0ccqm80nk"; }; - nativeBuildInputs = [ pkgconfig wafHook python3 ]; + nativeBuildInputs = [ pkg-config wafHook python3 ]; buildInputs = [ cairo fftw gtkmm2 lv2 lvtk ]; meta = with lib; { diff --git a/pkgs/applications/audio/apple-music-electron/default.nix b/pkgs/applications/audio/apple-music-electron/default.nix new file mode 100644 index 00000000000..1c6180ac211 --- /dev/null +++ b/pkgs/applications/audio/apple-music-electron/default.nix @@ -0,0 +1,32 @@ +{ appimageTools, lib, fetchurl }: +let + pname = "apple-music-electron"; + version = "1.5.2"; + name = "Apple.Music-${version}"; + + src = fetchurl { + url = "https://github.com/iiFir3z/Apple-Music-Electron/releases/download/${version}/${name}.AppImage"; + sha256 = "1jl0wgwy6ajmfkzygwb7cm9m49nkhp3x6vd8kwmh6ccs3jy4ayp5"; + }; + + appimageContents = appimageTools.extract { inherit name src; }; +in appimageTools.wrapType2 { + inherit name src; + + extraInstallCommands = '' + mv $out/bin/${name} $out/bin/${pname} + + install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Exec=AppRun' 'Exec=$out/bin/apple-music-electron' + cp -r ${appimageContents}/usr/share/icons $out/share + ''; + + meta = with lib; { + description = "Unofficial Apple Music application without having to bother with a Web Browser or iTunes"; + homepage = "https://github.com/iiFir3z/Apple-Music-Electron"; + license = licenses.mit; + maintainers = [ maintainers.ivar ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/audio/ario/default.nix b/pkgs/applications/audio/ario/default.nix index 99a09e7ee33..896f9361947 100644 --- a/pkgs/applications/audio/ario/default.nix +++ b/pkgs/applications/audio/ario/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, gtk3, intltool, +{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, intltool, wrapGAppsHook, libxml2, curl, mpd_clientlib, dbus-glib, libsoup, avahi, taglib }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "16nhfb3h5pc7flagfdz7xy0iq6kvgy6h4bfpi523i57rxvlfshhl"; }; - nativeBuildInputs = [ pkgconfig gettext intltool wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config gettext intltool wrapGAppsHook ]; buildInputs = [ gtk3 libxml2 curl mpd_clientlib dbus-glib libsoup avahi taglib ]; @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { meta = { description = "GTK client for MPD (Music player daemon)"; homepage = "http://ario-player.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.garrison ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.garrison ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/audio/asunder/default.nix b/pkgs/applications/audio/asunder/default.nix index 610085a137a..c3cba87e300 100644 --- a/pkgs/applications/audio/asunder/default.nix +++ b/pkgs/applications/audio/asunder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, gtk2, libcddb, intltool, pkgconfig, cdparanoia +{ lib, stdenv, fetchurl, makeWrapper, gtk2, libcddb, intltool, pkg-config, cdparanoia , mp3Support ? false, lame , oggSupport ? true, vorbis-tools , flacSupport ? true, flac @@ -9,7 +9,7 @@ #, aacSupport ? false, TODO: neroAacEnc }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { version = "2.9.7"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "1x3l308ss0iqhz90qyjb94gyd8b4piyrm2nzjmg5kf049k9prjf1"; }; - nativeBuildInputs = [ intltool makeWrapper pkgconfig ]; + nativeBuildInputs = [ intltool makeWrapper pkg-config ]; buildInputs = [ gtk2 libcddb ]; runtimeDeps = diff --git a/pkgs/applications/audio/aucatctl/default.nix b/pkgs/applications/audio/aucatctl/default.nix index ad9fefb68b9..6670e06a21d 100644 --- a/pkgs/applications/audio/aucatctl/default.nix +++ b/pkgs/applications/audio/aucatctl/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { }; buildInputs = [ sndio ] - ++ stdenv.lib.optional (!stdenv.isDarwin && !stdenv.targetPlatform.isBSD) + ++ lib.optional (!stdenv.isDarwin && !stdenv.targetPlatform.isBSD) libbsd; outputs = [ "out" "man" ]; preBuild = '' makeFlagsArray+=("PREFIX=$out") - '' + stdenv.lib.optionalString + '' + lib.optionalString (!stdenv.isDarwin && !stdenv.targetPlatform.isBSD) '' makeFlagsArray+=(LDADD="-lsndio -lbsd") diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index c441a2f9f3f..82a2303e26b 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, fetchurl, fetchpatch, - gettext, pkgconfig, + gettext, pkg-config, qtbase, alsaLib, curl, faad2, ffmpeg, flac, fluidsynth, gdk-pixbuf, lame, libbs2b, libcddb, libcdio, libcdio-paranoia, libcue, libjack2, libmad, libmms, libmodplug, @@ -22,7 +22,7 @@ mkDerivation rec { sha256 = "0ny5w1agr9jaz5w3wyyxf1ygmzmd1sivaf97lcm4z4w6529520lz"; }; - nativeBuildInputs = [ gettext pkgconfig ]; + nativeBuildInputs = [ gettext pkg-config ]; buildInputs = [ # Core dependencies diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 1f5468f7db3..c3daee55fc4 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -1,28 +1,79 @@ -{ lib, stdenv, fetchzip, wxGTK30, pkgconfig, file, gettext, - libvorbis, libmad, libjack2, lv2, lilv, serd, sord, sratom, suil, alsaLib, libsndfile, soxr, flac, lame, - expat, libid3tag, ffmpeg_3, soundtouch, /*, portaudio - given up fighting their portaudio.patch */ - cmake +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, cmake +, wxGTK +, pkg-config +, python3 +, gettext +, file +, libvorbis +, libmad +, libjack2 +, lv2 +, lilv +, serd +, sord +, sratom +, suil +, alsaLib +, libsndfile +, soxr +, flac +, twolame +, expat +, libid3tag +, libopus +, ffmpeg +, soundtouch +, pcre /*, portaudio - given up fighting their portaudio.patch */ +, at-spi2-core ? null +, dbus ? null +, epoxy ? null +, libXdmcp ? null +, libXtst ? null +, libpthreadstubs ? null +, libselinux ? null +, libsepol ? null +, libxkbcommon ? null +, utillinux ? null }: -with stdenv.lib; +# TODO +# - as of 2.4.2, GTK2 is still the recommended version ref https://www.audacityteam.org/download/source/ check if that changes in future versions +# - detach sbsms stdenv.mkDerivation rec { - version = "2.4.1"; pname = "audacity"; + version = "2.4.2"; - src = fetchzip { - url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz"; - sha256 = "1xk0piv72d2xd3p7igr916fhcbrm76fhjr418k1rlqdzzg1hfljn"; + src = fetchFromGitHub { + owner = "audacity"; + repo = "audacity"; + rev = "Audacity-${version}"; + sha256 = "sha256-hpRTo5B0EMyzORopsNPOgv6mohBkwJfWfCLnPvFmdFI="; }; - cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" + patches = [ + (fetchpatch { + url = "https://github.com/audacity/audacity/commit/a070b5d8a8ba10fb86edba6aeb8fdab0f66ba408.patch"; + sha256 = "sha256-8UZupGcN+/tytAhyy5T1P0nufvsQPeyLgOUMGt7l8Oc="; + name = "audacity_xdg_paths.patch"; + }) ]; - # audacity only looks for lame and ffmpeg at runtime, so we need to link them in manually + # this file *should* be generated by cmake but as of 2.4.2 isn't yet + postPatch = '' + touch src/RevisionIdent.h + ''; + + # workaround for a broken cmake. Drop it with a later version to see if it works. + # https://github.com/NixOS/nixpkgs/issues/94905 + cmakeFlags = lib.optional stdenv.isLinux "-DCMAKE_OSX_ARCHITECTURES="; + + # audacity only looks for ffmpeg at runtime, so we need to link it in manually NIX_LDFLAGS = toString [ - # LAME - "-lmp3lame" # ffmpeg "-lavcodec" "-lavdevice" @@ -35,14 +86,45 @@ stdenv.mkDerivation rec { "-lswscale" ]; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ cmake gettext pkg-config python3 ]; + buildInputs = [ - file gettext wxGTK30 expat alsaLib - libsndfile soxr libid3tag libjack2 lv2 lilv serd sord sratom suil wxGTK30.gtk - ffmpeg_3 libmad lame libvorbis flac soundtouch - ]; #ToDo: detach sbsms + alsaLib + expat + ffmpeg + file + flac + libid3tag + libjack2 + libmad + libopus + libsndfile + libvorbis + lilv + lv2 + pcre + serd + sord + soundtouch + soxr + sratom + suil + twolame + wxGTK + wxGTK.gtk + ] ++ lib.optionals stdenv.isLinux [ + at-spi2-core + dbus + epoxy + libXdmcp + libXtst + libpthreadstubs + libxkbcommon + libselinux + libsepol + utillinux + ]; - dontDisableStatic = true; doCheck = false; # Test fails meta = with lib; { diff --git a/pkgs/applications/audio/audio-recorder/default.nix b/pkgs/applications/audio/audio-recorder/default.nix index a66bb50f082..6a4abbbdf53 100644 --- a/pkgs/applications/audio/audio-recorder/default.nix +++ b/pkgs/applications/audio/audio-recorder/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl -, pkgconfig, intltool +, pkg-config, intltool , glib, dbus, gtk3, libappindicator-gtk3, gst_all_1 , librsvg, wrapGAppsHook , pulseaudioSupport ? true, libpulseaudio ? null }: @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { # https://bugs.launchpad.net/audio-recorder/+bug/1784622 NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config intltool wrapGAppsHook ]; buildInputs = [ glib dbus gtk3 librsvg libappindicator-gtk3 ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav - ]) ++ stdenv.lib.optional pulseaudioSupport libpulseaudio; + ]) ++ lib.optional pulseaudioSupport libpulseaudio; meta = with lib; { description = "Audio recorder for GNOME and Unity Desktops"; diff --git a/pkgs/applications/audio/aumix/default.nix b/pkgs/applications/audio/aumix/default.nix index 5bc7f843258..b1808ed90f1 100644 --- a/pkgs/applications/audio/aumix/default.nix +++ b/pkgs/applications/audio/aumix/default.nix @@ -1,9 +1,9 @@ -{stdenv, fetchurl, gettext, ncurses +{lib, stdenv, fetchurl, gettext, ncurses , gtkGUI ? false -, pkgconfig ? null +, pkg-config ? null , gtk2 ? null}: -assert gtkGUI -> pkgconfig != null && gtk2 != null; +assert gtkGUI -> pkg-config != null && gtk2 != null; stdenv.mkDerivation rec { name = "aumix-2.9.1"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ gettext ncurses ] - ++ (if gtkGUI then [pkgconfig gtk2] else []); + ++ (if gtkGUI then [pkg-config gtk2] else []); meta = { description = "Audio mixer for X and the console"; @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { the command line or a script. ''; homepage = "http://www.jpj.net/~trevor/aumix.html"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/axoloti/dfu-util.nix b/pkgs/applications/audio/axoloti/dfu-util.nix index 4b4b5ce5678..a8a2f8813af 100644 --- a/pkgs/applications/audio/axoloti/dfu-util.nix +++ b/pkgs/applications/audio/axoloti/dfu-util.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, fetchurl, pkgconfig, libusb1-axoloti }: +{ lib, stdenv, fetchurl, pkg-config, libusb1-axoloti }: stdenv.mkDerivation rec { pname = "dfu-util"; version = "0.8"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1-axoloti ]; src = fetchurl { diff --git a/pkgs/applications/audio/axoloti/libusb1.nix b/pkgs/applications/audio/axoloti/libusb1.nix index e95b391fc78..b6c2a1b1ae6 100644 --- a/pkgs/applications/audio/axoloti/libusb1.nix +++ b/pkgs/applications/audio/axoloti/libusb1.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, systemd ? null, libobjc, IOKit, fetchpatch }: +{ stdenv, lib, fetchurl, pkg-config, systemd ? null, libobjc, IOKit, fetchpatch }: stdenv.mkDerivation rec { name = "libusb-1.0.19"; @@ -10,10 +10,10 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; # get rid of propagating systemd closure - buildInputs = [ pkgconfig ]; + buildInputs = [ pkg-config ]; propagatedBuildInputs = - stdenv.lib.optional stdenv.isLinux systemd ++ - stdenv.lib.optionals stdenv.isDarwin [ libobjc IOKit ]; + lib.optional stdenv.isLinux systemd ++ + lib.optionals stdenv.isDarwin [ libobjc IOKit ]; patches = [ (fetchpatch { @@ -23,9 +23,9 @@ stdenv.mkDerivation rec { }) ]; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; + NIX_LDFLAGS = lib.optionalString stdenv.isLinux "-lgcc_s"; - preFixup = stdenv.lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString stdenv.isLinux '' sed 's,-ludev,-L${lib.getLib systemd}/lib -ludev,' -i $out/lib/libusb-1.0.la ''; diff --git a/pkgs/applications/audio/bambootracker/default.nix b/pkgs/applications/audio/bambootracker/default.nix index 8e9a566c172..592b0fb0730 100644 --- a/pkgs/applications/audio/bambootracker/default.nix +++ b/pkgs/applications/audio/bambootracker/default.nix @@ -13,7 +13,7 @@ }: let - inherit (stdenv.lib) optional optionals; + inherit (lib) optional optionals; in mkDerivation rec { diff --git a/pkgs/applications/audio/baudline/default.nix b/pkgs/applications/audio/baudline/default.nix index 2f695b6ed7b..29c5130f575 100644 --- a/pkgs/applications/audio/baudline/default.nix +++ b/pkgs/applications/audio/baudline/default.nix @@ -3,7 +3,7 @@ }: let - rpath = stdenv.lib.makeLibraryPath + rpath = lib.makeLibraryPath [ libXmu libXt libX11 libXext libXxf86vm libjack2 ]; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/audio/bchoppr/default.nix b/pkgs/applications/audio/bchoppr/default.nix index ffe9e549eb2..db8f8ad793a 100644 --- a/pkgs/applications/audio/bchoppr/default.nix +++ b/pkgs/applications/audio/bchoppr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bchoppr"; - version = "1.8.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "sjaehn"; repo = pname; rev = version; - sha256 = "1nd6byy75f0rbz9dm9drhxmpsfhxhg0y7q3v2m3098llynhy9k2j"; + sha256 = "sha256-LYndZhg4ILN0E8aRqgUBFzzzLv88TMSXG2OeFxImDu0="; }; nativeBuildInputs = [ pkg-config ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = https://github.com/sjaehn/BChoppr; + homepage = "https://github.com/sjaehn/BChoppr"; description = "An audio stream chopping LV2 plugin"; maintainers = [ maintainers.magnetophon ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/bitmeter/default.nix b/pkgs/applications/audio/bitmeter/default.nix index ebea6251dfb..6108d84c3d9 100644 --- a/pkgs/applications/audio/bitmeter/default.nix +++ b/pkgs/applications/audio/bitmeter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, autoreconfHook, fetchurl, libjack2, gtk2, pkgconfig }: +{ lib, stdenv, autoreconfHook, fetchurl, libjack2, gtk2, pkg-config }: stdenv.mkDerivation rec { pname = "bitmeter"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "09ck2gxqky701dc1p0ip61rrn16v0pdc7ih2hc2sd63zcw53g2a7"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libjack2 gtk2 ]; patches = [ diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix index 97c27d4ad9a..fca3eaf223e 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix @@ -3,7 +3,7 @@ , libbsd, libjack2, libpng, ffmpeg_3 , libxkbcommon , makeWrapper, pixman, autoPatchelfHook -, xdg_utils, zenity, zlib }: +, xdg-utils, zenity, zlib }: stdenv.mkDerivation rec { pname = "bitwig-studio"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ]; binPath = lib.makeBinPath [ - xdg_utils zenity ffmpeg_3 + xdg-utils zenity ffmpeg_3 ]; installPhase = '' diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix index 31086b3674d..2a12632494b 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, alsaLib, cairo, dpkg, freetype , gdk-pixbuf, glib, gtk3, lib, xorg , libglvnd, libjack2, ffmpeg_3 -, libxkbcommon, xdg_utils, zlib, pulseaudio +, libxkbcommon, xdg-utils, zlib, pulseaudio , wrapGAppsHook, makeWrapper }: stdenv.mkDerivation rec { @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ]; binPath = lib.makeBinPath [ - xdg_utils ffmpeg_3 + xdg-utils ffmpeg_3 ]; ldLibraryPath = lib.strings.makeLibraryPath buildInputs; diff --git a/pkgs/applications/audio/bjumblr/default.nix b/pkgs/applications/audio/bjumblr/default.nix index cc6df2328e0..104c795c11e 100644 --- a/pkgs/applications/audio/bjumblr/default.nix +++ b/pkgs/applications/audio/bjumblr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libX11, cairo, lv2, pkgconfig, libsndfile }: +{ lib, stdenv, fetchFromGitHub, libX11, cairo, lv2, pkg-config, libsndfile }: stdenv.mkDerivation rec { pname = "BJumblr"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0kl6hrxmqrdf0195bfnzsa2h1073fgiqrfhg2276fm1954sm994v"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 cairo lv2 libsndfile ]; diff --git a/pkgs/applications/audio/bristol/default.nix b/pkgs/applications/audio/bristol/default.nix index d58ff73bb70..e86341a608e 100644 --- a/pkgs/applications/audio/bristol/default.nix +++ b/pkgs/applications/audio/bristol/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, libjack2, pkgconfig, libpulseaudio, xorg }: +{ lib, stdenv, fetchurl, alsaLib, libjack2, pkg-config, libpulseaudio, xorg }: stdenv.mkDerivation rec { pname = "bristol"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1fi2m4gmvxdi260821y09lxsimq82yv4k5bbgk3kyc3x1nyhn7vx"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ alsaLib libjack2 libpulseaudio xorg.libX11 xorg.libXext xorg.xorgproto diff --git a/pkgs/applications/audio/bschaffl/default.nix b/pkgs/applications/audio/bschaffl/default.nix index c8fae58ac2f..6b0ca55f27f 100644 --- a/pkgs/applications/audio/bschaffl/default.nix +++ b/pkgs/applications/audio/bschaffl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bschaffl"; - version = "1.2.0"; + version = "1.4.2"; src = fetchFromGitHub { owner = "sjaehn"; repo = pname; rev = version; - sha256 = "1c09acqrbd387ba41f8ch1qykdap5h6cg9if5pgd16i4dmjnpghj"; + sha256 = "sha256-R6QTADPE2PW/ySQla2lQbb308jrHXZ43DpFxUfQ0/NY="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/audio/bsequencer/default.nix b/pkgs/applications/audio/bsequencer/default.nix index 93e010d826d..d45b42ddb9f 100644 --- a/pkgs/applications/audio/bsequencer/default.nix +++ b/pkgs/applications/audio/bsequencer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, xorg, cairo, lv2, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, xorg, cairo, lv2, pkg-config }: stdenv.mkDerivation rec { pname = "BSEQuencer"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0hagnn104ybzdp13r95idw20fhmzif8p3kmiypnr20m6c64rdd29"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorg.libX11 cairo lv2 ]; diff --git a/pkgs/applications/audio/bshapr/default.nix b/pkgs/applications/audio/bshapr/default.nix index e4f96e396c9..7e45d6a826f 100644 --- a/pkgs/applications/audio/bshapr/default.nix +++ b/pkgs/applications/audio/bshapr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, xorg, cairo, lv2, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, xorg, cairo, lv2, pkg-config }: stdenv.mkDerivation rec { pname = "BShapr"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "04zd3a178i2nivg5rjailzqvc5mlnilmhj1ziygmbhshbrywplri"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorg.libX11 cairo lv2 ]; diff --git a/pkgs/applications/audio/bslizr/default.nix b/pkgs/applications/audio/bslizr/default.nix index c833bd1262b..d307307fd1d 100644 --- a/pkgs/applications/audio/bslizr/default.nix +++ b/pkgs/applications/audio/bslizr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, xorg, cairo, lv2, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, xorg, cairo, lv2, pkg-config }: stdenv.mkDerivation rec { pname = "BSlizr"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1f7xrljvsy7a1p8c7wln2zhwarl3ara7gbjxkpyh47wfdpigpdb0"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorg.libX11 cairo lv2 ]; diff --git a/pkgs/applications/audio/cadence/default.nix b/pkgs/applications/audio/cadence/default.nix index 7230bf63287..2d3ac0c314e 100644 --- a/pkgs/applications/audio/cadence/default.nix +++ b/pkgs/applications/audio/cadence/default.nix @@ -1,12 +1,11 @@ -{ stdenv +{ lib , a2jmidid , coreutils -, lib , libjack2 , fetchpatch , fetchzip , jack_capture -, pkgconfig +, pkg-config , pulseaudioFull , qtbase , makeWrapper @@ -48,7 +47,7 @@ mkDerivation rec { ''; nativeBuildInputs = [ - pkgconfig + pkg-config ]; buildInputs = [ @@ -98,8 +97,8 @@ mkDerivation rec { meta = { homepage = "https://github.com/falkTX/Cadence/"; description = "Collection of tools useful for audio production"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ worldofpeace ]; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ worldofpeace ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/audio/calf/default.nix b/pkgs/applications/audio/calf/default.nix index 8fecd558e67..bdcbf024e60 100644 --- a/pkgs/applications/audio/calf/default.nix +++ b/pkgs/applications/audio/calf/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, cairo, expat, fftwSinglePrec, fluidsynth, glib -, gtk2, libjack2, ladspaH , libglade, lv2, pkgconfig }: +, gtk2, libjack2, ladspaH , libglade, lv2, pkg-config }: stdenv.mkDerivation rec { pname = "calf"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ cairo expat fftwSinglePrec fluidsynth glib gtk2 libjack2 ladspaH - libglade lv2 pkgconfig + libglade lv2 pkg-config ]; meta = with lib; { diff --git a/pkgs/applications/audio/callaudiod/default.nix b/pkgs/applications/audio/callaudiod/default.nix new file mode 100644 index 00000000000..d742961939f --- /dev/null +++ b/pkgs/applications/audio/callaudiod/default.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, fetchFromGitLab +, meson +, ninja +, pkg-config +, glib +, alsaLib +, libpulseaudio +}: + +stdenv.mkDerivation rec { + pname = "callaudiod"; + version = "0.0.4"; + + src = fetchFromGitLab { + domain = "gitlab.com"; + owner = "mobian1"; + repo = pname; + rev = version; + sha256 = "07k7xp5a9c4d4lq7amaj6cg6b3gsd77x9wvf7nzcf4vpaph4yiyj"; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + alsaLib + libpulseaudio + glib + ]; + + meta = with lib; { + description = "Daemon for dealing with audio routing during phone calls"; + homepage = "https://gitlab.com/mobian1/callaudiod"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ pacman99 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index bbdcbc21b78..8f02e8da893 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig +{ mkDerivation, lib, fetchFromGitHub, cmake, pkg-config , qtbase, qtsvg, qttools, perl # Cantata doesn't build with cdparanoia enabled so we disable that @@ -73,7 +73,7 @@ in mkDerivation { ++ lib.optional withUdisks udisks2 ++ lib.optional withLibVlc libvlc; - nativeBuildInputs = [ cmake pkgconfig qttools ]; + nativeBuildInputs = [ cmake pkg-config qttools ]; cmakeFlags = lib.flatten [ (fstats withTaglib [ "TAGLIB" "TAGLIB_EXTRAS" ]) diff --git a/pkgs/applications/audio/caps/default.nix b/pkgs/applications/audio/caps/default.nix index dc8511bf500..e0f71fa2646 100644 --- a/pkgs/applications/audio/caps/default.nix +++ b/pkgs/applications/audio/caps/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "caps"; version = "0.9.26"; @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { resource demands and meaningful control interfaces. ''; homepage = "http://www.quitte.de/dsp/caps.html"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.astsmtl ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.astsmtl ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/carla/default.nix b/pkgs/applications/audio/carla/default.nix index 883daa2ddef..40fb0cfda59 100644 --- a/pkgs/applications/audio/carla/default.nix +++ b/pkgs/applications/audio/carla/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchFromGitHub, alsaLib, file, fluidsynth, ffmpeg_3, jack2, - liblo, libpulseaudio, libsndfile, pkgconfig, python3Packages, + liblo, libpulseaudio, libsndfile, pkg-config, python3Packages, which, withFrontend ? true, withQt ? true, qtbase ? null, wrapQtAppsHook ? null, withGtk2 ? true, gtk2 ? null, withGtk3 ? true, gtk3 ? null }: -with stdenv.lib; +with lib; assert withFrontend -> python3Packages ? pyqt5; assert withQt -> qtbase != null; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - python3Packages.wrapPython pkgconfig which wrapQtAppsHook + python3Packages.wrapPython pkg-config which wrapQtAppsHook ]; pythonPath = with python3Packages; [ @@ -34,11 +34,12 @@ stdenv.mkDerivation rec { buildInputs = [ file liblo alsaLib fluidsynth ffmpeg_3 jack2 libpulseaudio libsndfile - ] ++ pythonPath - ++ optional withQt qtbase + ] ++ optional withQt qtbase ++ optional withGtk2 gtk2 ++ optional withGtk3 gtk3; + propagatedBuildInputs = pythonPath; + enableParallelBuilding = true; installFlags = [ "PREFIX=$(out)" ]; @@ -53,6 +54,7 @@ stdenv.mkDerivation rec { patchPythonScript "$f" done patchPythonScript "$out/share/carla/carla_settings.py" + patchPythonScript "$out/share/carla/carla_database.py" for program in $out/bin/*; do wrapQtApp "$program" \ diff --git a/pkgs/applications/audio/caudec/default.nix b/pkgs/applications/audio/caudec/default.nix index 013cf9ef707..0360922c819 100644 --- a/pkgs/applications/audio/caudec/default.nix +++ b/pkgs/applications/audio/caudec/default.nix @@ -25,8 +25,8 @@ stdenv.mkDerivation { postFixup = '' for executable in $(cd $out/bin && ls); do - wrapProgram $out/bin/$executable \ - --prefix PATH : "${stdenv.lib.makeBinPath [ bc findutils sox procps opusTools lame flac ]}" + wrapProgram $out/bin/$executable \ + --prefix PATH : "${lib.makeBinPath [ bc findutils sox procps opusTools lame flac ]}" done ''; diff --git a/pkgs/applications/audio/cd-discid/default.nix b/pkgs/applications/audio/cd-discid/default.nix index 5dcb178dc79..109ce1295b4 100644 --- a/pkgs/applications/audio/cd-discid/default.nix +++ b/pkgs/applications/audio/cd-discid/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" "INSTALL=install" ]; buildInputs = [] - ++ stdenv.lib.optional stdenv.isDarwin IOKit; + ++ lib.optional stdenv.isDarwin IOKit; meta = with lib; { homepage = "http://linukz.org/cd-discid.shtml"; diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix index 54d55d1c1b6..29359b097d2 100644 --- a/pkgs/applications/audio/cdparanoia/default.nix +++ b/pkgs/applications/audio/cdparanoia/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1pv4zrajm46za0f6lv162iqffih57a8ly4pc69f7y0gfyigb8p80"; }; - patches = stdenv.lib.optionals stdenv.isDarwin [ + patches = lib.optionals stdenv.isDarwin [ (fetchurl { url = "https://trac.macports.org/export/70964/trunk/dports/audio/cdparanoia/files/osx_interface.patch"; sha256 = "1n86kzm2ssl8fdf5wlhp6ncb2bf6b9xlb5vg0mhc85r69prqzjiy"; @@ -17,19 +17,19 @@ stdenv.mkDerivation rec { url = "https://trac.macports.org/export/70964/trunk/dports/audio/cdparanoia/files/patch-paranoia_paranoia.c.10.4.diff"; sha256 = "17l2qhn8sh4jy6ryy5si6ll6dndcm0r537rlmk4a6a8vkn852vad"; }) - ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./utils.patch + ] ++ lib.optional stdenv.hostPlatform.isMusl ./utils.patch ++ [./fix_private_keyword.patch]; - nativeBuildInputs = stdenv.lib.optional stdenv.isAarch64 autoreconfHook; + nativeBuildInputs = lib.optional stdenv.isAarch64 autoreconfHook; - propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ + propagatedBuildInputs = lib.optionals stdenv.isDarwin [ Carbon IOKit ]; hardeningDisable = [ "format" ]; - preConfigure = "unset CC" + stdenv.lib.optionalString stdenv.isAarch64 ''; + preConfigure = "unset CC" + lib.optionalString stdenv.isAarch64 ''; cp ${gnu-config}/config.sub configure.sub cp ${gnu-config}/config.guess configure.guess ''; diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index 500fb329356..be0f2f72529 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, fetchpatch, boost, cmake, chromaprint, gettext, gst_all_1, liblastfm +{ lib, mkDerivation, fetchFromGitHub, fetchpatch, boost, cmake, chromaprint, gettext, gst_all_1, liblastfm , qtbase, qtx11extras , taglib, fftw, glew, qjson, sqlite, libgpod, libplist, usbmuxd, libmtp , libpulseaudio, gvfs, libcdio, libechonest, libspotify, pcre, projectm, protobuf -, qca2, pkgconfig, sparsehash, config, makeWrapper, gst_plugins }: +, qca2, pkg-config, sparsehash, config, makeWrapper, gst_plugins }: let withIpod = config.clementine.ipod or false; @@ -24,7 +24,7 @@ let ./clementine-spotify-blob.patch ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ boost @@ -48,10 +48,10 @@ let sqlite taglib ] - ++ stdenv.lib.optionals (withIpod) [libgpod libplist usbmuxd] - ++ stdenv.lib.optionals (withMTP) [libmtp] - ++ stdenv.lib.optionals (withCD) [libcdio] - ++ stdenv.lib.optionals (withCloud) [sparsehash]; + ++ lib.optionals (withIpod) [libgpod libplist usbmuxd] + ++ lib.optionals (withMTP) [libmtp] + ++ lib.optionals (withCD) [libcdio] + ++ lib.optionals (withCloud) [sparsehash]; postPatch = '' sed -i src/CMakeLists.txt \ diff --git a/pkgs/applications/audio/clerk/default.nix b/pkgs/applications/audio/clerk/default.nix index 03c693da15a..0724632a63e 100644 --- a/pkgs/applications/audio/clerk/default.nix +++ b/pkgs/applications/audio/clerk/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { installPhase = '' DESTDIR=$out PREFIX=/ make install wrapProgram $out/bin/clerk \ - --prefix PATH : "${stdenv.lib.makeBinPath [ rofi mpc_cli perl util-linux libnotify ]}" + --prefix PATH : "${lib.makeBinPath [ rofi mpc_cli perl util-linux libnotify ]}" ''; meta = with lib; { diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index 2c8bf47cee9..b00355cc9cd 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -1,4 +1,4 @@ -{ config, lib, stdenv, fetchFromGitHub, runCommand, ncurses, pkgconfig +{ config, lib, stdenv, fetchFromGitHub, runCommand, ncurses, pkg-config , libiconv, CoreAudio , alsaSupport ? stdenv.isLinux, alsaLib ? null @@ -39,7 +39,7 @@ #, vtxSupport ? true, libayemu ? null }: -with stdenv.lib; +with lib; assert samplerateSupport -> jackSupport; @@ -102,13 +102,13 @@ in stdenv.mkDerivation rec { pname = "cmus"; - version = "2.8.0"; + version = "2.9.1"; src = fetchFromGitHub { owner = "cmus"; repo = "cmus"; rev = "v${version}"; - sha256 = "1ydnvq13ay8b8mfmmgwi5qsgyf220yi1d01acbnxqn775dghmwar"; + sha256 = "sha256-HEiEnEWf/MzhPO19VKTLYzhylpEvyzy1Jxs6EW2NU34="; }; patches = [ ./option-debugging.patch ]; @@ -118,10 +118,10 @@ stdenv.mkDerivation rec { "CONFIG_WAV=y" ] ++ concatMap (a: a.flags) opts); - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses ] - ++ stdenv.lib.optional stdenv.cc.isClang clangGCC - ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv CoreAudio ] + ++ lib.optional stdenv.cc.isClang clangGCC + ++ lib.optionals stdenv.isDarwin [ libiconv CoreAudio ] ++ flatten (concatMap (a: a.deps) opts); makeFlags = [ "LD=$(CC)" ]; diff --git a/pkgs/applications/audio/cmusfm/default.nix b/pkgs/applications/audio/cmusfm/default.nix index c07b887192a..79f78452c4c 100644 --- a/pkgs/applications/audio/cmusfm/default.nix +++ b/pkgs/applications/audio/cmusfm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, curl, libnotify, gdk-pixbuf }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, curl, libnotify, gdk-pixbuf }: stdenv.mkDerivation { version = "2020-07-23"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { }; # building configureFlags = [ "--enable-libnotify" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ curl libnotify gdk-pixbuf ]; meta = with lib; { @@ -29,7 +29,7 @@ stdenv.mkDerivation { + Inside cmus run `:set status_display_program=cmusfm` to set up cmusfm ''; homepage = "https://github.com/Arkq/cmusfm/"; - maintainers = with stdenv.lib.maintainers; [ CharlesHD ]; + maintainers = with lib.maintainers; [ CharlesHD ]; license = licenses.gpl3Plus; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/applications/audio/cozy-audiobooks/default.nix b/pkgs/applications/audio/cozy-audiobooks/default.nix index a30d604e346..bcad36e2da9 100644 --- a/pkgs/applications/audio/cozy-audiobooks/default.nix +++ b/pkgs/applications/audio/cozy-audiobooks/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, fetchFromGitHub , ninja , meson -, pkgconfig +, pkg-config , wrapGAppsHook , appstream-glib , desktop-file-utils @@ -35,7 +35,7 @@ python3Packages.buildPythonApplication rec { }; nativeBuildInputs = [ - meson ninja pkgconfig + meson ninja pkg-config wrapGAppsHook appstream-glib desktop-file-utils diff --git a/pkgs/applications/audio/crip/default.nix b/pkgs/applications/audio/crip/default.nix index 0181ede26dd..c61f838bc3a 100644 --- a/pkgs/applications/audio/crip/default.nix +++ b/pkgs/applications/audio/crip/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , makeWrapper @@ -16,7 +16,7 @@ , which }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { name = "crip-3.9"; @@ -60,8 +60,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://bach.dynet.com/crip/"; description = "Terminal-based ripper/encoder/tagger tool for creating Ogg Vorbis/FLAC files"; - license = stdenv.lib.licenses.gpl1; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl1; + platforms = lib.platforms.linux; maintainers = [ maintainers.endgame ]; }; } diff --git a/pkgs/applications/audio/csound/csound-manual/default.nix b/pkgs/applications/audio/csound/csound-manual/default.nix index 5cc8d71383b..ecd6685e217 100644 --- a/pkgs/applications/audio/csound/csound-manual/default.nix +++ b/pkgs/applications/audio/csound/csound-manual/default.nix @@ -1,5 +1,5 @@ { - stdenv, fetchFromGitHub, docbook_xsl, + lib, stdenv, fetchFromGitHub, docbook_xsl, docbook_xml_dtd_45, python, pygments, libxslt }: @@ -37,8 +37,8 @@ stdenv.mkDerivation { meta = { description = "The Csound Canonical Reference Manual"; homepage = "https://github.com/csound/manual"; - license = stdenv.lib.licenses.fdl12Plus; - maintainers = [ stdenv.lib.maintainers.hlolli ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.fdl12Plus; + maintainers = [ lib.maintainers.hlolli ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/audio/csound/csound-qt/default.nix b/pkgs/applications/audio/csound/csound-qt/default.nix index ba9df9039f6..953a919d0c7 100644 --- a/pkgs/applications/audio/csound/csound-qt/default.nix +++ b/pkgs/applications/audio/csound/csound-qt/default.nix @@ -40,6 +40,8 @@ stdenv.mkDerivation rec { "SHARE_DIR=${placeholder "out"}/share" ]; + dontWrapQtApps = true; + meta = with lib; { description = "CsoundQt is a frontend for Csound with editor, integrated help, widgets and other features"; homepage = "https://csoundqt.github.io/"; diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index 5a6a290af76..a63f7518494 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { }; cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp - ++ stdenv.lib.optional (libjack2 != null) "-DJACK_HEADER=${libjack2}/include/jack/jack.h"; + ++ lib.optional (libjack2 != null) "-DJACK_HEADER=${libjack2}/include/jack/jack.h"; nativeBuildInputs = [ cmake flex bison gettext ]; buildInputs = [ libsndfile libsamplerate boost ] diff --git a/pkgs/applications/audio/curseradio/default.nix b/pkgs/applications/audio/curseradio/default.nix index 82f3b130e6e..94059e06e54 100644 --- a/pkgs/applications/audio/curseradio/default.nix +++ b/pkgs/applications/audio/curseradio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, substituteAll, python3Packages, mpv }: +{ lib, fetchFromGitHub, substituteAll, python3Packages, mpv }: python3Packages.buildPythonApplication rec { version = "0.2"; diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix index 0259f522d80..9eda6333112 100644 --- a/pkgs/applications/audio/deadbeef/default.nix +++ b/pkgs/applications/audio/deadbeef/default.nix @@ -3,7 +3,7 @@ , automake , libtool , intltool -, pkgconfig +, pkg-config , jansson # deadbeef can use either gtk2 or gtk3 , gtk2Support ? false, gtk2 ? null @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { sha256 = "161b0ll8v4cjgwwmk137hzvh0jidlkx56vjkpnr70f0x4jzv2nll"; }; - buildInputs = with stdenv.lib; [ jansson ] + buildInputs = with lib; [ jansson ] ++ optional gtk2Support gtk2 ++ optionals gtk3Support [ gtk3 gsettings-desktop-schemas ] ++ optional vorbisSupport libvorbis @@ -97,8 +97,8 @@ stdenv.mkDerivation rec { automake intltool libtool - pkgconfig - ] ++ stdenv.lib.optional gtk3Support wrapGAppsHook; + pkg-config + ] ++ lib.optional gtk3Support wrapGAppsHook; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix b/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix index 819192fc1d4..16cefc5ff85 100644 --- a/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix +++ b/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, libxml2, deadbeef, glib, gtk3 }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, libxml2, deadbeef, glib, gtk3 }: stdenv.mkDerivation rec { pname = "deadbeef-headerbar-gtk3-plugin"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1v1schvnps7ypjqgcbqi74a45w8r2gbhrawz7filym22h1qr9wn0"; }; - nativeBuildInputs = [ autoconf automake libtool pkgconfig libxml2 ]; + nativeBuildInputs = [ autoconf automake libtool pkg-config libxml2 ]; buildInputs = [ deadbeef glib gtk3 ]; # Choose correct installation path diff --git a/pkgs/applications/audio/deadbeef/plugins/infobar.nix b/pkgs/applications/audio/deadbeef/plugins/infobar.nix index d5894e2fdbc..3f62e73e7e4 100644 --- a/pkgs/applications/audio/deadbeef/plugins/infobar.nix +++ b/pkgs/applications/audio/deadbeef/plugins/infobar.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, deadbeef, gtk3, libxml2 }: +{ lib, stdenv, fetchurl, pkg-config, deadbeef, gtk3, libxml2 }: stdenv.mkDerivation rec { pname = "deadbeef-infobar-plugin"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0c9wh3wh1hdww7v96i8cy797la06mylhfi0880k8vwh88079aapf"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ deadbeef gtk3 libxml2 ]; buildFlags = [ "gtk3" ]; diff --git a/pkgs/applications/audio/deadbeef/plugins/lyricbar.nix b/pkgs/applications/audio/deadbeef/plugins/lyricbar.nix index ad388e23d9f..bc6d206956f 100644 --- a/pkgs/applications/audio/deadbeef/plugins/lyricbar.nix +++ b/pkgs/applications/audio/deadbeef/plugins/lyricbar.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, deadbeef, gtkmm3, libxmlxx3 }: +{ lib, stdenv, fetchFromGitHub, pkg-config, deadbeef, gtkmm3, libxmlxx3 }: stdenv.mkDerivation { pname = "deadbeef-lyricbar-plugin"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "108hx5530f4xm8p9m2bk79nq7jkhcj39ad3vmxb2y6h6l2zv5kwl"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ deadbeef gtkmm3 libxmlxx3 ]; buildFlags = [ "gtk3" ]; diff --git a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix index 7bc0a4d1fa6..d0c1b4f9e50 100644 --- a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix +++ b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, deadbeef, glib }: +{ lib, stdenv, fetchurl, pkg-config, deadbeef, glib }: stdenv.mkDerivation rec { pname = "deadbeef-mpris2-plugin"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0s3y4ka4qf38cypc0xspy79q0g5y1kqx6ldad7yr6a45nw6j95jh"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ deadbeef glib ]; diff --git a/pkgs/applications/audio/denemo/default.nix b/pkgs/applications/audio/denemo/default.nix index ea152b59a50..4abaec8dadd 100644 --- a/pkgs/applications/audio/denemo/default.nix +++ b/pkgs/applications/audio/denemo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , libjack2, gettext, intltool, guile_2_0, lilypond , glib, libxml2, librsvg, libsndfile, aubio , gtk3, gtksourceview, evince, fluidsynth, rubberband @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { wrapGAppsHook intltool gettext - pkgconfig + pkg-config ]; meta = with lib; { diff --git a/pkgs/applications/audio/dfasma/default.nix b/pkgs/applications/audio/dfasma/default.nix index 20a1044fe24..3d4e5e5e5b9 100644 --- a/pkgs/applications/audio/dfasma/default.nix +++ b/pkgs/applications/audio/dfasma/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchFromGitHub, fftw, libsndfile, qtbase, qtmultimedia, qmake }: +{ mkDerivation, lib, fetchFromGitHub, fftw, libsndfile, qtbase, qtmultimedia, qmake }: let diff --git a/pkgs/applications/audio/dr14_tmeter/default.nix b/pkgs/applications/audio/dr14_tmeter/default.nix index 92e6eb2b323..80b2cff3ce0 100644 --- a/pkgs/applications/audio/dr14_tmeter/default.nix +++ b/pkgs/applications/audio/dr14_tmeter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, pkgs }: +{ lib, fetchFromGitHub, python3Packages, pkgs }: python3Packages.buildPythonApplication rec { pname = "dr14_tmeter"; diff --git a/pkgs/applications/audio/dragonfly-reverb/default.nix b/pkgs/applications/audio/dragonfly-reverb/default.nix index 0ada1dfeaa6..4f3d2a6a4dc 100644 --- a/pkgs/applications/audio/dragonfly-reverb/default.nix +++ b/pkgs/applications/audio/dragonfly-reverb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libjack2, libGL, pkgconfig, xorg }: +{ lib, stdenv, fetchFromGitHub, libjack2, libGL, pkg-config, xorg }: stdenv.mkDerivation rec { pname = "dragonfly-reverb"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { patchShebangs dpf/utils/generate-ttl.sh ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libjack2 xorg.libX11 libGL ]; diff --git a/pkgs/applications/audio/drumgizmo/default.nix b/pkgs/applications/audio/drumgizmo/default.nix index f69e101877b..dfaf7127f4b 100644 --- a/pkgs/applications/audio/drumgizmo/default.nix +++ b/pkgs/applications/audio/drumgizmo/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchpatch, alsaLib, expat, glib, libjack2, libXext, libX11, libpng -, libpthreadstubs, libsmf, libsndfile, lv2, pkgconfig, zita-resampler +, libpthreadstubs, libsmf, libsndfile, lv2, pkg-config, zita-resampler }: stdenv.mkDerivation rec { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib expat glib libjack2 libXext libX11 libpng libpthreadstubs - libsmf libsndfile lv2 pkgconfig zita-resampler + libsmf libsndfile lv2 pkg-config zita-resampler ]; meta = with lib; { diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix index 82a47b8173a..c175804a026 100644 --- a/pkgs/applications/audio/drumkv1/default.nix +++ b/pkgs/applications/audio/drumkv1/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchurl, pkgconfig, libjack2, alsaLib, libsndfile, liblo, lv2, qt5 }: +{ mkDerivation, lib, fetchurl, pkg-config, libjack2, alsaLib, libsndfile, liblo, lv2, qt5 }: mkDerivation rec { pname = "drumkv1"; @@ -11,7 +11,7 @@ mkDerivation rec { buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = with lib; { description = "An old-school drum-kit sampler synthesizer with stereo fx"; diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix index 5ea0871b62b..65c871640ef 100644 --- a/pkgs/applications/audio/easytag/default.nix +++ b/pkgs/applications/audio/easytag/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, intltool, gtk3, glib, libid3tag, id3lib, taglib +{ lib, stdenv, fetchurl, pkg-config, intltool, gtk3, glib, libid3tag, id3lib, taglib , libvorbis, libogg, opusfile, flac, itstool, libxml2, gsettings-desktop-schemas , gnome3, wrapGAppsHook }: @@ -10,13 +10,13 @@ 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}/${lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "1mbxnqrw1fwcgraa1bgik25vdzvf97vma5pzknbwbqq5ly9fwlgw"; }; NIX_LDFLAGS = "-lid3tag -lz"; - nativeBuildInputs = [ pkgconfig intltool itstool libxml2 wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config intltool itstool libxml2 wrapGAppsHook ]; buildInputs = [ gtk3 glib libid3tag id3lib taglib libvorbis libogg opusfile flac gsettings-desktop-schemas gnome3.adwaita-icon-theme diff --git a/pkgs/applications/audio/ecasound/default.nix b/pkgs/applications/audio/ecasound/default.nix index 505e5a604ca..0de66b24e70 100644 --- a/pkgs/applications/audio/ecasound/default.nix +++ b/pkgs/applications/audio/ecasound/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , pkg-config , alsaLib @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { meta = { description = "Software package designed for multitrack audio processing"; - license = with stdenv.lib.licenses; [ gpl2 lgpl21 ]; + license = with lib.licenses; [ gpl2 lgpl21 ]; homepage = "http://nosignal.fi/ecasound/"; }; } diff --git a/pkgs/applications/audio/eflite/default.nix b/pkgs/applications/audio/eflite/default.nix index 30a35501771..6a974abb8aa 100644 --- a/pkgs/applications/audio/eflite/default.nix +++ b/pkgs/applications/audio/eflite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, flite, alsaLib, debug ? false }: +{ lib, stdenv, fetchurl, fetchpatch, flite, alsaLib, debug ? false }: stdenv.mkDerivation rec { pname = "eflite"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ./format.patch ]; - CFLAGS = stdenv.lib.optionalString debug " -DDEBUG=2"; + CFLAGS = lib.optionalString debug " -DDEBUG=2"; meta = { homepage = "http://eflite.sourceforge.net"; @@ -44,8 +44,8 @@ stdenv.mkDerivation rec { a free text-to-speech engine developed at the CMU Speech Center as an off-shoot of Festival. ''; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ jhhuh ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ jhhuh ]; }; } diff --git a/pkgs/applications/audio/ekho/default.nix b/pkgs/applications/audio/ekho/default.nix index 86bf4faaa17..25ed8a71aa1 100644 --- a/pkgs/applications/audio/ekho/default.nix +++ b/pkgs/applications/audio/ekho/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , libsndfile, libpulseaudio }: @@ -28,12 +28,12 @@ in stdenv.mkDerivation rec { sha256 = "0ym6lpcpsvwvsiwlzkl1509a2hljwcw7synngrmqjq1n49ww00nj"; }; - preConfigure = with stdenv.lib; '' + preConfigure = with lib; '' NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE ${optionalString stdenv.is64bit "-D_x86_64"}" NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DEKHO_DATA_PATH=\"$out/share/ekho-data\"" ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsndfile libpulseaudio ]; } diff --git a/pkgs/applications/audio/ensemble-chorus/default.nix b/pkgs/applications/audio/ensemble-chorus/default.nix index 65dac936a38..7858da25b7c 100644 --- a/pkgs/applications/audio/ensemble-chorus/default.nix +++ b/pkgs/applications/audio/ensemble-chorus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fltk, alsaLib, freetype, libXrandr, libXinerama, libXcursor, lv2, libjack2, cmake, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, fltk, alsaLib, freetype, libXrandr, libXinerama, libXcursor, lv2, libjack2, cmake, pkg-config }: stdenv.mkDerivation rec { pname = "ensemble-chorus"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ fltk alsaLib freetype libXrandr libXinerama libXcursor lv2 libjack2 diff --git a/pkgs/applications/audio/eq10q/default.nix b/pkgs/applications/audio/eq10q/default.nix index 6c627c835ae..3531132f2fd 100644 --- a/pkgs/applications/audio/eq10q/default.nix +++ b/pkgs/applications/audio/eq10q/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, cmake, fftw, gtkmm2, libxcb, lv2, pkg-config +{ lib, stdenv, fetchurl, fetchpatch, cmake, fftw, gtkmm2, libxcb, lv2, pkg-config , xorg }: stdenv.mkDerivation rec { pname = "eq10q"; @@ -44,8 +44,8 @@ stdenv.mkDerivation rec { Nice GUI with powerful metering for every plugin. ''; homepage = "http://eq10q.sourceforge.net/"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.magnetophon ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/espeak-ng/default.nix b/pkgs/applications/audio/espeak-ng/default.nix index 720e1d4484a..50d7af6d116 100644 --- a/pkgs/applications/audio/espeak-ng/default.nix +++ b/pkgs/applications/audio/espeak-ng/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, autoconf, automake, which, libtool, pkgconfig +{ stdenv, lib, fetchFromGitHub, autoconf, automake, which, libtool, pkg-config , ronn , pcaudiolibSupport ? true, pcaudiolib , sonicSupport ? true, sonic }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0jkqhf2h94vbqq7mg7mmm23bq372fa7mdk941my18c3vkldcir1b"; }; - nativeBuildInputs = [ autoconf automake which libtool pkgconfig ronn ]; + nativeBuildInputs = [ autoconf automake which libtool pkg-config ronn ]; buildInputs = lib.optional pcaudiolibSupport pcaudiolib ++ lib.optional sonicSupport sonic; diff --git a/pkgs/applications/audio/espeak/edit.nix b/pkgs/applications/audio/espeak/edit.nix index e027bb03cfc..aa0dc90adf5 100644 --- a/pkgs/applications/audio/espeak/edit.nix +++ b/pkgs/applications/audio/espeak/edit.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, unzip, portaudio, wxGTK, sox }: +{ lib, stdenv, fetchurl, pkg-config, unzip, portaudio, wxGTK, sox }: stdenv.mkDerivation rec { name = "espeakedit-1.48.03"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0x8s7vpb7rw5x37yjzy1f98m4f2csdg89libb74fm36gn8ly0hli"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ unzip portaudio wxGTK ]; # TODO: @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { -e "s|@prefix@|$out|" \ -i "$file" done - '' + stdenv.lib.optionalString (portaudio.api_version == 19) '' + '' + lib.optionalString (portaudio.api_version == 19) '' cp src/portaudio19.h src/portaudio.h ''; diff --git a/pkgs/applications/audio/faust/faust1.nix b/pkgs/applications/audio/faust/faust1.nix index efa97738d3c..6d7d2e2c2ba 100644 --- a/pkgs/applications/audio/faust/faust1.nix +++ b/pkgs/applications/audio/faust/faust1.nix @@ -2,10 +2,10 @@ , coreutils , fetchurl , makeWrapper -, pkgconfig +, pkg-config }: -with stdenv.lib.strings; +with lib.strings; let @@ -159,7 +159,7 @@ let stdenv.mkDerivation ((faust2ApplBase args) // { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ makeWrapper ]; propagatedBuildInputs = [ faust ] ++ propagatedBuildInputs; diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index 4c0229e8f34..990d073528e 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -2,7 +2,7 @@ , coreutils , fetchFromGitHub , makeWrapper -, pkgconfig +, pkg-config , cmake , llvm , emscripten @@ -16,7 +16,7 @@ , which }: -with stdenv.lib.strings; +with lib.strings; let @@ -45,7 +45,7 @@ let inherit src; - nativeBuildInputs = [ makeWrapper pkgconfig cmake vim which ]; + nativeBuildInputs = [ makeWrapper pkg-config cmake vim which ]; buildInputs = [ llvm emscripten openssl libsndfile libmicrohttpd gnutls libtasn1 p11-kit ]; @@ -168,12 +168,12 @@ let stdenv.mkDerivation ((faust2ApplBase args) // { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ makeWrapper ]; propagatedBuildInputs = [ faust ] ++ propagatedBuildInputs; - libPath = stdenv.lib.makeLibraryPath propagatedBuildInputs; + libPath = lib.makeLibraryPath propagatedBuildInputs; postFixup = '' diff --git a/pkgs/applications/audio/faust/faust2firefox.nix b/pkgs/applications/audio/faust/faust2firefox.nix index b2cc6f46457..c718aa06806 100644 --- a/pkgs/applications/audio/faust/faust2firefox.nix +++ b/pkgs/applications/audio/faust/faust2firefox.nix @@ -1,5 +1,5 @@ { faust -, xdg_utils +, xdg-utils }: # This just runs faust2svg, then attempts to open a browser using @@ -9,6 +9,6 @@ faust.wrap { baseName = "faust2firefox"; - runtimeInputs = [ xdg_utils ]; + runtimeInputs = [ xdg-utils ]; } diff --git a/pkgs/applications/audio/faust/faust2jackrust.nix b/pkgs/applications/audio/faust/faust2jackrust.nix index 2562237424e..a93251c8d2d 100644 --- a/pkgs/applications/audio/faust/faust2jackrust.nix +++ b/pkgs/applications/audio/faust/faust2jackrust.nix @@ -1,12 +1,11 @@ -{ stdenv -, faust +{ faust , libjack2 , cargo , binutils , gcc , gnumake , openssl -, pkgconfig +, pkg-config }: @@ -14,5 +13,5 @@ faust.wrapWithBuildEnv { baseName = "faust2jackrust"; - propagatedBuildInputs = [ libjack2 cargo binutils gcc gnumake openssl pkgconfig ]; + propagatedBuildInputs = [ libjack2 cargo binutils gcc gnumake openssl pkg-config ]; } diff --git a/pkgs/applications/audio/faust/faustlive.nix b/pkgs/applications/audio/faust/faustlive.nix index 852a4d68e6a..20afb6fd761 100644 --- a/pkgs/applications/audio/faust/faustlive.nix +++ b/pkgs/applications/audio/faust/faustlive.nix @@ -5,12 +5,12 @@ stdenv.mkDerivation rec { pname = "faustlive"; - version = "2.5.4"; + version = "unstable-dev-2020-08-03"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faustlive"; - rev = version; - sha256 = "0npn8fvq8iafyamq4wrj1k1bmk4xd0my2sp3gi5jdjfx6hc1sm3n"; + rev = "c16565dc1b616ac0aad7c303c1997fa9e57177ab"; + sha256 = "1ys661lp1xwz21vy12kwkg248jvjq1z9w433knkh0ldyy2igvmd5"; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/flacon/default.nix b/pkgs/applications/audio/flacon/default.nix index b9750dd649a..a9dc7308aca 100644 --- a/pkgs/applications/audio/flacon/default.nix +++ b/pkgs/applications/audio/flacon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, libuchardet, pkgconfig, shntool, flac +{ stdenv, lib, fetchFromGitHub, cmake, libuchardet, pkg-config, shntool, flac , opusTools, vorbis-tools, mp3gain, lame, wavpack, vorbisgain, gtk3, qtbase , qttools, wrapQtAppsHook }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "04yp3aym7h70xjni9ancqv5lc4zds5a8dgw3fzgqs8k5nmh074gv"; }; - nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; buildInputs = [ qtbase qttools libuchardet ]; bin_path = lib.makeBinPath [ diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index 9d9772cde29..a1fee315d44 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake +{ stdenv, lib, fetchFromGitHub, pkg-config, cmake , alsaLib, glib, libjack2, libsndfile, libpulseaudio , AudioUnit, CoreAudio, CoreMIDI, CoreServices , version ? "2" @@ -30,7 +30,7 @@ stdenv.mkDerivation { inherit sha256; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ glib libsndfile libpulseaudio libjack2 ] ++ lib.optionals stdenv.isLinux [ alsaLib ] @@ -40,7 +40,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Real-time software synthesizer based on the SoundFont 2 specifications"; - homepage = "http://www.fluidsynth.org"; + homepage = "https://www.fluidsynth.org"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ goibhniu lovek323 ]; platforms = platforms.unix; diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix index f173d2fe02b..b91c72a5c75 100644 --- a/pkgs/applications/audio/fmit/default.nix +++ b/pkgs/applications/audio/fmit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub, fftw, qtbase, qtmultimedia, qmake, itstool, wrapQtAppsHook +{ lib, mkDerivation, fetchFromGitHub, fftw, qtbase, qtmultimedia, qmake, itstool, wrapQtAppsHook , alsaSupport ? true, alsaLib ? null , jackSupport ? false, libjack2 ? null , portaudioSupport ? false, portaudio ? null }: @@ -7,7 +7,7 @@ assert alsaSupport -> alsaLib != null; assert jackSupport -> libjack2 != null; assert portaudioSupport -> portaudio != null; -with stdenv.lib; +with lib; mkDerivation rec { pname = "fmit"; diff --git a/pkgs/applications/audio/fmsynth/default.nix b/pkgs/applications/audio/fmsynth/default.nix index d957c7ec33d..57b4bec50ad 100644 --- a/pkgs/applications/audio/fmsynth/default.nix +++ b/pkgs/applications/audio/fmsynth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtkmm2, lv2, lvtk, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, gtkmm2, lv2, lvtk, pkg-config }: stdenv.mkDerivation { pname = "fmsynth-unstable"; version = "2015-02-07"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1bk0bpr069hzx2508rgfbwpxiqgr7dmdkhqdywmd2i4rmibgrm1q"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtkmm2 lv2 lvtk ]; buildPhase = '' @@ -42,8 +42,8 @@ stdenv.mkDerivation { - Hard real-time constraints ''; homepage = "https://github.com/Themaister/libfmsynth"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.magnetophon ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/fomp/default.nix b/pkgs/applications/audio/fomp/default.nix index 006dbaf7980..f9f57b1ed55 100644 --- a/pkgs/applications/audio/fomp/default.nix +++ b/pkgs/applications/audio/fomp/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv, fetchurl, lv2, pkgconfig, python2, wafHook }: +{ lib, stdenv, fetchurl, lv2, pkg-config, python2, wafHook }: stdenv.mkDerivation rec { pname = "fomp"; - version = "1.2.0"; + version = "1.2.2"; src = fetchurl { url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; - sha256 = "01ld6yjrqrki6zwac8lmwmqkr5rv0sdham4pfbfkjwck4hi1gqqw"; + sha256 = "sha256-xnGijydiO3B7BjSlryFuH1j/OPio9hCYbniq2IXp2W8="; }; - nativeBuildInputs = [ pkgconfig wafHook ]; + nativeBuildInputs = [ pkg-config wafHook ]; buildInputs = [ lv2 python2 ]; meta = with lib; { diff --git a/pkgs/applications/audio/foo-yc20/default.nix b/pkgs/applications/audio/foo-yc20/default.nix index 6f91f1e1977..f7abeb2a91e 100644 --- a/pkgs/applications/audio/foo-yc20/default.nix +++ b/pkgs/applications/audio/foo-yc20/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libjack2, gtk2, lv2, faust, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, libjack2, gtk2, lv2, faust, pkg-config }: stdenv.mkDerivation { version = "git-2015-05-21"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "0i8261n95n4xic766h70xkrpbvw3sag96n1883ahmg6h7yb94avq"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libjack2 gtk2 lv2 faust ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/audio/freewheeling/default.nix b/pkgs/applications/audio/freewheeling/default.nix index 071a4a9caab..7bd063d9f53 100644 --- a/pkgs/applications/audio/freewheeling/default.nix +++ b/pkgs/applications/audio/freewheeling/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, gnutls, freetype +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, gnutls, freetype , SDL, SDL_gfx, SDL_ttf, liblo, libxml2, alsaLib, libjack2, libvorbis , libSM, libsndfile, libogg, libtool }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "1xff5whr02cixihgd257dc70hnyf22j3zamvhsvg4lp7zq9l2in4"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook libtool ]; + nativeBuildInputs = [ pkg-config autoreconfHook libtool ]; buildInputs = [ freetype SDL SDL_gfx SDL_ttf liblo libxml2 libjack2 alsaLib libvorbis libsndfile libogg libSM @@ -45,8 +45,8 @@ stdenv.mkDerivation rec { '' ; homepage = "http://freewheeling.sourceforge.net"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.sepi ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.sepi ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix index b231b4a69ed..d9d2570d0a8 100644 --- a/pkgs/applications/audio/ft2-clone/default.nix +++ b/pkgs/applications/audio/ft2-clone/default.nix @@ -13,24 +13,24 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.42"; + version = "1.43"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - sha256 = "0w3c1rgm8qlqi50gavrcjz40xb0nkis4i9mvpwmvzmdv9nipxry9"; + sha256 = "sha256-OIQk7ngg1wsB6DFcxhrviPGlhzdaAWBi9C2roSNg1eI="; }; # Adapt the linux-only CMakeLists to darwin (more reliable than make-macos.sh) - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.isDarwin '' sed -i -e 's@__LINUX_ALSA__@__MACOSX_CORE__@' -e 's@asound@@' CMakeLists.txt ''; nativeBuildInputs = [ cmake ]; buildInputs = [ SDL2 ] - ++ stdenv.lib.optional stdenv.isLinux alsaLib - ++ stdenv.lib.optionals stdenv.isDarwin [ + ++ lib.optional stdenv.isLinux alsaLib + ++ lib.optionals stdenv.isDarwin [ libiconv CoreAudio CoreMIDI @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { Cocoa ]; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin [ + NIX_LDFLAGS = lib.optionalString stdenv.isDarwin [ "-framework CoreAudio" "-framework CoreMIDI" "-framework CoreServices" diff --git a/pkgs/applications/audio/gigedit/default.nix b/pkgs/applications/audio/gigedit/default.nix index a97d1d3516f..1187dd1ba26 100644 --- a/pkgs/applications/audio/gigedit/default.nix +++ b/pkgs/applications/audio/gigedit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoconf, automake, intltool, libtool, pkgconfig, which +{ lib, stdenv, fetchurl, autoconf, automake, intltool, libtool, pkg-config, which , docbook_xml_dtd_45, docbook_xsl, gtkmm2, libgig, libsndfile, libxslt }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { preConfigure = "make -f Makefile.svn"; - nativeBuildInputs = [ autoconf automake intltool libtool pkgconfig which ]; + nativeBuildInputs = [ autoconf automake intltool libtool pkg-config which ]; buildInputs = [ docbook_xml_dtd_45 docbook_xsl gtkmm2 libgig libsndfile libxslt ]; diff --git a/pkgs/applications/audio/gjay/default.nix b/pkgs/applications/audio/gjay/default.nix index f2ba8ab3bfa..32c61380dca 100644 --- a/pkgs/applications/audio/gjay/default.nix +++ b/pkgs/applications/audio/gjay/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, mpd_clientlib, dbus-glib, audacious, gtk2, gsl +{ lib, stdenv, fetchurl, pkg-config, mpd_clientlib, dbus-glib, audacious, gtk2, gsl , libaudclient }: stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1a1vv4r0vnxjdyl0jyv7gga3zfd5azxlwjm1l6hjrf71lb228zn8"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ mpd_clientlib dbus-glib audacious gtk2 gsl libaudclient ]; diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix index d3d0d5fcd0a..11187015df0 100644 --- a/pkgs/applications/audio/gmpc/default.nix +++ b/pkgs/applications/audio/gmpc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libtool, intltool, pkgconfig, glib +{ lib, stdenv, fetchurl, libtool, intltool, pkg-config, glib , gtk2, curl, mpd_clientlib, libsoup, gob2, vala, libunique , libSM, libICE, sqlite, hicolor-icon-theme, wrapGAppsHook }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; patches = [ ./libmpd-11.8.17-remove-strndup.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib ]; }; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { sha256 = "0b3bnxf98i5lhjyljvgxgx9xmb6p46cn3a9cccrng14nagri9556"; }; - nativeBuildInputs = [ pkgconfig libtool intltool gob2 vala wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config libtool intltool gob2 vala wrapGAppsHook ]; buildInputs = [ glib gtk2 curl mpd_clientlib libsoup libunique libmpd libSM libICE sqlite hicolor-icon-theme diff --git a/pkgs/applications/audio/gmu/default.nix b/pkgs/applications/audio/gmu/default.nix index bfe9f72d664..3e2087162f5 100644 --- a/pkgs/applications/audio/gmu/default.nix +++ b/pkgs/applications/audio/gmu/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, SDL, SDL_gfx, SDL_image, tremor, flac, mpg123, libmikmod +{lib, stdenv, fetchurl, SDL, SDL_gfx, SDL_image, tremor, flac, mpg123, libmikmod , speex, ncurses , keymap ? "default" , conf ? "unknown" @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://wejp.k.vu/projects/gmu"; description = "Open source music player for portable gaming consoles and handhelds"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/applications/audio/gnome-podcasts/default.nix b/pkgs/applications/audio/gnome-podcasts/default.nix index 8686150c08a..1733aef4177 100644 --- a/pkgs/applications/audio/gnome-podcasts/default.nix +++ b/pkgs/applications/audio/gnome-podcasts/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , rustPlatform , fetchFromGitLab , fetchpatch @@ -8,7 +8,7 @@ , cargo , rustc , python3 -, pkgconfig +, pkg-config , glib , libhandy_0 , gtk3 @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gettext cargo rustc diff --git a/pkgs/applications/audio/goattracker/default.nix b/pkgs/applications/audio/goattracker/default.nix index 76b5617d23c..30bb4099233 100644 --- a/pkgs/applications/audio/goattracker/default.nix +++ b/pkgs/applications/audio/goattracker/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , unzip , copyDesktopItems @@ -8,7 +8,7 @@ , isStereo ? false }: -with stdenv.lib; +with lib; let pname = "goattracker" + optionalString isStereo "-stereo"; desktopItem = makeDesktopItem { diff --git a/pkgs/applications/audio/google-musicmanager/default.nix b/pkgs/applications/audio/google-musicmanager/default.nix index a202b3ad280..e10a961a9e6 100644 --- a/pkgs/applications/audio/google-musicmanager/default.nix +++ b/pkgs/applications/audio/google-musicmanager/default.nix @@ -50,12 +50,12 @@ stdenv.mkDerivation rec { postFixup = '' patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$(patchelf --print-rpath $out/opt/google/musicmanager/minidump_upload):${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib ]}" \ + --set-rpath "$(patchelf --print-rpath $out/opt/google/musicmanager/minidump_upload):${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}" \ $out/opt/google/musicmanager/minidump_upload patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$(patchelf --print-rpath $out/opt/google/musicmanager/MusicManager):$out/lib:${stdenv.lib.makeLibraryPath [ + --set-rpath "$(patchelf --print-rpath $out/opt/google/musicmanager/MusicManager):$out/lib:${lib.makeLibraryPath [ flac expat libidn diff --git a/pkgs/applications/audio/google-play-music-desktop-player/default.nix b/pkgs/applications/audio/google-play-music-desktop-player/default.nix index 509d3ddcf75..0be1cc45717 100644 --- a/pkgs/applications/audio/google-play-music-desktop-player/default.nix +++ b/pkgs/applications/audio/google-play-music-desktop-player/default.nix @@ -1,4 +1,4 @@ -{ stdenv, alsaLib, atk, at-spi2-atk, cairo, cups, dbus, dpkg, expat, fontconfig, freetype +{ lib, stdenv, alsaLib, atk, at-spi2-atk, cairo, cups, dbus, dpkg, expat, fontconfig, freetype , fetchurl, GConf, gdk-pixbuf, glib, gtk2, gtk3, libpulseaudio, makeWrapper, nspr , nss, pango, udev, xorg }: @@ -69,14 +69,14 @@ stdenv.mkDerivation { wrapProgram $out/bin/google-play-music-desktop-player \ --prefix LD_LIBRARY_PATH : "$out/share/google-play-music-desktop-player" \ - --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath deps}" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath deps}" ''; meta = { homepage = "https://www.googleplaymusicdesktopplayer.com/"; description = "A beautiful cross platform Desktop Player for Google Play Music"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; platforms = [ "x86_64-linux" ]; - maintainers = [ stdenv.lib.maintainers.SuprDewd ]; + maintainers = [ lib.maintainers.SuprDewd ]; }; } diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index 08263026959..229050654cd 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3, python3Packages, intltool +{ lib, fetchFromGitHub, python3, python3Packages, intltool , glibcLocales, gnome3, gtk3, wrapGAppsHook , gobject-introspection }: @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { ./disable-autoupdate.patch ]; - postPatch = with stdenv.lib; '' + postPatch = with lib; '' sed -i -re 's,^( *gpodder_dir *= *).*,\1"'"$out"'",' bin/gpodder ''; diff --git a/pkgs/applications/audio/gradio/default.nix b/pkgs/applications/audio/gradio/default.nix index f9fda0fe7bd..1e0fc40b533 100644 --- a/pkgs/applications/audio/gradio/default.nix +++ b/pkgs/applications/audio/gradio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig +{ lib, stdenv, fetchFromGitHub, pkg-config , python3 , gsettings-desktop-schemas , desktop-file-utils @@ -30,7 +30,7 @@ in stdenv.mkDerivation { }; nativeBuildInputs = [ - pkgconfig + pkg-config meson ninja diff --git a/pkgs/applications/audio/grandorgue/default.nix b/pkgs/applications/audio/grandorgue/default.nix index e2ba4ee2244..2d660bc736c 100644 --- a/pkgs/applications/audio/grandorgue/default.nix +++ b/pkgs/applications/audio/grandorgue/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchsvn, cmake, pkg-config, gcc, pkgconfig, fftwFloat, alsaLib +{ lib, stdenv, fetchsvn, cmake, gcc, pkg-config, fftwFloat, alsaLib , zlib, wavpack, wxGTK31, udev, jackaudioSupport ? false, libjack2 , includeDemo ? true }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ pkgconfig fftwFloat alsaLib zlib wavpack wxGTK31 udev ] + buildInputs = [ pkg-config fftwFloat alsaLib zlib wavpack wxGTK31 udev ] ++ lib.optional jackaudioSupport libjack2; cmakeFlags = lib.optional (!jackaudioSupport) [ @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { meta = { description = "Virtual Pipe Organ Software"; homepage = "https://sourceforge.net/projects/ourorgan"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.puzzlewolf ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.puzzlewolf ]; }; } diff --git a/pkgs/applications/audio/greg/default.nix b/pkgs/applications/audio/greg/default.nix index 46e1baed07d..95f3bf9988c 100644 --- a/pkgs/applications/audio/greg/default.nix +++ b/pkgs/applications/audio/greg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pythonPackages }: +{ lib, fetchFromGitHub, pythonPackages }: with pythonPackages; buildPythonApplication rec { pname = "greg"; diff --git a/pkgs/applications/audio/gtklick/default.nix b/pkgs/applications/audio/gtklick/default.nix index a81834c1fff..b3b95ca057e 100644 --- a/pkgs/applications/audio/gtklick/default.nix +++ b/pkgs/applications/audio/gtklick/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pythonPackages, gettext, klick}: +{ lib, fetchurl, pythonPackages, gettext, klick}: pythonPackages.buildPythonApplication rec { pname = "gtklick"; @@ -29,6 +29,6 @@ pythonPackages.buildPythonApplication rec { meta = { homepage = "http://das.nasophon.de/gtklick/"; description = "Simple metronome with an easy-to-use GTK interface"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix index c504f19de39..f39558c1571 100644 --- a/pkgs/applications/audio/gtkpod/default.nix +++ b/pkgs/applications/audio/gtkpod/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, wrapGAppsHook, intltool, libgpod, curl, flac, +{ lib, stdenv, fetchurl, pkg-config, wrapGAppsHook, intltool, libgpod, curl, flac, gnome3, gtk3, gettext, perlPackages, flex, libid3tag, gdl, libvorbis, gdk-pixbuf }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0xisrpx069f7bjkyc8vqxb4k0480jmx1wscqxr6cpq1qj6pchzd5"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook intltool ]; buildInputs = [ curl gettext flex libgpod libid3tag flac libvorbis gtk3 gdk-pixbuf diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index 41c7db959e0..69e427dd96c 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -23,7 +23,7 @@ , lilv , lrdf , lv2 -, pkgconfig +, pkg-config , python2 , sassc , serd @@ -37,7 +37,7 @@ }: let - inherit (stdenv.lib) optional; + inherit (lib) optional; in stdenv.mkDerivation rec { @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { gettext hicolor-icon-theme intltool - pkgconfig + pkg-config python2 wafHook wrapGAppsHook diff --git a/pkgs/applications/audio/gxmatcheq-lv2/default.nix b/pkgs/applications/audio/gxmatcheq-lv2/default.nix index 42e5cd726c7..246b034400d 100644 --- a/pkgs/applications/audio/gxmatcheq-lv2/default.nix +++ b/pkgs/applications/audio/gxmatcheq-lv2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, xorg, xorgproto, cairo, lv2, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, xorg, xorgproto, cairo, lv2, pkg-config }: stdenv.mkDerivation rec { pname = "GxMatchEQ.lv2"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0azdmgzqwjn26nx38iw13666a1i4y2bv39wk89pf6ihdi46klf72"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorg.libX11 xorgproto cairo lv2 ]; diff --git a/pkgs/applications/audio/gxplugins-lv2/default.nix b/pkgs/applications/audio/gxplugins-lv2/default.nix index 9201ff730d9..d71d40f401c 100644 --- a/pkgs/applications/audio/gxplugins-lv2/default.nix +++ b/pkgs/applications/audio/gxplugins-lv2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, xorg, xorgproto, cairo, lv2, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, xorg, xorgproto, cairo, lv2, pkg-config }: stdenv.mkDerivation rec { pname = "GxPlugins.lv2"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorg.libX11 xorgproto cairo lv2 ]; diff --git a/pkgs/applications/audio/helio-workstation/default.nix b/pkgs/applications/audio/helio-workstation/default.nix index 980b312ba6c..e2c19ac156d 100644 --- a/pkgs/applications/audio/helio-workstation/default.nix +++ b/pkgs/applications/audio/helio-workstation/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , alsaLib, freetype, xorg, curl, libGL, libjack2, gnome3 -, pkgconfig, makeWrapper +, pkg-config, makeWrapper }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { xorg.libXcursor xorg.libXcomposite curl libGL libjack2 gnome3.zenity ]; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; preBuild = '' cd Projects/LinuxMakefile diff --git a/pkgs/applications/audio/helm/default.nix b/pkgs/applications/audio/helm/default.nix index d20bbb8e573..172f134907c 100644 --- a/pkgs/applications/audio/helm/default.nix +++ b/pkgs/applications/audio/helm/default.nix @@ -7,7 +7,7 @@ , curl , libjack2 , lv2 -, pkgconfig +, pkg-config , libGLU , libGL }: @@ -26,7 +26,7 @@ buildInputs = [ xorg.libX11 xorg.libXcomposite xorg.libXcursor xorg.libXext xorg.libXinerama xorg.libXrender xorg.libXrandr - freetype alsaLib curl libjack2 pkgconfig libGLU libGL lv2 + freetype alsaLib curl libjack2 pkg-config libGLU libGL lv2 ]; CXXFLAGS = "-DHAVE_LROUND"; @@ -72,7 +72,7 @@ Simple arpeggiator Effects: Formant filter, stutter, delay ''; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; maintainers = [ maintainers.magnetophon ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/audio/hivelytracker/default.nix b/pkgs/applications/audio/hivelytracker/default.nix new file mode 100644 index 00000000000..4cf20e3c898 --- /dev/null +++ b/pkgs/applications/audio/hivelytracker/default.nix @@ -0,0 +1,89 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, makeWrapper +, SDL +, SDL_image +, SDL_ttf +, gtk2 +, glib +}: + +stdenv.mkDerivation rec { + pname = "hivelytracker"; + version = "unstable-2020-08-19"; + + src = fetchFromGitHub { + owner = "pete-gordon"; + repo = "hivelytracker"; + rev = "c8e3c7a5ee9f4a07cb4a941caecf7e4c4f4d40e0"; + sha256 = "1nqianlf1msir6wqwapi7ys1vbmf6aik58wa54b6cn5v6kwxh75a"; + }; + + nativeBuildInputs = [ + pkg-config + makeWrapper + ]; + + buildInputs = [ + SDL + SDL_image + SDL_ttf + gtk2 + glib + ]; + + makeFlags = [ + "-C sdl" + "-f Makefile.linux" + "PREFIX=$(out)" + ]; + + # TODO: try to exclude gtk and glib from darwin builds + NIX_CFLAGS_COMPILE = [ + "-I${SDL}/include/SDL" + "-I${SDL_image}/include/SDL" + "-I${SDL_ttf}/include/SDL" + "-I${gtk2.dev}/include/gtk-2.0" + "-I${glib.dev}/include/glib-2.0" + ]; + + # Also build the hvl2wav tool + postBuild = '' + make -C hvl2wav + ''; + + postInstall = '' + # https://github.com/pete-gordon/hivelytracker/issues/43 + # Ideally we should patch the sources, but the program can't open + # files passed as arguments anyway, so this works well enough until the + # issue is fixed. + wrapProgram $out/bin/hivelytracker \ + --run "cd $out/share/hivelytracker" + + # Also install the hvl2wav tool + install -Dm755 hvl2wav/hvl2wav $out/bin/hvl2wav + ''; + + meta = with lib; { + homepage = "http://www.hivelytracker.co.uk/"; + downloadPage = "http://www.hivelytracker.co.uk/downl.php"; + description = "Chip music tracker based upon the AHX format"; + longDescription = '' + Hively Tracker is a tracker program based upon the AHX format created in + the mid '90s by Dexter and Pink of Abyss. The format was relatively + popular, and many songs were created and used in scene productions and + games. AHX was designed to create a very SID-like sound on the Amiga. + + HivelyTracker can import and export modules and instruments in the AHX + format, but it also improves on AHX in several ways and therefore has + its own instrument and module formats. + ''; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = with maintainers; [ fgaz ]; + broken = stdenv.isDarwin; # TODO: try to use xcbuild + }; +} + diff --git a/pkgs/applications/audio/hybridreverb2/default.nix b/pkgs/applications/audio/hybridreverb2/default.nix index a8bb81de717..b887615a30f 100644 --- a/pkgs/applications/audio/hybridreverb2/default.nix +++ b/pkgs/applications/audio/hybridreverb2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchzip, cmake, pkgconfig, lv2, alsaLib, libjack2, +{ lib, stdenv, fetchFromGitHub, fetchzip, cmake, pkg-config, lv2, alsaLib, libjack2, freetype, libX11, gtk3, pcre, libpthreadstubs, libXdmcp, libxkbcommon, epoxy, at-spi2-core, dbus, curl, fftwFloat }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ lv2 alsaLib libjack2 freetype libX11 gtk3 pcre libpthreadstubs libXdmcp libxkbcommon epoxy at-spi2-core dbus curl fftwFloat ]; diff --git a/pkgs/applications/audio/hydrogen/0.nix b/pkgs/applications/audio/hydrogen/0.nix index 774b2a93447..1746715b834 100644 --- a/pkgs/applications/audio/hydrogen/0.nix +++ b/pkgs/applications/audio/hydrogen/0.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, cmake +{ lib, stdenv, fetchurl, pkg-config, cmake , alsaLib, boost, glib, lash, libjack2, libarchive, libsndfile, lrdf, qt4 }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1dy2jfkdw0nchars4xi4isrz66fqn53a9qk13bqza7lhmsg3s3qy"; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ alsaLib boost glib lash libjack2 libarchive libsndfile lrdf qt4 ]; diff --git a/pkgs/applications/audio/hydrogen/default.nix b/pkgs/applications/audio/hydrogen/default.nix index 728f0e90a99..e794726e050 100644 --- a/pkgs/applications/audio/hydrogen/default.nix +++ b/pkgs/applications/audio/hydrogen/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, wrapQtAppsHook +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, wrapQtAppsHook , alsaLib, ladspa-sdk, lash, libarchive, libjack2, liblo, libpulseaudio, libsndfile, lrdf , qtbase, qttools, qtxmlpatterns }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0snljpvbcgikhz610c325dgvayi0k512p3bglck9vvi90wsqx7l1"; }; - nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; buildInputs = [ alsaLib ladspa-sdk lash libarchive libjack2 liblo libpulseaudio libsndfile lrdf qtbase qttools qtxmlpatterns diff --git a/pkgs/applications/audio/i-score/default.nix b/pkgs/applications/audio/i-score/default.nix deleted file mode 100644 index daedb9b9820..00000000000 --- a/pkgs/applications/audio/i-score/default.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ - alsaLib, - boost, - cln, - cmake, - fetchFromGitHub, - gcc, - ginac, - jamomacore, - kdnssd, - libsndfile, - ninja, - portaudio, - portmidi, - qtbase, - qtdeclarative, - qtimageformats, - qtmultimedia, - qtquickcontrols2, - qtserialport, - qtsvg, - qttools, - qtwebsockets, - rtaudio, - stdenv -}: - -stdenv.mkDerivation rec { - version = "1.0.0-b31"; - pname = "i-score"; - - src = fetchFromGitHub { - owner = "OSSIA"; - repo = "i-score"; - rev = "v${version}"; - sha256 = "0g7s6n11w3wflrv5i2047dxx56lryms7xj0mznnlk5bii7g8dxzb"; - fetchSubmodules = true; - }; - - buildInputs = [ - alsaLib - boost - cln - cmake - ginac - gcc - jamomacore - kdnssd - libsndfile - ninja - portaudio - portmidi - qtbase - qtdeclarative - qtimageformats - qtmultimedia - qtquickcontrols2 - qtserialport - qtsvg - qttools - qtwebsockets - rtaudio - ]; - - cmakeFlags = [ - "-GNinja" - "-DISCORE_CONFIGURATION=static-release" - "-DISCORE_ENABLE_LTO=OFF" - "-DISCORE_BUILD_FOR_PACKAGE_MANAGER=True" - ]; - - preConfigure = '' - export CMAKE_PREFIX_PATH="''${CMAKE_PREFIX_PATH-}:$(echo "${jamomacore}/jamoma/share/cmake/Jamoma")" - ''; - - postInstall = ''rm $out/bin/i-score.sh''; - - meta = { - description = "An interactive sequencer for the intermedia arts"; - homepage = "http://i-score.org/"; - license = stdenv.lib.licenses.cecill20; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/applications/audio/iannix/default.nix b/pkgs/applications/audio/iannix/default.nix index 3765d2ca678..304f67e85aa 100644 --- a/pkgs/applications/audio/iannix/default.nix +++ b/pkgs/applications/audio/iannix/default.nix @@ -1,18 +1,18 @@ -{ mkDerivation, lib, fetchFromGitHub, alsaLib, pkgconfig, qtbase, qtscript, qmake +{ mkDerivation, lib, fetchFromGitHub, alsaLib, pkg-config, qtbase, qtscript, qmake }: mkDerivation rec { pname = "iannix"; - version = "0.9.20-b"; + version = "unstable-2020-12-09"; src = fetchFromGitHub { owner = "iannix"; repo = "IanniX"; - rev = "v${version}"; - sha256 = "6jjgMvD2VkR3ztU5LguqhtNd+4/ZqRy5pVW5xQ6K20Q="; + rev = "287b51d9b90b3e16ae206c0c4292599619f7b159"; + sha256 = "AhoP+Ok78Vk8Aee/RP572hJeM8O7v2ZTvFalOZZqRy8="; }; - nativeBuildInputs = [ pkgconfig qmake ]; + nativeBuildInputs = [ pkg-config qmake ]; buildInputs = [ alsaLib qtbase qtscript ]; qmakeFlags = [ "PREFIX=/" ]; diff --git a/pkgs/applications/audio/industrializer/default.nix b/pkgs/applications/audio/industrializer/default.nix index 593458506d8..f638eba3210 100644 --- a/pkgs/applications/audio/industrializer/default.nix +++ b/pkgs/applications/audio/industrializer/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , alsaLib , audiofile @@ -43,8 +43,8 @@ stdenv.mkDerivation rec { After a sound is rendered, it can be played and then saved to a .WAV file. ''; homepage = "https://sourceforge.net/projects/industrializer/"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.magnetophon ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/infamousPlugins/default.nix b/pkgs/applications/audio/infamousPlugins/default.nix index ce3121e2f95..dd96f720e93 100644 --- a/pkgs/applications/audio/infamousPlugins/default.nix +++ b/pkgs/applications/audio/infamousPlugins/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, cairomm, cmake, lv2, libpthreadstubs, libXdmcp, libXft, ntk, pcre, fftwFloat, zita-resampler }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, cairomm, cmake, lv2, libpthreadstubs, libXdmcp, libXft, ntk, pcre, fftwFloat, zita-resampler }: stdenv.mkDerivation rec { pname = "infamousPlugins"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "08xwh6px13y1gykaw103nhvjms7vgbgkcm0avh9f5d2d7aadq0l2"; }) ]; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ cairomm lv2 libpthreadstubs libXdmcp libXft ntk pcre fftwFloat zita-resampler ]; meta = with lib; { diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix index 9bb6ddd6a98..55456b2fb6f 100644 --- a/pkgs/applications/audio/ingen/default.nix +++ b/pkgs/applications/audio/ingen/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchgit, boost, ganv, glibmm, gtkmm2, libjack2, lilv -, lv2, makeWrapper, pkgconfig, python, raul, rdflib, serd, sord, sratom +, lv2, makeWrapper, pkg-config, python, raul, rdflib, serd, sord, sratom , wafHook , suil }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { deepClone = true; }; - nativeBuildInputs = [ pkgconfig wafHook ]; + nativeBuildInputs = [ pkg-config wafHook ]; buildInputs = [ boost ganv glibmm gtkmm2 libjack2 lilv lv2 makeWrapper python raul serd sord sratom suil diff --git a/pkgs/applications/audio/ir.lv2/default.nix b/pkgs/applications/audio/ir.lv2/default.nix index bc3049dc6b3..6c2b9c5be9c 100644 --- a/pkgs/applications/audio/ir.lv2/default.nix +++ b/pkgs/applications/audio/ir.lv2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fftw, gtk2, lv2, libsamplerate, libsndfile, pkgconfig, zita-convolver }: +{ lib, stdenv, fetchFromGitHub, fftw, gtk2, lv2, libsamplerate, libsndfile, pkg-config, zita-convolver }: stdenv.mkDerivation rec { pname = "ir.lv2"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ fftw gtk2 lv2 libsamplerate libsndfile zita-convolver ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; postPatch = '' # Fix build with lv2 1.18: https://github.com/tomszilagyi/ir.lv2/pull/20 diff --git a/pkgs/applications/audio/jack-capture/default.nix b/pkgs/applications/audio/jack-capture/default.nix index 0cf21c6a8c8..44e6dd1cd8a 100644 --- a/pkgs/applications/audio/jack-capture/default.nix +++ b/pkgs/applications/audio/jack-capture/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libjack2, libsndfile, pkgconfig }: +{ lib, stdenv, fetchurl, libjack2, libsndfile, pkg-config }: stdenv.mkDerivation rec { pname = "jack_capture"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1pji0zdwm3kxjrkbzj7fnxhr8ncrc8pyqnwyrh47fhypgqjv1br1"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libjack2 libsndfile ]; buildPhase = "PREFIX=$out make jack_capture"; @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { homepage = "http://archive.notam02.no/arkiv/src"; license = licenses.gpl2; maintainers = [ maintainers.goibhniu ]; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/jack-oscrolloscope/default.nix b/pkgs/applications/audio/jack-oscrolloscope/default.nix index ffd9ec5cbc3..9905d072361 100644 --- a/pkgs/applications/audio/jack-oscrolloscope/default.nix +++ b/pkgs/applications/audio/jack-oscrolloscope/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, SDL, libjack2, libGLU, libGL, pkgconfig }: +{ lib, stdenv, fetchurl, SDL, libjack2, libGLU, libGL, pkg-config }: stdenv.mkDerivation rec { pname = "jack_oscrolloscope"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1pl55in0sj7h5r06n1v91im7d18pplvhbjhjm1fdl39zwnyxiash"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ SDL libjack2 libGLU libGL ]; installPhase = '' @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { homepage = "http://das.nasophon.de/jack_oscrolloscope"; license = licenses.gpl2; maintainers = [ maintainers.goibhniu ]; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/jack-rack/default.nix b/pkgs/applications/audio/jack-rack/default.nix index d13dbcc1688..ec62cb04c85 100644 --- a/pkgs/applications/audio/jack-rack/default.nix +++ b/pkgs/applications/audio/jack-rack/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, pkgconfig, libjack2, ladspaH, gtk2, alsaLib, libxml2, lrdf }: +{ lib, stdenv, fetchurl, pkg-config, libjack2, ladspaH, gtk2, alsaLib, libxml2, lrdf }: stdenv.mkDerivation rec { name = "jack-rack-1.4.7"; src = fetchurl { url = "mirror://sourceforge/jack-rack/${name}.tar.bz2"; sha256 = "1lmibx9gicagcpcisacj6qhq6i08lkl5x8szysjqvbgpxl9qg045"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libjack2 ladspaH gtk2 alsaLib libxml2 lrdf ]; NIX_LDFLAGS = "-ldl -lm -lpthread"; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { computer into an effects box. ''; homepage = "http://jack-rack.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.astsmtl ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.astsmtl ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/jackmeter/default.nix b/pkgs/applications/audio/jackmeter/default.nix index d049cf81b11..2b4d413526a 100644 --- a/pkgs/applications/audio/jackmeter/default.nix +++ b/pkgs/applications/audio/jackmeter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libjack2, pkgconfig }: +{ lib, stdenv, fetchurl, libjack2, pkg-config }: stdenv.mkDerivation rec { name = "jackmeter-0.4"; @@ -8,14 +8,14 @@ stdenv.mkDerivation rec { sha256 = "1cnvgx3jv0yvxlqy0l9k285zgvazmh5k8m4l7lxckjfm5bn6hm1r"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libjack2 ]; meta = { description = "Console jack loudness meter"; homepage = "https://www.aelius.com/njh/jackmeter/"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.marcweber ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/jackmix/default.nix b/pkgs/applications/audio/jackmix/default.nix index 14cda8a81b5..eecafe9e501 100644 --- a/pkgs/applications/audio/jackmix/default.nix +++ b/pkgs/applications/audio/jackmix/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, pkgconfig, sconsPackages, qtbase, lash, libjack2, jack ? libjack2, alsaLib }: +{ mkDerivation, lib, fetchFromGitHub, pkg-config, sconsPackages, qtbase, lash, libjack2, jack ? libjack2, alsaLib }: mkDerivation rec { pname = "jackmix"; @@ -13,7 +13,7 @@ mkDerivation rec { patches = [ ./no_error.patch ]; - nativeBuildInputs = [ sconsPackages.scons_3_1_2 pkgconfig ]; + nativeBuildInputs = [ sconsPackages.scons_3_1_2 pkg-config ]; buildInputs = [ qtbase lash diff --git a/pkgs/applications/audio/jalv/default.nix b/pkgs/applications/audio/jalv/default.nix index d3ed57436c9..5d322eeca93 100644 --- a/pkgs/applications/audio/jalv/default.nix +++ b/pkgs/applications/audio/jalv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gtk2, libjack2, lilv, lv2, pkgconfig, python +{ lib, stdenv, fetchurl, gtk2, libjack2, lilv, lv2, pkg-config, python , serd, sord , sratom, suil, wafHook }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1wwfn7yzbs37s2rdlfjgks63svd5g14yyzd2gdl7h0z12qncwsy2"; }; - nativeBuildInputs = [ pkgconfig wafHook ]; + nativeBuildInputs = [ pkg-config wafHook ]; buildInputs = [ gtk2 libjack2 lilv lv2 python serd sord sratom suil ]; diff --git a/pkgs/applications/audio/jamin/default.nix b/pkgs/applications/audio/jamin/default.nix index 7f6501a473d..f111c4e99d7 100644 --- a/pkgs/applications/audio/jamin/default.nix +++ b/pkgs/applications/audio/jamin/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fftwFloat, gtk2, ladspaPlugins, libjack2, liblo, libxml2 -, makeWrapper, pkgconfig, perlPackages +, makeWrapper, pkg-config, perlPackages }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0g5v74cm0q3p3pzl6xmnp4rqayaymfli7c6z8s78h9rgd24fwbvn"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ fftwFloat gtk2 ladspaPlugins libjack2 liblo libxml2 makeWrapper ] ++ (with perlPackages; [ perl XMLParser ]); diff --git a/pkgs/applications/audio/jamulus/default.nix b/pkgs/applications/audio/jamulus/default.nix index 4cc48b89f9c..13b488ce7d7 100644 --- a/pkgs/applications/audio/jamulus/default.nix +++ b/pkgs/applications/audio/jamulus/default.nix @@ -1,14 +1,14 @@ -{ mkDerivation, stdenv, fetchFromGitHub, fetchpatch, pkg-config, qtscript, qmake, libjack2 +{ mkDerivation, lib, fetchFromGitHub, fetchpatch, pkg-config, qtscript, qmake, libjack2 }: mkDerivation rec { pname = "jamulus"; - version = "3.6.1"; + version = "3.6.2"; src = fetchFromGitHub { owner = "corrados"; repo = "jamulus"; - rev = "r${stdenv.lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "11rwgd2car7ziqa0vancb363m4ca94pj480jfxywd6d81139jl15"; + rev = "r${lib.replaceStrings [ "." ] [ "_" ] version}"; + sha256 = "sha256-b187Q8KXcU32C2hGFqs6R2CqWgmieq6ewQDx+elEgP4="; }; nativeBuildInputs = [ pkg-config qmake ]; @@ -20,8 +20,8 @@ mkDerivation rec { description = "Enables musicians to perform real-time jam sessions over the internet"; longDescription = "You also need to enable JACK and should enable several real-time optimizations. See project website for details"; homepage = "https://github.com/corrados/jamulus/wiki"; - license = stdenv.lib.licenses.gpl2; # linked in git repo, at least - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.seb314 ]; + license = lib.licenses.gpl2; # linked in git repo, at least + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.seb314 ]; }; } diff --git a/pkgs/applications/audio/japa/default.nix b/pkgs/applications/audio/japa/default.nix index 426fea21107..f45395eefa6 100644 --- a/pkgs/applications/audio/japa/default.nix +++ b/pkgs/applications/audio/japa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, libjack2, fftwFloat, libclthreads, libclxclient, libX11, libXft, zita-alsa-pcmi, }: +{ lib, stdenv, fetchurl, alsaLib, libjack2, fftwFloat, libclthreads, libclxclient, libX11, libXft, zita-alsa-pcmi, }: stdenv.mkDerivation rec { version = "0.9.2"; @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { meta = { description = "A 'perceptual' or 'psychoacoustic' audio spectrum analyser for JACK and ALSA"; homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/index.html"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.magnetophon ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/keyfinder/default.nix b/pkgs/applications/audio/keyfinder/default.nix index 187d3a58b17..b8fb01b6ecd 100644 --- a/pkgs/applications/audio/keyfinder/default.nix +++ b/pkgs/applications/audio/keyfinder/default.nix @@ -16,12 +16,11 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace is_KeyFinder.pro \ - --replace "keyfinder.0" "keyfinder" \ --replace "-stdlib=libc++" "" \ --replace "\$\$[QT_INSTALL_PREFIX]" "$out" ''; - enableParallelBuilding = true; + dontWrapQtApps = true; meta = with lib; { description = "Musical key detection for digital audio (graphical UI)"; diff --git a/pkgs/applications/audio/klick/default.nix b/pkgs/applications/audio/klick/default.nix index 9ff063c1c80..281a7148dfe 100644 --- a/pkgs/applications/audio/klick/default.nix +++ b/pkgs/applications/audio/klick/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, sconsPackages, pkgconfig +{ lib, stdenv, fetchurl, sconsPackages, pkg-config , libsamplerate, libsndfile, liblo, libjack2, boost }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1289533c0849b1b66463bf27f7ce5f71736b655cfb7672ef884c7e6eb957ac42"; }; - nativeBuildInputs = [ sconsPackages.scons_3_0_1 pkgconfig ]; + nativeBuildInputs = [ sconsPackages.scons_3_0_1 pkg-config ]; buildInputs = [ libsamplerate libsndfile liblo libjack2 boost ]; prefixKey = "PREFIX="; NIX_CFLAGS_COMPILE = "-fpermissive"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://das.nasophon.de/klick/"; description = "Advanced command-line metronome for JACK"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/klystrack/default.nix b/pkgs/applications/audio/klystrack/default.nix index ea8cfcec2e4..5d26397efdb 100644 --- a/pkgs/applications/audio/klystrack/default.nix +++ b/pkgs/applications/audio/klystrack/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, fetchpatch , SDL2, SDL2_image -, pkgconfig +, pkg-config }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ SDL2 SDL2_image ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; patches = [ (fetchpatch { diff --git a/pkgs/applications/audio/kmetronome/default.nix b/pkgs/applications/audio/kmetronome/default.nix index 415bfe37026..02353fcf4f5 100644 --- a/pkgs/applications/audio/kmetronome/default.nix +++ b/pkgs/applications/audio/kmetronome/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, pkgconfig, qttools, alsaLib, drumstick, qtbase, qtsvg }: +{ lib, stdenv, fetchurl, cmake, pkg-config, qttools, alsaLib, drumstick, qtbase, qtsvg }: stdenv.mkDerivation rec { pname = "kmetronome"; @@ -9,10 +9,12 @@ stdenv.mkDerivation rec { sha256 = "0bzm6vzlm32kjrgn1nvp096b2d41ybys2sk145nhy992wg56v32s"; }; - nativeBuildInputs = [ cmake pkgconfig qttools ]; + nativeBuildInputs = [ cmake pkg-config qttools ]; buildInputs = [ alsaLib drumstick qtbase qtsvg ]; + dontWrapQtApps = true; + meta = with lib; { homepage = "https://kmetronome.sourceforge.io/"; description = "ALSA MIDI metronome with Qt interface"; diff --git a/pkgs/applications/audio/ladspa-plugins/default.nix b/pkgs/applications/audio/ladspa-plugins/default.nix index 855056c6c15..fe8e9f323a5 100644 --- a/pkgs/applications/audio/ladspa-plugins/default.nix +++ b/pkgs/applications/audio/ladspa-plugins/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, automake, fftw, ladspaH, libxml2, pkgconfig +{ lib, stdenv, fetchurl, autoreconfHook, automake, fftw, ladspaH, libxml2, pkg-config , perlPackages }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1rqwh8xrw6hnp69dg4gy336bfbfpmbx4fjrk0nb8ypjcxkz91c6i"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ fftw ladspaH libxml2 perlPackages.perl perlPackages.XMLParser ]; patchPhase = '' diff --git a/pkgs/applications/audio/ladspa-sdk/default.nix b/pkgs/applications/audio/ladspa-sdk/default.nix index 76acd1daba7..47a36ed1b5d 100644 --- a/pkgs/applications/audio/ladspa-sdk/default.nix +++ b/pkgs/applications/audio/ladspa-sdk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "ladspa-sdk"; version = "1.15"; @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { three example programs (applyplugin, analyseplugin and listplugins). ''; homepage = "http://www.ladspa.org/ladspa_sdk/overview.html"; - license = stdenv.lib.licenses.lgpl2; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.lgpl2; + maintainers = [ lib.maintainers.magnetophon ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/ladspa-sdk/ladspah.nix b/pkgs/applications/audio/ladspa-sdk/ladspah.nix index d51aa3b75e1..b497e91927b 100644 --- a/pkgs/applications/audio/ladspa-sdk/ladspah.nix +++ b/pkgs/applications/audio/ladspa-sdk/ladspah.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "ladspa.h"; version = "1.15"; @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { For the full SDK, use the ladspa-sdk package. ''; homepage = "http://www.ladspa.org/ladspa_sdk/overview.html"; - license = stdenv.lib.licenses.lgpl2; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.lgpl2; + maintainers = [ lib.maintainers.magnetophon ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/audio/lash/default.nix b/pkgs/applications/audio/lash/default.nix index 26a8568f01a..eb355a43409 100644 --- a/pkgs/applications/audio/lash/default.nix +++ b/pkgs/applications/audio/lash/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, alsaLib, gtk2, libjack2, libuuid, libxml2 -, makeWrapper, pkgconfig, readline }: +, makeWrapper, pkg-config, readline }: assert libuuid != null; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { patches = [ ./socket.patch ./gcc-47.patch ]; buildInputs = [ alsaLib gtk2 libjack2 libxml2 makeWrapper - pkgconfig readline ]; + pkg-config readline ]; propagatedBuildInputs = [ libuuid ]; NIX_LDFLAGS = "-lm -lpthread -luuid"; diff --git a/pkgs/applications/audio/librespot/default.nix b/pkgs/applications/audio/librespot/default.nix index 241a89caa0b..13aa4fe5bc2 100644 --- a/pkgs/applications/audio/librespot/default.nix +++ b/pkgs/applications/audio/librespot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, withRodio ? true +{ lib, fetchFromGitHub, rustPlatform, pkg-config, openssl, withRodio ? true , withALSA ? true, alsaLib ? null, withPulseAudio ? false, libpulseaudio ? null , withPortAudio ? false, portaudio ? null }: @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { cargoPatches = [ ./cargo-lock.patch ]; - cargoBuildFlags = with stdenv.lib; [ + cargoBuildFlags = with lib; [ "--no-default-features" "--features" (concatStringsSep "," (filter (x: x != "") [ @@ -29,11 +29,11 @@ rustPlatform.buildRustPackage rec { ])) ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ stdenv.lib.optional withALSA alsaLib - ++ stdenv.lib.optional withPulseAudio libpulseaudio - ++ stdenv.lib.optional withPortAudio portaudio; + buildInputs = [ openssl ] ++ lib.optional withALSA alsaLib + ++ lib.optional withPulseAudio libpulseaudio + ++ lib.optional withPortAudio portaudio; doCheck = false; diff --git a/pkgs/applications/audio/lingot/default.nix b/pkgs/applications/audio/lingot/default.nix index f229e15871e..17a28315f19 100644 --- a/pkgs/applications/audio/lingot/default.nix +++ b/pkgs/applications/audio/lingot/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , pkg-config , intltool @@ -31,15 +31,15 @@ stdenv.mkDerivation rec { alsaLib libpulseaudio fftw - ] ++ stdenv.lib.optional jackSupport libjack2; + ] ++ lib.optional jackSupport libjack2; - configureFlags = stdenv.lib.optional (!jackSupport) "--disable-jack"; + configureFlags = lib.optional (!jackSupport) "--disable-jack"; meta = { description = "Not a Guitar-Only tuner"; homepage = "https://www.nongnu.org/lingot/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = with stdenv.lib.platforms; linux; - maintainers = with stdenv.lib.maintainers; [ viric ]; + license = lib.licenses.gpl2Plus; + platforms = with lib.platforms; linux; + maintainers = with lib.maintainers; [ viric ]; }; } diff --git a/pkgs/applications/audio/linuxband/default.nix b/pkgs/applications/audio/linuxband/default.nix index cd9ca5e2674..118b54ad858 100644 --- a/pkgs/applications/audio/linuxband/default.nix +++ b/pkgs/applications/audio/linuxband/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, pkgconfig, MMA, libjack2, libsmf, python2Packages }: +{ lib, stdenv, fetchurl, makeWrapper, pkg-config, MMA, libjack2, libsmf, python2Packages }: let inherit (python2Packages) pyGtkGlade pygtksourceview python; @@ -7,11 +7,11 @@ in stdenv.mkDerivation rec { pname = "linuxband"; src = fetchurl { - url = "http://linuxband.org/assets/sources/${pname}-${version}.tar.gz"; + url = "https://linuxband.org/assets/sources/${pname}-${version}.tar.gz"; sha256 = "1r71h4yg775m4gax4irrvygmrsclgn503ykmc2qwjsxa42ri4n2n"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ makeWrapper MMA libjack2 libsmf python pyGtkGlade pygtksourceview ]; patchPhase = '' @@ -29,9 +29,9 @@ in stdenv.mkDerivation rec { meta = { description = "A GUI front-end for MMA: Type in the chords, choose the groove and it will play an accompaniment"; - homepage = "http://linuxband.org/"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.linux; + homepage = "https://linuxband.org/"; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.magnetophon ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/linuxsampler/default.nix b/pkgs/applications/audio/linuxsampler/default.nix index 5eda9e92123..1daeb2cf379 100644 --- a/pkgs/applications/audio/linuxsampler/default.nix +++ b/pkgs/applications/audio/linuxsampler/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoconf, automake, bison, libtool, pkgconfig, which +{ lib, stdenv, fetchurl, autoconf, automake, bison, libtool, pkg-config, which , alsaLib, asio, libjack2, libgig, libsndfile, lv2 }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { make -f Makefile.svn ''; - nativeBuildInputs = [ autoconf automake bison libtool pkgconfig which ]; + nativeBuildInputs = [ autoconf automake bison libtool pkg-config which ]; buildInputs = [ alsaLib asio libjack2 libgig libsndfile lv2 ]; diff --git a/pkgs/applications/audio/littlegptracker/default.nix b/pkgs/applications/audio/littlegptracker/default.nix index 9772425535f..638f54da515 100644 --- a/pkgs/applications/audio/littlegptracker/default.nix +++ b/pkgs/applications/audio/littlegptracker/default.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { buildInputs = [ SDL ] - ++ stdenv.lib.optional stdenv.isDarwin Foundation - ++ stdenv.lib.optional stdenv.isLinux jack2; + ++ lib.optional stdenv.isDarwin Foundation + ++ lib.optional stdenv.isLinux jack2; patches = [ # Remove outdated (pre-64bit) checks that would fail on modern platforms @@ -32,13 +32,13 @@ stdenv.mkDerivation rec { preBuild = "cd projects"; makeFlags = [ "CXX=${stdenv.cc.targetPrefix}c++" ] - ++ stdenv.lib.optionals stdenv.isLinux [ "PLATFORM=DEB" ] - ++ stdenv.lib.optionals stdenv.isDarwin [ "PLATFORM=OSX" ]; + ++ lib.optionals stdenv.isLinux [ "PLATFORM=DEB" ] + ++ lib.optionals stdenv.isDarwin [ "PLATFORM=OSX" ]; NIX_CFLAGS_COMPILE = [ "-fpermissive" ] ++ - stdenv.lib.optional stdenv.hostPlatform.isAarch64 "-Wno-error=narrowing"; + lib.optional stdenv.hostPlatform.isAarch64 "-Wno-error=narrowing"; - NIX_LDFLAGS = stdenv.lib.optional stdenv.isDarwin "-framework Foundation"; + NIX_LDFLAGS = lib.optional stdenv.isDarwin "-framework Foundation"; installPhase = let extension = if stdenv.isDarwin then "app" else "deb-exe"; in "install -Dm555 lgpt.${extension} $out/bin/lgpt"; diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix index ef95bf59494..11a7d0cf3c6 100644 --- a/pkgs/applications/audio/lmms/default.nix +++ b/pkgs/applications/audio/lmms/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, alsaLib ? null, fftwFloat, fltk13 +{ lib, fetchFromGitHub, cmake, pkg-config, alsaLib ? null, fftwFloat, fltk13 , fluidsynth_1 ? null, lame ? null, libgig ? null, libjack2 ? null, libpulseaudio ? null , libsamplerate, libsoundio ? null, libsndfile, libvorbis ? null, portaudio ? null , qtbase, qtx11extras, qttools, SDL ? null, mkDerivation }: @@ -15,7 +15,7 @@ mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ cmake qttools pkgconfig ]; + nativeBuildInputs = [ cmake qttools pkg-config ]; buildInputs = [ alsaLib diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index 14ab2aaf2d0..c85645565ee 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -3,7 +3,7 @@ , nix-update-script , meson , ninja -, pkgconfig +, pkg-config , python3 , gtk3 , gst_all_1 @@ -43,7 +43,7 @@ python3.pkgs.buildPythonApplication rec { gobject-introspection meson ninja - pkgconfig + pkg-config wrapGAppsHook ]; diff --git a/pkgs/applications/audio/lsp-plugins/default.nix b/pkgs/applications/audio/lsp-plugins/default.nix index e32b2e54f47..a25c522e12f 100644 --- a/pkgs/applications/audio/lsp-plugins/default.nix +++ b/pkgs/applications/audio/lsp-plugins/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, makeWrapper +{ lib, stdenv, fetchFromGitHub, pkg-config, makeWrapper , libsndfile, jack2Full , libGLU, libGL, lv2, cairo , ladspaH, php }: @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { sha256 = "1apw8zh3a3il4smkjji6bih4vbsymj0hjs10fgkrd4nazqkjvgyd"; }; - nativeBuildInputs = [ pkgconfig php makeWrapper ]; + nativeBuildInputs = [ pkg-config php makeWrapper ]; buildInputs = [ jack2Full libsndfile libGLU libGL lv2 cairo ladspaH ]; makeFlags = [ - "PREFIX=${placeholder ''out''}" + "PREFIX=${placeholder "out"}" "ETC_PATH=$(out)/etc" ]; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { buildFlags = [ "release" ]; - meta = with stdenv.lib; + meta = with lib; { description = "Collection of open-source audio plugins"; longDescription = '' Compatible with follwing formats: diff --git a/pkgs/applications/audio/ltc-tools/default.nix b/pkgs/applications/audio/ltc-tools/default.nix index 31986762fc1..c8c87959727 100644 --- a/pkgs/applications/audio/ltc-tools/default.nix +++ b/pkgs/applications/audio/ltc-tools/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchFromGitHub, pkgconfig, libltc, libsndfile, jack2}: +{lib, stdenv, fetchFromGitHub, pkg-config, libltc, libsndfile, jack2}: stdenv.mkDerivation rec { pname = "ltc-tools"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0vp25b970r1hv5ndzs4di63rgwnl31jfaj3jz5dka276kx34q4al"; }; - buildInputs = [ pkgconfig libltc libsndfile jack2 ]; + buildInputs = [ pkg-config libltc libsndfile jack2 ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/audio/luppp/default.nix b/pkgs/applications/audio/luppp/default.nix index ac7ff3a3084..36d329bcafd 100644 --- a/pkgs/applications/audio/luppp/default.nix +++ b/pkgs/applications/audio/luppp/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , meson , ninja -, pkgconfig +, pkg-config , jack2 , cairo , liblo @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/audio/lv2-cpp-tools/default.nix b/pkgs/applications/audio/lv2-cpp-tools/default.nix index b6e878d4836..f1709d00558 100644 --- a/pkgs/applications/audio/lv2-cpp-tools/default.nix +++ b/pkgs/applications/audio/lv2-cpp-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, pkgconfig, lv2, gtkmm2, boost }: +{ lib, stdenv, fetchzip, pkg-config, lv2, gtkmm2, boost }: stdenv.mkDerivation rec { pname = "lv2-cpp-tools"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sed -r 's,/sbin/ldconfig,ldconfig,g' -i ./Makefile.template ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ lv2 gtkmm2 boost ]; diff --git a/pkgs/applications/audio/lv2bm/default.nix b/pkgs/applications/audio/lv2bm/default.nix index 8f997a28193..553e0e67f83 100644 --- a/pkgs/applications/audio/lv2bm/default.nix +++ b/pkgs/applications/audio/lv2bm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, glib, libsndfile, lilv, lv2, pkgconfig, serd, sord, sratom }: +{ lib, stdenv, fetchFromGitHub, glib, libsndfile, lilv, lv2, pkg-config, serd, sord, sratom }: stdenv.mkDerivation rec { pname = "lv2bm"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0vlppxfb9zbmffazs1kiyb79py66s8x9hihj36m2vz86zsq7ybl0"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib libsndfile lilv lv2 serd sord sratom ]; installPhase = '' diff --git a/pkgs/applications/audio/m4acut/default.nix b/pkgs/applications/audio/m4acut/default.nix new file mode 100644 index 00000000000..f3ceee9227c --- /dev/null +++ b/pkgs/applications/audio/m4acut/default.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, autoreconfHook, fetchFromGitHub, l-smash }: + +stdenv.mkDerivation rec { + pname = "m4acut"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "nu774"; + repo = "m4acut"; + rev = "v${version}"; + sha256 = "1hzf9f1fzmlpnxjaxhs2w22wzb28vd87ycaddnix1mmhvh3nvzkd"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ l-smash ]; + + meta = with lib; { + description = "Losslessly & gaplessly cut m4a (AAC in MP4) files."; + homepage = "https://github.com/nu774/m4acut"; + license = with licenses; [ bsdOriginal zlib ]; + maintainers = [ maintainers.chkno ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix b/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix index e16198696a6..d7f0a7fb20e 100644 --- a/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = { description = "A compressor with character. For jack and lv2"; homepage = "https://github.com/magnetophon/CharacterCompressor"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.magnetophon ]; }; } diff --git a/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix b/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix index 1ccc9f3fcd5..7a917d79c57 100644 --- a/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { description = "A group of compressors mixed into a bus, sidechained from that mix bus. For jack and lv2"; homepage = "https://github.com/magnetophon/CompBus"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.magnetophon ]; }; } diff --git a/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix b/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix index d5ed7e85b69..5ac71172325 100644 --- a/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "A chorus algorithm that maintains constant and symmetric detuning depth (in cents), regardless of modulation rate. For jack and lv2"; homepage = "https://github.com/magnetophon/constant-detune-chorus"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.magnetophon ]; }; } diff --git a/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix b/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix index 6d119394d5d..277b186fd4a 100644 --- a/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "A fast yet clean lookahead limiter for jack and lv2"; homepage = "https://magnetophon.github.io/LazyLimiter/"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.magnetophon ]; }; } diff --git a/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix b/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix index 0eb68e65eae..de7e573cbee 100644 --- a/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "Mid-side multiband distortion for jack and lv2"; homepage = "https://github.com/magnetophon/MBdistortion"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.magnetophon ]; }; } diff --git a/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix b/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix index be8ad72d28d..80c5bb89eee 100644 --- a/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "Tap a rhythm into your delay! For jack and lv2"; homepage = "https://github.com/magnetophon/RhythmDelay"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.magnetophon ]; }; } diff --git a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix index dce2db4cb77..9bd4076f130 100644 --- a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = { description = "Turn your voice into a synthesizer"; homepage = "https://github.com/magnetophon/VoiceOfFaust"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.magnetophon ]; }; } diff --git a/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix b/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix index 172b5ed3891..a90492f4235 100644 --- a/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = { description = "A collection of bread and butter compressors"; homepage = "https://github.com/magnetophon/faustCompressors"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.magnetophon ]; }; } diff --git a/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix b/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix index 11d51d756ab..414e350caa0 100644 --- a/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = { description = "Some simple utility lv2 plugins"; homepage = "https://github.com/magnetophon/pluginUtils"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.magnetophon ]; }; } diff --git a/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix b/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix index 360cee243c3..7dcdf985c82 100644 --- a/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = { description = "A multiband compressor made from shelving filters."; homepage = "https://github.com/magnetophon/shelfMultiBand"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.magnetophon ]; }; } diff --git a/pkgs/applications/audio/mda-lv2/default.nix b/pkgs/applications/audio/mda-lv2/default.nix index b53ea7a7963..30d654ab87a 100644 --- a/pkgs/applications/audio/mda-lv2/default.nix +++ b/pkgs/applications/audio/mda-lv2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fftwSinglePrec, lv2, pkgconfig, wafHook, python3 }: +{ lib, stdenv, fetchurl, fftwSinglePrec, lv2, pkg-config, wafHook, python3 }: stdenv.mkDerivation rec { pname = "mda-lv2"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1a3cv6w5xby9yn11j695rbh3c4ih7rxfxmkca9s1324ljphh06m8"; }; - nativeBuildInputs = [ pkgconfig wafHook python3 ]; + nativeBuildInputs = [ pkg-config wafHook python3 ]; buildInputs = [ fftwSinglePrec lv2 ]; meta = with lib; { diff --git a/pkgs/applications/audio/mellowplayer/default.nix b/pkgs/applications/audio/mellowplayer/default.nix index 37c38496773..5bdcb81fb63 100644 --- a/pkgs/applications/audio/mellowplayer/default.nix +++ b/pkgs/applications/audio/mellowplayer/default.nix @@ -3,7 +3,7 @@ , lib , libnotify , mkDerivation -, pkgconfig +, pkg-config , qtbase , qtdeclarative , qtgraphicaleffects @@ -14,16 +14,16 @@ mkDerivation rec { pname = "MellowPlayer"; - version = "3.6.7"; + version = "3.6.8"; src = fetchFromGitLab { owner = "ColinDuquesnoy"; repo = "MellowPlayer"; rev = version; - sha256 = "1p0z8hkbxaxrqjmknjwxb0mpf3xdssik3m5cwrsv1881k1x2x5qs"; + sha256 = "sha256-rsF2xQet7U8d4oGU/HgghvE3vvmkxjlGXPBlLD9mWTk="; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libnotify diff --git a/pkgs/applications/audio/meterbridge/default.nix b/pkgs/applications/audio/meterbridge/default.nix index fbf23fbbd58..a825eaa4e38 100644 --- a/pkgs/applications/audio/meterbridge/default.nix +++ b/pkgs/applications/audio/meterbridge/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, SDL, SDL_image, libjack2 +{ lib, stdenv, fetchurl, pkg-config, SDL, SDL_image, libjack2 }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { patches = [ ./buf_rect.patch ./fix_build_with_gcc-5.patch]; buildInputs = - [ pkgconfig SDL SDL_image libjack2 + [ pkg-config SDL SDL_image libjack2 ]; meta = with lib; { diff --git a/pkgs/applications/audio/meters_lv2/default.nix b/pkgs/applications/audio/meters_lv2/default.nix index cd9523d2710..b21b859596e 100644 --- a/pkgs/applications/audio/meters_lv2/default.nix +++ b/pkgs/applications/audio/meters_lv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , lv2, libGLU, libGL, gtk2, cairo, pango, fftwFloat, libjack2 }: let @@ -25,7 +25,7 @@ in stdenv.mkDerivation { inherit name; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ lv2 libGLU libGL gtk2 cairo pango fftwFloat libjack2 ]; srcs = [ src robtkSrc ]; @@ -36,7 +36,7 @@ stdenv.mkDerivation { preConfigure = "makeFlagsArray=( PREFIX=$out )"; meter_VERSION = version; - meta = with stdenv.lib; + meta = with lib; { description = "Collection of audio level meters with GUI in LV2 plugin format"; homepage = "http://x42.github.io/meters.lv2/"; maintainers = with maintainers; [ ehmry ]; diff --git a/pkgs/applications/audio/mhwaveedit/default.nix b/pkgs/applications/audio/mhwaveedit/default.nix index c87a050ed33..82f9b70c618 100644 --- a/pkgs/applications/audio/mhwaveedit/default.nix +++ b/pkgs/applications/audio/mhwaveedit/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, makeWrapper, SDL, alsaLib, autoreconfHook, gtk2, libjack2, ladspaH -, ladspaPlugins, libsamplerate, libsndfile, pkgconfig, libpulseaudio, lame +, ladspaPlugins, libsamplerate, libsndfile, pkg-config, libpulseaudio, lame , vorbis-tools }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "037pbq23kh8hsih994x2sv483imglwcrqrx6m8visq9c46fi0j1y"; }; - nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig ]; + nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config ]; preAutoreconf = "(cd docgen && sh gendocs.sh)"; diff --git a/pkgs/applications/audio/mi2ly/default.nix b/pkgs/applications/audio/mi2ly/default.nix index 58c1690a9bb..b4f7668394f 100644 --- a/pkgs/applications/audio/mi2ly/default.nix +++ b/pkgs/applications/audio/mi2ly/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: let s = # Generated upstream information rec { @@ -32,10 +32,10 @@ stdenv.mkDerivation { meta = { inherit (s) version; - description = ''MIDI to Lilypond converter''; - license = stdenv.lib.licenses.gpl2Plus ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + description = "MIDI to Lilypond converter"; + license = lib.licenses.gpl2Plus ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; broken = true; # 2018-04-11 }; } diff --git a/pkgs/applications/audio/midi-visualizer/default.nix b/pkgs/applications/audio/midi-visualizer/default.nix index 58f8fee3cef..ec6fd4d8ed9 100644 --- a/pkgs/applications/audio/midi-visualizer/default.nix +++ b/pkgs/applications/audio/midi-visualizer/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "MIDIVisualizer"; - version = "6.0"; + version = "6.2"; src = fetchFromGitHub { owner = "kosua20"; repo = pname; rev = "v${version}"; - sha256 = "052zpabkbkqzqzf8r6mdq9p6arn9mr1ywx6x3y9rqxj6sfprxd65"; + sha256 = "sha256-t7DRPV0FSg6v81GzHLK2O++sfjr2aFT+xg3+wFd0UFg="; }; nativeBuildInputs = [ cmake pkg-config makeWrapper]; diff --git a/pkgs/applications/audio/midisheetmusic/default.nix b/pkgs/applications/audio/midisheetmusic/default.nix index 1f408f6f628..bff9e807b43 100644 --- a/pkgs/applications/audio/midisheetmusic/default.nix +++ b/pkgs/applications/audio/midisheetmusic/default.nix @@ -47,8 +47,8 @@ in stdenv.mkDerivation { cp bin/Debug/MidiSheetMusic.exe $out/bin/.MidiSheetMusic.exe makeWrapper ${mono}/bin/mono $out/bin/midisheetmusic.mono.exe \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ gtk2 cups ]} \ - --prefix PATH : ${stdenv.lib.makeBinPath [ timidity ]} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ gtk2 cups ]} \ + --prefix PATH : ${lib.makeBinPath [ timidity ]} \ --add-flags $out/bin/.MidiSheetMusic.exe ''; diff --git a/pkgs/applications/audio/mikmod/default.nix b/pkgs/applications/audio/mikmod/default.nix index 9be303cb652..4d39616c99d 100644 --- a/pkgs/applications/audio/mikmod/default.nix +++ b/pkgs/applications/audio/mikmod/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libmikmod, ncurses }: +{ lib, stdenv, fetchurl, libmikmod, ncurses }: stdenv.mkDerivation rec { name = "mikmod-3.2.8"; @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { meta = { description = "Tracker music player for the terminal"; homepage = "http://mikmod.shlomifish.org/"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix index b061b48abc8..b43694eb9c0 100644 --- a/pkgs/applications/audio/milkytracker/default.nix +++ b/pkgs/applications/audio/milkytracker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, makeWrapper +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, makeWrapper , SDL2, alsaLib, libjack2, lhasa, perl, rtmidi, zlib, zziplib }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "025fj34gq2kmkpwcswcyx7wdxb89vm944dh685zi4bxx0hz16vvk"; }; - nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; + nativeBuildInputs = [ cmake pkg-config makeWrapper ]; buildInputs = [ SDL2 alsaLib libjack2 lhasa perl rtmidi zlib zziplib ]; diff --git a/pkgs/applications/audio/mimic/default.nix b/pkgs/applications/audio/mimic/default.nix index e33e69ad78c..57af7a469a0 100644 --- a/pkgs/applications/audio/mimic/default.nix +++ b/pkgs/applications/audio/mimic/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, autoreconfHook, fetchFromGitHub, pkgconfig +{ config, lib, stdenv, autoreconfHook, fetchFromGitHub, pkg-config , alsaLib, libtool, icu , pulseaudioSupport ? config.pulseaudio or false, libpulseaudio }: @@ -15,20 +15,20 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config ]; buildInputs = [ alsaLib libtool icu - ] ++ stdenv.lib.optional pulseaudioSupport libpulseaudio; + ] ++ lib.optional pulseaudioSupport libpulseaudio; meta = { description = "Mycroft's TTS engine, based on CMU's Flite (Festival Lite)"; homepage = "https://mimic.mycroft.ai/"; - license = stdenv.lib.licenses.free; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.noneucat ]; + license = lib.licenses.free; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.noneucat ]; }; } diff --git a/pkgs/applications/audio/mimms/default.nix b/pkgs/applications/audio/mimms/default.nix index 47e9fa306dc..9811998c368 100644 --- a/pkgs/applications/audio/mimms/default.nix +++ b/pkgs/applications/audio/mimms/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pythonPackages, libmms }: +{ fetchurl, lib, pythonPackages, libmms }: pythonPackages.buildPythonApplication rec { pname = "mimms"; @@ -16,7 +16,7 @@ pythonPackages.buildPythonApplication rec { meta = { homepage = "https://savannah.nongnu.org/projects/mimms/"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; description = "An mms (e.g. mms://) stream downloader"; longDescription = '' diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix index ef0db55f090..7af4b585adf 100644 --- a/pkgs/applications/audio/mixxx/default.nix +++ b/pkgs/applications/audio/mixxx/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, mkDerivation, fetchurl, fetchFromGitHub, chromaprint +{ lib, mkDerivation, fetchurl, fetchFromGitHub, chromaprint , fftw, flac, faad2, glibcLocales, mp4v2 , libid3tag, libmad, libopus, libshout, libsndfile, libusb1, libvorbis , libGLU, libxcb, lilv, lv2, opusfile -, pkgconfig, portaudio, portmidi, protobuf, qtbase, qtscript, qtsvg +, pkg-config, portaudio, portmidi, protobuf, qtbase, qtscript, qtsvg , qtx11extras, rubberband, sconsPackages, sqlite, taglib, upower, vamp-plugin-sdk }: @@ -31,7 +31,7 @@ mkDerivation rec { nativeBuildInputs = [ sconsPackages.scons_3_1_2 ]; buildInputs = [ chromaprint fftw flac faad2 glibcLocales mp4v2 libid3tag libmad libopus libshout241 libsndfile - libusb1 libvorbis libxcb libGLU lilv lv2 opusfile pkgconfig portaudio portmidi protobuf qtbase qtscript qtsvg + libusb1 libvorbis libxcb libGLU lilv lv2 opusfile pkg-config portaudio portmidi protobuf qtbase qtscript qtsvg qtx11extras rubberband sqlite taglib upower vamp-plugin-sdk ]; diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix index 96a4ab9fdaa..51d197fb0e0 100644 --- a/pkgs/applications/audio/moc/default.nix +++ b/pkgs/applications/audio/moc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , ncurses, db , popt, libtool # Sound sub-systems , alsaSupport ? true, alsaLib @@ -25,7 +25,7 @@ }: let - opt = stdenv.lib.optional; + opt = lib.optional; mkFlag = c: f: if c then "--with-${f}" else "--without-${f}"; in stdenv.mkDerivation rec { @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { ++ opt withffmpeg4 ./moc-ffmpeg4.patch ++ opt pulseSupport ./pulseaudio.patch; - nativeBuildInputs = [ pkgconfig ] + nativeBuildInputs = [ pkg-config ] ++ opt pulseSupport autoreconfHook; buildInputs = [ ncurses db popt libtool ] @@ -57,7 +57,7 @@ in stdenv.mkDerivation rec { ++ opt midiSupport timidity ++ opt modplugSupport libmodplug ++ opt mp3Support libmad - ++ stdenv.lib.optionals musepackSupport [ libmpc libmpcdec taglib ] + ++ lib.optionals musepackSupport [ libmpc libmpcdec taglib ] ++ opt vorbisSupport libvorbis ++ opt speexSupport speex ++ opt (ffmpegSupport && !withffmpeg4) ffmpeg_3 diff --git a/pkgs/applications/audio/mooSpace/default.nix b/pkgs/applications/audio/mooSpace/default.nix index f6958c5e974..b7d7502d25a 100644 --- a/pkgs/applications/audio/mooSpace/default.nix +++ b/pkgs/applications/audio/mooSpace/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: +{ lib, stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { pname = "mooSpace"; version = "unstable-2020-06-10"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Variable reverb audio effect, jack and lv2"; homepage = "https://github.com/modularev/mooSpace"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.magnetophon ]; }; } diff --git a/pkgs/applications/audio/mopidy/gmusic.nix b/pkgs/applications/audio/mopidy/gmusic.nix index 54af3bc68f1..6e76d6af87d 100644 --- a/pkgs/applications/audio/mopidy/gmusic.nix +++ b/pkgs/applications/audio/mopidy/gmusic.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, mopidy }: +{ lib, python3Packages, mopidy }: python3Packages.buildPythonApplication rec { pname = "mopidy-gmusic"; diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index 05827b0bb56..c2171d4cecc 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, mopidy }: +{ lib, python3Packages, mopidy }: python3Packages.buildPythonApplication rec { pname = "Mopidy-Iris"; diff --git a/pkgs/applications/audio/mopidy/moped.nix b/pkgs/applications/audio/mopidy/moped.nix index 8daaef7d45d..c191eba4c4d 100644 --- a/pkgs/applications/audio/mopidy/moped.nix +++ b/pkgs/applications/audio/mopidy/moped.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pythonPackages, mopidy, glibcLocales }: +{ lib, pythonPackages, mopidy, glibcLocales }: pythonPackages.buildPythonApplication rec { pname = "Mopidy-Moped"; diff --git a/pkgs/applications/audio/mopidy/mopidy.nix b/pkgs/applications/audio/mopidy/mopidy.nix index 55b7646af07..63a28eb0f58 100644 --- a/pkgs/applications/audio/mopidy/mopidy.nix +++ b/pkgs/applications/audio/mopidy/mopidy.nix @@ -32,7 +32,7 @@ pythonPackages.buildPythonApplication rec { requests setuptools tornado - ] ++ stdenv.lib.optional (!stdenv.isDarwin) dbus-python + ] ++ lib.optional (!stdenv.isDarwin) dbus-python ); # There are no tests diff --git a/pkgs/applications/audio/mopidy/mopify.nix b/pkgs/applications/audio/mopidy/mopify.nix index 17e68c16539..670b1a9c509 100644 --- a/pkgs/applications/audio/mopidy/mopify.nix +++ b/pkgs/applications/audio/mopidy/mopify.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pythonPackages, mopidy }: +{ lib, pythonPackages, mopidy }: pythonPackages.buildPythonApplication rec { pname = "Mopidy-Mopify"; diff --git a/pkgs/applications/audio/mopidy/mpd.nix b/pkgs/applications/audio/mopidy/mpd.nix index 8d6d7a1528b..d686d492898 100644 --- a/pkgs/applications/audio/mopidy/mpd.nix +++ b/pkgs/applications/audio/mopidy/mpd.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, mopidy }: +{ lib, python3Packages, mopidy }: python3Packages.buildPythonApplication rec { pname = "Mopidy-MPD"; diff --git a/pkgs/applications/audio/mopidy/mpris.nix b/pkgs/applications/audio/mopidy/mpris.nix index 868dbaf3035..6327ba020bf 100644 --- a/pkgs/applications/audio/mopidy/mpris.nix +++ b/pkgs/applications/audio/mopidy/mpris.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, mopidy }: +{ lib, python3Packages, mopidy }: python3Packages.buildPythonApplication rec { pname = "mopidy-mpris"; diff --git a/pkgs/applications/audio/mopidy/scrobbler.nix b/pkgs/applications/audio/mopidy/scrobbler.nix index be38c6a7040..621ced53646 100644 --- a/pkgs/applications/audio/mopidy/scrobbler.nix +++ b/pkgs/applications/audio/mopidy/scrobbler.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, mopidy }: +{ lib, python3Packages, mopidy }: python3Packages.buildPythonApplication rec { pname = "Mopidy-Scrobbler"; diff --git a/pkgs/applications/audio/mopidy/somafm.nix b/pkgs/applications/audio/mopidy/somafm.nix index afa46726db7..81c689a343d 100644 --- a/pkgs/applications/audio/mopidy/somafm.nix +++ b/pkgs/applications/audio/mopidy/somafm.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, mopidy }: +{ lib, python3Packages, mopidy }: python3Packages.buildPythonApplication rec { pname = "mopidy-somafm"; @@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec { doCheck = false; meta = with lib; { - homepage = https://www.mopidy.com/; + homepage = "https://www.mopidy.com/"; description = "Mopidy extension for playing music from SomaFM"; license = licenses.mit; maintainers = [ maintainers.nickhu ]; diff --git a/pkgs/applications/audio/mopidy/soundcloud.nix b/pkgs/applications/audio/mopidy/soundcloud.nix index bdc3523652c..d8a244b5146 100644 --- a/pkgs/applications/audio/mopidy/soundcloud.nix +++ b/pkgs/applications/audio/mopidy/soundcloud.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pythonPackages, mopidy }: +{ lib, fetchFromGitHub, pythonPackages, mopidy }: pythonPackages.buildPythonApplication rec { pname = "mopidy-soundcloud"; diff --git a/pkgs/applications/audio/mopidy/spotify-tunigo.nix b/pkgs/applications/audio/mopidy/spotify-tunigo.nix index 8fafab0970f..70d076190cd 100644 --- a/pkgs/applications/audio/mopidy/spotify-tunigo.nix +++ b/pkgs/applications/audio/mopidy/spotify-tunigo.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pythonPackages, mopidy, mopidy-spotify }: +{ lib, fetchFromGitHub, pythonPackages, mopidy, mopidy-spotify }: pythonPackages.buildPythonApplication rec { pname = "mopidy-spotify-tunigo"; diff --git a/pkgs/applications/audio/mopidy/spotify.nix b/pkgs/applications/audio/mopidy/spotify.nix index 57ba6ea1f61..e44b9f35daa 100644 --- a/pkgs/applications/audio/mopidy/spotify.nix +++ b/pkgs/applications/audio/mopidy/spotify.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pythonPackages, mopidy }: +{ lib, fetchurl, pythonPackages, mopidy }: pythonPackages.buildPythonApplication rec { pname = "mopidy-spotify"; diff --git a/pkgs/applications/audio/mopidy/tunein.nix b/pkgs/applications/audio/mopidy/tunein.nix index 776b4a0afb5..4a3edd2a434 100644 --- a/pkgs/applications/audio/mopidy/tunein.nix +++ b/pkgs/applications/audio/mopidy/tunein.nix @@ -1,13 +1,13 @@ -{ lib, stdenv, python3Packages, mopidy }: +{ lib, python3Packages, mopidy }: python3Packages.buildPythonApplication rec { pname = "mopidy-tunein"; - version = "1.0.2"; + version = "1.1.0"; src = python3Packages.fetchPypi { inherit version; pname = "Mopidy-TuneIn"; - sha256 = "1mvfhka8wi835yk9869yn3b6mdkfwqkylp14vpjkbm42d0kj4lkc"; + sha256 = "01y1asylscr73yqx071imhrzfzlg07wmqqzkdvpgm6r35marc2li"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/audio/mopidy/youtube.nix b/pkgs/applications/audio/mopidy/youtube.nix index e35338a5f0d..b84a756c2ce 100644 --- a/pkgs/applications/audio/mopidy/youtube.nix +++ b/pkgs/applications/audio/mopidy/youtube.nix @@ -1,13 +1,13 @@ -{ lib, stdenv, python3Packages, mopidy }: +{ lib, python3Packages, mopidy }: python3Packages.buildPythonApplication rec { pname = "mopidy-youtube"; - version = "3.1"; + version = "3.2"; src = python3Packages.fetchPypi { inherit version; pname = "Mopidy-YouTube"; - sha256 = "1bn3nxianbal9f81z9wf2cxi893hndvrz2zdqvh1zpxrhs0cr038"; + sha256 = "0wmalfqnskglssq3gj6kkrq6h6c9yab503y72afhkm7n9r5c57zz"; }; patchPhase = "sed s/bs4/beautifulsoup4/ -i setup.cfg"; diff --git a/pkgs/applications/audio/mp3blaster/default.nix b/pkgs/applications/audio/mp3blaster/default.nix index d7795524529..d7dd5f102db 100644 --- a/pkgs/applications/audio/mp3blaster/default.nix +++ b/pkgs/applications/audio/mp3blaster/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses libvorbis - ] ++ stdenv.lib.optional stdenv.isDarwin SDL; + ] ++ lib.optional stdenv.isDarwin SDL; NIX_CFLAGS_COMPILE = toString ([ "-Wno-narrowing" - ] ++ stdenv.lib.optionals stdenv.cc.isClang [ + ] ++ lib.optionals stdenv.cc.isClang [ "-Wno-reserved-user-defined-literal" ]); diff --git a/pkgs/applications/audio/mp3info/default.nix b/pkgs/applications/audio/mp3info/default.nix index 69ca271d27d..d67b4da5eb2 100644 --- a/pkgs/applications/audio/mp3info/default.nix +++ b/pkgs/applications/audio/mp3info/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, ncurses, pkgconfig, gtk2 }: +{ fetchurl, lib, stdenv, ncurses, pkg-config, gtk2 }: stdenv.mkDerivation rec { name = "mp3info-0.8.5a"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "042f1czcs9n2sbqvg4rsvfwlqib2gk976mfa2kxlfjghx5laqf04"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses gtk2 ]; hardeningDisable = [ "format" ]; @@ -37,9 +37,9 @@ stdenv.mkDerivation rec { homepage = "http://www.ibiblio.org/mp3info/"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/mp3splt/default.nix b/pkgs/applications/audio/mp3splt/default.nix index 2ff147fa919..1407c153aed 100644 --- a/pkgs/applications/audio/mp3splt/default.nix +++ b/pkgs/applications/audio/mp3splt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libmp3splt }: +{ lib, stdenv, fetchurl, pkg-config, libmp3splt }: stdenv.mkDerivation rec { pname = "mp3splt"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; configureFlags = [ "--enable-oggsplt-symlink" "--enable-flacsplt-symlink" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libmp3splt ]; outputs = [ "out" "man" ]; diff --git a/pkgs/applications/audio/mp3val/default.nix b/pkgs/applications/audio/mp3val/default.nix index 636fb7d9b9a..dc1a3085831 100644 --- a/pkgs/applications/audio/mp3val/default.nix +++ b/pkgs/applications/audio/mp3val/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "mp3val"; @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { common types of tags (ID3v1, ID3v2, APEv2). ''; homepage = "http://mp3val.sourceforge.net/index.shtml"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.devhell ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.devhell ]; }; } diff --git a/pkgs/applications/audio/mpc/default.nix b/pkgs/applications/audio/mpc/default.nix index a00ac7868b3..c1b88e47e87 100644 --- a/pkgs/applications/audio/mpc/default.nix +++ b/pkgs/applications/audio/mpc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig, mpd_clientlib, sphinx, libiconv }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, mpd_clientlib, sphinx, libiconv }: stdenv.mkDerivation rec { pname = "mpc"; @@ -11,9 +11,9 @@ stdenv.mkDerivation rec { sha256 = "1qbi0i9cq54rj8z2kapk8x8g1jkw2jz781niwb9i7kw4xfhvy5zx"; }; - buildInputs = [ mpd_clientlib ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = [ mpd_clientlib ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; - nativeBuildInputs = [ meson ninja pkgconfig sphinx ]; + nativeBuildInputs = [ meson ninja pkg-config sphinx ]; meta = with lib; { description = "A minimalist command line interface to MPD"; diff --git a/pkgs/applications/audio/mpc123/default.nix b/pkgs/applications/audio/mpc123/default.nix index ef5cb169a2c..7ce8af1de23 100644 --- a/pkgs/applications/audio/mpc123/default.nix +++ b/pkgs/applications/audio/mpc123/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, gettext, libmpcdec, libao }: +{ fetchurl, lib, stdenv, gettext, libmpcdec, libao }: let version = "0.2.4"; in stdenv.mkDerivation rec { @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { description = "A Musepack (.mpc) audio player"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice + platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix index f3203566a13..0b46cffd19c 100644 --- a/pkgs/applications/audio/mpg123/default.nix +++ b/pkgs/applications/audio/mpg123/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , makeWrapper @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ perl ] ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib; + buildInputs = [ perl ] ++ lib.optional (!stdenv.isDarwin) alsaLib; - configureFlags = stdenv.lib.optional + configureFlags = lib.optional (stdenv.hostPlatform ? mpg123) "--with-cpu=${stdenv.hostPlatform.mpg123.cpu}"; @@ -41,8 +41,8 @@ stdenv.mkDerivation rec { meta = { description = "Fast console MPEG Audio Player and decoder library"; homepage = "http://mpg123.org"; - license = stdenv.lib.licenses.lgpl21; - maintainers = [ stdenv.lib.maintainers.ftrvxmtrx ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.lgpl21; + maintainers = [ lib.maintainers.ftrvxmtrx ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/audio/mpg321/default.nix b/pkgs/applications/audio/mpg321/default.nix index 1f98d31eb9c..0079947438c 100644 --- a/pkgs/applications/audio/mpg321/default.nix +++ b/pkgs/applications/audio/mpg321/default.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { configureFlags = [ ("--enable-alsa=" + (if stdenv.isLinux then "yes" else "no")) ] - ++ (stdenv.lib.optional (defaultAudio != null) + ++ (lib.optional (defaultAudio != null) "--with-default-audio=${defaultAudio}"); buildInputs = [libao libid3tag libmad zlib] - ++ stdenv.lib.optional stdenv.isLinux alsaLib; + ++ lib.optional stdenv.isLinux alsaLib; installTargets = [ "install" "install-man" ]; diff --git a/pkgs/applications/audio/munt/default.nix b/pkgs/applications/audio/munt/default.nix index 8d8ab419fdb..0efe034034a 100644 --- a/pkgs/applications/audio/munt/default.nix +++ b/pkgs/applications/audio/munt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, qtbase, alsaLib, makeDesktopItem, libjack2 }: +{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, alsaLib, makeDesktopItem, libjack2 }: let desktopItem = makeDesktopItem rec { @@ -15,7 +15,7 @@ in mkDerivation rec { src = fetchFromGitHub { owner = pname; repo = pname; - rev = with stdenv.lib.versions; "libmt32emu_${major version}_${minor version}_${patch version}"; + rev = with lib.versions; "libmt32emu_${major version}_${minor version}_${patch version}"; sha256 = "0bszhkbz24hhx32f973l6h5lkyn4lxhqrckiwmv765d1sba8n5bk"; }; diff --git a/pkgs/applications/audio/muse/default.nix b/pkgs/applications/audio/muse/default.nix index a583e45be2c..22d66b18ddd 100644 --- a/pkgs/applications/audio/muse/default.nix +++ b/pkgs/applications/audio/muse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, qttools, wrapQtAppsHook +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, qttools, wrapQtAppsHook , alsaLib, dssi, fluidsynth, ladspaH, lash, libinstpatch, libjack2, liblo , libsamplerate, libsndfile, lilv, lrdf, lv2, qtsvg, rtaudio, rubberband, sord }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { patches = [ ./fix-parallel-building.patch ]; - nativeBuildInputs = [ cmake pkgconfig qttools wrapQtAppsHook ]; + nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ]; buildInputs = [ alsaLib dssi fluidsynth ladspaH lash libinstpatch libjack2 liblo diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index fa05e45b668..47f8e5a22e6 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig +{ mkDerivation, lib, fetchFromGitHub, cmake, pkg-config , alsaLib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis , portaudio, portmidi, qtbase, qtdeclarative, qtgraphicaleffects , qtquickcontrols2, qtscript, qtsvg, qttools @@ -7,13 +7,13 @@ mkDerivation rec { pname = "musescore"; - version = "3.5.2"; + version = "3.6"; src = fetchFromGitHub { owner = "musescore"; repo = "MuseScore"; rev = "v${version}"; - sha256 = "VA0+npLUUXQJHalD01pmFTTum2Re7FiiyAwU1XvR93s="; + sha256 = "sha256-0M+idYnrgXyH6WLp+2jIYRnFzTB93v+dG1XHmSNyPjE="; }; patches = [ @@ -31,7 +31,7 @@ mkDerivation rec { "--set QML_DISABLE_DISK_CACHE 1" ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ alsaLib libjack2 freetype lame libogg libpulseaudio libsndfile libvorbis diff --git a/pkgs/applications/audio/musikcube/default.nix b/pkgs/applications/audio/musikcube/default.nix index fba80928b0d..7bcac454b78 100644 --- a/pkgs/applications/audio/musikcube/default.nix +++ b/pkgs/applications/audio/musikcube/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "musikcube"; - version = "0.96.2"; + version = "0.96.4"; src = fetchFromGitHub { owner = "clangen"; repo = pname; rev = version; - sha256 = "1vvc8295yadprfqpmk9i43ghymgsqxsg8zfx3p5i86a8xrdhd9vn"; + sha256 = "sha256-DYLLnmRHEK2nJUbJfJUDcA8qHZq+qZpHS5ei8qUGmFA="; }; nativeBuildInputs = [ @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ncurses pulseaudio taglib - ] ++ stdenv.lib.optional systemdSupport systemd; + ] ++ lib.optional systemdSupport systemd; cmakeFlags = [ "-DDISABLE_STRIP=true" diff --git a/pkgs/applications/audio/mympd/default.nix b/pkgs/applications/audio/mympd/default.nix index cc709822d9e..876677c3bea 100644 --- a/pkgs/applications/audio/mympd/default.nix +++ b/pkgs/applications/audio/mympd/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , pkg-config @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "mympd"; - version = "6.8.3"; + version = "6.10.0"; src = fetchFromGitHub { owner = "jcorporation"; repo = "myMPD"; rev = "v${version}"; - sha256 = "1a3jrqslxk2a9h5gj6kch108lg9z0i5zwr0j9yd5viyfhr3ka4cq"; + sha256 = "sha256-QGJti1tKKJlumLgABPmROplF0UVGMWMnyRXLb2cEieQ="; }; nativeBuildInputs = [ @@ -46,8 +46,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://jcorporation.github.io/mympd"; description = "A standalone and mobile friendly web mpd client with a tiny footprint and advanced features"; - maintainers = [ stdenv.lib.maintainers.doronbehar ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.doronbehar ]; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix index 2deff6162fb..4e30e32774d 100644 --- a/pkgs/applications/audio/ncmpc/default.nix +++ b/pkgs/applications/audio/ncmpc/default.nix @@ -1,27 +1,27 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig, glib, ncurses +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, glib, ncurses , mpd_clientlib, gettext, boost , pcreSupport ? false , pcre ? null }: -with stdenv.lib; +with lib; assert pcreSupport -> pcre != null; stdenv.mkDerivation rec { pname = "ncmpc"; - version = "0.42"; + version = "0.43"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "ncmpc"; rev = "v${version}"; - sha256 = "1c21sbdm6pp3kwhnzc7c6ksna7madvsmfa7j91as2g8485symqv2"; + sha256 = "sha256-/bynLU4/QtUawBjhcaajjuUDUwaSt6zk4/4TZqfQX3c="; }; buildInputs = [ glib ncurses mpd_clientlib boost ] ++ optional pcreSupport pcre; - nativeBuildInputs = [ meson ninja pkgconfig gettext ]; + nativeBuildInputs = [ meson ninja pkg-config gettext ]; mesonFlags = [ "-Dlirc=disabled" diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix index 33308ebc61a..f6560a7abcf 100644 --- a/pkgs/applications/audio/ncmpcpp/default.nix +++ b/pkgs/applications/audio/ncmpcpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, mpd_clientlib, ncurses, pkgconfig, readline +{ lib, stdenv, fetchurl, boost, mpd_clientlib, ncurses, pkg-config, readline , libiconv, icu, curl , outputsSupport ? true # outputs screen , visualizerSupport ? false, fftw ? null # visualizer screen @@ -9,14 +9,14 @@ assert visualizerSupport -> (fftw != null); assert taglibSupport -> (taglib != null); -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "ncmpcpp"; - version = "0.9.1"; + version = "0.9.2"; src = fetchurl { url = "https://rybczak.net/ncmpcpp/stable/${pname}-${version}.tar.bz2"; - sha256 = "0x35nd4v31sma8fliqdbn1nxpjyi8hv472318sfb3xbmr4wlm0fb"; + sha256 = "sha256-+qv2FXyMsbJKBZryduFi+p+aO5zTgQxDuRKIYMk4Ohs="; }; configureFlags = [ "BOOST_LIB_SUFFIX=" ] @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ++ optional clockSupport "--enable-clock" ++ optional taglibSupport "--with-taglib"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ boost mpd_clientlib ncurses readline libiconv icu curl ] ++ optional visualizerSupport fftw diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix index a1019880318..9cc96bd03a7 100644 --- a/pkgs/applications/audio/ncspot/default.nix +++ b/pkgs/applications/audio/ncspot/default.nix @@ -14,16 +14,16 @@ let in rustPlatform.buildRustPackage rec { pname = "ncspot"; - version = "0.2.6"; + version = "0.3.0"; src = fetchFromGitHub { owner = "hrkfdn"; repo = "ncspot"; rev = "v${version}"; - sha256 = "0x40qzgw9zcih4q6mzclb7gqkw8h76hrmqzmg6nimpla29jcdxss"; + sha256 = "1dfq6ickx24cq8zhhm0a8x5ycd0iygw065qd2blcgl0fim350zw9"; }; - cargoSha256 = "1pfl7cblf7d4ci514vlkdh1ybgby71x4aszxmlsrqmn92bq56jys"; + cargoSha256 = "0z4af575rx6ggjxsw1q18kwsb4cvyy1kzfkp32v9n74krmy0fk8p"; cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ]; diff --git a/pkgs/applications/audio/new-session-manager/default.nix b/pkgs/applications/audio/new-session-manager/default.nix index 8d359b29201..0badb85f02c 100644 --- a/pkgs/applications/audio/new-session-manager/default.nix +++ b/pkgs/applications/audio/new-session-manager/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "new-session-manager"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "linuxaudio"; repo = "new-session-manager"; rev = "v${version}"; - sha256 = "PqOv4tx3NLxL2+GWIUVgL72EQYMyDPIMrAkyby3TZ+0="; + sha256 = "sha256-YP5AHoFP8P1o0Y2jAipRcNPxPRuM7COs5tBMm6Eojoc="; }; nativeBuildInputs = [ meson pkg-config ninja ]; diff --git a/pkgs/applications/audio/ninjas2/default.nix b/pkgs/applications/audio/ninjas2/default.nix index 5af483ecfe3..8fa5bed3066 100644 --- a/pkgs/applications/audio/ninjas2/default.nix +++ b/pkgs/applications/audio/ninjas2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libjack2, libGL, pkgconfig, xorg, mesa, libsndfile, libsamplerate }: +{ lib, stdenv, fetchFromGitHub, libjack2, libGL, pkg-config, xorg, mesa, libsndfile, libsamplerate }: stdenv.mkDerivation rec { pname = "ninjas2"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { patchShebangs dpf/utils/generate-ttl.sh ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libjack2 xorg.libX11 libGL mesa libsndfile libsamplerate ]; diff --git a/pkgs/applications/audio/noise-repellent/default.nix b/pkgs/applications/audio/noise-repellent/default.nix index 88281cd0989..7aaa8ddd843 100644 --- a/pkgs/applications/audio/noise-repellent/default.nix +++ b/pkgs/applications/audio/noise-repellent/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig, fftwFloat, lv2 }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, fftwFloat, lv2 }: stdenv.mkDerivation rec { pname = "noise-repellent"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { mesonFlags = ("--prefix=${placeholder "out"}/lib/lv2"); - nativeBuildInputs = [ meson ninja pkgconfig ]; + nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ fftwFloat lv2 ]; diff --git a/pkgs/applications/audio/noisetorch/default.nix b/pkgs/applications/audio/noisetorch/default.nix index bb22b3cec22..fea6e097de7 100644 --- a/pkgs/applications/audio/noisetorch/default.nix +++ b/pkgs/applications/audio/noisetorch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, rnnoise-plugin }: +{ lib, buildGoModule, fetchFromGitHub, rnnoise-plugin }: buildGoModule rec { pname = "NoiseTorch"; diff --git a/pkgs/applications/audio/non/default.nix b/pkgs/applications/audio/non/default.nix index 9b4b147c230..9dd377a601b 100644 --- a/pkgs/applications/audio/non/default.nix +++ b/pkgs/applications/audio/non/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, python2, cairo, libjpeg, ntk, libjack2 +{ lib, stdenv, fetchFromGitHub, pkg-config, python2, cairo, libjpeg, ntk, libjack2 , libsndfile, ladspaH, liblo, libsigcxx, lrdf, wafHook }: @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "1cljkkyi9dxqpqhx8y6l2ja4zjmlya26m26kqxml8gx08vyvddhx"; }; - nativeBuildInputs = [ pkgconfig wafHook ]; + nativeBuildInputs = [ pkg-config wafHook ]; buildInputs = [ python2 cairo libjpeg ntk libjack2 libsndfile ladspaH liblo libsigcxx lrdf ]; @@ -20,8 +20,8 @@ stdenv.mkDerivation { meta = { description = "Lightweight and lightning fast modular Digital Audio Workstation"; homepage = "http://non.tuxfamily.org"; - license = stdenv.lib.licenses.lgpl21; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.nico202 ]; + license = lib.licenses.lgpl21; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.nico202 ]; }; } diff --git a/pkgs/applications/audio/nootka/default.nix b/pkgs/applications/audio/nootka/default.nix index b1b60540b8c..11424c0be18 100644 --- a/pkgs/applications/audio/nootka/default.nix +++ b/pkgs/applications/audio/nootka/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { "-DENABLE_PULSEAUDIO=ON" ]; + dontWrapQtApps = true; + meta = with lib; { description = "Application for practicing playing musical scores and ear training"; homepage = "https://nootka.sourceforge.io/"; diff --git a/pkgs/applications/audio/nootka/unstable.nix b/pkgs/applications/audio/nootka/unstable.nix index 1fb70c195dc..aa49daaa1e7 100644 --- a/pkgs/applications/audio/nootka/unstable.nix +++ b/pkgs/applications/audio/nootka/unstable.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { qtbase qtdeclarative qtquickcontrols2 ]; + dontWrapQtApps = true; + cmakeFlags = [ "-DCMAKE_INCLUDE_PATH=${libjack2}/include/jack;${libpulseaudio.dev}/include/pulse" "-DENABLE_JACK=ON" diff --git a/pkgs/applications/audio/nova-filters/default.nix b/pkgs/applications/audio/nova-filters/default.nix index ed5ec361714..cae9353d2de 100644 --- a/pkgs/applications/audio/nova-filters/default.nix +++ b/pkgs/applications/audio/nova-filters/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, sconsPackages, boost, ladspaH, pkgconfig }: +{lib, stdenv, fetchurl, sconsPackages, boost, ladspaH, pkg-config }: stdenv.mkDerivation { version = "0.2-2"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "16064vvl2w5lz4xi3lyjk4xx7fphwsxc14ajykvndiz170q32s6i"; }; - nativeBuildInputs = [ pkgconfig sconsPackages.scons_3_0_1 ]; + nativeBuildInputs = [ pkg-config sconsPackages.scons_3_0_1 ]; buildInputs = [ boost ladspaH ]; patchPhase = '' diff --git a/pkgs/applications/audio/ocenaudio/default.nix b/pkgs/applications/audio/ocenaudio/default.nix index c3ab0ffcebd..2fd1aeccd7a 100644 --- a/pkgs/applications/audio/ocenaudio/default.nix +++ b/pkgs/applications/audio/ocenaudio/default.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { dontUnpack = true; dontBuild = true; dontStrip = true; + dontWrapQtApps = true; installPhase = '' mkdir -p $out diff --git a/pkgs/applications/audio/openmpt123/default.nix b/pkgs/applications/audio/openmpt123/default.nix index 486a9827511..5a610284c21 100644 --- a/pkgs/applications/audio/openmpt123/default.nix +++ b/pkgs/applications/audio/openmpt123/default.nix @@ -1,4 +1,4 @@ -{ config, lib, stdenv, fetchurl, zlib, pkgconfig, mpg123, libogg, libvorbis, portaudio, libsndfile, flac +{ config, lib, stdenv, fetchurl, zlib, pkg-config, mpg123, libogg, libvorbis, portaudio, libsndfile, flac , usePulseAudio ? config.pulseaudio or false, libpulseaudio }: let @@ -15,11 +15,11 @@ in stdenv.mkDerivation { enableParallelBuilding = true; doCheck = true; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib mpg123 libogg libvorbis portaudio libsndfile flac ] - ++ stdenv.lib.optional usePulseAudio libpulseaudio; + ++ lib.optional usePulseAudio libpulseaudio; - configureFlags = stdenv.lib.optional (!usePulseAudio) "--without-pulseaudio"; + configureFlags = lib.optional (!usePulseAudio) "--without-pulseaudio"; meta = with lib; { description = "A cross-platform command-line based module file player"; diff --git a/pkgs/applications/audio/opus-tools/default.nix b/pkgs/applications/audio/opus-tools/default.nix index b8253b078be..8ca75eecde1 100644 --- a/pkgs/applications/audio/opus-tools/default.nix +++ b/pkgs/applications/audio/opus-tools/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libogg, libao, pkgconfig, flac, opusfile, libopusenc}: +{lib, stdenv, fetchurl, libogg, libao, pkg-config, flac, opusfile, libopusenc}: stdenv.mkDerivation rec { name = "opus-tools-0.2"; @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { sha256 = "11pzl27s4vcz4m18ch72nivbhww2zmzn56wspb7rll1y1nq6rrdl"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libogg libao flac opusfile libopusenc ]; meta = { description = "Tools to work with opus encoded audio streams"; homepage = "https://www.opus-codec.org/"; - license = stdenv.lib.licenses.bsd2; - maintainers = with stdenv.lib.maintainers; [ ]; - platforms = with stdenv.lib.platforms; unix; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ ]; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/applications/audio/opusfile/default.nix b/pkgs/applications/audio/opusfile/default.nix index 34813c05e5b..e4f7e6ca6b4 100644 --- a/pkgs/applications/audio/opusfile/default.nix +++ b/pkgs/applications/audio/opusfile/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, openssl, libogg, libopus }: +{ lib, stdenv, fetchurl, pkg-config, openssl, libogg, libopus }: stdenv.mkDerivation rec { name = "opusfile-0.12"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { sha256 = "02smwc5ah8nb3a67mnkjzqmrzk43j356hgj2a97s9midq40qd38i"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl libogg ]; propagatedBuildInputs = [ libopus ]; patches = [ ./include-multistream.patch ]; diff --git a/pkgs/applications/audio/padthv1/default.nix b/pkgs/applications/audio/padthv1/default.nix index 4db337917ed..f238a687609 100644 --- a/pkgs/applications/audio/padthv1/default.nix +++ b/pkgs/applications/audio/padthv1/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libjack2, alsaLib, libsndfile, liblo, lv2, qt5, fftwFloat, mkDerivation }: +{ lib, fetchurl, pkg-config, libjack2, alsaLib, libsndfile, liblo, lv2, qt5, fftwFloat, mkDerivation }: mkDerivation rec { pname = "padthv1"; @@ -11,7 +11,7 @@ mkDerivation rec { buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftwFloat ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = with lib; { description = "polyphonic additive synthesizer"; diff --git a/pkgs/applications/audio/pamix/default.nix b/pkgs/applications/audio/pamix/default.nix index deb8bec28c2..fb076797fb5 100644 --- a/pkgs/applications/audio/pamix/default.nix +++ b/pkgs/applications/audio/pamix/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, pkgconfig, cmake +, pkg-config, cmake , libpulseaudio, ncurses }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { substituteInPlace CMakeLists.txt --replace "/etc" "$out/etc/xdg" ''; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libpulseaudio ncurses ]; meta = with lib; { diff --git a/pkgs/applications/audio/paprefs/default.nix b/pkgs/applications/audio/paprefs/default.nix index f2ac17f1556..64e403001a3 100644 --- a/pkgs/applications/audio/paprefs/default.nix +++ b/pkgs/applications/audio/paprefs/default.nix @@ -3,7 +3,7 @@ , meson , ninja , gettext -, pkgconfig +, pkg-config , pulseaudioFull , glibmm , gtkmm3 @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meson ninja gettext - pkgconfig + pkg-config wrapGAppsHook ]; diff --git a/pkgs/applications/audio/parlatype/default.nix b/pkgs/applications/audio/parlatype/default.nix index 7ca0d347fea..acffe9464fa 100644 --- a/pkgs/applications/audio/parlatype/default.nix +++ b/pkgs/applications/audio/parlatype/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, meson, gtk3, at-spi2-core, dbus, gst_all_1, sphinxbase, pocketsphinx, ninja, gettext, appstream-glib, python3, glib, gobject-introspection, gsettings-desktop-schemas, itstool, wrapGAppsHook, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, pkg-config, meson, gtk3, at-spi2-core, dbus, gst_all_1, sphinxbase, pocketsphinx, ninja, gettext, appstream-glib, python3, glib, gobject-introspection, gsettings-desktop-schemas, itstool, wrapGAppsHook, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "parlatype"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config meson ninja gettext diff --git a/pkgs/applications/audio/patchage/default.nix b/pkgs/applications/audio/patchage/default.nix index ac679d6dd94..573b2262e73 100644 --- a/pkgs/applications/audio/patchage/default.nix +++ b/pkgs/applications/audio/patchage/default.nix @@ -1,5 +1,5 @@ -{ stdenv, alsaLib, boost, dbus-glib, fetchsvn, ganv, glibmm -, gtkmm2, libjack2, pkgconfig, python2, wafHook +{ lib, stdenv, alsaLib, boost, dbus-glib, fetchsvn, ganv, glibmm +, gtkmm2, libjack2, pkg-config, python2, wafHook }: stdenv.mkDerivation { @@ -13,14 +13,14 @@ stdenv.mkDerivation { buildInputs = [ alsaLib boost dbus-glib ganv glibmm gtkmm2 libjack2 - pkgconfig python2 wafHook + pkg-config python2 wafHook ]; meta = { description = "Modular patch bay for Jack and ALSA systems"; homepage = "http://non.tuxfamily.org"; - license = stdenv.lib.licenses.lgpl3; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.nico202 ]; + license = lib.licenses.lgpl3; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.nico202 ]; }; } diff --git a/pkgs/applications/audio/paulstretch/default.nix b/pkgs/applications/audio/paulstretch/default.nix index f56ad4f5930..1d701004622 100644 --- a/pkgs/applications/audio/paulstretch/default.nix +++ b/pkgs/applications/audio/paulstretch/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, fetchpatch , audiofile, libvorbis, fltk, fftw, fftwFloat -, minixml, pkgconfig, libmad, libjack2, portaudio, libsamplerate +, minixml, pkg-config, libmad, libjack2, portaudio, libsamplerate }: stdenv.mkDerivation { @@ -14,7 +14,7 @@ stdenv.mkDerivation { sha256 = "06dy03dbz1yznhsn0xvsnkpc5drzwrgxbxdx0hfpsjn2xcg0jrnc"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ audiofile diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index ffc56e54586..31d9292675e 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, lib, stdenv, pkgconfig, intltool, libpulseaudio, +{ fetchurl, fetchpatch, lib, stdenv, pkg-config, intltool, libpulseaudio, gtkmm3 , libcanberra-gtk3, gnome3, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ libpulseaudio gtkmm3 libcanberra-gtk3 gnome3.adwaita-icon-theme ]; - nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config intltool wrapGAppsHook ]; configureFlags = [ "--disable-lynx" ]; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { homepage = "http://freedesktop.org/software/pulseaudio/pavucontrol/"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; maintainers = with maintainers; [ abbradar globin ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/pd-plugins/cyclone/default.nix b/pkgs/applications/audio/pd-plugins/cyclone/default.nix index 56f1ec518de..03df731aef5 100644 --- a/pkgs/applications/audio/pd-plugins/cyclone/default.nix +++ b/pkgs/applications/audio/pd-plugins/cyclone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, puredata }: +{ lib, stdenv, fetchFromGitHub, puredata }: stdenv.mkDerivation rec { pname = "cyclone"; @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { meta = { description = "A library of PureData classes, bringing some level of compatibility between Max/MSP and Pd environments"; homepage = "http://puredata.info/downloads/cyclone"; - license = stdenv.lib.licenses.tcltk; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.tcltk; + maintainers = [ lib.maintainers.magnetophon ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/pd-plugins/gem/default.nix b/pkgs/applications/audio/pd-plugins/gem/default.nix index a44ba689a61..aeb58911623 100644 --- a/pkgs/applications/audio/pd-plugins/gem/default.nix +++ b/pkgs/applications/audio/pd-plugins/gem/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch , autoreconfHook @@ -43,8 +43,8 @@ stdenv.mkDerivation rec { meta = { description = "Graphics Environment for Multimedia"; homepage = "http://puredata.info/downloads/gem"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.raboof ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.raboof ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix index be5a385d308..9b50b40a5bb 100644 --- a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix +++ b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, puredata }: +{ lib, stdenv, fetchurl, unzip, puredata }: stdenv.mkDerivation { name = "helmholtz"; @@ -39,8 +39,8 @@ stdenv.mkDerivation { meta = { description = "Time domain pitch tracker for Pure Data"; homepage = "http://www.katjaas.nl/helmholtz/helmholtz.html"; - license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.magnetophon ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/pd-plugins/maxlib/default.nix b/pkgs/applications/audio/pd-plugins/maxlib/default.nix index aec793c4ee8..1fc3475bc6a 100644 --- a/pkgs/applications/audio/pd-plugins/maxlib/default.nix +++ b/pkgs/applications/audio/pd-plugins/maxlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, puredata }: +{ lib, stdenv, fetchFromGitHub, puredata }: stdenv.mkDerivation rec { pname = "maxlib"; @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { meta = { description = "A library of non-tilde externals for puredata, by Miller Puckette"; homepage = "http://puredata.info/downloads/maxlib"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.magnetophon ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/pd-plugins/mrpeach/default.nix b/pkgs/applications/audio/pd-plugins/mrpeach/default.nix index cefee430ad5..71f5e9438e1 100644 --- a/pkgs/applications/audio/pd-plugins/mrpeach/default.nix +++ b/pkgs/applications/audio/pd-plugins/mrpeach/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, puredata }: +{ lib, stdenv, fetchurl, puredata }: stdenv.mkDerivation { pname = "mrpeach"; @@ -55,8 +55,8 @@ stdenv.mkDerivation { meta = { description = "A collection of Pd objectclasses for OSC-messages"; homepage = "http://puredata.info/downloads/osc"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.magnetophon ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/pd-plugins/puremapping/default.nix b/pkgs/applications/audio/pd-plugins/puremapping/default.nix index 7a5014664d5..1eb6eb38931 100644 --- a/pkgs/applications/audio/pd-plugins/puremapping/default.nix +++ b/pkgs/applications/audio/pd-plugins/puremapping/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, puredata }: +{ lib, stdenv, fetchurl, unzip, puredata }: stdenv.mkDerivation rec { pname = "puremapping"; @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { meta = { description = "Set of externals to facilitate the use of sensors within Pure Data and to create complex relations between input and output of a dynamic system"; homepage = "http://www.chnry.net/ch/?090-Pure-Mapping&lang=en"; - license = stdenv.lib.licenses.gpl1; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl1; + maintainers = [ lib.maintainers.magnetophon ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/pd-plugins/timbreid/default.nix b/pkgs/applications/audio/pd-plugins/timbreid/default.nix index e68610a0226..e5e67ec44dd 100644 --- a/pkgs/applications/audio/pd-plugins/timbreid/default.nix +++ b/pkgs/applications/audio/pd-plugins/timbreid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, puredata, fftw }: +{ lib, stdenv, fetchurl, unzip, puredata, fftw }: stdenv.mkDerivation rec { version = "0.7.0"; @@ -38,8 +38,8 @@ stdenv.mkDerivation rec { meta = { description = "A collection of audio feature analysis externals for puredata"; homepage = "http://williambrent.conflations.com/pages/research.html"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.magnetophon ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/pd-plugins/zexy/default.nix b/pkgs/applications/audio/pd-plugins/zexy/default.nix index 4f826908136..67c7cd18be8 100644 --- a/pkgs/applications/audio/pd-plugins/zexy/default.nix +++ b/pkgs/applications/audio/pd-plugins/zexy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake, puredata }: +{ lib, stdenv, fetchurl, autoconf, automake, puredata }: stdenv.mkDerivation rec { pname = "zexy"; @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { meta = { description = "The swiss army knife for puredata"; homepage = "http://puredata.info/downloads/zexy"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.magnetophon ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/pianobar/default.nix b/pkgs/applications/audio/pianobar/default.nix index b53c088b7af..0abc933d628 100644 --- a/pkgs/applications/audio/pianobar/default.nix +++ b/pkgs/applications/audio/pianobar/default.nix @@ -1,14 +1,14 @@ -{ fetchurl, lib, stdenv, pkgconfig, libao, json_c, libgcrypt, ffmpeg_3, curl }: +{ fetchurl, lib, stdenv, pkg-config, libao, json_c, libgcrypt, ffmpeg_3, curl }: stdenv.mkDerivation rec { - name = "pianobar-2020.04.05"; + name = "pianobar-2020.11.28"; src = fetchurl { url = "http://6xq.net/projects/pianobar/${name}.tar.bz2"; - sha256 = "1034f9ilj9xjw12d6n4vadhl5jzrx0jv8gq1w0rg9hfc55mkn5vc"; + sha256 = "1znlwybfpxsjqr1jmr8j0ci8wzmpzmk2yxb0qcx9w9a8nnbgnfv5"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libao json_c libgcrypt ffmpeg_3 curl ]; diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index 8a7c1b32245..200e457c568 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub, gettext, chromaprint, qt5 +{ lib, python3Packages, fetchFromGitHub, gettext, chromaprint, qt5 , enablePlayback ? true , gst_all_1 }: @@ -22,7 +22,7 @@ in pythonPackages.buildPythonApplication rec { }; nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ] - ++ stdenv.lib.optionals (pyqt5.multimediaEnabled) [ + ++ lib.optionals (pyqt5.multimediaEnabled) [ qt5.qtmultimedia.bin gst_all_1.gstreamer gst_all_1.gst-vaapi @@ -49,7 +49,7 @@ in pythonPackages.buildPythonApplication rec { preFixup = '' makeWrapperArgs+=("''${qtWrapperArgs[@]}") '' - + stdenv.lib.optionalString (pyqt5.multimediaEnabled) '' + + lib.optionalString (pyqt5.multimediaEnabled) '' makeWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") '' ; diff --git a/pkgs/applications/audio/pifi/Gemfile b/pkgs/applications/audio/pifi/Gemfile new file mode 100644 index 00000000000..da7d26e3760 --- /dev/null +++ b/pkgs/applications/audio/pifi/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'pifi' diff --git a/pkgs/applications/audio/pifi/Gemfile.lock b/pkgs/applications/audio/pifi/Gemfile.lock new file mode 100644 index 00000000000..ddcdb537e6a --- /dev/null +++ b/pkgs/applications/audio/pifi/Gemfile.lock @@ -0,0 +1,39 @@ +GEM + remote: https://rubygems.org/ + specs: + daemons (1.3.1) + eventmachine (1.2.7) + json (2.5.1) + mustermann (1.1.1) + ruby2_keywords (~> 0.0.1) + optimist (3.0.1) + pifi (0.4.11) + json (~> 2.2) + optimist (~> 3.0) + ruby-mpd (~> 0.3) + sinatra (~> 2.0) + thin (~> 1.7) + rack (2.2.3) + rack-protection (2.1.0) + rack + ruby-mpd (0.3.3) + ruby2_keywords (0.0.4) + sinatra (2.1.0) + mustermann (~> 1.0) + rack (~> 2.2) + rack-protection (= 2.1.0) + tilt (~> 2.0) + thin (1.8.0) + daemons (~> 1.0, >= 1.0.9) + eventmachine (~> 1.0, >= 1.0.4) + rack (>= 1, < 3) + tilt (2.0.10) + +PLATFORMS + ruby + +DEPENDENCIES + pifi + +BUNDLED WITH + 2.1.4 diff --git a/pkgs/applications/audio/pifi/default.nix b/pkgs/applications/audio/pifi/default.nix new file mode 100644 index 00000000000..856807608d7 --- /dev/null +++ b/pkgs/applications/audio/pifi/default.nix @@ -0,0 +1,18 @@ +{ lib, bundlerEnv, ruby }: + +bundlerEnv rec { + pname = "pifi"; + + version = (import ./gemset.nix).pifi.version; + inherit ruby; + # expects Gemfile, Gemfile.lock and gemset.nix in the same directory + gemdir = ./.; + + meta = with lib; { + description = "MPD web client to listen to radio, written in React and Sinatra"; + homepage = "https://github.com/rccavalcanti/pifi-radio"; + license = with licenses; gpl3Only; + maintainers = with maintainers; [ kmein ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/audio/pifi/gemset.nix b/pkgs/applications/audio/pifi/gemset.nix new file mode 100644 index 00000000000..77dd8c55289 --- /dev/null +++ b/pkgs/applications/audio/pifi/gemset.nix @@ -0,0 +1,137 @@ +{ + daemons = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0l5gai3vd4g7aqff0k1mp41j9zcsvm2rbwmqn115a325k9r7pf4w"; + type = "gem"; + }; + version = "1.3.1"; + }; + eventmachine = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r"; + type = "gem"; + }; + version = "1.2.7"; + }; + json = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci"; + type = "gem"; + }; + version = "2.5.1"; + }; + mustermann = { + dependencies = ["ruby2_keywords"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ccm54qgshr1lq3pr1dfh7gphkilc19dp63rw6fcx7460pjwy88a"; + type = "gem"; + }; + version = "1.1.1"; + }; + optimist = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vg2chy1cfmdj6c1gryl8zvjhhmb3plwgyh1jfnpq4fnfqv7asrk"; + type = "gem"; + }; + version = "3.0.1"; + }; + pifi = { + dependencies = ["json" "optimist" "ruby-mpd" "sinatra" "thin"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xwjaql852m0p7himc3pak1ibc8lfxi29bbgic153wp713xc2cga"; + type = "gem"; + }; + version = "0.4.11"; + }; + rack = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0i5vs0dph9i5jn8dfc6aqd6njcafmb20rwqngrf759c9cvmyff16"; + type = "gem"; + }; + version = "2.2.3"; + }; + rack-protection = { + dependencies = ["rack"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "159a4j4kragqh0z0z8vrpilpmaisnlz3n7kgiyf16bxkwlb3qlhz"; + type = "gem"; + }; + version = "2.1.0"; + }; + ruby-mpd = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0l80gbnma009pfcqgz4azbngkr5jn9nm46fflx5p7c4vz4kwshpc"; + type = "gem"; + }; + version = "0.3.3"; + }; + ruby2_keywords = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15wfcqxyfgka05v2a7kpg64x57gl1y4xzvnc9lh60bqx5sf1iqrs"; + type = "gem"; + }; + version = "0.0.4"; + }; + sinatra = { + dependencies = ["mustermann" "rack" "rack-protection" "tilt"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dd53rzpkxgs697pycbhhgc9vcnxra4ly4xar8ni6aiydx2f88zk"; + type = "gem"; + }; + version = "2.1.0"; + }; + thin = { + dependencies = ["daemons" "eventmachine" "rack"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0g5p3r47qxxfmfagdf8wb68pd24938cgzdfn6pmpysrn296pg5m5"; + type = "gem"; + }; + version = "1.8.0"; + }; + tilt = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rn8z8hda4h41a64l0zhkiwz2vxw9b1nb70gl37h1dg2k874yrlv"; + type = "gem"; + }; + version = "2.0.10"; + }; +} diff --git a/pkgs/applications/audio/pithos/default.nix b/pkgs/applications/audio/pithos/default.nix index 550cfc909d9..939b53c44fb 100644 --- a/pkgs/applications/audio/pithos/default.nix +++ b/pkgs/applications/audio/pithos/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig, appstream-glib +{ lib, fetchFromGitHub, meson, ninja, pkg-config, appstream-glib , wrapGAppsHook, pythonPackages, gtk3, gnome3, gobject-introspection , libnotify, libsecret, gst_all_1 }: @@ -20,7 +20,7 @@ pythonPackages.buildPythonApplication rec { patchShebangs meson_post_install.py ''; - nativeBuildInputs = [ meson ninja pkgconfig appstream-glib wrapGAppsHook ]; + nativeBuildInputs = [ meson ninja pkg-config appstream-glib wrapGAppsHook ]; propagatedBuildInputs = [ gtk3 gobject-introspection libnotify libsecret gnome3.adwaita-icon-theme ] ++ diff --git a/pkgs/applications/audio/playbar2/default.nix b/pkgs/applications/audio/playbar2/default.nix index 7545c17131f..dfbfb43e625 100644 --- a/pkgs/applications/audio/playbar2/default.nix +++ b/pkgs/applications/audio/playbar2/default.nix @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { kwindowsystem ]; + dontWrapQtApps = true; + meta = with lib; { description = "Mpris2 Client for Plasma5"; homepage = "https://github.com/audoban/PlayBar2"; diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix index 2c33584e362..c484f6e1924 100644 --- a/pkgs/applications/audio/plexamp/default.nix +++ b/pkgs/applications/audio/plexamp/default.nix @@ -2,13 +2,13 @@ let pname = "plexamp"; - version = "3.3.1"; + version = "3.4.1"; name = "${pname}-${version}"; src = fetchurl { url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage"; name="${pname}-${version}.AppImage"; - sha256 = "6/asP8VR+rJ52lKKds46gSw1or9suUEmyR75pjdWHIQ="; + sha256 = "Vv+e1q5ThuXDPX8baSU+7/U63p6/dvh0ZvScO1Loj+U="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/audio/plugin-torture/default.nix b/pkgs/applications/audio/plugin-torture/default.nix index b906e033601..e209d98ec71 100644 --- a/pkgs/applications/audio/plugin-torture/default.nix +++ b/pkgs/applications/audio/plugin-torture/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, boost, ladspaH, lilv, lv2, pkgconfig, serd, sord, sratom }: +{ lib, stdenv, fetchFromGitHub, boost, ladspaH, lilv, lv2, pkg-config, serd, sord, sratom }: stdenv.mkDerivation { pname = "plugin-torture"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "1xyhvhm85d9z0kw716cjllrrzksn4s4bw34layg8hf4m5m31sp2p"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ boost ladspaH lilv lv2 serd sord sratom ]; installPhase = '' diff --git a/pkgs/applications/audio/polyphone/default.nix b/pkgs/applications/audio/polyphone/default.nix index f54e8e8e9f0..a331952aa81 100644 --- a/pkgs/applications/audio/polyphone/default.nix +++ b/pkgs/applications/audio/polyphone/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, pkgconfig, alsaLib, libjack2, portaudio, libogg, flac, libvorbis, rtmidi, qtsvg }: +{ lib, mkDerivation, fetchFromGitHub, qmake, pkg-config, alsaLib, libjack2, portaudio, libogg, flac, libvorbis, rtmidi, qtsvg }: mkDerivation rec { version = "2.2.0"; @@ -22,7 +22,7 @@ mkDerivation rec { qtsvg ]; - nativeBuildInputs = [ qmake pkgconfig ]; + nativeBuildInputs = [ qmake pkg-config ]; preConfigure = '' cd ./sources/ diff --git a/pkgs/applications/audio/ponymix/default.nix b/pkgs/applications/audio/ponymix/default.nix index fb28b10448d..70e7217dff7 100644 --- a/pkgs/applications/audio/ponymix/default.nix +++ b/pkgs/applications/audio/ponymix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libpulseaudio, libnotify, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, libpulseaudio, libnotify, pkg-config }: stdenv.mkDerivation rec { pname = "ponymix"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libpulseaudio libnotify ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; postPatch = ''substituteInPlace Makefile --replace "\$(DESTDIR)/usr" "$out"''; diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index 5abab029bc9..1d3fd534dd2 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, gtk2, pkgconfig }: +{ lib, stdenv, fetchurl, alsaLib, gtk2, pkg-config }: stdenv.mkDerivation rec { pname = "praat"; @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { cp praat $out/bin ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ alsaLib gtk2 ]; meta = { description = "Doing phonetics by computer"; homepage = "https://www.fon.hum.uva.nl/praat/"; - license = stdenv.lib.licenses.gpl2Plus; # Has some 3rd-party code in it though - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; # Has some 3rd-party code in it though + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/projectm/default.nix b/pkgs/applications/audio/projectm/default.nix index 845435be60e..8f4cfb499f2 100644 --- a/pkgs/applications/audio/projectm/default.nix +++ b/pkgs/applications/audio/projectm/default.nix @@ -3,7 +3,7 @@ , lib , fetchFromGitHub , autoreconfHook -, pkgconfig +, pkg-config , SDL2 , qtdeclarative , libpulseaudio @@ -23,7 +23,7 @@ mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config autoreconfHook which ]; diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix index 011ef8d12e5..6a093c91daf 100644 --- a/pkgs/applications/audio/pt2-clone/default.nix +++ b/pkgs/applications/audio/pt2-clone/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ SDL2 ] ++ stdenv.lib.optional stdenv.isLinux alsaLib; + buildInputs = [ SDL2 ] ++ lib.optional stdenv.isLinux alsaLib; passthru.tests = { pt2-clone-opens = nixosTests.pt2-clone; diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix index 94a571df294..efa1d943610 100644 --- a/pkgs/applications/audio/puddletag/default.nix +++ b/pkgs/applications/audio/puddletag/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, wrapQtAppsHook, chromaprint }: +{ lib, fetchFromGitHub, python3Packages, wrapQtAppsHook, chromaprint }: python3Packages.buildPythonApplication rec { pname = "puddletag"; diff --git a/pkgs/applications/audio/pulseaudio-ctl/default.nix b/pkgs/applications/audio/pulseaudio-ctl/default.nix index 245c58a2119..843c131ea65 100644 --- a/pkgs/applications/audio/pulseaudio-ctl/default.nix +++ b/pkgs/applications/audio/pulseaudio-ctl/default.nix @@ -2,7 +2,7 @@ , bc, dbus, gawk, gnused, libnotify, pulseaudio }: let - path = stdenv.lib.makeBinPath [ bc dbus gawk gnused libnotify pulseaudio ]; + path = lib.makeBinPath [ bc dbus gawk gnused libnotify pulseaudio ]; pname = "pulseaudio-ctl"; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/audio/pulseaudio-dlna/default.nix b/pkgs/applications/audio/pulseaudio-dlna/default.nix index 3c80a521286..83de192c6b3 100644 --- a/pkgs/applications/audio/pulseaudio-dlna/default.nix +++ b/pkgs/applications/audio/pulseaudio-dlna/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, stdenv, pythonPackages +{ fetchFromGitHub, lib, pythonPackages , mp3Support ? true, lame ? null , opusSupport ? true, opusTools ? null , faacSupport ? false, faac ? null @@ -32,12 +32,12 @@ pythonPackages.buildPythonApplication { dbus-python docopt requests setproctitle protobuf psutil futures chardet notify2 netifaces pyroute2 pygobject2 lxml setuptools ] ++ [ zeroconf ] - ++ stdenv.lib.optional mp3Support lame - ++ stdenv.lib.optional opusSupport opusTools - ++ stdenv.lib.optional faacSupport faac - ++ stdenv.lib.optional flacSupport flac - ++ stdenv.lib.optional soxSupport sox - ++ stdenv.lib.optional vorbisSupport vorbis-tools; + ++ lib.optional mp3Support lame + ++ lib.optional opusSupport opusTools + ++ lib.optional faacSupport faac + ++ lib.optional flacSupport flac + ++ lib.optional soxSupport sox + ++ lib.optional vorbisSupport vorbis-tools; # upstream has no tests checkPhase = '' diff --git a/pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix b/pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix index e28aabe8dab..d4f3306697d 100644 --- a/pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix +++ b/pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , ifaddr @@ -19,7 +19,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ netifaces six enum-compat ifaddr ] - ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ]; + ++ lib.optionals (pythonOlder "3.5") [ typing ]; meta = with lib; { description = "A pure python implementation of multicast DNS service discovery"; diff --git a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix index c7dc2cc3b1d..331bce3e8be 100644 --- a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix +++ b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix @@ -2,7 +2,7 @@ , runCommand , fetchFromGitHub , pulseaudio -, pkgconfig +, pkg-config , ffmpeg , patchelf , fdk_aac @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config patchelf cmake ]; diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix index f0f3ad60b41..fca498bd897 100644 --- a/pkgs/applications/audio/pulseeffects/default.nix +++ b/pkgs/applications/audio/pulseeffects/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , meson , ninja -, pkgconfig +, pkg-config , itstool , python3 , libxml2 @@ -57,7 +57,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config libxml2 itstool python3 @@ -94,15 +94,15 @@ in stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( - --set LV2_PATH "${stdenv.lib.makeSearchPath "lib/lv2" lv2Plugins}" - --set LADSPA_PATH "${stdenv.lib.makeSearchPath "lib/ladspa" ladspaPlugins}" + --set LV2_PATH "${lib.makeSearchPath "lib/lv2" lv2Plugins}" + --set LADSPA_PATH "${lib.makeSearchPath "lib/ladspa" ladspaPlugins}" ) ''; # Meson is no longer able to pick up Boost automatically. # https://github.com/NixOS/nixpkgs/issues/86131 - BOOST_INCLUDEDIR = "${stdenv.lib.getDev boost}/include"; - BOOST_LIBRARYDIR = "${stdenv.lib.getLib boost}/lib"; + BOOST_INCLUDEDIR = "${lib.getDev boost}/include"; + BOOST_LIBRARYDIR = "${lib.getLib boost}/lib"; meta = with lib; { description = "Limiter, compressor, reverberation, equalizer and auto volume effects for Pulseaudio applications"; diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix index 51972e6bfeb..586dfeae733 100644 --- a/pkgs/applications/audio/qjackctl/default.nix +++ b/pkgs/applications/audio/qjackctl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub +{ lib, mkDerivation, fetchFromGitHub , pkg-config, cmake, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras # Enable jack session support , jackSession ? false @@ -13,7 +13,7 @@ mkDerivation rec { src = fetchFromGitHub { owner = "rncbc"; repo = "qjackctl"; - rev = "${pname}_${stdenv.lib.replaceChars ["."] ["_"] version}"; + rev = "${pname}_${lib.replaceChars ["."] ["_"] version}"; sha256 = "044kgwk7pfywad4myza0s2kvfkl21zkqq5wgny7n3c43qlcgs3zr"; }; diff --git a/pkgs/applications/audio/qmidinet/default.nix b/pkgs/applications/audio/qmidinet/default.nix index 9b9b84850dc..d7b4b834321 100644 --- a/pkgs/applications/audio/qmidinet/default.nix +++ b/pkgs/applications/audio/qmidinet/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchurl, pkgconfig, qtbase, qttools, alsaLib, libjack2 }: +{ mkDerivation, lib, fetchurl, pkg-config, qtbase, qttools, alsaLib, libjack2 }: mkDerivation rec { version = "0.6.3"; @@ -13,7 +13,7 @@ mkDerivation rec { buildInputs = [ qtbase qttools alsaLib libjack2 ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = with lib; { description = "A MIDI network gateway application that sends and receives MIDI data (ALSA Sequencer and/or JACK MIDI) over the network"; diff --git a/pkgs/applications/audio/qmidiroute/default.nix b/pkgs/applications/audio/qmidiroute/default.nix index ee983f78014..e24824985fa 100644 --- a/pkgs/applications/audio/qmidiroute/default.nix +++ b/pkgs/applications/audio/qmidiroute/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, qt4, alsaLib }: +{ lib, stdenv, fetchurl, pkg-config, qt4, alsaLib }: stdenv.mkDerivation rec { version = "0.4.0"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0vmjwarsxr5540rafhmdcc62yarf0w2l05bjjl9s28zzr5m39z3n"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ qt4 alsaLib ]; meta = with lib; { @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.lebastr ]; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index f5015325d85..b75af645bb3 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchurl, cmake, pkgconfig, xlibsWrapper +{ lib, mkDerivation, fetchurl, cmake, pkg-config, xlibsWrapper , qtbase, qttools, qtmultimedia, qtx11extras # transports , curl, libmms @@ -12,7 +12,7 @@ }: # Additional plugins that can be added: -# wavpack (http://www.wavpack.com/) +# wavpack (https://www.wavpack.com/) # gme (Game music support) # Ogg Opus support # BS2B effect plugin (http://bs2b.sourceforge.net/) @@ -36,7 +36,7 @@ mkDerivation rec { sha256 = "1kvzw0n90crg3dgy8834qrjv0zb3ia5cny7virax9ax73y653jfa"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ # basic requirements qtbase qttools qtmultimedia qtx11extras xlibsWrapper diff --git a/pkgs/applications/audio/qsampler/default.nix b/pkgs/applications/audio/qsampler/default.nix index 0418957dee0..bb40e0b3eeb 100644 --- a/pkgs/applications/audio/qsampler/default.nix +++ b/pkgs/applications/audio/qsampler/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, qttools +{ lib, fetchurl, autoconf, automake, libtool, pkg-config, qttools , liblscp, libgig, qtbase, mkDerivation }: mkDerivation rec { @@ -10,7 +10,7 @@ mkDerivation rec { sha256 = "1wr7k739zx2nz00b810f60g9k3y92w05nfci987hw7y2sks9rd8j"; }; - nativeBuildInputs = [ autoconf automake libtool pkgconfig qttools ]; + nativeBuildInputs = [ autoconf automake libtool pkg-config qttools ]; buildInputs = [ liblscp libgig qtbase ]; preConfigure = "make -f Makefile.svn"; diff --git a/pkgs/applications/audio/qsynth/default.nix b/pkgs/applications/audio/qsynth/default.nix index 1ea7852dc10..f708207cce9 100644 --- a/pkgs/applications/audio/qsynth/default.nix +++ b/pkgs/applications/audio/qsynth/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, fluidsynth, libjack2, autoconf, pkgconfig +{ lib, fetchurl, alsaLib, fluidsynth, libjack2, autoconf, pkg-config , mkDerivation, qtbase, qttools, qtx11extras }: @@ -11,7 +11,7 @@ mkDerivation rec { sha256 = "0xiqmpzpxjvh32vivfj6h33w0ahmyfjzjb41b6fnf92bbg9k6mqv"; }; - nativeBuildInputs = [ autoconf pkgconfig ]; + nativeBuildInputs = [ autoconf pkg-config ]; buildInputs = [ alsaLib fluidsynth libjack2 qtbase qttools qtx11extras ]; diff --git a/pkgs/applications/audio/qtractor/default.nix b/pkgs/applications/audio/qtractor/default.nix index 493a99f6b71..f19d0f70fdf 100644 --- a/pkgs/applications/audio/qtractor/default.nix +++ b/pkgs/applications/audio/qtractor/default.nix @@ -24,7 +24,7 @@ , serd , sord , sratom -, lib, stdenv +, lib , suil }: diff --git a/pkgs/applications/audio/qtscrobbler/default.nix b/pkgs/applications/audio/qtscrobbler/default.nix index 5b84989a7c4..f013c338e76 100644 --- a/pkgs/applications/audio/qtscrobbler/default.nix +++ b/pkgs/applications/audio/qtscrobbler/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, withMtp ? true, libmtp, pkgconfig, which, qt4, qmake4Hook }: +{ stdenv, lib, fetchurl, withMtp ? true, libmtp, pkg-config, which, qt4, qmake4Hook }: stdenv.mkDerivation rec { pname = "qtscrobbler"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "01c8e48f616ed09504833d27d92fd62f455bd645ea2d1cc2a5f4c287d641daba"; }; - nativeBuildInputs = [ qmake4Hook ] ++ lib.optionals withMtp [ pkgconfig which ]; + nativeBuildInputs = [ qmake4Hook ] ++ lib.optionals withMtp [ pkg-config which ]; buildInputs = [ qt4 ] ++ lib.optional withMtp libmtp; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index 00da41e308a..571097ad478 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -6,7 +6,7 @@ webkitgtk ? null, keybinder3 ? null, gtksourceview ? null, libmodplug ? null, kakasi ? null, libappindicator-gtk3 ? null }: -let optionals = stdenv.lib.optionals; in +let optionals = lib.optionals; in python3.pkgs.buildPythonApplication rec { pname = "quodlibet${tag}"; version = "4.3.0"; @@ -35,7 +35,7 @@ python3.pkgs.buildPythonApplication rec { LC_ALL = "en_US.UTF-8"; - pytestFlags = stdenv.lib.optionals (xineBackend || !withGstPlugins) [ + pytestFlags = lib.optionals (xineBackend || !withGstPlugins) [ "--ignore=tests/plugin/test_replaygain.py" ] ++ [ # requires networking @@ -65,7 +65,7 @@ python3.pkgs.buildPythonApplication rec { runHook postCheck ''; - preFixup = stdenv.lib.optionalString (kakasi != null) "gappsWrapperArgs+=(--prefix PATH : ${kakasi}/bin)"; + preFixup = lib.optionalString (kakasi != null) "gappsWrapperArgs+=(--prefix PATH : ${kakasi}/bin)"; meta = with lib; { description = "GTK-based audio player written in Python, using the Mutagen tagging library"; diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix index 9c5e6a931a9..5730bcdcaab 100644 --- a/pkgs/applications/audio/radiotray-ng/default.nix +++ b/pkgs/applications/audio/radiotray-ng/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, cmake, pkgconfig +, cmake, pkg-config # Transport , curl # Libraries @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { sha256 = "1v2nsz7s0jj0wmqabzk6akcf1353rachm1lfq77hxbq9z5pw8pgb"; }; - nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook makeWrapper ]; + nativeBuildInputs = [ cmake pkg-config wrapGAppsHook makeWrapper ]; buildInputs = [ curl @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isAarch64; # single failure that I can't explain preFixup = '' - gappsWrapperArgs+=(--suffix PATH : ${stdenv.lib.makeBinPath [ dbus ]}) + gappsWrapperArgs+=(--suffix PATH : ${lib.makeBinPath [ dbus ]}) wrapProgram $out/bin/rt2rtng --prefix PYTHONPATH : $PYTHONPATH ''; diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index 09df5dcddbb..212b4c716ff 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -1,38 +1,40 @@ -{ lib, stdenv, fetchurl, autoPatchelfHook, makeWrapper -, alsaLib, xorg, libjack2 -, gtk3, pango, gdk-pixbuf, cairo, glib, freetype -, libpulseaudio, xdg_utils +{ config, lib, stdenv +, fetchurl +, autoPatchelfHook +, makeWrapper + +, alsaLib +, gtk3 +, lame +, ffmpeg +, vlc + +, jackSupport ? true, libjack2 +, pulseaudioSupport ? config.pulseaudio or true, libpulseaudio }: stdenv.mkDerivation rec { pname = "reaper"; - version = "6.12c"; + version = "6.21"; src = fetchurl { - url = "https://www.reaper.fm/files/${stdenv.lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_x86_64.tar.xz"; - sha256 = "1xnd4qvgwsz1dmgb656i611776dqcb84m1gh30i8jhpwcr9ym46w"; + url = "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_x86_64.tar.xz"; + sha256 = "11nvfjfrri9y0k7n7psz3yk1l7mxp9f6yi69pq7hvn9d4n26p5vd"; }; nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; buildInputs = [ alsaLib - - xorg.libX11 - xorg.libXi - - gdk-pixbuf - pango - cairo - glib - freetype - - xdg_utils + stdenv.cc.cc.lib # reaper and libSwell need libstdc++.so.6 + gtk3 ]; runtimeDependencies = [ - gtk3 - ]; + gtk3 # libSwell needs libgdk-3.so.0 + ] + ++ lib.optional jackSupport libjack2 + ++ lib.optional pulseaudioSupport libpulseaudio; dontBuild = true; @@ -42,8 +44,15 @@ stdenv.mkDerivation rec { --integrate-user-desktop rm $out/opt/REAPER/uninstall-reaper.sh + # Dynamic loading of plugin dependencies does not adhere to rpath of + # reaper executable that gets modified with runtimeDependencies. + # Patching each plugin with DT_NEEDED is cumbersome and requires + # hardcoding of API versions of each dependency. + # Setting the rpath of the plugin shared object files does not + # seem to have an effect for some plugins. + # We opt for wrapping the executable with LD_LIBRARY_PATH prefix. wrapProgram $out/opt/REAPER/reaper \ - --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libpulseaudio libjack2 ]}" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ lame ffmpeg vlc ]}" mkdir $out/bin ln -s $out/opt/REAPER/reaper $out/bin/ @@ -55,6 +64,6 @@ stdenv.mkDerivation rec { homepage = "https://www.reaper.fm/"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ jfrankenau ]; + maintainers = with maintainers; [ jfrankenau ilian ]; }; } diff --git a/pkgs/applications/audio/redoflacs/default.nix b/pkgs/applications/audio/redoflacs/default.nix index 879acdf3a17..999dc90a6e4 100644 --- a/pkgs/applications/audio/redoflacs/default.nix +++ b/pkgs/applications/audio/redoflacs/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { postFixup = '' wrapProgram $out/bin/redoflacs \ - --prefix PATH : ${stdenv.lib.makeBinPath ([ flac sox ])} + --prefix PATH : ${lib.makeBinPath ([ flac sox ])} ''; meta = with lib; { diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix index 0ae65cb8c37..8d495b93629 100644 --- a/pkgs/applications/audio/renoise/default.nix +++ b/pkgs/applications/audio/renoise/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, libX11, libXext, libXcursor, libXrandr, libjack2, alsaLib +{ lib, stdenv, fetchurl, libX11, libXext, libXcursor, libXrandr, libjack2, alsaLib , mpg123, releasePath ? null }: -with stdenv.lib; +with lib; # To use the full release version: # 1) Sign into https://backstage.renoise.com and download the release version to some stable location. @@ -19,15 +19,15 @@ stdenv.mkDerivation rec { src = if stdenv.hostPlatform.system == "x86_64-linux" then if releasePath == null then - fetchurl { - urls = [ - "https://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_Linux.tar.gz" - "https://web.archive.org/web/https://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_Linux.tar.gz" - ]; - sha256 = "1v249kmyidx55kppk3sry7yg6hl1a91ixhnwz36h4y134fs7bkrl"; - } + fetchurl { + urls = [ + "https://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_Linux.tar.gz" + "https://web.archive.org/web/https://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_Linux.tar.gz" + ]; + sha256 = "1v249kmyidx55kppk3sry7yg6hl1a91ixhnwz36h4y134fs7bkrl"; + } else - releasePath + releasePath else throw "Platform is not supported by Renoise"; buildInputs = [ alsaLib libjack2 libX11 libXcursor libXext libXrandr ]; @@ -37,8 +37,6 @@ stdenv.mkDerivation rec { mkdir -p $out/lib/ - mv $out/AudioPluginServer* $out/lib/ - cp renoise $out/renoise for path in ${toString buildInputs}; do @@ -56,6 +54,13 @@ stdenv.mkDerivation rec { --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ --set-rpath ${mpg123}/lib:$out/lib \ $out/renoise + + for path in $out/AudioPluginServer*; do + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-rpath $out/lib \ + $path + done ''; meta = { diff --git a/pkgs/applications/audio/rhvoice/default.nix b/pkgs/applications/audio/rhvoice/default.nix index a29fcf383b8..af35ad829dd 100644 --- a/pkgs/applications/audio/rhvoice/default.nix +++ b/pkgs/applications/audio/rhvoice/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, pkgconfig, fetchFromGitHub, sconsPackages +{ stdenv, lib, pkg-config, fetchFromGitHub, sconsPackages , python, glibmm, libpulseaudio, libao }: let @@ -15,7 +15,7 @@ in stdenv.mkDerivation { }; nativeBuildInputs = [ - sconsPackages.scons_3_1_2 pkgconfig + sconsPackages.scons_3_1_2 pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/applications/audio/rhythmbox/default.nix index c07d73530b5..173741484fd 100644 --- a/pkgs/applications/audio/rhythmbox/default.nix +++ b/pkgs/applications/audio/rhythmbox/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , python3 , perl , perlPackages @@ -22,12 +22,12 @@ 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}/${lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "142xcvw4l19jyr5i72nbnrihs953pvrrzcbijjn9dxmxszbv03pf"; }; nativeBuildInputs = [ - pkgconfig + pkg-config intltool perl perlPackages.XMLParser itstool wrapGAppsHook diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/applications/audio/rosegarden/default.nix index 31fce746077..5c7493ef7db 100644 --- a/pkgs/applications/audio/rosegarden/default.nix +++ b/pkgs/applications/audio/rosegarden/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, makedepend, perl, pkgconfig, qttools, wrapQtAppsHook +{ lib, stdenv, fetchurl, cmake, makedepend, perl, pkg-config, qttools, wrapQtAppsHook , dssi, fftwSinglePrec, ladspaH, ladspaPlugins, libjack2, alsaLib , liblo, libsamplerate, libsndfile, lirc ? null, lrdf, qtbase }: @@ -16,7 +16,7 @@ stdenv.mkDerivation (rec { ''; nativeBuildInputs = - [ cmake makedepend perl pkgconfig qttools wrapQtAppsHook ]; + [ cmake makedepend perl pkg-config qttools wrapQtAppsHook ]; buildInputs = [ dssi diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix index 17b3f1c3745..4b06a99d473 100644 --- a/pkgs/applications/audio/samplv1/default.nix +++ b/pkgs/applications/audio/samplv1/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchurl, pkgconfig, libjack2 +{ mkDerivation, lib, fetchurl, pkg-config, libjack2 , alsaLib, liblo, libsndfile, lv2, qtbase, qttools , rubberband }: @@ -12,7 +12,7 @@ mkDerivation rec { sha256 = "ePhM9OTLJp1Wa2D9Y1Dqq/69WlEhEp3ih9yNUIJU5Y4="; }; - nativeBuildInputs = [ qttools pkgconfig ]; + nativeBuildInputs = [ qttools pkg-config ]; buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qtbase rubberband ]; diff --git a/pkgs/applications/audio/schismtracker/default.nix b/pkgs/applications/audio/schismtracker/default.nix index 02c8f28da65..3b5708529e0 100644 --- a/pkgs/applications/audio/schismtracker/default.nix +++ b/pkgs/applications/audio/schismtracker/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook python ]; - buildInputs = [ SDL ] ++ stdenv.lib.optional stdenv.isLinux alsaLib; + buildInputs = [ SDL ] ++ lib.optional stdenv.isLinux alsaLib; meta = with lib; { description = "Music tracker application, free reimplementation of Impulse Tracker"; diff --git a/pkgs/applications/audio/seq24/default.nix b/pkgs/applications/audio/seq24/default.nix index aa3abd3f0f3..84eebfac695 100644 --- a/pkgs/applications/audio/seq24/default.nix +++ b/pkgs/applications/audio/seq24/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, gtkmm2, libjack2, pkgconfig }: +{ lib, stdenv, fetchurl, alsaLib, gtkmm2, libjack2, pkg-config }: stdenv.mkDerivation rec { pname = "seq24"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { patches = [ ./mutex_no_nameclash.patch ]; buildInputs = [ alsaLib gtkmm2 libjack2 ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = with lib; { description = "Minimal loop based midi sequencer"; diff --git a/pkgs/applications/audio/seq66/default.nix b/pkgs/applications/audio/seq66/default.nix index 93f9e9503b9..71d70c2dd58 100644 --- a/pkgs/applications/audio/seq66/default.nix +++ b/pkgs/applications/audio/seq66/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + dontWrapQtApps = true; + meta = with lib; { homepage = "https://github.com/ahlstromcj/seq66"; description = "Loop based midi sequencer with Qt GUI derived from seq24 and sequencer64"; diff --git a/pkgs/applications/audio/setbfree/default.nix b/pkgs/applications/audio/setbfree/default.nix index 0f3b2fcfa95..613abbf3c12 100644 --- a/pkgs/applications/audio/setbfree/default.nix +++ b/pkgs/applications/audio/setbfree/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchzip, alsaLib, freetype, ftgl, libjack2, libX11, lv2 -, libGLU, libGL, pkgconfig, ttf_bitstream_vera +, libGLU, libGL, pkg-config, ttf_bitstream_vera }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { -i b_synth/Makefile ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ alsaLib freetype ftgl libjack2 libX11 lv2 libGLU libGL ttf_bitstream_vera diff --git a/pkgs/applications/audio/sfizz/default.nix b/pkgs/applications/audio/sfizz/default.nix index 4ba30935089..85bc9e3542c 100644 --- a/pkgs/applications/audio/sfizz/default.nix +++ b/pkgs/applications/audio/sfizz/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub , cmake, libjack2, libsndfile, pkgconfig }: +{ lib, stdenv, fetchFromGitHub , cmake, libjack2, libsndfile, pkg-config }: stdenv.mkDerivation rec { pname = "sfizz"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libjack2 libsndfile ]; diff --git a/pkgs/applications/audio/sfxr/default.nix b/pkgs/applications/audio/sfxr/default.nix index 9e5195b2caa..aed27ecdba5 100644 --- a/pkgs/applications/audio/sfxr/default.nix +++ b/pkgs/applications/audio/sfxr/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, pkgconfig +, pkg-config , desktop-file-utils , SDL , gtk3 @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - pkgconfig + pkg-config desktop-file-utils ]; diff --git a/pkgs/applications/audio/shntool/default.nix b/pkgs/applications/audio/shntool/default.nix index de18f3c2ce8..8b4f736ab1c 100644 --- a/pkgs/applications/audio/shntool/default.nix +++ b/pkgs/applications/audio/shntool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, flac }: +{ lib, stdenv, fetchurl, flac }: stdenv.mkDerivation { version = "3.0.10"; @@ -14,8 +14,8 @@ stdenv.mkDerivation { meta = { description = "Multi-purpose WAVE data processing and reporting utility"; homepage = "http://www.etree.org/shnutils/shntool/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ jcumming ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ jcumming ]; }; } diff --git a/pkgs/applications/audio/shortwave/default.nix b/pkgs/applications/audio/shortwave/default.nix index 2cc8c53f607..a503d3b344c 100644 --- a/pkgs/applications/audio/shortwave/default.nix +++ b/pkgs/applications/audio/shortwave/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitLab , cargo , dbus diff --git a/pkgs/applications/audio/sidplayfp/default.nix b/pkgs/applications/audio/sidplayfp/default.nix index 2ebf56fee52..cebf0d83e16 100644 --- a/pkgs/applications/audio/sidplayfp/default.nix +++ b/pkgs/applications/audio/sidplayfp/default.nix @@ -1,7 +1,7 @@ { stdenv , lib , fetchurl -, pkgconfig +, pkg-config , libsidplayfp , alsaSupport ? stdenv.hostPlatform.isLinux , alsaLib @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { sha256 = "1s2dfs9z1hwarpfzawg11wax9nh0zcqx4cafwq7iysckyg4scz4k"; }; - nativeBuildInputs = [ pkgconfig ] + nativeBuildInputs = [ pkg-config ] ++ optional alsaSupport alsaLib ++ optional pulseSupport libpulseaudio; diff --git a/pkgs/applications/audio/sisco.lv2/default.nix b/pkgs/applications/audio/sisco.lv2/default.nix index 311edbbae89..3ecd4665f26 100644 --- a/pkgs/applications/audio/sisco.lv2/default.nix +++ b/pkgs/applications/audio/sisco.lv2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, lv2, pkgconfig, libGLU, libGL, cairo, pango, libjack2 }: +{ lib, stdenv, fetchFromGitHub, lv2, pkg-config, libGLU, libGL, cairo, pango, libjack2 }: let name = "sisco.lv2-${version}"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { srcs = [ src robtkSrc ]; sourceRoot = src.name; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ lv2 pango cairo libjack2 libGLU libGL ]; postUnpack = "chmod u+w -R ${robtkName}-src; mv ${robtkName}-src/* ${sourceRoot}/robtk"; diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix index 5eff8f82e89..84695730db6 100644 --- a/pkgs/applications/audio/snapcast/default.nix +++ b/pkgs/applications/audio/snapcast/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config , alsaLib, asio, avahi, boost170, flac, libogg, libvorbis, soxr , nixosTests }: @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { sha256 = "152ic8hlyawcmj9pykb33xc6yx7il6yb9ilmsy6m9nlh40m8yxls"; }; - nativeBuildInputs = [ cmake pkgconfig boost170.dev ]; + nativeBuildInputs = [ cmake pkg-config boost170.dev ]; # snapcast also supports building against tremor but as we have libogg, that's # not needed buildInputs = [ diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index 76ea4efeace..61d1647087e 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , gtk2, alsaLib , fftw, gsl }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "016slh34gb6qqb38m8k9yg48rbhc5p12084szcwvanhh5v7fc7mk"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 alsaLib @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { meta = { description = "Sound editor"; homepage = "http://ccrma.stanford.edu/software/snd"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.free; - maintainers = with stdenv.lib.maintainers; [ ]; + platforms = lib.platforms.linux; + license = lib.licenses.free; + maintainers = with lib.maintainers; [ ]; }; diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix index afb02768960..83af7985dbe 100644 --- a/pkgs/applications/audio/sonata/default.nix +++ b/pkgs/applications/audio/sonata/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, wrapGAppsHook, gettext +{ lib, fetchFromGitHub, wrapGAppsHook, gettext , python3Packages, gnome3, gtk3, glib, gdk-pixbuf, gsettings-desktop-schemas, gobject-introspection }: let @@ -74,8 +74,8 @@ in buildPythonApplication rec { - Available in 24 languages ''; homepage = "https://www.nongnu.org/sonata/"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.rvl ]; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.rvl ]; }; } diff --git a/pkgs/applications/audio/sonic-lineup/default.nix b/pkgs/applications/audio/sonic-lineup/default.nix index 87803e68485..b88165f693a 100644 --- a/pkgs/applications/audio/sonic-lineup/default.nix +++ b/pkgs/applications/audio/sonic-lineup/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, alsaLib, boost, bzip2, fftw, fftwFloat, libfishsound , libid3tag, liblo, libmad, liboggz, libpulseaudio, libsamplerate , libsndfile, lrdf, opusfile, portaudio, rubberband, serd, sord, capnproto -, wrapQtAppsHook, pkgconfig +, wrapQtAppsHook, pkg-config }: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { portaudio rubberband serd sord capnproto ]; - nativeBuildInputs = [ pkgconfig wrapQtAppsHook ]; + nativeBuildInputs = [ pkg-config wrapQtAppsHook ]; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix index d80632a08f5..349f4636a79 100644 --- a/pkgs/applications/audio/sonic-pi/default.nix +++ b/pkgs/applications/audio/sonic-pi/default.nix @@ -6,7 +6,7 @@ , ruby , aubio , cmake -, pkgconfig +, pkg-config , boost , bash , jack2Full @@ -35,7 +35,7 @@ mkDerivation rec { buildInputs = [ bash cmake - pkgconfig + pkg-config qtbase qwt ruby diff --git a/pkgs/applications/audio/sooperlooper/default.nix b/pkgs/applications/audio/sooperlooper/default.nix index e9ec7b33f74..135c042d538 100644 --- a/pkgs/applications/audio/sooperlooper/default.nix +++ b/pkgs/applications/audio/sooperlooper/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchFromGitHub , autoreconfHook -, pkgconfig +, pkg-config , which , libtool , liblo @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - nativeBuildInputs = [ autoreconfHook pkgconfig which libtool ]; + nativeBuildInputs = [ autoreconfHook pkg-config which libtool ]; buildInputs = [ liblo diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix index e8ab895579c..740757a639e 100644 --- a/pkgs/applications/audio/sound-juicer/default.nix +++ b/pkgs/applications/audio/sound-juicer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, glib, gtk3, intltool, itstool, libxml2, brasero +{ lib, stdenv, fetchurl, pkg-config, glib, gtk3, intltool, itstool, libxml2, brasero , libcanberra-gtk3, gnome3, gst_all_1, libmusicbrainz5, libdiscid, isocodes , gsettings-desktop-schemas, wrapGAppsHook }: @@ -9,11 +9,11 @@ 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}/${lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "19qg4xv0f9rkq34lragkmhii1llxsa87llbl28i759b0ks4f6sny"; }; - nativeBuildInputs = [ pkgconfig intltool itstool libxml2 wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config intltool itstool libxml2 wrapGAppsHook ]; buildInputs = [ glib gtk3 brasero libcanberra-gtk3 gnome3.adwaita-icon-theme gsettings-desktop-schemas libmusicbrainz5 libdiscid isocodes diff --git a/pkgs/applications/audio/soundkonverter/default.nix b/pkgs/applications/audio/soundkonverter/default.nix index e8704ff6191..1c1724fbce8 100644 --- a/pkgs/applications/audio/soundkonverter/default.nix +++ b/pkgs/applications/audio/soundkonverter/default.nix @@ -1,7 +1,7 @@ # currently needs to be installed into an environment and needs a `kbuildsycoca5` run afterwards for plugin discovery { mkDerivation, fetchFromGitHub, fetchpatch, lib, makeWrapper, - cmake, extra-cmake-modules, pkgconfig, + cmake, extra-cmake-modules, pkg-config, libkcddb, kconfig, kconfigwidgets, ki18n, kdelibs4support, kio, solid, kwidgetsaddons, kxmlgui, qtbase, phonon, taglib, @@ -63,7 +63,7 @@ mkDerivation rec { }) ]; - nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig kdelibs4support makeWrapper ]; + nativeBuildInputs = [ cmake extra-cmake-modules pkg-config kdelibs4support makeWrapper ]; propagatedBuildInputs = [ libkcddb kconfig kconfigwidgets ki18n kdelibs4support kio solid kwidgetsaddons kxmlgui qtbase phonon]; buildInputs = [ taglib ] ++ runtimeDeps; # encoder plugins go to ${out}/lib so they're found by kbuildsycoca5 diff --git a/pkgs/applications/audio/soundscape-renderer/default.nix b/pkgs/applications/audio/soundscape-renderer/default.nix index 741211bd90d..fa9860ab248 100644 --- a/pkgs/applications/audio/soundscape-renderer/default.nix +++ b/pkgs/applications/audio/soundscape-renderer/default.nix @@ -1,8 +1,8 @@ -{ stdenv +{ lib, stdenv , fetchgit , autoreconfHook , help2man -, pkgconfig +, pkg-config , libsndfile , fftwFloat , libjack2 @@ -32,7 +32,7 @@ stdenv.mkDerivation { LC_ALL = "en_US.UTF-8"; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ boost boost.dev ecasound libGLU libGL help2man libsndfile fftwFloat libjack2 libxml2 qt4 glibcLocales ]; # 1) Fix detecting version. https://github.com/SoundScapeRenderer/ssr/pull/53 @@ -47,8 +47,8 @@ stdenv.mkDerivation { meta = { homepage = "http://spatialaudio.net/ssr/"; description = "The SoundScape Renderer (SSR) is a tool for real-time spatial audio reproduction"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.fridh ]; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.fridh ]; }; } diff --git a/pkgs/applications/audio/soundtracker/default.nix b/pkgs/applications/audio/soundtracker/default.nix index aa78bbf3de8..71fc763a5c5 100644 --- a/pkgs/applications/audio/soundtracker/default.nix +++ b/pkgs/applications/audio/soundtracker/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { jack2 audiofile goocanvas - ] ++ stdenv.lib.optional stdenv.isLinux alsaLib; + ] ++ lib.optional stdenv.isLinux alsaLib; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/audio/spectmorph/default.nix b/pkgs/applications/audio/spectmorph/default.nix index 055ed99dbeb..6292d771a51 100644 --- a/pkgs/applications/audio/spectmorph/default.nix +++ b/pkgs/applications/audio/spectmorph/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libjack2, lv2, glib, qt5, libao, cairo, libsndfile, fftwFloat }: +{ lib, stdenv, fetchurl, pkg-config, libjack2, lv2, glib, qt5, libao, cairo, libsndfile, fftwFloat }: stdenv.mkDerivation rec { pname = "spectmorph"; @@ -10,7 +10,9 @@ stdenv.mkDerivation rec { buildInputs = [ libjack2 lv2 glib qt5.qtbase libao cairo libsndfile fftwFloat ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; + + dontWrapQtApps = true; meta = with lib; { description = "Allows to analyze samples of musical instruments, and to combine them (morphing) to construct hybrid sounds"; diff --git a/pkgs/applications/audio/spectrojack/default.nix b/pkgs/applications/audio/spectrojack/default.nix index 35534750d0c..12bb972398e 100644 --- a/pkgs/applications/audio/spectrojack/default.nix +++ b/pkgs/applications/audio/spectrojack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libjack2, fftwFloat, gtk2 }: +{ lib, stdenv, fetchurl, pkg-config, libjack2, fftwFloat, gtk2 }: stdenv.mkDerivation rec { pname = "spectrojack"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { url = "http://sed.free.fr/spectrojack/${pname}-${version}.tar.gz"; sha256 = "1kiwx0kag7kq7rhg0bvckfm8r7pqmbk76ppa39cq2980jb5v8rfp"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libjack2 fftwFloat gtk2 ]; configurePhase= '' sed -i 's/.*home.*/#&/' ./Makefile @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { meta = { description = "A little spectrogram/audiogram/sonogram/whatever for JACK"; homepage = "http://sed.free.fr/spectrojack"; - license = stdenv.lib.licenses.publicDomain; - maintainers = with stdenv.lib.maintainers; [ sleexyz ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.publicDomain; + maintainers = with lib.maintainers; [ sleexyz ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/audio/speech-denoiser/default.nix b/pkgs/applications/audio/speech-denoiser/default.nix index 34b372f964e..c6536c4d20f 100644 --- a/pkgs/applications/audio/speech-denoiser/default.nix +++ b/pkgs/applications/audio/speech-denoiser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, lv2, meson, ninja }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, lv2, meson, ninja }: let speech-denoiser-src = fetchFromGitHub { @@ -24,7 +24,7 @@ stdenv.mkDerivation { src = speech-denoiser-src; - nativeBuildInputs = [ pkgconfig meson ninja ]; + nativeBuildInputs = [ pkg-config meson ninja ]; buildInputs = [ lv2 rnnoise-nu ]; mesonFlags = ("--prefix=${placeholder "out"}/lib/lv2"); diff --git a/pkgs/applications/audio/spek/default.nix b/pkgs/applications/audio/spek/default.nix index d4b83605c32..1a73b8adea7 100644 --- a/pkgs/applications/audio/spek/default.nix +++ b/pkgs/applications/audio/spek/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, intltool, pkgconfig, ffmpeg, wxGTK30-gtk3, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, intltool, pkg-config, ffmpeg, wxGTK30-gtk3, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "spek"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { # needed for autoreconfHook AUTOPOINT="intltoolize --automake --copy"; - nativeBuildInputs = [ autoreconfHook intltool pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ autoreconfHook intltool pkg-config wrapGAppsHook ]; buildInputs = [ ffmpeg wxGTK30-gtk3 wxGTK30-gtk3.gtk ]; diff --git a/pkgs/applications/audio/split2flac/default.nix b/pkgs/applications/audio/split2flac/default.nix index 689e9e1cb24..92f0753fd78 100644 --- a/pkgs/applications/audio/split2flac/default.nix +++ b/pkgs/applications/audio/split2flac/default.nix @@ -9,7 +9,7 @@ let wrapSplit2flac = format: '' makeWrapper $out/bin/.split2flac-wrapped $out/bin/split2${format} \ --set SPLIT2FLAC_FORMAT ${format} \ - --prefix PATH : ${stdenv.lib.makeBinPath [ + --prefix PATH : ${lib.makeBinPath [ shntool cuetools flac faac mp4v2 wavpack mac imagemagick libiconv enca lame pythonPackages.mutagen vorbis-tools diff --git a/pkgs/applications/audio/spotify-cli-linux/default.nix b/pkgs/applications/audio/spotify-cli-linux/default.nix index 593ad9468eb..e473d97ce56 100644 --- a/pkgs/applications/audio/spotify-cli-linux/default.nix +++ b/pkgs/applications/audio/spotify-cli-linux/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, dbus }: +{ lib, python3Packages, dbus }: python3Packages.buildPythonApplication rec { pname = "spotify-cli-linux"; version = "1.6.0"; diff --git a/pkgs/applications/audio/spotify-tui/default.nix b/pkgs/applications/audio/spotify-tui/default.nix index 55a725e59b0..78972effc4d 100644 --- a/pkgs/applications/audio/spotify-tui/default.nix +++ b/pkgs/applications/audio/spotify-tui/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, pkgconfig, openssl, python3, libxcb, AppKit, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, pkg-config, openssl, python3, libxcb, AppKit, Security }: rustPlatform.buildRustPackage rec { pname = "spotify-tui"; @@ -13,10 +13,10 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "100c7x603qyhav3p24clwfal4ngh0258x9lqsi84kcj4wq2f3i8f"; - nativeBuildInputs = [ installShellFiles ] ++ stdenv.lib.optionals stdenv.isLinux [ pkgconfig python3 ]; + nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ pkg-config python3 ]; buildInputs = [ ] - ++ stdenv.lib.optionals stdenv.isLinux [ openssl libxcb ] - ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Security ]; + ++ lib.optionals stdenv.isLinux [ openssl libxcb ] + ++ lib.optionals stdenv.isDarwin [ AppKit Security ]; postInstall = '' for shell in bash fish zsh; do diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index bfc8757445c..43ecb67d64a 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -135,7 +135,7 @@ stdenv.mkDerivation { --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath $rpath $out/share/spotify/spotify - librarypath="${stdenv.lib.makeLibraryPath deps}:$libdir" + librarypath="${lib.makeLibraryPath deps}:$libdir" wrapProgram $out/share/spotify/spotify \ --prefix LD_LIBRARY_PATH : "$librarypath" \ --prefix PATH : "${gnome3.zenity}/bin" diff --git a/pkgs/applications/audio/spotifyd/default.nix b/pkgs/applications/audio/spotifyd/default.nix index 737b8656c6a..776c9576bb4 100644 --- a/pkgs/applications/audio/spotifyd/default.nix +++ b/pkgs/applications/audio/spotifyd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPackages_1_45, pkgconfig, openssl +{ lib, fetchFromGitHub, rustPackages, pkg-config, openssl , withALSA ? true, alsaLib ? null , withPulseAudio ? false, libpulseaudio ? null , withPortAudio ? false, portaudio ? null @@ -7,35 +7,32 @@ , dbus ? null }: -# rust >= 1.48 causes a panic within spotifyd on music playback. as long as -# there is no upstream fix for the issue we use an older version of rust. -# Upstream issue: https://github.com/Spotifyd/spotifyd/issues/719 -rustPackages_1_45.rustPlatform.buildRustPackage rec { +rustPackages.rustPlatform.buildRustPackage rec { pname = "spotifyd"; - version = "0.2.24"; + version = "0.3.0"; src = fetchFromGitHub { owner = "Spotifyd"; repo = "spotifyd"; rev = "v${version}"; - sha256 = "08i0zm7kgprixqjpgaxk7xid1njgj6lmi896jf9fsjqzdzlblqk8"; + sha256 = "055njhy9if4qpsbgbr6615xxhcx9plava1m4l323vi4dbw09wh5r"; }; - cargoSha256 = "0200apqbx769ggjnjr0m72g61ikhml2xak5n1il2pvfx1yf5nw0n"; + cargoSha256 = "1ijrl208607abjwpr3cajcbj6sr35bk6ik778a58zf28kzdhrawc"; cargoBuildFlags = [ "--no-default-features" "--features" - "${stdenv.lib.optionalString withALSA "alsa_backend,"}${stdenv.lib.optionalString withPulseAudio "pulseaudio_backend,"}${stdenv.lib.optionalString withPortAudio "portaudio_backend,"}${stdenv.lib.optionalString withMpris "dbus_mpris,"}${stdenv.lib.optionalString withKeyring "dbus_keyring,"}" + "${lib.optionalString withALSA "alsa_backend,"}${lib.optionalString withPulseAudio "pulseaudio_backend,"}${lib.optionalString withPortAudio "portaudio_backend,"}${lib.optionalString withMpris "dbus_mpris,"}${lib.optionalString withKeyring "dbus_keyring,"}" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ stdenv.lib.optional withALSA alsaLib - ++ stdenv.lib.optional withPulseAudio libpulseaudio - ++ stdenv.lib.optional withPortAudio portaudio - ++ stdenv.lib.optional (withMpris || withKeyring) dbus; + ++ lib.optional withALSA alsaLib + ++ lib.optional withPulseAudio libpulseaudio + ++ lib.optional withPortAudio portaudio + ++ lib.optional (withMpris || withKeyring) dbus; doCheck = false; diff --git a/pkgs/applications/audio/squeezelite/default.nix b/pkgs/applications/audio/squeezelite/default.nix index d5c84888eeb..6bb3bef8a50 100644 --- a/pkgs/applications/audio/squeezelite/default.nix +++ b/pkgs/applications/audio/squeezelite/default.nix @@ -9,8 +9,8 @@ }: let - concatStringsSep = stdenv.lib.concatStringsSep; - optional = stdenv.lib.optional; + concatStringsSep = lib.concatStringsSep; + optional = lib.optional; opts = [ "-DLINKALL" ] ++ optional dsdSupport "-DDSD" ++ optional (!faad2Support) "-DNO_FAAD" diff --git a/pkgs/applications/audio/squishyball/default.nix b/pkgs/applications/audio/squishyball/default.nix index 06ff5f3909d..b44efc1534f 100644 --- a/pkgs/applications/audio/squishyball/default.nix +++ b/pkgs/applications/audio/squishyball/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, autoreconfHook, fetchsvn, flac, libao, libvorbis, ncurses -, opusfile, pkgconfig +, opusfile, pkg-config }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "013vq52q9z6kpg9iyc2jnb3m2gihcjblvwpg4yj4wy1q2c05pzqp"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ flac libao libvorbis ncurses opusfile ]; diff --git a/pkgs/applications/audio/stone-phaser/default.nix b/pkgs/applications/audio/stone-phaser/default.nix index 7fb4a5410fb..7d12c6cbf34 100644 --- a/pkgs/applications/audio/stone-phaser/default.nix +++ b/pkgs/applications/audio/stone-phaser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, xorg, cairo, lv2, libjack2, mesa, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, xorg, cairo, lv2, libjack2, mesa, pkg-config }: stdenv.mkDerivation rec { pname = "stone-phaser"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorg.libX11 cairo lv2 libjack2 mesa ]; diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix index 53a4cc96437..eb7aac16c64 100644 --- a/pkgs/applications/audio/strawberry/default.nix +++ b/pkgs/applications/audio/strawberry/default.nix @@ -3,7 +3,7 @@ , lib , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , alsaLib , boost , chromaprint @@ -77,7 +77,7 @@ mkDerivation rec { ]) ++ lib.optional withVlc libvlc; - nativeBuildInputs = [ cmake ninja pkgconfig qttools ]; + nativeBuildInputs = [ cmake ninja pkg-config qttools ]; cmakeFlags = [ "-DUSE_SYSTEM_TAGLIB=ON" diff --git a/pkgs/applications/audio/streamripper/default.nix b/pkgs/applications/audio/streamripper/default.nix index 7d21e816667..6fae14e2b1a 100644 --- a/pkgs/applications/audio/streamripper/default.nix +++ b/pkgs/applications/audio/streamripper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl , glib, pkgconfig, libogg, libvorbis, libmad }: +{ lib, stdenv, fetchurl , glib, pkg-config, libogg, libvorbis, libmad }: stdenv.mkDerivation rec { pname = "streamripper"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0hnyv3206r0rfprn3k7k6a0j959kagsfyrmyjm3gsf3vkhp5zmy1"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib libogg libvorbis libmad ]; meta = with lib; { diff --git a/pkgs/applications/audio/sunvox/default.nix b/pkgs/applications/audio/sunvox/default.nix index 12397f2fdbf..abc31d9f180 100644 --- a/pkgs/applications/audio/sunvox/default.nix +++ b/pkgs/applications/audio/sunvox/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, unzip, alsaLib, libX11, libXi, SDL2 }: let - libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc alsaLib libX11 libXi SDL2 ]; + libPath = lib.makeLibraryPath [ stdenv.cc.cc alsaLib libX11 libXi SDL2 ]; arch = if stdenv.isAarch64 then "arm64" diff --git a/pkgs/applications/audio/swh-lv2/default.nix b/pkgs/applications/audio/swh-lv2/default.nix index ccec7b9171f..f2b71c1ce29 100644 --- a/pkgs/applications/audio/swh-lv2/default.nix +++ b/pkgs/applications/audio/swh-lv2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fftwSinglePrec, libxslt, lv2, pkgconfig }: +{ lib, stdenv, fetchurl, fftwSinglePrec, libxslt, lv2, pkg-config }: stdenv.mkDerivation rec { pname = "swh-lv2"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sed -e "s#PREFIX = /usr/local#PREFIX = $out#" -i Makefile ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ fftwSinglePrec lv2 ]; installPhase = "make install-system"; diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix index f10b20bfc3c..50e16c355e2 100644 --- a/pkgs/applications/audio/synthv1/default.nix +++ b/pkgs/applications/audio/synthv1/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchurl, pkgconfig, qtbase, qttools, libjack2, alsaLib, liblo, lv2 }: +{ mkDerivation, lib, fetchurl, pkg-config, qtbase, qttools, libjack2, alsaLib, liblo, lv2 }: mkDerivation rec { pname = "synthv1"; @@ -11,7 +11,7 @@ mkDerivation rec { buildInputs = [ qtbase qttools libjack2 alsaLib liblo lv2 ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = with lib; { description = "An old-school 4-oscillator subtractive polyphonic synthesizer with stereo fx"; diff --git a/pkgs/applications/audio/tageditor/default.nix b/pkgs/applications/audio/tageditor/default.nix new file mode 100644 index 00000000000..02e23084cf5 --- /dev/null +++ b/pkgs/applications/audio/tageditor/default.nix @@ -0,0 +1,58 @@ +{ stdenv +, pkgs +, fetchFromGitHub +, pkg-config +, cmake + +, cpp-utilities +, qtutilities +, mp4v2 +, libid3tag +, qtbase +, qttools +, qtwebengine +, qtx11extras +, tagparser +, wrapQtAppsHook +}: + +stdenv.mkDerivation rec { + pname = "tageditor"; + version = "3.3.10"; + + src = fetchFromGitHub { + owner = "martchus"; + repo = "tageditor"; + rev = "v${version}"; + sha256 = "16cmq7dyalcwc8gx1y9acngw5imjh8ydp4prxy7qpzk4fj3kpsak"; + }; + + nativeBuildInputs = [ + pkg-config + cmake + wrapQtAppsHook + ]; + buildInputs = [ + mp4v2 + libid3tag + pkg-config + qtbase + qttools + qtx11extras + qtwebengine + cpp-utilities + qtutilities + tagparser + ]; + + enableParallelBuilding = true; + + meta = with pkgs.lib; { + homepage = "https://github.com/Martchus/tageditor"; + description = "A tag editor with Qt GUI and command-line interface supporting MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus, FLAC and Matroska"; + license = licenses.gpl2; + maintainers = [ maintainers.matthiasbeyer ]; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/applications/audio/talentedhack/default.nix b/pkgs/applications/audio/talentedhack/default.nix index 0dd9a03739d..387fd4f5a0c 100644 --- a/pkgs/applications/audio/talentedhack/default.nix +++ b/pkgs/applications/audio/talentedhack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, lv2, fftwFloat, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, lv2, fftwFloat, pkg-config }: stdenv.mkDerivation rec { pname = "talentedhack"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0kwvayalysmk7y49jq0k16al252md8d45z58hphzsksmyz6148bx"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ lv2 fftwFloat ]; diff --git a/pkgs/applications/audio/tap-plugins/default.nix b/pkgs/applications/audio/tap-plugins/default.nix index 2b04b450dec..c0b2c64822f 100644 --- a/pkgs/applications/audio/tap-plugins/default.nix +++ b/pkgs/applications/audio/tap-plugins/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ladspa-sdk, pkgs, ... }: +{ lib, stdenv, fetchurl, ladspa-sdk, pkgs, ... }: stdenv.mkDerivation rec { pname = "tap-plugins"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace /usr/local "$out" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tom's Audio Processing plugins"; longDescription = '' A number of LADSPA plugins including: TAP AutoPanner, TAP Chorus/Flanger, TAP DeEsser, diff --git a/pkgs/applications/audio/timemachine/default.nix b/pkgs/applications/audio/timemachine/default.nix index 8be43346bc0..623714e706f 100644 --- a/pkgs/applications/audio/timemachine/default.nix +++ b/pkgs/applications/audio/timemachine/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, gtk2 +{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, gtk2 , libjack2, libsndfile }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "16fgyw6jnscx9279dczv72092dddghwlp53rkfw469kcgvjhwx0z"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoconf automake gtk2 libjack2 libsndfile ]; @@ -24,9 +24,9 @@ stdenv.mkDerivation rec { meta = { description = "JACK audio recorder"; homepage = "http://plugin.org.uk/timemachine/"; - license = stdenv.lib.licenses.lgpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.nico202 ]; + license = lib.licenses.lgpl2; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.nico202 ]; }; } diff --git a/pkgs/applications/audio/tony/default.nix b/pkgs/applications/audio/tony/default.nix index 8d3ba620f9d..d8265c3161b 100644 --- a/pkgs/applications/audio/tony/default.nix +++ b/pkgs/applications/audio/tony/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, wrapQtAppsHook +{ lib, stdenv, fetchurl, pkg-config, wrapQtAppsHook , alsaLib, boost, bzip2, fftw, fftwFloat, libX11, libfishsound, libid3tag , libjack2, liblo, libmad, libogg, liboggz, libpulseaudio, libsamplerate , libsndfile, lrdf, opusfile, qtbase, qtsvg, rubberband, serd, sord @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "03g2bmlj08lmgvh54dyd635xccjn730g4wwlhpvsw04bffz8b7fp"; }; - nativeBuildInputs = [ pkgconfig wrapQtAppsHook ]; + nativeBuildInputs = [ pkg-config wrapQtAppsHook ]; buildInputs = [ alsaLib boost bzip2 fftw fftwFloat libX11 libfishsound libid3tag diff --git a/pkgs/applications/audio/transcode/default.nix b/pkgs/applications/audio/transcode/default.nix index cc3c8c7a0f0..ff10ff13e19 100644 --- a/pkgs/applications/audio/transcode/default.nix +++ b/pkgs/applications/audio/transcode/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, flac, lame, zlib, libjpeg, libvorbis, libtheora, libxml2 -, lzo, libdvdread, pkgconfig, x264, libmpeg2, xvidcore }: +, lzo, libdvdread, pkg-config, x264, libmpeg2, xvidcore }: stdenv.mkDerivation rec { name = "transcode-1.1.7"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ flac lame zlib libjpeg libvorbis libtheora libxml2 lzo - libdvdread pkgconfig x264 libmpeg2 xvidcore ]; + libdvdread pkg-config x264 libmpeg2 xvidcore ]; configureFlags = [ "--disable-ffmpeg" "--disable-libavcodec" "--disable-libavformat" "--enable-lzo" "--enable-ogg" "--enable-vorbis" "--enable-theora" "--enable-libxml2" diff --git a/pkgs/applications/audio/traverso/default.nix b/pkgs/applications/audio/traverso/default.nix index f9395ec6fa2..71a91dc3105 100644 --- a/pkgs/applications/audio/traverso/default.nix +++ b/pkgs/applications/audio/traverso/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchurl, cmake, pkgconfig +{ mkDerivation, lib, fetchurl, cmake, pkg-config , alsaLib, fftw, flac, lame, libjack2, libmad, libpulseaudio , libsamplerate, libsndfile, libvorbis, portaudio, qtbase, wavpack }: @@ -11,7 +11,7 @@ mkDerivation { sha256 = "12f7x8kw4fw1j0xkwjrp54cy4cv1ql0zwz2ba5arclk4pf6bhl7q"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ alsaLib fftw flac.dev libjack2 lame libmad libpulseaudio libsamplerate.dev libsndfile.dev libvorbis portaudio qtbase wavpack ]; diff --git a/pkgs/applications/audio/tree-from-tags/gemset.nix b/pkgs/applications/audio/tree-from-tags/gemset.nix index 20e10e9d93b..f482d174ebc 100644 --- a/pkgs/applications/audio/tree-from-tags/gemset.nix +++ b/pkgs/applications/audio/tree-from-tags/gemset.nix @@ -7,4 +7,4 @@ }; version = "0.7.1"; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/audio/uade123/default.nix b/pkgs/applications/audio/uade123/default.nix index 09e066dadac..368731c52b3 100644 --- a/pkgs/applications/audio/uade123/default.nix +++ b/pkgs/applications/audio/uade123/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, which, libao, pkgconfig }: +{ lib, stdenv, fetchurl, which, libao, pkg-config }: let version = "2.13"; @@ -9,7 +9,7 @@ in stdenv.mkDerivation { url = "http://zakalwe.fi/uade/uade2/uade-${version}.tar.bz2"; sha256 = "04nn5li7xy4g5ysyjjngmv5d3ibxppkbb86m10vrvadzxdd4w69v"; }; - nativeBuildInputs = [ pkgconfig which ]; + nativeBuildInputs = [ pkg-config which ]; buildInputs = [ libao ]; enableParallelBuilding = true; @@ -19,7 +19,7 @@ in stdenv.mkDerivation { description = "Plays old Amiga tunes through UAE emulation and cloned m68k-assembler Eagleplayer API"; homepage = "http://zakalwe.fi/uade/"; license = licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.gnidorah ]; - platforms = stdenv.lib.platforms.unix; + maintainers = [ lib.maintainers.gnidorah ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/audio/vcv-rack/default.nix b/pkgs/applications/audio/vcv-rack/default.nix index 27844841482..c7e24b926c0 100644 --- a/pkgs/applications/audio/vcv-rack/default.nix +++ b/pkgs/applications/audio/vcv-rack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, makeWrapper, fetchzip, fetchFromGitHub, pkgconfig +{ lib, stdenv, makeWrapper, fetchzip, fetchFromGitHub, pkg-config , alsaLib, curl, glew, glfw, gtk2-x11, jansson, libjack2, libXext, libXi , libzip, rtaudio, rtmidi, speex, libsamplerate }: @@ -36,7 +36,7 @@ let sha256 = "17kd0lh2x3x12bxkyhq6z8sg6vxln8m9qirf0basvcsmylr6rb64"; }; in -with stdenv.lib; stdenv.mkDerivation rec { +with lib; stdenv.mkDerivation rec { pname = "VCV-Rack"; version = "1.1.6"; @@ -74,7 +74,7 @@ with stdenv.lib; stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = [ alsaLib curl glew glfw gtk2-x11 jansson libjack2 libsamplerate libzip rtaudio rtmidi speex ]; buildFlags = [ "Rack" ]; diff --git a/pkgs/applications/audio/vimpc/default.nix b/pkgs/applications/audio/vimpc/default.nix index b0412005aba..e38fc838667 100644 --- a/pkgs/applications/audio/vimpc/default.nix +++ b/pkgs/applications/audio/vimpc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, mpd_clientlib, ncurses, pcre, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, mpd_clientlib, ncurses, pcre, pkg-config , taglib, curl }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0lswzkap2nm7v5h7ppb6a64cb35rajysd09nb204rxgrkij4m6nx"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ mpd_clientlib ncurses pcre taglib curl ]; postInstall = '' diff --git a/pkgs/applications/audio/virtual-ans/default.nix b/pkgs/applications/audio/virtual-ans/default.nix index dd7e8b062da..1cb9c0f18bf 100644 --- a/pkgs/applications/audio/virtual-ans/default.nix +++ b/pkgs/applications/audio/virtual-ans/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { startScript = if stdenv.isx86_32 then "START_LINUX_X86" else if stdenv.isx86_64 then "START_LINUX_X86_64" #else if stdenv.isDarwin then "START_MACOS.app" # disabled because I cannot test on Darwin - else abort "Unsupported platform: ${stdenv.platform.kernelArch}."; + else abort "Unsupported platform: ${stdenv.hostPlatform.linuxArch}."; linuxExecutable = if stdenv.isx86_32 then "pixilang_linux_x86" else if stdenv.isx86_64 then "pixilang_linux_x86_64" diff --git a/pkgs/applications/audio/vocal/default.nix b/pkgs/applications/audio/vocal/default.nix index fb1046aab52..8c449316674 100644 --- a/pkgs/applications/audio/vocal/default.nix +++ b/pkgs/applications/audio/vocal/default.nix @@ -4,7 +4,7 @@ , cmake , ninja , vala -, pkgconfig +, pkg-config , pantheon , gtk3 , glib @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { libxml2 ninja vala - pkgconfig + pkg-config wrapGAppsHook ]; diff --git a/pkgs/applications/audio/vocproc/default.nix b/pkgs/applications/audio/vocproc/default.nix index dce4ed36aac..46957000507 100644 --- a/pkgs/applications/audio/vocproc/default.nix +++ b/pkgs/applications/audio/vocproc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, pkgconfig, lvtk, lv2, fftw, lv2-cpp-tools, gtkmm2 }: +{ lib, stdenv, fetchzip, pkg-config, lvtk, lv2, fftw, lv2-cpp-tools, gtkmm2 }: stdenv.mkDerivation rec { pname = "vocproc"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "07a1scyz14mg2jdbw6fpv4qg91zsw61qqii64n9qbnny9d5pn8n2"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ lv2 fftw lv2-cpp-tools gtkmm2 ]; diff --git a/pkgs/applications/audio/vorbis-tools/default.nix b/pkgs/applications/audio/vorbis-tools/default.nix index b50912f26d7..894bed1715f 100644 --- a/pkgs/applications/audio/vorbis-tools/default.nix +++ b/pkgs/applications/audio/vorbis-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchzip, libogg, libvorbis, libao, pkgconfig, curl +{ lib, stdenv, fetchurl, fetchzip, libogg, libvorbis, libao, pkg-config, curl , speex, flac }: let @@ -20,7 +20,7 @@ stdenv.mkDerivation { done ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libogg libvorbis libao curl speex flac ]; meta = with lib; { diff --git a/pkgs/applications/audio/waon/default.nix b/pkgs/applications/audio/waon/default.nix index 78e4fb1a5c5..970ab087b2c 100644 --- a/pkgs/applications/audio/waon/default.nix +++ b/pkgs/applications/audio/waon/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fftw, gtk2, libao, libsamplerate -, libsndfile, ncurses, pkgconfig +, libsndfile, ncurses, pkg-config }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1xmq8d2rj58xbp4rnyav95y1vnz3r9s9db7xxfa2rd0ilq0ps4y7"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ fftw gtk2 libao libsamplerate libsndfile ncurses ]; installPhase = '' diff --git a/pkgs/applications/audio/wavegain/default.nix b/pkgs/applications/audio/wavegain/default.nix index d9b13f53273..f4ef7f6d8a5 100644 --- a/pkgs/applications/audio/wavegain/default.nix +++ b/pkgs/applications/audio/wavegain/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { name = "wavegain-1.3.1"; @@ -17,8 +17,8 @@ stdenv.mkDerivation { meta = { description = "ReplayGain for wave files"; homepage = "https://github.com/MestreLion/wavegain"; - license = stdenv.lib.licenses.lgpl21; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.robbinch ]; + license = lib.licenses.lgpl21; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.robbinch ]; }; } diff --git a/pkgs/applications/audio/whipper/default.nix b/pkgs/applications/audio/whipper/default.nix index 227091dd581..97d42eb9c69 100644 --- a/pkgs/applications/audio/whipper/default.nix +++ b/pkgs/applications/audio/whipper/default.nix @@ -1,9 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, python3, cdparanoia, cdrdao, flac +{ lib, fetchFromGitHub, python3, cdparanoia, cdrdao, flac , sox, accuraterip-checksum, libsndfile, util-linux, substituteAll }: python3.pkgs.buildPythonApplication rec { pname = "whipper"; - version = "0.9.1.dev7+g${stdenv.lib.substring 0 7 src.rev}"; + version = "0.9.1.dev7+g${lib.substring 0 7 src.rev}"; src = fetchFromGitHub { owner = "whipper-team"; @@ -37,7 +37,7 @@ python3.pkgs.buildPythonApplication rec { ]; makeWrapperArgs = [ - "--prefix" "PATH" ":" (stdenv.lib.makeBinPath [ accuraterip-checksum cdrdao util-linux flac sox ]) + "--prefix" "PATH" ":" (lib.makeBinPath [ accuraterip-checksum cdrdao util-linux flac sox ]) ]; preBuild = '' diff --git a/pkgs/applications/audio/wolf-shaper/default.nix b/pkgs/applications/audio/wolf-shaper/default.nix index e724e934e52..b61ea3fc4d4 100644 --- a/pkgs/applications/audio/wolf-shaper/default.nix +++ b/pkgs/applications/audio/wolf-shaper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub , libjack2, lv2, xorg, liblo, libGL, libXcursor, pkgconfig }: +{ lib, stdenv, fetchFromGitHub , libjack2, lv2, xorg, liblo, libGL, libXcursor, pkg-config }: stdenv.mkDerivation rec { pname = "wolf-shaper"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libjack2 lv2 xorg.libX11 liblo libGL libXcursor ]; makeFlags = [ diff --git a/pkgs/applications/audio/x42-avldrums/default.nix b/pkgs/applications/audio/x42-avldrums/default.nix index b2b9a4c233d..31ef68714f6 100644 --- a/pkgs/applications/audio/x42-avldrums/default.nix +++ b/pkgs/applications/audio/x42-avldrums/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, cairo, glib, libGLU, lv2, pango }: +{ lib, stdenv, fetchFromGitHub, pkg-config, cairo, glib, libGLU, lv2, pango }: stdenv.mkDerivation rec { pname = "x42-avldrums"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ cairo glib libGLU lv2 pango ]; makeFlags = [ diff --git a/pkgs/applications/audio/x42-gmsynth/default.nix b/pkgs/applications/audio/x42-gmsynth/default.nix index dad6d05f904..cde67908fde 100644 --- a/pkgs/applications/audio/x42-gmsynth/default.nix +++ b/pkgs/applications/audio/x42-gmsynth/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, glib, lv2 }: +{ lib, stdenv, fetchFromGitHub, pkg-config, glib, lv2 }: stdenv.mkDerivation rec { pname = "x42-gmsynth"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "08dvdj8r17sfl6l18g2b8abgls2irkbrq5vhrfai01hp2m0rlm34"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib lv2 ]; makeFlags = [ diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix index d3726eab7ff..2d2f670d067 100644 --- a/pkgs/applications/audio/x42-plugins/default.nix +++ b/pkgs/applications/audio/x42-plugins/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , libltc, libsndfile, libsamplerate, ftgl, freefont_ttf, libjack2 , libGLU, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1av05ykph8x67018hm9zfgh1vk0zi39mvrsxkj6bm4hkarxf0vvl"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libGLU ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate lv2 gtk2 cairo pango fftwFloat zita-convolver ]; # Don't remove this. The default fails with 'do not know how to unpack source archive' @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { sed -i 's|/usr/include/zita-convolver.h|${zita-convolver}/include/zita-convolver.h|g' ./convoLV2/Makefile ''; - meta = with stdenv.lib; + meta = with lib; { description = "Collection of LV2 plugins by Robin Gareus"; homepage = "https://github.com/x42/x42-plugins"; maintainers = with maintainers; [ magnetophon ]; diff --git a/pkgs/applications/audio/xmp/default.nix b/pkgs/applications/audio/xmp/default.nix index d38faa6925d..b6accf1993a 100644 --- a/pkgs/applications/audio/xmp/default.nix +++ b/pkgs/applications/audio/xmp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, alsaLib, libxmp }: +{ lib, stdenv, fetchurl, pkg-config, alsaLib, libxmp }: stdenv.mkDerivation rec { name = "xmp-4.1.0"; @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { sha256 = "17i8fc7x7yn3z1x963xp9iv108gxfakxmdgmpv3mlm438w3n3g8x"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ alsaLib libxmp ]; } diff --git a/pkgs/applications/audio/xsynth-dssi/default.nix b/pkgs/applications/audio/xsynth-dssi/default.nix index e8f6bd94bb4..b994f197e67 100644 --- a/pkgs/applications/audio/xsynth-dssi/default.nix +++ b/pkgs/applications/audio/xsynth-dssi/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, alsaLib, autoconf, automake, dssi, gtk2, libjack2, -ladspaH, ladspaPlugins, liblo, pkgconfig }: +ladspaH, ladspaPlugins, liblo, pkg-config }: stdenv.mkDerivation rec { pname = "xsynth-dssi"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ alsaLib autoconf automake dssi gtk2 libjack2 ladspaH - ladspaPlugins liblo pkgconfig ]; + ladspaPlugins liblo pkg-config ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/audio/yasr/default.nix b/pkgs/applications/audio/yasr/default.nix index fed2ee0d8f7..21313b9c059 100644 --- a/pkgs/applications/audio/yasr/default.nix +++ b/pkgs/applications/audio/yasr/default.nix @@ -1,4 +1,4 @@ -{stdenv,fetchurl}: +{lib, stdenv,fetchurl}: stdenv.mkDerivation rec { pname = "yasr"; @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { homepage = "http://yasr.sourceforge.net"; description = "A general-purpose console screen reader"; longDescription = "Yasr is a general-purpose console screen reader for GNU/Linux and other Unix-like operating systems."; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ jhhuh ]; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ jhhuh ]; }; } diff --git a/pkgs/applications/audio/ympd/default.nix b/pkgs/applications/audio/ympd/default.nix index 72c17aed52e..c12c060864d 100644 --- a/pkgs/applications/audio/ympd/default.nix +++ b/pkgs/applications/audio/ympd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkg-config, mpd_clientlib, openssl }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, mpd_clientlib, openssl }: stdenv.mkDerivation rec { pname = "ympd"; @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.ympd.org"; description = "Standalone MPD Web GUI written in C, utilizing Websockets and Bootstrap/JS"; - maintainers = [ stdenv.lib.maintainers.siddharthist ]; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.gpl2; + maintainers = [ lib.maintainers.siddharthist ]; + platforms = lib.platforms.unix; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index 7f5b0e8d008..e9e191112f9 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub , alsaLib, boost, cairo, cmake, fftwSinglePrec, fltk, pcre -, libjack2, libsndfile, libXdmcp, readline, lv2, libGLU, libGL, minixml, pkgconfig, zlib, xorg +, libjack2, libsndfile, libXdmcp, readline, lv2, libGLU, libGL, minixml, pkg-config, zlib, xorg }: assert stdenv ? glibc; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { minixml zlib xorg.libpthreadstubs pcre ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; patchPhase = '' substituteInPlace src/Misc/Config.cpp --replace /usr $out diff --git a/pkgs/applications/audio/zam-plugins/default.nix b/pkgs/applications/audio/zam-plugins/default.nix index 82993ec2673..777ac79a22d 100644 --- a/pkgs/applications/audio/zam-plugins/default.nix +++ b/pkgs/applications/audio/zam-plugins/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, boost, libX11, libGL, liblo, libjack2, ladspaH, lv2, pkgconfig, rubberband, libsndfile, fftwFloat, libsamplerate }: +{ lib, stdenv, fetchFromGitHub, boost, libX11, libGL, liblo, libjack2, ladspaH, lv2, pkg-config, rubberband, libsndfile, fftwFloat, libsamplerate }: stdenv.mkDerivation rec { pname = "zam-plugins"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ boost libX11 libGL liblo libjack2 ladspaH lv2 rubberband libsndfile fftwFloat libsamplerate ]; postPatch = '' @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; makeFlags = [ - "PREFIX=${placeholder ''out''}" + "PREFIX=${placeholder "out"}" ]; enableParallelBuilding = true; diff --git a/pkgs/applications/backup/areca/default.nix b/pkgs/applications/backup/areca/default.nix index 2cf0113cb5a..b50ebdd4a87 100644 --- a/pkgs/applications/backup/areca/default.nix +++ b/pkgs/applications/backup/areca/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { substituteInPlace jni/com_myJava_file_metadata_posix_jni_wrapper_FileAccessWrapper.c --replace attr/xattr.h sys/xattr.h sed -i "s#^PROGRAM_DIR.*#PROGRAM_DIR=$out#g" bin/areca_run.sh - sed -i "s#^LIBRARY_PATH.*#LIBRARY_PATH=$out/lib:${stdenv.lib.makeLibraryPath [ swt acl ]}#g" bin/areca_run.sh + sed -i "s#^LIBRARY_PATH.*#LIBRARY_PATH=$out/lib:${lib.makeLibraryPath [ swt acl ]}#g" bin/areca_run.sh # https://sourceforge.net/p/areca/bugs/563/ substituteInPlace bin/areca_run.sh --replace '[ "$JAVA_IMPL" = "java" ]' \ diff --git a/pkgs/applications/backup/vorta/default.nix b/pkgs/applications/backup/vorta/default.nix index fc7e6c0fc35..a1b5944a51e 100644 --- a/pkgs/applications/backup/vorta/default.nix +++ b/pkgs/applications/backup/vorta/default.nix @@ -1,26 +1,27 @@ -{ buildPythonApplication, fetchFromGitHub, lib, paramiko, peewee, pyqt5 -, python-dateutil, APScheduler, psutil, qdarkstyle, secretstorage -, appdirs, setuptools, qt5 +{ lib +, python3 +, fetchFromGitHub +, wrapQtAppsHook }: -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "vorta"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "borgbase"; repo = "vorta"; rev = "v${version}"; - sha256 = "069fq5gv324l2ap3g6m6i12lhq1iqm27dsmaagyc3sva945j0gxw"; + sha256 = "1amq0fz3xrnxplzd6ih2azx6b4k1w496kcr7f8agfp617f5rkwa5"; }; postPatch = '' sed -i -e '/setuptools_git/d' -e '/pytest-runner/d' setup.cfg ''; - nativeBuildInputs = [ qt5.wrapQtAppsHook ]; + nativeBuildInputs = [ wrapQtAppsHook ]; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3.pkgs; [ paramiko peewee pyqt5 python-dateutil APScheduler psutil qdarkstyle secretstorage appdirs setuptools ]; @@ -33,7 +34,7 @@ buildPythonApplication rec { ''; meta = with lib; { - license = licenses.gpl3; + license = licenses.gpl3Only; homepage = "https://vorta.borgbase.com/"; maintainers = with maintainers; [ ma27 ]; description = "Desktop Backup Client for Borg"; diff --git a/pkgs/applications/blockchains/aeon/default.nix b/pkgs/applications/blockchains/aeon/default.nix index b9c8512ae13..79742d48a99 100644 --- a/pkgs/applications/blockchains/aeon/default.nix +++ b/pkgs/applications/blockchains/aeon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, git, doxygen, graphviz +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, git, doxygen, graphviz , boost, miniupnpc, openssl, unbound, cppzmq , zeromq, pcsclite, readline, libsodium }: @@ -18,7 +18,7 @@ stdenv.mkDerivation { sha256 = "07d87n1j4dc9gfwj6xy5jdpryn45095xdh961g6xjnjzc5fivjch"; }; - nativeBuildInputs = [ cmake pkgconfig git doxygen graphviz ]; + nativeBuildInputs = [ cmake pkg-config git doxygen graphviz ]; buildInputs = [ boost miniupnpc openssl unbound diff --git a/pkgs/applications/blockchains/bitcoin-abc.nix b/pkgs/applications/blockchains/bitcoin-abc.nix index d2b69a32ab5..446aafab8ce 100644 --- a/pkgs/applications/blockchains/bitcoin-abc.nix +++ b/pkgs/applications/blockchains/bitcoin-abc.nix @@ -1,8 +1,8 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, cmake, openssl, db53, boost +{ lib, stdenv, mkDerivation, fetchFromGitHub, pkg-config, cmake, openssl, db53, boost , zlib, miniupnpc, qtbase ? null , qttools ? null, util-linux, protobuf, qrencode, libevent , withGui, python3, jemalloc, zeromq4 }: -with stdenv.lib; +with lib; mkDerivation rec { @@ -18,7 +18,7 @@ mkDerivation rec { patches = [ ./fix-bitcoin-qt-build.patch ]; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ openssl db53 boost zlib python3 jemalloc zeromq4 miniupnpc util-linux protobuf libevent ] ++ optionals withGui [ qtbase qttools qrencode ]; diff --git a/pkgs/applications/blockchains/bitcoin-classic.nix b/pkgs/applications/blockchains/bitcoin-classic.nix index 417262f6f4d..f578313323c 100644 --- a/pkgs/applications/blockchains/bitcoin-classic.nix +++ b/pkgs/applications/blockchains/bitcoin-classic.nix @@ -1,22 +1,22 @@ -{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, openssl, db48, boost , zlib, miniupnpc, qtbase ? null, qttools ? null, util-linux, protobuf, qrencode, libevent , withGui }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { name = "bitcoin" + (toString (optional (!withGui) "d")) + "-classic-" + version; - version = "1.3.8"; + version = "1.3.8uahf"; src = fetchFromGitHub { owner = "bitcoinclassic"; repo = "bitcoinclassic"; rev = "v${version}"; - sha256 = "06ij9v7zbdnhxq9429nnxiw655cp8idldj18l7fmj94gqx07n5vh"; + sha256 = "sha256-V1cOB5FLotGS5jup/aVaiDiyr/v2KJ2SLcIu/Hrjuwk="; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ openssl db48 boost zlib miniupnpc util-linux protobuf libevent ] ++ optionals withGui [ qtbase qttools qrencode ]; @@ -28,6 +28,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + dontWrapQtApps = true; + meta = { description = "Peer-to-peer electronic cash system (Classic client)"; longDescription= '' diff --git a/pkgs/applications/blockchains/bitcoin-gold.nix b/pkgs/applications/blockchains/bitcoin-gold.nix index c108304ee37..7ff2804ba79 100644 --- a/pkgs/applications/blockchains/bitcoin-gold.nix +++ b/pkgs/applications/blockchains/bitcoin-gold.nix @@ -1,11 +1,11 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , openssl , boost , libevent , autoreconfHook , db4 -, pkgconfig +, pkg-config , protobuf , hexdump , zeromq @@ -16,7 +16,7 @@ , wrapQtAppsHook ? null }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config hexdump ] ++ optionals withGui [ wrapQtAppsHook diff --git a/pkgs/applications/blockchains/bitcoin-knots.nix b/pkgs/applications/blockchains/bitcoin-knots.nix index a7fb005ea81..eea836ac62d 100644 --- a/pkgs/applications/blockchains/bitcoin-knots.nix +++ b/pkgs/applications/blockchains/bitcoin-knots.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchFromGitHub -, pkgconfig +, pkg-config , autoreconfHook , db5 , openssl @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { sha256 = "0c8k1154kcwz6q2803wx0zigvqaij1fi5akgfqlj3yl57jjw48jj"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ openssl db5 openssl util-linux protobuf boost zlib miniupnpc libevent ]; diff --git a/pkgs/applications/blockchains/bitcoin-unlimited.nix b/pkgs/applications/blockchains/bitcoin-unlimited.nix index 8a2b9e370f5..04c906aefb2 100644 --- a/pkgs/applications/blockchains/bitcoin-unlimited.nix +++ b/pkgs/applications/blockchains/bitcoin-unlimited.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, openssl, db48, boost , zlib, miniupnpc, util-linux, protobuf, qrencode, libevent, python3 , withGui, wrapQtAppsHook ? null, qtbase ? null, qttools ? null , Foundation, ApplicationServices, AppKit }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { name = "bitcoin" + (toString (optional (!withGui) "d")) + "-unlimited-" + version; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "018a22zbvjqky0whizmgxzscmna0sh2xqgyw02yjk8qj4yi0zp8c"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook python3 ] + nativeBuildInputs = [ pkg-config autoreconfHook python3 ] ++ optionals withGui [ wrapQtAppsHook qttools ]; buildInputs = [ openssl db48 boost zlib miniupnpc util-linux protobuf libevent ] diff --git a/pkgs/applications/blockchains/bitcoin.nix b/pkgs/applications/blockchains/bitcoin.nix index 80e935f2b1a..b241fcc49ee 100644 --- a/pkgs/applications/blockchains/bitcoin.nix +++ b/pkgs/applications/blockchains/bitcoin.nix @@ -1,8 +1,9 @@ -{ stdenv +{ lib, stdenv , fetchurl -, pkgconfig +, pkg-config , autoreconfHook , db48 +, sqlite , boost , zeromq , hexdump @@ -16,11 +17,12 @@ , qrencode , libevent , withGui +, withWallet ? true }: -with stdenv.lib; +with lib; let - version = "0.20.1"; + version = "0.21.0"; majorMinorVersion = versions.majorMinor version; desktop = fetchurl { url = "https://raw.githubusercontent.com/bitcoin-core/packaging/${majorMinorVersion}/debian/bitcoin-qt.desktop"; @@ -36,20 +38,22 @@ stdenv.mkDerivation rec { "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" "https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" ]; - sha256 = "4bbd62fd6acfa5e9864ebf37a24a04bc2dcfe3e3222f056056288d854c53b978"; + sha256 = "1a91202c62ee49fb64d57a52b8d6d01cd392fffcbef257b573800f9289655f37"; }; nativeBuildInputs = - [ pkgconfig autoreconfHook ] + [ pkg-config autoreconfHook ] ++ optional stdenv.isDarwin hexdump ++ optional withGui wrapQtAppsHook; - buildInputs = [ db48 boost zlib zeromq miniupnpc libevent ] + buildInputs = [ boost zlib zeromq miniupnpc libevent ] ++ optionals stdenv.isLinux [ util-linux ] + ++ optionals withWallet [ db48 sqlite ] ++ optionals withGui [ qtbase qttools qrencode ]; postInstall = optional withGui '' install -Dm644 ${desktop} $out/share/applications/bitcoin-qt.desktop - install -Dm644 share/pixmaps/bitcoin128.png $out/share/pixmaps/bitcoin128.png + substituteInPlace $out/share/applications/bitcoin-qt.desktop --replace "Icon=bitcoin128" "Icon=bitcoin" + install -Dm644 share/pixmaps/bitcoin256.png $out/share/pixmaps/bitcoin.png ''; configureFlags = [ @@ -58,8 +62,9 @@ stdenv.mkDerivation rec { ] ++ optionals (!doCheck) [ "--disable-tests" "--disable-gui-tests" - ] - ++ optionals withGui [ + ] ++ optionals (!withWallet) [ + "--disable-wallet" + ] ++ optionals withGui [ "--with-gui=qt5" "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" ]; @@ -87,7 +92,7 @@ stdenv.mkDerivation rec { homepage = "https://bitcoin.org/"; downloadPage = "https://bitcoincore.org/bin/bitcoin-core-${version}/"; changelog = "https://bitcoincore.org/en/releases/${version}/"; - maintainers = with maintainers; [ roconnor ]; + maintainers = with maintainers; [ prusnak roconnor ]; license = licenses.mit; platforms = platforms.unix; }; diff --git a/pkgs/applications/blockchains/btcdeb/default.nix b/pkgs/applications/blockchains/btcdeb/default.nix index 39d2197626a..7f4e438173b 100644 --- a/pkgs/applications/blockchains/btcdeb/default.nix +++ b/pkgs/applications/blockchains/btcdeb/default.nix @@ -1,11 +1,11 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook -, pkgconfig +, pkg-config , openssl }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "btcdeb-unstable"; version = "200806"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "0qkmf89z2n7s95vhw3n9vh9dbi14zy4vqw3ffdh1w911jwm5ry3z"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ openssl ]; meta = { diff --git a/pkgs/applications/blockchains/cgminer/default.nix b/pkgs/applications/blockchains/cgminer/default.nix index b7d9bcd583a..250379ee710 100644 --- a/pkgs/applications/blockchains/cgminer/default.nix +++ b/pkgs/applications/blockchains/cgminer/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchFromGitHub -, pkgconfig +, pkg-config , libtool , autoconf , automake @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { sha256 = "0l1ms3nxnjzh4mpiadikvngcr9k3jnjqy3yna207za0va0c28dj5"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoconf automake libtool curl ncurses ocl-icd opencl-headers xorg.libX11 xorg.libXext xorg.libXinerama jansson libusb1 ]; diff --git a/pkgs/applications/blockchains/clightning.nix b/pkgs/applications/blockchains/clightning.nix index b17876325d5..745ac349975 100644 --- a/pkgs/applications/blockchains/clightning.nix +++ b/pkgs/applications/blockchains/clightning.nix @@ -1,28 +1,35 @@ -{ stdenv, python3, pkgconfig, which, libtool, autoconf, automake, - autogen, sqlite, gmp, zlib, fetchurl, unzip, fetchpatch, gettext }: - -with stdenv.lib; +{ lib +, stdenv +, fetchurl +, autoconf +, automake +, autogen +, gettext +, libtool +, pkg-config +, unzip +, which +, gmp +, libsodium +, python3 +, sqlite +, zlib +}: +let + py3 = python3.withPackages (p: [ p.Mako ]); +in stdenv.mkDerivation rec { pname = "clightning"; - version = "0.9.2"; + version = "0.9.3"; src = fetchurl { url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip"; - sha256 = "022fw6rbn0chg0432h9q05w8qnys0hd9hf1qm2qlnnmamxw4dyfy"; + sha256 = "b4563921ed8bccd59d32b031f81825dc57fbe90882f0ecd5da89e48b59ff18b2"; }; - enableParallelBuilding = true; - - nativeBuildInputs = [ autoconf autogen automake libtool pkgconfig which unzip gettext ]; - buildInputs = - let py3 = python3.withPackages (p: [ p.Mako ]); - in [ sqlite gmp zlib py3 ]; - - makeFlags = [ "prefix=$(out) VERSION=v${version}" ]; + nativeBuildInputs = [ autogen autoconf automake gettext libtool pkg-config py3 unzip which ]; - configurePhase = '' - ./configure --prefix=$out --disable-developer --disable-valgrind - ''; + buildInputs = [ gmp libsodium sqlite zlib ]; postPatch = '' patchShebangs \ @@ -32,18 +39,24 @@ stdenv.mkDerivation rec { devtools/sql-rewrite.py ''; - doCheck = false; + configurePhase = '' + ./configure --prefix=$out --disable-developer --disable-valgrind + ''; + + makeFlags = [ "prefix=$(out) VERSION=v${version}" ]; + + enableParallelBuilding = true; - meta = { + meta = with lib; { description = "A Bitcoin Lightning Network implementation in C"; - longDescription= '' + longDescription = '' c-lightning is a standard compliant implementation of the Lightning Network protocol. The Lightning Network is a scalability solution for Bitcoin, enabling secure and instant transfer of funds between any two parties for any amount. ''; homepage = "https://github.com/ElementsProject/lightning"; - maintainers = with maintainers; [ jb55 ]; + maintainers = with maintainers; [ jb55 prusnak ]; license = licenses.mit; platforms = platforms.linux; }; diff --git a/pkgs/applications/blockchains/dashpay.nix b/pkgs/applications/blockchains/dashpay.nix index b55dd3b5b78..ca1dd13e425 100644 --- a/pkgs/applications/blockchains/dashpay.nix +++ b/pkgs/applications/blockchains/dashpay.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, pkgconfig, autoreconfHook +{ fetchFromGitHub, lib, stdenv, pkg-config, autoreconfHook , openssl, db48, boost, zlib, miniupnpc , qrencode, glib, protobuf, yasm, libevent , util-linux @@ -6,7 +6,7 @@ , disable_Wallet ? false , disable_Daemon ? false }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "dashpay"; version = "0.12.2.3"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "0l1gcj2xf2bal9ph9y11x8yd28fd25f55f48xbm45bfw3ij7nbaa"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ glib openssl db48 yasm boost zlib libevent miniupnpc protobuf qrencode util-linux ]; diff --git a/pkgs/applications/blockchains/dcrwallet.nix b/pkgs/applications/blockchains/dcrwallet.nix index 779e7135618..2266a1e4c26 100644 --- a/pkgs/applications/blockchains/dcrwallet.nix +++ b/pkgs/applications/blockchains/dcrwallet.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dcrwallet"; - version = "1.5.1"; + version = "1.6.0"; src = fetchFromGitHub { owner = "decred"; repo = "dcrwallet"; rev = "refs/tags/v${version}"; - sha256 = "0ij2mwvdxg78p9qbdf9wm7aaphfg4j8lqgrjyjsj3kyi1l458ds9"; + sha256 = "sha256-WUfmv+laOwR/fc4osAFzPKqHQR+wOtSdLEsysICnuvg="; }; - vendorSha256 = "0qrrr92cad399xwr64qa9h41wqqaj0dy5mw248g5v53zars541w7"; + vendorSha256 = "sha256-9IRNlULvARIZu6dWaKrvx6fiDJ80SBLINhK/9tW9k/0="; doCheck = false; diff --git a/pkgs/applications/blockchains/dero.nix b/pkgs/applications/blockchains/dero.nix index 373170fe8ff..6b15cbd0a16 100644 --- a/pkgs/applications/blockchains/dero.nix +++ b/pkgs/applications/blockchains/dero.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, unbound, openssl, boost +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, unbound, openssl, boost , lmdb, miniupnpc, readline }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1v8b9wbmqbpyf4jpc0v276qzk3hc5fpddcmwvv5k5yfi30nmbh5c"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ boost miniupnpc openssl lmdb unbound readline ]; meta = with lib; { diff --git a/pkgs/applications/blockchains/digibyte.nix b/pkgs/applications/blockchains/digibyte.nix index 0d0fc081a11..acf0b355e64 100644 --- a/pkgs/applications/blockchains/digibyte.nix +++ b/pkgs/applications/blockchains/digibyte.nix @@ -1,11 +1,11 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , openssl , boost , libevent , autoreconfHook , db4 -, pkgconfig +, pkg-config , protobuf , hexdump , zeromq @@ -15,7 +15,7 @@ , wrapQtAppsHook ? null }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "digibyte"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config hexdump ] ++ optionals withGui [ wrapQtAppsHook diff --git a/pkgs/applications/blockchains/dogecoin.nix b/pkgs/applications/blockchains/dogecoin.nix index 527b307042c..88439d6bdbf 100644 --- a/pkgs/applications/blockchains/dogecoin.nix +++ b/pkgs/applications/blockchains/dogecoin.nix @@ -1,10 +1,10 @@ -{ stdenv , fetchFromGitHub -, pkgconfig, autoreconfHook +{ lib, stdenv , fetchFromGitHub +, pkg-config, autoreconfHook , db5, openssl, boost, zlib, miniupnpc, libevent , protobuf, util-linux, qt4, qrencode , withGui }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { name = "dogecoin" + (toString (optional (!withGui) "d")) + "-" + version; version = "1.14.2"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "1gw46q63mjzwvb17ck6p1bap2xpdrap08szw2kjhasa3yvd5swyy"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ openssl db5 openssl util-linux protobuf boost zlib miniupnpc libevent ] ++ optionals withGui [ qt4 qrencode ]; diff --git a/pkgs/applications/blockchains/ethabi.nix b/pkgs/applications/blockchains/ethabi.nix index ec142cc723e..8cf3295ccab 100644 --- a/pkgs/applications/blockchains/ethabi.nix +++ b/pkgs/applications/blockchains/ethabi.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "ethabi"; diff --git a/pkgs/applications/blockchains/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix index ae1286a384f..72af1af9536 100644 --- a/pkgs/applications/blockchains/exodus/default.nix +++ b/pkgs/applications/blockchains/exodus/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchurl, unzip, glib, systemd, nss, nspr, gtk3-x11, pango, atk, cairo, gdk-pixbuf, xorg, xorg_sys_opengl, util-linux, alsaLib, dbus, at-spi2-atk, -cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core }: +cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core, libxkbcommon, mesa }: stdenv.mkDerivation rec { pname = "exodus"; - version = "20.12.4"; + version = "21.1.18"; src = fetchurl { url = "https://downloads.exodus.io/releases/${pname}-linux-x64-${version}.zip"; - sha256 = "1j1iqmcbwfj72l7g83ah701bipas9cqwazyhh0af5hp2ckj9nmmf"; + sha256 = "sha256-cc0m1gOwIY4M0ljSSdj8WaQfU/ikGI1Zlf8gGDdht4Q="; }; sourceRoot = "."; @@ -62,6 +62,8 @@ stdenv.mkDerivation rec { libpulseaudio systemd vivaldi-ffmpeg-codecs + libxkbcommon + mesa ]; in '' patchelf \ diff --git a/pkgs/applications/blockchains/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix index 3fc3a9109c5..776253ac9cd 100644 --- a/pkgs/applications/blockchains/go-ethereum.nix +++ b/pkgs/applications/blockchains/go-ethereum.nix @@ -35,7 +35,7 @@ buildGoModule rec { # Fix for usb-related segmentation faults on darwin propagatedBuildInputs = - stdenv.lib.optionals stdenv.isDarwin [ libobjc IOKit ]; + lib.optionals stdenv.isDarwin [ libobjc IOKit ]; meta = with lib; { homepage = "https://geth.ethereum.org/"; diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 54805f2512f..f2087c63716 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -1,13 +1,13 @@ -{ lib, stdenv, fetchurl, makeDesktopItem, appimageTools, imagemagick }: +{ lib, fetchurl, makeDesktopItem, appimageTools, imagemagick }: let pname = "ledger-live-desktop"; - version = "2.19.0"; + version = "2.20.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage"; - sha256 = "13z4v64z58b8fxph3rgjqy1z1y2agmarfr8cihlkf0ndssicasdl"; + sha256 = "10gi29mcvs4d5flqycwid190pnlciznzbvg36250mxaxxs58rq7j"; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/blockchains/litecoin.nix b/pkgs/applications/blockchains/litecoin.nix index 85adbec718f..c80ef342c75 100644 --- a/pkgs/applications/blockchains/litecoin.nix +++ b/pkgs/applications/blockchains/litecoin.nix @@ -1,5 +1,5 @@ -{ stdenv, mkDerivation, fetchFromGitHub -, pkgconfig, autoreconfHook +{ lib, stdenv, mkDerivation, fetchFromGitHub +, pkg-config, autoreconfHook , openssl, db48, boost, zlib, miniupnpc , glib, protobuf, util-linux, qrencode , AppKit @@ -8,7 +8,7 @@ , zeromq }: -with stdenv.lib; +with lib; mkDerivation rec { @@ -22,7 +22,7 @@ mkDerivation rec { sha256 = "11753zhyx1kmrlljc6kbjwrcb06dfcrsqvmw3iaki9a132qk6l5c"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ openssl db48 boost zlib zeromq miniupnpc glib protobuf util-linux libevent ] ++ optionals stdenv.isDarwin [ AppKit ] diff --git a/pkgs/applications/blockchains/lnd.nix b/pkgs/applications/blockchains/lnd.nix index 831195f06f0..f5c1329090f 100644 --- a/pkgs/applications/blockchains/lnd.nix +++ b/pkgs/applications/blockchains/lnd.nix @@ -1,21 +1,21 @@ -{ buildGoModule, fetchFromGitHub, lib +{ buildGoModule +, fetchFromGitHub +, lib , tags ? [ "autopilotrpc" "signrpc" "walletrpc" "chainrpc" "invoicesrpc" "watchtowerrpc" ] }: buildGoModule rec { pname = "lnd"; - version = "0.11.0-beta"; + version = "0.12.0-beta"; src = fetchFromGitHub { owner = "lightningnetwork"; repo = "lnd"; rev = "v${version}"; - sha256 = "1r1hwz8ka5mnmrvj9zcd78kn68g8fg3d4bdx9i0xy4sc2hh1dcpj"; + sha256 = "0mjfmmi5d5d2hny3938rxxdgar3qyk6x909l25fvjr4q3l4sz4x0"; }; - vendorSha256 = "090b9sxvdwh787w0rhrcbky9pbx64qgqx1pvk9ysk3886nxdhf7k"; - - doCheck = false; + vendorSha256 = "00q8dydskzg4rhxnnpzpbmmvc3q4wzm8z3dps2bv0nx3fk0fmrl3"; subPackages = ["cmd/lncli" "cmd/lnd"]; @@ -34,7 +34,7 @@ buildGoModule rec { meta = with lib; { description = "Lightning Network Daemon"; homepage = "https://github.com/lightningnetwork/lnd"; - license = lib.licenses.mit; - maintainers = with maintainers; [ cypherpunk2140 ]; + license = licenses.mit; + maintainers = with maintainers; [ cypherpunk2140 prusnak ]; }; } diff --git a/pkgs/applications/blockchains/masari.nix b/pkgs/applications/blockchains/masari.nix index 25301a87aea..bf995da36af 100644 --- a/pkgs/applications/blockchains/masari.nix +++ b/pkgs/applications/blockchains/masari.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, unbound, openssl, boost +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, unbound, openssl, boost , lmdb, miniupnpc, readline }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0l6i21wkq5f6z8xr756i7vqgkzk7lixaa31ydy34fkfcqxppgxz3"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ boost miniupnpc openssl lmdb unbound readline ]; meta = with lib; { diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix index a34e834d4a7..9bf1ca586c2 100644 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ b/pkgs/applications/blockchains/monero-gui/default.nix @@ -1,6 +1,6 @@ -{ stdenv, wrapQtAppsHook, makeDesktopItem +{ lib, stdenv, wrapQtAppsHook, makeDesktopItem , fetchFromGitHub -, cmake, qttools, pkgconfig +, cmake, qttools, pkg-config , qtbase, qtdeclarative, qtgraphicaleffects , qtmultimedia, qtxmlpatterns , qtquickcontrols, qtquickcontrols2 @@ -15,7 +15,7 @@ , python3 ? null }: -with stdenv.lib; +with lib; assert trezorSupport -> all (x: x!=null) [ libusb1 protobuf python3 ]; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - cmake pkgconfig wrapQtAppsHook + cmake pkg-config wrapQtAppsHook (getDev qttools) ]; diff --git a/pkgs/applications/blockchains/monero/default.nix b/pkgs/applications/blockchains/monero/default.nix index c9134e3ec47..41931bc9ec3 100644 --- a/pkgs/applications/blockchains/monero/default.nix +++ b/pkgs/applications/blockchains/monero/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchpatch -, cmake, pkgconfig +, cmake, pkg-config , boost, miniupnpc, openssl, unbound , zeromq, pcsclite, readline, libsodium, hidapi , randomx, rapidjson @@ -10,7 +10,7 @@ , python3 ? null }: -with stdenv.lib; +with lib; assert stdenv.isDarwin -> IOKit != null; assert trezorSupport -> all (x: x!=null) [ libusb1 protobuf python3 ]; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { cp -r . $source ''; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ boost miniupnpc openssl unbound diff --git a/pkgs/applications/blockchains/namecoin.nix b/pkgs/applications/blockchains/namecoin.nix index cbce1773104..dccee1dc056 100644 --- a/pkgs/applications/blockchains/namecoin.nix +++ b/pkgs/applications/blockchains/namecoin.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, openssl, boost, libevent, autoreconfHook, db4, miniupnpc, eject, pkgconfig, qt4, protobuf, qrencode, hexdump +{ lib, stdenv, fetchFromGitHub, openssl, boost, libevent, autoreconfHook, db4, miniupnpc, eject, pkg-config, qt4, protobuf, qrencode, hexdump , withGui }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { version = "nc0.20.1"; name = "namecoin" + toString (optional (!withGui) "d") + "-" + version; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config hexdump ]; diff --git a/pkgs/applications/blockchains/nano-wallet/default.nix b/pkgs/applications/blockchains/nano-wallet/default.nix index 664e2674062..60ad51152f6 100644 --- a/pkgs/applications/blockchains/nano-wallet/default.nix +++ b/pkgs/applications/blockchains/nano-wallet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, wrapQtAppsHook, boost, libGL +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, wrapQtAppsHook, boost, libGL , qtbase}: stdenv.mkDerivation rec { @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { optionToFlag = name: value: "-D${name}=${value}"; in lib.mapAttrsToList optionToFlag options; - nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; buildInputs = [ boost libGL qtbase ]; buildPhase = '' diff --git a/pkgs/applications/blockchains/openethereum/default.nix b/pkgs/applications/blockchains/openethereum/default.nix index 563b2378f84..8ad7c8fdd6c 100644 --- a/pkgs/applications/blockchains/openethereum/default.nix +++ b/pkgs/applications/blockchains/openethereum/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "openethereum"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "openethereum"; repo = "openethereum"; rev = "v${version}"; - sha256 = "cs84Zz0nhagGDu5sDFTaFZF3SPEgJU8F4vGX7KLihOM="; + sha256 = "sha256-RUrJuJF0R0mc7XdLyk915fRWtMfzjp5QE6oeWxHfyEQ="; }; - cargoSha256 = "6suNkHw1BbISb0MkYkUaD+mpUal+kn3y1SFVqzJFqJc="; + cargoSha256 = "sha256-b+winsCzU0sXGDX6nUtWq4JrIyTcJ3uva7RlV5VsXfk="; LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; nativeBuildInputs = [ @@ -32,8 +32,8 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ openssl ] - ++ stdenv.lib.optionals stdenv.isLinux [ systemd ] - ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.Security ]; + ++ lib.optionals stdenv.isLinux [ systemd ] + ++ lib.optionals stdenv.isDarwin [ darwin.Security ]; cargoBuildFlags = [ "--features final" ]; @@ -45,6 +45,6 @@ rustPlatform.buildRustPackage rec { homepage = "http://parity.io/ethereum"; license = licenses.gpl3; maintainers = with maintainers; [ akru xrelkd ]; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/blockchains/particl/particl-core.nix b/pkgs/applications/blockchains/particl/particl-core.nix index f30e9a60980..2c17b344664 100644 --- a/pkgs/applications/blockchains/particl/particl-core.nix +++ b/pkgs/applications/blockchains/particl/particl-core.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , autoreconfHook , boost , db48 @@ -6,14 +6,14 @@ , libevent , miniupnpc , openssl -, pkgconfig +, pkg-config , zeromq , zlib , unixtools , python3 }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "particl-core"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { sha256 = "11y5q2srkh6r2samppjb5mg6hl79y16j2lj1r23p0968vb9c45kl"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ openssl db48 boost zlib miniupnpc libevent zeromq unixtools.hexdump python3 ]; configureFlags = [ diff --git a/pkgs/applications/blockchains/pivx.nix b/pkgs/applications/blockchains/pivx.nix index dc80df74a45..58986a10676 100644 --- a/pkgs/applications/blockchains/pivx.nix +++ b/pkgs/applications/blockchains/pivx.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, stdenv, pkgconfig, autoreconfHook, wrapQtAppsHook ? null +{ fetchFromGitHub, lib, stdenv, pkg-config, autoreconfHook, wrapQtAppsHook ? null , openssl, db48, boost, zlib, miniupnpc, gmp , qrencode, glib, protobuf, yasm, libevent , util-linux, qtbase ? null, qttools ? null @@ -7,7 +7,7 @@ , disableDaemon ? false , withGui ? false }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { name = "pivx-${version}"; version = "4.1.1"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "03ndk46h6093v8s18d5iffz48zhlshq7jrk6vgpjfs6z2iqgd2sy"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ] ++ optionals withGui [ wrapQtAppsHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ] ++ optionals withGui [ wrapQtAppsHook ]; buildInputs = [ glib gmp openssl db48 yasm boost zlib libevent miniupnpc protobuf util-linux ] ++ optionals withGui [ qtbase qttools qrencode ]; diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index 866adeea278..84bb42fabf8 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -7,16 +7,16 @@ }: rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "0.8.26-1"; + version = "0.8.27"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot"; rev = "v${version}"; - sha256 = "17ji1gjrx3gzw4msaz9kgvm132y14wgh8z183l3mfw1cj44a6kqk"; + sha256 = "1zkqmsclhnv14s4mxz7h49kfx8wyi3lyi0dik6jn1fh6w8zr962c"; }; - cargoSha256 = "07zwlwx02xw1y20br2c4grwv7bprhynqy7gav4qh3vw117ijpiqk"; + cargoSha256 = "1j0pr09y5pc43a4rz1zq3h9vmd874zz6z0wd279lpm6p2m0077cs"; nativeBuildInputs = [ clang ]; @@ -24,9 +24,10 @@ rustPlatform.buildRustPackage rec { PROTOC = "${protobuf}/bin/protoc"; # NOTE: We don't build the WASM runtimes since this would require a more - # complicated rust environment setup. The resulting binary is still useful for - # live networks since those just use the WASM blob from the network chainspec. - BUILD_DUMMY_WASM_BINARY = 1; + # complicated rust environment setup and this is only needed for developer + # environments. The resulting binary is useful for end-users of live networks + # since those just use the WASM blob from the network chainspec. + SKIP_WASM_BUILD = 1; # We can't run the test suite since we didn't compile the WASM runtimes. doCheck = false; diff --git a/pkgs/applications/blockchains/quorum.nix b/pkgs/applications/blockchains/quorum.nix index 499e2a77c6f..1424ddc9516 100644 --- a/pkgs/applications/blockchains/quorum.nix +++ b/pkgs/applications/blockchains/quorum.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoPackage, git, which, removeReferencesTo, go }: +{ lib, fetchFromGitHub, buildGoPackage, git, which, removeReferencesTo, go }: buildGoPackage rec { pname = "quorum"; diff --git a/pkgs/applications/blockchains/stellar-core.nix b/pkgs/applications/blockchains/stellar-core.nix index 925942c56e9..ceb48bf6aa4 100644 --- a/pkgs/applications/blockchains/stellar-core.nix +++ b/pkgs/applications/blockchains/stellar-core.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, autoconf, libtool, automake, pkgconfig, git +{ lib, stdenv, fetchgit, autoconf, libtool, automake, pkg-config, git , bison, flex, postgresql }: let @@ -16,7 +16,7 @@ in stdenv.mkDerivation { leaveDotGit = true; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoconf automake libtool git ]; propagatedBuildInputs = [ bison flex postgresql ]; diff --git a/pkgs/applications/blockchains/turbo-geth.nix b/pkgs/applications/blockchains/turbo-geth.nix index acb0eafb95e..dcfba417149 100644 --- a/pkgs/applications/blockchains/turbo-geth.nix +++ b/pkgs/applications/blockchains/turbo-geth.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "turbo-geth"; - version = "2020.12.02"; + version = "2021.01.01"; src = fetchFromGitHub { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - sha256 = "0ynnpvpd84qncvzmk4hmq8mn6m14a9p3zg4svijqwlsrr39amp3q"; + sha256 = "0a570570cmyngbz645728jdd0d2xmnyrnln2gbxnngiv4v62dxls"; }; - vendorSha256 = "0sk064iyaxq9ig9xv3h1p1c4994hna9bky16g3hblbnh3v7mmqar"; + vendorSha256 = "1x3mhfc16slaamp51rbscfwll25qj6ama1xkysidy7rscmmsj392"; runVend = true; subPackages = [ diff --git a/pkgs/applications/blockchains/vertcoin.nix b/pkgs/applications/blockchains/vertcoin.nix index 21104012f4d..acb02298e11 100644 --- a/pkgs/applications/blockchains/vertcoin.nix +++ b/pkgs/applications/blockchains/vertcoin.nix @@ -1,11 +1,11 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , openssl , boost , libevent , autoreconfHook , db4 -, pkgconfig +, pkg-config , protobuf , hexdump , zeromq @@ -15,7 +15,7 @@ , wrapQtAppsHook ? null }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "vertcoin"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config hexdump ] ++ optionals withGui [ wrapQtAppsHook diff --git a/pkgs/applications/blockchains/wasabibackend/default.nix b/pkgs/applications/blockchains/wasabibackend/default.nix index fd298debcb6..43deb6f3c6c 100644 --- a/pkgs/applications/blockchains/wasabibackend/default.nix +++ b/pkgs/applications/blockchains/wasabibackend/default.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { cp -r ${projectName}/bin/${projectConfiguration}/netcoreapp3.1/${projectRuntime}/publish $out/lib mkdir -p $out/bin makeWrapper $out/lib/WalletWasabi.Backend $out/bin/${pname} \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ openssl zlib ]} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ openssl zlib ]} \ --run "cd $out/lib" ''; diff --git a/pkgs/applications/blockchains/wasabiwallet/default.nix b/pkgs/applications/blockchains/wasabiwallet/default.nix index ae9c8fa3e88..d85e7dcfebf 100644 --- a/pkgs/applications/blockchains/wasabiwallet/default.nix +++ b/pkgs/applications/blockchains/wasabiwallet/default.nix @@ -11,7 +11,7 @@ }: let - libPath = stdenv.lib.makeLibraryPath [ + libPath = lib.makeLibraryPath [ curl dotnet-netcore fontconfig.lib diff --git a/pkgs/applications/blockchains/whirlpool-gui/default.nix b/pkgs/applications/blockchains/whirlpool-gui/default.nix index 3417f9b5185..c26270beef6 100644 --- a/pkgs/applications/blockchains/whirlpool-gui/default.nix +++ b/pkgs/applications/blockchains/whirlpool-gui/default.nix @@ -90,8 +90,8 @@ in stdenv.mkDerivation rec { ''; }; - passthru.prefetchYarnCache = stdenv.lib.overrideDerivation yarnCache (d: { - outputHash = stdenv.lib.fakeSha256; + passthru.prefetchYarnCache = lib.overrideDerivation yarnCache (d: { + outputHash = lib.fakeSha256; }); meta = with lib; { diff --git a/pkgs/applications/blockchains/wownero.nix b/pkgs/applications/blockchains/wownero.nix index 8d45e1a96b5..bc020de8be4 100644 --- a/pkgs/applications/blockchains/wownero.nix +++ b/pkgs/applications/blockchains/wownero.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchgit, cmake, boost, miniupnpc_2, openssl, unbound +{ lib, stdenv, fetchgit, cmake, boost, miniupnpc_2, openssl, unbound , readline, libsodium, rapidjson, fetchurl }: -with stdenv.lib; +with lib; let randomwowVersion = "1.1.7"; diff --git a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix index 43f5bcd495a..f595e211dc2 100644 --- a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, pkgconfig, linkFarm, lightdm-enso-os-greeter +{ lib, stdenv, fetchgit, pkg-config, linkFarm, lightdm-enso-os-greeter , dbus, pcre, epoxy, libXdmcp, at-spi2-core, libxklavier, libxkbcommon, libpthreadstubs , gtk3, vala, cmake, libgee, libX11, lightdm, gdk-pixbuf, clutter-gtk, wrapGAppsHook, librsvg }: @@ -18,7 +18,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake - pkgconfig + pkg-config vala wrapGAppsHook ]; diff --git a/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix b/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix index 363e0503c2d..d1cd2e7d3e4 100644 --- a/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, linkFarm, lightdm-mini-greeter, fetchFromGitHub, autoreconfHook, pkgconfig, lightdm, gtk3, glib, gdk-pixbuf, wrapGAppsHook, librsvg }: +{ lib, stdenv, linkFarm, lightdm-mini-greeter, fetchFromGitHub, autoreconfHook, pkg-config, lightdm, gtk3, glib, gdk-pixbuf, wrapGAppsHook, librsvg }: stdenv.mkDerivation rec { pname = "lightdm-mini-greeter"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "10hga7pmfyjdvj4xwm3djwrhk50brcpycj3p3c57pa0vnx4ill3s"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ]; buildInputs = [ lightdm gtk3 glib gdk-pixbuf librsvg ]; configureFlags = [ "--sysconfdir=/etc" ]; diff --git a/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix b/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix index 29dece3e5cf..5c2a6d7c59b 100644 --- a/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, linkFarm, lightdm-tiny-greeter, fetchFromGitHub -, pkgconfig, lightdm, gtk3, glib, wrapGAppsHook, conf ? "" }: +, pkg-config, lightdm, gtk3, glib, wrapGAppsHook, conf ? "" }: stdenv.mkDerivation rec { pname = "lightdm-tiny-greeter"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "08azpj7b5qgac9bgi1xvd6qy6x2nb7iapa0v40ggr3d1fabyhrg6"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; buildInputs = [ lightdm gtk3 glib ]; postUnpack = if conf != "" then '' diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index 9858f04d7dd..be9ba0f7561 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -1,10 +1,10 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , substituteAll , plymouth , pam -, pkgconfig +, pkg-config , autoconf , automake , libtool @@ -31,7 +31,7 @@ , yelp-tools }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "lightdm"; @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { intltool itstool libtool - pkgconfig + pkg-config vala ]; @@ -101,6 +101,8 @@ stdenv.mkDerivation rec { }) ]; + dontWrapQtApps = true; + preConfigure = "NOCONFIGURE=1 ./autogen.sh"; configureFlags = [ diff --git a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix index b25e087a211..90f7a03d0dd 100644 --- a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix +++ b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix @@ -2,7 +2,7 @@ , lightdm_gtk_greeter , fetchurl , lightdm -, pkgconfig +, pkg-config , intltool , linkFarm , wrapGAppsHook @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { sha256 = "1g7wc3d3vqfa7mrdhx1w9ywydgjbffla6rbrxq9k3sc62br97qms"; }; - nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config intltool wrapGAppsHook ]; buildInputs = [ lightdm exo librsvg hicolor-icon-theme ] ++ (if useGTK2 then [ gtk2 ] else [ gtk3 ]); @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc" "--disable-indicator-services-command" "--sbindir=${placeholder "out"}/bin" # for wrapGAppsHook to wrap automatically - ] ++ stdenv.lib.optional useGTK2 "--with-gtk2"; + ] ++ lib.optional useGTK2 "--with-gtk2"; preConfigure = '' configureFlagsArray+=( --enable-at-spi-command="${at-spi2-core}/libexec/at-spi-bus-launcher --launch-immediately" ) diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index fd02536589f..f43d3ca9be3 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchFromGitHub -, cmake, extra-cmake-modules, pkgconfig, libxcb, libpthreadstubs +, cmake, extra-cmake-modules, pkg-config, libxcb, libpthreadstubs , libXdmcp, libXau, qtbase, qtdeclarative, qtquickcontrols2, qttools, pam, systemd }: @@ -27,7 +27,7 @@ in mkDerivation { sed -e '1i#include <sys/time.h>' -i src/helper/HelperApp.cpp ''; - nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qttools ]; + nativeBuildInputs = [ cmake extra-cmake-modules pkg-config qttools ]; buildInputs = [ libxcb libpthreadstubs libXdmcp libXau pam qtbase qtdeclarative qtquickcontrols2 systemd diff --git a/pkgs/applications/editors/aewan/default.nix b/pkgs/applications/editors/aewan/default.nix index 56a144bdfb8..b9d350cbd43 100644 --- a/pkgs/applications/editors/aewan/default.nix +++ b/pkgs/applications/editors/aewan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, ncurses }: +{ lib, stdenv, fetchurl, zlib, ncurses }: stdenv.mkDerivation rec { pname = "aewan"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "Ascii-art Editor Without A Name"; homepage = "http://aewan.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/editors/amp/default.nix b/pkgs/applications/editors/amp/default.nix index 54b3c646e25..5f8c56592f6 100644 --- a/pkgs/applications/editors/amp/default.nix +++ b/pkgs/applications/editors/amp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, openssl, pkgconfig, python3, xorg, cmake, libgit2, darwin +{ lib, stdenv, fetchFromGitHub, rustPlatform, openssl, pkg-config, python3, xorg, cmake, libgit2, darwin , curl }: rustPlatform.buildRustPackage rec { @@ -14,8 +14,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "09v991rl2w4c4jh7ga7q1lk6wyl2vr71j5cpniij8mcvszrz78qf"; - nativeBuildInputs = [ cmake pkgconfig python3 ]; - buildInputs = [ openssl xorg.libxcb libgit2 ] ++ stdenv.lib.optionals stdenv.isDarwin + nativeBuildInputs = [ cmake pkg-config python3 ]; + buildInputs = [ openssl xorg.libxcb libgit2 ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ curl Security AppKit ]); # Tests need to write to the theme directory in HOME. diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index d8f2d86daee..0ce0a37d876 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -72,7 +72,7 @@ let cp -r . $out wrapProgram $out/bin/studio.sh \ --set ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \ - --prefix PATH : "${stdenv.lib.makeBinPath [ + --prefix PATH : "${lib.makeBinPath [ # Checked in studio.sh coreutils @@ -95,7 +95,7 @@ let git ps ]}" \ - --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ # Crash at startup without these fontconfig diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index d1eb7e58ef8..cbc5198f2f3 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -9,18 +9,18 @@ let inherit buildFHSUserEnv; }; stableVersion = { - version = "4.1.1.0"; # "Android Studio 4.1.1" - build = "201.6953283"; - sha256Hash = "sha256-aAMhhJWcVFdvEZt8fI3tF12Eg3TzlU+kUFMNeCYN1os="; + version = "4.1.2.0"; # "Android Studio 4.1.2" + build = "201.7042882"; + sha256Hash = "1f9bclvyvm3sg9an7wxlfwd8jwnb9cl726dvggmysa6r7shc7xw9"; }; betaVersion = { - version = "4.2.0.18"; # "Android Studio 4.2 Beta 2" - build = "202.7008469"; - sha256Hash = "0323i4mcib84z7bsy801640gadd2k8ps7vr9jbdpb6i9gma6klmh"; + version = "4.2.0.19"; # "Android Studio 4.2 Beta 3" + build = "202.7033425"; + sha256Hash = "037r99hn16y0fy6z6k90qf6yx5a4vvx6bl9rdyagdm16ry4bpiw4"; }; latestVersion = { # canary & dev - version = "2020.3.1.3"; # "Android Studio Arctic Fox Canary 3" - sha256Hash = "1nx78j3pqr8qgwprnzfy17w9jmkgiqnlbsw91jnslr9p9fd0ixcx"; + version = "2020.3.1.4"; # "Android Studio Arctic Fox Canary 4" + sha256Hash = "05drh4grq0b37qg5nspf2c6vmvcc9x71al3xwc2ddjhmyj0f9sk4"; }; in { # Attributes are named by their corresponding release channels diff --git a/pkgs/applications/editors/apostrophe/default.nix b/pkgs/applications/editors/apostrophe/default.nix index cb8e9b7e3bb..4265e0ef104 100644 --- a/pkgs/applications/editors/apostrophe/default.nix +++ b/pkgs/applications/editors/apostrophe/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitLab, meson, ninja, cmake -, wrapGAppsHook, pkgconfig, desktop-file-utils +, wrapGAppsHook, pkg-config, desktop-file-utils , appstream-glib, pythonPackages, glib, gobject-introspection , gtk3, webkitgtk, glib-networking, gnome3, gspell, texlive , shared-mime-info, haskellPackages}: @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { sha256 = "06bl1hc69ixk2vcb2ig74mwid14sl5zq6rfna7lx9na6j3l04879"; }; - nativeBuildInputs = [ meson ninja cmake pkgconfig desktop-file-utils + nativeBuildInputs = [ meson ninja cmake pkg-config desktop-file-utils appstream-glib wrapGAppsHook ]; buildInputs = [ glib pythonEnv gobject-introspection gtk3 diff --git a/pkgs/applications/editors/aseprite/default.nix b/pkgs/applications/editors/aseprite/default.nix index b44dc7c6d4f..58342ab1393 100644 --- a/pkgs/applications/editors/aseprite/default.nix +++ b/pkgs/applications/editors/aseprite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, callPackage, fetchFromGitHub, fetchpatch, cmake, ninja, pkgconfig +{ stdenv, lib, callPackage, fetchFromGitHub, fetchpatch, cmake, ninja, pkg-config , curl, freetype, giflib, libjpeg, libpng, libwebp, pixman, tinyxml, zlib , harfbuzzFull, glib, fontconfig, pcre , libX11, libXext, libXcursor, libXxf86vm, libGL @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - cmake pkgconfig + cmake pkg-config ] ++ lib.optionals unfree [ ninja ]; buildInputs = [ diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 9d1d8d4113c..e7a9a26f066 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkgs, fetchurl, wrapGAppsHook, gvfs, gtk3, atomEnv }: +{ lib, stdenv, pkgs, fetchurl, wrapGAppsHook, glib, gtk3, atomEnv }: let versions = { @@ -15,7 +15,7 @@ let }; common = pname: {version, sha256, beta ? null}: - let fullVersion = version + stdenv.lib.optionalString (beta != null) "-beta${toString beta}"; + let fullVersion = version + lib.optionalString (beta != null) "-beta${toString beta}"; name = "${pname}-${fullVersion}"; in stdenv.mkDerivation { inherit name; @@ -54,7 +54,8 @@ let preFixup = '' gappsWrapperArgs+=( - --prefix "PATH" : "${gvfs}/bin" + # needed for gio executable to be able to delete files + --prefix "PATH" : "${glib.bin}/bin" ) ''; @@ -89,4 +90,4 @@ let platforms = platforms.x86_64; }; }; -in stdenv.lib.mapAttrs common versions +in lib.mapAttrs common versions diff --git a/pkgs/applications/editors/bless/default.nix b/pkgs/applications/editors/bless/default.nix index ab5f2ccc104..24fc8440bbd 100644 --- a/pkgs/applications/editors/bless/default.nix +++ b/pkgs/applications/editors/bless/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchFromGitHub , autoreconfHook -, pkgconfig +, pkg-config , mono , gtk-sharp-2_0 , gettext @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config autoreconfHook gettext makeWrapper diff --git a/pkgs/applications/editors/bluefish/default.nix b/pkgs/applications/editors/bluefish/default.nix index 21da4de9c6d..2507cb13d7a 100644 --- a/pkgs/applications/editors/bluefish/default.nix +++ b/pkgs/applications/editors/bluefish/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, intltool, wrapGAppsHook, pkgconfig , gtk, libxml2 +{ lib, stdenv, fetchurl, intltool, wrapGAppsHook, pkg-config , gtk, libxml2 , enchant, gucharmap, python, gnome3 }: @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0slyjx4b4l612505q02crk00pjg9d5wi8gm5gxvcs0f6l9dr1y8d"; }; - nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ intltool pkg-config wrapGAppsHook ]; buildInputs = [ gnome3.adwaita-icon-theme gtk libxml2 enchant gucharmap python ]; diff --git a/pkgs/applications/editors/bonzomatic/default.nix b/pkgs/applications/editors/bonzomatic/default.nix index df54f710d9c..4b6480639b3 100644 --- a/pkgs/applications/editors/bonzomatic/default.nix +++ b/pkgs/applications/editors/bonzomatic/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { unlicense unfreeRedistributable # contains libbass.so in repository ]; - maintainers = [ maintainers.nocent ]; + maintainers = [ maintainers.ilian ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/applications/editors/brackets/default.nix b/pkgs/applications/editors/brackets/default.nix deleted file mode 100644 index 9d5978e605a..00000000000 --- a/pkgs/applications/editors/brackets/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ stdenv, lib, fetchurl, gtk2, glib, gdk-pixbuf, alsaLib, nss, nspr, gconf -, cups, libgcrypt_1_5, systemd, dbus, libXdamage, expat }: -with stdenv.lib; - -let - bracketsLibs = makeLibraryPath [ - gtk2 glib gdk-pixbuf stdenv.cc.cc.lib alsaLib nss nspr gconf cups libgcrypt_1_5 dbus systemd libXdamage expat - ]; -in -stdenv.mkDerivation rec { - pname = "brackets"; - version = "1.9"; - - src = fetchurl { - url = "https://github.com/adobe/brackets/releases/download/release-${version}/Brackets.Release.${version}.64-bit.deb"; - sha256 = "0c4l2rr0853xd21kw8hhxlmrx8mqwb7iqa2k24zvwyjp4nnwkgbp"; - name = "${pname}-${version}.deb"; - }; - - phases = [ "installPhase" "fixupPhase" ]; - - installPhase = '' - mkdir -p $out - ar p $src data.tar.xz | tar -C $out -xJ - - mv $out/usr/* $out/ - rmdir $out/usr - ln -sf $out/opt/brackets/brackets $out/bin/brackets - - ln -s ${lib.getLib systemd}/lib/libudev.so.1 $out/opt/brackets/lib/libudev.so.0 - - substituteInPlace $out/opt/brackets/brackets.desktop \ - --replace "Exec=/opt/brackets/brackets" "Exec=brackets" - mkdir -p $out/share/applications - ln -s $out/opt/brackets/brackets.desktop $out/share/applications/ - ''; - - postFixup = '' - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${bracketsLibs}:$out/opt/brackets/lib" \ - $out/opt/brackets/Brackets - - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${bracketsLibs}" \ - $out/opt/brackets/Brackets-node - - patchelf --set-rpath "${bracketsLibs}" \ - $out/opt/brackets/lib/libcef.so - ''; - - meta = { - description = "An open source code editor for the web, written in JavaScript, HTML and CSS"; - homepage = "http://brackets.io/"; - license = licenses.mit; - maintainers = [ maintainers.matejc ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/applications/editors/code-browser/default.nix b/pkgs/applications/editors/code-browser/default.nix index 3eecc471db9..ea4398cc4a5 100644 --- a/pkgs/applications/editors/code-browser/default.nix +++ b/pkgs/applications/editors/code-browser/default.nix @@ -28,17 +28,20 @@ stdenv.mkDerivation rec { gtk3 pkg-config ] - ++ stdenv.lib.optionals withQt [ wrapQtAppsHook ]; - buildInputs = stdenv.lib.optionals withQt [ qtbase ] - ++ stdenv.lib.optionals withGtk [ gtk3 ]; + ++ lib.optionals withQt [ wrapQtAppsHook ]; + buildInputs = lib.optionals withQt [ qtbase ] + ++ lib.optionals withGtk [ gtk3 ]; makeFlags = [ "prefix=$(out)" "COPPER=${copper}/bin/copper-elf64" "with-local-libs" "QINC=${qtbase.dev}/include" ] - ++ stdenv.lib.optionals withQt [ "UI=qt" ] - ++ stdenv.lib.optionals withGtk [ "UI=gtk" ]; + ++ lib.optionals withQt [ "UI=qt" ] + ++ lib.optionals withGtk [ "UI=gtk" ]; + + dontWrapQtApps = true; + meta = with lib; { description = "Folding text editor, designed to hierarchically structure any kind of text file and especially source code"; homepage = "https://tibleiz.net/code-browser/"; diff --git a/pkgs/applications/editors/codeblocks/default.nix b/pkgs/applications/editors/codeblocks/default.nix index 4e2ac8a50f1..8a5f4cf4b3a 100644 --- a/pkgs/applications/editors/codeblocks/default.nix +++ b/pkgs/applications/editors/codeblocks/default.nix @@ -1,21 +1,21 @@ -{ stdenv, fetchurl, autoreconfHook, libtool, pkgconfig, file, zip, wxGTK, gtk2 -, contribPlugins ? false, hunspell, gamin, boost +{ lib, stdenv, fetchurl, pkg-config, file, zip, wxGTK30-gtk3, gtk3 +, contribPlugins ? false, hunspell, gamin, boost, wrapGAppsHook }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { - name = "${pname}-${stdenv.lib.optionalString contribPlugins "full-"}${version}"; - version = "17.12"; + name = "${pname}-${lib.optionalString contribPlugins "full-"}${version}"; + version = "20.03"; pname = "codeblocks"; src = fetchurl { - url = "mirror://sourceforge/codeblocks/Sources/${version}/codeblocks_${version}.tar.xz"; - sha256 = "1q2pph7md1p10i83rir2l4gvy7ym2iw8w6sk5vl995knf851m20k"; + url = "mirror://sourceforge/codeblocks/Sources/${version}/codeblocks-${version}.tar.xz"; + sha256 = "1idaksw1vacmm83krxh5zlb12kad3dkz9ixh70glw1gaibib7vhm"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig libtool file zip ]; - buildInputs = [ wxGTK gtk2 ] + nativeBuildInputs = [ pkg-config file zip wrapGAppsHook ]; + buildInputs = [ wxGTK30-gtk3 gtk3 ] ++ optionals contribPlugins [ hunspell gamin boost ]; enableParallelBuilding = true; patches = [ ./writable-projects.patch ]; diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix index bcdff1eff1f..2d9138bc32e 100644 --- a/pkgs/applications/editors/cudatext/default.nix +++ b/pkgs/applications/editors/cudatext/default.nix @@ -38,24 +38,20 @@ let in stdenv.mkDerivation rec { pname = "cudatext"; - version = "1.118.2"; + version = "1.122.3"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - sha256 = "0d6f4qfs7vifz7qkw2vkdjgd5w717wfpnxbc4qa4hs4g6y86ywmm"; + sha256 = "1h56hj433z0n4l97zl1cwkjv0qvz4qmvf469zzjzf1nj4zj8px2b"; }; - patches = [ - # Don't check for update - ./dont-check-update.patch - ]; - postPatch = '' substituteInPlace app/proc_globdata.pas \ --replace "/usr/share/cudatext" "$out/share/cudatext" \ - --replace "libpython3.so" "${python3}/lib/libpython3.so" + --replace "libpython3.so" "${python3}/lib/libpython${python3.pythonVersion}.so" \ + --replace "AllowProgramUpdates:= true;" "AllowProgramUpdates:= false;" ''; nativeBuildInputs = [ lazarus fpc ] diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json index fc82ec4b8d1..89f6dbc75fa 100644 --- a/pkgs/applications/editors/cudatext/deps.json +++ b/pkgs/applications/editors/cudatext/deps.json @@ -1,33 +1,33 @@ { "EncConv": { "owner": "Alexey-T", - "rev": "2020.06.15", - "sha256": "07dpvq3ppfq3b70i1smkf7vwdlzq8qnxs3fk94hi9h1z36bz2rw3" + "rev": "2021.01.01", + "sha256": "18fp7yz2rl80a6xw7v4bgc4092l74fb6p6z4yf312r7gw7b8naq6" }, "ATBinHex-Lazarus": { "owner": "Alexey-T", - "rev": "2020.09.05", - "sha256": "022yx5vic4hnc9lz53wvr4h7hf0h71801dzlilj55x5mf8p59072" + "rev": "2020.11.22", + "sha256": "0dkvzm32ls03pfp40fxvsyrkfmyznc5yrj65cp4a8pp9kpkvzlz7" }, "ATFlatControls": { "owner": "Alexey-T", - "rev": "2020.11.02", - "sha256": "0shihlm1hg74m04qyrj2iic2ik0x7qggihmnylvvdry3y79d07fy" + "rev": "2021.01.12", + "sha256": "1mavv3krs4srdp362prf4sncssxjh11la5j4lkx0wk5csrmd1pc9" }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "6560bc35a2cf31399be8713ac189216afabf9f01", - "sha256": "1bjnd6pcd9ddkvl7ma05z7f8svq609kljwc7gvbszc76hdb8d54x" + "rev": "2021.01.19", + "sha256": "0lpgfwljwh9mypscbpj5c7fivhza0hizjgqypval3v0209cx38d1" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", - "rev": "2459ea2a2e50050f7e6ee59a17a52aae05ca4433", - "sha256": "155cwcmr9f23j4x13pidvb3vcgglawkxxpizjw90ajwhmg831acr" + "rev": "2021.01.17", + "sha256": "14i4jdpbmh6sjpvbwipdvvmmqqw8wg592b34a9wdf2f9qxq2p4ly" }, "EControl": { "owner": "Alexey-T", - "rev": "2020.10.04", - "sha256": "0ypbaca3y5biw2207yh3x5p28gm8g51qf7glm5622w3cgbrf9mdq" + "rev": "2021.01.12", + "sha256": "107zyd65vc72fl4mvyirhv2a9m47l9bs6gwqiwar7hrn02zns6bq" }, "ATSynEdit_Ex": { "owner": "Alexey-T", @@ -36,8 +36,8 @@ }, "Python-for-Lazarus": { "owner": "Alexey-T", - "rev": "2020.10.23", - "sha256": "1lljldqnixlh0j05fh594gccwzkgcxa50byq8wr9ld5ik5sf8khn" + "rev": "2021.01.16", + "sha256": "07qv3x1cm3r12gxfnqzxly6nff39bghwwgxzl2lxi1qbpqhcs2l5" }, "Emmet-Pascal": { "owner": "Alexey-T", @@ -46,8 +46,8 @@ }, "CudaText-lexers": { "owner": "Alexey-T", - "rev": "2020.08.10", - "sha256": "1gzs2psyfhb9si1qyacxzfjb3dz2v255hv7y4jlkbxdxv0kckqr6" + "rev": "2021.01.16", + "sha256": "13zyg0cm1c1662l3f7sy462pbc39l1cwm5214nx8ijngf8kgn2zh" }, "bgrabitmap": { "owner": "bgrabitmap", diff --git a/pkgs/applications/editors/cudatext/dont-check-update.patch b/pkgs/applications/editors/cudatext/dont-check-update.patch deleted file mode 100644 index 5c896bc046c..00000000000 --- a/pkgs/applications/editors/cudatext/dont-check-update.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git i/app/formmain.pas w/app/formmain.pas -index f6f37febb..cf993d75e 100644 ---- i/app/formmain.pas -+++ w/app/formmain.pas -@@ -2156,6 +2156,7 @@ begin - false - {$endif}; - *) -+ mnuHelpCheckUpd.Enabled:=false; - - with AppPanels[cPaneSide] do - begin diff --git a/pkgs/applications/editors/dhex/default.nix b/pkgs/applications/editors/dhex/default.nix index c4f43e71fe6..743e55b0969 100644 --- a/pkgs/applications/editors/dhex/default.nix +++ b/pkgs/applications/editors/dhex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses }: +{ lib, stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { pname = "dhex"; @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { meta = { description = "A themeable hex editor with diff mode"; homepage = "http://www.dettus.net/dhex/"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [qknight]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [qknight]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix index 0282dc95f72..1ddb6707110 100644 --- a/pkgs/applications/editors/eclipse/build-eclipse.nix +++ b/pkgs/applications/editors/eclipse/build-eclipse.nix @@ -1,4 +1,4 @@ -{ stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender +{ lib, stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender , zlib, jdk, glib, gtk, libXtst, gsettings-desktop-schemas, webkitgtk , makeWrapper, perl, ... }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ fontconfig freetype glib gsettings-desktop-schemas gtk jdk libX11 libXrender libXtst makeWrapper zlib - ] ++ stdenv.lib.optional (webkitgtk != null) webkitgtk; + ] ++ lib.optional (webkitgtk != null) webkitgtk; buildCommand = '' # Unpack tarball. @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { interpreter=$(echo ${stdenv.glibc.out}/lib/ld-linux*.so.2) libCairo=$out/eclipse/libcairo-swt.so patchelf --set-interpreter $interpreter $out/eclipse/eclipse - [ -f $libCairo ] && patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ freetype fontconfig libX11 libXrender zlib ]} $libCairo + [ -f $libCairo ] && patchelf --set-rpath ${lib.makeLibraryPath [ freetype fontconfig libX11 libXrender zlib ]} $libCairo # Create wrapper script. Pass -configuration to store # settings in ~/.eclipse/org.eclipse.platform_<version> rather @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { makeWrapper $out/eclipse/eclipse $out/bin/eclipse \ --prefix PATH : ${jdk}/bin \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk libXtst ] ++ stdenv.lib.optional (webkitgtk != null) webkitgtk)} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk libXtst ] ++ lib.optional (webkitgtk != null) webkitgtk)} \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ --add-flags "-configuration \$HOME/.eclipse/''${productId}_$productVersion/configuration" diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 586e2343cd3..cff482e887d 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeDesktopItem, makeWrapper +{ lib, stdenv, fetchurl, makeDesktopItem, makeWrapper , freetype, fontconfig, libX11, libXrender, zlib , glib, gtk3, gtk2, libXtst, jdk, jdk8, gsettings-desktop-schemas , webkitgtk ? null # for internal web browser @@ -148,7 +148,7 @@ in rec { pluginEnv = buildEnv { name = "eclipse-plugins"; paths = - with stdenv.lib; + with lib; filter (x: x ? isEclipsePlugin) (closePropagation plugins); }; @@ -156,11 +156,11 @@ in rec { # add the property indicating the plugin directory. dropinPropName = "org.eclipse.equinox.p2.reconciler.dropins.directory"; dropinProp = "-D${dropinPropName}=${pluginEnv}/eclipse/dropins"; - jvmArgsText = stdenv.lib.concatStringsSep "\n" (jvmArgs ++ [dropinProp]); + jvmArgsText = lib.concatStringsSep "\n" (jvmArgs ++ [dropinProp]); # Base the derivation name on the name of the underlying # Eclipse. - name = (stdenv.lib.meta.appendToName "with-plugins" eclipse).name; + name = (lib.meta.appendToName "with-plugins" eclipse).name; in runCommand name { buildInputs = [ makeWrapper ]; } '' mkdir -p $out/bin $out/etc diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix index 0fb48203b2f..a6ab483a7b0 100644 --- a/pkgs/applications/editors/ed/default.nix +++ b/pkgs/applications/editors/ed/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lzip +{ lib, stdenv, fetchurl, lzip }: # Note: this package is used for bootstrapping fetchurl, and thus @@ -7,12 +7,12 @@ # files. stdenv.mkDerivation (rec { - name = "ed-${version}"; - version = "1.16"; + pname = "ed"; + version = "1.17"; src = fetchurl { - url = "mirror://gnu/ed/${name}.tar.lz"; - sha256 = "0b4b1lwizvng9bvpcjnmpj2i80xz9xw2w8nfff27b2h4mca7mh6g"; + url = "mirror://gnu/ed/${pname}-${version}.tar.lz"; + sha256 = "0m2yrkfjjraakxr98nsiakqrn351h99n706x9asgmdi57j43kpki"; }; nativeBuildInputs = [ lzip ]; @@ -33,14 +33,14 @@ stdenv.mkDerivation (rec { full-screen editors such as GNU Emacs or GNU Moe. ''; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; homepage = "https://www.gnu.org/software/ed/"; maintainers = [ ]; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; -} // stdenv.lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) { +} // lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) { # This may be moved above during a stdenv rebuild. preConfigure = '' configureFlagsArray+=("CC=$CC") diff --git a/pkgs/applications/editors/edit/default.nix b/pkgs/applications/editors/edit/default.nix index ff4dcca8935..25e620c51e4 100644 --- a/pkgs/applications/editors/edit/default.nix +++ b/pkgs/applications/editors/edit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, unzip, pkgconfig, ncurses, libX11, libXft, cwebbin }: +{ lib, stdenv, fetchgit, unzip, pkg-config, ncurses, libX11, libXft, cwebbin }: stdenv.mkDerivation { pname = "edit-nightly"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { buildInputs = [ unzip - pkgconfig + pkg-config ncurses libX11 libXft diff --git a/pkgs/applications/editors/elvis/default.nix b/pkgs/applications/editors/elvis/default.nix index df8f255de5e..f63598a7c5e 100644 --- a/pkgs/applications/editors/elvis/default.nix +++ b/pkgs/applications/editors/elvis/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, stdenv, ncurses }: +{ fetchurl, fetchpatch, lib, stdenv, ncurses }: stdenv.mkDerivation { name = "elvis-2.2_0"; @@ -41,6 +41,6 @@ stdenv.mkDerivation { meta = { homepage = "http://elvis.the-little-red-haired-girl.org/"; description = "A vi clone for Unix and other operating systems"; - license = stdenv.lib.licenses.free; + license = lib.licenses.free; }; } diff --git a/pkgs/applications/editors/emacs-modes/cedet/default.nix b/pkgs/applications/editors/emacs-modes/cedet/default.nix index 45f20fccad9..18dcef129cc 100644 --- a/pkgs/applications/editors/emacs-modes/cedet/default.nix +++ b/pkgs/applications/editors/emacs-modes/cedet/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, emacs, python }: +{ lib, fetchurl, stdenv, emacs, python }: stdenv.mkDerivation rec { name = "cedet-1.1"; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { Development Environment), and COGRE (COnnected GRaph Editor). ''; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; homepage = "http://cedet.sourceforge.net/"; diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index ea776ed4cec..b841c0df959 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -69,10 +69,10 @@ elpaBuild { pname = "adaptive-wrap"; ename = "adaptive-wrap"; - version = "0.7"; + version = "0.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/adaptive-wrap-0.7.el"; - sha256 = "10fb8gzvkbnrgzv28n1rczs03dvapr7rvi0kd73j6yf1zg2iz6qp"; + url = "https://elpa.gnu.org/packages/adaptive-wrap-0.8.tar"; + sha256 = "1gs1pqzywvvw4prj63vpj8abh8h14pjky11xfl23pgpk9l3ldrb0"; }; packageRequires = []; meta = { @@ -223,10 +223,10 @@ elpaBuild { pname = "auctex"; ename = "auctex"; - version = "13.0.1"; + version = "13.0.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/auctex-13.0.1.tar"; - sha256 = "1y5q3phd0xr7342i757hr4hic8nad4kkdf1zk56mlj5snwr0g0w7"; + url = "https://elpa.gnu.org/packages/auctex-13.0.3.tar"; + sha256 = "1ljpkr0z15fyh907jbgky238dvci5vqi3xhvslyhblhp8sg9cbsi"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1015,10 +1015,10 @@ elpaBuild { pname = "eev"; ename = "eev"; - version = "20201013"; + version = "20210102"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eev-20201013.tar"; - sha256 = "1frwlcqi8kjm13x3i6pw70kqcr306rikaanyfxyn6i5brm1ncxk8"; + url = "https://elpa.gnu.org/packages/eev-20210102.tar"; + sha256 = "14vpgcncmzzbv8v78v221hdhigvk00vqiizwd8dy0b7hqz6gl0rq"; }; packageRequires = [ emacs ]; meta = { @@ -1306,21 +1306,6 @@ license = lib.licenses.free; }; }) {}; - fountain-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "fountain-mode"; - ename = "fountain-mode"; - version = "2.7.3"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/fountain-mode-2.7.3.el"; - sha256 = "1sz3qp3y52d05jd006zc99r4ryignpa2jgfk72rw3zfqmikzv15j"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/fountain-mode.html"; - license = lib.licenses.free; - }; - }) {}; frame-tabs = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "frame-tabs"; @@ -1512,10 +1497,10 @@ elpaBuild { pname = "gnus-mock"; ename = "gnus-mock"; - version = "0.4.5"; + version = "0.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gnus-mock-0.4.5.tar"; - sha256 = "1hfh315vrxd54r2f1wpdfk06b7lhpab7knygav58vdwwdbndlqiz"; + url = "https://elpa.gnu.org/packages/gnus-mock-0.5.tar"; + sha256 = "1lyh1brb68zaasnw2brymsspcyl3jxmnvbvpvrqfxhhl3fq9nbv1"; }; packageRequires = []; meta = { @@ -2399,21 +2384,6 @@ license = lib.licenses.free; }; }) {}; - olivetti = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "olivetti"; - ename = "olivetti"; - version = "1.7.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/olivetti-1.7.1.el"; - sha256 = "1bk41bqri0ycpab46c7a6i5k3js1pm5k6d76y91mp3l2izy2bxwj"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/olivetti.html"; - license = lib.licenses.free; - }; - }) {}; omn-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "omn-mode"; @@ -2673,10 +2643,10 @@ elpaBuild { pname = "posframe"; ename = "posframe"; - version = "0.8.3"; + version = "0.8.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/posframe-0.8.3.el"; - sha256 = "05m56aw2yxik0pgcvyr5c92j2mwfksxgq1syzvik6161gy8hdd0g"; + url = "https://elpa.gnu.org/packages/posframe-0.8.4.tar"; + sha256 = "1sn35ibp5y4y80l1xm4b8i94ld953a9gbkk99zqd9mrq9bwjyhdp"; }; packageRequires = [ emacs ]; meta = { @@ -3165,6 +3135,21 @@ license = lib.licenses.free; }; }) {}; + shell-command-plus = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "shell-command-plus"; + ename = "shell-command+"; + version = "2.0.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/shell-command+-2.0.0.tar"; + sha256 = "1l8lwami4rbp94sbb1k4dvv7z0dvf51s0992xragpn9b9jbx5qd6"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/shell-command+.html"; + license = lib.licenses.free; + }; + }) {}; shen-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "shen-mode"; @@ -3229,10 +3214,10 @@ elpaBuild { pname = "smalltalk-mode"; ename = "smalltalk-mode"; - version = "3.2.92"; + version = "4.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/smalltalk-mode-3.2.92.tar"; - sha256 = "0zlp1pk88m1gybhnvcmm0bhrj6zvnjzhc26r1i4d56pyh6vwivfj"; + url = "https://elpa.gnu.org/packages/smalltalk-mode-4.0.tar"; + sha256 = "1i1w2fk241z10mph92lry8ly55rxr24n1v4840cddpiw81nrqpcn"; }; packageRequires = []; meta = { @@ -3828,21 +3813,6 @@ license = lib.licenses.free; }; }) {}; - w3 = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "w3"; - ename = "w3"; - version = "4.0.49"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/w3-4.0.49.tar"; - sha256 = "01n334b3gwx288xysa1vxsvb14avsz3syfigw85i7m5nizhikqbb"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/w3.html"; - license = lib.licenses.free; - }; - }) {}; wcheck-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "wcheck-mode"; @@ -3907,10 +3877,10 @@ elpaBuild { pname = "websocket"; ename = "websocket"; - version = "1.12"; + version = "1.13.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/websocket-1.12.tar"; - sha256 = "0ap4z80c6pzpb69wrx0hsvwzignxmd2b9xy974by9gf5xm2wpa8w"; + url = "https://elpa.gnu.org/packages/websocket-1.13.1.tar"; + sha256 = "1x664zswas0fpml7zaj59zy97avrm49zb80zd69rlkqzz1m45psc"; }; packageRequires = [ cl-lib ]; meta = { diff --git a/pkgs/applications/editors/emacs-modes/elpa-packages.nix b/pkgs/applications/editors/emacs-modes/elpa-packages.nix index 57f5d7b8594..8b9ad33fce7 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-packages.nix @@ -5,7 +5,7 @@ To update the list of packages from MELPA, 1. Run `./update-elpa`. -2. Check for evaluation errors: `nix-instantiate ../../../.. -A emacsPackagesNg.elpaPackages`. +2. Check for evaluation errors: `nix-instantiate ../../../.. -A emacs.pkgs.elpaPackages`. 3. `git commit -m "elpa-packages $(date -Idate)" -- elpa-generated.nix` ## Update from overlay diff --git a/pkgs/applications/editors/emacs-modes/ess-R-object-popup/default.nix b/pkgs/applications/editors/emacs-modes/ess-R-object-popup/default.nix index 5beaed58240..a92471a9493 100644 --- a/pkgs/applications/editors/emacs-modes/ess-R-object-popup/default.nix +++ b/pkgs/applications/editors/emacs-modes/ess-R-object-popup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit }: +{ lib, stdenv, fetchgit }: stdenv.mkDerivation { name = "ess-R-object-popup-20130302"; @@ -17,6 +17,6 @@ stdenv.mkDerivation { meta = { description = "Popup descriptions of R objects"; homepage = "https://github.com/myuhe/ess-R-object-popup.el"; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/editors/emacs-modes/helm-words/default.nix b/pkgs/applications/editors/emacs-modes/helm-words/default.nix index 00879463276..0678492500d 100644 --- a/pkgs/applications/editors/emacs-modes/helm-words/default.nix +++ b/pkgs/applications/editors/emacs-modes/helm-words/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit }: +{ lib, stdenv, fetchgit }: stdenv.mkDerivation { name = "helm-words-20190917"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { description = "Emacs major mode for jade and stylus"; homepage = "https://github.com/brianc/helm-words"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl3; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/editors/emacs-modes/hsc3/default.nix b/pkgs/applications/editors/emacs-modes/hsc3/default.nix index 6c2db85d794..3b20326d96f 100644 --- a/pkgs/applications/editors/emacs-modes/hsc3/default.nix +++ b/pkgs/applications/editors/emacs-modes/hsc3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, emacs }: +{ lib, stdenv, fetchurl, emacs }: # this package installs the emacs-mode which # resides in the hsc3 sources. @@ -23,6 +23,6 @@ in stdenv.mkDerivation { meta = { homepage = "http://rd.slavepianos.org/?t=hsc3"; description = "hsc3 mode package for Emacs"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index a47688eca7e..9334a16d22d 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -6,8 +6,8 @@ To update the list of packages from MELPA, 1. Run ./update-melpa 2. Check for evaluation errors: -env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPackages.melpaStablePackages -env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPackages.melpaPackages +env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacs.pkgs..melpaStablePackages +env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacs.pkgs..melpaPackages 3. `git commit -m "melpa-packages: $(date -Idate)" recipes-archive-melpa.json` ## Update from overlay @@ -144,7 +144,7 @@ let flycheck-rtags = fix-rtags super.flycheck-rtags; pdf-tools = super.pdf-tools.overrideAttrs (old: { - nativeBuildInputs = [ external.pkgconfig ]; + nativeBuildInputs = [ external.pkg-config ]; buildInputs = with external; old.buildInputs ++ [ autoconf automake libpng zlib poppler ]; preBuild = "make server/epdfinfo"; recipe = pkgs.writeText "recipe" '' @@ -341,6 +341,7 @@ let # Telega has a server portion for it's network protocol telega = super.telega.overrideAttrs (old: { buildInputs = old.buildInputs ++ [ pkgs.tdlib ]; + nativeBuildInputs = [ external.pkg-config ]; postBuild = '' cd source/server @@ -373,7 +374,7 @@ let nativeBuildInputs = [ external.autoconf external.automake - external.pkgconfig + external.pkg-config external.libtool (external.zeromq.override { enableDrafts = true; }) ]; diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix index d2dc41bcf04..7adb58c8bd7 100644 --- a/pkgs/applications/editors/emacs-modes/org-generated.nix +++ b/pkgs/applications/editors/emacs-modes/org-generated.nix @@ -4,10 +4,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "20201228"; + version = "20210111"; src = fetchurl { - url = "https://orgmode.org/elpa/org-20201228.tar"; - sha256 = "0rv98v3zbdbc4yfq9mymrxrcj422xpfhvw31xrspydwgpxqgsf99"; + url = "https://orgmode.org/elpa/org-20210111.tar"; + sha256 = "1hn3i583h3idmiv1plbp0p6qi3myl317vl43qyxjks2nvqfj5313"; }; packageRequires = []; meta = { @@ -19,10 +19,10 @@ elpaBuild { pname = "org-plus-contrib"; ename = "org-plus-contrib"; - version = "20201228"; + version = "20210111"; src = fetchurl { - url = "https://orgmode.org/elpa/org-plus-contrib-20201228.tar"; - sha256 = "0libzh2a51m9l0kb01zjw2fai2nbxqw9r01i8fkjy94hq0lbw7cc"; + url = "https://orgmode.org/elpa/org-plus-contrib-20210111.tar"; + sha256 = "1qw44y4v4vg0vhz1i55x4fjiaxfaqcch0mqm98sc5f31fw3r4zga"; }; packageRequires = []; meta = { diff --git a/pkgs/applications/editors/emacs-modes/org-mac-link/default.nix b/pkgs/applications/editors/emacs-modes/org-mac-link/default.nix index 93af03ce229..600e44eb8ab 100644 --- a/pkgs/applications/editors/emacs-modes/org-mac-link/default.nix +++ b/pkgs/applications/editors/emacs-modes/org-mac-link/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, emacs}: +{ lib, stdenv, fetchurl, emacs }: stdenv.mkDerivation { name = "org-mac-link-1.2"; @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = { description = "Insert org-mode links to items selected in various Mac apps"; homepage = "https://orgmode.org/worg/org-contrib/org-mac-link.html"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl3; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/editors/emacs-modes/org-packages.nix b/pkgs/applications/editors/emacs-modes/org-packages.nix index 1f37cf624f9..b60af0e9334 100644 --- a/pkgs/applications/editors/emacs-modes/org-packages.nix +++ b/pkgs/applications/editors/emacs-modes/org-packages.nix @@ -5,7 +5,7 @@ To update the list of packages from Org (ELPA), 1. Run `./update-org`. -2. Check for evaluation errors: `nix-instantiate ../../../.. -A emacsPackagesNg.orgPackages`. +2. Check for evaluation errors: `nix-instantiate ../../../.. -A emacs.pkgs.orgPackages`. 3. `git commit -m "org-packages $(date -Idate)" -- org-generated.nix` */ diff --git a/pkgs/applications/editors/emacs-modes/perl-completion/default.nix b/pkgs/applications/editors/emacs-modes/perl-completion/default.nix index 7f2454c811a..e14e5ed8cc2 100644 --- a/pkgs/applications/editors/emacs-modes/perl-completion/default.nix +++ b/pkgs/applications/editors/emacs-modes/perl-completion/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "perl-completion"; @@ -18,6 +18,6 @@ stdenv.mkDerivation { meta = { description = "Minor mode provides useful features for editing perl codes"; homepage = "http://emacswiki.org/emacs/PerlCompletion"; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/editors/emacs-modes/prolog/default.nix b/pkgs/applications/editors/emacs-modes/prolog/default.nix index 66ab9830237..deac73a194e 100644 --- a/pkgs/applications/editors/emacs-modes/prolog/default.nix +++ b/pkgs/applications/editors/emacs-modes/prolog/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { pname = "prolog-mode"; @@ -17,6 +17,6 @@ stdenv.mkDerivation { meta = { homepage = "http://bruda.ca/emacs/prolog_mode_for_emacs/"; description = "Prolog mode for Emacs"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/editors/emacs-modes/railgun/default.nix b/pkgs/applications/editors/emacs-modes/railgun/default.nix index 8ca8d1feaa1..240a2f29edf 100644 --- a/pkgs/applications/editors/emacs-modes/railgun/default.nix +++ b/pkgs/applications/editors/emacs-modes/railgun/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit }: +{ lib, stdenv, fetchgit }: stdenv.mkDerivation { name = "railgun-2012-10-17"; @@ -17,6 +17,6 @@ stdenv.mkDerivation { meta = { description = "Propel yourself through a rails project with the power of magnets"; homepage = "https://github.com/mbriggs/railgun.el"; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json index 18b78521586..5dcb01dcefa 100644 --- a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json @@ -111,14 +111,14 @@ "repo": "emacsorphanage/4clojure", "unstable": { "version": [ - 20200123, - 2008 + 20210102, + 459 ], "deps": [ "request" ], - "commit": "557eecb5da50fedd92840021c8b08d87dfdc782b", - "sha256": "19x653lzc1dxil4ix257hciidbdmbhaxhs6qhlkwi9ygjrlrgvnk" + "commit": "6f494d3905284ccdd57aae3d8ac16fc7ab431596", + "sha256": "19mbfh504mli8mnf95xaych45nqnayrspymf5r80dky4jv43zzv8" } }, { @@ -1871,8 +1871,8 @@ "annotation", "eri" ], - "commit": "c45dc6b2729a53653df2874b6ea8b3500793da78", - "sha256": "03a49iifi5dl2fcsi288l68frmga3qiw2prd0vfr9xzmyqmfaz6z" + "commit": "c5400349d7d9cb1e54af19bdb2046b52ecada5bc", + "sha256": "02kma8f6v6vxzbfzd2limwabp8a5hzjyg9kfabgp1j0dwvsl64pf" }, "stable": { "version": [ @@ -2331,14 +2331,11 @@ "repo": "domtronn/all-the-icons.el", "unstable": { "version": [ - 20200923, - 1339 - ], - "deps": [ - "memoize" + 20210114, + 1520 ], - "commit": "6917b08f64dd8487e23769433d6cb9ba11f4152f", - "sha256": "0jzpil1k5brg4dvy0fxibbwwb2hkni5fkxng4n0wfv6099b2zc68" + "commit": "ed978fa64fdefc817e8b1b826c87e8928a26f2ce", + "sha256": "0l5jc0f5q5p4i2c5s6vrryxkc0fapxffz8x1yvk32j151rz932rc" }, "stable": { "version": [ @@ -2717,14 +2714,14 @@ "repo": "DarwinAwardWinner/amx", "unstable": { "version": [ - 20200701, - 2108 + 20210101, + 1921 ], "deps": [ "s" ], - "commit": "ccfc92c600df681df5e8b5fecec328c462ceb71e", - "sha256": "0pdgicknrph4lfyjxwdqh7xwcfsnqnrx1l4xpd972ivy1n8s7783" + "commit": "b99149715266b5c2c48f5a0fc43716d36575da5f", + "sha256": "14k1wrjfhawb18fyrfdv2lv0nwfpliw0f14hrhdb3kmshp5dsb3x" }, "stable": { "version": [ @@ -2746,8 +2743,8 @@ "repo": "pythonic-emacs/anaconda-mode", "unstable": { "version": [ - 20200912, - 239 + 20210101, + 833 ], "deps": [ "dash", @@ -2755,14 +2752,14 @@ "pythonic", "s" ], - "commit": "39b1cf88c8c459901630d248d6135d8644075648", - "sha256": "0nwrs6cw2dpl522rrdhzrka4fkcw4f2grxlz0mjwwlaxafd2zc3y" + "commit": "80afec20f91f13614647b192522fff460505db6f", + "sha256": "04f6kw4rd8k6waiyfbk7x8qdrqm411mdsdzjh2w9rvmv7y36ckh8" }, "stable": { "version": [ 0, 1, - 12 + 14 ], "deps": [ "dash", @@ -2770,8 +2767,8 @@ "pythonic", "s" ], - "commit": "6be586123f606317c51e62239490af9843ba2d13", - "sha256": "1vydyyxd5n0pz0jlib3yvw8vnklp15nvyyj7qkm4wcyssi70q1rf" + "commit": "80afec20f91f13614647b192522fff460505db6f", + "sha256": "04f6kw4rd8k6waiyfbk7x8qdrqm411mdsdzjh2w9rvmv7y36ckh8" } }, { @@ -3064,11 +3061,11 @@ "repo": "bastibe/annotate.el", "unstable": { "version": [ - 20201216, - 1526 + 20210108, + 1828 ], - "commit": "44ac24f63dab3a5e052248d384082414b7af5f1d", - "sha256": "1np5kqfdxaq76gs6fwrlqv5sv6ii1w6f6rbp74j9hsir34kfpbv7" + "commit": "d4eff870d9c1575731890acfdde89511d0322ec1", + "sha256": "11k5j7xgnxq4s5ar56f3qmbr8vnrhi231zv0iiv2p0nqryaaj354" }, "stable": { "version": [ @@ -3106,8 +3103,8 @@ 20200914, 644 ], - "commit": "c71681368fdedcc83a136b4dc7b01e08b8a938ba", - "sha256": "1i9xp35vrksmalrr0y0ybsrb9qxxwyzgxhxz297488czxw8cfvz0" + "commit": "c5400349d7d9cb1e54af19bdb2046b52ecada5bc", + "sha256": "02kma8f6v6vxzbfzd2limwabp8a5hzjyg9kfabgp1j0dwvsl64pf" }, "stable": { "version": [ @@ -3188,28 +3185,28 @@ "repo": "k1LoW/emacs-ansible", "unstable": { "version": [ - 20201001, - 838 + 20210103, + 543 ], "deps": [ "f", "s" ], - "commit": "cf6b8f06c2628357fc2a72ea9817a2c2d0ebf690", - "sha256": "1pj7z6hsrh6ih1m6x3lbs2af6y30yazc44ahgkdvi00ckd48akqp" + "commit": "40af0d2bbb6c5bbcf7aa9269ac9a07e22622d263", + "sha256": "12k8mwlyiipsdjq5h1v04g3aa7ymjyhmy14j6vzjil4w9l6xyvdh" }, "stable": { "version": [ 0, 3, - 1 + 2 ], "deps": [ "f", "s" ], - "commit": "b5ef59406604bc5027f4d816d90e633feef0149c", - "sha256": "1v56mz39vlszprd6m6virbv87qvsnb38n0h0yhqzcy85c2l0jzx3" + "commit": "40af0d2bbb6c5bbcf7aa9269ac9a07e22622d263", + "sha256": "12k8mwlyiipsdjq5h1v04g3aa7ymjyhmy14j6vzjil4w9l6xyvdh" } }, { @@ -4813,11 +4810,11 @@ "repo": "jcs-elpa/auto-highlight-symbol", "unstable": { "version": [ - 20201018, - 1340 + 20210108, + 1841 ], - "commit": "0982390f19fee3c05856b9e4e40056dce4c4020d", - "sha256": "1vvk0vp61y63rjhfxk5ajs0m4p36pvbwb97sw66zdlrq5h33lmv9" + "commit": "5ad84d0a12b175360b18504cd04e6bf7ab1cf5c8", + "sha256": "0dpsqzl6nn08kg9d42a6zpk7jq6621c0hzf28c1ary4vzcwm4j9v" }, "stable": { "version": [ @@ -5262,8 +5259,8 @@ 20190331, 2230 ], - "commit": "5bb073fe751d6a839e33c4a7fd043be16a3dbeb2", - "sha256": "0pyjds57kc0y1h6qligxzdx7m61wxzv57bp7al5cvqlg225dswa0" + "commit": "c6ccdc83e85719a8bb07ef715cf5fd06866a479c", + "sha256": "0z8rykhhhwccy0zg6v3gnghfiawqw3afv4pvxr1hrympiyhyvhvp" } }, { @@ -5392,6 +5389,25 @@ } }, { + "ename": "avy-embark-collect", + "commit": "81c3fffff154360fd4fecb34b1b7ce362bf4eb41", + "sha256": "0fxya97fkh3w18301n37yj07mik3r8aaa61dmb64raav40xza9ad", + "fetcher": "github", + "repo": "oantolin/embark", + "unstable": { + "version": [ + 20210112, + 2334 + ], + "deps": [ + "avy", + "embark" + ], + "commit": "14dcc650d9339a6458bb0babfed35de13e76fa50", + "sha256": "15shi1i8071833mjzrwyy5iw818sxcqym0cb0zvi9bk5nvprp58b" + } + }, + { "ename": "avy-flycheck", "commit": "05755bed49219072d2ec98f0be5ecba4deda7cd1", "sha256": "0xvgysbx8yxhypms6639kk3cn0x6y6njnhnn9lf6hxsi96wd9y96", @@ -6192,11 +6208,11 @@ "url": "https://git.savannah.nongnu.org/git/bbdb.git", "unstable": { "version": [ - 20200928, - 1749 + 20210108, + 38 ], - "commit": "d25c29822aff60ab44eb7b5e68e28bc7c2d5d9a9", - "sha256": "0sc2m1xxhw7rgzpk4bw4n3nivhv0byy8yflzvnaf9xkq7km7wv3z" + "commit": "03c9ab00642fd54d7fb601f95a094b8b7f0eefb0", + "sha256": "1nk4d3qb5ibdjp3jmlbf5751y8zd6gms9r19l3hk1ajkw94p43kn" }, "stable": { "version": [ @@ -6611,11 +6627,11 @@ "repo": "gilbertw1/better-jumper", "unstable": { "version": [ - 20201230, - 2104 + 20210110, + 1317 ], - "commit": "e3a6546aa626b9a79ae451c88f44cf26f9d1a919", - "sha256": "0pijmc496m1mlzhny8zzklh5idpkipv552h8774rkdsn0c6d9jna" + "commit": "411ecdf6e7a3e1b4ced7605070d2309e5fc46556", + "sha256": "03jgfrpjlvn7fkv9grcqayphz2bjjkfh4rd6k1s7vmdpd3hm0xpb" } }, { @@ -6873,8 +6889,8 @@ "repo": "tmalsburg/helm-bibtex", "unstable": { "version": [ - 20200908, - 1017 + 20210108, + 1155 ], "deps": [ "biblio", @@ -6884,8 +6900,8 @@ "parsebib", "s" ], - "commit": "1bb81d77e08296a50de7ebfe5cf5b0c715b7f3d6", - "sha256": "1n5539hivg65gkr041mq8h96bn489fhvbxrh1manxacf6xi6b2am" + "commit": "94807a3d3419f90b505eddc3272e244475eeb4f2", + "sha256": "08wfvqdzs05bmfjjaqfxffjbl4j7632bnpncs9khrh6lifz03xh2" }, "stable": { "version": [ @@ -7011,8 +7027,8 @@ "bind-key", "key-chord" ], - "commit": "caa92f1d64fc25480551757d854b4b49981dfa6b", - "sha256": "088kl3bml0rs5bkfymgzr15ram9qvy66h1kaisrbkynh0yxvf8g9" + "commit": "365c73d2618dd0040a32c2601c5456ab5495b812", + "sha256": "10c0rmi5axypx0xy3fib739rjnakl32spwcirzxz1p5r0x9gya4a" }, "stable": { "version": [ @@ -7039,8 +7055,8 @@ 20200805, 1727 ], - "commit": "caa92f1d64fc25480551757d854b4b49981dfa6b", - "sha256": "088kl3bml0rs5bkfymgzr15ram9qvy66h1kaisrbkynh0yxvf8g9" + "commit": "365c73d2618dd0040a32c2601c5456ab5495b812", + "sha256": "10c0rmi5axypx0xy3fib739rjnakl32spwcirzxz1p5r0x9gya4a" }, "stable": { "version": [ @@ -7477,8 +7493,8 @@ 20201116, 2341 ], - "commit": "79b3543ca5efc02e4981d8fb987d2e869986511b", - "sha256": "0vbj0wn0apsxaxj428lkg2ga37pin0jqd3n51r7yrgj8s92qfacj" + "commit": "dc69eb6e431151d3942cb812b7161e6f23c28c07", + "sha256": "0gxj8m8q4md1kaay5ymsyynw5990apnqxa6lw73y8w1py785drmn" }, "stable": { "version": [ @@ -7738,15 +7754,15 @@ "repo": "emacscollective/borg", "unstable": { "version": [ - 20201119, - 1841 + 20210105, + 1045 ], "deps": [ "epkg", "magit" ], - "commit": "79bfdbdf0b4a81ee3bab2c853040e57e5454e164", - "sha256": "1rjlkgk6vcfxzgsw44h5prqgpjc1w4sfvklzlbxhyx84x0fzygpb" + "commit": "5de2a7aa0c126f5b18506e187bca66079e68f51d", + "sha256": "18d845xpfp1dklqqghxxzy6zglm8w11lyi3ww44yfmrmxgi8xsvd" }, "stable": { "version": [ @@ -8256,8 +8272,8 @@ 20180307, 2251 ], - "commit": "e093360e05164c78255866c1ac8f966aa38ba514", - "sha256": "1s35llycdhhclf9kl1q9l7zzzfqrnnvbiqv5csfw0mngfj0lz77f" + "commit": "b8ecbf0251a59c351a3e44607ee502af343da64b", + "sha256": "1zb4k5v4n6j42z7kzlw2y1jp4xbkp6w9zxls3ja36g326mz5mdjz" }, "stable": { "version": [ @@ -8512,14 +8528,14 @@ "repo": "alezost/bui.el", "unstable": { "version": [ - 20200426, - 2219 + 20210108, + 1141 ], "deps": [ "dash" ], - "commit": "28a9b0a36cb69b931cf32db7546ad5c6589752cf", - "sha256": "1gwb95pjwv9k0iq290mcyyl0xasr3jldr086rrhabxpcc9ih3yv8" + "commit": "f3a137628e112a91910fd33c0cff0948fa58d470", + "sha256": "04b0c15g24474sy9kp198g28yikhpr0fvmx1kgwqq9ly4p5wyzla" }, "stable": { "version": [ @@ -8805,19 +8821,19 @@ "repo": "jorgenschaefer/emacs-buttercup", "unstable": { "version": [ - 20201028, - 2204 + 20210105, + 2255 ], - "commit": "2f24a44f31caf5e832bd48438b5424193c5213d1", - "sha256": "0dxbn9h38a55jk91mrapsv7k7vdvijkakpcblnjpjd1ww5lkhcy8" + "commit": "1de6be465cfe2c3f00183de9351bd838690c9f81", + "sha256": "1w02p4bfkyga6sign4flq2kw0hawyvnv63410pyh8nm7acp311gg" }, "stable": { "version": [ 1, - 23 + 24 ], - "commit": "a9647cbb566eb488b7bbde44c4cdaf51b7915851", - "sha256": "0ym1hajy47n5f1rxic8qfxrwd8zc1r7csz1v4hrwhwm4qld4krfr" + "commit": "1de6be465cfe2c3f00183de9351bd838690c9f81", + "sha256": "1w02p4bfkyga6sign4flq2kw0hawyvnv63410pyh8nm7acp311gg" } }, { @@ -9475,15 +9491,15 @@ "repo": "kwrooijen/cargo.el", "unstable": { "version": [ - 20201213, - 1943 + 20210103, + 2111 ], "deps": [ "markdown-mode", "rust-mode" ], - "commit": "b18e1ecc7ef4b0d813ad6775af00f1297efd2804", - "sha256": "04zxafczac13lygdh05glrgqks5zn2l1aajckjcla7ad6naknmar" + "commit": "9c7d885562c7d5935ec2e97585acf95813a084be", + "sha256": "0j1ls97m4rc9mkjp57k4ba1ljvzlhmpn31z7drkqhx9yff0q0fan" }, "stable": { "version": [ @@ -9767,8 +9783,8 @@ 20200904, 1431 ], - "commit": "a66a7b16f13533afdd03e21eebcdd6309e469a13", - "sha256": "1x5qrzzsn977hyi8xnc37jrsq7adwg2jd1ln3vapfxr05pgiijk7" + "commit": "1cd0f65e4e116aaa1dddce98e95ce79911ff85ac", + "sha256": "1w9k8gadkm0l39j8i9n5c3zwsgv1rqi9q3gpx050wn5mv33aryak" } }, { @@ -9816,8 +9832,8 @@ 20200904, 1431 ], - "commit": "a66a7b16f13533afdd03e21eebcdd6309e469a13", - "sha256": "1x5qrzzsn977hyi8xnc37jrsq7adwg2jd1ln3vapfxr05pgiijk7" + "commit": "1cd0f65e4e116aaa1dddce98e95ce79911ff85ac", + "sha256": "1w9k8gadkm0l39j8i9n5c3zwsgv1rqi9q3gpx050wn5mv33aryak" } }, { @@ -9951,15 +9967,15 @@ "repo": "ema2159/centaur-tabs", "unstable": { "version": [ - 20201213, - 949 + 20210114, + 2059 ], "deps": [ "cl-lib", "powerline" ], - "commit": "23eda0a0292a84c7e0a0aa2b598f9e29c7e5b54f", - "sha256": "1zk0vf7yckv3zaws9z0svgbkvs94b2js1r9vjl6pxgxa2qc0khd6" + "commit": "50fd573ce9ed9f914940c79c82e411511ca5c8a8", + "sha256": "0dxis8w931chcbfwggc0jdirsxys42n2g21wqnqy892k70p7by1j" }, "stable": { "version": [ @@ -10086,8 +10102,8 @@ 20171115, 2108 ], - "commit": "412acbdcff7c296f5980ad26e66a7b9235059035", - "sha256": "077rv9hv52rl3hdm3s3csf9wxgjvmd28ndyjwfn3fgshriwhh9dr" + "commit": "a1f30acc05097d9def5925e8b48de3df4237610b", + "sha256": "18ixkfz41wa3h4041rlj6zxg30m3afhn1vfvcf6dz2vnj1z22h2z" }, "stable": { "version": [ @@ -10119,10 +10135,10 @@ }, { "ename": "cfml-mode", - "commit": "0d28507e1109195004a371fa201d914b995c2b4e", - "sha256": "0q88lxhkzzab4jjihk0livdpn6lsmd8l2s4brcbl8402m285sylp", + "commit": "858b9dd3723deb7da87c5a4db135b9098c7920ee", + "sha256": "09ic34pk3ccwda2gp42h9kv98b3k4b3069yqffa8621cjhz58fiw", "fetcher": "github", - "repo": "am2605/cfml-mode", + "repo": "amyers634/cfml-mode", "unstable": { "version": [ 20190617, @@ -10171,30 +10187,30 @@ "repo": "Alexander-Miller/cfrs", "unstable": { "version": [ - 20201227, - 1135 + 20210108, + 1152 ], "deps": [ "dash", "posframe", "s" ], - "commit": "6477fc50513ac5a5fe2bee8c76109a026d30b6a8", - "sha256": "0nw1sl8yy1l25jjwcr918ynf9aax5ilp0xjk5n9iw8c0d4lzgdla" + "commit": "d4cee9074b31b283b1475bfc8fe3c63ab51dbb61", + "sha256": "122gls0zwxl3km5h0gw5ykccxxdfy8svvr7s7lm78ylmp6prpx2p" }, "stable": { "version": [ 1, - 3, - 2 + 5, + 1 ], "deps": [ "dash", "posframe", "s" ], - "commit": "6477fc50513ac5a5fe2bee8c76109a026d30b6a8", - "sha256": "0nw1sl8yy1l25jjwcr918ynf9aax5ilp0xjk5n9iw8c0d4lzgdla" + "commit": "f47e9b7b96172023cbc0e3aaeb62462829d3134d", + "sha256": "1sia4dnp2jfjx2npklgg9yhdgs5vzjxvyk6nj0z1fvpqxfdkg60m" } }, { @@ -10684,8 +10700,8 @@ "repo": "contrapunctus-1/chronometrist", "unstable": { "version": [ - 20201222, - 1500 + 20210106, + 2147 ], "deps": [ "anaphora", @@ -10694,14 +10710,14 @@ "seq", "ts" ], - "commit": "551a750cae4030d7f4ff92eebc26da6c4aae9af6", - "sha256": "1jhdr4b2y92982rbbhwmrd3h4bm17px0adglhsc1w4h02zdm54iy" + "commit": "cef185de5ce47236c6ba70a7613f7aa51365e5ec", + "sha256": "10jc1xw3rz18h1an8psbmrp9a1y11xcf53j0hi7vvch85w75hfc6" }, "stable": { "version": [ 0, - 5, - 6 + 6, + 2 ], "deps": [ "anaphora", @@ -10710,8 +10726,8 @@ "seq", "ts" ], - "commit": "6e310163b3b43844a45ee93cb37d093f66860ede", - "sha256": "0g54pxvid1hlynlnfx99sl027q2mr2f4axsvnf0vb3v48zm0n5cw" + "commit": "cef185de5ce47236c6ba70a7613f7aa51365e5ec", + "sha256": "10jc1xw3rz18h1an8psbmrp9a1y11xcf53j0hi7vvch85w75hfc6" } }, { @@ -10722,28 +10738,28 @@ "repo": "contrapunctus-1/chronometrist-goal", "unstable": { "version": [ - 20200906, - 1522 + 20210104, + 336 ], "deps": [ "alert", "chronometrist" ], - "commit": "c8bb401155a8a2c5718ffd3667c516f8e178a1b5", - "sha256": "0lqllxhq8r38gm12ia5s2mjsv75l1d99dbning5lmwwbcyc9cn17" + "commit": "7a878bd3709b9638caff17b5f49b27c03b06862a", + "sha256": "1gyz0cfq7sqqrcj8d5ikm6xqmbg3njhmbi291fs5jr8bdqrcbbmg" }, "stable": { "version": [ 0, - 2, - 1 + 3, + 0 ], "deps": [ "alert", "chronometrist" ], - "commit": "e651821d0f64830235232082a8295e86a173574b", - "sha256": "02q9bksjs24hxl1lz93f16rvqyn6ah10acjg2yw7kx0nj3qxff8v" + "commit": "7a878bd3709b9638caff17b5f49b27c03b06862a", + "sha256": "1gyz0cfq7sqqrcj8d5ikm6xqmbg3njhmbi291fs5jr8bdqrcbbmg" } }, { @@ -10802,8 +10818,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20201230, - 1039 + 20210104, + 915 ], "deps": [ "clojure-mode", @@ -10814,8 +10830,8 @@ "sesman", "spinner" ], - "commit": "02518bc16bd0fbf56bcade491fbf5c36cedc5b8e", - "sha256": "0a82m5rnam34xkjh466ds84n6d09w9z8q162x61dvl2qnyn0ma3f" + "commit": "3fac28541e03812990c771bd774bf8ea65c228c9", + "sha256": "1216nws4mcvmrlkdvpb83slqqwkqiwdyw0fxp2b1nkm2lmrcq7bs" }, "stable": { "version": [ @@ -10985,8 +11001,8 @@ 20181024, 1256 ], - "commit": "414127acad8e2e0092ca60918e6a7cb89da6e28a", - "sha256": "08cfhk33xawj0jbgywfn1w0j7gjyj9bcghbrwn96fd7wwj3wh5j2" + "commit": "925451a00e6defd4f5ac1a7fd76ffefefdbce3ef", + "sha256": "0bmjrfijaicwa5vvlfr47xmjcgj2npmqfcj63nczxc316kka4q9q" }, "stable": { "version": [ @@ -11006,14 +11022,14 @@ "repo": "jorgenschaefer/circe", "unstable": { "version": [ - 20201225, - 1707 + 20210111, + 2141 ], "deps": [ "cl-lib" ], - "commit": "0472cda711252b06fc07be184449b31933578148", - "sha256": "1ad1aqjmj1imh5zmnmdnwc06sn3rgd3xmksypyi2hnh07r79ynf4" + "commit": "265f36c1e6c8db598742778dc64f9799896f5dc1", + "sha256": "0vf76rrgkpybi67n14g6gn1a7by7b90gxa8rz2m50xl3vdphnibk" }, "stable": { "version": [ @@ -11059,6 +11075,24 @@ } }, { + "ename": "circleci-api", + "commit": "d05bf29e8367d4942e13eb768f4db2b291f1281e", + "sha256": "16kcbh5d6yhqaircwzy7zhb2l3in62hz6khzarfadcsk9y47pp2s", + "fetcher": "github", + "repo": "sulami/circleci-api.el", + "unstable": { + "version": [ + 20201221, + 1036 + ], + "deps": [ + "request" + ], + "commit": "870d6b550210cb1fd97a8dabad2c284e54416b4b", + "sha256": "0ph12r4lfy653qbp00hbry06n0gddfm3c7kmqp2v3c03bdsn5l9c" + } + }, + { "ename": "citeproc", "commit": "20aa56e9a4809cee1082224b1b4e65921a48bda1", "sha256": "1qphg2bg7vvjzgvnsscbyf40llxxh4aa2s2ffk8vsbfd4p8208cq", @@ -11495,8 +11529,8 @@ "repo": "clojure-emacs/clj-refactor.el", "unstable": { "version": [ - 20200831, - 1244 + 20210101, + 1036 ], "deps": [ "cider", @@ -11509,8 +11543,8 @@ "seq", "yasnippet" ], - "commit": "6db85b37b57497b56d97d5e5512160e5db85f798", - "sha256": "1aig67ps65adsnpdkjvl0wdglzjzhw1jc2v1rdhyfszqk0w30sz9" + "commit": "9dcc50da7ce6f3c10276c87f09022e80c03e8bef", + "sha256": "10b83yyhkppgzjxaqk8l1c2476x8cvnpn6vf1gj2v5y23c7s2mbs" }, "stable": { "version": [ @@ -11873,16 +11907,16 @@ "repo": "clojure-emacs/clomacs", "unstable": { "version": [ - 20200808, - 2347 + 20201224, + 1358 ], "deps": [ "cider", "s", "simple-httpd" ], - "commit": "ada167954911bf1631ea73537b4b496f35f99a73", - "sha256": "0gc4c97s6y7al1777zmzvq1n30i532b4v8k2p7i71bzzijr97fml" + "commit": "ffcb122194507593815d67b26f5d2d8ffcc52bf8", + "sha256": "1dqcc5szghqxdhy8r0gq6s7bbv4zq0grsjjfh8n6wmsyd1svrd3k" }, "stable": { "version": [ @@ -12035,14 +12069,14 @@ "repo": "Lindydancer/cmake-font-lock", "unstable": { "version": [ - 20200914, - 1715 + 20210103, + 1558 ], "deps": [ "cmake-mode" ], - "commit": "47687b6ccd0e244691fb5907aaba609e5a42d787", - "sha256": "03am60wr5jzx1vqyvfc885z8vy959zypjbmar37ln2pffiz9510l" + "commit": "5e20ed32193c2c7ebae920a6a3cd711c8c950597", + "sha256": "030j8k2yi1vli7xw10vz24qigq7jxg8yhc15kwjscfczl38x8vh4" } }, { @@ -12087,20 +12121,20 @@ "url": "https://gitlab.kitware.com/cmake/cmake.git", "unstable": { "version": [ - 20201217, - 1410 + 20210104, + 1831 ], - "commit": "95c59252c4116c185e898762d82b49d7a4f42445", - "sha256": "08c4q1nllcc8d5zjcdjg0ms2ia75rar1xxm8sd036pl74bns7ra8" + "commit": "e6b6e457a0e8d33402bc7d64d85b20a8ca0546a0", + "sha256": "1p5vd3dmp7q0nw5px2gplrrdi6zgd3qlvmc3ql7xclgaxbp0zrs2" }, "stable": { "version": [ 3, 19, - 2 + 3 ], - "commit": "0932b1c2b29f4ad1228fa71bf4f5c089474d9882", - "sha256": "0c6vncdqps7i1a3gxm94pp0wrgs8xvq77br178xna398f3ckf26p" + "commit": "19ff734e76a35d59eb0f973197cadb1c271c766c", + "sha256": "0yzwnb1vikbhqzrqq6ngzqv45dcngajjc3b2f4cc002ry3bnn1mv" } }, { @@ -12600,11 +12634,11 @@ "repo": "purcell/color-theme-sanityinc-tomorrow", "unstable": { "version": [ - 20201225, - 2110 + 20210107, + 2111 ], - "commit": "b70046e4bf23583af39ddd0534470358eab0ff9d", - "sha256": "15bn6y75mr7g7l36hxfmz0fmcdpysacp29ib04az4mn6bkylns4x" + "commit": "71b72baed2008e38ad1eb6558934e64094351cd7", + "sha256": "1z39lha9jb1bxr1xlyy5clqqqvnafipx0rf8pdjw9qhbjh4kk2x1" }, "stable": { "version": [ @@ -12641,11 +12675,11 @@ "url": "https://git.sr.ht/~lthms/colorless-themes.el", "unstable": { "version": [ - 20201225, - 1334 + 20210102, + 1035 ], - "commit": "92ae2775ac9ae2fd3d1172ffdf706e18db55963c", - "sha256": "06cp84bi3x33il119gfk8blikbqdmakvj7h64dr9crh0v11lg7ds" + "commit": "c1ed1e12541cf05cc6c558d23c089c07e10b54d7", + "sha256": "02ai9yf7h3i81bg01w8nb4kdrcc94ladbrkw9vg3p40w617mjwlb" }, "stable": { "version": [ @@ -12877,11 +12911,11 @@ "repo": "remyferre/comment-dwim-2", "unstable": { "version": [ - 20201024, - 828 + 20210101, + 1820 ], - "commit": "396b03c67684461e194a45ce751508d37088469d", - "sha256": "1pmgprhl9fllpa06c4hxb5zss3qiq1lcqwqzlnq5n2lhv8lzk3h0" + "commit": "7cdafd6d98234a7402865b8abdae54a2f2551c94", + "sha256": "0f9gzgn4d2ir79nvv5vqhn4s4131dphzpfzfcb0iy4fx6mhmca5b" }, "stable": { "version": [ @@ -13044,11 +13078,11 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20201230, - 2332 + 20210114, + 35 ], - "commit": "123b604297b64c69aeec3018722c75e03d18c23a", - "sha256": "0s5afwzdy31ws7qcjxnijsnm8nsxvqs2pmaz2bxf5ph8cyaxzdvj" + "commit": "288a7617c4c3e5f22a887a17a697ac2bfe4e567d", + "sha256": "1h5wkgv7gny7dp01mq35fj9g18v62813gx6qvw7812rypaj068yw" }, "stable": { "version": [ @@ -13218,8 +13252,8 @@ "repo": "sebastiencs/company-box", "unstable": { "version": [ - 20201004, - 735 + 20210103, + 1605 ], "deps": [ "company", @@ -13227,8 +13261,8 @@ "dash-functional", "frame-local" ], - "commit": "be37a9a30dc112ab172af21af694e2cb04a74f85", - "sha256": "13fgmdy51gqdwijqfvb784pirx4lgva0y7ysi0c3fcx8f82cdj59" + "commit": "ec8f44674dc10dd4d50785a1f97820b29d392ea2", + "sha256": "1bzmwf6nv10pipaa3934kkly4vyzdc7hcb4r7ygimqxxcx0zvipj" } }, { @@ -13650,15 +13684,15 @@ "repo": "guidoschmidt/company-glsl", "unstable": { "version": [ - 20171015, - 1749 + 20210109, + 1403 ], "deps": [ "company", "glsl-mode" ], - "commit": "a262c12c3bcd0807718c4edcaf2b054e30ef0e26", - "sha256": "0338bym8ifvkgpbc4vyzf3nmlp6rc8lihyxcbym5m08612ln78mk" + "commit": "3a40501ba831a30a7fd3e8529b20d1305d0454aa", + "sha256": "0khpvi23jbgs2rbwjawl56a219z8r3i44s4zq10an91r0q8d8n4l" } }, { @@ -14350,8 +14384,8 @@ "company", "prescient" ], - "commit": "2af94ce194f9b8d7087f7b49ecd986083f7eb753", - "sha256": "19wwnl72gh4ar2q6gcp6k6n4gdvamdjj6lgc0n4mk7j1qrylp3hf" + "commit": "42adc802d3ba6c747bed7ea1f6e3ffbbdfc7192d", + "sha256": "0v12707jwd2ynk8gp3shgarl6yp3ynal7d4jzds6l2lknr6wi50w" }, "stable": { "version": [ @@ -14747,8 +14781,8 @@ "repo": "TommyX12/company-tabnine", "unstable": { "version": [ - 20201101, - 1948 + 20210111, + 347 ], "deps": [ "cl-lib", @@ -14757,8 +14791,8 @@ "s", "unicode-escape" ], - "commit": "da18b5e1f01facea1e9588f067ec79dc36e475fc", - "sha256": "0qaq5k5c6nnnk7rhi2n51nj4jgnrjf843p8qafcqbz120ynih1w1" + "commit": "a6edb64cd1087f0453d08a72c3c0169cebcd9f4c", + "sha256": "069zzs80zwxhhnwnvybyvhd0qrwdd60r7ihffn5bmngmxf5nmi8i" } }, { @@ -15081,8 +15115,8 @@ "repo": "necaris/conda.el", "unstable": { "version": [ - 20200818, - 1614 + 20210114, + 123 ], "deps": [ "dash", @@ -15090,8 +15124,8 @@ "pythonic", "s" ], - "commit": "9f7eea16e9ad3eb34fe3d1cbd9d6162b8046c2f8", - "sha256": "1151bk1fx8y8yql1sg9qqagxcbq57rz85gwnx0z2acfpljb2i7r7" + "commit": "dce431b25f5a13af58cc7cacfa7968b5a888609c", + "sha256": "1q4hnb42kp73ida37cgrrwi5dxl8vjdl1ibj8l51h47l2rlcrn09" }, "stable": { "version": [ @@ -15257,17 +15291,17 @@ }, { "ename": "consult", - "commit": "1a1fbbfebeb88dab2d032e994ec21c976f059d22", - "sha256": "1jkqrc9wzk2dhajnd84avppynqcmly9vc35xhaqi4skhx5il24wb", + "commit": "a0f3b8b11eb8f9adf182ab62fcb276b52bc26f19", + "sha256": "17zriam6hgz19ms78c9zh0hvb4b6h5hinrinbmbb2jcwi4cykxs3", "fetcher": "github", "repo": "minad/consult", "unstable": { "version": [ - 20201231, - 1259 + 20210115, + 618 ], - "commit": "815360376ba93e731ff715520a79fdbf2424a0f1", - "sha256": "0djnhrf2radvxfbdx3wimrsrhdkqqrhnyr0jnfasw1jyr832s64x" + "commit": "6e7fd01c217b2ee6cc5e02dd74d7e687c2ccf267", + "sha256": "0vzbv51q6ax824kcrr7hv4l93s91ii583lsx2wc0nvi0vklbq50i" } }, { @@ -15278,34 +15312,15 @@ "repo": "minad/consult", "unstable": { "version": [ - 20201226, - 12 + 20210112, + 1845 ], "deps": [ "consult", "flycheck" ], - "commit": "815360376ba93e731ff715520a79fdbf2424a0f1", - "sha256": "0djnhrf2radvxfbdx3wimrsrhdkqqrhnyr0jnfasw1jyr832s64x" - } - }, - { - "ename": "consult-selectrum", - "commit": "1a1fbbfebeb88dab2d032e994ec21c976f059d22", - "sha256": "08zhnzj70c3j4jkxa75a4wsaz1g35sc0wl7vkhjnhlpqhwidb2p5", - "fetcher": "github", - "repo": "minad/consult", - "unstable": { - "version": [ - 20201230, - 942 - ], - "deps": [ - "consult", - "selectrum" - ], - "commit": "815360376ba93e731ff715520a79fdbf2424a0f1", - "sha256": "0djnhrf2radvxfbdx3wimrsrhdkqqrhnyr0jnfasw1jyr832s64x" + "commit": "6e7fd01c217b2ee6cc5e02dd74d7e687c2ccf267", + "sha256": "0vzbv51q6ax824kcrr7hv4l93s91ii583lsx2wc0nvi0vklbq50i" } }, { @@ -15621,14 +15636,14 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20201227, - 1327 + 20210109, + 1641 ], "deps": [ "swiper" ], - "commit": "d2891aab7b816aebf21ebd01ce33933a6ac6244f", - "sha256": "12bm5w073mgpj7kvk6596fnw8809nl6vkv288l7vvzx7iimaqzpl" + "commit": "cbce9ce71429c98c67bd76ef15d049ecced042f7", + "sha256": "08lgvpvkhp2i9q73bnr2v17w864rwp6wjnrl3b7qg06dacfs2rvl" }, "stable": { "version": [ @@ -15644,6 +15659,25 @@ } }, { + "ename": "counsel-ag-popup", + "commit": "746d624efbf305a07c1eb68990b8bfb249e212fc", + "sha256": "148szhlv9pflf7zhc0ljmbsm32k7z8x03r0jqyypp6gfjbhf3l5w", + "fetcher": "github", + "repo": "gexplorer/counsel-ag-popup", + "unstable": { + "version": [ + 20210114, + 1548 + ], + "deps": [ + "counsel", + "transient" + ], + "commit": "cf0ee4f5bdb43a576f5cde00d52744ddb49177d5", + "sha256": "1k9d0581imp65d6w9vmc8bx6phyx0pvl7mas56p06hgnwg1i9cyk" + } + }, + { "ename": "counsel-bbdb", "commit": "0ed9bcdb1f25a6dd743c1dac2bb6cda73a5a5dc2", "sha256": "14d9mk44skpmyj0zkqwz97j80r630j7s5hfrrhlsafdpl5aafjxp", @@ -16660,11 +16694,11 @@ "repo": "emacs-csharp/csharp-mode", "unstable": { "version": [ - 20201231, - 1103 + 20210114, + 2018 ], - "commit": "74644d4534beae372f7f05b2464a201383588f59", - "sha256": "0k1zm83w6d6dw2w68d8frpcadacsrar09vv996xrax68i16ggcp5" + "commit": "1d02a54f71b0c6ae0b5be9f764271ac31b1b0167", + "sha256": "02mbxqf4y04ancz89jkb8dmpmx3pmzxnxm5vc4fc6d828nzv56fx" }, "stable": { "version": [ @@ -17230,11 +17264,11 @@ "repo": "mrkkrp/cyphejor", "unstable": { "version": [ - 20190713, - 1339 + 20210111, + 841 ], - "commit": "763531d077d02a4a45c58332b8a8b8300c090678", - "sha256": "0q0wjybmasrv04r09linnb3n1m7g7qylaynzmmsdrk59fwzda3c2" + "commit": "037c0f2d0cd0e23acd2aacb621d7694080f5eef6", + "sha256": "16jca2abc66vcf92js5m5489np7a4ymb27i78rkqwsrwcniz178j" }, "stable": { "version": [ @@ -17272,8 +17306,8 @@ 20190111, 2150 ], - "commit": "e6f92c1753fd8b07c5beb040fb8be1c4a8b0591c", - "sha256": "1cbq2sigqvqrpllli2qlasm5j96ssx96smjr3pj51i6ndi81gp04" + "commit": "30fc474830b4a5beb88cdc53a31797ed794cddb8", + "sha256": "08wb26skxw4gh1gzpbxxgi63x44zbb50xd6mi5nbsg538fqb9arj" }, "stable": { "version": [ @@ -17439,8 +17473,8 @@ "repo": "jyp/dante", "unstable": { "version": [ - 20200921, - 723 + 20210101, + 907 ], "deps": [ "company", @@ -17451,8 +17485,8 @@ "lcr", "s" ], - "commit": "e2acbf6dd37818cbf479c9c3503d8a59192e34af", - "sha256": "18w9ifykrcxxjn9pwp3xfyxvx54c0icwsv0n12xfjghfdkph21qq" + "commit": "7b32bf21d5b9f7232c4b5c3760abf306e9ed9a0c", + "sha256": "1if4p6ikj7dry2c0xyli4m02f6xabriddm25xp4nksm8mj9cjgby" }, "stable": { "version": [ @@ -17493,8 +17527,8 @@ "posframe", "s" ], - "commit": "041db8eb7f0ceb9477ffff1730b5940814001158", - "sha256": "0cjr2dhqh8k76il9iiajszr7vra1phhksf0zw946chg7sa12chh1" + "commit": "612388d0b85e77972a9c28391bac6224a63408c7", + "sha256": "1z1vimfwjb5bfqdijh38cii222sw07l2mgbw4bwhwp93kasczw9a" }, "stable": { "version": [ @@ -17747,11 +17781,11 @@ "repo": "magnars/dash.el", "unstable": { "version": [ - 20201230, - 348 + 20210114, + 2017 ], - "commit": "e47ecb822f6bb10c196ca00030b0e6f5e176495e", - "sha256": "0p6qj7ambff7r7s8kab2rrl0mlgjz46k1f98x5msn6ajl3zdv9n6" + "commit": "6f5888c77523c2373c5252ef2113612beac7e78f", + "sha256": "1kg6c0jv44wlc0pidphg0cpmxfkn72r9391x0jgl1w22bhsvy4cz" }, "stable": { "version": [ @@ -17820,14 +17854,14 @@ "repo": "magnars/dash.el", "unstable": { "version": [ - 20201215, - 40 + 20210103, + 1524 ], "deps": [ "dash" ], - "commit": "e47ecb822f6bb10c196ca00030b0e6f5e176495e", - "sha256": "0p6qj7ambff7r7s8kab2rrl0mlgjz46k1f98x5msn6ajl3zdv9n6" + "commit": "6f5888c77523c2373c5252ef2113612beac7e78f", + "sha256": "1kg6c0jv44wlc0pidphg0cpmxfkn72r9391x0jgl1w22bhsvy4cz" }, "stable": { "version": [ @@ -17850,14 +17884,14 @@ "repo": "emacs-dashboard/emacs-dashboard", "unstable": { "version": [ - 20201229, - 426 + 20210113, + 922 ], "deps": [ "page-break-lines" ], - "commit": "c4283b7be41d5c047dfea4e3e8ca4d03c8f63c12", - "sha256": "0w44lf194smcm8ppgl2nsji246sg8n12mm0jaiqrjnk7rcirivbn" + "commit": "fb5e47576a1c91374b008221277f0a45b2491085", + "sha256": "0c4rj8lm7dikjbnr2ynzhmzchg7mjirawp0hqxd5jgdv0lbn267n" }, "stable": { "version": [ @@ -17893,36 +17927,36 @@ }, { "ename": "dashboard-ls", - "commit": "656977197e0030525c52b14de8f6e1faa042daeb", - "sha256": "10dsdzps7kh3v5p5grdjwf2xjr7rvaiqp57fg9vh4pficvhylqaa", + "commit": "c011899d671f33ce6f303693a11c4f37e4c90fe7", + "sha256": "19hps917cys5bvplr9l4zzphhq6k9mpi1c4yjgslygx3svrfsxcf", "fetcher": "github", - "repo": "jcs-elpa/dashboard-ls", + "repo": "emacs-dashboard/dashboard-ls", "unstable": { "version": [ - 20201207, - 1616 + 20210108, + 1857 ], "deps": [ "dashboard", "f", "s" ], - "commit": "c97ea0b454ea78e55155fd4c52abc60753496cd8", - "sha256": "1dkgccj4ac2mis930qwsncjcygx729pgs0v00hpm23mnhc6mxx9b" + "commit": "91b3c79aa3af3842f1477825f967370414dc77b2", + "sha256": "0q456m64wkbwxc99bwr8b3n7z2f2qkrbcdij0kji35rg89rxbgph" }, "stable": { "version": [ 0, 2, - 1 + 2 ], "deps": [ "dashboard", "f", "s" ], - "commit": "c97ea0b454ea78e55155fd4c52abc60753496cd8", - "sha256": "1dkgccj4ac2mis930qwsncjcygx729pgs0v00hpm23mnhc6mxx9b" + "commit": "86ad7ca7b09e98524de6c64e1fd63f61d41f9177", + "sha256": "052072jk22dz141wsr6wg3wfnvwfaikalhmqc7mpp15iwwg1ppa4" } }, { @@ -18190,15 +18224,15 @@ "repo": "skk-dev/ddskk", "unstable": { "version": [ - 20200906, - 233 + 20210112, + 2013 ], "deps": [ "ccc", "cdb" ], - "commit": "a66a7b16f13533afdd03e21eebcdd6309e469a13", - "sha256": "1x5qrzzsn977hyi8xnc37jrsq7adwg2jd1ln3vapfxr05pgiijk7" + "commit": "1cd0f65e4e116aaa1dddce98e95ce79911ff85ac", + "sha256": "1w9k8gadkm0l39j8i9n5c3zwsgv1rqi9q3gpx050wn5mv33aryak" } }, { @@ -18240,16 +18274,16 @@ "repo": "Wilfred/deadgrep", "unstable": { "version": [ - 20201012, - 619 + 20210113, + 829 ], "deps": [ "dash", "s", "spinner" ], - "commit": "baa352b982bded5fbca1ec9c14fec20e78b2089b", - "sha256": "08p2aaak27mf8nidl2nqfhrhvapswp0b79l3jn0vb2xabbhza7rv" + "commit": "bb374c625939ac2dd9e2408c2cc180b1c9f4aa20", + "sha256": "0galdbka4dmlrryn5pbyd7frc676hb91y0zf6di8p9j2v3r7gzqv" }, "stable": { "version": [ @@ -18524,11 +18558,11 @@ "repo": "abo-abo/define-word", "unstable": { "version": [ - 20200824, - 1120 + 20210103, + 1812 ], - "commit": "3af6825c5f3bf4f6176a3f5b2e499616c65e2fe0", - "sha256": "1l418w5lhlyh62557ffrsisv7ips0ql7bpcxc32msc51dlh7ilhh" + "commit": "6e4a427503aef096484f88332962c346cdd10847", + "sha256": "1mpsc9cfdl5lzn2yzn63gxvshjl3m2aiwsv12g3qvya2a1xskjj8" }, "stable": { "version": [ @@ -18581,11 +18615,11 @@ "repo": "jrblevin/deft", "unstable": { "version": [ - 20200515, - 1513 + 20210101, + 1519 ], - "commit": "fca9ea05ef4fdac825e2ad3921baa7042f6b82c8", - "sha256": "0h5znwc4sa92l2472204yn60z30ysvkr9hphjga7kn4j4jgvqak1" + "commit": "c4af44827f4257e7619e63abfd22094a29a9ab52", + "sha256": "0xphl5r8q884ml6clrfrzaiqznfrrpsvysakigjqpgazic5d60g2" }, "stable": { "version": [ @@ -19052,14 +19086,14 @@ "repo": "dgutov/diff-hl", "unstable": { "version": [ - 20201220, - 1006 + 20210113, + 1930 ], "deps": [ "cl-lib" ], - "commit": "a0028d9d3ef28513b0b2cec145199bf088169563", - "sha256": "0g8gia8wbxyx37302is50i4jp863k23fpb75j4ndrv4k0pj6cr20" + "commit": "dc3e12f14f5fddff3811310cd48640e2c9e626da", + "sha256": "1ackhs5rajydwfjgm4a9mwqhc75dk1jsby4yxkqbji495kwq4rsq" }, "stable": { "version": [ @@ -19327,11 +19361,11 @@ "repo": "gonewest818/dimmer.el", "unstable": { "version": [ - 20201203, - 545 + 20210109, + 1932 ], - "commit": "360e413f06d0da968af7cbb2a25d97a24765818f", - "sha256": "0fbr5s8zf5na8zsm5vq2ahkyr37azslnssa102mhkf67077lpy4n" + "commit": "8559fb73a2c96755cb30f560be82191164014b43", + "sha256": "0jb5ki27yvzli3yybglhcnkhzpjxv15zy646yaafszq232j1ylnk" }, "stable": { "version": [ @@ -19455,8 +19489,8 @@ "dash", "dired-hacks-utils" ], - "commit": "d6d4d1930969bbc22fd0551d5195887bf92cab3e", - "sha256": "0nhd2f6ybdcb4nb6klallvjfdfkfn1vp2j29zi1d7spi7ksv6l4f" + "commit": "d1a2bda6aa8f890cb367297ed93aee6d3b5ba388", + "sha256": "12m81a9kjhs4cyq3lym0vp5nx6z3sfnypyzrnia76x6rjvixjf6y" } }, { @@ -19467,16 +19501,16 @@ "repo": "Fuco1/dired-hacks", "unstable": { "version": [ - 20190515, - 1210 + 20210110, + 1714 ], "deps": [ "dash", "dired-hacks-utils", "f" ], - "commit": "d6d4d1930969bbc22fd0551d5195887bf92cab3e", - "sha256": "0nhd2f6ybdcb4nb6klallvjfdfkfn1vp2j29zi1d7spi7ksv6l4f" + "commit": "d1a2bda6aa8f890cb367297ed93aee6d3b5ba388", + "sha256": "12m81a9kjhs4cyq3lym0vp5nx6z3sfnypyzrnia76x6rjvixjf6y" } }, { @@ -19602,8 +19636,8 @@ "dired-hacks-utils", "f" ], - "commit": "d6d4d1930969bbc22fd0551d5195887bf92cab3e", - "sha256": "0nhd2f6ybdcb4nb6klallvjfdfkfn1vp2j29zi1d7spi7ksv6l4f" + "commit": "d1a2bda6aa8f890cb367297ed93aee6d3b5ba388", + "sha256": "12m81a9kjhs4cyq3lym0vp5nx6z3sfnypyzrnia76x6rjvixjf6y" } }, { @@ -19641,8 +19675,8 @@ "deps": [ "dash" ], - "commit": "d6d4d1930969bbc22fd0551d5195887bf92cab3e", - "sha256": "0nhd2f6ybdcb4nb6klallvjfdfkfn1vp2j29zi1d7spi7ksv6l4f" + "commit": "d1a2bda6aa8f890cb367297ed93aee6d3b5ba388", + "sha256": "12m81a9kjhs4cyq3lym0vp5nx6z3sfnypyzrnia76x6rjvixjf6y" } }, { @@ -19792,8 +19826,8 @@ "dash", "dired-hacks-utils" ], - "commit": "d6d4d1930969bbc22fd0551d5195887bf92cab3e", - "sha256": "0nhd2f6ybdcb4nb6klallvjfdfkfn1vp2j29zi1d7spi7ksv6l4f" + "commit": "d1a2bda6aa8f890cb367297ed93aee6d3b5ba388", + "sha256": "12m81a9kjhs4cyq3lym0vp5nx6z3sfnypyzrnia76x6rjvixjf6y" } }, { @@ -19811,8 +19845,8 @@ "dash", "dired-hacks-utils" ], - "commit": "d6d4d1930969bbc22fd0551d5195887bf92cab3e", - "sha256": "0nhd2f6ybdcb4nb6klallvjfdfkfn1vp2j29zi1d7spi7ksv6l4f" + "commit": "d1a2bda6aa8f890cb367297ed93aee6d3b5ba388", + "sha256": "12m81a9kjhs4cyq3lym0vp5nx6z3sfnypyzrnia76x6rjvixjf6y" } }, { @@ -19889,8 +19923,8 @@ "dash", "dired-hacks-utils" ], - "commit": "d6d4d1930969bbc22fd0551d5195887bf92cab3e", - "sha256": "0nhd2f6ybdcb4nb6klallvjfdfkfn1vp2j29zi1d7spi7ksv6l4f" + "commit": "d1a2bda6aa8f890cb367297ed93aee6d3b5ba388", + "sha256": "12m81a9kjhs4cyq3lym0vp5nx6z3sfnypyzrnia76x6rjvixjf6y" } }, { @@ -19908,8 +19942,8 @@ "dash", "dired-hacks-utils" ], - "commit": "d6d4d1930969bbc22fd0551d5195887bf92cab3e", - "sha256": "0nhd2f6ybdcb4nb6klallvjfdfkfn1vp2j29zi1d7spi7ksv6l4f" + "commit": "d1a2bda6aa8f890cb367297ed93aee6d3b5ba388", + "sha256": "12m81a9kjhs4cyq3lym0vp5nx6z3sfnypyzrnia76x6rjvixjf6y" } }, { @@ -20004,14 +20038,14 @@ "repo": "jojojames/dired-sidebar", "unstable": { "version": [ - 20200711, - 2031 + 20210109, + 1854 ], "deps": [ "dired-subtree" ], - "commit": "da77919081d9a4e73c2df63542353319381e4f89", - "sha256": "05h56wdl2xvc8davnx83ypg20fl7wlks97cafa4r2yf141xjc05h" + "commit": "18986f015c993508af0b1b4e43e11dbd7af98057", + "sha256": "1zla8q26sif8795n5vncwgz2j7c45bh3gnjkwqgpdg4carrw5s60" }, "stable": { "version": [ @@ -20058,15 +20092,15 @@ "repo": "Fuco1/dired-hacks", "unstable": { "version": [ - 20180922, - 1615 + 20210105, + 1127 ], "deps": [ "dash", "dired-hacks-utils" ], - "commit": "d6d4d1930969bbc22fd0551d5195887bf92cab3e", - "sha256": "0nhd2f6ybdcb4nb6klallvjfdfkfn1vp2j29zi1d7spi7ksv6l4f" + "commit": "d1a2bda6aa8f890cb367297ed93aee6d3b5ba388", + "sha256": "12m81a9kjhs4cyq3lym0vp5nx6z3sfnypyzrnia76x6rjvixjf6y" } }, { @@ -20124,11 +20158,11 @@ "repo": "Boruch-Baum/emacs-diredc", "unstable": { "version": [ - 20201229, - 2025 + 20210113, + 1 ], - "commit": "a240c7dee42dad03e0012bb7b6280194e31311ea", - "sha256": "19p6w6c6zrfmkbm5g2yisac8f6d8sjlba88syx5crx2cy02m8y51" + "commit": "887434054c2cfc521ceb990266cc7bbc12c4a72a", + "sha256": "16rwxv2mrn79m8hqg79kq7z6fz2l8amh17kny4y3qnsvakpi0hch" } }, { @@ -21105,11 +21139,11 @@ "repo": "spotify/dockerfile-mode", "unstable": { "version": [ - 20201208, - 1348 + 20210106, + 235 ], - "commit": "6a56c1cc1713b501040b08fdbf0c4159a4fe95f9", - "sha256": "0l5pj85xpywfl2sgd4rgpvlxphc9alhhwi7ls0pa8wh2nry7ri5b" + "commit": "58b7380189de21496235382900838aa0db2dcf92", + "sha256": "1n3kis5g7m25sl68iw9jw7jkfz7jab82v37xk492d77rr9cbvjwx" }, "stable": { "version": [ @@ -21169,11 +21203,11 @@ "repo": "progfolio/doct", "unstable": { "version": [ - 20201229, - 2136 + 20210113, + 1646 ], - "commit": "36075595cf5cf6460f215735b1aa562d6a07a496", - "sha256": "1c8676b81dx8zhmbv3ymdyi21rx0x60a2v104i6p9l7c2yilq9c2" + "commit": "a795fa4eafd42e016b6c9fed93d2f370c4f5eef5", + "sha256": "1z8yzphckcbykz5nxz75vbc75zigv3f5lwwpnk35ipzb20xnm563" } }, { @@ -21288,16 +21322,16 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20201212, - 1823 + 20210107, + 1407 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "af5f61888e7eb0aa521d2d29b42221302b717915", - "sha256": "1d1ad9c321ni6hsvcrc6rhd1vbxd0dhfgvz52cna91alg9nhxwmm" + "commit": "4956606a5455a3968ca10cbdb8de3889e6bd1d85", + "sha256": "1agv0jdfqvyw227mr3c4wnpjby48ccggfjglbidnfl7knd9i982d" }, "stable": { "version": [ @@ -21322,14 +21356,14 @@ "repo": "hlissner/emacs-doom-themes", "unstable": { "version": [ - 20201220, - 836 + 20210113, + 1858 ], "deps": [ "cl-lib" ], - "commit": "3761dfce75144e49789b6576e187acd82e2731ee", - "sha256": "0a0lz9kkaaxj2r8xkcgyczz9pxq5hb4kd8mivqxmcj9572xs6v1r" + "commit": "18cddefb3c8b9da63086496142ad6756f0bc9167", + "sha256": "0ix7kfxhs45w763ajzi2qxr7f94rd4g4xfi6szv3c75q6y5mb3y3" }, "stable": { "version": [ @@ -21778,6 +21812,21 @@ } }, { + "ename": "dtb-mode", + "commit": "0c33d49a8d79ee60571775fc224453a351b0ff48", + "sha256": "0s8jwmg2kafg31scl04swbx56dnxr2y3j56g95a4k4ffnb0q28n3", + "fetcher": "github", + "repo": "schspa/dtb-mode", + "unstable": { + "version": [ + 20210105, + 1132 + ], + "commit": "7f66de945a0be2be5a26b4619cae097288fb55cd", + "sha256": "1ljmjc0a0ich5wixqq8v0k7gh51va9smq5a340c23zfbia17mmw5" + } + }, + { "ename": "dtk", "commit": "39333468fb6e9493deb86511f0032610a412ec8a", "sha256": "005x3j5q8dhphhh4c48l6qx7qi3jz9k02m86ww1bzwfzji55p9sp", @@ -21794,8 +21843,8 @@ "s", "seq" ], - "commit": "282ad6f8eb21b5812521bd9e31d2323b8b9bd9cb", - "sha256": "0yy1jfdh3k0fj7mrl66g6ljp6q77b9xh4xywi80021a15vv1va57" + "commit": "86d1558711cc6e843a1a5470113ff9cb1ad608d8", + "sha256": "03k96gr7hxw76dpykbzjfvrpkl2m1ifm4y0jc9skf2p448fd1ssw" } }, { @@ -21956,17 +22005,17 @@ 20191016, 1241 ], - "commit": "133a6fedc217d9b66329cc8fce45ab0edddef538", - "sha256": "0ixmj378dvi2dh2vy6c47v0zqjkfyr7n5gzcyaplrxsydfwzr2j2" + "commit": "13642e22a405de7c4361e94dd9aaa35ad1b09847", + "sha256": "0liha8qf1f4w5x8kklxc30yrn9krcrs9wvvj7chmgrg3m4mk3172" }, "stable": { "version": [ 2, - 7, + 8, 1 ], - "commit": "5472766b2448308a7160dfd0fca1ec711e124a5c", - "sha256": "10qgx83fq8b522y9mpllrp0l5cgmr2bs5s7aix5img21hlbm34in" + "commit": "b796156167490e777131403f651e83779e954000", + "sha256": "118fc0bwqp4yn4b6sfir53y3b7acgmpd2n0d7dc2cdjcv72bv0bm" } }, { @@ -22628,14 +22677,14 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20201223, - 2217 + 20210110, + 1450 ], "deps": [ "parsebib" ], - "commit": "f4a36bd7629dd67ec5fdfdf4ea4d087d8e8c986d", - "sha256": "0qsl4qyscd29jkbnkp2acy3ww7lrmhfb60nbpcf03hq8mi3n51rp" + "commit": "a0c1cd12f2a635c89f4ecad1f3ec5701a78ebd00", + "sha256": "03np9b9xkd2h7c6il2a6vvlpcm80vnaf16ryark9cv9wraa5q4d1" }, "stable": { "version": [ @@ -23063,16 +23112,16 @@ 20181016, 1125 ], - "commit": "638c0d92ce7030e799c46aa712bbb3034c342e9c", - "sha256": "1qraxzw37jmzssyz2kcnnhh0l90d3fgw0rimx783ppn1h06844z4" + "commit": "1632acab5624637031326bd902e2ad7ccb6b4c90", + "sha256": "0m7gj224sqxjjw5sxky92fnrxg9jy4nf33kwf0aqxnfhqlgh545k" }, "stable": { "version": [ 1, - 15 + 16 ], - "commit": "4e959de2f78268b348d2eaac4e43c846792d345f", - "sha256": "0xxby3ghs38i1l7kag12rnzlzcg9297pm8k6kqq3aqzsg9d2950y" + "commit": "1632acab5624637031326bd902e2ad7ccb6b4c90", + "sha256": "0m7gj224sqxjjw5sxky92fnrxg9jy4nf33kwf0aqxnfhqlgh545k" } }, { @@ -23101,14 +23150,14 @@ "repo": "editorconfig/editorconfig-emacs", "unstable": { "version": [ - 20201122, - 1542 + 20210112, + 901 ], "deps": [ "cl-lib" ], - "commit": "d73333c224de783e42acd225a20330a667fe5191", - "sha256": "1w6ghpkhdy45aqfw01mzh90s437fx29iw3c9m4p7ish65rmxkqgk" + "commit": "9dd9789b77521eb9d128f9ebd4cfc7ef45072d0f", + "sha256": "1fi3mn16pw7iflhwsnhvdgzyghzgmv1kxdiw4ycnc7rb4q162an5" }, "stable": { "version": [ @@ -23438,8 +23487,8 @@ 20200107, 2333 ], - "commit": "fc939c84a0ca6e8de844edfdcc0aacdfde577c66", - "sha256": "1r10ivaifxp4200vpmayjrnqanz9sp4bykknj5n2rsx078fsbb90" + "commit": "a874f97af30b59daefaf08e1b4b6846b2214d1a5", + "sha256": "1vqllbkiwjcq3y68cbrvh7xq4r4xsm04qh628sbc95l09gwrsk2x" }, "stable": { "version": [ @@ -23459,8 +23508,8 @@ "repo": "joaotavora/eglot", "unstable": { "version": [ - 20201222, - 1735 + 20210113, + 1843 ], "deps": [ "eldoc", @@ -23469,8 +23518,8 @@ "project", "xref" ], - "commit": "4c85df2b04e467b8ed0eca68bd202fd0e7b671f4", - "sha256": "1ibdxkhqjyzf3dyn0y56xjnp0aialfcbzjnmnjnwzik0m0qgw53p" + "commit": "e5a9648beec6e83f5b4471261b07e1da6630da1d", + "sha256": "1ny2myy1yxz9xqd0cs3hciasyc6gfvr2gshgza3pry7w5z481yy3" }, "stable": { "version": [ @@ -23589,8 +23638,8 @@ "repo": "millejoh/emacs-ipython-notebook", "unstable": { "version": [ - 20201231, - 101 + 20210115, + 120 ], "deps": [ "anaphora", @@ -23601,8 +23650,8 @@ "websocket", "with-editor" ], - "commit": "5525b345901f72652bc49e1acb77380ea05ea696", - "sha256": "13hl52xx2x2d1srjgs87x3y0z4jyjjskyqybx64hcggz2flsrali" + "commit": "fbf1f71f52881dc23580053a6e188badb541388c", + "sha256": "1jnwl5yvw6bvj2hw0bnlzs4mz6xsv610ll1pk1rw3kricrnbmh1b" }, "stable": { "version": [ @@ -24077,8 +24126,8 @@ "repo": "rollacaster/elcontext", "unstable": { "version": [ - 20201129, - 1203 + 20210109, + 1238 ], "deps": [ "f", @@ -24087,8 +24136,8 @@ "osx-location", "uuidgen" ], - "commit": "077d36928993950c01bcdb92102a3d3c18d06bac", - "sha256": "1hj3m3y2an0axwkk75af2bd68sqcqf4j0l8dm6392xy4yipz5cj9" + "commit": "2efd3dd8c5176c4f071bb048be6cb069b05d6e9e", + "sha256": "1xi37jpx8wj2cq6n8la1p4wmqzrwga2ixp6rllbnbhq2fpm9fjsr" } }, { @@ -24344,11 +24393,11 @@ "repo": "justinbarclay/elegant-agenda-mode", "unstable": { "version": [ - 20201118, - 558 + 20210115, + 353 ], - "commit": "c72f42e0f551c3dd81e68262f07a96c0ec90a589", - "sha256": "0f8qk3vd41ffbkfqw5nks3bld0qpjrlnk9sb46wcbsyfnrs2v082" + "commit": "5cbc688584ba103ea3be7d7b30e5d94e52f59eb6", + "sha256": "13jv4dars81b42593zijpjm0qci0z7hizbjsjab3xfxi3m3r4pk4" } }, { @@ -24931,8 +24980,8 @@ "repo": "jcollard/elm-mode", "unstable": { "version": [ - 20200602, - 500 + 20210106, + 228 ], "deps": [ "dash", @@ -24940,8 +24989,8 @@ "reformatter", "s" ], - "commit": "363da4b47c9de1ff091a8caf95fccc34188d59a3", - "sha256": "0nmhf4vql0nkc4igd9mp9v77cb0rsxfawb160f9mcgkdd6ahn3xj" + "commit": "706ffb8779c7ace330d6e020bb046e331266586a", + "sha256": "1rc6qdkiv13ggjwwcgzmri16i2g5x7jwbjc7g8590rndwbg9w9lc" }, "stable": { "version": [ @@ -25230,20 +25279,20 @@ "repo": "redguardtoo/elpa-mirror", "unstable": { "version": [ - 20201119, - 1306 + 20210107, + 219 ], - "commit": "c9d4f69dd0fd7a1be143ef512262d219d7c10eb6", - "sha256": "01gnyan4l04pvvpncpxydramd77v5dxcv8vby4k3lv731qqvp0nv" + "commit": "49088c9bcdd66316a133252cf657187c4064488a", + "sha256": "15n1gbr6h6nm856drss8d1yrc6a3x191bsikhw64zkf7bdlqnxaw" }, "stable": { "version": [ 2, 1, - 2 + 3 ], - "commit": "cdd83ff9965d8df7aaf95e5d7751d2feabbd5493", - "sha256": "0i7ayq9v06l0raw8fw557k159rids9avabbj79yzf6p0daq93xvk" + "commit": "49088c9bcdd66316a133252cf657187c4064488a", + "sha256": "15n1gbr6h6nm856drss8d1yrc6a3x191bsikhw64zkf7bdlqnxaw" } }, { @@ -25536,8 +25585,8 @@ "dash", "elscreen" ], - "commit": "6ad77f972bde05e4e3d44f0d33b68ac41655e5f1", - "sha256": "0az5csc243p48g7mbx5yv16kg3171ykqy1zyw9wi3dwv07gqhyyb" + "commit": "5d7a740e47a56365413d75f4f0553de74f5ca198", + "sha256": "1ypk6jj99pb41mi2cwz7jkrzy15mpd3ir176x52riix6737wmgcm" }, "stable": { "version": [ @@ -25903,17 +25952,17 @@ }, { "ename": "embark", - "commit": "d5174ca91e266dbb9467c962e269ff411bbbfa90", - "sha256": "1dps8p4qrzw2az9ccsgjmz0fwqqgj08qcw1f99n5absb3xmyrnf7", + "commit": "a33cbf1d5cb58d2bb7dc535391bb1e1b0e718261", + "sha256": "1pwcgxgmf1pzq76gi4nhb3pq93v0bv48qnn0djdsxkk1snh3v5ni", "fetcher": "github", "repo": "oantolin/embark", "unstable": { "version": [ - 20201231, - 910 + 20210115, + 613 ], - "commit": "e9aa0d7a941c1fc31cfd9112f2446701201aceed", - "sha256": "0mac0cawis29lywhrvryaafks0fprc5bx6rwl05kx9ziia0640bk" + "commit": "14dcc650d9339a6458bb0babfed35de13e76fa50", + "sha256": "15shi1i8071833mjzrwyy5iw818sxcqym0cb0zvi9bk5nvprp58b" }, "stable": { "version": [ @@ -25925,6 +25974,25 @@ } }, { + "ename": "embark-consult", + "commit": "91a9088e0d00483874a6dff4526cdeb6d3f7dba5", + "sha256": "0br3hmr4r3jrkla45byyvxrpv0gxv5lwkk4chiqr1k8j3fbkhwqx", + "fetcher": "github", + "repo": "oantolin/embark", + "unstable": { + "version": [ + 20210113, + 1434 + ], + "deps": [ + "consult", + "embark" + ], + "commit": "14dcc650d9339a6458bb0babfed35de13e76fa50", + "sha256": "15shi1i8071833mjzrwyy5iw818sxcqym0cb0zvi9bk5nvprp58b" + } + }, + { "ename": "ember-mode", "commit": "9ac1eef4ad87b1b6b6d8e63d340ba03dc013425b", "sha256": "0fwd34cim29dg802ibsfd120px9sj54d4wzp3ggmjjzwkl9ky7dx", @@ -26076,15 +26144,15 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20201230, - 2142 + 20210113, + 2138 ], "deps": [ "cl-lib", "seq" ], - "commit": "a2738fe1a9013f641eeba31300e828e88b468b14", - "sha256": "0r2krmrhmwqcw3sdmy7z9rw4l222ja4jz8an8av11qjhpacr8v98" + "commit": "50bdbcc619e376ac2d7472b7097b3a5ba2d1f64e", + "sha256": "1mbfdvh0fs824zvlw3vcy5rdbqdrq4dcx8031yyiq9qpxziswicd" }, "stable": { "version": [ @@ -26407,15 +26475,15 @@ "repo": "iqbalansari/emacs-emojify", "unstable": { "version": [ - 20201130, - 1116 + 20210108, + 1111 ], "deps": [ "ht", "seq" ], - "commit": "4b96f37f315182f95d4ea9ff33a9b5af9f1b1620", - "sha256": "0xk8yv3icb7cik6qgc8c7v657zyyclbpgyra2djagwj5fnn3266n" + "commit": "cfa00865388809363df3f884b4dd554a5d44f835", + "sha256": "0dw0wkirphwk7iv61b9z5qbg850nnyrivi6d2a80al1nmxkla2sg" }, "stable": { "version": [ @@ -26471,8 +26539,8 @@ "repo": "Wilfred/emacs-refactor", "unstable": { "version": [ - 20200420, - 721 + 20210110, + 1928 ], "deps": [ "cl-lib", @@ -26485,8 +26553,8 @@ "projectile", "s" ], - "commit": "a8f6ab823453decf43f0764d02e554d05009a631", - "sha256": "0d1qd9jzmh0vg1in6q1xjlwq85sgds5lfvyg2wi6z8ci5a7m3ahs" + "commit": "d0540df81c1b5f9f75f69ff92331bbf4b16f2e2c", + "sha256": "1py0140pvi8vyy3digjsz3clp98md05mik8w2xnjb47mb4af39jb" }, "stable": { "version": [ @@ -26665,14 +26733,14 @@ "repo": "purcell/envrc", "unstable": { "version": [ - 20201114, - 240 + 20210106, + 2359 ], "deps": [ "seq" ], - "commit": "18caf5154f61d7f78cd4719d999e0fa6ef52345f", - "sha256": "09ww340nnnsqxkxr68rnd2h9lyi4sdngry30d57ps4g1p3phdfxd" + "commit": "d1b991f19a4c4781e73bbc3badd368727fae942c", + "sha256": "0ssf9i6iym2rb530k2w5aj392qa73i6p5y0vwrs5qhkv9lagqq7p" }, "stable": { "version": [ @@ -26780,14 +26848,14 @@ "repo": "emacscollective/epkg", "unstable": { "version": [ - 20201219, - 1947 + 20210105, + 1456 ], "deps": [ "closql" ], - "commit": "f721e3801cf92ea4265d645ac077365dc5c49d41", - "sha256": "167ghzv772i0x8ndldgsagpqkkr768dcm83ajagkppaw7rgkvg0r" + "commit": "94c8389a8b660a68ae7e5458583b06b30ba0edb9", + "sha256": "0r2lvcrs34ixk5xx81b20m0s8x795l7plmry394lgh28gwr437jj" }, "stable": { "version": [ @@ -27421,8 +27489,8 @@ 20200914, 644 ], - "commit": "c71681368fdedcc83a136b4dc7b01e08b8a938ba", - "sha256": "1i9xp35vrksmalrr0y0ybsrb9qxxwyzgxhxz297488czxw8cfvz0" + "commit": "c5400349d7d9cb1e54af19bdb2046b52ecada5bc", + "sha256": "02kma8f6v6vxzbfzd2limwabp8a5hzjyg9kfabgp1j0dwvsl64pf" }, "stable": { "version": [ @@ -27446,8 +27514,8 @@ 20201215, 830 ], - "commit": "e0e9d8bad472fa94f4919e6db798e45913dc9eec", - "sha256": "0pbj8hafvzg5ydrhf6q3knir5gv265x815amx4vrz0y740w1pzab" + "commit": "ed4bc369fe6724083bd0decac961fb7b3462d202", + "sha256": "1bsf9y6rxwndafvi1lh2vgawjd9k469rhbqb42p6wjc4872lbb0q" }, "stable": { "version": [ @@ -28143,14 +28211,14 @@ "repo": "aaronjensen/eslintd-fix", "unstable": { "version": [ - 20201127, - 1639 + 20210114, + 1448 ], "deps": [ "dash" ], - "commit": "f287e61208a5ae532f6722e369400a530b697ea0", - "sha256": "05b00iacp792i05p10iaaj6385gmdygglfizhziag4s588afpj46" + "commit": "5f9daecd4a02418515070b8084cb06e2251e2119", + "sha256": "0px94k7ms0wpxyyj0qfn82hz59822yn7i1851h0ld1rs8mh0rhwk" }, "stable": { "version": [ @@ -28287,17 +28355,17 @@ }, { "ename": "ess", - "commit": "678b5515b5194da6ca605c2070ce1f3ed730f008", - "sha256": "0nw56mjp17xw7ay2ka10rxa0sa764spsvzjrh5hscn7x02qychy9", + "commit": "30182a89f9f9396f4b3ab8ee0722d99f2fedb221", + "sha256": "0flvvnyrym5dl095sm9r0cj5lgqrb4whl4zrzg0l124kwk5v9h50", "fetcher": "github", "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20201230, - 1711 + 20210113, + 915 ], - "commit": "161db4922680b3d3e21acb858b4b1ef38a6b0b1d", - "sha256": "0q055pw86jqpfr8lkn0f7rlrdx928i1iq1xcycin16lc52fhsjw6" + "commit": "19de88d2b3b2436955ce0f7e6cf8544d4ffaf8ac", + "sha256": "048b0274cj6hkri6hzsmp7r8g9vkx2vxxjljx24vvzxyqfwmn445" }, "stable": { "version": [ @@ -28539,6 +28607,24 @@ } }, { + "ename": "eta", + "commit": "6566b2cf5be53047db6d076d47f29932ba589d09", + "sha256": "06xfkcnjq5w56vbxaq23lqhw2fl2gx2b0wj8ddvii3q3c432y4hq", + "fetcher": "github", + "repo": "zcaudate/eta", + "unstable": { + "version": [ + 20210103, + 645 + ], + "deps": [ + "ht" + ], + "commit": "850c3aff1d7999348aea30530e722e561b672f9c", + "sha256": "1ridnn2b1sp8rp3z9x3igavaq40d66chq25lhfimb6yw84544l0b" + } + }, + { "ename": "etable", "commit": "afee0fed80f4fa444116b12653c034d760f5f1fb", "sha256": "0m4h24mmhp680wfhb90im228mrcyxapzyi4kla8xdmss83gc0c32", @@ -28857,15 +28943,15 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20201107, - 1830 + 20210109, + 807 ], "deps": [ "cl-lib", "goto-chg" ], - "commit": "d6cf6680ec52733ea78dc530ed75fadc5171c758", - "sha256": "14rl6jx7cj336raxbksh3r2cplyifz8dghdhqvf7h1ng10sd9j6b" + "commit": "cc9d6886b418389752a0591b9fcb270e83234cf9", + "sha256": "14nin675kb2q7fchawj5f2r7bdga9cxp7jbhmaa8vac03zs6xb4x" }, "stable": { "version": [ @@ -29059,15 +29145,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20201227, - 1057 + 20210115, + 641 ], "deps": [ "annalist", "evil" ], - "commit": "16e14ea9c58aa1224c09d02e40ad3edde72c820a", - "sha256": "1k4lk23yzs0qz6fds5d6brabsh6k9dma4jr4adxhpm4i20b0sv8j" + "commit": "a67450ff537b9681a5fed25010ce28d4128e6db2", + "sha256": "0iyp72pp5db5pg7nrw81ij7r7gkzsl11d5hcvllcm7qwpj99az8q" }, "stable": { "version": [ @@ -29657,14 +29743,14 @@ "repo": "redguardtoo/evil-matchit", "unstable": { "version": [ - 20201216, - 114 + 20210110, + 1011 ], "deps": [ "evil" ], - "commit": "0fd65c463b991e81c6775147385badfafade52e7", - "sha256": "1l572lq6ys9v7yl51p7j3ryas2738imk2hdcbw6sf62q6yvcv1ih" + "commit": "9cdaddd55d28b50d1319baee8038972796e8b178", + "sha256": "15j6li3fnj4q6l54c6r31ng3hrcb703c06c3wk5w4spc4nsgzfvc" }, "stable": { "version": [ @@ -30414,8 +30500,8 @@ "deps": [ "evil" ], - "commit": "d6cf6680ec52733ea78dc530ed75fadc5171c758", - "sha256": "14rl6jx7cj336raxbksh3r2cplyifz8dghdhqvf7h1ng10sd9j6b" + "commit": "cc9d6886b418389752a0591b9fcb270e83234cf9", + "sha256": "14nin675kb2q7fchawj5f2r7bdga9cxp7jbhmaa8vac03zs6xb4x" }, "stable": { "version": [ @@ -31492,8 +31578,8 @@ 20200327, 1810 ], - "commit": "7a585de01b6fee081eaa167b09d7e12d02cf4149", - "sha256": "11v8rbaiaihpky1m7azbflz77mwg76nbg8hsgybs86wyjk5797dv" + "commit": "d7e517f8e626035df3b63ec6fc07b85d48a996c5", + "sha256": "1br74wkzvq51wqhimsf0c7pzvfpcb80hb47dqjahh938y7x0fkdc" }, "stable": { "version": [ @@ -31518,8 +31604,8 @@ "dash", "s" ], - "commit": "1814209e2ff43cf2e6d38c4cd476218915f550fb", - "sha256": "1l9lff15vbji9phpx4jrg8bmw2bkspzmhcgawchf5ylg2sb6yymm" + "commit": "c4dbf8c8e83df834f5d6f72cd5649b9d8a8812ec", + "sha256": "132zj5yvx4llzsh6rs0jwj0b5cfl140v0m6rk0kckw3vfgfh0cln" }, "stable": { "version": [ @@ -31685,19 +31771,19 @@ "repo": "WJCFerguson/emacs-faff-theme", "unstable": { "version": [ - 20201227, - 2240 + 20210108, + 1527 ], - "commit": "37f396ec57c28249af3fb10d84231afb44581df8", - "sha256": "1jlm81s8rximvbh95sk0xazp57skfgs6382gkw0yqw63ikc5x60c" + "commit": "e475a0805cd9f4bb0f7397e4d37b868f42d96c00", + "sha256": "1djgrjnqapxjpnjly3mk9xna27fgl53rj257slz2dm3svhyghk2n" }, "stable": { "version": [ 2, - 15 + 16 ], - "commit": "37f396ec57c28249af3fb10d84231afb44581df8", - "sha256": "1jlm81s8rximvbh95sk0xazp57skfgs6382gkw0yqw63ikc5x60c" + "commit": "e475a0805cd9f4bb0f7397e4d37b868f42d96c00", + "sha256": "1djgrjnqapxjpnjly3mk9xna27fgl53rj257slz2dm3svhyghk2n" } }, { @@ -31846,11 +31932,11 @@ "url": "https://framagit.org/steckerhalter/emacs-fasd.git", "unstable": { "version": [ - 20201226, - 923 + 20210104, + 738 ], - "commit": "c4c04873fd0c8e916186f38a75cd4ab7f8b7ad59", - "sha256": "1vh5aaljjal62jv3pdl64jkzwszv1hxk7f3lrm873lr84785pc41" + "commit": "c1d92553f33ebb018135c698db1a6d7f86731a26", + "sha256": "16if5pp2y5nxp37gl29l206dmika75fs2znfpks98iv9zwxpps2w" } }, { @@ -32459,26 +32545,20 @@ "repo": "technomancy/find-file-in-project", "unstable": { "version": [ - 20201217, - 527 - ], - "deps": [ - "ivy" + 20210112, + 532 ], - "commit": "f2f537476bb3579dcdf0587dfd2bac034cc5e719", - "sha256": "1zdc73w3649xrm902ah8vr2x8xbk17cacpspif3hrbabqpaihvh9" + "commit": "c4c7ec595c54c3006299717b1fd83e357864b2d5", + "sha256": "0mhp70h7n6h5s4dls5pslp45xxlrg6bbs7hkpbl3p1jhxx414fwr" }, "stable": { "version": [ - 5, - 7, - 13 - ], - "deps": [ - "ivy" + 6, + 0, + 0 ], - "commit": "c4dee37e0454cc169330c251a06e892e4a24f45a", - "sha256": "1yn4hjhaa74b67kfh7n24vic6yz3w0l5w7spchh2lbyr7s8mz90x" + "commit": "7cc9c05d05da5139e8361b72ca83ca30f44fae7d", + "sha256": "1iagywiihwv96y9p811xlx4cmbsj8h76niymprv1vm4fj6cmihr6" } }, { @@ -32791,11 +32871,11 @@ "repo": "marcowahl/fit-text-scale", "unstable": { "version": [ - 20200701, - 2239 + 20210112, + 2246 ], - "commit": "a87341d4fb2077076eb83af0fb510112900aaebe", - "sha256": "1ayswmb99mimsg6b05nnvm15yg8w2512sv1mjk1nbifz627vgq2x" + "commit": "3f93650a8e8899114ea48048b7962210f1024862", + "sha256": "1yjfvb2vn5pmrq5fw4sfx1lfkbnkwlc160izpvkrf9ww9xsas6al" }, "stable": { "version": [ @@ -34363,31 +34443,31 @@ }, { "ename": "flycheck-grammalecte", - "commit": "ddaffa55c1b99cce9097c019efe9a236e2f5a395", - "sha256": "1fblc6mvj9n676ci8597as3rnwh6hmbh2hfwr92gi1dd8ibnd2pn", + "commit": "2e7aee5074faedef4f2b989ffe05995b2f73bfbb", + "sha256": "031x2yh3wdklsm169h34sg0bzpl36nfms129zj4j0z99gw1kda3z", "fetcher": "git", - "url": "https://git.deparis.io/flycheck-grammalecte/", + "url": "https://git.umaneti.net/flycheck-grammalecte/", "unstable": { "version": [ - 20200515, - 1120 + 20210106, + 1422 ], "deps": [ "flycheck" ], - "commit": "8608df3144714d79b93afcfe13400693ed763ed8", - "sha256": "1ibcalim4mp9676szbvrf69nhfbc8vy47anmpqi9idjvdf6bpm75" + "commit": "69f1f276057dadc7aaa8d1669d68ab17986e5b37", + "sha256": "0ih0nakal36is0dci82gx4ijrvnpz9jpw1adprfara2cf8dx4rk6" }, "stable": { "version": [ 1, - 2 + 3 ], "deps": [ "flycheck" ], - "commit": "8608df3144714d79b93afcfe13400693ed763ed8", - "sha256": "1ibcalim4mp9676szbvrf69nhfbc8vy47anmpqi9idjvdf6bpm75" + "commit": "69f1f276057dadc7aaa8d1669d68ab17986e5b37", + "sha256": "0ih0nakal36is0dci82gx4ijrvnpz9jpw1adprfara2cf8dx4rk6" } }, { @@ -36804,11 +36884,11 @@ "repo": "jojojames/flymake-racket", "unstable": { "version": [ - 20180912, - 109 + 20210105, + 606 ], - "commit": "d20fa60d66db3f7c2df0133814564ee5b36d2aba", - "sha256": "0fdrlzvznpqfyzy6v7rz4cj83fhdcpyhy37l7jjbb91cqqk2hjc2" + "commit": "3d3e5f2a9ab696670f9e52baa4dde7b84b7542df", + "sha256": "0p935dr74m73w2qs65a2x6chw2zrjq903vdwpmvq3pn2dk4djdf0" } }, { @@ -37642,8 +37722,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20201229, - 939 + 20210112, + 1148 ], "deps": [ "closql", @@ -37655,8 +37735,8 @@ "markdown-mode", "transient" ], - "commit": "c4ae0f2bdd3ecd3dacb303bd7687ecb111af8c9b", - "sha256": "17fwrcaq61qi0067nfs266dbn193lkf47630mf6bdsi2h3d2fxr6" + "commit": "47be4eebfa34f87e502aad30f59907ad09552979", + "sha256": "0fbj6css456abzslr09vxr46xikxydjh78kmd0kqfidsp1rx6xsj" }, "stable": { "version": [ @@ -37711,14 +37791,14 @@ "repo": "lassik/emacs-format-all-the-code", "unstable": { "version": [ - 20201230, - 2354 + 20210107, + 1425 ], "deps": [ "language-id" ], - "commit": "f51cca79d89f27c65e43f4e4cae2fbec6098304b", - "sha256": "0ix0p3bwp2slcqp7v8lbjr9a2jp1xj3firvvssldiy0d2bfykya4" + "commit": "05bd6d0b4aa3d8b22291de5827da64b7be155590", + "sha256": "0fgc0kj9zb0f08i2mcm8ny9f8cqlk9v8185qmc6wmq1i7kaczsvr" }, "stable": { "version": [ @@ -37985,15 +38065,15 @@ "repo": "davidshepherd7/frames-only-mode", "unstable": { "version": [ - 20200728, - 740 + 20210107, + 918 ], "deps": [ "dash", "s" ], - "commit": "187753b095a94f423763fe893408e1318fb7b2dc", - "sha256": "0b4aqilpxby3ac7rmcb4r6yhhlyjkrh47zhrshk8f3ndlyxbz9ch" + "commit": "d3f6647c484656ddabdac5d18546599a03823cd4", + "sha256": "02wai424sxxmaz7ilfm4ap4jl5rpx5dajg534x6vxm5alfjhlpag" }, "stable": { "version": [ @@ -38380,16 +38460,15 @@ "repo": "fsharp/emacs-fsharp-mode", "unstable": { "version": [ - 20201208, - 1852 + 20210106, + 1632 ], "deps": [ - "dash", "eglot", "s" ], - "commit": "848ab1578658b97844e671e4f6dbdbd0f67a52ca", - "sha256": "08nyxyxag86nv6cbj9kmyh28kb52h6wf2l1w5qlq9pb00d5ck7h0" + "commit": "e3dccd65a16a1675722b1eed7aca1a729a2fc8ed", + "sha256": "1wyc3lzvjl01cy18cyzq1xms4kid9iqkm31fxrv87awmzpxsvqi5" }, "stable": { "version": [ @@ -38455,8 +38534,8 @@ "deps": [ "cl-lib" ], - "commit": "aa4babe4f25d218fb4f50ac7b804cbde83e5fb4c", - "sha256": "183kbv6i23zh8dqha4l9crzgx0p5g5vc71d2kkfcpnxh83l3dhmm" + "commit": "527567aa9f668e9fa63df7d258b82004473dd7e4", + "sha256": "1w1k193hc2ihi2wh9gbsp9wcwl2gxqia21868ad7v3xadyik0a6i" }, "stable": { "version": [ @@ -38790,11 +38869,11 @@ "repo": "bling/fzf.el", "unstable": { "version": [ - 20201201, - 1842 + 20210101, + 1358 ], - "commit": "5d776acca230d781ba7647185b730c686622f876", - "sha256": "0rikrpvgnj1zlcr1fgcmi5xqmhr5xsdpphnqp947jr47q70v0qxx" + "commit": "c84beb96b959c0a20d70dad3bb9e3bc275a5b001", + "sha256": "1qb49qw0lyb2v3yn4jzq8fyq45akrl4078kg2q38g3gh9n29wf52" }, "stable": { "version": [ @@ -38954,11 +39033,11 @@ "repo": "godotengine/emacs-gdscript-mode", "unstable": { "version": [ - 20201026, - 1319 + 20210104, + 1919 ], - "commit": "20fc7e438170b8a2e03378956c1a501fbc49aee4", - "sha256": "16k4vdmip6fmz51070w2vz9dqbh1vlsiwq0a7wikmgzz7yv8micd" + "commit": "b53d56e467a77dfd6c26eec5b78e2241083b1408", + "sha256": "120yjlwf8pyrv5n0bdzxnr2lbppwgir4l8c128jq0cx3mbfamjlz" }, "stable": { "version": [ @@ -39055,11 +39134,11 @@ "repo": "jaor/geiser", "unstable": { "version": [ - 20201202, - 1922 + 20210103, + 953 ], - "commit": "cd00be69b26e6fd748b183d127d8b6f4c91ba622", - "sha256": "0zxaayww9h3alc1h5zlpan28wgva561b4rlb8xk6s6gznpkc3gsp" + "commit": "c7a427edf33ab1ebdca7d3df67d740f97037a950", + "sha256": "0lvgmfwlmyxgbyqlw8c79q79ramws88s746nckz0qyy5fckx0ri3" }, "stable": { "version": [ @@ -39916,16 +39995,16 @@ "repo": "magit/magit", "unstable": { "version": [ - 20201222, - 1527 + 20210102, + 1242 ], "deps": [ "dash", "transient", "with-editor" ], - "commit": "c5e11811197ef8c667a605e5d9dd8ec77247bd13", - "sha256": "0i4la1sncgn2hgpgd26x0igc90q4c4jkgkng8la96hjaw09qsv23" + "commit": "25f432551347468ce97b8b03987e59092e91f8f0", + "sha256": "0vxsh75xynpfkfvmyyz8x3rppbwr9rgk7zjfil2af2kzba3p27vl" }, "stable": { "version": [ @@ -39949,8 +40028,8 @@ "repo": "emacs-stuff/git-commit-insert-issue", "unstable": { "version": [ - 20201230, - 1721 + 20210107, + 2018 ], "deps": [ "bitbucket", @@ -39958,8 +40037,8 @@ "projectile", "s" ], - "commit": "8a403005ea7f7611bb1bfd829eeefe5a4f10bb40", - "sha256": "0w5xl9r7sbhlwxzg391x50pnsjmjjakn761v3qg0lj6xhv23sdl5" + "commit": "6cfb8b4b5b23ae881cf3d005da4d7f60d91cd2cd", + "sha256": "02hag6jd55mqf0n90p0hvihmqjvd0cdlpm5knsxk3cll7fp0kkkr" }, "stable": { "version": [ @@ -40018,11 +40097,11 @@ "repo": "emacsorphanage/git-gutter", "unstable": { "version": [ - 20201203, - 500 + 20210109, + 640 ], - "commit": "56308dc1a1196583791cb24aa86b2669d343b9f3", - "sha256": "1yad6pyskc28hcva9v9v7d6lxp2dg3j0zvmp9pv2qs1105l590ic" + "commit": "5c2ae01562b3ff2def870ed822fd0869326977d6", + "sha256": "0bf12nfyhpvdbxajbwna2z19ii42ih8h4p8jrvgqvh0r3lhavdiw" }, "stable": { "version": [ @@ -40511,15 +40590,15 @@ "repo": "dgtized/github-clone.el", "unstable": { "version": [ - 20160623, - 310 + 20210108, + 1920 ], "deps": [ "gh", "magit" ], - "commit": "467b40ca60a6c26257466ebc43c74414df7f19cc", - "sha256": "1gdx9sl509vn4bagqg8vi1wvj1h3ryfvd5ggs2mv9rry6x9dg823" + "commit": "9e40d6d3c6128407d7456bf71c95ad1fbb473b2a", + "sha256": "12mk8cl1mpfapdgxwcm6rlyfg9yyk2wk8hv2486hqb6qb77kdg9i" }, "stable": { "version": [ @@ -40576,11 +40655,11 @@ "repo": "TxGVNN/github-explorer", "unstable": { "version": [ - 20200803, - 1445 + 20210113, + 1307 ], - "commit": "e6bdc500dd9b580ed12a54d18600f5db541b38b8", - "sha256": "1a9hnmx1q7fxyyxn0ji2mcam6wz8rwxi7a71f5542l65ah20gg1r" + "commit": "b083d0615dd88d9ec4f116015c98b5e3326f77a5", + "sha256": "09slgwmv59vwz34b5mcz46360a979h6k3pnqr3pmbakn7ysbdmqs" }, "stable": { "version": [ @@ -41348,20 +41427,20 @@ "repo": "emacsorphanage/gnuplot", "unstable": { "version": [ - 20201223, - 2347 + 20210104, + 1052 ], - "commit": "df47e871f7fc2f2c53bfed96e5a315281806396d", - "sha256": "1lkkx5ir095ffbdwkvj036x7z0ypxhxd60y3r2y7jq6986mzllka" + "commit": "116cad8e09024223f97e81b0a4503cef20de9bf5", + "sha256": "09y177sq24gs7wwjihw59g0m4n1rv2ws9890ynxjxawv823r0fxm" }, "stable": { "version": [ 0, - 7, + 8, 0 ], - "commit": "aefd4f671485fbcea42511ce79a7a60e5e0110a3", - "sha256": "0bwri3cvm2vr27kyqkrddm28fs08axnd4nm9amfgp54xp20bn4yn" + "commit": "116cad8e09024223f97e81b0a4503cef20de9bf5", + "sha256": "09y177sq24gs7wwjihw59g0m4n1rv2ws9890ynxjxawv823r0fxm" } }, { @@ -41431,8 +41510,8 @@ "repo": "deusmax/gnus-notes", "unstable": { "version": [ - 20201225, - 1617 + 20210103, + 2050 ], "deps": [ "async", @@ -41443,14 +41522,14 @@ "org", "s" ], - "commit": "08687b98403cc165d7d62ceea9d50480f12e7bfb", - "sha256": "07fl52djky3v3gigjdzsi79rlq9ddpiarrmzsbdp0wadp524d4n7" + "commit": "8cacba653f8912355d45847c5e5376eb83e6898f", + "sha256": "11d98vasn74p7ifyw8qnyzm4na8l0pnbh7a04cr2znnwqjbnzd7s" }, "stable": { "version": [ 0, 4, - 0 + 1 ], "deps": [ "async", @@ -41461,8 +41540,8 @@ "org", "s" ], - "commit": "f34e5fc1077e2558e5059876d0a22b35331f7b93", - "sha256": "0nc1chp5h495v3bpbmi00f2wahr9c9p4y7gn6rdr1xx0gnl6v2gk" + "commit": "8cacba653f8912355d45847c5e5376eb83e6898f", + "sha256": "11d98vasn74p7ifyw8qnyzm4na8l0pnbh7a04cr2znnwqjbnzd7s" } }, { @@ -41473,20 +41552,20 @@ "repo": "unhammer/gnus-recent", "unstable": { "version": [ - 20200513, - 1038 + 20210107, + 1346 ], - "commit": "a7b131c5acd10df2949ef4f799af08ded013bc35", - "sha256": "0cx0764ksxmjnryjwya3h49r1c5npyipxv16amad1lyysm4a8q0a" + "commit": "6f13a00c5736c269ed850094cfbc9ea474e24dfe", + "sha256": "1x91da1vb48hn2qqdn144gj9n2sas252llcf5jlqqkl8w5wk6z3i" }, "stable": { "version": [ 0, - 3, + 4, 0 ], - "commit": "a7b131c5acd10df2949ef4f799af08ded013bc35", - "sha256": "0cx0764ksxmjnryjwya3h49r1c5npyipxv16amad1lyysm4a8q0a" + "commit": "6f13a00c5736c269ed850094cfbc9ea474e24dfe", + "sha256": "1x91da1vb48hn2qqdn144gj9n2sas252llcf5jlqqkl8w5wk6z3i" } }, { @@ -42264,20 +42343,20 @@ "repo": "emacsorphanage/god-mode", "unstable": { "version": [ - 20201216, - 2023 + 20210102, + 515 ], - "commit": "f6eb3428e6a17a97e6e9f0783ce17ced004b98c3", - "sha256": "0qjsyp488qqjn6vwzxy23aywhv8ckx797l2zah70d23zrf79qmxc" + "commit": "02a402b2323e025f77e89cf56d5e678e31a2d2f6", + "sha256": "07xxj1wqxjvzlqp41xj9jz1jfbb8h4578xmbfaqi4isljbadj04k" }, "stable": { "version": [ 2, 17, - 2 + 3 ], - "commit": "2e519312fdef36dea523aa530d134a703d3032a6", - "sha256": "1gnwl81immxdq72hsxgic2631r4jsq9pv5jqh0jzji0q320m9xcl" + "commit": "a72feb2fe8b1a8993c472995d83d9c4718f7a7c1", + "sha256": "1wsc04l5j5a9y5439qx85pcchxjnjgcgwbffw3l30q9zlblvc58b" } }, { @@ -42312,11 +42391,11 @@ "repo": "minad/goggles", "unstable": { "version": [ - 20201221, - 1418 + 20210113, + 1945 ], - "commit": "d6e584a2c9487d3df4aee818c43485e437cb87ef", - "sha256": "1mi5cnii7zbhzq6pyfaxsfixhilqmmx6v5milmkzwx6mwxxgjv87" + "commit": "8b7d223eca9b26acb0e3eca4b58d39a3b933bf08", + "sha256": "1s0smkprlnmml4a2rqhzb81mz7dlxswnvqsn3wra4brbrs3almhi" } }, { @@ -42442,6 +42521,30 @@ } }, { + "ename": "good-scroll", + "commit": "f51029dd5dbfdcd70befae42e1706a309f642996", + "sha256": "1d0f5v0566n8k3vmh6ddbif6cmii8dk6nszkqjx5za09jilndnc9", + "fetcher": "github", + "repo": "io12/good-scroll.el", + "unstable": { + "version": [ + 20210105, + 903 + ], + "commit": "beac144c37227d23e5ceefb8ce1f45aa484ca5c9", + "sha256": "1yv07vpgqla7nk0imn7dlzsv392jvhk3w63frvhcmijq5ciafc45" + }, + "stable": { + "version": [ + 0, + 3, + 0 + ], + "commit": "a4e80bbf83872fa6c8ace5197693d2f81c4ff1cd", + "sha256": "0bh3wbaiavz033isgl0m7crjhfsb0gxsgsnh54aph7pdrffci0r6" + } + }, + { "ename": "google", "commit": "45237d37da807559498bb958184e05109f880070", "sha256": "11a521cq5bj7afl7bqiilg0c81dy00lnhak7h3d9c9kwg7kfljiq", @@ -42548,8 +42651,8 @@ 20200809, 1430 ], - "commit": "0270073331de9358f29d049a27aa9145697d6dc7", - "sha256": "12nhl3h0f1kmv7ak9lh0p96k0f2284k20ilwn3ail7p2kpp8affk" + "commit": "6f7b75b2aa1ff4e50b6f1579cafddafae5705dbd", + "sha256": "1mcmv1p879nbbhwcimya5licq1mq0wkw5dgil7kqwicz5zzb8p2g" }, "stable": { "version": [ @@ -42794,11 +42897,11 @@ "repo": "jcs-elpa/goto-line-preview", "unstable": { "version": [ - 20200927, - 252 + 20210113, + 616 ], - "commit": "66817b66ce124b2961df3521faa3adc87943d0d9", - "sha256": "0w9cqp5xcqnncwpb90xvirvm05bknsaxhd51y2wkhqr7j5xi489i" + "commit": "605a182c389b60b11dad0738babc66d227a4ed23", + "sha256": "1p5bpb5870mkfqgx8dqapx6mvfc6h2g8hzngljd71i3b5idlxx0s" }, "stable": { "version": [ @@ -42827,8 +42930,8 @@ "magit-popup", "s" ], - "commit": "1ec59a7c0002598c594fb58e03907d7ff0ca84b4", - "sha256": "0bz01ybpj1lk7g34n6wwy53aaa4jvs3xhsv50y34z5wvxa8ypdsj" + "commit": "c43a1c86c89e6e30e54d4a21b2d95c03c6ed0c4d", + "sha256": "0d43gkppk06w58xsawbnil83170k6h387jr5a4v48zy2amdq7rp2" }, "stable": { "version": [ @@ -43575,20 +43678,20 @@ "repo": "ROCKTAKEY/grugru", "unstable": { "version": [ - 20201225, - 638 + 20210115, + 646 ], - "commit": "5f1cffb6d5970988c49b89f29bfaf308f7dd8834", - "sha256": "09hn4ilvhh10sc1dypj1gpcyz07nli5lpbiazsx2gw61y2fgrc40" + "commit": "7a3437feb777996dcb8f484b79e898cfdb714bfe", + "sha256": "0jfz54phg3db8cgp9sj1grvj3sf10jaq359024j72l71s5cqwmlx" }, "stable": { "version": [ 1, - 15, + 17, 0 ], - "commit": "e4ccfd416de6a5f70e3f1c718f773b9fa2e8e17a", - "sha256": "1gx1j5l0g7n706ri8rg20v6kkl393gbhh9wx8szzmcw0xjrawdzj" + "commit": "6820ae3aa9203f5e23e0cd80f51b410aaf1d32f3", + "sha256": "0sf3lkdvqb55bin8bx5jd06ncqiy9lkx7mx5i8q27r8wmi58q7v6" } }, { @@ -43631,14 +43734,14 @@ "repo": "greduan/emacs-theme-gruvbox", "unstable": { "version": [ - 20201224, - 554 + 20210105, + 1136 ], "deps": [ "autothemer" ], - "commit": "46de195e194ebbd21a925c33db9d498c30c342af", - "sha256": "0xyysxn31xsbckxixi6cmz3yrws86cqycd5f9p06p2ahqh8xahxs" + "commit": "0013c68458ae62fe1dc4bbbb23f6a54a9d41e398", + "sha256": "197r166c4pj0kc2v65rip93pcmmnm4li2jvagvajblang1svr2v0" }, "stable": { "version": [ @@ -44592,8 +44695,8 @@ 20181110, 1859 ], - "commit": "c12337a13ec3a1f04400d0ea51e6120ebe79efb9", - "sha256": "0nk7wm8ns721smbyr7wqxp3s4wbpwg594rcy79ai3fkfy1lb6k4y" + "commit": "f33ba22a6e5060fb14c9fd3dda728d6724f2f9dd", + "sha256": "1lmr8j2g7v3jn2q9h65c7qhzzk4asz0mlqarnl2h0g7xjk0wmi6z" } }, { @@ -44703,11 +44806,11 @@ "repo": "emacsorphanage/haxe-mode", "unstable": { "version": [ - 20201018, - 1357 + 20210108, + 1835 ], - "commit": "5e8183a275babdc7604ae01fc94853e60cb04a32", - "sha256": "0141xzgvv1xzlsaxls4qy9dzl57g1qy5r02x4qydq1p417r30pqc" + "commit": "fb3f3c9514e652f8955a67baeae13de264996860", + "sha256": "05kaxcazbr51chcmlx0fscwk32blj3lzndkr0qpbwfrn8n6mcmrg" }, "stable": { "version": [ @@ -44846,16 +44949,16 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20201228, - 517 + 20210114, + 1521 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "830f03683d99a1e771277cac6f2a1110b8936334", - "sha256": "14bwzr1icv7px3din86z20vmcig0dm8dhhld6795cgbj9q99gmjf" + "commit": "d0073fd556e5e2296b4fea824929dfab9b1895b8", + "sha256": "0wz12f190vsp71bcwygvagksqfihm85rj80bc4a3sx96wyrdjbqm" }, "stable": { "version": [ @@ -45168,8 +45271,8 @@ "cl-lib", "helm" ], - "commit": "1bb81d77e08296a50de7ebfe5cf5b0c715b7f3d6", - "sha256": "1n5539hivg65gkr041mq8h96bn489fhvbxrh1manxacf6xi6b2am" + "commit": "94807a3d3419f90b505eddc3272e244475eeb4f2", + "sha256": "08wfvqdzs05bmfjjaqfxffjbl4j7632bnpncs9khrh6lifz03xh2" }, "stable": { "version": [ @@ -45774,14 +45877,14 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20201225, - 1456 + 20210105, + 504 ], "deps": [ "async" ], - "commit": "830f03683d99a1e771277cac6f2a1110b8936334", - "sha256": "14bwzr1icv7px3din86z20vmcig0dm8dhhld6795cgbj9q99gmjf" + "commit": "d0073fd556e5e2296b4fea824929dfab9b1895b8", + "sha256": "0wz12f190vsp71bcwygvagksqfihm85rj80bc4a3sx96wyrdjbqm" }, "stable": { "version": [ @@ -47646,14 +47749,14 @@ "repo": "istib/helm-mode-manager", "unstable": { "version": [ - 20151124, - 938 + 20210108, + 2330 ], "deps": [ "helm" ], - "commit": "5d9c3ca4f8205d07ff4e03c4c3e88f596751c1fc", - "sha256": "1lbxb4vnnv6s46m90qihkj99qdbdylwncwaijjfd7i2kap2ayawh" + "commit": "7df8ed3ddd46a0402838b748d317c01454346164", + "sha256": "0j1mlqdqii6vpp748ydvcs0fxlwkrwf5bsbys8h34rjhb7x75dq4" }, "stable": { "version": [ @@ -47709,14 +47812,14 @@ "repo": "emacs-helm/helm-mu", "unstable": { "version": [ - 20200823, - 1534 + 20210104, + 1214 ], "deps": [ "helm" ], - "commit": "c02bba3c6e52e623951781c98a1cf2ce923439e6", - "sha256": "0i9k03x6gnwfsf3r7m3yhmgf3y9hnc895mv5x4zdv1jazr4gc8gf" + "commit": "392a8c11ab27b625d9f863cdde14e09893401b15", + "sha256": "1l7l75g6sg8fhsd98pfc5qw6w05qq08ilvy6bpaxfz50g81saypg" } }, { @@ -47871,8 +47974,8 @@ "repo": "akirak/org-multi-wiki", "unstable": { "version": [ - 20201203, - 847 + 20210111, + 1022 ], "deps": [ "dash", @@ -47881,8 +47984,8 @@ "org-multi-wiki", "org-ql" ], - "commit": "8e38e1f3c06593b729f6401b6413856efd0264f4", - "sha256": "1jrlngyvbgy6ra59krgdn9gbfpg0aznaaridd95xkr6z78ad1ql7" + "commit": "c9005cbe4077cce3743b680dec97c11fa179bb36", + "sha256": "1428lky09cvlqdb8b9zf0x49cxmigrkhvhi391b2mj2qzgmjzcvm" }, "stable": { "version": [ @@ -48788,14 +48891,14 @@ }, { "ename": "helm-searcher", - "commit": "aafea99e6091ada48708db7a42ffe13effa17a41", - "sha256": "063453h22811inn55z09kfz5a42lzjw3mv41ghwypnqgy0lnjs0r", + "commit": "9ff049623a64ceba2299f43babaede205ccdd67a", + "sha256": "06nhvkf1k7mrbdxliikn5q8kp6nw77zn2f1xifpzp2c6mwxm4idg", "fetcher": "github", - "repo": "jcs-elpa/helm-searcher", + "repo": "emacs-helm/helm-searcher", "unstable": { "version": [ - 20201001, - 838 + 20210108, + 1818 ], "deps": [ "f", @@ -48803,8 +48906,8 @@ "s", "searcher" ], - "commit": "7b3016faeca201843d849c00d11665a90c1709fb", - "sha256": "07whjqsi7jq4i3fypzasq2iivsj025x3701wfgsj2f02xyvgfk4p" + "commit": "d27c7cafc79b6e5e11881014eee9817e3897762f", + "sha256": "117m2c8ms66gqwsxgdwywx166bif2i2y5dgq1w0yw5j4h02q3ji7" }, "stable": { "version": [ @@ -48930,16 +49033,16 @@ "repo": "emacs-helm/helm-sly", "unstable": { "version": [ - 20201120, - 1108 + 20210114, + 1928 ], "deps": [ "cl-lib", "helm", "sly" ], - "commit": "ccf8e83644bc1b2113eab46693e64d3f0c56198f", - "sha256": "13s2dj09mcdwlibjlahyyq2dxjkjlpxs88dbdyvcd64249jmahsx" + "commit": "7fbd6544511d8669c8122b6a9128fd09e835c3fe", + "sha256": "061qihf8fwka7jpcvn1z76rcjbipfri41xfkn17i7pg4nzmqhaaw" }, "stable": { "version": [ @@ -49082,15 +49185,14 @@ "repo": "jamesnvc/helm-switch-shell", "unstable": { "version": [ - 20200831, - 1329 + 20210106, + 1810 ], "deps": [ - "dash", "helm" ], - "commit": "e9927561cfc62c8427e9d10526518d643f4bc26d", - "sha256": "1l4irigdirvbn1xh0py135q5463z8axdh0y0icvzinn7z1z0141j" + "commit": "9de26ca41e94c095c978ed920009de0280f5c4ec", + "sha256": "190bmn04g4nlcrpnsm465vyp0zcd2ryh13bc14f7w1vrmnw6ll1j" } }, { @@ -49193,15 +49295,15 @@ "repo": "Lompik/helm-systemd", "unstable": { "version": [ - 20180131, - 434 + 20210105, + 542 ], "deps": [ "helm", "with-editor" ], - "commit": "96f5cd3ee3412539c2f8d145201f47c4f8e53b4f", - "sha256": "0wyabh76q2lighd7qxpkzp35fkblxlz8g7p4lpgfwvjid0ixmnvq" + "commit": "8b26ab2d3a5b08c1e03c9312818512d7492bbc9a", + "sha256": "11v6pwkhdssg2f6azs3nw1y3s5ysmkxxv1jvgm7yy8gwg04zvcym" } }, { @@ -50133,23 +50235,26 @@ "repo": "tsdh/highlight-parentheses.el", "unstable": { "version": [ - 20200920, - 832 + 20210104, + 1625 ], "deps": [ "cl-lib" ], - "commit": "e18f2c2b240d7586ff7ffdc2881079e2dd8944ca", - "sha256": "1agdsqn3g18s9nicp23mlwvshxqskkbfzs9lgjmzxsa5628rxixc" + "commit": "013ac29970d5209c14da0af6c5bb9bbbcca40c02", + "sha256": "01p8j248vcmbcdskr3146ag979c0m74gddy3yzp3x8hz9a4mgqx0" }, "stable": { "version": [ - 1, - 1, + 2, + 0, 0 ], - "commit": "5aa800a68e3795716de1e7f2722e836781190f31", - "sha256": "08ld4wjrkd77cghmrf1n2hn2yzid7bdqwz6b1rzzqaiwxl138iy9" + "deps": [ + "cl-lib" + ], + "commit": "e18f2c2b240d7586ff7ffdc2881079e2dd8944ca", + "sha256": "1agdsqn3g18s9nicp23mlwvshxqskkbfzs9lgjmzxsa5628rxixc" } }, { @@ -50572,11 +50677,11 @@ "repo": "tarsius/hl-todo", "unstable": { "version": [ - 20200813, - 1419 + 20210105, + 744 ], - "commit": "0598b98f63b623c1778cbd2e2f60b774b7a311b9", - "sha256": "1y57q3s6hrjd134mkwzcz5ii2jichvccpvc6bcj1vfl4d7yrxsal" + "commit": "9661a462d86b22293caaa4c3d94f971a15dbf1d5", + "sha256": "0w0l990wqdv9fdxf8a02fx0aj6ffp83jp3zh81jf3j5i0l75xfkr" }, "stable": { "version": [ @@ -51015,14 +51120,14 @@ "repo": "Wilfred/ht.el", "unstable": { "version": [ - 20201119, - 518 + 20210113, + 822 ], "deps": [ "dash" ], - "commit": "2850301d19176b8d3bb6cc8d95af6ab7e529bd56", - "sha256": "1qajlsqsvrngzbb1qss7xadrajgdk4pc6nvvyw6443p6947yx7rk" + "commit": "5876209c9712bd1acbbf1d31f6e3293e5ab88971", + "sha256": "03cn43vd2zq67hzb1hy82b7lshzslxzndjj1z1liv1kspww2hkch" }, "stable": { "version": [ @@ -51319,11 +51424,11 @@ "repo": "humanoid-colors/emacs-humanoid-themes", "unstable": { "version": [ - 20201211, - 1320 + 20210106, + 2120 ], - "commit": "5a2638b95f93ededa625187dee76946a60e7b9d4", - "sha256": "063vrr73zsvvfcsda5z8b7hpkhql2smbi40dp10nqsyih26f6ahh" + "commit": "c1f9989bcecd1d93a2d7469d6b5c812bd35fe0f3", + "sha256": "180hj0ww30kjr4nrnlp5r59xr6qpi7xhw19cp91syqhclzylkpqr" } }, { @@ -51437,11 +51542,11 @@ "repo": "Riyyi/emacs-hybrid-reverse", "unstable": { "version": [ - 20201213, - 1504 + 20210107, + 1435 ], - "commit": "4c7a3813bc3fb8753de9edbc1d6296428d3a2601", - "sha256": "13lx5ghi939xx47d3plpznhrs4qlzsgicp8rcvm47li04j56db9h" + "commit": "30072ccf0a49bb47360dce12965db1b1e2f2b57d", + "sha256": "16p7k3lwlykpgrc2pkbdx7z209bzps9ksizjhgbcfbkn67xpavka" } }, { @@ -51873,11 +51978,11 @@ "repo": "oantolin/icomplete-vertical", "unstable": { "version": [ - 20201213, - 2230 + 20210105, + 500 ], - "commit": "a4c65f213bd3d8be94fe8cb28ecf7ff3b44405d1", - "sha256": "02v190pb802vck7di39jyf5prvmfsgcxln8mgwsls2b4clx9da97" + "commit": "288166784de29db2f5f61722cc11151deca3f34a", + "sha256": "0if14qqixkkg8nfikfzhqqnsclhkbx4n8885gm9w0zlibkcj65pk" }, "stable": { "version": [ @@ -51896,27 +52001,27 @@ "repo": "plandes/icsql", "unstable": { "version": [ - 20201219, - 224 + 20210115, + 137 ], "deps": [ "buffer-manage", "choice-program" ], - "commit": "dbe4957b08b70e157a05a7d8db84a51aeb9400ca", - "sha256": "0rkby252cyj2dxs89qgifysk615wwr0cm4zdnmamyyqcwpc4c223" + "commit": "41ca05a6d234c55c2963599648a9e3c433ad5902", + "sha256": "0skazm21xjp8w80g4iqpi1dj48xnhka03l46v6zz48v5686iqv5d" }, "stable": { "version": [ 0, - 2 + 3 ], "deps": [ "buffer-manage", "choice-program" ], - "commit": "f4d40c48f770df68540934a3dfabd07d0edc081c", - "sha256": "1j70rljhmzh6ixxbf4cj8qkjkkl4l2mlj45dqls3b5h6kzxwg5cy" + "commit": "41ca05a6d234c55c2963599648a9e3c433ad5902", + "sha256": "0skazm21xjp8w80g4iqpi1dj48xnhka03l46v6zz48v5686iqv5d" } }, { @@ -52106,16 +52211,16 @@ "repo": "DarwinAwardWinner/ido-completing-read-plus", "unstable": { "version": [ - 20200520, - 1535 + 20210103, + 1621 ], "deps": [ "cl-lib", "memoize", "seq" ], - "commit": "b9ca2566b867464c25b720e2148d240961c110e7", - "sha256": "1vkk311wghhnkmybv3h5a6hf3vxlgy03iqzwl6xyxdw3hgip8in5" + "commit": "f91e5a1d696c13db029fd62806fe9bcb9702be26", + "sha256": "0yhl6wa3fkvkfx87vhjl8dhn3igzrilby2vxhllgysb5kbd9adzc" }, "stable": { "version": [ @@ -52480,11 +52585,11 @@ "repo": "victorhge/iedit", "unstable": { "version": [ - 20201125, - 342 + 20210114, + 1621 ], - "commit": "313997a2504e565a34e84fdb59a5a7ffd223328b", - "sha256": "08gaz5ia70hg66a4i4gdyhnaggpf7m39gqilbx88dy9ccg4lywa0" + "commit": "dc3b419f1b945bd806bf40b7a478e7a2144c2077", + "sha256": "1xqq0hl8wcxa64pfn11pxcb7gcfgczaw166h0qksczwib2v4racc" }, "stable": { "version": [ @@ -52543,11 +52648,11 @@ "repo": "rolandwalker/ignoramus", "unstable": { "version": [ - 20160414, - 1409 + 20210108, + 2026 ], - "commit": "b37dc7c07edd9d152436f9019c14df158b599be3", - "sha256": "1b4r4h8yrs8zkyr1hnnx2wjrmm39wbqxfhyxpjb5pxi4zk3fh4rj" + "commit": "6a6578816ff7af8851f7db36b3465fa9d2c759c5", + "sha256": "04cl5y3ba8bip7fkz8dsxx5m7dc97qx6214fgxj16i0kyxpwfnbl" }, "stable": { "version": [ @@ -52880,20 +52985,20 @@ "repo": "petergardfjall/emacs-immaterial-theme", "unstable": { "version": [ - 20201202, - 1801 + 20210109, + 1653 ], - "commit": "d965b9b29e1ade16aa92b934ac888616409a95c5", - "sha256": "1s72wj88rannk0byz3689yff3wks4k80xcxkcmh1c4gja6zbj99r" + "commit": "288b367ea0efccd5e98efbdf925591ffc989a654", + "sha256": "1y62yfg67lnbc89l6k4gw5fibahnlpn23g415a6zdk2vz89n6y0k" }, "stable": { "version": [ 0, - 6, - 2 + 7, + 0 ], - "commit": "fe8875f116cead5bff6befb6c77a6ebb6f20a490", - "sha256": "0gpy8pvaw66pvas1j1f74aa6fyxm1z43kqlan297l4jviw4rh4gs" + "commit": "288b367ea0efccd5e98efbdf925591ffc989a654", + "sha256": "1y62yfg67lnbc89l6k4gw5fibahnlpn23g415a6zdk2vz89n6y0k" } }, { @@ -53095,11 +53200,11 @@ "repo": "zk-phi/indent-guide", "unstable": { "version": [ - 20191106, - 240 + 20210115, + 400 ], - "commit": "7fc710748f9e5a086acfe77970f117df89ee9749", - "sha256": "055cpcj57k14v2vdpc1an6dww5ncvfpxghpgw1spv53wzgv8vzkq" + "commit": "d388c3387781a370ca13233ff445d03f3c5cf12f", + "sha256": "0r303mzxj57l8rclzsmvhnx2p3lhf2k4zvn8a6145wb10jvcwfxi" }, "stable": { "version": [ @@ -53117,20 +53222,20 @@ "repo": "terlar/indent-info.el", "unstable": { "version": [ - 20200128, - 1052 + 20210111, + 745 ], - "commit": "9548f14e7f0f7220d6cd1b8e88756b89fc57c471", - "sha256": "1hmrg1pyzcldqh858j3zpb6y0ap4x6142m56pas0lyh65d2wzggk" + "commit": "05a787afeb9946714d8b0c724868195a678db49e", + "sha256": "14qjl5mw7zmrc2zbcid1alqh67f704giq49qyda8q8n82vi6g8a9" }, "stable": { "version": [ + 1, 0, - 2, 0 ], - "commit": "4713807101bff80b342d0f847da9006be001141b", - "sha256": "0sprs5qgrbvgxd6k8h8fyybxdxfd3izhvk1bh13vg238qbn09a26" + "commit": "05a787afeb9946714d8b0c724868195a678db49e", + "sha256": "14qjl5mw7zmrc2zbcid1alqh67f704giq49qyda8q8n82vi6g8a9" } }, { @@ -53379,14 +53484,14 @@ "repo": "eschulte/jump.el", "unstable": { "version": [ - 20170913, - 916 + 20210110, + 2237 ], "deps": [ "cl-lib" ], - "commit": "e4f1372cf22e811faca52fc86bdd5d817498a4d8", - "sha256": "0354b64drvv8v5g13xy5nc1klwx4hldz1b5mf1frhna7h2dqz0j9" + "commit": "55caa66a7cc6e0b1a76143fd40eff38416928941", + "sha256": "03fh7i6blnbc0zbmp83fk095hr3q4fdvrvfxad74zghcbc2nk7b7" }, "stable": { "version": [ @@ -53590,8 +53695,8 @@ 20200520, 2345 ], - "commit": "44829fa70f5c4cba03d36db5fa2c969001325b91", - "sha256": "1863s0qvnh7hcy2f86d86zajkqldvnz71q16dd9b4wvgnnicwk8s" + "commit": "10b8d7b12acbd1036e68dfb59f460714baedaa33", + "sha256": "1w7sq9famd4xbh5jk974zzpn6cf1nh2vmbvjvd4fwpjhmnnibqsm" }, "stable": { "version": [ @@ -53681,11 +53786,11 @@ "repo": "ideasman42/emacs-inkpot-theme", "unstable": { "version": [ - 20201103, - 139 + 20210109, + 1112 ], - "commit": "fb5839ae7307a56a7f4d7ba71d05c9ecc051927e", - "sha256": "1qxmzdhyhh71yivdix1qg4d4wkv7rzfljby03bliv46165i2xsms" + "commit": "c010838770bad2a3fc37fcb5c497bf92d5aca27b", + "sha256": "0pf5q4n4p2szmvgh6zcfb7q9p58fac3k5bvqxq6wialz14m779lr" } }, { @@ -54359,11 +54464,11 @@ "repo": "ffevotte/isend-mode.el", "unstable": { "version": [ - 20190201, - 832 + 20210106, + 1506 ], - "commit": "38ace354d579eb364d4f95b9ea16081c171ea604", - "sha256": "19k09bxlq5a8ba3xb68cajv66qad5vh12k391kq9wcj4gjlniyjv" + "commit": "ea855f63be7febc15bd08aec6229fab9407734fb", + "sha256": "0avxwa6d19i5fns27vwpl95f5iawm710jlnrihi5i21ndfm4mcyw" } }, { @@ -54521,14 +54626,14 @@ "repo": "thierryvolpiatto/iterator", "unstable": { "version": [ - 20170207, - 838 + 20210109, + 1859 ], "deps": [ "cl-lib" ], - "commit": "9da54f9aed945b46866782cdf962c9e530419297", - "sha256": "0r50hdyr9s18p7ggiyv36g011jgg47bgszvjgcmpp23rz131mxyw" + "commit": "b514d4d1d0167e5973afbc93a34070d1aa967d82", + "sha256": "1xl64lz45z4s90ja96wy86qyr0xahk96v5rdvbamnfgw32kkxyh5" } }, { @@ -54576,11 +54681,11 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20201218, - 1222 + 20210114, + 1859 ], - "commit": "d2891aab7b816aebf21ebd01ce33933a6ac6244f", - "sha256": "12bm5w073mgpj7kvk6596fnw8809nl6vkv288l7vvzx7iimaqzpl" + "commit": "cbce9ce71429c98c67bd76ef15d049ecced042f7", + "sha256": "08lgvpvkhp2i9q73bnr2v17w864rwp6wjnrl3b7qg06dacfs2rvl" }, "stable": { "version": [ @@ -54607,8 +54712,8 @@ "avy", "ivy" ], - "commit": "d2891aab7b816aebf21ebd01ce33933a6ac6244f", - "sha256": "12bm5w073mgpj7kvk6596fnw8809nl6vkv288l7vvzx7iimaqzpl" + "commit": "cbce9ce71429c98c67bd76ef15d049ecced042f7", + "sha256": "08lgvpvkhp2i9q73bnr2v17w864rwp6wjnrl3b7qg06dacfs2rvl" } }, { @@ -54627,8 +54732,8 @@ "cl-lib", "swiper" ], - "commit": "1bb81d77e08296a50de7ebfe5cf5b0c715b7f3d6", - "sha256": "1n5539hivg65gkr041mq8h96bn489fhvbxrh1manxacf6xi6b2am" + "commit": "94807a3d3419f90b505eddc3272e244475eeb4f2", + "sha256": "08wfvqdzs05bmfjjaqfxffjbl4j7632bnpncs9khrh6lifz03xh2" }, "stable": { "version": [ @@ -54962,8 +55067,8 @@ "hydra", "ivy" ], - "commit": "d2891aab7b816aebf21ebd01ce33933a6ac6244f", - "sha256": "12bm5w073mgpj7kvk6596fnw8809nl6vkv288l7vvzx7iimaqzpl" + "commit": "cbce9ce71429c98c67bd76ef15d049ecced042f7", + "sha256": "08lgvpvkhp2i9q73bnr2v17w864rwp6wjnrl3b7qg06dacfs2rvl" }, "stable": { "version": [ @@ -55168,8 +55273,8 @@ "ivy", "prescient" ], - "commit": "2af94ce194f9b8d7087f7b49ecd986083f7eb753", - "sha256": "19wwnl72gh4ar2q6gcp6k6n4gdvamdjj6lgc0n4mk7j1qrylp3hf" + "commit": "42adc802d3ba6c747bed7ea1f6e3ffbbdfc7192d", + "sha256": "0v12707jwd2ynk8gp3shgarl6yp3ynal7d4jzds6l2lknr6wi50w" }, "stable": { "version": [ @@ -56291,11 +56396,11 @@ "repo": "Michael-Allan/Java_Mode_Tamed", "unstable": { "version": [ - 20201222, - 2048 + 20210114, + 900 ], - "commit": "b028d48d22d72129b2b49d93298f65241de206fd", - "sha256": "1ky9vzvib9rp4k46n80hilff2yr5bg4ham1cx083nnaxshdw8n3b" + "commit": "6a307c7ee17d44f1b0fe3dfba2bc34e0ca055818", + "sha256": "0q8y512l91r32igdksc6i2gwv0csl35xqlnx1cw41fwdpnbvdx4m" } }, { @@ -56563,16 +56668,16 @@ "repo": "jakoblind/js-import", "unstable": { "version": [ - 20201209, - 735 + 20210105, + 829 ], "deps": [ "dash", "f", "projectile" ], - "commit": "0eac79d8d6277dde1c5de39c4bd529bc042f092a", - "sha256": "17l570zd8d9r1lg1yfri2w7628p7wp7nm5flq5iwm4v85048pair" + "commit": "941091b3ab074c482a5920194d61f50e9b50d503", + "sha256": "1p18lg3apmhcmvkwldnygy35s1kjj68sgv81lyyf0csvc0pxbcpk" } }, { @@ -57134,14 +57239,14 @@ "repo": "tpapp/julia-repl", "unstable": { "version": [ - 20200625, - 924 + 20210114, + 1549 ], "deps": [ "s" ], - "commit": "d073acb6339e99edf77833f82277afd9a076f16a", - "sha256": "1p2d92mcbdl8j22qz04iwdlpkbv2qn9p8ds8n2vpf4m9mgzjplzi" + "commit": "0774d3b5b954e82e5bbcbe5123c689341297b01e", + "sha256": "056zv48nbqvnadca4q2hh0aal2bz00f9ayzqpwnsxl482p8bi93k" }, "stable": { "version": [ @@ -57275,8 +57380,8 @@ "findr", "inflections" ], - "commit": "e4f1372cf22e811faca52fc86bdd5d817498a4d8", - "sha256": "0354b64drvv8v5g13xy5nc1klwx4hldz1b5mf1frhna7h2dqz0j9" + "commit": "55caa66a7cc6e0b1a76143fd40eff38416928941", + "sha256": "03fh7i6blnbc0zbmp83fk095hr3q4fdvrvfxad74zghcbc2nk7b7" }, "stable": { "version": [ @@ -57615,8 +57720,8 @@ "deps": [ "s" ], - "commit": "52b5be3277f65cb5ca657973e9bd7f914b996356", - "sha256": "0g2n73habz844f64p1x66kxpvadv9zh34qmxhql34c3w2sm9mmwf" + "commit": "af4034dcace867c4ede0bce744d5cb888c318f23", + "sha256": "1f352ki7yj1z5y2xpbmwi5f8nim208nbg94760hzwkjkk7rd71k2" } }, { @@ -57635,8 +57740,8 @@ "kaleidoscope", "s" ], - "commit": "52b5be3277f65cb5ca657973e9bd7f914b996356", - "sha256": "0g2n73habz844f64p1x66kxpvadv9zh34qmxhql34c3w2sm9mmwf" + "commit": "af4034dcace867c4ede0bce744d5cb888c318f23", + "sha256": "1f352ki7yj1z5y2xpbmwi5f8nim208nbg94760hzwkjkk7rd71k2" } }, { @@ -57855,20 +57960,20 @@ "repo": "ifosch/keepass-mode", "unstable": { "version": [ - 20200928, - 2106 + 20210110, + 630 ], - "commit": "f3d19b4deb14053785e660f1995994581536aecc", - "sha256": "1krxcsvqf9f4mi34kn2zgf82z1cai133sgpfa70f5wczqibhfg99" + "commit": "515343a7667b2bf4253309449f65a6eb94933df7", + "sha256": "0hrq521swki0l3m81wk9p7pkc5j99li441fb75h7107v6z0p102c" }, "stable": { "version": [ 0, 0, - 2 + 4 ], - "commit": "ad073eaab4f96ca033df023736d195dc3b611897", - "sha256": "0kyzcws47ch3pkw9ijb4gjr7l933c3mrxc9bsy16ddkc8dvl7yng" + "commit": "cd07542fddf080927eae927afdcf62be1b087503", + "sha256": "1syz5yds6b59dws6f8b6az2ng7czwnq34izlc9y25c8ng94bynm5" } }, { @@ -58498,8 +58603,8 @@ 20180702, 2029 ], - "commit": "e205c97ebd8e3cf4d432bc6e1a7e028ebe70f7d9", - "sha256": "1m171sjcckxca2fdcy32s5m488931dsmfbj81j9c7g92v8bw72hb" + "commit": "554e98fb7c439d182a48dce7276932139a325f02", + "sha256": "1afw0ak9wbf63d23sfp78a9ial4vscw002p0b47rlsq895j683cb" }, "stable": { "version": [ @@ -58519,14 +58624,14 @@ "repo": "stardiviner/kiwix.el", "unstable": { "version": [ - 20201231, - 209 + 20210113, + 1834 ], "deps": [ "request" ], - "commit": "1ea9239189d8c8687375f877e2b4966616001d6f", - "sha256": "0p72yl0h24j8snl630hyn7jqzqh7r1dqfiym6f2p5r0rlwwrrvq9" + "commit": "e5821f5ccb34262aedcb4ea3a19e583c6a97e2f8", + "sha256": "1g9cn34r948a0g9wyda1kzlq33ddgmarl9j6wbb76g0fgkh7qjh9" }, "stable": { "version": [ @@ -59080,16 +59185,16 @@ "repo": "Deducteam/lambdapi", "unstable": { "version": [ - 20201230, - 859 + 20210115, + 651 ], "deps": [ "eglot", "highlight", "math-symbol-lists" ], - "commit": "5ca13281fc98741bddef6b500bbce34a0f7f44b6", - "sha256": "0qd2nyx7zjxw06qd885zlqghqg9d1pcm2yabiv3743akflpgcs6p" + "commit": "e4205c5da3a0c99f0b29677736711ee069e2c175", + "sha256": "0kxdli25dbzq7mjinnvfxy2x9zy79062l45kafpayywa1ipwgfkp" } }, { @@ -59501,8 +59606,8 @@ "deps": [ "colorless-themes" ], - "commit": "92ae2775ac9ae2fd3d1172ffdf706e18db55963c", - "sha256": "06cp84bi3x33il119gfk8blikbqdmakvj7h64dr9crh0v11lg7ds" + "commit": "c1ed1e12541cf05cc6c558d23c089c07e10b54d7", + "sha256": "02ai9yf7h3i81bg01w8nb4kdrcc94ladbrkw9vg3p40w617mjwlb" }, "stable": { "version": [ @@ -59548,14 +59653,14 @@ "repo": "jyp/lcr", "unstable": { "version": [ - 20180902, - 1919 + 20210102, + 853 ], "deps": [ "dash" ], - "commit": "c14f40692292d59156c7632dbdd2867c086aa75f", - "sha256": "0mc55icihxqpf8b05990q1lc2nj2792wcgyr73xsiqx0963sjaj8" + "commit": "493424dab9f374c5521dca8714481b70cb3c3cfd", + "sha256": "10nvxvyz39avlf2v8d4lag7jj5x5p8jvaqiww7x6l992mp11hahk" }, "stable": { "version": [ @@ -59789,14 +59894,14 @@ "repo": "DamienCassou/ledger-import", "unstable": { "version": [ - 20200522, - 853 + 20210108, + 728 ], "deps": [ "ledger-mode" ], - "commit": "027a6caf173948feacd2f416a7995d82f82165e7", - "sha256": "08aqqhbrcgn72wjw4c9wq5pyxdswbhly2c2izmy316bjh3cqvbhf" + "commit": "d1eda3ccafbfabbcc51be364146e31450f11745f", + "sha256": "0w6qgqmcv1nyrgjqrb1ah4wj94rn7zn00g0kib4vmc83wcnmyrjb" }, "stable": { "version": [ @@ -59819,11 +59924,11 @@ "repo": "ledger/ledger-mode", "unstable": { "version": [ - 20201226, - 1721 + 20210106, + 227 ], - "commit": "9c418079c244bc984f01b48e2bf360ed764d3261", - "sha256": "1zwmkm6s52dh1vb0d6r845j160i98v2p002iwwhwk28m2v5adbj1" + "commit": "bcd8cefb720702db88986a52bb66e08e2e451c05", + "sha256": "1l2lhz45lc7njdv3kl5g8z5ig6vykxlp446raaif14k2flhw24a0" }, "stable": { "version": [ @@ -60113,8 +60218,8 @@ 20201007, 2214 ], - "commit": "75a30e55501ffc70712bc8176fe47eaf9ca1dbe6", - "sha256": "04ah4ps11lsmclisx2rfbgayznlw0c2blpdvy13b5c8ii7bqjccb" + "commit": "e5f20c459a13b35ed1e71b1d2667363af168e958", + "sha256": "0fapq9b14lxx5qm55yhcj2f1ym0kfrh6796ffb2i032bprh8n3m6" }, "stable": { "version": [ @@ -60247,11 +60352,11 @@ "repo": "mpdel/libmpdel", "unstable": { "version": [ - 20201026, - 1122 + 20210107, + 950 ], - "commit": "e26060d2139841ef206704e7e0d2f9fa06a1884b", - "sha256": "0i48sdhrx1nqnca1kk1iaghb6b3nsxshs6bdd0zfs03b425hhlsv" + "commit": "9162a4b350c978f94dde6f75d60bc6a17e1dc18e", + "sha256": "0w45g4pkjsggv5yqw0zsnwqvzljapfvhxzf0vhnrqc446ys9jzp3" }, "stable": { "version": [ @@ -60390,8 +60495,8 @@ 20180219, 1024 ], - "commit": "ab112e3de44c062d9bebd2e2b32c6c9b9812c43e", - "sha256": "1zhdp4k1jm23n28x58vflxw7znxgwmg4711awq5qgicn7srj8vw3" + "commit": "30cc83af69216ceced310c058ffae48bbe67fed1", + "sha256": "143l1fb3i0z7dxd39lw5qds62kv5ii9wy4gbqy3jg11swva0xkcd" }, "stable": { "version": [ @@ -60835,11 +60940,11 @@ "repo": "rolandwalker/list-utils", "unstable": { "version": [ - 20200502, - 1309 + 20210111, + 1522 ], - "commit": "9bb2487c83ec46a0b6e6c4158af69334ac797b82", - "sha256": "07hbz2md52ccy95gv4d5n6szrfmpfqf3w4kwqdg2cf54c7kgf7hw" + "commit": "ca9654cd1418e874c876c6b3b7d4cd8339bfde77", + "sha256": "0pkkfjjpak8xxbzr2xl5ah3isrn0bm8d7zfhrmhivpzpkhgdzvfx" }, "stable": { "version": [ @@ -61126,20 +61231,20 @@ "repo": "donkirkby/live-py-plugin", "unstable": { "version": [ - 20201229, - 139 + 20210101, + 1827 ], - "commit": "40a5c9cef3ecae289fef73d76d0e3fd006051a21", - "sha256": "0dafnxqfhxmq4fkrxwalixxb0cmd3mgvx49jwvnmdcaghwxgr1jv" + "commit": "d489fafd824d3fbd26fadb7b60dd2533d32478a9", + "sha256": "13m65xvh172rs7pc4yshz41289h93fz4isrpracy2zi409ji3h37" }, "stable": { "version": [ 4, - 2, + 3, 0 ], - "commit": "de3ce16dbb054b6d1b14f3274935bbdccadd9790", - "sha256": "1vl6v8lsid4p82clvp62079jnxhmibza3p5hb1frdlsycyc9d1bv" + "commit": "c6d3d34bae62f1d5e986625db74f2076af258900", + "sha256": "1d022chhib61ghrf847f2w9baqiscpp1s2qvj9i84zmk7bndjvag" } }, { @@ -61353,8 +61458,8 @@ 20191022, 1955 ], - "commit": "4934c0560d2f63e6314b4584211a0cc0a7e671c4", - "sha256": "03hwvx3h64jj9nylmzpv2241b5fi97anhjjpwc5sjmfsq1wbf432" + "commit": "284d7bb285bd382be6c1936077de7e2246fa2374", + "sha256": "16jslrdzxlcl6s5jiylqfv48xrm7fqk765jwcgzayjl94939r22l" } }, { @@ -61757,8 +61862,8 @@ "repo": "emacs-lsp/lsp-dart", "unstable": { "version": [ - 20201206, - 1725 + 20210110, + 15 ], "deps": [ "dap-mode", @@ -61769,14 +61874,14 @@ "lsp-treemacs", "pkg-info" ], - "commit": "8180a46ea8699c461a49904432492c7e4e1f6df8", - "sha256": "1ms87gzz7ai4ziaigsrpjn8a659yq5c4h1rs1s0f1gdb3qxk43zc" + "commit": "be9f979fa9cb098d064c3ab26d1f7ea7c65cbd23", + "sha256": "03g97sm3y5y1y8crwlc8kvpgrrljyym5yq6qz9llpwy8cg9srchw" }, "stable": { "version": [ 1, 17, - 11 + 12 ], "deps": [ "dap-mode", @@ -61787,8 +61892,8 @@ "lsp-treemacs", "pkg-info" ], - "commit": "8180a46ea8699c461a49904432492c7e4e1f6df8", - "sha256": "1ms87gzz7ai4ziaigsrpjn8a659yq5c4h1rs1s0f1gdb3qxk43zc" + "commit": "be9f979fa9cb098d064c3ab26d1f7ea7c65cbd23", + "sha256": "03g97sm3y5y1y8crwlc8kvpgrrljyym5yq6qz9llpwy8cg9srchw" } }, { @@ -61850,15 +61955,15 @@ "repo": "emacs-lsp/lsp-haskell", "unstable": { "version": [ - 20201210, - 1702 + 20210108, + 1332 ], "deps": [ "haskell-mode", "lsp-mode" ], - "commit": "592e883026288677f4042333b51efc7a40b9a68a", - "sha256": "1dar5iapnx55z8875sr05p4b9nklmqdx6vfxhisy2hsgkp8iq8fc" + "commit": "5d3f4814f6ac44547a62551472cc76fbaebcccf7", + "sha256": "0qak0vl9jicx9sv4sa2ash5agxxsx8qycp4jk3wxs96q5kjshf62" } }, { @@ -61920,8 +62025,8 @@ "repo": "emacs-lsp/lsp-java", "unstable": { "version": [ - 20201105, - 1758 + 20210105, + 1625 ], "deps": [ "dap-mode", @@ -61934,8 +62039,8 @@ "request", "treemacs" ], - "commit": "f43b00acd86801aff76c9cdc01f9d7f4b83bf14f", - "sha256": "1xpjjz7m06yazlw7qp7i278f7v4a3n80kpcvck35ahg5ar8i111j" + "commit": "33364a268a61366f1a07596e9fe7bd0f6d73fd90", + "sha256": "0ii26773cm945z1s4vyfqgzjsizv1a9wiadgg3klnfz9748y93a4" }, "stable": { "version": [ @@ -62046,26 +62151,26 @@ "repo": "ROCKTAKEY/lsp-latex", "unstable": { "version": [ - 20200718, - 928 + 20210110, + 1914 ], "deps": [ "lsp-mode" ], - "commit": "a9a26a21bf16b9444021563d844719ace0c5c3b6", - "sha256": "1waysrxhihg099czr2hydsvipdm8kf1zxw725r84lv5363cijw0b" + "commit": "2140e65fc5d759cdf163128ef6ab15c246d6039b", + "sha256": "10qf62c6raqhikhmfrav6qhc1mj229mrabzs1swyc06sx1sgkiwf" }, "stable": { "version": [ 1, - 2, + 3, 0 ], "deps": [ "lsp-mode" ], - "commit": "a1376d3f4d4467aaf7fc5750c437e3edc91d2116", - "sha256": "044jivz2w6xs2kyjasndy00c0j9f63qf66s5wmkjjxbyamd7viwi" + "commit": "969846d5d0c9a9d1fc8deae30a0f664607f06e72", + "sha256": "1dz9yib9g7a5b1yipxjc6mqq9ffkpkm2icpj6xzanfdnc1ymj7c9" } }, { @@ -62119,8 +62224,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20201231, - 1252 + 20210114, + 1955 ], "deps": [ "dash", @@ -62131,8 +62236,8 @@ "markdown-mode", "spinner" ], - "commit": "51138a029cd2cb5b530ab0e98030e24b830da943", - "sha256": "0l8y3ypb8sl96vqrn8za1bdkkj1w1ip8nya75iqj4h0gcmcdw04z" + "commit": "0062a7cd4ab674390287e6b20d93ac42ed1f5512", + "sha256": "16awnan07b6ayf0rnxs8hal468bc7i24gw0l849s04v41y2i35cg" }, "stable": { "version": [ @@ -62421,8 +62526,8 @@ "repo": "emacs-lsp/lsp-ui", "unstable": { "version": [ - 20201209, - 332 + 20210110, + 1507 ], "deps": [ "dash", @@ -62430,8 +62535,8 @@ "lsp-mode", "markdown-mode" ], - "commit": "72034bdd65f66b43d10e6106e82dfa4718557e1a", - "sha256": "0dz2rz6fl87yr2jj324b8v1kw0kr4021lj245l60nqy5pnj7gz2y" + "commit": "fbe9a859f0b50097270ccf1314952de2d2039c12", + "sha256": "01xw3jpwffk5gg86s5n2i1jwn0xslc9bdbacfxy0iyrn6qp5jr1i" }, "stable": { "version": [ @@ -62460,8 +62565,8 @@ 20201110, 1250 ], - "commit": "d2ff3045b9694293a302fa60d7bd5d97f2673156", - "sha256": "1g5wkprz33az2kp8w46343nhri82g4ib8jahqi4lpn507307gchz" + "commit": "9454aeeb665df360543b47e162f03276a16b01a5", + "sha256": "0ssqqhvc08g5917i4lmsr698zr57v9hpnbw67l1lx48ra4vr6fcr" }, "stable": { "version": [ @@ -62875,8 +62980,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20201225, - 4 + 20210105, + 1030 ], "deps": [ "async", @@ -62885,8 +62990,8 @@ "transient", "with-editor" ], - "commit": "2fb44690b4de28ada77571b1a7acabbe7718fdbd", - "sha256": "1l6pl8wy1k9ywk45ywyjc11gbm6bjh8g3z1sd3bar21381dnm0w8" + "commit": "25f432551347468ce97b8b03987e59092e91f8f0", + "sha256": "0vxsh75xynpfkfvmyyz8x3rppbwr9rgk7zjfil2af2kzba3p27vl" }, "stable": { "version": [ @@ -62966,15 +63071,15 @@ "repo": "dandavison/magit-delta", "unstable": { "version": [ - 20200929, - 1335 + 20210104, + 1541 ], "deps": [ "magit", "xterm-color" ], - "commit": "b8526f890415374822514e488341d2b706d6bc2f", - "sha256": "1r809j0pj7lfv70dkqzgzahppzp0g5zsa3q18h68d35vanaicm2d" + "commit": "fc4de96e3faa1c983728239c5e41cc9f074b73a2", + "sha256": "0gyjsjjjdbns8vlbja8wvmba8sq85ah7cawqqm0xjinrpfrhh8b7" } }, { @@ -63225,15 +63330,15 @@ "repo": "magit/magit", "unstable": { "version": [ - 20200102, - 2204 + 20210103, + 1554 ], "deps": [ "libgit", "magit" ], - "commit": "c5e11811197ef8c667a605e5d9dd8ec77247bd13", - "sha256": "0i4la1sncgn2hgpgd26x0igc90q4c4jkgkng8la96hjaw09qsv23" + "commit": "25f432551347468ce97b8b03987e59092e91f8f0", + "sha256": "0vxsh75xynpfkfvmyyz8x3rppbwr9rgk7zjfil2af2kzba3p27vl" } }, { @@ -63381,14 +63486,14 @@ "repo": "magit/magit", "unstable": { "version": [ - 20201221, - 2057 + 20210103, + 1631 ], "deps": [ "dash" ], - "commit": "2fb44690b4de28ada77571b1a7acabbe7718fdbd", - "sha256": "1l6pl8wy1k9ywk45ywyjc11gbm6bjh8g3z1sd3bar21381dnm0w8" + "commit": "25f432551347468ce97b8b03987e59092e91f8f0", + "sha256": "0vxsh75xynpfkfvmyyz8x3rppbwr9rgk7zjfil2af2kzba3p27vl" }, "stable": { "version": [ @@ -63971,11 +64076,11 @@ "repo": "emacsorphanage/manage-minor-mode", "unstable": { "version": [ - 20200123, - 1406 + 20210108, + 1832 ], - "commit": "0dfab46a728a21c91658ffcb14101b182cf1b403", - "sha256": "1c17r1vz6181plbhb5nh36q6r2rwkrxhy45xmk7rjghmdd765f2r" + "commit": "f4b37fffec7b6608a597e6a3f6900634802807b4", + "sha256": "0shk5n4a88r347h1fhayn0gzi242mc5b7i6b4aw0s63kw2yd4h6r" }, "stable": { "version": [ @@ -64177,11 +64282,11 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20201230, - 1926 + 20210114, + 1652 ], - "commit": "3c8042845c62b565c211e11d54defa093153b715", - "sha256": "0vl1hb1drchqzxbvf6iil1q6sg6qw9yq8163jaz0cw5rjzjjafb2" + "commit": "327ad58bd69a372dc10dbb5b5d3d47f246e28020", + "sha256": "0nx5322278vr44aq27kaj5nr0rcq4d3wcbfyb3fpl80asj672m09" } }, { @@ -64289,11 +64394,11 @@ "repo": "jrblevin/markdown-mode", "unstable": { "version": [ - 20201220, - 253 + 20210112, + 1557 ], - "commit": "e250a8465f805644d372c264eb0572f569d7f2a1", - "sha256": "0ffx65gq10i56bxcg4baffrhr2xj5vk1051cljvzlffcq56hx98g" + "commit": "3e380572a5177d0fa527c15efd15e340f53a923b", + "sha256": "1zhxw0cp95zy3qy9ai9k81zja5m31964nyyrjqzlywxx7zjk4x9g" }, "stable": { "version": [ @@ -64661,16 +64766,16 @@ "repo": "matsievskiysv/math-preview", "unstable": { "version": [ - 20201213, - 646 + 20210108, + 1121 ], "deps": [ "dash", "dash-functional", "s" ], - "commit": "61554599f839a6d00cd4037d373bfde7b280c1c3", - "sha256": "0mrrb5wf3drpd5ywacq3bj2kcvsijysb37p5asz5pmdpg8s8nr6v" + "commit": "6c83ab7c6e3df95e60e942a9017d0c218228d429", + "sha256": "1v32nip530j4lvvm9gsjr9f6i0p0i59lx3f3j32m25q0yvv4s8z6" } }, { @@ -65240,16 +65345,16 @@ "repo": "DogLooksGood/meow", "unstable": { "version": [ - 20201231, - 748 + 20210114, + 1624 ], "deps": [ "cl-lib", "dash", "s" ], - "commit": "9d745c8336a39dc1bd47aec4b3f9d2c034a0574f", - "sha256": "0s306wwns2zzpbw1008ga224mncc55jdbd31v9qp147wsnhd11s3" + "commit": "d012944ac149358d0e978b10ff0e8a090921e044", + "sha256": "0i89v52damd9jhg9sdqghxrcbdybix2cw8hzx6lawg847wc09j06" } }, { @@ -65263,8 +65368,8 @@ 20191025, 851 ], - "commit": "47ebe5e6186e70584ef5f92c9191bd7bbcb6c1da", - "sha256": "1vinlgqljdsv91dd5briak2v747fbml72xdgr859j6v514hap2rz" + "commit": "a1a6e02756426f58a885846cbe56c4704b2a79e1", + "sha256": "1drx20bj1bb45n6wan0ys04qp4ccqjapi4056qn0ry6fdzx3c35d" }, "stable": { "version": [ @@ -65554,11 +65659,11 @@ "repo": "kazu-yamamoto/Mew", "unstable": { "version": [ - 20201202, - 203 + 20210113, + 11 ], - "commit": "cf20ca579120dd3a4126641a5bcc1dfc6289183c", - "sha256": "0041q1vxy6222ic8807yhxdxb0vsmzvndb9f50ymfx6zrjisydf7" + "commit": "1dabdcd19ac93223ebc1a488666958e8c224449f", + "sha256": "0p5wwxfxds5h5v6jp4z2f423lzz3b3y84da8gw593byqzxd0sbf3" }, "stable": { "version": [ @@ -66157,11 +66262,11 @@ "repo": "ayrat555/mix.el", "unstable": { "version": [ - 20200920, - 1500 + 20210105, + 1821 ], - "commit": "8a2f8c2df0e1817190c4dc0d2d7c7b5e5407744a", - "sha256": "0r8b3v4vp46afw8q5v03aifd1kpap79qc4af84placrhy80kya2v" + "commit": "39a7d3e35769086c0008389b3975dd90b91b657c", + "sha256": "0f74wb9f1j47qc0xhhn23i8nrsyznhngwvdrg62ixdzdz9z0z5hh" } }, { @@ -66172,11 +66277,11 @@ "repo": "jabranham/mixed-pitch", "unstable": { "version": [ - 20200916, - 2311 + 20210103, + 7 ], - "commit": "d305108f9520e196b533f05d1dcc284cf535faaf", - "sha256": "0yx89is3g2m8af8vfsz5rgjmfmx7mfrxlffb1x6y4b8lh9l0k6dj" + "commit": "beb22e85f6073a930f7338a78bd186e3090abdd7", + "sha256": "1dhljrh44dsnixd8hbb11k6dgap8r8n7jknhfy2afdzq889fih74" }, "stable": { "version": [ @@ -66426,11 +66531,11 @@ "repo": "sigma/mocker.el", "unstable": { "version": [ - 20201223, - 658 + 20210115, + 157 ], - "commit": "5d739d5170ff42e841cd2755b68151918052da2b", - "sha256": "1dc514cqbfmg33sb3j90s5jmw6jnm3wzvs0zhw3maz13bp7w6z48" + "commit": "cc538e5702274ad9e8c6c41c807f890ca38f427f", + "sha256": "0ai424aggmavj3yjqpzi8a7cxxz96bm3wdbs7vy4g68xxb88ll7n" }, "stable": { "version": [ @@ -66647,11 +66752,11 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20201231, - 1237 + 20210114, + 1245 ], - "commit": "cc61cc3d034f87a6a7a0dd6266c11c5c79d97981", - "sha256": "1ldj36rp2mjcblawvgq2xxx48bmpvy4j6ny3gwgrqj4ggjjmqjv3" + "commit": "cefa14959c9118c279adccd151ac77e05b8beb3e", + "sha256": "1zqyvqkgy9w0ay0i61gq0mz5dwjdymcq4c2cbypq0adph4dlhkjq" }, "stable": { "version": [ @@ -66770,26 +66875,26 @@ "repo": "jpablobr/emacs-monkeytype", "unstable": { "version": [ - 20201221, - 1355 + 20210110, + 513 ], "deps": [ - "quick-peek" + "scrollable-quick-peek" ], - "commit": "8a01436eda0f2174c0174af097591de76eda4d1b", - "sha256": "11p91p1w84rbvgvb8f9xj3r2nnr34i9ka5hvz82ri4cfx1hwr9hk" + "commit": "0e949d08198c0bd003f1d5c8cdceb7e36bef22f7", + "sha256": "0fgnfslhg10q96lyxfnpa7s8dvw5gjlll7p6qji2jfz3kncwhf5l" }, "stable": { "version": [ 0, 1, - 4 + 5 ], "deps": [ - "async" + "scrollable-quick-peek" ], - "commit": "919b24f3b18d70be8c43e792a4e81476d76166cc", - "sha256": "0fgdx8zm6lbp8dn9wrfgpm146h7p1hmz0r32mwb5y9wvwkglvqla" + "commit": "0e949d08198c0bd003f1d5c8cdceb7e36bef22f7", + "sha256": "0fgnfslhg10q96lyxfnpa7s8dvw5gjlll7p6qji2jfz3kncwhf5l" } }, { @@ -66979,11 +67084,11 @@ "repo": "tarsius/moody", "unstable": { "version": [ - 20200514, - 1946 + 20210114, + 850 ], - "commit": "f6bebfe6fe51b728ebd013b7084becad23cabad3", - "sha256": "0n8p864yj5m3n7f9qiq9hy24dwfvv0a0wchx2818rppff6vfq3hf" + "commit": "2a29baa0cb6e364c5acbbf590a6d7c936c4378ae", + "sha256": "0l6cgr2969flhkdkiycqppvblpsn0qkdp19r406jpqbc1ql394lj" }, "stable": { "version": [ @@ -67338,8 +67443,8 @@ 20200822, 1229 ], - "commit": "9ba59b64d53365c1fe93c1c245b4ec3e35bdadf0", - "sha256": "07fmvwlv77za6k67myfn297hx44j8dn47xsx8mw8xaw5gpin6d3c" + "commit": "1f4fa17372bd196e87042738a16ab08bf904bcbf", + "sha256": "180glmkk6wnq5pc02543phih1f71vpvykqkwxs2qv7s7dyf2qg58" }, "stable": { "version": [ @@ -67465,15 +67570,15 @@ "repo": "mpdel/mpdel", "unstable": { "version": [ - 20201026, - 1123 + 20210107, + 1303 ], "deps": [ "libmpdel", "navigel" ], - "commit": "e937fbe0b98774e711134f3fac230a9fc66ac106", - "sha256": "1qiwk3ahjhdc6ac3k81qjl5vjjsxm1hd7wnl7whk2zwj7k12zb9j" + "commit": "6682446c6263a79e79c55cf32c0efb066245feec", + "sha256": "0q84gml1g9zwchp4h3r0xvj1sc1ynx0s2drfkpd357br3fw8ivzf" }, "stable": { "version": [ @@ -67777,8 +67882,8 @@ 20190609, 812 ], - "commit": "98110bb9c300fc9866dee8e0023355f9f79c9b96", - "sha256": "080s96jkcw2p288sp1vgds91rgl693iz6hi2dv56p2ih0nnivwlg" + "commit": "ccf85002b18fee54051dbfaf8d3931ca2a07db24", + "sha256": "1ysj9x9m1lxg1gy0z7y07qsi3g26qfqdwwa8kjkf40pchb2wxg0s" } }, { @@ -68015,11 +68120,11 @@ "url": "https://hg.osdn.net/view/multi-project/multi-project", "unstable": { "version": [ - 20191117, - 1203 + 20210105, + 1229 ], - "commit": "4045823d51f6330466b6ab83828b6c598ac817a0", - "sha256": "18z1mmmjq4xw238mw1417nlqv67qv07blz0lxhpl8m1wma4v96af" + "commit": "f71a56978a57ee5b08e75d01a5d6ec75f20cedba", + "sha256": "10fvwrd0l05lv05shrdl0cw1bg231djkz6gxlgccmdr97d01qwkl" } }, { @@ -68030,14 +68135,14 @@ "repo": "sagarjha/multi-run", "unstable": { "version": [ - 20190507, - 2349 + 20210108, + 336 ], "deps": [ "window-layout" ], - "commit": "c6256b0cc2876c29faf381d8324b31b911045a27", - "sha256": "07nd7lwrnz9j54hq33c8ii1pipd472qfsdifg6fid7kca0rychif" + "commit": "13d4d923535b5e8482b13ff76185203075fb26a3", + "sha256": "0b5pym2dk4rhrcbn0kgiaf6mqpwa45zfi5k2vh0lfzv9b45nngzs" }, "stable": { "version": [ @@ -68367,15 +68472,15 @@ "repo": "agzam/mw-thesaurus.el", "unstable": { "version": [ - 20201212, - 2250 + 20210106, + 1857 ], "deps": [ "dash", "request" ], - "commit": "4117f49b9f40d119f9ed0888458ce5495510226e", - "sha256": "0i2r54rzvfiiap7vg2fx4py62xng7n9hjblih0ybb2b0saqmpvgd" + "commit": "cb0637bd3799820d6738f5d66b8bc2de2333e0e4", + "sha256": "1j5x1rfnxvghdmai7cv9sjqw1azq59pk8h5vm0krgnan2rpx5k4k" } }, { @@ -69589,8 +69694,8 @@ 20181024, 1439 ], - "commit": "68f971460bb21abd59dfe6253e35a55c3e1cfc64", - "sha256": "1isbay1i23jjw24a7nxjhsdhvnff2108gr98s90jfwwiymr1fp81" + "commit": "68f09b03c090840162d1852f1e92afa8e117cc4e", + "sha256": "1ampghm9laigs0frqfw2yjsm0whh2vff5gqp96i4d88n9ar0wj5n" }, "stable": { "version": [ @@ -69688,11 +69793,11 @@ "repo": "NixOS/nix-mode", "unstable": { "version": [ - 20201229, - 138 + 20210115, + 340 ], - "commit": "53ea839a52335d089699d3530bae8ea5914cdbb6", - "sha256": "1gmsq0simdrk8w1ywls3bn224wxgc0v8dmcch75zjp34rx9fg11n" + "commit": "e8e5211f6e083cf0ba9aac52acb6657818a32972", + "sha256": "1zhvj1j5pvsfa0xzky819fc1xlhy3a4snkyyp1dczbfdnk34kan9" }, "stable": { "version": [ @@ -69952,16 +70057,16 @@ "repo": "dickmao/nntwitter", "unstable": { "version": [ - 20201129, - 2009 + 20210104, + 1423 ], "deps": [ "anaphora", "dash", "request" ], - "commit": "94916ad8c3e3bf697855c58257f92cd697c9521a", - "sha256": "19dk7mkjpmmzbq26kdpz032g16jlj3b7mbmgi5px9rfa9qm0v8qw" + "commit": "174eb3bdb1339872b62fe2bf0c27d9a3eb142d27", + "sha256": "089zsy7f69h6kj6rckn5big2bfdn6hgdwamacsgsb8fpsvmy3ai9" } }, { @@ -69987,14 +70092,14 @@ "repo": "emacscollective/no-littering", "unstable": { "version": [ - 20201222, - 1537 + 20210108, + 1350 ], "deps": [ "cl-lib" ], - "commit": "96ed5b8ecad8bcdcd212aacd9957276be3cf128e", - "sha256": "00chkzpjcdll907vpzfzmf9p3jprisnr8i0h1x5gixidwbfc2whi" + "commit": "6e8950ad296c0f57d80d034eb0b7adf538c02906", + "sha256": "10zjxc6ipm9330awx7k9hzjf28qpnaw2rcz67dc0jbdgxkn16gl8" }, "stable": { "version": [ @@ -70240,8 +70345,8 @@ "deps": [ "colorless-themes" ], - "commit": "92ae2775ac9ae2fd3d1172ffdf706e18db55963c", - "sha256": "06cp84bi3x33il119gfk8blikbqdmakvj7h64dr9crh0v11lg7ds" + "commit": "c1ed1e12541cf05cc6c558d23c089c07e10b54d7", + "sha256": "02ai9yf7h3i81bg01w8nb4kdrcc94ladbrkw9vg3p40w617mjwlb" }, "stable": { "version": [ @@ -70293,11 +70398,11 @@ "url": "https://git.notmuchmail.org/git/notmuch", "unstable": { "version": [ - 20201225, - 1832 + 20210113, + 1123 ], - "commit": "0f37509cc7e92f2c09fcd7d7f3e2b477e4f29401", - "sha256": "1g3l7hyr8zcddwvcdjxmblzkw3dzrdhp8kc31j81m22g9napjxya" + "commit": "1bbbde4a0c3153f6caa30724bd173397be43144f", + "sha256": "0lawmpg52yc7fsh2rrmwajds2yhx9jr3h8g04ikf4cma95v4d8s2" }, "stable": { "version": [ @@ -71255,8 +71360,8 @@ "ess", "julia-mode" ], - "commit": "862f34da39faae87fc0900bb7006fb20fbd2b61a", - "sha256": "09gg0jbilrzz5fpvgkvig43k860044c0525y5lcgqns6gm0fs24h" + "commit": "b97ebf19c3d68ff946584e78ab7943f8a691ebe5", + "sha256": "1g9p3i6iwhgh6wj1k326lswms59nx4n1dyb7rr1qia1d0y3k1zym" }, "stable": { "version": [ @@ -71968,8 +72073,8 @@ 20201204, 945 ], - "commit": "3910c34756adf38f35ccad9650d1454d2ba5f735", - "sha256": "0h8kwlwff76ry9rps83hgvsx4h8sf6nm9jjcj54z8q8r7j9sh276" + "commit": "7c6e115c38e447e7cfd4d1d128bed363d3d10c4b", + "sha256": "0jik0j3mjyd8fxdlcdkxp0znlw29fm3knqa7i4fgwz6cvzkl9fa0" }, "stable": { "version": [ @@ -72162,26 +72267,26 @@ "repo": "oer/oer-reveal", "unstable": { "version": [ - 20201221, - 909 + 20210107, + 1519 ], "deps": [ "org-re-reveal" ], - "commit": "63a3b7744e1820bfc832f3f2ba03e7a9231e806d", - "sha256": "0yfx5brpf45v8nskfgxrflxw0bdjj4xbfvr48gncfs6np6s3w2fb" + "commit": "7edfa815105543a183b1503fa49531f77a713840", + "sha256": "09sl4bpd5k25cb82q57f39hb74hsilg9271zbs6nxvrshks23wy3" }, "stable": { "version": [ 3, - 11, + 15, 0 ], "deps": [ "org-re-reveal" ], - "commit": "4155e1b7d533cc107da74b4d6f463ed96b6dad39", - "sha256": "0pwpwxqd0mdp7dcir4yiigsybra1iv571ngn3yvprid8ji12h5sr" + "commit": "7edfa815105543a183b1503fa49531f77a713840", + "sha256": "09sl4bpd5k25cb82q57f39hb74hsilg9271zbs6nxvrshks23wy3" } }, { @@ -72836,11 +72941,14 @@ "repo": "abo-abo/orca", "unstable": { "version": [ - 20201216, - 950 + 20210105, + 1749 ], - "commit": "e2a20d6069b8217b5d9386ea15c0c56f40885c26", - "sha256": "0z60vi3qyagr43vnbh80ygcvxcr44pd183dhyacysqv0mif5bvrj" + "deps": [ + "zoutline" + ], + "commit": "c50b98da70d08b27ad1751c57bc7edcf27cd1d79", + "sha256": "19kgyxq3dci44hayzli3z528vs3mxfpsa5443wxf5pfgr7lkc9c0" } }, { @@ -72851,11 +72959,11 @@ "repo": "oantolin/orderless", "unstable": { "version": [ - 20200905, - 2113 + 20210105, + 448 ], - "commit": "e56eeef6e11909ccd62aa7250867dce803706d2c", - "sha256": "1g4963snkp1gxlf5h1h5kjn4pj55f844ajzx4n5nhkws44sr6isg" + "commit": "cbc0109eac542ef4fe0be027af1c62c4bbf846ee", + "sha256": "0cp8yspghfbgy2nhcqw8irqyhphw4jdr36864m45ralzzxc6lqac" }, "stable": { "version": [ @@ -73027,8 +73135,8 @@ "ox-slimhtml", "request" ], - "commit": "43c3d6418cc91d3e6fe880d02fc498345bd11ae3", - "sha256": "1nbjxcasw14jvmn10cy0ch0k79r7lvaznnh504qq2nhbxkqz22n6" + "commit": "efa9e3aa2d768c00440f745192aba6672b28d086", + "sha256": "009n23gcgyfylp4q6igj67r606syq2r43s86g12xkl3vmc14929b" } }, { @@ -73223,14 +73331,14 @@ "repo": "Kungsgeten/org-brain", "unstable": { "version": [ - 20201214, - 822 + 20210108, + 1512 ], "deps": [ "org" ], - "commit": "2f36f303e96e384e17d156e0d6489211808d4a36", - "sha256": "1dm672s30i31103wgp56dlwjb9gdc4g6jhjznz22s6rqrr6wkkhp" + "commit": "f7939ef5071895930eebccf490ea7cb25cc54b2c", + "sha256": "0lplrdy5432ckif94vl9phh07c6qfm8cxa1mjyn1dypn2sh8p9gi" } }, { @@ -73596,14 +73704,14 @@ "repo": "abo-abo/org-download", "unstable": { "version": [ - 20200914, - 1558 + 20210105, + 1758 ], "deps": [ "async" ], - "commit": "42ac361ef5502017e6fc1bceb00333eba90402f4", - "sha256": "0cg4y7hy7xbq4vrbdicfzgvyaf3cjbx2zkqd4yl0y2garz71j99l" + "commit": "97bec7412e1a4d6e9031c7a0568d0f065cd9fd00", + "sha256": "0jb49q2ayhw1s2dnd323lqc7fy9k3sznxn4dv73s4945j8w2lqcc" }, "stable": { "version": [ @@ -74163,14 +74271,14 @@ "repo": "shg/org-inline-pdf.el", "unstable": { "version": [ - 20201229, - 512 + 20210107, + 940 ], "deps": [ "org" ], - "commit": "d1f0aae00adf7e64b8ddbb181eded6d811dd38c6", - "sha256": "0kyf4dqjs16m007ydl27x73scl4isy44n2x38585g592rqn25x6a" + "commit": "a449c614d63712cd55e8c38d4679667117c132c1", + "sha256": "0grsmhif0pmdsvc6lifxip1jh57h5him6ipzkr1rvbs5l47qndk7" }, "stable": { "version": [ @@ -74246,14 +74354,14 @@ "repo": "bastibe/org-journal", "unstable": { "version": [ - 20201222, - 750 + 20210109, + 913 ], "deps": [ "org" ], - "commit": "c0836483ae43e525bf7547b7a789d171eda84c84", - "sha256": "100w9z2kphxn3r1ybvvin8gcrfv4851niv2sapgqgsllyx0ql2nr" + "commit": "08d5fce95023c015372678d353388ad0dae8952b", + "sha256": "0f1826xi9z895a1wgnvvv5nqpi2r0l6f8h761zk8ng9j1rhkz865" }, "stable": { "version": [ @@ -74365,14 +74473,14 @@ "repo": "stardiviner/org-link-beautify", "unstable": { "version": [ - 20201230, - 1243 + 20210114, + 1508 ], "deps": [ "all-the-icons" ], - "commit": "621ff93a7229cce9f6090cdabeb318e857278c4c", - "sha256": "1xic8fh8pnaw0xi1hcsn0xy7mc4d07cmw1zr6ncbk9df0vgz6agf" + "commit": "e20c116f7a7a42f0cd6af580ef6e53e006c5b538", + "sha256": "1321z866ahs07kil4yzqvsnjcdldapg1gvfx9k9rdx11x3awja2q" } }, { @@ -74596,11 +74704,11 @@ "repo": "unhammer/org-mru-clock", "unstable": { "version": [ - 20201019, - 824 + 20210113, + 1416 ], - "commit": "1c407b6a577f4a995030574d58f76e78da854742", - "sha256": "166ac0gnn8zamgzn166skdv4i6hs392wrdi8pmdx5s9wa3b60xy3" + "commit": "e08e2ab2b71763f53f2029471057d58f96085a69", + "sha256": "10v1ric4xppx92vv722d50as350pw14cqkjlswi0nqssgihxrk11" }, "stable": { "version": [ @@ -74620,14 +74728,14 @@ "repo": "jeremy-compostella/org-msg", "unstable": { "version": [ - 20201229, - 27 + 20210111, + 2224 ], "deps": [ "htmlize" ], - "commit": "20aac1b7254627c393f3a9e52395ee4d3546d586", - "sha256": "0wvav4g1adqymn6viwf6jmwl41vb6cjkai4n80yk0v4lndw6b1pl" + "commit": "c19f54beebe268833c44a015861bf02531591011", + "sha256": "06c8hlj3zpsx9xsw7xr06db8c61iczyvn3kkwpg54p03sjzmpsnx" } }, { @@ -74638,8 +74746,8 @@ "repo": "akirak/org-multi-wiki", "unstable": { "version": [ - 20201212, - 949 + 20210111, + 1022 ], "deps": [ "dash", @@ -74647,8 +74755,8 @@ "org-ql", "s" ], - "commit": "8e38e1f3c06593b729f6401b6413856efd0264f4", - "sha256": "1jrlngyvbgy6ra59krgdn9gbfpg0aznaaridd95xkr6z78ad1ql7" + "commit": "c9005cbe4077cce3743b680dec97c11fa179bb36", + "sha256": "1428lky09cvlqdb8b9zf0x49cxmigrkhvhi391b2mj2qzgmjzcvm" }, "stable": { "version": [ @@ -74756,8 +74864,8 @@ "repo": "fuxialexander/org-pdftools", "unstable": { "version": [ - 20200929, - 2241 + 20210110, + 2132 ], "deps": [ "org", @@ -74765,8 +74873,8 @@ "org-pdftools", "pdf-tools" ], - "commit": "3c2b9a413eb841c781cfb49d8c343bf07aa0ad1f", - "sha256": "0hk6dldi7ccymypp6rrf370ccgps27yh6z53nhjbzc9phk1pkslm" + "commit": "812bbff3212097bb9f8d2acc4b25826ed45dde92", + "sha256": "1iaswir2fwbhnwlyi2a1h9azgfdsa8m5ydgyckf67a2y5ykwkwv7" } }, { @@ -74951,16 +75059,16 @@ "repo": "fuxialexander/org-pdftools", "unstable": { "version": [ - 20200929, - 2241 + 20210110, + 2052 ], "deps": [ "org", "org-noter", "pdf-tools" ], - "commit": "3c2b9a413eb841c781cfb49d8c343bf07aa0ad1f", - "sha256": "0hk6dldi7ccymypp6rrf370ccgps27yh6z53nhjbzc9phk1pkslm" + "commit": "812bbff3212097bb9f8d2acc4b25826ed45dde92", + "sha256": "1iaswir2fwbhnwlyi2a1h9azgfdsa8m5ydgyckf67a2y5ykwkwv7" } }, { @@ -75064,8 +75172,8 @@ "elnode", "org-present" ], - "commit": "ba7e07af3bd1142e310e868893b919286758a007", - "sha256": "1vzipij1wy3g1lh13igbmf16p16llgnm90ydjrr6mlb35d141i20" + "commit": "dc3be74c544efc4723f5f64f54b4c74b523f0bbd", + "sha256": "0axl2wbkgb5vd7dm471gxw45lxv8za6wfcai15rjrfbhlxckj7l9" } }, { @@ -75329,28 +75437,28 @@ "repo": "oer/org-re-reveal", "unstable": { "version": [ - 20201231, - 909 + 20210111, + 1807 ], "deps": [ "htmlize", "org" ], - "commit": "8f31c73a8950b0e45f244f33274c8e5a32d7f757", - "sha256": "0gnz4vjj968x203j8z8gr98vf4ipgrq8abfmx0xll0i0gynpmyzf" + "commit": "7b536b497edc46e6231f33d2c1eea9cd9a7eabbb", + "sha256": "16kpprrcylrysbpqsz2k47q0qb1yjz9y7az71aik1nskinnml83v" }, "stable": { "version": [ 3, - 5, + 6, 0 ], "deps": [ "htmlize", "org" ], - "commit": "8f31c73a8950b0e45f244f33274c8e5a32d7f757", - "sha256": "0gnz4vjj968x203j8z8gr98vf4ipgrq8abfmx0xll0i0gynpmyzf" + "commit": "7b536b497edc46e6231f33d2c1eea9cd9a7eabbb", + "sha256": "16kpprrcylrysbpqsz2k47q0qb1yjz9y7az71aik1nskinnml83v" } }, { @@ -75361,15 +75469,15 @@ "repo": "oer/org-re-reveal-ref", "unstable": { "version": [ - 20200624, - 615 + 20210104, + 1650 ], "deps": [ "org-re-reveal", "org-ref" ], - "commit": "d60e7b000e863c60485f866f14f552506317f5b4", - "sha256": "03p3fhrllrx42dzx4v2lc4w6bpw5wxgncd8mivg3lqhkm8sb5qwj" + "commit": "2379e224d6acfdba3ee6f0de72805cdfa6b8e0f8", + "sha256": "1467vskijg2n8k7fa2jj2hz8xr2s04r8a89521wmz54cza21g5j4" }, "stable": { "version": [ @@ -75461,10 +75569,11 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20201230, - 2020 + 20210113, + 1549 ], "deps": [ + "bibtex-completion", "dash", "f", "helm", @@ -75476,8 +75585,8 @@ "pdf-tools", "s" ], - "commit": "5e6c1c7319adfdad6bd67debcf332a478e6812df", - "sha256": "1n08ssdq6m2k5721wgnbdniiyc4gp0g7rmxaw17plbkzj6x6qcbf" + "commit": "cd0b4997fad3a050a0092d1458d34286ef5122d2", + "sha256": "1rn9x5p4kmm83smg7c9xalbziliqq02fwfl4v1cgczqyb7vir7nz" }, "stable": { "version": [ @@ -75603,8 +75712,8 @@ "repo": "org-roam/org-roam", "unstable": { "version": [ - 20201225, - 543 + 20210111, + 1138 ], "deps": [ "dash", @@ -75614,8 +75723,8 @@ "org", "s" ], - "commit": "65c0f0dc8cc36261858c31b8c9d1a7fba4ed083c", - "sha256": "08m1lm091nkwmf1462yf7rqmsvxyb2x9qa3wbmr3q86wiw7i5pca" + "commit": "05a9bc44f2d158cc355c904382f2c7b079aeee15", + "sha256": "18s3qp671g28qy1qllnm4lay7mvyar8qcqqjn8yd3417gxwndqhh" }, "stable": { "version": [ @@ -75675,8 +75784,8 @@ "repo": "org-roam/org-roam-server", "unstable": { "version": [ - 20201213, - 1924 + 20210109, + 935 ], "deps": [ "dash", @@ -75686,8 +75795,8 @@ "s", "simple-httpd" ], - "commit": "93b673209d141953547fc0732506bb0efa68f804", - "sha256": "0dlw8997d1p6yvgnskimj5nkv1rv9fkf13k3prq0399y9mqyvh0x" + "commit": "c7793202e9929dc2a415482779141e7b429421ce", + "sha256": "1z29xngyxmq0pd8kfx6z8n8hps4apnffnsi8qc0hvmyhp197hkqc" }, "stable": { "version": [ @@ -75732,19 +75841,20 @@ "repo": "tyler-dodge/org-runbook", "unstable": { "version": [ - 20201229, - 1905 + 20210102, + 1627 ], "deps": [ "dash", "f", "ht", + "ivy", "mustache", "s", "seq" ], - "commit": "63cf17f35d81f78f9ce10f8c99288b978982d4dc", - "sha256": "16axy433zz8mvbvihj4ks4mq2wn28j2jg5b3vgi9mbrv1pybdm1l" + "commit": "a05dcf6b9674406a9d616b53b4f199a3f87b3f2a", + "sha256": "0bj91c8zz804zclhl5ay8k2sjw9pi9mrkrjcmcs2h36klcb1x4qn" }, "stable": { "version": [ @@ -75889,8 +75999,8 @@ "repo": "alhassy/org-special-block-extras", "unstable": { "version": [ - 20201222, - 234 + 20210114, + 2006 ], "deps": [ "dash", @@ -75898,8 +76008,8 @@ "org", "s" ], - "commit": "61ff797d068947a4f1c172bb83aaf5cf897febf1", - "sha256": "112nbh12qgq3wy3p736k8hjzpaa621zv4x2rdbxhaib1il7x7i7p" + "commit": "0c5a7b97be4e5e11093276af310442ab5776ab90", + "sha256": "1311yxmsdb9gms0v20dd7ak0vdkkgda5p89zrp21v4dazjh7rl9a" }, "stable": { "version": [ @@ -76021,11 +76131,11 @@ "repo": "bastibe/org-static-blog", "unstable": { "version": [ - 20201221, - 1630 + 20210113, + 731 ], - "commit": "1dd66614cc54a2051646324c7910e3e295d1cc40", - "sha256": "18fawppxij4yd2w5s1h223v0jpv44dpxbja32w0n9975ip5ciir0" + "commit": "0da4f8cc3a09bdd107da18ab381a4cabb461430d", + "sha256": "1684cxa1qj3b90zckhph7vawwxwa0djpaqwps0vh9p8yngy794z2" }, "stable": { "version": [ @@ -76173,15 +76283,15 @@ "repo": "abrochard/org-sync-snippets", "unstable": { "version": [ - 20190318, - 1744 + 20210111, + 1726 ], "deps": [ "f", "org" ], - "commit": "50cefe5a37196ed1af3d330d6871c3b37fa90d41", - "sha256": "13d1adymxn3b579syyaszgg98h3kh3hwn97pdfzghfli1cd9fb9y" + "commit": "88f995dea188b8a645a3388c42b62a2bb88953d3", + "sha256": "1ggn4y6sczl08mzbnzgjixgl685c71wqqffmng4gl67fs6wr6lrv" } }, { @@ -76965,36 +77075,38 @@ }, { "ename": "organize-imports-java", - "commit": "e38a261ab64a1ce897d997fcfba6f01e9ad969f0", - "sha256": "1m7nqw0mgyjzh0wyqkk6542ibg7d6fx6mgj21gv32js8rcnmkrmv", + "commit": "fe3f9f732a69483bfa86446cd90f0f1c2611cc80", + "sha256": "07wllb95sahlr4rjj29wc59qhgiml9ll84grwd0x5xi04f69ayq4", "fetcher": "github", "repo": "jcs-elpa/organize-imports-java", "unstable": { "version": [ - 20201105, - 540 + 20210113, + 1838 ], "deps": [ "dash", "f", + "ht", "s" ], - "commit": "95cc282063338daf602200ddc140e3bb01a13c44", - "sha256": "0bb6l5kc744dsq650m316fs0a4f9kzvs393wpghl3k1y60i8k227" + "commit": "6e0b1d094bc624a895d198874a8a423dfc033247", + "sha256": "0fhnlzg0gh9bkb471kxgsx69zqk1xybnii4lyv2lshylxac918a6" }, "stable": { "version": [ 0, - 2, - 4 + 3, + 0 ], "deps": [ "dash", "f", + "ht", "s" ], - "commit": "95cc282063338daf602200ddc140e3bb01a13c44", - "sha256": "0bb6l5kc744dsq650m316fs0a4f9kzvs393wpghl3k1y60i8k227" + "commit": "6e0b1d094bc624a895d198874a8a423dfc033247", + "sha256": "0fhnlzg0gh9bkb471kxgsx69zqk1xybnii4lyv2lshylxac918a6" } }, { @@ -77955,15 +78067,15 @@ "repo": "jkitchin/ox-clip", "unstable": { "version": [ - 20191122, - 237 + 20210113, + 1749 ], "deps": [ "htmlize", "org" ], - "commit": "f5eac28734ea33d0b7a3dbe10b777907a91cf9f9", - "sha256": "05ndpkqr4kh2942ygjsa1w53056d60qvl0gmp30dxmzc57v0wb2x" + "commit": "bae9075745f21da2dfce311ae3ca8ad12d75046c", + "sha256": "04hnl7w6hf2jwd788p3p633bdfcziwll8638mlmslpws84iwx905" } }, { @@ -78003,11 +78115,11 @@ "url": "https://git.sr.ht/~abrahms/ox-gemini", "unstable": { "version": [ - 20201125, - 1716 + 20210102, + 1517 ], - "commit": "5b50b6e8d1372955503f01f13ea5c02e4ca16af4", - "sha256": "00jkrnqbkh9nsbjpb7gykgdzzgcq73i4rya6pz4kjvqs76v4npnd" + "commit": "d88c10bcb10fc463fa5a2f6e29c8c94b75a314c0", + "sha256": "1f8kbg5vjd1k7fak3v56b77yk612j6vmzx4xzx3m2vq3f0nyxq29" } }, { @@ -78094,8 +78206,8 @@ "deps": [ "org" ], - "commit": "661eb223fd50b0f3bd683aba92d7fd661b78c2cf", - "sha256": "0kkqg5y0f4bnykv37nvccrq1v745xhj0bs2yknvdji7kx8fs9lns" + "commit": "6bc8ee08023695fa167ac0ddf1fc61e1975fa1ce", + "sha256": "0sb4ms9wd6085g6c6kfjm4bk9z1z02l8dbn15xs9axzksk4zcq6x" }, "stable": { "version": [ @@ -78864,14 +78976,14 @@ "repo": "melpa/package-build", "unstable": { "version": [ - 20201231, - 1321 + 20210113, + 329 ], "deps": [ "cl-lib" ], - "commit": "126565141704faaad428bc82ca4379701d0c7c04", - "sha256": "1advai81xwvahilbj11g2g3rhxzxi7nmfpaq5dlm8g6qi5814n1x" + "commit": "71484efbf5f5df74c0db9936019c2e08f5ef3789", + "sha256": "08w97l0xycnm2z43n51bmgkf38cgaj4jq8p3qxyw3gx76605i8ck" }, "stable": { "version": [ @@ -78908,15 +79020,15 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20200906, - 512 + 20210111, + 341 ], "deps": [ "cl-lib", "let-alist" ], - "commit": "05596996286089acc7693b700c7c31780439e39f", - "sha256": "09ngfyh3l6shqmxzaaidr73r2j7am9il6wimvc4w1lbfvfxdjq7x" + "commit": "348b15a1da1d62dee378b33971e39758b96c6575", + "sha256": "0zj7qxb3b0yrrfwa8n9hhzrnsyh9msf38glmn8r087p27x0ifwzr" }, "stable": { "version": [ @@ -78939,14 +79051,14 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20191116, - 45 + 20210110, + 2231 ], "deps": [ "package-lint" ], - "commit": "05596996286089acc7693b700c7c31780439e39f", - "sha256": "09ngfyh3l6shqmxzaaidr73r2j7am9il6wimvc4w1lbfvfxdjq7x" + "commit": "348b15a1da1d62dee378b33971e39758b96c6575", + "sha256": "0zj7qxb3b0yrrfwa8n9hhzrnsyh9msf38glmn8r087p27x0ifwzr" }, "stable": { "version": [ @@ -79112,19 +79224,19 @@ "repo": "purcell/page-break-lines", "unstable": { "version": [ - 20200305, - 244 + 20210104, + 2224 ], - "commit": "34cd91d841e5334c6966e25fbfd971a2dfbcee69", - "sha256": "0lakwlr9azqkxbh38vak2299m88073ylmza7vjfhdzr9dy1cnxq0" + "commit": "69caea070379f3324c530e96e06625c3cd097cb9", + "sha256": "0plfyzmh93x1r3zgfjyx23cc7vi1pcniipclzlms1iwfkl7zsqvp" }, "stable": { "version": [ 0, - 11 + 14 ], - "commit": "67b5928a7f14568baf2716b5741e13659a86b9ea", - "sha256": "1wp974716ih2cz9kdmdz7xwjy1qnnfzdzlfr9kchknagw8d9nn12" + "commit": "69caea070379f3324c530e96e06625c3cd097cb9", + "sha256": "0plfyzmh93x1r3zgfjyx23cc7vi1pcniipclzlms1iwfkl7zsqvp" } }, { @@ -79219,16 +79331,16 @@ "repo": "abo-abo/pamparam", "unstable": { "version": [ - 20201228, - 1117 + 20210105, + 1513 ], "deps": [ "ivy-posframe", "lispy", "worf" ], - "commit": "66827c3fe86a3e50aa2d594e80cccc0fc1064f3b", - "sha256": "09yawvlhgb03077q1ypjizccps4bjr3vizgbjch4gjxvg14j9948" + "commit": "0ba91149095bee8c43688c68f83f4d365fbe6771", + "sha256": "0459qqhra9zx9klw89s5hjbka1kdh1nvhl6wc7igfklglzw0d7zs" } }, { @@ -79713,20 +79825,20 @@ "repo": "joostkremers/parsebib", "unstable": { "version": [ - 20200513, - 2352 + 20210108, + 1525 ], - "commit": "3497b6068d78ae15ba1eaf94e4315d18e9ae6b00", - "sha256": "0vf9qrkc4dna2f9l0ry1qhfxy7yw1dlilgh38dlp42kqdyp5qny8" + "commit": "25ea94f57c6f3531dd8383f8c5a45ee8d81272bd", + "sha256": "1d3ysh82gh5mg07hlz3ll782lldnaj0xmyabv18jln4y2xd7ncni" }, "stable": { "version": [ 2, - 3, - 3 + 4, + 1 ], - "commit": "683c970a6fb51591bc88ee80e295fedee876e044", - "sha256": "0mpgyy9qfb5x4fvlmb274hgayjbwf0bgk65dxyx31zikjwpcd56p" + "commit": "25ea94f57c6f3531dd8383f8c5a45ee8d81272bd", + "sha256": "1d3ysh82gh5mg07hlz3ll782lldnaj0xmyabv18jln4y2xd7ncni" } }, { @@ -79877,14 +79989,14 @@ "repo": "pjones/passmm", "unstable": { "version": [ - 20181130, - 1612 + 20210109, + 8 ], "deps": [ "password-store" ], - "commit": "b25a92048c788a8477cc5ffe14c0c4a4df19d79a", - "sha256": "1jg2rs010fmw10ld0bfl6x7af3v9yqfy9ga5ixmam3qpilc8c4fw" + "commit": "d78d1bf4f397180d2256248df589f33aafb4c8b4", + "sha256": "0r2nj2p6kx40lhmsv06xsyylj5b9lqji32rc4ipr1biaai52w2b6" }, "stable": { "version": [ @@ -80582,14 +80694,14 @@ "url": "https://git.sr.ht/~yoctocell/peertube", "unstable": { "version": [ - 20201222, - 1655 + 20210101, + 1007 ], "deps": [ "transmission" ], - "commit": "3ce0df17465bcf4ed1a478f7346dbd8a1a2363af", - "sha256": "1p4phw90l91c6xax187011n1n45byyf1pjvsd7mlz0gif78lqz6h" + "commit": "bb529db154596e86327829edbd7144b67cf72255", + "sha256": "1vqlz6s57cqhbmxc9733crhb1z91lrhm0xmwfsq3yb30nfdwlyyb" } }, { @@ -80869,25 +80981,25 @@ "repo": "nex3/perspective-el", "unstable": { "version": [ - 20201218, - 4 + 20210104, + 2243 ], "deps": [ "cl-lib" ], - "commit": "94830c4fc18ac460a217be7c46da4272b2217f43", - "sha256": "1prymf64fhn69mzwnhqnxlid6b7mz0zgxcsc1q5jcbmgns5qm382" + "commit": "2f2b59e693f08b8d9c81062fca25e6076b6e7f8d", + "sha256": "04r5h5zs5r6s22p5ynhpr860r2r552z9pyf4kbabfg1gz9jag7yp" }, "stable": { "version": [ 2, - 13 + 14 ], "deps": [ "cl-lib" ], - "commit": "1eb46847ea563e213e21e65ec65892e37aeda577", - "sha256": "17ldps10ap0yz3z9smdf4cr35xw3wscmqphad8d9ddd2jbqin6xg" + "commit": "2f2b59e693f08b8d9c81062fca25e6076b6e7f8d", + "sha256": "04r5h5zs5r6s22p5ynhpr860r2r552z9pyf4kbabfg1gz9jag7yp" } }, { @@ -81360,11 +81472,11 @@ "repo": "emacs-php/php-mode", "unstable": { "version": [ - 20201120, - 1807 + 20210103, + 1738 ], - "commit": "7e5722c8854d7465c93765653e6ec0897fb7cc7b", - "sha256": "0f4i76rbrhgmq4ba7r560yj0xnlmhv46inlp83bwl7cbcy1r679n" + "commit": "8cdc727e6d4eef81655b90574784e9540f407cda", + "sha256": "1v09ldgdjayj66q8vn97n6hh0zqk3pxqg100ibbcyz6vfrsa5pdm" }, "stable": { "version": [ @@ -81683,11 +81795,11 @@ "repo": "johanclaesson/picpocket", "unstable": { "version": [ - 20180914, - 1819 + 20210103, + 2315 ], - "commit": "6fd88b8711c4370662c0f9c462170187d092a046", - "sha256": "1mdzzxf7xm7zwrpnqqxa27d1cr31pd72d7ilbwljv13qp177a3yw" + "commit": "fa3a49f011b5ae139728548fec7375743f61c7c7", + "sha256": "1vb358jyfs3px70ah60dmlz5azdfkva9xrw3mgrr4060vcy7w4q1" } }, { @@ -82098,11 +82210,11 @@ "repo": "juergenhoetzel/pkgbuild-mode", "unstable": { "version": [ - 20201230, - 1310 + 20210114, + 1506 ], - "commit": "284c78151a73b4813e8d0ff329456826a9fb5622", - "sha256": "1hpnydm6c4rw01cmph16d9rqlnb377v9l9r3gcbj4axfnffgr4py" + "commit": "e4f0067bdce3e071a7d9316a6e142e1c61215169", + "sha256": "1mvn4w3k1wf8yls0mjl667yzlir1qyvxamlzdx62yhqpr9y55sip" }, "stable": { "version": [ @@ -83225,11 +83337,15 @@ "repo": "TatriX/pomidor", "unstable": { "version": [ - 20200722, - 1402 + 20210111, + 919 ], - "commit": "60da23c97c30e08254a914dca411b2e3fd639c99", - "sha256": "19a5155gxz97yqhfxp48d6lnhh0qqai4pd5rg1xy79mq0hxy31p7" + "deps": [ + "alert", + "dash" + ], + "commit": "52134701fa76b12252b06c9d6fd4e8665596a95a", + "sha256": "1h94dgjcbpd6vr1wgvajx7d0ikz5jl4zdmxjgqzff0cg2vqin3r6" }, "stable": { "version": [ @@ -83249,11 +83365,11 @@ "repo": "baudtack/pomodoro.el", "unstable": { "version": [ - 20190201, - 2152 + 20210111, + 1934 ], - "commit": "6cd665ceeaca1f70954aa4caef6f085179f94c69", - "sha256": "08z2nja3bhjgg6k7bb0cr8v02y8gaxkmxmfcvvgiixw3kfrnkpwn" + "commit": "662b1f176d6faddd07be32ee6eb974ca02d5ec03", + "sha256": "02iji913mh03hdlzdl4m7lfzzqp3p7437cay5mn8ba4prpqqz76j" } }, { @@ -83400,14 +83516,14 @@ "repo": "auto-complete/popup-el", "unstable": { "version": [ - 20200610, - 317 + 20210108, + 1821 ], "deps": [ "cl-lib" ], - "commit": "13364d7674535db225789b03da766746734a4f28", - "sha256": "0glwyrks761kpan3ff6a60mqd1hk11yd7rim1fanycmp711k610q" + "commit": "bd5a0df7e5bc68af46eef37afe9e80764a1d4fd8", + "sha256": "1y9wv5c9x1rsfdhh3r7mah7yyx2cs7asjzhgsn1pbq7zdjpv5p0p" }, "stable": { "version": [ @@ -83646,20 +83762,20 @@ "repo": "tumashu/posframe", "unstable": { "version": [ - 20201224, - 2318 + 20210113, + 314 ], - "commit": "ae8ac91744010c8975f07cf18282f58ce56605d0", - "sha256": "1y6d4h0lzgg9xmhswkd0d7rjrqs08mpngylqypycqn90rz0gb6hd" + "commit": "efd7ea490defc53a5b78e7469a3a35d225b766cc", + "sha256": "1in1w9h1hal1qbcqxlk3mqn3q5qpcpni8a2c05dxqaqavbvz2y4j" }, "stable": { "version": [ 0, 8, - 3 + 4 ], - "commit": "f8cb9d6329f96af62ee2e5f401c5430960cf81e1", - "sha256": "022m8abjg0ay531jdkmdrc7y9gl539dprzyrzj7yk6hgmzjx088z" + "commit": "efd7ea490defc53a5b78e7469a3a35d225b766cc", + "sha256": "1in1w9h1hal1qbcqxlk3mqn3q5qpcpni8a2c05dxqaqavbvz2y4j" } }, { @@ -83929,11 +84045,11 @@ "repo": "raxod502/prescient.el", "unstable": { "version": [ - 20201214, - 230 + 20210101, + 2227 ], - "commit": "2af94ce194f9b8d7087f7b49ecd986083f7eb753", - "sha256": "19wwnl72gh4ar2q6gcp6k6n4gdvamdjj6lgc0n4mk7j1qrylp3hf" + "commit": "42adc802d3ba6c747bed7ea1f6e3ffbbdfc7192d", + "sha256": "0v12707jwd2ynk8gp3shgarl6yp3ynal7d4jzds6l2lknr6wi50w" }, "stable": { "version": [ @@ -84563,14 +84679,14 @@ "repo": "bbatsov/projectile", "unstable": { "version": [ - 20201227, - 1430 + 20210104, + 1216 ], "deps": [ "pkg-info" ], - "commit": "1f2887696ec4fa7ecc005f258da276c445db039c", - "sha256": "05xrf805slj793mszkzgckhcwf13lbkr4ns2rkqw59cclj3yly1l" + "commit": "c31bd41c0b9d6fba8837ebfd3a31dec0b3cd73c6", + "sha256": "10pibv07mb3mwmz6r2kmd7xdz5rly7hfbxvhmxd536zbr2s9rr1j" }, "stable": { "version": [ @@ -84994,11 +85110,11 @@ "repo": "ProofGeneral/PG", "unstable": { "version": [ - 20201226, - 2208 + 20210110, + 1959 ], - "commit": "2d94aa0aabf0aa7087f8833e1c61d95a034e2d13", - "sha256": "0gbh8cpz4cd03892jg1rfl2azs3ahbbk7mcsq3pwczf7v4vllqkl" + "commit": "0d731606bee81b2d73895a23b69e84796ea7e4e7", + "sha256": "1j0fhd5cmhx6h3hnk2xb30hn6sxfp1js3zgldqpvk4qrws5vs25h" }, "stable": { "version": [ @@ -85101,8 +85217,8 @@ 20200619, 1742 ], - "commit": "635156e40637d65650e91a21afec10ad8fac5c19", - "sha256": "1xkjb57rbrrhy5fidfmqjhij891i4k3j0cm900464z44s9mq2ypf" + "commit": "48234f5f012582843bb476ee3afef36cda94cb66", + "sha256": "1rn10w72a98k2r98lv3vaq6k8vwasdkc6c1r8lix441hd1jl60gj" }, "stable": { "version": [ @@ -85257,15 +85373,15 @@ "repo": "thierryvolpiatto/psession", "unstable": { "version": [ - 20201111, - 1424 + 20210102, + 1856 ], "deps": [ "async", "cl-lib" ], - "commit": "4856442966f94fd2da486993a8d3e07f190d971f", - "sha256": "12vip32c6pszrvvnfd9k1mngmd4qzh5wvpc3ykjcil1f4mdfnlar" + "commit": "a3fbcbb94a41450c9a5fdbea3b4ac2134c2aa082", + "sha256": "1w0ifzmd35c9rrc1vwas63hz7f1l8w0dlzwikmiiza6jy51qn9dd" }, "stable": { "version": [ @@ -85363,14 +85479,14 @@ "repo": "nbfalcon/ptemplate-templates", "unstable": { "version": [ - 20201129, - 1306 + 20210109, + 2155 ], "deps": [ "ptemplate" ], - "commit": "40cf3031f0fb5bbb75e1f35db3186fd1aabe7262", - "sha256": "046wmvhj5bf68klb4gzb0ijgib89pw2hmm9yrykpi8c8fnvzgdb0" + "commit": "26f1e4d40ac0e89e82c3210591064770f86490bf", + "sha256": "1yjigz22laz0f5m10kcslhg184lsqsfr72samk59l13jpnr676qg" } }, { @@ -85559,14 +85675,11 @@ "repo": "purescript-emacs/purescript-mode", "unstable": { "version": [ - 20200708, - 827 - ], - "deps": [ - "cl-lib" + 20210109, + 244 ], - "commit": "154ad16b61fb9dec83a6c863ffaf92638278f00f", - "sha256": "14046nryg870s366j6hxqpwza0y057hxaiq3kwlnpf1avlzdwhib" + "commit": "8410baff69ba934b64d78340c7fd20aa1e67dbfb", + "sha256": "1gc5rg5rggljmcfz93kz03fy21455nvp7vz79pknqyf8k67aah4h" } }, { @@ -85961,8 +86074,8 @@ "repo": "tumashu/pyim", "unstable": { "version": [ - 20201130, - 309 + 20210109, + 1118 ], "deps": [ "async", @@ -85970,8 +86083,8 @@ "pyim-basedict", "xr" ], - "commit": "e9b46009c0e80f45ad95c64237bf69cb28dc12e7", - "sha256": "06ahzyi2h353xj17mzsm9fxmkc6cyzd1mjzmvqfw8cyv538nijc0" + "commit": "09a3b590cd83bf94b92ea772765db581e3aeb2f1", + "sha256": "0v5b7p8icn9gvdqmbh7xy79xnqi80qhskg00ag8zabmg624mpn2x" }, "stable": { "version": [ @@ -86038,14 +86151,14 @@ "repo": "tumashu/pyim-wbdict", "unstable": { "version": [ - 20200910, - 1445 + 20210111, + 923 ], "deps": [ "pyim" ], - "commit": "8b1f0dfa1c5f5f8e5fb110a0963603ee08d60932", - "sha256": "11y4xa27w8n16181bddxs8w5p7r2mk38l19id69w2xvvaqa36prf" + "commit": "62a1bd8b6070463e872137cf8eba50122b180e2c", + "sha256": "03zh5sdqc32q8an8k59csc95sczcs38ganxrg3lp2i2vn5ykza7h" }, "stable": { "version": [ @@ -86117,8 +86230,8 @@ 20200503, 1624 ], - "commit": "3a065a16f0826f3d46025209b11d30a1fd5b3b49", - "sha256": "1p9q5bnkv7jwy4f7d0fq6c72z7qqcl7vwgq55wh46pzhnrvl4f3d" + "commit": "168bee7f23d9956c12b419b18aa9f5974151e3d7", + "sha256": "00y3klba3m1j43mfggh7pvy93khk1ga1lyb98r5mlfffrymvr209" } }, { @@ -86383,8 +86496,8 @@ "repo": "wbolster/emacs-python-pytest", "unstable": { "version": [ - 20201120, - 2106 + 20210111, + 1046 ], "deps": [ "dash", @@ -86393,8 +86506,8 @@ "s", "transient" ], - "commit": "4a1c4c8915c12e540d41aae1d4e326a2362da541", - "sha256": "11hzh86mmi4hwiwnq1nfn6lizjk3pghi8j4m4cgam2zikapxq0wi" + "commit": "3fadf1f8bc363d57c54eedd1bf98e6d9db9f0a62", + "sha256": "0ij72rjf3qnsbg3zripxyx3lwzliplm24pfrg867dr6lxczkxwv2" }, "stable": { "version": [ @@ -86678,11 +86791,11 @@ "repo": "quelpa/quelpa", "unstable": { "version": [ - 20201022, - 638 + 20210101, + 937 ], - "commit": "6aceac05fb8ab23838adc0d5956c0fc439cc84ce", - "sha256": "1f0wqrqqal6a4grcgxxxn0h6bv7riqhi2gcdh0rnwb19qdaqczdn" + "commit": "42835119977a6512274d8337e866479af4f26dec", + "sha256": "1qqzkk3ym4p3q8b33szmww4ixp1sjmirihnvkgmvfpv0rrc15icc" }, "stable": { "version": [ @@ -86974,15 +87087,15 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20201220, - 1343 + 20210110, + 1607 ], "deps": [ "faceup", "pos-tip" ], - "commit": "6ec7c4c17b2cd7603df6d0e267d99edbdde65794", - "sha256": "19gsxwxdmzis97v7m035abrg028qn5rjsjbwy21mhh3kq0anzryg" + "commit": "871aff8dc5a4bbc6f1d760fdbceb1f71fcf70b1f", + "sha256": "1z8lxaj24ykpa27y6v5zjwmdnaxhd7m8my5q7yxr4inlzyhhgckp" } }, { @@ -88206,8 +88319,8 @@ 20201219, 1739 ], - "commit": "1f46a5ca366f0320dcd5ef9ee84de6e14e162101", - "sha256": "1jixzkswqa8zbj3jf0m8jh5964ffjflm92iwjq7b7py6hyq2ksnk" + "commit": "54d9914b270975e92fec56bcb3911c7335aeed7d", + "sha256": "1v2maw9jpvvfv6a6qkh3nasshf3pjzbqpyxsarhk2054d982qy5c" } }, { @@ -88401,8 +88514,8 @@ 20200814, 435 ], - "commit": "45c0add95025f53ca644a6c8b9afa05b2da3c474", - "sha256": "1dfn7c3gpavpiwd73v2pasd8wd8b62dczhg9iv1cgh8vaqlsf92x" + "commit": "5aa8c1867950b9b2ba6e583271f9c0d715853c5a", + "sha256": "1aypb17k408i4lg9v3fnb5q2n8m3iry4ca4c7axjbvax09dawznk" }, "stable": { "version": [ @@ -88709,14 +88822,14 @@ "repo": "tomterl/repl-toggle", "unstable": { "version": [ - 20201022, - 938 + 20210114, + 932 ], "deps": [ "fullframe" ], - "commit": "68e7e8ef6775a870eb00828e87de09dba65a0fd7", - "sha256": "1brmmh68qcznd0n296ad3547p2awv03kvg1swdz653akci2pkd0n" + "commit": "091aea753f59f2af5c581e73d15b4dd7ee394d94", + "sha256": "0r2zr6dxzml418rmar5v6yw6x1wfbrk89lqqvgsbjfps3yk9b27a" }, "stable": { "version": [ @@ -89153,8 +89266,8 @@ "f", "s" ], - "commit": "29240e4845a44d10134652b427580301318f1288", - "sha256": "0ckaq8z38mj17abzarvq0awsqvwnff22mxa6pgsl7ks67hzq5kb4" + "commit": "5143c92c806fd3a80e6729a42167be9caea88f45", + "sha256": "1kpnk1fhzgiv2dc3y6fk27ina7j11s6siagqpi5fckbbi18hd84i" }, "stable": { "version": [ @@ -89297,15 +89410,15 @@ "repo": "dajva/rg.el", "unstable": { "version": [ - 20201226, - 1050 + 20210113, + 1559 ], "deps": [ "transient", "wgrep" ], - "commit": "7055a673b557de8b886e08e15f9578676d729195", - "sha256": "0jf0z8n292qc3xahj18gl8jj41fdhhbkgi0yjmvv9lmmnj874waz" + "commit": "c34266646951618af916684e954c33a9b1f86085", + "sha256": "12v7x427rwg8q9i7c81bzd4r4jpqwsv0442dahjxiivlrxqdb18h" }, "stable": { "version": [ @@ -89454,8 +89567,8 @@ "repo": "DogLooksGood/emacs-rime", "unstable": { "version": [ - 20201227, - 717 + 20210113, + 742 ], "deps": [ "cl-lib", @@ -89463,8 +89576,8 @@ "popup", "posframe" ], - "commit": "c797c443886aca6083737a3644e45af51f5b6760", - "sha256": "12r94srq41sxnss4b9bqvgccmvmzjgy3hgncb5p4vq26iln2cbxm" + "commit": "8012c6a09195d940c2ba24d7c63974fb5b3b0e51", + "sha256": "0wnx4saydjy6h97hg9277sqykxs2qh7731qs27n5nhxq2rbyw01p" }, "stable": { "version": [ @@ -90203,19 +90316,19 @@ "repo": "purcell/ruby-hash-syntax", "unstable": { "version": [ - 20200304, - 2214 + 20210106, + 224 ], - "commit": "d64036278dcfb4fa0603e6697142e02c2876f634", - "sha256": "02s494r9iy47jd74cd0z1dz1igh8rw2jbyybahy9pivmcn7fnqkr" + "commit": "d458fb5891e0da85271b1cba3ee0ee69ea66a374", + "sha256": "02bjxsi8vbpadwjlhkdgpm4bi091ry9rdvzwnqsr4lh0z7f0ab76" }, "stable": { "version": [ 0, - 6 + 7 ], - "commit": "89fc364a837d7a78ecce34380f09c073a83e30e0", - "sha256": "1nwf3681fa6lfqr14n9wihckpi220hvamv1ppzmrhn4k49vxljy8" + "commit": "d458fb5891e0da85271b1cba3ee0ee69ea66a374", + "sha256": "02bjxsi8vbpadwjlhkdgpm4bi091ry9rdvzwnqsr4lh0z7f0ab76" } }, { @@ -90487,8 +90600,8 @@ "repo": "brotzeit/rustic", "unstable": { "version": [ - 20201219, - 1952 + 20210103, + 1235 ], "deps": [ "dash", @@ -90501,8 +90614,8 @@ "spinner", "xterm-color" ], - "commit": "25d14f1794e55b7ceba4f7560c1fc27b53bcc32d", - "sha256": "0vvqlsmi9idkirz5i1clffrh0jcliigplbib7ayjwpyrbqqlacpx" + "commit": "4570312648cb8d4788f4fe749d67c0fce2de42e4", + "sha256": "1l6b0ljr6xwpjq46qgna2brprj81ppxwzhaj5s1xbwffzi67dc1z" } }, { @@ -90975,8 +91088,8 @@ 20200830, 301 ], - "commit": "4cfbf9985ed25b8ed919d0e59d5af31acdcbe21a", - "sha256": "0a6c6d0gq1v21nxdjrxnbhhfag6lfx452vxjb67syibiplbigndj" + "commit": "85f1e8f2dabb94fb1c853a7c60c1dda07163ac8e", + "sha256": "16cnp54gvkx7kc6kr74mahvjwhkpc7y60c8v16m8n7si6h77lfqd" } }, { @@ -91367,6 +91480,39 @@ } }, { + "ename": "scroll-on-jump", + "commit": "824ab5881f045a43056d9b143cc59267c43aec81", + "sha256": "03ra46xclmxrygpbbf05j9rx2q8qx70cxsqmhygqad5ij75h253k", + "fetcher": "gitlab", + "repo": "ideasman42/emacs-scroll-on-jump", + "unstable": { + "version": [ + 20210103, + 2120 + ], + "commit": "69c86542a148222a7571506a2515fc52529d209d", + "sha256": "00qddxcax55pmfai7083w08mgz6c3876jb5p7fas4j5h417c09yb" + } + }, + { + "ename": "scrollable-quick-peek", + "commit": "bd3e8860d02fcc30ee9692e09cd6492e164c0ec5", + "sha256": "09p63w6chb075agw1k90yg1xka5c6bjyhf70w534pik4jzm42lii", + "fetcher": "github", + "repo": "jpablobr/scrollable-quick-peek", + "unstable": { + "version": [ + 20201224, + 329 + ], + "deps": [ + "quick-peek" + ], + "commit": "3e3492145a61831661d6e97fdcb47b5b66c73287", + "sha256": "0gca860rhvcdjgm6k5pm6spznhg4787dqyjzfixvnffd5l93lcvc" + } + }, + { "ename": "scrollkeeper", "commit": "d9ad5b16ff61c1f8ba1e030ee0988aa51a437022", "sha256": "16wqlyxznall4kmd8l68q4d11qyilj8vsji36h7llprxa2m9pg12", @@ -91731,11 +91877,11 @@ "repo": "raxod502/selectrum", "unstable": { "version": [ - 20201226, - 1908 + 20210114, + 2154 ], - "commit": "4106b216f9b3ccf8960abe89fb9863c570a6f376", - "sha256": "045khkm5b62yagvw0588mmj91b6qapjmp7pzmj0x5i622k83zdxn" + "commit": "3abbfd9bc7d8991cce20202942a5b59a6c8d8dab", + "sha256": "05g0cwyv77ajbbq3ja4bsgh84m1829mqrp5mxg5gbwhjp9xr974r" }, "stable": { "version": [ @@ -91761,8 +91907,8 @@ "prescient", "selectrum" ], - "commit": "2af94ce194f9b8d7087f7b49ecd986083f7eb753", - "sha256": "19wwnl72gh4ar2q6gcp6k6n4gdvamdjj6lgc0n4mk7j1qrylp3hf" + "commit": "42adc802d3ba6c747bed7ea1f6e3ffbbdfc7192d", + "sha256": "0v12707jwd2ynk8gp3shgarl6yp3ynal7d4jzds6l2lknr6wi50w" }, "stable": { "version": [ @@ -92706,8 +92852,8 @@ 20201021, 552 ], - "commit": "085de54acae027e7f0d0b9bf34d3142993234fd3", - "sha256": "14klj49iwykqj1j1q03fvhpj44fg0h4rzh0mbn7xzm4iv0z3222c" + "commit": "f29aadae07bd58689720271b1f6538edfec5c476", + "sha256": "130ydwzpzw4s4h3jhh5h066iib7s9c8xa43imvlvcqs3vghp7p1x" } }, { @@ -92796,6 +92942,21 @@ } }, { + "ename": "show-font-mode", + "commit": "c93262f233f73417528e1d4ec254d1c39970a994", + "sha256": "1yv2b9p7ccv21fznl0j4jxd2gzxhahbisacany0p18v1fbkj9njf", + "fetcher": "github", + "repo": "melissaboiko/show-font-mode", + "unstable": { + "version": [ + 20201225, + 2217 + ], + "commit": "8503be7966d3bd8316039b5f49d3c37c7b97d10c", + "sha256": "188d6fpi8cws0dhlcpgvvixbmf6045vb1r7psbd3sqciv29xm1yh" + } + }, + { "ename": "showtip", "commit": "ae489be43b1aee93614e40f492ebdf0b98a3fbc1", "sha256": "1d5ckka2z0ffwyk9g3h91n3waijj2v7n8kvdks35gcr2yl3yk780", @@ -93466,8 +93627,8 @@ "deps": [ "terminal-focus-reporting" ], - "commit": "0f2dcbeef2f924b7ae57a198472b2e059c92cee0", - "sha256": "05fpzg98a3s2rngyjqk4mp6rwln0x78nkqbsx5izivvx85ss26sq" + "commit": "f2d4031711714b100ec81aac321917c40cf20dc9", + "sha256": "1b3nav38g95iasm1shsmw2xbw2jkgf1djddaknywcff129faqb9f" } }, { @@ -93712,15 +93873,15 @@ "repo": "slime/slime", "unstable": { "version": [ - 20201216, - 2342 + 20210105, + 2148 ], "deps": [ "cl-lib", "macrostep" ], - "commit": "15cf0609d30255405957bf0612fd6291fea438bc", - "sha256": "11zb8aaay1yirql638ssbap4rnxdf6a4lwmqm761grgssk44rqpd" + "commit": "48bfe6cccfdf879cd7137b00eb2ca160665a92f8", + "sha256": "1b3kjxjx30lan77vgiskvh9g5cqz4j44xa221vnh9ccixqwqhhim" }, "stable": { "version": [ @@ -93938,11 +94099,11 @@ "repo": "joaotavora/sly", "unstable": { "version": [ - 20201218, - 2227 + 20210114, + 912 ], - "commit": "613f597ecf72eb5719d4e13a4bfdbeb91373bf09", - "sha256": "0xayq42akw3aliagxxbnfqx6s0q3k6hbjn3r1481fpycs0ifpg9c" + "commit": "eb67be9698794ba66a09f46b7cfffab742863a91", + "sha256": "11yclc8i6gpy26m1yj6bid6da22639zpil1qzj87m5gfvxiv4zg6" }, "stable": { "version": [ @@ -94208,14 +94369,11 @@ "repo": "jojojames/smart-jump", "unstable": { "version": [ - 20201113, - 2039 - ], - "deps": [ - "dumb-jump" + 20210110, + 214 ], - "commit": "8c6e9bdc86ea492fa618361a56a9784cc923b3e1", - "sha256": "0zscn6396bl5g9rdw2p6vv5nf5vgmhx562k9vgb72l5m81lxfvyj" + "commit": "947499023b7c31b99fc172e2a4c1a105ad9c8555", + "sha256": "1yyyh1507lr4dlp39k8slwfz0fdjh2hx5ypn5zx5hyjjncw7x2r7" } }, { @@ -94944,11 +95102,11 @@ "repo": "alphapapa/snow.el", "unstable": { "version": [ - 20201226, - 2348 + 20201231, + 1632 ], - "commit": "d3d7509c89c598be73f912aca34097ad4898794c", - "sha256": "0m3wfjmjnswhvki05jp6ih7k65qg8gj91x1nhvavg7pczd398r29" + "commit": "7ca25adc94148f182ac58c9f5d35f576a8a3131c", + "sha256": "1bpq8611yqvi7w58qylbyd2k7va6cbg12xyj6md7ipnq79wpfy4j" } }, { @@ -95085,14 +95243,14 @@ "repo": "bbatsov/solarized-emacs", "unstable": { "version": [ - 20201207, - 1431 + 20210112, + 1050 ], "deps": [ "dash" ], - "commit": "67f261c7b3d1a041e5c8964df680f8132703fc17", - "sha256": "03x5p135i2rshsvvsls2pl70mslzifzfznd310wiqgscg7vja1wy" + "commit": "93d124962106f4cec72e9c8ab8cb243c581d9d46", + "sha256": "11gsxakwmkymlmm8jjbkxi6ryhvfri06n2g8kh4s6abm15pnq6sh" }, "stable": { "version": [ @@ -95252,14 +95410,14 @@ "repo": "mtreca/emacs-theme-sorcery", "unstable": { "version": [ - 20200929, - 1001 + 20210101, + 1352 ], "deps": [ "autothemer" ], - "commit": "d438fe3f985f19ad0f7244ca780e474df8f31ce5", - "sha256": "01qpdp14vzlq3pzbw14ri1gwmw32lkijxsv1mn6b39m0xmsimnkj" + "commit": "5a1c4445b9e6e09589a299a9962a6973272a0c2f", + "sha256": "1b858049n6nw4qf60fmszjrhl80x7ssh32f7glj722kwy7404kdh" } }, { @@ -95798,11 +95956,11 @@ "repo": "condy0919/spdx.el", "unstable": { "version": [ - 20201219, - 1245 + 20210109, + 1842 ], - "commit": "883b3e32573fad834ee4697924c8e57ac3007344", - "sha256": "09h26kwhh95xngb0p8y88xp8nq5vw4rp1mv960kyx41v5x7mmma6" + "commit": "e451b29f2702c60b664ad1e3e3ae253cfb969fa0", + "sha256": "0am4da6j5mianjj6ib5hf87z5v2q3wc8xlmgmna4mi70rx4bkz3x" } }, { @@ -96470,8 +96628,8 @@ 20200813, 1430 ], - "commit": "a3a4df9875ea6ae21cfb483dfd7b5c92278fb1c3", - "sha256": "1lc8796r5vy4n9nz9q10qy4brzd7c7i7dsjmvci6c9f7blqnz1la" + "commit": "c10f71465a416050ee4b9633aeabaee823ff3ba9", + "sha256": "1a5bblc5sfd0akrvjs2hysjs7a9fz4p6y44l00nmk43yl7bh0678" }, "stable": { "version": [ @@ -96514,11 +96672,11 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20201222, - 709 + 20210113, + 2052 ], - "commit": "f26b37d8c32a033ab4dd7d5c707fd2f2dfccf85e", - "sha256": "0f59v8hmk9j0bfyga8h7ph6xxp72h88ky0g9qq8xisilw209lzji" + "commit": "1fe8720e2e1e8884eac512d28257d655306a9686", + "sha256": "1s99ynhkak2qpfy448yi1iwxss4zwz1p61279xv1771jx7aclcd3" }, "stable": { "version": [ @@ -97423,26 +97581,26 @@ "repo": "nflath/sudo-edit", "unstable": { "version": [ - 20200625, - 142 + 20210108, + 420 ], "deps": [ "cl-lib" ], - "commit": "0e2c32b5e5242d30f8780cbe8e1b1649476cac4d", - "sha256": "1z26i4hzi2mksl4nr8szzlnrnyv96fg7jjddbm5dp5dlmh2pndk1" + "commit": "a7ae1713bb659988bb1465a13b837fbc2d699504", + "sha256": "1hncxbg5lvywzkwvdmzvrz71midy4samjq2vvxxhz90z1y5l8l29" }, "stable": { "version": [ 0, 1, - 0 + 1 ], "deps": [ "cl-lib" ], - "commit": "bcb12aaa0da0c56d851cfa2f1b3ea4afdd2a755b", - "sha256": "1k6sx8k304dw9dlidnxcln9ip9cj3b6i196z98g9n0kcd1js9f99" + "commit": "a7ae1713bb659988bb1465a13b837fbc2d699504", + "sha256": "1hncxbg5lvywzkwvdmzvrz71midy4samjq2vvxxhz90z1y5l8l29" } }, { @@ -97679,11 +97837,11 @@ "repo": "leafOfTree/svelte-mode", "unstable": { "version": [ - 20201009, - 831 + 20210111, + 1314 ], - "commit": "2a19e0aeea9dd90388d86d6adf2339c9c94b73e8", - "sha256": "17xdsgzjd4ys79053nmsfvhmx8c78zizka7hbka4y1j92lqm33gz" + "commit": "266db1fc882efe17bba7033d69ec663ab4cca5f9", + "sha256": "0v1brx89qswf9803spxi9rb02mfppg1fhx7azd9q7wvh4r1n98v3" } }, { @@ -97992,8 +98150,8 @@ "deps": [ "ivy" ], - "commit": "d2891aab7b816aebf21ebd01ce33933a6ac6244f", - "sha256": "12bm5w073mgpj7kvk6596fnw8809nl6vkv288l7vvzx7iimaqzpl" + "commit": "cbce9ce71429c98c67bd76ef15d049ecced042f7", + "sha256": "08lgvpvkhp2i9q73bnr2v17w864rwp6wjnrl3b7qg06dacfs2rvl" }, "stable": { "version": [ @@ -98308,8 +98466,8 @@ "repo": "countvajhula/symex.el", "unstable": { "version": [ - 20201229, - 352 + 20210113, + 1943 ], "deps": [ "dash-functional", @@ -98323,8 +98481,8 @@ "smartparens", "undo-tree" ], - "commit": "a0db2c80ccb6895981a6dfda7ef79fab201825cc", - "sha256": "1rpmxnz5xd02g0cfrn4l2ixh5bb6f9yvpp6n58mpriwdy99ndamn" + "commit": "c535794b539627b26b7e73481e41f3c870d4b33e", + "sha256": "0pyyjbwcacql4l45fi6jxxvrm4alz9rm8pp6abikh5di98yidjm6" }, "stable": { "version": [ @@ -98479,14 +98637,14 @@ "repo": "emacs-berlin/syntactic-close", "unstable": { "version": [ - 20200909, - 1320 + 20210105, + 1400 ], "deps": [ "cl-lib" ], - "commit": "fbeb5c03b3ba94d7302c541ae7281a84de02b499", - "sha256": "1cwfnj0n64q632ldarhf2pg6nvkmw3hldb6kf60b96karp1qsrrc" + "commit": "ffe8b28907973fda775254432f88b55c92b5ae1f", + "sha256": "03qgrchvzw489594s6ghd0wmq53qzlxqsjlcwcnvlj185hg5fiwp" } }, { @@ -98590,11 +98748,11 @@ "repo": "jabranham/system-packages", "unstable": { "version": [ - 20200426, - 1714 + 20210103, + 8 ], - "commit": "92c58d98bc7282df9fd6f24436a105f5f518cde9", - "sha256": "01hj46zgs7a1as0r0x451ag2fb40pp3gyzycvj0gm328grn6vpmk" + "commit": "05add2fe051846e2ecb3c23ef22c41ecc59a1f36", + "sha256": "0n4qr5qqy6hbc1hg4wi1d2ckdl870v5mf9xhv5m9vrlwaphvnnjr" }, "stable": { "version": [ @@ -98949,11 +99107,11 @@ "repo": "saf-dmitry/taskpaper-mode", "unstable": { "version": [ - 20201207, - 1629 + 20210104, + 1044 ], - "commit": "d0199992b268784425b1724bf5899fc2dd22bc2e", - "sha256": "124qnfdcrwqnhpi7l2vgr56jik8yfv0d2rvhmpkv07h4kljrgwli" + "commit": "fe4030a3b44a283dc3e1062d40f2bb7ab08db542", + "sha256": "0y9c40dw9fcrjf9pdqiva12fha6d3yww6yip1g7dadi648hzr0ip" }, "stable": { "version": [ @@ -99134,34 +99292,34 @@ }, { "ename": "telega", - "commit": "e067f03ebe9dd8c90ceaa5a7983483087c74107f", - "sha256": "0n1n1fciwh7jbakdjkx36aq6k0is0c694j3n5dicwvfp7spca7p8", + "commit": "e5d96e72c0fb942e001f3001ce907be0117705a7", + "sha256": "1qn6gw8dqh335am0wx6dnfc7qxw8djypvvzbk5sl1zmzsg562sbq", "fetcher": "github", "repo": "zevlg/telega.el", "unstable": { "version": [ - 20201231, - 918 + 20210114, + 1122 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "3c290b48934a84cff271c10cf60b3b0afe007db0", - "sha256": "0kvi1azzcs25lvibakdqfqcfcjs843mg69nbis8bd92sadgbpzp7" + "commit": "d72bd42f57c0a09c2e91ecb69516b2eaab1991bd", + "sha256": "05czr9wwvqbhrvvslv2nsgip78ayfx4p6lfbdxnq44qjmfvamx0y" }, "stable": { "version": [ 0, 7, - 1 + 9 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "1d28dc209e2acf1a3bf2852cc620b6e412ea73f9", - "sha256": "0h6kj3r36x26v6p4gkzg5s6fv0brlvrf6ycsdwnz27fw5sdb99k7" + "commit": "f87858583ca7c0e4328f3373aa57d715fd25bbb7", + "sha256": "14954lpkd22p3q66lykbl0fvapdly9cll313jrag5qzbcccrxq5j" } }, { @@ -99279,11 +99437,11 @@ "repo": "clarete/templatel", "unstable": { "version": [ - 20201206, - 302 + 20210111, + 521 ], - "commit": "3243c632bf3062eb1c576dd424378a9f419f6013", - "sha256": "1ggid3vfns9j9bxz33cik270fh0m170bal3044xs0mkfncah1q5a" + "commit": "6dd630e5786e500441b5acbfe5868d7172a2dbcf", + "sha256": "1kqxmainf31d1s2qbwanwzp9dij0i6zj9pp3833clnybf4l90cr6" }, "stable": { "version": [ @@ -100216,18 +100374,18 @@ 20200212, 1903 ], - "commit": "20bcade0c3554aefca82e52b982997f2ae5f3aed", - "sha256": "1gpkykhhcs5ccavicym2w7rhg2n9as1cxdcpdapnb8l735pz16sw" + "commit": "442466ab9411594350d4f9ef012f9892d4034773", + "sha256": "0srj6fnk7damyh6snwnvl599iad4ys7dw944vp0d4wpay0sxqvcl" }, "stable": { "version": [ - 2020, - 12, - 21, + 2021, + 1, + 11, 0 ], - "commit": "9f04619abf9ecea78df57fcdc1d0cbe2e4c1f1eb", - "sha256": "1jy54salpfjanvr3qyz23z5lqkfl6m81r1d63v9gvr3hpvbsa801" + "commit": "c72b2fa29856d45c91f5ed6c98fca6d723246977", + "sha256": "1y2hjw2a0dq6vzyfg7hcn09dbw00rfyblzibf5i7s08jbvp2zzin" } }, { @@ -100277,14 +100435,14 @@ "repo": "tidalcycles/Tidal", "unstable": { "version": [ - 20200523, - 833 + 20210107, + 1831 ], "deps": [ "haskell-mode" ], - "commit": "4c79a3314dacd77d3e1327a3cc54361da8dffeec", - "sha256": "0fx7km09f70y7f5wmqs3j126jgryzxp66vbkvri6kcimxja36914" + "commit": "0a3a5f9d0aad689ad87649647944d6dca6c16bb5", + "sha256": "1lrwjxx0a3lalwbpndf751b1wn2yv3j2x58xa5kby63dxnxf77ph" }, "stable": { "version": [ @@ -100307,8 +100465,8 @@ "repo": "ananthakumaran/tide", "unstable": { "version": [ - 20201223, - 432 + 20210105, + 812 ], "deps": [ "cl-lib", @@ -100317,8 +100475,8 @@ "s", "typescript-mode" ], - "commit": "ba09882d88dd0191e9c02c9b4e0fcd74199ff3cc", - "sha256": "1ivr9wj289zhsc4kkzmlbpxvl5nyhj6a0ir23i05fh5j93wc1da0" + "commit": "e622d4d879d8b1de2517962b243146ec18b6cfff", + "sha256": "1963yf9nzx4hgp16c9vyn3drx9ypyni4xrrz1kylkb3mcm10y97v" }, "stable": { "version": [ @@ -100793,8 +100951,8 @@ "deps": [ "cl-lib" ], - "commit": "5bb073fe751d6a839e33c4a7fd043be16a3dbeb2", - "sha256": "0pyjds57kc0y1h6qligxzdx7m61wxzv57bp7al5cvqlg225dswa0" + "commit": "c6ccdc83e85719a8bb07ef715cf5fd06866a479c", + "sha256": "0z8rykhhhwccy0zg6v3gnghfiawqw3afv4pvxr1hrympiyhyvhvp" } }, { @@ -101162,8 +101320,8 @@ 20201101, 1045 ], - "commit": "0472cda711252b06fc07be184449b31933578148", - "sha256": "1ad1aqjmj1imh5zmnmdnwc06sn3rgd3xmksypyi2hnh07r79ynf4" + "commit": "265f36c1e6c8db598742778dc64f9799896f5dc1", + "sha256": "0vf76rrgkpybi67n14g6gn1a7by7b90gxa8rz2m50xl3vdphnibk" }, "stable": { "version": [ @@ -101266,11 +101424,11 @@ "repo": "magit/transient", "unstable": { "version": [ - 20201220, - 1911 + 20210103, + 1546 ], - "commit": "4a2b7fdf75c6940b5b311d930ea26f7e85a08cd4", - "sha256": "0l0pabisi4x61svnrv8namlyc3nl7zpk3pkmfb4s5lx3rqdg8myf" + "commit": "7811dcff825210c17bd15525fb6a98854501af99", + "sha256": "1nwpwviica8fv8q8pfgx0r4888giq48x0phgl2mkvbz8rr6nyn50" }, "stable": { "version": [ @@ -101301,6 +101459,25 @@ } }, { + "ename": "transient-posframe", + "commit": "616910997097f08d49004809cac3d995dcfe4bdc", + "sha256": "1dgcv51ychr575ckykwbz9cvnh6q9li4j11gg0mkqdd0x3srxfsf", + "fetcher": "github", + "repo": "yanghaoxie/transient-posframe", + "unstable": { + "version": [ + 20210102, + 130 + ], + "deps": [ + "posframe", + "transient" + ], + "commit": "dcd898d1d35183a7d4f2c8f0ebcb43b4f8e70ebe", + "sha256": "1aq1vbkww55xplyaa3xagz9z4kdlsxk13x054asnk0dqps4bcgbf" + } + }, + { "ename": "transmission", "commit": "9ed7e414687c0bd82b140a1bd8044084d094d18f", "sha256": "0w0hlr4y4xpcrpvclqqqasggkgrwnzrdib51mhkh3f3mqyiw8gs9", @@ -101308,14 +101485,14 @@ "repo": "holomorph/transmission", "unstable": { "version": [ - 20201217, - 1922 + 20210106, + 2057 ], "deps": [ "let-alist" ], - "commit": "8e7e020cda8513c1dfeba911d0942640c7650348", - "sha256": "0ndcsyfbyhjvpg9asv0awa7dfj2fhzwhg42qx01kyr3bkb6gkjd0" + "commit": "7cf0d739a8a7834d6c3896b62122a0fc6953d371", + "sha256": "1gy4fmjpymabs4z5k3j07di6hqpx6w592w4qvq1iccapy1kqxbj1" }, "stable": { "version": [ @@ -101482,8 +101659,8 @@ "deps": [ "tsc" ], - "commit": "a3aef9113365032d55fedbbe08ab7b04f5268d14", - "sha256": "1n8mxd7fhs2brblrfr5892j5xqgh247d8ngnkhwq6acn8hfxn7qf" + "commit": "e7f2f625c1b9a2dce4f6b16a5affbb4f57337ae0", + "sha256": "0175mr8wqkrv83lyx7q9vbb6j90abqfbd3h1qc1kqb80p03l5vcr" }, "stable": { "version": [ @@ -101506,15 +101683,15 @@ "url": "https://codeberg.org/FelipeLema/tree-sitter-indent.el.git", "unstable": { "version": [ - 20201229, - 1827 + 20201231, + 1842 ], "deps": [ "seq", "tree-sitter" ], - "commit": "a1eddfabb41375eda84178531b944472599c25e7", - "sha256": "179zz3qw0iq7j6xjw9ga6wp5k52s71w7yfnmx0cy5afxn4wivfdi" + "commit": "a11aa84a768cff2d40db7ef0c6029742b7ce46a1", + "sha256": "1zxzmqdyw681vzxwhs7bi4xylqy99v0jajsv03mppsslxl4l2fwm" } }, { @@ -101525,14 +101702,14 @@ "repo": "ubolonton/emacs-tree-sitter", "unstable": { "version": [ - 20201221, - 1340 + 20210113, + 1755 ], "deps": [ "tree-sitter" ], - "commit": "a3aef9113365032d55fedbbe08ab7b04f5268d14", - "sha256": "1n8mxd7fhs2brblrfr5892j5xqgh247d8ngnkhwq6acn8hfxn7qf" + "commit": "e7f2f625c1b9a2dce4f6b16a5affbb4f57337ae0", + "sha256": "0175mr8wqkrv83lyx7q9vbb6j90abqfbd3h1qc1kqb80p03l5vcr" }, "stable": { "version": [ @@ -101591,8 +101768,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20201230, - 1245 + 20210110, + 2030 ], "deps": [ "ace-window", @@ -101605,8 +101782,8 @@ "pfuture", "s" ], - "commit": "bffb1d88eef63434022d26d6f822fb33c929348b", - "sha256": "0i01sxdm0wn7rgjf3g4wazkxdsl4b553l8vmcmas15a9mhzd2ahd" + "commit": "16d757fc697a73cbf7920caf2f598e839e7e0e56", + "sha256": "036chafmgx0zdqa00yb5y0y6lq6mfimlvwhzkdy1n982jgqvk12f" }, "stable": { "version": [ @@ -101635,15 +101812,15 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20200819, - 1950 + 20210107, + 1251 ], "deps": [ "all-the-icons", "treemacs" ], - "commit": "6b045fd585421ab3c9e1185c2508d34af700490b", - "sha256": "0sifzkhyd4k2ffvf2gn6frg7qd28my8w7wy2cqqa4i9gxhbflbsj" + "commit": "16d757fc697a73cbf7920caf2f598e839e7e0e56", + "sha256": "036chafmgx0zdqa00yb5y0y6lq6mfimlvwhzkdy1n982jgqvk12f" } }, { @@ -101654,15 +101831,15 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20200716, - 2041 + 20210107, + 1251 ], "deps": [ "evil", "treemacs" ], - "commit": "6b045fd585421ab3c9e1185c2508d34af700490b", - "sha256": "0sifzkhyd4k2ffvf2gn6frg7qd28my8w7wy2cqqa4i9gxhbflbsj" + "commit": "16d757fc697a73cbf7920caf2f598e839e7e0e56", + "sha256": "036chafmgx0zdqa00yb5y0y6lq6mfimlvwhzkdy1n982jgqvk12f" }, "stable": { "version": [ @@ -101685,14 +101862,14 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20201005, - 1309 + 20210107, + 1251 ], "deps": [ "treemacs" ], - "commit": "6b045fd585421ab3c9e1185c2508d34af700490b", - "sha256": "0sifzkhyd4k2ffvf2gn6frg7qd28my8w7wy2cqqa4i9gxhbflbsj" + "commit": "16d757fc697a73cbf7920caf2f598e839e7e0e56", + "sha256": "036chafmgx0zdqa00yb5y0y6lq6mfimlvwhzkdy1n982jgqvk12f" }, "stable": { "version": [ @@ -101715,16 +101892,16 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20201025, - 957 + 20210107, + 1251 ], "deps": [ "magit", "pfuture", "treemacs" ], - "commit": "6b045fd585421ab3c9e1185c2508d34af700490b", - "sha256": "0sifzkhyd4k2ffvf2gn6frg7qd28my8w7wy2cqqa4i9gxhbflbsj" + "commit": "16d757fc697a73cbf7920caf2f598e839e7e0e56", + "sha256": "036chafmgx0zdqa00yb5y0y6lq6mfimlvwhzkdy1n982jgqvk12f" }, "stable": { "version": [ @@ -101748,16 +101925,16 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20200901, - 1550 + 20210114, + 2135 ], "deps": [ "dash", "persp-mode", "treemacs" ], - "commit": "6b045fd585421ab3c9e1185c2508d34af700490b", - "sha256": "0sifzkhyd4k2ffvf2gn6frg7qd28my8w7wy2cqqa4i9gxhbflbsj" + "commit": "16d757fc697a73cbf7920caf2f598e839e7e0e56", + "sha256": "036chafmgx0zdqa00yb5y0y6lq6mfimlvwhzkdy1n982jgqvk12f" }, "stable": { "version": [ @@ -101781,16 +101958,16 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20200901, - 1550 + 20210114, + 2135 ], "deps": [ "dash", "perspective", "treemacs" ], - "commit": "6b045fd585421ab3c9e1185c2508d34af700490b", - "sha256": "0sifzkhyd4k2ffvf2gn6frg7qd28my8w7wy2cqqa4i9gxhbflbsj" + "commit": "16d757fc697a73cbf7920caf2f598e839e7e0e56", + "sha256": "036chafmgx0zdqa00yb5y0y6lq6mfimlvwhzkdy1n982jgqvk12f" } }, { @@ -101801,15 +101978,15 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20200530, - 2129 + 20210107, + 1251 ], "deps": [ "projectile", "treemacs" ], - "commit": "6b045fd585421ab3c9e1185c2508d34af700490b", - "sha256": "0sifzkhyd4k2ffvf2gn6frg7qd28my8w7wy2cqqa4i9gxhbflbsj" + "commit": "16d757fc697a73cbf7920caf2f598e839e7e0e56", + "sha256": "036chafmgx0zdqa00yb5y0y6lq6mfimlvwhzkdy1n982jgqvk12f" }, "stable": { "version": [ @@ -102066,8 +102243,8 @@ 20201229, 1403 ], - "commit": "a3aef9113365032d55fedbbe08ab7b04f5268d14", - "sha256": "1n8mxd7fhs2brblrfr5892j5xqgh247d8ngnkhwq6acn8hfxn7qf" + "commit": "e7f2f625c1b9a2dce4f6b16a5affbb4f57337ae0", + "sha256": "0175mr8wqkrv83lyx7q9vbb6j90abqfbd3h1qc1kqb80p03l5vcr" }, "stable": { "version": [ @@ -102882,19 +103059,19 @@ "repo": "purcell/unfill", "unstable": { "version": [ - 20200304, - 2218 + 20210106, + 220 ], - "commit": "6a3f9e929489ebac5aa26862363410144d84409e", - "sha256": "0jdk2r6jlynswjz047zz2v3dyfq94inf1zbsriq1b8fmia018gah" + "commit": "8375d87ec184fbe964189e2f9b7263cdb1396694", + "sha256": "0pg64nza2mp4xyr69pjq51jsq1aaym0g38g4jzaxr0hh3w0ris1n" }, "stable": { "version": [ 0, - 2 + 3 ], - "commit": "88186dce0de69e8f4aeaf2bfdc77d62210f19cd8", - "sha256": "0wyradin5igp25nsd3n22i2ppxhmy49ac1iq1w2715v8pfmiydnc" + "commit": "8375d87ec184fbe964189e2f9b7263cdb1396694", + "sha256": "0pg64nza2mp4xyr69pjq51jsq1aaym0g38g4jzaxr0hh3w0ris1n" } }, { @@ -103056,11 +103233,11 @@ "repo": "astoff/unicode-math-input.el", "unstable": { "version": [ - 20190813, - 1436 + 20210110, + 1431 ], - "commit": "ba45edbfb8fa453e29c4c6c73af60f06637951d6", - "sha256": "1sil8lnvpdwk0g30mbqymp6ib325q28a8zn3n9y6j39ngphpkffl" + "commit": "b46fc1d4cc5ab5c2bca3de1e5e43c8f53f1d343b", + "sha256": "1g84ynppdv46lhsrl0bgvdvlkijhzns4knkldgmbdhsjafvnz8cw" } }, { @@ -103475,14 +103652,14 @@ "repo": "jwiegley/use-package", "unstable": { "version": [ - 20201110, - 2133 + 20210106, + 2145 ], "deps": [ "bind-key" ], - "commit": "caa92f1d64fc25480551757d854b4b49981dfa6b", - "sha256": "088kl3bml0rs5bkfymgzr15ram9qvy66h1kaisrbkynh0yxvf8g9" + "commit": "365c73d2618dd0040a32c2601c5456ab5495b812", + "sha256": "10c0rmi5axypx0xy3fib739rjnakl32spwcirzxz1p5r0x9gya4a" }, "stable": { "version": [ @@ -103514,8 +103691,8 @@ "key-chord", "use-package" ], - "commit": "caa92f1d64fc25480551757d854b4b49981dfa6b", - "sha256": "088kl3bml0rs5bkfymgzr15ram9qvy66h1kaisrbkynh0yxvf8g9" + "commit": "365c73d2618dd0040a32c2601c5456ab5495b812", + "sha256": "10c0rmi5axypx0xy3fib739rjnakl32spwcirzxz1p5r0x9gya4a" }, "stable": { "version": [ @@ -103577,8 +103754,8 @@ "system-packages", "use-package" ], - "commit": "caa92f1d64fc25480551757d854b4b49981dfa6b", - "sha256": "088kl3bml0rs5bkfymgzr15ram9qvy66h1kaisrbkynh0yxvf8g9" + "commit": "365c73d2618dd0040a32c2601c5456ab5495b812", + "sha256": "10c0rmi5axypx0xy3fib739rjnakl32spwcirzxz1p5r0x9gya4a" }, "stable": { "version": [ @@ -103667,8 +103844,8 @@ "deps": [ "s" ], - "commit": "74ab3e375f2f6ddf786d7a520319f95203a47d26", - "sha256": "0wjqy000kaqgkkjvg7bq8qnpnma1cy6vl7sqdfsdiqy2952s2wz0" + "commit": "408c01423d7036463891d83e4a21227250ed2a14", + "sha256": "1jz7x93c14f2nm8iqc30kzfjbn5bcdvxxnfljvwj77mwgir2ali8" }, "stable": { "version": [ @@ -103709,17 +103886,17 @@ 20190715, 1836 ], - "commit": "7bc5117d3449fc19f5c706a6decfdb2a30984507", - "sha256": "0fg1amarrwyfq76mv0w5z78qxs1x9vsvmzf7qzvnwh92n7lv6snb" + "commit": "a5ff52bbf608e1112b5c0d41a36e3267f39f4084", + "sha256": "125cv7kwvr1xj52yfb5qlra2li2hikbqnqvqdasn0rq3pkj7f02b" }, "stable": { "version": [ 2, - 6, + 7, 0 ], - "commit": "df2447a63de2fea0f56d8c63d35b0bf39e11c0f2", - "sha256": "1g0s46p8c5kbv1kxvvj838g8hghqbkykv94q6zwy0d7q8ai1kqrq" + "commit": "a5ff52bbf608e1112b5c0d41a36e3267f39f4084", + "sha256": "125cv7kwvr1xj52yfb5qlra2li2hikbqnqvqdasn0rq3pkj7f02b" } }, { @@ -104397,20 +104574,20 @@ "repo": "federicotdn/verb", "unstable": { "version": [ - 20201231, - 1142 + 20210112, + 2239 ], - "commit": "9bdad040c342dfd513f0c65bde5d938f41da24e6", - "sha256": "0pxzl927pmz851fs3zlhggrk9dryh929sqn4kyql6arpf53jsyir" + "commit": "91827971f655936d8a8df95c9d2f39eaee667c97", + "sha256": "1bvvj25shkasy4b14ifkvh195w401xggmhjkflld5frzp7pm6zvp" }, "stable": { "version": [ 2, 13, - 0 + 1 ], - "commit": "e714404d8b190e4c82383f9ffe1ff613f3efebe7", - "sha256": "0116n67d3d26mvifs6a7pn2yvj511nrmmnjkykjfb5i8dhpa0lyq" + "commit": "91827971f655936d8a8df95c9d2f39eaee667c97", + "sha256": "1bvvj25shkasy4b14ifkvh195w401xggmhjkflld5frzp7pm6zvp" } }, { @@ -104882,8 +105059,8 @@ 20201229, 2303 ], - "commit": "ad76c1692e822c0d032e926136011673e9b03aa4", - "sha256": "1j2fb7v8qvs9wkgrfqaddg7sy7w31r9ry25zd2xxhkvda1l80xx7" + "commit": "5b08b9ae9da5b95e42e94e4c9ec01d63e8848ea2", + "sha256": "1zg69lqg7yxxr4bw5lhcs5r8pljqalxqqbzvv3zrcifx7n24qzi9" }, "stable": { "version": [ @@ -105184,11 +105361,11 @@ "repo": "akermu/emacs-libvterm", "unstable": { "version": [ - 20201206, - 205 + 20210111, + 522 ], - "commit": "a670b786539d3c8865d8f68fe0c67a2d4afbf1aa", - "sha256": "0s244crjkbzl2jhp9m4sm1xdhbpxwph0m3jg18livirgajvdz6hn" + "commit": "9d2ef5e535e79781a0c1d2523f82d096eb48765f", + "sha256": "03nslg391cagq9kdxkgyjcw3abfd5xswza5bq8rl8mrp9f8v7i17" } }, { @@ -105386,11 +105563,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20201224, - 4 + 20210105, + 2310 ], - "commit": "085de54acae027e7f0d0b9bf34d3142993234fd3", - "sha256": "14klj49iwykqj1j1q03fvhpj44fg0h4rzh0mbn7xzm4iv0z3222c" + "commit": "f29aadae07bd58689720271b1f6538edfec5c476", + "sha256": "130ydwzpzw4s4h3jhh5h066iib7s9c8xa43imvlvcqs3vghp7p1x" } }, { @@ -105466,8 +105643,8 @@ 20200730, 240 ], - "commit": "7626678315918bdbb81ede68149f20a7d97a928f", - "sha256": "0dlhj32mkylji1d55pc593d3gn8babcs6s4c0c5sfm6jfz14m9j0" + "commit": "5e6deddda7a70f4b79832e9e8b6636418812e162", + "sha256": "195h5dnanicxksag72kp19nvsxsbqb34pr3pk6shki6yca2ks7yg" } }, { @@ -105611,16 +105788,16 @@ "repo": "wanderlust/wanderlust", "unstable": { "version": [ - 20201128, - 2357 + 20210105, + 1556 ], "deps": [ "apel", "flim", "semi" ], - "commit": "5db307a0441b6b7aa4ecfd34344842d78f15611b", - "sha256": "03044c5lq9j5i1a5d0wy195m1n7353g2kjldinbla650fhwjhix1" + "commit": "cf16d1272cd04ccc845476a1db9fb2ab690b0f55", + "sha256": "05mx1g5gqrbzl4p41kxsk2hl15vrfx8nf97xf2zn9c9s8nq0qj0n" } }, { @@ -105993,6 +106170,36 @@ } }, { + "ename": "weblorg", + "commit": "8c9f6e5452a31772f90c1b5a5fa34b5a833073bb", + "sha256": "0gcxksn353zl0kzi387dm3fyy9n4gpjsjy5qlbr7iq4pcby4zbjb", + "fetcher": "github", + "repo": "emacs-love/weblorg", + "unstable": { + "version": [ + 20210111, + 526 + ], + "deps": [ + "templatel" + ], + "commit": "1d0b5b9bc640a7147e1aa42867c7794fb5d039cc", + "sha256": "1fanpp3a40fkwdxc3ixvz6ykvkxh61mq2jxl1dgf0rrxc82mzhms" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "templatel" + ], + "commit": "5ef2daff8498be07ea9b0f50a92d84c8d21d3a49", + "sha256": "14797vv2i3b5dgzdazacw2g9r3i5zam4xr3554xzpq1l8ran0g2p" + } + }, + { "ename": "webpaste", "commit": "13847d91c1780783e516943adee8a3530c757e17", "sha256": "1pqqapslb5wxfrf1ykrj5jxcl43pix17lawgdqrqkv5fyxbhmfpm", @@ -106032,25 +106239,25 @@ "repo": "ahyatt/emacs-websocket", "unstable": { "version": [ - 20201122, - 246 + 20210110, + 17 ], "deps": [ "cl-lib" ], - "commit": "36deb3ff85368d000a88435d5a645ffbab490654", - "sha256": "08q24pp6r8s74bxah6lk0rs9y4bygfpl4pcpw2yngd5i4wajsjvx" + "commit": "34e11124fdd9d73e431499ba8a6b6a8023519664", + "sha256": "066zql1zknnc1dlj9jj4dx7w8y8z2q6i2gnagy3jwwxc8j5pp0c2" }, "stable": { "version": [ 1, - 12 + 13 ], "deps": [ "cl-lib" ], - "commit": "491a60b8bb8a6c3bd081c70354ab82040b0a7db3", - "sha256": "0g0vy2yc118mcka9f26950gdmb780zpxck9y6nli602vj32dw1g2" + "commit": "34e11124fdd9d73e431499ba8a6b6a8023519664", + "sha256": "066zql1zknnc1dlj9jj4dx7w8y8z2q6i2gnagy3jwwxc8j5pp0c2" } }, { @@ -106644,6 +106851,40 @@ } }, { + "ename": "wikinfo", + "commit": "c92d75c776bd5ef84b6e5991f4a9d1398b7044a3", + "sha256": "12vdymysak2d8xn3jklcvl7nw7w7ldkb6jyyvlwsf5z6sk8b3rx8", + "fetcher": "github", + "repo": "progfolio/wikinfo", + "unstable": { + "version": [ + 20210112, + 324 + ], + "commit": "b3c2824ab7cd653741b2b905f5c3279e312857cc", + "sha256": "01l3qwaqrcgrwlvfhxw2db06svcqhiahp6jbn8x8k5fmq7mk5hr3" + } + }, + { + "ename": "wikinforg", + "commit": "536407ae580d8921f40cb1480c0443ad3df5078c", + "sha256": "0v80kaq63h3a2ybfmwk0vm6n6fg4891m9arq6psd0y7f77af9hrs", + "fetcher": "github", + "repo": "progfolio/wikinforg", + "unstable": { + "version": [ + 20201227, + 1454 + ], + "deps": [ + "org", + "wikinfo" + ], + "commit": "8496c243f8d98ba2787b63f7d19fbae3831832d2", + "sha256": "1w7q3badp6r653grsblmnambv99r52c34gmnpdz0f5ybmw83002p" + } + }, + { "ename": "wilt", "commit": "eea4f2ca8b4f9ea93cc02151fdda6cfee5b68b70", "sha256": "0nw6zr06zq60j72qfjmbqrxyz022fnisb0bsh6xmlnd1k1kqlrz6", @@ -106921,11 +107162,11 @@ "repo": "dgtized/winnow.el", "unstable": { "version": [ - 20170903, - 1206 + 20210105, + 1919 ], - "commit": "18cb6b94338f3b7b4f2cd0331dad22f82dd9e0d3", - "sha256": "1wp00zxxcibvl6vjwmvhkgcbi76dyb2g8c30wy4kp7876cpc8hgv" + "commit": "761b15bc31696a4f80c5fd508c84b1f5b4190ec2", + "sha256": "1hl208sl8vq6mjv9a3f4xmj7732jy3mw4bikxcs5c1drlmqr3mxs" } }, { @@ -107036,14 +107277,14 @@ "repo": "magit/with-editor", "unstable": { "version": [ - 20201030, - 1232 + 20210110, + 1545 ], "deps": [ "async" ], - "commit": "6735180e73e787b79535c245b162249b70dbf841", - "sha256": "0hw6i5r3adkm4988badi94825lywkrh3sddiff4z04kj1nj15d0k" + "commit": "139ef3933ea7aa3fe67b87450a6a1ac0895e5c81", + "sha256": "1zdgn2ajpbdxnc7qf98z7590w8y1s0iqj27fv7m8ndkrn8c1cx0x" }, "stable": { "version": [ @@ -107795,11 +108036,11 @@ "repo": "xahlee/xah-elisp-mode", "unstable": { "version": [ - 20201014, - 1717 + 20210112, + 109 ], - "commit": "fd7200afd199a52aea560173689039015aac595d", - "sha256": "0lg5yg1ckbqi5rw8y9jjymdqxl2z8ka959vghkbk7s9h8v6sidpq" + "commit": "134f9d259b68f5c3644dbed203d0d4142e2f3ce9", + "sha256": "15x15dzk67xif8ybnv9jid5xzmwimxx086ysdhryqqzrlxc3igiq" } }, { @@ -107810,11 +108051,11 @@ "repo": "xahlee/xah-find", "unstable": { "version": [ - 20201219, - 552 + 20210111, + 334 ], - "commit": "c66b54d4c683289a41db823df5da73174184c12b", - "sha256": "071y34n995a391v59n0mdz0y210gkx8p4r4p36yzazkrvhmqkjk3" + "commit": "8948fa8f18023868731a1666f9893abc08f370e1", + "sha256": "1qk1scf085fc650km5hx2fp2chxj1a2hwp4bffxmp59mg78qpb71" } }, { @@ -107825,11 +108066,11 @@ "repo": "xahlee/xah-fly-keys", "unstable": { "version": [ - 20201228, - 107 + 20210114, + 751 ], - "commit": "4e273efcc6f94535e58461c2e9cb0d14fd6d7f6d", - "sha256": "0lwyd9kif0lgm1gawv19jmhraabnrqsqpmvh7pd3g1cmyn2chnkh" + "commit": "015ec792050b4df00bb640602903258431ca6a44", + "sha256": "0h8sr9ig5ww2dwg5d22dfndyq68fv5mm1lf99k76wy5dxkqs5w5c" } }, { @@ -107900,11 +108141,11 @@ "repo": "xahlee/xah-replace-pairs", "unstable": { "version": [ - 20201219, - 741 + 20210109, + 1741 ], - "commit": "fa239bf4eaf30858bb40fc8d3c1fa1372faacc42", - "sha256": "1rjclwr4wq7k1bqf9di0smjqyh6aqhzvy7xzj2w28iy6al1b80zw" + "commit": "a051568c21b0bd7907dffebdbe04d0110c038be0", + "sha256": "0z3cvajj5cf23h8lxlj10wm8rxh7vjpnsk8svryx5djd26ffpc11" } }, { @@ -108021,8 +108262,8 @@ "repo": "dandavison/xenops", "unstable": { "version": [ - 20201223, - 923 + 20210103, + 1339 ], "deps": [ "aio", @@ -108033,8 +108274,8 @@ "f", "s" ], - "commit": "902b909cf637dc84178abe897b12ac175f8638fc", - "sha256": "0zl4f64v9avpwfn15lbziangd69f83v7n9hvbsh4d4ipdb3yx9x6" + "commit": "5812aa55a816bb66d90443a6a634069d9fbfecf1", + "sha256": "1nwhrbpqgbcv1467zyjwww6r04k965fkrkc5v3iqzkg88ld43sj0" } }, { @@ -108320,6 +108561,21 @@ } }, { + "ename": "xref-rst", + "commit": "2f6748512dc546f84b13733086cefb158bc7787c", + "sha256": "0crzzalphr4865a78wih085ycscg78h288hlq0dh6qk50siaxk1m", + "fetcher": "gitlab", + "repo": "ideasman42/emacs-xref-rst", + "unstable": { + "version": [ + 20210110, + 640 + ], + "commit": "3e7360553f46461cbcacdb18cbb7a214d55b89f7", + "sha256": "1cqp0azbnhsi7l2xis6b0pwcpn4v40cqx5p79ymhhza8ch8q7rx6" + } + }, + { "ename": "xresources-theme", "commit": "35763febad20f29320d459394f810668db6c3353", "sha256": "1vsbvg9w5g6y2qlb8ssn12ax31r7fbslfi9vcgvmjydcr8r1z0zs", @@ -108845,11 +109101,11 @@ "repo": "emacsorphanage/yascroll", "unstable": { "version": [ - 20201018, - 1346 + 20210108, + 1826 ], - "commit": "cd66d81c5d4ba39da3c385d12d22f7103ecd67c5", - "sha256": "04mhjh163gp2shivxhilpacy22lrd2vswjf7934ldphw8qfahl2f" + "commit": "b9061340cc15a3ace3ca8c6e54512b481c71acf1", + "sha256": "1vr0p3q5pnnqpdfvnz29v8sjsldp22hghqb16gmj7l0n2xnlvyv3" }, "stable": { "version": [ @@ -108917,14 +109173,14 @@ "repo": "AndreaCrotti/yasnippet-snippets", "unstable": { "version": [ - 20201221, - 849 + 20210105, + 1346 ], "deps": [ "yasnippet" ], - "commit": "1f90ffb80e1da458a8cccf09add2f5fd952f1642", - "sha256": "0yg435j6wv4jalfpndqhy8xb0cviak9kpv38yby9zjzcjc9dcsg7" + "commit": "899c027f442587e0f8ef90761f58b27907ca64b4", + "sha256": "1vl2y271y4vlgpnjb1fa24fsd77zmzha2miyqwnf9n9pdd96brjg" }, "stable": { "version": [ @@ -109487,20 +109743,20 @@ "repo": "eutropius225/zenscript-mode", "unstable": { "version": [ - 20201206, - 2129 + 20210102, + 1350 ], - "commit": "5ec8663f3d2e6391f18a9f3a78864bcf6962898a", - "sha256": "1j99gds76dvnkrqrddd1fw6k3f8x7zixdpdv71qsirjw8nvsyhk4" + "commit": "c33b4525502459fe60dd76b383e19919d450aeb8", + "sha256": "0v4limzd9d95wp7f32acln0h245d0zr88jb4a4szl053p6ynvbq0" }, "stable": { "version": [ 1, 2, - 0 + 1 ], - "commit": "5ec8663f3d2e6391f18a9f3a78864bcf6962898a", - "sha256": "1j99gds76dvnkrqrddd1fw6k3f8x7zixdpdv71qsirjw8nvsyhk4" + "commit": "c33b4525502459fe60dd76b383e19919d450aeb8", + "sha256": "0v4limzd9d95wp7f32acln0h245d0zr88jb4a4szl053p6ynvbq0" } }, { @@ -110009,15 +110265,15 @@ "repo": "egh/zotxt-emacs", "unstable": { "version": [ - 20200514, - 423 + 20210115, + 456 ], "deps": [ "deferred", "request" ], - "commit": "63f13c794b165d047867d8e688cd17ae91bad858", - "sha256": "1s15fyg2ib3kpcxpc5i3cp8cayh163937az49agicnfsqwny5cpd" + "commit": "87d8c4836c5f43530db8f00a66b7b69087236875", + "sha256": "01w529yr96kx7xg2w670ci61aljd1alrbqy1qxnj9yiymqsnmys1" }, "stable": { "version": [ diff --git a/pkgs/applications/editors/emacs-modes/rect-mark/default.nix b/pkgs/applications/editors/emacs-modes/rect-mark/default.nix index 4320a88457a..1275c51b99e 100644 --- a/pkgs/applications/editors/emacs-modes/rect-mark/default.nix +++ b/pkgs/applications/editors/emacs-modes/rect-mark/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, emacs}: +{ lib, stdenv, fetchurl, emacs }: stdenv.mkDerivation { name = "rect-mark-1.4"; @@ -25,8 +25,8 @@ stdenv.mkDerivation { meta = { description = "Mark a rectangle of text with highlighting"; homepage = "http://emacswiki.org/emacs/RectangleMark"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix b/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix index 7e611d68a0a..412ed59f2ac 100644 --- a/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix +++ b/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchgit, emacs}: +{ lib, stdenv, fetchgit, emacs }: stdenv.mkDerivation { name = "sunrise-commander-6r435"; @@ -23,8 +23,8 @@ stdenv.mkDerivation { meta = { description = "Two-pane file manager for Emacs based on Dired and inspired by MC"; homepage = "http://www.emacswiki.org/emacs/Sunrise_Commander"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/editors/emacs-modes/sv-kalender/default.nix b/pkgs/applications/editors/emacs-modes/sv-kalender/default.nix index dd553fc1998..ea871ccf414 100644 --- a/pkgs/applications/editors/emacs-modes/sv-kalender/default.nix +++ b/pkgs/applications/editors/emacs-modes/sv-kalender/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, trivialBuild }: +{ fetchurl, lib, trivialBuild }: trivialBuild { pname = "sv-kalender"; diff --git a/pkgs/applications/editors/emacs-modes/tramp/default.nix b/pkgs/applications/editors/emacs-modes/tramp/default.nix index b87390d4609..237c05c5fa7 100644 --- a/pkgs/applications/editors/emacs-modes/tramp/default.nix +++ b/pkgs/applications/editors/emacs-modes/tramp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, emacs, texinfo }: +{ lib, stdenv, fetchurl, emacs, texinfo }: stdenv.mkDerivation rec { name = "tramp-2.4.2"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = { description = "Transparently access remote files from Emacs. Newer versions than built-in."; homepage = "https://www.gnu.org/software/tramp"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/editors/emacs-modes/update-from-overlay b/pkgs/applications/editors/emacs-modes/update-from-overlay index fc5657e4419..886019716d4 100755 --- a/pkgs/applications/editors/emacs-modes/update-from-overlay +++ b/pkgs/applications/editors/emacs-modes/update-from-overlay @@ -2,18 +2,20 @@ #! nix-shell -i bash -p curl nix set -euxo pipefail +export NIXPKGS_ALLOW_BROKEN=1 + # This script piggybacks on the automatic code generation done by the nix-community emacs overlay # You can use this to avoid running lengthy code generation jobs locally curl -s -O https://raw.githubusercontent.com/nix-community/emacs-overlay/master/repos/elpa/elpa-generated.nix -nix-instantiate ../../../.. -A emacsPackagesNg.elpaPackages --show-trace -git diff --exit-code elpa-generated.nix > /dev/null || git commit -m "emacsPackages.elpa-packages: $(date --iso)" -- elpa-generated.nix +nix-instantiate ../../../.. -A emacs.pkgs.elpaPackages --show-trace +git diff --exit-code elpa-generated.nix > /dev/null || git commit -m "emacs.pkgs.elpa-packages: $(date --iso)" -- elpa-generated.nix curl -s -O https://raw.githubusercontent.com/nix-community/emacs-overlay/master/repos/org/org-generated.nix -nix-instantiate ../../../.. -A emacsPackagesNg.orgPackages --show-trace -git diff --exit-code org-generated.nix > /dev/null || git commit -m "emacsPackages.org-packages: $(date --iso)" -- org-generated.nix +nix-instantiate ../../../.. -A emacs.pkgs.orgPackages --show-trace +git diff --exit-code org-generated.nix > /dev/null || git commit -m "emacs.pkgs.org-packages: $(date --iso)" -- org-generated.nix curl -s -O https://raw.githubusercontent.com/nix-community/emacs-overlay/master/repos/melpa/recipes-archive-melpa.json -env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPackages.melpaStablePackages -env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPackages.melpaPackages -git diff --exit-code recipes-archive-melpa.json > /dev/null || git commit -m "emacsPackages.melpa-packages: $(date --iso)" -- recipes-archive-melpa.json +nix-instantiate --show-trace ../../../../ -A emacs.pkgs.melpaStablePackages +nix-instantiate --show-trace ../../../../ -A emacs.pkgs.melpaPackages +git diff --exit-code recipes-archive-melpa.json > /dev/null || git commit -m "emacs.pkgs.melpa-packages: $(date --iso)" -- recipes-archive-melpa.json diff --git a/pkgs/applications/editors/emacs-modes/updater-emacs.nix b/pkgs/applications/editors/emacs-modes/updater-emacs.nix index b5de993eaa7..4c321065445 100644 --- a/pkgs/applications/editors/emacs-modes/updater-emacs.nix +++ b/pkgs/applications/editors/emacs-modes/updater-emacs.nix @@ -1,7 +1,7 @@ let pkgs = import ../../../.. {}; - emacsEnv = (pkgs.emacsPackagesFor pkgs.emacs).emacsWithPackages (epkgs: let + emacsEnv = pkgs.emacs.pkgs.withPackages (epkgs: let promise = epkgs.trivialBuild { pname = "promise"; diff --git a/pkgs/applications/editors/emacs-modes/zeitgeist/default.nix b/pkgs/applications/editors/emacs-modes/zeitgeist/default.nix index c771f5423a9..67bf7b500ff 100644 --- a/pkgs/applications/editors/emacs-modes/zeitgeist/default.nix +++ b/pkgs/applications/editors/emacs-modes/zeitgeist/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, emacs }: +{ lib, stdenv, fetchurl, emacs }: stdenv.mkDerivation { name = "zeitgeist-20120221"; @@ -20,6 +20,6 @@ stdenv.mkDerivation { meta = { description = "Integreate Emacs with Zeitgeist"; homepage = "http://zeitgeist-project.com/"; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index 0f3ececd37d..37707996919 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -7,10 +7,11 @@ , patches ? [ ] }: { stdenv, lib, fetchurl, fetchpatch, ncurses, xlibsWrapper, libXaw, libXpm -, Xaw3d, libXcursor, pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif +, Xaw3d, libXcursor, pkg-config, gettext, libXft, dbus, libpng, libjpeg, libungif , libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux , alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf , jansson, harfbuzz +, dontRecurseIntoAttrs ,emacsPackagesFor , libgccjit, targetPlatform, makeWrapper # native-comp params , systemd ? null , withX ? !stdenv.isDarwin @@ -40,9 +41,7 @@ assert withGTK3 -> !withGTK2 && gtk3-x11 != null; assert withXwidgets -> withGTK3 && webkitgtk != null; -let - -in stdenv.mkDerivation (lib.optionalAttrs nativeComp { +let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp { NATIVE_FULL_AOT = "1"; LIBRARY_PATH = "${lib.getLib stdenv.cc.libc}/lib"; } // lib.optionalAttrs stdenv.isDarwin { @@ -93,7 +92,7 @@ in stdenv.mkDerivation (lib.optionalAttrs nativeComp { "" ]; - nativeBuildInputs = [ pkgconfig makeWrapper ] + nativeBuildInputs = [ pkg-config makeWrapper ] ++ lib.optionals srcRepo [ autoreconfHook texinfo ] ++ lib.optional (withX && (withGTK3 || withXwidgets)) wrapGAppsHook; @@ -175,6 +174,7 @@ in stdenv.mkDerivation (lib.optionalAttrs nativeComp { passthru = { inherit nativeComp; + pkgs = dontRecurseIntoAttrs (emacsPackagesFor emacs); }; meta = with lib; { @@ -201,4 +201,5 @@ in stdenv.mkDerivation (lib.optionalAttrs nativeComp { separately. ''; }; -}) +}); +in emacs diff --git a/pkgs/applications/editors/emacs/macport.nix b/pkgs/applications/editors/emacs/macport.nix index dd9a6673458..3c57d3bc81a 100644 --- a/pkgs/applications/editors/emacs/macport.nix +++ b/pkgs/applications/editors/emacs/macport.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls, gettext, autoconf, automake, jansson +{ lib, stdenv, fetchurl, ncurses, pkg-config, texinfo, libxml2, gnutls, gettext, autoconf, automake, jansson , AppKit, Carbon, Cocoa, IOKit, OSAKit, Quartz, QuartzCore, WebKit , ImageCaptureCore, GSS, ImageIO # These may be optional }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig autoconf automake ]; + nativeBuildInputs = [ pkg-config autoconf automake ]; buildInputs = [ ncurses libxml2 gnutls texinfo gettext jansson AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit diff --git a/pkgs/applications/editors/featherpad/default.nix b/pkgs/applications/editors/featherpad/default.nix index dee0fe72ebb..c73238ce366 100644 --- a/pkgs/applications/editors/featherpad/default.nix +++ b/pkgs/applications/editors/featherpad/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, pkgconfig, qmake, qttools, qtbase, qtsvg, qtx11extras, fetchFromGitHub }: +{ lib, mkDerivation, pkg-config, qmake, qttools, qtbase, qtsvg, qtx11extras, fetchFromGitHub }: mkDerivation rec { pname = "featherpad"; version = "0.10.0"; @@ -10,7 +10,7 @@ mkDerivation rec { sha256 = "1wrbs6kni9s3x39cckm9kzpglryxn5vyarilvh9pafbzpc6rc57p"; }; - nativeBuildInputs = [ qmake pkgconfig qttools ]; + nativeBuildInputs = [ qmake pkg-config qttools ]; buildInputs = [ qtbase qtsvg qtx11extras ]; meta = with lib; { diff --git a/pkgs/applications/editors/flpsed/default.nix b/pkgs/applications/editors/flpsed/default.nix index 871d8489f61..bffa5064389 100644 --- a/pkgs/applications/editors/flpsed/default.nix +++ b/pkgs/applications/editors/flpsed/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { postPatch = '' # replace the execvp call to ghostscript - sed -e '/exec_gs/ {n; s|"gs"|"${stdenv.lib.getBin ghostscript}/bin/gs"|}' \ + sed -e '/exec_gs/ {n; s|"gs"|"${lib.getBin ghostscript}/bin/gs"|}' \ -i src/GsWidget.cxx ''; diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix index 1a5ce245153..d47c315f613 100644 --- a/pkgs/applications/editors/focuswriter/default.nix +++ b/pkgs/applications/editors/focuswriter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, qmake, qttools, hunspell, qtbase, qtmultimedia, mkDerivation }: +{ lib, fetchurl, pkg-config, qmake, qttools, hunspell, qtbase, qtmultimedia, mkDerivation }: mkDerivation rec { pname = "focuswriter"; @@ -9,7 +9,7 @@ mkDerivation rec { sha256 = "0h85f6cs9zbxv118mjfxqfv41j19zkx2xq36mpnlmrlzkjj7dx9l"; }; - nativeBuildInputs = [ pkgconfig qmake qttools ]; + nativeBuildInputs = [ pkg-config qmake qttools ]; buildInputs = [ hunspell qtbase qtmultimedia ]; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix index e6752386718..e77b63218c3 100644 --- a/pkgs/applications/editors/geany/default.nix +++ b/pkgs/applications/editors/geany/default.nix @@ -2,7 +2,7 @@ , fetchurl , gtk3 , which -, pkgconfig +, pkg-config , intltool , file , libintl @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config intltool libintl which diff --git a/pkgs/applications/editors/ghostwriter/default.nix b/pkgs/applications/editors/ghostwriter/default.nix index 4da73d0d2e6..f0ae7ef5f3e 100644 --- a/pkgs/applications/editors/ghostwriter/default.nix +++ b/pkgs/applications/editors/ghostwriter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, pkgconfig, qttools, qtwebengine, hunspell }: +{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, pkg-config, qttools, qtwebengine, hunspell }: mkDerivation rec { pname = "ghostwriter"; @@ -11,7 +11,7 @@ mkDerivation rec { sha256 = "sha256-Ag97iE++f3nG2zlwqn0qxSL9RpF8O3XWH9NtQ5kFuWg="; }; - nativeBuildInputs = [ qmake pkgconfig qttools ]; + nativeBuildInputs = [ qmake pkg-config qttools ]; buildInputs = [ qtwebengine hunspell ]; diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index 6c91595c99a..198185e469d 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -25,7 +25,7 @@ , ostree , pcre , pcre2 -, pkgconfig +, pkg-config , python3 , sysprof , template-glib @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { version = "3.38.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "06wcyfrwcjyj2vcqyw0z3sy1r4qxpcdpwqq1qmpsaphpz8acycjn"; }; @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { gtk-doc meson ninja - pkgconfig + pkg-config python3 python3.pkgs.wrapPython wrapGAppsHook diff --git a/pkgs/applications/editors/gnome-latex/default.nix b/pkgs/applications/editors/gnome-latex/default.nix index 692e07e52ca..7967b78f13c 100644 --- a/pkgs/applications/editors/gnome-latex/default.nix +++ b/pkgs/applications/editors/gnome-latex/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, wrapGAppsHook, gsettings-desktop-schemas, gspell, gtksourceview4, libgee -, tepl, amtk, gnome3, glib, pkgconfig, intltool, itstool, libxml2 }: +, tepl, amtk, gnome3, glib, pkg-config, intltool, itstool, libxml2 }: let version = "3.38.0"; pname = "gnome-latex"; @@ -7,7 +7,7 @@ in stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0xqd49pgi82dygqnxj08i1v22b0vwwhx3zvdinhrx4jny339yam8"; }; @@ -15,7 +15,7 @@ in stdenv.mkDerivation { configureFlags = ["--disable-dconf-migration"]; nativeBuildInputs = [ - pkgconfig + pkg-config wrapGAppsHook itstool intltool diff --git a/pkgs/applications/editors/gobby/default.nix b/pkgs/applications/editors/gobby/default.nix index 4dc7ea33cdd..27047f8e95a 100644 --- a/pkgs/applications/editors/gobby/default.nix +++ b/pkgs/applications/editors/gobby/default.nix @@ -1,19 +1,21 @@ { avahiSupport ? false # build support for Avahi in libinfinity -, lib, stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, wrapGAppsHook, yelp-tools +, lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, wrapGAppsHook, yelp-tools , gtkmm3, gsasl, gtksourceview3, libxmlxx, libinfinity, intltool, itstool, gnome3 }: let libinf = libinfinity.override { gtkWidgets = true; inherit avahiSupport; }; -in stdenv.mkDerivation { - name = "gobby-unstable-2018-04-03"; +in stdenv.mkDerivation rec { + pname = "gobby"; + version = "0.6.0"; + src = fetchFromGitHub { owner = "gobby"; repo = "gobby"; - rev = "ea4df27c9b6b885434797b0071ce198b23f9f63b"; - sha256 = "0q7lq64yn16lxvj4jphs8y9194h0xppj8k7y9x8b276krraak2az"; + rev = "v${version}"; + sha256 = "06cbc2y4xkw89jaa0ayhgh7fxr5p2nv3jjs8h2xcbbbgwaw08lk0"; }; - nativeBuildInputs = [ autoconf automake pkgconfig intltool itstool yelp-tools wrapGAppsHook ]; + nativeBuildInputs = [ autoconf automake pkg-config intltool itstool yelp-tools wrapGAppsHook ]; buildInputs = [ gtkmm3 gsasl gtksourceview3 libxmlxx libinf ]; preConfigure = "./autogen.sh"; @@ -21,7 +23,7 @@ in stdenv.mkDerivation { meta = with lib; { homepage = "http://gobby.0x539.de/"; description = "A GTK-based collaborative editor supporting multiple documents in one session and a multi-user chat"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; maintainers = [ maintainers.phreedom ]; platforms = platforms.all; }; diff --git a/pkgs/applications/editors/hecate/default.nix b/pkgs/applications/editors/hecate/default.nix index a0fdcfbb3f6..5429497d209 100644 --- a/pkgs/applications/editors/hecate/default.nix +++ b/pkgs/applications/editors/hecate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { version = "0.0.1"; diff --git a/pkgs/applications/editors/hexdino/default.nix b/pkgs/applications/editors/hexdino/default.nix index 5d782aa1abc..f92a4557ac7 100644 --- a/pkgs/applications/editors/hexdino/default.nix +++ b/pkgs/applications/editors/hexdino/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, ncurses }: +{ lib, fetchFromGitHub, rustPlatform, ncurses }: rustPlatform.buildRustPackage { pname = "hexdino"; diff --git a/pkgs/applications/editors/hexedit/default.nix b/pkgs/applications/editors/hexedit/default.nix index 916dd4a1594..56b721842a3 100644 --- a/pkgs/applications/editors/hexedit/default.nix +++ b/pkgs/applications/editors/hexedit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses }: +{ lib, stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { pname = "hexedit"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "View and edit files in hexadecimal or in ASCII"; homepage = "http://prigaux.chez.com/hexedit.html"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/editors/howl/default.nix b/pkgs/applications/editors/howl/default.nix index 975016d5541..2c959519f41 100644 --- a/pkgs/applications/editors/howl/default.nix +++ b/pkgs/applications/editors/howl/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, makeWrapper, pkgconfig, gtk3, librsvg }: +{ lib, stdenv, fetchurl, makeWrapper, pkg-config, gtk3, librsvg }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "howl"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # The Makefile uses "/usr/local" if not explicitly overridden installFlags = [ "PREFIX=$(out)" ]; - nativeBuildInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = [ gtk3 librsvg ]; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/jed/default.nix b/pkgs/applications/editors/jed/default.nix index e3be0139abf..7b197be0e6f 100644 --- a/pkgs/applications/editors/jed/default.nix +++ b/pkgs/applications/editors/jed/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip +{ lib, stdenv, fetchzip , pkg-config , gpm , libXext @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { install -D src/objs/rgrep $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A programmable text editor written around S-Lang"; longDescription = '' JED is a freely available text editor for Unix, VMS, MSDOS, OS/2, BeOS, diff --git a/pkgs/applications/editors/jetbrains/common.nix b/pkgs/applications/editors/jetbrains/common.nix index 43dbd137f78..62f1178866c 100644 --- a/pkgs/applications/editors/jetbrains/common.nix +++ b/pkgs/applications/editors/jetbrains/common.nix @@ -5,7 +5,7 @@ { name, product, version, src, wmClass, jdk, meta }: -with stdenv.lib; +with lib; let loName = toLower product; hiName = toUpper product; @@ -71,8 +71,8 @@ with stdenv; lib.makeOverridable mkDerivation rec { item=${desktopItem} makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${execName}" \ - --prefix PATH : "$out/libexec/${name}:${lib.optionalString (stdenv.isDarwin) "${jdk}/jdk/Contents/Home/bin:"}${stdenv.lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \ - --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ + --prefix PATH : "$out/libexec/${name}:${lib.optionalString (stdenv.isDarwin) "${jdk}/jdk/Contents/Home/bin:"}${lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ # Some internals want libstdc++.so.6 stdenv.cc.cc.lib libsecret libnotify @@ -86,6 +86,6 @@ with stdenv; lib.makeOverridable mkDerivation rec { ln -s "$item/share/applications" $out/share ''; -} // stdenv.lib.optionalAttrs (!(meta.license.free or true)) { +} // lib.optionalAttrs (!(meta.license.free or true)) { preferLocalBuild = true; } diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index d805d179647..c2415cf4f21 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -5,7 +5,7 @@ , vmopts ? null }: -with stdenv.lib; +with lib; let mkJetBrainsProduct = callPackage ./common.nix { inherit vmopts; }; @@ -271,7 +271,7 @@ in name = "clion-${version}"; version = "2020.3.1"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; sha256 = "1jfvwir79s0kcqmlx6bbkmc42bplgl7814mnqfcsdzni1qv62pws"; /* updated by script */ @@ -284,7 +284,7 @@ in name = "datagrip-${version}"; version = "2020.3.1"; /* updated by script */ description = "Your Swiss Army Knife for Databases and SQL"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; sha256 = "0jk7ywxk983ld5x71a59dh1hvlnli3sbvg7fbicahas5ml8clxfv"; /* updated by script */ @@ -297,7 +297,7 @@ in name = "goland-${version}"; version = "2020.3.1"; /* updated by script */ description = "Up and Coming Go IDE"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; sha256 = "12gi1a2bmafmy7qgqwv3a7b5b46dlhw4ahmkm5pkq6pmxl4y6dmk"; /* updated by script */ @@ -308,12 +308,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2020.3.1"; /* updated by script */ + version = "2020.3.2"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "0am4h8w1dmjl08iphqy78ivb91vkrvskg95dgm24zcj0n8rwmaq6"; /* updated by script */ + sha256 = "0zkjmvi27b69xrkn4s6f5788n5yn044phgf48kamfqfs37q4xf1d"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA RELEASE"; @@ -321,12 +321,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2020.3.1"; /* updated by script */ + version = "2020.3.2"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"; - sha256 = "1kwz0aq4b664awppakj4syppk218nynwxv4ngc7pa3k9v4g2sdah"; /* updated by script */ + sha256 = "1vac21d9p52z4k1dl903rc2dbbcf873xbg8rx1fp9nsaaphnc9lq"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA RELEASE"; @@ -334,12 +334,12 @@ in mps = buildMps rec { name = "mps-${version}"; - version = "2020.2.3"; /* updated by script */ + version = "2020.3"; /* updated by script */ description = "Create your own domain-specific language"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/mps/2020.2/MPS-${version}.tar.gz"; - sha256 = "1wd3d8pc155m54y5p2056p0x93v2nv9457i7la53ibbs7rj1j7kw"; /* updated by script */ + url = "https://download.jetbrains.com/mps/2020.3/MPS-${version}.tar.gz"; + sha256 = "0dr1z2sxarz1xif4swxx28hpzsyjd86m0c3xdaw5lmpqwqlzvc5h"; /* updated by script */ }; wmClass = "jetbrains-mps"; update-channel = "MPS RELEASE"; @@ -349,7 +349,7 @@ in name = "phpstorm-${version}"; version = "2020.3.1"; /* updated by script */ description = "Professional IDE for Web and PHP developers"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; sha256 = "1c5j3mbg8scsl4c90cjahdk5gs5q72y5a8fhkqa9zmy6di42k99x"; /* updated by script */ @@ -362,7 +362,7 @@ in name = "pycharm-community-${version}"; version = "2020.3.2"; /* updated by script */ description = "PyCharm Community Edition"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; sha256 = "1z3w6aah635fdrhrzp5af6sgj269jk7mv8vgdd83gxillkx9vq9k"; /* updated by script */ @@ -375,7 +375,7 @@ in name = "pycharm-professional-${version}"; version = "2020.3.2"; /* updated by script */ description = "PyCharm Professional Edition"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; sha256 = "1fbb8v40q7vgn5v5dyxb211abr8swnxa3gw18kh3vlk6yc2crzfw"; /* updated by script */ @@ -388,7 +388,7 @@ in name = "rider-${version}"; version = "2020.3.2"; /* updated by script */ description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz"; sha256 = "1dkgbd2nqkjcswf7j3pnrsaq9n5wk42abz2c4wgkrh1zrpgihd0j"; /* updated by script */ @@ -401,7 +401,7 @@ in name = "ruby-mine-${version}"; version = "2020.3.1"; /* updated by script */ description = "The Most Intelligent Ruby and Rails IDE"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; sha256 = "0drxzz6k0cmhir4szg8nwmsi9qh380vrryghmpvx9w83yrcain4c"; /* updated by script */ @@ -412,12 +412,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2020.3.1"; /* updated by script */ + version = "2020.3.2"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "1bfq3xwnfz6f04d0lq584q7pg775a8y35b1b62w81dbfh43l4fj0"; /* updated by script */ + sha256 = "1jpa4gfy0xmmscjqca4pvvwvh4h3lg02nbf1m5wcsjdcywbk9y40"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WebStorm RELEASE"; diff --git a/pkgs/applications/editors/jove/default.nix b/pkgs/applications/editors/jove/default.nix index 4a22c4d4d95..0b60b9474bd 100644 --- a/pkgs/applications/editors/jove/default.nix +++ b/pkgs/applications/editors/jove/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , groff , ncurses , makeWrapper @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { --prefix PATH ":" "$out/bin" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Jonathan's Own Version or Emacs"; homepage = "https://github.com/jonmacs/jove"; license = licenses.bsd2; diff --git a/pkgs/applications/editors/jucipp/default.nix b/pkgs/applications/editors/jucipp/default.nix index 53549986ed2..95b41ba5caf 100644 --- a/pkgs/applications/editors/jucipp/default.nix +++ b/pkgs/applications/editors/jucipp/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchgit, dconf, gtksourceview3, at-spi2-core, gtksourceviewmm, - boost, epoxy, cmake, aspell, llvmPackages, libgit2, pkgconfig, pcre, +{ lib, stdenv, fetchgit, dconf, gtksourceview3, at-spi2-core, gtksourceviewmm, + boost, epoxy, cmake, aspell, llvmPackages, libgit2, pkg-config, pcre, libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts, gtkmm3, coreutils, glibc, dbus, openssl, libxml2, gnumake, ctags }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "juicipp"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { sha256 = "0xp6ijnrggskjrvscp204bmdpz48l5a8nxr9abp17wni6akb5wiq"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; buildInputs = [ dbus openssl @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { lintIncludes = let p = "arguments.emplace_back(\"-I"; e = "\");"; - v = stdenv.lib.getVersion llvmPackages.clang; + v = lib.getVersion llvmPackages.clang; in p+llvmPackages.libcxx+"/include/c++/v1"+e +p+llvmPackages.clang-unwrapped+"/lib/clang/"+v+"/include/"+e @@ -61,11 +61,11 @@ stdenv.mkDerivation rec { sed -i 's|liblldb LIBLLDB_LIBRARIES|liblldb LIBNOTHING|g' CMakeLists.txt sed -i 's|> arguments;|> arguments; ${lintIncludes}|g' src/source_clang.cc ''; - cmakeFlags = [ "-DLIBLLDB_LIBRARIES=${stdenv.lib.makeLibraryPath [ llvmPackages.lldb ]}/liblldb.so" ]; + cmakeFlags = [ "-DLIBLLDB_LIBRARIES=${lib.makeLibraryPath [ llvmPackages.lldb ]}/liblldb.so" ]; postInstall = '' mv $out/bin/juci $out/bin/.juci makeWrapper "$out/bin/.juci" "$out/bin/juci" \ - --set PATH "${stdenv.lib.makeBinPath [ ctags coreutils llvmPackages.clang.cc cmake gnumake llvmPackages.clang.bintools llvmPackages.clang ]}" \ + --set PATH "${lib.makeBinPath [ ctags coreutils llvmPackages.clang.cc cmake gnumake llvmPackages.clang.bintools llvmPackages.clang ]}" \ --set NO_AT_BRIDGE 1 \ --set ASPELL_CONF "dict-dir ${aspellDicts.en}/lib/aspell" ''; diff --git a/pkgs/applications/editors/jupyter-kernels/iruby/gemset.nix b/pkgs/applications/editors/jupyter-kernels/iruby/gemset.nix index 1ba77a058ea..59630f0a53d 100644 --- a/pkgs/applications/editors/jupyter-kernels/iruby/gemset.nix +++ b/pkgs/applications/editors/jupyter-kernels/iruby/gemset.nix @@ -426,4 +426,4 @@ }; version = "8.2.0"; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix index 67a2ac5fac7..93a9e1a05a6 100644 --- a/pkgs/applications/editors/kakoune/default.nix +++ b/pkgs/applications/editors/kakoune/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, ncurses, asciidoc, docbook_xsl, libxslt, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, ncurses, asciidoc, docbook_xsl, libxslt, pkg-config }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "kakoune-unwrapped"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "091qzk0qs7hql0q51hix99srgma35mhdnjfd5ncfba1bmc1h8x5i"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses asciidoc docbook_xsl libxslt ]; makeFlags = [ "debug=no" ]; diff --git a/pkgs/applications/editors/kakoune/plugins/default.nix b/pkgs/applications/editors/kakoune/plugins/default.nix index 168c1d06b31..950229baee0 100644 --- a/pkgs/applications/editors/kakoune/plugins/default.nix +++ b/pkgs/applications/editors/kakoune/plugins/default.nix @@ -13,4 +13,5 @@ kak-prelude = pkgs.callPackage ./kak-prelude.nix { }; kak-vertical-selection = pkgs.callPackage ./kak-vertical-selection.nix { }; openscad-kak = pkgs.callPackage ./openscad.kak.nix { }; + quickscope-kak = pkgs.callPackage ./quickscope.kak.nix { }; } diff --git a/pkgs/applications/editors/kakoune/plugins/kak-auto-pairs.nix b/pkgs/applications/editors/kakoune/plugins/kak-auto-pairs.nix index 4b67f760976..36842f999a5 100644 --- a/pkgs/applications/editors/kakoune/plugins/kak-auto-pairs.nix +++ b/pkgs/applications/editors/kakoune/plugins/kak-auto-pairs.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { name = "kak-auto-pairs"; version = "2020-07-14"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { cp -r rc $out/share/kak/autoload/plugins/auto-pairs ''; - meta = with stdenv.lib; + meta = with lib; { description = "Kakoune extension to enable automatic closing of pairs"; homepage = "https://github.com/alexherbo2/auto-pairs.kak"; license = licenses.unlicense; diff --git a/pkgs/applications/editors/kakoune/plugins/kak-buffers.nix b/pkgs/applications/editors/kakoune/plugins/kak-buffers.nix index eaf20aeadf8..7075ae3ef0a 100644 --- a/pkgs/applications/editors/kakoune/plugins/kak-buffers.nix +++ b/pkgs/applications/editors/kakoune/plugins/kak-buffers.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, lib }: stdenv.mkDerivation { name = "kak-buffers"; version = "2019-04-03"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { cp -r buffers.kak $out/share/kak/autoload/plugins ''; - meta = with stdenv.lib; + meta = with lib; { description = "Ease navigation between opened buffers in Kakoune"; homepage = "https://github.com/Delapouite/kakoune-buffers"; license = licenses.mit; diff --git a/pkgs/applications/editors/kakoune/plugins/kak-fzf.nix b/pkgs/applications/editors/kakoune/plugins/kak-fzf.nix index 8a91f829c0c..b52584b4456 100644 --- a/pkgs/applications/editors/kakoune/plugins/kak-fzf.nix +++ b/pkgs/applications/editors/kakoune/plugins/kak-fzf.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, fzf }: +{ lib, stdenv, fetchFromGitHub, fzf }: -assert stdenv.lib.asserts.assertOneOf "fzf" fzf.pname [ "fzf" "skim" ]; +assert lib.asserts.assertOneOf "fzf" fzf.pname [ "fzf" "skim" ]; stdenv.mkDerivation { name = "kak-fzf"; @@ -29,7 +29,7 @@ stdenv.mkDerivation { cp -r rc $out/share/kak/autoload/plugins/fzf ''; - meta = with stdenv.lib; + meta = with lib; { description = "Kakoune plugin that brings integration with fzf"; homepage = "https://github.com/andreyorst/fzf.kak"; license = licenses.mit; diff --git a/pkgs/applications/editors/kakoune/plugins/kak-powerline.nix b/pkgs/applications/editors/kakoune/plugins/kak-powerline.nix index d328e47f7e1..318ae2958b6 100644 --- a/pkgs/applications/editors/kakoune/plugins/kak-powerline.nix +++ b/pkgs/applications/editors/kakoune/plugins/kak-powerline.nix @@ -1,12 +1,12 @@ -{ stdenv, git, fetchFromGitHub }: +{ stdenv, git, fetchFromGitHub, lib }: stdenv.mkDerivation { name = "kak-powerline"; - version = "2019-07-23"; + version = "2020-08-22"; src = fetchFromGitHub { - owner = "andreyorst"; + owner = "jdugan6240"; repo = "powerline.kak"; - rev = "82b01eb6c97c7380b7da253db1fd484a5de13ea4"; - sha256 = "1480wp2jc7c84z1wqmpf09lzny6kbnbhiiym2ffaddxrd4ns9i6z"; + rev = "d641b2cd8024f872bcda23f9256e7aff36da02ae"; + sha256 = "65948f5ef3ab2f46f6d186ad752665c251d887631d439949decc2654a67958a4"; }; configurePhase = '' @@ -19,9 +19,9 @@ stdenv.mkDerivation { cp -r rc $out/share/kak/autoload/plugins/powerline ''; - meta = with stdenv.lib; + meta = with lib; { description = "Kakoune modeline, but with passion"; - homepage = "https://github.com/andreyorst/powerline.kak"; + homepage = "https://github.com/jdugan6240/powerline.kak"; license = licenses.mit; maintainers = with maintainers; [ nrdxp ]; platform = platforms.all; diff --git a/pkgs/applications/editors/kakoune/plugins/kak-prelude.nix b/pkgs/applications/editors/kakoune/plugins/kak-prelude.nix index 8fd5fba7d7e..e6f06f4b8e6 100644 --- a/pkgs/applications/editors/kakoune/plugins/kak-prelude.nix +++ b/pkgs/applications/editors/kakoune/plugins/kak-prelude.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { name = "kak-prelude"; - version = "2020-03-15"; + version = "2020-06-09"; src = fetchFromGitHub { owner = "alexherbo2"; repo = "prelude.kak"; - rev = "05b2642b1e014bd46423f9d738cc38a624947b63"; - sha256 = "180p8hq8z7mznzd9w9ma5as3ijs7zbzcj96prcpswqg263a0b329"; + rev = "f1e0f4d5cb62a36924e3f8ba6824d6aed8c19d23"; + sha256 = "1pncr8azqvl2z9yvzhc68p1s9fld8cvak8yz88zgrp5ypx2cxl8c"; }; installPhase = '' @@ -15,7 +15,7 @@ stdenv.mkDerivation { cp -r rc $out/share/kak/autoload/plugins/prelude ''; - meta = with stdenv.lib; + meta = with lib; { description = "Prelude of shell blocks for Kakoune."; homepage = "https://github.com/alexherbo2/prelude.kak"; license = licenses.unlicense; diff --git a/pkgs/applications/editors/kakoune/plugins/kak-vertical-selection.nix b/pkgs/applications/editors/kakoune/plugins/kak-vertical-selection.nix index 7658ba0f7ad..2ef9d44854f 100644 --- a/pkgs/applications/editors/kakoune/plugins/kak-vertical-selection.nix +++ b/pkgs/applications/editors/kakoune/plugins/kak-vertical-selection.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, lib }: stdenv.mkDerivation { name = "kak-vertical-selection"; version = "2019-04-11"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { cp -r vertical-selection.kak $out/share/kak/autoload/plugins ''; - meta = with stdenv.lib; + meta = with lib; { description = "Select up and down lines that match the same pattern in Kakoune"; homepage = "https://github.com/occivink/kakoune-vertical-selection"; license = licenses.unlicense; diff --git a/pkgs/applications/editors/kakoune/plugins/quickscope.kak.nix b/pkgs/applications/editors/kakoune/plugins/quickscope.kak.nix new file mode 100644 index 00000000000..8e60e17e792 --- /dev/null +++ b/pkgs/applications/editors/kakoune/plugins/quickscope.kak.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, fetchgit, lua5_3 }: + +stdenv.mkDerivation rec { + pname = "quickscope-kak"; + version = "1.0.0"; + + src = fetchgit { + url = "https://git.sr.ht/~voroskoi/quickscope.kak"; + rev = "v${version}"; + sha256 = "0y1g3zpa2ql8l9rl5i2w84bka8a09kig9nq9zdchaff5pw660mcx"; + }; + + buildInputs = [ lua5_3 ]; + + installPhase = '' + mkdir -p $out/share/kak/autoload/plugins/ + cp quickscope.* $out/share/kak/autoload/plugins/ + # substituteInPlace does not like the pipe + sed -e 's,[|] *lua,|${lua5_3}/bin/lua,' quickscope.kak >$out/share/kak/autoload/plugins/quickscope.kak + ''; + + meta = with lib; { + description = "Highlight f and t jump positions"; + homepage = "https://sr.ht/~voroskoi/quickscope.kak/"; + license = licenses.unlicense; + maintainers = with maintainers; [ eraserhd ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/editors/kdevelop5/kdev-php.nix b/pkgs/applications/editors/kdevelop5/kdev-php.nix index 23c8f0698cf..44b4fd7bc19 100644 --- a/pkgs/applications/editors/kdevelop5/kdev-php.nix +++ b/pkgs/applications/editors/kdevelop5/kdev-php.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules ]; buildInputs = [ kdevelop-pg-qt threadweaver ktexteditor kdevelop-unwrapped ]; + dontWrapQtApps = true; + meta = with lib; { maintainers = [ maintainers.aanderse ]; platforms = platforms.linux; diff --git a/pkgs/applications/editors/kdevelop5/kdev-python.nix b/pkgs/applications/editors/kdevelop5/kdev-python.nix index 041c25f1728..0567ee39d7d 100644 --- a/pkgs/applications/editors/kdevelop5/kdev-python.nix +++ b/pkgs/applications/editors/kdevelop5/kdev-python.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules ]; buildInputs = [ threadweaver ktexteditor kdevelop-unwrapped ]; + dontWrapQtApps = true; + meta = with lib; { maintainers = [ maintainers.aanderse ]; platforms = platforms.linux; diff --git a/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix b/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix index 27cf579734e..e1478ef6a03 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix +++ b/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, pkgconfig, extra-cmake-modules, qtbase }: +{ lib, stdenv, fetchurl, cmake, pkg-config, extra-cmake-modules, qtbase }: let pname = "kdevelop-pg-qt"; @@ -13,10 +13,12 @@ stdenv.mkDerivation rec { sha256 = "0ay6m6j6zgrbcm48f14bass83bk4w5qnx76xihc05p69i9w32ff1"; }; - nativeBuildInputs = [ cmake pkgconfig extra-cmake-modules ]; + nativeBuildInputs = [ cmake pkg-config extra-cmake-modules ]; buildInputs = [ qtbase ]; + dontWrapQtApps = true; + meta = with lib; { maintainers = [ maintainers.ambrop72 ]; platforms = platforms.linux; @@ -26,6 +28,6 @@ stdenv.mkDerivation rec { It is used for some KDevelop-languagesupport-plugins (Ruby, PHP, CSS...). ''; homepage = "https://www.kdevelop.org"; - license = with stdenv.lib.licenses; [ lgpl2Plus ]; + license = with lib.licenses; [ lgpl2Plus ]; }; } diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix index d8f41664e66..b54015de7b8 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop.nix +++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix @@ -1,5 +1,5 @@ -{ mkDerivation, lib, fetchurl, cmake, gettext, pkgconfig, extra-cmake-modules +{ mkDerivation, lib, fetchurl, cmake, gettext, pkg-config, extra-cmake-modules , qtquickcontrols, qtwebkit, qttools, kde-cli-tools, qtbase , kconfig, kdeclarative, kdoctools, kiconthemes, ki18n, kitemmodels, kitemviews , kjobwidgets, kcmutils, kio, knewstuff, knotifyconfig, kparts, ktexteditor @@ -10,15 +10,15 @@ mkDerivation rec { pname = "kdevelop"; - version = "5.6.0"; + version = "5.6.1"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "0cpmavxz5fi0f1rjinvn6id1nplvjwg00l0n36s0ybygqkacgb9q"; + sha256 = "02ip5r67hjfpywkm3mz86n6wbqcr7996ifzfd2fyzsvm4998hi4y"; }; nativeBuildInputs = [ - cmake gettext pkgconfig extra-cmake-modules makeWrapper + cmake gettext pkg-config extra-cmake-modules makeWrapper ]; buildInputs = [ diff --git a/pkgs/applications/editors/kibi/default.nix b/pkgs/applications/editors/kibi/default.nix index 07454d331c6..71833be3300 100644 --- a/pkgs/applications/editors/kibi/default.nix +++ b/pkgs/applications/editors/kibi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , rustPlatform }: diff --git a/pkgs/applications/editors/kodestudio/default.nix b/pkgs/applications/editors/kodestudio/default.nix index d7f00a2e18a..e0704cdbc85 100644 --- a/pkgs/applications/editors/kodestudio/default.nix +++ b/pkgs/applications/editors/kodestudio/default.nix @@ -111,7 +111,7 @@ in # Wrap preload libXss wrapProgram $out/bin/kodestudio \ - --prefix LD_PRELOAD : ${stdenv.lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1 + --prefix LD_PRELOAD : ${lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1 ''; meta = with lib; { diff --git a/pkgs/applications/editors/leafpad/default.nix b/pkgs/applications/editors/leafpad/default.nix index d37a2de2866..2f53df97d32 100644 --- a/pkgs/applications/editors/leafpad/default.nix +++ b/pkgs/applications/editors/leafpad/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, intltool, pkgconfig, gtk2 }: +{ lib, stdenv, fetchurl, intltool, pkg-config, gtk2 }: stdenv.mkDerivation rec { version = "0.8.18.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0b0az2wvqgvam7w0ns1j8xp2llslm1rx6h7zcsy06a7j0yp257cm"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ intltool gtk2 ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix index ff5b6e3862e..52acc8ee50b 100644 --- a/pkgs/applications/editors/lighttable/default.nix +++ b/pkgs/applications/editors/lighttable/default.nix @@ -4,7 +4,7 @@ }: let - libPath = stdenv.lib.makeLibraryPath [ + libPath = lib.makeLibraryPath [ stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3 nss fontconfig gdk-pixbuf cairo cups expat libgpgerror alsaLib nspr gnome2.GConf xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst diff --git a/pkgs/applications/editors/manuskript/default.nix b/pkgs/applications/editors/manuskript/default.nix index deeb9b36c71..49dafe8fc1a 100644 --- a/pkgs/applications/editors/manuskript/default.nix +++ b/pkgs/applications/editors/manuskript/default.nix @@ -1,4 +1,4 @@ -{ stdenv, zlib, fetchFromGitHub, python3Packages, wrapQtAppsHook }: +{ lib, zlib, fetchFromGitHub, python3Packages, wrapQtAppsHook }: python3Packages.buildPythonApplication rec { pname = "manuskript"; @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { --replace sample-projects $out/share/${pname}/sample-projects ''; - buildPhase = ''''; + buildPhase = ""; installPhase = '' mkdir -p $out/share/${pname} @@ -55,8 +55,8 @@ python3Packages.buildPythonApplication rec { outline your story. Organize your ideas about the world your characters live in. ''; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.steveej ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.steveej ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/editors/mg/default.nix b/pkgs/applications/editors/mg/default.nix index 8878e01de67..ea5e162fdde 100644 --- a/pkgs/applications/editors/mg/default.nix +++ b/pkgs/applications/editors/mg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, ncurses, buildPackages }: +{ lib, stdenv, fetchFromGitHub, pkg-config, ncurses, buildPackages }: stdenv.mkDerivation rec { pname = "mg"; @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - makeFlags = [ "PKG_CONFIG=${buildPackages.pkgconfig}/bin/${buildPackages.pkgconfig.targetPrefix}pkg-config" ]; + makeFlags = [ "PKG_CONFIG=${buildPackages.pkg-config}/bin/${buildPackages.pkg-config.targetPrefix}pkg-config" ]; installPhase = '' install -m 555 -Dt $out/bin mg install -m 444 -Dt $out/share/man/man1 mg.1 ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses ]; diff --git a/pkgs/applications/editors/mindforger/default.nix b/pkgs/applications/editors/mindforger/default.nix index a8e60cddfbb..512e0f12441 100644 --- a/pkgs/applications/editors/mindforger/default.nix +++ b/pkgs/applications/editors/mindforger/default.nix @@ -4,7 +4,7 @@ , qmake , qtbase , qtwebkit -, lib, stdenv +, lib , wrapGAppsHook }: diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix index 9b576795be0..e5fde3e501e 100644 --- a/pkgs/applications/editors/monodevelop/default.nix +++ b/pkgs/applications/editors/monodevelop/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl -, autoconf, automake, pkgconfig, shared-mime-info, intltool +, autoconf, automake, pkg-config, shared-mime-info, intltool , glib, mono, gtk-sharp-2_0, gnome2, gnome-sharp, unzip , dotnetPackages }: @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { patchFlags = [ "-p2" ]; patches = [ ./git-revert-12d610fb3f6dce121df538e36f21d8c2eeb0a6e3.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoconf automake shared-mime-info intltool mono gtk-sharp-2_0 gnome-sharp unzip @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { 2a3,5 > export MONO_GAC_PREFIX=${gnome-sharp}:${gtk-sharp-2_0}:\$MONO_GAC_PREFIX > export PATH=${mono}/bin:\$PATH - > export LD_LIBRARY_PATH=${stdenv.lib.makeLibraryPath [ glib gnome2.libgnomeui gnome2.gnome_vfs gnome-sharp gtk-sharp-2_0 gtk-sharp-2_0.gtk ]}:\$LD_LIBRARY_PATH + > export LD_LIBRARY_PATH=${lib.makeLibraryPath [ glib gnome2.libgnomeui gnome2.gnome_vfs gnome-sharp gtk-sharp-2_0 gtk-sharp-2_0.gtk ]}:\$LD_LIBRARY_PATH > EOF done diff --git a/pkgs/applications/editors/music/tuxguitar/default.nix b/pkgs/applications/editors/music/tuxguitar/default.nix index e7cd319b820..63be87ee86c 100644 --- a/pkgs/applications/editors/music/tuxguitar/default.nix +++ b/pkgs/applications/editors/music/tuxguitar/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { wrapProgram $out/bin/tuxguitar \ --set JAVA "${jdk}/bin/java" \ - --prefix LD_LIBRARY_PATH : "$out/lib/:${stdenv.lib.makeLibraryPath [ swt alsaLib jack2 fluidsynth libpulseaudio ]}" \ + --prefix LD_LIBRARY_PATH : "$out/lib/:${lib.makeLibraryPath [ swt alsaLib jack2 fluidsynth libpulseaudio ]}" \ --prefix CLASSPATH : "${swt}/jars/swt.jar:$out/lib/tuxguitar.jar:$out/lib/itext.jar" ''; diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index bd8ad4b3d20..cb53eb9d9d4 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, fetchFromGitHub, ncurses, texinfo, writeScript +{ lib, stdenv, fetchurl, fetchFromGitHub, ncurses, texinfo, writeScript , common-updater-scripts, git, nix, nixfmt, coreutils, gnused, nixosTests , gettext ? null, enableNls ? true, enableTiny ? false }: assert enableNls -> (gettext != null); -with stdenv.lib; +with lib; let nixSyntaxHighlight = fetchFromGitHub { @@ -16,11 +16,11 @@ let in stdenv.mkDerivation rec { pname = "nano"; - version = "5.4"; + version = "5.5"; src = fetchurl { url = "mirror://gnu/nano/${pname}-${version}.tar.xz"; - sha256 = "1sc6xl9935k9s9clkv83hapijka4qknfnj6f15c3b1i2n84396gy"; + sha256 = "0jkyd3yzcidnvnj1k9bmplzlbd303x6xxblpp5np7zs1kfzq22rr"; }; nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; @@ -30,8 +30,8 @@ in stdenv.mkDerivation rec { configureFlags = [ "--sysconfdir=/etc" - (stdenv.lib.enableFeature enableNls "nls") - (stdenv.lib.enableFeature enableTiny "tiny") + (lib.enableFeature enableNls "nls") + (lib.enableFeature enableTiny "tiny") ]; postInstall = '' @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { #!${stdenv.shell} set -o errexit PATH=${ - stdenv.lib.makeBinPath [ + lib.makeBinPath [ common-updater-scripts git nixfmt diff --git a/pkgs/applications/editors/nano/nanorc/default.nix b/pkgs/applications/editors/nano/nanorc/default.nix index 54442fc21f4..fcec55871aa 100644 --- a/pkgs/applications/editors/nano/nanorc/default.nix +++ b/pkgs/applications/editors/nano/nanorc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, writeScript, nixosTests, common-updater-scripts +{ lib, stdenv, fetchFromGitHub, writeScript, nixosTests, common-updater-scripts , coreutils, git, gnused, nix, nixfmt }: let @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { #!${stdenv.shell} set -o errexit PATH=${ - stdenv.lib.makeBinPath [ + lib.makeBinPath [ common-updater-scripts coreutils git @@ -51,8 +51,8 @@ in stdenv.mkDerivation rec { meta = { description = "Improved Nano Syntax Highlighting Files"; homepage = "https://github.com/scopatz/nanorc"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ nequissimus ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ nequissimus ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/editors/nedit/default.nix b/pkgs/applications/editors/nedit/default.nix index feaba31734c..5a523c05d79 100644 --- a/pkgs/applications/editors/nedit/default.nix +++ b/pkgs/applications/editors/nedit/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ motif libXpm ]; # the linux config works fine on darwin too! - buildFlags = stdenv.lib.optional (stdenv.isLinux || stdenv.isDarwin) "linux"; + buildFlags = lib.optional (stdenv.isLinux || stdenv.isDarwin) "linux"; NIX_CFLAGS_COMPILE="-DBUILD_UNTESTED_NEDIT -L${motif}/lib"; diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index b4ad25f60c2..3e5de3d5fc1 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, cmake, gettext, msgpack, libtermkey, libiconv -, libuv, lua, ncurses, pkgconfig +{ lib, stdenv, fetchFromGitHub, cmake, gettext, msgpack, libtermkey, libiconv +, libuv, lua, ncurses, pkg-config , unibilium, xsel, gperf , libvterm-neovim , glibcLocales ? null, procps ? null @@ -9,7 +9,7 @@ , nodejs ? null, fish ? null, python ? null }: -with stdenv.lib; +with lib; let neovimLuaEnv = lua.withPackages(ps: @@ -74,7 +74,7 @@ in nativeBuildInputs = [ cmake gettext - pkgconfig + pkg-config ]; # extra programs test via `make functionaltest` @@ -104,11 +104,11 @@ in # triggers on buffer overflow bug while running tests hardeningDisable = [ "fortify" ]; - preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.isDarwin '' substituteInPlace src/nvim/CMakeLists.txt --replace " util" "" ''; - postInstall = stdenv.lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.isLinux '' sed -i -e "s|'xsel|'${xsel}/bin/xsel|g" $out/share/nvim/runtime/autoload/provider/clipboard.vim ''; diff --git a/pkgs/applications/editors/neovim/gnvim/default.nix b/pkgs/applications/editors/neovim/gnvim/default.nix index f1d56584e49..208339c2e38 100644 --- a/pkgs/applications/editors/neovim/gnvim/default.nix +++ b/pkgs/applications/editors/neovim/gnvim/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, gtk, webkitgtk }: +{ lib, rustPlatform, fetchFromGitHub, gtk, webkitgtk }: rustPlatform.buildRustPackage rec { pname = "gnvim-unwrapped"; diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/applications/editors/neovim/neovim-remote.nix index 06beff03f90..867e2275128 100644 --- a/pkgs/applications/editors/neovim/neovim-remote.nix +++ b/pkgs/applications/editors/neovim/neovim-remote.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, pythonPackages }: +{ lib, fetchFromGitHub, pythonPackages }: -with stdenv.lib; +with lib; pythonPackages.buildPythonApplication rec { pname = "neovim-remote"; diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index 111e84e6343..5c6c6c1a8d5 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -7,7 +7,7 @@ , pythonPackages , python3Packages }: -with stdenv.lib; +with lib; neovim: @@ -37,7 +37,7 @@ let [ "--set" "NVIM_SYSTEM_RPLUGIN_MANIFEST" "${placeholder "out"}/rplugin.vim" ]; in symlinkJoin { - name = "neovim-${stdenv.lib.getVersion neovim}"; + name = "neovim-${lib.getVersion neovim}"; # Remove the symlinks created by symlinkJoin which we need to perform # extra actions upon postBuild = lib.optionalString stdenv.isLinux '' diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix index eb4698c69d6..9206b296b9a 100644 --- a/pkgs/applications/editors/netbeans/default.nix +++ b/pkgs/applications/editors/netbeans/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, makeDesktopItem, which, unzip, libicns, imagemagick +{ lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, which, unzip, libicns, imagemagick , jdk, perl, python }: @@ -34,7 +34,7 @@ stdenv.mkDerivation { mkdir -pv $out/bin cp -a netbeans $out makeWrapper $out/netbeans/bin/netbeans $out/bin/netbeans \ - --prefix PATH : ${stdenv.lib.makeBinPath [ jdk which ]} \ + --prefix PATH : ${lib.makeBinPath [ jdk which ]} \ --prefix JAVA_HOME : ${jdk.home} \ --add-flags "--jdkhome ${jdk.home}" @@ -61,8 +61,8 @@ stdenv.mkDerivation { meta = { description = "An integrated development environment for Java, C, C++ and PHP"; homepage = "https://netbeans.apache.org/"; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ sander rszibele asbachb ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ sander rszibele asbachb ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/editors/notepadqq/default.nix b/pkgs/applications/editors/notepadqq/default.nix index cd4fe34ef33..545d64ef512 100644 --- a/pkgs/applications/editors/notepadqq/default.nix +++ b/pkgs/applications/editors/notepadqq/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, pkgconfig, which, qtbase, qtsvg, qttools, qtwebkit }: +{ mkDerivation, lib, fetchFromGitHub, pkg-config, which, qtbase, qtsvg, qttools, qtwebkit }: mkDerivation rec { pname = "notepadqq"; @@ -12,7 +12,7 @@ mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig which qttools + pkg-config which qttools ]; buildInputs = [ diff --git a/pkgs/applications/editors/nvi/default.nix b/pkgs/applications/editors/nvi/default.nix index ed08954f8ba..328aad29efa 100644 --- a/pkgs/applications/editors/nvi/default.nix +++ b/pkgs/applications/editors/nvi/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, ncurses }: +{ fetchurl, lib, stdenv, ncurses }: stdenv.mkDerivation { name = "nvi-1.79"; @@ -50,7 +50,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.bostic.com/vi/"; description = "The Berkeley Vi Editor"; - license = stdenv.lib.licenses.free; + license = lib.licenses.free; broken = true; # since 2020-02-08 }; } diff --git a/pkgs/applications/editors/okteta/default.nix b/pkgs/applications/editors/okteta/default.nix index d51f46b9e0a..b2011c5d8e6 100644 --- a/pkgs/applications/editors/okteta/default.nix +++ b/pkgs/applications/editors/okteta/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchurl, extra-cmake-modules, kdoctools, qtscript, kconfig +{ mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools, qtscript, kconfig , kinit, karchive, kcrash, kcmutils, kconfigwidgets, knewstuff, kparts , qca-qt5, shared-mime-info }: diff --git a/pkgs/applications/editors/quartus-prime/default.nix b/pkgs/applications/editors/quartus-prime/default.nix index 7ad2a3247df..96a543f3cb5 100644 --- a/pkgs/applications/editors/quartus-prime/default.nix +++ b/pkgs/applications/editors/quartus-prime/default.nix @@ -89,6 +89,7 @@ let description = "FPGA design and simulation software"; license = lib.licenses.unfree; platforms = lib.platforms.linux; + hydraPlatforms = [ ]; # requireFile srcs cannot be fetched by hydra, ignore maintainers = with lib.maintainers; [ kwohlfahrt ]; }; }; diff --git a/pkgs/applications/editors/quilter/default.nix b/pkgs/applications/editors/quilter/default.nix index 9834b78eae9..2d04ad1629c 100644 --- a/pkgs/applications/editors/quilter/default.nix +++ b/pkgs/applications/editors/quilter/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, nix-update-script, pkgconfig, meson, ninja, python3, vala +{ lib, stdenv, fetchFromGitHub, nix-update-script, pkg-config, meson, ninja, python3, vala , gtk3, desktop-file-utils, gtksourceview, webkitgtk, gtkspell3, pantheon , libgee, discount, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "quilter"; - version = "2.5.1"; + version = "2.5.4"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - sha256 = "0ya1iwzfzvrci083zyrjj6ac4ys25j90slpk8yydw9n99kb750rk"; + sha256 = "sha256-A8Ov0rITHuMLDYTueeDO89KtxlP0pNk1pA7O4x3Q9fE="; }; nativeBuildInputs = [ @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meson ninja vala - pkgconfig + pkg-config python3 wrapGAppsHook ]; diff --git a/pkgs/applications/editors/qxmledit/default.nix b/pkgs/applications/editors/qxmledit/default.nix index 4023861cc37..d2aea1344da 100644 --- a/pkgs/applications/editors/qxmledit/default.nix +++ b/pkgs/applications/editors/qxmledit/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "qxmledit-${version}" ; version = "0.9.15" ; - src = fetchFromGitHub ( stdenv.lib.importJSON ./qxmledit.json ) ; + src = fetchFromGitHub ( lib.importJSON ./qxmledit.json ) ; nativeBuildInputs = [ qmake ] ; buildInputs = [ qtbase qtxmlpatterns qtsvg qtscxml qtquick1 libGLU ] ; qmakeFlags = [ "CONFIG+=release" ] ; @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { export QXMLEDIT_INST_DOC_DIR="$doc" ''; + dontWrapQtApps = true; + meta = with lib; { description = "Simple XML editor based on qt libraries" ; homepage = "https://sourceforge.net/projects/qxmledit"; diff --git a/pkgs/applications/editors/rehex/default.nix b/pkgs/applications/editors/rehex/default.nix index ec85ffde488..df5fed210e6 100644 --- a/pkgs/applications/editors/rehex/default.nix +++ b/pkgs/applications/editors/rehex/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { 'png2icns $@ $(ICONSET)/icon_16x16.png $(ICONSET)/icon_32x32.png $(ICONSET)/icon_128x128.png $(ICONSET)/icon_256x256.png $(ICONSET)/icon_512x512.png' ''; - nativeBuildInputs = stdenv.lib.optionals (stdenv.isDarwin) [ libicns ]; + nativeBuildInputs = lib.optionals (stdenv.isDarwin) [ libicns ]; buildInputs = [ capstone jansson ] - ++ (stdenv.lib.optionals (!stdenv.isDarwin) [ wxGTK30 ]) - ++ (stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Carbon Cocoa IOKit wxmac ])); + ++ (lib.optionals (!stdenv.isDarwin) [ wxGTK30 ]) + ++ (lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Carbon Cocoa IOKit wxmac ])); - makeFlags = [ "prefix=$(out)" ] ++ (stdenv.lib.optionals stdenv.isDarwin [ "-f Makefile.osx" ]); + makeFlags = [ "prefix=$(out)" ] ++ (lib.optionals stdenv.isDarwin [ "-f Makefile.osx" ]); meta = with lib; { description = "Reverse Engineers' Hex Editor"; diff --git a/pkgs/applications/editors/retext/default.nix b/pkgs/applications/editors/retext/default.nix index 99f7340f753..6bf0f191ece 100644 --- a/pkgs/applications/editors/retext/default.nix +++ b/pkgs/applications/editors/retext/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3, fetchFromGitHub, wrapQtAppsHook, buildEnv, aspellDicts +{ lib, python3, fetchFromGitHub, wrapQtAppsHook, buildEnv, aspellDicts # Use `lib.collect lib.isDerivation aspellDicts;` to make all dictionaries # available. , enchantAspellDicts ? with aspellDicts; [ en en-computers en-science ] diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 97e8378d94e..00d0259a7a9 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -122,7 +122,7 @@ mkDerivation rec { mimeType = "text/x-r-source;text/x-r;text/x-R;text/x-r-doc;text/x-r-sweave;text/x-r-markdown;text/x-r-html;text/x-r-presentation;application/x-r-data;application/x-r-project;text/x-r-history;text/x-r-profile;text/x-tex;text/x-markdown;text/html;text/css;text/javascript;text/x-chdr;text/x-csrc;text/x-c++hdr;text/x-c++src;"; }; - qtWrapperArgs = [ ''--suffix PATH : ${gnumake}/bin'' ]; + qtWrapperArgs = [ "--suffix PATH : ${gnumake}/bin" ]; postInstall = '' mkdir $out/share diff --git a/pkgs/applications/editors/scite/default.nix b/pkgs/applications/editors/scite/default.nix index 0b72a57df3e..3d6ec9ece9c 100644 --- a/pkgs/applications/editors/scite/default.nix +++ b/pkgs/applications/editors/scite/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gtk2 }: +{ lib, stdenv, fetchurl, pkg-config, gtk2 }: stdenv.mkDerivation { pname = "scite"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "0h16wk2986nkkhhdv5g4lxlcn02qwyja24x1r6vf02r1hf46b9q2"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 ]; sourceRoot = "scintilla/gtk"; diff --git a/pkgs/applications/editors/setzer/default.nix b/pkgs/applications/editors/setzer/default.nix index 46dc413971d..334f8b79c4b 100644 --- a/pkgs/applications/editors/setzer/default.nix +++ b/pkgs/applications/editors/setzer/default.nix @@ -7,6 +7,7 @@ , appstream , appstream-glib , wrapGAppsHook +, desktop-file-utils , gobject-introspection , gtksourceview4 , gspell @@ -17,13 +18,13 @@ python3.pkgs.buildPythonApplication rec { pname = "setzer"; - version = "0.3.2"; + version = "0.4.1"; src = fetchFromGitHub { owner = "cvfosammmm"; repo = "Setzer"; rev = "v${version}"; - sha256 = "1c7jrq20m53y2k8lmh37zldgc3bndldxipx4xq0lz3qq2fv1gg07"; + sha256 = "1rcx2c07jg1ij81pnvg3px49hfbjmkagn68d3gp79z3gcajbp2av"; }; format = "other"; @@ -35,6 +36,7 @@ python3.pkgs.buildPythonApplication rec { appstream # for appstreamcli appstream-glib wrapGAppsHook + desktop-file-utils ]; buildInputs = [ @@ -49,8 +51,14 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ pygobject3 pyxdg + pdfminer + pycairo ]; + checkPhase = '' + meson test --print-errorlogs + ''; + meta = with lib; { description = "LaTeX editor written in Python with Gtk"; homepage = src.meta.homepage; diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix index 8e662d55523..b34441d100c 100644 --- a/pkgs/applications/editors/sigil/default.nix +++ b/pkgs/applications/editors/sigil/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, pkgconfig, makeWrapper +{ lib, mkDerivation, fetchFromGitHub, cmake, pkg-config, makeWrapper , boost, xercesc, hunspell, zlib, pcre16 , qtbase, qttools, qtwebengine, qtxmlpatterns , python3Packages @@ -17,7 +17,7 @@ mkDerivation rec { pythonPath = with python3Packages; [ lxml ]; - nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; + nativeBuildInputs = [ cmake pkg-config makeWrapper ]; buildInputs = [ boost xercesc qtbase qttools qtwebengine qtxmlpatterns diff --git a/pkgs/applications/editors/spacevim/default.nix b/pkgs/applications/editors/spacevim/default.nix index 02c6fd82d8c..2193d0ea5bb 100644 --- a/pkgs/applications/editors/spacevim/default.nix +++ b/pkgs/applications/editors/spacevim/default.nix @@ -1,4 +1,4 @@ -{ ripgrep, gitAndTools, fzf, makeWrapper, vim_configurable, vimPlugins, fetchFromGitHub, writeTextDir +{ ripgrep, git, fzf, makeWrapper, vim_configurable, vimPlugins, fetchFromGitHub, writeTextDir , lib, stdenv, runCommandNoCC, remarshal, formats, spacevim_config ? import ./init.nix }: with stdenv; let @@ -39,7 +39,7 @@ in mkDerivation rec { # trailing slash very important for SPACEVIMDIR makeWrapper "${vim-customized}/bin/vim" "$out/bin/spacevim" \ --add-flags "-u $out/SpaceVim/vimrc" --set SPACEVIMDIR "${spacevimdir}/" \ - --prefix PATH : ${lib.makeBinPath [ fzf gitAndTools.git ripgrep]} + --prefix PATH : ${lib.makeBinPath [ fzf git ripgrep]} ''; meta = with lib; { diff --git a/pkgs/applications/editors/standardnotes/default.nix b/pkgs/applications/editors/standardnotes/default.nix index e472df44a60..f88d4489504 100644 --- a/pkgs/applications/editors/standardnotes/default.nix +++ b/pkgs/applications/editors/standardnotes/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, appimageTools, autoPatchelfHook, desktop-file-utils - , fetchurl, runtimeShell }: +, fetchurl, runtimeShell, libsecret, gtk3, gsettings-desktop-schemas }: let version = "3.5.11"; @@ -30,6 +30,14 @@ let in appimageTools.wrapType2 rec { inherit name src; + profile = '' + export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS + ''; + + extraPkgs = pkgs: with pkgs; [ + libsecret + ]; + extraInstallCommands = '' # directory in /nix/store so readonly cp -r ${appimageContents}/* $out diff --git a/pkgs/applications/editors/sublime/2/default.nix b/pkgs/applications/editors/sublime/2/default.nix index b10008d0c49..e46d6ef97e4 100644 --- a/pkgs/applications/editors/sublime/2/default.nix +++ b/pkgs/applications/editors/sublime/2/default.nix @@ -1,6 +1,6 @@ -{ fetchurl, stdenv, glib, xorg, cairo, gtk2, makeDesktopItem }: +{ fetchurl, lib, stdenv, glib, xorg, cairo, gtk2, makeDesktopItem }: let - libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk2 cairo]; + libPath = lib.makeLibraryPath [glib xorg.libX11 gtk2 cairo]; in stdenv.mkDerivation rec { @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { echo ${libPath} patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${libPath}:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \ + --set-rpath ${libPath}:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.is64bit "64"} \ $out/sublime/sublime_text mkdir -p $out/share/icons @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { meta = { description = "Sophisticated text editor for code, markup and prose"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; platforms = [ "x86_64-linux" "i686-linux" ]; }; } diff --git a/pkgs/applications/editors/sublime/3/common.nix b/pkgs/applications/editors/sublime/3/common.nix index 82d824b4877..cc8b835c137 100644 --- a/pkgs/applications/editors/sublime/3/common.nix +++ b/pkgs/applications/editors/sublime/3/common.nix @@ -8,7 +8,7 @@ let pname = "sublimetext3"; - packageAttribute = "sublime3${stdenv.lib.optionalString dev "-dev"}"; + packageAttribute = "sublime3${lib.optionalString dev "-dev"}"; binaries = [ "sublime_text" "plugin_host" "crash_reporter" ]; primaryBinary = "sublime_text"; primaryBinaryAliases = [ "subl" "sublime" "sublime3" ]; @@ -26,7 +26,7 @@ let else "x64"; - libPath = stdenv.lib.makeLibraryPath [ xorg.libX11 glib gtk3 cairo pango ]; + libPath = lib.makeLibraryPath [ xorg.libX11 glib gtk3 cairo pango ]; redirects = [ "/usr/bin/pkexec=${pkexecPath}" ]; in let binaryPackage = stdenv.mkDerivation { @@ -66,7 +66,7 @@ in let for binary in ${ builtins.concatStringsSep " " binaries }; do patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${libPath}:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \ + --set-rpath ${libPath}:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.is64bit "64"} \ $binary done @@ -93,7 +93,7 @@ in let postFixup = '' wrapProgram $out/sublime_bash \ - --set LD_PRELOAD "${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1" + --set LD_PRELOAD "${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1" wrapProgram $out/${primaryBinary} \ --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ @@ -102,7 +102,7 @@ in let "''${gappsWrapperArgs[@]}" # Without this, plugin_host crashes, even though it has the rpath - wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1:${openssl.out}/lib/libssl.so:${bzip2.out}/lib/libbz2.so + wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1:${openssl.out}/lib/libssl.so:${bzip2.out}/lib/libbz2.so ''; }; in stdenv.mkDerivation (rec { @@ -131,7 +131,7 @@ in stdenv.mkDerivation (rec { passthru.updateScript = writeScript "${pname}-update-script" '' #!${stdenv.shell} set -o errexit - PATH=${stdenv.lib.makeBinPath [ common-updater-scripts curl gnugrep ]} + PATH=${lib.makeBinPath [ common-updater-scripts curl gnugrep ]} latestVersion=$(curl -s ${versionUrl}) @@ -140,7 +140,7 @@ in stdenv.mkDerivation (rec { exit 0 fi - for platform in ${stdenv.lib.concatStringsSep " " meta.platforms}; do + for platform in ${lib.concatStringsSep " " meta.platforms}; do # The script will not perform an update when the version attribute is up to date from previous platform run # We need to clear it before each run update-source-version ${packageAttribute}.${primaryBinary} 0 0000000000000000000000000000000000000000000000000000000000000000 --file=${versionFile} --version-key=buildVersion --system=$platform diff --git a/pkgs/applications/editors/supertux-editor/default.nix b/pkgs/applications/editors/supertux-editor/default.nix index b42ebe19f64..e474ff5f19b 100644 --- a/pkgs/applications/editors/supertux-editor/default.nix +++ b/pkgs/applications/editors/supertux-editor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, mono, gtk-sharp-2_0, pkgconfig, makeWrapper, gnome2, gtk2 }: +{ lib, stdenv, fetchFromGitHub, mono, gtk-sharp-2_0, pkg-config, makeWrapper, gnome2, gtk2 }: stdenv.mkDerivation { version = "git-2014-08-20"; pname = "supertux-editor"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "08y5haclgxvcii3hpdvn1ah8qd0f3n8xgxxs8zryj02b8n7cz3vx"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [mono gtk-sharp-2_0 makeWrapper gnome2.libglade gtk2 ]; installPhase = '' diff --git a/pkgs/applications/editors/tecoc/default.nix b/pkgs/applications/editors/tecoc/default.nix index 50cad500c95..f5ad8d947c7 100644 --- a/pkgs/applications/editors/tecoc/default.nix +++ b/pkgs/applications/editors/tecoc/default.nix @@ -1,37 +1,47 @@ -{ lib, stdenv, fetchFromGitHub -, ncurses }: +{ stdenv +, lib +, fetchFromGitHub +, ncurses +}: stdenv.mkDerivation rec { - - pname = "tecoc-git"; - version = "20150606"; + pname = "tecoc"; + version = "unstable-2020-11-03"; src = fetchFromGitHub { owner = "blakemcbride"; repo = "TECOC"; - rev = "d7dffdeb1dfb812e579d6d3b518545b23e1b50cb"; - sha256 = "11zfa73dlx71c0hmjz5n3wqcvk6082rpb4sss877nfiayisc0njj"; + rev = "79fcb6cfd6c5f9759f6ec46aeaf86d5806b13a0b"; + sha256 = "sha256-JooLvoh9CxLHLOXXxE7zA7R9yglr9BGUwX4nrw2/vIw="; }; buildInputs = [ ncurses ]; makefile = if stdenv.hostPlatform.isDarwin - then "makefile.osx" - else if stdenv.hostPlatform.isFreeBSD - then "makefile.bsd" - else if stdenv.hostPlatform.isOpenBSD - then "makefile.bsd" - else if stdenv.hostPlatform.isWindows - then "makefile.win" - else "makefile.linux"; # I think Linux is a safe default... + then "makefile.osx" + else if stdenv.hostPlatform.isFreeBSD + then "makefile.bsd" + else if stdenv.hostPlatform.isOpenBSD + then "makefile.bsd" + else if stdenv.hostPlatform.isWindows + then "makefile.win" + else "makefile.linux"; # I think Linux is a safe default... makeFlags = [ "CC=${stdenv.cc}/bin/cc" "-C src/" ]; + preInstall = '' + install -d $out/bin $out/share/doc/${pname}-${version} $out/lib/teco/macros + ''; + installPhase = '' - mkdir -p $out/bin $out/share/doc/${pname}-${version} $out/lib/teco/macros - cp src/tecoc $out/bin - cp src/aaout.txt doc/* $out/share/doc/${pname}-${version} - cp lib/* lib2/* $out/lib/teco/macros + runHook preInstall + install -m755 src/tecoc $out/bin + install -m644 src/aaout.txt doc/* $out/share/doc/${pname}-${version} + install -m644 lib/* lib2/* $out/lib/teco/macros + runHook postInstall + ''; + + postInstall = '' (cd $out/bin ln -s tecoc Make ln -s tecoc mung @@ -54,9 +64,11 @@ stdenv.mkDerivation rec { of Editor MACroS for TECO. TECOC is a portable C implementation of TECO-11. - ''; + ''; homepage = "https://github.com/blakemcbride/TECOC"; - license = { url = "https://github.com/blakemcbride/TECOC/tree/master/doc/readme-1st.txt"; }; + license = { + url = "https://github.com/blakemcbride/TECOC/tree/master/doc/readme-1st.txt"; + }; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/editors/texmacs/common.nix b/pkgs/applications/editors/texmacs/common.nix index 9479295e747..e52d95f837d 100644 --- a/pkgs/applications/editors/texmacs/common.nix +++ b/pkgs/applications/editors/texmacs/common.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, tex, extraFonts, chineseFonts, japaneseFonts, koreanFonts }: +{ lib, fetchurl, tex, extraFonts, chineseFonts, japaneseFonts, koreanFonts }: rec { extraFontsSrc = fetchurl { url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-extra-fonts-1.0-noarch.tar.gz"; @@ -63,6 +63,6 @@ rec { collaborative authoring are planned for later. ''; homepage = "http://texmacs.org/"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/editors/texmacs/darwin.nix b/pkgs/applications/editors/texmacs/darwin.nix index a5117f3a678..ff090dd3259 100644 --- a/pkgs/applications/editors/texmacs/darwin.nix +++ b/pkgs/applications/editors/texmacs/darwin.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl, +{ lib, stdenv, callPackage, fetchurl, guile_1_8, qt4, zlib, freetype, CoreFoundation, Cocoa, gettext, libiconv, ghostscript, tex ? null, aspell ? null, @@ -49,12 +49,12 @@ stdenv.mkDerivation { "${ghostscript}/bin:" + (if aspell == null then "" else "${aspell}/bin:") + (if tex == null then "" else "${tex}/bin:") + - (if netpbm == null then "" else "${stdenv.lib.getBin netpbm}/bin:") + + (if netpbm == null then "" else "${lib.getBin netpbm}/bin:") + (if imagemagick == null then "" else "${imagemagick}/bin:"); enableParallelBuilding = true; meta = common.meta // { - platforms = stdenv.lib.platforms.darwin; + platforms = lib.platforms.darwin; }; } diff --git a/pkgs/applications/editors/texmacs/default.nix b/pkgs/applications/editors/texmacs/default.nix index f967f28f4df..dd5e5e61b29 100644 --- a/pkgs/applications/editors/texmacs/default.nix +++ b/pkgs/applications/editors/texmacs/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, callPackage, fetchFromGitHub, +{ lib, mkDerivation, callPackage, fetchurl, guile_1_8, qtbase, xmodmap, which, freetype, libjpeg, sqlite, @@ -7,7 +7,7 @@ git ? null, python3 ? null, cmake, - pkgconfig, + pkg-config, ghostscriptX ? null, extraFonts ? false, chineseFonts ? false, @@ -16,22 +16,20 @@ let pname = "TeXmacs"; - version = "1.99.15"; + version = "1.99.18"; common = callPackage ./common.nix { inherit tex extraFonts chineseFonts japaneseFonts koreanFonts; }; in mkDerivation { - name = "${pname}-${version}"; + inherit pname version; - src = fetchFromGitHub { - owner = "texmacs"; - repo = "texmacs"; - rev = "v${version}"; - sha256 = "04585hdh98fvyhj4wsxf69xal2wvfa6lg76gad8pr6ww9abi5105"; + src = fetchurl { + url = "https://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${version}-src.tar.gz"; + sha256 = "0il3fwgw20421aj90wg8kyhkwk6lbgb3bb2g5qamh5lk90yj725i"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ guile_1_8 qtbase diff --git a/pkgs/applications/editors/texmaker/default.nix b/pkgs/applications/editors/texmaker/default.nix index 0b78ff54c35..75f22da2516 100644 --- a/pkgs/applications/editors/texmaker/default.nix +++ b/pkgs/applications/editors/texmaker/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchurl, qtbase, qtscript, qmake, zlib, pkgconfig, poppler }: +{ lib, mkDerivation, fetchurl, qtbase, qtscript, qmake, zlib, pkg-config, poppler }: mkDerivation rec { pname = "texmaker"; @@ -10,7 +10,7 @@ mkDerivation rec { }; buildInputs = [ qtbase qtscript poppler zlib ]; - nativeBuildInputs = [ pkgconfig poppler qmake ]; + nativeBuildInputs = [ pkg-config poppler qmake ]; NIX_CFLAGS_COMPILE="-I${poppler.dev}/include/poppler"; qmakeFlags = [ @@ -24,10 +24,10 @@ mkDerivation rec { meta = with lib; { description = "TeX and LaTeX editor"; longDescription='' - This editor is a full fledged IDE for TeX and - LaTeX editing with completion, structure viewer, preview, - spell checking and support of any compilation chain. - ''; + This editor is a full fledged IDE for TeX and + LaTeX editing with completion, structure viewer, preview, + spell checking and support of any compilation chain. + ''; homepage = "http://www.xm1math.net/texmaker/"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index 101c9bc59f9..988e32ae712 100644 --- a/pkgs/applications/editors/texstudio/default.nix +++ b/pkgs/applications/editors/texstudio/default.nix @@ -1,5 +1,5 @@ { lib, mkDerivation, fetchFromGitHub, qmake, qtbase, qtscript, qtsvg, - wrapQtAppsHook, poppler, zlib, pkgconfig }: + wrapQtAppsHook, poppler, zlib, pkg-config }: mkDerivation rec { pname = "texstudio"; @@ -12,7 +12,7 @@ mkDerivation rec { sha256 = "05q70wbdaldhrlapss4agmvz1cwqd229nd5amkj069v1wxrkvpb7"; }; - nativeBuildInputs = [ qmake wrapQtAppsHook pkgconfig ]; + nativeBuildInputs = [ qmake wrapQtAppsHook pkg-config ]; buildInputs = [ qtbase qtscript qtsvg poppler zlib ]; qmakeFlags = [ "NO_APPDATA=True" ]; diff --git a/pkgs/applications/editors/textadept/10/default.nix b/pkgs/applications/editors/textadept/10/default.nix index 4450fe77d18..9d86bdc4c5b 100644 --- a/pkgs/applications/editors/textadept/10/default.nix +++ b/pkgs/applications/editors/textadept/10/default.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, fetchhg, fetchurl, gtk2, glib, pkgconfig, unzip, ncurses, zip }: +{ lib, stdenv, fetchhg, fetchurl, gtk2, glib, pkg-config, unzip, ncurses, zip }: stdenv.mkDerivation rec { version = "10.8"; pname = "textadept"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 ncurses glib unzip zip ]; diff --git a/pkgs/applications/editors/textadept/11/default.nix b/pkgs/applications/editors/textadept/11/default.nix index 017a2970c30..a0037ca6c2b 100644 --- a/pkgs/applications/editors/textadept/11/default.nix +++ b/pkgs/applications/editors/textadept/11/default.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, fetchhg, fetchFromGitHub, fetchurl, gtk2, glib, pkgconfig, unzip, ncurses, zip }: +{ lib, stdenv, fetchhg, fetchFromGitHub, fetchurl, gtk2, glib, pkg-config, unzip, ncurses, zip }: stdenv.mkDerivation rec { version = "11.0_beta"; pname = "textadept11"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 ncurses glib unzip zip ]; diff --git a/pkgs/applications/editors/thonny/default.nix b/pkgs/applications/editors/thonny/default.nix index e98d57420e8..39aefe3fa16 100644 --- a/pkgs/applications/editors/thonny/default.nix +++ b/pkgs/applications/editors/thonny/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3 }: +{ lib, fetchFromGitHub, python3 }: with python3.pkgs; diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index b58f5da6a96..b6222c8a6d2 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake +{ lib, mkDerivation, fetchFromGitHub, pkg-config, qmake , python, qtbase, qttools }: mkDerivation rec { @@ -12,7 +12,7 @@ mkDerivation rec { sha256 = "0n8p7bp5pqq72c65av3v7wbazwphh78pw27nqvpiyp9y8k5w4pg0"; }; - nativeBuildInputs = [ pkgconfig qmake ]; + nativeBuildInputs = [ pkg-config qmake ]; buildInputs = [ python qtbase qttools ]; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vbindiff/default.nix b/pkgs/applications/editors/vbindiff/default.nix index 110b7caaf81..9a103867fbc 100644 --- a/pkgs/applications/editors/vbindiff/default.nix +++ b/pkgs/applications/editors/vbindiff/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses }: +{ lib, stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { pname = "vbindiff"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "A terminal visual binary diff viewer"; homepage = "https://www.cjmweb.net/vbindiff/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index aa8120470d1..734b189d1e4 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -1,4 +1,4 @@ -{ source ? "default", callPackage, stdenv, ncurses, pkgconfig, gettext +{ source ? "default", callPackage, lib, stdenv, ncurses, pkg-config, gettext , writeText, config, glib, gtk2-x11, gtk3-x11, lua, python3, perl, tcl, ruby , libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu , libICE @@ -72,7 +72,7 @@ in stdenv.mkDerivation rec { default = common.src; # latest release }; - patches = [ ./cflags-prune.diff ] ++ stdenv.lib.optional ftNixSupport ./ft-nix-support.patch; + patches = [ ./cflags-prune.diff ] ++ lib.optional ftNixSupport ./ft-nix-support.patch; configureFlags = [ "--enable-gui=${guiSupport}" @@ -95,50 +95,49 @@ in stdenv.mkDerivation rec { "--disable-carbon_check" "--disable-gtktest" ] - ++ stdenv.lib.optional stdenv.isDarwin + ++ lib.optional stdenv.isDarwin (if darwinSupport then "--enable-darwin" else "--disable-darwin") - ++ stdenv.lib.optionals luaSupport [ + ++ lib.optionals luaSupport [ "--with-lua-prefix=${lua}" "--enable-luainterp" - ] ++ stdenv.lib.optional lua.pkgs.isLuaJIT [ + ] ++ lib.optional lua.pkgs.isLuaJIT [ "--with-luajit" ] - ++ stdenv.lib.optionals pythonSupport [ + ++ lib.optionals pythonSupport [ "--enable-python3interp=yes" "--with-python3-config-dir=${python3}/lib" # Disables Python 2 "--disable-pythoninterp" ] - ++ stdenv.lib.optional nlsSupport "--enable-nls" - ++ stdenv.lib.optional perlSupport "--enable-perlinterp" - ++ stdenv.lib.optional rubySupport "--enable-rubyinterp" - ++ stdenv.lib.optional tclSupport "--enable-tclinterp" - ++ stdenv.lib.optional multibyteSupport "--enable-multibyte" - ++ stdenv.lib.optional cscopeSupport "--enable-cscope" - ++ stdenv.lib.optional netbeansSupport "--enable-netbeans" - ++ stdenv.lib.optional ximSupport "--enable-xim"; + ++ lib.optional nlsSupport "--enable-nls" + ++ lib.optional perlSupport "--enable-perlinterp" + ++ lib.optional rubySupport "--enable-rubyinterp" + ++ lib.optional tclSupport "--enable-tclinterp" + ++ lib.optional multibyteSupport "--enable-multibyte" + ++ lib.optional cscopeSupport "--enable-cscope" + ++ lib.optional netbeansSupport "--enable-netbeans" + ++ lib.optional ximSupport "--enable-xim"; nativeBuildInputs = [ - pkgconfig + pkg-config ] - ++ stdenv.lib.optional wrapPythonDrv makeWrapper - ++ stdenv.lib.optional nlsSupport gettext - ++ stdenv.lib.optional perlSupport perl - ++ stdenv.lib.optional (guiSupport == "gtk3") wrapGAppsHook + ++ lib.optional wrapPythonDrv makeWrapper + ++ lib.optional nlsSupport gettext + ++ lib.optional perlSupport perl + ++ lib.optional (guiSupport == "gtk3") wrapGAppsHook ; buildInputs = [ ncurses libX11 libXext libSM libXpm libXt libXaw libXau libXmu glib libICE ] - ++ stdenv.lib.optional (guiSupport == "gtk2") gtk2-x11 - ++ stdenv.lib.optional (guiSupport == "gtk3") gtk3-x11 - ++ stdenv.lib.optionals darwinSupport [ CoreServices CoreData Cocoa Foundation libobjc ] - ++ stdenv.lib.optional luaSupport lua - ++ stdenv.lib.optional pythonSupport python3 - ++ stdenv.lib.optional tclSupport tcl - ++ stdenv.lib.optional rubySupport ruby; - - preConfigure = '' - '' + stdenv.lib.optionalString ftNixSupport '' + ++ lib.optional (guiSupport == "gtk2") gtk2-x11 + ++ lib.optional (guiSupport == "gtk3") gtk3-x11 + ++ lib.optionals darwinSupport [ CoreServices CoreData Cocoa Foundation libobjc ] + ++ lib.optional luaSupport lua + ++ lib.optional pythonSupport python3 + ++ lib.optional tclSupport tcl + ++ lib.optional rubySupport ruby; + + preConfigure = "" + lib.optionalString ftNixSupport '' cp ${vimPlugins.vim-nix.src}/ftplugin/nix.vim runtime/ftplugin/nix.vim cp ${vimPlugins.vim-nix.src}/indent/nix.vim runtime/indent/nix.vim cp ${vimPlugins.vim-nix.src}/syntax/nix.vim runtime/syntax/nix.vim @@ -150,20 +149,20 @@ in stdenv.mkDerivation rec { postInstall = '' ln -s $out/bin/vim $out/bin/vi - '' + stdenv.lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.isLinux '' patchelf --set-rpath \ - "$(patchelf --print-rpath $out/bin/vim):${stdenv.lib.makeLibraryPath buildInputs}" \ + "$(patchelf --print-rpath $out/bin/vim):${lib.makeLibraryPath buildInputs}" \ "$out"/bin/vim if [[ -e "$out"/bin/gvim ]]; then patchelf --set-rpath \ - "$(patchelf --print-rpath $out/bin/vim):${stdenv.lib.makeLibraryPath buildInputs}" \ + "$(patchelf --print-rpath $out/bin/vim):${lib.makeLibraryPath buildInputs}" \ "$out"/bin/gvim fi ln -sfn '${nixosRuntimepath}' "$out"/share/vim/vimrc - '' + stdenv.lib.optionalString wrapPythonDrv '' + '' + lib.optionalString wrapPythonDrv '' wrapProgram "$out/bin/vim" --prefix PATH : "${python3}/bin" - '' + stdenv.lib.optionalString (guiSupport == "gtk3") '' + '' + lib.optionalString (guiSupport == "gtk3") '' rewrap () { rm -f "$out/bin/$1" diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index 95d2076153c..48e1369c8c3 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, callPackage, ncurses, gettext, pkgconfig +{ lib, stdenv, fetchurl, callPackage, ncurses, gettext, pkg-config # default vimrc , vimrc ? fetchurl { name = "default-vimrc"; @@ -17,14 +17,14 @@ stdenv.mkDerivation { inherit (common) version src postPatch hardeningDisable enableParallelBuilding meta; - nativeBuildInputs = [ gettext pkgconfig ]; + nativeBuildInputs = [ gettext pkg-config ]; buildInputs = [ ncurses ] - ++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ Carbon Cocoa ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon Cocoa ]; configureFlags = [ "--enable-multibyte" "--enable-nls" - ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "vim_cv_toupper_broken=no" "--with-tlib=ncurses" "vim_cv_terminfo=yes" diff --git a/pkgs/applications/editors/vim/macvim-configurable.nix b/pkgs/applications/editors/vim/macvim-configurable.nix index 087a375c50c..6ea6b6c6094 100644 --- a/pkgs/applications/editors/vim/macvim-configurable.nix +++ b/pkgs/applications/editors/vim/macvim-configurable.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, vimUtils, buildEnv, makeWrapper }: +{ lib, stdenv, callPackage, vimUtils, buildEnv, makeWrapper }: let macvim = callPackage ./macvim.nix { inherit stdenv; }; @@ -12,7 +12,6 @@ let # sourcing of the user's vimrc. Use `customRC = "source $HOME/.vim/vimrc"` # if you want to preserve that behavior. configure = let - inherit (stdenv) lib; doConfig = config: let vimrcConfig = config // { # always source the bundled system vimrc diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index e950e7685ef..c71f057fe0f 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, runCommand, ncurses, gettext -, pkgconfig, cscope, ruby, tcl, perl, luajit +, pkg-config, cscope, ruby, tcl, perl, luajit , darwin , usePython27 ? false @@ -38,7 +38,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig buildSymlinks ]; + nativeBuildInputs = [ pkg-config buildSymlinks ]; buildInputs = [ gettext ncurses cscope luajit ruby tcl perl python.pkg ]; diff --git a/pkgs/applications/editors/vim/vimacs.nix b/pkgs/applications/editors/vim/vimacs.nix index cb77e60cf00..628b4c46cba 100644 --- a/pkgs/applications/editors/vim/vimacs.nix +++ b/pkgs/applications/editors/vim/vimacs.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { description = "Vim-Improved eMACS: Emacs emulation for Vim"; homepage = "http://algorithm.com.au/code/vimacs"; license = licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ millerjason ]; + maintainers = with lib.maintainers; [ millerjason ]; }; } diff --git a/pkgs/applications/editors/vis/default.nix b/pkgs/applications/editors/vis/default.nix index bd6eba94907..9a020233f3b 100644 --- a/pkgs/applications/editors/vis/default.nix +++ b/pkgs/applications/editors/vis/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, makeWrapper, makeDesktopItem +{ lib, stdenv, fetchFromGitHub, pkg-config, makeWrapper, makeDesktopItem , ncurses, libtermkey, lpeg, lua , acl ? null, libselinux ? null }: @@ -14,14 +14,14 @@ stdenv.mkDerivation rec { owner = "martanne"; }; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ ncurses libtermkey lua lpeg - ] ++ stdenv.lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ acl libselinux ]; @@ -51,10 +51,10 @@ stdenv.mkDerivation rec { comment = meta.description; desktopName = "vis"; genericName = "Text editor"; - categories = stdenv.lib.concatStringsSep ";" [ + categories = lib.concatStringsSep ";" [ "Application" "Development" "IDE" ]; - mimeType = stdenv.lib.concatStringsSep ";" [ + mimeType = lib.concatStringsSep ";" [ "text/plain" "application/octet-stream" ]; startupNotify = "false"; diff --git a/pkgs/applications/editors/vscode/update-vscode.sh b/pkgs/applications/editors/vscode/update-vscode.sh index cb1400f048e..d1ae71cd11e 100755 --- a/pkgs/applications/editors/vscode/update-vscode.sh +++ b/pkgs/applications/editors/vscode/update-vscode.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnugrep gnused gawk +#!nix-shell -i bash -p curl jq gnused # Update script for the vscode versions and hashes. # Usually doesn't need to be called by hand, @@ -16,8 +16,7 @@ fi # VSCode -VSCODE_VER=$(curl -s -L "https://code.visualstudio.com/Download" | grep "is now available" | awk -F'</span>' '{print $1}' | awk -F'>' '{print $NF}') -VSCODE_VER=$(curl -s -L "https://code.visualstudio.com/updates/v${VSCODE_VER/./_}" | grep "Downloads:" | awk -F'code.visualstudio.com/' '{print $2}' | awk -F'/' '{print $1}') +VSCODE_VER=$(curl --fail --silent https://api.github.com/repos/Microsoft/vscode/releases/latest | jq --raw-output .tag_name) sed -i "s/version = \".*\"/version = \"${VSCODE_VER}\"/" "$ROOT/vscode.nix" VSCODE_LINUX_URL="https://vscode-update.azurewebsites.net/${VSCODE_VER}/linux-x64/stable" diff --git a/pkgs/applications/editors/wxhexeditor/default.nix b/pkgs/applications/editors/wxhexeditor/default.nix index 9b0fd592a6a..09037b2f0c3 100644 --- a/pkgs/applications/editors/wxhexeditor/default.nix +++ b/pkgs/applications/editors/wxhexeditor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, wxGTK, autoconf, automake, libtool, python, gettext }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, wxGTK, autoconf, automake, libtool, python, gettext }: stdenv.mkDerivation rec { pname = "wxHexEditor"; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { wxHexEditor could edit HDD/SDD disk devices or partitions in raw up to exabyte sizes. ''; homepage = "http://www.wxhexeditor.org/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix index 81c86fb400e..7d36a2fd7f5 100644 --- a/pkgs/applications/editors/zile/default.nix +++ b/pkgs/applications/editors/zile/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl pkg-config ] # `help2man' wants to run Zile, which won't work when the # newly-produced binary can't be run at build-time. - ++ stdenv.lib.optional + ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) help2man; diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index c1b7841dc58..ef7458d7394 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -1,22 +1,20 @@ -{ stdenv, fetchFromGitHub, flex, bison, pkgconfig, zlib, libtiff, libpng, fftw +{ lib, stdenv, fetchFromGitHub, flex, bison, pkg-config, zlib, libtiff, libpng, fftw , cairo, readline, ffmpeg_3, makeWrapper, wxGTK30, netcdf, blas , proj, gdal, geos, sqlite, postgresql, libmysqlclient, python2Packages, libLAS, proj-datumgrid }: -let inherit (stdenv) lib; in - stdenv.mkDerivation rec { name = "grass"; version = "7.6.1"; - src = with stdenv.lib; fetchFromGitHub { + src = with lib; fetchFromGitHub { owner = "OSGeo"; repo = "grass"; rev = "${name}_${replaceStrings ["."] ["_"] version}"; sha256 = "1amjk9rz7vw5ha7nyl5j2bfwj5if9w62nlwx5qbp1x7spldimlll"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite cairo proj readline ffmpeg_3 makeWrapper wxGTK30 netcdf geos postgresql libmysqlclient blas libLAS proj-datumgrid ] @@ -51,7 +49,7 @@ stdenv.mkDerivation rec { ]; # Otherwise a very confusing "Can't load GDAL library" error - makeFlags = stdenv.lib.optional stdenv.isDarwin "GDAL_DYNAMIC="; + makeFlags = lib.optional stdenv.isDarwin "GDAL_DYNAMIC="; /* Ensures that the python script run at build time are actually executable; * otherwise, patchShebangs ignores them. */ @@ -103,8 +101,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://grass.osgeo.org/"; description = "GIS software suite used for geospatial data management and analysis, image processing, graphics and maps production, spatial modeling, and visualization"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [mpickering]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [mpickering]; }; } diff --git a/pkgs/applications/gis/openorienteering-mapper/default.nix b/pkgs/applications/gis/openorienteering-mapper/default.nix index e4307e244ad..81e81c88537 100644 --- a/pkgs/applications/gis/openorienteering-mapper/default.nix +++ b/pkgs/applications/gis/openorienteering-mapper/default.nix @@ -52,7 +52,7 @@ mkDerivation rec { # See https://github.com/NixOS/nixpkgs/issues/85306 "-DLICENSING_PROVIDER:BOOL=OFF" "-DMapper_MANUAL_QTHELP:BOOL=OFF" - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ # FindGDAL is broken and always finds /Library/Framework unless this is # specified "-DGDAL_INCLUDE_DIR=${gdal}/include" diff --git a/pkgs/applications/gis/udig/default.nix b/pkgs/applications/gis/udig/default.nix new file mode 100644 index 00000000000..e4abddbcde0 --- /dev/null +++ b/pkgs/applications/gis/udig/default.nix @@ -0,0 +1,66 @@ +{ stdenv, lib, fetchurl, unzip, makeWrapper, jre8, libXtst, gdal }: +let + pname = "udig"; + version = "2.0.0"; + + srcs = { + x86_64-linux = fetchurl { + url = "http://udig.refractions.net/files/downloads/udig-${version}.linux.gtk.x86_64.zip"; + sha256 = "03hj1mdd6sq0gbpa838wkccibp3l2hvnwxxf5dyc0jk3mmd94fwa"; + }; + x86_64-darwin = fetchurl { + url = "http://udig.refractions.net/files/downloads/udig-${version}.macosx.cocoa.x86_64.zip"; + sha256 = "16rcyp1zy3lr1hwjhzh6vwcgck52w66dm1qsc52gppy1f4i3f692"; + }; + }; + src = srcs.${stdenv.hostPlatform.system}; + + meta = with lib; { + description = "User-friendly Desktop Internet GIS"; + homepage = "http://udig.refractions.net/"; + license = with licenses; [ epl10 bsd3 ]; + maintainers = with maintainers; [ sikmir ]; + platforms = builtins.attrNames srcs; + }; + + linux = stdenv.mkDerivation { + inherit pname version src meta; + + nativeBuildInputs = [ unzip makeWrapper ]; + + installPhase = '' + install -dm755 $out/bin $out/opt/udig + cp -r . $out/opt/udig + makeWrapper $out/opt/udig/udig.sh $out/bin/udig \ + --prefix PATH : ${jre8}/bin \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ libXtst gdal ])} + ''; + + postFixup = '' + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + $out/opt/udig/udig_internal + ''; + }; + + darwin = stdenv.mkDerivation { + inherit pname version src meta; + + nativeBuildInputs = [ unzip makeWrapper ]; + + postPatch = '' + substituteInPlace configuration/config.ini \ + --replace "\$LOCALAPPDATA\$" "@user.home" + ''; + + installPhase = '' + mkdir -p $out/Applications/udig + cp -R . $out/Applications/udig + wrapProgram $out/Applications/udig/udig.app/Contents/MacOS/udig_internal \ + --prefix DYLD_LIBRARY_PATH : ${lib.makeLibraryPath ([ gdal ])} + ''; + }; +in +if stdenv.isDarwin +then darwin +else linux diff --git a/pkgs/applications/gis/whitebox-tools/default.nix b/pkgs/applications/gis/whitebox-tools/default.nix index c31701901ec..1e7390f8c83 100644 --- a/pkgs/applications/gis/whitebox-tools/default.nix +++ b/pkgs/applications/gis/whitebox-tools/default.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0s5byn8qyi1bm59j9vhwqaygw5cxipc7wbd3flh7n24nx0s8pr8c"; }; - buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.isDarwin Security; cargoSha256 = "09rz8f1xyc64qjbj6pgw8jxr2a7chghmdc6sfkbv7hdvx6vg4wvk"; diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 9d52046ba0c..ee608b7538f 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, libtool +{ lib, stdenv, fetchFromGitHub, pkg-config, libtool , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg, djvulibre , lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, libheif , ApplicationServices @@ -50,7 +50,7 @@ stdenv.mkDerivation { [ "--enable-static" "--disable-shared" ] # due to libxml2 being without DLLs ATM ; - nativeBuildInputs = [ pkgconfig libtool ]; + nativeBuildInputs = [ pkg-config libtool ]; buildInputs = [ zlib fontconfig freetype ghostscript @@ -72,7 +72,7 @@ stdenv.mkDerivation { moveToOutput "lib/ImageMagick-*/config-Q16HDRI" "$dev" # includes configure params for file in "$dev"/bin/*-config; do substituteInPlace "$file" --replace pkg-config \ - "PKG_CONFIG_PATH='$dev/lib/pkgconfig' '${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config'" + "PKG_CONFIG_PATH='$dev/lib/pkgconfig' '${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config'" done '' + lib.optionalString (ghostscript != null) '' for la in $out/lib/*.la; do diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 42f157e5313..66ad424253e 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, libtool +{ lib, stdenv, fetchFromGitHub, pkg-config, libtool , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg, djvulibre , lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, fftw, libheif, libde265 , ApplicationServices @@ -12,39 +12,19 @@ let else if stdenv.hostPlatform.system == "aarch64-linux" then "aarch64" else if stdenv.hostPlatform.system == "powerpc64le-linux" then "ppc64le" else throw "ImageMagick is not supported on this platform."; - - cfg = { - version = "6.9.11-29"; - sha256 = "0adjdpi91ya0g3v7y503n95833m25aibkim5swg5lnwjrba407hg"; - patches = []; - } - # Freeze version on mingw so we don't need to port the patch too often. - # FIXME: This version has multiple security vulnerabilities - // lib.optionalAttrs (stdenv.hostPlatform.isMinGW) { - version = "6.9.2-0"; - sha256 = "17ir8bw1j7g7srqmsz3rx780sgnc21zfn0kwyj78iazrywldx8h7"; - patches = [(fetchpatch { - name = "mingw-build.patch"; - url = "https://raw.githubusercontent.com/Alexpux/MINGW-packages/" - + "01ca03b2a4ef/mingw-w64-imagemagick/002-build-fixes.patch"; - sha256 = "1pypszlcx2sf7wfi4p37w1y58ck2r8cd5b2wrrwr9rh87p7fy1c0"; - })]; - }; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "imagemagick"; - inherit (cfg) version; + version = "6.9.11-60"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick6"; - rev = cfg.version; - inherit (cfg) sha256; + rev = version; + sha256 = "12810882a0kf4zlgyi290z9bjs921m05njbljkjfw6s1hf0mncl0"; }; - patches = cfg.patches; - outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big outputMan = "out"; # it's tiny @@ -62,7 +42,7 @@ stdenv.mkDerivation { [ "--enable-static" "--disable-shared" ] # due to libxml2 being without DLLs ATM ; - nativeBuildInputs = [ pkgconfig libtool ]; + nativeBuildInputs = [ pkg-config libtool ]; buildInputs = [ zlib fontconfig freetype ghostscript @@ -85,10 +65,10 @@ stdenv.mkDerivation { moveToOutput "bin/*-config" "$dev" moveToOutput "lib/ImageMagick-*/config-Q16" "$dev" # includes configure params for file in "$dev"/bin/*-config; do - substituteInPlace "$file" --replace "${pkgconfig}/bin/pkg-config -config" \ - ${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config - substituteInPlace "$file" --replace ${pkgconfig}/bin/pkg-config \ - "PKG_CONFIG_PATH='$dev/lib/pkgconfig' '${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config'" + substituteInPlace "$file" --replace "${pkg-config}/bin/pkg-config -config" \ + ${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config + substituteInPlace "$file" --replace ${pkg-config}/bin/pkg-config \ + "PKG_CONFIG_PATH='$dev/lib/pkgconfig' '${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config'" done '' + lib.optionalString (ghostscript != null) '' for la in $out/lib/*.la; do diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix index a994ae271c9..0459d1d04ac 100644 --- a/pkgs/applications/graphics/ahoviewer/default.nix +++ b/pkgs/applications/graphics/ahoviewer/default.nix @@ -1,4 +1,4 @@ -{ config, lib, stdenv, fetchFromGitHub, pkgconfig, libconfig +{ config, lib, stdenv, fetchFromGitHub, pkg-config, libconfig , gtkmm2, glibmm, libxml2, libsecret, curl, libzip , librsvg, gst_all_1, autoreconfHook, makeWrapper , useUnrar ? config.ahoviewer.useUnrar or false, unrar @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ]; + nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper ]; buildInputs = [ glibmm libconfig gtkmm2 glibmm libxml2 libsecret curl libzip librsvg @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { gst_all_1.gst-plugins-good gst_all_1.gst-libav gst_all_1.gst-plugins-base - ] ++ stdenv.lib.optional useUnrar unrar; + ] ++ lib.optional useUnrar unrar; NIX_LDFLAGS = "-lpthread"; - postPatch = ''patchShebangs version.sh''; + postPatch = "patchShebangs version.sh"; postInstall = '' wrapProgram $out/bin/ahoviewer \ diff --git a/pkgs/applications/graphics/akira/default.nix b/pkgs/applications/graphics/akira/default.nix index 4d0cc46bb59..c2d8a4bda35 100644 --- a/pkgs/applications/graphics/akira/default.nix +++ b/pkgs/applications/graphics/akira/default.nix @@ -6,7 +6,7 @@ , meson , ninja , pantheon -, pkgconfig +, pkg-config , python3 , vala , vala-lint @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { desktop-file-utils meson ninja - pkgconfig + pkg-config python3 vala vala-lint diff --git a/pkgs/applications/graphics/animbar/default.nix b/pkgs/applications/graphics/animbar/default.nix index 771145d54b6..dda734363eb 100644 --- a/pkgs/applications/graphics/animbar/default.nix +++ b/pkgs/applications/graphics/animbar/default.nix @@ -22,14 +22,14 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Create your own animation on paper and transparancy"; longDescription = '' - Animbar lets you easily create your own animation on paper and - transparancy. From a set of input images two output images are - computed, that are printed one on paper and one on - transparency. By moving the transparency over the paper you - create a fascinating animation effect. This kind of animation - technique is hundreds of years old and known under several - names: picket fence animation, barrier grid animation, Moiré - animation, to name a few. + Animbar lets you easily create your own animation on paper and + transparancy. From a set of input images two output images are + computed, that are printed one on paper and one on + transparency. By moving the transparency over the paper you + create a fascinating animation effect. This kind of animation + technique is hundreds of years old and known under several + names: picket fence animation, barrier grid animation, Moiré + animation, to name a few. ''; homepage = "http://animbar.mnim.org"; maintainers = with maintainers; [ leenaars ]; diff --git a/pkgs/applications/graphics/apitrace/default.nix b/pkgs/applications/graphics/apitrace/default.nix index 462962d9e18..f842cf6f5c4 100644 --- a/pkgs/applications/graphics/apitrace/default.nix +++ b/pkgs/applications/graphics/apitrace/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { for i in $out/bin/eglretrace $out/bin/glretrace do echo "Patching RPath for $i" - patchelf --set-rpath "${stdenv.lib.makeLibraryPath [libglvnd]}:$(patchelf --print-rpath $i)" $i + patchelf --set-rpath "${lib.makeLibraryPath [libglvnd]}:$(patchelf --print-rpath $i)" $i done wrapQtApp $out/bin/qapitrace diff --git a/pkgs/applications/graphics/autopanosiftc/default.nix b/pkgs/applications/graphics/autopanosiftc/default.nix index 5c649b384c7..129e3e54769 100644 --- a/pkgs/applications/graphics/autopanosiftc/default.nix +++ b/pkgs/applications/graphics/autopanosiftc/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cmake, libpng, libtiff, libjpeg, panotools, libxml2 }: +{lib, stdenv, fetchurl, cmake, libpng, libtiff, libjpeg, panotools, libxml2 }: stdenv.mkDerivation { name = "autopano-sift-C-2.5.1"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { homepage = "http://hugin.sourceforge.net/"; description = "Implementation in C of the autopano-sift algorithm for automatically stitching panoramas"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/graphics/autotrace/default.nix b/pkgs/applications/graphics/autotrace/default.nix index 54cc09a4d18..e3b966353ff 100644 --- a/pkgs/applications/graphics/autotrace/default.nix +++ b/pkgs/applications/graphics/autotrace/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, callPackage, libpng12, imagemagick -, autoreconfHook, glib, pstoedit, pkgconfig, gettext, gd, darwin +, autoreconfHook, glib, pstoedit, pkg-config, gettext, gd, darwin , runtimeShell }: # TODO: Figure out why the resultant binary is somehow linked against @@ -34,9 +34,9 @@ stdenv.mkDerivation rec { #''; autofig = callPackage ./autofig.nix {}; - nativeBuildInputs = [ autoreconfHook glib autofig pkgconfig gettext ]; + nativeBuildInputs = [ autoreconfHook glib autofig pkg-config gettext ]; buildInputs = [ libpng12 imagemagick pstoedit ] - ++ stdenv.lib.optionals stdenv.isDarwin + ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ gd ApplicationServices ]); postUnpack = '' diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index 65fc56f81b1..8726fc1d793 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -1,18 +1,18 @@ { lib, stdenv, makeDesktopItem, fetchurl, unzip , gdk-pixbuf, glib, gtk3, atk, at-spi2-atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsaLib, cups, expat, udev, gnome3 -, xorg, mozjpeg, makeWrapper, wrapGAppsHook, libuuid, at-spi2-core +, xorg, mozjpeg, makeWrapper, wrapGAppsHook, libuuid, at-spi2-core, libdrm, mesa }: stdenv.mkDerivation rec { pname = "avocode"; - version = "4.10.4"; + version = "4.11.1"; src = fetchurl { url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip"; - sha256 = "06xf5y2mljk3pd74ap9n90bhhidbzpg5c6wws361ygd4f3x86c46"; + sha256 = "sha256-Qe5mV9GBLHsmzMQg6dKib/sTnNdyOTj4wYQ9xd/iqJM="; }; - libPath = stdenv.lib.makeLibraryPath (with xorg; [ + libPath = lib.makeLibraryPath (with xorg; [ stdenv.cc.cc.lib at-spi2-core.out gdk-pixbuf @@ -44,6 +44,8 @@ stdenv.mkDerivation rec { libXtst libXScrnSaver libuuid + libdrm + mesa ]); desktopItem = makeDesktopItem { diff --git a/pkgs/applications/graphics/c3d/default.nix b/pkgs/applications/graphics/c3d/default.nix index 4317cc78cda..0a4ed515511 100644 --- a/pkgs/applications/graphics/c3d/default.nix +++ b/pkgs/applications/graphics/c3d/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ itk4 ] - ++ stdenv.lib.optional stdenv.isDarwin Cocoa; + ++ lib.optional stdenv.isDarwin Cocoa; meta = with lib; { homepage = "https://github.com/pyushkevich/c3d"; diff --git a/pkgs/applications/graphics/comical/default.nix b/pkgs/applications/graphics/comical/default.nix index 800709de054..5c6ec804e62 100644 --- a/pkgs/applications/graphics/comical/default.nix +++ b/pkgs/applications/graphics/comical/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, wxGTK, util-linux, zlib }: +{lib, stdenv, fetchurl, wxGTK, util-linux, zlib }: stdenv.mkDerivation rec { name = "comical-0.8"; @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { meta = { description = "Viewer of CBR and CBZ files, often used to store scanned comics"; homepage = "http://comical.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index c93b94ee183..0f47b87d4ac 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, libsoup, graphicsmagick, json-glib, wrapGAppsHook , cairo, cmake, ninja, curl, perl, llvm, desktop-file-utils, exiv2, glib , ilmbase, gtk3, intltool, lcms2, lensfun, libX11, libexif, libgphoto2, libjpeg -, libpng, librsvg, libtiff, openexr, osm-gps-map, pkgconfig, sqlite, libxslt +, libpng, librsvg, libtiff, openexr, osm-gps-map, pkg-config, sqlite, libxslt , openjpeg, lua, pugixml, colord, colord-gtk, libwebp, libsecret, gnome3 , ocl-icd, pcre, gtk-mac-integration, isocodes, llvmPackages }: @@ -15,21 +15,21 @@ stdenv.mkDerivation rec { sha256 = "6dd3de1f5ea9f94af92838c0be5ff30fdaa599aa1d737dcb562f9e0b2b2dbdda"; }; - nativeBuildInputs = [ cmake ninja llvm pkgconfig intltool perl desktop-file-utils wrapGAppsHook ]; + nativeBuildInputs = [ cmake ninja llvm pkg-config intltool perl desktop-file-utils wrapGAppsHook ]; buildInputs = [ cairo curl exiv2 glib gtk3 ilmbase lcms2 lensfun libexif libgphoto2 libjpeg libpng librsvg libtiff openexr sqlite libxslt libsoup graphicsmagick json-glib openjpeg lua pugixml libwebp libsecret gnome3.adwaita-icon-theme osm-gps-map pcre isocodes - ] ++ stdenv.lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ colord colord-gtk libX11 ocl-icd - ] ++ stdenv.lib.optional stdenv.isDarwin gtk-mac-integration - ++ stdenv.lib.optional stdenv.cc.isClang llvmPackages.openmp; + ] ++ lib.optional stdenv.isDarwin gtk-mac-integration + ++ lib.optional stdenv.cc.isClang llvmPackages.openmp; cmakeFlags = [ "-DBUILD_USERMANUAL=False" - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ "-DUSE_COLORD=OFF" "-DUSE_KWALLET=OFF" ]; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { # the wrappers: preFixup = let libPathEnvVar = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; - libPathPrefix = "$out/lib/darktable" + stdenv.lib.optionalString stdenv.isLinux ":${ocl-icd}/lib"; + libPathPrefix = "$out/lib/darktable" + lib.optionalString stdenv.isLinux ":${ocl-icd}/lib"; in '' for f in $out/share/darktable/kernels/*.cl; do sed -r "s|#include \"(.*)\"|#include \"$out/share/darktable/kernels/\1\"|g" -i "$f" diff --git a/pkgs/applications/graphics/dia/CVE-2019-19451.patch b/pkgs/applications/graphics/dia/CVE-2019-19451.patch new file mode 100644 index 00000000000..28d6598330a --- /dev/null +++ b/pkgs/applications/graphics/dia/CVE-2019-19451.patch @@ -0,0 +1,11 @@ +diff -ru a/app/app_procs.c b/app/app_procs.c +--- a/app/app_procs.c 2021-01-30 11:09:52.000000000 -0500 ++++ b/app/app_procs.c 2021-01-30 11:11:05.000000000 -0500 +@@ -785,6 +785,7 @@ + + if (!filename) { + g_print (_("Filename conversion failed: %s\n"), filenames[i]); ++ ++i; + continue; + } + diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix index da6047a0256..d9de3eb7fc1 100644 --- a/pkgs/applications/graphics/dia/default.nix +++ b/pkgs/applications/graphics/dia/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, autoconf, automake, libtool, gtk2, pkgconfig, perlPackages, +{ lib, stdenv, fetchgit, autoconf, automake, libtool, gtk2, pkg-config, perlPackages, libxml2, gettext, python, libxml2Python, docbook5, docbook_xsl, libxslt, intltool, libart_lgpl, withGNOME ? false, libgnomeui, gtk-mac-integration-gtk2 }: @@ -13,19 +13,23 @@ stdenv.mkDerivation { sha256 = "1fyxfrzdcs6blxhkw3bcgkksaf3byrsj4cbyrqgb4869k3ynap96"; }; + patches = [ + ./CVE-2019-19451.patch + ]; + buildInputs = [ gtk2 libxml2 gettext python libxml2Python docbook5 libxslt docbook_xsl libart_lgpl ] - ++ stdenv.lib.optional withGNOME libgnomeui - ++ stdenv.lib.optional stdenv.isDarwin gtk-mac-integration-gtk2; + ++ lib.optional withGNOME libgnomeui + ++ lib.optional stdenv.isDarwin gtk-mac-integration-gtk2; - nativeBuildInputs = [ autoconf automake libtool pkgconfig intltool ] + nativeBuildInputs = [ autoconf automake libtool pkg-config intltool ] ++ (with perlPackages; [ perl XMLParser ]); preConfigure = '' NOCONFIGURE=1 ./autogen.sh # autoreconfHook is not enough ''; - configureFlags = stdenv.lib.optional withGNOME "--enable-gnome"; + configureFlags = lib.optional withGNOME "--enable-gnome"; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/graphics/displaycal/default.nix b/pkgs/applications/graphics/displaycal/default.nix index 5b324a5974d..3b6bb01bb15 100644 --- a/pkgs/applications/graphics/displaycal/default.nix +++ b/pkgs/applications/graphics/displaycal/default.nix @@ -1,7 +1,7 @@ { python2 -, stdenv +, lib , fetchurl -, pkgconfig +, pkg-config , libXext , libXxf86vm , libX11 @@ -38,7 +38,7 @@ in buildPythonApplication rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config ]; preConfigure = '' @@ -65,8 +65,8 @@ in buildPythonApplication rec { meta = { description = "Display Calibration and Characterization powered by Argyll CMS"; homepage = "https://displaycal.net/"; - license = stdenv.lib.licenses.gpl3; - maintainers = [stdenv.lib.maintainers.marcweber]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + maintainers = [lib.maintainers.marcweber]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/graphics/djview/default.nix b/pkgs/applications/graphics/djview/default.nix index a7fc17ce29b..ef100e5f7bd 100644 --- a/pkgs/applications/graphics/djview/default.nix +++ b/pkgs/applications/graphics/djview/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , mkDerivation , fetchurl -, pkgconfig +, pkg-config , djvulibre , qtbase , qttools @@ -20,7 +20,7 @@ mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config qttools ]; @@ -29,7 +29,7 @@ mkDerivation rec { qtbase xorg.libXt libtiff - ] ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.AGL; + ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.AGL; configureFlags = [ "--disable-silent-rules" @@ -37,7 +37,7 @@ mkDerivation rec { "--with-x" "--with-tiff" # NOTE: 2019-09-19: experimental "--enable-npdjvu" fails - ] ++ stdenv.lib.optional stdenv.isDarwin "--enable-mac"; + ] ++ lib.optional stdenv.isDarwin "--enable-mac"; passthru = { mozillaPlugin = "/lib/mozilla/plugins"; diff --git a/pkgs/applications/graphics/dosage/default.nix b/pkgs/applications/graphics/dosage/default.nix index b491c3e3ead..db0012a184b 100644 --- a/pkgs/applications/graphics/dosage/default.nix +++ b/pkgs/applications/graphics/dosage/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub }: python3Packages.buildPythonApplication rec { pname = "dosage"; @@ -23,6 +23,6 @@ python3Packages.buildPythonApplication rec { meta = { description = "A comic strip downloader and archiver"; homepage = "https://dosage.rocks/"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; } diff --git a/pkgs/applications/graphics/drawing/default.nix b/pkgs/applications/graphics/drawing/default.nix index a0d28689ae7..0feb72f64aa 100644 --- a/pkgs/applications/graphics/drawing/default.nix +++ b/pkgs/applications/graphics/drawing/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , meson , ninja -, pkgconfig +, pkg-config , python3 , gtk3 , appstream-glib @@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication rec { gobject-introspection meson ninja - pkgconfig + pkg-config wrapGAppsHook glib gettext diff --git a/pkgs/applications/graphics/emulsion/default.nix b/pkgs/applications/graphics/emulsion/default.nix index ba7ebfcfdff..9792ce4d6d2 100644 --- a/pkgs/applications/graphics/emulsion/default.nix +++ b/pkgs/applications/graphics/emulsion/default.nix @@ -15,7 +15,6 @@ , libxcb , libxkbcommon , wayland -, xdg_utils , AppKit , CoreGraphics , CoreServices @@ -38,16 +37,16 @@ let in rustPlatform.buildRustPackage rec { pname = "emulsion"; - version = "7.2"; + version = "8.0"; src = fetchFromGitHub { owner = "ArturKovacs"; repo = pname; rev = "v${version}"; - sha256 = "1king04p5j4gsvprrfppwaxa5jn4ga4nc0v63wl6fvq2ngwnkg4g"; + sha256 = "sha256-xv3q59HobunrFyc+CPLztpsQd20Eu4+JI+iYhlGI0bc="; }; - cargoSha256 = "19vb2q5w3063l7349p1b8q40n97a4hxdvc7h7qsx1iiwp75knbd0"; + cargoSha256 = "sha256-37xtdFbtbfGUqaSpzlxDQfe1+0ESHz/rgO1iTPBEBLc="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/applications/graphics/epeg/default.nix b/pkgs/applications/graphics/epeg/default.nix index 75f1fb9acd1..942a6d63bd5 100644 --- a/pkgs/applications/graphics/epeg/default.nix +++ b/pkgs/applications/graphics/epeg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, libtool, autoconf, automake +{ lib, stdenv, fetchFromGitHub, pkg-config, libtool, autoconf, automake , libjpeg, libexif }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig libtool autoconf automake ]; + nativeBuildInputs = [ pkg-config libtool autoconf automake ]; propagatedBuildInputs = [ libjpeg libexif ]; diff --git a/pkgs/applications/graphics/exrdisplay/default.nix b/pkgs/applications/graphics/exrdisplay/default.nix index 7841e9d571b..c31c1407da7 100644 --- a/pkgs/applications/graphics/exrdisplay/default.nix +++ b/pkgs/applications/graphics/exrdisplay/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, fltk, openexr, libGLU, libGL, ctl }: +{ lib, stdenv, fetchurl, pkg-config, fltk, openexr, libGLU, libGL, ctl }: stdenv.mkDerivation { name ="openexr_viewers-2.2.1"; @@ -16,13 +16,13 @@ stdenv.mkDerivation { make LDFLAGS="`fltk-config --ldflags` -lGL -lfltk_gl" ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openexr fltk libGLU libGL ctl ]; meta = { description = "Application for viewing OpenEXR images on a display at various exposure settings"; homepage = "http://openexr.com"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.bsd3; + platforms = lib.platforms.linux; + license = lib.licenses.bsd3; }; } diff --git a/pkgs/applications/graphics/exrtools/default.nix b/pkgs/applications/graphics/exrtools/default.nix index c50b6d0c2ad..1985176765f 100644 --- a/pkgs/applications/graphics/exrtools/default.nix +++ b/pkgs/applications/graphics/exrtools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, openexr, libpng12, libjpeg }: +{ lib, stdenv, fetchurl, pkg-config, openexr, libpng12, libjpeg }: stdenv.mkDerivation rec { pname = "exrtools"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0jpkskqs1yjiighab4s91jy0c0qxcscwadfn94xy2mm2bx2qwp4z"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ stdenv openexr libpng12 libjpeg ]; meta = with lib; { diff --git a/pkgs/applications/graphics/f3d/default.nix b/pkgs/applications/graphics/f3d/default.nix index e90d0e13f22..92875bcaeee 100644 --- a/pkgs/applications/graphics/f3d/default.nix +++ b/pkgs/applications/graphics/f3d/default.nix @@ -2,21 +2,21 @@ stdenv.mkDerivation rec { pname = "f3d"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitLab { domain = "gitlab.kitware.com"; owner = "f3d"; repo = "f3d"; rev = "v${version}"; - sha256 = "0a6r0jspkhl735f6zmnhby1g4dlmjqd5izgsp5yfdcdhqj4j63mg"; + sha256 = "0lj20k5qyw9z85k3wsp05f7dcv7v7asrnppi8i1jm32dzxjm4siw"; }; nativeBuildInputs = [ cmake ]; buildInputs = [ vtk_9 ] - ++ stdenv.lib.optionals stdenv.isLinux [ libGL libX11 ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa OpenGL ]; + ++ lib.optionals stdenv.isLinux [ libGL libX11 ] + ++ lib.optionals stdenv.isDarwin [ Cocoa OpenGL ]; meta = with lib; { description = "Fast and minimalist 3D viewer using VTK"; diff --git a/pkgs/applications/graphics/fbida/default.nix b/pkgs/applications/graphics/fbida/default.nix index 4754cc1a024..9ed6ee75159 100644 --- a/pkgs/applications/graphics/fbida/default.nix +++ b/pkgs/applications/graphics/fbida/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, libjpeg, libexif, libungif, libtiff, libpng, libwebp, libdrm -, pkgconfig, freetype, fontconfig, which, imagemagick, curl, sane-backends, libXpm +, pkg-config, freetype, fontconfig, which, imagemagick, curl, sane-backends, libXpm , epoxy, poppler, mesa, lirc }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0f242mix20rgsqz1llibhsz4r2pbvx6k32rmky0zjvnbaqaw1dwm"; }; - nativeBuildInputs = [ pkgconfig which ]; + nativeBuildInputs = [ pkg-config which ]; buildInputs = [ libexif libjpeg libpng libungif freetype fontconfig libtiff libwebp imagemagick curl sane-backends libdrm libXpm epoxy poppler lirc diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index a7d26f5300a..fac3dbb5534 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, makeWrapper +{ lib, stdenv, fetchurl, makeWrapper , xorg, imlib2, libjpeg, libpng , curl, libexif, jpegexiforient, perlPackages , enableAutoreload ? !stdenv.hostPlatform.isDarwin }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "feh"; - version = "3.6.1"; + version = "3.6.3"; src = fetchurl { url = "https://feh.finalrewind.org/${pname}-${version}.tar.bz2"; - sha256 = "1a0ygdpyvpcsr0hdi9ai7ycbkgvacq8dpd8cacbppsds5k2xw7lv"; + sha256 = "sha256-Q3Qg838RYU4AjQZuKjve/Px4FEyCEpmLK6zdXSHqI7Q="; }; outputs = [ "out" "man" "doc" ]; diff --git a/pkgs/applications/graphics/fig2dev/default.nix b/pkgs/applications/graphics/fig2dev/default.nix index c22bbbb4827..667f5afe579 100644 --- a/pkgs/applications/graphics/fig2dev/default.nix +++ b/pkgs/applications/graphics/fig2dev/default.nix @@ -1,26 +1,32 @@ -{ lib, stdenv, fetchurl, ghostscript, libpng } : +{ lib, stdenv, fetchurl, ghostscript, libpng, makeWrapper +, coreutils, bc, gnugrep, gawk, gnused } : -let - version = "3.2.7b"; - -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "fig2dev"; - inherit version; + version = "3.2.8"; src = fetchurl { url = "mirror://sourceforge/mcj/fig2dev-${version}.tar.xz"; - sha256 = "1ck8gnqgg13xkxq4hrdy706i4xdgrlckx6bi6wxm1g514121pp27"; + sha256 = "0zg29yqknfafyzmmln4k7kydfb2dapk3r8ffvlqhj3cm8fp5h4lk"; }; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ libpng ]; GSEXE="${ghostscript}/bin/gs"; + postInstall = '' + wrapProgram $out/bin/fig2ps2tex \ + --set PATH ${lib.makeBinPath [ coreutils bc gnugrep gawk ]} + wrapProgram $out/bin/pic2tpic \ + --set PATH ${lib.makeBinPath [ gnused ]} + ''; + meta = with lib; { description = "Tool to convert Xfig files to other formats"; homepage = "http://mcj.sourceforge.net/"; license = licenses.xfig; platforms = platforms.linux; + maintainers = with maintainers; [ lesuisse ]; }; } - diff --git a/pkgs/applications/graphics/fluxus/default.nix b/pkgs/applications/graphics/fluxus/default.nix index 05260dc9812..acec5293101 100644 --- a/pkgs/applications/graphics/fluxus/default.nix +++ b/pkgs/applications/graphics/fluxus/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { "RacketPrefix=${racket}" "RacketInclude=${racket}/include/racket" "RacketLib=${racket}/lib/racket" - "LIBPATH=${stdenv.lib.makeLibraryPath libs}" + "LIBPATH=${lib.makeLibraryPath libs}" "DESTDIR=build" ]; configurePhase = '' diff --git a/pkgs/applications/graphics/fondo/default.nix b/pkgs/applications/graphics/fondo/default.nix index ee75d6e1ae0..49e8fee513d 100644 --- a/pkgs/applications/graphics/fondo/default.nix +++ b/pkgs/applications/graphics/fondo/default.nix @@ -3,7 +3,7 @@ , nix-update-script , pantheon , vala -, pkgconfig +, pkg-config , meson , ninja , python3 @@ -21,20 +21,20 @@ stdenv.mkDerivation rec { pname = "fondo"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "calo001"; repo = pname; rev = version; - sha256 = "1zmrpk0b5z6m956j923njn6dpqdm2p8653a325hgjjjq0sgwbhj2"; + sha256 = "sha256-eGHgZm9Q6JnY6OQNAyrFvRsuyuFnruMJNckOCCiO4Ug="; }; nativeBuildInputs = [ desktop-file-utils meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index cb37a81d9e1..1c4f05b42da 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, fetchpatch, cmake, ninja, coin3d, +{ lib, mkDerivation, fetchFromGitHub, fetchpatch, cmake, ninja, coin3d, xercesc, ode, eigen, qtbase, qttools, qtwebengine, qtxmlpatterns, wrapQtAppsHook, opencascade-occt, gts, hdf5, vtk, medfile, zlib, python3Packages, swig, -gfortran, libXmu, soqt, libf2c, libGLU, makeWrapper, pkgconfig, mpi ? null }: +gfortran, libXmu, soqt, libf2c, libGLU, makeWrapper, pkg-config, mpi ? null }: assert mpi != null; @@ -21,7 +21,7 @@ in mkDerivation rec { nativeBuildInputs = [ cmake ninja - pkgconfig + pkg-config pythonPackages.pyside2-tools wrapQtAppsHook ]; @@ -33,6 +33,7 @@ in mkDerivation rec { ] ++ (with pythonPackages; [ matplotlib pycollada shiboken2 pyside2 pyside2-tools pivy python boost GitPython # for addon manager + scipy pyyaml # (at least for) PyrateWorkbench ]); cmakeFlags = [ diff --git a/pkgs/applications/graphics/freepv/default.nix b/pkgs/applications/graphics/freepv/default.nix index a0356d12981..bf990c4d0ef 100644 --- a/pkgs/applications/graphics/freepv/default.nix +++ b/pkgs/applications/graphics/freepv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libjpeg, libGLU, libGL, freeglut, zlib, cmake, libX11, libxml2, libpng, +{ lib, stdenv, fetchurl, libjpeg, libGLU, libGL, freeglut, zlib, cmake, libX11, libxml2, libpng, libXxf86vm }: stdenv.mkDerivation { @@ -30,6 +30,6 @@ stdenv.mkDerivation { meta = { description = "Open source panorama viewer using GL"; homepage = "http://freepv.sourceforge.net/"; - license = [ stdenv.lib.licenses.lgpl21 ]; + license = [ lib.licenses.lgpl21 ]; }; } diff --git a/pkgs/applications/graphics/fstl/default.nix b/pkgs/applications/graphics/fstl/default.nix index e7eb2c4f92a..c6b77300cb3 100644 --- a/pkgs/applications/graphics/fstl/default.nix +++ b/pkgs/applications/graphics/fstl/default.nix @@ -14,7 +14,7 @@ mkDerivation rec { qmake qt/fstl.pro ''; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.isDarwin '' mkdir -p $out/Applications mv fstl.app $out/Applications ''; diff --git a/pkgs/applications/graphics/gcolor2/default.nix b/pkgs/applications/graphics/gcolor2/default.nix index f585a0c5d29..0e79f981fbc 100644 --- a/pkgs/applications/graphics/gcolor2/default.nix +++ b/pkgs/applications/graphics/gcolor2/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gtk2, perlPackages, pkgconfig } : +{lib, stdenv, fetchurl, gtk2, perlPackages, pkg-config } : let version = "0.4"; in stdenv.mkDerivation { @@ -20,15 +20,15 @@ stdenv.mkDerivation { [ ./gcolor2-amd64.patch ] else [ ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 ] ++ (with perlPackages; [ perl XMLParser ]); meta = { description = "Simple GTK 2 color selector"; homepage = "http://gcolor2.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ notthemessiah ]; - platforms = with stdenv.lib.platforms; unix; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ notthemessiah ]; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index 7167700c244..ff1df143141 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, autoconf, automake, gettext, intltool +{ lib, stdenv, fetchurl, pkg-config, autoconf, automake, gettext, intltool , gtk3, lcms2, exiv2, libchamplain, clutter-gtk, ffmpegthumbnailer, fbida , wrapGAppsHook, fetchpatch }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; - nativeBuildInputs = [ pkgconfig autoconf automake gettext intltool + nativeBuildInputs = [ pkg-config autoconf automake gettext intltool wrapGAppsHook ]; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { # Allow geeqie to find exiv2 and exiftran, necessary to # losslessly rotate JPEG images. sed -i $out/lib/geeqie/geeqie-rotate \ - -e '1 a export PATH=${stdenv.lib.makeBinPath [ exiv2 fbida ]}:$PATH' + -e '1 a export PATH=${lib.makeBinPath [ exiv2 fbida ]}:$PATH' ''; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index 4ba7cb8eb03..62f1a362771 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -3,7 +3,7 @@ , fetchurl , substituteAll , autoreconfHook -, pkgconfig +, pkg-config , intltool , babl , gegl @@ -76,7 +76,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook # hardcode-plugin-interpreters.patch changes Makefile.am - pkgconfig + pkg-config intltool gettext makeWrapper diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 7ea76c9a824..555bfbe17e7 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -35,7 +35,7 @@ let } // attrs // { - name = "gimp-plugin-${name}"; + name = "${gimp.name}-plugin-${name}"; buildInputs = [ gimp gimp.gtk @@ -167,8 +167,6 @@ in variant = "gimp"; }; - ufraw = pkgs.ufraw.gimpPlugin; - gimplensfun = pluginDerivation rec { version = "unstable-2018-10-21"; name = "gimplensfun-${version}"; @@ -191,9 +189,9 @@ in homepage = "http://lensfun.sebastiankraft.net/"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; + platforms = lib.platforms.gnu ++ lib.platforms.linux; }; }; diff --git a/pkgs/applications/graphics/gimp/wrapper.nix b/pkgs/applications/graphics/gimp/wrapper.nix index 7e8ce913f02..8fde04d0d1d 100644 --- a/pkgs/applications/graphics/gimp/wrapper.nix +++ b/pkgs/applications/graphics/gimp/wrapper.nix @@ -1,10 +1,10 @@ -{ stdenv, lib, symlinkJoin, gimp, makeWrapper, gimpPlugins, gnome3, plugins ? null}: +{ lib, symlinkJoin, gimp, makeWrapper, gimpPlugins, gnome3, plugins ? null}: let allPlugins = lib.filter (pkg: lib.isDerivation pkg && !pkg.meta.broken or false) (lib.attrValues gimpPlugins); selectedPlugins = lib.filter (pkg: pkg != gimpPlugins.gimp) (if plugins == null then allPlugins else plugins); extraArgs = map (x: x.wrapArgs or "") selectedPlugins; -versionBranch = stdenv.lib.versions.majorMinor gimp.version; +versionBranch = lib.versions.majorMinor gimp.version; in symlinkJoin { name = "gimp-with-plugins-${gimp.version}"; diff --git a/pkgs/applications/graphics/glabels/default.nix b/pkgs/applications/graphics/glabels/default.nix index c6b7b60c98e..33337739364 100644 --- a/pkgs/applications/graphics/glabels/default.nix +++ b/pkgs/applications/graphics/glabels/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, barcode, gnome3, autoreconfHook , gtk3, gtk-doc, libxml2, librsvg , libtool, libe-book, gsettings-desktop-schemas -, intltool, itstool, makeWrapper, pkgconfig, yelp-tools +, intltool, itstool, makeWrapper, pkg-config, yelp-tools }: stdenv.mkDerivation rec { @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { version = "3.4.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0f2rki8i27pkd9r0gz03cdl1g4vnmvp0j49nhxqn275vi8lmgr0q"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper intltool ]; + nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper intltool ]; buildInputs = [ barcode gtk3 gtk-doc yelp-tools gnome3.gnome-common gsettings-desktop-schemas diff --git a/pkgs/applications/graphics/glimpse/default.nix b/pkgs/applications/graphics/glimpse/default.nix new file mode 100644 index 00000000000..de85fb9bf17 --- /dev/null +++ b/pkgs/applications/graphics/glimpse/default.nix @@ -0,0 +1,197 @@ +{ stdenv +, lib +, fetchFromGitHub +, substituteAll +, pkg-config +, intltool +, babl +, gegl +, gtk2 +, glib +, gdk-pixbuf +, isocodes +, pango +, cairo +, freetype +, fontconfig +, lcms +, libpng +, libjpeg +, poppler +, poppler_data +, libtiff +, libmng +, librsvg +, libwmf +, zlib +, libzip +, ghostscript +, aalib +, shared-mime-info +, python2 +, libexif +, gettext +, xorg +, glib-networking +, libmypaint +, gexiv2 +, harfbuzz +, mypaint-brushes1 +, libwebp +, libheif +, libgudev +, openexr +, AppKit +, Cocoa +, gtk-mac-integration-gtk2 +, libxslt +, automake +, autoconf +, libtool +, makeWrapper +, autoreconfHook +, gtk-doc +}: +let + python = python2.withPackages (pp: [ pp.pygtk ]); +in +stdenv.mkDerivation rec { + pname = "glimpse"; + version = "0.2.0"; + + outputs = [ "out" "dev" ]; + + src = fetchFromGitHub { + owner = "glimpse-editor"; + repo = "Glimpse"; + rev = "v${version}"; + sha256 = "sha256-qbZQmAo7fuJWWbn0QTyxAwAenZOdsGueUq5/3IV8Njc="; + }; + + patches = [ + # to remove compiler from the runtime closure, reference was retained via + # gimp --version --verbose output + (substituteAll { + src = ./remove-cc-reference.patch; + cc_version = stdenv.cc.cc.name; + }) + ../gimp/hardcode-plugin-interpreters.patch + ]; + + postPatch = '' + ln -s ${gtk-doc}/share/gtk-doc/data/gtk-doc.make . + ''; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + intltool + gettext + automake + autoconf + makeWrapper + gtk-doc + libxslt + libtool + ]; + + buildInputs = [ + babl + gegl + gtk2 + glib + gdk-pixbuf + pango + cairo + gexiv2 + harfbuzz + isocodes + freetype + fontconfig + lcms + libpng + libjpeg + poppler + poppler_data + libtiff + openexr + libmng + librsvg + libwmf + zlib + libzip + ghostscript + aalib + shared-mime-info + libwebp + libheif + python + libexif + xorg.libXpm + glib-networking + libmypaint + mypaint-brushes1 + ] ++ lib.optionals stdenv.isDarwin [ + AppKit + Cocoa + gtk-mac-integration-gtk2 + ] ++ lib.optionals stdenv.isLinux [ + libgudev + ]; + + # needed by gimp-2.0.pc + propagatedBuildInputs = [ + gegl + ]; + + # Check if librsvg was built with --disable-pixbuf-loader. + PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = "${librsvg}/${gdk-pixbuf.moduleDir}"; + + preAutoreconf = '' + # The check runs before glib-networking is registered + export GIO_EXTRA_MODULES="${glib-networking}/lib/gio/modules:$GIO_EXTRA_MODULES" + ''; + + postFixup = '' + wrapProgram $out/bin/glimpse-${lib.versions.majorMinor version} \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" + ''; + + passthru = rec { + # The declarations for `glimpse-with-plugins` wrapper, + # used for determining plug-in installation paths + majorVersion = "2.0"; + targetPluginDir = "lib/glimpse/${majorVersion}/plug-ins"; + targetScriptDir = "share/glimpse/${majorVersion}/scripts"; + targetDataDir = "share/gimp/${majorVersion}"; + targetLibDir = "lib/gimp/${majorVersion}"; + + # probably its a good idea to use the same gtk in plugins ? + gtk = gtk2; + }; + + configureFlags = [ + "--without-webkit" # old version is required + "--with-bug-report-url=https://github.com/NixOS/nixpkgs/issues/new" + "--with-icc-directory=/run/current-system/sw/share/color/icc" + # fix libdir in pc files (${exec_prefix} needs to be passed verbatim) + "--libdir=\${exec_prefix}/lib" + ]; + + # on Darwin, + # test-eevl.c:64:36: error: initializer element is not a compile-time constant + doCheck = !stdenv.isDarwin; + + enableParallelBuilding = true; + + meta = with lib; { + description = "An open source image editor based on the GNU Image Manipulation Program"; + longDescription = '' + Glimpse is an open source image editor based on the GNU Image Manipulation Program (GIMP). The goal is to experiment with new ideas and expand the use of free software. + ''; + homepage = "https://glimpse-editor.org"; + maintainers = with maintainers; [ ashkitten erictapen ]; + license = licenses.gpl3Plus; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/graphics/glimpse/plugins/default.nix b/pkgs/applications/graphics/glimpse/plugins/default.nix new file mode 100644 index 00000000000..48c65c3d564 --- /dev/null +++ b/pkgs/applications/graphics/glimpse/plugins/default.nix @@ -0,0 +1,11 @@ +# Use `glimpse-with-plugins` package for Glimpse with all plug-ins. +# If you just want a subset of plug-ins, you can specify them explicitly: +# `glimpse-with-plugins.override { plugins = with glimpsePlugins; [ gap ]; }`. + +{ gimpPlugins, glimpse }: + +# This attrs can be extended in the future if there happen to be glimpse-only +# plugins or some that need further modification in order to work with Glimpse. +gimpPlugins.overrideScope' (self: super: { + gimp = glimpse; +}) diff --git a/pkgs/applications/graphics/glimpse/remove-cc-reference.patch b/pkgs/applications/graphics/glimpse/remove-cc-reference.patch new file mode 100644 index 00000000000..e63bf88dfdd --- /dev/null +++ b/pkgs/applications/graphics/glimpse/remove-cc-reference.patch @@ -0,0 +1,13 @@ +diff --git a/app/gimp-version.c b/app/gimp-version.c +index b584398231..1b40a1570f 100644 +--- a/app/gimp-version.c ++++ b/app/gimp-version.c +@@ -230,7 +230,7 @@ gimp_version (gboolean be_verbose, + GIMP_BUILD_ID, + gimp_version_get_revision (), + GIMP_BUILD_PLATFORM_FAMILY, +- CC_VERSION, ++ "@cc_version@", + lib_versions); + g_free (lib_versions); + diff --git a/pkgs/applications/graphics/glimpse/wrapper.nix b/pkgs/applications/graphics/glimpse/wrapper.nix new file mode 100644 index 00000000000..cdfb2f66873 --- /dev/null +++ b/pkgs/applications/graphics/glimpse/wrapper.nix @@ -0,0 +1,30 @@ +{ lib, symlinkJoin, glimpse, makeWrapper, glimpsePlugins, gnome3, plugins ? null }: + +let + allPlugins = lib.filter (pkg: lib.isDerivation pkg && !pkg.meta.broken or false) (lib.attrValues glimpsePlugins); + selectedPlugins = if plugins == null then allPlugins else plugins; + extraArgs = map (x: x.wrapArgs or "") selectedPlugins; + versionBranch = lib.versions.majorMinor glimpse.version; + +in +symlinkJoin { + name = "glimpse-with-plugins-${glimpse.version}"; + + paths = [ glimpse ] ++ selectedPlugins; + + buildInputs = [ makeWrapper ]; + + postBuild = '' + for each in glimpse-${versionBranch} glimpse-console-${versionBranch}; do + wrapProgram $out/bin/$each \ + --set GIMP2_PLUGINDIR "$out/lib/glimpse/2.0" \ + --set GIMP2_DATADIR "$out/share/glimpse/2.0" \ + --prefix GTK_PATH : "${gnome3.gnome-themes-extra}/lib/gtk-2.0" \ + ${toString extraArgs} + done + + for each in glimpse glimpse-console; do + ln -sf "$each-${versionBranch}" $out/bin/$each + done + ''; +} diff --git a/pkgs/applications/graphics/gnome-photos/default.nix b/pkgs/applications/graphics/gnome-photos/default.nix index 425762fdaa9..a710d6c1e47 100644 --- a/pkgs/applications/graphics/gnome-photos/default.nix +++ b/pkgs/applications/graphics/gnome-photos/default.nix @@ -27,7 +27,7 @@ , meson , ninja , nixosTests -, pkgconfig +, pkg-config , python3 , tracker , tracker-miners @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "installedTests" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1i64w69kk3sdf9vn7npnwrhy8qjwn0vizq200x3pgmbrfm3kjzv6"; }; @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { libxml2 meson ninja - pkgconfig + pkg-config (python3.withPackages (pkgs: with pkgs; [ dogtail pygobject3 diff --git a/pkgs/applications/graphics/gnuclad/default.nix b/pkgs/applications/graphics/gnuclad/default.nix index e4a82703feb..a1b4accc8d5 100644 --- a/pkgs/applications/graphics/gnuclad/default.nix +++ b/pkgs/applications/graphics/gnuclad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig +{ stdenv, lib, fetchurl, pkg-config }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error=catch-value"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = with lib; { homepage = "https://launchpad.net/gnuclad"; diff --git a/pkgs/applications/graphics/gocr/default.nix b/pkgs/applications/graphics/gocr/default.nix index 7c586374ec5..3c87e62e3d6 100644 --- a/pkgs/applications/graphics/gocr/default.nix +++ b/pkgs/applications/graphics/gocr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, tk }: +{ lib, stdenv, fetchurl, tk }: stdenv.mkDerivation rec { name = "gocr-0.52"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://jocr.sourceforge.net/"; description = "GPL Optical Character Recognition"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix index ec51e077c56..64ea533eefd 100644 --- a/pkgs/applications/graphics/goxel/default.nix +++ b/pkgs/applications/graphics/goxel/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, scons, pkgconfig, wrapGAppsHook +{ lib, stdenv, fetchFromGitHub, scons, pkg-config, wrapGAppsHook , glfw3, gtk3, libpng12 }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { patches = [ ./disable-imgui_ini.patch ]; - nativeBuildInputs = [ scons pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ scons pkg-config wrapGAppsHook ]; buildInputs = [ glfw3 gtk3 libpng12 ]; NIX_LDFLAGS = "-lpthread"; diff --git a/pkgs/applications/graphics/gpicview/default.nix b/pkgs/applications/graphics/gpicview/default.nix index e686aa4f359..b661ba562f9 100644 --- a/pkgs/applications/graphics/gpicview/default.nix +++ b/pkgs/applications/graphics/gpicview/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, intltool, pkgconfig, gtk2, fetchpatch }: +{ lib, stdenv, fetchurl, intltool, pkg-config, gtk2, fetchpatch }: stdenv.mkDerivation { name = "gpicview-0.2.4"; @@ -24,6 +24,6 @@ stdenv.mkDerivation { platforms = platforms.unix; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ intltool gtk2 ]; } diff --git a/pkgs/applications/graphics/gqview/default.nix b/pkgs/applications/graphics/gqview/default.nix index 6ea67e33212..39f7a42b3b3 100644 --- a/pkgs/applications/graphics/gqview/default.nix +++ b/pkgs/applications/graphics/gqview/default.nix @@ -1,6 +1,6 @@ -{lib, stdenv, fetchurl, pkgconfig, gtk2, libpng}: +{lib, stdenv, fetchurl, pkg-config, gtk2, libpng}: -assert pkgconfig != null && gtk2 != null && libpng != null; +assert pkg-config != null && gtk2 != null && libpng != null; # Note that we cannot just copy gtk's png attribute, since gtk might # not be linked against png. # !!! assert libpng == gtk2.libpng; @@ -13,7 +13,7 @@ stdenv.mkDerivation { sha256 = "0ilm5s7ps9kg4f5hzgjhg0xhn6zg0v9i7jnd67zrx9h7wsaa9zhj"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 libpng]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/graphics/grafx2/default.nix b/pkgs/applications/graphics/grafx2/default.nix index 2a2a6a67598..3529f827b4a 100644 --- a/pkgs/applications/graphics/grafx2/default.nix +++ b/pkgs/applications/graphics/grafx2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, SDL_image, SDL_ttf, zlib, libpng, pkgconfig, lua5 }: +{ lib, stdenv, fetchurl, SDL, SDL_image, SDL_ttf, zlib, libpng, pkg-config, lua5 }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0svsy6rqmdj11b400c242i2ixihyz0hds0dgicqz6g6dcgmcl62q"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ SDL SDL_image SDL_ttf libpng zlib lua5 ]; preBuild = "cd src"; @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { meta = { description = "Bitmap paint program inspired by the Amiga programs Deluxe Paint and Brilliance"; homepage = "http://pulkomandy.tk/projects/GrafX2"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = [ stdenv.lib.maintainers.zoomulator ]; + maintainers = [ lib.maintainers.zoomulator ]; }; } diff --git a/pkgs/applications/graphics/graphicsmagick/compat.nix b/pkgs/applications/graphics/graphicsmagick/compat.nix index 9517aa78ee4..b715093308f 100644 --- a/pkgs/applications/graphics/graphicsmagick/compat.nix +++ b/pkgs/applications/graphics/graphicsmagick/compat.nix @@ -1,4 +1,4 @@ -{ stdenv, graphicsmagick }: +{ lib, stdenv, graphicsmagick }: stdenv.mkDerivation { pname = "graphicsmagick-imagemagick-compat"; @@ -31,7 +31,7 @@ stdenv.mkDerivation { meta = { description = "ImageMagick interface for GraphicsMagick"; - license = stdenv.lib.licenses.free; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.free; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index b8b21e71c93..24e064e721b 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, bzip2, freetype, graphviz, ghostscript +{ lib, stdenv, fetchurl, bzip2, freetype, graphviz, ghostscript , libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz, libX11 , libwebp, quantumdepth ? 8, fixDarwinDylibNames }: stdenv.mkDerivation rec { pname = "graphicsmagick"; - version = "1.3.35"; + version = "1.3.36"; src = fetchurl { url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz"; - sha256 = "0l024l4hawm9s3jqrgi2j0lxgm61dqh8sgkj1017ma7y11hqv2hq"; + sha256 = "0ilg6fkppb4avzais1dvi3qf6ln7v3mzj7gjm83w7pwwfpg3ynsx"; }; patches = [ @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ xz ] - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; postInstall = '' sed -i 's/-ltiff.*'\'/\'/ $out/bin/* @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.graphicsmagick.org"; description = "Swiss army knife of image processing"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.mit; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/graphics/gscan2pdf/default.nix b/pkgs/applications/graphics/gscan2pdf/default.nix index 5125df7b7da..0e65d3199ab 100644 --- a/pkgs/applications/graphics/gscan2pdf/default.nix +++ b/pkgs/applications/graphics/gscan2pdf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perlPackages, wrapGAppsHook, +{ lib, fetchurl, perlPackages, wrapGAppsHook, # libs librsvg, sane-backends, sane-frontends, # runtime dependencies @@ -6,7 +6,7 @@ # test dependencies xvfb_run, liberation_ttf, file, tesseract }: -with stdenv.lib; +with lib; perlPackages.buildPerlPackage rec { pname = "gscan2pdf"; diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index c97e28c9f9a..cefb9c03dc0 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -2,7 +2,7 @@ , fetchurl , fetchpatch , gnome3 -, pkgconfig +, pkg-config , meson , ninja , exiv2 @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { version = "3.10.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0gm7q6n9lnjsdqpx5b0cqjayhzwnplqb6p5pshzhbfp2zqd2g9ss"; }; @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { itstool meson ninja - pkgconfig + pkg-config python3 wrapGAppsHook ]; diff --git a/pkgs/applications/graphics/guetzli/default.nix b/pkgs/applications/graphics/guetzli/default.nix index ccddf907e94..9f2f050441f 100644 --- a/pkgs/applications/graphics/guetzli/default.nix +++ b/pkgs/applications/graphics/guetzli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, libpng, fetchFromGitHub, pkgconfig }: +{ lib, stdenv, libpng, fetchFromGitHub, pkg-config }: let version = "1.0.1"; in @@ -11,7 +11,7 @@ stdenv.mkDerivation { rev = "v${version}"; sha256 = "1wy9wfvyradp0aigfv8yijvj0dgb5kpq2yf2xki15f605jc1r5dm"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libpng ]; installPhase = '' @@ -23,8 +23,8 @@ stdenv.mkDerivation { description = "Perceptual JPEG encoder"; longDescription = "Guetzli is a JPEG encoder that aims for excellent compression density at high visual quality."; homepage = "https://github.com/google/guetzli"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.x86_64; - maintainers = [ stdenv.lib.maintainers.seppeljordan ]; + license = lib.licenses.asl20; + platforms = lib.platforms.x86_64; + maintainers = [ lib.maintainers.seppeljordan ]; }; } diff --git a/pkgs/applications/graphics/hdr-plus/default.nix b/pkgs/applications/graphics/hdr-plus/default.nix new file mode 100644 index 00000000000..15042e6877f --- /dev/null +++ b/pkgs/applications/graphics/hdr-plus/default.nix @@ -0,0 +1,42 @@ +{ lib, stdenv, fetchFromGitHub, fetchpatch +, cmake, halide +, libpng, libjpeg, libtiff, libraw +}: + +stdenv.mkDerivation rec { + pname = "hdr-plus-unstable"; + version = "2020-10-29"; + + src = fetchFromGitHub { + owner = "timothybrooks"; + repo = "hdr-plus"; + rev = "132bd73ccd4eaef9830124605c93f06a98607cfa"; + sha256 = "1n49ggrppf336p7n510kapzh376791bysxj3f33m3bdzksq360ps"; + }; + + patches = [ + # PR #70, fixes incompatibility with Halide 10.0.0 + (fetchpatch { + url = "https://github.com/timothybrooks/hdr-plus/pull/70/commits/077e1a476279539c72e615210762dca27984c57b.patch"; + sha256 = "1sg2l1bqs2smpfpy4flwg86fzhcc4yf7zx998v1bfhim43yyrx59"; + }) + ]; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ halide libpng libjpeg libtiff libraw ]; + + installPhase = '' + for bin in hdrplus stack_frames; do + install -Dm755 $bin $out/bin/$bin + done + ''; + + meta = with lib; { + description = "Burst photography pipeline based on Google's HDR+"; + homepage = "https://www.timothybrooks.com/tech/hdr-plus/"; + license = licenses.mit; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index 17d1dc32676..f7f1e17be22 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, cmake, fetchurl, gnumake, makeWrapper, pkgconfig, fetchpatch +{ lib, stdenv, cmake, fetchurl, gnumake, makeWrapper, pkg-config, fetchpatch , autopanosiftc, boost, cairo, enblend-enfuse, exiv2, fftw, flann, gettext , glew, ilmbase, lcms2, lensfun, libjpeg, libpng, libtiff, libX11, libXi , libXmu, libGLU, libGL, openexr, panotools, perlPackages, sqlite, vigra, wxGTK, zlib @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { wxGTK zlib ]; - nativeBuildInputs = [ cmake makeWrapper pkgconfig ]; + nativeBuildInputs = [ cmake makeWrapper pkg-config ]; # disable installation of the python scripting interface cmakeFlags = [ "-DBUILD_HSI:BOOl=OFF" ]; diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 69fdb9e2e11..f5b8b806215 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , lzma , qt5 @@ -10,14 +10,14 @@ pythonPackages.buildPythonPackage { pname = "hydrus"; - version = "420"; + version = "426"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; - rev = "067c4862a0ed8dd9264b464c69975b520139809f"; - sha256 = "12x0rv2yxsczdaxvpb5ggf4jwzjd1vd7ml0r61s4342zwvjrhji9"; + rev = "1acdc258e5bb2ae22f5eafaf3dac8d9265dba5e2"; + sha256 = "1snihd433hx36s6d5hsnq4qg0xs6ag4822lwm5fqak64n22ad2qb"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/ideogram/default.nix b/pkgs/applications/graphics/ideogram/default.nix index fbee1d5b0e8..f78170fde34 100644 --- a/pkgs/applications/graphics/ideogram/default.nix +++ b/pkgs/applications/graphics/ideogram/default.nix @@ -3,7 +3,7 @@ , nix-update-script , fetchpatch , vala -, pkgconfig +, pkg-config , python3 , glib , gtk3 @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meson ninja vala - pkgconfig + pkg-config python3 wrapGAppsHook ]; diff --git a/pkgs/applications/graphics/image_optim/gemset.nix b/pkgs/applications/graphics/image_optim/gemset.nix index 6c9ec2de745..08e7f5c78ef 100644 --- a/pkgs/applications/graphics/image_optim/gemset.nix +++ b/pkgs/applications/graphics/image_optim/gemset.nix @@ -48,4 +48,4 @@ }; version = "3.5.0"; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/graphics/imv/default.nix b/pkgs/applications/graphics/imv/default.nix index 067abb785b4..3f6a27cbc76 100644 --- a/pkgs/applications/graphics/imv/default.nix +++ b/pkgs/applications/graphics/imv/default.nix @@ -8,7 +8,7 @@ , fontconfig , meson , ninja -, pkgconfig +, pkg-config , icu , pango , inih @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { libxslt meson ninja - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index be89d32e722..ba6af5d781f 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -50,11 +50,11 @@ let in stdenv.mkDerivation rec { pname = "inkscape"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { url = "https://media.inkscape.org/dl/resources/file/${pname}-${version}.tar.xz"; - sha256 = "1hjp5nnyx2m3miji6q4lcb6zgbi498v641dc7apkqqvayknrb4ng"; + sha256 = "sha256-2j4jBRGgjL8h6GcQ0WFFhZT+qHhn6RV7Z+0BoE6ieYo="; }; # Inkscape hits the ARGMAX when linking on macOS. It appears to be @@ -122,15 +122,15 @@ stdenv.mkDerivation rec { potrace python3Env zlib - ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.isDarwin) [ gtkspell3 - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ cairo gtk-mac-integration ]; # Make sure PyXML modules can be found at run-time. - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.isDarwin '' install_name_tool -change $out/lib/libinkscape_base.dylib $out/lib/inkscape/libinkscape_base.dylib $out/bin/inkscape install_name_tool -change $out/lib/libinkscape_base.dylib $out/lib/inkscape/libinkscape_base.dylib $out/bin/inkview ''; diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix index 6a2a8dbc18f..d9c51d38802 100644 --- a/pkgs/applications/graphics/ipe/default.nix +++ b/pkgs/applications/graphics/ipe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, pkgconfig, zlib, freetype, cairo, lua5, texlive, ghostscript +{ lib, fetchurl, makeWrapper, pkg-config, zlib, freetype, cairo, lua5, texlive, ghostscript , libjpeg, libpng, qtbase, mkDerivation }: @@ -20,9 +20,9 @@ mkDerivation rec { libjpeg libpng zlib qtbase freetype cairo lua5 texlive ghostscript ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; - qtWrapperArgs = [ ''--prefix PATH : ${texlive}/bin'' ]; + qtWrapperArgs = [ "--prefix PATH : ${texlive}/bin" ]; enableParallelBuilding = true; @@ -31,13 +31,13 @@ mkDerivation rec { meta = { description = "An editor for drawing figures"; homepage = "http://ipe.otfried.org"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; longDescription = '' Ipe is an extensible drawing editor for creating figures in PDF and Postscript format. It supports making small figures for inclusion into LaTeX-documents as well as presentations in PDF. ''; - maintainers = [ stdenv.lib.maintainers.ttuegel ]; - platforms = stdenv.lib.platforms.linux; + maintainers = [ lib.maintainers.ttuegel ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix index c333ecaa99f..99e56738dbf 100644 --- a/pkgs/applications/graphics/k3d/default.nix +++ b/pkgs/applications/graphics/k3d/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, ftgl, glew, asciidoc , cmake, ninja, libGLU, libGL, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype -, libpng, boost, doxygen, cairomm, pkgconfig, libjpeg, libtiff +, libpng, boost, doxygen, cairomm, pkg-config, libjpeg, libtiff , gettext, intltool, perl, gtkmm2, glibmm, gtkglext, libXmu }: stdenv.mkDerivation rec { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/build/lib" ''; - nativeBuildInputs = [ cmake ninja gettext intltool doxygen pkgconfig perl asciidoc ]; + nativeBuildInputs = [ cmake ninja gettext intltool doxygen pkg-config perl asciidoc ]; buildInputs = [ libGLU libGL zlib python expat libxml2 libsigcxx libuuid freetype libpng diff --git a/pkgs/applications/graphics/kgraphviewer/default.nix b/pkgs/applications/graphics/kgraphviewer/default.nix index 4f3e08bf7b0..294b6c4ca70 100644 --- a/pkgs/applications/graphics/kgraphviewer/default.nix +++ b/pkgs/applications/graphics/kgraphviewer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchurl, cmake, extra-cmake-modules, pkgconfig, wrapGAppsHook +{ lib, mkDerivation, fetchurl, cmake, extra-cmake-modules, pkg-config, wrapGAppsHook , kconfig, kinit, kdoctools, kio, kparts, kwidgetsaddons , qtbase, qtsvg , boost, graphviz @@ -19,7 +19,7 @@ mkDerivation rec { ]; nativeBuildInputs = [ - cmake extra-cmake-modules pkgconfig wrapGAppsHook + cmake extra-cmake-modules pkg-config wrapGAppsHook kdoctools ]; diff --git a/pkgs/applications/graphics/kodelife/default.nix b/pkgs/applications/graphics/kodelife/default.nix index 80abca80f87..4eaab036eb9 100644 --- a/pkgs/applications/graphics/kodelife/default.nix +++ b/pkgs/applications/graphics/kodelife/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ''; preFixup = let - libPath = stdenv.lib.makeLibraryPath [ + libPath = lib.makeLibraryPath [ stdenv.cc.cc.lib alsaLib glib @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { libGLU libGL xorg.libX11 ]; - in stdenv.lib.optionalString (!stdenv.isDarwin) '' + in lib.optionalString (!stdenv.isDarwin) '' patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${libPath}" \ diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index 9bb78d19996..4700b1dfbbf 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -10,16 +10,13 @@ mkDerivation rec { pname = "krita"; - version = "4.4.1"; + version = "4.4.2"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.xz"; - sha256 = "1bmmfvmawnlihbqkksdrwxfkaip4nfsi97w83fmvkyxl4jk715vr"; + sha256 = "121fjdv5phx1aqk21vx9k9vsc5k1w8s86gp6pamy2y31r2ph7r8y"; }; - # *somtimes* fails with can't find ui_manager.h, also see https://github.com/NixOS/nixpkgs/issues/35359 - enableParallelBuilding = false; - nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip makeWrapper ]; buildInputs = [ diff --git a/pkgs/applications/graphics/krop/default.nix b/pkgs/applications/graphics/krop/default.nix index ee490676977..ef335cd6be2 100644 --- a/pkgs/applications/graphics/krop/default.nix +++ b/pkgs/applications/graphics/krop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages, libsForQt5, ghostscript, qt5}: +{ lib, fetchFromGitHub, python3Packages, libsForQt5, ghostscript, qt5}: python3Packages.buildPythonApplication rec { pname = "krop"; @@ -44,8 +44,8 @@ python3Packages.buildPythonApplication rec { your eReader does not support convenient scrolling. Krop also has a command line interface. ''; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ leenaars ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ leenaars ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/graphics/ktikz/default.nix b/pkgs/applications/graphics/ktikz/default.nix index 1872d976f8e..7cdf32cc8e7 100644 --- a/pkgs/applications/graphics/ktikz/default.nix +++ b/pkgs/applications/graphics/ktikz/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchpatch -, pkgconfig, wrapQtAppsHook +, pkg-config, wrapQtAppsHook , poppler, gnuplot , qmake, qtbase, qttools }: @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkgconfig qttools qmake wrapQtAppsHook ]; + nativeBuildInputs = [ pkg-config qttools qmake wrapQtAppsHook ]; QT_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}"; buildInputs = [ qtbase poppler ]; diff --git a/pkgs/applications/graphics/lazpaint/default.nix b/pkgs/applications/graphics/lazpaint/default.nix index 2756414d30d..4dae4dd3f9a 100644 --- a/pkgs/applications/graphics/lazpaint/default.nix +++ b/pkgs/applications/graphics/lazpaint/default.nix @@ -55,7 +55,7 @@ in stdenv.mkDerivation rec { # Python is needed for scripts makeWrapper $out/share/lazpaint/lazpaint $out/bin/lazpaint \ - --prefix PATH : ${stdenv.lib.makeBinPath [ python3 ]} + --prefix PATH : ${lib.makeBinPath [ python3 ]} ''; meta = with lib; { diff --git a/pkgs/applications/graphics/lightburn/default.nix b/pkgs/applications/graphics/lightburn/default.nix index 9d2c6c4dd59..18fe87b128d 100644 --- a/pkgs/applications/graphics/lightburn/default.nix +++ b/pkgs/applications/graphics/lightburn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, patchelf, fetchurl, p7zip +{ lib, stdenv, patchelf, fetchurl, p7zip , nss, nspr, libusb1 , qtbase, qtmultimedia, qtserialport , autoPatchelfHook, wrapQtAppsHook @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "lightburn"; - version = "0.9.19"; + version = "0.9.20"; nativeBuildInputs = [ p7zip @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/LightBurnSoftware/deployment/releases/download/${version}/LightBurn-Linux64-v${version}.7z"; - sha256 = "0j3ydivd666fphmgi3ar48xabgi2dcky7p2fyfl7ghxjplflqs9q"; + sha256 = "sha256-FtkBIoz5u70DbZZBH4uSaAkmOphWA9H0uYuukIPVGUM="; }; buildInputs = [ @@ -42,8 +42,8 @@ stdenv.mkDerivation rec { meta = { description = "Layout, editing, and control software for your laser cutter"; homepage = "https://lightburnsoftware.com/"; - license = stdenv.lib.licenses.unfree; - maintainers = with stdenv.lib.maintainers; [ q3k ]; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ q3k ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/graphics/luminance-hdr/default.nix b/pkgs/applications/graphics/luminance-hdr/default.nix index 9b1dbe53795..c44ff57d18f 100644 --- a/pkgs/applications/graphics/luminance-hdr/default.nix +++ b/pkgs/applications/graphics/luminance-hdr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, cmake, fetchFromGitHub, pkgconfig +{ lib, mkDerivation, cmake, fetchFromGitHub, pkg-config , boost, exiv2, fftwFloat, gsl , ilmbase, lcms2, libraw, libtiff, openexr , qtbase, qtdeclarative, qttools, qtwebengine, eigen @@ -22,7 +22,7 @@ mkDerivation rec { boost exiv2 fftwFloat gsl ilmbase lcms2 libraw libtiff openexr ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; meta = with lib; { homepage = "http://qtpfsgui.sourceforge.net/"; diff --git a/pkgs/applications/graphics/mandelbulber/default.nix b/pkgs/applications/graphics/mandelbulber/default.nix index 384ddac5b4c..9ac853c896e 100644 --- a/pkgs/applications/graphics/mandelbulber/default.nix +++ b/pkgs/applications/graphics/mandelbulber/default.nix @@ -19,13 +19,13 @@ assert withOpenCL -> ocl-icd != null; mkDerivation rec { pname = "mandelbulber"; - version = "2.23"; + version = "2.24"; src = fetchFromGitHub { owner = "buddhi1980"; repo = "mandelbulber2"; rev = version; - sha256 = "08izphj7jyk3wsq3qbzaf2fplys80vr39wliqc1i4c5cr90nrq1l"; + sha256 = "sha256-JgpYGzD2FsqcCWnOKBiVCxUKqLfT4S++uUBZekhGWmA="; }; nativeBuildInputs = [ @@ -47,7 +47,7 @@ mkDerivation rec { sourceRoot = "${src.name}/mandelbulber2"; qmakeFlags = [ - "SHARED_PATH=${placeholder ''out''}" + "SHARED_PATH=${placeholder "out"}" (if withOpenCL then "qmake/mandelbulber-opencl.pro" else "qmake/mandelbulber.pro") diff --git a/pkgs/applications/graphics/mcomix3/default.nix b/pkgs/applications/graphics/mcomix3/default.nix index 81077578eb2..add40043c0f 100644 --- a/pkgs/applications/graphics/mcomix3/default.nix +++ b/pkgs/applications/graphics/mcomix3/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , fetchFromGitHub , wrapGAppsHook , installShellFiles diff --git a/pkgs/applications/graphics/megapixels/default.nix b/pkgs/applications/graphics/megapixels/default.nix new file mode 100644 index 00000000000..29aaed1278d --- /dev/null +++ b/pkgs/applications/graphics/megapixels/default.nix @@ -0,0 +1,55 @@ +{ stdenv +, lib +, fetchgit +, meson +, ninja +, pkg-config +, wrapGAppsHook +, gtk3 +, gnome3 +, tiffSupport ? true +, libraw +, jpgSupport ? true +, imagemagick +, exiftool +}: + +assert jpgSupport -> tiffSupport; + +let + inherit (lib) makeBinPath optional optionals optionalString; + runtimePath = makeBinPath ( + optional tiffSupport libraw + ++ optionals jpgSupport [ imagemagick exiftool ] + ); +in +stdenv.mkDerivation rec { + pname = "megapixels"; + version = "0.14.0"; + + src = fetchgit { + url = "https://git.sr.ht/~martijnbraam/megapixels"; + rev = version; + sha256 = "136rv9sx0kgfkpqn5s90j7j4qhb8h04p14g5qhqshb89kmmsmxiw"; + }; + + nativeBuildInputs = [ meson ninja pkg-config wrapGAppsHook ]; + + buildInputs = [ gtk3 gnome3.adwaita-icon-theme ] + ++ optional tiffSupport libraw + ++ optional jpgSupport imagemagick; + + preFixup = optionalString (tiffSupport || jpgSupport) '' + gappsWrapperArgs+=( + --prefix PATH : ${runtimePath} + ) + ''; + + meta = with lib; { + description = "GTK3 camera application using raw v4l2 and media-requests"; + homepage = "https://sr.ht/~martijnbraam/Megapixels"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/graphics/meh/default.nix b/pkgs/applications/graphics/meh/default.nix index 0b2e5bc3777..28f307d6cec 100644 --- a/pkgs/applications/graphics/meh/default.nix +++ b/pkgs/applications/graphics/meh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libX11, libXext, libjpeg, libpng, giflib }: +{ lib, stdenv, fetchFromGitHub, libX11, libXext, libjpeg, libpng, giflib }: stdenv.mkDerivation { name = "meh-unstable-2015-04-11"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { description = "A minimal image viewer using raw XLib"; homepage = "https://www.johnhawthorn.com/meh/"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mit; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/graphics/meme/default.nix b/pkgs/applications/graphics/meme/default.nix index c894de2c933..d06ff027c5b 100644 --- a/pkgs/applications/graphics/meme/default.nix +++ b/pkgs/applications/graphics/meme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , unstableGitUpdater , buildGoModule , fetchFromGitHub diff --git a/pkgs/applications/graphics/minidjvu/default.nix b/pkgs/applications/graphics/minidjvu/default.nix index 2af79659ced..40b28dd8566 100644 --- a/pkgs/applications/graphics/minidjvu/default.nix +++ b/pkgs/applications/graphics/minidjvu/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libtiff, gettext }: +{lib, stdenv, fetchurl, libtiff, gettext }: stdenv.mkDerivation { name = "minidjvu-0.8"; @@ -20,8 +20,8 @@ stdenv.mkDerivation { meta = { homepage = "http://djvu.sourceforge.net/djview4.html"; description = "Black-and-white djvu page encoder and decoder that use interpage information"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.viric ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.viric ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/graphics/mozjpeg/default.nix b/pkgs/applications/graphics/mozjpeg/default.nix index e17664a018a..af6b812e1e5 100644 --- a/pkgs/applications/graphics/mozjpeg/default.nix +++ b/pkgs/applications/graphics/mozjpeg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libpng, nasm }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libpng, nasm }: stdenv.mkDerivation rec { version = "3.3.1"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1na68860asn8b82ny5ilwbhh4nyl9gvx2yxmm4wr2v1v95v51fky"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libpng nasm ]; meta = { @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { The idea is to reduce transfer times for JPEGs on the Web, thus reducing page load times. ''; homepage = "https://github.com/mozilla/mozjpeg"; - license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.aristid ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.aristid ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/graphics/mtpaint/default.nix b/pkgs/applications/graphics/mtpaint/default.nix index c002e2a8d05..3565173285b 100644 --- a/pkgs/applications/graphics/mtpaint/default.nix +++ b/pkgs/applications/graphics/mtpaint/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , pkg-config , freetype, giflib, gtk3, lcms2, libjpeg, libpng, libtiff, openjpeg, gifsicle }: @@ -35,9 +35,9 @@ stdenv.mkDerivation rec { GNU/Linux, Windows and older PC hardware. ''; homepage = "http://mtpaint.sourceforge.net/"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.vklquevs ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.vklquevs ]; }; } diff --git a/pkgs/applications/graphics/mypaint/default.nix b/pkgs/applications/graphics/mypaint/default.nix index 3b030a1eb57..7b83bdec8c6 100644 --- a/pkgs/applications/graphics/mypaint/default.nix +++ b/pkgs/applications/graphics/mypaint/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , gtk3 , gettext @@ -11,7 +11,7 @@ , hicolor-icon-theme , mypaint-brushes , gdk-pixbuf -, pkgconfig +, pkg-config , python3 , swig , wrapGAppsHook @@ -33,7 +33,7 @@ in buildPythonApplication rec { nativeBuildInputs = [ gettext - pkgconfig + pkg-config swig wrapGAppsHook gobject-introspection # for setup hook diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix index 3c571fedb83..bd6d732ac68 100644 --- a/pkgs/applications/graphics/nomacs/default.nix +++ b/pkgs/applications/graphics/nomacs/default.nix @@ -1,9 +1,9 @@ -{ lib, stdenv +{ lib , mkDerivation , fetchFromGitHub , fetchpatch , cmake -, pkgconfig +, pkg-config , qtbase , qttools @@ -32,7 +32,7 @@ mkDerivation rec { ''; nativeBuildInputs = [cmake - pkgconfig]; + pkg-config]; buildInputs = [qtbase qttools @@ -53,7 +53,7 @@ mkDerivation rec { meta = with lib; { homepage = "https://nomacs.org"; description = "Qt-based image viewer"; - maintainers = with stdenv.lib.maintainers; [ mindavi ]; + maintainers = with lib.maintainers; [ mindavi ]; license = licenses.gpl3Plus; repositories.git = "https://github.com/nomacs/nomacs.git"; inherit (qtbase.meta) platforms; diff --git a/pkgs/applications/graphics/ocrfeeder/default.nix b/pkgs/applications/graphics/ocrfeeder/default.nix index 95ff90a8eef..ff5d4bdf41d 100644 --- a/pkgs/applications/graphics/ocrfeeder/default.nix +++ b/pkgs/applications/graphics/ocrfeeder/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { version = "0.8.3"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "12f5gnq92ffnd5zaj04df7jrnsdz1zn4zcgpbf5p9qnd21i2y529"; }; @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { --replace /usr/share/xml/iso-codes ${isocodes}/share/xml/iso-codes ''; - enginesPath = stdenv.lib.makeBinPath ([ + enginesPath = lib.makeBinPath ([ tesseract4 ] ++ extraOcrEngines); diff --git a/pkgs/applications/graphics/openimageio/2.x.nix b/pkgs/applications/graphics/openimageio/2.x.nix index b200b9be8cd..f5595da47ad 100644 --- a/pkgs/applications/graphics/openimageio/2.x.nix +++ b/pkgs/applications/graphics/openimageio/2.x.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { "-DUSE_PYTHON=OFF" "-DUSE_QT=OFF" # GNUInstallDirs - "-DCMAKE_INSTALL_LIBDIR=lib" # needs relative path for pkgconfig + "-DCMAKE_INSTALL_LIBDIR=lib" # needs relative path for pkg-config ]; meta = with lib; { diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index 8ff4d6f27e0..c8950eba398 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , qtbase , qtmultimedia @@ -14,7 +14,7 @@ , mpfr , gmp , glib -, pkgconfig +, pkg-config , harfbuzz , gettext , freetype @@ -38,14 +38,14 @@ mkDerivation rec { sha256 = "1qz384jqgk75zxk7sqd22ma9pyd94kh4h6a207ldx7p9rny6vc5l"; }; - nativeBuildInputs = [ bison flex pkgconfig gettext qmake ]; + nativeBuildInputs = [ bison flex pkg-config gettext qmake ]; buildInputs = [ eigen boost glew opencsg cgal mpfr gmp glib harfbuzz lib3mf libzip double-conversion freetype fontconfig qtbase qtmultimedia qscintilla - ] ++ stdenv.lib.optionals stdenv.isLinux [ libGLU libGL ] - ++ stdenv.lib.optional stdenv.isDarwin qtmacextras + ] ++ lib.optionals stdenv.isLinux [ libGLU libGL ] + ++ lib.optional stdenv.isDarwin qtmacextras ; qmakeFlags = [ "VERSION=${version}" ]; @@ -53,7 +53,7 @@ mkDerivation rec { # src/lexer.l:36:10: fatal error: parser.hxx: No such file or directory enableParallelBuilding = false; # true by default due to qmake - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.isDarwin '' mkdir $out/Applications mv $out/bin/*.app $out/Applications rmdir $out/bin || true @@ -80,8 +80,8 @@ mkDerivation rec { interested in creating computer-animated movies. ''; homepage = "http://openscad.org/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ bjornfor raskin gebner ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ bjornfor raskin gebner ]; }; } diff --git a/pkgs/applications/graphics/opentoonz/default.nix b/pkgs/applications/graphics/opentoonz/default.nix index 68830699699..da5aa7bf6ef 100644 --- a/pkgs/applications/graphics/opentoonz/default.nix +++ b/pkgs/applications/graphics/opentoonz/default.nix @@ -1,6 +1,6 @@ { boost, cmake, fetchFromGitHub, freeglut, freetype, glew, libjpeg, libmypaint -, libpng, libtiff, libusb1, lz4, lzma, lzo, openblas, pkgconfig, qtbase -, qtmultimedia, qtscript, stdenv, superlu, wrapQtAppsHook, }: +, libpng, libtiff, libusb1, lz4, lzma, lzo, openblas, pkg-config, qtbase +, qtmultimedia, qtscript, lib, stdenv, superlu, wrapQtAppsHook, }: let source = import ./source.nix { inherit fetchFromGitHub; }; in stdenv.mkDerivation rec { inherit (source) src; @@ -8,7 +8,7 @@ in stdenv.mkDerivation rec { pname = "opentoonz"; version = source.versions.opentoonz; - nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; buildInputs = [ boost @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { meta = { description = "Full-featured 2D animation creation software"; homepage = "https://opentoonz.github.io/"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ chkno ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ chkno ]; }; } diff --git a/pkgs/applications/graphics/ovito/default.nix b/pkgs/applications/graphics/ovito/default.nix new file mode 100644 index 00000000000..f0dc5f2b363 --- /dev/null +++ b/pkgs/applications/graphics/ovito/default.nix @@ -0,0 +1,41 @@ +{ mkDerivation, lib, fetchFromGitLab, cmake +, boost, netcdf, hdf5, fftwSinglePrec, muparser, openssl, ffmpeg, python +, qtbase, qtsvg, qttools, qscintilla }: + +mkDerivation rec { + pname = "ovito"; + version = "3.4.0"; + + src = fetchFromGitLab { + owner = "stuko"; + repo = "ovito"; + rev = "v${version}"; + sha256 = "1y3wr6yzpsl0qm7cicp2mppfszxd0fgx8hm99in9wff9qd0r16b5"; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + boost + netcdf + hdf5 + fftwSinglePrec + muparser + openssl + ffmpeg + python + qtbase + qtsvg + qttools + qscintilla + ]; + + meta = with lib; { + description = "Scientific visualization and analysis software for atomistic and particle simulation data"; + homepage = "https://ovito.org"; + license = with licenses; [ gpl3Only mit ]; + maintainers = with maintainers; [ twhitehead ]; + }; +} diff --git a/pkgs/applications/graphics/panotools/default.nix b/pkgs/applications/graphics/panotools/default.nix index c03bdd8331b..50e0f3955f7 100644 --- a/pkgs/applications/graphics/panotools/default.nix +++ b/pkgs/applications/graphics/panotools/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, libjpeg, libpng, libtiff, perl }: +{ fetchurl, lib, stdenv, libjpeg, libpng, libtiff, perl }: stdenv.mkDerivation rec { name = "libpano13-2.9.19"; @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://panotools.sourceforge.net/"; description = "Free software suite for authoring and displaying virtual reality panoramas"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice + platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index 6e4738dd07c..79feab3ab7a 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -1,6 +1,6 @@ { boost, cmake, fetchFromGitHub, ffmpeg, qtbase, qtx11extras, qttools, qtxmlpatterns, qtsvg, gdal, gfortran, libXt, makeWrapper, - mkDerivation, ninja, openmpi, python3, lib, stdenv, tbb, libGLU, libGL }: + mkDerivation, ninja, mpi, python3, lib, tbb, libGLU, libGL }: mkDerivation rec { pname = "paraview"; @@ -65,7 +65,7 @@ mkDerivation rec { buildInputs = [ libGLU libGL libXt - openmpi + mpi tbb boost ffmpeg diff --git a/pkgs/applications/graphics/pdfcpu/default.nix b/pkgs/applications/graphics/pdfcpu/default.nix index 3a06c8e31f7..857a68df092 100644 --- a/pkgs/applications/graphics/pdfcpu/default.nix +++ b/pkgs/applications/graphics/pdfcpu/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "pdfcpu"; - version = "0.3.7"; + version = "0.3.8"; src = fetchFromGitHub { owner = "pdfcpu"; repo = pname; rev = "v${version}"; - sha256 = "13b1ncpx189ca0h70j5cdp0jwlj95kasysryz1l6g13cwn9n6mii"; + sha256 = "sha256-Rx/LUp5s2DhEKuLUklYXjtTXjqBju+5YzK1hNfBCnIE="; }; - vendorSha256 = "11w9i1829hk1qb9w24dyxv1bi49358a274g60x11fp5x5cw7bqa7"; + vendorSha256 = "sha256-/SsDDFveovJfuEdnOkxHAWccS8PJW5k9IHSxSJAgHMQ="; # No tests doCheck = false; diff --git a/pkgs/applications/graphics/photivo/default.nix b/pkgs/applications/graphics/photivo/default.nix index b44130c47ae..4acb50e200f 100644 --- a/pkgs/applications/graphics/photivo/default.nix +++ b/pkgs/applications/graphics/photivo/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchhg, fetchpatch, cmake, qt4, fftw, graphicsmagick_q16, - lcms2, lensfun, pkgconfig, libjpeg, exiv2, liblqr1 }: + lcms2, lensfun, pkg-config, libjpeg, exiv2, liblqr1 }: stdenv.mkDerivation { name = "photivo-2014-01-25"; @@ -28,7 +28,7 @@ stdenv.mkDerivation { sed '1i#include <math.h>' -i Sources/filters/ptFilter_StdCurve.cpp ''; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ qt4 fftw graphicsmagick_q16 lcms2 lensfun libjpeg exiv2 liblqr1 ]; diff --git a/pkgs/applications/graphics/photoflare/default.nix b/pkgs/applications/graphics/photoflare/default.nix index ca2455dd048..0c25364b76a 100644 --- a/pkgs/applications/graphics/photoflare/default.nix +++ b/pkgs/applications/graphics/photoflare/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, graphicsmagick, fetchFromGitHub, qmake, qtbase, qttools +{ mkDerivation, lib, graphicsmagick, fetchFromGitHub, qmake, qtbase, qttools }: mkDerivation rec { diff --git a/pkgs/applications/graphics/photoflow/default.nix b/pkgs/applications/graphics/photoflow/default.nix index 436d6764c75..79a171d6fc3 100644 --- a/pkgs/applications/graphics/photoflow/default.nix +++ b/pkgs/applications/graphics/photoflow/default.nix @@ -20,7 +20,7 @@ , ninja , openexr , pcre -, pkgconfig +, pkg-config , pugixml , lib, stdenv , swig @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { gobject-introspection libxml2 ninja - pkgconfig + pkg-config swig ]; diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix index 4f470b014af..52e38b23c1f 100644 --- a/pkgs/applications/graphics/photoqt/default.nix +++ b/pkgs/applications/graphics/photoqt/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, stdenv, fetchurl, cmake, exiv2, graphicsmagick, libraw, fetchpatch +{ mkDerivation, lib, fetchurl, cmake, exiv2, graphicsmagick, libraw, fetchpatch , qtbase, qtdeclarative, qtmultimedia, qtquickcontrols, qttools, qtgraphicaleffects , extra-cmake-modules, poppler, kimageformats, libarchive, libdevil }: @@ -40,7 +40,7 @@ mkDerivation rec { meta = { homepage = "https://photoqt.org/"; description = "Simple, yet powerful and good looking image viewer"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/graphics/phototonic/default.nix b/pkgs/applications/graphics/phototonic/default.nix index 21960358a7b..5044e60161c 100644 --- a/pkgs/applications/graphics/phototonic/default.nix +++ b/pkgs/applications/graphics/phototonic/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchFromGitHub, qtbase, qmake, exiv2 }: +{ mkDerivation, lib, fetchFromGitHub, qtbase, qmake, exiv2 }: mkDerivation rec { pname = "phototonic"; diff --git a/pkgs/applications/graphics/pick-colour-picker/default.nix b/pkgs/applications/graphics/pick-colour-picker/default.nix index d4788b3c1e7..e3ab0c772a1 100644 --- a/pkgs/applications/graphics/pick-colour-picker/default.nix +++ b/pkgs/applications/graphics/pick-colour-picker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , buildPythonPackage , pygobject3 diff --git a/pkgs/applications/graphics/pikopixel/default.nix b/pkgs/applications/graphics/pikopixel/default.nix new file mode 100644 index 00000000000..97a3684682d --- /dev/null +++ b/pkgs/applications/graphics/pikopixel/default.nix @@ -0,0 +1,48 @@ +{ lib +, fetchurl +, gnustep +, gcc +, llvmPackages_9 +}: + +let + # Earlier llvm than 9 segfaults + gnustep' = gnustep.override { llvmPackages = llvmPackages_9; }; + +in gnustep'.gsmakeDerivation rec { + pname = "pikopixel"; + version = "1.0-b10"; + + src = fetchurl { + url = "http://twilightedge.com/downloads/PikoPixel.Sources.${version}.tar.gz"; + sha256 = "1b27npgsan2nx1p581b9q2krx4506yyd6s34r4sf1r9x9adshm77"; + }; + + sourceRoot = "PikoPixel.Sources.${version}/PikoPixel"; + + buildInputs = [ + gnustep'.base + gnustep'.gui + gnustep'.back + ]; + + # Fix the Exec and Icon paths in the .desktop file, and save the file in the + # correct place. + # postInstall gets redefined in gnustep.make's builder.sh, so we use preFixup + preFixup = '' + mkdir -p $out/share/applications + sed \ + -e "s@^Exec=.*\$@Exec=$out/bin/PikoPixel %F@" \ + -e "s@^Icon=.*/local@Icon=$out@" \ + PikoPixel.app/Resources/PikoPixel.desktop > $out/share/applications/PikoPixel.desktop + ''; + + meta = with lib; { + description = "Application for drawing and editing pixel-art images"; + homepage = "http://twilightedge.com/mac/pikopixel/"; + downloadPage = "http://twilightedge.com/mac/pikopixel/"; + license = licenses.agpl3; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/graphics/pinta/default.nix b/pkgs/applications/graphics/pinta/default.nix index b534763b245..2635b2d3d88 100644 --- a/pkgs/applications/graphics/pinta/default.nix +++ b/pkgs/applications/graphics/pinta/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildDotnetPackage, dotnetPackages, gtksharp, +{ lib, fetchFromGitHub, buildDotnetPackage, dotnetPackages, gtksharp, gettext }: let @@ -21,7 +21,7 @@ buildDotnetPackage rec { }; # Remove version information from nodes <Reference Include="... Version=... "> - postPatch = with stdenv.lib; let + postPatch = with lib; let csprojFiles = [ "Pinta/Pinta.csproj" "Pinta.Core/Pinta.Core.csproj" @@ -56,9 +56,9 @@ buildDotnetPackage rec { ''; makeWrapperArgs = [ - ''--prefix MONO_GAC_PREFIX : ${gtksharp}'' - ''--prefix LD_LIBRARY_PATH : ${gtksharp}/lib'' - ''--prefix LD_LIBRARY_PATH : ${gtksharp.gtk.out}/lib'' + "--prefix MONO_GAC_PREFIX : ${gtksharp}" + "--prefix LD_LIBRARY_PATH : ${gtksharp}/lib" + "--prefix LD_LIBRARY_PATH : ${gtksharp.gtk.out}/lib" ]; postInstall = '' @@ -76,8 +76,8 @@ buildDotnetPackage rec { meta = { homepage = "https://www.pinta-project.com/"; description = "Drawing/editing program modeled after Paint.NET"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/graphics/pqiv/default.nix b/pkgs/applications/graphics/pqiv/default.nix index 969a3bcb9d1..7948ef0f08c 100644 --- a/pkgs/applications/graphics/pqiv/default.nix +++ b/pkgs/applications/graphics/pqiv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig +{ lib, stdenv, fetchFromGitHub, pkg-config , ffmpeg_3, gtk3, imagemagick, libarchive, libspectre, libwebp, poppler }: @@ -13,7 +13,7 @@ stdenv.mkDerivation (rec { sha256 = "18nvrqmlifh4m8nfs0d19sb9d1l3a95xc89qxqdr881jcxdsgflw"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ffmpeg_3 gtk3 imagemagick libarchive libspectre libwebp poppler ]; prePatch = "patchShebangs ."; diff --git a/pkgs/applications/graphics/processing/default.nix b/pkgs/applications/graphics/processing/default.nix index 434f9fab88d..2e61e40b01f 100644 --- a/pkgs/applications/graphics/processing/default.nix +++ b/pkgs/applications/graphics/processing/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, xmlstarlet, makeWrapper, ant, jdk, rsync, javaPackages, libXxf86vm, gsettings-desktop-schemas }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, fetchurl, xmlstarlet, makeWrapper, ant, jdk, rsync, javaPackages, libXxf86vm, gsettings-desktop-schemas }: stdenv.mkDerivation rec { pname = "processing"; @@ -11,6 +11,14 @@ stdenv.mkDerivation rec { sha256 = "0cvv8jda9y8qnfcsziasyv3w7h3w22q78ihr23cm4an63ghxci58"; }; + patches = [ + (fetchpatch { + name = "oraclejdk-8u281-compat.patch"; + url = "https://github.com/processing/processing/commit/7e176876173c93e3a00a922e7ae37951366d1761.patch"; + sha256 = "g+zwpoIVgw7Sp6QWW3vyPZ/fKHk+o/YCY6xnrX8IGKo="; + }) + ]; + nativeBuildInputs = [ ant rsync makeWrapper ]; buildInputs = [ jdk ]; diff --git a/pkgs/applications/graphics/qcomicbook/default.nix b/pkgs/applications/graphics/qcomicbook/default.nix index 65ecaa90784..47bf2d95028 100644 --- a/pkgs/applications/graphics/qcomicbook/default.nix +++ b/pkgs/applications/graphics/qcomicbook/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools, qtx11extras, poppler }: +{ mkDerivation, lib, fetchFromGitHub, pkg-config, cmake, qtbase, qttools, qtx11extras, poppler }: mkDerivation rec { pname = "qcomicbook"; @@ -12,7 +12,7 @@ mkDerivation rec { }; nativeBuildInputs = [ - cmake pkgconfig + cmake pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/graphics/qimgv/default.nix b/pkgs/applications/graphics/qimgv/default.nix index 2b24a34fbc2..886a753ee2c 100644 --- a/pkgs/applications/graphics/qimgv/default.nix +++ b/pkgs/applications/graphics/qimgv/default.nix @@ -4,7 +4,7 @@ , fetchpatch , cmake -, pkgconfig +, pkg-config , exiv2 , mpv @@ -27,7 +27,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/graphics/qiv/default.nix b/pkgs/applications/graphics/qiv/default.nix index e0426de6fb6..acd9c576f73 100644 --- a/pkgs/applications/graphics/qiv/default.nix +++ b/pkgs/applications/graphics/qiv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gtk2, imlib2, file, lcms2, libexif } : +{ lib, stdenv, fetchurl, pkg-config, gtk2, imlib2, file, lcms2, libexif } : stdenv.mkDerivation (rec { version = "2.3.2"; @@ -9,7 +9,7 @@ stdenv.mkDerivation (rec { sha256 = "1mc0f2nnas4q0d7zc9r6g4z93i32xlx0p9hl4fn5zkyml24a1q28"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 imlib2 file lcms2 libexif ]; preBuild='' diff --git a/pkgs/applications/graphics/qscreenshot/default.nix b/pkgs/applications/graphics/qscreenshot/default.nix index 635da088e56..b3e555358be 100644 --- a/pkgs/applications/graphics/qscreenshot/default.nix +++ b/pkgs/applications/graphics/qscreenshot/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ dos2unix which qt ] - ++ stdenv.lib.optional stdenv.isDarwin Carbon; + ++ lib.optional stdenv.isDarwin Carbon; # Remove carriage returns that cause /bin/sh to abort preConfigure = '' diff --git a/pkgs/applications/graphics/rapcad/default.nix b/pkgs/applications/graphics/rapcad/default.nix index e86436cd06f..904c9f8f402 100644 --- a/pkgs/applications/graphics/rapcad/default.nix +++ b/pkgs/applications/graphics/rapcad/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; - description = ''Constructive solid geometry package''; + description = "Constructive solid geometry package"; broken = true; # 2018-04-11 }; } diff --git a/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/pkgs/applications/graphics/rapid-photo-downloader/default.nix index 73341cf2ea0..f444ebfe5be 100644 --- a/pkgs/applications/graphics/rapid-photo-downloader/default.nix +++ b/pkgs/applications/graphics/rapid-photo-downloader/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivationWith, fetchurl, python3Packages +{ lib, mkDerivationWith, fetchurl, python3Packages , file, intltool, gobject-introspection, libgudev , udisks, gexiv2, gst_all_1, libnotify , exiftool, gdk-pixbuf, libmediainfo, vmtouch @@ -71,8 +71,8 @@ mkDerivationWith python3Packages.buildPythonApplication rec { makeWrapperArgs+=( --set GI_TYPELIB_PATH "$GI_TYPELIB_PATH" --set PYTHONPATH "$PYTHONPATH" - --prefix PATH : "${stdenv.lib.makeBinPath [ exiftool vmtouch ]}" - --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libmediainfo ]}" + --prefix PATH : "${lib.makeBinPath [ exiftool vmtouch ]}" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libmediainfo ]}" --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" "''${qtWrapperArgs[@]}" ) diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index 14a46bbfcc8..7d1acc1dcd6 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, pixman, libpthreadstubs, gtkmm3, libXau +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, pixman, libpthreadstubs, gtkmm3, libXau , libXdmcp, lcms2, libiptcdata, libcanberra-gtk3, fftw, expat, pcre, libsigcxx, wrapGAppsHook , lensfun, librsvg }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0d644s4grfia6f3k6y0byd5pwajr12kai2kc280yxi8v3w1b12ik"; }; - nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ]; buildInputs = [ pixman libpthreadstubs gtkmm3 libXau libXdmcp @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { meta = { description = "RAW converter and digital photo processing software"; homepage = "http://www.rawtherapee.com/"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ jcumming mahe ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ jcumming mahe ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix index f9e3662f1b8..c51794881e9 100644 --- a/pkgs/applications/graphics/renderdoc/default.nix +++ b/pkgs/applications/graphics/renderdoc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, mkDerivation +{ lib, fetchFromGitHub, cmake, pkg-config, mkDerivation , qtbase, qtx11extras, qtsvg, makeWrapper , vulkan-loader, libglvnd, xorg, python3, python3Packages , bison, pcre, automake, autoconf, addOpenGLRunpath @@ -28,7 +28,7 @@ mkDerivation rec { ]; # ++ (with pythonPackages; [pyside2 pyside2-tools shiboken2]); # TODO: figure out how to make cmake recognise pyside2 - nativeBuildInputs = [ cmake makeWrapper pkgconfig bison pcre automake autoconf addOpenGLRunpath ]; + nativeBuildInputs = [ cmake makeWrapper pkg-config bison pcre automake autoconf addOpenGLRunpath ]; postUnpack = '' cp -r ${custom_swig} swig diff --git a/pkgs/applications/graphics/rx/default.nix b/pkgs/applications/graphics/rx/default.nix index 9350d7c5cd7..78cc664accc 100644 --- a/pkgs/applications/graphics/rx/default.nix +++ b/pkgs/applications/graphics/rx/default.nix @@ -1,9 +1,9 @@ -{ stdenv, rustPlatform, fetchFromGitHub, makeWrapper +{ lib, stdenv, rustPlatform, fetchFromGitHub, makeWrapper , cmake, pkg-config , xorg ? null , libGL ? null }: -with stdenv.lib; +with lib; rustPlatform.buildRustPackage rec { pname = "rx"; diff --git a/pkgs/applications/graphics/sane/backends/brscan4/default.nix b/pkgs/applications/graphics/sane/backends/brscan4/default.nix index 4ad5c24ddd6..0e768afdde1 100644 --- a/pkgs/applications/graphics/sane/backends/brscan4/default.nix +++ b/pkgs/applications/graphics/sane/backends/brscan4/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, callPackage, patchelf, makeWrapper, coreutils, libusb-compat-0_1 }: +{ lib, stdenv, fetchurl, callPackage, patchelf, makeWrapper, coreutils, libusb-compat-0_1 }: let - myPatchElf = file: with stdenv.lib; '' + myPatchElf = file: with lib; '' patchelf --set-interpreter \ ${stdenv.glibc}/lib/ld-linux${optionalString stdenv.is64bit "-x86-64"}.so.2 \ ${file} @@ -44,7 +44,7 @@ in stdenv.mkDerivation rec { done ''; - installPhase = with stdenv.lib; '' + installPhase = with lib; '' PATH_TO_BRSCAN4="opt/brother/scanner/brscan4" mkdir -p $out/$PATH_TO_BRSCAN4 cp -rp $PATH_TO_BRSCAN4/* $out/$PATH_TO_BRSCAN4 @@ -87,8 +87,8 @@ in stdenv.mkDerivation rec { meta = { description = "Brother brscan4 sane backend driver"; homepage = "http://www.brother.com"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.unfree; - maintainers = with stdenv.lib.maintainers; [ jraygauthier ]; + platforms = lib.platforms.linux; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ jraygauthier ]; }; } diff --git a/pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix b/pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix index 682e401c069..9ca0a702060 100644 --- a/pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix +++ b/pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libsaneUDevRuleNumber ? "49"}: +{ lib, stdenv, fetchurl, libsaneUDevRuleNumber ? "49"}: stdenv.mkDerivation rec { name = "brother-udev-rule-type1-1.0.0-1"; @@ -48,8 +48,8 @@ stdenv.mkDerivation rec { meta = { description = "Brother type1 scanners udev rules"; homepage = "http://www.brother.com"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.unfree; - maintainers = with stdenv.lib.maintainers; [ jraygauthier ]; + platforms = lib.platforms.linux; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ jraygauthier ]; }; } diff --git a/pkgs/applications/graphics/sane/backends/dsseries/default.nix b/pkgs/applications/graphics/sane/backends/dsseries/default.nix index 37ac0298706..8a01f70c6b0 100644 --- a/pkgs/applications/graphics/sane/backends/dsseries/default.nix +++ b/pkgs/applications/graphics/sane/backends/dsseries/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, rpmextract }: +{ lib, stdenv, fetchurl, rpmextract }: stdenv.mkDerivation rec { pname = "libsane-dsseries"; @@ -46,8 +46,8 @@ stdenv.mkDerivation rec { meta = { description = "Brother DSSeries SANE backend driver"; homepage = "http://www.brother.com"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.unfree; - maintainers = with stdenv.lib.maintainers; [ callahad ]; + platforms = lib.platforms.linux; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ callahad ]; }; } diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix index cef48daca11..88d47b58932 100644 --- a/pkgs/applications/graphics/sane/backends/generic.nix +++ b/pkgs/applications/graphics/sane/backends/generic.nix @@ -1,5 +1,5 @@ { lib, stdenv -, gettext, pkgconfig +, gettext, pkg-config , avahi, libgphoto2, libieee1284, libjpeg, libpng, libtiff, libusb1, libv4l, net-snmp # List of { src name backend } attibute sets - see installFirmware below: @@ -21,7 +21,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ gettext - pkgconfig + pkg-config ]; buildInputs = [ @@ -39,19 +39,19 @@ stdenv.mkDerivation { enableParallelBuilding = true; configureFlags = [] - ++ stdenv.lib.optional (avahi != null) "--enable-avahi" - ++ stdenv.lib.optional (libusb1 != null) "--with-usb" + ++ lib.optional (avahi != null) "--enable-avahi" + ++ lib.optional (libusb1 != null) "--with-usb" ; postInstall = let compatFirmware = extraFirmware - ++ stdenv.lib.optional (gt68xxFirmware != null) { + ++ lib.optional (gt68xxFirmware != null) { src = gt68xxFirmware.fw; inherit (gt68xxFirmware) name; backend = "gt68xx"; } - ++ stdenv.lib.optional (snapscanFirmware != null) { + ++ lib.optional (snapscanFirmware != null) { src = snapscanFirmware; name = "your-firmwarefile.bin"; backend = "snapscan"; @@ -75,7 +75,7 @@ stdenv.mkDerivation { # net.conf conflicts with the file generated by the nixos module rm -f $out/etc/sane.d/net.conf - '' + stdenv.lib.concatStrings (builtins.map installFirmware compatFirmware); + '' + lib.concatStrings (builtins.map installFirmware compatFirmware); meta = with lib; { description = "SANE (Scanner Access Now Easy) backends"; diff --git a/pkgs/applications/graphics/sane/config.nix b/pkgs/applications/graphics/sane/config.nix index 2ef1e26f5ac..304df652f15 100644 --- a/pkgs/applications/graphics/sane/config.nix +++ b/pkgs/applications/graphics/sane/config.nix @@ -1,8 +1,8 @@ -{ stdenv }: +{ lib, stdenv }: { paths }: -with stdenv.lib; +with lib; let installSanePath = path: '' if [ -e "${path}/lib/sane" ]; then find "${path}/lib/sane" -maxdepth 1 -not -type d | while read backend; do diff --git a/pkgs/applications/graphics/sane/frontends.nix b/pkgs/applications/graphics/sane/frontends.nix index 86a1f201f82..c0945242096 100644 --- a/pkgs/applications/graphics/sane/frontends.nix +++ b/pkgs/applications/graphics/sane/frontends.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, sane-backends, libX11, gtk2, pkgconfig, libusb-compat-0_1 ? null }: +{ lib, stdenv, fetchurl, sane-backends, libX11, gtk2, pkg-config, libusb-compat-0_1 ? null }: stdenv.mkDerivation rec { pname = "sane-frontends"; @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { ''; buildInputs = [ sane-backends libX11 gtk2 ] - ++ stdenv.lib.optional (libusb-compat-0_1 != null) libusb-compat-0_1; - nativeBuildInputs = [ pkgconfig ]; + ++ lib.optional (libusb-compat-0_1 != null) libusb-compat-0_1; + nativeBuildInputs = [ pkg-config ]; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/sane/xsane.nix b/pkgs/applications/graphics/sane/xsane.nix index 04d19dee8a8..1deaab4dfe5 100644 --- a/pkgs/applications/graphics/sane/xsane.nix +++ b/pkgs/applications/graphics/sane/xsane.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, sane-backends, sane-frontends, libX11, gtk2, pkgconfig, libpng +{ lib, stdenv, fetchurl, sane-backends, sane-frontends, libX11, gtk2, pkg-config, libpng , libusb-compat-0_1 ? null , gimpSupport ? false, gimp ? null }: @@ -18,16 +18,16 @@ stdenv.mkDerivation rec { chmod a+rX -R . ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [libpng sane-backends sane-frontends libX11 gtk2 ] ++ (if libusb-compat-0_1 != null then [libusb-compat-0_1] else []) - ++ stdenv.lib.optional gimpSupport gimp; + ++ lib.optional gimpSupport gimp; meta = { homepage = "http://www.sane-project.org/"; description = "Graphical scanning frontend for sane"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [peti]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [peti]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/graphics/scantailor/advanced.nix b/pkgs/applications/graphics/scantailor/advanced.nix index 361f1fa1809..048b8b56fc0 100644 --- a/pkgs/applications/graphics/scantailor/advanced.nix +++ b/pkgs/applications/graphics/scantailor/advanced.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, mkDerivation +{ lib, fetchFromGitHub, mkDerivation , cmake, libjpeg, libpng, libtiff, boost , qtbase, qttools }: diff --git a/pkgs/applications/graphics/scantailor/default.nix b/pkgs/applications/graphics/scantailor/default.nix index 5e05072f7b5..291825770ac 100644 --- a/pkgs/applications/graphics/scantailor/default.nix +++ b/pkgs/applications/graphics/scantailor/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, qt4, cmake, libjpeg, libtiff, boost }: +{lib, stdenv, fetchurl, qt4, cmake, libjpeg, libtiff, boost }: stdenv.mkDerivation { name = "scantailor-0.9.12.1"; @@ -15,9 +15,9 @@ stdenv.mkDerivation { homepage = "http://scantailor.org/"; description = "Interactive post-processing tool for scanned pages"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; - maintainers = [ stdenv.lib.maintainers.viric ]; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; + maintainers = [ lib.maintainers.viric ]; + platforms = lib.platforms.gnu ++ lib.platforms.linux; }; } diff --git a/pkgs/applications/graphics/screencloud/default.nix b/pkgs/applications/graphics/screencloud/default.nix index f5478f684fe..b7d6ecdef3d 100644 --- a/pkgs/applications/graphics/screencloud/default.nix +++ b/pkgs/applications/graphics/screencloud/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, cmake, qt4, quazip, qt-mobility, qxt, pythonPackages }: +{ lib, stdenv, fetchFromGitHub, cmake, qt4, quazip, qt-mobility, qxt, pythonPackages }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "screencloud"; version = "1.2.0"; @@ -69,8 +69,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://screencloud.net/"; description = "Client for Screencloud, an easy to use screenshot sharing tool"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ forkk ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ forkk ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 992a7f78799..bd9ad301d34 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -11,7 +11,7 @@ , vala , sqlite , webkitgtk -, pkgconfig +, pkg-config , gnome3 , gst_all_1 , libgudev @@ -32,6 +32,7 @@ , itstool , libgdata , libchamplain +, libsecret , gsettings-desktop-schemas , python3 }: @@ -40,18 +41,18 @@ stdenv.mkDerivation rec { pname = "shotwell"; - version = "0.31.2"; + version = "0.31.3"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0ywzr6vgcz8yy60v0jp55na9lgqi4dbh2vakfphkcml1gpah0r2l"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1wkahbnnfxmi1jc5zmm3h761nrnkdks8lk0rj38bfkwg90h6zqwd"; }; nativeBuildInputs = [ meson ninja vala - pkgconfig + pkg-config itstool gettext desktop-file-utils @@ -86,6 +87,7 @@ stdenv.mkDerivation rec { gnome3.adwaita-icon-theme libgdata libchamplain + libsecret ]; postPatch = '' diff --git a/pkgs/applications/graphics/smartdeblur/default.nix b/pkgs/applications/graphics/smartdeblur/default.nix index d9877afad86..6a835fb3c71 100644 --- a/pkgs/applications/graphics/smartdeblur/default.nix +++ b/pkgs/applications/graphics/smartdeblur/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, cmake, qt4, fftw }: +{ fetchurl, lib, stdenv, cmake, qt4, fftw }: let rev = "9895036d26"; @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/Y-Vladimir/SmartDeblur"; description = "Tool for restoring blurry and defocused images"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/graphics/solvespace/default.nix b/pkgs/applications/graphics/solvespace/default.nix index 26b544cf1c5..98348129d9b 100644 --- a/pkgs/applications/graphics/solvespace/default.nix +++ b/pkgs/applications/graphics/solvespace/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, cmake, pkgconfig, zlib, libpng, cairo, freetype +{ lib, stdenv, fetchgit, cmake, pkg-config, zlib, libpng, cairo, freetype , json_c, fontconfig, gtkmm3, pangomm, glew, libGLU, xorg, pcre , wrapGAppsHook }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig cmake wrapGAppsHook + pkg-config cmake wrapGAppsHook ]; buildInputs = [ zlib libpng cairo freetype diff --git a/pkgs/applications/graphics/sxiv/default.nix b/pkgs/applications/graphics/sxiv/default.nix index 4cf0ae55578..fec378d3843 100644 --- a/pkgs/applications/graphics/sxiv/default.nix +++ b/pkgs/applications/graphics/sxiv/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, libXft, imlib2, giflib, libexif, conf ? null }: +{ lib, stdenv, fetchFromGitHub, libXft, imlib2, giflib, libexif, conf ? null }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "sxiv"; @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { meta = { description = "Simple X Image Viewer"; homepage = "https://github.com/muennich/sxiv"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; maintainers = with maintainers; [ jfrankenau ]; }; } diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix index 14f502434b2..3f29d25fbe0 100644 --- a/pkgs/applications/graphics/synfigstudio/default.nix +++ b/pkgs/applications/graphics/synfigstudio/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, boost, cairo, gettext, glibmm, gtk3, gtkmm3 -, libjack2, libsigcxx, libxmlxx, makeWrapper, mlt-qt5, pango, pkgconfig +, libjack2, libsigcxx, libxmlxx, makeWrapper, mlt-qt5, pango, pkg-config , imagemagick, intltool, autoreconfHook, which, gnome3 }: @@ -39,7 +39,7 @@ let "--with-boost-libdir=${boost.out}/lib" ]; - nativeBuildInputs = [ pkgconfig autoreconfHook gettext ]; + nativeBuildInputs = [ pkg-config autoreconfHook gettext ]; buildInputs = [ ETL boost cairo glibmm mlt-qt5 libsigcxx libxmlxx pango ]; @@ -103,7 +103,7 @@ stdenv.mkDerivation { preConfigure = "./bootstrap.sh"; - nativeBuildInputs = [ pkgconfig autoreconfHook gettext ]; + nativeBuildInputs = [ pkg-config autoreconfHook gettext ]; buildInputs = [ ETL boost cairo glibmm gtk3 gtkmm3 imagemagick intltool libjack2 libsigcxx libxmlxx makeWrapper mlt-qt5 diff --git a/pkgs/applications/graphics/tesseract/tesseract3.nix b/pkgs/applications/graphics/tesseract/tesseract3.nix index dc9d4ac2d59..7b9669bc465 100644 --- a/pkgs/applications/graphics/tesseract/tesseract3.nix +++ b/pkgs/applications/graphics/tesseract/tesseract3.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config , leptonica, libpng, libtiff, icu, pango, opencl-headers }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ leptonica libpng libtiff icu pango opencl-headers ]; LIBLEPT_HEADERSDIR = "${leptonica}/include"; @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { meta = { description = "OCR engine"; homepage = "https://github.com/tesseract-ocr/tesseract"; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ viric earvstedt ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ viric earvstedt ]; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/graphics/tesseract/tesseract4.nix b/pkgs/applications/graphics/tesseract/tesseract4.nix index d7c3cacc1f9..49cf93835b1 100644 --- a/pkgs/applications/graphics/tesseract/tesseract4.nix +++ b/pkgs/applications/graphics/tesseract/tesseract4.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, autoconf-archive, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, autoconf-archive, pkg-config , leptonica, libpng, libtiff, icu, pango, opencl-headers }: stdenv.mkDerivation rec { @@ -14,14 +14,14 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig autoreconfHook autoconf-archive ]; + nativeBuildInputs = [ pkg-config autoreconfHook autoconf-archive ]; buildInputs = [ leptonica libpng libtiff icu pango opencl-headers ]; meta = { description = "OCR engine"; homepage = "https://github.com/tesseract-ocr/tesseract"; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ viric earvstedt ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ viric earvstedt ]; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/graphics/tesseract/wrapper.nix b/pkgs/applications/graphics/tesseract/wrapper.nix index 365d68a9ee7..313920d8154 100644 --- a/pkgs/applications/graphics/tesseract/wrapper.nix +++ b/pkgs/applications/graphics/tesseract/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, tesseractBase, languages +{ lib, makeWrapper, tesseractBase, languages # A list of languages like [ "eng" "spa" … ] or `null` for all available languages , enableLanguages ? null @@ -54,5 +54,5 @@ in if enableLanguagesHash == null then tesseract else - stdenv.lib.warn "Argument `enableLanguagesHash` is obsolete and can be removed." + lib.warn "Argument `enableLanguagesHash` is obsolete and can be removed." tesseract diff --git a/pkgs/applications/graphics/ufraw/default.nix b/pkgs/applications/graphics/ufraw/default.nix deleted file mode 100644 index c30aeb15a0c..00000000000 --- a/pkgs/applications/graphics/ufraw/default.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub - -, autoconf -, automake -, autoreconfHook -, bzip2 -, cfitsio -, exiv2 -, gettext -, gimp ? null -, gtk2 -, gtkimageview -, lcms2 -, lensfun -, libjpeg -, libtiff -, perl -, pkgconfig -, zlib - -, withGimpPlugin ? true -}: - -assert withGimpPlugin -> gimp != null; - -stdenv.mkDerivation { - pname = "ufraw"; - version = "unstable-2019-06-12"; - - # The original ufraw repo is unmaintained and broken; - # this is a fork that collects patches - src = fetchFromGitHub { - owner = "sergiomb2"; - repo = "ufraw"; - rev = "c65b4237dcb430fb274e4778afaf5df9a18e04e6"; - sha256 = "02icn67bsinvgliy62qa6v7gmwgp2sh15jvm8iiz3c7g1h74f0b7"; - }; - - outputs = [ "out" ] ++ stdenv.lib.optional withGimpPlugin "gimpPlugin"; - - nativeBuildInputs = [ autoconf automake autoreconfHook gettext perl pkgconfig ]; - - buildInputs = [ - bzip2 - cfitsio - exiv2 - gtk2 - gtkimageview - lcms2 - lensfun - libjpeg - libtiff - zlib - ] ++ stdenv.lib.optional withGimpPlugin gimp; - - configureFlags = [ - "--enable-contrast" - "--enable-dst-correction" - ] ++ stdenv.lib.optional withGimpPlugin "--with-gimp"; - - postInstall = stdenv.lib.optionalString withGimpPlugin '' - moveToOutput "lib/gimp" "$gimpPlugin" - ''; - - meta = with lib; { - homepage = "https://github.com/sergiomb2/ufraw"; - - broken = true; # https://github.com/NixOS/nixpkgs/issues/97946 - - description = "Utility to read and manipulate raw images from digital cameras"; - - longDescription = - '' The Unidentified Flying Raw (UFRaw) is a utility to read and - manipulate raw images from digital cameras. It can be used on its - own or as a Gimp plug-in. It reads raw images using Dave Coffin's - raw conversion utility - DCRaw. UFRaw supports color management - workflow based on Little CMS, allowing the user to apply ICC color - profiles. For Nikon users UFRaw has the advantage that it can read - the camera's tone curves. - ''; - - license = licenses.gpl2Plus; - - maintainers = with maintainers; [ gloaming ]; - platforms = with platforms; all; - }; -} diff --git a/pkgs/applications/graphics/unigine-valley/default.nix b/pkgs/applications/graphics/unigine-valley/default.nix index 8043f153083..0c5c8f3ff28 100644 --- a/pkgs/applications/graphics/unigine-valley/default.nix +++ b/pkgs/applications/graphics/unigine-valley/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl # Build-time dependencies , makeWrapper @@ -40,7 +40,7 @@ in buildInputs = [file makeWrapper]; - libPath = stdenv.lib.makeLibraryPath [ + libPath = lib.makeLibraryPath [ stdenv.cc.cc # libstdc++.so.6 fontconfig freetype @@ -108,8 +108,8 @@ in meta = { description = "The Unigine Valley GPU benchmarking tool"; homepage = "https://unigine.com/products/benchmarks/valley/"; - license = stdenv.lib.licenses.unfree; # see also: $out/$instPath/documentation/License.pdf - maintainers = [ stdenv.lib.maintainers.kierdavis ]; + license = lib.licenses.unfree; # see also: $out/$instPath/documentation/License.pdf + maintainers = [ lib.maintainers.kierdavis ]; platforms = ["x86_64-linux" "i686-linux"]; }; } diff --git a/pkgs/applications/graphics/viewnior/default.nix b/pkgs/applications/graphics/viewnior/default.nix index 9718dee45dd..fc39306b753 100644 --- a/pkgs/applications/graphics/viewnior/default.nix +++ b/pkgs/applications/graphics/viewnior/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig, desktop-file-utils, gtk2, libpng, exiv2, lcms +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, desktop-file-utils, gtk2, libpng, exiv2, lcms , intltool, gettext, shared-mime-info, glib, gdk-pixbuf, perl}: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config desktop-file-utils intltool gettext diff --git a/pkgs/applications/graphics/wings/default.nix b/pkgs/applications/graphics/wings/default.nix index 19c30f3ecc4..ef8d4b5096e 100644 --- a/pkgs/applications/graphics/wings/default.nix +++ b/pkgs/applications/graphics/wings/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, erlang, cl, libGL, libGLU, runtimeShell }: +{ fetchurl, lib, stdenv, erlang, cl, libGL, libGLU, runtimeShell }: stdenv.mkDerivation rec { name = "wings-2.2.4"; @@ -38,8 +38,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.wings3d.com/"; description = "Subdivision modeler inspired by Nendo and Mirai from Izware"; - license = stdenv.lib.licenses.tcltk; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.tcltk; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/graphics/write_stylus/default.nix b/pkgs/applications/graphics/write_stylus/default.nix index d03c29a58ec..65f6c46f7da 100644 --- a/pkgs/applications/graphics/write_stylus/default.nix +++ b/pkgs/applications/graphics/write_stylus/default.nix @@ -55,7 +55,7 @@ mkDerivation rec { homepage = "http://www.styluslabs.com/"; description = "Write is a word processor for handwriting"; platforms = platforms.linux; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; maintainers = with maintainers; [ oyren ]; }; } diff --git a/pkgs/applications/graphics/xaos/default.nix b/pkgs/applications/graphics/xaos/default.nix index 767f3aa920b..15c2d468fb4 100644 --- a/pkgs/applications/graphics/xaos/default.nix +++ b/pkgs/applications/graphics/xaos/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, aalib, gsl, libpng, libX11, xorgproto, libXext +{ lib, stdenv, fetchurl, aalib, gsl, libpng, libX11, xorgproto, libXext , libXt, zlib, gettext, intltool, perl }: stdenv.mkDerivation rec { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://xaos.sourceforge.net/"; description = "Fractal viewer"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/graphics/xfig/default.nix b/pkgs/applications/graphics/xfig/default.nix index 3f35880b3f2..53a9632e192 100644 --- a/pkgs/applications/graphics/xfig/default.nix +++ b/pkgs/applications/graphics/xfig/default.nix @@ -1,17 +1,14 @@ { lib, stdenv, fetchurl, xlibsWrapper, makeWrapper, libXpm -, libXmu, libXi, libXp, Xaw3d, fig2dev +, libXmu, libXi, libXp, Xaw3d, libXaw, fig2dev }: -let - version = "3.2.7a"; - -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "xfig"; - inherit version; + version = "3.2.8"; src = fetchurl { url = "mirror://sourceforge/mcj/xfig-${version}.tar.xz"; - sha256 = "096zgp0bqnxhgxbrv2jjylrjz3pr4da0xxznlk2z7ffxr5pri2fa"; + sha256 = "1czamqp0xn0j6qjnasa3fjnrzi072v6qknylr6jrs4gwsfw4ybyw"; }; postPatch = '' @@ -30,7 +27,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ xlibsWrapper libXpm libXmu libXi libXp Xaw3d ]; + buildInputs = [ xlibsWrapper libXpm libXmu libXi libXp Xaw3d libXaw ]; meta = with lib; { description = "An interactive drawing tool for X11"; @@ -38,6 +35,6 @@ in stdenv.mkDerivation { Note that you need to have the <literal>netpbm</literal> tools in your path to export bitmaps. ''; - inherit (fig2dev.meta) license homepage platforms; + inherit (fig2dev.meta) license homepage platforms maintainers; }; } diff --git a/pkgs/applications/graphics/xfractint/default.nix b/pkgs/applications/graphics/xfractint/default.nix index 08ef0cd7b58..cca061ed2a6 100644 --- a/pkgs/applications/graphics/xfractint/default.nix +++ b/pkgs/applications/graphics/xfractint/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libX11, libXft}: +{lib, stdenv, fetchurl, libX11, libXft}: stdenv.mkDerivation rec { pname = "xfractint"; version = "20.04p16"; @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { description = ""; # Code cannot be used in commercial programs # Looks like the definition hinges on the price, not license - license = stdenv.lib.licenses.unfree; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.unfree; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; homepage = "https://www.fractint.net/"; }; } diff --git a/pkgs/applications/graphics/xmountains/default.nix b/pkgs/applications/graphics/xmountains/default.nix new file mode 100644 index 00000000000..c31f7923c99 --- /dev/null +++ b/pkgs/applications/graphics/xmountains/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchFromGitHub, xlibsWrapper, xorg }: + +stdenv.mkDerivation rec { + pname = "xmountains"; + version = "2.10"; + + src = fetchFromGitHub { + owner = "spbooth"; + repo = pname; + rev = "aa3bcbfed228adf3fff0fe4295589f13fc194f0b"; + sha256 = "0dx4n2y736lv04sj41cp1dw8n5zkw5gyd946a6zsiv0k796s9ra9"; + }; + + buildInputs = [ xlibsWrapper xorg.xbitmaps ]; + nativeBuildInputs = with xorg; [ imake gccmakedep ]; + + installPhase = "install -Dm755 xmountains -t $out/bin"; + + meta = with lib; { + description = "X11 based fractal landscape generator"; + homepage = "https://spbooth.github.io/xmountains"; + license = licenses.hpndSellVariant; + maintainers = with maintainers; [ djanatyn ]; + }; +} diff --git a/pkgs/applications/graphics/xournal/default.nix b/pkgs/applications/graphics/xournal/default.nix index 066e6cf2fb1..7d9ab53bef8 100644 --- a/pkgs/applications/graphics/xournal/default.nix +++ b/pkgs/applications/graphics/xournal/default.nix @@ -2,7 +2,7 @@ , ghostscript, atk, gtk2, glib, fontconfig, freetype , libgnomecanvas, libgnomeprint, libgnomeprintui , pango, libX11, xorgproto, zlib, poppler -, autoconf, automake, libtool, pkgconfig}: +, autoconf, automake, libtool, pkg-config}: let isGdkQuartzBackend = (gtk2.gdktarget == "quartz"); @@ -20,14 +20,14 @@ stdenv.mkDerivation rec { ghostscript atk gtk2 glib fontconfig freetype libgnomecanvas pango libX11 xorgproto zlib poppler - ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.isDarwin) [ libgnomeprint libgnomeprintui ]; - nativeBuildInputs = [ autoconf automake libtool pkgconfig ]; + nativeBuildInputs = [ autoconf automake libtool pkg-config ]; NIX_LDFLAGS = "-lz" - + stdenv.lib.optionalString (!isGdkQuartzBackend) " -lX11"; + + lib.optionalString (!isGdkQuartzBackend) " -lX11"; desktopItem = makeDesktopItem { name = name; diff --git a/pkgs/applications/graphics/xournalpp/default.nix b/pkgs/applications/graphics/xournalpp/default.nix index c6aa330329c..1810a6c6b8e 100644 --- a/pkgs/applications/graphics/xournalpp/default.nix +++ b/pkgs/applications/graphics/xournalpp/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { portaudio zlib ] - ++ stdenv.lib.optional withLua lua; + ++ lib.optional withLua lua; buildFlags = "translations"; diff --git a/pkgs/applications/graphics/xzgv/default.nix b/pkgs/applications/graphics/xzgv/default.nix index d2c569b91c6..d26f6eccf76 100644 --- a/pkgs/applications/graphics/xzgv/default.nix +++ b/pkgs/applications/graphics/xzgv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gtk2, libexif, pkgconfig, texinfo }: +{ lib, stdenv, fetchurl, gtk2, libexif, pkg-config, texinfo }: stdenv.mkDerivation rec { pname = "xzgv"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/xzgv/xzgv-${version}.tar.gz"; sha256 = "17l1xr9v07ggwga3vn0z1i4lnwjrr20rr8z1kjbw71aaijxl18i5"; }; - nativeBuildInputs = [ pkgconfig texinfo ]; + nativeBuildInputs = [ pkg-config texinfo ]; buildInputs = [ gtk2 libexif ]; postPatch = '' substituteInPlace config.mk \ diff --git a/pkgs/applications/graphics/yacreader/default.nix b/pkgs/applications/graphics/yacreader/default.nix index 2d253d4462a..5c727dbbaab 100644 --- a/pkgs/applications/graphics/yacreader/default.nix +++ b/pkgs/applications/graphics/yacreader/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, qmake, poppler, pkgconfig, libunarr +{ mkDerivation, lib, fetchFromGitHub, qmake, poppler, pkg-config, libunarr , libGLU, qtdeclarative, qtgraphicaleffects, qtmultimedia, qtquickcontrols , qtscript }: @@ -14,7 +14,7 @@ mkDerivation rec { sha256 = "17kzh69sxpyk4n7c2gkbsvr9y4j14azdy1qxzghsbwp7ij4iw9kv"; }; - nativeBuildInputs = [ qmake pkgconfig ]; + nativeBuildInputs = [ qmake pkg-config ]; buildInputs = [ poppler libunarr libGLU qtmultimedia qtscript ]; propagatedBuildInputs = [ qtquickcontrols qtgraphicaleffects qtdeclarative ]; diff --git a/pkgs/applications/graphics/zgrviewer/default.nix b/pkgs/applications/graphics/zgrviewer/default.nix index db07b9e1db4..c47c41a1cdc 100644 --- a/pkgs/applications/graphics/zgrviewer/default.nix +++ b/pkgs/applications/graphics/zgrviewer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, unzip, runtimeShell }: +{ lib, stdenv, fetchurl, jre, unzip, runtimeShell }: stdenv.mkDerivation rec { version = "0.9.0"; pname = "zgrviewer"; @@ -16,15 +16,15 @@ stdenv.mkDerivation rec { cp -r target/* "$out/share/java/zvtm/" echo '#!${runtimeShell}' > "$out/bin/zgrviewer" - echo "${jre}/lib/openjdk/jre/bin/java -jar '$out/share/java/zvtm/zgrviewer-${version}.jar' \"\$@\"" >> "$out/bin/zgrviewer" + echo "${jre}/bin/java -jar '$out/share/java/zvtm/zgrviewer-${version}.jar' \"\$@\"" >> "$out/bin/zgrviewer" chmod a+x "$out/bin/zgrviewer" ''; meta = { # Quicker to unpack locally than load Hydra hydraPlatforms = []; - maintainers = with stdenv.lib.maintainers; [raskin]; - license = stdenv.lib.licenses.lgpl21Plus; + maintainers = with lib.maintainers; [raskin]; + license = lib.licenses.lgpl21Plus; description = "GraphViz graph viewer/navigator"; - platforms = with stdenv.lib.platforms; unix; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/applications/graphics/zgv/default.nix b/pkgs/applications/graphics/zgv/default.nix index 435f4ccaf6d..a4e5e725490 100644 --- a/pkgs/applications/graphics/zgv/default.nix +++ b/pkgs/applications/graphics/zgv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, SDL, SDL_image, libjpeg, libpng, libtiff }: +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, SDL, SDL_image, libjpeg, libpng, libtiff }: stdenv.mkDerivation rec { pname = "zgv"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1fk4i9x0cpnpn3llam0zy2pkmhlr2hy3iaxhxg07v9sizd4dircj"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ SDL SDL_image libjpeg libpng libtiff ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/logging/humioctl/default.nix b/pkgs/applications/logging/humioctl/default.nix index a5131d14ca9..f3aef213ad2 100644 --- a/pkgs/applications/logging/humioctl/default.nix +++ b/pkgs/applications/logging/humioctl/default.nix @@ -1,9 +1,9 @@ -{ buildGoModule, fetchFromGitHub, installShellFiles, lib, stdenv }: +{ buildGoModule, fetchFromGitHub, installShellFiles, lib }: let - humioCtlVersion = "0.28.1"; - sha256 = "0vy07nzafqhc14i179sfrzb795yh4pcyjj3py9fwq0nwnmxndby4"; - vendorSha256 = "0anvah2rpqvxgmdrdj73k3vbf8073nmsl3aykgvb1nraf3gz3bpk"; + humioCtlVersion = "0.28.2"; + sha256 = "sha256-mCYxgBiuKylL2Qx4RCnD4ZoMFUm2J6VIL/Erc0u3BMA="; + vendorSha256 = "sha256-867x33Aq27D2m14NqqsdByC39pjjyJZbfX3jmwVU2yo="; in buildGoModule { name = "humioctl-${humioCtlVersion}"; pname = "humioctl"; diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index 4f4841bb2ed..3728216da7a 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { sha256 = "0pycia75vdfh6gxfd2hr32cxrryfxydid804n0v76l2fpr9v9v3d"; }; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ xar cpio ]; + buildInputs = lib.optionals stdenv.isDarwin [ xar cpio ]; - unpackPhase = stdenv.lib.optionalString stdenv.isDarwin '' + unpackPhase = lib.optionalString stdenv.isDarwin '' xar -xf $src zcat Payload | cpio -i ''; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { dontStrip = stdenv.isDarwin; - nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; doInstallCheck = true; diff --git a/pkgs/applications/misc/abook/default.nix b/pkgs/applications/misc/abook/default.nix index 4c03b197b4a..62cba4a5b73 100644 --- a/pkgs/applications/misc/abook/default.nix +++ b/pkgs/applications/misc/abook/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, ncurses, readline, autoreconfHook }: +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, ncurses, readline, autoreconfHook }: stdenv.mkDerivation rec { name = "abook-0.6.1"; @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ ncurses readline ]; meta = { homepage = "http://abook.sourceforge.net/"; description = "Text-based addressbook program designed to use with mutt mail client"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.edwtjo ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.edwtjo ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/misc/adobe-reader/default.nix b/pkgs/applications/misc/adobe-reader/default.nix index 25f888bbc8b..8f1b3f5ca88 100644 --- a/pkgs/applications/misc/adobe-reader/default.nix +++ b/pkgs/applications/misc/adobe-reader/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, cups, zlib, libxml2, pango, atk, gtk2, glib +{ lib, stdenv, fetchurl, libX11, cups, zlib, libxml2, pango, atk, gtk2, glib , gdk-pixbuf, gdk-pixbuf-xlib }: assert stdenv.hostPlatform.system == "i686-linux"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { # We should probably remove those and use the regular Nixpkgs # versions. - libPath = stdenv.lib.makeLibraryPath + libPath = lib.makeLibraryPath [ stdenv.cc.cc libX11 zlib libxml2 cups pango atk gtk2 glib gdk-pixbuf gdk-pixbuf-xlib ]; passthru.mozillaPlugin = "/libexec/adobe-reader/Browser/intellinux"; @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = { description = "Adobe Reader, a viewer for PDF documents"; homepage = "http://www.adobe.com/products/reader"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; knownVulnerabilities = [ "Numerous unresolved vulnerabilities" "See: https://www.cvedetails.com/product/497/Adobe-Acrobat-Reader.html?vendor_id=53" diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix index 9f4fc95df77..c862872a793 100644 --- a/pkgs/applications/misc/albert/default.nix +++ b/pkgs/applications/misc/albert/default.nix @@ -4,13 +4,13 @@ mkDerivation rec { pname = "albert"; - version = "0.16.1"; + version = "0.17.2"; src = fetchFromGitHub { owner = "albertlauncher"; repo = "albert"; rev = "v${version}"; - sha256 = "04sr35fqz66i24lv7r2p9qfqxs55i8xpj7aam0v9yakcr33lf55a"; + sha256 = "0lpp8rqx5b6rwdpcdldfdlw5327harr378wnfbc6rp3ajmlb4p7w"; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/almanah/default.nix b/pkgs/applications/misc/almanah/default.nix index b2b6815f7df..b8029b6229d 100644 --- a/pkgs/applications/misc/almanah/default.nix +++ b/pkgs/applications/misc/almanah/default.nix @@ -4,6 +4,7 @@ , cairo , desktop-file-utils , evolution-data-server +, evolution , gcr , gettext , glib @@ -27,7 +28,7 @@ stdenv.mkDerivation rec { version = "0.12.2"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "IWYOnOu0C9uQ9k1dgWkJ6Kv+o/jY+6Llfsi4PusHE24="; }; @@ -48,7 +49,7 @@ stdenv.mkDerivation rec { evolution-data-server gcr glib - gnome3.evolution + evolution gpgme gtk3 gtksourceview3 diff --git a/pkgs/applications/misc/antfs-cli/default.nix b/pkgs/applications/misc/antfs-cli/default.nix index 133194f7af5..516b786222d 100644 --- a/pkgs/applications/misc/antfs-cli/default.nix +++ b/pkgs/applications/misc/antfs-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication { pname = "antfs-cli"; diff --git a/pkgs/applications/misc/ape/apeclex.nix b/pkgs/applications/misc/ape/apeclex.nix index 8accc06fac2..81096d9877f 100644 --- a/pkgs/applications/misc/ape/apeclex.nix +++ b/pkgs/applications/misc/ape/apeclex.nix @@ -1,8 +1,8 @@ -{ stdenv, attemptoClex, callPackage }: +{ lib, attemptoClex, callPackage }: callPackage ./. { pname = "ape-clex"; lexiconPath = "${attemptoClex}/clex_lexicon.pl"; description = "Parser for Attempto Controlled English (ACE) with a large lexicon (~100,000 entries)"; - license = with stdenv.lib; [ licenses.lgpl3 licenses.gpl3 ]; + license = with lib; [ licenses.lgpl3 licenses.gpl3 ]; } diff --git a/pkgs/applications/misc/appeditor/default.nix b/pkgs/applications/misc/appeditor/default.nix index 20ee9a25494..d0db2b12dfd 100644 --- a/pkgs/applications/misc/appeditor/default.nix +++ b/pkgs/applications/misc/appeditor/default.nix @@ -4,7 +4,7 @@ , vala , meson , ninja -, pkgconfig +, pkg-config , pantheon , python3 , gettext @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meson ninja vala - pkgconfig + pkg-config python3 wrapGAppsHook ]; diff --git a/pkgs/applications/misc/apvlv/default.nix b/pkgs/applications/misc/apvlv/default.nix index f80dfeb1075..140d6eb7d08 100644 --- a/pkgs/applications/misc/apvlv/default.nix +++ b/pkgs/applications/misc/apvlv/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { cp ../Startup.pdf $out/share/doc/apvlv/Startup.pdf cp ../main_menubar.glade $out/share/doc/apvlv/main_menubar.glade '' - + stdenv.lib.optionalString (!stdenv.isDarwin) '' + + lib.optionalString (!stdenv.isDarwin) '' install -D ../apvlv.desktop $out/share/applications/apvlv.desktop ''; diff --git a/pkgs/applications/misc/archivy/default.nix b/pkgs/applications/misc/archivy/default.nix index c94011466ec..56260fa4f70 100644 --- a/pkgs/applications/misc/archivy/default.nix +++ b/pkgs/applications/misc/archivy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, python3, fetchPypi, appdirs, attrs, requests, +{ lib, python3, fetchPypi, appdirs, attrs, requests, beautifulsoup4, click-plugins, elasticsearch, flask_login, flask_wtf, pypandoc, python-dotenv, python-frontmatter, tinydb, validators, watchdog, wtforms }: @@ -17,7 +17,6 @@ python3.pkgs.buildPythonApplication rec { substituteInPlace requirements.txt \ --replace 'WTForms ==' 'WTForms >=' \ --replace 'attrs == 20.2.0' 'attrs' \ - --replace 'beautifulsoup4 ==' 'beautifulsoup4 >=' \ --replace 'elasticsearch ==' 'elasticsearch >=' \ --replace 'python_dotenv ==' 'python_dotenv >=' \ --replace 'python_frontmatter == 0.5.0' 'python_frontmatter' \ diff --git a/pkgs/applications/misc/artha/default.nix b/pkgs/applications/misc/artha/default.nix index bc31b844f18..37a1cee79a6 100644 --- a/pkgs/applications/misc/artha/default.nix +++ b/pkgs/applications/misc/artha/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, autoreconfHook, fetchurl, dbus-glib, gtk2, pkgconfig, wordnet }: +{ lib, stdenv, autoreconfHook, fetchurl, dbus-glib, gtk2, pkg-config, wordnet }: stdenv.mkDerivation { pname = "artha"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "0qr4ihl7ma3cq82xi1fpzvf74mm9vsg0j035xvmcp3r6rmw2fycx"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ dbus-glib gtk2 wordnet ]; patches = [ diff --git a/pkgs/applications/misc/audio/sox/default.nix b/pkgs/applications/misc/audio/sox/default.nix index ab9242c1322..dd5dbde5286 100644 --- a/pkgs/applications/misc/audio/sox/default.nix +++ b/pkgs/applications/misc/audio/sox/default.nix @@ -1,4 +1,4 @@ -{ config, lib, stdenv, fetchurl, pkgconfig, CoreAudio +{ config, lib, stdenv, fetchurl, pkg-config, CoreAudio , enableAlsa ? true, alsaLib ? null , enableLibao ? true, libao ? null , enableLame ? config.sox.enableLame or false, lame ? null @@ -14,7 +14,7 @@ , enableLibpulseaudio ? true, libpulseaudio ? null }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { name = "sox-14.4.2"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }; # configure.ac uses pkg-config only to locate libopusfile - nativeBuildInputs = optional enableOpusfile pkgconfig; + nativeBuildInputs = optional enableOpusfile pkg-config; buildInputs = optional (enableAlsa && stdenv.isLinux) alsaLib ++ diff --git a/pkgs/applications/misc/audio/soxr/default.nix b/pkgs/applications/misc/audio/soxr/default.nix index 59c7154fa7d..3f3ed0a0b15 100644 --- a/pkgs/applications/misc/audio/soxr/default.nix +++ b/pkgs/applications/misc/audio/soxr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake }: +{ lib, stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { name = "soxr-0.1.3"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "An audio resampling library"; homepage = "http://soxr.sourceforge.net"; - license = stdenv.lib.licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.lgpl21Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/misc/audio/wavesurfer/default.nix b/pkgs/applications/misc/audio/wavesurfer/default.nix index 45746a963b2..6e276d592b0 100644 --- a/pkgs/applications/misc/audio/wavesurfer/default.nix +++ b/pkgs/applications/misc/audio/wavesurfer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, snack, tcl, tk, makeWrapper }: +{ lib, stdenv, fetchurl, snack, tcl, tk, makeWrapper }: stdenv.mkDerivation { name = "wavesurfer-1.8.5"; @@ -17,12 +17,12 @@ stdenv.mkDerivation { ln -s $out/{nix-support,bin}/wavesurfer.tcl wrapProgram "$out/nix-support/wavesurfer.tcl" \ --set TCLLIBPATH "${snack}/lib" \ - --prefix PATH : "${stdenv.lib.makeBinPath [ tcl tk ]}" + --prefix PATH : "${lib.makeBinPath [ tcl tk ]}" ''; meta = { description = "Tool for recording, playing, editing, viewing and labeling of audio"; homepage = "http://www.speech.kth.se/wavesurfer/"; - license = stdenv.lib.licenses.bsd0; + license = lib.licenses.bsd0; }; } diff --git a/pkgs/applications/misc/ausweisapp2/default.nix b/pkgs/applications/misc/ausweisapp2/default.nix index e4305118b57..bd3194e3fea 100644 --- a/pkgs/applications/misc/ausweisapp2/default.nix +++ b/pkgs/applications/misc/ausweisapp2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, pkgconfig, pcsclite, qtsvg, qttools, qtwebsockets +{ lib, mkDerivation, fetchFromGitHub, cmake, pkg-config, pcsclite, qtsvg, qttools, qtwebsockets , qtquickcontrols2, qtgraphicaleffects }: mkDerivation rec { @@ -12,7 +12,7 @@ mkDerivation rec { sha256 = "00isb8xcbm419nvxx2ri0n8x5d403733h2whjqjcd3hmpx3x4q1h"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ qtsvg qttools qtwebsockets qtquickcontrols2 qtgraphicaleffects pcsclite ]; diff --git a/pkgs/applications/misc/autospotting/default.nix b/pkgs/applications/misc/autospotting/default.nix index 0b57ad29266..ac929bfa5b1 100644 --- a/pkgs/applications/misc/autospotting/default.nix +++ b/pkgs/applications/misc/autospotting/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage { pname = "autospotting"; diff --git a/pkgs/applications/misc/avrdudess/default.nix b/pkgs/applications/misc/avrdudess/default.nix index 4e5e253fd07..29469d9fff9 100644 --- a/pkgs/applications/misc/avrdudess/default.nix +++ b/pkgs/applications/misc/avrdudess/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, runtimeShell, fetchurl, unzip, mono, avrdude, gtk2, xdg_utils }: +{ lib, stdenv, runtimeShell, fetchurl, unzip, mono, avrdude, gtk2, xdg-utils }: stdenv.mkDerivation { name = "avrdudess-2.2.20140102"; @@ -20,10 +20,10 @@ stdenv.mkDerivation { cat >> "$out/bin/avrdudess" << __EOF__ #!${runtimeShell} - export LD_LIBRARY_PATH="${stdenv.lib.makeLibraryPath [gtk2 mono]}" + export LD_LIBRARY_PATH="${lib.makeLibraryPath [gtk2 mono]}" # We need PATH from user env for xdg-open to find its tools, which # typically depend on the currently running desktop environment. - export PATH="${stdenv.lib.makeBinPath [ avrdude xdg_utils ]}:\$PATH" + export PATH="${lib.makeBinPath [ avrdude xdg-utils ]}:\$PATH" # avrdudess must have its resource files in its current working directory cd $out/avrdudess && exec ${mono}/bin/mono "$out/avrdudess/avrdudess.exe" "\$@" diff --git a/pkgs/applications/misc/azuredatastudio/default.nix b/pkgs/applications/misc/azuredatastudio/default.nix index 902bef5f12e..9472af7a16f 100644 --- a/pkgs/applications/misc/azuredatastudio/default.nix +++ b/pkgs/applications/misc/azuredatastudio/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { ${gnutar}/bin/tar xf $src --strip 1 -C ${targetPath} ''; - sqltoolsserviceRpath = stdenv.lib.makeLibraryPath [ + sqltoolsserviceRpath = lib.makeLibraryPath [ stdenv.cc.cc libunwind libuuid @@ -62,10 +62,10 @@ stdenv.mkDerivation rec { # this will most likely need to be updated when azuredatastudio's version changes sqltoolsservicePath = "${targetPath}/resources/app/extensions/mssql/sqltoolsservice/Linux/2.0.0-release.56"; - rpath = stdenv.lib.concatStringsSep ":" [ + rpath = lib.concatStringsSep ":" [ atomEnv.libPath ( - stdenv.lib.makeLibraryPath [ + lib.makeLibraryPath [ libuuid at-spi2-core at-spi2-atk @@ -107,7 +107,7 @@ stdenv.mkDerivation rec { ''; meta = { - maintainers = with stdenv.lib.maintainers; [ xavierzwirtz ]; + maintainers = with lib.maintainers; [ xavierzwirtz ]; description = "A data management tool that enables working with SQL Server, Azure SQL DB and SQL DW"; homepage = "https://docs.microsoft.com/en-us/sql/azure-data-studio/download-azure-data-studio"; license = lib.licenses.unfreeRedistributable; diff --git a/pkgs/applications/misc/barrier/default.nix b/pkgs/applications/misc/barrier/default.nix index f08b33f0985..b9dbcf529be 100644 --- a/pkgs/applications/misc/barrier/default.nix +++ b/pkgs/applications/misc/barrier/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, curl, xorg, avahi, qtbase, mkDerivation, +{ lib, fetchFromGitHub, cmake, curl, xorg, avahi, qtbase, mkDerivation, openssl, wrapGAppsHook, avahiWithLibdnssdCompat ? avahi.override { withLibdnssdCompat = true; } }: @@ -23,7 +23,7 @@ mkDerivation rec { ''; qtWrapperArgs = [ - ''--prefix PATH : ${stdenv.lib.makeBinPath [ openssl ]}'' + ''--prefix PATH : ${lib.makeBinPath [ openssl ]}'' ]; meta = { @@ -35,8 +35,8 @@ mkDerivation rec { ''; homepage = "https://github.com/debauchee/barrier"; downloadPage = "https://github.com/debauchee/barrier/releases"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.phryneas ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.phryneas ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/bemenu/default.nix b/pkgs/applications/misc/bemenu/default.nix index 43362b0394e..8de0ceeae65 100644 --- a/pkgs/applications/misc/bemenu/default.nix +++ b/pkgs/applications/misc/bemenu/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, cairo, libxkbcommon -, pango, fribidi, harfbuzz, pcre, pkgconfig +, pango, fribidi, harfbuzz, pcre, pkg-config , ncursesSupport ? true, ncurses ? null , waylandSupport ? true, wayland ? null, wayland-protocols ? null , x11Support ? true, xlibs ? null, xorg ? null @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { sha256 = "1ifq5bk7782b9m6bl111x33fn38rpppdrww7hfavqia9a9gi2sl5"; }; - nativeBuildInputs = [ pkgconfig pcre ]; + nativeBuildInputs = [ pkg-config pcre ]; makeFlags = ["PREFIX=$(out)"]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ++ lib.optional waylandSupport "wayland" ++ lib.optional x11Support "x11"; - buildInputs = with stdenv.lib; [ + buildInputs = with lib; [ cairo fribidi harfbuzz diff --git a/pkgs/applications/misc/bibletime/default.nix b/pkgs/applications/misc/bibletime/default.nix index cfac79bef4b..eb909155e4e 100644 --- a/pkgs/applications/misc/bibletime/default.nix +++ b/pkgs/applications/misc/bibletime/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, stdenv, fetchurl, cmake, pkgconfig, sword, boost, clucene_core +{ lib, mkDerivation, fetchurl, cmake, pkg-config, sword, boost, clucene_core , qtbase, qttools, qtsvg, qtwebkit }: @@ -13,7 +13,7 @@ mkDerivation rec { sha256 = "1s5bvmwbz1gyp3ml8sghpc00h8nhdvx2iyq96iri30kwx1y1jy6i"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ sword boost clucene_core qtbase qttools qtsvg qtwebkit @@ -29,8 +29,8 @@ mkDerivation rec { meta = { description = "A Qt4 Bible study tool"; homepage = "http://www.bibletime.info/"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.piotr ]; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.piotr ]; }; } diff --git a/pkgs/applications/misc/birdtray/default.nix b/pkgs/applications/misc/birdtray/default.nix index df12d2b9f8f..ce8db160a75 100644 --- a/pkgs/applications/misc/birdtray/default.nix +++ b/pkgs/applications/misc/birdtray/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , cmake - , pkgconfig + , pkg-config , qtbase , qttools , qtx11extras @@ -26,7 +26,7 @@ mkDerivation rec { ./fix-qttranslations-path.diff ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ qtbase qttools qtx11extras ]; diff --git a/pkgs/applications/misc/bleachbit/default.nix b/pkgs/applications/misc/bleachbit/default.nix index 31da1e8d495..952d1fe16db 100644 --- a/pkgs/applications/misc/bleachbit/default.nix +++ b/pkgs/applications/misc/bleachbit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , python3Packages , fetchurl , gettext @@ -54,7 +54,7 @@ python3Packages.buildPythonApplication rec { # prevent double wrapping from wrapGApps and wrapPythonProgram dontWrapGApps = true; makeWrapperArgs = [ - ''''${gappsWrapperArgs[@]}'' + "\${gappsWrapperArgs[@]}" ]; strictDeps = false; diff --git a/pkgs/applications/misc/blogc/default.nix b/pkgs/applications/misc/blogc/default.nix index 57be731a121..86d52625dc2 100644 --- a/pkgs/applications/misc/blogc/default.nix +++ b/pkgs/applications/misc/blogc/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, ronn, git, cmocka }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, ronn, git, cmocka }: stdenv.mkDerivation rec { pname = "blogc"; - version = "0.20.0"; + version = "0.20.1"; src = fetchFromGitHub { owner = "blogc"; repo = pname; rev = "v${version}"; - sha256 = "0hx0gpvmv7rd910czafvmcpxabbvfmvdyxk4d1mckmblx8prb807"; + sha256 = "sha256-YAwGgV5Vllz8JlIASbGIkdRzpciQbgPiXl5DjiSEJyE="; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ ronn git cmocka ]; diff --git a/pkgs/applications/misc/bluetooth_battery/default.nix b/pkgs/applications/misc/bluetooth_battery/default.nix new file mode 100644 index 00000000000..19c2f3b99a4 --- /dev/null +++ b/pkgs/applications/misc/bluetooth_battery/default.nix @@ -0,0 +1,30 @@ +{ lib, fetchFromGitHub, buildPythonApplication, pybluez }: + +buildPythonApplication rec { + pname = "bluetooth_battery"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "TheWeirdDev"; + repo = "Bluetooth_Headset_Battery_Level"; + rev = "v${version}"; + sha256 = "121pkaq9z8p2i35cqs32aygjvf82r961w0axirpmsrbmrwq2hh6g"; + }; + + propagatedBuildInputs = [ pybluez ]; + + format = "other"; + + installPhase = '' + mkdir -p $out/bin + cp $src/bluetooth_battery.py $out/bin/bluetooth_battery + ''; + + meta = with lib; { + description = "Fetch the battery charge level of some Bluetooth headsets"; + homepage = "https://github.com/TheWeirdDev/Bluetooth_Headset_Battery_Level"; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ cheriimoya ]; + }; +} diff --git a/pkgs/applications/misc/break-time/default.nix b/pkgs/applications/misc/break-time/default.nix index 05815e242f0..3458ac3f250 100644 --- a/pkgs/applications/misc/break-time/default.nix +++ b/pkgs/applications/misc/break-time/default.nix @@ -5,7 +5,7 @@ , pkg-config , python3 , rustPlatform -, lib, stdenv +, lib , wrapGAppsHook }: diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix index 772754ecc6d..68b4f7b3e56 100644 --- a/pkgs/applications/misc/buku/default.nix +++ b/pkgs/applications/misc/buku/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3, fetchFromGitHub }: +{ lib, python3, fetchFromGitHub }: with python3.pkgs; buildPythonApplication rec { version = "4.5"; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 649acaabc0b..7917975f4f2 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -1,8 +1,9 @@ { lib +, stdenv , mkDerivation , fetchurl , poppler_utils -, pkgconfig +, pkg-config , libpng , imagemagick , libjpeg @@ -19,18 +20,18 @@ , python3Packages , libusb1 , libmtp -, xdg_utils +, xdg-utils , makeDesktopItem , removeReferencesTo }: mkDerivation rec { pname = "calibre"; - version = "5.9.0"; + version = "5.10.1"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz"; - sha256 = "a71196af15372054c4a25697534a2df1ef6dd732b9db07aaecaac7a86d9b3a0a"; + sha256 = "18pnqxdyvgmw12yarxhvsgs4jk6c5hp05gf8khybcd78330954v9"; }; patches = [ @@ -42,9 +43,20 @@ mkDerivation rec { # the unrar patch is not from debian ] ++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch; + escaped_pyqt5_dir = builtins.replaceStrings ["/"] ["\\/"] (toString python3Packages.pyqt5); + platform_tag = + if stdenv.hostPlatform.isDarwin then + "WS_MACX" + else if stdenv.hostPlatform.isWindows then + "WS_WIN" + else + "WS_X11"; + prePatch = '' - sed -i "/pyqt_sip_dir/ s:=.*:= '${python3Packages.pyqt5}/share/sip/PyQt5':" \ - setup/build_environment.py + sed -i "s/\[tool.sip.project\]/[tool.sip.project]\nsip-include-dirs = [\"${escaped_pyqt5_dir}\/share\/sip\/PyQt5\"]/g" \ + setup/build.py + sed -i "s/\[tool.sip.bindings.pictureflow\]/[tool.sip.bindings.pictureflow]\ntags = [\"${platform_tag}\"]/g" \ + setup/build.py # Remove unneeded files and libs rm -rf resources/calibre-portable.* \ @@ -55,7 +67,7 @@ mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig qmake removeReferencesTo ]; + nativeBuildInputs = [ pkg-config qmake removeReferencesTo ]; buildInputs = [ chmlib @@ -72,7 +84,7 @@ mkDerivation rec { poppler_utils qtbase sqlite - xdg_utils + xdg-utils ] ++ ( with python3Packages; [ apsw @@ -90,11 +102,13 @@ mkDerivation rec { msgpack netifaces pillow + pyqt-builder pyqt5 pyqtwebengine python regex - sip + sip_5 + zeroconf # the following are distributed with calibre, but we use upstream instead odfpy ] ++ lib.optional (unrarSupport) unrardll @@ -145,7 +159,7 @@ mkDerivation rec { # /nix/store/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx-podofo-0.9.6-dev/include/podofo/base/PdfVariant.h preFixup = '' remove-references-to -t ${podofo.dev} \ - $out/lib/calibre/calibre/plugins${lib.optionalString python3Packages.isPy3k "/3"}/podofo.so + $out/lib/calibre/calibre/plugins/podofo.so for program in $out/bin/*; do wrapProgram $program \ diff --git a/pkgs/applications/misc/candle/default.nix b/pkgs/applications/misc/candle/default.nix index d3357b41bd2..8df75b0cbd1 100644 --- a/pkgs/applications/misc/candle/default.nix +++ b/pkgs/applications/misc/candle/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchFromGitHub, qtbase, qtserialport, qmake }: +{ mkDerivation, lib, fetchFromGitHub, qtbase, qtserialport, qmake }: mkDerivation rec { pname = "candle"; diff --git a/pkgs/applications/misc/cardpeek/default.nix b/pkgs/applications/misc/cardpeek/default.nix index c565a1bf994..1d5baf9f6b3 100644 --- a/pkgs/applications/misc/cardpeek/default.nix +++ b/pkgs/applications/misc/cardpeek/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, glib, gtk3, pcsclite, lua5_2, curl, readline }: let version = "0.8.4"; @@ -14,7 +14,7 @@ in sha256 = "1ighpl7nvcvwnsd6r5h5n9p95kclwrq99hq7bry7s53yr57l6588"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ glib gtk3 pcsclite lua5_2 curl readline ]; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/cataract/build.nix b/pkgs/applications/misc/cataract/build.nix index 3347321d71d..f894dc91bd8 100644 --- a/pkgs/applications/misc/cataract/build.nix +++ b/pkgs/applications/misc/cataract/build.nix @@ -2,7 +2,7 @@ , fetchgit , autoreconfHook , glib -, pkgconfig +, pkg-config , libxml2 , exiv2 , imagemagick @@ -19,7 +19,7 @@ stdenv.mkDerivation { inherit sha256 rev; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ glib libxml2 exiv2 imagemagick ]; prePatch = '' diff --git a/pkgs/applications/misc/cbatticon/default.nix b/pkgs/applications/misc/cbatticon/default.nix index e77958b724d..482bec9d054 100644 --- a/pkgs/applications/misc/cbatticon/default.nix +++ b/pkgs/applications/misc/cbatticon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, gettext, glib, gtk3, libnotify, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitHub, pkg-config, gettext, glib, gtk3, libnotify, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "cbatticon"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0ivm2dzhsa9ir25ry418r2qg2llby9j7a6m3arbvq5c3kaj8m9jr"; }; - nativeBuildInputs = [ pkgconfig gettext wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config gettext wrapGAppsHook ]; buildInputs = [ glib gtk3 libnotify ]; diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix index 988af330deb..90eb38329a3 100644 --- a/pkgs/applications/misc/cheat/default.nix +++ b/pkgs/applications/misc/cheat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, fetchFromGitHub , buildGoModule, installShellFiles }: buildGoModule rec { diff --git a/pkgs/applications/misc/chewing-editor/default.nix b/pkgs/applications/misc/chewing-editor/default.nix index e1a57bb5300..13ee17999fe 100644 --- a/pkgs/applications/misc/chewing-editor/default.nix +++ b/pkgs/applications/misc/chewing-editor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, pkgconfig, libchewing, qtbase +{ lib, mkDerivation, fetchFromGitHub, cmake, pkg-config, libchewing, qtbase , qttools }: mkDerivation rec { @@ -14,7 +14,7 @@ mkDerivation rec { doCheck = true; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libchewing qtbase qttools ]; meta = with lib; { diff --git a/pkgs/applications/misc/cipher/default.nix b/pkgs/applications/misc/cipher/default.nix index ccf7da70f6e..eab1185edd8 100644 --- a/pkgs/applications/misc/cipher/default.nix +++ b/pkgs/applications/misc/cipher/default.nix @@ -4,7 +4,7 @@ , meson , ninja , vala -, pkgconfig +, pkg-config , pantheon , python3 , gettext @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meson ninja vala - pkgconfig + pkg-config python3 wrapGAppsHook ]; diff --git a/pkgs/applications/misc/cli-visualizer/default.nix b/pkgs/applications/misc/cli-visualizer/default.nix index 57b3f906cab..74dd82a3c6e 100644 --- a/pkgs/applications/misc/cli-visualizer/default.nix +++ b/pkgs/applications/misc/cli-visualizer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, fftw, ncurses5, libpulseaudio, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, cmake, fftw, ncurses5, libpulseaudio, makeWrapper }: stdenv.mkDerivation rec { version = "1.8"; @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/dpayne/cli-visualizer"; description = "CLI based audio visualizer"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.matthiasbeyer ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/misc/clight/clightd.nix b/pkgs/applications/misc/clight/clightd.nix index e1f019ffa45..51c61ca28e7 100644 --- a/pkgs/applications/misc/clight/clightd.nix +++ b/pkgs/applications/misc/clight/clightd.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, dbus, cmake, pkgconfig +, dbus, cmake, pkg-config , glib, udev, polkit, libmodule , pcre, libXdmcp, util-linux, libpthreadstubs , enableDdc ? true, ddcutil @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ dbus cmake - pkgconfig + pkg-config ]; buildInputs = with lib; [ diff --git a/pkgs/applications/misc/clight/default.nix b/pkgs/applications/misc/clight/default.nix index 2502459af10..6ef2e886a19 100644 --- a/pkgs/applications/misc/clight/default.nix +++ b/pkgs/applications/misc/clight/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, dbus, cmake, pkgconfig, bash-completion +, dbus, cmake, pkg-config, bash-completion , gsl, popt, clightd, systemd, libconfig, libmodule , withGeoclue ? true, geoclue2 , withUpower ? true, upower }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ dbus cmake - pkgconfig + pkg-config bash-completion ]; diff --git a/pkgs/applications/misc/clipcat/default.nix b/pkgs/applications/misc/clipcat/default.nix index 244770e138f..80e4982fc8a 100644 --- a/pkgs/applications/misc/clipcat/default.nix +++ b/pkgs/applications/misc/clipcat/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, installShellFiles, rustPlatform, rustfmt, xorg -, pkgconfig, llvmPackages, clang, protobuf, python3 }: +, pkg-config, llvmPackages, clang, protobuf, python3 }: rustPlatform.buildRustPackage rec { pname = "clipcat"; @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { PROTOC_INCLUDE = "${protobuf}/include"; nativeBuildInputs = [ - pkgconfig + pkg-config clang llvmPackages.libclang diff --git a/pkgs/applications/misc/clipit/default.nix b/pkgs/applications/misc/clipit/default.nix index 97ac54731c9..630ee3c3683 100644 --- a/pkgs/applications/misc/clipit/default.nix +++ b/pkgs/applications/misc/clipit/default.nix @@ -1,5 +1,5 @@ { fetchFromGitHub, fetchpatch, lib, stdenv -, autoreconfHook, intltool, pkgconfig +, autoreconfHook, intltool, pkg-config , gtk3, libayatana-appindicator, xdotool, which, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -17,12 +17,12 @@ stdenv.mkDerivation rec { intltoolize --copy --force --automake ''; - nativeBuildInputs = [ pkgconfig wrapGAppsHook autoreconfHook intltool ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook autoreconfHook intltool ]; configureFlags = [ "--with-gtk3" "--enable-appindicator=yes" ]; buildInputs = [ gtk3 libayatana-appindicator ]; gappsWrapperArgs = [ - "--prefix" "PATH" ":" "${stdenv.lib.makeBinPath [ xdotool which ]}" + "--prefix" "PATH" ":" "${lib.makeBinPath [ xdotool which ]}" ]; meta = with lib; { diff --git a/pkgs/applications/misc/confclerk/default.nix b/pkgs/applications/misc/confclerk/default.nix index bb1aacc2069..fb89d2a7e37 100644 --- a/pkgs/applications/misc/confclerk/default.nix +++ b/pkgs/applications/misc/confclerk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, qmake4Hook }: +{ lib, stdenv, fetchurl, qt4, qmake4Hook }: let version = "0.6.4"; in stdenv.mkDerivation { @@ -22,8 +22,8 @@ stdenv.mkDerivation { meta = { description = "Offline conference schedule viewer"; homepage = "http://www.toastfreeware.priv.at/confclerk"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ ehmry ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ ehmry ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/corectrl/default.nix b/pkgs/applications/misc/corectrl/default.nix index 3e129a81b16..f213faa4412 100644 --- a/pkgs/applications/misc/corectrl/default.nix +++ b/pkgs/applications/misc/corectrl/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec{ ]; runtimeDeps = [ mesa-demos vulkan-tools ]; - binPath = stdenv.lib.makeBinPath runtimeDeps; + binPath = lib.makeBinPath runtimeDeps; dontWrapQtApps = true; diff --git a/pkgs/applications/misc/coursera-dl/default.nix b/pkgs/applications/misc/coursera-dl/default.nix index 631d53b506f..56938f5338d 100644 --- a/pkgs/applications/misc/coursera-dl/default.nix +++ b/pkgs/applications/misc/coursera-dl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, glibcLocales, pandoc, python3 }: +{ lib, fetchFromGitHub, glibcLocales, pandoc, python3 }: let pythonPackages = python3.pkgs; diff --git a/pkgs/applications/misc/cpu-x/default.nix b/pkgs/applications/misc/cpu-x/default.nix index 236c2d6d433..d0ef6f05aeb 100644 --- a/pkgs/applications/misc/cpu-x/default.nix +++ b/pkgs/applications/misc/cpu-x/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, gtk3, ncurses +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, gtk3, ncurses , libcpuid, pciutils, procps, wrapGAppsHook, nasm, makeWrapper }: stdenv.mkDerivation rec { @@ -12,14 +12,14 @@ stdenv.mkDerivation rec { sha256 = "191zkkswlbbsw492yygc3idf7wh3bxs97drrqvqqw0mqvrzykxm3"; }; - nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook nasm makeWrapper ]; + nativeBuildInputs = [ cmake pkg-config wrapGAppsHook nasm makeWrapper ]; buildInputs = [ gtk3 ncurses libcpuid pciutils procps ]; postInstall = '' wrapProgram $out/bin/cpu-x \ - --prefix PATH : ${stdenv.lib.makeBinPath [ stdenv.cc ]} + --prefix PATH : ${lib.makeBinPath [ stdenv.cc ]} ''; meta = with lib; { diff --git a/pkgs/applications/misc/crow-translate/default.nix b/pkgs/applications/misc/crow-translate/default.nix index 120bc768c39..8cb87274c1d 100644 --- a/pkgs/applications/misc/crow-translate/default.nix +++ b/pkgs/applications/misc/crow-translate/default.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib + , mkDerivation , fetchFromGitHub , substituteAll @@ -64,7 +65,7 @@ mkDerivation rec { buildInputs = [ leptonica tesseract4 qtmultimedia qtx11extras ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple and lightweight translator that allows to translate and speak text using Google, Yandex and Bing"; homepage = "https://crow-translate.github.io/"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/misc/crumbs/default.nix b/pkgs/applications/misc/crumbs/default.nix index 889c17e6988..5bb42205816 100644 --- a/pkgs/applications/misc/crumbs/default.nix +++ b/pkgs/applications/misc/crumbs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "crumbs"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { cp crumbs-completion.fish $out/share/fish/vendor_completions.d/crumbs.fish ''; - meta = with stdenv.lib; + meta = with lib; { description = "Bookmarks for the command line"; homepage = "https://github.com/fasseg/crumbs"; license = licenses.wtfpl; diff --git a/pkgs/applications/misc/cum/default.nix b/pkgs/applications/misc/cum/default.nix index 6b851e80f34..42df68f6721 100644 --- a/pkgs/applications/misc/cum/default.nix +++ b/pkgs/applications/misc/cum/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages }: +{ lib, python3Packages }: with python3Packages; diff --git a/pkgs/applications/misc/cura/lulzbot/curaengine.nix b/pkgs/applications/misc/cura/lulzbot/curaengine.nix index a5cfa937fd8..5d1df20e224 100644 --- a/pkgs/applications/misc/cura/lulzbot/curaengine.nix +++ b/pkgs/applications/misc/cura/lulzbot/curaengine.nix @@ -1,4 +1,4 @@ -{ gcc8Stdenv, callPackage, fetchgit, fetchpatch, cmake, libarcusLulzbot, stb, protobuf }: +{ lib, gcc8Stdenv, callPackage, fetchgit, fetchpatch, cmake, libarcusLulzbot, stb, protobuf }: gcc8Stdenv.mkDerivation rec { pname = "curaengine-lulzBot"; @@ -17,7 +17,7 @@ gcc8Stdenv.mkDerivation rec { cmakeFlags = [ "-DCURA_ENGINE_VERSION=${version}" ]; - meta = with gcc8Stdenv.lib; { + meta = with lib; { description = "A powerful, fast and robust engine for processing 3D models into 3D printing instruction"; homepage = "https://code.alephobjects.com/source/curaengine-lulzbot/"; license = licenses.agpl3; diff --git a/pkgs/applications/misc/cura/lulzbot/libarcus.nix b/pkgs/applications/misc/cura/lulzbot/libarcus.nix index 1e186bdf5fd..7b1dbf4d85e 100644 --- a/pkgs/applications/misc/cura/lulzbot/libarcus.nix +++ b/pkgs/applications/misc/cura/lulzbot/libarcus.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchgit, fetchurl, cmake, sip, protobuf, pythonOlder }: +{ lib, buildPythonPackage, fetchgit, fetchurl, cmake, sip, protobuf, pythonOlder }: buildPythonPackage { pname = "libarcus"; diff --git a/pkgs/applications/misc/cura/lulzbot/libsavitar.nix b/pkgs/applications/misc/cura/lulzbot/libsavitar.nix index fb920235031..f12059e6317 100644 --- a/pkgs/applications/misc/cura/lulzbot/libsavitar.nix +++ b/pkgs/applications/misc/cura/lulzbot/libsavitar.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, pythonOlder, fetchgit, cmake, sip }: +{ lib, buildPythonPackage, pythonOlder, fetchgit, cmake, sip }: buildPythonPackage { pname = "libsavitar-lulzbot"; diff --git a/pkgs/applications/misc/cura/lulzbot/uranium.nix b/pkgs/applications/misc/cura/lulzbot/uranium.nix index 77a4f3edef6..01166092b2b 100644 --- a/pkgs/applications/misc/cura/lulzbot/uranium.nix +++ b/pkgs/applications/misc/cura/lulzbot/uranium.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, callPackage, fetchurl, fetchgit, buildPythonPackage, fetchFromGitHub, python, cmake +{ lib, callPackage, fetchurl, fetchgit, buildPythonPackage, fetchFromGitHub, python, cmake , pyqt5, numpy, scipy, shapely, libarcusLulzbot, doxygen, gettext, pythonOlder }: buildPythonPackage { diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix index 3a46b5e2f9a..20742311375 100644 --- a/pkgs/applications/misc/dasel/default.nix +++ b/pkgs/applications/misc/dasel/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildGoModule , fetchFromGitHub }: diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index e1c73393ec5..05d282aaf06 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { makeWrapper $out/dbeaver/dbeaver $out/bin/dbeaver \ --prefix PATH : ${jdk}/bin \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk3 libXtst ])} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk3 libXtst ])} \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" # Create desktop item. diff --git a/pkgs/applications/misc/deadd-notification-center/default.nix b/pkgs/applications/misc/deadd-notification-center/default.nix index 8414e02eb88..35627b28d15 100644 --- a/pkgs/applications/misc/deadd-notification-center/default.nix +++ b/pkgs/applications/misc/deadd-notification-center/default.nix @@ -1,44 +1,46 @@ -{ lib, stdenv -, fetchurl +{ lib +, stdenv +, fetchFromGitHub , autoPatchelfHook +, wrapGAppsHook +, hicolor-icon-theme , gtk3 , gobject-introspection , libxml2 }: - -let - version = "1.7.2"; - - dbusService = fetchurl { - url = "https://github.com/phuhl/linux_notification_center/raw/${version}/com.ph-uhl.deadd.notification.service.in"; - sha256 = "0jvmi1c98hm8x1x7kw9ws0nbf4y56yy44c3bqm6rjj4lrm89l83s"; - }; -in stdenv.mkDerivation rec { - inherit version; pname = "deadd-notification-center"; + version = "1.7.3"; - src = fetchurl { - url = "https://github.com/phuhl/linux_notification_center/releases/download/${version}/${pname}"; - sha256 = "13f15slkjiw2n5dnqj13dprhqm3nf1k11jqaqda379yhgygyp9zm"; + src = fetchFromGitHub { + owner = "phuhl"; + repo = "linux_notification_center"; + rev = version; + sha256 = "QaOLrtlhQyhMOirk6JO1yMGRrgycHmF9FAdKNbN2TRk="; }; dontUnpack = true; - nativeBuildInputs = [ autoPatchelfHook ]; + nativeBuildInputs = [ + autoPatchelfHook + wrapGAppsHook + ]; buildInputs = [ gtk3 gobject-introspection libxml2 + hicolor-icon-theme ]; installPhase = '' mkdir -p $out/bin $out/share/dbus-1/services - cp $src $out/bin/deadd-notification-center - chmod +x $out/bin/deadd-notification-center - sed "s|##PREFIX##|$out|g" ${dbusService} > $out/share/dbus-1/services/com.ph-uhl.deadd.notification.service + cp $src/.out/${pname} $out/bin/ + chmod +x $out/bin/${pname} + + sed "s|##PREFIX##|$out|g" $src/${pname}.service.in > \ + $out/share/dbus-1/services/com.ph-uhl.deadd.notification.service ''; meta = with lib; { diff --git a/pkgs/applications/misc/devdocs-desktop/default.nix b/pkgs/applications/misc/devdocs-desktop/default.nix index 3425ceb44a9..fe15d90f254 100644 --- a/pkgs/applications/misc/devdocs-desktop/default.nix +++ b/pkgs/applications/misc/devdocs-desktop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, appimageTools, fetchurl, gsettings-desktop-schemas, gtk3 }: +{ lib, appimageTools, fetchurl, gsettings-desktop-schemas, gtk3 }: let version = "0.7.1"; diff --git a/pkgs/applications/misc/devilspie2/default.nix b/pkgs/applications/misc/devilspie2/default.nix index 70fb38d17c4..2d3c28b2d71 100644 --- a/pkgs/applications/misc/devilspie2/default.nix +++ b/pkgs/applications/misc/devilspie2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, intltool, pkgconfig, glib, gtk, lua, libwnck3 }: +{ lib, stdenv, fetchurl, intltool, pkg-config, glib, gtk, lua, libwnck3 }: stdenv.mkDerivation rec { pname = "devilspie2"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0a7qjl2qd4099kkkbwa1y2fk48s21jlr409lf9mij7mlc9yc3zzc"; }; - nativeBuildInputs = [ intltool pkgconfig ]; + nativeBuildInputs = [ intltool pkg-config ]; buildInputs = [ glib gtk lua libwnck3 ]; installPhase = '' diff --git a/pkgs/applications/misc/dfilemanager/default.nix b/pkgs/applications/misc/dfilemanager/default.nix index e9a50e88b23..19cfa95a88e 100644 --- a/pkgs/applications/misc/dfilemanager/default.nix +++ b/pkgs/applications/misc/dfilemanager/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub, cmake, file, qtbase, qttools, solid }: +{ lib, mkDerivation, fetchFromGitHub, cmake, file, qtbase, qttools, solid }: mkDerivation { pname = "dfilemanager"; @@ -19,7 +19,7 @@ mkDerivation { meta = { homepage = "http://dfilemanager.sourceforge.net/"; description = "File manager written in Qt/C++"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/misc/diff-pdf/default.nix b/pkgs/applications/misc/diff-pdf/default.nix index 471755c6392..f5e5dccd0f3 100644 --- a/pkgs/applications/misc/diff-pdf/default.nix +++ b/pkgs/applications/misc/diff-pdf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, cairo, poppler, wxGTK ? null, wxmac ? null, darwin ? null }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, cairo, poppler, wxGTK ? null, wxmac ? null, darwin ? null }: let wxInputs = @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "1y5ji4c4m69vzs0z051fkhfdrjnyxb6kzac5flhdkfb2hgp1jnxl"; }; - nativeBuildInputs = [ autoconf automake pkgconfig ]; + nativeBuildInputs = [ autoconf automake pkg-config ]; buildInputs = [ cairo poppler ] ++ wxInputs; preConfigure = "./bootstrap"; diff --git a/pkgs/applications/misc/diffpdf/default.nix b/pkgs/applications/misc/diffpdf/default.nix index bce224f21b2..30715dd51f3 100644 --- a/pkgs/applications/misc/diffpdf/default.nix +++ b/pkgs/applications/misc/diffpdf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchurl, fetchpatch, qmake, qttools, qtbase, poppler }: +{ lib, mkDerivation, fetchurl, fetchpatch, qmake, qttools, qtbase, poppler }: mkDerivation rec { version = "2.1.3"; @@ -51,9 +51,9 @@ mkDerivation rec { meta = { homepage = "http://www.qtrac.eu/diffpdfc.html"; description = "Tool for diffing pdf files visually or textually"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ tstrobel ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ tstrobel ]; + platforms = with lib.platforms; linux; inherit version; }; } diff --git a/pkgs/applications/misc/digitalbitbox/default.nix b/pkgs/applications/misc/digitalbitbox/default.nix index 0c731aca713..4771cebc341 100644 --- a/pkgs/applications/misc/digitalbitbox/default.nix +++ b/pkgs/applications/misc/digitalbitbox/default.nix @@ -10,7 +10,7 @@ , udev , libusb1 , makeWrapper -, pkgconfig +, pkg-config , qtbase , qttools , qtwebsockets @@ -63,7 +63,7 @@ in mkDerivation rec { curl git makeWrapper - pkgconfig + pkg-config qttools ]; @@ -94,7 +94,7 @@ in mkDerivation rec { "format" ]; - qtWrapperArgs = [ ''--prefix LD_LIBRARY_PATH : $out/lib'' ]; + qtWrapperArgs = [ "--prefix LD_LIBRARY_PATH : $out/lib" ]; postInstall = '' mkdir -p "$out/lib" diff --git a/pkgs/applications/misc/ding/default.nix b/pkgs/applications/misc/ding/default.nix index 4f06708e47e..f0a7e2a779f 100644 --- a/pkgs/applications/misc/ding/default.nix +++ b/pkgs/applications/misc/ding/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { cp -v ding.png $out/share/pixmaps/ cp -v ding.desktop $out/share/applications/ - wrapProgram $out/bin/ding --prefix PATH : ${stdenv.lib.makeBinPath [ gnugrep aspellEnv tk fortune ]} --prefix ASPELL_CONF : "\"prefix ${aspellEnv};\"" + wrapProgram $out/bin/ding --prefix PATH : ${lib.makeBinPath [ gnugrep aspellEnv tk fortune ]} --prefix ASPELL_CONF : "\"prefix ${aspellEnv};\"" ''; meta = with lib; { diff --git a/pkgs/applications/misc/dmensamenu/default.nix b/pkgs/applications/misc/dmensamenu/default.nix index a0b4237c7f6..a8817a542e3 100644 --- a/pkgs/applications/misc/dmensamenu/default.nix +++ b/pkgs/applications/misc/dmensamenu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, fetchFromGitHub, substituteAll, requests, dmenu }: +{ lib, buildPythonApplication, fetchFromGitHub, substituteAll, requests, dmenu }: buildPythonApplication rec { pname = "dmensamenu"; diff --git a/pkgs/applications/misc/dockbarx/default.nix b/pkgs/applications/misc/dockbarx/default.nix index e0e9fcd6feb..b31c17cc319 100644 --- a/pkgs/applications/misc/dockbarx/default.nix +++ b/pkgs/applications/misc/dockbarx/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pythonPackages, gnome2, keybinder }: +{ lib, fetchFromGitHub, pythonPackages, gnome2, keybinder }: pythonPackages.buildPythonApplication rec { ver = "0.93"; diff --git a/pkgs/applications/misc/doing/gemset.nix b/pkgs/applications/misc/doing/gemset.nix index b30a124bb58..1e39123a83b 100644 --- a/pkgs/applications/misc/doing/gemset.nix +++ b/pkgs/applications/misc/doing/gemset.nix @@ -57,4 +57,4 @@ }; version = "2.0.8"; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/misc/doomseeker/default.nix b/pkgs/applications/misc/doomseeker/default.nix index 37f75c4fdd5..48ea1a0296c 100644 --- a/pkgs/applications/misc/doomseeker/default.nix +++ b/pkgs/applications/misc/doomseeker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, cmake, fetchFromBitbucket, pkgconfig, qtbase, qttools, qtmultimedia, zlib, bzip2, xxd }: +{ lib, stdenv, mkDerivation, cmake, fetchFromBitbucket, pkg-config, qtbase, qttools, qtmultimedia, zlib, bzip2, xxd }: mkDerivation { pname = "doomseeker"; @@ -13,10 +13,10 @@ mkDerivation { patches = [ ./fix_paths.patch ./qt_build_fix.patch ]; - nativeBuildInputs = [ cmake qttools pkgconfig xxd ]; + nativeBuildInputs = [ cmake qttools pkg-config xxd ]; buildInputs = [ qtbase qtmultimedia zlib bzip2 ]; - hardeningDisable = stdenv.lib.optional stdenv.isDarwin "format"; + hardeningDisable = lib.optional stdenv.isDarwin "format"; meta = with lib; { homepage = "http://doomseeker.drdteam.org/"; diff --git a/pkgs/applications/misc/dotfiles/default.nix b/pkgs/applications/misc/dotfiles/default.nix index 913ed9523ba..911a319a963 100644 --- a/pkgs/applications/misc/dotfiles/default.nix +++ b/pkgs/applications/misc/dotfiles/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pythonPackages }: +{ lib, pythonPackages }: pythonPackages.buildPythonApplication rec { pname = "dotfiles"; diff --git a/pkgs/applications/misc/dozenal/default.nix b/pkgs/applications/misc/dozenal/default.nix index 05d3ddb7cfb..ae5dd170eb9 100644 --- a/pkgs/applications/misc/dozenal/default.nix +++ b/pkgs/applications/misc/dozenal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ncurses, hdate, lua5_2 }: +{ lib, stdenv, fetchFromGitHub, ncurses, hdate, lua5_2 }: stdenv.mkDerivation rec { version = "12010904"; @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { Defaults to dozenal Roman numerals. ''; homepage = "https://github.com/dgoodmaniii/dozenal/"; - maintainers = with stdenv.lib.maintainers; [ CharlesHD ]; - license = stdenv.lib.licenses.gpl3; + maintainers = with lib.maintainers; [ CharlesHD ]; + license = lib.licenses.gpl3; }; } diff --git a/pkgs/applications/misc/dstask/default.nix b/pkgs/applications/misc/dstask/default.nix index 78efa133c1e..cd1c659ec5b 100644 --- a/pkgs/applications/misc/dstask/default.nix +++ b/pkgs/applications/misc/dstask/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "dstask"; diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix index a906669e7c6..eed07a2356e 100644 --- a/pkgs/applications/misc/dunst/default.nix +++ b/pkgs/applications/misc/dunst/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, makeWrapper -, pkgconfig, which, perl, libXrandr +, pkg-config, which, perl, libXrandr , cairo, dbus, systemd, gdk-pixbuf, glib, libX11, libXScrnSaver , libXinerama, libnotify, pango, xorgproto, librsvg, dunstify ? false }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "0irwkqcgwkqaylcpvqgh25gn2ysbdm2kydipxfzcq1ddj9ns6f9c"; }; - nativeBuildInputs = [ perl pkgconfig which systemd makeWrapper ]; + nativeBuildInputs = [ perl pkg-config which systemd makeWrapper ]; buildInputs = [ cairo dbus gdk-pixbuf glib libX11 libXScrnSaver diff --git a/pkgs/applications/misc/dupeguru/default.nix b/pkgs/applications/misc/dupeguru/default.nix index 7a9e2939640..d2332b4d9c7 100644 --- a/pkgs/applications/misc/dupeguru/default.nix +++ b/pkgs/applications/misc/dupeguru/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, python3Packages, fetchpatch, gettext, qt5, fetchFromGitHub}: +{lib, python3Packages, fetchpatch, gettext, qt5, fetchFromGitHub}: python3Packages.buildPythonApplication rec { pname = "dupeguru"; @@ -38,7 +38,7 @@ python3Packages.buildPythonApplication rec { ]; makeFlags = [ - "PREFIX=${placeholder ''out''}" + "PREFIX=${placeholder "out"}" "NO_VENV=1" ]; diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix index 806d960222d..d411ce7ae81 100644 --- a/pkgs/applications/misc/eaglemode/default.nix +++ b/pkgs/applications/misc/eaglemode/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perl, libX11, libXinerama, libjpeg, libpng, libtiff, pkgconfig, +{ lib, stdenv, fetchurl, perl, libX11, libXinerama, libjpeg, libpng, libtiff, pkg-config, librsvg, glib, gtk2, libXext, libXxf86vm, poppler, xineLib, ghostscript, makeWrapper }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "10zxih7gmyhq0az1mnsw2x563l4bbwcns794s4png8rf4d6hjszm"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ perl libX11 libXinerama libjpeg libpng libtiff librsvg glib gtk2 libXxf86vm libXext poppler xineLib ghostscript makeWrapper ]; diff --git a/pkgs/applications/misc/electrum/dash.nix b/pkgs/applications/misc/electrum/dash.nix index 29ac8b4484b..d0606001ad4 100644 --- a/pkgs/applications/misc/electrum/dash.nix +++ b/pkgs/applications/misc/electrum/dash.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python2Packages }: +{ lib, fetchurl, python2Packages }: python2Packages.buildPythonApplication rec { version = "2.9.3.1"; diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 215aa3dd5f2..273077b3bda 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -58,7 +58,7 @@ python3.pkgs.buildPythonApplication { cp -ar ${tests} $sourceRoot/electrum/tests ''; - nativeBuildInputs = stdenv.lib.optionals enableQt [ wrapQtAppsHook ]; + nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ]; propagatedBuildInputs = with python3.pkgs; [ aiohttp @@ -81,7 +81,7 @@ python3.pkgs.buildPythonApplication { keepkey trezor btchip - ] ++ stdenv.lib.optionals enableQt [ pyqt5 qdarkstyle ]; + ] ++ lib.optionals enableQt [ pyqt5 qdarkstyle ]; preBuild = '' sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py @@ -94,7 +94,7 @@ python3.pkgs.buildPythonApplication { sed -i '/qdarkstyle/d' contrib/requirements/requirements.txt ''); - postInstall = stdenv.lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.isLinux '' # Despite setting usr_share above, these files are installed under # $out/nix ... mv $out/${python3.sitePackages}/nix/store"/"*/share $out @@ -108,7 +108,7 @@ python3.pkgs.buildPythonApplication { ''; - postFixup = stdenv.lib.optionalString enableQt '' + postFixup = lib.optionalString enableQt '' wrapQtApp $out/bin/electrum ''; @@ -125,7 +125,7 @@ python3.pkgs.buildPythonApplication { ''; passthru.updateScript = import ./update.nix { - inherit (stdenv) lib; + inherit lib; inherit writeScript common-updater-scripts diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix index ad6ed6f7a78..bd015afdc57 100644 --- a/pkgs/applications/misc/electrum/ltc.nix +++ b/pkgs/applications/misc/electrum/ltc.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchurl , python3Packages , wrapQtAppsHook diff --git a/pkgs/applications/misc/elfx86exts/default.nix b/pkgs/applications/misc/elfx86exts/default.nix index 8fc7fb32743..690b88d8417 100644 --- a/pkgs/applications/misc/elfx86exts/default.nix +++ b/pkgs/applications/misc/elfx86exts/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , rustPlatform , fetchFromGitHub }: diff --git a/pkgs/applications/misc/elogind/default.nix b/pkgs/applications/misc/elogind/default.nix index 78dc54497dd..a3919648f74 100644 --- a/pkgs/applications/misc/elogind/default.nix +++ b/pkgs/applications/misc/elogind/default.nix @@ -8,7 +8,7 @@ , getent , libcap , gettext -, pkgconfig +, pkg-config , udev , eudev , libxslt @@ -25,7 +25,7 @@ , enableSystemd ? false }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "elogind"; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meson ninja m4 - pkgconfig + pkg-config gperf getent libcap diff --git a/pkgs/applications/misc/epdfview/default.nix b/pkgs/applications/misc/epdfview/default.nix index 90884af9fdf..9eea30e74f8 100644 --- a/pkgs/applications/misc/epdfview/default.nix +++ b/pkgs/applications/misc/epdfview/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, gtk2, poppler }: +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, gtk2, poppler }: stdenv.mkDerivation rec { pname = "epdfview"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0ibyb60a0b4n34bsjgvhdw8yf24463ky0hpmf6a2jjqsbm5g4v64"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 poppler ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/misc/et/default.nix b/pkgs/applications/misc/et/default.nix index 0de4ad9e21f..de47efc07ef 100644 --- a/pkgs/applications/misc/et/default.nix +++ b/pkgs/applications/misc/et/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, libnotify, gdk-pixbuf }: +{ lib, stdenv, fetchFromGitHub, pkg-config, libnotify, gdk-pixbuf }: stdenv.mkDerivation rec { pname = "et"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libnotify gdk-pixbuf ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/misc/etesync-dav/default.nix b/pkgs/applications/misc/etesync-dav/default.nix index 0cbb3cc75a7..ba3568f862c 100644 --- a/pkgs/applications/misc/etesync-dav/default.nix +++ b/pkgs/applications/misc/etesync-dav/default.nix @@ -1,12 +1,12 @@ -{ lib, python3Packages, radicale3 }: +{ lib, stdenv, python3Packages, radicale3 }: python3Packages.buildPythonApplication rec { pname = "etesync-dav"; - version = "0.30.6"; + version = "0.30.7"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0cjz4p3a750fwvrxbzwda0sidw7nscahvppdshbsx49i6qrczpbg"; + sha256 = "16b3105834dd6d9e374e976cad0978e1acfed0f0328c5054bc214550aea3e2c5"; }; propagatedBuildInputs = with python3Packages; [ @@ -24,5 +24,6 @@ python3Packages.buildPythonApplication rec { description = "Secure, end-to-end encrypted, and privacy respecting sync for contacts, calendars and tasks"; license = licenses.gpl3; maintainers = with maintainers; [ valodim ]; + broken = stdenv.isDarwin; # pyobjc-framework-Cocoa is missing }; } diff --git a/pkgs/applications/misc/eureka-editor/default.nix b/pkgs/applications/misc/eureka-editor/default.nix index 0b5922f8f69..2e70beb6173 100644 --- a/pkgs/applications/misc/eureka-editor/default.nix +++ b/pkgs/applications/misc/eureka-editor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, fltk, zlib, xdg_utils, xorg, libjpeg, libGL }: +{ lib, stdenv, fetchzip, fltk, zlib, xdg-utils, xorg, libjpeg, libGL }: stdenv.mkDerivation rec { pname = "eureka-editor"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0fpj13aq4wh3f7473cdc5jkf1c71jiiqmjc0ihqa0nm3hic1d4yv"; }; - buildInputs = [ fltk zlib xdg_utils libjpeg xorg.libXinerama libGL ]; + buildInputs = [ fltk zlib xdg-utils libjpeg xorg.libXinerama libGL ]; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/evtest/default.nix b/pkgs/applications/misc/evtest/default.nix index 7ed1afd14f8..84fae703a0c 100644 --- a/pkgs/applications/misc/evtest/default.nix +++ b/pkgs/applications/misc/evtest/default.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, fetchgit, autoreconfHook, pkgconfig, libxml2 }: +{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, libxml2 }: stdenv.mkDerivation rec { pname = "evtest"; version = "1.34"; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libxml2 ]; src = fetchgit { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Simple tool for input event debugging"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; diff --git a/pkgs/applications/misc/exercism/default.nix b/pkgs/applications/misc/exercism/default.nix index 1eeeba1b439..79420eacec8 100644 --- a/pkgs/applications/misc/exercism/default.nix +++ b/pkgs/applications/misc/exercism/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "exercism"; diff --git a/pkgs/applications/misc/expenses/default.nix b/pkgs/applications/misc/expenses/default.nix index 6b118e54122..63f942c2c59 100644 --- a/pkgs/applications/misc/expenses/default.nix +++ b/pkgs/applications/misc/expenses/default.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib + , buildGoModule , fetchFromGitHub , sqlite @@ -26,7 +27,7 @@ buildGoModule rec { "-ldflags=-s -w -X github.com/manojkarthick/expenses/cmd.Version=${version}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An interactive command line expense logger"; license = licenses.mit; maintainers = [ maintainers.manojkarthick ]; diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix index 75d0ec3f796..f95fb5ed6ec 100644 --- a/pkgs/applications/misc/far2l/default.nix +++ b/pkgs/applications/misc/far2l/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, pkgconfig, wxGTK30, glib, pcre, m4, bash, - xdg_utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick, darwin }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, pkg-config, wxGTK30, glib, pcre, m4, bash, + xdg-utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick, darwin }: let newer-colorer-schemes = fetchFromGitHub { @@ -20,21 +20,21 @@ stdenv.mkDerivation rec { sha256 = "1ssd3hwz4b7vl4r858d9whl61cn23pgcamcjmvfa6ysf4x2b7sgi"; }; - nativeBuildInputs = [ cmake pkgconfig m4 makeWrapper imagemagick ]; + nativeBuildInputs = [ cmake pkg-config m4 makeWrapper imagemagick ]; buildInputs = [ wxGTK30 glib pcre ] - ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa; + ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa; - postPatch = stdenv.lib.optionalString stdenv.isLinux '' + postPatch = lib.optionalString stdenv.isLinux '' substituteInPlace far2l/bootstrap/trash.sh \ --replace 'gvfs-trash' '${gvfs}/bin/gvfs-trash' - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' substituteInPlace far2l/CMakeLists.txt \ --replace "-framework System" -lSystem '' + '' echo 'echo ${version}' > far2l/bootstrap/scripts/vbuild.sh substituteInPlace far2l/bootstrap/open.sh \ - --replace 'xdg-open' '${xdg_utils}/bin/xdg-open' + --replace 'xdg-open' '${xdg-utils}/bin/xdg-open' substituteInPlace far2l/vtcompletor.cpp \ --replace '"/bin/bash"' '"${bash}/bin/bash"' substituteInPlace multiarc/src/formats/zip/zip.cpp \ @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { mkdir -p $out/share/icons/hicolor/$size/apps convert -size $size ../far2l/DE/icons/hicolor/$size/apps/far2l.svg $out/share/icons/hicolor/$size/apps/far2l.png done - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' wrapProgram $out/bin/far2l --argv0 $out/bin/far2l ''; diff --git a/pkgs/applications/misc/fbmenugen/default.nix b/pkgs/applications/misc/fbmenugen/default.nix index 26b8beab19c..36629179ab5 100644 --- a/pkgs/applications/misc/fbmenugen/default.nix +++ b/pkgs/applications/misc/fbmenugen/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , fluxbox , gnused diff --git a/pkgs/applications/misc/fbreader/default.nix b/pkgs/applications/misc/fbreader/default.nix index fff5bf1680d..c2347d5fbb8 100644 --- a/pkgs/applications/misc/fbreader/default.nix +++ b/pkgs/applications/misc/fbreader/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config , bzip2, curl, expat, fribidi, libunibreak, sqlite, zlib , uiTarget ? if !stdenv.isDarwin then "desktop" else "macosx" , uiType ? if !stdenv.isDarwin then "qt4" else "cocoa" @@ -6,7 +6,7 @@ , AppKit, Cocoa }: -with stdenv.lib; +with lib; assert elem uiTarget [ "desktop" "macosx" ]; assert elem uiType [ "qt4" "gtk" "cocoa" ]; @@ -50,7 +50,7 @@ stdenv.mkDerivation { --replace -llinebreak -lunibreak ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ bzip2 curl expat fribidi libunibreak sqlite zlib diff --git a/pkgs/applications/misc/feedbackd/default.nix b/pkgs/applications/misc/feedbackd/default.nix new file mode 100644 index 00000000000..34119c2006d --- /dev/null +++ b/pkgs/applications/misc/feedbackd/default.nix @@ -0,0 +1,52 @@ +{ lib +, stdenv +, fetchFromGitLab +, meson +, ninja +, pkg-config +, wrapGAppsHook +, glib +, gsound +, libgudev +, json-glib +, vala +, gobject-introspection +}: + +stdenv.mkDerivation rec { + pname = "feedbackd-unstable"; + version = "2021-01-25"; + + src = fetchFromGitLab { + domain = "source.puri.sm"; + owner = "Librem5"; + repo = "feedbackd"; + rev = "v0.0.0+git${builtins.replaceStrings ["-"] [""] version}"; + sha256 = "184ag10sfzrka533inv6f38x6z769kq5jj56vdkcm65j5h786w5v"; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + wrapGAppsHook + vala + gobject-introspection + ]; + + buildInputs = [ + glib + gsound + libgudev + json-glib + ]; + + meta = with lib; { + description = "A daemon to provide haptic (and later more) feedback on events"; + homepage = "https://source.puri.sm/Librem5/feedbackd"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ pacman99 ]; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/applications/misc/fehlstart/default.nix b/pkgs/applications/misc/fehlstart/default.nix index 55d47459aed..992b6278082 100644 --- a/pkgs/applications/misc/fehlstart/default.nix +++ b/pkgs/applications/misc/fehlstart/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkgconfig, gtk2, keybinder, fetchFromGitLab }: +{ lib, stdenv, pkg-config, gtk2, keybinder, fetchFromGitLab }: stdenv.mkDerivation { name = "fehlstart-9f4342d7"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { }; patches = [ ./use-nix-profiles.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 keybinder ]; preConfigure = '' diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix index ce6b7c64693..01493e13181 100644 --- a/pkgs/applications/misc/fetchmail/default.nix +++ b/pkgs/applications/misc/fetchmail/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, openssl }: +{ lib, stdenv, fetchurl, openssl }: let - version = "6.4.14"; + version = "6.4.15"; in stdenv.mkDerivation { pname = "fetchmail"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz"; - sha256 = "1jxxb3qyrh7118fwqa3bhirjh97j2w8r71s8vcb6vp3w1wwhfis2"; + sha256 = "sha256-c1shdHSTfhPPzeotQqNGv2hIfg1h7+vk0Nnt3LOia5Y="; }; buildInputs = [ openssl ]; @@ -28,8 +28,8 @@ stdenv.mkDerivation { IPSEC. ''; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.peti ]; - license = stdenv.lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.peti ]; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/misc/fff/default.nix b/pkgs/applications/misc/fff/default.nix index 5b007ccb37f..a3f791940cb 100644 --- a/pkgs/applications/misc/fff/default.nix +++ b/pkgs/applications/misc/fff/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, bashInteractive, xdg_utils, file, coreutils, w3m, xdotool }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, bashInteractive, xdg-utils, file, coreutils, w3m, xdotool }: stdenv.mkDerivation rec { pname = "fff"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "14ymdw6l6phnil0xf1frd5kgznaiwppcic0v4hb61s1zpf4wrshg"; }; - pathAdd = stdenv.lib.makeSearchPath "bin" ([ xdg_utils file coreutils w3m xdotool ]); + pathAdd = lib.makeSearchPath "bin" ([ xdg-utils file coreutils w3m xdotool ]); nativeBuildInputs = [ makeWrapper ]; buildInputs = [ bashInteractive ]; diff --git a/pkgs/applications/misc/firestarter/default.nix b/pkgs/applications/misc/firestarter/default.nix index 3af59d0ddfa..7215cc56449 100644 --- a/pkgs/applications/misc/firestarter/default.nix +++ b/pkgs/applications/misc/firestarter/default.nix @@ -2,7 +2,7 @@ withCuda ? true }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "firestarter"; version = "1.7.4"; diff --git a/pkgs/applications/misc/fme/default.nix b/pkgs/applications/misc/fme/default.nix index 1a4b38a1cad..52ba2927fd4 100644 --- a/pkgs/applications/misc/fme/default.nix +++ b/pkgs/applications/misc/fme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, autoconf, automake, gettext +{ lib, stdenv, fetchurl, pkg-config, autoconf, automake, gettext , fluxbox, bc, gtkmm2, glibmm, libglademm, libsigcxx }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "d1c81a6a38c0faad02943ad65d6d0314bd205c6de841669a2efe43e4c503e63d"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoconf automake gettext fluxbox bc gtkmm2 glibmm libglademm libsigcxx ]; preConfigure = '' diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix index 8b8fc09f7d3..3efef455313 100644 --- a/pkgs/applications/misc/font-manager/default.nix +++ b/pkgs/applications/misc/font-manager/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, meson, ninja, gettext, python3, - pkgconfig, libxml2, json-glib , sqlite, itstool, librsvg, yelp-tools, + pkg-config, libxml2, json-glib , sqlite, itstool, librsvg, yelp-tools, vala, gtk3, gnome3, desktop-file-utils, wrapGAppsHook, gobject-introspection }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config meson ninja gettext diff --git a/pkgs/applications/misc/formatter/default.nix b/pkgs/applications/misc/formatter/default.nix index 71479c4ac3e..26c6a8cbc70 100644 --- a/pkgs/applications/misc/formatter/default.nix +++ b/pkgs/applications/misc/formatter/default.nix @@ -4,7 +4,7 @@ , meson , ninja , vala -, pkgconfig +, pkg-config , pantheon , python3 , substituteAll @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meson ninja vala - pkgconfig + pkg-config python3 wrapGAppsHook ]; diff --git a/pkgs/applications/misc/fsv/default.nix b/pkgs/applications/misc/fsv/default.nix index 71e60a11caa..a965c615dfd 100644 --- a/pkgs/applications/misc/fsv/default.nix +++ b/pkgs/applications/misc/fsv/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchFromGitHub, autoreconfHook -, libtool, pkgconfig, gtk2, libGLU, file +, libtool, pkg-config, gtk2, libGLU, file }: let @@ -7,10 +7,10 @@ let pname = "gtkglarea"; version = "2.1.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1pl2vdj6l64j864ilhkq1bcggb3hrlxjwk5m029i7xfjfxc587lf"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 libGLU ]; hardeningDisable = [ "format" ]; }; @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { sed -i 's/AM_GNU_GETTEXT/AM_GNU_GETTEXT([external])/' configure.in ''; - nativeBuildInputs = [ autoreconfHook libtool pkgconfig ]; + nativeBuildInputs = [ autoreconfHook libtool pkg-config ]; buildInputs = [ file gtk2 libGLU gtkglarea ]; meta = with lib; { diff --git a/pkgs/applications/misc/fuzzel/default.nix b/pkgs/applications/misc/fuzzel/default.nix index 337d68b4b20..3dafe8fa671 100644 --- a/pkgs/applications/misc/fuzzel/default.nix +++ b/pkgs/applications/misc/fuzzel/default.nix @@ -1,13 +1,12 @@ -{ stdenv, lib, fetchgit, pkg-config, meson, ninja, wayland, pixman, cairo, librsvg, wayland-protocols, wlroots, libxkbcommon, scdoc, git, tllist, fcft}: +{ stdenv, lib, fetchzip, pkg-config, meson, ninja, wayland, pixman, cairo, librsvg, wayland-protocols, wlroots, libxkbcommon, scdoc, git, tllist, fcft}: stdenv.mkDerivation rec { pname = "fuzzel"; - version = "1.4.2"; + version = "1.5.1"; - src = fetchgit { - url = "https://codeberg.org/dnkl/fuzzel"; - rev = version; - sha256 = "0c0p9spklzmy9f7abz3mvw0vp6zgnk3ns1i6ks95ljjb3kqy9vs2"; + src = fetchzip { + url = "https://codeberg.org/dnkl/fuzzel/archive/${version}.tar.gz"; + sha256 = "0zy0icd3647jyq4xflp35vwn52yxgj3zz4n30br657xjq1l5afzl"; }; nativeBuildInputs = [ pkg-config meson ninja scdoc git ]; diff --git a/pkgs/applications/misc/gImageReader/default.nix b/pkgs/applications/misc/gImageReader/default.nix index 80ec6f82571..2e1afa8053b 100644 --- a/pkgs/applications/misc/gImageReader/default.nix +++ b/pkgs/applications/misc/gImageReader/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, libuuid +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libuuid , sane-backends, podofo, libjpeg, djvulibre, libxmlxx3, libzip, tesseract , intltool, poppler, json-glib , ninja @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja intltool - pkgconfig + pkg-config pythonEnv # Gtk specific diff --git a/pkgs/applications/misc/galculator/default.nix b/pkgs/applications/misc/galculator/default.nix index 6d7989412d4..287a2fca363 100644 --- a/pkgs/applications/misc/galculator/default.nix +++ b/pkgs/applications/misc/galculator/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , autoreconfHook, intltool -, gtk, pkgconfig, flex }: +, gtk, pkg-config, flex }: stdenv.mkDerivation rec { pname = "galculator"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0q0hb62f266709ncyq96bpx4a40a1i6dc5869byvd7x285sx1c2w"; }; - nativeBuildInputs = [ autoreconfHook intltool pkgconfig ]; + nativeBuildInputs = [ autoreconfHook intltool pkg-config ]; buildInputs = [ gtk flex ]; meta = with lib; { diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index 398cec3a2bb..5eebda9610e 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "gallery_dl"; - version = "1.16.1"; + version = "1.16.4"; src = fetchPypi { inherit pname version; - sha256 = "51d789aac43013e25c1fad553f214cb1f43b1ae02e0651b640f102c5b9280aea"; + sha256 = "744deddf22fdbc51d1d89776c41b0f1127d2b4d212bd092718fad2c0dc7f160f"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/applications/misc/gammu/default.nix b/pkgs/applications/misc/gammu/default.nix index 6f1b824925f..0a6796a9b07 100644 --- a/pkgs/applications/misc/gammu/default.nix +++ b/pkgs/applications/misc/gammu/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchFromGitHub, python, pkgconfig, cmake, bluez, libusb1, curl +{ lib, stdenv, fetchFromGitHub, python, pkg-config, cmake, bluez, libusb1, curl , libiconv, gettext, sqlite , dbiSupport ? false, libdbi ? null, libdbiDrivers ? null , postgresSupport ? false, postgresql ? null }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "gammu"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { patches = [ ./bashcomp-dir.patch ./systemd.patch ]; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ python bluez libusb1 curl gettext sqlite libiconv ] ++ optionals dbiSupport [ libdbi libdbiDrivers ] diff --git a/pkgs/applications/misc/garmin-plugin/default.nix b/pkgs/applications/misc/garmin-plugin/default.nix index 37cf8fc18af..c2c3a69140b 100644 --- a/pkgs/applications/misc/garmin-plugin/default.nix +++ b/pkgs/applications/misc/garmin-plugin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, garmintools, libgcrypt, libusb-compat-0_1, pkgconfig, tinyxml, zlib }: +{ lib, stdenv, fetchurl, garmintools, libgcrypt, libusb-compat-0_1, pkg-config, tinyxml, zlib }: stdenv.mkDerivation { name = "garmin-plugin-0.3.26"; src = fetchurl { @@ -6,7 +6,7 @@ stdenv.mkDerivation { sha256 = "15gads1fj4sj970m5960dgnhys41ksi4cm53ldkf67wn8dc9i4k0"; }; sourceRoot = "GarminPlugin-0.3.26/src"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ garmintools libusb-compat-0_1 libgcrypt tinyxml zlib ]; configureFlags = [ "--with-libgcrypt-prefix=${libgcrypt.dev}" @@ -19,8 +19,8 @@ stdenv.mkDerivation { ''; meta = { homepage = "http://www.andreas-diesner.de/garminplugin"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; maintainers = [ ]; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/gcal/default.nix b/pkgs/applications/misc/gcal/default.nix index 24906b11dd5..28de8e0ecea 100644 --- a/pkgs/applications/misc/gcal/default.nix +++ b/pkgs/applications/misc/gcal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, fetchpatch }: +{ lib, stdenv, fetchurl, ncurses, fetchpatch }: stdenv.mkDerivation rec { pname = "gcal"; @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { also displays holiday lists for many countries around the globe. ''; homepage = "https://www.gnu.org/software/gcal/"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.romildo ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.romildo ]; }; } diff --git a/pkgs/applications/misc/genxword/default.nix b/pkgs/applications/misc/genxword/default.nix index 215542003ad..f443618c685 100644 --- a/pkgs/applications/misc/genxword/default.nix +++ b/pkgs/applications/misc/genxword/default.nix @@ -10,13 +10,13 @@ python3.pkgs.buildPythonApplication rec { pname = "genxword"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "riverrun"; repo = pname; rev = "v${version}"; - sha256 = "00czdvyb5wnrk3x0g529afisl8v4frfys9ih0nzf1fs4jkzjcijg"; + sha256 = "17h8saja45bv612yk0pra9ncbp2mjnx5n10q25nqhl765ks4bmb5"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/geoipupdate/default.nix b/pkgs/applications/misc/geoipupdate/default.nix index 1e0aba0400f..12b5a38877a 100644 --- a/pkgs/applications/misc/geoipupdate/default.nix +++ b/pkgs/applications/misc/geoipupdate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "geoipupdate"; diff --git a/pkgs/applications/misc/get_iplayer/default.nix b/pkgs/applications/misc/get_iplayer/default.nix index 5c31ce55add..d4f50451719 100644 --- a/pkgs/applications/misc/get_iplayer/default.nix +++ b/pkgs/applications/misc/get_iplayer/default.nix @@ -1,6 +1,6 @@ -{stdenv, fetchFromGitHub, atomicparsley, flvstreamer, ffmpeg_3, makeWrapper, perl, perlPackages, rtmpdump}: +{ lib, fetchFromGitHub, atomicparsley, flvstreamer, ffmpeg_3, makeWrapper, perl, perlPackages, rtmpdump}: -with stdenv.lib; +with lib; perlPackages.buildPerlPackage rec { pname = "get_iplayer"; diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index 4c61a4dad51..f8ebd8aed7e 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkgconfig, check, dbus, xvfb_run, glib, gtk, gettext, libiconv, json_c, libintl +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, check, dbus, xvfb_run, glib, gtk, gettext, libiconv, json_c, libintl }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1n3i960b458172mc3pkq7m9dn5qxry6fms3c3k06v27cjp5whsyf"; }; - nativeBuildInputs = [ meson ninja pkgconfig gettext check dbus xvfb_run ]; + nativeBuildInputs = [ meson ninja pkg-config gettext check dbus xvfb_run ]; buildInputs = [ libintl libiconv json_c ]; propagatedBuildInputs = [ glib gtk ]; diff --git a/pkgs/applications/misc/gkrellm/default.nix b/pkgs/applications/misc/gkrellm/default.nix index bc7c66ee531..2cc20b424b1 100644 --- a/pkgs/applications/misc/gkrellm/default.nix +++ b/pkgs/applications/misc/gkrellm/default.nix @@ -1,7 +1,7 @@ -{ fetchurl, stdenv, gettext, pkgconfig, glib, gtk2, libX11, libSM, libICE, which +{ lib, fetchurl, stdenv, gettext, pkg-config, glib, gtk2, libX11, libSM, libICE, which , IOKit ? null }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { name = "gkrellm-2.3.11"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "01lccz4fga40isv09j8rjgr0qy10rff9vj042n6gi6gdv4z69q0y"; }; - nativeBuildInputs = [ pkgconfig which ]; + nativeBuildInputs = [ pkg-config which ]; buildInputs = [gettext glib gtk2 libX11 libSM libICE] ++ optionals stdenv.isDarwin [ IOKit ]; diff --git a/pkgs/applications/misc/gksu/default.nix b/pkgs/applications/misc/gksu/default.nix index bfa50447761..9d8ce3cc480 100644 --- a/pkgs/applications/misc/gksu/default.nix +++ b/pkgs/applications/misc/gksu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, gnome2, gnome3, libgksu, +{ lib, stdenv, fetchurl, pkg-config, gtk2, gnome2, gnome3, libgksu, intltool, libstartup_notification, gtk-doc, wrapGAppsHook }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig intltool gtk-doc wrapGAppsHook + pkg-config intltool gtk-doc wrapGAppsHook ]; buildInputs = [ @@ -46,8 +46,8 @@ stdenv.mkDerivation rec { as another user. ''; homepage = "https://www.nongnu.org/gksu/"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.romildo ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.romildo ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/glava/default.nix b/pkgs/applications/misc/glava/default.nix index daa74c3a414..a0af30ac84b 100644 --- a/pkgs/applications/misc/glava/default.nix +++ b/pkgs/applications/misc/glava/default.nix @@ -3,7 +3,7 @@ , enableGlfw ? false, glfw, runtimeShell }: let - inherit (stdenv.lib) optional makeLibraryPath; + inherit (lib) optional makeLibraryPath; wrapperScript = writeScript "glava" '' #!${runtimeShell} diff --git a/pkgs/applications/misc/glom/default.nix b/pkgs/applications/misc/glom/default.nix index 0c2bb9304b1..47d56288ed2 100644 --- a/pkgs/applications/misc/glom/default.nix +++ b/pkgs/applications/misc/glom/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, pkgconfig +, pkg-config , autoconf , automake , libtool @@ -54,12 +54,12 @@ in stdenv.mkDerivation rec { outputs = [ "out" "lib" "dev" "doc" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1wcd4kd3crwqjv0jfp73jkyyf5ws8mvykg37kqxmcb58piz21gsk"; }; nativeBuildInputs = [ - pkgconfig + pkg-config autoconf automake libtool @@ -101,7 +101,7 @@ in stdenv.mkDerivation rec { preConfigure = "NOCONFIGURE=1 ./autogen.sh"; configureFlags = [ - "--with-boost-python=boost_python${stdenv.lib.versions.major python3.version}${stdenv.lib.versions.minor python3.version}" + "--with-boost-python=boost_python${lib.versions.major python3.version}${lib.versions.minor python3.version}" ]; makeFlags = [ diff --git a/pkgs/applications/misc/gmrun/default.nix b/pkgs/applications/misc/gmrun/default.nix index b3ef510739b..bd99adf9435 100644 --- a/pkgs/applications/misc/gmrun/default.nix +++ b/pkgs/applications/misc/gmrun/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, glib, gtk2, pkgconfig, popt }: +{ lib, stdenv, fetchurl, glib, gtk2, pkg-config, popt }: let version = "0.9.2"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "180z6hbax1qypy5cyy2z6nn7fzxla4ib47ck8mqwr714ag77na8p"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib gtk2 popt ]; doCheck = true; diff --git a/pkgs/applications/misc/gmtp/default.nix b/pkgs/applications/misc/gmtp/default.nix index c568afac31e..1479fe7bc7d 100644 --- a/pkgs/applications/misc/gmtp/default.nix +++ b/pkgs/applications/misc/gmtp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libmtp, libid3tag, flac, libvorbis, gtk3 +{ lib, stdenv, fetchurl, pkg-config, libmtp, libid3tag, flac, libvorbis, gtk3 , gsettings-desktop-schemas, wrapGAppsHook }: @@ -13,7 +13,7 @@ stdenv.mkDerivation { sha256 = "04q6byyq002fhzkc2rkkahwh5b6272xakaj4m3vwm8la8jf0r0ss"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; buildInputs = [ libmtp libid3tag flac libvorbis gtk3 gsettings-desktop-schemas ]; enableParallelBuilding = true; @@ -25,8 +25,8 @@ stdenv.mkDerivation { meta = { description = "A simple MP3 and Media player client for UNIX and UNIX like systems"; homepage = "https://gmtp.sourceforge.io"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; maintainers = [ ]; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }; } diff --git a/pkgs/applications/misc/gnome-firmware-updater/default.nix b/pkgs/applications/misc/gnome-firmware-updater/default.nix index 88be6b22f28..30d3b57003d 100644 --- a/pkgs/applications/misc/gnome-firmware-updater/default.nix +++ b/pkgs/applications/misc/gnome-firmware-updater/default.nix @@ -11,7 +11,7 @@ , libxmlb , meson , ninja -, pkgconfig +, pkg-config , systemd , help2man , wrapGAppsHook @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { help2man meson ninja - pkgconfig + pkg-config wrapGAppsHook ]; diff --git a/pkgs/applications/misc/gnome-multi-writer/default.nix b/pkgs/applications/misc/gnome-multi-writer/default.nix index 628f93f5bbc..89a967d718b 100644 --- a/pkgs/applications/misc/gnome-multi-writer/default.nix +++ b/pkgs/applications/misc/gnome-multi-writer/default.nix @@ -11,7 +11,7 @@ , libgudev , meson , ninja -, pkgconfig +, pkg-config , wrapGAppsHook , polkit , udisks @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { version = "3.32.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1apdd8yi12zagf82k376a9wmdm27wzwdxpm2wf2pnwkaf786rmdw"; }; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { gettext meson ninja - pkgconfig + pkg-config wrapGAppsHook ]; diff --git a/pkgs/applications/misc/gnome-recipes/default.nix b/pkgs/applications/misc/gnome-recipes/default.nix index 3e21e2cadb9..168d5b9fb5c 100644 --- a/pkgs/applications/misc/gnome-recipes/default.nix +++ b/pkgs/applications/misc/gnome-recipes/default.nix @@ -2,7 +2,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , gnome3 , desktop-file-utils , gettext @@ -26,14 +26,14 @@ 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}/${lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "1yymii3yf823d9x28fbhqdqm1wa30s40j94x0am9fjj0nzyd5s8v"; }; nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config desktop-file-utils gettext itstool diff --git a/pkgs/applications/misc/gnome-usage/default.nix b/pkgs/applications/misc/gnome-usage/default.nix index ad956e9d02a..fee4ba655c3 100644 --- a/pkgs/applications/misc/gnome-usage/default.nix +++ b/pkgs/applications/misc/gnome-usage/default.nix @@ -2,7 +2,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , vala , gettext , libxml2 @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { version = "3.38.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0mqs39yi2cqwkzlmmgzrszsva5hbdpws6zk4lbi4w2cjzl185mcl"; }; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { libxml2 meson ninja - pkgconfig + pkg-config vala wrapGAppsHook ]; diff --git a/pkgs/applications/misc/go-jira/default.nix b/pkgs/applications/misc/go-jira/default.nix index c2871766deb..2f2a0a22126 100644 --- a/pkgs/applications/misc/go-jira/default.nix +++ b/pkgs/applications/misc/go-jira/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "go-jira"; diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix index 57e2d95f043..fa58c2d3965 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/applications/misc/golden-cheetah/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, mkDerivation +{ lib, fetchFromGitHub, fetchpatch, mkDerivation , qtbase, qtsvg, qtserialport, qtwebengine, qtmultimedia, qttools , qtconnectivity, qtcharts, libusb-compat-0_1 , yacc, flex, zlib, qmake, makeDesktopItem, makeWrapper diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix index 0fb4b3f2b97..307ef57c625 100644 --- a/pkgs/applications/misc/goldendict/default.nix +++ b/pkgs/applications/misc/goldendict/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, pkgconfig +{ lib, stdenv, mkDerivation, fetchFromGitHub, pkg-config , libXtst, libvorbis, hunspell, lzo, xz, bzip2, libiconv , qtbase, qtsvg, qtwebkit, qtx11extras, qttools, qmake , withCC ? true, opencc @@ -21,28 +21,28 @@ mkDerivation rec { patches = [ ./0001-dont-check-for-updates.patch - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ ./0001-dont-use-maclibs.patch ]; postPatch = '' substituteInPlace goldendict.pro \ - --replace "hunspell-1.6.1" "hunspell-${stdenv.lib.versions.majorMinor hunspell.version}" + --replace "hunspell-1.6.1" "hunspell-${lib.versions.majorMinor hunspell.version}" ''; - nativeBuildInputs = [ pkgconfig qmake ]; + nativeBuildInputs = [ pkg-config qmake ]; buildInputs = [ qtbase qtsvg qtwebkit qttools libvorbis hunspell xz lzo - ] ++ stdenv.lib.optionals stdenv.isLinux [ qtx11extras libXtst ] - ++ stdenv.lib.optionals stdenv.isDarwin [ bzip2 libiconv ] - ++ stdenv.lib.optional withCC opencc - ++ stdenv.lib.optional withEpwing libeb - ++ stdenv.lib.optional withExtraTiff libtiff - ++ stdenv.lib.optionals withFFmpeg [ libao ffmpeg_3 ] - ++ stdenv.lib.optional withZim zstd; + ] ++ lib.optionals stdenv.isLinux [ qtx11extras libXtst ] + ++ lib.optionals stdenv.isDarwin [ bzip2 libiconv ] + ++ lib.optional withCC opencc + ++ lib.optional withEpwing libeb + ++ lib.optional withExtraTiff libtiff + ++ lib.optionals withFFmpeg [ libao ffmpeg_3 ] + ++ lib.optional withZim zstd; - qmakeFlags = with stdenv.lib; [ + qmakeFlags = with lib; [ "goldendict.pro" (optional withCC "CONFIG+=chinese_conversion_support") (optional (!withCC) "CONFIG+=no_chinese_conversion_support") @@ -53,7 +53,7 @@ mkDerivation rec { (optional withZim "CONFIG+=zim_support") ]; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.isDarwin '' mkdir -p $out/Applications mv GoldenDict.app $out/Applications wrapQtApp $out/Applications/GoldenDict.app/Contents/MacOS/GoldenDict diff --git a/pkgs/applications/misc/gollum/default.nix b/pkgs/applications/misc/gollum/default.nix index e1698f06015..fc80a5ddb8a 100644 --- a/pkgs/applications/misc/gollum/default.nix +++ b/pkgs/applications/misc/gollum/default.nix @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { in '' mkdir -p $out/bin makeWrapper ${env}/bin/gollum $out/bin/gollum \ - --prefix PATH ":" ${stdenv.lib.makeBinPath [ git ]} + --prefix PATH ":" ${lib.makeBinPath [ git ]} makeWrapper ${env}/bin/gollum-migrate-tags $out/bin/gollum-migrate-tags \ - --prefix PATH ":" ${stdenv.lib.makeBinPath [ git ]} + --prefix PATH ":" ${lib.makeBinPath [ git ]} ''; passthru.updateScript = bundlerUpdateScript "gollum"; diff --git a/pkgs/applications/misc/gollum/gemset.nix b/pkgs/applications/misc/gollum/gemset.nix index 75ee9d05ab4..d259167856a 100644 --- a/pkgs/applications/misc/gollum/gemset.nix +++ b/pkgs/applications/misc/gollum/gemset.nix @@ -463,4 +463,4 @@ }; version = "0.16.10"; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/misc/googleearth/default.nix b/pkgs/applications/misc/googleearth/default.nix index 641e0896f4e..edf1fc54ba9 100644 --- a/pkgs/applications/misc/googleearth/default.nix +++ b/pkgs/applications/misc/googleearth/default.nix @@ -12,7 +12,7 @@ let then "0dwnppn5snl5bwkdrgj4cyylnhngi0g66fn2k41j3dvis83x24k6" else "0gndbxrj3kgc2dhjqwjifr3cl85hgpm695z0wi01wvwzhrjqs0l2"; version = "7.1.8.3036"; - fullPath = stdenv.lib.makeLibraryPath [ + fullPath = lib.makeLibraryPath [ glibc glib stdenv.cc.cc diff --git a/pkgs/applications/misc/googler/default.nix b/pkgs/applications/misc/googler/default.nix index f7a29c257f4..a7cd5ec64ab 100644 --- a/pkgs/applications/misc/googler/default.nix +++ b/pkgs/applications/misc/googler/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "googler"; - version = "4.3.1"; + version = "4.3.2"; src = fetchFromGitHub { owner = "jarun"; repo = pname; rev = "v${version}"; - sha256 = "04wa0mlbfjnzwham2dpd9lch7800js4vp3ikgjl4qnwilvr1lw74"; + sha256 = "sha256-PgWg396AQ15CAnfTXGDpSg1UXx7mNCtknEjJd/KV4MU="; }; buildInputs = [ python ]; diff --git a/pkgs/applications/misc/gosmore/default.nix b/pkgs/applications/misc/gosmore/default.nix index 4d55129193f..854fec8642a 100644 --- a/pkgs/applications/misc/gosmore/default.nix +++ b/pkgs/applications/misc/gosmore/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchsvn, libxml2, gtk2, curl, pkgconfig } : +{ lib, stdenv, fetchsvn, libxml2, gtk2, curl, pkg-config } : let version = "31801"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { buildInputs = [ libxml2 gtk2 curl ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; prePatch = '' sed -e '/curl.types.h/d' -i *.{c,h,hpp,cpp} diff --git a/pkgs/applications/misc/gpa/default.nix b/pkgs/applications/misc/gpa/default.nix index 6bda23aebe0..63bba909b6d 100644 --- a/pkgs/applications/misc/gpa/default.nix +++ b/pkgs/applications/misc/gpa/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, intltool, pkgconfig, gtk2, gpgme, libgpgerror, libassuan }: +{ lib, stdenv, fetchurl, intltool, pkg-config, gtk2, gpgme, libgpgerror, libassuan }: stdenv.mkDerivation rec { name = "gpa-0.10.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1cbpc45f8qbdkd62p12s3q2rdq6fa5xdzwmcwd3xrj55bzkspnwm"; }; - nativeBuildInputs = [ intltool pkgconfig ]; + nativeBuildInputs = [ intltool pkg-config ]; buildInputs = [ gtk2 gpgme libgpgerror libassuan ]; meta = with lib; { diff --git a/pkgs/applications/misc/gpg-mdp/default.nix b/pkgs/applications/misc/gpg-mdp/default.nix index cf3d6fe9e93..48c7c7724eb 100644 --- a/pkgs/applications/misc/gpg-mdp/default.nix +++ b/pkgs/applications/misc/gpg-mdp/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, ncurses, gnupg }: +{ fetchurl, lib, stdenv, ncurses, gnupg }: let version = "0.7.4"; in stdenv.mkDerivation { @@ -7,7 +7,7 @@ in stdenv.mkDerivation { inherit version; meta = { homepage = "https://tamentis.com/projects/mdp/"; - license = [stdenv.lib.licenses.isc]; + license = [lib.licenses.isc]; description = "Manage your passwords with GnuPG and a text editor"; }; src = fetchurl { diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix index 409aaded4b6..5635aadda9d 100644 --- a/pkgs/applications/misc/gphoto2/default.nix +++ b/pkgs/applications/misc/gphoto2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config , gettext , libexif , libgphoto2 @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config gettext libtool ]; diff --git a/pkgs/applications/misc/gphoto2/gphotofs.nix b/pkgs/applications/misc/gphoto2/gphotofs.nix index c5511847ba0..afb02c9937f 100644 --- a/pkgs/applications/misc/gphoto2/gphotofs.nix +++ b/pkgs/applications/misc/gphoto2/gphotofs.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libtool, pkgconfig, libgphoto2, fuse, glib }: +{ lib, stdenv, fetchurl, libtool, pkg-config, libgphoto2, fuse, glib }: stdenv.mkDerivation rec { pname = "gphoto2fs"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1k23ncbsbh64r7kz050bg31jqamchyswgg9izhzij758d7gc8vk7"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libgphoto2 fuse glib libtool ]; diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix index 39cd4f40b4b..85c7fbae789 100644 --- a/pkgs/applications/misc/gpsbabel/default.nix +++ b/pkgs/applications/misc/gpsbabel/default.nix @@ -32,12 +32,14 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-zlib=system" ] # Floating point behavior on i686 causes test failures. Preventing # extended precision fixes this problem. - ++ stdenv.lib.optionals stdenv.isi686 [ + ++ lib.optionals stdenv.isi686 [ "CFLAGS=-ffloat-store" "CXXFLAGS=-ffloat-store" ]; enableParallelBuilding = true; + dontWrapQtApps = true; + doCheck = true; preCheck = '' patchShebangs testo diff --git a/pkgs/applications/misc/gpsbabel/gui.nix b/pkgs/applications/misc/gpsbabel/gui.nix index b115329cf0d..8501b7c0875 100644 --- a/pkgs/applications/misc/gpsbabel/gui.nix +++ b/pkgs/applications/misc/gpsbabel/gui.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, qmake, qttools, qtwebkit, qttranslations, gpsbabel }: +{ lib, mkDerivation, qmake, qttools, qtwebkit, qttranslations, gpsbabel }: mkDerivation { pname = "gpsbabel-gui"; @@ -10,6 +10,8 @@ mkDerivation { nativeBuildInputs = [ qmake qttools ]; buildInputs = [ qtwebkit ]; + dontWrapQtApps = true; + postPatch = '' substituteInPlace mainwindow.cc \ --replace "QApplication::applicationDirPath() + \"/" "\"" \ @@ -29,7 +31,7 @@ mkDerivation { ''; qtWrapperArgs = [ - "--prefix PATH : ${stdenv.lib.makeBinPath [ gpsbabel ]}" + "--prefix PATH : ${lib.makeBinPath [ gpsbabel ]}" ]; postInstall = '' diff --git a/pkgs/applications/misc/gpscorrelate/default.nix b/pkgs/applications/misc/gpscorrelate/default.nix index 5d8296d337f..a1357ff0a08 100644 --- a/pkgs/applications/misc/gpscorrelate/default.nix +++ b/pkgs/applications/misc/gpscorrelate/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, stdenv, fetchpatch, pkgconfig, exiv2, libxml2, gtk3 +{ fetchFromGitHub, lib, stdenv, fetchpatch, pkg-config, exiv2, libxml2, gtk3 , libxslt, docbook_xsl, docbook_xml_dtd_42, desktop-file-utils, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { docbook_xml_dtd_42 docbook_xsl libxslt - pkgconfig + pkg-config wrapGAppsHook ]; diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix index 2348384abd0..f413f526774 100644 --- a/pkgs/applications/misc/gpsprune/default.nix +++ b/pkgs/applications/misc/gpsprune/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gpsprune"; - version = "20"; + version = "20.1"; src = fetchurl { url = "https://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar"; - sha256 = "1i9p6h98azgradrrkcwx18zwz4c6zkxp4bfykpa2imi1z3ry5q2b"; + sha256 = "sha256-NU2AhqMVxjPyCocjZg5dzwHpTgAIBluMqdKqn4lnknM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/gpx-viewer/default.nix b/pkgs/applications/misc/gpx-viewer/default.nix index 2c14691869f..89a4198a749 100644 --- a/pkgs/applications/misc/gpx-viewer/default.nix +++ b/pkgs/applications/misc/gpx-viewer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, intltool, libxml2, pkgconfig, gnome3, libchamplain, gdl, shared-mime-info, desktop-file-utils, wrapGAppsHook }: +{ lib, stdenv, fetchurl, intltool, libxml2, pkg-config, gnome3, libchamplain, gdl, shared-mime-info, desktop-file-utils, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "gpx-viewer"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-database-updates" ]; nativeBuildInputs = [ - intltool pkgconfig + intltool pkg-config wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system ]; buildInputs = [ gdl libchamplain gnome3.adwaita-icon-theme libxml2 ]; diff --git a/pkgs/applications/misc/gpx/default.nix b/pkgs/applications/misc/gpx/default.nix index c052b1ddb05..04ebd491c28 100644 --- a/pkgs/applications/misc/gpx/default.nix +++ b/pkgs/applications/misc/gpx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "gpx"; @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { meta = { description = "Gcode to x3g conversion postprocessor"; homepage = "https://github.com/markwal/GPX/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.leo60228 ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.leo60228 ]; }; } diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index adafe8801f3..c79c2886fd4 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "gpxsee"; - version = "8.0"; + version = "8.3"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "01ggakpzmiwkqdzc9xqc93xmynd53kzpwl99q3l9z2hpqyzlnj2a"; + sha256 = "sha256-D58Q9qZ7x2j//pOQa+oIgVK/9F0du2FUoZprSFEKViU="; }; patches = (substituteAll { diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix index 7b2c5a23f8b..1628f0473fa 100644 --- a/pkgs/applications/misc/gramps/default.nix +++ b/pkgs/applications/misc/gramps/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gtk3, pythonPackages, intltool, gexiv2, +{ lib, fetchFromGitHub, gtk3, pythonPackages, intltool, gexiv2, pango, gobject-introspection, wrapGAppsHook, gettext, # Optional packages: enableOSM ? true, osm-gps-map, @@ -15,11 +15,11 @@ in buildPythonApplication rec { nativeBuildInputs = [ wrapGAppsHook intltool gettext ]; buildInputs = [ gtk3 gobject-introspection pango gexiv2 ] # Map support - ++ stdenv.lib.optional enableOSM osm-gps-map + ++ lib.optional enableOSM osm-gps-map # Graphviz support - ++ stdenv.lib.optional enableGraphviz graphviz + ++ lib.optional enableGraphviz graphviz # Ghostscript support - ++ stdenv.lib.optional enableGhostscript ghostscript + ++ lib.optional enableGhostscript ghostscript ; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/green-pdfviewer/default.nix b/pkgs/applications/misc/green-pdfviewer/default.nix index 876ab562598..fe21631c0d6 100644 --- a/pkgs/applications/misc/green-pdfviewer/default.nix +++ b/pkgs/applications/misc/green-pdfviewer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, poppler, pkgconfig, gdk-pixbuf, SDL, gtk2 }: +{ lib, stdenv, fetchFromGitHub, poppler, pkg-config, gdk-pixbuf, SDL, gtk2 }: stdenv.mkDerivation { pname = "green-pdfviewer"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0d0lv33flhgsxhc77kfp2avdz5gvml04r8l1j95yjz2rr096lzlj"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ poppler gdk-pixbuf SDL gtk2 ]; patches = [ diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/applications/misc/grip/default.nix index 02544812eb1..5ebe7765e50 100644 --- a/pkgs/applications/misc/grip/default.nix +++ b/pkgs/applications/misc/grip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk2, glib, pkgconfig, libgnome, libgnomeui, vte +{ lib, stdenv, fetchurl, gtk2, glib, pkg-config, libgnome, libgnomeui, vte , curl, cdparanoia, libid3tag, ncurses, libtool }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1si5kidwg0i2jg0brzyvjrzw24v3km2hdgd4kda1adzq81a3p1cs"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 glib libgnome libgnomeui vte curl cdparanoia libid3tag ncurses libtool ]; @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { meta = { description = "GTK-based audio CD player/ripper"; homepage = "http://nostatic.org/grip"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ marcweber peti ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with lib.maintainers; [ marcweber peti ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/gsctl/default.nix b/pkgs/applications/misc/gsctl/default.nix index 101baa09396..15d8b966396 100644 --- a/pkgs/applications/misc/gsctl/default.nix +++ b/pkgs/applications/misc/gsctl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gsctl"; diff --git a/pkgs/applications/misc/gsimplecal/default.nix b/pkgs/applications/misc/gsimplecal/default.nix index 158a7fc8fc6..21128ac9119 100644 --- a/pkgs/applications/misc/gsimplecal/default.nix +++ b/pkgs/applications/misc/gsimplecal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, automake, autoconf, pkgconfig, gtk3 }: +{ lib, stdenv, fetchurl, automake, autoconf, pkg-config, gtk3 }: stdenv.mkDerivation rec { pname = "gsimplecal"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ automake autoconf gtk3 ]; preConfigure = "./autogen.sh"; @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { Also, you can configure it to not only show the calendar, but also display multiple clocks for different world time zones. ''; - license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.romildo ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.romildo ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/gtk2fontsel/default.nix b/pkgs/applications/misc/gtk2fontsel/default.nix index 828cd952bbc..d635fa8d865 100644 --- a/pkgs/applications/misc/gtk2fontsel/default.nix +++ b/pkgs/applications/misc/gtk2fontsel/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, pkgconfig, gtk2 }: +{lib, stdenv, fetchurl, pkg-config, gtk2 }: stdenv.mkDerivation rec { version = "0.1"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0s2sj19n8ys92q9832hkn36ld91bb4qavicc6nygkry6qdpkkmjw"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ stdenv gtk2 ]; preferLocalBuild = true; diff --git a/pkgs/applications/misc/gummi/default.nix b/pkgs/applications/misc/gummi/default.nix index af121758c3c..f0416e232dc 100644 --- a/pkgs/applications/misc/gummi/default.nix +++ b/pkgs/applications/misc/gummi/default.nix @@ -1,6 +1,6 @@ -{ stdenv, pkgs +{ lib, stdenv, pkgs , glib, gnome3, gtk3, gtksourceview3, gtkspell3, poppler, texlive -, pkgconfig, intltool, autoreconfHook, wrapGAppsHook +, pkg-config, intltool, autoreconfHook, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig intltool autoreconfHook wrapGAppsHook + pkg-config intltool autoreconfHook wrapGAppsHook ]; buildInputs = [ glib gtksourceview3 gtk3 gtkspell3 poppler @@ -29,9 +29,9 @@ stdenv.mkDerivation rec { meta = { homepage = "https://gummi.app"; description = "Simple LaTex editor for GTK users"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ flokli ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ flokli ]; + platforms = with lib.platforms; linux; inherit version; }; } diff --git a/pkgs/applications/misc/gv/default.nix b/pkgs/applications/misc/gv/default.nix index accf62c0c46..aa07058dc80 100644 --- a/pkgs/applications/misc/gv/default.nix +++ b/pkgs/applications/misc/gv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, Xaw3d, ghostscriptX, perl, pkgconfig, libiconv }: +{ lib, stdenv, fetchurl, Xaw3d, ghostscriptX, perl, pkg-config, libiconv }: let name = "gv-3.7.4"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0q8s43z14vxm41pfa8s5h9kyyzk1fkwjhkiwbf2x70alm6rv6qi1"; }; - configureFlags = stdenv.lib.optionals stdenv.isDarwin [ + configureFlags = lib.optionals stdenv.isDarwin [ "--enable-SIGCHLD-fallback" ]; @@ -19,8 +19,8 @@ stdenv.mkDerivation { Xaw3d ghostscriptX perl - pkgconfig - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + pkg-config + ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; @@ -41,8 +41,8 @@ stdenv.mkDerivation { interface for the Ghostscript interpreter. ''; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/misc/gxmessage/default.nix b/pkgs/applications/misc/gxmessage/default.nix index ce0a6963ea9..9f09e3d978e 100644 --- a/pkgs/applications/misc/gxmessage/default.nix +++ b/pkgs/applications/misc/gxmessage/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk3, intltool, pkgconfig, texinfo }: +{ lib, stdenv, fetchurl, gtk3, intltool, pkg-config, texinfo }: stdenv.mkDerivation rec { pname = "gxmessage"; @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { sha256 = "db4e1655fc58f31e5770a17dfca4e6c89028ad8b2c8e043febc87a0beedeef05"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ intltool gtk3 texinfo ]; meta = { description = "A GTK enabled dropin replacement for xmessage"; homepage = "http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [jfb]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [jfb]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/misc/gxneur/default.nix b/pkgs/applications/misc/gxneur/default.nix index 2e2e9f0850e..9e8c5ddaef4 100644 --- a/pkgs/applications/misc/gxneur/default.nix +++ b/pkgs/applications/misc/gxneur/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, intltool, gtk2, xorg, glib, xneur, libglade, GConf, libappindicator-gtk2, pcre }: +{ lib, stdenv, fetchurl, pkg-config, intltool, gtk2, xorg, glib, xneur, libglade, GConf, libappindicator-gtk2, pcre }: stdenv.mkDerivation { name = "gxneur-0.20.0"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { # glib-2.62 deprecations NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkg-config intltool ]; buildInputs = [ xorg.libX11 glib gtk2 xorg.libXpm xorg.libXt xorg.libXext xneur libglade GConf pcre libappindicator-gtk2 diff --git a/pkgs/applications/misc/hamster/default.nix b/pkgs/applications/misc/hamster/default.nix index 855123ef793..dbf7e1aee74 100644 --- a/pkgs/applications/misc/hamster/default.nix +++ b/pkgs/applications/misc/hamster/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, intltool, glib, itstool +{ lib, fetchFromGitHub, python3Packages, intltool, glib, itstool , wrapGAppsHook, gobject-introspection, pango, gdk-pixbuf, atk, wafHook }: python3Packages.buildPythonApplication rec { diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix index 467cbfad656..fc9607e7be6 100644 --- a/pkgs/applications/misc/haxor-news/default.nix +++ b/pkgs/applications/misc/haxor-news/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3, fetchpatch }: +{ lib, fetchFromGitHub, python3, fetchpatch }: let diff --git a/pkgs/applications/misc/hdate/default.nix b/pkgs/applications/misc/hdate/default.nix index c97a67c0bd3..899630b6909 100644 --- a/pkgs/applications/misc/hdate/default.nix +++ b/pkgs/applications/misc/hdate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { version = "1.6.02"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = { description = "Hebrew calendar and solar astronomical times library and utilities"; homepage = "https://sourceforge.net/projects/libhdate/"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ CharlesHD ]; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ CharlesHD ]; }; } diff --git a/pkgs/applications/misc/heimer/default.nix b/pkgs/applications/misc/heimer/default.nix index 444ee7ab523..9d8dc1eaa03 100644 --- a/pkgs/applications/misc/heimer/default.nix +++ b/pkgs/applications/misc/heimer/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "heimer"; - version = "1.21.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "juzzlin"; repo = pname; rev = version; - sha256 = "03q3jn0j0cydw2mxfv7236lv4w9fh9slha0mphj33mk2f97b9hl6"; + sha256 = "sha256-upsOmf46bCO8sVp5dBHPLUBZYZP3JyXa7H5KXbd76qo="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/hello-unfree/default.nix b/pkgs/applications/misc/hello-unfree/default.nix index a5a9187ab0f..7c54c320111 100644 --- a/pkgs/applications/misc/hello-unfree/default.nix +++ b/pkgs/applications/misc/hello-unfree/default.nix @@ -1,4 +1,4 @@ -{ stdenv, runtimeShell }: +{ lib, stdenv, runtimeShell }: stdenv.mkDerivation { pname = "example-unfree-package"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { description = "An example package with unfree license (for testing)"; - license = stdenv.lib.licenses.unfree; - maintainers = [ stdenv.lib.maintainers.oxij ]; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.oxij ]; }; } diff --git a/pkgs/applications/misc/hivemind/default.nix b/pkgs/applications/misc/hivemind/default.nix index fc22d3a854a..6ada1fd749b 100644 --- a/pkgs/applications/misc/hivemind/default.nix +++ b/pkgs/applications/misc/hivemind/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, runtimeShell }: +{ lib, buildGoPackage, fetchFromGitHub, runtimeShell }: buildGoPackage rec { pname = "hivemind"; diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix index 51b08af23c5..b1c7949d258 100644 --- a/pkgs/applications/misc/houdini/runtime.nix +++ b/pkgs/applications/misc/houdini/runtime.nix @@ -1,9 +1,9 @@ -{ stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, libGLU, libGL, alsaLib, dbus, xkeyboardconfig, bc, addOpenGLRunpath }: +{ lib, stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, libGLU, libGL, alsaLib, dbus, xkeyboardconfig, bc, addOpenGLRunpath }: let ld_library_path = builtins.concatStringsSep ":" [ "${stdenv.cc.cc.lib}/lib64" - (stdenv.lib.makeLibraryPath [ + (lib.makeLibraryPath [ libGLU libGL xorg.libXmu @@ -79,9 +79,10 @@ stdenv.mkDerivation rec { meta = { description = "3D animation application software"; homepage = "https://www.sidefx.com"; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.canndrew ]; + license = lib.licenses.unfree; + platforms = lib.platforms.linux; + hydraPlatforms = [ ]; # requireFile src's should be excluded + maintainers = [ lib.maintainers.canndrew ]; }; } diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix index c58f87d1ab8..3cda6d0a318 100644 --- a/pkgs/applications/misc/hstr/default.nix +++ b/pkgs/applications/misc/hstr/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, readline, ncurses -, autoreconfHook, pkgconfig, gettext }: +{ lib, stdenv, fetchFromGitHub, readline, ncurses +, autoreconfHook, pkg-config, gettext }: stdenv.mkDerivation rec { pname = "hstr"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1chmfdi1dwg3sarzd01nqa82g65q7wdr6hrnj96l75vikwsg986y"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ readline ncurses gettext ]; configureFlags = [ "--prefix=$(out)" ]; @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/dvorka/hstr"; description = "Shell history suggest box - easily view, navigate, search and use your command history"; - license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.matthiasbeyer ]; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/misc/hubstaff/default.nix b/pkgs/applications/misc/hubstaff/default.nix index 4cfb5703883..f291ab898e3 100644 --- a/pkgs/applications/misc/hubstaff/default.nix +++ b/pkgs/applications/misc/hubstaff/default.nix @@ -9,7 +9,7 @@ let inherit (data) version url sha256; - rpath = stdenv.lib.makeLibraryPath + rpath = lib.makeLibraryPath [ libX11 zlib libSM libICE libXext freetype libXrender fontconfig libXft libXinerama stdenv.cc.cc.lib libnotify glib gtk3 libappindicator-gtk3 curl libXfixes libXScrnSaver ]; diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 2d2ccefe934..35246a45da2 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "hugo"; diff --git a/pkgs/applications/misc/icesl/default.nix b/pkgs/applications/misc/icesl/default.nix index b3e7e53774d..9f1431a2340 100644 --- a/pkgs/applications/misc/icesl/default.nix +++ b/pkgs/applications/misc/icesl/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchzip, freeglut, libXmu, libXi, libX11, libICE, libGLU, libGL, libSM, libXext, dialog, makeWrapper }: let - lpath = stdenv.lib.makeLibraryPath [ libXmu libXi libX11 freeglut libICE libGLU libGL libSM libXext ]; + lpath = lib.makeLibraryPath [ libXmu libXi libX11 freeglut libICE libGLU libGL libSM libXext ]; in stdenv.mkDerivation rec { pname = "iceSL"; diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index c97ea3d4b77..8865435339c 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perlPackages, gettext, makeWrapper, PerlMagick, which, highlight +{ lib, stdenv, fetchurl, perlPackages, gettext, makeWrapper, PerlMagick, which, highlight , gitSupport ? false, git ? null , docutilsSupport ? false, python ? null, docutils ? null , monotoneSupport ? false, monotone ? null @@ -20,8 +20,6 @@ assert mercurialSupport -> (mercurial != null); let name = "ikiwiki"; version = "3.20200202.3"; - - lib = stdenv.lib; in stdenv.mkDerivation { name = "${name}-${version}"; @@ -62,13 +60,13 @@ stdenv.mkDerivation { postInstall = '' for a in "$out/bin/"*; do wrapProgram $a --suffix PERL5LIB : $PERL5LIB --prefix PATH : ${perlPackages.perl}/bin:$out/bin \ - ${lib.optionalString gitSupport ''--prefix PATH : ${git}/bin ''} \ - ${lib.optionalString monotoneSupport ''--prefix PATH : ${monotone}/bin ''} \ - ${lib.optionalString bazaarSupport ''--prefix PATH : ${breezy}/bin ''} \ - ${lib.optionalString cvsSupport ''--prefix PATH : ${cvs}/bin ''} \ - ${lib.optionalString cvsSupport ''--prefix PATH : ${cvsps}/bin ''} \ - ${lib.optionalString subversionSupport ''--prefix PATH : ${subversion.out}/bin ''} \ - ${lib.optionalString mercurialSupport ''--prefix PATH : ${mercurial}/bin ''} \ + ${lib.optionalString gitSupport "--prefix PATH : ${git}/bin "} \ + ${lib.optionalString monotoneSupport "--prefix PATH : ${monotone}/bin "} \ + ${lib.optionalString bazaarSupport "--prefix PATH : ${breezy}/bin "} \ + ${lib.optionalString cvsSupport "--prefix PATH : ${cvs}/bin "} \ + ${lib.optionalString cvsSupport "--prefix PATH : ${cvsps}/bin "} \ + ${lib.optionalString subversionSupport "--prefix PATH : ${subversion.out}/bin "} \ + ${lib.optionalString mercurialSupport "--prefix PATH : ${mercurial}/bin "} \ ${lib.optionalString docutilsSupport ''--prefix PYTHONPATH : "$(toPythonPath ${docutils})" ''} \ ${lib.concatMapStrings (x: "--prefix PATH : ${x}/bin ") extraUtils} done @@ -85,8 +83,8 @@ stdenv.mkDerivation { meta = { description = "Wiki compiler, storing pages and history in a RCS"; homepage = "http://ikiwiki.info/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.peti ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.peti ]; }; } diff --git a/pkgs/applications/misc/imag/default.nix b/pkgs/applications/misc/imag/default.nix index 2f559715838..09f734df9a1 100644 --- a/pkgs/applications/misc/imag/default.nix +++ b/pkgs/applications/misc/imag/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles pkg-config ]; buildInputs = [ openssl ] - ++ stdenv.lib.optional stdenv.isDarwin Security; + ++ lib.optional stdenv.isDarwin Security; checkInputs = [ gitMinimal util-linuxMinimal ]; LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; diff --git a/pkgs/applications/misc/ipmicfg/default.nix b/pkgs/applications/misc/ipmicfg/default.nix index a2cee088e1d..120affb988c 100644 --- a/pkgs/applications/misc/ipmicfg/default.nix +++ b/pkgs/applications/misc/ipmicfg/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "ipmicfg"; - version = "1.30.0"; - buildVersion = "190710"; + version = "1.32.0"; + buildVersion = "200910"; src = fetchzip { url = "https://www.supermicro.com/wftp/utility/IPMICFG/IPMICFG_${version}_build.${buildVersion}.zip"; - sha256 = "0srkzivxa4qlf3x9zdkri7xfq7kjj4fsmn978vzmzsvbxkqswd5a"; + sha256 = "1mncinwgx5d8jkvnvhccqlj2xp0xa5xjsab4r5mblmcnvm609rr3"; }; installPhase = '' @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}" \ + --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc ]}" \ "$out/opt/ipmicfg/IPMICFG-Linux.x86_64" ln -s "$out/opt/ipmicfg/IPMICFG-Linux.x86_64" "$out/bin/ipmicfg" diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix index 415762eb6ff..0c7fc750cfd 100644 --- a/pkgs/applications/misc/ipmiview/default.nix +++ b/pkgs/applications/misc/ipmiview/default.nix @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { else throw "IPMIView is not supported on this platform"; in '' - patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libX11 libXext libXrender libXtst libXi ]}" ./jre/lib/amd64/libawt_xawt.so - patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ freetype ]}" ./jre/lib/amd64/libfontmanager.so + patchelf --set-rpath "${lib.makeLibraryPath [ libX11 libXext libXrender libXtst libXi ]}" ./jre/lib/amd64/libawt_xawt.so + patchelf --set-rpath "${lib.makeLibraryPath [ freetype ]}" ./jre/lib/amd64/libfontmanager.so patchelf --set-rpath "${gcc.cc}/lib:$out/jre/lib/amd64/jli" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/java patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./BMCSecurity/${stunnelBinary} ''; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { # WORK_DIR: unfortunately the ikvm related binaries are loaded from # and user configuration is written to files in the CWD makeWrapper $out/jre/bin/java $out/bin/IPMIView \ - --set LD_LIBRARY_PATH "${stdenv.lib.makeLibraryPath [ fontconfig gcc-unwrapped.lib ]}" \ + --set LD_LIBRARY_PATH "${lib.makeLibraryPath [ fontconfig gcc-unwrapped.lib ]}" \ --prefix PATH : "$out/jre/bin:${iputils}/bin:${psmisc}/bin" \ --add-flags "-jar $out/IPMIView20.jar" \ --run 'WORK_DIR=''${XDG_DATA_HOME:-~/.local/share}/ipmiview diff --git a/pkgs/applications/misc/jbidwatcher/default.nix b/pkgs/applications/misc/jbidwatcher/default.nix index 2d7dca36d20..0b8bcbfffac 100644 --- a/pkgs/applications/misc/jbidwatcher/default.nix +++ b/pkgs/applications/misc/jbidwatcher/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, java, runtimeShell }: +{ lib, stdenv, fetchurl, java, runtimeShell }: stdenv.mkDerivation rec { pname = "jbidwatcher"; @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { binary. ''; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/applications/misc/jekyll/basic/gemset.nix b/pkgs/applications/misc/jekyll/basic/gemset.nix index 9f33cdc53eb..cc7be93510c 100644 --- a/pkgs/applications/misc/jekyll/basic/gemset.nix +++ b/pkgs/applications/misc/jekyll/basic/gemset.nix @@ -421,4 +421,4 @@ }; version = "2.4.2"; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/misc/jgmenu/default.nix b/pkgs/applications/misc/jgmenu/default.nix index 62f15818966..29816dea49e 100644 --- a/pkgs/applications/misc/jgmenu/default.nix +++ b/pkgs/applications/misc/jgmenu/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchFromGitHub -, pkgconfig +, pkg-config , python3Packages , pango , librsvg @@ -15,17 +15,17 @@ stdenv.mkDerivation rec { pname = "jgmenu"; - version = "4.2.1"; + version = "4.3.0"; src = fetchFromGitHub { owner = "johanmalm"; repo = pname; rev = "v${version}"; - sha256 = "00q4v31x4q7nm61wda4v0gznv18bm3qs8mp04pcns60qacdv9lkk"; + sha256 = "sha256-+JO/A7+6/yeYz0tP7vxSi04cS1bEet+3sAs7CYXKxI8="; }; nativeBuildInputs = [ - pkgconfig + pkg-config makeWrapper python3Packages.wrapPython ]; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { xorg.libXinerama xorg.libXrandr python3Packages.python - ] ++ stdenv.lib.optionals enableXfcePanelApplet [ + ] ++ lib.optionals enableXfcePanelApplet [ gtk3 xfce.libxfce4util xfce.xfce4-panel @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { configureFlags = [ ] - ++ stdenv.lib.optionals enableXfcePanelApplet [ + ++ lib.optionals enableXfcePanelApplet [ "--with-xfce4-panel-applet" ]; diff --git a/pkgs/applications/misc/jigdo/default.nix b/pkgs/applications/misc/jigdo/default.nix index 134354de40b..b4573a81635 100644 --- a/pkgs/applications/misc/jigdo/default.nix +++ b/pkgs/applications/misc/jigdo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, db, gtk2, bzip2 }: +{ lib, stdenv, fetchurl, db, gtk2, bzip2 }: stdenv.mkDerivation { name = "jigdo-0.7.3"; @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { description = "Download utility that can fetch files from several sources simultaneously"; homepage = "http://atterer.net/jigdo/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index a61740434e6..f737470d53f 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -2,7 +2,7 @@ let pname = "joplin-desktop"; - version = "1.4.19"; + version = "1.7.10"; name = "${pname}-${version}"; inherit (stdenv.hostPlatform) system; @@ -16,8 +16,8 @@ let src = fetchurl { url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}"; sha256 = { - x86_64-linux = "1xyj30pnlczchbh4awb955sxh51v89d170f4yk0v1jkj7dg2wjgj"; - x86_64-darwin = "166yp2rr87p0lh64ngs498a50ahcann8z5s0g2p0azs6wi54a6kw"; + x86_64-linux = "1f8pfssfqigh0fl5r5wpvdpn48dx1q9qq4mfqi2s5z94h7ci2jxg"; + x86_64-darwin = "0s29mhf88nlhaabmd32k21h1qiavgpqqksbdjxkx8bfg591s8jqb"; }.${system} or throwSystem; }; diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 056d73ba76f..28c7de12c8c 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { dontUnpack = true; - buildInputs = stdenv.lib.optionals (!stdenv.isDarwin) [ jre makeWrapper ]; + buildInputs = lib.optionals (!stdenv.isDarwin) [ jre makeWrapper ]; installPhase = if stdenv.isDarwin then '' diff --git a/pkgs/applications/misc/jotta-cli/default.nix b/pkgs/applications/misc/jotta-cli/default.nix index ad7ca25324d..3b44555c541 100644 --- a/pkgs/applications/misc/jotta-cli/default.nix +++ b/pkgs/applications/misc/jotta-cli/default.nix @@ -5,10 +5,10 @@ let in stdenv.mkDerivation rec { pname = "jotta-cli"; - version = "0.7.35160"; + version = "0.9.38023"; src = fetchzip { url = "https://repo.jotta.us/archives/linux/${arch}/jotta-cli-${version}_linux_${arch}.tar.gz"; - sha256 = "00fzycy199l9y738cj71s88qz96ppczb5sqsk3x9w4jj4m6ks239"; + sha256 = "0whbf7sb4i3g1f6yps3a6l3f0z3dg681ypax4snxw5vchi3h99kc"; stripRoot = false; }; diff --git a/pkgs/applications/misc/jrnl/default.nix b/pkgs/applications/misc/jrnl/default.nix index 7fc8ef88330..79f87612e49 100644 --- a/pkgs/applications/misc/jrnl/default.nix +++ b/pkgs/applications/misc/jrnl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , python3 }: diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix index 7c2e2ac0711..6b594f196c9 100644 --- a/pkgs/applications/misc/k2pdfopt/default.nix +++ b/pkgs/applications/misc/k2pdfopt/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, runCommand, fetchzip, fetchurl, fetchpatch, fetchFromGitHub -, cmake, pkgconfig, zlib, libpng, makeWrapper +, cmake, pkg-config, zlib, libpng, makeWrapper , enableGSL ? true, gsl , enableGhostScript ? true, ghostscript , enableMuPDF ? true, mupdf_1_17 @@ -8,7 +8,7 @@ , enableTesseract ? true, leptonica, tesseract4 }: -with stdenv.lib; +with lib; # k2pdfopt is a pain to package. It requires modified versions of mupdf, # leptonica, and tesseract. Instead of shipping patches for these upstream @@ -70,7 +70,7 @@ in stdenv.mkDerivation rec { --replace "<djvu.h>" "<libdjvu/ddjvuapi.h>" ''; - nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; + nativeBuildInputs = [ cmake pkg-config makeWrapper ]; buildInputs = let diff --git a/pkgs/applications/misc/k4dirstat/default.nix b/pkgs/applications/misc/k4dirstat/default.nix index 1d6a6097d27..467945af6ac 100644 --- a/pkgs/applications/misc/k4dirstat/default.nix +++ b/pkgs/applications/misc/k4dirstat/default.nix @@ -6,18 +6,18 @@ , kio , kjobwidgets , kxmlgui -, lib, stdenv +, lib }: mkDerivation rec { pname = "k4dirstat"; - version = "3.2.1"; + version = "3.2.2"; src = fetchFromGitHub { owner = "jeromerobert"; repo = pname; rev = version; - sha256 = "15xjb80jq6vhzvzx4l341f40d8a23w1334qh6cczqm9adfnzycp7"; + sha256 = "sha256-U5p/gW5GPxRoM9XknP8G7iVhLDoqmvgspeRsmCRdxDg="; }; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/applications/misc/kanboard/default.nix b/pkgs/applications/misc/kanboard/default.nix index 722f2364ab3..ffb787a9bd9 100644 --- a/pkgs/applications/misc/kanboard/default.nix +++ b/pkgs/applications/misc/kanboard/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kanboard"; - version = "1.2.16"; + version = "1.2.18"; src = fetchFromGitHub { owner = "kanboard"; repo = "kanboard"; rev = "v${version}"; - sha256 = "1nps7xcw1gp7kfdp13wyj2sprc8hn5iamdb0xj4202qygpzm63wq"; + sha256 = "sha256-raXPRoydd3CfciF7S0cZiuY7EPFKfE8IU3qj2dOztHU="; }; dontBuild = true; diff --git a/pkgs/applications/misc/kdbplus/default.nix b/pkgs/applications/misc/kdbplus/default.nix index 4c4b461303f..d27a10af20c 100644 --- a/pkgs/applications/misc/kdbplus/default.nix +++ b/pkgs/applications/misc/kdbplus/default.nix @@ -1,9 +1,9 @@ -{ stdenv, requireFile, unzip, rlwrap, bash, zlib }: +{ lib, stdenv, requireFile, unzip, rlwrap, bash, zlib }: assert (stdenv.hostPlatform.system == "i686-linux"); let - libPath = stdenv.lib.makeLibraryPath + libPath = lib.makeLibraryPath [ stdenv.cc.libc stdenv.cc.cc zlib ]; in stdenv.mkDerivation rec { @@ -68,8 +68,8 @@ stdenv.mkDerivation rec { meta = { description = "Analytics and time-series database"; homepage = "http://www.kx.com/"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; platforms = [ "i686-linux" ]; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + maintainers = [ lib.maintainers.thoughtpolice ]; }; } diff --git a/pkgs/applications/misc/keepass-plugins/keeagent/default.nix b/pkgs/applications/misc/keepass-plugins/keeagent/default.nix index 85749af0a56..7dc75f60426 100644 --- a/pkgs/applications/misc/keepass-plugins/keeagent/default.nix +++ b/pkgs/applications/misc/keepass-plugins/keeagent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildEnv, fetchzip, mono }: +{ lib, stdenv, buildEnv, fetchzip, mono }: let version = "0.12.0"; @@ -15,8 +15,8 @@ let meta = { description = "KeePass plugin to allow other programs to access SSH keys stored in a KeePass database for authentication"; homepage = "http://lechnology.com/software/keeagent"; - platforms = with stdenv.lib.platforms; linux; - license = stdenv.lib.licenses.gpl2; + platforms = with lib.platforms; linux; + license = lib.licenses.gpl2; maintainers = [ ]; }; diff --git a/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix b/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix index 10e6996873a..be58f0e34cb 100644 --- a/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix +++ b/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildEnv, fetchFromGitHub, mono }: +{ lib, stdenv, buildEnv, fetchFromGitHub, mono }: let version = "1.8.4.2"; @@ -18,8 +18,8 @@ let meta = { description = "KeePass plugin to expose password entries securely (256bit AES/CBC) over HTTP"; homepage = "https://github.com/pfn/keepasshttp"; - platforms = with stdenv.lib.platforms; linux; - license = stdenv.lib.licenses.gpl3; + platforms = with lib.platforms; linux; + license = lib.licenses.gpl3; }; pluginFilename = "KeePassHttp.plgx"; diff --git a/pkgs/applications/misc/keepass-plugins/otpkeyprov/default.nix b/pkgs/applications/misc/keepass-plugins/otpkeyprov/default.nix index e2b26eaee90..780de142c5f 100644 --- a/pkgs/applications/misc/keepass-plugins/otpkeyprov/default.nix +++ b/pkgs/applications/misc/keepass-plugins/otpkeyprov/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildEnv, fetchzip, mono }: +{ lib, stdenv, buildEnv, fetchzip, mono }: let version = "2.6"; @@ -15,9 +15,9 @@ let meta = { description = "OtpKeyProv is a key provider based on one-time passwords"; homepage = "https://keepass.info/plugins.html#otpkeyprov"; - platforms = with stdenv.lib.platforms; linux; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.ente ]; + platforms = with lib.platforms; linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.ente ]; }; pluginFilename = "OtpKeyProv.plgx"; diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix index 6164a60d6a8..32572ffcdb3 100644 --- a/pkgs/applications/misc/keepass/default.nix +++ b/pkgs/applications/misc/keepass/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, buildDotnetPackage, substituteAll, makeWrapper, makeDesktopItem, +{ lib, fetchurl, buildDotnetPackage, substituteAll, makeWrapper, makeDesktopItem, unzip, icoutils, gtk2, xorg, xdotool, xsel, coreutils, unixtools, glib, plugins ? [] }: with builtins; buildDotnetPackage rec { @@ -69,7 +69,7 @@ with builtins; buildDotnetPackage rec { desktopName = "Keepass"; genericName = "Password manager"; categories = "Utility;"; - mimeType = stdenv.lib.concatStringsSep ";" [ + mimeType = lib.concatStringsSep ";" [ "application/x-keepass2" "" ]; @@ -85,7 +85,7 @@ with builtins; buildDotnetPackage rec { # is found and does not pollute output path. binPaths = lib.concatStrings (lib.intersperse ":" (map (x: x + "/bin") plugins)); - dynlibPath = stdenv.lib.makeLibraryPath [ gtk2 ]; + dynlibPath = lib.makeLibraryPath [ gtk2 ]; postInstall = let @@ -111,8 +111,8 @@ with builtins; buildDotnetPackage rec { meta = { description = "GUI password manager with strong cryptography"; homepage = "http://www.keepass.info/"; - maintainers = with stdenv.lib.maintainers; [ amorsillo obadz jraygauthier ]; - platforms = with stdenv.lib.platforms; all; - license = stdenv.lib.licenses.gpl2; + maintainers = with lib.maintainers; [ amorsillo obadz ]; + platforms = with lib.platforms; all; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/applications/misc/keepassx/2.0.nix b/pkgs/applications/misc/keepassx/2.0.nix index 52feb338a15..86bd7d0849e 100644 --- a/pkgs/applications/misc/keepassx/2.0.nix +++ b/pkgs/applications/misc/keepassx/2.0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, libgcrypt, qt4, xorg }: +{ lib, stdenv, fetchurl, cmake, libgcrypt, qt4, xorg }: stdenv.mkDerivation rec { pname = "keepassx2"; @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { meta = { description = "Qt password manager compatible with its Win32 and Pocket PC versions"; homepage = "https://www.keepassx.org/"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ qknight ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ qknight ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index 7df1294874f..c7e87dbbfd4 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch , cmake @@ -36,31 +36,26 @@ , withKeePassFDOSecrets ? true }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "keepassxc"; - version = "2.6.2"; + version = "2.6.4"; src = fetchFromGitHub { owner = "keepassxreboot"; repo = "keepassxc"; rev = version; - sha256 = "032dzywvwpclhsl3n1pq2m9gyxqpg0gkci6axbvbs7bn82wznc4h"; + sha256 = "02ajfkw818cmalvkl0kqvza85rgdgs59kw2v7b3c4v8kv00c41j3"; }; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang [ + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang [ "-Wno-old-style-cast" "-Wno-error" "-D__BIG_ENDIAN__=${if stdenv.isBigEndian then "1" else "0"}" ]; - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' - substituteInPlace CMakeLists.txt \ - --replace "/usr/local/bin" "../bin" \ - --replace "/usr/local/share/man" "../share/man" - ''; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-rpath ${libargon2}/lib"; + NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-rpath ${libargon2}/lib"; patches = [ ./darwin.patch @@ -83,14 +78,18 @@ stdenv.mkDerivation rec { doCheck = true; checkPhase = '' + runHook preCheck + export LC_ALL="en_US.UTF-8" export QT_QPA_PLATFORM=offscreen export QT_PLUGIN_PATH="${qtbase.bin}/${qtbase.qtPluginPrefix}" # testcli and testgui are flaky - skip them both make test ARGS+="-E 'testcli|testgui' --output-on-failure" + + runHook postCheck ''; - nativeBuildInputs = [ cmake wrapQtAppsHook qttools ]; + nativeBuildInputs = [ cmake wrapQtAppsHook qttools pkg-config ]; buildInputs = [ asciidoctor @@ -103,7 +102,6 @@ stdenv.mkDerivation rec { libgpgerror libsodium libyubikey - pkg-config qrencode qtbase qtsvg @@ -111,9 +109,9 @@ stdenv.mkDerivation rec { yubikey-personalization zlib ] - ++ stdenv.lib.optional withKeePassKeeShareSecure quazip - ++ stdenv.lib.optional stdenv.isDarwin qtmacextras - ++ stdenv.lib.optional (stdenv.isDarwin && withKeePassTouchID) darwin.apple_sdk.frameworks.LocalAuthentication; + ++ lib.optional withKeePassKeeShareSecure quazip + ++ lib.optional stdenv.isDarwin qtmacextras + ++ lib.optional (stdenv.isDarwin && withKeePassTouchID) darwin.apple_sdk.frameworks.LocalAuthentication; preFixup = optionalString stdenv.isDarwin '' # Make it work without Qt in PATH. @@ -124,7 +122,7 @@ stdenv.mkDerivation rec { description = "Password manager to store your passwords safely and auto-type them into your everyday websites and applications"; longDescription = "A community fork of KeePassX, which is itself a port of KeePass Password Safe. The goal is to extend and improve KeePassX with new features and bugfixes to provide a feature-rich, fully cross-platform and modern open-source password manager. Accessible via native cross-platform GUI, CLI, and browser integration with the KeePassXC Browser Extension (https://github.com/keepassxreboot/keepassxc-browser)."; homepage = "https://keepassxc.org/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ jonafato turion ]; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/applications/misc/keepassx/default.nix b/pkgs/applications/misc/keepassx/default.nix index d0980001c8f..0fad28d94d3 100644 --- a/pkgs/applications/misc/keepassx/default.nix +++ b/pkgs/applications/misc/keepassx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bzip2, qt4, qmake4Hook, libX11, xorgproto, libXtst }: +{ lib, stdenv, fetchurl, bzip2, qt4, qmake4Hook, libX11, xorgproto, libXtst }: stdenv.mkDerivation rec { pname = "keepassx"; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { meta = { description = "Qt password manager compatible with its Win32 and Pocket PC versions"; homepage = "https://www.keepassx.org/"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ qknight ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ qknight ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/misc/keystore-explorer/default.nix b/pkgs/applications/misc/keystore-explorer/default.nix index 613b96d1731..f98e21edf5b 100644 --- a/pkgs/applications/misc/keystore-explorer/default.nix +++ b/pkgs/applications/misc/keystore-explorer/default.nix @@ -1,4 +1,4 @@ -{ fetchzip, stdenv, jdk8, runtimeShell }: +{ fetchzip, lib, stdenv, jdk8, runtimeShell }: stdenv.mkDerivation rec { version = "5.4.4"; @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { meta = { description = "Open source GUI replacement for the Java command-line utilities keytool and jarsigner"; - license = stdenv.lib.licenses.gpl3Only; - maintainers = [ stdenv.lib.maintainers.numinit ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl3Only; + maintainers = [ lib.maintainers.numinit ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix index a3e4c1309ff..3bec8db0687 100644 --- a/pkgs/applications/misc/khard/default.nix +++ b/pkgs/applications/misc/khard/default.nix @@ -1,4 +1,4 @@ -{ stdenv, glibcLocales, python3 }: +{ lib, glibcLocales, python3 }: python3.pkgs.buildPythonApplication rec { version = "0.17.0"; @@ -30,7 +30,7 @@ python3.pkgs.buildPythonApplication rec { meta = { homepage = "https://github.com/scheibler/khard"; description = "Console carddav client"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ matthiasbeyer ]; }; } diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix index 068f7833c86..dff50bafaf8 100644 --- a/pkgs/applications/misc/kiwix/default.nix +++ b/pkgs/applications/misc/kiwix/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, makeWrapper, pkg-config +{ lib, stdenv, fetchurl, makeWrapper, pkg-config , zip, python, zlib, which, icu, libmicrohttpd, lzma, aria2, wget, bc , libuuid, libX11, libXext, libXt, libXrender, glib, dbus, dbus-glib , gtk2, gdk-pixbuf, pango, cairo, freetype, fontconfig, alsaLib, atk, cmake , xapian, ctpp2, zimlib }: -with stdenv.lib; +with lib; let xulrunner64_tar = fetchurl { diff --git a/pkgs/applications/misc/kondo/default.nix b/pkgs/applications/misc/kondo/default.nix index 545dc85efeb..dcbeb408759 100644 --- a/pkgs/applications/misc/kondo/default.nix +++ b/pkgs/applications/misc/kondo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "kondo"; diff --git a/pkgs/applications/misc/koreader/default.nix b/pkgs/applications/misc/koreader/default.nix index c3d7fbac12f..a903600b46d 100644 --- a/pkgs/applications/misc/koreader/default.nix +++ b/pkgs/applications/misc/koreader/default.nix @@ -11,12 +11,12 @@ let font-droid = nerdfonts.override { fonts = [ "DroidSansMono" ]; }; in stdenv.mkDerivation rec { pname = "koreader"; - version = "2020.12"; + version = "2021.01.1"; src = fetchurl { url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb"; - sha256 = "0x97mm7h8kr1jps0hzdgl9irakma85ikrhzr18wc1plmffgv6kwm"; + sha256 = "0kignyia2xrg84bqzsp8rid4c79zg11lhw52z1854jw9v9324pja"; }; sourceRoot = "."; @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { done ln -s "${font-droid}/share/fonts/opentype/NerdFonts/Droid Sans Mono Nerd Font Complete Mono.otf" $out/lib/koreader/fonts/droid/DroidSansMono.ttf wrapProgram $out/bin/koreader --prefix LD_LIBRARY_PATH : ${ - stdenv.lib.makeLibraryPath [ gtk3-x11 SDL2 glib ] + lib.makeLibraryPath [ gtk3-x11 SDL2 glib ] } ''; diff --git a/pkgs/applications/misc/kupfer/default.nix b/pkgs/applications/misc/kupfer/default.nix index ce21ea75b30..243583b8762 100644 --- a/pkgs/applications/misc/kupfer/default.nix +++ b/pkgs/applications/misc/kupfer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchurl , intltool , python3Packages diff --git a/pkgs/applications/misc/libosmocore/default.nix b/pkgs/applications/misc/libosmocore/default.nix index 27432a4dd75..273ca0245a2 100644 --- a/pkgs/applications/misc/libosmocore/default.nix +++ b/pkgs/applications/misc/libosmocore/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config , pcsclite, talloc, python2, gnutls }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - autoreconfHook pkgconfig + autoreconfHook pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix index 676b7aea1e2..08bf01aea61 100644 --- a/pkgs/applications/misc/librecad/default.nix +++ b/pkgs/applications/misc/librecad/default.nix @@ -5,7 +5,7 @@ , installShellFiles , mkDerivationWith , muparser -, pkgconfig +, pkg-config , qmake , qtbase , qtsvg @@ -83,7 +83,7 @@ mkDerivationWith stdenv.mkDerivation rec { nativeBuildInputs = [ installShellFiles - pkgconfig + pkg-config qmake qttools ]; diff --git a/pkgs/applications/misc/lighthouse/default.nix b/pkgs/applications/misc/lighthouse/default.nix index a54b8a54e8b..e9aa79dcdd8 100644 --- a/pkgs/applications/misc/lighthouse/default.nix +++ b/pkgs/applications/misc/lighthouse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig +{ lib, stdenv, fetchFromGitHub, pkg-config , libX11, libxcb, cairo, gtk2, pango, python27, python3 }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0v6ylm49f1b44zwq1y1gqxp2csyqblplr24ajllc2q3r0sc9m1ys"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libxcb cairo gtk2 pango python27 python3 ]; diff --git a/pkgs/applications/misc/loxodo/default.nix b/pkgs/applications/misc/loxodo/default.nix index e32535d4445..65f9a9f0f17 100644 --- a/pkgs/applications/misc/loxodo/default.nix +++ b/pkgs/applications/misc/loxodo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python27Packages, fetchgit }: +{ lib, python27Packages, fetchgit }: let py = python27Packages; python = py.python; diff --git a/pkgs/applications/misc/ltwheelconf/default.nix b/pkgs/applications/misc/ltwheelconf/default.nix index 66d10f5e6b8..52fac494156 100644 --- a/pkgs/applications/misc/ltwheelconf/default.nix +++ b/pkgs/applications/misc/ltwheelconf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, libusb1, pkgconfig, fetchFromGitHub }: +{ lib, stdenv, libusb1, pkg-config, fetchFromGitHub }: stdenv.mkDerivation { pname = "ltwheelconf"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "1fsz7k73yln987gcx1jvb5irxfbp1x2c457a60a8yap27nkp5y2w"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 ]; installPhase = '' diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix index b3a68cffeff..cb8494e1c48 100644 --- a/pkgs/applications/misc/lutris/default.nix +++ b/pkgs/applications/misc/lutris/default.nix @@ -101,7 +101,7 @@ in buildPythonApplication rec { dontWrapGApps = true; makeWrapperArgs = [ "--prefix PATH : ${binPath}" - ''''${gappsWrapperArgs[@]}'' + "\${gappsWrapperArgs[@]}" ]; # needed for glib-schemas to work correctly (will crash on dialogues otherwise) # see https://github.com/NixOS/nixpkgs/issues/56943 diff --git a/pkgs/applications/misc/lutris/fhsenv.nix b/pkgs/applications/misc/lutris/fhsenv.nix index d7eabae0e8e..dbb6301d286 100644 --- a/pkgs/applications/misc/lutris/fhsenv.nix +++ b/pkgs/applications/misc/lutris/fhsenv.nix @@ -97,7 +97,7 @@ in buildFHSUserEnv { libcap libtiff libva libgphoto2 libxslt libsndfile giflib zlib glib alsaLib zziplib bash dbus keyutils zip cabextract freetype unzip coreutils readline gcc SDL SDL2 curl graphite2 gtk2 gtk3 udev ncurses wayland libglvnd - vulkan-loader xdg_utils sqlite gnutls p11-kit libbsd harfbuzz + vulkan-loader xdg-utils sqlite gnutls p11-kit libbsd harfbuzz # PCSX2 // TODO: "libgobject-2.0.so.0: wrong ELF class: ELFCLASS64" diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index 3c915875096..800de77f1c5 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, mkDerivation, pkgconfig, python, file, bc +{ fetchurl, lib, mkDerivation, pkg-config, python, file, bc , qtbase, qtsvg, hunspell, makeWrapper #, mythes, boost }: @@ -12,7 +12,7 @@ mkDerivation rec { }; # LaTeX is used from $PATH, as people often want to have it with extra pkgs - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ qtbase qtsvg python file/*for libmagic*/ bc hunspell makeWrapper # enchant diff --git a/pkgs/applications/misc/madonctl/default.nix b/pkgs/applications/misc/madonctl/default.nix index 249ed48bd1c..2a65fc25af2 100644 --- a/pkgs/applications/misc/madonctl/default.nix +++ b/pkgs/applications/misc/madonctl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "madonctl"; diff --git a/pkgs/applications/misc/mako/default.nix b/pkgs/applications/misc/mako/default.nix index 3c1babaab37..a845a767b2a 100644 --- a/pkgs/applications/misc/mako/default.nix +++ b/pkgs/applications/misc/mako/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig, scdoc +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, scdoc , systemd, pango, cairo, gdk-pixbuf , wayland, wayland-protocols , wrapGAppsHook }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0hwvibpnrximb628w9dsfjpi30b5jy7nfkm4d94z5vhp78p43vxh"; }; - nativeBuildInputs = [ meson ninja pkgconfig scdoc wayland-protocols wrapGAppsHook ]; + nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-protocols wrapGAppsHook ]; buildInputs = [ systemd pango cairo gdk-pixbuf wayland ]; mesonFlags = [ "-Dzsh-completions=true" ]; diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix index a743a9fbc27..2fd217e3cd6 100644 --- a/pkgs/applications/misc/masterpdfeditor/default.nix +++ b/pkgs/applications/misc/masterpdfeditor/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "masterpdfeditor"; - version = "5.6.09"; + version = "5.7.20"; src = fetchurl { - url = "https://code-industry.net/public/master-pdf-editor-${version}-qt5.amd64.tar.gz"; - sha256 = "0v9j6fwr0xl03kr77vf4wdb06zlplmn4mr3jyzxhvs8a77scmfzb"; + url = "https://code-industry.net/public/master-pdf-editor-${version}-qt5.x86_64.tar.gz"; + sha256 = "0lyfss0r0dc6skhdlkslcdagdp9k1mi0w8n5pbrskwcd09c9mxym"; }; nativeBuildInputs = [ autoPatchelfHook wrapQtAppsHook ]; diff --git a/pkgs/applications/misc/masterpdfeditor4/default.nix b/pkgs/applications/misc/masterpdfeditor4/default.nix index b0252465bde..b4b9a4d6244 100644 --- a/pkgs/applications/misc/masterpdfeditor4/default.nix +++ b/pkgs/applications/misc/masterpdfeditor4/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Master PDF Editor - version 4, without watermark"; homepage = "https://code-industry.net/free-pdf-editor/"; license = licenses.unfreeRedistributable; diff --git a/pkgs/applications/misc/mediaelch/default.nix b/pkgs/applications/misc/mediaelch/default.nix index d437cfda44f..4adfe0f6526 100644 --- a/pkgs/applications/misc/mediaelch/default.nix +++ b/pkgs/applications/misc/mediaelch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , mkDerivation , fetchFromGitHub , qmake @@ -13,13 +13,13 @@ mkDerivation rec { pname = "mediaelch"; - version = "2.8.4"; + version = "2.8.6"; src = fetchFromGitHub { owner = "Komet"; repo = "MediaElch"; rev = "v${version}"; - sha256 = "00jwmpdwbn6rgaha0iimcbwg9pwb8ilpjgxhv0p13j2c6dcisjzh"; + sha256 = "1134vw7hr0mpqcsxjq4bqmg5760dngz17bzj97ypfc5cvzcxjh43"; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix index 99aada11f04..3e8aacb9895 100644 --- a/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/pkgs/applications/misc/mediainfo-gui/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, wxGTK30-gtk3 +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libzen, libmediainfo, wxGTK30-gtk3 , desktop-file-utils, libSM, imagemagick }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0rqg9z7s5bk7vlvjrs4gackzg7ib05a0dffi2ihsjf5a7kw7wcir"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libzen libmediainfo wxGTK30-gtk3 desktop-file-utils libSM imagemagick ]; diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix index bb90d76977b..7c81e9607f9 100644 --- a/pkgs/applications/misc/mediainfo/default.nix +++ b/pkgs/applications/misc/mediainfo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }: +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libzen, libmediainfo, zlib }: stdenv.mkDerivation rec { version = "20.09"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0rqg9z7s5bk7vlvjrs4gackzg7ib05a0dffi2ihsjf5a7kw7wcir"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libzen libmediainfo zlib ]; sourceRoot = "./MediaInfo/Project/GNU/CLI/"; diff --git a/pkgs/applications/misc/megacmd/default.nix b/pkgs/applications/misc/megacmd/default.nix index 1e7aa1f56db..23d34f30d64 100644 --- a/pkgs/applications/misc/megacmd/default.nix +++ b/pkgs/applications/misc/megacmd/default.nix @@ -15,7 +15,7 @@ , libuv , libzen , pcre-cpp -, pkgconfig +, pkg-config , readline , sqlite }: @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { autoconf automake libtool - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/misc/megasync/default.nix b/pkgs/applications/misc/megasync/default.nix index b7f8c0a281d..c302a4b4a07 100644 --- a/pkgs/applications/misc/megasync/default.nix +++ b/pkgs/applications/misc/megasync/default.nix @@ -16,7 +16,7 @@ , libzen , lsb-release , mkDerivation -, pkgconfig +, pkg-config , qtbase , qttools , qtx11extras @@ -39,7 +39,7 @@ mkDerivation rec { }; nativeBuildInputs = - [ autoconf automake doxygen lsb-release pkgconfig qttools swig ]; + [ autoconf automake doxygen lsb-release pkg-config qttools swig ]; buildInputs = [ c-ares cryptopp diff --git a/pkgs/applications/misc/memo/default.nix b/pkgs/applications/misc/memo/default.nix index 66fe0d7207c..885e5466f8b 100644 --- a/pkgs/applications/misc/memo/default.nix +++ b/pkgs/applications/misc/memo/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, silver-searcher, tree, man, stdenv, +{ fetchFromGitHub, silver-searcher, tree, man, lib, stdenv, git, pandocSupport ? true, pandoc ? null , ... }: @@ -45,8 +45,8 @@ stdenv.mkDerivation rec { ''; homepage = "http://palovandalo.com/memo/"; downloadPage = "https://github.com/mrVanDalo/memo/releases"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.mrVanDalo ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.mrVanDalo ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/misc/menumaker/default.nix b/pkgs/applications/misc/menumaker/default.nix index 192228de5d9..086db35a5ad 100644 --- a/pkgs/applications/misc/menumaker/default.nix +++ b/pkgs/applications/misc/menumaker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pythonPackages }: +{ lib, fetchurl, pythonPackages }: pythonPackages.buildPythonApplication rec { pname = "menumaker"; diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix index e73805f67b3..8eee8c1f09f 100644 --- a/pkgs/applications/misc/merkaartor/default.nix +++ b/pkgs/applications/misc/merkaartor/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, qmake, pkgconfig, fetchpatch +{ mkDerivation, lib, fetchFromGitHub, qmake, pkg-config, fetchpatch , boost, gdal, proj, qtbase, qtsvg, qtwebview, qtwebkit }: mkDerivation rec { @@ -19,7 +19,7 @@ mkDerivation rec { }) ]; - nativeBuildInputs = [ qmake pkgconfig ]; + nativeBuildInputs = [ qmake pkg-config ]; buildInputs = [ boost gdal proj qtbase qtsvg qtwebview qtwebkit ]; diff --git a/pkgs/applications/misc/milu/default.nix b/pkgs/applications/misc/milu/default.nix index 84cc0e0bc8d..23da8abc668 100644 --- a/pkgs/applications/misc/milu/default.nix +++ b/pkgs/applications/misc/milu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, unzip, pkgconfig, glib, llvmPackages }: +{ lib, stdenv, fetchFromGitHub, unzip, pkg-config, glib, llvmPackages }: stdenv.mkDerivation { pname = "milu-nightly"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { cp bin/milu $out/bin ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib unzip @@ -32,9 +32,9 @@ stdenv.mkDerivation { meta = { description = "Higher Order Mutation Testing Tool for C and C++ programs"; homepage = "https://github.com/yuejia/Milu"; - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.vrthra ]; + license = lib.licenses.bsd2; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.vrthra ]; }; } diff --git a/pkgs/applications/misc/minder/default.nix b/pkgs/applications/misc/minder/default.nix index 1c25e5c3320..16fa17609e1 100644 --- a/pkgs/applications/misc/minder/default.nix +++ b/pkgs/applications/misc/minder/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, pkgconfig, meson, ninja, python3 +, pkg-config, meson, ninja, python3 , wrapGAppsHook, vala, shared-mime-info , cairo, pantheon, glib, gtk3, libxml2, libgee, libarchive , discount, gtksourceview3 @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "137kyf82n5a2v0cm9q02rhv8rmbjgnj60h64prq90h0d42prj3gd"; }; - nativeBuildInputs = [ pkgconfig meson ninja python3 wrapGAppsHook vala shared-mime-info ]; + nativeBuildInputs = [ pkg-config meson ninja python3 wrapGAppsHook vala shared-mime-info ]; buildInputs = [ cairo pantheon.granite glib gtk3 libxml2 libgee libarchive hicolor-icon-theme discount gtksourceview3 ]; postPatch = '' diff --git a/pkgs/applications/misc/minergate-cli/default.nix b/pkgs/applications/misc/minergate-cli/default.nix index 59de7ba8a9e..0fe4103f613 100644 --- a/pkgs/applications/misc/minergate-cli/default.nix +++ b/pkgs/applications/misc/minergate-cli/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { interpreter=${stdenv.glibc}/lib/ld-linux-x86-64.so.2 patchelf --set-interpreter "$interpreter" $pgm - wrapProgram $pgm --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ openssl stdenv.cc.cc ]} + wrapProgram $pgm --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ openssl stdenv.cc.cc ]} rm $out/usr/bin/minergate-cli mkdir -p $out/bin diff --git a/pkgs/applications/misc/minergate/default.nix b/pkgs/applications/misc/minergate/default.nix index 18af19db510..f6ec20b0df7 100644 --- a/pkgs/applications/misc/minergate/default.nix +++ b/pkgs/applications/misc/minergate/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { interpreter=${stdenv.glibc}/lib/ld-linux-x86-64.so.2 patchelf --set-interpreter "$interpreter" $pgm - wrapProgram $pgm --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ fontconfig freetype openssl stdenv.cc.cc xorg.libX11 xorg.libxcb ]} --prefix "QT_XKB_CONFIG_ROOT" ":" "${xkeyboard_config}/share/X11/xkb" + wrapProgram $pgm --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ fontconfig freetype openssl stdenv.cc.cc xorg.libX11 xorg.libxcb ]} --prefix "QT_XKB_CONFIG_ROOT" ":" "${xkeyboard_config}/share/X11/xkb" rm $out/usr/bin/minergate mkdir -p $out/bin diff --git a/pkgs/applications/misc/mkgmap/default.nix b/pkgs/applications/misc/mkgmap/default.nix index 0ef661333d6..ad001eb3045 100644 --- a/pkgs/applications/misc/mkgmap/default.nix +++ b/pkgs/applications/misc/mkgmap/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, fetchsvn +, substituteAll , jdk , jre , ant @@ -9,39 +9,32 @@ , withExamples ? false }: let - version = "4565"; - sha256 = "0cfh0msky5812l28mavy6p3k2zgyxb698xk79mvla9l45zcicnvw"; - deps = import ./deps.nix { inherit fetchurl; }; testInputs = import ./testinputs.nix { inherit fetchurl; }; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "mkgmap"; - inherit version; + version = "4600"; - src = fetchsvn { - inherit sha256; - url = "https://svn.mkgmap.org.uk/mkgmap/mkgmap/trunk"; - rev = version; + src = fetchurl { + url = "http://www.mkgmap.org.uk/download/mkgmap-r${version}-src.tar.gz"; + sha256 = "1xnqbyrf5cbxmggkk1pjcj5d1767kbp15v12zy2fpbbn3yf0k3sh"; }; patches = [ - # Disable automatic download of dependencies - ./build.xml.patch - - # Fix testJavaRules test - ./fix-failing-test.patch + (substituteAll { + # Disable automatic download of dependencies + src = ./build.xml.patch; + inherit version; + }) ]; postPatch = with deps; '' - substituteInPlace build.xml \ - --subst-var-by version ${version} - mkdir -p lib/compile cp ${fastutil} lib/compile/${fastutil.name} cp ${osmpbf} lib/compile/${osmpbf.name} cp ${protobuf} lib/compile/${protobuf.name} - '' + stdenv.lib.optionalString doCheck '' + '' + lib.optionalString doCheck '' mkdir -p lib/test cp ${fastutil} lib/test/${fastutil.name} cp ${osmpbf} lib/test/${osmpbf.name} @@ -51,7 +44,7 @@ stdenv.mkDerivation { cp ${hamcrest-core} lib/test/${hamcrest-core.name} mkdir -p test/resources/in/img - ${stdenv.lib.concatMapStringsSep "\n" (res: '' + ${lib.concatMapStringsSep "\n" (res: '' cp ${res} test/resources/in/${builtins.replaceStrings [ "__" ] [ "/" ] res.name} '') testInputs} ''; @@ -65,19 +58,22 @@ stdenv.mkDerivation { checkPhase = "ant test"; installPhase = '' - install -Dm644 dist/mkgmap.jar $out/share/java/mkgmap/mkgmap.jar - install -Dm644 dist/doc/mkgmap.1 $out/share/man/man1/mkgmap.1 + install -Dm644 dist/mkgmap.jar -t $out/share/java/mkgmap + install -Dm644 dist/doc/mkgmap.1 -t $out/share/man/man1 cp -r dist/lib/ $out/share/java/mkgmap/ makeWrapper ${jre}/bin/java $out/bin/mkgmap \ --add-flags "-jar $out/share/java/mkgmap/mkgmap.jar" - '' + stdenv.lib.optionalString withExamples '' + '' + lib.optionalString withExamples '' mkdir -p $out/share/mkgmap cp -r dist/examples $out/share/mkgmap/ ''; + passthru.updateScript = [ ./update.sh "mkgmap" meta.downloadPage ]; + meta = with lib; { description = "Create maps for Garmin GPS devices from OpenStreetMap (OSM) data"; homepage = "http://www.mkgmap.org.uk"; + downloadPage = "http://www.mkgmap.org.uk/download/mkgmap.html"; license = licenses.gpl2Only; maintainers = with maintainers; [ sikmir ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/mkgmap/fix-failing-test.patch b/pkgs/applications/misc/mkgmap/fix-failing-test.patch deleted file mode 100644 index 9cfe75583c8..00000000000 --- a/pkgs/applications/misc/mkgmap/fix-failing-test.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/test/uk/me/parabola/imgfmt/app/srt/SrtCollatorTest.java (revision 4555) -+++ a/test/uk/me/parabola/imgfmt/app/srt/SrtCollatorTest.java (working copy) -@@ -125,7 +125,7 @@ - assertEquals("prim: different letter", -1, collator.compare("aaac", "aaad")); - assertEquals("prim: different letter", 1, collator.compare("aaae", "aaad")); - assertEquals(0, collator.compare("aaaa", "aaaa")); -- assertEquals(0, collator.compare("aáÄâ", "aaaa")); -+ //assertEquals(0, collator.compare("aáÄâ", "aaaa")); - - collator.setStrength(Collator.SECONDARY); - assertEquals(0, collator.compare("AabBb", "aabbb")); -@@ -132,8 +132,8 @@ - assertEquals(0, collator.compare("aabBb", "aabBb")); - assertEquals(0, collator.compare("aabbB", "aabBb")); - assertEquals(1, collator.compare("aáÄâ", "aaaa")); -- assertEquals("prim len diff", -1, collator.compare("aáÄâ", "aaaaa")); -- assertEquals(-1, collator.compare("aáÄâa", "aaaab")); -+ //assertEquals("prim len diff", -1, collator.compare("aáÄâ", "aaaaa")); -+ //assertEquals(-1, collator.compare("aáÄâa", "aaaab")); - - collator.setStrength(Collator.TERTIARY); - assertEquals("prim: different case", 1, collator.compare("AabBb", "aabbb")); diff --git a/pkgs/applications/misc/mkgmap/splitter/default.nix b/pkgs/applications/misc/mkgmap/splitter/default.nix index 98f6379700e..eabc0601cfa 100644 --- a/pkgs/applications/misc/mkgmap/splitter/default.nix +++ b/pkgs/applications/misc/mkgmap/splitter/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, fetchsvn +, substituteAll , jdk , jre , ant @@ -8,46 +8,42 @@ , doCheck ? true }: let - version = "597"; - sha256 = "1al3160amw0gdarrc707dsppm0kcai9mpkfak7ffspwzw9alsndx"; - deps = import ../deps.nix { inherit fetchurl; }; testInputs = import ./testinputs.nix { inherit fetchurl; }; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "splitter"; - inherit version; + version = "597"; - src = fetchsvn { - inherit sha256; - url = "https://svn.mkgmap.org.uk/mkgmap/splitter/trunk"; - rev = version; + src = fetchurl { + url = "http://www.mkgmap.org.uk/download/splitter-r${version}-src.tar.gz"; + sha256 = "0d928wvlpzqwdpfksmxyyfkqrhjsij21wx2538bs2i29siwyla61"; }; patches = [ - # Disable automatic download of dependencies - ./build.xml.patch + (substituteAll { + # Disable automatic download of dependencies + src = ./build.xml.patch; + inherit version; + }) # Fix func.SolverAndProblemGeneratorTest test ./fix-failing-test.patch ]; postPatch = with deps; '' - substituteInPlace build.xml \ - --subst-var-by version ${version} - mkdir -p lib/compile cp ${fastutil} lib/compile/${fastutil.name} cp ${osmpbf} lib/compile/${osmpbf.name} cp ${protobuf} lib/compile/${protobuf.name} cp ${xpp3} lib/compile/${xpp3.name} - '' + stdenv.lib.optionalString doCheck '' + '' + lib.optionalString doCheck '' mkdir -p lib/test cp ${junit} lib/test/${junit.name} cp ${hamcrest-core} lib/test/${hamcrest-core.name} mkdir -p test/resources/in/osm - ${stdenv.lib.concatMapStringsSep "\n" (res: '' + ${lib.concatMapStringsSep "\n" (res: '' cp ${res} test/resources/in/${builtins.replaceStrings [ "__" ] [ "/" ] res.name} '') testInputs} ''; @@ -61,16 +57,19 @@ stdenv.mkDerivation { checkPhase = "ant run.tests && ant run.func-tests"; installPhase = '' - install -Dm644 dist/splitter.jar $out/share/java/splitter/splitter.jar - install -Dm644 doc/splitter.1 $out/share/man/man1/splitter.1 + install -Dm644 dist/splitter.jar -t $out/share/java/splitter + install -Dm644 doc/splitter.1 -t $out/share/man/man1 cp -r dist/lib/ $out/share/java/splitter/ makeWrapper ${jre}/bin/java $out/bin/splitter \ --add-flags "-jar $out/share/java/splitter/splitter.jar" ''; + passthru.updateScript = [ ../update.sh "mkgmap-splitter" meta.downloadPage ]; + meta = with lib; { description = "Utility for splitting OpenStreetMap maps into tiles"; homepage = "http://www.mkgmap.org.uk"; + downloadPage = "http://www.mkgmap.org.uk/download/splitter.html"; license = licenses.gpl2Only; maintainers = with maintainers; [ sikmir ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/mkgmap/update.sh b/pkgs/applications/misc/mkgmap/update.sh new file mode 100755 index 00000000000..ddfca935935 --- /dev/null +++ b/pkgs/applications/misc/mkgmap/update.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl common-updater-scripts + +set -euo pipefail + +version=$(curl -s $2 | sed -n 's#.*<span data-bind="text: current().version">\(.*\)</span>.*#\1#p') +update-source-version $1 "$version" diff --git a/pkgs/applications/misc/mob/default.nix b/pkgs/applications/misc/mob/default.nix index 821dc1ccc3c..96c8d8cf32a 100644 --- a/pkgs/applications/misc/mob/default.nix +++ b/pkgs/applications/misc/mob/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { pname = "mob"; - version = "0.0.25"; + version = "1.1.0"; goPackagePath = "github.com/remotemobprogramming/mob"; src = fetchFromGitHub { rev = "v${version}"; owner = "remotemobprogramming"; repo = pname; - sha256 = "1gs0mv4j66278srrck7llvi5gnfdqxz3a489qn5sx3mw46yx5q93"; + sha256 = "sha256-C63tGMd+kGQc99k7L8SKlijlEBaBCiksAghsg6WC8Bw="; }; meta = with lib; { diff --git a/pkgs/applications/misc/moonlight-embedded/default.nix b/pkgs/applications/misc/moonlight-embedded/default.nix index 06835aad4d1..9fa4089c4cd 100644 --- a/pkgs/applications/misc/moonlight-embedded/default.nix +++ b/pkgs/applications/misc/moonlight-embedded/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, perl , alsaLib, libevdev, libopus, udev, SDL2 -, ffmpeg_3, pkgconfig, xorg, libvdpau, libpulseaudio, libcec +, ffmpeg_3, pkg-config, xorg, libvdpau, libpulseaudio, libcec , curl, expat, avahi, enet, libuuid, libva }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake perl ]; buildInputs = [ alsaLib libevdev libopus udev SDL2 - ffmpeg_3 pkgconfig xorg.libxcb libvdpau libpulseaudio libcec + ffmpeg_3 pkg-config xorg.libxcb libvdpau libpulseaudio libcec xorg.libpthreadstubs curl expat avahi enet libuuid libva ]; diff --git a/pkgs/applications/misc/mop/default.nix b/pkgs/applications/misc/mop/default.nix index 07102fe56f2..007965f868b 100644 --- a/pkgs/applications/misc/mop/default.nix +++ b/pkgs/applications/misc/mop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "mop"; diff --git a/pkgs/applications/misc/mqtt-bench/default.nix b/pkgs/applications/misc/mqtt-bench/default.nix index c01a1b9cbc6..657ac9645de 100644 --- a/pkgs/applications/misc/mqtt-bench/default.nix +++ b/pkgs/applications/misc/mqtt-bench/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }: +{ lib, buildGoPackage, fetchFromGitHub, fetchpatch }: buildGoPackage rec { pname = "mqtt-bench"; diff --git a/pkgs/applications/misc/multibootusb/default.nix b/pkgs/applications/misc/multibootusb/default.nix index 34671d9374f..fd1ca666589 100644 --- a/pkgs/applications/misc/multibootusb/default.nix +++ b/pkgs/applications/misc/multibootusb/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, libxcb, mtools, p7zip, parted, procps, qemu, unzip, zip, coreutils, gnugrep, which, gnused, e2fsprogs, autoPatchelfHook, gptfdisk, - python36Packages, qt5, runtimeShell, lib, stdenv, util-linux, wrapQtAppsHook }: + python36Packages, qt5, runtimeShell, lib, util-linux, wrapQtAppsHook }: # Note: Multibootusb is tricky to maintain. It relies on the # $PYTHONPATH variable containing some of their code, so that @@ -98,7 +98,7 @@ python36Packages.buildPythonApplication rec { --prefix "PYTHONPATH" ":" "$out/lib/${python36Packages.python.libPrefix}/site-packages" # Add some runtime dependencies - --prefix "PATH" ":" "${stdenv.lib.makeBinPath runTimeDeps}" + --prefix "PATH" ":" "${lib.makeBinPath runTimeDeps}" # Finally, move to directory that contains data --run "cd $out/share/${pname}" diff --git a/pkgs/applications/misc/mupdf/1.17.nix b/pkgs/applications/misc/mupdf/1.17.nix index bf66fc80bab..95e9c7c3307 100644 --- a/pkgs/applications/misc/mupdf/1.17.nix +++ b/pkgs/applications/misc/mupdf/1.17.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, freetype, harfbuzz, openjpeg +{ stdenv, lib, fetchurl, fetchpatch, pkg-config, freetype, harfbuzz, openjpeg , jbig2dec, libjpeg , darwin , enableX11 ? true, libX11, libXext, libXi, libXrandr , enableCurl ? true, curl, openssl @@ -23,8 +23,8 @@ in stdenv.mkDerivation rec { patches = # Use shared libraries to decrease size - stdenv.lib.optional (!stdenv.isDarwin) ./mupdf-1.14-shared_libs.patch - ++ stdenv.lib.optional stdenv.isDarwin ./darwin.patch + lib.optional (!stdenv.isDarwin) ./mupdf-1.14-shared_libs.patch + ++ lib.optional stdenv.isDarwin ./darwin.patch ; postPatch = '' @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { ''; makeFlags = [ "prefix=$(out) USE_SYSTEM_LIBS=yes" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg freeglut libGLU ] ++ lib.optionals enableX11 [ libX11 libXext libXi libXrandr ] ++ lib.optionals enableCurl [ curl openssl ] diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 09ad5fe9842..61c395e64a9 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, freetype, harfbuzz, openjpeg +{ stdenv, lib, fetchurl, fetchpatch, pkg-config, freetype, harfbuzz, openjpeg , jbig2dec, libjpeg , darwin , gumbo , enableX11 ? true, libX11, libXext, libXi, libXrandr @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { }; patches = - stdenv.lib.optional stdenv.isDarwin ./darwin.patch ++ [ + lib.optional stdenv.isDarwin ./darwin.patch ++ [ (fetchpatch { name = "pdfocr.patch"; url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=a507b139adf37d2c742e039815601cdc2aa00a84"; @@ -49,7 +49,7 @@ in stdenv.mkDerivation rec { buildFlags = [ "shared" ]; makeFlags = [ "prefix=$(out) USE_SYSTEM_LIBS=yes" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg freeglut libGLU gumbo ] ++ lib.optionals enableX11 [ libX11 libXext libXi libXrandr ] ++ lib.optionals enableCurl [ curl openssl ] diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index 34e124367eb..63dde76fabc 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -3,7 +3,7 @@ , substituteAll , cmake , ninja -, pkgconfig +, pkg-config , glibc , gtk3 , gtkmm3 @@ -86,7 +86,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja - pkgconfig + pkg-config jre swig wrapGAppsHook diff --git a/pkgs/applications/misc/nanoblogger/default.nix b/pkgs/applications/misc/nanoblogger/default.nix index a4969a34a86..e8fa4d4fd37 100644 --- a/pkgs/applications/misc/nanoblogger/default.nix +++ b/pkgs/applications/misc/nanoblogger/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, bash }: +{ fetchurl, lib, stdenv, bash }: stdenv.mkDerivation rec { version = "3.5-rc1"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "Small weblog engine written in Bash for the command line"; homepage = "http://nanoblogger.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/misc/navi/default.nix b/pkgs/applications/misc/navi/default.nix index 46d463645e5..da8d387d166 100644 --- a/pkgs/applications/misc/navi/default.nix +++ b/pkgs/applications/misc/navi/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "navi"; - version = "2.13.0"; + version = "2.14.0"; src = fetchFromGitHub { owner = "denisidoro"; repo = "navi"; rev = "v${version}"; - sha256 = "04ks38s6d3nkdj0arhxw8f3sfw796l97fbqxsm7b9g5d2953a6cs"; + sha256 = "sha256-4XR+HazX65jiMvZpLNMNOc8gVVAxMx3bNcVNT6UPJ3o="; }; - cargoSha256 = "1zwar1l793809bsgqnwrgi50y76bd78qd4s8lw6d64f4z72dh80g"; + cargoSha256 = "sha256-ZBs9/yoY3na21rQd5zJzFujZZSq2BDoENKYAWI1fnTg="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/navipowm/default.nix b/pkgs/applications/misc/navipowm/default.nix index 80c455f41a0..0727f867291 100644 --- a/pkgs/applications/misc/navipowm/default.nix +++ b/pkgs/applications/misc/navipowm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, qmake4Hook }: +{ lib, stdenv, fetchurl, qt4, qmake4Hook }: stdenv.mkDerivation rec { name = "navipowm-0.2.4"; @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://navipowm.sourceforge.net/"; description = "Car navigation system"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/misc/navit/default.nix b/pkgs/applications/misc/navit/default.nix index e04669d6896..c041c296927 100644 --- a/pkgs/applications/misc/navit/default.nix +++ b/pkgs/applications/misc/navit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, gtk2, fontconfig, freetype, imlib2 +{ lib, stdenv, fetchFromGitHub, pkg-config, gtk2, fontconfig, freetype, imlib2 , SDL_image, libGLU, libGL, libXmu, freeglut, pcre, dbus, dbus-glib, glib , librsvg, freeimage, libxslt, cairo, gdk-pixbuf, pango , atk, patchelf, fetchurl, bzip2, python, gettext, quesoglc @@ -15,7 +15,7 @@ assert speechdSupport -> speechd != null; -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "navit"; version = "0.5.3"; @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { qtbase qtlocation qtdeclarative qtsvg ]; - nativeBuildInputs = [ makeWrapper pkgconfig cmake patchelf bzip2 ]; + nativeBuildInputs = [ makeWrapper pkg-config cmake patchelf bzip2 ]; # we dont want blank screen by defaut postInstall = '' @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { ''; # TODO: fix upstream? - libPath = stdenv.lib.makeLibraryPath ([ stdenv.cc.libc ] ++ buildInputs ); + libPath = lib.makeLibraryPath ([ stdenv.cc.libc ] ++ buildInputs ); postFixup = '' find "$out/lib" -type f -name "*.so" -exec patchelf --set-rpath $libPath {} \; diff --git a/pkgs/applications/misc/nixnote2/default.nix b/pkgs/applications/misc/nixnote2/default.nix index b23c41e6fee..cbb7a110c4c 100644 --- a/pkgs/applications/misc/nixnote2/default.nix +++ b/pkgs/applications/misc/nixnote2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, boost +{ lib, mkDerivation, fetchFromGitHub, boost , qtbase, qtwebkit, poppler, qmake, hunspell, html-tidy}: mkDerivation rec { diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix index 81f2f648e5f..4a72eecf9b3 100644 --- a/pkgs/applications/misc/nnn/default.nix +++ b/pkgs/applications/misc/nnn/default.nix @@ -1,6 +1,9 @@ -{ stdenv, fetchFromGitHub, pkgconfig, ncurses, readline, conf ? null }: +{ lib, stdenv, fetchFromGitHub, pkg-config, ncurses, readline +, conf ? null, withIcons ? false, withNerdIcons ? false }: -with stdenv.lib; +# Mutually exclusive options +assert withIcons -> withNerdIcons == false; +assert withNerdIcons -> withIcons == false; stdenv.mkDerivation rec { pname = "nnn"; @@ -13,13 +16,17 @@ stdenv.mkDerivation rec { sha256 = "1fa7cmwrzn6kx87kms8i98p9azdlwyh2gnif29l340syl9hkr5qy"; }; - configFile = optionalString (conf != null) (builtins.toFile "nnn.h" conf); - preBuild = optionalString (conf != null) "cp ${configFile} src/nnn.h"; + configFile = lib.optionalString (conf != null) (builtins.toFile "nnn.h" conf); + preBuild = lib.optionalString (conf != null) "cp ${configFile} src/nnn.h"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ readline ncurses ]; - makeFlags = [ "DESTDIR=${placeholder "out"}" "PREFIX=" ]; + makeFlags = [ + "DESTDIR=${placeholder "out"}" + "PREFIX=" + ] ++ lib.optional withIcons [ "O_ICONS=1" ] + ++ lib.optional withNerdIcons [ "O_NERD=1" ]; # shell completions postInstall = '' @@ -28,7 +35,7 @@ stdenv.mkDerivation rec { install -Dm555 misc/auto-completion/fish/nnn.fish -t $out/share/fish/vendor_completions.d ''; - meta = { + meta = with lib; { description = "Small ncurses-based file browser forked from noice"; homepage = "https://github.com/jarun/nnn"; license = licenses.bsd2; diff --git a/pkgs/applications/misc/noice/default.nix b/pkgs/applications/misc/noice/default.nix index 2be5a4ab83b..73648d896d0 100644 --- a/pkgs/applications/misc/noice/default.nix +++ b/pkgs/applications/misc/noice/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchgit, ncurses, conf ? null }: +{ lib, stdenv, fetchgit, ncurses, conf ? null }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "noice"; diff --git a/pkgs/applications/misc/notejot/default.nix b/pkgs/applications/misc/notejot/default.nix index 5a84f91bb74..0b781f61369 100644 --- a/pkgs/applications/misc/notejot/default.nix +++ b/pkgs/applications/misc/notejot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, nix-update-script, vala, pkgconfig, meson, ninja, python3, pantheon +{ lib, stdenv, fetchFromGitHub, nix-update-script, vala, pkg-config, meson, ninja, python3, pantheon , gtk3, gtksourceview, json-glib, libgee, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meson ninja vala - pkgconfig + pkg-config python3 wrapGAppsHook ]; diff --git a/pkgs/applications/misc/notify-osd-customizable/default.nix b/pkgs/applications/misc/notify-osd-customizable/default.nix index aeeb1051b09..e62b3a33487 100644 --- a/pkgs/applications/misc/notify-osd-customizable/default.nix +++ b/pkgs/applications/misc/notify-osd-customizable/default.nix @@ -7,7 +7,7 @@ , libtool , libwnck3 , makeWrapper -, pkgconfig +, pkg-config , gsettings-desktop-schemas }: @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { preConfigure = "./autogen.sh --libexecdir=$(out)/bin"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib libwnck3 libnotify dbus-glib makeWrapper gsettings-desktop-schemas gnome3.gnome-common diff --git a/pkgs/applications/misc/notify-osd/default.nix b/pkgs/applications/misc/notify-osd/default.nix index bc2e4076404..d68601ca6ec 100644 --- a/pkgs/applications/misc/notify-osd/default.nix +++ b/pkgs/applications/misc/notify-osd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, glib, libwnck3, libnotify, dbus-glib, makeWrapper, gsettings-desktop-schemas }: +{ lib, stdenv, fetchurl, pkg-config, glib, libwnck3, libnotify, dbus-glib, makeWrapper, gsettings-desktop-schemas }: stdenv.mkDerivation rec { pname = "notify-osd"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0g5a7a680b05x27apz0y1ldl5csxpp152wqi42s107jymbp0s20j"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib libwnck3 libnotify dbus-glib makeWrapper gsettings-desktop-schemas diff --git a/pkgs/applications/misc/nrsc5/default.nix b/pkgs/applications/misc/nrsc5/default.nix index f00fd7894c7..e55438f0eb1 100644 --- a/pkgs/applications/misc/nrsc5/default.nix +++ b/pkgs/applications/misc/nrsc5/default.nix @@ -45,8 +45,8 @@ in stdenv.mkDerivation { meta = with lib; { homepage = "https://github.com/theori-io/nrsc5"; description = "HD-Radio decoder for RTL-SDR"; - platforms = stdenv.lib.platforms.linux; - license = licenses.gpl3; + platforms = lib.platforms.linux; + license = licenses.gpl3Plus; maintainers = with maintainers; [ markuskowa ]; }; } diff --git a/pkgs/applications/misc/nut/default.nix b/pkgs/applications/misc/nut/default.nix index d36efb483db..4694c243b39 100644 --- a/pkgs/applications/misc/nut/default.nix +++ b/pkgs/applications/misc/nut/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, neon, libusb-compat-0_1, openssl, udev, avahi, freeipmi +{ lib, stdenv, fetchurl, pkg-config, neon, libusb-compat-0_1, openssl, udev, avahi, freeipmi , libtool, makeWrapper, autoreconfHook, fetchpatch }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ neon libusb-compat-0_1 openssl udev avahi freeipmi ]; - nativeBuildInputs = [ autoreconfHook libtool pkgconfig makeWrapper ]; + nativeBuildInputs = [ autoreconfHook libtool pkg-config makeWrapper ]; configureFlags = [ "--with-all" diff --git a/pkgs/applications/misc/nwg-launchers/default.nix b/pkgs/applications/misc/nwg-launchers/default.nix index e6575b780f7..c4c54ba7c53 100644 --- a/pkgs/applications/misc/nwg-launchers/default.nix +++ b/pkgs/applications/misc/nwg-launchers/default.nix @@ -5,26 +5,26 @@ , meson , ninja , nlohmann_json -, pkgconfig +, pkg-config , swaylock , makeWrapper }: stdenv.mkDerivation rec { pname = "nwg-launchers"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "v${version}"; - sha256 = "0flp7mwj1pgcwx3k9pzc8pmqlkhbddj0maimdnvlazk87kzxpfd0"; + sha256 = "sha256-vuvYL9N9xdg27uhiTe2OqxZ3/n/9EjlqPxtNMXpqpE8="; }; nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config cmake makeWrapper ]; diff --git a/pkgs/applications/misc/obinskit/default.nix b/pkgs/applications/misc/obinskit/default.nix index ee31948c62d..5e37e74902e 100644 --- a/pkgs/applications/misc/obinskit/default.nix +++ b/pkgs/applications/misc/obinskit/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { postFixup = '' makeWrapper ${electron}/bin/electron $out/bin/${pname} \ --add-flags $out/opt/obinskit/resources/app.asar \ - --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib libxkbcommon (lib.getLib systemd) xorg.libXt ]}" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc.lib libxkbcommon (lib.getLib systemd) xorg.libXt ]}" ''; meta = with lib; { diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index bfe215487af..57400fe100c 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -30,12 +30,12 @@ let in stdenv.mkDerivation rec { pname = "obsidian"; - version = "0.10.6"; + version = "0.10.11"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.asar.gz"; - sha256 = "KfGVc3nXu5ilYKQPLc5qaksTwsdhSVtty9CfjSoiCU8="; + sha256 = "RQdNTzorFq3W8clNObyOisKWUM/s+bE/CbpJ/8ABbrk="; }; nativeBuildInputs = [ makeWrapper graphicsmagick ]; diff --git a/pkgs/applications/misc/ocropus/default.nix b/pkgs/applications/misc/ocropus/default.nix index 27b1b4ab98f..507399c012b 100644 --- a/pkgs/applications/misc/ocropus/default.nix +++ b/pkgs/applications/misc/ocropus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, pythonPackages, curl }: +{ lib, fetchFromGitHub, fetchurl, pythonPackages, curl }: let getmodel = name: sha256: { @@ -33,7 +33,7 @@ pythonPackages.buildPythonApplication rec { enableParallelBuilding = true; - preConfigure = with stdenv.lib; '' + preConfigure = with lib; '' ${concatStrings (map (x: "cp -R ${x.src} models/`basename ${x.name}`;") models)} diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index f35d03c6d17..9f229e4821b 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -3,6 +3,7 @@ , lib , fetchFromGitHub , python3 +, nix-update-script # To include additional plugins, pass them here as an overlay. , packageOverrides ? self: super: {} }: @@ -89,13 +90,13 @@ let self: super: { octoprint = self.buildPythonPackage rec { pname = "OctoPrint"; - version = "1.5.1"; + version = "1.5.3"; src = fetchFromGitHub { owner = "OctoPrint"; repo = "OctoPrint"; rev = version; - sha256 = "04x58cjivslsrld341ip11c50d50p2q01090nsyji0j255v986j9"; + sha256 = "sha256-ZL/P/YIHynPmP8ssZZUKZDJscBsSsCq3UtOHrTVLpec="; }; propagatedBuildInputs = with super; [ @@ -170,7 +171,10 @@ let "test_set_external_modification" ]; - passthru.python = self.python; + passthru = { + python = self.python; + updateScript = nix-update-script { attrPath = "octoprint"; }; + }; meta = with lib; { homepage = "https://octoprint.org/"; diff --git a/pkgs/applications/misc/ola/default.nix b/pkgs/applications/misc/ola/default.nix index 6524052e5f3..224b5921baa 100644 --- a/pkgs/applications/misc/ola/default.nix +++ b/pkgs/applications/misc/ola/default.nix @@ -3,7 +3,7 @@ , autoreconfHook , bison , flex -, pkgconfig +, pkg-config , libuuid , cppunit , protobuf @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { sha256 = "17a3z3zhx00rjk58icd3zlqfw3753f3y8bwy2sza0frdim09lqr4"; }; - nativeBuildInputs = [ autoreconfHook bison flex pkgconfig perl ]; + nativeBuildInputs = [ autoreconfHook bison flex pkg-config perl ]; buildInputs = [ libuuid cppunit protobuf zlib avahi libmicrohttpd python3 ]; propagatedBuildInputs = [ python3.pkgs.protobuf diff --git a/pkgs/applications/misc/olifant/default.nix b/pkgs/applications/misc/olifant/default.nix index b6d184efe46..fbaf140a9f7 100644 --- a/pkgs/applications/misc/olifant/default.nix +++ b/pkgs/applications/misc/olifant/default.nix @@ -5,7 +5,7 @@ , vala , meson , ninja -, pkgconfig +, pkg-config , python3 , libgee , gsettings-desktop-schemas @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/applications/misc/onboard/default.nix b/pkgs/applications/misc/onboard/default.nix index 3c7f87ff967..d52120e0fb7 100644 --- a/pkgs/applications/misc/onboard/default.nix +++ b/pkgs/applications/misc/onboard/default.nix @@ -1,5 +1,5 @@ { fetchurl -, lib, stdenv +, lib , substituteAll , aspellWithDicts , at-spi2-core ? null @@ -20,7 +20,7 @@ , mousetweaks , udev , libxkbcommon -, pkgconfig +, pkg-config , procps , python3 , wrapGAppsHook @@ -59,7 +59,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ gobject-introspection intltool - pkgconfig + pkg-config wrapGAppsHook ]; @@ -77,7 +77,7 @@ python3.pkgs.buildPythonApplication rec { udev xorg.libXtst xorg.libxkbfile - ] ++ stdenv.lib.optional atspiSupport at-spi2-core; + ] ++ lib.optional atspiSupport at-spi2-core; propagatedBuildInputs = with python3.pkgs; [ dbus-python diff --git a/pkgs/applications/misc/openbox-menu/default.nix b/pkgs/applications/misc/openbox-menu/default.nix index e5857010324..9d2695f97ff 100644 --- a/pkgs/applications/misc/openbox-menu/default.nix +++ b/pkgs/applications/misc/openbox-menu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, gtk2, menu-cache }: +{ lib, stdenv, fetchurl, pkg-config, glib, gtk2, menu-cache }: stdenv.mkDerivation rec { pname = "openbox-menu"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1hi4b6mq97y6ajq4hhsikbkk23aha7ikaahm92djw48mgj2f1w8l"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib gtk2 menu-cache ]; patches = [ ./with-svg.patch ]; @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { dynamic menu listing installed applications. Most of the work is done by the LXDE library menu-cache. ''; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.romildo ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.romildo ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/misc/openbrf/default.nix b/pkgs/applications/misc/openbrf/default.nix index ec5d3c0a075..e815fd7a39f 100644 --- a/pkgs/applications/misc/openbrf/default.nix +++ b/pkgs/applications/misc/openbrf/default.nix @@ -28,7 +28,7 @@ mkDerivation { install -Dm644 reference.brf $out/share/openBrf/reference.brf patchelf \ - --set-rpath "${stdenv.lib.makeLibraryPath [ qtbase glew stdenv.cc.cc libGLU libGL ]}" \ + --set-rpath "${lib.makeLibraryPath [ qtbase glew stdenv.cc.cc libGLU libGL ]}" \ $out/share/openBrf/openBrf mkdir -p "$out/bin" @@ -40,7 +40,7 @@ mkDerivation { meta = with lib; { description = "A tool to edit resource files (BRF)"; homepage = "https://github.com/cfcohen/openbrf"; - maintainers = with stdenv.lib.maintainers; [ abbradar ]; + maintainers = with lib.maintainers; [ abbradar ]; license = licenses.free; platforms = platforms.linux; }; diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix index a93f4b24740..522c5739a88 100644 --- a/pkgs/applications/misc/opencpn/default.nix +++ b/pkgs/applications/misc/opencpn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkg-config, cmake, gtk2, wxGTK30, libpulseaudio, curl, +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, gtk2, wxGTK30, libpulseaudio, curl, gettext, glib, portaudio }: stdenv.mkDerivation rec { @@ -23,9 +23,9 @@ stdenv.mkDerivation rec { meta = { description = "A concise ChartPlotter/Navigator"; - maintainers = [ stdenv.lib.maintainers.kragniz ]; + maintainers = [ lib.maintainers.kragniz ]; platforms = [ "x86_64-linux" ]; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; homepage = "https://opencpn.org/"; }; } diff --git a/pkgs/applications/misc/openjump/default.nix b/pkgs/applications/misc/openjump/default.nix index 544329ec5e7..28becefa5b1 100644 --- a/pkgs/applications/misc/openjump/default.nix +++ b/pkgs/applications/misc/openjump/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, makeWrapper +{ lib, stdenv, fetchurl, unzip, makeWrapper , coreutils, gawk, which, gnugrep, findutils , jdk }: @@ -32,8 +32,8 @@ stdenv.mkDerivation { meta = { description = "Open source Geographic Information System (GIS) written in the Java programming language"; homepage = "http://www.openjump.org/index.html"; - license = stdenv.lib.licenses.gpl2; - maintainers = [stdenv.lib.maintainers.marcweber]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [lib.maintainers.marcweber]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/opentx/default.nix b/pkgs/applications/misc/opentx/default.nix index 53dbde29a0e..2ca4e3203ac 100644 --- a/pkgs/applications/misc/opentx/default.nix +++ b/pkgs/applications/misc/opentx/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub +{ lib, mkDerivation, fetchFromGitHub , cmake, gcc-arm-embedded, python3Packages , qtbase, qtmultimedia, qttranslations, SDL, gtest , dfu-util, avrdude @@ -6,13 +6,13 @@ mkDerivation rec { pname = "opentx"; - version = "2.3.10"; + version = "2.3.11"; src = fetchFromGitHub { owner = "opentx"; repo = "opentx"; rev = "release/${version}"; - sha256 = "1pp3k1802gl1rji98clv17wj0619dliq821mpi4446lk22q692yq"; + sha256 = "sha256-0B41TkTs4sNGYzpMGbsgCLT2ThkP6foeuwLUIzKKGkU="; }; nativeBuildInputs = [ cmake gcc-arm-embedded python3Packages.pillow ]; diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index be6928a8746..72d68431b8c 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv -, pkgconfig +{ lib +, pkg-config , fetchurl , buildPythonApplication , autoreconfHook @@ -40,7 +40,7 @@ buildPythonApplication rec { format = "other"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "UAX/LhHdH3E/WswZA6JwEZvFjDD9uMn4K8rHFJfGwjw="; }; @@ -57,7 +57,7 @@ buildPythonApplication rec { nativeBuildInputs = [ autoreconfHook wrapGAppsHook - pkgconfig + pkg-config libxmlxx3 gettext yelp-tools diff --git a/pkgs/applications/misc/osm2xmap/default.nix b/pkgs/applications/misc/osm2xmap/default.nix index 3c06ed19e52..4f2af99ab14 100644 --- a/pkgs/applications/misc/osm2xmap/default.nix +++ b/pkgs/applications/misc/osm2xmap/default.nix @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { makeFlags = [ "GIT_VERSION=${version}" "GIT_TIMESTAMP=" - "SHAREDIR=${placeholder ''out''}/share/osm2xmap" - "INSTALL_BINDIR=${placeholder ''out''}/bin" - "INSTALL_MANDIR=${placeholder ''out''}/share/man/man1" + "SHAREDIR=${placeholder "out"}/share/osm2xmap" + "INSTALL_BINDIR=${placeholder "out"}/bin" + "INSTALL_MANDIR=${placeholder "out"}/share/man/man1" ]; NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"; @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { description = "Converter from OpenStreetMap data format to OpenOrienteering Mapper format"; license = licenses.gpl3; maintainers = [ maintainers.mpickering ]; - platforms = with stdenv.lib.platforms; linux; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/misc/pass-secret-service/default.nix b/pkgs/applications/misc/pass-secret-service/default.nix index 678bc06f800..932fa588d27 100644 --- a/pkgs/applications/misc/pass-secret-service/default.nix +++ b/pkgs/applications/misc/pass-secret-service/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3, dbus, gnupg }: +{ lib, fetchFromGitHub, python3, dbus, gnupg }: python3.pkgs.buildPythonApplication rec { pname = "pass-secret-service"; @@ -54,8 +54,8 @@ python3.pkgs.buildPythonApplication rec { meta = { description = "Libsecret D-Bus API with pass as the backend"; homepage = "https://github.com/mdellweg/pass_secret_service/"; - license = stdenv.lib.licenses.gpl3Only; - platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ jluttine ]; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ jluttine ]; }; } diff --git a/pkgs/applications/misc/pastel/default.nix b/pkgs/applications/misc/pastel/default.nix index 7fd88348fe9..39a4c6a6a03 100644 --- a/pkgs/applications/misc/pastel/default.nix +++ b/pkgs/applications/misc/pastel/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1ji64h0f8f2sq12cx33kymypzar9swhaj903gclf3jdwgna77326"; - buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.isDarwin Security; meta = with lib; { description = "A command-line tool to generate, analyze, convert and manipulate colors"; diff --git a/pkgs/applications/misc/pbpst/default.nix b/pkgs/applications/misc/pbpst/default.nix index ebca7a42409..68b1908e515 100644 --- a/pkgs/applications/misc/pbpst/default.nix +++ b/pkgs/applications/misc/pbpst/default.nix @@ -1,5 +1,5 @@ { llvmPackages, lib, stdenv, fetchFromGitHub -, python36Packages, which, pkgconfig, curl, git, gettext, jansson +, python36Packages, which, pkg-config, curl, git, gettext, jansson # Optional overrides , maxFileSize ? 64 # in MB @@ -20,7 +20,7 @@ llvmPackages.stdenv.mkDerivation rec { nativeBuildInputs = [ python36Packages.sphinx which - pkgconfig + pkg-config curl git gettext diff --git a/pkgs/applications/misc/pcmanfm/default.nix b/pkgs/applications/misc/pcmanfm/default.nix index 15aedb8e709..da1c79865a7 100644 --- a/pkgs/applications/misc/pcmanfm/default.nix +++ b/pkgs/applications/misc/pcmanfm/default.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, fetchurl, glib, intltool, libfm, libX11, pango, pkgconfig +{ lib, stdenv, fetchurl, glib, intltool, libfm, libX11, pango, pkg-config , wrapGAppsHook, gnome3, withGtk3 ? true, gtk2, gtk3 }: let libfm' = libfm.override { inherit withGtk3; }; gtk = if withGtk3 then gtk3 else gtk2; - inherit (stdenv.lib) optional; + inherit (lib) optional; in stdenv.mkDerivation rec { name = "pcmanfm-1.3.1"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ glib gtk libfm' libX11 pango gnome3.adwaita-icon-theme ]; - nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook intltool ]; configureFlags = optional withGtk3 "--with-gtk=3"; diff --git a/pkgs/applications/misc/pcmanx-gtk2/default.nix b/pkgs/applications/misc/pcmanx-gtk2/default.nix index cb8b6150777..484b9d3b407 100644 --- a/pkgs/applications/misc/pcmanx-gtk2/default.nix +++ b/pkgs/applications/misc/pcmanx-gtk2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gtk2, libXft, intltool, automake, autoconf, libtool, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, gtk2, libXft, intltool, automake, autoconf, libtool, pkg-config }: stdenv.mkDerivation rec { pname = "pcmanx-gtk2"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0fbwd149wny67rfhczz4cbh713a1qnswjiz7b6c2bxfcwh51f9rc"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 libXft intltool automake autoconf libtool ]; preConfigure = '' diff --git a/pkgs/applications/misc/pdf-quench/default.nix b/pkgs/applications/misc/pdf-quench/default.nix index 907cceeb58b..4255127b3df 100644 --- a/pkgs/applications/misc/pdf-quench/default.nix +++ b/pkgs/applications/misc/pdf-quench/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgs, python3, wrapGAppsHook}: +{ lib, fetchFromGitHub, pkgs, python3, wrapGAppsHook}: python3.pkgs.buildPythonApplication { pname = "pdf-quench"; diff --git a/pkgs/applications/misc/pdfarranger/default.nix b/pkgs/applications/misc/pdfarranger/default.nix index 8c8413b2ce6..27a5934e483 100644 --- a/pkgs/applications/misc/pdfarranger/default.nix +++ b/pkgs/applications/misc/pdfarranger/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, lib +{ fetchFromGitHub, lib , wrapGAppsHook, intltool , python3Packages, gtk3, poppler_gi }: python3Packages.buildPythonApplication rec { pname = "pdfarranger"; - version = "1.6.2"; + version = "1.7.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "wJ6ImWpszfgErfLh7YgHirVKFIt0ij8A/CdYJmkNBP0="; + sha256 = "0dmgmvpghsm938iznalbg8h8k17a5h3q466yfc67mcll428n4nx3"; }; nativeBuildInputs = [ @@ -29,6 +29,7 @@ python3Packages.buildPythonApplication rec { pikepdf img2pdf setuptools + dateutil ]; # incompatible with wrapGAppsHook @@ -45,6 +46,6 @@ python3Packages.buildPythonApplication rec { description = "Merge or split pdf documents and rotate, crop and rearrange their pages using an interactive and intuitive graphical interface"; platforms = platforms.linux; maintainers = with maintainers; [ symphorien ]; - license = licenses.gpl3; + license = licenses.gpl3Plus; }; } diff --git a/pkgs/applications/misc/pdfdiff/default.nix b/pkgs/applications/misc/pdfdiff/default.nix index 31719cdfef2..5e489bebb25 100644 --- a/pkgs/applications/misc/pdfdiff/default.nix +++ b/pkgs/applications/misc/pdfdiff/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pythonPackages, fetchurl, xpdf }: +{ lib, pythonPackages, fetchurl, xpdf }: let py = pythonPackages; in diff --git a/pkgs/applications/misc/pdfmod/default.nix b/pkgs/applications/misc/pdfmod/default.nix index 76eeaa4da7f..da9340f3075 100644 --- a/pkgs/applications/misc/pdfmod/default.nix +++ b/pkgs/applications/misc/pdfmod/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, gnome-doc-utils, intltool, lib +{ stdenv, fetchurl, fetchpatch, pkg-config, gnome-doc-utils, intltool, lib , mono, gtk-sharp-2_0, gnome-sharp, hyena , which, makeWrapper, glib, gnome2, poppler, wrapGAppsHook }: @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "0.9.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "eb7c987514a053106ddf03f26544766c751c801d87762909b36415d46bc425c9"; }; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "0fpz9ifr6476lqhd5rkb94dm68vlrwdq5w1aaxzgyjgdax9hxx81"; }) ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gnome-doc-utils intltool mono gtk-sharp-2_0 gnome-sharp hyena which makeWrapper wrapGAppsHook diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix index 5714b04c7d1..84ba3ced8fc 100644 --- a/pkgs/applications/misc/pdfpc/default.nix +++ b/pkgs/applications/misc/pdfpc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, vala, gtk3, libgee, fetchpatch +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, vala, gtk3, libgee, fetchpatch , poppler, libpthreadstubs, gstreamer, gst-plugins-base, gst-plugins-good, gst-libav, librsvg, pcre, gobject-introspection, wrapGAppsHook , webkitgtk, discount, json-glib }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - cmake pkgconfig vala + cmake pkg-config vala # For setup hook gobject-introspection wrapGAppsHook @@ -33,12 +33,12 @@ stdenv.mkDerivation rec { json-glib ]; - cmakeFlags = stdenv.lib.optional stdenv.isDarwin "-DMOVIES=OFF"; + cmakeFlags = lib.optional stdenv.isDarwin "-DMOVIES=OFF"; meta = with lib; { description = "A presenter console with multi-monitor support for PDF files"; homepage = "https://pdfpc.github.io/"; - license = licenses.gpl2Plus; + license = licenses.gpl3Plus; maintainers = with maintainers; [ pSub ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/misc/pdfsam-basic/default.nix b/pkgs/applications/misc/pdfsam-basic/default.nix index 2aeb3ba7f99..37905b8e444 100644 --- a/pkgs/applications/misc/pdfsam-basic/default.nix +++ b/pkgs/applications/misc/pdfsam-basic/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pdfsam-basic"; - version = "4.2.1"; + version = "4.2.2"; src = fetchurl { url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb"; - sha256 = "0d7pvl87ybkvcxk69fr35fz0w447hy2pm65bhvlril16ljm2izja"; + sha256 = "sha256-fbcU3NZdQ8NR5tLjEJyOPneVWNMBddLdttLeVwIUtpg="; }; unpackPhase = '' diff --git a/pkgs/applications/misc/perkeep/default.nix b/pkgs/applications/misc/perkeep/default.nix index 5a1e5ba65de..2b14079ae60 100644 --- a/pkgs/applications/misc/perkeep/default.nix +++ b/pkgs/applications/misc/perkeep/default.nix @@ -1,4 +1,4 @@ -{ buildGoPackage, fetchurl, fetchFromGitHub, lib }: +{ buildGoModule, fetchurl, fetchFromGitHub, lib }: let gouiJS = fetchurl { @@ -11,41 +11,49 @@ let sha256 = "09hd7p0xscqnh612jbrjvh3njmlm4292zd5sbqx2lg0aw688q8p2"; }; -in buildGoPackage rec { - name = "perkeep-${version}"; - version = "unstable-2020-03-23"; + packages = [ + "perkeep.org/server/perkeepd" + "perkeep.org/cmd/pk" + "perkeep.org/cmd/pk-get" + "perkeep.org/cmd/pk-put" + "perkeep.org/cmd/pk-mount" + ]; + +in buildGoModule rec { + pname = "perkeep"; + version = "0.11"; src = fetchFromGitHub { owner = "perkeep"; repo = "perkeep"; - rev = "c2e31370ddefd86b6112a5d891100ea3382a4254"; - sha256 = "0jf02k20ms7h60wglcq6dj3vqi9rlfww7db5iplgwznbij70c1i4"; + rev = version; + sha256 = "07j5gplk4kcrbazyg4m4bwggzlz5gk89h90r14jvfcpms7v5nrll"; }; - goPackagePath = "perkeep.org"; + vendorSha256 = "1af9a6r9qfrak0n5xyv9z8n7gn7xw2sdjn4s9bwwidkrdm81iq6b"; + deleteVendor = true; # Vendor is out of sync with go.mod buildPhase = '' - cd "$NIX_BUILD_TOP/go/src/$goPackagePath" + cd "$NIX_BUILD_TOP/source" # 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 + go run make.go -offline=true -targets=${lib.concatStringsSep "," packages} ''; - # devcam is only useful when developing perkeep, we should not install it as - # part of this derivation. + # genfileembed gets built regardless of -targets, to embed static + # content into the Perkeep binaries. Remove it in post-install to + # avoid polluting paths. postInstall = '' - rm -f $out/bin/devcam + rm -f $out/bin/genfileembed ''; meta = with lib; { description = "A way of storing, syncing, sharing, modelling and backing up content (née Camlistore)"; homepage = "https://perkeep.org"; license = licenses.asl20; - maintainers = with maintainers; [ cstrahan kalbasit ]; - platforms = platforms.unix; + maintainers = with maintainers; [ cstrahan danderson kalbasit ]; }; } diff --git a/pkgs/applications/misc/pgmodeler/default.nix b/pkgs/applications/misc/pgmodeler/default.nix index 67010e713c3..0a99d357e68 100644 --- a/pkgs/applications/misc/pgmodeler/default.nix +++ b/pkgs/applications/misc/pgmodeler/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , fetchFromGitHub , pkg-config , qmake diff --git a/pkgs/applications/misc/phwmon/default.nix b/pkgs/applications/misc/phwmon/default.nix index 5800bcebef9..717c5c3feb1 100644 --- a/pkgs/applications/misc/phwmon/default.nix +++ b/pkgs/applications/misc/phwmon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, pythonPackages }: +{ lib, stdenv, fetchFromGitLab, pythonPackages }: stdenv.mkDerivation { pname = "phwmon"; @@ -33,8 +33,8 @@ stdenv.mkDerivation { meta = { homepage = "https://gitlab.com/o9000/phwmon"; description = "Hardware monitor (CPU, memory, network and disk I/O) for the system tray"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.romildo ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.romildo ]; }; } diff --git a/pkgs/applications/misc/pipr/default.nix b/pkgs/applications/misc/pipr/default.nix index 7332f201689..6ca315b1092 100644 --- a/pkgs/applications/misc/pipr/default.nix +++ b/pkgs/applications/misc/pipr/default.nix @@ -1,9 +1,8 @@ -{ stdenv +{ lib , fetchFromGitHub , rustPlatform , bubblewrap , makeWrapper -, lib }: rustPlatform.buildRustPackage rec { diff --git a/pkgs/applications/misc/plank/default.nix b/pkgs/applications/misc/plank/default.nix index cdc08686124..b462e5f134b 100644 --- a/pkgs/applications/misc/plank/default.nix +++ b/pkgs/applications/misc/plank/default.nix @@ -13,7 +13,7 @@ , libXi , pango , gettext -, pkgconfig +, pkg-config , libxml2 , bamf , gdk-pixbuf @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { gettext gnome3.gnome-common libxml2 # xmllint - pkgconfig + pkg-config vala wrapGAppsHook ]; diff --git a/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix b/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix index d9feb28c037..bb365ecfefd 100644 --- a/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix +++ b/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix @@ -12,10 +12,12 @@ stdenv.mkDerivation rec { }; patches = [ ./cmake.patch ]; - postPatch = '' rm build ''; + postPatch = "rm build "; nativeBuildInputs = [ cmake extra-cmake-modules ]; buildInputs = [ plasma-framework kwindowsystem plasma-pa ]; + dontWrapQtApps = true; + meta = with lib; { description = "A fork of the default volume plasmoid with a Windows 7 theme (vertical sliders)"; homepage = "https://github.com/Zren/plasma-applet-volumewin7mixer"; diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix index 73d50209e90..d805aa0c0aa 100644 --- a/pkgs/applications/misc/playonlinux/default.nix +++ b/pkgs/applications/misc/playonlinux/default.nix @@ -27,7 +27,7 @@ let version = "4.4"; - binpath = stdenv.lib.makeBinPath [ + binpath = lib.makeBinPath [ cabextract python gettext @@ -52,7 +52,7 @@ let else if stdenv.hostPlatform.system == "i686-linux" then "${stdenv.cc}/nix-support/dynamic-linker" else throw "Unsupported platform for PlayOnLinux: ${stdenv.hostPlatform.system}"; ld64 = "${stdenv.cc}/nix-support/dynamic-linker"; - libs = pkgs: stdenv.lib.makeLibraryPath [ xorg.libX11 libGL ]; + libs = pkgs: lib.makeLibraryPath [ xorg.libX11 libGL ]; python = python2.withPackages(ps: with ps; [ wxPython diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix index 2a3368e351f..05886a85bf0 100644 --- a/pkgs/applications/misc/plover/default.nix +++ b/pkgs/applications/misc/plover/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python27Packages, python36Packages, wmctrl, +{ lib, fetchurl, python27Packages, python36Packages, wmctrl, qtbase, mkDerivationWith }: { diff --git a/pkgs/applications/misc/polar-bookshelf/default.nix b/pkgs/applications/misc/polar-bookshelf/default.nix index cd309797aa3..faa139a3da4 100644 --- a/pkgs/applications/misc/polar-bookshelf/default.nix +++ b/pkgs/applications/misc/polar-bookshelf/default.nix @@ -82,9 +82,9 @@ stdenv.mkDerivation rec { meta = { homepage = "https://getpolarized.io/"; description = "Personal knowledge repository for PDF and web content supporting incremental reading and document annotation"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.noneucat ]; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.noneucat ]; }; } diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix index 2556eb02062..c79da21ad63 100644 --- a/pkgs/applications/misc/polybar/default.nix +++ b/pkgs/applications/misc/polybar/default.nix @@ -1,4 +1,4 @@ -{ cairo, cmake, fetchFromGitHub, libXdmcp, libpthreadstubs, libxcb, pcre, pkgconfig +{ cairo, cmake, fetchFromGitHub, libXdmcp, libpthreadstubs, libxcb, pcre, pkg-config , python3, lib, stdenv, xcbproto, xcbutil, xcbutilcursor, xcbutilimage , xcbutilrenderutil, xcbutilwm, xcbutilxrm, makeWrapper , removeReferencesTo @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { '' else ""; nativeBuildInputs = [ - cmake pkgconfig removeReferencesTo + cmake pkg-config removeReferencesTo ]; postFixup = '' diff --git a/pkgs/applications/misc/prevo/default.nix b/pkgs/applications/misc/prevo/default.nix index 92d78869503..45f5889d4d5 100644 --- a/pkgs/applications/misc/prevo/default.nix +++ b/pkgs/applications/misc/prevo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, symlinkJoin, prevo-tools, prevo-data, makeWrapper }: +{ lib, symlinkJoin, prevo-tools, prevo-data, makeWrapper }: symlinkJoin rec { name = "prevo-${version}"; diff --git a/pkgs/applications/misc/printrun/default.nix b/pkgs/applications/misc/printrun/default.nix index bd45e742f54..63160955130 100644 --- a/pkgs/applications/misc/printrun/default.nix +++ b/pkgs/applications/misc/printrun/default.nix @@ -1,18 +1,18 @@ -{ lib, stdenv, python27Packages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub }: -python27Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "printrun"; - version = "1.6.0"; + version = "2.0.0rc5"; src = fetchFromGitHub { owner = "kliment"; repo = "Printrun"; rev = "${pname}-${version}"; - sha256 = "0nhcx1bi1hals0a6d6994y0kcwsfqx3hplwbmn9136hgrplg0l2l"; + sha256 = "179x8lwrw2h7cxnkq7izny6qcb4nhjnd8zx893i77zfhzsa6kx81"; }; - propagatedBuildInputs = with python27Packages; [ - wxPython30 pyserial dbus-python psutil numpy pyopengl pyglet cython + propagatedBuildInputs = with python3Packages; [ + appdirs cython dbus-python numpy six wxPython_4_0 psutil pyglet pyopengl pyserial ]; doCheck = false; diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index 80936d910a3..4d2ef2254e1 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -1,15 +1,16 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig -, boost, cereal, curl, eigen, expat, glew, libpng, tbb, wxGTK31 -, gtest, nlopt, xorg, makeDesktopItem -, cgal_5, gmp, ilmbase, mpfr, qhull, openvdb, systemd +{ stdenv, lib, fetchFromGitHub, cmake, copyDesktopItems, makeDesktopItem, pkg-config, wrapGAppsHook +, boost, cereal, cgal_5, curl, dbus, eigen, expat, glew, glib, gmp, gtest, gtk3, hicolor-icon-theme +, ilmbase, libpng, mpfr, nlopt, openvdb, pcre, qhull, systemd, tbb, wxGTK31-gtk3, xorg }: stdenv.mkDerivation rec { pname = "prusa-slicer"; - version = "2.2.0"; + version = "2.3.0"; nativeBuildInputs = [ cmake - pkgconfig + copyDesktopItems + pkg-config + wrapGAppsHook ]; buildInputs = [ @@ -17,21 +18,27 @@ stdenv.mkDerivation rec { cereal cgal_5 curl + dbus eigen expat glew + glib gmp + gtk3 + hicolor-icon-theme ilmbase libpng mpfr nlopt openvdb + pcre systemd tbb - wxGTK31 + wxGTK31-gtk3 xorg.libX11 ] ++ checkInputs; + doCheck = true; checkInputs = [ gtest ]; # The build system uses custom logic - defined in @@ -62,30 +69,43 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "prusa3d"; repo = "PrusaSlicer"; - sha256 = "0954k9sm09y8qnz1jyswyysg10k54ywz8mswnwa4n2hnpq9qx73m"; + sha256 = "08zyvik8cyj1n9knbg8saan7j8s60nzkyj4a77818zbi9lpi65i5"; rev = "version_${version}"; }; cmakeFlags = [ "-DSLIC3R_FHS=1" + "-DSLIC3R_GTK=3" ]; postInstall = '' + ln -s "$out/bin/prusa-slicer" "$out/bin/prusa-gcodeviewer" + mkdir -p "$out/share/pixmaps/" ln -s "$out/share/PrusaSlicer/icons/PrusaSlicer.png" "$out/share/pixmaps/PrusaSlicer.png" - mkdir -p "$out/share/applications" - cp "$desktopItem"/share/applications/* "$out/share/applications/" + ln -s "$out/share/PrusaSlicer/icons/PrusaSlicer-gcodeviewer_192px.png" "$out/share/pixmaps/PrusaSlicer-gcodeviewer.png" ''; - desktopItem = makeDesktopItem { - name = "PrusaSlicer"; - exec = "prusa-slicer"; - icon = "PrusaSlicer"; - comment = "G-code generator for 3D printers"; - desktopName = "PrusaSlicer"; - genericName = "3D printer tool"; - categories = "Development;"; - }; + desktopItems = [ + (makeDesktopItem { + name = "PrusaSlicer"; + exec = "prusa-slicer"; + icon = "PrusaSlicer"; + comment = "G-code generator for 3D printers"; + desktopName = "PrusaSlicer"; + genericName = "3D printer tool"; + categories = "Development;"; + }) + (makeDesktopItem { + name = "PrusaSlicer G-code Viewer"; + exec = "prusa-gcodeviewer"; + icon = "PrusaSlicer-gcodeviewer"; + comment = "G-code viewer for 3D printers"; + desktopName = "PrusaSlicer G-code Viewer"; + genericName = "G-code Viewer"; + categories = "Development;"; + }) + ]; meta = with lib; { description = "G-code generator for 3D printer"; diff --git a/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/pkgs/applications/misc/prusa-slicer/super-slicer.nix index eed3bfc9c31..14894159843 100644 --- a/pkgs/applications/misc/prusa-slicer/super-slicer.nix +++ b/pkgs/applications/misc/prusa-slicer/super-slicer.nix @@ -24,19 +24,19 @@ let postInstall = '' mkdir -p "$out/share/pixmaps/" ln -s "$out/share/SuperSlicer/icons/Slic3r.png" "$out/share/pixmaps/${appname}.png" - mkdir -p "$out/share/applications" - cp "$desktopItem"/share/applications/* "$out/share/applications/" ''; - desktopItem = makeDesktopItem { - name = appname; - exec = "superslicer"; - icon = appname; - comment = description; - desktopName = appname; - genericName = "3D printer tool"; - categories = "Development;"; - }; + desktopItems = [ + (makeDesktopItem { + name = appname; + exec = "superslicer"; + icon = appname; + comment = description; + desktopName = appname; + genericName = "3D printer tool"; + categories = "Development;"; + }) + ]; meta = with lib; { inherit description; diff --git a/pkgs/applications/misc/pt/gemset.nix b/pkgs/applications/misc/pt/gemset.nix index f1f69c25214..9cd83a90721 100644 --- a/pkgs/applications/misc/pt/gemset.nix +++ b/pkgs/applications/misc/pt/gemset.nix @@ -270,4 +270,4 @@ }; version = "1.0.5"; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/misc/ptask/default.nix b/pkgs/applications/misc/ptask/default.nix index 011b782053e..b243f194181 100644 --- a/pkgs/applications/misc/ptask/default.nix +++ b/pkgs/applications/misc/ptask/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, makeWrapper, gtk3, json_c, taskwarrior }: +{ lib, stdenv, fetchurl, pkg-config, makeWrapper, gtk3, json_c, taskwarrior }: stdenv.mkDerivation rec { name = "ptask-1.0.0"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 json_c ]; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; patches = [ ./tw-version.patch ./json_c_is_error.patch ]; diff --git a/pkgs/applications/misc/pwsafe/default.nix b/pkgs/applications/misc/pwsafe/default.nix index c1b9d04d673..2e7c77c0935 100644 --- a/pkgs/applications/misc/pwsafe/default.nix +++ b/pkgs/applications/misc/pwsafe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, zip, gettext, perl +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, zip, gettext, perl , wxGTK30, libXext, libXi, libXt, libXtst, xercesc , qrencode, libuuid, libyubikey, yubikey-personalization , curl, openssl, file @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - cmake gettext perl pkgconfig zip + cmake gettext perl pkg-config zip ]; buildInputs = [ libXext libXi libXt libXtst wxGTK30 diff --git a/pkgs/applications/misc/pydf/default.nix b/pkgs/applications/misc/pydf/default.nix index 0135e10d6df..afec377e9b6 100644 --- a/pkgs/applications/misc/pydf/default.nix +++ b/pkgs/applications/misc/pydf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages }: +{ lib, python3Packages }: python3Packages.buildPythonPackage rec { pname = "pydf"; diff --git a/pkgs/applications/misc/pyditz/cerberus.nix b/pkgs/applications/misc/pyditz/cerberus.nix index a26b6b014da..5eb43c0e357 100644 --- a/pkgs/applications/misc/pyditz/cerberus.nix +++ b/pkgs/applications/misc/pyditz/cerberus.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytestrunner, pytest }: +{ lib, buildPythonPackage, fetchPypi, pytestrunner, pytest }: buildPythonPackage rec { pname = "Cerberus"; diff --git a/pkgs/applications/misc/pyditz/default.nix b/pkgs/applications/misc/pyditz/default.nix index 268d2fb2860..5765aeba7dd 100644 --- a/pkgs/applications/misc/pyditz/default.nix +++ b/pkgs/applications/misc/pyditz/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pythonPackages }: +{ lib, pythonPackages }: with pythonPackages; diff --git a/pkgs/applications/misc/pytrainer/default.nix b/pkgs/applications/misc/pytrainer/default.nix index eb775a1f602..4e1e1f31f19 100644 --- a/pkgs/applications/misc/pytrainer/default.nix +++ b/pkgs/applications/misc/pytrainer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , perl , python3 diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix index ac1db54ebce..c6b9d82bcf4 100644 --- a/pkgs/applications/misc/qcad/default.nix +++ b/pkgs/applications/misc/qcad/default.nix @@ -3,7 +3,7 @@ , libGLU , mkDerivationWith , muparser -, pkgconfig +, pkg-config , qtbase , qmake , qtscript @@ -85,7 +85,7 @@ mkDerivationWith stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config qmake qttools ]; diff --git a/pkgs/applications/misc/qdirstat/default.nix b/pkgs/applications/misc/qdirstat/default.nix index a51bd3a80c0..29cd7967e13 100644 --- a/pkgs/applications/misc/qdirstat/default.nix +++ b/pkgs/applications/misc/qdirstat/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchFromGitHub, qmake -, coreutils, xdg_utils, bash +{ lib, fetchFromGitHub, qmake +, coreutils, xdg-utils, bash , makeWrapper, perlPackages, mkDerivation }: let @@ -28,7 +28,7 @@ mkDerivation { for i in src/SysUtil.cpp src/FileSizeStatsWindow.cpp do substituteInPlace $i \ - --replace /usr/bin/xdg-open ${xdg_utils}/bin/xdg-open + --replace /usr/bin/xdg-open ${xdg-utils}/bin/xdg-open done for i in src/Cleanup.cpp src/cleanup-config-page.ui do diff --git a/pkgs/applications/misc/qlcplus/default.nix b/pkgs/applications/misc/qlcplus/default.nix index 0f359007696..721c95c028b 100644 --- a/pkgs/applications/misc/qlcplus/default.nix +++ b/pkgs/applications/misc/qlcplus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, pkgconfig, udev +{ lib, mkDerivation, fetchFromGitHub, qmake, pkg-config, udev , qtmultimedia, qtscript, alsaLib, ola, libftdi1, libusb-compat-0_1 , libsndfile, libmad }: @@ -14,7 +14,7 @@ mkDerivation rec { sha256 = "PB1Y8N1TrJMcS7A2e1nKjsUlAxOYjdJqBhbyuDCAbGs="; }; - nativeBuildInputs = [ qmake pkgconfig ]; + nativeBuildInputs = [ qmake pkg-config ]; buildInputs = [ udev qtmultimedia qtscript alsaLib ola libftdi1 libusb-compat-0_1 libsndfile libmad ]; diff --git a/pkgs/applications/misc/qolibri/default.nix b/pkgs/applications/misc/qolibri/default.nix index 6cdd97e666f..3b61e3dbc1a 100644 --- a/pkgs/applications/misc/qolibri/default.nix +++ b/pkgs/applications/misc/qolibri/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, pkgconfig, cmake, libeb, lzo +{ mkDerivation, lib, fetchFromGitHub, pkg-config, cmake, libeb, lzo , qtbase, qtmultimedia, qttools, qtwebengine }: mkDerivation { @@ -12,7 +12,7 @@ mkDerivation { sha256 = "0kcc6dvbcmq9y7hk8mp23pydiaqz6f0clg64d1f2y04ppphmah42"; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ libeb lzo qtbase qtmultimedia qttools qtwebengine ]; diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/misc/qpdfview/default.nix index 3e55215f473..6ae81fca27c 100644 --- a/pkgs/applications/misc/qpdfview/default.nix +++ b/pkgs/applications/misc/qpdfview/default.nix @@ -1,4 +1,4 @@ -{stdenv, mkDerivation, fetchurl, qmake, qtbase, qtsvg, pkgconfig, poppler, djvulibre, libspectre, cups +{lib, mkDerivation, fetchurl, qmake, qtbase, qtsvg, pkg-config, poppler, djvulibre, libspectre, cups , file, ghostscript }: let @@ -10,7 +10,7 @@ let url="https://launchpad.net/qpdfview/trunk/${version}/+download/qpdfview-${version}.tar.gz"; sha256 = "0v1rl126hvblajnph2hkansgi0s8vjdc5yxrm4y3faa0lxzjwr6c"; }; - nativeBuildInputs = [ qmake pkgconfig ]; + nativeBuildInputs = [ qmake pkg-config ]; buildInputs = [ qtbase qtsvg poppler djvulibre libspectre cups file ghostscript ]; @@ -40,9 +40,9 @@ mkDerivation { meta = { inherit (s) version; description = "A tabbed document viewer"; - license = stdenv.lib.licenses.gpl2; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; homepage = "https://launchpad.net/qpdfview"; updateWalker = true; }; diff --git a/pkgs/applications/misc/qsudo/default.nix b/pkgs/applications/misc/qsudo/default.nix index f7dbc9a9058..5f9958f2d5d 100644 --- a/pkgs/applications/misc/qsudo/default.nix +++ b/pkgs/applications/misc/qsudo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , mkDerivation , fetchFromGitHub , qmake diff --git a/pkgs/applications/misc/qt-box-editor/default.nix b/pkgs/applications/misc/qt-box-editor/default.nix index 5de2428250a..9480a32aae3 100644 --- a/pkgs/applications/misc/qt-box-editor/default.nix +++ b/pkgs/applications/misc/qt-box-editor/default.nix @@ -1,5 +1,5 @@ { mkDerivation -, lib, stdenv +, lib , fetchFromGitHub , qtbase , qtsvg diff --git a/pkgs/applications/misc/qt-video-wlr/default.nix b/pkgs/applications/misc/qt-video-wlr/default.nix index e10c922e4f1..bdb434085da 100644 --- a/pkgs/applications/misc/qt-video-wlr/default.nix +++ b/pkgs/applications/misc/qt-video-wlr/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, pkg-config, meson, ninja, wayland, pixman, cairo, librsvg, wayland-protocols, wlroots, libxkbcommon, gst_all_1, wrapQtAppsHook, qtbase, qtmultimedia }: let - gstreamerPath = with gst_all_1; stdenv.lib.makeSearchPath "lib/gstreamer-1.0" [ + gstreamerPath = with gst_all_1; lib.makeSearchPath "lib/gstreamer-1.0" [ gstreamer gst-plugins-base gst-plugins-good diff --git a/pkgs/applications/misc/qtbitcointrader/default.nix b/pkgs/applications/misc/qtbitcointrader/default.nix index 4ab70a5a8d7..fafd91f7811 100644 --- a/pkgs/applications/misc/qtbitcointrader/default.nix +++ b/pkgs/applications/misc/qtbitcointrader/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, qt5, mkDerivation }: +{ lib, fetchzip, qt5, mkDerivation }: let version = "1.40.43"; diff --git a/pkgs/applications/misc/quicksynergy/default.nix b/pkgs/applications/misc/quicksynergy/default.nix index 1956f0ad41d..81a4ef3d99f 100644 --- a/pkgs/applications/misc/quicksynergy/default.nix +++ b/pkgs/applications/misc/quicksynergy/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, gtk2, synergy}: +{lib, stdenv, fetchurl, pkg-config, gtk2, synergy}: stdenv.mkDerivation rec { pname = "quicksynergy"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1pi8503bg8q1psw50y6d780i33nnvfjqiy9vnr3v52pdcfip8pix"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 synergy @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { Remember to open port 24800 (used by synergys program) if you want to host mouse and keyboard."; homepage = "https://sourceforge.net/projects/quicksynergy/"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.spinus ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.spinus ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix index 68ddef65697..619b2ba9955 100644 --- a/pkgs/applications/misc/ranger/default.nix +++ b/pkgs/applications/misc/ranger/default.nix @@ -1,7 +1,7 @@ -{ stdenv, lib, fetchFromGitHub, python3Packages, file, less, highlight +{ lib, fetchFromGitHub, python3Packages, file, less, highlight , imagePreviewSupport ? true, w3m ? null}: -with stdenv.lib; +with lib; assert imagePreviewSupport -> w3m != null; @@ -36,7 +36,7 @@ python3Packages.buildPythonApplication rec { --replace "/bin/echo" "echo" substituteInPlace ranger/__init__.py \ - --replace "DEFAULT_PAGER = 'less'" "DEFAULT_PAGER = '${stdenv.lib.getBin less}/bin/less'" + --replace "DEFAULT_PAGER = 'less'" "DEFAULT_PAGER = '${lib.getBin less}/bin/less'" for i in ranger/config/rc.conf doc/config/rc.conf ; do substituteInPlace $i --replace /usr/share $out/share diff --git a/pkgs/applications/misc/razergenie/default.nix b/pkgs/applications/misc/razergenie/default.nix index ac0f373dc93..8f78c0becaf 100644 --- a/pkgs/applications/misc/razergenie/default.nix +++ b/pkgs/applications/misc/razergenie/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchFromGitHub, lib, meson, ninja, pkgconfig, qtbase, qttools +{ stdenv, fetchFromGitHub, lib, meson, ninja, pkg-config, qtbase, qttools , wrapQtAppsHook , enableExperimental ? false , includeMatrixDiscovery ? false }: let - version = "0.8.1"; + version = "0.9.0"; pname = "razergenie"; in stdenv.mkDerivation { @@ -15,11 +15,11 @@ in stdenv.mkDerivation { owner = "z3ntu"; repo = "RazerGenie"; rev = "v${version}"; - sha256 = "1ggxnaidxbbpkv1h3zwwyci6886sssgslk5adbikbhz9kc9qg239"; + sha256 = "17xlv26q8sdbav00wdm043449pg2424l3yaf8fvkc9rrlqkv13a4"; }; nativeBuildInputs = [ - pkgconfig meson ninja wrapQtAppsHook + pkg-config meson ninja wrapQtAppsHook ]; buildInputs = [ @@ -35,7 +35,7 @@ in stdenv.mkDerivation { homepage = "https://github.com/z3ntu/RazerGenie"; description = "Qt application for configuring your Razer devices under GNU/Linux"; license = licenses.gpl3; - maintainers = with maintainers; [ f4814n ]; + maintainers = with maintainers; [ f4814n Mogria ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/reddsaver/default.nix b/pkgs/applications/misc/reddsaver/default.nix index 2a6d613ed57..c90aeeb0afd 100644 --- a/pkgs/applications/misc/reddsaver/default.nix +++ b/pkgs/applications/misc/reddsaver/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , rustPlatform , openssl @@ -21,12 +21,12 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ stdenv.lib.optional stdenv.isDarwin Security; + ++ lib.optional stdenv.isDarwin Security; # package does not contain tests as of v0.2.2 docCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "CLI tool to download saved images from Reddit"; homepage = "https://github.com/manojkarthick/reddsaver"; license = with licenses; [ mit /* or */ asl20 ]; diff --git a/pkgs/applications/misc/redis-desktop-manager/default.nix b/pkgs/applications/misc/redis-desktop-manager/default.nix index ec40347cbcb..c185dc13729 100644 --- a/pkgs/applications/misc/redis-desktop-manager/default.nix +++ b/pkgs/applications/misc/redis-desktop-manager/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchFromGitiles, pkgconfig, libssh2 +{ stdenv, lib, fetchFromGitHub, fetchFromGitiles, pkg-config, libssh2 , qtbase, qtdeclarative, qtgraphicaleffects, qtimageformats, qtquickcontrols , qtsvg, qttools, qtquick1, qtcharts , qmake @@ -25,13 +25,14 @@ stdenv.mkDerivation rec { sha256 = "0yd4i944d4blw8jky0nxl7sfkkj975q4d328rdcbhizwvf6dx81f"; }; - nativeBuildInputs = [ pkgconfig qmake ]; + nativeBuildInputs = [ pkg-config qmake ]; buildInputs = [ libssh2 qtbase qtdeclarative qtgraphicaleffects qtimageformats qtquick1 qtquickcontrols qtsvg qttools qtcharts ]; dontUseQmakeConfigure = true; + dontWrapQtApps = true; NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated" ]; diff --git a/pkgs/applications/misc/redshift-plasma-applet/default.nix b/pkgs/applications/misc/redshift-plasma-applet/default.nix index fa5ee0c753a..b8d25f0db1d 100644 --- a/pkgs/applications/misc/redshift-plasma-applet/default.nix +++ b/pkgs/applications/misc/redshift-plasma-applet/default.nix @@ -35,6 +35,8 @@ stdenv.mkDerivation { kwindowsystem ]; + dontWrapQtApps = true; + meta = with lib; { description = "KDE Plasma 5 widget for controlling Redshift"; homepage = "https://github.com/kotelnik/plasma-applet-redshift-control"; diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 6e48a75810e..5798473db5e 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, fetchFromGitLab , autoconf, automake, gettext, intltool -, libtool, pkgconfig, wrapGAppsHook, wrapPython, gobject-introspection +, libtool, pkg-config, wrapGAppsHook, wrapPython, gobject-introspection , gtk3, python, pygobject3, pyxdg , withQuartz ? stdenv.isDarwin, ApplicationServices @@ -19,7 +19,7 @@ let stdenv.mkDerivation rec { inherit pname version src meta; - patches = stdenv.lib.optionals (pname != "gammastep") [ + patches = lib.optionals (pname != "gammastep") [ # https://github.com/jonls/redshift/pull/575 ./575.patch ]; @@ -30,7 +30,7 @@ let gettext intltool libtool - pkgconfig + pkg-config wrapGAppsHook wrapPython ]; @@ -41,7 +41,7 @@ let "--enable-drm=${if withDrm then "yes" else "no"}" "--enable-quartz=${if withQuartz then "yes" else "no"}" "--enable-corelocation=${if withCoreLocation then "yes" else "no"}" - ] ++ stdenv.lib.optionals (pname == "gammastep") [ + ] ++ lib.optionals (pname == "gammastep") [ "--with-systemduserunitdir=${placeholder "out"}/share/systemd/user/" "--enable-apparmor" ]; @@ -50,12 +50,12 @@ let gobject-introspection gtk3 python - ] ++ stdenv.lib.optional withRandr libxcb - ++ stdenv.lib.optional withGeoclue geoclue - ++ stdenv.lib.optional withDrm libdrm - ++ stdenv.lib.optional withQuartz ApplicationServices - ++ stdenv.lib.optionals withCoreLocation [ CoreLocation Foundation Cocoa ] - ++ stdenv.lib.optional withAppIndicator (if (pname != "gammastep") + ] ++ lib.optional withRandr libxcb + ++ lib.optional withGeoclue geoclue + ++ lib.optional withDrm libdrm + ++ lib.optional withQuartz ApplicationServices + ++ lib.optionals withCoreLocation [ CoreLocation Foundation Cocoa ] + ++ lib.optional withAppIndicator (if (pname != "gammastep") then libappindicator else libayatana-appindicator) ; @@ -132,21 +132,21 @@ rec { gammastep = mkRedshift rec { pname = "gammastep"; - version = "2.0.6"; + version = "2.0.7"; src = fetchFromGitLab { owner = "chinstrap"; repo = pname; rev = "v${version}"; - sha256 = "00s457yajnm7vq6jfanyri52pq000jbyjiy6wz2i3f0rq7cc01ya"; + sha256 = "sha256-78z2CQ+r7undbp+8E0mMDNWWl+RXeS5he/ax0VomRYY="; }; meta = redshift.meta // { name = "${pname}-${version}"; longDescription = "Gammastep" - + stdenv.lib.removePrefix "Redshift" redshift.meta.longDescription; + + lib.removePrefix "Redshift" redshift.meta.longDescription; homepage = "https://gitlab.com/chinstrap/gammastep"; - maintainers = [ stdenv.lib.maintainers.primeos ] ++ redshift.meta.maintainers; + maintainers = [ lib.maintainers.primeos ] ++ redshift.meta.maintainers; }; }; } diff --git a/pkgs/applications/misc/regextester/default.nix b/pkgs/applications/misc/regextester/default.nix index a6762d7d846..eac131d6ef7 100644 --- a/pkgs/applications/misc/regextester/default.nix +++ b/pkgs/applications/misc/regextester/default.nix @@ -3,7 +3,7 @@ , vala , gettext , libxml2 -, pkgconfig +, pkg-config , glib , gtk3 , gnome3 @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { libxml2 meson ninja - pkgconfig + pkg-config wrapGAppsHook ]; diff --git a/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix b/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix index 77538f24361..800170b314a 100644 --- a/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix +++ b/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, fetchPypi, python3Packages }: +{ lib, buildPythonApplication, fetchPypi, python3Packages }: buildPythonApplication rec { pname = "remarkable-mouse"; diff --git a/pkgs/applications/misc/remarkable/rmapi/default.nix b/pkgs/applications/misc/remarkable/rmapi/default.nix index 22a154da4fd..e2a5f348da5 100644 --- a/pkgs/applications/misc/remarkable/rmapi/default.nix +++ b/pkgs/applications/misc/remarkable/rmapi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "rmapi"; diff --git a/pkgs/applications/misc/remarkable/rmview/default.nix b/pkgs/applications/misc/remarkable/rmview/default.nix new file mode 100644 index 00000000000..385607ec709 --- /dev/null +++ b/pkgs/applications/misc/remarkable/rmview/default.nix @@ -0,0 +1,31 @@ +{ lib, fetchFromGitHub, python3Packages, wrapQtAppsHook }: + +python3Packages.buildPythonApplication rec { + pname = "rmview"; + version = "2.1"; + + src = fetchFromGitHub { + owner = "bordaigorl"; + repo = pname; + rev = "v${version}"; + sha256 = "0zyngirpg808k1pkyhrk43qr3i8ilvfci0wzwk4b5f6f9cmjs7kb"; + }; + + nativeBuildInputs = with python3Packages; [ pyqt5 wrapQtAppsHook ]; + propagatedBuildInputs = with python3Packages; [ pyqt5 paramiko twisted ]; + + preBuild = '' + pyrcc5 -o src/rmview/resources.py resources.qrc + ''; + + preFixup = '' + wrapQtApp "$out/bin/rmview" + ''; + + meta = with lib; { + description = "Fast live viewer for reMarkable 1 and 2"; + homepage = "https://github.com/bordaigorl/rmview"; + license = licenses.gpl3Only; + maintainers = [ maintainers.nickhu ]; + }; +} diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix index fcdab3ddbc4..69f0b26b9ec 100644 --- a/pkgs/applications/misc/rescuetime/default.nix +++ b/pkgs/applications/misc/rescuetime/default.nix @@ -1,18 +1,18 @@ -{ stdenv, lib, fetchurl, dpkg, patchelf, qt5, libXtst, libXext, libX11, mkDerivation, makeWrapper, libXScrnSaver, writeScript }: +{ stdenv, lib, fetchurl, dpkg, patchelf, qt5, libXtst, libXext, libX11, mkDerivation, makeWrapper, libXScrnSaver, writeScript, common-updater-scripts, curl, pup }: let - version = "2.16.4.2"; + version = "2.16.5.1"; src = if stdenv.hostPlatform.system == "i686-linux" then fetchurl { name = "rescuetime-installer.deb"; url = "https://www.rescuetime.com/installers/rescuetime_${version}_i386.deb"; - sha256 = "0zyal9n3rfj8i13v1q25inq6qyil7897483cdhqvwpb8wskrij4c"; + sha256 = "1xrvyy0higc1fbc8ascpaszvg2bl6x0a35bzmdq6dkay48hnrd8b"; } else fetchurl { name = "rescuetime-installer.deb"; url = "https://www.rescuetime.com/installers/rescuetime_${version}_amd64.deb"; - sha256 = "03bmnkxhip1wilnfqs8akmy1hppahxrmnm8gasnmw5s922vn06cv"; + sha256 = "09ng0yal66d533vzfv27k9l2va03rqbqmsni43qi3hgx7w9wx5ii"; }; -in mkDerivation { +in mkDerivation rec { # https://www.rescuetime.com/updates/linux_release_notes.html inherit version; pname = "rescuetime"; @@ -35,12 +35,18 @@ in mkDerivation { $out/bin/rescuetime ''; - passthru.updateScript = writeScript "rescuetime-updater" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl pup common-updater-scripts + passthru.updateScript = writeScript "${pname}-updater" '' + #!${stdenv.shell} set -eu -o pipefail + PATH=${lib.makeBinPath [curl pup common-updater-scripts]}:$PATH latestVersion="$(curl -sS https://www.rescuetime.com/release-notes/linux | pup '.release:first-of-type h2 strong text{}' | tr -d '\n')" - update-source-version rescuetime "$latestVersion" + + for platform in ${lib.concatStringsSep " " meta.platforms}; do + # The script will not perform an update when the version attribute is up to date from previous platform run + # We need to clear it before each run + update-source-version ${pname} 0 $(yes 0 | head -64 | tr -d "\n") --system=$platform + update-source-version ${pname} "$latestVersion" --system=$platform + done ''; meta = with lib; { diff --git a/pkgs/applications/misc/robo3t/default.nix b/pkgs/applications/misc/robo3t/default.nix index d1e31b4077f..30fd51fa990 100644 --- a/pkgs/applications/misc/robo3t/default.nix +++ b/pkgs/applications/misc/robo3t/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, glib, xorg, dbus, fontconfig, libGL, +{ lib, stdenv, fetchurl, zlib, glib, xorg, dbus, fontconfig, libGL, freetype, xkeyboard_config, makeDesktopItem, makeWrapper }: stdenv.mkDerivation rec { @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [makeWrapper]; - ldLibraryPath = stdenv.lib.makeLibraryPath [ + ldLibraryPath = lib.makeLibraryPath [ stdenv.cc.cc zlib glib @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { homepage = "https://robomongo.org/"; description = "Query GUI for mongodb"; platforms = [ "x86_64-linux" ]; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.eperuffo ]; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.eperuffo ]; }; } diff --git a/pkgs/applications/misc/robomongo/default.nix b/pkgs/applications/misc/robomongo/default.nix index ef0a3047297..e8bba1f7a34 100644 --- a/pkgs/applications/misc/robomongo/default.nix +++ b/pkgs/applications/misc/robomongo/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [makeWrapper]; - ldLibraryPath = stdenv.lib.makeLibraryPath [ + ldLibraryPath = lib.makeLibraryPath [ stdenv.cc.cc zlib glib @@ -70,8 +70,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://robomongo.org/"; description = "Query GUI for mongodb"; - platforms = stdenv.lib.intersectLists stdenv.lib.platforms.linux stdenv.lib.platforms.x86_64; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.eperuffo ]; + platforms = lib.intersectLists lib.platforms.linux lib.platforms.x86_64; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.eperuffo ]; }; } diff --git a/pkgs/applications/misc/rofi-emoji/default.nix b/pkgs/applications/misc/rofi-emoji/default.nix index 14742da35da..73d8999be5b 100644 --- a/pkgs/applications/misc/rofi-emoji/default.nix +++ b/pkgs/applications/misc/rofi-emoji/default.nix @@ -6,7 +6,7 @@ , makeWrapper , autoreconfHook -, pkgconfig +, pkg-config , cairo , glib @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/misc/rofi-file-browser/default.nix b/pkgs/applications/misc/rofi-file-browser/default.nix index d5b0944ac39..0f9067a7e39 100644 --- a/pkgs/applications/misc/rofi-file-browser/default.nix +++ b/pkgs/applications/misc/rofi-file-browser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, rofi, gtk3 }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, rofi, gtk3 }: stdenv.mkDerivation rec { pname = "rofi-file-browser-extended"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { --replace "/usr/share/" "$out/share/" ''; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ rofi gtk3 ]; ROFI_PLUGINS_DIR = "$out/lib/rofi"; diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix index 6ee2cb8c349..33a37e32612 100644 --- a/pkgs/applications/misc/rofi/default.nix +++ b/pkgs/applications/misc/rofi/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl -, autoreconfHook, pkgconfig, libxkbcommon, pango, which, git +, autoreconfHook, pkg-config, libxkbcommon, pango, which, git , cairo, libxcb, xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification , bison, flex, librsvg, check }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sed -i 's/~root/~nobody/g' test/helper-expand.c ''; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libxkbcommon pango cairo git bison flex librsvg check libstartup_notification libxcb xcbutil xcbutilwm xcbutilxrm which ]; diff --git a/pkgs/applications/misc/rofimoji/default.nix b/pkgs/applications/misc/rofimoji/default.nix index ed97c17bfd9..1e340697e76 100644 --- a/pkgs/applications/misc/rofimoji/default.nix +++ b/pkgs/applications/misc/rofimoji/default.nix @@ -38,6 +38,9 @@ buildPythonApplication rec { substituteInPlace setup.py --replace 'pyxdg==0.26' 'pyxdg' ''; + # no tests executed + doCheck = false; + meta = with lib; { description = "A simple emoji and character picker for rofi"; homepage = "https://github.com/fdw/rofimoji"; diff --git a/pkgs/applications/misc/rsclock/default.nix b/pkgs/applications/misc/rsclock/default.nix index d7b38e2d665..bc36b2f379e 100644 --- a/pkgs/applications/misc/rsclock/default.nix +++ b/pkgs/applications/misc/rsclock/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "rsClock"; diff --git a/pkgs/applications/misc/rss-bridge-cli/default.nix b/pkgs/applications/misc/rss-bridge-cli/default.nix index 4ab79440b23..7550e6bcb95 100644 --- a/pkgs/applications/misc/rss-bridge-cli/default.nix +++ b/pkgs/applications/misc/rss-bridge-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, writeShellScriptBin, rss-bridge, php }: +{ lib, writeShellScriptBin, rss-bridge, php }: let phpWithExts = (php.withExtensions diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix index 34393696232..be539a37a30 100644 --- a/pkgs/applications/misc/rtv/default.nix +++ b/pkgs/applications/misc/rtv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: with python3Packages; buildPythonApplication rec { diff --git a/pkgs/applications/misc/sbagen/default.nix b/pkgs/applications/misc/sbagen/default.nix index d7d7dd3ab70..215447ed4e9 100644 --- a/pkgs/applications/misc/sbagen/default.nix +++ b/pkgs/applications/misc/sbagen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "sbagen-1.4.4"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "Binaural sound generator"; homepage = "http://uazu.net/sbagen"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; platforms = [ "i686-linux" ]; }; } diff --git a/pkgs/applications/misc/sc-im/default.nix b/pkgs/applications/misc/sc-im/default.nix index 21cf60b60fc..0ae7a5c1ec0 100644 --- a/pkgs/applications/misc/sc-im/default.nix +++ b/pkgs/applications/misc/sc-im/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, yacc, ncurses, libxml2, libzip, libxls, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, yacc, ncurses, libxml2, libzip, libxls, pkg-config }: stdenv.mkDerivation rec { version = "0.7.0"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0xi0n9qzby012y2j7hg4fgcwyly698sfi4i9gkvy0q682jihprbk"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ yacc ncurses libxml2 libzip libxls ]; buildPhase = '' diff --git a/pkgs/applications/misc/sdcv/default.nix b/pkgs/applications/misc/sdcv/default.nix index ea3fc7d30f1..391ef82daf1 100644 --- a/pkgs/applications/misc/sdcv/default.nix +++ b/pkgs/applications/misc/sdcv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, glib, gettext, readline }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, glib, gettext, readline }: stdenv.mkDerivation rec { pname = "sdcv"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; hardeningDisable = [ "format" ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ glib gettext readline ]; preInstall = '' diff --git a/pkgs/applications/misc/sequeler/default.nix b/pkgs/applications/misc/sequeler/default.nix index ff7fc7dd082..c8a0e0175fa 100644 --- a/pkgs/applications/misc/sequeler/default.nix +++ b/pkgs/applications/misc/sequeler/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, nix-update-script -, vala, meson, ninja, pkgconfig, pantheon, gettext, wrapGAppsHook, python3, desktop-file-utils +, vala, meson, ninja, pkg-config, pantheon, gettext, wrapGAppsHook, python3, desktop-file-utils , gtk3, glib, libgee, libgda, gtksourceview, libxml2, libsecret, libssh2 }: @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { sha256 = "090plqnby2wxzr1waq5kz89w3269j363mgxwfz9g7qg55lddaahz"; }; - nativeBuildInputs = [ meson ninja pkgconfig vala gettext wrapGAppsHook python3 desktop-file-utils ]; + nativeBuildInputs = [ meson ninja pkg-config vala gettext wrapGAppsHook python3 desktop-file-utils ]; buildInputs = [ gtk3 glib pantheon.granite libgee sqlGda gtksourceview libxml2 libsecret libssh2 ]; diff --git a/pkgs/applications/misc/sequelpro/default.nix b/pkgs/applications/misc/sequelpro/default.nix index 16a11342d81..dd1aca73b7d 100644 --- a/pkgs/applications/misc/sequelpro/default.nix +++ b/pkgs/applications/misc/sequelpro/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, undmg }: +{ lib, stdenv, fetchurl, undmg }: stdenv.mkDerivation { pname = "sequel-pro"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "MySQL database management for macOS"; homepage = "http://www.sequelpro.com/"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.darwin; + license = lib.licenses.mit; + platforms = lib.platforms.darwin; }; } diff --git a/pkgs/applications/misc/sidequest/default.nix b/pkgs/applications/misc/sidequest/default.nix index ef4d472e74c..6dad2eaf812 100644 --- a/pkgs/applications/misc/sidequest/default.nix +++ b/pkgs/applications/misc/sidequest/default.nix @@ -1,69 +1,69 @@ { stdenv, lib, fetchurl, buildFHSUserEnv, makeDesktopItem, makeWrapper, atomEnv, libuuid, at-spi2-atk, icu, openssl, zlib }: - let - pname = "sidequest"; - version = "0.10.11"; + let + pname = "sidequest"; + version = "0.10.11"; - desktopItem = makeDesktopItem rec { - name = "SideQuest"; - exec = "SideQuest"; - desktopName = name; - genericName = "VR App Store"; - categories = "Settings;PackageManager;"; - }; + desktopItem = makeDesktopItem rec { + name = "SideQuest"; + exec = "SideQuest"; + desktopName = name; + genericName = "VR App Store"; + categories = "Settings;PackageManager;"; + }; - sidequest = stdenv.mkDerivation { - inherit pname version; + sidequest = stdenv.mkDerivation { + inherit pname version; - src = fetchurl { - url = "https://github.com/the-expanse/SideQuest/releases/download/v${version}/SideQuest-${version}.tar.xz"; - sha256 = "0fw952kdh1gn00y6sx2ag0rnb2paxq9ikg4bzgmbj7rrd1c6l2k9"; - }; + src = fetchurl { + url = "https://github.com/the-expanse/SideQuest/releases/download/v${version}/SideQuest-${version}.tar.xz"; + sha256 = "0fw952kdh1gn00y6sx2ag0rnb2paxq9ikg4bzgmbj7rrd1c6l2k9"; + }; - buildInputs = [ makeWrapper ]; + buildInputs = [ makeWrapper ]; - buildCommand = '' - mkdir -p "$out/lib/SideQuest" "$out/bin" - tar -xJf "$src" -C "$out/lib/SideQuest" --strip-components 1 + buildCommand = '' + mkdir -p "$out/lib/SideQuest" "$out/bin" + tar -xJf "$src" -C "$out/lib/SideQuest" --strip-components 1 - ln -s "$out/lib/SideQuest/sidequest" "$out/bin" + ln -s "$out/lib/SideQuest/sidequest" "$out/bin" - fixupPhase + fixupPhase - # mkdir -p "$out/share/applications" - # ln -s "${desktopItem}/share/applications/*" "$out/share/applications" + # mkdir -p "$out/share/applications" + # ln -s "${desktopItem}/share/applications/*" "$out/share/applications" - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${atomEnv.libPath}/lib:${lib.makeLibraryPath [libuuid at-spi2-atk]}:$out/lib/SideQuest" \ - "$out/lib/SideQuest/sidequest" - ''; - }; - in buildFHSUserEnv { - name = "SideQuest"; + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${atomEnv.libPath}/lib:${lib.makeLibraryPath [libuuid at-spi2-atk]}:$out/lib/SideQuest" \ + "$out/lib/SideQuest/sidequest" + ''; + }; + in buildFHSUserEnv { + name = "SideQuest"; - passthru = { - inherit pname version; + passthru = { + inherit pname version; - meta = with lib; { - description = "An open app store and side-loading tool for Android-based VR devices such as the Oculus Go, Oculus Quest or Moverio BT 300"; - homepage = "https://github.com/the-expanse/SideQuest"; - downloadPage = "https://github.com/the-expanse/SideQuest/releases"; - license = licenses.mit; - maintainers = with maintainers; [ joepie91 rvolosatovs ]; - platforms = [ "x86_64-linux" ]; - }; - }; + meta = with lib; { + description = "An open app store and side-loading tool for Android-based VR devices such as the Oculus Go, Oculus Quest or Moverio BT 300"; + homepage = "https://github.com/the-expanse/SideQuest"; + downloadPage = "https://github.com/the-expanse/SideQuest/releases"; + license = licenses.mit; + maintainers = with maintainers; [ joepie91 rvolosatovs ]; + platforms = [ "x86_64-linux" ]; + }; + }; - targetPkgs = pkgs: [ - sidequest - # Needed in the environment on runtime, to make QuestSaberPatch work - icu openssl zlib - ]; + targetPkgs = pkgs: [ + sidequest + # Needed in the environment on runtime, to make QuestSaberPatch work + icu openssl zlib + ]; - extraInstallCommands = '' - mkdir -p "$out/share/applications" - ln -s ${desktopItem}/share/applications/* "$out/share/applications" - ''; + extraInstallCommands = '' + mkdir -p "$out/share/applications" + ln -s ${desktopItem}/share/applications/* "$out/share/applications" + ''; - runScript = "sidequest"; - } + runScript = "sidequest"; + } diff --git a/pkgs/applications/misc/signumone-ks/default.nix b/pkgs/applications/misc/signumone-ks/default.nix index cf6fcb20167..aeea3ff5daa 100644 --- a/pkgs/applications/misc/signumone-ks/default.nix +++ b/pkgs/applications/misc/signumone-ks/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper, +{ lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper, atk, ffmpeg, gdk-pixbuf, glibc, gtk3, libav_0_8, libXtst }: stdenv.mkDerivation rec { pname = "signumone-ks"; - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { url = "https://cdn-dist.signum.one/${version}/${pname}-${version}.deb"; - sha256 = "4efd80e61619ccf26df1292194fcec68eb14d77dfcf0a1a673da4cf5bf41f4b7"; + sha256 = "00wlya3kb6qac2crflm86km9r48r29bvngjq1wgzj9w2xv0q32b9"; }; # Necessary to avoid using multiple ffmpeg and gtk libs @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { libav_0_8 gtk3 libXtst ]; - libPath = stdenv.lib.makeLibraryPath buildInputs; + libPath = lib.makeLibraryPath buildInputs; unpackPhase = '' dpkg-deb -x ${src} ./ @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { --prefix LD_LIBRARY_PATH : ${libPath} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Digital signature tool for Costa Rican electronic invoicing"; homepage = "https://signum.one/download.html"; license = licenses.unfree; diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix index bc5814add89..840b37351c7 100644 --- a/pkgs/applications/misc/simplenote/default.nix +++ b/pkgs/applications/misc/simplenote/default.nix @@ -88,7 +88,7 @@ let postFixup = '' makeWrapper $out/opt/Simplenote/simplenote $out/bin/simplenote \ - --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ] }" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ] }" \ "''${gappsWrapperArgs[@]}" ''; }; diff --git a/pkgs/applications/misc/slade/default.nix b/pkgs/applications/misc/slade/default.nix index ed0dde0ffaf..e9ba7b2a8f3 100644 --- a/pkgs/applications/misc/slade/default.nix +++ b/pkgs/applications/misc/slade/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, wxGTK, gtk2, sfml, fluidsynth, curl, freeimage, ftgl, glew, zip }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, wxGTK, gtk2, sfml, fluidsynth, curl, freeimage, ftgl, glew, zip }: stdenv.mkDerivation rec { pname = "slade"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0mdn59jm6ab4cdh99bgvadif3wdlqmk5mq635gg7krq35njgw6f6"; }; - nativeBuildInputs = [ cmake pkgconfig zip ]; + nativeBuildInputs = [ cmake pkg-config zip ]; buildInputs = [ wxGTK gtk2 sfml fluidsynth curl freeimage ftgl glew ]; meta = with lib; { diff --git a/pkgs/applications/misc/slade/git.nix b/pkgs/applications/misc/slade/git.nix index b7fee00a40f..dfbfbe55669 100644 --- a/pkgs/applications/misc/slade/git.nix +++ b/pkgs/applications/misc/slade/git.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, wxGTK, gtk2, sfml, fluidsynth, curl, freeimage, ftgl, glew, zip }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, wxGTK, gtk2, sfml, fluidsynth, curl, freeimage, ftgl, glew, zip }: stdenv.mkDerivation { name = "slade-git-3.1.2.2018.01.29"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { }; cmakeFlags = ["-DNO_WEBVIEW=1"]; - nativeBuildInputs = [ cmake pkgconfig zip ]; + nativeBuildInputs = [ cmake pkg-config zip ]; buildInputs = [ wxGTK gtk2 sfml fluidsynth curl freeimage ftgl glew ]; meta = with lib; { diff --git a/pkgs/applications/misc/sleepyhead/default.nix b/pkgs/applications/misc/sleepyhead/default.nix index 1ea7893108d..bf8a9efb9fd 100644 --- a/pkgs/applications/misc/sleepyhead/default.nix +++ b/pkgs/applications/misc/sleepyhead/default.nix @@ -33,7 +33,7 @@ in mkDerivation { cp sleepyhead/SleepyHead $out/bin ''; - postFixup = stdenv.lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.isDarwin '' wrapQtApp "$out/Applications/SleepyHead.app/Contents/MacOS/SleepyHead" ''; diff --git a/pkgs/applications/misc/slmenu/default.nix b/pkgs/applications/misc/slmenu/default.nix index 55025621fc7..16145a915fe 100644 --- a/pkgs/applications/misc/slmenu/default.nix +++ b/pkgs/applications/misc/slmenu/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchhg}: +{lib, stdenv, fetchhg}: let s = rec { @@ -22,9 +22,9 @@ stdenv.mkDerivation { makeFlags = [ "PREFIX=$(out)" ]; meta = { inherit (s) version; - description = ''A console dmenu-like tool''; - license = stdenv.lib.licenses.mit; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + description = "A console dmenu-like tool"; + license = lib.licenses.mit; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/slstatus/default.nix b/pkgs/applications/misc/slstatus/default.nix index 6adf24f617c..613d2f8e78b 100644 --- a/pkgs/applications/misc/slstatus/default.nix +++ b/pkgs/applications/misc/slstatus/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchgit, pkgconfig, writeText, libX11, conf ? null, patches ? [] }: +{ lib, stdenv, fetchgit, pkg-config, writeText, libX11, conf ? null, patches ? [] }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "slstatus"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { inherit patches; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 ]; installFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/misc/snapper-gui/default.nix b/pkgs/applications/misc/snapper-gui/default.nix new file mode 100644 index 00000000000..5beacfad2f9 --- /dev/null +++ b/pkgs/applications/misc/snapper-gui/default.nix @@ -0,0 +1,49 @@ +{ lib, fetchFromGitHub, python3, python3Packages +, gnome3, gtk3, wrapGAppsHook, gtksourceview3, snapper +, gobject-introspection +}: + +python3Packages.buildPythonApplication rec { + pname = "snapper-gui"; + version = "2020-10-20"; + + src = fetchFromGitHub { + owner = "ricardomv"; + repo = pname; + rev = "f0c67abe0e10cc9e2ebed400cf80ecdf763fb1d1"; + sha256 = "13j4spbi9pxg69zifzai8ifk4207sn0vwh6vjqryi0snd5sylh7h"; + }; + + nativeBuildInputs = [ wrapGAppsHook ]; + + buildInputs = [ + python3 + gobject-introspection + gnome3.adwaita-icon-theme + ]; + + doCheck = false; # it doesn't have any tests + + propagatedBuildInputs = with python3Packages; [ + gtk3 + dbus-python + pygobject3 + setuptools + gtksourceview3 + snapper + ]; + + meta = with lib; { + description = "Graphical interface for snapper"; + longDescription = '' + A graphical user interface for the tool snapper for Linux filesystem + snapshot management. It can compare snapshots and revert differences between snapshots. + In simple terms, this allows root and non-root users to view older versions of files + and revert changes. Currently works with btrfs, ext4 and thin-provisioned LVM volumes. + ''; + homepage = "https://github.com/ricardomv/snapper-gui"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ ahuzik ]; + }; +} diff --git a/pkgs/applications/misc/snowmachine/default.nix b/pkgs/applications/misc/snowmachine/default.nix new file mode 100644 index 00000000000..022d75030d0 --- /dev/null +++ b/pkgs/applications/misc/snowmachine/default.nix @@ -0,0 +1,24 @@ +{ buildPythonPackage, lib, click, colorama, fetchPypi, setuptools-git }: + +buildPythonPackage rec { + pname = "snowmachine"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1v385hhxy2a8vx5p0fhn0di8l4qfpb0a86j6nwsg0aw6ngb09qf1"; + }; + + buildInputs = [ setuptools-git ]; + propagatedBuildInputs = [ click colorama ]; + + doCheck = false; + pythonImportsCheck = [ "snowmachine" ]; + + meta = with lib; { + description = "A python script that will make your terminal snow"; + homepage = "https://github.com/sontek/snowmachine"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ djanatyn ]; + }; +} diff --git a/pkgs/applications/misc/snowsql/default.nix b/pkgs/applications/misc/snowsql/default.nix index 69277196001..531bc489354 100644 --- a/pkgs/applications/misc/snowsql/default.nix +++ b/pkgs/applications/misc/snowsql/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ rpmextract makeWrapper ]; - libPath = stdenv.lib.makeLibraryPath [ openssl ]; + libPath = lib.makeLibraryPath [ openssl ]; buildCommand = '' mkdir -p $out/bin/ diff --git a/pkgs/applications/misc/spacefm/default.nix b/pkgs/applications/misc/spacefm/default.nix index 45dc487c8ed..e08240733d1 100644 --- a/pkgs/applications/misc/spacefm/default.nix +++ b/pkgs/applications/misc/spacefm/default.nix @@ -1,5 +1,5 @@ -{ pkgs, fetchFromGitHub, stdenv, gtk3, udev, desktop-file-utils -, shared-mime-info, intltool, pkgconfig, wrapGAppsHook, ffmpegthumbnailer +{ pkgs, fetchFromGitHub, lib, stdenv, gtk3, udev, desktop-file-utils +, shared-mime-info, intltool, pkg-config, wrapGAppsHook, ffmpegthumbnailer , jmtpfs, ifuseSupport ? false, ifuse ? null, lsof, udisks2 }: stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share") ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk3 udev desktop-file-utils shared-mime-info intltool wrapGAppsHook ffmpegthumbnailer jmtpfs lsof udisks2 @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { # Introduced because ifuse doesn't build due to CVEs in libplist # Revert when libplist builds again… - meta = with stdenv.lib; { + meta = with lib; { description = "A multi-panel tabbed file manager"; longDescription = '' Multi-panel tabbed file and desktop manager for Linux diff --git a/pkgs/applications/misc/stag/default.nix b/pkgs/applications/misc/stag/default.nix index 6b4bf194630..03c90af2368 100644 --- a/pkgs/applications/misc/stag/default.nix +++ b/pkgs/applications/misc/stag/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, curses }: +{ lib, stdenv, fetchgit, curses }: stdenv.mkDerivation { name = "stag-1.0"; @@ -18,8 +18,8 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/seenaburns/stag"; description = "Terminal streaming bar graph passed through stdin"; - license = stdenv.lib.licenses.bsdOriginal; - maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.bsdOriginal; + maintainers = [ lib.maintainers.matthiasbeyer ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix index ab3423c4737..98392ae27f2 100644 --- a/pkgs/applications/misc/subsurface/default.nix +++ b/pkgs/applications/misc/subsurface/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, autoreconfHook, cmake, wrapQtAppsHook, pkgconfig, qmake +{ lib, stdenv, fetchurl, fetchFromGitHub, autoreconfHook, cmake, wrapQtAppsHook, pkg-config, qmake , curl, grantlee, libgit2, libusb-compat-0_1, libssh2, libxml2, libxslt, libzip, zlib , qtbase, qtconnectivity, qtlocation, qtsvg, qttools, qtwebkit, libXcomposite }: @@ -52,6 +52,8 @@ let buildInputs = [ qtbase qtlocation libXcomposite ]; + dontWrapQtApps = true; + pluginsSubdir = "lib/qt-${qtbase.qtCompatVersion}/plugins"; installPhase = '' @@ -84,7 +86,7 @@ in stdenv.mkDerivation { qtbase qtconnectivity qtsvg qttools qtwebkit ]; - nativeBuildInputs = [ cmake wrapQtAppsHook pkgconfig ]; + nativeBuildInputs = [ cmake wrapQtAppsHook pkg-config ]; cmakeFlags = [ "-DLIBDC_FROM_PKGCONFIG=ON" diff --git a/pkgs/applications/misc/swappy/default.nix b/pkgs/applications/misc/swappy/default.nix index 11798db34f5..bf1fdf63fed 100644 --- a/pkgs/applications/misc/swappy/default.nix +++ b/pkgs/applications/misc/swappy/default.nix @@ -5,7 +5,7 @@ , cairo , pango , gtk -, pkgconfig +, pkg-config , cmake , scdoc , libnotify @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { sha256 = "14ac2jmnak7avcz0jhqjm30vk7pv3gq5aq5rdyh84k8c613kkicf"; }; - nativeBuildInputs = [ glib meson ninja pkgconfig cmake scdoc ]; + nativeBuildInputs = [ glib meson ninja pkg-config cmake scdoc ]; buildInputs = [ cairo pango gtk libnotify wayland glib ]; diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix index bf2db296650..afbf5b364ed 100644 --- a/pkgs/applications/misc/sweethome3d/default.nix +++ b/pkgs/applications/misc/sweethome3d/default.nix @@ -17,7 +17,7 @@ let stdenv.mkDerivation rec { inherit pname version src description; - exec = stdenv.lib.toLower module; + exec = lib.toLower module; sweethome3dItem = makeDesktopItem { inherit exec desktopName; name = pname; @@ -67,21 +67,21 @@ let homepage = "http://www.sweethome3d.com/index.jsp"; inherit description; inherit license; - maintainers = [ stdenv.lib.maintainers.edwtjo ]; - platforms = stdenv.lib.platforms.linux; + maintainers = [ lib.maintainers.edwtjo ]; + platforms = lib.platforms.linux; }; }; - d2u = stdenv.lib.replaceChars ["."] ["_"]; + d2u = lib.replaceChars ["."] ["_"]; in { application = mkSweetHome3D rec { - pname = stdenv.lib.toLower module + "-application"; + pname = lib.toLower module + "-application"; version = "6.4.2"; module = "SweetHome3D"; description = "Design and visualize your future home"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; src = fetchsvn { url = "https://svn.code.sf.net/p/sweethome3d/code/tags/V_" + d2u version + "/SweetHome3D/"; sha256 = "13rczayakwb5246hqnp8lnw61p0p7ywr2294bnlp4zwsrz1in9z4"; diff --git a/pkgs/applications/misc/sweethome3d/editors.nix b/pkgs/applications/misc/sweethome3d/editors.nix index d6b44a86e08..08bc5b90fd9 100644 --- a/pkgs/applications/misc/sweethome3d/editors.nix +++ b/pkgs/applications/misc/sweethome3d/editors.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchcvs, makeWrapper, makeDesktopItem, jdk, jre, ant +{ lib, stdenv, fetchcvs, makeWrapper, makeDesktopItem, jdk, jre, ant , gtk3, gsettings-desktop-schemas, sweethome3dApp }: let - sweetExec = with stdenv.lib; + sweetExec = with lib; m: "sweethome3d-" + removeSuffix "libraryeditor" (toLower m) + "-editor"; @@ -50,13 +50,13 @@ let homepage = "http://www.sweethome3d.com/index.jsp"; inherit description; inherit license; - maintainers = [ stdenv.lib.maintainers.edwtjo ]; - platforms = stdenv.lib.platforms.linux; + maintainers = [ lib.maintainers.edwtjo ]; + platforms = lib.platforms.linux; }; }; - d2u = stdenv.lib.replaceChars ["."] ["_"]; + d2u = lib.replaceChars ["."] ["_"]; in { @@ -65,7 +65,7 @@ in { module = "TexturesLibraryEditor"; pname = module; description = "Easily create SH3T files and edit the properties of the texture images it contain"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; src = fetchcvs { cvsRoot = ":pserver:anonymous@sweethome3d.cvs.sourceforge.net:/cvsroot/sweethome3d"; sha256 = "15wxdns3hc8yq362x0rj53bcxran2iynxznfcb9js85psd94zq7h"; @@ -80,7 +80,7 @@ in { module = "FurnitureLibraryEditor"; pname = module; description = "Quickly create SH3F files and edit the properties of the 3D models it contain"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; src = fetchcvs { cvsRoot = ":pserver:anonymous@sweethome3d.cvs.sourceforge.net:/cvsroot/sweethome3d"; sha256 = "0rr4nqil1mngak3ds5vz7f1whrgcgzpk6fb0qcr5ljms0jx0ylvs"; diff --git a/pkgs/applications/misc/synapse/default.nix b/pkgs/applications/misc/synapse/default.nix index 6f8dd068de8..da822f5347b 100644 --- a/pkgs/applications/misc/synapse/default.nix +++ b/pkgs/applications/misc/synapse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gettext, pkgconfig, glib, libnotify, gtk3, libgee +{ lib, stdenv, fetchurl, gettext, pkg-config, glib, libnotify, gtk3, libgee , keybinder3, json-glib, zeitgeist, vala, gobject-introspection }: @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig gettext vala + pkg-config gettext vala # For setup hook gobject-introspection ]; diff --git a/pkgs/applications/misc/syncthing-tray/default.nix b/pkgs/applications/misc/syncthing-tray/default.nix index ab57bf7a430..db734bff587 100644 --- a/pkgs/applications/misc/syncthing-tray/default.nix +++ b/pkgs/applications/misc/syncthing-tray/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoPackage, pkgconfig, libappindicator-gtk3 }: +{ lib, fetchFromGitHub, buildGoPackage, pkg-config, libappindicator-gtk3 }: buildGoPackage rec { pname = "syncthing-tray"; @@ -15,7 +15,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libappindicator-gtk3 ]; meta = with lib; { diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index bbe629ecb14..f5c5faf4d96 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -1,5 +1,4 @@ { mkDerivation -, stdenv , lib , fetchFromGitHub , qtbase diff --git a/pkgs/applications/misc/taizen/default.nix b/pkgs/applications/misc/taizen/default.nix index 993606d39c0..c480c7a8e2f 100644 --- a/pkgs/applications/misc/taizen/default.nix +++ b/pkgs/applications/misc/taizen/default.nix @@ -1,4 +1,4 @@ -{ rustPlatform, lib, fetchFromGitHub, ncurses, openssl, pkgconfig, Security, stdenv }: +{ rustPlatform, lib, fetchFromGitHub, ncurses, openssl, pkg-config, Security, stdenv }: rustPlatform.buildRustPackage rec { pname = "taizen"; @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { }; buildInputs = [ ncurses openssl ] ++ lib.optional stdenv.isDarwin Security; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; cargoSha256 = "0chrgwm97y1a3gj218x25yqk1y1h74a6gzyxjdm023msvs58nkni"; diff --git a/pkgs/applications/misc/taskjuggler/2.x/default.nix b/pkgs/applications/misc/taskjuggler/2.x/default.nix index a1d04a13af8..0235c8af7c5 100644 --- a/pkgs/applications/misc/taskjuggler/2.x/default.nix +++ b/pkgs/applications/misc/taskjuggler/2.x/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.taskjuggler.org"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; description = "Project management tool"; longDescription = '' TaskJuggler is a modern and powerful, Open Source project management diff --git a/pkgs/applications/misc/taskjuggler/gemset.nix b/pkgs/applications/misc/taskjuggler/gemset.nix index fcf607de815..c22d49c7dc7 100644 --- a/pkgs/applications/misc/taskjuggler/gemset.nix +++ b/pkgs/applications/misc/taskjuggler/gemset.nix @@ -52,4 +52,4 @@ }; version = "1.20.2"; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/misc/taskopen/default.nix b/pkgs/applications/misc/taskopen/default.nix index 3632a282f7d..8933faf5fb0 100644 --- a/pkgs/applications/misc/taskopen/default.nix +++ b/pkgs/applications/misc/taskopen/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { description = "Script for taking notes and open urls with taskwarrior"; homepage = "https://github.com/ValiValpas/taskopen"; platforms = platforms.linux; - license = stdenv.lib.licenses.free ; + license = lib.licenses.free ; maintainers = [ maintainers.winpat ]; }; } diff --git a/pkgs/applications/misc/taskwarrior-tui/default.nix b/pkgs/applications/misc/taskwarrior-tui/default.nix index ae730d597ce..1a97f6c0feb 100644 --- a/pkgs/applications/misc/taskwarrior-tui/default.nix +++ b/pkgs/applications/misc/taskwarrior-tui/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , rustPlatform , fetchFromGitHub }: diff --git a/pkgs/applications/misc/termdown/default.nix b/pkgs/applications/misc/termdown/default.nix index d8bb03138f3..562a0f0bdcb 100644 --- a/pkgs/applications/misc/termdown/default.nix +++ b/pkgs/applications/misc/termdown/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , buildPythonApplication , click diff --git a/pkgs/applications/misc/terminal-parrot/default.nix b/pkgs/applications/misc/terminal-parrot/default.nix index e3e64cfd68a..b44b4bd0a70 100644 --- a/pkgs/applications/misc/terminal-parrot/default.nix +++ b/pkgs/applications/misc/terminal-parrot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "terminal-parrot"; diff --git a/pkgs/applications/misc/terminal-typeracer/default.nix b/pkgs/applications/misc/terminal-typeracer/default.nix index 9b7adac9a2a..7a19b2923da 100644 --- a/pkgs/applications/misc/terminal-typeracer/default.nix +++ b/pkgs/applications/misc/terminal-typeracer/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "VSwku0rtQECirCHx2CXe72gCA+p3DdPC4YYwEYu8WfM="; - buildInputs = [ openssl sqlite ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = [ openssl sqlite ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; nativeBuildInputs = [ pkg-config ]; meta = with lib; { diff --git a/pkgs/applications/misc/termpdf.py/default.nix b/pkgs/applications/misc/termpdf.py/default.nix index 2541a17fc20..95937ea5f2e 100644 --- a/pkgs/applications/misc/termpdf.py/default.nix +++ b/pkgs/applications/misc/termpdf.py/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonApplication , fetchFromGitHub , fetchPypi diff --git a/pkgs/applications/misc/teseq/default.nix b/pkgs/applications/misc/teseq/default.nix index 1ba22911c51..c07cc39f84e 100644 --- a/pkgs/applications/misc/teseq/default.nix +++ b/pkgs/applications/misc/teseq/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: let version = "1.1.1"; @@ -15,9 +15,9 @@ stdenv.mkDerivation { meta = { homepage = "https://www.gnu.org/software/teseq/"; description = "Escape sequence illuminator"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.vaibhavsagar ]; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.vaibhavsagar ]; }; } diff --git a/pkgs/applications/misc/tickrs/default.nix b/pkgs/applications/misc/tickrs/default.nix index ced50748d0f..856fa60d8e6 100644 --- a/pkgs/applications/misc/tickrs/default.nix +++ b/pkgs/applications/misc/tickrs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, perl }: +{ lib, rustPlatform, fetchFromGitHub, perl }: rustPlatform.buildRustPackage rec { pname = "tickrs"; diff --git a/pkgs/applications/misc/tipp10/default.nix b/pkgs/applications/misc/tipp10/default.nix index 0658b43626e..3333760a759 100644 --- a/pkgs/applications/misc/tipp10/default.nix +++ b/pkgs/applications/misc/tipp10/default.nix @@ -1,4 +1,4 @@ -{ cmake, lib, stdenv, mkDerivation, fetchFromGitLab, +{ cmake, lib, mkDerivation, fetchFromGitLab, qtmultimedia, qttools, ... }: mkDerivation rec { diff --git a/pkgs/applications/misc/todiff/default.nix b/pkgs/applications/misc/todiff/default.nix index bc172c9b49f..069a63fb66b 100644 --- a/pkgs/applications/misc/todiff/default.nix +++ b/pkgs/applications/misc/todiff/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "todiff"; diff --git a/pkgs/applications/misc/todolist/default.nix b/pkgs/applications/misc/todolist/default.nix deleted file mode 100644 index e678da0a436..00000000000 --- a/pkgs/applications/misc/todolist/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - pname = "todolist"; - version = "v0.8.1"; - - goPackagePath = "github.com/gammons/todolist"; - - src = fetchFromGitHub { - owner = "gammons"; - repo = "todolist"; - rev = version; - sha256 = "0dazfymby5xm4482p9cyj23djmkz5q7g79cqm2d85mczvz7vks8p"; - }; - - meta = with lib; { - description = "Simple GTD-style todo list for the command line"; - homepage = "http://todolist.site"; - license = licenses.mit; - maintainers = with maintainers; [ uvnikita ]; - }; -} diff --git a/pkgs/applications/misc/toggldesktop/default.nix b/pkgs/applications/misc/toggldesktop/default.nix index eb49853885b..44c46f74655 100644 --- a/pkgs/applications/misc/toggldesktop/default.nix +++ b/pkgs/applications/misc/toggldesktop/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchzip, buildEnv, makeDesktopItem, runCommand, writeText, pkgconfig +{ mkDerivation, lib, fetchzip, buildEnv, makeDesktopItem, runCommand, writeText, pkg-config , cmake, qmake, cacert, jsoncpp, libX11, libXScrnSaver, lua, openssl, poco , qtbase, qtwebengine, qtx11extras, sqlite }: @@ -68,7 +68,7 @@ let sourceRoot = "source/src"; - nativeBuildInputs = [ qmake pkgconfig ]; + nativeBuildInputs = [ qmake pkg-config ]; buildInputs = [ jsoncpp lua openssl poco poco-pc-wrapped sqlite libX11 ]; postPatch = '' @@ -93,7 +93,7 @@ let ln -s ${cacert}/etc/ssl/certs/ca-bundle.crt $out/cacert.pem ''; - nativeBuildInputs = [ qmake pkgconfig ]; + nativeBuildInputs = [ qmake pkg-config ]; buildInputs = [ bugsnag-qt diff --git a/pkgs/applications/misc/tomboy/default.nix b/pkgs/applications/misc/tomboy/default.nix index b87d52fa628..5aaec7a1e60 100644 --- a/pkgs/applications/misc/tomboy/default.nix +++ b/pkgs/applications/misc/tomboy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, itstool, intltool, pkgconfig +{ stdenv, fetchurl, itstool, intltool, pkg-config , libxml2, gnome2, atk, gtk2, glib , mono, mono-addins, dbus-sharp-2_0, dbus-sharp-glib-2_0, gnome-sharp, gtk-sharp-2_0 , makeWrapper, lib}: @@ -16,7 +16,7 @@ stdenv.mkDerivation { sha256 = "0j5jmd079bm2fydqaic5ymbfdxna3qlx6fkp2mqhgcdr7prsbl3q"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ itstool intltool libxml2 gnome2.GConf atk gtk2 mono mono-addins dbus-sharp-2_0 dbus-sharp-glib-2_0 gnome-sharp gtk-sharp-2_0 @@ -37,7 +37,7 @@ stdenv.mkDerivation { homepage = "https://wiki.gnome.org/Apps/Tomboy"; description = "A simple note-taking application with synchronization"; platforms = platforms.linux; - license = stdenv.lib.licenses.lgpl2; + license = lib.licenses.lgpl2; maintainers = with maintainers; [ stesie ]; }; } diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix index d992d9cdc41..2a322b20881 100644 --- a/pkgs/applications/misc/toot/default.nix +++ b/pkgs/applications/misc/toot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { version = "0.27.0"; diff --git a/pkgs/applications/misc/tootle/default.nix b/pkgs/applications/misc/tootle/default.nix index 70568f92383..3b9b09aaba9 100644 --- a/pkgs/applications/misc/tootle/default.nix +++ b/pkgs/applications/misc/tootle/default.nix @@ -5,7 +5,7 @@ , vala , meson , ninja -, pkgconfig +, pkg-config , python3 , libgee , gsettings-desktop-schemas @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/applications/misc/topydo/default.nix b/pkgs/applications/misc/topydo/default.nix index 4ff3090d1f8..3ea3511308b 100644 --- a/pkgs/applications/misc/topydo/default.nix +++ b/pkgs/applications/misc/topydo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub, glibcLocales }: +{ lib, python3Packages, fetchFromGitHub, glibcLocales }: with python3Packages; diff --git a/pkgs/applications/misc/tpmmanager/default.nix b/pkgs/applications/misc/tpmmanager/default.nix index 2bbb95d01ae..37d44d8bf16 100644 --- a/pkgs/applications/misc/tpmmanager/default.nix +++ b/pkgs/applications/misc/tpmmanager/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, qt4, qmake4Hook, trousers }: +{ lib, stdenv, fetchgit, qt4, qmake4Hook, trousers }: stdenv.mkDerivation rec { version = "0.8.1"; @@ -33,9 +33,9 @@ stdenv.mkDerivation rec { meta = { homepage = "https://projects.sirrix.com/trac/tpmmanager"; description = "Tool for managing the TPM"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ tstrobel ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ tstrobel ]; + platforms = with lib.platforms; linux; inherit version; }; } diff --git a/pkgs/applications/misc/translate-shell/default.nix b/pkgs/applications/misc/translate-shell/default.nix index 94dc4656027..03ed031be85 100644 --- a/pkgs/applications/misc/translate-shell/default.nix +++ b/pkgs/applications/misc/translate-shell/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/trans \ - --prefix PATH : ${stdenv.lib.makeBinPath [ + --prefix PATH : ${lib.makeBinPath [ gawk curl ncurses diff --git a/pkgs/applications/misc/tty-share/default.nix b/pkgs/applications/misc/tty-share/default.nix index be9a0bafcc6..a402a669fbe 100644 --- a/pkgs/applications/misc/tty-share/default.nix +++ b/pkgs/applications/misc/tty-share/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: # Upstream has a `./vendor` directory with all deps which we rely upon. buildGoPackage rec { diff --git a/pkgs/applications/misc/tut/default.nix b/pkgs/applications/misc/tut/default.nix index 1fa3e9b7883..893f901044a 100644 --- a/pkgs/applications/misc/tut/default.nix +++ b/pkgs/applications/misc/tut/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "tut"; diff --git a/pkgs/applications/misc/twmn/default.nix b/pkgs/applications/misc/twmn/default.nix index 69f58b828c4..b7974966be4 100644 --- a/pkgs/applications/misc/twmn/default.nix +++ b/pkgs/applications/misc/twmn/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchFromGitHub, qtbase, qtx11extras, qmake, pkgconfig, boost }: +{ lib, mkDerivation, fetchFromGitHub, qtbase, qtx11extras, qmake, pkg-config, boost }: mkDerivation { name = "twmn-git-2018-10-01"; @@ -10,7 +10,7 @@ mkDerivation { sha256 = "0mpjvp800x07lp9i3hfcc5f4bqj1fj4w3dyr0zwaxc6wqmm0fdqz"; }; - nativeBuildInputs = [ pkgconfig qmake ]; + nativeBuildInputs = [ pkg-config qmake ]; buildInputs = [ qtbase qtx11extras boost ]; postPatch = '' diff --git a/pkgs/applications/misc/tzupdate/default.nix b/pkgs/applications/misc/tzupdate/default.nix index 3873f8d248e..f6416f0f352 100644 --- a/pkgs/applications/misc/tzupdate/default.nix +++ b/pkgs/applications/misc/tzupdate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3 }: +{ lib, python3 }: let inherit (python3.pkgs) buildPythonApplication fetchPypi requests; diff --git a/pkgs/applications/misc/udevil/default.nix b/pkgs/applications/misc/udevil/default.nix index 8e01f73f967..e83a5e9a2c7 100644 --- a/pkgs/applications/misc/udevil/default.nix +++ b/pkgs/applications/misc/udevil/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, intltool, glib, pkgconfig, udev, util-linux, acl }: +{ lib, stdenv, fetchurl, intltool, glib, pkg-config, udev, util-linux, acl }: stdenv.mkDerivation { name = "udevil-0.4.4"; src = fetchurl { url = "https://github.com/IgnorantGuru/udevil/archive/0.4.4.tar.gz"; sha256 = "0z1bhaayambrcn7bgnrqk445k50ifabmw8q4i9qj49nnbcvxhbxd"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ intltool glib udev ]; configurePhase = '' substituteInPlace src/Makefile.in --replace "-o root -g root" "" @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { description = "A command line Linux program which mounts and unmounts removable devices without a password, shows device info, and monitors device changes"; homepage = "https://ignorantguru.github.io/udevil/"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl3; + platforms = lib.platforms.linux; + license = lib.licenses.gpl3; }; } diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix index e2178850da1..87c49a19a19 100644 --- a/pkgs/applications/misc/udiskie/default.nix +++ b/pkgs/applications/misc/udiskie/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, asciidoc-full, gettext +{ lib, fetchFromGitHub, asciidoc-full, gettext , gobject-introspection, gtk3, libappindicator-gtk3, libnotify, librsvg , udisks2, wrapGAppsHook , python3Packages diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix index 117d9dc6aa7..989649ec414 100644 --- a/pkgs/applications/misc/ulauncher/default.nix +++ b/pkgs/applications/misc/ulauncher/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchurl , nix-update-script , python3Packages @@ -100,7 +100,7 @@ python3Packages.buildPythonApplication rec { ''; preFixup = '' - gappsWrapperArgs+=(--prefix PATH : "${stdenv.lib.makeBinPath [ wmctrl ]}") + gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ wmctrl ]}") ''; passthru = { diff --git a/pkgs/applications/misc/ultralist/default.nix b/pkgs/applications/misc/ultralist/default.nix new file mode 100644 index 00000000000..2943fe29f4a --- /dev/null +++ b/pkgs/applications/misc/ultralist/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "ultralist"; + version = "1.5.1"; + + src = fetchFromGitHub { + owner = "ultralist"; + repo = "ultralist"; + rev = version; + sha256 = "09kgf83jn5k35lyrnyzbsy0l1livzmy292qmlbx5dkdpaq5wxnmp"; + }; + + vendorSha256 = null; + + meta = with lib; { + description = "Simple GTD-style todo list for the command line"; + homepage = "https://ultralist.io"; + license = licenses.mit; + maintainers = with maintainers; [ uvnikita ]; + }; +} diff --git a/pkgs/applications/misc/upwork/default.nix b/pkgs/applications/misc/upwork/default.nix index 136c4c2745a..36fd4047761 100644 --- a/pkgs/applications/misc/upwork/default.nix +++ b/pkgs/applications/misc/upwork/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { libXtst nspr nss libxcb pango systemd libXScrnSaver ]; - libPath = stdenv.lib.makeLibraryPath buildInputs; + libPath = lib.makeLibraryPath buildInputs; unpackPhase = '' dpkg-deb -x ${src} ./ diff --git a/pkgs/applications/misc/urlscan/default.nix b/pkgs/applications/misc/urlscan/default.nix index 3e97088371a..a56a09a8e34 100644 --- a/pkgs/applications/misc/urlscan/default.nix +++ b/pkgs/applications/misc/urlscan/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub }: python3Packages.buildPythonApplication rec { pname = "urlscan"; diff --git a/pkgs/applications/misc/valentina/default.nix b/pkgs/applications/misc/valentina/default.nix index e9e8cfed796..7329d8204cd 100644 --- a/pkgs/applications/misc/valentina/default.nix +++ b/pkgs/applications/misc/valentina/default.nix @@ -1,10 +1,10 @@ -{ mkDerivation, stdenv, fetchhg +{ mkDerivation, lib, fetchhg , qmake, qttools , qtbase, qtsvg, qtxmlpatterns , poppler_utils }: -with stdenv.lib; +with lib; mkDerivation rec { pname = "valentina"; diff --git a/pkgs/applications/misc/veracrypt/default.nix b/pkgs/applications/misc/veracrypt/default.nix index 07e0a046ac5..15bda9d5f97 100644 --- a/pkgs/applications/misc/veracrypt/default.nix +++ b/pkgs/applications/misc/veracrypt/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, makeself, yasm, fuse, wxGTK, lvm2 }: +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, makeself, yasm, fuse, wxGTK, lvm2 }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "veracrypt"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { sourceRoot = "src"; - nativeBuildInputs = [ makeself pkgconfig yasm ]; + nativeBuildInputs = [ makeself pkg-config yasm ]; buildInputs = [ fuse lvm2 wxGTK ]; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/verbiste/default.nix b/pkgs/applications/misc/verbiste/default.nix index be354d60dc4..9f27f8e73d7 100644 --- a/pkgs/applications/misc/verbiste/default.nix +++ b/pkgs/applications/misc/verbiste/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libgnomeui, libxml2 }: +{ lib, stdenv, fetchurl, pkg-config, libgnomeui, libxml2 }: stdenv.mkDerivation rec { pname = "verbiste"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "02kzin3pky2q2jnihrch8y0hy043kqqmzxq8j741x80kl0j1qxkm"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libgnomeui libxml2 ]; diff --git a/pkgs/applications/misc/vifm/default.nix b/pkgs/applications/misc/vifm/default.nix index 64f0f6b7f5f..18d190a9dd6 100644 --- a/pkgs/applications/misc/vifm/default.nix +++ b/pkgs/applications/misc/vifm/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, makeWrapper -, pkgconfig +, pkg-config , ncurses, libX11 , util-linux, file, which, groff @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { sha256 = "0rqyd424y0g5b5basw2ybb60r9gar4f40d1xgzr3c2dsy4jpwvyh"; }; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ ncurses libX11 util-linux file which groff ]; postFixup = let @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { ''; meta = with lib; { - description = ''A vi-like file manager${if isFullPackage then "; Includes support for optional features" else ""}''; + description = "A vi-like file manager${if isFullPackage then "; Includes support for optional features" else ""}"; maintainers = with maintainers; [ raskin ]; platforms = if mediaSupport then platforms.linux else platforms.unix; license = licenses.gpl2; diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix index 4e002d92ec5..61ebfb0fcc6 100644 --- a/pkgs/applications/misc/viking/default.nix +++ b/pkgs/applications/misc/viking/default.nix @@ -1,5 +1,5 @@ { fetchurl, fetchpatch, lib, stdenv, makeWrapper -, pkgconfig, intltool, gettext, gtk2, expat, curl +, pkg-config, intltool, gettext, gtk2, expat, curl , gpsd, bc, file, gnome-doc-utils, libexif, libxml2, libxslt, scrollkeeper , docbook_xml_dtd_412, gexiv2, gpsbabel, expect , withMapnik ? false, mapnik @@ -25,22 +25,22 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ makeWrapper intltool gettext gtk2 expat curl gpsd bc file gnome-doc-utils libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 gexiv2 - ] ++ stdenv.lib.optional withMapnik mapnik - ++ stdenv.lib.optional withGeoClue geoclue2 - ++ stdenv.lib.optional withMd5Hash nettle - ++ stdenv.lib.optional withOAuth liboauth - ++ stdenv.lib.optional withMBTiles sqlite; + ] ++ lib.optional withMapnik mapnik + ++ lib.optional withGeoClue geoclue2 + ++ lib.optional withMd5Hash nettle + ++ lib.optional withOAuth liboauth + ++ lib.optional withMBTiles sqlite; configureFlags = [ "--disable-scrollkeeper" - (stdenv.lib.enableFeature withMapnik "mapnik") - (stdenv.lib.enableFeature withGeoClue "geoclue") - (stdenv.lib.enableFeature withMd5Hash "nettle") - (stdenv.lib.enableFeature withOAuth "oauth") - (stdenv.lib.enableFeature withMBTiles "mbtiles") + (lib.enableFeature withMapnik "mapnik") + (lib.enableFeature withGeoClue "geoclue") + (lib.enableFeature withMd5Hash "nettle") + (lib.enableFeature withOAuth "oauth") + (lib.enableFeature withMBTiles "mbtiles") ]; preBuild = '' diff --git a/pkgs/applications/misc/volnoti/default.nix b/pkgs/applications/misc/volnoti/default.nix index c565bfe0ce3..d70918f2e7c 100644 --- a/pkgs/applications/misc/volnoti/default.nix +++ b/pkgs/applications/misc/volnoti/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchpatch -, pkgconfig, dbus, gdk-pixbuf, glib, libX11, gtk2, librsvg +, pkg-config, dbus, gdk-pixbuf, glib, libX11, gtk2, librsvg , dbus-glib, autoreconfHook, wrapGAppsHook }: stdenv.mkDerivation { @@ -22,7 +22,7 @@ stdenv.mkDerivation { }) ]; - nativeBuildInputs = [ pkgconfig autoreconfHook wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook wrapGAppsHook ]; buildInputs = [ dbus gdk-pixbuf glib libX11 gtk2 dbus-glib librsvg diff --git a/pkgs/applications/misc/vue/default.nix b/pkgs/applications/misc/vue/default.nix index d6404ca6596..13b09865c6a 100644 --- a/pkgs/applications/misc/vue/default.nix +++ b/pkgs/applications/misc/vue/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, runtimeShell }: +{ lib, stdenv, fetchurl, jre, runtimeShell }: stdenv.mkDerivation rec { pname = "vue"; @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { meta = { description = "Visual Understanding Environment - mind mapping software"; - maintainers = with stdenv.lib.maintainers; [ raskin ]; - platforms = with stdenv.lib.platforms; linux; - license = stdenv.lib.licenses.free; # Apache License fork, actually + maintainers = with lib.maintainers; [ raskin ]; + platforms = with lib.platforms; linux; + license = lib.licenses.free; # Apache License fork, actually }; } diff --git a/pkgs/applications/misc/vym/default.nix b/pkgs/applications/misc/vym/default.nix index d198a15c252..9d820fc4da7 100644 --- a/pkgs/applications/misc/vym/default.nix +++ b/pkgs/applications/misc/vym/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchurl, pkgconfig, qmake, qtscript, qtsvg }: +{ lib, mkDerivation, fetchurl, pkg-config, qmake, qtscript, qtsvg }: mkDerivation rec { pname = "vym"; @@ -32,7 +32,7 @@ mkDerivation rec { hardeningDisable = [ "format" ]; - nativeBuildInputs = [ pkgconfig qmake ]; + nativeBuildInputs = [ pkg-config qmake ]; buildInputs = [ qtscript qtsvg ]; postInstall = '' diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index 3bb96d7a757..8dd18de5d89 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -1,8 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, meson, pkgconfig, ninja, wrapGAppsHook +{ lib, stdenv, fetchFromGitHub, meson, pkg-config, ninja, wrapGAppsHook , wayland, wlroots, gtkmm3, libsigcxx, jsoncpp, fmt, scdoc, spdlog, gtk-layer-shell , howard-hinnant-date, cmake , traySupport ? true, libdbusmenu-gtk3 , pulseSupport ? true, libpulseaudio +, sndioSupport ? true, sndio , nlSupport ? true, libnl , udevSupport ? true, udev , swaySupport ? true, sway @@ -11,40 +12,42 @@ }: stdenv.mkDerivation rec { pname = "waybar"; - version = "0.9.4"; + version = "0.9.5"; src = fetchFromGitHub { owner = "Alexays"; repo = "Waybar"; rev = version; - sha256 = "038vnma7y7z81caywp45yr364bc1aq8d01j5vycyiyfv33nm76fy"; + sha256 = "1kzrgqaclfk6gcwhknxn28xl74gm5swipgn8kk8avacb4nsw1l9q"; }; nativeBuildInputs = [ - meson ninja pkgconfig scdoc wrapGAppsHook cmake - ] ++ stdenv.lib.optional withMediaPlayer gobject-introspection; + meson ninja pkg-config scdoc wrapGAppsHook cmake + ] ++ lib.optional withMediaPlayer gobject-introspection; - propagatedBuildInputs = stdenv.lib.optionals withMediaPlayer [ + propagatedBuildInputs = lib.optionals withMediaPlayer [ glib playerctl python38Packages.pygobject3 ]; strictDeps = false; - buildInputs = with stdenv.lib; + buildInputs = with lib; [ wayland wlroots gtkmm3 libsigcxx jsoncpp fmt spdlog gtk-layer-shell howard-hinnant-date ] ++ optional traySupport libdbusmenu-gtk3 ++ optional pulseSupport libpulseaudio + ++ optional sndioSupport sndio ++ optional nlSupport libnl ++ optional udevSupport udev ++ optional swaySupport sway ++ optional mpdSupport mpd_clientlib; - mesonFlags = (stdenv.lib.mapAttrsToList + mesonFlags = (lib.mapAttrsToList (option: enable: "-D${option}=${if enable then "enabled" else "disabled"}") { dbusmenu-gtk = traySupport; pulseaudio = pulseSupport; + sndio = sndioSupport; libnl = nlSupport; libudev = udevSupport; mpd = mpdSupport; @@ -54,7 +57,7 @@ "-Dsystemd=disabled" ]; - preFixup = stdenv.lib.optional withMediaPlayer '' + preFixup = lib.optional withMediaPlayer '' cp $src/resources/custom_modules/mediaplayer.py $out/bin/waybar-mediaplayer.py wrapProgram $out/bin/waybar-mediaplayer.py \ diff --git a/pkgs/applications/misc/web-media-controller/default.nix b/pkgs/applications/misc/web-media-controller/default.nix index ccd1e229902..7e0fbb999f5 100644 --- a/pkgs/applications/misc/web-media-controller/default.nix +++ b/pkgs/applications/misc/web-media-controller/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, glib, pcre, json-glib }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, glib, pcre, json-glib }: stdenv.mkDerivation rec { pname = "wmc-mpris"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1zcnaf9g55cbj9d2zlsr0i15qh0w9gp5jmxkm6dcp1j6yd7j3ymc"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ glib pcre json-glib ]; cmakeFlags = [ "-DCHROMIUM_MANIFEST_DESTINATION=${placeholder "out"}/etc/chromium/native-messaging-hosts" diff --git a/pkgs/applications/misc/wego/default.nix b/pkgs/applications/misc/wego/default.nix index 0dc13e290f5..4bbd0289a15 100644 --- a/pkgs/applications/misc/wego/default.nix +++ b/pkgs/applications/misc/wego/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "wego"; @@ -16,7 +16,7 @@ buildGoPackage rec { goDeps = ./deps.nix; meta = { - license = stdenv.lib.licenses.isc; + license = lib.licenses.isc; homepage = "https://github.com/schachmat/wego"; description = "Weather app for the terminal"; }; diff --git a/pkgs/applications/misc/wikicurses/default.nix b/pkgs/applications/misc/wikicurses/default.nix index e528dab0c9f..ec7dff14143 100644 --- a/pkgs/applications/misc/wikicurses/default.nix +++ b/pkgs/applications/misc/wikicurses/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pythonPackages }: +{ lib, fetchFromGitHub, pythonPackages }: pythonPackages.buildPythonApplication rec { version = "1.4"; @@ -26,9 +26,9 @@ pythonPackages.buildPythonApplication rec { meta = { description = "A simple curses interface for MediaWiki sites such as Wikipedia"; homepage = "https://github.com/ids1024/wikicurses/"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ pSub ]; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ pSub ]; }; } diff --git a/pkgs/applications/misc/with-shell/default.nix b/pkgs/applications/misc/with-shell/default.nix index d3b5541ac4d..daf697c1661 100644 --- a/pkgs/applications/misc/with-shell/default.nix +++ b/pkgs/applications/misc/with-shell/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { name = "with-2016-08-20"; src = fetchFromGitHub { @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/mchav/With"; description = "Command prefixing for continuous workflow using a single tool"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/misc/wmname/default.nix b/pkgs/applications/misc/wmname/default.nix index 8e760b787b4..d501869770e 100644 --- a/pkgs/applications/misc/wmname/default.nix +++ b/pkgs/applications/misc/wmname/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11 }: +{ lib, stdenv, fetchurl, libX11 }: stdenv.mkDerivation rec { name = "wmname-0.1"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "Prints or set the window manager name property of the root window"; homepage = "https://tools.suckless.org/wmname"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.mit; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/misc/wordnet/default.nix b/pkgs/applications/misc/wordnet/default.nix index f681923978b..32c1f0eaa64 100644 --- a/pkgs/applications/misc/wordnet/default.nix +++ b/pkgs/applications/misc/wordnet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, tcl, tk, Cocoa, xlibsWrapper, makeWrapper }: +{ lib, stdenv, fetchurl, tcl, tk, Cocoa, xlibsWrapper, makeWrapper }: stdenv.mkDerivation rec { version = "3.0"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ tcl tk xlibsWrapper makeWrapper ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ]; + ++ lib.optionals stdenv.isDarwin [ Cocoa ]; hardeningDisable = [ "format" ]; @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { url = "https://wordnet.princeton.edu/license-and-commercial-use"; }; maintainers = [ ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/applications/misc/workrave/default.nix index aa769e7d8ee..6b63fde222f 100644 --- a/pkgs/applications/misc/workrave/default.nix +++ b/pkgs/applications/misc/workrave/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, wrapGAppsHook -, autoconf, autoconf-archive, automake, gettext, intltool, libtool, pkgconfig +, autoconf, autoconf-archive, automake, gettext, intltool, libtool, pkg-config , libICE, libSM, libXScrnSaver, libXtst, cheetah , gobject-introspection, glib, glibmm, gtkmm3, atk, pango, pangomm, cairo , cairomm , dbus, dbus-glib, gdome2, gstreamer, gst-plugins-base @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { sha256 = "0v2mx2idaxlsyv5w66b7pknlill9j9i2gqcs3vq54gak7ix9fj1p"; - rev = with stdenv.lib; + rev = with lib; "v" + concatStringsSep "_" (splitVersion version); repo = "workrave"; owner = "rcaelers"; }; nativeBuildInputs = [ - autoconf autoconf-archive automake gettext intltool libtool pkgconfig wrapGAppsHook + autoconf autoconf-archive automake gettext intltool libtool pkg-config wrapGAppsHook ]; buildInputs = [ libICE libSM libXScrnSaver libXtst cheetah diff --git a/pkgs/applications/misc/xautoclick/default.nix b/pkgs/applications/misc/xautoclick/default.nix index 641d3b4e20c..3429e80f054 100644 --- a/pkgs/applications/misc/xautoclick/default.nix +++ b/pkgs/applications/misc/xautoclick/default.nix @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libevdev xorg.libXtst ] - ++ stdenv.lib.optionals gtkSupport [ gtk3 pcre glib wrapGAppsHook ] - ++ stdenv.lib.optionals fltkSupport [ fltk ] - ++ stdenv.lib.optionals qtSupport [ qt5.qtbase qt5.wrapQtAppsHook ]; + ++ lib.optionals gtkSupport [ gtk3 pcre glib wrapGAppsHook ] + ++ lib.optionals fltkSupport [ fltk ] + ++ lib.optionals qtSupport [ qt5.qtbase qt5.wrapQtAppsHook ]; meta = with lib; { description = "Autoclicker application, which enables you to automatically click the left mousebutton"; diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix index bf6b37b1028..9e05e09caef 100644 --- a/pkgs/applications/misc/xca/default.nix +++ b/pkgs/applications/misc/xca/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, autoreconfHook, perl, pkgconfig +{ mkDerivation, lib, fetchFromGitHub, autoreconfHook, perl, pkg-config , libtool, openssl, qtbase, qttools }: mkDerivation rec { @@ -19,7 +19,7 @@ mkDerivation rec { buildInputs = [ libtool openssl qtbase ]; - nativeBuildInputs = [ autoreconfHook pkgconfig qttools ]; + nativeBuildInputs = [ autoreconfHook pkg-config qttools ]; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/xdgmenumaker/default.nix b/pkgs/applications/misc/xdgmenumaker/default.nix index c1af7ae373c..00ae2df100e 100644 --- a/pkgs/applications/misc/xdgmenumaker/default.nix +++ b/pkgs/applications/misc/xdgmenumaker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, txt2tags, python3Packages, glib, gobject-introspection, wrapGAppsHook }: +{ lib, fetchFromGitHub, txt2tags, python3Packages, glib, gobject-introspection, wrapGAppsHook }: python3Packages.buildPythonApplication rec { pname = "xdgmenumaker"; diff --git a/pkgs/applications/misc/xfe/default.nix b/pkgs/applications/misc/xfe/default.nix index 29a20e0ece2..17e58cb54d7 100644 --- a/pkgs/applications/misc/xfe/default.nix +++ b/pkgs/applications/misc/xfe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fox, pkgconfig, gettext, xlibsWrapper, gcc, intltool, file, libpng }: +{ lib, stdenv, fetchurl, fox, pkg-config, gettext, xlibsWrapper, gcc, intltool, file, libpng }: stdenv.mkDerivation rec { name = "xfe-1.42"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1v1v0vcbnm30kpyd3rj8f56yh7lfnwy7nbs9785wi229b29fiqx1"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ fox gettext xlibsWrapper gcc intltool file libpng ]; preConfigure = '' @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { Xfe aims to be the filemanager of choice for all the Unix addicts! ''; homepage = "https://sourceforge.net/projects/xfe/"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; maintainers = []; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/xfontsel/default.nix b/pkgs/applications/misc/xfontsel/default.nix index c61e64a8a3a..10034fbe1b1 100644 --- a/pkgs/applications/misc/xfontsel/default.nix +++ b/pkgs/applications/misc/xfontsel/default.nix @@ -2,7 +2,7 @@ # at https://www.x.org/releases/individual/. # That is why this expression is not inside pkgs.xorg -{stdenv, fetchurl, makeWrapper, libX11, pkgconfig, libXaw}: +{lib, stdenv, fetchurl, makeWrapper, libX11, pkg-config, libXaw}: stdenv.mkDerivation rec { name = "xfontsel-1.0.6"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0700lf6hx7dg88wq1yll7zjvf9gbwh06xff20yffkxb289y0pai5"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [libX11 makeWrapper libXaw]; # Without this, it gets Xmu as a dependency, but without rpath entry @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.x.org/"; description = "Allows testing the fonts available in an X server"; - license = stdenv.lib.licenses.free; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = lib.licenses.free; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/misc/xiphos/default.nix b/pkgs/applications/misc/xiphos/default.nix index efdd7f2b0f1..01706011e2d 100644 --- a/pkgs/applications/misc/xiphos/default.nix +++ b/pkgs/applications/misc/xiphos/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig +{ lib, stdenv, fetchFromGitHub, pkg-config , python , intltool , docbook2x, docbook_xml_dtd_412, libxslt @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { sha256 = "14il9k4i58qbc78hcadw3gqy21sb9q661d75vlj6fwpczbzj7x1a"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook wafHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook wafHook ]; buildInputs = [ python intltool docbook2x docbook_xml_dtd_412 libxslt sword clucene_core biblesync gnome-doc-utils libgsf gconf gtkhtml libglade scrollkeeper webkitgtk dbus-glib enchant isocodes libuuid icu ]; diff --git a/pkgs/applications/misc/xmenu/default.nix b/pkgs/applications/misc/xmenu/default.nix index f29bfcb55fe..c6a37caf34d 100644 --- a/pkgs/applications/misc/xmenu/default.nix +++ b/pkgs/applications/misc/xmenu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "xmenu"; - version = "4.4.1"; + version = "4.5.4"; src = fetchFromGitHub { owner = "phillbush"; repo = "xmenu"; rev = "v${version}"; - sha256 = "1s70zvsaqnsjqs298vw3py0vcvia68xlks1wcz37pb88bwligz1x"; + sha256 = "1dy3aqqczs7d3f8rf6h7xssgr3881g8m5y4waskizjy9z7chs64q"; }; buildInputs = [ imlib2 libX11 libXft libXinerama ]; diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/applications/misc/xneur/default.nix index 9c3795ef394..bb4e1727f69 100644 --- a/pkgs/applications/misc/xneur/default.nix +++ b/pkgs/applications/misc/xneur/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, intltool, xorg, pcre, gst_all_1, glib +{ lib, stdenv, fetchurl, pkg-config, intltool, xorg, pcre, gst_all_1, glib , xosd, libnotify, enchant, wrapGAppsHook, gdk-pixbuf }: stdenv.mkDerivation { @@ -11,7 +11,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ - pkgconfig intltool wrapGAppsHook + pkg-config intltool wrapGAppsHook ]; buildInputs = [ diff --git a/pkgs/applications/misc/xpad/default.nix b/pkgs/applications/misc/xpad/default.nix index acb1cbf90e3..dbb5eb42e1d 100644 --- a/pkgs/applications/misc/xpad/default.nix +++ b/pkgs/applications/misc/xpad/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl -, autoreconfHook, pkgconfig, wrapGAppsHook +, autoreconfHook, pkg-config, wrapGAppsHook , glib, intltool, gtk3, gtksourceview }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1qpmlwn0bcw1q73ag0l0fdnlzmwawfvsy4g9y5b0vyrc58lcp5d3"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ]; buildInputs = [ glib intltool gtk3 gtksourceview ]; diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix index a6fadcf9d2f..cafbcd4b11c 100644 --- a/pkgs/applications/misc/xpdf/default.nix +++ b/pkgs/applications/misc/xpdf/default.nix @@ -22,19 +22,19 @@ stdenv.mkDerivation rec { # Fix "No known features for CXX compiler", see # https://cmake.org/pipermail/cmake/2016-December/064733.html and the note at # https://cmake.org/cmake/help/v3.10/command/cmake_minimum_required.html - patches = stdenv.lib.optional stdenv.isDarwin ./cmake_version.patch; + patches = lib.optional stdenv.isDarwin ./cmake_version.patch; nativeBuildInputs = [ cmake ] - ++ stdenv.lib.optional enableGUI wrapQtAppsHook; + ++ lib.optional enableGUI wrapQtAppsHook; cmakeFlags = ["-DSYSTEM_XPDFRC=/etc/xpdfrc" "-DA4_PAPER=ON" "-DOPI_SUPPORT=ON"] - ++ stdenv.lib.optional (!enablePrinting) "-DXPDFWIDGET_PRINTING=OFF"; + ++ lib.optional (!enablePrinting) "-DXPDFWIDGET_PRINTING=OFF"; buildInputs = [ zlib libpng ] ++ - stdenv.lib.optional enableGUI qtbase ++ - stdenv.lib.optional enablePrinting cups ++ - stdenv.lib.optional enablePDFtoPPM freetype; + lib.optional enableGUI qtbase ++ + lib.optional enablePrinting cups ++ + lib.optional enablePDFtoPPM freetype; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/misc/xrandr-invert-colors/default.nix b/pkgs/applications/misc/xrandr-invert-colors/default.nix index 0d5fbc336ae..f1a0f7b5ba1 100644 --- a/pkgs/applications/misc/xrandr-invert-colors/default.nix +++ b/pkgs/applications/misc/xrandr-invert-colors/default.nix @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Inverts the colors of your screen"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; homepage = "https://github.com/zoltanp/xrandr-invert-colors"; - maintainers = [stdenv.lib.maintainers.magnetophon ]; + maintainers = [lib.maintainers.magnetophon ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/xrq/default.nix b/pkgs/applications/misc/xrq/default.nix index e3db746ee02..e8e6490cbd6 100644 --- a/pkgs/applications/misc/xrq/default.nix +++ b/pkgs/applications/misc/xrq/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchFromGitHub, libX11}: +{ lib, stdenv, fetchFromGitHub, libX11}: stdenv.mkDerivation { name = "xrq-unstable-2016-01-15"; src = fetchFromGitHub { - owner = "arianon"; - repo = "xrq"; + owner = "arianon"; + repo = "xrq"; rev = "d5dc19c63881ebdd1287a02968e3a1447dde14a9"; sha256 = "1bxf6h3fjw3kjraz7028m7p229l423y1ngy88lqvf0xl1g3dhp36"; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { description = "X utility for querying xrdb"; homepage = "https://github.com/arianon/xrq"; - license = stdenv.lib.licenses.mit; - platforms = with stdenv.lib.platforms; unix; + license = lib.licenses.mit; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/applications/misc/xscope/default.nix b/pkgs/applications/misc/xscope/default.nix index d2cc2bf7ad1..ba798a861a8 100644 --- a/pkgs/applications/misc/xscope/default.nix +++ b/pkgs/applications/misc/xscope/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libXt }: +{ lib, stdenv, fetchurl, pkg-config, libXt }: stdenv.mkDerivation rec { pname = "xscope"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "08zl3zghvbcqy0r5dn54dim84lp52s0ygrr87jr3a942a6ypz01k"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libXt ]; meta = with lib; { diff --git a/pkgs/applications/misc/xsuspender/default.nix b/pkgs/applications/misc/xsuspender/default.nix index a5bd8a02ebf..93e56f1df2d 100644 --- a/pkgs/applications/misc/xsuspender/default.nix +++ b/pkgs/applications/misc/xsuspender/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, pkgconfig +{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, pkg-config , glib, libwnck3, procps }: with lib; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" "doc" ]; - nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; + nativeBuildInputs = [ cmake pkg-config makeWrapper ]; buildInputs = [ glib libwnck3 ]; postInstall = '' diff --git a/pkgs/applications/misc/xsw/default.nix b/pkgs/applications/misc/xsw/default.nix index d20489d37f3..a664aec45e1 100644 --- a/pkgs/applications/misc/xsw/default.nix +++ b/pkgs/applications/misc/xsw/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, SDL, SDL_image, SDL_ttf, SDL_gfx, flex, bison }: +{ stdenv, lib, fetchFromGitHub, pkg-config, SDL, SDL_image, SDL_ttf, SDL_gfx, flex, bison }: let makeSDLFlags = map (p: "-I${lib.getDev p}/include/SDL"); @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { sha256 = "092vp61ngd2vscsvyisi7dv6qrk5m1i81gg19hyfl5qvjq5p0p8g"; }; - nativeBuildInputs = [ pkgconfig flex bison ]; + nativeBuildInputs = [ pkg-config flex bison ]; buildInputs = [ SDL SDL_image SDL_ttf SDL_gfx ]; diff --git a/pkgs/applications/misc/xxkb/default.nix b/pkgs/applications/misc/xxkb/default.nix index 64d55322896..7a0111785c1 100644 --- a/pkgs/applications/misc/xxkb/default.nix +++ b/pkgs/applications/misc/xxkb/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, libX11, libXt, libXext, libXpm, imake, gccmakedep -, svgSupport ? false, librsvg, glib, gdk-pixbuf, pkgconfig +{ lib, stdenv, fetchurl, libX11, libXt, libXext, libXpm, imake, gccmakedep +, svgSupport ? false, librsvg, glib, gdk-pixbuf, pkg-config }: assert svgSupport -> - librsvg != null && glib != null && gdk-pixbuf != null && pkgconfig != null; + librsvg != null && glib != null && gdk-pixbuf != null && pkg-config != null; stdenv.mkDerivation rec { name = "xxkb-1.11.1"; @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ imake gccmakedep ]; buildInputs = [ libX11 libXt libXext libXpm - ] ++ stdenv.lib.optionals svgSupport [ librsvg glib gdk-pixbuf pkgconfig ]; + ] ++ lib.optionals svgSupport [ librsvg glib gdk-pixbuf pkg-config ]; outputs = [ "out" "man" ]; - imakeFlags = stdenv.lib.optionalString svgSupport "-DWITH_SVG_SUPPORT"; + imakeFlags = lib.optionalString svgSupport "-DWITH_SVG_SUPPORT"; makeFlags = [ "BINDIR=${placeholder "out"}/bin" @@ -34,8 +34,8 @@ stdenv.mkDerivation rec { meta = { description = "A keyboard layout indicator and switcher"; homepage = "http://xxkb.sourceforge.net/"; - license = stdenv.lib.licenses.artistic2; - maintainers = with stdenv.lib.maintainers; [ rasendubi ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.artistic2; + maintainers = with lib.maintainers; [ rasendubi ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/xygrib/default.nix b/pkgs/applications/misc/xygrib/default.nix index 24f6b22b4e2..68adc2abbf9 100644 --- a/pkgs/applications/misc/xygrib/default.nix +++ b/pkgs/applications/misc/xygrib/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake qttools wrapQtAppsHook ]; buildInputs = [ bzip2 qtbase libnova proj openjpeg libpng ]; cmakeFlags = [ "-DOPENJPEG_INCLUDE_DIR=${openjpeg.dev}/include/openjpeg-2.3" ] - ++ stdenv.lib.optionals stdenv.isDarwin [ "-DLIBNOVA_LIBRARY=${libnova}/lib/libnova.dylib" ]; + ++ lib.optionals stdenv.isDarwin [ "-DLIBNOVA_LIBRARY=${libnova}/lib/libnova.dylib" ]; postInstall = if stdenv.isDarwin then '' mkdir -p "$out/Applications" "$out/XyGrib/XyGrib.app/Contents/Resources" diff --git a/pkgs/applications/misc/yate/default.nix b/pkgs/applications/misc/yate/default.nix index 6c03bbc33b3..3046638ec4a 100644 --- a/pkgs/applications/misc/yate/default.nix +++ b/pkgs/applications/misc/yate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lib, qt4, openssl, pkgconfig }: +{ stdenv, fetchurl, lib, qt4, openssl, pkg-config }: stdenv.mkDerivation rec { pname = "yate"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; # TODO zaptel ? postgres ? - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ qt4 openssl ]; # /dev/null is used when linking which is a impure path for the wrapper diff --git a/pkgs/applications/misc/yokadi/default.nix b/pkgs/applications/misc/yokadi/default.nix index ca329521142..e31a69963ff 100644 --- a/pkgs/applications/misc/yokadi/default.nix +++ b/pkgs/applications/misc/yokadi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, buildPythonApplication, dateutil, +{ lib, fetchurl, buildPythonApplication, dateutil, sqlalchemy, setproctitle, icalendar }: buildPythonApplication rec { diff --git a/pkgs/applications/misc/yubioath-desktop/default.nix b/pkgs/applications/misc/yubioath-desktop/default.nix index 22385262a5d..dbd33db16f9 100644 --- a/pkgs/applications/misc/yubioath-desktop/default.nix +++ b/pkgs/applications/misc/yubioath-desktop/default.nix @@ -39,7 +39,7 @@ mkDerivation rec { --prefix PYTHONPATH : "$program_PYTHONPATH" \ --prefix QML2_IMPORT_PATH : "${pyotherside}/${qtbase.qtQmlPrefix}" \ --prefix LD_PRELOAD : "${yubikey-personalization}/lib/libykpers-1.so" \ - --prefix LD_LIBRARY_PATH : "${stdenv.lib.getLib pcsclite}/lib:${yubikey-personalization}/lib" + --prefix LD_LIBRARY_PATH : "${lib.getLib pcsclite}/lib:${yubikey-personalization}/lib" mkdir -p $out/share/applications cp resources/com.yubico.yubioath.desktop \ @@ -63,7 +63,7 @@ mkDerivation rec { downloadPage = "https://developers.yubico.com/yubioath-desktop/Releases/"; changelog = "https://developers.yubico.com/yubioath-desktop/Release_Notes.html"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; maintainers = with maintainers; [ mic92 risson ]; }; } diff --git a/pkgs/applications/misc/zathura/cb/default.nix b/pkgs/applications/misc/zathura/cb/default.nix index 4e2d16819ba..69ecb1cfd1b 100644 --- a/pkgs/applications/misc/zathura/cb/default.nix +++ b/pkgs/applications/misc/zathura/cb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, meson, ninja, pkgconfig, zathura_core +{ stdenv, lib, fetchurl, meson, ninja, pkg-config, zathura_core , girara, gettext, libarchive }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1i6cf0vks501cggwvfsl6qb7mdaf3sszdymphimfvnspw810faj5"; }; - nativeBuildInputs = [ meson ninja pkgconfig gettext ]; + nativeBuildInputs = [ meson ninja pkg-config gettext ]; buildInputs = [ libarchive zathura_core girara ]; PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 2fc158daf62..5690dc0db10 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, wrapGAppsHook, pkgconfig +{ lib, stdenv, fetchurl, meson, ninja, wrapGAppsHook, pkg-config , appstream-glib, desktop-file-utils, python3 , gtk, girara, gettext, libxml2, check , sqlite, glib, texlive, libintl, libseccomp @@ -6,7 +6,7 @@ , gtk-mac-integration }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "zathura"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ] ++ optional (!stdenv.isLinux) "-Dseccomp=disabled"; nativeBuildInputs = [ - meson ninja pkgconfig desktop-file-utils python3.pkgs.sphinx + meson ninja pkg-config desktop-file-utils python3.pkgs.sphinx gettext wrapGAppsHook libxml2 check appstream-glib ]; diff --git a/pkgs/applications/misc/zathura/djvu/default.nix b/pkgs/applications/misc/zathura/djvu/default.nix index a5ed7ab6781..f0fe0948632 100644 --- a/pkgs/applications/misc/zathura/djvu/default.nix +++ b/pkgs/applications/misc/zathura/djvu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkgconfig, gtk, zathura_core, girara, djvulibre, gettext }: +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gtk, zathura_core, girara, djvulibre, gettext }: stdenv.mkDerivation rec { pname = "zathura-djvu"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0062n236414db7q7pnn3ccg5111ghxj3407pn9ri08skxskgirln"; }; - nativeBuildInputs = [ meson ninja pkgconfig ]; + nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ djvulibre gettext zathura_core gtk girara ]; PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix index 97f36f82847..d787705be15 100644 --- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix +++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix @@ -7,7 +7,7 @@ , libjpeg , mupdf , openjpeg_2 -, pkgconfig +, pkg-config , zathura_core }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { sha256 = "1r3v37k9fl2rxipvacgxr36llywvy7n20a25h3ajlyk70697sa66"; }; - nativeBuildInputs = [ meson ninja pkgconfig ]; + nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ cairo diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/applications/misc/zathura/pdf-poppler/default.nix index bafa293ad9c..b76e72a6970 100644 --- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix +++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, meson, ninja, pkgconfig, zathura_core, girara, poppler }: +{ stdenv, lib, fetchurl, meson, ninja, pkg-config, zathura_core, girara, poppler }: stdenv.mkDerivation rec { pname = "zathura-pdf-poppler"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1vfl4vkyy3rf39r1sqaa7y8113bgkh2bkfq3nn2inis9mrykmk6m"; }; - nativeBuildInputs = [ meson ninja pkgconfig zathura_core ]; + nativeBuildInputs = [ meson ninja pkg-config zathura_core ]; buildInputs = [ poppler girara ]; PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; diff --git a/pkgs/applications/misc/zathura/ps/default.nix b/pkgs/applications/misc/zathura/ps/default.nix index 05cc570eb8f..ee63a9df53b 100644 --- a/pkgs/applications/misc/zathura/ps/default.nix +++ b/pkgs/applications/misc/zathura/ps/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, meson, ninja, pkgconfig, zathura_core, girara, libspectre, gettext }: +{ stdenv, lib, fetchurl, meson, ninja, pkg-config, zathura_core, girara, libspectre, gettext }: stdenv.mkDerivation rec { pname = "zathura-ps"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0wygq89nyjrjnsq7vbpidqdsirjm6iq4w2rijzwpk2f83ys8bc3y"; }; - nativeBuildInputs = [ meson ninja pkgconfig gettext ]; + nativeBuildInputs = [ meson ninja pkg-config gettext ]; buildInputs = [ libspectre zathura_core girara ]; PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; diff --git a/pkgs/applications/misc/zk-shell/default.nix b/pkgs/applications/misc/zk-shell/default.nix index df6e011e4d5..1dbaa842ba4 100644 --- a/pkgs/applications/misc/zk-shell/default.nix +++ b/pkgs/applications/misc/zk-shell/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pythonPackages }: +{ lib, fetchFromGitHub, pythonPackages }: pythonPackages.buildPythonApplication rec { version = "1.0.0"; @@ -21,8 +21,8 @@ pythonPackages.buildPythonApplication rec { meta = { description = "A powerful & scriptable shell for Apache ZooKeeper"; homepage = "https://github.com/rgs1/zk_shell"; - license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.mahe ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.mahe ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/misc/zola/default.nix b/pkgs/applications/misc/zola/default.nix index 99699d6e3cc..3f704e8dd85 100644 --- a/pkgs/applications/misc/zola/default.nix +++ b/pkgs/applications/misc/zola/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ openssl oniguruma ] - ++ stdenv.lib.optional stdenv.isDarwin CoreServices; + ++ lib.optional stdenv.isDarwin CoreServices; RUSTONIG_SYSTEM_LIBONIG = true; diff --git a/pkgs/applications/misc/zscroll/default.nix b/pkgs/applications/misc/zscroll/default.nix index 748bc21ee35..3acac8b3c68 100644 --- a/pkgs/applications/misc/zscroll/default.nix +++ b/pkgs/applications/misc/zscroll/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3, python3Packages, fetchFromGitHub }: +{ lib, python3, python3Packages, fetchFromGitHub }: let version = "1.0"; in diff --git a/pkgs/applications/networking/Sylk/default.nix b/pkgs/applications/networking/Sylk/default.nix index 7391ad4c688..3759a09e700 100644 --- a/pkgs/applications/networking/Sylk/default.nix +++ b/pkgs/applications/networking/Sylk/default.nix @@ -2,7 +2,7 @@ let pname = "Sylk"; - version = "2.9.4"; + version = "3.0.0"; in appimageTools.wrapType2 rec { @@ -10,7 +10,7 @@ appimageTools.wrapType2 rec { src = fetchurl { url = "http://download.ag-projects.com/Sylk/Sylk-${version}-x86_64.AppImage"; - hash = "sha256-LnJ8Pd+AHIrHrYpIx+rxnFKZ1uh2viDHC5TaU1BL62s="; + hash = "sha256-A+SFkGDg+I1lPJ56XPaRfBUktyjSttcsZSqgXvw9sDs="; }; profile = '' diff --git a/pkgs/applications/networking/appgate-sdp/default.nix b/pkgs/applications/networking/appgate-sdp/default.nix index bfe6ba97e4c..56f2162bf08 100644 --- a/pkgs/applications/networking/appgate-sdp/default.nix +++ b/pkgs/applications/networking/appgate-sdp/default.nix @@ -20,6 +20,8 @@ , iproute , krb5 , lib +, mesa +, libdrm , libX11 , libXScrnSaver , libXcomposite @@ -48,7 +50,7 @@ , systemd , zlib }: -with stdenv.lib; +with lib; let deps = [ alsaLib @@ -65,6 +67,8 @@ let gtk3 icu krb5 + mesa + libdrm libX11 libXScrnSaver libXcomposite @@ -88,15 +92,15 @@ let systemd zlib ]; - rpath = stdenv.lib.makeLibraryPath deps ; + rpath = lib.makeLibraryPath deps ; in stdenv.mkDerivation rec { pname = "appgate-sdp"; - version = "5.1.2"; + version = "5.3.2"; src = fetchurl { - url = "https://bin.appgate-sdp.com/5.1/client/appgate-sdp_${version}_amd64.deb"; - sha256 = "0v4vfibg1giml3vfz2w7qypqzymvfchi5qm6vfagah2vfbkw7xc2"; + url = "https://bin.appgate-sdp.com/${lib.versions.majorMinor version}/client/appgate-sdp_${version}_amd64.deb"; + sha256 = "123d4mx2nsh8q3ckm4g2chdcdwgg0cz9cvhiwjggxzvy7j6bqgy4"; }; dontConfigure = true; @@ -123,26 +127,35 @@ stdenv.mkDerivation rec { cp -r $out/usr/share $out/share for file in $out/opt/appgate/linux/appgate-resolver.pre \ - $out/opt/appgate/linux/appgate-dumb-resolver.pre \ - $out/lib/systemd/system/appgatedriver.service \ - $out/lib/systemd/system/appgate-dumb-resolver.service \ - $out/lib/systemd/system/appgate-resolver.service + $out/opt/appgate/linux/appgate-dumb-resolver.pre do substituteInPlace $file \ --replace "/bin/sh" "${bash}/bin/sh" \ - --replace "/opt/" "$out/opt/" \ - --replace "/usr/sbin/dnsmasq" "${dnsmasq}/bin/dnsmasq" \ - --replace "InaccessiblePaths=/mnt /srv /boot /media" "InaccessiblePaths=-/mnt -/srv -/boot -/media" \ --replace "cat" "${coreutils}/bin/cat" \ --replace "chattr" "${e2fsprogs}/bin/chattr" \ --replace "mv" "${coreutils}/bin/mv" \ --replace "pkill" "${procps}/bin/pkill" done + for file in $out/lib/systemd/system/appgatedriver.service \ + $out/lib/systemd/system/appgate-dumb-resolver.service \ + $out/lib/systemd/system/appgate-resolver.service + do + substituteInPlace $file \ + --replace "/bin/sh" "${bash}/bin/sh" \ + --replace "/opt/" "$out/opt/" \ + --replace "chattr" "${e2fsprogs}/bin/chattr" \ + --replace "mv" "${coreutils}/bin/mv" + done + + substituteInPlace $out/lib/systemd/system/appgatedriver.service \ + --replace "InaccessiblePaths=/mnt /srv /boot /media" "InaccessiblePaths=-/mnt -/srv -/boot -/media" + + substituteInPlace $out/lib/systemd/system/appgate-resolver.service \ + --replace "/usr/sbin/dnsmasq" "${dnsmasq}/bin/dnsmasq" + substituteInPlace $out/opt/appgate/linux/nm.py --replace "/usr/sbin/dnsmasq" "${dnsmasq}/bin/dnsmasq" - substituteInPlace $out/opt/appgate/linux/set_dns \ - --replace "service appgate-resolver stop" "${systemd.out}/bin/systemctl stop appgate-resolver" \ - --replace "/etc/appgate.conf" "$out/etc/appgate.conf" + substituteInPlace $out/opt/appgate/linux/set_dns --replace "/etc/appgate.conf" "$out/etc/appgate.conf" ''; @@ -156,7 +169,7 @@ stdenv.mkDerivation rec { patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "$ORIGIN:$out/opt/appgate/service/:$out/opt/appgate/:${rpath}" $binary done - wrapProgram $out/opt/appgate/appgate-driver --prefix PATH : ${stdenv.lib.makeBinPath [ iproute networkmanager dnsmasq ]} + wrapProgram $out/opt/appgate/appgate-driver --prefix PATH : ${lib.makeBinPath [ iproute networkmanager dnsmasq ]} wrapProgram $out/opt/appgate/linux/set_dns --set PYTHONPATH $PYTHONPATH ''; meta = with lib; { diff --git a/pkgs/applications/networking/bee/0001-clef-service-accept-default-CONFIGDIR-from-the-envir.patch b/pkgs/applications/networking/bee/0001-clef-service-accept-default-CONFIGDIR-from-the-envir.patch new file mode 100644 index 00000000000..fb551646b7c --- /dev/null +++ b/pkgs/applications/networking/bee/0001-clef-service-accept-default-CONFIGDIR-from-the-envir.patch @@ -0,0 +1,44 @@ +From 04933c578f51aa1f536991318dc5aede57f81c0d Mon Sep 17 00:00:00 2001 +From: Attila Lendvai <attila@lendvai.name> +Date: Sat, 30 Jan 2021 14:02:02 +0100 +Subject: [PATCH 1/2] clef-service: accept default CONFIGDIR from the + environment + +--- + packaging/bee-clef-service | 15 ++++++++++----- + 1 file changed, 10 insertions(+), 5 deletions(-) + +diff --git a/packaging/bee-clef-service b/packaging/bee-clef-service +index 10bcd92..34c7edd 100755 +--- a/packaging/bee-clef-service ++++ b/packaging/bee-clef-service +@@ -1,16 +1,21 @@ + #!/usr/bin/env sh + + start() { +- KEYSTORE=/var/lib/bee-clef/keystore +- CONFIGDIR=/var/lib/bee-clef ++ if [ -z "$CONFIGDIR" ]; then ++ CONFIGDIR=/var/lib/bee-clef ++ fi ++ if [ -z "$PASSWORD_FILE" ]; then ++ PASSWORD_FILE=${CONFIGDIR}/password ++ fi ++ KEYSTORE=${CONFIGDIR}/keystore ++ SECRET=$(cat ${PASSWORD_FILE}) + CHAINID=5 +- SECRET=$(cat /var/lib/bee-clef/password) + # clef with every start sets permissions back to 600 +- (sleep 4; chmod 660 /var/lib/bee-clef/clef.ipc) & ++ (sleep 4; chmod 660 ${CONFIGDIR}/clef.ipc) & + ( sleep 2; cat << EOF + { "jsonrpc": "2.0", "id":1, "result": { "text":"$SECRET" } } + EOF +-) | clef --stdio-ui --keystore $KEYSTORE --configdir $CONFIGDIR --chainid $CHAINID --rules /etc/bee-clef/rules.js --nousb --4bytedb-custom /etc/bee-clef/4byte.json --pcscdpath "" --auditlog "" --loglevel 3 --ipcpath /var/lib/bee-clef ++) | clef --stdio-ui --keystore $KEYSTORE --configdir $CONFIGDIR --chainid $CHAINID --rules /etc/bee-clef/rules.js --nousb --4bytedb-custom /etc/bee-clef/4byte.json --pcscdpath "" --auditlog "" --loglevel 3 --ipcpath ${CONFIGDIR} + } + + stop() { +-- +2.29.2 + diff --git a/pkgs/applications/networking/bee/0002-nix-diff-for-substituteAll.patch b/pkgs/applications/networking/bee/0002-nix-diff-for-substituteAll.patch new file mode 100644 index 00000000000..611aed0b890 --- /dev/null +++ b/pkgs/applications/networking/bee/0002-nix-diff-for-substituteAll.patch @@ -0,0 +1,25 @@ +From 1a1ab986245e8b74648a1a0adb5d1c7019561d18 Mon Sep 17 00:00:00 2001 +From: Attila Lendvai <attila@lendvai.name> +Date: Sat, 30 Jan 2021 15:24:57 +0100 +Subject: [PATCH 2/2] nix diff for substituteAll + +--- + packaging/bee-clef-service | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/packaging/bee-clef-service b/packaging/bee-clef-service +index 34c7edd..31e9d95 100755 +--- a/packaging/bee-clef-service ++++ b/packaging/bee-clef-service +@@ -15,7 +15,7 @@ start() { + ( sleep 2; cat << EOF + { "jsonrpc": "2.0", "id":1, "result": { "text":"$SECRET" } } + EOF +-) | clef --stdio-ui --keystore $KEYSTORE --configdir $CONFIGDIR --chainid $CHAINID --rules /etc/bee-clef/rules.js --nousb --4bytedb-custom /etc/bee-clef/4byte.json --pcscdpath "" --auditlog "" --loglevel 3 --ipcpath ${CONFIGDIR} ++) | @clefBinary@ --stdio-ui --keystore $KEYSTORE --configdir $CONFIGDIR --chainid $CHAINID --rules @out@/share/bee-clef/rules.js --nousb --4bytedb-custom @out@/share/bee-clef/4byte.json --pcscdpath "" --auditlog "" --loglevel 3 --ipcpath ${CONFIGDIR} + } + + stop() { +-- +2.29.2 + diff --git a/pkgs/applications/networking/bee/bee-clef.nix b/pkgs/applications/networking/bee/bee-clef.nix new file mode 100644 index 00000000000..a94386ea3f1 --- /dev/null +++ b/pkgs/applications/networking/bee/bee-clef.nix @@ -0,0 +1,57 @@ +{ version ? "release", stdenv, lib, substituteAll, fetchFromGitHub, go-ethereum }: + +stdenv.mkDerivation rec { + pname = "bee-clef"; + version = "0.4.7"; + + src = fetchFromGitHub { + owner = "ethersphere"; + repo = "bee-clef"; + rev = "refs/tags/v${version}"; + sha256 = "1sfwql0kvnir8b9ggpqcyc0ar995gxgfbhqb1xpfzp6wl0g3g4zz"; + }; + + buildInputs = [ go-ethereum ]; + + clefBinary = "${go-ethereum}/bin/clef"; + + patches = [ + ./0001-clef-service-accept-default-CONFIGDIR-from-the-envir.patch + ./0002-nix-diff-for-substituteAll.patch + ]; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/bin/ + mkdir -p $out/share/bee-clef/ + mkdir -p $out/lib/systemd/system/ + cp packaging/bee-clef.service $out/lib/systemd/system/ + substituteAll packaging/bee-clef-service $out/share/bee-clef/bee-clef-service + substituteAll ${./ensure-clef-account} $out/share/bee-clef/ensure-clef-account + substituteAll packaging/bee-clef-keys $out/bin/bee-clef-keys + cp packaging/rules.js packaging/4byte.json $out/share/bee-clef/ + chmod +x $out/bin/bee-clef-keys + chmod +x $out/share/bee-clef/bee-clef-service + chmod +x $out/share/bee-clef/ensure-clef-account + patchShebangs $out/ + ''; + + meta = with lib; { + # homepage = "https://gateway.ethswarm.org/bzz/docs.swarm.eth/docs/installation/bee-clef/"; + homepage = "https://docs.ethswarm.org/docs/installation/bee-clef"; + description = "External signer for Ethereum Swarm Bee"; + longDescription = '' + clef is go-ethereum's external signer. + + bee-clef is a package that starts up a vanilla clef instance as a systemd service, + but configured in such a way that is suitable for bee (relaxed security for + automated operation). + + This package contains the files necessary to run the bee-clef service. + ''; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ attila-lendvai ]; + platforms = go-ethereum.meta.platforms; + }; +} diff --git a/pkgs/applications/networking/bee/bee.nix b/pkgs/applications/networking/bee/bee.nix new file mode 100644 index 00000000000..5ffff918750 --- /dev/null +++ b/pkgs/applications/networking/bee/bee.nix @@ -0,0 +1,77 @@ +{ version ? "release", stdenv, lib, fetchFromGitHub, buildGoModule, coreutils }: + +let + + versionSpec = rec { + unstable = rec { + pname = "bee-unstable"; + version = "2021-01-30"; + rev = "824636a2c2629c329ab10275cef6a0b7395343ad"; + goVersionString = "g" + builtins.substring 0 7 rev; # this seems to be some kind of standard of git describe... + sha256 = "0ly1yqjq29arbak8lchdradf39l5bmxpbfir6ljjc7nyqdxz0sxg"; + vendorSha256 = "0w1db7xpissdpf8i5bb96z92zbasj5x9kk3kcisxn0dwla6n55n3"; + }; + release = rec { + pname = "bee"; + version = "0.4.2"; + rev = "refs/tags/v${version}"; + sha256 = "1jg7aivsgdb9bm87dlmwpf1g6gla8j6v55xmzs8h5xmwqcybbmag"; + vendorSha256 = "0w1db7xpissdpf8i5bb96z92zbasj5x9kk3kcisxn0dwla6n55n3"; + }; + "0.4.2" = release; + "0.4.1" = rec { + pname = "bee"; + version = "0.4.1"; + rev = "refs/tags/v${version}"; + sha256 = "1bmgbav52pcb5p7cgq9756512fzfqhjybyr0dv538plkqx47mpv7"; + vendorSha256 = "0j393va4jrg9q3wlc9mgkbpgnn2w2s3k2hcn8phzj8d5fl4n4v2h"; + }; + }.${version}; + +in + +buildGoModule { + inherit (versionSpec) pname version vendorSha256; + + src = fetchFromGitHub { + owner = "ethersphere"; + repo = "bee"; + inherit (versionSpec) rev sha256; + }; + + nativeBuildInputs = [ coreutils ]; + + subPackages = [ "cmd/bee" ]; + + # no symbol table, no debug info, and pass the commit for the version string + buildFlags = lib.optionalString ( lib.hasAttr "goVersionString" versionSpec) + "-ldflags -s -ldflags -w -ldflags -X=github.com/ethersphere/bee.commit=${versionSpec.goVersionString}"; + + # Mimic the bee Makefile: without disabling CGO, two (transitive and + # unused) dependencies would fail to compile. + preBuild = '' + export CGO_ENABLED=0 + ''; + + postInstall = '' + mkdir -p $out/lib/systemd/system + cp packaging/bee.service $out/lib/systemd/system/ + cp packaging/bee-get-addr $out/bin/ + chmod +x $out/bin/bee-get-addr + patchShebangs $out/bin/ + ''; + + meta = with lib; { + homepage = "https://swarm.ethereum.org/"; + description = "Ethereum Swarm Bee"; + longDescription = '' + A decentralised storage and communication system for a sovereign digital society. + + Swarm is a system of peer-to-peer networked nodes that create a decentralised storage and communication service. The system is economically self-sustaining due to a built-in incentive system enforced through smart contracts on the Ethereum blockchain. + + Bee is a Swarm node implementation, written in Go. + ''; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ attila-lendvai ]; + }; +} diff --git a/pkgs/applications/networking/bee/ensure-clef-account b/pkgs/applications/networking/bee/ensure-clef-account new file mode 100644 index 00000000000..def67ff9cc3 --- /dev/null +++ b/pkgs/applications/networking/bee/ensure-clef-account @@ -0,0 +1,47 @@ +#!/usr/bin/env sh + +set -e + +# NOTE This file is called by the systemd service in its preStart +# hook, but it's not Nix specific in any way. Ideally, the same file +# should be called from the postinst scripts of the other packages, +# but... the world is not ideal. + +# What follows was extracted from, and should be in sync with +# https://github.com/ethersphere/bee-clef/tree/master/packaging + +DATA_DIR="$1" +CONFIG_DIR="$2" +PASSWORD_FILE=${DATA_DIR}/password +MASTERSEED=${DATA_DIR}/masterseed.json +KEYSTORE=${DATA_DIR}/keystore + +echo "ensure-clef-account $DATA_DIR $CONFIG_DIR" + +if ! test -f ${PASSWORD_FILE}; then + < /dev/urandom tr -dc _A-Z-a-z-0-9 2> /dev/null | head -c32 > ${PASSWORD_FILE} + chmod 0400 ${PASSWORD_FILE} + echo "Initialized ${PASSWORD_FILE} from /dev/urandom" +fi + +if ! test -f ${MASTERSEED}; then + parse_json() { echo $1|sed -e 's/[{}]/''/g'|sed -e 's/", "/'\",\"'/g'|sed -e 's/" ,"/'\",\"'/g'|sed -e 's/" , "/'\",\"'/g'|sed -e 's/","/'\"---SEPERATOR---\"'/g'|awk -F=':' -v RS='---SEPERATOR---' "\$1~/\"$2\"/ {print}"|sed -e "s/\"$2\"://"|tr -d "\n\t"|sed -e 's/\\"/"/g'|sed -e 's/\\\\/\\/g'|sed -e 's/^[ \t]*//g'|sed -e 's/^"//' -e 's/"$//' ; } + SECRET=$(cat ${PASSWORD_FILE}) + CLEF="@clefBinary@ --configdir ${DATA_DIR} --keystore ${KEYSTORE} --stdio-ui" + $CLEF init >/dev/null << EOF +$SECRET +$SECRET +EOF + $CLEF newaccount >/dev/null << EOF +$SECRET +EOF + $CLEF setpw 0x$(parse_json $(cat ${KEYSTORE}/*) address) >/dev/null << EOF +$SECRET +$SECRET +$SECRET +EOF + $CLEF attest $(sha256sum ${CONFIG_DIR}/rules.js | cut -d' ' -f1 | tr -d '\n') >/dev/null << EOF +$SECRET +EOF + echo "Clef data dir initialized" +fi diff --git a/pkgs/applications/networking/brig/default.nix b/pkgs/applications/networking/brig/default.nix index a56a586b82a..20b685a162f 100644 --- a/pkgs/applications/networking/brig/default.nix +++ b/pkgs/applications/networking/brig/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "brig"; diff --git a/pkgs/applications/networking/browsers/amfora/default.nix b/pkgs/applications/networking/browsers/amfora/default.nix index e309f9a3562..e951f4c53c0 100644 --- a/pkgs/applications/networking/browsers/amfora/default.nix +++ b/pkgs/applications/networking/browsers/amfora/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildGoModule }: +{ stdenv, lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "amfora"; @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "rOEM7iEkm42g8yJxY7qdTCSbkPMDHqlAsK7/ud8IDLY="; - postInstall = '' + postInstall = lib.optionalString (!stdenv.isDarwin) '' sed -i "s:amfora:$out/bin/amfora:" amfora.desktop install -Dm644 amfora.desktop -t $out/share/applications ''; diff --git a/pkgs/applications/networking/browsers/asuka/default.nix b/pkgs/applications/networking/browsers/asuka/default.nix index 89718100ab5..98c8a8afae0 100644 --- a/pkgs/applications/networking/browsers/asuka/default.nix +++ b/pkgs/applications/networking/browsers/asuka/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchurl, pkgconfig, ncurses, openssl, Security }: +{ lib, stdenv, rustPlatform, fetchurl, pkg-config, ncurses, openssl, Security }: rustPlatform.buildRustPackage rec { pname = "asuka"; @@ -11,10 +11,10 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0p0x4ch04kydg76bfal5zqzr9hvn5268wf3k2v9h7g8r4y8xqlhw"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses openssl ] - ++ stdenv.lib.optional stdenv.isDarwin Security; + ++ lib.optional stdenv.isDarwin Security; meta = with lib; { description = "Gemini Project client written in Rust with NCurses"; diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 9eed9b627e6..6e772c7931d 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -38,7 +38,7 @@ , udev , xorg , zlib -, xdg_utils +, xdg-utils , wrapGAppsHook }: @@ -79,7 +79,7 @@ rpath = lib.makeLibraryPath [ nss pango udev - xdg_utils + xdg-utils xorg.libxcb zlib ]; @@ -88,11 +88,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.18.77"; + version = "1.19.88"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "AV3bqtWaoy6AVnt8K/Qo+7hguAIsPJPZhgLSeOvJ7JY="; + sha256 = "jySedvm9V3O4kri1PgoqC0OsC1gvB0Nwx8leoUZnHK0="; }; dontConfigure = true; @@ -144,8 +144,8 @@ stdenv.mkDerivation rec { done # Replace xdg-settings and xdg-mime - ln -sf ${xdg_utils}/bin/xdg-settings $out/opt/brave.com/brave/xdg-settings - ln -sf ${xdg_utils}/bin/xdg-mime $out/opt/brave.com/brave/xdg-mime + ln -sf ${xdg-utils}/bin/xdg-settings $out/opt/brave.com/brave/xdg-settings + ln -sf ${xdg-utils}/bin/xdg-mime $out/opt/brave.com/brave/xdg-mime ''; installCheckPhase = '' diff --git a/pkgs/applications/networking/browsers/browsh/default.nix b/pkgs/applications/networking/browsers/browsh/default.nix index cf1ae25974e..e106eb7ff66 100644 --- a/pkgs/applications/networking/browsers/browsh/default.nix +++ b/pkgs/applications/networking/browsers/browsh/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchurl, fetchFromGitHub, go-bindata }: +{ lib, buildGoPackage, fetchurl, fetchFromGitHub, go-bindata }: let version = "1.6.4"; @@ -55,7 +55,7 @@ in buildGoPackage rec { description = "A fully-modern text-based browser, rendering to TTY and browsers"; homepage = "https://www.brow.sh/"; maintainers = [ maintainers.kalbasit ]; - license = stdenv.lib.licenses.lgpl21; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + license = lib.licenses.lgpl21; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/applications/networking/browsers/browsh/deps.nix b/pkgs/applications/networking/browsers/browsh/deps.nix index 9a6a898beb5..12154af752d 100644 --- a/pkgs/applications/networking/browsers/browsh/deps.nix +++ b/pkgs/applications/networking/browsers/browsh/deps.nix @@ -261,4 +261,4 @@ sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; }; } -] \ No newline at end of file +] diff --git a/pkgs/applications/networking/browsers/castor/default.nix b/pkgs/applications/networking/browsers/castor/default.nix index 6482ce59da6..be3d8295f99 100644 --- a/pkgs/applications/networking/browsers/castor/default.nix +++ b/pkgs/applications/networking/browsers/castor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchurl , rustPlatform , pkg-config diff --git a/pkgs/applications/networking/browsers/chromium/README.md b/pkgs/applications/networking/browsers/chromium/README.md index 5b7c9fe5504..9d23e3143c6 100644 --- a/pkgs/applications/networking/browsers/chromium/README.md +++ b/pkgs/applications/networking/browsers/chromium/README.md @@ -36,6 +36,21 @@ update `upstream-info.json`. After updates it is important to test at least `nixosTests.chromium` (or basic manual testing) and `google-chrome` (which reuses `upstream-info.json`). +To run all automated NixOS VM tests for Chromium, ungoogled-chromium, +and Google Chrome (not recommended, currently 6x tests!): +``` +nix-build nixos/tests/chromium.nix +``` + +A single test can be selected, e.g. to test `ungoogled-chromium` (see +`channelMap` in `nixos/tests/chromium.nix` for all available options): +``` +nix-build nixos/tests/chromium.nix -A ungoogled +``` +(Note: Testing Google Chrome requires `export NIXPKGS_ALLOW_UNFREE=1`.) + +For custom builds it's possible to "override" `channelMap`. + ## Backports All updates are considered security critical and should be ported to the stable diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index b9a42e825f3..c4a5508b753 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -1,6 +1,6 @@ -{ stdenv, mkChromiumDerivation, channel, enableWideVine, ungoogled }: +{ lib, mkChromiumDerivation, channel, enableWideVine, ungoogled }: -with stdenv.lib; +with lib; mkChromiumDerivation (base: rec { name = "chromium-browser"; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index d7b1a017d31..d25dd2a7830 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -4,10 +4,10 @@ , gnutar, bzip2, flac, speex, libopus , libevent, expat, libjpeg, snappy , libpng, libcap -, xdg_utils, yasm, nasm, minizip, libwebp +, xdg-utils, yasm, nasm, minizip, libwebp , libusb1, pciutils, nss, re2 -, python2Packages, perl, pkgconfig +, python2Packages, perl, pkg-config , nspr, systemd, kerberos , util-linux, alsaLib , bison, gperf @@ -39,7 +39,7 @@ buildFun: -with stdenv.lib; +with lib; let jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 @@ -89,7 +89,7 @@ let bzip2 flac speex opusWithCustomModes libevent expat libjpeg snappy libpng libcap - xdg_utils minizip libwebp + xdg-utils minizip libwebp libusb1 re2 ffmpeg libxslt libxml2 nasm @@ -101,12 +101,14 @@ let buildPath = "out/${buildType}"; libExecPath = "$out/libexec/${packageName}"; + chromiumVersionAtLeast = min-version: + versionAtLeast upstream-info.version min-version; versionRange = min-version: upto-version: let inherit (upstream-info) version; result = versionAtLeast version min-version && versionOlder version upto-version; - stable-version = (importJSON ./upstream-info.json).stable.version; - in if versionAtLeast stable-version upto-version - then warn "chromium: stable version ${stable-version} is newer than a patchset bounded at ${upto-version}. You can safely delete it." + ungoogled-version = (importJSON ./upstream-info.json).ungoogled-chromium.version; + in if versionAtLeast ungoogled-version upto-version + then warn "chromium: ungoogled version ${ungoogled-version} is newer than a patchset bounded at ${upto-version}. You can safely delete it." result else result; @@ -117,7 +119,7 @@ let base = rec { name = "${packageName}-unwrapped-${version}"; inherit (upstream-info) version; - inherit channel packageName buildType buildPath; + inherit packageName buildType buildPath; src = fetchurl { url = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz"; @@ -126,7 +128,7 @@ let nativeBuildInputs = [ llvmPackages.lldClang.bintools - ninja which python2Packages.python perl pkgconfig + ninja which python2Packages.python perl pkg-config python2Packages.ply python2Packages.jinja2 nodejs gnutar python2Packages.setuptools ]; @@ -150,8 +152,12 @@ let patches = [ ./patches/no-build-timestamps.patch # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed) ./patches/widevine-79.patch # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags - # ++ optional (versionRange "68" "72") ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" ) - ]; + # ++ optional (versionRange "68" "72") (githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000") + ] ++ optional (versionRange "89" "90.0.4402.0") (githubPatch + # To fix the build of chromiumBeta and chromiumDev: + "b5b80df7dafba8cafa4c6c0ba2153dfda467dfc9" # add dependency on opus in webcodecs + "1r4wmwaxz5xbffmj5wspv2xj8s32j9p6jnwimjmalqg3al2ba64x" + ); postPatch = '' # remove unused third-party @@ -190,7 +196,7 @@ let '/usr/share/locale/' \ '${glibc}/share/locale/' - sed -i -e 's@"\(#!\)\?.*xdg-@"\1${xdg_utils}/bin/xdg-@' \ + sed -i -e 's@"\(#!\)\?.*xdg-@"\1${xdg-utils}/bin/xdg-@' \ chrome/browser/shell_integration_linux.cc sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \ @@ -269,6 +275,16 @@ let use_system_minigbm = true; use_system_libdrm = true; system_wayland_scanner_path = "${wayland}/bin/wayland-scanner"; + } // optionalAttrs (chromiumVersionAtLeast "89") { + # Disable PGO (defaults to 2 since M89) because it fails without additional changes: + # error: Could not read profile ../../chrome/build/pgo_profiles/chrome-linux-master-1610647094-405a32bcf15e5a84949640f99f84a5b9f61e2f2e.profdata: Unsupported instrumentation profile format version + chrome_pgo_phase = 0; + } // optionalAttrs (chromiumVersionAtLeast "90") { + # Disable build with TFLite library because it fails without additional changes: + # ninja: error: '../../chrome/test/data/simple_test.tflite', needed by 'test_data/simple_test.tflite', missing and no known rule to make it + # Note: chrome/test/data/simple_test.tflite is in the Git repository but not in chromium-90.0.4400.8.tar.xz + # See also chrome/services/machine_learning/README.md + build_with_tflite_lib = false; } // optionalAttrs ungoogled { chrome_pgo_phase = 0; enable_hangout_services_extension = false; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index fd89f316008..900e823bb75 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,5 +1,5 @@ { newScope, config, stdenv, fetchurl, makeWrapper -, llvmPackages_11, ed, gnugrep, coreutils, xdg_utils +, llvmPackages_11, ed, gnugrep, coreutils, xdg-utils , glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit , libva ? null , pipewire_0_2 @@ -55,14 +55,23 @@ let pkgSuffix = if channel == "dev" then "unstable" else (if channel == "ungoogled-chromium" then "stable" else channel); pkgName = "google-chrome-${pkgSuffix}"; - chromeSrc = fetchurl { - urls = map (repo: "${repo}/${pkgName}/${pkgName}_${version}-1_amd64.deb") [ - "https://dl.google.com/linux/chrome/deb/pool/main/g" - "http://95.31.35.30/chrome/pool/main/g" - "http://mirror.pcbeta.com/google/chrome/deb/pool/main/g" - "http://repo.fdzh.org/chrome/deb/pool/main/g" - ]; - sha256 = chromium.upstream-info.sha256bin64; + chromeSrc = + let + # Use the latest stable Chrome version if necessary: + version = if chromium.upstream-info.sha256bin64 != null + then chromium.upstream-info.version + else (lib.importJSON ./upstream-info.json).stable.version; + sha256 = if chromium.upstream-info.sha256bin64 != null + then chromium.upstream-info.sha256bin64 + else (lib.importJSON ./upstream-info.json).stable.sha256bin64; + in fetchurl { + urls = map (repo: "${repo}/${pkgName}/${pkgName}_${version}-1_amd64.deb") [ + "https://dl.google.com/linux/chrome/deb/pool/main/g" + "http://95.31.35.30/chrome/pool/main/g" + "http://mirror.pcbeta.com/google/chrome/deb/pool/main/g" + "http://repo.fdzh.org/chrome/deb/pool/main/g" + ]; + inherit sha256; }; mkrpath = p: "${lib.makeSearchPathOutput "lib" "lib64" p}:${lib.makeLibraryPath p}"; @@ -158,9 +167,9 @@ in stdenv.mkDerivation { buildCommand = let browserBinary = "${chromiumWV}/libexec/chromium/chromium"; getWrapperFlags = plugin: "$(< \"${plugin}/nix-support/wrapper-flags\")"; - libPath = stdenv.lib.makeLibraryPath [ libva pipewire_0_2 ]; + libPath = lib.makeLibraryPath [ libva pipewire_0_2 ]; - in with stdenv.lib; '' + in with lib; '' mkdir -p "$out/bin" eval makeWrapper "${browserBinary}" "$out/bin/chromium" \ @@ -190,7 +199,7 @@ in stdenv.mkDerivation { export XDG_DATA_DIRS=$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH\''${XDG_DATA_DIRS:+:}\$XDG_DATA_DIRS # Mainly for xdg-open but also other xdg-* tools: - export PATH="${xdg_utils}/bin\''${PATH:+:}\$PATH" + export PATH="${xdg-utils}/bin\''${PATH:+:}\$PATH" . w diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index eef1c5ef38c..355f5633172 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -1,4 +1,4 @@ -{ stdenv, gcc +{ lib, stdenv, gcc , jshon , glib , nspr @@ -9,7 +9,7 @@ , upstream-info }: -with stdenv.lib; +with lib; let mkrpath = p: "${makeSearchPathOutput "lib" "lib64" p}:${makeLibraryPath p}"; @@ -81,8 +81,8 @@ let dontStrip = true; meta = { - license = stdenv.lib.licenses.unfree; - maintainers = with stdenv.lib.maintainers; [ taku0 ]; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ taku0 ]; platforms = platforms.x86_64; }; }; diff --git a/pkgs/applications/networking/browsers/chromium/update.py b/pkgs/applications/networking/browsers/chromium/update.py index 2b9f9232c24..d6788fa4192 100755 --- a/pkgs/applications/networking/browsers/chromium/update.py +++ b/pkgs/applications/networking/browsers/chromium/update.py @@ -13,6 +13,7 @@ import sys from codecs import iterdecode from collections import OrderedDict from datetime import datetime +from distutils.version import LooseVersion from os.path import abspath, dirname from urllib.request import urlopen @@ -102,6 +103,31 @@ def get_latest_ungoogled_chromium_build(): } +def channel_name_to_attr_name(channel_name): + """Maps a channel name to the corresponding main Nixpkgs attribute name.""" + if channel_name == 'stable': + return 'chromium' + if channel_name == 'beta': + return 'chromiumBeta' + if channel_name == 'dev': + return 'chromiumDev' + if channel_name == 'ungoogled-chromium': + return 'ungoogled-chromium' + print(f'Error: Unexpected channel: {channel_name}', file=sys.stderr) + sys.exit(1) + + +def print_updates(channels_old, channels_new): + """Print a summary of the updates.""" + print('Updates:') + for channel_name in channels_old: + version_old = channels_old[channel_name]["version"] + version_new = channels_new[channel_name]["version"] + if LooseVersion(version_old) < LooseVersion(version_new): + attr_name = channel_name_to_attr_name(channel_name) + print(f'- {attr_name}: {version_old} -> {version_new}') + + channels = {} last_channels = load_json(JSON_PATH) @@ -140,9 +166,18 @@ with urlopen(HISTORY_URL) as resp: f'{DEB_URL}/google-chrome-{google_chrome_suffix}/' + f'google-chrome-{google_chrome_suffix}_{build["version"]}-1_amd64.deb') except subprocess.CalledProcessError: - # This build isn't actually available yet. Continue to - # the next one. - continue + if (channel_name == 'ungoogled-chromium' and 'sha256' in channel and + build['version'].split('.')[0] == last_channels['stable']['version'].split('.')[0]): + # Sometimes ungoogled-chromium is updated to a newer tag than + # the latest stable Chromium version. In this case we'll set + # sha256bin64 to null and the Nixpkgs code will fall back to + # the latest stable Google Chrome (only required for + # Widevine/DRM which is disabled by default): + channel['sha256bin64'] = None + else: + # This build isn't actually available yet. Continue to + # the next one. + continue channel['deps'] = get_channel_dependencies(channel['version']) if channel_name == 'stable': @@ -174,3 +209,4 @@ with open(JSON_PATH, 'w') as out: sorted_channels = OrderedDict(sorted(channels.items(), key=get_channel_key)) json.dump(sorted_channels, out, indent=2) out.write('\n') + print_updates(last_channels, sorted_channels) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 8baa7cc7b4f..46228e2b27d 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,62 +1,62 @@ { "stable": { - "version": "87.0.4280.141", - "sha256": "0x9k809m36pfirnw2vnr9pk93nxdbgrvna0xf1rs3q91zkbr2x8l", - "sha256bin64": "0wq3yi0qyxzcid390w5rh4xjq92fjajvlifjl70g6sqnbk6vgvdp", + "version": "88.0.4324.96", + "sha256": "17y7x50cx2d3bbz0hna25j8pyqsk0914266mpvrpk5am52xwb5c9", + "sha256bin64": "09210781s9y49l6qkbd1v8w52741rmhxz6cc6qsldnqpm5mwlgsc", "deps": { "gn": { - "version": "2020-09-09", + "version": "2020-11-05", "url": "https://gn.googlesource.com/gn", - "rev": "e002e68a48d1c82648eadde2f6aafa20d08c36f2", - "sha256": "0x4c7amxwzxs39grqs3dnnz0531mpf1p75niq7zhinyfqm86i4dk" + "rev": "53d92014bf94c3893886470a1c7c1289f8818db0", + "sha256": "1xcm07qjk6m2czi150fiqqxql067i832adck6zxrishm70c9jbr9" } }, "chromedriver": { - "version": "87.0.4280.88", - "sha256_linux": "1insh1imi25sj4hdkbll5rzwnag8wvfxv4ckshpq8akl8r13p6lj", - "sha256_darwin": "048hsqp6575r980m769lzznvxypmfcwn89f1d3ik751ymzmb5r78" + "version": "88.0.4324.27", + "sha256_linux": "1vx1llg0x6903ggqa345iswd63y9c24184zv784q01zqxqwn0g8p", + "sha256_darwin": "0x1s6crfwkcn86w6p8g4vmx5raqlr41pjr4h2dbwppgrc0nx1p14" } }, "beta": { - "version": "88.0.4324.79", - "sha256": "1xmssngzg370gazvqngw5mzhfq476fan5y3sp4ggs8fx5anh6jlz", - "sha256bin64": "16m2k4kr92236yvfnl276cy77d5324b7ca3grsw990c0b2kgizq7", + "version": "89.0.4389.23", + "sha256": "1d5pv4bhskh4l8x5ygccxwiryf05mwr1qzq1dzn6q82damr6dpq5", + "sha256bin64": "0swyx2a1gh9mi2jayymcvzwm9cb265ks43wg823abss4q3rskg84", "deps": { "gn": { - "version": "2020-11-05", + "version": "2021-01-07", "url": "https://gn.googlesource.com/gn", - "rev": "53d92014bf94c3893886470a1c7c1289f8818db0", - "sha256": "1xcm07qjk6m2czi150fiqqxql067i832adck6zxrishm70c9jbr9" + "rev": "595e3be7c8381d4eeefce62a63ec12bae9ce5140", + "sha256": "08y7cjlgjdbzja5ij31wxc9i191845m01v1hc7y176svk9y0hj1d" } } }, "dev": { - "version": "89.0.4381.6", - "sha256": "031w24qf5cn9y30pgh736g67p6c10kwpflhvxa24h0v99gqnah2i", - "sha256bin64": "1fssdxllq2ncpy8s7ykbq33456hfjlgj1m5147wbg2c5k36rj78s", + "version": "90.0.4400.8", + "sha256": "0z7695r8k1xm5kx7cc42kmcr11dbagcwjak32sglj0sw3hsr2yqz", + "sha256bin64": "11gp2sxaly66qfb2gfxnikq1xad520r32pgshkm2jsb7a7vj7mmf", "deps": { "gn": { - "version": "2020-12-22", + "version": "2021-01-14", "url": "https://gn.googlesource.com/gn", - "rev": "0d67e272bdb8145f87d238bc0b2cb8bf80ccec90", - "sha256": "07mrfl9hbjldbgidwwhr482a0s0ppqzwa5j7v5nbqxj18j55iril" + "rev": "d62642c920e6a0d1756316d225a90fd6faa9e21e", + "sha256": "0f1i079asiznn092vm6lyad96wcs8pxh95fjmjbnaqjaalivsic0" } } }, "ungoogled-chromium": { - "version": "87.0.4280.88", - "sha256": "1h09g9b2zxad85vd146ymvg3w2kpngpi78yig3dn1vrmhwr4aiiy", - "sha256bin64": "0n3fm6wf8zfkv135d50xl8xxrnng3q55vyxkck1da8jyvh18bijb", + "version": "88.0.4324.104", + "sha256": "0iq1rmfiqmxsj6skbi17g007zqgjsb50b59slfni2n4mz06xmgbx", + "sha256bin64": null, "deps": { "gn": { - "version": "2020-09-09", + "version": "2020-11-05", "url": "https://gn.googlesource.com/gn", - "rev": "e002e68a48d1c82648eadde2f6aafa20d08c36f2", - "sha256": "0x4c7amxwzxs39grqs3dnnz0531mpf1p75niq7zhinyfqm86i4dk" + "rev": "53d92014bf94c3893886470a1c7c1289f8818db0", + "sha256": "1xcm07qjk6m2czi150fiqqxql067i832adck6zxrishm70c9jbr9" }, "ungoogled-patches": { - "rev": "87.0.4280.88-1", - "sha256": "0w2137w8hfcgl6f938hqnb4ffp33v5r8vdzxrvs814w7dszkiqgg" + "rev": "88.0.4324.104-1", + "sha256": "09x6kxd99a274mln3k3ckly6swyp5qdnkkp8p6grs9nr5jrgqqx5" } } } diff --git a/pkgs/applications/networking/browsers/dillo/default.nix b/pkgs/applications/networking/browsers/dillo/default.nix index 9da80576e95..8af0c1bc8e6 100644 --- a/pkgs/applications/networking/browsers/dillo/default.nix +++ b/pkgs/applications/networking/browsers/dillo/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "12ql8n1lypv3k5zqgwjxlw1md90ixz3ag6j1gghfnhjq3inf26yv"; }; - buildInputs = with stdenv.lib; + buildInputs = with lib; [ perl fltk openssl libjpeg libpng libXcursor libXi libXinerama ]; configureFlags = [ "--enable-ssl" ]; diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index 114bc93f3b9..12adbc0a9b7 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, xlibsWrapper, bzip2, zlib -, brotli, zstd, lzma, openssl, autoreconfHook, gettext, pkgconfig, libev +, brotli, zstd, lzma, openssl, autoreconfHook, gettext, pkg-config, libev , gpm, libidn, tre, expat , # Incompatible licenses, LGPLv3 - GPLv2 enableGuile ? false, guile ? null @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { ncurses xlibsWrapper bzip2 zlib brotli zstd lzma openssl libidn tre expat libev ] - ++ stdenv.lib.optional stdenv.isLinux gpm - ++ stdenv.lib.optional enableGuile guile - ++ stdenv.lib.optional enablePython python - ++ stdenv.lib.optional enablePerl perl + ++ lib.optional stdenv.isLinux gpm + ++ lib.optional enableGuile guile + ++ lib.optional enablePython python + ++ lib.optional enablePerl perl ; - nativeBuildInputs = [ autoreconfHook gettext pkgconfig ]; + nativeBuildInputs = [ autoreconfHook gettext pkg-config ]; configureFlags = [ "--enable-finger" @@ -46,9 +46,9 @@ stdenv.mkDerivation rec { "--with-lzma" "--with-libev" "--with-terminfo" - ] ++ stdenv.lib.optional enableGuile "--with-guile" - ++ stdenv.lib.optional enablePython "--with-python" - ++ stdenv.lib.optional enablePerl "--with-perl" + ] ++ lib.optional enableGuile "--with-guile" + ++ lib.optional enablePython "--with-python" + ++ lib.optional enablePerl "--with-perl" ; meta = with lib; { diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix index 53a32e09f87..874a73dae8e 100644 --- a/pkgs/applications/networking/browsers/eolie/default.nix +++ b/pkgs/applications/networking/browsers/eolie/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, meson, ninja, pkgconfig, nix-update-script +{ lib, fetchgit, meson, ninja, pkg-config, nix-update-script , python3, gtk3, libsecret, gst_all_1, webkitgtk, glib , glib-networking, gtkspell3, hunspell, desktop-file-utils , gobject-introspection, wrapGAppsHook, gnome3 }: @@ -22,7 +22,7 @@ python3.pkgs.buildPythonApplication rec { gobject-introspection meson ninja - pkgconfig + pkg-config wrapGAppsHook ]; diff --git a/pkgs/applications/networking/browsers/ephemeral/default.nix b/pkgs/applications/networking/browsers/ephemeral/default.nix index ad2d69edd4e..338ceaa4344 100644 --- a/pkgs/applications/networking/browsers/ephemeral/default.nix +++ b/pkgs/applications/networking/browsers/ephemeral/default.nix @@ -11,7 +11,7 @@ , meson , ninja , pantheon -, pkgconfig +, pkg-config , python3 , webkitgtk , wrapGAppsHook @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "ephemeral"; - version = "7.0.4"; + version = "7.0.5"; src = fetchFromGitHub { owner = "cassidyjames"; repo = "ephemeral"; rev = version; - sha256 = "18chvfdmka21zvjgqfpinm3nrj0ba09szxhhm39anpvpbj92ra8j"; + sha256 = "sha256-dets4YoTUgFCDOrvzNuAwJb3/MsnjOSBx9PBZuT0ruk="; }; nativeBuildInputs = [ @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meson ninja vala - pkgconfig + pkg-config python3 wrapGAppsHook ]; diff --git a/pkgs/applications/networking/browsers/falkon/default.nix b/pkgs/applications/networking/browsers/falkon/default.nix index c1d40fa770f..f39ae2f1669 100644 --- a/pkgs/applications/networking/browsers/falkon/default.nix +++ b/pkgs/applications/networking/browsers/falkon/default.nix @@ -1,5 +1,5 @@ { stdenv, mkDerivation, lib, fetchFromGitHub, fetchpatch -, cmake, extra-cmake-modules, pkgconfig, qmake +, cmake, extra-cmake-modules, pkg-config, qmake , libpthreadstubs, libxcb, libXdmcp , qtsvg, qttools, qtwebengine, qtx11extras , qtwayland, wrapQtAppsHook @@ -41,7 +41,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules - pkgconfig + pkg-config qmake qttools wrapQtAppsHook diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 1bf97a8ad98..20101258da5 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -74,9 +74,9 @@ let policiesJson = writeText "no-update-firefox-policy.json" (builtins.toJSON { inherit policies; }); - defaultSource = stdenv.lib.findFirst (sourceMatches "en-US") {} sources; + defaultSource = lib.findFirst (sourceMatches "en-US") {} sources; - source = stdenv.lib.findFirst (sourceMatches systemLocale) defaultSource sources; + source = lib.findFirst (sourceMatches systemLocale) defaultSource sources; name = "firefox-${channel}-bin-unwrapped-${version}"; @@ -89,7 +89,7 @@ stdenv.mkDerivation { phases = [ "unpackPhase" "patchPhase" "installPhase" "fixupPhase" ]; - libPath = stdenv.lib.makeLibraryPath + libPath = lib.makeLibraryPath [ stdenv.cc.cc alsaLib (lib.getDev alsaLib) @@ -131,7 +131,7 @@ stdenv.mkDerivation { (lib.getDev libpulseaudio) systemd ffmpeg - ] + ":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" [ + ] + ":" + lib.makeSearchPathOutput "lib" "lib64" [ stdenv.cc.cc ]; diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index dbca2e9c92c..246bffb8bb4 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,965 +1,965 @@ { - version = "84.0.2"; + version = "85.0"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/ach/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/ach/firefox-85.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "00ad2b1cf208c43fef463979c39a6e1f272d360b4b539e3255aa9f17bbc115be"; + sha256 = "af7632d2ec4772c1532745b44509ea429681fc41295e8cd577bded16aa56920a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/af/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/af/firefox-85.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "fa9b27a4e23dbad3bc87ba275df4cc87f44bfe13f009268f4ea70ff31ec6e847"; + sha256 = "9254217dadb1fbdc58d8f2cb565a43cf22a48a9621dd9b25c274b266dfaa4a94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/an/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/an/firefox-85.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "074206329118376889a1a8f414617c821e9fbbc35a8f9b8d38f3dcd1622280cc"; + sha256 = "e92e9b30f6646ec58a8a963b4017883058058e52bb392ac81eceb6cfaccc5f98"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/ar/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/ar/firefox-85.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "8871b4c191aed7f5923f4dd64254a41e03780c66f4179c3a54768758c2f99f5e"; + sha256 = "29d207b37c8b8832183256c5434da76bb41b8c893c728678877b6551b40f8d82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/ast/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/ast/firefox-85.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "a2a143d21d9381410896ac90fd359a086859183fb5e8f18a71157be4263ae481"; + sha256 = "aa68b7807a1cdaa0c780c0da2afcaa5b28946ead2c6f5ea5adfab798f9d223b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/az/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/az/firefox-85.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "f8493138759fbf0d2e9f13c3510c51b1b343fc2e10eef9b96d083a35e9a57a26"; + sha256 = "c193052c8ee725d6c909c4f84099d1f72de71ac59318f8fb7f959322ea78e315"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/be/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/be/firefox-85.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "a943d5f372ab63cef96d351f52d248cd2b575756b8a53c9d17b88035c8022bad"; + sha256 = "54bb585bfbc3b910ac95dbce7b1507b210a871bece19df250bd871fdd4354e18"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/bg/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/bg/firefox-85.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "d3c12c9a43ae9728fffbcf016a03bcf1411fb891e8bb84a58b9f3cb5adfb9a68"; + sha256 = "3199a6111d85e00c63314f842adc8277d54bfbb457172bfa03f59fc186d0213e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/bn/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/bn/firefox-85.0.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "95c19322009f9f8be9f2e11d0baa530111db13fe65d93e93d97f8953e8653741"; + sha256 = "c9767a236edb36585348d7d69668074ff8b7bf0ce8bf9461660fa3f5002b5700"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/br/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/br/firefox-85.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "20178f91bbb29ab3994db94fcb0929a15754395a6c5c1a2a5f292a3e0fe97ff6"; + sha256 = "4f5cc23bb984de4703f0861c06d51621851149cf7f140439f4e628b760f7e6b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/bs/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/bs/firefox-85.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "c61a7cf7cc981175a2041534dc90548be21973c7b520a6e4f3da45e7d8f5b509"; + sha256 = "fd09d9c54505ed70a94a861bac653c89b1401f3dd8bcfade90a0b43517e0bb12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/ca-valencia/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/ca-valencia/firefox-85.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "a52c5fdc41d360a660330ecc055ebd2206a7ada996af17bf76d97e5a82dc552d"; + sha256 = "3b16d75fcd1f5cb38df9a3bada0dd59c050f57d4b19988d413dfa910a07a21d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/ca/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/ca/firefox-85.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "1d827df4ff4ae8eecf1cbb888c8f011ab0320c05a878da0b24e8e0b4abfb1a59"; + sha256 = "e3736de71272be8fb64762f48175d8f3c5efa001f5ef683327a706bacdbfe412"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/cak/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/cak/firefox-85.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "dfff83803ed04547aa8c8c9b12ee2fda7388017e8e17bab3d2d1244026779b8d"; + sha256 = "a75a176b989383367b973b683a0755a283350aad43e2b9f8825561a3fefd9bd0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/cs/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/cs/firefox-85.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "601b791c8829653f4eabb08c5d66fba83acddd001b1ccfe2f1f3b615808c9928"; + sha256 = "40060c9664c9518692601215e86047f05e9dc1d7a51454b4e2097f6dddab5be4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/cy/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/cy/firefox-85.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "aa14be4f6e6adebfd11e334a305355ed4cf199d3d578c7648b6f42fe73275b3d"; + sha256 = "a015e8b04695fbbc19f98361ea1965cb5901ecf285ed2a56f073b8ff0abe98fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/da/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/da/firefox-85.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "dcc37cc52c473b77f9944eae767cc218330bad1d4753e3da7ae9bc1d59b6ea5f"; + sha256 = "976e53318750b552292d899f4534541cfd02d64c18f3f1f283ee6b5eba10f220"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/de/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/de/firefox-85.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "5d7332a8b02c84afdca3fa0876087312dc8abfb4307cfd12896aa9671b6dc855"; + sha256 = "2951b14baacc84b9627b714a80dede18897a3f9696b50ce06c48131888b31322"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/dsb/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/dsb/firefox-85.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "a79e0512916e0258d73815fc32c343a908c2bf684a3ee55f6603ed2bff204261"; + sha256 = "7b878a3be6798bc19b06242696a61ea78536a1b39851f9a1d41797192d7313ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/el/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/el/firefox-85.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "fcf89299094d3757c8cec828ea43befc02cc258d3640f7474fc24dac63bcbafa"; + sha256 = "86948d6656659180cc279401106ba7aa420e817b6cc2f633c5f9dde5f2753b33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/en-CA/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/en-CA/firefox-85.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "7849e70478c410500f0e49cf3372e7b3395a8668e2df13641450db2e23485f0b"; + sha256 = "cebc4e8e9320d0141e2a81b4e54177103f6bcf69685055e3ee1bdf59b2188efd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/en-GB/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/en-GB/firefox-85.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "6533bd93be6777db55a0787447b97d0cf32d770ab79dbb0a4689e528c277e807"; + sha256 = "377b3afe2fbf6dc6d953658fe086347b795a25131eb9374465fe0b7089d22d04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/en-US/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/en-US/firefox-85.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "4d987bc87b56dfd2518e162401496c247750ca0a18d8c9072c9ad1ecbd67cbb9"; + sha256 = "addf2e4094d4b1f4d4445165a1f52fbd2198cde5fc9c213aef1145bfe8fffef2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/eo/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/eo/firefox-85.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "88bcb8ff61ad19d3a9975b8a8e302b2b4f37303c04e02770e5eaa6a99dc8a1eb"; + sha256 = "0393c54f640bba1d73c5a8f7f128d6c3d28b633432f72ec9fadc5305c6a394ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/es-AR/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/es-AR/firefox-85.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "44469a62926e451499b3f813034001dcd9228c80a05d9d69431b9918fdc6b99b"; + sha256 = "700a5c7c906514dba573c72ebd92fd2809351382b870362a9e73d295ad68ee7e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/es-CL/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/es-CL/firefox-85.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "81e42f8acedd167a1f69d500fca94752a5453e096b471d07e86adcd99e29b40e"; + sha256 = "dc76f5b7690326a51ef2606bc19946c329ed3a4174cbcffe9193ec7281c03d83"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/es-ES/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/es-ES/firefox-85.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "4b47dcf3b595b5c0011a8f8f56f938991cd68576cf4655e04e43ebec14e1256f"; + sha256 = "57e60cf15b7562d5766c3bffe511b43f50b9ee00c484344d7997b1dd74e6000e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/es-MX/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/es-MX/firefox-85.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "c54dcd581d45d273b8b6138393a662b4618e8bd181f625cda6d23ca6b9baf358"; + sha256 = "77531203ff37345f9849b61f0c163c573c5ac5091e5d0e07037681609e0cac8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/et/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/et/firefox-85.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "2fa06a0e49fc69719acd018148a400c9fbfb3ad68ad13183b1c26971337474b3"; + sha256 = "a68e6825149007d042fc9f1fb359c18c8cf09da6bee0ef3d9f2a619bb2985b61"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/eu/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/eu/firefox-85.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "9171ab64137fa21b4ee50598d244af0760898c6553ae060252109314b997fcf0"; + sha256 = "7a94fa17efff869247b65eaf1c8731c536fedfc46edaaffba27d0367033a54f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/fa/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/fa/firefox-85.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "3b16e8290e15999a29a9ac92d8294ac212e4e9e4c96fe2ebba09ca43dc66edbe"; + sha256 = "732417908adb7da3a9a06ad9022d3f487f6650445b93c406d6bd03482a622401"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/ff/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/ff/firefox-85.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "1124cd9611e9ccbfe1255afaf8cf3591b0f61d0d2e63c4cae877209b8c591ba9"; + sha256 = "defe2f208ba27521850ec1fd8abe73c181004ddd66bc15d45a2d01c8908fee97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/fi/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/fi/firefox-85.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "e3afa4a74b325d52b6cca0436b36d7d5c0d4e2e50755da28aeb587411f705e8f"; + sha256 = "247ad848a34946c93129012de65da3153401b3a1dbd41d132d03904657b8ff87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/fr/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/fr/firefox-85.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "c5470bf4a8a71985bb356c0e56b516108ee6abd6437815bfaf6e3c2f5fe09e46"; + sha256 = "ac56118839123c10899e043fde74051b4dca211832c2ca4abffc42062773648b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/fy-NL/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/fy-NL/firefox-85.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "4608593cde1c810cfd1301f87fe348b5172d92863416b5b135e2adf8b41a5106"; + sha256 = "aff1bdd3559698eb253e6339088a1818490bc11fcec08560fed9732705d8f12d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/ga-IE/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/ga-IE/firefox-85.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "64101b561b5adc391c79347b870784d18f9b8457ea8523b5cd8448aa6f9ea80e"; + sha256 = "b3aaaa9b45865d0be2fabaee45ec8ef481cc92afd93976058441c3c801f71761"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/gd/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/gd/firefox-85.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "1048d1f82dc14c4da5954b3e8da2b0cddfe2ec31e9cd520a60202655771f260e"; + sha256 = "979140c1d5db3ee847af64eb86e97a657f7665cc85e0754d4f580229a81a6a56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/gl/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/gl/firefox-85.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "bfd82fb48bd4e403f60acc217c48f42e2ad967f9810ad632e112354acdf6f459"; + sha256 = "8953815137c2f40fbf490ce41f09c9f1c44114cf0640478e22e16ad67397f99e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/gn/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/gn/firefox-85.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "bf4d24303ee087df005cf04bb1511ebed5635c0b6a27154d292d00240ac35ac4"; + sha256 = "5b8887274069e3c14ba4911cf64e01103ca2b2092f7819d535932ef09a486656"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/gu-IN/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/gu-IN/firefox-85.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "3669c53042edf83d37ad4e7ab7486f9ac3c2535811fd21fce45188b153b3eb66"; + sha256 = "f18ac181d0b5dedfc107ace1b257475d7ff75e15f069db183bd445e91ff066fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/he/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/he/firefox-85.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "cf83947396daac7bf4c53d97a58df2fc856056833a3547ca19289fb0b0f4b895"; + sha256 = "b1b4b4bba5379e6aea2052dce060a857d545abedb75beeb09132c83d89315772"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/hi-IN/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/hi-IN/firefox-85.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "f497cd8173fe2f4b4e14921805004ce81b5e8f63f70b3a135a9be787ad34693d"; + sha256 = "9fa023800ee3db1485a18ba33ce6e4b004123434da4b7e177e9413cd9dc72293"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/hr/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/hr/firefox-85.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "6e2eb6ede94ff51ab5d2c57744c16738bba50beb5cb4140d42ae1085d6a186ec"; + sha256 = "5dd335bb622a37629874680a132b4199dddfc341ed6cab7c34cc8bc6fef8fd33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/hsb/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/hsb/firefox-85.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "99fad7bdc3db88dd5fc2d6244f37716938f2fa44904ffabfe44a25840b390716"; + sha256 = "f89219c755fe8aaf1309c6b83feffaf6630816882563286e324a90ca62394a5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/hu/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/hu/firefox-85.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "bd94dbefb12821ca1e0232dff9804ee7e1caf5fdd3a5823268f757b70f467930"; + sha256 = "8bff8576e76bc01e57838ec7751a8cf17d99e0c9dc153e91061ace650d8c058c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/hy-AM/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/hy-AM/firefox-85.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "b9497158d7cce081fd9f6c4c0eab0871ae00eee7745b59544f63026b48757c83"; + sha256 = "adab4ab3ce22632836266963323a75a81db9e653614b9b639a6f61eeb10543a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/ia/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/ia/firefox-85.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "cd4f2462e64989151e4962cd89f8d3e97f295505bf1c447db6549f898ec6a38b"; + sha256 = "8b4acfb5654eb694b50155cfa41e02e19316cb47e552fc6537339156bb5cbfca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/id/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/id/firefox-85.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "0c0b086fc304ed4ab1f23b659999cb303b9016962d26f0509b73009a9c651ae8"; + sha256 = "e848c3877e0453d4ab9b6ccf6078fb919c4d15b1f0f20c1a975654c5e6182530"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/is/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/is/firefox-85.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "a7482f969ad5e537c1d8084cab54eb03b12860df4c084a7aaf51409577af6b49"; + sha256 = "00036a6977a932b547ee5b97f5c830456cb19393cda45c190ee5237e796a76e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/it/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/it/firefox-85.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "2139dd8f281de5ef79c3a3671eaeb0704db0dcff286df6da44351fcc5d102864"; + sha256 = "81dc17afe61ed833494cca7687a1bea1f6a5a3d93571ae0522e481ba2c9e73aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/ja/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/ja/firefox-85.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "818b66e1e9ff60f30bceb6b44acd2c704de5f64016de7bea45a4110118341314"; + sha256 = "2f0a652d51740c9adc760a8843433a52226327600fc7e9e87b603e97c0541547"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/ka/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/ka/firefox-85.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "805d101b7977061af0d5e3b99a8980b972aa4c8eb6ae9914d10c527a58a6aaed"; + sha256 = "8f01dcfe02fd71d3c3d564ab111b34e4f2d5c58981233c5698c87bf449144015"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/kab/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/kab/firefox-85.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "34a75868f2e8da1fb87235b29b2b1fa7d28b55dea8351a472cc1d752c1b084dc"; + sha256 = "1163788f9d943533b124a57fb3e3fc1aae56793f929e5ac2d3f17b1826e3d353"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/kk/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/kk/firefox-85.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "a8c40b1ebac7d0375232518f35b854600f35e52dd6b0123e86a70cb0f3386406"; + sha256 = "f91eae3b5afcff6c49548c6d5d5d5b0fc0dd6a9500b87baaf00e0cee96efe22f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/km/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/km/firefox-85.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "3ccc2a85edec4f90c39d23ba74474e27326ed18fd020847d567ed93406ca9678"; + sha256 = "2ab5040f15ceea952a7fb6d737eed93b23e1423e2298c31a5d7486c81ecab9af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/kn/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/kn/firefox-85.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "634c0ba151f9334f4991c2f118b96de45d8a4fe359a08c3cb001f3b813d89198"; + sha256 = "c141f0e1c95c0630aecda5f929ea3720f3620ad9f30f95e4e371865c2d0eb96b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/ko/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/ko/firefox-85.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "d085163b35684903418648648dca8ad078e1a89f611775ab4b01fb60aa4d1b2b"; + sha256 = "8e87b7f748f2fddb3edf5f12fcd8238bf8f05b403c707471878ef540f8fa2a40"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/lij/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/lij/firefox-85.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "b676b6f955441df571541b52b6534ad12caf5df45d16dd374b3cda19d58e990c"; + sha256 = "99e4be7139c456c7a7da8d1ba1b845d381995241940b9e9f3db81892cb51231b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/lt/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/lt/firefox-85.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "eb5499c40bfc805599e51f490d1bd860c6c46512f927a47af3f9ae5bdb9e3fbc"; + sha256 = "acfc0ce0b56a15d2b5a7492807b9b70b801712b420a72d5b2e73a6e5021cce71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/lv/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/lv/firefox-85.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "935e736c0d46254d8429d87eb2a72e46c9c70c92ebdb1fd1077798e538af770f"; + sha256 = "c8bab5353b01987b6e3ee434ec5460cb54d56183662fa9c7f3017ae018be575d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/mk/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/mk/firefox-85.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "310fcae105829fd03ede31c32e1f078c69d1bed7880469976159968de1f7ccfb"; + sha256 = "7ba1d47b8923862ff2228faeaf86a1277dd48f45ffa83230f3b9b22b1860febc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/mr/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/mr/firefox-85.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "acd8be31fba57a9ced68960c1dd28c9e91a88433b0b885bd3f8e2656a639e3bc"; + sha256 = "acbc9dd00e31437bee02f9d3548af926ca021f128239f67ff5399e533923e2d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/ms/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/ms/firefox-85.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "71a6a63883123b19e70c0bb1e6251550fa4b5035792c7b767d47839428d4e0a9"; + sha256 = "6293173ccfcd0475b6ee0baffb54d4b43776710b3c4ea97ef1437a8919aebc1d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/my/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/my/firefox-85.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "121264d0508aa26f9d6e89620bb1821d07763c28d5085b5cf7d0ce90704bf983"; + sha256 = "c4e075996c9a6c13e2631bd85d6f5b3015400dfa40116479e5a17c939d538cf6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/nb-NO/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/nb-NO/firefox-85.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "9b930c9e5e92c01ae89c7388d6a168d83b4e95f945381f1301a6137795f4e017"; + sha256 = "94d8f6ea965080e0b28d797c0c73813164216541bb6c008adffa523722a2727d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/ne-NP/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/ne-NP/firefox-85.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "99994740252ec76e9728950d307762acec5ab6555d4b5921d89a083447bd7e70"; + sha256 = "129ab6f7276d180c3adacfe970c4c870953481790b451f8dc98134c914daddd6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/nl/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/nl/firefox-85.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "cbe751edd3b72a8cd823b9cf548ce77e3a148bceac4861853d1374e79c2cf694"; + sha256 = "0f7efdcd52cf5c214da536261e539b45d8da3ad37543b6296feb92186053a59f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/nn-NO/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/nn-NO/firefox-85.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "f63c3f08d01d8963d8ec6047b69efec9f36a92d822a8ae966cc2a7d66f33f93e"; + sha256 = "2e42e0a8eb2dc2fcd217aacd7c0aa7eac5e673bad0d66f0555f7bb51ffb895fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/oc/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/oc/firefox-85.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "675090877a1cb5841ddb98c5ba8ebaba9d4ad2d4de9d17c7e9559ba6a8b2e1ec"; + sha256 = "d4fabdd18ca199f6081093fe4c88191885ae0c19fc36fe574f546b26b5d2eacf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/pa-IN/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/pa-IN/firefox-85.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "6fd35af9216a1099c246f9e12161384d6a5d1d24e846d3aabe5bef3a55b215b8"; + sha256 = "88ddf2bc486d13217edd3d325247dae774ba60d509481d7a6900e06ae30f70d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/pl/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/pl/firefox-85.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "54cae52178e21f0f2beabe1120746962141cbf79fb5dc6eef11ae1f2705e9e4d"; + sha256 = "9e6336fe8745e21674270a95bce7d24508c9585955c58ad74f631e1fa73c56f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/pt-BR/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/pt-BR/firefox-85.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "f1dc18aea91440dfe5e34b332c2e2b2b0241d7af1c1a8f2a979eead34db64480"; + sha256 = "68573084e4a826978bfae5c1c8cbfecba2fd578d0c6a07affebc2ba19f1d97e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/pt-PT/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/pt-PT/firefox-85.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "c2159af01743f1004e3dba0b99a2670155ae3e695f0fd0208b367f910bcba642"; + sha256 = "6b6bcca14f08cb8fe07282a3b24797417ea73a60300cdf76c64ffda4bfb051c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/rm/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/rm/firefox-85.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "211813cb32c9f2b0880c7116dc935929570c81937d3446aef506da3705172099"; + sha256 = "331c0cd9510564ade274c209514dc5ec3647e3ea37da6b630a7cefb8c445332c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/ro/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/ro/firefox-85.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "a2144bde6023d4b8468128c52015849e6a8f77c0c10d4851a9255f6204a98a77"; + sha256 = "52df2b116aaac13590076b86216b904def287e18828f040980cae01e8ae67b1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/ru/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/ru/firefox-85.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "098748cde08f1d362a8eed6432353a1edabc84579abb30aca983772c5b6ac36e"; + sha256 = "2fbcd36492688e21dc4e8fb1faf1ea67ecd745f3b7f58b0950786120c9043cf0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/si/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/si/firefox-85.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "41707b3e3b7dbaaea510c58ba503fe22de84963fe1979b2e4c7e00cdf1ded01a"; + sha256 = "2a4ab4bf9fee148931d09bae59ec1f049c09aafdcfee3c6a083adb3d2b1e42ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/sk/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/sk/firefox-85.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "4ba12f304145102db13feaca98f84bae5e06609c721967e1b69d68643a94c1db"; + sha256 = "4ba12a5d49a2ee0f5c41f63cab08b7c161f3546ca9195339e22d463879e7f45b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/sl/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/sl/firefox-85.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "2dfafc7ca5fdf0a03a8301f1daacc397fc49f3fae18f6ac6454b4110c5bdd65f"; + sha256 = "6f1f6379a9706d2af9c7797d8c1c86700f3e9ff7cd72fa35c3d602e6622de47e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/son/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/son/firefox-85.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "13139fb6bb47472c2ce47dd535bdeea6fa90521681c2a8e8ea963bebecbdd54f"; + sha256 = "b9292626bad35a50dcb81d34db417417b031a6ef9a215e26d5e1ee9456e244cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/sq/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/sq/firefox-85.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "9710315181f78df3673b71fef597b9498c0a860b167ab4b9c4e68df9c500a6be"; + sha256 = "077dbbaa904712782252e8f8a01b78237d51cbbeeda0e455ad5f2569f9a394d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/sr/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/sr/firefox-85.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "bbd69589dc5a1fe7b3a0f74c0d8e20cb4cf6b7ed771faf7c161c96301736e89c"; + sha256 = "c537ab1e63530a82cf5c181d98895b580705e3418f598ab3f98fa67cd9a83f10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/sv-SE/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/sv-SE/firefox-85.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "a5769159d0c7bc89865ffe1e2fd6b88675afdbda29752ebdaae986f0ace7d3f4"; + sha256 = "42e36cc411666fad716a60643eae0be0301783fda10cb07943c8b6df293430dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/ta/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/ta/firefox-85.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "836aef11ef967ee8c74b9c4221525c31427ee509b798952b59a43a6c7c2169f8"; + sha256 = "b77e5c448f6a1bde09da07c3b20339f54214d89b4394123809e7bec668d65abb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/te/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/te/firefox-85.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "a8e091052e0f606ad8b29b344d65cd86ee45a2b349c99e462f96cc36c08c18e8"; + sha256 = "8c700eb9c7a9057e4639c39643430667ed9099a37d2214c8ffc5d349e5b0fe79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/th/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/th/firefox-85.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "17679aff5806314398ffd9568be11157f41b0820313394f7c59c8bc69af8cff2"; + sha256 = "3a467b98fb435e80bb913c56291803a79a05a42c73576be49b014394a29002f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/tl/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/tl/firefox-85.0.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "7fd68265f2d1187dab49480004355d241fbe628cf9bce7a613ed5e048df9223d"; + sha256 = "599214c5dd5eb28d6ea3b7e2db8795ce4923284c721b15a85bcbdbe74b416c5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/tr/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/tr/firefox-85.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "0eeb30611cd3da04ef0c3439e59a3c2c46f2d38b566795691f8992041507550a"; + sha256 = "1192f241df3a8691d0e895737c03a790f47a731a6335d2ee2fd1e1310b3d0cc0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/trs/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/trs/firefox-85.0.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "31ed82b3b45c9f9e6a84fb57b32c23468f42d4072b04437db5dd62f1d541ea80"; + sha256 = "f68c08305ec3d1396826e3310ac88b5b07beb71beebcbfaebf3ac81c543bc47e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/uk/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/uk/firefox-85.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "bee267b4822a44edfcacd11bc6aa83ed2957dce95789926ea3cf3d714fd99542"; + sha256 = "4705551ac9a02b450f5e81b05a08912b7b26bdba99b9e9095461aa9c70aeed36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/ur/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/ur/firefox-85.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "1da5fbc3e3b77a102d00bd1db146944640b9e8c5a9c7c5222a3570281846d1b5"; + sha256 = "ec84dd4c7a4e338a21ccf8f09c1dfb14a9e34e3240a55b92901cc5e6a89bb135"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/uz/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/uz/firefox-85.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "11b92211b88db216ee17537c27d86511f827a7435bbe3cc0ea39d0c015c55c0a"; + sha256 = "d7a5b1c95cd9c8bc20cff8add8a2fa9c9c909b3845cbdc6f593f2686f9f27a40"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/vi/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/vi/firefox-85.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "29e1f625c9862cb13b5f6238ba2f72200b864abf66ff44af11ca991c67a742d5"; + sha256 = "a3c1a719317c9fc73371132dfc0349dce50db061c4f96d32585bb26d0aecc7c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xh/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xh/firefox-85.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "6e859ba83b1fcc2930db6ac53ddc5f36ec2bc325b034337c33a2e5b531f905d8"; + sha256 = "cacdaf5b7044a7e951fd67c4ff25ed41f2fe05a6cf2f4ff5b9d8d9fb0cf211ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/zh-CN/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/zh-CN/firefox-85.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "afa32b9e1560aff7c7a6dd9d3c627690ee70c20ea5748f1754cc8ebdffeccb15"; + sha256 = "888569bd9bf58a58ffd5effdc4f0c58ac53354cec5d2792f0d88cfb30efff4bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/zh-TW/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/zh-TW/firefox-85.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "5f0ec2ca348b788590ec4eb552d34c204612895145521eb53a3b1dd73c34eafc"; + sha256 = "71e1fc336cfda1401b4d96ed185423486480a5ad4d267d3c94336470fa4a8bce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/ach/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/ach/firefox-85.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "f003b9197505256cefcc96a07a3314ee9438a5024048d9815691d5f149233e67"; + sha256 = "efcfa1aaac69712596c7f5ecbaf359c69980eb0b4d8c99857085f3a4564d5026"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/af/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/af/firefox-85.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "67b9eecc70db21a150ad45682be637e3c6187cd8b0ca3fab9c20e12517372925"; + sha256 = "b5e1eb9041fdda259a3db87d784e6b633a18f18c46038361d4a6d2a8aeadcda3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/an/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/an/firefox-85.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "08fe11419370ed3e8a47819f22bed8f5cc4cadd3296dd69304a4fb5f5a7a5dd1"; + sha256 = "35ecf29bbb2e65feb372c83d2bf6b1c28b6edd57873eaec3090ed0200121043a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/ar/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/ar/firefox-85.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "fb85564a9037ee9168dfb14ed9f743affa5cd7829e2f2637f75184713db93712"; + sha256 = "ef86ed77ac7de83e4e068970f57843ab801f89f180837015f1ea4e3ea11f3b6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/ast/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/ast/firefox-85.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "89c659c314dfe2674ce65a37793c151db5c127452e786f77772c1db7b0fc1aa8"; + sha256 = "6b58d2d132944a5106b73f47bdffbd606df63173f817bbdb32c4d3b2354030a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/az/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/az/firefox-85.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "9062c6fcd28afd070baff45df8320aab43e61e7d6343945bd1304a2b8fcf78ce"; + sha256 = "1ee85155d8d45fe003bea0d8ff9d5a1c40c4d52102e125b4bc1ad608b5383c39"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/be/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/be/firefox-85.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "0043bb412b2ad9c4bd5f60199f8e3c3e1d81b8bd35d687c909ea65cf0a1eaedd"; + sha256 = "e6f30798e101d73b0e359a63a35b044ea51df964f1e22a9c894f1b572cb99653"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/bg/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/bg/firefox-85.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "97ebda162b20aefad89ea918896a1d0a2b7546a67b577000f4ddb6cb93bc5a32"; + sha256 = "e3bbc6ca6c77fdb56dac6c8ad0c45d425485ef279c115651bb4824f6d52a14f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/bn/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/bn/firefox-85.0.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "705b8e97ca21e14343f16c39ac5a081d866f7b422be154eb55cc4ebe728ef9a3"; + sha256 = "583762c0fb01f6ee1165eb98122940fc42286e6f8678679466a2b79051a45fd3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/br/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/br/firefox-85.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "8a61f457be78003ba212b9921a657428d117bdc978e1f62eb4ba2b2cfd553b13"; + sha256 = "abef23deaac27bea07d0586f78578b34407765c05cdeaa9bd4d4ea0b552bafbe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/bs/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/bs/firefox-85.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "074a4153395b6397ffa5b2a74bb22b456e15357a760003a4dfc2c5974e8efa1f"; + sha256 = "8f4385e1a8db5567d499a046a169d8a77c585a61734ee7257063a98d722cd278"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/ca-valencia/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/ca-valencia/firefox-85.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "87109dec410e6f57199743666d46e81a42fe6364cb55742e24391d922bd8c0dd"; + sha256 = "eca948e8e2020cf401ac4dcaefda2aaf967336122e1927418a80d9a854e2e52c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/ca/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/ca/firefox-85.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "7ab7be9dd01b25f119de9a432b1487a506d5b8306b7c516614feb9a559de6cdc"; + sha256 = "c46250371ac43baaed265e74998e0bc44fdf01c4308f1bae8e34896e75004096"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/cak/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/cak/firefox-85.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "e5518707de8deffc05024f76248711b59037f994a1b6883e65243a01a82076c7"; + sha256 = "64dace82a39b131fad3509b2865a6cb22c5044a88838187f975a9c3bbb5cff2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/cs/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/cs/firefox-85.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "682add587e420149a34cdba03a0b91a7190a33753bb40972836c8e12110ea356"; + sha256 = "799c10e7f4068f4122637f4e8ae992f4da892b8f4ae17e47e2b93ff9f61f236c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/cy/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/cy/firefox-85.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "396764a821b7333aae3dfa6924e5246ac6aeb613470e5098ff542aa5d7dca65d"; + sha256 = "9075bde46721937fc83f891a3f3162969e61c8ae6aa0904b6d597fd5c2872e81"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/da/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/da/firefox-85.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "28aa6f2f3ae2fd19b5b6d149c1bf735ae55c56ff3bee0646bef98dcdfcbf3dff"; + sha256 = "d1bc56c35db77e1ed7c3b206ca7906834edd41e8d37f5fb467fa75eab22b1c6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/de/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/de/firefox-85.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "eefb48753ea89ebbd27e7357a22ae7246086093d7054b684ed8f2ed1dbd66835"; + sha256 = "8430827afb4a748890d1b114d3363898ff6a882b2a17165a10abe8ef385ec83f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/dsb/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/dsb/firefox-85.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "65c947541d4c6125b292b6e5ac61486bb434b56a824e304c343464d4a8ac4021"; + sha256 = "e6985031027fc9d4e5d8ab0899daadd93a5333a668b116b632181ed34006ae64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/el/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/el/firefox-85.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "86d20281cd16436acc0c015b2a72775ab3beaf1f52348181131c210448dd9ccd"; + sha256 = "4e5bb6be18e963006f30a1478194b6613ff922e9dd3939ed7df5e2d79df5c630"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/en-CA/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/en-CA/firefox-85.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "d71c02929a7e4b08bfe1d83eaa577755d7dd1074f2328c428bea73c1bdd82920"; + sha256 = "b172f0368b07b6f908035e7d41a95ee8abd9c21cfe77923d902ec53517716a6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/en-GB/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/en-GB/firefox-85.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "5ef6635f57a34fab6dcc54462b621721063ab354798d8924e8621895fc3ed4ac"; + sha256 = "3e64db811fa3cf989dff5b043b9ffc3349f119ce27185fcade110e57ccb66056"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/en-US/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/en-US/firefox-85.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "7008acb0a5112d22b02f75fa8b46ecdb46dc2cb0ab691791595f2ac45187d6e5"; + sha256 = "e6269d7b11bd0e2d918e45059d201a2ae329da6ae69d33648de1e8ed885c65fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/eo/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/eo/firefox-85.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "e9dadf0b2b655bbcee8557805ee1b93cfef911c9c1a60d63b31afc84f06f9021"; + sha256 = "fa1e60db4ff414b96c7813545a5b67730f312cbd85bbf079aa4c03eed5dc0920"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/es-AR/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/es-AR/firefox-85.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "3ca485c3eda6a0d2cf348d2870fa708ad374dc0fc830696484e0c2ff5ef3c967"; + sha256 = "f65977cf029a0075e2214708719a6af4b8e41d39bbf59b1ad998a5fca460c717"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/es-CL/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/es-CL/firefox-85.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "e69f6b048f42ff8eac54176d5b3c85cd31ce02794f22bce2a09fd262d62789a1"; + sha256 = "94cf0ad46c52685c03c385ca80e159e5ddf229f31c8ef764defa50dfb5e59857"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/es-ES/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/es-ES/firefox-85.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "1cf1ea30406e16564fabd54b339ebd2111498eecbf25ec93c7401e2143e1d456"; + sha256 = "6603132e1660a50ab3f0347a22b52b9480f4bac21f67f958fb0f112205f3dd3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/es-MX/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/es-MX/firefox-85.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "94a8ea4e1fb63470a46a83678f71698b151ebf9c57794a086a8982d29edc0706"; + sha256 = "325cefd6f0920207fdcb11674a4b5a3f8d71a4b65e64c11f7ab3681a7a1ffb08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/et/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/et/firefox-85.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "b4fde31f58defe8b35d4c9325f1485093bfb155c73f6d3c02fa3cdcbc8393105"; + sha256 = "9e997aac788ad9c5d249a2e1cce5f3a968fb5564c67e585f842d576aad5b710f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/eu/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/eu/firefox-85.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "d84a2bdc2f55b57c612abbb0208ef4b7683ef7d696739e9b1a36238daf61ab9f"; + sha256 = "c677e6c0e86ce007fd0027132891b0baeefb172dfe19b8a3b6c0a1fdb09413a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/fa/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/fa/firefox-85.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "054e6269745c8ae120daab489a9157618956bf2ecbc309bc64b7fb2f73400766"; + sha256 = "4961d99cfa342ff1148f751a7ecb480439f2850247e4b4815023ae767cb92c55"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/ff/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/ff/firefox-85.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "1ebef6026207141e0d3d37533ecff2b22a4e936e27a58939fbaa72d723078049"; + sha256 = "751d7fb2485d00f1653397cbab88e0131b959cb9fe94a2c74687b05967a0efe1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/fi/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/fi/firefox-85.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "9a8609ae113b392d3bcee30ae48c1e8b4ce6a1fc180c7f936c52934fa1911429"; + sha256 = "98244bbd2d914c14b66a2f1b58312fed6ad09d69a8c6e36c6a28b9d6f5b93bd1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/fr/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/fr/firefox-85.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "afcc5075d8455d32360d5045125290c8b843e48f4b774ab48d5c2f49e1cd9fe2"; + sha256 = "c90054aa48353ecd2e7d8bec810e98b8706bc837216bd2237010c50d73890de1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/fy-NL/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/fy-NL/firefox-85.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "232dd4a17ff87945b1ea11183fea8711c572e31d34898d15b378a54697c720b9"; + sha256 = "343559198dbea2cd4f4d66c83fb8c0f44fede93843d43421c9a7e5925a7f834c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/ga-IE/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/ga-IE/firefox-85.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "c68e57472d6837074bb8180063ce6eebf0396b187aa3d47ee9bccf1cd1529459"; + sha256 = "44a19acee4c0a8e03604de46c19c28f54f9ecc8bbf8f32f2e7b3922c11659df9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/gd/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/gd/firefox-85.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "ed6ab375a3e487ee3c6f2d4017f8bde6c3ff29978a8b2f125b58e3ca2472ce38"; + sha256 = "bad179771be3cb0fd0ed4dfb287f16df65a06b78b3741853f474184f534f1ec2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/gl/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/gl/firefox-85.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "28993fb518753a241abb2e6a22583f8a318bfeeca4e0eca76bedfb2aa0a01e07"; + sha256 = "58732e181252d40d59e3acfaaa1da9533e659fa4d3c43f70c03801fe793c7280"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/gn/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/gn/firefox-85.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "370637503e0fa36b937f32867bd68a300fe1bd8d99188ab86ad9392ab5b8a8b6"; + sha256 = "645d6840fa76e286bf107c526de0762c5074ef3b52bae49ee5f02307c52d02f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/gu-IN/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/gu-IN/firefox-85.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "1fc77e276cf34424e3c7522af9bfb5d3dd43e33357ce01b696655c2a91a8f2a0"; + sha256 = "f61f6b052a687807022b72629a22a6b53890487add36634d09e2860d92d6733e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/he/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/he/firefox-85.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "b1ffe2fcfd55fff2b696dd40d3292ad9cf2cde1179bd8c9c7103df9c902b276e"; + sha256 = "5b96a1b4298737182a7c7c99ea43eb7b6558593f9f7b18df4a0217101dc183e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/hi-IN/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/hi-IN/firefox-85.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "d13f74a4a45e7a20a1ec3354dce98f33bef647d6153aed2539cf567a6eb3fcfc"; + sha256 = "e4c393235aaa9d80d678ea2f69092462815705647022fb2635a00174e597eb60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/hr/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/hr/firefox-85.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "f0a288dc290d2665948e3536b7b52b799461bf060be38b957aff7cd52aac02ff"; + sha256 = "3722f05edf8f9fd5adf782291be51b708e7f08943b2f03351b36df00a1ef0d1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/hsb/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/hsb/firefox-85.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "e395166b3039027e56eb6d2d7f97b121c1bd947cd6266829b949b221cbb2cb74"; + sha256 = "e79dc707afdd246540e886522890d6ae2f53c38054c8902303d9bdd03df02359"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/hu/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/hu/firefox-85.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "666b47226545e9e8f45ff09e3428d6317fbe67a197e13ada814b6a4f72544a98"; + sha256 = "415edcbfa2cf3bd0cb1278799914ccd683af51b8e380039c4aaba118e66047af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/hy-AM/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/hy-AM/firefox-85.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "779111633101f8b7da4c84d3d085ab1e8e3502d255316d17eca653b0481d0885"; + sha256 = "4561cf20fea47b11a330be2bc3b517c1c53b4577f250b531225c53f321df7382"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/ia/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/ia/firefox-85.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "e27ac7b8e8d2f3c4f453563d2d2efd3005b12be1696de453182a53a3de490ab1"; + sha256 = "97b44d0e08f79ad55aafe2384b523d24e0147d414b95ff81834feb59c6b07695"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/id/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/id/firefox-85.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "86dcf72326ea283bcfd612cbec0ea095be72fe16d446a317a31c886d91f5b452"; + sha256 = "2b501c2b43fc54f1ba5a89f8b0d19f8d25626584d1bcc108e16e2287f11449a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/is/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/is/firefox-85.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "17305f92a16967d941df34a59706f90b94b8c671d01e8aab768fbfd473a81f78"; + sha256 = "2cc3d7b82be2bad7ab6dc5659bf7a4c8ce4d882964588a2a767e78a34d832b27"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/it/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/it/firefox-85.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "4b2804d9c52c4f9202e867f2540523cc45675b5d34e46a8d59b044c88a840f5e"; + sha256 = "68b3f63b6e561f038894d6503b4fba8177e3fc025a189b68e2da11f8bef11c2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/ja/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/ja/firefox-85.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "6a8bc7abc0c320a31d7fac4e457bd46a3fe7379f795e8cb2f36b2de70bf048f3"; + sha256 = "0023494cb7a5485b1d492c2b9f1eb40a9fed06db0de6a2bcc76b54c4c8b44b5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/ka/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/ka/firefox-85.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "de6b6be1696d20148cb94cfacaee0fe5ec128550de006a6f64723885d47a1352"; + sha256 = "a6489db173bbf47f76379afd09c75912d2bc4b8fdd8023d654df9d5f257378ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/kab/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/kab/firefox-85.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "a898355c71d00c72aedb87901184f69d0598fabc4827c9070ebb900a48dbf152"; + sha256 = "3b060b719b8bf0993786b05753467534e10986304b3251f572603be5aaeec2eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/kk/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/kk/firefox-85.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "1945b3526a8f52cc7cbaa30e344333c43c7d228d557a249fa4f41a8bb91eb4b1"; + sha256 = "7c1139dad1b300c8450357356e6c317159b5d702db30747c1ff7aec31f33f82b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/km/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/km/firefox-85.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "3e033fae06700495784b4eaa911309d250d3e55a94139a65f44248975c414980"; + sha256 = "f9dbec23d5110b389fea294cdecad03772f2471952e9ea01bc9d0462f7541ca5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/kn/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/kn/firefox-85.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "b70553b460d0604bff55ea29657e74b1133995ae93bb958b6b20af366cce2eeb"; + sha256 = "7521548f755d51ed47e9596d58223f699fd4494bd5af8fffc1c59018f20be8bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/ko/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/ko/firefox-85.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "0ed0d1a0219ef92c0de45578c3674da0ba0e8fd9ed2e00afc01b05d53ea28112"; + sha256 = "bed7a64af30ad21413516c201498fbc335125768ebea48cc895e724e6208d566"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/lij/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/lij/firefox-85.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "5fa837001b3bc5d9138ed14e22720933f28fedef63a7dd473976348448cebb30"; + sha256 = "426c432ae9727806af45667948a1f1aed7196a245441054da590931f98b5e96a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/lt/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/lt/firefox-85.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "b54990d4737b71dfa235d20ee2f87367b72f0a1245585135a9918d2755b3d1cb"; + sha256 = "badafabd22ea7934cc2099677c9890cca609c56f3b16a863fa2c977f1e86a9c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/lv/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/lv/firefox-85.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "06ece913374b567ea10cd9377485d0793a12a151e9e3ba08e3c5433a5e772151"; + sha256 = "7caf8f81efa55b69cd51fb5f75652c6d9aeacb2711d9bdbc29fa80dcfeda74df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/mk/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/mk/firefox-85.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "dc69547cdf414f783017ebb8931dd24ad1b899f19bac20bca4d21ebe91963a0c"; + sha256 = "ef22239e208acfc9b0a57dd06781c09dea1afd0303a091cf075c021a5c85003a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/mr/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/mr/firefox-85.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "f503a40041ba0f4e44791f8d2e38c41f25698fd970457fd8cafd92d2d3e64102"; + sha256 = "99d2c32ea14feec74db39d1eabc0c914a8681bc216aa76cd970473fbc06e5dee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/ms/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/ms/firefox-85.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "07491c18e9fe0d7f97b24c8bcf571ede2c4effda58ceacb0395fb7ce9eae1eb7"; + sha256 = "43011dbbc33615a67088619053a2579098e2afaed43b09268e5117290f100101"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/my/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/my/firefox-85.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "19d57112de4c6429e915568ae317c3bef2ef6d58d0c57d5a07be0cb2f1bc11d0"; + sha256 = "d78bb48ec1b01787037d575da259b724db2bfffb0cad1700801ac7696eeacc55"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/nb-NO/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/nb-NO/firefox-85.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "72e6576c3a725675c2514d39b3ea4497590410037aca696c5f3f3dd5109b3c09"; + sha256 = "64f55d03bcdd9132b40cad1a5265cd81e2945022056141272dc0fca22aee2a71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/ne-NP/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/ne-NP/firefox-85.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "fb624e1ea63aca7f481024c40e7b5a47e504ea545169566f86e7ca24e36e7582"; + sha256 = "b3d7c64b087ccd67b56dbb0f9554dd3db6481fd59ec7f46db1a03dfea129c372"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/nl/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/nl/firefox-85.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "a1aab7534d0dde0c61c48bf0f33fb336c12b5d8c644e41188dad7c138531bbf7"; + sha256 = "f2c83282acb30108f4bb381eecc30d61758d1e2279abfb772050b3ed8827b8fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/nn-NO/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/nn-NO/firefox-85.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "d1c645cd0b65f8b48b0497b1a16b25a2e11d8de70bb3e37baf6f05c5750525cb"; + sha256 = "534dbf0d58c85fe21ad9998a703ac4df5a0b7d124c80eaca0b72fe42b97628f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/oc/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/oc/firefox-85.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "f110c97c8e464ace6026ddb3da15c13177455bcba067a54d4c531329a4cdfdab"; + sha256 = "c3eaa5dbee8ee90d735c5e6db3c397011837385d4ac4d46ba3693d3aebd03e1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/pa-IN/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/pa-IN/firefox-85.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "4931270889eb97b55b3bea7177e778422045bfcebc25e4bc05019ffbde438c78"; + sha256 = "66c640b7bfb626b8d851af9f3170356adb3436fe1adbce76961df586fcdac051"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/pl/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/pl/firefox-85.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "c0438fb22ef1c610afc16bfd689d1843d6099e91e6b8a30b03a2f692b609eb4a"; + sha256 = "64d5f25fc15cad09c103fd243d0767aa4d0a6e10940e9229e9fbf5e5354f14b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/pt-BR/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/pt-BR/firefox-85.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "df61ec134c161d0f44ad0805bda8d1baa37d21c618c4f4d165e40996d7ba5956"; + sha256 = "8cbd4c44af5da9fff2baedddfda640661dc3c3e0a2541985a12b0a42a76bbece"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/pt-PT/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/pt-PT/firefox-85.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "a09341dc8284b77fa3bd1c7d5fbc377a93cd21109e1330b0a2260613df3c4e5e"; + sha256 = "5fde2c95eafa41bd9c8da90fbc6408eee8fe8187d18ebc2b9e04a19e662eb7a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/rm/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/rm/firefox-85.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "19016551888f5104227e3cfed6c66b7ca11e11a31d9c007c3d00f6821126fd03"; + sha256 = "1f2b1d0c9695b7a8796670baefe35e95d91a4060137c01739e00033a2c50aae3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/ro/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/ro/firefox-85.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "d5cacf3a2c3cf9c3c6fe182005c038094fb6b8ae58ea169123e6289f7a2c5457"; + sha256 = "77fad9b28166ba65d8514f76f43f4686345ac7ce7cd8e08bb5575da1b042bba4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/ru/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/ru/firefox-85.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "8907175fd858dc243dafd4216b3602f154ce824a2388b714cee9352322781f39"; + sha256 = "58b4896bf014197734a9d8fcd03e526be422858aa0ac109282f0dcd543bb8697"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/si/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/si/firefox-85.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "19be977d9110dddb944e0ca713aa986fb3c005a4f39bde23a4a0b907cb7d39df"; + sha256 = "8aee64af130801e33df0d2aa91ed0b1d1328e39963320a418fd04a3bb0a0ec89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/sk/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/sk/firefox-85.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "2a7a5dfacaa016ae6d2dbb52d0803a8a27f74061a6bf71fcbac5fe2e10834374"; + sha256 = "2f7813dc98211b3cf8fd0d2d233e2c7dca7f94e85fb2a70df9c69aa6bd5add5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/sl/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/sl/firefox-85.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "61c65884ba57fa5fd37919a390b8af4cb0d7abf31ead557f2967049c35a4bc72"; + sha256 = "75564047dfa2bc5e4c0dd1d1dd1f15e1c59e96c203470731db143ae424cd8c2f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/son/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/son/firefox-85.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "be825ca5923ec9aa37417d4d4842bd82ee4271ec201bb317e0b58f654fe8a7c1"; + sha256 = "3684681de408a4cd02fdb81c559bdb15252dc56c0376a94ee512d7cc49e67190"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/sq/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/sq/firefox-85.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "c7ab49257d5e44bb96e8f39bb586e51a100b899fb6e595a86bf41ebc25b55021"; + sha256 = "573e998a49756843d14f063d4e3aea23f7844076d8ed3b5a0409d0c3758d7a17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/sr/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/sr/firefox-85.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "b22e12526457dfaaf976eb94262965c3bd46edf4a99380a430d75b2324ad654a"; + sha256 = "9289ae5e5270553dfc11dd6a7b9db6e6afa106919daedf085494c96f79cd0c52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/sv-SE/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/sv-SE/firefox-85.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "5e024fc41d9287480ab09ea45d46e9dc358be53adce325826d9820b6cf3ab8ae"; + sha256 = "4b97dd3f617774925a140edcde97b5e0864405401222f46bcc59d02537168ff9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/ta/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/ta/firefox-85.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "529afecbbdfa2f934d755f80c7a0bc9d4bac5053cc0c6421c1687ab16e5b1f02"; + sha256 = "80273dacecd26e0dbf1dcc39858f05c5ef0415972851166c0761f553e832e071"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/te/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/te/firefox-85.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "d90b59759a4f24f9142250f6fe5853fa0e6afdc30bff7e735fc5b70a3b76f555"; + sha256 = "e074997f616b1b356f40dab47f25e13e8b9b143bfaf932a0a281eec8675b71dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/th/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/th/firefox-85.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "023f86d83e23371bbbe68bb586a08e81a58cec027a44c0ddeb217ea1343b5cd5"; + sha256 = "e28ae199709c1ab1d580f8bd83b7ef8cf56750f17b4c30bcd188b088a61d8ba7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/tl/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/tl/firefox-85.0.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "2fd3a1f80900f16eac1de89c8a7a4f93cafef144a24d9c261b09549a3b659448"; + sha256 = "c8b5161094d3fbed51d4dc033804ce5c2e77f9d96172076edced695ba76922c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/tr/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/tr/firefox-85.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "1144aa3437ae67c6921ddeeceb59dad5767d1d59c7932fa0da460c64a4f5577f"; + sha256 = "a5178b392fdf8b36292548c9a98e22b879eb19e0f6d237192b376b7df92ee219"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/trs/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/trs/firefox-85.0.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "1f3e1d5fec2b4d9b11c3c0ded1a68aa7e36d13fae472ce782fd820d4fd32a7c6"; + sha256 = "38554c05e9122c71ea0910892e6c455c4402ead97c6f00d309391544ca208697"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/uk/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/uk/firefox-85.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "165dfdd03c178af49d3f3139a0c9032431f92cf91e79d6842b5e0b006c73490c"; + sha256 = "d6b2fe56aae2b6f4543072f0968c357ab893d89b92ff6c053cc709df75a51aa8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/ur/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/ur/firefox-85.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "6a91871a99188c0bc6a956d92382c800543d95a4d917e64d3295d9b1fe8971e6"; + sha256 = "fcd15754df86493bc627e8fd65f0237a7a10e6e5e5843715bd31445e4b99f2dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/uz/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/uz/firefox-85.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "ade7a34f46893e3367384b414322895f5cd9ce0d341b7a7ddeb191fcc7679e5a"; + sha256 = "2a9cfc082a01c6af057627f4d028b67e0f0b72f913994ac208cea6ccfcd7e41a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/vi/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/vi/firefox-85.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "aca136daf5a8d71b55e479a37a1d42569ee6c9086ac96bf98587948eb23c5f59"; + sha256 = "b32b7b8ff09a0642d4636a1d6477ba3b14c0a47ef93407078998818e7fc23145"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/xh/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/xh/firefox-85.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "6993f823fd76b8974334b37ebe9c683d43fd2524ea1c485ef0c53db993db15ef"; + sha256 = "5a95cd2dbb58f739b58eb8ba5d829d1e7f4e7be405cc6659857432a5c10c8d21"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/zh-CN/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/zh-CN/firefox-85.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "b179fb98b0eb374e28574a4eb61f86df8765ee5bac033e93ad6c3e71d010e7cc"; + sha256 = "e5f93c089a0de95e3e430ed7ad3b028ee7a427072ebb3a035451b5724ee248d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/zh-TW/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/zh-TW/firefox-85.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "0c51a4e5afa22fac0c98e2e960168fb5625a29d2d9e1565ecd08080d83e72d73"; + sha256 = "348b26495fca92805814ee355962741154654d9babe5959ed4f41065123a50d2"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 70fde21823a..230399898ea 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -2,9 +2,9 @@ , src, unpackPhase ? null, patches ? [] , extraNativeBuildInputs ? [], extraConfigureFlags ? [], extraMakeFlags ? [] }: -{ lib, stdenv, pkgconfig, pango, perl, python2, python3, zip +{ lib, stdenv, pkg-config, pango, perl, python3, zip , libjpeg, zlib, dbus, dbus-glib, bzip2, xorg -, freetype, fontconfig, file, nspr, nss, nss_3_53, libnotify +, freetype, fontconfig, file, nspr, nss, nss_3_53 , yasm, libGLU, libGL, sqlite, unzip, makeWrapper , hunspell, libXdamage, libevent, libstartup_notification , libvpx_1_8 @@ -23,8 +23,7 @@ , ffmpegSupport ? true , gtk3Support ? true, gtk2, gtk3, wrapGAppsHook , waylandSupport ? true, libxkbcommon -# LTO is disabled since it caused segfaults on wayland see https://github.com/NixOS/nixpkgs/issues/101429 -, ltoSupport ? false, overrideCC, buildPackages +, ltoSupport ? stdenv.isLinux, overrideCC, buildPackages , gssSupport ? true, kerberos , pipewireSupport ? waylandSupport && webrtcSupport, pipewire @@ -91,11 +90,19 @@ let then "/Applications/${binaryNameCapitalized}.app/Contents/MacOS" else "/bin"; + # 78 ESR won't build with rustc 1.47 + inherit (if lib.versionAtLeast ffversion "82" then rustPackages else rustPackages_1_45) + rustc cargo; + # Darwin's stdenv provides the default llvmPackages version, match that since # clang LTO on Darwin is broken so the stdenv is not being changed. + # Target the LLVM version that rustc -Vv reports it is built with for LTO. + # rustPackages_1_45 -> LLVM 10, rustPackages -> LLVM 11 llvmPackages = if stdenv.isDarwin then buildPackages.llvmPackages - else buildPackages.llvmPackages_10; + else if lib.versionAtLeast rustc.llvm.version "11" + then buildPackages.llvmPackages_11 + else buildPackages.llvmPackages_10; # When LTO for Darwin is fixed, the following will need updating as lld # doesn't work on it. For now it is fine since ltoSupport implies no Darwin. @@ -103,10 +110,6 @@ let then overrideCC stdenv llvmPackages.lldClang else stdenv; - # 78 ESR won't build with rustc 1.47 - inherit (if lib.versionAtLeast ffversion "82" then rustPackages else rustPackages_1_45) - rustc cargo; - nss_pkg = if lib.versionOlder ffversion "83" then nss_3_53 else nss; in @@ -121,29 +124,20 @@ buildStdenv.mkDerivation ({ ] ++ lib.optional (lib.versionOlder ffversion "83") ./no-buildconfig-ffx76.patch ++ lib.optional (lib.versionAtLeast ffversion "84") ./no-buildconfig-ffx84.patch ++ + lib.optional (ltoSupport && lib.versionOlder ffversion "84") ./lto-dependentlibs-generation-ffx83.patch ++ + lib.optional (ltoSupport && lib.versionAtLeast ffversion "84" && lib.versionOlder ffversion "86") + (fetchpatch { + url = "https://hg.mozilla.org/mozilla-central/raw-rev/fdff20c37be3"; + sha256 = "135n9brliqy42lj3nqgb9d9if7x6x9nvvn0z4anbyf89bikixw48"; + }) - # there are two flavors of pipewire support - # The patches for the ESR release and the patches for the current stable - # release. - # Until firefox upstream stabilizes pipewire support we will have to continue - # tracking multiple versions here. - lib.optional (pipewireSupport && lib.versionOlder ffversion "83") + # This patch adds pipewire support for the ESR release + ++ lib.optional (pipewireSupport && lib.versionOlder ffversion "83") (fetchpatch { # https://src.fedoraproject.org/rpms/firefox/blob/master/f/firefox-pipewire-0-3.patch url = "https://src.fedoraproject.org/rpms/firefox/raw/e99b683a352cf5b2c9ff198756859bae408b5d9d/f/firefox-pipewire-0-3.patch"; sha256 = "0qc62di5823r7ly2lxkclzj9rhg2z7ms81igz44nv0fzv3dszdab"; }) - ++ - # This picks pipewire patches from fedora that are part of https://bugzilla.mozilla.org/show_bug.cgi?id=1672944 - lib.optionals (pipewireSupport && lib.versionAtLeast ffversion "83") (let - fedora_revision = "d6756537dd8cf4d9816dc63ada66ea026e0fd128"; - mkPWPatch = spec: fetchpatch { - inherit (spec) name sha256; - url = "https://src.fedoraproject.org/rpms/firefox/raw/${fedora_revision}/f/${spec.name}"; - }; - in map mkPWPatch [ - { name = "pw6.patch"; sha256 = "12lhx9wjpw0ahbfmw07wsx76bb223mr453q9cg8cq951vyskch3s"; } - ]) ++ patches; @@ -157,7 +151,7 @@ buildStdenv.mkDerivation ({ gtk2 perl zip libjpeg zlib bzip2 dbus dbus-glib pango freetype fontconfig xorg.libXi xorg.libXcursor xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file - libnotify xorg.pixman yasm libGLU libGL + xorg.pixman yasm libGLU libGL xorg.xorgproto xorg.libXext unzip makeWrapper libevent libstartup_notification /* cairo */ @@ -173,24 +167,17 @@ buildStdenv.mkDerivation ({ ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed ++ lib.optional gtk3Support gtk3 ++ lib.optional gssSupport kerberos - ++ lib.optional ltoSupport llvmPackages.libunwind - ++ lib.optionals waylandSupport [ libxkbcommon ] - ++ lib.optionals pipewireSupport [ pipewire ] - ++ lib.optionals (lib.versionAtLeast ffversion "82") [ gnum4 ] + ++ lib.optional waylandSupport libxkbcommon + ++ lib.optional pipewireSupport pipewire + ++ lib.optional (lib.versionAtLeast ffversion "82") gnum4 ++ lib.optionals buildStdenv.isDarwin [ CoreMedia ExceptionHandling Kerberos AVFoundation MediaToolbox CoreLocation Foundation libobjc AddressBook cups ]; NIX_LDFLAGS = lib.optionalString ltoSupport '' - -rpath ${placeholder "out"}/lib/${binaryName} -rpath ${llvmPackages.libunwind.out}/lib ''; - NIX_CFLAGS_COMPILE = toString [ - "-I${glib.dev}/include/gio-unix-2.0" - "-I${nss_pkg.dev}/include/nss" - ]; - MACH_USE_SYSTEM_PYTHON = "1"; postPatch = '' @@ -202,7 +189,7 @@ buildStdenv.mkDerivation ({ substituteInPlace \ media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build \ --replace /usr/include ${pipewire.dev}/include - '' + lib.optionalString (lib.versionAtLeast ffversion "80") '' + '' + lib.optionalString (lib.versionAtLeast ffversion "80" && lib.versionOlder ffversion "81") '' substituteInPlace dom/system/IOUtils.h \ --replace '#include "nspr/prio.h"' '#include "prio.h"' @@ -220,8 +207,7 @@ buildStdenv.mkDerivation ({ llvmPackages.llvm # llvm-objdump nodejs perl - pkgconfig - python2 + pkg-config python3 rust-cbindgen rustc @@ -295,10 +281,9 @@ buildStdenv.mkDerivation ({ # https://bugzilla.mozilla.org/show_bug.cgi?id=1538724 # elf-hack is broken when using clang+lld: # https://bugzilla.mozilla.org/show_bug.cgi?id=1482204 - ++ lib.optionals ltoSupport [ - "--enable-lto" - "--disable-elf-hack" - ] ++ lib.optional (ltoSupport && !buildStdenv.isDarwin) "--enable-linker=lld" + ++ lib.optional ltoSupport "--enable-lto" + ++ lib.optional (ltoSupport && (buildStdenv.isAarch32 || buildStdenv.isi686 || buildStdenv.isx86_64)) "--disable-elf-hack" + ++ lib.optional (ltoSupport && !buildStdenv.isDarwin) "--enable-linker=lld" ++ flag alsaSupport "alsa" ++ flag pulseaudioSupport "pulseaudio" @@ -323,6 +308,13 @@ buildStdenv.mkDerivation ({ "MOZILLA_OFFICIAL=1" "BUILD_OFFICIAL=1" ] + ++ lib.optionals ltoSupport [ + "AR=${llvmPackages.bintools}/bin/llvm-ar" + "LLVM_OBJDUMP=${llvmPackages.bintools}/bin/llvm-objdump" + "NM=${llvmPackages.bintools}/bin/llvm-nm" + "RANLIB=${llvmPackages.bintools}/bin/llvm-ranlib" + "STRIP=${llvmPackages.bintools}/bin/llvm-strip" + ] ++ extraMakeFlags; enableParallelBuilding = true; @@ -341,18 +333,6 @@ buildStdenv.mkDerivation ({ gappsWrapperArgs+=(--argv0 "$out/bin/.${binaryName}-wrapped") ''; - postFixup = lib.optionalString buildStdenv.isLinux '' - # Fix notifications. LibXUL uses dlopen for this, unfortunately; see #18712. - patchelf --set-rpath "${lib.getLib libnotify - }/lib:$(patchelf --print-rpath "$out"/lib/${binaryName}*/libxul.so)" \ - "$out"/lib/${binaryName}*/libxul.so - patchelf --add-needed ${xorg.libXScrnSaver.out}/lib/libXss.so $out/lib/${binaryName}/${binaryName} - ${lib.optionalString (pipewireSupport && lib.versionAtLeast ffversion "83") '' - patchelf --add-needed "${lib.getLib pipewire}/lib/libpipewire-0.3.so" \ - "$out"/lib/${binaryName}/${binaryName} - ''} - ''; - doInstallCheck = true; installCheckPhase = '' # Some basic testing @@ -365,6 +345,7 @@ buildStdenv.mkDerivation ({ isFirefox3Like = true; gtk = gtk2; inherit alsaSupport; + inherit pipewireSupport; inherit nspr; inherit ffmpegSupport; inherit gssSupport; diff --git a/pkgs/applications/networking/browsers/firefox/lto-dependentlibs-generation-ffx83.patch b/pkgs/applications/networking/browsers/firefox/lto-dependentlibs-generation-ffx83.patch new file mode 100644 index 00000000000..b6f1b81fa9f --- /dev/null +++ b/pkgs/applications/networking/browsers/firefox/lto-dependentlibs-generation-ffx83.patch @@ -0,0 +1,45 @@ +--- a/toolkit/library/build/dependentlibs.py ++++ b/toolkit/library/build/dependentlibs.py +@@ -36,26 +36,17 @@ def dependentlibs_win32_objdump(lib): + proc.wait() + return deps + +-def dependentlibs_readelf(lib): ++def dependentlibs_elf_objdump(lib): + '''Returns the list of dependencies declared in the given ELF .so''' +- proc = subprocess.Popen([substs.get('TOOLCHAIN_PREFIX', '') + 'readelf', '-d', lib], stdout = subprocess.PIPE, ++ proc = subprocess.Popen([substs['LLVM_OBJDUMP'], '--private-headers', lib], stdout = subprocess.PIPE, + universal_newlines=True) + deps = [] + for line in proc.stdout: +- # Each line has the following format: +- # tag (TYPE) value +- # or with BSD readelf: +- # tag TYPE value +- # Looking for NEEDED type entries +- tmp = line.split(' ', 3) +- if len(tmp) > 3 and 'NEEDED' in tmp[2]: +- # NEEDED lines look like: +- # 0x00000001 (NEEDED) Shared library: [libname] +- # or with BSD readelf: +- # 0x00000001 NEEDED Shared library: [libname] +- match = re.search('\[(.*)\]', tmp[3]) +- if match: +- deps.append(match.group(1)) ++ # We are looking for lines with the format: ++ # NEEDED libname ++ tmp = line.split() ++ if len(tmp) == 2 and tmp[0] == 'NEEDED': ++ deps.append(tmp[1]) + proc.wait() + return deps + +@@ -110,7 +101,7 @@ def gen_list(output, lib): + libpaths = [os.path.join(substs['DIST'], 'bin')] + binary_type = get_type(lib) + if binary_type == ELF: +- func = dependentlibs_readelf ++ func = dependentlibs_elf_objdump + elif binary_type == MACHO: + func = dependentlibs_mac_objdump + else: diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index d005b232f5b..ad835623394 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -7,10 +7,10 @@ in rec { firefox = common rec { pname = "firefox"; - ffversion = "84.0.2"; + ffversion = "85.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "2cxybnrcr0n75hnw18rrymw1jsd5crqfgnpk10hywbmnkdc72fx5sk51cg890pzwfiagicxfxsacnm3f6g8135k0wsz4294xjjwkm1z"; + sha512 = "17bx4782ix3nrjnc6y29bz86lkpc2fzapqraa67xi65m46qrn0cs9hwdjyl48rdc44j5972gilpmd217kfxf4wxrfc2vcxadgk75158"; }; meta = { @@ -31,10 +31,10 @@ rec { firefox-esr-78 = common rec { pname = "firefox-esr"; - ffversion = "78.6.1esr"; + ffversion = "78.7.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "3kq9vb0a8qblqk995xqhghw5d694mr1cjd5alkkwxbdjhpc1mck0ayn40xjph0znga6qdcq8l366p0by8ifbsdhv0x39ng8nvx9jvdf"; + sha512 = "0606prndxfv9nvrpcnagwky04j4jhn1139gr72a0rydfagznsaqwy13gpzdf58ifycdln63052kchlh2dslz5m8hifp215ydcppv8xg"; }; meta = { diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 907f3e495d4..31cfe0247ee 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -1,11 +1,11 @@ { stdenv, lib, makeDesktopItem, makeWrapper, lndir, config -, replace, fetchurl, zip, unzip, jq, xdg_utils, writeText +, replace, fetchurl, zip, unzip, jq, xdg-utils, writeText ## various stuff that can be plugged in , flashplayer, hal-flash -, ffmpeg, xorg, alsaLib, libpulseaudio, libcanberra-gtk2, libglvnd +, ffmpeg, xorg, alsaLib, libpulseaudio, libcanberra-gtk2, libglvnd, libnotify , gnome3/*.gnome-shell*/ -, browserpass, chrome-gnome-shell, uget-integrator, plasma5Packages, bukubrow +, browserpass, chrome-gnome-shell, uget-integrator, plasma5Packages, bukubrow, pipewire , tridactyl-native , fx_cast_bridge , udev @@ -51,6 +51,7 @@ let ffmpegSupport = browser.ffmpegSupport or false; gssSupport = browser.gssSupport or false; alsaSupport = browser.alsaSupport or false; + pipewireSupport = browser.pipewireSupport or false; plugins = let @@ -80,7 +81,8 @@ let ++ lib.optional (cfg.enableFXCastBridge or false) fx_cast_bridge ++ extraNativeMessagingHosts ); - libs = lib.optionals stdenv.isLinux [ udev libva mesa ] + libs = lib.optionals stdenv.isLinux [ udev libva mesa libnotify xorg.libXScrnSaver ] + ++ lib.optional (pipewireSupport && lib.versionAtLeast version "83") pipewire ++ lib.optional ffmpegSupport ffmpeg ++ lib.optional gssSupport kerberos ++ lib.optional useGlvnd libglvnd @@ -172,7 +174,7 @@ let desktopName = "${desktopName}${nameSuffix}${lib.optionalString forceWayland " (Wayland)"}"; genericName = "Web Browser"; categories = "Network;WebBrowser;"; - mimeType = stdenv.lib.concatStringsSep ";" [ + mimeType = lib.concatStringsSep ";" [ "text/html" "text/xml" "application/xhtml+xml" @@ -263,7 +265,7 @@ let --suffix LD_LIBRARY_PATH ':' "$libs" \ --suffix-each GTK_PATH ':' "$gtk_modules" \ --suffix-each LD_PRELOAD ':' "$(cat $(filterExisting $(addSuffix /extra-ld-preload $plugins)))" \ - --prefix PATH ':' "${xdg_utils}/bin" \ + --prefix PATH ':' "${xdg-utils}/bin" \ --prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" \ --suffix PATH ':' "$out${browser.execdir or "/bin"}" \ --set MOZ_APP_LAUNCHER "${browserName}${nameSuffix}" \ diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index 73a095b0827..c5e5aff77e0 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -1,9 +1,9 @@ -{ stdenv, patchelf, makeWrapper +{ lib, stdenv, patchelf, makeWrapper # Linked dynamic libraries. , glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr , libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb -, alsaLib, libXdamage, libXtst, libXrandr, expat, cups +, alsaLib, libXdamage, libXtst, libXrandr, libxshmfence, expat, cups , dbus, gtk3, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core , kerberos, libdrm, mesa , libxkbcommon, wayland # ozone/wayland @@ -22,7 +22,7 @@ # Additional dependencies according to other distros. ## Ubuntu -, liberation_ttf, curl, util-linux, xdg_utils, wget +, liberation_ttf, curl, util-linux, xdg-utils, wget ## Arch Linux. , flac, harfbuzz, icu, libpng, libopus, snappy, speechd ## Gentoo @@ -41,7 +41,7 @@ , gnome3 }: -with stdenv.lib; +with lib; let opusWithCustomModes = libopus.override { @@ -53,11 +53,11 @@ let deps = [ glib fontconfig freetype pango cairo libX11 libXi atk gconf nss nspr libXcursor libXext libXfixes libXrender libXScrnSaver libXcomposite libxcb - alsaLib libXdamage libXtst libXrandr expat cups + alsaLib libXdamage libXtst libXrandr libxshmfence expat cups dbus gdk-pixbuf gcc-unwrapped.lib systemd libexif - liberation_ttf curl util-linux xdg_utils wget + liberation_ttf curl util-linux xdg-utils wget flac harfbuzz icu libpng opusWithCustomModes snappy speechd bzip2 libcap at-spi2-atk at-spi2-core kerberos libdrm mesa coreutils diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix new file mode 100644 index 00000000000..10831c57f8d --- /dev/null +++ b/pkgs/applications/networking/browsers/lagrange/default.nix @@ -0,0 +1,44 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, pkg-config +, libunistring +, openssl +, pcre +, SDL2 +, AppKit +}: + +stdenv.mkDerivation rec { + pname = "lagrange"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "skyjake"; + repo = "lagrange"; + rev = "v${version}"; + sha256 = "04bp5k1byjbzwnmcx4b7sw68pr2jrj4c21z76jq311hyrmanj6fi"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ libunistring openssl pcre SDL2 ] + ++ lib.optional stdenv.isDarwin AppKit; + + hardeningDisable = lib.optional (!stdenv.cc.isClang) "format"; + + installPhase = if stdenv.isDarwin then '' + mkdir -p $out/Applications + mv Lagrange.app $out/Applications + '' else null; + + meta = with lib; { + description = "A Beautiful Gemini Client"; + homepage = "https://gmi.skyjake.fi/lagrange/"; + license = licenses.bsd2; + maintainers = with maintainers; [ sikmir ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix index f497a7f9a28..ec57bcfae18 100644 --- a/pkgs/applications/networking/browsers/links2/default.nix +++ b/pkgs/applications/networking/browsers/links2/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl -, gpm, openssl, pkgconfig, libev # Misc. +, gpm, openssl, pkg-config, libev # Misc. , libpng, libjpeg, libtiff, librsvg # graphic formats , bzip2, zlib, xz # Transfer encodings , enableFB ? true @@ -16,19 +16,19 @@ stdenv.mkDerivation rec { sha256 = "0qqdcghsdqm7l6kyi0k752ws3ak5crw85pqkcb11wy67j62yspi8"; }; - buildInputs = with stdenv.lib; + buildInputs = with lib; [ libev librsvg libpng libjpeg libtiff openssl xz bzip2 zlib ] ++ optionals stdenv.isLinux [ gpm ] ++ optionals enableX11 [ libX11 libXau libXt ] ++ optional enableDirectFB [ directfb ]; - nativeBuildInputs = [ pkgconfig bzip2 ]; + nativeBuildInputs = [ pkg-config bzip2 ]; configureFlags = [ "--with-ssl" ] - ++ stdenv.lib.optional (enableX11 || enableFB || enableDirectFB) "--enable-graphics" - ++ stdenv.lib.optional enableX11 "--with-x" - ++ stdenv.lib.optional enableFB "--with-fb" - ++ stdenv.lib.optional enableDirectFB "--with-directfb"; + ++ lib.optional (enableX11 || enableFB || enableDirectFB) "--enable-graphics" + ++ lib.optional enableX11 "--with-x" + ++ lib.optional enableFB "--with-fb" + ++ lib.optional enableDirectFB "--with-directfb"; meta = with lib; { homepage = "http://links.twibright.com/"; diff --git a/pkgs/applications/networking/browsers/luakit/default.nix b/pkgs/applications/networking/browsers/luakit/default.nix index e634b0f566f..917da034c30 100644 --- a/pkgs/applications/networking/browsers/luakit/default.nix +++ b/pkgs/applications/networking/browsers/luakit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, wrapGAppsHook +{ lib, stdenv, fetchFromGitHub, pkg-config, wrapGAppsHook , help2man, luafilesystem, luajit, sqlite , webkitgtk, gtk3, gst_all_1, glib-networking }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig help2man wrapGAppsHook + pkg-config help2man wrapGAppsHook ]; buildInputs = [ diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix index 9c9ec5624c8..713f934f778 100644 --- a/pkgs/applications/networking/browsers/lynx/default.nix +++ b/pkgs/applications/networking/browsers/lynx/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, buildPackages -, fetchurl, pkgconfig, ncurses, gzip +, fetchurl, pkg-config, ncurses, gzip , sslSupport ? true, openssl ? null , nukeReferences }: @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { "--enable-default-colors" "--enable-widec" "--enable-ipv6" - ] ++ stdenv.lib.optional sslSupport "--with-ssl"; + ] ++ lib.optional sslSupport "--with-ssl"; depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ nukeReferences ] - ++ stdenv.lib.optional sslSupport pkgconfig; + ++ lib.optional sslSupport pkg-config; - buildInputs = [ ncurses gzip ] ++ stdenv.lib.optional sslSupport openssl.dev; + buildInputs = [ ncurses gzip ] ++ lib.optional sslSupport openssl.dev; # cfg_defs.h captures lots of references to build-only dependencies, derived # from config.cache. diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix index ca6d4335785..3362948e98a 100644 --- a/pkgs/applications/networking/browsers/midori/default.nix +++ b/pkgs/applications/networking/browsers/midori/default.nix @@ -2,7 +2,7 @@ , fetchurl , cmake , ninja -, pkgconfig +, pkg-config , intltool , vala , wrapGAppsHook @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { cmake intltool ninja - pkgconfig + pkg-config vala wrapGAppsHook ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index cd9898e420e..1a4f9b4ec7b 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -140,8 +140,8 @@ stdenv.mkDerivation rec { meta = { description = "Adobe Flash Player browser plugin"; homepage = "http://www.adobe.com/products/flashplayer/"; - license = stdenv.lib.licenses.unfree; - maintainers = with stdenv.lib.maintainers; [ taku0 ]; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ taku0 ]; platforms = [ "x86_64-linux" "i686-linux" ]; }; } diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index 09839b4c3c9..ed95d02ade4 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -96,8 +96,8 @@ stdenv.mkDerivation { meta = { description = "Adobe Flash Player standalone executable"; homepage = "https://www.adobe.com/support/flashplayer/debug_downloads.html"; - license = stdenv.lib.licenses.unfree; - maintainers = with stdenv.lib.maintainers; [ taku0 ]; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ taku0 ]; platforms = [ "x86_64-linux" ]; # Application crashed with an unhandled SIGSEGV # Not on all systems, though. Video driver problem? diff --git a/pkgs/applications/networking/browsers/netsurf/browser.nix b/pkgs/applications/networking/browsers/netsurf/browser.nix index 4dc3ee16957..db4940093b3 100644 --- a/pkgs/applications/networking/browsers/netsurf/browser.nix +++ b/pkgs/applications/networking/browsers/netsurf/browser.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, fetchpatch, makeWrapper, wrapGAppsHook # Buildtime dependencies. -, check, pkgconfig, xxd +, check, pkg-config, xxd # Runtime dependencies. , curl, expat, libXcursor, libXrandr, libidn, libjpeg, libpng, libwebp, libxml2 @@ -22,7 +22,7 @@ }: let - inherit (stdenv.lib) optional optionals; + inherit (lib) optional optionals; in stdenv.mkDerivation rec { pname = "netsurf"; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { makeWrapper perl perlPackages.HTMLParser - pkgconfig + pkg-config xxd ] ++ optional (uilib == "gtk2" || uilib == "gtk3") wrapGAppsHook diff --git a/pkgs/applications/networking/browsers/netsurf/libcss.nix b/pkgs/applications/networking/browsers/netsurf/libcss.nix index b09701fc367..be8adaa1568 100644 --- a/pkgs/applications/networking/browsers/netsurf/libcss.nix +++ b/pkgs/applications/networking/browsers/netsurf/libcss.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, perl +{ lib, stdenv, fetchurl, pkg-config, perl , buildsystem , libparserutils , libwapcaplet @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-0tzhbpM5Lo1qcglCDUfC1Wo4EXAaDoGnJPxUHGPTxtw="; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ perl libparserutils diff --git a/pkgs/applications/networking/browsers/netsurf/libdom.nix b/pkgs/applications/networking/browsers/netsurf/libdom.nix index 5bb62801437..4c7224f2263 100644 --- a/pkgs/applications/networking/browsers/netsurf/libdom.nix +++ b/pkgs/applications/networking/browsers/netsurf/libdom.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, expat +{ lib, stdenv, fetchurl, pkg-config, expat , buildsystem , libparserutils , libwapcaplet @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-mO4HJHHlXiCMmHjlFcQQrUYso2+HtK/L7K0CPzos70o="; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ expat libhubbub diff --git a/pkgs/applications/networking/browsers/netsurf/libhubbub.nix b/pkgs/applications/networking/browsers/netsurf/libhubbub.nix index 3a1a29e743c..9fd04904c8e 100644 --- a/pkgs/applications/networking/browsers/netsurf/libhubbub.nix +++ b/pkgs/applications/networking/browsers/netsurf/libhubbub.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, perl +{ lib, stdenv, fetchurl, pkg-config, perl , buildsystem , libparserutils }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-nnriU+bJBp51frmtTkhG84tNtSwMoBUURqn6Spd3NbY="; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ perl libparserutils diff --git a/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix b/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix index f25ccf96354..24790c477d4 100644 --- a/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix +++ b/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , buildsystem }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-ecSTZfhg7UUb/EEJ7d7I3j6bfOWjvgaVlr0qoZJ5Mk8="; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ buildsystem ]; makeFlags = [ diff --git a/pkgs/applications/networking/browsers/netsurf/libnsfb.nix b/pkgs/applications/networking/browsers/netsurf/libnsfb.nix index cb3a759acb8..d093df46629 100644 --- a/pkgs/applications/networking/browsers/netsurf/libnsfb.nix +++ b/pkgs/applications/networking/browsers/netsurf/libnsfb.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , uilib, SDL , buildsystem }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-vkRso+tU35A/LamDEdEH11dM0R9awHE+YZFW1NGeo5o="; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ SDL buildsystem ]; makeFlags = [ diff --git a/pkgs/applications/networking/browsers/netsurf/libnsgif.nix b/pkgs/applications/networking/browsers/netsurf/libnsgif.nix index 032d886085f..582bcc84e4f 100644 --- a/pkgs/applications/networking/browsers/netsurf/libnsgif.nix +++ b/pkgs/applications/networking/browsers/netsurf/libnsgif.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , buildsystem }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-nq6lNM1wtTxar0UxeulXcBaFprSojb407Sb0+q6Hmks="; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ buildsystem ]; makeFlags = [ diff --git a/pkgs/applications/networking/browsers/netsurf/libnslog.nix b/pkgs/applications/networking/browsers/netsurf/libnslog.nix index eba4952d7fc..7189f1c591b 100644 --- a/pkgs/applications/networking/browsers/netsurf/libnslog.nix +++ b/pkgs/applications/networking/browsers/netsurf/libnslog.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, bison, flex +{ lib, stdenv, fetchurl, pkg-config, bison, flex , buildsystem }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-/JjcqdfvpnCWRwpdlsAjFG4lv97AjA23RmHHtNsEU9A="; }; - nativeBuildInputs = [ pkgconfig bison flex ]; + nativeBuildInputs = [ pkg-config bison flex ]; buildInputs = [ buildsystem ]; makeFlags = [ diff --git a/pkgs/applications/networking/browsers/netsurf/libnspsl.nix b/pkgs/applications/networking/browsers/netsurf/libnspsl.nix index bfbd611000c..01e3e401a78 100644 --- a/pkgs/applications/networking/browsers/netsurf/libnspsl.nix +++ b/pkgs/applications/networking/browsers/netsurf/libnspsl.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , buildsystem }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-08WCBct40xC/gcpVNHotCYcZzsrHBGvDZ5g7E4tFAgs="; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ buildsystem ]; makeFlags = [ diff --git a/pkgs/applications/networking/browsers/netsurf/libnsutils.nix b/pkgs/applications/networking/browsers/netsurf/libnsutils.nix index 56e2e048b67..b0d954a00d4 100644 --- a/pkgs/applications/networking/browsers/netsurf/libnsutils.nix +++ b/pkgs/applications/networking/browsers/netsurf/libnsutils.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , buildsystem }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-eQxlFjRKvoL2KJ1lY5LpzOvkdbIMx+Hi2EMBE4X3rvA="; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ buildsystem ]; makeFlags = [ diff --git a/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix b/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix index 66a2dbcf437..14399788433 100644 --- a/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix +++ b/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gperf +{ lib, stdenv, fetchurl, pkg-config, gperf , buildsystem , libdom , libhubbub @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-LA3PlS8c2ILD6VQB75RZ8W27U8XT5FEjObL563add4E="; }; - nativeBuildInputs = [ pkgconfig gperf ]; + nativeBuildInputs = [ pkg-config gperf ]; buildInputs = [ libdom libhubbub diff --git a/pkgs/applications/networking/browsers/netsurf/libutf8proc.nix b/pkgs/applications/networking/browsers/netsurf/libutf8proc.nix index 38680da1bcf..c7362b998be 100644 --- a/pkgs/applications/networking/browsers/netsurf/libutf8proc.nix +++ b/pkgs/applications/networking/browsers/netsurf/libutf8proc.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , buildsystem }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-AasdaYnBx3VQkNskw/ZOSflcVgrknCa+xRQrrGgCxHI="; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ buildsystem ]; makeFlags = [ diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 753ea1dc08d..36883faab14 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchzip, python3 +{ lib, fetchurl, fetchzip, python3 , mkDerivationWith, wrapQtAppsHook, wrapGAppsHook, qtbase, glib-networking , asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2 , libxslt, gst_all_1 ? null @@ -31,12 +31,12 @@ let in mkDerivationWith python3Packages.buildPythonApplication rec { pname = "qutebrowser"; - version = "1.14.1"; + version = "2.0.1"; # the release tarballs are different from the git checkout! src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "15l7jphy1qjsh6y6kd5mgkxsl6ymm9564g1yypa946jbyrgi8k2m"; + sha256 = "0hmj19bp5dihzpphxz77377yfmygj498am0h23kxg5m3y5hqv65a"; }; # Needs tox @@ -55,13 +55,16 @@ in mkDerivationWith python3Packages.buildPythonApplication rec { docbook_xml_dtd_45 docbook_xsl libxml2 libxslt ]; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = with python3Packages; ([ pyyaml backendPackage jinja2 pygments - pypeg2 cssutils pyopengl attrs setuptools # scripts and userscripts libs tldextract beautifulsoup4 pyreadability pykeepass stem - ]; + # extensive ad blocking + adblock + ] + ++ lib.optional (pythonOlder "3.9") importlib-resources + ); patches = [ ./fix-restart.patch ]; diff --git a/pkgs/applications/networking/browsers/surf/default.nix b/pkgs/applications/networking/browsers/surf/default.nix index 5ab7cb8d93b..26cbc92adac 100644 --- a/pkgs/applications/networking/browsers/surf/default.nix +++ b/pkgs/applications/networking/browsers/surf/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchgit -, pkgconfig, wrapGAppsHook +, pkg-config, wrapGAppsHook , glib, gcr, glib-networking, gsettings-desktop-schemas, gtk, libsoup, webkitgtk , xorg, dmenu, findutils, gnused, coreutils , patches ? null @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "0pjsv2q8c74sdmqsalym8wa2lv55lj4pd36miam5wd12769xw68m"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; buildInputs = [ glib gcr glib-networking gsettings-desktop-schemas gtk libsoup webkitgtk ]; inherit patches; diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 8c70b13cfe1..9b0a9078ee5 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -57,7 +57,7 @@ , extraPrefs ? "" }: -with stdenv.lib; +with lib; let libPath = makeLibraryPath libPkgs; @@ -91,19 +91,19 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "10.0.7"; + version = "10.0.9"; lang = "en-US"; srcs = { x86_64-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"; - sha256 = "1phqsdf9lav0s111chlgyh4xiq2rm5zcxbx676i9711lkmc5l053"; + sha256 = "Dtlfm/memHSxir5XkUGkJICGEM+tPs//ET4PdVM1HPM="; }; i686-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"; - sha256 = "1nkppwdcjbrx8nh3d6qvvkgd5by6ja5ckjgpbkhavyy2pqlxyqk8"; + sha256 = "GZywFEX/5Br+Zu1w6pegoNOTrSIVQNE2LINsa3Vdlxs="; }; }; in diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix index 099d81c99f8..816b986f883 100644 --- a/pkgs/applications/networking/browsers/vimb/default.nix +++ b/pkgs/applications/networking/browsers/vimb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, libsoup, webkitgtk, gtk3, glib-networking +{ lib, stdenv, fetchFromGitHub, pkg-config, libsoup, webkitgtk, gtk3, glib-networking , gsettings-desktop-schemas, wrapGAppsHook }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1qg18z2gnsli9qgrqfhqfrsi6g9mcgr90w8yab28nxrq4aha6brf"; }; - nativeBuildInputs = [ wrapGAppsHook pkgconfig ]; + nativeBuildInputs = [ wrapGAppsHook pkg-config ]; buildInputs = [ gtk3 libsoup webkitgtk glib-networking gsettings-desktop-schemas ]; makeFlags = [ "PREFIX=${placeholder "out"}" ]; @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { keyboard driven and does not detract you from your daily work. ''; homepage = "https://fanglingsu.github.io/vimb/"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; maintainers = []; - platforms = with stdenv.lib.platforms; linux; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index d19da31026e..2fe27c16720 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -18,11 +18,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "3.5.2115.73-1"; + version = "3.5.2115.87-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "0gjar22b0qdirww4mlb0d0pm2cqkhlp1jn88gwxwvx6g72p3b6lz"; + sha256 = "0m0w2sj6kdd2b67f3kfcf4qyyxhqnmi2qzjwmqpmns9a485s6bn0"; }; unpackPhase = '' @@ -39,11 +39,11 @@ in stdenv.mkDerivation rec { freetype fontconfig libXrender libuuid expat glib nss nspr libxml2 pango cairo gnome2.GConf libdrm mesa - ] ++ stdenv.lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs; + ] ++ lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs; - libPath = stdenv.lib.makeLibraryPath buildInputs - + stdenv.lib.optionalString (stdenv.is64bit) - (":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" buildInputs) + libPath = lib.makeLibraryPath buildInputs + + lib.optionalString (stdenv.is64bit) + (":" + lib.makeSearchPathOutput "lib" "lib64" buildInputs) + ":$out/opt/${vivaldiName}/lib"; buildPhase = '' @@ -52,7 +52,7 @@ in stdenv.mkDerivation rec { --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${libPath}" \ opt/${vivaldiName}/vivaldi-bin - '' + stdenv.lib.optionalString proprietaryCodecs '' + '' + lib.optionalString proprietaryCodecs '' ln -s ${vivaldi-ffmpeg-codecs}/lib/libffmpeg.so opt/${vivaldiName}/libffmpeg.so.''${version%\.*\.*} '' + '' echo "Finished patching Vivaldi binaries" @@ -81,8 +81,8 @@ in stdenv.mkDerivation rec { done wrapProgram "$out/bin/vivaldi" \ --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/ \ - ${stdenv.lib.optionalString enableWidevine "--suffix LD_LIBRARY_PATH : ${libPath}"} - '' + stdenv.lib.optionalString enableWidevine '' + ${lib.optionalString enableWidevine "--suffix LD_LIBRARY_PATH : ${libPath}"} + '' + lib.optionalString enableWidevine '' ln -sf ${vivaldi-widevine}/share/google/chrome/WidevineCdm $out/opt/${vivaldiName}/WidevineCdm ''; diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix index a15d6844f56..2a4dc9e389a 100644 --- a/pkgs/applications/networking/browsers/w3m/default.nix +++ b/pkgs/applications/networking/browsers/w3m/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub, fetchpatch , ncurses, boehmgc, gettext, zlib , sslSupport ? true, openssl ? null , graphicsSupport ? !stdenv.isDarwin, imlib2 ? null , x11Support ? graphicsSupport, libX11 ? null , mouseSupport ? !stdenv.isDarwin, gpm-ncurses ? null -, perl, man, pkgconfig, buildPackages, w3m +, perl, man, pkg-config, buildPackages, w3m }: assert sslSupport -> openssl != null; @@ -12,13 +12,13 @@ assert graphicsSupport -> imlib2 != null; assert x11Support -> graphicsSupport && libX11 != null; assert mouseSupport -> gpm-ncurses != null; -with stdenv.lib; +with lib; let mktable = buildPackages.stdenv.mkDerivation { name = "w3m-mktable"; inherit (w3m) src; - nativeBuildInputs = [ pkgconfig boehmgc ]; + nativeBuildInputs = [ pkg-config boehmgc ]; makeFlags = [ "mktable" ]; installPhase = '' install -D mktable $out/bin/mktable @@ -59,7 +59,7 @@ in stdenv.mkDerivation rec { sed -ie 's!mktable.*:.*!mktable:!' Makefile.in ''; - nativeBuildInputs = [ pkgconfig gettext ]; + nativeBuildInputs = [ pkg-config gettext ]; buildInputs = [ ncurses boehmgc zlib ] ++ optional sslSupport openssl ++ optional mouseSupport gpm-ncurses @@ -94,7 +94,7 @@ in stdenv.mkDerivation rec { homepage = "http://w3m.sourceforge.net/"; description = "A text-mode web browser"; maintainers = [ maintainers.cstrahan ]; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.mit; + platforms = lib.platforms.unix; + license = lib.licenses.mit; }; } diff --git a/pkgs/applications/networking/browsers/webbrowser/default.nix b/pkgs/applications/networking/browsers/webbrowser/default.nix index 5190f1a7b53..d9e997f514b 100644 --- a/pkgs/applications/networking/browsers/webbrowser/default.nix +++ b/pkgs/applications/networking/browsers/webbrowser/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchgit, makeDesktopItem, pkgconfig, makeWrapper +{ stdenv, lib, fetchgit, makeDesktopItem, pkg-config, makeWrapper # Build , python2, autoconf213, yasm, perl , unzip, gnome2, gnum4 @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gnum4 makeWrapper perl pkgconfig python2 + gnum4 makeWrapper perl pkg-config python2 ]; buildInputs = [ @@ -104,5 +104,6 @@ in stdenv.mkDerivation rec { license = [ licenses.mpl20 licenses.gpl3 ]; maintainers = with maintainers; [ TheBrainScrambler ]; platforms = [ "i686-linux" "x86_64-linux" ]; + broken = true; # 2021-01-07 }; } diff --git a/pkgs/applications/networking/c14/default.nix b/pkgs/applications/networking/c14/default.nix index 572975f78d0..3a9192164ad 100644 --- a/pkgs/applications/networking/c14/default.nix +++ b/pkgs/applications/networking/c14/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "c14-cli"; diff --git a/pkgs/applications/networking/calls/default.nix b/pkgs/applications/networking/calls/default.nix index d163f8a7475..01797397f4e 100644 --- a/pkgs/applications/networking/calls/default.nix +++ b/pkgs/applications/networking/calls/default.nix @@ -1,13 +1,17 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitLab , meson , ninja -, pkgconfig -, libhandy_0 +, cmake +, pkg-config +, libhandy , modemmanager , gtk3 , gom , gsound +, feedbackd +, callaudiod , evolution-data-server , folks , desktop-file-utils @@ -22,32 +26,35 @@ stdenv.mkDerivation rec { pname = "calls"; - version = "0.1.5"; + version = "0.2.0"; src = fetchFromGitLab { domain = "source.puri.sm"; owner = "Librem5"; - repo = "calls"; + repo = pname; rev = "v${version}"; - sha256 = "1wqkczl1fn4d2py00fsb6kh05avmc7c49gi49j3592fqsvi87j18"; + sha256 = "1qmjdhnr95dawccw1ss8hc3lk0cypj86xg2amjq7avzn86ryd76l"; }; nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config desktop-file-utils vala + cmake wrapGAppsHook ]; buildInputs = [ modemmanager - libhandy_0 + libhandy evolution-data-server folks gom gsound + feedbackd + callaudiod gtk3 libpeas ]; diff --git a/pkgs/applications/networking/cawbird/default.nix b/pkgs/applications/networking/cawbird/default.nix index 3394394afd4..9cf0e715e0e 100644 --- a/pkgs/applications/networking/cawbird/default.nix +++ b/pkgs/applications/networking/cawbird/default.nix @@ -5,12 +5,13 @@ , json-glib , sqlite , libsoup +, liboauth , gettext , gspell , vala , meson , ninja -, pkgconfig +, pkg-config , dconf , gst_all_1 , wrapGAppsHook @@ -21,21 +22,21 @@ }: stdenv.mkDerivation rec { - version = "1.2.1"; + version = "1.3.2"; pname = "cawbird"; src = fetchFromGitHub { owner = "IBBoard"; repo = "cawbird"; rev = "v${version}"; - sha256 = "11s8x48syy5wjj23ab4bn5jxhi7l5sx7aw6q2ggk99v042hxh3h2"; + sha256 = "1baw3h5wq2ib4bnphazq7n9c9wc94g0n6v4y5kg71n1dir0c3jkh"; }; nativeBuildInputs = [ meson ninja vala - pkgconfig + pkg-config wrapGAppsHook python3 gobject-introspection # for setup hook @@ -47,6 +48,7 @@ stdenv.mkDerivation rec { json-glib sqlite libsoup + liboauth gettext dconf gspell @@ -73,6 +75,6 @@ stdenv.mkDerivation rec { homepage = "https://ibboard.co.uk/cawbird/"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with stdenv.lib.maintainers; [ jonafato schmittlauch ]; + maintainers = with lib.maintainers; [ jonafato schmittlauch ]; }; } diff --git a/pkgs/applications/networking/charles/default.nix b/pkgs/applications/networking/charles/default.nix index 82c4ce0f1be..03d1911333e 100644 --- a/pkgs/applications/networking/charles/default.nix +++ b/pkgs/applications/networking/charles/default.nix @@ -49,8 +49,8 @@ let description = "Web Debugging Proxy"; homepage = "https://www.charlesproxy.com/"; maintainers = [ maintainers.kalbasit ]; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + license = lib.licenses.unfree; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; }; diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index 2b5f7a0e663..810ea11b017 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "cloudflared"; - version = "2020.11.11"; + version = "2021.1.5"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - sha256 = "059q0k53n8cc78cg70pw7dnbc1cjzv3kdvw3cfamvkrmscqgczxd"; + sha256 = "sha256-nknRQdlYVfqCi9SMVTak615Yn/9N99+zHITDKL5nZ00="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index 4009bf96cd4..eaa3821f663 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -19,16 +19,16 @@ let in buildGoModule rec { pname = "argo"; - version = "2.11.8"; + version = "2.12.6"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "v${version}"; - sha256 = "19nkkj69506759qjfrz6d7j57z8rqjslgfrdrkx01ri68cil4mfh"; + sha256 = "sha256-28vePb/2CsDLNFYMqtsoptAaOgh4YdPSHzGTO+HLGLs="; }; - vendorSha256 = "1ca0ssvbi4vrsn9ljc783hnh9bmf5p8nr1lz5wm8g3gbrrrf1ray"; + vendorSha256 = "sha256-CcSR2TZldeAbBE0yTR+4oa8mDCIx33pu9h8NE1LkRFQ="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index 9aa0b6614b2..c3e9a774fa9 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "argocd"; - version = "1.8.1"; + version = "1.8.3"; commit = "ef5010c3a0b5e027fd642732d03c5b0391b1e574"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - sha256 = "1lz395nfvjzri3fnk0d9hiwlf7w01afbx4cpn2crdd3rlab105s4"; + sha256 = "sha256-do5DAxaQ1gBdvNN/YGKAkmkFcJ+j/ojBaWPwrXXQko0="; }; - vendorSha256 = "1rd2wnsh95r1r5zb6xfav8gf7kkp68vzp295cv1iy3b71ak52ag1"; + vendorSha256 = "sha256-6DOay+aeXz7EQKe5SzQSmg/5KyUI0g6wzPgx/+F2RW4="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/atlantis/default.nix b/pkgs/applications/networking/cluster/atlantis/default.nix index 60be1d000b3..728e23ff380 100644 --- a/pkgs/applications/networking/cluster/atlantis/default.nix +++ b/pkgs/applications/networking/cluster/atlantis/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "atlantis"; - version = "0.15.1"; + version = "0.16.0"; src = fetchFromGitHub { owner = "runatlantis"; repo = "atlantis"; rev = "v${version}"; - sha256 = "0xxg48f28ac7x6kap6w1hgsimdc604ivkck4dx7p5p7xd3s7gld5"; + sha256 = "sha256-1sak6CaqFhiBIoaa7kERXLHsgn24oMgBlOJaQDuF61E="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/click/default.nix b/pkgs/applications/networking/cluster/click/default.nix index f1895d074bc..1b76406f334 100644 --- a/pkgs/applications/networking/cluster/click/default.nix +++ b/pkgs/applications/networking/cluster/click/default.nix @@ -15,7 +15,7 @@ buildRustPackage rec { cargoSha256 = "1f9yn4pvp58laylngdrfdkwygisnzkhkm7pndf6l33k3aqxhz5mm"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; meta = with lib; { description = ''The "Command Line Interactive Controller for Kubernetes"''; diff --git a/pkgs/development/tools/cloudfoundry-cli/default.nix b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix index 642c42108aa..de032cc60e9 100644 --- a/pkgs/development/tools/cloudfoundry-cli/default.nix +++ b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix @@ -1,19 +1,20 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, fetchurl, installShellFiles }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, fetchurl, installShellFiles }: -buildGoPackage rec { +buildGoModule rec { pname = "cloudfoundry-cli"; - version = "7.0.1"; - - goPackagePath = "code.cloudfoundry.org/cli"; - - subPackages = [ "." ]; + version = "7.2.0"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = "cli"; rev = "v${version}"; - sha256 = "0jh4x7xlijp1naak5qyc256zkzlrczl6g4iz94s8wx2zj7np0q5l"; + sha256 = "0cf5vshyz6j70sv7x43r1404hdcmkzxgdb7514kjilp5z6wsr1nv"; }; + # vendor directory stale + deleteVendor = true; + vendorSha256 = "0p0s0dr7kpmmnim4fps62vj4zki2qxxdq5ww0fzrf1372xbl4kp2"; + + subPackages = [ "." ]; # upstream have helpfully moved the bash completion script to a separate # repo which receives no releases or even tags @@ -24,32 +25,23 @@ buildGoPackage rec { nativeBuildInputs = [ installShellFiles ]; - makeTarget = let hps = stdenv.hostPlatform.system; in - if hps == "x86_64-darwin" then - "out/cf-cli_osx" - else if hps == "x86_64-linux" then - "out/cf-cli_linux_x86-64" - else if hps == "i686-linux" then - "out/cf-cli_linux_i686" - else - throw "make target for this platform unknown"; - - buildPhase = '' - cd go/src/${goPackagePath} - CF_BUILD_DATE="1970-01-01" make $makeTarget - cp $makeTarget out/cf - ''; + buildFlagsArray = [ + "-ldflags=" + "-s" + "-w" + "-X code.cloudfoundry.org/cli/version.binaryBuildDate=1970-01-01" + "-X code.cloudfoundry.org/cli/version.binaryVersion=${version}" + ]; - installPhase = '' - install -Dm555 out/cf "$out/bin/cf" + postInstall = '' + mv "$out/bin/cli" "$out/bin/cf" installShellCompletion --bash $bashCompletionScript ''; - meta = with stdenv.lib; { + meta = with lib; { description = "The official command line client for Cloud Foundry"; homepage = "https://github.com/cloudfoundry/cli"; maintainers = with maintainers; [ ris ]; license = licenses.asl20; - platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/applications/networking/cluster/containerpilot/default.nix b/pkgs/applications/networking/cluster/containerpilot/default.nix new file mode 100644 index 00000000000..dc6e5f3402f --- /dev/null +++ b/pkgs/applications/networking/cluster/containerpilot/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + version = "3.9.0pre"; + pname = "containerpilot"; + + src = fetchFromGitHub { + owner = "joyent"; + repo = pname; + rev = "d999b632b0c96d9e27f092dc9f81a9d82dfe0106"; + sha256 = "0wsc8canr1c9wzr1lv40yixj9l10c66i6d14yrljsyagl2z02v4n"; + }; + + goPackagePath = "github.com/joyent/${pname}"; + goDeps = ./deps.nix; + + meta = with lib; { + homepage = "https://www.joyent.com/containerpilot"; + description = "An application centric micro-orchestrator."; + platforms = platforms.unix; + license = licenses.mpl20; + maintainers = with maintainers; [ cpcloud ]; + }; +} diff --git a/pkgs/applications/networking/cluster/containerpilot/deps.nix b/pkgs/applications/networking/cluster/containerpilot/deps.nix new file mode 100644 index 00000000000..9df154389cb --- /dev/null +++ b/pkgs/applications/networking/cluster/containerpilot/deps.nix @@ -0,0 +1,173 @@ +# file generated from go.mod using vgo2nix (https://github.com/nix-community/vgo2nix) +[ + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "4c0e84591b9a"; + sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/client9/reopen"; + fetch = { + type = "git"; + url = "https://github.com/client9/reopen"; + rev = "1a6ccbeaae3f"; + sha256 = "0iarv0sn9hb26sr75bwilz3m86kcfad4m5klmzixbd4yw1ipnffa"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/flynn/json5"; + fetch = { + type = "git"; + url = "https://github.com/flynn/json5"; + rev = "7620272ed633"; + sha256 = "1l3rqfis8b72mqwm88lx78d0mbdihyamj8cgg2pa5vfbq49cpydf"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "6a1fa9404c0a"; + sha256 = "0dsd6vlfdyarn3v822x9p2s94gfi5lhvqc2vm3bqmqjgcik3c51z"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/hashicorp/consul"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/consul"; + rev = "v1.0.1-rc1"; + sha256 = "10xqi86n2h39q3qlkxfhnrqwm1bgijs5n2kryaq9yalv5p3qxczg"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/hashicorp/go-cleanhttp"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-cleanhttp"; + rev = "3573b8b52aa7"; + sha256 = "1pbl6p7w5wp1c70x7fp94h4ynk2ajfa76rqin3d2hq1w2fcb7byr"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/hashicorp/go-rootcerts"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-rootcerts"; + rev = "6bb64b370b90"; + sha256 = "1a81fcm1i0ji2iva0dcimiichgwpbcb7lx0vyaks87zj5wf04qy9"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/hashicorp/serf"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/serf"; + rev = "91fd53b1d3e6"; + sha256 = "0p9mhv6w85cxxl95kvl3rk04yif6v5bhf5kxw8i1cphv5kddv7j9"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "v1.0.1"; + sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/mitchellh/go-homedir"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-homedir"; + rev = "b8bc1bf76747"; + sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/mitchellh/mapstructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/mapstructure"; + rev = "d2dd02622084"; + sha256 = "1idj9h0g9z3s21y2hivaf1dknxhpd7yy0kn6wk3311hlr7s543j5"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "v0.8.0"; + sha256 = "1xqny3147g12n4j03kxm8s9mvdbs3ln6i56c655mybrn9jjy48kd"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "6f3806018612"; + sha256 = "1413ibprinxhni51p0755dp57r9wvbw7xgj9nmdaxmhzlqhc86j4"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/prometheus/common"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/common"; + rev = "0866df4b85a1"; + sha256 = "0zw4rxs6zh9vgxz5wwhjnwa6mgac8jh7mb63viircgh08r889chp"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "e645f4e5aaa8"; + sha256 = "18hwygbawbqilz7h8fl25xpbciwalkslb4igqn4cr9d8sqp7d3np"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/sirupsen/logrus"; + rev = "v1.0.0"; + sha256 = "0kyvaa4m8w5wijjvrh0amd9bl3sci1vj4y9v9a97sx3rf7xww52l"; + moduleDir = ""; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "94b76065f2d2"; + sha256 = "0lxd3gmkvza3mah5m8nncdsgd1y6r25vaz4wzdmrs3i1ikzknn93"; + moduleDir = ""; + }; + } +] diff --git a/pkgs/applications/networking/cluster/docker-machine/default.nix b/pkgs/applications/networking/cluster/docker-machine/default.nix index 5a4f6b7db0e..c483125d851 100644 --- a/pkgs/applications/networking/cluster/docker-machine/default.nix +++ b/pkgs/applications/networking/cluster/docker-machine/default.nix @@ -1,5 +1,5 @@ # This file was generated by go2nix. -{ lib, stdenv, buildGoPackage, fetchFromGitHub, installShellFiles }: +{ lib, buildGoPackage, fetchFromGitHub, installShellFiles }: buildGoPackage rec { pname = "machine"; diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm.nix b/pkgs/applications/networking/cluster/docker-machine/kvm.nix index 50f2ab14a77..4940f6331d4 100644 --- a/pkgs/applications/networking/cluster/docker-machine/kvm.nix +++ b/pkgs/applications/networking/cluster/docker-machine/kvm.nix @@ -1,5 +1,5 @@ # This file was generated by go2nix. -{ lib, stdenv, buildGoPackage, fetchFromGitHub, libvirt, pkgconfig }: +{ lib, buildGoPackage, fetchFromGitHub, libvirt, pkg-config }: buildGoPackage rec { pname = "docker-machine-kvm"; @@ -15,7 +15,7 @@ buildGoPackage rec { sha256 = "0ch4zwb6h7hnr5l3skj1daypvpyms2i666lbnmakpw1fw3zvjmgy"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libvirt ]; meta = with lib; { diff --git a/pkgs/applications/networking/cluster/docker-machine/xhyve.nix b/pkgs/applications/networking/cluster/docker-machine/xhyve.nix index 49e59ab7093..8c3534006bf 100644 --- a/pkgs/applications/networking/cluster/docker-machine/xhyve.nix +++ b/pkgs/applications/networking/cluster/docker-machine/xhyve.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, fetchpatch, pkgconfig, cctools, Hypervisor, vmnet }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub, fetchpatch, pkg-config, cctools, Hypervisor, vmnet }: buildGoPackage rec { pname = "docker-machine-xhyve"; @@ -26,7 +26,7 @@ buildGoPackage rec { sha256 = "0000v97fr8xc5b39v44hsa87wrbk4bcwyaaivxv4hxlf4vlgg863"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ Hypervisor vmnet ]; meta = with lib; { diff --git a/pkgs/applications/networking/cluster/flink/default.nix b/pkgs/applications/networking/cluster/flink/default.nix index d8b156bed88..3c3bc2bace2 100644 --- a/pkgs/applications/networking/cluster/flink/default.nix +++ b/pkgs/applications/networking/cluster/flink/default.nix @@ -1,27 +1,12 @@ -{ lib, stdenv, fetchurl, makeWrapper, jre -, version ? "1.6" }: - -let - versionMap = { - "1.5" = { - flinkVersion = "1.5.5"; - sha256 = "18wqcqi3gyqd40nspih99gq7ylfs20b35f4dcrspffagwkfp2l4z"; - }; - "1.6" = { - flinkVersion = "1.11.1"; - sha256 = "0338bg2sb427c1rrf2cmsz63sz0yk6gclpli2lskq0mpx72wxpl0"; - }; - }; -in - -with versionMap.${version}; +{ lib, stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - name = "flink-${flinkVersion}"; + pname = "flink"; + version = "1.12.1"; src = fetchurl { - url = "mirror://apache/flink/${name}/${name}-bin-scala_2.11.tgz"; - inherit sha256; + url = "mirror://apache/flink/${pname}-${version}/${pname}-${version}-bin-scala_2.11.tgz"; + sha256 = "146azc5wg1xby3nqz8mha959qy99z2h8032rfgs2mcl3d5rrsm2l"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index 2800df052b5..ec69b349076 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "fluxcd"; - version = "0.5.0"; + version = "0.7.6"; src = fetchFromGitHub { owner = "fluxcd"; repo = "flux2"; rev = "v${version}"; - sha256 = "125im8br7x8djd6zagvikpc02k55pxbd97rjj3g2frj9plbryh8n"; + sha256 = "1bngsm2z02w9chbd65dvd1k21y16rapx6i84ac2icmc9wwpsfnls"; }; - vendorSha256 = "0f818a0z71nl061db93iqb87njx66vbrra1zh92warbx8djdsr7k"; + vendorSha256 = "0pl1llj4bfxxxp49v3190vpvplv0wbw5ahj6l2045pic5yyxwrma"; nativeBuildInputs = [ installShellFiles ]; @@ -21,6 +21,11 @@ buildGoModule rec { buildFlagsArray = [ "-ldflags=-s -w -X main.VERSION=${version}" ]; + doInstallCheck = true; + installCheckPhase = '' + $out/bin/flux --version | grep ${version} > /dev/null + ''; + postInstall = '' for shell in bash fish zsh; do $out/bin/flux completion $shell > flux.$shell diff --git a/pkgs/applications/networking/cluster/fluxctl/default.nix b/pkgs/applications/networking/cluster/fluxctl/default.nix index 4f1f57e45b7..4a8f42e3cc7 100644 --- a/pkgs/applications/networking/cluster/fluxctl/default.nix +++ b/pkgs/applications/networking/cluster/fluxctl/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "fluxctl"; - version = "1.21.0"; + version = "1.21.1"; src = fetchFromGitHub { owner = "weaveworks"; repo = "flux"; rev = version; - sha256 = "007i6kb80142v19w2dm3667sskcvdp1ilg3q3f9gjgr9c5nrg1m2"; + sha256 = "sha256-/go8V1EjY/iL3csoNpPyeWORvWCf0WnnaSOgiZ8UFQ8="; }; - vendorSha256 = "01v4x2mk5jglnigq0iic52f84vzx56zh46i7v2wlq8ninj8y1k0x"; + vendorSha256 = "sha256-GEU0Q2Elhiel20xvup+i1DSXCjQdA9s7cWykcbKR5KA="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/habitat/default.nix b/pkgs/applications/networking/cluster/habitat/default.nix index 9abaeef8013..d9827039500 100644 --- a/pkgs/applications/networking/cluster/habitat/default.nix +++ b/pkgs/applications/networking/cluster/habitat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, pkgconfig +{ lib, fetchFromGitHub, rustPlatform, pkg-config , libsodium, libarchive, openssl, zeromq }: rustPlatform.buildRustPackage rec { @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "08sncz0jgsr2s821j3s4bk7d54xqwmnld7m57avavym1xqvsnbmy"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsodium libarchive openssl zeromq ]; cargoBuildFlags = ["--package hab"]; diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index 88d4a88b67e..4f3dfcfc03f 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, pkgconfig, which, maven, cmake, jre, bash +{ lib, stdenv, fetchurl, makeWrapper, pkg-config, which, maven, cmake, jre, bash , coreutils, glibc, protobuf2_5, fuse, snappy, zlib, bzip2, openssl, openssl_1_0_2 }: @@ -13,7 +13,7 @@ let inherit sha256; }; - postUnpack = stdenv.lib.optionalString (tomcat != null) '' + postUnpack = lib.optionalString (tomcat != null) '' install -D ${tomcat.src} $sourceRoot/hadoop-hdfs-project/hadoop-hdfs-httpfs/downloads/apache-tomcat-${tomcat.version}.tar.gz install -D ${tomcat.src} $sourceRoot/hadoop-common-project/hadoop-kms/downloads/apache-tomcat-${tomcat.version}.tar.gz ''; @@ -34,7 +34,7 @@ let outputHash = dependencies-sha256; }; - nativeBuildInputs = [ maven cmake pkgconfig ]; + nativeBuildInputs = [ maven cmake pkg-config ]; buildInputs = [ fuse snappy zlib bzip2 opensslPkg protobuf2_5 ]; # most of the hardcoded pathes are fixed in 2.9.x and 3.0.0, this list of patched files might be reduced when 2.7.x and 2.8.x will be deprecated postPatch = '' @@ -59,8 +59,8 @@ let # 'maven.repo.local' must be writable mvn package --offline -Dmaven.repo.local=$(cp -dpR ${fetched-maven-deps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2 ${mavenFlags} # remove runtime dependency on $jdk/jre/lib/amd64/server/libjvm.so - patchelf --set-rpath ${stdenv.lib.makeLibraryPath [glibc]} hadoop-dist/target/hadoop-${version}/lib/native/libhadoop.so.1.0.0 - patchelf --set-rpath ${stdenv.lib.makeLibraryPath [glibc]} hadoop-dist/target/hadoop-${version}/lib/native/libhdfs.so.0.0.0 + patchelf --set-rpath ${lib.makeLibraryPath [glibc]} hadoop-dist/target/hadoop-${version}/lib/native/libhadoop.so.1.0.0 + patchelf --set-rpath ${lib.makeLibraryPath [glibc]} hadoop-dist/target/hadoop-${version}/lib/native/libhdfs.so.0.0.0 ''; installPhase = "mv hadoop-dist/target/hadoop-${version} $out"; }; @@ -86,8 +86,8 @@ let if [ -f "$n" ]; then # only regular files mv $n $out/bin.wrapped/ makeWrapper $out/bin.wrapped/$(basename $n) $n \ - --prefix PATH : "${stdenv.lib.makeBinPath [ which jre bash coreutils ]}" \ - --prefix JAVA_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ opensslPkg snappy zlib bzip2 ]}" \ + --prefix PATH : "${lib.makeBinPath [ which jre bash coreutils ]}" \ + --prefix JAVA_LIBRARY_PATH : "${lib.makeLibraryPath [ opensslPkg snappy zlib bzip2 ]}" \ --set JAVA_HOME "${jre}" \ --set HADOOP_PREFIX "$out" fi diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 7d97896c360..d823e38f3f2 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "helm"; diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index 2516370430e..8a571669c57 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helmfile"; - version = "0.135.0"; + version = "0.138.1"; src = fetchFromGitHub { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "1ky9mh5n6n84g77ax1dn1cisgxjwyrhnapaikyj4q53zcbyai3ng"; + sha256 = "sha256-ZViDnV2b9od3yBfROBBZPsuFX8FH/rSO/epZtuCO1ps="; }; - vendorSha256 = "0dycngvk4nymcrkn6pn2q2h2zfvhc69m1zs2pspl58sa0mkakk2p"; + vendorSha256 = "sha256-BWWmdKrxay0Qy5z+UFFZ3we5C7wI1KUHv6qHF4TPzJE="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/helmsman/default.nix b/pkgs/applications/networking/cluster/helmsman/default.nix index 21a9608db2c..ccfeb6ed87a 100644 --- a/pkgs/applications/networking/cluster/helmsman/default.nix +++ b/pkgs/applications/networking/cluster/helmsman/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helmsman"; - version = "3.6.2"; + version = "3.6.4"; src = fetchFromGitHub { owner = "Praqma"; repo = "helmsman"; rev = "v${version}"; - sha256 = "0a9f6745f17sws7fyhz0d8wnriv69d6nrci9j5nhysnzg97ky1np"; + sha256 = "sha256-4oJ/undqDSNn+Xn8eFEgOx+7263tmdXTHxXBkyFLpsE="; }; - vendorSha256 = "04csmw5zpansb30amr3i6vlwxc3z38q4g69cklh44cr37glm04sm"; + vendorSha256 = "sha256-mktq5Dnk1mBO2yy5SeMDxa/akXdO5i2WafMTGtH53H8="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix index 5d293df9157..5f136fef807 100644 --- a/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/pkgs/applications/networking/cluster/istioctl/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "istioctl"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - sha256 = "1m97hszmw0hfzj3jvd1is7fa3mpqkm7jbq3ik337rb9yq1f0gasv"; + sha256 = "sha256-9mQYJvZU/Ra+LyzfDbWGfopkdGBD7DpS9/yvRvGHDKg="; }; - vendorSha256 = "0ividxxmil69vpvyjlgyzb2jzipmh9rpvk19kv7266d29ky3q7s6"; + vendorSha256 = "sha256-7LQY32hNXLxg/IUBbzzgb67yrbPGLCTNtmNvjE9tUno="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/jx/default.nix b/pkgs/applications/networking/cluster/jx/default.nix index 1f1eb3e8548..d7fc1cb2242 100644 --- a/pkgs/applications/networking/cluster/jx/default.nix +++ b/pkgs/applications/networking/cluster/jx/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "jx"; - version = "2.1.149"; + version = "2.1.155"; src = fetchFromGitHub { owner = "jenkins-x"; repo = "jx"; rev = "v${version}"; - sha256 = "0jgny09wpfab8mkxkhv9swp1baqx3lxsx75a5i78cypkj6xadc69"; + sha256 = "sha256-kwcmZSOA26XuSgNSHitGaMohalnLobabXf4z3ybSJtk="; }; - vendorSha256 = "1fswrf14nwjm0z8qqgdx236w7w1m451lyfinhx9pyp89fw2h5mv6"; + vendorSha256 = "sha256-ZtcCBXcJXX9ThzY6T0MhNfDDzRC9PYzRB1VyS4LLXLs="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index c35579def7e..5a7d953a069 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -11,7 +11,7 @@ , runc , kmod , libseccomp -, pkgconfig +, pkg-config , ethtool , util-linux , ipset @@ -128,7 +128,7 @@ let patches = [ ./patches/0001-Use-rm-from-path-in-go-generate.patch ./patches/0002-Add-nixpkgs-patches.patch ]; - nativeBuildInputs = [ git pkgconfig ]; + nativeBuildInputs = [ git pkg-config ]; buildInputs = [ libseccomp ]; buildPhase = '' @@ -168,7 +168,7 @@ let patches = [ ./patches/0001-Use-rm-from-path-in-go-generate.patch ./patches/0002-Add-nixpkgs-patches.patch ]; - nativeBuildInputs = [ git pkgconfig ]; + nativeBuildInputs = [ git pkg-config ]; # These dependencies are embedded as compressed files in k3s at runtime. # Propagate them to avoid broken runtime references to libraries. propagatedBuildInputs = [ k3sPlugins k3sBuildStage1 runc ]; diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index abc23058303..11e2b0a2915 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "k9s"; diff --git a/pkgs/applications/networking/cluster/kanif/default.nix b/pkgs/applications/networking/cluster/kanif/default.nix index ebf98840ee2..b4bb69dc1f6 100644 --- a/pkgs/applications/networking/cluster/kanif/default.nix +++ b/pkgs/applications/networking/cluster/kanif/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl , taktuk}: +{ lib, stdenv, fetchurl, perl , taktuk}: stdenv.mkDerivation rec { version = "1.2.2"; @@ -26,9 +26,9 @@ stdenv.mkDerivation rec { remote files or directories locally ('kaget' command). It relies on TakTuk for efficiency and scalability.''; homepage = "http://taktuk.gforge.inria.fr/kanif"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.bzizou ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.bzizou ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index f3037cf8a36..9b1a155a25b 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, go-bindata, installShellFiles }: +{ lib, buildGoPackage, fetchFromGitHub, go-bindata, installShellFiles }: let goPackagePath = "k8s.io/kops"; @@ -44,7 +44,7 @@ let homepage = "https://github.com/kubernetes/kops"; changelog = "https://github.com/kubernetes/kops/tree/master/docs/releases"; license = licenses.asl20; - maintainers = with maintainers; [ offline zimbatm kampka ]; + maintainers = with maintainers; [ offline zimbatm ]; platforms = platforms.unix; }; } // attrs'; diff --git a/pkgs/applications/networking/cluster/kpt/default.nix b/pkgs/applications/networking/cluster/kpt/default.nix index 712761eeef2..ae9380c5139 100644 --- a/pkgs/applications/networking/cluster/kpt/default.nix +++ b/pkgs/applications/networking/cluster/kpt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kpt"; - version = "0.37.0"; + version = "0.37.1"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = pname; rev = "v${version}"; - sha256 = "1b1sgwax67pazcs1lly3h3bb7ww91lcd3nr0w3r3f46d1c6iy8mn"; + sha256 = "sha256-4SGCYkx9U6XNUrJfVPgNEhFA75CF8GOrtS4BSm6f7mM="; }; - vendorSha256 = "0dn6nryf3vn7r0xna02va4wbgkq0z6x8sj6g2mskfywrk0mfhadv"; + vendorSha256 = "sha256-y/l9k3oTrN+9OGgyiVzCyYi+6lJpcKaEygirytbn9aI="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix index a97bf509fe4..cc90cf2d63c 100644 --- a/pkgs/applications/networking/cluster/kube3d/default.nix +++ b/pkgs/applications/networking/cluster/kube3d/default.nix @@ -1,11 +1,8 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, k3sVersion ? "1.20.0-k3s2" }: -let - k3sVersion = "1.19.4-k3s1"; -in buildGoModule rec { pname = "kube3d"; - version = "3.4.0"; + version = "4.0.0"; excludedPackages = "tools"; @@ -13,7 +10,7 @@ buildGoModule rec { owner = "rancher"; repo = "k3d"; rev = "v${version}"; - sha256 = "1fisbzv786n841pagy7zbanll7k1g5ib805j9azs2s30cfhvi08b"; + sha256 = "sha256-sHtPW9EaTycHh9d/vp28BvzhmbLUQYsu6yMfJlJYH+k="; }; vendorSha256 = null; @@ -24,8 +21,8 @@ buildGoModule rec { "-ldflags=" "-w" "-s" - "-X github.com/rancher/k3d/v3/version.Version=v${version}" - "-X github.com/rancher/k3d/v3/version.K3sVersion=v${k3sVersion}" + "-X github.com/rancher/k3d/v4/version.Version=v${version}" + "-X github.com/rancher/k3d/v4/version.K3sVersion=v${k3sVersion}" ]; doCheck = false; diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/pkgs/applications/networking/cluster/kubecfg/default.nix index b8bef9ecc05..561bcbf7ad3 100644 --- a/pkgs/applications/networking/cluster/kubecfg/default.nix +++ b/pkgs/applications/networking/cluster/kubecfg/default.nix @@ -1,6 +1,6 @@ { lib, buildGoPackage, fetchFromGitHub, ... }: -let version = "0.16.0"; in +let version = "0.17.0"; in buildGoPackage { pname = "kubecfg"; @@ -10,7 +10,7 @@ buildGoPackage { owner = "bitnami"; repo = "kubecfg"; rev = "v${version}"; - sha256 = "1ipw7r9fyqbh1bjvk7ifmj3skh799ly90y4ph37r8mqk1wb92rz4"; + sha256 = "sha256-/91im204vBS3NjrMOvwTVO6tEBgdpirqJFqCnbIB+iQ="; }; goPackagePath = "github.com/bitnami/kubecfg"; diff --git a/pkgs/applications/networking/cluster/kubeless/default.nix b/pkgs/applications/networking/cluster/kubeless/default.nix index fd7eabf1276..38323b98b19 100644 --- a/pkgs/applications/networking/cluster/kubeless/default.nix +++ b/pkgs/applications/networking/cluster/kubeless/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, installShellFiles }: +{ lib, buildGoPackage, fetchFromGitHub, installShellFiles }: buildGoPackage rec { pname = "kubeless"; diff --git a/pkgs/applications/networking/cluster/kubelogin/default.nix b/pkgs/applications/networking/cluster/kubelogin/default.nix index b1b107a2b03..d7f829dc00e 100644 --- a/pkgs/applications/networking/cluster/kubelogin/default.nix +++ b/pkgs/applications/networking/cluster/kubelogin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoModule, go }: +{ lib, fetchFromGitHub, buildGoModule, go }: buildGoModule rec { pname = "kubelogin"; @@ -16,7 +16,7 @@ buildGoModule rec { buildFlagsArray = '' -ldflags= -X main.version=${version} - -X main.goVersion=${stdenv.lib.getVersion go} + -X main.goVersion=${lib.getVersion go} ''; meta = with lib; { diff --git a/pkgs/applications/networking/cluster/kubernix/default.nix b/pkgs/applications/networking/cluster/kubernix/default.nix index 1411892b75b..88cacfea4f1 100644 --- a/pkgs/applications/networking/cluster/kubernix/default.nix +++ b/pkgs/applications/networking/cluster/kubernix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "kubernix"; diff --git a/pkgs/applications/networking/cluster/kubeseal/default.nix b/pkgs/applications/networking/cluster/kubeseal/default.nix index 51ae1202a37..f2071494f16 100644 --- a/pkgs/applications/networking/cluster/kubeseal/default.nix +++ b/pkgs/applications/networking/cluster/kubeseal/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubeseal"; - version = "0.13.1"; + version = "0.14.1"; src = fetchFromGitHub { owner = "bitnami-labs"; repo = "sealed-secrets"; rev = "v${version}"; - sha256 = "1hlj7i7pjyvrf9cpx6s41sdn7wjwfk7c0akx45kw662vrxcqcgf2"; + sha256 = "sha256-sUeXzmgSOkpqzqrX9+wNGj2X7gcf5QSpavXK4MJe8qE="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/kubeval/default.nix b/pkgs/applications/networking/cluster/kubeval/default.nix index d26f8ed5dc6..28b3b719997 100644 --- a/pkgs/applications/networking/cluster/kubeval/default.nix +++ b/pkgs/applications/networking/cluster/kubeval/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, buildGoModule, makeWrapper }: +{ lib, fetchFromGitHub, buildGoModule, makeWrapper }: buildGoModule rec { pname = "kubeval"; diff --git a/pkgs/applications/networking/cluster/linkerd/default.nix b/pkgs/applications/networking/cluster/linkerd/default.nix index 8718da46246..11b62f479c7 100644 --- a/pkgs/applications/networking/cluster/linkerd/default.nix +++ b/pkgs/applications/networking/cluster/linkerd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule }: buildGoModule { pname = "linkerd-unstable"; diff --git a/pkgs/applications/networking/cluster/luigi/default.nix b/pkgs/applications/networking/cluster/luigi/default.nix index e0a6cd48d6e..ef85494bd14 100644 --- a/pkgs/applications/networking/cluster/luigi/default.nix +++ b/pkgs/applications/networking/cluster/luigi/default.nix @@ -1,22 +1,15 @@ { lib, python3 }: -let - python = python3.override { - self = python; - packageOverrides = self: super: { - tornado = super.tornado_5; - }; - }; -in with python.pkgs; buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "luigi"; version = "3.0.2"; - src = fetchPypi { + src = python3.pkgs.fetchPypi { inherit pname version; sha256 = "b4b1ccf086586d041d7e91e68515d495c550f30e4d179d63863fea9ccdbb78eb"; }; - propagatedBuildInputs = [ dateutil tornado_5 python-daemon boto3 ]; + propagatedBuildInputs = with python3.pkgs; [ dateutil tornado python-daemon boto3 ]; # Requires tox, hadoop, and google cloud doCheck = false; diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index 9acb5f319ca..81ca2283d20 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -11,9 +11,9 @@ buildGoModule rec { pname = "minikube"; - version = "1.16.0"; + version = "1.17.1"; - vendorSha256 = "0nc2f9h77h24f0nvai5wvgmf1gh09dqfwrb6d5qghmq03a459san"; + vendorSha256 = "1flny2f7n3vqhl9vkwsqxvzl8q3fv8v0h1p0d0qaqp9lgn02q3bh"; doCheck = false; @@ -21,7 +21,7 @@ buildGoModule rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "00dn8yy7mna0j8rdcnxbgnd5vkjdkqij8akgqhvbd32kxpqss890"; + sha256 = "1m4kw77j4swwg3vqwmwrys7cq790w4g6y4gvdg33z9n1y9xzqys3"; }; nativeBuildInputs = [ go-bindata installShellFiles pkg-config which ]; diff --git a/pkgs/applications/networking/cluster/minishift/default.nix b/pkgs/applications/networking/cluster/minishift/default.nix index f9391373b18..5b3b17b3df2 100644 --- a/pkgs/applications/networking/cluster/minishift/default.nix +++ b/pkgs/applications/networking/cluster/minishift/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoPackage, fetchFromGitHub, go-bindata, pkgconfig, makeWrapper +{ lib, buildGoPackage, fetchFromGitHub, go-bindata, pkg-config, makeWrapper , glib, gtk3, libappindicator-gtk3, gpgme, openshift, ostree, libselinux, btrfs-progs , lvm2, docker-machine-kvm }: @@ -21,7 +21,7 @@ in buildGoPackage rec { sha256 = "0yhln3kyc0098hbnjyxhbd915g6j7s692c0z8yrhh9gdpc5cr2aa"; }; - nativeBuildInputs = [ pkgconfig go-bindata makeWrapper ]; + nativeBuildInputs = [ pkg-config go-bindata makeWrapper ]; buildInputs = [ glib gtk3 libappindicator-gtk3 gpgme ostree libselinux btrfs-progs lvm2 ]; goPackagePath = "github.com/minishift/minishift"; diff --git a/pkgs/applications/networking/cluster/nerdctl/default.nix b/pkgs/applications/networking/cluster/nerdctl/default.nix index ed00fb231a6..28f7b540722 100644 --- a/pkgs/applications/networking/cluster/nerdctl/default.nix +++ b/pkgs/applications/networking/cluster/nerdctl/default.nix @@ -14,16 +14,16 @@ let in buildGoModule rec { pname = "nerdctl"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "AkihiroSuda"; repo = pname; rev = "v${version}"; - sha256 = "0vjcbvd5yrasw97hd5mrn6cdjvfv2r03z7g1wczlszlcs8gr6nxw"; + sha256 = "sha256-lSvYiTh67gK9kJls7VsayV8T3H6RzFEEKe49BOWnUBw="; }; - vendorSha256 = "181lp9l4i0qpiqm8wbxa4ldi1j5bm3ygmanz1xh3mkjanl0pwqjr"; + vendorSha256 = "sha256-qywiaNoO3pI7sfyPbwWR8BLd86RvJ2xSWwCJUsm3RkM="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/cluster/node-problem-detector/default.nix b/pkgs/applications/networking/cluster/node-problem-detector/default.nix index 370a86db0e6..6be32ed17a4 100644 --- a/pkgs/applications/networking/cluster/node-problem-detector/default.nix +++ b/pkgs/applications/networking/cluster/node-problem-detector/default.nix @@ -20,16 +20,16 @@ buildGoModule rec { # Linux-only feature. See 'ENABLE_JOURNALD' upstream: # https://github.com/kubernetes/node-problem-detector/blob/master/Makefile subPackages = [ "cmd/nodeproblemdetector" ] ++ - stdenv.lib.optionals stdenv.isLinux [ "cmd/logcounter" ]; + lib.optionals stdenv.isLinux [ "cmd/logcounter" ]; preBuild = '' export CGO_ENABLED=${if stdenv.isLinux then "1" else "0"} ''; - buildInputs = stdenv.lib.optionals stdenv.isLinux [ systemd ]; + buildInputs = lib.optionals stdenv.isLinux [ systemd ]; buildFlags = "-mod vendor" + - stdenv.lib.optionalString stdenv.isLinux " -tags journald"; + lib.optionalString stdenv.isLinux " -tags journald"; buildFlagsArray = [ "-ldflags=" diff --git a/pkgs/applications/networking/cluster/nomad-driver-podman/default.nix b/pkgs/applications/networking/cluster/nomad-driver-podman/default.nix new file mode 100644 index 00000000000..cfa8d6fc674 --- /dev/null +++ b/pkgs/applications/networking/cluster/nomad-driver-podman/default.nix @@ -0,0 +1,28 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "nomad-driver-podman"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "hashicorp"; + repo = pname; + rev = "v${version}"; + sha256 = "1a2alapqm7wnkjm9cg0gvi63pkaila9lhsa5razv0vprhg1k84gy"; + }; + + vendorSha256 = "1zs5y0zfi8dd9w371hpmah4iwxahgvaf70biqqdw3c9yp6yw2rwq"; + + subPackages = [ "." ]; + + # some tests require a running podman service + doCheck = false; + + meta = with lib; { + homepage = "https://www.github.com/hashicorp/nomad-driver-podman"; + description = "Podman task driver for Nomad"; + platforms = platforms.unix; + license = licenses.mpl20; + maintainers = with maintainers; [ cpcloud ]; + }; +} diff --git a/pkgs/applications/networking/cluster/nomad/1.0.nix b/pkgs/applications/networking/cluster/nomad/1.0.nix index 0b7b7c12d1a..ff4434399bd 100644 --- a/pkgs/applications/networking/cluster/nomad/1.0.nix +++ b/pkgs/applications/networking/cluster/nomad/1.0.nix @@ -6,6 +6,6 @@ callPackage ./generic.nix { inherit buildGoPackage nvidia_x11 nvidiaGpuSupport; - version = "1.0.1"; - sha256 = "07k81csyxhgc7bgn297zlqyvc55qb5fmiavi7dk81rdpg5m2zjvv"; + version = "1.0.2"; + sha256 = "1l9j6k5dzh9ym9j75mam10vd9b5qh4xqfj6d63bjp7gkk4hd1jxx"; } diff --git a/pkgs/applications/networking/cluster/octant/default.nix b/pkgs/applications/networking/cluster/octant/default.nix index 4eb2bf78b54..ebf3cb417d6 100644 --- a/pkgs/applications/networking/cluster/octant/default.nix +++ b/pkgs/applications/networking/cluster/octant/default.nix @@ -25,7 +25,6 @@ stdenv.mkDerivation rec { x86_64-darwin = "0y2qjdlyvhrzwg0fmxsr3jl39kd13276a7wg0ndhdjfwxvdwpxkz"; }; - doBuild = false; doCheck = false; installPhase = '' diff --git a/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix b/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix index 8e5942a033f..f6fb486bd93 100644 --- a/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix +++ b/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix @@ -2,16 +2,18 @@ buildGoModule rec { pname = "starboard-octant-plugin"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wMt/I2zpdM7l+YNwHkAA6sVRWUtlGpN+94jqx2Jy4HA="; + sha256 = "sha256-R6hnAqFpebZ9PV3KAX052wjjCtW5D9hKfj7DdS+3Ibg="; }; - vendorSha256 = "sha256-fhIIqirEEdqn/n8bBtLw07fEGfnpC/8SOLbkhnytyME="; + vendorSha256 = "sha256-c5sel3xs4npTENqRQu8d9hUOK1OFQodF3M0ZpUpr1po="; + + buildFlagsArray = [ "-ldflags=" "-s" "-w" ]; meta = with lib; { description = "Octant plugin for viewing Starboard security information"; diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index ef9e6c74220..53209d2edd6 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, buildGoPackage, which, go-bindata, rsync, util-linux +{ lib, fetchFromGitHub, buildGoPackage, which, go-bindata, rsync, util-linux , coreutils, kerberos, ncurses, clang, installShellFiles , components ? [ "cmd/oc" @@ -10,7 +10,7 @@ with lib; let version = "4.1.0"; - ver = stdenv.lib.elemAt (stdenv.lib.splitVersion version); + ver = lib.elemAt (lib.splitVersion version); versionMajor = ver 0; versionMinor = ver 1; versionPatch = ver 2; diff --git a/pkgs/applications/networking/cluster/pig/default.nix b/pkgs/applications/networking/cluster/pig/default.nix index 2a2c2c43722..ded8a2ea493 100644 --- a/pkgs/applications/networking/cluster/pig/default.nix +++ b/pkgs/applications/networking/cluster/pig/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { for n in $out/{bin,sbin}"/"*; do wrapProgram $n \ - --prefix PATH : "${stdenv.lib.makeBinPath [ jre bash ]}" \ + --prefix PATH : "${lib.makeBinPath [ jre bash ]}" \ --set JAVA_HOME "${jre}" --set HADOOP_PREFIX "${hadoop}" done ''; diff --git a/pkgs/applications/networking/cluster/popeye/default.nix b/pkgs/applications/networking/cluster/popeye/default.nix index 650532ae8b9..89802f12be5 100644 --- a/pkgs/applications/networking/cluster/popeye/default.nix +++ b/pkgs/applications/networking/cluster/popeye/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "popeye"; diff --git a/pkgs/applications/networking/cluster/qbec/default.nix b/pkgs/applications/networking/cluster/qbec/default.nix index 18a753ca3ca..a4f15586ad0 100644 --- a/pkgs/applications/networking/cluster/qbec/default.nix +++ b/pkgs/applications/networking/cluster/qbec/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "qbec"; - version = "0.12.2"; + version = "0.13.4"; src = fetchFromGitHub { owner = "splunk"; repo = "qbec"; rev = "v${version}"; - sha256 = "10bf9ja44n1gzhb5znqbmr1xjc87akrsdyxfvrz4f5bd3p1fh6j0"; + sha256 = "sha256-jbGEkBBXb1dDv4E7vEPVyvDahz27Kpyo3taenCH/vfw="; }; - vendorSha256 = "0xkmccm6cyw1p5mah7psbpfsfaw8f09r1a2k4iksfggrn9mimaam"; + vendorSha256 = "sha256-rzxtLaGUl8hxcJ+GWlrkjN+f7mb0lXrtkHj/pBO8HzQ="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/spacegun/default.nix b/pkgs/applications/networking/cluster/spacegun/default.nix index 2180d8d3048..64623f88dda 100644 --- a/pkgs/applications/networking/cluster/spacegun/default.nix +++ b/pkgs/applications/networking/cluster/spacegun/default.nix @@ -21,7 +21,7 @@ nodePackages."${packageName}".override { meta = with lib; { description = "Version controlled multi-cluster deployment manager for kubernetes"; - maintainers = with maintainers; [ kampka ]; + maintainers = with maintainers; [ ]; license = licenses.mit; }; } diff --git a/pkgs/applications/networking/cluster/spacegun/node-composition.nix b/pkgs/applications/networking/cluster/spacegun/node-composition.nix index 712f62e8d4f..4e8a9d958f9 100644 --- a/pkgs/applications/networking/cluster/spacegun/node-composition.nix +++ b/pkgs/applications/networking/cluster/spacegun/node-composition.nix @@ -6,7 +6,7 @@ let nodeEnv = import ../../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile; + inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile; inherit nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; @@ -14,4 +14,4 @@ in import ./node-packages.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} \ No newline at end of file +} diff --git a/pkgs/applications/networking/cluster/spacegun/node-packages.nix b/pkgs/applications/networking/cluster/spacegun/node-packages.nix index 981d787c91a..423e34f10df 100644 --- a/pkgs/applications/networking/cluster/spacegun/node-packages.nix +++ b/pkgs/applications/networking/cluster/spacegun/node-packages.nix @@ -11474,4 +11474,4 @@ in bypassCache = true; reconstructLock = true; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index 53856ce9e2f..071636ec443 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchzip, makeWrapper, jre, pythonPackages, coreutils, hadoop +{ lib, stdenv, fetchzip, makeWrapper, jre, pythonPackages, coreutils, hadoop , RSupport? true, R }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { @@ -47,8 +47,8 @@ stdenv.mkDerivation rec { meta = { description = "Apache Spark is a fast and general engine for large-scale data processing"; homepage = "http://spark.apache.org"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.asl20; + platforms = lib.platforms.all; maintainers = with maintainers; [ thoughtpolice offline kamilchm ]; repositories.git = "git://git.apache.org/spark.git"; }; diff --git a/pkgs/applications/networking/cluster/ssm-agent/default.nix b/pkgs/applications/networking/cluster/ssm-agent/default.nix index 80c8244bee1..928fb351c6a 100644 --- a/pkgs/applications/networking/cluster/ssm-agent/default.nix +++ b/pkgs/applications/networking/cluster/ssm-agent/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoPackage, bash, makeWrapper }: +{ lib, fetchFromGitHub, buildGoPackage, bash, makeWrapper }: buildGoPackage rec { pname = "amazon-ssm-agent"; diff --git a/pkgs/applications/networking/cluster/starboard/default.nix b/pkgs/applications/networking/cluster/starboard/default.nix index 3850eb75638..0ce692402e1 100644 --- a/pkgs/applications/networking/cluster/starboard/default.nix +++ b/pkgs/applications/networking/cluster/starboard/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "starboard"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KRVMgrJ7xtv2SYa249sSDV8PObStAe+UGEgZWv43sk4="; + sha256 = "sha256-BzOpP34UumGaAL+vc+lkCKBuK8i0zAWzpMLuPszupQI="; }; - vendorSha256 = "sha256-AIMa0lUXFGvhnt8v7l+NIhXLlik5cGYL1OqINNElnx0="; + vendorSha256 = "sha256-XOneGFTtoxuHnjGVse15Ypfo7vO3ReeGs46qLG619aM="; subPackages = [ "cmd/starboard" ]; diff --git a/pkgs/applications/networking/cluster/taktuk/default.nix b/pkgs/applications/networking/cluster/taktuk/default.nix index a5a2ace2399..5cb9f816006 100644 --- a/pkgs/applications/networking/cluster/taktuk/default.nix +++ b/pkgs/applications/networking/cluster/taktuk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl }: +{ lib, stdenv, fetchurl, perl }: stdenv.mkDerivation rec { version = "3.7.7"; @@ -26,9 +26,9 @@ stdenv.mkDerivation rec { require any specific software on the nodes thanks to a self-propagation algorithm.''; homepage = "http://taktuk.gforge.inria.fr/"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.bzizou ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.bzizou ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix index aeaff2ff5f1..a2bb9da6805 100644 --- a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix +++ b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tektoncd-cli"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "tektoncd"; repo = "cli"; rev = "v${version}"; - sha256 = "1mkbwh4cmhx9in928vlvs7xjjklpsxbv5niv8jmsbnifflg1an8p"; + sha256 = "0xb2zlpkh9cwinp6zj2jpv4wlws042ad1fa0wkcnnkh0vjm6mnrl"; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/terraform-inventory/default.nix b/pkgs/applications/networking/cluster/terraform-inventory/default.nix index 7b9bf354af7..085b504314e 100644 --- a/pkgs/applications/networking/cluster/terraform-inventory/default.nix +++ b/pkgs/applications/networking/cluster/terraform-inventory/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub}: +{ lib, buildGoPackage, fetchFromGitHub}: buildGoPackage rec { pname = "terraform-inventory"; diff --git a/pkgs/applications/networking/cluster/terraform-landscape/gemset.nix b/pkgs/applications/networking/cluster/terraform-landscape/gemset.nix index aa3f5142aa5..bf3767486ea 100644 --- a/pkgs/applications/networking/cluster/terraform-landscape/gemset.nix +++ b/pkgs/applications/networking/cluster/terraform-landscape/gemset.nix @@ -58,4 +58,4 @@ }; version = "1.6.10"; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/networking/cluster/terraform-providers/ansible/default.nix b/pkgs/applications/networking/cluster/terraform-providers/ansible/default.nix index 14d411c0239..b8e3c1540e9 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/ansible/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/ansible/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoPackage }: +{ lib, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { pname = "terraform-provider-ansible"; version = "1.0.3"; diff --git a/pkgs/applications/networking/cluster/terraform-providers/cloudfoundry/default.nix b/pkgs/applications/networking/cluster/terraform-providers/cloudfoundry/default.nix index 0528bce81e3..1ee986d2030 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/cloudfoundry/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/cloudfoundry/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "terraform-provider-cloudfoundry"; diff --git a/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix b/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix index 47e4f30d009..6ae781046df 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "terraform-provider-elasticsearch"; version = "0.7.0"; diff --git a/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix b/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix index fe508f4fa2e..13afa8d3818 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoPackage }: +{ lib, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { pname = "terraform-provider-gandi"; version = "1.0.0"; diff --git a/pkgs/applications/networking/cluster/terraform-providers/hcloud/default.nix b/pkgs/applications/networking/cluster/terraform-providers/hcloud/default.nix index 97331e683ef..f9a84866934 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/hcloud/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/hcloud/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "terraform-provider-hcloud"; diff --git a/pkgs/applications/networking/cluster/terraform-providers/keycloak/default.nix b/pkgs/applications/networking/cluster/terraform-providers/keycloak/default.nix index f2244345a9c..043e081d94e 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/keycloak/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/keycloak/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , buildGoModule }: diff --git a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix index 3caab38a3ef..ed2409ead9a 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, libvirt, pkgconfig, makeWrapper, cdrtools }: +{ lib, buildGoPackage, fetchFromGitHub, fetchpatch, libvirt, pkg-config, makeWrapper, cdrtools }: # USAGE: # install the following package globally or in nix-shell: @@ -23,6 +23,14 @@ buildGoPackage rec { goPackagePath = "github.com/dmacvicar/terraform-provider-libvirt"; + patches = [ + (fetchpatch { + name = "base_volume_copy.patch"; + url = "https://github.com/cyril-s/terraform-provider-libvirt/commit/52df264e8a28c40ce26e2b614ee3daea882931c3.patch"; + sha256 = "1fg7ii2fi4c93hl41nhcncy9bpw3avbh6yiq99p1vkf87hhrw72n"; + }) + ]; + src = fetchFromGitHub { owner = "dmacvicar"; repo = "terraform-provider-libvirt"; @@ -30,7 +38,7 @@ buildGoPackage rec { sha256 = "0ak2lpnv6h0i7lzfcggd90jpfhvsasdr6nflkflk2drlcpalggj9"; }; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ libvirt ]; diff --git a/pkgs/applications/networking/cluster/terraform-providers/linuxbox/default.nix b/pkgs/applications/networking/cluster/terraform-providers/linuxbox/default.nix index f445d48eaee..4f8c44aad3f 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/linuxbox/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/linuxbox/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "terraform-provider-linuxbox"; diff --git a/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix b/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix index 6ccc551b4d3..23d41ce7f1f 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "terraform-provider-lxd"; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index c015afb787d..406f89decb5 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -342,9 +342,9 @@ "owner": "gitlabhq", "provider-source-address": "registry.terraform.io/gitlabhq/gitlab", "repo": "terraform-provider-gitlab", - "rev": "v3.1.0", - "sha256": "1an34ckz7lz1k25lkjpbmls55zp9pacr46vjnjjpqx6bx5s95f5g", - "version": "3.1.0" + "rev": "v3.4.0", + "sha256": "03k3xjhxw70n00dvwd0fkdshff9hnicrah6rm6zqmksb4mb7wji3", + "version": "3.4.0" }, "google": { "owner": "hashicorp", diff --git a/pkgs/applications/networking/cluster/terraform-providers/shell/default.nix b/pkgs/applications/networking/cluster/terraform-providers/shell/default.nix index 4833a967788..f2e9b86a646 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/shell/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/shell/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "terraform-provider-shell"; version = "1.6.0"; @@ -20,6 +20,8 @@ buildGoModule rec { # if the versions are not provided via file paths. postInstall = "mv $out/bin/${pname}{,_v${version}}"; + passthru.provider-source-address = "registry.terraform.io/scottwinkler/shell"; + meta = with lib; { inherit (src.meta) homepage; description = "Terraform provider for executing shell commands and saving output to state file"; diff --git a/pkgs/applications/networking/cluster/terraform-providers/vercel/default.nix b/pkgs/applications/networking/cluster/terraform-providers/vercel/default.nix index f4cfe6ba02f..f37d1ac5d87 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/vercel/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/vercel/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "terraform-provider-vercel"; diff --git a/pkgs/applications/networking/cluster/terraform-providers/vpsadmin/default.nix b/pkgs/applications/networking/cluster/terraform-providers/vpsadmin/default.nix index 4f56070fa51..93401dfc635 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/vpsadmin/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/vpsadmin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "terraform-provider-vpsadmin"; version = "0.1.0"; diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index a190994e746..9e01674eab2 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -157,9 +157,9 @@ in rec { }); terraform_0_14 = pluggable (generic { - version = "0.14.4"; - sha256 = "0kjbx1gshp1lvhnjfigfzza0sbl3m6d9qb3in7q5vc6kdkiplb66"; - vendorSha256 = "10vb6gsw7mha99lvx3lbgd80vf0imcqyc0va0y64f6wzaw557n7v"; + version = "0.14.5"; + sha256 = "0drf049zghpm3ajrn006w621s7bw5r1s8gl77nd1cj2zcw2nzn1r"; + vendorSha256 = "0z9mkilazrkpbccnkws4hcc49djdwzn0cdbgqkm9bnp9fyg3rfvs"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 83704f9ea93..95772e997e5 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -1,27 +1,31 @@ -{ lib, buildGoModule, fetchFromGitHub, makeWrapper }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "terragrunt"; - version = "0.27.0"; + version = "0.28.1"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MbhJ1f6Da+kkkCV85kH8Yv74cMzp7JvxeQb0By9aGp8="; + sha256 = "sha256-uY0J/w7uIVMd+0N0IeWKWWzQENI6oaLCD4+YUz9BOVA="; }; - vendorSha256 = "sha256-AMxBzUHRsq1HOMtvgYqIw22Cky7gQ7/2hI8wQnxaXb0="; + vendorSha256 = "sha256-lRJerUYafpkXAGf8MEM8SeG3aB86mlMo7iLpeHFAnd4="; doCheck = false; - buildInputs = [ makeWrapper ]; - - buildFlagsArray = [ "-ldflags=" "-X main.VERSION=v${version}" ]; + buildFlagsArray = [ + "-ldflags=" + "-s" + "-w" + "-X main.VERSION=v${version}" + ]; meta = with lib; { + homepage = "https://terragrunt.gruntwork.io"; + changelog = "https://github.com/gruntwork-io/terragrunt/releases/tag/v${version}"; description = "A thin wrapper for Terraform that supports locking for Terraform state and enforces best practices"; - homepage = "https://github.com/gruntwork-io/terragrunt/"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg jk ]; }; diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index 9f2a223c448..a185c64646f 100644 --- a/pkgs/applications/networking/cluster/tilt/default.nix +++ b/pkgs/applications/networking/cluster/tilt/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "tilt"; /* Do not use "dev" as a version. If you do, Tilt will consider itself running in development environment and try to serve assets from the source tree, which is not there once build completes. */ - version = "0.18.1"; + version = "0.18.5"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "1sdb2x06va0j9cxdwz95dklv2csq0s596wjsjqi4sq65y9bxjr7i"; + sha256 = "0msfc2cgfq7dz02n2z898iw2bx98qsny3j4pzja767vcdpnzjmr5"; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/velero/default.nix b/pkgs/applications/networking/cluster/velero/default.nix index ec95b090c2e..250d6cfc1a0 100644 --- a/pkgs/applications/networking/cluster/velero/default.nix +++ b/pkgs/applications/networking/cluster/velero/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "velero"; diff --git a/pkgs/applications/networking/compactor/default.nix b/pkgs/applications/networking/compactor/default.nix index 96b8b6933d8..d0db8cc10b9 100644 --- a/pkgs/applications/networking/compactor/default.nix +++ b/pkgs/applications/networking/compactor/default.nix @@ -1,5 +1,5 @@ { autoconf, automake, boost, cbor-diag, cddl, fetchFromGitHub, file, libctemplate, libmaxminddb -, libpcap, libtins, libtool, lzma, openssl, pkgconfig, lib, stdenv, tcpdump, wireshark-cli +, libpcap, libtins, libtool, lzma, openssl, pkg-config, lib, stdenv, tcpdump, wireshark-cli }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; # cbor-diag, cddl and wireshark-cli are only used for tests. - nativeBuildInputs = [ autoconf automake libtool pkgconfig cbor-diag cddl wireshark-cli ]; + nativeBuildInputs = [ autoconf automake libtool pkg-config cbor-diag cddl wireshark-cli ]; buildInputs = [ boost libpcap @@ -54,6 +54,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/dns-stats/${pname}/raw/${version}/ChangeLog.txt"; license = [ licenses.boost licenses.mpl20 licenses.openssl ]; maintainers = with maintainers; [ fdns ]; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/networking/datovka/default.nix b/pkgs/applications/networking/datovka/default.nix index ca675dd7836..a48bd4ae44d 100644 --- a/pkgs/applications/networking/datovka/default.nix +++ b/pkgs/applications/networking/datovka/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , mkDerivation , fetchurl , libxml2 diff --git a/pkgs/applications/networking/davmail/default.nix b/pkgs/applications/networking/davmail/default.nix index bbb27672a7d..008592778aa 100644 --- a/pkgs/applications/networking/davmail/default.nix +++ b/pkgs/applications/networking/davmail/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { cp -vR ./* $out/share/davmail makeWrapper $out/share/davmail/davmail $out/bin/davmail \ --prefix PATH : ${jre}/bin \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ glib gtk2 libXtst ]} + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ glib gtk2 libXtst ]} ''; meta = with lib; { diff --git a/pkgs/applications/networking/dropbox/cli.nix b/pkgs/applications/networking/dropbox/cli.nix index 5ff47f4859a..57b39383e97 100644 --- a/pkgs/applications/networking/dropbox/cli.nix +++ b/pkgs/applications/networking/dropbox/cli.nix @@ -1,6 +1,6 @@ -{ stdenv +{ lib, stdenv , substituteAll -, pkgconfig +, pkg-config , fetchurl , python3 , dropbox @@ -35,7 +35,7 @@ stdenv.mkDerivation { ]; nativeBuildInputs = [ - pkgconfig + pkg-config gobject-introspection gdk-pixbuf # only for build, the install command also wants to use GTK through introspection @@ -63,8 +63,8 @@ stdenv.mkDerivation { meta = { homepage = "https://www.dropbox.com"; description = "Command line client for the dropbox daemon"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; # NOTE: Dropbox itself only works on linux, so this is ok. - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/dyndns/cfdyndns/default.nix b/pkgs/applications/networking/dyndns/cfdyndns/default.nix index cedfcbdb5d1..dae9ad3bc33 100644 --- a/pkgs/applications/networking/dyndns/cfdyndns/default.nix +++ b/pkgs/applications/networking/dyndns/cfdyndns/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl }: +{ lib, fetchFromGitHub, rustPlatform, pkg-config, openssl }: with rustPlatform; @@ -25,7 +25,7 @@ buildRustPackage rec { meta = with lib; { description = "CloudFlare Dynamic DNS Client"; homepage = "https://github.com/colemickens/cfdyndns"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; maintainers = with maintainers; [ colemickens ]; platforms = with platforms; linux; }; diff --git a/pkgs/applications/networking/enhanced-ctorrent/default.nix b/pkgs/applications/networking/enhanced-ctorrent/default.nix index 76d6d39baf2..ef4baaadc2b 100644 --- a/pkgs/applications/networking/enhanced-ctorrent/default.nix +++ b/pkgs/applications/networking/enhanced-ctorrent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch }: +{ lib, stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation { version = "3.3.2"; @@ -28,8 +28,8 @@ stdenv.mkDerivation { performance enhancements. ''; homepage = "http://www.rahul.net/dholmes/ctorrent/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.devhell ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.devhell ]; }; } diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix index 4c1b2bbea04..97b0b1f192b 100644 --- a/pkgs/applications/networking/esniper/default.nix +++ b/pkgs/applications/networking/esniper/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { postInstall = '' sed <"frontends/snipe" >"$out/bin/snipe" \ - -e "2i export PATH=\"$out/bin:${stdenv.lib.makeBinPath [ coreutils gawk bash which ]}:\$PATH\"" + -e "2i export PATH=\"$out/bin:${lib.makeBinPath [ coreutils gawk bash which ]}:\$PATH\"" chmod 555 "$out/bin/snipe" ''; diff --git a/pkgs/applications/networking/feedreaders/canto-curses/default.nix b/pkgs/applications/networking/feedreaders/canto-curses/default.nix index 80106085e1b..729d12c1e5b 100644 --- a/pkgs/applications/networking/feedreaders/canto-curses/default.nix +++ b/pkgs/applications/networking/feedreaders/canto-curses/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages, readline, ncurses, canto-daemon }: +{ lib, fetchFromGitHub, python3Packages, readline, ncurses, canto-daemon }: python3Packages.buildPythonApplication rec { version = "0.9.9"; @@ -25,8 +25,8 @@ python3Packages.buildPythonApplication rec { and extensibility using the excellent Python programming language. ''; homepage = "https://codezen.org/canto-ng/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.devhell ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.devhell ]; }; } diff --git a/pkgs/applications/networking/feedreaders/canto-daemon/default.nix b/pkgs/applications/networking/feedreaders/canto-daemon/default.nix index a67e0c3aed2..5eb8c9d7437 100644 --- a/pkgs/applications/networking/feedreaders/canto-daemon/default.nix +++ b/pkgs/applications/networking/feedreaders/canto-daemon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, }: +{ lib, fetchFromGitHub, python3Packages, }: python3Packages.buildPythonApplication rec { version = "0.9.8"; diff --git a/pkgs/applications/networking/feedreaders/castget/default.nix b/pkgs/applications/networking/feedreaders/castget/default.nix index 6aec4540147..f0f09c8de7e 100644 --- a/pkgs/applications/networking/feedreaders/castget/default.nix +++ b/pkgs/applications/networking/feedreaders/castget/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , autoreconfHook -, pkgconfig +, pkg-config , glib , ronn , curl @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { # See comment on locale above glibcLocales autoreconfHook - pkgconfig + pkg-config ]; meta = with lib; { diff --git a/pkgs/applications/networking/feedreaders/feedreader/default.nix b/pkgs/applications/networking/feedreaders/feedreader/default.nix index 2df2b9ce786..d550a126547 100644 --- a/pkgs/applications/networking/feedreaders/feedreader/default.nix +++ b/pkgs/applications/networking/feedreaders/feedreader/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, nix-update-script, meson, ninja, pkgconfig, vala, gettext, python3 +{ lib, stdenv, fetchFromGitHub, nix-update-script, meson, ninja, pkg-config, vala, gettext, python3 , appstream-glib, desktop-file-utils, wrapGAppsHook, gnome-online-accounts , gtk3, libgee, libpeas, librest, webkitgtk, gsettings-desktop-schemas, pantheon , curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo, libxml2 @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - meson ninja pkgconfig vala gettext appstream-glib desktop-file-utils + meson ninja pkg-config vala gettext appstream-glib desktop-file-utils libxml2 python3 wrapGAppsHook ]; diff --git a/pkgs/applications/networking/feedreaders/feeds/default.nix b/pkgs/applications/networking/feedreaders/feeds/default.nix index 243999553e6..8b83762089d 100644 --- a/pkgs/applications/networking/feedreaders/feeds/default.nix +++ b/pkgs/applications/networking/feedreaders/feeds/default.nix @@ -1,6 +1,6 @@ { lib , callPackage -, stdenv + , fetchFromGitLab , appstream diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix index 448590fbf11..b032d3de332 100644 --- a/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -3,22 +3,22 @@ rustPlatform.buildRustPackage rec { pname = "newsboat"; - version = "2.21"; + version = "2.22.1"; src = fetchFromGitHub { owner = "newsboat"; repo = "newsboat"; rev = "r${version}"; - sha256 = "0ignfmh5193bigvk9f057r0r4yaxymxv2afycn2b98w05gljccb6"; + sha256 = "1j3z34dhqw0f1v6v2lfwcvzqnm2kr2940bgxibfi0npacp74izh3"; }; - cargoSha256 = "16652i2hbs6d3fam2hdlc947i5nrb3na186zfcb4nfh7hnb7lh8g"; + cargoSha256 = "08ywaka1lib8yrqjmfx1i37f7b33y3i6jj7f50pwhw8n6lr9f7lc"; postPatch = '' substituteInPlace Makefile --replace "|| true" "" '' # TODO: Check if that's still needed - + stdenv.lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.isDarwin '' # Allow other ncurses versions on Darwin substituteInPlace config.sh \ --replace "ncurses5.4" "ncurses" @@ -29,24 +29,24 @@ rustPlatform.buildRustPackage rec { pkg-config asciidoctor gettext - ] ++ stdenv.lib.optionals stdenv.isDarwin [ makeWrapper ncurses ]; + ] ++ lib.optionals stdenv.isDarwin [ makeWrapper ncurses ]; buildInputs = [ stfl sqlite curl libxml2 json_c ncurses ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Security Foundation libiconv gettext ]; + ++ lib.optionals stdenv.isDarwin [ Security Foundation libiconv gettext ]; postBuild = '' make prefix="$out" ''; # TODO: Check if that's still needed - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin " -Wno-error=format-security"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin " -Wno-error=format-security"; # https://github.com/NixOS/nixpkgs/pull/98471#issuecomment-703100014 . We set # these for all platforms, since upstream's gettext crate behavior might # change in the future. - GETTEXT_LIB_DIR = "${stdenv.lib.getLib gettext}/lib"; - GETTEXT_INCLUDE_DIR = "${stdenv.lib.getDev gettext}/include"; - GETTEXT_BIN_DIR = "${stdenv.lib.getBin gettext}/bin"; + GETTEXT_LIB_DIR = "${lib.getLib gettext}/lib"; + GETTEXT_INCLUDE_DIR = "${lib.getDev gettext}/include"; + GETTEXT_BIN_DIR = "${lib.getBin gettext}/bin"; doCheck = true; @@ -57,7 +57,7 @@ rustPlatform.buildRustPackage rec { postInstall = '' make prefix="$out" install cp -r contrib $out - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' for prog in $out/bin/*; do wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${stfl}/lib" done diff --git a/pkgs/applications/networking/feedreaders/rawdog/default.nix b/pkgs/applications/networking/feedreaders/rawdog/default.nix index d24e0fbf717..f840c191f90 100644 --- a/pkgs/applications/networking/feedreaders/rawdog/default.nix +++ b/pkgs/applications/networking/feedreaders/rawdog/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python2Packages }: +{ lib, fetchurl, python2Packages }: python2Packages.buildPythonApplication rec { pname = "rawdog"; diff --git a/pkgs/applications/networking/feedreaders/rsstail/default.nix b/pkgs/applications/networking/feedreaders/rsstail/default.nix index f83c9111755..ea1566cd697 100644 --- a/pkgs/applications/networking/feedreaders/rsstail/default.nix +++ b/pkgs/applications/networking/feedreaders/rsstail/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { owner = "flok99"; }; - buildInputs = [ libmrss ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = [ libmrss ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; checkInputs = [ cppcheck ]; postPatch = '' diff --git a/pkgs/applications/networking/firehol/default.nix b/pkgs/applications/networking/firehol/default.nix index 904fd90e102..ee0b561e675 100644 --- a/pkgs/applications/networking/firehol/default.nix +++ b/pkgs/applications/networking/firehol/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "firehol"; - version = "3.1.6"; + version = "3.1.7"; src = fetchFromGitHub { owner = "firehol"; repo = "firehol"; rev = "v${version}"; - sha256 = "0l7sjpsb300kqv21hawd26a7jszlmafplacpn5lfj64m4yip93fd"; + sha256 = "sha256-gq7l7QoUsK+j5DUn84kD9hlUTC4hz3ds3gNJc1tRygs="; }; patches = [ diff --git a/pkgs/applications/networking/flent/default.nix b/pkgs/applications/networking/flent/default.nix index 5f9350b70cd..bcff9e4f8b7 100644 --- a/pkgs/applications/networking/flent/default.nix +++ b/pkgs/applications/networking/flent/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, fetchPypi, matplotlib, procps, pyqt5, python +{ lib, buildPythonApplication, fetchPypi, matplotlib, procps, pyqt5, python , pythonPackages, qt5, sphinx, xvfb_run }: buildPythonApplication rec { diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index a24105f8315..877cdec4ca8 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -7,12 +7,12 @@ , libfilezilla , libidn , nettle -, pkgconfig +, pkg-config , pugixml , sqlite , tinyxml , wxGTK30-gtk3 -, xdg_utils +, xdg-utils }: stdenv.mkDerivation rec { @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { "--disable-autoupdatecheck" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ dbus @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { tinyxml wxGTK30-gtk3 wxGTK30-gtk3.gtk - xdg_utils + xdg-utils ]; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/ftp/taxi/default.nix b/pkgs/applications/networking/ftp/taxi/default.nix index 335b94cd2f4..a359bf3a7c0 100644 --- a/pkgs/applications/networking/ftp/taxi/default.nix +++ b/pkgs/applications/networking/ftp/taxi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, nix-update-script, pantheon, pkgconfig, meson, ninja, python3, vala +{ lib, stdenv, fetchFromGitHub, nix-update-script, pantheon, pkg-config, meson, ninja, python3, vala , gtk3, libgee, libsoup, libsecret, gobject-introspection, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { gobject-introspection meson ninja - pkgconfig + pkg-config python3 wrapGAppsHook ]; diff --git a/pkgs/applications/networking/gdrive/default.nix b/pkgs/applications/networking/gdrive/default.nix index b51512332c5..b62bda3c469 100644 --- a/pkgs/applications/networking/gdrive/default.nix +++ b/pkgs/applications/networking/gdrive/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gdrive"; diff --git a/pkgs/applications/networking/gmailctl/default.nix b/pkgs/applications/networking/gmailctl/default.nix index 30a25dc9f70..0042e5417df 100644 --- a/pkgs/applications/networking/gmailctl/default.nix +++ b/pkgs/applications/networking/gmailctl/default.nix @@ -1,20 +1,20 @@ -{ lib, stdenv +{ lib , buildGoModule , fetchFromGitHub }: buildGoModule rec { pname = "gmailctl"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "mbrt"; repo = "gmailctl"; rev = "v${version}"; - sha256 = "08q4yjfbwlldirf3j5db18l8kn6sf288wd364s50jlcx2ka8w50j"; + sha256 = "sha256-UZzpecW4vW1JYUDCcwDIJXCGjw80fgZC4wvCh0DdE98="; }; - vendorSha256 = "0qp8n7z3vcsbc6safp7i18i0i3r4hy4nidzwl85i981sg12vcg6b"; + vendorSha256 = "sha256-5oVr1qazTzsSNVLvcAsAN8UyrJOeqLjSVinImLOyJlk="; doCheck = false; diff --git a/pkgs/applications/networking/gnome-network-displays/default.nix b/pkgs/applications/networking/gnome-network-displays/default.nix index 5a865fddb59..8456720cb7a 100644 --- a/pkgs/applications/networking/gnome-network-displays/default.nix +++ b/pkgs/applications/networking/gnome-network-displays/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { version = "0.90.4"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "04snnfz5jxxpjkrwa7dchc2h4shszi8mq9g3ihvsvipgzjw3d498"; }; diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index c2ca0f580c3..62fdfd71f23 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -1,6 +1,6 @@ { stable, branch, version, sha256Hash, mkOverride, commonOverrides }: -{ lib, stdenv, python3, fetchFromGitHub }: +{ lib, python3, fetchFromGitHub }: let defaultOverrides = commonOverrides ++ [ diff --git a/pkgs/applications/networking/hydroxide/default.nix b/pkgs/applications/networking/hydroxide/default.nix index a54a47b9c8f..52d4ae07ce5 100644 --- a/pkgs/applications/networking/hydroxide/default.nix +++ b/pkgs/applications/networking/hydroxide/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hydroxide"; - version = "0.2.15"; + version = "0.2.17"; src = fetchFromGitHub { owner = "emersion"; repo = pname; rev = "v${version}"; - sha256 = "0r91cq39n89hfy8sbdy5vjzqfrsfd7cdhd41gwszpayq65qhbsyp"; + sha256 = "sha256-gNMLVh5ntVCxiIKLshRvYXi5dYLZ8qiZFwZxbNPVFTk="; }; - vendorSha256 = "1r5qg5cx48yw1l5nil28y4a82fc7g52jmy9pckaxygppmmn539pc"; + vendorSha256 = "sha256-f/1Vxuc87eQie/j1b14q/1lAAzRk+ZDkBaTmHtCy7go="; doCheck = false; diff --git a/pkgs/applications/networking/ids/daq/default.nix b/pkgs/applications/networking/ids/daq/default.nix index 871aba0a669..26ae9e7a581 100644 --- a/pkgs/applications/networking/ids/daq/default.nix +++ b/pkgs/applications/networking/ids/daq/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, flex, bison, libpcap, libdnet, libnfnetlink, libnetfilter_queue}: +{ lib, stdenv, fetchurl, flex, bison, libpcap, libdnet, libnfnetlink, libnetfilter_queue}: stdenv.mkDerivation rec { name = "daq-2.2.2"; @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { meta = { description = "Data AcQuisition library (DAQ), for packet I/O"; homepage = "https://www.snort.org"; - maintainers = with stdenv.lib.maintainers; [ aycanirican ]; - license = stdenv.lib.licenses.gpl2; - platforms = with stdenv.lib.platforms; linux; + maintainers = with lib.maintainers; [ aycanirican ]; + license = lib.licenses.gpl2; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix index 7529e233e13..17ace3021d8 100644 --- a/pkgs/applications/networking/ids/snort/default.nix +++ b/pkgs/applications/networking/ids/snort/default.nix @@ -1,4 +1,4 @@ -{stdenv, pkgconfig, luajit, openssl, fetchurl, libpcap, pcre, libdnet, daq, zlib, flex, bison, makeWrapper +{lib, stdenv, pkg-config, luajit, openssl, fetchurl, libpcap, pcre, libdnet, daq, zlib, flex, bison, makeWrapper , libtirpc }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "13lzvjli6kbsnkd7lf0rm71l2mnz38pxk76ia9yrjb6clfhlbb73"; }; - buildInputs = [ makeWrapper pkgconfig luajit openssl libpcap pcre libdnet daq zlib flex bison libtirpc ]; + buildInputs = [ makeWrapper pkg-config luajit openssl libpcap pcre libdnet daq zlib flex bison libtirpc ]; NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; @@ -32,8 +32,8 @@ stdenv.mkDerivation rec { meta = { description = "Network intrusion prevention and detection system (IDS/IPS)"; homepage = "https://www.snort.org"; - maintainers = with stdenv.lib.maintainers; [ aycanirican ]; - license = stdenv.lib.licenses.gpl2; - platforms = with stdenv.lib.platforms; linux; + maintainers = with lib.maintainers; [ aycanirican ]; + license = lib.licenses.gpl2; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/networking/ids/suricata/default.nix b/pkgs/applications/networking/ids/suricata/default.nix index 40dbbddbb3e..00f6aee0915 100644 --- a/pkgs/applications/networking/ids/suricata/default.nix +++ b/pkgs/applications/networking/ids/suricata/default.nix @@ -3,7 +3,7 @@ , fetchurl , clang , llvm -, pkgconfig +, pkg-config , makeWrapper , file , hyperscan @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { clang llvm makeWrapper - pkgconfig + pkg-config ] ++ lib.optionals rustSupport [ rustc cargo ] ; diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix index dc8fde4c6ca..f7b526f29b5 100644 --- a/pkgs/applications/networking/ids/zeek/default.nix +++ b/pkgs/applications/networking/ids/zeek/default.nix @@ -30,12 +30,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake flex bison file ]; buildInputs = [ openssl libpcap zlib curl libmaxminddb gperftools python swig ] - ++ stdenv.lib.optionals stdenv.isDarwin [ gettext ]; + ++ lib.optionals stdenv.isDarwin [ gettext ]; #see issue https://github.com/zeek/zeek/issues/804 to modify hardlinking duplicate files. inherit preConfigure; - patches = stdenv.lib.optionals stdenv.cc.isClang [ + patches = lib.optionals stdenv.cc.isClang [ # Fix pybind c++17 build with Clang. See: https://github.com/pybind/pybind11/issues/1604 (fetchpatch { url = "https://github.com/pybind/pybind11/commit/759221f5c56939f59d8f342a41f8e2d2cacbc8cf.patch"; diff --git a/pkgs/applications/networking/ike/default.nix b/pkgs/applications/networking/ike/default.nix index 405827d8c5d..7a8c3d395f6 100644 --- a/pkgs/applications/networking/ike/default.nix +++ b/pkgs/applications/networking/ike/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { installPhase = '' make install for file in "$out"/bin/* "$out"/sbin/*; do - wrapProgram $file --prefix LD_LIBRARY_PATH ":" "$out/lib:${stdenv.lib.makeLibraryPath [ openssl gcc.cc stdenv.cc.libc libedit qt4 ]}" + wrapProgram $file --prefix LD_LIBRARY_PATH ":" "$out/lib:${lib.makeLibraryPath [ openssl gcc.cc stdenv.cc.libc libedit qt4 ]}" done ''; diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index c3479d1ee69..e3a8e682577 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, zlib, openssl, libre, librem, pkgconfig, gst_all_1 +{ lib, stdenv, fetchurl, zlib, openssl, libre, librem, pkg-config, gst_all_1 , cairo, mpg123, alsaLib, SDL, libv4l, celt, libsndfile, srtp, ffmpeg_3 , gsm, speex, portaudio, spandsp, libuuid, libvpx }: @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz"; sha256 = "13di0ycdcr2q2a20mjvyaqfmvk5xldwqaxklqsz7470jnbc5n0rb"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [zlib openssl libre librem cairo mpg123 alsaLib SDL libv4l celt libsndfile srtp ffmpeg_3 gsm speex portaudio spandsp libuuid libvpx @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { "LIBRE_INC=${libre}/include/re" "LIBRE_SO=${libre}/lib" "LIBREM_PATH=${librem}" - ''PREFIX=$(out)'' + "PREFIX=$(out)" "USE_VIDEO=1" "CCACHE_DISABLE=1" @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { "USE_BV32=" "USE_COREAUDIO=" "USE_G711=1" "USE_G722=1" "USE_G722_1=" "USE_ILBC=" "USE_OPUS=" "USE_SILK=" ] - ++ stdenv.lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}" - ++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.cc.libc}" + ++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}" + ++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.cc.libc}" ; NIX_CFLAGS_COMPILE='' -I${librem}/include/rem -I${gsm}/include/gsm @@ -42,9 +42,9 @@ stdenv.mkDerivation rec { -D__need_timeval -D__need_timespec -D__need_time_t ''; meta = { homepage = "http://www.creytiv.com/baresip.html"; - platforms = with stdenv.lib.platforms; linux; - maintainers = with stdenv.lib.maintainers; [raskin]; - license = stdenv.lib.licenses.bsd3; + platforms = with lib.platforms; linux; + maintainers = with lib.maintainers; [raskin]; + license = lib.licenses.bsd3; inherit version; downloadPage = "http://www.creytiv.com/pub/"; updateWalker = true; diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix index c4d780d9ea2..543a5f52c97 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix @@ -1,6 +1,6 @@ -{ fetchFromGitHub, stdenv, bitlbee, autoreconfHook, pkgconfig, glib }: +{ lib, fetchFromGitHub, stdenv, bitlbee, autoreconfHook, pkg-config, glib }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "bitlbee-discord"; version = "0.4.3"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "00qgdvrp7hv02n0ns685igp810zxmv3adsama8601122al6x041n"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ bitlbee ]; preConfigure = '' @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/sm00th/bitlbee-discord"; license = licenses.gpl2Plus; maintainers = with maintainers; [ lassulus jb55 ]; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix index 1a8110acacb..8023c70fe5f 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix @@ -1,6 +1,6 @@ -{ fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkgconfig, glib, json-glib }: +{ lib, fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkg-config, glib, json-glib }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "bitlbee-facebook"; version = "1.2.1"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1yjhjhk3jzjip13lq009vlg84lm2lzwhac5jy0aq3vkcz6rp94rc"; }; - nativeBuildInputs = [ autoconf automake libtool pkgconfig ]; + nativeBuildInputs = [ autoconf automake libtool pkg-config ]; buildInputs = [ bitlbee json-glib ]; @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/bitlbee/bitlbee-facebook"; license = licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix index 411cd789275..f1b2df658a6 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix @@ -1,6 +1,6 @@ -{ fetchgit, stdenv, bitlbee, autoreconfHook, pkgconfig, glib }: +{ lib, fetchgit, stdenv, bitlbee, autoreconfHook, pkg-config, glib }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "bitlbee-mastodon"; version = "1.4.4"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0a8196pyr6bjnqg82zn7jdhiv7xsg4npbpzalla1i2h99j30q8pk"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ bitlbee ]; preConfigure = '' @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { homepage = "https://alexschroeder.ch/cgit/bitlbee-mastodon/about"; license = licenses.gpl2Plus; maintainers = with maintainers; [ jpotier ]; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix index 8cb7f6c37c4..14464247659 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix @@ -1,6 +1,6 @@ -{ fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkgconfig, glib, libgcrypt }: +{ lib, fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkg-config, glib, libgcrypt }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { version = "1.4.2"; pname = "bitlbee-steam"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "121r92mgwv445wwxzh35n19fs5k81ihr0j19k256ia5502b1xxaq"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ bitlbee autoconf automake libtool libgcrypt ]; preConfigure = '' @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/jgeboski/bitlbee-steam"; license = licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix index 7b1256b657a..1a83a04a1fa 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix @@ -1,9 +1,9 @@ -{ fetchurl, fetchpatch, stdenv, gnutls, glib, pkgconfig, check, libotr, python +{ lib, fetchurl, fetchpatch, stdenv, gnutls, glib, pkg-config, check, libotr, python , enableLibPurple ? false, pidgin ? null , enablePam ? false, pam ? null }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { name = "bitlbee-3.6"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0zhhcbcr59sx9h4maf8zamzv2waya7sbsl7w74gbyilvy93dw5cz"; }; - nativeBuildInputs = [ pkgconfig ] ++ optional doCheck check; + nativeBuildInputs = [ pkg-config ] ++ optional doCheck check; buildInputs = [ gnutls libotr python ] ++ optional enableLibPurple pidgin diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/plugins.nix b/pkgs/applications/networking/instant-messengers/bitlbee/plugins.nix index 4e05e7cae97..ad68fcb4b79 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee/plugins.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee/plugins.nix @@ -1,6 +1,6 @@ -{ stdenv, bitlbee }: +{ lib, stdenv, bitlbee }: -with stdenv.lib; +with lib; plugins: diff --git a/pkgs/applications/networking/instant-messengers/blink/default.nix b/pkgs/applications/networking/instant-messengers/blink/default.nix index 9dd6754af0c..7ed3b167383 100644 --- a/pkgs/applications/networking/instant-messengers/blink/default.nix +++ b/pkgs/applications/networking/instant-messengers/blink/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchdarcs, pythonPackages, libvncserver, zlib +{ lib, fetchdarcs, pythonPackages, libvncserver, zlib , gnutls, libvpx, makeDesktopItem, mkDerivationWith }: mkDerivationWith pythonPackages.buildPythonApplication rec { diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix index cce3a7edd79..2360b2442f5 100644 --- a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix +++ b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ rpmextract makeWrapper ]; libPath = - stdenv.lib.makeLibraryPath + lib.makeLibraryPath [ libnotify libuuid diff --git a/pkgs/applications/networking/instant-messengers/centerim/default.nix b/pkgs/applications/networking/instant-messengers/centerim/default.nix index 52d8178764c..78178f0021e 100644 --- a/pkgs/applications/networking/instant-messengers/centerim/default.nix +++ b/pkgs/applications/networking/instant-messengers/centerim/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gnused, openssl, curl, ncurses, libjpeg +{ lib, stdenv, fetchurl, gnused, openssl, curl, ncurses, libjpeg , withGpg ? true, gpgme ? null}: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { CXXFLAGS = "-std=gnu++98"; buildInputs = [ openssl curl ncurses libjpeg ] - ++ stdenv.lib.optional withGpg gpgme; + ++ lib.optional withGpg gpgme; preConfigure = '' ${gnused}/bin/sed -i '1,1i#include <stdio.h>' libicq2000/libicq2000/sigslot.h @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.centerim.org/"; description = "Fork of CenterICQ, a curses instant messaging program"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2Plus; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix index 617c02de263..f9789cfda41 100644 --- a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix +++ b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, stdenv, lib, pkgconfig, fetchFromGitHub, qtbase, qtsvg, qtmultimedia, qmake, boost, openssl, wrapQtAppsHook }: +{ mkDerivation, stdenv, lib, pkg-config, fetchFromGitHub, qtbase, qtsvg, qtmultimedia, qmake, boost, openssl, wrapQtAppsHook }: mkDerivation rec { pname = "chatterino2"; @@ -10,7 +10,7 @@ mkDerivation rec { sha256 = "026cs48hmqkv7k4akbm205avj2pn3x1g7q46chwa707k9km325dz"; fetchSubmodules = true; }; - nativeBuildInputs = [ qmake pkgconfig wrapQtAppsHook ]; + nativeBuildInputs = [ qmake pkg-config wrapQtAppsHook ]; buildInputs = [ qtbase qtsvg qtmultimedia boost openssl ]; postInstall = lib.optionalString stdenv.isDarwin '' mkdir -p "$out/Applications" diff --git a/pkgs/applications/networking/instant-messengers/cordless/default.nix b/pkgs/applications/networking/instant-messengers/cordless/default.nix index 5d95eddb6b6..a906c46c4ae 100644 --- a/pkgs/applications/networking/instant-messengers/cordless/default.nix +++ b/pkgs/applications/networking/instant-messengers/cordless/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "cordless"; diff --git a/pkgs/applications/networking/instant-messengers/coyim/default.nix b/pkgs/applications/networking/instant-messengers/coyim/default.nix index d16ad19428f..31896f20184 100644 --- a/pkgs/applications/networking/instant-messengers/coyim/default.nix +++ b/pkgs/applications/networking/instant-messengers/coyim/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, +{ lib, buildGoPackage, fetchFromGitHub, pkg-config, cairo, gdk-pixbuf, glib, gnome3, wrapGAppsHook, gtk3 }: buildGoPackage rec { @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "1g8nf56j17rdhhj7pv3ha1rb2mfc0mdvyzl35pgcki08w7iw08j3"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; buildInputs = [ glib cairo gdk-pixbuf gtk3 gnome3.adwaita-icon-theme ]; diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 8e6725d6067..0474f21a2b9 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, vala, cmake, ninja, wrapGAppsHook, pkgconfig, gettext +, vala, cmake, ninja, wrapGAppsHook, pkg-config, gettext , gobject-introspection, gnome3, glib, gdk-pixbuf, gtk3, glib-networking , xorg, libXdmcp, libxkbcommon , libnotify, libsoup, libgee @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { vala cmake ninja - pkgconfig + pkg-config wrapGAppsHook gettext ]; diff --git a/pkgs/applications/networking/instant-messengers/discord/base.nix b/pkgs/applications/networking/instant-messengers/discord/base.nix index 72fb92b9d7c..e4c588e6c18 100644 --- a/pkgs/applications/networking/instant-messengers/discord/base.nix +++ b/pkgs/applications/networking/instant-messengers/discord/base.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { dontWrapGApps = true; - libPath = stdenv.lib.makeLibraryPath [ + libPath = lib.makeLibraryPath [ libcxx systemd libpulseaudio stdenv.cc.cc alsaLib atk at-spi2-atk at-spi2-core cairo cups dbus expat fontconfig freetype gdk-pixbuf glib gtk3 libnotify libX11 libXcomposite libuuid diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index 7a735e59dcb..9f60c014c76 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -2,7 +2,7 @@ "name": "element-desktop", "productName": "Element", "main": "src/electron-main.js", - "version": "1.7.16", + "version": "1.7.18", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { @@ -57,12 +57,12 @@ "tar": "^6.0.1" }, "hakDependencies": { - "matrix-seshat": "^2.2.1", + "matrix-seshat": "^2.2.3", "keytar": "^5.6.0" }, "build": { "appId": "im.riot.app", - "electronVersion": "10.1.6", + "electronVersion": "10.2.0", "files": [ "package.json", { diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index 1b2cd7d598a..833d1731b72 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, fetchFromGitHub , makeWrapper, makeDesktopItem, mkYarnPackage -, electron_9, element-web +, electron, element-web }: # Notes for maintainers: # * versions of `element-web` and `element-desktop` should be kept in sync. @@ -8,15 +8,13 @@ let executableName = "element-desktop"; - version = "1.7.16"; + version = "1.7.18"; src = fetchFromGitHub { owner = "vector-im"; repo = "element-desktop"; rev = "v${version}"; - sha256 = "sha256-mdHsw1Vi+2hrAF7biX3pJqfRaZU2lpw9zUZdcCm717g="; + sha256 = "sha256-5k+VVcloFAcFvk683r7njOCuj7OOnHS9QLEHFu0g+5o="; }; - electron = electron_9; - in mkYarnPackage rec { name = "element-desktop-${version}"; inherit version src; @@ -57,7 +55,7 @@ in mkYarnPackage rec { ''; # The desktop item properties should be kept in sync with data from upstream: - # https://github.com/vector-im/riot-desktop/blob/develop/package.json + # https://github.com/vector-im/element-desktop/blob/develop/package.json desktopItem = makeDesktopItem { name = "element-desktop"; exec = "${executableName} %u"; diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix index 527af7a4de0..a997ea15676 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "element-web"; - version = "1.7.16"; + version = "1.7.18"; src = fetchurl { url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz"; - sha256 = "sha256-/KLTD7IvIp1f1dSUEMMCoknQzZarcP2wDM211h+OJMM="; + sha256 = "sha256-fgbdlVTPPZriOoDsBbpmDWEEzHEunaDIl/sT4/6A9LM="; }; installPhase = '' @@ -32,9 +32,9 @@ in stdenv.mkDerivation rec { meta = { description = "A glossy Matrix collaboration client for the web"; homepage = "https://element.io/"; - maintainers = stdenv.lib.teams.matrix.members; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.all; + maintainers = lib.teams.matrix.members; + license = lib.licenses.asl20; + platforms = lib.platforms.all; hydraPlatforms = []; }; } diff --git a/pkgs/applications/networking/instant-messengers/element/update-element-desktop.sh b/pkgs/applications/networking/instant-messengers/element/update-element-desktop.sh index ecca3018e76..69d0d3d7072 100755 --- a/pkgs/applications/networking/instant-messengers/element/update-element-desktop.sh +++ b/pkgs/applications/networking/instant-messengers/element/update-element-desktop.sh @@ -4,12 +4,12 @@ set -euo pipefail if [ "$#" -ne 1 ] || [[ "$1" == -* ]]; then - echo "Regenerates the Yarn dependency lock files for the element-desktop package." - echo "Usage: $0 <git release tag>" - exit 1 + echo "Regenerates the Yarn dependency lock files for the element-desktop package." + echo "Usage: $0 <git release tag>" + exit 1 fi -RIOT_WEB_SRC="https://raw.githubusercontent.com/vector-im/riot-desktop/$1" +RIOT_WEB_SRC="https://raw.githubusercontent.com/vector-im/element-desktop/$1" wget "$RIOT_WEB_SRC/package.json" -O element-desktop-package.json wget "$RIOT_WEB_SRC/yarn.lock" -O element-desktop-yarndeps.lock diff --git a/pkgs/applications/networking/instant-messengers/ferdi/default.nix b/pkgs/applications/networking/instant-messengers/ferdi/default.nix index 458808c832d..e4f8d3c99ee 100644 --- a/pkgs/applications/networking/instant-messengers/ferdi/default.nix +++ b/pkgs/applications/networking/instant-messengers/ferdi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkFranzDerivation, fetchurl }: +{ lib, mkFranzDerivation, fetchurl }: mkFranzDerivation rec { pname = "ferdi"; diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix index a72ff17abcd..9f772bf3f6d 100644 --- a/pkgs/applications/networking/instant-messengers/franz/default.nix +++ b/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkFranzDerivation, fetchurl }: +{ lib, mkFranzDerivation, fetchurl }: mkFranzDerivation rec { pname = "franz"; diff --git a/pkgs/applications/networking/instant-messengers/franz/generic.nix b/pkgs/applications/networking/instant-messengers/franz/generic.nix index 96865374bed..7bbad798233 100644 --- a/pkgs/applications/networking/instant-messengers/franz/generic.nix +++ b/pkgs/applications/networking/instant-messengers/franz/generic.nix @@ -22,7 +22,7 @@ , expat , udev , libnotify -, xdg_utils +, xdg-utils }: # Helper function for building a derivation for Franz and forks. @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { postFixup = '' wrapProgram $out/opt/${name}/${pname} \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDependencies}" \ - --prefix PATH : ${xdg_utils}/bin \ + --prefix PATH : ${xdg-utils}/bin \ "''${gappsWrapperArgs[@]}" ''; } diff --git a/pkgs/applications/networking/instant-messengers/freetalk/default.nix b/pkgs/applications/networking/instant-messengers/freetalk/default.nix index 2fe770e56eb..4c28e346a12 100644 --- a/pkgs/applications/networking/instant-messengers/freetalk/default.nix +++ b/pkgs/applications/networking/instant-messengers/freetalk/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchFromGitHub -, guile, pkgconfig, glib, loudmouth, gmp, libidn, readline, libtool +, guile, pkg-config, glib, loudmouth, gmp, libidn, readline, libtool , libunwind, ncurses, curl, jansson, texinfo , automake, autoconf }: stdenv.mkDerivation rec { pname = "freetalk"; version = "4.1"; - + src = fetchFromGitHub { owner = "GNUFreetalk"; repo = "freetalk"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - nativeBuildInputs = [ pkgconfig texinfo autoconf automake ]; + nativeBuildInputs = [ pkg-config texinfo autoconf automake ]; buildInputs = [ guile glib loudmouth gmp libidn readline libtool libunwind ncurses curl jansson diff --git a/pkgs/applications/networking/instant-messengers/gitter/default.nix b/pkgs/applications/networking/instant-messengers/gitter/default.nix index 42827d43f0d..6fe0e3b13b2 100644 --- a/pkgs/applications/networking/instant-messengers/gitter/default.nix +++ b/pkgs/applications/networking/instant-messengers/gitter/default.nix @@ -6,7 +6,7 @@ , pango, systemd }: let gitterDirectorySuffix = "opt/gitter"; - libPath = stdenv.lib.makeLibraryPath [ + libPath = lib.makeLibraryPath [ alsaLib atk at-spi2-core diff --git a/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/pkgs/applications/networking/instant-messengers/gomuks/default.nix index 015e7fdbdf4..a2d12124dbf 100644 --- a/pkgs/applications/networking/instant-messengers/gomuks/default.nix +++ b/pkgs/applications/networking/instant-messengers/gomuks/default.nix @@ -1,21 +1,38 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, olm, makeDesktopItem }: +{ lib +, stdenv +, substituteAll +, buildGoModule +, fetchFromGitHub +, makeDesktopItem +, makeWrapper +, libnotify +, olm +, pulseaudio +, sound-theme-freedesktop +}: buildGoModule rec { pname = "gomuks"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "tulir"; repo = pname; - rev = "v" + version; - sha256 = "0xa4ch4p48w6sd0f4s1sp0hl1w4fvzhff7w2ar19ki0ydy5g368n"; + rev = "v${version}"; + sha256 = "169xyd44jyfh5njwmhsmkah8njfgnp9q9c2b13p0ry5saicwm5h5"; }; - vendorSha256 = "1rhvwk8bdbbffhx2d03a8p9jc5c8v3pi7kw1dmyyngz6p7wq1g0x"; + vendorSha256 = "1l8qnz0qy90zpywfx7pbkqpxg7rkvc9j622zcmkf38kdc1z6w20a"; doCheck = false; - buildInputs = [ olm ]; + buildInputs = [ makeWrapper olm ]; + + # Upstream issue: https://github.com/tulir/gomuks/issues/260 + patches = lib.optional stdenv.isLinux (substituteAll { + src = ./hardcoded_path.patch; + soundTheme = sound-theme-freedesktop; + }); postInstall = '' cp -r ${ @@ -30,13 +47,15 @@ buildGoModule rec { } }/* $out/ substituteAllInPlace $out/share/applications/* + wrapProgram $out/bin/gomuks \ + --prefix PATH : "${lib.makeBinPath (lib.optionals stdenv.isLinux [ libnotify pulseaudio ])}" ''; meta = with lib; { homepage = "https://maunium.net/go/gomuks/"; description = "A terminal based Matrix client written in Go"; license = licenses.gpl3; - maintainers = with maintainers; [ tilpner emily ]; + maintainers = with maintainers; [ charvp emily ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/instant-messengers/gomuks/hardcoded_path.patch b/pkgs/applications/networking/instant-messengers/gomuks/hardcoded_path.patch new file mode 100644 index 00000000000..0e0d4e28b0a --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/gomuks/hardcoded_path.patch @@ -0,0 +1,13 @@ +diff --git a/lib/notification/notify_linux.go b/lib/notification/notify_linux.go +index f93a95f..da6a61d 100644 +--- a/lib/notification/notify_linux.go ++++ b/lib/notification/notify_linux.go +@@ -32,7 +32,7 @@ func Send(title, text string, critical, sound bool) error { + if critical { + soundName = "complete" + } +- exec.Command("paplay", "/usr/share/sounds/freedesktop/stereo/"+soundName+".oga").Run() ++ exec.Command("paplay", "@soundTheme@/share/sounds/freedesktop/stereo/"+soundName+".oga").Run() + } + return exec.Command("notify-send", args...).Run() + } diff --git a/pkgs/applications/networking/instant-messengers/gtmess/default.nix b/pkgs/applications/networking/instant-messengers/gtmess/default.nix index 0661e6d7525..fec5462c47a 100644 --- a/pkgs/applications/networking/instant-messengers/gtmess/default.nix +++ b/pkgs/applications/networking/instant-messengers/gtmess/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ncurses, openssl, tcl, tk}: +{lib, stdenv, fetchurl, ncurses, openssl, tcl, tk}: stdenv.mkDerivation { name = "gtmess-0.97"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "Console MSN Messenger client for Linux and other unix systems"; homepage = "http://gtmess.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2Plus; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index 27e1fc0cad3..f3736bfc64f 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, xorg, freetype, fontconfig, openssl, glib, nss, nspr, expat , alsaLib, dbus, zlib, libxml2, libxslt, makeWrapper, xkeyboard_config, systemd -, libGL, xcbutilkeysyms, xdg_utils, libtool }: +, libGL, xcbutilkeysyms, xdg-utils, libtool }: let version = "4.30.5.1682"; - rpath = stdenv.lib.makeLibraryPath [ - xdg_utils + rpath = lib.makeLibraryPath [ + xdg-utils xorg.libXext xorg.libSM xorg.libICE diff --git a/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix b/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix index c23d081866b..7cb614f1d41 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { postFixup = '' makeWrapper ${electron}/bin/electron $out/bin/${pname} \ --add-flags $out/share/${pname}/resources/app.asar \ - --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ]}" ''; meta = with lib; { diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix index 137ad4d49b0..5fa5c2a2864 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ unzip ]; buildInputs = [ ant jdk ]; - buildPhase = ''ant make''; + buildPhase = "ant make"; installPhase = '' mkdir -p $out diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index 1344440eafc..f0846fc63f7 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -36,7 +36,7 @@ , openldap , ortp , pango -, pkgconfig +, pkg-config , python , qtbase , qtgraphicaleffects @@ -45,7 +45,7 @@ , readline , speex , sqlite -, stdenv + , udev , zlib }: @@ -125,7 +125,7 @@ mkDerivation rec { graphviz intltool makeWrapper - pkgconfig + pkg-config ]; cmakeFlags = [ diff --git a/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix b/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix index 92ddfe34298..2992bf22cb3 100644 --- a/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix +++ b/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix @@ -6,12 +6,11 @@ let nodeEnv = import ./node-env.nix { - inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile; + inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile; inherit nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; -locpkgs = -import ./node-packages.nix { +locpkgs = import ./node-packages.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; globalBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/matrix-recorder/default.nix b/pkgs/applications/networking/instant-messengers/matrix-recorder/default.nix index 633219626b6..9e352794881 100644 --- a/pkgs/applications/networking/instant-messengers/matrix-recorder/default.nix +++ b/pkgs/applications/networking/instant-messengers/matrix-recorder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs }: +{ lib, stdenv, pkgs }: (import ./composition.nix { inherit pkgs; inherit (stdenv.hostPlatform) system; @@ -21,7 +21,7 @@ meta = { description = "Matrix message recorder"; homepage = "https://gitlab.com/argit/matrix-recorder/"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.raskin ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.raskin ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/matrix-recorder/node-env.nix b/pkgs/applications/networking/instant-messengers/matrix-recorder/node-env.nix index ff5ca0d99b1..e6131fe8e77 100644 --- a/pkgs/applications/networking/instant-messengers/matrix-recorder/node-env.nix +++ b/pkgs/applications/networking/instant-messengers/matrix-recorder/node-env.nix @@ -1,6 +1,6 @@ # This file originates from node2nix -{stdenv, nodejs, python2, util-linux, libtool, runCommand, writeTextFile}: +{lib, stdenv, nodejs, python2, util-linux, libtool, runCommand, writeTextFile}: let python = if nodejs ? python then nodejs.python else python2; @@ -38,8 +38,8 @@ let }; includeDependencies = {dependencies}: - stdenv.lib.optionalString (dependencies != []) - (stdenv.lib.concatMapStrings (dependency: + lib.optionalString (dependencies != []) + (lib.concatMapStrings (dependency: '' # Bundle the dependencies of the package mkdir -p node_modules @@ -100,7 +100,7 @@ let cd "$DIR/${packageName}" ${includeDependencies { inherit dependencies; }} cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} ''; pinpointDependencies = {dependencies, production}: @@ -161,12 +161,12 @@ let '' node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"} - ${stdenv.lib.optionalString (dependencies != []) + ${lib.optionalString (dependencies != []) '' if [ -d node_modules ] then cd node_modules - ${stdenv.lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} + ${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} cd .. fi ''} @@ -183,7 +183,7 @@ let cd "${packageName}" ${pinpointDependencies { inherit dependencies production; }} cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} fi ''; @@ -344,8 +344,8 @@ let cd "${packageName}" runHook preRebuild - ${stdenv.lib.optionalString bypassCache '' - ${stdenv.lib.optionalString reconstructLock '' + ${lib.optionalString bypassCache '' + ${lib.optionalString reconstructLock '' if [ -f package-lock.json ] then echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!" @@ -361,14 +361,14 @@ let node ${addIntegrityFieldsScript} ''} - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild if [ "$dontNpmInstall" != "1" ] then # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. rm -f npm-shrinkwrap.json - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} install fi ''; @@ -396,8 +396,8 @@ let stdenv.mkDerivation ({ name = "node_${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] - ++ stdenv.lib.optional (stdenv.isLinux) util-linux - ++ stdenv.lib.optional (stdenv.isDarwin) libtool + ++ lib.optional (stdenv.isLinux) util-linux + ++ lib.optional (stdenv.isDarwin) libtool ++ buildInputs; inherit dontStrip; # Stripping may fail a build for some package deployments @@ -468,8 +468,8 @@ let name = "node-dependencies-${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] - ++ stdenv.lib.optional (stdenv.isLinux) util-linux - ++ stdenv.lib.optional (stdenv.isDarwin) libtool + ++ lib.optional (stdenv.isLinux) util-linux + ++ lib.optional (stdenv.isDarwin) libtool ++ buildInputs; inherit dontStrip; # Stripping may fail a build for some package deployments @@ -489,7 +489,7 @@ let # Create fake package.json to make the npm commands work properly cp ${src}/package.json . chmod 644 package.json - ${stdenv.lib.optionalString bypassCache '' + ${lib.optionalString bypassCache '' if [ -f ${src}/package-lock.json ] then cp ${src}/package-lock.json . @@ -498,13 +498,13 @@ let # Go to the parent folder to make sure that all packages are pinpointed cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} # Expose the executables that were installed cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} mv ${packageName} lib ln -s $out/lib/node_modules/.bin $out/bin @@ -514,7 +514,7 @@ let stdenv.mkDerivation { name = "node-shell-${name}-${version}"; - buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) util-linux ++ buildInputs; + buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) util-linux ++ buildInputs; buildCommand = '' mkdir -p $out/bin cat > $out/bin/shell <<EOF @@ -527,14 +527,14 @@ let # Provide the dependencies in a development shell through the NODE_PATH environment variable inherit nodeDependencies; - shellHook = stdenv.lib.optionalString (dependencies != []) '' + shellHook = lib.optionalString (dependencies != []) '' export NODE_PATH=$nodeDependencies/lib/node_modules export PATH="$nodeDependencies/bin:$PATH" ''; }; in { - buildNodeSourceDist = stdenv.lib.makeOverridable buildNodeSourceDist; - buildNodePackage = stdenv.lib.makeOverridable buildNodePackage; - buildNodeShell = stdenv.lib.makeOverridable buildNodeShell; + buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist; + buildNodePackage = lib.makeOverridable buildNodePackage; + buildNodeShell = lib.makeOverridable buildNodeShell; } diff --git a/pkgs/applications/networking/instant-messengers/matrixcli/default.nix b/pkgs/applications/networking/instant-messengers/matrixcli/default.nix index 54b7ef2bd99..aadb18606e1 100644 --- a/pkgs/applications/networking/instant-messengers/matrixcli/default.nix +++ b/pkgs/applications/networking/instant-messengers/matrixcli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit +{ lib, fetchgit , buildPythonApplication, buildPythonPackage , pygobject3, pytestrunner, requests, responses, pytest, python-olm , canonicaljson, olm @@ -15,7 +15,7 @@ let name = "${pname}-${version}"; pname = "matrix-python-sdk-matrixcli"; version = "0.0.2019-08-15"; - + src = "${mainsrc}/matrix-python-sdk/"; propagatedBuildInputs = [ @@ -27,9 +27,9 @@ let doInstallCheck = false; meta = { - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; description = "Fork of Matrix Python SDK"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; }; @@ -45,9 +45,9 @@ buildPythonApplication rec { meta = { description = "CLI client for Matrix"; - license = stdenv.lib.licenses.gpl3; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; homepage = "https://github.com/saadnpq/matrixcli"; }; } diff --git a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix index 686e9c47697..121bd3f8fe3 100644 --- a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix @@ -5,7 +5,7 @@ libXScrnSaver, nss, nspr, alsaLib, cups, expat, udev, wrapGAppsHook, hicolor-icon-theme, libuuid, at-spi2-core, at-spi2-atk }: let - rpath = stdenv.lib.makeLibraryPath [ + rpath = lib.makeLibraryPath [ alsaLib at-spi2-atk at-spi2-core diff --git a/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/pkgs/applications/networking/instant-messengers/mcabber/default.nix index 8e5642855a3..7c5bff94084 100644 --- a/pkgs/applications/networking/instant-messengers/mcabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/mcabber/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openssl, ncurses, pkgconfig, glib, loudmouth, libotr +{ lib, stdenv, fetchurl, openssl, ncurses, pkg-config, glib, loudmouth, libotr , gpgme }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0q1i5acyghsmzas88qswvki8kkk2nfpr8zapgnxbcd3lwcxl38f4"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ncurses glib loudmouth libotr gpgme ]; configureFlags = [ diff --git a/pkgs/applications/networking/instant-messengers/mikutter/gemset.nix b/pkgs/applications/networking/instant-messengers/mikutter/gemset.nix index 88ea97be1ca..2bc4db978dd 100644 --- a/pkgs/applications/networking/instant-messengers/mikutter/gemset.nix +++ b/pkgs/applications/networking/instant-messengers/mikutter/gemset.nix @@ -419,4 +419,4 @@ }; version = "3.7.6"; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/networking/instant-messengers/mirage/default.nix b/pkgs/applications/networking/instant-messengers/mirage/default.nix index bcf3279d6a0..3b6b9bfc6f9 100644 --- a/pkgs/applications/networking/instant-messengers/mirage/default.nix +++ b/pkgs/applications/networking/instant-messengers/mirage/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, mkDerivation, fetchFromGitHub -, qmake, pkgconfig, olm, wrapQtAppsHook +, qmake, pkg-config, olm, wrapQtAppsHook , qtbase, qtquickcontrols2, qtkeychain, qtmultimedia, qttools, qtgraphicaleffects , python3Packages, pyotherside, libXScrnSaver }: @@ -23,7 +23,7 @@ mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ pkgconfig qmake wrapQtAppsHook python3Packages.wrapPython ]; + nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook python3Packages.wrapPython ]; buildInputs = [ qtbase qtmultimedia diff --git a/pkgs/applications/networking/instant-messengers/mm/default.nix b/pkgs/applications/networking/instant-messengers/mm/default.nix index 7229218a704..c8f24e72a9a 100644 --- a/pkgs/applications/networking/instant-messengers/mm/default.nix +++ b/pkgs/applications/networking/instant-messengers/mm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchgit }: +{ lib, buildGoModule, fetchgit }: buildGoModule { pname = "mm"; diff --git a/pkgs/applications/networking/instant-messengers/neochat/default.nix b/pkgs/applications/networking/instant-messengers/neochat/default.nix index 03e74de7780..cd456b336dd 100644 --- a/pkgs/applications/networking/instant-messengers/neochat/default.nix +++ b/pkgs/applications/networking/instant-messengers/neochat/default.nix @@ -1,5 +1,5 @@ { mkDerivation -, lib, stdenv +, lib , fetchFromGitLab , pkg-config , cmake @@ -26,14 +26,14 @@ mkDerivation rec { pname = "neochat"; - version = "1.0"; + version = "1.0.1"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "network"; repo = pname; rev = "v${version}"; - sha256 = "1r9n83kvc5v215lzmzh6hyc5q9i3w6znbf508qk0mdwdzxz4zry9"; + sha256 = "sha256-xGqGFJHyoZXHLv/n3UGr/KVbgs5Gc9kKKWIuKMr9DtQ="; }; nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ]; diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index a26d3c41b22..57db6a0750e 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -6,9 +6,11 @@ , cmark , lmdb , lmdbxx +, libsecret , tweeny , mkDerivation , qtbase +, qtkeychain , qtmacextras , qtmultimedia , qttools @@ -19,25 +21,25 @@ , spdlog , fmt , olm -, pkgconfig +, pkg-config , nlohmann_json }: mkDerivation rec { pname = "nheko"; - version = "0.7.2"; + version = "0.8.1"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "nheko"; rev = "v${version}"; - sha256 = "1cbhgaf9klgxdirrxj571fqwspm0byl75c1xc40l727a6qswvp7s"; + sha256 = "1v7k3ifzi05fdr06hmws1wkfl1bmhrnam3dbwahp086vkj0r8524"; }; nativeBuildInputs = [ lmdbxx cmake - pkgconfig + pkg-config ]; buildInputs = [ @@ -46,6 +48,7 @@ mkDerivation rec { mtxclient olm boost17x + libsecret lmdb spdlog fmt @@ -55,8 +58,13 @@ mkDerivation rec { qttools qtquickcontrols2 qtgraphicaleffects + qtkeychain ] ++ lib.optional stdenv.isDarwin qtmacextras; + cmakeFlags = [ + "-DCOMPILE_QML=ON" # see https://github.com/Nheko-Reborn/nheko/issues/389 + ]; + meta = with lib; { description = "Desktop client for the Matrix protocol"; homepage = "https://github.com/Nheko-Reborn/nheko"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix index 2bb347611b8..46f8458f153 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, libxml2, pidgin, pkgconfig, fetchFromGitHub } : +{ lib, stdenv, libxml2, pidgin, pkg-config, fetchFromGitHub } : stdenv.mkDerivation rec { pname = "pidgin-carbons"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PURPLE_PLUGIN_DIR=$(out)/lib/pidgin" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxml2 pidgin ]; meta = with lib; { diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix index eccb8de31e5..c32bd6f3e39 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pidgin} : +{ lib, stdenv, fetchurl, pidgin} : stdenv.mkDerivation { name = "pidgin-msn-pecan-0.1.4"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { meta = { description = "Alternative MSN protocol plug-in for Pidgin IM"; homepage = "https://github.com/felipec/msn-pecan"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; makeFlags = [ diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix index 5f54d02ca9f..1250e3877b9 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, pidgin, texLive, imagemagick, glib, gtk2 }: +{ lib, stdenv, fetchurl, pkg-config, pidgin, texLive, imagemagick, glib, gtk2 }: let version = "1.5.0"; in @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "9c850aee90d7e59de834f83e09fa6e3e51b123f06e265ead70957608ada95441"; }; - nativeBuildInputs = [pkgconfig]; + nativeBuildInputs = [pkg-config]; buildInputs = [gtk2 glib pidgin]; makeFlags = [ "PREFIX=$(out)" ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation { ''; passthru = { - wrapArgs = "--prefix PATH ':' ${stdenv.lib.makeBinPath [ texLive imagemagick ]}"; + wrapArgs = "--prefix PATH ':' ${lib.makeBinPath [ texLive imagemagick ]}"; }; meta = with lib; { diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix index 13e165ad7a1..a168eb984c3 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, pkgconfig, pidgin } : +{ lib, stdenv, fetchgit, pkg-config, pidgin } : let version = "54b2992"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { sha256 = "1adq57g11kw7bfpivyvfk3nlpjkc8raiw4bzn3gn4nx3m0wl99vw"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pidgin ]; postPatch = '' @@ -29,7 +29,7 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/dreadatour/pidgin-mra"; description = "Mail.ru Agent plugin for Pidgin / libpurple"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix index f72dd198b60..9af8b0aff77 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, pidgin, glib, json-glib, nss, nspr +{ lib, stdenv, fetchFromGitHub, pkg-config, pidgin, glib, json-glib, nss, nspr , libsecret } : @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config ]; buildInputs = [ pidgin glib json-glib nss nspr libsecret diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix index 59afb8bd65b..d7c3c6cacab 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, pidgin, json-glib }: +{ lib, stdenv, fetchFromGitHub, pkg-config, pidgin, json-glib }: stdenv.mkDerivation rec { pname = "pidgin-skypeweb"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sourceRoot=$(echo */skypeweb) ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pidgin json-glib ]; PKG_CONFIG_PURPLE_PLUGINDIR = "${placeholder "out"}/lib/purple-2"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix index 8128d0af7b7..10cbcb6c1d2 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, pidgin, json-glib }: +{ lib, stdenv, fetchFromGitHub, pkg-config, pidgin, json-glib }: stdenv.mkDerivation { pname = "purple-discord"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0dc344zh1v4yh9c8javcw5ylzwc1wpx0ih8bww8p8cjmhr8kcl32"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pidgin json-glib ]; PKG_CONFIG_PURPLE_PLUGINDIR = "${placeholder "out"}/lib/purple-2"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix index 75be98506ae..2862e4df796 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, pidgin, json-glib, glib, http-parser, sqlite, olm, libgcrypt } : +{ lib, stdenv, fetchFromGitHub, pkg-config, pidgin, json-glib, glib, http-parser, sqlite, olm, libgcrypt } : stdenv.mkDerivation rec { pname = "purple-matrix-unstable"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { "-O3" "-Wno-error" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pidgin json-glib glib http-parser sqlite olm libgcrypt ]; makeFlags = [ diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-slack/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-slack/default.nix index 547cd2b1427..9f5f9a2bda1 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-slack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pidgin, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, pidgin, pkg-config }: stdenv.mkDerivation { pname = "purple-slack-unstable"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "1sksqshiwldd32k8jmiflp2pcax31ym6rypr4qa4v5vdn907g80m"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pidgin ]; PKG_CONFIG_PURPLE_PLUGINDIR = "${placeholder "out"}/lib/purple-2"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix index 327827b74f3..07b38ff3c5a 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchhg, pidgin, cmake, libxml2 } : +{ lib, stdenv, fetchhg, pidgin, cmake, libxml2 } : let version = "40ddb6d"; @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = { homepage = "https://bitbucket.org/olegoandreev/purple-vk-plugin"; description = "Vk (russian social network) plugin for Pidgin / libpurple"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix index 253d2ddfe24..6e14ee1a2b8 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pidgin, libnotify, gdk-pixbuf, glib, dbus +{ lib, stdenv, fetchurl, pkg-config, pidgin, libnotify, gdk-pixbuf, glib, dbus , dbus-glib }: stdenv.mkDerivation rec { @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { postInstall = "ln -s \$out/lib/pidgin \$out/share/pidgin-otr"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pidgin libnotify gdk-pixbuf glib dbus dbus-glib ]; meta = { homepage = "https://github.com/novas0x2a/skype4pidgin"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; description = "Plugin to use a running skype account through pidgin"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix index a5593624691..527af9ed98d 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, pkgconfig, pidgin, libwebp, libgcrypt, gettext } : +{ lib, stdenv, fetchgit, pkg-config, pidgin, libwebp, libgcrypt, gettext } : let version = "1.3.1"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pidgin libwebp libgcrypt gettext ]; preConfigure = '' diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index c956864b83d..65b9c245a38 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, pkgconfig, gtk2, gtk2-x11 +{ stdenv, fetchurl, makeWrapper, pkg-config, gtk2, gtk2-x11 , gtkspell2, aspell , gst_all_1, startupnotification, gettext , perlPackages, libxml2, nss, nspr, farstream @@ -44,7 +44,7 @@ let unwrapped = stdenv.mkDerivation rec { ++ (lib.optional (stdenv.isDarwin) gtk2-x11); - propagatedBuildInputs = [ pkgconfig gettext ] + propagatedBuildInputs = [ pkg-config gettext ] ++ (with perlPackages; [ perl XMLParser ]) ++ (lib.optional (stdenv.isLinux) gtk2) ++ (lib.optional (stdenv.isDarwin) gtk2-x11); diff --git a/pkgs/applications/networking/instant-messengers/poezio/default.nix b/pkgs/applications/networking/instant-messengers/poezio/default.nix index 8dc70d6d792..df6e675fecb 100644 --- a/pkgs/applications/networking/instant-messengers/poezio/default.nix +++ b/pkgs/applications/networking/instant-messengers/poezio/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonApplication, fetchFromGitHub, pythonOlder -, pytest, aiodns, slixmpp, pyinotify, potr, mpd2, cffi, pkgconfig, setuptools }: +, pytest, aiodns, slixmpp, pyinotify, potr, mpd2, cffi, pkg-config, setuptools }: buildPythonApplication rec { pname = "poezio"; version = "0.13.1"; @@ -8,7 +8,7 @@ buildPythonApplication rec { checkInputs = [ pytest ]; propagatedBuildInputs = [ aiodns slixmpp pyinotify potr mpd2 cffi setuptools ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; src = fetchFromGitHub { owner = pname; diff --git a/pkgs/applications/networking/instant-messengers/pond/default.nix b/pkgs/applications/networking/instant-messengers/pond/default.nix index 1d70c9641f8..4c059cb20d8 100644 --- a/pkgs/applications/networking/instant-messengers/pond/default.nix +++ b/pkgs/applications/networking/instant-messengers/pond/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, trousers, dclxvi, wrapGAppsHook, pkgconfig, gtk3, gtkspell3, +{ lib, stdenv, buildGoPackage, trousers, dclxvi, wrapGAppsHook, pkg-config, gtk3, gtkspell3, fetchgit }: let @@ -6,7 +6,7 @@ let in buildGoPackage rec { pname = "pond"; - version = "20150830-${stdenv.lib.strings.substring 0 7 rev}"; + version = "20150830-${lib.strings.substring 0 7 rev}"; rev = "bce6e0dc61803c23699c749e29a83f81da3c41b2"; goPackagePath = "github.com/agl/pond"; @@ -19,13 +19,13 @@ buildGoPackage rec { goDeps = ./deps.nix; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ trousers gtk3 gtkspell3 ] - ++ stdenv.lib.optional stdenv.hostPlatform.isx86_64 dclxvi - ++ stdenv.lib.optionals gui [ wrapGAppsHook ]; - buildFlags = stdenv.lib.optionals (!gui) [ "-tags" "nogui" ]; + ++ lib.optional stdenv.hostPlatform.isx86_64 dclxvi + ++ lib.optionals gui [ wrapGAppsHook ]; + buildFlags = lib.optionals (!gui) [ "-tags" "nogui" ]; excludedPackages = "\\(appengine\\|bn256cgo\\)"; - postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isx86_64 '' + postPatch = lib.optionalString stdenv.hostPlatform.isx86_64 '' grep -r 'bn256' | awk -F: '{print $1}' | xargs sed -i \ -e "s,golang.org/x/crypto/bn256,github.com/agl/pond/bn256cgo,g" \ -e "s,bn256\.,bn256cgo.,g" diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index 4dfca92f39f..c373d23948b 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -1,7 +1,6 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, openssl +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib, openssl , glibcLocales, expect, ncurses, libotr, curl, readline, libuuid -, cmocka, libmicrohttpd, expat, sqlite, libmesode, fetchpatch -, autoconf-archive +, cmocka, libmicrohttpd, expat, sqlite, libmesode, autoconf-archive , autoAwaySupport ? true, libXScrnSaver ? null, libX11 ? null , notifySupport ? true, libnotify ? null, gdk-pixbuf ? null @@ -18,31 +17,27 @@ assert pgpSupport -> gpgme != null; assert pythonPluginSupport -> python != null; assert omemoSupport -> libsignal-protocol-c != null && libgcrypt != null; -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "profanity"; - version = "0.9.5"; + version = "0.10.0"; src = fetchFromGitHub { owner = "profanity-im"; repo = "profanity"; rev = version; - sha256 = "14vbblf639f90bb4npg2xv53cpvk9am9ic4pmc1vnv4m3zsndjg5"; + sha256 = "0a9rzhnivxcr8v02xxzrbck7pvvv4c66ap2zy0gzxhri5p8ac03r"; }; patches = [ - (fetchpatch { - url = "https://github.com/profanity-im/profanity/commit/54667c022f17bdb547c3b8b4eec1c2889c9d60f3.patch"; - sha256 = "0aqrq45im1qnq308hyhh7dqbggzmcqb0b868wr5v8v08pd94s45k"; - }) ./patches/packages-osx.patch ]; enableParallelBuilding = true; nativeBuildInputs = [ - autoreconfHook autoconf-archive glibcLocales pkgconfig + autoreconfHook autoconf-archive glibcLocales pkg-config ]; buildInputs = [ @@ -80,6 +75,8 @@ stdenv.mkDerivation rec { homepage = "http://www.profanity.im/"; license = licenses.gpl3Plus; platforms = platforms.unix; + changelog = "https://github.com/profanity-im/profanity/releases/tag/${version}"; + downloadPage = "https://github.com/profanity-im/profanity/releases/"; maintainers = [ maintainers.devhell ]; updateWalker = true; }; diff --git a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix index 06f02fa8094..279eea2f2d7 100644 --- a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix +++ b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python2Packages, openssl }: +{ lib, fetchFromGitHub, python2Packages, openssl }: python2Packages.buildPythonApplication rec { pname = "pybitmessage"; diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index 37527262b7f..b91db31f89a 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -22,10 +22,10 @@ mkDerivation rec { qtbase qtsvg qttranslations ffmpeg_3 filter-audio libexif libopus libsodium libvpx openal pcre qrencode sqlcipher - ] ++ stdenv.lib.optionals stdenv.isDarwin [ AVFoundation] ; + ] ++ lib.optionals stdenv.isDarwin [ AVFoundation] ; nativeBuildInputs = [ cmake pkg-config qttools ] - ++ stdenv.lib.optionals stdenv.isDarwin [ perl ]; + ++ lib.optionals stdenv.isDarwin [ perl ]; cmakeFlags = [ "-DGIT_DESCRIBE=v${version}" diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index bc26b68d2db..5525805c2e4 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -1,46 +1,22 @@ -{ stdenv, lib, fetchurl, xdg_utils, dpkg, makeWrapper, autoPatchelfHook -, libXtst, libXScrnSaver, gtk3, nss, alsaLib, udev, libnotify, wrapGAppsHook -}: +{ stdenv, callPackage, fetchurl, lib }: let - version = "0.7.7"; -in stdenv.mkDerivation rec { + mkRambox = opts: callPackage (import ./rambox.nix opts) { }; +in mkRambox rec { pname = "rambox"; - inherit version; + version = "0.7.7"; + src = { x86_64-linux = fetchurl { - url = "https://github.com/ramboxapp/community-edition/releases/download/${version}/Rambox-${version}-linux-amd64.deb"; - sha256 = "0bij4f1bkg94gc8pq7r6yfym5zcvwc2ymdnmnmh5m4h1pa1gk6x9"; + url = "https://github.com/ramboxapp/community-edition/releases/download/${version}/Rambox-${version}-linux-x86_64.AppImage"; + sha256 = "0f82hq0dzcjicdz6lkzj8889y100yqciqrwh8wjjy9pxkhjcdini"; }; i686-linux = fetchurl { - url = "https://github.com/ramboxapp/community-edition/releases/download/${version}/Rambox-${version}-linux-i386.deb"; - sha256 = "1nhgqjha10jvyf9nsghvlkibg7byj8qz140639ygag9qlpd51rfs"; + url = "https://github.com/ramboxapp/community-edition/releases/download/${version}/Rambox-${version}-linux-i386.AppImage"; + sha256 = "1nhgqjha10jvyf9nsghvlkibg7byj8qz140639ygag9qlpd52rfs"; }; }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); - nativeBuildInputs = [ dpkg makeWrapper autoPatchelfHook wrapGAppsHook ]; - buildInputs = [ libXtst libXScrnSaver gtk3 nss alsaLib ]; - runtimeDependencies = [ (lib.getLib udev) libnotify ]; - - unpackPhase = "dpkg-deb -x $src ."; - - installPhase = '' - mkdir -p $out/bin - cp -r opt $out - ln -s $out/opt/Rambox/rambox $out/bin - - # provide resources - cp -r usr/share $out - substituteInPlace $out/share/applications/rambox.desktop \ - --replace Exec=/opt/Rambox/rambox Exec=rambox - ''; - - preFixup = '' - gappsWrapperArgs+=( - --prefix PATH : ${xdg_utils}/bin - ) - ''; - meta = with lib; { description = "Free and Open Source messaging and emailing app that combines common web applications into one"; homepage = "https://rambox.pro"; diff --git a/pkgs/applications/networking/instant-messengers/rambox/pro.nix b/pkgs/applications/networking/instant-messengers/rambox/pro.nix index 1df0b597ae2..827cac7c297 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/pro.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/pro.nix @@ -1,56 +1,25 @@ -{ autoPatchelfHook, electron_7, fetchurl, makeDesktopItem, makeWrapper, nodePackages, nss, lib, stdenv, xdg_utils, xorg }: +{ stdenv, callPackage, fetchurl, lib }: let - electron = electron_7; -in -stdenv.mkDerivation rec { + mkRambox = opts: callPackage (import ./rambox.nix opts) { }; +in mkRambox rec { pname = "rambox-pro"; - version = "1.4.1"; + version = "1.5.0"; - dontBuild = true; - dontStrip = true; + desktopName = "Rambox Pro"; - buildInputs = [ nss xorg.libXext xorg.libxkbfile xorg.libXScrnSaver ]; - nativeBuildInputs = [ autoPatchelfHook makeWrapper nodePackages.asar ]; - - src = fetchurl { - url = "https://github.com/ramboxapp/download/releases/download/v${version}/RamboxPro-${version}-linux-x64.tar.gz"; - sha256 = "1bd4fba3ac8c20fa557ebfb110f6503d36e6c3dba0401d1073529dcae2c2ec1e"; - }; - - installPhase = '' - mkdir -p $out/{bin,resources/dist/renderer/assets/images/app,share/applications,share/icons/hicolor/256x256/apps} - - asar e resources/app.asar $out/resources - - substituteInPlace "$out/resources/dist/electron/main.js" \ - --replace ",isHidden:" ",path:\"$out/bin/ramboxpro\",isHidden:" - - cp $desktopItem/share/applications/* $out/share/applications - cp $out/resources/dist/electron/imgs/256x256.png $out/share/icons/hicolor/256x256/apps/ramboxpro.png - cp $out/resources/dist/electron/imgs/256x256.png $out/resources/dist/renderer/assets/images/app/icon.png - ''; - - postFixup = '' - makeWrapper ${electron}/bin/electron $out/bin/ramboxpro \ - --add-flags "$out/resources --without-update" \ - --prefix PATH : ${xdg_utils}/bin - ''; - - desktopItem = makeDesktopItem { - name = "rambox-pro"; - exec = "ramboxpro"; - icon = "ramboxpro"; - type = "Application"; - desktopName = "Rambox Pro"; - categories = "Network;"; - }; + src = { + x86_64-linux = fetchurl { + url = "https://github.com/ramboxapp/download/releases/download/v${version}/RamboxPro-${version}-linux-x64.AppImage"; + sha256 = "1g7lrjm8yxklqpc2mp8gy0g61wfilr15dl80r3sh6pa5b4k5spir"; + }; + }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); meta = with lib; { description = "Messaging and emailing app that combines common web applications into one"; homepage = "https://rambox.pro"; license = licenses.unfree; maintainers = with maintainers; [ chrisaw ]; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/rambox/rambox.nix b/pkgs/applications/networking/instant-messengers/rambox/rambox.nix new file mode 100644 index 00000000000..56930f561c7 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/rambox/rambox.nix @@ -0,0 +1,30 @@ +{ pname, version, src, meta, desktopName ? "Rambox" }: + +{ appimageTools, lib, fetchurl, makeDesktopItem }: + +let + name = "${pname}-${version}"; + + desktopItem = (makeDesktopItem { + inherit desktopName; + name = pname; + exec = pname; + icon = pname; + type = "Application"; + categories = "Network;"; + }); + + appimageContents = appimageTools.extractType2 { + inherit name src; + }; +in appimageTools.wrapType2 rec { + inherit name src meta; + + extraInstallCommands = '' + mkdir -p $out/share/applications $out/share/icons/hicolor/256x256/apps + # CE uses rambox-<version>, Pro uses rambox + mv $out/bin/rambox* $out/bin/${pname} + install -Dm644 ${appimageContents}/usr/share/icons/hicolor/256x256/apps/rambox*.png $out/share/icons/hicolor/256x256/apps/${pname}.png + install -Dm644 ${desktopItem}/share/applications/* $out/share/applications + ''; +} diff --git a/pkgs/applications/networking/instant-messengers/ratox/default.nix b/pkgs/applications/networking/instant-messengers/ratox/default.nix index 212ba3a31a4..1851a60216b 100644 --- a/pkgs/applications/networking/instant-messengers/ratox/default.nix +++ b/pkgs/applications/networking/instant-messengers/ratox/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchgit, libtoxcore +{ lib, stdenv, fetchgit, libtoxcore , conf ? null }: -with stdenv.lib; +with lib; let configFile = optionalString (conf!=null) (builtins.toFile "config.h" conf); diff --git a/pkgs/applications/networking/instant-messengers/ricochet/default.nix b/pkgs/applications/networking/instant-messengers/ricochet/default.nix index 322da86071c..97d8d39f656 100644 --- a/pkgs/applications/networking/instant-messengers/ricochet/default.nix +++ b/pkgs/applications/networking/instant-messengers/ricochet/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchurl, pkgconfig, makeDesktopItem +{ mkDerivation, lib, fetchurl, pkg-config, makeDesktopItem , qtbase, qttools, qtmultimedia, qtquick1, qtquickcontrols , openssl, protobuf, qmake }: @@ -27,7 +27,7 @@ mkDerivation rec { openssl protobuf ]; - nativeBuildInputs = [ pkgconfig qmake ]; + nativeBuildInputs = [ pkg-config qmake ]; preConfigure = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags openssl)" diff --git a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix index 801e6826680..bad54f455b0 100644 --- a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix +++ b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix @@ -2,7 +2,7 @@ , fetchgit , which , autoreconfHook -, pkgconfig +, pkg-config , automake , libtool , pjsip @@ -62,7 +62,7 @@ let ]; }; - pjsip' = stdenv.lib.overrideDerivation pjsip (old: { + pjsip' = lib.overrideDerivation pjsip (old: { patches = [ "${patchdir}/pjproject/gnutls.patch" ./notestsapps.patch # this one had to be modified @@ -89,7 +89,7 @@ stdenv.mkDerivation { autoreconfHook automake libtool - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix index 614ceeb0c32..6a6302e7495 100644 --- a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix +++ b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix @@ -3,7 +3,7 @@ let inherit (python27Packages) python; requirements = (import ./requirements.nix { - inherit stdenv fetchurl; + inherit lib fetchurl; pythonPackages = python27Packages; }); diff --git a/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix b/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix index c15b7ac45dd..8277028ac7b 100644 --- a/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix +++ b/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix @@ -1,5 +1,5 @@ { fetchurl -, lib, stdenv +, lib , pythonPackages }: @@ -8,7 +8,7 @@ let xe = buildPythonPackage rec { url = "http://www.blarg.net/%7Esteveha/xe-0.7.4.tar.gz"; - name = stdenv.lib.nameFromURL url ".tar"; + name = lib.nameFromURL url ".tar"; src = fetchurl { inherit url; sha256 = "0v9878cl0y9cczdsr6xjy8v9l139lc23h4m5f86p4kpf2wlnpi42"; @@ -28,7 +28,7 @@ in { pyfeed = (buildPythonPackage rec { url = "http://www.blarg.net/%7Esteveha/pyfeed-0.7.4.tar.gz"; - name = stdenv.lib.nameFromURL url ".tar"; + name = lib.nameFromURL url ".tar"; src = fetchurl { inherit url; @@ -49,7 +49,7 @@ in { wokkel = buildPythonPackage (rec { url = "http://wokkel.ik.nu/releases/0.7.0/wokkel-0.7.0.tar.gz"; - name = stdenv.lib.nameFromURL url ".tar"; + name = lib.nameFromURL url ".tar"; src = fetchurl { inherit url; sha256 = "0rnshrzw8605x05mpd8ndrx3ri8h6cx713mp8sl4f04f4gcrz8ml"; diff --git a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix b/pkgs/applications/networking/instant-messengers/scudcloud/default.nix index 55935f69e1c..29d4c3600c3 100644 --- a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix +++ b/pkgs/applications/networking/instant-messengers/scudcloud/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python3Packages }: +{ lib, fetchurl, python3Packages }: let version = "1.63"; in python3Packages.buildPythonPackage { diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index 93ab78c439a..601489d4532 100644 --- a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -1,13 +1,13 @@ -{ stdenv, lib, fetchurl, makeWrapper, jre_headless, libmatthew_java, dbus, dbus_java }: +{ stdenv, lib, fetchurl, makeWrapper, openjdk11_headless, libmatthew_java, dbus, dbus_java }: stdenv.mkDerivation rec { pname = "signal-cli"; - version = "0.6.12"; + version = "0.7.4"; # Building from source would be preferred, but is much more involved. src = fetchurl { url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}.tar.gz"; - sha256 = "0i1y2p5qi2bwhkm8sv0wkb0lfi2vm26qalnpg6kn0ikcxkqkq5bc"; + sha256 = "18dv2944nsryl6372jqgb52z3s1grvgfc5sb1b1rgn0y84g8g46n"; }; buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ]; @@ -18,15 +18,15 @@ stdenv.mkDerivation rec { cp -r lib $out/lib cp bin/signal-cli $out/bin/signal-cli '' + (if stdenv.isLinux then '' - makeWrapper ${jre_headless}/bin/java $out/bin/signal-cli \ - --set JAVA_HOME "${jre_headless}" \ + makeWrapper ${openjdk11_headless}/bin/java $out/bin/signal-cli \ + --set JAVA_HOME "${openjdk11_headless}" \ --add-flags "-classpath '$out/lib/*:${libmatthew_java}/lib/jni'" \ --add-flags "-Djava.library.path=${libmatthew_java}/lib/jni:${dbus_java}/share/java/dbus:$out/lib" \ --add-flags "org.asamk.signal.Main" '' else '' wrapProgram $out/bin/signal-cli \ - --prefix PATH : ${lib.makeBinPath [ jre_headless ]} \ - --set JAVA_HOME ${jre_headless} + --prefix PATH : ${lib.makeBinPath [ openjdk11_headless ]} \ + --set JAVA_HOME ${openjdk11_headless} ''); # Execution in the macOS (10.13) sandbox fails with diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 44df5f6be68..19e48bf88d6 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -25,7 +25,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "1.39.4"; # Please backport all updates to the stable channel. + version = "1.39.6"; # 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: @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "11rjz0vawwyny4rpdqsqyfh8pi177xykm69xxcj6kgcncxaxg0vb"; + sha256 = "04fd81vc0dxk0b47crm5zacf4x79pdn483xicygnc1z6v7mnrmgk"; }; nativeBuildInputs = [ @@ -113,7 +113,7 @@ in stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( - --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ] }" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ] }" ${customLanguageWrapperArgs} ) diff --git a/pkgs/applications/networking/instant-messengers/silc-client/default.nix b/pkgs/applications/networking/instant-messengers/silc-client/default.nix index 0c84e1c5c80..83cc80ccaf0 100644 --- a/pkgs/applications/networking/instant-messengers/silc-client/default.nix +++ b/pkgs/applications/networking/instant-messengers/silc-client/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, pkgconfig, glib, ncurses +{ lib, stdenv, fetchurl, perl, pkg-config, glib, ncurses , enablePlugin ? false }: # Enabling the plugin and using it with a recent irssi, segafults on join: @@ -8,7 +8,7 @@ let basename = "silc-client-1.1.11"; in stdenv.mkDerivation { - name = basename + stdenv.lib.optionalString enablePlugin "-irssi-plugin"; + name = basename + lib.optionalString enablePlugin "-irssi-plugin"; src = fetchurl { url = "mirror://sourceforge/silc/silc/client/sources/${basename}.tar.bz2"; @@ -23,18 +23,18 @@ stdenv.mkDerivation { configureFlags = [ "--with-ncurses=${ncurses.dev}" ]; - preConfigure = stdenv.lib.optionalString enablePlugin '' + preConfigure = lib.optionalString enablePlugin '' configureFlags="$configureFlags --with-silc-plugin=$out/lib/irssi" ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ perl glib ncurses ]; meta = { homepage = "http://silcnet.org/"; description = "Secure Internet Live Conferencing server"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 068b939d515..09452aa90b6 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -9,7 +9,7 @@ let # source of the latter disappears much faster. version = "8.66.0.74"; - rpath = stdenv.lib.makeLibraryPath [ + rpath = lib.makeLibraryPath [ alsaLib atk at-spi2-atk @@ -118,7 +118,7 @@ in stdenv.mkDerivation { description = "Linux client for skype"; homepage = "https://www.skype.com"; license = licenses.unfree; - maintainers = with stdenv.lib.maintainers; [ panaeon jraygauthier ]; + maintainers = with lib.maintainers; [ panaeon jraygauthier ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/slack-term/default.nix b/pkgs/applications/networking/instant-messengers/slack-term/default.nix index 66d59346c4b..30cc7396c56 100644 --- a/pkgs/applications/networking/instant-messengers/slack-term/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack-term/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { # https://github.com/erroneousboat/slack-term diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 6c1e99a24da..44642ab8a93 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -31,7 +31,7 @@ , nss , pango , systemd -, xdg_utils +, xdg-utils , xorg }: @@ -41,11 +41,11 @@ let pname = "slack"; - x86_64-darwin-version = "4.11.1"; - x86_64-darwin-sha256 = "0a5rq8zhgdckwxnyjv6nrgpnj682j1rd9yc4nwvsbvpzv15kmd35"; + x86_64-darwin-version = "4.12.2"; + x86_64-darwin-sha256 = "0qflv2glfy7d77zjgqi7qcjr53c9dni26gmqkg9vk2xijmmd3xy7"; - x86_64-linux-version = "4.11.1"; - x86_64-linux-sha256 = "1r43g3xnla5aq38l3mpba8jb1gx9m2b6pr84prsclz27nr0rfm6g"; + x86_64-linux-version = "4.12.2"; + x86_64-linux-sha256 = "sha256-G5uQI078N7AbhEJs6a/17Hoi5DSdwvYLM1T/ttrEw4s="; version = { x86_64-darwin = x86_64-darwin-version; @@ -78,7 +78,7 @@ let passthru.updateScript = ./update.sh; - rpath = stdenv.lib.makeLibraryPath [ + rpath = lib.makeLibraryPath [ alsaLib at-spi2-atk at-spi2-core @@ -151,7 +151,7 @@ let rm $out/bin/slack makeWrapper $out/lib/slack/slack $out/bin/slack \ --prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH \ - --prefix PATH : ${xdg_utils}/bin + --prefix PATH : ${xdg-utils}/bin # Fix the desktop link substituteInPlace $out/share/applications/slack.desktop \ diff --git a/pkgs/applications/networking/instant-messengers/stride/default.nix b/pkgs/applications/networking/instant-messengers/stride/default.nix index 9096a925bbd..0ce5f764128 100644 --- a/pkgs/applications/networking/instant-messengers/stride/default.nix +++ b/pkgs/applications/networking/instant-messengers/stride/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, dpkg, alsaLib, atk, cairo, cups, dbus, expat, fontconfig , freetype, gdk-pixbuf, glib, gnome2, nspr, nss, pango, udev, xorg }: let - fullPath = stdenv.lib.makeLibraryPath [ + fullPath = lib.makeLibraryPath [ alsaLib atk cairo diff --git a/pkgs/applications/networking/instant-messengers/swift-im/default.nix b/pkgs/applications/networking/instant-messengers/swift-im/default.nix index 494a1f267f9..58335bed421 100644 --- a/pkgs/applications/networking/instant-messengers/swift-im/default.nix +++ b/pkgs/applications/networking/instant-messengers/swift-im/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchurl, pkgconfig, qttools, sconsPackages +{ mkDerivation, lib, fetchurl, pkg-config, qttools, sconsPackages , GConf, avahi, boost, hunspell, libXScrnSaver, libedit, libidn, libnatpmp, libxml2 , lua, miniupnpc, openssl, qtbase, qtmultimedia, qtsvg, qtwebkit, qtx11extras, zlib }: @@ -14,7 +14,7 @@ mkDerivation rec { patches = [ ./qt-5.11.patch ./scons.patch ]; - nativeBuildInputs = [ pkgconfig qttools sconsPackages.scons_3_1_2 ]; + nativeBuildInputs = [ pkg-config qttools sconsPackages.scons_3_1_2 ]; buildInputs = [ GConf avahi boost hunspell libXScrnSaver libedit libidn libnatpmp libxml2 diff --git a/pkgs/applications/networking/instant-messengers/tangram/default.nix b/pkgs/applications/networking/instant-messengers/tangram/default.nix new file mode 100644 index 00000000000..e7ca8c320ac --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/tangram/default.nix @@ -0,0 +1,56 @@ +{ stdenv, lib, fetchFromGitHub, appstream-glib, desktop-file-utils, gdk-pixbuf +, gettext, gjs, glib, gobject-introspection, gsettings-desktop-schemas, gtk3 +, hicolor-icon-theme, meson, ninja, pkg-config, python3, webkitgtk, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "tangram"; + version = "1.3.1"; + + src = fetchFromGitHub { + owner = "sonnyp"; + repo = "Tangram"; + rev = "v${version}"; + sha256 = "0bhs9s6c2k06i3cx01h2102lgl7g6vxm3k63jkkhh2bwdpc9kvn3"; + fetchSubmodules = true; + }; + + buildInputs = [ gdk-pixbuf gjs glib gsettings-desktop-schemas gtk3 webkitgtk ]; + + nativeBuildInputs = [ + appstream-glib + desktop-file-utils + gettext + gobject-introspection + hicolor-icon-theme + meson + ninja + pkg-config + python3 + wrapGAppsHook + ]; + + dontWrapGApps = true; + + # Fixes https://github.com/NixOS/nixpkgs/issues/31168 + postPatch = '' + chmod +x build-aux/meson/postinstall.py + patchShebangs build-aux/meson/postinstall.py + ''; + + postFixup = '' + for file in $out/bin/re.sonny.Tangram; do + sed -e $"2iimports.package._findEffectiveEntryPointName = () => \'$(basename $file)\' " \ + -i $file + wrapGApp "$file" + done + ''; + + meta = with lib; { + description = "Run web apps on your desktop"; + homepage = "https://github.com/sonnyp/Tangram"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [ austinbutler ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/teams/default.nix b/pkgs/applications/networking/instant-messengers/teams/default.nix index af3235bbdc7..1625878a2d0 100644 --- a/pkgs/applications/networking/instant-messengers/teams/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams/default.nix @@ -10,7 +10,7 @@ , at-spi2-atk , coreutils , gawk -, xdg_utils +, xdg-utils , systemd }: stdenv.mkDerivation rec { @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ]; preFixup = '' - gappsWrapperArgs+=(--prefix PATH : "${coreutils}/bin:${gawk}/bin:${xdg_utils}/bin") + gappsWrapperArgs+=(--prefix PATH : "${coreutils}/bin:${gawk}/bin:${xdg-utils}/bin") ''; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index 33b8c5355f7..98867407916 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { patchelf --replace-needed libquazip.so ${quazip}/lib/libquazip5.so ts3client patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath deps}:$(cat $NIX_CC/nix-support/orig-cc)/${libDir} \ + --set-rpath ${lib.makeLibraryPath deps}:$(cat $NIX_CC/nix-support/orig-cc)/${libDir} \ --force-rpath \ ts3client ''; diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index 190e0515896..676902d68ef 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchFromGitHub, pkg-config, python3, cmake, ninja -, qtbase, qtimageformats, libdbusmenu, hunspell, xdg_utils, ffmpeg_3, openalSoft +, qtbase, qtimageformats, libdbusmenu, hunspell, xdg-utils, ffmpeg_3, openalSoft , lzma, lz4, xxHash, zlib, minizip, openssl, libtgvoip, microsoft_gsl, tl-expected , range-v3 }: @@ -26,7 +26,7 @@ mkDerivation rec { ]; qtWrapperArgs = [ - "--prefix PATH : ${xdg_utils}/bin" + "--prefix PATH : ${xdg-utils}/bin" ]; cmakeFlags = [ diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 8ea4362e7e3..693a01f5d89 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,11 +1,11 @@ { mkDerivation, lib, fetchurl, callPackage -, pkgconfig, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook, removeReferencesTo +, pkg-config, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook, removeReferencesTo , qtbase, qtimageformats, gtk3, libsForQt5, enchant2, lz4, xxHash , dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 , tl-expected, hunspell # TODO: Shouldn't be required: , pcre, xorg, util-linux, libselinux, libsepol, epoxy, at-spi2-core, libXtst -, xdg_utils +, xdg-utils }: with lib; @@ -22,12 +22,12 @@ let in mkDerivation rec { pname = "telegram-desktop"; - version = "2.5.1"; + version = "2.5.8"; # Telegram-Desktop with submodules src = fetchurl { url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"; - sha256 = "1qpap599h2c4hlmr00k82r6138ym4zqrbfpvm97gm97adn3mxk7i"; + sha256 = "0zj1g24fi4m84p6zj9yk55v8sbhn0jdpdhp33y12d2msz0qwp2cw"; }; postPatch = '' @@ -41,10 +41,10 @@ in mkDerivation rec { dontWrapGApps = true; dontWrapQtApps = true; - nativeBuildInputs = [ pkgconfig cmake ninja python3 wrapGAppsHook wrapQtAppsHook removeReferencesTo ]; + nativeBuildInputs = [ pkg-config cmake ninja python3 wrapGAppsHook wrapQtAppsHook removeReferencesTo ]; buildInputs = [ - qtbase qtimageformats gtk3 libsForQt5.libdbusmenu enchant2 lz4 xxHash + qtbase qtimageformats gtk3 libsForQt5.kwayland libsForQt5.libdbusmenu enchant2 lz4 xxHash dee ffmpeg openalSoft minizip libopus alsaLib libpulseaudio range-v3 tl-expected hunspell tg_owt @@ -83,7 +83,7 @@ in mkDerivation rec { wrapProgram $out/bin/telegram-desktop \ "''${gappsWrapperArgs[@]}" \ "''${qtWrapperArgs[@]}" \ - --prefix PATH : ${xdg_utils}/bin \ + --prefix PATH : ${xdg-utils}/bin \ --set XDG_RUNTIME_DIR "XDG-RUNTIME-DIR" sed -i $out/bin/telegram-desktop \ -e "s,'XDG-RUNTIME-DIR',\"\''${XDG_RUNTIME_DIR:-/run/user/\$(id --user)}\"," diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix index 2853418da0e..b5a6579db57 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix @@ -3,8 +3,8 @@ }: let - rev = "6eaebec41b34a0a0d98f02892d0cfe6bbcbc0a39"; - sha256 = "0dbc36j09jmxvznal55hi3qrfyvj4y0ila6347nav9skcmk8fm64"; + rev = "be23804afce3bb2e80a1d57a7c1318c71b82b7de"; + sha256 = "0avdxkig8z1ainzyxkm9vmlvkyqbjalwb4h9s9kcail82mnldnhc"; in stdenv.mkDerivation { pname = "tg_owt"; @@ -25,5 +25,10 @@ in stdenv.mkDerivation { libjpeg openssl libopus ffmpeg alsaLib libpulseaudio protobuf ]; + cmakeFlags = [ + # Building as a shared library isn't officially supported and currently broken: + "-DBUILD_SHARED_LIBS=OFF" + ]; + meta.license = lib.licenses.bsd3; } diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix index 3cdaa72cfd2..3fe88c287c5 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libxslt, telepathy-glib, libxml2, dbus-glib, dbus +{ lib, stdenv, fetchurl, pkg-config, libxslt, telepathy-glib, libxml2, dbus-glib, dbus , sqlite, libsoup, libnice, gnutls}: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "174nlkqm055vrhv11gy73m20jbsggcb0ddi51c7s9m3j5ibr2p0i"; }; - nativeBuildInputs = [ pkgconfig libxslt ]; + nativeBuildInputs = [ pkg-config libxslt ]; buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls telepathy-glib.python ]; checkInputs = [ dbus.daemon ]; @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { homepage = "https://telepathy.freedesktop.org/components/telepathy-gabble/"; description = "Jabber/XMPP connection manager for the Telepathy framework"; license = licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; + platforms = lib.platforms.gnu ++ lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix index 6d4ff62f22a..74e4d1039e7 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pidgin, telepathy-glib, glib, dbus-glib, pkgconfig, libxslt }: +{ lib, stdenv, fetchurl, fetchpatch, pidgin, telepathy-glib, glib, dbus-glib, pkg-config, libxslt }: stdenv.mkDerivation rec { pname = "telepathy-haze"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib telepathy-glib dbus-glib pidgin telepathy-glib.python ]; - nativeBuildInputs = [ pkgconfig libxslt ]; + nativeBuildInputs = [ pkg-config libxslt ]; patches = [ # Patch from Gentoo that helps telepathy-haze build with more @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { meta = { description = "A Telepathy connection manager based on libpurple"; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # Random choice + platforms = lib.platforms.gnu ++ lib.platforms.linux; # Random choice }; } diff --git a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix index f3d1e6cfd75..bc66d77e224 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, dconf, pkgconfig, dbus-glib, telepathy-glib, libxslt, makeWrapper }: +{ lib, stdenv, fetchurl, glib, dconf, pkg-config, dbus-glib, telepathy-glib, libxslt, makeWrapper }: stdenv.mkDerivation rec { pname = "telepathy-idle"; @@ -9,17 +9,17 @@ stdenv.mkDerivation rec { sha256 = "1argdzbif1vdmwp5vqbgkadq9ancjmgdm2ncp0qfckni715ss4rh"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib telepathy-glib dbus-glib libxslt telepathy-glib.python (stdenv.lib.getLib dconf) makeWrapper ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ glib telepathy-glib dbus-glib libxslt telepathy-glib.python (lib.getLib dconf) makeWrapper ]; preFixup = '' wrapProgram "$out/libexec/telepathy-idle" \ - --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" + --prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules" ''; meta = { description = "IRC connection manager for the Telepathy framework"; - license = stdenv.lib.licenses.lgpl21; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; + license = lib.licenses.lgpl21; + platforms = lib.platforms.gnu ++ lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index e96b35f21a8..bae29f4b31f 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, pkgconfig +{ lib, stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, pkg-config , dconf, makeWrapper, intltool, libxslt, gobject-introspection, dbus }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - makeWrapper pkgconfig intltool libxslt gobject-introspection + makeWrapper pkg-config intltool libxslt gobject-introspection ]; buildInputs = [ dbus-glib libxml2 sqlite telepathy-glib @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram "$out/libexec/telepathy-logger" \ - --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix index 1df59809146..8464619f1e7 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram "$lib/libexec/mission-control-5" \ - --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix index dc0a16139ea..cf166f7e2d3 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, libxslt, glib, libxml2, telepathy-glib, avahi, libsoup -, libuuid, openssl, pcre, sqlite, pkgconfig }: +, libuuid, openssl, pcre, sqlite, pkg-config }: stdenv.mkDerivation rec { pname = "telepathy-salut"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib libxml2 telepathy-glib avahi libsoup libuuid openssl sqlite pcre telepathy-glib.python ]; - nativeBuildInputs = [ libxslt pkgconfig ]; + nativeBuildInputs = [ libxslt pkg-config ]; configureFlags = [ "--disable-avahi-tests" ]; diff --git a/pkgs/applications/networking/instant-messengers/tensor/default.nix b/pkgs/applications/networking/instant-messengers/tensor/default.nix index 93b3315c1ef..114b3ab8f4d 100644 --- a/pkgs/applications/networking/instant-messengers/tensor/default.nix +++ b/pkgs/applications/networking/instant-messengers/tensor/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchgit, qtbase, qtquickcontrols, qmake, makeDesktopItem }: +{ mkDerivation, lib, fetchgit, qtbase, qtquickcontrols, qmake, makeDesktopItem }: # we now have libqmatrixclient so a future version of tensor that supports it # should use that diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix index 4aee50453ed..e59e5864432 100644 --- a/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, libsodium, ncurses, curl -, libtoxcore, openal, libvpx, freealut, libconfig, pkgconfig, libopus +, libtoxcore, openal, libvpx, freealut, libconfig, pkg-config, libopus , qrencode, gdk-pixbuf, libnotify }: stdenv.mkDerivation rec { @@ -18,10 +18,10 @@ stdenv.mkDerivation rec { buildInputs = [ libtoxcore libsodium ncurses curl gdk-pixbuf libnotify - ] ++ stdenv.lib.optionals (!stdenv.isAarch32) [ + ] ++ lib.optionals (!stdenv.isAarch32) [ openal libopus libvpx freealut qrencode ]; - nativeBuildInputs = [ pkgconfig libconfig ]; + nativeBuildInputs = [ pkg-config libconfig ]; meta = with lib; { description = "Reference CLI for Tox"; diff --git a/pkgs/applications/networking/instant-messengers/turses/default.nix b/pkgs/applications/networking/instant-messengers/turses/default.nix index 4b07289a11c..256e026a060 100644 --- a/pkgs/applications/networking/instant-messengers/turses/default.nix +++ b/pkgs/applications/networking/instant-messengers/turses/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchpatch, python3Packages }: +{ lib, fetchpatch, python3Packages }: -with stdenv.lib; +with lib; with python3Packages; buildPythonPackage rec { diff --git a/pkgs/applications/networking/instant-messengers/twinkle/default.nix b/pkgs/applications/networking/instant-messengers/twinkle/default.nix index 004a4dab823..8b306c07506 100644 --- a/pkgs/applications/networking/instant-messengers/twinkle/default.nix +++ b/pkgs/applications/networking/instant-messengers/twinkle/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , cmake , libxml2 diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix index 01f2b9c5644..668e614c474 100644 --- a/pkgs/applications/networking/instant-messengers/utox/default.nix +++ b/pkgs/applications/networking/instant-messengers/utox/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, check, cmake, pkgconfig +{ lib, stdenv, fetchFromGitHub, check, cmake, pkg-config , libtoxcore, filter-audio, dbus, libvpx, libX11, openal, freetype, libv4l , libXrender, fontconfig, libXext, libXft, libsodium, libopus }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - cmake pkgconfig + cmake pkg-config ]; cmakeFlags = [ diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix index 24ce75dc797..4389ee153c5 100644 --- a/pkgs/applications/networking/instant-messengers/viber/default.nix +++ b/pkgs/applications/networking/instant-messengers/viber/default.nix @@ -1,4 +1,4 @@ -{fetchurl, stdenv, dpkg, makeWrapper, +{fetchurl, lib, stdenv, dpkg, makeWrapper, alsaLib, cups, curl, dbus, expat, fontconfig, freetype, glib, gst_all_1, harfbuzz, libcap, libGL, libGLU, libpulseaudio, libxkbcommon, libxml2, libxslt, nspr, nss, openssl, systemd, wayland, xorg, zlib, ... @@ -17,7 +17,7 @@ stdenv.mkDerivation { dontUnpack = true; - libPath = stdenv.lib.makeLibraryPath [ + libPath = lib.makeLibraryPath [ alsaLib cups curl @@ -98,9 +98,9 @@ stdenv.mkDerivation { meta = { homepage = "http://www.viber.com"; description = "An instant messaging and Voice over IP (VoIP) app"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; platforms = [ "x86_64-linux" ]; - maintainers = with stdenv.lib.maintainers; [ jagajaga ]; + maintainers = with lib.maintainers; [ jagajaga ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/pkgs/applications/networking/instant-messengers/wavebox/default.nix index cddff29b5ed..ba0f867b2aa 100644 --- a/pkgs/applications/networking/instant-messengers/wavebox/default.nix +++ b/pkgs/applications/networking/instant-messengers/wavebox/default.nix @@ -1,9 +1,9 @@ { alsaLib, autoPatchelfHook, fetchurl, gtk3, libnotify -, makeDesktopItem, makeWrapper, nss, lib, stdenv, udev, xdg_utils +, makeDesktopItem, makeWrapper, nss, lib, stdenv, udev, xdg-utils , xorg }: -with stdenv.lib; +with lib; let bits = "x86_64"; @@ -54,7 +54,7 @@ in stdenv.mkDerivation { postFixup = '' makeWrapper $out/opt/wavebox/Wavebox $out/bin/wavebox \ - --prefix PATH : ${xdg_utils}/bin + --prefix PATH : ${xdg-utils}/bin ''; meta = with lib; { diff --git a/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix b/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix index a4c3f55b299..4367230f775 100644 --- a/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix +++ b/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "xmpp-client"; - version = "20160916-${stdenv.lib.strings.substring 0 7 rev}"; + version = "20160916-${lib.strings.substring 0 7 rev}"; rev = "abbf9020393e8caae3e8996a16ce48446e31cf0e"; goPackagePath = "github.com/agl/xmpp-client"; diff --git a/pkgs/applications/networking/instant-messengers/ytalk/default.nix b/pkgs/applications/networking/instant-messengers/ytalk/default.nix index 8cb22aabc69..1ccc9fbe6f5 100644 --- a/pkgs/applications/networking/instant-messengers/ytalk/default.nix +++ b/pkgs/applications/networking/instant-messengers/ytalk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses }: +{ lib, stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { pname = "ytalk"; @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://ytalk.ourproject.org"; description = "A terminal based talk client"; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ taeer ]; - license = stdenv.lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ taeer ]; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 887e3f458bc..089f0b327af 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -1,136 +1,126 @@ -{ stdenv, fetchurl, mkDerivation, autoPatchelfHook, bash +{ stdenv +, lib +, fetchurl +, mkDerivation +, makeWrapper , fetchFromGitHub # Dynamic libraries -, dbus, glib, libGL, libX11, libXfixes, libuuid, libxcb, qtbase, qtdeclarative -, qtgraphicaleffects, qtimageformats, qtlocation, qtquickcontrols -, qtquickcontrols2, qtscript, qtsvg , qttools, qtwayland, qtwebchannel -, qtwebengine +, alsaLib +, atk +, cairo +, dbus +, libGL +, fontconfig +, freetype +, gtk3 +, gdk-pixbuf +, glib +, pango +, wayland +, xorg +, libxkbcommon +, zlib # Runtime -, coreutils, faac, pciutils, procps, util-linux +, coreutils +, pciutils +, procps +, util-linux +, qttools , pulseaudioSupport ? true, libpulseaudio ? null -, alsaSupport ? stdenv.isLinux, alsaLib ? null }: assert pulseaudioSupport -> libpulseaudio != null; let - inherit (stdenv.lib) concatStringsSep makeBinPath optional; - - version = "5.4.53350.1027"; + version = "5.4.57862.0110"; srcs = { x86_64-linux = fetchurl { - url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "11va3px42y81bwy10mxm7mk0kf2sni9gwb422pq9djck2dgchw5x"; + url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz"; + sha256 = "sha256-ZAwXhbZ3nT6PGkSC1vnX2y/XUOZfped0r3OuedI62gY="; }; }; - - # Used for icons, appdata, and desktop file. - desktopIntegration = fetchFromGitHub { - owner = "flathub"; - repo = "us.zoom.Zoom"; - rev = "25e14f8141cdc682b4f7d9ebe15608619f5a19f2"; - sha256 = "0w3pdd5484r3nsb4iahi37jdlm37vm1053sb8k2zlqb9s554zjwp"; - }; - -in mkDerivation { - pname = "zoom-us"; - inherit version; - - src = srcs.${stdenv.hostPlatform.system}; - - nativeBuildInputs = [ autoPatchelfHook ]; - - buildInputs = [ - dbus glib libGL libX11 libXfixes libuuid libxcb faac qtbase - qtdeclarative qtgraphicaleffects qtlocation qtquickcontrols qtquickcontrols2 - qtscript qtwebchannel qtwebengine qtimageformats qtsvg qttools qtwayland + dontUnpack = true; + + libs = lib.makeLibraryPath ([ + # $ LD_LIBRARY_PATH=$NIX_LD_LIBRARY_PATH:$PWD ldd zoom | grep 'not found' + alsaLib + atk + cairo + dbus + libGL + fontconfig + freetype + gtk3 + gdk-pixbuf + glib + pango + stdenv.cc.cc + wayland + xorg.libX11 + xorg.libxcb + xorg.libXcomposite + xorg.libXext + libxkbcommon + xorg.libXrender + zlib + xorg.xcbutilimage + xorg.xcbutilkeysyms + xorg.libXfixes + xorg.libXtst + ] ++ lib.optional (pulseaudioSupport) libpulseaudio); + +in stdenv.mkDerivation { + name = "zoom-${version}"; + + dontUnpack = true; + + nativeBuildInputs = [ + makeWrapper ]; - runtimeDependencies = optional pulseaudioSupport libpulseaudio - ++ optional alsaSupport alsaLib; - - installPhase = - let - files = concatStringsSep " " [ - "*.pcm" - "*.png" - "ZoomLauncher" - "config-dump.sh" - "timezones" - "translations" - "version.txt" - "zcacert.pem" - "zoom" - "zoom.sh" - "zopen" - ]; - in '' - runHook preInstall - - mkdir -p $out/{bin,share/zoom-us} - - cp -ar ${files} $out/share/zoom-us - - # TODO Patch this somehow; tries to dlopen './libturbojpeg.so' from cwd - cp libturbojpeg.so $out/share/zoom-us/libturbojpeg.so - - # Again, requires faac with a nonstandard filename. - ln -s $(readlink -e "${faac}/lib/libfaac.so") $out/share/zoom-us/libfaac1.so - - runHook postInstall - ''; - - postInstall = '' - mkdir -p $out/share/{applications,appdata,icons} + installPhase = '' + runHook preInstall + mkdir $out + tar -C $out -xf ${srcs.${stdenv.hostPlatform.system}} + mv $out/usr/* $out/ + runHook postInstall + ''; + postFixup = '' # Desktop File - cp ${desktopIntegration}/us.zoom.Zoom.desktop $out/share/applications - substituteInPlace $out/share/applications/us.zoom.Zoom.desktop \ - --replace "Exec=zoom" "Exec=$out/bin/zoom-us" - - # Appdata - cp ${desktopIntegration}/us.zoom.Zoom.appdata.xml $out/share/appdata + substituteInPlace $out/share/applications/Zoom.desktop \ + --replace "Exec=/usr/bin/zoom" "Exec=$out/bin/zoom" - # Icons - for icon_size in 64 96 128 256; do - path=$icon_size'x'$icon_size - icon=${desktopIntegration}/us.zoom.Zoom.$icon_size.png - - mkdir -p $out/share/icons/hicolor/$path/apps - cp $icon $out/share/icons/hicolor/$path/apps/us.zoom.Zoom.png + for i in zopen zoom ZoomLauncher; do + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/opt/zoom/$i done - ''; - # $out/share/zoom-us isn't in auto-wrap directories list, need manual wrapping - dontWrapQtApps = true; + # ZoomLauncher sets LD_LIBRARY_PATH before execing zoom + wrapProgram $out/opt/zoom/zoom \ + --prefix LD_LIBRARY_PATH ":" ${libs} - qtWrapperArgs = [ - ''--prefix PATH : ${makeBinPath [ coreutils glib.dev pciutils procps qttools.dev util-linux ]}'' - # --run "cd ${placeholder "out"}/share/zoom-us" - # ^^ unfortunately, breaks run arg into multiple array elements, due to - # some bad array propagation. We'll do that in bash below - ]; - - postFixup = '' + rm $out/bin/zoom # Zoom expects "zopen" executable (needed for web login) to be present in CWD. Or does it expect # everybody runs Zoom only after cd to Zoom package directory? Anyway, :facepalm: - qtWrapperArgs+=( --run "cd ${placeholder "out"}/share/zoom-us" ) - - for app in ZoomLauncher zopen zoom; do - wrapQtApp $out/share/zoom-us/$app - done + makeWrapper $out/opt/zoom/ZoomLauncher $out/bin/zoom \ + --run "cd $out/opt/zoom" \ + --prefix PATH : ${lib.makeBinPath [ coreutils glib.dev pciutils procps qttools.dev util-linux ]} \ + --prefix LD_LIBRARY_PATH ":" ${libs} - ln -s $out/share/zoom-us/ZoomLauncher $out/bin/zoom-us + # Backwards compatiblity: we used to call it zoom-us + ln -s $out/bin/{zoom,zoom-us} ''; + # already done + dontPatchELF = true; + passthru.updateScript = ./update.sh; meta = { homepage = "https://zoom.us/"; description = "zoom.us video conferencing application"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; platforms = builtins.attrNames srcs; - maintainers = with stdenv.lib.maintainers; [ danbst tadfisher doronbehar ]; + maintainers = with lib.maintainers; [ danbst tadfisher doronbehar ]; }; - } diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/update.sh b/pkgs/applications/networking/instant-messengers/zoom-us/update.sh index bda9c5ae0a0..6ef9ec32538 100755 --- a/pkgs/applications/networking/instant-messengers/zoom-us/update.sh +++ b/pkgs/applications/networking/instant-messengers/zoom-us/update.sh @@ -3,6 +3,8 @@ set -eu -o pipefail -version="$(curl -Ls https://zoom.us/download\?os\=linux | pup '.linux-ver-text text{}' | cut -d' ' -f2)" +version="$(curl -Ls https://zoom.us/download\?os\=linux | \ + pup '.linux-ver-text text{}' | \ + awk -F'[ ().]' '{printf $2"."$3"."$6"."$7"\n"}')" update-source-version zoom-us "$version" diff --git a/pkgs/applications/networking/insync/default.nix b/pkgs/applications/networking/insync/default.nix index c864754403c..b52a81932e4 100644 --- a/pkgs/applications/networking/insync/default.nix +++ b/pkgs/applications/networking/insync/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, autoPatchelfHook }: +{ lib, stdenv, fetchurl, makeWrapper, autoPatchelfHook }: stdenv.mkDerivation rec { pname = "insync"; @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { meta = { platforms = ["x86_64-linux"]; - license = stdenv.lib.licenses.unfree; - maintainers = [ stdenv.lib.maintainers.benley ]; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.benley ]; homepage = "https://www.insynchq.com"; description = "Google Drive sync and backup with multiple account support"; longDescription = '' diff --git a/pkgs/applications/networking/insync/v3.nix b/pkgs/applications/networking/insync/v3.nix new file mode 100644 index 00000000000..0c18ec60ab6 --- /dev/null +++ b/pkgs/applications/networking/insync/v3.nix @@ -0,0 +1,83 @@ +{ stdenv +, lib +, fetchurl +, makeWrapper +, dpkg +, glibc +, glib +, libxcb +, libGL +, nss +, libthai +, wayland +, alsaLib +, qtvirtualkeyboard +, qtwebchannel +, qtwebsockets +, qtlocation +, qtwebengine +, autoPatchelfHook +, wrapQtAppsHook +}: + +stdenv.mkDerivation rec { + pname = "insync"; + version = "3.2.4.40856"; + + src = fetchurl { + url = "http://s.insynchq.com/builds/${pname}_${version}-focal_amd64.deb"; + sha256 = "1bvqbbrfn5784nmb2qaflm1rzczqhvghhb6y5zaxrapyhygxbcis"; + }; + + postPatch = '' + substituteInPlace usr/bin/insync --replace /usr/lib/insync $out/usr/lib/insync + ''; + + buildInputs = [ + alsaLib + libGL + libthai + libxcb + nss + qtlocation + qtvirtualkeyboard + qtwebchannel + qtwebengine + qtwebsockets + wayland + ]; + + nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper wrapQtAppsHook ]; + + unpackPhase = '' + dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner + ''; + + installPhase = '' + mkdir -p $out/bin $out/lib $out/share + cp -R usr/* $out/ + rm $out/lib/insync/libGLX.so.0 + rm $out/lib/insync/libQt5* + sed -i 's|/usr/lib/insync|/lib/insync|' "$out/bin/insync" + wrapQtApp "$out/lib/insync/insync" + ''; + + dontConfigure = true; + dontBuild = true; + + meta = with lib; { + platforms = ["x86_64-linux"]; + license = licenses.unfree; + maintainers = with maintainers; [ benley ]; + homepage = "https://www.insynchq.com"; + description = "Google Drive sync and backup with multiple account support"; + longDescription = '' + Insync is a commercial application that syncs your Drive files to your + computer. It has more advanced features than Google's official client + such as multiple account support, Google Doc conversion, symlink support, + and built in sharing. + + There is a 15-day free trial, and it is a paid application after that. + ''; + }; +} diff --git a/pkgs/applications/networking/ipfs-cluster/default.nix b/pkgs/applications/networking/ipfs-cluster/default.nix index 69b2d9ef309..67d45c44868 100644 --- a/pkgs/applications/networking/ipfs-cluster/default.nix +++ b/pkgs/applications/networking/ipfs-cluster/default.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "ipfs-cluster"; - version = "unstable-2020-10-20"; + version = "0.13.1"; - vendorSha256 = "0abfhl4v4yqy89aqn13ymj4rw5zhr92a9fh1abgpkr19adnyrs3d"; + vendorSha256 = "0ls6d5ijl8bbh48w0i30mwd4a4na93iw9xqpbw23lnb8pvskaggh"; patches = [ ./test.patch @@ -13,8 +13,8 @@ buildGoModule rec { src = fetchFromGitHub { owner = "ipfs"; repo = "ipfs-cluster"; - rev = "c78f7839a2d5645806e01bfbf7af862600f8fbc4"; - sha256 = "0fschpysma2piy2bfas56yapxm2cl6nj986ww3sp7ysldjzadmkk"; + rev = "v${version}"; + sha256 = "0kmsa7cnk88wrplsjysrpg6n0gd0risnhw0kh33jqx0fcg12b7h8"; }; meta = with lib; { diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix index fd9d8bd0d34..c54b4428819 100644 --- a/pkgs/applications/networking/ipfs/default.nix +++ b/pkgs/applications/networking/ipfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchurl, nixosTests }: +{ lib, buildGoModule, fetchurl, nixosTests }: buildGoModule rec { pname = "ipfs"; diff --git a/pkgs/applications/networking/ipget/default.nix b/pkgs/applications/networking/ipget/default.nix index ded83f30a1a..8817d90dd6e 100644 --- a/pkgs/applications/networking/ipget/default.nix +++ b/pkgs/applications/networking/ipget/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "ipget"; diff --git a/pkgs/applications/networking/iptraf/default.nix b/pkgs/applications/networking/iptraf/default.nix index e57c8bbae0f..344af6a0312 100644 --- a/pkgs/applications/networking/iptraf/default.nix +++ b/pkgs/applications/networking/iptraf/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ncurses}: +{lib, stdenv, fetchurl, ncurses}: stdenv.mkDerivation { name = "iptraf-3.0.1"; @@ -25,9 +25,9 @@ stdenv.mkDerivation { meta = { homepage = "http://iptraf.seul.org/"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; description = "Console-based network statistics utility for Linux"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; broken = true; # required isdn headers have been removed from the linux kernel }; } diff --git a/pkgs/applications/networking/irc/bip/default.nix b/pkgs/applications/networking/irc/bip/default.nix index af67c224e7d..a7b57aa3102 100644 --- a/pkgs/applications/networking/irc/bip/default.nix +++ b/pkgs/applications/networking/irc/bip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, bison, flex, autoconf, automake, openssl }: +{ lib, stdenv, fetchurl, fetchpatch, bison, flex, autoconf, automake, openssl }: stdenv.mkDerivation rec { pname = "bip"; @@ -42,8 +42,8 @@ stdenv.mkDerivation rec { meta = { description = "An IRC proxy (bouncer)"; homepage = "http://bip.milkypond.org/"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; downloadPage = "https://projects.duckcorp.org/projects/bip/files"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/irc/communi/default.nix b/pkgs/applications/networking/irc/communi/default.nix index 5380bb5458e..0d0144fbf91 100644 --- a/pkgs/applications/networking/irc/communi/default.nix +++ b/pkgs/applications/networking/irc/communi/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + dontWrapQtApps = true; + preConfigure = '' export QMAKEFEATURES=${libcommuni}/features ''; @@ -30,7 +32,7 @@ stdenv.mkDerivation rec { "COMMUNI_INSTALL_THEMES=${placeholder "out"}/share/communi/themes" ]; - postInstall = stdenv.lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.isLinux '' substituteInPlace "$out/share/applications/communi.desktop" \ --replace "/usr/bin" "$out/bin" ''; diff --git a/pkgs/applications/networking/irc/convos/default.nix b/pkgs/applications/networking/irc/convos/default.nix index 551953d4337..9a42d0aa99b 100644 --- a/pkgs/applications/networking/irc/convos/default.nix +++ b/pkgs/applications/networking/irc/convos/default.nix @@ -1,31 +1,33 @@ -{ stdenv, fetchFromGitHub, perl, perlPackages, makeWrapper, shortenPerlShebang +{ lib, stdenv, fetchFromGitHub, perl, perlPackages, makeWrapper, shortenPerlShebang, openssl , nixosTests }: -with stdenv.lib; +with lib; perlPackages.buildPerlPackage rec { pname = "convos"; - version = "5.00"; + version = "5.11"; src = fetchFromGitHub { owner = "Nordaaker"; repo = pname; rev = version; - sha256 = "0mdbh9q1vclwgnjwvb3z637s7v804h65zxazbhmd7qi3zislnhg1"; + sha256 = "08k8dqdgz2b3p8g1zfg9i74r5nm1w0sqdm759d1f3jcyp737r47x"; }; nativeBuildInputs = [ makeWrapper ] ++ optional stdenv.isDarwin [ shortenPerlShebang ]; buildInputs = with perlPackages; [ - CryptEksblowfish FileHomeDir FileReadBackwards + CryptEksblowfish FileHomeDir FileReadBackwards HTTPAcceptLanguage IOSocketSSL IRCUtils JSONValidator LinkEmbedder ModuleInstall Mojolicious MojoliciousPluginOpenAPI MojoliciousPluginWebpack ParseIRC TextMarkdown TimePiece UnicodeUTF8 CpanelJSONXS EV ]; + propagatedBuildInputs = [ openssl ]; + checkInputs = with perlPackages; [ TestDeep TestMore ]; postPatch = '' @@ -43,6 +45,15 @@ perlPackages.buildPerlPackage rec { substituteInPlace t/web-register-open-to-public.t \ --replace '!127.0.0.1!' '!localhost!' + # A webirc test fails to resolve "localhost" likely due to sandboxing, we + # remove this test. + # + rm t/irc-webirc.t + + # A web-user test fails on Darwin, we remove it. + # + rm t/web-user.t + # Module::Install is a runtime dependency not covered by the tests, so we add # a test for it. # @@ -71,7 +82,7 @@ perlPackages.buildPerlPackage rec { meta = { homepage = "https://convos.chat"; description = "Convos is the simplest way to use IRC in your browser"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; maintainers = with maintainers; [ sgo ]; }; } diff --git a/pkgs/applications/networking/irc/epic5/default.nix b/pkgs/applications/networking/irc/epic5/default.nix index 872c96ac7a0..9b096eb72e9 100644 --- a/pkgs/applications/networking/irc/epic5/default.nix +++ b/pkgs/applications/networking/irc/epic5/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { # Darwin needs libiconv, tcl; while Linux build don't buildInputs = [ openssl ncurses ] - ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv tcl ]; + ++ lib.optionals stdenv.isDarwin [ libiconv tcl ]; patches = [ (fetchpatch { diff --git a/pkgs/applications/networking/irc/hexchat/default.nix b/pkgs/applications/networking/irc/hexchat/default.nix index 19f398bc59a..2a91e3ebddc 100644 --- a/pkgs/applications/networking/irc/hexchat/default.nix +++ b/pkgs/applications/networking/irc/hexchat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, gtk2, lua, perl, python3 +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, gtk2, lua, perl, python3 , pciutils, dbus-glib, libcanberra-gtk2, libproxy , enchant2, libnotify, openssl, isocodes , desktop-file-utils @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "08kvp0dcn3bvmlqcfp9312075bwkqkpa8m7zybr88pfp210gfl85"; }; - nativeBuildInputs = [ meson ninja pkgconfig ]; + nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ gtk2 lua perl python3 pciutils dbus-glib libcanberra-gtk2 libproxy diff --git a/pkgs/applications/networking/irc/ii/default.nix b/pkgs/applications/networking/irc/ii/default.nix index 163dec194b1..22d03af0faf 100644 --- a/pkgs/applications/networking/irc/ii/default.nix +++ b/pkgs/applications/networking/irc/ii/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { name = "ii-1.8"; @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://tools.suckless.org/ii/"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; description = "Irc it, simple FIFO based irc client"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix index 27b37e78a1a..91617a26782 100644 --- a/pkgs/applications/networking/irc/irssi/default.nix +++ b/pkgs/applications/networking/irc/irssi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintl, libgcrypt, libotr }: +{ lib, stdenv, fetchurl, pkg-config, ncurses, glib, openssl, perl, libintl, libgcrypt, libotr }: stdenv.mkDerivation rec { pname = "irssi"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0g2nxazn4lszmd6mf1s36x5ablk4999g1qx7byrnvgnjsihjh62k"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses glib openssl perl libintl libgcrypt libotr ]; configureFlags = [ @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://irssi.org"; description = "A terminal based IRC client"; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ lovek323 ]; - license = stdenv.lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ lovek323 ]; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/networking/irc/irssi/fish/default.nix b/pkgs/applications/networking/irc/irssi/fish/default.nix index f1e0e9158ca..d3b814fb161 100644 --- a/pkgs/applications/networking/irc/irssi/fish/default.nix +++ b/pkgs/applications/networking/irc/irssi/fish/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, irssi, gmp, automake, autoconf, libtool, openssl, glib, pkgconfig }: +{ lib, stdenv, fetchurl, irssi, gmp, automake, autoconf, libtool, openssl, glib, pkg-config }: stdenv.mkDerivation rec { name = "fish-irssi-20130413-e98156bebd"; - + src = fetchurl { url = "https://github.com/falsovsky/FiSH-irssi/tarball/e98156bebd"; name = "${name}.tar.gz"; @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { mkdir -p $out/lib/irssi/modules cp src/.libs/libfish.so $out/lib/irssi/modules ''; - - nativeBuildInputs = [ pkgconfig ]; + + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gmp automake autoconf libtool openssl glib ]; - + meta = { homepage = "https://github.com/falsovsky/FiSH-irssi"; - license = stdenv.lib.licenses.unfree; # I can't find any mention of license - maintainers = with stdenv.lib.maintainers; [viric]; + license = lib.licenses.unfree; # I can't find any mention of license + maintainers = with lib.maintainers; [viric]; }; } diff --git a/pkgs/applications/networking/irc/kvirc/default.nix b/pkgs/applications/networking/irc/kvirc/default.nix index 6fd66096b5b..cfc03fe37d3 100644 --- a/pkgs/applications/networking/irc/kvirc/default.nix +++ b/pkgs/applications/networking/irc/kvirc/default.nix @@ -1,6 +1,6 @@ { lib, mkDerivation, fetchFromGitHub , qtbase, qtmultimedia, qtsvg, qtx11extras -, pkgconfig, cmake, gettext +, pkg-config, cmake, gettext }: mkDerivation rec { @@ -19,7 +19,7 @@ mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig cmake gettext + pkg-config cmake gettext ]; meta = with lib; { diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index 842e160677e..b72e28929e3 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -20,7 +20,6 @@ }: let - inherit (stdenv) lib; buildClient = monolithic || client; buildCore = monolithic || enableDaemon; in diff --git a/pkgs/applications/networking/irc/qweechat/default.nix b/pkgs/applications/networking/irc/qweechat/default.nix index 18a4872a44f..c4a67c8098a 100644 --- a/pkgs/applications/networking/irc/qweechat/default.nix +++ b/pkgs/applications/networking/irc/qweechat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python27Packages }: +{ lib, fetchFromGitHub, python27Packages }: python27Packages.buildPythonApplication rec { version = "2016-07-29"; diff --git a/pkgs/applications/networking/irc/sic/default.nix b/pkgs/applications/networking/irc/sic/default.nix index 69605af2f66..129b72d847d 100644 --- a/pkgs/applications/networking/irc/sic/default.nix +++ b/pkgs/applications/networking/irc/sic/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "sic"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Simple IRC client"; homepage = "https://tools.suckless.org/sic/"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.mit; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/networking/irc/tiny/default.nix b/pkgs/applications/networking/irc/tiny/default.nix index c51d93378c5..676309a2bae 100644 --- a/pkgs/applications/networking/irc/tiny/default.nix +++ b/pkgs/applications/networking/irc/tiny/default.nix @@ -11,18 +11,24 @@ rustPlatform.buildRustPackage rec { pname = "tiny"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "osa1"; repo = pname; rev = "v${version}"; - sha256 = "11kjndd4rzj83hzhcqvvp9nxjkana63m0h5r51xwp1ww9sn63km9"; + sha256 = "07a50shv6k4fwl2gmv4j0maxaqqkjpwwmqkxkqs0gvx38lc5f7m7"; }; - cargoSha256 = "079ns78acsff2qb59s7q0ck3j2fygcfqy8is6vfa71jyq7a0rjqm"; + cargoSha256 = "009jqizj4qg1bqslna35myxcark40hwlqsz58fbps9nsgp1i0hq2"; - RUSTC_BOOTSTRAP = 1; + cargoPatches = [ + # Fix Cargo.lock version. Remove with the next release. + (fetchpatch { + url = "https://github.com/osa1/tiny/commit/b1caf48a6399dad8875de1d965d1ad445e49585d.patch"; + sha256 = "1zkjhx94nwmd69cfwwwzg51ipcwq01wyvgsmn0vq7iaa2h0d286i"; + }) + ]; nativeBuildInputs = lib.optional stdenv.isLinux pkg-config; buildInputs = lib.optionals stdenv.isLinux [ dbus openssl ] ++ lib.optional stdenv.isDarwin Foundation; @@ -30,6 +36,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A console IRC client"; homepage = "https://github.com/osa1/tiny"; + changelog = "https://github.com/osa1/tiny/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ Br1ght0ne ]; }; diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 7343b7e1a55..58952f28b55 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -27,17 +27,17 @@ let in assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "3.0"; + version = "3.0.1"; pname = "weechat"; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.bz2"; - sha256 = "0ciddvyhyp38fnfsi1plj3z8d76f28lbzbxib2857vw7rzyqfcky"; + sha256 = "0f50kib8l99vlp9wqszq2r2g5panzphsgs7viga8lyc83v229b33"; }; outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; - cmakeFlags = with stdenv.lib; [ + cmakeFlags = with lib; [ "-DENABLE_MAN=ON" "-DENABLE_DOC=ON" "-DENABLE_JAVASCRIPT=OFF" # Requires v8 <= 3.24.3, https://github.com/weechat/weechat/issues/360 @@ -48,7 +48,7 @@ let ; nativeBuildInputs = [ cmake pkg-config makeWrapper asciidoctor ]; - buildInputs = with stdenv.lib; [ + buildInputs = with lib; [ ncurses openssl aspell gnutls gettext zlib curl libgcrypt ] ++ optionals stdenv.isDarwin [ libobjc libresolv ] @@ -57,9 +57,9 @@ let NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix}" # Fix '_res_9_init: undefined symbol' error - + (stdenv.lib.optionalString stdenv.isDarwin "-DBIND_8_COMPAT=1 -lresolv"); + + (lib.optionalString stdenv.isDarwin "-DBIND_8_COMPAT=1 -lresolv"); - postInstall = with stdenv.lib; '' + postInstall = with lib; '' for p in ${concatMapStringsSep " " (p: p.name) enabledPlugins}; do from=$out/lib/weechat/plugins/$p.so to=''${!p}/lib/weechat/plugins/$p.so @@ -76,8 +76,8 @@ let (eg. adding python modules for scripts that would require them, etc.) on https://nixos.org/nixpkgs/manual/#sec-weechat . ''; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ lovek323 lheckemann ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ lovek323 lheckemann ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix index b77d9c984de..20aebebf7da 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage -, lib, stdenv +, lib , python , fetchFromGitHub , pyopenssl @@ -70,6 +70,10 @@ in buildPythonPackage { ''; dontPatchShebangs = true; + postFixup = '' + addToSearchPath program_PYTHONPATH $out/${python.sitePackages} + patchPythonScript $out/share/matrix.py + ''; meta = with lib; { description = "A Python plugin for Weechat that lets Weechat communicate over the Matrix protocol"; diff --git a/pkgs/applications/networking/irc/wraith/default.nix b/pkgs/applications/networking/irc/wraith/default.nix index 02bccb67bfe..3b1fa79aa26 100644 --- a/pkgs/applications/networking/irc/wraith/default.nix +++ b/pkgs/applications/networking/irc/wraith/default.nix @@ -1,9 +1,6 @@ -{ stdenv, fetchurl, openssl }: +{ lib, stdenv, fetchurl, openssl }: -with stdenv; -with stdenv.lib; - -mkDerivation rec { +stdenv.mkDerivation rec { pname = "wraith"; version = "1.4.7"; src = fetchurl { @@ -25,7 +22,7 @@ mkDerivation rec { ln -s wraith $out/bin/hub ''; - meta = { + meta = with lib; { description = "An IRC channel management bot written purely in C/C++"; longDescription = '' Wraith is an IRC channel management bot written purely in C/C++. It has diff --git a/pkgs/applications/networking/jmeter/default.nix b/pkgs/applications/networking/jmeter/default.nix index a8f947aebf7..d52d00f9a05 100644 --- a/pkgs/applications/networking/jmeter/default.nix +++ b/pkgs/applications/networking/jmeter/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "jmeter"; - version = "5.1.1"; + version = "5.4.1"; src = fetchurl { url = "https://archive.apache.org/dist/jmeter/binaries/apache-${pname}-${version}.tgz"; - sha256 = "1bmlxnlcias781mwf3wzpd4935awswbq3w8ijck65bsaw07m2kc4"; + sha256 = "sha256-TtrpmIHRzbUEiYesy9ArPzza3qShCNFtB/sVJe9hLPM="; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper jre ]; installPhase = '' mkdir $out @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/jmeter.sh --set JAVA_HOME "${jre}" ''; - doInstallCheck = true; + doInstallCheck = false; #NoClassDefFoundError: org/apache/logging/log4j/Level for tests checkInputs = [ coreutils ]; @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { Applications but has since expanded to other test functions. ''; license = licenses.asl20; - maintainers = [ ]; + maintainers = [ maintainers.bryanasdev000 ]; priority = 1; platforms = platforms.unix; }; diff --git a/pkgs/applications/networking/libcoap/default.nix b/pkgs/applications/networking/libcoap/default.nix index 188d19d5968..643941b5fa8 100644 --- a/pkgs/applications/networking/libcoap/default.nix +++ b/pkgs/applications/networking/libcoap/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, automake, autoconf, which, pkgconfig, libtool, lib, stdenv }: +{ fetchFromGitHub, automake, autoconf, which, pkg-config, libtool, lib, stdenv }: stdenv.mkDerivation rec { pname = "libcoap"; version = "4.2.1"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { autoconf which libtool - pkgconfig + pkg-config ]; preConfigure = "./autogen.sh"; configureFlags = [ diff --git a/pkgs/applications/networking/lieer/default.nix b/pkgs/applications/networking/lieer/default.nix index aee21dca645..3ad2762a2cf 100644 --- a/pkgs/applications/networking/lieer/default.nix +++ b/pkgs/applications/networking/lieer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { pname = "lieer"; diff --git a/pkgs/applications/networking/linssid/default.nix b/pkgs/applications/networking/linssid/default.nix index 91c299d4fda..090f53cffb6 100644 --- a/pkgs/applications/networking/linssid/default.nix +++ b/pkgs/applications/networking/linssid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, qtbase, qtsvg, qmake, pkgconfig, boost, wirelesstools, iw, qwt, wrapQtAppsHook }: +{ lib, stdenv, fetchurl, qtbase, qtsvg, qmake, pkg-config, boost, wirelesstools, iw, qwt, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "linssid"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "13d35rlcjncd8lx3khkgn9x8is2xjd5fp6ns5xsn3w6l4xj9b4gl"; }; - nativeBuildInputs = [ pkgconfig qmake wrapQtAppsHook ]; + nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ]; buildInputs = [ qtbase qtsvg boost qwt ]; patches = [ ./0001-unbundled-qwt.patch ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; qtWrapperArgs = - [ ''--prefix PATH : ${stdenv.lib.makeBinPath [ wirelesstools iw ]}'' ]; + [ ''--prefix PATH : ${lib.makeBinPath [ wirelesstools iw ]}'' ]; meta = with lib; { description = "Graphical wireless scanning for Linux"; diff --git a/pkgs/applications/networking/maestral-qt/default.nix b/pkgs/applications/networking/maestral-qt/default.nix index 41341532637..b568775481c 100644 --- a/pkgs/applications/networking/maestral-qt/default.nix +++ b/pkgs/applications/networking/maestral-qt/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , fetchFromGitHub , python3 , wrapQtAppsHook @@ -24,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { maestral packaging pyqt5 - ] ++ stdenv.lib.optionals (pythonOlder "3.9") [ + ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ]; @@ -35,7 +34,7 @@ python3.pkgs.buildPythonApplication rec { "\${qtWrapperArgs[@]}" # Add the installed directories to the python path so the daemon can find them - "--prefix" "PYTHONPATH" ":" "${stdenv.lib.concatStringsSep ":" (map (p: p + "/lib/${python3.libPrefix}/site-packages") (python3.pkgs.requiredPythonModules python3.pkgs.maestral.propagatedBuildInputs))}" + "--prefix" "PYTHONPATH" ":" "${lib.concatStringsSep ":" (map (p: p + "/lib/${python3.libPrefix}/site-packages") (python3.pkgs.requiredPythonModules python3.pkgs.maestral.propagatedBuildInputs))}" "--prefix" "PYTHONPATH" ":" "${python3.pkgs.maestral}/lib/${python3.libPrefix}/site-packages" ]; diff --git a/pkgs/applications/networking/mailreaders/aerc/default.nix b/pkgs/applications/networking/mailreaders/aerc/default.nix index 1bd8cbeceeb..b43e6bb093c 100644 --- a/pkgs/applications/networking/mailreaders/aerc/default.nix +++ b/pkgs/applications/networking/mailreaders/aerc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchurl +{ lib, buildGoModule, fetchurl , go, ncurses, notmuch, scdoc , python3, perl, w3m, dante , fetchFromGitHub @@ -48,9 +48,9 @@ buildGoModule rec { postFixup = '' wrapProgram $out/bin/aerc --prefix PATH ":" \ - "$out/share/aerc/filters:${stdenv.lib.makeBinPath [ ncurses ]}" + "$out/share/aerc/filters:${lib.makeBinPath [ ncurses ]}" wrapProgram $out/share/aerc/filters/html --prefix PATH ":" \ - ${stdenv.lib.makeBinPath [ w3m dante ]} + ${lib.makeBinPath [ w3m dante ]} ''; meta = with lib; { diff --git a/pkgs/applications/networking/mailreaders/afew/default.nix b/pkgs/applications/networking/mailreaders/afew/default.nix index dbc55850f9f..8a5f607dd32 100644 --- a/pkgs/applications/networking/mailreaders/afew/default.nix +++ b/pkgs/applications/networking/mailreaders/afew/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, notmuch }: +{ lib, python3Packages, notmuch }: python3Packages.buildPythonApplication rec { pname = "afew"; diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix index c49866ed9c6..570b2d13be1 100644 --- a/pkgs/applications/networking/mailreaders/astroid/default.nix +++ b/pkgs/applications/networking/mailreaders/astroid/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, gnome3, gmime3, webkitgtk +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, gnome3, gmime3, webkitgtk, ronn , libsass, notmuch, boost, wrapGAppsHook, glib-networking, protobuf, vim_configurable -, gtkmm3, libpeas, gsettings-desktop-schemas -, python3, python3Packages -, vim ? vim_configurable.override { - features = "normal"; - gui = "auto"; - } -, ronn +, gtkmm3, libpeas, gsettings-desktop-schemas, gobject-introspection, python3 + +# vim to be used, should support the GUI mode. +, vim ? vim_configurable.override { features = "normal"; gui = "auto"; } + +# additional python3 packages to be available within plugins +, extraPythonPackages ? [] }: stdenv.mkDerivation rec { @@ -20,22 +20,30 @@ stdenv.mkDerivation rec { sha256 = "11cxbva9ni98gii59xmbxh4c6idcg3mg0pgdsp1c3j0yg7ix0lj3"; }; - nativeBuildInputs = [ cmake ronn pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ + cmake ronn pkg-config wrapGAppsHook gobject-introspection + python3 python3.pkgs.wrapPython + ]; buildInputs = [ gtkmm3 gmime3 webkitgtk libsass libpeas - python3 python3Packages.pygobject3 + python3 notmuch boost gsettings-desktop-schemas gnome3.adwaita-icon-theme glib-networking protobuf - ] ++ (if vim == null then [] else [ vim ]); + vim + ]; postPatch = '' sed -i "s~gvim ~${vim}/bin/vim -g ~g" src/config.cc sed -i "s~ -geom 10x10~~g" src/config.cc ''; - postInstall = '' - wrapProgram "$out/bin/astroid" --set CHARSET=en_us.UTF-8 + pythonPath = with python3.pkgs; requiredPythonModules [ pygobject3 ] ++ extraPythonPackages; + preFixup = '' + buildPythonPath "$out $pythonPath" + gappsWrapperArgs+=( + --prefix PYTHONPATH : "$program_PYTHONPATH" + ) ''; meta = with lib; { diff --git a/pkgs/applications/networking/mailreaders/balsa/default.nix b/pkgs/applications/networking/mailreaders/balsa/default.nix index 2570e425ae7..2f9832d9193 100644 --- a/pkgs/applications/networking/mailreaders/balsa/default.nix +++ b/pkgs/applications/networking/mailreaders/balsa/default.nix @@ -15,7 +15,7 @@ , libnotify , libsecret , openssl -, pkgconfig +, pkg-config , webkitgtk , wrapGAppsHook }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config intltool gobject-introspection wrapGAppsHook diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index a2a26010e4d..b745a842b9f 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -1,7 +1,7 @@ -{ config, fetchurl, stdenv, wrapGAppsHook, autoreconfHook +{ lib, config, fetchurl, stdenv, wrapGAppsHook, autoreconfHook , curl, dbus, dbus-glib, enchant, gtk2, gnutls, gnupg, gpgme, gumbo , libarchive, libcanberra-gtk2, libetpan, libnotify, libsoup, libxml2, networkmanager -, openldap, perl, pkgconfig, poppler, python, shared-mime-info +, openldap, perl, pkg-config, poppler, python, shared-mime-info , glib-networking, gsettings-desktop-schemas, libSM, libytnef, libical # Build options # TODO: A flag to build the manual. @@ -27,7 +27,7 @@ , enableSpellcheck ? false }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "claws-mail"; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { --subst-var-by MIMEROOTDIR ${shared-mime-info}/share ''; - nativeBuildInputs = [ autoreconfHook pkgconfig wrapGAppsHook python.pkgs.wrapPython ]; + nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook python.pkgs.wrapPython ]; propagatedBuildInputs = with python.pkgs; [ python ] ++ optionals enablePluginPython [ pygtk pygobject2 ]; buildInputs = diff --git a/pkgs/applications/networking/mailreaders/claws-mail/gtk3.nix b/pkgs/applications/networking/mailreaders/claws-mail/gtk3.nix index 2d93ff85b89..d5223092446 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/gtk3.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/gtk3.nix @@ -1,7 +1,7 @@ -{ config, fetchgit, stdenv, wrapGAppsHook, autoreconfHook, bison, flex +{ lib, config, fetchgit, stdenv, wrapGAppsHook, autoreconfHook, bison, flex , curl, dbus, dbus-glib, enchant, gtk3, gnutls, gnupg, gpgme , libarchive, libcanberra-gtk3, libetpan, libnotify, libsoup, libxml2, networkmanager -, openldap, perl, pkgconfig, poppler, python, shared-mime-info, webkitgtk +, openldap, perl, pkg-config, poppler, python, shared-mime-info, webkitgtk , glib-networking, gsettings-desktop-schemas, libSM, libytnef, libical # Build options # TODO: A flag to build the manual. @@ -27,7 +27,7 @@ , enableSpellcheck ? false }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "claws-mail-gtk3"; @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { --subst-var-by MIMEROOTDIR ${shared-mime-info}/share ''; - nativeBuildInputs = [ autoreconfHook bison flex pkgconfig wrapGAppsHook python.pkgs.wrapPython ]; + nativeBuildInputs = [ autoreconfHook bison flex pkg-config wrapGAppsHook python.pkgs.wrapPython ]; propagatedBuildInputs = with python.pkgs; [ python ] ++ optionals enablePluginPython [ pygtk pygobject2 ]; buildInputs = diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix index 65cb888ad6f..3471795b435 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -1,19 +1,19 @@ -{ lib, stdenv, fetchurl, gnome3, cmake, gettext, intltool, pkg-config, evolution-data-server +{ lib, stdenv, fetchurl, gnome3, cmake, gettext, intltool, pkg-config, evolution-data-server, evolution , sqlite, gtk3, webkitgtk, libgdata, libmspack }: stdenv.mkDerivation rec { pname = "evolution-ews"; - version = "3.36.5"; + version = "3.38.3"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0h1wz4hxsasihdvvsaxnmzka4afjw7603gn0qcw8rxpw114ib1bl"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1s2jpviliazmhnpkh8dc57ga3c3612f2rnc0nfya5ndbi6lpzxhi"; }; nativeBuildInputs = [ cmake gettext intltool pkg-config ]; buildInputs = [ - evolution-data-server gnome3.evolution + evolution-data-server evolution sqlite libgdata gtk3 webkitgtk libmspack diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index 9bf15676115..b8aaabca0fb 100644 --- a/pkgs/desktops/gnome-3/apps/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -6,14 +6,12 @@ , libxml2 , webkitgtk , highlight -, pkgconfig +, pkg-config , gtk3 , glib , libnotify , gspell , evolution-data-server -, adwaita-icon-theme -, gnome-desktop , libgdata , libgweather , glib-networking @@ -43,11 +41,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.38.2"; + version = "3.38.3"; src = fetchurl { - url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1whjgfhcxpb5yhhvyqb8pv71vprw6fv02czin4k4z6dxrxsq32qx"; + url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1kfshljvkpbh965rjlyy1qjjm0ic3rdxisyy9c5jjvv2qlk65b3z"; }; nativeBuildInputs = [ @@ -56,12 +54,12 @@ stdenv.mkDerivation rec { itstool libxml2 ninja - pkgconfig + pkg-config wrapGAppsHook ]; buildInputs = [ - adwaita-icon-theme + gnome3.adwaita-icon-theme bogofilter db evolution-data-server @@ -69,7 +67,7 @@ stdenv.mkDerivation rec { gdk-pixbuf glib glib-networking - gnome-desktop + gnome3.gnome-desktop gsettings-desktop-schemas gst_all_1.gst-plugins-base gst_all_1.gstreamer @@ -115,10 +113,13 @@ stdenv.mkDerivation rec { doCheck = true; + patches = [ + ./moduledir_from_env.patch + ]; + passthru = { updateScript = gnome3.updateScript { packageName = "evolution"; - attrPath = "gnome3.evolution"; }; }; diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/moduledir_from_env.patch b/pkgs/applications/networking/mailreaders/evolution/evolution/moduledir_from_env.patch new file mode 100644 index 00000000000..2a5edfb9a5a --- /dev/null +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/moduledir_from_env.patch @@ -0,0 +1,21 @@ +diff --git a/src/shell/main.c b/src/shell/main.c +index 5d089225ca..030908d684 100644 +--- a/src/shell/main.c ++++ b/src/shell/main.c +@@ -407,7 +407,15 @@ create_default_shell (void) + } + + /* Load all shared library modules. */ +- module_types = e_module_load_all_in_directory (EVOLUTION_MODULEDIR); ++ const gchar *modules_directory = EVOLUTION_MODULEDIR; ++ const gchar *modules_directory_env; ++ ++ modules_directory_env = g_getenv ("EVOLUTION_MODULEDIR"); ++ if (modules_directory_env && ++ g_file_test (modules_directory_env, G_FILE_TEST_IS_DIR)) ++ modules_directory = g_strdup (modules_directory_env); ++ ++ module_types = e_module_load_all_in_directory (modules_directory); + g_list_free_full (module_types, (GDestroyNotify) g_type_module_unuse); + + flags = G_APPLICATION_HANDLES_OPEN | diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix new file mode 100644 index 00000000000..050082c6f93 --- /dev/null +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix @@ -0,0 +1,41 @@ +{ lib, makeWrapper, symlinkJoin, gnome3, plugins }: + +symlinkJoin { + name = "evolution-with-plugins"; + paths = [ gnome3.evolution-data-server ] ++ plugins; + + buildInputs = [ makeWrapper ]; + + postBuild = '' + for i in $out/bin/* $out/libexec/**; do + if [ ! -d $i ]; then + echo wrapping $i + wrapProgram $i \ + --set LD_LIBRARY_PATH "$out/lib" \ + --set EDS_ADDRESS_BOOK_MODULES "$out/lib/evolution-data-server/addressbook-backends/" \ + --set EDS_CALENDAR_MODULES "$out/lib/evolution-data-server/calendar-backends/" \ + --set EDS_CAMEL_PROVIDER_DIR "$out/lib/evolution-data-server/camel-providers/" \ + --set EDS_REGISTRY_MODULES "$out/lib/evolution-data-server/registry-modules/" \ + --set EVOLUTION_MODULEDIR "$out/lib/evolution/modules" + fi + done + + fixSymlink () { + local link=$1 + local target=$(readlink $link); + local newtarget=$(sed "s@/nix/store/[^/]*/@$out/@" <<< "$target") + if [[ $target != $newtarget ]] && [[ -d $newtarget ]]; then + echo fixing link to point to $newtarget instead of $target + rm $link + ln -s $newtarget $link + fi + } + + fixSymlink $out/share/dbus-1/service + fixSymlink $out/lib/systemd/user + for i in $out/share/dbus-1/services/*.service $out/lib/systemd/user/*.service; do + echo fixing service file $i to point to $out + sed -i "s@/nix/store/[^/]*/@$out/@" $i + done + ''; +} diff --git a/pkgs/applications/networking/mailreaders/hasmail/default.nix b/pkgs/applications/networking/mailreaders/hasmail/default.nix index a097fd0dd8a..b2ec2a743f3 100644 --- a/pkgs/applications/networking/mailreaders/hasmail/default.nix +++ b/pkgs/applications/networking/mailreaders/hasmail/default.nix @@ -1,7 +1,7 @@ { lib , buildGoModule , fetchFromGitHub -, pkgconfig +, pkg-config , gobject-introspection , pango , cairo @@ -24,7 +24,7 @@ buildGoModule rec { doCheck = false; nativeBuildInputs = [ - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/networking/mailreaders/imapfilter.nix b/pkgs/applications/networking/mailreaders/imapfilter.nix index 8423beec468..bed71202c4f 100644 --- a/pkgs/applications/networking/mailreaders/imapfilter.nix +++ b/pkgs/applications/networking/mailreaders/imapfilter.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, openssl, lua, pcre2 }: +{ lib, stdenv, fetchFromGitHub, openssl, lua, pcre2 }: stdenv.mkDerivation rec { pname = "imapfilter"; @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/lefcha/imapfilter"; description = "Mail filtering utility"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ doronbehar ]; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ doronbehar ]; }; } diff --git a/pkgs/applications/networking/mailreaders/lumail/default.nix b/pkgs/applications/networking/mailreaders/lumail/default.nix index 0929919dcd0..878b778c5a5 100644 --- a/pkgs/applications/networking/mailreaders/lumail/default.nix +++ b/pkgs/applications/networking/mailreaders/lumail/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, lua, file, ncurses, gmime, pcre-cpp +{ lib, stdenv, fetchurl, pkg-config, lua, file, ncurses, gmime, pcre-cpp , perl, perlPackages, makeWrapper , debugBuild ? false , alternativeGlobalConfigFilePath ? null @@ -35,7 +35,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ lua file ncurses gmime pcre-cpp perl perlPackages.JSON perlPackages.NetIMAPClient @@ -52,7 +52,7 @@ stdenv.mkDerivation { sed -e "s|^#\!\(.*/perl.*\)$|#\!\1$perlFlags|" -i perl.d/imap-proxy ''; - buildFlags = stdenv.lib.optional debugBuild "lumail2-debug"; + buildFlags = lib.optional debugBuild "lumail2-debug"; installPhase = '' mkdir -p $out/bin || true diff --git a/pkgs/applications/networking/mailreaders/mailcheck/default.nix b/pkgs/applications/networking/mailreaders/mailcheck/default.nix index 96ce99580fc..d66dcbf47c1 100644 --- a/pkgs/applications/networking/mailreaders/mailcheck/default.nix +++ b/pkgs/applications/networking/mailreaders/mailcheck/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "mailcheck"; @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { meta = { description = "Simple command line tool to check for new messages"; homepage = "http://mailcheck.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ kovirobi ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ kovirobi ]; + platforms = lib.platforms.linux; inherit version; longDescription = '' diff --git a/pkgs/applications/networking/mailreaders/mailnag/goa-plugin.nix b/pkgs/applications/networking/mailreaders/mailnag/goa-plugin.nix index 4f60135cca1..1def97bd62d 100644 --- a/pkgs/applications/networking/mailreaders/mailnag/goa-plugin.nix +++ b/pkgs/applications/networking/mailreaders/mailnag/goa-plugin.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , python3Packages , gobject-introspection diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix index 3cd02e7467c..1d1dc030c31 100644 --- a/pkgs/applications/networking/mailreaders/mailpile/default.nix +++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python2Packages, gnupg1orig, openssl, git }: +{ lib, fetchFromGitHub, python2Packages, gnupg1orig, openssl, git }: python2Packages.buildPythonApplication rec { pname = "mailpile"; @@ -32,7 +32,7 @@ python2Packages.buildPythonApplication rec { postInstall = '' wrapProgram $out/bin/mailpile \ - --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg1orig openssl ]}" \ + --prefix PATH ":" "${lib.makeBinPath [ gnupg1orig openssl ]}" \ --set-default MAILPILE_SHARED "$out/share/mailpile" ''; diff --git a/pkgs/applications/networking/mailreaders/mailspring/default.nix b/pkgs/applications/networking/mailreaders/mailspring/default.nix index f0ab5f148f1..f0f3bdb3ff4 100644 --- a/pkgs/applications/networking/mailreaders/mailspring/default.nix +++ b/pkgs/applications/networking/mailreaders/mailspring/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "mailspring"; - version = "1.7.8"; + version = "1.8.0"; src = fetchurl { url = "https://github.com/Foundry376/Mailspring/releases/download/${version}/mailspring-${version}-amd64.deb"; - sha256 = "207fbf813b6da018a5b848e5dc1194b5996daab39adbd873b2cecb0565c105ce"; + sha256 = "BtzYcHN87qH7s3GiBrsDfmuy9v2xdhCeSShu8+T9T3E="; }; nativeBuildInputs = [ @@ -60,7 +60,6 @@ stdenv.mkDerivation rec { cp -ar ./usr/share $out substituteInPlace $out/share/mailspring/resources/app.asar.unpacked/mailsync \ - --replace realpath ${coreutils}/bin/realpath \ --replace dirname ${coreutils}/bin/dirname ln -s $out/share/mailspring/mailspring $out/bin/mailspring diff --git a/pkgs/applications/networking/mailreaders/meli/default.nix b/pkgs/applications/networking/mailreaders/meli/default.nix index 519448c3ade..ec50e913176 100644 --- a/pkgs/applications/networking/mailreaders/meli/default.nix +++ b/pkgs/applications/networking/mailreaders/meli/default.nix @@ -1,8 +1,7 @@ -{ stdenv -, lib +{ lib , fetchgit , rustPlatform -, pkgconfig +, pkg-config , openssl , dbus , sqlite @@ -28,7 +27,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = lib.optional withNotmuch "--features=notmuch"; - nativeBuildInputs = [ pkgconfig gzip makeWrapper ]; + nativeBuildInputs = [ pkg-config gzip makeWrapper ]; buildInputs = [ openssl dbus sqlite ] ++ lib.optional withNotmuch notmuch; diff --git a/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix b/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix index ea10bf89248..6cd0b3db786 100644 --- a/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix +++ b/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3, notmuch }: +{ lib, python3, notmuch }: python3.pkgs.buildPythonApplication rec { pname = "mlarchive2maildir"; diff --git a/pkgs/applications/networking/mailreaders/msgviewer/default.nix b/pkgs/applications/networking/mailreaders/msgviewer/default.nix index d3bb47a911b..646fa4e2050 100644 --- a/pkgs/applications/networking/mailreaders/msgviewer/default.nix +++ b/pkgs/applications/networking/mailreaders/msgviewer/default.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation { rmdir $dir/${uname} cat <<_EOF > $out/bin/msgviewer #!${runtimeShell} -eu - exec ${stdenv.lib.getBin jre}/bin/java -jar $dir/MSGViewer.jar "\$@" + exec ${lib.getBin jre}/bin/java -jar $dir/MSGViewer.jar "\$@" _EOF chmod 755 $out/bin/msgviewer ''; diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index f7b1b990acb..874fa0d42e5 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, ncurses, which, perl +{ lib, stdenv, fetchurl, fetchpatch, ncurses, which, perl , gdbm ? null , openssl ? null , cyrus_sasl ? null @@ -23,15 +23,15 @@ assert smimeSupport -> openssl != null; assert gpgSupport -> gnupg != null; assert gpgmeSupport -> gpgme != null && openssl != null; -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "mutt"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; - sha256 = "1m4ig69qw4g3lhm4351snmy5i0ch65fqc9vqqdybr6jy21w7w225"; + sha256 = "0k80s27sf7djb7zxj81ihksr8jkr71mfaa8976fzh41i1pn5l7g2"; }; patches = optional smimeSupport (fetchpatch { diff --git a/pkgs/applications/networking/mailreaders/notbit/default.nix b/pkgs/applications/networking/mailreaders/notbit/default.nix index 868037c33c1..5c979bde604 100644 --- a/pkgs/applications/networking/mailreaders/notbit/default.nix +++ b/pkgs/applications/networking/mailreaders/notbit/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gettext, openssl }: -with stdenv.lib; +with lib; stdenv.mkDerivation { pname = "notbit"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { sha256 = "1623n0lvx42mamvb2vwin5i38hh0nxpxzmkr5188ss2x7m20lmii"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ openssl gettext ]; diff --git a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix index fcb92d3fcc1..64ebb78a12d 100644 --- a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, glib, notmuch }: +{ lib, stdenv, fetchFromGitHub, pkg-config, glib, notmuch }: let version = "9"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { sha256 = "1j3zdx161i1x4w0nic14ix5i8hd501rb31daf8api0k8855sx4rc"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib notmuch ]; installPhase = "install -D notmuch-addrlookup $out/bin/notmuch-addrlookup"; diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index a9a82dc67c0..ddffe074706 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -1,5 +1,5 @@ -{ fetchurl, fetchgit, stdenv -, pkgconfig, gnupg +{ fetchurl, fetchgit, lib, stdenv +, pkg-config, gnupg , xapian, gmime, talloc, zlib , doxygen, perl, texinfo , pythonPackages @@ -9,10 +9,10 @@ , withEmacs ? true }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { - version = "0.31"; + version = "0.31.3"; pname = "notmuch"; passthru = { @@ -22,12 +22,12 @@ stdenv.mkDerivation rec { src = fetchgit { url = "https://git.notmuchmail.org/git/notmuch"; - sha256 = "0f9d9k9avb46yh2r8fvijvw7bryqwckvyzc68f9phax2g4c99x4x"; + sha256 = "1wm1myzacz1dcg7vdfd3akia3xan7ssfspf1fflrwm18hdalss5v"; rev = version; }; nativeBuildInputs = [ - pkgconfig + pkg-config doxygen # (optional) api docs pythonPackages.sphinx # (optional) documentation -> doc/INSTALL texinfo # (optional) documentation -> doc/INSTALL @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { makeFlags = [ "V=1" ]; - outputs = [ "out" "man" "info" ] ++ stdenv.lib.optional withEmacs "emacs"; + outputs = [ "out" "man" "info" ] ++ lib.optional withEmacs "emacs"; preCheck = let test-database = fetchurl { @@ -86,9 +86,15 @@ stdenv.mkDerivation rec { gdb man emacs ]; + # Expects there to always be a thread with ID + # thread:0000000000000009, but notmuch new is non-deterministic so + # this isn't always the case. Upstream bug report: + # https://nmbug.notmuchmail.org/nmweb/show/871reno6g7.fsf%40alyssa.is + NOTMUCH_SKIP_TESTS = "lib-thread"; + installTargets = [ "install" "install-man" "install-info" ]; - postInstall = stdenv.lib.optionalString withEmacs '' + postInstall = lib.optionalString withEmacs '' moveToOutput bin/notmuch-emacs-mua $emacs ''; diff --git a/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix b/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix index 953cfed3c66..fc8c83f216c 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl -, notmuch, openssl, pkgconfig, sqlite, xapian, zlib +{ lib, stdenv, fetchurl +, notmuch, openssl, pkg-config, sqlite, xapian, zlib }: stdenv.mkDerivation rec { version = "5"; @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { url = "http://www.muchsync.org/src/${pname}-${version}.tar.gz"; sha256 = "1k2m44pj5i6vfhp9icdqs42chsp208llanc666p3d9nww8ngq2lb"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ notmuch openssl sqlite xapian zlib ]; meta = { description = "Synchronize maildirs and notmuch databases"; homepage = "http://www.muchsync.org/"; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; []; - license = stdenv.lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; []; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix index 8f268e67c30..48a212b4ffb 100644 --- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix +++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, openssl ? null, gpgme ? null +{ lib, stdenv, fetchurl, pkg-config, gtk2, openssl ? null, gpgme ? null , gpgSupport ? true, sslSupport ? true }: assert gpgSupport -> gpgme != null; assert sslSupport -> openssl != null; -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "sylpheed"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "0j9y5vdzch251s264diw9clrn88dn20bqqkwfmis9l7m8vmwasqd"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 ] ++ optionals gpgSupport [ gpgme ] @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ++ optional sslSupport "--enable-ssl"; meta = { - homepage = "http://sylpheed.sraoss.jp/en/"; + homepage = "https://sylpheed.sraoss.jp/en/"; description = "Lightweight and user-friendly e-mail client"; maintainers = with maintainers; [ eelco ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/68.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/68.nix index fafd2c72c88..5e2c74fb3f1 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/68.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/68.nix @@ -60,9 +60,9 @@ let systemLocale = config.i18n.defaultLocale or "en-US"; - defaultSource = stdenv.lib.findFirst (sourceMatches "en-US") {} sources; + defaultSource = lib.findFirst (sourceMatches "en-US") {} sources; - source = stdenv.lib.findFirst (sourceMatches systemLocale) defaultSource sources; + source = lib.findFirst (sourceMatches systemLocale) defaultSource sources; name = "thunderbird-bin-${version}"; in @@ -77,7 +77,7 @@ stdenv.mkDerivation { phases = "unpackPhase installPhase"; - libPath = stdenv.lib.makeLibraryPath + libPath = lib.makeLibraryPath [ stdenv.cc.cc alsaLib at-spi2-atk @@ -112,7 +112,7 @@ stdenv.mkDerivation { nspr nss pango - ] + ":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" [ + ] + ":" + lib.makeSearchPathOutput "lib" "lib64" [ stdenv.cc.cc ]; @@ -177,7 +177,7 @@ stdenv.mkDerivation { free = false; url = "http://www.mozilla.org/en-US/foundation/trademarks/policy/"; }; - maintainers = with stdenv.lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ ]; platforms = platforms.linux; knownVulnerabilities = [ "Support ended around Semptember 2020." ]; }; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index faf4fd7b452..f78c4457b89 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,665 +1,665 @@ { - version = "78.6.1"; + version = "78.7.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/af/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/af/thunderbird-78.7.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "f6fb6e449dbfb7478b5faffa0118845a2e55fb09e27f6b4bc63c4d8abd2f5db5"; + sha256 = "2e5741f536243b84f6014c33b44900a01dcbe8c42e17f3d6acb62a2441708c69"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/ar/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/ar/thunderbird-78.7.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "33f0010135377291851e06fd43fe797fc331d93e018e4410b878ea7056e149b9"; + sha256 = "bb2126528e1aa170fd0b59914fbcb3df3eba57aa83c995284ceadb40b24e65be"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/ast/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/ast/thunderbird-78.7.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "a5b4e9007b68abb9100f757d62ab976a4ecd8e7f389f896411b9957ecc175b62"; + sha256 = "93b59d8d66b2d87076f680fd6e284f7f424a7925d82e3fa6e394388278a89a4a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/be/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/be/thunderbird-78.7.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "ed9846f9e06dcbc60b6dfb08814d19111558f91e96181b73338af8dc30b89ad7"; + sha256 = "92dd5f24667a1886ab321df2148096ab7530c6fb8306d6d21e158c72dbcd8611"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/bg/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/bg/thunderbird-78.7.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "c45a472030b9c42931966a8f90e0d9de9364a4bcca721678090a6702480a1a27"; + sha256 = "03444b4e10bbad0fec4928564d39b30f9e9ff8705adcc20706959eee357ee45c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/br/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/br/thunderbird-78.7.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "37cda6ed4d6296d58b18b8325eeeeccc24088029999c4146ce429ff131eefab0"; + sha256 = "088b6b2456f475c76527122d503f2d91c274e88cafa9a052029f2f4e00a0609d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/ca/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/ca/thunderbird-78.7.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "be91d650c2e8e26afe64373c8ad9213c9b3f903c0037ef9fe215ac4b46b2fe4b"; + sha256 = "4be51f350929a907aa20a036c7ea7232d14874ff29c622cb4a6c917634a79019"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/cak/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/cak/thunderbird-78.7.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "5dab8ad6ab718855237fa5b43ac687e117e7eaeabc1702fe3cfc49af2f62fdf7"; + sha256 = "f50880a17573b1eb2bee79c2768eb04eaf2b715b7fbeb134e08634dac3ea7e22"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/cs/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/cs/thunderbird-78.7.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "a6c4afa14cefb505aade5a9d8b48a12d9d4f4823c8db7356eb635dc1c492f592"; + sha256 = "e1971a4e5f91a7d6de06fd2121e7cc0169d5c8ec04418540a840c887b5c1a560"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/cy/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/cy/thunderbird-78.7.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "f45e222a10bdfe13c51a49e834d10f00320d7cd4093160d7b3616fce01a208ff"; + sha256 = "20f7086783ce5ed7bafa9875555008e62e146b080fe6eb1ad3ddf2e5fee9f0c1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/da/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/da/thunderbird-78.7.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "618d582a161d7ee6e7d304e200486b0af7df6cb1a0d154de9fd5ed208e71ef07"; + sha256 = "8ea77a13dd99252ada9a02115457ffd8a73e7422bd633d1f8dff835fef1daedf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/de/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/de/thunderbird-78.7.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "79f86cc42efb58ba5b1da6d99c4f17ecbeafe235ed6fe03d772d48e3a4f9f4b1"; + sha256 = "9ba270c4013c0bee106ea45fc46b79f066daa1e1b90a03000ec93a54c80f65b6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/dsb/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/dsb/thunderbird-78.7.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "13a929d9848809c9e44fe6d564fdd796fd3aa87103f6c9cbe5797d73ba4a858a"; + sha256 = "1e4394e4ecd44714abc0756054e751daeee4b2f485bcd3fa2db697dceb756c37"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/el/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/el/thunderbird-78.7.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "fb520853ca5aac6380411e86858f58040369100ef1602452d0b1d12dafa4bd89"; + sha256 = "543d9343785f655caa637a2bdbf56a814b280efe206ef5868c855f2b397e0e88"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/en-CA/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/en-CA/thunderbird-78.7.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "ca00e11b378e00a1c551b45608e8261ca5cef088975925030b1c3294f8cd6935"; + sha256 = "76e414cf62428874d4e9633fa6ae166ea16f6d295a4ddb4240c5f310557ec928"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/en-GB/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/en-GB/thunderbird-78.7.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "fb792943477dfb5210b071832474e27a66290af49ed3204adbaef301bf97b9a8"; + sha256 = "cfbd194b58349fbd5d8dc0ccaeb36ea0fe21b28bf25f176ba8d12bb79ff25501"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/en-US/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/en-US/thunderbird-78.7.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "442cd017c9aa5321b7f59ca165f4a687e3619d2d5fefcb9af3127d2d8d0a69f7"; + sha256 = "2e0501823951e4f5239b4c75a05f1d9d882d600a0080fd5cc7bc792990357b2f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/es-AR/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/es-AR/thunderbird-78.7.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "c3b14e63e75efa1411480a8fb9df4e5f57c733f1782f122514c324d2cb943cbf"; + sha256 = "37c8d43b674558fa7e8bfe9b276762562e9132daf377727ac77cd2869c16a628"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/es-ES/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/es-ES/thunderbird-78.7.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "f0aad6c895034cd01d55a9e17f3ec81912767b46b3d1db65da24884ee2dfe532"; + sha256 = "b79324ecdf228b24c7c51a1dc9129c39518d6a19c7a083364639bab16cc52214"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/et/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/et/thunderbird-78.7.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "07b29082709f888febae991196c05fc3de3b87a5b7371000d002ac59870c7d45"; + sha256 = "35c30673d027bfc465bb1ff9b5fa2f52487472ef870e6a8c08e0ec2d0ceacae2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/eu/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/eu/thunderbird-78.7.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "0b49e505114f24832f337d265a9bf092d25e653790c595c698f3e11a82fd11d3"; + sha256 = "3af23e4364bb5a44f38a8931da270269780c0d8d0a115f77d16a15ff84f4c2bb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/fa/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/fa/thunderbird-78.7.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "b333b2a40b4c57ed00c9833bb32a88a72a4db3e4b376db07b84fc146df9fc6c3"; + sha256 = "596877606b66903812ca456332aeb0c80d365255d99c6adc51d8606a5a80e024"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/fi/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/fi/thunderbird-78.7.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "5e484dc76a50f77fbc24fac3c8d11f2b4501a3488b8dcc7cb5517b263833966c"; + sha256 = "e9fa8440743a8ff0ba6963e1d595e959791ad814bc3c239f63478ef1fe2fe05c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/fr/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/fr/thunderbird-78.7.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "63e95323a8b93831516ce0015a052d316a6d501f6c7a4a0b1bed6dd367367aee"; + sha256 = "5b41d9065654f248b3765c79872d6ab9f4333515f36d6bdd8306e73502100f54"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/fy-NL/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/fy-NL/thunderbird-78.7.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "d05e85a3fa9a212160821bcf26cde73eab17ddd1f879c4e1e5d46d28f27bdf17"; + sha256 = "f607c83d05d40ba9bb596819a86cc1c15fedc55ff47916f83650ef8f6e37251c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/ga-IE/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/ga-IE/thunderbird-78.7.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "475f4176d529afcc25b5480762ac0cfddaf61e0bd95fffc3761c152b10094ba1"; + sha256 = "b1a244481eef2a8a7796fb17ec6283ab44bce5ec04063a8b84a5fffef8ea70d0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/gd/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/gd/thunderbird-78.7.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "13bbd007cab49ab1f37862392e3c02c5418deece6894fb2ddb1f15e9ce811bbf"; + sha256 = "bf30f3825599bc0168fe533a50481f779acd57432188fd0b90c98fa50ad23eb6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/gl/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/gl/thunderbird-78.7.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "8cb71820ff19c7a7c9186aefcd80cf27d0ace5331b320e2e4660d982921b6d96"; + sha256 = "3184484adade8ee8fd57570103fd3dce2f2ac582e9f4fb5bfc884fd3f0fa6630"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/he/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/he/thunderbird-78.7.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "12092b25ae77177bac52dd0555136b041dc409507401566d8f0f0973a59eabce"; + sha256 = "e34713989d1b98d55ea852f23e49353779be449142bdfa5098d68d076d6a9f69"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/hr/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/hr/thunderbird-78.7.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "b9cff4319fb62af844d278c93a649b85c64469aaaf9881a6788aa25498afe5ec"; + sha256 = "a1833d7bbd438319f4dc37378c1dce49243f148db7f58f8063346bf9a5725653"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/hsb/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/hsb/thunderbird-78.7.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "3bb8f6d9989270197e5b99fce18e2558daf19317b47bea50d8a30a7934c68859"; + sha256 = "359117a30c63a85b9d41f0369bb448ba470edd41f705070d9f7b4a805f89cf65"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/hu/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/hu/thunderbird-78.7.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "253c65d5a1a0b8780f8add3fa532d10290d7aa86e99efa8ed1c881f6ff76e4ec"; + sha256 = "4d51554390fdab6caa01993697b1490d69504556207e9202d6e59614256dc941"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/hy-AM/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/hy-AM/thunderbird-78.7.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "8dd61e4cbaddb8f97e466402e474adb6c22f2ac9b3d7ddeac53aecbb21ac1129"; + sha256 = "a838b6bfefa9c2852e4316f3665c37c1fcad8e8400fcf8fff769f1e44b4004eb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/id/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/id/thunderbird-78.7.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "b03444c14c9f73dce2620f1acfa975e165b2ee33d27a8bf359dd3b3a0a22199e"; + sha256 = "b293c67ff239ac6632d9c914ba8c9f6a161c1400bf3dca3295683632d2e4e64b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/is/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/is/thunderbird-78.7.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "4d4e355365b20561b50f72027c160c2d0d3742a09654f6a2b5db80af4aa0b794"; + sha256 = "f5cce0c2dcaef81da19a2eaf3e294e9c72153d25be48d382ecd06aca430c76c8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/it/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/it/thunderbird-78.7.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "1ea72c07428ab4cff56541b6b18e571f1e0f0f22bd161071548d38746eee1015"; + sha256 = "1ab3587a7ba49e479588fba735571f458f378f4845a686a22bcd6e2483bbc3d7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/ja/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/ja/thunderbird-78.7.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "1983ca2ffd9a2c53a8ac46ee36757375f53d2f6c2ac519ce7fde004e11a6f48f"; + sha256 = "9ce1c13c539e3e11203ad35ef1f70e71204ceaf548279ac1dd8f39ee07f92013"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/ka/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/ka/thunderbird-78.7.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "339b7be89dfda68efb30c6f72036f94fbaba9b230977b27506edf9f1e70b572f"; + sha256 = "5174664bb0cd1dcbdc845664ba41c89ea0ae3bbd4c755219e709f1be76d99ef7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/kab/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/kab/thunderbird-78.7.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "5163897a19f9303a32dc69ad6697b458040ef09eb5b1b954617bd9833d66e491"; + sha256 = "de5fc0cbc657d07138f8ba744903909133fe4cfeb5436c13a5c669573b4b5170"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/kk/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/kk/thunderbird-78.7.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "aa93b34afbe38389722959e5e8bfe788d158b2a186768bcd1a3469c5ab728d88"; + sha256 = "abbb0e5474a369c230a4faf386dbf6d663020ffbaa0bd75e69305e539006d6f4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/ko/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/ko/thunderbird-78.7.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "06fac9843688e278a56d3bd4d650cb9f2a369c09343663cbfd79054c80a24dde"; + sha256 = "7b66371753ced2b07d136c67c3fc91a562a3fcee6b377fe1d35c550126358b91"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/lt/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/lt/thunderbird-78.7.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "6bb215f78165bd0377c983c544a84e4bd41053af475a544e61c78bb2ee0272b6"; + sha256 = "99811e5ecd83d827a3fbbe20666da7ea307e105fdf1090f0f61e3853a51bb53f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/ms/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/ms/thunderbird-78.7.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "59b93cc98131bd462279d36d2449176d1c4f546b4512a7316e88063ffcb1d66a"; + sha256 = "d2c11fb20170d2c9eec6b780532ac9aa4e7d8d705802e2b68a8d7c07d3d1e120"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/nb-NO/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/nb-NO/thunderbird-78.7.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "1d6f1b6d8db512d4ca330e4fd303efd2165cd7dea4055381b85d5c57534ad45c"; + sha256 = "19fb8d0d0f8d80c4ed9c45c861c98c862ae880bcefb365c86fc5bcea1ef19d8c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/nl/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/nl/thunderbird-78.7.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "30693fe9a43221a3afe5755257e0dc0820fdbdb6fc6fcff2ae39475a70a8f9dd"; + sha256 = "42855c4f257cad05b6f9c6c7c48ee9cf02a9159e5dd05619f3af4b473574bd87"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/nn-NO/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/nn-NO/thunderbird-78.7.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "dd27afaba1b3354a8a865e297e107f7717a00f83156c92b22ee18a08d6b2ba2f"; + sha256 = "c16c892b9a515700e328f01f5a92b7c4af199ae29a7c610d4795140c70bb83e5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/pa-IN/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/pa-IN/thunderbird-78.7.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "90ca962ae6585842191bdbb8495b37b10fdd0b477760565369457e1945dcab6d"; + sha256 = "74c8bbf72b304d81d14fe9c1342c7b8bf17eb42dae52bb3b9ee043f0bdec94ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/pl/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/pl/thunderbird-78.7.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "1eb445495e9ff8b4f18eea7ce86655a6470b1d33b524c7eeb8938ecf030f1f20"; + sha256 = "cadf3756acf8cbae0c2778edda4656589eb3d339a80736a9223c6add5c6fa99c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/pt-BR/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/pt-BR/thunderbird-78.7.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "2b45cf19695837209ddb6e079a1c05d449962dee94afd5bfb62ba22124b6eaf9"; + sha256 = "1fe1f6edbd9d38a9db30720413c48ef91e4be77b1c218fddcb3db1fb98017971"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/pt-PT/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/pt-PT/thunderbird-78.7.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "bf4d215bc674ffdc43f80a63f8a19e675209254e08e843b7ef447e488ce416ae"; + sha256 = "ae5be903d29582feab6402b12034a01bbf338602a8739a1cad9d5d9806e4ed1c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/rm/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/rm/thunderbird-78.7.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "aa9ac4a13278437b400035205baf92556e09d3a333a8ce9a3c3df7b241851717"; + sha256 = "cfc9dba2b3977ac5721559746a1a1e071ff24116db5c52039ce9b40631e43619"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/ro/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/ro/thunderbird-78.7.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "edf568ef69d3b8444469d00d9295e377d4b7e8e1df5257b6a13b83cdc4c18b13"; + sha256 = "97bdb9a195a3b8a74d82dd373cd5b25ffb1d61178a9f2b0a3610341e9a207158"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/ru/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/ru/thunderbird-78.7.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "22b27fbf138272264ee643fd6b55eb803fcce68682150daedde303ea6d297062"; + sha256 = "c16b656259451be87d5e86795bf2ee14322743046a0b6f3542369337494abc90"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/si/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/si/thunderbird-78.7.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "477906e0205fd6961a0b2ab2bff27577cc02ee3bf90c66329221b666cd726ba2"; + sha256 = "34596141553b28a72b743cc7f80edb06549a71816f8caa4c7f9b20148a523fcc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/sk/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/sk/thunderbird-78.7.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "df25d31d5fc75ffb4e961f8cdbde64183cc507efb2833e58f13ea9e3b849105d"; + sha256 = "71ec684701c5d42521e5e1f39601f0cbf8b9c082555dd593695288f327c1a44e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/sl/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/sl/thunderbird-78.7.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "4a2e66d474f2a8fee6e7a7158145c9474f9f03173e9b3e0c78f906ba612af99d"; + sha256 = "9c4de92259c02966d8970fa7792d6a1d279d2021ecf78e4cdb5e992f4eae5e8d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/sq/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/sq/thunderbird-78.7.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "fb602510a4b58e7a4574987638794a423991a147284babd6b40d3a8b4a859b19"; + sha256 = "e05525980dba6605f4e722a42aa074a014c7a5786d261b3fa6f10570cfd952da"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/sr/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/sr/thunderbird-78.7.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "12e203abd18020c9e22eb0142c916d084bc61afe3be55bd0555c1aeb8d11f086"; + sha256 = "e05a147164785faa39ca35728cbc8f5e769267a546bb22cade4411e3cc34cc22"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/sv-SE/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/sv-SE/thunderbird-78.7.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "deef0110e1157c3a7521d1671cb54b8414d09b6cc2898f2bd3ba9f60e184ecd8"; + sha256 = "f1349dce69bc95329b7558cd7b87109ccbf201bb6f42040c1b1a034d48d7d62a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/th/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/th/thunderbird-78.7.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "2c963e0e3804b0e93b6e1c11d09974049f134c36f55f5d57f57449bdc6008326"; + sha256 = "e30b19275cfe460ebdf47c1c9bf8f97342568041ed16e925ddda334532ad1453"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/tr/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/tr/thunderbird-78.7.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "8e4daca1bb4d4f93fa6f834c8d8269b91c0fb07f5310e7bccdae202b868c9758"; + sha256 = "13d3264c891b198e4030334ee771919c8fa45ca4cee4a9c30e6776e258a15ed1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/uk/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/uk/thunderbird-78.7.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "57c1aeaeae081a253557e558c79fd8f85591495a56e9f1bec9153dd51214abf2"; + sha256 = "f3a3c098c71c7632c36da1e1f401db5dcb5fefe8c4658d2e221d429be4d0867d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/uz/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/uz/thunderbird-78.7.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "6fcd73f96acf99decaa639cb0d1adf99d65be2dc75b9ca8ba2d15308ee524990"; + sha256 = "8c4a4e904eb4ddc131dbec594ccc9e4faef209f746d999c08618ad9757ec300b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/vi/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/vi/thunderbird-78.7.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "108b21717a42c94ea38f46186f5ee3d570da56d9bacfb4eca9d9b14779e74237"; + sha256 = "bad2147d54293ce4b245df01d47ab2555811292ec117a1b74e49aece0a5aa625"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/zh-CN/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/zh-CN/thunderbird-78.7.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "09546642bc79c74a965e4700957c295527b7462d64744a651d5575127ce5c944"; + sha256 = "000a1143b3f7c09717610459549305c99cedd4a4fc35d1b0bb276ae72b83c44e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/zh-TW/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/zh-TW/thunderbird-78.7.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "25f082fdf2051ceda74b12f3c6da76a18b66c928e204e9ce5364545540eee2a5"; + sha256 = "bae5923d844f137e38b46519420a6e765fa5457733a60ffa6bda70185993e575"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/af/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/af/thunderbird-78.7.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "cc01b60e44a2449458af74acc1774266e7cb44ed4eadb9cea766195974694676"; + sha256 = "94e7737e9e06d84b336b5f69ff3a69220ff6ef12588857b8b8e4596f5f5ca7f3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/ar/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/ar/thunderbird-78.7.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "a51eca5032e0beb9dd16bb18e1efe3dde8343ad964dabd25457fc5deea61f858"; + sha256 = "2843aa9cbc0f102aae2abb192590445240568e94e35f4ed558fac446895c9daa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/ast/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/ast/thunderbird-78.7.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "b6fed93d30de5635539e2a2f38e78b6e90df82ed79e9e3190f60389b598b928b"; + sha256 = "01130d2e0bba48de5c9cdb3c0c83081e29ce8964218ab1e7f9d03b61facfb513"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/be/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/be/thunderbird-78.7.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "7d8e58062d885a35be4cb5e66ed9e1752ba7d1b21c615f255766cde5d737fedd"; + sha256 = "d8377688f8760afdea0ff93b37267b117090c311e0636aefe1185ab2ed0e0a05"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/bg/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/bg/thunderbird-78.7.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "daa18d443e9772f5d956f2b1aceb2186a20b39f18376d4a0ca021adc2436426e"; + sha256 = "2eca1032ae4bc73967fab319681a5123ae2681a0128de6efd0d7a58aa97986b3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/br/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/br/thunderbird-78.7.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "3d9fb8cb96a670225b30f898b83d7ceebf9a43b639e1e60d38478c2d9e1bb8f3"; + sha256 = "3c5b9e1a96be9f706f458480badcd4efb324d59c2e1227c31720c98eef19dac0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/ca/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/ca/thunderbird-78.7.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "624f313e09d8ec67ec08ee57a4ee78105e05d378c474d1cc005d12061e55f629"; + sha256 = "c31b3d7936726295e2e66a25b554af25fef04d76eeca0f0b2744dc6b38eb25d0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/cak/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/cak/thunderbird-78.7.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "bd483d57306326d61b8bae407a4e4fffca4a6f6a6f57b6ebc4ee9f1b0bd2b38f"; + sha256 = "8abbf5f08d4b9e606090a976bfc9e5cad794259cf2461c2a4edd028c783440e8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/cs/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/cs/thunderbird-78.7.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "0262e549c966460469ac870492587c66114bdb96ef92e48ce50d9f28ba3f3e5c"; + sha256 = "63a6a2e0eab7f7ab0522d36369b4cd696af3b24e9a00977bf3ba1ae440ec077c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/cy/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/cy/thunderbird-78.7.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "3a22886e71d3eb8fa6aa683322db0cf19f14b80b4e97a2226dacfbcce7aa0574"; + sha256 = "5415f68080e95b331146a53d00b312882a8c0b904c91509785bf79139a1accd6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/da/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/da/thunderbird-78.7.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "5c008c00784ac37ecf56fe24f38952b111d531936de00f47034fbc5a46ba2158"; + sha256 = "a43d6445cb39506a898e96432d1730b780bc745344011d230771e4592e34b49d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/de/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/de/thunderbird-78.7.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "f3a1f1bc1b8ec9701050440c9312440a29392118cb680d6485836197c07ba44d"; + sha256 = "b14360cbc698e636b56150bdf3ffd145d3bbb43c9f342eb56d74dca82674c25e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/dsb/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/dsb/thunderbird-78.7.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "fb4df74e6c293123fed6f1b7fc776cb2e1009f8655d27acc9c0cf6d5872190f8"; + sha256 = "dc83ee5540b4254cd01f67f72adad857774f23769748550fcf46e7f066a672a3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/el/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/el/thunderbird-78.7.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "452ecc706867078d54190da0e25d346ee120ea4ebd6be6ac494f67709ffd1975"; + sha256 = "5ca65866f1440ba2161d08005d3229e5f08c9a5696db51f633a8154c93d0ce97"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/en-CA/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/en-CA/thunderbird-78.7.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "941852cf3463df6d80686b1808f341a2e21206dfebcbcfd6bdea25adbae5580c"; + sha256 = "35afceb267f29985ea068afb0358e3e73d120c7f63162ddd22854b1179a2c409"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/en-GB/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/en-GB/thunderbird-78.7.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "83e49ecdebe816c02244d6c5db84ccf9953b2b7349e8e880c3febca7de7ffa09"; + sha256 = "6f2cb3fe2d4223809ec7e842746bb6453ec741df59fcf63898af9e4c579158c9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/en-US/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/en-US/thunderbird-78.7.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "9a93ebefdca24266b55568538d834e139da78f5aea9f3e264c4feb40f8c4f820"; + sha256 = "dc1dae45f45246c95861ef7a50c2acfd7ad343eb0bf39049094dd999e18338ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/es-AR/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/es-AR/thunderbird-78.7.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "88e1c5c7b4bc77005bcb384f578a99288bddd99877a10e95920a994767537f05"; + sha256 = "1d25b980227c60cff9db1c052167c82c06f853b0ebafb5144e53a1be6fbf4b49"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/es-ES/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/es-ES/thunderbird-78.7.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "6ef1618adf242f6f1aad30d4d872f85d0135a3a86e3783b6ff5bd742c06e6806"; + sha256 = "c34971c9a52bb6174254d4bbb67b682e862187b008bd0fa3c07d3d6955da6f6d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/et/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/et/thunderbird-78.7.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "701e0fe34fddbd85369550e3ac6aa099d93aff19207c750b74f0ea36e86857a6"; + sha256 = "da6305745f73ea4469d308c6ada3749b8c09852e57e9af6d00fe470e40092cf2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/eu/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/eu/thunderbird-78.7.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "08904babb0a69cd3bc19575d8e533804525b5786e1aebd3236785e7c574b113e"; + sha256 = "406bb8b9a7c5eace3b84ed29e16dee077ee2e4f1b8ddd49afc9291e368b44ce0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/fa/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/fa/thunderbird-78.7.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "083c128daf6fd05d325282fb7c4648d6cb7c86209a6b940a07f2df730ca25906"; + sha256 = "4756eca3217756d540bf4e904bcda9f7259b65ae2062b493a8f05122a730130c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/fi/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/fi/thunderbird-78.7.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "ffe71bf498ba41b5fc97f67a99e838b4fafbe383333b0dbc4ec306b362529574"; + sha256 = "dbe77298a712a0a64a16fcf618b1e3fb21d1afbea8f7b93a9e6d7e43edbede6a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/fr/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/fr/thunderbird-78.7.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "0160e46be32847dd1c4e597bd1dbd0734aa32a327df93b6d7266879b6c54733e"; + sha256 = "71ce692f4f46e8afe488581670c186c20eccb5bf78306452fd7b82964f6d1087"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/fy-NL/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/fy-NL/thunderbird-78.7.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "e3292054a4c7d10add34480a828f35b09e103277ad754d4e45869c72a662ed5a"; + sha256 = "2f62f25c74e382cec5a9cccc24429cff5a5c36ab3810b5b43f194beb0a5b7a3a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/ga-IE/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/ga-IE/thunderbird-78.7.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "071efc85f1461c2bfee5c77222c117363b0f37714c25c65f0a6d1637df791aa3"; + sha256 = "4da8e456e0e1f115e4018275c041fa345c02b635fd20ec0b3a5b3d1975dde52f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/gd/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/gd/thunderbird-78.7.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "731768809717bb73432deff720252af855e71e7f7743f7316f60fd25f0ce046a"; + sha256 = "8517486ccdf76ac04b8e8c4df11e5bfd79375a8023efb63476232d985b47a8ca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/gl/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/gl/thunderbird-78.7.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "0d7f6686fc184f0c0efe3a44793e511c8e229265bf43aacecf766a7189ba323e"; + sha256 = "928f1721f4ca40f154041bc4ed4aa7b06e3508eba45c7f6ee889fb4e698fb6a6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/he/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/he/thunderbird-78.7.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "dc2dc901c86b5b0af5612e80ea8bb145e33670fbfe338599e3995c43115622a7"; + sha256 = "e49d647ee9d414cfd9dfecc4fdaa7931fd4d4a8ffab3fe9bd820023813d0d7b6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/hr/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/hr/thunderbird-78.7.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "c720e60e7e0c6ea7bde01111a0bee647c05c17f6fd05a7e87d5733a55b4ab7e8"; + sha256 = "8c804b3288036619e0be76d9129102098f5406a00c6586a7edd1e35ac5ffe1ea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/hsb/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/hsb/thunderbird-78.7.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "f96276ffad03bfbe04ea7424e9d2fdbd2f3af89da54f2f48e5a36267f8b6a26d"; + sha256 = "846966d7f8dc6619afa7904debeaf3aeac95d040478fb3e29cae5cb116782d88"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/hu/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/hu/thunderbird-78.7.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "2376d64c5c2ea53ddf07bac4712e8375d91dc92e4c22eb123d6bea4258f5c194"; + sha256 = "a05a7410d0f8ae016d3aa69152a381173c22f3361c7a940a2f7f1684a42ac0d7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/hy-AM/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/hy-AM/thunderbird-78.7.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "31a4d4fe82eb5b1dfc949728c9fc386b7a8f64a3c31428aafb58bd3eb3439253"; + sha256 = "93783417a9c065a4b53566d21bfd34f3a96c9cca7e6cd61c20474c63c28f5f15"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/id/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/id/thunderbird-78.7.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "c47d68876d3dc1789cfe921ba05096e45351c8df9bfcda01f9d5d7b40c484cd2"; + sha256 = "3608569802e13a45feb519239f43bed7ee06f8e3198f188ba8f5c815ca9748bb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/is/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/is/thunderbird-78.7.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "7bf6cf429ffaa4567180c56033666287e10c8a09478a077ba1ddd9b94f13d048"; + sha256 = "afbcee0a5c4926dc7ee089e6e11d83844d068bac2ddb71bf7cf29747dc753420"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/it/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/it/thunderbird-78.7.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "ea1659937f1a9453513c3ce92e36fdf8c194dd1253bc723c4e0e0c2797c97a3f"; + sha256 = "212d0125796a12ccde71939bf1b62b540a630a965f160ebe6199e8b1d3149043"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/ja/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/ja/thunderbird-78.7.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "c6fc0d5fa9d6eefbe8a8d867b96c1f4230ca3a8604c83eb963330212a6c8d633"; + sha256 = "c450ba455b8e8b846a6dfc6a380c672e6ed9d18553c07caae3cd3d24a9d21744"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/ka/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/ka/thunderbird-78.7.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "d05682cfcd90fc8072890e63fe3b9817b57759d0592876b53dbb1a1e9d024fa5"; + sha256 = "349da02164ef984dc22b85b9e4e7a09748cdd1d6325904b32c1e36a8a9f7c4f5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/kab/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/kab/thunderbird-78.7.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "74a8edb8be388cf7a32904a123bd4bf6f98fbea229327eb38843900769dafb2f"; + sha256 = "0f367818d4a7568e57ad9d06c52c55c2feebac351d164c434f86943a420c283b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/kk/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/kk/thunderbird-78.7.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "b4c1c9e4e7107ea47d5a4c271b581afd98be4f04c6fe9d427f30e7bea4d70fbf"; + sha256 = "3274d7e4b787e5ed2f26ce11ff26e261e33a90b60bfef644f017215cbdaefc6e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/ko/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/ko/thunderbird-78.7.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "de1d69f07f087fbbe0b085fbcf57fdf77baea36f09ad95594e9f3eabde835365"; + sha256 = "8aa9eebe4ffeaa3f6d963806a6b5d0d3e6530b08476bf55e9cdc1b25cdc105d5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/lt/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/lt/thunderbird-78.7.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "a2b4dafb34e35da9d7ad939fcd00c1d8730aba99ba71efb1c62dac95cb873209"; + sha256 = "2e811db91100b6e3671693fda6776406477ee3f71f4ae9431eb1b94e1aff4a19"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/ms/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/ms/thunderbird-78.7.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "b8d998101f30ae03a94e6b9c802d41d0c7afe2f837f92be7ffb9ac37998c1ab6"; + sha256 = "950a316e46a5f6bc127715295e00cf9c742d3bd7ef23a489e3fe4131f7394e2e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/nb-NO/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/nb-NO/thunderbird-78.7.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "5b2b419b1a79ff1ac28af11a9649a5f68c0eb06a813687280a8d01edf09db4e6"; + sha256 = "c3bcd1740b5288b9d0f486fc9d2f5936e38e869eab5bf84a92bfc50caa11c5cc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/nl/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/nl/thunderbird-78.7.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "428e422214e706c5cfcbbcf2bf1e9190168d9cbaaf7a9aa94dfbe078ca1fa38c"; + sha256 = "f7eb04082ef4ff38e287016ea3b75e795eb7428c8271ae06a21930031de108bf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/nn-NO/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/nn-NO/thunderbird-78.7.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "0fb80dd45a0f7ddfcfe55d7f99d47279a083a4ca6d813d3791c21c14c759b1fe"; + sha256 = "01adbf1a345fa117ac8cf5ae65f11e5ce14dafe3f06d99fede51abaa4eee3f94"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/pa-IN/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/pa-IN/thunderbird-78.7.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "d4e17383fd04a300b416a291a1b50071284593e635c5c4cb101362dbb1602612"; + sha256 = "3d8b49a32080315c3726fbc77ff2de4eda453e4919b487af99cbc85a9e8b79fa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/pl/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/pl/thunderbird-78.7.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "c76deda25f28bc43489ef5c13c03f95c52c49b7c58311ea173c853ffe6de0a06"; + sha256 = "32429dee14ba7c405ccab71bc3a8ea24cc4a028ea331254c0b4e227c921da58b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/pt-BR/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/pt-BR/thunderbird-78.7.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "e7a29a78acd5a7daf2366f2b79f7a51df37f19687e84213de61af2065a011e8a"; + sha256 = "2709ac332c29c0d2dfb3e76c77e3af58cc27a9d23496fa7432fe043ebd486a35"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/pt-PT/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/pt-PT/thunderbird-78.7.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "23cb3cab0228b1290d9315b2416940293df21a53231726937af133a20a102a7c"; + sha256 = "eca228d5846b51cbbd64888477e7514669dc1714dc07d1aab86e38ab0f7956b5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/rm/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/rm/thunderbird-78.7.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "0c2175e117964deb87949a3047ce72a11ba7781581f6dcd583fecf51680a1573"; + sha256 = "269e7483c5f1a884fd809dc3ccb5c1627573708c558a5f2acdd9ca6b925312b5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/ro/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/ro/thunderbird-78.7.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "3b3395c39fa032ced0af7508c20a24341b1e893b26ac6430dfebd771ed86478b"; + sha256 = "41d769fb26c99e66708c7c8884c822e863d8066b46512ec20b26c760e7c78916"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/ru/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/ru/thunderbird-78.7.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "9933df6138ccf8042e82181e629b97166f7661d26dbeb524d0954ac13c9795be"; + sha256 = "06ed87bfb7830607e87ef5f17f553e34275f3c0a56674f1f07e7e30b43c1f9d0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/si/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/si/thunderbird-78.7.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "b50d48a71acd7c399877c5b6507bd0228c3ca88b3f7ee57748167d579d76c2a1"; + sha256 = "09b96524a7b887ba0cdae931ca368f079d5c3536134f6d9798b0073cfa047332"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/sk/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/sk/thunderbird-78.7.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "9a84aec070338c33eec3e617e19f7452c9436c4671cfca6374b45c4d146b7258"; + sha256 = "a9025df80c0dd8ebe96dec1503d11820ac7c48ea35ef695e883f1e01dbd0b6dd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/sl/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/sl/thunderbird-78.7.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "e8398068668cad4f0a0070d2545523c6d3cce2352e753355e8a195a90b3daaed"; + sha256 = "8db2dceecad941230113b079bd083d0548cafef3bab0b9698260ce3db28453fd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/sq/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/sq/thunderbird-78.7.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "91aa97a9ac1951bd43a46e7c2b36f7d865d307685b20c5dabe48c83714a82bc1"; + sha256 = "365db0f0872959400b5aaae94866f1a49e0b14db2fd55938c0084e983f06f2bc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/sr/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/sr/thunderbird-78.7.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "ef6b30e33e1ad8f771ef4b5a76305369e5cfeed47982a65996c9ceb23409f76a"; + sha256 = "252587e46e7cf1fbd83f9bc9da6b8273985f26d5ede94aab16a2d2ef1d92faa2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/sv-SE/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/sv-SE/thunderbird-78.7.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "48b9733a90ed561d7439369c115d9a2778bfbe83222e786564c98f7c5396de89"; + sha256 = "029d0a70f4c0bf770dc37263639097aed24b6186057cd9d81c50fb4657ce3e04"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/th/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/th/thunderbird-78.7.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "9759c011a43e0622d4a42ac3462039d70eef678f633863ed24f3cb5736b4b8ed"; + sha256 = "24b20e9cd1d9a5b863d4dcfd8d62599b52ba9a64126b6bf584d4ff5c3db524d8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/tr/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/tr/thunderbird-78.7.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "5f9e153ca23c3ff3b9bcae816176cfb4c89845a05481d98b538254603e981896"; + sha256 = "d7d9878fbcf9b552164f588600ac1704a5e295fe73c333f0e838b5d99fbd5deb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/uk/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/uk/thunderbird-78.7.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "cde508d6b9e7590b50902afe6497328cf087cb7519ea4df2de0a5d47ee8e6034"; + sha256 = "3c8eef6d084fec6b0ac57ae6d2fce6dc7e02977ed10c670be30d032e417a50ce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/uz/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/uz/thunderbird-78.7.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "0a533d7788c957aab3615a04eb0bc6db12acf92d4ccdef5d1763f0e8bf4f3dc3"; + sha256 = "545de649b406faa1b942020eb418c4e52054efcc8706a2f4881409d253ed5c4a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/vi/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/vi/thunderbird-78.7.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "4e30ead1cf49a7716c25759fd5e84efe3edc8dd5722367d50417f2b28e3fb376"; + sha256 = "86ae5dbef5ec4cdb0e25ce3cbe78b46ed35349d11038ed12a49dc0440dc7111e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/zh-CN/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/zh-CN/thunderbird-78.7.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "c673aead55f3762b68a9c692d422d61a407bca31cd9dbfbe63d8ec4292c24ed8"; + sha256 = "ce94974470209d9dc81f676f3e74a6359d4e97c7f8801f644c7ea0fe774ad6bc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/zh-TW/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/zh-TW/thunderbird-78.7.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "9c5d7cc03df92efa4be3dfc2f9521f77253fba4abd961a21e4d20ac19495244e"; + sha256 = "f013131307e31eed708f8a75e1313b2f94cd401de06e00053f4155aedca33b13"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/68.nix b/pkgs/applications/networking/mailreaders/thunderbird/68.nix index ec26384261f..f3594d97801 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/68.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/68.nix @@ -37,7 +37,7 @@ , nss , pango , perl -, pkgconfig +, pkg-config , python2 , python3 , runtimeShell @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { nasm nodejs perl - pkgconfig + pkg-config python2 python3 rust-cbindgen diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index ab4078d6a0d..8c7d471776d 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -38,7 +38,7 @@ , nss_3_53 , pango , perl -, pkgconfig +, pkg-config , python2 , python3 , runtimeShell @@ -73,13 +73,13 @@ assert waylandSupport -> gtk3Support == true; stdenv.mkDerivation rec { pname = "thunderbird"; - version = "78.6.1"; + version = "78.7.0"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; sha512 = - "1vzka0msy6gqyxgwyp2dknp6rmgzhcjsyq2hf798wf4wrb7rrrsyrgqrd8skss929wakda0slqng505lhig79za7wyyh531f7i9qbv7"; + "1fwi9dvh9q8pzwri6hyyg89zxkfpw3zin53nkqgvips43yq6jdmyxnz3y9qnk2f50d0lnkx12vvkzgirjhdz23gkf7y860zmwg85vpy"; }; nativeBuildInputs = [ @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { nasm nodejs perl - pkgconfig + pkg-config python2 python3 rust-cbindgen diff --git a/pkgs/applications/networking/mailreaders/trojita/default.nix b/pkgs/applications/networking/mailreaders/trojita/default.nix index 51f6b4e0622..d7c7320b9e4 100644 --- a/pkgs/applications/networking/mailreaders/trojita/default.nix +++ b/pkgs/applications/networking/mailreaders/trojita/default.nix @@ -10,7 +10,7 @@ , libsecret , mimetic , mkDerivation -, pkgconfig +, pkg-config , qgpgme , qtbase , qtkeychain @@ -59,7 +59,7 @@ in mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config qttools gnupg ]; diff --git a/pkgs/applications/networking/mkchromecast/default.nix b/pkgs/applications/networking/mkchromecast/default.nix index b682c9e7351..ec2857753d7 100644 --- a/pkgs/applications/networking/mkchromecast/default.nix +++ b/pkgs/applications/networking/mkchromecast/default.nix @@ -23,7 +23,7 @@ let packages = [ nodejs ffmpeg youtube-dl -] ++ stdenv.lib.optionals stdenv.isLinux [ pulseaudio ]; +] ++ lib.optionals stdenv.isLinux [ pulseaudio ]; in python3Packages.buildPythonApplication rec { @@ -63,13 +63,13 @@ python3Packages.buildPythonApplication rec { makeWrapperArgs = [ "\${qtWrapperArgs[@]}" - "--prefix PATH : ${stdenv.lib.makeBinPath packages}" + "--prefix PATH : ${lib.makeBinPath packages}" ]; postInstall = '' substituteInPlace $out/lib/${python3Packages.python.libPrefix}/site-packages/mkchromecast/video.py \ --replace '/usr/share/mkchromecast/nodejs/' '${placeholder "out"}/share/mkchromecast/nodejs/' - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' install -Dm 755 -t $out/bin bin/audiodevice substituteInPlace $out/lib/${python3Packages.python.libPrefix}/site-packages/mkchromecast/audio_devices.py \ --replace './bin/audiodevice' '${placeholder "out"}/bin/audiodevice' diff --git a/pkgs/applications/networking/modem-manager-gui/default.nix b/pkgs/applications/networking/modem-manager-gui/default.nix index 2b4dabbedc5..da36589aeec 100644 --- a/pkgs/applications/networking/modem-manager-gui/default.nix +++ b/pkgs/applications/networking/modem-manager-gui/default.nix @@ -1,5 +1,5 @@ { lib, stdenv -, pkgconfig +, pkg-config , python3 , fetchFromGitLab , gtk3 @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config python3 perlPackages.Po4a itstool diff --git a/pkgs/applications/networking/mpop/default.nix b/pkgs/applications/networking/mpop/default.nix index e2f1f0e828d..01528df856c 100644 --- a/pkgs/applications/networking/mpop/default.nix +++ b/pkgs/applications/networking/mpop/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, gnutls, gsasl, libidn, Security }: +{ lib, stdenv, fetchurl, pkg-config, gnutls, gsasl, libidn, Security }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "mpop"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1gcxvhin5y0q47svqbf90r5aip0cgywm8sq6m84ygda7km8xylwv"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gnutls gsasl libidn ] ++ optional stdenv.isDarwin Security; diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index 468e65cf4d8..02131b41ea4 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, autoreconfHook, pkgconfig, texinfo +{ stdenv, lib, fetchurl, autoreconfHook, pkg-config, texinfo , netcat-gnu, gnutls, gsasl, libidn2, Security , withKeyring ? true, libsecret ? null , systemd ? null }: @@ -21,13 +21,13 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ gnutls gsasl libidn2 ] - ++ stdenv.lib.optional stdenv.isDarwin Security - ++ stdenv.lib.optional withKeyring libsecret; + ++ lib.optional stdenv.isDarwin Security + ++ lib.optional withKeyring libsecret; - nativeBuildInputs = [ autoreconfHook pkgconfig texinfo ]; + nativeBuildInputs = [ autoreconfHook pkg-config texinfo ]; configureFlags = - [ "--sysconfdir=/etc" ] ++ stdenv.lib.optional stdenv.isDarwin [ "--with-macosx-keyring" ]; + [ "--sysconfdir=/etc" ] ++ lib.optional stdenv.isDarwin [ "--with-macosx-keyring" ]; postInstall = '' install -d $out/share/doc/${pname}/scripts diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index fd2fb4a8fb7..bde8f7c4fed 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, pkgconfig, qt5 +{ lib, stdenv, fetchurl, fetchFromGitHub, fetchpatch, pkg-config, qt5 , avahi, boost, libopus, libsndfile, protobuf, speex, libcap -, alsaLib, python +, alsaLib, python3 , rnnoise , jackSupport ? false, libjack2 ? null , speechdSupport ? false, speechd ? null @@ -16,7 +16,7 @@ assert pulseSupport -> libpulseaudio != null; assert iceSupport -> zeroc-ice != null; assert grpcSupport -> (grpc != null && c-ares != null && abseil-cpp != null && which != null); -with stdenv.lib; +with lib; let generic = overrides: source: qt5.mkDerivation (source // overrides // { pname = overrides.type; @@ -25,7 +25,7 @@ let patches = (source.patches or []) ++ [ ./fix-rnnoise-argument.patch ]; - nativeBuildInputs = [ pkgconfig python qt5.qmake ] + nativeBuildInputs = [ pkg-config python3 qt5.qmake ] ++ (overrides.nativeBuildInputs or [ ]); buildInputs = [ boost protobuf avahi ] diff --git a/pkgs/applications/networking/mumble/overlay.nix b/pkgs/applications/networking/mumble/overlay.nix index d3af518a3c5..bc960ac12d4 100644 --- a/pkgs/applications/networking/mumble/overlay.nix +++ b/pkgs/applications/networking/mumble/overlay.nix @@ -25,6 +25,6 @@ in stdenv.mkDerivation { ''; meta = { - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/n8n/node-composition.nix b/pkgs/applications/networking/n8n/node-composition.nix index c970861a86f..f6cfb2cd2e4 100644 --- a/pkgs/applications/networking/n8n/node-composition.nix +++ b/pkgs/applications/networking/n8n/node-composition.nix @@ -6,7 +6,7 @@ let nodeEnv = import ./node-env.nix { - inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; + inherit (pkgs) lib stdenv python2 utillinux runCommand writeTextFile; inherit nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; @@ -14,4 +14,4 @@ in import ./node-packages.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} \ No newline at end of file +} diff --git a/pkgs/applications/networking/n8n/node-env.nix b/pkgs/applications/networking/n8n/node-env.nix index e1abf530493..759fa71c5aa 100644 --- a/pkgs/applications/networking/n8n/node-env.nix +++ b/pkgs/applications/networking/n8n/node-env.nix @@ -1,6 +1,6 @@ # This file originates from node2nix -{stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile}: +{lib, stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile}: let python = if nodejs ? python then nodejs.python else python2; @@ -38,8 +38,8 @@ let }; includeDependencies = {dependencies}: - stdenv.lib.optionalString (dependencies != []) - (stdenv.lib.concatMapStrings (dependency: + lib.optionalString (dependencies != []) + (lib.concatMapStrings (dependency: '' # Bundle the dependencies of the package mkdir -p node_modules @@ -100,7 +100,7 @@ let cd "$DIR/${packageName}" ${includeDependencies { inherit dependencies; }} cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} ''; pinpointDependencies = {dependencies, production}: @@ -161,12 +161,12 @@ let '' node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"} - ${stdenv.lib.optionalString (dependencies != []) + ${lib.optionalString (dependencies != []) '' if [ -d node_modules ] then cd node_modules - ${stdenv.lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} + ${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} cd .. fi ''} @@ -183,7 +183,7 @@ let cd "${packageName}" ${pinpointDependencies { inherit dependencies production; }} cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} fi ''; @@ -344,8 +344,8 @@ let cd "${packageName}" runHook preRebuild - ${stdenv.lib.optionalString bypassCache '' - ${stdenv.lib.optionalString reconstructLock '' + ${lib.optionalString bypassCache '' + ${lib.optionalString reconstructLock '' if [ -f package-lock.json ] then echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!" @@ -361,14 +361,14 @@ let node ${addIntegrityFieldsScript} ''} - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild if [ "''${dontNpmInstall-}" != "1" ] then # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. rm -f npm-shrinkwrap.json - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} install fi ''; @@ -396,8 +396,8 @@ let stdenv.mkDerivation ({ name = "node_${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] - ++ stdenv.lib.optional (stdenv.isLinux) utillinux - ++ stdenv.lib.optional (stdenv.isDarwin) libtool + ++ lib.optional (stdenv.isLinux) utillinux + ++ lib.optional (stdenv.isDarwin) libtool ++ buildInputs; inherit nodejs; @@ -470,8 +470,8 @@ let name = "node-dependencies-${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] - ++ stdenv.lib.optional (stdenv.isLinux) utillinux - ++ stdenv.lib.optional (stdenv.isDarwin) libtool + ++ lib.optional (stdenv.isLinux) utillinux + ++ lib.optional (stdenv.isDarwin) libtool ++ buildInputs; inherit dontStrip; # Stripping may fail a build for some package deployments @@ -491,7 +491,7 @@ let # Create fake package.json to make the npm commands work properly cp ${src}/package.json . chmod 644 package.json - ${stdenv.lib.optionalString bypassCache '' + ${lib.optionalString bypassCache '' if [ -f ${src}/package-lock.json ] then cp ${src}/package-lock.json . @@ -500,13 +500,13 @@ let # Go to the parent folder to make sure that all packages are pinpointed cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} # Expose the executables that were installed cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} mv ${packageName} lib ln -s $out/lib/node_modules/.bin $out/bin @@ -516,7 +516,7 @@ let stdenv.mkDerivation { name = "node-shell-${name}-${version}"; - buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ buildInputs; + buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs; buildCommand = '' mkdir -p $out/bin cat > $out/bin/shell <<EOF @@ -529,14 +529,14 @@ let # Provide the dependencies in a development shell through the NODE_PATH environment variable inherit nodeDependencies; - shellHook = stdenv.lib.optionalString (dependencies != []) '' + shellHook = lib.optionalString (dependencies != []) '' export NODE_PATH=${nodeDependencies}/lib/node_modules export PATH="${nodeDependencies}/bin:$PATH" ''; }; in { - buildNodeSourceDist = stdenv.lib.makeOverridable buildNodeSourceDist; - buildNodePackage = stdenv.lib.makeOverridable buildNodePackage; - buildNodeShell = stdenv.lib.makeOverridable buildNodeShell; + buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist; + buildNodePackage = lib.makeOverridable buildNodePackage; + buildNodeShell = lib.makeOverridable buildNodeShell; } diff --git a/pkgs/applications/networking/n8n/node-packages.nix b/pkgs/applications/networking/n8n/node-packages.nix index 7a77dcff11b..09d2fc5ccdf 100644 --- a/pkgs/applications/networking/n8n/node-packages.nix +++ b/pkgs/applications/networking/n8n/node-packages.nix @@ -6926,4 +6926,4 @@ in bypassCache = true; reconstructLock = true; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/networking/netperf/default.nix b/pkgs/applications/networking/netperf/default.nix index 47693cc97f1..fe5588d81f8 100644 --- a/pkgs/applications/networking/netperf/default.nix +++ b/pkgs/applications/networking/netperf/default.nix @@ -1,4 +1,4 @@ -{ libsmbios, stdenv, autoreconfHook, fetchFromGitHub }: +{ libsmbios, lib, stdenv, autoreconfHook, fetchFromGitHub }: stdenv.mkDerivation { pname = "netperf"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "1wbbgdvhadd3qs3afv6i777argdpcyxkwz4yv6aqp223n8ki6dm8"; }; - buildInputs = stdenv.lib.optional (with stdenv.hostPlatform; isx86 && isLinux) libsmbios; + buildInputs = lib.optional (with stdenv.hostPlatform; isx86 && isLinux) libsmbios; nativeBuildInputs = [ autoreconfHook ]; autoreconfPhase = '' autoreconf -i -I src/missing/m4 @@ -24,7 +24,7 @@ stdenv.mkDerivation { homepage = "http://www.netperf.org/netperf/"; license = "Hewlett-Packard BSD-like license"; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.mmlb ]; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.mmlb ]; }; } diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix index ef022306d4b..90bbd31a888 100644 --- a/pkgs/applications/networking/newsreaders/pan/default.nix +++ b/pkgs/applications/networking/newsreaders/pan/default.nix @@ -1,5 +1,5 @@ { spellChecking ? true -, lib, stdenv, fetchurl, pkgconfig, gtk3, gtkspell3 ? null +, lib, stdenv, fetchurl, pkg-config, gtk3, gtkspell3 ? null , gmime2, gettext, intltool, itstool, libxml2, libnotify, gnutls , makeWrapper, gnupg , gnomeSupport ? true, libsecret, gcr @@ -18,18 +18,18 @@ stdenv.mkDerivation { sha256 = "17agd27sn4a7nahvkpg0w39kv74njgdrrygs74bbvpaj8rk2hb55"; }; - nativeBuildInputs = [ pkgconfig gettext intltool itstool libxml2 makeWrapper ]; + nativeBuildInputs = [ pkg-config gettext intltool itstool libxml2 makeWrapper ]; buildInputs = [ gtk3 gmime2 libnotify gnutls ] - ++ stdenv.lib.optional spellChecking gtkspell3 - ++ stdenv.lib.optionals gnomeSupport [ libsecret gcr ]; + ++ lib.optional spellChecking gtkspell3 + ++ lib.optionals gnomeSupport [ libsecret gcr ]; configureFlags = [ "--with-dbus" "--with-gtk3" "--with-gnutls" "--enable-libnotify" - ] ++ stdenv.lib.optional spellChecking "--with-gtkspell" - ++ stdenv.lib.optional gnomeSupport "--enable-gkr"; + ] ++ lib.optional spellChecking "--with-gtkspell" + ++ lib.optional gnomeSupport "--enable-gkr"; postInstall = '' wrapProgram $out/bin/pan --suffix PATH : ${gnupg}/bin diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index bfc928cfbc6..42486458b2c 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -7,7 +7,7 @@ , libsecret , openssl , pcre -, pkgconfig +, pkg-config , qtbase , qtkeychain , qttools @@ -33,7 +33,7 @@ mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config cmake ]; diff --git a/pkgs/applications/networking/nextdns/default.nix b/pkgs/applications/networking/nextdns/default.nix index dfe816fbf93..b65ba8d94cf 100644 --- a/pkgs/applications/networking/nextdns/default.nix +++ b/pkgs/applications/networking/nextdns/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nextdns"; - version = "1.9.4"; + version = "1.10.1"; src = fetchFromGitHub { owner = "nextdns"; repo = "nextdns"; rev = "v${version}"; - sha256 = "0bd3nvisdg64wcy5syb1iyrv3vy4c6j8gy68dbf141hn1qiah1bg"; + sha256 = "sha256-hMI6zq176p7MI4cjMSeQ8T8UvibJW60lzsPmeAOi3ow="; }; - vendorSha256 = "09whpzsn16znyrknfm5zlhla253r69j6d751czza4c83m4r36swj"; + vendorSha256 = "sha256-kmszMqkDMaL+Z6GcZmQyeRShKKS/VGdn9vabYPW/kCc="; doCheck = false; diff --git a/pkgs/applications/networking/ngadmin/default.nix b/pkgs/applications/networking/ngadmin/default.nix new file mode 100644 index 00000000000..8392e058345 --- /dev/null +++ b/pkgs/applications/networking/ngadmin/default.nix @@ -0,0 +1,33 @@ +{ stdenv, lib, fetchFromGitHub, autoreconfHook, readline +, withReadline ? true +, enableEmu ? true +, enableSpy ? true +}: + +stdenv.mkDerivation { + pname = "ngadmin"; + version = "unstable-2020-10-05"; + + src = fetchFromGitHub { + owner = "Alkorin"; + repo = "ngadmin"; + rev = "5bf8650ce6d465b8cb1e570548819f0cefe9a87d"; + sha256 = "15vixhwqcpbjdxlaznans9w63kwl29mdkds6spvbv2i7l33qnhq4"; + }; + + nativeBuildInputs = + [ autoreconfHook ] + ++ lib.optional withReadline readline; + enableParallelBuild = true; + configureFlags = with lib; + optional (!withReadline) "--without-readline" + ++ optional enableEmu "--enable-emu" + ++ optional enableSpy "--enable-spy"; + + meta = with lib; { + description = "Netgear switch (NSDP) administration tool"; + homepage = "https://www.netgeek.ovh/wiki/projets:ngadmin"; + license = licenses.gpl2Only; + maintainers = [ maintainers.astro ]; + }; +} diff --git a/pkgs/applications/networking/nload/default.nix b/pkgs/applications/networking/nload/default.nix index 85a39f7e656..8b97bbf4635 100644 --- a/pkgs/applications/networking/nload/default.nix +++ b/pkgs/applications/networking/nload/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, ncurses }: +{ lib, stdenv, fetchurl, fetchpatch, ncurses }: stdenv.mkDerivation rec { version = "0.7.4"; @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { transfered data and min/max network usage. ''; homepage = "http://www.roland-riegel.de/nload/index.html"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.devhell ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.devhell ]; }; } diff --git a/pkgs/applications/networking/nntp-proxy/default.nix b/pkgs/applications/networking/nntp-proxy/default.nix index 3986f2b67cb..626913cd60a 100644 --- a/pkgs/applications/networking/nntp-proxy/default.nix +++ b/pkgs/applications/networking/nntp-proxy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libconfig, pkgconfig, libevent, openssl }: +{ lib, stdenv, fetchFromGitHub, libconfig, pkg-config, libevent, openssl }: stdenv.mkDerivation { pname = "nntp-proxy"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0jwxh71am83fbnq9mn06jl06rq8qybm506js79xmmc3xbk5pqvy4"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libconfig libevent openssl ]; installFlags = [ "INSTALL_DIR=$(out)/bin/" ]; @@ -26,8 +26,8 @@ stdenv.mkDerivation { meta = { description = "Simple NNTP proxy with SSL support"; homepage = "https://github.com/nieluj/nntp-proxy"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.fadenb ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.fadenb ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/networking/nym/default.nix b/pkgs/applications/networking/nym/default.nix index d85266f68d6..528db85092c 100644 --- a/pkgs/applications/networking/nym/default.nix +++ b/pkgs/applications/networking/nym/default.nix @@ -1,7 +1,7 @@ { lib , rustPlatform , fetchFromGitHub -, pkgconfig +, pkg-config , openssl , libredirect , writeText @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0zr5nzmglmvn6xfqgvipbzy8nw5cl3nf7zjmghkqdwi6zj9p9272"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; diff --git a/pkgs/applications/networking/offrss/default.nix b/pkgs/applications/networking/offrss/default.nix index 19de00d7436..a6816d042e0 100644 --- a/pkgs/applications/networking/offrss/default.nix +++ b/pkgs/applications/networking/offrss/default.nix @@ -9,15 +9,15 @@ stdenv.mkDerivation { ''; buildInputs = [ curl libmrss ] - ++ stdenv.lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) podofo - ++ stdenv.lib.optional (!stdenv.isLinux) libiconv; + ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) podofo + ++ lib.optional (!stdenv.isLinux) libiconv; configurePhase = '' substituteInPlace Makefile \ --replace '$(CC) $(CFLAGS) $(LDFLAGS)' '$(CXX) $(CFLAGS) $(LDFLAGS)' - '' + stdenv.lib.optionalString (!stdenv.isLinux) '' + '' + lib.optionalString (!stdenv.isLinux) '' sed 's/#EXTRA/EXTRA/' -i Makefile - '' + stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' sed 's/^PDF/#PDF/' -i Makefile ''; @@ -31,6 +31,6 @@ stdenv.mkDerivation { description = "Offline RSS/Atom reader"; license = licenses.agpl3Plus; maintainers = with maintainers; [ viric ]; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/openbazaar/client.nix b/pkgs/applications/networking/openbazaar/client.nix index 4352c44f72a..e7a19fa7825 100644 --- a/pkgs/applications/networking/openbazaar/client.nix +++ b/pkgs/applications/networking/openbazaar/client.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "openbazaar-client"; - version = "2.4.9"; + version = "2.4.10"; src = fetchurl { url = "https://github.com/OpenBazaar/openbazaar-desktop/releases/download/v${version}/openbazaar2client_${version}_amd64.deb"; - sha256 = "1l6l72kb5h5f32dl5wqv31sigl3fh2byixv0h0d3icmjf558c39p"; + sha256 = "sha256-X0iTTLOJsZeyVZwNU3y39cFMHnxlnYXmqQERE26CLTY="; }; dontBuild = true; @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { postFixup = '' makeWrapper ${electron}/bin/electron $out/bin/${pname} \ --add-flags $out/share/${pname}/resources/app \ - --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ gcc-unwrapped.lib ]}" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gcc-unwrapped.lib ]}" ''; meta = with lib; { diff --git a/pkgs/applications/networking/openbazaar/default.nix b/pkgs/applications/networking/openbazaar/default.nix index caddae6d775..beb957786ba 100644 --- a/pkgs/applications/networking/openbazaar/default.nix +++ b/pkgs/applications/networking/openbazaar/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { install -D $src $out/bin/openbazaard ''; - postFixup = stdenv.lib.optionalString (!stdenv.isDarwin) '' + postFixup = lib.optionalString (!stdenv.isDarwin) '' patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ $out/bin/openbazaard diff --git a/pkgs/applications/networking/owamp/default.nix b/pkgs/applications/networking/owamp/default.nix index 24369bfc8d5..c357e78ccf2 100644 --- a/pkgs/applications/networking/owamp/default.nix +++ b/pkgs/applications/networking/owamp/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://software.internet2.edu/owamp/"; - description = ''A tool for performing one-way active measurements''; + description = "A tool for performing one-way active measurements"; platforms = platforms.linux; maintainers = [maintainers.teto]; license = licenses.asl20; diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix index c1711497f78..761d0e6b244 100644 --- a/pkgs/applications/networking/owncloud-client/default.nix +++ b/pkgs/applications/networking/owncloud-client/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, mkDerivation, cmake, pkgconfig, qtbase, qtkeychain, sqlite, libsecret }: +{ lib, fetchurl, mkDerivation, cmake, pkg-config, qtbase, qtkeychain, sqlite, libsecret }: mkDerivation rec { pname = "owncloud-client"; @@ -9,7 +9,7 @@ mkDerivation rec { sha256 = "1xcklhvbyg34clm9as2rjnjfwxpwq77lmdxj6qc0w7q43viqvlz3"; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ qtbase qtkeychain sqlite ]; qtWrapperArgs = [ diff --git a/pkgs/applications/networking/p2p/deluge/default.nix b/pkgs/applications/networking/p2p/deluge/default.nix index 068776fe17a..4587da48a4a 100644 --- a/pkgs/applications/networking/p2p/deluge/default.nix +++ b/pkgs/applications/networking/p2p/deluge/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, intltool, libtorrent-rasterbar, pythonPackages +{ lib, fetchurl, intltool, libtorrent-rasterbar, pythonPackages , gtk3, glib, gobject-introspection, librsvg, wrapGAppsHook }: pythonPackages.buildPythonPackage rec { diff --git a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix index 7c5ffabd860..c7a05f37ca8 100644 --- a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix +++ b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, qt4, boost, bzip2, libX11 +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, qt4, boost, bzip2, libX11 , fetchpatch, libiconv, pcre-cpp, libidn, lua5, miniupnpc, aspell, gettext }: stdenv.mkDerivation rec { @@ -12,9 +12,9 @@ stdenv.mkDerivation rec { sha256 = "1mqz0g69njmlghcra3izarjxbxi1jrhiwn4ww94b8jv8xb9cv682"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ qt4 boost bzip2 libX11 pcre-cpp libidn lua5 miniupnpc aspell gettext ] - ++ stdenv.lib.optional stdenv.isDarwin libiconv; + ++ lib.optional stdenv.isDarwin libiconv; patches = [ (fetchpatch { diff --git a/pkgs/applications/networking/p2p/freenet/default.nix b/pkgs/applications/networking/p2p/freenet/default.nix index d50f5a67931..83cc191f1b3 100644 --- a/pkgs/applications/networking/p2p/freenet/default.nix +++ b/pkgs/applications/networking/p2p/freenet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, ant, jdk, bash, coreutils, substituteAll }: +{ lib, stdenv, fetchurl, fetchFromGitHub, ant, jdk, bash, coreutils, substituteAll }: let freenet_ext = fetchurl { @@ -73,8 +73,8 @@ in stdenv.mkDerivation { meta = { description = "Decentralised and censorship-resistant network"; homepage = "https://freenetproject.org/"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; maintainers = [ ]; - platforms = with stdenv.lib.platforms; linux; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix index 3dbbbbe072d..2991550defc 100644 --- a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix +++ b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, jre, makeWrapper }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { version = "6.8.9"; diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index 20fb5d4e79c..b4efd89441e 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, adns, curl, gettext, gmp, gnutls, libextractor , libgcrypt, libgnurl, libidn, libmicrohttpd, libtool, libunistring -, makeWrapper, ncurses, pkgconfig, libxml2, sqlite, zlib +, makeWrapper, ncurses, pkg-config, libxml2, sqlite, zlib , libpulseaudio, libopus, libogg, jansson, libsodium }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig libtool makeWrapper ]; + nativeBuildInputs = [ pkg-config libtool makeWrapper ]; buildInputs = [ adns curl gmp gnutls libextractor libgcrypt libgnurl libidn libmicrohttpd libunistring libxml2 ncurses gettext libsodium diff --git a/pkgs/applications/networking/p2p/mldonkey/default.nix b/pkgs/applications/networking/p2p/mldonkey/default.nix index 786ba434b92..37bc1e372ac 100644 --- a/pkgs/applications/networking/p2p/mldonkey/default.nix +++ b/pkgs/applications/networking/p2p/mldonkey/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocamlPackages, zlib, bzip2, ncurses, file, gd, libpng, libjpeg }: +{ lib, stdenv, fetchurl, ocamlPackages, zlib, bzip2, ncurses, file, gd, libpng, libjpeg }: stdenv.mkDerivation ({ name = "mldonkey-3.1.6"; @@ -8,7 +8,7 @@ stdenv.mkDerivation ({ sha256 = "0g84islkj72ymp0zzppcj9n4r21h0vlghnq87hv2wg580mybadhv"; }; - preConfigure = stdenv.lib.optionalString (ocamlPackages.camlp4 != null) '' + preConfigure = lib.optionalString (ocamlPackages.camlp4 != null) '' substituteInPlace Makefile --replace '+camlp4' \ '${ocamlPackages.camlp4}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib/camlp4' ''; @@ -20,8 +20,8 @@ stdenv.mkDerivation ({ meta = { description = "Client for many p2p networks, with multiple frontends"; homepage = "http://mldonkey.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; }; } // (if !ocamlPackages.ocaml.nativeCompilers then { diff --git a/pkgs/applications/networking/p2p/ncdc/default.nix b/pkgs/applications/networking/p2p/ncdc/default.nix index e479da0f22a..dd7f4a7bb60 100644 --- a/pkgs/applications/networking/p2p/ncdc/default.nix +++ b/pkgs/applications/networking/p2p/ncdc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, ncurses, zlib, bzip2, sqlite, pkgconfig, glib, gnutls }: +{ lib, stdenv, fetchurl, ncurses, zlib, bzip2, sqlite, pkg-config, glib, gnutls }: stdenv.mkDerivation rec { pname = "ncdc"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1bdgqd07f026qk6vpbxqsin536znd33931m3b4z44prlm9wd6pyi"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses zlib bzip2 sqlite glib gnutls ]; meta = with lib; { diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index d83cc6ad184..4c0d391ccaa 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, makeWrapper, pkgconfig +{ mkDerivation, lib, fetchFromGitHub, makeWrapper, pkg-config , boost, libtorrent-rasterbar, qtbase, qttools, qtsvg , debugSupport ? false , guiSupport ? true, dbus ? null # GUI (disable to run headless) @@ -12,17 +12,17 @@ assert trackerSearch -> (python3 != null); with lib; mkDerivation rec { pname = "qbittorrent"; - version = "4.3.1"; + version = "4.3.3"; src = fetchFromGitHub { owner = "qbittorrent"; repo = "qbittorrent"; rev = "release-${version}"; - sha256 = "17ih00q7idrpl3b2vgh4smva6lazs5jw06pblriscn1lrwdvrc38"; + sha256 = "0y8vrvfv8n6zg6pgg5a9hmvxi2z9rrfd9k8zv04nv5js91b99ncq"; }; # NOTE: 2018-05-31: CMake is working but it is not officially supported - nativeBuildInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = [ boost libtorrent-rasterbar qtbase qttools qtsvg ] ++ optional guiSupport dbus # D(esktop)-Bus depends on GUI support diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix index 412016e4877..85a5217ff69 100644 --- a/pkgs/applications/networking/p2p/retroshare/default.nix +++ b/pkgs/applications/networking/p2p/retroshare/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libupnp, gpgme, gnome3, glib, libssh, pkgconfig, protobuf, bzip2 +{ lib, stdenv, fetchFromGitHub, libupnp, gpgme, gnome3, glib, libssh, pkg-config, protobuf, bzip2 , libXScrnSaver, speex, curl, libxml2, libxslt, sqlcipher, libmicrohttpd, opencv, qmake, ffmpeg_3 , qtmultimedia, qtx11extras, qttools }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { libretroshare/src/upnp/UPnPBase.cpp ''; - nativeBuildInputs = [ pkgconfig qmake ]; + nativeBuildInputs = [ pkg-config qmake ]; buildInputs = [ speex libupnp gpgme gnome3.libgnome-keyring glib libssh qtmultimedia qtx11extras qttools protobuf bzip2 libXScrnSaver curl libxml2 libxslt sqlcipher libmicrohttpd opencv ffmpeg_3 diff --git a/pkgs/applications/networking/p2p/stig/default.nix b/pkgs/applications/networking/p2p/stig/default.nix index 08da6cdf6fa..6c09043a65b 100644 --- a/pkgs/applications/networking/p2p/stig/default.nix +++ b/pkgs/applications/networking/p2p/stig/default.nix @@ -54,7 +54,7 @@ python3Packages.buildPythonApplication rec { "--deselect=tests/client_test/ttypes_test.py::TestTimestamp::test_string__month_day_hour_minute_second" # TestScrollBarWithScrollable.test_wrapping_bug fails "--deselect=tests/tui_test/scroll_test.py::TestScrollBarWithScrollable::test_wrapping_bug" - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ "--deselect=tests/client_test/aiotransmission_test/api_torrent_test.py" "--deselect=tests/client_test/aiotransmission_test/rpc_test.py" ]; diff --git a/pkgs/applications/networking/p2p/synapse-bt/default.nix b/pkgs/applications/networking/p2p/synapse-bt/default.nix index ae2c3c2469f..761d18e5fe3 100644 --- a/pkgs/applications/networking/p2p/synapse-bt/default.nix +++ b/pkgs/applications/networking/p2p/synapse-bt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, CoreServices, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, CoreServices, Security }: rustPlatform.buildRustPackage rec { pname = "synapse-bt"; @@ -13,9 +13,9 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0lhhdzq4sadnp2pnbq309d1mb7ggbf24k5ivlchrjhllbim1wmdz"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; + ++ lib.optionals stdenv.isDarwin [ CoreServices Security ]; cargoBuildFlags = [ "--all" ]; diff --git a/pkgs/applications/networking/p2p/tixati/default.nix b/pkgs/applications/networking/p2p/tixati/default.nix index 7152570b6ac..3ceeb4b002e 100644 --- a/pkgs/applications/networking/p2p/tixati/default.nix +++ b/pkgs/applications/networking/p2p/tixati/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { installPhase = '' patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath [ glib zlib dbus dbus-glib gtk2 gdk-pixbuf cairo pango ]} \ + --set-rpath ${lib.makeLibraryPath [ glib zlib dbus dbus-glib gtk2 gdk-pixbuf cairo pango ]} \ tixati install -D tixati $out/bin/tixati install -D tixati.desktop $out/share/applications/tixati.desktop diff --git a/pkgs/applications/networking/p2p/torrential/default.nix b/pkgs/applications/networking/p2p/torrential/default.nix index ef2b97563bb..cbeb6afa408 100644 --- a/pkgs/applications/networking/p2p/torrential/default.nix +++ b/pkgs/applications/networking/p2p/torrential/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , nix-update-script , cmake -, pkgconfig +, pkg-config , vala_0_40 , pantheon , curl @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake vala_0_40 # https://github.com/davidmhewitt/torrential/issues/135 - pkgconfig + pkg-config wrapGAppsHook ]; diff --git a/pkgs/applications/networking/p2p/transgui/default.nix b/pkgs/applications/networking/p2p/transgui/default.nix index dbe3bb50e6d..809e4528df9 100644 --- a/pkgs/applications/networking/p2p/transgui/default.nix +++ b/pkgs/applications/networking/p2p/transgui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, makeDesktopItem, unzip, fpc, lazarus, +{ lib, stdenv, fetchFromGitHub, pkg-config, makeDesktopItem, unzip, fpc, lazarus, libX11, glib, gtk2, gdk-pixbuf, pango, atk, cairo, openssl }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1dyx778756zhvz5sxgdvy49p2c0x44w4nmcfd90wqrmgfknncnf5"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ unzip fpc lazarus stdenv.cc libX11 glib gtk2 gdk-pixbuf pango atk cairo openssl @@ -48,11 +48,11 @@ stdenv.mkDerivation rec { comment = meta.description; desktopName = "Transmission Remote GUI"; genericName = "BitTorrent Client"; - categories = stdenv.lib.concatStringsSep ";" [ + categories = lib.concatStringsSep ";" [ "Application" "Network" "FileTransfer" "P2P" "GTK" ]; startupNotify = "true"; - mimeType = stdenv.lib.concatStringsSep ";" [ + mimeType = lib.concatStringsSep ";" [ "application/x-bittorrent" "x-scheme-handler/magnet" ]; }; @@ -69,8 +69,8 @@ stdenv.mkDerivation rec { meta = { description = "A cross platform front-end for the Transmission Bit-Torrent client"; homepage = "https://sourceforge.net/p/transgui"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ ramkromberg ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ ramkromberg ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix index fe93657048a..c89e5397706 100644 --- a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix +++ b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, autoconf, automake, libtool, wrapGAppsHook, fetchFromGitHub, pkgconfig +{ lib, stdenv, autoconf, automake, libtool, wrapGAppsHook, fetchFromGitHub, pkg-config , intltool, gtk3, json-glib, curl, glib, autoconf-archive, appstream-glib, fetchpatch }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs= [ autoconf automake libtool wrapGAppsHook - pkgconfig intltool autoconf-archive + pkg-config intltool autoconf-archive appstream-glib ]; diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index ab4fc0908ba..8cc674b1ea7 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -2,7 +2,7 @@ , lib , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , openssl , curl , libevent @@ -50,7 +50,7 @@ in stdenv.mkDerivation { ]; nativeBuildInputs = [ - pkgconfig + pkg-config cmake ] ++ lib.optionals enableGTK3 [ wrapGAppsHook ] diff --git a/pkgs/applications/networking/p2p/tremc/default.nix b/pkgs/applications/networking/p2p/tremc/default.nix index 4d3b3d3f374..dfbe66ac856 100644 --- a/pkgs/applications/networking/p2p/tremc/default.nix +++ b/pkgs/applications/networking/p2p/tremc/default.nix @@ -5,7 +5,7 @@ , useGeoIP ? false # Require /var/lib/geoip-databases/GeoIP.dat }: let - wrapperPath = with stdenv.lib; makeBinPath ( + wrapperPath = with lib; makeBinPath ( optional x11Support xclip ++ optional stdenv.isDarwin pbcopy ); @@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec { ipy pyperclip ] ++ - stdenv.lib.optional useGeoIP GeoIP; + lib.optional useGeoIP GeoIP; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index 474d6a0c9f1..36b7451e441 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { ]; postPatch = '' - ${stdenv.lib.optionalString enablePlayer '' + ${lib.optionalString enablePlayer '' substituteInPlace "./TriblerGUI/vlc.py" --replace "ctypes.CDLL(p)" "ctypes.CDLL('${libvlc}/lib/libvlc.so')" substituteInPlace "./TriblerGUI/widgets/videoplayerpage.py" \ --replace "if vlc and vlc.plugin_path" "if vlc" \ @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { --set NO_AT_BRIDGE 1 \ --run 'cd $_TRIBLERPATH' \ --add-flags "-O $out/run_tribler.py" \ - ${stdenv.lib.optionalString enablePlayer '' + ${lib.optionalString enablePlayer '' --prefix LD_LIBRARY_PATH : ${libvlc}/lib ''} diff --git a/pkgs/applications/networking/p2p/twister/default.nix b/pkgs/applications/networking/p2p/twister/default.nix index 03cb381f5eb..1d05cafef83 100644 --- a/pkgs/applications/networking/p2p/twister/default.nix +++ b/pkgs/applications/networking/p2p/twister/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, autoconf, automake, libtool, pkgconfig, python2 +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoconf, automake, libtool, pkg-config, python2 , boost, db, openssl, geoip, libiconv, miniupnpc , srcOnly, fetchgit }: @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { "--with-boost-libdir=${boostPython.out}/lib" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoconf automake libtool python2 boostPython db openssl geoip miniupnpc libiconv @@ -61,7 +61,7 @@ in stdenv.mkDerivation rec { meta = { homepage = "http://www.twister.net.co/"; description = "Peer-to-peer microblogging"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mit; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/p2p/zeronet/default.nix b/pkgs/applications/networking/p2p/zeronet/default.nix index 7deddf8578b..4440b24a2b1 100644 --- a/pkgs/applications/networking/p2p/zeronet/default.nix +++ b/pkgs/applications/networking/p2p/zeronet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { pname = "zeronet"; diff --git a/pkgs/applications/networking/ping/default.nix b/pkgs/applications/networking/ping/default.nix index a2d614ff542..40240565973 100644 --- a/pkgs/applications/networking/ping/default.nix +++ b/pkgs/applications/networking/ping/default.nix @@ -4,7 +4,7 @@ , meson , ninja , vala -, pkgconfig +, pkg-config , pantheon , python3 , glib @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meson ninja vala_0_40 - pkgconfig + pkg-config python3 wrapGAppsHook ]; diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index 60b94bbf7f9..dc7b0b0a4c8 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { ]; buildInputs = [ openssl libsamplerate ] - ++ stdenv.lib.optional stdenv.isLinux alsaLib - ++ stdenv.lib.optional stdenv.isDarwin AppKit; + ++ lib.optional stdenv.isLinux alsaLib + ++ lib.optional stdenv.isDarwin AppKit; preConfigure = '' export LD=$CC '' # Fixed on master, remove with 2.11 - + stdenv.lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.isDarwin '' NIX_CFLAGS_COMPILE+=" -framework Security" ''; diff --git a/pkgs/applications/networking/protocol/default.nix b/pkgs/applications/networking/protocol/default.nix index 70723f48646..6690a75485b 100644 --- a/pkgs/applications/networking/protocol/default.nix +++ b/pkgs/applications/networking/protocol/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, fetchFromGitHub }: +{ lib, buildPythonApplication, fetchFromGitHub }: buildPythonApplication { pname = "protocol-unstable"; diff --git a/pkgs/applications/networking/protonvpn-cli/default.nix b/pkgs/applications/networking/protonvpn-cli/default.nix index 1c72d4ef88c..a13f8409686 100644 --- a/pkgs/applications/networking/protonvpn-cli/default.nix +++ b/pkgs/applications/networking/protonvpn-cli/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "protonvpn-linux-cli"; - version = "2.2.4"; + version = "2.2.6"; src = fetchFromGitHub { owner = "protonvpn"; repo = "linux-cli"; rev = "v${version}"; - sha256 = "08yca0a0prrnrc7ir7ajd56yxvxpcs4m1k8f5kf273f5whgr7wzw"; + sha256 = "0y7v9ikrmy5dbjlpbpacp08gy838i8z54m8m4ps7ldk1j6kyia3n"; }; propagatedBuildInputs = (with python3Packages; [ @@ -29,8 +29,8 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Linux command-line client for ProtonVPN"; homepage = "https://github.com/protonvpn/linux-cli"; - maintainers = with maintainers; [ jtcoolen jefflabonte ]; + maintainers = with maintainers; [ jtcoolen jefflabonte shamilton ]; license = licenses.gpl3; - platforms = platforms.unix; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/pyload/default.nix b/pkgs/applications/networking/pyload/default.nix index dcfa88d9d4c..f70359cf7ac 100644 --- a/pkgs/applications/networking/pyload/default.nix +++ b/pkgs/applications/networking/pyload/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pythonPackages, gocr, unrar, rhino, spidermonkey_38 }: +{ lib, fetchFromGitHub, fetchpatch, pythonPackages, gocr, unrar, rhino, spidermonkey_38 }: let beautifulsoup = pythonPackages.callPackage ./beautifulsoup.nix { diff --git a/pkgs/applications/networking/qv2ray/default.nix b/pkgs/applications/networking/qv2ray/default.nix index fa8609ef532..7b97bd8543d 100644 --- a/pkgs/applications/networking/qv2ray/default.nix +++ b/pkgs/applications/networking/qv2ray/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , mkDerivation , fetchFromGitHub , qmake @@ -8,7 +8,7 @@ , grpc , protobuf , openssl -, pkgconfig +, pkg-config , c-ares , abseil-cpp , libGL @@ -51,7 +51,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake clang - pkgconfig + pkg-config qmake qttools ]; diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix index 50516eab2f0..a28c68a6583 100644 --- a/pkgs/applications/networking/remote/anydesk/default.nix +++ b/pkgs/applications/networking/remote/anydesk/default.nix @@ -64,7 +64,7 @@ in stdenv.mkDerivation rec { postFixup = '' patchelf \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - --set-rpath "${stdenv.lib.makeLibraryPath buildInputs}" \ + --set-rpath "${lib.makeLibraryPath buildInputs}" \ $out/bin/anydesk # pangox is not actually necessary (it was only added as a part of gtkglext) @@ -73,7 +73,7 @@ in stdenv.mkDerivation rec { $out/bin/anydesk wrapProgram $out/bin/anydesk \ - --prefix PATH : ${stdenv.lib.makeBinPath [ lsb-release ]} + --prefix PATH : ${lib.makeBinPath [ lsb-release ]} substituteInPlace $out/share/applications/*.desktop \ --subst-var out diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index c0dc438daac..0437a108d89 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, requireFile, makeWrapper, autoPatchelfHook, wrapGAppsHook, which, more +{ lib, stdenv, requireFile, makeWrapper, autoPatchelfHook, wrapGAppsHook, which, more , file, atk, alsaLib, cairo, fontconfig, gdk-pixbuf, glib, gnome3, gtk2-x11, gtk3 , heimdal, krb5, libsoup, libvorbis, speex, openssl, zlib, xorg, pango, gtk2 , gnome2, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2 @@ -11,8 +11,6 @@ }: let - inherit (stdenv) lib; - openssl' = symlinkJoin { name = "openssl-backwards-compat"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index a81356da252..04f2efd5b07 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, alsaLib, ffmpeg, glib, openssl +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, alsaLib, ffmpeg, glib, openssl , pcre, zlib, libX11, libXcursor, libXdamage, libXext, libXi, libXinerama , libXrandr, libXrender, libXv, libXtst, libxkbcommon, libxkbfile, wayland , gstreamer, gst-plugins-base, gst-plugins-good, libunwind, orc, libxslt, cairo @@ -82,7 +82,7 @@ in stdenv.mkDerivation rec { zlib ] ++ optional stdenv.isLinux systemd; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; doCheck = true; diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix index 61e82726f35..e7544258acf 100644 --- a/pkgs/applications/networking/remote/putty/default.nix +++ b/pkgs/applications/networking/remote/putty/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, autoconf, automake, pkgconfig, libtool +{ stdenv, lib, fetchurl, autoconf, automake, pkg-config, libtool , gtk2, halibut, ncurses, perl, darwin }: @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { done '' else null; - nativeBuildInputs = [ autoconf automake halibut libtool perl pkgconfig ]; + nativeBuildInputs = [ autoconf automake halibut libtool perl pkg-config ]; buildInputs = lib.optionals stdenv.hostPlatform.isUnix [ gtk2 ncurses ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.libs.utmp; diff --git a/pkgs/applications/networking/remote/rdesktop/default.nix b/pkgs/applications/networking/remote/rdesktop/default.nix index 4c67105dafc..acf1d7cc2d2 100644 --- a/pkgs/applications/networking/remote/rdesktop/default.nix +++ b/pkgs/applications/networking/remote/rdesktop/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, openssl, libX11, krb5, libXcursor, libtasn1, nettle, gnutls, pkgconfig, autoreconfHook +{lib, stdenv, fetchFromGitHub, openssl, libX11, krb5, libXcursor, libtasn1, nettle, gnutls, pkg-config, autoreconfHook , enableCredssp ? (!stdenv.isDarwin) } : @@ -13,20 +13,20 @@ stdenv.mkDerivation (rec { sha256 = "1s6k1jwd28y38ymk3lfv76ch4arpfwrbdhpkbnwwy3fc4617gb78"; }; - nativeBuildInputs = [pkgconfig autoreconfHook]; + nativeBuildInputs = [pkg-config autoreconfHook]; buildInputs = [openssl libX11 libXcursor libtasn1 nettle gnutls] - ++ stdenv.lib.optional enableCredssp krb5; + ++ lib.optional enableCredssp krb5; configureFlags = [ "--with-ipv6" "--with-openssl=${openssl.dev}" "--disable-smartcard" - ] ++ stdenv.lib.optional (!enableCredssp) "--disable-credssp"; + ] ++ lib.optional (!enableCredssp) "--disable-credssp"; meta = { description = "Open source client for Windows Terminal Services"; homepage = "http://www.rdesktop.org/"; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - license = stdenv.lib.licenses.gpl2; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + license = lib.licenses.gpl2; }; }) diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index feb70741246..02f1e7ed344 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitLab, cmake, ninja, pkgconfig, wrapGAppsHook +{ lib, stdenv, fetchFromGitLab, cmake, ninja, pkg-config, wrapGAppsHook , glib, gtk3, gettext, libxkbfile, libX11 , freerdp, libssh, libgcrypt, gnutls -, pcre, libdbusmenu-gtk3, libappindicator-gtk3 +, pcre2, libdbusmenu-gtk3, libappindicator-gtk3 , libvncserver, libpthreadstubs, libXdmcp, libxkbcommon , libsecret, libsoup, spice-protocol, spice-gtk, epoxy, at-spi2-core , openssl, gsettings-desktop-schemas, json-glib, libsodium, webkitgtk, harfbuzz @@ -9,25 +9,25 @@ , gnome3 }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "remmina"; - version = "1.4.7"; + version = "1.4.10"; src = fetchFromGitLab { owner = "Remmina"; repo = "Remmina"; rev = "v${version}"; - sha256 = "0h09f2amj7ab78fzil2w7cr22d21ad5mp1r2fa70w26g7ra3jzk9"; + sha256 = "sha256-n3YfLKCv6CoBeUIv+1yN6RIih63PTFj5zr+dZDJwYdw="; }; - nativeBuildInputs = [ cmake ninja pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook ]; buildInputs = [ gsettings-desktop-schemas glib gtk3 gettext libxkbfile libX11 freerdp libssh libgcrypt gnutls - pcre libdbusmenu-gtk3 libappindicator-gtk3 + pcre2 libdbusmenu-gtk3 libappindicator-gtk3 libvncserver libpthreadstubs libXdmcp libxkbcommon libsecret libsoup spice-protocol spice-gtk epoxy at-spi2-core openssl gnome3.adwaita-icon-theme json-glib libsodium webkitgtk diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index c556ce35b2d..30bd5346ace 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchurl, autoPatchelfHook, makeWrapper, xdg_utils, dbus +{ mkDerivation, lib, fetchurl, autoPatchelfHook, makeWrapper, xdg-utils, dbus , qtbase, qtwebkit, qtx11extras, qtquickcontrols, glibc , libXrandr, libX11, libXext, libXdamage, libXtst, libSM, libXfixes , wrapQtAppsHook @@ -36,7 +36,7 @@ mkDerivation rec { ln -s $out/share/teamviewer/tv_bin/desktop/com.teamviewer.*.desktop $out/share/applications ln -s /var/lib/teamviewer $out/share/teamviewer/config ln -s /var/log/teamviewer $out/share/teamviewer/logfiles - ln -s ${xdg_utils}/bin $out/share/teamviewer/tv_bin/xdg-utils + ln -s ${xdg-utils}/bin $out/share/teamviewer/tv_bin/xdg-utils for i in 16 20 24 32 48 256; do size=$i"x"$i diff --git a/pkgs/applications/networking/remote/vmware-horizon-client/default.nix b/pkgs/applications/networking/remote/vmware-horizon-client/default.nix index 7d5b965e60f..a9ddf48bae6 100644 --- a/pkgs/applications/networking/remote/vmware-horizon-client/default.nix +++ b/pkgs/applications/networking/remote/vmware-horizon-client/default.nix @@ -1,24 +1,56 @@ -{ lib, stdenv, buildFHSUserEnv, fetchurl, makeWrapper, makeDesktopItem, libxslt, atk -, fontconfig, freetype, gdk-pixbuf, glib, gtk2, libudev0-shim, libxml2 -, pango, pixman, libX11, libXext, libXinerama, libXrandr , libXrender -, libXtst, libXcursor, libXi, libxkbfile , libXScrnSaver, zlib, liberation_ttf -, libtiff, dbus, at-spi2-atk, harfbuzz, gtk3-x11, libuuid, pcsclite +{ stdenv +, lib +, at-spi2-atk +, atk +, buildFHSUserEnv +, dbus +, fetchurl +, fontconfig +, freetype +, gdk-pixbuf +, glib +, gsettings-desktop-schemas +, gtk2 +, gtk3-x11 +, harfbuzz +, liberation_ttf +, libjpeg +, libtiff +, libudev0-shim +, libuuid +, libX11 +, libXcursor +, libXext +, libXi +, libXinerama +, libxkbfile +, libxml2 +, libXrandr +, libXrender +, libXScrnSaver +, libxslt +, libXtst +, makeDesktopItem +, makeWrapper +, pango +, pcsclite +, pixman +, zlib }: - let - version = "2006"; + version = "2012"; sysArch = if stdenv.hostPlatform.system == "x86_64-linux" then "x64" else throw "Unsupported system: ${stdenv.hostPlatform.system}"; - # The downloaded archive also contains i386 and ARM binaries, but these have not been tested. + # The downloaded archive also contains i386 and ARM binaries, but these have not been tested. vmwareHorizonClientFiles = stdenv.mkDerivation { name = "vmwareHorizonClientFiles"; inherit version; src = fetchurl { - url = https://download3.vmware.com/software/view/viewclients/CART21FQ2/vmware-view-client-linux-2006-8.0.0-16522670.tar.gz; - sha256 = "8c46d49fea42f8c1f7cf32a5f038f5a47d2b304743b1e4f4c68c658621b0e79c"; + url = "https://download3.vmware.com/software/view/viewclients/CART21FQ4/VMware-Horizon-Client-Linux-2012-8.1.0-17349998.tar.gz"; + sha256 = "0afda1f3116e75a4e7f89990d8ee60ccea5f3bb8a2360652162fa11c795724ce"; }; buildInputs = [ makeWrapper ]; installPhase = '' @@ -30,12 +62,16 @@ let # when it cannot detect a new enough version already present on the system. # The checks are distribution-specific and do not function correctly on NixOS. # Deleting the bundled library is the simplest way to force it to use our version. - rm -f "$out/lib/vmware/gcc/libstdc++.so.6" + rm "$out/lib/vmware/gcc/libstdc++.so.6" + + # This libjpeg library interferes with Chromium, so we will be using ours instead. + rm $out/lib/vmware/libjpeg.* # Force the default GTK theme (Adwaita) because Horizon is prone to # UI usability issues when using non-default themes, such as Adwaita-dark. makeWrapper "$out/bin/vmware-view" "$out/bin/vmware-view_wrapper" \ --set GTK_THEME Adwaita \ + --suffix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" \ --suffix LD_LIBRARY_PATH : "$out/lib/vmware/view/crtbora:$out/lib/vmware" ''; }; @@ -46,10 +82,37 @@ let runScript = "${vmwareHorizonClientFiles}/bin/vmware-view_wrapper"; targetPkgs = pkgs: [ - pcsclite dbus vmwareHorizonClientFiles atk fontconfig freetype gdk-pixbuf glib gtk2 - libudev0-shim libxml2 pango pixman liberation_ttf libX11 libXext libXinerama - libXrandr libXrender libXtst libXcursor libXi libxkbfile at-spi2-atk libXScrnSaver - zlib libtiff harfbuzz gtk3-x11 libuuid + at-spi2-atk + atk + dbus + fontconfig + freetype + gdk-pixbuf + glib + gtk2 + gtk3-x11 + harfbuzz + liberation_ttf + libjpeg + libtiff + libudev0-shim + libuuid + libX11 + libXcursor + libXext + libXi + libXinerama + libxkbfile + libxml2 + libXrandr + libXrender + libXScrnSaver + libXtst + pango + pcsclite + pixman + vmwareHorizonClientFiles + zlib ]; }; @@ -61,15 +124,22 @@ let mimeType = "x-scheme-handler/vmware-view"; }; -in stdenv.mkDerivation { +in +stdenv.mkDerivation { name = "vmware-view"; + dontUnpack = true; + installPhase = '' mkdir -p $out/bin $out/share/applications cp "${desktopItem}"/share/applications/* $out/share/applications/ ln -s "${vmwareFHSUserEnv}/bin/vmware-view" "$out/bin/" ''; + unwrapped = vmwareHorizonClientFiles; + + passthru.updateScript = ./update.sh; + meta = with lib; { description = "Allows you to connect to your VMware Horizon virtual desktop"; homepage = "https://www.vmware.com/go/viewclients"; diff --git a/pkgs/applications/networking/remote/vmware-horizon-client/update.sh b/pkgs/applications/networking/remote/vmware-horizon-client/update.sh new file mode 100755 index 00000000000..126cb17a7c2 --- /dev/null +++ b/pkgs/applications/networking/remote/vmware-horizon-client/update.sh @@ -0,0 +1,27 @@ +#!/usr/bin/env nix-shell +#!nix-shell -p curl -p jq -p common-updater-scripts -i bash +set -e + +entryPointURL='https://my.vmware.com/channel/public/api/v1.0/products/getRelatedDLGList?locale=en_US&category=desktop_end_user_computing&product=vmware_horizon_clients&version=horizon_8&dlgType=PRODUCT_BINARY' + +function getTarballMetaUrl { + curl "$entryPointURL" | jq -r ' + .dlgEditionsLists | .[] | select(.name | contains("Client for Linux")) | + .dlgList | .[] | select(.name | contains("tarball version")) | + @uri "https://my.vmware.com/channel/public/api/v1.0/dlg/details?locale=en_US&downloadGroup=\(.code)&productId=\(.productId)&rPId=\(.releasePackageId)" + ' +} + +meta="$( curl "$(getTarballMetaUrl)" | jq ".downloadFiles | .[]" )" + +ver="$( echo "$meta" | jq -r .version )" +url="$( echo "$meta" | jq -r .thirdPartyDownloadUrl )" +sum="$( echo "$meta" | jq -r .sha256checksum )" + +echo +echo "version: $ver" +echo "tar url: $url" +echo " sha256: $sum" + +cd "$(dirname "$0")/../../../../.." +update-source-version vmware-horizon-client.unwrapped "$ver" "$sum" "$url" diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix index 6401393acda..4156c82f91b 100644 --- a/pkgs/applications/networking/remote/x2goclient/default.nix +++ b/pkgs/applications/networking/remote/x2goclient/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchgit, cups, libssh, libXpm, nx-libs, openldap, openssh -, mkDerivation, qtbase, qtsvg, qtx11extras, qttools, phonon, pkgconfig }: +{ lib, fetchgit, cups, libssh, libXpm, nx-libs, openldap, openssh +, mkDerivation, qtbase, qtsvg, qtx11extras, qttools, phonon, pkg-config }: mkDerivation { pname = "x2goclient"; @@ -12,7 +12,7 @@ mkDerivation { }; buildInputs = [ cups libssh libXpm nx-libs openldap openssh - qtbase qtsvg qtx11extras qttools phonon pkgconfig ]; + qtbase qtsvg qtx11extras qttools phonon pkg-config ]; postPatch = '' substituteInPlace Makefile \ @@ -28,7 +28,7 @@ mkDerivation { installTargets = [ "install_client" "install_man" ]; - qtWrapperArgs = [ ''--suffix PATH : ${nx-libs}/bin:${openssh}/libexec'' ]; + qtWrapperArgs = [ "--suffix PATH : ${nx-libs}/bin:${openssh}/libexec" ]; meta = with lib; { description = "Graphical NoMachine NX3 remote desktop client"; diff --git a/pkgs/applications/networking/remote/x2goserver/default.nix b/pkgs/applications/networking/remote/x2goserver/default.nix index f30b21464e3..314805a685c 100644 --- a/pkgs/applications/networking/remote/x2goserver/default.nix +++ b/pkgs/applications/networking/remote/x2goserver/default.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Remote desktop application, server component"; homepage = "http://x2go.org/"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; license = licenses.gpl2; maintainers = [ maintainers.averelld ]; }; diff --git a/pkgs/applications/networking/remote/xrdp/default.nix b/pkgs/applications/networking/remote/xrdp/default.nix index faa65379de4..b8677a2683c 100644 --- a/pkgs/applications/networking/remote/xrdp/default.nix +++ b/pkgs/applications/networking/remote/xrdp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, which, perl, autoconf, automake, libtool, openssl, systemd, pam, fuse, libjpeg, libopus, nasm, xorg }: +{ lib, stdenv, fetchFromGitHub, pkg-config, which, perl, autoconf, automake, libtool, openssl, systemd, pam, fuse, libjpeg, libopus, nasm, xorg }: let xorgxrdp = stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ let sha256 = "1bhp5x47hajhinvglmc4vxxnpjvfjm6369njb3ghqfr7c5xypvzr"; }; - nativeBuildInputs = [ pkgconfig autoconf automake which libtool nasm ]; + nativeBuildInputs = [ pkg-config autoconf automake which libtool nasm ]; buildInputs = [ xorg.xorgserver ]; @@ -45,7 +45,7 @@ let sha256 = "0ynj6pml4f38y8571ryhifza57wfqg4frdrjcwzw3fmryiznfm1z"; }; - nativeBuildInputs = [ pkgconfig autoconf automake which libtool nasm ]; + nativeBuildInputs = [ pkg-config autoconf automake which libtool nasm ]; buildInputs = [ openssl systemd pam fuse libjpeg libopus xorg.libX11 xorg.libXfixes xorg.libXrandr ]; diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix index ecdc2160737..fdd4ebdbd92 100644 --- a/pkgs/applications/networking/resilio-sync/default.nix +++ b/pkgs/applications/networking/resilio-sync/default.nix @@ -6,7 +6,7 @@ let i686-linux = "i386"; aarch64-linux = "arm64"; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ]; + libPath = lib.makeLibraryPath [ stdenv.cc.libc ]; in stdenv.mkDerivation rec { pname = "resilio-sync"; diff --git a/pkgs/applications/networking/scaleft/default.nix b/pkgs/applications/networking/scaleft/default.nix index 67fb66feabb..6dca196948d 100644 --- a/pkgs/applications/networking/scaleft/default.nix +++ b/pkgs/applications/networking/scaleft/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ patchelf rpmextract ]; libPath = - stdenv.lib.makeLibraryPath + lib.makeLibraryPath [ stdenv.cc stdenv.cc.cc.lib ]; buildCommand = '' diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index fb0c0a18ac5..3e58e83143f 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools +{ mkDerivation, lib, fetchFromGitHub, pkg-config, cmake, qtbase, qttools , seafile-shared, jansson, libsearpc , withShibboleth ? true, qtwebengine }: @@ -13,7 +13,7 @@ mkDerivation rec { sha256 = "2vV+6ZXjVg81JVLfWeD0UK+RdmpBxBU2Ozx790WFSyw="; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ qtbase qttools seafile-shared jansson libsearpc ] ++ lib.optional withShibboleth qtwebengine; diff --git a/pkgs/applications/networking/shellhub-agent/default.nix b/pkgs/applications/networking/shellhub-agent/default.nix index db9e112a063..7e7206883d9 100644 --- a/pkgs/applications/networking/shellhub-agent/default.nix +++ b/pkgs/applications/networking/shellhub-agent/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildGoModule , fetchFromGitHub , genericUpdater @@ -7,18 +7,18 @@ buildGoModule rec { pname = "shellhub-agent"; - version = "0.4.2"; + version = "0.5.1"; src = fetchFromGitHub { owner = "shellhub-io"; repo = "shellhub"; rev = "v${version}"; - sha256 = "0cd41ing1pcf1bdaaq00w5h7lih5j2kcaa0m41g3ikm3vd1w5qna"; + sha256 = "1vg236vc2v4g47lb68hb1vy3phamhsyb383fdbblh3vc4vf46j8a"; }; modRoot = "./agent"; - vendorSha256 = "19gsfhh6idqysdxhpq45sq35gw19adz9lp83krjlhzj1vqm59qma"; + vendorSha256 = "1l8x9cvisjb8smnsg91v04j1vvawpjzp0lcq0ahw8slz8rfdm80c"; buildFlagsArray = [ "-ldflags=-s -w -X main.AgentVersion=v${version}" ]; diff --git a/pkgs/applications/networking/siproxd/default.nix b/pkgs/applications/networking/siproxd/default.nix index e664ee20c23..2a91eb35d80 100644 --- a/pkgs/applications/networking/siproxd/default.nix +++ b/pkgs/applications/networking/siproxd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libosip }: +{ lib, stdenv, fetchurl, libosip }: stdenv.mkDerivation rec { name = "siproxd-0.8.2"; @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://siproxd.sourceforge.net/"; description = "A masquerading SIP Proxy Server"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; - license = stdenv.lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/networking/sniffers/etherape/default.nix b/pkgs/applications/networking/sniffers/etherape/default.nix index aba93e2d6d0..1e3f2635f47 100644 --- a/pkgs/applications/networking/sniffers/etherape/default.nix +++ b/pkgs/applications/networking/sniffers/etherape/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libtool, gtk3, libpcap, goocanvas2, +{ lib, stdenv, fetchurl, pkg-config, libtool, gtk3, libpcap, goocanvas2, popt, itstool, libxml2 }: stdenv.mkDerivation rec { @@ -8,14 +8,14 @@ stdenv.mkDerivation rec { sha256 = "0w63vg2q6if3wvy2md66in8b6cdw9q40hny5xy6yrxky58l4kmg7"; }; - nativeBuildInputs = [ itstool pkgconfig (stdenv.lib.getBin libxml2) ]; + nativeBuildInputs = [ itstool pkg-config (lib.getBin libxml2) ]; buildInputs = [ libtool gtk3 libpcap goocanvas2 popt ]; meta = with lib; { homepage = "http://etherape.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; platforms = with platforms; linux; maintainers = with maintainers; [ symphorien ]; }; diff --git a/pkgs/applications/networking/sniffers/ettercap/default.nix b/pkgs/applications/networking/sniffers/ettercap/default.nix index d3bfc148c42..a3c79fd9560 100644 --- a/pkgs/applications/networking/sniffers/ettercap/default.nix +++ b/pkgs/applications/networking/sniffers/ettercap/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, libpcap, libnet, zlib, curl, pcre , openssl, ncurses, glib, gtk3, atk, pango, flex, bison, geoip, harfbuzz -, pkgconfig }: +, pkg-config }: stdenv.mkDerivation rec { pname = "ettercap"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; strictDeps = true; - nativeBuildInputs = [ cmake flex bison pkgconfig ]; + nativeBuildInputs = [ cmake flex bison pkg-config ]; buildInputs = [ libpcap libnet zlib curl pcre openssl ncurses glib gtk3 atk pango geoip harfbuzz diff --git a/pkgs/applications/networking/sniffers/kismet/default.nix b/pkgs/applications/networking/sniffers/kismet/default.nix index 56260bd06fa..ad1ee0a0b30 100644 --- a/pkgs/applications/networking/sniffers/kismet/default.nix +++ b/pkgs/applications/networking/sniffers/kismet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libpcap, pcre, libnl, zlib, libmicrohttpd +{ lib, stdenv, fetchurl, pkg-config, libpcap, pcre, libnl, zlib, libmicrohttpd , sqlite, protobuf, protobufc, libusb1, libcap, binutils, elfutils , withNetworkManager ? false, glib, networkmanager , withPython ? false, python3 @@ -17,20 +17,20 @@ stdenv.mkDerivation rec { sha256 = "1n6y6sgqf50bng8n0mhs2r1w0ak14mv654sqay72a78wh2s7ywzg"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libpcap pcre libmicrohttpd libnl zlib sqlite protobuf protobufc libusb1 libcap binutils elfutils - ] ++ stdenv.lib.optionals withNetworkManager [ networkmanager glib ] - ++ stdenv.lib.optional withSensors lm_sensors - ++ stdenv.lib.optional withPython (python3.withPackages(ps: [ ps.setuptools ps.protobuf + ] ++ lib.optionals withNetworkManager [ networkmanager glib ] + ++ lib.optional withSensors lm_sensors + ++ lib.optional withPython (python3.withPackages(ps: [ ps.setuptools ps.protobuf ps.numpy ps.pyserial ])); configureFlags = [] - ++ stdenv.lib.optional (!withNetworkManager) "--disable-libnm" - ++ stdenv.lib.optional (!withPython) "--disable-python-tools" - ++ stdenv.lib.optional (!withSensors) "--disable-lmsensors"; + ++ lib.optional (!withNetworkManager) "--disable-libnm" + ++ lib.optional (!withPython) "--disable-python-tools" + ++ lib.optional (!withSensors) "--disable-lmsensors"; postConfigure = '' sed -e 's/-o $(INSTUSR)//' \ diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 0497472b90e..55789401c14 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares +{ lib, stdenv, fetchurl, pkg-config, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares , gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, python3, libcap, glib , libssh, nghttp2, zlib, cmake, fetchpatch, makeWrapper , withQt ? true, qt5 ? null @@ -7,7 +7,7 @@ assert withQt -> qt5 != null; -with stdenv.lib; +with lib; let version = "3.4.2"; @@ -34,7 +34,7 @@ in stdenv.mkDerivation { NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ]; nativeBuildInputs = [ - bison cmake flex pkgconfig + bison cmake flex pkg-config ] ++ optional withQt qt5.wrapQtAppsHook; buildInputs = [ @@ -47,7 +47,7 @@ in stdenv.mkDerivation { patches = [ ./wireshark-lookup-dumpcap-in-path.patch ] # https://code.wireshark.org/review/#/c/23728/ - ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch { + ++ lib.optional stdenv.hostPlatform.isMusl (fetchpatch { name = "fix-timeout.patch"; url = "https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commitdiff_plain;h=8b5b843fcbc3e03e0fc45f3caf8cf5fc477e8613;hp=94af9724d140fd132896b650d10c4d060788e4f0"; sha256 = "1g2dm7lwsnanwp68b9xr9swspx7hfj4v3z44sz3yrfmynygk8zlv"; diff --git a/pkgs/applications/networking/sniproxy/default.nix b/pkgs/applications/networking/sniproxy/default.nix index f3eae72970f..6652e7c986c 100644 --- a/pkgs/applications/networking/sniproxy/default.nix +++ b/pkgs/applications/networking/sniproxy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, gettext, libev, pcre, pkgconfig, udns }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, gettext, libev, pcre, pkg-config, udns }: stdenv.mkDerivation rec { pname = "sniproxy"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0isgl2lyq8vz5kkxpgyh1sgjlb6sqqybakr64w2mfh29k5ls8xzm"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ gettext libev pcre udns ]; meta = with lib; { diff --git a/pkgs/applications/networking/soulseek/nicotine-plus/default.nix b/pkgs/applications/networking/soulseek/nicotine-plus/default.nix index d673917af31..045120813f0 100644 --- a/pkgs/applications/networking/soulseek/nicotine-plus/default.nix +++ b/pkgs/applications/networking/soulseek/nicotine-plus/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, python27Packages, geoip }: +{ lib, fetchFromGitHub, python27Packages, geoip }: -with stdenv.lib; +with lib; python27Packages.buildPythonApplication { pname = "nicotine-plus"; diff --git a/pkgs/applications/networking/spideroak/default.nix b/pkgs/applications/networking/spideroak/default.nix index 90d8ea55331..edff4c78126 100644 --- a/pkgs/applications/networking/spideroak/default.nix +++ b/pkgs/applications/networking/spideroak/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, patchelf +{ lib, stdenv, fetchurl, makeWrapper, patchelf , fontconfig, freetype, glib, libICE, libSM , libX11, libXext, libXrender, zlib }: @@ -6,7 +6,7 @@ let sha256 = "6d6ca2b383bcc81af1217c696eb77864a2b6db7428f4b5bde5b5913ce705eec5"; - ldpath = stdenv.lib.makeLibraryPath [ + ldpath = lib.makeLibraryPath [ fontconfig freetype glib libICE libSM libX11 libXext libXrender zlib ]; @@ -53,8 +53,8 @@ in stdenv.mkDerivation { meta = { homepage = "https://spideroak.com"; description = "Secure online backup and sychronization"; - license = stdenv.lib.licenses.unfree; - maintainers = with stdenv.lib.maintainers; [ amorsillo ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ amorsillo ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/super-productivity/default.nix b/pkgs/applications/networking/super-productivity/default.nix index 065caa3d77e..38d12710cca 100644 --- a/pkgs/applications/networking/super-productivity/default.nix +++ b/pkgs/applications/networking/super-productivity/default.nix @@ -7,7 +7,7 @@ let version = "1.10.45"; - rpath = stdenv.lib.makeLibraryPath [ + rpath = lib.makeLibraryPath [ alsaLib atk cairo diff --git a/pkgs/applications/networking/sync/acd_cli/default.nix b/pkgs/applications/networking/sync/acd_cli/default.nix index 2f83873fbf8..49fc578377c 100644 --- a/pkgs/applications/networking/sync/acd_cli/default.nix +++ b/pkgs/applications/networking/sync/acd_cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonApplication, fuse +{ lib, fetchFromGitHub, buildPythonApplication, fuse , appdirs, colorama, dateutil, requests, requests_toolbelt , fusepy, sqlalchemy }: diff --git a/pkgs/applications/networking/sync/backintime/common.nix b/pkgs/applications/networking/sync/backintime/common.nix index 73b40ea111a..335ba4a4de1 100644 --- a/pkgs/applications/networking/sync/backintime/common.nix +++ b/pkgs/applications/networking/sync/backintime/common.nix @@ -40,9 +40,9 @@ in stdenv.mkDerivation rec { meta = { homepage = "https://github.com/bit-team/backintime"; description = "Simple backup tool for Linux"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; longDescription = '' Back In Time is a simple backup tool (on top of rsync) for Linux inspired from “flyback project” and “TimeVault”. The backup is diff --git a/pkgs/applications/networking/sync/casync/default.nix b/pkgs/applications/networking/sync/casync/default.nix index 847e5c21da8..0e82aa2dd85 100644 --- a/pkgs/applications/networking/sync/casync/default.nix +++ b/pkgs/applications/networking/sync/casync/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, meson, ninja, pkgconfig, python3, sphinx +, meson, ninja, pkg-config, python3, sphinx , acl, curl, fuse, libselinux, udev, xz, zstd , fuseSupport ? true , selinuxSupport ? true @@ -19,10 +19,10 @@ stdenv.mkDerivation { }; buildInputs = [ acl curl xz zstd ] - ++ stdenv.lib.optionals (fuseSupport) [ fuse ] - ++ stdenv.lib.optionals (selinuxSupport) [ libselinux ] - ++ stdenv.lib.optionals (udevSupport) [ udev ]; - nativeBuildInputs = [ meson ninja pkgconfig python3 sphinx ]; + ++ lib.optionals (fuseSupport) [ fuse ] + ++ lib.optionals (selinuxSupport) [ libselinux ] + ++ lib.optionals (udevSupport) [ udev ]; + nativeBuildInputs = [ meson ninja pkg-config python3 sphinx ]; checkInputs = [ glibcLocales rsync ]; postPatch = '' @@ -33,9 +33,9 @@ stdenv.mkDerivation { ''; PKG_CONFIG_UDEV_UDEVDIR = "lib/udev"; - mesonFlags = stdenv.lib.optionals (!fuseSupport) [ "-Dfuse=false" ] - ++ stdenv.lib.optionals (!udevSupport) [ "-Dudev=false" ] - ++ stdenv.lib.optionals (!selinuxSupport) [ "-Dselinux=false" ]; + mesonFlags = lib.optionals (!fuseSupport) [ "-Dfuse=false" ] + ++ lib.optionals (!udevSupport) [ "-Dudev=false" ] + ++ lib.optionals (!selinuxSupport) [ "-Dselinux=false" ]; doCheck = true; preCheck = '' diff --git a/pkgs/applications/networking/sync/desync/default.nix b/pkgs/applications/networking/sync/desync/default.nix index 689a2b3fdda..bc2776657c2 100644 --- a/pkgs/applications/networking/sync/desync/default.nix +++ b/pkgs/applications/networking/sync/desync/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "desync"; diff --git a/pkgs/applications/networking/sync/lsyncd/default.nix b/pkgs/applications/networking/sync/lsyncd/default.nix index 06371f80ffe..4c95a35ab85 100644 --- a/pkgs/applications/networking/sync/lsyncd/default.nix +++ b/pkgs/applications/networking/sync/lsyncd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, lua, pkgconfig, rsync, +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, lua, pkg-config, rsync, asciidoc, libxml2, docbook_xml_dtd_45, docbook_xsl, libxslt }: stdenv.mkDerivation rec { @@ -25,19 +25,23 @@ stdenv.mkDerivation rec { --replace "/usr/bin/rsync" "${rsync}/bin/rsync" ''; + # Special flags needed on Darwin: + # https://github.com/axkibe/lsyncd/blob/42413cabbedca429d55a5378f6e830f191f3cc86/INSTALL#L51 + cmakeFlags = lib.optional stdenv.isDarwin [ "-DWITH_INOTIFY=OFF" "-DWITH_FSEVENTS=ON" ]; + dontUseCmakeBuildDir = true; buildInputs = [ rsync - cmake lua pkgconfig + cmake lua pkg-config asciidoc libxml2 docbook_xml_dtd_45 docbook_xsl libxslt ]; meta = with lib; { homepage = "https://github.com/axkibe/lsyncd"; description = "A utility that synchronizes local directories with remote targets"; - license = licenses.gpl2; - platforms = platforms.linux; + license = licenses.gpl2Plus; + platforms = platforms.all; maintainers = with maintainers; [ bobvanderlinden ]; }; } diff --git a/pkgs/applications/networking/sync/onedrive/default.nix b/pkgs/applications/networking/sync/onedrive/default.nix index a6175af3511..ec983276de8 100644 --- a/pkgs/applications/networking/sync/onedrive/default.nix +++ b/pkgs/applications/networking/sync/onedrive/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, ldc, installShellFiles, pkgconfig +{ stdenv, lib, fetchFromGitHub, autoreconfHook, ldc, installShellFiles, pkg-config , curl, sqlite, libnotify , withSystemd ? stdenv.isLinux, systemd ? null }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "12g2z6c4f65y8cc7vyhk9nlg1mpbsmlsj7ghlny452qhr13m7qpn"; }; - nativeBuildInputs = [ autoreconfHook ldc installShellFiles pkgconfig ]; + nativeBuildInputs = [ autoreconfHook ldc installShellFiles pkg-config ]; buildInputs = [ curl sqlite libnotify diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index 75c6e877a1f..ef130d00329 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "rclone"; - version = "1.53.3"; + version = "1.53.4"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "10nimrq8nmpmfk2d4fx0yp916wk5q027m283izpshrbwvx7l6xx0"; + sha256 = "1w6dsf8hw0wap4090ixl01p64yn53xidfdbpy6rc3xaifypj185d"; }; vendorSha256 = "1l4iz31k1pylvf0zrp4nhxna70s1ma4981x6q1s3dhszjxil5c88"; @@ -26,7 +26,7 @@ buildGoModule rec { rcloneBin = if stdenv.buildPlatform == stdenv.hostPlatform then "$out" - else stdenv.lib.getBin buildPackages.rclone; + else lib.getBin buildPackages.rclone; in '' installManPage rclone.1 @@ -39,6 +39,7 @@ buildGoModule rec { meta = with lib; { description = "Command line program to sync files and directories to and from major cloud storage"; homepage = "https://rclone.org"; + changelog = "https://github.com/rclone/rclone/blob/v${version}/docs/content/changelog.md"; license = licenses.mit; maintainers = with maintainers; [ danielfullmer marsam ]; }; diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index f8fe9b66696..c50ea08510a 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -24,15 +24,15 @@ stdenv.mkDerivation rec { patchesSrc = base.upstreamPatchTarball; - srcs = [mainSrc] ++ stdenv.lib.optional enableCopyDevicesPatch patchesSrc; - patches = stdenv.lib.optional enableCopyDevicesPatch "./patches/copy-devices.diff"; + srcs = [mainSrc] ++ lib.optional enableCopyDevicesPatch patchesSrc; + patches = lib.optional enableCopyDevicesPatch "./patches/copy-devices.diff"; buildInputs = [libiconv zlib popt] - ++ stdenv.lib.optional enableACLs acl - ++ stdenv.lib.optional enableZstd zstd - ++ stdenv.lib.optional enableLZ4 lz4 - ++ stdenv.lib.optional enableOpenSSL openssl - ++ stdenv.lib.optional enableXXHash xxHash; + ++ lib.optional enableACLs acl + ++ lib.optional enableZstd zstd + ++ lib.optional enableLZ4 lz4 + ++ lib.optional enableOpenSSL openssl + ++ lib.optional enableXXHash xxHash; nativeBuildInputs = [perl]; configureFlags = [ @@ -48,13 +48,13 @@ stdenv.mkDerivation rec { # The following PR should fix the cross-compilation issue. # Test using `nix-build -A pkgsCross.aarch64-multiplatform.rsync`. # https://github.com/WayneD/rsync/commit/b7fab6f285ff0ff3816b109a8c3131b6ded0b484 - ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--enable-simd=no" + ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--enable-simd=no" ; passthru.tests = { inherit (nixosTests) rsyncd; }; meta = base.meta // { description = "A fast incremental file transfer utility"; - maintainers = with stdenv.lib.maintainers; [ peti ehmry kampfschlaefer ]; + maintainers = with lib.maintainers; [ peti ehmry kampfschlaefer ]; }; } diff --git a/pkgs/applications/networking/sync/rsync/rrsync.nix b/pkgs/applications/networking/sync/rsync/rrsync.nix index 2ec940d52a8..5a4c2600569 100644 --- a/pkgs/applications/networking/sync/rsync/rrsync.nix +++ b/pkgs/applications/networking/sync/rsync/rrsync.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation { meta = base.meta // { description = "A helper to run rsync-only environments from ssh-logins"; - maintainers = [ stdenv.lib.maintainers.kampfschlaefer ]; + maintainers = [ lib.maintainers.kampfschlaefer ]; }; } diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix index 36e80350926..86126e86169 100644 --- a/pkgs/applications/networking/sync/unison/default.nix +++ b/pkgs/applications/networking/sync/unison/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, ocamlPackages, fontschumachermisc, xset, makeWrapper, ncurses, gnugrep +{lib, stdenv, fetchFromGitHub, ocamlPackages, fontschumachermisc, xset, makeWrapper, ncurses, gnugrep , enableX11 ? true}: let inherit (ocamlPackages) ocaml lablgtk; in @@ -25,7 +25,7 @@ stdenv.mkDerivation (rec { makeFlags = [ "INSTALLDIR=$(out)/bin/" "UISTYLE=${if enableX11 then "gtk2" else "text"}" - ] ++ stdenv.lib.optional (!ocaml.nativeCompilers) "NATIVE=false"; + ] ++ lib.optional (!ocaml.nativeCompilers) "NATIVE=false"; preInstall = "mkdir -p $out/bin"; @@ -41,9 +41,9 @@ stdenv.mkDerivation (rec { meta = { homepage = "https://www.cis.upenn.edu/~bcpierce/unison/"; description = "Bidirectional file synchronizer"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; unix; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; unix; }; }) diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix index a7f9c5f9f4b..015033d6ca5 100644 --- a/pkgs/applications/networking/syncthing-gtk/default.nix +++ b/pkgs/applications/networking/syncthing-gtk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, libnotify, librsvg, killall +{ lib, fetchFromGitHub, fetchpatch, libnotify, librsvg, killall , gtk3, libappindicator-gtk3, substituteAll, syncthing, wrapGAppsHook , gnome3, buildPythonApplication, dateutil, pyinotify, pygobject3 , bcrypt, gobject-introspection, gsettings-desktop-schemas diff --git a/pkgs/applications/networking/tcpkali/default.nix b/pkgs/applications/networking/tcpkali/default.nix index fae3bde72f0..fa0236dcd8c 100644 --- a/pkgs/applications/networking/tcpkali/default.nix +++ b/pkgs/applications/networking/tcpkali/default.nix @@ -1,4 +1,4 @@ -{stdenv, autoreconfHook, fetchFromGitHub, bison}: +{lib, stdenv, autoreconfHook, fetchFromGitHub, bison}: let version = "1.1.1"; in @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { buildInputs = [ bison]; meta = { description = "High performance TCP and WebSocket load generator and sink"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; inherit (src.meta) homepage; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ ethercrow ]; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ ethercrow ]; }; } diff --git a/pkgs/applications/networking/termius/default.nix b/pkgs/applications/networking/termius/default.nix index ff4a847aefe..b1c9adfd9c1 100644 --- a/pkgs/applications/networking/termius/default.nix +++ b/pkgs/applications/networking/termius/default.nix @@ -66,4 +66,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ Br1ght0ne th0rgal ]; platforms = [ "x86_64-linux" ]; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/networking/twtxt/default.nix b/pkgs/applications/networking/twtxt/default.nix index 98877880255..ff6e61c614f 100644 --- a/pkgs/applications/networking/twtxt/default.nix +++ b/pkgs/applications/networking/twtxt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "twtxt"; diff --git a/pkgs/applications/networking/versus/default.nix b/pkgs/applications/networking/versus/default.nix index 5e1b1e873c9..1e3dd211326 100644 --- a/pkgs/applications/networking/versus/default.nix +++ b/pkgs/applications/networking/versus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "versus"; diff --git a/pkgs/applications/networking/vnstat/default.nix b/pkgs/applications/networking/vnstat/default.nix index 1db69432642..60b24a6619c 100644 --- a/pkgs/applications/networking/vnstat/default.nix +++ b/pkgs/applications/networking/vnstat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gd, ncurses, sqlite, check }: +{ lib, stdenv, fetchurl, pkg-config, gd, ncurses, sqlite, check }: stdenv.mkDerivation rec { pname = "vnstat"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { substituteInPlace src/cfg.c --replace /usr/local $out ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gd ncurses sqlite ]; checkInputs = [ check ]; diff --git a/pkgs/applications/networking/wayback_machine_downloader/gemset.nix b/pkgs/applications/networking/wayback_machine_downloader/gemset.nix index 615570f1f09..1ef3cd36536 100644 --- a/pkgs/applications/networking/wayback_machine_downloader/gemset.nix +++ b/pkgs/applications/networking/wayback_machine_downloader/gemset.nix @@ -9,4 +9,4 @@ }; version = "2.2.1"; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/networking/weather/meteo/default.nix b/pkgs/applications/networking/weather/meteo/default.nix index 3393dea929e..3de0d450de5 100644 --- a/pkgs/applications/networking/weather/meteo/default.nix +++ b/pkgs/applications/networking/weather/meteo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, vala, python3, pkgconfig, meson, ninja, gtk3 +{ lib, stdenv, fetchFromGitLab, vala, python3, pkg-config, meson, ninja, gtk3 , json-glib, libsoup, webkitgtk, geocode-glib, nix-update-script , libappindicator, desktop-file-utils, appstream, wrapGAppsHook }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { desktop-file-utils meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix index 7e523128545..557c2865fa1 100644 --- a/pkgs/applications/networking/znc/default.nix +++ b/pkgs/applications/networking/znc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openssl, pkgconfig +{ lib, stdenv, fetchurl, openssl, pkg-config , withPerl ? false, perl , withPython ? false, python3 , withTcl ? false, tcl @@ -9,7 +9,7 @@ , withDebug ? false }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "znc"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { sha256 = "03fyi0j44zcanj1rsdx93hkdskwfvhbywjiwd17f9q1a7yp8l8zz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ optional withPerl perl @@ -31,11 +31,11 @@ stdenv.mkDerivation rec { ++ optional withZlib zlib; configureFlags = [ - (stdenv.lib.enableFeature withPerl "perl") - (stdenv.lib.enableFeature withPython "python") - (stdenv.lib.enableFeature withTcl "tcl") - (stdenv.lib.withFeatureAs withTcl "tcl" "${tcl}/lib") - (stdenv.lib.enableFeature withCyrus "cyrus") + (lib.enableFeature withPerl "perl") + (lib.enableFeature withPython "python") + (lib.enableFeature withTcl "tcl") + (lib.withFeatureAs withTcl "tcl" "${tcl}/lib") + (lib.enableFeature withCyrus "cyrus") ] ++ optional (!withIPv6) [ "--disable-ipv6" ] ++ optional withDebug [ "--enable-debug" ]; diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix index 964afa459f4..a72618d935d 100644 --- a/pkgs/applications/networking/znc/modules.nix +++ b/pkgs/applications/networking/znc/modules.nix @@ -11,7 +11,7 @@ let buildInputs = znc.buildInputs; - meta = a.meta // { platforms = stdenv.lib.platforms.unix; }; + meta = a.meta // { platforms = lib.platforms.unix; }; passthru.module_name = module_name; }); @@ -93,7 +93,7 @@ in { meta = { description = "ZNC FiSH module"; homepage = "https://github.com/dctrwatson/znc-fish"; - maintainers = [ stdenv.lib.maintainers.offline ]; + maintainers = [ lib.maintainers.offline ]; }; }; @@ -119,21 +119,21 @@ in { palaver = zncDerivation rec { name = "znc-palaver-${version}"; - version = "2018-09-18"; + version = "2020-07-18"; module_name = "palaver"; src = fetchFromGitHub { owner = "cocodelabs"; repo = "znc-palaver"; - rev = "c70e8112686f917d39197d582db36c3ea37a4cb6"; - sha256 = "1gjr8yqgpkpcc18rf0zfgil3rcd1ihqk0q9f8rwbfvs5381h3c58"; + rev = "825cb6814d64006ca0f85fec23fa0a8a3a2d14ca"; + sha256 = "zXWPIxhO5Z2L6f+Hf3vIpEh6V4kjUONWAaKexKLECc8="; }; meta = with lib; { description = "Palaver ZNC module"; homepage = "https://github.com/cocodelabs/znc-palaver"; license = licenses.mit; - maintainers = with maintainers; [ kiwi ]; + maintainers = with maintainers; [ kiwi szlend ]; }; }; @@ -190,8 +190,8 @@ in { meta = { description = "Push notification service module for ZNC"; homepage = "https://github.com/jreese/znc-push"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ offline schneefux ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ offline schneefux ]; }; }; diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix index 1a9073056e7..4e83f36ea52 100644 --- a/pkgs/applications/office/abiword/default.nix +++ b/pkgs/applications/office/abiword/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gtk3, fribidi +{ lib, stdenv, fetchurl, pkg-config, gtk3, fribidi , libpng, popt, libgsf, enchant, wv, librsvg, bzip2, libjpeg, perl , boost, libxslt, goffice, wrapGAppsHook, gnome3 }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { substituteInPlace configure --replace 'enchant >=' 'enchant-2 >=' ''; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; buildInputs = [ gtk3 librsvg bzip2 fribidi libpng popt diff --git a/pkgs/applications/office/aesop/default.nix b/pkgs/applications/office/aesop/default.nix index aefa786d060..0e151f3adbe 100644 --- a/pkgs/applications/office/aesop/default.nix +++ b/pkgs/applications/office/aesop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, vala, fetchFromGitHub, nix-update-script, pantheon, pkgconfig, meson, ninja, python3, gtk3 +{ lib, stdenv, vala, fetchFromGitHub, nix-update-script, pantheon, pkg-config, meson, ninja, python3, gtk3 , desktop-file-utils, json-glib, libsoup, libgee, poppler, wrapGAppsHook, fetchpatch }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { desktop-file-utils meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/applications/office/antiword/default.nix b/pkgs/applications/office/antiword/default.nix index c8cb294b0dc..67a37b2d511 100644 --- a/pkgs/applications/office/antiword/default.nix +++ b/pkgs/applications/office/antiword/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv }: +{ lib, fetchurl, stdenv }: let name = "antiword-0.37"; @@ -23,9 +23,9 @@ stdenv.mkDerivation { meta = { homepage = "http://www.winfield.demon.nl/"; description = "Convert MS Word documents to plain text or PostScript"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.peti ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + maintainers = [ lib.maintainers.peti ]; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/office/atlassian-cli/default.nix b/pkgs/applications/office/atlassian-cli/default.nix index d743baaed7e..8c1245a99ac 100644 --- a/pkgs/applications/office/atlassian-cli/default.nix +++ b/pkgs/applications/office/atlassian-cli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "atlassian-cli"; - version = "9.4.0"; + version = "9.5.0"; src = fetchzip { url = "https://bobswift.atlassian.net/wiki/download/attachments/16285777/${pname}-${version}-distribution.zip"; - sha256 = "091dhjkx7fdn23cj7c4071swncsbmknpvidmmjzhc0355l3p4k2g"; + sha256 = "sha256-EAoydA2lg4K1gTgzn9patNw7pcCdU/OPfaEG1OfEJ18="; }; tools = [ diff --git a/pkgs/applications/office/beamerpresenter/default.nix b/pkgs/applications/office/beamerpresenter/default.nix index c07b4c5e1aa..4e8bcaee019 100644 --- a/pkgs/applications/office/beamerpresenter/default.nix +++ b/pkgs/applications/office/beamerpresenter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, installShellFiles, +{ lib, mkDerivation, fetchFromGitHub, installShellFiles, qmake, qtbase, poppler, qtmultimedia }: mkDerivation rec { diff --git a/pkgs/applications/office/beancount/bean-add.nix b/pkgs/applications/office/beancount/bean-add.nix index 916d13e7a83..ba3afbff946 100644 --- a/pkgs/applications/office/beancount/bean-add.nix +++ b/pkgs/applications/office/beancount/bean-add.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages }: +{ lib, stdenv, fetchFromGitHub, python3Packages }: stdenv.mkDerivation { name = "bean-add-2018-01-08"; @@ -25,7 +25,7 @@ stdenv.mkDerivation { # The (only) source file states: # License: "Do what you feel is right, but don't be a jerk" public license. - maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; + maintainers = with lib.maintainers; [ matthiasbeyer ]; }; } diff --git a/pkgs/applications/office/bookworm/default.nix b/pkgs/applications/office/bookworm/default.nix index e6fa2884feb..8ea277e1af3 100644 --- a/pkgs/applications/office/bookworm/default.nix +++ b/pkgs/applications/office/bookworm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pantheon, vala, python3, python2, pkgconfig, libxml2, meson, ninja, gtk3, gnome3, glib, webkitgtk, libgee +{ lib, stdenv, fetchFromGitHub, pantheon, vala, python3, python2, pkg-config, libxml2, meson, ninja, gtk3, gnome3, glib, webkitgtk, libgee , gobject-introspection, sqlite, poppler, poppler_utils, html2text, curl, gnugrep, coreutils, bash, unzip, unar, wrapGAppsHook , appstream, desktop-file-utils }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { libxml2 meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { # These programs are expected in PATH from the source code and scripts preFixup = '' gappsWrapperArgs+=( - --prefix PATH : "${stdenv.lib.makeBinPath [ unzip unar poppler_utils html2text coreutils curl gnugrep ]}" + --prefix PATH : "${lib.makeBinPath [ unzip unar poppler_utils html2text coreutils curl gnugrep ]}" --prefix PATH : $out/bin ) ''; diff --git a/pkgs/applications/office/cb2bib/default.nix b/pkgs/applications/office/cb2bib/default.nix index e57d490f05c..b0a0fded80a 100644 --- a/pkgs/applications/office/cb2bib/default.nix +++ b/pkgs/applications/office/cb2bib/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { runHook postConfigure ''; + dontWrapQtApps = true; + meta = with lib; { description = "Rapidly extract unformatted, or unstandardized bibliographic references from email alerts, journal Web pages and PDF files"; homepage = "http://www.molspaces.com/d_cb2bib-overview.php"; diff --git a/pkgs/applications/office/csv2odf/default.nix b/pkgs/applications/office/csv2odf/default.nix index 7bab06ed4ab..436e8d97bdb 100644 --- a/pkgs/applications/office/csv2odf/default.nix +++ b/pkgs/applications/office/csv2odf/default.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { creating reports from databases and other data sources that produce csv files. csv2odf can be combined with cron and shell scripts to automatically generate business reports. - + The output format (fonts, number formatting, etc.) is controlled by a template file that you can design in your office application of choice. ''; diff --git a/pkgs/applications/office/docear/default.nix b/pkgs/applications/office/docear/default.nix index e14fee010e8..683e6681573 100644 --- a/pkgs/applications/office/docear/default.nix +++ b/pkgs/applications/office/docear/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { # The wrapper ensures oraclejre is used makeWrapper ${runtimeShell} $out/bin/docear \ - --set _JAVA_OPTIONS "${stdenv.lib.optionalString antialiasFont ''-Dswing.aatext=TRUE -Dawt.useSystemAAFontSettings=on''}" \ + --set _JAVA_OPTIONS "${lib.optionalString antialiasFont "-Dswing.aatext=TRUE -Dawt.useSystemAAFontSettings=on"}" \ --set JAVA_HOME ${oraclejre.home} \ --add-flags "$out/share/docear.sh" diff --git a/pkgs/applications/office/elementary-planner/default.nix b/pkgs/applications/office/elementary-planner/default.nix index ff40d944c83..d49ee41c9f5 100644 --- a/pkgs/applications/office/elementary-planner/default.nix +++ b/pkgs/applications/office/elementary-planner/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , meson , ninja -, pkgconfig +, pkg-config , desktop-file-utils , python3 , vala @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { desktop-file-utils meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/applications/office/envelope/default.nix b/pkgs/applications/office/envelope/default.nix index 6dc46d9dec6..7798026e790 100644 --- a/pkgs/applications/office/envelope/default.nix +++ b/pkgs/applications/office/envelope/default.nix @@ -4,7 +4,7 @@ , fetchpatch , meson , ninja -, pkgconfig +, pkg-config , pantheon , python3 , vala @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meson ninja vala - pkgconfig + pkg-config python3 wrapGAppsHook ]; diff --git a/pkgs/applications/office/espanso/default.nix b/pkgs/applications/office/espanso/default.nix index 594c95d3d95..d20e19c6859 100644 --- a/pkgs/applications/office/espanso/default.nix +++ b/pkgs/applications/office/espanso/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , rustPlatform -, pkgconfig +, pkg-config , extra-cmake-modules , libX11 , libXi @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ extra-cmake-modules - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix index cee8098f451..b070683e6f2 100644 --- a/pkgs/applications/office/fava/default.nix +++ b/pkgs/applications/office/fava/default.nix @@ -1,15 +1,15 @@ -{ stdenv, python3, beancount }: +{ lib, python3, beancount }: let inherit (python3.pkgs) buildPythonApplication fetchPypi; in buildPythonApplication rec { pname = "fava"; - version = "1.17"; + version = "1.18"; src = fetchPypi { inherit pname version; - sha256 = "efad3a4b5697b9d7ee29eff5dc0c8367fc1df37b1abacc8d0b2071602e94a6cd"; + sha256 = "21336b695708497e6f00cab77135b174c51feb2713b657e0e208282960885bf5"; }; checkInputs = [ python3.pkgs.pytest ]; @@ -38,7 +38,7 @@ buildPythonApplication rec { meta = { homepage = "https://beancount.github.io/fava"; description = "Web interface for beancount"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ matthiasbeyer ]; }; } diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index 898ee032fc4..959aa30c037 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, makeWrapper, cmake, gtest +{ fetchurl, lib, stdenv, pkg-config, makeWrapper, cmake, gtest , boost, icu, libxml2, libxslt, gettext, swig, isocodes, gtk3, glibcLocales , webkitgtk, dconf, hicolor-icon-theme, libofx, aqbanking, gwenhywfar, libdbi , libdbiDrivers, guile, perl, perlPackages @@ -25,14 +25,14 @@ in stdenv.mkDerivation rec { pname = "gnucash"; - version = "4.2"; + version = "4.4"; src = fetchurl { url = "mirror://sourceforge/gnucash/${pname}-${version}.tar.bz2"; - sha256 = "020k1mm909dcgs52ls4v7xx3yn8gqazi9awyr81l6y7pkq1spn2n"; + sha256 = "sha256-2R4NEmtGHXHeG8GyDZzxQnBDU97AfT5lmdE4QidZ5no="; }; - nativeBuildInputs = [ pkgconfig makeWrapper cmake gtest ]; + nativeBuildInputs = [ pkg-config makeWrapper cmake gtest ]; buildInputs = [ boost icu libxml2 libxslt gettext swig isocodes gtk3 glibcLocales @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "${hicolor-icon-theme}/share" \ --prefix PERL5LIB ":" "$PERL5LIB" \ --set GNC_DBD_DIR ${libdbiDrivers}/lib/dbd \ - --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" + --prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules" ''; # TODO: The following tests FAILED: @@ -96,11 +96,11 @@ stdenv.mkDerivation rec { accounting principles to ensure balanced books and accurate reports. ''; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; homepage = "http://www.gnucash.org/"; - maintainers = [ stdenv.lib.maintainers.peti stdenv.lib.maintainers.domenkozar ]; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; + maintainers = [ lib.maintainers.peti lib.maintainers.domenkozar ]; + platforms = lib.platforms.gnu ++ lib.platforms.linux; }; } diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index ab8ec821244..f926391ac48 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -10,7 +10,7 @@ in stdenv.mkDerivation rec { version = "1.12.48"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "14556b0vyxdvdwjlin0rv7jk0vq4nplbmvp9j89bhkfk84xf7k2p"; }; @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "The GNOME Office Spreadsheet"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; homepage = "http://projects.gnome.org/gnumeric/"; platforms = platforms.unix; maintainers = [ maintainers.vcunat ]; diff --git a/pkgs/applications/office/grisbi/default.nix b/pkgs/applications/office/grisbi/default.nix index f52f9a3e909..9fc7a84231b 100644 --- a/pkgs/applications/office/grisbi/default.nix +++ b/pkgs/applications/office/grisbi/default.nix @@ -1,7 +1,7 @@ { fetchurl , lib, stdenv , gtk -, pkgconfig +, pkg-config , libgsf , libofx , intltool @@ -12,14 +12,14 @@ stdenv.mkDerivation rec { pname = "grisbi"; - version = "1.2.2"; + version = "2.0.0"; src = fetchurl { url = "mirror://sourceforge/grisbi/${pname}-${version}.tar.bz2"; - sha256 = "1piiyyxjsjbw9gcqydvknzxmmfgh8kdqal12ywrxyxih2afwnvbw"; + sha256 = "sha256-b3I87tlXhIjM/bFjhsJTNFQvZxIGKsIbsf4zZT5sHXg="; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; buildInputs = [ gtk libgsf diff --git a/pkgs/applications/office/gtg/default.nix b/pkgs/applications/office/gtg/default.nix index 52558df5da8..4c892b2605b 100644 --- a/pkgs/applications/office/gtg/default.nix +++ b/pkgs/applications/office/gtg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , meson , python3Packages diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index a0df7144114..03c9445fe24 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, gtk, pkgconfig, libofx, intltool, wrapGAppsHook +{ fetchurl, lib, stdenv, gtk, pkg-config, libofx, intltool, wrapGAppsHook , libsoup, gnome3 }: stdenv.mkDerivation rec { @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "02wd569viwy6ncy0144z9nxr3zmpl4shkqhz7zzwyky4gknxf8lj"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; buildInputs = [ gtk libofx intltool libsoup gnome3.adwaita-icon-theme ]; diff --git a/pkgs/applications/office/impressive/default.nix b/pkgs/applications/office/impressive/default.nix index ed8cc1dd50a..4614a543694 100644 --- a/pkgs/applications/office/impressive/default.nix +++ b/pkgs/applications/office/impressive/default.nix @@ -61,9 +61,9 @@ in stdenv.mkDerivation { homepage = "http://impressive.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ lheckemann ]; - platforms = stdenv.lib.platforms.mesaPlatforms; + platforms = lib.platforms.mesaPlatforms; }; } diff --git a/pkgs/applications/office/jabref/default.nix b/pkgs/applications/office/jabref/default.nix index c593111f2f4..3974e75a2f7 100644 --- a/pkgs/applications/office/jabref/default.nix +++ b/pkgs/applications/office/jabref/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [ gsettings-desktop-schemas ] ++ systemLibs; systemLibs = [ gtk3 zlib libX11 libXext libXi libXrender libXtst libGL alsaLib libav cairo freetype pango gdk-pixbuf glib ]; - systemLibPaths = stdenv.lib.makeLibraryPath systemLibs; + systemLibPaths = lib.makeLibraryPath systemLibs; installPhase = '' mkdir -p $out/share/java $out/share/icons @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { for f in $out/lib/runtime/bin/j*; do patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${ stdenv.lib.makeLibraryPath [ zlib ]}:$out/lib/runtime/lib:$out/lib/runtime/lib/server" $f + --set-rpath "${ lib.makeLibraryPath [ zlib ]}:$out/lib/runtime/lib:$out/lib/runtime/lib/server" $f done for f in $out/lib/runtime/lib/*.so; do diff --git a/pkgs/applications/office/jameica/default.nix b/pkgs/applications/office/jameica/default.nix index 1585ebb4da7..2f34d8b8c18 100644 --- a/pkgs/applications/office/jameica/default.nix +++ b/pkgs/applications/office/jameica/default.nix @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { inherit name version; nativeBuildInputs = [ ant jdk makeWrapper ]; - buildInputs = stdenv.lib.optionals stdenv.isLinux [ gtk2 glib xorg.libXtst ] - ++ stdenv.lib.optional stdenv.isDarwin Cocoa; + buildInputs = lib.optionals stdenv.isLinux [ gtk2 glib xorg.libXtst ] + ++ lib.optional stdenv.isDarwin Cocoa; src = fetchFromGitHub { owner = "willuhn"; @@ -55,9 +55,9 @@ stdenv.mkDerivation rec { makeWrapper ${jre}/bin/java $out/bin/jameica \ --add-flags "-cp $out/share/java/jameica.jar:$out/share/${name}/* ${ - stdenv.lib.optionalString stdenv.isDarwin ''-Xdock:name="Jameica" -XstartOnFirstThread'' + lib.optionalString stdenv.isDarwin ''-Xdock:name="Jameica" -XstartOnFirstThread'' } de.willuhn.jameica.Main" \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath buildInputs} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath buildInputs} \ --run "cd $out/share/java/" ''; diff --git a/pkgs/applications/office/keepnote/default.nix b/pkgs/applications/office/keepnote/default.nix index cf1b5125adf..14f48da2230 100644 --- a/pkgs/applications/office/keepnote/default.nix +++ b/pkgs/applications/office/keepnote/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python2Packages }: +{ lib, fetchurl, python2Packages }: python2Packages.buildPythonApplication { name = "keepnote-0.7.8"; @@ -17,6 +17,6 @@ python2Packages.buildPythonApplication { meta = { description = "Note taking application"; homepage = "http://keepnote.org"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix index 093d20906a4..1d8a214c818 100644 --- a/pkgs/applications/office/kmymoney/default.nix +++ b/pkgs/applications/office/kmymoney/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "kmymoney"; - version = "5.1.0"; + version = "5.1.1"; src = fetchurl { url = "mirror://kde/stable/kmymoney/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "0l8kywq77yaf1bqgdqswrai9ws6a2l11drg0wgyi7f8js7qnif9d"; + sha256 = "sha256-33ufeOhZb5nSgpXKc4cI8GVe4Fd4nf2SHHsbq5ZXgpg="; }; # Hidden dependency that wasn't included in CMakeLists.txt: diff --git a/pkgs/applications/office/ktimetracker/default.nix b/pkgs/applications/office/ktimetracker/default.nix index 8a40a3f4f69..3b1700cc24f 100644 --- a/pkgs/applications/office/ktimetracker/default.nix +++ b/pkgs/applications/office/ktimetracker/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchurl, cmake, pkgconfig, extra-cmake-modules, +{ mkDerivation, lib, fetchurl, cmake, pkg-config, extra-cmake-modules, kconfig, kconfigwidgets, kdbusaddons, kdoctools, ki18n, kidletime, kjobwidgets, kio, knotifications, kwindowsystem, kxmlgui, ktextwidgets, kcalendarcore @@ -14,11 +14,11 @@ mkDerivation rec { }; nativeBuildInputs = [ - cmake pkgconfig extra-cmake-modules + cmake pkg-config extra-cmake-modules ]; buildInputs = [ - kconfig kconfigwidgets kdbusaddons kdoctools ki18n kidletime kjobwidgets + kconfig kconfigwidgets kdbusaddons kdoctools ki18n kidletime kjobwidgets kio knotifications kwindowsystem kxmlgui ktextwidgets kcalendarcore ]; diff --git a/pkgs/applications/office/ledger-autosync/default.nix b/pkgs/applications/office/ledger-autosync/default.nix index 57d7e78d32a..90e5995669e 100644 --- a/pkgs/applications/office/ledger-autosync/default.nix +++ b/pkgs/applications/office/ledger-autosync/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub, ledger, hledger, useLedger ? true, useHledger ? true }: +{ lib, python3Packages, fetchFromGitHub, ledger, hledger, useLedger ? true, useHledger ? true }: python3Packages.buildPythonApplication rec { pname = "ledger-autosync"; @@ -32,8 +32,8 @@ python3Packages.buildPythonApplication rec { pycparser secretstorage six - ] ++ stdenv.lib.optional useLedger ledger - ++ stdenv.lib.optional useHledger hledger; + ] ++ lib.optional useLedger ledger + ++ lib.optional useHledger hledger; # Checks require ledger as a python package, # ledger does not support python3 while ledger-autosync requires it. diff --git a/pkgs/applications/office/ledger-web/gemset.nix b/pkgs/applications/office/ledger-web/gemset.nix index 71a959c0a86..3bdcc86595f 100644 --- a/pkgs/applications/office/ledger-web/gemset.nix +++ b/pkgs/applications/office/ledger-web/gemset.nix @@ -208,4 +208,4 @@ }; version = "2.0.9"; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 6d8983179dc..7b3e630233f 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -8,7 +8,7 @@ , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr , libwpg, dbus-glib, clucene_core, libcdr, lcms , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio -, fontsConf, pkgconfig, bluez5, libtool, carlito +, fontsConf, pkg-config, bluez5, libtool, carlito , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf , librevenge, libe-book, libmwaw, glm, gst_all_1 , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook @@ -386,7 +386,7 @@ in (mkDrv rec { ''; nativeBuildInputs = [ - gdb fontforge autoconf automake bison pkgconfig libtool + gdb fontforge autoconf automake bison pkg-config libtool ] ++ lib.optional (!kdeIntegration) wrapGAppsHook ++ lib.optional kdeIntegration wrapQtAppsHook; @@ -399,7 +399,7 @@ in (mkDrv rec { libXaw libXext libXi libXinerama libxml2 libxslt libXtst libXdmcp libpthreadstubs libGLU libGL mythes glib libmysqlclient - neon nspr nss openldap openssl pam perl pkgconfig poppler + neon nspr nss openldap openssl pam perl pkg-config poppler python3 sane-backends unzip which zip zlib mdds bluez5 libcmis libwps libabw libzmf libxshmfence libatomic_ops graphite2 harfbuzz gpgme util-linux diff --git a/pkgs/applications/office/libreoffice/src-fresh/override.nix b/pkgs/applications/office/libreoffice/src-fresh/override.nix index 60e08735d2e..0141b74c389 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/override.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/override.nix @@ -1,10 +1,10 @@ -{ stdenv, kdeIntegration, ... }: +{ lib, kdeIntegration, ... }: attrs: { postConfigure = attrs.postConfigure + '' sed -e '/CPPUNIT_TEST(Import_Export_Import);/d' -i './sw/qa/inc/swmodeltestbase.hxx' ''; configureFlags = attrs.configureFlags ++ [ - (stdenv.lib.enableFeature kdeIntegration "kf5") + (lib.enableFeature kdeIntegration "kf5") ]; } diff --git a/pkgs/applications/office/libreoffice/src-still/override.nix b/pkgs/applications/office/libreoffice/src-still/override.nix index 54935dd7072..50812d0efb9 100644 --- a/pkgs/applications/office/libreoffice/src-still/override.nix +++ b/pkgs/applications/office/libreoffice/src-still/override.nix @@ -1,4 +1,4 @@ -{ stdenv, kdeIntegration, fetchpatch, ... }: +{ lib, kdeIntegration, fetchpatch, ... }: attrs: { patches = attrs.patches or [ ] ++ [ @@ -11,9 +11,9 @@ attrs: postConfigure = attrs.postConfigure + '' sed -e '/CPPUNIT_TEST(Import_Export_Import);/d' -i './sw/qa/extras/inc/swmodeltestbase.hxx' ''; - configureFlags = stdenv.lib.remove "--without-system-qrcodegen" + configureFlags = lib.remove "--without-system-qrcodegen" (attrs.configureFlags ++ [ - (stdenv.lib.enableFeature kdeIntegration "kde5") + (lib.enableFeature kdeIntegration "kde5") ]); meta = attrs.meta // { description = "Comprehensive, professional-quality productivity suite (Still/Stable release)"; }; } diff --git a/pkgs/applications/office/marp/default.nix b/pkgs/applications/office/marp/default.nix index e498f39949b..c223fa40cc4 100644 --- a/pkgs/applications/office/marp/default.nix +++ b/pkgs/applications/office/marp/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { postFixup = '' patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${atomEnv.libPath}:${stdenv.lib.makeLibraryPath [ libXScrnSaver gtk2 ]}:$out/lib/marp" \ + --set-rpath "${atomEnv.libPath}:${lib.makeLibraryPath [ libXScrnSaver gtk2 ]}:$out/lib/marp" \ $out/bin/Marp ''; diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index 45af12ae0e3..b38b7e0e585 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -114,12 +114,12 @@ mkDerivation { interpreter=$(patchelf --print-interpreter $(readlink -f $(which patchelf))) patchelf --set-interpreter $interpreter \ - --set-rpath ${stdenv.lib.makeLibraryPath deps}:$out/lib \ + --set-rpath ${lib.makeLibraryPath deps}:$out/lib \ $out/bin/mendeleydesktop wrapQtApp $out/bin/mendeleydesktop \ --add-flags "--unix-distro-build" \ - ${stdenv.lib.optionalString autorunLinkHandler # ignore errors installing the link handler + ${lib.optionalString autorunLinkHandler # ignore errors installing the link handler ''--run "$out/bin/install-mendeley-link-handler.sh $out/bin/mendeleydesktop ||:"''} # Remove bundled qt bits @@ -128,7 +128,7 @@ mkDerivation { # Patch up link handler script wrapProgram $out/bin/install-mendeley-link-handler.sh \ - --prefix PATH ':' ${stdenv.lib.makeBinPath [ which gconf desktop-file-utils ] } + --prefix PATH ':' ${lib.makeBinPath [ which gconf desktop-file-utils ] } ''; dontStrip = true; diff --git a/pkgs/applications/office/mmex/default.nix b/pkgs/applications/office/mmex/default.nix index 6d430a286bd..7113997c90f 100644 --- a/pkgs/applications/office/mmex/default.nix +++ b/pkgs/applications/office/mmex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, sqlite, wxGTK30, gettext, wrapGAppsHook }: +{ lib, stdenv, fetchgit, sqlite, wxGTK30, gettext, wrapGAppsHook }: let @@ -28,8 +28,8 @@ in meta = { description = "Easy-to-use personal finance software"; homepage = "https://www.moneymanagerex.org/"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/office/moneyplex/default.nix b/pkgs/applications/office/moneyplex/default.nix index cdea3cede11..4038f5fd435 100644 --- a/pkgs/applications/office/moneyplex/default.nix +++ b/pkgs/applications/office/moneyplex/default.nix @@ -3,7 +3,7 @@ , runtimeShell }: let - libPath = stdenv.lib.makeLibraryPath [ + libPath = lib.makeLibraryPath [ stdenv.cc.cc zlib glib gdk-pixbuf gtk2 cairo pango libX11 atk openssl ]; @@ -63,8 +63,8 @@ stdenv.mkDerivation { if [ ! -d "\$MDIR/pcsc" ]; then ${coreutils}/bin/mkdir -p \$MDIR/pcsc fi - if [ ! -e "\$MDIR/pcsc/libpcsclite.so.1" ] || [ ! \`${coreutils}/bin/readlink -f "\$MDIR/pcsc/libpcsclite.so.1"\` -ef "${stdenv.lib.getLib pcsclite}/lib/libpcsclite.so.1" ]; then - ${coreutils}/bin/ln -sf "${stdenv.lib.getLib pcsclite}/lib/libpcsclite.so.1" "\$MDIR/pcsc/libpcsclite.so.1" + if [ ! -e "\$MDIR/pcsc/libpcsclite.so.1" ] || [ ! \`${coreutils}/bin/readlink -f "\$MDIR/pcsc/libpcsclite.so.1"\` -ef "${lib.getLib pcsclite}/lib/libpcsclite.so.1" ]; then + ${coreutils}/bin/ln -sf "${lib.getLib pcsclite}/lib/libpcsclite.so.1" "\$MDIR/pcsc/libpcsclite.so.1" fi diff --git a/pkgs/applications/office/mytetra/default.nix b/pkgs/applications/office/mytetra/default.nix index f48ec3fb237..3e2383fb356 100644 --- a/pkgs/applications/office/mytetra/default.nix +++ b/pkgs/applications/office/mytetra/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchurl, qmake, qtsvg, makeWrapper, xdg_utils }: +{ lib, mkDerivation, fetchurl, qmake, qtsvg, makeWrapper, xdg-utils }: let version = "1.44.55"; @@ -26,7 +26,7 @@ in mkDerivation { postFixup = '' wrapProgram $out/bin/mytetra \ - --prefix PATH : ${xdg_utils}/bin + --prefix PATH : ${xdg-utils}/bin ''; meta = with lib; { diff --git a/pkgs/applications/office/notes-up/default.nix b/pkgs/applications/office/notes-up/default.nix index 291e6f39493..7ab5bc838ec 100644 --- a/pkgs/applications/office/notes-up/default.nix +++ b/pkgs/applications/office/notes-up/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , nix-update-script , pantheon -, pkgconfig +, pkg-config , vala_0_46 , cmake , ninja @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ninja # fails with newer vala: https://github.com/Philip-Scott/Notes-up/issues/349 vala_0_46 - pkgconfig + pkg-config wrapGAppsHook ]; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { ]; # Whether to build with contractor support (Pantheon specific) - cmakeFlags = stdenv.lib.optional (!withPantheon) "-Dnoele=yes"; + cmakeFlags = lib.optional (!withPantheon) "-Dnoele=yes"; passthru = { updateScript = nix-update-script { @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Markdown notes editor and manager designed for elementary OS" - + stdenv.lib.optionalString withPantheon " - built with Contractor support"; + + lib.optionalString withPantheon " - built with Contractor support"; homepage = "https://github.com/Philip-Scott/Notes-up"; license = licenses.gpl2; maintainers = with maintainers; [ davidak worldofpeace ]; diff --git a/pkgs/applications/office/osmo/default.nix b/pkgs/applications/office/osmo/default.nix index 3513e44ed0c..77cc087c66b 100644 --- a/pkgs/applications/office/osmo/default.nix +++ b/pkgs/applications/office/osmo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gtk3, libxml2, gettext, libical, libnotify +{ lib, stdenv, fetchurl, pkg-config, gtk3, libxml2, gettext, libical, libnotify , libarchive, gspell, webkitgtk, libgringotts, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "19h3dnjgqbawnvgnycyp4n5b6mjsp5zghn3b69b6f3xa3fyi32qy"; }; - nativeBuildInputs = [ pkgconfig gettext wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config gettext wrapGAppsHook ]; buildInputs = [ gtk3 libxml2 libical libnotify libarchive gspell webkitgtk libgringotts ]; diff --git a/pkgs/applications/office/pinpoint/default.nix b/pkgs/applications/office/pinpoint/default.nix index 6326df87ed2..b6d0d373f35 100644 --- a/pkgs/applications/office/pinpoint/default.nix +++ b/pkgs/applications/office/pinpoint/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, pkgconfig, autoconf, automake, clutter, clutter-gst +{ fetchurl, lib, stdenv, pkg-config, autoconf, automake, clutter, clutter-gst , gdk-pixbuf, cairo, clutter-gtk }: stdenv.mkDerivation rec { @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { url = "http://ftp.gnome.org/pub/GNOME/sources/pinpoint/0.1/${pname}-${version}.tar.xz"; sha256 = "1jp8chr9vjlpb5lybwp5cg6g90ak5jdzz9baiqkbg0anlg8ps82s"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoconf automake clutter clutter-gst gdk-pixbuf cairo clutter-gtk ]; diff --git a/pkgs/applications/office/planner/default.nix b/pkgs/applications/office/planner/default.nix deleted file mode 100644 index dab567db898..00000000000 --- a/pkgs/applications/office/planner/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ lib, stdenv -, fetchFromGitLab -, pkgconfig -, intltool -, automake111x -, autoconf -, libtool -, gnome2 -, libxslt -, python2 -}: - -let version = "unstable-2019-02-13"; - -in stdenv.mkDerivation { - pname = "planner"; - inherit version; - - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "GNOME"; - repo = "planner"; - rev = "76d31defae4979aa51dd37e8888f61e9a6a51367"; - sha256 = "0lbch4drg6005216hgcys93rq92p7zd20968x0gk254kckd9ag5w"; - }; - - nativeBuildInputs = with gnome2; [ - pkgconfig - intltool - automake111x - autoconf - libtool - gnome-common - gtk-doc - scrollkeeper - ]; - - buildInputs = with gnome2; [ - GConf - gtk - libgnomecanvas - libgnomeui - libglade - libxslt - python2.pkgs.pygtk - ]; - - # glib-2.62 deprecations - NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; - - preConfigure = ''./autogen.sh''; - configureFlags = [ - "--enable-python" - "--enable-python-plugin" - ]; - - enableParallelBuilding = true; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Planner"; - description = "Project management application for GNOME"; - longDescription = '' - Planner is the GNOME project management tool. - 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 - 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. - - Planner was originally created by Richard Hult and Mikael Hallendal - at Imendio. - ''; - license = licenses.gpl2Plus; - platforms = platforms.all; - maintainers = with maintainers; [ rasendubi amiloradovsky ]; - }; -} diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix index 44c4a4e1f52..47cda051821 100644 --- a/pkgs/applications/office/portfolio/default.nix +++ b/pkgs/applications/office/portfolio/default.nix @@ -20,15 +20,15 @@ let categories = "Office;"; }; - runtimeLibs = stdenv.lib.makeLibraryPath [ gtk3 webkitgtk ]; + runtimeLibs = lib.makeLibraryPath [ gtk3 webkitgtk ]; in stdenv.mkDerivation rec { pname = "PortfolioPerformance"; - version = "0.50.0"; + version = "0.50.3"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "1jq4if5hx3fwag1dz38sj87av2na1kv4c36hai1gyz9w5qhjv7j8"; + sha256 = "sha256-8sFBxcs3tnIQQ4S39aF8r9SGm9VOHPpgQYyLkUaOscw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/pyspread/default.nix b/pkgs/applications/office/pyspread/default.nix new file mode 100644 index 00000000000..0b657e38f7f --- /dev/null +++ b/pkgs/applications/office/pyspread/default.nix @@ -0,0 +1,86 @@ +{ lib +, buildPythonApplication +, fetchPypi +, makeDesktopItem +, makePythonPath +, dateutil +, matplotlib +, numpy +, pyenchant +, pyqt5 +, pytest +, python +, qtsvg +, runtimeShell +, wrapQtAppsHook +}: + +buildPythonApplication rec { + pname = "pyspread"; + version = "1.99.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-05bC+Uvx72FAh3qxkgXm8jdb/gHRv1D/M7tjOEdE3Xg="; + }; + + pythonLibs = [ + dateutil + matplotlib + numpy + pyenchant + pyqt5 + ]; + + nativeBuildInputs = [ wrapQtAppsHook ]; + buildInputs = pythonLibs ++ [ + qtsvg + ]; + + doCheck = false; # it fails miserably with a core dump + + desktopItem = makeDesktopItem rec { + name = pname; + exec = name; + icon = name; + desktopName = "Pyspread"; + genericName = "Spreadsheet"; + comment = meta.description; + categories = "Office;Development;Spreadsheet;"; + }; + + postInstall = '' + runHook preInstall + install -D $out/share/applications + install -m 644 $desktopItem/share/applications/* $out/share/applications + runHook postInstall + ''; + + fixupPhase = '' + runHook preFixup + sed -i -e "s|#!/bin/bash|#!${runtimeShell}|" $out/bin/pyspread + wrapProgram $out/bin/pyspread \ + --prefix PYTHONPATH ':' $(toPythonPath $out):${makePythonPath pythonLibs} \ + --prefix PATH ':' ${python}/bin/ \ + ''${qtWrapperArgs[@]} + runHook postFixup + ''; + + meta = with lib; { + homepage = "https://pyspread.gitlab.io/"; + description = "A Python-oriented spreadsheet application"; + longDescription = '' + pyspread is a non-traditional spreadsheet application that is based on and + written in the programming language Python. The goal of pyspread is to be + the most pythonic spreadsheet. + + pyspread expects Python expressions in its grid cells, which makes a + spreadsheet specific language obsolete. Each cell returns a Python object + that can be accessed from other cells. These objects can represent + anything including lists or matrices. + ''; + license = with licenses; gpl3Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; all; + }; +} diff --git a/pkgs/applications/office/qnotero/default.nix b/pkgs/applications/office/qnotero/default.nix index 7821b041064..414312f24e5 100644 --- a/pkgs/applications/office/qnotero/default.nix +++ b/pkgs/applications/office/qnotero/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages, wrapQtAppsHook }: +{ lib, fetchFromGitHub, python3Packages, wrapQtAppsHook }: python3Packages.buildPythonPackage rec { pname = "qnotero"; @@ -26,11 +26,14 @@ python3Packages.buildPythonPackage rec { wrapQtApp "$out"/bin/qnotero ''; + # no tests executed + doCheck = false; + meta = { description = "Quick access to Zotero references"; homepage = "http://www.cogsci.nl/software/qnotero"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.nico202 ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.nico202 ]; }; } diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix index 4cc20775390..a6427d0f890 100644 --- a/pkgs/applications/office/scribus/default.nix +++ b/pkgs/applications/office/scribus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, freetype, lcms, libtiff, libxml2 +{ lib, stdenv, fetchurl, pkg-config, freetype, lcms, libtiff, libxml2 , libart_lgpl, qt4, python2, cups, fontconfig, libjpeg , zlib, libpng, xorg, cairo, podofo, hunspell, boost, cmake, imagemagick, ghostscript }: @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { sha256 = "0bq433myw6h1siqlsakxv6ghb002rp3mfz5k12bg68s0k6skn992"; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = with xorg; [ freetype lcms libtiff libxml2 libart_lgpl qt4 pythonEnv cups fontconfig @@ -43,10 +43,10 @@ in stdenv.mkDerivation rec { ''; meta = { - maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = stdenv.lib.platforms.linux; + maintainers = [ lib.maintainers.marcweber ]; + platforms = lib.platforms.linux; description = "Desktop Publishing (DTP) and Layout program for Linux"; homepage = "https://www.scribus.net"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/applications/office/scribus/unstable.nix b/pkgs/applications/office/scribus/unstable.nix index 8745dd37c98..acf44880452 100644 --- a/pkgs/applications/office/scribus/unstable.nix +++ b/pkgs/applications/office/scribus/unstable.nix @@ -14,7 +14,7 @@ , libxml2 , mkDerivation , pixman -, pkgconfig +, pkg-config , podofo , poppler , poppler_data @@ -22,7 +22,7 @@ , qtbase , qtimageformats , qttools -, lib, stdenv +, lib }: let @@ -45,7 +45,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/office/skanlite/default.nix b/pkgs/applications/office/skanlite/default.nix index 7436054715d..89cf2add212 100644 --- a/pkgs/applications/office/skanlite/default.nix +++ b/pkgs/applications/office/skanlite/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchurl, cmake, extra-cmake-modules, qtbase, +{ lib, mkDerivation, fetchurl, cmake, extra-cmake-modules, qtbase, kcoreaddons, kdoctools, ki18n, kio, kxmlgui, ktextwidgets, libksane }: diff --git a/pkgs/applications/office/softmaker/generic.nix b/pkgs/applications/office/softmaker/generic.nix index 7d936f400b8..a80eaa459c0 100644 --- a/pkgs/applications/office/softmaker/generic.nix +++ b/pkgs/applications/office/softmaker/generic.nix @@ -73,7 +73,7 @@ in stdenv.mkDerivation { extraWrapperArgs = '' --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ --set NIX_REDIRECTS "/bin/ls=${coreutils}/bin/ls" \ - --prefix PATH : "${stdenv.lib.makeBinPath [ coreutils gnugrep util-linux which ]}" + --prefix PATH : "${lib.makeBinPath [ coreutils gnugrep util-linux which ]}" ''; in '' runHook preInstall diff --git a/pkgs/applications/office/spice-up/default.nix b/pkgs/applications/office/spice-up/default.nix index f40bc44e6eb..28e35d08e91 100644 --- a/pkgs/applications/office/spice-up/default.nix +++ b/pkgs/applications/office/spice-up/default.nix @@ -9,7 +9,7 @@ , gettext , ninja , pantheon -, pkgconfig +, pkg-config , json-glib , libgudev , libevdev @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { cmake gettext ninja - pkgconfig + pkg-config vala wrapGAppsHook ]; diff --git a/pkgs/applications/office/timetable/default.nix b/pkgs/applications/office/timetable/default.nix index fa70fdd3082..9c9df892a04 100644 --- a/pkgs/applications/office/timetable/default.nix +++ b/pkgs/applications/office/timetable/default.nix @@ -8,7 +8,7 @@ , libgee , meson , ninja -, pkgconfig +, pkg-config , pantheon , python3 , wrapGAppsHook @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config vala python3 wrapGAppsHook diff --git a/pkgs/applications/office/timetrap/gemset.nix b/pkgs/applications/office/timetrap/gemset.nix index 65ab4ade9e0..d1655e0695c 100644 --- a/pkgs/applications/office/timetrap/gemset.nix +++ b/pkgs/applications/office/timetrap/gemset.nix @@ -40,4 +40,4 @@ }; version = "1.15.2"; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/office/timeular/default.nix b/pkgs/applications/office/timeular/default.nix index 63f86171dce..6c1068d4584 100644 --- a/pkgs/applications/office/timeular/default.nix +++ b/pkgs/applications/office/timeular/default.nix @@ -1,5 +1,5 @@ { - lib, stdenv, + lib, fetchurl, appimageTools, libsecret diff --git a/pkgs/applications/office/todo.txt-cli/default.nix b/pkgs/applications/office/todo.txt-cli/default.nix index 8db5691ed84..0e06cf2f65a 100644 --- a/pkgs/applications/office/todo.txt-cli/default.nix +++ b/pkgs/applications/office/todo.txt-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: let version = "2.12.0"; in stdenv.mkDerivation { @@ -22,7 +22,7 @@ in stdenv.mkDerivation { meta = { description = "Simple plaintext todo list manager"; homepage = "http://todotxt.com"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl3; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix index dc788a6f195..4011879ddb8 100644 --- a/pkgs/applications/office/todoman/default.nix +++ b/pkgs/applications/office/todoman/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , python3 , glibcLocales , installShellFiles diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index bd067688fb4..499aa1e5faf 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -16,7 +16,7 @@ let homepage = "https://github.com/zadam/trilium"; license = licenses.agpl3; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ emmanuelrosa dtzWill kampka ]; + maintainers = with maintainers; [ emmanuelrosa dtzWill ]; }; version = "0.43.3"; diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix index d0c5eb4e7b2..65eb48f3b2d 100644 --- a/pkgs/applications/office/tryton/default.nix +++ b/pkgs/applications/office/tryton/default.nix @@ -1,6 +1,6 @@ -{ stdenv +{ lib , python3Packages -, pkgconfig +, pkg-config , librsvg , gobject-introspection , atk @@ -16,7 +16,7 @@ , wrapGAppsHook }: -with stdenv.lib; +with lib; python3Packages.buildPythonApplication rec { pname = "tryton"; @@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config gobject-introspection wrapGAppsHook ]; diff --git a/pkgs/applications/office/tudu/default.nix b/pkgs/applications/office/tudu/default.nix index e353b43c747..57204fe8656 100644 --- a/pkgs/applications/office/tudu/default.nix +++ b/pkgs/applications/office/tudu/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ]; - preConfigure = stdenv.lib.optionalString stdenv.cc.isClang '' + preConfigure = lib.optionalString stdenv.cc.isClang '' substituteInPlace configure \ --replace 'echo "main()' 'echo "int main()' ''; diff --git a/pkgs/applications/office/watson/default.nix b/pkgs/applications/office/watson/default.nix index 30992e60a6f..18c1b9469e7 100644 --- a/pkgs/applications/office/watson/default.nix +++ b/pkgs/applications/office/watson/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pythonPackages, installShellFiles }: +{ lib, fetchFromGitHub, pythonPackages, installShellFiles }: with pythonPackages; diff --git a/pkgs/applications/office/wordgrinder/default.nix b/pkgs/applications/office/wordgrinder/default.nix index 921ce4d5f3d..0b086160e50 100644 --- a/pkgs/applications/office/wordgrinder/default.nix +++ b/pkgs/applications/office/wordgrinder/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, makeWrapper +{ lib, stdenv, fetchFromGitHub, pkg-config, makeWrapper , lua52Packages, libXft, ncurses, ninja, readline, zlib }: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { "OBJDIR=$TMP/wg-build" ]; - preBuild = stdenv.lib.optionalString stdenv.isLinux '' + preBuild = lib.optionalString stdenv.isLinux '' makeFlagsArray+=('XFT_PACKAGE=--cflags={} --libs={-lX11 -lXft}') ''; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { dontConfigure = true; nativeBuildInputs = [ - pkgconfig + pkg-config makeWrapper ninja ]; @@ -38,17 +38,17 @@ stdenv.mkDerivation rec { ncurses readline zlib - ] ++ stdenv.lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ libXft ]; # To be able to find <Xft.h> - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isLinux "-I${libXft.dev}/include/X11"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isLinux "-I${libXft.dev}/include/X11"; # Binaries look for LuaFileSystem library (lfs.so) at runtime postInstall = '' wrapProgram $out/bin/wordgrinder --set LUA_CPATH "${lua52Packages.luafilesystem}/lib/lua/5.2/lfs.so"; - '' + stdenv.lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.isLinux '' wrapProgram $out/bin/xwordgrinder --set LUA_CPATH "${lua52Packages.luafilesystem}/lib/lua/5.2/lfs.so"; ''; @@ -57,6 +57,6 @@ stdenv.mkDerivation rec { homepage = "https://cowlark.com/wordgrinder"; license = licenses.mit; maintainers = with maintainers; [ matthiasbeyer ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix index 9ab7446fe3c..e0f156f06c9 100644 --- a/pkgs/applications/office/wpsoffice/default.nix +++ b/pkgs/applications/office/wpsoffice/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , mkDerivation , fetchurl , autoPatchelfHook @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { unpackCmd = "dpkg -x $src ."; sourceRoot = "."; - postUnpack = stdenv.lib.optionalString (version == "11.1.0.9505") '' + postUnpack = lib.optionalString (version == "11.1.0.9505") '' # distribution is missing libjsapiservice.so, so we should not let # autoPatchelfHook fail on the following dead libraries rm opt/kingsoft/wps-office/office6/{libjsetapi.so,libjswppapi.so,libjswpsapi.so} @@ -60,8 +60,8 @@ stdenv.mkDerivation rec { homepage = "http://wps-community.org/"; platforms = [ "x86_64-linux" ]; hydraPlatforms = []; - license = stdenv.lib.licenses.unfreeRedistributable; - maintainers = with stdenv.lib.maintainers; [ mlatus th0rgal ]; + license = lib.licenses.unfreeRedistributable; + maintainers = with lib.maintainers; [ mlatus th0rgal ]; }; buildInputs = with xorg; [ @@ -155,7 +155,7 @@ stdenv.mkDerivation rec { done ''; - runtimeLibPath = stdenv.lib.makeLibraryPath [ + runtimeLibPath = lib.makeLibraryPath [ cups.lib ]; diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index 4b41655b9ae..739b003bbef 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { dontStrip = true; dontPatchELF = true; - libPath = stdenv.lib.makeLibraryPath + libPath = lib.makeLibraryPath [ stdenv.cc.cc atk cairo @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { nspr nss pango - ] + ":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" [ + ] + ":" + lib.makeSearchPathOutput "lib" "lib64" [ stdenv.cc.cc ]; @@ -134,7 +134,7 @@ stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( - --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils ]} + --prefix PATH : ${lib.makeBinPath [ coreutils ]} ) ''; diff --git a/pkgs/applications/printing/pappl/default.nix b/pkgs/applications/printing/pappl/default.nix index 5cad364d240..4c7b60c125c 100644 --- a/pkgs/applications/printing/pappl/default.nix +++ b/pkgs/applications/printing/pappl/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "pappl"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "michaelrsweet"; repo = pname; rev = "v${version}"; - sha256 = "1cg06v8hxska0hnybnmfda1v4h3ifjir24nx2iqx80kb6jq0hayb"; + sha256 = "sha256-4evyOrPd8zb5y00L8h2t++ayW1S8WQ5P+6MXe6eju68="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/applications/radio/airspy/default.nix b/pkgs/applications/radio/airspy/default.nix index f006eeb6756..6299fe21d29 100644 --- a/pkgs/applications/radio/airspy/default.nix +++ b/pkgs/applications/radio/airspy/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub -, cmake , pkgconfig, libusb1 +, cmake , pkg-config, libusb1 }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { substituteInPlace airspy-tools/CMakeLists.txt --replace "/etc/udev/rules.d" "$out/etc/udev/rules.d" ''; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libusb1 ]; cmakeFlags = diff --git a/pkgs/applications/radio/chirp/default.nix b/pkgs/applications/radio/chirp/default.nix index 6b84e47909d..e9b446dc584 100644 --- a/pkgs/applications/radio/chirp/default.nix +++ b/pkgs/applications/radio/chirp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchurl , python2 }: diff --git a/pkgs/applications/radio/cubicsdr/default.nix b/pkgs/applications/radio/cubicsdr/default.nix index d3b5b12836f..7e346bcbf84 100644 --- a/pkgs/applications/radio/cubicsdr/default.nix +++ b/pkgs/applications/radio/cubicsdr/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, cmake, fftw, hamlib, libpulseaudio, libGL, libX11, liquid-dsp, - pkgconfig, soapysdr-with-plugins, wxGTK31-gtk3, enableDigitalLab ? false }: + pkg-config, soapysdr-with-plugins, wxGTK31-gtk3, enableDigitalLab ? false }: stdenv.mkDerivation rec { pname = "cubicsdr"; @@ -29,12 +29,12 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ fftw hamlib libpulseaudio libGL libX11 liquid-dsp soapysdr-with-plugins wxGTK31-gtk3 ]; cmakeFlags = [ "-DUSE_HAMLIB=ON" ] - ++ stdenv.lib.optional enableDigitalLab "-DENABLE_DIGITAL_LAB=ON"; + ++ lib.optional enableDigitalLab "-DENABLE_DIGITAL_LAB=ON"; meta = with lib; { homepage = "https://cubicsdr.com"; diff --git a/pkgs/applications/radio/dablin/default.nix b/pkgs/applications/radio/dablin/default.nix index 0fb7317428e..e74cc551d49 100644 --- a/pkgs/applications/radio/dablin/default.nix +++ b/pkgs/applications/radio/dablin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config , mpg123, SDL2, gnome3, faad2, pcre } : @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0143jnhwwh4din6mlrkbm8m2wm8vnrlk0yk9r5qcvj70r2314bgq"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ faad2 mpg123 SDL2 gnome3.gtkmm pcre ]; diff --git a/pkgs/applications/radio/dabtools/default.nix b/pkgs/applications/radio/dabtools/default.nix index 04d1e6056de..a288d93b40a 100644 --- a/pkgs/applications/radio/dabtools/default.nix +++ b/pkgs/applications/radio/dabtools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config , libusb1, rtl-sdr, fftw } : @@ -13,7 +13,7 @@ stdenv.mkDerivation { sha256 = "18nkdybgg2w6zh56g6xwmg49sifalvraz4rynw8w5d8cqi3dm9sm"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ rtl-sdr fftw libusb1 ]; meta = with lib; { diff --git a/pkgs/applications/radio/direwolf/default.nix b/pkgs/applications/radio/direwolf/default.nix index 321b103c7f7..e7da78034cc 100644 --- a/pkgs/applications/radio/direwolf/default.nix +++ b/pkgs/applications/radio/direwolf/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, cmake, alsaLib, espeak, glibc, gpsd +{ lib, stdenv, fetchFromGitHub, cmake, alsaLib, espeak, glibc, gpsd , hamlib, perl, python, udev }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "direwolf"; diff --git a/pkgs/applications/radio/dsd/default.nix b/pkgs/applications/radio/dsd/default.nix index 4b9fbcd6af2..35a3e9f44bb 100644 --- a/pkgs/applications/radio/dsd/default.nix +++ b/pkgs/applications/radio/dsd/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ mbelib libsndfile itpp - ] ++ stdenv.lib.optionals portaudioSupport [ portaudio ]; + ] ++ lib.optionals portaudioSupport [ portaudio ]; doCheck = true; preCheck = '' diff --git a/pkgs/applications/radio/dump1090/default.nix b/pkgs/applications/radio/dump1090/default.nix index f97ffb4d807..65afdccf812 100644 --- a/pkgs/applications/radio/dump1090/default.nix +++ b/pkgs/applications/radio/dump1090/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchFromGitHub -, pkgconfig +, pkg-config , libbladeRF , libusb1 , ncurses @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "1zacsqaqsiapljhzw31dwc4nld2rp98jm3ivkyznrhzk9n156p42"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libbladeRF diff --git a/pkgs/applications/radio/fldigi/default.nix b/pkgs/applications/radio/fldigi/default.nix index 07e9647f2c3..51728bfb403 100644 --- a/pkgs/applications/radio/fldigi/default.nix +++ b/pkgs/applications/radio/fldigi/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, hamlib, fltk14, libjpeg, libpng, portaudio, libsndfile, - libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }: +{ lib, stdenv, fetchurl, hamlib, fltk14, libjpeg, libpng, portaudio, libsndfile, + libsamplerate, libpulseaudio, libXinerama, gettext, pkg-config, alsaLib }: stdenv.mkDerivation rec { version = "4.1.17"; @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { }; buildInputs = [ libXinerama gettext hamlib fltk14 libjpeg libpng portaudio - libsndfile libsamplerate libpulseaudio pkgconfig alsaLib ]; + libsndfile libsamplerate libpulseaudio pkg-config alsaLib ]; meta = { description = "Digital modem program"; homepage = "https://sourceforge.net/projects/fldigi/"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ relrod ftrvxmtrx ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ relrod ftrvxmtrx ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/radio/fllog/default.nix b/pkgs/applications/radio/fllog/default.nix index 649caae0902..b0983c811e1 100644 --- a/pkgs/applications/radio/fllog/default.nix +++ b/pkgs/applications/radio/fllog/default.nix @@ -1,8 +1,9 @@ -{ stdenv +{ lib +, stdenv , fetchurl , fltk13 , libjpeg -, pkgconfig +, pkg-config }: stdenv.mkDerivation rec { @@ -20,14 +21,14 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config ]; meta = { description = "Digital modem log program"; homepage = "https://sourceforge.net/projects/fldigi/"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ dysinger ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ dysinger ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/radio/flmsg/default.nix b/pkgs/applications/radio/flmsg/default.nix index fa3f175fcc5..0f75f704af3 100644 --- a/pkgs/applications/radio/flmsg/default.nix +++ b/pkgs/applications/radio/flmsg/default.nix @@ -1,8 +1,9 @@ -{ stdenv +{ lib +, stdenv , fetchurl , fltk13 , libjpeg -, pkgconfig +, pkg-config }: stdenv.mkDerivation rec { @@ -20,14 +21,14 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config ]; meta = { description = "Digital modem message program"; homepage = "https://sourceforge.net/projects/fldigi/"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ dysinger ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ dysinger ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/radio/flrig/default.nix b/pkgs/applications/radio/flrig/default.nix index 322f2eb9a3b..276581d80e5 100644 --- a/pkgs/applications/radio/flrig/default.nix +++ b/pkgs/applications/radio/flrig/default.nix @@ -1,8 +1,9 @@ -{ stdenv +{ lib +, stdenv , fetchurl , fltk13 , libjpeg -, pkgconfig +, pkg-config }: stdenv.mkDerivation rec { @@ -20,14 +21,14 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config ]; meta = { description = "Digital modem rig control program"; homepage = "https://sourceforge.net/projects/fldigi/"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ dysinger ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ dysinger ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/radio/flwrap/default.nix b/pkgs/applications/radio/flwrap/default.nix index 889c212de4e..7471d6676ed 100644 --- a/pkgs/applications/radio/flwrap/default.nix +++ b/pkgs/applications/radio/flwrap/default.nix @@ -1,8 +1,9 @@ -{ stdenv +{ lib +, stdenv , fetchurl , fltk13 , libjpeg -, pkgconfig +, pkg-config }: stdenv.mkDerivation rec { @@ -20,14 +21,14 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config ]; meta = { description = "Digital modem file transfer program"; homepage = "https://sourceforge.net/projects/fldigi/"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ dysinger ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ dysinger ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/radio/gnuradio/3.7.nix b/pkgs/applications/radio/gnuradio/3.7.nix index 54fb0d7d66c..a48efb9aa6d 100644 --- a/pkgs/applications/radio/gnuradio/3.7.nix +++ b/pkgs/applications/radio/gnuradio/3.7.nix @@ -1,10 +1,10 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch , cmake # Remove gcc and python references , removeReferencesTo -, pkgconfig +, pkg-config , cppunit , swig , orc @@ -53,7 +53,7 @@ let basic = { native = [ cmake - pkgconfig + pkg-config orc ]; runtime = [ boost log4cpp mpir ]; @@ -138,8 +138,8 @@ let }; gr-audio = { runtime = [] - ++ stdenv.lib.optionals stdenv.isLinux [ alsaLib libjack2 ] - ++ stdenv.lib.optionals stdenv.isDarwin [ CoreAudio ] + ++ lib.optionals stdenv.isLinux [ alsaLib libjack2 ] + ++ lib.optionals stdenv.isDarwin [ CoreAudio ] ; cmakeEnableFlag = "GR_AUDIO"; }; @@ -198,6 +198,7 @@ let }; shared = (import ./shared.nix { inherit + lib stdenv python removeReferencesTo @@ -229,7 +230,7 @@ let # From some reason, if these are not set, libcodec2 and gsm are # not detected properly (slightly different then what's in # ./default.nix). - ++ stdenv.lib.optionals (hasFeature "gr-vocoder" features) [ + ++ lib.optionals (hasFeature "gr-vocoder" features) [ "-DLIBCODEC2_LIBRARIES=${codec2}/lib/libcodec2.so" "-DLIBCODEC2_INCLUDE_DIR=${codec2}/include" "-DLIBGSM_LIBRARIES=${gsm}/lib/libgsm.so" @@ -238,16 +239,15 @@ let ; stripDebugList = shared.stripDebugList # gr-fcd feature was dropped in 3.8 - ++ stdenv.lib.optionals (hasFeature "gr-fcd" features) [ "share/gnuradio/examples/fcd" ] + ++ lib.optionals (hasFeature "gr-fcd" features) [ "share/gnuradio/examples/fcd" ] ; - preConfigure = '' - '' + preConfigure = "" # wxgui and pygtk are not looked up properly, so we force them to be # detected as found, if they are requested by the `features` attrset. - + stdenv.lib.optionalString (hasFeature "gr-wxgui" features) '' + + lib.optionalString (hasFeature "gr-wxgui" features) '' sed -i 's/.*wx\.version.*/set(WX_FOUND TRUE)/g' gr-wxgui/CMakeLists.txt '' - + stdenv.lib.optionalString (hasFeature "gnuradio-companion" features) '' + + lib.optionalString (hasFeature "gnuradio-companion" features) '' sed -i 's/.*pygtk_version.*/set(PYGTK_FOUND TRUE)/g' grc/CMakeLists.txt '' # If python-support is disabled, don't install volk's (git submodule) @@ -256,7 +256,7 @@ let # NOTE: The same is done for 3.8, but we don't put this string in # ./shared.nix since on the next release of 3.8 it won't be needed there, # but it will be needed for 3.7, probably for ever. - + stdenv.lib.optionalString (!hasFeature "python-support" features) '' + + lib.optionalString (!hasFeature "python-support" features) '' sed -i -e "/python\/volk_modtool/d" volk/CMakeLists.txt '' ; diff --git a/pkgs/applications/radio/gnuradio/ais.nix b/pkgs/applications/radio/gnuradio/ais.nix index 9c993de65d0..94556561439 100644 --- a/pkgs/applications/radio/gnuradio/ais.nix +++ b/pkgs/applications/radio/gnuradio/ais.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake makeWrapper pkg-config ]; buildInputs = [ boost gnuradio cppunit gr-osmosdr log4cpp ] - ++ stdenv.lib.optionals pythonSupport [ python swig ]; + ++ lib.optionals pythonSupport [ python swig ]; postInstall = '' for prog in "$out"/bin/*; do diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index 811eb37f4f3..9bc1511968b 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -1,10 +1,10 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch , cmake # Remove gcc and python references , removeReferencesTo -, pkgconfig +, pkg-config , cppunit , swig , orc @@ -53,7 +53,7 @@ let basic = { native = [ cmake - pkgconfig + pkg-config orc ]; runtime = [ @@ -143,8 +143,8 @@ let }; gr-audio = { runtime = [] - ++ stdenv.lib.optionals stdenv.isLinux [ alsaLib libjack2 ] - ++ stdenv.lib.optionals stdenv.isDarwin [ CoreAudio ] + ++ lib.optionals stdenv.isLinux [ alsaLib libjack2 ] + ++ lib.optionals stdenv.isDarwin [ CoreAudio ] ; cmakeEnableFlag = "GR_AUDIO"; }; @@ -193,6 +193,7 @@ let shared = (import ./shared.nix { inherit stdenv + lib python removeReferencesTo featuresInfo @@ -217,13 +218,14 @@ let passthru doCheck dontWrapPythonPrograms + dontWrapQtApps meta ; cmakeFlags = shared.cmakeFlags # From some reason, if these are not set, libcodec2 and gsm are not # detected properly. NOTE: qradiolink needs libcodec2 to be detected in # order to build, see https://github.com/qradiolink/qradiolink/issues/67 - ++ stdenv.lib.optionals (hasFeature "gr-vocoder" features) [ + ++ lib.optionals (hasFeature "gr-vocoder" features) [ "-DLIBCODEC2_LIBRARIES=${codec2}/lib/libcodec2.so" "-DLIBCODEC2_INCLUDE_DIRS=${codec2}/include" "-DLIBCODEC2_HAS_FREEDV_API=ON" @@ -235,12 +237,11 @@ let postInstall = shared.postInstall # This is the only python reference worth removing, if needed (3.7 doesn't # set that reference). - + stdenv.lib.optionalString (!hasFeature "python-support" features) '' + + lib.optionalString (!hasFeature "python-support" features) '' ${removeReferencesTo}/bin/remove-references-to -t ${python} $out/lib/cmake/gnuradio/GnuradioConfig.cmake '' ; - preConfigure = '' - '' + preConfigure = "" # If python-support is disabled, don't install volk's (git submodule) # volk_modtool - it references python. # @@ -249,7 +250,7 @@ let # we'll need to package volk while able to tell it to install or not # install python referencing files. When we'll be there, this will help: # https://github.com/gnuradio/volk/pull/404 - + stdenv.lib.optionalString (!hasFeature "python-support" features) '' + + lib.optionalString (!hasFeature "python-support" features) '' sed -i -e "/python\/volk_modtool/d" volk/CMakeLists.txt '' ; @@ -283,6 +284,7 @@ stdenv.mkDerivation rec { passthru doCheck dontWrapPythonPrograms + dontWrapQtApps meta ; } diff --git a/pkgs/applications/radio/gnuradio/gsm.nix b/pkgs/applications/radio/gnuradio/gsm.nix index 39834540ff8..28c5045081b 100644 --- a/pkgs/applications/radio/gnuradio/gsm.nix +++ b/pkgs/applications/radio/gnuradio/gsm.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ boost gnuradio makeWrapper cppunit libosmocore gr-osmosdr log4cpp - ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; + ] ++ lib.optionals pythonSupport [ python swig ]; postInstall = '' for prog in "$out"/bin/*; do diff --git a/pkgs/applications/radio/gnuradio/limesdr.nix b/pkgs/applications/radio/gnuradio/limesdr.nix index 1033b25cb3d..afe3de64527 100644 --- a/pkgs/applications/radio/gnuradio/limesdr.nix +++ b/pkgs/applications/radio/gnuradio/limesdr.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, boost, gnuradio , pythonSupport ? true, python, swig, limesuite, log4cpp } : @@ -20,12 +20,12 @@ in stdenv.mkDerivation { nativeBuildInputs = [ cmake - pkgconfig - ] ++ stdenv.lib.optionals pythonSupport [ swig ]; + pkg-config + ] ++ lib.optionals pythonSupport [ swig ]; buildInputs = [ boost gnuradio limesuite log4cpp - ] ++ stdenv.lib.optionals pythonSupport [ python ]; + ] ++ lib.optionals pythonSupport [ python ]; meta = with lib; { diff --git a/pkgs/applications/radio/gnuradio/nacl.nix b/pkgs/applications/radio/gnuradio/nacl.nix index e87d2a71b1c..f6c21e79454 100644 --- a/pkgs/applications/radio/gnuradio/nacl.nix +++ b/pkgs/applications/radio/gnuradio/nacl.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ boost gnuradio uhd makeWrapper libsodium cppunit log4cpp - ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; + ] ++ lib.optionals pythonSupport [ python swig ]; postInstall = '' for prog in "$out"/bin/*; do diff --git a/pkgs/applications/radio/gnuradio/osmosdr.nix b/pkgs/applications/radio/gnuradio/osmosdr.nix index 90adcf5ffae..436c4309a5b 100644 --- a/pkgs/applications/radio/gnuradio/osmosdr.nix +++ b/pkgs/applications/radio/gnuradio/osmosdr.nix @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake makeWrapper pkg-config ]; buildInputs = [ boost log4cpp airspy gnuradio hackrf libbladeRF rtl-sdr uhd - ] ++ stdenv.lib.optionals stdenv.isLinux [ soapysdr-with-plugins ] - ++ stdenv.lib.optionals pythonSupport [ python swig python.pkgs.cheetah ]; + ] ++ lib.optionals stdenv.isLinux [ soapysdr-with-plugins ] + ++ lib.optionals pythonSupport [ python swig python.pkgs.cheetah ]; postInstall = '' for prog in "$out"/bin/*; do diff --git a/pkgs/applications/radio/gnuradio/rds.nix b/pkgs/applications/radio/gnuradio/rds.nix index 3c90a8ad985..4f15f2a961e 100644 --- a/pkgs/applications/radio/gnuradio/rds.nix +++ b/pkgs/applications/radio/gnuradio/rds.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ boost gnuradio makeWrapper log4cpp - ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; + ] ++ lib.optionals pythonSupport [ python swig ]; postInstall = '' for prog in "$out"/bin/*; do diff --git a/pkgs/applications/radio/gnuradio/shared.nix b/pkgs/applications/radio/gnuradio/shared.nix index 66ce0a5f513..9b354d5b960 100644 --- a/pkgs/applications/radio/gnuradio/shared.nix +++ b/pkgs/applications/radio/gnuradio/shared.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , python , qt , gtk @@ -14,9 +14,7 @@ , fetchSubmodules }: -let - lib = stdenv.lib; -in rec { +rec { version = builtins.concatStringsSep "." ( lib.attrVals [ "major" "minor" "patch" ] versionAttr ); @@ -85,8 +83,7 @@ in rec { ++ lib.optionals (hasFeature "gr-uhd" features) [ "share/gnuradio/examples/uhd" ] ++ lib.optionals (hasFeature "gr-qtgui" features) [ "share/gnuradio/examples/qt-gui" ] ; - postInstall = '' - '' + postInstall = "" # Gcc references + lib.optionalString (hasFeature "volk" features) '' ${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc} $(readlink -f $out/lib/libvolk.so) @@ -112,6 +109,7 @@ in rec { }; # Wrapping is done with an external wrapper dontWrapPythonPrograms = true; + dontWrapQtApps = true; # Tests should succeed, but it's hard to get LD_LIBRARY_PATH right in order # for it to happen. doCheck = false; diff --git a/pkgs/applications/radio/gnuradio/wrapper.nix b/pkgs/applications/radio/gnuradio/wrapper.nix index 6b854918f57..aaf74abc2c5 100644 --- a/pkgs/applications/radio/gnuradio/wrapper.nix +++ b/pkgs/applications/radio/gnuradio/wrapper.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , unwrapped , makeWrapper # For lndir @@ -28,7 +29,7 @@ let pythonPkgs = extraPythonPackages # Add the extraPackages as python modules as well ++ (builtins.map unwrapped.python.pkgs.toPythonModule extraPackages) - ++ stdenv.lib.flatten (stdenv.lib.mapAttrsToList ( + ++ lib.flatten (lib.mapAttrsToList ( feat: info: ( if unwrapped.hasFeature feat unwrapped.features then (if builtins.hasAttr "pythonRuntime" info then info.pythonRuntime else []) @@ -36,18 +37,18 @@ let [] ) ) unwrapped.featuresInfo) - ++ stdenv.lib.optionals (unwrapped.hasFeature "python-support" unwrapped.features) [ + ++ lib.optionals (unwrapped.hasFeature "python-support" unwrapped.features) [ # Add unwrapped itself as a python module (unwrapped.python.pkgs.toPythonModule unwrapped) ] ; python3Env = unwrapped.python.withPackages(ps: pythonPkgs); - name = (stdenv.lib.appendToName "wrapped" unwrapped).name; + name = (lib.appendToName "wrapped" unwrapped).name; makeWrapperArgs = builtins.concatStringsSep " " ([ ] # Emulating wrapGAppsHook & wrapQtAppsHook working together - ++ stdenv.lib.optionals ( + ++ lib.optionals ( (unwrapped.hasFeature "gnuradio-companion" unwrapped.features) || (unwrapped.hasFeature "gr-qtgui" unwrapped.features) ) [ @@ -57,14 +58,14 @@ let "--prefix" "XDG_DATA_DIRS" ":" "${hicolor-icon-theme}/share" # Needs to run `gsettings` on startup, see: # https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg1764890.html - "--prefix" "PATH" ":" "${stdenv.lib.getBin glib}/bin" + "--prefix" "PATH" ":" "${lib.getBin glib}/bin" ] - ++ stdenv.lib.optionals (unwrapped.hasFeature "gnuradio-companion" unwrapped.features) [ + ++ lib.optionals (unwrapped.hasFeature "gnuradio-companion" unwrapped.features) [ "--set" "GDK_PIXBUF_MODULE_FILE" "${librsvg}/${gdk-pixbuf.moduleDir}.cache" - "--prefix" "GIO_EXTRA_MODULES" ":" "${stdenv.lib.getLib dconf}/lib/gio/modules" + "--prefix" "GIO_EXTRA_MODULES" ":" "${lib.getLib dconf}/lib/gio/modules" "--prefix" "XDG_DATA_DIRS" ":" "${unwrapped.gtk}/share" "--prefix" "XDG_DATA_DIRS" ":" "${unwrapped.gtk}/share/gsettings-schemas/${unwrapped.gtk.name}" - "--prefix" "GI_TYPELIB_PATH" ":" "${stdenv.lib.makeSearchPath "lib/girepository-1.0" [ + "--prefix" "GI_TYPELIB_PATH" ":" "${lib.makeSearchPath "lib/girepository-1.0" [ unwrapped.gtk gsettings-desktop-schemas atk @@ -79,17 +80,17 @@ let at-spi2-core ]}" ] - ++ stdenv.lib.optionals (extraPackages != []) [ - "--prefix" "GRC_BLOCKS_PATH" ":" "${stdenv.lib.makeSearchPath "share/gnuradio/grc/blocks" extraPackages}" + ++ lib.optionals (extraPackages != []) [ + "--prefix" "GRC_BLOCKS_PATH" ":" "${lib.makeSearchPath "share/gnuradio/grc/blocks" extraPackages}" ] - ++ stdenv.lib.optionals (unwrapped.hasFeature "gr-qtgui" unwrapped.features) + ++ lib.optionals (unwrapped.hasFeature "gr-qtgui" unwrapped.features) # 3.7 builds with qt4 (if unwrapped.versionAttr.major == "3.8" then [ "--prefix" "QT_PLUGIN_PATH" ":" - "${stdenv.lib.getBin unwrapped.qt.qtbase}/${unwrapped.qt.qtbase.qtPluginPrefix}" + "${lib.getBin unwrapped.qt.qtbase}/${unwrapped.qt.qtbase.qtPluginPrefix}" "--prefix" "QML2_IMPORT_PATH" ":" - "${stdenv.lib.getBin unwrapped.qt.qtbase}/${unwrapped.qt.qtbase.qtQmlPrefix}" + "${lib.getBin unwrapped.qt.qtbase}/${unwrapped.qt.qtbase.qtQmlPrefix}" ] else # TODO: Add here qt4 related environment for 3.7? diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix index a4a1dfa61e4..217818f67c2 100644 --- a/pkgs/applications/radio/gqrx/default.nix +++ b/pkgs/applications/radio/gqrx/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, qtbase, qtsvg, gnuradio, boost, gr-osmosdr +{ lib, fetchFromGitHub, cmake, qtbase, qtsvg, gnuradio, boost, gr-osmosdr , mkDerivation # drivers (optional): , rtl-sdr, hackrf @@ -9,19 +9,19 @@ assert pulseaudioSupport -> libpulseaudio != null; mkDerivation rec { pname = "gqrx"; - version = "2.14.3"; + version = "2.14.4"; src = fetchFromGitHub { owner = "csete"; repo = "gqrx"; rev = "v${version}"; - sha256 = "10pmd2jqmw77gybjfzrch6qi8jil1g6nsjzabbd6gnbsq7320axj"; + sha256 = "sha256-mMaxu0jq2GaNLWjLsJQXx+zCxtyiCAZQJJZ8GJtnllQ="; }; nativeBuildInputs = [ cmake ]; buildInputs = [ qtbase qtsvg gnuradio boost gr-osmosdr rtl-sdr hackrf - ] ++ stdenv.lib.optionals pulseaudioSupport [ libpulseaudio ]; + ] ++ lib.optionals pulseaudioSupport [ libpulseaudio ]; postInstall = '' install -vD $src/gqrx.desktop -t "$out/share/applications/" diff --git a/pkgs/applications/radio/hackrf/default.nix b/pkgs/applications/radio/hackrf/default.nix index 41df55a890d..98dce802c5c 100644 --- a/pkgs/applications/radio/hackrf/default.nix +++ b/pkgs/applications/radio/hackrf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, libusb1, fftwSinglePrec }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libusb1, fftwSinglePrec }: stdenv.mkDerivation rec { pname = "hackrf"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/radio/inspectrum/default.nix b/pkgs/applications/radio/inspectrum/default.nix index cf4ddd5b6e8..37131a686b5 100644 --- a/pkgs/applications/radio/inspectrum/default.nix +++ b/pkgs/applications/radio/inspectrum/default.nix @@ -1,7 +1,7 @@ { lib , mkDerivation , fetchFromGitHub -, pkgconfig +, pkg-config , cmake , boost , fftwFloat @@ -22,7 +22,7 @@ mkDerivation rec { sha256 = "1x6nyn429pk0f7lqzskrgsbq09mq5787xd4piic95add6n1cc355"; }; - nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; buildInputs = [ fftwFloat boost diff --git a/pkgs/applications/radio/kalibrate-hackrf/default.nix b/pkgs/applications/radio/kalibrate-hackrf/default.nix index dc6b1325cf1..5792031c802 100644 --- a/pkgs/applications/radio/kalibrate-hackrf/default.nix +++ b/pkgs/applications/radio/kalibrate-hackrf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, fftw, hackrf, libusb1 }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, fftw, hackrf, libusb1 }: stdenv.mkDerivation { name = "kalibrate-hackrf-unstable-20160827"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "1jvn1qx7csgycxpx1k804sm9gk5a0c65z9gh8ybp9awq3pziv0nx"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ fftw hackrf libusb1 ]; diff --git a/pkgs/applications/radio/kalibrate-rtl/default.nix b/pkgs/applications/radio/kalibrate-rtl/default.nix index 536e83297c3..255938b11d5 100644 --- a/pkgs/applications/radio/kalibrate-rtl/default.nix +++ b/pkgs/applications/radio/kalibrate-rtl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, autoreconfHook, pkgconfig, fftw, rtl-sdr, libusb1 }: +{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, fftw, rtl-sdr, libusb1 }: stdenv.mkDerivation { name = "kalibrate-rtl-20131214"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "1spbfflkqnw9s8317ppsf7b1nnkicqsmaqsnz1zf8i49ix70i6kn"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ fftw rtl-sdr libusb1 ]; meta = with lib; { diff --git a/pkgs/applications/radio/klog/default.nix b/pkgs/applications/radio/klog/default.nix new file mode 100644 index 00000000000..080011e167e --- /dev/null +++ b/pkgs/applications/radio/klog/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, fetchurl, hamlib, pkg-config, qt5, qtbase, qttools, qtserialport, qtcharts, qmake, wrapQtAppsHook }: + +stdenv.mkDerivation rec { + pname = "klog"; + version = "1.3.2"; + + src = fetchurl { + url = "https://download.savannah.nongnu.org/releases/klog/${pname}-${version}.tar.gz"; + sha256 = "1d5x7rq0mgfrqws3q1y4z8wh2qa3gvsmd0ssf2yqgkyq3fhdrb5c"; + }; + + nativeBuildInputs = [ pkg-config wrapQtAppsHook qmake qttools ]; + buildInputs = [ hamlib qtbase qtserialport qtcharts ]; + + qmakeFlags = [ "KLog.pro" ]; + + meta = with lib; { + description = "A multiplatform free hamradio logger"; + longDescription = '' + KLog provides QSO management, useful QSL management DX-Cluster client, DXCC management, + ClubLog integration, WSJT-X, DX-Marathon support and much more. + ''; + homepage = "https://www.klog.xyz/"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ pulsation ]; + }; +} diff --git a/pkgs/applications/radio/minimodem/default.nix b/pkgs/applications/radio/minimodem/default.nix index e94561e46dc..48068a342e2 100644 --- a/pkgs/applications/radio/minimodem/default.nix +++ b/pkgs/applications/radio/minimodem/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, autoconf, automake, libtool +{ lib, stdenv, fetchFromGitHub, pkg-config, autoconf, automake, libtool , fftw, fftwSinglePrec, alsaLib, libsndfile, libpulseaudio }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1b5xy36fjcp7vkp115dpx4mlmqg2fc7xvxdy648fb8im953bw7ql"; }; - nativeBuildInputs = [ pkgconfig autoconf automake libtool ]; + nativeBuildInputs = [ pkg-config autoconf automake libtool ]; buildInputs = [ fftw fftwSinglePrec alsaLib libsndfile libpulseaudio ]; preConfigure = '' @@ -33,9 +33,9 @@ stdenv.mkDerivation rec { Caller-ID. ''; homepage = "http://www.whence.com/minimodem/"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = with stdenv.lib.platforms; linux; - maintainers = with stdenv.lib.maintainers; [ relrod ]; + license = lib.licenses.gpl3Plus; + platforms = with lib.platforms; linux; + maintainers = with lib.maintainers; [ relrod ]; }; } diff --git a/pkgs/applications/radio/multimon-ng/default.nix b/pkgs/applications/radio/multimon-ng/default.nix index 2524b48c9c2..aea0944b29b 100644 --- a/pkgs/applications/radio/multimon-ng/default.nix +++ b/pkgs/applications/radio/multimon-ng/default.nix @@ -37,7 +37,8 @@ stdenv.mkDerivation { ZVEI3 DZVEI PZVEI EEA EIA CCIR MORSE CW ''; homepage = "https://github.com/EliasOenal/multimon-ng"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; + maintainers = [ maintainers.markuskowa ]; }; } diff --git a/pkgs/applications/radio/qsstv/default.nix b/pkgs/applications/radio/qsstv/default.nix index ddf1d6c6feb..e6fa95b5dc7 100644 --- a/pkgs/applications/radio/qsstv/default.nix +++ b/pkgs/applications/radio/qsstv/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchurl, qtbase, qmake, openjpeg, pkgconfig, fftw, +{ mkDerivation, lib, fetchurl, qtbase, qmake, openjpeg, pkg-config, fftw, libpulseaudio, alsaLib, hamlib, libv4l, fftwFloat }: mkDerivation rec { @@ -14,7 +14,7 @@ mkDerivation rec { nativeBuildInputs = [ qmake - pkgconfig + pkg-config ]; buildInputs = [ qtbase openjpeg fftw libpulseaudio alsaLib hamlib libv4l @@ -29,8 +29,8 @@ mkDerivation rec { description = "Qt-based slow-scan TV and fax"; homepage = "http://users.telenet.be/on4qz/"; platforms = platforms.linux; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ hax404 ]; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ hax404 ]; }; } diff --git a/pkgs/applications/radio/quisk/default.nix b/pkgs/applications/radio/quisk/default.nix index c0dab8773c7..19a4e715013 100644 --- a/pkgs/applications/radio/quisk/default.nix +++ b/pkgs/applications/radio/quisk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python38Packages, fetchPypi +{ lib, python38Packages, fetchPypi , fftw, alsaLib, pulseaudio, wxPython_4_0 }: python38Packages.buildPythonApplication rec { diff --git a/pkgs/applications/radio/rtl-ais/default.nix b/pkgs/applications/radio/rtl-ais/default.nix index 9f917329168..7fd37d21fe1 100644 --- a/pkgs/applications/radio/rtl-ais/default.nix +++ b/pkgs/applications/radio/rtl-ais/default.nix @@ -1,9 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, libusb1, rtl-sdr }: +{ lib, stdenv, fetchFromGitHub, pkg-config, libusb1, rtl-sdr }: stdenv.mkDerivation { name = "rtl-ais"; version = "0.8.1"; - buildInputs = [ pkgconfig rtl-sdr libusb1 ]; + buildInputs = [ pkg-config rtl-sdr libusb1 ]; src = fetchFromGitHub { owner = "dgiardini"; diff --git a/pkgs/applications/radio/rtl-sdr/default.nix b/pkgs/applications/radio/rtl-sdr/default.nix index 3f69f40424e..2fe57eaf296 100644 --- a/pkgs/applications/radio/rtl-sdr/default.nix +++ b/pkgs/applications/radio/rtl-sdr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, fetchpatch, cmake, pkgconfig, libusb1 }: +{ lib, stdenv, fetchgit, fetchpatch, cmake, pkg-config, libusb1 }: stdenv.mkDerivation rec { pname = "rtl-sdr"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "0ns740s2rys4glq4la4bh0sxfv1mn61yfjns2yllhx70rsb2fqrn"; }) ]; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ libusb1 ]; # TODO: get these fixes upstream: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { # /etc/udev/rules.d/, and there is no option to install elsewhere. So install # rules manually. # * Propagate libusb-1.0 dependency in pkg-config file. - postInstall = stdenv.lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.isLinux '' mkdir -p "$out/etc/udev/rules.d/" cp ../rtl-sdr.rules "$out/etc/udev/rules.d/99-rtl-sdr.rules" diff --git a/pkgs/applications/radio/rtl_433/default.nix b/pkgs/applications/radio/rtl_433/default.nix index 6f4460e6d6e..b926e29bc47 100644 --- a/pkgs/applications/radio/rtl_433/default.nix +++ b/pkgs/applications/radio/rtl_433/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config , libusb1, rtl-sdr, soapysdr-with-plugins }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "093bxjxkg7yf78wqj5gpijbfa2p05ny09qqsj84kzi1svnzsa369"; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ libusb1 rtl-sdr soapysdr-with-plugins ]; diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix index 96f6df2744b..b4a6cb775cc 100644 --- a/pkgs/applications/radio/sdrangel/default.nix +++ b/pkgs/applications/radio/sdrangel/default.nix @@ -19,7 +19,7 @@ libbladeRF, mkDerivation, ocl-icd, opencv3, -pkgconfig, +pkg-config, qtbase, qtmultimedia, qtserialport, @@ -42,7 +42,7 @@ mkDerivation rec { fetchSubmodules = false; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ glew opencv3 libusb1 boost libopus limesuite libav libiio libpulseaudio qtbase qtwebsockets qtmultimedia rtl-sdr airspy hackrf diff --git a/pkgs/applications/radio/soapybladerf/default.nix b/pkgs/applications/radio/soapybladerf/default.nix index db9ad67ad40..dca5b7702c3 100644 --- a/pkgs/applications/radio/soapybladerf/default.nix +++ b/pkgs/applications/radio/soapybladerf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config , libbladeRF, soapysdr } : @@ -16,7 +16,7 @@ in stdenv.mkDerivation { sha256 = "02wh09850vinqg248fw4lxmx7y857cqmnnb8jm9zhyrsggal0hki"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libbladeRF soapysdr ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; @@ -25,7 +25,7 @@ in stdenv.mkDerivation { meta = with lib; { homepage = "https://github.com/pothosware/SoapyBladeRF"; description = "SoapySDR plugin for BladeRF devices"; - license = licenses.lgpl21; + license = licenses.lgpl21Only; maintainers = with maintainers; [ markuskowa ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/radio/soapyhackrf/default.nix b/pkgs/applications/radio/soapyhackrf/default.nix index 105f0f423f4..8fe3dc90008 100644 --- a/pkgs/applications/radio/soapyhackrf/default.nix +++ b/pkgs/applications/radio/soapyhackrf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config , hackrf, soapysdr } : @@ -16,7 +16,7 @@ in stdenv.mkDerivation { sha256 = "1awn89z462500gb3fjb7x61b1znkjri9n1d39bqfip1qk4s11pxc"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ hackrf soapysdr ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; diff --git a/pkgs/applications/radio/soapyrtlsdr/default.nix b/pkgs/applications/radio/soapyrtlsdr/default.nix index 4be9e20d1f5..855213fc514 100644 --- a/pkgs/applications/radio/soapyrtlsdr/default.nix +++ b/pkgs/applications/radio/soapyrtlsdr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config , rtl-sdr, soapysdr } : @@ -16,7 +16,7 @@ in stdenv.mkDerivation { sha256 = "15j0s7apbg9cjr6rcbr058kl0r3szwzf00ixcbykxb77fh7c6r9w"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ rtl-sdr soapysdr ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; diff --git a/pkgs/applications/radio/soapysdr/default.nix b/pkgs/applications/radio/soapysdr/default.nix index 87f69377c62..ea8c8fad106 100644 --- a/pkgs/applications/radio/soapysdr/default.nix +++ b/pkgs/applications/radio/soapysdr/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, lndir, makeWrapper , fetchFromGitHub, cmake -, libusb-compat-0_1, pkgconfig +, libusb-compat-0_1, pkg-config , usePython ? false , python, ncurses, swig2 , extraPackages ? [] @@ -24,7 +24,7 @@ in stdenv.mkDerivation { sha256 = "102wnpjxrwba20pzdh1vvx0yg1h8vqd8z914idxflg9p14r6v5am"; }; - nativeBuildInputs = [ cmake makeWrapper pkgconfig ]; + nativeBuildInputs = [ cmake makeWrapper pkg-config ]; buildInputs = [ libusb-compat-0_1 ncurses ] ++ lib.optionals usePython [ python swig2 ]; diff --git a/pkgs/applications/radio/svxlink/default.nix b/pkgs/applications/radio/svxlink/default.nix index f2688db4ad1..19e635da5ac 100644 --- a/pkgs/applications/radio/svxlink/default.nix +++ b/pkgs/applications/radio/svxlink/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, cmake, pkgconfig, fetchFromGitHub, makeDesktopItem, alsaLib, speex +{ lib, stdenv, cmake, pkg-config, fetchFromGitHub, makeDesktopItem, alsaLib, speex , libopus, curl, gsm, libgcrypt, libsigcxx, popt, qtbase, qttools , wrapQtAppsHook, rtl-sdr, tcl, doxygen, groff }: @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { ]; dontWrapQtApps = true; - nativeBuildInputs = [ cmake pkgconfig doxygen groff wrapQtAppsHook ]; + nativeBuildInputs = [ cmake pkg-config doxygen groff wrapQtAppsHook ]; buildInputs = [ alsaLib diff --git a/pkgs/applications/radio/tlf/default.nix b/pkgs/applications/radio/tlf/default.nix index a9fd0102dd1..91a07496ce9 100644 --- a/pkgs/applications/radio/tlf/default.nix +++ b/pkgs/applications/radio/tlf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, autoconf, automake, pkgconfig, glib +{ lib, stdenv, fetchFromGitHub, autoreconfHook, autoconf, automake, pkg-config, glib , perl, ncurses5, hamlib, xmlrpc_c }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1xpgs4k27pjd9mianfknknp6mf34365bcp96wrv5xh4dhph573rj"; }; - nativeBuildInputs = [ autoreconfHook autoconf automake pkgconfig perl ]; + nativeBuildInputs = [ autoreconfHook autoconf automake pkg-config perl ]; buildInputs = [ glib ncurses5 hamlib xmlrpc_c ]; configureFlags = [ "--enable-hamlib" "--enable-fldigi-xmlrpc" ]; diff --git a/pkgs/applications/radio/uhd/default.nix b/pkgs/applications/radio/uhd/default.nix index 033c2c4e2a6..bafb2f637df 100644 --- a/pkgs/applications/radio/uhd/default.nix +++ b/pkgs/applications/radio/uhd/default.nix @@ -2,7 +2,7 @@ , fetchurl , fetchFromGitHub , cmake -, pkgconfig +, pkg-config # See https://files.ettus.com/manual_archive/v3.15.0.0/html/page_build_guide.html for dependencies explanations , boost , enableLibuhd_C_api ? true @@ -33,7 +33,7 @@ let onOffBool = b: if b then "ON" else "OFF"; - inherit (stdenv.lib) optionals; + inherit (lib) optionals; in stdenv.mkDerivation rec { @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { # TODO: Check if this still needed # ABI differences GCC 7.1 # /nix/store/wd6r25miqbk9ia53pp669gn4wrg9n9cj-gcc-7.3.0/include/c++/7.3.0/bits/vector.tcc:394:7: note: parameter passing for argument of type 'std::vector<uhd::range_t>::iterator {aka __gnu_cxx::__normal_iterator<uhd::range_t*, std::vector<uhd::range_t> >}' changed in GCC 7.1 - ++ [ (stdenv.lib.optionalString stdenv.isAarch32 "-DCMAKE_CXX_FLAGS=-Wno-psabi") ] + ++ [ (lib.optionalString stdenv.isAarch32 "-DCMAKE_CXX_FLAGS=-Wno-psabi") ] ; # Python + Mako are always required for the build itself but not necessary for runtime. @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config ] # If both enableLibuhd_Python_api and enableUtils are off, we don't need # pythonEnv in buildInputs as it's a 'build' dependency and not a runtime diff --git a/pkgs/applications/radio/unixcw/default.nix b/pkgs/applications/radio/unixcw/default.nix index ec449517fcf..cdb84670c61 100644 --- a/pkgs/applications/radio/unixcw/default.nix +++ b/pkgs/applications/radio/unixcw/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, libpulseaudio, alsaLib , pkgconfig, qt5}: +{lib, stdenv, fetchurl, libpulseaudio, alsaLib , pkg-config, qt5}: stdenv.mkDerivation rec { pname = "unixcw"; version = "3.5.1"; @@ -9,9 +9,11 @@ stdenv.mkDerivation rec { patches = [ ./remove-use-of-dlopen.patch ]; - buildInputs = [libpulseaudio alsaLib pkgconfig qt5.qtbase]; + buildInputs = [libpulseaudio alsaLib pkg-config qt5.qtbase]; CFLAGS ="-lasound -lpulse-simple"; + dontWrapQtApps = true; + meta = with lib; { description = "sound characters as Morse code on the soundcard or console speaker"; longDescription = '' diff --git a/pkgs/applications/radio/urh/default.nix b/pkgs/applications/radio/urh/default.nix index 3a51f77d7bd..00d3431b6e3 100644 --- a/pkgs/applications/radio/urh/default.nix +++ b/pkgs/applications/radio/urh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, python3Packages +{ lib, fetchFromGitHub, python3Packages , hackrf, rtl-sdr, airspy, limesuite, libiio , qt5 , USRPSupport ? false, uhd }: diff --git a/pkgs/applications/radio/welle-io/default.nix b/pkgs/applications/radio/welle-io/default.nix index 87c04dd3b98..97bf84a2bf3 100644 --- a/pkgs/applications/radio/welle-io/default.nix +++ b/pkgs/applications/radio/welle-io/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig +{ mkDerivation, lib, fetchFromGitHub, cmake, pkg-config , qtbase, qtcharts, qtmultimedia, qtquickcontrols, qtquickcontrols2, qtgraphicaleffects , faad2, rtl-sdr, soapysdr-with-plugins, libusb-compat-0_1, fftwSinglePrec, lame, mpg123 }: let @@ -17,7 +17,7 @@ in mkDerivation { sha256 = "04fpm6sc431dl9i5h53xpd6k85j22sv8aawl7b6wv2fzpfsd9fwa"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ faad2 @@ -43,7 +43,7 @@ in mkDerivation { description = "A DAB/DAB+ Software Radio"; homepage = "https://www.welle.io/"; maintainers = with maintainers; [ ck3d markuskowa ]; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = with platforms; [ "x86_64-linux" "i686-linux" ] ++ darwin; }; } diff --git a/pkgs/applications/radio/wsjtx/default.nix b/pkgs/applications/radio/wsjtx/default.nix index debbaf0606f..697a28e4be9 100644 --- a/pkgs/applications/radio/wsjtx/default.nix +++ b/pkgs/applications/radio/wsjtx/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; # Hamlib builds with autotools, wsjtx builds with cmake - # Omitting pkgconfig because it causes issues locating the built hamlib + # Omitting pkg-config because it causes issues locating the built hamlib nativeBuildInputs = [ asciidoc asciidoctor autoconf automake cmake docbook_xsl gfortran libtool qttools texinfo wrapQtAppsHook diff --git a/pkgs/applications/radio/xlog/default.nix b/pkgs/applications/radio/xlog/default.nix index 04797140b02..eb57048c5c2 100644 --- a/pkgs/applications/radio/xlog/default.nix +++ b/pkgs/applications/radio/xlog/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, glib, gtk2, pkgconfig, hamlib }: +{ lib, stdenv, fetchurl, glib, gtk2, pkg-config, hamlib }: stdenv.mkDerivation rec { pname = "xlog"; version = "2.0.19"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { # glib-2.62 deprecations NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; - buildInputs = [ glib pkgconfig gtk2 hamlib ]; + buildInputs = [ glib pkg-config gtk2 hamlib ]; meta = with lib; { description = "An amateur radio logging program"; diff --git a/pkgs/applications/science/astronomy/astrolabe-generator/default.nix b/pkgs/applications/science/astronomy/astrolabe-generator/default.nix index 4a6bdd9d1e9..3802f2bada8 100644 --- a/pkgs/applications/science/astronomy/astrolabe-generator/default.nix +++ b/pkgs/applications/science/astronomy/astrolabe-generator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, makeWrapper, unzip }: +{ lib, stdenv, fetchurl, jre, makeWrapper, unzip }: stdenv.mkDerivation rec { pname = "astrolabe-generator"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { --add-flags "-jar $out/share/java/AstrolabeGenerator-${version}.jar" ''; - meta = with stdenv.lib;{ + meta = with lib;{ homepage = "https://www.astrolabeproject.com"; description = "A Java-based tool for generating EPS files for constructing astrolabes and related tools"; license = licenses.gpl3; diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix index 340641917e4..24eace7eb99 100644 --- a/pkgs/applications/science/astronomy/celestia/default.nix +++ b/pkgs/applications/science/astronomy/celestia/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, freeglut, gtk2, gtkglext, libjpeg_turbo, libtheora, libXmu -, lua, libGLU, libGL, pkgconfig, perl, autoreconfHook +{ lib, stdenv, fetchurl, freeglut, gtk2, gtkglext, libjpeg_turbo, libtheora, libXmu +, lua, libGLU, libGL, pkg-config, perl, autoreconfHook }: let @@ -43,7 +43,7 @@ stdenv.mkDerivation { sha256 = "1i1lvhbgllsh2z8i6jj4mvrjak4a7r69psvk7syw03s4p7670mfk"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ freeglut gtk2 gtkglext libjpeg_turbo libtheora libXmu libGLU libGL lua perl autoreconfHook ]; @@ -67,9 +67,9 @@ stdenv.mkDerivation { meta = { description = "Free space simulation"; homepage = "https://celestia.space/"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.peti ]; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.peti ]; }; } diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix index e84a542f1a6..b716b0f2f90 100644 --- a/pkgs/applications/science/astronomy/gildas/default.nix +++ b/pkgs/applications/science/astronomy/gildas/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk2-x11 , pkgconfig , python3 , gfortran , lesstif +{ lib, stdenv, fetchurl, gtk2-x11 , pkg-config , python3 , gfortran , lesstif , cfitsio , getopt , perl , groff , which, darwin, ncurses }: @@ -19,16 +19,16 @@ stdenv.mkDerivation rec { sha256 = "9faa0b3e674b5ffe5b1aee88027d7401a46ae28cd0b306595300547605d6222a"; }; - nativeBuildInputs = [ pkgconfig groff perl getopt gfortran which ]; + nativeBuildInputs = [ pkg-config groff perl getopt gfortran which ]; buildInputs = [ gtk2-x11 lesstif cfitsio python3Env ncurses ] - ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation ]); + ++ 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_CFLAGS_COMPILE = 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"); + NIX_LDFLAGS = lib.optionalString stdenv.isDarwin (with darwin.apple_sdk.frameworks; "-F${CoreFoundation}/Library/Frameworks"); configurePhase='' substituteInPlace admin/wrapper.sh --replace '%%OUT%%' $out @@ -62,9 +62,9 @@ stdenv.mkDerivation rec { few parts in C/C++ (mainly keyboard interaction, plotting, widgets).''; homepage = "http://www.iram.fr/IRAMFR/GILDAS/gildas.html"; - license = stdenv.lib.licenses.free; - maintainers = [ stdenv.lib.maintainers.bzizou stdenv.lib.maintainers.smaret ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.free; + maintainers = [ lib.maintainers.bzizou lib.maintainers.smaret ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/science/astronomy/gpredict/default.nix b/pkgs/applications/science/astronomy/gpredict/default.nix index a089bf6534b..3f82ff7b52a 100644 --- a/pkgs/applications/science/astronomy/gpredict/default.nix +++ b/pkgs/applications/science/astronomy/gpredict/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, intltool +{ lib, stdenv, fetchurl, pkg-config, intltool , gtk3, glib, curl, goocanvas2, gpsd , hamlib, wrapGAppsHook }: @@ -14,7 +14,7 @@ in stdenv.mkDerivation { sha256 = "0hwf97kng1zy8rxyglw04x89p0bg07zq30hgghm20yxiw2xc8ng7"; }; - nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config intltool wrapGAppsHook ]; buildInputs = [ curl glib gtk3 goocanvas2 gpsd hamlib ]; meta = with lib; { @@ -26,7 +26,7 @@ in stdenv.mkDerivation { well. Gpredict uses the SGP4/SDP4 algorithms, which are compatible with the NORAD Keplerian elements. ''; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; homepage = "http://gpredict.oz9aec.net/"; maintainers = [ maintainers.markuskowa maintainers.cmcdragonkai ]; diff --git a/pkgs/applications/science/astronomy/gravit/default.nix b/pkgs/applications/science/astronomy/gravit/default.nix index 0a98563ed0e..baf9ed7fc18 100644 --- a/pkgs/applications/science/astronomy/gravit/default.nix +++ b/pkgs/applications/science/astronomy/gravit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, SDL_ttf, SDL_image, libSM, libICE, libGLU, libGL, libpng, lua5, autoconf, automake }: +{ lib, stdenv, fetchurl, SDL, SDL_ttf, SDL_image, libSM, libICE, libGLU, libGL, libpng, lua5, autoconf, automake }: stdenv.mkDerivation rec { name = "gravit-0.5.1"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://gravit.slowchop.com"; description = "Beautiful OpenGL-based gravity simulator"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; longDescription = '' Gravit is a gravity simulator which runs under Linux, Windows and @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { view in 3D and zoom in and out. ''; - platforms = stdenv.lib.platforms.mesaPlatforms; - hydraPlatforms = stdenv.lib.platforms.linux; # darwin times out + platforms = lib.platforms.mesaPlatforms; + hydraPlatforms = lib.platforms.linux; # darwin times out }; } diff --git a/pkgs/applications/science/astronomy/kstars/default.nix b/pkgs/applications/science/astronomy/kstars/default.nix index c32d671cb05..33f00979c97 100644 --- a/pkgs/applications/science/astronomy/kstars/default.nix +++ b/pkgs/applications/science/astronomy/kstars/default.nix @@ -14,11 +14,11 @@ mkDerivation rec { pname = "kstars"; - version = "3.5.0"; + version = "3.5.1"; src = fetchurl { url = "mirror://kde/stable/kstars/kstars-${version}.tar.xz"; - sha256 = "0fpkm75abn0hhdhfyvpfl6n0fr7gvw63xhb4hvwdrglhkf2nxam1"; + sha256 = "sha256-gf+yaXiYQFuO1/nvdP6OOuD4QrRtPAQTwQZAbYNKxUU="; }; patches = [ diff --git a/pkgs/applications/science/astronomy/openspace/default.nix b/pkgs/applications/science/astronomy/openspace/default.nix index ca8651aa9e6..17c721ac869 100644 --- a/pkgs/applications/science/astronomy/openspace/default.nix +++ b/pkgs/applications/science/astronomy/openspace/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, makeWrapper, cmake +{ lib, stdenv, fetchFromGitHub, fetchurl, makeWrapper, cmake , curl, boost, gdal, glew, soil , libX11, libXi, libXxf86vm, libXcursor, libXrandr, libXinerama }: @@ -83,8 +83,8 @@ stdenv.mkDerivation rec { WARNING: This build is not very usable for now. ''; homepage = "https://www.openspaceproject.com/"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mit; + platforms = lib.platforms.linux; broken = true; # fails to build }; } diff --git a/pkgs/applications/science/astronomy/xearth/default.nix b/pkgs/applications/science/astronomy/xearth/default.nix index 57054cc491a..bd92ae01ebb 100644 --- a/pkgs/applications/science/astronomy/xearth/default.nix +++ b/pkgs/applications/science/astronomy/xearth/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { longDescription = '' Xearth sets the X root window to an image of the Earth, as seen from your favorite vantage point in space, correctly shaded for the current position of the Sun. - By default, xearth updates the displayed image every five minutes. + By default, xearth updates the displayed image every five minutes. ''; maintainers = [ maintainers.mafo ]; license = "xearth"; diff --git a/pkgs/applications/science/astronomy/xplanet/default.nix b/pkgs/applications/science/astronomy/xplanet/default.nix index 63a1feab42f..82331a9496d 100644 --- a/pkgs/applications/science/astronomy/xplanet/default.nix +++ b/pkgs/applications/science/astronomy/xplanet/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, fetchpatch, pkgconfig, freetype, pango, libpng, libtiff +{lib, stdenv, fetchurl, fetchpatch, pkg-config, freetype, pango, libpng, libtiff , giflib, libjpeg, netpbm}: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1rzc1alph03j67lrr66499zl0wqndiipmj99nqgvh9xzm1qdb023"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ freetype pango libpng libtiff giflib libjpeg netpbm ]; patches = [ @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }) ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; meta = with lib; { description = "Renders an image of the earth or other planets into the X root window"; diff --git a/pkgs/applications/science/biology/EZminc/default.nix b/pkgs/applications/science/biology/EZminc/default.nix index 17d8944128e..a2ba038c059 100644 --- a/pkgs/applications/science/biology/EZminc/default.nix +++ b/pkgs/applications/science/biology/EZminc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, libminc, bicpl, itk4, fftwFloat, gsl }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libminc, bicpl, itk4, fftwFloat, gsl }: stdenv.mkDerivation rec { pname = "EZminc"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0wy8cppf5xpgfqvgb3mqs1cjh81n6qzkk6zxv29wvng8nar9wsy4"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ itk4 libminc bicpl fftwFloat gsl ]; cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake" diff --git a/pkgs/applications/science/biology/ants/default.nix b/pkgs/applications/science/biology/ants/default.nix index 7aa41bdf6f0..bdcd82ed432 100644 --- a/pkgs/applications/science/biology/ants/default.nix +++ b/pkgs/applications/science/biology/ants/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake makeWrapper ]; - buildInputs = [ itk4 vtk_7 ] ++ stdenv.lib.optional stdenv.isDarwin [ Cocoa ]; + buildInputs = [ itk4 vtk_7 ] ++ lib.optional stdenv.isDarwin [ Cocoa ]; cmakeFlags = [ "-DANTS_SUPERBUILD=FALSE" "-DUSE_VTK=TRUE" ]; diff --git a/pkgs/applications/science/biology/bayescan/default.nix b/pkgs/applications/science/biology/bayescan/default.nix index 7c4f198b842..043ee3ca52d 100644 --- a/pkgs/applications/science/biology/bayescan/default.nix +++ b/pkgs/applications/science/biology/bayescan/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ unzip ]; - buildInputs = stdenv.lib.optional stdenv.cc.isClang llvmPackages.openmp; + buildInputs = lib.optional stdenv.cc.isClang llvmPackages.openmp; # Disable FORTIFY_SOURCE or the binary fails with "buffer overflow" hardeningDisable = [ "fortify" ]; @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { homepage = "http://cmpg.unibe.ch/software/BayeScan"; license = licenses.gpl3; maintainers = [ maintainers.bzizou ]; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/science/biology/bedtools/default.nix b/pkgs/applications/science/biology/bedtools/default.nix index cfa22ae5ac8..d0553bb0649 100644 --- a/pkgs/applications/science/biology/bedtools/default.nix +++ b/pkgs/applications/science/biology/bedtools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bedtools"; - version = "2.29.2"; + version = "2.30.0"; src = fetchFromGitHub { owner = "arq5x"; repo = "bedtools2"; rev = "v${version}"; - sha256 = "015qq3pwrwgnyxyi959niijjlswl231b3wxlsm3l8msv6fdhmkz8"; + sha256 = "sha256-NqKldF7ePJn3pT+AkESIQghBKSFFOEBBsTaKEbU+oaQ="; }; buildInputs = [ zlib python bzip2 lzma ]; diff --git a/pkgs/applications/science/biology/blast/default.nix b/pkgs/applications/science/biology/blast/default.nix index a72f16938d4..6fd061f1402 100644 --- a/pkgs/applications/science/biology/blast/default.nix +++ b/pkgs/applications/science/biology/blast/default.nix @@ -10,15 +10,15 @@ stdenv.mkDerivation rec { }; sourceRoot = "ncbi-blast-${version}+-src/c++"; - - configureFlags = [ + + configureFlags = [ # With flat Makefile we can use all_projects in order not to build extra. # These extra cause clang to hang on Darwin. "--with-flat-makefile" - "--without-makefile-auto-update" + "--without-makefile-auto-update" "--with-dll" # build dynamic libraries (static are default) ]; - + makeFlags = [ "all_projects=app/" ]; preConfigure = '' diff --git a/pkgs/applications/science/biology/cd-hit/default.nix b/pkgs/applications/science/biology/cd-hit/default.nix index 94012b1c2ff..bed562abe23 100644 --- a/pkgs/applications/science/biology/cd-hit/default.nix +++ b/pkgs/applications/science/biology/cd-hit/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "032nva6iiwmw59gjipm1mv0xlcckhxsf45mc2qbnv19lbis0q22i"; }; - propagatedBuildInputs = [ perl perlPackages.TextNSP perlPackages.PerlMagick perlPackages.Storable ]; + propagatedBuildInputs = [ perl perlPackages.TextNSP perlPackages.PerlMagick ]; nativeBuildInputs = [ zlib makeWrapper ]; diff --git a/pkgs/applications/science/biology/cmtk/default.nix b/pkgs/applications/science/biology/cmtk/default.nix index ea4f55ba475..f147c0422e4 100644 --- a/pkgs/applications/science/biology/cmtk/default.nix +++ b/pkgs/applications/science/biology/cmtk/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; meta = with lib; { description = "Computational Morphometry Toolkit "; diff --git a/pkgs/applications/science/biology/conglomerate/default.nix b/pkgs/applications/science/biology/conglomerate/default.nix index 592ab2cd663..fe1c1f5511d 100644 --- a/pkgs/applications/science/biology/conglomerate/default.nix +++ b/pkgs/applications/science/biology/conglomerate/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { postFixup = '' for p in $out/bin/*; do - wrapProgram $p --prefix PERL5LIB : $PERL5LIB --set PATH "${stdenv.lib.makeBinPath [ coreutils minc_tools ]}"; + wrapProgram $p --prefix PERL5LIB : $PERL5LIB --set PATH "${lib.makeBinPath [ coreutils minc_tools ]}"; done ''; diff --git a/pkgs/applications/science/biology/delly/default.nix b/pkgs/applications/science/biology/delly/default.nix index 7a7e3f13c7a..efaa4403f41 100644 --- a/pkgs/applications/science/biology/delly/default.nix +++ b/pkgs/applications/science/biology/delly/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "delly"; - version = "0.8.6"; + version = "0.8.7"; src = fetchFromGitHub { owner = "dellytools"; repo = pname; rev = "v${version}"; - sha256 = "sha256-j9klZ8qq1GQS7+zZ+vHwAwLHBYMBrWfbwqeD8QJeCuk="; + sha256 = "sha256-DWwC35r8cQbePUzppkFQlev0YZdxk2+BSrNTW/DOY3M="; }; buildInputs = [ zlib htslib bzip2 lzma ncurses boost ]; diff --git a/pkgs/applications/science/biology/ecopcr/default.nix b/pkgs/applications/science/biology/ecopcr/default.nix index b3029f586ad..01937037860 100644 --- a/pkgs/applications/science/biology/ecopcr/default.nix +++ b/pkgs/applications/science/biology/ecopcr/default.nix @@ -13,12 +13,12 @@ stdenv.mkDerivation rec { buildInputs = [ gcc python27 zlib ]; installPhase = '' - mkdir -p $out/bin - cp -v ecoPCR $out/bin - cp -v ecogrep $out/bin - cp -v ecofind $out/bin - cp -v ../tools/ecoPCRFormat.py $out/bin/ecoPCRFormat - chmod a+x $out/bin/ecoPCRFormat + mkdir -p $out/bin + cp -v ecoPCR $out/bin + cp -v ecogrep $out/bin + cp -v ecofind $out/bin + cp -v ../tools/ecoPCRFormat.py $out/bin/ecoPCRFormat + chmod a+x $out/bin/ecoPCRFormat ''; meta = with lib; { diff --git a/pkgs/applications/science/biology/eggnog-mapper/default.nix b/pkgs/applications/science/biology/eggnog-mapper/default.nix index c6defb245c7..7eb3afd437a 100644 --- a/pkgs/applications/science/biology/eggnog-mapper/default.nix +++ b/pkgs/applications/science/biology/eggnog-mapper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, python27Packages, wget, diamond, hmmer }: +{ lib, fetchFromGitHub, fetchpatch, makeWrapper, python27Packages, wget, diamond, hmmer }: python27Packages.buildPythonApplication rec { pname = "eggnog-mapper"; diff --git a/pkgs/applications/science/biology/emboss/default.nix b/pkgs/applications/science/biology/emboss/default.nix index 2eeb17520f2..5cbcd46ee07 100644 --- a/pkgs/applications/science/biology/emboss/default.nix +++ b/pkgs/applications/science/biology/emboss/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, readline, perl, libharu, libX11, libpng, libXt, zlib}: +{lib, stdenv, fetchurl, readline, perl, libharu, libX11, libpng, libXt, zlib}: stdenv.mkDerivation { name = "emboss-6.6.0"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { user community, including libraries. The software automatically copes with data in a variety of formats and even allows transparent retrieval of sequence data from the web.''; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; homepage = "http://emboss.sourceforge.net/"; }; } diff --git a/pkgs/applications/science/biology/exonerate/default.nix b/pkgs/applications/science/biology/exonerate/default.nix index 9f87d0117df..f7b6bf6c14c 100644 --- a/pkgs/applications/science/biology/exonerate/default.nix +++ b/pkgs/applications/science/biology/exonerate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, glib, pkgconfig }: +{ lib, stdenv, fetchurl, glib, pkg-config }: stdenv.mkDerivation rec { version = "2.4.0"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = with lib; { description = "Generic tool for sequence alignment"; diff --git a/pkgs/applications/science/biology/iv/default.nix b/pkgs/applications/science/biology/iv/default.nix index 82fe3694008..72cf9c86e65 100644 --- a/pkgs/applications/science/biology/iv/default.nix +++ b/pkgs/applications/science/biology/iv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, neuron-version +{ lib, stdenv, fetchurl, neuron-version , libX11, libXext, patchelf }: @@ -15,15 +15,15 @@ stdenv.mkDerivation rec postInstall = '' for dir in $out/*; do # */ if [ -d $dir/lib ]; then - mv $dir/* $out # */ + mv $dir/* $out # */ rmdir $dir break fi done - '' + stdenv.lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.isLinux '' patchelf --add-needed ${libX11}/lib/libX11.so $out/lib/libIVhines.so ''; - meta = with stdenv.lib; + meta = with lib; { description = "InterViews graphical library for Neuron"; license = licenses.bsd3; homepage = "http://www.neuron.yale.edu/neuron"; diff --git a/pkgs/applications/science/biology/last/default.nix b/pkgs/applications/science/biology/last/default.nix index 3a36a2194a1..e0790b8b1a3 100644 --- a/pkgs/applications/science/biology/last/default.nix +++ b/pkgs/applications/science/biology/last/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "last"; - version = "1170"; + version = "1178"; src = fetchurl { url = "http://last.cbrc.jp/last-${version}.zip"; - sha256 = "sha256-hBuG6QGXtBrvNrtaZU+i8gxu2ZQw+srFRkbuWoL5JHc="; + sha256 = "sha256-LihTYXiYCHAFZaWDb2MqN+RvHayGSyZd3vJf4TVCu3A="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/science/biology/messer-slim/default.nix b/pkgs/applications/science/biology/messer-slim/default.nix index 876cc8ebaa7..687a2a985f2 100644 --- a/pkgs/applications/science/biology/messer-slim/default.nix +++ b/pkgs/applications/science/biology/messer-slim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, gcc, gcc-unwrapped }: +{ lib, stdenv, fetchurl, cmake, gcc, gcc-unwrapped }: stdenv.mkDerivation rec { version = "3.2.1"; @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { meta = { description = "An evolutionary simulation framework"; homepage = "https://messerlab.org/slim/"; - license = with stdenv.lib.licenses; [ gpl3 ]; - maintainers = with stdenv.lib.maintainers; [ bzizou ]; - platforms = stdenv.lib.platforms.all; + license = with lib.licenses; [ gpl3 ]; + maintainers = with lib.maintainers; [ bzizou ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/science/biology/migrate/default.nix b/pkgs/applications/science/biology/migrate/default.nix index 0e2aa1c1a79..36790b22b22 100644 --- a/pkgs/applications/science/biology/migrate/default.nix +++ b/pkgs/applications/science/biology/migrate/default.nix @@ -1,4 +1,4 @@ -{ gccStdenv, fetchurl, zlib, openmpi }: +{ lib, gccStdenv, fetchurl, zlib, mpi }: gccStdenv.mkDerivation rec { version = "3.7.2"; @@ -9,12 +9,12 @@ gccStdenv.mkDerivation rec { sha256 = "1p2364ffjc56i82snzvjpy6pkf6wvqwvlvlqxliscx2c303fxs8v"; }; - buildInputs = [ zlib openmpi ]; - setSourceRoot = ''sourceRoot=$(echo */src)''; + buildInputs = [ zlib mpi ]; + setSourceRoot = "sourceRoot=$(echo */src)"; buildFlags = [ "thread" "mpis" ]; preInstall = "mkdir -p $out/man/man1"; - meta = with gccStdenv.lib; { + meta = with lib; { description = "Estimates population size, migration, population splitting parameters using genetic/genomic data"; homepage = "https://peterbeerli.com/migrate-html5/index.html"; license = licenses.mit; diff --git a/pkgs/applications/science/biology/minc-widgets/default.nix b/pkgs/applications/science/biology/minc-widgets/default.nix index 3af227d70a5..e8aef4138b0 100644 --- a/pkgs/applications/science/biology/minc-widgets/default.nix +++ b/pkgs/applications/science/biology/minc-widgets/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { postFixup = '' for p in $out/bin/*; do - wrapProgram $p --prefix PERL5LIB : $PERL5LIB --set PATH "${stdenv.lib.makeBinPath [ coreutils minc_tools ]}"; + wrapProgram $p --prefix PERL5LIB : $PERL5LIB --set PATH "${lib.makeBinPath [ coreutils minc_tools ]}"; done ''; diff --git a/pkgs/applications/science/biology/minimap2/default.nix b/pkgs/applications/science/biology/minimap2/default.nix index ae327e2c43f..d21ef8b3d7a 100644 --- a/pkgs/applications/science/biology/minimap2/default.nix +++ b/pkgs/applications/science/biology/minimap2/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { mkdir -p $out/share/man/man1 cp minimap2.1 $out/share/man/man1 ''; - + meta = with lib; { description = "A versatile pairwise aligner for genomic and spliced nucleotide sequences"; homepage = "https://lh3.github.io/minimap2"; diff --git a/pkgs/applications/science/biology/muscle/default.nix b/pkgs/applications/science/biology/muscle/default.nix index e7c1040e593..f4f6d0c46e0 100644 --- a/pkgs/applications/science/biology/muscle/default.nix +++ b/pkgs/applications/science/biology/muscle/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.unode ]; # NOTE: Supposed to be compatible with darwin/intel & PPC but currently fails. # Anyone with access to these platforms is welcome to give it a try - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/science/biology/ncbi-tools/default.nix b/pkgs/applications/science/biology/ncbi-tools/default.nix index cc8ebf7f37d..0e273dbefaa 100644 --- a/pkgs/applications/science/biology/ncbi-tools/default.nix +++ b/pkgs/applications/science/biology/ncbi-tools/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "1b2v0dcdqn3bysgdkj57sxmd6s0hc9wpnxssviz399g6plhxggbr"; }; - configureFlags = [ + configureFlags = [ "--without-debug" "--with-bin-release" "--with-dll" @@ -24,9 +24,9 @@ stdenv.mkDerivation rec { buildInputs = [ cpio ]; meta = { - description = ''NCBI Bioinformatics toolbox (incl. BLAST)''; - longDescription = ''The NCBI Bioinformatics toolsbox, including command-line utilties, libraries and include files. No X11 support''; - homepage = "http://www.ncbi.nlm.nih.gov/IEB/ToolBox/"; + description = "NCBI Bioinformatics toolbox (incl. BLAST)"; + longDescription = "The NCBI Bioinformatics toolsbox, including command-line utilties, libraries and include files. No X11 support"; + homepage = "http://www.ncbi.nlm.nih.gov/IEB/ToolBox/"; license = "GPL"; priority = 5; # zlib.so gives a conflict with zlib broken = true; diff --git a/pkgs/applications/science/biology/neuron/default.nix b/pkgs/applications/science/biology/neuron/default.nix index 048a9a5644d..7bfef3a82fe 100644 --- a/pkgs/applications/science/biology/neuron/default.nix +++ b/pkgs/applications/science/biology/neuron/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, pkgconfig +, pkg-config , automake , autoconf , libtool @@ -8,7 +8,8 @@ , readline , which , python ? null -, mpi ? null +, useMpi ? false +, mpi , iv }: @@ -16,24 +17,25 @@ stdenv.mkDerivation rec { pname = "neuron"; version = "7.5"; - nativeBuildInputs = [ which pkgconfig automake autoconf libtool ]; - buildInputs = [ ncurses readline python mpi iv ]; + nativeBuildInputs = [ which pkg-config automake autoconf libtool ]; + buildInputs = [ ncurses readline python iv ] + ++ lib.optional useMpi mpi; src = fetchurl { url = "https://www.neuron.yale.edu/ftp/neuron/versions/v${version}/nrn-${version}.tar.gz"; sha256 = "0f26v3qvzblcdjg7isq0m9j2q8q7x3vhmkfllv8lsr3gyj44lljf"; }; - patches = (stdenv.lib.optional (stdenv.isDarwin) [ ./neuron-carbon-disable.patch ]); + patches = (lib.optional (stdenv.isDarwin) [ ./neuron-carbon-disable.patch ]); # With LLVM 3.8 and above, clang (really libc++) gets upset if you attempt to redefine these... - postPatch = stdenv.lib.optionalString stdenv.cc.isClang '' + postPatch = lib.optionalString stdenv.cc.isClang '' substituteInPlace src/gnu/neuron_gnu_builtin.h \ --replace 'double abs(double arg);' "" \ --replace 'float abs(float arg);' "" \ --replace 'short abs(short arg);' "" \ --replace 'long abs(long arg);' "" - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' # we are darwin, but we don't have all the quirks the source wants to compensate for substituteInPlace src/nrnpython/setup.py.in --replace 'readline="edit"' 'readline="readline"' for f in src/nrnpython/*.[ch] ; do @@ -51,14 +53,14 @@ stdenv.mkDerivation rec { export prefix="''${prefix} --exec-prefix=''${out}" ''; - configureFlags = with stdenv.lib; + configureFlags = with lib; [ "--with-readline=${readline}" "--with-iv=${iv}" ] ++ optionals (python != null) [ "--with-nrnpython=${python.interpreter}" ] - ++ (if mpi != null then ["--with-mpi" "--with-paranrn"] + ++ (if useMpi then ["--with-mpi" "--with-paranrn"] else ["--without-mpi"]); - postInstall = stdenv.lib.optionals (python != null) [ '' + postInstall = lib.optionals (python != null) [ '' ## standardise python neuron install dir if any if [[ -d $out/lib/python ]]; then mkdir -p ''${out}/${python.sitePackages} @@ -84,4 +86,3 @@ stdenv.mkDerivation rec { platforms = platforms.x86_64 ++ platforms.i686; }; } - diff --git a/pkgs/applications/science/biology/obitools/obitools3.nix b/pkgs/applications/science/biology/obitools/obitools3.nix index 7ecee60c4b1..082a779e12b 100644 --- a/pkgs/applications/science/biology/obitools/obitools3.nix +++ b/pkgs/applications/science/biology/obitools/obitools3.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3Packages, cmake, python3 }: +{ lib, fetchurl, python3Packages, cmake, python3 }: let pythonPackages = python3Packages; @@ -26,7 +26,7 @@ pythonPackages.buildPythonApplication rec { doCheck = true; - meta = with stdenv.lib ; { + meta = with lib ; { description = "Management of analyses and data in DNA metabarcoding"; homepage = "https://git.metabarcoding.org/obitools/obitools3"; license = licenses.cecill20; diff --git a/pkgs/applications/science/biology/paml/default.nix b/pkgs/applications/science/biology/paml/default.nix index 7a2dc2782ab..d288edca933 100644 --- a/pkgs/applications/science/biology/paml/default.nix +++ b/pkgs/applications/science/biology/paml/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "Phylogenetic Analysis by Maximum Likelihood (PAML)"; - longDescription = ''PAML is a package of programs for phylogenetic analyses of DNA or protein sequences using maximum likelihood. It is maintained and distributed for academic use free of charge by Ziheng Yang. ANSI C source codes are distributed for UNIX/Linux/Mac OSX, and executables are provided for MS Windows. PAML is not good for tree making. It may be used to estimate parameters and test hypotheses to study the evolutionary process, when you have reconstructed trees using other programs such as PAUP*, PHYLIP, MOLPHY, PhyML, RaxML, etc.''; + longDescription = "PAML is a package of programs for phylogenetic analyses of DNA or protein sequences using maximum likelihood. It is maintained and distributed for academic use free of charge by Ziheng Yang. ANSI C source codes are distributed for UNIX/Linux/Mac OSX, and executables are provided for MS Windows. PAML is not good for tree making. It may be used to estimate parameters and test hypotheses to study the evolutionary process, when you have reconstructed trees using other programs such as PAUP*, PHYLIP, MOLPHY, PhyML, RaxML, etc."; license = "non-commercial"; homepage = "http://abacus.gene.ucl.ac.uk/software/paml.html"; }; diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index d18ca2e2a4f..4a3816c4d4a 100644 --- a/pkgs/applications/science/biology/picard-tools/default.nix +++ b/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "picard-tools"; - version = "2.23.9"; + version = "2.24.1"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "1ygdl590sbcsxpk0qwr0bx163nx51h0545n1xxkbc3pk2r6n51lk"; + sha256 = "sha256-acCsYHyZ358hYqa2haOxR+g6FQGtK+hstYfLBvHLwR8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/science/biology/plink-ng/default.nix b/pkgs/applications/science/biology/plink-ng/default.nix index 0a31ff6ba4f..26c3e7ba66b 100644 --- a/pkgs/applications/science/biology/plink-ng/default.nix +++ b/pkgs/applications/science/biology/plink-ng/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, zlib, blas, lapack, darwin}: +{ lib, stdenv, fetchFromGitHub, zlib, blas, lapack, darwin}: stdenv.mkDerivation rec { pname = "plink-ng"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "A comprehensive update to the PLINK association analysis toolset"; homepage = "https://www.cog-genomics.org/plink2"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/science/biology/poretools/default.nix b/pkgs/applications/science/biology/poretools/default.nix index a9f3fdb2467..b2cefefb5cb 100755 --- a/pkgs/applications/science/biology/poretools/default.nix +++ b/pkgs/applications/science/biology/poretools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pythonPackages, fetchFromGitHub }: +{ lib, pythonPackages, fetchFromGitHub }: pythonPackages.buildPythonPackage rec { pname = "poretools"; @@ -15,8 +15,8 @@ pythonPackages.buildPythonPackage rec { meta = { description = "a toolkit for working with nanopore sequencing data from Oxford Nanopore"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; homepage = "https://poretools.readthedocs.io/en/latest/"; - maintainers = [stdenv.lib.maintainers.rybern]; + maintainers = [lib.maintainers.rybern]; }; } diff --git a/pkgs/applications/science/biology/prodigal/default.nix b/pkgs/applications/science/biology/prodigal/default.nix index 70069fe541d..22883cc522f 100644 --- a/pkgs/applications/science/biology/prodigal/default.nix +++ b/pkgs/applications/science/biology/prodigal/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { "CC=cc" "INSTALLDIR=$(out)/bin" ]; - + meta = with lib; { description = "Fast, reliable protein-coding gene prediction for prokaryotic genomes"; homepage = "https://github.com/hyattpd/Prodigal"; diff --git a/pkgs/applications/science/biology/quast/default.nix b/pkgs/applications/science/biology/quast/default.nix index e3c3ea23c2c..553fb1de539 100644 --- a/pkgs/applications/science/biology/quast/default.nix +++ b/pkgs/applications/science/biology/quast/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3Packages, zlib, bash, coreutils }: +{ lib, stdenv, fetchurl, python3Packages, zlib, bash, coreutils }: let pythonPackages = python3Packages; @@ -48,7 +48,7 @@ pythonPackages.buildPythonApplication rec { # Tests need to download data files, so manual run after packaging is needed doCheck = false; - meta = with stdenv.lib ; { + meta = with lib ; { description = "Evaluates genome assemblies by computing various metrics"; homepage = "https://github.com/ablab/quast"; license = licenses.gpl2; diff --git a/pkgs/applications/science/biology/raxml/default.nix b/pkgs/applications/science/biology/raxml/default.nix index e4019295ece..6e747e318f5 100644 --- a/pkgs/applications/science/biology/raxml/default.nix +++ b/pkgs/applications/science/biology/raxml/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchFromGitHub -, pkgs -, mpi ? false +, useMpi ? false +, mpi }: stdenv.mkDerivation rec { @@ -15,16 +15,16 @@ stdenv.mkDerivation rec { sha256 = "1jqjzhch0rips0vp04prvb8vmc20c5pdmsqn8knadcf91yy859fh"; }; - buildInputs = stdenv.lib.optionals mpi [ pkgs.openmpi ]; + buildInputs = lib.optionals useMpi [ mpi ]; # TODO darwin, AVX and AVX2 makefile targets - buildPhase = if mpi then '' + buildPhase = if useMpi then '' make -f Makefile.MPI.gcc '' else '' make -f Makefile.SSE3.PTHREADS.gcc ''; - installPhase = if mpi then '' + installPhase = if useMpi then '' mkdir -p $out/bin && cp raxmlHPC-MPI $out/bin '' else '' mkdir -p $out/bin && cp raxmlHPC-PTHREADS-SSE3 $out/bin diff --git a/pkgs/applications/science/biology/samtools/default.nix b/pkgs/applications/science/biology/samtools/default.nix index 7dd78ee2e63..20d9565bce4 100644 --- a/pkgs/applications/science/biology/samtools/default.nix +++ b/pkgs/applications/science/biology/samtools/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ncurses htslib ]; configureFlags = [ "--with-htslib=${htslib}" ] - ++ stdenv.lib.optional (ncurses == null) "--without-curses"; + ++ lib.optional (ncurses == null) "--without-curses"; preCheck = '' patchShebangs test/ diff --git a/pkgs/applications/science/biology/sortmerna/default.nix b/pkgs/applications/science/biology/sortmerna/default.nix index 01c65f4bcff..11530c6a722 100644 --- a/pkgs/applications/science/biology/sortmerna/default.nix +++ b/pkgs/applications/science/biology/sortmerna/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, cmake, rocksdb, rapidjson, pkgconfig, fetchFromGitHub, fetchpatch, zlib }: +{ lib, stdenv, cmake, rocksdb, rapidjson, pkg-config, fetchFromGitHub, fetchpatch, zlib }: stdenv.mkDerivation rec { pname = "sortmerna"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0r91viylzr069jm7kpcgb45kagvf8sqcj5zc1af4arl9sgfs1f3j"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ zlib rocksdb rapidjson ]; cmakeFlags = [ @@ -41,5 +41,6 @@ stdenv.mkDerivation rec { platforms = platforms.x86_64; homepage = "https://bioinfo.lifl.fr/RNA/sortmerna/"; maintainers = with maintainers; [ luispedro ]; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/science/biology/stacks/default.nix b/pkgs/applications/science/biology/stacks/default.nix index 12c86516242..c208d80d576 100644 --- a/pkgs/applications/science/biology/stacks/default.nix +++ b/pkgs/applications/science/biology/stacks/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, zlib }: - +{ lib, stdenv, fetchurl, zlib }: + stdenv.mkDerivation rec { pname = "stacks"; version = "2.53"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Software pipeline for building loci from short-read sequences"; homepage = "http://catchenlab.life.illinois.edu/stacks/"; - maintainers = [ stdenv.lib.maintainers.bzizou ]; - license = stdenv.lib.licenses.gpl3; + maintainers = [ lib.maintainers.bzizou ]; + license = lib.licenses.gpl3; }; } diff --git a/pkgs/applications/science/biology/tebreak/default.nix b/pkgs/applications/science/biology/tebreak/default.nix index b70ac29e38f..cb606a6b346 100644 --- a/pkgs/applications/science/biology/tebreak/default.nix +++ b/pkgs/applications/science/biology/tebreak/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, last, exonerate, minia, python3Packages, bwa +{ lib, fetchFromGitHub, last, exonerate, minia, python3Packages, bwa , samtools, findutils, python }: python3Packages.buildPythonApplication rec { diff --git a/pkgs/applications/science/biology/vcftools/default.nix b/pkgs/applications/science/biology/vcftools/default.nix index 61b2ea143b8..9f88079627e 100755 --- a/pkgs/applications/science/biology/vcftools/default.nix +++ b/pkgs/applications/science/biology/vcftools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, zlib, autoreconfHook, pkgconfig, perl }: +{ lib, stdenv, fetchFromGitHub, zlib, autoreconfHook, pkg-config, perl }: stdenv.mkDerivation rec { pname = "vcftools"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0msb09d2cnm8rlpg8bsc1lhjddvp3kf3i9dsj1qs4qgsdlzhxkyx"; }; - buildInputs = [ autoreconfHook pkgconfig zlib perl ]; + buildInputs = [ autoreconfHook pkg-config zlib perl ]; meta = with lib; { description = "A set of tools written in Perl and C++ for working with VCF files, such as those generated by the 1000 Genomes Project"; diff --git a/pkgs/applications/science/chemistry/avogadro/default.nix b/pkgs/applications/science/chemistry/avogadro/default.nix index 96dea10333b..f5c6d79e28a 100644 --- a/pkgs/applications/science/chemistry/avogadro/default.nix +++ b/pkgs/applications/science/chemistry/avogadro/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel, pkgconfig, libGLU, libGL, libX11, doxygen }: +{ lib, stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel, pkg-config, libGLU, libGL, libX11, doxygen }: stdenv.mkDerivation rec { name = "avogadro-1.1.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ qt4 eigen zlib openbabel libGL libGLU libX11 ]; - nativeBuildInputs = [ cmake pkgconfig doxygen ]; + nativeBuildInputs = [ cmake pkg-config doxygen ]; NIX_CFLAGS_COMPILE = "-include ${libGLU.dev}/include/GL/glu.h"; @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { }) ]; - meta = { + meta = with lib; { description = "Molecule editor and visualizer"; - maintainers = [ ]; - platforms = stdenv.lib.platforms.mesaPlatforms; + maintainers = with maintainers; [ danielbarter ]; + platforms = platforms.mesaPlatforms; }; } diff --git a/pkgs/applications/science/chemistry/d-seams/default.nix b/pkgs/applications/science/chemistry/d-seams/default.nix index cbe73bb7edc..f5e21db4b55 100644 --- a/pkgs/applications/science/chemistry/d-seams/default.nix +++ b/pkgs/applications/science/chemistry/d-seams/default.nix @@ -1,4 +1,4 @@ -{ clangStdenv, stdenv, fetchFromGitHub, catch2, rang, fmt, libyamlcpp, cmake +{ clangStdenv, fetchFromGitHub, catch2, rang, fmt, libyamlcpp, cmake , eigen, lua, luaPackages, liblapack, blas, lib, boost, gsl }: clangStdenv.mkDerivation rec { diff --git a/pkgs/applications/science/chemistry/gwyddion/default.nix b/pkgs/applications/science/chemistry/gwyddion/default.nix index bdebfc72e47..8d9ea7a3917 100644 --- a/pkgs/applications/science/chemistry/gwyddion/default.nix +++ b/pkgs/applications/science/chemistry/gwyddion/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk2, pkg-config, fftw, file, +{ lib, stdenv, fetchurl, gtk2, pkg-config, fftw, file, pythonSupport ? false, pythonPackages ? null, gnome2 ? null, openexrSupport ? true, openexr ? null, @@ -40,10 +40,10 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/gwyddion/gwyddion-${version}.tar.xz"; sha256 = "0z83p3ifdkv5dds8s6fqqbycql1zmgppdc7ygqmm12z5zlrl9p12"; }; - + nativeBuildInputs = [ pkg-config file ]; - - buildInputs = with stdenv.lib; + + buildInputs = with lib; [ gtk2 fftw ] ++ optional openglSupport gnome2.gtkglext ++ optional openexrSupport openexr ++ @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { optional libuniqueSupport libunique ++ optional libzipSupport libzip; - propagatedBuildInputs = with stdenv.lib; + propagatedBuildInputs = with lib; optionals pythonSupport [ pygtk pygobject2 python gnome2.gtksourceview ]; # This patch corrects problems with python support, but should apply cleanly @@ -79,8 +79,8 @@ stdenv.mkDerivation rec { analysis of profilometry data or thickness maps from imaging spectrophotometry. ''; - license = stdenv.lib.licenses.gpl2; - platforms = with stdenv.lib.platforms; linux ++ darwin; - maintainers = [ stdenv.lib.maintainers.cge ]; + license = lib.licenses.gpl2; + platforms = with lib.platforms; linux ++ darwin; + maintainers = [ lib.maintainers.cge ]; }; } diff --git a/pkgs/applications/science/chemistry/marvin/default.nix b/pkgs/applications/science/chemistry/marvin/default.nix index ddab526ebe7..f6de72205dc 100644 --- a/pkgs/applications/science/chemistry/marvin/default.nix +++ b/pkgs/applications/science/chemistry/marvin/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, dpkg, makeWrapper, coreutils, gawk, gnugrep, gnused, jre }: +{ lib, stdenv, fetchurl, dpkg, makeWrapper, coreutils, gawk, gnugrep, gnused, jre }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "marvin"; - version = "20.20.0"; + version = "21.1.0"; src = fetchurl { name = "marvin-${version}.deb"; url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb"; - sha256 = "1a8b0drb0c95c8arm3aa0z0sbdm9ilj4h1g90i0qyn4g2wk2xsal"; + sha256 = "sha256-HlBvtpxm8voLS6E8QQ4Ur211KSUhAkL/sv4odoy8oUo="; }; nativeBuildInputs = [ dpkg makeWrapper ]; diff --git a/pkgs/applications/science/chemistry/molden/default.nix b/pkgs/applications/science/chemistry/molden/default.nix index ac3dd513f34..9595639d381 100644 --- a/pkgs/applications/science/chemistry/molden/default.nix +++ b/pkgs/applications/science/chemistry/molden/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { pname = "molden"; src = fetchurl { - url = "ftp://ftp.cmbi.ru.nl/pub/molgraph/molden/molden${version}.tar.gz"; + url = "ftp://ftp.cmbi.umcn.nl/pub/molgraph/molden/molden${version}.tar.gz"; sha256 = "02qi16pz2wffn3cc47dpjqhfafzwfmb79waw4nnhfyir8a4h3cq1"; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { --replace '-I/usr/X11R6/include' "" \ --replace '/usr/local/' $out/ \ --replace 'sudo' "" \ - --replace '-C surf depend' '-C surf' + --replace '-C surf depend' '-C surf' sed -in '/^# DO NOT DELETE THIS LINE/q;' surf/Makefile ''; @@ -31,14 +31,13 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Display and manipulate molecular structures"; - homepage = "http://www.cmbi.ru.nl/molden/"; + homepage = "http://www3.cmbi.umcn.nl/molden/"; license = { fullName = "Free for academic/non-profit use"; - url = "http://www.cmbi.ru.nl/molden/CopyRight.html"; + url = "http://www3.cmbi.umcn.nl/molden/CopyRight.html"; free = false; }; platforms = platforms.linux; maintainers = with maintainers; [ markuskowa ]; }; } - diff --git a/pkgs/applications/science/chemistry/openmolcas/default.nix b/pkgs/applications/science/chemistry/openmolcas/default.nix index 1297e595b9a..cc9202493b1 100644 --- a/pkgs/applications/science/chemistry/openmolcas/default.nix +++ b/pkgs/applications/science/chemistry/openmolcas/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitLab, cmake, gfortran, perl , openblas, hdf5-cpp, python3, texlive -, armadillo, openmpi, globalarrays, openssh +, armadillo, mpi, globalarrays, openssh , makeWrapper, fetchpatch } : @@ -33,7 +33,7 @@ in stdenv.mkDerivation { hdf5-cpp python armadillo - openmpi + mpi globalarrays openssh ]; @@ -69,7 +69,7 @@ in stdenv.mkDerivation { description = "Advanced quantum chemistry software package"; homepage = "https://gitlab.com/Molcas/OpenMolcas"; maintainers = [ maintainers.markuskowa ]; - license = licenses.lgpl21; + license = licenses.lgpl21Only; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/science/chemistry/pymol/default.nix b/pkgs/applications/science/chemistry/pymol/default.nix index 47498690122..2df8b0e6d47 100644 --- a/pkgs/applications/science/chemistry/pymol/default.nix +++ b/pkgs/applications/science/chemistry/pymol/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, makeDesktopItem +{ lib, fetchurl, fetchFromGitHub, makeDesktopItem , python3, python3Packages , glew, glm, freeglut, libpng, libxml2, tk, freetype, msgpack }: diff --git a/pkgs/applications/science/chemistry/quantum-espresso/default.nix b/pkgs/applications/science/chemistry/quantum-espresso/default.nix index 717ff1dba82..6d70e9f984f 100644 --- a/pkgs/applications/science/chemistry/quantum-espresso/default.nix +++ b/pkgs/applications/science/chemistry/quantum-espresso/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchurl , gfortran, fftw, blas, lapack -, mpi ? null +, useMpi ? false +, mpi }: stdenv.mkDerivation rec { @@ -21,9 +22,9 @@ stdenv.mkDerivation rec { ''; buildInputs = [ fftw blas lapack gfortran ] - ++ (stdenv.lib.optionals (mpi != null) [ mpi ]); + ++ (lib.optionals useMpi [ mpi ]); -configureFlags = if (mpi != null) then [ "LD=${mpi}/bin/mpif90" ] else [ "LD=${gfortran}/bin/gfortran" ]; +configureFlags = if useMpi then [ "LD=${mpi}/bin/mpif90" ] else [ "LD=${gfortran}/bin/gfortran" ]; makeFlags = [ "all" ]; diff --git a/pkgs/applications/science/chemistry/siesta/default.nix b/pkgs/applications/science/chemistry/siesta/default.nix index cb4667adcab..02ff4c1ca44 100644 --- a/pkgs/applications/science/chemistry/siesta/default.nix +++ b/pkgs/applications/science/chemistry/siesta/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchurl -, gfortran, blas, lapack -, mpi ? null, scalapack +, gfortran, blas, lapack, scalapack +, useMpi ? false +, mpi }: stdenv.mkDerivation { @@ -17,7 +18,7 @@ stdenv.mkDerivation { }; buildInputs = [ blas lapack gfortran ] - ++ (stdenv.lib.optionals (mpi != null) [ mpi scalapack ]); + ++ lib.optionals useMpi [ mpi scalapack ]; enableParallelBuilding = true; @@ -29,7 +30,7 @@ stdenv.mkDerivation { cp gfortran.make arch.make ''; - preBuild = if (mpi != null) then '' + preBuild = if useMpi then '' makeFlagsArray=( CC="mpicc" FC="mpifort" FPPFLAGS="-DMPI" MPI_INTERFACE="libmpi_f90.a" MPI_INCLUDE="." diff --git a/pkgs/applications/science/electronics/adms/default.nix b/pkgs/applications/science/electronics/adms/default.nix index 0fcf4d25e2d..7b7e2a1af63 100644 --- a/pkgs/applications/science/electronics/adms/default.nix +++ b/pkgs/applications/science/electronics/adms/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, flex, bison, gperf, +{ lib, stdenv, fetchFromGitHub, autoreconfHook, flex, bison, gperf, libxml2, perl, perlPackages, gd }: stdenv.mkDerivation rec { @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { meta = { description = "automatic device model synthesizer"; homepage = "https://github.com/Qucs/adms"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [disassembler]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [disassembler]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/science/electronics/archimedes/default.nix b/pkgs/applications/science/electronics/archimedes/default.nix index 1377231c152..731f2db56af 100644 --- a/pkgs/applications/science/electronics/archimedes/default.nix +++ b/pkgs/applications/science/electronics/archimedes/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { name = "archimedes-2.0.1"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = { description = "GNU package for semiconductor device simulations"; homepage = "https://www.gnu.org/software/archimedes"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2Plus; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/science/electronics/bitscope/common.nix b/pkgs/applications/science/electronics/bitscope/common.nix index 8aade9dd2c8..49415ea0484 100644 --- a/pkgs/applications/science/electronics/bitscope/common.nix +++ b/pkgs/applications/science/electronics/bitscope/common.nix @@ -15,7 +15,7 @@ let wrapBinary = libPaths: binaryName: '' wrapProgram "$out/bin/${binaryName}" \ - --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath libPaths}" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath libPaths}" ''; pkg = stdenv.mkDerivation (rec { inherit (attrs) version src; diff --git a/pkgs/applications/science/electronics/caneda/default.nix b/pkgs/applications/science/electronics/caneda/default.nix index 5cf9ab1ae6f..6a9a491af1e 100644 --- a/pkgs/applications/science/electronics/caneda/default.nix +++ b/pkgs/applications/science/electronics/caneda/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, stdenv, fetchFromGitHub, cmake, qtbase, qttools, qtsvg, qwt }: +{ mkDerivation, lib, fetchFromGitHub, cmake, qtbase, qttools, qtsvg, qwt }: mkDerivation rec { pname = "caneda"; @@ -17,8 +17,8 @@ mkDerivation rec { meta = { description = "Open source EDA software focused on easy of use and portability"; homepage = "http://caneda.org"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/science/electronics/dsview/default.nix b/pkgs/applications/science/electronics/dsview/default.nix index 8c5e9e41aac..ab16866fe01 100644 --- a/pkgs/applications/science/electronics/dsview/default.nix +++ b/pkgs/applications/science/electronics/dsview/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchFromGitHub, pkgconfig, cmake +{ lib, mkDerivation, fetchFromGitHub, pkg-config, cmake , libzip, boost, fftw, qtbase, libusb1, libsigrok4dsl , libsigrokdecode4dsl, python3, fetchpatch }: @@ -27,7 +27,7 @@ mkDerivation rec { ./qt515.patch ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ boost fftw qtbase libusb1 libzip libsigrokdecode4dsl libsigrok4dsl diff --git a/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix b/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix index a2fcb9a929d..8e04d72780c 100644 --- a/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix +++ b/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkgconfig, autoreconfHook, +{ lib, stdenv, pkg-config, autoreconfHook, glib, libzip, libserialport, check, libusb1, libftdi, systemd, alsaLib, dsview }: @@ -12,7 +12,7 @@ stdenv.mkDerivation { export sourceRoot=$sourceRoot/libsigrok4DSL ''; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ glib libzip libserialport libusb1 libftdi systemd check alsaLib diff --git a/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix b/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix index 2bab4b681d3..09eed4a67c5 100644 --- a/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix +++ b/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkgconfig, autoreconfHook, +{ lib, stdenv, pkg-config, autoreconfHook, glib, check, python3, dsview }: @@ -11,7 +11,7 @@ stdenv.mkDerivation { export sourceRoot=$sourceRoot/libsigrokdecode4DSL ''; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ python3 glib check diff --git a/pkgs/applications/science/electronics/eagle/eagle.nix b/pkgs/applications/science/electronics/eagle/eagle.nix index 130146e0d9a..58873b8a770 100644 --- a/pkgs/applications/science/electronics/eagle/eagle.nix +++ b/pkgs/applications/science/electronics/eagle/eagle.nix @@ -5,7 +5,7 @@ }: let - libPath = stdenv.lib.makeLibraryPath + libPath = lib.makeLibraryPath [ libXrender libXrandr libXcursor libX11 libXext libXi libxcb libGL glib nss nspr expat alsaLib qtbase qtdeclarative qtsvg qtlocation qtwebchannel qtwebengine diff --git a/pkgs/applications/science/electronics/eagle/eagle7.nix b/pkgs/applications/science/electronics/eagle/eagle7.nix index d826d2d2c24..2804fc3c8d7 100644 --- a/pkgs/applications/science/electronics/eagle/eagle7.nix +++ b/pkgs/applications/science/electronics/eagle/eagle7.nix @@ -5,7 +5,7 @@ let - libPath = stdenv.lib.makeLibraryPath + libPath = lib.makeLibraryPath [ zlib freetype fontconfig openssl libXrender libXrandr libXcursor libX11 libXext libXi libxcb cups ]; diff --git a/pkgs/applications/science/electronics/fped/default.nix b/pkgs/applications/science/electronics/fped/default.nix index 9ef47ae2634..f1c458f40d9 100644 --- a/pkgs/applications/science/electronics/fped/default.nix +++ b/pkgs/applications/science/electronics/fped/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchgit , flex, bison, fig2dev, imagemagick, netpbm, gtk2 -, pkgconfig +, pkg-config }: with lib; @@ -24,7 +24,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ flex bison - pkgconfig + pkg-config imagemagick fig2dev netpbm diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix index f8a0adea482..79c01d3ec71 100644 --- a/pkgs/applications/science/electronics/fritzing/default.nix +++ b/pkgs/applications/science/electronics/fritzing/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, stdenv, fetchpatch, fetchFromGitHub, qmake, pkgconfig +{ mkDerivation, lib, fetchpatch, fetchFromGitHub, qmake, pkg-config , qtbase, qtsvg, qttools, qtserialport, boost, libgit2 }: @@ -32,7 +32,7 @@ mkDerivation rec { buildInputs = [ qtbase qtsvg qtserialport boost libgit2 ]; - nativeBuildInputs = [ qmake pkgconfig qttools ]; + nativeBuildInputs = [ qmake pkg-config qttools ]; patches = [(fetchpatch { name = "fix-libgit2-version.patch"; @@ -79,8 +79,8 @@ mkDerivation rec { meta = { description = "An open source prototyping tool for Arduino-based projects"; homepage = "https://fritzing.org/"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.robberer ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.robberer ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/science/electronics/geda/default.nix b/pkgs/applications/science/electronics/geda/default.nix index c9a3dcf1aa0..cf98e6963e1 100644 --- a/pkgs/applications/science/electronics/geda/default.nix +++ b/pkgs/applications/science/electronics/geda/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, guile, gtk2, flex, gawk, perl }: +{ lib, stdenv, fetchurl, pkg-config, guile, gtk2, flex, gawk, perl }: stdenv.mkDerivation { pname = "geda"; @@ -10,9 +10,9 @@ stdenv.mkDerivation { }; configureFlags = [ - "--disable-update-xdg-database" + "--disable-update-xdg-database" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ guile gtk2 flex gawk perl ]; meta = with lib; { diff --git a/pkgs/applications/science/electronics/gerbv/default.nix b/pkgs/applications/science/electronics/gerbv/default.nix index a44a892eabe..94a8f081f69 100644 --- a/pkgs/applications/science/electronics/gerbv/default.nix +++ b/pkgs/applications/science/electronics/gerbv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, pkgconfig, gettext, libtool, automake, autoconf, cairo, gtk2, autoreconfHook }: +{ lib, stdenv, fetchgit, pkg-config, gettext, libtool, automake, autoconf, cairo, gtk2, autoreconfHook }: stdenv.mkDerivation { pname = "gerbv"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "00jn1xhf6kblxc5gac1wvk8zm12fy6sk81nj3jwdag0z6wk3z446"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ gettext libtool automake autoconf cairo gtk2 ]; configureFlags = ["--disable-update-desktop-database"]; diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index ad5e9e55c57..971891a5b01 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, gtk3, gperf, pkgconfig, bzip2, tcl, tk, wrapGAppsHook, judy, xz }: +{ lib, stdenv, fetchurl, glib, gtk3, gperf, pkg-config, bzip2, tcl, tk, wrapGAppsHook, judy, xz }: stdenv.mkDerivation rec { pname = "gtkwave"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0ma30jyc94iid3v3m8aw4i2lyiqfxkpsdvdmmaibynk400cbzivl"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; buildInputs = [ glib gtk3 gperf bzip2 tcl tk judy xz ]; configureFlags = [ @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { meta = { description = "VCD/Waveform viewer for Unix and Win32"; homepage = "http://gtkwave.sourceforge.net"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ thoughtpolice ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix index 47f901c0ba5..2c5ee674a23 100644 --- a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix +++ b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, ninja, pkgconfig, python3Packages +{ lib, stdenv, fetchFromGitHub, cmake, ninja, pkg-config, python3Packages , boost, rapidjson, qtbase, qtsvg, igraph, spdlog, wrapQtAppsHook , fmt, graphviz, llvmPackages ? null }: @@ -21,12 +21,12 @@ stdenv.mkDerivation rec { shopt -u extglob ''; - nativeBuildInputs = [ cmake ninja pkgconfig ]; + nativeBuildInputs = [ cmake ninja pkg-config ]; buildInputs = [ qtbase qtsvg boost rapidjson igraph spdlog fmt graphviz wrapQtAppsHook ] ++ (with python3Packages; [ python pybind11 ]) - ++ stdenv.lib.optional stdenv.cc.isClang llvmPackages.openmp; + ++ lib.optional stdenv.cc.isClang llvmPackages.openmp; - cmakeFlags = with stdenv.lib.versions; [ + cmakeFlags = with lib.versions; [ "-DHAL_VERSION_RETURN=${version}" "-DHAL_VERSION_MAJOR=${major version}" "-DHAL_VERSION_MINOR=${minor version}" diff --git a/pkgs/applications/science/electronics/horizon-eda/default.nix b/pkgs/applications/science/electronics/horizon-eda/default.nix index 6b9f07ee68f..ef68eb999fa 100644 --- a/pkgs/applications/science/electronics/horizon-eda/default.nix +++ b/pkgs/applications/science/electronics/horizon-eda/default.nix @@ -13,7 +13,7 @@ , libuuid , libzip , opencascade -, pkgconfig +, pkg-config , podofo , python3 , sqlite @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "horizon-eda"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "horizon-eda"; repo = "horizon"; rev = "v${version}"; - sha256 = "13c4p60vrmwmnrv2jcr2gc1cxnimy7j8yp1p6434pbbk2py9k8mx"; + sha256 = "0mra6kf1c2qixfzqva6r01qms5kdabbhhblhk5is6h6nq78i8640"; }; buildInputs = [ @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ boost.dev - pkgconfig + pkg-config wrapGAppsHook ]; diff --git a/pkgs/applications/science/electronics/hyp2mat/default.nix b/pkgs/applications/science/electronics/hyp2mat/default.nix index 01d587fc172..799af4c4308 100644 --- a/pkgs/applications/science/electronics/hyp2mat/default.nix +++ b/pkgs/applications/science/electronics/hyp2mat/default.nix @@ -7,7 +7,7 @@ , groff , libharu , autoreconfHook -, pkgconfig +, pkg-config , libpng , zlib }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index 7f11f483a9d..3ed6234b4f8 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitLab , cmake , libGLU @@ -13,7 +13,7 @@ , curl , openssl , boost -, pkgconfig +, pkg-config , doxygen , pcre , libpthreadstubs @@ -43,11 +43,11 @@ , gtk3 }: -assert stdenv.lib.asserts.assertMsg (!(withOCE && stdenv.isAarch64)) "OCE fails a test on Aarch64"; -assert stdenv.lib.asserts.assertMsg (!(withOCC && withOCE)) +assert lib.asserts.assertMsg (!(withOCE && stdenv.isAarch64)) "OCE fails a test on Aarch64"; +assert lib.asserts.assertMsg (!(withOCC && withOCE)) "Only one of OCC and OCE may be enabled"; let - inherit (stdenv.lib) optional optionals; + inherit (lib) optional optionals; in stdenv.mkDerivation rec { pname = "kicad-base"; @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { ] ; - nativeBuildInputs = [ cmake doxygen pkgconfig lndir ]; + nativeBuildInputs = [ cmake doxygen pkg-config lndir ]; buildInputs = [ libGLU @@ -140,7 +140,7 @@ stdenv.mkDerivation rec { the libraries are passed via an env var in the wrapper, default.nix ''; homepage = "https://www.kicad-pcb.org/"; - license = stdenv.lib.licenses.agpl3; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.agpl3; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 48a5779d207..88bb7978881 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitLab , gnome3 , wxGTK30 @@ -70,13 +70,13 @@ # } assert withNgspice -> libngspice != null; -assert stdenv.lib.assertMsg (!ngspiceSupport) +assert lib.assertMsg (!ngspiceSupport) "`nspiceSupport` was renamed to `withNgspice` for the sake of consistency with other kicad nix arguments."; -assert stdenv.lib.assertMsg (!oceSupport) +assert lib.assertMsg (!oceSupport) "`oceSupport` was renamed to `withOCE` for the sake of consistency with other kicad nix arguments."; -assert stdenv.lib.assertMsg (!scriptingSupport) +assert lib.assertMsg (!scriptingSupport) "`scriptingSupport` was renamed to `withScripting` for the sake of consistency with other kicad nix arguments."; -assert stdenv.lib.assertMsg (!withOCCT) +assert lib.assertMsg (!withOCCT) "`withOCCT` was renamed to `withOCC` for the sake of consistency with upstream cmake options."; let baseName = if (stable) then "kicad" else "kicad-unstable"; @@ -151,7 +151,7 @@ let python = python3; wxPython = python.pkgs.wxPython_4_0; - inherit (stdenv.lib) concatStringsSep flatten optionalString optionals; + inherit (lib) concatStringsSep flatten optionalString optionals; in stdenv.mkDerivation rec { @@ -251,11 +251,11 @@ stdenv.mkDerivation rec { KiCad is an open source software suite for Electronic Design Automation. The Programs handle Schematic Capture, and PCB Layout with Gerber output. ''; - license = stdenv.lib.licenses.agpl3; + license = lib.licenses.agpl3; # berce seems inactive... - maintainers = with stdenv.lib.maintainers; [ evils kiwi berce ]; + maintainers = with lib.maintainers; [ evils kiwi berce ]; # kicad is cross platform - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; # despite that, nipkgs' wxGTK for darwin is "wxmac" # and wxPython_4_0 does not account for this # adjusting this package to downgrade to python2Packages.wxPython (wxPython 3), diff --git a/pkgs/applications/science/electronics/kicad/libraries.nix b/pkgs/applications/science/electronics/kicad/libraries.nix index b045a7d1068..e98f2e49576 100644 --- a/pkgs/applications/science/electronics/kicad/libraries.nix +++ b/pkgs/applications/science/electronics/kicad/libraries.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , cmake , gettext , libSrc @@ -15,8 +15,8 @@ let nativeBuildInputs = [ cmake ]; meta = rec { - license = stdenv.lib.licenses.cc-by-sa-40; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.cc-by-sa-40; + platforms = lib.platforms.all; # the 3d models are a ~1 GiB download and occupy ~5 GiB in store. # this would exceed the hydra output limit hydraPlatforms = if (name == "packages3d") then [ ] else platforms; diff --git a/pkgs/applications/science/electronics/openems/default.nix b/pkgs/applications/science/electronics/openems/default.nix index e1063f8e26c..64afe3222c2 100644 --- a/pkgs/applications/science/electronics/openems/default.nix +++ b/pkgs/applications/science/electronics/openems/default.nix @@ -11,16 +11,15 @@ , cmake , octave , gl2ps +, mpi , withQcsxcad ? true , withMPI ? false , withHyp2mat ? true , qcsxcad ? null -, openmpi ? null , hyp2mat ? null }: assert withQcsxcad -> qcsxcad != null; -assert withMPI -> openmpi != null; assert withHyp2mat -> hyp2mat != null; stdenv.mkDerivation { @@ -50,7 +49,7 @@ stdenv.mkDerivation { csxcad (octave.override { inherit hdf5; }) ] ++ lib.optionals withQcsxcad [ qcsxcad ] - ++ lib.optionals withMPI [ openmpi ] + ++ lib.optionals withMPI [ mpi ] ++ lib.optionals withHyp2mat [ hyp2mat ]; postFixup = '' diff --git a/pkgs/applications/science/electronics/pcb/default.nix b/pkgs/applications/science/electronics/pcb/default.nix index 47de2173947..69ff7b2e69f 100644 --- a/pkgs/applications/science/electronics/pcb/default.nix +++ b/pkgs/applications/science/electronics/pcb/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, pkgconfig +, pkg-config , gtk2 , bison , intltool @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config bison intltool flex diff --git a/pkgs/applications/science/electronics/pulseview/default.nix b/pkgs/applications/science/electronics/pulseview/default.nix index f43717389b5..00c830fcd33 100644 --- a/pkgs/applications/science/electronics/pulseview/default.nix +++ b/pkgs/applications/science/electronics/pulseview/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchurl, pkgconfig, cmake, glib, boost, libsigrok +{ mkDerivation, lib, fetchurl, pkg-config, cmake, glib, boost, libsigrok , libsigrokdecode, libserialport, libzip, udev, libusb1, libftdi1, glibmm , pcre, librevisa, python3, qtbase, qtsvg }: @@ -12,7 +12,7 @@ mkDerivation rec { sha256 = "0bvgmkgz37n2bi9niskpl05hf7rsj1lj972fbrgnlz25s4ywxrwy"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ glib boost libsigrok libsigrokdecode libserialport libzip udev libusb1 libftdi1 glibmm diff --git a/pkgs/applications/science/electronics/qfsm/default.nix b/pkgs/applications/science/electronics/qfsm/default.nix index a50609e84a8..de79abc3e51 100644 --- a/pkgs/applications/science/electronics/qfsm/default.nix +++ b/pkgs/applications/science/electronics/qfsm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, cmake, graphviz, pkg-config }: +{ lib, stdenv, fetchurl, qt4, cmake, graphviz, pkg-config }: stdenv.mkDerivation rec { name = "qfsm-0.54.0"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "Graphical editor for finite state machines"; homepage = "http://qfsm.sourceforge.net/"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/science/electronics/qucs-s/default.nix b/pkgs/applications/science/electronics/qucs-s/default.nix new file mode 100644 index 00000000000..6507198a790 --- /dev/null +++ b/pkgs/applications/science/electronics/qucs-s/default.nix @@ -0,0 +1,42 @@ +{ stdenv, lib, fetchFromGitHub, flex, bison, qt4, libX11, cmake, gperf, adms, +ngspice, wrapGAppsHook, +kernels ? [ ngspice ] }: + +stdenv.mkDerivation rec { + pname = "qucs-s"; + version = "0.0.22"; + + src = fetchFromGitHub { + owner = "ra3xdh"; + repo = "qucs_s"; + rev = version; + sha256 = "0rrq2ddridc09m6fixdmbngn42xmv8cmdf6r8zzn2s98fqib5qd6"; + }; + + nativeBuildInputs = [ wrapGAppsHook cmake ]; + buildInputs = [ flex bison qt4 libX11 gperf adms ] ++ kernels; + + preConfigure = '' + # Make custom kernels avaible from qucs-s + gappsWrapperArgs+=(--prefix PATH ":" ${lib.makeBinPath kernels}) + ''; + + QTDIR=qt4; + + doInstallCheck = true; + installCheck = '' + $out/bin/qucs-s --version + ''; + + meta = with lib; { + description = "Spin-off of Qucs that allows custom simulation kernels"; + longDescription = '' + Spin-off of Qucs that allows custom simulation kernels. + Default version is installed with ngspice. + ''; + homepage = "https://ra3xdh.github.io/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ mazurel ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/applications/science/electronics/qucs/default.nix b/pkgs/applications/science/electronics/qucs/default.nix index 9b143f1c3f1..a5f2cf394b4 100644 --- a/pkgs/applications/science/electronics/qucs/default.nix +++ b/pkgs/applications/science/electronics/qucs/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, flex, bison, qt4, libX11, cmake, gperf, adms }: +{lib, stdenv, fetchFromGitHub, flex, bison, qt4, libX11, cmake, gperf, adms }: stdenv.mkDerivation rec { version = "0.0.19"; @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { meta = { description = "Integrated circuit simulator"; homepage = "http://qucs.sourceforge.net"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/science/electronics/tkgate/1.x.nix b/pkgs/applications/science/electronics/tkgate/1.x.nix index e6f91261603..9bb04a3189e 100644 --- a/pkgs/applications/science/electronics/tkgate/1.x.nix +++ b/pkgs/applications/science/electronics/tkgate/1.x.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, tcl, tk, libX11, glibc, which, yacc, flex, imake, xorgproto, gccmakedep }: +{ lib, stdenv, fetchurl, tcl, tk, libX11, glibc, which, yacc, flex, imake, xorgproto, gccmakedep }: let - libiconvInc = stdenv.lib.optionalString stdenv.isLinux "${glibc.dev}/include"; - libiconvLib = stdenv.lib.optionalString stdenv.isLinux "${glibc.out}/lib"; + libiconvInc = lib.optionalString stdenv.isLinux "${glibc.dev}/include"; + libiconvLib = lib.optionalString stdenv.isLinux "${glibc.out}/lib"; in stdenv.mkDerivation rec { name = "tkgate-1.8.7"; @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { meta = { description = "Event driven digital circuit simulator with a TCL/TK-based graphical editor"; homepage = "http://www.tkgate.org/"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.peti ]; - hydraPlatforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.peti ]; + hydraPlatforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index 27423e75308..fe988642c01 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -1,24 +1,31 @@ { lib, stdenv, fetchurl -, perl, flex, bison +, perl, flex, bison, python3 }: stdenv.mkDerivation rec { pname = "verilator"; - version = "4.100"; + version = "4.108"; src = fetchurl { url = "https://www.veripool.org/ftp/${pname}-${version}.tgz"; - sha256 = "0vg1gk1hqlnz74gfpf57588758myxvhqzi37yl4vqjcq40r83nr2"; + sha256 = "00i7am41w9v4smhl64z7s95wdb55f684y89mc0hbc07j1ggc33lf"; }; enableParallelBuilding = true; buildInputs = [ perl ]; - nativeBuildInputs = [ flex bison ]; + nativeBuildInputs = [ flex bison python3 ]; # these tests need some interpreter paths patched early on... + # see https://github.com/NixOS/nix/issues/1205 doCheck = false; checkTarget = "test"; + postPatch = '' + patchShebangs \ + src/flexfix \ + src/vlcovgen + ''; + meta = with lib; { description = "Fast and robust (System)Verilog simulator/compiler"; homepage = "https://www.veripool.org/wiki/verilator"; diff --git a/pkgs/applications/science/electronics/verilog/default.nix b/pkgs/applications/science/electronics/verilog/default.nix index 081ca65f315..dd76e9364c5 100644 --- a/pkgs/applications/science/electronics/verilog/default.nix +++ b/pkgs/applications/science/electronics/verilog/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "steveicarus"; repo = pname; - rev = "v${stdenv.lib.replaceStrings ["."] ["_"] version}"; + rev = "v${lib.replaceStrings ["."] ["_"] version}"; sha256 = "0nzcyi6l2zv9wxzsv9i963p3igyjds0n55x0ph561mc3pfbc7aqp"; }; diff --git a/pkgs/applications/science/electronics/vhd2vl/default.nix b/pkgs/applications/science/electronics/vhd2vl/default.nix index 4014f53f649..adce3055107 100644 --- a/pkgs/applications/science/electronics/vhd2vl/default.nix +++ b/pkgs/applications/science/electronics/vhd2vl/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "17va2pil4938j8c93anhy45zzgnvq3k71a7glj02synfrsv6fs8n"; }; - patches = stdenv.lib.optionals (!stdenv.isAarch64) [ + patches = lib.optionals (!stdenv.isAarch64) [ # fix build with verilog 11.0 - https://github.com/ldoolitt/vhd2vl/pull/15 # for some strange reason, this is not needed for aarch64 (fetchpatch { diff --git a/pkgs/applications/science/electronics/xcircuit/default.nix b/pkgs/applications/science/electronics/xcircuit/default.nix index d7bdf5c67c0..68322a19178 100644 --- a/pkgs/applications/science/electronics/xcircuit/default.nix +++ b/pkgs/applications/science/electronics/xcircuit/default.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, fetchurl, autoreconfHook, automake, pkgconfig +{ lib, stdenv, fetchurl, autoreconfHook, automake, pkg-config , cairo, ghostscript, ngspice, tcl, tk, xorg, zlib }: let version = "3.10.12"; name = "xcircuit-${version}"; - inherit (stdenv.lib) getBin; + inherit (lib) getBin; in stdenv.mkDerivation { inherit name version; @@ -14,7 +14,7 @@ in stdenv.mkDerivation { sha256 = "1h1ywc3mr7plvwnhdii2zgnnv5ih2nhyl4qbdjpi83dq0aq1s2mn"; }; - nativeBuildInputs = [ autoreconfHook automake pkgconfig ]; + nativeBuildInputs = [ autoreconfHook automake pkg-config ]; hardeningDisable = [ "format" ]; configureFlags = [ diff --git a/pkgs/applications/science/electronics/xoscope/default.nix b/pkgs/applications/science/electronics/xoscope/default.nix index f8a68f31f46..5052a3715ef 100644 --- a/pkgs/applications/science/electronics/xoscope/default.nix +++ b/pkgs/applications/science/electronics/xoscope/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gtk2, pkgconfig}: +{lib, stdenv, fetchurl, gtk2, pkg-config}: stdenv.mkDerivation rec { name = "xoscope-2.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "00xlvvqyw6l1ljbsx1vgx2v1jfh0xacz1a0yhq1dj6yxf5wh58x8"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 ]; # from: https://aur.archlinux.org/packages.php?ID=12140&detail=1 @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { meta = { description = "Oscilloscope through the sound card"; homepage = "http://xoscope.sourceforge.net"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/science/geometry/drgeo/default.nix b/pkgs/applications/science/geometry/drgeo/default.nix index a147cb305cc..59d7315ef41 100644 --- a/pkgs/applications/science/geometry/drgeo/default.nix +++ b/pkgs/applications/science/geometry/drgeo/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, libglade, gtk2, guile, libxml2, perl -, intltool, libtool, pkgconfig }: +, intltool, libtool, pkg-config }: stdenv.mkDerivation rec { pname = "drgeo"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { patches = [ ./struct.patch ]; buildInputs = [libglade gtk2 guile libxml2 - perl intltool libtool pkgconfig]; + perl intltool libtool pkg-config]; prebuild = '' cp drgeo.desktop.in drgeo.desktop diff --git a/pkgs/applications/science/geometry/tetgen/1.4.nix b/pkgs/applications/science/geometry/tetgen/1.4.nix index 9dd25473683..245d4c12bfe 100644 --- a/pkgs/applications/science/geometry/tetgen/1.4.nix +++ b/pkgs/applications/science/geometry/tetgen/1.4.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { name = "tetgen-1.4.3"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Quality Tetrahedral Mesh Generator and 3D Delaunay Triangulator"; homepage = "http://tetgen.org/"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mit; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/science/geometry/tetgen/default.nix b/pkgs/applications/science/geometry/tetgen/default.nix index d12e8e35844..c921c05c58e 100644 --- a/pkgs/applications/science/geometry/tetgen/default.nix +++ b/pkgs/applications/science/geometry/tetgen/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: let version = "1.5.1"; in stdenv.mkDerivation { @@ -19,7 +19,7 @@ stdenv.mkDerivation { inherit version; description = "Quality Tetrahedral Mesh Generator and 3D Delaunay Triangulator"; homepage = "http://tetgen.org/"; - license = stdenv.lib.licenses.agpl3Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.agpl3Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/science/logic/abella/default.nix b/pkgs/applications/science/logic/abella/default.nix index 3d9a2e9bd67..14ceb53f9bb 100644 --- a/pkgs/applications/science/logic/abella/default.nix +++ b/pkgs/applications/science/logic/abella/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, rsync, ocamlPackages }: +{ lib, stdenv, fetchurl, rsync, ocamlPackages }: stdenv.mkDerivation rec { pname = "abella"; @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { objects with binding. ''; homepage = "http://abella-prover.org/"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ bcdarwin ciil ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ bcdarwin ciil ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/science/logic/acgtk/default.nix b/pkgs/applications/science/logic/acgtk/default.nix index 48563248773..13364beed5c 100644 --- a/pkgs/applications/science/logic/acgtk/default.nix +++ b/pkgs/applications/science/logic/acgtk/default.nix @@ -16,7 +16,9 @@ stdenv.mkDerivation { buildPhase = "dune build"; - inherit (dune) installPhase; + installPhase = '' + dune install --prefix $out --libdir $OCAMLFIND_DESTDIR + ''; meta = with lib; { homepage = "https://acg.loria.fr/"; diff --git a/pkgs/applications/science/logic/aiger/default.nix b/pkgs/applications/science/logic/aiger/default.nix index aa5a59ed298..15c45466b13 100644 --- a/pkgs/applications/science/logic/aiger/default.nix +++ b/pkgs/applications/science/logic/aiger/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, picosat }: +{ lib, stdenv, fetchurl, picosat }: stdenv.mkDerivation rec { pname = "aiger"; @@ -48,8 +48,8 @@ stdenv.mkDerivation rec { meta = { description = "And-Inverter Graph (AIG) utilities"; homepage = "http://fmv.jku.at/aiger/"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ thoughtpolice ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/science/logic/avy/default.nix b/pkgs/applications/science/logic/avy/default.nix index 6f8120c7b8e..fe2f30a55a3 100644 --- a/pkgs/applications/science/logic/avy/default.nix +++ b/pkgs/applications/science/logic/avy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, zlib, boost }: +{ lib, stdenv, fetchgit, cmake, zlib, boost }: stdenv.mkDerivation rec { pname = "avy"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib boost.out boost.dev ]; NIX_CFLAGS_COMPILE = toString ([ "-Wno-narrowing" ] # Squelch endless stream of warnings on same few things - ++ stdenv.lib.optionals stdenv.cc.isClang [ + ++ lib.optionals stdenv.cc.isClang [ "-Wno-empty-body" "-Wno-tautological-compare" "-Wc++11-compat-deprecated-writable-strings" @@ -40,9 +40,9 @@ stdenv.mkDerivation rec { meta = { description = "AIGER model checking for Property Directed Reachability"; homepage = "https://arieg.bitbucket.io/avy/"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ thoughtpolice ]; + platforms = lib.platforms.linux; # See pkgs/applications/science/logic/glucose/default.nix # (The error is different due to glucose-fenv.patch, but the same) badPlatforms = [ "aarch64-linux" ]; diff --git a/pkgs/applications/science/logic/boolector/default.nix b/pkgs/applications/science/logic/boolector/default.nix index 2898ce4e1f6..6916379bdea 100644 --- a/pkgs/applications/science/logic/boolector/default.nix +++ b/pkgs/applications/science/logic/boolector/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { in # tests modelgen and modelgensmt2 spawn boolector in another processes and # macOS strips DYLD_LIBRARY_PATH, hardcode it for testing - stdenv.lib.optionalString stdenv.isDarwin '' + lib.optionalString stdenv.isDarwin '' cp -r bin bin.back install_name_tool -change libboolector.dylib $(pwd)/lib/libboolector.dylib bin/boolector '' + '' @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { patchShebangs .. ''; - postCheck = stdenv.lib.optionalString stdenv.isDarwin '' + postCheck = lib.optionalString stdenv.isDarwin '' rm -rf bin mv bin.back bin ''; diff --git a/pkgs/applications/science/logic/btor2tools/default.nix b/pkgs/applications/science/logic/btor2tools/default.nix index 355274d1e1c..992d8b1de58 100644 --- a/pkgs/applications/science/logic/btor2tools/default.nix +++ b/pkgs/applications/science/logic/btor2tools/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0mfqmkgvyw8fa2c09kww107dmk180ch1hp98r5kv41vnc04iqb0s"; }; - nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; installPhase = '' mkdir -p $out $dev/include/btor2parser/ $lib/lib diff --git a/pkgs/applications/science/logic/clprover/clprover.nix b/pkgs/applications/science/logic/clprover/clprover.nix index f3049a659d1..2a8c058a80b 100644 --- a/pkgs/applications/science/logic/clprover/clprover.nix +++ b/pkgs/applications/science/logic/clprover/clprover.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "1.0.3"; src = fetchzip { - url = "http://cgi.csc.liv.ac.uk/~ullrich/CLProver++/CLProver++-v1.0.3-18-04-2015.zip"; + url = "https://cgi.csc.liv.ac.uk/~ullrich/CLProver++/CLProver++-v1.0.3-18-04-2015.zip"; sha256 = "10kmlg4m572qwfzi6hkyb0ypb643xw8sfb55xx7866lyh37w1q3s"; stripRoot = false; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Resolution-based theorem prover for Coalition Logic implemented in C++"; - homepage = "http://cgi.csc.liv.ac.uk/~ullrich/CLProver++/"; + homepage = "https://cgi.csc.liv.ac.uk/~ullrich/CLProver++/"; license = licenses.gpl3; # Note that while the website states that it is GPLv2 but the file in the zip as well as the comments in the source state it is GPLv3 maintainers = with maintainers; [ mgttlinger ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index fae17a5e09f..7a5c1e4da14 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -5,7 +5,7 @@ # - The exact version can be specified through the `version` argument to # the derivation; it defaults to the latest stable version. -{ lib, stdenv, fetchzip, writeText, pkgconfig, gnumake42 +{ lib, stdenv, fetchzip, writeText, pkg-config, gnumake42 , customOCamlPackages ? null , ocamlPackages_4_05, ocamlPackages_4_09, ocamlPackages_4_10, ncurses , buildIde ? !(stdenv.isDarwin && lib.versionAtLeast version "8.10") @@ -13,7 +13,8 @@ , csdp ? null , version, coq-version ? null, }@args: -let lib = import ../../../../build-support/coq/extra-lib.nix {inherit (stdenv) lib;}; in +let lib' = lib; in +let lib = import ../../../../build-support/coq/extra-lib.nix {lib = lib';}; in with builtins; with lib; let release = { @@ -44,12 +45,12 @@ let }; releaseRev = v: "V${v}"; fetched = import ../../../../build-support/coq/meta-fetch/default.nix - { inherit stdenv fetchzip; } + { inherit lib stdenv fetchzip; } { inherit release releaseRev; location = { owner = "coq"; repo = "coq";}; } args.version; version = fetched.version; coq-version = args.coq-version or (if version != "dev" then versions.majorMinor version else "dev"); - versionAtLeast = v: (coq-version == "dev") || (stdenv.lib.versionAtLeast coq-version v); + versionAtLeast = v: (coq-version == "dev") || (lib.versionAtLeast coq-version v); ideFlags = optionalString (buildIde && !versionAtLeast "8.10") "-lablgtkdir ${ocamlPackages.lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt"; csdpPatch = if csdp != null then '' @@ -121,7 +122,7 @@ self = stdenv.mkDerivation { ''; }; - nativeBuildInputs = [ pkgconfig ] ++ optional (!versionAtLeast "8.6") gnumake42; + nativeBuildInputs = [ pkg-config ] ++ optional (!versionAtLeast "8.6") gnumake42; buildInputs = [ ncurses ] ++ ocamlBuildInputs ++ optionals buildIde (if versionAtLeast "8.10" diff --git a/pkgs/applications/science/logic/cryptominisat/default.nix b/pkgs/applications/science/logic/cryptominisat/default.nix index 042a4b23566..33de2d27dc9 100644 --- a/pkgs/applications/science/logic/cryptominisat/default.nix +++ b/pkgs/applications/science/logic/cryptominisat/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "00hmxdlyhn7pwk9jlvc5g0l5z5xqfchjzf5jgn3pkj9xhl8yqq50"; }; - patches = [ + patches = [ (fetchpatch { # https://github.com/msoos/cryptominisat/pull/621 url = "https://github.com/msoos/cryptominisat/commit/11a97003b0bfbfb61ed6c4e640212110d390c28c.patch"; diff --git a/pkgs/applications/science/logic/cryptoverif/default.nix b/pkgs/applications/science/logic/cryptoverif/default.nix index 78861786def..4c9ce3e9595 100644 --- a/pkgs/applications/science/logic/cryptoverif/default.nix +++ b/pkgs/applications/science/logic/cryptoverif/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml }: +{ lib, stdenv, fetchurl, ocaml }: stdenv.mkDerivation rec { pname = "cryptoverif"; @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { meta = { description = "Cryptographic protocol verifier in the computational model"; homepage = "https://prosecco.gforge.inria.fr/personal/bblanche/cryptoverif/"; - license = stdenv.lib.licenses.cecill-b; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = lib.licenses.cecill-b; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.thoughtpolice ]; }; } diff --git a/pkgs/applications/science/logic/cvc4/default.nix b/pkgs/applications/science/logic/cvc4/default.nix index fd31a5732e3..b0b3e5e610e 100644 --- a/pkgs/applications/science/logic/cvc4/default.nix +++ b/pkgs/applications/science/logic/cvc4/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, cln, gmp, git, swig, pkgconfig +{ lib, stdenv, fetchFromGitHub, cmake, cln, gmp, git, swig, pkg-config , readline, libantlr3c, boost, jdk, python3, antlr3_4 }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1rhs4pvzaa1wk00czrczp58b2cxfghpsnq534m0l3snnya2958jp"; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ gmp git python3.pkgs.toml cln readline swig libantlr3c antlr3_4 boost jdk python3 ]; configureFlags = [ "--enable-language-bindings=c,c++,java" diff --git a/pkgs/applications/science/logic/ekrhyper/default.nix b/pkgs/applications/science/logic/ekrhyper/default.nix index e1eb9a2dcc3..38cc0f06088 100644 --- a/pkgs/applications/science/logic/ekrhyper/default.nix +++ b/pkgs/applications/science/logic/ekrhyper/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, perl}: +{lib, stdenv, fetchurl, ocaml, perl}: let s = # Generated upstream information rec { @@ -25,8 +25,8 @@ stdenv.mkDerivation { meta = { inherit (s) version; description = "Automated first-order theorem prover"; - license = stdenv.lib.licenses.gpl2 ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2 ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix index 7a7da2c5f5d..bb10998b2f4 100644 --- a/pkgs/applications/science/logic/elan/default.nix +++ b/pkgs/applications/science/logic/elan/default.nix @@ -1,19 +1,19 @@ -{ lib, pkgconfig, curl, openssl, zlib, fetchFromGitHub, rustPlatform }: +{ lib, pkg-config, curl, openssl, zlib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "elan"; - version = "0.10.2"; + version = "0.10.3"; src = fetchFromGitHub { owner = "kha"; repo = "elan"; rev = "v${version}"; - sha256 = "0ycw1r364g5gwh8796dpv1israpg7zqwx8mcvnacv2lqj5iijmby"; + sha256 = "sha256-YkGfuqtvVfPcxJ8UqD5QidcNEy5brTWGEK4fR64Yz70="; }; - cargoSha256 = "0hcaiy046d2gnkp6sfpnkkprb3nd94i9q8dgqxxpwrc1j157x6z9"; + cargoSha256 = "sha256-2fYicpoEERwD4OjdpseKQOkDvZlb7NnOZcb6Tu+rQdA="; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ curl zlib openssl ]; diff --git a/pkgs/applications/science/logic/gappa/default.nix b/pkgs/applications/science/logic/gappa/default.nix index 2ca1bcd3098..73f34f60fc4 100644 --- a/pkgs/applications/science/logic/gappa/default.nix +++ b/pkgs/applications/science/logic/gappa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gmp, mpfr, boost }: +{ lib, stdenv, fetchurl, gmp, mpfr, boost }: stdenv.mkDerivation { name = "gappa-1.3.5"; @@ -16,8 +16,8 @@ stdenv.mkDerivation { meta = { homepage = "http://gappa.gforge.inria.fr/"; description = "Verifying and formally proving properties on numerical programs dealing with floating-point or fixed-point arithmetic"; - license = with stdenv.lib.licenses; [ cecill20 gpl2 ]; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; - platforms = stdenv.lib.platforms.all; + license = with lib.licenses; [ cecill20 gpl2 ]; + maintainers = with lib.maintainers; [ vbgl ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/science/logic/iprover/default.nix b/pkgs/applications/science/logic/iprover/default.nix index 1f02d30cf25..ff88586e035 100644 --- a/pkgs/applications/science/logic/iprover/default.nix +++ b/pkgs/applications/science/logic/iprover/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml eprover zlib ]; - preConfigure = ''patchShebangs .''; + preConfigure = "patchShebangs ."; installPhase = '' mkdir -p "$out/bin" diff --git a/pkgs/applications/science/logic/isabelle/default.nix b/pkgs/applications/science/logic/isabelle/default.nix index 9472d4b9b29..a0f81a543f1 100644 --- a/pkgs/applications/science/logic/isabelle/default.nix +++ b/pkgs/applications/science/logic/isabelle/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perl, nettools, java, polyml, z3, rlwrap }: +{ lib, stdenv, fetchurl, perl, perlPackages, makeWrapper, nettools, java, polyml, z3, rlwrap }: # nettools needed for hostname stdenv.mkDerivation rec { @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { sha256 = "1bibabhlsvf6qsjjkgxcpq3cvl1z7r8yfcgqbhbvsiv69n3gyfk3"; }; - buildInputs = [ perl polyml z3 ] - ++ stdenv.lib.optionals (!stdenv.isDarwin) [ nettools java ]; + buildInputs = [ perl polyml z3 makeWrapper ] + ++ lib.optionals (!stdenv.isDarwin) [ nettools java ]; sourceRoot = dirname; @@ -64,6 +64,8 @@ stdenv.mkDerivation rec { mv $TMP/$dirname $out cd $out/$dirname bin/isabelle install $out/bin + + wrapProgram $out/$dirname/src/HOL/Tools/ATP/scripts/remote_atp --set PERL5LIB ${perlPackages.makeFullPerlPath [ perlPackages.LWP ]} ''; meta = with lib; { diff --git a/pkgs/applications/science/logic/jonprl/default.nix b/pkgs/applications/science/logic/jonprl/default.nix index 3ee05a478bc..379a9a48354 100644 --- a/pkgs/applications/science/logic/jonprl/default.nix +++ b/pkgs/applications/science/logic/jonprl/default.nix @@ -1,4 +1,4 @@ -{ fetchgit, stdenv, smlnj, which }: +{ fetchgit, lib, stdenv, smlnj, which }: stdenv.mkDerivation rec { pname = "jonprl"; @@ -27,9 +27,9 @@ stdenv.mkDerivation rec { Inspired by Nuprl ''; homepage = "https://github.com/jonsterling/JonPRL"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ puffnfresh ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ puffnfresh ]; + platforms = lib.platforms.linux; broken = true; }; } diff --git a/pkgs/applications/science/logic/lci/default.nix b/pkgs/applications/science/logic/lci/default.nix index 4775384a3dd..593b2c54c5c 100644 --- a/pkgs/applications/science/logic/lci/default.nix +++ b/pkgs/applications/science/logic/lci/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, readline}: +{lib, stdenv, fetchurl, readline}: stdenv.mkDerivation rec { version = "0.6"; pname = "lci"; @@ -8,9 +8,9 @@ stdenv.mkDerivation rec { }; buildInputs = [readline]; meta = { - description = ''Lambda calculus interpreter''; - maintainers = with stdenv.lib.maintainers; [raskin]; - platforms = with stdenv.lib.platforms; linux; - license = stdenv.lib.licenses.gpl3; + description = "Lambda calculus interpreter"; + maintainers = with lib.maintainers; [raskin]; + platforms = with lib.platforms; linux; + license = lib.licenses.gpl3; }; } diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index 5bf33a8a359..7749f4fd72d 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lean"; - version = "3.24.0"; + version = "3.26.0"; src = fetchFromGitHub { owner = "leanprover-community"; repo = "lean"; rev = "v${version}"; - sha256 = "npzBuZ37KrUYwC0TglryVTqui/3/t1ma1Zjpnty0d7c="; + sha256 = "sha256-xCULu6ljfyrA/Idr/BJ+3rLVmQqJZPoo+a7s++u50zU="; }; nativeBuildInputs = [ cmake ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { postPatch = "patchShebangs ."; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.isDarwin '' substituteInPlace $out/bin/leanpkg \ --replace "greadlink" "${coreutils}/bin/readlink" ''; diff --git a/pkgs/applications/science/logic/leo3/binary.nix b/pkgs/applications/science/logic/leo3/binary.nix index 29a9adf94c4..dda18c49b72 100644 --- a/pkgs/applications/science/logic/leo3/binary.nix +++ b/pkgs/applications/science/logic/leo3/binary.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, openjdk, runtimeShell}: +{lib, stdenv, fetchurl, openjdk, runtimeShell}: stdenv.mkDerivation rec { pname = "leo3"; version = "1.2"; @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { meta = { inherit version; description = "An automated theorem prover for classical higher-order logic with choice"; - license = stdenv.lib.licenses.bsd3; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.bsd3; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; homepage = "https://page.mi.fu-berlin.de/lex/leo3/"; }; } diff --git a/pkgs/applications/science/logic/logisim/default.nix b/pkgs/applications/science/logic/logisim/default.nix index ce86b252311..1ca22cf769c 100644 --- a/pkgs/applications/science/logic/logisim/default.nix +++ b/pkgs/applications/science/logic/logisim/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, jre, makeWrapper }: +{ lib, stdenv, fetchurl, jre, makeWrapper }: let version = "2.7.1"; in stdenv.mkDerivation { pname = "logisim"; inherit version; - + src = fetchurl { url = "mirror://sourceforge/project/circuit/2.7.x/${version}/logisim-generic-${version}.jar"; sha256 = "1hkvc9zc7qmvjbl9579p84hw3n8wl3275246xlzj136i5b0phain"; }; - + phases = [ "installPhase" ]; nativeBuildInputs = [makeWrapper]; @@ -19,11 +19,11 @@ stdenv.mkDerivation { mkdir -pv $out/bin makeWrapper ${jre}/bin/java $out/bin/logisim --add-flags "-jar $src" ''; - + meta = { homepage = "http://ozark.hendrix.edu/~burch/logisim"; description = "Educational tool for designing and simulating digital logic circuits"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/science/logic/ltl2ba/default.nix b/pkgs/applications/science/logic/ltl2ba/default.nix index b5d13db3b9a..30c13c6036f 100644 --- a/pkgs/applications/science/logic/ltl2ba/default.nix +++ b/pkgs/applications/science/logic/ltl2ba/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv }: +{ fetchurl, lib, stdenv }: stdenv.mkDerivation rec { pname = "ltl2ba"; @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { meta = { description = "Fast translation from LTL formulae to Buchi automata"; homepage = "http://www.lsv.ens-cachan.fr/~gastin/ltl2ba"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.darwin ++ stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.darwin ++ lib.platforms.linux; + maintainers = [ lib.maintainers.thoughtpolice ]; }; } diff --git a/pkgs/applications/science/logic/mcrl2/default.nix b/pkgs/applications/science/logic/mcrl2/default.nix index 56898f163b9..da9231efb81 100644 --- a/pkgs/applications/science/logic/mcrl2/default.nix +++ b/pkgs/applications/science/logic/mcrl2/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libGLU libGL qt5.qtbase boost ]; + dontWrapQtApps = true; + meta = with lib; { description = "A toolset for model-checking concurrent systems and protocols"; longDescription = '' diff --git a/pkgs/applications/science/logic/mcy/default.nix b/pkgs/applications/science/logic/mcy/default.nix index eba910e07eb..dc1094f3e27 100644 --- a/pkgs/applications/science/logic/mcy/default.nix +++ b/pkgs/applications/science/logic/mcy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , yosys, symbiyosys, python3 }: @@ -44,8 +44,8 @@ stdenv.mkDerivation { meta = { description = "Mutation-based coverage testing for hardware designs, with Yosys"; homepage = "https://github.com/YosysHQ/mcy"; - license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ thoughtpolice ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/science/logic/monosat/default.nix b/pkgs/applications/science/logic/monosat/default.nix index 19fba6e2993..259cdcea443 100644 --- a/pkgs/applications/science/logic/monosat/default.nix +++ b/pkgs/applications/science/logic/monosat/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchpatch, fetchFromGitHub, cmake, zlib, gmp, jdk8, +{ lib, stdenv, fetchpatch, fetchFromGitHub, cmake, zlib, gmp, jdk8, # The JDK we use on Darwin currenly makes extensive use of rpaths which are # annoying and break the python library, so let's not bother for now includeJava ? !stdenv.hostPlatform.isDarwin, includeGplCode ? true }: -with stdenv.lib; +with lib; let boolToCmake = x: if x then "ON" else "OFF"; diff --git a/pkgs/applications/science/logic/opensmt/default.nix b/pkgs/applications/science/logic/opensmt/default.nix index 3b4dd20931c..1681d454590 100644 --- a/pkgs/applications/science/logic/opensmt/default.nix +++ b/pkgs/applications/science/logic/opensmt/default.nix @@ -1,25 +1,38 @@ -{ lib, stdenv, fetchurl, automake, libtool, autoconf, intltool, perl -, gmpxx, flex, bison +{ stdenv, lib, fetchFromGitHub +, cmake, libedit, gmpxx, bison, flex +, enableReadline ? false, readline +, gtest }: stdenv.mkDerivation rec { pname = "opensmt"; - version = "20101017"; + version = "2.0.1"; - src = fetchurl { - url = "http://opensmt.googlecode.com/files/opensmt_src_${version}.tgz"; - sha256 = "0xrky7ixjaby5x026v7hn72xh7d401w9jhccxjn0khhn1x87p2w1"; + src = fetchFromGitHub { + owner = "usi-verification-and-security"; + repo = "opensmt"; + rev = "v${version}"; + sha256 = "uoIcXWsxxRsIuFsou3RcN9e48lc7cWMgRPVJLFVslDE="; }; - buildInputs = [ automake libtool autoconf intltool perl gmpxx flex bison ]; + nativeBuildInputs = [ cmake bison flex ]; + buildInputs = [ libedit gmpxx ] + ++ lib.optional enableReadline readline; + + preConfigure = '' + substituteInPlace test/CMakeLists.txt \ + --replace 'FetchContent_Populate' '#FetchContent_Populate' + ''; + cmakeFlags = [ + "-Dgoogletest_SOURCE_DIR=${gtest.src}" + "-Dgoogletest_BINARY_DIR=./gtest-build" + ]; meta = with lib; { description = "A satisfiability modulo theory (SMT) solver"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; - license = licenses.gpl3; - homepage = "http://code.google.com/p/opensmt/"; - broken = true; - downloadPage = "http://code.google.com/p/opensmt/downloads/list"; + license = if enableReadline then licenses.gpl2Plus else licenses.mit; + homepage = "https://github.com/usi-verification-and-security/opensmt"; }; } diff --git a/pkgs/applications/science/logic/ott/default.nix b/pkgs/applications/science/logic/ott/default.nix index 15a9fa5ccab..8752c4ef59d 100644 --- a/pkgs/applications/science/logic/ott/default.nix +++ b/pkgs/applications/science/logic/ott/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, ocaml, opaline }: +{ lib, stdenv, fetchFromGitHub, pkg-config, ocaml, opaline }: stdenv.mkDerivation rec { pname = "ott"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0l81126i2qkz11fs5yrjdgymnqgjcs5avb7f951h61yh1s68jpnn"; }; - nativeBuildInputs = [ pkgconfig opaline ]; + nativeBuildInputs = [ pkg-config opaline ]; buildInputs = [ ocaml ]; installTargets = "ott.install"; @@ -38,8 +38,8 @@ stdenv.mkDerivation rec { target-system terms. ''; homepage = "http://www.cl.cam.ac.uk/~pes20/ott"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ jwiegley ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ jwiegley ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/science/logic/otter/default.nix b/pkgs/applications/science/logic/otter/default.nix index a7eec20548c..2ad066e53f7 100644 --- a/pkgs/applications/science/logic/otter/default.nix +++ b/pkgs/applications/science/logic/otter/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, tcsh, libXaw, libXt, libX11}: +{lib, stdenv, fetchurl, tcsh, libXaw, libXt, libX11}: let s = # Generated upstream information rec { @@ -27,7 +27,7 @@ stdenv.mkDerivation { find . -perm -0100 -type f | xargs sed -i -e "s@/bin/rm@$(type -P rm)@g" find . -perm -0100 -type f | xargs sed -i -e "s@/bin/mv@$(type -P mv)@g" - sed -i -e "s/^XLIBS *=.*/XLIBS=-lXaw -lXt -lX11/" source/formed/Makefile + sed -i -e "s/^XLIBS *=.*/XLIBS=-lXaw -lXt -lX11/" source/formed/Makefile make all make -C examples all @@ -45,9 +45,9 @@ stdenv.mkDerivation { meta = { inherit (s) version; description = "A reliable first-order theorem prover"; - license = stdenv.lib.licenses.publicDomain ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.publicDomain ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; broken = true; }; } diff --git a/pkgs/applications/science/logic/petrinizer/default.nix b/pkgs/applications/science/logic/petrinizer/default.nix index d277e0e1521..38039f61fda 100644 --- a/pkgs/applications/science/logic/petrinizer/default.nix +++ b/pkgs/applications/science/logic/petrinizer/default.nix @@ -1,6 +1,6 @@ { mkDerivation, callPackage, buildPackages , async, base, bytestring, containers, fetchFromGitLab, mtl -, parallel-io, parsec, stdenv, stm, transformers +, parallel-io, parsec, lib, stm, transformers }: let z3 = callPackage ./z3.nix { gomp = null; z3 = buildPackages.z3; }; @@ -26,6 +26,6 @@ mkDerivation rec { transformers ]; description = "Safety and Liveness Analysis of Petri Nets with SMT solvers"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ raskin ]; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ raskin ]; } diff --git a/pkgs/applications/science/logic/petrinizer/sbv-7.13.nix b/pkgs/applications/science/logic/petrinizer/sbv-7.13.nix index ed10e9f3db1..f0c8dd24904 100644 --- a/pkgs/applications/science/logic/petrinizer/sbv-7.13.nix +++ b/pkgs/applications/science/logic/petrinizer/sbv-7.13.nix @@ -1,7 +1,7 @@ { 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 +, lib, syb, tasty, tasty-golden, tasty-hunit, tasty-quickcheck , template-haskell, time, z3 }: mkDerivation { @@ -22,5 +22,5 @@ mkDerivation { testSystemDepends = [ z3 ]; homepage = "http://leventerkok.github.com/sbv/"; description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; } diff --git a/pkgs/applications/science/logic/petrinizer/z3.nix b/pkgs/applications/science/logic/petrinizer/z3.nix index 4d868054c09..a20ccea16dc 100644 --- a/pkgs/applications/science/logic/petrinizer/z3.nix +++ b/pkgs/applications/science/logic/petrinizer/z3.nix @@ -1,5 +1,5 @@ { mkDerivation, fetchpatch -, base, containers, gomp, hspec, QuickCheck, stdenv +, base, containers, gomp, hspec, QuickCheck, lib , transformers, z3 }: mkDerivation { @@ -13,7 +13,7 @@ mkDerivation { testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://github.com/IagoAbal/haskell-z3"; description = "Bindings for the Z3 Theorem Prover"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; doCheck = false; patches = [ (fetchpatch { diff --git a/pkgs/applications/science/logic/picosat/default.nix b/pkgs/applications/science/logic/picosat/default.nix index b13d871580c..48def5fc2e4 100644 --- a/pkgs/applications/science/logic/picosat/default.nix +++ b/pkgs/applications/science/logic/picosat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "picosat"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { configurePhase = "./configure.sh --shared --trace"; - makeFlags = stdenv.lib.optional stdenv.isDarwin + makeFlags = lib.optional stdenv.isDarwin "SONAME=-Wl,-install_name,$(out)/lib/libpicosat.so"; installPhase = '' @@ -37,8 +37,8 @@ stdenv.mkDerivation rec { meta = { description = "SAT solver with proof and core support"; homepage = "http://fmv.jku.at/picosat/"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ roconnor thoughtpolice ]; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ roconnor thoughtpolice ]; }; } diff --git a/pkgs/applications/science/logic/potassco/clingcon.nix b/pkgs/applications/science/logic/potassco/clingcon.nix index b74583ca1a2..4d64a813e62 100644 --- a/pkgs/applications/science/logic/potassco/clingcon.nix +++ b/pkgs/applications/science/logic/potassco/clingcon.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , bison @@ -34,8 +34,8 @@ stdenv.mkDerivation rec { meta = { inherit version; description = "Extension of clingo to handle constraints over integers"; - license = stdenv.lib.licenses.gpl3; # for now GPL3, next version MIT! - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl3; # for now GPL3, next version MIT! + platforms = lib.platforms.unix; homepage = "https://potassco.org/"; downloadPage = "https://github.com/potassco/clingcon/releases/"; changelog = "https://github.com/potassco/clingcon/releases/tag/v${version}"; diff --git a/pkgs/applications/science/logic/potassco/clingo.nix b/pkgs/applications/science/logic/potassco/clingo.nix index fd6b2c8d14c..f473c4f5366 100644 --- a/pkgs/applications/science/logic/potassco/clingo.nix +++ b/pkgs/applications/science/logic/potassco/clingo.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, cmake }: +{ lib, stdenv, fetchzip, cmake }: stdenv.mkDerivation rec { pname = "clingo"; @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { meta = { inherit version; description = "ASP system to ground and solve logic programs"; - license = stdenv.lib.licenses.mit; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.mit; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.unix; homepage = "https://potassco.org/"; downloadPage = "https://github.com/potassco/clingo/releases/"; }; diff --git a/pkgs/applications/science/logic/prooftree/default.nix b/pkgs/applications/science/logic/prooftree/default.nix index 4db3c333e97..2606b94f4bb 100644 --- a/pkgs/applications/science/logic/prooftree/default.nix +++ b/pkgs/applications/science/logic/prooftree/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, ncurses, ocamlPackages }: +{ lib, stdenv, fetchurl, pkg-config, ncurses, ocamlPackages }: stdenv.mkDerivation rec { pname = "prooftree"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0z1z4wqbqwgppkh2bm89fgy07a0y2m6g4lvcyzs09sm1ysklk2dh"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses ] ++ (with ocamlPackages; [ ocaml findlib camlp5 lablgtk ]); diff --git a/pkgs/applications/science/logic/prover9/default.nix b/pkgs/applications/science/logic/prover9/default.nix index fcdff855848..7fedca72b69 100644 --- a/pkgs/applications/science/logic/prover9/default.nix +++ b/pkgs/applications/science/logic/prover9/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation { name = "prover9-2009-11a"; @@ -39,7 +39,7 @@ stdenv.mkDerivation { for first-order and equational logic. Prover9 is a successor of the Otter Prover. This is the LADR command-line version. ''; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; maintainers = []; }; } diff --git a/pkgs/applications/science/logic/proverif/default.nix b/pkgs/applications/science/logic/proverif/default.nix index 4242bb0599e..ba46d87581e 100644 --- a/pkgs/applications/science/logic/proverif/default.nix +++ b/pkgs/applications/science/logic/proverif/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocamlPackages }: +{ lib, stdenv, fetchurl, ocamlPackages }: stdenv.mkDerivation rec { pname = "proverif"; @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { meta = { description = "Cryptographic protocol verifier in the Dolev-Yao model"; homepage = "https://prosecco.gforge.inria.fr/personal/bblanche/proverif/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.thoughtpolice ]; }; } diff --git a/pkgs/applications/science/logic/redprl/default.nix b/pkgs/applications/science/logic/redprl/default.nix index 49245c73f2c..43a2ec7e97e 100644 --- a/pkgs/applications/science/logic/redprl/default.nix +++ b/pkgs/applications/science/logic/redprl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, mlton }: +{ lib, stdenv, fetchgit, mlton }: stdenv.mkDerivation { name = "redprl-2017-03-28"; src = fetchgit { @@ -21,8 +21,8 @@ stdenv.mkDerivation { meta = { description = "A proof assistant for Nominal Computational Type Theory"; homepage = "http://www.redprl.org/"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.acowley ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.acowley ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/science/logic/sad/default.nix b/pkgs/applications/science/logic/sad/default.nix index 77613a13571..8e4d19973ef 100644 --- a/pkgs/applications/science/logic/sad/default.nix +++ b/pkgs/applications/science/logic/sad/default.nix @@ -31,10 +31,10 @@ stdenv.mkDerivation { The system for automated deduction is intended for automated processing of formal mathematical texts written in a special language called ForTheL (FORmal THEory Language) or in a traditional first-order language ''; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = [ stdenv.lib.maintainers.schmitthenner ]; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.schmitthenner ]; homepage = "http://nevidal.org/sad.en.html"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; broken = true; # ghc-8.4.4 is gone from Nixpkgs }; } diff --git a/pkgs/applications/science/logic/satallax/default.nix b/pkgs/applications/science/logic/satallax/default.nix index 6c2b03b5b37..dffb66b2fcf 100644 --- a/pkgs/applications/science/logic/satallax/default.nix +++ b/pkgs/applications/science/logic/satallax/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, zlib, which, eprover, makeWrapper, coq}: +{lib, stdenv, fetchurl, ocaml, zlib, which, eprover, makeWrapper, coq}: stdenv.mkDerivation rec { pname = "satallax"; version = "2.7"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/libexec/satallax" cp picosat-*/picosat picosat-*/picomus "$out/libexec/satallax" - ( + ( cd minisat export MROOT=$PWD cd core @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/share/doc/satallax" "$out/bin" "$out/lib" "$out/lib/satallax" cp bin/satallax.opt "$out/bin/satallax" wrapProgram "$out/bin/satallax" \ - --suffix PATH : "${stdenv.lib.makeBinPath [ coq eprover ]}:$out/libexec/satallax" \ + --suffix PATH : "${lib.makeBinPath [ coq eprover ]}:$out/libexec/satallax" \ --add-flags "-M" --add-flags "$out/lib/satallax/modes" cp LICENSE README "$out/share/doc/satallax" @@ -60,10 +60,10 @@ stdenv.mkDerivation rec { meta = { inherit version; - description = ''Automated theorem prover for higher-order logic''; - license = stdenv.lib.licenses.mit ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + description = "Automated theorem prover for higher-order logic"; + license = lib.licenses.mit ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; downloadPage = "http://www.ps.uni-saarland.de/~cebrown/satallax/downloads.php"; homepage = "http://www.ps.uni-saarland.de/~cebrown/satallax/index.php"; updateWalker = true; diff --git a/pkgs/applications/science/logic/saw-tools/default.nix b/pkgs/applications/science/logic/saw-tools/default.nix index 71b26f8023a..3eabc9422e3 100644 --- a/pkgs/applications/science/logic/saw-tools/default.nix +++ b/pkgs/applications/science/logic/saw-tools/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, gmp4, ncurses, zlib, clang }: +{ lib, stdenv, fetchurl, gmp4, ncurses, zlib, clang }: let - libPath = stdenv.lib.makeLibraryPath + libPath = lib.makeLibraryPath [ stdenv.cc.libc stdenv.cc.cc gmp4 @@ -53,8 +53,8 @@ stdenv.mkDerivation { meta = { description = "Tools for software verification and analysis"; homepage = "https://saw.galois.com"; - license = stdenv.lib.licenses.unfreeRedistributable; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = lib.licenses.bsd3; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.thoughtpolice ]; }; } diff --git a/pkgs/applications/science/logic/statverif/default.nix b/pkgs/applications/science/logic/statverif/default.nix index e0efb28819d..07365eef33f 100644 --- a/pkgs/applications/science/logic/statverif/default.nix +++ b/pkgs/applications/science/logic/statverif/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml }: +{ lib, stdenv, fetchurl, ocaml }: stdenv.mkDerivation rec { pname = "statverif"; @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { meta = { description = "Verification of stateful processes (via Proverif)"; homepage = "https://markryan.eu/research/statverif/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.thoughtpolice ]; }; } diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix index 9cf8b0845d4..1f2ad4634de 100644 --- a/pkgs/applications/science/logic/symbiyosys/default.nix +++ b/pkgs/applications/science/logic/symbiyosys/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , bash, python3, yosys , yices, boolector, z3, aiger }: @@ -51,8 +51,8 @@ stdenv.mkDerivation { meta = { description = "Tooling for Yosys-based verification flows"; homepage = "https://symbiyosys.readthedocs.io/"; - license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice emily ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ thoughtpolice emily ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/science/logic/tlaplus/default.nix b/pkgs/applications/science/logic/tlaplus/default.nix index 14944f5e19b..c4ba334b85f 100644 --- a/pkgs/applications/science/logic/tlaplus/default.nix +++ b/pkgs/applications/science/logic/tlaplus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper +{ lib, stdenv, fetchFromGitHub, makeWrapper , adoptopenjdk-bin, jre, ant }: @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { meta = { description = "An algorithm specification language with model checking tools"; homepage = "http://lamport.azurewebsites.net/tla/tla.html"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.thoughtpolice ]; }; } diff --git a/pkgs/applications/science/logic/tlaplus/tlaps.nix b/pkgs/applications/science/logic/tlaplus/tlaps.nix index 3872d3a9826..89bdd979fea 100644 --- a/pkgs/applications/science/logic/tlaplus/tlaps.nix +++ b/pkgs/applications/science/logic/tlaplus/tlaps.nix @@ -1,5 +1,5 @@ { fetchurl -, stdenv +, lib, stdenv , ocaml, isabelle, cvc3, perl, wget, which }: @@ -46,8 +46,8 @@ stdenv.mkDerivation rec { consistent abstraction over the various “backend” verifiers. ''; homepage = "https://tla.msr-inria.inria.fr/tlaps/content/Home.html"; - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.bsd2; + platforms = lib.platforms.unix; maintainers = [ ]; }; diff --git a/pkgs/applications/science/logic/tlaplus/toolbox.nix b/pkgs/applications/science/logic/tlaplus/toolbox.nix index c9e97375b6c..1c33d923289 100644 --- a/pkgs/applications/science/logic/tlaplus/toolbox.nix +++ b/pkgs/applications/science/logic/tlaplus/toolbox.nix @@ -75,7 +75,7 @@ in stdenv.mkDerivation { ''; # http://lamport.azurewebsites.net/tla/license.html license = with lib.licenses; [ mit ]; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; maintainers = [ ]; }; } diff --git a/pkgs/applications/science/logic/twelf/default.nix b/pkgs/applications/science/logic/twelf/default.nix index 975b989bd94..67779b2b572 100644 --- a/pkgs/applications/science/logic/twelf/default.nix +++ b/pkgs/applications/science/logic/twelf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, smlnj, rsync }: +{ lib, stdenv, fetchurl, pkg-config, smlnj, rsync }: stdenv.mkDerivation rec { pname = "twelf"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0fi1kbs9hrdrm1x4k13angpjasxlyd1gc3ys8ah54i75qbcd9c4i"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ smlnj rsync ]; buildPhase = '' @@ -44,8 +44,8 @@ stdenv.mkDerivation rec { Standard ML. ''; homepage = "http://twelf.org/wiki/Main_Page"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ jwiegley ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jwiegley ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/science/logic/verifast/default.nix b/pkgs/applications/science/logic/verifast/default.nix index 49618d2586b..2d625a1c1b2 100644 --- a/pkgs/applications/science/logic/verifast/default.nix +++ b/pkgs/applications/science/logic/verifast/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, gtk2, gdk-pixbuf, atk, pango, glib, cairo, freetype +{ lib, stdenv, fetchurl, gtk2, gdk-pixbuf, atk, pango, glib, cairo, freetype , fontconfig, libxml2, gnome2 }: let - libPath = stdenv.lib.makeLibraryPath + libPath = lib.makeLibraryPath [ stdenv.cc.libc stdenv.cc.cc gtk2 gdk-pixbuf atk pango glib cairo freetype fontconfig libxml2 gnome2.gtksourceview ] + ":${stdenv.cc.cc.lib}/lib64:$out/libexec"; @@ -43,8 +43,8 @@ stdenv.mkDerivation rec { meta = { description = "Verification for C and Java programs via separation logic"; homepage = "http://people.cs.kuleuven.be/~bart.jacobs/verifast/"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; platforms = [ "x86_64-linux" ]; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + maintainers = [ lib.maintainers.thoughtpolice ]; }; } diff --git a/pkgs/applications/science/logic/workcraft/default.nix b/pkgs/applications/science/logic/workcraft/default.nix index 9ce6592d998..cb0d668f536 100644 --- a/pkgs/applications/science/logic/workcraft/default.nix +++ b/pkgs/applications/science/logic/workcraft/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, makeWrapper }: +{ lib, stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { pname = "workcraft"; @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { meta = { homepage = "https://workcraft.org/"; description = "Framework for interpreted graph modeling, verification and synthesis"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ timor ]; + platforms = lib.platforms.linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ timor ]; inherit version; }; } diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix index a01a07b8954..c26504bf7bd 100644 --- a/pkgs/applications/science/logic/yices/default.nix +++ b/pkgs/applications/science/logic/yices/default.nix @@ -23,12 +23,12 @@ stdenv.mkDerivation rec { doCheck = true; # Usual shenanigans - patchPhase = ''patchShebangs tests/regress/check.sh''; + patchPhase = "patchShebangs tests/regress/check.sh"; # Includes a fix for the embedded soname being libyices.so.2.5, but # only installing the libyices.so.2.5.x file. installPhase = let - ver_XdotY = stdenv.lib.versions.majorMinor version; + ver_XdotY = lib.versions.majorMinor version; in '' make install LDCONFIG=true ln -sfr $out/lib/libyices.so.{${version},${ver_XdotY}} diff --git a/pkgs/applications/science/logic/z3/4.4.0.nix b/pkgs/applications/science/logic/z3/4.4.0.nix index a5388572db6..9b7dabeb720 100644 --- a/pkgs/applications/science/logic/z3/4.4.0.nix +++ b/pkgs/applications/science/logic/z3/4.4.0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python }: +{ lib, stdenv, fetchFromGitHub, python }: stdenv.mkDerivation rec { name = "z3-${version}"; @@ -34,8 +34,8 @@ stdenv.mkDerivation rec { meta = { description = "A high-performance theorem prover and SMT solver"; homepage = "https://github.com/Z3Prover/z3"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.x86_64; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice ttuegel ]; + license = lib.licenses.mit; + platforms = lib.platforms.x86_64; + maintainers = with lib.maintainers; [ thoughtpolice ttuegel ]; }; } diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix index 48512eff530..cd58740186f 100644 --- a/pkgs/applications/science/logic/z3/default.nix +++ b/pkgs/applications/science/logic/z3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python, fixDarwinDylibNames +{ lib, stdenv, fetchFromGitHub, python, fixDarwinDylibNames , javaBindings ? false , ocamlBindings ? false , pythonBindings ? true @@ -9,7 +9,7 @@ assert javaBindings -> jdk != null; assert ocamlBindings -> ocaml != null && findlib != null && zarith != null; -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "z3"; @@ -59,8 +59,8 @@ stdenv.mkDerivation rec { meta = { description = "A high-performance theorem prover and SMT solver"; homepage = "https://github.com/Z3Prover/z3"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice ttuegel ]; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ thoughtpolice ttuegel ]; }; } diff --git a/pkgs/applications/science/logic/z3/tptp.nix b/pkgs/applications/science/logic/z3/tptp.nix index 34449542abb..bb912742b7c 100644 --- a/pkgs/applications/science/logic/z3/tptp.nix +++ b/pkgs/applications/science/logic/z3/tptp.nix @@ -1,4 +1,4 @@ -{stdenv, z3, cmake}: +{lib, stdenv, z3, cmake}: stdenv.mkDerivation rec { pname = "z3-tptp"; version = z3.version; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { inherit version; inherit (z3.meta) license homepage platforms; - description = ''TPTP wrapper for Z3 prover''; - maintainers = [stdenv.lib.maintainers.raskin]; + description = "TPTP wrapper for Z3 prover"; + maintainers = [lib.maintainers.raskin]; }; } diff --git a/pkgs/applications/science/machine-learning/labelimg/default.nix b/pkgs/applications/science/machine-learning/labelimg/default.nix index 4bfd4b9421f..50d0aa6f9d1 100644 --- a/pkgs/applications/science/machine-learning/labelimg/default.nix +++ b/pkgs/applications/science/machine-learning/labelimg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub, qt5 }: +{ lib, python3Packages, fetchFromGitHub, qt5 }: python3Packages.buildPythonApplication rec { pname = "labelImg"; version = "1.8.3"; diff --git a/pkgs/applications/science/machine-learning/sc2-headless/default.nix b/pkgs/applications/science/machine-learning/sc2-headless/default.nix index 7bcc915daec..9438cd972f9 100644 --- a/pkgs/applications/science/machine-learning/sc2-headless/default.nix +++ b/pkgs/applications/science/machine-learning/sc2-headless/default.nix @@ -49,7 +49,7 @@ in stdenv.mkDerivation rec { ''; meta = { - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; description = "Starcraft II headless linux client for machine learning research"; license = { fullName = "BLIZZARD® STARCRAFT® II AI AND MACHINE LEARNING LICENSE"; diff --git a/pkgs/applications/science/machine-learning/sc2-headless/maps.nix b/pkgs/applications/science/machine-learning/sc2-headless/maps.nix index 6eec10e958c..47e14108e37 100644 --- a/pkgs/applications/science/machine-learning/sc2-headless/maps.nix +++ b/pkgs/applications/science/machine-learning/sc2-headless/maps.nix @@ -9,7 +9,7 @@ in sha256 = "19f873ilcdsf50g2v0s2zzmxil1bqncsk8nq99bzy87h0i7khkla"; stripRoot = false; }; - + melee = fetchzip' { url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Melee.zip"; sha256 = "0z44pgy10jklsvgpr0kcn4c2mz3hw7nlcmvsy6a6lzpi3dvzf33i"; diff --git a/pkgs/applications/science/machine-learning/starspace/default.nix b/pkgs/applications/science/machine-learning/starspace/default.nix new file mode 100644 index 00000000000..b511b4ea42e --- /dev/null +++ b/pkgs/applications/science/machine-learning/starspace/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, fetchFromGitHub, boost165 }: + +stdenv.mkDerivation rec { + pname = "starspace"; + version = "unstable-2021-01-17"; + + src = fetchFromGitHub { + owner = "facebookresearch"; + repo = pname; + rev = "8aee0a950aa607c023e5c91cff518bec335b5df5"; + sha256 = "0sc7a37z1skb9377a1qs8ggwrkz0nmpybx7sms38xj05b702kbvj"; + }; + + buildInputs = [ boost165 ]; + + installPhase = '' + mkdir -p $out/bin + mv starspace $out/bin + ''; + + meta = with lib; { + description = "General-purpose neural model for efficient learning of entity embeddings"; + homepage = https://ai.facebook.com/tools/starspace/; + license = licenses.mit; + platforms = platforms.unix; + maintainers = [ maintainers.mausch ]; + }; +} diff --git a/pkgs/applications/science/math/LiE/default.nix b/pkgs/applications/science/math/LiE/default.nix index f5f3bb0a42b..9b16fc1d67f 100644 --- a/pkgs/applications/science/math/LiE/default.nix +++ b/pkgs/applications/science/math/LiE/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , bison, readline }: stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { meta = { description = "A Computer algebra package for Lie group computations"; homepage = "http://wwwmathlabo.univ-poitiers.fr/~maavl/LiE/"; - license = stdenv.lib.licenses.lgpl3; # see the website + license = lib.licenses.lgpl3; # see the website longDescription = '' LiE is a computer algebra system that is specialised in computations @@ -19,7 +19,7 @@ stdenv.mkDerivation { characteristics, we refer to the following sources of information. ''; # take from the website - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; maintainers = [ ]; # this package is probably not going to change anyway }; diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 2191511a9c5..7cbff99bf47 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, bzip2, gfortran, libX11, libXmu, libXt, libjpeg, libpng , libtiff, ncurses, pango, pcre2, perl, readline, tcl, texLive, tk, xz, zlib -, less, texinfo, graphviz, icu, pkgconfig, bison, imake, which, jdk, blas, lapack +, less, texinfo, graphviz, icu, pkg-config, bison, imake, which, jdk, blas, lapack , curl, Cocoa, Foundation, libobjc, libcxx, tzdata, fetchpatch , withRecommendedPackages ? true , enableStrictBarrier ? false @@ -24,15 +24,15 @@ stdenv.mkDerivation rec { buildInputs = [ bzip2 gfortran libX11 libXmu libXt libXt libjpeg libpng libtiff ncurses pango pcre2 perl readline texLive xz zlib less texinfo graphviz icu - pkgconfig bison imake which blas lapack curl tcl tk jdk - ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc libcxx ]; + pkg-config bison imake which blas lapack curl tcl tk jdk + ] ++ lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc libcxx ]; patches = [ ./no-usr-local-search-paths.patch ./fix-failing-test.patch ]; - prePatch = stdenv.lib.optionalString stdenv.isDarwin '' + prePatch = lib.optionalString stdenv.isDarwin '' substituteInPlace configure --replace "-install_name libR.dylib" "-install_name $out/lib/R/lib/libR.dylib" ''; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { preConfigure = '' configureFlagsArray=( --disable-lto - --with${stdenv.lib.optionalString (!withRecommendedPackages) "out"}-recommended-packages + --with${lib.optionalString (!withRecommendedPackages) "out"}-recommended-packages --with-blas="-L${blas}/lib -lblas" --with-lapack="-L${lapack}/lib -llapack" --with-readline @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { --with-jpeglib --with-libtiff --with-ICU - ${stdenv.lib.optionalString enableStrictBarrier "--enable-strict-barrier"} + ${lib.optionalString enableStrictBarrier "--enable-strict-barrier"} ${if static then "--enable-R-static-lib" else "--enable-R-shlib"} AR=$(type -p ar) AWK=$(type -p gawk) @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { JAVA_HOME="${jdk}" RANLIB=$(type -p ranlib) R_SHELL="${stdenv.shell}" - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' --disable-R-framework OBJC="clang" CPPFLAGS="-isystem ${libcxx}/include/c++/v1" diff --git a/pkgs/applications/science/math/almonds/default.nix b/pkgs/applications/science/math/almonds/default.nix index 7271b6d8755..ec3891667c5 100644 --- a/pkgs/applications/science/math/almonds/default.nix +++ b/pkgs/applications/science/math/almonds/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3, fetchFromGitHub, ncurses }: +{ lib, python3, fetchFromGitHub, ncurses }: with python3.pkgs; buildPythonApplication rec { pname = "almonds"; diff --git a/pkgs/applications/science/math/bcal/default.nix b/pkgs/applications/science/math/bcal/default.nix index 5df2d20549c..8cbf90a7187 100644 --- a/pkgs/applications/science/math/bcal/default.nix +++ b/pkgs/applications/science/math/bcal/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, python3Packages, readline, bc }: +{ lib, stdenv, fetchFromGitHub, python3Packages, readline, bc }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "bcal"; diff --git a/pkgs/applications/science/math/cemu/default.nix b/pkgs/applications/science/math/cemu/default.nix index 65dd05d3d62..9d56ac70d92 100644 --- a/pkgs/applications/science/math/cemu/default.nix +++ b/pkgs/applications/science/math/cemu/default.nix @@ -1,5 +1,5 @@ { fetchFromGitHub -, lib, stdenv +, lib , mkDerivation , SDL2 , libGL @@ -9,7 +9,7 @@ , qmake , git , libpng_apng -, pkgconfig +, pkg-config }: mkDerivation rec { @@ -26,7 +26,7 @@ mkDerivation rec { nativeBuildInputs = [ qmake git - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/science/math/cntk/default.nix b/pkgs/applications/science/math/cntk/default.nix index a348210179e..e15e2a43d77 100644 --- a/pkgs/applications/science/math/cntk/default.nix +++ b/pkgs/applications/science/math/cntk/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchgit, fetchFromGitHub, cmake -, openblas, blas, lapack, opencv3, libzip, boost, protobuf, openmpi +, openblas, blas, lapack, opencv3, libzip, boost, protobuf, mpi , onebitSGDSupport ? false , cudaSupport ? false, addOpenGLRunpath, cudatoolkit, nvidia_x11 , cudnnSupport ? cudaSupport, cudnn @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { # Force OpenMPI to use g++ in PATH. OMPI_CXX = "g++"; - buildInputs = [ openblas opencv3 libzip boost protobuf openmpi ] + buildInputs = [ openblas opencv3 libzip boost protobuf mpi ] ++ lib.optional cudaSupport cudatoolkit ++ lib.optional cudnnSupport cudnn; @@ -43,7 +43,7 @@ in stdenv.mkDerivation rec { "--with-openblas=${openblas}" "--with-boost=${boost.dev}" "--with-protobuf=${protobuf}" - "--with-mpi=${openmpi}" + "--with-mpi=${mpi}" "--cuda=${if cudaSupport then "yes" else "no"}" # FIXME "--asgd=no" diff --git a/pkgs/applications/science/math/cplex/default.nix b/pkgs/applications/science/math/cplex/default.nix index 39213aff09a..068f9f0ea3c 100644 --- a/pkgs/applications/science/math/cplex/default.nix +++ b/pkgs/applications/science/math/cplex/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, makeWrapper, openjdk, gtk2, xorg, glibcLocales, releasePath ? null }: # To use this package, you need to download your own cplex installer from IBM -# and override the releasePath attribute to point to the location of the file. +# and override the releasePath attribute to point to the location of the file. # # Note: cplex creates an individual build for each license which screws # somewhat with the use of functions like requireFile as the hash will be @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "cplex"; version = "128"; - + src = if releasePath == null then throw '' This nix expression requires that the cplex installer is already - downloaded to your machine. Get it from IBM: - https://developer.ibm.com/docloud/blog/2017/12/20/cplex-optimization-studio-12-8-now-available/ + downloaded to your machine. Get it from IBM: + https://developer.ibm.com/docloud/blog/2017/12/20/cplex-optimization-studio-12-8-now-available/ Set `cplex.releasePath = /path/to/download;` in your ~/.config/nixpkgs/config.nix for `nix-*` commands, or @@ -49,9 +49,9 @@ stdenv.mkDerivation rec { $out/bin ''; - fixupPhase = - let - libraryPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc gtk2 xorg.libXtst ]; + fixupPhase = + let + libraryPath = lib.makeLibraryPath [ stdenv.cc.cc gtk2 xorg.libXtst ]; in '' interpreter=${stdenv.glibc}/lib/ld-linux-x86-64.so.2 @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { --set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive; done - for pgm in $out/cplex/bin/x86-64_linux/cplex $out/cpoptimizer/bin/x86-64_linux/cpoptimizer $out/opl/oplide/jre/bin/*; + for pgm in $out/cplex/bin/x86-64_linux/cplex $out/cpoptimizer/bin/x86-64_linux/cpoptimizer $out/opl/oplide/jre/bin/*; do if grep ELF $pgm > /dev/null; then @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { libArch = "x86-64_linux"; libSuffix = "${version}0"; }; - + meta = with lib; { description = "Optimization solver for mathematical programming"; homepage = "https://www.ibm.com/be-en/marketplace/ibm-ilog-cplex"; diff --git a/pkgs/applications/science/math/csdp/default.nix b/pkgs/applications/science/math/csdp/default.nix index ef9d5e733ca..02c4c134f92 100644 --- a/pkgs/applications/science/math/csdp/default.nix +++ b/pkgs/applications/science/math/csdp/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation { license = lib.licenses.cpl10; maintainers = [ lib.maintainers.roconnor ]; description = "A C Library for Semidefinite Programming"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/science/math/ecm/default.nix b/pkgs/applications/science/math/ecm/default.nix index 3e8e5879950..c59b1a8729a 100644 --- a/pkgs/applications/science/math/ecm/default.nix +++ b/pkgs/applications/science/math/ecm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gmp, m4 }: +{ lib, stdenv, fetchurl, gmp, m4 }: let pname = "ecm"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { }; # See https://trac.sagemath.org/ticket/19233 - configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-asm-redc"; + configureFlags = lib.optional stdenv.isDarwin "--disable-asm-redc"; buildInputs = [ m4 gmp ]; @@ -23,9 +23,9 @@ stdenv.mkDerivation { meta = { description = "Elliptic Curve Method for Integer Factorization"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; homepage = "http://ecm.gforge.inria.fr/"; - maintainers = [ stdenv.lib.maintainers.roconnor ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + maintainers = [ lib.maintainers.roconnor ]; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/science/math/eukleides/default.nix b/pkgs/applications/science/math/eukleides/default.nix index 879ad96a936..5f7fe58465d 100644 --- a/pkgs/applications/science/math/eukleides/default.nix +++ b/pkgs/applications/science/math/eukleides/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bison, flex, texinfo, readline, texLive }: +{ lib, stdenv, fetchurl, bison, flex, texinfo, readline, texLive }: let name = "eukleides"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "Geometry Drawing Language"; homepage = "http://www.eukleides.org/"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; longDescription = '' Eukleides is a computer language devoted to elementary plane @@ -31,7 +31,7 @@ stdenv.mkDerivation { circles and conics. ''; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.peti ]; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.peti ]; }; } diff --git a/pkgs/applications/science/math/fricas/default.nix b/pkgs/applications/science/math/fricas/default.nix index 39ca53c47e6..a29d4036728 100644 --- a/pkgs/applications/science/math/fricas/default.nix +++ b/pkgs/applications/science/math/fricas/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, sbcl, libX11, libXpm, libICE, libSM, libXt, libXau, libXdmcp }: +{ lib, stdenv, fetchurl, sbcl, libX11, libXpm, libICE, libSM, libXt, libXau, libXdmcp }: let version = "1.3.4"; @@ -19,9 +19,9 @@ stdenv.mkDerivation { meta = { homepage = "http://fricas.sourceforge.net/"; description = "An advanced computer algebra system"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.sprock ]; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.sprock ]; }; } diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix index a20b43c875e..fa2724469b6 100644 --- a/pkgs/applications/science/math/geogebra/default.nix +++ b/pkgs/applications/science/math/geogebra/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, jre, makeDesktopItem, makeWrapper, unzip, language ? "en_US" }: let pname = "geogebra"; - version = "5-0-609-0"; + version = "5-0-620-0"; srcIcon = fetchurl { url = "http://static.geogebra.org/images/geogebra-logo.svg"; @@ -27,7 +27,7 @@ let calculus in one easy-to-use package. ''; homepage = "https://www.geogebra.org/"; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ sikmir ]; license = with licenses; [ gpl3 cc-by-nc-sa-30 geogebra ]; platforms = with platforms; linux ++ darwin; hydraPlatforms = []; @@ -41,9 +41,9 @@ let src = fetchurl { urls = [ "https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2" - "http://web.archive.org/web/20201022200454/https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2" + "http://web.archive.org/web/20210101213140/https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2" ]; - sha256 = "0xbhg8hm3dqm3qkraj48pqwslrnjyxpq9mcgylr2m8i1gmqw7xwf"; + sha256 = "0v4r76b91cj0pns78gh3d432g2jlq2pz37lslg3fnnpvlfh25s9j"; }; nativeBuildInputs = [ makeWrapper ]; @@ -70,8 +70,11 @@ let preferLocalBuild = true; src = fetchurl { - url = "https://download.geogebra.org/installers/5.0/GeoGebra-MacOS-Installer-withJava-${version}.zip"; - sha256 = "16fgqwxz31cfmia0pyzpk05aqzrqr11sjbw37q9zb3xfh3p1r4gz"; + urls = [ + "https://download.geogebra.org/installers/5.0/GeoGebra-MacOS-Installer-withJava-${version}.zip" + "https://web.archive.org/web/20210101213641/https://download.geogebra.org/installers/5.0/GeoGebra-MacOS-Installer-withJava-${version}.zip" + ]; + sha256 = "02sbxrns9zvhcfrr68ygv766and6f6b2a3dfarljxszwsviv6ljf"; }; dontUnpack = true; diff --git a/pkgs/applications/science/math/geogebra/geogebra6.nix b/pkgs/applications/science/math/geogebra/geogebra6.nix index 7bd58264893..dc952dc2329 100644 --- a/pkgs/applications/science/math/geogebra/geogebra6.nix +++ b/pkgs/applications/science/math/geogebra/geogebra6.nix @@ -1,14 +1,14 @@ -{ stdenv, unzip, fetchurl, electron_6, makeWrapper, geogebra }: +{ lib, stdenv, unzip, fetchurl, electron_6, makeWrapper, geogebra }: let pname = "geogebra"; - version = "6-0-609-0"; + version = "6-0-620-0"; srcIcon = geogebra.srcIcon; desktopItem = geogebra.desktopItem; - meta = with stdenv.lib; geogebra.meta // { + meta = with lib; geogebra.meta // { license = licenses.geogebra; - maintainers = with maintainers; [ voidless ]; + maintainers = with maintainers; [ voidless sikmir ]; platforms = with platforms; linux ++ darwin; }; @@ -17,10 +17,10 @@ let src = fetchurl { urls = [ - "https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip" - "https://web.archive.org/web/20201022200156/https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip" - ]; - sha256 = "0rzcbq587x8827g9v03awa9hz27vyfjc0cz45ymbchqp31lsx49b"; + "https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip" + "https://web.archive.org/web/20210101214511/https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip" + ]; + sha256 = "0xxzmphbfvmhnxnc1pkjgdhccjndyzmlvvaa8xfdrvswwwk7zh43"; }; dontConfigure = true; @@ -38,7 +38,7 @@ let installPhase = '' mkdir -p $out/libexec/geogebra/ $out/bin cp -r GeoGebra-linux-x64/{resources,locales} "$out/" - makeWrapper ${stdenv.lib.getBin electron_6}/bin/electron $out/bin/geogebra --add-flags "$out/resources/app" + makeWrapper ${lib.getBin electron_6}/bin/electron $out/bin/geogebra --add-flags "$out/resources/app" install -Dm644 "${desktopItem}/share/applications/"* \ -t $out/share/applications/ @@ -51,8 +51,11 @@ let inherit pname version meta; src = fetchurl { - url = "https://download.geogebra.org/installers/6.0/GeoGebra-Classic-6-MacOS-Portable-${version}.zip"; - sha256 = "0275869zgwbl1qjj593q6629hnxbwk9c15rkm29a3lh10pinb099"; + urls = [ + "https://download.geogebra.org/installers/6.0/GeoGebra-Classic-6-MacOS-Portable-${version}.zip" + "https://web.archive.org/web/20210101214236/https://download.geogebra.org/installers/6.0/GeoGebra-Classic-6-MacOS-Portable-${version}.zip" + ]; + sha256 = "13g05d45j6dn9zwxpxnln83j7w1cvcd7l8jnir30pxlmdi7h8r78"; }; dontUnpack = true; diff --git a/pkgs/applications/science/math/getdp/default.nix b/pkgs/applications/science/math/getdp/default.nix index 915c7e1147f..39d9c866cae 100644 --- a/pkgs/applications/science/math/getdp/default.nix +++ b/pkgs/applications/science/math/getdp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, gfortran, blas, lapack, openmpi, petsc, python3 }: +{ lib, stdenv, fetchurl, cmake, gfortran, blas, lapack, mpi, petsc, python3 }: stdenv.mkDerivation rec { name = "getdp-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake gfortran ]; - buildInputs = [ blas lapack openmpi petsc python3 ]; + buildInputs = [ blas lapack mpi petsc python3 ]; meta = with lib; { description = "A General Environment for the Treatment of Discrete Problems"; diff --git a/pkgs/applications/science/math/gfan/default.nix b/pkgs/applications/science/math/gfan/default.nix index 7e2a4625d30..587568f8c29 100644 --- a/pkgs/applications/science/math/gfan/default.nix +++ b/pkgs/applications/science/math/gfan/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gmp, mpir, cddlib}: +{lib, stdenv, fetchurl, gmp, mpir, cddlib}: stdenv.mkDerivation rec { pname = "gfan"; version = "0.6.2"; @@ -12,20 +12,20 @@ stdenv.mkDerivation rec { ./gfan-0.6.2-cddlib-prefix.patch ]; - postPatch = stdenv.lib.optionalString stdenv.cc.isClang '' + postPatch = lib.optionalString stdenv.cc.isClang '' substituteInPlace Makefile --replace "-fno-guess-branch-probability" "" ''; buildFlags = [ "CC=cc" "CXX=c++" ]; - installFlags = [ ''PREFIX=$(out)'' ]; + installFlags = [ "PREFIX=$(out)" ]; buildInputs = [ gmp mpir cddlib ]; meta = { inherit version; - description = ''A software package for computing Gröbner fans and tropical varieties''; - license = stdenv.lib.licenses.gpl2 ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; + description = "A software package for computing Gröbner fans and tropical varieties"; + license = lib.licenses.gpl2 ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.unix; homepage = "http://home.math.au.dk/jensen/software/gfan/gfan.html"; }; } diff --git a/pkgs/applications/science/math/gfm/default.nix b/pkgs/applications/science/math/gfm/default.nix new file mode 100644 index 00000000000..a8031b3e8a3 --- /dev/null +++ b/pkgs/applications/science/math/gfm/default.nix @@ -0,0 +1,54 @@ +{ stdenv +, lib +, fetchurl +, fetchpatch +, pkg-config +, autoreconfHook +, gnome2 +, glib +, libtifiles2 +, libticables2 +, libticalcs2 +, libticonv +}: + +stdenv.mkDerivation rec { + pname = "gfm"; + version = "1.08"; + src = fetchurl { + url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2"; + sha256 = "0zq1a9mm54zr18dz2mqh79w1a126xwqz6dcrpjlbd1pnmg01l0q9"; + }; + + patches = fetchpatch { + name = "remove-broken-kde-support.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/remove-broken-kde-support.patch?h=gfm"; + sha256 = "03yc8s2avicmv04f2ygg3r3q8l7kpsc94mhp6clp584kmjpjqag5"; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + gnome2.gtk + gnome2.libglade + glib + libtifiles2 + libticables2 + libticalcs2 + libticonv + ]; + + NIX_CFLAGS_COMPILE = "-I${libticables2}/include/tilp2"; + + meta = with lib; { + changelog = "http://lpg.ticalc.org/prj_tilp/news.html"; + description = "Group File Manager (GFM) allows manipulation of single/group/tigroup files"; + homepage = "http://lpg.ticalc.org/prj_gfm/index.html"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ siraben luc65r ]; + platforms = with platforms; linux ++ darwin; + }; +} diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/applications/science/math/giac/default.nix index 7825fc1d9a2..8c391e25322 100644 --- a/pkgs/applications/science/math/giac/default.nix +++ b/pkgs/applications/science/math/giac/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "1d0h1yb7qvh9x7wwv9yrzmcp712f49w1iljkxp4y6g9pzsmg1mmv"; }; - patches = stdenv.lib.optionals (!enableGUI) [ + patches = lib.optionals (!enableGUI) [ # when enableGui is false, giac is compiled without fltk. That means some # outputs differ in the make check. Patch around this: (fetchpatch { @@ -41,9 +41,9 @@ stdenv.mkDerivation rec { readline gettext libpng libao perl ecm # gfortran.cc default output contains static libraries compiled without -fPIC # we want libgfortran.so.3 instead - (stdenv.lib.getLib gfortran.cc) + (lib.getLib gfortran.cc) lapack blas - ] ++ stdenv.lib.optionals enableGUI [ + ] ++ lib.optionals enableGUI [ libGL libGLU fltk xorg.libX11 ]; @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { # xcas Phys and Turtle menus are broken with split outputs # and interactive use is likely to need docs - outputs = [ "out" ] ++ stdenv.lib.optional (!enableGUI) "doc"; + outputs = [ "out" ] ++ lib.optional (!enableGUI) "doc"; doCheck = true; preCheck = '' @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { "--enable-gc" "--enable-png" "--enable-gsl" "--enable-lapack" "--enable-pari" "--enable-ntl" "--enable-gmpxx" # "--enable-cocoa" "--enable-ao" "--enable-ecm" "--enable-glpk" - ] ++ stdenv.lib.optionals enableGUI [ + ] ++ lib.optionals enableGUI [ "--enable-gui" "--with-x" ]; @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { mv "$out/share/giac/doc" "$doc/share/giac" mv "$out/share/giac/examples" "$doc/share/giac" fi - '' + stdenv.lib.optionalString (!enableGUI) '' + '' + lib.optionalString (!enableGUI) '' for i in pixmaps application-registry applications icons; do rm -r "$out/share/$i"; done; diff --git a/pkgs/applications/science/math/ginac/default.nix b/pkgs/applications/science/math/ginac/default.nix index e20e15edeff..6a38670adcc 100644 --- a/pkgs/applications/science/math/ginac/default.nix +++ b/pkgs/applications/science/math/ginac/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cln, pkgconfig, readline, gmp, python }: +{ lib, stdenv, fetchurl, cln, pkg-config, readline, gmp, python }: stdenv.mkDerivation rec { name = "ginac-1.8.0"; @@ -10,9 +10,9 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ cln ]; - buildInputs = [ readline ] ++ stdenv.lib.optional stdenv.isDarwin gmp; + buildInputs = [ readline ] ++ lib.optional stdenv.isDarwin gmp; - nativeBuildInputs = [ pkgconfig python ]; + nativeBuildInputs = [ pkg-config python ]; preConfigure = "patchShebangs ginsh"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GiNaC is Not a CAS"; - homepage = "http://www.ginac.de/"; + homepage = "https://www.ginac.de/"; maintainers = with maintainers; [ lovek323 ]; license = licenses.gpl2; platforms = platforms.all; diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix index 09d0d524168..599d4bac8e7 100644 --- a/pkgs/applications/science/math/glsurf/default.nix +++ b/pkgs/applications/science/math/glsurf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocamlPackages, libGLU, libGL, freeglut +{ lib, stdenv, fetchurl, ocamlPackages, libGLU, libGL, freeglut , libmysqlclient, mpfr, gmp, libtiff, libjpeg, libpng, giflib }: @@ -26,6 +26,6 @@ stdenv.mkDerivation { meta = { homepage = "https://raffalli.eu/~christophe/glsurf/"; description = "A program to draw implicit surfaces and curves"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; }; } diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index 1b6dc2ae007..4ed9c963ba3 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, blas, lapack, gfortran, gmm, fltk, libjpeg +{ lib, stdenv, fetchurl, cmake, blas, lapack, gfortran, gmm, fltk, libjpeg , zlib, libGL, libGLU, xorg, opencascade-occt }: assert (!blas.isILP64) && (!lapack.isILP64); @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { description = "A three-dimensional finite element mesh generator"; homepage = "http://gmsh.info/"; platforms = [ "x86_64-linux" ]; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/science/math/gretl/default.nix b/pkgs/applications/science/math/gretl/default.nix index b68a02e9ebb..cc9fe7c4d2c 100644 --- a/pkgs/applications/science/math/gretl/default.nix +++ b/pkgs/applications/science/math/gretl/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "gretl"; - version = "2020e"; + version = "2021a"; src = fetchurl { url = "mirror://sourceforge/gretl/${pname}-${version}.tar.xz"; - sha256 = "105y5hkzgyvad6wc3y7nn327bvrsch6jp03ckkn0w0hpnhiywzx7"; + sha256 = "sha256-BDaTv6PORiBnsEaU7uXJIKuxTqIgpY44vUmSViyME0A="; }; buildInputs = [ diff --git a/pkgs/applications/science/math/gurobi/default.nix b/pkgs/applications/science/math/gurobi/default.nix index f2f406991e3..6066d0325f5 100644 --- a/pkgs/applications/science/math/gurobi/default.nix +++ b/pkgs/applications/science/math/gurobi/default.nix @@ -6,7 +6,7 @@ in stdenv.mkDerivation rec { pname = "gurobi"; version = "${majorVersion}.0"; - src = with stdenv.lib; fetchurl { + src = with lib; fetchurl { url = "http://packages.gurobi.com/${versions.majorMinor version}/gurobi${version}_linux64.tar.gz"; sha256 = "1yjqbzqnq4jjkjm616d36bgd3rmqr0a1ii17n0prpdjzmdlq63dz"; }; diff --git a/pkgs/applications/science/math/mathematica/10.nix b/pkgs/applications/science/math/mathematica/10.nix index 277fb1984c4..9a8f05bc575 100644 --- a/pkgs/applications/science/math/mathematica/10.nix +++ b/pkgs/applications/science/math/mathematica/10.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , coreutils , patchelf , requireFile @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = requireFile rec { name = "Mathematica_${version}_LINUX.sh"; - message = '' + message = '' This nix expression requires that ${name} is already part of the store. Find the file on your Mathematica CD and add it to the nix store with nix-store --add-fixed sha256 <FILE>. @@ -69,9 +69,9 @@ stdenv.mkDerivation rec { libSM ]); - ldpath = stdenv.lib.makeLibraryPath buildInputs - + stdenv.lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") - (":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" buildInputs); + ldpath = lib.makeLibraryPath buildInputs + + lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") + (":" + lib.makeSearchPathOutput "lib" "lib64" buildInputs); phases = "unpackPhase installPhase fixupPhase"; @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { echo "patching $f executable <<" patchelf --shrink-rpath "$f" patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "$(patchelf --print-rpath "$f"):${ldpath}" \ "$f" \ && patchelf --shrink-rpath "$f" \ @@ -131,6 +131,6 @@ stdenv.mkDerivation rec { meta = { description = "Wolfram Mathematica computational software system"; homepage = "http://www.wolfram.com/mathematica/"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; }; } diff --git a/pkgs/applications/science/math/mathematica/11.nix b/pkgs/applications/science/math/mathematica/11.nix index 1c698a5e542..b8270cca908 100644 --- a/pkgs/applications/science/math/mathematica/11.nix +++ b/pkgs/applications/science/math/mathematica/11.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , coreutils , patchelf , requireFile @@ -26,7 +26,7 @@ let l10n = import ./l10ns.nix { - lib = stdenv.lib; + lib = lib; inherit requireFile lang; majorVersion = "11"; }; @@ -70,9 +70,9 @@ stdenv.mkDerivation rec { libSM ]); - ldpath = stdenv.lib.makeLibraryPath buildInputs - + stdenv.lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") - (":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" buildInputs); + ldpath = lib.makeLibraryPath buildInputs + + lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") + (":" + lib.makeSearchPathOutput "lib" "lib64" buildInputs); phases = "unpackPhase installPhase fixupPhase"; @@ -118,7 +118,7 @@ stdenv.mkDerivation rec { echo "patching $f executable <<" patchelf --shrink-rpath "$f" patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "$(patchelf --print-rpath "$f"):${ldpath}" \ "$f" \ && patchelf --shrink-rpath "$f" \ @@ -145,6 +145,6 @@ stdenv.mkDerivation rec { meta = { description = "Wolfram Mathematica computational software system"; homepage = "http://www.wolfram.com/mathematica/"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; }; } diff --git a/pkgs/applications/science/math/mathematica/9.nix b/pkgs/applications/science/math/mathematica/9.nix index d0967485c01..43d7853e3d9 100644 --- a/pkgs/applications/science/math/mathematica/9.nix +++ b/pkgs/applications/science/math/mathematica/9.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , coreutils , patchelf , requireFile @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { src = requireFile { name = "Mathematica_9.0.0_LINUX.sh"; - message = '' + message = '' This nix expression requires that Mathematica_9.0.0_LINUX.sh is already part of the store. Find the file on your Mathematica CD and add it to the nix store with nix-store --add-fixed sha256 <FILE>. @@ -59,9 +59,9 @@ stdenv.mkDerivation rec { libxcb ]); - ldpath = stdenv.lib.makeLibraryPath buildInputs - + stdenv.lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") - (":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" buildInputs); + ldpath = lib.makeLibraryPath buildInputs + + lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") + (":" + lib.makeSearchPathOutput "lib" "lib64" buildInputs); phases = "unpackPhase installPhase fixupPhase"; @@ -117,6 +117,6 @@ stdenv.mkDerivation rec { meta = { description = "Wolfram Mathematica computational software system"; homepage = "http://www.wolfram.com/mathematica/"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; }; } diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index e91ad5e5f8c..497592f1c06 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -28,7 +28,7 @@ let l10n = import ./l10ns.nix { - lib = stdenv.lib; + lib = lib; inherit requireFile lang; }; in @@ -74,9 +74,9 @@ stdenv.mkDerivation rec { libSM ]); - ldpath = stdenv.lib.makeLibraryPath buildInputs - + stdenv.lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") - (":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" buildInputs); + ldpath = lib.makeLibraryPath buildInputs + + lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") + (":" + lib.makeSearchPathOutput "lib" "lib64" buildInputs); unpackPhase = '' echo "=== Extracting makeself archive ===" @@ -125,7 +125,7 @@ stdenv.mkDerivation rec { echo "patching $f executable <<" patchelf --shrink-rpath "$f" patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "$(patchelf --print-rpath "$f"):${ldpath}" \ "$f" \ && patchelf --shrink-rpath "$f" \ @@ -144,7 +144,7 @@ stdenv.mkDerivation rec { ''; dontBuild = true; - + # This is primarily an IO bound build; there's little benefit to building remotely. preferLocalBuild = true; diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index cdc81a87646..01f086c92c7 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, sbcl, texinfo, perl, python, makeWrapper, autoreconfHook +{ lib, stdenv, fetchurl, fetchpatch, sbcl, texinfo, perl, python, makeWrapper, autoreconfHook , rlwrap ? null, tk ? null, gnuplot ? null, ecl ? null, ecl-fasl ? false }: @@ -7,8 +7,8 @@ let version = "5.44.0"; searchPath = - stdenv.lib.makeBinPath - (stdenv.lib.filter (x: x != null) [ sbcl ecl rlwrap tk gnuplot ]); + lib.makeBinPath + (lib.filter (x: x != null) [ sbcl ecl rlwrap tk gnuplot ]); in stdenv.mkDerivation ({ inherit version; @@ -21,7 +21,7 @@ stdenv.mkDerivation ({ nativeBuildInputs = [ autoreconfHook ]; - buildInputs = stdenv.lib.filter (x: x != null) [ + buildInputs = lib.filter (x: x != null) [ sbcl ecl texinfo perl python makeWrapper gnuplot # required in the test suite ]; @@ -40,7 +40,7 @@ stdenv.mkDerivation ({ ln -s ../maxima/${version}/emacs $out/share/emacs/site-lisp ln -s ../maxima/${version}/doc $out/share/doc/maxima '' - + (stdenv.lib.optionalString ecl-fasl '' + + (lib.optionalString ecl-fasl '' cp src/binary-ecl/maxima.fas* "$out/lib/maxima/${version}/binary-ecl/" '') ; @@ -63,7 +63,7 @@ stdenv.mkDerivation ({ url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/undoing_true_false_printing_patch.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; sha256 = "0fvi3rcjv6743sqsbgdzazy9jb6r1p1yq63zyj9fx42wd1hgf7yx"; }) - ] ++ stdenv.lib.optionals ecl-fasl [ + ] ++ lib.optionals ecl-fasl [ # build fasl, needed for ECL support (fetchpatch { url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/maxima.system.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; @@ -94,7 +94,7 @@ stdenv.mkDerivation ({ meta = { description = "Computer algebra system"; homepage = "http://maxima.sourceforge.net"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; longDescription = '' Maxima is a fairly complete computer algebra system written in @@ -103,7 +103,7 @@ stdenv.mkDerivation ({ symbolic integration, 3D plotting, and an ODE solver. ''; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.peti ]; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.peti ]; }; }) diff --git a/pkgs/applications/science/math/msieve/default.nix b/pkgs/applications/science/math/msieve/default.nix index db7a1c14906..679b29cb062 100644 --- a/pkgs/applications/science/math/msieve/default.nix +++ b/pkgs/applications/science/math/msieve/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, zlib, gmp, ecm }: +{lib, stdenv, fetchurl, zlib, gmp, ecm }: stdenv.mkDerivation { name = "msieve-1.53"; @@ -22,9 +22,9 @@ stdenv.mkDerivation { meta = { description = "A C library implementing a suite of algorithms to factor large integers"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; homepage = "http://msieve.sourceforge.net/"; - maintainers = [ stdenv.lib.maintainers.roconnor ]; - platforms = [ "x86_64-linux" ] ++ stdenv.lib.platforms.darwin; + maintainers = [ lib.maintainers.roconnor ]; + platforms = [ "x86_64-linux" ] ++ lib.platforms.darwin; }; } diff --git a/pkgs/applications/science/math/nasc/default.nix b/pkgs/applications/science/math/nasc/default.nix index 37173f81978..931e83defdc 100644 --- a/pkgs/applications/science/math/nasc/default.nix +++ b/pkgs/applications/science/math/nasc/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchFromGitHub -, pkgconfig +, pkg-config , fetchpatch , python3 , meson @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { intltool # for libqalculate meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/applications/science/math/nauty/default.nix b/pkgs/applications/science/math/nauty/default.nix index 94b7ad266c4..05a7d874d91 100644 --- a/pkgs/applications/science/math/nauty/default.nix +++ b/pkgs/applications/science/math/nauty/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { checkTarget = "checks"; meta = with lib; { inherit version; - description = ''Programs for computing automorphism groups of graphs and digraphs''; + description = "Programs for computing automorphism groups of graphs and digraphs"; license = licenses.asl20; maintainers = teams.sage.members; platforms = platforms.unix; diff --git a/pkgs/applications/science/math/palp/default.nix b/pkgs/applications/science/math/palp/default.nix index b5b9577d493..97b5f88e55b 100644 --- a/pkgs/applications/science/math/palp/default.nix +++ b/pkgs/applications/science/math/palp/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { "format" ]; - patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' + patchPhase = lib.optionalString stdenv.isDarwin '' substituteInPlace GNUmakefile --replace gcc cc ''; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { for file in poly class cws nef mori; do cp -p $file.x "$out/bin/$file-${dim}d.x" done - '' + stdenv.lib.optionalString doSymlink '' + '' + lib.optionalString doSymlink '' cd "$out/bin" for file in poly class cws nef mori; do ln -sf $file-6d.x $file.x diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index dd965e17c73..a99cbbbe0df 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { # Versions with current majorMinor values are at http://pari.math.u-bordeaux.fr/pub/pari/unix/${pname}-${version}.tar.gz - url = "https://pari.math.u-bordeaux.fr/pub/pari/OLD/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.gz"; + url = "https://pari.math.u-bordeaux.fr/pub/pari/OLD/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz"; sha256 = "sha256-v8iPxPc1L0hA5uNSxy8DacvqikVAOxg0piafNwmXCxw="; }; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { libX11 tex perl - ] ++ stdenv.lib.optionals withThread [ + ] ++ lib.optionals withThread [ libpthreadstubs ]; @@ -34,14 +34,14 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-gmp=${gmp.dev}" "--with-readline=${readline.dev}" - ] ++ stdenv.lib.optional stdenv.isDarwin "--host=x86_64-darwin" - ++ stdenv.lib.optional withThread "--mt=pthread"; + ] ++ lib.optional stdenv.isDarwin "--host=x86_64-darwin" + ++ lib.optional withThread "--mt=pthread"; preConfigure = '' export LD=$CC ''; - postConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + postConfigure = lib.optionalString stdenv.isDarwin '' echo 'echo x86_64-darwin' > config/arch-osname ''; diff --git a/pkgs/applications/science/math/pcalc/default.nix b/pkgs/applications/science/math/pcalc/default.nix index f372357fe7d..1ee45ca266a 100644 --- a/pkgs/applications/science/math/pcalc/default.nix +++ b/pkgs/applications/science/math/pcalc/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchgit, bison, flex }: +{ lib, stdenv, fetchgit, bison, flex }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "pcalc"; @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { homepage = "http://pcalc.sourceforge.net/"; description = "Programmer's calculator"; license = licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ ftrvxmtrx ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with lib.maintainers; [ ftrvxmtrx ]; + platforms = lib.platforms.linux; inherit version; }; } diff --git a/pkgs/applications/science/math/perseus/default.nix b/pkgs/applications/science/math/perseus/default.nix index 55293e6c8a7..242f2e2cea5 100644 --- a/pkgs/applications/science/math/perseus/default.nix +++ b/pkgs/applications/science/math/perseus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation { name = "perseus-4-beta"; @@ -33,8 +33,8 @@ stdenv.mkDerivation { matrices and so forth. ''; homepage = "http://www.sas.upenn.edu/~vnanda/perseus/index.html"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [erikryb]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [erikryb]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/science/math/polymake/default.nix b/pkgs/applications/science/math/polymake/default.nix index d4f13f84f81..552881c5f1a 100644 --- a/pkgs/applications/science/math/polymake/default.nix +++ b/pkgs/applications/science/math/polymake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , ninja, libxml2, libxslt, readline, perl, gmp, mpfr, boost , bliss, ppl, singular, cddlib, lrs, nauty , ant, openjdk @@ -39,9 +39,9 @@ stdenv.mkDerivation rec { meta = { inherit version; description = "Software for research in polyhedral geometry"; - license = stdenv.lib.licenses.gpl2 ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2 ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; homepage = "https://www.polymake.org/doku.php"; }; } diff --git a/pkgs/applications/science/math/pspp/default.nix b/pkgs/applications/science/math/pspp/default.nix index d6c5b58f0d5..6e9ff90315c 100644 --- a/pkgs/applications/science/math/pspp/default.nix +++ b/pkgs/applications/science/math/pspp/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, libxml2, readline, zlib, perl, cairo, gtk3, gsl -, pkgconfig, gtksourceview, pango, gettext, dconf +{ lib, stdenv, fetchurl, libxml2, readline, zlib, perl, cairo, gtk3, gsl +, pkg-config, gtksourceview, pango, gettext, dconf , makeWrapper, gsettings-desktop-schemas, hicolor-icon-theme , texinfo, ssw, python3 }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0lqrash677b09zxdlxp89z6k02y4i23mbqg83956dwl69wc53dan"; }; - nativeBuildInputs = [ pkgconfig texinfo python3 ]; + nativeBuildInputs = [ pkg-config texinfo python3 ]; buildInputs = [ libxml2 readline zlib perl cairo gtk3 gsl gtksourceview pango gettext makeWrapper gsettings-desktop-schemas hicolor-icon-theme ssw @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "$out/share" \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ - --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" + --prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules" ''; meta = { homepage = "https://www.gnu.org/software/pspp/"; description = "A free replacement for SPSS, a program for statistical analysis of sampled data"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; longDescription = '' PSPP is a program for statistical analysis of sampled data. It is @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { more traditional syntax commands. ''; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/science/math/pynac/default.nix b/pkgs/applications/science/math/pynac/default.nix index d49285c3e2f..00d35b491d6 100644 --- a/pkgs/applications/science/math/pynac/default.nix +++ b/pkgs/applications/science/math/pynac/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , fetchurl , autoreconfHook -, pkgconfig +, pkg-config , flint , gmp , python3 @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config ]; patches = [ diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index d7d880df040..3d80d8c039e 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, intltool, autoreconfHook, pkgconfig, libqalculate, gtk3, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitHub, intltool, autoreconfHook, pkg-config, libqalculate, gtk3, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "qalculate-gtk"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - nativeBuildInputs = [ intltool pkgconfig autoreconfHook wrapGAppsHook ]; + nativeBuildInputs = [ intltool pkg-config autoreconfHook wrapGAppsHook ]; buildInputs = [ libqalculate gtk3 ]; enableParallelBuilding = true; diff --git a/pkgs/applications/science/math/ratpoints/default.nix b/pkgs/applications/science/math/ratpoints/default.nix index fb205a69f03..eed1c8e3fd4 100644 --- a/pkgs/applications/science/math/ratpoints/default.nix +++ b/pkgs/applications/science/math/ratpoints/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, gmp }: +{ lib, stdenv, fetchurl, fetchpatch, gmp }: stdenv.mkDerivation rec { pname = "ratpoints"; version = "2.1.3.p4"; @@ -20,17 +20,17 @@ stdenv.mkDerivation rec { buildInputs = [ gmp ]; makeFlags = [ "CC=cc" ]; - buildFlags = stdenv.lib.optional stdenv.isDarwin ["CCFLAGS2=-lgmp -lc -lm" "CCFLAGS=-UUSE_SSE"]; + buildFlags = lib.optional stdenv.isDarwin ["CCFLAGS2=-lgmp -lc -lm" "CCFLAGS=-UUSE_SSE"]; installFlags = [ "INSTALL_DIR=$(out)" ]; preInstall = ''mkdir -p "$out"/{bin,share,lib,include}''; meta = { inherit version; - description = ''A program to find rational points on hyperelliptic curves''; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; + description = "A program to find rational points on hyperelliptic curves"; + license = lib.licenses.gpl2Plus; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.unix; homepage = "http://www.mathe2.uni-bayreuth.de/stoll/programs/"; updateWalker = true; }; diff --git a/pkgs/applications/science/math/ripser/default.nix b/pkgs/applications/science/math/ripser/default.nix index 1c8ced5ed22..21f0d003391 100644 --- a/pkgs/applications/science/math/ripser/default.nix +++ b/pkgs/applications/science/math/ripser/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub +{ lib, stdenv, fetchurl, fetchFromGitHub , assembleReductionMatrix ? false , useCoefficients ? false , indicateProgress ? false @@ -6,14 +6,14 @@ , fileFormat ? "lowerTriangularCsv" }: -with stdenv.lib; +with lib; assert assertOneOf "fileFormat" fileFormat ["lowerTriangularCsv" "upperTriangularCsv" "dipha"]; assert useGoogleHashmap -> sparsehash != null; let - inherit (stdenv.lib) optional; + inherit (lib) optional; version = "1.0"; in stdenv.mkDerivation { @@ -60,8 +60,8 @@ stdenv.mkDerivation { meta = { description = "A lean C++ code for the computation of Vietoris–Rips persistence barcodes"; homepage = "https://github.com/Ripser/ripser"; - license = stdenv.lib.licenses.lgpl3; - maintainers = with stdenv.lib.maintainers; [erikryb]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.lgpl3; + maintainers = with lib.maintainers; [erikryb]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/science/math/rofi-calc/default.nix b/pkgs/applications/science/math/rofi-calc/default.nix index e7cf98c7266..9e0c8403646 100644 --- a/pkgs/applications/science/math/rofi-calc/default.nix +++ b/pkgs/applications/science/math/rofi-calc/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchFromGitHub , autoreconfHook -, pkgconfig +, pkg-config , rofi-unwrapped , libqalculate , glib @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config gobject-introspection wrapGAppsHook ]; diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index 416f2b957b7..8ef1f5189e5 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -17,7 +17,7 @@ let inherit sage-src env-locations pynac singular; ecl = maxima-ecl.ecl; linbox = pkgs.linbox.override { withSage = true; }; - pkg-config = pkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig + pkg-config = pkgs.pkg-config; # not to confuse with pythonPackages.pkg-config }; }; }; @@ -56,7 +56,7 @@ let inherit env-locations; inherit python3 singular palp flint pynac pythonEnv maxima-ecl; ecl = maxima-ecl.ecl; - pkg-config = pkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig + pkg-config = pkgs.pkg-config; # not to confuse with pythonPackages.pkg-config }; # The documentation for sage, building it takes a lot of ram. @@ -70,7 +70,7 @@ let inherit python3 pythonEnv; inherit sage-env; inherit pynac singular maxima-ecl; - pkg-config = pkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig + pkg-config = pkgs.pkg-config; # not to confuse with pythonPackages.pkg-config three = nodePackages.three; }; diff --git a/pkgs/applications/science/math/sage/sage.nix b/pkgs/applications/science/math/sage/sage.nix index b9256e32f8b..106f9eea309 100644 --- a/pkgs/applications/science/math/sage/sage.nix +++ b/pkgs/applications/science/math/sage/sage.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/bin" makeWrapper "${sage-with-env}/bin/sage" "$out/bin/sage" \ --set SAGE_DOC_SRC_OVERRIDE "${src}/src/doc" ${ - stdenv.lib.optionalString withDoc "--set SAGE_DOC_OVERRIDE ${sagedoc}/share/doc/sage" + lib.optionalString withDoc "--set SAGE_DOC_OVERRIDE ${sagedoc}/share/doc/sage" } \ --prefix JUPYTER_PATH : "${kernel-specs}" ''; diff --git a/pkgs/applications/science/math/scilab/default.nix b/pkgs/applications/science/math/scilab/default.nix index 24b3feef51e..95c6c23fb09 100644 --- a/pkgs/applications/science/math/scilab/default.nix +++ b/pkgs/applications/science/math/scilab/default.nix @@ -35,14 +35,14 @@ stdenv.mkDerivation rec { # do not compile with PVM library "--without-pvm" # compile with GTK - (stdenv.lib.enableFeature withGtk "gtk") - (stdenv.lib.enableFeature withGtk "gtk2") + (lib.enableFeature withGtk "gtk") + (lib.enableFeature withGtk "gtk2") # compile with ocaml - (stdenv.lib.withFeature withOCaml "ocaml") + (lib.withFeature withOCaml "ocaml") # do not compile Java interface "--without-java" # use the X Window System - (stdenv.lib.withFeature withX "x") + (lib.withFeature withX "x") # compile with TCL/TK ] ++ lib.optionals withTk [ "--with-tk" diff --git a/pkgs/applications/science/math/scotch/default.nix b/pkgs/applications/science/math/scotch/default.nix index 75a6b2dba68..b6613f25cbc 100644 --- a/pkgs/applications/science/math/scotch/default.nix +++ b/pkgs/applications/science/math/scotch/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, bison, openmpi, flex, zlib}: +{ lib, stdenv, fetchurl, bison, mpi, flex, zlib}: stdenv.mkDerivation rec { version = "6.0.4"; pname = "scotch"; src_name = "scotch_${version}"; - buildInputs = [ bison openmpi flex zlib ]; + buildInputs = [ bison mpi flex zlib ]; src = fetchurl { url = "https://gforge.inria.fr/frs/download.php/file/34618/${src_name}.tar.gz"; @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { meta = { description = "Graph and mesh/hypergraph partitioning, graph clustering, and sparse matrix ordering"; longDescription = '' - Scotch is a software package for graph and mesh/hypergraph partitioning, graph clustering, + Scotch is a software package for graph and mesh/hypergraph partitioning, graph clustering, and sparse matrix ordering. ''; homepage = "http://www.labri.fr/perso/pelegrin/scotch"; - license = stdenv.lib.licenses.cecill-c; - maintainers = [ stdenv.lib.maintainers.bzizou ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.cecill-c; + maintainers = [ lib.maintainers.bzizou ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix index 8c5eac2c06d..fad05099a73 100644 --- a/pkgs/applications/science/math/singular/default.nix +++ b/pkgs/applications/science/math/singular/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gmp, bison, perl, ncurses, readline, coreutils, pkgconfig +{ stdenv, fetchurl, gmp, bison, perl, ncurses, readline, coreutils, pkg-config , lib , fetchpatch , autoreconfHook @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ bison perl - pkgconfig + pkg-config autoreconfHook ]; diff --git a/pkgs/applications/science/math/symmetrica/default.nix b/pkgs/applications/science/math/symmetrica/default.nix index ca752259797..ed9e64347a8 100644 --- a/pkgs/applications/science/math/symmetrica/default.nix +++ b/pkgs/applications/science/math/symmetrica/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - description = ''A collection of routines for representation theory and combinatorics''; + description = "A collection of routines for representation theory and combinatorics"; license = licenses.isc; maintainers = teams.sage.members; platforms = platforms.unix; diff --git a/pkgs/applications/science/math/tilp2/default.nix b/pkgs/applications/science/math/tilp2/default.nix new file mode 100644 index 00000000000..1b46f982b41 --- /dev/null +++ b/pkgs/applications/science/math/tilp2/default.nix @@ -0,0 +1,56 @@ +{ stdenv +, lib +, fetchurl +, fetchpatch +, autoreconfHook +, pkg-config +, intltool +, glib +, gnome2 +, gfm +, libticables2 +, libticalcs2 +, libticonv +, libtifiles2 +}: + +stdenv.mkDerivation rec { + pname = "tilp2"; + version = "1.18"; + src = fetchurl { + url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2"; + sha256 = "0isf73bjwk06baz2gm3vpdh600gqck9ca4aqxzb089dmxriv6fkv"; + }; + + patches = fetchpatch { + name = "remove-broken-kde-support.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/remove-broken-kde-support.patch?h=tilp"; + sha256 = "1fn6vh7r45spkwpmkvffkbn7zrcsdrs5mjmspd5rwi3jc12cy3ny"; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + intltool + ]; + + buildInputs = [ + glib + gnome2.gtk + gnome2.libglade + gfm + libticables2 + libticalcs2 + libticonv + libtifiles2 + ]; + + meta = with lib; { + changelog = "http://lpg.ticalc.org/prj_tilp/news.html"; + description = "Transfer data between Texas Instruments graphing calculators and a computer"; + homepage = "http://lpg.ticalc.org/prj_tilp/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ luc65r ]; + platforms = with platforms; linux ++ darwin; + }; +} diff --git a/pkgs/applications/science/math/weka/default.nix b/pkgs/applications/science/math/weka/default.nix index c4fc19d6c6b..179801da379 100644 --- a/pkgs/applications/science/math/weka/default.nix +++ b/pkgs/applications/science/math/weka/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, jre, unzip, makeWrapper }: +{ lib, stdenv, fetchurl, jre, unzip, makeWrapper }: stdenv.mkDerivation rec { pname = "weka"; version = "3.9.2"; src = fetchurl { - url = "mirror://sourceforge/weka/${stdenv.lib.replaceChars ["."]["-"] "${pname}-${version}"}.zip"; + url = "mirror://sourceforge/weka/${lib.replaceChars ["."]["-"] "${pname}-${version}"}.zip"; sha256 = "0zwmhspmqb0a7cm6k6i0s6q3w19ws1g9dx3cp2v3g3vsif6cdh31"; }; @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.cs.waikato.ac.nz/ml/weka/"; description = "Collection of machine learning algorithms for data mining tasks"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.mimame ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.mimame ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/science/math/yacas/default.nix b/pkgs/applications/science/math/yacas/default.nix index 06aab669df5..05d1f780bf3 100644 --- a/pkgs/applications/science/math/yacas/default.nix +++ b/pkgs/applications/science/math/yacas/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, perl +{ lib, stdenv, fetchFromGitHub, cmake, perl , enableGui ? false, qt5 , enableJupyter ? false, boost, jsoncpp, openssl, zmqpp }: @@ -24,16 +24,16 @@ stdenv.mkDerivation rec { # Perl is only for the documentation nativeBuildInputs = [ cmake perl ]; buildInputs = [ - ] ++ stdenv.lib.optionals enableGui (with qt5; [ qtbase qtwebkit ]) - ++ stdenv.lib.optionals enableJupyter [ boost jsoncpp openssl zmqpp ] + ] ++ lib.optionals enableGui (with qt5; [ qtbase qtwebkit ]) + ++ lib.optionals enableJupyter [ boost jsoncpp openssl zmqpp ] ; meta = { description = "Easy to use, general purpose Computer Algebra System"; homepage = "http://www.yacas.org/"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; broken = enableGui || enableJupyter; }; } diff --git a/pkgs/applications/science/medicine/aliza/default.nix b/pkgs/applications/science/medicine/aliza/default.nix index b4e56591f9c..c6bfd6361f2 100644 --- a/pkgs/applications/science/medicine/aliza/default.nix +++ b/pkgs/applications/science/medicine/aliza/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, rpmextract, makeWrapper, patchelf, qt4, zlib, libX11, libXt, libSM, libICE, libXext, libGLU, libGL }: +{ lib, stdenv, fetchurl, rpmextract, makeWrapper, patchelf, qt4, zlib, libX11, libXt, libSM, libICE, libXext, libGLU, libGL }: -with stdenv.lib; +with lib; stdenv.mkDerivation { pname = "aliza"; version = "1.98.32"; @@ -27,7 +27,7 @@ stdenv.mkDerivation { ''; postInstall = let - libs = stdenv.lib.makeLibraryPath [ qt4 zlib stdenv.cc.cc libSM libICE libX11 libXext libXt libGLU libGL ]; + libs = lib.makeLibraryPath [ qt4 zlib stdenv.cc.cc libSM libICE libX11 libXext libXt libGLU libGL ]; in '' ${patchelf}/bin/patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ diff --git a/pkgs/applications/science/medicine/dcmtk/default.nix b/pkgs/applications/science/medicine/dcmtk/default.nix index 817ab578a82..8a06260ebc7 100644 --- a/pkgs/applications/science/medicine/dcmtk/default.nix +++ b/pkgs/applications/science/medicine/dcmtk/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, zlib, libtiff, libxml2, openssl, libiconv, libpng, cmake }: +{ lib, stdenv, fetchFromGitHub, zlib, libtiff, libxml2, openssl, libiconv, libpng, cmake }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "dcmtk"; - version = "3.6.5"; + version = "3.6.6"; src = fetchFromGitHub { owner = "DCMTK"; repo = pname; rev = "DCMTK-${version}"; - sha256 = "0i38k1s0wdpbxxpiwsx490mszhxi45wp0z67iksvh60wfkaw54na"; + sha256 = "sha256-bpvf2JJXikV/CqmXZb3w4Ua3VBEQcQk7PXw9ie0t8xo="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix index 802abae80e1..460ea1408ec 100644 --- a/pkgs/applications/science/misc/boinc/default.nix +++ b/pkgs/applications/science/misc/boinc/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, autoconf, automake, pkgconfig, m4, curl, +{ fetchFromGitHub, lib, stdenv, autoconf, automake, pkg-config, m4, curl, libGLU, libGL, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK30, xcbutil, sqlite, gtk2, patchelf, libXScrnSaver, libnotify, libX11, libxcb }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "0nicpkag18xq0libfqqvs0im22mijpsxzfk272iwdd9l0lmgfvyd"; }; - nativeBuildInputs = [ libtool automake autoconf m4 pkgconfig ]; + nativeBuildInputs = [ libtool automake autoconf m4 pkg-config ]; buildInputs = [ curl libGLU libGL libXmu libXi freeglut libjpeg wxGTK30 sqlite gtk2 libXScrnSaver @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = { description = "Free software for distributed and grid computing"; homepage = "https://boinc.berkeley.edu/"; - license = stdenv.lib.licenses.lgpl2Plus; - platforms = stdenv.lib.platforms.linux; # arbitrary choice + license = lib.licenses.lgpl2Plus; + platforms = lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/applications/science/misc/cytoscape/default.nix b/pkgs/applications/science/misc/cytoscape/default.nix index 647492bbe31..db98e0db348 100644 --- a/pkgs/applications/science/misc/cytoscape/default.nix +++ b/pkgs/applications/science/misc/cytoscape/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, makeWrapper, substituteAll, coreutils }: +{ lib, stdenv, fetchurl, jre, makeWrapper, substituteAll, coreutils }: stdenv.mkDerivation rec { pname = "cytoscape"; @@ -36,8 +36,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.cytoscape.org"; description = "A general platform for complex network analysis and visualization"; - license = stdenv.lib.licenses.lgpl21; - maintainers = [stdenv.lib.maintainers.mimame]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.lgpl21; + maintainers = [lib.maintainers.mimame]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/science/misc/fityk/default.nix b/pkgs/applications/science/misc/fityk/default.nix index 18def1d24e2..3198b40711d 100644 --- a/pkgs/applications/science/misc/fityk/default.nix +++ b/pkgs/applications/science/misc/fityk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, wxGTK30, boost, lua, zlib, bzip2 +{ lib, stdenv, fetchFromGitHub, autoreconfHook, wxGTK30, boost, lua, zlib, bzip2 , xylib, readline, gnuplot, swig3 }: let @@ -21,8 +21,8 @@ stdenv.mkDerivation { meta = { description = "Curve fitting and peak fitting software"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; homepage = "http://fityk.nieto.pl/"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/science/misc/foldingathome/client.nix b/pkgs/applications/science/misc/foldingathome/client.nix index bf7145113f5..cc3d5445b59 100644 --- a/pkgs/applications/science/misc/foldingathome/client.nix +++ b/pkgs/applications/science/misc/foldingathome/client.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , autoPatchelfHook , buildFHSUserEnv , dpkg @@ -9,7 +9,7 @@ , extraPkgs ? [] }: let - majMin = stdenv.lib.versions.majorMinor version; + majMin = lib.versions.majorMinor version; version = "7.6.13"; fahclient = stdenv.mkDerivation rec { @@ -52,8 +52,8 @@ buildFHSUserEnv { meta = { description = "Folding@home client"; homepage = "https://foldingathome.org/"; - license = stdenv.lib.licenses.unfree; - maintainers = [ stdenv.lib.maintainers.zimbatm ]; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.zimbatm ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/science/misc/foldingathome/control.nix b/pkgs/applications/science/misc/foldingathome/control.nix index 85be61f6686..1430881a3f0 100644 --- a/pkgs/applications/science/misc/foldingathome/control.nix +++ b/pkgs/applications/science/misc/foldingathome/control.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , autoPatchelfHook , dpkg , fahviewer @@ -7,7 +7,7 @@ , python2 }: let - majMin = stdenv.lib.versions.majorMinor version; + majMin = lib.versions.majorMinor version; version = "7.6.21"; python = python2.withPackages @@ -35,8 +35,6 @@ stdenv.mkDerivation rec { buildInputs = [ fahviewer python ]; - doBuild = false; - unpackPhase = '' dpkg-deb -x ${src} ./ ''; @@ -53,8 +51,8 @@ stdenv.mkDerivation rec { meta = { description = "Folding@home control"; homepage = "https://foldingathome.org/"; - license = stdenv.lib.licenses.unfree; - maintainers = [ stdenv.lib.maintainers.zimbatm ]; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.zimbatm ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/science/misc/foldingathome/viewer.nix b/pkgs/applications/science/misc/foldingathome/viewer.nix index a383de621f2..52ca9c9e623 100644 --- a/pkgs/applications/science/misc/foldingathome/viewer.nix +++ b/pkgs/applications/science/misc/foldingathome/viewer.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , autoPatchelfHook , dpkg , fetchurl @@ -10,7 +10,7 @@ , zlib }: let - majMin = stdenv.lib.versions.majorMinor version; + majMin = lib.versions.majorMinor version; version = "7.6.21"; in stdenv.mkDerivation rec { @@ -48,8 +48,8 @@ stdenv.mkDerivation rec { meta = { description = "Folding@home viewer"; homepage = "https://foldingathome.org/"; - license = stdenv.lib.licenses.unfree; - maintainers = [ stdenv.lib.maintainers.zimbatm ]; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.zimbatm ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/science/misc/golly/beta.nix b/pkgs/applications/science/misc/golly/beta.nix index 36de6a1d4c5..7741f7ba65b 100644 --- a/pkgs/applications/science/misc/golly/beta.nix +++ b/pkgs/applications/science/misc/golly/beta.nix @@ -1,4 +1,4 @@ -{stdenv, fetchgit +{lib, stdenv, fetchgit , wxGTK, perl, python2, zlib, libGLU, libGL, libX11 , automake, autoconf }: @@ -43,9 +43,9 @@ stdenv.mkDerivation rec { meta = { inherit version; description = "Cellular automata simulation program"; - license = stdenv.lib.licenses.gpl2; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; downloadPage = "https://sourceforge.net/projects/golly/files/golly"; }; } diff --git a/pkgs/applications/science/misc/golly/default.nix b/pkgs/applications/science/misc/golly/default.nix index 1478bb64318..be61ec86b32 100644 --- a/pkgs/applications/science/misc/golly/default.nix +++ b/pkgs/applications/science/misc/golly/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, wxGTK, perl, python2, zlib, libGLU, libGL, libX11}: +{lib, stdenv, fetchurl, wxGTK, perl, python2, zlib, libGLU, libGL, libX11}: stdenv.mkDerivation rec { pname = "golly"; version = "3.3"; @@ -31,9 +31,9 @@ stdenv.mkDerivation rec { meta = { inherit version; description = "Cellular automata simulation program"; - license = stdenv.lib.licenses.gpl2; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; downloadPage = "https://sourceforge.net/projects/golly/files/golly"; }; } diff --git a/pkgs/applications/science/misc/megam/default.nix b/pkgs/applications/science/misc/megam/default.nix index 8bb64932f20..6c55027d3c6 100644 --- a/pkgs/applications/science/misc/megam/default.nix +++ b/pkgs/applications/science/misc/megam/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, ocaml, makeWrapper, ncurses }: +{ fetchurl, lib, stdenv, ocaml, makeWrapper, ncurses }: let version = "0.92"; in stdenv.mkDerivation { @@ -11,7 +11,7 @@ stdenv.mkDerivation { }; patches = [ ./ocaml-includes.patch ./ocaml-3.12.patch ]; - + buildInputs = [ ocaml ncurses ]; nativeBuildInputs = [ makeWrapper ]; @@ -42,6 +42,6 @@ stdenv.mkDerivation { license = "non-commercial"; maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice + platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/applications/science/misc/openmodelica/default.nix b/pkgs/applications/science/misc/openmodelica/default.nix index 8b027b52687..cab0fa5ff5c 100644 --- a/pkgs/applications/science/misc/openmodelica/default.nix +++ b/pkgs/applications/science/misc/openmodelica/default.nix @@ -1,11 +1,11 @@ {lib, stdenv, fetchgit, fetchsvn, autoconf, automake, libtool, gfortran, clang, cmake, gnumake, hwloc, jre, lapack, blas, hdf5, expat, ncurses, readline, qt4, webkitgtk, which, -lp_solve, omniorb, sqlite, libatomic_ops, pkgconfig, file, gettext, flex, bison, +lp_solve, omniorb, sqlite, libatomic_ops, pkg-config, file, gettext, flex, bison, doxygen, boost, openscenegraph, gnome2, xorg, git, bash, gtk2, makeWrapper }: let - fakegit = import ./fakegit.nix {inherit stdenv fetchgit fetchsvn bash;} ; + fakegit = import ./fakegit.nix { inherit lib stdenv fetchgit fetchsvn bash; }; in @@ -16,7 +16,7 @@ stdenv.mkDerivation { buildInputs = [autoconf cmake automake libtool gfortran clang gnumake hwloc jre lapack blas hdf5 expat ncurses readline qt4 webkitgtk which - lp_solve omniorb sqlite libatomic_ops pkgconfig file gettext flex bison + lp_solve omniorb sqlite libatomic_ops pkg-config file gettext flex bison doxygen boost openscenegraph gnome2.gtkglext xorg.libXmu git gtk2 makeWrapper]; @@ -38,7 +38,7 @@ stdenv.mkDerivation { for e in $(cd $out/bin && ls); do wrapProgram $out/bin/$e \ --prefix PATH : "${gnumake}/bin" \ - --prefix LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ lapack blas ]}" + --prefix LIBRARY_PATH : "${lib.makeLibraryPath [ lapack blas ]}" done ''; diff --git a/pkgs/applications/science/misc/openmodelica/fakegit.nix b/pkgs/applications/science/misc/openmodelica/fakegit.nix index de69626cd3e..47cca7c7491 100644 --- a/pkgs/applications/science/misc/openmodelica/fakegit.nix +++ b/pkgs/applications/science/misc/openmodelica/fakegit.nix @@ -1,4 +1,4 @@ -{stdenv, fetchgit, fetchsvn, bash } : +{ lib, stdenv, fetchgit, fetchsvn, bash }: let mkscript = path : text : '' @@ -11,9 +11,9 @@ let sed -i "s@%out@$out@g" ${path} chmod +x ${path} ''; - + hashname = r: let - rpl = stdenv.lib.replaceChars [":" "/"] ["_" "_"]; + rpl = lib.replaceChars [":" "/"] ["_" "_"]; in (rpl r.url) + "-" + (rpl r.rev); @@ -24,7 +24,7 @@ stdenv.mkDerivation { buildCommand = '' mkdir -pv $out/repos - ${stdenv.lib.concatMapStrings + ${lib.concatMapStrings (r : '' cp -r ${fetchgit r} $out/repos/${hashname r} '' @@ -55,7 +55,7 @@ stdenv.mkDerivation { chmod u+w -R $DEST ''} - ${stdenv.lib.concatMapStrings + ${lib.concatMapStrings (r : '' cp -r ${fetchsvn r} $out/repos/${hashname r} '' diff --git a/pkgs/applications/science/misc/openmvg/default.nix b/pkgs/applications/science/misc/openmvg/default.nix index 5db6092fa36..2e34f2d15d2 100644 --- a/pkgs/applications/science/misc/openmvg/default.nix +++ b/pkgs/applications/science/misc/openmvg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake , libjpeg ? null , zlib ? null , libpng ? null @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ libjpeg zlib libpng eigen libtiff ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++11" @@ -42,8 +42,8 @@ stdenv.mkDerivation rec { meta = { description = "A library for computer-vision scientists and targeted for the Multiple View Geometry community"; homepage = "https://openmvg.readthedocs.io/en/latest/"; - license = stdenv.lib.licenses.mpl20; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ mdaiter ]; + license = lib.licenses.mpl20; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ mdaiter ]; }; } diff --git a/pkgs/applications/science/misc/openmvs/default.nix b/pkgs/applications/science/misc/openmvs/default.nix index ec22aaa599b..731230130ca 100644 --- a/pkgs/applications/science/misc/openmvs/default.nix +++ b/pkgs/applications/science/misc/openmvs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, cmake +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake , eigen, opencv, ceres-solver, cgal, boost, vcg , gmp, mpfr, glog, gflags, libjpeg_turbo }: @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [ eigen opencv ceres-solver cgal boost vcg gmp mpfr glog gflags libjpeg_turbo ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; preConfigure = '' cmakeFlagsArray=( diff --git a/pkgs/applications/science/misc/rink/default.nix b/pkgs/applications/science/misc/rink/default.nix index 5670969e7a2..4f0d1eae487 100644 --- a/pkgs/applications/science/misc/rink/default.nix +++ b/pkgs/applications/science/misc/rink/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, openssl, pkg-config, ncurses }: +{ lib, fetchFromGitHub, rustPlatform, openssl, pkg-config, ncurses }: rustPlatform.buildRustPackage rec { version = "0.5.1"; diff --git a/pkgs/applications/science/misc/root/5.nix b/pkgs/applications/science/misc/root/5.nix index d8e6ae06a24..144827413b5 100644 --- a/pkgs/applications/science/misc/root/5.nix +++ b/pkgs/applications/science/misc/root/5.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ pcre python2 zlib libxml2 lz4 lzma gsl_1 xxHash ] - ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] - ++ stdenv.lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] + ++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] + ++ lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] ; patches = [ @@ -30,14 +30,14 @@ stdenv.mkDerivation rec { preConfigure = '' patchShebangs build/unix/ - ln -s ${stdenv.lib.getDev stdenv.cc.libc}/include/AvailabilityMacros.h cint/cint/include/ + ln -s ${lib.getDev stdenv.cc.libc}/include/AvailabilityMacros.h cint/cint/include/ '' # Fix CINTSYSDIR for "build" version of rootcint # This is probably a bug that breaks out-of-source builds + '' substituteInPlace cint/cint/src/loadfile.cxx\ --replace 'env = "cint";' 'env = "'`pwd`'/cint";' - '' + stdenv.lib.optionalString noSplash '' + '' + lib.optionalString noSplash '' substituteInPlace rootx/src/rootx.cxx --replace "gNoLogo = false" "gNoLogo = true" ''; @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { "-Dxml=ON" "-Dxrootd=OFF" ] - ++ stdenv.lib.optional stdenv.isDarwin "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"; + ++ lib.optional stdenv.isDarwin "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"; setupHook = ./setup-hook.sh; diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 8bfde114beb..2f3d57c31e7 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, makeWrapper, cmake, ftgl, gl2ps, glew, gsl, llvm_5 , libX11, libXpm, libXft, libXext, libGLU, libGL, libxml2, lz4, lzma, pcre -, pkgconfig, python, xxHash, zlib, zstd +, pkg-config, python, xxHash, zlib, zstd , libAfterImage, giflib, libjpeg, libtiff, libpng , Cocoa, OpenGL, noSplash ? false }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0mqvj42nax0bmz8h83jjlwjm3xxjy1n0n10inc8csip9ly28fs64"; }; - nativeBuildInputs = [ makeWrapper cmake pkgconfig ]; + nativeBuildInputs = [ makeWrapper cmake pkg-config ]; buildInputs = [ ftgl gl2ps glew pcre zlib zstd llvm_5 libxml2 lz4 lzma gsl xxHash libAfterImage giflib libjpeg libtiff libpng python.pkgs.numpy ] ++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] ++ lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { --replace 'set(lcgpackages ' '#set(lcgpackages ' patchShebangs build/unix/ - '' + stdenv.lib.optionalString noSplash '' + '' + lib.optionalString noSplash '' substituteInPlace rootx/src/rootx.cxx --replace "gNoLogo = false" "gNoLogo = true" ''; @@ -70,8 +70,8 @@ stdenv.mkDerivation rec { "-Dxml=ON" "-Dxrootd=OFF" ] - ++ stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.lib.getDev stdenv.cc.libc}/include" - ++ stdenv.lib.optionals stdenv.isDarwin [ + ++ lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${lib.getDev stdenv.cc.libc}/include" + ++ lib.optionals stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" "-DCMAKE_DISABLE_FIND_PACKAGE_Python2=TRUE" diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix index 7cc702f2d53..771e79311c9 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, cmake, perl, python3, boost, valgrind +{ lib, stdenv, fetchFromGitLab, cmake, perl, python3, boost, valgrind # Optional requirements # Lua 5.3 needed and not available now #, luaSupport ? false, lua5 @@ -10,7 +10,7 @@ , moreTests ? false }: -with stdenv.lib; +with lib; let optionOnOff = option: if option then "on" else "off"; diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index 6b3c405a9ac..edf26f7ec23 100644 --- a/pkgs/applications/science/misc/snakemake/default.nix +++ b/pkgs/applications/science/misc/snakemake/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages }: +{ lib, python3Packages }: python3Packages.buildPythonApplication rec { pname = "snakemake"; diff --git a/pkgs/applications/science/misc/tulip/default.nix b/pkgs/applications/science/misc/tulip/default.nix index f29cd41169d..62d638717f8 100644 --- a/pkgs/applications/science/misc/tulip/default.nix +++ b/pkgs/applications/science/misc/tulip/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, libxml2, freetype, libGLU, libGL, glew, qt4 +{ fetchurl, lib, stdenv, libxml2, freetype, libGLU, libGL, glew, qt4 , cmake, makeWrapper, libjpeg, python }: let version = "5.2.1"; in @@ -31,9 +31,9 @@ stdenv.mkDerivation rec { homepage = "http://tulip.labri.fr/"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice + platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/applications/science/misc/vite/default.nix b/pkgs/applications/science/misc/vite/default.nix index 6f7735db82e..ed9d1852875 100644 --- a/pkgs/applications/science/misc/vite/default.nix +++ b/pkgs/applications/science/misc/vite/default.nix @@ -1,4 +1,4 @@ -{ fetchsvn, stdenv, cmake, qt4, libGLU, libGL }: +{ fetchsvn, lib, stdenv, cmake, qt4, libGLU, libGL }: # ViTE 1.1 has several bugs, so use the SVN version. let @@ -38,8 +38,8 @@ stdenv.mkDerivation { ''; homepage = "http://vite.gforge.inria.fr/"; - license = stdenv.lib.licenses.cecill20; - maintainers = with stdenv.lib.maintainers; [ ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.cecill20; + maintainers = with lib.maintainers; [ ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index 6a243c1d917..bdec2ccc669 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -3,10 +3,10 @@ , cmake , hwloc , fftw -, openmpi , perl , singlePrec ? true , mpiEnabled ? false +, mpi , cpuAcceleration ? null }: @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ fftw perl hwloc ] - ++ (stdenv.lib.optionals mpiEnabled [ openmpi ]); + ++ (lib.optionals mpiEnabled [ mpi ]); cmakeFlags = [ "-DGMX_SIMD:STRING=${SIMD cpuAcceleration}" diff --git a/pkgs/applications/science/molecular-dynamics/lammps/default.nix b/pkgs/applications/science/molecular-dynamics/lammps/default.nix index 561bb119f12..51ce64115ea 100644 --- a/pkgs/applications/science/molecular-dynamics/lammps/default.nix +++ b/pkgs/applications/science/molecular-dynamics/lammps/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchFromGitHub , libpng, gzip, fftw, blas, lapack -, mpi ? null +, withMPI ? false +, mpi }: let packages = [ "asphere" "body" "class2" "colloid" "compress" "coreshell" @@ -8,7 +9,6 @@ let packages = [ "opt" "peri" "qeq" "replica" "rigid" "shock" "snap" "srd" "user-reaxc" ]; lammps_includes = "-DLAMMPS_EXCEPTIONS -DLAMMPS_GZIP -DLAMMPS_MEMALIGN=64"; - withMPI = (mpi != null); in stdenv.mkDerivation rec { # LAMMPS has weird versioning converted to ISO 8601 format @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { }; buildInputs = [ fftw libpng blas lapack gzip ] - ++ (stdenv.lib.optionals withMPI [ mpi ]); + ++ (lib.optionals withMPI [ mpi ]); configurePhase = '' cd src - for pack in ${stdenv.lib.concatStringsSep " " packages}; do make "yes-$pack" SHELL=$SHELL; done + for pack in ${lib.concatStringsSep " " packages}; do make "yes-$pack" SHELL=$SHELL; done ''; # Must do manual build due to LAMMPS requiring a seperate build for diff --git a/pkgs/applications/science/physics/elmerfem/default.nix b/pkgs/applications/science/physics/elmerfem/default.nix index 6fa25ce66ae..5033b28bd3b 100644 --- a/pkgs/applications/science/physics/elmerfem/default.nix +++ b/pkgs/applications/science/physics/elmerfem/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, git, gfortran, openmpi, blas, liblapack, qt4, qwt6_qt4, pkg-config }: +{ lib, stdenv, fetchFromGitHub, cmake, git, gfortran, mpi, blas, liblapack, qt4, qwt6_qt4, pkg-config }: stdenv.mkDerivation rec { pname = "elmerfem"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; nativeBuildInputs = [ cmake pkg-config git ]; - buildInputs = [ gfortran openmpi blas liblapack qt4 qwt6_qt4 ]; + buildInputs = [ gfortran mpi blas liblapack qt4 qwt6_qt4 ]; preConfigure = '' patchShebangs ./ diff --git a/pkgs/applications/science/physics/sacrifice/default.nix b/pkgs/applications/science/physics/sacrifice/default.nix index 2c4757d92e4..34e4d989e95 100644 --- a/pkgs/applications/science/physics/sacrifice/default.nix +++ b/pkgs/applications/science/physics/sacrifice/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, hepmc2, lhapdf, pythia, makeWrapper }: +{ lib, stdenv, fetchurl, boost, hepmc2, lhapdf, pythia, makeWrapper }: stdenv.mkDerivation { pname = "sacrifice"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { preConfigure = '' substituteInPlace configure --replace HAVE_LCG=yes HAVE_LCG=no '' - + stdenv.lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.isDarwin '' substituteInPlace configure --replace LIB_SUFFIX=\"so\" LIB_SUFFIX=\"dylib\" ''; @@ -40,9 +40,9 @@ stdenv.mkDerivation { meta = { description = "A standalone contribution to AGILe for steering Pythia 8"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; homepage = "https://agile.hepforge.org/trac/wiki/Sacrifice"; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ veprbl ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ veprbl ]; }; } diff --git a/pkgs/applications/science/physics/xfitter/default.nix b/pkgs/applications/science/physics/xfitter/default.nix index 0713825ccef..d0a0585e69f 100644 --- a/pkgs/applications/science/physics/xfitter/default.nix +++ b/pkgs/applications/science/physics/xfitter/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { # # gfortran: error: unrecognized command line option '-stdlib=libc++' # - stdenv.lib.optionalString stdenv.isDarwin '' + lib.optionalString stdenv.isDarwin '' substituteInPlace src/Makefile.in \ --replace "F77LD = \$(F77)" "F77LD = \$(CXXLD)" \ ''; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { buildInputs = [ apfel apfelgrid applgrid blas lhapdf lapack mela root5 qcdnum libtirpc ] # pdf2yaml requires fmemopen and open_memstream which are not readily available on Darwin - ++ stdenv.lib.optional (!stdenv.isDarwin) libyaml + ++ lib.optional (!stdenv.isDarwin) libyaml ; propagatedBuildInputs = [ lynx ]; diff --git a/pkgs/applications/science/programming/fdr/default.nix b/pkgs/applications/science/programming/fdr/default.nix index 3ac8267d8ae..8beecf2def9 100644 --- a/pkgs/applications/science/programming/fdr/default.nix +++ b/pkgs/applications/science/programming/fdr/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { sha256 = "0n2yqichym5xdawlgk3r7yha88k7ycnx6585jfrcm7043sls1i88"; }; - libPath = stdenv.lib.makeLibraryPath [ + libPath = lib.makeLibraryPath [ stdenv.cc.cc python27Packages.python qtbase diff --git a/pkgs/applications/science/programming/plm/default.nix b/pkgs/applications/science/programming/plm/default.nix index 852502e73b0..dd61c3668cc 100644 --- a/pkgs/applications/science/programming/plm/default.nix +++ b/pkgs/applications/science/programming/plm/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { description = "Free cross-platform programming exerciser"; license = licenses.gpl3; maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; broken = true; }; } diff --git a/pkgs/applications/science/robotics/apmplanner2/default.nix b/pkgs/applications/science/robotics/apmplanner2/default.nix index e6d1c544ee4..e048b881d33 100644 --- a/pkgs/applications/science/robotics/apmplanner2/default.nix +++ b/pkgs/applications/science/robotics/apmplanner2/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "apmplanner2"; - version = "2.0.28-rc1"; + version = "2.0.28"; src = fetchFromGitHub { owner = "ArduPilot"; repo = "apm_planner"; rev = version; - sha256 = "18yn8bdz5hmgb0m5hlk8bibz4cj4g25w75pm1rvc4ds0mr1qgyjd"; + sha256 = "0wvbfjnnf7sh6fpgw8gimh5hgzywj3nwrgr80r782f5gayd3v2l1"; }; buildInputs = [ diff --git a/pkgs/applications/science/robotics/betaflight-configurator/default.nix b/pkgs/applications/science/robotics/betaflight-configurator/default.nix index 0b39c60b283..9a304272fe9 100644 --- a/pkgs/applications/science/robotics/betaflight-configurator/default.nix +++ b/pkgs/applications/science/robotics/betaflight-configurator/default.nix @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ wrapGAppsHook ]; - + buildInputs = [ unzip gsettings-desktop-schemas gtk3 ]; - + installPhase = '' mkdir -p $out/bin \ $out/opt/${pname} @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { description = "The Betaflight flight control system configuration tool"; longDescription = '' A crossplatform configuration tool for the Betaflight flight control system. - Various types of aircraft are supported by the tool and by Betaflight, e.g. + Various types of aircraft are supported by the tool and by Betaflight, e.g. quadcopters, hexacopters, octocopters and fixed-wing aircraft. ''; homepage = "https://github.com/betaflight/betaflight/wiki"; diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/pkgs/applications/science/robotics/mavproxy/default.nix index 8e7c5bddd96..22a32f89bde 100644 --- a/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/pkgs/applications/science/robotics/mavproxy/default.nix @@ -1,5 +1,5 @@ -{ lib, buildPythonApplication, fetchPypi, matplotlib, numpy, pymavlink, pyserial -, setuptools, wxPython_4_0 }: +{ stdenv, lib, buildPythonApplication, fetchPypi, matplotlib, numpy, pymavlink, pyserial +, setuptools, wxPython_4_0, billiard, gnureadline }: buildPythonApplication rec { pname = "MAVProxy"; @@ -10,6 +10,11 @@ buildPythonApplication rec { sha256 = "fe046481b793b592334749249620fce8a463f4c46b394ff744645975465d677b"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "opencv-python" "" + ''; + propagatedBuildInputs = [ matplotlib numpy @@ -17,7 +22,7 @@ buildPythonApplication rec { pyserial setuptools wxPython_4_0 - ]; + ] ++ lib.optionals stdenv.isDarwin [ billiard gnureadline ]; # No tests doCheck = false; diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index 023a4fc8b6a..95c8aebd32d 100644 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -1,7 +1,7 @@ { lib, mkDerivation, fetchFromGitHub, SDL2 , qtbase, qtcharts, qtlocation, qtserialport, qtsvg, qtquickcontrols2 , qtgraphicaleffects, qtspeech, qtx11extras, qmake, qttools -, gst_all_1, wayland, pkgconfig +, gst_all_1, wayland, pkg-config }: mkDerivation rec { @@ -19,7 +19,7 @@ mkDerivation rec { enableParallelBuilding = true; buildInputs = [ SDL2 ] ++ gstInputs ++ qtInputs; - nativeBuildInputs = [ pkgconfig qmake qttools ]; + nativeBuildInputs = [ pkg-config qmake qttools ]; preConfigure = '' mkdir build diff --git a/pkgs/applications/science/robotics/sumorobot-manager/default.nix b/pkgs/applications/science/robotics/sumorobot-manager/default.nix index bd056a2ec21..0b4b807a481 100644 --- a/pkgs/applications/science/robotics/sumorobot-manager/default.nix +++ b/pkgs/applications/science/robotics/sumorobot-manager/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, python3, qt5, fetchFromGitHub, wrapPython, pyqt5, pyserial }: - + stdenv.mkDerivation rec { pname = "sumorobot-manager"; version = "0.9.0"; diff --git a/pkgs/applications/science/robotics/yarp/default.nix b/pkgs/applications/science/robotics/yarp/default.nix index aa0062f8f3a..3b33096dc68 100644 --- a/pkgs/applications/science/robotics/yarp/default.nix +++ b/pkgs/applications/science/robotics/yarp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, ace +{ lib, stdenv, fetchFromGitHub, cmake, ace }: stdenv.mkDerivation rec { @@ -28,9 +28,9 @@ stdenv.mkDerivation rec { meta = { description = "Yet Another Robot Platform"; homepage = "http://yarp.it"; - license = stdenv.lib.licenses.lgpl21; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.nico202 ]; + license = lib.licenses.lgpl21; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.nico202 ]; }; } diff --git a/pkgs/applications/search/doodle/default.nix b/pkgs/applications/search/doodle/default.nix index 9bf00801600..83dbb651144 100644 --- a/pkgs/applications/search/doodle/default.nix +++ b/pkgs/applications/search/doodle/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libextractor, gettext }: +{ lib, stdenv, fetchurl, libextractor, gettext }: stdenv.mkDerivation rec { name = "doodle-0.7.1"; @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://grothoff.org/christian/doodle/"; description = "Tool to quickly index and search documents on a computer"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/search/grepm/default.nix b/pkgs/applications/search/grepm/default.nix index 7fef36d910e..1225f036a49 100644 --- a/pkgs/applications/search/grepm/default.nix +++ b/pkgs/applications/search/grepm/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { -e "s:^\( *\)mutt:\1${mutt}/bin/mutt:" \ $out/bin/grepm ''; - + meta = with lib; { description = "Wrapper for grepmail utilizing mutt"; homepage = "http://www.barsnick.net/sw/grepm.html"; diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index 6d6f58fb5e2..99e323d16da 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -85,7 +85,7 @@ mkDerivation rec { substituteInPlace $f --replace /usr/bin/perl ${lib.getBin perl}/bin/perl fi done - '' + stdenv.lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.isLinux '' substituteInPlace $f --replace '"lyx"' '"${lib.getBin lyx}/bin/lyx"' ''; diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix index b0bd5cc8b15..10a6eb9c6bb 100644 --- a/pkgs/applications/system/glances/default.nix +++ b/pkgs/applications/system/glances/default.nix @@ -9,14 +9,14 @@ buildPythonApplication rec { pname = "glances"; - version = "3.1.5"; + version = "3.1.6.1"; disabled = isPyPy; src = fetchFromGitHub { owner = "nicolargo"; repo = "glances"; rev = "v${version}"; - sha256 = "0l91nvlwyabxlsy5p533dqnc68mmvykfsrcsnxylcpjjl1nzy931"; + sha256 = "sha256-lYvFNeCuvLIV//fEQDZIj+nLGZmrKHfAQyNpe4vMmfU="; }; # Some tests fail in the sandbox (they e.g. require access to /sys/class/power_supply): diff --git a/pkgs/applications/terminal-emulators/alacritty/default.nix b/pkgs/applications/terminal-emulators/alacritty/default.nix index 13a67c6236f..71986e6ec6f 100644 --- a/pkgs/applications/terminal-emulators/alacritty/default.nix +++ b/pkgs/applications/terminal-emulators/alacritty/default.nix @@ -8,7 +8,7 @@ , installShellFiles , makeWrapper , ncurses -, pkgconfig +, pkg-config , python3 , expat @@ -23,7 +23,7 @@ , libxcb , libxkbcommon , wayland -, xdg_utils +, xdg-utils # Darwin Frameworks , AppKit @@ -69,7 +69,7 @@ rustPlatform.buildRustPackage rec { installShellFiles makeWrapper ncurses - pkgconfig + pkg-config python3 ]; @@ -87,7 +87,7 @@ rustPlatform.buildRustPackage rec { postPatch = '' substituteInPlace alacritty/src/config/mouse.rs \ - --replace xdg-open ${xdg_utils}/bin/xdg-open + --replace xdg-open ${xdg-utils}/bin/xdg-open ''; installPhase = '' diff --git a/pkgs/applications/terminal-emulators/cool-retro-term/default.nix b/pkgs/applications/terminal-emulators/cool-retro-term/default.nix index 739ad07adbf..97812decbf3 100644 --- a/pkgs/applications/terminal-emulators/cool-retro-term/default.nix +++ b/pkgs/applications/terminal-emulators/cool-retro-term/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, mkDerivation, qtbase, qtquick1, qmltermwidget +{ lib, stdenv, fetchFromGitHub, mkDerivation, qtbase, qtquick1, qmltermwidget , qtquickcontrols, qtgraphicaleffects, qmake }: mkDerivation rec { @@ -25,7 +25,7 @@ mkDerivation rec { mv $out/usr/share $out/share mv $out/usr/bin $out/bin rmdir $out/usr - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' ln -s $out/bin/cool-retro-term.app/Contents/MacOS/cool-retro-term $out/bin/cool-retro-term ''; @@ -39,8 +39,8 @@ mkDerivation rec { eye-candy, customizable, and reasonably lightweight. ''; homepage = "https://github.com/Swordfish90/cool-retro-term"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = with stdenv.lib.platforms; linux ++ darwin; - maintainers = with stdenv.lib.maintainers; [ skeidel ]; + license = lib.licenses.gpl3Plus; + platforms = with lib.platforms; linux ++ darwin; + maintainers = with lib.maintainers; [ skeidel ]; }; } diff --git a/pkgs/applications/terminal-emulators/eterm/default.nix b/pkgs/applications/terminal-emulators/eterm/default.nix index b72b31babe0..9e2afe57907 100644 --- a/pkgs/applications/terminal-emulators/eterm/default.nix +++ b/pkgs/applications/terminal-emulators/eterm/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl , libX11, libXext, libXaw -, pkgconfig, imlib2, libast }: +, pkg-config, imlib2, libast }: stdenv.mkDerivation rec { pname = "eterm"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0g71szjklkiczxwzbjjfm59y6v9w4hp8mg7cy99z1g7qcjm0gfbj"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXext libXaw imlib2 ]; propagatedBuildInputs = [ libast ]; diff --git a/pkgs/applications/terminal-emulators/evilvte/default.nix b/pkgs/applications/terminal-emulators/evilvte/default.nix index 40e723f1682..06dafe09168 100644 --- a/pkgs/applications/terminal-emulators/evilvte/default.nix +++ b/pkgs/applications/terminal-emulators/evilvte/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, makeWrapper, pkgconfig, +{ lib, stdenv, fetchgit, makeWrapper, pkg-config, gnome2, glib, pango, cairo, gdk-pixbuf, atk, freetype, xorg, configH ? "" }: @@ -15,7 +15,7 @@ stdenv.mkDerivation { buildInputs = [ gnome2.vte glib pango gnome2.gtk cairo gdk-pixbuf atk freetype xorg.libX11 - xorg.xorgproto xorg.libXext makeWrapper pkgconfig + xorg.xorgproto xorg.libXext makeWrapper pkg-config ]; buildPhase = '' diff --git a/pkgs/applications/terminal-emulators/foot/default.nix b/pkgs/applications/terminal-emulators/foot/default.nix index 2b79c5362de..b9a8316794a 100644 --- a/pkgs/applications/terminal-emulators/foot/default.nix +++ b/pkgs/applications/terminal-emulators/foot/default.nix @@ -21,7 +21,7 @@ }: let - version = "1.6.2"; + version = "1.6.3"; # build stimuli file for PGO build and the script to generate it # independently of the foot's build, so we can cache the result @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://codeberg.org/dnkl/${pname}/archive/${version}.tar.gz"; - sha256 = "08i3jmjky5s2nnc0c95c009cym91rs4sj4876sr4xnlkb7ab4812"; + sha256 = "0rm7w29wf3gipf69qf7s42qw8857z74gsigrpz9g6vvd1x58f03m"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/terminal-emulators/germinal/default.nix b/pkgs/applications/terminal-emulators/germinal/default.nix index 12d82290b1a..1bbe87853f7 100644 --- a/pkgs/applications/terminal-emulators/germinal/default.nix +++ b/pkgs/applications/terminal-emulators/germinal/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { fixupPhase = '' runHook preFixup wrapProgram $out/bin/germinal \ - --prefix PATH ":" "${stdenv.lib.makeBinPath [ tmux ]}" \ + --prefix PATH ":" "${lib.makeBinPath [ tmux ]}" \ "''${gappsWrapperArgs[@]}" runHook postFixup ''; diff --git a/pkgs/applications/terminal-emulators/guake/default.nix b/pkgs/applications/terminal-emulators/guake/default.nix index bdb3e65ed98..62cb6707c1b 100644 --- a/pkgs/applications/terminal-emulators/guake/default.nix +++ b/pkgs/applications/terminal-emulators/guake/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , python3 , glibcLocales @@ -59,11 +59,11 @@ python3.pkgs.buildPythonApplication rec { PBR_VERSION = version; # pbr needs either .git directory, sdist, or env var makeFlags = [ - "prefix=${placeholder ''out''}" + "prefix=${placeholder "out"}" ]; preFixup = '' - gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libutempter ]}") + gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libutempter ]}") ''; meta = with lib; { diff --git a/pkgs/applications/terminal-emulators/havoc/default.nix b/pkgs/applications/terminal-emulators/havoc/default.nix index 61fd5831dc9..5df53be3b92 100644 --- a/pkgs/applications/terminal-emulators/havoc/default.nix +++ b/pkgs/applications/terminal-emulators/havoc/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, pkgconfig, libxkbcommon, wayland, wayland-protocols }: +, pkg-config, libxkbcommon, wayland, wayland-protocols }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1g05r9j6srwz1krqvzckx80jn8fm48rkb4xp68953gy9yp2skg3k"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxkbcommon wayland wayland-protocols ]; dontConfigure = true; diff --git a/pkgs/applications/terminal-emulators/hyper/default.nix b/pkgs/applications/terminal-emulators/hyper/default.nix index e5ea0a67f93..092d4a0e09e 100644 --- a/pkgs/applications/terminal-emulators/hyper/default.nix +++ b/pkgs/applications/terminal-emulators/hyper/default.nix @@ -4,7 +4,7 @@ , libxcb, nss, nspr, alsaLib, cups, expat, udev, libpulseaudio }: let - libPath = stdenv.lib.makeLibraryPath [ + libPath = lib.makeLibraryPath [ stdenv.cc.cc gtk2 gnome2.GConf atk glib pango gdk-pixbuf cairo freetype fontconfig dbus libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb libXrender libX11 libXtst libXScrnSaver nss nspr alsaLib cups expat udev libpulseaudio diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index b7541f2528d..91d7b48738e 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, substituteAll, fetchFromGitHub, python3Packages, libunistring, - harfbuzz, fontconfig, pkgconfig, ncurses, imagemagick, xsel, + harfbuzz, fontconfig, pkg-config, ncurses, imagemagick, xsel, libstartup_notification, libGL, libX11, libXrandr, libXinerama, libXcursor, libxkbcommon, libXi, libXext, wayland-protocols, wayland, lcms2, @@ -35,7 +35,7 @@ buildPythonApplication rec { harfbuzz ncurses lcms2 - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ Cocoa CoreGraphics Foundation @@ -45,21 +45,21 @@ buildPythonApplication rec { libpng python3 zlib - ] ++ stdenv.lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ fontconfig libunistring libcanberra libX11 libXrandr libXinerama libXcursor libxkbcommon libXi libXext wayland-protocols wayland dbus ]; nativeBuildInputs = [ - pkgconfig sphinx ncurses + pkg-config sphinx ncurses installShellFiles - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ imagemagick libicns # For the png2icns tool. ]; - propagatedBuildInputs = stdenv.lib.optional stdenv.isLinux libGL; + propagatedBuildInputs = lib.optional stdenv.isLinux libGL; outputs = [ "out" "terminfo" ]; @@ -68,7 +68,7 @@ buildPythonApplication rec { ]; # Causes build failure due to warning - hardeningDisable = stdenv.lib.optional stdenv.cc.isClang "strictoverflow"; + hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow"; dontConfigure = true; @@ -80,7 +80,7 @@ buildPythonApplication rec { '' else '' ${python.interpreter} setup.py linux-package \ --update-check-interval=0 \ - --egl-library='${stdenv.lib.getLib libGL}/lib/libEGL.so.1' \ + --egl-library='${lib.getLib libGL}/lib/libEGL.so.1' \ --startup-notification-library='${libstartup_notification}/lib/libstartup-notification-1.so' \ --canberra-library='${libcanberra}/lib/libcanberra.so' ''; @@ -110,7 +110,7 @@ buildPythonApplication rec { '' else '' cp -r linux-package/{bin,share,lib} $out ''} - wrapProgram "$out/bin/kitty" --prefix PATH : "$out/bin:${stdenv.lib.makeBinPath [ imagemagick xsel ncurses.dev ]}" + wrapProgram "$out/bin/kitty" --prefix PATH : "$out/bin:${lib.makeBinPath [ imagemagick xsel ncurses.dev ]}" runHook postInstall installShellCompletion --cmd kitty \ diff --git a/pkgs/applications/terminal-emulators/lilyterm/default.nix b/pkgs/applications/terminal-emulators/lilyterm/default.nix index 96029259f15..9e2d2a67b44 100644 --- a/pkgs/applications/terminal-emulators/lilyterm/default.nix +++ b/pkgs/applications/terminal-emulators/lilyterm/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, fetchFromGitHub -, pkgconfig +, pkg-config , autoconf, automake, intltool, gettext , gtk, vte , flavour ? "stable" @@ -29,13 +29,13 @@ let }; in -with stdenv.lib; +with lib; stdenv.mkDerivation rec { inherit pname; inherit (stuff) src version; - nativeBuildInputs = [ pkgconfig autoconf automake intltool gettext ]; + nativeBuildInputs = [ pkg-config autoconf automake intltool gettext ]; buildInputs = [ gtk vte ]; preConfigure = "sh autogen.sh"; diff --git a/pkgs/applications/terminal-emulators/lxterminal/default.nix b/pkgs/applications/terminal-emulators/lxterminal/default.nix index 8c002bd14b0..a62db90c9e0 100644 --- a/pkgs/applications/terminal-emulators/lxterminal/default.nix +++ b/pkgs/applications/terminal-emulators/lxterminal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, automake, autoconf, intltool, pkgconfig, gtk3, vte, wrapGAppsHook +{ lib, stdenv, fetchurl, automake, autoconf, intltool, pkg-config, gtk3, vte, wrapGAppsHook , libxslt, docbook_xml_dtd_412, docbook_xsl, libxml2, findXMLCatalogs }: @@ -19,7 +19,7 @@ stdenv.mkDerivation { ]; nativeBuildInputs = [ - automake autoconf intltool pkgconfig wrapGAppsHook + automake autoconf intltool pkg-config wrapGAppsHook libxslt docbook_xml_dtd_412 docbook_xsl libxml2 findXMLCatalogs ]; @@ -43,8 +43,8 @@ stdenv.mkDerivation { unnecessary dependencies. ''; homepage = "https://wiki.lxde.org/en/LXTerminal"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.velovix ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.velovix ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/terminal-emulators/mlterm/default.nix b/pkgs/applications/terminal-emulators/mlterm/default.nix index 9c01430d6df..94629314341 100644 --- a/pkgs/applications/terminal-emulators/mlterm/default.nix +++ b/pkgs/applications/terminal-emulators/mlterm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, autoconf, makeDesktopItem +{ stdenv, lib, fetchFromGitHub, pkg-config, autoconf, makeDesktopItem , libX11, gdk-pixbuf, cairo, libXft, gtk3, vte , harfbuzz #substituting glyphs with opentype fonts , fribidi, m17n_lib #bidi and encoding @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "1hh196kz2n3asv8r8r2bdk5b2w93zq7rw4880ciiq1554h0ib7fj"; }; - nativeBuildInputs = [ pkgconfig autoconf wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config autoconf wrapGAppsHook ]; buildInputs = [ libX11 gdk-pixbuf.dev diff --git a/pkgs/applications/terminal-emulators/mrxvt/default.nix b/pkgs/applications/terminal-emulators/mrxvt/default.nix index e273e96cbed..b0b9ee61118 100644 --- a/pkgs/applications/terminal-emulators/mrxvt/default.nix +++ b/pkgs/applications/terminal-emulators/mrxvt/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, libX11, libXft, libXi, xorgproto, libSM, libICE -, freetype, pkgconfig, which }: +, freetype, pkg-config, which }: stdenv.mkDerivation { name = "mrxvt-0.5.4"; buildInputs = - [ libX11 libXft libXi xorgproto libSM libICE freetype pkgconfig which ]; + [ libX11 libXft libXi xorgproto libSM libICE freetype pkg-config which ]; configureFlags = [ "--with-x" @@ -30,8 +30,8 @@ stdenv.mkDerivation { meta = with lib; { description = "Lightweight multitabbed feature-rich X11 terminal emulator"; longDescription = " - Multitabbed lightweight terminal emulator based on rxvt. - Supports transparency, backgroundimages, freetype fonts, ... + Multitabbed lightweight terminal emulator based on rxvt. + Supports transparency, backgroundimages, freetype fonts, ... "; homepage = "https://sourceforge.net/projects/materm"; license = licenses.gpl2; diff --git a/pkgs/applications/terminal-emulators/roxterm/default.nix b/pkgs/applications/terminal-emulators/roxterm/default.nix index 93c3ab099c9..fff534aaff1 100644 --- a/pkgs/applications/terminal-emulators/roxterm/default.nix +++ b/pkgs/applications/terminal-emulators/roxterm/default.nix @@ -1,7 +1,7 @@ { at-spi2-core, cmake, dbus, dbus-glib, docbook_xsl, epoxy, fetchpatch, fetchFromGitHub , glib, gtk3, harfbuzz, libXdmcp, libXtst, libpthreadstubs , libselinux, libsepol, libtasn1, libxkbcommon, libxslt, p11-kit, pcre2 -, pkgconfig, lib, stdenv, util-linuxMinimal, vte, wrapGAppsHook, xmlto +, pkg-config, lib, stdenv, util-linuxMinimal, vte, wrapGAppsHook, xmlto }: stdenv.mkDerivation rec { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook libxslt ]; + nativeBuildInputs = [ cmake pkg-config wrapGAppsHook libxslt ]; buildInputs = [ gtk3 dbus dbus-glib vte pcre2 harfbuzz libpthreadstubs libXdmcp diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-bidi/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-bidi/default.nix index 4b6b4eb8184..cb3843cb61e 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-bidi/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-bidi/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, perlPackages, pkgconfig, fribidi }: +{ lib, fetchurl, perlPackages, pkg-config, fribidi }: perlPackages.buildPerlPackage rec { pname = "urxvt-bidi"; @@ -9,7 +9,7 @@ perlPackages.buildPerlPackage rec { sha256 = "1w65xbi4mw5acsrpv3phyzv82ghb29kpbb3b1b1gcinlfxl6f61m"; }; - nativeBuildInputs = [ pkgconfig perlPackages.ExtUtilsPkgConfig ]; + nativeBuildInputs = [ pkg-config perlPackages.ExtUtilsPkgConfig ]; buildInputs = [ fribidi ]; postInstall = '' diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix index 6512f402ffb..82536e4b873 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, makeDesktopItem +{ lib, stdenv, fetchurl, makeDesktopItem , libX11, libXt, libXft, libXrender , ncurses, fontconfig, freetype -, pkgconfig, gdk-pixbuf, perl +, pkg-config, gdk-pixbuf, perl , perlSupport ? true , gdkPixbufSupport ? true , unicode3Support ? true @@ -23,7 +23,7 @@ let }; in -with stdenv.lib; +with lib; stdenv.mkDerivation { name = "${pname}-unwrapped-${version}"; @@ -36,7 +36,7 @@ stdenv.mkDerivation { buildInputs = [ libX11 libXt libXft ncurses # required to build the terminfo file - fontconfig freetype pkgconfig libXrender + fontconfig freetype pkg-config libXrender ] ++ optional perlSupport perl ++ optional gdkPixbufSupport gdk-pixbuf; @@ -64,7 +64,7 @@ stdenv.mkDerivation { mkdir -p $terminfo/share/terminfo export TERMINFO=$terminfo/share/terminfo '' - + stdenv.lib.optionalString perlSupport '' + + lib.optionalString perlSupport '' # make urxvt find its perl file lib/perl5/site_perl # is added to PERL5LIB automatically mkdir -p $out/$(dirname ${perl.libPrefix}) diff --git a/pkgs/applications/terminal-emulators/rxvt/default.nix b/pkgs/applications/terminal-emulators/rxvt/default.nix index 2c89940f760..0cd4f13e465 100644 --- a/pkgs/applications/terminal-emulators/rxvt/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl -, pkgconfig, libtool +, pkg-config, libtool , libX11, libXt, libXpm }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0jfl71gz3k7zh3kxdb8lxi06kajjnx7bq1rxjgk680l209jxask1"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libtool libX11 libXt libXpm ]; configurePhase = '' diff --git a/pkgs/applications/terminal-emulators/sakura/default.nix b/pkgs/applications/terminal-emulators/sakura/default.nix index 6aa1c4b44df..af56f54a414 100644 --- a/pkgs/applications/terminal-emulators/sakura/default.nix +++ b/pkgs/applications/terminal-emulators/sakura/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchurl , cmake -, pkgconfig +, pkg-config , gtk3 , perl , vte @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-cppODnUKQpS9kFkkOqxU3yqAElAVn8VQtQsP4Carkos="; }; - nativeBuildInputs = [ cmake perl pkgconfig makeWrapper ]; + nativeBuildInputs = [ cmake perl pkg-config makeWrapper ]; buildInputs = [ gtk3 vte pcre2 glib ]; diff --git a/pkgs/applications/terminal-emulators/st/default.nix b/pkgs/applications/terminal-emulators/st/default.nix index a91229f2921..4e43bed0a07 100644 --- a/pkgs/applications/terminal-emulators/st/default.nix +++ b/pkgs/applications/terminal-emulators/st/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, pkgconfig, writeText, libX11, ncurses +{ lib, stdenv, fetchurl, pkg-config, writeText, libX11, ncurses , libXft, conf ? null, patches ? [], extraLibs ? []}: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "st"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { substituteInPlace config.mk --replace "-lrt" "" ''; - nativeBuildInputs = [ pkgconfig ncurses ]; + nativeBuildInputs = [ pkg-config ncurses ]; buildInputs = [ libX11 libXft ] ++ extraLibs; installPhase = '' diff --git a/pkgs/applications/terminal-emulators/st/xst.nix b/pkgs/applications/terminal-emulators/st/xst.nix index 3e29abee5d6..9634a3be6b6 100644 --- a/pkgs/applications/terminal-emulators/st/xst.nix +++ b/pkgs/applications/terminal-emulators/st/xst.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, pkgconfig, libX11, ncurses, libXext, libXft, fontconfig }: +{ lib, stdenv, fetchFromGitHub, pkg-config, libX11, ncurses, libXext, libXft, fontconfig }: -with stdenv.lib; +with lib; let version = "0.7.2"; @@ -15,7 +15,7 @@ in stdenv.mkDerivation { sha256 = "1fplgy30gyrwkjsw3z947327r98i13zd1whwkplpj9fzckhb9vs9"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 ncurses libXext libXft fontconfig ]; installPhase = '' diff --git a/pkgs/applications/terminal-emulators/stupidterm/default.nix b/pkgs/applications/terminal-emulators/stupidterm/default.nix index 0d8c39a45f5..554d210fbde 100644 --- a/pkgs/applications/terminal-emulators/stupidterm/default.nix +++ b/pkgs/applications/terminal-emulators/stupidterm/default.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, vte, gtk, pcre2 }: +{ lib, stdenv, fetchFromGitHub, pkg-config, vte, gtk, pcre2 }: stdenv.mkDerivation { pname = "stupidterm"; version = "2019-03-26"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ vte gtk pcre2 ]; @@ -15,7 +15,7 @@ stdenv.mkDerivation { sha256 = "1f73wvqqvj5pr3fvb7jjc4bi1iwgkkknz24k8n69mdb75jnfjipp"; }; - makeFlags = [ "PKGCONFIG=${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config" "binary=stupidterm" ]; + makeFlags = [ "PKGCONFIG=${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config" "binary=stupidterm" ]; installPhase = '' install -D stupidterm $out/bin/stupidterm diff --git a/pkgs/applications/terminal-emulators/terminator/default.nix b/pkgs/applications/terminal-emulators/terminator/default.nix index 80698c56cde..433e5c30618 100644 --- a/pkgs/applications/terminal-emulators/terminator/default.nix +++ b/pkgs/applications/terminal-emulators/terminator/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , python3 , keybinder3 diff --git a/pkgs/applications/terminal-emulators/terminus/default.nix b/pkgs/applications/terminal-emulators/terminus/default.nix index 4c38e530247..67c660275f5 100644 --- a/pkgs/applications/terminal-emulators/terminus/default.nix +++ b/pkgs/applications/terminal-emulators/terminus/default.nix @@ -5,7 +5,7 @@ , nss, nspr, alsaLib, cups, expat, systemd, libpulseaudio }: let - libPath = stdenv.lib.makeLibraryPath [ + libPath = lib.makeLibraryPath [ stdenv.cc.cc gtk2 atk glib pango gdk-pixbuf cairo freetype fontconfig dbus libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb libXrender libX11 libXtst libXScrnSaver gnome2.GConf nss nspr alsaLib cups expat systemd libpulseaudio diff --git a/pkgs/applications/terminal-emulators/termite/default.nix b/pkgs/applications/terminal-emulators/termite/default.nix index 20d1ad675a8..96fd3409dc7 100644 --- a/pkgs/applications/terminal-emulators/termite/default.nix +++ b/pkgs/applications/terminal-emulators/termite/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, vte, gtk3, ncurses, pcre2, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, vte, gtk3, ncurses, pcre2, wrapGAppsHook }: let @@ -47,13 +47,13 @@ in stdenv.mkDerivation rec { url = "https://github.com/thestinger/termite/commit/7e9a93b421b9596f8980645a46ac2ad5468dac06.patch"; sha256 = "0vph2m5919f7w1xnc8i6z0j44clsm1chxkfg7l71nahxyfw5yh4j"; }) - ] ++ stdenv.lib.optional stdenv.isDarwin ./remove_ldflags_macos.patch; + ] ++ lib.optional stdenv.isDarwin ./remove_ldflags_macos.patch; makeFlags = [ "VERSION=v${version}" "PREFIX=" "DESTDIR=$(out)" ]; buildInputs = [ vte-ng gtk3 ncurses pcre2 ]; - nativeBuildInputs = [ wrapGAppsHook pkgconfig ]; + nativeBuildInputs = [ wrapGAppsHook pkg-config ]; outputs = [ "out" "terminfo" ]; diff --git a/pkgs/applications/terminal-emulators/tilix/default.nix b/pkgs/applications/terminal-emulators/tilix/default.nix index ee9eac8e267..80956a51244 100644 --- a/pkgs/applications/terminal-emulators/tilix/default.nix +++ b/pkgs/applications/terminal-emulators/tilix/default.nix @@ -4,7 +4,7 @@ , meson , ninja , python3 -, pkgconfig +, pkg-config , dmd , dconf , dbus @@ -39,7 +39,7 @@ stdenv.mkDerivation { dmd meson ninja - pkgconfig + pkg-config python3 wrapGAppsHook ]; diff --git a/pkgs/applications/terminal-emulators/wayst/default.nix b/pkgs/applications/terminal-emulators/wayst/default.nix index 99ee326aebf..dc79e48b24f 100644 --- a/pkgs/applications/terminal-emulators/wayst/default.nix +++ b/pkgs/applications/terminal-emulators/wayst/default.nix @@ -1,7 +1,7 @@ { stdenv , lib , fetchFromGitHub -, pkgconfig +, pkg-config , freetype , fontconfig , libGL @@ -13,7 +13,7 @@ , wayland , libnotify -, xdg_utils +, xdg-utils , makeDesktopItem }: @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { makeFlags = [ "INSTALL_DIR=\${out}/bin" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ fontconfig @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace src/settings.c \ - --replace xdg-open ${xdg_utils}/bin/xdg-open + --replace xdg-open ${xdg-utils}/bin/xdg-open substituteInPlace src/main.c \ --replace notify-send ${libnotify}/bin/notify-send ''; diff --git a/pkgs/applications/terminal-emulators/wezterm/default.nix b/pkgs/applications/terminal-emulators/wezterm/default.nix index a30afa1ce68..12abd98beb4 100644 --- a/pkgs/applications/terminal-emulators/wezterm/default.nix +++ b/pkgs/applications/terminal-emulators/wezterm/default.nix @@ -34,7 +34,7 @@ let zlib fontconfig freetype - ] ++ stdenv.lib.optionals (stdenv.isLinux) [ + ] ++ lib.optionals (stdenv.isLinux) [ libX11 xcbutil libxcb @@ -47,7 +47,7 @@ let wayland libGLU libGL - ] ++ stdenv.lib.optionals (stdenv.isDarwin) [ + ] ++ lib.optionals (stdenv.isDarwin) [ Foundation CoreGraphics Cocoa @@ -77,13 +77,12 @@ rustPlatform.buildRustPackage { buildInputs = runtimeDeps; - installPhase = '' - '' + stdenv.lib.optionalString stdenv.isLinux '' + installPhase = "" + lib.optionalString stdenv.isLinux '' for artifact in wezterm wezterm-gui wezterm-mux-server strip-ansi-escapes; do patchelf --set-rpath "${lib.makeLibraryPath runtimeDeps}" $releaseDir/$artifact install -D $releaseDir/$artifact -t $out/bin done - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' mkdir -p "$out/Applications" OUT_APP="$out/Applications/WezTerm.app" cp -r assets/macos/WezTerm.app "$OUT_APP" diff --git a/pkgs/applications/terminal-emulators/xterm/default.nix b/pkgs/applications/terminal-emulators/xterm/default.nix index d06a66edf1a..ba6c9bc8fdf 100644 --- a/pkgs/applications/terminal-emulators/xterm/default.nix +++ b/pkgs/applications/terminal-emulators/xterm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, xorg, ncurses, freetype, fontconfig, pkgconfig +{ lib, stdenv, fetchurl, fetchpatch, xorg, ncurses, freetype, fontconfig, pkg-config , makeWrapper, nixosTests, writeScript, common-updater-scripts, git, nixfmt, nix , gnused, coreutils, enableDecLocator ? true }: @@ -25,14 +25,14 @@ stdenv.mkDerivation rec { ncurses freetype fontconfig - pkgconfig + pkg-config xorg.libXft xorg.luit makeWrapper ]; patches = [ ./sixel-256.support.patch ] - ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch { + ++ lib.optional stdenv.hostPlatform.isMusl (fetchpatch { name = "posix-ptys.patch"; url = "https://git.alpinelinux.org/aports/plain/community/xterm/posix-ptys.patch?id=3aa532e77875fa1db18c7fcb938b16647031bcc1"; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { "--enable-mini-luit" "--with-tty-group=tty" "--with-app-defaults=$(out)/lib/X11/app-defaults" - ] ++ stdenv.lib.optional enableDecLocator "--enable-dec-locator"; + ] ++ lib.optional enableDecLocator "--enable-dec-locator"; # Work around broken "plink.sh". NIX_LDFLAGS = "-lXmu -lXt -lICE -lX11 -lfontconfig"; @@ -79,14 +79,14 @@ stdenv.mkDerivation rec { updateScript = let # Tags that end in letters are unstable - suffixes = stdenv.lib.concatStringsSep " " + suffixes = lib.concatStringsSep " " (map (c: "-c versionsort.suffix='${c}'") - (stdenv.lib.stringToCharacters "abcdefghijklmnopqrstuvwxyz")); + (lib.stringToCharacters "abcdefghijklmnopqrstuvwxyz")); in writeScript "update.sh" '' #!${stdenv.shell} set -o errexit PATH=${ - stdenv.lib.makeBinPath [ + lib.makeBinPath [ common-updater-scripts git nixfmt @@ -112,8 +112,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://invisible-island.net/xterm"; - license = with stdenv.lib.licenses; [ mit ]; - maintainers = with stdenv.lib.maintainers; [ nequissimus vrthra ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ nequissimus vrthra ]; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/terminal-emulators/xtermcontrol/default.nix b/pkgs/applications/terminal-emulators/xtermcontrol/default.nix index f7c0edf2242..821d922c6d9 100644 --- a/pkgs/applications/terminal-emulators/xtermcontrol/default.nix +++ b/pkgs/applications/terminal-emulators/xtermcontrol/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { version = "3.7"; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { To complete the feature set; xtermcontrol lets advanced users issue any xterm control sequence of their choosing. ''; homepage = "http://thrysoee.dk/xtermcontrol"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.derchris ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.derchris ]; }; } diff --git a/pkgs/applications/terminal-emulators/yaft/default.nix b/pkgs/applications/terminal-emulators/yaft/default.nix index e66f397a383..5471ee45e0a 100644 --- a/pkgs/applications/terminal-emulators/yaft/default.nix +++ b/pkgs/applications/terminal-emulators/yaft/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ncurses }: +{ lib, stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { version = "0.2.9"; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/uobikiemukot/yaft"; description = "Yet another framebuffer terminal"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.matthiasbeyer ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/version-management/bcompare/default.nix b/pkgs/applications/version-management/bcompare/default.nix index 61ea5a9ddd4..d90de1a526f 100644 --- a/pkgs/applications/version-management/bcompare/default.nix +++ b/pkgs/applications/version-management/bcompare/default.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { dontBuild = true; dontConfigure = true; + dontWrapQtApps = true; meta = with lib; { description = "GUI application that allows to quickly and easily compare files and folders"; diff --git a/pkgs/applications/version-management/bitkeeper/default.nix b/pkgs/applications/version-management/bitkeeper/default.nix index 78f62ebcf25..c185a4fb759 100644 --- a/pkgs/applications/version-management/bitkeeper/default.nix +++ b/pkgs/applications/version-management/bitkeeper/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, perl, gperf, bison, groff -, pkgconfig, libXft, pcre +{ lib, stdenv, fetchurl, perl, gperf, bison, groff +, pkg-config, libXft, pcre , libtomcrypt, libtommath, lz4 }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ perl gperf bison groff libXft pcre libtomcrypt libtommath lz4 @@ -48,9 +48,9 @@ stdenv.mkDerivation rec { scales up to very large projects and down to tiny ones. ''; homepage = "https://www.bitkeeper.org/"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ wscott thoughtpolice ]; + license = lib.licenses.asl20; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ wscott thoughtpolice ]; broken = true; # seems to fail on recent glibc versions }; } diff --git a/pkgs/applications/version-management/commitizen/node-composition.nix b/pkgs/applications/version-management/commitizen/node-composition.nix index 17879f381d5..0769168a78f 100644 --- a/pkgs/applications/version-management/commitizen/node-composition.nix +++ b/pkgs/applications/version-management/commitizen/node-composition.nix @@ -6,7 +6,7 @@ let nodeEnv = import ./node-env.nix { - inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile; + inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile; inherit nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; @@ -14,4 +14,4 @@ in import ./node-packages.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} \ No newline at end of file +} diff --git a/pkgs/applications/version-management/commitizen/node-env.nix b/pkgs/applications/version-management/commitizen/node-env.nix index 04e3ee097fa..262df27e464 100644 --- a/pkgs/applications/version-management/commitizen/node-env.nix +++ b/pkgs/applications/version-management/commitizen/node-env.nix @@ -1,6 +1,6 @@ # This file originates from node2nix -{stdenv, nodejs, python2, util-linux, libtool, runCommand, writeTextFile}: +{lib, stdenv, nodejs, python2, util-linux, libtool, runCommand, writeTextFile}: let python = if nodejs ? python then nodejs.python else python2; @@ -38,8 +38,8 @@ let }; includeDependencies = {dependencies}: - stdenv.lib.optionalString (dependencies != []) - (stdenv.lib.concatMapStrings (dependency: + lib.optionalString (dependencies != []) + (lib.concatMapStrings (dependency: '' # Bundle the dependencies of the package mkdir -p node_modules @@ -100,7 +100,7 @@ let cd "$DIR/${packageName}" ${includeDependencies { inherit dependencies; }} cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} ''; pinpointDependencies = {dependencies, production}: @@ -161,12 +161,12 @@ let '' node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"} - ${stdenv.lib.optionalString (dependencies != []) + ${lib.optionalString (dependencies != []) '' if [ -d node_modules ] then cd node_modules - ${stdenv.lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} + ${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} cd .. fi ''} @@ -183,7 +183,7 @@ let cd "${packageName}" ${pinpointDependencies { inherit dependencies production; }} cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} fi ''; @@ -344,8 +344,8 @@ let cd "${packageName}" runHook preRebuild - ${stdenv.lib.optionalString bypassCache '' - ${stdenv.lib.optionalString reconstructLock '' + ${lib.optionalString bypassCache '' + ${lib.optionalString reconstructLock '' if [ -f package-lock.json ] then echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!" @@ -361,14 +361,14 @@ let node ${addIntegrityFieldsScript} ''} - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild if [ "''${dontNpmInstall-}" != "1" ] then # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. rm -f npm-shrinkwrap.json - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} install fi ''; @@ -396,8 +396,8 @@ let stdenv.mkDerivation ({ name = "node_${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] - ++ stdenv.lib.optional (stdenv.isLinux) util-linux - ++ stdenv.lib.optional (stdenv.isDarwin) libtool + ++ lib.optional (stdenv.isLinux) util-linux + ++ lib.optional (stdenv.isDarwin) libtool ++ buildInputs; inherit nodejs; @@ -470,8 +470,8 @@ let name = "node-dependencies-${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] - ++ stdenv.lib.optional (stdenv.isLinux) util-linux - ++ stdenv.lib.optional (stdenv.isDarwin) libtool + ++ lib.optional (stdenv.isLinux) util-linux + ++ lib.optional (stdenv.isDarwin) libtool ++ buildInputs; inherit dontStrip; # Stripping may fail a build for some package deployments @@ -491,7 +491,7 @@ let # Create fake package.json to make the npm commands work properly cp ${src}/package.json . chmod 644 package.json - ${stdenv.lib.optionalString bypassCache '' + ${lib.optionalString bypassCache '' if [ -f ${src}/package-lock.json ] then cp ${src}/package-lock.json . @@ -500,13 +500,13 @@ let # Go to the parent folder to make sure that all packages are pinpointed cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} # Expose the executables that were installed cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} mv ${packageName} lib ln -s $out/lib/node_modules/.bin $out/bin @@ -516,7 +516,7 @@ let stdenv.mkDerivation { name = "node-shell-${name}-${version}"; - buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) util-linux ++ buildInputs; + buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) util-linux ++ buildInputs; buildCommand = '' mkdir -p $out/bin cat > $out/bin/shell <<EOF @@ -529,14 +529,14 @@ let # Provide the dependencies in a development shell through the NODE_PATH environment variable inherit nodeDependencies; - shellHook = stdenv.lib.optionalString (dependencies != []) '' + shellHook = lib.optionalString (dependencies != []) '' export NODE_PATH=${nodeDependencies}/lib/node_modules export PATH="${nodeDependencies}/bin:$PATH" ''; }; in { - buildNodeSourceDist = stdenv.lib.makeOverridable buildNodeSourceDist; - buildNodePackage = stdenv.lib.makeOverridable buildNodePackage; - buildNodeShell = stdenv.lib.makeOverridable buildNodeShell; + buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist; + buildNodePackage = lib.makeOverridable buildNodePackage; + buildNodeShell = lib.makeOverridable buildNodeShell; } diff --git a/pkgs/applications/version-management/commitizen/node-packages.nix b/pkgs/applications/version-management/commitizen/node-packages.nix index df50c8e473e..396dedf56fd 100644 --- a/pkgs/applications/version-management/commitizen/node-packages.nix +++ b/pkgs/applications/version-management/commitizen/node-packages.nix @@ -9068,4 +9068,4 @@ in bypassCache = true; reconstructLock = true; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/version-management/cvs-fast-export/default.nix b/pkgs/applications/version-management/cvs-fast-export/default.nix index cbd630094f0..f4957a82d44 100644 --- a/pkgs/applications/version-management/cvs-fast-export/default.nix +++ b/pkgs/applications/version-management/cvs-fast-export/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, makeWrapper, flex, bison, +{lib, stdenv, fetchurl, makeWrapper, flex, bison, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2, libxslt, python3, rcs, cvs, git, diff --git a/pkgs/applications/version-management/cvsps/default.nix b/pkgs/applications/version-management/cvsps/default.nix index 133d8d7cbb4..7423726ac3b 100644 --- a/pkgs/applications/version-management/cvsps/default.nix +++ b/pkgs/applications/version-management/cvsps/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, cvs, zlib }: +{ lib, stdenv, fetchurl, fetchpatch, cvs, zlib }: stdenv.mkDerivation rec { pname = "cvsps"; @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { installFlags = [ "prefix=$(out)" ]; meta = { - description = ''A tool to generate CVS patch set information''; + description = "A tool to generate CVS patch set information"; longDescription = '' CVSps is a program for generating `patchset' information from a CVS repository. A patchset in this case is defined as a set of @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { same time (using a single "cvs commit" command). ''; homepage = "http://www.cobite.com/cvsps/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/version-management/cvsq/default.nix b/pkgs/applications/version-management/cvsq/default.nix index a39c9ede524..89fe6e89f48 100644 --- a/pkgs/applications/version-management/cvsq/default.nix +++ b/pkgs/applications/version-management/cvsq/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , makeWrapper , cvs @@ -28,20 +28,20 @@ stdenv.mkDerivation rec { postInstall = '' substituteInPlace $out/bin/cvsq --replace "/bin/sh" "${stdenv.shell}" substituteInPlace $out/bin/lcvs --replace "/bin/sh" "${stdenv.shell}" - wrapProgram $out/bin/cvsq --prefix PATH : ${stdenv.lib.makeBinPath + wrapProgram $out/bin/cvsq --prefix PATH : ${lib.makeBinPath [ cvs nettools findutils rsync coreutils diffutils ]} - wrapProgram $out/bin/cvsq-branch --prefix PATH : ${stdenv.lib.makeBinPath + wrapProgram $out/bin/cvsq-branch --prefix PATH : ${lib.makeBinPath [ cvs nettools findutils rsync coreutils diffutils ]} - wrapProgram $out/bin/cvsq-merge --prefix PATH : ${stdenv.lib.makeBinPath + wrapProgram $out/bin/cvsq-merge --prefix PATH : ${lib.makeBinPath [ cvs nettools findutils rsync coreutils diffutils ]} - wrapProgram $out/bin/cvsq-switch --prefix PATH : ${stdenv.lib.makeBinPath + wrapProgram $out/bin/cvsq-switch --prefix PATH : ${lib.makeBinPath [ cvs nettools findutils rsync coreutils diffutils ]} - wrapProgram $out/bin/lcvs --prefix PATH : ${stdenv.lib.makeBinPath + wrapProgram $out/bin/lcvs --prefix PATH : ${lib.makeBinPath [ cvs nettools findutils rsync coreutils diffutils ]} ''; meta = { - description = ''A collection of tools to work locally with CVS''; + description = "A collection of tools to work locally with CVS"; longDescription = '' cvsq is a collection of tools to work locally with CVS. @@ -60,8 +60,8 @@ stdenv.mkDerivation rec { be used for commits (that's what cvsq is for). ''; homepage = "https://www.linta.de/~aehlig/cvsq/"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ clkamp ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ clkamp ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index d68535e0a4c..af2ed175ac8 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pname = "fossil"; - version = "2.13"; + version = "2.14"; src = fetchurl { urls = @@ -23,18 +23,18 @@ stdenv.mkDerivation rec { "https://www.fossil-scm.org/index.html/uv/fossil-src-${version}.tar.gz" ]; name = "${pname}-${version}.tar.gz"; - sha256 = "1xbk7bb7340x2vvn22ykii54v721fwk8vgr3xvjkvv8ff7hd6cyr"; + sha256 = "sha256-uNDJIBlt2K4pFS+nRI5ROh+nxYiHG3heP7/Ae0KgX7k="; }; nativeBuildInputs = [ installShellFiles tcl ]; buildInputs = [ zlib openssl readline sqlite which ed ] - ++ stdenv.lib.optional stdenv.isDarwin libiconv; + ++ lib.optional stdenv.isDarwin libiconv; doCheck = stdenv.hostPlatform == stdenv.buildPlatform; configureFlags = [ "--disable-internal-sqlite" ] - ++ stdenv.lib.optional withJson "--json"; + ++ lib.optional withJson "--json"; preCheck = '' export TCLLIBPATH="${tcllib}/lib/tcllib${tcllib.version}" diff --git a/pkgs/applications/version-management/gerrit/default.nix b/pkgs/applications/version-management/gerrit/default.nix index 164a8b85005..2c5ddca5090 100644 --- a/pkgs/applications/version-management/gerrit/default.nix +++ b/pkgs/applications/version-management/gerrit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gerrit"; - version = "3.2.3"; + version = "3.3.1"; src = fetchurl { url = "https://gerrit-releases.storage.googleapis.com/gerrit-${version}.war"; - sha256 = "0hdxbn5qqqjzpqfcydz33nc351zanxp0j2k0ivizx4dn40fnavd7"; + sha256 = "0swj3lmxwh4a0gnkirqrh7znzizsizy3cnlinhhsi319qns2szb1"; }; buildCommand = '' diff --git a/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix b/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix index 68edb8503bf..695250a5cc4 100644 --- a/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix +++ b/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix @@ -9,7 +9,7 @@ bundlerEnv rec { pname = "atlassian-stash"; - passthru.updateScript = bundlerUpdateScript "gitAndTools.bitbucket-server-cli"; + passthru.updateScript = bundlerUpdateScript "bitbucket-server-cli"; meta = with lib; { description = "A command line interface to interact with BitBucket Server (formerly Atlassian Stash)"; diff --git a/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/gemset.nix b/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/gemset.nix index a7c1406665e..844291b0905 100644 --- a/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/gemset.nix +++ b/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/gemset.nix @@ -63,4 +63,4 @@ }; version = "2.0.5"; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/version-management/git-and-tools/bump2version/default.nix b/pkgs/applications/version-management/git-and-tools/bump2version/default.nix index 393edc57dcc..47d31d6c18f 100644 --- a/pkgs/applications/version-management/git-and-tools/bump2version/default.nix +++ b/pkgs/applications/version-management/git-and-tools/bump2version/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonApplication, fetchFromGitHub, isPy27, pytest, testfixtures, lib }: +{ buildPythonApplication, fetchFromGitHub, isPy27, pytest, testfixtures, lib }: buildPythonApplication rec { pname = "bump2version"; diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix index 79c118a200c..f48fe4b1ec4 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt -, docbook_xsl, pkgconfig, luajit +{ lib, stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt +, docbook_xsl, pkg-config, luajit , coreutils, gnused, groff, docutils , gzip, bzip2, lzip, xz, zstd , python, wrapPython, pygments, markdown @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { sha256 = "09lzwa183nblr6l8ib35g2xrjf9wm9yhk3szfvyzkwivdv69c9r2"; }; - nativeBuildInputs = [ pkgconfig ] ++ [ python wrapPython ]; + nativeBuildInputs = [ pkg-config ] ++ [ python wrapPython ]; buildInputs = [ openssl zlib asciidoc libxml2 libxslt docbook_xsl luajit ]; @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { wrapPythonProgramsIn "$out/lib/cgit/filters" "$out $pythonPath" for script in $out/lib/cgit/filters/*.sh $out/lib/cgit/filters/html-converters/txt2html; do - wrapProgram $script --prefix PATH : '${stdenv.lib.makeBinPath [ coreutils gnused ]}' + wrapProgram $script --prefix PATH : '${lib.makeBinPath [ coreutils gnused ]}' done ''; @@ -75,8 +75,8 @@ stdenv.mkDerivation rec { homepage = "https://git.zx2c4.com/cgit/about/"; repositories.git = "git://git.zx2c4.com/cgit"; description = "Web frontend for git repositories"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ bjornfor ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ bjornfor ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix b/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix index 22d289d549a..f4b7d38bebc 100644 --- a/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, ruby, gnugrep, diffutils, git, darcs }: +{ lib, stdenv, fetchgit, ruby, gnugrep, diffutils, git, darcs }: stdenv.mkDerivation { pname = "darcs-to-git"; @@ -74,7 +74,7 @@ stdenv.mkDerivation { meta = { description = "Converts a Darcs repository into a Git repository"; homepage = "http://www.sanityinc.com/articles/converting-darcs-repositories-to-git"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.mit; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix deleted file mode 100644 index 2b0efdf6904..00000000000 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ /dev/null @@ -1,270 +0,0 @@ -/* All git-relates tools live here, in a separate attribute set so that users - * can get a fast overview over what's available. - */ -args @ {config, lib, pkgs}: with args; with pkgs; -let - gitBase = callPackage ./git { - svnSupport = false; # for git-svn support - guiSupport = false; # requires tcl/tk - sendEmailSupport = false; # requires plenty of perl libraries - perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey]; - smtpPerlLibs = [ - perlPackages.libnet perlPackages.NetSMTPSSL - perlPackages.IOSocketSSL perlPackages.NetSSLeay - perlPackages.AuthenSASL perlPackages.DigestHMAC - ]; - }; - - self = rec { - # Try to keep this generally alphabetized - - bfg-repo-cleaner = callPackage ./bfg-repo-cleaner { }; - - bitbucket-server-cli = callPackage ./bitbucket-server-cli { }; - - bump2version = pkgs.python37Packages.callPackage ./bump2version { }; - - darcs-to-git = callPackage ./darcs-to-git { }; - - delta = callPackage ./delta { - inherit (darwin.apple_sdk.frameworks) Security; - }; - - diff-so-fancy = callPackage ./diff-so-fancy { }; - - gh = callPackage ./gh { }; - - ghorg = callPackage ./ghorg { }; - - ghq = callPackage ./ghq { }; - - ghr = callPackage ./ghr { }; - - git = appendToName "minimal" gitBase; - - git-absorb = callPackage ./git-absorb { - inherit (darwin.apple_sdk.frameworks) Security; - }; - - git-annex = pkgs.haskellPackages.git-annex; - - git-annex-metadata-gui = libsForQt5.callPackage ./git-annex-metadata-gui { - inherit (python3Packages) buildPythonApplication pyqt5 git-annex-adapter; - }; - - git-annex-remote-b2 = callPackage ./git-annex-remote-b2 { }; - - git-annex-remote-dbx = callPackage ./git-annex-remote-dbx { - inherit (python3Packages) - buildPythonApplication - fetchPypi - dropbox - annexremote - humanfriendly; - }; - - git-annex-remote-rclone = callPackage ./git-annex-remote-rclone { }; - - git-annex-utils = callPackage ./git-annex-utils { }; - - git-brunch = pkgs.haskellPackages.git-brunch; - - git-appraise = callPackage ./git-appraise {}; - - git-bug = callPackage ./git-bug { }; - - # support for bugzilla - git-bz = callPackage ./git-bz { }; - - git-chglog = callPackage ./git-chglog { }; - - git-cinnabar = callPackage ./git-cinnabar { }; - - git-codeowners = callPackage ./git-codeowners { }; - - git-codereview = callPackage ./git-codereview { }; - - git-cola = callPackage ./git-cola { }; - - git-crypt = callPackage ./git-crypt { }; - - git-delete-merged-branches = callPackage ./git-delete-merged-branches { }; - - git-dit = callPackage ./git-dit { - inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; - }; - - git-doc = lib.addMetaAttrs { - description = "Additional documentation for Git"; - longDescription = '' - This package contains additional documentation (HTML and text files) that - is referenced in the man pages of Git. - ''; - } gitFull.doc; - - git-extras = callPackage ./git-extras { }; - - git-fame = callPackage ./git-fame {}; - - git-fast-export = callPackage ./fast-export { mercurial = mercurial_4; }; - - git-filter-repo = callPackage ./git-filter-repo { - pythonPackages = python3Packages; - }; - - git-gone = callPackage ./git-gone { - inherit (darwin.apple_sdk.frameworks) Security; - }; - - git-hub = callPackage ./git-hub { }; - - git-ignore = callPackage ./git-ignore { }; - - git-imerge = python3Packages.callPackage ./git-imerge { }; - - git-interactive-rebase-tool = callPackage ./git-interactive-rebase-tool { - inherit (darwin.apple_sdk.frameworks) Security; - }; - - git-machete = python3Packages.callPackage ./git-machete { }; - - git-my = callPackage ./git-my { }; - - git-octopus = callPackage ./git-octopus { }; - - git-open = callPackage ./git-open { }; - - git-radar = callPackage ./git-radar { }; - - git-recent = callPackage ./git-recent { - util-linux = if stdenv.isLinux then util-linuxMinimal else util-linux; - }; - - git-remote-codecommit = python3Packages.callPackage ./git-remote-codecommit { }; - - git-remote-gcrypt = callPackage ./git-remote-gcrypt { }; - - git-remote-hg = callPackage ./git-remote-hg { }; - - git-reparent = callPackage ./git-reparent { }; - - git-secret = callPackage ./git-secret { }; - - git-secrets = callPackage ./git-secrets { }; - - git-standup = callPackage ./git-standup { }; - - git-stree = callPackage ./git-stree { }; - - git-subrepo = callPackage ./git-subrepo { }; - - git-subset = callPackage ./git-subset { - inherit (darwin.apple_sdk.frameworks) Security; - }; - - git-subtrac = callPackage ./git-subtrac { }; - - git-sync = callPackage ./git-sync { }; - - git-test = callPackage ./git-test { }; - - git-trim = callPackage ./git-trim { - inherit (darwin.apple_sdk.frameworks) Security; - }; - - git-when-merged = callPackage ./git-when-merged { }; - - git-workspace = callPackage ./git-workspace { - inherit (darwin.apple_sdk.frameworks) Security; - }; - - git2cl = callPackage ./git2cl { }; - - # The full-featured Git. - gitFull = gitBase.override { - svnSupport = true; - guiSupport = true; - sendEmailSupport = true; - withLibsecret = !stdenv.isDarwin; - }; - - # Git with SVN support, but without GUI. - gitSVN = lowPrio (appendToName "with-svn" (gitBase.override { - svnSupport = true; - })); - - gita = python3Packages.callPackage ./gita {}; - - gitbatch = callPackage ./gitbatch { }; - - gitflow = callPackage ./gitflow { }; - - gitin = callPackage ./gitin { }; - - gitstatus = callPackage ./gitstatus { }; - - gitui = callPackage ./gitui { - inherit (darwin.apple_sdk.frameworks) Security AppKit; - inherit (pkgs) openssl perl; - }; - - glab = callPackage ./glab { }; - - grv = callPackage ./grv { }; - - hub = callPackage ./hub { }; - - lab = callPackage ./lab { }; - - lefthook = callPackage ./lefthook { - # Please use empty attrset once upstream bugs have been fixed - # https://github.com/Arkweid/lefthook/issues/151 - buildGoModule = buildGo114Module; - }; - - legit = callPackage ./legit { }; - - pass-git-helper = python3Packages.callPackage ./pass-git-helper { }; - - pre-commit = pkgs.python3Packages.toPythonApplication pkgs.python3Packages.pre-commit; - - qgit = qt5.callPackage ./qgit { }; - - rs-git-fsmonitor = callPackage ./rs-git-fsmonitor { }; - - scmpuff = callPackage ./scmpuff { }; - - stgit = callPackage ./stgit { }; - - subgit = callPackage ./subgit { }; - - svn-all-fast-export = libsForQt5.callPackage ./svn-all-fast-export { }; - - svn2git = callPackage ./svn2git { - git = gitSVN; - }; - - thicket = callPackage ./thicket { }; - - tig = callPackage ./tig { }; - - top-git = callPackage ./topgit { }; - - transcrypt = callPackage ./transcrypt { }; - - git-vanity-hash = callPackage ./git-vanity-hash { }; - - ydiff = pkgs.python3.pkgs.toPythonApplication pkgs.python3.pkgs.ydiff; - -} // lib.optionalAttrs (config.allowAliases or true) (with self; { - # aliases - darcsToGit = darcs-to-git; - gitAnnex = git-annex; - gitBrunch = git-brunch; - gitFastExport = git-fast-export; - gitRemoteGcrypt = git-remote-gcrypt; - svn_all_fast_export = svn-all-fast-export; - topGit = top-git; -}); -in - self diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index 7ba8a652d80..38413f990a0 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "08gxx9dwk24r1c5jkc9mqzcicxqmrdw0bi94nr517hk5cqsav2sl"; + sha256 = "1f23b8bn867b4zihz8m91xmkclcw1jnqkwi06klhm5576akahigq"; }; - vendorSha256 = "1ih7z883pffb6hnx51h8823d95b52d6dy1gk6ln7j25fqhcfvsy8"; + vendorSha256 = "00adc0xjrkjrjh0gxk55vhpgxb5x0j5ialzrdvhlrvhpnb44qrcq"; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-and-tools/ghorg/default.nix b/pkgs/applications/version-management/git-and-tools/ghorg/default.nix index f7ce118bbc7..4bfe06fee74 100644 --- a/pkgs/applications/version-management/git-and-tools/ghorg/default.nix +++ b/pkgs/applications/version-management/git-and-tools/ghorg/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "ghorg"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "gabrie30"; repo = "ghorg"; rev = version; - sha256 = "0diwndkckv6fga45j9zngizycn5m71r67cziv0zrx6c66ssbj49w"; + sha256 = "sha256-OoNHKDxYKTmfm1rrQxG7PnH7DINa2M/NKc/5iKaUybg="; }; doCheck = false; diff --git a/pkgs/applications/version-management/git-and-tools/ghq/default.nix b/pkgs/applications/version-management/git-and-tools/ghq/default.nix index 96f72f2d69c..f56ce386e42 100644 --- a/pkgs/applications/version-management/git-and-tools/ghq/default.nix +++ b/pkgs/applications/version-management/git-and-tools/ghq/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "ghq"; @@ -28,7 +28,7 @@ buildGoModule rec { meta = { description = "Remote repository management made easy"; homepage = "https://github.com/x-motemen/ghq"; - maintainers = with stdenv.lib.maintainers; [ sigma ]; - license = stdenv.lib.licenses.mit; + maintainers = with lib.maintainers; [ sigma ]; + license = lib.licenses.mit; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix b/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix index c4824b6c66f..2d6d7401e28 100644 --- a/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; cargoSha256 = "0h0vlz4qd8i9bf1mgjr618zbdwfp6bmy7ql9a1xzjmfdpkl3cgk9"; diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix index 1908b753924..4d57820c84e 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, fetchFromGitHub, pyqt5, qt5, git-annex-adapter }: +{ lib, buildPythonApplication, fetchFromGitHub, pyqt5, qt5, git-annex-adapter }: buildPythonApplication rec { pname = "git-annex-metadata-gui"; diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix index 55a9dd18f72..6d3b6554733 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "git-annex-remote-b2"; - version = "20151212-${stdenv.lib.strings.substring 0 7 rev}"; + version = "20151212-${lib.strings.substring 0 7 rev}"; rev = "4db46b9fc9ef7b3f4851c2a6b061cb8f90f553ba"; goPackagePath = "github.com/encryptio/git-annex-remote-b2"; diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix index ea44d7278f3..843a8d34881 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp git-annex-remote-rclone $out/bin wrapProgram "$out/bin/git-annex-remote-rclone" \ - --prefix PATH ":" "${stdenv.lib.makeBinPath [ rclone ]}" + --prefix PATH ":" "${lib.makeBinPath [ rclone ]}" ''; meta = with lib; { diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-utils/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-utils/default.nix index bcfc33e55e4..7ad040a7c17 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex-utils/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoconf, automake, libtool, gmp }: +{ lib, stdenv, fetchgit, autoconf, automake, libtool, gmp }: stdenv.mkDerivation rec { pname = "git-annex-utils"; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { Currently there is only one utility gadu, a du like utility for annexed files. ''; homepage = "http://git-annex.mysteryvortex.com/git-annex-utils.html"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ woffs ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ woffs ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix b/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix index 4895a2e399b..33580712932 100644 --- a/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "git-appraise-unstable"; @@ -17,7 +17,7 @@ buildGoPackage rec { meta = { description = "Distributed code review system for Git repos"; homepage = "https://github.com/google/git-appraise"; - license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.vdemeester ]; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.vdemeester ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix b/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix index cd35c98a969..35aada8b870 100644 --- a/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix @@ -1,30 +1,27 @@ -{ fetchFromGitHub, python2Packages, stdenv, git, graphviz }: +{ python3Packages, lib, git, graphviz }: -python2Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "git-big-picture"; - version = "0.10.1"; + version = "1.1.1"; + format = "wheel"; - src = fetchFromGitHub { - owner = "esc"; - repo = pname; - rev = "v${version}"; - sha256 = "0b0zdq7d7k7f6p3wwc799347fraphbr20rxd1ysnc4xi1cj4wpmi"; + src = python3Packages.fetchPypi { + inherit format version; + pname = "git_big_picture"; # underscores needed for working download URL + python = "py3"; # i.e. no Python 2.7 + sha256 = "a20a480057ced1585c4c38497d27a5012f12dd29697313f0bb8fa6ddbb5c17d8"; }; - buildInputs = [ git graphviz ]; - - checkInputs = [ git ]; - postFixup = '' wrapProgram $out/bin/git-big-picture \ - --prefix PATH ":" ${ stdenv.lib.makeBinPath buildInputs } + --prefix PATH ":" ${ lib.makeBinPath [ git graphviz ] } ''; meta = { description = "Tool for visualization of Git repositories"; - homepage = "https://github.com/esc/git-big-picture"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.nthorne ]; + homepage = "https://github.com/git-big-picture/git-big-picture"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.nthorne ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix index 9ca5c707b5c..7a24fe8e035 100644 --- a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "git-bug"; diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix index e7e0e009d11..5e105ad9dd3 100644 --- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, gettext, git, qt5 }: +{ lib, fetchFromGitHub, python3Packages, gettext, git, qt5 }: let inherit (python3Packages) buildPythonApplication pyqt5 sip pyinotify; diff --git a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix index e41a8b3a525..fb3f555cb13 100644 --- a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix @@ -5,7 +5,7 @@ , libssh , cmake , perl -, pkgconfig +, pkg-config , rustPlatform , curl , libiconv @@ -30,7 +30,7 @@ buildRustPackage rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config perl ]; @@ -38,7 +38,7 @@ buildRustPackage rec { openssl_1_0_2 libssh zlib - ] ++ stdenv.lib.optionals (stdenv.isDarwin) [ + ] ++ lib.optionals (stdenv.isDarwin) [ curl libiconv CoreFoundation diff --git a/pkgs/applications/version-management/git-and-tools/git-fame/default.nix b/pkgs/applications/version-management/git-and-tools/git-fame/default.nix index 6084d496a56..4dc9c4f8453 100644 --- a/pkgs/applications/version-management/git-and-tools/git-fame/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-fame/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, bundlerEnv, ruby, bundlerUpdateScript }: +{ lib, bundlerEnv, ruby, bundlerUpdateScript }: bundlerEnv { inherit ruby; @@ -7,7 +7,7 @@ bundlerEnv { gemdir = ./.; - passthru.updateScript = bundlerUpdateScript "gitAndTools.git-fame"; + passthru.updateScript = bundlerUpdateScript "git-fame"; meta = with lib; { description = '' diff --git a/pkgs/applications/version-management/git-and-tools/git-fame/gemset.nix b/pkgs/applications/version-management/git-and-tools/git-fame/gemset.nix index 49b4af4ef6d..07dd36ac68a 100644 --- a/pkgs/applications/version-management/git-and-tools/git-fame/gemset.nix +++ b/pkgs/applications/version-management/git-and-tools/git-fame/gemset.nix @@ -57,4 +57,4 @@ }; version = "2.1.2"; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix index f08f57ee8be..c7453aff85b 100644 --- a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, pkgconfig, makeWrapper, openssl, git, libiconv, Security, installShellFiles }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, makeWrapper, openssl, git, libiconv, Security, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "git-gone"; @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1g2jijx8y34lid9qwa26v4svab5v9ki6gn9vcfiy61dqa964c3l9"; - nativeBuildInputs = [ pkgconfig makeWrapper installShellFiles ]; + nativeBuildInputs = [ pkg-config makeWrapper installShellFiles ]; buildInputs = [ openssl ] - ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; + ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; postInstall = '' installManPage git-gone.1 ''; postFixup = '' - wrapProgram $out/bin/git-gone --prefix PATH : "${stdenv.lib.makeBinPath [ git ]}" + wrapProgram $out/bin/git-gone --prefix PATH : "${lib.makeBinPath [ git ]}" ''; meta = with lib; { diff --git a/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix b/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix index 4ef97a30a1f..b01976f7632 100644 --- a/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix @@ -1,23 +1,23 @@ -{ lib, stdenv, fetchFromGitHub, installShellFiles, rustPlatform, pkgconfig, openssl, darwin }: +{ lib, stdenv, fetchFromGitHub, installShellFiles, rustPlatform, pkg-config, openssl, darwin }: with rustPlatform; buildRustPackage rec { pname = "git-ignore"; - version = "1.0.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "sondr3"; repo = pname; rev = "v${version}"; - sha256 = "0krz50pw9bkyzl78bvppk6skbpjp8ga7bd34jya4ha1xfmd8p89c"; + sha256 = "sha256-bKIBPqGKiS3ey8vH2F4EoleV1H2PTOp+71d/YW3jkT0="; }; - cargoSha256 = "0vcg2pl0s329fr8p23pwdx2jy7qahbr7n337ib61f69aaxi1xmq0"; + cargoSha256 = "sha256-D1CIITuZSAsKYsK8U0q8HwPsYCyrfkTXZThxufEEkWU="; - nativeBuildInputs = [ pkgconfig installShellFiles ]; + nativeBuildInputs = [ pkg-config installShellFiles ]; buildInputs = [ openssl ] - ++ stdenv.lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix b/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix index 2b76fb3dea5..1d669bfe49c 100644 --- a/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0jc6mhszxmwsdjk73wkfi0jjp9vkzzl9kk0dbnry6w7dyr5if8cc"; - buildInputs = [ ncurses5 ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = [ ncurses5 ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; cargoParallelTestThreads = false; diff --git a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix index 3fb8b2f35e8..7f2163e67d6 100644 --- a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix @@ -4,11 +4,11 @@ buildPythonApplication rec { pname = "git-machete"; - version = "2.15.9"; + version = "2.16.1"; src = fetchPypi { inherit pname version; - sha256 = "0sg9ci9q1v3975855vi491ass72ladp3bjj2mvg77yxj13g3qqsx"; + sha256 = "00xh3q3gmi88qcl0a61pw532iyw4xcls5h336cjzld70ps2r89g4"; }; nativeBuildInputs = [ installShellFiles pbr ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix b/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix index d5278d9d241..942a12e239b 100644 --- a/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, git, perl, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, git, perl, makeWrapper }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "git-octopus"; diff --git a/pkgs/applications/version-management/git-and-tools/git-open/default.nix b/pkgs/applications/version-management/git-and-tools/git-open/default.nix index ac28e555950..5e5bba3df72 100644 --- a/pkgs/applications/version-management/git-and-tools/git-open/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-open/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, git, xdg_utils, gnugrep, fetchFromGitHub, makeWrapper}: +{lib, stdenv, git, xdg-utils, gnugrep, fetchFromGitHub, makeWrapper}: stdenv.mkDerivation rec { pname = "git-open"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp git-open $out/bin wrapProgram $out/bin/git-open \ - --prefix PATH : "${stdenv.lib.makeBinPath [ git xdg_utils gnugrep ]}" + --prefix PATH : "${lib.makeBinPath [ git xdg-utils gnugrep ]}" ''; meta = with lib; { diff --git a/pkgs/applications/version-management/git-and-tools/git-recent/default.nix b/pkgs/applications/version-management/git-and-tools/git-recent/default.nix index b3a371063f3..2ecc5d872b8 100644 --- a/pkgs/applications/version-management/git-and-tools/git-recent/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-recent/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp git-recent $out/bin wrapProgram $out/bin/git-recent \ - --prefix PATH : "${stdenv.lib.makeBinPath [ git less util-linux ]}" + --prefix PATH : "${lib.makeBinPath [ git less util-linux ]}" ''; meta = with lib; { diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix index 16efc8cbca1..93dc314fa3d 100644 --- a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "git-remote-gcrypt"; - version = "1.3"; + version = "1.4"; rev = version; src = fetchFromGitHub { inherit rev; owner = "spwhitton"; repo = "git-remote-gcrypt"; - sha256 = "0n8fzvr6y0pxrbvkywlky2bd8jvi0ayp4n9hwi84l1ldmv4a40dh"; + sha256 = "sha256-uHgz8Aj5w8UOo/XbptCRKON1RAdDfFsLL9ZDEF1QrPQ="; }; outputs = [ "out" "man" ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { installPhase = '' prefix="$out" ./install.sh wrapProgram "$out/bin/git-remote-gcrypt" \ - --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg curl rsync coreutils + --prefix PATH ":" "${lib.makeBinPath [ gnupg curl rsync coreutils gawk gnused gnugrep ]}" ''; diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix index dd4e6e011a6..69689a49a92 100644 --- a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, python3Packages +{ lib, fetchFromGitHub, python3Packages , asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt, libxml2 }: diff --git a/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix b/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix index 7bc4a05e53c..037de14658d 100644 --- a/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; postFixup = '' - wrapProgram $out/bin/git-reparent --prefix PATH : "${stdenv.lib.makeBinPath [ git gnused ]}" + wrapProgram $out/bin/git-reparent --prefix PATH : "${lib.makeBinPath [ git gnused ]}" ''; meta = with lib; { diff --git a/pkgs/applications/version-management/git-and-tools/git-secret/default.nix b/pkgs/applications/version-management/git-and-tools/git-secret/default.nix index fe67aca55d1..eea7bed011b 100644 --- a/pkgs/applications/version-management/git-and-tools/git-secret/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-secret/default.nix @@ -29,8 +29,8 @@ in stdenv.mkDerivation { meta = { description = "A bash-tool to store your private data inside a git repository"; homepage = "https://git-secret.io"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.lo1tuma ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.lo1tuma ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix b/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix index 90c2b884226..154a4048e0a 100644 --- a/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { install -m444 -Dt $out/share/man/man1 git-secrets.1 wrapProgram $out/bin/git-secrets \ - --prefix PATH : "${stdenv.lib.makeBinPath [ git coreutils ]}" + --prefix PATH : "${lib.makeBinPath [ git coreutils ]}" ''; meta = with lib; { diff --git a/pkgs/applications/version-management/git-and-tools/git-standup/default.nix b/pkgs/applications/version-management/git-and-tools/git-standup/default.nix index 541baee50a7..2bbf7840138 100644 --- a/pkgs/applications/version-management/git-and-tools/git-standup/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-standup/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { install -Dm755 -t $out/bin git-standup wrapProgram $out/bin/git-standup \ - --prefix PATH : "${stdenv.lib.makeBinPath [ git ]}" + --prefix PATH : "${lib.makeBinPath [ git ]}" ''; meta = with lib; { diff --git a/pkgs/applications/version-management/git-and-tools/git-subset/default.nix b/pkgs/applications/version-management/git-and-tools/git-subset/default.nix index dd6902af243..204ded65fd3 100644 --- a/pkgs/applications/version-management/git-and-tools/git-subset/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-subset/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ curl libiconv Security ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ curl libiconv Security ]; meta = with lib; { description = "Super fast Git tree filtering"; diff --git a/pkgs/applications/version-management/git-and-tools/git-sync/default.nix b/pkgs/applications/version-management/git-and-tools/git-sync/default.nix index bba35509555..87cb7452c75 100644 --- a/pkgs/applications/version-management/git-and-tools/git-sync/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-sync/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, coreutils, gnugrep, gnused, makeWrapper, git +{ lib, stdenv, fetchFromGitHub, coreutils, gnugrep, gnused, makeWrapper, git }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { cp -a git-sync $out/bin/git-sync ''; - wrapperPath = with stdenv.lib; makeBinPath [ + wrapperPath = with lib; makeBinPath [ coreutils git gnugrep @@ -38,8 +38,8 @@ stdenv.mkDerivation rec { meta = { description = "A script to automatically synchronize a git repository"; homepage = "https://github.com/simonthum/git-sync"; - maintainers = with stdenv.lib.maintainers; [ imalison ]; - license = stdenv.lib.licenses.cc0; - platforms = with stdenv.lib.platforms; unix; + maintainers = with lib.maintainers; [ imalison ]; + license = lib.licenses.cc0; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-test/default.nix b/pkgs/applications/version-management/git-and-tools/git-test/default.nix index de345f17cf0..624ce561690 100644 --- a/pkgs/applications/version-management/git-and-tools/git-test/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-test/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { install -m444 -Dt $out/share/man/man1 git-test.1 wrapProgram $out/bin/git-test \ - --prefix PATH : "${stdenv.lib.makeBinPath [ git ]}" + --prefix PATH : "${lib.makeBinPath [ git ]}" ''; meta = with lib; { diff --git a/pkgs/applications/version-management/git-and-tools/git-trim/default.nix b/pkgs/applications/version-management/git-and-tools/git-trim/default.nix index d827797b33a..d470b63a0b7 100644 --- a/pkgs/applications/version-management/git-and-tools/git-trim/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-trim/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; postInstall = '' install -Dm644 -t $out/share/man/man1/ docs/git-trim.1 diff --git a/pkgs/applications/version-management/git-and-tools/git-vanity-hash/default.nix b/pkgs/applications/version-management/git-and-tools/git-vanity-hash/default.nix index 77e07743616..85a84103118 100644 --- a/pkgs/applications/version-management/git-and-tools/git-vanity-hash/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-vanity-hash/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "git-vanity-hash"; diff --git a/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix b/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix index aa869c754dc..9b2853551c2 100644 --- a/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix @@ -2,24 +2,24 @@ , fetchFromGitHub , rustPlatform , Security -, pkgconfig, openssl +, pkg-config, openssl }: rustPlatform.buildRustPackage rec { pname = "git-workspace"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "orf"; repo = pname; rev = "v${version}"; - sha256 = "1ckfk221ag6yhbqxfz432wpgbhddgzgdsaxhl1ymw90pwpnz717y"; + sha256 = "sha256-//EyGhuE8rMRL03TtECIi0X51/p/GvTqvr2FRQEIqFA="; }; - cargoSha256 = "0zkns037vgy96ybmn80px515ivz6yhj5br5mwbvxgl73va92wd9v"; + cargoSha256 = "sha256-lvxEYjVMJoAFFRG5iVfGwxUeJObIxfEaWokk69l++nI="; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; meta = with lib; { description = "Sync personal and work git repositories from multiple providers"; diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 8c7f323cbb6..90f6ba5ac5a 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, buildPackages +{ fetchurl, lib, stdenv, buildPackages , fetchpatch , curl, openssl, zlib, expat, perlPackages, python3, gettext, cpio , gnugrep, gnused, gawk, coreutils # needed at runtime by git-filter-branch etc @@ -15,7 +15,7 @@ , sendEmailSupport , darwin , withLibsecret ? false -, pkgconfig, glib, libsecret +, pkg-config, glib, libsecret , gzip # needed at runtime by gitweb.cgi }: @@ -38,7 +38,7 @@ stdenv.mkDerivation { sha256 = "06ad6dylgla34k9am7d5z8y3rryc8ln3ibq5z0d74rcm20hm0wsm"; }; - outputs = [ "out" ] ++ stdenv.lib.optional withManual "doc"; + outputs = [ "out" ] ++ lib.optional withManual "doc"; hardeningDisable = [ "format" ]; @@ -66,20 +66,20 @@ stdenv.mkDerivation { ''; nativeBuildInputs = [ gettext perlPackages.perl ] - ++ stdenv.lib.optionals withManual [ asciidoctor texinfo xmlto docbook2x + ++ lib.optionals withManual [ asciidoctor texinfo xmlto docbook2x docbook_xsl docbook_xsl_ns docbook_xml_dtd_45 libxslt ]; buildInputs = [curl openssl zlib expat cpio makeWrapper libiconv] - ++ stdenv.lib.optionals perlSupport [ perlPackages.perl ] - ++ stdenv.lib.optionals guiSupport [tcl tk] - ++ stdenv.lib.optionals withpcre2 [ pcre2 ] - ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.Security ] - ++ stdenv.lib.optionals withLibsecret [ pkgconfig glib libsecret ]; + ++ lib.optionals perlSupport [ perlPackages.perl ] + ++ lib.optionals guiSupport [tcl tk] + ++ lib.optionals withpcre2 [ pcre2 ] + ++ lib.optionals stdenv.isDarwin [ darwin.Security ] + ++ lib.optionals withLibsecret [ pkg-config glib libsecret ]; # required to support pthread_cancel() - NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.cc.isClang) "-lgcc_s" - + stdenv.lib.optionalString (stdenv.isFreeBSD) "-lthr"; + NIX_LDFLAGS = lib.optionalString (!stdenv.cc.isClang) "-lgcc_s" + + lib.optionalString (stdenv.isFreeBSD) "-lthr"; - configureFlags = stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + configureFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "ac_cv_fread_reads_directories=yes" "ac_cv_snprintf_returns_bogus=no" "ac_cv_iconv_omits_bom=no" @@ -96,11 +96,11 @@ stdenv.mkDerivation { ] ++ (if perlSupport then ["PERL_PATH=${perlPackages.perl}/bin/perl"] else ["NO_PERL=1"]) ++ (if pythonSupport then ["PYTHON_PATH=${python3}/bin/python"] else ["NO_PYTHON=1"]) - ++ stdenv.lib.optionals stdenv.isSunOS ["INSTALL=install" "NO_INET_NTOP=" "NO_INET_PTON="] + ++ lib.optionals stdenv.isSunOS ["INSTALL=install" "NO_INET_NTOP=" "NO_INET_PTON="] ++ (if stdenv.isDarwin then ["NO_APPLE_COMMON_CRYPTO=1"] else ["sysconfdir=/etc"]) - ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl ["NO_SYS_POLL_H=1" "NO_GETTEXT=YesPlease"] - ++ stdenv.lib.optional withpcre2 "USE_LIBPCRE2=1" - ++ stdenv.lib.optional (!nlsSupport) "NO_GETTEXT=1" + ++ lib.optionals stdenv.hostPlatform.isMusl ["NO_SYS_POLL_H=1" "NO_GETTEXT=YesPlease"] + ++ lib.optional withpcre2 "USE_LIBPCRE2=1" + ++ lib.optional (!nlsSupport) "NO_GETTEXT=1" # git-gui refuses to start with the version of tk distributed with # macOS Catalina. We can prevent git from building the .app bundle # by specifying an invalid tk framework. The postInstall step will @@ -108,16 +108,16 @@ stdenv.mkDerivation { # acceptable version. # # See https://github.com/Homebrew/homebrew-core/commit/dfa3ccf1e7d3901e371b5140b935839ba9d8b706 - ++ stdenv.lib.optional stdenv.isDarwin "TKFRAMEWORK=/nonexistent"; + ++ lib.optional stdenv.isDarwin "TKFRAMEWORK=/nonexistent"; postBuild = '' make -C contrib/subtree - '' + (stdenv.lib.optionalString perlSupport '' + '' + (lib.optionalString perlSupport '' make -C contrib/diff-highlight - '') + (stdenv.lib.optionalString stdenv.isDarwin '' + '') + (lib.optionalString stdenv.isDarwin '' make -C contrib/credential/osxkeychain - '') + (stdenv.lib.optionalString withLibsecret '' + '') + (lib.optionalString withLibsecret '' make -C contrib/credential/libsecret ''); @@ -129,11 +129,11 @@ stdenv.mkDerivation { installFlags = [ "NO_INSTALL_HARDLINKS=1" ]; - preInstall = (stdenv.lib.optionalString stdenv.isDarwin '' + preInstall = (lib.optionalString stdenv.isDarwin '' mkdir -p $out/bin ln -s $out/share/git/contrib/credential/osxkeychain/git-credential-osxkeychain $out/bin/ rm -f $PWD/contrib/credential/osxkeychain/git-credential-osxkeychain.o - '') + (stdenv.lib.optionalString withLibsecret '' + '') + (lib.optionalString withLibsecret '' mkdir -p $out/bin ln -s $out/share/git/contrib/credential/libsecret/git-credential-libsecret $out/bin/ rm -f $PWD/contrib/credential/libsecret/git-credential-libsecret.o @@ -146,7 +146,7 @@ stdenv.mkDerivation { } # Install git-subtree. - make -C contrib/subtree install ${stdenv.lib.optionalString withManual "USE_ASCIIDOCTOR=1 install-doc"} + make -C contrib/subtree install ${lib.optionalString withManual "USE_ASCIIDOCTOR=1 install-doc"} rm -rf contrib/subtree # Install contrib stuff. @@ -170,7 +170,7 @@ stdenv.mkDerivation { '${gnugrep}/bin/grep', '${gnused}/bin/sed', '${gawk}/bin/awk', '${coreutils}/bin/cut', '${coreutils}/bin/basename', '${coreutils}/bin/dirname', '${coreutils}/bin/wc', '${coreutils}/bin/tr' - ${stdenv.lib.optionalString perlSupport ", '${perlPackages.perl}/bin/perl'"} + ${lib.optionalString perlSupport ", '${perlPackages.perl}/bin/perl'"} ); } foreach $c (@a) { @@ -186,7 +186,7 @@ stdenv.mkDerivation { # Also put git-http-backend into $PATH, so that we can use smart # HTTP(s) transports for pushing ln -s $out/libexec/git-core/git-http-backend $out/bin/git-http-backend - '' + stdenv.lib.optionalString perlSupport '' + '' + lib.optionalString perlSupport '' # wrap perl commands makeWrapper "$out/share/git/contrib/credential/netrc/git-credential-netrc.perl" $out/bin/git-credential-netrc \ --set PERL5LIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath perlLibs}" @@ -206,7 +206,7 @@ stdenv.mkDerivation { sed -i -e "s|'compressor' => \['gzip'|'compressor' => ['${gzip}/bin/gzip'|" \ $out/share/gitweb/gitweb.cgi # Give access to CGI.pm and friends (was removed from perl core in 5.22) - for p in ${stdenv.lib.concatStringsSep " " gitwebPerlLibs}; do + for p in ${lib.concatStringsSep " " gitwebPerlLibs}; do sed -i -e "/use CGI /i use lib \"$p/${perlPackages.perl.libPrefix}\";" \ "$out/share/gitweb/gitweb.cgi" done @@ -230,7 +230,7 @@ stdenv.mkDerivation { notSupported $out/libexec/git-core/git-send-email '') - + stdenv.lib.optionalString withManual ''# Install man pages + + lib.optionalString withManual ''# Install man pages make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES USE_ASCIIDOCTOR=1 PERL_PATH="${buildPackages.perl}/bin/perl" cmd-list.made install install-html \ -C Documentation '' @@ -248,7 +248,7 @@ stdenv.mkDerivation { notSupported "$out/$prog" done '') - + stdenv.lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.isDarwin '' # enable git-credential-osxkeychain by default if darwin mkdir -p $out/etc cat > $out/etc/gitconfig << EOF @@ -275,7 +275,7 @@ stdenv.mkDerivation { installCheckFlagsArray+=( GIT_PROVE_OPTS="--jobs $NIX_BUILD_CORES --failures --state=failed,save" GIT_TEST_INSTALLED=$out/bin - ${stdenv.lib.optionalString (!svnSupport) "NO_SVN_TESTS=y"} + ${lib.optionalString (!svnSupport) "NO_SVN_TESTS=y"} ) function disable_test { @@ -297,7 +297,7 @@ stdenv.mkDerivation { # Our patched gettext never fallbacks disable_test t0201-gettext-fallbacks - ${stdenv.lib.optionalString (!sendEmailSupport) '' + ${lib.optionalString (!sendEmailSupport) '' # Disable sendmail tests disable_test t9001-send-email ''} @@ -310,17 +310,17 @@ stdenv.mkDerivation { # Tested to fail: 2.18.0 disable_test t9902-completion "sourcing the completion script clears cached --options" - ${stdenv.lib.optionalString (!perlSupport) '' + ${lib.optionalString (!perlSupport) '' # request-pull is a Bash script that invokes Perl, so it is not available # when NO_PERL=1, and the test should be skipped, but the test suite does # not check for the Perl prerequisite. disable_test t5150-request-pull ''} - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' # XXX: Some tests added in 2.24.0 fail. # Please try to re-enable on the next release. disable_test t7816-grep-binary-pattern - '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + '' + lib.optionalString stdenv.hostPlatform.isMusl '' # Test fails (as of 2.17.0, musl 1.1.19) disable_test t3900-i18n-commit # Fails largely due to assumptions about BOM @@ -334,7 +334,7 @@ stdenv.mkDerivation { meta = { homepage = "https://git-scm.com/"; description = "Distributed version control system"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; changelog = "https://raw.githubusercontent.com/git/git/${version}/Documentation/RelNotes/${version}.txt"; longDescription = '' @@ -342,7 +342,7 @@ stdenv.mkDerivation { handle very large projects with speed and efficiency. ''; - platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ primeos peti wmertens globin ]; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ primeos peti wmertens globin ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git2cl/default.nix b/pkgs/applications/version-management/git-and-tools/git2cl/default.nix index 34417cfaa8c..a1c63538220 100644 --- a/pkgs/applications/version-management/git-and-tools/git2cl/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git2cl/default.nix @@ -1,4 +1,4 @@ -{ fetchgit, stdenv, perl }: +{ fetchgit, lib, stdenv, perl }: stdenv.mkDerivation { name = "git2cl-20080827"; @@ -18,6 +18,6 @@ stdenv.mkDerivation { meta = { homepage = "https://savannah.nongnu.org/projects/git2cl"; description = "Convert git logs to GNU style ChangeLog files"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/version-management/git-and-tools/gita/default.nix b/pkgs/applications/version-management/git-and-tools/gita/default.nix index 3e07a93458b..6f20e4a44c6 100644 --- a/pkgs/applications/version-management/git-and-tools/gita/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gita/default.nix @@ -9,12 +9,12 @@ }: buildPythonApplication rec { - version = "0.10.10"; + version = "0.11.9"; pname = "gita"; src = fetchFromGitHub { - sha256 = "0k7hicncbrqvhmpq1w3v1309bqij6izw31xs8xcb8is85dvi754h"; - rev = "v${version}"; + sha256 = "9+zuLAx9lMfltsBqjvsivJ5wPnStPfq11XgGMv/JDpY="; + rev = version; repo = "gita"; owner = "nosarthur"; }; diff --git a/pkgs/applications/version-management/git-and-tools/gitbatch/default.nix b/pkgs/applications/version-management/git-and-tools/gitbatch/default.nix index dc853be6772..25f7e95d184 100644 --- a/pkgs/applications/version-management/git-and-tools/gitbatch/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitbatch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gitbatch-unstable"; diff --git a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix b/pkgs/applications/version-management/git-and-tools/gitflow/default.nix index b9bca127472..08bf5eb6ba0 100644 --- a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitflow/default.nix @@ -4,13 +4,13 @@ with pkgs.lib; stdenv.mkDerivation rec { pname = "gitflow"; - version = "1.12.2"; + version = "1.12.3"; src = fetchFromGitHub { owner = "petervanderdoes"; repo = pname; rev = version; - sha256 = "0smwlc1wa4ndvspc9x6f4jwnzr58achysrhhip402j98d7di8hw5"; + sha256 = "sha256-kHirHG/bfsU6tKyQ0khNSTyChhzHfzib+HyA3LOtBI8="; }; buildInputs = [ pkgs.makeWrapper ]; diff --git a/pkgs/applications/version-management/git-and-tools/gitin/default.nix b/pkgs/applications/version-management/git-and-tools/gitin/default.nix index c9111ea2c32..3d429b7c561 100644 --- a/pkgs/applications/version-management/git-and-tools/gitin/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitin/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv +{ lib , buildGoPackage , fetchFromGitHub -, pkgconfig +, pkg-config , libgit2_0_27 }: @@ -20,7 +20,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libgit2_0_27 ]; meta = with lib; { diff --git a/pkgs/applications/version-management/git-and-tools/gitui/default.nix b/pkgs/applications/version-management/git-and-tools/gitui/default.nix index 20a446965f9..81b2984087b 100644 --- a/pkgs/applications/version-management/git-and-tools/gitui/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitui/default.nix @@ -14,8 +14,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ python3 perl ]; buildInputs = [ openssl ] - ++ stdenv.lib.optional stdenv.isLinux xclip - ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security AppKit ]; + ++ lib.optional stdenv.isLinux xclip + ++ lib.optionals stdenv.isDarwin [ libiconv Security AppKit ]; meta = with lib; { description = "Blazing fast terminal-ui for git written in rust"; diff --git a/pkgs/applications/version-management/git-and-tools/gitweb/default.nix b/pkgs/applications/version-management/git-and-tools/gitweb/default.nix index b6659b5f539..1fa2ebc6f74 100644 --- a/pkgs/applications/version-management/git-and-tools/gitweb/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitweb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildEnv, git, fetchFromGitHub +{ lib, buildEnv, git, fetchFromGitHub , gitwebTheme ? false }: let @@ -15,13 +15,13 @@ let sha256 = "17hypq6jvhy6zhh26lp3nyi52npfd5wy5752k6sq0shk4na2acqi"; }; in buildEnv { - name = "gitweb-${stdenv.lib.getVersion git}"; + name = "gitweb-${lib.getVersion git}"; ignoreCollisions = true; - paths = stdenv.lib.optional gitwebTheme gitwebThemeSrc + paths = lib.optional gitwebTheme gitwebThemeSrc ++ [ "${git}/share/gitweb" ]; meta = git.meta // { - maintainers = with stdenv.lib.maintainers; [ gnidorah ]; + maintainers = with lib.maintainers; [ gnidorah ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/glab/default.nix b/pkgs/applications/version-management/git-and-tools/glab/default.nix index 9c2e4f00ca7..eae572530c3 100644 --- a/pkgs/applications/version-management/git-and-tools/glab/default.nix +++ b/pkgs/applications/version-management/git-and-tools/glab/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "glab"; - version = "1.11.1"; + version = "1.14.0"; src = fetchFromGitHub { owner = "profclems"; repo = pname; rev = "v${version}"; - sha256 = "mmrTuldU2WDe9t2nC3DYfqwb28uh6qjAaaveR221mjw="; + sha256 = "sha256-JvHuOMpt62tw7ewDev7unAgZGV+ZSo6wDuiPhWap2v0="; }; - vendorSha256 = "B4RKcKUTdGkonsKhL7NIKzVpZq6XD6cMMWed4wr/Moc="; + vendorSha256 = "sha256-0nnrH3GJhd4wlRETo9iSlFkXq358m30k7Fsb5haHlpQ="; runVend = true; # Tests are trying to access /homeless-shelter diff --git a/pkgs/applications/version-management/git-and-tools/grv/default.nix b/pkgs/applications/version-management/git-and-tools/grv/default.nix index f7aae5ba8d2..e43c602d6d9 100644 --- a/pkgs/applications/version-management/git-and-tools/grv/default.nix +++ b/pkgs/applications/version-management/git-and-tools/grv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, curl, ncurses, pkgconfig, readline +{ lib, buildGoPackage, fetchFromGitHub, curl, ncurses, pkg-config, readline , cmake }: let version = "0.3.2"; @@ -8,7 +8,7 @@ buildGoPackage { inherit version; buildInputs = [ ncurses readline curl ]; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; goPackagePath = "github.com/rgburke/grv"; diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix index 4b189c55c8a..e0d7e46d22a 100644 --- a/pkgs/applications/version-management/git-and-tools/hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, git, groff, installShellFiles, util-linux, nixosTests }: +{ lib, buildGoPackage, fetchFromGitHub, git, groff, installShellFiles, util-linux, nixosTests }: buildGoPackage rec { pname = "hub"; diff --git a/pkgs/applications/version-management/git-and-tools/lab/default.nix b/pkgs/applications/version-management/git-and-tools/lab/default.nix index 437529cd73a..41c4e653a63 100644 --- a/pkgs/applications/version-management/git-and-tools/lab/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lab/default.nix @@ -1,14 +1,14 @@ -{ lib, buildGoModule, fetchFromGitHub, makeWrapper, xdg_utils, installShellFiles, git }: +{ lib, buildGoModule, fetchFromGitHub, makeWrapper, xdg-utils, installShellFiles, git }: buildGoModule rec { pname = "lab"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "zaquestion"; repo = "lab"; rev = "v${version}"; - sha256 = "1vl5ylix4h6z1vrdslv9qphgb6yqpqd4r54jzk5kd6zgrnf9c2zc"; + sha256 = "1l6xsikd1113qd4y0mvjsl64gbi4327m9v4d593f27fxink39j8s"; }; subPackages = [ "." ]; @@ -22,7 +22,7 @@ buildGoModule rec { buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; postInstall = '' - wrapProgram $out/bin/lab --prefix PATH ":" "${lib.makeBinPath [ git xdg_utils ]}"; + wrapProgram $out/bin/lab --prefix PATH ":" "${lib.makeBinPath [ git xdg-utils ]}"; for shell in bash fish zsh; do $out/bin/lab completion $shell > lab.$shell installShellCompletion lab.$shell diff --git a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix index ce749308843..18f2e5ad487 100644 --- a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: # Currently `buildGo114Module` is passed as `buildGoModule` from # `../default.nix`. Please remove the fixed 1.14 once a new release has been diff --git a/pkgs/applications/version-management/git-and-tools/legit/default.nix b/pkgs/applications/version-management/git-and-tools/legit/default.nix index 7dbdd6071a5..df286652711 100644 --- a/pkgs/applications/version-management/git-and-tools/legit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/legit/default.nix @@ -16,10 +16,8 @@ python3Packages.buildPythonApplication rec { six ]; - # Prevent tests from trying to create configuration in /homeless-shelter. - preCheck = '' - export HOME=$PWD/test-home - ''; + # no tests + doCheck = false; meta = with lib; { homepage = "https://github.com/frostming/legit"; diff --git a/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix b/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix index 805afdf363c..1821dba0f00 100644 --- a/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix +++ b/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix @@ -1,18 +1,18 @@ -{ lib, stdenv, buildPythonApplication, fetchFromGitHub, pyxdg, pytest }: +{ lib, buildPythonApplication, fetchFromGitHub, pyxdg, pytest, pytest-mock }: buildPythonApplication rec { pname = "pass-git-helper"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "languitar"; repo = "pass-git-helper"; rev = "v${version}"; - sha256 = "18nvwlp0w4aqj268wly60rnjzqw2d8jl0hbs6bkwp3hpzzz5g6yd"; + sha256 = "sha256-GdsFPpBdoEaOCmdKxw5xTuFOcGFH94w5q/lV891lCUs="; }; propagatedBuildInputs = [ pyxdg ]; - checkInputs = [ pytest ]; + checkInputs = [ pytest pytest-mock ]; preCheck = '' export HOME=$(mktemp -d) ''; diff --git a/pkgs/applications/version-management/git-and-tools/qgit/default.nix b/pkgs/applications/version-management/git-and-tools/qgit/default.nix index 24743b21a4d..8f84c0db558 100644 --- a/pkgs/applications/version-management/git-and-tools/qgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/qgit/default.nix @@ -16,7 +16,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake ]; meta = with lib; { - license = licenses.gpl2; + license = licenses.gpl2Only; homepage = "https://github.com/tibirna/qgit"; description = "Graphical front-end to Git"; maintainers = with maintainers; [ peterhoeg markuskowa ]; diff --git a/pkgs/applications/version-management/git-and-tools/scmpuff/default.nix b/pkgs/applications/version-management/git-and-tools/scmpuff/default.nix index 69062d305b7..1e65834f519 100644 --- a/pkgs/applications/version-management/git-and-tools/scmpuff/default.nix +++ b/pkgs/applications/version-management/git-and-tools/scmpuff/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "scmpuff"; diff --git a/pkgs/applications/version-management/git-and-tools/stgit/default.nix b/pkgs/applications/version-management/git-and-tools/stgit/default.nix index 3a37c798a08..4ee92c1d5e6 100644 --- a/pkgs/applications/version-management/git-and-tools/stgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/stgit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub, git, installShellFiles }: +{ lib, python3Packages, fetchFromGitHub, git, installShellFiles }: python3Packages.buildPythonApplication rec { pname = "stgit"; diff --git a/pkgs/applications/version-management/git-and-tools/subgit/default.nix b/pkgs/applications/version-management/git-and-tools/subgit/default.nix index 11189e02c8f..2f275827a2e 100644 --- a/pkgs/applications/version-management/git-and-tools/subgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/subgit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, makeWrapper, jre }: +{ lib, stdenv, fetchurl, unzip, makeWrapper, jre }: stdenv.mkDerivation rec { name = "subgit-3.3.10"; @@ -7,8 +7,8 @@ stdenv.mkDerivation rec { description = "A tool for a smooth, stress-free SVN to Git migration"; longDescription = "Create writable Git mirror of a local or remote Subversion repository and use both Subversion and Git as long as you like. You may also do a fast one-time import from Subversion to Git."; homepage = "http://subgit.com"; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.unfree; + platforms = lib.platforms.all; }; nativeBuildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix index 8c73c00f00c..a40e959a50a 100644 --- a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix +++ b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation { NIX_LDFLAGS = "-lsvn_fs-1"; + dontWrapQtApps = true; + meta = with lib; { homepage = "https://github.com/svn-all-fast-export/svn2git"; description = "A fast-import based converter for an svn repo to git repos"; diff --git a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix index b61ae80bbee..69742b6d760 100644 --- a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ruby, makeWrapper, git }: +{ lib, stdenv, fetchurl, ruby, makeWrapper, git }: let version = "2.4.0"; @@ -33,7 +33,7 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/nirvdrum/svn2git"; description = "Tool for importing Subversion repositories into git"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.mit; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix index 1a469970caf..6ac6cde44a8 100644 --- a/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, ncurses, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45 -, readline, makeWrapper, git, libiconv, autoreconfHook, findXMLCatalogs, pkgconfig +, readline, makeWrapper, git, libiconv, autoreconfHook, findXMLCatalogs, pkg-config }: stdenv.mkDerivation rec { @@ -13,12 +13,12 @@ stdenv.mkDerivation rec { sha256 = "0wxcbfqsk8p84zizy6lf3gp5j122wrf8c7xlipki6nhcfhksn33b"; }; - nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkgconfig ]; + nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkg-config ]; autoreconfFlags = "-I tools -v"; buildInputs = [ ncurses readline git ] - ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; + ++ lib.optionals stdenv.isDarwin [ libiconv ]; # those files are inherently impure, we'll handle the corresponding dependencies. postPatch = '' diff --git a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix index faa4d66d7ca..aebd488fe30 100644 --- a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { install -m 644 -D contrib/zsh/_transcrypt $out/share/zsh/site-functions/_transcrypt wrapProgram $out/bin/transcrypt \ - --prefix PATH : "${stdenv.lib.makeBinPath [ git openssl coreutils util-linux gnugrep gnused gawk ]}" + --prefix PATH : "${lib.makeBinPath [ git openssl coreutils util-linux gnugrep gnused gawk ]}" cat > $out/bin/transcrypt-depspathprefix << EOF #!${stdenv.shell} - echo "${stdenv.lib.makeBinPath [ git openssl coreutils gawk ]}:" + echo "${lib.makeBinPath [ git openssl coreutils gawk ]}:" EOF chmod +x $out/bin/transcrypt-depspathprefix ''; diff --git a/pkgs/applications/version-management/git-backup/default.nix b/pkgs/applications/version-management/git-backup/default.nix index bb621647125..d73e77d6d94 100644 --- a/pkgs/applications/version-management/git-backup/default.nix +++ b/pkgs/applications/version-management/git-backup/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; meta = with lib; { homepage = "https://github.com/jsdw/git-backup"; diff --git a/pkgs/applications/version-management/git-crecord/default.nix b/pkgs/applications/version-management/git-crecord/default.nix index 9481f3ebd92..5dc75ce4d70 100644 --- a/pkgs/applications/version-management/git-crecord/default.nix +++ b/pkgs/applications/version-management/git-crecord/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pythonPackages }: +{ lib, fetchFromGitHub, pythonPackages }: pythonPackages.buildPythonApplication rec { pname = "git-crecord"; @@ -16,6 +16,6 @@ pythonPackages.buildPythonApplication rec { meta = { homepage = "https://github.com/andrewshadura/git-crecord"; description = "Git subcommand to interactively select changes to commit or stage"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/version-management/git-lfs/1.nix b/pkgs/applications/version-management/git-lfs/1.nix index 3c758908cd4..f72f5190750 100644 --- a/pkgs/applications/version-management/git-lfs/1.nix +++ b/pkgs/applications/version-management/git-lfs/1.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "git-lfs"; diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix index 3736c1c573d..c73a9277138 100644 --- a/pkgs/applications/version-management/git-lfs/default.nix +++ b/pkgs/applications/version-management/git-lfs/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, ronn, installShellFiles }: +{ lib, buildGoPackage, fetchFromGitHub, ronn, installShellFiles }: buildGoPackage rec { pname = "git-lfs"; - version = "2.13.1"; + version = "2.13.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "git-lfs"; repo = "git-lfs"; - sha256 = "0n4gi7sh6d1maqwp12fsznrky9xwkk2jrmxfwa2hnk8wb2rhvlrm"; + sha256 = "0gfpzdya48phwln61746ii78sq55mhzj938lz8x062xkkcsdvbf4"; }; goPackagePath = "github.com/git-lfs/git-lfs"; diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index fb0b153bc3a..ea9e195cd0d 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.11.1"; + version = "2.12"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "sha256-6XsjxTYmjr/3smwwS7c+Mq1sqfgKAhWzHOY8TWlIKHU="; + sha256 = "sha256-k9G0lN7qKQhWiXibzhC9Ma9h+44LQJ966MIakWk5nJM="; }; patches = [ ./import-ssl-module.patch ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { # Important runtime dependencies postFixup = '' wrapProgram $out/bin/repo --prefix PATH ":" \ - "${stdenv.lib.makeBinPath [ git gnupg less ]}" + "${lib.makeBinPath [ git gnupg less ]}" ''; meta = with lib; { diff --git a/pkgs/applications/version-management/git-up/default.nix b/pkgs/applications/version-management/git-up/default.nix index 57a40de9d4a..06a2bb48989 100644 --- a/pkgs/applications/version-management/git-up/default.nix +++ b/pkgs/applications/version-management/git-up/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pythonPackages, git }: +{ lib, fetchurl, pythonPackages, git }: pythonPackages.buildPythonApplication rec { pname = "git-up"; diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 528e7c3dd99..566459afa18 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -1,18 +1,19 @@ -{ stdenv, buildGoPackage, fetchurl, makeWrapper +{ lib, buildGoPackage, fetchurl, makeWrapper , git, bash, gzip, openssh, pam , sqliteSupport ? true , pamSupport ? true +, nixosTests }: -with stdenv.lib; +with lib; buildGoPackage rec { pname = "gitea"; - version = "1.13.1"; + version = "1.13.2"; src = fetchurl { url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"; - sha256 = "sha256-tah7ciq+jkkROJq/V+yPRtWPuWaSnf5hKndjnifsQYc="; + sha256 = "sha256-uezg8GdNqgKVHgJj9rTqHFLWuLdyDp63fzr7DMslOII="; }; unpackPhase = '' @@ -60,6 +61,8 @@ buildGoPackage rec { goPackagePath = "code.gitea.io/gitea"; + passthru.tests.gitea = nixosTests.gitea; + meta = { description = "Git with a cup of tea"; homepage = "https://gitea.io"; diff --git a/pkgs/applications/version-management/gitinspector/default.nix b/pkgs/applications/version-management/gitinspector/default.nix index 68dd3c190be..384f5d0f01f 100644 --- a/pkgs/applications/version-management/gitinspector/default.nix +++ b/pkgs/applications/version-management/gitinspector/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, python2Packages}: +{ lib, fetchzip, python2Packages}: python2Packages.buildPythonApplication rec { pname = "gitinspector"; diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 4fc84767cd4..7dd8ff43974 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -1,4 +1,4 @@ -{ stdenv, libXcomposite, libgnome-keyring, makeWrapper, udev, curl, alsaLib +{ lib, stdenv, libXcomposite, libgnome-keyring, makeWrapper, udev, curl, alsaLib , libXfixes, atk, gtk3, libXrender, pango, gnome3, cairo, freetype, fontconfig , libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst , nss, nspr, cups, fetchzip, expat, gdk-pixbuf, libXdamage, libXrandr, dbus @@ -6,18 +6,18 @@ , e2fsprogs, krb5, libdrm, mesa }: -with stdenv.lib; +with lib; let curlWithGnuTls = curl.override { gnutlsSupport = true; sslSupport = false; }; in stdenv.mkDerivation rec { pname = "gitkraken"; - version = "7.4.1"; + version = "7.5.0"; src = fetchzip { url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; - sha256 = "1c9cyxx5sqvnilf6xp3ildq3lwl6mj8v1vl0wzyjpaiqky99lj9p"; + sha256 = "1v89aza7iwph7k5phyld5m5856c5wbh8ncgg6lh7558v4xna0x57"; }; dontBuild = true; @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { ]; desktopItem = makeDesktopItem { - name = "gitkraken"; + name = pname; exec = "gitkraken"; icon = "gitkraken"; desktopName = "GitKraken"; @@ -88,10 +88,7 @@ stdenv.mkDerivation rec { ln -s $out/share/gitkraken/gitkraken $out/bin/gitkraken mkdir -p $out/share/applications - cp ${desktopItem}/share/applications/* $out/share/applications/ - - substituteInPlace $out/share/applications/gitkraken.desktop \ - --replace $out/usr/share/gitkraken $out/bin + ln -s ${desktopItem}/share/applications/* $out/share/applications mkdir -p $out/share/pixmaps cp gitkraken.png $out/share/pixmaps/gitkraken.png diff --git a/pkgs/applications/version-management/gitlab-triage/gemset.nix b/pkgs/applications/version-management/gitlab-triage/gemset.nix index 1ce8450bba1..52748770661 100644 --- a/pkgs/applications/version-management/gitlab-triage/gemset.nix +++ b/pkgs/applications/version-management/gitlab-triage/gemset.nix @@ -115,4 +115,4 @@ }; version = "1.2.7"; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index c6d4401fde4..9ea6d241060 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,13 +1,13 @@ { - "version": "13.7.1", - "repo_hash": "13bbi9ps6z8q9di9gni2ckydgfk7pxkaqf0wgx8gfwm80sc7s0km", + "version": "13.7.4", + "repo_hash": "1ggx76k6941rhccsd585p4h5k4zb87yvg0pmpzhwhh2q4ma2sywm", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v13.7.1-ee", + "rev": "v13.7.4-ee", "passthru": { - "GITALY_SERVER_VERSION": "13.7.1", - "GITLAB_PAGES_VERSION": "1.32.0", + "GITALY_SERVER_VERSION": "13.7.4", + "GITLAB_PAGES_VERSION": "1.34.0", "GITLAB_SHELL_VERSION": "13.14.0", - "GITLAB_WORKHORSE_VERSION": "8.58.0" + "GITLAB_WORKHORSE_VERSION": "8.58.2" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index c16e66c9e81..1b96307457c 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchFromGitLab, fetchFromGitHub, buildGoModule, ruby -, bundlerEnv, pkgconfig +{ lib, fetchFromGitLab, fetchFromGitHub, buildGoModule, ruby +, bundlerEnv, pkg-config # libgit2 + dependencies , libgit2, openssl, zlib, pcre, http-parser }: @@ -33,14 +33,14 @@ let }; }; in buildGoModule rec { - version = "13.7.1"; + version = "13.7.4"; pname = "gitaly"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "1zmjll7sdan8kc7bq5vjaiyqwzlh5zmx1g4ql4dqmnwscpn1avjb"; + sha256 = "1inb7xlv8admzy9q1bgxccbrhks0mmc8lng356h39crj5sgaqkmg"; }; vendorSha256 = "15i1ajvrff1bfpv3kmb1wm1mmriswwfw2v4cml0nv0zp6a5n5187"; @@ -50,7 +50,7 @@ in buildGoModule rec { }; buildFlags = [ "-tags=static,system_libgit2" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ rubyEnv.wrappedRuby libgit openssl zlib pcre http-parser ]; doCheck = false; diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index fe05c1d0178..b4a6b0e78eb 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -855,4 +855,4 @@ }; version = "2.4.0"; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index d1b5958c751..a1a9df57f04 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, buildGoModule, ruby }: +{ lib, fetchFromGitLab, buildGoModule, ruby }: buildGoModule rec { pname = "gitlab-shell"; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index b38485716d7..3e292632d4c 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv, fetchFromGitLab, git, buildGoModule }: +{ lib, fetchFromGitLab, git, buildGoModule }: buildGoModule rec { pname = "gitlab-workhorse"; - version = "8.58.0"; + version = "8.58.2"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "1642vxxqnpccjzfls3vz4l62kvksk6irwv1dhjcxv1cppbr9hz80"; + sha256 = "1ks8rla6hm618dxhr41x1ckzk3jxv0f7vl2547f7f1fl3zqna1zp"; }; vendorSha256 = "0vkw12w7vr0g4hf4f0im79y7l36d3ah01n1vl7siy94si47g8ir5"; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index ebb3fe5b740..a4758f7418e 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -5558,4 +5558,4 @@ }; version = "2.4.1"; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/version-management/gitless/default.nix b/pkgs/applications/version-management/gitless/default.nix index e53da902e13..310158e3eea 100644 --- a/pkgs/applications/version-management/gitless/default.nix +++ b/pkgs/applications/version-management/gitless/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, python, lib, stdenv }: +{ fetchFromGitHub, python, lib }: with python.pkgs; buildPythonApplication rec { diff --git a/pkgs/applications/version-management/gitoxide/default.nix b/pkgs/applications/version-management/gitoxide/default.nix index c345b8d7a80..51fc538261d 100644 --- a/pkgs/applications/version-management/gitoxide/default.nix +++ b/pkgs/applications/version-management/gitoxide/default.nix @@ -15,9 +15,9 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; + ++ lib.optionals stdenv.isDarwin [ Security ]; - # Needed to get openssl-sys to use pkgconfig. + # Needed to get openssl-sys to use pkg-config. OPENSSL_NO_VENDOR = 1; meta = with lib; { diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix index b574c03248f..c0b0021f8cb 100644 --- a/pkgs/applications/version-management/gogs/default.nix +++ b/pkgs/applications/version-management/gogs/default.nix @@ -1,10 +1,10 @@ -{ stdenv, buildGoModule, fetchFromGitHub, makeWrapper +{ lib, buildGoModule, fetchFromGitHub, makeWrapper , git, bash, gzip, openssh, pam , sqliteSupport ? true , pamSupport ? true }: -with stdenv.lib; +with lib; buildGoModule rec { pname = "gogs"; diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/applications/version-management/gource/default.nix index 048ad403665..c4a86b8d4be 100644 --- a/pkgs/applications/version-management/gource/default.nix +++ b/pkgs/applications/version-management/gource/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, SDL2, ftgl, pkgconfig, libpng, libjpeg, pcre +{ lib, stdenv, fetchurl, SDL2, ftgl, pkg-config, libpng, libjpeg, pcre , SDL2_image, freetype, glew, libGLU, libGL, boost, glm }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "16p7b1x4r0915w883lp374jcdqqja37fnb7m8vnsfnl2n64gi8qr"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glew SDL2 ftgl libpng libjpeg pcre SDL2_image libGLU libGL boost glm freetype diff --git a/pkgs/applications/version-management/guitone/default.nix b/pkgs/applications/version-management/guitone/default.nix index 1ff1030150f..d78023d8468 100644 --- a/pkgs/applications/version-management/guitone/default.nix +++ b/pkgs/applications/version-management/guitone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchmtn, qt4, qmake4Hook, pkgconfig, graphviz }: +{ lib, stdenv, fetchmtn, qt4, qmake4Hook, pkg-config, graphviz }: let version = "1.0-mtn-head"; in stdenv.mkDerivation { @@ -19,7 +19,7 @@ stdenv.mkDerivation { patches = [ ./parallel-building.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ qt4 qmake4Hook graphviz ]; qmakeFlags = [ "guitone.pro" ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation { description = "Qt4 based GUI for monotone"; homepage = "https://guitone.thomaskeller.biz"; downloadPage = "https://code.monotone.ca/p/guitone/"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; inherit (qt4.meta) platforms; }; } diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index ecad825dc8b..268098b2d2d 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchurl , gettext , itstool @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { format = "other"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "toARTVq3kzJFSf1Y9OsgLY4oDAYzoLdl7ebfs0FgqBs="; }; diff --git a/pkgs/applications/version-management/mercurial/4.9.nix b/pkgs/applications/version-management/mercurial/4.9.nix index f0918ab69a6..29440724274 100644 --- a/pkgs/applications/version-management/mercurial/4.9.nix +++ b/pkgs/applications/version-management/mercurial/4.9.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python2Packages, makeWrapper, unzip +{ lib, stdenv, fetchurl, python2Packages, makeWrapper, unzip , guiSupport ? false, tk ? null , ApplicationServices , mercurialSrc ? fetchurl rec { @@ -22,13 +22,13 @@ in python2Packages.buildPythonApplication { inherit python; # pass it so that the same version can be used in hg2git buildInputs = [ makeWrapper docutils unzip ] - ++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices ]; + ++ lib.optionals stdenv.isDarwin [ ApplicationServices ]; propagatedBuildInputs = [ hg-git dulwich ]; makeFlags = [ "PREFIX=$(out)" ]; - postInstall = (stdenv.lib.optionalString guiSupport + postInstall = (lib.optionalString guiSupport '' mkdir -p $out/etc/mercurial cp contrib/hgk $out/bin @@ -62,10 +62,10 @@ in python2Packages.buildPythonApplication { description = "A fast, lightweight SCM system for very large distributed projects"; homepage = "https://www.mercurial-scm.org"; downloadPage = "https://www.mercurial-scm.org/release/"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.eraserhd ]; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.eraserhd ]; updateWalker = true; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index e0400fd46c6..c841482126a 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3Packages, makeWrapper, unzip +{ lib, stdenv, fetchurl, python3Packages, makeWrapper, unzip , guiSupport ? false, tk ? null , ApplicationServices }: @@ -20,11 +20,11 @@ in python3Packages.buildPythonApplication rec { passthru = { inherit python; }; # pass it so that the same version can be used in hg2git buildInputs = [ makeWrapper docutils unzip ] - ++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices ]; + ++ lib.optionals stdenv.isDarwin [ ApplicationServices ]; makeFlags = [ "PREFIX=$(out)" ]; - postInstall = (stdenv.lib.optionalString guiSupport '' + postInstall = (lib.optionalString guiSupport '' mkdir -p $out/etc/mercurial cp contrib/hgk $out/bin cat >> $out/etc/mercurial/hgrc << EOF @@ -56,9 +56,9 @@ in python3Packages.buildPythonApplication rec { description = "A fast, lightweight SCM system for very large distributed projects"; homepage = "https://www.mercurial-scm.org"; downloadPage = "https://www.mercurial-scm.org/release/"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.eelco ]; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.eelco ]; updateWalker = true; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/version-management/monotone-viz/default.nix b/pkgs/applications/version-management/monotone-viz/default.nix index 03b98694eaf..d6d55eaa4eb 100644 --- a/pkgs/applications/version-management/monotone-viz/default.nix +++ b/pkgs/applications/version-management/monotone-viz/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, ocamlPackages, gnome2, pkgconfig, makeWrapper, glib +{ lib, stdenv, fetchurl, ocamlPackages, gnome2, pkg-config, makeWrapper, glib , libtool, libpng, yacc, expat, fontconfig, gd, pango, libjpeg, libwebp, xlibsWrapper, libXaw }: # We need an old version of Graphviz for format compatibility reasons. # This version is vulnerable, but monotone-viz will never feed it bad input. let graphviz_2_0 = import ./graphviz-2.0.nix { - inherit stdenv fetchurl pkgconfig xlibsWrapper libpng libjpeg expat libXaw + inherit lib stdenv fetchurl pkg-config xlibsWrapper libpng libjpeg expat libXaw yacc libtool fontconfig pango gd libwebp; }; in let inherit (gnome2) libgnomecanvas; in @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { version = "1.0.2"; pname = "monotone-viz"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ocaml lablgtk libgnomecanvas glib graphviz_2_0 makeWrapper camlp4]; src = fetchurl { url = "http://oandrieu.nerim.net/monotone-viz/${pname}-${version}-nolablgtk.tar.gz"; @@ -47,9 +47,9 @@ stdenv.mkDerivation rec { meta = { inherit version; - description = ''Monotone ancestry visualiser''; - license = stdenv.lib.licenses.gpl2Plus ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + description = "Monotone ancestry visualiser"; + license = lib.licenses.gpl2Plus ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix b/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix index 816bfcde67f..8ecc5bf9ac8 100644 --- a/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix +++ b/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, xlibsWrapper, libpng, libjpeg, expat, libXaw +{ lib, stdenv, fetchurl, pkg-config, xlibsWrapper, libpng, libjpeg, expat, libXaw , yacc, libtool, fontconfig, pango, gd, libwebp }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "39b8e1f2ba4cc1f5bdc8e39c7be35e5f831253008e4ee2c176984f080416676c"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xlibsWrapper libpng libjpeg expat libXaw yacc libtool fontconfig pango gd libwebp @@ -30,12 +30,12 @@ stdenv.mkDerivation rec { "--with-ltdl-include=${libtool}/include" "--with-ltdl-lib=${libtool.lib}/lib" ] - ++ stdenv.lib.optional (xlibsWrapper == null) "--without-x"; + ++ lib.optional (xlibsWrapper == null) "--without-x"; meta = { description = "A program for visualising graphs"; homepage = "http://www.graphviz.org/"; branch = "2.0"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/version-management/monotone/default.nix b/pkgs/applications/version-management/monotone/default.nix index e08ea3c8cd8..f20d827dc5f 100644 --- a/pkgs/applications/version-management/monotone/default.nix +++ b/pkgs/applications/version-management/monotone/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, boost, zlib, botan, libidn -, lua, pcre, sqlite, perl, pkgconfig, expect +, lua, pcre, sqlite, perl, pkg-config, expect , bzip2, gmp, openssl }: let version = "1.1"; - perlVersion = stdenv.lib.getVersion perl; + perlVersion = lib.getVersion perl; in assert perlVersion != ""; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { patches = [ ./monotone-1.1-Adapt-to-changes-in-pcre-8.42.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ boost zlib botan libidn lua pcre sqlite expect openssl gmp bzip2 ]; diff --git a/pkgs/applications/version-management/mr/default.nix b/pkgs/applications/version-management/mr/default.nix index 05ef7021f16..da882f1e359 100644 --- a/pkgs/applications/version-management/mr/default.nix +++ b/pkgs/applications/version-management/mr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, perl }: +{ lib, stdenv, fetchgit, perl }: stdenv.mkDerivation { pname = "mr"; @@ -31,8 +31,8 @@ stdenv.mkDerivation { other version control systems can easily be added. ''; homepage = "http://myrepos.branchable.com/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ antono henrytill ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ antono henrytill ]; }; } diff --git a/pkgs/applications/version-management/nitpick/default.nix b/pkgs/applications/version-management/nitpick/default.nix index bcb16ea8678..56d3531f721 100644 --- a/pkgs/applications/version-management/nitpick/default.nix +++ b/pkgs/applications/version-management/nitpick/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub , buildPythonPackage -, stdenv +, lib , isPy27 }: @@ -10,7 +10,7 @@ buildPythonPackage rec { format = "other"; disabled = !isPy27; - + src = fetchFromGitHub { owner = "travisb-ca"; repo = pname; @@ -21,7 +21,7 @@ buildPythonPackage rec { installPhase = '' mkdir -p $out/share/src install -m 755 -t $out/share/src nitpick.py - + mkdir -p $out/bin ln -s $out/share/src/nitpick.py $out/bin/nitpick ''; @@ -34,7 +34,7 @@ buildPythonPackage rec { follow the code via whatever VCS or distribution mechanism. ''; homepage = "http://travisbrown.ca/projects/nitpick/docs/nitpick.html"; - license = with stdenv.lib.licenses; gpl2; + license = with lib.licenses; gpl2; maintainers = []; }; } diff --git a/pkgs/applications/version-management/p4v/default.nix b/pkgs/applications/version-management/p4v/default.nix index 01ea365b76c..476df99d232 100644 --- a/pkgs/applications/version-management/p4v/default.nix +++ b/pkgs/applications/version-management/p4v/default.nix @@ -48,8 +48,8 @@ stdenv.mkDerivation rec { meta = { description = "Perforce Visual Client"; homepage = "https://www.perforce.com"; - license = stdenv.lib.licenses.unfreeRedistributable; + license = lib.licenses.unfreeRedistributable; platforms = [ "x86_64-linux" ]; - maintainers = with stdenv.lib.maintainers; [ nathyong nioncode ]; + maintainers = with lib.maintainers; [ nathyong nioncode ]; }; } diff --git a/pkgs/applications/version-management/peru/default.nix b/pkgs/applications/version-management/peru/default.nix index d7ad9060879..b7b6d62e4b4 100644 --- a/pkgs/applications/version-management/peru/default.nix +++ b/pkgs/applications/version-management/peru/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { pname = "peru"; diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index a4b8be65117..eaad772f734 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -13,22 +13,22 @@ rustPlatform.buildRustPackage rec { pname = "pijul"; - version = "1.0.0-alpha.31"; + version = "1.0.0-alpha.38"; src = fetchCrate { inherit version pname; - sha256 = "sha256-dSwQlALN0E87o86sasuNFPTZN6SRCuxP6pI7wi4uRf4"; + sha256 = "0f14jkr1yswwyqz0l47b0287vpyz0g1qmksr3hkskhbmwlkf1q2b"; }; - cargoSha256 = "sha256-Xwk5bX9o41M/1BmkOpAscGQHikhzV+9qAwVz0qI7FRA"; + cargoSha256 = "08p2dq48d1islk02xz1j39402fqxfh4isf8qi219aivl0yciwjn3"; - cargoBuildFlags = stdenv.lib.optional gitImportSupport "--features=git"; + cargoBuildFlags = lib.optional gitImportSupport "--features=git"; doCheck = false; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl libsodium xxHash zstd ] - ++ (stdenv.lib.optionals gitImportSupport [ libgit2 ]) - ++ (stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ++ (lib.optionals gitImportSupport [ libgit2 ]) + ++ (lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreServices Security SystemConfiguration ])); diff --git a/pkgs/applications/version-management/rabbitvcs/default.nix b/pkgs/applications/version-management/rabbitvcs/default.nix index 0384f9723d5..e274f0b0335 100644 --- a/pkgs/applications/version-management/rabbitvcs/default.nix +++ b/pkgs/applications/version-management/rabbitvcs/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, python3Packages, meld, subversion, gvfs, xdg_utils, gtk3 }: +{ fetchFromGitHub, lib, python3Packages, meld, subversion, gvfs, xdg-utils, gtk3 }: python3Packages.buildPythonApplication rec { pname = "rabbitvcs"; @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { }; buildInputs = [ gtk3 ]; - pythonPath = with python3Packages; [ configobj pygobject3 pysvn dulwich tkinter gvfs xdg_utils ]; + pythonPath = with python3Packages; [ configobj pygobject3 pysvn dulwich tkinter gvfs xdg-utils ]; prePatch = '' sed -ie 's|if sys\.argv\[1\] == "install":|if False:|' ./setup.py diff --git a/pkgs/applications/version-management/rapidsvn/default.nix b/pkgs/applications/version-management/rapidsvn/default.nix index fc6a8adc2ad..33eba79732d 100644 --- a/pkgs/applications/version-management/rapidsvn/default.nix +++ b/pkgs/applications/version-management/rapidsvn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, wxGTK, subversion, apr, aprutil, python }: +{ lib, stdenv, fetchurl, wxGTK, subversion, apr, aprutil, python }: stdenv.mkDerivation rec { pname = "rapidsvn"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "Multi-platform GUI front-end for the Subversion revision system"; homepage = "http://rapidsvn.tigris.org/"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = [ stdenv.lib.maintainers.viric ]; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.viric ]; }; } diff --git a/pkgs/applications/version-management/rcs/default.nix b/pkgs/applications/version-management/rcs/default.nix index 404d6ae09bc..f8143711318 100644 --- a/pkgs/applications/version-management/rcs/default.nix +++ b/pkgs/applications/version-management/rcs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, ed }: +{ lib, stdenv, fetchurl, fetchpatch, ed }: stdenv.mkDerivation rec { name = "rcs-5.9.4"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ ed ]; - patches = stdenv.lib.optionals stdenv.isDarwin [ + patches = lib.optionals stdenv.isDarwin [ # This failure appears unrelated to the subject of the test. This # test seems to rely on a bash bug where `test $x -nt $y` ignores # subsecond values in timetamps. This bug has been fixed in Bash @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-std=c99"; - hardeningDisable = stdenv.lib.optional stdenv.cc.isClang "format"; + hardeningDisable = lib.optional stdenv.cc.isClang "format"; meta = { homepage = "https://www.gnu.org/software/rcs/"; @@ -66,8 +66,8 @@ stdenv.mkDerivation rec { documentation, graphics, papers, and form letters. ''; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ eelco ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ eelco ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/version-management/redmine/gemset.nix b/pkgs/applications/version-management/redmine/gemset.nix index 9a4deb7e155..a8fd6eba6f0 100644 --- a/pkgs/applications/version-management/redmine/gemset.nix +++ b/pkgs/applications/version-management/redmine/gemset.nix @@ -875,4 +875,4 @@ }; version = "0.9.24"; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/version-management/reposurgeon/default.nix b/pkgs/applications/version-management/reposurgeon/default.nix index f52fd30d839..3e526d5ac7c 100644 --- a/pkgs/applications/version-management/reposurgeon/default.nix +++ b/pkgs/applications/version-management/reposurgeon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, python27Packages, git +{ lib, stdenv, fetchurl, makeWrapper, python27Packages, git , docbook_xml_dtd_412, docbook_xsl, asciidoc, xmlto, pypy , breezy ? null, cvs ? null, darcs ? null, fossil ? null , mercurial ? null, monotone ? null, rcs ? null diff --git a/pkgs/applications/version-management/sit/default.nix b/pkgs/applications/version-management/sit/default.nix index bd8d5db36be..83370f5c6f0 100644 --- a/pkgs/applications/version-management/sit/default.nix +++ b/pkgs/applications/version-management/sit/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libzip gnupg ] - ++ (stdenv.lib.optionals stdenv.isDarwin [ libiconv CoreFoundation Security ]); + ++ (lib.optionals stdenv.isDarwin [ libiconv CoreFoundation Security ]); preCheck = '' export HOME=$(mktemp -d) diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix index f2bd4bf576b..324c61ab194 100644 --- a/pkgs/applications/version-management/smartgithg/default.nix +++ b/pkgs/applications/version-management/smartgithg/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ jre gnome3.adwaita-icon-theme gtk3 ]; - preFixup = with stdenv.lib; '' + preFixup = with lib; '' gappsWrapperArgs+=( \ --prefix PATH : ${makeBinPath [ jre which ]} \ --prefix LD_LIBRARY_PATH : ${makeLibraryPath [ @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - desktopItem = with stdenv.lib; makeDesktopItem rec { + desktopItem = with lib; makeDesktopItem rec { name = "smartgit"; exec = "smartgit"; comment = meta.description; @@ -89,6 +89,6 @@ stdenv.mkDerivation rec { homepage = "https://www.syntevo.com/smartgit/"; license = licenses.unfree; platforms = platforms.linux; - maintainers = with stdenv.lib.maintainers; [ jraygauthier ]; + maintainers = with lib.maintainers; [ jraygauthier ]; }; } diff --git a/pkgs/applications/version-management/sourcehut/builds.nix b/pkgs/applications/version-management/sourcehut/builds.nix index 200d1d5384f..3e89fe0a4dc 100644 --- a/pkgs/applications/version-management/sourcehut/builds.nix +++ b/pkgs/applications/version-management/sourcehut/builds.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, buildPythonPackage +{ lib, fetchgit, buildPythonPackage , python , buildGoModule , srht, redis, celery, pyyaml, markdown }: diff --git a/pkgs/applications/version-management/sourcehut/core.nix b/pkgs/applications/version-management/sourcehut/core.nix index bcc47920ebe..69f8a7d4e45 100644 --- a/pkgs/applications/version-management/sourcehut/core.nix +++ b/pkgs/applications/version-management/sourcehut/core.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, fetchNodeModules, buildPythonPackage +{ lib, fetchgit, fetchNodeModules, buildPythonPackage , pgpy, flask, bleach, humanize, html5lib, markdown, psycopg2, pygments , requests, sqlalchemy, cryptography, beautifulsoup4, sqlalchemy-utils, prometheus_client , celery, alembic, importlib-metadata, mistletoe diff --git a/pkgs/applications/version-management/sourcehut/dispatch.nix b/pkgs/applications/version-management/sourcehut/dispatch.nix index c7c11cafc8b..ea3f58e3890 100644 --- a/pkgs/applications/version-management/sourcehut/dispatch.nix +++ b/pkgs/applications/version-management/sourcehut/dispatch.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, buildPythonPackage +{ lib, fetchgit, buildPythonPackage , python , srht, pyyaml, PyGithub }: diff --git a/pkgs/applications/version-management/sourcehut/fetchNodeModules.nix b/pkgs/applications/version-management/sourcehut/fetchNodeModules.nix index 047890a932c..bbc18d0442d 100644 --- a/pkgs/applications/version-management/sourcehut/fetchNodeModules.nix +++ b/pkgs/applications/version-management/sourcehut/fetchNodeModules.nix @@ -1,8 +1,8 @@ -{ stdenv, jq }: { src, nodejs, sha256 }: +{ lib, stdenv, jq }: { src, nodejs, sha256 }: # Only npm >= 5.4.2 is deterministic, see: # https://github.com/npm/npm/issues/17979#issuecomment-332701215 -assert stdenv.lib.versionAtLeast nodejs.version "8.9.0"; +assert lib.versionAtLeast nodejs.version "8.9.0"; stdenv.mkDerivation { name = "node_modules"; diff --git a/pkgs/applications/version-management/sourcehut/git.nix b/pkgs/applications/version-management/sourcehut/git.nix index 3ef49b79664..8966cbe0800 100644 --- a/pkgs/applications/version-management/sourcehut/git.nix +++ b/pkgs/applications/version-management/sourcehut/git.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, buildPythonPackage +{ lib, fetchgit, buildPythonPackage , python , buildGoModule , srht, minio, pygit2, scmsrht }: diff --git a/pkgs/applications/version-management/sourcehut/hg.nix b/pkgs/applications/version-management/sourcehut/hg.nix index d0e14090846..fae311831f2 100644 --- a/pkgs/applications/version-management/sourcehut/hg.nix +++ b/pkgs/applications/version-management/sourcehut/hg.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchhg, buildPythonPackage +{ lib, fetchhg, buildPythonPackage , python , srht, hglib, scmsrht, unidiff }: diff --git a/pkgs/applications/version-management/sourcehut/hub.nix b/pkgs/applications/version-management/sourcehut/hub.nix index 8ea4961e7d4..99b5663a9b8 100644 --- a/pkgs/applications/version-management/sourcehut/hub.nix +++ b/pkgs/applications/version-management/sourcehut/hub.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, buildPythonPackage +{ lib, fetchgit, buildPythonPackage , python , srht }: diff --git a/pkgs/applications/version-management/sourcehut/lists.nix b/pkgs/applications/version-management/sourcehut/lists.nix index a0b52a2d564..25d22dede35 100644 --- a/pkgs/applications/version-management/sourcehut/lists.nix +++ b/pkgs/applications/version-management/sourcehut/lists.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, buildPythonPackage +{ lib, fetchgit, buildPythonPackage , python , srht, asyncpg, aiosmtpd, pygit2, emailthreads }: diff --git a/pkgs/applications/version-management/sourcehut/man.nix b/pkgs/applications/version-management/sourcehut/man.nix index 26939d2bebe..24a31a3ef17 100644 --- a/pkgs/applications/version-management/sourcehut/man.nix +++ b/pkgs/applications/version-management/sourcehut/man.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, buildPythonPackage +{ lib, fetchgit, buildPythonPackage , python , srht, pygit2 }: diff --git a/pkgs/applications/version-management/sourcehut/meta.nix b/pkgs/applications/version-management/sourcehut/meta.nix index b6622d97487..d07bd29357a 100644 --- a/pkgs/applications/version-management/sourcehut/meta.nix +++ b/pkgs/applications/version-management/sourcehut/meta.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, buildPythonPackage +{ lib, fetchgit, buildPythonPackage , python , buildGoModule , pgpy, srht, redis, bcrypt, qrcode, stripe, zxcvbn, alembic, pystache diff --git a/pkgs/applications/version-management/sourcehut/paste.nix b/pkgs/applications/version-management/sourcehut/paste.nix index eaec8b710dd..12747f98103 100644 --- a/pkgs/applications/version-management/sourcehut/paste.nix +++ b/pkgs/applications/version-management/sourcehut/paste.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, buildPythonPackage +{ lib, fetchgit, buildPythonPackage , python , srht, pyyaml }: diff --git a/pkgs/applications/version-management/sourcehut/scm.nix b/pkgs/applications/version-management/sourcehut/scm.nix index 6e8b03835bc..615716d03af 100644 --- a/pkgs/applications/version-management/sourcehut/scm.nix +++ b/pkgs/applications/version-management/sourcehut/scm.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, buildPythonPackage +{ lib, fetchgit, buildPythonPackage , srht, redis, pyyaml, buildsrht , writeText }: diff --git a/pkgs/applications/version-management/sourcehut/todo.nix b/pkgs/applications/version-management/sourcehut/todo.nix index 357dcd4d2e2..85ae3b2cf14 100644 --- a/pkgs/applications/version-management/sourcehut/todo.nix +++ b/pkgs/applications/version-management/sourcehut/todo.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, buildPythonPackage +{ lib, fetchgit, buildPythonPackage , python , srht, redis, alembic, pystache , pytest, factory_boy, writeText }: diff --git a/pkgs/applications/version-management/sparkleshare/default.nix b/pkgs/applications/version-management/sparkleshare/default.nix index a7d1f86652c..da6bb386535 100644 --- a/pkgs/applications/version-management/sparkleshare/default.nix +++ b/pkgs/applications/version-management/sparkleshare/default.nix @@ -19,7 +19,7 @@ stdenv, symlinkJoin, webkit2-sharp, - xdg_utils, + xdg-utils, }: stdenv.mkDerivation rec { @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { mono openssh openssl - xdg_utils + xdg-utils ]; }}/bin \ --set MONO_GAC_PREFIX ${lib.concatStringsSep ":" [ diff --git a/pkgs/applications/version-management/srcml/default.nix b/pkgs/applications/version-management/srcml/default.nix index 6deca94fc15..c13a08a711c 100644 --- a/pkgs/applications/version-management/srcml/default.nix +++ b/pkgs/applications/version-management/srcml/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, cmake, libxml2, libxslt, boost, libarchive, python, antlr, +{ lib, stdenv, fetchurl, cmake, libxml2, libxslt, boost, libarchive, python, antlr, curl }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { version = "0.9.5_beta"; diff --git a/pkgs/applications/version-management/sublime-merge/common.nix b/pkgs/applications/version-management/sublime-merge/common.nix index 6ed644d050e..e6c83eb55d8 100644 --- a/pkgs/applications/version-management/sublime-merge/common.nix +++ b/pkgs/applications/version-management/sublime-merge/common.nix @@ -7,7 +7,7 @@ let pname = "sublime-merge"; - packageAttribute = "sublime-merge${stdenv.lib.optionalString dev "-dev"}"; + packageAttribute = "sublime-merge${lib.optionalString dev "-dev"}"; binaries = [ "sublime_merge" "crash_reporter" "git-credential-sublime" "ssh-askpass-sublime" ]; primaryBinary = "sublime_merge"; primaryBinaryAliases = [ "smerge" ]; @@ -17,7 +17,7 @@ let archSha256 = sha256; arch = "x64"; - libPath = stdenv.lib.makeLibraryPath [ xorg.libX11 glib gtk3 cairo pango ]; + libPath = lib.makeLibraryPath [ xorg.libX11 glib gtk3 cairo pango ]; redirects = [ "/usr/bin/pkexec=${pkexecPath}" "/bin/true=${coreutils}/bin/true" ]; in let binaryPackage = stdenv.mkDerivation { @@ -40,7 +40,7 @@ in let for binary in ${ builtins.concatStringsSep " " binaries }; do patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${libPath}:${libGL}/lib:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \ + --set-rpath ${libPath}:${libGL}/lib:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.is64bit "64"} \ $binary done @@ -105,11 +105,11 @@ in stdenv.mkDerivation (rec { passthru.updateScript = writeScript "${pname}-update-script" '' #!${stdenv.shell} set -o errexit - PATH=${stdenv.lib.makeBinPath [ common-updater-scripts curl gnugrep ]} + PATH=${lib.makeBinPath [ common-updater-scripts curl gnugrep ]} latestVersion=$(curl -s ${versionUrl} | grep -Po '(?<=<p class="latest"><i>Version:</i> Build )([0-9]+)') - for platform in ${stdenv.lib.concatStringsSep " " meta.platforms}; do + for platform in ${lib.concatStringsSep " " meta.platforms}; do # The script will not perform an update when the version attribute is up to date from previous platform run # We need to clear it before each run update-source-version ${packageAttribute}.${primaryBinary} 0 0000000000000000000000000000000000000000000000000000000000000000 --file=${versionFile} --version-key=buildVersion --system=$platform diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 66d22e9d718..5540e53c84e 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -31,10 +31,10 @@ let buildInputs = [ zlib apr aprutil sqlite openssl ] ++ extraBuildInputs - ++ stdenv.lib.optional httpSupport serf - ++ stdenv.lib.optional pythonBindings python - ++ stdenv.lib.optional perlBindings perl - ++ stdenv.lib.optional saslSupport sasl; + ++ lib.optional httpSupport serf + ++ lib.optional pythonBindings python + ++ lib.optional perlBindings perl + ++ lib.optional saslSupport sasl; patches = [ ./apr-1.patch ]; @@ -44,15 +44,15 @@ let CPPFLAGS = [ "-P" ]; configureFlags = [ - (stdenv.lib.withFeature bdbSupport "berkeley-db") - (stdenv.lib.withFeatureAs httpServer "apxs" "${apacheHttpd.dev}/bin/apxs") - (stdenv.lib.withFeatureAs (pythonBindings || perlBindings) "swig" swig) - (stdenv.lib.withFeatureAs saslSupport "sasl" sasl) - (stdenv.lib.withFeatureAs httpSupport "serf" serf) + (lib.withFeature bdbSupport "berkeley-db") + (lib.withFeatureAs httpServer "apxs" "${apacheHttpd.dev}/bin/apxs") + (lib.withFeatureAs (pythonBindings || perlBindings) "swig" swig) + (lib.withFeatureAs saslSupport "sasl" sasl) + (lib.withFeatureAs httpSupport "serf" serf) "--disable-keychain" "--with-zlib=${zlib.dev}" "--with-sqlite=${sqlite.dev}" - ] ++ stdenv.lib.optionals javahlBindings [ + ] ++ lib.optionals javahlBindings [ "--enable-javahl" "--with-jdk=${jdk}" ]; @@ -103,7 +103,7 @@ let platforms = platforms.linux ++ platforms.darwin; }; - } // stdenv.lib.optionalAttrs stdenv.isDarwin { + } // lib.optionalAttrs stdenv.isDarwin { CXX = "clang++"; CC = "clang"; CPP = "clang -E"; diff --git a/pkgs/applications/version-management/tkcvs/default.nix b/pkgs/applications/version-management/tkcvs/default.nix index d2a7299bcd9..6a9e910f801 100644 --- a/pkgs/applications/version-management/tkcvs/default.nix +++ b/pkgs/applications/version-management/tkcvs/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, tcl, tk}: +{lib, stdenv, fetchurl, tcl, tk}: stdenv.mkDerivation { @@ -22,7 +22,7 @@ stdenv.mkDerivation meta = { homepage = "https://tkcvs.sourceforge.io"; description = "TCL/TK GUI for cvs and subversion"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix index 3a45d126203..b75af94af56 100644 --- a/pkgs/applications/version-management/yadm/default.nix +++ b/pkgs/applications/version-management/yadm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, git, gnupg }: +{ lib, stdenv, fetchFromGitHub, git, gnupg }: let version = "2.5.0"; in stdenv.mkDerivation { @@ -35,8 +35,8 @@ stdenv.mkDerivation { * Provides a way to use alternate files on a specific OS or host. * Supplies a method of encrypting confidential data so it can safely be stored in your repository. ''; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ abathur ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ abathur ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix index 54dac5c2aa1..d39b5e179a6 100644 --- a/pkgs/applications/video/aegisub/default.nix +++ b/pkgs/applications/video/aegisub/default.nix @@ -1,4 +1,5 @@ -{ config +{ lib +, config , stdenv , fetchurl , fetchpatch @@ -45,7 +46,7 @@ assert alsaSupport -> (alsaLib != null); assert pulseaudioSupport -> (libpulseaudio != null); assert portaudioSupport -> (portaudio != null); -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "aegisub"; @@ -81,7 +82,7 @@ stdenv.mkDerivation intltool ]; - buildInputs = with stdenv.lib; [ + buildInputs = with lib; [ libX11 wxGTK fontconfig diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index 69e33f986a8..da3c25def3f 100644 --- a/pkgs/applications/video/avidemux/default.nix +++ b/pkgs/applications/video/avidemux/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, cmake, pkgconfig +{ stdenv, lib, fetchurl, cmake, pkg-config , zlib, gettext, libvdpau, libva, libXv, sqlite , yasm, freetype, fontconfig, fribidi , makeWrapper, libXext, libGLU, qttools, qtbase, wrapQtAppsHook @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = - [ yasm cmake pkgconfig ] + [ yasm cmake pkg-config ] ++ lib.optional withQT wrapQtAppsHook; buildInputs = [ zlib gettext libvdpau libva libXv sqlite fribidi fontconfig @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ++ lib.optional withVPX libvpx; buildCommand = let - qtVersion = "5.${stdenv.lib.versions.minor qtbase.version}"; + qtVersion = "5.${lib.versions.minor qtbase.version}"; wrapWith = makeWrapper: filename: "${makeWrapper} ${filename} --set ADM_ROOT_DIR $out --prefix LD_LIBRARY_PATH : ${libXext}/lib"; wrapQtApp = wrapWith "wrapQtApp"; @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { ${wrapProgram "$out/bin/avidemux3_cli"} - ${stdenv.lib.optionalString withQT '' + ${lib.optionalString withQT '' ${wrapQtApp "$out/bin/avidemux3_qt5"} ${wrapQtApp "$out/bin/avidemux3_jobs_qt5"} ''} diff --git a/pkgs/applications/video/avxsynth/default.nix b/pkgs/applications/video/avxsynth/default.nix index aed1bcef381..3fd25bdf73d 100644 --- a/pkgs/applications/video/avxsynth/default.nix +++ b/pkgs/applications/video/avxsynth/default.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config , cairo, ffmpeg_3, ffms, libjpeg, log4cpp, pango , avxeditSupport ? false, qt4 ? null }: let - inherit (stdenv.lib) enableFeature optional; + inherit (lib) enableFeature optional; in stdenv.mkDerivation { @@ -27,7 +27,7 @@ stdenv.mkDerivation { "--with-jpeg=${libjpeg.out}/lib" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ cairo ffmpeg_3 ffms libjpeg log4cpp pango ] ++ optional avxeditSupport qt4; diff --git a/pkgs/applications/video/bino3d/default.nix b/pkgs/applications/video/bino3d/default.nix index 4554bea6157..2a732ffa184 100644 --- a/pkgs/applications/video/bino3d/default.nix +++ b/pkgs/applications/video/bino3d/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchurl, pkgconfig, ffmpeg, glew, libass, openal, qtbase }: +{ mkDerivation, lib, fetchurl, pkg-config, ffmpeg, glew, libass, openal, qtbase }: mkDerivation rec { pname = "bino"; @@ -9,7 +9,7 @@ mkDerivation rec { sha256 = "04yl7ibnhajlli4a5x77az8jxbzw6b2wjay8aa6px551nmiszn9k"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ffmpeg glew libass openal qtbase ]; diff --git a/pkgs/applications/video/bombono/default.nix b/pkgs/applications/video/bombono/default.nix index 7e366da4378..8d6df2c4904 100644 --- a/pkgs/applications/video/bombono/default.nix +++ b/pkgs/applications/video/bombono/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchFromGitHub -, pkgconfig +, pkg-config , fetchpatch , scons , boost @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { {name="fix_ffmpeg30.patch"; sha256="sha256-vKEbvbjYVRzEaVYC8XOJBPmk6FDXI/WA0X/dldRRO8c=";} ]); - nativeBuildInputs = [ wrapGAppsHook scons pkgconfig gettext ]; + nativeBuildInputs = [ wrapGAppsHook scons pkg-config gettext ]; buildInputs = [ boost diff --git a/pkgs/applications/video/byzanz/default.nix b/pkgs/applications/video/byzanz/default.nix index 705bac06eb6..69d27c3a2c8 100644 --- a/pkgs/applications/video/byzanz/default.nix +++ b/pkgs/applications/video/byzanz/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, wrapGAppsHook, which, gnome3, glib, intltool, pkgconfig, libtool, cairo, gtk3, gst_all_1, xorg }: +{ lib, stdenv, fetchgit, wrapGAppsHook, which, gnome3, glib, intltool, pkg-config, libtool, cairo, gtk3, gst_all_1, xorg }: stdenv.mkDerivation { version = "0.2.3.alpha"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ which gnome3.gnome-common glib intltool libtool cairo gtk3 xorg.xwininfo ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-bad gst-plugins-good gst-plugins-ugly gst-libav wrapGAppsHook ]); diff --git a/pkgs/applications/video/ccextractor/default.nix b/pkgs/applications/video/ccextractor/default.nix index 91c47516521..881e6b687ef 100644 --- a/pkgs/applications/video/ccextractor/default.nix +++ b/pkgs/applications/video/ccextractor/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake , glew, glfw3, leptonica, libiconv, tesseract3, zlib }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "ccextractor"; version = "0.88"; @@ -15,9 +15,9 @@ stdenv.mkDerivation rec { sourceRoot = "source/src"; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; - buildInputs = [ glew glfw3 leptonica tesseract3 zlib ] ++ stdenv.lib.optional (!stdenv.isLinux) libiconv; + buildInputs = [ glew glfw3 leptonica tesseract3 zlib ] ++ lib.optional (!stdenv.isLinux) libiconv; meta = { homepage = "https://www.ccextractor.org"; diff --git a/pkgs/applications/video/celluloid/default.nix b/pkgs/applications/video/celluloid/default.nix index b59a40c03a2..57eaf91f2ae 100644 --- a/pkgs/applications/video/celluloid/default.nix +++ b/pkgs/applications/video/celluloid/default.nix @@ -5,7 +5,7 @@ , ninja , python3 , gettext -, pkgconfig +, pkg-config , desktop-file-utils , wrapGAppsHook , appstream-glib @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { python3 appstream-glib gettext - pkgconfig + pkg-config desktop-file-utils wrapGAppsHook ]; diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/applications/video/cinelerra/default.nix index 22533b182a0..bfc577e51a2 100644 --- a/pkgs/applications/video/cinelerra/default.nix +++ b/pkgs/applications/video/cinelerra/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool -, pkgconfig, faad2, faac, a52dec, alsaLib, fftw, lame, libavc1394 +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool +, pkg-config, faad2, faac, a52dec, alsaLib, fftw, lame, libavc1394 , libiec61883, libraw1394, libsndfile, libvorbis, libogg, libjpeg , libtiff, freetype, mjpegtools, x264, gettext, openexr , libXext, libXxf86vm, libXv, libXi, libX11, libXft, xorgproto, libtheora, libpng @@ -30,7 +30,7 @@ stdenv.mkDerivation { buildInputs = [ automake - autoconf libtool pkgconfig file + autoconf libtool pkg-config file faad2 faac a52dec alsaLib fftw lame libavc1394 libiec61883 libraw1394 libsndfile libvorbis libogg libjpeg libtiff freetype @@ -45,7 +45,7 @@ stdenv.mkDerivation { meta = { description = "Video Editor"; homepage = "http://www.cinelerra.org"; - maintainers = [ stdenv.lib.maintainers.marcweber ]; - license = stdenv.lib.licenses.gpl2; + maintainers = [ lib.maintainers.marcweber ]; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix index 7fcd3fce64d..6db2450d136 100644 --- a/pkgs/applications/video/clipgrab/default.nix +++ b/pkgs/applications/video/clipgrab/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeDesktopItem, ffmpeg_3 +{ lib, fetchurl, makeDesktopItem, ffmpeg_3 , qmake, qttools, mkDerivation , qtbase, qtdeclarative, qtlocation, qtquickcontrols2, qtwebchannel, qtwebengine }: @@ -16,7 +16,7 @@ mkDerivation rec { buildInputs = [ ffmpeg_3 qtbase qtdeclarative qtlocation qtquickcontrols2 qtwebchannel qtwebengine ]; nativeBuildInputs = [ qmake qttools ]; - postPatch = stdenv.lib.optionalString (ffmpeg_3 != null) '' + postPatch = lib.optionalString (ffmpeg_3 != null) '' substituteInPlace converter_ffmpeg.cpp \ --replace '"ffmpeg"' '"${ffmpeg_3.bin}/bin/ffmpeg"' \ --replace '"ffmpeg ' '"${ffmpeg_3.bin}/bin/ffmpeg ' diff --git a/pkgs/applications/video/coriander/default.nix b/pkgs/applications/video/coriander/default.nix index a094bfd904a..09289840030 100644 --- a/pkgs/applications/video/coriander/default.nix +++ b/pkgs/applications/video/coriander/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, glib, gtk2, libgnomeui, libXv, libraw1394, libdc1394 +{ lib, stdenv, fetchurl, pkg-config, glib, gtk2, libgnomeui, libXv, libraw1394, libdc1394 , SDL, automake, GConf }: stdenv.mkDerivation { @@ -13,14 +13,14 @@ stdenv.mkDerivation { cp ${automake}/share/automake-*/mkinstalldirs . ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib gtk2 libgnomeui libXv libraw1394 libdc1394 SDL GConf ]; - + meta = { homepage = "https://damien.douxchamps.net/ieee1394/coriander/"; description = "GUI for controlling a Digital Camera through the IEEE1394 bus"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/video/devede/default.nix b/pkgs/applications/video/devede/default.nix index 4b1b7ae0b60..6a4d0dc1b8d 100644 --- a/pkgs/applications/video/devede/default.nix +++ b/pkgs/applications/video/devede/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, python3Packages, ffmpeg_3, mplayer, vcdimager, cdrkit, dvdauthor +{ lib, fetchFromGitLab, python3Packages, ffmpeg_3, mplayer, vcdimager, cdrkit, dvdauthor , gtk3, gettext, wrapGAppsHook, gdk-pixbuf, gobject-introspection }: let diff --git a/pkgs/applications/video/droidcam/default.nix b/pkgs/applications/video/droidcam/default.nix index 807399408ba..3e6a06db1a8 100644 --- a/pkgs/applications/video/droidcam/default.nix +++ b/pkgs/applications/video/droidcam/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "droidcam"; - version = "1.6"; + version = "1.7.1"; src = fetchFromGitHub { owner = "aramg"; repo = "droidcam"; rev = "v${version}"; - sha256 = "sha256-3RmEmLNUbwIh+yr7vtYZnMwbzfmtW3mz5u4Ohau9OLU="; + sha256 = "sha256-f7wLi4ReExkqb+SfOK0juzKbwdcqUVkklIUOIMtmnxM="; }; nativeBuildInputs = [ @@ -29,12 +29,11 @@ stdenv.mkDerivation rec { ]; postPatch = '' - substituteInPlace linux/src/droidcam.c \ + substituteInPlace src/droidcam.c \ --replace "/opt/droidcam-icon.png" "$out/share/icons/hicolor/droidcam.png" ''; preBuild = '' - cd linux makeFlagsArray+=("JPEG=$(pkg-config --libs --cflags libturbojpeg)") makeFlagsArray+=("USBMUXD=$(pkg-config --libs --cflags libusbmuxd-2.0)") ''; diff --git a/pkgs/applications/video/dvd-slideshow/default.nix b/pkgs/applications/video/dvd-slideshow/default.nix index e35d95d54d6..95f3169718d 100644 --- a/pkgs/applications/video/dvd-slideshow/default.nix +++ b/pkgs/applications/video/dvd-slideshow/default.nix @@ -65,8 +65,8 @@ in stdenv.mkDerivation rec { meta = { description = "Suite of command line programs that creates a slideshow-style video from groups of pictures"; homepage = "http://dvd-slideshow.sourceforge.net/wiki/Main_Page"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.robbinch ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.robbinch ]; }; } diff --git a/pkgs/applications/video/dvdauthor/default.nix b/pkgs/applications/video/dvdauthor/default.nix index 6ea3a53a0af..502c4c69c3f 100644 --- a/pkgs/applications/video/dvdauthor/default.nix +++ b/pkgs/applications/video/dvdauthor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, imagemagick, libdvdread, libxml2, freetype, fribidi, libpng, zlib, pkgconfig +{ lib, stdenv, fetchurl, imagemagick, libdvdread, libxml2, freetype, fribidi, libpng, zlib, pkg-config , flex, bison }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libpng freetype libdvdread libxml2 zlib fribidi imagemagick flex bison]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; patches = [ ./dvdauthor-0.7.1-automake-1.13.patch diff --git a/pkgs/applications/video/dvdbackup/default.nix b/pkgs/applications/video/dvdbackup/default.nix index 633eea3d282..89995ab8cba 100644 --- a/pkgs/applications/video/dvdbackup/default.nix +++ b/pkgs/applications/video/dvdbackup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, libdvdread, libdvdcss, dvdauthor }: +{ lib, stdenv, fetchurl, fetchpatch, libdvdread, libdvdcss, dvdauthor }: stdenv.mkDerivation rec { version = "0.4.2"; @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { meta = { description = "A tool to rip video DVDs from the command line"; homepage = "http://dvdbackup.sourceforge.net/"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = [ stdenv.lib.maintainers.bradediger ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.bradediger ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/video/dvdstyler/default.nix b/pkgs/applications/video/dvdstyler/default.nix index e3f7f8a0702..6366a222722 100644 --- a/pkgs/applications/video/dvdstyler/default.nix +++ b/pkgs/applications/video/dvdstyler/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , flex, bison, gettext , xineUI, wxSVG , fontconfig @@ -10,7 +10,7 @@ , dbusSupport ? true, dbus ? null , makeWrapper }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "dvdstyler"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = - [ pkgconfig ]; + [ pkg-config ]; packagesToBinPath = [ cdrtools dvdauthor dvdplusrwtools ]; diff --git a/pkgs/applications/video/electronplayer/electronplayer.nix b/pkgs/applications/video/electronplayer/electronplayer.nix index a4ebbf159b8..15f5b60a09a 100644 --- a/pkgs/applications/video/electronplayer/electronplayer.nix +++ b/pkgs/applications/video/electronplayer/electronplayer.nix @@ -1,4 +1,4 @@ -{ appimageTools, lib, stdenv, fetchurl }: +{ appimageTools, lib, fetchurl }: let pname = "electronplayer"; version = "2.0.8"; diff --git a/pkgs/applications/video/epgstation/default.nix b/pkgs/applications/video/epgstation/default.nix index 62aa54ca784..f1f89b10907 100644 --- a/pkgs/applications/video/epgstation/default.nix +++ b/pkgs/applications/video/epgstation/default.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , fetchFromGitHub , common-updater-scripts , genericUpdater @@ -82,7 +83,7 @@ let makeWrapper ${nodejs}/bin/npm $out/bin/epgstation \ --run "cd $out/lib/node_modules/EPGStation" \ - --prefix PATH : ${stdenv.lib.makeBinPath runtimeDeps} + --prefix PATH : ${lib.makeBinPath runtimeDeps} popd ''; @@ -90,7 +91,7 @@ let # NOTE: this may take a while since it has to update all packages in # nixpkgs.nodePackages passthru.updateScript = import ./update.nix { - inherit (stdenv) lib; + inherit lib; inherit (src.meta) homepage; inherit pname @@ -113,7 +114,7 @@ in pkg // { name = "${pname}-${version}"; - meta = with stdenv.lib; pkg.meta // { + meta = with lib; pkg.meta // { maintainers = with maintainers; [ midchildan ]; # NOTE: updateScript relies on this being correct diff --git a/pkgs/applications/video/filebot/default.nix b/pkgs/applications/video/filebot/default.nix index ba0627fc0fa..0e7cce4fee7 100644 --- a/pkgs/applications/video/filebot/default.nix +++ b/pkgs/applications/video/filebot/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { --replace 'APP_DATA="$FILEBOT_HOME/data/$(id -u)"' 'APP_DATA=''${XDG_DATA_HOME:-$HOME/.local/share}/filebot/data' \ --replace '$FILEBOT_HOME/data/.license' '$APP_DATA/.license' wrapProgram $out/opt/filebot.sh \ - --prefix PATH : ${stdenv.lib.makeBinPath [ openjdk11 ]} + --prefix PATH : ${lib.makeBinPath [ openjdk11 ]} # Expose the binary in bin to make runnable. ln -s $out/opt/filebot.sh $out/bin/filebot ''; diff --git a/pkgs/applications/video/gnome-mplayer/default.nix b/pkgs/applications/video/gnome-mplayer/default.nix index 88dfe5b4b87..de56865410e 100644 --- a/pkgs/applications/video/gnome-mplayer/default.nix +++ b/pkgs/applications/video/gnome-mplayer/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, substituteAll, fetchFromGitHub, pkgconfig, gettext, glib, gtk3, gmtk, dbus, dbus-glib +{lib, stdenv, substituteAll, fetchFromGitHub, pkg-config, gettext, glib, gtk3, gmtk, dbus, dbus-glib , libnotify, libpulseaudio, mplayer, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0qvy9fllvg1mad6y1j79iaqa6khs0q2cb0z62yfg4srbr07fi8xr"; }; - nativeBuildInputs = [ pkgconfig gettext wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config gettext wrapGAppsHook ]; buildInputs = [ glib gtk3 gmtk dbus dbus-glib libnotify libpulseaudio ]; patches = [ diff --git a/pkgs/applications/video/go-chromecast/default.nix b/pkgs/applications/video/go-chromecast/default.nix index 8dd10fff89a..10047b2148b 100644 --- a/pkgs/applications/video/go-chromecast/default.nix +++ b/pkgs/applications/video/go-chromecast/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-chromecast"; - version = "0.2.6"; + version = "0.2.8"; src = fetchFromGitHub { owner = "vishen"; repo = pname; rev = "v${version}"; - sha256 = "0frvj1van1qn7hi96m0l7pzm4jf0v49xl4r4fi2lh1yqzgsgzy9f"; + sha256 = "sha256-ehIhFqZeVidhYTgqOLlf0aMHKG0cOe6245UyOVM/nOg="; }; - vendorSha256 = "0vgbmgk07kqmhhmcssy1ibr2hzk07hf32kkdyj2b9jqj9sb49p49"; + vendorSha256 = "sha256-idxElk4Sy7SE9G1OMRw8YH4o8orBa80qhBXPA+ar620="; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev} -X main.date=unknown" ]; diff --git a/pkgs/applications/video/gpac/default.nix b/pkgs/applications/video/gpac/default.nix index 906d119dfc5..6597b5fbffe 100644 --- a/pkgs/applications/video/gpac/default.nix +++ b/pkgs/applications/video/gpac/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, zlib }: +{ lib, stdenv, fetchFromGitHub, pkg-config, zlib }: stdenv.mkDerivation rec { version = "1.0.1"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # this is the bare minimum configuration, as I'm only interested in MP4Box # For most other functionality, this should probably be extended - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib ]; diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index 16db55f060d..6317d7b1ab3 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -9,7 +9,7 @@ { stdenv, lib, fetchFromGitHub, # Main build tools - pkgconfig, autoconf, automake, libtool, m4, lzma, python3, + pkg-config, autoconf, automake, libtool, m4, lzma, python3, numactl, # Processing, video codecs, containers ffmpeg-full, nv-codec-headers, libogg, x264, x265, libvpx, libtheora, dav1d, @@ -93,7 +93,7 @@ _EOF ''); nativeBuildInputs = [ - pkgconfig autoconf automake libtool m4 python3 + pkg-config autoconf automake libtool m4 python3 ] ++ lib.optionals useGtk [ intltool wrapGAppsHook ]; buildInputs = [ diff --git a/pkgs/applications/video/jellyfin-mpv-shim/default.nix b/pkgs/applications/video/jellyfin-mpv-shim/default.nix index fe06e9431f9..6dc42a47685 100644 --- a/pkgs/applications/video/jellyfin-mpv-shim/default.nix +++ b/pkgs/applications/video/jellyfin-mpv-shim/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, fetchFromGitHub, callPackage +{ lib, buildPythonApplication, fetchFromGitHub, callPackage , mpv, python-mpv-jsonipc, jellyfin-apiclient-python , pillow, tkinter, pystray, jinja2, pywebview }: diff --git a/pkgs/applications/video/kazam/default.nix b/pkgs/applications/video/kazam/default.nix index d47b5fddf88..35b7d173257 100644 --- a/pkgs/applications/video/kazam/default.nix +++ b/pkgs/applications/video/kazam/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, substituteAll, python3, gst_all_1, wrapGAppsHook, gobject-introspection +{ lib, fetchurl, substituteAll, python3, gst_all_1, wrapGAppsHook, gobject-introspection , gtk3, libwnck3, keybinder3, intltool, libcanberra-gtk3, libappindicator-gtk3, libpulseaudio , fetchpatch }: @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { ]; propagatedBuildInputs = with python3.pkgs; [ pygobject3 pyxdg pycairo dbus-python ]; - + # workaround https://github.com/NixOS/nixpkgs/issues/56943 strictDeps = false; diff --git a/pkgs/applications/video/kino/default.nix b/pkgs/applications/video/kino/default.nix index 3f41e73dfa7..5f12dd6494b 100644 --- a/pkgs/applications/video/kino/default.nix +++ b/pkgs/applications/video/kino/default.nix @@ -50,8 +50,8 @@ #AMR-WB float support no #AMR-WB IF2 support no -{ stdenv, fetchurl, gtk2, libglade, libxml2, libraw1394, libsamplerate, libdv -, pkgconfig, perlPackages, libavc1394, libiec61883, libXv, gettext +{ lib, stdenv, fetchurl, gtk2, libglade, libxml2, libraw1394, libsamplerate, libdv +, pkg-config, perlPackages, libavc1394, libiec61883, libXv, gettext , libX11, glib, cairo, intltool, ffmpeg, libv4l }: @@ -64,7 +64,7 @@ stdenv.mkDerivation { }; buildInputs = [ gtk2 libglade libxml2 libraw1394 libsamplerate libdv - pkgconfig libavc1394 libiec61883 intltool libXv gettext libX11 glib cairo ffmpeg libv4l ] # TODOoptional packages + pkg-config libavc1394 libiec61883 intltool libXv gettext libX11 glib cairo ffmpeg libv4l ] # TODOoptional packages ++ (with perlPackages; [ perl XMLParser ]); configureFlags = [ "--enable-local-ffmpeg=no" ]; @@ -89,7 +89,7 @@ stdenv.mkDerivation { meta = { description = "Non-linear DV editor for GNU/Linux"; homepage = "http://www.kinodv.org/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index 4726c1b7b51..3aaa465a3cc 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchpatch, fetchurl, fetchFromGitHub, autoconf, automake, libtool, makeWrapper, linuxHeaders -, pkgconfig, cmake, gnumake, yasm, python2Packages +, pkg-config, cmake, gnumake, yasm, python2Packages , libgcrypt, libgpgerror, libunistring , boost, avahi, lame, autoreconfHook , gettext, pcre-cpp, yajl, fribidi, which @@ -99,11 +99,11 @@ let "-DCROSSCOMPILING=ON" "-DCPU=${stdenv.hostPlatform.parsed.cpu.name}" "-DOS=${stdenv.hostPlatform.parsed.kernel.name}" - "-DPKG_CONFIG_EXECUTABLE=pkgconfig" + "-DPKG_CONFIG_EXECUTABLE=pkg-config" ]; buildInputs = [ libidn libtasn1 p11-kit zlib libva ] ++ lib.optional vdpauSupport libvdpau; - nativeBuildInputs = [ cmake nasm pkgconfig gnutls ]; + nativeBuildInputs = [ cmake nasm pkg-config gnutls ]; }; # We can build these externally but FindLibDvd.cmake forces us to build it @@ -114,7 +114,7 @@ let rev = "${version}-${rel}-Beta-5"; sha256 = "0j41ydzx0imaix069s3z07xqw9q95k7llh06fc27dcn6f7b8ydyl"; buildInputs = [ linuxHeaders ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; postPatch = '' rm -rf msvc @@ -133,7 +133,7 @@ let rev = "${version}-${rel}-Alpha-3"; sha256 = "0qwlf4lgahxqxk1r2pzl866mi03pbp7l1fc0rk522sc0ak2s9jhb"; buildInputs = [ libdvdcss libdvdread ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; postPatch = cmakeProtoPatch; postInstall = '' mv $out/lib/liblibdvdnav.so $out/lib/libdvdnav.so @@ -146,7 +146,7 @@ let rev = "${version}-${rel}-Alpha-3"; sha256 = "1xxn01mhkdnp10cqdr357wx77vyzfb5glqpqyg8m0skyi75aii59"; buildInputs = [ libdvdcss ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; configureFlags = [ "--with-libdvdcss" ]; postPatch = cmakeProtoPatch; }; @@ -208,7 +208,7 @@ in stdenv.mkDerivation { doxygen makeWrapper which - pkgconfig gnumake + pkg-config gnumake autoconf automake libtool # still needed for some components. Check if that is the case with 19.0 jre_headless yasm gettext python2Packages.python flatbuffers diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index a0ef8b7e8fe..7d9fdcc3d00 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -4,7 +4,7 @@ , python2Packages, expat, glib, nspr, nss, openssl , libssh, libarchive, lzma, bzip2, lz4, lzo }: -with stdenv.lib; +with lib; let self = rec { diff --git a/pkgs/applications/video/kodi/wrapper.nix b/pkgs/applications/video/kodi/wrapper.nix index d0a7ed5e23c..80a36df3de7 100644 --- a/pkgs/applications/video/kodi/wrapper.nix +++ b/pkgs/applications/video/kodi/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, makeWrapper, buildEnv, kodi, plugins }: +{ lib, makeWrapper, buildEnv, kodi, plugins }: let drvName = builtins.parseDrvName kodi.name; @@ -18,7 +18,7 @@ in buildEnv { --prefix PYTHONPATH : ${kodi.pythonPackages.makePythonPath plugins} \ --prefix KODI_HOME : $out/share/kodi \ --prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath - (stdenv.lib.concatMap + (lib.concatMap (plugin: plugin.extraRuntimeDependencies or []) plugins)}" done ''; diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/applications/video/lightworks/default.nix index 97e5e67aaec..1776aab0033 100644 --- a/pkgs/applications/video/lightworks/default.nix +++ b/pkgs/applications/video/lightworks/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, dpkg, makeWrapper, buildFHSUserEnv +{ lib, stdenv, fetchurl, dpkg, makeWrapper, buildFHSUserEnv , gtk3, gdk-pixbuf, cairo, libjpeg_original, glib, pango, libGLU , nvidia_cg_toolkit, zlib, openssl, portaudio }: let - fullPath = stdenv.lib.makeLibraryPath [ + fullPath = lib.makeLibraryPath [ stdenv.cc.cc gtk3 gdk-pixbuf @@ -80,8 +80,8 @@ in buildFHSUserEnv { meta = { description = "Professional Non-Linear Video Editor"; homepage = "https://www.lwks.com/"; - license = stdenv.lib.licenses.unfree; - maintainers = [ stdenv.lib.maintainers.antonxy ]; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.antonxy ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/video/linuxstopmotion/default.nix b/pkgs/applications/video/linuxstopmotion/default.nix index 365fb1ea417..ad9a77af080 100644 --- a/pkgs/applications/video/linuxstopmotion/default.nix +++ b/pkgs/applications/video/linuxstopmotion/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchgit, pkgconfig, qmake, qtbase, qttools, qtmultimedia, libvorbis, libtar, libxml2 }: +{ mkDerivation, lib, fetchgit, pkg-config, qmake, qtbase, qttools, qtmultimedia, libvorbis, libtar, libxml2 }: mkDerivation rec { version = "0.8.5"; @@ -10,7 +10,7 @@ mkDerivation rec { sha256 = "1612lkwsfzc59wvdj2zbj5cwsyw66bwn31jrzjrxvygxdh4ab069"; }; - nativeBuildInputs = [ qmake pkgconfig ]; + nativeBuildInputs = [ qmake pkg-config ]; buildInputs = [ qtbase qttools qtmultimedia libvorbis libtar libxml2 ]; postPatch = '' diff --git a/pkgs/applications/video/lxdvdrip/default.nix b/pkgs/applications/video/lxdvdrip/default.nix index 16ade40f0b5..6a10aca398c 100644 --- a/pkgs/applications/video/lxdvdrip/default.nix +++ b/pkgs/applications/video/lxdvdrip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libdvdread }: +{ lib, stdenv, fetchurl, libdvdread }: stdenv.mkDerivation rec { name = "lxdvdrip-1.76"; @@ -20,10 +20,10 @@ stdenv.mkDerivation rec { buildInputs = [ libdvdread ]; - meta = { + meta = { description = "Command line tool to make a copy from a video DVD for private use"; homepage = "https://sourceforge.net/projects/lxdvdrip"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index 35b0d41907b..cec6468c43b 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , mkDerivation , fetchurl , autoPatchelfHook @@ -43,9 +43,9 @@ in mkDerivation { qtWrapperArgs = let - binPath = stdenv.lib.makeBinPath [ jre_headless ]; - in stdenv.lib.optionals withJava [ - ''--prefix PATH : ${binPath}'' + binPath = lib.makeBinPath [ jre_headless ]; + in lib.optionals withJava [ + "--prefix PATH : ${binPath}" ]; installPhase = '' diff --git a/pkgs/applications/video/manim/default.nix b/pkgs/applications/video/manim/default.nix index 667b2bb2b88..f2d33506ffc 100644 --- a/pkgs/applications/video/manim/default.nix +++ b/pkgs/applications/video/manim/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonApplication, fetchFromGitHub, pythonOlder, file, fetchpatch -, cairo, ffmpeg_3, sox, xdg_utils, texlive +, cairo, ffmpeg_3, sox, xdg-utils, texlive , colour, numpy, pillow, progressbar, scipy, tqdm, opencv , pycairo, pydub , pbr, fetchPypi }: @@ -28,14 +28,14 @@ buildPythonApplication rec { pycairo pydub - cairo sox ffmpeg_3 xdg_utils + cairo sox ffmpeg_3 xdg-utils ]; # Test with texlive to see whether it works but don't propagate # because it's huge and optional # TODO: Use smaller TexLive distribution # Doesn't need everything but it's hard to figure out what it needs - checkInputs = [ cairo sox ffmpeg_3 xdg_utils texlive.combined.scheme-full ]; + checkInputs = [ cairo sox ffmpeg_3 xdg-utils texlive.combined.scheme-full ]; # Simple test and complex test with LaTeX checkPhase = '' diff --git a/pkgs/applications/video/mapmap/default.nix b/pkgs/applications/video/mapmap/default.nix index 284cc4ae58a..6bca33eb388 100644 --- a/pkgs/applications/video/mapmap/default.nix +++ b/pkgs/applications/video/mapmap/default.nix @@ -6,7 +6,7 @@ , liblo , gst_all_1 , qmake -, pkgconfig +, pkg-config , wrapQtAppsHook }: @@ -26,7 +26,7 @@ mkDerivation rec { nativeBuildInputs = [ qmake - pkgconfig + pkg-config wrapQtAppsHook ]; diff --git a/pkgs/applications/video/mediathekview/default.nix b/pkgs/applications/video/mediathekview/default.nix index 6a8731dd72e..1e4f4785265 100644 --- a/pkgs/applications/video/mediathekview/default.nix +++ b/pkgs/applications/video/mediathekview/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "13.5.1"; + version = "13.7.0"; pname = "mediathekview"; src = fetchurl { url = "https://download.mediathekview.de/stabil/MediathekView-${version}-linux.tar.gz"; - sha256 = "0fixr6drim0wmh4q44zikcla4mrnm44nm95d5naqsgx6idalddrc"; + sha256 = "sha256-9SQUsxs/Zt7YaZo6FdeEF3MOUO3IbkDGwV5i72/X4bk="; }; nativeBuildInputs = [ makeWrapper ]; @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { install -m644 MediathekView.jar $out/lib makeWrapper ${jre}/bin/java $out/bin/mediathek \ - --add-flags "-Xmx1G -jar $out/lib/MediathekView.jar" + --add-flags "-Xmx1G --enable-preview -jar $out/lib/MediathekView.jar" makeWrapper ${jre}/bin/java $out/bin/MediathekView \ - --add-flags "-Xmx1G -jar $out/lib/MediathekView.jar" + --add-flags "-Xmx1G --enable-preview -jar $out/lib/MediathekView.jar" makeWrapper ${jre}/bin/java $out/bin/MediathekView_ipv4 \ - --add-flags "-Xmx1G -Djava.net.preferIPv4Stack=true -jar $out/lib/MediathekView.jar" + --add-flags "-Xmx1G --enable-preview -Djava.net.preferIPv4Stack=true -jar $out/lib/MediathekView.jar" ''; meta = with lib; { diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 9ad64e72fd3..8ac7af3b216 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchFromGitLab, pkgconfig, autoconf, automake, libiconv, drake -, ruby, docbook_xsl, file, xdg_utils, gettext, expat, boost, libebml, zlib +{ lib, stdenv, fetchFromGitLab, pkg-config, autoconf, automake, libiconv, drake +, ruby, docbook_xsl, file, xdg-utils, gettext, expat, boost, libebml, zlib , fmt, libmatroska, libogg, libvorbis, flac, libxslt, cmark, pcre2 , withGUI ? true , qtbase ? null @@ -9,7 +9,7 @@ assert withGUI -> qtbase != null && qtmultimedia != null && wrapQtAppsHook != null; -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "mkvtoolnix"; @@ -23,12 +23,12 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig autoconf automake gettext + pkg-config autoconf automake gettext drake ruby docbook_xsl libxslt ]; buildInputs = [ - expat file xdg_utils boost libebml zlib fmt + expat file xdg-utils boost libebml zlib fmt libmatroska libogg libvorbis flac cmark pcre2 ] ++ optional stdenv.isDarwin libiconv ++ optionals withGUI [ qtbase qtmultimedia wrapQtAppsHook ]; diff --git a/pkgs/applications/video/molotov/default.nix b/pkgs/applications/video/molotov/default.nix index c4ee96cc246..3015bc1191b 100644 --- a/pkgs/applications/video/molotov/default.nix +++ b/pkgs/applications/video/molotov/default.nix @@ -2,11 +2,11 @@ let pname = "molotov"; - version = "4.2.2"; + version = "4.4.0"; name = "${pname}-${version}"; src = fetchurl { url = "http://desktop-auto-upgrade.molotov.tv/linux/${version}/molotov.AppImage"; - sha256 = "00p8srf4yswbihlsi3s7kfkav02h902yvrq99wys11is63n01x8z"; + sha256 = "sha256-l4Il6i8uXSeJqH3ITC8ZUpKXPQb0qcW7SpKx1R46XDc="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; in @@ -15,7 +15,7 @@ appimageTools.wrapType2 { extraInstallCommands = '' mv $out/bin/${name} $out/bin/${pname} install -m 444 -D \ - ${appimageContents}/${pname}.desktop \ + ${appimageContents}/@molotovdesktop-wrapper.desktop \ $out/share/applications/${pname}.desktop substituteInPlace $out/share/applications/${pname}.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' diff --git a/pkgs/applications/video/motion/default.nix b/pkgs/applications/video/motion/default.nix index b3732647162..53db96e31d4 100644 --- a/pkgs/applications/video/motion/default.nix +++ b/pkgs/applications/video/motion/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config , ffmpeg, libjpeg, libmicrohttpd }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "09xs815jsivcilpmnrx2jkcxirj4lg5kp99fkr0p2sdxw03myi95"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ ffmpeg libjpeg libmicrohttpd ]; diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index 86047239cc5..4e245b70d4f 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, fetchurl, pkgconfig, freetype, yasm, ffmpeg_3 +{ config, lib, stdenv, fetchurl, pkg-config, freetype, yasm, ffmpeg_3 , aalibSupport ? true, aalib ? null , fontconfigSupport ? true, fontconfig ? null, freefont_ttf ? null , fribidiSupport ? true, fribidi ? null @@ -84,7 +84,7 @@ let cp -prv * $out ''; - meta.license = stdenv.lib.licenses.unfree; + meta.license = lib.licenses.unfree; } else null; crossBuild = stdenv.hostPlatform != stdenv.buildPlatform; @@ -107,8 +107,8 @@ stdenv.mkDerivation rec { ''; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ pkgconfig yasm ]; - buildInputs = with stdenv.lib; + nativeBuildInputs = [ pkg-config yasm ]; + buildInputs = with lib; [ freetype ffmpeg_3 ] ++ optional aalibSupport aalib ++ optional fontconfigSupport fontconfig @@ -139,7 +139,7 @@ stdenv.mkDerivation rec { ; configurePlatforms = [ ]; - configureFlags = with stdenv.lib; [ + configureFlags = with lib; [ "--enable-freetype" (if fontconfigSupport then "--enable-fontconfig" else "--disable-fontconfig") (if x11Support then "--enable-x11 --enable-gl" else "--disable-x11 --disable-gl") @@ -199,19 +199,19 @@ stdenv.mkDerivation rec { echo CONFIG_MPEGAUDIODSP=yes >> config.mak ''; - NIX_LDFLAGS = with stdenv.lib; toString ( + NIX_LDFLAGS = with lib; toString ( optional fontconfigSupport "-lfontconfig" ++ optional fribidiSupport "-lfribidi" ++ optionals x11Support [ "-lX11" "-lXext" ] ++ [ "-lfreetype" ] ); - installTargets = [ "install" ] ++ stdenv.lib.optional x11Support "install-gui"; + installTargets = [ "install" ] ++ lib.optional x11Support "install-gui"; enableParallelBuilding = true; # Provide a reasonable standard font when not using fontconfig. Maybe we should symlink here. - postInstall = stdenv.lib.optionalString (!fontconfigSupport) + postInstall = lib.optionalString (!fontconfigSupport) '' mkdir -p $out/share/mplayer cp ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mplayer/subfont.ttf @@ -224,7 +224,7 @@ stdenv.mkDerivation rec { description = "A movie player that supports many video formats"; homepage = "http://mplayerhq.hu"; license = "GPL"; - maintainers = [ stdenv.lib.maintainers.eelco ]; + maintainers = [ lib.maintainers.eelco ]; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 8d487fecfde..d4fc07d1a2e 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -1,5 +1,5 @@ { config, lib, stdenv, fetchFromGitHub, fetchpatch -, addOpenGLRunpath, docutils, perl, pkgconfig, python3, wafHook, which +, addOpenGLRunpath, docutils, perl, pkg-config, python3, wafHook, which , ffmpeg, freefont_ttf, freetype, libass, libpthreadstubs, mujs , nv-codec-headers, lua, libuchardet, libiconv ? null , CoreFoundation, Cocoa, CoreAudio, MediaPlayer @@ -56,7 +56,7 @@ , zimgSupport ? true, zimg ? null }: -with stdenv.lib; +with lib; let available = x: x != null; @@ -149,10 +149,10 @@ in stdenv.mkDerivation rec { (enableFeature waylandSupport "wayland") (enableFeature stdenv.isLinux "dvbin") ] # Disable whilst Swift isn't supported - ++ stdenv.lib.optional (!swiftSupport) "--disable-macos-cocoa-cb"; + ++ lib.optional (!swiftSupport) "--disable-macos-cocoa-cb"; nativeBuildInputs = [ - addOpenGLRunpath docutils perl pkgconfig python3 wafHook which + addOpenGLRunpath docutils perl pkg-config python3 wafHook which ] ++ optional swiftSupport swift; diff --git a/pkgs/applications/video/mpv/scripts/mpris.nix b/pkgs/applications/video/mpv/scripts/mpris.nix index 020c38c8b57..1b5404fede1 100644 --- a/pkgs/applications/video/mpv/scripts/mpris.nix +++ b/pkgs/applications/video/mpv/scripts/mpris.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchpatch, fetchFromGitHub, pkgconfig, glib, mpv-unwrapped }: +{ lib, stdenv, fetchpatch, fetchFromGitHub, pkg-config, glib, mpv-unwrapped }: stdenv.mkDerivation rec { pname = "mpv-mpris"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib mpv-unwrapped ]; diff --git a/pkgs/applications/video/mpv/scripts/mpvacious.nix b/pkgs/applications/video/mpv/scripts/mpvacious.nix new file mode 100644 index 00000000000..5bfcd2ac32c --- /dev/null +++ b/pkgs/applications/video/mpv/scripts/mpvacious.nix @@ -0,0 +1,38 @@ +{ lib, stdenv, fetchFromGitHub, curl, xclip }: + +stdenv.mkDerivation rec { + pname = "mpvacious"; + version = "0.12"; + + src = fetchFromGitHub { + owner = "Ajatt-Tools"; + repo = "mpvacious"; + rev = "v${version}"; + sha256 = "1xz4qh2ibfv03m3pfdasim9byvlm78wigx1linmih19vgg99vky2"; + }; + + postPatch = '' + substituteInPlace subs2srs.lua \ + --replace "'curl'" "'${curl}/bin/curl'" \ + --replace "xclip" "${xclip}/bin/xclip" + ''; + + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/mpv/scripts + cp subs2srs.lua $out/share/mpv/scripts + runHook postInstall + ''; + + passthru.scriptName = "subs2srs.lua"; + + meta = with lib; { + description = "Adds mpv keybindings to create Anki cards from movies and TV shows"; + homepage = "https://github.com/Ajatt-Tools/mpvacious"; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = with maintainers; [ kmicklas ]; + }; +} diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix index 5a789654644..236aec2ee56 100644 --- a/pkgs/applications/video/mythtv/default.nix +++ b/pkgs/applications/video/mythtv/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, which, qtbase, qtwebkit, qtscript, xlibsWrapper +{ lib, mkDerivation, fetchFromGitHub, which, qtbase, qtwebkit, qtscript, xlibsWrapper , libpulseaudio, fftwSinglePrec , lame, zlib, libGLU, libGL, alsaLib, freetype -, perl, pkgconfig , libsamplerate, libbluray, lzo, libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm +, perl, pkg-config , libsamplerate, libbluray, lzo, libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm , libXmu , yasm, libuuid, taglib, libtool, autoconf, automake, file, exiv2, linuxHeaders }: @@ -20,16 +20,16 @@ mkDerivation rec { ./disable-os-detection.patch ]; - setSourceRoot = ''sourceRoot=$(echo */mythtv)''; + setSourceRoot = "sourceRoot=$(echo */mythtv)"; buildInputs = [ freetype qtbase qtwebkit qtscript lame zlib xlibsWrapper libGLU libGL perl libsamplerate libbluray lzo alsaLib libpulseaudio fftwSinglePrec libX11 libXv libXrandr libXvMC libXmu libXinerama libXxf86vm libXmu libuuid taglib exiv2 ]; - nativeBuildInputs = [ pkgconfig which yasm libtool autoconf automake file ]; + nativeBuildInputs = [ pkg-config which yasm libtool autoconf automake file ]; - configureFlags = + configureFlags = [ "--dvb-path=${linuxHeaders}/include" ]; meta = with lib; { diff --git a/pkgs/applications/video/natron/default.nix b/pkgs/applications/video/natron/default.nix index 75d271c4878..a455869ebf9 100644 --- a/pkgs/applications/video/natron/default.nix +++ b/pkgs/applications/video/natron/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, qt4, pkgconfig, boost, expat, cairo, python2Packages, +{ lib, stdenv, fetchurl, qt4, pkg-config, boost, expat, cairo, python2Packages, cmake, flex, bison, pango, librsvg, librevenge, libxml2, libcdr, libzip, poppler, imagemagick, openexr, ffmpeg_3, opencolorio, openimageio, qmake4Hook, libpng, libGL, lndir }: @@ -50,7 +50,7 @@ let ({ pluginName = "arena"; sha256 = "0qba13vn9qdfax7nqlz1ps27zspr5kh795jp1xvbmwjzjzjpkqkf"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pango librsvg librevenge libcdr opencolorio libxml2 libzip poppler imagemagick @@ -66,7 +66,7 @@ let ({ pluginName = "io"; sha256 = "0s196i9fkgr9iw92c94mxgs1lkxbhynkf83vmsgrldflmf0xjky7"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libpng ffmpeg_3 openexr opencolorio openimageio boost libGL seexpr @@ -93,7 +93,7 @@ stdenv.mkDerivation { sha256 = "1wdc0zqriw2jhlrhzs6af3kagrv22cm086ffnbr1x43mgc9hfhjp"; }; - nativeBuildInputs = [ qmake4Hook pkgconfig python2Packages.wrapPython ]; + nativeBuildInputs = [ qmake4Hook pkg-config python2Packages.wrapPython ]; buildInputs = [ qt4 boost expat cairo python2Packages.pyside python2Packages.pysideShiboken @@ -121,7 +121,7 @@ stdenv.mkDerivation { functionalities to Adobe After Effects and Nuke by The Foundry. ''; homepage = "https://natron.fr/"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; maintainers = [ maintainers.puffnfresh ]; platforms = platforms.linux; broken = true; diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 1f8357324ea..9fdb78c7038 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -19,7 +19,7 @@ , curl , xorg , makeWrapper -, pkgconfig +, pkg-config , libvlc , mbedtls @@ -36,21 +36,21 @@ }: let - inherit (stdenv.lib) optional optionals; + inherit (lib) optional optionals; in mkDerivation rec { pname = "obs-studio"; - version = "26.0.2"; + version = "26.1.2"; src = fetchFromGitHub { owner = "obsproject"; repo = "obs-studio"; - rev = "refs/tags/${version}"; - sha256 = "1bf56z2yb7gq1knqwcqj369c3wl9jr3wll5vlngmfy2gwqrczjmw"; + rev = version; + sha256 = "1plr5a7k5scxlibhbknhhk19ipk8las14dzs7v64zx7rhpj00009"; fetchSubmodules = true; }; - nativeBuildInputs = [ addOpenGLRunpath cmake pkgconfig ]; + nativeBuildInputs = [ addOpenGLRunpath cmake pkg-config ]; buildInputs = [ curl @@ -105,7 +105,7 @@ in mkDerivation rec { --prefix "LD_LIBRARY_PATH" : "${xorg.libX11.out}/lib:${libvlc}/lib" ''; - postFixup = stdenv.lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.isLinux '' addOpenGLRunpath $out/lib/lib*.so addOpenGLRunpath $out/lib/obs-plugins/*.so ''; diff --git a/pkgs/applications/video/obs-studio/obs-gstreamer.nix b/pkgs/applications/video/obs-studio/obs-gstreamer.nix new file mode 100644 index 00000000000..e32ec7575b2 --- /dev/null +++ b/pkgs/applications/video/obs-studio/obs-gstreamer.nix @@ -0,0 +1,44 @@ +{ lib +, stdenv +, fetchFromGitHub +, gst_all_1 +, pkg-config +, meson +, ninja +, obs-studio +}: + +stdenv.mkDerivation rec { + pname = "obs-gstreamer"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "fzwoch"; + repo = "obs-gstreamer"; + rev = "v${version}"; + sha256 = "1fdpwr8br8x9cnrhr3j4f0l81df26n3bj2ibi3cg96rl86054nid"; + }; + + nativeBuildInputs = [ pkg-config meson ninja ]; + buildInputs = [ gst_all_1.gstreamermm obs-studio ]; + + # obs-studio expects the shared object to be located in bin/32bit or bin/64bit + # https://github.com/obsproject/obs-studio/blob/d60c736cb0ec0491013293c8a483d3a6573165cb/libobs/obs-nix.c#L48 + postInstall = let + pluginPath = { + i686-linux = "bin/32bit"; + x86_64-linux = "bin/64bit"; + }.${stdenv.targetPlatform.system} or (throw "Unsupported system: ${stdenv.targetPlatform.system}"); + in '' + mkdir -p $out/share/obs/obs-plugins/obs-gstreamer/${pluginPath} + ln -s $out/lib/obs-plugins/obs-gstreamer.so $out/share/obs/obs-plugins/obs-gstreamer/${pluginPath} + ''; + + meta = with lib; { + description = "An OBS Studio source, encoder and video filter plugin to use GStreamer elements/pipelines in OBS Studio"; + homepage = "https://github.com/fswoch/obs-gstreamer"; + maintainers = with maintainers; [ ahuzik ]; + license = licenses.gpl2Plus; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; +} diff --git a/pkgs/applications/video/obs-studio/obs-move-transition.nix b/pkgs/applications/video/obs-studio/obs-move-transition.nix index 70985b438c6..9a896c7320a 100644 --- a/pkgs/applications/video/obs-studio/obs-move-transition.nix +++ b/pkgs/applications/video/obs-studio/obs-move-transition.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "obs-move-transition"; - version = "2.0.2"; + version = "2.3.0"; src = fetchFromGitHub { owner = "exeldro"; repo = "obs-move-transition"; rev = version; - sha256 = "0kr868lxlanq0y98f2hb70y92ac2nla8khsj879kjf3z6dqdpd66"; + sha256 = "0cl6z3cvdjmbisvfcy281pcg6rhxmyfs31rwv7q4x39352rcs1nw"; }; nativeBuildInputs = [ cmake ]; @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { substituteInPlace move-source-filter.c --replace '<../UI/obs-frontend-api/obs-frontend-api.h>' '<obs-frontend-api.h>' substituteInPlace move-value-filter.c --replace '<../UI/obs-frontend-api/obs-frontend-api.h>' '<obs-frontend-api.h>' substituteInPlace move-transition.c --replace '<../UI/obs-frontend-api/obs-frontend-api.h>' '<obs-frontend-api.h>' + substituteInPlace audio-move.c --replace '<../UI/obs-frontend-api/obs-frontend-api.h>' '<obs-frontend-api.h>' ''; # obs-studio expects the shared object to be located in bin/32bit or bin/64bit diff --git a/pkgs/applications/video/obs-studio/obs-ndi.nix b/pkgs/applications/video/obs-studio/obs-ndi.nix index d9867b1bb2d..b35398d65b5 100644 --- a/pkgs/applications/video/obs-studio/obs-ndi.nix +++ b/pkgs/applications/video/obs-studio/obs-ndi.nix @@ -31,6 +31,8 @@ stdenv.mkDerivation rec { "-DCMAKE_CXX_FLAGS=-I${obs-studio.src}/UI/obs-frontend-api" ]; + dontWrapQtApps = true; + meta = with lib; { description = "Network A/V plugin for OBS Studio"; homepage = "https://github.com/Palakis/obs-ndi"; diff --git a/pkgs/applications/video/obs-studio/rename-obs-move-transition-cmake.patch b/pkgs/applications/video/obs-studio/rename-obs-move-transition-cmake.patch index 24c1848c10b..ed6df1d565d 100644 --- a/pkgs/applications/video/obs-studio/rename-obs-move-transition-cmake.patch +++ b/pkgs/applications/video/obs-studio/rename-obs-move-transition-cmake.patch @@ -7,7 +7,7 @@ index d116619..a1366ce 100644 + cmake_policy(SET CMP0048 NEW) +endif (POLICY CMP0048) + - project(move-transition VERSION 2.0.2) + project(move-transition VERSION 2.3.0) set(PROJECT_FULL_NAME "Move Transition") +include(FindLibobs.cmake) @@ -17,9 +17,9 @@ index d116619..a1366ce 100644 + "${LIBOBS_INCLUDE_DIR}/../plugins/obs-transitions" + "${LIBOBS_INCLUDE_DIR}/../UI/obs-frontend-api") + + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_SOURCE_DIR}/version.h) + set(move-transition_HEADERS - move-transition.h - easing.h) @@ -34,4 +45,10 @@ target_link_libraries(move-transition libobs) diff --git a/pkgs/applications/video/obs-studio/v4l2sink.nix b/pkgs/applications/video/obs-studio/v4l2sink.nix index eb8e4186882..2716120682e 100644 --- a/pkgs/applications/video/obs-studio/v4l2sink.nix +++ b/pkgs/applications/video/obs-studio/v4l2sink.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ qtbase obs-studio ]; + dontWrapQtApps = true; + patches = [ # Fixes the segfault when stopping the plugin (fetchpatch { diff --git a/pkgs/applications/video/obs-studio/wlrobs.nix b/pkgs/applications/video/obs-studio/wlrobs.nix index eba1508387b..47f6ea9e5dd 100644 --- a/pkgs/applications/video/obs-studio/wlrobs.nix +++ b/pkgs/applications/video/obs-studio/wlrobs.nix @@ -6,7 +6,7 @@ # mkdir -p ~/.config/obs-studio/plugins/wlrobs/bin/64bit # ln -s ~/.nix-profile/share/obs/obs-plugins/wlrobs/bin/64bit/libwlrobs.so ~/.config/obs-studio/plugins/wlrobs/bin/64bit { stdenv, fetchhg, wayland, obs-studio -, meson, ninja, pkgconfig, libX11 +, meson, ninja, pkg-config, libX11 , dmabufSupport ? false, libdrm ? null, libGL ? null, lib}: assert dmabufSupport -> libdrm != null && libGL != null; @@ -21,7 +21,7 @@ stdenv.mkDerivation { sha256 = "0qrcf8024r4ynfjw0zx8vn59ygx9q5rb196s6nyxmy3gkv2lfxlq"; }; - buildInputs = [ libX11 libGL libdrm meson ninja pkgconfig wayland obs-studio ]; + buildInputs = [ libX11 libGL libdrm meson ninja pkg-config wayland obs-studio ]; installPhase = '' mkdir -p $out/share/obs/obs-plugins/wlrobs/bin/64bit diff --git a/pkgs/applications/video/ogmtools/default.nix b/pkgs/applications/video/ogmtools/default.nix index c9c5190dc53..aa0f2404ab8 100644 --- a/pkgs/applications/video/ogmtools/default.nix +++ b/pkgs/applications/video/ogmtools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libogg, libvorbis, libdvdread }: +{ lib, stdenv, fetchurl, libogg, libvorbis, libdvdread }: stdenv.mkDerivation rec { name = "ogmtools-1.5"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { tool for extracting chapter information from DVD. ''; homepage = "https://www.bunkus.org/videotools/ogmtools/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/video/olive-editor/default.nix b/pkgs/applications/video/olive-editor/default.nix index 9356e4676a2..7bacf4138c1 100644 --- a/pkgs/applications/video/olive-editor/default.nix +++ b/pkgs/applications/video/olive-editor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, which, qmake, mkDerivation, +{ lib, stdenv, fetchFromGitHub, pkg-config, which, qmake, mkDerivation, qtmultimedia, wrapQtAppsHook, frei0r, opencolorio, ffmpeg-full, CoreFoundation }: @@ -14,7 +14,7 @@ mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config which qmake wrapQtAppsHook @@ -25,7 +25,7 @@ mkDerivation rec { frei0r opencolorio qtmultimedia - ] ++ stdenv.lib.optional stdenv.isDarwin CoreFoundation; + ] ++ lib.optional stdenv.isDarwin CoreFoundation; meta = with lib; { description = "Professional open-source NLE video editor"; diff --git a/pkgs/applications/video/omxplayer/default.nix b/pkgs/applications/video/omxplayer/default.nix index 28df8ead0c8..3fe3dcf454a 100644 --- a/pkgs/applications/video/omxplayer/default.nix +++ b/pkgs/applications/video/omxplayer/default.nix @@ -1,20 +1,20 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , raspberrypifw, pcre, boost, freetype, zlib }: let ffmpeg = stdenv.mkDerivation rec { name = "ffmpeg-1.1.3"; - + src = fetchurl { url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; sha256 = "03s1zsprz5p6gjgwwqcf7b6cvzwwid6l8k7bamx9i0f1iwkgdm0j"; }; - + configurePlatforms = []; configureFlags = [ "--arch=${stdenv.hostPlatform.parsed.cpu.name}" - ] ++ stdenv.lib.optionals stdenv.hostPlatform.isAarch32 [ + ] ++ lib.optionals stdenv.hostPlatform.isAarch32 [ # TODO be better with condition "--cpu=arm1176jzf-s" ] ++ [ @@ -47,7 +47,7 @@ let "--disable-debug" "--arch=${stdenv.hostPlatform.parsed.cpu.name}" "--target_os=${stdenv.hostPlatform.parsed.kernel.name}" - ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--cross-prefix=${stdenv.cc.targetPrefix}" "--enable-cross-compile" ]; @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/huceke/omxplayer"; description = "Commandline OMX player for the Raspberry Pi"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.arm; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.arm; }; } diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix index f3c0187d9cb..5951f4665e4 100644 --- a/pkgs/applications/video/openshot-qt/default.nix +++ b/pkgs/applications/video/openshot-qt/default.nix @@ -32,8 +32,8 @@ mkDerivationWith python3Packages.buildPythonApplication rec { wrapProgram $out/bin/openshot-qt \ '' # Fix toolbar icons on Darwin - + stdenv.lib.optionalString stdenv.isDarwin '' - --suffix QT_PLUGIN_PATH : "${stdenv.lib.getBin qtsvg}/lib/qt-5.12.7/plugins" \ + + lib.optionalString stdenv.isDarwin '' + --suffix QT_PLUGIN_PATH : "${lib.getBin qtsvg}/lib/qt-5.12.7/plugins" \ '' + '' "''${gappsWrapperArgs[@]}" \ diff --git a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix index b6bb87e6651..84f5ac56e7d 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, doxygen +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, doxygen , alsaLib, libX11, libXft, libXrandr, libXinerama, libXext, libXcursor , zlib, AGL, Cocoa, Foundation }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "libopenshot-audio"; version = "0.2.0"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = - [ pkgconfig cmake doxygen ]; + [ pkg-config cmake doxygen ]; buildInputs = optionals stdenv.isLinux [ alsaLib ] diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix index 1ab7a5266a2..169bd33b709 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, fetchpatch -, pkgconfig, cmake, doxygen +{ lib, stdenv, fetchFromGitHub, fetchpatch +, pkg-config, cmake, doxygen , libopenshot-audio, imagemagick, ffmpeg_3 , swig, python3 , unittest-cpp, cppzmq, zeromq @@ -7,7 +7,7 @@ , llvmPackages }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "libopenshot"; version = "0.2.5"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { export _REL_PYTHON_MODULE_PATH=$(toPythonPath $out) ''; - nativeBuildInputs = [ pkgconfig cmake doxygen ]; + nativeBuildInputs = [ pkg-config cmake doxygen ]; buildInputs = [ imagemagick ffmpeg_3 swig python3 unittest-cpp @@ -41,6 +41,8 @@ stdenv.mkDerivation rec { ++ optional stdenv.isDarwin llvmPackages.openmp ; + dontWrapQtApps = true; + LIBOPENSHOT_AUDIO_DIR = libopenshot-audio; "UNITTEST++_INCLUDE_DIR" = "${unittest-cpp}/include/UnitTest++"; diff --git a/pkgs/applications/video/p2pvc/default.nix b/pkgs/applications/video/p2pvc/default.nix index 91468ea1ee6..35dceddf224 100644 --- a/pkgs/applications/video/p2pvc/default.nix +++ b/pkgs/applications/video/p2pvc/default.nix @@ -1,9 +1,9 @@ -{ stdenv, pkgconfig, fetchFromGitHub, opencv2, ncurses, portaudio }: +{ lib, stdenv, pkg-config, fetchFromGitHub, opencv2, ncurses, portaudio }: stdenv.mkDerivation { name = "p2pvc"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ opencv2 ncurses portaudio ]; enableParallelBuilding = true; @@ -20,8 +20,8 @@ stdenv.mkDerivation { meta = { description = "A point to point color terminal video chat"; homepage = "https://github.com/mofarrell/p2pvc"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ trino ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ trino ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/video/peek/default.nix b/pkgs/applications/video/peek/default.nix index 17f9d20695e..2a1418cb373 100644 --- a/pkgs/applications/video/peek/default.nix +++ b/pkgs/applications/video/peek/default.nix @@ -6,7 +6,7 @@ , gettext , desktop-file-utils , appstream-glib -, pkgconfig +, pkg-config , txt2man , gzip , vala @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meson ninja libxml2 - pkgconfig + pkg-config txt2man python3 vala @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { ''; preFixup = '' - gappsWrapperArgs+=(--prefix PATH : ${stdenv.lib.makeBinPath [ which ffmpeg_3 gifski ]}) + gappsWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ which ffmpeg_3 gifski ]}) ''; passthru = { diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index c56878dea35..e388d5a67fe 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , fetchurl , pkg-config @@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec { format = "other"; src = fetchurl { - url = "mirror://gnome/sources/pitivi/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/pitivi/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0hzvv4wia4rk0kvq16y27imq2qd4q5lg3vx99hdcjdb1x3zqqfg0"; }; diff --git a/pkgs/applications/video/plex-media-player/default.nix b/pkgs/applications/video/plex-media-player/default.nix index 5f7f62a409b..e7a735f167c 100644 --- a/pkgs/applications/video/plex-media-player/default.nix +++ b/pkgs/applications/video/plex-media-player/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, pkgconfig, cmake, python3, mkDerivation +{ lib, fetchFromGitHub, fetchurl, pkg-config, cmake, python3, mkDerivation , libX11, libXrandr, qtbase, qtwebchannel, qtwebengine, qtx11extras , libvdpau, SDL2, mpv, libGL }: let @@ -21,7 +21,7 @@ in mkDerivation rec { sha256 = "XFwcSHn9wG30bDMGFITBmhp6/VI1RLmxMxFFxjntTmw="; }; - nativeBuildInputs = [ pkgconfig cmake python3 ]; + nativeBuildInputs = [ pkg-config cmake python3 ]; buildInputs = [ libX11 libXrandr qtbase qtwebchannel qtwebengine qtx11extras libvdpau SDL2 mpv libGL ]; diff --git a/pkgs/applications/video/plex-mpv-shim/default.nix b/pkgs/applications/video/plex-mpv-shim/default.nix index 7738dd99d21..d0904790a9e 100644 --- a/pkgs/applications/video/plex-mpv-shim/default.nix +++ b/pkgs/applications/video/plex-mpv-shim/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, fetchFromGitHub, mpv, requests, python-mpv-jsonipc }: +{ lib, buildPythonApplication, fetchFromGitHub, mpv, requests, python-mpv-jsonipc }: buildPythonApplication rec { pname = "plex-mpv-shim"; diff --git a/pkgs/applications/video/pyca/default.nix b/pkgs/applications/video/pyca/default.nix index bf54c0a2d6c..df42bbec156 100644 --- a/pkgs/applications/video/pyca/default.nix +++ b/pkgs/applications/video/pyca/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, fetchFromGitHub, pycurl, dateutil, configobj, sqlalchemy, sdnotify, flask }: +{ lib, buildPythonApplication, fetchFromGitHub, pycurl, dateutil, configobj, sqlalchemy, sdnotify, flask }: buildPythonApplication rec { pname = "pyca"; diff --git a/pkgs/applications/video/qmediathekview/default.nix b/pkgs/applications/video/qmediathekview/default.nix index 0de021a82a1..d0f41413570 100644 --- a/pkgs/applications/video/qmediathekview/default.nix +++ b/pkgs/applications/video/qmediathekview/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchFromGitHub, qtbase, qttools, xz, boost, qmake, pkgconfig }: +{ mkDerivation, lib, fetchFromGitHub, qtbase, qttools, xz, boost, qmake, pkg-config }: mkDerivation rec { pname = "QMediathekView"; @@ -18,7 +18,7 @@ mkDerivation rec { buildInputs = [ qtbase qttools xz boost ]; - nativeBuildInputs = [ qmake pkgconfig ]; + nativeBuildInputs = [ qmake pkg-config ]; installFlags = [ "INSTALL_ROOT=$(out)" ]; diff --git a/pkgs/applications/video/qstopmotion/default.nix b/pkgs/applications/video/qstopmotion/default.nix index 008e73cd6ed..53b46ceeb07 100644 --- a/pkgs/applications/video/qstopmotion/default.nix +++ b/pkgs/applications/video/qstopmotion/default.nix @@ -12,7 +12,7 @@ , ninja , libxml2 , gettext -, pkgconfig +, pkg-config , libgphoto2 , gphoto2 , v4l-utils @@ -46,7 +46,7 @@ mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config cmake extra-cmake-modules ninja @@ -74,9 +74,9 @@ mkDerivation rec { animation to different video formats such as mpeg or avi. ''; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; maintainers = [ maintainers.leenaars ]; broken = stdenv.isAarch64; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; + platforms = lib.platforms.gnu ++ lib.platforms.linux; }; } diff --git a/pkgs/applications/video/quvi/library.nix b/pkgs/applications/video/quvi/library.nix index c4926bedd72..071e67a1721 100644 --- a/pkgs/applications/video/quvi/library.nix +++ b/pkgs/applications/video/quvi/library.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, lua5, curl, quvi_scripts, libproxy, libgcrypt, glib }: +{ lib, stdenv, fetchurl, pkg-config, lua5, curl, quvi_scripts, libproxy, libgcrypt, glib }: stdenv.mkDerivation rec { pname = "libquvi"; @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { sha256 = "1cl1kbgxl1jnx2nwx4z90l0lap09lnnj1fg7hxsxk3m6aj4y4grd"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ lua5 curl quvi_scripts libproxy libgcrypt glib ]; meta = { description = "Web video downloader"; homepage = "http://quvi.sf.net"; - license = stdenv.lib.licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.lgpl21Plus; + platforms = lib.platforms.linux; maintainers = [ ]; }; } diff --git a/pkgs/applications/video/quvi/scripts.nix b/pkgs/applications/video/quvi/scripts.nix index 462c2df9962..676d073900c 100644 --- a/pkgs/applications/video/quvi/scripts.nix +++ b/pkgs/applications/video/quvi/scripts.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig}: +{lib, stdenv, fetchurl, pkg-config}: stdenv.mkDerivation rec { pname = "quvi-scripts"; @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { sha256 = "1qvp6z5k1qgcys7vf7jd6fm0g07xixmciwj14ypn1kqhmjgizwhp"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = { description = "Web video downloader"; homepage = "http://quvi.sf.net"; - license = stdenv.lib.licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.lgpl21Plus; + platforms = lib.platforms.linux; maintainers = [ ]; }; } diff --git a/pkgs/applications/video/quvi/tool.nix b/pkgs/applications/video/quvi/tool.nix index b2746ef8233..6718fc1dc36 100644 --- a/pkgs/applications/video/quvi/tool.nix +++ b/pkgs/applications/video/quvi/tool.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, lua5, curl, quvi_scripts, libquvi, lua5_sockets, glib, makeWrapper}: +{lib, stdenv, fetchurl, pkg-config, lua5, curl, quvi_scripts, libquvi, lua5_sockets, glib, makeWrapper}: stdenv.mkDerivation rec { pname = "quvi"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1h52s265rp3af16dvq1xlscp2926jqap2l4ah94vrfchv6m1hffb"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ lua5 curl quvi_scripts libquvi glib makeWrapper ]; postInstall = '' wrapProgram $out/bin/quvi --set LUA_PATH "${lua5_sockets}/share/lua/${lua5.luaversion}/?.lua" @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { meta = { description = "Web video downloader"; homepage = "http://quvi.sf.net"; - license = stdenv.lib.licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.lgpl21Plus; + platforms = lib.platforms.linux; maintainers = [ ]; }; } diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index bae6a0ac7f3..d580d98a6c1 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , fetchpatch , mkDerivation @@ -8,7 +8,7 @@ , gettext , mlt , jack1 -, pkgconfig +, pkg-config , qtbase , qtmultimedia , qtx11extras @@ -21,7 +21,7 @@ , common-updater-scripts }: -assert stdenv.lib.versionAtLeast mlt.version "6.22.1"; +assert lib.versionAtLeast mlt.version "6.22.1"; mkDerivation rec { pname = "shotcut"; @@ -35,7 +35,7 @@ mkDerivation rec { }; enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig qmake ]; + nativeBuildInputs = [ pkg-config qmake ]; buildInputs = [ SDL2 frei0r @@ -52,7 +52,7 @@ mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${mlt.dev}/include/mlt++ -I${mlt.dev}/include/mlt"; qmakeFlags = [ - "QMAKE_LRELEASE=${stdenv.lib.getDev qttools}/bin/lrelease" + "QMAKE_LRELEASE=${lib.getDev qttools}/bin/lrelease" "SHOTCUT_VERSION=${version}" "DEFINES+=SHOTCUT_NOUPGRADE" ]; @@ -68,7 +68,7 @@ mkDerivation rec { qtWrapperArgs = [ "--prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1" "--prefix LADSPA_PATH : ${ladspaPlugins}/lib/ladspa" - "--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ jack1 SDL2 ]}" + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ jack1 SDL2 ]}" "--prefix PATH : ${mlt}/bin" ]; diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix index b42e1412152..939ae7c4440 100644 --- a/pkgs/applications/video/simplescreenrecorder/default.nix +++ b/pkgs/applications/video/simplescreenrecorder/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, mkDerivation, fetchurl, alsaLib, ffmpeg_3, libjack2, libX11, libXext, qtx11extras -, libXfixes, libGLU, libGL, pkgconfig, libpulseaudio, qtbase, cmake, ninja +, libXfixes, libGLU, libGL, pkg-config, libpulseaudio, qtbase, cmake, ninja }: mkDerivation rec { @@ -23,7 +23,7 @@ mkDerivation rec { done ''; - nativeBuildInputs = [ pkgconfig cmake ninja ]; + nativeBuildInputs = [ pkg-config cmake ninja ]; buildInputs = [ alsaLib ffmpeg_3 libjack2 libX11 libXext libXfixes libGLU libGL libpulseaudio qtbase qtx11extras diff --git a/pkgs/applications/video/sub-batch/default.nix b/pkgs/applications/video/sub-batch/default.nix index 244e826f0a2..070bcc90685 100644 --- a/pkgs/applications/video/sub-batch/default.nix +++ b/pkgs/applications/video/sub-batch/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , rustPlatform }: @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-l+BTF9PGb8bG8QHhNCoBsrsVX8nlRjPlaea1ESFfMW0="; - meta = with stdenv.lib; { + meta = with lib; { description = "Match and rename subtitle files to video files and perform other batch operations on subtitle files"; homepage = "https://github.com/kl/sub-batch"; license = licenses.mit; diff --git a/pkgs/applications/video/subdl/default.nix b/pkgs/applications/video/subdl/default.nix index b2b020a20d2..e115fbcdd04 100644 --- a/pkgs/applications/video/subdl/default.nix +++ b/pkgs/applications/video/subdl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3 }: +{ lib, stdenv, fetchFromGitHub, python3 }: stdenv.mkDerivation { name = "subdl-0.0pre.2017.11.06"; @@ -13,14 +13,14 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/alexanderwink/subdl"; description = "A command-line tool to download subtitles from opensubtitles.org"; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.exfalso ]; + platforms = lib.platforms.all; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.exfalso ]; }; buildInputs = [ python3 ]; installPhase = '' install -vD subdl $out/bin/subdl - ''; + ''; } diff --git a/pkgs/applications/video/subtitleeditor/default.nix b/pkgs/applications/video/subtitleeditor/default.nix index eea6353d66c..cc3d518ff88 100644 --- a/pkgs/applications/video/subtitleeditor/default.nix +++ b/pkgs/applications/video/subtitleeditor/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, intltool, file, +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, intltool, file, desktop-file-utils, enchant, gtk3, gtkmm3, gst_all_1, hicolor-icon-theme, - libsigcxx, libxmlxx, xdg_utils, isocodes, wrapGAppsHook + libsigcxx, libxmlxx, xdg-utils, isocodes, wrapGAppsHook }: let @@ -20,7 +20,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config intltool file wrapGAppsHook @@ -41,7 +41,7 @@ stdenv.mkDerivation { hicolor-icon-theme libsigcxx libxmlxx - xdg_utils + xdg-utils isocodes ]; @@ -60,8 +60,8 @@ stdenv.mkDerivation { makes it easier to synchronise subtitles to voices. ''; homepage = "http://kitone.github.io/subtitleeditor/"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.plcplc ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.plcplc ]; }; } diff --git a/pkgs/applications/video/tartube/default.nix b/pkgs/applications/video/tartube/default.nix index 36375d9ecc0..12525da35c4 100644 --- a/pkgs/applications/video/tartube/default.nix +++ b/pkgs/applications/video/tartube/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , fetchFromGitHub , gdk-pixbuf , gobject-introspection @@ -63,7 +62,7 @@ python3Packages.buildPythonApplication rec { doCheck = false; makeWrapperArgs = [ - "--prefix PATH : ${stdenv.lib.makeBinPath [ youtube-dl ]}" + "--prefix PATH : ${lib.makeBinPath [ youtube-dl ]}" ]; meta = with lib; { diff --git a/pkgs/applications/video/vcs/default.nix b/pkgs/applications/video/vcs/default.nix index 0280cfb3f1f..4998797fcf3 100644 --- a/pkgs/applications/video/vcs/default.nix +++ b/pkgs/applications/video/vcs/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, makeWrapper +{ lib, stdenv, fetchurl, makeWrapper , coreutils, ffmpeg, gawk, gnugrep, gnused, imagemagick, mplayer, util-linux , dejavu_fonts }: -with stdenv.lib; +with lib; let version = "1.13.4"; runtimeDeps = [ coreutils ffmpeg gawk gnugrep gnused imagemagick mplayer util-linux ]; @@ -18,7 +18,6 @@ stdenv.mkDerivation { unpackCmd = "mkdir src; cp $curSrc src/vcs"; patches = [ ./fonts.patch ]; nativeBuildInputs = [ makeWrapper ]; - doBuild = false; inherit dejavu_fonts; installPhase = '' diff --git a/pkgs/applications/video/vdr/default.nix b/pkgs/applications/video/vdr/default.nix index 16aa2a3e6a5..eeb61624409 100644 --- a/pkgs/applications/video/vdr/default.nix +++ b/pkgs/applications/video/vdr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, fontconfig, libjpeg, libcap, freetype, fribidi, pkgconfig +{ stdenv, fetchgit, fontconfig, libjpeg, libcap, freetype, fribidi, pkg-config , gettext, systemd, perl, lib , enableSystemd ? true , enableBidi ? true @@ -28,7 +28,7 @@ nativeBuildInputs = [ perl ]; # plugins uses the same build environment as vdr - propagatedNativeBuildInputs = [ pkgconfig gettext ]; + propagatedNativeBuildInputs = [ pkg-config gettext ]; installFlags = [ "DESTDIR=$(out)" diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix index 55ac94d8c6c..395de891eb9 100644 --- a/pkgs/applications/video/vdr/plugins.nix +++ b/pkgs/applications/video/vdr/plugins.nix @@ -18,7 +18,7 @@ in { buildInputs = oldAttr.buildInputs ++ [ ncurses ]; }); - inherit (stdenv.lib.genAttrs [ + inherit (lib.genAttrs [ "epgtableid0" "hello" "osddemo" "pictures" "servicedemo" "status" "svdrpdemo" ] mkPlugin); diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 559398677a4..c925eca302a 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, autoreconfHook , libarchive, perl, xorg, libdvdnav, libbluray , zlib, a52dec, libmad, faad2, ffmpeg_3, alsaLib -, pkgconfig, dbus, fribidi, freefont_ttf, libebml, libmatroska +, pkg-config, dbus, fribidi, freefont_ttf, libebml, libmatroska , libvorbis, libtheora, speex, lua5, libgcrypt, libgpgerror, libupnp , libcaca, libpulseaudio, flac, schroedinger, libxml2, librsvg , mpeg2dec, systemd, gnutls, avahi, libcddb, libjack2, SDL, SDL_image @@ -9,8 +9,9 @@ , libass, libva, libdvbpsi, libdc1394, libraw1394, libopus , libvdpau, libsamplerate, live555, fluidsynth, wayland, wayland-protocols , onlyLibVLC ? false -, withQt5 ? true, qtbase ? null, qtsvg ? null, qtx11extras ? null, wrapQtAppsHook ? null +, withQt5 ? true, qtbase, qtsvg, qtx11extras, wrapQtAppsHook , jackSupport ? false +, skins2Support ? !onlyLibVLC, freetype , removeReferencesTo , chromecastSupport ? true, protobuf, libmicrodns }: @@ -19,25 +20,17 @@ # If your firewall is enabled, make sure to have something like: # networking.firewall.allowedTCPPorts = [ 8010 ]; -with stdenv.lib; - -assert (withQt5 -> qtbase != null && qtsvg != null && qtx11extras != null && wrapQtAppsHook != null); +with lib; stdenv.mkDerivation rec { pname = "${optionalString onlyLibVLC "lib"}vlc"; - version = "3.0.11.1"; + version = "3.0.12"; src = fetchurl { url = "http://get.videolan.org/vlc/${version}/vlc-${version}.tar.xz"; - sha256 = "1f46h0hv7fk35zg4iczlp7ib7h2jmh8m4r5klw3g2558ib9134qq"; + sha256 = "0ygqihw2c5vvzv8950dlf7rdwz1cpz1668jgyja604ljibrmix7g"; }; - patches = [ - # Couldn't find an upstream version of this patch - # https://build.opensuse.org/package/view_file/openSUSE:Factory/vlc/fix-missing-includes-with-qt-5.15.patch?expand=1 - ./fix-missing-includes-with-qt-5.15.patch - ]; - # VLC uses a *ton* of libraries for various pieces of functionality, many of # which are not included here for no other reason that nobody has mentioned # needing them @@ -52,10 +45,11 @@ stdenv.mkDerivation rec { fluidsynth wayland wayland-protocols ] ++ optional (!stdenv.hostPlatform.isAarch64) live555 ++ optionals withQt5 [ qtbase qtsvg qtx11extras ] + ++ optionals skins2Support (with xorg; [ libXpm freetype libXext libXinerama ]) ++ optional jackSupport libjack2 ++ optionals chromecastSupport [ protobuf libmicrodns ]; - nativeBuildInputs = [ autoreconfHook perl pkgconfig removeReferencesTo ] + nativeBuildInputs = [ autoreconfHook perl pkg-config removeReferencesTo ] ++ optionals withQt5 [ wrapQtAppsHook ]; enableParallelBuilding = true; @@ -67,9 +61,6 @@ stdenv.mkDerivation rec { BUILDCC = "${stdenv.cc}/bin/gcc"; postPatch = '' - substituteInPlace configure \ - --replace /bin/echo echo - substituteInPlace modules/text_renderer/freetype/platform_fonts.h --replace \ /usr/share/fonts/truetype/freefont ${freefont_ttf}/share/fonts/truetype ''; @@ -89,6 +80,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-kde-solid=$out/share/apps/solid/actions" ] ++ optional onlyLibVLC "--disable-vlc" + ++ optional skins2Support "--enable-skins2" ++ optionals chromecastSupport [ "--enable-sout" "--enable-chromecast" diff --git a/pkgs/applications/video/vlc/fix-missing-includes-with-qt-5.15.patch b/pkgs/applications/video/vlc/fix-missing-includes-with-qt-5.15.patch deleted file mode 100644 index d980fd2f6da..00000000000 --- a/pkgs/applications/video/vlc/fix-missing-includes-with-qt-5.15.patch +++ /dev/null @@ -1,37 +0,0 @@ -Index: vlc-3.0.8/modules/gui/qt/util/timetooltip.hpp -=================================================================== ---- vlc-3.0.8.orig/modules/gui/qt/util/timetooltip.hpp -+++ vlc-3.0.8/modules/gui/qt/util/timetooltip.hpp -@@ -25,6 +25,7 @@ - #include "qt.hpp" - - #include <QWidget> -+#include <QPainterPath> - - class TimeTooltip : public QWidget - { -Index: vlc-3.0.8/modules/gui/qt/components/playlist/views.cpp -=================================================================== ---- vlc-3.0.8.orig/modules/gui/qt/components/playlist/views.cpp -+++ vlc-3.0.8/modules/gui/qt/components/playlist/views.cpp -@@ -27,6 +27,7 @@ - #include "input_manager.hpp" /* THEMIM */ - - #include <QPainter> -+#include <QPainterPath> - #include <QRect> - #include <QStyleOptionViewItem> - #include <QFontMetrics> -Index: vlc-3.0.8/modules/gui/qt/dialogs/plugins.cpp -=================================================================== ---- vlc-3.0.8.orig/modules/gui/qt/dialogs/plugins.cpp -+++ vlc-3.0.8/modules/gui/qt/dialogs/plugins.cpp -@@ -53,6 +53,7 @@ - #include <QListView> - #include <QListWidget> - #include <QPainter> -+#include <QPainterPath> - #include <QStyleOptionViewItem> - #include <QKeyEvent> - #include <QPushButton> - diff --git a/pkgs/applications/video/vokoscreen/default.nix b/pkgs/applications/video/vokoscreen/default.nix index c0b6853cf32..598a162f399 100644 --- a/pkgs/applications/video/vokoscreen/default.nix +++ b/pkgs/applications/video/vokoscreen/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchFromGitHub, mkDerivation -, pkgconfig, qtbase, qttools, qmake, qtmultimedia, qtx11extras, alsaLib, libv4l, libXrandr +{ lib, fetchFromGitHub, mkDerivation +, pkg-config, qtbase, qttools, qmake, qtmultimedia, qtx11extras, alsaLib, libv4l, libXrandr , ffmpeg }: @@ -15,7 +15,7 @@ mkDerivation rec { sha256 = "1a85vbsi53mhzva49smqwcs61c51wv3ic410nvb9is9nlsbifwan"; }; - nativeBuildInputs = [ pkgconfig qmake ]; + nativeBuildInputs = [ pkg-config qmake ]; buildInputs = [ alsaLib libv4l diff --git a/pkgs/applications/video/w_scan/default.nix b/pkgs/applications/video/w_scan/default.nix index 7710c7d67a3..7cbc2b0f815 100644 --- a/pkgs/applications/video/w_scan/default.nix +++ b/pkgs/applications/video/w_scan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "w_scan"; @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { meta = { description = "Small CLI utility to scan DVB and ATSC transmissions"; homepage = "http://wirbel.htpc-forum.de/w_scan/index_en.html"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.nico202 ] ; - license = stdenv.lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.nico202 ] ; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/applications/video/webcamoid/default.nix b/pkgs/applications/video/webcamoid/default.nix index a0d25f2ec1e..ef485fc8201 100644 --- a/pkgs/applications/video/webcamoid/default.nix +++ b/pkgs/applications/video/webcamoid/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, pkgconfig, libxcb, mkDerivation, qmake +{ lib, fetchFromGitHub, pkg-config, libxcb, mkDerivation, qmake , qtbase, qtdeclarative, qtquickcontrols, qtquickcontrols2 , ffmpeg-full, gst_all_1, libpulseaudio, alsaLib, jack2 , v4l-utils }: @@ -22,7 +22,7 @@ mkDerivation rec { v4l-utils ]; - nativeBuildInputs = [ pkgconfig qmake ]; + nativeBuildInputs = [ pkg-config qmake ]; qmakeFlags = [ "Webcamoid.pro" diff --git a/pkgs/applications/video/webtorrent_desktop/default.nix b/pkgs/applications/video/webtorrent_desktop/default.nix index 6b97fa63e0b..ac3dd320d3a 100644 --- a/pkgs/applications/video/webtorrent_desktop/default.nix +++ b/pkgs/applications/video/webtorrent_desktop/default.nix @@ -6,7 +6,7 @@ }: let - rpath = stdenv.lib.makeLibraryPath ([ + rpath = lib.makeLibraryPath ([ alsaLib atk at-spi2-core diff --git a/pkgs/applications/video/wxcam/default.nix b/pkgs/applications/video/wxcam/default.nix index 9294c4d2cde..f197abacee0 100644 --- a/pkgs/applications/video/wxcam/default.nix +++ b/pkgs/applications/video/wxcam/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl -, pkgconfig +, pkg-config , intltool , libX11, libXv, libSM , gtk, libglade @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { sha256 = "1765bvc65fpzn9ycnnj5hais9xkx9v0sm6a878d35x54bpanr859"; }; - buildInputs = with stdenv.lib; - [ pkgconfig intltool libX11 libXv libSM gtk libglade wxGTK perlPackages.XMLParser xvidcore mjpegtools alsaLib libv4l cimg ]; + buildInputs = with lib; + [ pkg-config intltool libX11 libXv libSM gtk libglade wxGTK perlPackages.XMLParser xvidcore mjpegtools alsaLib libv4l cimg ]; NIX_CFLAGS_COMPILE="-I ${cimg}/include/cimg"; diff --git a/pkgs/applications/video/xawtv/default.nix b/pkgs/applications/video/xawtv/default.nix index ee2f811cb4a..0945c5b3f3f 100644 --- a/pkgs/applications/video/xawtv/default.nix +++ b/pkgs/applications/video/xawtv/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , ncurses , libjpeg @@ -51,14 +51,14 @@ stdenv.mkDerivation rec { makeFlags = [ "SUID_ROOT=" # do not try to setuid - "resdir=${placeholder ''out''}/share/X11" + "resdir=${placeholder "out"}/share/X11" ]; meta = { description = "TV application for Linux with apps and tools such as a teletext browser"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; homepage = "https://www.kraxel.org/blog/linux/xawtv/"; - maintainers = with stdenv.lib.maintainers; [ domenkozar ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with lib.maintainers; [ domenkozar ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix index c11d77c2974..651597b3a48 100644 --- a/pkgs/applications/video/xine-ui/default.nix +++ b/pkgs/applications/video/xine-ui/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, pkgconfig, xorg, libpng, xineLib, readline, ncurses, curl +{lib, stdenv, fetchurl, pkg-config, xorg, libpng, xineLib, readline, ncurses, curl , lirc, shared-mime-info, libjpeg }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "10zmmss3hm8gjjyra20qhdc0lb1m6sym2nb2w62bmfk8isfw9gsl"; }; - nativeBuildInputs = [ pkgconfig shared-mime-info ]; + nativeBuildInputs = [ pkg-config shared-mime-info ]; buildInputs = [ xineLib libpng readline ncurses curl lirc libjpeg diff --git a/pkgs/applications/video/xscast/default.nix b/pkgs/applications/video/xscast/default.nix index 050b5b32b19..49f5b43bb73 100644 --- a/pkgs/applications/video/xscast/default.nix +++ b/pkgs/applications/video/xscast/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { patchShebangs $out/bin wrapProgram "$out/bin/xscast" \ - --prefix PATH : ${stdenv.lib.makeBinPath [ ffmpeg_3 dzen2 xorg.xwininfo xorg.xinput xorg.xmodmap imagemagick ]} + --prefix PATH : ${lib.makeBinPath [ ffmpeg_3 dzen2 xorg.xwininfo xorg.xinput xorg.xmodmap imagemagick ]} runHook postInstall ''; diff --git a/pkgs/applications/video/xvidcap/default.nix b/pkgs/applications/video/xvidcap/default.nix index 0f7f9390dac..e0cca040987 100644 --- a/pkgs/applications/video/xvidcap/default.nix +++ b/pkgs/applications/video/xvidcap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perlPackages, pkgconfig, gtk2 +{ lib, stdenv, fetchurl, perlPackages, pkg-config, gtk2 , scrollkeeper, libglade, libXmu, libX11, libXext, gettext , lame, libXfixes, libXdamage }: @@ -12,7 +12,7 @@ stdenv.mkDerivation { patches = [ ./xlib.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 scrollkeeper libglade libXmu gettext lame libXdamage libXfixes libXext libX11 @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Screencast video catpuring tool"; homepage = "http://xvidcap.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; platforms = platforms.linux; }; } diff --git a/pkgs/applications/virtualization/8086tiny/default.nix b/pkgs/applications/virtualization/8086tiny/default.nix index addab70c3b3..c58d488f583 100644 --- a/pkgs/applications/virtualization/8086tiny/default.nix +++ b/pkgs/applications/virtualization/8086tiny/default.nix @@ -16,12 +16,12 @@ stdenv.mkDerivation rec { sha256 = "00aydg8f28sgy8l3rd2a7jvp56lx3b63hhak43p7g7vjdikv495w"; }; - buildInputs = with stdenv.lib; + buildInputs = with lib; optionals localBios [ nasm ] ++ optionals sdlSupport [ SDL ]; - + bios = localBios; - + builder = ./builder.sh; meta = with lib; { diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index 6301182771f..14d8d0c13fe 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -59,7 +59,7 @@ edk2.mkDerivation projectDscPath { meta = { description = "Sample UEFI firmware for QEMU and KVM"; homepage = "https://github.com/tianocore/tianocore.github.io/wiki/OVMF"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; platforms = ["x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin"]; }; } diff --git a/pkgs/applications/virtualization/aqemu/default.nix b/pkgs/applications/virtualization/aqemu/default.nix index d31523e946a..2d865f41818 100644 --- a/pkgs/applications/virtualization/aqemu/default.nix +++ b/pkgs/applications/virtualization/aqemu/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, cmake, fetchFromGitHub, libvncserver, qemu, qtbase, lib, stdenv +{ mkDerivation, cmake, fetchFromGitHub, libvncserver, qemu, qtbase, lib }: mkDerivation rec { diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix index e9982d61391..f2418d80d2e 100644 --- a/pkgs/applications/virtualization/bochs/default.nix +++ b/pkgs/applications/virtualization/bochs/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl -, pkgconfig, libtool +{ lib, stdenv, fetchurl +, pkg-config, libtool , gtk2, libGLU, libGL, readline, libX11, libXpm , docbook_xml_dtd_45, docbook_xsl , sdlSupport ? true, SDL2 ? null @@ -15,7 +15,7 @@ assert wxSupport -> (gtk2 != null && wxGTK != null); assert wgetSupport -> (wget != null); assert curlSupport -> (curl != null); -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "bochs"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { patches = [ ./bochs-2.6.11-glibc-2.26.patch ./fix-build-smp.patch ]; buildInputs = - [ pkgconfig libtool gtk2 libGLU libGL readline libX11 libXpm docbook_xml_dtd_45 docbook_xsl ] + [ pkg-config libtool gtk2 libGLU libGL readline libX11 libXpm docbook_xml_dtd_45 docbook_xsl ] ++ optionals termSupport [ ncurses ] ++ optionals sdlSupport [ SDL2 ] ++ optionals wxSupport [ wxGTK ] diff --git a/pkgs/applications/virtualization/charliecloud/default.nix b/pkgs/applications/virtualization/charliecloud/default.nix index 79e32007144..9e866d7cf4d 100644 --- a/pkgs/applications/virtualization/charliecloud/default.nix +++ b/pkgs/applications/virtualization/charliecloud/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3, python3Packages, docker, autoreconfHook, coreutils, makeWrapper, gnused, gnutar, gzip, findutils, sudo, nixosTests }: +{ lib, stdenv, fetchFromGitHub, python3, python3Packages, docker, autoreconfHook, coreutils, makeWrapper, gnused, gnutar, gzip, findutils, sudo, nixosTests }: stdenv.mkDerivation rec { @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { # Here we wrap those deps so they are resolved inside nixpkgs. postInstall = '' for file in $out/bin/* ; do \ - wrapProgram $file --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils docker gnused gnutar gzip findutils sudo ]} + wrapProgram $file --prefix PATH : ${lib.makeBinPath [ coreutils docker gnused gnutar gzip findutils sudo ]} done ''; @@ -54,9 +54,9 @@ stdenv.mkDerivation rec { on offer. ''; homepage = "https://hpc.github.io/charliecloud"; - license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.bzizou ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.bzizou ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/virtualization/cloud-hypervisor/default.nix b/pkgs/applications/virtualization/cloud-hypervisor/default.nix index 59c97c4a8de..32d5be13d3b 100644 --- a/pkgs/applications/virtualization/cloud-hypervisor/default.nix +++ b/pkgs/applications/virtualization/cloud-hypervisor/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rustPlatform, pkgconfig, openssl }: +{ lib, fetchFromGitHub, rustPlatform, pkg-config, openssl }: rustPlatform.buildRustPackage rec { pname = "cloud-hypervisor"; @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "h2aWWjycTm84TS89/vhqnAvwOqeeSDtvvCt+Is6I0eI="; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; cargoPatches = [ ./cargo-lock-vendor-fix.patch ]; diff --git a/pkgs/applications/virtualization/cntr/default.nix b/pkgs/applications/virtualization/cntr/default.nix index f7b7c99b554..2283b45aee4 100644 --- a/pkgs/applications/virtualization/cntr/default.nix +++ b/pkgs/applications/virtualization/cntr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "cntr"; diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix index 2afb1e7874f..cef69cb0c6c 100644 --- a/pkgs/applications/virtualization/conmon/default.nix +++ b/pkgs/applications/virtualization/conmon/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , pkg-config , glib @@ -9,18 +10,18 @@ stdenv.mkDerivation rec { pname = "conmon"; - version = "2.0.22"; + version = "2.0.25"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "07wd3pns6x25dcnc1r84cwmrzg8xgzsfmidkclcpcagf97ad7jmc"; + sha256 = "sha256-u22irZ9AC1W2AVJ1OD1gLzTH4NOgRkZekZ78rNKXnps="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib systemd ] - ++ stdenv.lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ]; + ++ lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ]; # manpage requires building the vendored go-md2man makeFlags = [ "bin/conmon" ]; diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 7914fd24327..99505371507 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , btrfs-progs , buildGoModule , fetchFromGitHub @@ -15,13 +15,13 @@ buildGoModule rec { pname = "cri-o"; - version = "1.19.0"; + version = "1.20.0"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "1lrr8y0k6609z4gb8cg277rq58sh0bqd2b4mzjlynyjdgp3xskfq"; + sha256 = "sha256-3rougAl0vVH01ulbnfIO2x8OCyofWlvVsvlKjoAD2NE="; }; vendorSha256 = null; @@ -37,7 +37,7 @@ buildGoModule rec { libseccomp libselinux lvm2 - ] ++ stdenv.lib.optionals (glibc != null) [ glibc glibc.static ]; + ] ++ lib.optionals (glibc != null) [ glibc glibc.static ]; BUILDTAGS = "apparmor seccomp selinux containers_image_openpgp containers_image_ostree_stub"; buildPhase = '' diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/applications/virtualization/crosvm/default.nix index 38ce277bf3f..848b93a5381 100644 --- a/pkgs/applications/virtualization/crosvm/default.nix +++ b/pkgs/applications/virtualization/crosvm/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, rustPlatform, fetchgit, runCommand, symlinkJoin -, pkgconfig, minijail, dtc, libusb1, libcap, linux +, pkg-config, minijail, dtc, libusb1, libcap, linux }: let @@ -55,7 +55,7 @@ in cargoSha256 = "0lhivwvdihslwp81i3sa5q88p5hr83bzkvklrcgf6x73arwk8kdz"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ dtc libcap libusb1 minijail ]; @@ -75,7 +75,7 @@ in CROSVM_CARGO_TEST_KERNEL_BINARY = lib.optionalString (stdenv.buildPlatform == stdenv.hostPlatform) - "${linux}/${stdenv.hostPlatform.platform.kernelTarget}"; + "${linux}/${stdenv.hostPlatform.linux-kernel.target}"; passthru = { inherit adhdSrc; diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index ef506c01cfb..143d2fdcea3 100644 --- a/pkgs/applications/virtualization/crun/default.nix +++ b/pkgs/applications/virtualization/crun/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , autoreconfHook , go-md2man -, pkgconfig +, pkg-config , libcap , libseccomp , python3 @@ -35,17 +35,17 @@ let in stdenv.mkDerivation rec { pname = "crun"; - version = "0.16"; + version = "0.17"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - sha256 = "03547axiwv161sbymh2vxqx591xr4nq6b9y8y45m15xvfv0f7vl8"; + sha256 = "sha256-OdB7UXLG99ErbfSCvq87LxBy5EYkUvTfyQNG70RFbl4="; fetchSubmodules = true; }; - nativeBuildInputs = [ autoreconfHook go-md2man pkgconfig python3 ]; + nativeBuildInputs = [ autoreconfHook go-md2man pkg-config python3 ]; buildInputs = [ libcap libseccomp systemd yajl ]; diff --git a/pkgs/applications/virtualization/docker-compose/default.nix b/pkgs/applications/virtualization/docker-compose/default.nix index e9e6092e1f9..93f5f56ac55 100644 --- a/pkgs/applications/virtualization/docker-compose/default.nix +++ b/pkgs/applications/virtualization/docker-compose/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, fetchPypi, pythonOlder +{ lib, buildPythonApplication, fetchPypi, pythonOlder , installShellFiles , mock, pytest, nose , pyyaml, backports_ssl_match_hostname, colorama, docopt @@ -8,12 +8,12 @@ }: buildPythonApplication rec { - version = "1.27.4"; + version = "1.28.2"; pname = "docker-compose"; src = fetchPypi { inherit pname version; - sha256 = "5a5690f24c27d4b43dcbe6b3fae91ba680713208e99ee863352b3bae37bcaa83"; + sha256 = "2f148b590414915d029dad7551f4cdf0b03a774dc9baa674480217236d260cc1"; }; # lots of networking and other fails @@ -25,8 +25,8 @@ buildPythonApplication rec { ipaddress jsonschema requests six texttable websocket_client docopt cached-property paramiko distro python-dotenv ] ++ - stdenv.lib.optional (pythonOlder "3.4") enum34 ++ - stdenv.lib.optional (pythonOlder "3.2") functools32; + lib.optional (pythonOlder "3.4") enum34 ++ + lib.optional (pythonOlder "3.2") functools32; postPatch = '' # Remove upper bound on requires, see also diff --git a/pkgs/applications/virtualization/docker-slim/default.nix b/pkgs/applications/virtualization/docker-slim/default.nix index 6c1ef95cd6f..889752b2703 100644 --- a/pkgs/applications/virtualization/docker-slim/default.nix +++ b/pkgs/applications/virtualization/docker-slim/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildGoPackage , fetchFromGitHub , makeWrapper @@ -6,7 +6,7 @@ buildGoPackage rec { pname = "docker-slim"; - version = "1.33.0"; + version = "1.34.0"; goPackagePath = "github.com/docker-slim/docker-slim"; @@ -14,7 +14,7 @@ buildGoPackage rec { owner = "docker-slim"; repo = "docker-slim"; rev = version; - sha256 = "0fk1r9id3fjcqdg4nls2k5ik3822njz4xx9fpbvmx0fycvjmbr4v"; + sha256 = "1ynpd6yb1xc18y528sshd5k9nkz48h1zifj2w4sjh5n0864lna7b"; }; subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ]; diff --git a/pkgs/applications/virtualization/docker/buildx.nix b/pkgs/applications/virtualization/docker/buildx.nix new file mode 100644 index 00000000000..84019395853 --- /dev/null +++ b/pkgs/applications/virtualization/docker/buildx.nix @@ -0,0 +1,25 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "docker-buildx"; + version = "0.5.1"; + + src = fetchFromGitHub { + owner = "docker"; + repo = "buildx"; + rev = "v${version}"; + sha256 = "0l03ncs1x4lhgy0kf7bd1zq00md8fi93f8xq6k0ans4400divfzk"; + }; + + vendorSha256 = null; + + installPhase = '' + install -D $GOPATH/bin/buildx $out/libexec/docker/cli-plugins/docker-buildx + ''; + + meta = with lib; { + description = "Docker CLI plugin for extended build capabilities with BuildKit"; + license = licenses.asl20; + maintainers = [ maintainers.ivan-babrou ]; + }; +} diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 1f4d5e3aac6..207ebdf2211 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -1,21 +1,23 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, buildGoPackage -, makeWrapper, installShellFiles, pkgconfig -, go-md2man, go, containerd, runc, docker-proxy, tini, libtool -, sqlite, iproute, lvm2, systemd -, btrfs-progs, iptables, e2fsprogs, xz, util-linux, xfsprogs, git -, procps, libseccomp -, nixosTests -}: +{ lib, callPackage }: with lib; rec { dockerGen = { version, rev, sha256 + , mobyRev, mobySha256 , runcRev, runcSha256 , containerdRev, containerdSha256 - , tiniRev, tiniSha256 - } : + , tiniRev, tiniSha256, buildxSupport ? false + # package dependencies + , stdenv, fetchFromGitHub, fetchpatch, buildGoPackage + , makeWrapper, installShellFiles, pkg-config + , go-md2man, go, containerd, runc, docker-proxy, tini, libtool + , sqlite, iproute, lvm2, systemd, docker-buildx + , btrfs-progs, iptables, e2fsprogs, xz, util-linux, xfsprogs, git + , procps, libseccomp + , nixosTests + }: let docker-runc = runc.overrideAttrs (oldAttrs: { name = "docker-runc-${version}"; @@ -30,9 +32,7 @@ rec { patches = []; }); - docker-containerd = let - withlibseccomp = lib.versionAtLeast version "19.03"; - in containerd.overrideAttrs (oldAttrs: { + docker-containerd = containerd.overrideAttrs (oldAttrs: { name = "docker-containerd-${version}"; inherit version; src = fetchFromGitHub { @@ -41,11 +41,7 @@ rec { rev = containerdRev; sha256 = containerdSha256; }; - # disable completion, can be removed when docker uses containerd >= 1.4 - postInstall = []; - # This should be removed once Docker uses containerd >=1.4 - nativeBuildInputs = oldAttrs.nativeBuildInputs ++ lib.optional withlibseccomp pkgconfig; - buildInputs = oldAttrs.buildInputs ++ lib.optional withlibseccomp libseccomp; + buildInputs = oldAttrs.buildInputs ++ [ libseccomp ]; }); docker-tini = tini.overrideAttrs (oldAttrs: { @@ -59,21 +55,73 @@ rec { }; # Do not remove static from make files as we want a static binary - patchPhase = '' - ''; + patchPhase = ""; NIX_CFLAGS_COMPILE = "-DMINIMAL=ON"; }); + + moby = buildGoPackage ((optionalAttrs (stdenv.isLinux)) rec { + name = "moby-${version}"; + inherit version; + inherit docker-runc docker-containerd docker-proxy docker-tini; + + src = fetchFromGitHub { + owner = "moby"; + repo = "moby"; + rev = mobyRev; + sha256 = mobySha256; + }; + + goPackagePath = "github.com/docker/docker"; + + nativeBuildInputs = [ makeWrapper pkg-config go-md2man go libtool installShellFiles ]; + buildInputs = [ sqlite lvm2 btrfs-progs systemd libseccomp ]; + + extraPath = optionals (stdenv.isLinux) (makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps util-linux git ]); + + buildPhase = '' + export GOCACHE="$TMPDIR/go-cache" + # build engine + cd ./go/src/${goPackagePath} + export AUTO_GOPATH=1 + export DOCKER_GITCOMMIT="${rev}" + export VERSION="${version}" + ./hack/make.sh dynbinary + cd - + ''; + + postPatch = '' + patchShebangs . + substituteInPlace ./hack/make.sh --replace libsystemd-journal libsystemd + ''; + + installPhase = '' + cd ./go/src/${goPackagePath} + install -Dm755 ./bundles/dynbinary-daemon/dockerd $out/libexec/docker/dockerd + + makeWrapper $out/libexec/docker/dockerd $out/bin/dockerd \ + --prefix PATH : "$out/libexec/docker:$extraPath" + + ln -s ${docker-containerd}/bin/containerd $out/libexec/docker/containerd + ln -s ${docker-containerd}/bin/containerd-shim $out/libexec/docker/containerd-shim + ln -s ${docker-runc}/bin/runc $out/libexec/docker/runc + ln -s ${docker-proxy}/bin/docker-proxy $out/libexec/docker/docker-proxy + ln -s ${docker-tini}/bin/tini-static $out/libexec/docker/docker-init + + # systemd + install -Dm644 ./contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service + ''; + + DOCKER_BUILDTAGS = [] + ++ optional (systemd != null) [ "journald" ] + ++ optional (btrfs-progs == null) "exclude_graphdriver_btrfs" + ++ optional (lvm2 == null) "exclude_graphdriver_devicemapper" + ++ optional (libseccomp != null) "seccomp"; + }); in buildGoPackage ((optionalAttrs (stdenv.isLinux) { - inherit docker-runc docker-containerd docker-proxy docker-tini; - - DOCKER_BUILDTAGS = [] - ++ optional (systemd != null) [ "journald" ] - ++ optional (btrfs-progs == null) "exclude_graphdriver_btrfs" - ++ optional (lvm2 == null) "exclude_graphdriver_devicemapper" - ++ optional (libseccomp != null) "seccomp"; + inherit docker-runc docker-containerd docker-proxy docker-tini moby; }) // rec { inherit version rev; @@ -82,97 +130,64 @@ rec { src = fetchFromGitHub { owner = "docker"; - repo = "docker-ce"; + repo = "cli"; rev = "v${version}"; sha256 = sha256; }; - patches = lib.optional (versionAtLeast version "19.03") [ - # Replace hard-coded cross-compiler with $CC - (fetchpatch { - url = https://github.com/docker/docker-ce/commit/2fdfb4404ab811cb00227a3de111437b829e55cf.patch; - sha256 = "1af20bzakhpfhaixc29qnl9iml9255xdinxdnaqp4an0n1xa686a"; - }) - ]; - - goPackagePath = "github.com/docker/docker-ce"; + goPackagePath = "github.com/docker/cli"; - nativeBuildInputs = [ pkgconfig go-md2man go libtool installShellFiles ]; + nativeBuildInputs = [ pkg-config go-md2man go libtool installShellFiles ]; buildInputs = [ makeWrapper ] ++ optionals (stdenv.isLinux) [ sqlite lvm2 btrfs-progs systemd libseccomp - ]; - - dontStrip = true; + ] ++ optionals (buildxSupport) [ docker-buildx ]; + # Keep eyes on BUILDTIME format - https://github.com/docker/cli/blob/${version}/scripts/build/.variables buildPhase = '' export GOCACHE="$TMPDIR/go-cache" - '' + (optionalString (stdenv.isLinux) '' - # build engine - cd ./go/src/${goPackagePath}/components/engine - export AUTO_GOPATH=1 - export DOCKER_GITCOMMIT="${rev}" - export VERSION="${version}" - ./hack/make.sh dynbinary - cd - - '') + '' - # build cli - cd ./go/src/${goPackagePath}/components/cli + + cd ./go/src/${goPackagePath} # Mimic AUTO_GOPATH mkdir -p .gopath/src/github.com/docker/ ln -sf $PWD .gopath/src/github.com/docker/cli export GOPATH="$PWD/.gopath:$GOPATH" export GITCOMMIT="${rev}" export VERSION="${version}" + export BUILDTIME="1970-01-01T00:00:00Z" source ./scripts/build/.variables export CGO_ENABLED=1 go build -tags pkcs11 --ldflags "$LDFLAGS" github.com/docker/cli/cmd/docker cd - ''; - # systemd 230 no longer has libsystemd-journal as a separate entity from libsystemd postPatch = '' - substituteInPlace ./components/cli/scripts/build/.variables --replace "set -eu" "" - '' + optionalString (stdenv.isLinux) '' patchShebangs . - substituteInPlace ./components/engine/hack/make.sh --replace libsystemd-journal libsystemd - substituteInPlace ./components/engine/daemon/logger/journald/read.go --replace libsystemd-journal libsystemd + substituteInPlace ./scripts/build/.variables --replace "set -eu" "" + substituteInPlace ./scripts/docs/generate-man.sh --replace "-v md2man" "-v go-md2man" + substituteInPlace ./man/md2man-all.sh --replace md2man go-md2man + '' + optionalString buildxSupport '' + substituteInPlace ./cli-plugins/manager/manager_unix.go --replace /usr/libexec/docker/cli-plugins \ + ${lib.strings.makeSearchPathOutput "bin" "libexec/docker/cli-plugins" [docker-buildx]} ''; outputs = ["out" "man"]; - extraPath = optionals (stdenv.isLinux) (makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps util-linux git ]); - installPhase = '' cd ./go/src/${goPackagePath} - install -Dm755 ./components/cli/docker $out/libexec/docker/docker + install -Dm755 ./docker $out/libexec/docker/docker makeWrapper $out/libexec/docker/docker $out/bin/docker \ --prefix PATH : "$out/libexec/docker:$extraPath" '' + optionalString (stdenv.isLinux) '' - install -Dm755 ./components/engine/bundles/dynbinary-daemon/dockerd $out/libexec/docker/dockerd - - makeWrapper $out/libexec/docker/dockerd $out/bin/dockerd \ - --prefix PATH : "$out/libexec/docker:$extraPath" - - # docker uses containerd now - ln -s ${docker-containerd}/bin/containerd $out/libexec/docker/containerd - ln -s ${docker-containerd}/bin/containerd-shim $out/libexec/docker/containerd-shim - ln -s ${docker-runc}/bin/runc $out/libexec/docker/runc - ln -s ${docker-proxy}/bin/docker-proxy $out/libexec/docker/docker-proxy - ln -s ${docker-tini}/bin/tini-static $out/libexec/docker/docker-init - - # systemd - install -Dm644 ./components/engine/contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service + # symlink docker daemon to docker cli derivation + ln -s ${moby}/bin/dockerd $out/bin/dockerd '' + '' # completion (cli) - installShellCompletion --bash ./components/cli/contrib/completion/bash/docker - installShellCompletion --fish ./components/cli/contrib/completion/fish/docker.fish - installShellCompletion --zsh ./components/cli/contrib/completion/zsh/_docker - - # Include contributed man pages (cli) - cd ./components/cli + installShellCompletion --bash ./contrib/completion/bash/docker + installShellCompletion --fish ./contrib/completion/fish/docker.fish + installShellCompletion --zsh ./contrib/completion/zsh/_docker '' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' # Generate man pages from cobra commands echo "Generate man pages from cobra" @@ -199,30 +214,18 @@ rec { }); # Get revisions from - # https://github.com/docker/docker-ce/tree/${version}/components/engine/hack/dockerfile/install/* - - docker_18_09 = makeOverridable dockerGen rec { - version = "18.09.9"; - rev = "v${version}"; - sha256 = "0wqhjx9qs96q2jd091wffn3cyv2aslqn2cvpdpgljk8yr9s0yg7h"; - runcRev = "3e425f80a8c931f88e6d94a8c831b9d5aa481657"; - runcSha256 = "18psc830b2rkwml1x6vxngam5b5wi3pj14mw817rshpzy87prspj"; - containerdRev = "894b81a4b802e4eb2a91d1ce216b8817763c29fb"; - containerdSha256 = "0sp5mn5wd3xma4svm6hf67hyhiixzkzz6ijhyjkwdrc4alk81357"; - tiniRev = "fec3683b971d9c3ef73f284f176672c44b448662"; - tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn"; - }; - - docker_19_03 = makeOverridable dockerGen rec { - version = "19.03.14"; + # https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/* + docker_20_10 = callPackage dockerGen rec { + version = "20.10.2"; rev = "v${version}"; - sha256 = "0szr5dgfrypb5kyj5l1rf7rw4iqj0d0cyx6skdqlbgf4dqwa6g9y"; - runcRev = "dc9208a3303feef5b3839f4323d9beb36df0a9dd"; # v1.0.0-rc10 - runcSha256 = "0pi3rvj585997m4z9ljkxz2z9yxf9p2jr0pmqbqrc7bc95f5hagk"; - # Note: Once all packaged Docker versions use containerd <=1.2 or >=1.4 remove the libseccomp and pkgconfig inputs above - containerdRev = "ea765aba0d05254012b0b9e595e995c09186427f"; # v1.3.9 - containerdSha256 = "1isi1wgq61b4l0lxy1d8n6dnmcb8s5ihn2yqjb6525y3dj5c5i1j"; - tiniRev = "fec3683b971d9c3ef73f284f176672c44b448662"; # v0.18.0 + sha256 = "0z0hpm5hrqh7p8my8lmiwpym2shs48my6p0zv2cc34wym0hcly51"; + mobyRev = "v${version}"; + mobySha256 = "0c2zycpnwj4kh8m8xckv1raj3fx07q9bfaj46rr85jihm4p2dp5w"; + runcRev = "ff819c7e9184c13b7c2607fe6c30ae19403a7aff"; # v1.0.0-rc92 + runcSha256 = "0r4zbxbs03xr639r7848282j1ybhibfdhnxyap9p76j5w8ixms94"; + containerdRev = "269548fa27e0089a8b8278fc4fc781d7f65a939b"; # v1.4.3 + containerdSha256 = "09xvhjg5f8h90w1y94kqqnqzhbhd62dcdd9wb9sdqakisjk6zrl0"; + tiniRev = "de40ad007797e0dcd8b7126f27bb87401d224240"; # v0.19.0 tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn"; }; } diff --git a/pkgs/applications/virtualization/docker/distribution.nix b/pkgs/applications/virtualization/docker/distribution.nix index f41862c0dd1..96722fe393f 100644 --- a/pkgs/applications/virtualization/docker/distribution.nix +++ b/pkgs/applications/virtualization/docker/distribution.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "distribution"; diff --git a/pkgs/applications/virtualization/docker/gc.nix b/pkgs/applications/virtualization/docker/gc.nix index 08cfba59918..f7bd5a4b069 100644 --- a/pkgs/applications/virtualization/docker/gc.nix +++ b/pkgs/applications/virtualization/docker/gc.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { cp docker-gc $out/bin chmod +x $out/bin/docker-gc wrapProgram $out/bin/docker-gc \ - --prefix PATH : "${stdenv.lib.makeBinPath [ docker coreutils procps gnused findutils gnugrep ]}" + --prefix PATH : "${lib.makeBinPath [ docker coreutils procps gnused findutils gnugrep ]}" ''; meta = { diff --git a/pkgs/applications/virtualization/docker/proxy.nix b/pkgs/applications/virtualization/docker/proxy.nix index 4859054d78d..59fc80eefbf 100644 --- a/pkgs/applications/virtualization/docker/proxy.nix +++ b/pkgs/applications/virtualization/docker/proxy.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "docker-proxy-${rev}"; - rev = "7b2b1feb1de4817d522cc372af149ff48d25028e"; + rev = "fa125a3512ee0f6187721c88582bf8c4378bd4d7"; src = fetchFromGitHub { inherit rev; owner = "docker"; repo = "libnetwork"; - sha256 = "1ng577k11cyv207bp0vaz5jjfcn2igd6w95zn4izcq1nldzp5935"; + sha256 = "1r47y0gww3j7fas4kgiqbhrz5fazsx1c6sxnccdfhj8fzik77s9y"; }; goPackagePath = "github.com/docker/libnetwork"; diff --git a/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix b/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix index e772a540b18..cf6395c8a53 100644 --- a/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix +++ b/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { buildPhase = let unpack = x: "tar xf $src/${x}.tar; mkdir -p x86/${x} amd64/${x}; cp ${x}/x86/* x86/${x}/.; cp ${x}/x64/* amd64/${x}/."; - in stdenv.lib.concatStringsSep "\n" (map unpack ["xenbus" "xeniface" "xenvif" "xennet" "xenvbd"]); + in lib.concatStringsSep "\n" (map unpack ["xenbus" "xeniface" "xenvif" "xennet" "xenvbd"]); installPhase = '' mkdir -p $out diff --git a/pkgs/applications/virtualization/driver/win-virtio/default.nix b/pkgs/applications/virtualization/driver/win-virtio/default.nix index 565fc4cf533..1f9e21845ce 100644 --- a/pkgs/applications/virtualization/driver/win-virtio/default.nix +++ b/pkgs/applications/virtualization/driver/win-virtio/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { {input="viorng"; output="viorng";} ]; in - stdenv.lib.concatStringsSep "\n" ((map (copy "amd64" "w8.1") virtio) ++ (map (copy "x86" "w8.1") virtio)); + lib.concatStringsSep "\n" ((map (copy "amd64" "w8.1") virtio) ++ (map (copy "x86" "w8.1") virtio)); meta = with lib; { description = "Windows VirtIO Drivers"; diff --git a/pkgs/applications/virtualization/dumb-init/default.nix b/pkgs/applications/virtualization/dumb-init/default.nix index 80a76432f08..bb265dc5488 100644 --- a/pkgs/applications/virtualization/dumb-init/default.nix +++ b/pkgs/applications/virtualization/dumb-init/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "dumb-init"; - version = "1.2.4"; + version = "1.2.5"; src = fetchFromGitHub { owner = "Yelp"; repo = pname; rev = "v${version}"; - sha256 = "0v6ggfjl3q5p4hf002ygs8rryyzrg0fqy836p403fq2fgm30k0xx"; + sha256 = "sha256-aRh0xfmp+ToXIYjYaducTpZUHndZ5HlFZpFhzJ3yKgs="; }; buildInputs = [ glibc.static ]; diff --git a/pkgs/applications/virtualization/ecs-agent/default.nix b/pkgs/applications/virtualization/ecs-agent/default.nix index 41a09315333..390f3049c02 100644 --- a/pkgs/applications/virtualization/ecs-agent/default.nix +++ b/pkgs/applications/virtualization/ecs-agent/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoPackage }: +{ lib, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { pname = "amazon-ecs-agent"; diff --git a/pkgs/applications/virtualization/firectl/default.nix b/pkgs/applications/virtualization/firectl/default.nix index 0b5fc5dac52..ac531b36dd2 100644 --- a/pkgs/applications/virtualization/firectl/default.nix +++ b/pkgs/applications/virtualization/firectl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "firectl"; diff --git a/pkgs/applications/virtualization/gvisor/default.nix b/pkgs/applications/virtualization/gvisor/default.nix index 54cf8094d64..fd001d598ad 100644 --- a/pkgs/applications/virtualization/gvisor/default.nix +++ b/pkgs/applications/virtualization/gvisor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildBazelPackage , fetchFromGitHub , cacert @@ -87,7 +87,7 @@ in buildBazelPackage rec { # Needed for the 'runsc do' subcomand wrapProgram $out/bin/runsc \ - --prefix PATH : ${stdenv.lib.makeBinPath [ iproute iptables procps ]} + --prefix PATH : ${lib.makeBinPath [ iproute iptables procps ]} ''; }; diff --git a/pkgs/applications/virtualization/nvidia-docker/avoid-static-libtirpc-build.patch b/pkgs/applications/virtualization/libnvidia-container/avoid-static-libtirpc-build.patch index d3f207de00b..d3f207de00b 100644 --- a/pkgs/applications/virtualization/nvidia-docker/avoid-static-libtirpc-build.patch +++ b/pkgs/applications/virtualization/libnvidia-container/avoid-static-libtirpc-build.patch diff --git a/pkgs/applications/virtualization/nvidia-docker/libnvc.nix b/pkgs/applications/virtualization/libnvidia-container/default.nix index 95d66582618..3ce493c6178 100644 --- a/pkgs/applications/virtualization/nvidia-docker/libnvc.nix +++ b/pkgs/applications/virtualization/libnvidia-container/default.nix @@ -1,12 +1,13 @@ { stdenv , lib , fetchFromGitHub -, pkgconfig +, pkg-config , libelf , libcap , libseccomp , rpcsvc-proto , libtirpc +, makeWrapper }: let modp-ver = "450.57"; @@ -23,7 +24,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "NVIDIA"; - repo = "libnvidia-container"; + repo = pname; rev = "v${version}"; sha256 = "0j6b8z9x9hrrs4xp11zyjjd7kyl7fzcicpiis8k1qb1q2afnqsrq"; }; @@ -64,17 +65,23 @@ stdenv.mkDerivation rec { popd ''; + postInstall = '' + wrapProgram $out/bin/nvidia-container-cli \ + --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib:/run/opengl-driver-32/lib + ''; + NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; NIX_LDFLAGS = [ "-L${libtirpc.dev}/lib" "-ltirpc" ]; - nativeBuildInputs = [ pkgconfig rpcsvc-proto ]; + nativeBuildInputs = [ pkg-config rpcsvc-proto makeWrapper ]; buildInputs = [ libelf libcap libseccomp libtirpc ]; meta = with lib; { homepage = "https://github.com/NVIDIA/libnvidia-container"; description = "NVIDIA container runtime library"; - license = licenses.bsd3; + license = licenses.asl20; platforms = platforms.linux; + maintainers = with maintainers; [ cpcloud ]; }; } diff --git a/pkgs/applications/virtualization/nvidia-docker/libnvc-ldconfig-and-path-fixes.patch b/pkgs/applications/virtualization/libnvidia-container/libnvc-ldconfig-and-path-fixes.patch index d4638791a01..d4638791a01 100644 --- a/pkgs/applications/virtualization/nvidia-docker/libnvc-ldconfig-and-path-fixes.patch +++ b/pkgs/applications/virtualization/libnvidia-container/libnvc-ldconfig-and-path-fixes.patch diff --git a/pkgs/applications/virtualization/nvidia-docker/modprobe.patch b/pkgs/applications/virtualization/libnvidia-container/modprobe.patch index 8e7b0a723ec..8e7b0a723ec 100644 --- a/pkgs/applications/virtualization/nvidia-docker/modprobe.patch +++ b/pkgs/applications/virtualization/libnvidia-container/modprobe.patch diff --git a/pkgs/applications/virtualization/looking-glass-client/default.nix b/pkgs/applications/virtualization/looking-glass-client/default.nix index e7c8cc4d47a..720f684f44c 100644 --- a/pkgs/applications/virtualization/looking-glass-client/default.nix +++ b/pkgs/applications/virtualization/looking-glass-client/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, SDL2, SDL2_ttf, spice-protocol +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, SDL2, SDL2_ttf, spice-protocol , fontconfig, libX11, freefont_ttf, nettle, libpthreadstubs, libXau, libXdmcp , libXi, libXext, wayland, libffi, libGLU, expat, libbfd }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ SDL2 SDL2_ttf spice-protocol fontconfig libX11 freefont_ttf nettle diff --git a/pkgs/applications/virtualization/nvidia-container-runtime/default.nix b/pkgs/applications/virtualization/nvidia-container-runtime/default.nix new file mode 100644 index 00000000000..92717b98891 --- /dev/null +++ b/pkgs/applications/virtualization/nvidia-container-runtime/default.nix @@ -0,0 +1,72 @@ +{ lib +, glibc +, fetchFromGitHub +, makeWrapper +, buildGoPackage +, linkFarm +, writeShellScript +, containerRuntimePath +, configTemplate +}: +let + isolatedContainerRuntimePath = linkFarm "isolated_container_runtime_path" [ + { + name = "runc"; + path = containerRuntimePath; + } + ]; + warnIfXdgConfigHomeIsSet = writeShellScript "warn_if_xdg_config_home_is_set" '' + set -eo pipefail + + if [ -n "$XDG_CONFIG_HOME" ]; then + echo >&2 "$(tput setaf 3)warning: \$XDG_CONFIG_HOME=$XDG_CONFIG_HOME$(tput sgr 0)" + fi + ''; +in +buildGoPackage rec { + pname = "nvidia-container-runtime"; + version = "3.4.0"; + + src = fetchFromGitHub { + owner = "NVIDIA"; + repo = pname; + rev = "v${version}"; + sha256 = "095mks0r4079vawi50pk4zb5jk0g6s9idg2s1w55a0d27jkknldr"; + }; + + goPackagePath = "github.com/${pname}/src"; + buildFlagsArray = [ "-ldflags=" "-s -w" ]; + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + mv $out/bin/{src,nvidia-container-runtime} + mkdir -p $out/etc/nvidia-container-runtime + + # nvidia-container-runtime invokes docker-runc or runc if that isn't + # available on PATH. + # + # Also set XDG_CONFIG_HOME if it isn't already to allow overriding + # configuration. This in turn allows users to have the nvidia container + # runtime enabled for any number of higher level runtimes like docker and + # podman, i.e., there's no need to have mutually exclusivity on what high + # level runtime can enable the nvidia runtime because each high level + # runtime has its own config.toml file. + wrapProgram $out/bin/nvidia-container-runtime \ + --run "${warnIfXdgConfigHomeIsSet}" \ + --prefix PATH : ${isolatedContainerRuntimePath} \ + --set-default XDG_CONFIG_HOME $out/etc + + cp ${configTemplate} $out/etc/nvidia-container-runtime/config.toml + + substituteInPlace $out/etc/nvidia-container-runtime/config.toml \ + --subst-var-by glibcbin ${lib.getBin glibc} + ''; + + meta = with lib; { + homepage = "https://github.com/NVIDIA/nvidia-container-runtime"; + description = "NVIDIA container runtime"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ cpcloud ]; + }; +} diff --git a/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix b/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix new file mode 100644 index 00000000000..4276f71a409 --- /dev/null +++ b/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix @@ -0,0 +1,37 @@ +{ lib +, fetchFromGitHub +, buildGoModule +, makeWrapper +, nvidia-container-runtime +}: +buildGoModule rec { + pname = "nvidia-container-toolkit"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "NVIDIA"; + repo = pname; + rev = "v${version}"; + sha256 = "04284bhgx4j55vg9ifvbji2bvmfjfy3h1lq7q356ffgw3yr9n0hn"; + }; + + vendorSha256 = "17zpiyvf22skfcisflsp6pn56y6a793jcx89kw976fq2x5br1bz7"; + buildFlagsArray = [ "-ldflags=" "-s -w" ]; + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + mv $out/bin/{pkg,${pname}} + ln -s $out/bin/nvidia-container-{toolkit,runtime-hook} + + wrapProgram $out/bin/nvidia-container-toolkit \ + --add-flags "-config ${nvidia-container-runtime}/etc/nvidia-container-runtime/config.toml" + ''; + + meta = with lib; { + homepage = "https://github.com/NVIDIA/nvidia-container-toolkit"; + description = "NVIDIA container runtime hook"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ cpcloud ]; + }; +} diff --git a/pkgs/applications/virtualization/nvidia-docker/default.nix b/pkgs/applications/virtualization/nvidia-docker/default.nix index 0df2efebd82..07dfc3fdb6d 100644 --- a/pkgs/applications/virtualization/nvidia-docker/default.nix +++ b/pkgs/applications/virtualization/nvidia-docker/default.nix @@ -1,106 +1,32 @@ -{ stdenv -, lib -, fetchFromGitHub -, fetchpatch -, callPackage -, makeWrapper -, buildGoModule -, buildGoPackage -, glibc -, docker -, linkFarm -, containerRuntimePath ? "${docker}/libexec/docker/runc" -}: - -with lib; let - libnvidia-container = callPackage ./libnvc.nix { }; - isolatedContainerRuntimePath = linkFarm "isolated_container_runtime_path" [ - { - name = "runc"; - path = containerRuntimePath; - } - ]; - - nvidia-container-runtime = buildGoPackage rec { - pname = "nvidia-container-runtime"; - version = "3.4.0"; - src = fetchFromGitHub { - owner = "NVIDIA"; - repo = "nvidia-container-runtime"; - rev = "v${version}"; - sha256 = "095mks0r4079vawi50pk4zb5jk0g6s9idg2s1w55a0d27jkknldr"; - }; - goPackagePath = "github.com/nvidia-container-runtime/src"; - buildFlagsArray = [ "-ldflags=" "-s -w" ]; - postInstall = '' - mv $out/bin/{src,nvidia-container-runtime} - ''; - }; - - nvidia-container-toolkit = buildGoModule rec { - pname = "nvidia-container-toolkit"; - version = "1.3.0"; - src = fetchFromGitHub { - owner = "NVIDIA"; - repo = "nvidia-container-toolkit"; - rev = "v${version}"; - sha256 = "04284bhgx4j55vg9ifvbji2bvmfjfy3h1lq7q356ffgw3yr9n0hn"; - }; - vendorSha256 = "17zpiyvf22skfcisflsp6pn56y6a793jcx89kw976fq2x5br1bz7"; - buildFlagsArray = [ "-ldflags=" "-s -w" ]; - postInstall = '' - mv $out/bin/{pkg,${pname}} - cp $out/bin/{${pname},nvidia-container-runtime-hook} - ''; - }; - -in +{ stdenv, lib, fetchFromGitHub, callPackage }: stdenv.mkDerivation rec { pname = "nvidia-docker"; version = "2.5.0"; src = fetchFromGitHub { owner = "NVIDIA"; - repo = "nvidia-docker"; + repo = pname; rev = "v${version}"; sha256 = "1n1k7fnimky67s12p2ycaq9mgk245fchq62vgd7bl3bzfcbg0z4h"; }; - nativeBuildInputs = [ makeWrapper ]; - buildPhase = '' mkdir bin cp nvidia-docker bin substituteInPlace bin/nvidia-docker --subst-var-by VERSION ${version} - - cp ${libnvidia-container}/bin/nvidia-container-cli bin - cp ${nvidia-container-toolkit}/bin/nvidia-container-{toolkit,runtime-hook} bin - cp ${nvidia-container-runtime}/bin/nvidia-container-runtime bin ''; installPhase = '' - mkdir -p $out/{bin,etc} - cp -r bin $out - - wrapProgram $out/bin/nvidia-container-cli \ - --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib:/run/opengl-driver-32/lib - - # nvidia-container-runtime invokes docker-runc or runc if that isn't available on PATH - wrapProgram $out/bin/nvidia-container-runtime --prefix PATH : ${isolatedContainerRuntimePath} - - cp ${./config.toml} $out/etc/config.toml - substituteInPlace $out/etc/config.toml --subst-var-by glibcbin ${lib.getBin glibc} - - cp ${./podman-config.toml} $out/etc/podman-config.toml - substituteInPlace $out/etc/podman-config.toml --subst-var-by glibcbin ${lib.getBin glibc} + mkdir -p $out/bin + cp bin/nvidia-docker $out/bin ''; - meta = { + meta = with lib; { homepage = "https://github.com/NVIDIA/nvidia-docker"; description = "NVIDIA container runtime for Docker"; license = licenses.bsd3; platforms = platforms.linux; - maintainers = with lib.maintainers; [ cpcloud ]; + maintainers = with maintainers; [ cpcloud ]; }; } diff --git a/pkgs/applications/virtualization/nvidia-docker/podman-config.toml b/pkgs/applications/virtualization/nvidia-podman/config.toml index eb39699b96b..eb39699b96b 100644 --- a/pkgs/applications/virtualization/nvidia-docker/podman-config.toml +++ b/pkgs/applications/virtualization/nvidia-podman/config.toml diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index a5c8d976932..1afe994977c 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook, fuse, libmspack, openssl, pam, xercesc, icu, libdnet, procps, libtirpc, rpcsvc-proto, libX11, libXext, libXinerama, libXi, libXrender, libXrandr, libXtst, - pkgconfig, glib, gdk-pixbuf-xlib, gtk3, gtkmm3, iproute, dbus, systemd, which, + pkg-config, glib, gdk-pixbuf-xlib, gtk3, gtkmm3, iproute, dbus, systemd, which, withX ? true }: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig ]; + nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config ]; buildInputs = [ fuse glib icu libdnet libmspack libtirpc openssl pam procps rpcsvc-proto xercesc ] ++ lib.optionals withX [ gdk-pixbuf-xlib gtk3 gtkmm3 libX11 libXext libXinerama libXi libXrender libXrandr libXtst ]; diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 39097c8e5b3..5c03951e17e 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -33,7 +33,7 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config go-md2man installShellFiles ]; - buildInputs = stdenv.lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.isLinux [ btrfs-progs gpgme libapparmor @@ -51,7 +51,7 @@ buildGoModule rec { make docs ''; - installPhase = stdenv.lib.optionalString stdenv.isDarwin '' + installPhase = lib.optionalString stdenv.isDarwin '' mv bin/{podman-remote,podman} '' + '' install -Dm555 bin/podman $out/bin/podman diff --git a/pkgs/applications/virtualization/qboot/default.nix b/pkgs/applications/virtualization/qboot/default.nix index 8d1f9dac2e5..8ac00d1f8e1 100644 --- a/pkgs/applications/virtualization/qboot/default.nix +++ b/pkgs/applications/virtualization/qboot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, meson, ninja, fetchFromGitHub, nixosTests }: +{ lib, stdenv, meson, ninja, fetchFromGitHub, nixosTests }: stdenv.mkDerivation { name = "qboot-20200423"; @@ -24,8 +24,8 @@ stdenv.mkDerivation { meta = { description = "A simple x86 firmware for booting Linux"; homepage = "https://github.com/bonzini/qboot"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ tstrobel ]; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ tstrobel ]; platforms = ["x86_64-linux" "i686-linux"]; }; } diff --git a/pkgs/applications/virtualization/qemu/CVE-2020-27617.patch b/pkgs/applications/virtualization/qemu/CVE-2020-27617.patch deleted file mode 100644 index fa708b29836..00000000000 --- a/pkgs/applications/virtualization/qemu/CVE-2020-27617.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 6d19c0cc6c5a9bba308fc29d7c0edc2dc372c41b Mon Sep 17 00:00:00 2001 -From: Prasad J Pandit <pjp@fedoraproject.org> -Date: Wed, 21 Oct 2020 11:35:50 +0530 -Subject: [PATCH] net: remove an assert call in eth_get_gso_type - -eth_get_gso_type() routine returns segmentation offload type based on -L3 protocol type. It calls g_assert_not_reached if L3 protocol is -unknown, making the following return statement unreachable. Remove the -g_assert call, it maybe triggered by a guest user. - -Reported-by: Gaoning Pan <pgn@zju.edu.cn> -Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org> ---- - net/eth.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/net/eth.c b/net/eth.c -index 0c1d413ee2..eee77071f9 100644 ---- a/net/eth.c -+++ b/net/eth.c -@@ -16,6 +16,7 @@ - */ - - #include "qemu/osdep.h" -+#include "qemu/log.h" - #include "net/eth.h" - #include "net/checksum.h" - #include "net/tap.h" -@@ -71,9 +72,8 @@ eth_get_gso_type(uint16_t l3_proto, uint8_t *l3_hdr, uint8_t l4proto) - return VIRTIO_NET_HDR_GSO_TCPV6 | ecn_state; - } - } -- -- /* Unsupported offload */ -- g_assert_not_reached(); -+ qemu_log_mask(LOG_GUEST_ERROR, "%s: probably not GSO frame, " -+ "unknown L3 protocol: 0x%04"PRIx16"\n", __func__, l3_proto); - - return VIRTIO_NET_HDR_GSO_NONE | ecn_state; - } --- -2.28.0 - diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 44dff9ad42a..d83c6d350e2 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchurl, fetchpatch, python, zlib, pkgconfig, glib +{ lib, stdenv, fetchurl, fetchpatch, python, zlib, pkg-config, glib , perl, pixman, vde2, alsaLib, texinfo, flex -, bison, lzo, snappy, libaio, gnutls, nettle, curl -, makeWrapper +, bison, lzo, snappy, libaio, gnutls, nettle, curl, ninja, meson +, makeWrapper, autoPatchelfHook , attr, libcap, libcap_ng , CoreServices, Cocoa, Hypervisor, rez, setfile , numaSupport ? stdenv.isLinux && !stdenv.isAarch32, numactl , seccompSupport ? stdenv.isLinux, libseccomp , alsaSupport ? lib.hasSuffix "linux" stdenv.hostPlatform.system && !nixosTestRunner , pulseSupport ? !stdenv.isDarwin && !nixosTestRunner, libpulseaudio -, sdlSupport ? !stdenv.isDarwin && !nixosTestRunner, SDL2 +, sdlSupport ? !stdenv.isDarwin && !nixosTestRunner, SDL2, SDL2_image , gtkSupport ? !stdenv.isDarwin && !xenSupport && !nixosTestRunner, gtk3, gettext, vte, wrapGAppsHook , vncSupport ? !nixosTestRunner, libjpeg, libpng , smartcardSupport ? !nixosTestRunner, libcacard @@ -19,6 +19,7 @@ , cephSupport ? false, ceph , openGLSupport ? sdlSupport, mesa, epoxy, libdrm , virglSupport ? openGLSupport, virglrenderer +, libiscsiSupport ? true, libiscsi , smbdSupport ? false, samba , tpmSupport ? true , hostCpuOnly ? false @@ -29,7 +30,7 @@ , nixosTestRunner ? false }: -with stdenv.lib; +with lib; let audio = optionalString alsaSupport "alsa," + optionalString pulseSupport "pa," @@ -38,18 +39,18 @@ let in stdenv.mkDerivation rec { - version = "5.1.0"; + version = "5.2.0"; pname = "qemu" - + stdenv.lib.optionalString xenSupport "-xen" - + stdenv.lib.optionalString hostCpuOnly "-host-cpu-only" - + stdenv.lib.optionalString nixosTestRunner "-for-vm-tests"; + + lib.optionalString xenSupport "-xen" + + lib.optionalString hostCpuOnly "-host-cpu-only" + + lib.optionalString nixosTestRunner "-for-vm-tests"; src = fetchurl { url= "https://download.qemu.org/qemu-${version}.tar.xz"; - sha256 = "1rd41wwlvp0vpialjp2czs6i3lsc338xc72l3zkbb7ixjfslw5y9"; + sha256 = "1g0pvx4qbirpcn9mni704y03n3lvkmw2c0rbcwvydyr8ns4xh66b"; }; - nativeBuildInputs = [ python python.pkgs.sphinx pkgconfig flex bison ] + nativeBuildInputs = [ python python.pkgs.sphinx pkg-config flex bison meson ninja autoPatchelfHook ] ++ optionals gtkSupport [ wrapGAppsHook ]; buildInputs = [ zlib glib perl pixman @@ -61,7 +62,7 @@ stdenv.mkDerivation rec { ++ optionals seccompSupport [ libseccomp ] ++ optionals numaSupport [ numactl ] ++ optionals pulseSupport [ libpulseaudio ] - ++ optionals sdlSupport [ SDL2 ] + ++ optionals sdlSupport [ SDL2 SDL2_image ] ++ optionals gtkSupport [ gtk3 gettext vte ] ++ optionals vncSupport [ libjpeg libpng ] ++ optionals smartcardSupport [ libcacard ] @@ -72,23 +73,17 @@ stdenv.mkDerivation rec { ++ optionals cephSupport [ ceph ] ++ optionals openGLSupport [ mesa epoxy libdrm ] ++ optionals virglSupport [ virglrenderer ] + ++ optionals libiscsiSupport [ libiscsi ] ++ optionals smbdSupport [ samba ]; enableParallelBuilding = true; + dontUseMesonConfigure = true; # meson's configurePhase isn't compatible with qemu build outputs = [ "out" "ga" ]; patches = [ - ./no-etc-install.patch ./fix-qemu-ga.patch ./9p-ignore-noatime.patch - ./CVE-2020-27617.patch - (fetchpatch { - # e1000e: infinite loop scenario in case of null packet descriptor, remove for QEMU >= 5.2.0-rc3 - name = "CVE-2020-28916.patch"; - url = "https://git.qemu.org/?p=qemu.git;a=patch;h=c2cb511634012344e3d0fe49a037a33b12d8a98a"; - sha256 = "1kvm6wl4vry0npiisxsn76h8nf1iv5fmqsyjvb46203f1yyg5pis"; - }) ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch ++ optionals stdenv.hostPlatform.isMusl [ (fetchpatch { @@ -106,27 +101,19 @@ stdenv.mkDerivation rec { }) ]; - # Remove CVE-2020-{29129,29130} for QEMU >5.1.0 - postPatch = '' - (cd slirp && patch -p1 < ${fetchpatch { - name = "CVE-2020-29129_CVE-2020-29130.patch"; - url = "https://gitlab.freedesktop.org/slirp/libslirp/-/commit/2e1dcbc0c2af64fcb17009eaf2ceedd81be2b27f.patch"; - sha256 = "01vbjqgnc0kp881l5p6b31cyyirhwhavm6x36hlgkymswvl3wh9w"; - }}) - ''; - hardeningDisable = [ "stackprotector" ]; preConfigure = '' unset CPP # intereferes with dependency calculation + # this script isn't marked as executable b/c it's indirectly used by meson. Needed to patch its shebang + chmod +x ./scripts/shaderinclude.pl + patchShebangs . '' + optionalString stdenv.hostPlatform.isMusl '' NIX_CFLAGS_COMPILE+=" -D_LINUX_SYSINFO_H" ''; configureFlags = [ "--audio-drv-list=${audio}" - "--sysconfdir=/etc" - "--localstatedir=/var" "--enable-docs" "--enable-tools" "--enable-guest-agent" @@ -138,7 +125,7 @@ stdenv.mkDerivation rec { ++ optional smartcardSupport "--enable-smartcard" ++ optional spiceSupport "--enable-spice" ++ optional usbredirSupport "--enable-usb-redir" - ++ optional (hostCpuTargets != null) "--target-list=${stdenv.lib.concatStringsSep "," hostCpuTargets}" + ++ optional (hostCpuTargets != null) "--target-list=${lib.concatStringsSep "," hostCpuTargets}" ++ optional stdenv.isDarwin "--enable-cocoa" ++ optional stdenv.isDarwin "--enable-hvf" ++ optional stdenv.isLinux "--enable-linux-aio" @@ -148,6 +135,7 @@ stdenv.mkDerivation rec { ++ optional openGLSupport "--enable-opengl" ++ optional virglSupport "--enable-virglrenderer" ++ optional tpmSupport "--enable-tpm" + ++ optional libiscsiSupport "--enable-libiscsi" ++ optional smbdSupport "--smbd=${samba}/bin/smbd"; doCheck = false; # tries to access /dev @@ -155,7 +143,7 @@ stdenv.mkDerivation rec { postFixup = '' # the .desktop is both invalid and pointless - rm $out/share/applications/qemu.desktop + rm -f $out/share/applications/qemu.desktop # copy qemu-ga (guest agent) to separate output mkdir -p $ga/bin @@ -166,6 +154,7 @@ stdenv.mkDerivation rec { wrapGApp $f done ''; + preBuild = "cd build"; # Add a ‘qemu-kvm’ wrapper for compatibility/convenience. postInstall = '' diff --git a/pkgs/applications/virtualization/qemu/no-etc-install.patch b/pkgs/applications/virtualization/qemu/no-etc-install.patch deleted file mode 100644 index 5bab930d06a..00000000000 --- a/pkgs/applications/virtualization/qemu/no-etc-install.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/Makefile b/Makefile ---- a/Makefile -+++ b/Makefile -@@ -867,7 +867,7 @@ install-includedir: - $(INSTALL_DIR) "$(DESTDIR)$(includedir)" - - install: all $(if $(BUILD_DOCS),install-doc) \ -- install-datadir install-localstatedir install-includedir \ -+ install-datadir install-includedir \ - $(if $(INSTALL_BLOBS),$(edk2-decompressed)) \ - recurse-install - ifneq ($(TOOLS),) diff --git a/pkgs/applications/virtualization/qtemu/default.nix b/pkgs/applications/virtualization/qtemu/default.nix index 4c0f441d781..3a5f26bfcc8 100644 --- a/pkgs/applications/virtualization/qtemu/default.nix +++ b/pkgs/applications/virtualization/qtemu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitLab, pkgconfig, qmake, qtbase, qemu, makeWrapper }: +{ lib, mkDerivation, fetchFromGitLab, pkg-config, qmake, qtbase, qemu, makeWrapper }: mkDerivation rec { pname = "qtemu"; @@ -13,7 +13,7 @@ mkDerivation rec { nativeBuildInputs = [ qmake - pkgconfig + pkg-config ]; buildInputs = [ @@ -30,7 +30,7 @@ mkDerivation rec { install -D -t $out/bin qtemu # make sure that the qemu-* executables are found - wrapProgram $out/bin/qtemu --prefix PATH : ${stdenv.lib.makeBinPath [ qemu ]} + wrapProgram $out/bin/qtemu --prefix PATH : ${lib.makeBinPath [ qemu ]} runHook postInstall ''; diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix index 13f84736d9e..3bc2df19d1d 100644 --- a/pkgs/applications/virtualization/singularity/default.nix +++ b/pkgs/applications/virtualization/singularity/default.nix @@ -1,5 +1,4 @@ -{stdenv -, lib +{ lib , fetchurl , util-linux , gpgme @@ -17,11 +16,11 @@ with lib; buildGoPackage rec { pname = "singularity"; - version = "3.7.0"; + version = "3.7.1"; src = fetchurl { url = "https://github.com/hpcng/singularity/releases/download/v${version}/singularity-${version}.tar.gz"; - sha256 = "0y6lm23g6a2ljm78w8iyak7yivxvpj3i55fjbd56m9b2ykssm5pv"; + sha256 = "sha256-gtLGUGNWAZXsNFUZMb48MluV6OIAnpJ1X9farTRuCDw="; }; goPackagePath = "github.com/sylabs/singularity"; @@ -39,7 +38,7 @@ buildGoPackage rec { cd go/src/github.com/sylabs/singularity patchShebangs . - sed -i 's|defaultPath := "[^"]*"|defaultPath := "${stdenv.lib.makeBinPath propagatedBuildInputs}"|' cmd/internal/cli/actions.go + sed -i 's|defaultPath := "[^"]*"|defaultPath := "${lib.makeBinPath propagatedBuildInputs}"|' cmd/internal/cli/actions.go ./mconfig -V ${version} -p $out --localstatedir=/var @@ -59,8 +58,8 @@ buildGoPackage rec { chmod 755 $out/libexec/singularity/bin/starter-suid # Explicitly configure paths in the config file - sed -i 's|^# mksquashfs path =.*$|mksquashfs path = ${stdenv.lib.makeBinPath [squashfsTools]}/mksquashfs|' $out/etc/singularity/singularity.conf - sed -i 's|^# cryptsetup path =.*$|cryptsetup path = ${stdenv.lib.makeBinPath [cryptsetup]}/cryptsetup|' $out/etc/singularity/singularity.conf + sed -i 's|^# mksquashfs path =.*$|mksquashfs path = ${lib.makeBinPath [squashfsTools]}/mksquashfs|' $out/etc/singularity/singularity.conf + sed -i 's|^# cryptsetup path =.*$|cryptsetup path = ${lib.makeBinPath [cryptsetup]}/cryptsetup|' $out/etc/singularity/singularity.conf runHook postInstall ''; diff --git a/pkgs/applications/virtualization/spice-vdagent/default.nix b/pkgs/applications/virtualization/spice-vdagent/default.nix index f577ded70ba..48b0423983d 100644 --- a/pkgs/applications/virtualization/spice-vdagent/default.nix +++ b/pkgs/applications/virtualization/spice-vdagent/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, alsaLib, spice-protocol, glib, +{lib, stdenv, fetchurl, pkg-config, alsaLib, spice-protocol, glib, libpciaccess, libxcb, libXrandr, libXinerama, libXfixes, dbus, libdrm, systemd}: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace data/spice-vdagent.desktop --replace /usr $out ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ alsaLib spice-protocol glib libdrm libpciaccess libxcb libXrandr libXinerama libXfixes dbus systemd ] ; @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { * Multiple displays ''; homepage = "https://www.spice-space.org/"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.aboseley ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.aboseley ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/virtualization/tinyemu/default.nix b/pkgs/applications/virtualization/tinyemu/default.nix index 2c9098993d8..17cee52a64e 100644 --- a/pkgs/applications/virtualization/tinyemu/default.nix +++ b/pkgs/applications/virtualization/tinyemu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, curl, SDL }: +{ lib, stdenv, fetchurl, openssl, curl, SDL }: stdenv.mkDerivation rec { pname = "tinyemu"; @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { homepage = "https://bellard.org/tinyemu/"; description = "A system emulator for the RISC-V and x86 architectures"; longDescription = "TinyEMU is a system emulator for the RISC-V and x86 architectures. Its purpose is to be small and simple while being complete."; - license = with stdenv.lib.licenses; [ mit bsd2 ]; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ jhhuh ]; + license = with lib.licenses; [ mit bsd2 ]; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ jhhuh ]; }; } diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 4a6b539b4fb..11ddaff8d3b 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python3Packages, intltool, file +{ lib, fetchurl, python3Packages, intltool, file , wrapGAppsHook, gtk-vnc, vte, avahi, dconf , gobject-introspection, libvirt-glib, system-libvirt , gsettings-desktop-schemas, glib, libosinfo, gnome3 @@ -7,7 +7,7 @@ , cpio, e2fsprogs, findutils, gzip }: -with stdenv.lib; +with lib; python3Packages.buildPythonApplication rec { pname = "virt-manager"; diff --git a/pkgs/applications/virtualization/virt-manager/qt.nix b/pkgs/applications/virtualization/virt-manager/qt.nix index 1d2a32c54e3..1633c8d66f3 100644 --- a/pkgs/applications/virtualization/virt-manager/qt.nix +++ b/pkgs/applications/virtualization/virt-manager/qt.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, fetchpatch, cmake, pkgconfig +{ mkDerivation, lib, fetchFromGitHub, fetchpatch, cmake, pkg-config , qtbase, qtmultimedia, qtsvg, qttools, krdc , libvncserver, libvirt, pcre, pixman, qtermwidget, spice-gtk, spice-protocol , libselinux, libsepol, util-linux @@ -35,7 +35,7 @@ mkDerivation rec { libselinux libsepol util-linux ]; - nativeBuildInputs = [ cmake pkgconfig qttools ]; + nativeBuildInputs = [ cmake pkg-config qttools ]; meta = with lib; { homepage = "https://f1ash.github.io/qt-virt-manager"; diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index 41e6c425a81..4fd56e0cae3 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, shared-mime-info, wrapGAppsHook +{ lib, stdenv, fetchurl, pkg-config, intltool, shared-mime-info, wrapGAppsHook , glib, gsettings-desktop-schemas, gtk-vnc, gtk3, libvirt, libvirt-glib, libxml2, vte , spiceSupport ? true , spice-gtk ? null, spice-protocol ? null, libcap ? null, gdbm ? null @@ -7,7 +7,7 @@ assert spiceSupport -> spice-gtk != null && spice-protocol != null && libcap != null && gdbm != null; -with stdenv.lib; +with lib; stdenv.mkDerivation rec { baseName = "virt-viewer"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "09a83mzyn3b4nd7wpa659g1zf1fjbzb79rk968bz6k5xl21k7d4i"; }; - nativeBuildInputs = [ pkgconfig intltool shared-mime-info wrapGAppsHook glib ]; + nativeBuildInputs = [ pkg-config intltool shared-mime-info wrapGAppsHook glib ]; buildInputs = [ glib gsettings-desktop-schemas gtk-vnc gtk3 libvirt libvirt-glib libxml2 vte ] ++ optionals spiceSupport [ diff --git a/pkgs/applications/virtualization/virtinst/default.nix b/pkgs/applications/virtualization/virtinst/default.nix index 4d8987d6ed7..37f03d8772f 100644 --- a/pkgs/applications/virtualization/virtinst/default.nix +++ b/pkgs/applications/virtualization/virtinst/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, python2Packages, intltool, libxml2Python }: +{ lib, stdenv, fetchurl, python2Packages, intltool, libxml2Python }: -with stdenv.lib; +with lib; let version = "0.600.4"; in @@ -39,9 +39,9 @@ stdenv.mkDerivation rec { meta = { homepage = "http://virt-manager.org"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [qknight]; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [qknight]; description = "Command line tool which provides an easy way to provision operating systems into virtual machines"; - platforms = with stdenv.lib.platforms; linux; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index e80edf72677..360e6e36c1a 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -1,7 +1,7 @@ { 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, qtsvg, qtwayland, pkgconfig, which, docbook_xsl, docbook_xml_dtd_43 +, qttools, qtsvg, qtwayland, pkg-config, which, docbook_xsl, docbook_xml_dtd_43 , alsaLib, curl, libvpx, nettools, dbus, substituteAll, fetchpatch # If open-watcom-bin is not passed, VirtualBox will fall back to use # the shipped alternative sources (assembly). @@ -16,14 +16,14 @@ , enable32bitGuests ? true }: -with stdenv.lib; +with lib; let python = python3; buildType = "release"; # Use maintainers/scripts/update.nix to update the version and all related hashes or # change the hashes in extpack.nix and guest-additions/default.nix as well manually. - version = "6.1.16"; + version = "6.1.18"; iasl' = iasl.overrideAttrs (old: rec { inherit (old) pname; @@ -40,12 +40,12 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = "49c1990da16d8a3d5bda8cdb961ec8195a901e67e4c79aea44c1521a5fc2f9f1"; + sha256 = "108d42b9b391b7a332a33df1662cf7b0e9d9a80f3079d16288d8b9487f427d40"; }; outputs = [ "out" "modsrc" ]; - nativeBuildInputs = [ pkgconfig which docbook_xsl docbook_xml_dtd_43 ] + nativeBuildInputs = [ pkg-config which docbook_xsl docbook_xml_dtd_43 ] ++ optional (!headless) wrapQtAppsHook; # Wrap manually because we wrap just a small number of executables. diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix index 302f2b5945a..4aa3ed1fd49 100644 --- a/pkgs/applications/virtualization/virtualbox/extpack.nix +++ b/pkgs/applications/virtualization/virtualbox/extpack.nix @@ -12,7 +12,7 @@ fetchurl rec { # Manually sha256sum the extensionPack file, must be hex! # Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`. # Checksums can also be found at https://www.virtualbox.org/download/hashes/${version}/SHA256SUMS - let value = "9802482b77b95a954cb5111793da10d009009a4e9a9c4eaa4bd1ae5dafe9db46"; + let value = "d609e35accff5c0819ca9be47de302abf094dc1b6d4c54da8fdda639671f267e"; in assert (builtins.stringLength value) == 64; value; meta = { diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 180970d51da..c35ebdb81d0 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -3,7 +3,7 @@ let version = virtualbox.version; - xserverVListFunc = builtins.elemAt (stdenv.lib.splitVersion xorg.xorgserver.version); + xserverVListFunc = builtins.elemAt (lib.splitVersion xorg.xorgserver.version); # Forced to 1.18 in <nixpkgs/nixos/modules/services/x11/xserver.nix> # as it even fails to build otherwise. Still, override this even here, @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "88db771a5efd7c048228e5c1e0b8fba56542e9d8c1b75f7af5b0c4cf334f0584"; + sha256 = "904432eb331d7ae517afaa4e4304e6492b7947b46ecb8267de7ef792c4921b4c"; }; KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; diff --git a/pkgs/applications/virtualization/vpcs/default.nix b/pkgs/applications/virtualization/vpcs/default.nix index 33d707a5007..8c41a1f4c27 100644 --- a/pkgs/applications/virtualization/vpcs/default.nix +++ b/pkgs/applications/virtualization/vpcs/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildPhase = ''( cd src - ./mk.sh ${stdenv.buildPlatform.platform.kernelArch} + ./mk.sh ${stdenv.buildPlatform.linuxArch} )''; installPhase = '' diff --git a/pkgs/applications/virtualization/x11docker/default.nix b/pkgs/applications/virtualization/x11docker/default.nix index cbaa0a57992..b671c1f6fa4 100644 --- a/pkgs/applications/virtualization/x11docker/default.nix +++ b/pkgs/applications/virtualization/x11docker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg, getopt, gnugrep, gawk, ps, mount, iproute }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg, getopt, gnugrep, gawk, ps, mount, iproute }: stdenv.mkDerivation rec { pname = "x11docker"; version = "6.6.2"; @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { installPhase = '' install -D x11docker "$out/bin/x11docker"; wrapProgram "$out/bin/x11docker" \ - --prefix PATH : "${stdenv.lib.makeBinPath [ getopt gnugrep gawk ps mount iproute nx-libs xorg.xdpyinfo xorg.xhost xorg.xinit ]}" + --prefix PATH : "${lib.makeBinPath [ getopt gnugrep gawk ps mount iproute nx-libs xorg.xdpyinfo xorg.xhost xorg.xinit ]}" ''; meta = { description = "Run graphical applications with Docker"; homepage = "https://github.com/mviereck/x11docker"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ jD91mZM2 ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jD91mZM2 ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/virtualization/xen/4.10.nix b/pkgs/applications/virtualization/xen/4.10.nix index 7e3c73fb11d..bc9003e128a 100644 --- a/pkgs/applications/virtualization/xen/4.10.nix +++ b/pkgs/applications/virtualization/xen/4.10.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl, fetchpatch, fetchgit +{ lib, callPackage, fetchurl, fetchpatch, fetchgit , ocaml-ng , withInternalQemu ? true , withInternalTraditionalQemu ? true @@ -16,7 +16,7 @@ assert withInternalSeabios -> !withSeabios; assert withInternalOVMF -> !withOVMF; -with stdenv.lib; +with lib; # Patching XEN? Check the XSAs at # https://xenbits.xen.org/xsa/ diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix index 4b03bb5da46..5019ce23282 100644 --- a/pkgs/applications/virtualization/xen/generic.nix +++ b/pkgs/applications/virtualization/xen/generic.nix @@ -1,5 +1,5 @@ config: -{ stdenv, cmake, pkg-config, which +{ lib, stdenv, cmake, pkg-config, which # Xen , bison, bzip2, checkpolicy, dev86, figlet, flex, gettext, glib @@ -24,7 +24,7 @@ config: , ...} @ args: -with stdenv.lib; +with lib; let #TODO: fix paths instead @@ -250,9 +250,9 @@ stdenv.mkDerivation (rec { " (${args.meta.description})"; longDescription = (args.meta.longDescription or "") + "\nIncludes:\n" - + withXenfiles (name: x: ''* ${name}: ${x.meta.description or "(No description)"}.''); + + withXenfiles (name: x: "* ${name}: ${x.meta.description or "(No description)"}."); platforms = [ "x86_64-linux" ]; - maintainers = with stdenv.lib.maintainers; [ eelco tstrobel oxij ]; - license = stdenv.lib.licenses.gpl2; + maintainers = with lib.maintainers; [ eelco tstrobel oxij ]; + license = lib.licenses.gpl2; } // (config.meta or {}); } // removeAttrs config [ "xenfiles" "buildInputs" "patches" "postPatch" "meta" ]) diff --git a/pkgs/applications/virtualization/xen/packages.nix b/pkgs/applications/virtualization/xen/packages.nix index 55e3b12c3b7..5ff263dc8ff 100644 --- a/pkgs/applications/virtualization/xen/packages.nix +++ b/pkgs/applications/virtualization/xen/packages.nix @@ -1,5 +1,5 @@ { callPackage -, stdenv + }: # TODO(@oxij) on new Xen version: generalize this to generate [vanilla slim diff --git a/pkgs/applications/virtualization/xen/xsa-patches.nix b/pkgs/applications/virtualization/xen/xsa-patches.nix index 26cdbc1f65f..b1d1d7783c2 100644 --- a/pkgs/applications/virtualization/xen/xsa-patches.nix +++ b/pkgs/applications/virtualization/xen/xsa-patches.nix @@ -454,7 +454,7 @@ in { }) ]; - # 4.5 + # 4.5 XSA_248_45 = [ (xsaPatch { name = "248-4.5"; diff --git a/pkgs/applications/window-managers/afterstep/default.nix b/pkgs/applications/window-managers/afterstep/default.nix index 4bfe6543805..fbb4a7a5e49 100644 --- a/pkgs/applications/window-managers/afterstep/default.nix +++ b/pkgs/applications/window-managers/afterstep/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , libjpeg, libtiff, libpng, freetype , fltk, gtk , libX11, libXext, libICE @@ -24,10 +24,10 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libjpeg libtiff libpng freetype fltk gtk libX11 libXext libICE dbus dbus ]; - # A strange type of bug: dbus is not immediately found by pkgconfig + # A strange type of bug: dbus is not immediately found by pkg-config preConfigure = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config dbus-1 --cflags)" ''; diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 0409954cfb1..a526636063e 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, luaPackages, cairo, librsvg, cmake, imagemagick, pkgconfig, gdk-pixbuf +{ lib, stdenv, fetchFromGitHub, luaPackages, cairo, librsvg, cmake, imagemagick, pkg-config, gdk-pixbuf , xorg, libstartup_notification, libxdg_basedir, libpthreadstubs , xcb-util-cursor, makeWrapper, pango, gobject-introspection , which, dbus, nettools, git, doxygen @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { doxygen imagemagick makeWrapper - pkgconfig + pkg-config xmlto docbook_xml_dtd_45 docbook_xsl findXMLCatalogs asciidoctor @@ -50,12 +50,12 @@ stdenv.mkDerivation rec { xorg.xcbutil xorg.xcbutilimage xorg.xcbutilkeysyms xorg.xcbutilrenderutil xorg.xcbutilwm libxkbcommon xcbutilxrm ] - ++ stdenv.lib.optional gtk3Support gtk3; + ++ lib.optional gtk3Support gtk3; cmakeFlags = [ #"-DGENERATE_MANPAGES=ON" "-DOVERRIDE_VERSION=${version}" - ] ++ stdenv.lib.optional luaPackages.isLuaJIT "-DLUA_LIBRARY=${lua}/lib/libluajit-5.1.so" + ] ++ lib.optional luaPackages.isLuaJIT "-DLUA_LIBRARY=${lua}/lib/libluajit-5.1.so" ; GI_TYPELIB_PATH = "${pango.out}/lib/girepository-1.0"; diff --git a/pkgs/applications/window-managers/bspwm/unstable.nix b/pkgs/applications/window-managers/bspwm/unstable.nix index e52e33ec544..93718448340 100644 --- a/pkgs/applications/window-managers/bspwm/unstable.nix +++ b/pkgs/applications/window-managers/bspwm/unstable.nix @@ -24,8 +24,8 @@ stdenv.mkDerivation { meta = { description = "A tiling window manager based on binary space partitioning (git version)"; homepage = "https://github.com/baskerville/bspwm"; - maintainers = [ stdenv.lib.maintainers.meisternu stdenv.lib.maintainers.epitrochoid ]; - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.linux; + maintainers = [ lib.maintainers.meisternu lib.maintainers.epitrochoid ]; + license = lib.licenses.bsd2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/window-managers/btops/default.nix b/pkgs/applications/window-managers/btops/default.nix index f0bb26f43e2..5f107337ee4 100644 --- a/pkgs/applications/window-managers/btops/default.nix +++ b/pkgs/applications/window-managers/btops/default.nix @@ -1,5 +1,5 @@ # This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -{ lib, stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "btops"; diff --git a/pkgs/applications/window-managers/cage/default.nix b/pkgs/applications/window-managers/cage/default.nix index e48be5809e9..f7083212e70 100644 --- a/pkgs/applications/window-managers/cage/default.nix +++ b/pkgs/applications/window-managers/cage/default.nix @@ -29,9 +29,9 @@ stdenv.mkDerivation rec { systemd libGL libX11 ]; - mesonFlags = [ "-Dxwayland=${stdenv.lib.boolToString (xwayland != null)}" ]; + mesonFlags = [ "-Dxwayland=${lib.boolToString (xwayland != null)}" ]; - postFixup = stdenv.lib.optionalString (xwayland != null) '' + postFixup = lib.optionalString (xwayland != null) '' wrapProgram $out/bin/cage --prefix PATH : "${xwayland}/bin" ''; diff --git a/pkgs/applications/window-managers/cagebreak/default.nix b/pkgs/applications/window-managers/cagebreak/default.nix index 3d082599789..a4e5d7f7028 100644 --- a/pkgs/applications/window-managers/cagebreak/default.nix +++ b/pkgs/applications/window-managers/cagebreak/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "cagebreak"; - version = "1.4.4"; + version = "1.5.0"; src = fetchFromGitHub { owner = "project-repo"; repo = "cagebreak"; rev = version; - hash = "sha256-YmUn5H0xNC/4MBGydrEk7dy5v+s2ja4VoA1neWrQ3VY="; + hash = "sha256-P6zBVQEv+fKdverNIXhoEavu51uGKbSHx3Sh5FWsc2E="; }; nativeBuildInputs = [ meson ninja pkg-config wayland scdoc makeWrapper ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "contrib" ]; mesonFlags = [ - "-Dxwayland=${stdenv.lib.boolToString withXwayland}" + "-Dxwayland=${lib.boolToString withXwayland}" "-Dversion_override=${version}" ]; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { cp $src/examples/config $contrib/share/cagebreak/config ''; - postFixup = stdenv.lib.optionalString withXwayland '' + postFixup = lib.optionalString withXwayland '' wrapProgram $out/bin/cagebreak --prefix PATH : "${xwayland}/bin" ''; diff --git a/pkgs/applications/window-managers/cwm/default.nix b/pkgs/applications/window-managers/cwm/default.nix index dc80b54bc69..69c9cc1c37c 100644 --- a/pkgs/applications/window-managers/cwm/default.nix +++ b/pkgs/applications/window-managers/cwm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libX11, libXinerama, libXrandr, libXft, yacc, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, libX11, libXinerama, libXrandr, libXft, yacc, pkg-config }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0f9xmki2hx10k8iisfzc7nm1l31zkf1r06pdgn06ar9w9nizrld9"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXinerama libXrandr libXft yacc ]; prePatch = ''sed -i "s@/usr/local@$out@" Makefile''; diff --git a/pkgs/applications/window-managers/dwm/default.nix b/pkgs/applications/window-managers/dwm/default.nix index 455e3249adf..eb349e6f3b1 100644 --- a/pkgs/applications/window-managers/dwm/default.nix +++ b/pkgs/applications/window-managers/dwm/default.nix @@ -1,6 +1,6 @@ -{stdenv, fetchurl, libX11, libXinerama, libXft, writeText, patches ? [], conf ? null}: +{lib, stdenv, fetchurl, libX11, libXinerama, libXft, writeText, patches ? [], conf ? null}: -with stdenv.lib; +with lib; let name = "dwm-6.2"; @@ -27,8 +27,8 @@ stdenv.mkDerivation { meta = { homepage = "https://suckless.org/"; description = "Dynamic window manager for X"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; all; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; all; }; } diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix index 470c8ae2acc..d419b0ebe3a 100644 --- a/pkgs/applications/window-managers/dwm/dwm-status.nix +++ b/pkgs/applications/window-managers/dwm/dwm-status.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, rustPlatform, fetchFromGitHub, dbus, gdk-pixbuf, libnotify, makeWrapper, pkgconfig, xorg +{ lib, rustPlatform, fetchFromGitHub, dbus, gdk-pixbuf, libnotify, makeWrapper, pkg-config, xorg , enableAlsaUtils ? true, alsaUtils, coreutils , enableNetwork ? true, dnsutils, iproute, wirelesstools }: @@ -18,13 +18,13 @@ rustPlatform.buildRustPackage rec { sha256 = "172qkzbi37j6wx81pyqqffi9wxbg3bf8nis7d15ncn1yfd5r4gqh"; }; - nativeBuildInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = [ dbus gdk-pixbuf libnotify xorg.libX11 ]; cargoSha256 = "041sd9zm1c3v6iihnwjcya2xg5yxb2y4biyxpjlfblz2srxa15dm"; postInstall = lib.optionalString (bins != []) '' - wrapProgram $out/bin/dwm-status --prefix "PATH" : "${stdenv.lib.makeBinPath bins}" + wrapProgram $out/bin/dwm-status --prefix "PATH" : "${lib.makeBinPath bins}" ''; meta = with lib; { diff --git a/pkgs/applications/window-managers/dwm/git.nix b/pkgs/applications/window-managers/dwm/git.nix index 814b6167d17..71e91b6093b 100644 --- a/pkgs/applications/window-managers/dwm/git.nix +++ b/pkgs/applications/window-managers/dwm/git.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { inherit patches; # Allow users to override the entire config file AFTER appying the patches - postPatch = stdenv.lib.optionalString (conf!=null) '' + postPatch = lib.optionalString (conf!=null) '' echo -n '${conf}' > config.def.h ''; diff --git a/pkgs/applications/window-managers/dzen2/default.nix b/pkgs/applications/window-managers/dzen2/default.nix index 367c78ec5ca..84380bfc9d8 100644 --- a/pkgs/applications/window-managers/dzen2/default.nix +++ b/pkgs/applications/window-managers/dzen2/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, pkgconfig, libX11, libXft, libXinerama, libXpm }: +{ lib, stdenv, fetchurl, pkg-config, libX11, libXft, libXinerama, libXpm }: stdenv.mkDerivation { name = "dzen2-0.9.5"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXft libXinerama libXpm ]; src = fetchurl { @@ -30,8 +30,8 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/robm/dzen"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; description = "X notification utility"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/window-managers/fbpanel/default.nix b/pkgs/applications/window-managers/fbpanel/default.nix index e927db36fdd..1a87f29f67c 100644 --- a/pkgs/applications/window-managers/fbpanel/default.nix +++ b/pkgs/applications/window-managers/fbpanel/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , libX11, libXmu, libXpm, gtk2, libpng, libjpeg, libtiff, librsvg, gdk-pixbuf, gdk-pixbuf-xlib }: @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "e14542cc81ea06e64dd4708546f5fd3f5e01884c3e4617885c7ef22af8cf3965"; }; buildInputs = - [ pkgconfig libX11 libXmu libXpm gtk2 libpng libjpeg libtiff librsvg gdk-pixbuf gdk-pixbuf-xlib.dev ]; + [ pkg-config libX11 libXmu libXpm gtk2 libpng libjpeg libtiff librsvg gdk-pixbuf gdk-pixbuf-xlib.dev ]; preConfigure = "patchShebangs ."; diff --git a/pkgs/applications/window-managers/fluxbox/default.nix b/pkgs/applications/window-managers/fluxbox/default.nix index b1a11d7153c..36a22cb46d7 100644 --- a/pkgs/applications/window-managers/fluxbox/default.nix +++ b/pkgs/applications/window-managers/fluxbox/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , freetype, fribidi , libXext, libXft, libXpm, libXrandr, libXrender, xorgproto , libXinerama , imlib2 }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "fluxbox"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "1h1f70y40qd225dqx937vzb4k2cz219agm1zvnjxakn5jkz7b37w"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ freetype fribidi libXext libXft libXpm libXrandr libXrender xorgproto libXinerama imlib2 ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { substituteInPlace util/fluxbox-generate_menu.in \ --subst-var-by PREFIX "$out" ''; - + meta = { description = "Full-featured, light-resource X window manager"; longDescription = '' diff --git a/pkgs/applications/window-managers/fvwm/default.nix b/pkgs/applications/window-managers/fvwm/default.nix index 6b3f4029755..ae5dad94f2e 100644 --- a/pkgs/applications/window-managers/fvwm/default.nix +++ b/pkgs/applications/window-managers/fvwm/default.nix @@ -1,5 +1,5 @@ { gestures ? false -, stdenv, fetchurl, pkgconfig +, lib, stdenv, fetchurl, pkg-config , cairo, fontconfig, freetype, libXft, libXcursor, libXinerama , libXpm, libXt, librsvg, libpng, fribidi, perl , libstroke ? null @@ -16,18 +16,18 @@ stdenv.mkDerivation rec { sha256 = "1bliqcnap7vb3m2rn8wvxyfhbf35h9x34s41fl4301yhrkrlrihv"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ cairo fontconfig freetype libXft libXcursor libXinerama libXpm libXt librsvg libpng fribidi perl - ] ++ stdenv.lib.optional gestures libstroke; + ] ++ lib.optional gestures libstroke; meta = { homepage = "http://fvwm.org"; description = "A multiple large virtual desktop window manager"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ edanaher ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ edanaher ]; }; } diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix index e547cea3c54..ad45f01915d 100644 --- a/pkgs/applications/window-managers/herbstluftwm/default.nix +++ b/pkgs/applications/window-managers/herbstluftwm/default.nix @@ -1,35 +1,38 @@ -{ stdenv, fetchurl, cmake, pkgconfig, glib, libX11, libXext, libXinerama, libXrandr -, withDoc ? stdenv.buildPlatform == stdenv.targetPlatform, asciidoc ? null }: +{ lib, stdenv, fetchurl, cmake, pkg-config, python3, libX11, libXext, libXinerama, libXrandr, asciidoc +, xdotool, xorgserver, xsetroot, xterm, runtimeShell +, nixosTests }: # Doc generation is disabled by default when cross compiling because asciidoc -# does not cross compile for now +# dependency is broken when cross compiling for now -assert withDoc -> asciidoc != null; +let + cross = stdenv.buildPlatform != stdenv.targetPlatform; -stdenv.mkDerivation rec { +in stdenv.mkDerivation rec { pname = "herbstluftwm"; - version = "0.8.3"; + version = "0.9.1"; src = fetchurl { url = "https://herbstluftwm.org/tarballs/herbstluftwm-${version}.tar.gz"; - sha256 = "1qmb4pjf2f6g0dvcg11cw9njwmxblhqzd70ai8qnlgqw1iz3nkm1"; + sha256 = "0r4qaklv97qcq8p0pnz4f2zqg69vfai6c2qi1ydi2kz24xqjf5hy"; }; outputs = [ "out" - ] ++ stdenv.lib.optionals withDoc [ - "doc" + "doc" # share/doc exists with examples even without generated html documentation + ] ++ lib.optionals (!cross) [ "man" ]; cmakeFlags = [ "-DCMAKE_INSTALL_SYSCONF_PREFIX=${placeholder "out"}/etc" - ] ++ stdenv.lib.optional (!withDoc) "-DWITH_DOCUMENTATION=OFF"; + ] ++ lib.optional cross "-DWITH_DOCUMENTATION=OFF"; nativeBuildInputs = [ cmake - pkgconfig - ] ++ stdenv.lib.optional withDoc asciidoc; + pkg-config + python3 + ] ++ lib.optional (!cross) asciidoc; buildInputs = [ libX11 @@ -38,10 +41,50 @@ stdenv.mkDerivation rec { libXrandr ]; - meta = { + patches = [ + ./test-path-environment.patch + ]; + + postPatch = '' + patchShebangs doc/gendoc.py + + # fix /etc/xdg/herbstluftwm paths in documentation and scripts + grep -rlZ /etc/xdg/herbstluftwm share/ doc/ scripts/ | while IFS="" read -r -d "" path; do + substituteInPlace "$path" --replace /etc/xdg/herbstluftwm $out/etc/xdg/herbstluftwm + done + + # fix shebang in generated scripts + substituteInPlace tests/conftest.py --replace "/usr/bin/env bash" ${runtimeShell} + substituteInPlace tests/test_herbstluftwm.py --replace "/usr/bin/env bash" ${runtimeShell} + ''; + + doCheck = true; + + checkInputs = [ + (python3.withPackages (ps: with ps; [ ewmh pytest xlib ])) + xdotool + xorgserver + xsetroot + xterm + python3.pkgs.pytestCheckHook + ]; + + # make the package's module avalaible + preCheck = '' + export PYTHONPATH="$PYTHONPATH:../python" + ''; + + pytestFlagsArray = [ "../tests" ]; + + passthru = { + tests.herbstluftwm = nixosTests.herbstluftwm; + }; + + meta = with lib; { description = "A manual tiling window manager for X"; homepage = "https://herbstluftwm.org/"; - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.linux; + license = licenses.bsd2; + platforms = platforms.linux; + maintainers = with maintainers; [ thibautmarty ]; }; } diff --git a/pkgs/applications/window-managers/herbstluftwm/test-path-environment.patch b/pkgs/applications/window-managers/herbstluftwm/test-path-environment.patch new file mode 100644 index 00000000000..dab30d8ac71 --- /dev/null +++ b/pkgs/applications/window-managers/herbstluftwm/test-path-environment.patch @@ -0,0 +1,10 @@ +--- a/tests/conftest.py ++++ b/tests/conftest.py +@@ -43,6 +43,7 @@ + self.next_client_id = 0 + self.env = { + 'DISPLAY': display, ++ 'PATH': os.environ['PATH'] + } + self.env = extend_env_with_whitelist(self.env) + self.hlwm_process = hlwm_process diff --git a/pkgs/applications/window-managers/hikari/default.nix b/pkgs/applications/window-managers/hikari/default.nix index 8f9ec3e56a2..2325deaf37c 100644 --- a/pkgs/applications/window-managers/hikari/default.nix +++ b/pkgs/applications/window-managers/hikari/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchzip, - pkgconfig, bmake, + pkg-config, bmake, cairo, glib, libevdev, libinput, libxkbcommon, linux-pam, pango, pixman, libucl, wayland, wayland-protocols, wlroots, features ? { @@ -23,7 +23,7 @@ stdenv.mkDerivation { sha256 = "0sln1n5f67i3vxkybfi6xhzplb45djqyg272vqkv64m72rmm8875"; }; - nativeBuildInputs = [ pkgconfig bmake ]; + nativeBuildInputs = [ pkg-config bmake ]; buildInputs = [ cairo @@ -43,7 +43,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; # Must replace GNU Make by bmake - buildPhase = with stdenv.lib; concatStringsSep " " ( + buildPhase = with lib; concatStringsSep " " ( [ "bmake" "-j$NIX_BUILD_CORES" "PREFIX=$out" ] ++ optional stdenv.isLinux "WITH_POSIX_C_SOURCE=YES" ++ mapAttrsToList (feat: enabled: diff --git a/pkgs/applications/window-managers/i3/blocks-gaps.nix b/pkgs/applications/window-managers/i3/blocks-gaps.nix index f314f340bee..9c97c72ad5d 100644 --- a/pkgs/applications/window-managers/i3/blocks-gaps.nix +++ b/pkgs/applications/window-managers/i3/blocks-gaps.nix @@ -4,7 +4,7 @@ "load_average" "memory" "volume" "wifi" ] }: -with stdenv.lib; +with lib; let perlscripts = [ "battery" "cpu_usage" "openvpn" "temperature" ]; diff --git a/pkgs/applications/window-managers/i3/blocks.nix b/pkgs/applications/window-managers/i3/blocks.nix index bfd76b44437..1574c587743 100644 --- a/pkgs/applications/window-managers/i3/blocks.nix +++ b/pkgs/applications/window-managers/i3/blocks.nix @@ -1,6 +1,6 @@ -{ fetchFromGitHub, fetchpatch, stdenv, autoreconfHook, pkg-config }: +{ fetchFromGitHub, fetchpatch, lib, stdenv, autoreconfHook, pkg-config }: -with stdenv.lib; +with lib; stdenv.mkDerivation { pname = "i3blocks"; diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 999deed3c66..d05b187ca78 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { # https://github.com/NixOS/nixpkgs/issues/7957 doCheck = false; # stdenv.hostPlatform.system == "x86_64-linux"; - checkPhase = stdenv.lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") + checkPhase = lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") '' (cd testcases && xvfb-run ./complete-run.pl -p 1 --keep-xserver-output) ! grep -q '^not ok' testcases/latest/complete-run.log diff --git a/pkgs/applications/window-managers/i3/easyfocus.nix b/pkgs/applications/window-managers/i3/easyfocus.nix index 517971905f6..a2ee445eaf1 100644 --- a/pkgs/applications/window-managers/i3/easyfocus.nix +++ b/pkgs/applications/window-managers/i3/easyfocus.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, xorgproto, libxcb, xcbutilkeysyms +{ lib, stdenv, fetchFromGitHub, pkg-config, xorgproto, libxcb, xcbutilkeysyms , xorg , i3ipc-glib , glib }: @@ -13,7 +13,7 @@ stdenv.mkDerivation { sha256 = "1db23vzzmp0hnfss1fkd80za6d2pajx7hdwikw50pk95jq0w8wfm"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxcb xcbutilkeysyms xorgproto xorg.libX11.dev i3ipc-glib glib.dev ]; # Makefile has no rule for 'install' diff --git a/pkgs/applications/window-managers/i3/gaps.nix b/pkgs/applications/window-managers/i3/gaps.nix index 52322d8e194..1a11d40e3df 100644 --- a/pkgs/applications/window-managers/i3/gaps.nix +++ b/pkgs/applications/window-managers/i3/gaps.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, i3, autoreconfHook }: +{ fetchurl, lib, i3, autoreconfHook }: i3.overrideAttrs (oldAttrs : rec { diff --git a/pkgs/applications/window-managers/i3/i3ipc-glib.nix b/pkgs/applications/window-managers/i3/i3ipc-glib.nix index 36b48fa3b07..572b12d986c 100644 --- a/pkgs/applications/window-managers/i3/i3ipc-glib.nix +++ b/pkgs/applications/window-managers/i3/i3ipc-glib.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, xorgproto, libxcb +{ lib, stdenv, fetchFromGitHub, pkg-config, xorgproto, libxcb , autoreconfHook, json-glib, gtk-doc, which , gobject-introspection }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "01fzvrbnzcwx0vxw29igfpza9zwzp2s7msmzb92v01z0rz0y5m0p"; }; - nativeBuildInputs = [ autoreconfHook which pkgconfig ]; + nativeBuildInputs = [ autoreconfHook which pkg-config ]; buildInputs = [ libxcb json-glib gtk-doc xorgproto gobject-introspection ]; diff --git a/pkgs/applications/window-managers/i3/layout-manager.nix b/pkgs/applications/window-managers/i3/layout-manager.nix index a69a1cd5a33..8fd0364bb58 100644 --- a/pkgs/applications/window-managers/i3/layout-manager.nix +++ b/pkgs/applications/window-managers/i3/layout-manager.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, vim, makeWrapper, jq, rofi, xrandr, xdotool, i3, gawk, libnotify }: let - path = stdenv.lib.makeBinPath [ vim jq rofi xrandr xdotool i3 gawk libnotify ]; + path = lib.makeBinPath [ vim jq rofi xrandr xdotool i3 gawk libnotify ]; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix index 7fe48189752..6f22070dbc8 100644 --- a/pkgs/applications/window-managers/i3/lock-color.nix +++ b/pkgs/applications/window-managers/i3/lock-color.nix @@ -1,20 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libxcb, +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libxcb, xcbutilkeysyms , xcbutilimage, pam, libX11, libev, cairo, libxkbcommon, libxkbfile, libjpeg_turbo, xcbutilxrm }: stdenv.mkDerivation rec { - version = "2.12.c.5"; + version = "2.13.c.1"; pname = "i3lock-color"; src = fetchFromGitHub { owner = "PandorasFox"; repo = "i3lock-color"; rev = version; - sha256 = "10h50a6p9ivqjz8hd5pn9l03vz6y9dxdx68bprqssfzdkzqnzaiv"; + sha256 = "sha256-E+ejc26eyCJ0PnMpDgQrouaBIaUH0SWlzB08fQs8lDw="; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libxcb xcbutilkeysyms xcbutilimage pam libX11 libev cairo libxkbcommon libxkbfile libjpeg_turbo xcbutilxrm ]; diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix index 3b991d091ce..03506e889d7 100644 --- a/pkgs/applications/window-managers/i3/lock.nix +++ b/pkgs/applications/window-managers/i3/lock.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutilimage, +{ fetchurl, lib, stdenv, which, pkg-config, libxcb, xcbutilkeysyms, xcbutilimage, xcbutilxrm, pam, libX11, libev, cairo, libxkbcommon, libxkbfile }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "02szjsaz7rqrdkd0r2nwgwa85c4hwfrcskxw7ryk695kmjcfhzv3"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ which libxcb xcbutilkeysyms xcbutilimage xcbutilxrm pam libX11 libev cairo libxkbcommon libxkbfile ]; diff --git a/pkgs/applications/window-managers/i3/pystatus.nix b/pkgs/applications/window-managers/i3/pystatus.nix index f8d12642999..bddaab61578 100644 --- a/pkgs/applications/window-managers/i3/pystatus.nix +++ b/pkgs/applications/window-managers/i3/pystatus.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , libpulseaudio , libnotify @@ -29,7 +29,7 @@ python3Packages.buildPythonApplication rec { makeWrapperArgs = [ # LC_TIME != C results in locale.Error: unsupported locale setting "--set" "LC_TIME" "C" - "--suffix" "LD_LIBRARY_PATH" ":" "${stdenv.lib.makeLibraryPath [ libpulseaudio ]}" + "--suffix" "LD_LIBRARY_PATH" ":" "${lib.makeLibraryPath [ libpulseaudio ]}" ]; postPatch = '' diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index d49f8ff6bd6..be7e88a2501 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -1,7 +1,7 @@ -{ lib, stdenv +{ lib , rustPlatform , fetchFromGitHub -, pkgconfig +, pkg-config , makeWrapper , dbus , libpulseaudio @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0qqkcgl9iz4kxl1a2vv2p7vy7wxn970y28jynf3n7hfp16i3liy2"; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ dbus libpulseaudio notmuch ]; diff --git a/pkgs/applications/window-managers/i3/status.nix b/pkgs/applications/window-managers/i3/status.nix index 6005ca3ab3a..935a6c3c23b 100644 --- a/pkgs/applications/window-managers/i3/status.nix +++ b/pkgs/applications/window-managers/i3/status.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, libconfuse, yajl, alsaLib, libpulseaudio, libnl, pkgconfig, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }: +{ fetchurl, lib, stdenv, libconfuse, yajl, alsaLib, libpulseaudio, libnl, pkg-config, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }: stdenv.mkDerivation rec { name = "i3status-2.13"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0rhlzb96mw64z2jnhwz9nibc7pxg549626lz5642xxk5hpzwk2ff"; }; - nativeBuildInputs = [ pkgconfig asciidoc xmlto docbook_xml_dtd_45 docbook_xsl ]; + nativeBuildInputs = [ pkg-config asciidoc xmlto docbook_xml_dtd_45 docbook_xsl ]; buildInputs = [ libconfuse yajl alsaLib libpulseaudio libnl ]; makeFlags = [ "all" "PREFIX=$(out)" ]; @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { description = "Generates a status line for i3bar, dzen2, xmobar or lemonbar"; homepage = "https://i3wm.org"; maintainers = [ ]; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.bsd3; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/window-managers/i3/wk-switch.nix b/pkgs/applications/window-managers/i3/wk-switch.nix index e7fd87aaf3b..d0055ef6365 100644 --- a/pkgs/applications/window-managers/i3/wk-switch.nix +++ b/pkgs/applications/window-managers/i3/wk-switch.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { pname = "i3-wk-switch"; diff --git a/pkgs/applications/window-managers/i3/wmfocus.nix b/pkgs/applications/window-managers/i3/wmfocus.nix index 6f6a63eca09..9169cfc3817 100644 --- a/pkgs/applications/window-managers/i3/wmfocus.nix +++ b/pkgs/applications/window-managers/i3/wmfocus.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform -, xorg, python3, pkgconfig, cairo, libxkbcommon }: +{ lib, fetchFromGitHub, rustPlatform +, xorg, python3, pkg-config, cairo, libxkbcommon }: rustPlatform.buildRustPackage rec { pname = "wmfocus"; @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0rczas6sgcppacz48xx7sarkvc4s2sgcdz6c661d7vcry1y46xms"; - nativeBuildInputs = [ python3 pkgconfig ]; + nativeBuildInputs = [ python3 pkg-config ]; buildInputs = [ cairo libxkbcommon xorg.xcbutilkeysyms ]; # For now, this is the only available featureset. This is also why the file is diff --git a/pkgs/applications/window-managers/ion-3/default.nix b/pkgs/applications/window-managers/ion-3/default.nix index 57c91c2cfb7..8f172ac8700 100644 --- a/pkgs/applications/window-managers/ion-3/default.nix +++ b/pkgs/applications/window-managers/ion-3/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, xlibsWrapper, lua, gettext, groff }: +{ lib, stdenv, fetchurl, xlibsWrapper, lua, gettext, groff }: stdenv.mkDerivation { name = "ion-3-20090110"; meta = { description = "Tiling tabbed window manager designed with keyboard users in mind"; homepage = "http://modeemi.fi/~tuomov/ion"; - platforms = with stdenv.lib.platforms; linux; - license = stdenv.lib.licenses.lgpl21; + platforms = with lib.platforms; linux; + license = lib.licenses.lgpl21; }; src = fetchurl { url = "http://tuomov.iki.fi/software/dl/ion-3-20090110.tar.gz"; diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix index 61ea1b28273..3c97c5630b0 100644 --- a/pkgs/applications/window-managers/jwm/default.nix +++ b/pkgs/applications/window-managers/jwm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, automake, autoconf, libtool, gettext +{ lib, stdenv, fetchFromGitHub, pkg-config, automake, autoconf, libtool, gettext , which, xorg, libX11, libXext, libXinerama, libXpm, libXft, libXau, libXdmcp , libXmu, libpng, libjpeg, expat, xorgproto, librsvg, freetype, fontconfig }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { patches = [ ./0001-Fix-Gettext-Requirement.patch ]; - nativeBuildInputs = [ pkgconfig automake autoconf libtool gettext which ]; + nativeBuildInputs = [ pkg-config automake autoconf libtool gettext which ]; buildInputs = [ libX11 @@ -43,8 +43,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://joewing.net/projects/jwm/"; description = "Joe's Window Manager is a light-weight X11 window manager"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.romildo ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.romildo ]; }; } diff --git a/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix b/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix index 58105ec219b..d3b685e7dcd 100644 --- a/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix +++ b/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix @@ -1,9 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, gettext, libXpm, libGL, fltk, hicolor-icon-theme, glib, gnome2, which }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, gettext, libXpm, libGL, fltk, hicolor-icon-theme, glib, gnome2, which }: stdenv.mkDerivation { pname = "jwm-settings-manager"; version = "2018-10-19"; - + src = fetchFromGitHub { owner = "Israel-D"; repo = "jwm-settings-manager"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake - pkgconfig + pkg-config gettext ]; diff --git a/pkgs/applications/window-managers/kbdd/default.nix b/pkgs/applications/window-managers/kbdd/default.nix index de1a68a56bf..8f684fec620 100644 --- a/pkgs/applications/window-managers/kbdd/default.nix +++ b/pkgs/applications/window-managers/kbdd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, dbus-glib, autoreconfHook, xorg }: +{ lib, stdenv, fetchFromGitHub, pkg-config, dbus-glib, autoreconfHook, xorg }: stdenv.mkDerivation { pname = "kbdd"; @@ -11,14 +11,14 @@ stdenv.mkDerivation { sha256 = "068iqkqxh7928xlmz2pvnykszn9bcq2qgkkiwf37k1vm8fdmgzlj"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ xorg.libX11 dbus-glib ]; meta = { description = "Simple daemon and library to make per window layout using XKB"; homepage = "https://github.com/qnikst/kbdd"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.wedens ]; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.wedens ]; }; } diff --git a/pkgs/applications/window-managers/larswm/default.nix b/pkgs/applications/window-managers/larswm/default.nix index b918c28938c..e9d400378e6 100644 --- a/pkgs/applications/window-managers/larswm/default.nix +++ b/pkgs/applications/window-managers/larswm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, imake, gccmakedep, libX11, libXext, libXmu }: +{ lib, stdenv, fetchurl, imake, gccmakedep, libX11, libXext, libXmu }: stdenv.mkDerivation { name = "larswm-7.5.3"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.fnurt.net/larswm"; description = "9wm-like tiling window manager"; - license = stdenv.lib.licenses.free; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.free; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/window-managers/leftwm/default.nix b/pkgs/applications/window-managers/leftwm/default.nix index d0e883f89c8..cdef71c965e 100644 --- a/pkgs/applications/window-managers/leftwm/default.nix +++ b/pkgs/applications/window-managers/leftwm/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, libX11, libXinerama, makeWrapper }: +{ lib, fetchFromGitHub, rustPlatform, libX11, libXinerama, makeWrapper }: let - rpath = stdenv.lib.makeLibraryPath [ libXinerama libX11 ]; + rpath = lib.makeLibraryPath [ libXinerama libX11 ]; in rustPlatform.buildRustPackage rec { diff --git a/pkgs/applications/window-managers/lemonbar/default.nix b/pkgs/applications/window-managers/lemonbar/default.nix index 2a4004e5543..88d4b8360a5 100644 --- a/pkgs/applications/window-managers/lemonbar/default.nix +++ b/pkgs/applications/window-managers/lemonbar/default.nix @@ -2,21 +2,21 @@ stdenv.mkDerivation { name = "lemonbar-1.4"; - + src = fetchurl { url = "https://github.com/LemonBoy/bar/archive/v1.4.tar.gz"; sha256 = "0fa91vb968zh6fyg97kdaix7irvqjqhpsb6ks0ggcl59lkbkdzbv"; }; - + buildInputs = [ libxcb perl ]; - + prePatch = ''sed -i "s@/usr@$out@" Makefile''; - + meta = with lib; { description = "A lightweight xcb based bar"; homepage = "https://github.com/LemonBoy/bar"; maintainers = [ maintainers.meisternu ]; - license = "Custom"; + license = "Custom"; platforms = platforms.linux; }; } diff --git a/pkgs/applications/window-managers/lemonbar/xft.nix b/pkgs/applications/window-managers/lemonbar/xft.nix index a70e5a4dc5c..b318b39709a 100644 --- a/pkgs/applications/window-managers/lemonbar/xft.nix +++ b/pkgs/applications/window-managers/lemonbar/xft.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, perl, libxcb, libXft }: +{ lib, stdenv, fetchFromGitHub, perl, libxcb, libXft }: stdenv.mkDerivation { name = "lemonbar-xft-unstable-2016-02-17"; @@ -18,6 +18,6 @@ stdenv.mkDerivation { description = "A lightweight xcb based bar with XFT-support"; homepage = "https://github.com/krypt-n/bar"; license = "Custom"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/window-managers/matchbox/default.nix b/pkgs/applications/window-managers/matchbox/default.nix index 3c537d6c931..51bb3010d33 100644 --- a/pkgs/applications/window-managers/matchbox/default.nix +++ b/pkgs/applications/window-managers/matchbox/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, pkgconfig, libmatchbox, libX11, libXext }: +{ lib, stdenv, fetchurl, pkg-config, libmatchbox, libX11, libXext }: stdenv.mkDerivation rec { pname = "matchbox"; version = "1.2"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libmatchbox ]; NIX_LDFLAGS = "-lX11 -L${libX11}/lib -lXext -L${libXext}/lib"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "X window manager for non-desktop embedded systems"; homepage = "https://www.yoctoproject.org/software-item/matchbox/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/window-managers/neocomp/default.nix b/pkgs/applications/window-managers/neocomp/default.nix index da6b5e2825d..bf017ae085a 100644 --- a/pkgs/applications/window-managers/neocomp/default.nix +++ b/pkgs/applications/window-managers/neocomp/default.nix @@ -17,7 +17,7 @@ , libXrandr , libXrender , pcre -, pkgconfig +, pkg-config }: let rev = "v0.6-17-g271e784"; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { libXrandr libXrender pcre - pkgconfig + pkg-config ]; makeFlags = [ diff --git a/pkgs/applications/window-managers/notion/default.nix b/pkgs/applications/window-managers/notion/default.nix index 5d688f5e235..e59103d7d6d 100644 --- a/pkgs/applications/window-managers/notion/default.nix +++ b/pkgs/applications/window-managers/notion/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig +{ lib, stdenv, fetchFromGitHub, pkg-config , lua, gettext, which, groff, xmessage, xterm , readline, fontconfig, libX11, libXext, libSM , libXinerama, libXrandr, libXft @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "14swd0yqci8lxn259fkd9w92bgyf4rmjwgvgyqp78wlfix6ai4mv"; }; - nativeBuildInputs = [ pkgconfig makeWrapper groff ]; + nativeBuildInputs = [ pkg-config makeWrapper groff ]; buildInputs = [ lua gettext which readline fontconfig libX11 libXext libSM libXinerama libXrandr libXft xlibsWrapper ]; diff --git a/pkgs/applications/window-managers/openbox/default.nix b/pkgs/applications/window-managers/openbox/default.nix index 39329e8004c..5e3392b2002 100644 --- a/pkgs/applications/window-managers/openbox/default.nix +++ b/pkgs/applications/window-managers/openbox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, python3 +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, python3 , libxml2, libXinerama, libXcursor, libXau, libXrandr, libICE, libSM , imlib2, pango, libstartup_notification, makeWrapper }: @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config makeWrapper python3.pkgs.wrapPython ]; @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { meta = { description = "X window manager for non-desktop embedded systems"; homepage = "http://openbox.org/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/window-managers/oroborus/default.nix b/pkgs/applications/window-managers/oroborus/default.nix index 21b18a4917b..0124261e423 100644 --- a/pkgs/applications/window-managers/oroborus/default.nix +++ b/pkgs/applications/window-managers/oroborus/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , freetype, fribidi , libSM, libICE, libXt, libXaw, libXmu , libXext, libXft, libXpm, libXrandr , libXrender, xorgproto, libXinerama }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "oroborus"; version = "2.0.20"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ freetype fribidi libSM libICE libXt libXaw libXmu libXext libXft libXpm libXrandr libXrender xorgproto libXinerama ]; diff --git a/pkgs/applications/window-managers/picom/default.nix b/pkgs/applications/window-managers/picom/default.nix index 4287dd2db02..32eee9df0d8 100644 --- a/pkgs/applications/window-managers/picom/default.nix +++ b/pkgs/applications/window-managers/picom/default.nix @@ -1,41 +1,82 @@ -{ stdenv, lib, fetchFromGitHub, pkg-config, uthash, asciidoc, docbook_xml_dtd_45 -, docbook_xsl, libxslt, libxml2, makeWrapper, meson, ninja -, xorgproto, libxcb ,xcbutilrenderutil, xcbutilimage, pixman, libev -, dbus, libconfig, libdrm, libGL, pcre, libX11 -, libXinerama, libXext, xwininfo, libxdg_basedir }: +{ asciidoc +, dbus +, docbook_xml_dtd_45 +, docbook_xsl +, fetchFromGitHub +, lib +, libconfig +, libdrm +, libev +, libGL +, libX11 +, libxcb +, libxdg_basedir +, libXext +, libXinerama +, libxml2 +, libxslt +, makeWrapper +, meson +, ninja +, pcre +, pixman +, pkg-config +, stdenv +, uthash +, xcbutilimage +, xcbutilrenderutil +, xorgproto +, xwininfo +, withDebug ? false +}: stdenv.mkDerivation rec { pname = "picom"; version = "8.2"; src = fetchFromGitHub { - owner = "yshui"; - repo = "picom"; - rev = "v${version}"; + owner = "yshui"; + repo = "picom"; + rev = "v${version}"; sha256 = "0gjksayz2xpmgglvw17ppsan2imrd1fijs579kbf27xwp503xgfl"; fetchSubmodules = true; }; nativeBuildInputs = [ - meson ninja - pkg-config - uthash asciidoc docbook_xml_dtd_45 docbook_xsl makeWrapper + meson + ninja + pkg-config + uthash ]; buildInputs = [ - dbus libX11 libXext - xorgproto - libXinerama libdrm pcre libxml2 libxslt libconfig libGL - libxcb xcbutilrenderutil xcbutilimage - pixman libev + dbus + libconfig + libdrm + libev + libGL + libX11 + libxcb libxdg_basedir + libXext + libXinerama + libxml2 + libxslt + pcre + pixman + xcbutilimage + xcbutilrenderutil + xorgproto ]; - mesonBuildType = "release"; + # Use "debugoptimized" instead of "debug" so perhaps picom works better in + # normal usage too, not just temporary debugging. + mesonBuildType = if withDebug then "debugoptimized" else "release"; + dontStrip = withDebug; mesonFlags = [ "-Dwith_docs=true" @@ -43,9 +84,13 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; + # In debug mode, also copy src directory to store. If you then run `gdb picom` + # in the bin directory of picom store path, gdb finds the source files. postInstall = '' wrapProgram $out/bin/picom-trans \ --prefix PATH : ${lib.makeBinPath [ xwininfo ]} + '' + lib.optionalString withDebug '' + cp -r ../src $out/ ''; meta = with lib; { @@ -56,6 +101,13 @@ stdenv.mkDerivation rec { extensions. It enables basic eye-candy effects. This fork adds additional features, such as additional effects, and a fork at a well-defined and proper place. + + The package can be installed in debug mode as: + + picom.override { withDebug = true; } + + For gdb to find the source files, you need to run gdb in the bin directory + of picom package in the nix store. ''; license = licenses.mit; homepage = "https://github.com/yshui/picom"; diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index 284a12e65f5..21059c25afb 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python37Packages, glib, cairo, pango, pkgconfig, libxcb, xcbutilcursor }: +{ lib, fetchFromGitHub, python37Packages, glib, cairo, pango, pkg-config, libxcb, xcbutilcursor }: let cairocffi-xcffib = python37Packages.cairocffi.override { withXcffib = true; @@ -31,7 +31,7 @@ python37Packages.buildPythonApplication rec { SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib libxcb cairo pango python37Packages.xcffib ]; pythonPath = with python37Packages; [ diff --git a/pkgs/applications/window-managers/ratpoison/default.nix b/pkgs/applications/window-managers/ratpoison/default.nix index 30195ab9147..472707bf35c 100644 --- a/pkgs/applications/window-managers/ratpoison/default.nix +++ b/pkgs/applications/window-managers/ratpoison/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, perl, autoconf, automake +{ lib, stdenv, fetchurl, pkg-config, perl, autoconf, automake , libX11, xorgproto, libXt, libXpm, libXft, libXtst, libXi , libXrandr, fontconfig, freetype, readline }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { "--enable-history" ]; - nativeBuildInputs = [ pkgconfig autoconf automake ]; + nativeBuildInputs = [ pkg-config autoconf automake ]; buildInputs = [ perl diff --git a/pkgs/applications/window-managers/smallwm/default.nix b/pkgs/applications/window-managers/smallwm/default.nix index b6d3821e8d0..9dd2a25e5cf 100644 --- a/pkgs/applications/window-managers/smallwm/default.nix +++ b/pkgs/applications/window-managers/smallwm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , doxygen, graphviz, libX11, libXrandr }: stdenv.mkDerivation rec { @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { cp -r README.markdown doc/html doc/latex $out/share/doc/${pname}-${version} ''; - meta = with stdenv.lib;{ + meta = with lib;{ description = "A small X window manager, extended from tinywm"; homepage = "https://github.com/adamnew123456/SmallWM"; license = licenses.bsd2; diff --git a/pkgs/applications/window-managers/spectrwm/default.nix b/pkgs/applications/window-managers/spectrwm/default.nix index 6598fefaebd..be2c5bc3d6e 100644 --- a/pkgs/applications/window-managers/spectrwm/default.nix +++ b/pkgs/applications/window-managers/spectrwm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, xorg }: +{ lib, stdenv, fetchFromGitHub, pkg-config, xorg }: stdenv.mkDerivation { pname = "spectrwm"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0bf0d25yr0craksamczn2mdy6cjp27l88smihlw9bw4p6a2qhi41"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = with xorg; [ libXrandr libXcursor diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix index 4db5343498c..0f8d933a06d 100644 --- a/pkgs/applications/window-managers/stumpwm/default.nix +++ b/pkgs/applications/window-managers/stumpwm/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation { mkdir -p $out/share/stumpwm/modules cp -r modules/* $out/share/stumpwm/modules/ - for d in ${stdenv.lib.concatStringsSep " " extraModulePaths}; do + for d in ${lib.concatStringsSep " " extraModulePaths}; do cp -r --no-preserve=mode "$d" $out/share/stumpwm/modules/ done @@ -81,7 +81,7 @@ stdenv.mkDerivation { cp $out/share/stumpwm/modules/util/stumpish/stumpish $out/bin/ chmod +x $out/bin/stumpish wrapProgram $out/bin/stumpish \ - --prefix PATH ":" "${stdenv.lib.makeBinPath [ rlwrap gnused gnugrep coreutils xprop ]}" + --prefix PATH ":" "${lib.makeBinPath [ rlwrap gnused gnugrep coreutils xprop ]}" # Paths in the compressed image $out/bin/stumpwm are not # recognized by Nix. Add explicit reference here. diff --git a/pkgs/applications/window-managers/sway/bg.nix b/pkgs/applications/window-managers/sway/bg.nix index a4532960619..57b81c7831c 100644 --- a/pkgs/applications/window-managers/sway/bg.nix +++ b/pkgs/applications/window-managers/sway/bg.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, meson, ninja, pkgconfig, scdoc +, meson, ninja, pkg-config, scdoc , wayland, wayland-protocols, cairo, gdk-pixbuf }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1lmqz5bmig90gq2m7lwf02d2g7z4hzf8fhqz78c8vk92c6p4xwbc"; }; - nativeBuildInputs = [ meson ninja pkgconfig scdoc ]; + nativeBuildInputs = [ meson ninja pkg-config scdoc ]; buildInputs = [ wayland wayland-protocols cairo gdk-pixbuf ]; mesonFlags = [ diff --git a/pkgs/applications/window-managers/sway/contrib.nix b/pkgs/applications/window-managers/sway/contrib.nix index e04a6e1cb78..caf34e543b7 100644 --- a/pkgs/applications/window-managers/sway/contrib.nix +++ b/pkgs/applications/window-managers/sway/contrib.nix @@ -34,7 +34,7 @@ grimshot = stdenv.mkDerivation rec { install -Dm 0755 contrib/grimshot $out/bin/grimshot wrapProgram $out/bin/grimshot --set PATH \ - "${stdenv.lib.makeBinPath [ + "${lib.makeBinPath [ sway-unwrapped wl-clipboard coreutils diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 2b3c51a7340..1798c8235d0 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper +{ lib, stdenv, fetchFromGitHub, substituteAll, swaybg , meson, ninja, pkg-config, wayland, scdoc , libxkbcommon, pcre, json_c, dbus, libevdev , pango, cairo, libinput, libcap, pam, gdk-pixbuf, librsvg @@ -19,6 +19,11 @@ stdenv.mkDerivation rec { patches = [ ./sway-config-no-nix-store-references.patch ./load-configuration-from-etc.patch + + (substituteAll { + src = ./fix-paths.patch; + inherit swaybg; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/sway/fix-paths.patch b/pkgs/applications/window-managers/sway/fix-paths.patch new file mode 100644 index 00000000000..c52f65b146b --- /dev/null +++ b/pkgs/applications/window-managers/sway/fix-paths.patch @@ -0,0 +1,11 @@ +--- a/sway/config.c ++++ b/sway/config.c +@@ -276,7 +276,7 @@ + + if (!(config->active_bar_modifiers = create_list())) goto cleanup; + +- if (!(config->swaybg_command = strdup("swaybg"))) goto cleanup; ++ if (!(config->swaybg_command = strdup("@swaybg@/bin/swaybg"))) goto cleanup; + + if (!(config->config_chain = create_list())) goto cleanup; + config->current_config_path = NULL; diff --git a/pkgs/applications/window-managers/sway/idle.nix b/pkgs/applications/window-managers/sway/idle.nix index 546999e6035..acfbb1ad36b 100644 --- a/pkgs/applications/window-managers/sway/idle.nix +++ b/pkgs/applications/window-managers/sway/idle.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, meson, ninja, pkgconfig, scdoc +, meson, ninja, pkg-config, scdoc , wayland, wayland-protocols, systemd }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { --replace "version: '1.5'" "version: '${version}'" ''; - nativeBuildInputs = [ meson ninja pkgconfig scdoc ]; + nativeBuildInputs = [ meson ninja pkg-config scdoc ]; buildInputs = [ wayland wayland-protocols systemd ]; mesonFlags = [ "-Dman-pages=enabled" "-Dlogind=enabled" ]; diff --git a/pkgs/applications/window-managers/sway/lock-effects.nix b/pkgs/applications/window-managers/sway/lock-effects.nix index e90aaf5efc2..eff8710ebfc 100644 --- a/pkgs/applications/window-managers/sway/lock-effects.nix +++ b/pkgs/applications/window-managers/sway/lock-effects.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, - meson, ninja, pkgconfig, scdoc, + meson, ninja, pkg-config, scdoc, wayland, wayland-protocols, libxkbcommon, cairo, gdk-pixbuf, pam }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sed -iE "s/version: '1\.3',/version: '${version}',/" meson.build ''; - nativeBuildInputs = [ meson ninja pkgconfig scdoc ]; + nativeBuildInputs = [ meson ninja pkg-config scdoc ]; buildInputs = [ wayland wayland-protocols libxkbcommon cairo gdk-pixbuf pam ]; mesonFlags = [ diff --git a/pkgs/applications/window-managers/sway/lock-fancy.nix b/pkgs/applications/window-managers/sway/lock-fancy.nix index 710dff73452..bee1f925f60 100644 --- a/pkgs/applications/window-managers/sway/lock-fancy.nix +++ b/pkgs/applications/window-managers/sway/lock-fancy.nix @@ -3,7 +3,7 @@ }: let - depsPath = stdenv.lib.makeBinPath [ + depsPath = lib.makeBinPath [ coreutils grim gawk diff --git a/pkgs/applications/window-managers/sway/lock.nix b/pkgs/applications/window-managers/sway/lock.nix index 51e7bf34594..9b1523421ee 100644 --- a/pkgs/applications/window-managers/sway/lock.nix +++ b/pkgs/applications/window-managers/sway/lock.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, meson, ninja, pkgconfig, scdoc +, meson, ninja, pkg-config, scdoc , wayland, wayland-protocols, libxkbcommon, cairo, gdk-pixbuf, pam }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { --replace "version: '1.4'" "version: '${version}'" ''; - nativeBuildInputs = [ meson ninja pkgconfig scdoc ]; + nativeBuildInputs = [ meson ninja pkg-config scdoc ]; buildInputs = [ wayland wayland-protocols libxkbcommon cairo gdk-pixbuf pam ]; mesonFlags = [ diff --git a/pkgs/applications/window-managers/sway/wrapper.nix b/pkgs/applications/window-managers/sway/wrapper.nix index fe78e1a9ff9..319023eb2e5 100644 --- a/pkgs/applications/window-managers/sway/wrapper.nix +++ b/pkgs/applications/window-managers/sway/wrapper.nix @@ -1,5 +1,5 @@ -{ lib, stdenv -, sway-unwrapped, swaybg +{ lib +, sway-unwrapped , makeWrapper, symlinkJoin, writeShellScriptBin , withBaseWrapper ? true, extraSessionCommands ? "", dbus , withGtkWrapper ? false, wrapGAppsHook, gdk-pixbuf, glib, gtk3 @@ -42,7 +42,6 @@ in symlinkJoin { ${optionalString withGtkWrapper "gappsWrapperArgsHook"} wrapProgram $out/bin/sway \ - --prefix PATH : "${swaybg}/bin" \ ${optionalString withGtkWrapper ''"''${gappsWrapperArgs[@]}"''} \ ${optionalString (extraOptions != []) "${concatMapStrings (x: " --add-flags " + x) extraOptions}"} ''; diff --git a/pkgs/applications/window-managers/tabbed/default.nix b/pkgs/applications/window-managers/tabbed/default.nix index f0a427e6839..2eeae7f4da5 100644 --- a/pkgs/applications/window-managers/tabbed/default.nix +++ b/pkgs/applications/window-managers/tabbed/default.nix @@ -1,6 +1,6 @@ -{stdenv, fetchgit, xorgproto, libX11, libXft, customConfig ? null, patches ? [] }: +{lib, stdenv, fetchgit, xorgproto, libX11, libXft, customConfig ? null, patches ? [] }: -with stdenv.lib; +with lib; stdenv.mkDerivation { name = "tabbed-20180310"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { inherit patches; - postPatch = stdenv.lib.optionalString (customConfig != null) '' + postPatch = lib.optionalString (customConfig != null) '' cp ${builtins.toFile "config.h" customConfig} ./config.h ''; diff --git a/pkgs/applications/window-managers/taffybar/default.nix b/pkgs/applications/window-managers/taffybar/default.nix index 681a5baec82..cc457f81589 100644 --- a/pkgs/applications/window-managers/taffybar/default.nix +++ b/pkgs/applications/window-managers/taffybar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, ghcWithPackages, makeWrapper, packages ? (x: []) }: +{ lib, stdenv, ghcWithPackages, makeWrapper, packages ? (x: []) }: let taffybarEnv = ghcWithPackages (self: [ self.taffybar ] ++ packages self); @@ -14,7 +14,7 @@ in stdenv.mkDerivation { ''; meta = { - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.bsd3; + platforms = lib.platforms.unix; + license = lib.licenses.bsd3; }; } diff --git a/pkgs/applications/window-managers/tinywm/default.nix b/pkgs/applications/window-managers/tinywm/default.nix index d6ff4ad51a2..8fa6a84b721 100644 --- a/pkgs/applications/window-managers/tinywm/default.nix +++ b/pkgs/applications/window-managers/tinywm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , libX11 }: stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { install -m644 annotated.c README -t $out/share/doc/${pname}-${version} ''; - meta = with stdenv.lib;{ + meta = with lib;{ description = "A tiny window manger for X11"; longDescription = '' diff --git a/pkgs/applications/window-managers/trayer/default.nix b/pkgs/applications/window-managers/trayer/default.nix index e7fc397e123..c210b39fe18 100644 --- a/pkgs/applications/window-managers/trayer/default.nix +++ b/pkgs/applications/window-managers/trayer/default.nix @@ -1,9 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, gdk-pixbuf, gtk2 }: +{ lib, stdenv, fetchFromGitHub, pkg-config, gdk-pixbuf, gtk2 }: stdenv.mkDerivation rec { name = "trayer-1.1.8"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gdk-pixbuf gtk2 ]; src = fetchFromGitHub { diff --git a/pkgs/applications/window-managers/vwm/default.nix b/pkgs/applications/window-managers/vwm/default.nix index 1b70706d0d3..9eea18f79d6 100644 --- a/pkgs/applications/window-managers/vwm/default.nix +++ b/pkgs/applications/window-managers/vwm/default.nix @@ -1,9 +1,9 @@ -{lib, stdenv, fetchurl, ncurses, pkgconfig, glib, libviper, libpseudo, gpm, +{lib, stdenv, fetchurl, ncurses, pkg-config, glib, libviper, libpseudo, gpm, libvterm}: stdenv.mkDerivation rec { name = "vwm-2.1.3"; - + src = fetchurl { url = "mirror://sourceforge/vwm/${name}.tar.gz"; sha256 = "1r5wiqyfqwnyx7dfihixlnavbvg8rni36i4gq169aisjcg7laxaf"; @@ -19,10 +19,10 @@ stdenv.mkDerivation rec { preInstall = '' mkdir -p $out/bin $out/include ''; - - nativeBuildInputs = [ pkgconfig ]; + + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses glib libviper libpseudo gpm libvterm ]; - + meta = with lib; { homepage = "http://vwm.sourceforge.net/"; description = "Dynamic window manager for the console"; diff --git a/pkgs/applications/window-managers/waybox/default.nix b/pkgs/applications/window-managers/waybox/default.nix new file mode 100644 index 00000000000..666b2406d5f --- /dev/null +++ b/pkgs/applications/window-managers/waybox/default.nix @@ -0,0 +1,45 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, meson +, ninja +, libxkbcommon +, wayland +, wayland-protocols +, wlroots +, pixman +, udev +, libGL +}: + +stdenv.mkDerivation rec { + pname = "waybox"; + version = "unstable-2020-05-01"; + + src = fetchFromGitHub { + owner = "wizbright"; + repo = pname; + rev = "93811898f0eea3035145f593938d49d5af759b46"; + sha256 = "IOdKOqAQD87Rs3td8NVEgMnRF6kQSuQ64UVqeVqMBSM="; + }; + + nativeBuildInputs = [ pkg-config meson ninja ]; + buildInputs = [ + libxkbcommon + wayland + wayland-protocols + wlroots + pixman + udev + libGL + ]; + + meta = with lib; { + homepage = "https://github.com/wizbright/waybox"; + description = "An openbox clone on Wayland"; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index a1f3b3708a4..3a11444bcf4 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkg-config, wayland +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, wayland , libGL, mesa, libxkbcommon, cairo, libxcb , libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput, libevdev , colord, lcms2, pipewire ? null @@ -7,7 +7,7 @@ # beware of null defaults, as the parameters *are* supplied by callPackage by default }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "weston"; version = "9.0.0"; diff --git a/pkgs/applications/window-managers/windowlab/default.nix b/pkgs/applications/window-managers/windowlab/default.nix index 1bbdb7a460f..f4fea3f434c 100644 --- a/pkgs/applications/window-managers/windowlab/default.nix +++ b/pkgs/applications/window-managers/windowlab/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , libX11, libXext, libXft }: let version = "1.40"; in @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "1fx4jwq4s98p2wpvawsiww7d6568bpjgcjpks61dzfj8p2j32s4d"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXext libXft ]; postPatch = @@ -26,7 +26,7 @@ stdenv.mkDerivation { sed "s|/usr/local|$out|g" Makefile.orig >> Makefile ''; - meta = with stdenv.lib; + meta = with lib; { description = "Small and simple stacking window manager"; homepage = "http://nickgravgaard.com/windowlab/"; license = licenses.gpl2; diff --git a/pkgs/applications/window-managers/windowmaker/default.nix b/pkgs/applications/window-managers/windowmaker/default.nix index 6bb0586ffed..e56ff2512c1 100644 --- a/pkgs/applications/window-managers/windowmaker/default.nix +++ b/pkgs/applications/window-managers/windowmaker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , libX11, libXext, libXft, libXmu, libXinerama, libXrandr, libXpm , imagemagick, libpng, libjpeg, libexif, libtiff, libungif, libwebp }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "055pqvlkhipyjn7m6bb3fs4zz9rd1ynzl0mmwbhp05ihc3zmh8zj"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXext libXft libXmu libXinerama libXrandr libXpm imagemagick libpng libjpeg libexif libtiff libungif libwebp ]; diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix index cde55e01698..ced4cad8055 100644 --- a/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix +++ b/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libX11, libXpm, libXext, libXfixes, libXmu }: +{ lib, stdenv, fetchurl, pkg-config, libX11, libXpm, libXext, libXfixes, libXmu }: stdenv.mkDerivation rec { pname = "wmsystemtray"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-jt70NpHp//BxAA4pFmx8GtQgwJVukGgVEGHogcisl+k="; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXpm libXext libXfixes libXmu ]; meta = with lib; { diff --git a/pkgs/applications/window-managers/wio/default.nix b/pkgs/applications/window-managers/wio/default.nix index b001b6a64f9..301b0184e9c 100644 --- a/pkgs/applications/window-managers/wio/default.nix +++ b/pkgs/applications/window-managers/wio/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/wio \ - --prefix PATH ":" "${stdenv.lib.makeBinPath [ alacritty cage ]}" + --prefix PATH ":" "${lib.makeBinPath [ alacritty cage ]}" ''; meta = with lib; { diff --git a/pkgs/applications/window-managers/wmii-hg/default.nix b/pkgs/applications/window-managers/wmii-hg/default.nix index 721e618b1d4..b78b7c01570 100644 --- a/pkgs/applications/window-managers/wmii-hg/default.nix +++ b/pkgs/applications/window-managers/wmii-hg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, pkgconfig, libixp_hg, txt2tags, dash, python, which +{ lib, stdenv, fetchurl, unzip, pkg-config, libixp_hg, txt2tags, dash, python, which , libX11 , libXrender, libXext, libXinerama, libXrandr, libXft }: stdenv.mkDerivation rec { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { EOF ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ unzip libixp_hg txt2tags dash python which libX11 libXrender libXext libXinerama libXrandr libXft ]; @@ -39,9 +39,9 @@ stdenv.mkDerivation rec { meta = { homepage = "https://suckless.org/"; # https://wmii.suckless.org/ does not exist anymore description = "A small window manager controlled by a 9P filesystem"; - maintainers = with stdenv.lib.maintainers; [ kovirobi ]; - license = stdenv.lib.licenses.mit; + maintainers = with lib.maintainers; [ kovirobi ]; + license = lib.licenses.mit; inherit version; - platforms = with stdenv.lib.platforms; linux; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/window-managers/xmonad/log-applet/default.nix b/pkgs/applications/window-managers/xmonad/log-applet/default.nix index 744ae625790..ebabcf196d5 100644 --- a/pkgs/applications/window-managers/xmonad/log-applet/default.nix +++ b/pkgs/applications/window-managers/xmonad/log-applet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, glib, dbus-glib +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, glib, dbus-glib , desktopSupport ? "gnomeflashback", xorg , gtk2 , gtk3, gnome3, mate @@ -20,12 +20,12 @@ stdenv.mkDerivation rec { }; buildInputs = [ glib dbus-glib xorg.xcbutilwm ] - ++ stdenv.lib.optionals (desktopSupport == "gnomeflashback") [ gtk3 gnome3.gnome-panel ] - ++ stdenv.lib.optionals (desktopSupport == "mate") [ gtk3 mate.mate-panel ] - ++ stdenv.lib.optionals (desktopSupport == "xfce4") [ gtk2 libxfce4util xfce4-panel ] + ++ lib.optionals (desktopSupport == "gnomeflashback") [ gtk3 gnome3.gnome-panel ] + ++ lib.optionals (desktopSupport == "mate") [ gtk3 mate.mate-panel ] + ++ lib.optionals (desktopSupport == "xfce4") [ gtk2 libxfce4util xfce4-panel ] ; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; configureFlags = [ "--with-panel=${desktopSupport}" ]; diff --git a/pkgs/applications/window-managers/yabar/build.nix b/pkgs/applications/window-managers/yabar/build.nix index c4b4f5cc8c4..ec15f7e3627 100644 --- a/pkgs/applications/window-managers/yabar/build.nix +++ b/pkgs/applications/window-managers/yabar/build.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cairo, gdk-pixbuf, libconfig, pango, pkgconfig +{ stdenv, fetchFromGitHub, cairo, gdk-pixbuf, libconfig, pango, pkg-config , xcbutilwm, alsaLib, wirelesstools, asciidoc, libxslt, makeWrapper, docbook_xsl , configFile ? null, lib , rev, sha256, version, patches ? [] @@ -19,7 +19,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ cairo gdk-pixbuf libconfig pango xcbutilwm docbook_xsl alsaLib wirelesstools asciidoc libxslt makeWrapper diff --git a/pkgs/applications/window-managers/yeahwm/default.nix b/pkgs/applications/window-managers/yeahwm/default.nix index a8323ff1d38..3cf997c22c2 100644 --- a/pkgs/applications/window-managers/yeahwm/default.nix +++ b/pkgs/applications/window-managers/yeahwm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , lesstif , libX11, libXext, libXmu, libXinerama }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { install -m644 yeahwm.1.gz ${placeholder "out"}/share/man/man1/ ''; - meta = with stdenv.lib;{ + meta = with lib;{ description = "An X window manager based on evilwm and aewm"; longDescription = '' YeahWM is a h* window manager for X based on evilwm and aewm. diff --git a/pkgs/build-support/alternatives/blas/default.nix b/pkgs/build-support/alternatives/blas/default.nix index 5ebbc737e11..cf880677fdd 100644 --- a/pkgs/build-support/alternatives/blas/default.nix +++ b/pkgs/build-support/alternatives/blas/default.nix @@ -132,7 +132,7 @@ Description: BLAS C implementation Cflags: -I$dev/include Libs: -L$out/lib -lcblas EOF -'' + stdenv.lib.optionalString (blasImplementation == "mkl") '' +'' + lib.optionalString (blasImplementation == "mkl") '' mkdir -p $out/nix-support echo 'export MKL_INTERFACE_LAYER=${lib.optionalString isILP64 "I"}LP64,GNU' > $out/nix-support/setup-hook ln -s $out/lib/libblas${canonicalExtension} $out/lib/libmkl_rt${stdenv.hostPlatform.extensions.sharedLibrary} diff --git a/pkgs/build-support/alternatives/lapack/default.nix b/pkgs/build-support/alternatives/lapack/default.nix index 98b458b778a..7e74eb96b74 100644 --- a/pkgs/build-support/alternatives/lapack/default.nix +++ b/pkgs/build-support/alternatives/lapack/default.nix @@ -98,7 +98,7 @@ Description: LAPACK C implementation Cflags: -I$dev/include Libs: -L$out/lib -llapacke EOF -'' + stdenv.lib.optionalString (lapackImplementation == "mkl") '' +'' + lib.optionalString (lapackImplementation == "mkl") '' mkdir -p $out/nix-support echo 'export MKL_INTERFACE_LAYER=${lib.optionalString isILP64 "I"}LP64,GNU' > $out/nix-support/setup-hook ln -s $out/lib/liblapack${canonicalExtension} $out/lib/libmkl_rt${stdenv.hostPlatform.extensions.sharedLibrary} diff --git a/pkgs/build-support/appimage/appimage-exec.sh b/pkgs/build-support/appimage/appimage-exec.sh index 7986c589667..4ff6802e645 100755 --- a/pkgs/build-support/appimage/appimage-exec.sh +++ b/pkgs/build-support/appimage/appimage-exec.sh @@ -75,15 +75,15 @@ apprun() { wrap() { - cd "$APPDIR" || exit # quite same in appimageTools export APPIMAGE_SILENT_INSTALL=1 if [ -n "$APPIMAGE_DEBUG_EXEC" ]; then + cd "$APPDIR" || true exec "$APPIMAGE_DEBUG_EXEC" fi - exec ./AppRun "$@" + exec "$APPDIR/AppRun" "$@" } usage() { diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index e6014e35aef..6824b8215e5 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib + , bash , binutils-unwrapped , coreutils @@ -15,7 +16,7 @@ rec { src = ./appimage-exec.sh; isExecutable = true; dir = "bin"; - path = with pkgs; stdenv.lib.makeBinPath [ + path = lib.makeBinPath [ bash binutils-unwrapped coreutils @@ -65,7 +66,7 @@ rec { xorg.xrandr which perl - xdg_utils + xdg-utils iana-etc krb5 ]; diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index bd3ebdf800e..48a3ebb32df 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -6,6 +6,7 @@ # compiler and the linker just "work". { name ? "" +, lib , stdenvNoCC , bintools ? null, libc ? null, coreutils ? null, shell ? stdenvNoCC.shell, gnugrep ? null , nativeTools, noLibc ? false, nativeLibc, nativePrefix ? "" @@ -15,7 +16,7 @@ , useMacosReexportHack ? false }: -with stdenvNoCC.lib; +with lib; assert nativeTools -> !propagateDoc && nativePrefix != ""; assert !nativeTools -> @@ -31,11 +32,11 @@ let # # TODO(@Ericson2314) Make unconditional, or optional but always true by # default. - targetPrefix = stdenv.lib.optionalString (targetPlatform != hostPlatform) + targetPrefix = lib.optionalString (targetPlatform != hostPlatform) (targetPlatform.config + "-"); - bintoolsVersion = stdenv.lib.getVersion bintools; - bintoolsName = stdenv.lib.removePrefix targetPrefix (stdenv.lib.getName bintools); + bintoolsVersion = lib.getVersion bintools; + bintoolsName = lib.removePrefix targetPrefix (lib.getName bintools); libc_bin = if libc == null then null else getBin libc; libc_dev = if libc == null then null else getDev libc; @@ -56,13 +57,14 @@ let else if targetPlatform.libc == "nblibc" then "${libc_lib}/libexec/ld.elf_so" else if targetPlatform.system == "i686-linux" then "${libc_lib}/lib/ld-linux.so.2" else if targetPlatform.system == "x86_64-linux" then "${libc_lib}/lib/ld-linux-x86-64.so.2" + else if targetPlatform.system == "powerpc64le-linux" then "${libc_lib}/lib/ld64.so.2" # ARM with a wildcard, which can be "" or "-armhf". else if (with targetPlatform; isAarch32 && isLinux) then "${libc_lib}/lib/ld-linux*.so.3" else if targetPlatform.system == "aarch64-linux" then "${libc_lib}/lib/ld-linux-aarch64.so.1" else if targetPlatform.system == "powerpc-linux" then "${libc_lib}/lib/ld.so.1" else if targetPlatform.isMips then "${libc_lib}/lib/ld.so.1" else if targetPlatform.isDarwin then "/usr/lib/dyld" - else if stdenv.lib.hasSuffix "pc-gnu" targetPlatform.config then "ld.so.1" + else if lib.hasSuffix "pc-gnu" targetPlatform.config then "ld.so.1" else null; expand-response-params = @@ -190,7 +192,7 @@ stdenv.mkDerivation { else if targetPlatform.isRiscV then "lriscv" else throw "unknown emulation for platform: ${targetPlatform.config}"; in if targetPlatform.useLLVM or false then "" - else targetPlatform.platform.bfdEmulation or (fmt + sep + arch); + else targetPlatform.bfdEmulation or (fmt + sep + arch); strictDeps = true; depsTargetTargetPropagated = extraPackages; @@ -326,10 +328,10 @@ stdenv.mkDerivation { let bintools_ = if bintools != null then bintools else {}; in (if bintools_ ? meta then removeAttrs bintools.meta ["priority"] else {}) // { description = - stdenv.lib.attrByPath ["meta" "description"] "System binary utilities" bintools_ + lib.attrByPath ["meta" "description"] "System binary utilities" bintools_ + " (wrapper script)"; priority = 10; } // optionalAttrs useMacosReexportHack { - platforms = stdenv.lib.platforms.darwin; + platforms = lib.platforms.darwin; }; } diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix index 10a331bcc9e..3be72bd22c3 100644 --- a/pkgs/build-support/build-bazel-package/default.nix +++ b/pkgs/build-support/build-bazel-package/default.nix @@ -172,7 +172,9 @@ in stdenv.mkDerivation (fBuildAttrs // { chmod -R +w $bazelOut find $bazelOut -type l | while read symlink; do - ln -sf $(readlink "$symlink" | sed "s,NIX_BUILD_TOP,$NIX_BUILD_TOP,") "$symlink" + if [[ $(readlink "$symlink") == *NIX_BUILD_TOP* ]]; then + ln -sf $(readlink "$symlink" | sed "s,NIX_BUILD_TOP,$NIX_BUILD_TOP,") "$symlink" + fi done '' + fBuildAttrs.preConfigure or ""; diff --git a/pkgs/build-support/build-dotnet-package/default.nix b/pkgs/build-support/build-dotnet-package/default.nix index dae9ed888c7..440b10044f0 100644 --- a/pkgs/build-support/build-dotnet-package/default.nix +++ b/pkgs/build-support/build-dotnet-package/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, makeWrapper, pkgconfig, mono, dotnetbuildhelpers }: +{ stdenv, lib, makeWrapper, pkg-config, mono, dotnetbuildhelpers }: attrsOrig @ { baseName @@ -19,7 +19,7 @@ attrsOrig @ attrs = { name = "${baseName}-${version}"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ mono dotnetbuildhelpers diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix index b40569a479b..9a9e5a9ce10 100644 --- a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix +++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix @@ -1,4 +1,4 @@ -{ lib, callPackage, runCommandLocal, writeShellScriptBin, stdenv, coreutils, bubblewrap }: +{ lib, callPackage, runCommandLocal, writeShellScriptBin, coreutils, bubblewrap }: args @ { name diff --git a/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix b/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix index 6ab697c3696..15d7b315358 100644 --- a/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix +++ b/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, meson, ninja, pkgconfig, glib }: +{ lib, stdenv, meson, ninja, pkg-config, glib }: stdenv.mkDerivation { name = "chrootenv"; src = ./.; - nativeBuildInputs = [ meson ninja pkgconfig ]; + nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ glib ]; meta = with lib; { diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 0855c27eff4..341e2850437 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -6,6 +6,7 @@ # compiler and the linker just "work". { name ? "" +, lib , stdenvNoCC , cc ? null, libc ? null, bintools, coreutils ? null, shell ? stdenvNoCC.shell , gccForLibs ? null @@ -18,7 +19,7 @@ , libcxx ? null }: -with stdenvNoCC.lib; +with lib; assert nativeTools -> !propagateDoc && nativePrefix != ""; assert !nativeTools -> @@ -34,11 +35,11 @@ let # # TODO(@Ericson2314) Make unconditional, or optional but always true by # default. - targetPrefix = stdenv.lib.optionalString (targetPlatform != hostPlatform) + targetPrefix = lib.optionalString (targetPlatform != hostPlatform) (targetPlatform.config + "-"); - ccVersion = stdenv.lib.getVersion cc; - ccName = stdenv.lib.removePrefix targetPrefix (stdenv.lib.getName cc); + ccVersion = lib.getVersion cc; + ccName = lib.removePrefix targetPrefix (lib.getName cc); libc_bin = if libc == null then null else getBin libc; libc_dev = if libc == null then null else getDev libc; @@ -65,6 +66,7 @@ let && libcxx == null && !(stdenv.targetPlatform.useLLVM or false) && !(stdenv.targetPlatform.useAndroidPrebuilt or false) + && !(stdenv.targetPlatform.isiOS or false) && gccForLibs != null; # older compilers (for example bootstrap's GCC 5) fail with -march=too-modern-cpu @@ -246,8 +248,8 @@ stdenv.mkDerivation { setupHooks = [ ../setup-hooks/role.bash - ] ++ stdenv.lib.optional (cc.langC or true) ./setup-hook.sh - ++ stdenv.lib.optional (cc.langFortran or false) ./fortran-hook.sh; + ] ++ lib.optional (cc.langC or true) ./setup-hook.sh + ++ lib.optional (cc.langFortran or false) ./fortran-hook.sh; postFixup = # Ensure flags files exists, as some other programs cat them. (That these @@ -289,6 +291,17 @@ stdenv.mkDerivation { echo "-L${gccForLibs.lib}/${targetPlatform.config}/lib" >> $out/nix-support/cc-ldflags '' + # TODO We would like to connect this to `useGccForLibs`, but we cannot yet + # because `libcxxStdenv` on linux still needs this. Maybe someday we'll + # always set `useLLVM` on Darwin, and maybe also break down `useLLVM` into + # fine-grained use flags (libgcc vs compiler-rt, ld.lld vs legacy, libc++ + # vs libstdc++, etc.) since Darwin isn't `useLLVM` on all counts. (See + # https://clang.llvm.org/docs/Toolchain.html for all the axes one might + # break `useLLVM` into.) + + optionalString (isClang && gccForLibs != null && targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) '' + echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags + '' + ## ## General libc support ## @@ -341,7 +354,7 @@ stdenv.mkDerivation { + optionalString (libcxx.isLLVM or false) ('' echo "-isystem ${libcxx}/include/c++/v1" >> $out/nix-support/libcxx-cxxflags echo "-stdlib=libc++" >> $out/nix-support/libcxx-ldflags - '' + stdenv.lib.optionalString stdenv.targetPlatform.isLinux '' + '' + lib.optionalString stdenv.targetPlatform.isLinux '' echo "-lc++abi" >> $out/nix-support/libcxx-ldflags '') @@ -401,32 +414,32 @@ stdenv.mkDerivation { # Always add -march based on cpu in triple. Sometimes there is a # discrepency (x86_64 vs. x86-64), so we provide an "arch" arg in # that case. - + optionalString ((targetPlatform ? platform.gcc.arch) && - isGccArchSupported targetPlatform.platform.gcc.arch) '' - echo "-march=${targetPlatform.platform.gcc.arch}" >> $out/nix-support/cc-cflags-before + + optionalString ((targetPlatform ? gcc.arch) && + isGccArchSupported targetPlatform.gcc.arch) '' + echo "-march=${targetPlatform.gcc.arch}" >> $out/nix-support/cc-cflags-before '' # -mcpu is not very useful. You should use mtune and march # instead. It’s provided here for backwards compatibility. - + optionalString (targetPlatform ? platform.gcc.cpu) '' - echo "-mcpu=${targetPlatform.platform.gcc.cpu}" >> $out/nix-support/cc-cflags-before + + optionalString (targetPlatform ? gcc.cpu) '' + echo "-mcpu=${targetPlatform.gcc.cpu}" >> $out/nix-support/cc-cflags-before '' # -mfloat-abi only matters on arm32 but we set it here # unconditionally just in case. If the abi specifically sets hard # vs. soft floats we use it here. - + optionalString (targetPlatform ? platform.gcc.float-abi) '' - echo "-mfloat-abi=${targetPlatform.platform.gcc.float-abi}" >> $out/nix-support/cc-cflags-before + + optionalString (targetPlatform ? gcc.float-abi) '' + echo "-mfloat-abi=${targetPlatform.gcc.float-abi}" >> $out/nix-support/cc-cflags-before '' - + optionalString (targetPlatform ? platform.gcc.fpu) '' - echo "-mfpu=${targetPlatform.platform.gcc.fpu}" >> $out/nix-support/cc-cflags-before + + optionalString (targetPlatform ? gcc.fpu) '' + echo "-mfpu=${targetPlatform.gcc.fpu}" >> $out/nix-support/cc-cflags-before '' - + optionalString (targetPlatform ? platform.gcc.mode) '' - echo "-mmode=${targetPlatform.platform.gcc.mode}" >> $out/nix-support/cc-cflags-before + + optionalString (targetPlatform ? gcc.mode) '' + echo "-mmode=${targetPlatform.gcc.mode}" >> $out/nix-support/cc-cflags-before '' - + optionalString (targetPlatform ? platform.gcc.tune && - isGccArchSupported targetPlatform.platform.gcc.tune) '' - echo "-mtune=${targetPlatform.platform.gcc.tune}" >> $out/nix-support/cc-cflags-before + + optionalString (targetPlatform ? gcc.tune && + isGccArchSupported targetPlatform.gcc.tune) '' + echo "-mtune=${targetPlatform.gcc.tune}" >> $out/nix-support/cc-cflags-before '' # TODO: categorize these and figure out a better place for them @@ -480,7 +493,7 @@ stdenv.mkDerivation { let cc_ = if cc != null then cc else {}; in (if cc_ ? meta then removeAttrs cc.meta ["priority"] else {}) // { description = - stdenv.lib.attrByPath ["meta" "description"] "System C compiler" cc_ + lib.attrByPath ["meta" "description"] "System C compiler" cc_ + " (wrapper script)"; priority = 10; }; diff --git a/pkgs/build-support/coq/default.nix b/pkgs/build-support/coq/default.nix index 7e925e2473e..8d86602bf38 100644 --- a/pkgs/build-support/coq/default.nix +++ b/pkgs/build-support/coq/default.nix @@ -35,7 +35,7 @@ let "extraInstallFlags" "setCOQBIN" "mlPlugin" "dropAttrs" "dropDerivationAttrs" "keepAttrs" ] ++ dropAttrs) keepAttrs; fetch = import ../coq/meta-fetch/default.nix - { inherit stdenv fetchzip; } ({ + { inherit lib stdenv fetchzip; } ({ inherit release releaseRev; location = { inherit domain owner repo; }; } // optionalAttrs (args?fetcher) {inherit fetcher;}); diff --git a/pkgs/build-support/coq/meta-fetch/default.nix b/pkgs/build-support/coq/meta-fetch/default.nix index 580d58395ef..b01ae72a208 100644 --- a/pkgs/build-support/coq/meta-fetch/default.nix +++ b/pkgs/build-support/coq/meta-fetch/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchzip }@args: -let lib = import ../extra-lib.nix {inherit (args.stdenv) lib;}; in +{ lib, stdenv, fetchzip }@args: +let lib' = lib; in +let lib = import ../extra-lib.nix {lib = lib';}; in with builtins; with lib; let default-fetcher = {domain ? "github.com", owner ? "", repo, rev, name ? "source", sha256 ? null, ...}@args: diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index ae97d569133..0c9d4f110ad 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -94,7 +94,7 @@ rec { inherit imageDigest; imageName = finalImageName; imageTag = finalImageTag; - impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars; + impureEnvVars = lib.fetchers.proxyImpureEnvVars; outputHashMode = "flat"; outputHashAlgo = "sha256"; outputHash = sha256; @@ -109,7 +109,7 @@ rec { ''; # We need to sum layer.tar, not a directory, hence tarsum instead of nix-hash. - # And we cannot untar it, because then we cannot preserve permissions ecc. + # And we cannot untar it, because then we cannot preserve permissions etc. tarsum = runCommand "tarsum" { nativeBuildInputs = [ go ]; } '' @@ -120,7 +120,7 @@ rec { export GOPATH=$(pwd) export GOCACHE="$TMPDIR/go-cache" mkdir -p src/github.com/docker/docker/pkg - ln -sT ${docker.src}/components/engine/pkg/tarsum src/github.com/docker/docker/pkg/tarsum + ln -sT ${docker.moby.src}/pkg/tarsum src/github.com/docker/docker/pkg/tarsum go build mkdir -p $out/bin diff --git a/pkgs/build-support/docker/nix-prefetch-docker.nix b/pkgs/build-support/docker/nix-prefetch-docker.nix index 6341eb0154b..61e917461ed 100644 --- a/pkgs/build-support/docker/nix-prefetch-docker.nix +++ b/pkgs/build-support/docker/nix-prefetch-docker.nix @@ -1,6 +1,4 @@ -{ stdenv, makeWrapper, nix, skopeo, jq }: - -with stdenv.lib; +{ lib, stdenv, makeWrapper, nix, skopeo, jq }: stdenv.mkDerivation { name = "nix-prefetch-docker"; @@ -12,13 +10,13 @@ stdenv.mkDerivation { installPhase = '' install -vD ${./nix-prefetch-docker} $out/bin/$name; wrapProgram $out/bin/$name \ - --prefix PATH : ${makeBinPath [ nix skopeo jq ]} \ + --prefix PATH : ${lib.makeBinPath [ nix skopeo jq ]} \ --set HOME /homeless-shelter ''; preferLocalBuild = true; - meta = { + meta = with lib; { description = "Script used to obtain source hashes for dockerTools.pullImage"; maintainers = with maintainers; [ offline ]; platforms = platforms.unix; diff --git a/pkgs/build-support/dotnetbuildhelpers/default.nix b/pkgs/build-support/dotnetbuildhelpers/default.nix index 809619ed55d..4348832ac04 100644 --- a/pkgs/build-support/dotnetbuildhelpers/default.nix +++ b/pkgs/build-support/dotnetbuildhelpers/default.nix @@ -1,4 +1,4 @@ -{ runCommand, mono, pkgconfig }: +{ runCommand, mono, pkg-config }: runCommand "dotnetbuildhelpers" { preferLocalBuild = true; } @@ -12,7 +12,7 @@ cp -v "$script" "$target"/"$scriptName" chmod 755 "$target"/"$scriptName" patchShebangs "$target"/"$scriptName" - substituteInPlace "$target"/"$scriptName" --replace pkg-config ${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config + substituteInPlace "$target"/"$scriptName" --replace pkg-config ${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config substituteInPlace "$target"/"$scriptName" --replace monodis ${mono}/bin/monodis done '' diff --git a/pkgs/build-support/dotnetenv/build-solution.nix b/pkgs/build-support/dotnetenv/build-solution.nix index 57af1fe9bd4..b3372b94217 100644 --- a/pkgs/build-support/dotnetenv/build-solution.nix +++ b/pkgs/build-support/dotnetenv/build-solution.nix @@ -1,4 +1,4 @@ -{stdenv, dotnetfx}: +{ lib, stdenv, dotnetfx }: { name , src , baseDir ? "." @@ -24,7 +24,7 @@ stdenv.mkDerivation { ''; preBuild = '' - ${stdenv.lib.optionalString modifyPublicMain '' + ${lib.optionalString modifyPublicMain '' sed -i -e "s|static void Main|public static void Main|" ${mainClassFile} ''} ${preBuild} diff --git a/pkgs/build-support/dotnetenv/default.nix b/pkgs/build-support/dotnetenv/default.nix index c7145504eb7..3015db42b07 100644 --- a/pkgs/build-support/dotnetenv/default.nix +++ b/pkgs/build-support/dotnetenv/default.nix @@ -1,9 +1,9 @@ -{stdenv, dotnetfx}: +{ lib, stdenv, dotnetfx }: let dotnetenv = { buildSolution = import ./build-solution.nix { - inherit stdenv; + inherit lib stdenv; dotnetfx = dotnetfx.pkg; }; diff --git a/pkgs/build-support/emacs/generic.nix b/pkgs/build-support/emacs/generic.nix index 588699517ba..d84fa24923d 100644 --- a/pkgs/build-support/emacs/generic.nix +++ b/pkgs/build-support/emacs/generic.nix @@ -1,6 +1,6 @@ # generic builder for Emacs packages -{ lib, stdenv, emacs, texinfo }: +{ lib, stdenv, emacs, texinfo, ... }: with lib; diff --git a/pkgs/build-support/emacs/trivial.nix b/pkgs/build-support/emacs/trivial.nix index 396c971b2f0..f1aa078df27 100644 --- a/pkgs/build-support/emacs/trivial.nix +++ b/pkgs/build-support/emacs/trivial.nix @@ -1,12 +1,12 @@ # trivial builder for Emacs packages -{ lib, stdenv, texinfo, ... }@envargs: +{ callPackage, lib, ... }@envargs: with lib; args: -import ./generic.nix envargs ({ +callPackage ./generic.nix envargs ({ buildPhase = '' runHook preBuild diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix index ddd15065663..f34835eaf09 100644 --- a/pkgs/build-support/emacs/wrapper.nix +++ b/pkgs/build-support/emacs/wrapper.nix @@ -2,11 +2,11 @@ # Usage -`emacsWithPackages` takes a single argument: a function from a package +`emacs.pkgs.withPackages` takes a single argument: a function from a package set to a list of packages (the packages that will be available in Emacs). For example, ``` -emacsWithPackages (epkgs: [ epkgs.evil epkgs.magit ]) +emacs.pkgs.withPackages (epkgs: [ epkgs.evil epkgs.magit ]) ``` All the packages in the list should come from the provided package set. It is possible to add any package to the list, but the provided @@ -15,19 +15,19 @@ the correct version of Emacs. # Overriding -`emacsWithPackages` inherits the package set which contains it, so the +`emacs.pkgs.withPackages` inherits the package set which contains it, so the correct way to override the provided package set is to override the -set which contains `emacsWithPackages`. For example, to override -`emacsPackages.emacsWithPackages`, +set which contains `emacs.pkgs.withPackages`. For example, to override +`emacs.pkgs.emacs.pkgs.withPackages`, ``` let customEmacsPackages = - emacsPackages.overrideScope' (self: super: { + emacs.pkgs.overrideScope' (self: super: { # use a custom version of emacs emacs = ...; # use the unstable MELPA version of magit magit = self.melpaPackages.magit; }); -in customEmacsPackages.emacsWithPackages (epkgs: [ epkgs.evil epkgs.magit ]) +in customEmacsPackages.emacs.pkgs.withPackages (epkgs: [ epkgs.evil epkgs.magit ]) ``` */ diff --git a/pkgs/build-support/fetchbzr/default.nix b/pkgs/build-support/fetchbzr/default.nix index 2cf169de7a5..b7db9e9274d 100644 --- a/pkgs/build-support/fetchbzr/default.nix +++ b/pkgs/build-support/fetchbzr/default.nix @@ -10,6 +10,6 @@ stdenvNoCC.mkDerivation { outputHashAlgo = "sha256"; outputHashMode = "recursive"; outputHash = sha256; - + inherit url rev; } diff --git a/pkgs/build-support/fetchdocker/fetchDockerConfig.nix b/pkgs/build-support/fetchdocker/fetchDockerConfig.nix index 9fd813bfa57..e8b2403d8f3 100644 --- a/pkgs/build-support/fetchdocker/fetchDockerConfig.nix +++ b/pkgs/build-support/fetchdocker/fetchDockerConfig.nix @@ -1,4 +1,4 @@ -pkgargs@{ stdenv, lib, haskellPackages, writeText, gawk }: +pkgargs@{ lib, haskellPackages, writeText, gawk }: let generic-fetcher = import ./generic-fetcher.nix pkgargs; diff --git a/pkgs/build-support/fetchdocker/fetchDockerLayer.nix b/pkgs/build-support/fetchdocker/fetchDockerLayer.nix index 869ba637429..0fbbc078efc 100644 --- a/pkgs/build-support/fetchdocker/fetchDockerLayer.nix +++ b/pkgs/build-support/fetchdocker/fetchDockerLayer.nix @@ -1,4 +1,4 @@ -pkgargs@{ stdenv, lib, haskellPackages, writeText, gawk }: +pkgargs@{ lib, haskellPackages, writeText, gawk }: let generic-fetcher = import ./generic-fetcher.nix pkgargs; diff --git a/pkgs/build-support/fetchfirefoxaddon/default.nix b/pkgs/build-support/fetchfirefoxaddon/default.nix index 9efe9197d68..127f32dd61b 100644 --- a/pkgs/build-support/fetchfirefoxaddon/default.nix +++ b/pkgs/build-support/fetchfirefoxaddon/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { inherit name; extid = if fixedExtid == null then "nixos@${name}" else fixedExtid; passthru = { - exitd=extid; + inherit extid; }; builder = writeScript "xpibuilder" '' diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index 5f5ded128de..df97ef1492d 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -1,6 +1,6 @@ -{stdenvNoCC, git, git-lfs, cacert}: let +{lib, stdenvNoCC, git, git-lfs, cacert}: let urlToName = url: rev: let - inherit (stdenvNoCC.lib) removeSuffix splitString last; + inherit (lib) removeSuffix splitString last; base = last (splitString ":" (baseNameOf (removeSuffix "/" url))); matched = builtins.match "(.*).git" base; @@ -56,7 +56,7 @@ stdenvNoCC.mkDerivation { fetcher = ./nix-prefetch-git; # This must be a string to ensure it's called with bash. nativeBuildInputs = [ git ] - ++ stdenvNoCC.lib.optionals fetchLFS [ git-lfs ]; + ++ lib.optionals fetchLFS [ git-lfs ]; outputHashAlgo = "sha256"; outputHashMode = "recursive"; @@ -66,7 +66,7 @@ stdenvNoCC.mkDerivation { GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; - impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars ++ [ + impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ "GIT_PROXY_COMMAND" "SOCKS_SERVER" ]; diff --git a/pkgs/build-support/fetchhg/default.nix b/pkgs/build-support/fetchhg/default.nix index 41eff1f9c0c..15309d0a195 100644 --- a/pkgs/build-support/fetchhg/default.nix +++ b/pkgs/build-support/fetchhg/default.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, mercurial }: +{ lib, stdenvNoCC, mercurial }: { name ? null , url , rev ? null @@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation { builder = ./builder.sh; nativeBuildInputs = [mercurial]; - impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars; + impureEnvVars = lib.fetchers.proxyImpureEnvVars; subrepoClause = if fetchSubrepos then "S" else ""; diff --git a/pkgs/build-support/fetchmavenartifact/default.nix b/pkgs/build-support/fetchmavenartifact/default.nix index 42162638e72..4274b4b52bf 100644 --- a/pkgs/build-support/fetchmavenartifact/default.nix +++ b/pkgs/build-support/fetchmavenartifact/default.nix @@ -1,6 +1,6 @@ # Adaptation of the MIT-licensed work on `sbt2nix` done by Charles O'Farrell -{ fetchurl, stdenv }: +{ lib, fetchurl, stdenv }: let defaultRepos = [ "https://repo1.maven.org/maven2" @@ -36,21 +36,20 @@ assert (url == "") || (urls == []); # if repos is empty, then url or urls must be specified. assert (repos != []) || (url != "") || (urls != []); - let name_ = - with stdenv.lib; concatStrings [ - (replaceChars ["."] ["_"] groupId) "_" - (replaceChars ["."] ["_"] artifactId) "-" + lib.concatStrings [ + (lib.replaceChars ["."] ["_"] groupId) "_" + (lib.replaceChars ["."] ["_"] artifactId) "-" version ]; mkJarUrl = repoUrl: - with stdenv.lib; concatStringsSep "/" [ - (removeSuffix "/" repoUrl) - (replaceChars ["."] ["/"] groupId) + lib.concatStringsSep "/" [ + (lib.removeSuffix "/" repoUrl) + (lib.replaceChars ["."] ["/"] groupId) artifactId version - "${artifactId}-${version}${optionalString (!isNull classifier) "-${classifier}"}.jar" + "${artifactId}-${version}${lib.optionalString (!isNull classifier) "-${classifier}"}.jar" ]; urls_ = if url != "" then [url] diff --git a/pkgs/build-support/fetchmtn/default.nix b/pkgs/build-support/fetchmtn/default.nix index 7ce67453d69..4aa134242aa 100644 --- a/pkgs/build-support/fetchmtn/default.nix +++ b/pkgs/build-support/fetchmtn/default.nix @@ -1,10 +1,10 @@ # You can specify some extra mirrors and a cache DB via options -{stdenvNoCC, monotone, defaultDBMirrors ? [], cacheDB ? "./mtn-checkout.db"}: +{lib, stdenvNoCC, monotone, defaultDBMirrors ? [], cacheDB ? "./mtn-checkout.db"}: # dbs is a list of strings # each is an url for sync # selector is mtn selector, like h:org.example.branch -# +# {name ? "mtn-checkout", dbs ? [], sha256 , selector ? "h:" + branch, branch}: @@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation { dbs = defaultDBMirrors ++ dbs; inherit branch cacheDB name selector; - impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars; + impureEnvVars = lib.fetchers.proxyImpureEnvVars; } diff --git a/pkgs/build-support/fetchrepoproject/default.nix b/pkgs/build-support/fetchrepoproject/default.nix index 8144ed038bd..69b1bd1aef7 100644 --- a/pkgs/build-support/fetchrepoproject/default.nix +++ b/pkgs/build-support/fetchrepoproject/default.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, gitRepo, cacert, copyPathsToStore }: +{ lib, stdenvNoCC, gitRepo, cacert, copyPathsToStore }: { name, manifest, rev ? "HEAD", sha256 # Optional parameters: @@ -9,7 +9,7 @@ assert repoRepoRev != "" -> repoRepoURL != ""; assert createMirror -> !useArchive; -with stdenvNoCC.lib; +with lib; let extraRepoInitFlags = [ diff --git a/pkgs/build-support/fetchs3/default.nix b/pkgs/build-support/fetchs3/default.nix index 3dbde203374..8c551c20aa0 100644 --- a/pkgs/build-support/fetchs3/default.nix +++ b/pkgs/build-support/fetchs3/default.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, runCommand, awscli }: +{ lib, stdenvNoCC, runCommand, awscli }: { s3url , name ? builtins.baseNameOf s3url @@ -16,7 +16,7 @@ let AWS_SESSION_TOKEN = session_token; }; - credentialAttrs = stdenvNoCC.lib.optionalAttrs (credentials != null) (mkCredentials credentials); + credentialAttrs = lib.optionalAttrs (credentials != null) (mkCredentials credentials); in runCommand name ({ nativeBuildInputs = [ awscli ]; diff --git a/pkgs/build-support/fetchsvn/default.nix b/pkgs/build-support/fetchsvn/default.nix index 06f0ea0a3d1..82dececc124 100644 --- a/pkgs/build-support/fetchsvn/default.nix +++ b/pkgs/build-support/fetchsvn/default.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, buildPackages +{ lib, stdenvNoCC, buildPackages , subversion, glibcLocales, sshSupport ? true, openssh ? null }: @@ -10,7 +10,7 @@ assert sshSupport -> openssh != null; let - repoName = with stdenvNoCC.lib; + repoName = with lib; let fst = head; snd = l: head (tail l); @@ -39,7 +39,7 @@ stdenvNoCC.mkDerivation { name = name_; builder = ./builder.sh; nativeBuildInputs = [ subversion glibcLocales ] - ++ stdenvNoCC.lib.optional sshSupport openssh; + ++ lib.optional sshSupport openssh; SVN_SSH = if sshSupport then "${buildPackages.openssh}/bin/ssh" else null; @@ -49,6 +49,6 @@ stdenvNoCC.mkDerivation { inherit url rev ignoreExternals ignoreKeywords; - impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars; + impureEnvVars = lib.fetchers.proxyImpureEnvVars; inherit preferLocalBuild; } diff --git a/pkgs/build-support/icon-conv-tools/default.nix b/pkgs/build-support/icon-conv-tools/default.nix index 0ea18d8768a..79d3838e688 100644 --- a/pkgs/build-support/icon-conv-tools/default.nix +++ b/pkgs/build-support/icon-conv-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, icoutils }: +{ lib, stdenv, icoutils }: stdenv.mkDerivation { name = "icon-conv-tools-0.0.0"; @@ -23,9 +23,9 @@ stdenv.mkDerivation { dontPatchELF = true; dontStrip = true; - meta = { + meta = with lib; { description = "Tools for icon conversion specific to nix package manager"; - maintainers = with stdenv.lib.maintainers; [ jraygauthier ]; - platforms = with stdenv.lib.platforms; linux; + maintainers = with maintainers; [ jraygauthier ]; + platforms = platforms.linux; }; } diff --git a/pkgs/build-support/kernel/make-initrd.nix b/pkgs/build-support/kernel/make-initrd.nix index 901eb311a88..83d3bb65bae 100644 --- a/pkgs/build-support/kernel/make-initrd.nix +++ b/pkgs/build-support/kernel/make-initrd.nix @@ -56,13 +56,13 @@ in , prepend ? [] # Whether to wrap the initramfs in a u-boot image. -, makeUInitrd ? stdenvNoCC.hostPlatform.platform.kernelTarget == "uImage" +, makeUInitrd ? stdenvNoCC.hostPlatform.linux-kernel.target == "uImage" # If generating a u-boot image, the architecture to use. The default # guess may not align with u-boot's nomenclature correctly, so it can # be overridden. # See https://gitlab.denx.de/u-boot/u-boot/-/blob/9bfb567e5f1bfe7de8eb41f8c6d00f49d2b9a426/common/image.c#L81-106 for a list. -, uInitrdArch ? stdenvNoCC.hostPlatform.kernelArch +, uInitrdArch ? stdenvNoCC.hostPlatform.linuxArch # The name of the compression, as recognised by u-boot. # See https://gitlab.denx.de/u-boot/u-boot/-/blob/9bfb567e5f1bfe7de8eb41f8c6d00f49d2b9a426/common/image.c#L195-204 for a list. @@ -83,7 +83,7 @@ in stdenvNoCC.mkDerivation rec { builder = ./make-initrd.sh; nativeBuildInputs = [ perl cpio ] - ++ stdenvNoCC.lib.optional makeUInitrd ubootTools; + ++ lib.optional makeUInitrd ubootTools; compress = "${_compressorExecutable} ${lib.escapeShellArgs _compressorArgsReal}"; diff --git a/pkgs/build-support/libredirect/default.nix b/pkgs/build-support/libredirect/default.nix index 6e54e2a696c..70da5bf5b5f 100644 --- a/pkgs/build-support/libredirect/default.nix +++ b/pkgs/build-support/libredirect/default.nix @@ -46,8 +46,8 @@ stdenv.mkDerivation { ) ''; - meta = { - platforms = stdenv.lib.platforms.unix; + meta = with lib; { + platforms = platforms.unix; description = "An LD_PRELOAD library to intercept and rewrite the paths in glibc calls"; longDescription = '' libredirect is an LD_PRELOAD library to intercept and rewrite the paths in diff --git a/pkgs/build-support/ocaml/default.nix b/pkgs/build-support/ocaml/default.nix index 3957b955a2c..88ed3dfc2c2 100644 --- a/pkgs/build-support/ocaml/default.nix +++ b/pkgs/build-support/ocaml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, writeText, ocaml, findlib, ocamlbuild, camlp4 }: +{ lib, stdenv, writeText, ocaml, findlib, ocamlbuild, camlp4 }: { name, version, buildInputs ? [], createFindlibDestdir ? true, @@ -14,7 +14,7 @@ let }; in assert minimumSupportedOcamlVersion != null -> - stdenv.lib.versionOlder minimumSupportedOcamlVersion ocaml.version; + lib.versionOlder minimumSupportedOcamlVersion ocaml.version; stdenv.mkDerivation (args // { name = "ocaml-${name}-${version}"; diff --git a/pkgs/build-support/ocaml/dune.nix b/pkgs/build-support/ocaml/dune.nix index fce0096c83d..f9f59b21510 100644 --- a/pkgs/build-support/ocaml/dune.nix +++ b/pkgs/build-support/ocaml/dune.nix @@ -1,11 +1,11 @@ -{ stdenv, ocaml, findlib, dune, dune_2 }: +{ lib, stdenv, ocaml, findlib, dune, dune_2 }: { pname, version, buildInputs ? [], enableParallelBuilding ? true, ... }@args: let Dune = if args.useDune2 or false then dune_2 else dune; in if args ? minimumOCamlVersion && - ! stdenv.lib.versionAtLeast ocaml.version args.minimumOCamlVersion + ! lib.versionAtLeast ocaml.version args.minimumOCamlVersion then throw "${pname}-${version} is not available for OCaml ${ocaml.version}" else diff --git a/pkgs/build-support/ocaml/oasis.nix b/pkgs/build-support/ocaml/oasis.nix index c1d1d699765..ee231a6e258 100644 --- a/pkgs/build-support/ocaml/oasis.nix +++ b/pkgs/build-support/ocaml/oasis.nix @@ -1,4 +1,4 @@ -{ stdenv, ocaml_oasis, ocaml, findlib, ocamlbuild }: +{ lib, stdenv, ocaml_oasis, ocaml, findlib, ocamlbuild }: { pname, version, buildInputs ? [], meta ? { platforms = ocaml.meta.platforms or []; }, minimumOCamlVersion ? null, @@ -8,7 +8,7 @@ }@args: if args ? minimumOCamlVersion && - ! stdenv.lib.versionAtLeast ocaml.version args.minimumOCamlVersion + ! lib.versionAtLeast ocaml.version args.minimumOCamlVersion then throw "${pname}-${version} is not available for OCaml ${ocaml.version}" else diff --git a/pkgs/build-support/pkg-config-wrapper/default.nix b/pkgs/build-support/pkg-config-wrapper/default.nix index e01df107dd1..bbc49d6728c 100644 --- a/pkgs/build-support/pkg-config-wrapper/default.nix +++ b/pkgs/build-support/pkg-config-wrapper/default.nix @@ -2,6 +2,7 @@ # PKG_CONFIG_PATH_FOR_BUILD work properly. { stdenvNoCC +, lib , buildPackages , pkg-config , baseBinName ? "pkg-config" @@ -9,7 +10,7 @@ , extraPackages ? [], extraBuildCommands ? "" }: -with stdenvNoCC.lib; +with lib; let stdenv = stdenvNoCC; @@ -19,7 +20,7 @@ let # # TODO(@Ericson2314) Make unconditional, or optional but always true by # default. - targetPrefix = stdenv.lib.optionalString (targetPlatform != hostPlatform) + targetPrefix = lib.optionalString (targetPlatform != hostPlatform) (targetPlatform.config + "-"); # See description in cc-wrapper. @@ -119,7 +120,7 @@ stdenv.mkDerivation { let pkg-config_ = if pkg-config != null then pkg-config else {}; in (if pkg-config_ ? meta then removeAttrs pkg-config.meta ["priority"] else {}) // { description = - stdenv.lib.attrByPath ["meta" "description"] "pkg-config" pkg-config_ + lib.attrByPath ["meta" "description"] "pkg-config" pkg-config_ + " (wrapper script)"; priority = 10; }; diff --git a/pkgs/build-support/plugins.nix b/pkgs/build-support/plugins.nix index bf8a982a88f..31b478c6c0d 100644 --- a/pkgs/build-support/plugins.nix +++ b/pkgs/build-support/plugins.nix @@ -1,4 +1,4 @@ -{ stdenv }: +{ lib }: # helper functions for packaging programs with plugin systems { @@ -13,7 +13,7 @@ diffPlugins = expectedPlugins: foundPluginsFilePath: '' # sort both lists first plugins_expected=$(mktemp) - (${stdenv.lib.concatMapStrings (s: "echo \"${s}\";") expectedPlugins}) \ + (${lib.concatMapStrings (s: "echo \"${s}\";") expectedPlugins}) \ | sort -u > "$plugins_expected" plugins_found=$(mktemp) sort -u "${foundPluginsFilePath}" > "$plugins_found" diff --git a/pkgs/build-support/release/ant-build.nix b/pkgs/build-support/release/ant-build.nix index 2d24d5bd704..996f4f45d07 100644 --- a/pkgs/build-support/release/ant-build.nix +++ b/pkgs/build-support/release/ant-build.nix @@ -1,5 +1,6 @@ { src , pkgs +, lib , stdenv ? pkgs.stdenv , name , antTargets ? [] @@ -16,8 +17,7 @@ , ... } @ args: let - antFlags = "-f ${buildfile} " + stdenv.lib.concatMapStrings ({name, value}: "-D${name}=${value} " ) antProperties ; - lib = stdenv.lib; + antFlags = "-f ${buildfile} " + lib.concatMapStrings ({name, value}: "-D${name}=${value} " ) antProperties ; in stdenv.mkDerivation ( @@ -31,7 +31,7 @@ stdenv.mkDerivation ( prePhases = ["antSetupPhase"]; - antSetupPhase = with stdenv.lib; '' + antSetupPhase = with lib; '' if test "$hydraAntLogger" != "" ; then export ANT_ARGS="-logger org.hydra.ant.HydraLogger -lib `ls $hydraAntLogger/share/java/*.jar | head -1`" fi @@ -46,7 +46,7 @@ stdenv.mkDerivation ( mkdir -p $out/share/java ${ if jars == [] then '' find . -name "*.jar" | xargs -I{} cp -v {} $out/share/java - '' else stdenv.lib.concatMapStrings (j: '' + '' else lib.concatMapStrings (j: '' cp -v ${j} $out/share/java '') jars } @@ -65,7 +65,7 @@ stdenv.mkDerivation ( in '' header "Generating jar wrappers" - '' + (stdenv.lib.concatMapStrings (w: '' + '' + (lib.concatMapStrings (w: '' mkdir -p $out/bin cat >> $out/bin/${w.name} <<EOF @@ -85,7 +85,7 @@ stdenv.mkDerivation ( header "Building default ant target" ant ${antFlags} closeNest - '' else stdenv.lib.concatMapStrings (t: '' + '' else lib.concatMapStrings (t: '' header "Building '${t}' target" ant ${antFlags} ${t} closeNest @@ -103,12 +103,12 @@ stdenv.mkDerivation ( ''; } - // removeAttrs args ["antProperties" "buildInputs" "pkgs" "jarWrappers"] // + // removeAttrs args ["antProperties" "buildInputs" "pkgs" "lib" "jarWrappers"] // { name = name + (if src ? version then "-" + src.version else ""); - buildInputs = [ant jre zip unzip] ++ stdenv.lib.optional (args ? buildInputs) args.buildInputs ; + buildInputs = [ant jre zip unzip] ++ lib.optional (args ? buildInputs) args.buildInputs ; postHook = '' mkdir -p $out/nix-support diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/build-support/release/debian-build.nix index dfa896a86a6..2544d5c740c 100644 --- a/pkgs/build-support/release/debian-build.nix +++ b/pkgs/build-support/release/debian-build.nix @@ -2,8 +2,9 @@ # that contains a Debian-like (i.e. dpkg-based) OS. { name ? "debian-build" +, lib , diskImage -, src, stdenv, vmTools, checkinstall +, src, lib, stdenv, vmTools, checkinstall , fsTranslation ? false , # Features provided by this package. debProvides ? [] @@ -11,8 +12,6 @@ debRequires ? [] , ... } @ args: -with stdenv.lib; - vmTools.runInLinuxImage (stdenv.mkDerivation ( { @@ -59,8 +58,8 @@ vmTools.runInLinuxImage (stdenv.mkDerivation ( export PAGER=cat ${checkinstall}/sbin/checkinstall --nodoc -y -D \ --fstrans=${if fsTranslation then "yes" else "no"} \ - --requires="${concatStringsSep "," debRequires}" \ - --provides="${concatStringsSep "," debProvides}" \ + --requires="${lib.concatStringsSep "," debRequires}" \ + --provides="${lib.concatStringsSep "," debProvides}" \ ${if (src ? version) then "--pkgversion=$(echo ${src.version} | tr _ -)" else "--pkgversion=0.0.0"} \ ''${debMaintainer:+--maintainer="'$debMaintainer'"} \ diff --git a/pkgs/build-support/release/default.nix b/pkgs/build-support/release/default.nix index 6aaa0338f0c..83f755b2bec 100644 --- a/pkgs/build-support/release/default.nix +++ b/pkgs/build-support/release/default.nix @@ -1,4 +1,4 @@ -{ pkgs }: +{ lib, pkgs }: with pkgs; @@ -15,7 +15,7 @@ rec { } // args); antBuild = args: import ./ant-build.nix ( - { inherit pkgs; + { inherit lib pkgs; } // args); mvnBuild = args: import ./maven-build.nix ( @@ -23,7 +23,7 @@ rec { } // args); nixBuild = args: import ./nix-build.nix ( - { inherit stdenv; + { inherit lib stdenv; } // args); coverageAnalysis = args: nixBuild ( @@ -46,7 +46,7 @@ rec { } // args); debBuild = args: import ./debian-build.nix ( - { inherit stdenv vmTools checkinstall; + { inherit lib stdenv vmTools checkinstall; } // args); aggregate = @@ -94,7 +94,7 @@ rec { phases = [ "unpackPhase" "patchPhase" "installPhase" ]; - patchPhase = stdenv.lib.optionalString isNixOS '' + patchPhase = lib.optionalString isNixOS '' touch .update-on-nixos-rebuild ''; diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix index feda54de46f..97df52eaced 100644 --- a/pkgs/build-support/release/nix-build.nix +++ b/pkgs/build-support/release/nix-build.nix @@ -12,7 +12,7 @@ , doCoverityAnalysis ? false , lcovFilter ? [] , lcovExtraTraceFiles ? [] -, src, stdenv +, src, lib, stdenv , name ? if doCoverageAnalysis then "nix-coverage" else "nix-build" , failureHook ? null , prePhases ? [] @@ -69,7 +69,7 @@ stdenv.mkDerivation ( fi ''; - failureHook = (stdenv.lib.optionalString (failureHook != null) failureHook) + + failureHook = (lib.optionalString (failureHook != null) failureHook) + '' if test -n "$succeedOnFailure"; then if test -n "$keepBuildDirectory"; then @@ -136,10 +136,10 @@ stdenv.mkDerivation ( buildInputs = buildInputs ++ - (stdenv.lib.optional doCoverageAnalysis args.makeGCOVReport) ++ - (stdenv.lib.optional doClangAnalysis args.clang-analyzer) ++ - (stdenv.lib.optional doCoverityAnalysis args.cov-build) ++ - (stdenv.lib.optional doCoverityAnalysis args.xz); + (lib.optional doCoverageAnalysis args.makeGCOVReport) ++ + (lib.optional doClangAnalysis args.clang-analyzer) ++ + (lib.optional doCoverityAnalysis args.cov-build) ++ + (lib.optional doCoverityAnalysis args.xz); lcovFilter = ["/nix/store/*"] ++ lcovFilter; diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix index 4ff8640c2ff..3d2dc3733c2 100644 --- a/pkgs/build-support/rust/default-crate-overrides.nix +++ b/pkgs/build-support/rust/default-crate-overrides.nix @@ -1,4 +1,4 @@ -{ stdenv, pkg-config, curl, darwin, libiconv, libgit2, libssh2, +{ lib, stdenv, pkg-config, curl, darwin, libiconv, libgit2, libssh2, openssl, sqlite, zlib, dbus, dbus-glib, gdk-pixbuf, cairo, python3, libsodium, postgresql, gmp, foundationdb, capnproto, nettle, clang, llvmPackages, ... }: @@ -17,7 +17,7 @@ in cargo = attrs: { buildInputs = [ openssl zlib curl ] - ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv ]; + ++ lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv ]; }; libz-sys = attrs: { @@ -149,7 +149,7 @@ in }; serde_derive = attrs: { - buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.isDarwin Security; }; thrussh-libsodium = attrs: { diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 9e8e32035d0..dc86a7dc581 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -1,4 +1,5 @@ { stdenv +, lib , buildPackages , cacert , cargo @@ -83,13 +84,13 @@ let cargoDepsCopy="$sourceRoot/${cargoVendorDir}" ''; - targetIsJSON = stdenv.lib.hasSuffix ".json" target; + targetIsJSON = lib.hasSuffix ".json" target; useSysroot = targetIsJSON && !__internal_dontAddSysroot; # see https://github.com/rust-lang/cargo/blob/964a16a28e234a3d397b2a7031d4ab4a428b1391/src/cargo/core/compiler/compile_kind.rs#L151-L168 # the "${}" is needed to transform the path into a /nix/store path before baseNameOf shortTarget = if targetIsJSON then - (stdenv.lib.removeSuffix ".json" (builtins.baseNameOf "${target}")) + (lib.removeSuffix ".json" (builtins.baseNameOf "${target}")) else target; sysroot = (callPackage ./sysroot {}) { @@ -116,7 +117,7 @@ in # See https://os.phil-opp.com/testing/ for more information. assert useSysroot -> !(args.doCheck or true); -stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // stdenv.lib.optionalAttrs useSysroot { +stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // lib.optionalAttrs useSysroot { RUSTFLAGS = "--sysroot ${sysroot} " + (args.RUSTFLAGS or ""); } // { inherit cargoDeps; @@ -124,7 +125,7 @@ stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // stdenv.lib.optional patchRegistryDeps = ./patch-registry-deps; nativeBuildInputs = nativeBuildInputs ++ [ cacert git cargo rustc ]; - buildInputs = buildInputs ++ stdenv.lib.optional stdenv.hostPlatform.isMinGW windows.pthreads; + buildInputs = buildInputs ++ lib.optional stdenv.hostPlatform.isMinGW windows.pthreads; patches = cargoPatches ++ patches; @@ -147,11 +148,11 @@ stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // stdenv.lib.optional cat >> .cargo/config <<'EOF' [target."${rust.toRustTarget stdenv.buildPlatform}"] "linker" = "${ccForBuild}" - ${stdenv.lib.optionalString (stdenv.buildPlatform.config != stdenv.hostPlatform.config) '' + ${lib.optionalString (stdenv.buildPlatform.config != stdenv.hostPlatform.config) '' [target."${shortTarget}"] "linker" = "${ccForHost}" ${# https://github.com/rust-lang/rust/issues/46651#issuecomment-433611633 - stdenv.lib.optionalString (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isAarch64) '' + lib.optionalString (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isAarch64) '' "rustflags" = [ "-C", "target-feature=+crt-static", "-C", "link-arg=-lgcc" ] ''} ''} @@ -163,7 +164,7 @@ stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // stdenv.lib.optional # After unpacking and applying patches, check that the Cargo.lock matches our # src package. Note that we do this after the patchPhase, because the # patchPhase may create the Cargo.lock if upstream has not shipped one. - postPatch = (args.postPatch or "") + stdenv.lib.optionalString validateCargoDeps '' + postPatch = (args.postPatch or "") + lib.optionalString validateCargoDeps '' cargoDepsLockfile=$NIX_BUILD_TOP/$cargoDepsCopy/Cargo.lock srcLockfile=$NIX_BUILD_TOP/$sourceRoot/Cargo.lock @@ -206,7 +207,7 @@ stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // stdenv.lib.optional ''; buildPhase = with builtins; args.buildPhase or '' - ${stdenv.lib.optionalString (buildAndTestSubdir != null) "pushd ${buildAndTestSubdir}"} + ${lib.optionalString (buildAndTestSubdir != null) "pushd ${buildAndTestSubdir}"} runHook preBuild ( @@ -217,14 +218,14 @@ stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // stdenv.lib.optional "CC_${rust.toRustTarget stdenv.hostPlatform}"="${ccForHost}" \ "CXX_${rust.toRustTarget stdenv.hostPlatform}"="${cxxForHost}" \ cargo build -j $NIX_BUILD_CORES \ - ${stdenv.lib.optionalString (buildType == "release") "--release"} \ + ${lib.optionalString (buildType == "release") "--release"} \ --target ${target} \ --frozen ${concatStringsSep " " cargoBuildFlags} ) runHook postBuild - ${stdenv.lib.optionalString (buildAndTestSubdir != null) "popd"} + ${lib.optionalString (buildAndTestSubdir != null) "popd"} # This needs to be done after postBuild: packages like `cargo` do a pushd/popd in # the pre/postBuild-hooks that need to be taken into account before gathering @@ -238,15 +239,15 @@ stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // stdenv.lib.optional ''; checkPhase = args.checkPhase or (let - argstr = "${stdenv.lib.optionalString (checkType == "release") "--release"} --target ${target} --frozen"; + argstr = "${lib.optionalString (checkType == "release") "--release"} --target ${target} --frozen"; threads = if cargoParallelTestThreads then "$NIX_BUILD_CORES" else "1"; in '' - ${stdenv.lib.optionalString (buildAndTestSubdir != null) "pushd ${buildAndTestSubdir}"} + ${lib.optionalString (buildAndTestSubdir != null) "pushd ${buildAndTestSubdir}"} runHook preCheck echo "Running cargo test ${argstr} -- ''${checkFlags} ''${checkFlagsArray+''${checkFlagsArray[@]}}" cargo test -j $NIX_BUILD_CORES ${argstr} -- --test-threads=${threads} ''${checkFlags} ''${checkFlagsArray+"''${checkFlagsArray[@]}"} runHook postCheck - ${stdenv.lib.optionalString (buildAndTestSubdir != null) "popd"} + ${lib.optionalString (buildAndTestSubdir != null) "popd"} ''); doCheck = args.doCheck or true; diff --git a/pkgs/build-support/rust/fetchCargoTarball.nix b/pkgs/build-support/rust/fetchCargoTarball.nix index 0726e5cfa5a..c30e88d99b8 100644 --- a/pkgs/build-support/rust/fetchCargoTarball.nix +++ b/pkgs/build-support/rust/fetchCargoTarball.nix @@ -1,4 +1,4 @@ -{ stdenv, cacert, git, cargo, python3 }: +{ lib, stdenv, cacert, git, cargo, python3 }: let cargo-vendor-normalise = stdenv.mkDerivation { name = "cargo-vendor-normalise"; src = ./cargo-vendor-normalise.py; @@ -80,7 +80,7 @@ in stdenv.mkDerivation ({ inherit (hash_) outputHashAlgo outputHash; - impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars; + impureEnvVars = lib.fetchers.proxyImpureEnvVars; } // (builtins.removeAttrs args [ "name" "sha256" "cargoUpdateHook" ])) diff --git a/pkgs/build-support/singularity-tools/default.nix b/pkgs/build-support/singularity-tools/default.nix index 4a54498d117..318f5b430fe 100644 --- a/pkgs/build-support/singularity-tools/default.nix +++ b/pkgs/build-support/singularity-tools/default.nix @@ -1,4 +1,5 @@ { runCommand +, lib , stdenv , storeDir ? builtins.storeDir , writeScript @@ -64,7 +65,7 @@ rec { mkdir proc sys dev # Run root script - ${stdenv.lib.optionalString (runAsRoot != null) '' + ${lib.optionalString (runAsRoot != null) '' mkdir -p ./${storeDir} mount --rbind ${storeDir} ./${storeDir} unshare -imnpuf --mount-proc chroot ./ ${runAsRootFile} diff --git a/pkgs/build-support/skaware/build-skaware-package.nix b/pkgs/build-support/skaware/build-skaware-package.nix index e6e2e35789b..7a5db942b2c 100644 --- a/pkgs/build-support/skaware/build-skaware-package.nix +++ b/pkgs/build-support/skaware/build-skaware-package.nix @@ -1,6 +1,5 @@ -{ stdenv, cleanPackaging, fetchurl }: -let lib = stdenv.lib; -in { +{ lib, stdenv, cleanPackaging, fetchurl }: +{ # : string pname # : string @@ -98,7 +97,7 @@ in stdenv.mkDerivation { meta = { homepage = "https://skarnet.org/software/${pname}/"; inherit description platforms; - license = stdenv.lib.licenses.isc; + license = lib.licenses.isc; maintainers = with lib.maintainers; [ pmahoney Profpatsch ] ++ maintainers; }; diff --git a/pkgs/build-support/skaware/clean-packaging.nix b/pkgs/build-support/skaware/clean-packaging.nix index 762fe25c0ac..d51cbec8aeb 100644 --- a/pkgs/build-support/skaware/clean-packaging.nix +++ b/pkgs/build-support/skaware/clean-packaging.nix @@ -3,12 +3,12 @@ # files were either discarded or moved to outputs. # This ensures nothing is forgotten and new files # are correctly handled on update. -{ stdenv, file, writeScript }: +{ lib, stdenv, file, writeScript }: let - globWith = stdenv.lib.concatMapStringsSep "\n"; + globWith = lib.concatMapStringsSep "\n"; rmNoise = noiseGlobs: globWith (f: - ''rm -rf ${f}'') noiseGlobs; + "rm -rf ${f}") noiseGlobs; mvDoc = docGlobs: globWith (f: ''mv ${f} "$DOCDIR" 2>/dev/null || true'') docGlobs; diff --git a/pkgs/build-support/substitute-files/substitute-all-files.nix b/pkgs/build-support/substitute-files/substitute-all-files.nix index 66feb695c41..682e976dcfe 100644 --- a/pkgs/build-support/substitute-files/substitute-all-files.nix +++ b/pkgs/build-support/substitute-files/substitute-all-files.nix @@ -1,10 +1,10 @@ -{ stdenv }: +{ lib, stdenv }: args: stdenv.mkDerivation ({ name = if args ? name then args.name else baseNameOf (toString args.src); - builder = with stdenv.lib; builtins.toFile "builder.sh" '' + builder = builtins.toFile "builder.sh" '' source $stdenv/setup set -o pipefail @@ -13,7 +13,7 @@ stdenv.mkDerivation ({ args= pushd "$src" - echo -ne "${concatStringsSep "\\0" args.files}" | xargs -0 -n1 -I {} -- find {} -type f -print0 | while read -d "" line; do + echo -ne "${lib.concatStringsSep "\\0" args.files}" | xargs -0 -n1 -I {} -- find {} -type f -print0 | while read -d "" line; do mkdir -p "$out/$(dirname "$line")" substituteAll "$line" "$out/$line" done diff --git a/pkgs/build-support/templaterpm/default.nix b/pkgs/build-support/templaterpm/default.nix index 0f7acc13277..ffe5b0b4581 100644 --- a/pkgs/build-support/templaterpm/default.nix +++ b/pkgs/build-support/templaterpm/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Create templates of nix expressions from RPM .spec files"; maintainers = with maintainers; [ tstrobel ]; - platforms = with stdenv.lib.platforms; unix; + platforms = platforms.unix; hydraPlatforms = []; }; } diff --git a/pkgs/build-support/templaterpm/nix-template-rpm.py b/pkgs/build-support/templaterpm/nix-template-rpm.py index f39595f8977..db8c0f2064c 100755 --- a/pkgs/build-support/templaterpm/nix-template-rpm.py +++ b/pkgs/build-support/templaterpm/nix-template-rpm.py @@ -229,26 +229,26 @@ class SPECTemplate(object): @property def meta(self): - out = ' meta = {\n' + out = ' meta = with lib; {\n' out += ' homepage = ' + self.spec.sourceHeader['url'] + ';\n' out += ' description = "' + self.spec.sourceHeader['summary'] + '";\n' - out += ' license = stdenv.lib.licenses.' + self.spec.sourceHeader['license'] + ';\n' + out += ' license = lib.licenses.' + self.spec.sourceHeader['license'] + ';\n' out += ' platforms = [ "i686-linux" "x86_64-linux" ];\n' - out += ' maintainers = with stdenv.lib.maintainers; [ ' + self.maintainer + ' ];\n' + out += ' maintainers = with lib.maintainers; [ ' + self.maintainer + ' ];\n' out += ' };\n' out += '}\n' return out def __str__(self): - head = '{stdenv, fetchurl, ' + ', '.join(self.getBuildInputs("ALL")) + '}:\n\n' + head = '{lib, stdenv, fetchurl, ' + ', '.join(self.getBuildInputs("ALL")) + '}:\n\n' head += 'stdenv.mkDerivation {\n' body = [ self.name, self.src, self.patch, self.buildInputs, self.configure, self.build, self.ocamlExtra, self.install, self.meta ] return head + '\n'.join(body) def getTemplate(self): - head = '{stdenv, buildRoot, fetchurl, ' + ', '.join(self.getBuildInputs("ALL")) + '}:\n\n' + head = '{lib, stdenv, buildRoot, fetchurl, ' + ', '.join(self.getBuildInputs("ALL")) + '}:\n\n' head += 'let\n' head += ' buildRootInput = (import "${buildRoot}/usr/share/buildroot/buildRootInput.nix") { fetchurl=fetchurl; buildRoot=buildRoot; };\n' head += 'in\n\n' diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 5f3c7e1d621..759245aed1a 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1,6 +1,7 @@ -{ pkgs +{ lib +, pkgs , kernel ? pkgs.linux -, img ? pkgs.stdenv.hostPlatform.platform.kernelTarget +, img ? pkgs.stdenv.hostPlatform.linux-kernel.target , storeDir ? builtins.storeDir , rootModules ? [ "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_balloon" "virtio_rng" "ext4" "unix" "9p" "9pnet_virtio" "crc32c_generic" ] @@ -572,7 +573,7 @@ rec { buildCommand = '' ${createRootFS} - PATH=$PATH:${stdenv.lib.makeBinPath [ dpkg dpkg glibc lzma ]} + PATH=$PATH:${lib.makeBinPath [ dpkg dpkg glibc lzma ]} # Unpack the .debs. We do this to prevent pre-install scripts # (which have lots of circular dependencies) from barfing. diff --git a/pkgs/build-support/writers/default.nix b/pkgs/build-support/writers/default.nix index 89edbd513d5..f853f37fec6 100644 --- a/pkgs/build-support/writers/default.nix +++ b/pkgs/build-support/writers/default.nix @@ -122,7 +122,7 @@ rec { pkgs.coreutils pkgs.findutils pkgs.gcc - pkgs.pkgconfig + pkgs.pkg-config ]} export PKG_CONFIG_PATH=${concatMapStringsSep ":" (pkg: "${pkg}/lib/pkgconfig") libraries} gcc \ diff --git a/pkgs/build-support/writers/test.nix b/pkgs/build-support/writers/test.nix index 0febad2929a..7b7a698376a 100644 --- a/pkgs/build-support/writers/test.nix +++ b/pkgs/build-support/writers/test.nix @@ -196,7 +196,7 @@ let in runCommand "test-writers" { passthru = { inherit writeTest bin simple; }; - meta.platforms = stdenv.lib.platforms.all; + meta.platforms = lib.platforms.all; } '' ${lib.concatMapStringsSep "\n" (test: writeTest "success" "${test}/bin/test_writers") (lib.attrValues bin)} ${lib.concatMapStringsSep "\n" (test: writeTest "success" test) (lib.attrValues simple)} diff --git a/pkgs/common-updater/scripts.nix b/pkgs/common-updater/scripts.nix index 739f44387b3..351db619884 100644 --- a/pkgs/common-updater/scripts.nix +++ b/pkgs/common-updater/scripts.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, coreutils, gnused, gnugrep, diffutils, nix, git, jq }: +{ lib, stdenv, makeWrapper, coreutils, gnused, gnugrep, diffutils, nix, git, jq }: stdenv.mkDerivation { name = "common-updater-scripts"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { cp ${./scripts}/* $out/bin for f in $out/bin/*; do - wrapProgram $f --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gnused gnugrep nix diffutils git jq ]} + wrapProgram $f --prefix PATH : ${lib.makeBinPath [ coreutils gnused gnugrep nix diffutils git jq ]} done ''; } diff --git a/pkgs/common-updater/unstable-updater.nix b/pkgs/common-updater/unstable-updater.nix index 94cd33b9a26..d315c1027ab 100644 --- a/pkgs/common-updater/unstable-updater.nix +++ b/pkgs/common-updater/unstable-updater.nix @@ -1,5 +1,4 @@ -{ stdenv -, writeShellScript +{ writeShellScript , coreutils , git , nix diff --git a/pkgs/data/documentation/anarchism/default.nix b/pkgs/data/documentation/anarchism/default.nix index 8f95a371ae2..d0cda3da544 100644 --- a/pkgs/data/documentation/anarchism/default.nix +++ b/pkgs/data/documentation/anarchism/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, xdg_utils }: +{ lib, stdenv, fetchFromGitLab, xdg-utils }: stdenv.mkDerivation rec { pname = "anarchism"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace debian/anarchism.desktop \ - --replace "/usr/bin/xdg-open" "${xdg_utils}/bin/xdg-open" + --replace "/usr/bin/xdg-open" "${xdg-utils}/bin/xdg-open" substituteInPlace debian/anarchism.desktop \ --replace "file:///usr" "file://$out" ''; diff --git a/pkgs/data/documentation/gnome-user-docs/default.nix b/pkgs/data/documentation/gnome-user-docs/default.nix index 30f8d736d32..ebd171c6545 100644 --- a/pkgs/data/documentation/gnome-user-docs/default.nix +++ b/pkgs/data/documentation/gnome-user-docs/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { version = "3.38.2"; src = fetchurl { - url = "mirror://gnome/sources/gnome-user-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-user-docs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1h9lyn80zccmgi6gpymabgrcj7km0sb1axll5z490qnx74xbn37m"; }; diff --git a/pkgs/data/documentation/man-pages-posix/default.nix b/pkgs/data/documentation/man-pages-posix/default.nix index 8a76bcb2c44..a65b176f88f 100644 --- a/pkgs/data/documentation/man-pages-posix/default.nix +++ b/pkgs/data/documentation/man-pages-posix/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { name = "man-pages-posix-2013-a"; @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { meta = { description = "POSIX man-pages (0p, 1p, 3p)"; homepage = "https://www.kernel.org/doc/man-pages/"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/data/documentation/rnrs/common.nix b/pkgs/data/documentation/rnrs/common.nix index 3443846c83c..7ba5fe07450 100644 --- a/pkgs/data/documentation/rnrs/common.nix +++ b/pkgs/data/documentation/rnrs/common.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { buildInputs = [ texinfo ]; - # Tell the builder about the name of the report. + # Tell the builder about the name of the report. reportName = name; builder = ./builder.sh; diff --git a/pkgs/data/documentation/scheme-manpages/default.nix b/pkgs/data/documentation/scheme-manpages/default.nix index 2915430d9f2..e9fa1b7e4f4 100644 --- a/pkgs/data/documentation/scheme-manpages/default.nix +++ b/pkgs/data/documentation/scheme-manpages/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "scheme-manpages-unstable"; - version = "2020-08-14"; + version = "2021-01-17"; src = fetchFromGitHub { owner = "schemedoc"; repo = "manpages"; - rev = "2e99a0aea9c0327e3c2dcfb9b7a2f8f528b4fe43"; - sha256 = "0ykj4i8mx50mgyz9q63glfnc0mw1lf89hwsflpnbizjda5b4s0fp"; + rev = "817798ccca81424e797fda0e218d53a95f50ded7"; + sha256 = "1amc0dmliz2a37pivlkx88jbc08ypfiwv3z477znx8khhc538glk"; }; dontBuild = true; diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix index 7543672f7d0..8c806b87d4b 100644 --- a/pkgs/data/documentation/zeal/default.nix +++ b/pkgs/data/documentation/zeal/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, extra-cmake-modules, pkgconfig +{ lib, fetchFromGitHub, cmake, extra-cmake-modules, pkg-config , qtbase, qtimageformats, qtwebengine, qtx11extras, mkDerivation , libarchive, libXdmcp, libpthreadstubs, xcbutilkeysyms }: @@ -22,7 +22,7 @@ mkDerivation rec { -e 's@^project.*@project(Zeal VERSION ${version})@' ''; - nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig ]; + nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ]; buildInputs = [ qtbase qtimageformats qtwebengine qtx11extras diff --git a/pkgs/data/fonts/3270font/default.nix b/pkgs/data/fonts/3270font/default.nix index a972bd7c3d8..dacfdfbccea 100644 --- a/pkgs/data/fonts/3270font/default.nix +++ b/pkgs/data/fonts/3270font/default.nix @@ -1,24 +1,25 @@ { lib, fetchzip }: let - version = "2.1.0"; + version = "2.2.1"; in fetchzip { name = "3270font-${version}"; - url = "https://github.com/rbanffy/3270font/releases/download/v.${version}/3270_fonts_fba25eb.zip"; + url = "https://github.com/rbanffy/3270font/releases/download/v${version}/3270_fonts_70de9c7.zip"; - sha256 = "04xqgiznd6d3c1rdbbdmd87rjy9bnhh00lm8xzmal1zidcr2g0n9"; + sha256 = "0spz9abp87r3bncjim6hs47fmhg86qbgips4x6nfpqzg5qh2xd2m"; postFetch = '' mkdir -p $out/share/fonts/ unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*.woff -d $out/share/fonts/woff + unzip -j $downloadedFile \*.afm -d $out/share/fonts/type1 ''; meta = with lib; { description = "Monospaced font based on IBM 3270 terminals"; homepage = "https://github.com/rbanffy/3270font"; + changelog = "https://github.com/rbanffy/3270font/blob/v${version}/CHANGELOG.md"; license = [ licenses.bsd3 licenses.ofl ]; maintainers = [ maintainers.marsam ]; platforms = platforms.all; diff --git a/pkgs/data/fonts/cantarell-fonts/default.nix b/pkgs/data/fonts/cantarell-fonts/default.nix index 4c3459d0f11..5129cf27188 100644 --- a/pkgs/data/fonts/cantarell-fonts/default.nix +++ b/pkgs/data/fonts/cantarell-fonts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, gettext, appstream-glib, gnome3 }: +{ lib, stdenv, fetchurl, meson, ninja, gettext, appstream-glib, gnome3 }: let pname = "cantarell-fonts"; @@ -7,7 +7,7 @@ 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}/${lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "05hpnhihwm9sxlq1qn993g03pwkmpjbn0dvnba71r1gfjv0jp2w5"; }; @@ -31,8 +31,8 @@ in stdenv.mkDerivation rec { meta = { description = "Default typeface used in the user interface of GNOME since version 3.0"; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.ofl; - maintainers = with stdenv.lib.maintainers; [ ]; + platforms = lib.platforms.all; + license = lib.licenses.ofl; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/data/fonts/dejavu-fonts/default.nix b/pkgs/data/fonts/dejavu-fonts/default.nix index 839cb80a6b9..aed90b103b4 100644 --- a/pkgs/data/fonts/dejavu-fonts/default.nix +++ b/pkgs/data/fonts/dejavu-fonts/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, fontforge, perl, perlPackages }: +{ fetchFromGitHub, lib, stdenv, fontforge, perl, perlPackages }: let version = "2.37"; @@ -18,9 +18,9 @@ let # Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved. # DejaVu changes are in public domain # See http://dejavu-fonts.org/wiki/License for details - license = stdenv.lib.licenses.free; + license = lib.licenses.free; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; full-ttf = stdenv.mkDerivation { @@ -31,7 +31,7 @@ let src = fetchFromGitHub { owner = "dejavu-fonts"; repo = "dejavu-fonts"; - rev = "version_${stdenv.lib.replaceStrings ["."] ["_"] version}"; + rev = "version_${lib.replaceStrings ["."] ["_"] version}"; sha256 = "1xknlg2h287dx34v2n5r33bpcl4biqf0cv7nak657rjki7s0k4bk"; }; diff --git a/pkgs/data/fonts/et-book/default.nix b/pkgs/data/fonts/et-book/default.nix index e7d97b77707..c410826b2fb 100644 --- a/pkgs/data/fonts/et-book/default.nix +++ b/pkgs/data/fonts/et-book/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, fetchFromGitHub }: fetchFromGitHub rec { rev = "7e8f02dadcc23ba42b491b39e5bdf16e7b383031"; diff --git a/pkgs/data/fonts/fira-code/default.nix b/pkgs/data/fonts/fira-code/default.nix index 546c7d905a7..d5c5d0e000a 100644 --- a/pkgs/data/fonts/fira-code/default.nix +++ b/pkgs/data/fonts/fira-code/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip }: +{ lib, fetchzip }: let version = "5.2"; diff --git a/pkgs/data/fonts/fira-code/symbols.nix b/pkgs/data/fonts/fira-code/symbols.nix index 2e4cfc8f05b..e226c351a33 100644 --- a/pkgs/data/fonts/fira-code/symbols.nix +++ b/pkgs/data/fonts/fira-code/symbols.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip }: +{ lib, fetchzip }: fetchzip { name = "fira-code-symbols-20160811"; diff --git a/pkgs/data/fonts/fira-mono/default.nix b/pkgs/data/fonts/fira-mono/default.nix index 37f285b5552..2aef2fc4b05 100644 --- a/pkgs/data/fonts/fira-mono/default.nix +++ b/pkgs/data/fonts/fira-mono/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip }: +{ lib, fetchzip }: fetchzip { name = "fira-mono-3.206"; diff --git a/pkgs/data/fonts/fixedsys-excelsior/default.nix b/pkgs/data/fonts/fixedsys-excelsior/default.nix index 4222b802d55..8bdbc2d4c4f 100644 --- a/pkgs/data/fonts/fixedsys-excelsior/default.nix +++ b/pkgs/data/fonts/fixedsys-excelsior/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl } : +{ lib, fetchurl } : let major = "3"; @@ -23,8 +23,8 @@ in fetchurl rec { meta = { description = "Pan-unicode version of Fixedsys, a classic DOS font"; homepage = "http://www.fixedsysexcelsior.com/"; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.publicDomain; - maintainers = [ stdenv.lib.maintainers.ninjatrappeur ]; + platforms = lib.platforms.all; + license = lib.licenses.publicDomain; + maintainers = [ lib.maintainers.ninjatrappeur ]; }; } diff --git a/pkgs/data/fonts/go-font/default.nix b/pkgs/data/fonts/go-font/default.nix index b2225f5b49b..ed17dfc9054 100644 --- a/pkgs/data/fonts/go-font/default.nix +++ b/pkgs/data/fonts/go-font/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit }: +{ lib, fetchgit }: let version = "2017-03-30"; @@ -22,7 +22,7 @@ in (fetchgit { description = "The Go font family"; license = licenses.bsd3; maintainers = with maintainers; [ sternenseemann ]; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; hydraPlatforms = []; }; } diff --git a/pkgs/data/fonts/google-fonts/default.nix b/pkgs/data/fonts/google-fonts/default.nix index 0fac2a67bb8..210902a0e71 100644 --- a/pkgs/data/fonts/google-fonts/default.nix +++ b/pkgs/data/fonts/google-fonts/default.nix @@ -1,16 +1,18 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib +, stdenv +, fetchFromGitHub }: stdenv.mkDerivation { pname = "google-fonts"; - version = "2019-07-14"; + version = "unstable-2021-01-19"; outputs = [ "out" "adobeBlank" ]; src = fetchFromGitHub { owner = "google"; repo = "fonts"; - rev = "f113126dc4b9b1473d9354a86129c9d7b837aa1a"; - sha256 = "0safw5prpa63mqcyfw3gr3a535w4c9hg5ayw5pkppiwil7n3pyxs"; + rev = "a3a831f0fe44cd58465c6937ea06873728f2ba0d"; + sha256 = "19abx2bj7mkysv2ihr43m3kpyf6kv6v2qjlm1skxc82rb72xqhix"; }; phases = [ "unpackPhase" "patchPhase" "installPhase" ]; @@ -21,18 +23,9 @@ stdenv.mkDerivation { # directories. This causes non-determinism in the install since # the installation order of font files with the same name is not # fixed. - rm -rv ofl/alefhebrew \ - ofl/misssaintdelafield \ - ofl/mrbedford \ - ofl/siamreap \ - ofl/terminaldosislight - - # See comment above, the structure of these is a bit odd - # We keep the ofl/<font>/static/ variants - rm -rv ofl/comfortaa/*.ttf \ - ofl/mavenpro/*.ttf \ - ofl/muli/*.ttf \ - ofl/oswald/*.ttf + rm -rv ofl/cabincondensed \ + ofl/signikanegative \ + ofl/signikanegativesc if find . -name "*.ttf" | sed 's|.*/||' | sort | uniq -c | sort -n | grep -v '^.*1 '; then echo "error: duplicate font names" diff --git a/pkgs/data/fonts/inconsolata/default.nix b/pkgs/data/fonts/inconsolata/default.nix index f064b4f6192..530bb0380d2 100644 --- a/pkgs/data/fonts/inconsolata/default.nix +++ b/pkgs/data/fonts/inconsolata/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { inherit (google-fonts) src version; installPhase = '' - install -m644 --target $out/share/fonts/truetype/inconsolata -D $src/ofl/inconsolata/*.ttf + install -m644 --target $out/share/fonts/truetype/inconsolata -D $src/ofl/inconsolata/static/*.ttf ''; meta = with lib; { diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index b86460a50fd..f3bd8dab013 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -10,7 +10,7 @@ let (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ])); in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "4.3.0"; + version = "4.4.0"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix index d86f1ea3cfd..6b6cd00f49a 100644 --- a/pkgs/data/fonts/iosevka/variants.nix +++ b/pkgs/data/fonts/iosevka/variants.nix @@ -1,24 +1,24 @@ # This file was autogenerated. DO NOT EDIT! { - iosevka = "1m4qkn1abj6a9famy5cvnl9xk7690mglpj358xg01fnkmrm8ayzf"; - iosevka-aile = "0ry949kdnxlahg9a2qn758klb9yvv2wniwadb4hj2xz65zzfyv7i"; - iosevka-curly = "08ac8xprk3sq8lvgxlxp1z19bx0ndr7ga17kzxlqd4r96qjgab0p"; - iosevka-curly-slab = "1zmihfk32clp4ajywg9w6pbq3dh068s9d4bxzpgvicsfvbl04irk"; - iosevka-etoile = "09bk4myxg51m9xfyrljxm4r7gq1361x2yzlik99qp5anpxflf2jf"; - iosevka-slab = "10x6wwcicwy7rawrg563l5qfbp6vsaim82q3ifd6zqxxc71m33yd"; - iosevka-sparkle = "1f59j1cs11gabrk3m78bay96jpwz7lfc8z34ns9kx4bd43w0xnkx"; - iosevka-ss01 = "1kvsgghqc04mdqmbn2c98yqr062lav6aqawbdk1nsqyzihb09wq3"; - iosevka-ss02 = "06ri8ihinz6bd6swrxf500j1hfl8y9dfm7hjgm3hpdch4fcrhrnz"; - iosevka-ss03 = "110bwfikcxyr8s6p5l29wiyyfhnfv5p2bjlqrzs46pzpyj9g4730"; - iosevka-ss04 = "064nq0zphsik097ynv71p7007w0ysld1a0phfxmc0199s8qdahid"; - iosevka-ss05 = "0c99yp2fxsmx6pwqdlr217rh5khk79fnl8i35a19wf0z3sm4kcna"; - iosevka-ss06 = "0wfxcryhfwcqb2gd227qyiv1a3vzxig79bkp20cpb215w1hn6hkw"; - iosevka-ss07 = "141qpwbjy34v088a29fmj7nipvdxwh4l99wwyaq5ycbgj8743k93"; - iosevka-ss08 = "08yihjqp1fc6l1in9jk8dnlf9fwqahqv76di4xy9vk1dhgi1bd09"; - iosevka-ss09 = "01ad5dif3hwd2yf3y3sa58acqbps5kyivbxmsdqwpl5cvl2f9i83"; - iosevka-ss10 = "0aljyqqxw4mijkwzbq8hcpmpxm34ylp9pfcvisca2k7dspg17n2l"; - iosevka-ss11 = "1cz8ri184mdj6q67rdasbg7fjbhla2vj85lrkhy2avk515av2c2g"; - iosevka-ss12 = "0hif6sgk7r2d235sghaf9nqn7qr58rgj43ipc0pr5lykaraqi7md"; - iosevka-ss13 = "1wrzn9m2vvnc2sfh3wqgmr5ci3mpi0fmbzlvkf0j2hspkfy4d8iw"; - iosevka-ss14 = "1d71qbbd2b6nqdaxns70m3qm9qr03l5ld84fqlfcsmxdsnlhhx3k"; + iosevka = "0qkxqdx3vs53djiibc4ib3qj61fygxvxfcvs7yi08vdhd9qbxhjg"; + iosevka-aile = "053f6b1z0w1089y608k4wmspgljn9lyzyggq168k0110z9vlfjhf"; + iosevka-curly = "04kc7f6gqqxbdkdh1k4z4b28f8pj09npb87fx4zr41wkzkxmavcf"; + iosevka-curly-slab = "1pdm2g3a1nfc8w53r3sdifwypj3diil16jy6sgvgpmk7klf804vf"; + iosevka-etoile = "10vw53cd317qxhvws11zf98756vfn836assw3rbns6zpfrj7a2xg"; + iosevka-slab = "01ynv6b7fqdd98imfr14xcgrhp20yffa3n738iz5qnr75vqpnfdc"; + iosevka-sparkle = "1nw63dd1ccj8cp1x06alfxdvdlw9ibin41llmc0jla0nz7n8vsp3"; + iosevka-ss01 = "0g54rghx6z0a9azckvgh7njq12rsr1zzskgrm3f29rin8fdwvvd9"; + iosevka-ss02 = "0jhl75bwd76vp9hpvqgj7awpvibv4pk5vjab97n53b4bdxdxh1rf"; + iosevka-ss03 = "1ki5q7gafgm2iayjn82wrnwkfb3nbcr2xsrgs2vsw5lm9plawbmd"; + iosevka-ss04 = "03933skk5zqxrkj5m0j90cxrv4fmjfbp7ai5fywmhjzq92xbcr97"; + iosevka-ss05 = "014dglqr17adyj2229vvzhz61jpkgj33ngkav5sh2dj5wcx6b137"; + iosevka-ss06 = "07z87rm0rb9n6d7h0kmp51dnnglmr0wbwmplc5mlv036fcrdibaj"; + iosevka-ss07 = "1672n5ynd5fv8dwnwg8aa50ny74ad9gbx2xlk2ixih7ajv15p19d"; + iosevka-ss08 = "1jqdqg6dzrnq6y0g7ls2ya3dh0j00xj2k41aajvdqw342n08h27k"; + iosevka-ss09 = "1p1v0byb2nh11k362zxjrbvzbbryh2wk76dsd1zwyjrlgqq6qa81"; + iosevka-ss10 = "12c940w8vy1hjhi7cxgqsb23ip60xw1ydzhx5cv4ycxmi5745wqq"; + iosevka-ss11 = "0s6fvh5pw119w872w4rvamiwssryx4a98c7fhr737nzgiqy4iyz5"; + iosevka-ss12 = "14gjqmn807cv3dbvkm2i6dz6if46fbrkr8ls5shwalnl8qj3d06c"; + iosevka-ss13 = "1qd04cani9jzp1hjs8g6b42bmxvjyyxdha122816s0rg9i46mpcc"; + iosevka-ss14 = "0q109ahk7ww66brxgldgmr61m2qzpyhi1q21591wg1br5cn2d52w"; } diff --git a/pkgs/data/fonts/jetbrains-mono/default.nix b/pkgs/data/fonts/jetbrains-mono/default.nix index 42012e43d4b..0ba7fd835c3 100644 --- a/pkgs/data/fonts/jetbrains-mono/default.nix +++ b/pkgs/data/fonts/jetbrains-mono/default.nix @@ -1,14 +1,14 @@ { lib, fetchzip }: let - version = "2.221"; + version = "2.225"; in fetchzip { name = "JetBrainsMono-${version}"; url = "https://github.com/JetBrains/JetBrainsMono/releases/download/v${version}/JetBrainsMono-${version}.zip"; - sha256 = "1in3znnj0i0yfwj93ncxi3s1cp9lhgwnv2r14br47rr7vik4zjr6"; + sha256 = "1k8xmjaingz50626hd73hqbp196kg3zndiy0aqb88z5cw9nd0fva"; postFetch = '' mkdir -p $out/share/fonts diff --git a/pkgs/data/fonts/jost/default.nix b/pkgs/data/fonts/jost/default.nix index a8df441d999..457cb0d03c9 100644 --- a/pkgs/data/fonts/jost/default.nix +++ b/pkgs/data/fonts/jost/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchzip}: +{lib, fetchzip}: let version = "3.5"; diff --git a/pkgs/data/fonts/kochi-substitute/default.nix b/pkgs/data/fonts/kochi-substitute/default.nix index cf89a8fcb8f..071db9b13df 100644 --- a/pkgs/data/fonts/kochi-substitute/default.nix +++ b/pkgs/data/fonts/kochi-substitute/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dpkg }: +{ lib, stdenv, fetchurl, dpkg }: let version = "20030809"; in @@ -42,7 +42,7 @@ stdenv.mkDerivation { from the naga10 font. ''; homepage = "https://osdn.net/projects/efont/"; - license = stdenv.lib.licenses.wadalab; - maintainers = [ stdenv.lib.maintainers.auntie ]; + license = lib.licenses.wadalab; + maintainers = [ lib.maintainers.auntie ]; }; } diff --git a/pkgs/data/fonts/league-of-moveable-type/default.nix b/pkgs/data/fonts/league-of-moveable-type/default.nix index 9a80b9a43df..f6855dc99d6 100644 --- a/pkgs/data/fonts/league-of-moveable-type/default.nix +++ b/pkgs/data/fonts/league-of-moveable-type/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip, raleway}: +{lib, stdenv, fetchurl, unzip, raleway}: let @@ -43,9 +43,9 @@ stdenv.mkDerivation rec { homepage = "https://www.theleagueofmoveabletype.com/"; - license = stdenv.lib.licenses.ofl; + license = lib.licenses.ofl; - platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ bergey Profpatsch ]; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ bergey Profpatsch ]; }; } diff --git a/pkgs/data/fonts/meslo-lg/default.nix b/pkgs/data/fonts/meslo-lg/default.nix index 2837e488389..7083b9e0031 100644 --- a/pkgs/data/fonts/meslo-lg/default.nix +++ b/pkgs/data/fonts/meslo-lg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { version = "1.2.1"; @@ -39,8 +39,8 @@ stdenv.mkDerivation rec { meta = { description = "A customized version of Apple’s Menlo-Regular font"; homepage = "https://github.com/andreberg/Meslo-Font/"; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ balajisivaraman ]; - platforms = with stdenv.lib.platforms; all; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ balajisivaraman ]; + platforms = with lib.platforms; all; }; } diff --git a/pkgs/data/fonts/mno16/default.nix b/pkgs/data/fonts/mno16/default.nix index 1b311d2c25a..eeb53904fe1 100644 --- a/pkgs/data/fonts/mno16/default.nix +++ b/pkgs/data/fonts/mno16/default.nix @@ -15,7 +15,7 @@ in fetchzip rec { meta = with lib; { description = "minimalist monospaced font"; - homepage = "https://sev.dev/fonts/mno16"; + homepage = "https://sev.dev/fonts/mno16"; license = licenses.cc0; }; } diff --git a/pkgs/data/fonts/nafees/default.nix b/pkgs/data/fonts/nafees/default.nix index 11e1ccb5645..e23528aefe8 100644 --- a/pkgs/data/fonts/nafees/default.nix +++ b/pkgs/data/fonts/nafees/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip}: +{lib, stdenv, fetchurl, unzip}: stdenv.mkDerivation { name = "nafees"; @@ -56,7 +56,7 @@ stdenv.mkDerivation { # more like a modified BSD, but still contains the GPLv2 embedded # font exception, and some not-for-resale language. license = "unknown"; - platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ bergey ]; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ bergey ]; }; } diff --git a/pkgs/data/fonts/navilu/default.nix b/pkgs/data/fonts/navilu/default.nix index 0433ad22de5..afd9f85741c 100644 --- a/pkgs/data/fonts/navilu/default.nix +++ b/pkgs/data/fonts/navilu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fontforge }: +{ lib, stdenv, fetchFromGitHub, fontforge }: stdenv.mkDerivation rec { pname = "navilu-font"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { installPhase = "install -Dm444 -t $out/share/fonts/truetype/ Navilu.ttf"; - meta = with stdenv.lib; src.meta // { + meta = with lib; src.meta // { description = "A Kannada handwriting font"; license = licenses.gpl3Plus; platforms = platforms.all; diff --git a/pkgs/data/fonts/nerdfonts/shas.nix b/pkgs/data/fonts/nerdfonts/shas.nix index e360dd042b1..4194e57532d 100644 --- a/pkgs/data/fonts/nerdfonts/shas.nix +++ b/pkgs/data/fonts/nerdfonts/shas.nix @@ -1,52 +1,52 @@ { - "3270" = "1k71zsijasn6013c58pgf52xw3h9gkqdjlsa177wlldz8qxb16xk"; - "Agave" = "0jgm31wvmckb71qc9l0nj3sg4zq2vw67piaxr6h8zkakcl2mysha"; - "AnonymousPro" = "0s3n8rrr9kfqd8gxjxksp7p8bc3q7qhcrpyq8090dksvmbcks6xm"; - "Arimo" = "1k7ldfx6dmy9sigzsvi9qwms510nddw634g8xrn0vwnw6d7infk8"; - "AurulentSansMono" = "0q35948dai8qc7gfvas8sfn5s7b64b2y4f9psz6xslrv7nw8lcaz"; - "BigBlueTerminal" = "0ymw2m2xjsx77brm79aws26icwcf2a1d7q3p3ipsd25g4cgqcd2v"; - "BitstreamVeraSansMono" = "1n2298g1fn8jb1fbvw74289n7nnmjddn7zxh88gnl58pwz8ra5dk"; - "CascadiaCode" = "1q4l5a7b7ab6h1bs5pq734r9pp3fw9b59gdk1g4hyn2w61h0kdcj"; - "CodeNewRoman" = "1mgxawj3pblaxy0y9w0hzlfgipiskmc5p028m82zh1wyaplmh2pa"; - "Cousine" = "0jr0gxrsba3dhchp53vd67qq2pgfnvmvcwbv99l1700p539bcvy1"; - "DaddyTimeMono" = "1n6vwykz084fxgylayizxc210f4ms2ijfws5b2hvl2kqmy2q6jk4"; - "DejaVuSansMono" = "03qfrkzmhnn8dwgx4qhiigbz4dxs3957hydlr0j8vxl89j8c9g1z"; - "DroidSansMono" = "187cbcn4a2whrl8dag1ix6j1v3jgv5z2jdfw1w1z9llm1znvpp7z"; - "FantasqueSansMono" = "147h15k3ni0w6chxkrah2fk4klhdhq8y1d3nbx763h9ia3mnggv6"; - "FiraCode" = "1rx7zrkq0584k6hrh6dx30xrnz5nq379xyw73pfd4gxaxnh9mpi1"; - "FiraMono" = "0f2daidakhmbbd5ph6985rghjmr87k7xzmmmf9n851dxvfyndsgl"; - "Go-Mono" = "1bzh3pgyn87j27kw7x5h02rqzhh21pm6d0zhxd5iqi5qq5mj0nvm"; - "Gohu" = "1rlkprjg9nz1s69s4ancmxii6l907qachl116gngbj8gjv3g1x21"; - "Hack" = "052mav170lwxkgzg3hij4zvnmfwyrddn45gn07a33gpzzicjx1bh"; - "Hasklig" = "0vyb0z0m04pn8477d6a711vjwb3nhvpn5fxfwnz37av9jmz3i9vk"; - "HeavyData" = "065rhq7z52dp211inw3vszwc5zrd5s0w1kmgnrh68bxc0js0xqyb"; - "Hermit" = "1ij9pjr517jxk3dlsrzmnqivsfq5i5ai6pd8hznmrkb3360cn7sm"; - "iA-Writer" = "0clksrxw6xcv5c1pbd8rl2rc3r15iak1qv8v6bn0j2mccjcss64z"; - "IBMPlexMono" = "0xkfkpnkkrvjfiv624l7lpmfji107y7645w6ah47ijyg47yxkmsg"; - "Inconsolata" = "14gbwc0k3d1j496w6pv9kry1pglswzd0armsdb0g1mqgzfdf1ci1"; - "InconsolataGo" = "0c6yhx242d82dalyjas42qniy0jagqs47cfsfarwmzar6zg3lj5m"; - "InconsolataLGC" = "1746nl1rz4hscfgbmd8642wq3z1wizvfjb50y3yyjsc1ixc1f0pd"; - "Iosevka" = "1qqd4xh98vxb99rh2a2qv9gjclilhaw84pyqdpbx225qhvw9xlkb"; - "JetBrainsMono" = "1kc8fyk1aczxkmn8dzv1gy6xfi2jywgahd8np576v2dn8kx16844"; - "Lekton" = "0mny5j9bns9104wg2wmabdw0sl80c7i3dzp4j5mxh8jybx929d3i"; - "LiberationMono" = "19bpm893assmmnfvlvhz8df54c9pr2kfv2b6anlr4g64hliy1c1h"; - "Meslo" = "08zm8nqskhrqkw80wl460zbvsrvs5fp2njlcv867phpqna9hyqzh"; - "Monofur" = "0f5khqgdxi4g0qm5n48r1sk4pd2wlk987d8yxwks2mcsqa6fraqj"; - "Monoid" = "0m7i82jfiwqmi9lhv8lmq2n723ihn0isxi5559478qbdy5b104dd"; - "Mononoki" = "074avnvfl260pcrli4h5bc55yqr4mgd54paf80qcnh101qsz325w"; - "MPlus" = "03mrfhzfmmqjfl7fa81v1ih3fdr3q2k439w6pjbd2zvl806l92yq"; - "Noto" = "1jmycnf4fflijs730vbyj258kajkxv0j42655a7hvpapym7z940z"; - "OpenDyslexic" = "0ma62xg6cy8l4chfhqvm64zzhx3mrzdj6gxwnvx8plqy3j4dn3by"; - "Overpass" = "1xs2z3ch7dd32zb5l1axzd78hyskimqglcjcrb7n4ic85qm55xxm"; - "ProFont" = "0ck4rprj0w29pv3qm4n1zg6cdq76m3kaag0ka4q1qqcnhga67zr7"; - "ProggyClean" = "0sk3gk6zj61nbv94xv6z8y67sr5blg9n079d8srv7bbw9dv96i8g"; - "RobotoMono" = "1nhbr9zc0cz81pdj95rrb56bwdkmmbqmk429nf60j35pkcqmvk8x"; - "ShareTechMono" = "1h79myy0my3jyrvqcrgfdsjqrwwm5fdy2nmzp3ynyi769p7z1dwr"; - "SourceCodePro" = "06cnsdmm84kzjlwwcmhwpj7pyfqinqpmww1c13i21l611fg6hwd7"; - "SpaceMono" = "1xmmf2gdsa3ycl3pgpr3zr919qh702wjvc5k4hsdivvs2lzfdgmk"; - "Terminus" = "0g2ybs225fwxmvwfnanc32jc2lfnag3agmliv1vrb5mxyqzm53gj"; - "Tinos" = "077n4k6yh4qbirfkl02zqn3057kymspr10zcbfkf4ldvifa36pjd"; - "Ubuntu" = "1lzdrgb8vk5dwicxhvkgbain5phf88g3zgv5ya2ihh052xsl3qih"; - "UbuntuMono" = "0wa8ri7f3g8vwd194q812qh8nzplnmhl5ak0yhgilmm44s46ad0h"; - "VictorMono" = "18z92kwggfqwrd5m09yda55hcb4b159278lps6f9hr8icwki6v9q"; + "3270" = "1k71zsijasn6013c58pgf52xw3h9gkqdjlsa177wlldz8qxb16xk"; + "Agave" = "0jgm31wvmckb71qc9l0nj3sg4zq2vw67piaxr6h8zkakcl2mysha"; + "AnonymousPro" = "0s3n8rrr9kfqd8gxjxksp7p8bc3q7qhcrpyq8090dksvmbcks6xm"; + "Arimo" = "1k7ldfx6dmy9sigzsvi9qwms510nddw634g8xrn0vwnw6d7infk8"; + "AurulentSansMono" = "0q35948dai8qc7gfvas8sfn5s7b64b2y4f9psz6xslrv7nw8lcaz"; + "BigBlueTerminal" = "0ymw2m2xjsx77brm79aws26icwcf2a1d7q3p3ipsd25g4cgqcd2v"; + "BitstreamVeraSansMono" = "1n2298g1fn8jb1fbvw74289n7nnmjddn7zxh88gnl58pwz8ra5dk"; + "CascadiaCode" = "1q4l5a7b7ab6h1bs5pq734r9pp3fw9b59gdk1g4hyn2w61h0kdcj"; + "CodeNewRoman" = "1mgxawj3pblaxy0y9w0hzlfgipiskmc5p028m82zh1wyaplmh2pa"; + "Cousine" = "0jr0gxrsba3dhchp53vd67qq2pgfnvmvcwbv99l1700p539bcvy1"; + "DaddyTimeMono" = "1n6vwykz084fxgylayizxc210f4ms2ijfws5b2hvl2kqmy2q6jk4"; + "DejaVuSansMono" = "03qfrkzmhnn8dwgx4qhiigbz4dxs3957hydlr0j8vxl89j8c9g1z"; + "DroidSansMono" = "187cbcn4a2whrl8dag1ix6j1v3jgv5z2jdfw1w1z9llm1znvpp7z"; + "FantasqueSansMono" = "147h15k3ni0w6chxkrah2fk4klhdhq8y1d3nbx763h9ia3mnggv6"; + "FiraCode" = "1rx7zrkq0584k6hrh6dx30xrnz5nq379xyw73pfd4gxaxnh9mpi1"; + "FiraMono" = "0f2daidakhmbbd5ph6985rghjmr87k7xzmmmf9n851dxvfyndsgl"; + "Go-Mono" = "1bzh3pgyn87j27kw7x5h02rqzhh21pm6d0zhxd5iqi5qq5mj0nvm"; + "Gohu" = "1rlkprjg9nz1s69s4ancmxii6l907qachl116gngbj8gjv3g1x21"; + "Hack" = "052mav170lwxkgzg3hij4zvnmfwyrddn45gn07a33gpzzicjx1bh"; + "Hasklig" = "0vyb0z0m04pn8477d6a711vjwb3nhvpn5fxfwnz37av9jmz3i9vk"; + "HeavyData" = "065rhq7z52dp211inw3vszwc5zrd5s0w1kmgnrh68bxc0js0xqyb"; + "Hermit" = "1ij9pjr517jxk3dlsrzmnqivsfq5i5ai6pd8hznmrkb3360cn7sm"; + "iA-Writer" = "0clksrxw6xcv5c1pbd8rl2rc3r15iak1qv8v6bn0j2mccjcss64z"; + "IBMPlexMono" = "0xkfkpnkkrvjfiv624l7lpmfji107y7645w6ah47ijyg47yxkmsg"; + "Inconsolata" = "14gbwc0k3d1j496w6pv9kry1pglswzd0armsdb0g1mqgzfdf1ci1"; + "InconsolataGo" = "0c6yhx242d82dalyjas42qniy0jagqs47cfsfarwmzar6zg3lj5m"; + "InconsolataLGC" = "1746nl1rz4hscfgbmd8642wq3z1wizvfjb50y3yyjsc1ixc1f0pd"; + "Iosevka" = "1qqd4xh98vxb99rh2a2qv9gjclilhaw84pyqdpbx225qhvw9xlkb"; + "JetBrainsMono" = "1kc8fyk1aczxkmn8dzv1gy6xfi2jywgahd8np576v2dn8kx16844"; + "Lekton" = "0mny5j9bns9104wg2wmabdw0sl80c7i3dzp4j5mxh8jybx929d3i"; + "LiberationMono" = "19bpm893assmmnfvlvhz8df54c9pr2kfv2b6anlr4g64hliy1c1h"; + "Meslo" = "08zm8nqskhrqkw80wl460zbvsrvs5fp2njlcv867phpqna9hyqzh"; + "Monofur" = "0f5khqgdxi4g0qm5n48r1sk4pd2wlk987d8yxwks2mcsqa6fraqj"; + "Monoid" = "0m7i82jfiwqmi9lhv8lmq2n723ihn0isxi5559478qbdy5b104dd"; + "Mononoki" = "074avnvfl260pcrli4h5bc55yqr4mgd54paf80qcnh101qsz325w"; + "MPlus" = "03mrfhzfmmqjfl7fa81v1ih3fdr3q2k439w6pjbd2zvl806l92yq"; + "Noto" = "1jmycnf4fflijs730vbyj258kajkxv0j42655a7hvpapym7z940z"; + "OpenDyslexic" = "0ma62xg6cy8l4chfhqvm64zzhx3mrzdj6gxwnvx8plqy3j4dn3by"; + "Overpass" = "1xs2z3ch7dd32zb5l1axzd78hyskimqglcjcrb7n4ic85qm55xxm"; + "ProFont" = "0ck4rprj0w29pv3qm4n1zg6cdq76m3kaag0ka4q1qqcnhga67zr7"; + "ProggyClean" = "0sk3gk6zj61nbv94xv6z8y67sr5blg9n079d8srv7bbw9dv96i8g"; + "RobotoMono" = "1nhbr9zc0cz81pdj95rrb56bwdkmmbqmk429nf60j35pkcqmvk8x"; + "ShareTechMono" = "1h79myy0my3jyrvqcrgfdsjqrwwm5fdy2nmzp3ynyi769p7z1dwr"; + "SourceCodePro" = "06cnsdmm84kzjlwwcmhwpj7pyfqinqpmww1c13i21l611fg6hwd7"; + "SpaceMono" = "1xmmf2gdsa3ycl3pgpr3zr919qh702wjvc5k4hsdivvs2lzfdgmk"; + "Terminus" = "0g2ybs225fwxmvwfnanc32jc2lfnag3agmliv1vrb5mxyqzm53gj"; + "Tinos" = "077n4k6yh4qbirfkl02zqn3057kymspr10zcbfkf4ldvifa36pjd"; + "Ubuntu" = "1lzdrgb8vk5dwicxhvkgbain5phf88g3zgv5ya2ihh052xsl3qih"; + "UbuntuMono" = "0wa8ri7f3g8vwd194q812qh8nzplnmhl5ak0yhgilmm44s46ad0h"; + "VictorMono" = "18z92kwggfqwrd5m09yda55hcb4b159278lps6f9hr8icwki6v9q"; } diff --git a/pkgs/data/fonts/nerdfonts/update.sh b/pkgs/data/fonts/nerdfonts/update.sh index ccfab174dd8..b4c4aaa7cf2 100755 --- a/pkgs/data/fonts/nerdfonts/update.sh +++ b/pkgs/data/fonts/nerdfonts/update.sh @@ -15,7 +15,7 @@ while read -r name read -r url do - printf '\t"%s" = "%s";\n' "${name%.*}" "$(nix-prefetch-url "$url")" >>"$dirname/shas.nix" + printf ' "%s" = "%s";\n' "${name%.*}" "$(nix-prefetch-url "$url")" >>"$dirname/shas.nix" done < <(jq -r '.assets[] | .name, .browser_download_url' <<<"$latest_release") printf '}\n' >> "$dirname/shas.nix" diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index 59d1ed353f3..d93e5885401 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -7,7 +7,7 @@ , optipng , cairo , python3 -, pkgconfig +, pkg-config , pngquant , which , imagemagick @@ -131,7 +131,7 @@ in zopfli pngquant which - pkgconfig + pkg-config emojiPythonEnv ]; diff --git a/pkgs/data/fonts/orbitron/default.nix b/pkgs/data/fonts/orbitron/default.nix index 4c00b086e10..f4a0a9600a1 100644 --- a/pkgs/data/fonts/orbitron/default.nix +++ b/pkgs/data/fonts/orbitron/default.nix @@ -20,8 +20,7 @@ in fetchFromGitHub { meta = with lib; { homepage = "https://www.theleagueofmoveabletype.com/orbitron"; downloadPage = "https://www.theleagueofmoveabletype.com/orbitron/download"; - description = '' - Geometric sans-serif for display purposes by Matt McInerney''; + description = "Geometric sans-serif for display purposes by Matt McInerney"; longDescription = '' Orbitron is a geometric sans-serif typeface intended for display purposes. It features four weights (light, medium, bold, and diff --git a/pkgs/data/fonts/paratype-pt/mono.nix b/pkgs/data/fonts/paratype-pt/mono.nix index eecab47c087..6b1cd370241 100644 --- a/pkgs/data/fonts/paratype-pt/mono.nix +++ b/pkgs/data/fonts/paratype-pt/mono.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip }: +{ lib, fetchzip }: fetchzip { name = "paratype-pt-mono"; diff --git a/pkgs/data/fonts/paratype-pt/sans.nix b/pkgs/data/fonts/paratype-pt/sans.nix index 826b8887365..d6b783ebe4c 100644 --- a/pkgs/data/fonts/paratype-pt/sans.nix +++ b/pkgs/data/fonts/paratype-pt/sans.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip }: +{ lib, fetchzip }: fetchzip { name = "paratype-pt-sans"; diff --git a/pkgs/data/fonts/paratype-pt/serif.nix b/pkgs/data/fonts/paratype-pt/serif.nix index bbff974e107..2b5eeafd09b 100644 --- a/pkgs/data/fonts/paratype-pt/serif.nix +++ b/pkgs/data/fonts/paratype-pt/serif.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip }: +{ lib, fetchzip }: fetchzip { name = "paratype-pt-serif"; diff --git a/pkgs/data/fonts/poly/default.nix b/pkgs/data/fonts/poly/default.nix index 05b411a5ba3..50dfb502035 100644 --- a/pkgs/data/fonts/poly/default.nix +++ b/pkgs/data/fonts/poly/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { name = "poly"; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { and languages that use the Latin script and its variants. ''; homepage = "http://www.fontsquirrel.com/fonts/poly"; - license = stdenv.lib.licenses.ofl; - maintainers = with stdenv.lib.maintainers; [ relrod ]; + license = lib.licenses.ofl; + maintainers = with lib.maintainers; [ relrod ]; }; } diff --git a/pkgs/data/fonts/powerline-symbols/default.nix b/pkgs/data/fonts/powerline-symbols/default.nix new file mode 100644 index 00000000000..69e3bb59df6 --- /dev/null +++ b/pkgs/data/fonts/powerline-symbols/default.nix @@ -0,0 +1,18 @@ +{ lib, runCommandNoCC, powerline }: + +let + inherit (powerline) version; +in runCommandNoCC "powerline-symbols-${version}" { + meta = { + inherit (powerline.meta) license; + priority = (powerline.meta.priority or 0) + 1; + maintainers = with lib.maintainers; [ midchildan ]; + }; +} '' + install -Dm644 \ + ${powerline.src}/font/PowerlineSymbols.otf \ + $out/share/fonts/OTF/PowerlineSymbols.otf + install -Dm644 \ + ${powerline.src}/font/10-powerline-symbols.conf \ + $out/etc/fonts/conf.d/10-powerline-symbols.conf +'' diff --git a/pkgs/data/fonts/recursive/default.nix b/pkgs/data/fonts/recursive/default.nix index ff5070b1bd7..d6929153bf4 100644 --- a/pkgs/data/fonts/recursive/default.nix +++ b/pkgs/data/fonts/recursive/default.nix @@ -1,12 +1,12 @@ { lib, fetchzip }: let - version = "1.069"; + version = "1.071"; in fetchzip { name = "recursive-${version}"; - url = "https://github.com/arrowtype/recursive/releases/download/${version}/ArrowType-Recursive-${version}.zip"; + url = "https://github.com/arrowtype/recursive/releases/download/v${version}/ArrowType-Recursive-${version}.zip"; postFetch = '' mkdir -p $out/share/fonts/ @@ -14,7 +14,7 @@ fetchzip { unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype ''; - sha256 = "07l35vkarj8f748vbnca98zrl0yl456ddqf1wpmshs24r97cx96h"; + sha256 = "0db410vcvgawb89f11l2v7w3b7l70wzlwwv8df3vnangl3mdv13z"; meta = with lib; { homepage = "https://recursive.design/"; diff --git a/pkgs/data/fonts/stix-two/default.nix b/pkgs/data/fonts/stix-two/default.nix index 1e32ebbf16a..3d957f249f5 100644 --- a/pkgs/data/fonts/stix-two/default.nix +++ b/pkgs/data/fonts/stix-two/default.nix @@ -1,13 +1,13 @@ { lib, fetchzip }: let - version = "2.10"; + version = "2.11"; in fetchzip { name = "stix-two-${version}"; url = "https://github.com/stipub/stixfonts/raw/v${version}/zipfiles/STIX${builtins.replaceStrings [ "." ] [ "_" ] version}-all.zip"; - sha256 = "1xvh5c5asbasfa333mizimvdp209g0lppbwv2p0cg3ixfpxgq4dl"; + sha256 = "19ndavx5k85vm6wvq9603kynpgbfddbjiihivffvnbrxwf13h34n"; postFetch = '' mkdir -p $out/share/fonts/ diff --git a/pkgs/data/fonts/tempora-lgc/default.nix b/pkgs/data/fonts/tempora-lgc/default.nix index d20acad663c..6bcceff16d2 100644 --- a/pkgs/data/fonts/tempora-lgc/default.nix +++ b/pkgs/data/fonts/tempora-lgc/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: let srcs = [ (fetchurl { @@ -35,8 +35,8 @@ stdenv.mkDerivation { outputHash = "1kwj31cjgdirqvh6bxs4fnvvr1ppaz6z8w40kvhkivgs69jglmzw"; meta = { - description = ''Tempora font''; - license = stdenv.lib.licenses.gpl2 ; - maintainers = [stdenv.lib.maintainers.raskin]; + description = "Tempora font"; + license = lib.licenses.gpl2 ; + maintainers = [lib.maintainers.raskin]; }; } diff --git a/pkgs/data/fonts/tex-gyre-math/default.nix b/pkgs/data/fonts/tex-gyre-math/default.nix index 92898be0f3f..95038d3f9cf 100644 --- a/pkgs/data/fonts/tex-gyre-math/default.nix +++ b/pkgs/data/fonts/tex-gyre-math/default.nix @@ -64,4 +64,4 @@ let }; }; in - stdenv.lib.mapAttrs mkVariant variants + lib.mapAttrs mkVariant variants diff --git a/pkgs/data/fonts/tex-gyre/default.nix b/pkgs/data/fonts/tex-gyre/default.nix index 333da24e95f..6ce5bd20786 100644 --- a/pkgs/data/fonts/tex-gyre/default.nix +++ b/pkgs/data/fonts/tex-gyre/default.nix @@ -32,7 +32,7 @@ let platforms = platforms.all; }; }; -in stdenv.lib.mapAttrs mkVariant { +in lib.mapAttrs mkVariant { adventor = { version = "2_501"; sha256 = "0qjg3x0adfppyx3x33cm07ww9i9sl88xaq07m7wfip8rmyp567fn"; diff --git a/pkgs/data/fonts/ttf-bitstream-vera/default.nix b/pkgs/data/fonts/ttf-bitstream-vera/default.nix index f485f43b60c..95e4ce2a52a 100644 --- a/pkgs/data/fonts/ttf-bitstream-vera/default.nix +++ b/pkgs/data/fonts/ttf-bitstream-vera/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, fetchzip }: let pname = "ttf-bitstream-vera"; version = "1.10"; @@ -6,7 +6,7 @@ in fetchzip rec { name = "${pname}-${version}"; - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.bz2"; postFetch = '' tar -xjf $downloadedFile --strip-components=1 diff --git a/pkgs/data/fonts/ttf-tw-moe/default.nix b/pkgs/data/fonts/ttf-tw-moe/default.nix index 69579289442..bf52d07c52e 100644 --- a/pkgs/data/fonts/ttf-tw-moe/default.nix +++ b/pkgs/data/fonts/ttf-tw-moe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip }: +{ lib, fetchzip }: let version = "2020-11-14"; in diff --git a/pkgs/data/fonts/twitter-color-emoji/default.nix b/pkgs/data/fonts/twitter-color-emoji/default.nix index de70a0b6c6a..e74e51a95dc 100644 --- a/pkgs/data/fonts/twitter-color-emoji/default.nix +++ b/pkgs/data/fonts/twitter-color-emoji/default.nix @@ -55,16 +55,16 @@ stdenv.mkDerivation rec { ]; postPatch = let - templateSubstitutions = stdenv.lib.concatStringsSep "; " [ - ''s#Noto Color Emoji#Twitter Color Emoji#'' - ''s#NotoColorEmoji#TwitterColorEmoji#'' + templateSubstitutions = lib.concatStringsSep "; " [ + "s#Noto Color Emoji#Twitter Color Emoji#" + "s#NotoColorEmoji#TwitterColorEmoji#" ''s#Copyright .* Google Inc\.#Twitter, Inc and other contributors.#'' - ''s# Version .*# ${version}#'' - ''s#.*is a trademark.*##'' + "s# Version .*# ${version}#" + "s#.*is a trademark.*##" ''s#Google, Inc\.#Twitter, Inc and other contributors#'' - ''s#http://www.google.com/get/noto/#https://twemoji.twitter.com/#'' - ''s#.*is licensed under.*# Creative Commons Attribution 4.0 International#'' - ''s#http://scripts.sil.org/OFL#http://creativecommons.org/licenses/by/4.0/#'' + "s#http://www.google.com/get/noto/#https://twemoji.twitter.com/#" + "s#.*is licensed under.*# Creative Commons Attribution 4.0 International#" + "s#http://scripts.sil.org/OFL#http://creativecommons.org/licenses/by/4.0/#" ]; in '' ${noto-fonts-emoji.postPatch} diff --git a/pkgs/data/fonts/uni-vga/default.nix b/pkgs/data/fonts/uni-vga/default.nix index 65db46ca2ca..56ba36b1eb4 100644 --- a/pkgs/data/fonts/uni-vga/default.nix +++ b/pkgs/data/fonts/uni-vga/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, perl, kbd, bdftopcf +{ lib, stdenv, fetchurl, perl, kbd, bdftopcf , libfaketime, fonttosfnt, mkfontscale }: -with stdenv.lib; +with lib; stdenv.mkDerivation { name = "uni-vga"; diff --git a/pkgs/data/fonts/unscii/default.nix b/pkgs/data/fonts/unscii/default.nix index 724d015a7c3..066a4d4d922 100644 --- a/pkgs/data/fonts/unscii/default.nix +++ b/pkgs/data/fonts/unscii/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, bdftopcf +{ lib, stdenv, fetchurl, perl, bdftopcf , fontforge, SDL, SDL_image, mkfontscale }: @@ -45,11 +45,11 @@ stdenv.mkDerivation rec { meta = { inherit version; - description = ''Bitmapped character-art-friendly Unicode fonts''; + description = "Bitmapped character-art-friendly Unicode fonts"; # Basically GPL2+ with font exception — because of the Unifont-augmented # version. The reduced version is public domain. license = "http://unifoundry.com/LICENSE.txt"; - maintainers = [ stdenv.lib.maintainers.raskin ]; + maintainers = [ lib.maintainers.raskin ]; homepage = "http://pelulamu.net/unscii/"; }; } diff --git a/pkgs/data/fonts/vista-fonts/default.nix b/pkgs/data/fonts/vista-fonts/default.nix index 3a5ee616a0e..20b5b673ccf 100644 --- a/pkgs/data/fonts/vista-fonts/default.nix +++ b/pkgs/data/fonts/vista-fonts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, cabextract }: +{ lib, fetchzip, cabextract }: fetchzip { name = "vista-fonts-1"; @@ -26,7 +26,7 @@ fetchzip { meta = { description = "Some TrueType fonts from Microsoft Windows Vista (Calibri, Cambria, Candara, Consolas, Constantia, Corbel)"; homepage = "http://www.microsoft.com/typography/ClearTypeFonts.mspx"; - license = stdenv.lib.licenses.unfree; # haven't read the EULA, but we probably can't redistribute these files, so... + license = lib.licenses.unfree; # haven't read the EULA, but we probably can't redistribute these files, so... # Set a non-zero priority to allow easy overriding of the # fontconfig configuration files. diff --git a/pkgs/data/icons/bibata-cursors/default.nix b/pkgs/data/icons/bibata-cursors/default.nix index 66ed71f1f9e..04fb6281f25 100644 --- a/pkgs/data/icons/bibata-cursors/default.nix +++ b/pkgs/data/icons/bibata-cursors/default.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape, xcursorgen, python3 }: +{ lib, stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape, xcursorgen, python3 }: let py = python3.withPackages(ps: [ ps.pillow ]); @@ -41,7 +41,7 @@ in stdenvNoCC.mkDerivation rec { done ''; - meta = with stdenvNoCC.lib; { + meta = with lib; { description = "Material Based Cursor"; homepage = "https://github.com/KaizIqbal/Bibata_Cursor"; license = licenses.gpl3; diff --git a/pkgs/data/icons/bibata-cursors/extra.nix b/pkgs/data/icons/bibata-cursors/extra.nix index 7977566cb61..f59b12ec76a 100644 --- a/pkgs/data/icons/bibata-cursors/extra.nix +++ b/pkgs/data/icons/bibata-cursors/extra.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape, xcursorgen, python3 }: +{ lib, stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape, xcursorgen, python3 }: let py = python3.withPackages(ps: [ ps.pillow ]); @@ -41,7 +41,7 @@ in stdenvNoCC.mkDerivation rec { done ''; - meta = with stdenvNoCC.lib; { + meta = with lib; { description = "Cursors Based on Bibata"; homepage = "https://github.com/KaizIqbal/Bibata_Extra_Cursor"; license = licenses.gpl3; diff --git a/pkgs/data/icons/bibata-cursors/translucent.nix b/pkgs/data/icons/bibata-cursors/translucent.nix index afdd92600fa..d1e2814a8aa 100644 --- a/pkgs/data/icons/bibata-cursors/translucent.nix +++ b/pkgs/data/icons/bibata-cursors/translucent.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape, xcursorgen }: +{ lib, stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape, xcursorgen }: stdenvNoCC.mkDerivation rec { pname = "bibata-cursors-translucent"; @@ -31,7 +31,7 @@ stdenvNoCC.mkDerivation rec { cp -pr Bibata_* $out/share/icons/ ''; - meta = with stdenvNoCC.lib; { + meta = with lib; { description = "Translucent Varient of the Material Based Cursor"; homepage = "https://github.com/Silicasandwhich/Bibata_Cursor_Translucent"; license = licenses.gpl3; diff --git a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix index adf2139d0ce..dfcd2f59679 100644 --- a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix +++ b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix @@ -1,18 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, gdk-pixbuf, optipng, librsvg, gtk3, pantheon, gnome3, gnome-icon-theme, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, pkg-config, gdk-pixbuf, optipng, librsvg, gtk3, pantheon, gnome3, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "elementary-xfce-icon-theme"; - version = "0.15.1"; + version = "0.15.2"; src = fetchFromGitHub { owner = "shimmerproject"; repo = "elementary-xfce"; rev = "v${version}"; - sha256 = "1rl15kh9c7qxw4pvwmw44fb4v3vwh6zin4wpx55bnvm5j76y6p3f"; + sha256 = "sha256-E8f6UU/4Y9Nfk7LjDcdyV+TdeVj/zl3oFCyEu3Gz27w="; }; nativeBuildInputs = [ - pkgconfig + pkg-config gdk-pixbuf librsvg optipng diff --git a/pkgs/data/icons/gnome-icon-theme/default.nix b/pkgs/data/icons/gnome-icon-theme/default.nix index 9879f8da342..0e6a2fc67c4 100644 --- a/pkgs/data/icons/gnome-icon-theme/default.nix +++ b/pkgs/data/icons/gnome-icon-theme/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, gtk2 }: +{ lib, stdenv, fetchurl, pkg-config, intltool, iconnamingutils, gtk2 }: stdenv.mkDerivation rec { pname = "gnome-icon-theme"; version = "3.12.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-icon-theme/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-icon-theme/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0fjh9qmmgj34zlgxb09231ld7khys562qxbpsjlaplq2j85p57im"; }; nativeBuildInputs = [ - pkgconfig + pkg-config intltool iconnamingutils gtk2 diff --git a/pkgs/data/icons/kora-icon-theme/default.nix b/pkgs/data/icons/kora-icon-theme/default.nix index 9c64ed4b497..36aee979f0b 100644 --- a/pkgs/data/icons/kora-icon-theme/default.nix +++ b/pkgs/data/icons/kora-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kora-icon-theme"; - version = "1.3.4"; + version = "1.4.1"; src = fetchFromGitHub { owner = "bikass"; repo = "kora"; rev = "v${version}"; - sha256 = "01s7zhwwbdqgksjvfvn7kqijxzzc7734f707yk8y7anshq0518x3"; + sha256 = "sha256-YGhusal8g/UXMqrQvj147OScg51uNABTMIXxVXvnpKY="; }; nativeBuildInputs = [ diff --git a/pkgs/data/icons/luna-icons/default.nix b/pkgs/data/icons/luna-icons/default.nix index 702d4293f2a..b3513818df8 100644 --- a/pkgs/data/icons/luna-icons/default.nix +++ b/pkgs/data/icons/luna-icons/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "luna-icons"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "0mz5cayjgsc109nv7kdkn3gn1n79bl3hb773lrzrr0k2zblxg353"; + sha256 = "0ajx7yjkgj5ynbjmd6k3cldjn0qr51h6k80hjgr7vqd0ybyylh5p"; }; nativeBuildInputs = [ diff --git a/pkgs/data/icons/maia-icon-theme/default.nix b/pkgs/data/icons/maia-icon-theme/default.nix index 75c7cd58007..32365b70184 100644 --- a/pkgs/data/icons/maia-icon-theme/default.nix +++ b/pkgs/data/icons/maia-icon-theme/default.nix @@ -35,6 +35,8 @@ stdenv.mkDerivation { dontDropIconThemeCache = true; + dontWrapQtApps = true; + postInstall = '' for theme in $out/share/icons/*; do gtk-update-icon-cache $theme diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index b7901346182..ed5f8e7c4c2 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "papirus-icon-theme"; - version = "20200901"; + version = "20210101"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = pname; rev = version; - sha256 = "00khqbd7jz97q1kd43kkm6yaa40ml36rh04s76sgbm58srs66v3c"; + sha256 = "sha256-RHuT+zJQyhiApeLuh821PMI9dmD20OoRVxezF/uCWoE="; }; nativeBuildInputs = [ diff --git a/pkgs/data/icons/tango-icon-theme/default.nix b/pkgs/data/icons/tango-icon-theme/default.nix index f1b59c2f538..09d0875ca8a 100644 --- a/pkgs/data/icons/tango-icon-theme/default.nix +++ b/pkgs/data/icons/tango-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, iconnamingutils, imagemagick, librsvg +{ lib, stdenv, fetchurl, intltool, pkg-config, iconnamingutils, imagemagick, librsvg , gtk/*any version*/, gnome-icon-theme, hicolor-icon-theme }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { patches = [ ./rsvg-convert.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ intltool iconnamingutils imagemagick librsvg ]; propagatedBuildInputs = [ gnome-icon-theme hicolor-icon-theme ]; # still missing parent icon themes: cristalsvg @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { meta = { description = "A basic set of icons"; homepage = "http://tango.freedesktop.org/Tango_Icon_Library"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/data/machine-learning/mnist/default.nix b/pkgs/data/machine-learning/mnist/default.nix index 44a70ac5d1e..f5b450b4f2a 100644 --- a/pkgs/data/machine-learning/mnist/default.nix +++ b/pkgs/data/machine-learning/mnist/default.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, fetchurl }: +{ lib, stdenvNoCC, fetchurl }: let srcs = { train-images = fetchurl { @@ -30,7 +30,7 @@ in ln -s "${srcs.test-labels}" "$out/${srcs.test-labels.name}" ''; phases = [ "installPhase" ]; - meta = with stdenvNoCC.lib; { + meta = with lib; { description = "A large database of handwritten digits"; longDescription = '' The MNIST database (Modified National Institute of Standards and diff --git a/pkgs/data/misc/adapta-backgrounds/default.nix b/pkgs/data/misc/adapta-backgrounds/default.nix index 029961f6c52..6debaa9ebe2 100644 --- a/pkgs/data/misc/adapta-backgrounds/default.nix +++ b/pkgs/data/misc/adapta-backgrounds/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig, glib }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, glib }: stdenv.mkDerivation rec { pname = "adapta-backgrounds"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "04hmbmzf97rsii8gpwy3wkljy5xhxmlsl34d63s6hfy05knclydj"; }; - nativeBuildInputs = [ meson ninja pkgconfig glib ]; + nativeBuildInputs = [ meson ninja pkg-config glib ]; meta = with lib; { description = "Wallpaper collection for adapta-project"; diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index ad8c3983173..e50aa81656a 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, nss, python3 +{ lib, stdenv, fetchurl, nss, python3 , blacklist ? [] # Used for tests only @@ -7,7 +7,7 @@ , openssl }: -with stdenv.lib; +with lib; let diff --git a/pkgs/data/misc/ddccontrol-db/default.nix b/pkgs/data/misc/ddccontrol-db/default.nix index 6cb0c46e5f5..38f72b5a2ef 100644 --- a/pkgs/data/misc/ddccontrol-db/default.nix +++ b/pkgs/data/misc/ddccontrol-db/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation { homepage = "https://github.com/ddccontrol/ddccontrol-db"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = [ stdenv.lib.maintainers.pakhfn ]; + maintainers = [ lib.maintainers.pakhfn ]; }; } diff --git a/pkgs/data/misc/fedora-backgrounds/generic.nix b/pkgs/data/misc/fedora-backgrounds/generic.nix index e191dd027e8..3e2e0928c3b 100644 --- a/pkgs/data/misc/fedora-backgrounds/generic.nix +++ b/pkgs/data/misc/fedora-backgrounds/generic.nix @@ -1,4 +1,5 @@ -{ stdenvNoCC +{ lib +, stdenvNoCC , coreutils }: @@ -10,7 +11,7 @@ stdenvNoCC.mkDerivation { inherit patches src version; - pname = "fedora${stdenvNoCC.lib.versions.major version}-backgrounds"; + pname = "fedora${lib.versions.major version}-backgrounds"; dontBuild = true; @@ -32,7 +33,7 @@ stdenvNoCC.mkDerivation { "DESTDIR=$(out)" ]; - meta = with stdenvNoCC.lib; { + meta = with lib; { homepage = "https://github.com/fedoradesign/backgrounds"; description = "A set of default and supplemental wallpapers for Fedora"; license = licenses.cc-by-sa-40; diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index 2fcc47149fa..581d897702f 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/545d5cafa765c97ad6026ac96f42a246fea7675b.tar.gz"; - sha256 = "0v35kbbhmyc5yn1k4v9j32d2bj7zwlwfrwf1cppifdvwdhfs25vv"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/f8773aba1736a7929a7262fdd6217be67f679c98.tar.gz"; + sha256 = "1flmp0r1isgp8mf85iwiwps6sa3wczb6k0zphprhnvbi2dzg9x87"; } diff --git a/pkgs/data/misc/iana-etc/default.nix b/pkgs/data/misc/iana-etc/default.nix index 1936bd6627a..421054fa17f 100644 --- a/pkgs/data/misc/iana-etc/default.nix +++ b/pkgs/data/misc/iana-etc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip }: +{ lib, fetchzip }: let version = "20200729"; diff --git a/pkgs/data/misc/media-player-info/default.nix b/pkgs/data/misc/media-player-info/default.nix index 867822af39e..56e4ace41f4 100644 --- a/pkgs/data/misc/media-player-info/default.nix +++ b/pkgs/data/misc/media-player-info/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, python3, udev, systemd }: +{ lib, stdenv, fetchurl, pkg-config, python3, udev, systemd }: let name = "media-player-info-24"; @@ -13,7 +13,7 @@ in }; buildInputs = [ udev systemd ]; - nativeBuildInputs = [ pkgconfig python3 ]; + nativeBuildInputs = [ pkg-config python3 ]; postPatch = '' patchShebangs ./tools diff --git a/pkgs/data/misc/mime-types/default.nix b/pkgs/data/misc/mime-types/default.nix index dc942868250..77b67e48f92 100644 --- a/pkgs/data/misc/mime-types/default.nix +++ b/pkgs/data/misc/mime-types/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip }: +{ lib, fetchzip }: let version = "9"; diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix index 36fc664a83b..70224aaa836 100644 --- a/pkgs/data/misc/osinfo-db/default.nix +++ b/pkgs/data/misc/osinfo-db/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "osinfo-db"; - version = "20201119"; + version = "20201218"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz"; - sha256 = "1a0c42rh3anl3wy4hpg36s8k37y8zxpi5lc67wjwnj4j6mwi7w3l"; + sha256 = "sha256-APKuXWtnpF1r/q2MXddaDeBnBigx4hwMevPwx5uNq3k="; }; nativeBuildInputs = [ osinfo-db-tools gettext libxml2 ]; diff --git a/pkgs/data/misc/prjxray-db/default.nix b/pkgs/data/misc/prjxray-db/default.nix deleted file mode 100644 index d498fdb1cc8..00000000000 --- a/pkgs/data/misc/prjxray-db/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv -, fetchFromGitHub -}: - -stdenv.mkDerivation rec { - pname = "prjxray-db"; - version = "0.0-0232-g303a61d"; - - src = fetchFromGitHub { - owner = "SymbiFlow"; - repo = "prjxray-db"; - rev = "303a61d8bc552f7a533b91b17448c59e908aa391"; - sha256 = "0r75xig16dbgh3nfygggir0a160x52y766h7hd9xcib9m88jixb2"; - }; - - enableParallelBuilding = true; - - installPhase = '' - runHook preInstall - - DBDIR="$out/share/symbiflow/prjxray-db/" - DB_CONFIG="$out/bin/prjxray-config" - - mkdir -p $DBDIR $out/bin - - for device in artix7 kintex7 zynq7; do - cp -r $src/$device $DBDIR - done - - echo -e "#!/bin/sh\n\necho $DBDIR" > $DB_CONFIG - chmod +x $DB_CONFIG - - runHook postInstall - ''; - - meta = with stdenv.lib; { - description = "Project X-Ray - Xilinx Series 7 Bitstream Documentation"; - homepage = "https://github.com/SymbiFlow/prjxray-db"; - license = licenses.cc0; - maintainers = with maintainers; [ mcaju ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/data/misc/scowl/default.nix b/pkgs/data/misc/scowl/default.nix index 686582b48ce..a4d91eeb037 100644 --- a/pkgs/data/misc/scowl/default.nix +++ b/pkgs/data/misc/scowl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, unzip, zip, libiconv, perl, aspell, dos2unix +{ lib, stdenv, fetchFromGitHub, unzip, zip, libiconv, perl, aspell, dos2unix , singleWordlist ? null }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ unzip zip perl aspell dos2unix ]; - buildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv; + buildInputs = lib.optional (!stdenv.isLinux) libiconv; NIX_CFLAGS_COMPILE = "-Wno-narrowing"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { export PERL5LIB="$PERL5LIB''${PERL5LIB:+:}$PWD/varcon" ''; - postBuild = stdenv.lib.optionalString (singleWordlist == null) '' + postBuild = lib.optionalString (singleWordlist == null) '' ( cd scowl/speller make aspell @@ -104,9 +104,9 @@ stdenv.mkDerivation rec { meta = { inherit version; description = "Spell checker oriented word lists"; - license = stdenv.lib.licenses.mit; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.mit; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.unix; homepage = "http://wordlist.aspell.net/"; }; } diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/data/misc/shared-mime-info/default.nix index 69e1e697a47..c69a9802c0c 100644 --- a/pkgs/data/misc/shared-mime-info/default.nix +++ b/pkgs/data/misc/shared-mime-info/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, pkgconfig +, pkg-config , gettext , perlPackages , itstool @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config gettext itstool ] ++ (with perlPackages; [ diff --git a/pkgs/data/misc/symbiflow-arch-defs/default.nix b/pkgs/data/misc/symbiflow-arch-defs/default.nix deleted file mode 100644 index 89549da85dc..00000000000 --- a/pkgs/data/misc/symbiflow-arch-defs/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv -, fetchurl -, autoPatchelfHook -, python3Packages -, archs ? [ "xc7a100t" "xc7a50t" "xc7z010" "xc7z020" ] -}: - -stdenv.mkDerivation rec { - pname = "symbiflow-arch-defs"; - version = "20200914-111752-g05d68df0"; - - src = fetchurl { - url = "https://storage.googleapis.com/symbiflow-arch-defs/artifacts/prod/foss-fpga-tools/symbiflow-arch-defs/continuous/install/66/20200914-111752/symbiflow-arch-defs-install-05d68df0.tar.xz"; - sha256 = "1gmynybh8n33ag521w17c2kd16n834hqc6d8hi2pfs5kg1jl1a74"; - }; - - sourceRoot = "."; - - propagatedBuildInputs = [ - python3Packages.lxml - python3Packages.python-constraint - ]; - - installPhase = '' - mkdir -p $out/bin - cp -r bin/{symbiflow_*,vpr_common,python} $out/bin - for script in $out/bin/symbiflow_*; do - substituteInPlace $script --replace '/env' '/symbiflow_env' - done - cp bin/env $out/bin/symbiflow_env - - mkdir -p $out/share/symbiflow/arch - cp -r share/symbiflow/{scripts,techmaps} $out/share/symbiflow/ - - for arch in ${builtins.concatStringsSep " " archs}; do - cp -r share/symbiflow/arch/"$arch"_test* $out/share/symbiflow/arch/ - done - ''; - - meta = with stdenv.lib; { - description = "Project X-Ray - Xilinx Series 7 Bitstream Documentation"; - homepage = "https://github.com/SymbiFlow/symbiflow-arch-defs"; - hydraPlatforms = []; - license = licenses.isc; - platforms = platforms.all; - }; -} diff --git a/pkgs/data/misc/unicode-emoji/default.nix b/pkgs/data/misc/unicode-emoji/default.nix index 60ff492330d..b91afb08f60 100644 --- a/pkgs/data/misc/unicode-emoji/default.nix +++ b/pkgs/data/misc/unicode-emoji/default.nix @@ -1,7 +1,6 @@ -{ stdenv +{ lib , fetchurl , symlinkJoin -, lib }: let diff --git a/pkgs/data/misc/xorg-rgb/default.nix b/pkgs/data/misc/xorg-rgb/default.nix index e976fe1358d..24689d571da 100644 --- a/pkgs/data/misc/xorg-rgb/default.nix +++ b/pkgs/data/misc/xorg-rgb/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, xorgproto}: +{lib, stdenv, fetchurl, pkg-config, xorgproto}: stdenv.mkDerivation rec { pname = "rgb"; version = "1.0.6"; @@ -8,14 +8,14 @@ stdenv.mkDerivation rec { sha256 = "1c76zcjs39ljil6f6jpx1x17c8fnvwazz7zvl3vbjfcrlmm7rjmv"; }; - nativeBuildInputs = [pkgconfig]; + nativeBuildInputs = [pkg-config]; buildInputs = [xorgproto]; meta = { inherit version; description = "X11 colorname to RGB mapping database"; - license = stdenv.lib.licenses.mit; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mit; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; homepage = "http://xorg.freedesktop.org/"; }; } diff --git a/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix b/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix index 0faad5b594f..b1db3638682 100644 --- a/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix +++ b/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: let @@ -32,6 +32,6 @@ stdenv.mkDerivation { ''; meta = { - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix b/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix index 4b0ced9daae..85d7ab16796 100644 --- a/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix +++ b/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: let @@ -32,6 +32,6 @@ stdenv.mkDerivation { ''; meta = { - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix index a3b7067b2a4..1c6e57b3e7a 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation { name = "docbook-xml-ebnf-1.2b1"; @@ -20,6 +20,6 @@ stdenv.mkDerivation { ''; meta = { - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix index de126da9f90..8a10defa0fb 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip, findXMLCatalogs}: +{lib, stdenv, fetchurl, unzip, findXMLCatalogs}: let @@ -12,7 +12,7 @@ let in import ./generic.nix { - inherit stdenv unzip findXMLCatalogs; + inherit lib stdenv unzip findXMLCatalogs; name = "docbook-xml-4.1.2"; src = fetchurl { url = "http://www.docbook.org/xml/4.1.2/docbkx412.zip"; diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix index f894db24827..9a9abc0588b 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix @@ -1,7 +1,7 @@ -{stdenv, fetchurl, unzip, findXMLCatalogs}: +{lib, stdenv, fetchurl, unzip, findXMLCatalogs}: import ./generic.nix { - inherit stdenv unzip findXMLCatalogs; + inherit lib stdenv unzip findXMLCatalogs; name = "docbook-xml-4.2"; src = fetchurl { url = "http://www.docbook.org/xml/4.2/docbook-xml-4.2.zip"; diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix index dc2ec36ccef..4d821ce2ffb 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix @@ -1,7 +1,7 @@ -{stdenv, fetchurl, unzip, findXMLCatalogs}: +{lib, stdenv, fetchurl, unzip, findXMLCatalogs}: import ./generic.nix { - inherit stdenv unzip findXMLCatalogs; + inherit lib stdenv unzip findXMLCatalogs; name = "docbook-xml-4.3"; src = fetchurl { url = "http://www.docbook.org/xml/4.3/docbook-xml-4.3.zip"; diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix index 93b03d85457..ca847d3e436 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix @@ -1,7 +1,7 @@ -{stdenv, fetchurl, unzip, findXMLCatalogs}: +{lib, stdenv, fetchurl, unzip, findXMLCatalogs}: import ./generic.nix { - inherit stdenv unzip findXMLCatalogs; + inherit lib stdenv unzip findXMLCatalogs; name = "docbook-xml-4.4"; src = fetchurl { url = "http://www.docbook.org/xml/4.4/docbook-xml-4.4.zip"; diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix index 5bdb63e69da..7be810fe307 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix @@ -1,7 +1,7 @@ -{stdenv, fetchurl, unzip, findXMLCatalogs}: +{lib, stdenv, fetchurl, unzip, findXMLCatalogs}: import ./generic.nix { - inherit stdenv unzip findXMLCatalogs; + inherit lib stdenv unzip findXMLCatalogs; name = "docbook-xml-4.5"; src = fetchurl { url = "http://www.docbook.org/xml/4.5/docbook-xml-4.5.zip"; diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix index 41c4b73d3f6..3d6edd300ec 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, unzip, src, name, postInstall ? "true", meta ? {}, findXMLCatalogs }: +{ lib, stdenv, unzip, src, name, postInstall ? "true", meta ? {}, findXMLCatalogs }: stdenv.mkDerivation { inherit src name postInstall; @@ -18,6 +18,6 @@ stdenv.mkDerivation { ''; meta = meta // { - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix index 383a8750f1f..c698098e6c1 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxml2 }: +{ lib, stdenv, fetchurl, libxml2 }: stdenv.mkDerivation { name = "xhtml1-20020801"; @@ -20,13 +20,13 @@ stdenv.mkDerivation { xmlcatalog --noout --create $cat grep PUBLIC DTD/*.soc | while read x; do eval a=($x) - xmlcatalog --noout --add public "''${a[1]}" "''${a[2]}" $cat + xmlcatalog --noout --add public "''${a[1]}" "''${a[2]}" $cat done ''; # */ meta = { homepage = "http://www.w3.org/TR/xhtml1/"; description = "DTDs for XHTML 1.0, the Extensible HyperText Markup Language"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/data/themes/adapta-kde/default.nix b/pkgs/data/themes/adapta-kde/default.nix index fed16da929c..4feeeaa6c00 100644 --- a/pkgs/data/themes/adapta-kde/default.nix +++ b/pkgs/data/themes/adapta-kde/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "adapta-kde-theme"; @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { meta = { description = "A port of the Adapta theme for Plasma"; homepage = "https://git.io/adapta-kde"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.tadfisher ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.tadfisher ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/data/themes/adapta/default.nix b/pkgs/data/themes/adapta/default.nix index 7bbb8b6acc9..f67d689a4bf 100644 --- a/pkgs/data/themes/adapta/default.nix +++ b/pkgs/data/themes/adapta/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, parallel, sassc, inkscape, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine, gnome3 }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, parallel, sassc, inkscape, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine, gnome3 }: stdenv.mkDerivation rec { pname = "adapta-gtk-theme"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config parallel sassc inkscape diff --git a/pkgs/data/themes/albatross/default.nix b/pkgs/data/themes/albatross/default.nix index 1baa977d101..b53dd553ca2 100644 --- a/pkgs/data/themes/albatross/default.nix +++ b/pkgs/data/themes/albatross/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "Albatross"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "A desktop Suite for Xfce"; homepage = "https://github.com/shimmerproject/Albatross"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/data/themes/arc-kde/default.nix b/pkgs/data/themes/arc-kde/default.nix index c0db85105d5..ecf798364ff 100644 --- a/pkgs/data/themes/arc-kde/default.nix +++ b/pkgs/data/themes/arc-kde/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "arc-kde-theme"; @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { meta = { description = "A port of the arc theme for Plasma"; homepage = "https://git.io/arc-kde"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.nixy ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.nixy ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/data/themes/arc/default.nix b/pkgs/data/themes/arc/default.nix index 919c04913f0..8a283a04185 100644 --- a/pkgs/data/themes/arc/default.nix +++ b/pkgs/data/themes/arc/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "arc-theme"; - version = "20201013"; + version = "20210127"; src = fetchFromGitHub { owner = "jnsh"; repo = pname; rev = version; - sha256 = "1x2l1mwjx68dwf3jb1i90c1q8nqsl1wf2zggcn8im6590k5yv39s"; + sha256 = "sha256-P7YZTD5bAWNWepL7qsZZAMf8ujzNbHOj/SLx8Fw3bi4="; }; nativeBuildInputs = [ diff --git a/pkgs/data/themes/blackbird/default.nix b/pkgs/data/themes/blackbird/default.nix index f4a2fbb7bbe..a3f481b6d4e 100644 --- a/pkgs/data/themes/blackbird/default.nix +++ b/pkgs/data/themes/blackbird/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, gtk-engine-murrine }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "Blackbird"; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { meta = { description = "Dark Desktop Suite for Gtk, Xfce and Metacity"; homepage = "https://github.com/shimmerproject/Blackbird"; - license = with stdenv.lib.licenses; [ gpl2Plus cc-by-nc-sa-30 ]; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.romildo ]; + license = with lib.licenses; [ gpl2Plus cc-by-nc-sa-30 ]; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.romildo ]; }; } diff --git a/pkgs/data/themes/e17gtk/default.nix b/pkgs/data/themes/e17gtk/default.nix index c666cc5d0aa..b6cc44aa0d5 100644 --- a/pkgs/data/themes/e17gtk/default.nix +++ b/pkgs/data/themes/e17gtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "e17gtk"; @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { meta = { 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; - maintainers = [ stdenv.lib.maintainers.romildo ]; + license = lib.licenses.gpl3; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.romildo ]; }; } diff --git a/pkgs/data/themes/equilux-theme/default.nix b/pkgs/data/themes/equilux-theme/default.nix index ddc57c552a1..162b8788508 100644 --- a/pkgs/data/themes/equilux-theme/default.nix +++ b/pkgs/data/themes/equilux-theme/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { patchShebangs install.sh sed -i install.sh \ -e "s|if .*which gnome-shell.*;|if true;|" \ - -e "s|CURRENT_GS_VERSION=.*$|CURRENT_GS_VERSION=${stdenv.lib.versions.majorMinor gnome3.gnome-shell.version}|" + -e "s|CURRENT_GS_VERSION=.*$|CURRENT_GS_VERSION=${lib.versions.majorMinor gnome3.gnome-shell.version}|" mkdir -p $out/share/themes ./install.sh --dest $out/share/themes rm $out/share/themes/*/COPYING diff --git a/pkgs/data/themes/gnome-breeze/default.nix b/pkgs/data/themes/gnome-breeze/default.nix index 25d6d60d652..09f9ecd197a 100644 --- a/pkgs/data/themes/gnome-breeze/default.nix +++ b/pkgs/data/themes/gnome-breeze/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit }: +{ lib, stdenv, fetchgit }: stdenv.mkDerivation { name = "gnome-breeze-20160526"; @@ -17,9 +17,9 @@ stdenv.mkDerivation { meta = { description = "A GTK theme built to match KDE's breeze theme"; homepage = "https://github.com/dirruk1/gnome-breeze"; - license = stdenv.lib.licenses.lgpl2; - maintainers = with stdenv.lib.maintainers; [ bennofs ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.lgpl2; + maintainers = with lib.maintainers; [ bennofs ]; + platforms = lib.platforms.all; hydraPlatforms = []; }; } diff --git a/pkgs/data/themes/greybird/default.nix b/pkgs/data/themes/greybird/default.nix index 987df8deaf4..202424eeb2c 100644 --- a/pkgs/data/themes/greybird/default.nix +++ b/pkgs/data/themes/greybird/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig, sassc, gdk-pixbuf, librsvg, gtk-engine-murrine }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, sassc, gdk-pixbuf, librsvg, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "greybird"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config sassc ]; diff --git a/pkgs/data/themes/jade1/default.nix b/pkgs/data/themes/jade1/default.nix index 7b850c9049e..122d0a4a656 100644 --- a/pkgs/data/themes/jade1/default.nix +++ b/pkgs/data/themes/jade1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "theme-jade1"; - version = "1.10"; + version = "1.11"; src = fetchurl { url = "https://github.com/madmaxms/theme-jade-1/releases/download/v${version}/jade-1-theme.tar.xz"; - sha256 = "17s4r8yjhnz9wrnrma6m8qjp02r47xkjk062sdb8s91dxhh7l8q2"; + sha256 = "0jljmychbs2lsf6g1pck83x4acljdqqsllkdjgiwv3nnlwahzlvs"; }; sourceRoot = "."; diff --git a/pkgs/data/themes/lounge/default.nix b/pkgs/data/themes/lounge/default.nix index af355c168e4..0c51b78333d 100644 --- a/pkgs/data/themes/lounge/default.nix +++ b/pkgs/data/themes/lounge/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gtk-engine-murrine ]; mesonFlags = [ - "-D gnome_version=${stdenv.lib.versions.majorMinor gnome3.gnome-shell.version}" + "-D gnome_version=${lib.versions.majorMinor gnome3.gnome-shell.version}" ]; postFixup = '' diff --git a/pkgs/data/themes/materia-theme/default.nix b/pkgs/data/themes/materia-theme/default.nix index a7351a30ba8..d34ece5c94f 100644 --- a/pkgs/data/themes/materia-theme/default.nix +++ b/pkgs/data/themes/materia-theme/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { dontBuild = true; mesonFlags = [ - "-Dgnome_shell_version=${stdenv.lib.versions.majorMinor gnome3.gnome-shell.version}" + "-Dgnome_shell_version=${lib.versions.majorMinor gnome3.gnome-shell.version}" ]; postInstall = '' diff --git a/pkgs/data/themes/numix-sx/default.nix b/pkgs/data/themes/numix-sx/default.nix index 7c8cf77dfc4..ee887cbadee 100644 --- a/pkgs/data/themes/numix-sx/default.nix +++ b/pkgs/data/themes/numix-sx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk-engine-murrine }: +{ lib, stdenv, fetchurl, gtk-engine-murrine }: stdenv.mkDerivation { version = "2017-04-24"; @@ -23,8 +23,8 @@ stdenv.mkDerivation { meta = { description = "Gray variation of Numix theme"; homepage = "https://www.gnome-look.org/p/1117412/"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.sauyon ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.sauyon ]; }; } diff --git a/pkgs/data/themes/numix/default.nix b/pkgs/data/themes/numix/default.nix index 879a1356153..23f491d4a9a 100644 --- a/pkgs/data/themes/numix/default.nix +++ b/pkgs/data/themes/numix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, sass, glib, libxml2, gdk-pixbuf +{ lib, stdenv, fetchFromGitHub, sass, glib, libxml2, gdk-pixbuf , gtk-engine-murrine }: @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { meta = { description = "Modern flat theme with a combination of light and dark elements (GNOME, Unity, Xfce and Openbox)"; homepage = "https://numixproject.github.io"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.romildo ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.romildo ]; }; } diff --git a/pkgs/data/themes/obsidian2/default.nix b/pkgs/data/themes/obsidian2/default.nix index 3eb056e183e..a965af53d42 100644 --- a/pkgs/data/themes/obsidian2/default.nix +++ b/pkgs/data/themes/obsidian2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "theme-obsidian2"; - version = "2.17"; + version = "2.18"; src = fetchurl { url = "https://github.com/madmaxms/theme-obsidian-2/releases/download/v${version}/obsidian-2-theme.tar.xz"; - sha256 = "1gff34xqypqjhh15lv4cc4ifsg07jx2znlsj9is4wmqf39a8h8n4"; + sha256 = "1w3grlkws4ih7333hys33z4bgm33jbc78bq2pyp8nzw4q9d2hz2r"; }; sourceRoot = "."; diff --git a/pkgs/data/themes/openzone/default.nix b/pkgs/data/themes/openzone/default.nix index cce23bd76ea..e7748612fef 100644 --- a/pkgs/data/themes/openzone/default.nix +++ b/pkgs/data/themes/openzone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, icon-slicer, xcursorgen }: +{ lib, stdenv, fetchFromGitHub, icon-slicer, xcursorgen }: stdenv.mkDerivation rec { pname = "openzone-cursors"; version = "1.2.9"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { makeFlags = [ "DESTDIR=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Clean and sharp X11/Wayland cursor theme"; homepage = "https://www.gnome-look.org/p/999999/"; license = licenses.mit; diff --git a/pkgs/data/themes/orion/default.nix b/pkgs/data/themes/orion/default.nix index 740b3488922..93ea3633fb5 100644 --- a/pkgs/data/themes/orion/default.nix +++ b/pkgs/data/themes/orion/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk-engine-murrine }: +{ lib, stdenv, fetchFromGitHub, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "orion"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/shimmerproject/Orion"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/data/themes/plata/default.nix b/pkgs/data/themes/plata/default.nix index 6153c3607c9..69e6f0bb0d2 100644 --- a/pkgs/data/themes/plata/default.nix +++ b/pkgs/data/themes/plata/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkgconfig, parallel +{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, parallel , sassc, inkscape, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine , cinnamonSupport ? true , gnomeFlashbackSupport ? true @@ -32,15 +32,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config parallel sassc inkscape libxml2 glib.dev ] - ++ stdenv.lib.optionals mateSupport [ gtk3 marco ] - ++ stdenv.lib.optional telegramSupport zip; + ++ lib.optionals mateSupport [ gtk3 marco ] + ++ lib.optional telegramSupport zip; buildInputs = [ gdk-pixbuf @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { configureFlags = let - inherit (stdenv.lib) enableFeature optional; + inherit (lib) enableFeature optional; withOptional = value: feat: optional (value != null) "--with-${feat}=${value}"; in [ "--enable-parallel" diff --git a/pkgs/data/themes/qtcurve/default.nix b/pkgs/data/themes/qtcurve/default.nix index a65a24dc0b6..45a56f3355e 100644 --- a/pkgs/data/themes/qtcurve/default.nix +++ b/pkgs/data/themes/qtcurve/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, cmake, extra-cmake-modules, pkgconfig, mkDerivation +{ lib, fetchFromGitHub, cmake, extra-cmake-modules, pkg-config, mkDerivation , gtk2Support ? true, gtk2 , qtbase, qtsvg, qtx11extras # Toolkit dependencies , karchive, kconfig, kconfigwidgets, kio, frameworkintegration @@ -30,7 +30,7 @@ mkDerivation rec { }) ]; - nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig ]; + nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ]; buildInputs = [ qtbase qtsvg qtx11extras diff --git a/pkgs/data/themes/solarc/default.nix b/pkgs/data/themes/solarc/default.nix index 62a9b1076cf..3f6932e40a0 100644 --- a/pkgs/data/themes/solarc/default.nix +++ b/pkgs/data/themes/solarc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, +{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, gtk-engine-murrine, gtk3 }: @@ -13,7 +13,7 @@ stdenv.mkDerivation { sha256 = "005b66whyxba3403yzykpnlkz0q4m154pxpb4jzcny3fggy9r70s"; }; - nativeBuildInputs = [ autoconf automake pkgconfig gtk3 ]; + nativeBuildInputs = [ autoconf automake pkg-config gtk3 ]; propagatedUserEnvPkgs = [ gtk-engine-murrine gtk3 ]; diff --git a/pkgs/data/themes/vertex/default.nix b/pkgs/data/themes/vertex/default.nix index 7e0b5d7e9cb..d25df29013b 100644 --- a/pkgs/data/themes/vertex/default.nix +++ b/pkgs/data/themes/vertex/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-engine-murrine }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "theme-vertex"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0c9mhrs95ahz37djrv176vn41ywvj26ilwmnr1h9171giv6hid98"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index 5886804392b..11fcdb7452b 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -22,7 +22,7 @@ , libXtst , muffin , networkmanager -, pkgconfig +, pkg-config , polkit , lib, stdenv , wrapGAppsHook @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { libXtst muffin networkmanager - pkgconfig + pkg-config polkit libxml2 libgnomekbd diff --git a/pkgs/desktops/cinnamon/cinnamon-common/libcroco.nix b/pkgs/desktops/cinnamon/cinnamon-common/libcroco.nix index 10f5e61a175..d1ec77b7050 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/libcroco.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/libcroco.nix @@ -1,20 +1,20 @@ -{ lib, stdenv, fetchurl, pkgconfig, libxml2, glib, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, libxml2, glib, gnome3 }: stdenv.mkDerivation rec { pname = "libcroco"; version = "0.6.13"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1m110rbj5d2raxcdp4iz0qp172284945awrsbdlq99ksmqsc4zkn"; }; outputs = [ "out" "dev" ]; outputBin = "dev"; - configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic"; + configureFlags = lib.optional stdenv.isDarwin "--disable-Bsymbolic"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxml2 glib ]; passthru = { diff --git a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix index 6a495ccc516..198cfe40a6d 100644 --- a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchFromGitHub -, pkgconfig +, pkg-config , autoreconfHook , glib , gettext @@ -102,7 +102,7 @@ stdenv.mkDerivation rec { doCheck = true; nativeBuildInputs = [ - pkgconfig + pkg-config autoreconfHook wrapGAppsHook gettext diff --git a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix index f9b204d6114..cdcabb1261f 100644 --- a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix @@ -5,7 +5,7 @@ , intltool , meson , ninja -, pkgconfig +, pkg-config , pulseaudio , python3 , lib, stdenv @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { python3 wrapGAppsHook intltool - pkgconfig + pkg-config ]; postPatch = '' diff --git a/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix b/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix index 7f2e260e5df..832a534e5da 100644 --- a/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib , runCommand , nixos-artwork , glib @@ -36,7 +36,7 @@ let in -with stdenv.lib; +with lib; # TODO: Having https://github.com/NixOS/nixpkgs/issues/54150 would supersede this runCommand "cinnamon-gsettings-overrides" {} diff --git a/pkgs/desktops/cinnamon/cinnamon-menus/default.nix b/pkgs/desktops/cinnamon/cinnamon-menus/default.nix index cdcbe6ec805..a1771506477 100644 --- a/pkgs/desktops/cinnamon/cinnamon-menus/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-menus/default.nix @@ -3,7 +3,7 @@ , gobject-introspection , meson , ninja -, pkgconfig +, pkg-config , lib, stdenv , wrapGAppsHook }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meson ninja wrapGAppsHook - pkgconfig + pkg-config ]; meta = with lib; { diff --git a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix index 029dea37de1..80a026e8836 100644 --- a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchFromGitHub -, pkgconfig +, pkg-config , meson , ninja , glib @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config wrapGAppsHook gettext intltool @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { cairo cinnamon-desktop cinnamon-common - gnome3.libgnomekbd + libgnomekbd gnome3.caribou # things diff --git a/pkgs/desktops/cinnamon/cinnamon-session/default.nix b/pkgs/desktops/cinnamon/cinnamon-session/default.nix index 303523420c7..3d63846026a 100644 --- a/pkgs/desktops/cinnamon/cinnamon-session/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-session/default.nix @@ -12,7 +12,7 @@ , makeWrapper , meson , ninja -, pkgconfig +, pkg-config , python3 , lib, stdenv , systemd @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { docbook_xsl docbook_xml_dtd_412 python3 - pkgconfig + pkg-config libxslt xmlto ]; diff --git a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix index 4e930741b99..c5bae4e5767 100644 --- a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix @@ -13,7 +13,7 @@ , libnotify , libxklavier , wrapGAppsHook -, pkgconfig +, pkg-config , pulseaudio , lib, stdenv , systemd @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { autoreconfHook wrapGAppsHook intltool - pkgconfig + pkg-config ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/desktops/cinnamon/cjs/default.nix b/pkgs/desktops/cinnamon/cjs/default.nix index 90989d45e42..184c1438196 100644 --- a/pkgs/desktops/cinnamon/cjs/default.nix +++ b/pkgs/desktops/cinnamon/cjs/default.nix @@ -1,7 +1,7 @@ { dbus-glib , fetchFromGitHub , gobject-introspection -, pkgconfig +, pkg-config , lib, stdenv , wrapGAppsHook , python3 @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson # ADDING cmake breaks the build, ignore meson warning ninja - pkgconfig + pkg-config makeWrapper which # for locale detection libxml2 # for xml-stripblanks diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix index 68ccd76211d..2a52b83f046 100644 --- a/pkgs/desktops/cinnamon/default.nix +++ b/pkgs/desktops/cinnamon/default.nix @@ -31,4 +31,5 @@ lib.makeScope pkgs.newScope (self: with self; { muffin = callPackage ./muffin { }; xapps = callPackage ./xapps { }; warpinator = callPackage ./warpinator { }; + xviewer = callPackage ./xviewer { }; }) diff --git a/pkgs/desktops/cinnamon/muffin/default.nix b/pkgs/desktops/cinnamon/muffin/default.nix index be6f69359cc..93079e21d3d 100644 --- a/pkgs/desktops/cinnamon/muffin/default.nix +++ b/pkgs/desktops/cinnamon/muffin/default.nix @@ -13,7 +13,7 @@ , libstartup_notification , libXtst , libxkbcommon -, pkgconfig +, pkg-config , lib, stdenv , udev , xorg @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { gettext libtool wrapGAppsHook - pkgconfig + pkg-config intltool gnome-doc-utils diff --git a/pkgs/desktops/cinnamon/nemo/default.nix b/pkgs/desktops/cinnamon/nemo/default.nix index aa876a305c6..5017c1ce7d5 100644 --- a/pkgs/desktops/cinnamon/nemo/default.nix +++ b/pkgs/desktops/cinnamon/nemo/default.nix @@ -4,7 +4,7 @@ , gobject-introspection , meson , ninja -, pkgconfig +, pkg-config , lib, stdenv , wrapGAppsHook , libxml2 @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson - pkgconfig + pkg-config ninja wrapGAppsHook intltool diff --git a/pkgs/desktops/cinnamon/warpinator/default.nix b/pkgs/desktops/cinnamon/warpinator/default.nix index 2338c834d1f..efcd20457b3 100644 --- a/pkgs/desktops/cinnamon/warpinator/default.nix +++ b/pkgs/desktops/cinnamon/warpinator/default.nix @@ -1,5 +1,5 @@ { fetchFromGitHub -, lib, stdenv +, lib , gobject-introspection , meson , ninja diff --git a/pkgs/desktops/cinnamon/xapps/default.nix b/pkgs/desktops/cinnamon/xapps/default.nix index 0e8c7defa72..7be80048e3c 100644 --- a/pkgs/desktops/cinnamon/xapps/default.nix +++ b/pkgs/desktops/cinnamon/xapps/default.nix @@ -1,5 +1,4 @@ { fetchFromGitHub -, fetchpatch , glib , gobject-introspection , gtk3 @@ -9,7 +8,7 @@ , xorg , meson , ninja -, pkgconfig +, pkg-config , python3 , lib, stdenv , vala @@ -22,22 +21,15 @@ stdenv.mkDerivation rec { pname = "xapps"; - version = "1.8.9"; + version = "2.0.6"; outputs = [ "out" "dev" ]; - patches = [ - (fetchpatch { - url = "https://github.com/linuxmint/xapp/pull/110/commits/208563d4e2bbcfbeb4425d05f649867065c37615.patch"; - sha256 = "0brqndfgawhayrm36cjh6fkff274729jivjq3h5jx93lprvl2zih"; - }) - ]; - src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "01jx7612p0c0pi0r7fn5g08s6zjfmq1gfm5hi0fkzl0fxf2cx7a7"; + sha256 = "11qbz547qlfsvkz4bdxhryrsf10aw5jc2f1glbik7pvmmm87gf4f"; }; # TODO: https://github.com/NixOS/nixpkgs/issues/36468 @@ -48,7 +40,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook @@ -91,6 +83,10 @@ stdenv.mkDerivation rec { # Patch pastebin & inxi location sed "s|/usr/bin/pastebin|$out/bin/pastebin|" -i scripts/upload-system-info sed "s|'inxi'|'${inxi}/bin/inxi'|" -i scripts/upload-system-info + + # Patch gtk3 module target dir + substituteInPlace libxapp/meson.build \ + --replace "gtk3_dep.get_pkgconfig_variable('libdir')" "'$out'" ''; meta = with lib; { diff --git a/pkgs/desktops/cinnamon/xviewer/default.nix b/pkgs/desktops/cinnamon/xviewer/default.nix new file mode 100644 index 00000000000..53e88ddb947 --- /dev/null +++ b/pkgs/desktops/cinnamon/xviewer/default.nix @@ -0,0 +1,70 @@ +{ stdenv +, lib +, fetchFromGitHub +, autoreconfHook +, cinnamon-desktop +, file +, gdk-pixbuf +, glib +, gobject-introspection +, gtk-doc +, gtk3 +, intltool +, itstool +, lcms2 +, libexif +, libjpeg +, libpeas +, libtool +, libxml2 +, pkg-config +, shared-mime-info +, wrapGAppsHook +, xapps +, yelp-tools }: + +stdenv.mkDerivation rec { + pname = "xviewer"; + version = "2.8.3"; + + src = fetchFromGitHub { + owner = "linuxmint"; + repo = pname; + rev = version; + sha256 = "0h3qgqaiz5swy09fr6z3ag2952hgzsk5d2fpwmwb78yjrzrhnzpy"; + }; + + nativeBuildInputs = [ + wrapGAppsHook + autoreconfHook + cinnamon-desktop + gdk-pixbuf + gobject-introspection + gtk-doc + intltool + itstool + libtool + pkg-config + yelp-tools + ]; + + buildInputs = [ + glib + gtk3 + libexif + libjpeg + libpeas + libxml2 + shared-mime-info + xapps + lcms2 + ]; + + meta = with lib; { + description = "A generic image viewer from Linux Mint"; + homepage = "https://github.com/linuxmint/xviewer"; + license = licenses.gpl2Only; + platforms = platforms.linux; + maintainers = with maintainers; [ tu-maurice ]; + }; +} diff --git a/pkgs/desktops/enlightenment/econnman/default.nix b/pkgs/desktops/enlightenment/econnman/default.nix index 1979b4518a7..a781aa230b6 100644 --- a/pkgs/desktops/enlightenment/econnman/default.nix +++ b/pkgs/desktops/enlightenment/econnman/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, efl, python3Packages, dbus, makeWrapper }: +{ lib, stdenv, fetchurl, pkg-config, efl, python3Packages, dbus, makeWrapper }: stdenv.mkDerivation rec { pname = "econnman"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "057pwwavlvrrq26bncqnfrf449zzaim0zq717xv86av4n940gwv0"; }; - nativeBuildInputs = [ makeWrapper pkgconfig python3Packages.wrapPython ]; + nativeBuildInputs = [ makeWrapper pkg-config python3Packages.wrapPython ]; buildInputs = [ efl python3Packages.python dbus ]; @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { meta = { description = "A user interface for the connman network connection manager"; homepage = "https://enlightenment.org/"; - license = stdenv.lib.licenses.lgpl3; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx romildo ]; + license = lib.licenses.lgpl3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ matejc tstrobel ftrvxmtrx romildo ]; }; } diff --git a/pkgs/desktops/enlightenment/enlightenment/default.nix b/pkgs/desktops/enlightenment/enlightenment/default.nix index 0c6ae68529d..3b750bd08b7 100644 --- a/pkgs/desktops/enlightenment/enlightenment/default.nix +++ b/pkgs/desktops/enlightenment/enlightenment/default.nix @@ -43,8 +43,8 @@ stdenv.mkDerivation rec { xkeyboard_config udisks2 # for removable storage mounting/unmounting ] - ++ stdenv.lib.optional bluetoothSupport bluez5 # for bluetooth configuration and control - ++ stdenv.lib.optional pulseSupport libpulseaudio # for proper audio device control and redirection + ++ lib.optional bluetoothSupport bluez5 # for bluetooth configuration and control + ++ lib.optional pulseSupport libpulseaudio # for proper audio device control and redirection ; patches = [ diff --git a/pkgs/desktops/enlightenment/ephoto/default.nix b/pkgs/desktops/enlightenment/ephoto/default.nix index 36719200c76..2da7df3728d 100644 --- a/pkgs/desktops/enlightenment/ephoto/default.nix +++ b/pkgs/desktops/enlightenment/ephoto/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, efl, pcre, mesa, makeWrapper }: +{ lib, stdenv, fetchurl, pkg-config, efl, pcre, mesa, makeWrapper }: stdenv.mkDerivation rec { pname = "ephoto"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config mesa.dev # otherwise pkg-config does not find gbm makeWrapper ]; @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { meta = { description = "Image viewer and editor written using the Enlightenment Foundation Libraries"; homepage = "https://smhouston.us/projects/ephoto/"; - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.romildo ]; + license = lib.licenses.bsd2; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.romildo ]; }; } diff --git a/pkgs/desktops/enlightenment/evisum/default.nix b/pkgs/desktops/enlightenment/evisum/default.nix index e4b2a7ac205..8222c6ed843 100644 --- a/pkgs/desktops/enlightenment/evisum/default.nix +++ b/pkgs/desktops/enlightenment/evisum/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "evisum"; - version = "0.5.8"; + version = "0.5.9"; src = fetchurl { url = "https://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0cg4vqd069h89k3wrvl550p29y3yzbdnvii58gwc8rghwym621jx"; + sha256 = "sha256-ao5b4Mhr+fhY19X1g0gupcU8LayR55/kgHSwhGUAfys="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/enlightenment/rage/default.nix b/pkgs/desktops/enlightenment/rage/default.nix index 3c4de19fa91..ac3eb796388 100644 --- a/pkgs/desktops/enlightenment/rage/default.nix +++ b/pkgs/desktops/enlightenment/rage/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, efl, gst_all_1, pcre, mesa, wrapGAppsHook }: +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, efl, gst_all_1, pcre, mesa, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "rage"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config mesa.dev wrapGAppsHook ]; @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { meta = { description = "Video + Audio player along the lines of mplayer"; homepage = "https://enlightenment.org/"; - maintainers = with stdenv.lib.maintainers; [ matejc ftrvxmtrx romildo ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.bsd2; + maintainers = with lib.maintainers; [ matejc ftrvxmtrx romildo ]; + platforms = lib.platforms.linux; + license = lib.licenses.bsd2; }; } diff --git a/pkgs/desktops/enlightenment/terminology/default.nix b/pkgs/desktops/enlightenment/terminology/default.nix index 2d0d34ec067..36c449ee9de 100644 --- a/pkgs/desktops/enlightenment/terminology/default.nix +++ b/pkgs/desktops/enlightenment/terminology/default.nix @@ -1,18 +1,19 @@ -{ stdenv, fetchurl, meson, ninja, pkg-config, efl, pcre, mesa }: +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, python3, efl, pcre, mesa }: stdenv.mkDerivation rec { pname = "terminology"; - version = "1.8.1"; + version = "1.9.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1fxqjf7g30ix4qxi6366rrax27s3maxq43z2vakwnhz4mp49m9h4"; + sha256 = "0v74858yvrrfy0l2pq7yn6izvqhpkb9gw2jpd3a3khjwv8kw6frz"; }; nativeBuildInputs = [ meson ninja pkg-config + python3 ]; buildInputs = [ @@ -25,11 +26,15 @@ stdenv.mkDerivation rec { "-D edje-cc=${efl}/bin/edje_cc" ]; + postPatch = '' + patchShebangs data/colorschemes/*.py + ''; + meta = { description = "Powerful terminal emulator based on EFL"; homepage = "https://www.enlightenment.org/about-terminology"; - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx romildo ]; + license = lib.licenses.bsd2; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ matejc tstrobel ftrvxmtrx romildo ]; }; } diff --git a/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix b/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix index ef4c2ba0d91..86d92adbea8 100644 --- a/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix +++ b/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gnome_python, librsvg, libwnck, libgtop, pkgconfig, python2, gtk2 }: +{ lib, stdenv, fetchurl, gnome_python, librsvg, libwnck, libgtop, pkg-config, python2, gtk2 }: let inherit (python2.pkgs) python pygtk; @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { sha256 = "1s8f9rns9v7qlwjv9qh9lr8crp88dpzfm45hj47zc3ivpy0dbnq9"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 librsvg libwnck libgtop python ]; propagatedBuildInputs = [ gnome_python pygtk ]; diff --git a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix index bdcd9d661c3..1e7d726d557 100644 --- a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix +++ b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchurl, python2, pkgconfig, libgnome, GConf, glib, gtk2, gnome_vfs }: +{ lib, stdenv, fetchurl, python2, pkg-config, libgnome, GConf, glib, gtk2, gnome_vfs }: -with stdenv.lib; +with lib; let inherit (python2.pkgs) python pygobject2 pygtk dbus-python; @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { sha256 = "759ce9344cbf89cf7f8449d945822a0c9f317a494f56787782a901e4119b96d8"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ python glib gtk2 GConf libgnome gnome_vfs ]; propagatedBuildInputs = [ pygobject2 pygtk dbus-python ]; diff --git a/pkgs/desktops/gnome-2/bindings/libglademm/default.nix b/pkgs/desktops/gnome-2/bindings/libglademm/default.nix index 177a9f47c31..b997a9ddd1a 100644 --- a/pkgs/desktops/gnome-2/bindings/libglademm/default.nix +++ b/pkgs/desktops/gnome-2/bindings/libglademm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtkmm2, libglade }: +{ stdenv, fetchurl, pkg-config, intltool, gtkmm2, libglade }: stdenv.mkDerivation rec { name = "libglademm-2.6.7"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "devdoc" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ intltool ]; propagatedBuildInputs = [ gtkmm2 libglade ]; diff --git a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix index 87d2931d274..34dfaa85b2f 100644 --- a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix @@ -1,8 +1,8 @@ -{stdenv, fetchpatch, fetchurl, autoreconfHook, pkgconfig, atk, cairo, glib +{lib, stdenv, fetchpatch, fetchurl, autoreconfHook, pkg-config, atk, cairo, glib , gnome-common, gtk2, pango , libxml2Python, perl, intltool, gettext, gtk-mac-integration-gtk2 }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "gtksourceview"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ atk cairo glib gtk2 pango libxml2Python perl intltool diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix index 6cfc2891ee4..1e0064a8fad 100644 --- a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix +++ b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, glib, gnome2, dbus-glib, gmime, gnome-icon-theme, libnotify, libgnome-keyring, openssl, cyrus_sasl, sylpheed, gob2, gettext, intltool, libxml2, hicolor-icon-theme, tango-icon-theme }: +{ lib, stdenv, fetchFromGitHub, pkg-config, glib, gnome2, dbus-glib, gmime, gnome-icon-theme, libnotify, libgnome-keyring, openssl, cyrus_sasl, sylpheed, gob2, gettext, intltool, libxml2, hicolor-icon-theme, tango-icon-theme }: stdenv.mkDerivation rec { rev = "9ae8768"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1slb7gajn30vdaq0hf5rikwdly1npmg1cf83hpjs82xd98knl13d"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib dbus-glib gmime libnotify libgnome-keyring openssl cyrus_sasl sylpheed gob2 gettext intltool gnome2.GConf gnome2.libgnomeui dbus-glib gmime libnotify gnome2.scrollkeeper libxml2 gnome-icon-theme hicolor-icon-theme tango-icon-theme ]; prePatch = '' diff --git a/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix b/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix index e5892c0659f..258789140c8 100644 --- a/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix +++ b/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, perlPackages, libxml2, libxslt, docbook_xml_dtd_42, automake, gettext}: +{stdenv, fetchurl, pkg-config, perlPackages, libxml2, libxslt, docbook_xml_dtd_42, automake, gettext}: stdenv.mkDerivation { name = "scrollkeeper-0.3.14"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { cp ${automake}/share/automake*/config.{sub,guess} . "; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxml2 libxslt gettext ] ++ (with perlPackages; [ perl XMLParser ]); configureFlags = [ "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/catalog.xml" ]; diff --git a/pkgs/desktops/gnome-2/desktop/vte/default.nix b/pkgs/desktops/gnome-2/desktop/vte/default.nix index 81330218d49..6ce8df2daf4 100644 --- a/pkgs/desktops/gnome-2/desktop/vte/default.nix +++ b/pkgs/desktops/gnome-2/desktop/vte/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, intltool, pkgconfig, glib, gtk2, ncurses +{ lib, stdenv, fetchurl, fetchpatch, intltool, pkg-config, glib, gtk2, ncurses , pythonSupport ? false, python27Packages}: let @@ -28,15 +28,15 @@ in stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ intltool glib gtk2 ncurses ] ++ - stdenv.lib.optionals pythonSupport [python pygtk]; + lib.optionals pythonSupport [python pygtk]; configureFlags = [ - (stdenv.lib.enableFeature pythonSupport "python") + (lib.enableFeature pythonSupport "python") ]; - postInstall = stdenv.lib.optionalString pythonSupport '' + postInstall = lib.optionalString pythonSupport '' cd $(toPythonPath $out)/gtk-2.0 for n in *; do ln -s "gtk-2.0/$n" "../$n" @@ -54,8 +54,8 @@ in stdenv.mkDerivation rec { character set conversion, as well as emulating any terminal known to the system's terminfo database. ''; - license = stdenv.lib.licenses.lgpl2; - maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.lgpl2; + maintainers = with lib.maintainers; [ astsmtl ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/desktops/gnome-2/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix index 0e622a38e52..ec8deb537d0 100644 --- a/pkgs/desktops/gnome-2/platform/GConf/default.nix +++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix @@ -1,11 +1,11 @@ -{ lib, stdenv, fetchurl, pkgconfig, dbus-glib, glib, ORBit2, libxml2, polkit, python3, intltool }: +{ lib, stdenv, fetchurl, pkg-config, dbus-glib, glib, ORBit2, libxml2, polkit, python3, intltool }: stdenv.mkDerivation rec { pname = "gconf"; version = "3.2.6"; src = fetchurl { - url = "mirror://gnome/sources/GConf/${stdenv.lib.versions.majorMinor version}/GConf-${version}.tar.xz"; + url = "mirror://gnome/sources/GConf/${lib.versions.majorMinor version}/GConf-${version}.tar.xz"; sha256 = "0k3q9nh53yhc9qxf1zaicz4sk8p3kzq4ndjdsgpaa2db0ccbj4hr"; }; @@ -14,15 +14,15 @@ stdenv.mkDerivation rec { buildInputs = [ ORBit2 libxml2 python3 ] # polkit requires pam, which requires shadow.h, which is not available on # darwin - ++ stdenv.lib.optional (!stdenv.isDarwin) polkit; + ++ lib.optional (!stdenv.isDarwin) polkit; propagatedBuildInputs = [ glib dbus-glib ]; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkg-config intltool ]; configureFlags = # fixes the "libgconfbackend-oldxml.so is not portable" error on darwin - stdenv.lib.optional stdenv.isDarwin [ "--enable-static" ]; + lib.optional stdenv.isDarwin [ "--enable-static" ]; postPatch = '' 2to3 --write --nobackup gsettings/gsettings-schema-convert diff --git a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix index 48198bbdc9d..ab76e0c64fd 100644 --- a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix +++ b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, glib, libIDL, libintl }: +{ lib, stdenv, fetchurl, pkg-config, glib, libIDL, libintl }: stdenv.mkDerivation rec { name = "ORBit2-${minVer}.19"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0l3mhpyym9m5iz09fz0rgiqxl2ym6kpkwpsp1xrr4aa80nlh1jam"; }; - nativeBuildInputs = [ pkgconfig libintl ]; + nativeBuildInputs = [ pkg-config libintl ]; propagatedBuildInputs = [ glib libIDL ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix index 7196840978f..4196cf21c27 100644 --- a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix +++ b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, libxml2, bzip2, openssl, dbus-glib +{ stdenv, fetchurl, fetchpatch, pkg-config, libxml2, bzip2, openssl, dbus-glib , glib, gamin, cdparanoia, intltool, GConf, gnome_mime_data, avahi, acl }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ intltool pkgconfig ]; + nativeBuildInputs = [ intltool pkg-config ]; buildInputs = [ libxml2 bzip2 openssl dbus-glib gamin cdparanoia gnome_mime_data avahi acl diff --git a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix index 780acebbb37..ed0971b7131 100644 --- a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix +++ b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchFromGitLab -, pkgconfig +, pkg-config , gtk-doc , autoconf , automake @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config gtk-doc autoconf automake diff --git a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix b/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix index f4d6cb534bc..d8e1ea7108e 100644 --- a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix +++ b/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, intltool +{ stdenv, fetchurl, pkg-config, gtk3, intltool , GConf, enchant, isocodes, gnome-icon-theme, gsettings-desktop-schemas }: stdenv.mkDerivation rec { @@ -11,6 +11,6 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = [ gsettings-desktop-schemas gtk3 gnome-icon-theme GConf ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ intltool enchant isocodes ]; } diff --git a/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix b/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix index 57a000351cf..ec87bafc998 100644 --- a/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix +++ b/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, intltool, +{ stdenv, fetchurl, pkg-config, gtk2, intltool, GConf, enchant, isocodes, gnome-icon-theme }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { #http://www.mail-archive.com/debian-bugs-rc@lists.debian.org/msg250091.html patches = [ ./01_remove-disable-deprecated.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 intltool GConf enchant isocodes gnome-icon-theme ]; NIX_LDFLAGS = "-lgthread-2.0"; diff --git a/pkgs/desktops/gnome-2/platform/libIDL/default.nix b/pkgs/desktops/gnome-2/platform/libIDL/default.nix index 1fc78002606..4e9376d5c82 100644 --- a/pkgs/desktops/gnome-2/platform/libIDL/default.nix +++ b/pkgs/desktops/gnome-2/platform/libIDL/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, flex, bison, pkgconfig, glib, gettext}: +{stdenv, fetchurl, flex, bison, pkg-config, glib, gettext}: stdenv.mkDerivation rec { name = "libIDL-${minVer}.14"; @@ -11,5 +11,5 @@ stdenv.mkDerivation rec { buildInputs = [ glib gettext ]; - nativeBuildInputs = [ flex bison pkgconfig ]; + nativeBuildInputs = [ flex bison pkg-config ]; } diff --git a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix index bf0cec8dfbe..8d991d743be 100644 --- a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix +++ b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, flex, bison, pkgconfig, glib, libxml2, popt +{ stdenv, fetchurl, flex, bison, pkg-config, glib, libxml2, popt , intltool, ORBit2, procps }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { preConfigure = # still using stuff deprecated in new glib versions "sed 's/-DG_DISABLE_DEPRECATED//g' -i configure activation-server/Makefile.in"; - nativeBuildInputs = [ flex bison pkgconfig intltool procps ]; + nativeBuildInputs = [ flex bison pkg-config intltool procps ]; buildInputs = [ libxml2 ]; propagatedBuildInputs = [ popt glib ORBit2 ]; } diff --git a/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix b/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix index 0be9d7acb9c..4f9176acf10 100644 --- a/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix +++ b/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bison, pkgconfig, popt, libxml2, gtk2, libtool +{ stdenv, fetchurl, bison, pkg-config, popt, libxml2, gtk2, libtool , intltool, libbonobo, GConf, libgnomecanvas, libgnome, libglade }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkg-config intltool ]; buildInputs = [ bison popt gtk2 libxml2 GConf libglade libtool ]; propagatedBuildInputs = [ libbonobo libgnomecanvas libgnome ]; } diff --git a/pkgs/desktops/gnome-2/platform/libglade/default.nix b/pkgs/desktops/gnome-2/platform/libglade/default.nix index aa7e3b938c8..3eb7b533f09 100644 --- a/pkgs/desktops/gnome-2/platform/libglade/default.nix +++ b/pkgs/desktops/gnome-2/platform/libglade/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, libxml2, python2 ? null, withLibgladeConvert ? false, gettext }: +{ lib, stdenv, fetchurl, pkg-config, gtk2, libxml2, python2 ? null, withLibgladeConvert ? false, gettext }: assert withLibgladeConvert -> python2 != null; @@ -12,9 +12,9 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 gettext ] - ++ stdenv.lib.optional withLibgladeConvert python2; + ++ lib.optional withLibgladeConvert python2; NIX_LDFLAGS = "-lgmodule-2.0"; diff --git a/pkgs/desktops/gnome-2/platform/libgnome/default.nix b/pkgs/desktops/gnome-2/platform/libgnome/default.nix index 42f47bc5a83..ee477cb63c1 100644 --- a/pkgs/desktops/gnome-2/platform/libgnome/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnome/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, popt, zlib, libcanberra-gtk2 +{ stdenv, fetchurl, pkg-config, glib, popt, zlib, libcanberra-gtk2 , intltool, libbonobo, GConf, gnome_vfs, libtool, libogg }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ popt zlib intltool GConf gnome_vfs libcanberra-gtk2 libtool ]; propagatedBuildInputs = [ glib libbonobo libogg ]; } diff --git a/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix index 72928d82037..eb40c5ec0b5 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, intltool, libart_lgpl, libglade }: +{ stdenv, fetchurl, pkg-config, gtk2, intltool, libart_lgpl, libglade }: stdenv.mkDerivation rec { name = "libgnomecanvas-${minVer}.3"; @@ -12,6 +12,6 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; buildInputs = [ libglade ]; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkg-config intltool ]; propagatedBuildInputs = [ libart_lgpl gtk2 ]; } diff --git a/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix index b3ac327f8c3..2811a138cb6 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libgnomecanvas, gtkmm2 }: +{ stdenv, fetchurl, pkg-config, libgnomecanvas, gtkmm2 }: stdenv.mkDerivation { name = "libgnomecanvasmm-2.26.0"; @@ -8,6 +8,6 @@ stdenv.mkDerivation { sha256 = "996577f97f459a574919e15ba7fee6af8cda38a87a98289e9a4f54752d83e918"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libgnomecanvas gtkmm2 ]; } diff --git a/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix index ee0282147de..7e33ee91285 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, gettext, libxml2, intltool, libart_lgpl }: +{ stdenv, fetchurl, pkg-config, gtk2, gettext, libxml2, intltool, libart_lgpl }: stdenv.mkDerivation rec { name = "libgnomecups-0.2.3"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { patches = [ ./glib.patch ./cups_1.6.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 gettext intltool libart_lgpl ]; propagatedBuildInputs = [ libxml2 ]; diff --git a/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix index dd1975ac20f..b67be2b7f5b 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, gtk2, gettext, libxml2, intltool, libart_lgpl +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, gtk2, gettext, libxml2, intltool, libart_lgpl , libgnomecups, bison, flex }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 gettext intltool libart_lgpl libgnomecups bison flex ]; propagatedBuildInputs = [ libxml2 ]; diff --git a/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix index e535fe832d5..80d2c2050af 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, gtk2, gettext, intltool, libgnomecanvas, libgnomeprint, gnome-icon-theme}: +{stdenv, fetchurl, pkg-config, gtk2, gettext, intltool, libgnomecanvas, libgnomeprint, gnome-icon-theme}: stdenv.mkDerivation { name = "libgnomeprintui-2.18.6"; @@ -8,6 +8,6 @@ stdenv.mkDerivation { sha256 = "0spl8vinb5n6n1krnfnr61dwaxidg67h8j94z9p59k2xdsvfashm"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 gettext intltool libgnomecanvas libgnomeprint gnome-icon-theme]; } diff --git a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix index 20cc3877efb..0fa3847d9bd 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, libxml2, xorg, glib, pango +{ stdenv, fetchurl, fetchpatch, pkg-config, libxml2, xorg, glib, pango , intltool, libgnome, libgnomecanvas, libbonoboui, GConf, libtool , gnome_vfs, libgnome-keyring, libglade }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkg-config intltool ]; buildInputs = [ xorg.xlibsWrapper libxml2 GConf pango glib libgnome-keyring libglade libtool ]; diff --git a/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix b/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix index 0d362a28519..e7cf117ecdb 100644 --- a/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, gtk2, gettext, libxml2 }: +{stdenv, fetchurl, pkg-config, gtk2, gettext, libxml2 }: stdenv.mkDerivation { name = "libgtkhtml-2.11.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "0msajafd42545dxzyr5zqka990cjrxw2yz09ajv4zs8m1w6pm9rw"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 gettext ]; propagatedBuildInputs = [ libxml2 ]; diff --git a/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/apps/accerciser/default.nix index c482a3a45ee..2f8163adc72 100644 --- a/pkgs/desktops/gnome-3/apps/accerciser/default.nix +++ b/pkgs/desktops/gnome-3/apps/accerciser/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv +{ lib , fetchurl -, pkgconfig +, pkg-config , gnome3 , gtk3 , wrapGAppsHook @@ -22,7 +22,7 @@ python3.pkgs.buildPythonApplication rec { format = "other"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0fd9vv2abd2if2qj4nlfy7mpd7rc4sx18zhmxd5ijlnfhkpggbp5"; }; @@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec { gobject-introspection # For setup hook itstool libxml2 - pkgconfig + pkg-config dbus wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/apps/cheese/default.nix b/pkgs/desktops/gnome-3/apps/cheese/default.nix index d6d181df964..04c6b31563c 100644 --- a/pkgs/desktops/gnome-3/apps/cheese/default.nix +++ b/pkgs/desktops/gnome-3/apps/cheese/default.nix @@ -4,7 +4,7 @@ , wrapGAppsHook , gnome-video-effects , libcanberra-gtk3 -, pkgconfig +, pkg-config , gtk3 , glib , clutter-gtk @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { version = "3.38.0"; src = fetchurl { - url = "mirror://gnome/sources/cheese/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/cheese/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0vyim2avlgq3a48rgdfz5g21kqk11mfb53b2l883340v88mp7ll8"; }; @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { libxslt meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/apps/file-roller/default.nix index aa0e2c3b1f3..81680fb5df8 100644 --- a/pkgs/desktops/gnome-3/apps/file-roller/default.nix +++ b/pkgs/desktops/gnome-3/apps/file-roller/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, glib, gtk3, meson, ninja, pkgconfig, gnome3, gettext, itstool, libxml2, libarchive +{ lib, stdenv, fetchurl, glib, gtk3, meson, ninja, pkg-config, gnome3, gettext, itstool, libxml2, libarchive , file, json-glib, python3, wrapGAppsHook, desktop-file-utils, libnotify, nautilus, glibcLocales }: stdenv.mkDerivation rec { @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { version = "3.38.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "06ikvjjcgb8nxabkn2rywy76a1c7s6w8dszaxvaxldbxarp1qgbj"; }; LANG = "en_US.UTF-8"; # postinstall.py - nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 python3 wrapGAppsHook glibcLocales desktop-file-utils ]; + nativeBuildInputs = [ meson ninja gettext itstool pkg-config libxml2 python3 wrapGAppsHook glibcLocales desktop-file-utils ]; buildInputs = [ glib gtk3 json-glib libarchive file gnome3.adwaita-icon-theme libnotify nautilus ]; diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome-3/apps/gedit/default.nix index c59ff77d29d..79d31c3b8c7 100644 --- a/pkgs/desktops/gnome-3/apps/gedit/default.nix +++ b/pkgs/desktops/gnome-3/apps/gedit/default.nix @@ -2,7 +2,7 @@ , meson , fetchurl , python3 -, pkgconfig +, pkg-config , gtk3 , glib , adwaita-icon-theme @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { version = "3.38.1"; src = fetchurl { - url = "mirror://gnome/sources/gedit/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gedit/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0kc48a399achcz6vlqq0jk0b8ixbrzyv9xb22s5av76m5hyqalq0"; }; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meson ninja perl - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/desktops/gnome-3/apps/ghex/default.nix b/pkgs/desktops/gnome-3/apps/ghex/default.nix index 44e714382a3..fb8cf0a1a1c 100644 --- a/pkgs/desktops/gnome-3/apps/ghex/default.nix +++ b/pkgs/desktops/gnome-3/apps/ghex/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchurl , fetchpatch -, pkgconfig +, pkg-config , meson , ninja , python3 @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/ghex/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/ghex/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1h1pjrr9wynclfykizqd78dbi785wjz6b63p31k87kjvzy8w3nf2"; }; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { itstool meson ninja - pkgconfig + pkg-config python3 wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/apps/gnome-books/default.nix b/pkgs/desktops/gnome-3/apps/gnome-books/default.nix index a3456a0ed48..bff7c5fb281 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-books/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-books/default.nix @@ -5,7 +5,7 @@ , fetchurl , evince , gjs -, pkgconfig +, pkg-config , gtk3 , glib , tracker @@ -31,14 +31,14 @@ stdenv.mkDerivation rec { version = "3.34.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "153vknqisjn5f105avzm933fsc3v0pjzzbwxlqxf8vjjksh1cmya"; }; nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gettext libxslt desktop-file-utils diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix index 8020813c4fe..302fb7f8127 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix @@ -3,7 +3,7 @@ , meson , ninja , wrapGAppsHook -, pkgconfig +, pkg-config , gettext , itstool , libvirt-glib @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { version = "3.38.2"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1zjvng0izbws3506998l3dwsxjbm7wnhqipb8nmqzvi096czvajl"; }; @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { itstool meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook @@ -120,7 +120,7 @@ stdenv.mkDerivation rec { ]; preFixup = '' - gappsWrapperArgs+=(--prefix PATH : "${stdenv.lib.makeBinPath [ mtools cdrkit libcdio ]}") + gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ mtools cdrkit libcdio ]}") ''; postPatch = '' diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix index 6c539c9a970..e15125a00bf 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix @@ -3,7 +3,7 @@ , fetchpatch , meson , ninja -, pkgconfig +, pkg-config , wrapGAppsHook , libdazzle , libgweather @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { version = "3.38.2"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0SG7NLCLbqYB9du6Q6SxYTpuVJP8Cx4uzJDGZnEakS0="; }; @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gettext libxml2 wrapGAppsHook diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix index 9e4d8d8005f..3a65be9440e 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix @@ -2,7 +2,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , gettext , gnome3 , glib @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { version = "3.34.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-characters/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-characters/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0mqaxsa7hcmvid3zbzvxpfkp7s01ghiq6kaibmd3169axrr8ahql"; }; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { gobject-introspection meson ninja - pkgconfig + pkg-config python3 wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix index 39071542a97..a2caaf068eb 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix @@ -3,7 +3,7 @@ , meson , ninja , gettext -, pkgconfig +, pkg-config , wrapGAppsHook , itstool , desktop-file-utils @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { version = "3.38.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-clocks/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-clocks/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0f24g76ax59qnms1rjfyf1i0sa84nadgbr0r6m26p90w1w2wnmnr"; }; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { vala meson ninja - pkgconfig + pkg-config gettext itstool wrapGAppsHook diff --git a/pkgs/desktops/gnome-3/apps/gnome-connections/default.nix b/pkgs/desktops/gnome-3/apps/gnome-connections/default.nix index f672a7c4f99..17f11d0efdc 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-connections/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-connections/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { version = "3.38.1"; src = fetchurl { - url = "mirror://gnome/sources/connections/${stdenv.lib.versions.majorMinor version}/connections-${version}.tar.xz"; + url = "mirror://gnome/sources/connections/${lib.versions.majorMinor version}/connections-${version}.tar.xz"; hash = "sha256-5c7uBFkh9Vsw6bWWUDjNTMDrrFqI5JEgYlsWpfyuTpA="; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix index 6ab8fa84145..3172ae27123 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix @@ -6,7 +6,7 @@ , fetchpatch , evince , gjs -, pkgconfig +, pkg-config , gtk3 , glib , tracker @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { version = "3.34.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-documents/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-documents/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1qph567mapg3s1a26k7b8y57g9bklhj2mh8xm758z9zkms20xafq"; }; @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gettext itstool libxslt diff --git a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix index 0ec65b51c68..93a036228c3 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.38.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-getting-started-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-getting-started-docs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0ficf4i4njqrx3dn5rdkvpvcys5mwfma4zkgfmfkq964jxpwzqvw"; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix index ee023b3d434..20b27b2ddd0 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix @@ -3,7 +3,7 @@ , fetchpatch , meson , ninja -, pkgconfig +, pkg-config , gnome3 , glib , gtk3 @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { version = "3.36.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-logs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-logs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0w1nfdxbv3f0wnhmdy21ydvr4swfc108hypda561p7l9lrhnnxj4"; }; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { python3 meson ninja - pkgconfig + pkg-config wrapGAppsHook gettext itstool diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix index 8ea538eb30b..fa2fb86a5ce 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix @@ -4,7 +4,7 @@ , ninja , gettext , python3 -, pkgconfig +, pkg-config , gnome3 , gtk3 , gobject-introspection @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { version = "3.38.2"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0pa6h3md688752l7cjggncnxv13c07nj584gbz9asdblljk3r9x1"; }; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { gettext meson ninja - pkgconfig + pkg-config python3 wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix index 241120db7a9..be456071e41 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , meson , ninja , gettext @@ -14,7 +14,7 @@ , gnome-online-accounts , grilo , grilo-plugins -, pkgconfig +, pkg-config , gtk3 , pango , glib @@ -35,7 +35,7 @@ python3.pkgs.buildPythonApplication rec { format = "other"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0c2051wngf3jrifl5bv5kyqcci459n62vixxkryiryjcaqwbd1am"; }; @@ -44,7 +44,7 @@ python3.pkgs.buildPythonApplication rec { ninja gettext itstool - pkgconfig + pkg-config libxml2 wrapGAppsHook desktop-file-utils diff --git a/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix b/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix index 60b039c0df6..6fca1c0eea5 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook +{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, wrapGAppsHook , libgtop, intltool, itstool, libxml2, nmap, inetutils }: stdenv.mkDerivation rec { @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { version = "3.8.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1c9cvzvyqgfwa5zzyvp7118pkclji62fkbb33g4y9sp5kw6m397h"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk3 wrapGAppsHook libgtop intltool itstool libxml2 gnome3.adwaita-icon-theme diff --git a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix index 38505f9a83d..c6d4a30ab0a 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix @@ -3,7 +3,7 @@ , ninja , gettext , fetchurl -, pkgconfig +, pkg-config , wrapGAppsHook , itstool , desktop-file-utils @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { version = "3.38.0"; src = fetchurl { - url = "mirror://gnome/sources/bijiben/${stdenv.lib.versions.majorMinor version}/bijiben-${version}.tar.xz"; + url = "mirror://gnome/sources/bijiben/${lib.versions.majorMinor version}/bijiben-${version}.tar.xz"; sha256 = "H/bMCsbGKQe/KgmhchXt0vF7dNrKs6XIminDBJFyvis="; }; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gettext itstool libxml2 diff --git a/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix b/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix index 9bccff4a8a7..cb79a772b79 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , gettext , fetchurl -, pkgconfig +, pkg-config , gtk3 , glib , meson @@ -19,7 +19,7 @@ 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}/${lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "0drfn3wcc8l4n07qwv6p0rw2dwcd00hwzda282q62l6sasks2b2g"; }; @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config wrapGAppsHook gettext diff --git a/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix b/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix index 79fef5bdab1..f5ca1ba0ea6 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, pkgconfig +, pkg-config , gettext , gobject-introspection , wrapGAppsHook @@ -22,12 +22,12 @@ stdenv.mkDerivation rec { version = "3.38.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "I5A/c2G+QQhw+6lHIJFnuW9JB2MGQdM8y6qOQvV0tpk="; }; nativeBuildInputs = [ - pkgconfig + pkg-config gettext meson ninja diff --git a/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix b/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix index d1e43e0a13e..34aed52fa85 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix @@ -3,7 +3,7 @@ , fetchpatch , meson , ninja -, pkgconfig +, pkg-config , python3 , wrapGAppsHook , gettext @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { version = "3.28.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "08ygqbib72jlf9y0a16k54zz51sncpq2wa18wp81v46q8301ymy7"; }; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gettext python3 wrapGAppsHook diff --git a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix index 3080db3f100..9a5079dfc64 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gjs, gobject-introspection +{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, wrapGAppsHook, gjs, gobject-introspection , libgweather, meson, ninja, geoclue2, gnome-desktop, python3, gsettings-desktop-schemas }: stdenv.mkDerivation rec { @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { version = "3.36.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-weather/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-weather/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "11z75ky6xp9hx7lm24xng7ydr20bzh4d6p9sbi9c8ccz2m3fdrk8"; }; - nativeBuildInputs = [ pkgconfig meson ninja wrapGAppsHook python3 ]; + nativeBuildInputs = [ pkg-config meson ninja wrapGAppsHook python3 ]; buildInputs = [ gtk3 gjs gobject-introspection gnome-desktop libgweather gnome3.adwaita-icon-theme geoclue2 gsettings-desktop-schemas diff --git a/pkgs/desktops/gnome-3/apps/polari/default.nix b/pkgs/desktops/gnome-3/apps/polari/default.nix index 6551d653e29..727a82e5ff3 100644 --- a/pkgs/desktops/gnome-3/apps/polari/default.nix +++ b/pkgs/desktops/gnome-3/apps/polari/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, itstool, fetchurl, gdk-pixbuf, adwaita-icon-theme , telepathy-glib, gjs, meson, ninja, gettext, telepathy-idle, libxml2, desktop-file-utils -, pkgconfig, gtk3, glib, libsecret, libsoup, webkitgtk, gobject-introspection, appstream-glib +, pkg-config, gtk3, glib, libsecret, libsoup, webkitgtk, gobject-introspection, appstream-glib , gnome3, wrapGAppsHook, telepathy-logger, gspell, gsettings-desktop-schemas }: let @@ -10,7 +10,7 @@ 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}/${lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "1l82nmb5qk4h69rsdhzlcmjjdhwh9jzfs4cnw8hy39sg5v9ady1s"; }; @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ telepathy-idle telepathy-logger ]; nativeBuildInputs = [ - meson ninja pkgconfig itstool gettext wrapGAppsHook libxml2 + meson ninja pkg-config itstool gettext wrapGAppsHook libxml2 desktop-file-utils gobject-introspection appstream-glib ]; diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix index 355fd645b30..f0972f8d6f1 100644 --- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome-3/apps/seahorse/default.nix @@ -5,7 +5,7 @@ , meson , ninja , libpwquality -, pkgconfig +, pkg-config , gtk3 , glib , wrapGAppsHook @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { version = "3.38.0.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; hash = "sha256-x0XdHebhog8ZorB6Q4uO98yiNaaqc0ENt/E3sCHpsqI="; }; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config vala itstool wrapGAppsHook diff --git a/pkgs/desktops/gnome-3/apps/vinagre/default.nix b/pkgs/desktops/gnome-3/apps/vinagre/default.nix index 7c02715df5e..49abb2f1a70 100644 --- a/pkgs/desktops/gnome-3/apps/vinagre/default.nix +++ b/pkgs/desktops/gnome-3/apps/vinagre/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gtk3, gnome3, vte, libxml2, gtk-vnc, intltool +{ lib, stdenv, fetchurl, pkg-config, gtk3, gnome3, vte, libxml2, gtk-vnc, intltool , libsecret, itstool, wrapGAppsHook, librsvg }: stdenv.mkDerivation rec { @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { version = "3.22.0"; src = fetchurl { - url = "mirror://gnome/sources/vinagre/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/vinagre/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "cd1cdbacca25c8d1debf847455155ee798c3e67a20903df8b228d4ece5505e82"; }; - nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config intltool itstool wrapGAppsHook ]; buildInputs = [ gtk3 vte libxml2 gtk-vnc libsecret gnome3.adwaita-icon-theme librsvg ]; diff --git a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix index d7d1bad54c1..a1be29b0183 100644 --- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix +++ b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, intltool, gnome3 +{ lib, stdenv, fetchurl, pkg-config, intltool, gnome3 , iconnamingutils, gtk3, gdk-pixbuf, librsvg, hicolor-icon-theme }: stdenv.mkDerivation rec { @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "3.38.0"; src = fetchurl { - url = "mirror://gnome/sources/adwaita-icon-theme/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/adwaita-icon-theme/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "15xgz9wzk07442x3s3052as95g0223z4pp9qlsgcs323yama30v6"; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ gdk-pixbuf librsvg ]; - nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk3 ]; + nativeBuildInputs = [ pkg-config intltool iconnamingutils gtk3 ]; dontDropIconThemeCache = true; diff --git a/pkgs/desktops/gnome-3/core/baobab/default.nix b/pkgs/desktops/gnome-3/core/baobab/default.nix index 68c96209623..81faf79cbb6 100644 --- a/pkgs/desktops/gnome-3/core/baobab/default.nix +++ b/pkgs/desktops/gnome-3/core/baobab/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, gettext, fetchurl, vala, desktop-file-utils -, meson, ninja, pkgconfig, python3, gtk3, glib, libxml2 +, meson, ninja, pkg-config, python3, gtk3, glib, libxml2 , wrapGAppsHook, itstool, gnome3 }: let @@ -9,11 +9,11 @@ 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}/${lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "0ac3fbl15l836yvgw724q4whbkws9v4b6l2xy6bnp0b0g0a6i104"; }; - nativeBuildInputs = [ meson ninja pkgconfig vala gettext itstool libxml2 desktop-file-utils wrapGAppsHook python3 ]; + nativeBuildInputs = [ meson ninja pkg-config vala gettext itstool libxml2 desktop-file-utils wrapGAppsHook python3 ]; buildInputs = [ gtk3 glib gnome3.adwaita-icon-theme ]; doCheck = true; diff --git a/pkgs/desktops/gnome-3/core/caribou/default.nix b/pkgs/desktops/gnome-3/core/caribou/default.nix index f61490da1e0..88260f05acf 100644 --- a/pkgs/desktops/gnome-3/core/caribou/default.nix +++ b/pkgs/desktops/gnome-3/core/caribou/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, pkgconfig, gnome3, glib, gtk3, clutter, dbus, python3, libxml2 +{ fetchurl, lib, stdenv, pkg-config, gnome3, glib, gtk3, clutter, dbus, python3, libxml2 , libxklavier, libXtst, gtk2, intltool, libxslt, at-spi2-core, autoreconfHook , wrapGAppsHook, libgee }: @@ -10,7 +10,7 @@ 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}/${lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "0mfychh1q3dx0b96pjz9a9y112bm9yqyim40yykzxx1hppsdjhww"; }; @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkgconfig intltool libxslt libxml2 autoreconfHook wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config intltool libxslt libxml2 autoreconfHook wrapGAppsHook ]; buildInputs = [ glib gtk3 clutter at-spi2-core dbus pythonEnv python3.pkgs.pygobject3 diff --git a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix index 3f128e7378b..4e7892c048f 100644 --- a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix +++ b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, vala, libxslt, pkgconfig, glib, gtk3, gnome3, python3, dconf +{ lib, stdenv, fetchurl, meson, ninja, vala, libxslt, pkg-config, glib, gtk3, gnome3, python3, dconf , libxml2, gettext, docbook_xsl, wrapGAppsHook, gobject-introspection }: let @@ -8,12 +8,12 @@ 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}/${lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "1d1y33c6fm86xz9xbh3bfz4y2pyas01a58lmirmdx0lh6yd292bd"; }; nativeBuildInputs = [ - meson ninja vala libxslt pkgconfig wrapGAppsHook + meson ninja vala libxslt pkg-config wrapGAppsHook gettext docbook_xsl libxml2 gobject-introspection python3 ]; diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix index bc4d67f3a73..8ebb5c3f64f 100644 --- a/pkgs/desktops/gnome-3/core/empathy/default.nix +++ b/pkgs/desktops/gnome-3/core/empathy/default.nix @@ -2,7 +2,7 @@ , intltool , fetchurl , webkitgtk -, pkgconfig +, pkg-config , gtk3 , glib , file @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { version = "3.25.90"; src = fetchurl { - url = "mirror://gnome/sources/empathy/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/empathy/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0sn10fcymc6lyrabk7vx8lpvlaxxkqnmcwj9zdkfa8qf3388k4nc"; }; @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config libtool intltool itstool diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/pkgs/desktops/gnome-3/core/eog/default.nix index 20c126a6284..5187f51cbf2 100644 --- a/pkgs/desktops/gnome-3/core/eog/default.nix +++ b/pkgs/desktops/gnome-3/core/eog/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { version = "3.38.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1xqcfil3b68clafnxg1migp54psqh5x6arnlvdqgmvvpq9hwj7dp"; }; diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix index 7e47ec24af7..9f949b60738 100644 --- a/pkgs/desktops/gnome-3/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix @@ -3,7 +3,7 @@ , ninja , gettext , fetchurl -, pkgconfig +, pkg-config , gtk3 , glib , icu @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { version = "3.38.2"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0v8iymg72m83ikxxyhapvz5v8zh8hlr1pw7n215cy3p8q6yg41cb"; }; @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { libxslt meson ninja - pkgconfig + pkg-config python3 wrapGAppsHook buildPackages.glib diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix index 51778f5e8a9..4a1a305d127 100644 --- a/pkgs/desktops/gnome-3/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/core/evince/default.nix @@ -2,7 +2,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , gettext , libxml2 , appstream @@ -43,13 +43,13 @@ stdenv.mkDerivation rec { pname = "evince"; - version = "3.38.0"; + version = "3.38.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/evince/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0j0ry0y9qi1mlm7dcjwrmrw45s1225ri8sv0s9vb8ibm85x8kpr6"; + url = "mirror://gnome/sources/evince/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "APbWaJzCLePABb2H1MLr9yAGTLjcahiHgW+LfggrLmM="; }; postPatch = '' @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { itstool meson ninja - pkgconfig + pkg-config python3 wrapGAppsHook yelp-tools @@ -94,8 +94,8 @@ stdenv.mkDerivation rec { poppler t1lib texlive.bin.core # kpathsea for DVI support - ] ++ stdenv.lib.optional supportXPS libgxps - ++ stdenv.lib.optionals supportMultimedia (with gst_all_1; [ + ] ++ lib.optional supportXPS libgxps + ++ lib.optionals supportMultimedia (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav ]); mesonFlags = [ @@ -126,7 +126,7 @@ stdenv.mkDerivation rec { on the GNOME Desktop with a single simple application. ''; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; platforms = platforms.linux; maintainers = teams.gnome.members; }; diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index 3415203dccc..900040a7611 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, substituteAll, pkgconfig, gnome3, python3, gobject-introspection +{ fetchurl, lib, stdenv, substituteAll, pkg-config, gnome3, python3, gobject-introspection , intltool, libsoup, libxml2, libsecret, icu, sqlite, tzdata, libcanberra-gtk3, gcr , p11-kit, db, nspr, nss, libical, gperf, wrapGAppsHook, glib-networking, pcre , vala, cmake, ninja, kerberos, openldap, webkitgtk, libaccounts-glib, json-glib @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.38.2"; + version = "3.38.3"; outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0mflr8a3f2q55rirvqhizji0zinic75jk8mksflszqzgcdcph85z"; + url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "19rwgvjicfmd5zgabr5ns42rg8cqa05p8qf7684prajjna8gcclp"; }; patches = [ @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - cmake ninja pkgconfig intltool python3 gperf wrapGAppsHook gobject-introspection vala + cmake ninja pkg-config intltool python3 gperf wrapGAppsHook gobject-introspection vala ]; buildInputs = [ glib libsoup libxml2 gtk3 gnome-online-accounts diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix index cda062378f7..c88c1e0f525 100644 --- a/pkgs/desktops/gnome-3/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/core/gdm/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/gdm/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gdm/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "yliiBdXr/L2rVqEXFriY4Wrl3/Ia7nnQdgRkRGKOxNo="; }; @@ -129,7 +129,7 @@ stdenv.mkDerivation rec { # Upstream checks some common paths to find an `X` binary. We already know it. echo #!/bin/sh > build-aux/find-x-server.sh - echo "echo ${stdenv.lib.getBin xorg.xorgserver}/bin/X" >> build-aux/find-x-server.sh + echo "echo ${lib.getBin xorg.xorgserver}/bin/X" >> build-aux/find-x-server.sh patchShebangs build-aux/find-x-server.sh ''; diff --git a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix index ed8e513f8d3..36bf7b3e92c 100644 --- a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix @@ -1,11 +1,11 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkgconfig, gnome3, gettext }: +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gnome3, gettext }: stdenv.mkDerivation rec { pname = "gnome-backgrounds"; version = "3.38.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-backgrounds/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-backgrounds/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1qqygm15rcdgm36vz2iy7b9axndjzvpi29lmygyakjc07a3jlwgp"; }; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { updateScript = gnome3.updateScript { packageName = "gnome-backgrounds"; attrPath = "gnome3.gnome-backgrounds"; }; }; - nativeBuildInputs = [ meson ninja pkgconfig gettext ]; + nativeBuildInputs = [ meson ninja pkg-config gettext ]; meta = with lib; { platforms = platforms.unix; diff --git a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix index 9a1c7289810..2397b9d7be9 100644 --- a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gnome3, meson, ninja, pkgconfig, gtk3, intltool, glib +{ lib, stdenv, fetchurl, gnome3, meson, ninja, pkg-config, gtk3, intltool, glib , udev, itstool, libxml2, wrapGAppsHook, libnotify, libcanberra-gtk3, gobject-introspection , gtk-doc, docbook_xsl, docbook_xml_dtd_43, python3, gsettings-desktop-schemas }: @@ -12,12 +12,12 @@ in stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" "man" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "08k4jak4r72pvn5kjhm21planyc514j6c7jjj5lv9nmvvlxqw1ha"; }; nativeBuildInputs = [ - meson ninja intltool itstool pkgconfig libxml2 wrapGAppsHook gobject-introspection + meson ninja intltool itstool pkg-config libxml2 wrapGAppsHook gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_43 python3 ]; buildInputs = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix index 8af32c9208a..e033197b347 100644 --- a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, meson, ninja, vala, gettext, itstool, fetchurl, pkgconfig, libxml2 +{ lib, stdenv, meson, ninja, vala, gettext, itstool, fetchurl, pkg-config, libxml2 , gtk3, glib, gtksourceview4, wrapGAppsHook, gobject-introspection, python3 , gnome3, mpfr, gmp, libsoup, libmpc, gsettings-desktop-schemas, libgee }: @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { version = "3.38.2"; src = fetchurl { - url = "mirror://gnome/sources/gnome-calculator/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-calculator/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0sri58cp6v07cqpdsf8dhf9dnykz305kvkx0l9dd25g06djcr0wc"; }; nativeBuildInputs = [ - meson ninja pkgconfig vala gettext itstool wrapGAppsHook python3 + meson ninja pkg-config vala gettext itstool wrapGAppsHook python3 gobject-introspection # for finding vapi files ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix b/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix index 305163179aa..73db99f3d37 100644 --- a/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix @@ -2,7 +2,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , gettext , itstool , desktop-file-utils @@ -24,14 +24,14 @@ stdenv.mkDerivation rec { version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1vpxa2zjz3lkq9ldjg0fl65db9s6b4kcs8nyaqfz3jygma7ifg3w"; }; nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gettext itstool desktop-file-utils diff --git a/pkgs/desktops/gnome-3/core/gnome-common/default.nix b/pkgs/desktops/gnome-3/core/gnome-common/default.nix index ba2fcb39979..53e3ed47ebe 100644 --- a/pkgs/desktops/gnome-3/core/gnome-common/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-common/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.18.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-common/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-common/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "22569e370ae755e04527b76328befc4c73b62bfd4a572499fde116b8318af8cf"; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix index a6cb63de23c..3a7e21c65f5 100644 --- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix @@ -3,7 +3,7 @@ , fetchurl , evolution-data-server , fetchpatch -, pkgconfig +, pkg-config , libxslt , docbook_xsl , docbook_xml_dtd_42 @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { version = "3.38.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-contacts/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-contacts/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0hsq0dwxjahcaxnm1m4r1lync9k2fkwzybfmkchrmn95vqcwwvf9"; }; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config vala gettext libxslt diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix index 18bcc8e2e89..5a78f412dc7 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -52,7 +52,7 @@ , networkmanagerapplet , libnma , ninja -, pkgconfig +, pkg-config , polkit , python3 , samba @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { version = "3.38.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "09i011hf23s2i4wim43vjys7y4y43cxl3kyvrnrwqvqgc5n0144d"; }; # See https://mail.gnome.org/archives/distributor-list/2020-September/msg00001.html @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { libxslt meson ninja - pkgconfig + pkg-config python3 shared-mime-info wrapGAppsHook diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix index a818f23d086..bfe0bfe9d61 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, substituteAll, pkgconfig, libxslt, ninja, gnome3, gtk3, glib +{ lib, stdenv, fetchurl, substituteAll, pkg-config, libxslt, ninja, gnome3, gtk3, glib , gettext, libxml2, xkeyboard_config, isocodes, meson, wayland , libseccomp, systemd, bubblewrap, gobject-introspection, gtk-doc, docbook_xsl, gsettings-desktop-schemas }: @@ -9,12 +9,12 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-desktop/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1m7iww1zk845szs9s3zc8a1s1wpd6kizndhq7gqy3575c0xgr2w9"; }; nativeBuildInputs = [ - pkgconfig meson ninja gettext libxslt libxml2 gobject-introspection + pkg-config meson ninja gettext libxslt libxml2 gobject-introspection gtk-doc docbook_xsl glib ]; buildInputs = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix index 51382ad4cae..bb602c8b3fa 100644 --- a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, meson, ninja, pkgconfig, desktop-file-utils, appstream-glib, libxslt +{ lib, stdenv, fetchurl, fetchpatch, meson, ninja, pkg-config, desktop-file-utils, appstream-glib, libxslt , libxml2, gettext, itstool, wrapGAppsHook, docbook_xsl, docbook_xml_dtd_43 , gnome3, gtk3, glib, gsettings-desktop-schemas }: @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "3.26.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-dictionary/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-dictionary/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "16b8bc248dcf68987826d5e39234b1bb7fd24a2607fcdbf4258fde88f012f300"; }; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { doCheck = true; nativeBuildInputs = [ - meson ninja pkgconfig wrapGAppsHook libxml2 gettext itstool + meson ninja pkg-config wrapGAppsHook libxml2 gettext itstool desktop-file-utils appstream-glib libxslt docbook_xsl docbook_xml_dtd_43 ]; buildInputs = [ gtk3 glib gsettings-desktop-schemas gnome3.adwaita-icon-theme ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix index db7e60bbafb..95dfd0ef282 100644 --- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, gettext, fetchurl, pkgconfig, udisks2, libsecret, libdvdread +{ lib, stdenv, gettext, fetchurl, pkg-config, udisks2, libsecret, libdvdread , meson, ninja, gtk3, glib, wrapGAppsHook, python3, libnotify , itstool, gnome3, libxml2, gsettings-desktop-schemas , libcanberra-gtk3, libxslt, docbook_xsl, libpwquality, systemd }: @@ -8,12 +8,12 @@ stdenv.mkDerivation rec { version = "3.38.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-disk-utility/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-disk-utility/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1TuF3BMDobXOHkIcH1xqwLMY4HzZqVk50uHwlZpe19k="; }; nativeBuildInputs = [ - meson ninja pkgconfig gettext itstool libxslt docbook_xsl + meson ninja pkg-config gettext itstool libxslt docbook_xsl wrapGAppsHook python3 libxml2 ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix index 2bae66d7d45..83563c7d212 100644 --- a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, meson, ninja, gettext, fetchurl -, pkgconfig, gtk3, glib, libxml2, gnome-desktop, adwaita-icon-theme +, pkg-config, gtk3, glib, libxml2, gnome-desktop, adwaita-icon-theme , wrapGAppsHook, gnome3, harfbuzz }: stdenv.mkDerivation rec { @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { version = "3.34.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-font-viewer/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-font-viewer/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "12xrsqwmvid7hksiw4zhj4jd1qwxn8w0czskbq4yqfprwn1havxa"; }; doCheck = true; - nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook libxml2 ]; + nativeBuildInputs = [ meson ninja pkg-config gettext wrapGAppsHook libxml2 ]; buildInputs = [ gtk3 glib gnome-desktop adwaita-icon-theme harfbuzz ]; # Do not run meson-postinstall.sh diff --git a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix index 4f20910e20d..002ae9197b7 100644 --- a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix @@ -4,7 +4,7 @@ , gettext , meson , ninja -, pkgconfig +, pkg-config , wrapGAppsHook , gnome3 , accountsservice @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { version = "3.38.2"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; hash = "sha256-qliJJ0+LC23moFErR3Qrgqw0ANrsgt1O/+LuonRko7g="; }; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { gettext meson ninja - pkgconfig + pkg-config systemd wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix index eeb03125a26..93453cc72e9 100644 --- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, dbus, libgcrypt, pam, python2, glib, libxslt +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, dbus, libgcrypt, pam, python2, glib, libxslt , gettext, gcr, libcap_ng, libselinux, p11-kit, openssh, wrapGAppsHook , docbook_xsl, docbook_xml_dtd_43, gnome3 }: @@ -7,10 +7,18 @@ stdenv.mkDerivation rec { version = "3.36.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-keyring/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-keyring/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "11sgffrrpss5cmv3b717pqlbhgq17l1xd33fsvqgsw8simxbar52"; }; + patches = [ + # version 3.36.0 is incompatible with libncap_ng >= 0.8.1. remove patch after update. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-keyring/-/commit/ebc7bc9efacc17049e54da8d96a4a29943621113.diff"; + sha256 = "07bx7zmdswqsa3dj37m729g35n1prhylkw7ya8a7h64i10la12cs"; + }) + ]; + outputs = [ "out" "dev" ]; buildInputs = [ @@ -19,7 +27,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig gettext libxslt docbook_xsl docbook_xml_dtd_43 wrapGAppsHook + pkg-config gettext libxslt docbook_xsl docbook_xml_dtd_43 wrapGAppsHook ]; configureFlags = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix index abc791acb09..3cc85053bce 100644 --- a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { version = "3.34.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-online-miners/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-online-miners/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1n2jz9i8a42zwxx5h8j2gdy6q1vyydh4vl00r0al7w8jzdh24p44"; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix index 7e428688b92..8411b2edecb 100644 --- a/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix @@ -3,7 +3,7 @@ , cairo , meson , ninja -, pkgconfig +, pkg-config , python3 , wrapGAppsHook , glib @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { version = "0.1.9"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; hash = "sha256-8iZtp4tBRT7NNRKuzwop3rcMvq16RG/I2sAlEIsJ0M8="; }; nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config python3 wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix index f6aac0faf4a..432f7d9e2ad 100644 --- a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, gettext, libxml2, libhandy, fetchurl, pkgconfig, libcanberra-gtk3 +{ lib, stdenv, gettext, libxml2, libhandy, fetchurl, pkg-config, libcanberra-gtk3 , gtk3, glib, meson, ninja, python3, wrapGAppsHook, appstream-glib, desktop-file-utils , gnome3, gsettings-desktop-schemas }: @@ -9,7 +9,7 @@ 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}/${lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "1h4zsaybjrlkfcrvriyybg4gfr7v9d1ndh2p516k94ad2gfx6mp5"; }; @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { patchShebangs build-aux/postinstall.py ''; - nativeBuildInputs = [ meson ninja pkgconfig gettext appstream-glib libxml2 desktop-file-utils python3 wrapGAppsHook ]; + nativeBuildInputs = [ meson ninja pkg-config gettext appstream-glib libxml2 desktop-file-utils python3 wrapGAppsHook ]; buildInputs = [ gtk3 glib libcanberra-gtk3 libhandy gnome3.adwaita-icon-theme gsettings-desktop-schemas diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix index ade6ef2bb34..d2dca54b5ca 100644 --- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, substituteAll, meson, ninja, pkgconfig, gnome3, glib, gtk3, gsettings-desktop-schemas +{ fetchurl, lib, stdenv, substituteAll, meson, ninja, pkg-config, gnome3, glib, gtk3, gsettings-desktop-schemas , gnome-desktop, dbus, json-glib, libICE, xmlto, docbook_xsl, docbook_xml_dtd_412, python3 , libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash, gnome-session-ctl }: @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { outputs = ["out" "sessions"]; src = fetchurl { - url = "mirror://gnome/sources/gnome-session/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-session/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0rrxjk3vbqy3cdgnl7rw71dvcyrvhwq3m6s53dnkyjxsrnr0xk3v"; }; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dsystemd=true" "-Dsystemd_session=default" ]; nativeBuildInputs = [ - meson ninja pkgconfig gettext makeWrapper + meson ninja pkg-config gettext makeWrapper xmlto libxslt docbook_xsl docbook_xml_dtd_412 python3 dbus # for DTD ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix index 45250086f1d..e5923e6b56a 100644 --- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix @@ -4,7 +4,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , gnome3 , perl , gettext @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { version = "3.38.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-settings-daemon/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0r010wzw3dj87mapzvq15zv93i86wg0x0rpii3x2wapq3bcj30g2"; }; @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config perl gettext libxml2 diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix index b5d23009045..8b882df3b00 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, gettext, pkgconfig, spidermonkey_68, glib +{ lib, stdenv, fetchurl, meson, ninja, gettext, pkg-config, spidermonkey_68, glib , gnome3, gnome-menus, substituteAll }: stdenv.mkDerivation rec { @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "3.38.2"; src = fetchurl { - url = "mirror://gnome/sources/gnome-shell-extensions/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0hzn975v49rv3nsqp8m0mzv8gcm7nyvn54gj3zsml8ahlxwl592p"; }; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { # https://gitlab.gnome.org/GNOME/gnome-shell-extensions/blob/3.34.0/meson.build#L23 checkInputs = [ spidermonkey_68 ]; - nativeBuildInputs = [ meson ninja pkgconfig gettext glib ]; + nativeBuildInputs = [ meson ninja pkg-config gettext glib ]; mesonFlags = [ "-Dextension_set=all" ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index b7dfb90841f..56408d464db 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-shell/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "05fm7kxyvws2lbb156wfa2wf4xmkxr49rrjxg0yaxf68v000yq2k"; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix index b3a8b2c7d3a..ff80efaa4de 100644 --- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix @@ -1,13 +1,43 @@ -{ lib, stdenv, fetchurl, substituteAll, pkgconfig, meson, ninja, gettext, gnome3, wrapGAppsHook, packagekit, ostree -, glib, appstream-glib, libsoup, polkit, isocodes, gspell, libxslt, gobject-introspection, flatpak, fwupd -, gtk3, gsettings-desktop-schemas, gnome-desktop, libxmlb, gnome-online-accounts -, json-glib, libsecret, valgrind-light, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_43, gtk-doc, desktop-file-utils -, libsysprof-capture }: +{ lib +, stdenv +, fetchurl +, substituteAll +, pkg-config +, meson +, ninja +, gettext +, gnome3 +, wrapGAppsHook +, packagekit +, ostree +, glib +, appstream-glib +, libsoup +, polkit +, isocodes +, gspell +, libxslt +, gobject-introspection +, flatpak +, fwupd +, gtk3 +, gsettings-desktop-schemas +, gnome-desktop +, libxmlb +, gnome-online-accounts +, json-glib +, libsecret +, valgrind-light +, docbook-xsl-nons +, docbook_xml_dtd_42 +, docbook_xml_dtd_43 +, gtk-doc +, desktop-file-utils +, libsysprof-capture +}: let - withFwupd = stdenv.isx86_64 || stdenv.isi686; - in stdenv.mkDerivation rec { @@ -15,7 +45,7 @@ stdenv.mkDerivation rec { version = "3.38.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-software/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-software/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0rjm486vgn6gi9mv1rqdcvr9cilmw6in4r6djqkxbxqll89cp2l7"; }; @@ -27,16 +57,39 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - meson ninja pkgconfig gettext wrapGAppsHook libxslt docbook_xml_dtd_42 docbook_xml_dtd_43 - valgrind-light docbook_xsl gtk-doc desktop-file-utils gobject-introspection + meson + ninja + pkg-config + gettext + wrapGAppsHook + libxslt + docbook_xml_dtd_42 + docbook_xml_dtd_43 + valgrind-light + docbook-xsl-nons + gtk-doc + desktop-file-utils + gobject-introspection ]; buildInputs = [ - gtk3 glib packagekit appstream-glib libsoup - gsettings-desktop-schemas gnome-desktop - gspell json-glib libsecret ostree - polkit flatpak libxmlb gnome-online-accounts libsysprof-capture - ] ++ stdenv.lib.optionals withFwupd [ + gtk3 + glib + packagekit + appstream-glib + libsoup + gsettings-desktop-schemas + gnome-desktop + gspell + json-glib + libsecret + ostree + polkit + flatpak + libxmlb + gnome-online-accounts + libsysprof-capture + ] ++ lib.optionals withFwupd [ fwupd ]; @@ -45,13 +98,13 @@ stdenv.mkDerivation rec { "-Dgudev=false" # FIXME: package malcontent parental controls "-Dmalcontent=false" - ] ++ stdenv.lib.optionals (!withFwupd) [ + ] ++ lib.optionals (!withFwupd) [ "-Dfwupd=false" ]; passthru = { updateScript = gnome3.updateScript { - packageName = "gnome-software"; + packageName = pname; attrPath = "gnome3.gnome-software"; }; }; @@ -59,7 +112,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Software store that lets you install and update applications and system extensions"; homepage = "https://wiki.gnome.org/Apps/Software"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = teams.gnome.members; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix index 7675e1be864..db978f953b7 100644 --- a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, gettext, fetchurl, pkgconfig, gtkmm3, libxml2 +{ lib, stdenv, gettext, fetchurl, pkg-config, gtkmm3, libxml2 , bash, gtk3, glib, wrapGAppsHook, meson, ninja, python3 , gsettings-desktop-schemas, itstool, gnome3, librsvg, gdk-pixbuf, libgtop, systemd }: @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { version = "3.38.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-system-monitor/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-system-monitor/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1x5gd30g87im7fnqj63njlac69zywfd1r0vgsxkjag2hsns7mgvk"; }; doCheck = true; nativeBuildInputs = [ - pkgconfig gettext itstool wrapGAppsHook meson ninja python3 + pkg-config gettext itstool wrapGAppsHook meson ninja python3 ]; buildInputs = [ bash gtk3 glib libxml2 gtkmm3 libgtop gdk-pixbuf gnome3.adwaita-icon-theme librsvg diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix index e88d6f8fa40..087aa7f5ce0 100644 --- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv, fetchurl, pkgconfig, libxml2, gnome3, dconf, nautilus +{ lib, stdenv, fetchurl, pkg-config, libxml2, gnome3, dconf, nautilus , gtk3, gsettings-desktop-schemas, vte, gettext, which, libuuid, vala , desktop-file-utils, itstool, wrapGAppsHook, glib, pcre2 , libxslt, docbook-xsl-nons }: stdenv.mkDerivation rec { pname = "gnome-terminal"; - version = "3.38.1"; + version = "3.38.2"; src = fetchurl { - url = "mirror://gnome/sources/gnome-terminal/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1lgkvla0fadg76j898p2x2fipqf8kkqbbmmsfkfpz11q9y1d966r"; + url = "mirror://gnome/sources/gnome-terminal/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "J73cnQumFMhuXstPVMdevDQV4oh6zZFEIFdUj9MgZhg="; }; buildInputs = [ @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig gettext itstool which libxml2 libxslt docbook-xsl-nons + pkg-config gettext itstool which libxml2 libxslt docbook-xsl-nons vala desktop-file-utils wrapGAppsHook pcre2 ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix b/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix index 8207c8322ff..7b42d724593 100644 --- a/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, intltool, gtk3, gnome3, librsvg, pkgconfig, pango, atk, gtk2 +{ lib, stdenv, fetchurl, intltool, gtk3, gnome3, librsvg, pkg-config, pango, atk, gtk2 , gdk-pixbuf, hicolor-icon-theme }: let @@ -8,7 +8,7 @@ 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}/${lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "06aqg9asq2vqi9wr29bs4v8z2bf4manhbhfghf4nvw01y2zs0jvw"; }; @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { }; }; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkg-config intltool ]; buildInputs = [ gtk3 librsvg pango atk gtk2 gdk-pixbuf ]; propagatedBuildInputs = [ gnome3.adwaita-icon-theme hicolor-icon-theme ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-tour/default.nix b/pkgs/desktops/gnome-3/core/gnome-tour/default.nix index 606dda723bb..2b84442620d 100644 --- a/pkgs/desktops/gnome-3/core/gnome-tour/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-tour/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , rustPlatform , gettext , meson @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { version = "3.38.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; hash = "sha256-hV/C/Lyz6e9zhe3FRw4Sox5gMqThDP57wVCTgcekjng="; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix index d2f2a6242bf..54fcf531c65 100644 --- a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix @@ -6,7 +6,7 @@ , fetchpatch , apacheHttpd , nautilus -, pkgconfig +, pkg-config , gtk3 , glib , libxml2 @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { version = "3.34.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "04r9ck9v4i0d31grbli1d4slw2d6dcsfkpaybkwbzi7wnj72l30x"; }; @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config meson ninja gettext diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/core/gucharmap/default.nix index bbb271004ac..aac5a43e433 100644 --- a/pkgs/desktops/gnome-3/core/gucharmap/default.nix +++ b/pkgs/desktops/gnome-3/core/gucharmap/default.nix @@ -3,7 +3,7 @@ , fetchFromGitLab , meson , ninja -, pkgconfig +, pkg-config , python3 , gtk3 , adwaita-icon-theme @@ -59,7 +59,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config python3 wrapGAppsHook unzip diff --git a/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix index 0b9aacf0ddf..65d2bbc2157 100644 --- a/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, dbus, libgcrypt, pkgconfig, intltool, gobject-introspection, gnome3 }: +{ lib, stdenv, fetchurl, glib, dbus, libgcrypt, pkg-config, intltool, gobject-introspection, gnome3 }: let pname = "libgnome-keyring"; @@ -8,14 +8,14 @@ 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}/${lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783"; }; outputs = [ "out" "dev" ]; propagatedBuildInputs = [ glib gobject-introspection dbus libgcrypt ]; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkg-config intltool ]; passthru = { updateScript = gnome3.updateScript { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "Framework for managing passwords and other secrets"; homepage = "https://wiki.gnome.org/Projects/GnomeKeyring"; - license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ]; + license = with lib.licenses; [ gpl2Plus lgpl2Plus ]; inherit (glib.meta) platforms maintainers; longDescription = '' diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix b/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix index 4e81ae03f85..1f4ca5d3213 100644 --- a/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix @@ -2,7 +2,7 @@ , fetchpatch , substituteAll , lib, stdenv -, pkgconfig +, pkg-config , gnome3 , pantheon , gettext @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" ]; src = fetchurl { - url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/mutter/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; hash = "sha256-I73ofTO4mBNYgxzsiRW7X/Hq+cHedMkM0WYLG5WINSY="; }; @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ - # required for pkgconfig to detect mutter-clutter + # required for pkg-config to detect mutter-clutter json-glib libXtst libcap_ng @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { gettext meson ninja - pkgconfig + pkg-config python3 wrapGAppsHook xorgserver # for cvt command diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index 673966e720d..1ac0be1b194 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -3,7 +3,7 @@ , substituteAll , runCommand , lib, stdenv -, pkgconfig +, pkg-config , gnome3 , gettext , gobject-introspection @@ -47,7 +47,7 @@ let self = stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" ]; src = fetchurl { - url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/mutter/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "03a612m0c7v6y72bs3ghmpyk49177fzq6gdy1jrz4608vnalx5yr"; }; @@ -74,7 +74,7 @@ let self = stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ - # required for pkgconfig to detect mutter-clutter + # required for pkg-config to detect mutter-clutter json-glib libXtst libcap_ng @@ -86,7 +86,7 @@ let self = stdenv.mkDerivation rec { gettext meson ninja - pkgconfig + pkg-config python3 wrapGAppsHook xorgserver # for cvt command diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix index 682740b22bc..5ca1efe1ca3 100644 --- a/pkgs/desktops/gnome-3/core/nautilus/default.nix +++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix @@ -2,7 +2,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , gettext , libxml2 , desktop-file-utils @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { version = "3.38.2"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "19ln84d6s05h6cvx3c500bg5pvkz4k6p6ykmr2201rblq9afp76h"; }; @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { libxml2 meson ninja - pkgconfig + pkg-config python3 wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/core/rygel/default.nix b/pkgs/desktops/gnome-3/core/rygel/default.nix index bf821f31f90..65096c359d7 100644 --- a/pkgs/desktops/gnome-3/core/rygel/default.nix +++ b/pkgs/desktops/gnome-3/core/rygel/default.nix @@ -2,7 +2,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , vala , gettext , libxml2 @@ -34,14 +34,14 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0xrbdsgm78h3g4qcvq2p8k70q31x9xdbb35bixz36q6h9s1wqznn"; }; nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config vala gettext libxml2 diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix index d2d31ada0f8..6d282283925 100644 --- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix +++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix @@ -2,7 +2,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , gettext , itstool , python3 @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { version = "3.38.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0grscz96bwj79ka4qvxh8h75avdx6824k8k38ylmaj6xbl6gi0hy"; }; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ninja gettext itstool - pkgconfig + pkg-config python3 wrapGAppsHook libxml2 diff --git a/pkgs/desktops/gnome-3/core/sushi/default.nix b/pkgs/desktops/gnome-3/core/sushi/default.nix index 2363b921cd7..f5e85a1f16c 100644 --- a/pkgs/desktops/gnome-3/core/sushi/default.nix +++ b/pkgs/desktops/gnome-3/core/sushi/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, pkgconfig +, pkg-config , meson , gettext , gobject-introspection @@ -28,12 +28,12 @@ stdenv.mkDerivation rec { version = "3.38.0"; src = fetchurl { - url = "mirror://gnome/sources/sushi/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/sushi/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0vlqqk916dymv4asbyvalp1m096a5hh99nx23i4xavzvgygh4h2h"; }; nativeBuildInputs = [ - pkgconfig + pkg-config meson ninja gettext diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix index 03da54a1353..a98265ff508 100644 --- a/pkgs/desktops/gnome-3/core/totem/default.nix +++ b/pkgs/desktops/gnome-3/core/totem/default.nix @@ -8,7 +8,7 @@ , clutter-gst , python3Packages , shared-mime-info -, pkgconfig +, pkg-config , gtk3 , glib , gobject-introspection @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { version = "3.38.0"; src = fetchurl { - url = "mirror://gnome/sources/totem/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/totem/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0bs33ijvxbr2prb9yj4dxglsszslsn9k258n311sld84masz4ad8"; }; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meson ninja vala - pkgconfig + pkg-config gettext python3Packages.python itstool diff --git a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix index 91291448883..d4b6561c0de 100644 --- a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , gettext , fetchurl -, pkgconfig +, pkg-config , itstool , libxml2 , libxslt @@ -13,12 +13,12 @@ stdenv.mkDerivation rec { version = "3.38.1"; src = fetchurl { - url = "mirror://gnome/sources/yelp-xsl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/yelp-xsl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0ryzvkcgxp7xi0icmpdl2rinjn904s8imbxdi6wshzxblqymc8dk"; }; nativeBuildInputs = [ - pkgconfig + pkg-config gettext itstool libxml2 @@ -38,7 +38,15 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Apps/Yelp"; description = "Yelp's universal stylesheets for Mallard and DocBook"; maintainers = teams.gnome.members; - license = [licenses.gpl2 licenses.lgpl2]; - platforms = platforms.linux; + license = with licenses; [ + # See https://gitlab.gnome.org/GNOME/yelp-xsl/blob/master/COPYING + # Stylesheets + lgpl2Plus + # Icons, unclear: https://gitlab.gnome.org/GNOME/yelp-xsl/issues/25 + gpl2 + # highlight.js + bsd3 + ]; + platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix index 3b382a71424..62c5994fd41 100644 --- a/pkgs/desktops/gnome-3/core/yelp/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, gettext, fetchurl, webkitgtk, pkgconfig, gtk3, glib +{ lib, stdenv, gettext, fetchurl, webkitgtk, pkg-config, gtk3, glib , gnome3, sqlite , itstool, libxml2, libxslt, gst_all_1 , wrapGAppsHook }: @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { version = "3.38.1"; src = fetchurl { - url = "mirror://gnome/sources/yelp/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/yelp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "102z8khj82vdp12c3y86hhxwm1x89xpkpc5zs63c7gg21cbrwdbl"; }; - nativeBuildInputs = [ pkgconfig gettext itstool wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config gettext itstool wrapGAppsHook ]; buildInputs = [ gtk3 glib webkitgtk sqlite libxml2 libxslt gnome3.yelp-xsl diff --git a/pkgs/desktops/gnome-3/core/zenity/default.nix b/pkgs/desktops/gnome-3/core/zenity/default.nix index 6c6493a42e8..d02cb581cb8 100644 --- a/pkgs/desktops/gnome-3/core/zenity/default.nix +++ b/pkgs/desktops/gnome-3/core/zenity/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, pkgconfig +, pkg-config , libxml2 , gnome3 , gtk3 @@ -16,12 +16,12 @@ stdenv.mkDerivation rec { version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/zenity/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/zenity/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "15fdh8xfdhnwcynyh4byx3mrjxbyprqnwxzi7qn3g5wwaqryg1p7"; }; nativeBuildInputs = [ - pkgconfig + pkg-config gettext yelp-tools itstool diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 2bc825d8149..c4e203913be 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -158,8 +158,6 @@ lib.makeScope pkgs.newScope (self: with self; { cheese = callPackage ./apps/cheese { }; - evolution = callPackage ./apps/evolution { }; - file-roller = callPackage ./apps/file-roller { }; gedit = callPackage ./apps/gedit { }; diff --git a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix index 0a7975c03ca..4802287cb12 100644 --- a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix +++ b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gnome3, gtk3, gjs, flex, bison, libxml2, intltool, +{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, gjs, flex, bison, libxml2, intltool, gdl, libgda, gtksourceview, gsettings-desktop-schemas, itstool, python3, ncurses, makeWrapper }: @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "3.34.0"; src = fetchurl { - url = "mirror://gnome/sources/anjuta/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/anjuta/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "13ql7axw6zz387s7pa1m7wmh7qps3x7fk53h9832vq1yxlq33aa2"; }; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ - pkgconfig intltool itstool python3 makeWrapper + pkg-config intltool itstool python3 makeWrapper # Required by python3 ncurses ]; diff --git a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix index 5f714827e0b..173e4a9e5b8 100644 --- a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix +++ b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix @@ -2,7 +2,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , gnome3 , gtk3 , wrapGAppsHook @@ -23,14 +23,14 @@ stdenv.mkDerivation rec { version = "3.38.1"; src = fetchurl { - url = "mirror://gnome/sources/devhelp/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/devhelp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "13sa25mmlc49kn520hdfbskma65y7smvwmyhfggj0n9s3fazba2d"; }; nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gettext itstool wrapGAppsHook diff --git a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix index 115d9f289cf..bdbe73d2f88 100644 --- a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix +++ b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.38.2"; src = fetchurl { - url = "mirror://gnome/sources/gnome-devel-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-devel-docs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1h6481hbz1c5p69r6h96hbgf560lhp1jibszscgw0s2yikdh6q8n"; }; diff --git a/pkgs/desktops/gnome-3/extensions/clock-override/default.nix b/pkgs/desktops/gnome-3/extensions/clock-override/default.nix new file mode 100644 index 00000000000..6d3a752c886 --- /dev/null +++ b/pkgs/desktops/gnome-3/extensions/clock-override/default.nix @@ -0,0 +1,37 @@ +{ lib, stdenv, fetchzip, gnome3, gettext, glib }: + +stdenv.mkDerivation rec { + pname = "gnome-shell-extension-clock-override"; + version = "12"; + + src = fetchzip { + url = "https://extensions.gnome.org/extension-data/clock-overridegnomeshell.kryogenix.org.v${version}.shell-extension.zip"; + sha256 = "1cyaszks6bwnbgacqsl1pmr24mbj05mad59d4253la9am8ibb4m6"; + stripRoot = false; + }; + + uuid = "clock-override@gnomeshell.kryogenix.org"; + + nativeBuildInputs = [ gettext glib ]; + + buildPhase = '' + runHook preBuild + glib-compile-schemas --strict --targetdir=schemas schemas + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/gnome-shell/extensions/${uuid} + cp -r {convenience.js,extension.js,format.js,locale,metadata.json,prefs.js,schemas} $out/share/gnome-shell/extensions/${uuid} + runHook postInstall + ''; + + meta = with lib; { + description = "Customize the date and time format displayed in clock in the top bar in GNOME Shell"; + license = licenses.mit; + maintainers = with maintainers; [ rhoriguchi ]; + homepage = "https://github.com/stuartlangridge/gnome-shell-clock-override"; + broken = versionOlder gnome3.gnome-shell.version "3.18"; + }; +} diff --git a/pkgs/desktops/gnome-3/extensions/draw-on-your-screen/default.nix b/pkgs/desktops/gnome-3/extensions/draw-on-your-screen/default.nix index e5a2ccd89cd..0e0dab64be1 100644 --- a/pkgs/desktops/gnome-3/extensions/draw-on-your-screen/default.nix +++ b/pkgs/desktops/gnome-3/extensions/draw-on-your-screen/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-draw-on-your-screen"; - version = "6"; + version = "10"; src = fetchgit { url = "https://framagit.org/abakkk/DrawOnYourScreen/"; rev = "v${version}"; - sha256 = "05i20ii8lv6mg56rz8lng80dx35l6g45j8wr7jgbp591hg0spj1w"; + sha256 = "07adzg3mf6k0pmd9lc358w0w3l4pr3p6374day1qhmci2p4zxq6p"; }; uuid = "drawOnYourScreen@abakkk.framagit.org"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A drawing extension for GNOME Shell"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ ericdallo ]; + maintainers = with maintainers; [ ericdallo ahuzik ]; platforms = gnome3.gnome-shell.meta.platforms; homepage = "https://framagit.org/abakkk/DrawOnYourScreen"; }; diff --git a/pkgs/desktops/gnome-3/extensions/dynamic-panel-transparency/default.nix b/pkgs/desktops/gnome-3/extensions/dynamic-panel-transparency/default.nix new file mode 100644 index 00000000000..bf637ecab18 --- /dev/null +++ b/pkgs/desktops/gnome-3/extensions/dynamic-panel-transparency/default.nix @@ -0,0 +1,38 @@ +{ lib, stdenv, fetchFromGitHub, gnome3, glib }: + +stdenv.mkDerivation rec { + pname = "gnome-shell-extension-dynamic-panel-transparency"; + version = "35"; + + src = fetchFromGitHub { + owner = "ewlsh"; + repo = "dynamic-panel-transparency"; + rev = "0800c0a921bb25f51f6a5ca2e6981b1669a69aec"; + sha256 = "0200mx861mlsi9lf7h108yam02jfqqw55r521chkgmk4fy6z99pq"; + }; + + uuid = "dynamic-panel-transparency@rockon999.github.io"; + + nativeBuildInputs = [ glib ]; + + buildPhase = '' + runHook preBuild + glib-compile-schemas --strict --targetdir=${uuid}/schemas/ ${uuid}/schemas + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/gnome-shell/extensions/${uuid} + cp -r ${uuid} $out/share/gnome-shell/extensions + runHook postInstall + ''; + + meta = with lib; { + description = "This extension fades your top panel to nothingness when there are no maximized windows present"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ rhoriguchi ]; + homepage = "https://github.com/ewlsh/dynamic-panel-transparency"; + broken = versionOlder gnome3.gnome-shell.version "3.36"; + }; +} diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix index abb9d9d1bb3..0bdc3974d97 100644 --- a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix +++ b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { "-Dsshkeygen_path=${openssh}/bin/ssh-keygen" "-Dsession_bus_services_dir=${placeholder "out"}/share/dbus-1/services" "-Dpost_install=true" - "-Dinstalled_test_prefix=${placeholder ''installedTests''}" + "-Dinstalled_test_prefix=${placeholder "installedTests"}" ]; postPatch = '' diff --git a/pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix b/pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix index 6c1d6512adc..c83ad7ef4c1 100644 --- a/pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix +++ b/pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-night-theme-switcher"; - version = "36"; + version = "40"; src = fetchFromGitLab { owner = "rmnvgr"; repo = "nightthemeswitcher-gnome-shell-extension"; rev = "v${version}"; - sha256 = "1c88979qprwb5lj0v7va017w7rdr89a648anhw4k5q135jwyskpz"; + sha256 = "0z11y18bgdc0y41hrrzzgi4lagm2cg06x12jgdnary1ycng7xja0"; }; buildInputs = [ glib gnome3.gnome-shell unzip ]; diff --git a/pkgs/desktops/gnome-3/extensions/noannoyance/default.nix b/pkgs/desktops/gnome-3/extensions/noannoyance/default.nix new file mode 100644 index 00000000000..4763d905755 --- /dev/null +++ b/pkgs/desktops/gnome-3/extensions/noannoyance/default.nix @@ -0,0 +1,31 @@ +{ stdenv +, lib +, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "noannoyance"; + version = "unstable-2021-01-17"; + + src = fetchFromGitHub { + owner = "BjoernDaase"; + repo = "noannoyance"; + rev = "f6e76916336aee2f7c4141796f3c40c870d2b347"; + sha256 = "1iy3nif8rjjcwf83fg9ds93fi7vmhliynmlwqnx036s3msmxvgs3"; + }; + + uuid = "noannoyance@daase.net"; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/share/gnome-shell/extensions/${uuid} + cp metadata.json extension.js $out/share/gnome-shell/extensions/${uuid} + ''; + + meta = with lib; { + description = "Removes the 'Window is ready' notification and puts the window into focus"; + homepage = "https://github.com/BjoernDaase/noannoyance"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ tu-maurice ]; + }; +} diff --git a/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix b/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix index 7b98e20ed29..54af3281dc4 100644 --- a/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix +++ b/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ eperuffo ]; homepage = "https://github.com/phocean/TopIcons-plus"; # Unmaintained and no longer working with GNOME Shell 3.34+ - broken = stdenv.lib.versionAtLeast gnome3.gnome-shell.version "3.32"; + broken = lib.versionAtLeast gnome3.gnome-shell.version "3.32"; }; } diff --git a/pkgs/desktops/gnome-3/extensions/unite-shell/default.nix b/pkgs/desktops/gnome-3/extensions/unite/default.nix index add87c10f1a..9d58a923740 100644 --- a/pkgs/desktops/gnome-3/extensions/unite-shell/default.nix +++ b/pkgs/desktops/gnome-3/extensions/unite/default.nix @@ -1,6 +1,6 @@ -{ stdenv, gnome3, fetchFromGitHub, xprop, glib, coreutils }: +{ lib, stdenv, gnome3, fetchFromGitHub, xprop, glib, coreutils }: stdenv.mkDerivation rec { - pname = "gnome-shell-extension-unite-shell"; + pname = "gnome-shell-extension-unite"; version = "44"; src = fetchFromGitHub { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Unite is a GNOME Shell extension which makes a few layout tweaks to the top panel and removes window decorations to make it look like Ubuntu Unity Shell"; license = licenses.gpl3Only; maintainers = with maintainers; [ rhoriguchi ]; diff --git a/pkgs/desktops/gnome-3/extensions/window-corner-preview/default.nix b/pkgs/desktops/gnome-3/extensions/window-corner-preview/default.nix index e7659b6b314..42f226e9677 100644 --- a/pkgs/desktops/gnome-3/extensions/window-corner-preview/default.nix +++ b/pkgs/desktops/gnome-3/extensions/window-corner-preview/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ jtojnar ]; homepage = "https://github.com/medenagan/window-corner-preview"; - broken = stdenv.lib.versionAtLeast gnome3.gnome-shell.version "3.32"; # Doesn't support 3.34 + broken = lib.versionAtLeast gnome3.gnome-shell.version "3.32"; # Doesn't support 3.34 }; } diff --git a/pkgs/desktops/gnome-3/games/atomix/default.nix b/pkgs/desktops/gnome-3/games/atomix/default.nix index 6f8b9ad9bde..802d92bf19a 100644 --- a/pkgs/desktops/gnome-3/games/atomix/default.nix +++ b/pkgs/desktops/gnome-3/games/atomix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkgconfig, wrapGAppsHook, python3 +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, wrapGAppsHook, python3 , gettext, gnome3, glib, gtk3, libgnome-games-support, gdk-pixbuf }: let @@ -8,11 +8,11 @@ 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}/${lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "0h909a4mccf160hi0aimyicqhq2b0gk1dmqp7qwf87qghfrw6m00"; }; - nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook python3 ]; + nativeBuildInputs = [ meson ninja pkg-config gettext wrapGAppsHook python3 ]; buildInputs = [ glib gtk3 gdk-pixbuf libgnome-games-support gnome3.adwaita-icon-theme ]; postPatch = '' diff --git a/pkgs/desktops/gnome-3/games/five-or-more/default.nix b/pkgs/desktops/gnome-3/games/five-or-more/default.nix index 291581661f7..9f6ea6aac04 100644 --- a/pkgs/desktops/gnome-3/games/five-or-more/default.nix +++ b/pkgs/desktops/gnome-3/games/five-or-more/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkgconfig, gnome3, gtk3, wrapGAppsHook +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gnome3, gtk3, wrapGAppsHook , librsvg, libgnome-games-support, gettext, itstool, libxml2, python3, vala }: stdenv.mkDerivation rec { @@ -6,12 +6,12 @@ stdenv.mkDerivation rec { version = "3.32.2"; src = fetchurl { - url = "mirror://gnome/sources/five-or-more/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/five-or-more/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "19pf8wzbf3ciqf2k4bj9sddvyhckfd62x86pnqr6s8h4vn9jc6ii"; }; nativeBuildInputs = [ - meson ninja pkgconfig gettext itstool libxml2 python3 wrapGAppsHook + meson ninja pkg-config gettext itstool libxml2 python3 wrapGAppsHook vala ]; buildInputs = [ diff --git a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix index edd6a2ecd81..17dc8fe7c2c 100644 --- a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix +++ b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook +{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, wrapGAppsHook , gettext, meson, gsound, librsvg, itstool, vala , python3, ninja, desktop-file-utils }: @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { version = "3.38.1"; src = fetchurl { - url = "mirror://gnome/sources/four-in-a-row/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/four-in-a-row/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "10ji60bdfdzb6wk5dkwjc3yww7hqi3yjcx1k1z7x2521h2dpdli1"; }; nativeBuildInputs = [ - pkgconfig wrapGAppsHook gettext meson itstool vala + pkg-config wrapGAppsHook gettext meson itstool vala ninja python3 desktop-file-utils ]; buildInputs = [ gtk3 gsound librsvg gnome3.adwaita-icon-theme ]; diff --git a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix index f1f7cbcaeb8..918adc0eccf 100644 --- a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, vala, pkgconfig, wrapGAppsHook, gobject-introspection +{ lib, stdenv, fetchurl, meson, ninja, vala, pkg-config, wrapGAppsHook, gobject-introspection , gettext, itstool, libxml2, python3, gnome3, glib, gtk3, librsvg }: stdenv.mkDerivation rec { @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { version = "3.38.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-chess/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-chess/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1bpmi5p5vvjdq2rlm5x9k4gpci8jbrjvdxr1q62h5znzq0vz0w0l"; }; - nativeBuildInputs = [ meson ninja vala pkgconfig gettext itstool libxml2 python3 wrapGAppsHook gobject-introspection ]; + nativeBuildInputs = [ meson ninja vala pkg-config gettext itstool libxml2 python3 wrapGAppsHook gobject-introspection ]; buildInputs = [ glib gtk3 librsvg gnome3.adwaita-icon-theme ]; postPatch = '' diff --git a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix index c6a3a24a50b..fe1f092fbf0 100644 --- a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, vala, gnome3, gtk3, wrapGAppsHook, appstream-glib, desktop-file-utils +{ lib, stdenv, fetchurl, pkg-config, vala, gnome3, gtk3, wrapGAppsHook, appstream-glib, desktop-file-utils , glib, librsvg, libxml2, gettext, itstool, libgee, libgnome-games-support , meson, ninja, python3 }: @@ -10,12 +10,12 @@ 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}/${lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "00rwi6z0068pbq01sq2d389ffcqsh3ylq3i8zkrqvblqid1hvnlv"; }; nativeBuildInputs = [ - pkgconfig vala meson ninja python3 wrapGAppsHook + pkg-config vala meson ninja python3 wrapGAppsHook gettext itstool libxml2 appstream-glib desktop-file-utils gnome3.adwaita-icon-theme ]; diff --git a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix index 51908d3236c..d5d2de53e47 100644 --- a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook +{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, wrapGAppsHook , librsvg, gettext, itstool, libxml2 , meson, ninja, glib, vala, desktop-file-utils }: @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { version = "3.38.3"; src = fetchurl { - url = "mirror://gnome/sources/gnome-mahjongg/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-mahjongg/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "144ia3zn9rhwa1xbdkvsz6m0dsysl6mxvqw9bnrlh845hmyy9cfj"; }; nativeBuildInputs = [ meson ninja vala desktop-file-utils - pkgconfig gnome3.adwaita-icon-theme + pkg-config gnome3.adwaita-icon-theme libxml2 itstool gettext wrapGAppsHook glib # for glib-compile-schemas ]; diff --git a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix index 93529b0b3f8..600b0d98468 100644 --- a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, vala, gobject-introspection, pkgconfig, gnome3, gtk3, wrapGAppsHook +{ lib, stdenv, fetchurl, meson, ninja, vala, gobject-introspection, pkg-config, gnome3, gtk3, wrapGAppsHook , librsvg, gettext, itstool, python3, libxml2, libgnome-games-support, libgee, desktop-file-utils }: stdenv.mkDerivation rec { @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { version = "3.36.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0m2680r94nk61imym4x73j03jwfjd8cxm592m5ybiqdfdw6i723i"; }; # gobject-introspection for finding vapi files nativeBuildInputs = [ - meson ninja vala gobject-introspection pkgconfig gettext itstool python3 + meson ninja vala gobject-introspection pkg-config gettext itstool python3 libxml2 wrapGAppsHook desktop-file-utils ]; buildInputs = [ gtk3 librsvg gnome3.adwaita-icon-theme libgnome-games-support libgee ]; diff --git a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix index 410d397bb58..501b894a1df 100644 --- a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook +{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, wrapGAppsHook , librsvg, gsound, clutter-gtk, gettext, itstool, vala, python3 , libxml2, libgee, libgnome-games-support, meson, ninja , desktop-file-utils, hicolor-icon-theme}: @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { version = "3.38.2"; src = fetchurl { - url = "mirror://gnome/sources/gnome-nibbles/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-nibbles/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1naknfbciydbym79a0jq039xf0033z8gyln48c0qsbcfr2qn8yj5"; }; nativeBuildInputs = [ meson ninja vala python3 - pkgconfig wrapGAppsHook gettext itstool libxml2 + pkg-config wrapGAppsHook gettext itstool libxml2 desktop-file-utils hicolor-icon-theme ]; buildInputs = [ diff --git a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix index 39eb27228be..e9a079216b7 100644 --- a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook +{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, wrapGAppsHook , librsvg, gsound, gettext, itstool, libxml2, libgnome-games-support , libgee, meson, ninja, python3, desktop-file-utils, adwaita-icon-theme }: @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "3.38.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-robots/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-robots/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1qpzpsyj9i5dsfy7anfb2dcm602bjkcgqj86fxvnxy6llx56ks0z"; }; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig meson ninja python3 + pkg-config meson ninja python3 libxml2 wrapGAppsHook gettext itstool desktop-file-utils ]; buildInputs = [ diff --git a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix index 49bafcf9603..7c5fd8f1ac9 100644 --- a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, vala, pkgconfig, gobject-introspection, gettext, gtk3, gnome3, wrapGAppsHook +{ lib, stdenv, fetchurl, meson, ninja, vala, pkg-config, gobject-introspection, gettext, gtk3, gnome3, wrapGAppsHook , libgee, json-glib, qqwing, itstool, libxml2, python3, desktop-file-utils }: stdenv.mkDerivation rec { @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { version = "3.38.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-sudoku/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0cpxx63liczmax6ry06r5k0f221xpg2rqh49vkdj2snmqq61swrq"; }; - nativeBuildInputs = [ meson ninja vala pkgconfig gobject-introspection gettext itstool libxml2 python3 desktop-file-utils wrapGAppsHook ]; + nativeBuildInputs = [ meson ninja vala pkg-config gobject-introspection gettext itstool libxml2 python3 desktop-file-utils wrapGAppsHook ]; buildInputs = [ gtk3 libgee json-glib qqwing ]; postPatch = '' diff --git a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix index 9c8b06a7dd4..9b8c78d6e4a 100644 --- a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook +{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, wrapGAppsHook , librsvg, gsound, gettext, itstool, libxml2 , meson, ninja, vala, python3, desktop-file-utils }: @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "3.38.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-taquin/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-taquin/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0kw131q0ad0rbsp6qifjc8fjlhvjxyihil8a76kj8ya9mn7kvnwn"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig wrapGAppsHook meson ninja python3 + pkg-config wrapGAppsHook meson ninja python3 gettext itstool libxml2 vala desktop-file-utils ]; buildInputs = [ diff --git a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix index 42137e9caa5..9ae73773799 100644 --- a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook +{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, wrapGAppsHook , libxml2, gettext, itstool, meson, ninja, python3 , vala, desktop-file-utils }: @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "3.38.2"; src = fetchurl { - url = "mirror://gnome/sources/gnome-tetravex/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-tetravex/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "06wihvqp2p52zd2dnknsc3rii69qib4a30yp15h558xrg44z3k8z"; }; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ wrapGAppsHook itstool libxml2 gnome3.adwaita-icon-theme - pkgconfig gettext meson ninja python3 vala desktop-file-utils + pkg-config gettext meson ninja python3 vala desktop-file-utils ]; buildInputs = [ gtk3 diff --git a/pkgs/desktops/gnome-3/games/hitori/default.nix b/pkgs/desktops/gnome-3/games/hitori/default.nix index 3e5d0e00979..bb0bd257260 100644 --- a/pkgs/desktops/gnome-3/games/hitori/default.nix +++ b/pkgs/desktops/gnome-3/games/hitori/default.nix @@ -2,7 +2,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , gnome3 , glib , gtk3 @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { version = "3.38.0"; src = fetchurl { - url = "mirror://gnome/sources/hitori/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/hitori/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0gjbbh4gym8wwa4jjg7wwifjh2h7bf6m0x23c5jjxvrf3vln9gfq"; }; nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gettext itstool desktop-file-utils diff --git a/pkgs/desktops/gnome-3/games/iagno/default.nix b/pkgs/desktops/gnome-3/games/iagno/default.nix index 15be308e4e9..db3b0d21151 100644 --- a/pkgs/desktops/gnome-3/games/iagno/default.nix +++ b/pkgs/desktops/gnome-3/games/iagno/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { version = "3.38.1"; src = fetchurl { - url = "mirror://gnome/sources/iagno/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/iagno/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "097dw1l92l73xah9l56ka5mi3dvx48ffpiv33ni5i5rqw0ng7fc4"; }; diff --git a/pkgs/desktops/gnome-3/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/games/lightsoff/default.nix index 828a9ac24fb..6783147840c 100644 --- a/pkgs/desktops/gnome-3/games/lightsoff/default.nix +++ b/pkgs/desktops/gnome-3/games/lightsoff/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, vala, pkgconfig, gtk3, gnome3, gdk-pixbuf, librsvg, wrapGAppsHook +{ lib, stdenv, fetchurl, vala, pkg-config, gtk3, gnome3, gdk-pixbuf, librsvg, wrapGAppsHook , gettext, itstool, clutter, clutter-gtk, libxml2, appstream-glib , meson, ninja, python3 }: @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { version = "3.38.0"; src = fetchurl { - url = "mirror://gnome/sources/lightsoff/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/lightsoff/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0dpnnw8v1yk1p0y08f9c9xkgswqlm8x83dfn96798nif2zbypdnh"; }; nativeBuildInputs = [ - vala pkgconfig wrapGAppsHook itstool gettext appstream-glib libxml2 + vala pkg-config wrapGAppsHook itstool gettext appstream-glib libxml2 meson ninja python3 ]; buildInputs = [ gtk3 gnome3.adwaita-icon-theme gdk-pixbuf librsvg clutter clutter-gtk ]; diff --git a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix index c47b2776563..de3d67b58bf 100644 --- a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix +++ b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk-pixbuf +{ lib, stdenv, fetchurl, pkg-config, gtk3, gnome3, gdk-pixbuf , librsvg, gsound, libmanette , gettext, itstool, libxml2, clutter, clutter-gtk, wrapGAppsHook , meson, ninja, python3, vala, desktop-file-utils @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { version = "3.38.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "033plabc6q3sk6qjr5nml8z6p07vcw57gxddxjk9b65wgg0rzzhr"; }; nativeBuildInputs = [ meson ninja python3 vala desktop-file-utils - pkgconfig gnome3.adwaita-icon-theme + pkg-config gnome3.adwaita-icon-theme libxml2 itstool gettext wrapGAppsHook ]; buildInputs = [ diff --git a/pkgs/desktops/gnome-3/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/games/swell-foop/default.nix index a96ccd5c9b6..33dd9de1b42 100644 --- a/pkgs/desktops/gnome-3/games/swell-foop/default.nix +++ b/pkgs/desktops/gnome-3/games/swell-foop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkgconfig, vala, glib, gtk3, gnome3, desktop-file-utils +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, vala, glib, gtk3, gnome3, desktop-file-utils , clutter, clutter-gtk, gettext, itstool, libxml2, wrapGAppsHook, python3 }: let @@ -8,7 +8,7 @@ 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}/${lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "1032psxm59nissi268bh3j964m4a0n0ah4dy1pf0ph27j3zvdik1"; }; @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { }; }; - nativeBuildInputs = [ meson ninja vala pkgconfig wrapGAppsHook python3 itstool gettext libxml2 desktop-file-utils ]; + nativeBuildInputs = [ meson ninja vala pkg-config wrapGAppsHook python3 itstool gettext libxml2 desktop-file-utils ]; buildInputs = [ glib gtk3 gnome3.adwaita-icon-theme clutter clutter-gtk ]; postPatch = '' diff --git a/pkgs/desktops/gnome-3/games/tali/default.nix b/pkgs/desktops/gnome-3/games/tali/default.nix index c6d28cd3bc1..36c76c358e9 100644 --- a/pkgs/desktops/gnome-3/games/tali/default.nix +++ b/pkgs/desktops/gnome-3/games/tali/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk-pixbuf +{ lib, stdenv, fetchurl, pkg-config, gtk3, gnome3, gdk-pixbuf , librsvg, libgnome-games-support, gettext, itstool, libxml2, wrapGAppsHook , meson, ninja, python3, desktop-file-utils }: @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "3.38.0"; src = fetchurl { - url = "mirror://gnome/sources/tali/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/tali/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "196f6hiap61sdqr7kvywk74yl0m2j7fvqml37p6cgfm7gfrhrvi9"; }; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja python3 desktop-file-utils - pkgconfig gnome3.adwaita-icon-theme + pkg-config gnome3.adwaita-icon-theme libxml2 itstool gettext wrapGAppsHook ]; buildInputs = [ gtk3 gdk-pixbuf librsvg libgnome-games-support ]; diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix index db9fb395d7d..3ca257db49b 100644 --- a/pkgs/desktops/gnome-3/misc/geary/default.nix +++ b/pkgs/desktops/gnome-3/misc/geary/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchurl , fetchpatch -, pkgconfig +, pkg-config , gtk3 , vala , enchant2 @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { version = "3.38.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "04p8fjkz4xp5afp0ld1m09pnv0zkcx51l7hf23amfrjkk0kj2bp7"; }; @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { libxml2 meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/desktops/gnome-3/misc/gitg/default.nix b/pkgs/desktops/gnome-3/misc/gitg/default.nix index 0ba1d1130bd..0f4f8e67737 100644 --- a/pkgs/desktops/gnome-3/misc/gitg/default.nix +++ b/pkgs/desktops/gnome-3/misc/gitg/default.nix @@ -3,7 +3,7 @@ , fetchpatch , vala , gettext -, pkgconfig +, pkg-config , gtk3 , glib , json-glib @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { version = "3.32.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0npg4kqpwl992fgjd2cn3fh84aiwpdp9kd8z7rw2xaj2iazsm914"; }; @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { gettext meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix b/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix index 601dded4895..1f9b1ba871d 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { version = "3.38.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "04qrzycwm7pz556agl08xw3d0r1mmr4ja9n9jfijjxs9inrhp5yc"; }; diff --git a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix index 5495bdb4c3d..db7a6ba0920 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, pkgconfig +, pkg-config , gnome3 , gtk3 , glib @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/gnome-autoar/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-autoar/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0yk56ch46n3wfy633mq31kif9n7v06rlij4vqbsbn6l4z1vw6d0a"; }; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gobject-introspection - pkgconfig + pkg-config vala ]; diff --git a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix index 84666a83308..b65d27bb757 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix @@ -15,7 +15,7 @@ , libpulseaudio , libxkbfile , libxml2 -, pkgconfig +, pkg-config , polkit , gdm , systemd @@ -54,12 +54,12 @@ let "org.gnome.SettingsDaemon.Wacom" "org.gnome.SettingsDaemon.XSettings" ]; - requiredComponents = wmName: "RequiredComponents=${stdenv.lib.concatStringsSep ";" ([ wmName ] ++ requiredComponentsCommon ++ requiredComponentsGsd)};"; + requiredComponents = wmName: "RequiredComponents=${lib.concatStringsSep ";" ([ wmName ] ++ requiredComponentsCommon ++ requiredComponentsGsd)};"; gnome-flashback = 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}/${lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "1r51yqdqichp4jv54kiaqrh0xhykngr4ymlvrkjhzdhivwadsg4m"; }; @@ -87,7 +87,7 @@ let autoreconfHook gettext libxml2 - pkgconfig + pkg-config wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix index c69966406e0..53be2df471b 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, meson, ninja, gettext, gnome3, packagekit, polkit +{ lib, stdenv, fetchurl, pkg-config, meson, ninja, gettext, gnome3, packagekit, polkit , gtk3, systemd, wrapGAppsHook, desktop-file-utils }: stdenv.mkDerivation rec { @@ -6,12 +6,12 @@ stdenv.mkDerivation rec { version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-packagekit/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-packagekit/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "08rhsisdvx7pnx3rrg5v7c09jbw4grglkdj979gwl4a31j24zjsd"; }; nativeBuildInputs = [ - pkgconfig meson ninja gettext wrapGAppsHook desktop-file-utils + pkg-config meson ninja gettext wrapGAppsHook desktop-file-utils ]; buildInputs = [ gtk3 packagekit systemd polkit ]; diff --git a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix b/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix index d4ea880d1af..b820f7750dc 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix @@ -15,7 +15,7 @@ , libsoup , libwnck3 , libxml2 -, pkgconfig +, pkg-config , polkit , systemd , wrapGAppsHook @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; hash = "sha256-GosVrvCgKmyqm5IJyNP7Q+e5h6OAB2aRwj8DFOwwLxU="; }; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { gettext itstool libxml2 - pkgconfig + pkg-config wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/misc/gpaste/default.nix index 504846e8d4b..89d01c166b7 100644 --- a/pkgs/desktops/gnome-3/misc/gpaste/default.nix +++ b/pkgs/desktops/gnome-3/misc/gpaste/default.nix @@ -11,20 +11,20 @@ , mutter , ninja , pango -, pkgconfig +, pkg-config , vala , wrapGAppsHook }: stdenv.mkDerivation rec { - version = "3.38.3"; + version = "3.38.4"; pname = "gpaste"; src = fetchFromGitHub { owner = "Keruspe"; repo = "GPaste"; rev = "v${version}"; - sha256 = "10ag0mrr4r40414nyarghpgjawvf331asxgq47dqjfxr5w7bz6wc"; + sha256 = "sha256-CvrwVyx5QP9CeEraJsUInV2pG5puSJebpXQiLwnrFSs="; }; patches = [ @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { gobject-introspection meson ninja - pkgconfig + pkg-config vala wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix b/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix index 0f995927437..cc054a983c6 100644 --- a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix +++ b/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gtk3, intltool +{ lib, stdenv, fetchurl, pkg-config, gtk3, intltool , gnome3, enchant, isocodes, gsettings-desktop-schemas }: stdenv.mkDerivation rec { @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "4.10.0"; src = fetchurl { - url = "mirror://gnome/sources/gtkhtml/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gtkhtml/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "ca3b6424fb2c7ac5d9cb8fdafb69318fa2e825c9cf6ed17d1e38d9b29e5606c3"; }; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { updateScript = gnome3.updateScript { packageName = "gtkhtml"; attrPath = "gnome3.gtkhtml"; }; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk3 intltool gnome3.adwaita-icon-theme gsettings-desktop-schemas ]; diff --git a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix index f5dd04cdb91..01899d20b57 100644 --- a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix +++ b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, pkgconfig +, pkg-config , glib , gtk3 , libgee @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { version = "1.8.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1pdk9hc30xdlv0ba24f7pvcr2d5370zykrmpws7hgmjgl4wfbpdb"; }; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { gettext meson ninja - pkgconfig + pkg-config vala ]; diff --git a/pkgs/desktops/gnome-3/misc/metacity/default.nix b/pkgs/desktops/gnome-3/misc/metacity/default.nix index ef16cf49a15..d1b1aeec4c4 100644 --- a/pkgs/desktops/gnome-3/misc/metacity/default.nix +++ b/pkgs/desktops/gnome-3/misc/metacity/default.nix @@ -10,7 +10,7 @@ , libgtop , libstartup_notification , libxml2 -, pkgconfig +, pkg-config , substituteAll , wrapGAppsHook , zenity @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { version = "3.38.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1b0i9sq6qa540f2006cv1p8i6lxg1h6w00apxwzwjpfqn0hk26c1"; }; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gettext libxml2 - pkgconfig + pkg-config wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix b/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix index a942fded087..4db81228a07 100644 --- a/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix +++ b/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, pkgconfig +, pkg-config , which , gtk-doc , docbook_xsl @@ -19,12 +19,12 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "161050sx3sdxqcpjkjcpf6wl4kx0jydihga7mcvrj9c2f8ly0g07"; }; nativeBuildInputs = [ - pkgconfig + pkg-config which gtk-doc docbook_xsl diff --git a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix index dfaa7f844aa..ae52c41787b 100644 --- a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix +++ b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , autoconf-archive , appstream-glib -, pkgconfig +, pkg-config , wrapGAppsHook , libcanberra , gst_all_1 @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { gettext gobject-introspection libxml2 - pkgconfig + pkg-config vala wrapGAppsHook ]; diff --git a/pkgs/desktops/gnustep/back/default.nix b/pkgs/desktops/gnustep/back/default.nix index bf6441f6820..18986400c00 100644 --- a/pkgs/desktops/gnustep/back/default.nix +++ b/pkgs/desktops/gnustep/back/default.nix @@ -4,7 +4,7 @@ , base, gui , xlibsWrapper , freetype -, pkgconfig +, pkg-config , libXmu }: let @@ -16,7 +16,7 @@ gsmakeDerivation { url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${version}.tar.gz"; sha256 = "1ynd27zwga17mp2qlym90k2xsypdvz24w6gyy2rfvmv0gkvlgrjr"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ cairo base gui freetype xlibsWrapper libXmu ]; meta = { description = "A generic backend for GNUstep"; diff --git a/pkgs/desktops/gnustep/base/default.nix b/pkgs/desktops/gnustep/base/default.nix index deeca1d600f..8cc68b75569 100644 --- a/pkgs/desktops/gnustep/base/default.nix +++ b/pkgs/desktops/gnustep/base/default.nix @@ -8,7 +8,7 @@ , libxml2, libxslt, libiconv , libobjc, libgcrypt , icu -, pkgconfig, portaudio +, pkg-config, portaudio , libiberty }: let @@ -20,7 +20,7 @@ gsmakeDerivation { url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-base-${version}.tar.gz"; sha256 = "10xjrv5d443wzll6lf9y65p6v9kvx7xxklhsm1j05y93vwgzl0w8"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ aspell audiofile cups diff --git a/pkgs/desktops/gnustep/default.nix b/pkgs/desktops/gnustep/default.nix index 4f7c13e8e4a..abbabd4abf2 100644 --- a/pkgs/desktops/gnustep/default.nix +++ b/pkgs/desktops/gnustep/default.nix @@ -1,21 +1,22 @@ -{ pkgs, newScope, llvmPackages_6 }: +{ newScope +, llvmPackages +, giflib_4_1 +}: let callPackage = newScope self; self = rec { - stdenv = pkgs.clangStdenv; + stdenv = llvmPackages.stdenv; gsmakeDerivation = callPackage ./make/gsmakeDerivation.nix {}; gorm = callPackage ./gorm {}; projectcenter = callPackage ./projectcenter {}; system_preferences = callPackage ./systempreferences {}; - libobjc = callPackage ./libobjc2 { - stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; - }; + libobjc = callPackage ./libobjc2 {}; make = callPackage ./make {}; back = callPackage ./back {}; - base = callPackage ./base { giflib = pkgs.giflib_4_1; }; + base = callPackage ./base { giflib = giflib_4_1; }; gui = callPackage ./gui {}; gworkspace = callPackage ./gworkspace {}; }; diff --git a/pkgs/desktops/gnustep/make/default.nix b/pkgs/desktops/gnustep/make/default.nix index 9b803be0251..f571a3c4862 100644 --- a/pkgs/desktops/gnustep/make/default.nix +++ b/pkgs/desktops/gnustep/make/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, clang, which, libobjc }: +{ lib, stdenv, fetchurl, clang, which, libobjc }: let version = "2.8.0"; @@ -32,8 +32,8 @@ stdenv.mkDerivation { meta = { description = "A build manager for GNUstep"; homepage = "http://gnustep.org/"; - license = stdenv.lib.licenses.lgpl2Plus; - maintainers = with stdenv.lib.maintainers; [ ashalkhakov matthewbauer ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.lgpl2Plus; + maintainers = with lib.maintainers; [ ashalkhakov matthewbauer ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/desktops/gnustep/make/gsmakeDerivation.nix b/pkgs/desktops/gnustep/make/gsmakeDerivation.nix index 580fbdc5d88..eff7f3eac85 100644 --- a/pkgs/desktops/gnustep/make/gsmakeDerivation.nix +++ b/pkgs/desktops/gnustep/make/gsmakeDerivation.nix @@ -1,4 +1,4 @@ -{ stdenv, make, makeWrapper, which }: +{ lib, stdenv, make, makeWrapper, which }: { buildInputs ? [], ...} @ args: stdenv.mkDerivation (args // { buildInputs = [ makeWrapper make which ] ++ buildInputs; @@ -11,9 +11,9 @@ stdenv.mkDerivation (args // { meta = { homepage = "http://gnustep.org/"; - license = stdenv.lib.licenses.lgpl2Plus; + license = lib.licenses.lgpl2Plus; - maintainers = with stdenv.lib.maintainers; [ ashalkhakov matthewbauer ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with lib.maintainers; [ ashalkhakov matthewbauer ]; + platforms = lib.platforms.linux; } // (if builtins.hasAttr "meta" args then args.meta else {}); }) diff --git a/pkgs/desktops/gnustep/projectcenter/default.nix b/pkgs/desktops/gnustep/projectcenter/default.nix index abfdac1e7af..afe47c6cef7 100644 --- a/pkgs/desktops/gnustep/projectcenter/default.nix +++ b/pkgs/desktops/gnustep/projectcenter/default.nix @@ -16,7 +16,7 @@ gsmakeDerivation { # 1. Framework/PCProjectLauncher.m, locate gdb (say among NIX_GNUSTEP_SYSTEM_TOOLS) # 2. Framework/PCProjectBuilder.m, locate gmake (similar) propagatedBuildInputs = [ base back gui gnumake gdb gorm ]; - + meta = { description = "GNUstep's integrated development environment"; }; diff --git a/pkgs/desktops/lumina/lumina-calculator/default.nix b/pkgs/desktops/lumina/lumina-calculator/default.nix index 0b5690d9442..d0f09bbfae2 100644 --- a/pkgs/desktops/lumina/lumina-calculator/default.nix +++ b/pkgs/desktops/lumina/lumina-calculator/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, qtbase, qttools }: +{ lib, mkDerivation, fetchFromGitHub, qmake, qtbase, qttools }: mkDerivation rec { pname = "lumina-calculator"; @@ -10,7 +10,7 @@ mkDerivation rec { rev = "v${version}"; sha256 = "1238d1m0mjkwkdpgq165a4ql9aql0aji5f41rzdzny6m7ws9nm2y"; }; - + sourceRoot = "source/src-qt5"; nativeBuildInputs = [ qmake qttools ]; @@ -19,7 +19,7 @@ mkDerivation rec { qmakeFlags = [ "CONFIG+=WITH_I18N" - "LRELEASE=${stdenv.lib.getDev qttools}/bin/lrelease" + "LRELEASE=${lib.getDev qttools}/bin/lrelease" ]; meta = with lib; { diff --git a/pkgs/desktops/lumina/lumina-pdf/default.nix b/pkgs/desktops/lumina/lumina-pdf/default.nix index 1e169131604..679dfa65b5a 100644 --- a/pkgs/desktops/lumina/lumina-pdf/default.nix +++ b/pkgs/desktops/lumina/lumina-pdf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, qtbase, qttools, poppler }: +{ lib, mkDerivation, fetchFromGitHub, qmake, qtbase, qttools, poppler }: mkDerivation rec { pname = "lumina-pdf"; @@ -10,7 +10,7 @@ mkDerivation rec { rev = "v${version}"; sha256 = "08caj4nashp79fbvj94rabn0iaa1hymifqmb782x03nb2vkn38r6"; }; - + sourceRoot = "source/src-qt5"; nativeBuildInputs = [ qmake qttools ]; @@ -23,7 +23,7 @@ mkDerivation rec { qmakeFlags = [ "CONFIG+=WITH_I18N" - "LRELEASE=${stdenv.lib.getDev qttools}/bin/lrelease" + "LRELEASE=${lib.getDev qttools}/bin/lrelease" ]; enableParallelBuilding = false; diff --git a/pkgs/desktops/lumina/lumina/default.nix b/pkgs/desktops/lumina/lumina/default.nix index ec2cbc3b297..d31f16e235a 100644 --- a/pkgs/desktops/lumina/lumina/default.nix +++ b/pkgs/desktops/lumina/lumina/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , mkDerivation , fetchFromGitHub , fluxbox @@ -70,7 +70,7 @@ mkDerivation rec { # Add full path of bsdtar to lumina-archiver substituteInPlace src-qt5/desktop-utils/lumina-archiver/TarBackend.cpp \ - --replace '"bsdtar"' '"${stdenv.lib.getBin libarchive}/bin/bsdtar"' + --replace '"bsdtar"' '"${lib.getBin libarchive}/bin/bsdtar"' # Fix desktop files for i in $(grep -lir 'OnlyShowIn=Lumina' src-qt5); do @@ -81,7 +81,7 @@ mkDerivation rec { qmakeFlags = [ "LINUX_DISTRO=NixOS" "CONFIG+=WITH_I18N" - "LRELEASE=${stdenv.lib.getDev qttools}/bin/lrelease" + "LRELEASE=${lib.getDev qttools}/bin/lrelease" ]; passthru.providedSessions = [ "Lumina-DE" ]; diff --git a/pkgs/desktops/lxde/core/lxappearance/default.nix b/pkgs/desktops/lxde/core/lxappearance/default.nix index 4119f4c4134..8ff71e0a545 100644 --- a/pkgs/desktops/lxde/core/lxappearance/default.nix +++ b/pkgs/desktops/lxde/core/lxappearance/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ./lxappearance-0.6.3-xdg.system.data.dirs.patch ]; - configureFlags = stdenv.lib.optional withGtk3 "--enable-gtk3"; + configureFlags = lib.optional withGtk3 "--enable-gtk3"; meta = with lib; { description = "Lightweight program for configuring the theme and fonts of gtk applications"; diff --git a/pkgs/desktops/lxde/core/lxmenu-data.nix b/pkgs/desktops/lxde/core/lxmenu-data.nix index 572d86b652e..e52445aa0b0 100644 --- a/pkgs/desktops/lxde/core/lxmenu-data.nix +++ b/pkgs/desktops/lxde/core/lxmenu-data.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool }: +{ lib, stdenv, fetchurl, intltool }: stdenv.mkDerivation rec { pname = "lxmenu-data"; @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://lxde.org/"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; description = "Freedesktop.org desktop menus for LXDE"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/desktops/lxde/core/lxpanel/default.nix b/pkgs/desktops/lxde/core/lxpanel/default.nix index 1e0fb356982..8cb8d2f580c 100644 --- a/pkgs/desktops/lxde/core/lxpanel/default.nix +++ b/pkgs/desktops/lxde/core/lxpanel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, m4, intltool, libxmlxx, keybinder +{ lib, stdenv, fetchurl, pkg-config, gettext, m4, intltool, libxmlxx, keybinder , gtk2, libX11, libfm, libwnck, libXmu, libXpm, cairo, gdk-pixbuf, gdk-pixbuf-xlib , menu-cache, lxmenu-data, wirelesstools, curl , supportAlsa ? false, alsaLib @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { sha256 = "0zis3b815p375s6mymhf5sn1a0c1xv0ixxzb0mh3fqhrby6cqy26"; }; - nativeBuildInputs = [ pkgconfig gettext m4 intltool libxmlxx ]; + nativeBuildInputs = [ pkg-config gettext m4 intltool libxmlxx ]; buildInputs = [ keybinder gtk2 libX11 libfm libwnck libXmu libXpm cairo gdk-pixbuf gdk-pixbuf-xlib.dev menu-cache lxmenu-data m4 wirelesstools curl - ] ++ stdenv.lib.optional supportAlsa alsaLib; + ] ++ lib.optional supportAlsa alsaLib; postPatch = '' substituteInPlace src/Makefile.in \ @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { meta = { description = "Lightweight X11 desktop panel for LXDE"; homepage = "https://lxde.org/"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.ryneeverett ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.ryneeverett ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/desktops/lxde/core/lxrandr/default.nix b/pkgs/desktops/lxde/core/lxrandr/default.nix index 6ac021397de..7de2886eeb4 100644 --- a/pkgs/desktops/lxde/core/lxrandr/default.nix +++ b/pkgs/desktops/lxde/core/lxrandr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, intltool, gtk2, libX11, xrandr, withGtk3 ? false, gtk3 }: +{ lib, stdenv, fetchurl, pkg-config, intltool, gtk2, libX11, xrandr, withGtk3 ? false, gtk3 }: stdenv.mkDerivation rec { name = "lxrandr-0.3.2"; @@ -8,16 +8,16 @@ stdenv.mkDerivation rec { sha256 = "04n3vgh3ix12p8jfs4w0dyfq3anbjy33h7g53wbbqqc0f74xyplb"; }; - configureFlags = stdenv.lib.optional withGtk3 "--enable-gtk3"; + configureFlags = lib.optional withGtk3 "--enable-gtk3"; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkg-config intltool ]; buildInputs = [ libX11 (if withGtk3 then gtk3 else gtk2) xrandr ]; meta = with lib; { description = "Standard screen manager of LXDE"; homepage = "https://lxde.org/"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; maintainers = with maintainers; [ rawkode ]; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/desktops/lxde/core/lxsession/default.nix b/pkgs/desktops/lxde/core/lxsession/default.nix new file mode 100644 index 00000000000..16264522f28 --- /dev/null +++ b/pkgs/desktops/lxde/core/lxsession/default.nix @@ -0,0 +1,67 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoconf +, automake +, docbook_xml_dtd_412 +, docbook_xsl +, intltool +, libxml2 +, libxslt +, pkg-config +, wrapGAppsHook +, gtk2-x11 +, libX11 +, polkit +, vala +}: + +stdenv.mkDerivation rec { + pname = "lxsession"; + version = "0.5.5"; + + src = fetchFromGitHub { + owner = "lxde"; + repo = "lxsession"; + rev = version; + sha256 = "17sqsx57ymrimm5jfmcyrp7b0nzi41bcvpxsqckmwbhl19g6c17d"; + }; + + patches = [ ./xmlcatalog_patch.patch ]; + + nativeBuildInputs = [ + autoconf + automake + docbook_xml_dtd_412 + docbook_xsl + intltool + libxml2 + libxslt + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + gtk2-x11 + libX11 + polkit + vala + ]; + + configureFlags = [ + "--enable-man" + "--disable-buildin-clipboard" + "--disable-buildin-polkit" + "--with-xml-catalog=${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml" + ]; + + preConfigure = "./autogen.sh"; + + meta = with lib; { + description = "Classic LXDE session manager"; + license = licenses.gpl2Plus; + homepage = "https://wiki.lxde.org/en/LXSession"; + maintainers = [ maintainers.shamilton ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/lxde/core/lxsession/xmlcatalog_patch.patch b/pkgs/desktops/lxde/core/lxsession/xmlcatalog_patch.patch new file mode 100644 index 00000000000..644518a6eb2 --- /dev/null +++ b/pkgs/desktops/lxde/core/lxsession/xmlcatalog_patch.patch @@ -0,0 +1,23 @@ +diff --color -ur a/configure.ac b/configure.ac +--- a/configure.ac 2021-01-18 12:39:19.556844678 +0100 ++++ b/configure.ac 2021-01-18 17:26:47.989410501 +0100 +@@ -167,18 +167,7 @@ + AM_GLIB_GNU_GETTEXT + AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.]) + +-if test x"$enable_man" = x"yes"; then +- AC_PATH_PROG([XSLTPROC], [xsltproc]) +- if test -z "$XSLTPROC"; then +- enable_man=no +- fi +- +- dnl check for DocBook DTD and stylesheets in the local catalog. +- JH_CHECK_XML_CATALOG([-//OASIS//DTD DocBook XML V4.1.2//EN], +- [DocBook XML DTD V4.1.2], [], enable_man=no) +- JH_CHECK_XML_CATALOG([http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl], +- [DocBook XSL Stylesheets >= 1.70.1], [], enable_man=no) +-fi ++AC_PATH_PROG([XSLTPROC], [xsltproc]) + + AM_CONDITIONAL(ENABLE_REGENERATE_MAN, test "x$enable_man" != "xno") + diff --git a/pkgs/desktops/lxde/core/lxtask/default.nix b/pkgs/desktops/lxde/core/lxtask/default.nix index a1525ec8b73..27066ba9952 100644 --- a/pkgs/desktops/lxde/core/lxtask/default.nix +++ b/pkgs/desktops/lxde/core/lxtask/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libintl }: +{ lib, stdenv, fetchurl, pkg-config, intltool, gtk3, libintl }: stdenv.mkDerivation rec { pname = "lxtask"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0b2fxg8jjjpk219gh7qa18g45365598nd2bq7rrq0bdvqjdxy5i2"; }; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkg-config intltool ]; buildInputs = [ gtk3 libintl ]; @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { requires pure GTK. ''; homepage = "https://wiki.lxde.org/en/LXTask"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.romildo ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.romildo ]; }; } diff --git a/pkgs/desktops/lxqt/compton-conf/default.nix b/pkgs/desktops/lxqt/compton-conf/default.nix index 38dfd621848..0ffdc5199aa 100644 --- a/pkgs/desktops/lxqt/compton-conf/default.nix +++ b/pkgs/desktops/lxqt/compton-conf/default.nix @@ -2,7 +2,7 @@ , mkDerivation , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , qtbase , qttools , lxqt @@ -22,7 +22,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config lxqt.lxqt-build-tools ]; diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix index 088b4e335ea..9e302ebbbd6 100644 --- a/pkgs/desktops/lxqt/default.nix +++ b/pkgs/desktops/lxqt/default.nix @@ -107,7 +107,7 @@ let qlipper ### Default icon theme - pkgs.kdeFrameworks.oxygen-icons5 + libsForQt5.oxygen-icons5 ### Screen saver pkgs.xscreensaver diff --git a/pkgs/desktops/lxqt/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix index fb6b759db55..4bb3cd52d82 100644 --- a/pkgs/desktops/lxqt/libfm-qt/default.nix +++ b/pkgs/desktops/lxqt/libfm-qt/default.nix @@ -2,7 +2,7 @@ , mkDerivation , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , lxqt-build-tools , pcre , libexif @@ -27,7 +27,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config lxqt-build-tools ]; diff --git a/pkgs/desktops/lxqt/liblxqt/default.nix b/pkgs/desktops/lxqt/liblxqt/default.nix index ee915491f85..959afe1b887 100644 --- a/pkgs/desktops/lxqt/liblxqt/default.nix +++ b/pkgs/desktops/lxqt/liblxqt/default.nix @@ -39,6 +39,9 @@ mkDerivation rec { xorg.libXScrnSaver ]; + # convert name of wrapped binary, e.g. .lxqt-whatever-wrapped to the original name, e.g. lxqt-whatever so binaries can find their resources + patches = [ ./fix-application-path.patch ]; + postPatch = '' sed -i "s|\''${POLKITQT-1_POLICY_FILES_INSTALL_DIR}|''${out}/share/polkit-1/actions|" CMakeLists.txt ''; diff --git a/pkgs/desktops/lxqt/liblxqt/fix-application-path.patch b/pkgs/desktops/lxqt/liblxqt/fix-application-path.patch new file mode 100644 index 00000000000..12ef97db5d8 --- /dev/null +++ b/pkgs/desktops/lxqt/liblxqt/fix-application-path.patch @@ -0,0 +1,23 @@ +--- a/lxqtapplication.cpp ++++ b/lxqtapplication.cpp +@@ -77,7 +77,7 @@ Application::Application(int &argc, char** argv, bool handleQuitSignals) + + void Application::updateTheme() + { +- const QString styleSheetKey = QFileInfo(applicationFilePath()).fileName(); ++ const QString styleSheetKey = QFileInfo(applicationFilePath()).fileName().mid(1).chopped(8); + setStyleSheet(lxqtTheme.qss(styleSheetKey)); + Q_EMIT themeChanged(); + } + +--- a/lxqttranslator.cpp ++++ b/lxqttranslator.cpp +@@ -147,7 +147,7 @@ bool Translator::translateApplication(const QString &applicationName) + if (!applicationName.isEmpty()) + return translate(applicationName); + else +- return translate(QFileInfo(QCoreApplication::applicationFilePath()).baseName()); ++ return translate(QFileInfo(QCoreApplication::applicationFilePath()).baseName().mid(1).chopped(8)); + } + + diff --git a/pkgs/desktops/lxqt/lximage-qt/default.nix b/pkgs/desktops/lxqt/lximage-qt/default.nix index 014898f5326..217a6fe7922 100644 --- a/pkgs/desktops/lxqt/lximage-qt/default.nix +++ b/pkgs/desktops/lxqt/lximage-qt/default.nix @@ -2,7 +2,7 @@ , mkDerivation , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , qtbase , qttools , qtx11extras @@ -27,7 +27,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config lxqt-build-tools ]; diff --git a/pkgs/desktops/lxqt/lxqt-archiver/default.nix b/pkgs/desktops/lxqt/lxqt-archiver/default.nix index 8c5c57045d9..3d2ce3c0f57 100644 --- a/pkgs/desktops/lxqt/lxqt-archiver/default.nix +++ b/pkgs/desktops/lxqt/lxqt-archiver/default.nix @@ -2,7 +2,7 @@ , mkDerivation , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , lxqt-build-tools , json-glib , libfm-qt @@ -25,7 +25,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config lxqt-build-tools ]; diff --git a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix index cd39096678f..249d1664884 100644 --- a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix +++ b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix @@ -2,7 +2,7 @@ , mkDerivation , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , pcre , qtbase , glib @@ -22,7 +22,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config setupHook ]; diff --git a/pkgs/desktops/lxqt/lxqt-config/default.nix b/pkgs/desktops/lxqt/lxqt-config/default.nix index c50b258243e..407e45655ae 100644 --- a/pkgs/desktops/lxqt/lxqt-config/default.nix +++ b/pkgs/desktops/lxqt/lxqt-config/default.nix @@ -2,7 +2,7 @@ , mkDerivation , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , lxqt-build-tools , qtbase , qtx11extras @@ -29,7 +29,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config lxqt-build-tools ]; diff --git a/pkgs/desktops/lxqt/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix index d333bae3d30..5da0ab2499e 100644 --- a/pkgs/desktops/lxqt/lxqt-panel/default.nix +++ b/pkgs/desktops/lxqt/lxqt-panel/default.nix @@ -2,7 +2,7 @@ , mkDerivation , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , alsaLib , kguiaddons , kwindowsystem @@ -41,7 +41,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config lxqt-build-tools ]; diff --git a/pkgs/desktops/lxqt/lxqt-policykit/default.nix b/pkgs/desktops/lxqt/lxqt-policykit/default.nix index 5b708d6c036..762e7ac0462 100644 --- a/pkgs/desktops/lxqt/lxqt-policykit/default.nix +++ b/pkgs/desktops/lxqt/lxqt-policykit/default.nix @@ -2,7 +2,7 @@ , mkDerivation , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , lxqt-build-tools , qtbase , qttools @@ -29,7 +29,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config lxqt-build-tools ]; diff --git a/pkgs/desktops/lxqt/lxqt-runner/default.nix b/pkgs/desktops/lxqt/lxqt-runner/default.nix index d99692847f6..41a673fc345 100644 --- a/pkgs/desktops/lxqt/lxqt-runner/default.nix +++ b/pkgs/desktops/lxqt/lxqt-runner/default.nix @@ -2,7 +2,7 @@ , mkDerivation , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , lxqt-build-tools , qtbase , qttools @@ -31,7 +31,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config lxqt-build-tools ]; diff --git a/pkgs/desktops/lxqt/lxqt-session/default.nix b/pkgs/desktops/lxqt/lxqt-session/default.nix index bb212cf15a7..4be5eab5d94 100644 --- a/pkgs/desktops/lxqt/lxqt-session/default.nix +++ b/pkgs/desktops/lxqt/lxqt-session/default.nix @@ -2,7 +2,7 @@ , mkDerivation , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , lxqt-build-tools , qtbase , qttools @@ -29,7 +29,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config lxqt-build-tools ]; diff --git a/pkgs/desktops/lxqt/obconf-qt/default.nix b/pkgs/desktops/lxqt/obconf-qt/default.nix index 3b9891053ff..5772dfcf9e7 100644 --- a/pkgs/desktops/lxqt/obconf-qt/default.nix +++ b/pkgs/desktops/lxqt/obconf-qt/default.nix @@ -2,7 +2,7 @@ , mkDerivation , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , pcre , qtbase , qttools @@ -26,7 +26,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config lxqt-build-tools ]; diff --git a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix index dafb8947918..cd6d177b2ef 100644 --- a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix +++ b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix @@ -2,7 +2,7 @@ , mkDerivation , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , lxqt , libpulseaudio , pcre @@ -24,7 +24,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config lxqt.lxqt-build-tools ]; diff --git a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix index 9a6085da02c..a2378fafd55 100644 --- a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix +++ b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix @@ -2,7 +2,7 @@ , mkDerivation , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , lxqt , qtbase , qttools @@ -26,7 +26,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config lxqt.lxqt-build-tools ]; diff --git a/pkgs/desktops/lxqt/screengrab/default.nix b/pkgs/desktops/lxqt/screengrab/default.nix index cac2ef27d72..bc4f0f0de9f 100644 --- a/pkgs/desktops/lxqt/screengrab/default.nix +++ b/pkgs/desktops/lxqt/screengrab/default.nix @@ -2,7 +2,7 @@ , mkDerivation , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , qtbase , qttools , qtx11extras @@ -27,7 +27,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config autoPatchelfHook # fix libuploader.so and libextedit.so not found ]; diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix index 50254fbd29c..3f68da288c0 100644 --- a/pkgs/desktops/mate/atril/default.nix +++ b/pkgs/desktops/mate/atril/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, pkgconfig +, pkg-config , gettext , gtk3 , glib @@ -19,19 +19,19 @@ , enableImages ? false }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "atril"; version = "1.24.0"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0967gxw7h2qh2kpwl0jgv58hicz6aa92kr12mnykbpikad25s95y"; }; nativeBuildInputs = [ - pkgconfig + pkg-config gettext wrapGAppsHook ]; diff --git a/pkgs/desktops/mate/caja-dropbox/default.nix b/pkgs/desktops/mate/caja-dropbox/default.nix index 85179214b08..92176493afc 100644 --- a/pkgs/desktops/mate/caja-dropbox/default.nix +++ b/pkgs/desktops/mate/caja-dropbox/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, substituteAll -, pkgconfig, gobject-introspection, gdk-pixbuf +, pkg-config, gobject-introspection, gdk-pixbuf , gtk3, mate, python3, dropbox }: let @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { version = "1.24.0"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1rcn82q58mv9hn5xamvzay2pw1szfk6zns94362476fcp786lji2"; }; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = [ - pkgconfig + pkg-config gobject-introspection gdk-pixbuf (python3.withPackages (ps: with ps; [ diff --git a/pkgs/desktops/mate/caja-extensions/default.nix b/pkgs/desktops/mate/caja-extensions/default.nix index a9cd7abf857..64a036fd389 100644 --- a/pkgs/desktops/mate/caja-extensions/default.nix +++ b/pkgs/desktops/mate/caja-extensions/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, gtk3, gupnp, mate, imagemagick, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, gupnp, mate, imagemagick, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "caja-extensions"; version = "1.24.1"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "13jkynanqj8snys0if8lv6yx1y0jrm778s2152n4x65hsghc6cw5"; }; nativeBuildInputs = [ - pkgconfig + pkg-config gettext wrapGAppsHook ]; diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix index 9f1ec9f587b..890d3d61548 100644 --- a/pkgs/desktops/mate/caja/default.nix +++ b/pkgs/desktops/mate/caja/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, pkgconfig, gettext, gtk3, libnotify, libxml2, libexif, exempi, mate, hicolor-icon-theme, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libnotify, libxml2, libexif, exempi, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "caja"; version = "1.24.0"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1cnfy481hcwjv3ia3kw0d4h7ga8cng0pqm3z349v4qcmfdapmqc0"; }; nativeBuildInputs = [ - pkgconfig + pkg-config gettext wrapGAppsHook ]; @@ -36,8 +36,8 @@ stdenv.mkDerivation rec { meta = { description = "File manager for the MATE desktop"; homepage = "https://mate-desktop.org"; - license = with stdenv.lib.licenses; [ gpl2 lgpl2 ]; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.romildo ]; + license = with lib.licenses; [ gpl2 lgpl2 ]; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.romildo ]; }; } diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix index fce62f9f016..591cac7d886 100644 --- a/pkgs/desktops/mate/engrampa/default.nix +++ b/pkgs/desktops/mate/engrampa/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, pkgconfig, gettext, itstool, libxml2, gtk3, file, mate, hicolor-icon-theme, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, gtk3, file, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "engrampa"; version = "1.24.1"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0akjnz85qkpiqgj1ccn41rzbfid4l3r3nsm4s9s779ilzd7f097y"; }; nativeBuildInputs = [ - pkgconfig + pkg-config gettext itstool wrapGAppsHook @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { meta = { description = "Archive Manager for MATE"; homepage = "https://mate-desktop.org"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.romildo ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.romildo ]; }; } diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix index 2824fba2dfe..8b447f14d8b 100644 --- a/pkgs/desktops/mate/eom/default.nix +++ b/pkgs/desktops/mate/eom/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, pkgconfig, gettext, itstool, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, libpeas, shared-mime-info, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, libpeas, shared-mime-info, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "eom"; version = "1.24.1"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0dralsc0dvs0l38cysdhx6kiaiqlb8qi6g9xz2cm6mjqyq3d3f9f"; }; nativeBuildInputs = [ - pkgconfig + pkg-config gettext itstool wrapGAppsHook @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { meta = { description = "An image viewing and cataloging program for the MATE desktop"; homepage = "https://mate-desktop.org"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.romildo ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.romildo ]; }; } diff --git a/pkgs/desktops/mate/libmatekbd/default.nix b/pkgs/desktops/mate/libmatekbd/default.nix index 4b652d06d29..1b66bb97efe 100644 --- a/pkgs/desktops/mate/libmatekbd/default.nix +++ b/pkgs/desktops/mate/libmatekbd/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, gtk3, libxklavier }: +{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libxklavier }: stdenv.mkDerivation rec { pname = "libmatekbd"; version = "1.24.1"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "17mcxfkvl14p04id3n5kbhpjwjq00c8wmbyciyy2hm7kwdln6zx8"; }; - nativeBuildInputs = [ pkgconfig gettext ]; + nativeBuildInputs = [ pkg-config gettext ]; buildInputs = [ gtk3 libxklavier ]; diff --git a/pkgs/desktops/mate/libmatemixer/default.nix b/pkgs/desktops/mate/libmatemixer/default.nix index 97a55b5e45e..29d6127c3b3 100644 --- a/pkgs/desktops/mate/libmatemixer/default.nix +++ b/pkgs/desktops/mate/libmatemixer/default.nix @@ -1,4 +1,4 @@ -{ config, lib, stdenv, fetchurl, pkgconfig, gettext, glib +{ config, lib, stdenv, fetchurl, pkg-config, gettext, glib , alsaSupport ? stdenv.isLinux, alsaLib , pulseaudioSupport ? config.pulseaudio or true, libpulseaudio , ossSupport ? false @@ -9,17 +9,17 @@ stdenv.mkDerivation rec { version = "1.24.1"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1n6rq7k66zvfd6sb7h92xihh021w9hysfa4yd1mzjcbb7c62ybqx"; }; - nativeBuildInputs = [ pkgconfig gettext ]; + nativeBuildInputs = [ pkg-config gettext ]; buildInputs = [ glib ] - ++ stdenv.lib.optional alsaSupport alsaLib - ++ stdenv.lib.optional pulseaudioSupport libpulseaudio; + ++ lib.optional alsaSupport alsaLib + ++ lib.optional pulseaudioSupport libpulseaudio; - configureFlags = stdenv.lib.optional ossSupport "--enable-oss"; + configureFlags = lib.optional ossSupport "--enable-oss"; enableParallelBuilding = true; diff --git a/pkgs/desktops/mate/libmateweather/default.nix b/pkgs/desktops/mate/libmateweather/default.nix index 4ecdfcdf157..0f5deb8f550 100644 --- a/pkgs/desktops/mate/libmateweather/default.nix +++ b/pkgs/desktops/mate/libmateweather/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, gtk3, libsoup, tzdata }: +{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libsoup, tzdata }: stdenv.mkDerivation rec { pname = "libmateweather"; version = "1.24.1"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "02d7c59pami1fzxg73mp6risa9hvsdpgs68f62wkg09nrppzsk4v"; }; - nativeBuildInputs = [ pkgconfig gettext ]; + nativeBuildInputs = [ pkg-config gettext ]; buildInputs = [ gtk3 libsoup tzdata ]; diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix index fc098428fcb..3c16004010c 100644 --- a/pkgs/desktops/mate/marco/default.nix +++ b/pkgs/desktops/mate/marco/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, itstool, libxml2, libcanberra-gtk3, libgtop, libstartup_notification, gnome3, gtk3, mate-settings-daemon, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, libcanberra-gtk3, libgtop, libstartup_notification, gnome3, gtk3, mate-settings-daemon, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "marco"; version = "1.24.1"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "109b41pjrc1b4slw6sx1lakdhrc46x829vczzk4bz3j15kcszg54"; }; nativeBuildInputs = [ - pkgconfig + pkg-config gettext itstool wrapGAppsHook diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix index 533070c2698..bfa5a1a5d95 100644 --- a/pkgs/desktops/mate/mate-applets/default.nix +++ b/pkgs/desktops/mate/mate-applets/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, itstool, gnome3, glib, gtk3, gtksourceview3, libwnck3, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gnome3, glib, gtk3, gtksourceview3, libwnck3, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-applets"; version = "1.24.1"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0h70i4x3bk017pgv4zn280682wm58vwdjm7kni91ni8rmblnnvyp"; }; nativeBuildInputs = [ - pkgconfig + pkg-config gettext itstool wrapGAppsHook diff --git a/pkgs/desktops/mate/mate-backgrounds/default.nix b/pkgs/desktops/mate/mate-backgrounds/default.nix index f49529c4a66..b990a53b04a 100644 --- a/pkgs/desktops/mate/mate-backgrounds/default.nix +++ b/pkgs/desktops/mate/mate-backgrounds/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.24.2"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1ixb2vlm3dr52ibp4ggrbkf38m3q6i5lxjg4ix82gxbb6h6a3gp5"; }; diff --git a/pkgs/desktops/mate/mate-calc/default.nix b/pkgs/desktops/mate/mate-calc/default.nix index a9ed85e650b..2805c86fe89 100644 --- a/pkgs/desktops/mate/mate-calc/default.nix +++ b/pkgs/desktops/mate/mate-calc/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, itstool, gtk3, libxml2, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, libxml2, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-calc"; version = "1.24.1"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0imdimq5d5rjq8mkjcrsd683a2bn9acmhc0lmvyw71y0040inbaw"; }; nativeBuildInputs = [ - pkgconfig + pkg-config gettext itstool wrapGAppsHook diff --git a/pkgs/desktops/mate/mate-common/default.nix b/pkgs/desktops/mate/mate-common/default.nix index a491798147f..7a2ac74522f 100644 --- a/pkgs/desktops/mate/mate-common/default.nix +++ b/pkgs/desktops/mate/mate-common/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "mate-common"; version = "1.24.2"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0srb2ly5pjq1g0cs8m39nbfv33dvsc2j4g2gw081xis3awzh3lki"; }; @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { meta = { description = "Common files for development of MATE packages"; homepage = "https://mate-desktop.org"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.romildo ]; + license = lib.licenses.gpl3; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.romildo ]; }; } diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix index 397f4969b6e..262ca75ac79 100644 --- a/pkgs/desktops/mate/mate-control-center/default.nix +++ b/pkgs/desktops/mate/mate-control-center/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, itstool, libxml2, dbus-glib, +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, dbus-glib, libxklavier, libcanberra-gtk3, librsvg, libappindicator-gtk3, desktop-file-utils, dconf, gtk3, polkit, mate, hicolor-icon-theme, wrapGAppsHook }: @@ -8,12 +8,12 @@ stdenv.mkDerivation rec { version = "1.24.1"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "08bai47fsmbxlw2lhig9n6c8sxr24ixkd1spq3j0635yzcqighb0"; }; nativeBuildInputs = [ - pkgconfig + pkg-config gettext itstool desktop-file-utils diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix index 1f9db9a9520..9102ae3e8b5 100644 --- a/pkgs/desktops/mate/mate-desktop/default.nix +++ b/pkgs/desktops/mate/mate-desktop/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, isocodes, gnome3, gtk3, dconf, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, isocodes, gnome3, gtk3, dconf, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-desktop"; version = "1.24.1"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1nd1dn8mm1z6x4r68a25q4vzys1a6fmbzc94ss1z1n1872pczs6i"; }; nativeBuildInputs = [ - pkgconfig + pkg-config gettext wrapGAppsHook ]; diff --git a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix index a429e1e66e3..fd280f3d96e 100644 --- a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, autoreconfHook, gtk3, mate, hicolor-icon-theme }: +{ lib, stdenv, fetchurl, autoreconfHook, gtk3, mate, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "mate-icon-theme-faenza"; version = "1.20.0"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "000vr9cnbl2qlysf2gyg1lsjirqdzmwrnh6d3hyrsfc0r2vh4wna"; }; @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { meta = { description = "Faenza icon theme from MATE"; homepage = "https://mate-desktop.org"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.romildo ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.romildo ]; }; } diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix index 4a1ea4c41fc..530a7b66ff1 100644 --- a/pkgs/desktops/mate/mate-icon-theme/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, pkgconfig, gettext, iconnamingutils, librsvg, gtk3, hicolor-icon-theme }: +{ lib, stdenv, fetchurl, pkg-config, gettext, iconnamingutils, librsvg, gtk3, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "mate-icon-theme"; version = "1.24.0"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0a2lz61ivwwcdznmwlmgjr6ipr9sdl5g2czbagnpxkwz8f3m77na"; }; - nativeBuildInputs = [ pkgconfig gettext iconnamingutils ]; + nativeBuildInputs = [ pkg-config gettext iconnamingutils ]; buildInputs = [ librsvg ]; @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { meta = { description = "Icon themes from MATE"; homepage = "https://mate-desktop.org"; - license = stdenv.lib.licenses.lgpl3; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.romildo ]; + license = lib.licenses.lgpl3; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.romildo ]; }; } diff --git a/pkgs/desktops/mate/mate-indicator-applet/default.nix b/pkgs/desktops/mate/mate-indicator-applet/default.nix index 981a5a04f02..a26b593101a 100644 --- a/pkgs/desktops/mate/mate-indicator-applet/default.nix +++ b/pkgs/desktops/mate/mate-indicator-applet/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, gtk3, libindicator-gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libindicator-gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-indicator-applet"; version = "1.24.0"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0m7pvbs5hhy5f400wqb8wp0dw3pyjpjnjax9qzc73j97l1k3zawf"; }; nativeBuildInputs = [ - pkgconfig + pkg-config gettext wrapGAppsHook ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { longDescription = '' A small applet to display information from various applications consistently in the panel. - + The indicator applet exposes Ayatana Indicators in the MATE Panel. Ayatana Indicators are an initiative by Canonical to provide crisp and clean system and application status indication. They take the form of diff --git a/pkgs/desktops/mate/mate-media/default.nix b/pkgs/desktops/mate/mate-media/default.nix index 77e98495b09..f4d8bd73884 100644 --- a/pkgs/desktops/mate/mate-media/default.nix +++ b/pkgs/desktops/mate/mate-media/default.nix @@ -1,11 +1,11 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, libtool, libxml2, libcanberra-gtk3, gtk3, mate, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, libtool, libxml2, libcanberra-gtk3, gtk3, mate, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-media"; version = "1.24.1"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "118i4w2i2g3hfgbfn3hjzjkfq8vjj6049r7my3vna9js23b7ab92"; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config gettext libtool wrapGAppsHook diff --git a/pkgs/desktops/mate/mate-menus/default.nix b/pkgs/desktops/mate/mate-menus/default.nix index ae145061e1f..1333af0cdd9 100644 --- a/pkgs/desktops/mate/mate-menus/default.nix +++ b/pkgs/desktops/mate/mate-menus/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, glib, gobject-introspection, python3 }: +{ lib, stdenv, fetchurl, pkg-config, gettext, glib, gobject-introspection, python3 }: stdenv.mkDerivation rec { pname = "mate-menus"; version = "1.24.1"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "17zc9fn14jykhn30z8iwlw0qwk32ivj6gxgww3xrqvqk0da5yaas"; }; - nativeBuildInputs = [ pkgconfig gettext gobject-introspection ]; + nativeBuildInputs = [ pkg-config gettext gobject-introspection ]; buildInputs = [ glib python3 ]; diff --git a/pkgs/desktops/mate/mate-netbook/default.nix b/pkgs/desktops/mate/mate-netbook/default.nix index 7103464f23a..3912ab47c8e 100644 --- a/pkgs/desktops/mate/mate-netbook/default.nix +++ b/pkgs/desktops/mate/mate-netbook/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, gtk3, libwnck3, libfakekey, libXtst, mate, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libwnck3, libfakekey, libXtst, mate, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-netbook"; version = "1.24.0"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1bmk9gq5gcqkvfppa7i1hqfph8sajc3xs189s4ha97g0ifwd98a8"; }; nativeBuildInputs = [ - pkgconfig + pkg-config gettext wrapGAppsHook ]; diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix index 6c95f445ace..5e867085bb1 100644 --- a/pkgs/desktops/mate/mate-notification-daemon/default.nix +++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, glib, libcanberra-gtk3, +{ lib, stdenv, fetchurl, pkg-config, gettext, glib, libcanberra-gtk3, libnotify, libwnck3, gtk3, libxml2, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -6,12 +6,12 @@ stdenv.mkDerivation rec { version = "1.24.1"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1ybzr8mni5pgrspf8hqnisd0r0hwdlgk7n5mzsh7xisbkgivpw2b"; }; nativeBuildInputs = [ - pkgconfig + pkg-config gettext libxml2 # for xmllint wrapGAppsHook diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix index 9a09b5e949f..1ada0171911 100644 --- a/pkgs/desktops/mate/mate-panel/default.nix +++ b/pkgs/desktops/mate/mate-panel/default.nix @@ -1,11 +1,11 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, itstool, glib, libwnck3, librsvg, libxml2, dconf, gtk3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, glib, libwnck3, librsvg, libxml2, dconf, gtk3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-panel"; version = "1.24.1"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0xblqrhfazd01h0jdmx4hvavkb7f9anbd4rjsk5r6wxhp027l64l"; }; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { gobject-introspection gettext itstool - pkgconfig + pkg-config wrapGAppsHook ]; diff --git a/pkgs/desktops/mate/mate-polkit/default.nix b/pkgs/desktops/mate/mate-polkit/default.nix index 556bfa02d3d..67690161f55 100644 --- a/pkgs/desktops/mate/mate-polkit/default.nix +++ b/pkgs/desktops/mate/mate-polkit/default.nix @@ -1,18 +1,18 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, gtk3, gobject-introspection, libappindicator-gtk3, libindicator-gtk3, polkit }: +{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, gobject-introspection, libappindicator-gtk3, libindicator-gtk3, polkit }: stdenv.mkDerivation rec { pname = "mate-polkit"; version = "1.24.0"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1450bqzlnvwy3xa98lj102j2cf7piqbxcd1cy2zp41rdl8ri3gvn"; }; nativeBuildInputs = [ gobject-introspection gettext - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix index 995041be6bd..e0c46076a65 100644 --- a/pkgs/desktops/mate/mate-power-manager/default.nix +++ b/pkgs/desktops/mate/mate-power-manager/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, glib, itstool, libxml2, mate-panel, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, gtk3, libtool, polkit, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, glib, itstool, libxml2, mate-panel, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, gtk3, libtool, polkit, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-power-manager"; version = "1.24.2"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0fni41p3kraxwjnx9l5mdspng0zib1gfdxwlaiyq31mh4g79yjyj"; }; nativeBuildInputs = [ - pkgconfig + pkg-config gettext libtool wrapGAppsHook diff --git a/pkgs/desktops/mate/mate-screensaver/default.nix b/pkgs/desktops/mate/mate-screensaver/default.nix index 18f8f571332..fe309352346 100644 --- a/pkgs/desktops/mate/mate-screensaver/default.nix +++ b/pkgs/desktops/mate/mate-screensaver/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, gtk3, dbus-glib, libXScrnSaver, libnotify, libxml2, pam, systemd, mate, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, dbus-glib, libXScrnSaver, libnotify, libxml2, pam, systemd, mate, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-screensaver"; version = "1.24.1"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0imb1z2yvz1h95dzq396c569kkxys9mb2dyc6qxxxcnc5w02a2dw"; }; nativeBuildInputs = [ - pkgconfig + pkg-config gettext libxml2 # provides xmllint wrapGAppsHook diff --git a/pkgs/desktops/mate/mate-sensors-applet/default.nix b/pkgs/desktops/mate/mate-sensors-applet/default.nix index 21b5a58a143..6fed2a65444 100644 --- a/pkgs/desktops/mate/mate-sensors-applet/default.nix +++ b/pkgs/desktops/mate/mate-sensors-applet/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, itstool, gtk3, libxml2, libxslt, libatasmart, libnotify, lm_sensors, mate, hicolor-icon-theme, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, libxml2, libxslt, libatasmart, libnotify, lm_sensors, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-sensors-applet"; version = "1.24.1"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1nb4fy3mcymv7pmnc0czpxgp1sqvs533jwnqv1b5cqby415ljb16"; }; nativeBuildInputs = [ - pkgconfig + pkg-config gettext itstool wrapGAppsHook diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix index 64dfd65b20d..08a119ad8d2 100644 --- a/pkgs/desktops/mate/mate-session-manager/default.nix +++ b/pkgs/desktops/mate/mate-session-manager/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, xtrans, dbus-glib, systemd, +{ lib, stdenv, fetchurl, pkg-config, gettext, xtrans, dbus-glib, systemd, libSM, libXtst, gtk3, epoxy, polkit, hicolor-icon-theme, mate, wrapGAppsHook, fetchpatch }: @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "1.24.1"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1zwq8symyp3ijs28pyrknsdi9byf4dpp9wp93ndwdhi0vaip5i51"; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config gettext xtrans wrapGAppsHook diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix index 467b8c7c9b0..0a483269c5e 100644 --- a/pkgs/desktops/mate/mate-settings-daemon/default.nix +++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, glib, dbus-glib, libxklavier, +{ lib, stdenv, fetchurl, pkg-config, gettext, glib, dbus-glib, libxklavier, libcanberra-gtk3, libnotify, nss, polkit, dconf, gtk3, mate, pulseaudioSupport ? stdenv.config.pulseaudio or true, libpulseaudio, wrapGAppsHook }: @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { version = "1.24.1"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0n1ywr3ir5p536s7azdbw2mh40ylqlpx3a74mjrivbms1rpjxyab"; }; nativeBuildInputs = [ gettext - pkgconfig + pkg-config wrapGAppsHook ]; @@ -30,9 +30,9 @@ stdenv.mkDerivation rec { mate.mate-desktop mate.libmatekbd mate.libmatemixer - ] ++ stdenv.lib.optional pulseaudioSupport libpulseaudio; + ] ++ lib.optional pulseaudioSupport libpulseaudio; - configureFlags = stdenv.lib.optional pulseaudioSupport "--enable-pulse"; + configureFlags = lib.optional pulseaudioSupport "--enable-pulse"; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; diff --git a/pkgs/desktops/mate/mate-system-monitor/default.nix b/pkgs/desktops/mate/mate-system-monitor/default.nix index f6e767e94ab..2d89cb2494b 100644 --- a/pkgs/desktops/mate/mate-system-monitor/default.nix +++ b/pkgs/desktops/mate/mate-system-monitor/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, itstool, gtkmm3, libxml2, libgtop, libwnck3, librsvg, polkit, systemd, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtkmm3, libxml2, libgtop, libwnck3, librsvg, polkit, systemd, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-system-monitor"; version = "1.24.1"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1i2r4lw6xsk972yp15g5hm8p8xx9pp6jmcvvzbdq80xyx3x898qz"; }; nativeBuildInputs = [ - pkgconfig + pkg-config gettext itstool wrapGAppsHook diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix index 1772eacbd04..48588cc6d6d 100644 --- a/pkgs/desktops/mate/mate-terminal/default.nix +++ b/pkgs/desktops/mate/mate-terminal/default.nix @@ -1,11 +1,11 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, glib, itstool, libxml2, mate, dconf, gtk3, vte, pcre2, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, glib, itstool, libxml2, mate, dconf, gtk3, vte, pcre2, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-terminal"; version = "1.24.1"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0qmyhxmarwkxad8k1m9q1iwx70zhfp6zc2mh74nv26nj4gr3h3am"; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config gettext wrapGAppsHook ]; diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix index ffa902a2891..3c0d9cf1b02 100644 --- a/pkgs/desktops/mate/mate-themes/default.nix +++ b/pkgs/desktops/mate/mate-themes/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, mate-icon-theme, gtk2, gtk3, +{ lib, stdenv, fetchurl, pkg-config, gettext, mate-icon-theme, gtk2, gtk3, gtk_engines, gtk-engine-murrine, gdk-pixbuf, librsvg }: stdenv.mkDerivation rec { @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { version = "3.22.21"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/themes/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/themes/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "051g2vq817g84yrqzf7hjcqr4xrghnw1rprjd6jf5mhhzmwcas6n"; }; - nativeBuildInputs = [ pkgconfig gettext gtk3 ]; + nativeBuildInputs = [ pkg-config gettext gtk3 ]; buildInputs = [ mate-icon-theme gtk2 gtk_engines gdk-pixbuf librsvg ]; @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { meta = { description = "A set of themes from MATE"; homepage = "https://mate-desktop.org"; - license = stdenv.lib.licenses.lgpl21; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.romildo ]; + license = lib.licenses.lgpl21; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.romildo ]; }; } diff --git a/pkgs/desktops/mate/mate-tweak/default.nix b/pkgs/desktops/mate/mate-tweak/default.nix index 316a72a09c7..ce97bc416e6 100644 --- a/pkgs/desktops/mate/mate-tweak/default.nix +++ b/pkgs/desktops/mate/mate-tweak/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , python3Packages , intltool diff --git a/pkgs/desktops/mate/mate-user-guide/default.nix b/pkgs/desktops/mate/mate-user-guide/default.nix index 7a95620f31e..2a91cac5a54 100644 --- a/pkgs/desktops/mate/mate-user-guide/default.nix +++ b/pkgs/desktops/mate/mate-user-guide/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.24.0"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0ddxya84iydvy85dbqls0wmz2rph87wri3rsdhv4rkbhh5g4sd7f"; }; diff --git a/pkgs/desktops/mate/mate-user-share/default.nix b/pkgs/desktops/mate/mate-user-share/default.nix index 29f169f447d..8aa9591003c 100644 --- a/pkgs/desktops/mate/mate-user-share/default.nix +++ b/pkgs/desktops/mate/mate-user-share/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, itstool, gtk3, dbus-glib, libnotify, libxml2, libcanberra-gtk3, mod_dnssd, apacheHttpd, hicolor-icon-theme, mate, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, dbus-glib, libnotify, libxml2, libcanberra-gtk3, mod_dnssd, apacheHttpd, hicolor-icon-theme, mate, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-user-share"; version = "1.24.0"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1h4aabcby96nsg557brzzb0an1qvnawhim2rinzlzg4fhkvdfnr5"; }; nativeBuildInputs = [ - pkgconfig + pkg-config gettext itstool libxml2 diff --git a/pkgs/desktops/mate/mate-utils/default.nix b/pkgs/desktops/mate/mate-utils/default.nix index 2faa99f9a8b..c58a3d4bc64 100644 --- a/pkgs/desktops/mate/mate-utils/default.nix +++ b/pkgs/desktops/mate/mate-utils/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, itstool, glib, gtk3, libxml2, libgtop, libcanberra-gtk3, inkscape, udisks2, mate, hicolor-icon-theme, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, glib, gtk3, libxml2, libgtop, libcanberra-gtk3, inkscape, udisks2, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-utils"; version = "1.24.0"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1b16n1628gcsym5mph6lr9x5xm4rgkxsa8xwr2wlx8g2gw2775i1"; }; nativeBuildInputs = [ - pkgconfig + pkg-config gettext itstool inkscape diff --git a/pkgs/desktops/mate/mozo/default.nix b/pkgs/desktops/mate/mozo/default.nix index 669d5400881..4d893cd2e74 100644 --- a/pkgs/desktops/mate/mozo/default.nix +++ b/pkgs/desktops/mate/mozo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3, fetchurl, pkgconfig, gettext, mate, gtk3, glib, wrapGAppsHook, gobject-introspection }: +{ lib, python3, fetchurl, pkg-config, gettext, mate, gtk3, glib, wrapGAppsHook, gobject-introspection }: python3.pkgs.buildPythonApplication rec { pname = "mozo"; @@ -8,11 +8,11 @@ python3.pkgs.buildPythonApplication rec { doCheck = false; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "01lyi47a04xk0by5bvnfmqgv5sysk2wdlri6a4ssmy1qhgwh9zr3"; }; - nativeBuildInputs = [ pkgconfig gettext gobject-introspection wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config gettext gobject-introspection wrapGAppsHook ]; propagatedBuildInputs = [ mate.mate-menus python3.pkgs.pygobject3 ]; diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix index 94a87f5d5f0..a879f2df5d1 100644 --- a/pkgs/desktops/mate/pluma/default.nix +++ b/pkgs/desktops/mate/pluma/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, pkgconfig, gettext, perl, itstool, isocodes, enchant, libxml2, python3, gnome3, gtksourceview3, libpeas, mate, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, perl, itstool, isocodes, enchant, libxml2, python3, gnome3, gtksourceview3, libpeas, mate, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "pluma"; version = "1.24.1"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1sgc5f480icr2ans6gd3akvcax58mr4jp3zjk3xn7bx1mw9i299f"; }; nativeBuildInputs = [ - pkgconfig + pkg-config gettext perl itstool @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { meta = { description = "Powerful text editor for the MATE desktop"; homepage = "https://mate-desktop.org"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.romildo ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.romildo ]; }; } diff --git a/pkgs/desktops/mate/python-caja/default.nix b/pkgs/desktops/mate/python-caja/default.nix index fef39d11f9d..2c59d78e86a 100644 --- a/pkgs/desktops/mate/python-caja/default.nix +++ b/pkgs/desktops/mate/python-caja/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, gtk3, mate, python3Packages }: +{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, mate, python3Packages }: stdenv.mkDerivation rec { pname = "python-caja"; version = "1.24.0"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1wp61q64cgzr3syd3niclj6rjk87wlib5m86i0myf5ph704r3qgg"; }; nativeBuildInputs = [ - pkgconfig + pkg-config gettext python3Packages.wrapPython ]; diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix index 11ba1182f25..1c86de61607 100644 --- a/pkgs/desktops/pantheon/apps/appcenter/default.nix +++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix @@ -21,7 +21,7 @@ , ninja , packagekit , pantheon -, pkgconfig +, pkg-config , python3 , vala , polkit @@ -48,12 +48,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ appstream-glib - dbus # for pkgconfig + dbus # for pkg-config desktop-file-utils gettext meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix index c75ffa8acf3..15e0059ce87 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , nix-update-script , pantheon -, pkgconfig +, pkg-config , meson , ninja , vala @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "elementary-calculator"; - version = "1.5.5"; + version = "1.6.0"; repoName = "calculator"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "sha256-ctKUtaBU0qvDYquGCPL7tiTwQ7IcqvT7SXRjxETWXbM="; + sha256 = "sha256-kDqUwTi3XnFGUwAjnWcaKqDylUFqpus9WurLoqbV1xk="; }; passthru = { @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { libxml2 meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix index 48c660aeccb..f9ab49a72b9 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , nix-update-script , pantheon -, pkgconfig +, pkg-config , meson , ninja , vala @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { desktop-file-utils meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix index 0640265e6db..9a48d38ad8c 100644 --- a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , nix-update-script , pantheon -, pkgconfig +, pkg-config , meson , ninja , vala @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { libxml2 meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix index 538194edd45..7339038b080 100644 --- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , nix-update-script , pantheon -, pkgconfig +, pkg-config , meson , ninja , vala @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { desktop-file-utils meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { # ctags needed in path by outline plugin preFixup = '' gappsWrapperArgs+=( - --prefix PATH : "${stdenv.lib.makeBinPath [ ctags ]}" + --prefix PATH : "${lib.makeBinPath [ ctags ]}" ) ''; diff --git a/pkgs/desktops/pantheon/apps/elementary-dock/default.nix b/pkgs/desktops/pantheon/apps/elementary-dock/default.nix index c28ee297e33..db6633aa5bd 100644 --- a/pkgs/desktops/pantheon/apps/elementary-dock/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-dock/default.nix @@ -13,7 +13,7 @@ , libXi , pango , gettext -, pkgconfig +, pkg-config , libxml2 , bamf , gdk-pixbuf @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { meson ninja libxml2 # xmllint - pkgconfig + pkg-config vala wrapGAppsHook ]; diff --git a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix index abad7f42eb8..21aeb38530f 100644 --- a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , nix-update-script , pantheon -, pkgconfig +, pkg-config , meson , ninja , vala @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { gettext meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix index 635f77e09ed..99fd2a6555f 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , nix-update-script , pantheon -, pkgconfig +, pkg-config , meson , ninja , gettext @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { glib-networking meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/desktops/pantheon/apps/elementary-music/default.nix b/pkgs/desktops/pantheon/apps/elementary-music/default.nix index b8306394f10..24eafcabdea 100644 --- a/pkgs/desktops/pantheon/apps/elementary-music/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-music/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , nix-update-script , pantheon -, pkgconfig +, pkg-config , meson , ninja , vala @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { desktop-file-utils meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix index d3d931e44fc..ca0b3951351 100644 --- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix @@ -1,10 +1,10 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , pantheon , meson , ninja -, pkgconfig +, pkg-config , vala , desktop-file-utils , gtk3 @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { desktop-file-utils meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook @@ -98,7 +98,7 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Photo viewer and organizer designed for elementary OS"; homepage = "https://github.com/elementary/photos"; license = licenses.lgpl21Plus; diff --git a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix b/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix index 1224b9b3120..048aa4ab129 100644 --- a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , nix-update-script , pantheon -, pkgconfig +, pkg-config , meson , ninja , vala @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { desktop-file-utils meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix index 456fee4472b..46f279dd795 100644 --- a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix @@ -3,7 +3,7 @@ , nix-update-script , fetchpatch , pantheon -, pkgconfig +, pkg-config , meson , ninja , python3 @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { libxml2 meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix index 95a61a5649d..e5506093719 100644 --- a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , nix-update-script , pantheon -, pkgconfig +, pkg-config , meson , ninja , vala @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { desktop-file-utils meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/desktops/pantheon/apps/sideload/default.nix b/pkgs/desktops/pantheon/apps/sideload/default.nix index df483b9a796..c3ba1717801 100644 --- a/pkgs/desktops/pantheon/apps/sideload/default.nix +++ b/pkgs/desktops/pantheon/apps/sideload/default.nix @@ -13,7 +13,7 @@ , meson , ninja , pantheon -, pkgconfig +, pkg-config , python3 , vala , libxml2 @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { gettext meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix index 699aa56f4a7..06f097e81af 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix @@ -5,7 +5,7 @@ , pantheon , meson , ninja -, pkgconfig +, pkg-config , vala , libgee , granite @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config vala ]; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix index fad80f13196..adba2ec0801 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix @@ -6,7 +6,7 @@ , substituteAll , meson , ninja -, pkgconfig +, pkg-config , vala , libgee , granite @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config vala ]; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix index 3c76dc9053c..66596fa2ff1 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix @@ -4,7 +4,7 @@ , pantheon , meson , ninja -, pkgconfig +, pkg-config , vala , libgee , granite @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config vala ]; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix index 3f35c6a46b9..dea3c0306a3 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix @@ -4,7 +4,7 @@ , pantheon , meson , ninja -, pkgconfig +, pkg-config , vala , libgee , granite @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config vala ]; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix index 036b21a08fc..2337ef24119 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix @@ -5,7 +5,7 @@ , meson , ninja , substituteAll -, pkgconfig +, pkg-config , vala , libgee , granite @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { libxml2 meson ninja - pkgconfig + pkg-config vala ]; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix index 4471ebaef23..055a4098963 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix @@ -4,7 +4,7 @@ , pantheon , meson , ninja -, pkgconfig +, pkg-config , vala , libgee , granite @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config vala ]; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix index 8cb401e48de..06bdce19f45 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix @@ -6,7 +6,7 @@ , substituteAll , meson , ninja -, pkgconfig +, pkg-config , vala , libgee , granite @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { libxml2 meson ninja - pkgconfig + pkg-config vala ]; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix index c1177c54b24..67eeee584a6 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix @@ -4,7 +4,7 @@ , pantheon , meson , ninja -, pkgconfig +, pkg-config , vala , libgee , granite @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config vala ]; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix index 5672c442269..fce9402e131 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix @@ -4,7 +4,7 @@ , pantheon , meson , ninja -, pkgconfig +, pkg-config , substituteAll , vala , libgee @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config vala ]; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix index a1ed6b1085c..8c750710aed 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix @@ -5,7 +5,7 @@ , pantheon , meson , ninja -, pkgconfig +, pkg-config , vala , libgee , granite @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config vala ]; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix index 43a411a4d25..ef12cb38e1b 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix @@ -5,7 +5,7 @@ , pantheon , meson , ninja -, pkgconfig +, pkg-config , vala_0_46 , libgee , granite @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config vala_0_46 ]; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix index 6a9b1f6494d..97668d35471 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, nix-update-script, pantheon, meson, ninja, pkgconfig, vala, glib +{ lib, stdenv, fetchFromGitHub, nix-update-script, pantheon, meson, ninja, pkg-config, vala, glib , libgee, granite, gexiv2, elementary-settings-daemon, gtk3, gnome-desktop , gala, wingpanel, elementary-dock, switchboard, gettext, bamf, fetchpatch }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { gettext meson ninja - pkgconfig + pkg-config vala ]; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix index 71ce891043b..f0cf47cfdfe 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix @@ -5,7 +5,7 @@ , substituteAll , meson , ninja -, pkgconfig +, pkg-config , vala , libgee , elementary-dpms-helper @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config vala ]; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix index 6a9ade11736..06d8041339d 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix @@ -5,7 +5,7 @@ , pantheon , meson , ninja -, pkgconfig +, pkg-config , vala , libgee , granite @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config vala ]; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix index c90d88161a9..6a18f6b6e23 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix @@ -5,7 +5,7 @@ , meson , python3 , ninja -, pkgconfig +, pkg-config , vala , libgee , granite @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config python3 vala ]; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix index ff8fd5909ba..6baaed293c9 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix @@ -5,7 +5,7 @@ , pantheon , meson , ninja -, pkgconfig +, pkg-config , vala , libgee , granite @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config vala ]; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix index ead5305651b..10117dd8f95 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix @@ -4,7 +4,7 @@ , pantheon , meson , ninja -, pkgconfig +, pkg-config , vala , libgee , granite @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config vala ]; diff --git a/pkgs/desktops/pantheon/apps/switchboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard/default.nix index d842b4f361b..d0b56d7456a 100644 --- a/pkgs/desktops/pantheon/apps/switchboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , nix-update-script , pantheon -, pkgconfig +, pkg-config , meson , python3 , ninja @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { gettext meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix index b4d7ce5b247..a89ea19079e 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix @@ -4,7 +4,7 @@ , pantheon , meson , ninja -, pkgconfig +, pkg-config }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config ]; passthru = { diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix index 27888065715..982502f5161 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix @@ -6,7 +6,7 @@ , ninja , nixos-artwork , glib -, pkgconfig +, pkg-config , dbus , polkit , accountsservice @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { glib # polkit requires meson ninja - pkgconfig + pkg-config polkit python3 ]; diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix index 27d82c345a9..e80e7d951cd 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix @@ -5,7 +5,7 @@ , substituteAll , elementary-greeter , pantheon -, pkgconfig +, pkg-config , meson , ninja , vala @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { desktop-file-utils meson ninja - pkgconfig + pkg-config vala wrapGAppsHook ]; diff --git a/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix b/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix index f435104b320..bfe95e0be46 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib , runCommand , mutter , elementary-default-settings @@ -28,7 +28,7 @@ let in -with stdenv.lib; +with lib; # TODO: Having https://github.com/NixOS/nixpkgs/issues/54150 would supersede this runCommand "elementary-gsettings-desktop-schemas" {} diff --git a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix index 6d900b2e03f..70da883392a 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix @@ -3,7 +3,7 @@ , nix-update-script , pantheon , fetchpatch -, pkgconfig +, pkg-config , meson , ninja , vala @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { gettext meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix b/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix index e80dc3644fb..7b821f883ce 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix @@ -4,7 +4,7 @@ , pantheon , meson , ninja -, pkgconfig +, pkg-config , vala , gtk3 }: @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config vala ]; diff --git a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix index d3f3725ad83..314267d8612 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , nix-update-script , pantheon -, pkgconfig +, pkg-config , meson , ninja , vala @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { libxml2 meson ninja - pkgconfig + pkg-config vala wrapGAppsHook ]; diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index 349b4cd63b5..c4467c53a2b 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -1,9 +1,9 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , fetchpatch , pantheon -, pkgconfig +, pkg-config , meson , python3 , ninja @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { libxml2 meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { patchShebangs build-aux/meson/post_install.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A window & compositing manager based on mutter and designed by elementary for use with Pantheon"; homepage = "https://github.com/elementary/gala"; license = licenses.gpl3Plus; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix index 19c565ac9f9..230ae29ffa0 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix @@ -7,7 +7,7 @@ , meson , ninja , python3 -, pkgconfig +, pkg-config , vala , granite , libgee @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { gettext meson ninja - pkgconfig + pkg-config python3 vala ]; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix index 4e6fd0e4f6c..03500abd623 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , nix-update-script , pantheon -, pkgconfig +, pkg-config , meson , python3 , ninja @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { libxml2 meson ninja - pkgconfig + pkg-config python3 vala ]; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix index 2b5898db932..c4e070aeacb 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , nix-update-script , pantheon -, pkgconfig +, pkg-config , meson , python3 , ninja @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { libxml2 meson ninja - pkgconfig + pkg-config python3 vala ]; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix index 01c3ee9e275..4e2f9455073 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , nix-update-script , pantheon -, pkgconfig +, pkg-config , meson , ninja , substituteAll @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meson ninja libxml2 - pkgconfig + pkg-config vala ]; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix index eb69d6410eb..ab898084c08 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , nix-update-script , pantheon -, pkgconfig +, pkg-config , meson , ninja , vala @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config vala ]; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix index 04047180f30..4481c181f53 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , nix-update-script , pantheon -, pkgconfig +, pkg-config , meson , ninja , vala @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { libxml2 meson ninja - pkgconfig + pkg-config vala ]; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix index 3028fa21da3..97ab0cb80ed 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , nix-update-script , pantheon -, pkgconfig +, pkg-config , fetchpatch , meson , ninja @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config vala ]; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix index e1156f693e4..69a17b9dd30 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , nix-update-script , pantheon -, pkgconfig +, pkg-config , meson , python3 , ninja @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config python3 vala ]; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix index 84b204a17f7..a6c08b613bb 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix @@ -3,7 +3,7 @@ , nix-update-script , fetchpatch , pantheon -, pkgconfig +, pkg-config , meson , ninja , vala @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config vala ]; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix index ab51071bd75..25707f39e46 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , nix-update-script , pantheon -, pkgconfig +, pkg-config , meson , python3 , ninja @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { libxml2 meson ninja - pkgconfig + pkg-config python3 vala ]; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix index 752b7daac20..8e314d3d84b 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix @@ -3,7 +3,7 @@ , nix-update-script , pantheon , wrapGAppsHook -, pkgconfig +, pkg-config , meson , ninja , vala @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { gettext meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/desktops/pantheon/granite/default.nix b/pkgs/desktops/pantheon/granite/default.nix index 8d06464ef1c..defb6095a35 100644 --- a/pkgs/desktops/pantheon/granite/default.nix +++ b/pkgs/desktops/pantheon/granite/default.nix @@ -5,7 +5,7 @@ , meson , ninja , vala -, pkgconfig +, pkg-config , libgee , pantheon , gtk3 @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { gobject-introspection meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/desktops/pantheon/services/contractor/default.nix b/pkgs/desktops/pantheon/services/contractor/default.nix index 650c7a9fe87..e15480c8cc8 100644 --- a/pkgs/desktops/pantheon/services/contractor/default.nix +++ b/pkgs/desktops/pantheon/services/contractor/default.nix @@ -5,7 +5,7 @@ , meson , python3 , ninja -, pkgconfig +, pkg-config , vala , glib , libgee @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { dbus meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix index 97320ce0496..d9f224ce45d 100644 --- a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , nix-update-script , pantheon -, pkgconfig +, pkg-config , meson , python3 , ninja @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { desktop-file-utils meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix b/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix index 0251e857a18..65995c45659 100644 --- a/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ]; preFixup = '' - gappsWrapperArgs+=(--prefix PATH : "${stdenv.lib.makeBinPath [ glib.dev coreutils ]}") + gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ glib.dev coreutils ]}") ''; postFixup = '' diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix index 268f6c4aaef..a37e43cd355 100644 --- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix @@ -4,7 +4,7 @@ , fetchgit , meson , ninja -, pkgconfig +, pkg-config , gnome3 , perl , gettext @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config perl gettext libxml2 diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix index 29b24981c47..70b62e2b9a0 100644 --- a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix +++ b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , nix-update-script , pantheon -, pkgconfig +, pkg-config , meson , ninja , vala @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { desktop-file-utils meson ninja - pkgconfig + pkg-config vala wrapGAppsHook ]; diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix index f3a49654938..61bbb6ef9a4 100644 --- a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix +++ b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , nix-update-script , pantheon -, pkgconfig +, pkg-config , meson , ninja , vala @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config vala wrapGAppsHook ]; diff --git a/pkgs/desktops/rox/rox-filer/default.nix b/pkgs/desktops/rox/rox-filer/default.nix index e8ffe0f9d92..ed00f37c687 100644 --- a/pkgs/desktops/rox/rox-filer/default.nix +++ b/pkgs/desktops/rox/rox-filer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libxml2, gtk, libSM, shared-mime-info }: +{ lib, stdenv, fetchurl, pkg-config, libxml2, gtk, libSM, shared-mime-info }: let version = "2.11"; @@ -11,7 +11,7 @@ in stdenv.mkDerivation { sha256 = "a929bd32ee18ef7a2ed48b971574574592c42e34ae09f36604bf663d7c101ba8"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxml2 gtk shared-mime-info libSM ]; NIX_LDFLAGS = "-ldl -lm"; diff --git a/pkgs/desktops/surf-display/default.nix b/pkgs/desktops/surf-display/default.nix index 6746229a6bd..3a74982eb4a 100644 --- a/pkgs/desktops/surf-display/default.nix +++ b/pkgs/desktops/surf-display/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { patchShebangs $out/bin/surf-display wrapProgram $out/bin/surf-display \ - --prefix PATH ':' ${stdenv.lib.makeBinPath buildInputs} + --prefix PATH ':' ${lib.makeBinPath buildInputs} ''; makeFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/desktops/xfce/applications/catfish/default.nix b/pkgs/desktops/xfce/applications/catfish/default.nix index 6eff57f46ed..e76ffa7204a 100644 --- a/pkgs/desktops/xfce/applications/catfish/default.nix +++ b/pkgs/desktops/xfce/applications/catfish/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchurl, file, which, intltool, gobject-introspection, - findutils, xdg_utils, dconf, gtk3, python3Packages, +{ lib, fetchurl, file, which, intltool, gobject-introspection, + findutils, xdg-utils, dconf, gtk3, python3Packages, wrapGAppsHook }: @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication rec { version = "1.4.13"; src = fetchurl { - url = "https://archive.xfce.org/src/apps/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + url = "https://archive.xfce.org/src/apps/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "0fg89946z6n8njxn4mv29jksw8yavg8vypsljn9031pjwl3fmh2q"; }; @@ -34,7 +34,7 @@ python3Packages.buildPythonApplication rec { python3Packages.dbus-python python3Packages.pygobject3 python3Packages.pexpect - xdg_utils + xdg-utils findutils ]; diff --git a/pkgs/desktops/xfce/applications/orage/default.nix b/pkgs/desktops/xfce/applications/orage/default.nix index a18002928dc..45500450723 100644 --- a/pkgs/desktops/xfce/applications/orage/default.nix +++ b/pkgs/desktops/xfce/applications/orage/default.nix @@ -4,7 +4,7 @@ assert withPanelPlugin -> libxfce4ui != null && xfce4-panel != null; let - inherit (stdenv.lib) optionals; + inherit (lib) optionals; in stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { version = "4.12.1"; src = fetchurl { - url = "https://archive.xfce.org/src/apps/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + url = "https://archive.xfce.org/src/apps/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "0qlhvnl2m33vfxqlbkic2nmfpwyd4mq230jzhs48cg78392amy9w"; }; diff --git a/pkgs/desktops/xfce/art/xfce4-icon-theme.nix b/pkgs/desktops/xfce/art/xfce4-icon-theme/default.nix index ea4a4e0c7ee..a2339d58568 100644 --- a/pkgs/desktops/xfce/art/xfce4-icon-theme.nix +++ b/pkgs/desktops/xfce/art/xfce4-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, intltool, gtk3, gnome-icon-theme, tango-icon-theme, hicolor-icon-theme, xfce }: +{ lib, stdenv, fetchurl, pkg-config, intltool, gtk3, gnome-icon-theme, tango-icon-theme, hicolor-icon-theme, xfce }: let category = "art"; @@ -9,12 +9,12 @@ stdenv.mkDerivation rec { version = "4.4.3"; src = fetchurl { - url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "1yk6rx3zr9grm4jwpjvqdkl13pisy7qn1wm5cqzmd2kbsn96cy6l"; }; nativeBuildInputs = [ - pkgconfig + pkg-config intltool gtk3 ]; diff --git a/pkgs/desktops/xfce/art/xfwm4-themes.nix b/pkgs/desktops/xfce/art/xfwm4-themes/default.nix index b93fa776ca4..569a18a796e 100644 --- a/pkgs/desktops/xfce/art/xfwm4-themes.nix +++ b/pkgs/desktops/xfce/art/xfwm4-themes/default.nix @@ -9,10 +9,10 @@ stdenv.mkDerivation rec { version = "4.10.0"; src = fetchurl { - url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "0xfmdykav4rf6gdxbd6fhmrfrvbdc1yjihz7r7lba0wp1vqda51j"; }; - + passthru.updateScript = xfce.updateScript { inherit pname version; attrPath = "xfce.${pname}"; diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 09df8d79dca..de8ae12b895 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -96,9 +96,9 @@ lib.makeScope pkgs.newScope (self: with self; { #### ART - xfce4-icon-theme = callPackage ./art/xfce4-icon-theme.nix { }; + xfce4-icon-theme = callPackage ./art/xfce4-icon-theme { }; - xfwm4-themes = callPackage ./art/xfwm4-themes.nix { }; + xfwm4-themes = callPackage ./art/xfwm4-themes { }; #### PANEL PLUGINS @@ -110,47 +110,49 @@ lib.makeScope pkgs.newScope (self: with self; { xfce4-cpufreq-plugin = callPackage ./panel-plugins/xfce4-cpufreq-plugin { }; - xfce4-cpugraph-plugin = callPackage ./panel-plugins/xfce4-cpugraph-plugin.nix { }; + xfce4-cpugraph-plugin = callPackage ./panel-plugins/xfce4-cpugraph-plugin { }; xfce4-datetime-plugin = callPackage ./panel-plugins/xfce4-datetime-plugin { }; - xfce4-dockbarx-plugin = callPackage ./panel-plugins/xfce4-dockbarx-plugin.nix { }; + xfce4-dockbarx-plugin = callPackage ./panel-plugins/xfce4-dockbarx-plugin { }; - xfce4-embed-plugin = callPackage ./panel-plugins/xfce4-embed-plugin.nix { }; + xfce4-embed-plugin = callPackage ./panel-plugins/xfce4-embed-plugin { }; - xfce4-eyes-plugin = callPackage ./panel-plugins/xfce4-eyes-plugin.nix { }; + xfce4-eyes-plugin = callPackage ./panel-plugins/xfce4-eyes-plugin { }; - xfce4-fsguard-plugin = callPackage ./panel-plugins/xfce4-fsguard-plugin.nix { }; + xfce4-fsguard-plugin = callPackage ./panel-plugins/xfce4-fsguard-plugin { }; - xfce4-genmon-plugin = callPackage ./panel-plugins/xfce4-genmon-plugin.nix { }; + xfce4-genmon-plugin = callPackage ./panel-plugins/xfce4-genmon-plugin { }; - xfce4-hardware-monitor-plugin = callPackage ./panel-plugins/xfce4-hardware-monitor-plugin.nix { }; + xfce4-hardware-monitor-plugin = callPackage ./panel-plugins/xfce4-hardware-monitor-plugin { }; - xfce4-namebar-plugin = callPackage ./panel-plugins/xfce4-namebar-plugin.nix { }; + xfce4-i3-workspaces-plugin = callPackage ./panel-plugins/xfce4-i3-workspaces-plugin { }; + + xfce4-namebar-plugin = callPackage ./panel-plugins/xfce4-namebar-plugin { }; xfce4-netload-plugin = callPackage ./panel-plugins/xfce4-netload-plugin { }; - xfce4-notes-plugin = callPackage ./panel-plugins/xfce4-notes-plugin.nix { }; + xfce4-notes-plugin = callPackage ./panel-plugins/xfce4-notes-plugin { }; - xfce4-mailwatch-plugin = callPackage ./panel-plugins/xfce4-mailwatch-plugin.nix { }; + xfce4-mailwatch-plugin = callPackage ./panel-plugins/xfce4-mailwatch-plugin { }; - xfce4-mpc-plugin = callPackage ./panel-plugins/xfce4-mpc-plugin.nix { }; + xfce4-mpc-plugin = callPackage ./panel-plugins/xfce4-mpc-plugin { }; - xfce4-sensors-plugin = callPackage ./panel-plugins/xfce4-sensors-plugin.nix { }; + xfce4-sensors-plugin = callPackage ./panel-plugins/xfce4-sensors-plugin { }; - xfce4-systemload-plugin = callPackage ./panel-plugins/xfce4-systemload-plugin.nix { }; + xfce4-systemload-plugin = callPackage ./panel-plugins/xfce4-systemload-plugin { }; - xfce4-timer-plugin = callPackage ./panel-plugins/xfce4-timer-plugin.nix { }; + xfce4-timer-plugin = callPackage ./panel-plugins/xfce4-timer-plugin { }; xfce4-verve-plugin = callPackage ./panel-plugins/xfce4-verve-plugin { }; xfce4-xkb-plugin = callPackage ./panel-plugins/xfce4-xkb-plugin { }; - xfce4-weather-plugin = callPackage ./panel-plugins/xfce4-weather-plugin.nix { }; + xfce4-weather-plugin = callPackage ./panel-plugins/xfce4-weather-plugin { }; xfce4-whiskermenu-plugin = callPackage ./panel-plugins/xfce4-whiskermenu-plugin { }; - xfce4-windowck-plugin = callPackage ./panel-plugins/xfce4-windowck-plugin.nix { }; + xfce4-windowck-plugin = callPackage ./panel-plugins/xfce4-windowck-plugin { }; xfce4-pulseaudio-plugin = callPackage ./panel-plugins/xfce4-pulseaudio-plugin { }; diff --git a/pkgs/desktops/xfce/mkXfceDerivation.nix b/pkgs/desktops/xfce/mkXfceDerivation.nix index ddfc5530570..5c47dc7f85d 100644 --- a/pkgs/desktops/xfce/mkXfceDerivation.nix +++ b/pkgs/desktops/xfce/mkXfceDerivation.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, pkgconfig, xfce4-dev-tools, hicolor-icon-theme, xfce, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitLab, pkg-config, xfce4-dev-tools, hicolor-icon-theme, xfce, wrapGAppsHook }: { category , pname @@ -14,7 +14,7 @@ let inherit (builtins) filter getAttr head isList; - inherit (stdenv.lib) attrNames concatLists recursiveUpdate zipAttrsWithNames; + inherit (lib) attrNames concatLists recursiveUpdate zipAttrsWithNames; filterAttrNames = f: attrs: filter (n: f (getAttr n attrs)) (attrNames attrs); @@ -25,7 +25,7 @@ let template = rec { inherit pname version; - nativeBuildInputs = [ pkgconfig xfce4-dev-tools wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config xfce4-dev-tools wrapGAppsHook ]; buildInputs = [ hicolor-icon-theme ]; configureFlags = [ "--enable-maintainer-mode" ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix index e8945b3e55b..e80d0bbc9ac 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix @@ -1,20 +1,34 @@ -{ lib, stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xorgproto, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk3, hicolor-icon-theme, xfce }: +{ lib +, stdenv +, fetchurl +, pkg-config +, intltool +, glib +, exo +, libXtst +, xorgproto +, libxfce4util +, xfce4-panel +, libxfce4ui +, xfconf +, gtk3 +, hicolor-icon-theme +, xfce +}: let category = "panel-plugins"; -in - -stdenv.mkDerivation rec { +in stdenv.mkDerivation rec { pname = "xfce4-cpugraph-plugin"; - version = "1.1.0"; + version = "1.2.1"; src = fetchurl { - url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "193bj1p54l4zrvgdjj0pvjn161d6dn82jh9invcy09sqwlj0mkiy"; + url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + sha256 = "YVrfmr2RQXpEMZ2OTa3GAS+iKjd48vN5cXUS3Lfvkko="; }; nativeBuildInputs = [ - pkgconfig + pkg-config intltool ]; @@ -42,6 +56,6 @@ stdenv.mkDerivation rec { description = "CPU graph show for Xfce panel"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = [ ]; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix index aa14c878b12..304b9d9076d 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix @@ -1,5 +1,5 @@ { mkXfceDerivation -, lib, stdenv +, lib , intltool , libxfce4ui , xfce4-panel diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix index 6c75b44d77a..e64d6fbae51 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkgconfig, fetchFromGitHub, python2, bash, vala_0_46 +{ lib, stdenv, pkg-config, fetchFromGitHub, python2, bash, vala_0_46 , dockbarx, gtk2, xfce, pythonPackages, wafHook }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { pythonPath = [ dockbarx ]; - nativeBuildInputs = [ pkgconfig wafHook ]; + nativeBuildInputs = [ pkg-config wafHook ]; buildInputs = [ python2 vala_0_46 gtk2 pythonPackages.wrapPython ] ++ (with xfce; [ libxfce4util xfce4-panel xfconf xfce4-dev-tools ]) ++ pythonPath; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin/default.nix index 2b2027bcf4b..cf383f840d5 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin/default.nix @@ -1,21 +1,28 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk2, xfce }: +{ lib +, stdenv +, fetchurl +, pkg-config +, intltool +, libxfce4util +, xfce4-panel +, libxfce4ui +, gtk2 +, xfce +}: let category = "panel-plugins"; -in - -with stdenv.lib; -stdenv.mkDerivation rec { +in stdenv.mkDerivation rec { pname = "xfce4-embed-plugin"; version = "1.6.0"; src = fetchurl { - url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "0a72kqsjjh45swimqlpyrahdnplp0383v0i4phr4n6g8c1ixyry7"; }; nativeBuildInputs = [ - pkgconfig + pkg-config intltool ]; @@ -32,11 +39,11 @@ stdenv.mkDerivation rec { versionLister = xfce.archiveLister category pname; }; - meta = { + meta = with lib;{ homepage = "https://docs.xfce.org/panel-plugins/xfce4-embed-plugin"; description = "Embed arbitrary app windows on Xfce panel"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = [ ]; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin/default.nix index edd317918d8..d19f0051d43 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin/default.nix @@ -1,23 +1,32 @@ -{ lib, stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk3, xfce }: +{ lib +, stdenv +, fetchurl +, pkg-config +, intltool +, libxfce4util +, xfce4-panel +, libxfce4ui +, xfconf +, gtk3 +, xfce +}: let category = "panel-plugins"; -in - -stdenv.mkDerivation rec { +in stdenv.mkDerivation rec { pname = "xfce4-eyes-plugin"; version = "4.5.1"; src = fetchurl { - url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "1iaszzkagl1mb0cdafrvlfjnjklhhs9y90517par34sjiqbq1dsd"; }; nativeBuildInputs = [ - pkgconfig + pkg-config intltool ]; - + buildInputs = [ libxfce4util libxfce4ui @@ -25,7 +34,7 @@ stdenv.mkDerivation rec { xfconf gtk3 ]; - + passthru.updateScript = xfce.updateScript { inherit pname version; attrPath = "xfce.${pname}"; @@ -37,6 +46,6 @@ stdenv.mkDerivation rec { description = "Rolling eyes (following mouse pointer) plugin for the Xfce panel"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = [ ]; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin/default.nix index 31bb89198f6..36cca7b7395 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin/default.nix @@ -1,20 +1,29 @@ -{ lib, stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk3, xfce }: +{ lib +, stdenv +, fetchurl +, pkg-config +, intltool +, libxfce4util +, xfce4-panel +, libxfce4ui +, xfconf +, gtk3 +, xfce +}: let category = "panel-plugins"; -in - -stdenv.mkDerivation rec { +in stdenv.mkDerivation rec { pname = "xfce4-fsguard-plugin"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "05nmfkrmifm76bsywqmbjd1qdvzagv5cbvnwbkb57156j055vl6n"; + url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + sha256 = "Z9jmohmnEXxZaTrbxZw5puujHj8YpUmRie9O8otVQQU="; }; nativeBuildInputs = [ - pkgconfig + pkg-config intltool ]; @@ -25,7 +34,7 @@ stdenv.mkDerivation rec { xfconf gtk3 ]; - + passthru.updateScript = xfce.updateScript { inherit pname version; attrPath = "xfce.${pname}"; @@ -37,6 +46,6 @@ stdenv.mkDerivation rec { description = "Filesystem usage monitor plugin for the Xfce panel"; license = licenses.bsd2; platforms = platforms.linux; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = [ ]; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin/default.nix index 4566a140dd3..8289be33310 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin/default.nix @@ -1,20 +1,28 @@ -{ lib, stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk3, xfce }: +{ lib +, stdenv +, fetchurl +, pkg-config +, intltool +, libxfce4util +, xfce4-panel +, libxfce4ui +, gtk3 +, xfce +}: let category = "panel-plugins"; -in - -stdenv.mkDerivation rec { +in stdenv.mkDerivation rec { pname = "xfce4-genmon-plugin"; - version = "4.0.2"; + version = "4.1.1"; src = fetchurl { - url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "1ai3pwgv61nv7i2dyrvncnc63r8kdjbkp40vp51vzak1dx924v15"; + url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + sha256 = "shGf0P8Z+ik7l+yXsN6OJBeZ4IuGIYUVFnxWi9m1ATU="; }; nativeBuildInputs = [ - pkgconfig + pkg-config intltool ]; @@ -24,7 +32,7 @@ stdenv.mkDerivation rec { xfce4-panel gtk3 ]; - + passthru.updateScript = xfce.updateScript { inherit pname version; attrPath = "xfce.${pname}"; @@ -36,6 +44,6 @@ stdenv.mkDerivation rec { description = "Generic monitor plugin for the Xfce panel"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = [ ]; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin/default.nix index bc8d9ff3276..8afff65696d 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, intltool, autoreconfHook, gnome2, gtkmm2, +{ lib, stdenv, fetchurl, pkg-config, intltool, autoreconfHook, gnome2, gtkmm2, libgtop, libxfce4ui, libxfce4util, xfce4-panel, lm_sensors, xfce }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config intltool ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-i3-workspaces-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-i3-workspaces-plugin/default.nix new file mode 100644 index 00000000000..136b91a8a2f --- /dev/null +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-i3-workspaces-plugin/default.nix @@ -0,0 +1,46 @@ +{ lib, stdenv, fetchFromGitHub, pkg-config, intltool, gtk3 +, libxfce4ui, libxfce4util, xfconf, xfce4-dev-tools, xfce4-panel +, i3ipc-glib +}: + +stdenv.mkDerivation rec { + pname = "xfce4-i3-workspaces-plugin"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "denesb"; + repo = "xfce4-i3-workspaces-plugin"; + rev = version; + sha256 = "sha256-+tjxMr0UbE3BLdxBwNr2mZqKSQOOtw69FmN4rk4loyA="; + }; + + nativeBuildInputs = [ + pkg-config + intltool + ]; + + buildInputs = [ + gtk3 + xfconf + libxfce4ui + libxfce4util + xfce4-dev-tools + xfce4-panel + i3ipc-glib + ]; + + preConfigure = '' + ./autogen.sh + patchShebangs . + ''; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "https://github.com/denesb/xfce4-i3-workspaces-plugin"; + description = "Workspace switcher plugin for xfce4-panel which can be used for the i3 window manager"; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = [ maintainers.berbiche ]; + }; +} diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix index b3d1f6e7159..df31ea3b9b5 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, +{ lib, stdenv, fetchurl, pkg-config, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk2, exo, gnutls, libgcrypt, xfce }: let @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { version = "1.2.0"; src = fetchurl { - url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "1bfw3smwivr9mzdyq768biqrl4aq94zqi3xjzq6kqnd8561cqjk2"; }; nativeBuildInputs = [ intltool - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin/default.nix index dddbf79522e..37f64021c72 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, +{ lib, stdenv, fetchurl, pkg-config, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk3, exo, xfce }: let @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { version = "0.5.2"; src = fetchurl { - url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "0q3pysdp85b3c7g3b59y3c69g4nw6bvbf518lnri4lxrnsvpizpf"; }; nativeBuildInputs = [ - pkgconfig + pkg-config intltool ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix index 92d39fc8fbb..407f349d9bf 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkgconfig, fetchFromGitHub, python3, vala_0_46 +{ lib, stdenv, pkg-config, fetchFromGitHub, python3, vala_0_46 , gtk3, libwnck3, libxfce4util, xfce4-panel, wafHook, xfce }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0l70f6mzkscsj4wr43wp5c0l2qnf85vj24cv02bjrh3bzz6wkak8"; }; - nativeBuildInputs = [ pkgconfig vala_0_46 wafHook python3 ]; + nativeBuildInputs = [ pkg-config vala_0_46 wafHook python3 ]; buildInputs = [ gtk3 libwnck3 libxfce4util xfce4-panel ]; postPatch = '' diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix index 70586d1bc34..7442e30ed69 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix @@ -1,20 +1,31 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2, libunique, xfce }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, pkg-config +, intltool +, libxfce4util +, xfce4-panel +, libxfce4ui +, xfconf +, gtk2 +, libunique +, xfce +}: let category = "panel-plugins"; -in - -stdenv.mkDerivation rec { +in stdenv.mkDerivation rec { pname = "xfce4-notes-plugin"; - version = "1.8.1"; + version = "1.9.0"; src = fetchurl { - url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "1cjlvvcsigyh40xa26b2vc5zylgss0nlaw72sablzhii2kkw7907"; + url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + sha256 = "E/kJyUi2Oflt5kz3k+t0yxd5WJIB05M+/yFO6PNasIg="; }; nativeBuildInputs = [ - pkgconfig + pkg-config intltool ]; @@ -40,6 +51,6 @@ stdenv.mkDerivation rec { description = "Sticky notes plugin for Xfce panel"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = [ ]; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix index 61237856d5d..845f1b22e33 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, intltool, gtk3, libxfce4ui, +{ lib, stdenv, fetchurl, pkg-config, intltool, gtk3, libxfce4ui, libxfce4util, xfce4-panel, libnotify, lm_sensors, hddtemp, netcat-gnu, xfce }: @@ -11,12 +11,12 @@ stdenv.mkDerivation rec { version = "1.3.92"; src = fetchurl { - url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "04jibw23ibi61f19gc9xy400yhcdiya4px6zp8c7fjq65hyn9iix"; }; nativeBuildInputs = [ - pkgconfig + pkg-config intltool ]; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { "--with-pathhddtemp=${hddtemp}/bin/hddtemp" "--with-pathnetcat=${netcat-gnu}/bin/netcat" ]; - + passthru.updateScript = xfce.updateScript { inherit pname version; attrPath = "xfce.${pname}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin/default.nix index c1a5dfecbba..13bce97fe33 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin/default.nix @@ -1,20 +1,28 @@ -{ lib, stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk3, xfce }: +{ lib +, stdenv +, fetchurl +, pkg-config +, intltool +, libxfce4util +, xfce4-panel +, libxfce4ui +, gtk3 +, xfce +}: let category = "panel-plugins"; -in - -stdenv.mkDerivation rec { +in stdenv.mkDerivation rec { pname = "xfce4-systemload-plugin"; - version = "1.2.3"; + version = "1.2.4"; src = fetchurl { - url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "0x87a8h5l3ashz1ksfaxcpn9a392jzlsbx5n5pga8g90fp2hf905"; + url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + sha256 = "BTG435I8ujvo0GTLi2OLlU33SRXlpEciiZlReEd4mDU="; }; nativeBuildInputs = [ - pkgconfig + pkg-config intltool ]; @@ -36,6 +44,6 @@ stdenv.mkDerivation rec { description = "System load plugin for Xfce panel"; license = licenses.bsd2; platforms = platforms.linux; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = [ ]; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin/default.nix index 27e9c098974..7c2fb69dc5c 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk3, hicolor-icon-theme, xfce }: +{ lib, stdenv, fetchurl, pkg-config, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk3, hicolor-icon-theme, xfce }: let category = "panel-plugins"; @@ -9,12 +9,12 @@ stdenv.mkDerivation rec { version = "1.7.1"; src = fetchurl { - url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "1qr4m3n2l3rvsizsr3h7fyfajszfalqm7rhvjx2yjj8r3f8x4ljb"; }; nativeBuildInputs = [ - pkgconfig + pkg-config intltool ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; hardeningDisable = [ "format" ]; - + passthru.updateScript = xfce.updateScript { inherit pname version; attrPath = "xfce.${pname}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix index ce90dd6809d..d8946c98a38 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, substituteAll, callPackage, pkgconfig, cmake, vala, libxml2, +{ lib, stdenv, fetchFromGitHub, substituteAll, callPackage, pkg-config, cmake, vala, libxml2, glib, pcre, gtk2, gtk3, xorg, libxkbcommon, epoxy, at-spi2-core, dbus-glib, bamf, xfce, libwnck3, libdbusmenu, gobject-introspection }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "06rykdr2c9rnzxwinwdynd73v9wf0gjkx6qfva7sx2n94ajsdnaw"; }; - nativeBuildInputs = [ pkgconfig cmake vala libxml2.bin ]; + nativeBuildInputs = [ pkg-config cmake vala libxml2.bin ]; buildInputs = [ (callPackage ./appmenu-gtk-module.nix {}) glib pcre gtk2 gtk3 xorg.libpthreadstubs xorg.libXdmcp libxkbcommon epoxy at-spi2-core dbus-glib bamf xfce.xfce4panel_gtk3 xfce.libxfce4util xfce.xfconf diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix index 5a98173ea00..94b467fd682 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix @@ -1,18 +1,26 @@ -{ lib, mkXfceDerivation, gtk3, libxfce4ui, pcre, libxfce4util, xfce4-panel, xfconf }: +{ lib +, mkXfceDerivation +, gtk3 +, libxfce4ui +, pcre +, libxfce4util +, xfce4-panel +, xfconf +}: mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-verve-plugin"; - version = "2.0.0"; + version = "2.0.1"; rev-prefix = ""; - sha256 = "09vpa6m0ah7pgmra094c16vb79xrcwva808g6zpawwrhcwz85lcz"; + sha256 = "YwUOSTZMoHsWWmi/ajQv/fX8a0IJoc3re3laVEmnX/M="; buildInputs = [ gtk3 libxfce4ui pcre libxfce4util xfce4-panel ]; hardeningDisable = [ "format" ]; - meta = { + meta = with lib; { description = "A command-line plugin"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix index fae85cb6469..18639946ce8 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, intltool, gtk3, libxml2, libsoup, upower, +{ lib, stdenv, fetchurl, pkg-config, intltool, gtk3, libxml2, libsoup, upower, libxfce4ui, libxfce4util, xfce4-panel, hicolor-icon-theme, xfce }: let @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { version = "0.10.1"; src = fetchurl { - url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "12bs2rfmmy021087i10vxibdbbvd5vld0vk3h5hymhpz7rgszcmg"; }; nativeBuildInputs = [ - pkgconfig + pkg-config intltool ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ]; enableParallelBuilding = true; - + passthru.updateScript = xfce.updateScript { inherit pname version; attrPath = "xfce.${pname}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix index f5cf3899b02..ec6ef0e7b62 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, intltool, python3, imagemagick, libwnck, gtk2 +{ lib, stdenv, fetchFromGitHub, pkg-config, intltool, python3, imagemagick, libwnck, gtk2 , exo, libxfce4ui, libxfce4util, xfce4-panel, xfconf, xfce4-dev-tools, xfce }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config intltool ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix index a0862159489..35bc5ea8284 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix @@ -1,16 +1,37 @@ -{ lib, mkXfceDerivation, gtk3, librsvg, libwnck3, libxklavier, garcon, libxfce4ui, libxfce4util, xfce4-panel, xfconf }: +{ lib +, mkXfceDerivation +, gtk3 +, librsvg +, libwnck3 +, libxklavier +, garcon +, libxfce4ui +, libxfce4util +, xfce4-panel +, xfconf +}: mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-xkb-plugin"; - version = "0.8.1"; + version = "0.8.2"; rev-prefix = ""; - sha256 = "1gyky4raynp2ggdnq0g96c6646fjm679fzipcsmf1q0aymr8d5ky"; + sha256 = "xmCoNMxykeaThYEJo6BcbraFo9CruFZL6YPjovzb6hg="; - buildInputs = [ garcon gtk3 librsvg libxfce4ui libxfce4util libxklavier libwnck3 xfce4-panel xfconf ]; + buildInputs = [ + garcon + gtk3 + librsvg + libxfce4ui + libxfce4util + libxklavier + libwnck3 + xfce4-panel + xfconf + ]; meta = with lib; { description = "Allows you to setup and use multiple keyboard layouts"; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = [ ]; }; } diff --git a/pkgs/desktops/xfce/thunar-plugins/archive/default.nix b/pkgs/desktops/xfce/thunar-plugins/archive/default.nix index 985b067a02f..c46b5a0fd1b 100644 --- a/pkgs/desktops/xfce/thunar-plugins/archive/default.nix +++ b/pkgs/desktops/xfce/thunar-plugins/archive/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , mkXfceDerivation , gtk3 , thunar diff --git a/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix b/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix index 85a8b95dc00..b632fde2df2 100644 --- a/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix +++ b/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchFromGitHub -, pkgconfig +, pkg-config , gtk3 , thunar , cmake @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config cmake ninja ]; diff --git a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix index 995789b8c1b..04dfbcbedf0 100644 --- a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix +++ b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , makeWrapper , runCommand, wrapBintoolsWith, wrapCCWith , buildAndroidndk, androidndk, targetAndroidndkPkgs @@ -48,7 +48,7 @@ let hostInfo = ndkInfoFun stdenv.hostPlatform; targetInfo = ndkInfoFun stdenv.targetPlatform; - prefix = stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) (stdenv.targetPlatform.config + "-"); + prefix = lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) (stdenv.targetPlatform.config + "-"); in rec { diff --git a/pkgs/development/androidndk-pkgs/default.nix b/pkgs/development/androidndk-pkgs/default.nix index 10819d49ed3..5f71304d385 100644 --- a/pkgs/development/androidndk-pkgs/default.nix +++ b/pkgs/development/androidndk-pkgs/default.nix @@ -1,4 +1,4 @@ -{ androidenv, buildPackages, pkgs, targetPackages +{ lib, androidenv, buildPackages, pkgs, targetPackages }: { @@ -17,6 +17,7 @@ }; in import ./androidndk-pkgs.nix { + inherit lib; inherit (buildPackages) makeWrapper; inherit (pkgs) @@ -46,6 +47,7 @@ }; in import ./androidndk-pkgs.nix { + inherit lib; inherit (buildPackages) makeWrapper; inherit (pkgs) diff --git a/pkgs/development/arduino/arduino-ci/default.nix b/pkgs/development/arduino/arduino-ci/default.nix index 2f5d4bedc7f..fe28a962e10 100644 --- a/pkgs/development/arduino/arduino-ci/default.nix +++ b/pkgs/development/arduino/arduino-ci/default.nix @@ -2,7 +2,7 @@ let - runtimePath = stdenv.lib.makeBinPath [ + runtimePath = lib.makeBinPath [ arduino-cli python3 # required by the esp8266 core ]; diff --git a/pkgs/development/arduino/arduino-cli/default.nix b/pkgs/development/arduino/arduino-cli/default.nix index f3cc8341777..95586d064d9 100644 --- a/pkgs/development/arduino/arduino-cli/default.nix +++ b/pkgs/development/arduino/arduino-cli/default.nix @@ -21,7 +21,7 @@ let buildFlagsArray = [ "-ldflags=-s -w -X github.com/arduino/arduino-cli/version.versionString=${version} -X github.com/arduino/arduino-cli/version.commit=unknown" - ] ++ stdenv.lib.optionals stdenv.isLinux [ "-extldflags '-static'" ]; + ] ++ lib.optionals stdenv.isLinux [ "-extldflags '-static'" ]; meta = with lib; { inherit (src.meta) homepage; diff --git a/pkgs/development/arduino/arduino-core/default.nix b/pkgs/development/arduino/arduino-core/default.nix index 081c7c7c638..4c440ab97db 100644 --- a/pkgs/development/arduino/arduino-core/default.nix +++ b/pkgs/development/arduino/arduino-core/default.nix @@ -47,7 +47,7 @@ let ; # abiVersion 6 is default, but we need 5 for `avrdude_bin` executable ncurses5 = ncurses.override { abiVersion = "5"; }; - teensy_libpath = stdenv.lib.makeLibraryPath [ + teensy_libpath = lib.makeLibraryPath [ atk cairo expat @@ -76,7 +76,7 @@ let else throw "${stdenv.hostPlatform.system} is not supported in teensy"; flavor = (if withTeensyduino then "teensyduino" else "arduino") - + stdenv.lib.optionalString (!withGui) "-core"; + + lib.optionalString (!withGui) "-core"; in stdenv.mkDerivation rec { version = "1.8.13"; @@ -125,7 +125,7 @@ stdenv.mkDerivation rec { zlib ncurses5 readline - ] ++ stdenv.lib.optionals withTeensyduino [ upx ]; + ] ++ lib.optionals withTeensyduino [ upx ]; downloadSrcList = builtins.attrValues externalDownloads; downloadDstList = builtins.attrNames externalDownloads; @@ -165,7 +165,7 @@ stdenv.mkDerivation rec { cp -r ./build/linux/work/* "$out/share/arduino/" echo -n ${version} > $out/share/arduino/lib/version.txt - ${stdenv.lib.optionalString withGui '' + ${lib.optionalString withGui '' mkdir -p $out/bin substituteInPlace $out/share/arduino/arduino \ --replace "JAVA=java" "JAVA=$javaPath/java" \ @@ -180,7 +180,7 @@ stdenv.mkDerivation rec { --replace '<ICON_NAME>' "$out/share/arduino/icons/128x128/apps/arduino.png" ''} - ${stdenv.lib.optionalString withTeensyduino '' + ${lib.optionalString withTeensyduino '' # Back up the original jars mv $out/share/arduino/lib/arduino-core.jar $out/share/arduino/lib/arduino-core.jar.bak mv $out/share/arduino/lib/pde.jar $out/share/arduino/lib/pde.jar.bak @@ -235,7 +235,7 @@ stdenv.mkDerivation rec { mkdir $out/lib/ ln -s ${lib.makeLibraryPath [ ncurses5 ]}/libtinfo.so.5 $out/lib/libtinfo.so.5 - ${stdenv.lib.optionalString withTeensyduino '' + ${lib.optionalString withTeensyduino '' # Patch the Teensy loader binary patchelf --debug \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ diff --git a/pkgs/development/arduino/arduino-mk/default.nix b/pkgs/development/arduino/arduino-mk/default.nix index cd3dd32f380..d5f506038ca 100644 --- a/pkgs/development/arduino/arduino-mk/default.nix +++ b/pkgs/development/arduino/arduino-mk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages, installShellFiles }: +{ stdenv, lib, fetchFromGitHub, python3Packages, installShellFiles }: stdenv.mkDerivation rec { version = "1.6.0"; @@ -22,12 +22,11 @@ stdenv.mkDerivation rec { wrapPythonPrograms ''; - meta = { + meta = with lib; { description = "Makefile for Arduino sketches"; homepage = "https://github.com/sudar/Arduino-Makefile"; - license = stdenv.lib.licenses.lgpl21; - maintainers = [ stdenv.lib.maintainers.eyjhb ]; - platforms = stdenv.lib.platforms.unix; + license = licenses.lgpl21; + maintainers = [ maintainers.eyjhb ]; + platforms = platforms.unix; }; } - diff --git a/pkgs/development/arduino/ino/default.nix b/pkgs/development/arduino/ino/default.nix index c51d3f89d07..822cfb0e361 100644 --- a/pkgs/development/arduino/ino/default.nix +++ b/pkgs/development/arduino/ino/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python2Packages, picocom +{ lib, fetchurl, python2Packages, picocom , avrdude, arduino-core }: python2Packages.buildPythonApplication rec { @@ -36,11 +36,11 @@ python2Packages.buildPythonApplication rec { --replace "'-C', self.e['avrdude.conf']," "" ''; - meta = { + meta = with lib; { description = "Command line toolkit for working with Arduino hardware"; homepage = "http://inotool.org/"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ antono ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.mit; + maintainers = with maintainers; [ antono ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/beam-modules/build-erlang-mk.nix b/pkgs/development/beam-modules/build-erlang-mk.nix index c2d1ebabae2..a94524276b2 100644 --- a/pkgs/development/beam-modules/build-erlang-mk.nix +++ b/pkgs/development/beam-modules/build-erlang-mk.nix @@ -15,7 +15,7 @@ , buildFlags ? [] , ... }@attrs: -with stdenv.lib; +with lib; let debugInfoFlag = lib.optionalString (enableDebugInfo || erlang.debugInfo) "+debug_info"; diff --git a/pkgs/development/beam-modules/build-hex.nix b/pkgs/development/beam-modules/build-hex.nix index 27ce64582f3..1ebe3760ec8 100644 --- a/pkgs/development/beam-modules/build-hex.nix +++ b/pkgs/development/beam-modules/build-hex.nix @@ -1,11 +1,11 @@ -{ stdenv, buildRebar3, fetchHex }: +{ lib, buildRebar3, fetchHex }: { name, version, sha256 , builder ? buildRebar3 , hexPkg ? name , ... }@attrs: -with stdenv.lib; +with lib; let pkg = self: builder (attrs // { diff --git a/pkgs/development/beam-modules/build-mix.nix b/pkgs/development/beam-modules/build-mix.nix index 9aebad2dabf..45f5e367442 100644 --- a/pkgs/development/beam-modules/build-mix.nix +++ b/pkgs/development/beam-modules/build-mix.nix @@ -15,7 +15,7 @@ , enableDebugInfo ? false , ... }@attrs: -with stdenv.lib; +with lib; let diff --git a/pkgs/development/beam-modules/build-rebar3.nix b/pkgs/development/beam-modules/build-rebar3.nix index 224d111026a..2e2f0a50b31 100644 --- a/pkgs/development/beam-modules/build-rebar3.nix +++ b/pkgs/development/beam-modules/build-rebar3.nix @@ -14,7 +14,7 @@ , enableDebugInfo ? false , ... }@attrs: -with stdenv.lib; +with lib; let debugInfoFlag = lib.optionalString (enableDebugInfo || erlang.debugInfo) "debug-info"; @@ -64,7 +64,7 @@ let HOME=. rebar3 compile ${if compilePorts then '' HOME=. rebar3 pc compile - '' else ''''} + '' else ""} runHook postBuild ''; diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index a5de4dfb3bb..570155e4d1a 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -1,12 +1,12 @@ -{ stdenv, pkgs, erlang }: +{ lib, pkgs, erlang }: let - inherit (stdenv.lib) makeExtensible; + inherit (lib) makeExtensible; - lib = pkgs.callPackage ./lib.nix {}; + lib' = pkgs.callPackage ./lib.nix {}; # FIXME: add support for overrideScope - callPackageWithScope = scope: drv: args: stdenv.lib.callPackageWith scope drv args; + callPackageWithScope = scope: drv: args: lib.callPackageWith scope drv args; mkScope = scope: pkgs // scope; packages = self: @@ -38,27 +38,27 @@ let # BEAM-based languages. elixir = elixir_1_11; - elixir_1_11 = lib.callElixir ../interpreters/elixir/1.11.nix { + elixir_1_11 = lib'.callElixir ../interpreters/elixir/1.11.nix { inherit erlang; debugInfo = true; }; - elixir_1_10 = lib.callElixir ../interpreters/elixir/1.10.nix { + elixir_1_10 = lib'.callElixir ../interpreters/elixir/1.10.nix { inherit erlang; debugInfo = true; }; - elixir_1_9 = lib.callElixir ../interpreters/elixir/1.9.nix { + elixir_1_9 = lib'.callElixir ../interpreters/elixir/1.9.nix { inherit erlang; debugInfo = true; }; - elixir_1_8 = lib.callElixir ../interpreters/elixir/1.8.nix { + elixir_1_8 = lib'.callElixir ../interpreters/elixir/1.8.nix { inherit erlang; debugInfo = true; }; - elixir_1_7 = lib.callElixir ../interpreters/elixir/1.7.nix { + elixir_1_7 = lib'.callElixir ../interpreters/elixir/1.7.nix { inherit erlang; debugInfo = true; }; @@ -67,8 +67,8 @@ let # https://hexdocs.pm/elixir/compatibility-and-deprecations.html lfe = lfe_1_3; - lfe_1_2 = lib.callLFE ../interpreters/lfe/1.2.nix { inherit erlang buildRebar3 buildHex; }; - lfe_1_3 = lib.callLFE ../interpreters/lfe/1.3.nix { inherit erlang buildRebar3 buildHex; }; + lfe_1_2 = lib'.callLFE ../interpreters/lfe/1.2.nix { inherit erlang buildRebar3 buildHex; }; + lfe_1_3 = lib'.callLFE ../interpreters/lfe/1.3.nix { inherit erlang buildRebar3 buildHex; }; # Non hex packages. Examples how to build Rebar/Mix packages with and # without helper functions buildRebar3 and buildMix. diff --git a/pkgs/development/beam-modules/fetch-hex.nix b/pkgs/development/beam-modules/fetch-hex.nix index c55a7a80ff3..7f84e236070 100644 --- a/pkgs/development/beam-modules/fetch-hex.nix +++ b/pkgs/development/beam-modules/fetch-hex.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: { pkg, version, sha256 , meta ? {} }: -with stdenv.lib; +with lib; stdenv.mkDerivation ({ name = "hex-source-${pkg}-${version}"; diff --git a/pkgs/development/beam-modules/fetch-rebar-deps.nix b/pkgs/development/beam-modules/fetch-rebar-deps.nix index 389e07beca6..d858b3d81af 100644 --- a/pkgs/development/beam-modules/fetch-rebar-deps.nix +++ b/pkgs/development/beam-modules/fetch-rebar-deps.nix @@ -1,10 +1,10 @@ -{ stdenv, rebar3 }: +{ lib, stdenv, rebar3 }: { name, version, sha256, src , meta ? {} }: -with stdenv.lib; +with lib; stdenv.mkDerivation ({ name = "rebar-deps-${name}-${version}"; @@ -28,6 +28,6 @@ stdenv.mkDerivation ({ outputHashMode = "recursive"; outputHash = sha256; - impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars; + impureEnvVars = lib.fetchers.proxyImpureEnvVars; inherit meta; }) diff --git a/pkgs/development/beam-modules/hex/default.nix b/pkgs/development/beam-modules/hex/default.nix index 26070ce73bf..794b9e5cf22 100644 --- a/pkgs/development/beam-modules/hex/default.nix +++ b/pkgs/development/beam-modules/hex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, writeText, elixir }: +{ lib, stdenv, fetchFromGitHub, writeText, elixir }: let shell = drv: stdenv.mkDerivation { @@ -45,13 +45,13 @@ let meta = { description = "Package manager for the Erlang VM https://hex.pm"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; homepage = "https://github.com/hexpm/hex"; - maintainers = with stdenv.lib.maintainers; [ ericbmerritt ]; + maintainers = with lib.maintainers; [ ericbmerritt ]; }; passthru = { env = shell self; }; }; -in stdenv.lib.fix pkg +in lib.fix pkg diff --git a/pkgs/development/beam-modules/lib.nix b/pkgs/development/beam-modules/lib.nix index db40c47794f..1b021cf9347 100644 --- a/pkgs/development/beam-modules/lib.nix +++ b/pkgs/development/beam-modules/lib.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv }: +{ pkgs, lib }: rec { @@ -7,7 +7,7 @@ rec { callPackageWith = autoArgs: fn: args: let f = if pkgs.lib.isFunction fn then fn else import fn; - auto = builtins.intersectAttrs (stdenv.lib.functionArgs f) autoArgs; + auto = builtins.intersectAttrs (lib.functionArgs f) autoArgs; in f (auto // args); callPackage = callPackageWith pkgs; diff --git a/pkgs/development/beam-modules/pc/default.nix b/pkgs/development/beam-modules/pc/default.nix index d30b0fbdbd2..a6d7c1c44de 100644 --- a/pkgs/development/beam-modules/pc/default.nix +++ b/pkgs/development/beam-modules/pc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildHex }: +{ lib, buildHex }: buildHex { name = "pc"; @@ -6,8 +6,8 @@ buildHex { sha256 = "0xq411ig5ny3iilkkkqa4vm3w3dgjc9cfzkqwk8pm13dw9mcm8h0"; meta = { - description = ''a rebar3 port compiler for native code''; - license = stdenv.lib.licenses.mit; + description = "a rebar3 port compiler for native code"; + license = lib.licenses.mit; homepage = "https://github.com/blt/port_compiler"; }; } diff --git a/pkgs/development/beam-modules/pgsql/default.nix b/pkgs/development/beam-modules/pgsql/default.nix index c7e7aee1001..df6561b7cf1 100644 --- a/pkgs/development/beam-modules/pgsql/default.nix +++ b/pkgs/development/beam-modules/pgsql/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, buildRebar3 }: +{ lib, stdenv, fetchFromGitHub, buildRebar3 }: let shell = drv: stdenv.mkDerivation { @@ -21,9 +21,9 @@ let meta = { description = "Erlang PostgreSQL Driver"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; homepage = "https://github.com/semiocast/pgsql"; - maintainers = with stdenv.lib.maintainers; [ ericbmerritt ]; + maintainers = with lib.maintainers; [ ericbmerritt ]; }; passthru = { @@ -31,4 +31,4 @@ let }; }; -in stdenv.lib.fix pkg +in lib.fix pkg diff --git a/pkgs/development/beam-modules/rebar3-release.nix b/pkgs/development/beam-modules/rebar3-release.nix index 1ec9f244d6c..1b0e27891d8 100644 --- a/pkgs/development/beam-modules/rebar3-release.nix +++ b/pkgs/development/beam-modules/rebar3-release.nix @@ -15,7 +15,7 @@ , enableDebugInfo ? false , ... }@attrs: -with stdenv.lib; +with lib; let shell = drv: stdenv.mkDerivation { @@ -46,25 +46,25 @@ let configurePhase = '' runHook preConfigure ${if checkouts != null then - ''cp --no-preserve=all -R ${checkouts}/_checkouts .'' + "cp --no-preserve=all -R ${checkouts}/_checkouts ." else - ''''} + ""} runHook postConfigure ''; buildPhase = '' runHook preBuild HOME=. DEBUG=1 rebar3 as ${profile} ${if releaseType == "escript" - then '' escriptize'' - else '' release''} + then "escriptize" + else "release"} runHook postBuild ''; installPhase = '' runHook preInstall dir=${if releaseType == "escript" - then ''bin'' - else ''rel''} + then "bin" + else "rel"} mkdir -p "$out/$dir" cp -R --preserve=mode "_build/${profile}/$dir" "$out" runHook postInstall diff --git a/pkgs/development/beam-modules/webdriver/default.nix b/pkgs/development/beam-modules/webdriver/default.nix index 8f06f8ed7a8..1255ec59c3a 100644 --- a/pkgs/development/beam-modules/webdriver/default.nix +++ b/pkgs/development/beam-modules/webdriver/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, writeText, erlang }: +{ lib, stdenv, fetchFromGitHub, writeText, erlang }: let shell = drv: stdenv.mkDerivation { @@ -27,9 +27,9 @@ let meta = { description = "WebDriver implementation in Erlang"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; homepage = "https://github.com/Quviq/webdrv"; - maintainers = with stdenv.lib.maintainers; [ ericbmerritt ]; + maintainers = with lib.maintainers; [ ericbmerritt ]; }; passthru = { @@ -37,4 +37,4 @@ let }; }; -in stdenv.lib.fix pkg +in lib.fix pkg diff --git a/pkgs/development/chez-modules/chez-matchable/default.nix b/pkgs/development/chez-modules/chez-matchable/default.nix index d3f4e3fbe63..d66f6133fb7 100644 --- a/pkgs/development/chez-modules/chez-matchable/default.nix +++ b/pkgs/development/chez-modules/chez-matchable/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, chez }: +{ stdenv, lib, fetchFromGitHub, chez }: stdenv.mkDerivation rec { pname = "chez-matchable"; @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { doCheck = false; - meta = { + meta = with lib; { description = "This is a Library for ChezScheme providing the protable hygenic pattern matcher by Alex Shinn"; homepage = "https://github.com/fedeinthemix/chez-matchable/"; - maintainers = [ stdenv.lib.maintainers.jitwit ]; - license = stdenv.lib.licenses.publicDomain; + maintainers = [ maintainers.jitwit ]; + license = licenses.publicDomain; }; } diff --git a/pkgs/development/chez-modules/chez-mit/default.nix b/pkgs/development/chez-modules/chez-mit/default.nix index 63d6ef2c676..b3a2a44d278 100644 --- a/pkgs/development/chez-modules/chez-mit/default.nix +++ b/pkgs/development/chez-modules/chez-mit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, chez, chez-srfi }: +{ stdenv, lib, fetchgit, chez, chez-srfi }: stdenv.mkDerivation { pname = "chez-mit"; @@ -22,11 +22,11 @@ stdenv.mkDerivation { doCheck = false; - meta = { + meta = with lib; { description = "This is a MIT/GNU Scheme compatibility library for Chez Scheme"; homepage = "https://github.com/fedeinthemix/chez-mit/"; - maintainers = [ stdenv.lib.maintainers.jitwit ]; - license = stdenv.lib.licenses.free; + maintainers = [ maintainers.jitwit ]; + license = licenses.free; }; } diff --git a/pkgs/development/chez-modules/chez-scmutils/default.nix b/pkgs/development/chez-modules/chez-scmutils/default.nix index 19fe43da49e..39c1f73003e 100644 --- a/pkgs/development/chez-modules/chez-scmutils/default.nix +++ b/pkgs/development/chez-modules/chez-scmutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, chez, chez-srfi, chez-mit }: +{ stdenv, lib, fetchgit, chez, chez-srfi, chez-mit }: stdenv.mkDerivation { pname = "chez-scmutils"; @@ -22,11 +22,11 @@ stdenv.mkDerivation { doCheck = false; - meta = { + meta = with lib; { description = "This is a port of the ‘MIT Scmutils’ library to Chez Scheme"; homepage = "https://github.com/fedeinthemix/chez-scmutils/"; - maintainers = [ stdenv.lib.maintainers.jitwit ]; - license = stdenv.lib.licenses.gpl3; + maintainers = [ maintainers.jitwit ]; + license = licenses.gpl3; }; } diff --git a/pkgs/development/chez-modules/chez-srfi/default.nix b/pkgs/development/chez-modules/chez-srfi/default.nix index f055a14884a..1d8579ae106 100644 --- a/pkgs/development/chez-modules/chez-srfi/default.nix +++ b/pkgs/development/chez-modules/chez-srfi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, chez }: +{ stdenv, lib, fetchgit, chez }: stdenv.mkDerivation { pname = "chez-srfi"; @@ -22,11 +22,11 @@ stdenv.mkDerivation { doCheck = false; - meta = { + meta = with lib; { description = "This package provides a collection of SRFI libraries for Chez Scheme"; homepage = "https://github.com/fedeinthemix/chez-srfi/"; - maintainers = [ stdenv.lib.maintainers.jitwit ]; - license = stdenv.lib.licenses.free; + maintainers = [ maintainers.jitwit ]; + license = licenses.free; }; } diff --git a/pkgs/development/compilers/4th/default.nix b/pkgs/development/compilers/4th/default.nix index ee3050b8ba6..7205a979e27 100644 --- a/pkgs/development/compilers/4th/default.nix +++ b/pkgs/development/compilers/4th/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "4th"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { "MANDIR=${placeholder "out"}/share/man" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A portable Forth compiler"; homepage = "https://thebeez.home.xs4all.nl/4tH/index.html"; license = licenses.lgpl3; diff --git a/pkgs/development/compilers/abcl/default.nix b/pkgs/development/compilers/abcl/default.nix index 22f6ca7a0dd..fff88eddd19 100644 --- a/pkgs/development/compilers/abcl/default.nix +++ b/pkgs/development/compilers/abcl/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ant, jre, jdk}: +{lib, stdenv, fetchurl, ant, jre, jdk}: stdenv.mkDerivation rec { pname = "abcl"; version = "1.8.0"; @@ -30,10 +30,10 @@ stdenv.mkDerivation rec { buildInputs = [jre ant jdk jre]; meta = { inherit version; - description = ''A JVM-based Common Lisp implementation''; - license = stdenv.lib.licenses.gpl3 ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + description = "A JVM-based Common Lisp implementation"; + license = lib.licenses.gpl3 ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; homepage = "https://common-lisp.net/project/armedbear/"; }; } diff --git a/pkgs/development/compilers/acme/default.nix b/pkgs/development/compilers/acme/default.nix index 89c5620f5fc..f8731f55471 100644 --- a/pkgs/development/compilers/acme/default.nix +++ b/pkgs/development/compilers/acme/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchsvn }: +{ lib, stdenv, fetchsvn }: stdenv.mkDerivation rec { pname = "acme"; - version = "120"; + version = "unstable-2020-12-27"; src = fetchsvn { url = "svn://svn.code.sf.net/p/acme-crossass/code-0/trunk"; - rev = version; - sha256 = "0w17b8f8bis22m6l5bg8qg8nniy20f8yg2xmzjipblmc39vpv6s2"; + rev = "314"; + sha256 = "08zg26rh19nlif7id91nv0syx5n243ssxhfw0nk2r2bhjm5jrjz1"; }; sourceRoot = "code-0-r${src.rev}/src"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { --replace "= gcc" "?= gcc" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A multi-platform cross assembler for 6502/6510/65816 CPUs"; homepage = "https://sourceforge.net/projects/acme-crossass/"; license = licenses.gpl2Plus; diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix index 5e402b2d728..31a7346108e 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix @@ -1,7 +1,7 @@ sourcePerArch: { swingSupport ? true # not used for now -, stdenv +, lib, stdenv , fetchurl }: @@ -43,11 +43,11 @@ let cpuName = stdenv.hostPlatform.parsed.cpu.name; passthru.home = result; - meta = with stdenv.lib; { + meta = with lib; { license = licenses.gpl2Classpath; description = "AdoptOpenJDK, prebuilt OpenJDK binary"; platforms = [ "x86_64-darwin" ]; # some inherit jre.meta.platforms - maintainers = with stdenv.lib.maintainers; [ taku0 ]; + maintainers = with lib.maintainers; [ taku0 ]; }; }; in result diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix index 00945e32535..0fcad6c333f 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix @@ -69,7 +69,7 @@ let result = stdenv.mkDerivation rec { passthru.home = result; - meta = with stdenv.lib; { + meta = with lib; { license = licenses.gpl2Classpath; description = "AdoptOpenJDK, prebuilt OpenJDK binary"; platforms = lib.mapAttrsToList (arch: _: arch + "-linux") sourcePerArch; # some inherit jre.meta.platforms diff --git a/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix b/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix index b62b9c95ef6..e20983380a4 100644 --- a/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix +++ b/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cargo, rustc, autoreconfHook, jdk, glib, xulrunner, zip, pkgconfig, npapi_sdk, bash, bc }: +{ lib, stdenv, fetchFromGitHub, cargo, rustc, autoreconfHook, jdk, glib, xulrunner, zip, pkg-config, npapi_sdk, bash, bc }: stdenv.mkDerivation rec { pname = "adoptopenjdk-icedtea-web"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0pxijw9v5k4j840jczglx9qyfd57df390g5jdaz3qafblfg0k10n"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig bc ]; + nativeBuildInputs = [ autoreconfHook pkg-config bc ]; buildInputs = [ cargo rustc glib xulrunner zip npapi_sdk ]; preConfigure = '' @@ -58,6 +58,6 @@ stdenv.mkDerivation rec { based on the NetX project. ''; homepage = "https://github.com/adoptopenjdk/icedtea-web"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/compilers/aldor/default.nix b/pkgs/development/compilers/aldor/default.nix index 09ccf9510bb..2654cc467fe 100644 --- a/pkgs/development/compilers/aldor/default.nix +++ b/pkgs/development/compilers/aldor/default.nix @@ -1,4 +1,4 @@ -{ fetchgit, stdenv, gmp, which, flex, bison, makeWrapper +{ fetchgit, lib, stdenv, gmp, which, flex, bison, makeWrapper , autoconf, automake, libtool, jdk, perl }: stdenv.mkDerivation { @@ -32,7 +32,7 @@ stdenv.mkDerivation { broken = true; homepage = "http://www.aldor.org/"; description = "Programming language with an expressive type system"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; longDescription = '' Aldor is a programming language with an expressive type system well-suited @@ -47,6 +47,6 @@ stdenv.mkDerivation { and powerful properties of functional, object-oriented and aspect-oriented styles. ''; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/compilers/aliceml/default.nix b/pkgs/development/compilers/aliceml/default.nix index d3208b12dd6..8f560ef6198 100644 --- a/pkgs/development/compilers/aliceml/default.nix +++ b/pkgs/development/compilers/aliceml/default.nix @@ -1,4 +1,4 @@ -{stdenv, gcc, glibc, fetchurl, fetchgit, libtool, autoconf, automake, file, gnumake, which, zsh, m4, pkg-config, perl, gnome2, gtk2, pango, sqlite, libxml2, zlib, gmp, smlnj }: +{lib, stdenv, gcc, glibc, fetchurl, fetchgit, libtool, autoconf, automake, file, gnumake, which, zsh, m4, pkg-config, perl, gnome2, gtk2, pango, sqlite, libxml2, zlib, gmp, smlnj }: stdenv.mkDerivation { name = "aliceml-1.4-7d44dc8e"; @@ -50,8 +50,8 @@ stdenv.mkDerivation { programming. ''; homepage = "https://www.ps.uni-saarland.de/alice/"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.doublec ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.doublec ]; broken = true; }; } diff --git a/pkgs/development/compilers/apache-flex-sdk/default.nix b/pkgs/development/compilers/apache-flex-sdk/default.nix index ed6b2b2ff24..800b1ea55e3 100644 --- a/pkgs/development/compilers/apache-flex-sdk/default.nix +++ b/pkgs/development/compilers/apache-flex-sdk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, jre }: +{ lib, stdenv, fetchurl, makeWrapper, jre }: let playerglobal_ver = "27.0"; @@ -38,16 +38,16 @@ in stdenv.mkDerivation rec { for i in $out/bin/!(aasdoc|acompc|amxmlc); do wrapProgram $i \ --set FLEX_HOME $t \ - --set PLAYERGLOBAL_HOME $t/frameworks/libs/player/ + --set PLAYERGLOBAL_HOME $t/frameworks/libs/player/ done mkdir -p $t/frameworks/libs/player/${playerglobal_ver}/ cp ${playerglobal} $t/frameworks/libs/player/${playerglobal_ver}/playerglobal.swc ''; - + fixupPhase = ":"; - meta = with stdenv.lib; { + meta = with lib; { description = "Flex SDK for Adobe Flash / ActionScript"; homepage = "https://flex.apache.org/"; license = with licenses; [ asl20 ]; diff --git a/pkgs/development/compilers/arachne-pnr/default.nix b/pkgs/development/compilers/arachne-pnr/default.nix index 613f3fa186a..030da03add8 100644 --- a/pkgs/development/compilers/arachne-pnr/default.nix +++ b/pkgs/development/compilers/arachne-pnr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, icestorm }: +{ lib, stdenv, fetchFromGitHub, icestorm }: with builtins; @@ -37,8 +37,8 @@ stdenv.mkDerivation rec { the IceStorm [2] icepack command. ''; homepage = "https://github.com/cseed/arachne-pnr"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ shell thoughtpolice ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ shell thoughtpolice ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/compilers/asn1c/default.nix b/pkgs/development/compilers/asn1c/default.nix index 230ed36fff5..a4e822eec6d 100644 --- a/pkgs/development/compilers/asn1c/default.nix +++ b/pkgs/development/compilers/asn1c/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl }: +{ lib, stdenv, fetchurl, perl }: stdenv.mkDerivation rec { pname = "asn1c"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://lionet.info/asn1c/compiler.html"; description = "Open Source ASN.1 Compiler"; license = licenses.bsd2; diff --git a/pkgs/development/compilers/aspectj/default.nix b/pkgs/development/compilers/aspectj/default.nix index 8fd47e937c8..24ff50f558c 100644 --- a/pkgs/development/compilers/aspectj/default.nix +++ b/pkgs/development/compilers/aspectj/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, jre}: +{lib, stdenv, fetchurl, jre}: stdenv.mkDerivation rec { pname = "aspectj"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.eclipse.org/aspectj/"; description = "A seamless aspect-oriented extension to the Java programming language"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.epl10; + platforms = lib.platforms.unix; + license = lib.licenses.epl10; }; } diff --git a/pkgs/development/compilers/ats/default.nix b/pkgs/development/compilers/ats/default.nix index f086c36468d..35e1b1dd105 100644 --- a/pkgs/development/compilers/ats/default.nix +++ b/pkgs/development/compilers/ats/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gmp }: +{ lib, stdenv, fetchurl, gmp }: stdenv.mkDerivation rec { pname = "ats"; @@ -16,10 +16,10 @@ stdenv.mkDerivation rec { meta = { description = "Functional programming language with dependent types"; homepage = "http://www.ats-lang.org"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; # TODO: it looks like ATS requires gcc specifically. Someone with more knowledge # will need to experiment. - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.thoughtpolice ]; }; } diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix index bbfbcdbbeb0..c75600b5341 100644 --- a/pkgs/development/compilers/ats2/default.nix +++ b/pkgs/development/compilers/ats2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gmp +{ lib, stdenv, fetchurl, gmp , withEmacsSupport ? true , withContrib ? true }: @@ -10,14 +10,14 @@ let sha256 = "184m4hz2xszhcfc6w9fw9qibhmcvgjmikwfwkb345xypr59jm93d"; }; - postInstallContrib = stdenv.lib.optionalString withContrib + postInstallContrib = lib.optionalString withContrib '' local contribDir=$out/lib/ats2-postiats-*/ ; mkdir -p $contribDir ; tar -xzf "${contrib}" --strip-components 1 -C $contribDir ; ''; - postInstallEmacs = stdenv.lib.optionalString withEmacsSupport + postInstallEmacs = lib.optionalString withEmacsSupport '' local siteLispDir=$out/share/emacs/site-lisp/ats2 ; mkdir -p $siteLispDir ; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { buildInputs = [ gmp ]; - setupHook = with stdenv.lib; + setupHook = with lib; let hookFiles = [ ./setup-hook.sh ] @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { postInstall = postInstallContrib + postInstallEmacs; - meta = with stdenv.lib; { + meta = with lib; { description = "Functional programming language with dependent types"; homepage = "http://www.ats-lang.org"; license = licenses.gpl3Plus; diff --git a/pkgs/development/compilers/avian/default.nix b/pkgs/development/compilers/avian/default.nix index 7c5db45f31b..d39aa2806a4 100644 --- a/pkgs/development/compilers/avian/default.nix +++ b/pkgs/development/compilers/avian/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, zlib, jdk, CoreServices, Foundation }: +{ lib, stdenv, fetchFromGitHub, zlib, jdk, CoreServices, Foundation }: stdenv.mkDerivation rec { pname = "avian"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ zlib jdk ] - ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Foundation ]; + ++ lib.optionals stdenv.isDarwin [ CoreServices Foundation ]; NIX_CFLAGS_COMPILE = "-Wno-error"; @@ -36,8 +36,8 @@ stdenv.mkDerivation rec { building self-contained applications. ''; homepage = "https://readytalk.github.io/avian/"; - license = stdenv.lib.licenses.isc; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.earldouglas ]; + license = lib.licenses.isc; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.earldouglas ]; }; } diff --git a/pkgs/development/compilers/avra/default.nix b/pkgs/development/compilers/avra/default.nix index 56bf3e657be..9d360780053 100644 --- a/pkgs/development/compilers/avra/default.nix +++ b/pkgs/development/compilers/avra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake }: +{ lib, stdenv, fetchurl, autoconf, automake }: stdenv.mkDerivation rec { name = "avra-1.3.0"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { automake -a ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Assembler for the Atmel AVR microcontroller family"; homepage = "http://avra.sourceforge.net/"; license = licenses.gpl2Plus; diff --git a/pkgs/development/compilers/bigloo/default.nix b/pkgs/development/compilers/bigloo/default.nix index a3bac2b1722..a4f4287523f 100644 --- a/pkgs/development/compilers/bigloo/default.nix +++ b/pkgs/development/compilers/bigloo/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, autoconf, automake, libtool, gmp +{ fetchurl, lib, stdenv, autoconf, automake, libtool, gmp , darwin }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake libtool ]; - buildInputs = stdenv.lib.optional stdenv.isDarwin + buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.ApplicationServices ; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { preConfigure = # For libuv on darwin - stdenv.lib.optionalString stdenv.isDarwin '' + lib.optionalString stdenv.isDarwin '' export LIBTOOLIZE=libtoolize '' + # Help libgc's configure. @@ -32,14 +32,14 @@ stdenv.mkDerivation rec { # Fix absolute paths. sed -e 's=/bin/mv=mv=g' -e 's=/bin/rm=rm=g' \ -e 's=/tmp=$TMPDIR=g' -i autoconf/* \ - [Mm]akefile* */[Mm]akefile* */*/[Mm]akefile* \ - */*/*/[Mm]akefile* */*/*/*/[Mm]akefile* \ - comptime/Cc/cc.scm gc/install-* + [Mm]akefile* */[Mm]akefile* */*/[Mm]akefile* \ + */*/*/[Mm]akefile* */*/*/*/[Mm]akefile* \ + comptime/Cc/cc.scm gc/install-* # Make sure we don't change string lengths in the generated # C files. sed -e 's=/bin/rm= rm=g' -e 's=/bin/mv= mv=g' \ - -i comptime/Cc/cc.c + -i comptime/Cc/cc.c ''; checkTarget = "test"; @@ -50,9 +50,9 @@ stdenv.mkDerivation rec { meta = { description = "Efficient Scheme compiler"; homepage = "http://www-sop.inria.fr/indes/fp/Bigloo/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ thoughtpolice ]; longDescription = '' Bigloo is a Scheme implementation devoted to one goal: enabling diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix index 6de4e0fb304..d2d866a2804 100644 --- a/pkgs/development/compilers/binaryen/default.nix +++ b/pkgs/development/compilers/binaryen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, python3, fetchFromGitHub, fetchpatch, emscripten }: +{ lib, stdenv, cmake, python3, fetchFromGitHub, fetchpatch, emscripten }: stdenv.mkDerivation rec { pname = "binaryen"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python3 ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/WebAssembly/binaryen"; description = "Compiler infrastructure and toolchain library for WebAssembly, in C++"; platforms = platforms.all; diff --git a/pkgs/development/compilers/bluespec/default.nix b/pkgs/development/compilers/bluespec/default.nix index df7b6585205..defe78d7c31 100644 --- a/pkgs/development/compilers/bluespec/default.nix +++ b/pkgs/development/compilers/bluespec/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch , autoconf @@ -11,7 +11,7 @@ , perl , flex , bison -, pkgconfig +, pkg-config , itktcl , incrtcl , tcl @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec { perl flex bison - pkgconfig + pkg-config ghcWithPackages ]; @@ -97,10 +97,10 @@ in stdenv.mkDerivation rec { meta = { description = "Toolchain for the Bluespec Hardware Definition Language"; homepage = "https://github.com/B-Lang-org/bsc"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; platforms = [ "x86_64-linux" ]; # darwin fails at https://github.com/B-Lang-org/bsc/pull/35#issuecomment-583731562 # aarch64 fails, as GHC fails with "ghc: could not execute: opt" - maintainers = with stdenv.lib.maintainers; [ jcumming thoughtpolice ]; + maintainers = with lib.maintainers; [ jcumming thoughtpolice ]; }; } diff --git a/pkgs/development/compilers/bs-platform/build-bs-platform.nix b/pkgs/development/compilers/bs-platform/build-bs-platform.nix index 18c61d0d923..c73bb72b9d0 100644 --- a/pkgs/development/compilers/bs-platform/build-bs-platform.nix +++ b/pkgs/development/compilers/bs-platform/build-bs-platform.nix @@ -1,12 +1,12 @@ # This file is based on https://github.com/turboMaCk/bs-platform.nix/blob/master/build-bs-platform.nix # to make potential future updates simpler -{ stdenv, fetchFromGitHub, ninja, runCommand, nodejs, python3, +{ lib, stdenv, fetchFromGitHub, ninja, runCommand, nodejs, python3, ocaml-version, version, src, patches ? [], ocaml ? (import ./ocaml.nix { version = ocaml-version; - inherit stdenv; + inherit lib stdenv; src = "${src}/ocaml"; }), custom-ninja ? (ninja.overrideAttrs (attrs: { diff --git a/pkgs/development/compilers/bs-platform/default.nix b/pkgs/development/compilers/bs-platform/default.nix index 6eb7d50bfc8..50274c9eca6 100644 --- a/pkgs/development/compilers/bs-platform/default.nix +++ b/pkgs/development/compilers/bs-platform/default.nix @@ -1,9 +1,9 @@ -{ stdenv, runCommand, fetchFromGitHub, ninja, nodejs, python3, ... }: +{ lib, stdenv, runCommand, fetchFromGitHub, ninja, nodejs, python3, ... }: let build-bs-platform = import ./build-bs-platform.nix; in (build-bs-platform rec { - inherit stdenv runCommand fetchFromGitHub ninja nodejs python3; + inherit lib stdenv runCommand fetchFromGitHub ninja nodejs python3; version = "8.2.0"; ocaml-version = "4.06.1"; @@ -17,7 +17,7 @@ in fetchSubmodules = true; }; }).overrideAttrs (attrs: { - meta = with stdenv.lib; { + meta = with lib; { description = "A JavaScript backend for OCaml focused on smooth integration and clean generated code"; homepage = "https://bucklescript.github.io"; license = licenses.lgpl3; diff --git a/pkgs/development/compilers/bs-platform/ocaml.nix b/pkgs/development/compilers/bs-platform/ocaml.nix index 9aa34d02b36..d650d767a8d 100644 --- a/pkgs/development/compilers/bs-platform/ocaml.nix +++ b/pkgs/development/compilers/bs-platform/ocaml.nix @@ -1,4 +1,4 @@ -{ stdenv, src, version }: +{ lib, stdenv, src, version }: stdenv.mkDerivation rec { inherit src version; name = "ocaml-${version}+bs"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { make -j9 world.opt ''; - meta = with stdenv.lib; { + meta = with lib; { branch = "4.06"; platforms = platforms.all; }; diff --git a/pkgs/development/compilers/bupc/default.nix b/pkgs/development/compilers/bupc/default.nix index ecdfe8d461a..9b3a291a1a0 100644 --- a/pkgs/development/compilers/bupc/default.nix +++ b/pkgs/development/compilers/bupc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, coreutils }: +{ lib, stdenv, fetchurl, perl, coreutils }: stdenv.mkDerivation rec { name = "berkeley_upc-2.22.0"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ coreutils ]; buildInputs = [ perl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A compiler for the Berkely Unified Parallel C language"; longDescription = '' Unified Parallel C (UPC) is an extension of the C programming language diff --git a/pkgs/development/compilers/cakelisp/default.nix b/pkgs/development/compilers/cakelisp/default.nix index 500c15a2aaa..15afb9fc25e 100644 --- a/pkgs/development/compilers/cakelisp/default.nix +++ b/pkgs/development/compilers/cakelisp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gcc }: +{ lib, stdenv, fetchFromGitHub, gcc }: stdenv.mkDerivation rec { pname = "cakelisp"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { --replace '"/usr/bin/g++"' '"${gcc}/bin/g++"' substituteInPlace src/ModuleManager.cpp \ --replace '"/usr/bin/g++"' '"${gcc}/bin/g++"' - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' substituteInPlace Build.sh --replace '--export-dynamic' '-export_dynamic' substituteInPlace runtime/HotReloading.cake --replace '--export-dynamic' '-export_dynamic' substituteInPlace Bootstrap.cake --replace '--export-dynamic' '-export_dynamic' @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { install -Dm755 bin/cakelisp -t $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A performance-oriented Lisp-like language"; homepage = "https://github.com/makuto/cakelisp"; license = licenses.gpl3Plus; diff --git a/pkgs/development/compilers/carp/default.nix b/pkgs/development/compilers/carp/default.nix index f6c27436c76..b0a14534b08 100644 --- a/pkgs/development/compilers/carp/default.nix +++ b/pkgs/development/compilers/carp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, clang, haskellPackages }: +{ lib, fetchFromGitHub, makeWrapper, clang, haskellPackages }: haskellPackages.mkDerivation rec { @@ -39,10 +39,10 @@ haskellPackages.mkDerivation rec { description = "A statically typed lisp, without a GC, for real-time applications"; homepage = "https://github.com/carp-lang/Carp"; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ jluttine ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ jluttine ]; # Windows not (yet) supported. - platforms = with stdenv.lib.platforms; unix ++ darwin; + platforms = with lib.platforms; unix ++ darwin; } diff --git a/pkgs/development/compilers/cc65/default.nix b/pkgs/development/compilers/cc65/default.nix index 1b5011365cf..6e201ac7933 100644 --- a/pkgs/development/compilers/cc65/default.nix +++ b/pkgs/development/compilers/cc65/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}"]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://cc65.github.io/"; description = "C compiler for processors of 6502 family"; longDescription = '' @@ -53,5 +53,6 @@ stdenv.mkDerivation rec { ''; license = licenses.zlib; maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix index 8f292e358ae..79e7d324ec9 100644 --- a/pkgs/development/compilers/ccl/default.nix +++ b/pkgs/development/compilers/ccl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, runCommand, bootstrap_cmds, coreutils, glibc, m4, runtimeShell }: +{ lib, stdenv, fetchurl, runCommand, bootstrap_cmds, coreutils, glibc, m4, runtimeShell }: let options = rec { @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Clozure Common Lisp"; homepage = "https://ccl.clozure.com/"; maintainers = with maintainers; [ raskin muflax tohl ]; diff --git a/pkgs/development/compilers/chez/default.nix b/pkgs/development/compilers/chez/default.nix index 550f754639e..c1c8eced83b 100644 --- a/pkgs/development/compilers/chez/default.nix +++ b/pkgs/development/compilers/chez/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , coreutils, cctools , ncurses, libiconv, libX11, libuuid }: @@ -15,12 +15,12 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ coreutils ] ++ stdenv.lib.optional stdenv.isDarwin cctools; + nativeBuildInputs = [ coreutils ] ++ lib.optional stdenv.isDarwin cctools; buildInputs = [ ncurses libiconv libX11 libuuid ]; enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-error=format-truncation"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=format-truncation"; /* ** We patch out a very annoying 'feature' in ./configure, which @@ -70,9 +70,9 @@ stdenv.mkDerivation rec { meta = { description = "A powerful and incredibly fast R6RS Scheme compiler"; homepage = "https://cisco.github.io/ChezScheme/"; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ thoughtpolice ]; + platforms = lib.platforms.unix; badPlatforms = [ "aarch64-linux" ]; }; } diff --git a/pkgs/development/compilers/chicken/4/chicken.nix b/pkgs/development/compilers/chicken/4/chicken.nix index 50126fdac92..8ea522a81a9 100644 --- a/pkgs/development/compilers/chicken/4/chicken.nix +++ b/pkgs/development/compilers/chicken/4/chicken.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, darwin, bootstrap-chicken ? null }: +{ lib, stdenv, fetchurl, makeWrapper, darwin, bootstrap-chicken ? null }: let version = "4.13.0"; @@ -8,7 +8,6 @@ let else if (isFreeBSD || isOpenBSD) then "bsd" else if isSunOS then "solaris" else "linux"; # Should be a sane default - lib = stdenv.lib; in stdenv.mkDerivation { pname = "chicken"; @@ -70,9 +69,9 @@ stdenv.mkDerivation { meta = { homepage = "http://www.call-cc.org/"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ corngood ]; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; # Maybe other Unix + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ corngood ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; # Maybe other Unix description = "A portable compiler for the Scheme programming language"; longDescription = '' CHICKEN is a compiler for the Scheme programming language. diff --git a/pkgs/development/compilers/chicken/4/egg2nix.nix b/pkgs/development/compilers/chicken/4/egg2nix.nix index 977f34692f9..d2f2805ed7f 100644 --- a/pkgs/development/compilers/chicken/4/egg2nix.nix +++ b/pkgs/development/compilers/chicken/4/egg2nix.nix @@ -1,4 +1,4 @@ -{ stdenv, eggDerivation, fetchurl, chickenEggs }: +{ eggDerivation, fetchurl, chickenEggs }: # Note: This mostly reimplements the default.nix already contained in # the tarball. Is there a nicer way than duplicating code? @@ -20,8 +20,8 @@ eggDerivation { meta = { description = "Generate nix-expression from CHICKEN scheme eggs"; homepage = "https://github.com/the-kenny/egg2nix"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ corngood ]; + license = lib.licenses.bsd3; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ corngood ]; }; } diff --git a/pkgs/development/compilers/chicken/4/eggDerivation.nix b/pkgs/development/compilers/chicken/4/eggDerivation.nix index cd340c22174..4c84ef8c42b 100644 --- a/pkgs/development/compilers/chicken/4/eggDerivation.nix +++ b/pkgs/development/compilers/chicken/4/eggDerivation.nix @@ -1,4 +1,4 @@ -{ stdenv, chicken, makeWrapper }: +{ lib, stdenv, chicken, makeWrapper }: { name, src , buildInputs ? [] , chickenInstallFlags ? [] @@ -8,7 +8,7 @@ let libPath = "${chicken}/var/lib/chicken/${toString chicken.binaryVersion}/"; overrides = import ./overrides.nix; - baseName = stdenv.lib.getName name; + baseName = lib.getName name; override = if builtins.hasAttr baseName overrides then builtins.getAttr baseName overrides @@ -20,7 +20,7 @@ stdenv.mkDerivation ({ propagatedBuildInputs = buildInputs; buildInputs = [ makeWrapper chicken ]; - CSC_OPTIONS = stdenv.lib.concatStringsSep " " cscOptions; + CSC_OPTIONS = lib.concatStringsSep " " cscOptions; CHICKEN_REPOSITORY = libPath; CHICKEN_INSTALL_PREFIX = "$out"; @@ -28,7 +28,7 @@ stdenv.mkDerivation ({ installPhase = '' runHook preInstall - chicken-install -p $out ${stdenv.lib.concatStringsSep " " chickenInstallFlags} + chicken-install -p $out ${lib.concatStringsSep " " chickenInstallFlags} for f in $out/bin/* do diff --git a/pkgs/development/compilers/chicken/4/eggs.nix b/pkgs/development/compilers/chicken/4/eggs.nix index 6e6f104f8a0..8c96caca262 100644 --- a/pkgs/development/compilers/chicken/4/eggs.nix +++ b/pkgs/development/compilers/chicken/4/eggs.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv }: +{ pkgs }: rec { inherit (pkgs) eggDerivation fetchegg; diff --git a/pkgs/development/compilers/chicken/4/fetchegg/default.nix b/pkgs/development/compilers/chicken/4/fetchegg/default.nix index d4d33a5593c..23c5760b4bc 100644 --- a/pkgs/development/compilers/chicken/4/fetchegg/default.nix +++ b/pkgs/development/compilers/chicken/4/fetchegg/default.nix @@ -1,7 +1,7 @@ # Fetches a chicken egg from henrietta using `chicken-install -r' # See: http://wiki.call-cc.org/chicken-projects/egg-index-4.html -{ stdenvNoCC, chicken }: +{ lib, stdenvNoCC, chicken }: { name, version, md5 ? "", sha256 ? "" }: if md5 != "" then @@ -20,6 +20,6 @@ stdenvNoCC.mkDerivation { eggName = name; - impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars; + impureEnvVars = lib.fetchers.proxyImpureEnvVars; } diff --git a/pkgs/development/compilers/chicken/5/chicken.nix b/pkgs/development/compilers/chicken/5/chicken.nix index 712012643f3..9f2554b7343 100644 --- a/pkgs/development/compilers/chicken/5/chicken.nix +++ b/pkgs/development/compilers/chicken/5/chicken.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, darwin, bootstrap-chicken ? null }: +{ lib, stdenv, fetchurl, makeWrapper, darwin, bootstrap-chicken ? null }: let version = "5.2.0"; @@ -8,7 +8,6 @@ let else if (isFreeBSD || isOpenBSD) then "bsd" else if isSunOS then "solaris" else "linux"; # Should be a sane default - lib = stdenv.lib; in stdenv.mkDerivation { pname = "chicken"; @@ -51,9 +50,9 @@ stdenv.mkDerivation { meta = { homepage = "http://www.call-cc.org/"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ corngood ]; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; # Maybe other Unix + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ corngood ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; # Maybe other Unix description = "A portable compiler for the Scheme programming language"; longDescription = '' CHICKEN is a compiler for the Scheme programming language. diff --git a/pkgs/development/compilers/chicken/5/egg2nix.nix b/pkgs/development/compilers/chicken/5/egg2nix.nix index 0c18b8db2de..62b634eb637 100644 --- a/pkgs/development/compilers/chicken/5/egg2nix.nix +++ b/pkgs/development/compilers/chicken/5/egg2nix.nix @@ -1,4 +1,4 @@ -{ stdenv, eggDerivation, fetchFromGitHub, chickenEggs }: +{ lib, eggDerivation, fetchFromGitHub, chickenEggs }: # Note: This mostly reimplements the default.nix already contained in # the tarball. Is there a nicer way than duplicating code? @@ -22,8 +22,8 @@ eggDerivation { meta = { description = "Generate nix-expression from CHICKEN scheme eggs"; homepage = "https://github.com/the-kenny/egg2nix"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ corngood ]; + license = lib.licenses.bsd3; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ corngood ]; }; } diff --git a/pkgs/development/compilers/chicken/5/eggDerivation.nix b/pkgs/development/compilers/chicken/5/eggDerivation.nix index f5ed4b4b7f8..7102126206a 100644 --- a/pkgs/development/compilers/chicken/5/eggDerivation.nix +++ b/pkgs/development/compilers/chicken/5/eggDerivation.nix @@ -1,4 +1,4 @@ -{ stdenv, chicken, makeWrapper }: +{ lib, stdenv, chicken, makeWrapper }: { name, src , buildInputs ? [] , chickenInstallFlags ? [] @@ -7,7 +7,7 @@ let overrides = import ./overrides.nix; - baseName = stdenv.lib.getName name; + baseName = lib.getName name; override = if builtins.hasAttr baseName overrides then builtins.getAttr baseName overrides @@ -19,14 +19,14 @@ stdenv.mkDerivation ({ propagatedBuildInputs = buildInputs; buildInputs = [ makeWrapper chicken ]; - CSC_OPTIONS = stdenv.lib.concatStringsSep " " cscOptions; + CSC_OPTIONS = lib.concatStringsSep " " cscOptions; installPhase = '' runHook preInstall export CHICKEN_INSTALL_PREFIX=$out export CHICKEN_INSTALL_REPOSITORY=$out/lib/chicken/${toString chicken.binaryVersion} - chicken-install ${stdenv.lib.concatStringsSep " " chickenInstallFlags} + chicken-install ${lib.concatStringsSep " " chickenInstallFlags} for f in $out/bin/* do diff --git a/pkgs/development/compilers/chicken/5/eggs.nix b/pkgs/development/compilers/chicken/5/eggs.nix index 3c4ae74c1e6..1c1377350d2 100644 --- a/pkgs/development/compilers/chicken/5/eggs.nix +++ b/pkgs/development/compilers/chicken/5/eggs.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv }: +{ pkgs }: rec { inherit (pkgs) eggDerivation fetchegg; diff --git a/pkgs/development/compilers/chicken/5/fetchegg/default.nix b/pkgs/development/compilers/chicken/5/fetchegg/default.nix index 24bfbd7a30f..08d23cbaa61 100644 --- a/pkgs/development/compilers/chicken/5/fetchegg/default.nix +++ b/pkgs/development/compilers/chicken/5/fetchegg/default.nix @@ -1,7 +1,7 @@ # Fetches a chicken egg from henrietta using `chicken-install -r' # See: http://wiki.call-cc.org/chicken-projects/egg-index-5.html -{ stdenvNoCC, chicken }: +{ lib, stdenvNoCC, chicken }: { name, version, md5 ? "", sha256 ? "" }: if md5 != "" then @@ -20,6 +20,6 @@ stdenvNoCC.mkDerivation { eggName = name; - impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars; + impureEnvVars = lib.fetchers.proxyImpureEnvVars; } diff --git a/pkgs/development/compilers/ciao/default.nix b/pkgs/development/compilers/ciao/default.nix index be39d81f558..de8e73374c5 100644 --- a/pkgs/development/compilers/ciao/default.nix +++ b/pkgs/development/compilers/ciao/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "ciao"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ./ciao-boot.sh install ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://ciao-lang.org/"; description = "A general purpose, multi-paradigm programming language in the Prolog family"; license = licenses.lgpl21; diff --git a/pkgs/development/compilers/clasp/default.nix b/pkgs/development/compilers/clasp/default.nix index 664d8492113..31a669c313e 100644 --- a/pkgs/development/compilers/clasp/default.nix +++ b/pkgs/development/compilers/clasp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchFromGitLab +{ lib, stdenv, fetchFromGitHub, fetchFromGitLab , llvmPackages , cmake, boehmgc, gmp, zlib, ncurses, boost, libelf , python, git, sbcl @@ -72,14 +72,14 @@ stdenv.mkDerivation rec { buildInputs = with llvmPackages; ( - builtins.map (x: stdenv.lib.overrideDerivation x + builtins.map (x: lib.overrideDerivation x (x: {NIX_CFLAGS_COMPILE= (x.NIX_CFLAGS_COMPILE or "") + " -frtti"; })) [ llvm clang clang-unwrapped clang ]) ++ [ gmp zlib ncurses boost boehmgc libelf (boost.override {enableStatic = true; enableShared = false;}) - (stdenv.lib.overrideDerivation boehmgc + (lib.overrideDerivation boehmgc (x: {configureFlags = (x.configureFlags or []) ++ ["--enable-static"];})) ]; @@ -119,10 +119,10 @@ stdenv.mkDerivation rec { meta = { inherit version; - description = ''A Common Lisp implementation based on LLVM with C++ integration''; - license = stdenv.lib.licenses.lgpl21Plus ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + description = "A Common Lisp implementation based on LLVM with C++ integration"; + license = lib.licenses.lgpl21Plus ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; # Large, long to build, a private build of clang is needed, a prerelease. hydraPlatforms = []; homepage = "https://github.com/drmeister/clasp"; diff --git a/pkgs/development/compilers/clean/default.nix b/pkgs/development/compilers/clean/default.nix index 0dfd05030b9..f8121958e29 100644 --- a/pkgs/development/compilers/clean/default.nix +++ b/pkgs/development/compilers/clean/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "clean-3.0"; @@ -45,8 +45,8 @@ stdenv.mkDerivation { ''; homepage = "http://wiki.clean.cs.ru.nl/Clean"; - license = stdenv.lib.licenses.lgpl21; - maintainers = [ stdenv.lib.maintainers.kkallio ]; + license = lib.licenses.lgpl21; + maintainers = [ lib.maintainers.kkallio ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix index 7c0d42f1864..b5ac2e187d8 100644 --- a/pkgs/development/compilers/closure/default.nix +++ b/pkgs/development/compilers/closure/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, makeWrapper }: +{ lib, stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { pname = "closure-compiler"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { --add-flags "-jar $out/share/java/closure-compiler-v${version}.jar" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool for making JavaScript download and run faster"; homepage = "https://developers.google.com/closure/compiler/"; license = licenses.asl20; diff --git a/pkgs/development/compilers/cmdstan/default.nix b/pkgs/development/compilers/cmdstan/default.nix index 87d3f0ef00c..df674b67db8 100644 --- a/pkgs/development/compilers/cmdstan/default.nix +++ b/pkgs/development/compilers/cmdstan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, runtimeShell }: +{ lib, stdenv, fetchurl, python, runtimeShell }: stdenv.mkDerivation { name = "cmdstan-2.17.1"; @@ -36,7 +36,7 @@ stdenv.mkDerivation { likelihood estimation with Optimization (L-BFGS). ''; homepage = "https://mc-stan.org/interfaces/cmdstan.html"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.bsd3; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/compilers/cmucl/binary.nix b/pkgs/development/compilers/cmucl/binary.nix index 480a7e522b5..b09f5f41b67 100644 --- a/pkgs/development/compilers/cmucl/binary.nix +++ b/pkgs/development/compilers/cmucl/binary.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: let inherit (stdenv.hostPlatform) system; @@ -36,9 +36,9 @@ stdenv.mkDerivation { which runs on most major Unix platforms. It mainly conforms to the ANSI Common Lisp standard. ''; - license = stdenv.lib.licenses.free; # public domain + license = lib.licenses.free; # public domain homepage = "http://www.cons.org/cmucl/"; - maintainers = [stdenv.lib.maintainers.tohl]; - platforms = stdenv.lib.platforms.linux; + maintainers = [lib.maintainers.tohl]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/compilers/colm/default.nix b/pkgs/development/compilers/colm/default.nix index 06a56dc42ea..d7a0953a803 100644 --- a/pkgs/development/compilers/colm/default.nix +++ b/pkgs/development/compilers/colm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, gcc, asciidoc, autoreconfHook }: +{ lib, stdenv, fetchurl, makeWrapper, gcc, asciidoc, autoreconfHook }: stdenv.mkDerivation rec { pname = "colm"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { --prefix PATH ":" ${gcc}/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A programming language for the analysis and transformation of computer languages"; homepage = "http://www.colm.net/open-source/colm"; license = licenses.gpl2; diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix index 99bd09d8d9e..611efb11f44 100644 --- a/pkgs/development/compilers/compcert/default.nix +++ b/pkgs/development/compilers/compcert/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, makeWrapper +{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper , coqPackages, ocamlPackages, coq2html , tools ? stdenv.cc , version ? "3.8" @@ -8,7 +8,7 @@ let ocaml-pkgs = with ocamlPackages; [ ocaml findlib menhir ]; ccomp-platform = if stdenv.isDarwin then "x86_64-macosx" else "x86_64-linux"; inherit (coqPackages) coq flocq; - inherit (stdenv.lib) optional optionalString; + inherit (lib) optional optionalString; in let param = { @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "doc" "man" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Formally verified C compiler"; homepage = "https://compcert.org"; license = licenses.inria-compcert; diff --git a/pkgs/development/compilers/computecpp/default.nix b/pkgs/development/compilers/computecpp/default.nix index acdcc2014f8..0f9e877201b 100644 --- a/pkgs/development/compilers/computecpp/default.nix +++ b/pkgs/development/compilers/computecpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchzip , pkg-config , autoPatchelfHook @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { isClang = true; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Accelerate Complex C++ Applications on Heterogeneous Compute Systems using Open Standards"; homepage = "https://www.codeplay.com/products/computesuite/computecpp"; diff --git a/pkgs/development/compilers/copper/default.nix b/pkgs/development/compilers/copper/default.nix index 67bc786e669..dd6af73547a 100644 --- a/pkgs/development/compilers/copper/default.nix +++ b/pkgs/development/compilers/copper/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , libffi }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { installPhase = '' make BACKEND=elf64 install prefix=$out ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple imperative language, statically typed with type inference and genericity"; homepage = "https://tibleiz.net/copper/"; license = licenses.bsd2; diff --git a/pkgs/development/compilers/coreclr/default.nix b/pkgs/development/compilers/coreclr/default.nix index 2a44279209c..f38a3805962 100644 --- a/pkgs/development/compilers/coreclr/default.nix +++ b/pkgs/development/compilers/coreclr/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv +{ config, lib, stdenv , fetchFromGitHub , fetchpatch , which @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/dotnet/core/"; description = ".NET is a general purpose development platform"; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/development/compilers/crystal/build-package.nix b/pkgs/development/compilers/crystal/build-package.nix index bcac4eeb9c4..67c8128f6b5 100644 --- a/pkgs/development/compilers/crystal/build-package.nix +++ b/pkgs/development/compilers/crystal/build-package.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, crystal, shards, git, pkgconfig, which, linkFarm, fetchFromGitHub, installShellFiles }: +{ stdenv, lib, crystal, shards, git, pkg-config, which, linkFarm, fetchFromGitHub, installShellFiles }: { # Some projects do not include a lock file, so you can pass one @@ -61,12 +61,12 @@ stdenv.mkDerivation (mkDerivationArgs // { buildInputs = args.buildInputs or [ ] ++ [ crystal ] ++ lib.optional (format != "crystal") shards; - nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [ git installShellFiles pkgconfig which ]; + nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [ git installShellFiles pkg-config which ]; buildPhase = args.buildPhase or (lib.concatStringsSep "\n" ([ "runHook preBuild" ] ++ lib.optional (format == "make") - ''make ''${buildTargets:-build} $makeFlags'' + "make \${buildTargets:-build} $makeFlags" ++ lib.optionals (format == "crystal") (lib.mapAttrsToList (bin: attrs: '' crystal ${lib.escapeShellArgs ([ @@ -84,14 +84,14 @@ stdenv.mkDerivation (mkDerivationArgs // { installPhase = args.installPhase or (lib.concatStringsSep "\n" ([ "runHook preInstall" ] ++ lib.optional (format == "make") - ''make ''${installTargets:-install} $installFlags'' + "make \${installTargets:-install} $installFlags" ++ lib.optionals (format == "crystal") (map (bin: '' install -Dm555 ${lib.escapeShellArgs [ bin "${placeholder "out"}/bin/${bin}" ]} '') (lib.attrNames crystalBinaries)) ++ lib.optional (format == "shards") - ''install -Dm555 bin/* -t $out/bin'' + "install -Dm555 bin/* -t $out/bin" ++ [ '' for f in README* *.md LICENSE; do @@ -111,9 +111,9 @@ stdenv.mkDerivation (mkDerivationArgs // { checkPhase = args.checkPhase or (lib.concatStringsSep "\n" ([ "runHook preCheck" ] ++ lib.optional (format == "make") - ''make ''${checkTarget:-test} $checkFlags'' + "make \${checkTarget:-test} $checkFlags" ++ lib.optional (format != "make") - ''crystal ''${checkTarget:-spec} $checkFlags'' + "crystal \${checkTarget:-spec} $checkFlags" ++ [ "runHook postCheck" ])); doInstallCheck = args.doInstallCheck or true; diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index fa8198fabad..e887bc22089 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -18,7 +18,7 @@ , makeWrapper , openssl , pcre -, pkgconfig +, pkg-config , readline , tzdata , which @@ -63,7 +63,7 @@ let commonBuildInputs = extraBuildInputs: [ boehmgc libatomic_ops pcre libevent libyaml zlib libxml2 openssl ] ++ extraBuildInputs - ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; + ++ lib.optionals stdenv.isDarwin [ libiconv ]; generic = ( { version @@ -134,7 +134,7 @@ let buildInputs = commonBuildInputs extraBuildInputs; - nativeBuildInputs = [ binary makeWrapper which pkgconfig llvmPackages.llvm ]; + nativeBuildInputs = [ binary makeWrapper which pkg-config llvmPackages.llvm ]; makeFlags = [ "CRYSTAL_CONFIG_VERSION=${version}" @@ -158,7 +158,7 @@ let install -Dm755 .build/crystal $bin/bin/crystal wrapProgram $bin/bin/crystal \ - --suffix PATH : ${lib.makeBinPath [ pkgconfig llvmPackages.clang which ]} \ + --suffix PATH : ${lib.makeBinPath [ pkg-config llvmPackages.clang which ]} \ --suffix CRYSTAL_PATH : lib:$lib/crystal \ --suffix CRYSTAL_LIBRARY_PATH : ${ lib.makeLibraryPath (commonBuildInputs extraBuildInputs) @@ -255,7 +255,13 @@ in rec { extraBuildInputs = [ git ]; }; - crystal = crystal_0_35; + crystal_0_36 = generic { + version = "0.36.0"; + sha256 = "0s7g13mrh2jrxxrrrg4hy3gi49rp7fmpn9zg9kj4nbc8w8yir20r"; + binary = crystal_0_35; + }; + + crystal = crystal_0_36; crystal2nix = callPackage ./crystal2nix.nix {}; } diff --git a/pkgs/development/compilers/cudatoolkit/common.nix b/pkgs/development/compilers/cudatoolkit/common.nix index 92a684a6fbf..c18eb9d534a 100644 --- a/pkgs/development/compilers/cudatoolkit/common.nix +++ b/pkgs/development/compilers/cudatoolkit/common.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { gtk2 glib fontconfig freetype unixODBC alsaLib ]; - rpath = "${stdenv.lib.makeLibraryPath runtimeDependencies}:${stdenv.cc.cc.lib}/lib64"; + rpath = "${lib.makeLibraryPath runtimeDependencies}:${stdenv.cc.cc.lib}/lib64"; unpackPhase = '' sh $src --keep --noexec @@ -232,7 +232,7 @@ stdenv.mkDerivation rec { majorVersion = lib.versions.majorMinor version; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A compiler for NVIDIA GPUs, math libraries, and tools"; homepage = "https://developer.nvidia.com/cuda-toolkit"; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/development/compilers/dale/default.nix b/pkgs/development/compilers/dale/default.nix index ef32b37ef99..addd7997d36 100644 --- a/pkgs/development/compilers/dale/default.nix +++ b/pkgs/development/compilers/dale/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , pkg-config @@ -27,7 +27,7 @@ stdenv.mkDerivation { checkTarget = "tests"; - meta = with stdenv.lib; { + meta = with lib; { description = "Lisp-flavoured C"; longDescription = '' Dale is a system (no GC) programming language that uses diff --git a/pkgs/development/compilers/dasm/default.nix b/pkgs/development/compilers/dasm/default.nix index 627ac36329a..7f57f47f2ed 100644 --- a/pkgs/development/compilers/dasm/default.nix +++ b/pkgs/development/compilers/dasm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "dasm"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { checkTarget = "test"; doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Assembler for 6502 and other 8-bit microprocessors"; homepage = "https://dasm-assembler.github.io"; license = licenses.gpl2; diff --git a/pkgs/development/compilers/dev86/default.nix b/pkgs/development/compilers/dev86/default.nix index 88b46561241..cea9ea37b4e 100644 --- a/pkgs/development/compilers/dev86/default.nix +++ b/pkgs/development/compilers/dev86/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "dev86"; @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { meta = { description = "Linux 8086 development environment"; homepage = "http://v3.sk/~lkundrak/dev86/"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/compilers/dmd/binary.nix b/pkgs/development/compilers/dmd/binary.nix index 2ff2b35060b..de0964155fc 100644 --- a/pkgs/development/compilers/dmd/binary.nix +++ b/pkgs/development/compilers/dmd/binary.nix @@ -1,10 +1,11 @@ -{ stdenv, fetchurl, curl, tzdata, autoPatchelfHook, fixDarwinDylibNames, glibc +{ lib, stdenv, fetchurl, curl, tzdata, autoPatchelfHook, fixDarwinDylibNames, glibc , version, hashes }: -with stdenv; + let + inherit (stdenv) hostPlatform; OS = if hostPlatform.isDarwin then "osx" else hostPlatform.parsed.kernel.name; MODEL = toString hostPlatform.parsed.cpu.bits; -in mkDerivation { +in stdenv.mkDerivation { pname = "dmd-bootstrap"; inherit version; diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index 4bfd6298c8f..074646f5f41 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -16,7 +16,7 @@ let name = "dmd.conf"; text = (lib.generators.toINI {} { Environment = { - DFLAGS = ''-I@out@/include/dmd -L-L@out@/lib -fPIC ${stdenv.lib.optionalString (!targetPackages.stdenv.cc.isClang) "-L--export-dynamic"}''; + DFLAGS = ''-I@out@/include/dmd -L-L@out@/lib -fPIC ${lib.optionalString (!targetPackages.stdenv.cc.isClang) "-L--export-dynamic"}''; }; }); }; @@ -77,16 +77,16 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace dmd/test/dshell/test6952.d --replace "/usr/bin/env bash" "${bash}/bin/bash" '' - + stdenv.lib.optionalString stdenv.hostPlatform.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace phobos/std/socket.d --replace "assert(ih.addrList[0] == 0x7F_00_00_01);" "" '' - + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace phobos/std/socket.d --replace "foreach (name; names)" "names = []; foreach (name; names)" ''; nativeBuildInputs = [ makeWrapper unzip which gdb git ] - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ + ++ lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Foundation ]); @@ -163,7 +163,7 @@ stdenv.mkDerivation rec { substitute ${dmdConfFile} "$out/bin/dmd.conf" --subst-var out ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Official reference compiler for the D language"; homepage = "http://dlang.org/"; # Everything is now Boost licensed, even the backend. diff --git a/pkgs/development/compilers/dotnet/build-dotnet.nix b/pkgs/development/compilers/dotnet/build-dotnet.nix index 1162a75d0de..56880826a19 100644 --- a/pkgs/development/compilers/dotnet/build-dotnet.nix +++ b/pkgs/development/compilers/dotnet/build-dotnet.nix @@ -4,7 +4,7 @@ }: assert builtins.elem type [ "aspnetcore" "netcore" "sdk"]; -{ stdenv +{ lib, stdenv , fetchurl , libunwind , openssl @@ -41,7 +41,7 @@ let in stdenv.mkDerivation rec { inherit pname version; - rpath = stdenv.lib.makeLibraryPath [ + rpath = lib.makeLibraryPath [ curl icu libunwind @@ -70,7 +70,7 @@ in stdenv.mkDerivation rec { runHook postInstall ''; - postFixup = stdenv.lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.isLinux '' patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" $out/dotnet patchelf --set-rpath "${rpath}" $out/dotnet find $out -type f -name "*.so" -exec patchelf --set-rpath '$ORIGIN:${rpath}' {} \; @@ -82,7 +82,7 @@ in stdenv.mkDerivation rec { $out/bin/dotnet --info ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://dotnet.github.io/"; description = builtins.getAttr type descriptions; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; diff --git a/pkgs/development/compilers/dtc/default.nix b/pkgs/development/compilers/dtc/default.nix index 0a694e29ee8..c5d33590daa 100644 --- a/pkgs/development/compilers/dtc/default.nix +++ b/pkgs/development/compilers/dtc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchgit, flex, bison, pkgconfig, which +{ stdenv, lib, fetchgit, flex, bison, pkg-config, which , pythonSupport ? false, python, swig }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0li992wwd7kgy71bikanqky49y4hq3p3vx35p2hvyxy1k0wfy7i8"; }; - nativeBuildInputs = [ flex bison pkgconfig which ] ++ lib.optionals pythonSupport [ python swig ]; + nativeBuildInputs = [ flex bison pkg-config which ] ++ lib.optionals pythonSupport [ python swig ]; postPatch = '' patchShebangs pylibfdt/ diff --git a/pkgs/development/compilers/ecl/16.1.2.nix b/pkgs/development/compilers/ecl/16.1.2.nix index a7b2aa6be74..0789addb337 100644 --- a/pkgs/development/compilers/ecl/16.1.2.nix +++ b/pkgs/development/compilers/ecl/16.1.2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch +{ lib, stdenv, fetchurl, fetchpatch , libtool, autoconf, automake , gmp, mpfr, libffi, makeWrapper , noUnicode ? false @@ -23,7 +23,7 @@ let ]; propagatedBuildInputs = [ libffi gmp mpfr gcc - ] ++ stdenv.lib.optionals useBoehmgc [ + ] ++ lib.optionals useBoehmgc [ # replaces ecl's own gc which other packages can depend on, thus propagated boehmgc ]; @@ -42,7 +42,7 @@ stdenv.mkDerivation { "--with-libffi-prefix=${libffi.dev}" ] ++ - (stdenv.lib.optional (! noUnicode) + (lib.optional (! noUnicode) "--enable-unicode") ; @@ -77,8 +77,8 @@ stdenv.mkDerivation { meta = { inherit (s) version; description = "Lisp implementation aiming to be small, fast and easy to embed"; - license = stdenv.lib.licenses.mit ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.mit ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix index 40f3e38e506..0b4ea9b8389 100644 --- a/pkgs/development/compilers/ecl/default.nix +++ b/pkgs/development/compilers/ecl/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl +{lib, stdenv, fetchurl , libtool, autoconf, automake , texinfo , gmp, mpfr, libffi, makeWrapper @@ -22,7 +22,7 @@ let propagatedBuildInputs = [ libffi gmp mpfr gcc # replaces ecl's own gc which other packages can depend on, thus propagated - ] ++ stdenv.lib.optionals useBoehmgc [ + ] ++ lib.optionals useBoehmgc [ # replaces ecl's own gc which other packages can depend on, thus propagated boehmgc ]; @@ -76,7 +76,7 @@ stdenv.mkDerivation { "--with-libffi-prefix=${libffi.dev}" ] ++ - (stdenv.lib.optional (! noUnicode) + (lib.optional (! noUnicode) "--enable-unicode") ; @@ -94,8 +94,8 @@ stdenv.mkDerivation { inherit (s) version; description = "Lisp implementation aiming to be small, fast and easy to embed"; homepage = "https://common-lisp.net/project/ecl/"; - license = stdenv.lib.licenses.mit ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mit ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/compilers/eli/default.nix b/pkgs/development/compilers/eli/default.nix index 61e5fd70a7c..8920e34b6ee 100644 --- a/pkgs/development/compilers/eli/default.nix +++ b/pkgs/development/compilers/eli/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , symlinkJoin , makeWrapper @@ -84,8 +84,8 @@ stdenv.mkDerivation rec { arbitrary special cases. Output is the C subset of C++. ''; homepage = "http://eli-project.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ timokau ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ timokau ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index 0dbf1a3306f..7ee9e6e5d61 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -2,12 +2,13 @@ , haskell, nodejs , fetchurl, fetchpatch, makeWrapper, writeScriptBin # Rust dependecies -, rustPlatform, openssl, pkg-config }: +, rustPlatform, openssl, pkg-config, Security +}: let fetchElmDeps = import ./fetchElmDeps.nix { inherit stdenv lib fetchurl; }; hsPkgs = haskell.packages.ghc883.override { - overrides = self: super: with haskell.lib; + overrides = self: super: with haskell.lib; with lib; let elmPkgs = rec { elm = overrideCabal (self.callPackage ./packages/elm.nix { }) (drv: { # sadly with parallelism most of the time breaks compilation @@ -23,6 +24,11 @@ let wrapProgram $out/bin/elm \ --prefix PATH ':' ${lib.makeBinPath [ nodejs ]} ''; + + description = "A delightful language for reliable webapps"; + homepage = "https://elm-lang.org/"; + license = licenses.bsd3; + maintainers = with maintainers; [ domenkozar turbomack ]; }); /* @@ -31,6 +37,11 @@ let */ elm-format = justStaticExecutables (overrideCabal (self.callPackage ./packages/elm-format.nix {}) (drv: { jailbreak = true; + + description = "Formats Elm source code according to a standard set of rules based on the official Elm Style Guide"; + homepage = "https://github.com/avh4/elm-format"; + license = licenses.bsd3; + maintainers = with maintainers; [ turbomack ]; })); elmi-to-json = justStaticExecutables (overrideCabal (self.callPackage ./packages/elmi-to-json.nix {}) (drv: { @@ -39,6 +50,11 @@ let hpack ''; jailbreak = true; + + description = "Tool that reads .elmi files (Elm interface file) generated by the elm compiler"; + homepage = "https://github.com/stoeffel/elmi-to-json"; + license = licenses.bsd3; + maintainers = [ maintainers.turbomack ]; })); elm-instrument = justStaticExecutables (overrideCabal (self.callPackage ./packages/elm-instrument.nix {}) (drv: { @@ -48,6 +64,11 @@ let jailbreak = true; # Tests are failing because of missing instances for Eq and Show type classes doCheck = false; + + description = "Instrument Elm code as a preprocessing step for elm-coverage"; + homepage = "https://github.com/zwilias/elm-instrument"; + license = licenses.bsd3; + maintainers = [ maintainers.turbomack ]; })); inherit fetchElmDeps; @@ -74,9 +95,17 @@ let inherit (hsPkgs.elmPkgs) elm; }; - elmRustPackages = { + elmRustPackages = { elm-json = import ./packages/elm-json.nix { - inherit rustPlatform fetchurl openssl stdenv pkg-config; + inherit lib rustPlatform fetchurl openssl stdenv pkg-config Security; + } // { + meta = with lib; { + description = "Install, upgrade and uninstall Elm dependencies"; + homepage = "https://github.com/zwilias/elm-json"; + license = licenses.mit; + maintainers = [ maintainers.turbomack ]; + platforms = platforms.linux; + }; }; }; @@ -89,10 +118,24 @@ let in with hsPkgs.elmPkgs; { elm-test = patchBinwrap [elmi-to-json] - nodePkgs.elm-test; + nodePkgs.elm-test // { + meta = with lib; { + description = "Runs elm-test suites from Node.js"; + homepage = "https://github.com/rtfeldman/node-test-runner"; + license = licenses.bsd3; + maintainers = [ maintainers.turbomack ]; + }; + }; elm-verify-examples = patchBinwrap [elmi-to-json] - nodePkgs.elm-verify-examples; + nodePkgs.elm-verify-examples // { + meta = with lib; { + description = "Verify examples in your docs"; + homepage = "https://github.com/stoeffel/elm-verify-examples"; + license = licenses.bsd3; + maintainers = [ maintainers.turbomack ]; + }; + }; elm-coverage = let patched = patchNpmElm (patchBinwrap [elmi-to-json] nodePkgs.elm-coverage); @@ -111,17 +154,51 @@ let mkdir -p unpacked_bin ln -sf ${elm-instrument}/bin/elm-instrument unpacked_bin/elm-instrument ''; + meta = with lib; { + description = "Work in progress - Code coverage tooling for Elm"; + homepage = "https://github.com/zwilias/elm-coverage"; + license = licenses.bsd3; + maintainers = [ maintainers.turbomack ]; + }; }); create-elm-app = patchNpmElm (patchBinwrap [elmi-to-json] - nodePkgs.create-elm-app); + nodePkgs.create-elm-app) // { + meta = with lib; { + description = "Create Elm apps with no build configuration"; + homepage = "https://github.com/halfzebra/create-elm-app"; + license = licenses.mit; + maintainers = [ maintainers.turbomack ]; + }; + }; elm-review = patchBinwrap [elmRustPackages.elm-json] - nodePkgs.elm-review; + nodePkgs.elm-review // { + meta = with lib; { + description = "Analyzes Elm projects, to help find mistakes before your users find them"; + homepage = "https://package.elm-lang.org/packages/jfmengels/elm-review/${nodePkgs.elm-review.version}"; + license = licenses.bsd3; + maintainers = [ maintainers.turbomack ]; + }; + }; - elm-language-server = nodePkgs."@elm-tooling/elm-language-server"; + elm-language-server = nodePkgs."@elm-tooling/elm-language-server" // { + meta = with lib; { + description = "Language server implementation for Elm"; + homepage = "https://github.com/elm-tooling/elm-language-server"; + license = licenses.mit; + maintainers = [ maintainers.turbomack ]; + }; + }; - elm-optimize-level-2 = nodePkgs."elm-optimize-level-2"; + elm-optimize-level-2 = nodePkgs."elm-optimize-level-2" // { + meta = with lib; { + description = "A second level of optimization for the Javascript that the Elm Compiler produces"; + homepage = "https://github.com/mdgriffith/elm-optimize-level-2"; + license = licenses.bsd3; + maintainers = [ maintainers.turbomack ]; + }; + }; inherit (nodePkgs) elm-doc-preview elm-live elm-upgrade elm-xref elm-analyse; }; diff --git a/pkgs/development/compilers/elm/packages/elm-format.nix b/pkgs/development/compilers/elm/packages/elm-format.nix index ff944cc4b64..b2f655d4f1c 100644 --- a/pkgs/development/compilers/elm/packages/elm-format.nix +++ b/pkgs/development/compilers/elm/packages/elm-format.nix @@ -1,7 +1,7 @@ { mkDerivation, fetchgit, ansi-terminal, ansi-wl-pprint, array, base, binary , bytestring, cmark, containers, directory, filepath, free, HUnit , indents, json, mtl, optparse-applicative, parsec, process -, QuickCheck, quickcheck-io, split, stdenv, tasty, tasty-golden +, QuickCheck, quickcheck-io, split, lib, tasty, tasty-golden , tasty-hunit, tasty-quickcheck, text }: mkDerivation { @@ -36,5 +36,5 @@ mkDerivation { doHaddock = false; homepage = "https://elm-lang.org"; description = "A source code formatter for Elm"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; } diff --git a/pkgs/development/compilers/elm/packages/elm-instrument.nix b/pkgs/development/compilers/elm/packages/elm-instrument.nix index 4d7efcf1083..cf0ba2303e1 100644 --- a/pkgs/development/compilers/elm/packages/elm-instrument.nix +++ b/pkgs/development/compilers/elm/packages/elm-instrument.nix @@ -2,7 +2,7 @@ , bytestring, Cabal, cmark, containers, directory, elm-format , fetchgit, filepath, free, HUnit, indents, json, mtl , optparse-applicative, parsec, process, QuickCheck, quickcheck-io -, split, stdenv, tasty, tasty-golden, tasty-hunit, tasty-quickcheck +, split, lib, tasty, tasty-golden, tasty-hunit, tasty-quickcheck , text }: mkDerivation { @@ -30,5 +30,5 @@ mkDerivation { ]; homepage = "https://elm-lang.org"; description = "Instrumentation library for Elm"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; } diff --git a/pkgs/development/compilers/elm/packages/elm-json.nix b/pkgs/development/compilers/elm/packages/elm-json.nix index 44d300d254b..810c1a91a00 100644 --- a/pkgs/development/compilers/elm/packages/elm-json.nix +++ b/pkgs/development/compilers/elm/packages/elm-json.nix @@ -1,4 +1,4 @@ -{ rustPlatform, fetchurl, openssl, stdenv, pkg-config }: +{ lib, rustPlatform, fetchurl, openssl, stdenv, pkg-config, Security }: rustPlatform.buildRustPackage rec { pname = "elm-json"; version = "0.2.7"; @@ -12,18 +12,10 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; cargoSha256 = "0ylniriq073kpiykamkn9mxdaa6kyiza4pvf7gnfq2h1dvbqa6z7"; # Tests perform networking and therefore can't work in sandbox doCheck = false; - - meta = with stdenv.lib; { - description = "Install, upgrade and uninstall Elm dependencies"; - homepage = "https://github.com/zwilias/elm-json"; - license = licenses.mit; - maintainers = [ maintainers.turbomack ]; - platforms = platforms.linux; - }; } diff --git a/pkgs/development/compilers/elm/packages/elm.nix b/pkgs/development/compilers/elm/packages/elm.nix index 644a53fd619..c012d59d8ae 100644 --- a/pkgs/development/compilers/elm/packages/elm.nix +++ b/pkgs/development/compilers/elm/packages/elm.nix @@ -3,7 +3,7 @@ , file-embed, filelock, filepath, ghc-prim, haskeline, HTTP , http-client, http-client-tls, http-types, language-glsl, mtl , network, parsec, process, raw-strings-qq, scientific, SHA -, snap-core, snap-server, stdenv, template-haskell, time +, snap-core, snap-server, lib, template-haskell, time , unordered-containers, utf8-string, vector, zip-archive }: mkDerivation { @@ -27,5 +27,5 @@ mkDerivation { ]; homepage = "https://elm-lang.org"; description = "The `elm` command line interface"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; } diff --git a/pkgs/development/compilers/elm/packages/elmi-to-json.nix b/pkgs/development/compilers/elm/packages/elmi-to-json.nix index eaed18c5297..3362ce5cc7a 100644 --- a/pkgs/development/compilers/elm/packages/elmi-to-json.nix +++ b/pkgs/development/compilers/elm/packages/elmi-to-json.nix @@ -1,6 +1,6 @@ { mkDerivation, aeson, base, binary, bytestring, containers , directory, fetchgit, filepath, ghc-prim, hpack -, optparse-applicative, stdenv, text, unliftio +, optparse-applicative, lib, text, unliftio , unordered-containers }: mkDerivation { @@ -23,5 +23,5 @@ mkDerivation { testHaskellDepends = [ base ]; prePatch = "hpack"; homepage = "https://github.com/stoeffel/elmi-to-json#readme"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; } diff --git a/pkgs/development/compilers/elm/packages/indents.nix b/pkgs/development/compilers/elm/packages/indents.nix index 6bf7fa7890e..d196e8d0fbf 100644 --- a/pkgs/development/compilers/elm/packages/indents.nix +++ b/pkgs/development/compilers/elm/packages/indents.nix @@ -1,4 +1,4 @@ -{ mkDerivation, base, concatenative, mtl, parsec, stdenv }: +{ mkDerivation, base, concatenative, mtl, parsec, lib }: mkDerivation { pname = "indents"; version = "0.3.3"; @@ -7,5 +7,5 @@ mkDerivation { doCheck = false; homepage = "http://patch-tag.com/r/salazar/indents"; description = "indentation sensitive parser-combinators for parsec"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; } diff --git a/pkgs/development/compilers/elm/packages/node-composition.nix b/pkgs/development/compilers/elm/packages/node-composition.nix index c970861a86f..f6cfb2cd2e4 100644 --- a/pkgs/development/compilers/elm/packages/node-composition.nix +++ b/pkgs/development/compilers/elm/packages/node-composition.nix @@ -6,7 +6,7 @@ let nodeEnv = import ./node-env.nix { - inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; + inherit (pkgs) lib stdenv python2 utillinux runCommand writeTextFile; inherit nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; @@ -14,4 +14,4 @@ in import ./node-packages.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} \ No newline at end of file +} diff --git a/pkgs/development/compilers/elm/packages/node-env.nix b/pkgs/development/compilers/elm/packages/node-env.nix index e1abf530493..759fa71c5aa 100644 --- a/pkgs/development/compilers/elm/packages/node-env.nix +++ b/pkgs/development/compilers/elm/packages/node-env.nix @@ -1,6 +1,6 @@ # This file originates from node2nix -{stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile}: +{lib, stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile}: let python = if nodejs ? python then nodejs.python else python2; @@ -38,8 +38,8 @@ let }; includeDependencies = {dependencies}: - stdenv.lib.optionalString (dependencies != []) - (stdenv.lib.concatMapStrings (dependency: + lib.optionalString (dependencies != []) + (lib.concatMapStrings (dependency: '' # Bundle the dependencies of the package mkdir -p node_modules @@ -100,7 +100,7 @@ let cd "$DIR/${packageName}" ${includeDependencies { inherit dependencies; }} cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} ''; pinpointDependencies = {dependencies, production}: @@ -161,12 +161,12 @@ let '' node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"} - ${stdenv.lib.optionalString (dependencies != []) + ${lib.optionalString (dependencies != []) '' if [ -d node_modules ] then cd node_modules - ${stdenv.lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} + ${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} cd .. fi ''} @@ -183,7 +183,7 @@ let cd "${packageName}" ${pinpointDependencies { inherit dependencies production; }} cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} fi ''; @@ -344,8 +344,8 @@ let cd "${packageName}" runHook preRebuild - ${stdenv.lib.optionalString bypassCache '' - ${stdenv.lib.optionalString reconstructLock '' + ${lib.optionalString bypassCache '' + ${lib.optionalString reconstructLock '' if [ -f package-lock.json ] then echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!" @@ -361,14 +361,14 @@ let node ${addIntegrityFieldsScript} ''} - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild if [ "''${dontNpmInstall-}" != "1" ] then # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. rm -f npm-shrinkwrap.json - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} install fi ''; @@ -396,8 +396,8 @@ let stdenv.mkDerivation ({ name = "node_${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] - ++ stdenv.lib.optional (stdenv.isLinux) utillinux - ++ stdenv.lib.optional (stdenv.isDarwin) libtool + ++ lib.optional (stdenv.isLinux) utillinux + ++ lib.optional (stdenv.isDarwin) libtool ++ buildInputs; inherit nodejs; @@ -470,8 +470,8 @@ let name = "node-dependencies-${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] - ++ stdenv.lib.optional (stdenv.isLinux) utillinux - ++ stdenv.lib.optional (stdenv.isDarwin) libtool + ++ lib.optional (stdenv.isLinux) utillinux + ++ lib.optional (stdenv.isDarwin) libtool ++ buildInputs; inherit dontStrip; # Stripping may fail a build for some package deployments @@ -491,7 +491,7 @@ let # Create fake package.json to make the npm commands work properly cp ${src}/package.json . chmod 644 package.json - ${stdenv.lib.optionalString bypassCache '' + ${lib.optionalString bypassCache '' if [ -f ${src}/package-lock.json ] then cp ${src}/package-lock.json . @@ -500,13 +500,13 @@ let # Go to the parent folder to make sure that all packages are pinpointed cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} # Expose the executables that were installed cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} mv ${packageName} lib ln -s $out/lib/node_modules/.bin $out/bin @@ -516,7 +516,7 @@ let stdenv.mkDerivation { name = "node-shell-${name}-${version}"; - buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ buildInputs; + buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs; buildCommand = '' mkdir -p $out/bin cat > $out/bin/shell <<EOF @@ -529,14 +529,14 @@ let # Provide the dependencies in a development shell through the NODE_PATH environment variable inherit nodeDependencies; - shellHook = stdenv.lib.optionalString (dependencies != []) '' + shellHook = lib.optionalString (dependencies != []) '' export NODE_PATH=${nodeDependencies}/lib/node_modules export PATH="${nodeDependencies}/bin:$PATH" ''; }; in { - buildNodeSourceDist = stdenv.lib.makeOverridable buildNodeSourceDist; - buildNodePackage = stdenv.lib.makeOverridable buildNodePackage; - buildNodeShell = stdenv.lib.makeOverridable buildNodeShell; + buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist; + buildNodePackage = lib.makeOverridable buildNodePackage; + buildNodeShell = lib.makeOverridable buildNodeShell; } diff --git a/pkgs/development/compilers/elm/packages/node-packages.nix b/pkgs/development/compilers/elm/packages/node-packages.nix index c81d2acdf7f..015958d1239 100644 --- a/pkgs/development/compilers/elm/packages/node-packages.nix +++ b/pkgs/development/compilers/elm/packages/node-packages.nix @@ -15513,4 +15513,4 @@ in bypassCache = true; reconstructLock = true; }; -} \ No newline at end of file +} diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index ac13f955930..648ec156abe 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3, nodejs, closurecompiler +{ lib, stdenv, fetchFromGitHub, python3, nodejs, closurecompiler , jre, binaryen , llvmPackages_11 , symlinkJoin, makeWrapper @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { popd ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/emscripten-core/emscripten"; description = "An LLVM-to-JavaScript Compiler"; platforms = platforms.all; diff --git a/pkgs/development/compilers/eql/default.nix b/pkgs/development/compilers/eql/default.nix index ce42c102115..a3fefbc1f48 100644 --- a/pkgs/development/compilers/eql/default.nix +++ b/pkgs/development/compilers/eql/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, qt4, ecl, xorgserver, xkbcomp, xkeyboard_config }: +{ lib, stdenv, fetchgit, qt4, ecl, xorgserver, xkbcomp, xkeyboard_config }: stdenv.mkDerivation rec { version = src.rev; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ln -s $out/lib/eql/build-dir/libeql*.so* $out/lib ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Embedded Qt Lisp (ECL+Qt)"; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; diff --git a/pkgs/development/compilers/factor-lang/default.nix b/pkgs/development/compilers/factor-lang/default.nix index 2c7edb9c170..fc5f478177c 100644 --- a/pkgs/development/compilers/factor-lang/default.nix +++ b/pkgs/development/compilers/factor-lang/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, glib, git, - rlwrap, curl, pkgconfig, perl, makeWrapper, tzdata, ncurses, +{ lib, stdenv, fetchurl, glib, git, + rlwrap, curl, pkg-config, perl, makeWrapper, tzdata, ncurses, pango, cairo, gtk2, gdk-pixbuf, gtkglext, mesa, xorg, openssl, unzip }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ./fuel-dir.patch ]; - buildInputs = with xorg; [ git rlwrap curl pkgconfig perl makeWrapper + buildInputs = with xorg; [ git rlwrap curl pkg-config perl makeWrapper libX11 pango cairo gtk2 gdk-pixbuf gtkglext mesa libXmu libXt libICE libSM openssl unzip ]; @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { # out of known libraries. The side effect is that find-lib # will work only on the known libraries. There does not seem # to be a generic solution here. - find $(echo ${stdenv.lib.makeLibraryPath (with xorg; [ + find $(echo ${lib.makeLibraryPath (with xorg; [ glib libX11 pango cairo gtk2 gdk-pixbuf gtkglext mesa libXmu libXt libICE libSM ])} | sed -e 's#:# #g') -name \*.so.\* > $TMPDIR/so.lst @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { cp ./factor $out/bin wrapProgram $out/bin/factor --prefix LD_LIBRARY_PATH : \ - "${stdenv.lib.makeLibraryPath (with xorg; [ glib + "${lib.makeLibraryPath (with xorg; [ glib libX11 pango cairo gtk2 gdk-pixbuf gtkglext mesa libXmu libXt libICE libSM openssl])}" @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { cp misc/fuel/*.el $out/share/emacs/site-lisp/ ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://factorcode.org"; license = licenses.bsd2; description = "A concatenative, stack-based programming language"; diff --git a/pkgs/development/compilers/fasmg/default.nix b/pkgs/development/compilers/fasmg/default.nix index 5233e248c07..611a2bdb8f1 100644 --- a/pkgs/development/compilers/fasmg/default.nix +++ b/pkgs/development/compilers/fasmg/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchzip }: @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { cp docs/*.txt $doc/share/doc/fasmg ''; - meta = with stdenv.lib; { + meta = with lib; { description = "x86(-64) macro assembler to binary, MZ, PE, COFF, and ELF"; homepage = "https://flatassembler.net"; license = licenses.bsd3; diff --git a/pkgs/development/compilers/flasm/default.nix b/pkgs/development/compilers/flasm/default.nix index 9393d4fc59f..4257feb87b9 100644 --- a/pkgs/development/compilers/flasm/default.nix +++ b/pkgs/development/compilers/flasm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, unzip, bison, flex, gperf, zlib }: +{ lib, stdenv, fetchzip, unzip, bison, flex, gperf, zlib }: stdenv.mkDerivation rec { pname = "flasm"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { install -Dm755 flasm -t $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Assembler and disassembler for Flash (SWF) bytecode"; homepage = "http://flasm.sourceforge.net/"; license = licenses.bsd2; diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix index 3eea7f596b6..14f4d93caa0 100644 --- a/pkgs/development/compilers/flutter/default.nix +++ b/pkgs/development/compilers/flutter/default.nix @@ -1,40 +1,22 @@ -{ callPackage, dart }: +{ callPackage, fetchurl, dart }: let - dart_stable = dart.override { version = "2.10.0"; }; - dart_beta = dart.override { version = "2.10.0"; }; - dart_dev = dart.override { version = "2.11.0-161.0.dev"; }; mkFlutter = opts: callPackage (import ./flutter.nix opts) { }; getPatches = dir: let files = builtins.attrNames (builtins.readDir dir); in map (f: dir + ("/" + f)) files; + version = "1.22.4"; + channel = "stable"; + filename = "flutter_linux_${version}-${channel}.tar.xz"; in { mkFlutter = mkFlutter; stable = mkFlutter rec { + inherit dart version; pname = "flutter"; - channel = "stable"; - version = "1.22.0"; - filename = "flutter_linux_${version}-${channel}.tar.xz"; - sha256Hash = "0ryrx458ss8ryhmspcfrhjvad2pl46bxh1qk5vzwzhxiqdc79vm8"; - patches = getPatches ./patches/stable; - dart = dart_stable; - }; - beta = mkFlutter rec { - pname = "flutter"; - channel = "beta"; - version = "1.22.0-12.3.pre"; - filename = "flutter_linux_${version}-${channel}.tar.xz"; - sha256Hash = "1axzz137z4lgpa09h7bjf52i6dij6a9wmjbha1182db23r09plzh"; - patches = getPatches ./patches/stable; - dart = dart_beta; - }; - dev = mkFlutter rec { - pname = "flutter"; - channel = "dev"; - version = "1.23.0-7.0.pre"; - filename = "flutter_linux_${version}-${channel}.tar.xz"; - sha256Hash = "166qb4qbv051bc71yj7c0vrkamhvzz3fp3mz318qzm947mydwjj5"; - patches = getPatches ./patches/dev; - dart = dart_dev; + src = fetchurl { + url = "https://storage.googleapis.com/flutter_infra/releases/${channel}/linux/${filename}"; + sha256 = "0qalgav9drqddcj8lfvl9ddf3325n953pvkmgha47lslg9sa88zw"; + }; + patches = getPatches ./patches; }; } diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix index b7769e88af3..4a7aa0d0146 100644 --- a/pkgs/development/compilers/flutter/flutter.nix +++ b/pkgs/development/compilers/flutter/flutter.nix @@ -1,10 +1,8 @@ -{ channel -, pname +{ pname , version -, sha256Hash , patches , dart -, filename ? "flutter_linux_${version}-${channel}.tar.xz" +, src }: { bash @@ -14,6 +12,7 @@ , git , runCommand , stdenv +, lib , fetchurl , alsaLib , dbus @@ -26,25 +25,23 @@ , libXcursor , libXdamage , libXfixes +, libXrender +, libXtst +, libXi +, libXext , libGL , nspr , nss , systemd }: let - drvName = "flutter-${channel}-${version}"; + drvName = "flutter-${version}"; flutter = stdenv.mkDerivation { name = "${drvName}-unwrapped"; - src = fetchurl { - url = - "https://storage.googleapis.com/flutter_infra/releases/${channel}/linux/${filename}"; - sha256 = sha256Hash; - }; - buildInputs = [ git ]; - inherit patches; + inherit src patches; postPatch = '' patchShebangs --build ./bin/ @@ -52,25 +49,29 @@ let ''; buildPhase = '' - FLUTTER_ROOT=$(pwd) - FLUTTER_TOOLS_DIR="$FLUTTER_ROOT/packages/flutter_tools" - SNAPSHOT_PATH="$FLUTTER_ROOT/bin/cache/flutter_tools.snapshot" - STAMP_PATH="$FLUTTER_ROOT/bin/cache/flutter_tools.stamp" - SCRIPT_PATH="$FLUTTER_TOOLS_DIR/bin/flutter_tools.dart" - DART_SDK_PATH="${dart}" + export FLUTTER_ROOT="$(pwd)" + export FLUTTER_TOOLS_DIR="$FLUTTER_ROOT/packages/flutter_tools" + export SCRIPT_PATH="$FLUTTER_TOOLS_DIR/bin/flutter_tools.dart" + + export SNAPSHOT_PATH="$FLUTTER_ROOT/bin/cache/flutter_tools.snapshot" + export STAMP_PATH="$FLUTTER_ROOT/bin/cache/flutter_tools.stamp" + + export DART_SDK_PATH="${dart}" HOME=../.. # required for pub upgrade --offline, ~/.pub-cache # path is relative otherwise it's replaced by /build/flutter - (cd "$FLUTTER_TOOLS_DIR" && ${dart}/bin/pub upgrade --offline) + pushd "$FLUTTER_TOOLS_DIR" + ${dart}/bin/pub get --offline + popd local revision="$(cd "$FLUTTER_ROOT"; git rev-parse HEAD)" ${dart}/bin/dart --snapshot="$SNAPSHOT_PATH" --packages="$FLUTTER_TOOLS_DIR/.packages" "$SCRIPT_PATH" echo "$revision" > "$STAMP_PATH" echo -n "${version}" > version - rm -rf bin/cache/{artifacts,dart-sdk,downloads} - rm -f bin/cache/*.stamp + rm -r bin/cache/{artifacts,dart-sdk,downloads} + rm bin/cache/*.stamp ''; installPhase = '' @@ -117,7 +118,11 @@ let libXcomposite libXcursor libXdamage + libXext libXfixes + libXi + libXrender + libXtst libGL nspr nss @@ -137,7 +142,7 @@ runCommand drvName preferLocalBuild = true; allowSubstitutes = false; passthru = { unwrapped = flutter; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Flutter is Google's SDK for building mobile, web and desktop with Dart"; longDescription = '' Flutter is Google’s UI toolkit for building beautiful, @@ -146,7 +151,7 @@ runCommand drvName homepage = "https://flutter.dev"; license = licenses.bsd3; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ babariviere ericdallo ]; + maintainers = with maintainers; [ babariviere ericdallo thiagokokada ]; }; } '' mkdir -p $out/bin diff --git a/pkgs/development/compilers/flutter/patches/dev/disable-auto-update.patch b/pkgs/development/compilers/flutter/patches/dev/disable-auto-update.patch deleted file mode 100644 index f9ac00d1d32..00000000000 --- a/pkgs/development/compilers/flutter/patches/dev/disable-auto-update.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/bin/internal/shared.sh b/bin/internal/shared.sh -index 22efe87443..c6954575c5 100644 ---- a/bin/internal/shared.sh -+++ b/bin/internal/shared.sh -@@ -212,8 +212,6 @@ function shared::execute() { - # FLUTTER_TOOL_ARGS="--enable-asserts $FLUTTER_TOOL_ARGS" - # FLUTTER_TOOL_ARGS="$FLUTTER_TOOL_ARGS --observe=65432" - -- upgrade_flutter 7< "$PROG_NAME" -- - BIN_NAME="$(basename "$PROG_NAME")" - case "$BIN_NAME" in - flutter*) -diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -index fb1616ba96..b973b3fd58 100644 ---- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -+++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -@@ -291,13 +291,6 @@ class FlutterCommandRunner extends CommandRunner<void> { - globals.flutterUsage.suppressAnalytics = true; - } - -- try { -- await globals.flutterVersion.ensureVersionFile(); -- } on FileSystemException catch (e) { -- globals.printError('Failed to write the version file to the artifact cache: "$e".'); -- globals.printError('Please ensure you have permissions in the artifact cache directory.'); -- throwToolExit('Failed to write the version file'); -- } - final bool machineFlag = topLevelResults['machine'] as bool; - if (topLevelResults.command?.name != 'upgrade' && topLevelResults['version-check'] as bool && !machineFlag) { - await globals.flutterVersion.checkFlutterVersionFreshness(); diff --git a/pkgs/development/compilers/flutter/patches/dev/move-cache.patch b/pkgs/development/compilers/flutter/patches/dev/move-cache.patch deleted file mode 100644 index eb6ff5cf582..00000000000 --- a/pkgs/development/compilers/flutter/patches/dev/move-cache.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff --git a/dev/devicelab/lib/framework/runner.dart b/dev/devicelab/lib/framework/runner.dart -index a059a8e992..b664a7070c 100644 ---- a/dev/devicelab/lib/framework/runner.dart -+++ b/dev/devicelab/lib/framework/runner.dart -@@ -137,7 +137,7 @@ Future<void> cleanupSystem() async { - print('\nTelling Gradle to shut down (JAVA_HOME=$javaHome)'); - final String gradlewBinaryName = Platform.isWindows ? 'gradlew.bat' : 'gradlew'; - final Directory tempDir = Directory.systemTemp.createTempSync('flutter_devicelab_shutdown_gradle.'); -- recursiveCopy(Directory(path.join(flutterDirectory.path, 'bin', 'cache', 'artifacts', 'gradle_wrapper')), tempDir); -+ recursiveCopy(Directory(path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'artifacts', 'gradle_wrapper')), tempDir); - copy(File(path.join(path.join(flutterDirectory.path, 'packages', 'flutter_tools'), 'templates', 'app', 'android.tmpl', 'gradle', 'wrapper', 'gradle-wrapper.properties')), Directory(path.join(tempDir.path, 'gradle', 'wrapper'))); - if (!Platform.isWindows) { - await exec( -diff --git a/packages/flutter_tools/lib/src/asset.dart b/packages/flutter_tools/lib/src/asset.dart -index 36714c5fb4..c0cc049ee1 100644 ---- a/packages/flutter_tools/lib/src/asset.dart -+++ b/packages/flutter_tools/lib/src/asset.dart -@@ -6,6 +6,7 @@ import 'package:meta/meta.dart'; - import 'package:package_config/package_config.dart'; - import 'package:yaml/yaml.dart'; - -+import 'base/common.dart'; - import 'base/context.dart'; - import 'base/file_system.dart'; - import 'base/utils.dart'; -@@ -397,7 +398,7 @@ List<_Asset> _getMaterialAssets(String fontSet) { - for (final Map<dynamic, dynamic> font in (family['fonts'] as List<dynamic>).cast<Map<dynamic, dynamic>>()) { - final Uri entryUri = globals.fs.path.toUri(font['asset'] as String); - result.add(_Asset( -- baseDir: globals.fs.path.join(Cache.flutterRoot, 'bin', 'cache', 'artifacts', 'material_fonts'), -+ baseDir: globals.fs.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'artifacts', 'material_fonts'), - relativeUri: Uri(path: entryUri.pathSegments.last), - entryUri: entryUri, - package: null, -diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart -index aaca036d78..43ff428f8d 100644 ---- a/packages/flutter_tools/lib/src/cache.dart -+++ b/packages/flutter_tools/lib/src/cache.dart -@@ -226,8 +226,15 @@ class Cache { - return; - } - assert(_lock == null); -+ -+ final Directory dir = globals.fs.directory(globals.fs.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter')); -+ if (!dir.existsSync()) { -+ dir.createSync(recursive: true); -+ globals.os.chmod(dir, '755'); -+ } -+ - final File lockFile = -- globals.fs.file(globals.fs.path.join(flutterRoot, 'bin', 'cache', 'lockfile')); -+ globals.fs.file(globals.fs.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'lockfile')); - try { - _lock = lockFile.openSync(mode: FileMode.write); - } on FileSystemException catch (e) { -@@ -330,7 +337,7 @@ class Cache { - if (_rootOverride != null) { - return _fileSystem.directory(_fileSystem.path.join(_rootOverride.path, 'bin', 'cache')); - } else { -- return _fileSystem.directory(_fileSystem.path.join(flutterRoot, 'bin', 'cache')); -+ return _fileSystem.directory(_fileSystem.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter')); - } - } - diff --git a/pkgs/development/compilers/flutter/patches/stable/disable-auto-update.patch b/pkgs/development/compilers/flutter/patches/disable-auto-update.patch index 35ce5b36735..35ce5b36735 100644 --- a/pkgs/development/compilers/flutter/patches/stable/disable-auto-update.patch +++ b/pkgs/development/compilers/flutter/patches/disable-auto-update.patch diff --git a/pkgs/development/compilers/flutter/patches/stable/move-cache.patch b/pkgs/development/compilers/flutter/patches/move-cache.patch index dc77496edb3..dc77496edb3 100644 --- a/pkgs/development/compilers/flutter/patches/stable/move-cache.patch +++ b/pkgs/development/compilers/flutter/patches/move-cache.patch diff --git a/pkgs/development/compilers/flux/default.nix b/pkgs/development/compilers/flux/default.nix index c599c9f8baf..75386f21f74 100644 --- a/pkgs/development/compilers/flux/default.nix +++ b/pkgs/development/compilers/flux/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig }: +{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkg-config }: stdenv.mkDerivation rec { pname = "flux"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "11f3ypg0sdq5kj69zgz6kih1yrzgm48r16spyvzwvlswng147410"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; meta = with lib; { description = "An interface description language used by DirectFB"; diff --git a/pkgs/development/compilers/fpc/default.nix b/pkgs/development/compilers/fpc/default.nix index 6e7ffefca21..5c829386651 100644 --- a/pkgs/development/compilers/fpc/default.nix +++ b/pkgs/development/compilers/fpc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gawk }: +{ lib, stdenv, fetchurl, gawk }: let startFPC = import ./binary.nix { inherit stdenv fetchurl; }; in @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { bootstrap = startFPC; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Free Pascal Compiler from a source distribution"; homepage = "https://www.freepascal.org"; maintainers = [ maintainers.raskin ]; diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix index 71303305791..0b7ac647529 100644 --- a/pkgs/development/compilers/fpc/lazarus.nix +++ b/pkgs/development/compilers/fpc/lazarus.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { --prefix PATH ':' "${lib.makeBinPath [ fpc gdb gnumake binutils ]}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Graphical IDE for the FreePascal language"; homepage = "https://www.lazarus.freepascal.org"; license = licenses.gpl2Plus ; diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/development/compilers/fsharp/default.nix index 0c60403a6be..19b79989dc2 100644 --- a/pkgs/development/compilers/fsharp/default.nix +++ b/pkgs/development/compilers/fsharp/default.nix @@ -1,6 +1,6 @@ # Temporarily avoid dependency on dotnetbuildhelpers to avoid rebuilding many times while working on it -{ stdenv, fetchurl, mono, pkgconfig, dotnetbuildhelpers, autoconf, automake, which }: +{ lib, stdenv, fetchurl, mono, pkg-config, dotnetbuildhelpers, autoconf, automake, which }: stdenv.mkDerivation rec { pname = "fsharp"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0mvmvwwpl4zq0yvgzdizww8l9azvlrc82xm32nz1fi1nw8x5qfqk"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ mono dotnetbuildhelpers autoconf automake which ]; configurePhase = '' @@ -41,8 +41,8 @@ stdenv.mkDerivation rec { meta = { description = "A functional CLI language"; homepage = "https://fsharp.org/"; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin ]; - platforms = with stdenv.lib.platforms; unix; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ thoughtpolice raskin ]; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/development/compilers/fsharp41/default.nix b/pkgs/development/compilers/fsharp41/default.nix index 6475deb1026..e9f9088df3a 100644 --- a/pkgs/development/compilers/fsharp41/default.nix +++ b/pkgs/development/compilers/fsharp41/default.nix @@ -1,6 +1,6 @@ # Temporaririly avoid dependency on dotnetbuildhelpers to avoid rebuilding many times while working on it -{ stdenv, fetchurl, pkgconfig, autoconf, automake, which, mono, msbuild, dotnetbuildhelpers, dotnetPackages }: +{ lib, stdenv, fetchurl, pkg-config, autoconf, automake, which, mono, msbuild, dotnetbuildhelpers, dotnetPackages }: stdenv.mkDerivation rec { pname = "fsharp"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0cv6p5pin962vhbpsji40nkckkag5c96kq5qihvg60pc1z821p0i"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoconf automake @@ -119,8 +119,8 @@ EOF meta = { description = "A functional CLI language"; homepage = "https://fsharp.org/"; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin ]; - platforms = with stdenv.lib.platforms; unix; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ thoughtpolice raskin ]; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/development/compilers/fstar/default.nix b/pkgs/development/compilers/fstar/default.nix index 548abeff78d..73bf001f752 100644 --- a/pkgs/development/compilers/fstar/default.nix +++ b/pkgs/development/compilers/fstar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, z3, ocamlPackages, makeWrapper, installShellFiles }: +{ lib, stdenv, fetchFromGitHub, z3, ocamlPackages, makeWrapper, installShellFiles }: stdenv.mkDerivation rec { pname = "fstar"; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { installShellCompletion --zsh --name _fstar.exe .completion/zsh/__fstar.exe ''; - meta = with stdenv.lib; { + meta = with lib; { description = "ML-like functional programming language aimed at program verification"; homepage = "https://www.fstar-lang.org"; license = licenses.asl20; diff --git a/pkgs/development/compilers/gavrasm/default.nix b/pkgs/development/compilers/gavrasm/default.nix index 58e8b45b61a..6bd813b56cf 100644 --- a/pkgs/development/compilers/gavrasm/default.nix +++ b/pkgs/development/compilers/gavrasm/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchzip, fpc , lang ? "en" } : -assert stdenv.lib.assertOneOf "lang" lang ["cn" "de" "en" "fr" "tr"]; +{ lib, stdenv, fetchzip, fpc , lang ? "en" } : +assert lib.assertOneOf "lang" lang ["cn" "de" "en" "fr" "tr"]; stdenv.mkDerivation rec { pname = "gavrasm"; version = "4.5"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { cp LiesMich.Txt $out/doc ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.avr-asm-tutorial.net/gavrasm"; description = "AVR Assembler for ATMEL AVR-Processors"; license = licenses.unfree; diff --git a/pkgs/development/compilers/gcc-arm-embedded/10/default.nix b/pkgs/development/compilers/gcc-arm-embedded/10/default.nix index b300a190e1c..943ddd100a2 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/10/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/10/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , ncurses5 , python27 @@ -39,11 +39,11 @@ stdenv.mkDerivation rec { find $out -type f | while read f; do patchelf "$f" > /dev/null 2>&1 || continue patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true + patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors"; homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; diff --git a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix b/pkgs/development/compilers/gcc-arm-embedded/6/default.nix index 7d8a4b5b14d..266863d95b2 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/6/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , ncurses5 , python27 @@ -37,11 +37,11 @@ stdenv.mkDerivation rec { find $out -type f | while read f; do patchelf "$f" > /dev/null 2>&1 || continue patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true + patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors"; homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; diff --git a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix b/pkgs/development/compilers/gcc-arm-embedded/7/default.nix index 633ae054d05..4f2135446f6 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/7/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , ncurses5 , python27 @@ -37,11 +37,11 @@ stdenv.mkDerivation rec { find $out -type f | while read f; do patchelf "$f" > /dev/null 2>&1 || continue patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true + patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors"; homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; diff --git a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix b/pkgs/development/compilers/gcc-arm-embedded/8/default.nix index 99ec9d1b549..2d85113527c 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/8/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , ncurses5 , python27 @@ -37,11 +37,11 @@ stdenv.mkDerivation rec { find $out -type f | while read f; do patchelf "$f" > /dev/null 2>&1 || continue patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true + patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors"; homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; diff --git a/pkgs/development/compilers/gcc-arm-embedded/9/default.nix b/pkgs/development/compilers/gcc-arm-embedded/9/default.nix index c4c1ebc1d8a..944d7c7b159 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/9/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/9/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , ncurses5 , python27 @@ -39,11 +39,11 @@ stdenv.mkDerivation rec { find $out -type f | while read f; do patchelf "$f" > /dev/null 2>&1 || continue patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true + patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors"; homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix index c31e7c426e0..07b0921ec18 100644 --- a/pkgs/development/compilers/gcc/10/default.nix +++ b/pkgs/development/compilers/gcc/10/default.nix @@ -1,4 +1,4 @@ -{ stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs +{ lib, stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs , langC ? true, langCC ? true, langFortran ? false , langAda ? false , langObjC ? stdenv.targetPlatform.isDarwin @@ -28,8 +28,8 @@ , threadsCross ? null # for MinGW , crossStageStatic ? false , # Strip kills static libs of other archs (hence no cross) - stripped ? stdenv.hostPlatform == stdenv.buildPlatform - && stdenv.targetPlatform == stdenv.hostPlatform + stripped ? stdenv.hostPlatform.system == stdenv.buildPlatform.system + && stdenv.targetPlatform.system == stdenv.hostPlatform.system , gnused ? null , cloog # unused; just for compat with gcc4, as we override the parameter on some places , buildPackages @@ -48,7 +48,7 @@ assert langAda -> gnatboot != null; # threadsCross is just for MinGW assert threadsCross != null -> stdenv.targetPlatform.isWindows; -with stdenv.lib; +with lib; with builtins; let majorVersion = "10"; @@ -90,7 +90,7 @@ stdenv.mkDerivation ({ inherit patches; - outputs = [ "out" "man" "info" ] ++ stdenv.lib.optional (!langJit) "lib"; + outputs = [ "out" "man" "info" ] ++ lib.optional (!langJit) "lib"; setOutputFlags = false; NIX_NO_SELF_RPATH = true; @@ -100,7 +100,7 @@ stdenv.mkDerivation ({ # This should kill all the stdinc frameworks that gcc and friends like to # insert into default search paths. - prePatch = stdenv.lib.optionalString hostPlatform.isDarwin '' + prePatch = lib.optionalString hostPlatform.isDarwin '' substituteInPlace gcc/config/darwin-c.c \ --replace 'if (stdinc)' 'if (0)' @@ -134,13 +134,13 @@ stdenv.mkDerivation ({ -e 's|define[[:blank:]]*MUSL_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define MUSL_DYNAMIC_LINKER\1 "${libc.out}\2"|g' done '' - + stdenv.lib.optionalString (targetPlatform.libc == "musl") + + lib.optionalString (targetPlatform.libc == "musl") '' sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR' '' ) else "") - + stdenv.lib.optionalString targetPlatform.isAvr '' + + lib.optionalString targetPlatform.isAvr '' makeFlagsArray+=( 'LIMITS_H_TEST=false' ) @@ -177,20 +177,21 @@ stdenv.mkDerivation ({ depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross; - NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl"; + NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm -ldl"; preConfigure = import ../common/pre-configure.nix { - inherit (stdenv) lib; + inherit lib; inherit version hostPlatform gnatboot langAda langGo; }; dontDisableStatic = true; # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + configurePlatforms = [ "build" "host" ] ++ lib.optional (targetPlatform != hostPlatform) "target"; configureFlags = import ../common/configure-flags.nix { inherit + lib stdenv targetPackages crossStageStatic libcCross @@ -244,7 +245,7 @@ stdenv.mkDerivation ({ inherit (import ../common/extra-target-flags.nix { - inherit stdenv crossStageStatic libcCross threadsCross; + inherit lib stdenv crossStageStatic libcCross threadsCross; }) EXTRA_FLAGS_FOR_TARGET EXTRA_LDFLAGS_FOR_TARGET @@ -262,7 +263,7 @@ stdenv.mkDerivation ({ meta = { homepage = "https://gcc.gnu.org/"; - license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ + license = lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ description = "GNU Compiler Collection, version ${version}" + (if stripped then "" else " (with debugging info)"); @@ -275,13 +276,13 @@ stdenv.mkDerivation ({ compiler used in the GNU system including the GNU/Linux variant. ''; - maintainers = with stdenv.lib.maintainers; [ synthetica ]; + maintainers = with lib.maintainers; [ synthetica ]; platforms = - stdenv.lib.platforms.linux ++ - stdenv.lib.platforms.freebsd ++ - stdenv.lib.platforms.illumos ++ - stdenv.lib.platforms.darwin; + lib.platforms.linux ++ + lib.platforms.freebsd ++ + lib.platforms.illumos ++ + lib.platforms.darwin; }; } diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 617a19e238b..6a2121a8298 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -1,4 +1,4 @@ -{ stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs +{ lib, stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs , langC ? true, langCC ? true, langFortran ? false , langObjC ? stdenv.targetPlatform.isDarwin , langObjCpp ? stdenv.targetPlatform.isDarwin @@ -20,7 +20,7 @@ , libelf # optional, for link-time optimizations (LTO) , cloog ? null, isl ? null # optional, for the Graphite optimization framework. , zlib ? null, boehmgc ? null -, zip ? null, unzip ? null, pkgconfig ? null +, zip ? null, unzip ? null, pkg-config ? null , gtk2 ? null, libart_lgpl ? null , libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null , libXrender ? null, xorgproto ? null @@ -58,7 +58,7 @@ assert langGo -> langCC; # threadsCross is just for MinGW assert threadsCross != null -> stdenv.targetPlatform.isWindows; -with stdenv.lib; +with lib; with builtins; let majorVersion = "4"; @@ -161,7 +161,7 @@ stdenv.mkDerivation ({ depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ texinfo which gettext ] ++ (optional (perl != null) perl) - ++ (optional javaAwtGtk pkgconfig); + ++ (optional javaAwtGtk pkg-config); # For building runtime libs depsBuildTarget = @@ -190,17 +190,18 @@ stdenv.mkDerivation ({ depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross; preConfigure = import ../common/pre-configure.nix { - inherit (stdenv) lib; + inherit lib; inherit version hostPlatform langJava langGo; }; dontDisableStatic = true; # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + configurePlatforms = [ "build" "host" ] ++ lib.optional (targetPlatform != hostPlatform) "target"; configureFlags = import ../common/configure-flags.nix { inherit + lib stdenv targetPackages crossStageStatic libcCross @@ -270,7 +271,7 @@ stdenv.mkDerivation ({ inherit (import ../common/extra-target-flags.nix { - inherit stdenv crossStageStatic libcCross threadsCross; + inherit lib stdenv crossStageStatic libcCross threadsCross; }) EXTRA_FLAGS_FOR_TARGET EXTRA_LDFLAGS_FOR_TARGET @@ -289,7 +290,7 @@ stdenv.mkDerivation ({ meta = { homepage = "https://gcc.gnu.org/"; - license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ + license = lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ description = "GNU Compiler Collection, version ${version}" + (if stripped then "" else " (with debugging info)"); @@ -302,13 +303,13 @@ stdenv.mkDerivation ({ compiler used in the GNU system including the GNU/Linux variant. ''; - maintainers = with stdenv.lib.maintainers; [ peti veprbl ]; + maintainers = with lib.maintainers; [ peti veprbl ]; platforms = - stdenv.lib.platforms.linux ++ - stdenv.lib.platforms.freebsd ++ - stdenv.lib.platforms.illumos ++ - stdenv.lib.platforms.darwin; + lib.platforms.linux ++ + lib.platforms.freebsd ++ + lib.platforms.illumos ++ + lib.platforms.darwin; badPlatforms = [ "x86_64-darwin" ]; }; } diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 7ea80ffbeb3..709288559d1 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -1,4 +1,4 @@ -{ stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs +{ lib, stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs , langC ? true, langCC ? true, langFortran ? false , langObjC ? stdenv.targetPlatform.isDarwin , langObjCpp ? stdenv.targetPlatform.isDarwin @@ -20,7 +20,7 @@ , libelf # optional, for link-time optimizations (LTO) , cloog ? null, isl ? null # optional, for the Graphite optimization framework. , zlib ? null, boehmgc ? null -, zip ? null, unzip ? null, pkgconfig ? null +, zip ? null, unzip ? null, pkg-config ? null , gtk2 ? null, libart_lgpl ? null , libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null , libXrender ? null, xorgproto ? null @@ -58,7 +58,7 @@ assert langGo -> langCC; # threadsCross is just for MinGW assert threadsCross != null -> stdenv.targetPlatform.isWindows; -with stdenv.lib; +with lib; with builtins; let majorVersion = "4"; @@ -174,7 +174,7 @@ stdenv.mkDerivation ({ depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ texinfo which gettext ] ++ (optional (perl != null) perl) - ++ (optional javaAwtGtk pkgconfig); + ++ (optional javaAwtGtk pkg-config); # For building runtime libs depsBuildTarget = @@ -203,17 +203,18 @@ stdenv.mkDerivation ({ depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross; preConfigure = import ../common/pre-configure.nix { - inherit (stdenv) lib; + inherit lib; inherit version hostPlatform langJava langGo; }; dontDisableStatic = true; # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + configurePlatforms = [ "build" "host" ] ++ lib.optional (targetPlatform != hostPlatform) "target"; configureFlags = import ../common/configure-flags.nix { inherit + lib stdenv targetPackages crossStageStatic libcCross @@ -283,7 +284,7 @@ stdenv.mkDerivation ({ inherit (import ../common/extra-target-flags.nix { - inherit stdenv crossStageStatic libcCross threadsCross; + inherit lib stdenv crossStageStatic libcCross threadsCross; }) EXTRA_FLAGS_FOR_TARGET EXTRA_LDFLAGS_FOR_TARGET @@ -301,7 +302,7 @@ stdenv.mkDerivation ({ meta = { homepage = "https://gcc.gnu.org/"; - license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ + license = lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ description = "GNU Compiler Collection, version ${version}" + (if stripped then "" else " (with debugging info)"); @@ -314,13 +315,13 @@ stdenv.mkDerivation ({ compiler used in the GNU system including the GNU/Linux variant. ''; - maintainers = with stdenv.lib.maintainers; [ peti veprbl ]; + maintainers = with lib.maintainers; [ peti veprbl ]; platforms = - stdenv.lib.platforms.linux ++ - stdenv.lib.platforms.freebsd ++ - stdenv.lib.platforms.illumos ++ - stdenv.lib.platforms.darwin; + lib.platforms.linux ++ + lib.platforms.freebsd ++ + lib.platforms.illumos ++ + lib.platforms.darwin; badPlatforms = [ "x86_64-darwin" ]; }; } diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 029777430ff..fa7881e398a 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -1,4 +1,4 @@ -{ stdenv, targetPackages, fetchurl, fetchpatch, fetchFromGitHub, noSysDirs +{ lib, stdenv, targetPackages, fetchurl, fetchpatch, fetchFromGitHub, noSysDirs , langC ? true, langCC ? true, langFortran ? false , langAda ? false , langObjC ? stdenv.targetPlatform.isDarwin @@ -23,7 +23,7 @@ , isl ? null # optional, for the Graphite optimization framework. , zlib ? null, boehmgc ? null , gnatboot ? null -, zip ? null, unzip ? null, pkgconfig ? null +, zip ? null, unzip ? null, pkg-config ? null , gtk2 ? null, libart_lgpl ? null , libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null , libXrender ? null, xorgproto ? null @@ -36,8 +36,8 @@ , threadsCross ? null # for MinGW , crossStageStatic ? false , # Strip kills static libs of other archs (hence no cross) - stripped ? stdenv.hostPlatform == stdenv.buildPlatform - && stdenv.targetPlatform == stdenv.hostPlatform + stripped ? stdenv.hostPlatform.system == stdenv.buildPlatform.system + && stdenv.targetPlatform.system == stdenv.hostPlatform.system , gnused ? null , cloog # unused; just for compat with gcc4, as we override the parameter on some places , buildPackages @@ -61,7 +61,7 @@ assert langAda -> gnatboot != null; # threadsCross is just for MinGW assert threadsCross != null -> stdenv.targetPlatform.isWindows; -with stdenv.lib; +with lib; with builtins; let majorVersion = "6"; @@ -148,7 +148,7 @@ stdenv.mkDerivation ({ prePatch = # This should kill all the stdinc frameworks that gcc and friends like to # insert into default search paths. - stdenv.lib.optionalString hostPlatform.isDarwin '' + lib.optionalString hostPlatform.isDarwin '' substituteInPlace gcc/config/darwin-c.c \ --replace 'if (stdinc)' 'if (0)' @@ -177,7 +177,7 @@ stdenv.mkDerivation ({ -e 's|define[[:blank:]]*MUSL_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define MUSL_DYNAMIC_LINKER\1 "${libc.out}\2"|g' done '' - + stdenv.lib.optionalString (targetPlatform.libc == "musl") + + lib.optionalString (targetPlatform.libc == "musl") '' sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR' '' @@ -190,7 +190,7 @@ stdenv.mkDerivation ({ depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ texinfo which gettext ] ++ (optional (perl != null) perl) - ++ (optional javaAwtGtk pkgconfig) + ++ (optional javaAwtGtk pkg-config) ++ (optional (with stdenv.targetPlatform; isVc4 || isRedox) flex); # For building runtime libs @@ -219,20 +219,21 @@ stdenv.mkDerivation ({ depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross; - NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl"; + NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm -ldl"; preConfigure = import ../common/pre-configure.nix { - inherit (stdenv) lib; + inherit lib; inherit version hostPlatform gnatboot langJava langAda langGo; }; dontDisableStatic = true; # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + configurePlatforms = [ "build" "host" ] ++ lib.optional (targetPlatform != hostPlatform) "target"; configureFlags = import ../common/configure-flags.nix { inherit + lib stdenv targetPackages crossStageStatic libcCross @@ -302,7 +303,7 @@ stdenv.mkDerivation ({ inherit (import ../common/extra-target-flags.nix { - inherit stdenv crossStageStatic libcCross threadsCross; + inherit lib stdenv crossStageStatic libcCross threadsCross; }) EXTRA_FLAGS_FOR_TARGET EXTRA_LDFLAGS_FOR_TARGET @@ -320,7 +321,7 @@ stdenv.mkDerivation ({ meta = { homepage = "https://gcc.gnu.org/"; - license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ + license = lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ description = "GNU Compiler Collection, version ${version}" + (if stripped then "" else " (with debugging info)"); @@ -333,13 +334,13 @@ stdenv.mkDerivation ({ compiler used in the GNU system including the GNU/Linux variant. ''; - maintainers = with stdenv.lib.maintainers; [ peti ]; + maintainers = with lib.maintainers; [ peti ]; platforms = - stdenv.lib.platforms.linux ++ - stdenv.lib.platforms.freebsd ++ - stdenv.lib.platforms.illumos ++ - stdenv.lib.platforms.darwin; + lib.platforms.linux ++ + lib.platforms.freebsd ++ + lib.platforms.illumos ++ + lib.platforms.darwin; }; } diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index d950d6ac35b..2ea9033ba63 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -1,4 +1,4 @@ -{ stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs +{ lib, stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs , langC ? true, langCC ? true, langFortran ? false , langObjC ? stdenv.targetPlatform.isDarwin , langObjCpp ? stdenv.targetPlatform.isDarwin @@ -26,8 +26,8 @@ , threadsCross ? null # for MinGW , crossStageStatic ? false , # Strip kills static libs of other archs (hence no cross) - stripped ? stdenv.hostPlatform == stdenv.buildPlatform - && stdenv.targetPlatform == stdenv.hostPlatform + stripped ? stdenv.hostPlatform.system == stdenv.buildPlatform.system + && stdenv.targetPlatform.system == stdenv.hostPlatform.system , gnused ? null , cloog # unused; just for compat with gcc4, as we override the parameter on some places , buildPackages @@ -45,7 +45,7 @@ assert langGo -> langCC; # threadsCross is just for MinGW assert threadsCross != null -> stdenv.targetPlatform.isWindows; -with stdenv.lib; +with lib; with builtins; let majorVersion = "7"; @@ -97,7 +97,7 @@ stdenv.mkDerivation ({ inherit patches; - outputs = [ "out" "man" "info" ] ++ stdenv.lib.optional (!langJit) "lib"; + outputs = [ "out" "man" "info" ] ++ lib.optional (!langJit) "lib"; setOutputFlags = false; NIX_NO_SELF_RPATH = true; @@ -107,7 +107,7 @@ stdenv.mkDerivation ({ # This should kill all the stdinc frameworks that gcc and friends like to # insert into default search paths. - prePatch = stdenv.lib.optionalString hostPlatform.isDarwin '' + prePatch = lib.optionalString hostPlatform.isDarwin '' substituteInPlace gcc/config/darwin-c.c \ --replace 'if (stdinc)' 'if (0)' @@ -141,13 +141,13 @@ stdenv.mkDerivation ({ -e 's|define[[:blank:]]*MUSL_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define MUSL_DYNAMIC_LINKER\1 "${libc.out}\2"|g' done '' - + stdenv.lib.optionalString (targetPlatform.libc == "musl") + + lib.optionalString (targetPlatform.libc == "musl") '' sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR' '' ) else "") - + stdenv.lib.optionalString targetPlatform.isAvr '' + + lib.optionalString targetPlatform.isAvr '' makeFlagsArray+=( 'LIMITS_H_TEST=false' ) @@ -183,21 +183,22 @@ stdenv.mkDerivation ({ depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (stdenv.cc.isClang && langFortran) "-Wno-unused-command-line-argument"; - NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl"; + NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.cc.isClang && langFortran) "-Wno-unused-command-line-argument"; + NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm -ldl"; preConfigure = import ../common/pre-configure.nix { - inherit (stdenv) lib; + inherit lib; inherit version hostPlatform langGo; }; dontDisableStatic = true; # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + configurePlatforms = [ "build" "host" ] ++ lib.optional (targetPlatform != hostPlatform) "target"; configureFlags = import ../common/configure-flags.nix { inherit + lib stdenv targetPackages crossStageStatic libcCross @@ -254,7 +255,7 @@ stdenv.mkDerivation ({ inherit (import ../common/extra-target-flags.nix { - inherit stdenv crossStageStatic libcCross threadsCross; + inherit lib stdenv crossStageStatic libcCross threadsCross; }) EXTRA_FLAGS_FOR_TARGET EXTRA_LDFLAGS_FOR_TARGET @@ -272,7 +273,7 @@ stdenv.mkDerivation ({ meta = { homepage = "https://gcc.gnu.org/"; - license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ + license = lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ description = "GNU Compiler Collection, version ${version}" + (if stripped then "" else " (with debugging info)"); @@ -285,13 +286,13 @@ stdenv.mkDerivation ({ compiler used in the GNU system including the GNU/Linux variant. ''; - maintainers = with stdenv.lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ ]; platforms = - stdenv.lib.platforms.linux ++ - stdenv.lib.platforms.freebsd ++ - stdenv.lib.platforms.illumos ++ - stdenv.lib.platforms.darwin; + lib.platforms.linux ++ + lib.platforms.freebsd ++ + lib.platforms.illumos ++ + lib.platforms.darwin; }; } diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index 683a9edfe09..6ecf462d54d 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -1,4 +1,4 @@ -{ stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs +{ lib, stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs , langC ? true, langCC ? true, langFortran ? false , langObjC ? stdenv.targetPlatform.isDarwin , langObjCpp ? stdenv.targetPlatform.isDarwin @@ -26,8 +26,8 @@ , threadsCross ? null # for MinGW , crossStageStatic ? false , # Strip kills static libs of other archs (hence no cross) - stripped ? stdenv.hostPlatform == stdenv.buildPlatform - && stdenv.targetPlatform == stdenv.hostPlatform + stripped ? stdenv.hostPlatform.system == stdenv.buildPlatform.system + && stdenv.targetPlatform.system == stdenv.hostPlatform.system , gnused ? null , cloog # unused; just for compat with gcc4, as we override the parameter on some places , buildPackages @@ -45,7 +45,7 @@ assert langGo -> langCC; # threadsCross is just for MinGW assert threadsCross != null -> stdenv.targetPlatform.isWindows; -with stdenv.lib; +with lib; with builtins; let majorVersion = "8"; @@ -87,7 +87,7 @@ stdenv.mkDerivation ({ inherit patches; - outputs = [ "out" "man" "info" ] ++ stdenv.lib.optional (!langJit) "lib"; + outputs = [ "out" "man" "info" ] ++ lib.optional (!langJit) "lib"; setOutputFlags = false; NIX_NO_SELF_RPATH = true; @@ -97,7 +97,7 @@ stdenv.mkDerivation ({ # This should kill all the stdinc frameworks that gcc and friends like to # insert into default search paths. - prePatch = stdenv.lib.optionalString hostPlatform.isDarwin '' + prePatch = lib.optionalString hostPlatform.isDarwin '' substituteInPlace gcc/config/darwin-c.c \ --replace 'if (stdinc)' 'if (0)' @@ -131,13 +131,13 @@ stdenv.mkDerivation ({ -e 's|define[[:blank:]]*MUSL_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define MUSL_DYNAMIC_LINKER\1 "${libc.out}\2"|g' done '' - + stdenv.lib.optionalString (targetPlatform.libc == "musl") + + lib.optionalString (targetPlatform.libc == "musl") '' sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR' '' ) else "") - + stdenv.lib.optionalString targetPlatform.isAvr '' + + lib.optionalString targetPlatform.isAvr '' makeFlagsArray+=( 'LIMITS_H_TEST=false' ) @@ -173,20 +173,21 @@ stdenv.mkDerivation ({ depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross; - NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl"; + NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm -ldl"; preConfigure = import ../common/pre-configure.nix { - inherit (stdenv) lib; + inherit lib; inherit version hostPlatform langGo; }; dontDisableStatic = true; # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + configurePlatforms = [ "build" "host" ] ++ lib.optional (targetPlatform != hostPlatform) "target"; configureFlags = import ../common/configure-flags.nix { inherit + lib stdenv targetPackages crossStageStatic libcCross @@ -239,7 +240,7 @@ stdenv.mkDerivation ({ inherit (import ../common/extra-target-flags.nix { - inherit stdenv crossStageStatic libcCross threadsCross; + inherit lib stdenv crossStageStatic libcCross threadsCross; }) EXTRA_FLAGS_FOR_TARGET EXTRA_LDFLAGS_FOR_TARGET @@ -257,7 +258,7 @@ stdenv.mkDerivation ({ meta = { homepage = "https://gcc.gnu.org/"; - license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ + license = lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ description = "GNU Compiler Collection, version ${version}" + (if stripped then "" else " (with debugging info)"); @@ -270,13 +271,13 @@ stdenv.mkDerivation ({ compiler used in the GNU system including the GNU/Linux variant. ''; - maintainers = with stdenv.lib.maintainers; [ synthetica ]; + maintainers = with lib.maintainers; [ synthetica ]; platforms = - stdenv.lib.platforms.linux ++ - stdenv.lib.platforms.freebsd ++ - stdenv.lib.platforms.illumos ++ - stdenv.lib.platforms.darwin; + lib.platforms.linux ++ + lib.platforms.freebsd ++ + lib.platforms.illumos ++ + lib.platforms.darwin; }; } diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index 7827cb98505..7f35f5c7bb9 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -1,4 +1,4 @@ -{ stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs +{ lib, stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs , langC ? true, langCC ? true, langFortran ? false , langAda ? false , langObjC ? stdenv.targetPlatform.isDarwin @@ -29,8 +29,8 @@ , threadsCross ? null # for MinGW , crossStageStatic ? false , # Strip kills static libs of other archs (hence no cross) - stripped ? stdenv.hostPlatform == stdenv.buildPlatform - && stdenv.targetPlatform == stdenv.hostPlatform + stripped ? stdenv.hostPlatform.system == stdenv.buildPlatform.system + && stdenv.targetPlatform.system == stdenv.hostPlatform.system , gnused ? null , cloog # unused; just for compat with gcc4, as we override the parameter on some places , buildPackages @@ -54,7 +54,7 @@ assert langAda -> gnatboot != null; # threadsCross is just for MinGW assert threadsCross != null -> stdenv.targetPlatform.isWindows; -with stdenv.lib; +with lib; with builtins; let majorVersion = "9"; @@ -103,7 +103,7 @@ stdenv.mkDerivation ({ inherit patches; - outputs = [ "out" "man" "info" ] ++ stdenv.lib.optional (!langJit) "lib"; + outputs = [ "out" "man" "info" ] ++ lib.optional (!langJit) "lib"; setOutputFlags = false; NIX_NO_SELF_RPATH = true; @@ -113,7 +113,7 @@ stdenv.mkDerivation ({ # This should kill all the stdinc frameworks that gcc and friends like to # insert into default search paths. - prePatch = stdenv.lib.optionalString hostPlatform.isDarwin '' + prePatch = lib.optionalString hostPlatform.isDarwin '' substituteInPlace gcc/config/darwin-c.c \ --replace 'if (stdinc)' 'if (0)' @@ -147,13 +147,13 @@ stdenv.mkDerivation ({ -e 's|define[[:blank:]]*MUSL_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define MUSL_DYNAMIC_LINKER\1 "${libc.out}\2"|g' done '' - + stdenv.lib.optionalString (targetPlatform.libc == "musl") + + lib.optionalString (targetPlatform.libc == "musl") '' sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR' '' ) else "") - + stdenv.lib.optionalString targetPlatform.isAvr '' + + lib.optionalString targetPlatform.isAvr '' makeFlagsArray+=( 'LIMITS_H_TEST=false' ) @@ -190,20 +190,21 @@ stdenv.mkDerivation ({ depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross; - NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl"; + NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm -ldl"; preConfigure = import ../common/pre-configure.nix { - inherit (stdenv) lib; + inherit lib; inherit version hostPlatform gnatboot langAda langGo langJit; }; dontDisableStatic = true; # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + configurePlatforms = [ "build" "host" ] ++ lib.optional (targetPlatform != hostPlatform) "target"; configureFlags = import ../common/configure-flags.nix { inherit + lib stdenv targetPackages crossStageStatic libcCross @@ -258,7 +259,7 @@ stdenv.mkDerivation ({ inherit (import ../common/extra-target-flags.nix { - inherit stdenv crossStageStatic langD libcCross threadsCross; + inherit lib stdenv crossStageStatic langD libcCross threadsCross; }) EXTRA_FLAGS_FOR_TARGET EXTRA_LDFLAGS_FOR_TARGET @@ -276,7 +277,7 @@ stdenv.mkDerivation ({ meta = { homepage = "https://gcc.gnu.org/"; - license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ + license = lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ description = "GNU Compiler Collection, version ${version}" + (if stripped then "" else " (with debugging info)"); @@ -289,13 +290,13 @@ stdenv.mkDerivation ({ compiler used in the GNU system including the GNU/Linux variant. ''; - maintainers = with stdenv.lib.maintainers; [ synthetica ]; + maintainers = with lib.maintainers; [ synthetica ]; platforms = - stdenv.lib.platforms.linux ++ - stdenv.lib.platforms.freebsd ++ - stdenv.lib.platforms.illumos ++ - stdenv.lib.platforms.darwin; + lib.platforms.linux ++ + lib.platforms.freebsd ++ + lib.platforms.illumos ++ + lib.platforms.darwin; }; } diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh index 7d104b96624..e6d41d7b29a 100644 --- a/pkgs/development/compilers/gcc/builder.sh +++ b/pkgs/development/compilers/gcc/builder.sh @@ -147,9 +147,9 @@ if test "$noSysDirs" = "1"; then fi fi -if test -n "${targetConfig-}"; then - # The host strip will destroy some important details of the objects - dontStrip=1 +if [ -n "${targetConfig-}" ]; then + # if stripping gcc, include target directory too + stripDebugList="${stripDebugList-lib lib32 lib64 libexec bin sbin} $targetConfig" fi eval "$oldOpts" diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix index 12d3f5d8987..4bdec26fd99 100644 --- a/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , targetPackages , crossStageStatic, libcCross @@ -24,8 +24,8 @@ , langJit }: -assert cloog != null -> stdenv.lib.versionOlder version "5"; -assert langJava -> stdenv.lib.versionOlder version "7"; +assert cloog != null -> lib.versionOlder version "5"; +assert langJava -> lib.versionOlder version "7"; # Note [Windows Exception Handling] # sjlj (short jump long jump) exception handling makes no sense on x86_64, @@ -39,8 +39,7 @@ assert langJava -> stdenv.lib.versionOlder version "7"; let inherit (stdenv) - buildPlatform hostPlatform targetPlatform - lib; + buildPlatform hostPlatform targetPlatform; crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem"; @@ -171,7 +170,7 @@ let ++ lib.optional javaAwtGtk "--enable-java-awt=gtk" ++ lib.optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr}" - ++ (import ../common/platform-flags.nix { inherit (stdenv) lib targetPlatform; }) + ++ (import ../common/platform-flags.nix { inherit (stdenv) targetPlatform; inherit lib; }) ++ lib.optionals (targetPlatform != hostPlatform) crossConfigureFlags ++ lib.optional (targetPlatform != hostPlatform) "--disable-bootstrap" diff --git a/pkgs/development/compilers/gcc/common/extra-target-flags.nix b/pkgs/development/compilers/gcc/common/extra-target-flags.nix index 0a5a7a1bc1c..ad4ab6bcb4b 100644 --- a/pkgs/development/compilers/gcc/common/extra-target-flags.nix +++ b/pkgs/development/compilers/gcc/common/extra-target-flags.nix @@ -1,7 +1,7 @@ -{ stdenv, crossStageStatic, langD ? false, libcCross, threadsCross }: +{ lib, stdenv, crossStageStatic, langD ? false, libcCross, threadsCross }: let - inherit (stdenv) lib hostPlatform targetPlatform; + inherit (stdenv) hostPlatform targetPlatform; in { @@ -11,7 +11,7 @@ in EXTRA_FLAGS_FOR_TARGET = let mkFlags = dep: langD: lib.optionals (targetPlatform != hostPlatform && dep != null && !langD) ([ "-O2 -idirafter ${lib.getDev dep}${dep.incdir or "/include"}" - ] ++ stdenv.lib.optionals (! crossStageStatic) [ + ] ++ lib.optionals (! crossStageStatic) [ "-B${lib.getLib dep}${dep.libdir or "/lib"}" ]); in mkFlags libcCross langD diff --git a/pkgs/development/compilers/gcc/common/platform-flags.nix b/pkgs/development/compilers/gcc/common/platform-flags.nix index f3cdce41193..bd5a72f9603 100644 --- a/pkgs/development/compilers/gcc/common/platform-flags.nix +++ b/pkgs/development/compilers/gcc/common/platform-flags.nix @@ -1,7 +1,7 @@ { lib, targetPlatform }: let - p = targetPlatform.platform.gcc or {} + p = targetPlatform.gcc or {} // targetPlatform.parsed.abi; in lib.concatLists [ (lib.optional (!targetPlatform.isx86_64 && p ? arch) "--with-arch=${p.arch}") # --with-arch= is unknown flag on x86_64 @@ -11,6 +11,6 @@ in lib.concatLists [ (lib.optional (p ? float) "--with-float=${p.float}") (lib.optional (p ? mode) "--with-mode=${p.mode}") (lib.optional - (let tp = targetPlatform; in tp.isPower && tp.libc == "glibc" && tp.is64bit && tp.isLittleEndian) + (let tp = targetPlatform; in tp.isPower && tp.libc == "glibc" && tp.is64bit) "--with-long-double-128") ] diff --git a/pkgs/development/compilers/gcl/2.6.13-pre.nix b/pkgs/development/compilers/gcl/2.6.13-pre.nix index f4f63bc9b19..50efbe5d3c5 100644 --- a/pkgs/development/compilers/gcl/2.6.13-pre.nix +++ b/pkgs/development/compilers/gcl/2.6.13-pre.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, mpfr, m4, binutils, emacs, zlib, which +{ lib, stdenv, fetchgit, mpfr, m4, binutils, emacs, zlib, which , texinfo, libX11, xorgproto, libXi, gmp, readline, strace , libXext, libXt, libXaw, libXmu } : @@ -45,7 +45,7 @@ stdenv.mkDerivation { meta = { description = "GNU Common Lisp compiler working via GCC"; - maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = stdenv.lib.platforms.linux; + maintainers = [ lib.maintainers.raskin ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/compilers/gcl/default.nix b/pkgs/development/compilers/gcl/default.nix index a8a1bf9fc1b..6d0471dacbb 100644 --- a/pkgs/development/compilers/gcl/default.nix +++ b/pkgs/development/compilers/gcl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mpfr, m4, binutils, emacs, zlib, which +{ lib, stdenv, fetchurl, mpfr, m4, binutils, emacs, zlib, which , texinfo, libX11, xorgproto, libXi, gmp , libXext, libXt, libXaw, libXmu } : @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-fgnu89-inline"; - meta = with stdenv.lib; { + meta = with lib; { description = "GNU Common Lisp compiler working via GCC"; maintainers = [ maintainers.raskin ]; license = licenses.gpl2; diff --git a/pkgs/development/compilers/gforth/default.nix b/pkgs/development/compilers/gforth/default.nix index d2a2a7a85e3..bdf172cb9b9 100644 --- a/pkgs/development/compilers/gforth/default.nix +++ b/pkgs/development/compilers/gforth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, m4 }: +{ lib, stdenv, fetchurl, m4 }: let version = "0.7.3"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [ m4 ]; - configureFlags = stdenv.lib.optional stdenv.isDarwin [ "--build=x86_64-apple-darwin" ]; + configureFlags = lib.optional stdenv.isDarwin [ "--build=x86_64-apple-darwin" ]; postInstall = '' mkdir -p $out/share/emacs/site-lisp @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { description = "The Forth implementation of the GNU project"; homepage = "https://www.gnu.org/software/gforth/"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl3; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/compilers/ghc/8.10.1.nix b/pkgs/development/compilers/ghc/8.10.1.nix index 42eb994b8fe..661dd5cb002 100644 --- a/pkgs/development/compilers/ghc/8.10.1.nix +++ b/pkgs/development/compilers/ghc/8.10.1.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgsBuildTarget, targetPackages +{ lib, stdenv, pkgsBuildTarget, targetPackages # build-tools , bootPkgs @@ -18,7 +18,7 @@ , # If enabled, GHC will be built with the GPL-free but slower integer-simple # library instead of the faster but GPLed integer-gmp library. - enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp + enableIntegerSimple ? !(lib.any (lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp , # If enabled, use -fPIC when compiling static libs. enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform @@ -35,7 +35,7 @@ , # What flavour to build. An empty string indicates no # specific flavour and falls back to ghc default values. - ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) + ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) (if useLLVM then "perf-cross" else "perf-cross-ncg") , # Whether to disable the large address space allocator @@ -51,7 +51,7 @@ let inherit (bootPkgs) ghc; # TODO(@Ericson2314) Make unconditional - targetPrefix = stdenv.lib.optionalString + targetPrefix = lib.optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-"; @@ -69,32 +69,32 @@ let # to actually link to our new Libc. The iOS simulator is a special # exception because we can’t actually run simulators binaries # ourselves. - + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' + + lib.optionalString (targetPlatform != hostPlatform) '' Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"} CrossCompilePrefix = ${targetPrefix} HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO BUILD_SPHINX_PDF = NO - '' + stdenv.lib.optionalString dontStrip '' + '' + lib.optionalString dontStrip '' STRIP_CMD = : - '' + stdenv.lib.optionalString (!enableProfiledLibs) '' + '' + lib.optionalString (!enableProfiledLibs) '' GhcLibWays = "v dyn" - '' + stdenv.lib.optionalString enableRelocatedStaticLibs '' + '' + lib.optionalString enableRelocatedStaticLibs '' GhcLibHcOpts += -fPIC GhcRtsHcOpts += -fPIC - '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' + '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' EXTRA_CC_OPTS += -std=gnu99 ''; # Splicer will pull out correct variations - libDeps = platform: stdenv.lib.optional enableTerminfo ncurses + libDeps = platform: lib.optional enableTerminfo ncurses ++ [libffi] - ++ stdenv.lib.optional (!enableIntegerSimple) gmp - ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; + ++ lib.optional (!enableIntegerSimple) gmp + ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; toolsForTarget = [ pkgsBuildTarget.targetPackages.stdenv.cc - ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm; + ] ++ lib.optional useLLVM buildLlvmPackages.llvm; targetCC = builtins.head toolsForTarget; @@ -128,7 +128,7 @@ stdenv.mkDerivation (rec { export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString useLdGold ".gold"}" + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}" export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" @@ -138,13 +138,13 @@ stdenv.mkDerivation (rec { echo -n "${buildMK dontStrip}" > mk/build.mk sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.isDarwin) '' export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' export NIX_LDFLAGS+=" -no_dtrace_dof" - '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' + '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets - '' + stdenv.lib.optionalString targetPlatform.isMusl '' + '' + lib.optionalString targetPlatform.isMusl '' echo "patching llvm-targets for musl targets..." echo "Cloning these existing '*-linux-gnu*' targets:" grep linux-gnu llvm-targets | sed 's/^/ /' @@ -164,29 +164,29 @@ stdenv.mkDerivation (rec { # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = [ "build" "host" ] - ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + ++ lib.optional (targetPlatform != hostPlatform) "target"; # `--with` flags for libraries needed for RTS linker configureFlags = [ "--datadir=$doc/share/doc/ghc" "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" - ] ++ stdenv.lib.optionals (libffi != null) [ + ] ++ lib.optionals (libffi != null) [ "--with-system-libffi" "--with-ffi-includes=${targetPackages.libffi.dev}/include" "--with-ffi-libraries=${targetPackages.libffi.out}/lib" - ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [ + ] ++ lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [ "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib" - ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ + ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" - ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ + ] ++ lib.optionals (targetPlatform != hostPlatform) [ "--enable-bootstrap-with-devel-snapshot" - ] ++ stdenv.lib.optionals useLdGold [ + ] ++ lib.optionals useLdGold [ "CFLAGS=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" - ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [ + ] ++ lib.optionals (disableLargeAddressSpace) [ "--disable-large-address-space" ]; @@ -194,7 +194,7 @@ stdenv.mkDerivation (rec { strictDeps = true; # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. - dontAddExtraLibs = true; + dontAddExtraLibs = true; nativeBuildInputs = [ perl autoconf automake m4 python3 sphinx @@ -207,18 +207,18 @@ stdenv.mkDerivation (rec { buildInputs = [ perl bash ] ++ (libDeps hostPlatform); propagatedBuildInputs = [ targetPackages.stdenv.cc ] - ++ stdenv.lib.optional useLLVM llvmPackages.llvm; + ++ lib.optional useLLVM llvmPackages.llvm; - depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform); - depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform); + depsTargetTarget = map lib.getDev (libDeps targetPlatform); + depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform); # required, because otherwise all symbols from HSffi.o are stripped, and # that in turn causes GHCi to abort - stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; + stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; checkTarget = "test"; - hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie"; + hardeningDisable = [ "format" ] ++ lib.optional stdenv.targetPlatform.isMusl "pie"; postInstall = '' # Install the bash completion file. @@ -228,7 +228,7 @@ stdenv.mkDerivation (rec { for i in "$out/bin/"*; do test ! -h $i || continue egrep --quiet '^#!' <(head -n 1 $i) || continue - sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i + sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i done ''; @@ -245,14 +245,14 @@ stdenv.mkDerivation (rec { meta = { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; - maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; + maintainers = with lib.maintainers; [ marcweber andres peti ]; timeout = 24 * 3600; inherit (ghc.meta) license platforms; }; dontStrip = (targetPlatform.useAndroidPrebuilt || targetPlatform.isWasm); -} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt{ +} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt{ dontPatchELF = true; noAuditTmpdir = true; }) diff --git a/pkgs/development/compilers/ghc/8.10.2-binary.nix b/pkgs/development/compilers/ghc/8.10.2-binary.nix index 1a1a9ca0160..02373d00b10 100644 --- a/pkgs/development/compilers/ghc/8.10.2-binary.nix +++ b/pkgs/development/compilers/ghc/8.10.2-binary.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl, perl, gcc , ncurses6, gmp, glibc, libiconv, numactl , llvmPackages @@ -16,12 +16,12 @@ assert stdenv.targetPlatform == stdenv.hostPlatform; let useLLVM = !stdenv.targetPlatform.isx86; - libPath = stdenv.lib.makeLibraryPath ([ + libPath = lib.makeLibraryPath ([ ncurses6 gmp - ] ++ stdenv.lib.optional (stdenv.hostPlatform.isDarwin) libiconv - ++ stdenv.lib.optional (stdenv.hostPlatform.isAarch64) numactl); + ] ++ lib.optional (stdenv.hostPlatform.isDarwin) libiconv + ++ lib.optional (stdenv.hostPlatform.isAarch64) numactl); - libEnvVar = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin "DY" + libEnvVar = lib.optionalString stdenv.hostPlatform.isDarwin "DY" + "LD_LIBRARY_PATH"; glibcDynLinker = assert stdenv.isLinux; @@ -29,7 +29,7 @@ let # Could be stdenv.cc.bintools.dynamicLinker, keeping as-is to avoid rebuild. ''"$(cat $NIX_CC/nix-support/dynamic-linker)"'' else - "${stdenv.lib.getLib glibc}/lib/ld-linux*"; + "${lib.getLib glibc}/lib/ld-linux*"; in @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { or (throw "cannot bootstrap GHC on this platform")); nativeBuildInputs = [ perl ]; - propagatedBuildInputs = stdenv.lib.optionals useLLVM [ llvmPackages.llvm ]; + propagatedBuildInputs = lib.optionals useLLVM [ llvmPackages.llvm ]; # Cannot patchelf beforehand due to relative RPATHs that anticipate # the final install location/ @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { postUnpack = # GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib # during linking - stdenv.lib.optionalString stdenv.isDarwin '' + lib.optionalString stdenv.isDarwin '' export NIX_LDFLAGS+=" -no_dtrace_dof" # not enough room in the object files for the full path to libiconv :( for exe in $(find . -type f -executable); do @@ -92,20 +92,20 @@ stdenv.mkDerivation rec { '' find . -name integer-gmp.buildinfo \ -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp.out}/lib@" {} \; - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' find . -name base.buildinfo \ -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${libiconv}/lib@" {} \; '' + # aarch64 does HAVE_NUMA so -lnuma requires it in library-dirs in rts/package.conf.in # FFI_LIB_DIR is a good indication of places it must be needed. - stdenv.lib.optionalString stdenv.hostPlatform.isAarch64 '' + lib.optionalString stdenv.hostPlatform.isAarch64 '' find . -name package.conf.in \ -exec sed -i "s@FFI_LIB_DIR@FFI_LIB_DIR ${numactl.out}/lib@g" {} \; '' + # Rename needed libraries and binaries, fix interpreter - stdenv.lib.optionalString stdenv.isLinux '' + lib.optionalString stdenv.isLinux '' find . -type f -perm -0100 -exec patchelf \ - --replace-needed libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.6 libncurses.so \ + --replace-needed libncurses${lib.optionalString stdenv.is64bit "w"}.so.6 libncurses.so \ --interpreter ${glibcDynLinker} {} \; sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 @@ -117,21 +117,21 @@ stdenv.mkDerivation rec { # (`__strdup` is defined to be an alias of `strdup` anyway[1]). # [1] http://refspecs.linuxbase.org/LSB_4.0.0/LSB-Core-generic/LSB-Core-generic/baselib---strdup-1.html # Use objcopy magic to make the change: - stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + lib.optionalString stdenv.hostPlatform.isMusl '' find ./ghc-${version}/rts -name "libHSrts*.a" -exec ''${OBJCOPY:-objcopy} --redefine-sym __strdup=strdup {} \; ''; # fix for `configure: error: Your linker is affected by binutils #16177` - preConfigure = stdenv.lib.optionalString + preConfigure = lib.optionalString stdenv.targetPlatform.isAarch32 "LD=ld.gold"; configurePlatforms = [ ]; configureFlags = [ - "--with-gmp-libraries=${stdenv.lib.getLib gmp}/lib" - "--with-gmp-includes=${stdenv.lib.getDev gmp}/include" - ] ++ stdenv.lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}" - ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override"; + "--with-gmp-libraries=${lib.getLib gmp}/lib" + "--with-gmp-includes=${lib.getDev gmp}/include" + ] ++ lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}" + ++ lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override"; # No building is necessary, but calling make without flags ironically # calls install-strip ... @@ -139,7 +139,7 @@ stdenv.mkDerivation rec { # On Linux, use patchelf to modify the executables so that they can # find editline/gmp. - postFixup = stdenv.lib.optionalString stdenv.isLinux + postFixup = lib.optionalString stdenv.isLinux (if stdenv.hostPlatform.isAarch64 then # Keep rpath as small as possible on aarch64 for patchelf#244. All Elfs # are 2 directories deep from $out/lib, so pooling symlinks there makes @@ -167,7 +167,7 @@ stdenv.mkDerivation rec { patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p fi done - '') + stdenv.lib.optionalString stdenv.isDarwin '' + '') + lib.optionalString stdenv.isDarwin '' # not enough room in the object files for the full path to libiconv :( for exe in $(find "$out" -type f -executable); do isScript $exe && continue @@ -179,7 +179,7 @@ stdenv.mkDerivation rec { substituteInPlace $file --replace /usr/bin/ranlib "$(type -P ranlib)" done '' + - stdenv.lib.optionalString minimal '' + lib.optionalString minimal '' # Remove profiling files find $out -type f -name '*.p_o' -delete find $out -type f -name '*.p_hi' -delete @@ -215,8 +215,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; platforms = ["x86_64-linux" "armv7l-linux" "aarch64-linux" "i686-linux" "x86_64-darwin"]; - maintainers = with stdenv.lib.maintainers; [ lostnet ]; + maintainers = with lib.maintainers; [ lostnet ]; }; } diff --git a/pkgs/development/compilers/ghc/8.10.2.nix b/pkgs/development/compilers/ghc/8.10.2.nix index fac12099d5d..6e194b68faa 100644 --- a/pkgs/development/compilers/ghc/8.10.2.nix +++ b/pkgs/development/compilers/ghc/8.10.2.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgsBuildTarget, targetPackages +{ lib, stdenv, pkgsBuildTarget, targetPackages # build-tools , bootPkgs @@ -18,7 +18,7 @@ , # If enabled, GHC will be built with the GPL-free but slower integer-simple # library instead of the faster but GPLed integer-gmp library. - enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp + enableIntegerSimple ? !(lib.any (lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp , # If enabled, use -fPIC when compiling static libs. enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform @@ -35,7 +35,7 @@ , # What flavour to build. An empty string indicates no # specific flavour and falls back to ghc default values. - ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) + ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) (if useLLVM then "perf-cross" else "perf-cross-ncg") , # Whether to disable the large address space allocator @@ -51,7 +51,7 @@ let inherit (bootPkgs) ghc; # TODO(@Ericson2314) Make unconditional - targetPrefix = stdenv.lib.optionalString + targetPrefix = lib.optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-"; @@ -62,30 +62,30 @@ let endif DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} - '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' + '' + lib.optionalString (targetPlatform != hostPlatform) '' Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} CrossCompilePrefix = ${targetPrefix} HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO BUILD_SPHINX_PDF = NO - '' + stdenv.lib.optionalString (!enableProfiledLibs) '' + '' + lib.optionalString (!enableProfiledLibs) '' GhcLibWays = "v dyn" - '' + stdenv.lib.optionalString enableRelocatedStaticLibs '' + '' + lib.optionalString enableRelocatedStaticLibs '' GhcLibHcOpts += -fPIC GhcRtsHcOpts += -fPIC - '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' + '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' EXTRA_CC_OPTS += -std=gnu99 ''; # Splicer will pull out correct variations - libDeps = platform: stdenv.lib.optional enableTerminfo ncurses + libDeps = platform: lib.optional enableTerminfo ncurses ++ [libffi] - ++ stdenv.lib.optional (!enableIntegerSimple) gmp - ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; + ++ lib.optional (!enableIntegerSimple) gmp + ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; toolsForTarget = [ pkgsBuildTarget.targetPackages.stdenv.cc - ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm; + ] ++ lib.optional useLLVM buildLlvmPackages.llvm; targetCC = builtins.head toolsForTarget; @@ -110,7 +110,7 @@ stdenv.mkDerivation (rec { # https://gitlab.haskell.org/ghc/ghc/-/issues/18549 patches = [ ./issue-18549.patch - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ # Make Block.h compile with c++ compilers. Remove with the next release (fetchpatch { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/97d0b0a367e4c6a52a17c3299439ac7de129da24.patch"; @@ -130,7 +130,7 @@ stdenv.mkDerivation (rec { export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString useLdGold ".gold"}" + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}" export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" @@ -140,13 +140,13 @@ stdenv.mkDerivation (rec { echo -n "${buildMK}" > mk/build.mk sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.isDarwin) '' export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' export NIX_LDFLAGS+=" -no_dtrace_dof" - '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' + '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets - '' + stdenv.lib.optionalString targetPlatform.isMusl '' + '' + lib.optionalString targetPlatform.isMusl '' echo "patching llvm-targets for musl targets..." echo "Cloning these existing '*-linux-gnu*' targets:" grep linux-gnu llvm-targets | sed 's/^/ /' @@ -166,29 +166,29 @@ stdenv.mkDerivation (rec { # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = [ "build" "host" ] - ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + ++ lib.optional (targetPlatform != hostPlatform) "target"; # `--with` flags for libraries needed for RTS linker configureFlags = [ "--datadir=$doc/share/doc/ghc" "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" - ] ++ stdenv.lib.optionals (libffi != null) [ + ] ++ lib.optionals (libffi != null) [ "--with-system-libffi" "--with-ffi-includes=${targetPackages.libffi.dev}/include" "--with-ffi-libraries=${targetPackages.libffi.out}/lib" - ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [ + ] ++ lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [ "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib" - ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ + ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" - ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ + ] ++ lib.optionals (targetPlatform != hostPlatform) [ "--enable-bootstrap-with-devel-snapshot" - ] ++ stdenv.lib.optionals useLdGold [ + ] ++ lib.optionals useLdGold [ "CFLAGS=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" - ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [ + ] ++ lib.optionals (disableLargeAddressSpace) [ "--disable-large-address-space" ]; @@ -209,18 +209,18 @@ stdenv.mkDerivation (rec { buildInputs = [ perl bash ] ++ (libDeps hostPlatform); propagatedBuildInputs = [ targetPackages.stdenv.cc ] - ++ stdenv.lib.optional useLLVM llvmPackages.llvm; + ++ lib.optional useLLVM llvmPackages.llvm; - depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform); - depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform); + depsTargetTarget = map lib.getDev (libDeps targetPlatform); + depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform); # required, because otherwise all symbols from HSffi.o are stripped, and # that in turn causes GHCi to abort - stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; + stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; checkTarget = "test"; - hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie"; + hardeningDisable = [ "format" ] ++ lib.optional stdenv.targetPlatform.isMusl "pie"; postInstall = '' # Install the bash completion file. @@ -230,7 +230,7 @@ stdenv.mkDerivation (rec { for i in "$out/bin/"*; do test ! -h $i || continue egrep --quiet '^#!' <(head -n 1 $i) || continue - sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i + sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i done ''; @@ -247,12 +247,12 @@ stdenv.mkDerivation (rec { meta = { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; - maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; + maintainers = with lib.maintainers; [ marcweber andres peti ]; timeout = 24 * 3600; inherit (ghc.meta) license platforms; }; -} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt { +} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt { dontStrip = true; dontPatchELF = true; noAuditTmpdir = true; diff --git a/pkgs/development/compilers/ghc/8.10.3.nix b/pkgs/development/compilers/ghc/8.10.3.nix index c24b72fb43b..582817cca07 100644 --- a/pkgs/development/compilers/ghc/8.10.3.nix +++ b/pkgs/development/compilers/ghc/8.10.3.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgsBuildTarget, targetPackages +{ lib, stdenv, pkgsBuildTarget, targetPackages # build-tools , bootPkgs @@ -18,7 +18,7 @@ , # If enabled, GHC will be built with the GPL-free but slower integer-simple # library instead of the faster but GPLed integer-gmp library. - enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp + enableIntegerSimple ? !(lib.any (lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp , # If enabled, use -fPIC when compiling static libs. enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform @@ -35,7 +35,7 @@ , # What flavour to build. An empty string indicates no # specific flavour and falls back to ghc default values. - ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) + ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) (if useLLVM then "perf-cross" else "perf-cross-ncg") , # Whether to disable the large address space allocator @@ -51,7 +51,7 @@ let inherit (bootPkgs) ghc; # TODO(@Ericson2314) Make unconditional - targetPrefix = stdenv.lib.optionalString + targetPrefix = lib.optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-"; @@ -62,30 +62,30 @@ let endif DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} - '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' + '' + lib.optionalString (targetPlatform != hostPlatform) '' Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} CrossCompilePrefix = ${targetPrefix} HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO BUILD_SPHINX_PDF = NO - '' + stdenv.lib.optionalString (!enableProfiledLibs) '' + '' + lib.optionalString (!enableProfiledLibs) '' GhcLibWays = "v dyn" - '' + stdenv.lib.optionalString enableRelocatedStaticLibs '' + '' + lib.optionalString enableRelocatedStaticLibs '' GhcLibHcOpts += -fPIC GhcRtsHcOpts += -fPIC - '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' + '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' EXTRA_CC_OPTS += -std=gnu99 ''; # Splicer will pull out correct variations - libDeps = platform: stdenv.lib.optional enableTerminfo ncurses + libDeps = platform: lib.optional enableTerminfo ncurses ++ [libffi] - ++ stdenv.lib.optional (!enableIntegerSimple) gmp - ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; + ++ lib.optional (!enableIntegerSimple) gmp + ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; toolsForTarget = [ pkgsBuildTarget.targetPackages.stdenv.cc - ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm; + ] ++ lib.optional useLLVM buildLlvmPackages.llvm; targetCC = builtins.head toolsForTarget; @@ -107,7 +107,7 @@ stdenv.mkDerivation (rec { outputs = [ "out" "doc" ]; - patches = stdenv.lib.optionals stdenv.isDarwin [ + patches = lib.optionals stdenv.isDarwin [ # Make Block.h compile with c++ compilers. Remove with the next release (fetchpatch { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/97d0b0a367e4c6a52a17c3299439ac7de129da24.patch"; @@ -127,7 +127,7 @@ stdenv.mkDerivation (rec { export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString useLdGold ".gold"}" + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}" export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" @@ -137,13 +137,13 @@ stdenv.mkDerivation (rec { echo -n "${buildMK}" > mk/build.mk sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.isDarwin) '' export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' export NIX_LDFLAGS+=" -no_dtrace_dof" - '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' + '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets - '' + stdenv.lib.optionalString targetPlatform.isMusl '' + '' + lib.optionalString targetPlatform.isMusl '' echo "patching llvm-targets for musl targets..." echo "Cloning these existing '*-linux-gnu*' targets:" grep linux-gnu llvm-targets | sed 's/^/ /' @@ -163,29 +163,29 @@ stdenv.mkDerivation (rec { # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = [ "build" "host" ] - ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + ++ lib.optional (targetPlatform != hostPlatform) "target"; # `--with` flags for libraries needed for RTS linker configureFlags = [ "--datadir=$doc/share/doc/ghc" "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" - ] ++ stdenv.lib.optionals (libffi != null) [ + ] ++ lib.optionals (libffi != null) [ "--with-system-libffi" "--with-ffi-includes=${targetPackages.libffi.dev}/include" "--with-ffi-libraries=${targetPackages.libffi.out}/lib" - ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [ + ] ++ lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [ "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib" - ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ + ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" - ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ + ] ++ lib.optionals (targetPlatform != hostPlatform) [ "--enable-bootstrap-with-devel-snapshot" - ] ++ stdenv.lib.optionals useLdGold [ + ] ++ lib.optionals useLdGold [ "CFLAGS=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" - ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [ + ] ++ lib.optionals (disableLargeAddressSpace) [ "--disable-large-address-space" ]; @@ -206,18 +206,18 @@ stdenv.mkDerivation (rec { buildInputs = [ perl bash ] ++ (libDeps hostPlatform); propagatedBuildInputs = [ targetPackages.stdenv.cc ] - ++ stdenv.lib.optional useLLVM llvmPackages.llvm; + ++ lib.optional useLLVM llvmPackages.llvm; - depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform); - depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform); + depsTargetTarget = map lib.getDev (libDeps targetPlatform); + depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform); # required, because otherwise all symbols from HSffi.o are stripped, and # that in turn causes GHCi to abort - stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; + stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; checkTarget = "test"; - hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie"; + hardeningDisable = [ "format" ] ++ lib.optional stdenv.targetPlatform.isMusl "pie"; postInstall = '' # Install the bash completion file. @@ -227,7 +227,7 @@ stdenv.mkDerivation (rec { for i in "$out/bin/"*; do test ! -h $i || continue egrep --quiet '^#!' <(head -n 1 $i) || continue - sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i + sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i done ''; @@ -244,12 +244,12 @@ stdenv.mkDerivation (rec { meta = { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; - maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; + maintainers = with lib.maintainers; [ marcweber andres peti ]; timeout = 24 * 3600; inherit (ghc.meta) license platforms; }; -} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt { +} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt { dontStrip = true; dontPatchELF = true; noAuditTmpdir = true; diff --git a/pkgs/development/compilers/ghc/8.2.2-binary.nix b/pkgs/development/compilers/ghc/8.2.2-binary.nix index 9f546bcb541..5f83c2b2afc 100644 --- a/pkgs/development/compilers/ghc/8.2.2-binary.nix +++ b/pkgs/development/compilers/ghc/8.2.2-binary.nix @@ -1,4 +1,4 @@ -{ stdenv, substituteAll +{ lib, stdenv, substituteAll , fetchurl, perl, gcc, llvm , ncurses5, gmp, glibc, libiconv , llvmPackages @@ -10,11 +10,11 @@ assert stdenv.targetPlatform == stdenv.hostPlatform; let useLLVM = !stdenv.targetPlatform.isx86; - libPath = stdenv.lib.makeLibraryPath ([ + libPath = lib.makeLibraryPath ([ ncurses5 gmp - ] ++ stdenv.lib.optional (stdenv.hostPlatform.isDarwin) libiconv); + ] ++ lib.optional (stdenv.hostPlatform.isDarwin) libiconv); - libEnvVar = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin "DY" + libEnvVar = lib.optionalString stdenv.hostPlatform.isDarwin "DY" + "LD_LIBRARY_PATH"; glibcDynLinker = assert stdenv.isLinux; @@ -22,7 +22,7 @@ let # Could be stdenv.cc.bintools.dynamicLinker, keeping as-is to avoid rebuild. ''"$(cat $NIX_CC/nix-support/dynamic-linker)"'' else - "${stdenv.lib.getLib glibc}/lib/ld-linux*"; + "${lib.getLib glibc}/lib/ld-linux*"; in @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { or (throw "cannot bootstrap GHC on this platform")); nativeBuildInputs = [ perl ]; - propagatedBuildInputs = stdenv.lib.optionals useLLVM [ llvmPackages.llvm ]; + propagatedBuildInputs = lib.optionals useLLVM [ llvmPackages.llvm ]; # Cannot patchelf beforehand due to relative RPATHs that anticipate # the final install location/ @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { postUnpack = # GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib # during linking - stdenv.lib.optionalString stdenv.isDarwin '' + lib.optionalString stdenv.isDarwin '' export NIX_LDFLAGS+=" -no_dtrace_dof" # not enough room in the object files for the full path to libiconv :( for exe in $(find . -type f -executable); do @@ -97,14 +97,14 @@ stdenv.mkDerivation rec { '' find . -name integer-gmp.buildinfo \ -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp.out}/lib@" {} \; - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' find . -name base.buildinfo \ -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${libiconv}/lib@" {} \; '' + # Rename needed libraries and binaries, fix interpreter - stdenv.lib.optionalString stdenv.isLinux '' + lib.optionalString stdenv.isLinux '' find . -type f -perm -0100 -exec patchelf \ - --replace-needed libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5 libncurses.so \ + --replace-needed libncurses${lib.optionalString stdenv.is64bit "w"}.so.5 libncurses.so \ --replace-needed libtinfo.so libtinfo.so.5 \ --interpreter ${glibcDynLinker} {} \; @@ -117,7 +117,7 @@ stdenv.mkDerivation rec { # (`__strdup` is defined to be an alias of `strdup` anyway[1]). # [1] http://refspecs.linuxbase.org/LSB_4.0.0/LSB-Core-generic/LSB-Core-generic/baselib---strdup-1.html # Use objcopy magic to make the change: - stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + lib.optionalString stdenv.hostPlatform.isMusl '' find ./ghc-${version}/rts -name "libHSrts*.a" -exec ''${OBJCOPY:-objcopy} --redefine-sym __strdup=strdup {} \; ''; @@ -130,10 +130,10 @@ stdenv.mkDerivation rec { src = ./gcc-clang-wrapper.sh; }; in - [ "--with-gmp-libraries=${stdenv.lib.getLib gmp}/lib" - "--with-gmp-includes=${stdenv.lib.getDev gmp}/include" - ] ++ stdenv.lib.optional stdenv.isDarwin "--with-gcc=${gcc-clang-wrapper}" - ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override"; + [ "--with-gmp-libraries=${lib.getLib gmp}/lib" + "--with-gmp-includes=${lib.getDev gmp}/include" + ] ++ lib.optional stdenv.isDarwin "--with-gcc=${gcc-clang-wrapper}" + ++ lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override"; # Stripping combined with patchelf breaks the executables (they die # with a segfault or the kernel even refuses the execve). (NIXPKGS-85) @@ -145,14 +145,14 @@ stdenv.mkDerivation rec { # On Linux, use patchelf to modify the executables so that they can # find editline/gmp. - preFixup = stdenv.lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString stdenv.isLinux '' for p in $(find "$out" -type f -executable); do if isELF "$p"; then echo "Patchelfing $p" patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p fi done - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' # not enough room in the object files for the full path to libiconv :( for exe in $(find "$out" -type f -executable); do isScript $exe && continue @@ -186,6 +186,6 @@ stdenv.mkDerivation rec { enableShared = true; }; - meta.license = stdenv.lib.licenses.bsd3; + meta.license = lib.licenses.bsd3; meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "armv7l-linux" "aarch64-linux"]; } diff --git a/pkgs/development/compilers/ghc/8.6.5-binary.nix b/pkgs/development/compilers/ghc/8.6.5-binary.nix index 9234e3b1457..ca984c36957 100644 --- a/pkgs/development/compilers/ghc/8.6.5-binary.nix +++ b/pkgs/development/compilers/ghc/8.6.5-binary.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl, perl, gcc , ncurses5, ncurses6, gmp, glibc, libiconv , llvmPackages @@ -14,11 +14,11 @@ let ourNcurses = if useNcurses6 then ncurses6 else ncurses5; - libPath = stdenv.lib.makeLibraryPath ([ + libPath = lib.makeLibraryPath ([ ourNcurses gmp - ] ++ stdenv.lib.optional (stdenv.hostPlatform.isDarwin) libiconv); + ] ++ lib.optional (stdenv.hostPlatform.isDarwin) libiconv); - libEnvVar = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin "DY" + libEnvVar = lib.optionalString stdenv.hostPlatform.isDarwin "DY" + "LD_LIBRARY_PATH"; glibcDynLinker = assert stdenv.isLinux; @@ -26,7 +26,7 @@ let # Could be stdenv.cc.bintools.dynamicLinker, keeping as-is to avoid rebuild. ''"$(cat $NIX_CC/nix-support/dynamic-linker)"'' else - "${stdenv.lib.getLib glibc}/lib/ld-linux*"; + "${lib.getLib glibc}/lib/ld-linux*"; in @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { or (throw "cannot bootstrap GHC on this platform")); nativeBuildInputs = [ perl ]; - propagatedBuildInputs = stdenv.lib.optionals useLLVM [ llvmPackages.llvm ]; + propagatedBuildInputs = lib.optionals useLLVM [ llvmPackages.llvm ]; # Cannot patchelf beforehand due to relative RPATHs that anticipate # the final install location/ @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { postUnpack = # GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib # during linking - stdenv.lib.optionalString stdenv.isDarwin '' + lib.optionalString stdenv.isDarwin '' export NIX_LDFLAGS+=" -no_dtrace_dof" # not enough room in the object files for the full path to libiconv :( for exe in $(find . -type f -executable); do @@ -90,17 +90,17 @@ stdenv.mkDerivation rec { '' find . -name integer-gmp.buildinfo \ -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp.out}/lib@" {} \; - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' find . -name base.buildinfo \ -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${libiconv}/lib@" {} \; '' + # Rename needed libraries and binaries, fix interpreter - stdenv.lib.optionalString stdenv.isLinux '' + lib.optionalString stdenv.isLinux '' find . -type f -perm -0100 \ -exec patchelf \ - --replace-needed libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5 libncurses.so \ + --replace-needed libncurses${lib.optionalString stdenv.is64bit "w"}.so.5 libncurses.so \ ${ # This isn't required for x86_64-linux where we use ncurses6 - stdenv.lib.optionalString (!useNcurses6) "--replace-needed libtinfo.so libtinfo.so.5" + lib.optionalString (!useNcurses6) "--replace-needed libtinfo.so libtinfo.so.5" } \ --interpreter ${glibcDynLinker} {} \; @@ -113,16 +113,16 @@ stdenv.mkDerivation rec { # (`__strdup` is defined to be an alias of `strdup` anyway[1]). # [1] http://refspecs.linuxbase.org/LSB_4.0.0/LSB-Core-generic/LSB-Core-generic/baselib---strdup-1.html # Use objcopy magic to make the change: - stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + lib.optionalString stdenv.hostPlatform.isMusl '' find ./ghc-${version}/rts -name "libHSrts*.a" -exec ''${OBJCOPY:-objcopy} --redefine-sym __strdup=strdup {} \; ''; configurePlatforms = [ ]; configureFlags = [ - "--with-gmp-libraries=${stdenv.lib.getLib gmp}/lib" - "--with-gmp-includes=${stdenv.lib.getDev gmp}/include" - ] ++ stdenv.lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}" - ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override"; + "--with-gmp-libraries=${lib.getLib gmp}/lib" + "--with-gmp-includes=${lib.getDev gmp}/include" + ] ++ lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}" + ++ lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override"; # No building is necessary, but calling make without flags ironically # calls install-strip ... @@ -130,14 +130,14 @@ stdenv.mkDerivation rec { # On Linux, use patchelf to modify the executables so that they can # find editline/gmp. - postFixup = stdenv.lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.isLinux '' for p in $(find "$out" -type f -executable); do if isELF "$p"; then echo "Patchelfing $p" patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p fi done - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' # not enough room in the object files for the full path to libiconv :( for exe in $(find "$out" -type f -executable); do isScript $exe && continue @@ -171,6 +171,6 @@ stdenv.mkDerivation rec { enableShared = true; }; - meta.license = stdenv.lib.licenses.bsd3; + meta.license = lib.licenses.bsd3; meta.platforms = ["x86_64-linux" "aarch64-linux" "i686-linux" "x86_64-darwin"]; } diff --git a/pkgs/development/compilers/ghc/8.6.5.nix b/pkgs/development/compilers/ghc/8.6.5.nix index 7adacff597c..219ace5a916 100644 --- a/pkgs/development/compilers/ghc/8.6.5.nix +++ b/pkgs/development/compilers/ghc/8.6.5.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgsBuildTarget, targetPackages +{ lib, stdenv, pkgsBuildTarget, targetPackages # build-tools , bootPkgs @@ -18,7 +18,7 @@ , # If enabled, GHC will be built with the GPL-free but slower integer-simple # library instead of the faster but GPLed integer-gmp library. - enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp + enableIntegerSimple ? !(lib.any (lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp , # If enabled, use -fPIC when compiling static libs. enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform @@ -32,7 +32,7 @@ , # What flavour to build. An empty string indicates no # specific flavour and falls back to ghc default values. - ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) + ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) (if useLLVM then "perf-cross" else "perf-cross-ncg") , # Whether to disable the large address space allocator @@ -48,7 +48,7 @@ let inherit (bootPkgs) ghc; # TODO(@Ericson2314) Make unconditional - targetPrefix = stdenv.lib.optionalString + targetPrefix = lib.optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-"; @@ -66,28 +66,28 @@ let # to actually link to our new Libc. The iOS simulator is a special # exception because we can’t actually run simulators binaries # ourselves. - + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' + + lib.optionalString (targetPlatform != hostPlatform) '' Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"} CrossCompilePrefix = ${targetPrefix} HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO BUILD_SPHINX_PDF = NO - '' + stdenv.lib.optionalString enableRelocatedStaticLibs '' + '' + lib.optionalString enableRelocatedStaticLibs '' GhcLibHcOpts += -fPIC GhcRtsHcOpts += -fPIC - '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' + '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' EXTRA_CC_OPTS += -std=gnu99 ''; # Splicer will pull out correct variations - libDeps = platform: stdenv.lib.optional enableTerminfo ncurses + libDeps = platform: lib.optional enableTerminfo ncurses ++ [libffi] - ++ stdenv.lib.optional (!enableIntegerSimple) gmp - ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; + ++ lib.optional (!enableIntegerSimple) gmp + ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; toolsForTarget = [ pkgsBuildTarget.targetPackages.stdenv.cc - ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm; + ] ++ lib.optional useLLVM buildLlvmPackages.llvm; targetCC = builtins.head toolsForTarget; @@ -136,7 +136,7 @@ stdenv.mkDerivation (rec { export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString useLdGold ".gold"}" + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}" export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" @@ -146,13 +146,13 @@ stdenv.mkDerivation (rec { echo -n "${buildMK}" > mk/build.mk sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.isDarwin) '' export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' export NIX_LDFLAGS+=" -no_dtrace_dof" - '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' + '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets - '' + stdenv.lib.optionalString targetPlatform.isMusl '' + '' + lib.optionalString targetPlatform.isMusl '' echo "patching llvm-targets for musl targets..." echo "Cloning these existing '*-linux-gnu*' targets:" grep linux-gnu llvm-targets | sed 's/^/ /' @@ -172,23 +172,23 @@ stdenv.mkDerivation (rec { # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = [ "build" "host" ] - ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + ++ lib.optional (targetPlatform != hostPlatform) "target"; # `--with` flags for libraries needed for RTS linker configureFlags = [ "--datadir=$doc/share/doc/ghc" "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" - ] ++ stdenv.lib.optionals (libffi != null) ["--with-system-libffi" "--with-ffi-includes=${targetPackages.libffi.dev}/include" "--with-ffi-libraries=${targetPackages.libffi.out}/lib" - ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [ + ] ++ lib.optionals (libffi != null) ["--with-system-libffi" "--with-ffi-includes=${targetPackages.libffi.dev}/include" "--with-ffi-libraries=${targetPackages.libffi.out}/lib" + ] ++ lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [ "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib" - ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ + ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" - ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ + ] ++ lib.optionals (targetPlatform != hostPlatform) [ "--enable-bootstrap-with-devel-snapshot" - ] ++ stdenv.lib.optionals useLdGold [ + ] ++ lib.optionals useLdGold [ "CFLAGS=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" - ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [ + ] ++ lib.optionals (disableLargeAddressSpace) [ "--disable-large-address-space" ]; @@ -209,14 +209,14 @@ stdenv.mkDerivation (rec { buildInputs = [ perl bash ] ++ (libDeps hostPlatform); propagatedBuildInputs = [ targetPackages.stdenv.cc ] - ++ stdenv.lib.optional useLLVM llvmPackages.llvm; + ++ lib.optional useLLVM llvmPackages.llvm; - depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform); - depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform); + depsTargetTarget = map lib.getDev (libDeps targetPlatform); + depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform); # required, because otherwise all symbols from HSffi.o are stripped, and # that in turn causes GHCi to abort - stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; + stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; # See #63511 - the only unstripped file is the debug rts which isn't meant to # be stripped. @@ -224,7 +224,7 @@ stdenv.mkDerivation (rec { checkTarget = "test"; - hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie"; + hardeningDisable = [ "format" ] ++ lib.optional stdenv.targetPlatform.isMusl "pie"; postInstall = '' # Install the bash completion file. @@ -234,11 +234,11 @@ stdenv.mkDerivation (rec { for i in "$out/bin/"*; do test ! -h $i || continue egrep --quiet '^#!' <(head -n 1 $i) || continue - sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i + sed -i -e '2i export PATH="$PATH:${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 '' + + lib.optionalString hostPlatform.isAarch64 '' rm -rf "$doc/share/doc/ghc/html/libraries" ''; @@ -255,12 +255,12 @@ stdenv.mkDerivation (rec { meta = { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; - maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; + maintainers = with lib.maintainers; [ marcweber andres peti ]; timeout = 24 * 3600; inherit (ghc.meta) license platforms; }; -} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt { +} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt { dontStrip = true; dontPatchELF = true; noAuditTmpdir = true; diff --git a/pkgs/development/compilers/ghc/8.8.2.nix b/pkgs/development/compilers/ghc/8.8.2.nix index fbb75637df6..94553e56a81 100644 --- a/pkgs/development/compilers/ghc/8.8.2.nix +++ b/pkgs/development/compilers/ghc/8.8.2.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgsBuildTarget, targetPackages +{ lib, stdenv, pkgsBuildTarget, targetPackages # build-tools , bootPkgs @@ -18,7 +18,7 @@ , # If enabled, GHC will be built with the GPL-free but slower integer-simple # library instead of the faster but GPLed integer-gmp library. - enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp + enableIntegerSimple ? !(lib.any (lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp , # If enabled, use -fPIC when compiling static libs. enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform @@ -32,7 +32,7 @@ , # What flavour to build. An empty string indicates no # specific flavour and falls back to ghc default values. - ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) + ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) (if useLLVM then "perf-cross" else "perf-cross-ncg") , # Whether to disable the large address space allocator @@ -48,7 +48,7 @@ let inherit (bootPkgs) ghc; # TODO(@Ericson2314) Make unconditional - targetPrefix = stdenv.lib.optionalString + targetPrefix = lib.optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-"; @@ -66,30 +66,30 @@ let # to actually link to our new Libc. The iOS simulator is a special # exception because we can’t actually run simulators binaries # ourselves. - + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' + + lib.optionalString (targetPlatform != hostPlatform) '' Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"} CrossCompilePrefix = ${targetPrefix} HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO BUILD_SPHINX_PDF = NO - '' + stdenv.lib.optionalString dontStrip '' + '' + lib.optionalString dontStrip '' STRIP_CMD = : - '' + stdenv.lib.optionalString enableRelocatedStaticLibs '' + '' + lib.optionalString enableRelocatedStaticLibs '' GhcLibHcOpts += -fPIC GhcRtsHcOpts += -fPIC - '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' + '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' EXTRA_CC_OPTS += -std=gnu99 ''; # Splicer will pull out correct variations - libDeps = platform: stdenv.lib.optional enableTerminfo ncurses + libDeps = platform: lib.optional enableTerminfo ncurses ++ [libffi] - ++ stdenv.lib.optional (!enableIntegerSimple) gmp - ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; + ++ lib.optional (!enableIntegerSimple) gmp + ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; toolsForTarget = [ pkgsBuildTarget.targetPackages.stdenv.cc - ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm; + ] ++ lib.optional useLLVM buildLlvmPackages.llvm; targetCC = builtins.head toolsForTarget; @@ -123,7 +123,7 @@ stdenv.mkDerivation (rec { export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString useLdGold ".gold"}" + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}" export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" @@ -133,13 +133,13 @@ stdenv.mkDerivation (rec { echo -n "${buildMK dontStrip}" > mk/build.mk sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.isDarwin) '' export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' export NIX_LDFLAGS+=" -no_dtrace_dof" - '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' + '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets - '' + stdenv.lib.optionalString targetPlatform.isMusl '' + '' + lib.optionalString targetPlatform.isMusl '' echo "patching llvm-targets for musl targets..." echo "Cloning these existing '*-linux-gnu*' targets:" grep linux-gnu llvm-targets | sed 's/^/ /' @@ -159,29 +159,29 @@ stdenv.mkDerivation (rec { # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = [ "build" "host" ] - ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + ++ lib.optional (targetPlatform != hostPlatform) "target"; # `--with` flags for libraries needed for RTS linker configureFlags = [ "--datadir=$doc/share/doc/ghc" "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" - ] ++ stdenv.lib.optionals (libffi != null) [ + ] ++ lib.optionals (libffi != null) [ "--with-system-libffi" "--with-ffi-includes=${targetPackages.libffi.dev}/include" "--with-ffi-libraries=${targetPackages.libffi.out}/lib" - ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [ + ] ++ lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [ "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib" - ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ + ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" - ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ + ] ++ lib.optionals (targetPlatform != hostPlatform) [ "--enable-bootstrap-with-devel-snapshot" - ] ++ stdenv.lib.optionals useLdGold [ + ] ++ lib.optionals useLdGold [ "CFLAGS=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" - ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [ + ] ++ lib.optionals (disableLargeAddressSpace) [ "--disable-large-address-space" ]; @@ -189,7 +189,7 @@ stdenv.mkDerivation (rec { strictDeps = true; # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. - dontAddExtraLibs = true; + dontAddExtraLibs = true; nativeBuildInputs = [ perl autoconf automake m4 python3 sphinx @@ -202,18 +202,18 @@ stdenv.mkDerivation (rec { buildInputs = [ perl bash ] ++ (libDeps hostPlatform); propagatedBuildInputs = [ targetPackages.stdenv.cc ] - ++ stdenv.lib.optional useLLVM llvmPackages.llvm; + ++ lib.optional useLLVM llvmPackages.llvm; - depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform); - depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform); + depsTargetTarget = map lib.getDev (libDeps targetPlatform); + depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform); # required, because otherwise all symbols from HSffi.o are stripped, and # that in turn causes GHCi to abort - stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; + stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; checkTarget = "test"; - hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie"; + hardeningDisable = [ "format" ] ++ lib.optional stdenv.targetPlatform.isMusl "pie"; postInstall = '' # Install the bash completion file. @@ -223,7 +223,7 @@ stdenv.mkDerivation (rec { for i in "$out/bin/"*; do test ! -h $i || continue egrep --quiet '^#!' <(head -n 1 $i) || continue - sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i + sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i done ''; @@ -240,14 +240,14 @@ stdenv.mkDerivation (rec { meta = { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; - maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; + maintainers = with lib.maintainers; [ marcweber andres peti ]; timeout = 24 * 3600; inherit (ghc.meta) license platforms; }; dontStrip = (targetPlatform.useAndroidPrebuilt || targetPlatform.isWasm); -} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt{ +} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt{ dontPatchELF = true; noAuditTmpdir = true; }) diff --git a/pkgs/development/compilers/ghc/8.8.3.nix b/pkgs/development/compilers/ghc/8.8.3.nix index 538655a0d05..ca4dc35ccdc 100644 --- a/pkgs/development/compilers/ghc/8.8.3.nix +++ b/pkgs/development/compilers/ghc/8.8.3.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgsBuildTarget, targetPackages +{ lib, stdenv, pkgsBuildTarget, targetPackages # build-tools , bootPkgs @@ -18,7 +18,7 @@ , # If enabled, GHC will be built with the GPL-free but slower integer-simple # library instead of the faster but GPLed integer-gmp library. - enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp + enableIntegerSimple ? !(lib.any (lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp , # If enabled, use -fPIC when compiling static libs. enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform @@ -35,7 +35,7 @@ , # What flavour to build. An empty string indicates no # specific flavour and falls back to ghc default values. - ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) + ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) (if useLLVM then "perf-cross" else "perf-cross-ncg") , # Whether to disable the large address space allocator @@ -51,7 +51,7 @@ let inherit (bootPkgs) ghc; # TODO(@Ericson2314) Make unconditional - targetPrefix = stdenv.lib.optionalString + targetPrefix = lib.optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-"; @@ -69,32 +69,32 @@ let # to actually link to our new Libc. The iOS simulator is a special # exception because we can’t actually run simulators binaries # ourselves. - + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' + + lib.optionalString (targetPlatform != hostPlatform) '' Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"} CrossCompilePrefix = ${targetPrefix} HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO BUILD_SPHINX_PDF = NO - '' + stdenv.lib.optionalString dontStrip '' + '' + lib.optionalString dontStrip '' STRIP_CMD = : - '' + stdenv.lib.optionalString (!enableProfiledLibs) '' + '' + lib.optionalString (!enableProfiledLibs) '' GhcLibWays = "v dyn" - '' + stdenv.lib.optionalString enableRelocatedStaticLibs '' + '' + lib.optionalString enableRelocatedStaticLibs '' GhcLibHcOpts += -fPIC GhcRtsHcOpts += -fPIC - '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' + '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' EXTRA_CC_OPTS += -std=gnu99 ''; # Splicer will pull out correct variations - libDeps = platform: stdenv.lib.optional enableTerminfo ncurses + libDeps = platform: lib.optional enableTerminfo ncurses ++ [libffi] - ++ stdenv.lib.optional (!enableIntegerSimple) gmp - ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; + ++ lib.optional (!enableIntegerSimple) gmp + ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; toolsForTarget = [ pkgsBuildTarget.targetPackages.stdenv.cc - ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm; + ] ++ lib.optional useLLVM buildLlvmPackages.llvm; targetCC = builtins.head toolsForTarget; @@ -128,7 +128,7 @@ stdenv.mkDerivation (rec { export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString useLdGold ".gold"}" + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}" export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" @@ -138,13 +138,13 @@ stdenv.mkDerivation (rec { echo -n "${buildMK dontStrip}" > mk/build.mk sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.isDarwin) '' export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' export NIX_LDFLAGS+=" -no_dtrace_dof" - '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' + '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets - '' + stdenv.lib.optionalString targetPlatform.isMusl '' + '' + lib.optionalString targetPlatform.isMusl '' echo "patching llvm-targets for musl targets..." echo "Cloning these existing '*-linux-gnu*' targets:" grep linux-gnu llvm-targets | sed 's/^/ /' @@ -164,29 +164,29 @@ stdenv.mkDerivation (rec { # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = [ "build" "host" ] - ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + ++ lib.optional (targetPlatform != hostPlatform) "target"; # `--with` flags for libraries needed for RTS linker configureFlags = [ "--datadir=$doc/share/doc/ghc" "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" - ] ++ stdenv.lib.optionals (libffi != null) [ + ] ++ lib.optionals (libffi != null) [ "--with-system-libffi" "--with-ffi-includes=${targetPackages.libffi.dev}/include" "--with-ffi-libraries=${targetPackages.libffi.out}/lib" - ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [ + ] ++ lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [ "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib" - ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ + ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" - ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ + ] ++ lib.optionals (targetPlatform != hostPlatform) [ "--enable-bootstrap-with-devel-snapshot" - ] ++ stdenv.lib.optionals useLdGold [ + ] ++ lib.optionals useLdGold [ "CFLAGS=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" - ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [ + ] ++ lib.optionals (disableLargeAddressSpace) [ "--disable-large-address-space" ]; @@ -194,7 +194,7 @@ stdenv.mkDerivation (rec { strictDeps = true; # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. - dontAddExtraLibs = true; + dontAddExtraLibs = true; nativeBuildInputs = [ perl autoconf automake m4 python3 sphinx @@ -207,18 +207,18 @@ stdenv.mkDerivation (rec { buildInputs = [ perl bash ] ++ (libDeps hostPlatform); propagatedBuildInputs = [ targetPackages.stdenv.cc ] - ++ stdenv.lib.optional useLLVM llvmPackages.llvm; + ++ lib.optional useLLVM llvmPackages.llvm; - depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform); - depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform); + depsTargetTarget = map lib.getDev (libDeps targetPlatform); + depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform); # required, because otherwise all symbols from HSffi.o are stripped, and # that in turn causes GHCi to abort - stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; + stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; checkTarget = "test"; - hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie"; + hardeningDisable = [ "format" ] ++ lib.optional stdenv.targetPlatform.isMusl "pie"; postInstall = '' # Install the bash completion file. @@ -228,7 +228,7 @@ stdenv.mkDerivation (rec { for i in "$out/bin/"*; do test ! -h $i || continue egrep --quiet '^#!' <(head -n 1 $i) || continue - sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i + sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i done ''; @@ -245,14 +245,14 @@ stdenv.mkDerivation (rec { meta = { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; - maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; + maintainers = with lib.maintainers; [ marcweber andres peti ]; timeout = 24 * 3600; inherit (ghc.meta) license platforms; }; dontStrip = (targetPlatform.useAndroidPrebuilt || targetPlatform.isWasm); -} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt{ +} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt{ dontPatchELF = true; noAuditTmpdir = true; }) diff --git a/pkgs/development/compilers/ghc/8.8.4.nix b/pkgs/development/compilers/ghc/8.8.4.nix index e69766bccda..ab5f2c12e23 100644 --- a/pkgs/development/compilers/ghc/8.8.4.nix +++ b/pkgs/development/compilers/ghc/8.8.4.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgsBuildTarget, targetPackages +{ lib, stdenv, pkgsBuildTarget, targetPackages # build-tools , bootPkgs @@ -18,7 +18,7 @@ , # If enabled, GHC will be built with the GPL-free but slower integer-simple # library instead of the faster but GPLed integer-gmp library. - enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp + enableIntegerSimple ? !(lib.any (lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp , # If enabled, use -fPIC when compiling static libs. enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform @@ -35,7 +35,7 @@ , # What flavour to build. An empty string indicates no # specific flavour and falls back to ghc default values. - ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) + ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) (if useLLVM then "perf-cross" else "perf-cross-ncg") , # Whether to disable the large address space allocator @@ -51,7 +51,7 @@ let inherit (bootPkgs) ghc; # TODO(@Ericson2314) Make unconditional - targetPrefix = stdenv.lib.optionalString + targetPrefix = lib.optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-"; @@ -69,32 +69,32 @@ let # to actually link to our new Libc. The iOS simulator is a special # exception because we can’t actually run simulators binaries # ourselves. - + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' + + lib.optionalString (targetPlatform != hostPlatform) '' Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"} CrossCompilePrefix = ${targetPrefix} HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO BUILD_SPHINX_PDF = NO - '' + stdenv.lib.optionalString dontStrip '' + '' + lib.optionalString dontStrip '' STRIP_CMD = : - '' + stdenv.lib.optionalString (!enableProfiledLibs) '' + '' + lib.optionalString (!enableProfiledLibs) '' GhcLibWays = "v dyn" - '' + stdenv.lib.optionalString enableRelocatedStaticLibs '' + '' + lib.optionalString enableRelocatedStaticLibs '' GhcLibHcOpts += -fPIC GhcRtsHcOpts += -fPIC - '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' + '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' EXTRA_CC_OPTS += -std=gnu99 ''; # Splicer will pull out correct variations - libDeps = platform: stdenv.lib.optional enableTerminfo ncurses + libDeps = platform: lib.optional enableTerminfo ncurses ++ [libffi] - ++ stdenv.lib.optional (!enableIntegerSimple) gmp - ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; + ++ lib.optional (!enableIntegerSimple) gmp + ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; toolsForTarget = [ pkgsBuildTarget.targetPackages.stdenv.cc - ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm; + ] ++ lib.optional useLLVM buildLlvmPackages.llvm; targetCC = builtins.head toolsForTarget; @@ -119,7 +119,7 @@ stdenv.mkDerivation (rec { postPatch = "patchShebangs ."; # GHC is a bit confused on its cross terminology. - preConfigure = stdenv.lib.optionalString stdenv.isAarch64 '' + preConfigure = lib.optionalString stdenv.isAarch64 '' # Aarch64 allow backward bootstrapping since earlier versions are unstable. find . -name \*\.cabal\* -exec sed -i -e 's/\(base.*\)4.14/\14.16/' {} \; \ -exec sed -i -e 's/\(prim.*\)0.6/\10.8/' {} \; @@ -132,7 +132,7 @@ stdenv.mkDerivation (rec { export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString useLdGold ".gold"}" + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}" export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" @@ -142,13 +142,13 @@ stdenv.mkDerivation (rec { echo -n "${buildMK dontStrip}" > mk/build.mk sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.isDarwin) '' export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' export NIX_LDFLAGS+=" -no_dtrace_dof" - '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' + '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets - '' + stdenv.lib.optionalString targetPlatform.isMusl '' + '' + lib.optionalString targetPlatform.isMusl '' echo "patching llvm-targets for musl targets..." echo "Cloning these existing '*-linux-gnu*' targets:" grep linux-gnu llvm-targets | sed 's/^/ /' @@ -168,29 +168,29 @@ stdenv.mkDerivation (rec { # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = [ "build" "host" ] - ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + ++ lib.optional (targetPlatform != hostPlatform) "target"; # `--with` flags for libraries needed for RTS linker configureFlags = [ "--datadir=$doc/share/doc/ghc" "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" - ] ++ stdenv.lib.optionals (libffi != null) [ + ] ++ lib.optionals (libffi != null) [ "--with-system-libffi" "--with-ffi-includes=${targetPackages.libffi.dev}/include" "--with-ffi-libraries=${targetPackages.libffi.out}/lib" - ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [ + ] ++ lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [ "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib" - ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ + ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" - ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ + ] ++ lib.optionals (targetPlatform != hostPlatform) [ "--enable-bootstrap-with-devel-snapshot" - ] ++ stdenv.lib.optionals useLdGold [ + ] ++ lib.optionals useLdGold [ "CFLAGS=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" - ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [ + ] ++ lib.optionals (disableLargeAddressSpace) [ "--disable-large-address-space" ]; @@ -198,7 +198,7 @@ stdenv.mkDerivation (rec { strictDeps = true; # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. - dontAddExtraLibs = true; + dontAddExtraLibs = true; nativeBuildInputs = [ perl autoconf automake m4 python3 sphinx @@ -211,18 +211,18 @@ stdenv.mkDerivation (rec { buildInputs = [ perl bash ] ++ (libDeps hostPlatform); propagatedBuildInputs = [ targetPackages.stdenv.cc ] - ++ stdenv.lib.optional useLLVM llvmPackages.llvm; + ++ lib.optional useLLVM llvmPackages.llvm; - depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform); - depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform); + depsTargetTarget = map lib.getDev (libDeps targetPlatform); + depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform); # required, because otherwise all symbols from HSffi.o are stripped, and # that in turn causes GHCi to abort - stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; + stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; checkTarget = "test"; - hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie"; + hardeningDisable = [ "format" ] ++ lib.optional stdenv.targetPlatform.isMusl "pie"; postInstall = '' # Install the bash completion file. @@ -232,7 +232,7 @@ stdenv.mkDerivation (rec { for i in "$out/bin/"*; do test ! -h $i || continue egrep --quiet '^#!' <(head -n 1 $i) || continue - sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i + sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i done ''; @@ -249,14 +249,14 @@ stdenv.mkDerivation (rec { meta = { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; - maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; + maintainers = with lib.maintainers; [ marcweber andres peti ]; timeout = 24 * 3600; inherit (ghc.meta) license platforms; }; dontStrip = (targetPlatform.useAndroidPrebuilt || targetPlatform.isWasm); -} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt{ +} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt{ dontPatchELF = true; noAuditTmpdir = true; }) diff --git a/pkgs/development/compilers/ghc/9.0.1.nix b/pkgs/development/compilers/ghc/9.0.1.nix index d86cce9849c..39abe9c760e 100644 --- a/pkgs/development/compilers/ghc/9.0.1.nix +++ b/pkgs/development/compilers/ghc/9.0.1.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgsBuildTarget, targetPackages +{ lib, stdenv, pkgsBuildTarget, targetPackages # build-tools , bootPkgs @@ -19,7 +19,7 @@ , # If enabled, GHC will be built with the GPL-free but slower integer-simple # library instead of the faster but GPLed integer-gmp library. - enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp + enableIntegerSimple ? !(lib.any (lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp , # If enabled, use -fPIC when compiling static libs. enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform @@ -36,7 +36,7 @@ , # What flavour to build. An empty string indicates no # specific flavour and falls back to ghc default values. - ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) + ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) (if useLLVM then "perf-cross" else "perf-cross-ncg") , # Whether to disable the large address space allocator @@ -52,7 +52,7 @@ let inherit (bootPkgs) ghc; # TODO(@Ericson2314) Make unconditional - targetPrefix = stdenv.lib.optionalString + targetPrefix = lib.optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-"; @@ -63,30 +63,30 @@ let endif DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} - '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' + '' + lib.optionalString (targetPlatform != hostPlatform) '' Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} CrossCompilePrefix = ${targetPrefix} HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO BUILD_SPHINX_PDF = NO - '' + stdenv.lib.optionalString (!enableProfiledLibs) '' + '' + lib.optionalString (!enableProfiledLibs) '' GhcLibWays = "v dyn" - '' + stdenv.lib.optionalString enableRelocatedStaticLibs '' + '' + lib.optionalString enableRelocatedStaticLibs '' GhcLibHcOpts += -fPIC GhcRtsHcOpts += -fPIC - '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' + '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' EXTRA_CC_OPTS += -std=gnu99 ''; # Splicer will pull out correct variations - libDeps = platform: stdenv.lib.optional enableTerminfo ncurses + libDeps = platform: lib.optional enableTerminfo ncurses ++ [libffi] - ++ stdenv.lib.optional (!enableIntegerSimple) gmp - ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; + ++ lib.optional (!enableIntegerSimple) gmp + ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; toolsForTarget = [ pkgsBuildTarget.targetPackages.stdenv.cc - ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm; + ] ++ lib.optional useLLVM buildLlvmPackages.llvm; targetCC = builtins.head toolsForTarget; @@ -123,7 +123,7 @@ stdenv.mkDerivation (rec { export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString useLdGold ".gold"}" + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}" export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" @@ -133,15 +133,15 @@ stdenv.mkDerivation (rec { echo -n "${buildMK}" > mk/build.mk sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - '' + stdenv.lib.optionalString (stdenv.isLinux) '' + '' + lib.optionalString (stdenv.isLinux) '' export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive" - '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.isDarwin) '' export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' export NIX_LDFLAGS+=" -no_dtrace_dof" - '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' + '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets - '' + stdenv.lib.optionalString targetPlatform.isMusl '' + '' + lib.optionalString targetPlatform.isMusl '' echo "patching llvm-targets for musl targets..." echo "Cloning these existing '*-linux-gnu*' targets:" grep linux-gnu llvm-targets | sed 's/^/ /' @@ -161,29 +161,29 @@ stdenv.mkDerivation (rec { # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = [ "build" "host" ] - ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + ++ lib.optional (targetPlatform != hostPlatform) "target"; # `--with` flags for libraries needed for RTS linker configureFlags = [ "--datadir=$doc/share/doc/ghc" "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" - ] ++ stdenv.lib.optionals (libffi != null) [ + ] ++ lib.optionals (libffi != null) [ "--with-system-libffi" "--with-ffi-includes=${targetPackages.libffi.dev}/include" "--with-ffi-libraries=${targetPackages.libffi.out}/lib" - ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [ + ] ++ lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [ "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib" - ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ + ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" - ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ + ] ++ lib.optionals (targetPlatform != hostPlatform) [ "--enable-bootstrap-with-devel-snapshot" - ] ++ stdenv.lib.optionals useLdGold [ + ] ++ lib.optionals useLdGold [ "CFLAGS=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" - ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [ + ] ++ lib.optionals (disableLargeAddressSpace) [ "--disable-large-address-space" ]; @@ -204,18 +204,18 @@ stdenv.mkDerivation (rec { buildInputs = [ perl bash ] ++ (libDeps hostPlatform); propagatedBuildInputs = [ targetPackages.stdenv.cc ] - ++ stdenv.lib.optional useLLVM llvmPackages.llvm; + ++ lib.optional useLLVM llvmPackages.llvm; - depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform); - depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform); + depsTargetTarget = map lib.getDev (libDeps targetPlatform); + depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform); # required, because otherwise all symbols from HSffi.o are stripped, and # that in turn causes GHCi to abort - stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; + stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; checkTarget = "test"; - hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie"; + hardeningDisable = [ "format" ] ++ lib.optional stdenv.targetPlatform.isMusl "pie"; postInstall = '' # Install the bash completion file. @@ -225,7 +225,7 @@ stdenv.mkDerivation (rec { for i in "$out/bin/"*; do test ! -h $i || continue egrep --quiet '^#!' <(head -n 1 $i) || continue - sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i + sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i done ''; @@ -242,12 +242,12 @@ stdenv.mkDerivation (rec { meta = { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; - maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; + maintainers = with lib.maintainers; [ marcweber andres peti ]; timeout = 24 * 3600; inherit (ghc.meta) license platforms; }; -} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt { +} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt { dontStrip = true; dontPatchELF = true; noAuditTmpdir = true; diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 6f9f577743f..3ba88763117 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgsBuildTarget, targetPackages +{ lib, stdenv, pkgsBuildTarget, targetPackages # build-tools , bootPkgs @@ -22,7 +22,7 @@ , # If enabled, GHC will be built with the GPL-free but slightly slower native # bignum backend instead of the faster but GPLed gmp backend. - enableNativeBignum ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms) + enableNativeBignum ? !(lib.any (lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms) , gmp , # If enabled, use -fPIC when compiling static libs. @@ -41,7 +41,7 @@ , version ? "8.11.20200824" , # What flavour to build. An empty string indicates no # specific flavour and falls back to ghc default values. - ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) + ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) (if useLLVM then "perf-cross" else "perf-cross-ncg") , # Whether to disable the large address space allocator @@ -57,7 +57,7 @@ let inherit (bootPkgs) ghc; # TODO(@Ericson2314) Make unconditional - targetPrefix = stdenv.lib.optionalString + targetPrefix = lib.optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-"; @@ -68,33 +68,33 @@ let endif DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} BIGNUM_BACKEND = ${if enableNativeBignum then "native" else "gmp"} - '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' + '' + lib.optionalString (targetPlatform != hostPlatform) '' Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"} CrossCompilePrefix = ${targetPrefix} HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO BUILD_SPHINX_PDF = NO - '' + stdenv.lib.optionalString dontStrip '' + '' + lib.optionalString dontStrip '' STRIP_CMD = : - '' + stdenv.lib.optionalString (!enableProfiledLibs) '' + '' + lib.optionalString (!enableProfiledLibs) '' GhcLibWays = "v dyn" - '' + stdenv.lib.optionalString enableRelocatedStaticLibs '' + '' + lib.optionalString enableRelocatedStaticLibs '' GhcLibHcOpts += -fPIC GhcRtsHcOpts += -fPIC - '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' + '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' EXTRA_CC_OPTS += -std=gnu99 ''; # Splicer will pull out correct variations - libDeps = platform: stdenv.lib.optional enableTerminfo ncurses + libDeps = platform: lib.optional enableTerminfo ncurses ++ [libffi] - ++ stdenv.lib.optional (!enableNativeBignum) gmp - ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv - ++ stdenv.lib.optional enableDwarf elfutils; + ++ lib.optional (!enableNativeBignum) gmp + ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv + ++ lib.optional enableDwarf elfutils; toolsForTarget = [ pkgsBuildTarget.targetPackages.stdenv.cc - ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm; + ] ++ lib.optional useLLVM buildLlvmPackages.llvm; targetCC = builtins.head toolsForTarget; @@ -131,7 +131,7 @@ stdenv.mkDerivation (rec { export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 # and more generally have a faster linker. - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString useLdGold ".gold"}" + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}" export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" @@ -144,13 +144,13 @@ stdenv.mkDerivation (rec { echo ${src.rev} > GIT_COMMIT_ID ./boot sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.isDarwin) '' export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' export NIX_LDFLAGS+=" -no_dtrace_dof" - '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' + '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets - '' + stdenv.lib.optionalString targetPlatform.isMusl '' + '' + lib.optionalString targetPlatform.isMusl '' echo "patching llvm-targets for musl targets..." echo "Cloning these existing '*-linux-gnu*' targets:" grep linux-gnu llvm-targets | sed 's/^/ /' @@ -170,40 +170,40 @@ stdenv.mkDerivation (rec { # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = [ "build" "host" ] - ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + ++ lib.optional (targetPlatform != hostPlatform) "target"; # `--with` flags for libraries needed for RTS linker configureFlags = [ "--datadir=$doc/share/doc/ghc" "--with-curses-libraries=${ncurses.out}/lib" - ] ++ stdenv.lib.optionals (libffi != null) [ + ] ++ lib.optionals (libffi != null) [ "--with-system-libffi" "--with-ffi-includes=${targetPackages.libffi.dev}/include" "--with-ffi-libraries=${targetPackages.libffi.out}/lib" - ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && !enableNativeBignum) [ + ] ++ lib.optionals (targetPlatform == hostPlatform && !enableNativeBignum) [ "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib" - ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ + ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" - ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ + ] ++ lib.optionals (targetPlatform != hostPlatform) [ "--enable-bootstrap-with-devel-snapshot" - ] ++ stdenv.lib.optionals useLdGold [ + ] ++ lib.optionals useLdGold [ "CFLAGS=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" - ] ++ stdenv.lib.optional disableLargeAddressSpace "--disable-large-address-space" - ++ stdenv.lib.optionals enableDwarf [ + ] ++ lib.optional disableLargeAddressSpace "--disable-large-address-space" + ++ lib.optionals enableDwarf [ "--enable-dwarf-unwind" - "--with-libdw-includes=${stdenv.lib.getDev elfutils}/include" - "--with-libdw-libraries=${stdenv.lib.getLib elfutils}/lib" + "--with-libdw-includes=${lib.getDev elfutils}/include" + "--with-libdw-libraries=${lib.getLib elfutils}/lib" ]; # Make sure we never relax`$PATH` and hooks support for compatibility. strictDeps = true; # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. - dontAddExtraLibs = true; + dontAddExtraLibs = true; nativeBuildInputs = [ perl autoconf autoreconfHook automake m4 python3 sphinx @@ -216,18 +216,18 @@ stdenv.mkDerivation (rec { buildInputs = [ perl bash ] ++ (libDeps hostPlatform); propagatedBuildInputs = [ targetPackages.stdenv.cc ] - ++ stdenv.lib.optional useLLVM llvmPackages.llvm; + ++ lib.optional useLLVM llvmPackages.llvm; - depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform); - depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform); + depsTargetTarget = map lib.getDev (libDeps targetPlatform); + depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform); # required, because otherwise all symbols from HSffi.o are stripped, and # that in turn causes GHCi to abort - stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; + stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; checkTarget = "test"; - hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie"; + hardeningDisable = [ "format" ] ++ lib.optional stdenv.targetPlatform.isMusl "pie"; postInstall = '' # Install the bash completion file. @@ -237,7 +237,7 @@ stdenv.mkDerivation (rec { for i in "$out/bin/"*; do test ! -h $i || continue egrep --quiet '^#!' <(head -n 1 $i) || continue - sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i + sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i done ''; @@ -254,13 +254,13 @@ stdenv.mkDerivation (rec { meta = { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; - maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; + maintainers = with lib.maintainers; [ marcweber andres peti ]; inherit (ghc.meta) license platforms; }; dontStrip = (targetPlatform.useAndroidPrebuilt || targetPlatform.isWasm); -} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt{ +} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt{ dontPatchELF = true; noAuditTmpdir = true; }) diff --git a/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix b/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix index b957a6aa9e1..e8c4a027520 100644 --- a/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix +++ b/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix @@ -10,7 +10,7 @@ , ghcjs-th, haddock-api-ghcjs, hashable, haskell-src-exts , haskell-src-meta, http-types, HUnit, lens, lifted-base, mtl , network, optparse-applicative, parallel, parsec, process, random - , regex-posix, safe, shelly, split, stdenv, stringsearch, syb + , regex-posix, safe, shelly, split, lib, stringsearch, syb , system-fileio, system-filepath, tar, template-haskell , template-haskell-ghcjs, terminfo, test-framework , test-framework-hunit, text, time, transformers @@ -55,13 +55,13 @@ websockets yaml ]; description = "Haskell to JavaScript compiler"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; ghc-api-ghcjs = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, filepath, ghc-boot, ghc-boot-th, ghc-heap - , ghci-ghcjs, happy, hpc, process, stdenv, template-haskell-ghcjs + , ghci-ghcjs, happy, hpc, process, lib, template-haskell-ghcjs , terminfo, time, transformers, unix }: mkDerivation { @@ -76,12 +76,12 @@ libraryToolDepends = [ alex happy ]; homepage = "http://www.haskell.org/ghc/"; description = "The GHC API (customized for GHCJS)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; ghci-ghcjs = callPackage ({ mkDerivation, array, base, binary, bytestring, containers - , deepseq, filepath, ghc-boot, ghc-boot-th, ghc-heap, stdenv + , deepseq, filepath, ghc-boot, ghc-boot-th, ghc-heap, lib , template-haskell-ghcjs, transformers, unix }: mkDerivation { @@ -93,12 +93,12 @@ ghc-boot-th ghc-heap template-haskell-ghcjs transformers unix ]; description = "The library supporting GHC's interactive interpreter (customized for GHCJS)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; ghcjs-th = callPackage ({ mkDerivation, base, binary, bytestring, containers, ghc-prim - , ghci-ghcjs, stdenv, template-haskell-ghcjs + , ghci-ghcjs, lib, template-haskell-ghcjs }: mkDerivation { pname = "ghcjs-th"; @@ -109,13 +109,13 @@ template-haskell-ghcjs ]; homepage = "http://github.com/ghcjs"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; haddock-api-ghcjs = callPackage ({ mkDerivation, array, base, bytestring, Cabal, containers, deepseq , directory, filepath, ghc-api-ghcjs, ghc-boot, ghc-paths - , haddock-library-ghcjs, hspec, hspec-discover, QuickCheck, stdenv + , haddock-library-ghcjs, hspec, hspec-discover, QuickCheck, lib , transformers, xhtml }: mkDerivation { @@ -136,13 +136,13 @@ testToolDepends = [ hspec-discover ]; homepage = "http://www.haskell.org/haddock/"; description = "A documentation-generation tool for Haskell libraries"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; haddock-library-ghcjs = callPackage ({ mkDerivation, base, base-compat, bytestring, containers, deepseq , directory, filepath, haddock-library, hspec, hspec-discover - , optparse-applicative, parsec, QuickCheck, stdenv, text + , optparse-applicative, parsec, QuickCheck, lib, text , transformers, tree-diff }: mkDerivation { @@ -160,18 +160,18 @@ testToolDepends = [ hspec-discover ]; homepage = "http://www.haskell.org/haddock/"; description = "Library exposing some functionality of Haddock"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; template-haskell-ghcjs = callPackage - ({ mkDerivation, base, ghc-boot-th, pretty, stdenv }: + ({ mkDerivation, base, ghc-boot-th, pretty, lib }: mkDerivation { pname = "template-haskell-ghcjs"; version = "2.14.0.0"; src = configuredSrc + /lib/template-haskell-ghcjs; libraryHaskellDepends = [ base ghc-boot-th pretty ]; description = "Support library for Template Haskell (customized for GHCJS)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; } diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix index c6c81491fe6..8a04bc0c079 100644 --- a/pkgs/development/compilers/ghcjs-ng/default.nix +++ b/pkgs/development/compilers/ghcjs-ng/default.nix @@ -12,7 +12,7 @@ , makeWrapper , xorg , gmp -, pkgconfig +, pkg-config , gcc , lib , ghcjsDepOverrides ? (_:_:{}) @@ -73,7 +73,7 @@ in stdenv.mkDerivation { makeWrapper xorg.lndir gmp - pkgconfig + pkg-config ] ++ lib.optionals stdenv.isDarwin [ gcc # https://github.com/ghcjs/ghcjs/issues/663 ]; diff --git a/pkgs/development/compilers/ghcjs-ng/ghcjs-base.nix b/pkgs/development/compilers/ghcjs-ng/ghcjs-base.nix index 7c10ce6572f..4fff32759d3 100644 --- a/pkgs/development/compilers/ghcjs-ng/ghcjs-base.nix +++ b/pkgs/development/compilers/ghcjs-ng/ghcjs-base.nix @@ -1,9 +1,10 @@ { mkDerivation, aeson, array, attoparsec, base, binary, bytestring , containers, deepseq, directory, dlist, fetchgit, ghc-prim , ghcjs-prim, hashable, HUnit, integer-gmp, primitive, QuickCheck -, quickcheck-unicode, random, scientific, stdenv, test-framework +, quickcheck-unicode, random, scientific, test-framework , test-framework-hunit, test-framework-quickcheck2, text, time , transformers, unordered-containers, vector +, lib }: mkDerivation { pname = "ghcjs-base"; @@ -25,5 +26,5 @@ mkDerivation { ]; homepage = "https://github.com/ghcjs/ghcjs-base"; description = "base library for GHCJS"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; } diff --git a/pkgs/development/compilers/ghdl/default.nix b/pkgs/development/compilers/ghdl/default.nix index 6d1fae33734..6181486f50c 100644 --- a/pkgs/development/compilers/ghdl/default.nix +++ b/pkgs/development/compilers/ghdl/default.nix @@ -5,13 +5,15 @@ assert backend == "mcode" || backend == "llvm"; stdenv.mkDerivation rec { pname = "ghdl-${backend}"; - version = "0.37"; + # NOTE(aseipp): move to 0.38 when it comes out, since it should support a stable + # version of the yosys plugin + version = "unstable-2021.01.14"; src = fetchFromGitHub { - owner = "ghdl"; - repo = "ghdl"; - rev = "v${version}"; - sha256 = "0b53yl4im33c1cd4mdyc4ks9cmrpixym17gzchfmplrl22w3l17y"; + owner = "ghdl"; + repo = "ghdl"; + rev = "4868294436574660552ccef50a5b0849559393de"; + sha256 = "1wqjf0qc66dam1n2mskmlvj53bcsdwwk5rq9gimq6ah1vcwi222p"; }; LIBRARY_PATH = "${stdenv.cc.libc}/lib"; @@ -23,7 +25,7 @@ stdenv.mkDerivation rec { sed -i 's/check_version 7.0/check_version 7/g' configure ''; - configureFlags = lib.optional (backend == "llvm") + configureFlags = [ "--enable-synth" ] ++ lib.optional (backend == "llvm") "--with-llvm-config=${llvm}/bin/llvm-config"; hardeningDisable = [ "format" ]; @@ -33,7 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/ghdl/ghdl"; description = "VHDL 2008/93/87 simulator"; - maintainers = with maintainers; [ lucus16 ]; + maintainers = with maintainers; [ lucus16 thoughtpolice ]; platforms = platforms.linux; license = licenses.gpl2; }; diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix index f96f2f724a6..b9c7e7e1e3d 100644 --- a/pkgs/development/compilers/gleam/default.nix +++ b/pkgs/development/compilers/gleam/default.nix @@ -1,24 +1,24 @@ -{ stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, Security }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, Security }: rustPlatform.buildRustPackage rec { pname = "gleam"; - version = "0.12.1"; + version = "0.13.2"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; rev = "v${version}"; - sha256 = "0n23pn7jk4i2waczw5cczsb7v4lal4x6xqmp01y280hb2vk176fg"; + sha256 = "sha256-ka1GxukX3HR40fMeiiXHguyPKrpGngG2tXDColR7eQA="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ - stdenv.lib.optionals stdenv.isDarwin [ Security ]; + lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "0rnf9agpzlvk53x8zrg32w6r0gxcbank3fs32ydv53frvqv1spj3"; + cargoSha256 = "sha256-/l54ezS68loljKNh7AdYMIuCiyIbsMI3jqD9ktjZLfc="; - meta = with stdenv.lib; { + meta = with lib; { description = "A statically typed language for the Erlang VM"; homepage = "https://gleam.run/"; license = licenses.asl20; diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix index 3fb9e107356..0cfb2502a0d 100644 --- a/pkgs/development/compilers/glslang/default.nix +++ b/pkgs/development/compilers/glslang/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , bison , cmake @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { fi ''; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Khronos reference front-end for GLSL and ESSL"; license = licenses.asl20; diff --git a/pkgs/development/compilers/gnatboot/default.nix b/pkgs/development/compilers/gnatboot/default.nix index cb643d6123a..d97298d0238 100644 --- a/pkgs/development/compilers/gnatboot/default.nix +++ b/pkgs/development/compilers/gnatboot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { pname = "gentoo-gnatboot"; @@ -41,7 +41,7 @@ stdenv.mkDerivation { langAda = true; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://gentoo.org"; license = licenses.gpl3Plus; maintainers = [ maintainers.lucus16 ]; diff --git a/pkgs/development/compilers/gnu-cobol/default.nix b/pkgs/development/compilers/gnu-cobol/default.nix index 146af98093d..44c966fa974 100644 --- a/pkgs/development/compilers/gnu-cobol/default.nix +++ b/pkgs/development/compilers/gnu-cobol/default.nix @@ -1,40 +1,36 @@ -{ stdenv, fetchurl, gcc, makeWrapper +{ lib, stdenv, fetchurl, gcc, makeWrapper , db, gmp, ncurses }: -let - version = "2.2"; - lib = stdenv.lib; -in stdenv.mkDerivation rec { pname = "gnu-cobol"; - inherit version; + version = "3.1.2"; src = fetchurl { - url = "https://sourceforge.com/projects/open-cobol/files/gnu-cobol/${version}/gnucobol-${version}.tar.gz"; - sha256 = "1jrjmdx0swssjh388pp08awhiisbrs2i7gx4lcm4p1k5rpg3hn4j"; + url = "mirror://sourceforge/gnucobol/${lib.versions.majorMinor version}/gnucobol-${version}.tar.xz"; + sha256 = "0x15ybfm63g7c9340fc6712h9v59spnbyaz4rf85pmnp3zbhaw2r"; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ db gmp ncurses ]; - cflags = stdenv.lib.concatMapStringsSep " " (p: "-L" + (lib.getLib p) + "/lib ") buildInputs; - ldflags = stdenv.lib.concatMapStringsSep " " (p: "-I" + (lib.getDev p) + "/include ") buildInputs; + cflags = lib.concatMapStringsSep " " (p: "-L" + (lib.getLib p) + "/lib ") buildInputs; + ldflags = lib.concatMapStringsSep " " (p: "-I" + (lib.getDev p) + "/include ") buildInputs; cobolCCFlags = "-I$out/include ${ldflags} -L$out/lib ${cflags}"; - postInstall = with stdenv.lib; '' + postInstall = with lib; '' wrapProgram "$out/bin/cobc" \ --set COB_CC "${gcc}/bin/gcc" \ --prefix COB_LDFLAGS " " "${cobolCCFlags}" \ --prefix COB_CFLAGS " " "${cobolCCFlags}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An open-source COBOL compiler"; - homepage = "https://sourceforge.net/projects/open-cobol/"; - license = licenses.gpl3; + homepage = "https://sourceforge.net/projects/gnucobol/"; + license = with licenses; [ gpl3Only lgpl3Only ]; maintainers = with maintainers; [ ericsagnes ]; - platforms = with platforms; linux ++ darwin; + platforms = platforms.all; }; } diff --git a/pkgs/development/compilers/gnu-smalltalk/default.nix b/pkgs/development/compilers/gnu-smalltalk/default.nix index f48cd6dfa1b..cd33baad993 100644 --- a/pkgs/development/compilers/gnu-smalltalk/default.nix +++ b/pkgs/development/compilers/gnu-smalltalk/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, fetchurl, pkgconfig, libtool +{ config, lib, stdenv, fetchurl, pkg-config, libtool , zip, libffi, libsigsegv, readline, gmp , gnutls, gnome2, cairo, SDL, sqlite , emacsSupport ? config.emacsSupport or false, emacs ? null }: @@ -11,7 +11,7 @@ let # The gnu-smalltalk project has a dependency to the libsigsegv library. # Adding --enable-static=libsigsegv to the gnu-smalltalk configuration flags # does not help, the error still occurs. The only solution is to build a # shared version of libsigsegv. - libsigsegv-shared = stdenv.lib.overrideDerivation libsigsegv (oldAttrs: { + libsigsegv-shared = lib.overrideDerivation libsigsegv (oldAttrs: { configureFlags = [ "--enable-shared" ]; }); @@ -27,24 +27,24 @@ in stdenv.mkDerivation rec { # The dependencies and their justification are explained at # http://smalltalk.gnu.org/download - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libtool zip libffi libsigsegv-shared readline gmp gnutls gnome2.gtk cairo SDL sqlite ] - ++ stdenv.lib.optional emacsSupport emacs; + ++ lib.optional emacsSupport emacs; - configureFlags = stdenv.lib.optional (!emacsSupport) "--without-emacs"; + configureFlags = lib.optional (!emacsSupport) "--without-emacs"; hardeningDisable = [ "format" ]; - installFlags = stdenv.lib.optional emacsSupport "lispdir=$(out)/share/emacs/site-lisp"; + installFlags = lib.optional emacsSupport "lispdir=$(out)/share/emacs/site-lisp"; # For some reason the tests fail if executated with nix-build, but pass if # executed within nix-shell --pure. doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A free implementation of the Smalltalk-80 language"; longDescription = '' GNU Smalltalk is a free implementation of the Smalltalk-80 language. It diff --git a/pkgs/development/compilers/go/1.14.nix b/pkgs/development/compilers/go/1.14.nix index a37d5c3d2cf..174c299b15b 100644 --- a/pkgs/development/compilers/go/1.14.nix +++ b/pkgs/development/compilers/go/1.14.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, tzdata, iana-etc, runCommand -, perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation +{ lib, stdenv, fetchurl, tzdata, iana-etc, runCommand +, perl, which, pkg-config, patch, procps, pcre, cacert, Security, Foundation , mailcap, runtimeShell , buildPackages , pkgsBuildTarget @@ -8,7 +8,7 @@ let - inherit (stdenv.lib) optionals optionalString; + inherit (lib) optionals optionalString; goBootstrap = runCommand "go-bootstrap" {} '' mkdir $out @@ -36,15 +36,15 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.14.13"; + version = "1.14.14"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "0xxins5crcgghgvnzplmp0qyv2gbmh36v1fpl15d03jwdd6287ds"; + sha256 = "0vx7r0bb1a500znnnh7v3wgw22ly3p2x06vzyi9hiblgylrby132"; }; # perl is used for testing go vet - nativeBuildInputs = [ perl which pkgconfig patch procps ]; + nativeBuildInputs = [ perl which pkg-config patch procps ]; buildInputs = [ cacert pcre ] ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; @@ -143,6 +143,7 @@ stdenv.mkDerivation rec { ./go-1.9-skip-flaky-20072.patch ./skip-external-network-tests.patch ./skip-nohup-tests.patch + ./go_no_vendor_checks-1_14.patch # fix rare TestDontCacheBrokenHTTP2Conn failure (fetchpatch { @@ -179,7 +180,7 @@ stdenv.mkDerivation rec { else null; - GOARM = toString (stdenv.lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]); + GOARM = toString (lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]); GO386 = 387; # from Arch: don't assume sse2 on i686 CGO_ENABLED = 1; # Hopefully avoids test timeouts on Hydra @@ -246,7 +247,7 @@ stdenv.mkDerivation rec { disallowedReferences = [ goBootstrap ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://golang.org/"; description = "The Go Programming language"; license = licenses.bsd3; diff --git a/pkgs/development/compilers/go/1.15.nix b/pkgs/development/compilers/go/1.15.nix index 47bf9cebd4c..c3aef549e68 100644 --- a/pkgs/development/compilers/go/1.15.nix +++ b/pkgs/development/compilers/go/1.15.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, tzdata, iana-etc, runCommand -, perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation +{ lib, stdenv, fetchurl, tzdata, iana-etc, runCommand +, perl, which, pkg-config, patch, procps, pcre, cacert, Security, Foundation , mailcap, runtimeShell , buildPackages , pkgsBuildTarget @@ -8,7 +8,7 @@ let - inherit (stdenv.lib) optionals optionalString; + inherit (lib) optionals optionalString; goBootstrap = runCommand "go-bootstrap" {} '' mkdir $out @@ -36,15 +36,15 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.15.6"; + version = "1.15.7"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "05sqcx4fm1nxfm46j6xriq0fnnah4bm8bqw027xrzcg2qmrvl2w9"; + sha256 = "1g1a39y1cnvw3y0bjwjms55cz0s9icm8myrgxi295jwfznmb6cc6"; }; # perl is used for testing go vet - nativeBuildInputs = [ perl which pkgconfig patch procps ]; + nativeBuildInputs = [ perl which pkg-config patch procps ]; buildInputs = [ cacert pcre ] ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; @@ -152,6 +152,7 @@ stdenv.mkDerivation rec { ./skip-external-network-tests-1.15.patch ./skip-nohup-tests.patch ./skip-cgo-tests-1.15.patch + ./go_no_vendor_checks.patch ] ++ [ # breaks under load: https://github.com/golang/go/issues/25628 (if stdenv.isAarch32 @@ -182,7 +183,7 @@ stdenv.mkDerivation rec { else null; - GOARM = toString (stdenv.lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]); + GOARM = toString (lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]); GO386 = 387; # from Arch: don't assume sse2 on i686 CGO_ENABLED = 1; # Hopefully avoids test timeouts on Hydra @@ -249,7 +250,7 @@ stdenv.mkDerivation rec { disallowedReferences = [ goBootstrap ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://golang.org/"; description = "The Go Programming language"; license = licenses.bsd3; diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix index 6bc32b07c3d..ec3fd97da9b 100644 --- a/pkgs/development/compilers/go/1.4.nix +++ b/pkgs/development/compilers/go/1.4.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, fetchpatch, tzdata, iana-etc, libcCross -, pkgconfig +, pkg-config , pcre , Security }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "1zdyf883awaqdzm4r3fs76nbpiqx3iswl2p4qxclw2sl5vvynas5"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pcre ]; depsTargetTargetPropagated = lib.optional stdenv.isDarwin Security; @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { else if stdenv.hostPlatform.system == "x86_64-linux" then "amd64" else if stdenv.isAarch32 then "arm" else throw "Unsupported system"; - GOARM = stdenv.lib.optionalString (stdenv.hostPlatform.system == "armv5tel-linux") "5"; + GOARM = lib.optionalString (stdenv.hostPlatform.system == "armv5tel-linux") "5"; GO386 = 387; # from Arch: don't assume sse2 on i686 CGO_ENABLED = 0; @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { ./all.bash ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://golang.org/"; description = "The Go Programming language"; license = licenses.bsd3; diff --git a/pkgs/development/compilers/go/2-dev.nix b/pkgs/development/compilers/go/2-dev.nix index 35d3365768a..3e09f7c0fad 100644 --- a/pkgs/development/compilers/go/2-dev.nix +++ b/pkgs/development/compilers/go/2-dev.nix @@ -1,5 +1,5 @@ -{ pkgs, stdenv, fetchurl, fetchgit, tzdata, iana-etc, runCommand -, perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation +{ pkgs, lib, stdenv, fetchurl, fetchgit, tzdata, iana-etc, runCommand +, perl, which, pkg-config, patch, procps, pcre, cacert, Security, Foundation , mailcap, runtimeShell , buildPackages , pkgsBuildTarget @@ -8,7 +8,7 @@ let - inherit (stdenv.lib) optionals optionalString; + inherit (lib) optionals optionalString; goBootstrap = runCommand "go-bootstrap" {} '' mkdir $out @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { }; # perl is used for testing go vet - nativeBuildInputs = [ perl which pkgconfig patch procps ]; + nativeBuildInputs = [ perl which pkg-config patch procps ]; buildInputs = [ cacert pcre ] ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; @@ -184,7 +184,7 @@ stdenv.mkDerivation rec { else null; - GOARM = toString (stdenv.lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]); + GOARM = toString (lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]); GO386 = 387; # from Arch: don't assume sse2 on i686 CGO_ENABLED = 1; # Hopefully avoids test timeouts on Hydra @@ -251,7 +251,7 @@ stdenv.mkDerivation rec { disallowedReferences = [ goBootstrap ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://golang.org/"; description = "The Go Programming language"; license = licenses.bsd3; diff --git a/pkgs/development/compilers/go/go_no_vendor_checks-1_14.patch b/pkgs/development/compilers/go/go_no_vendor_checks-1_14.patch new file mode 100644 index 00000000000..53e4ba78ff1 --- /dev/null +++ b/pkgs/development/compilers/go/go_no_vendor_checks-1_14.patch @@ -0,0 +1,23 @@ +Starting from go1.14, go verifes that vendor/modules.txt matches the requirements +and replacements listed in the main module go.mod file, and it is a hard failure if +vendor/modules.txt is missing. + +Relax module consistency checks and switch back to pre go1.14 behaviour if +vendor/modules.txt is missing regardless of go version requirement in go.mod. + +This has been ported from FreeBSD: https://reviews.freebsd.org/D24122 +See https://github.com/golang/go/issues/37948 for discussion. + +diff --git a/src/cmd/go/internal/modload/init.go b/src/cmd/go/internal/modload/init.go +index 71f68efbcc..3c566d04dd 100644 +--- a/src/cmd/go/internal/modload/init.go ++++ b/src/cmd/go/internal/modload/init.go +@@ -133,7 +133,7 @@ func checkVendorConsistency() { + readVendorList() + + pre114 := false +- if modFile.Go == nil || semver.Compare("v"+modFile.Go.Version, "v1.14") < 0 { ++ if modFile.Go == nil || semver.Compare("v"+modFile.Go.Version, "v1.14") < 0 || (os.Getenv("GO_NO_VENDOR_CHECKS") == "1" && len(vendorMeta) == 0) { + // Go versions before 1.14 did not include enough information in + // vendor/modules.txt to check for consistency. + // If we know that we're on an earlier version, relax the consistency check. diff --git a/pkgs/development/compilers/go/go_no_vendor_checks.patch b/pkgs/development/compilers/go/go_no_vendor_checks.patch new file mode 100644 index 00000000000..45ff4360f0d --- /dev/null +++ b/pkgs/development/compilers/go/go_no_vendor_checks.patch @@ -0,0 +1,23 @@ +Starting from go1.14, go verifes that vendor/modules.txt matches the requirements +and replacements listed in the main module go.mod file, and it is a hard failure if +vendor/modules.txt is missing. + +Relax module consistency checks and switch back to pre go1.14 behaviour if +vendor/modules.txt is missing regardless of go version requirement in go.mod. + +This has been ported from FreeBSD: https://reviews.freebsd.org/D24122 +See https://github.com/golang/go/issues/37948 for discussion. + +diff --git a/src/cmd/go/internal/modload/vendor.go b/src/cmd/go/internal/modload/vendor.go +index 71f68efbcc..3c566d04dd 100644 +--- a/src/cmd/go/internal/modload/vendor.go ++++ b/src/cmd/go/internal/modload/vendor.go +@@ -133,7 +133,7 @@ func checkVendorConsistency() { + readVendorList() + + pre114 := false +- if modFile.Go == nil || semver.Compare("v"+modFile.Go.Version, "v1.14") < 0 { ++ if modFile.Go == nil || semver.Compare("v"+modFile.Go.Version, "v1.14") < 0 || (os.Getenv("GO_NO_VENDOR_CHECKS") == "1" && len(vendorMeta) == 0) { + // Go versions before 1.14 did not include enough information in + // vendor/modules.txt to check for consistency. + // If we know that we're on an earlier version, relax the consistency check. diff --git a/pkgs/development/compilers/gprolog/default.nix b/pkgs/development/compilers/gprolog/default.nix index 0a1cc512873..59f33db68cb 100644 --- a/pkgs/development/compilers/gprolog/default.nix +++ b/pkgs/development/compilers/gprolog/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "gprolog-1.4.5"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0z4cc42n3k6i35b8mr816iwsvrpxshw6d7dgz6s2h1hy0l7g1p5z"; }; - hardeningDisable = stdenv.lib.optional stdenv.isi686 "pic"; + hardeningDisable = lib.optional stdenv.isi686 "pic"; patchPhase = '' sed -i -e "s|/tmp/make.log|$TMPDIR/make.log|g" src/Pl2Wam/check_boot @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.gnu.org/software/gprolog/"; description = "GNU Prolog, a free Prolog compiler with constraint solving over finite domains"; - license = stdenv.lib.licenses.lgpl3Plus; + license = lib.licenses.lgpl3Plus; longDescription = '' GNU Prolog is a free Prolog compiler with constraint solving @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { declarativity of logic programming. ''; - maintainers = [ stdenv.lib.maintainers.peti ]; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; + maintainers = [ lib.maintainers.peti ]; + platforms = lib.platforms.gnu ++ lib.platforms.linux; }; } diff --git a/pkgs/development/compilers/graalvm/community-edition.nix b/pkgs/development/compilers/graalvm/community-edition.nix index 71f3b1560c6..f3a03b36474 100644 --- a/pkgs/development/compilers/graalvm/community-edition.nix +++ b/pkgs/development/compilers/graalvm/community-edition.nix @@ -1,48 +1,60 @@ -{ stdenv, fetchurl, perl, unzip, glibc, zlib, setJavaClassPath }: +{ lib, stdenv, fetchurl, perl, unzip, glibc, zlib, setJavaClassPath, Foundation, openssl }: let + platform = if stdenv.isDarwin then "darwin-amd64" else "linux-amd64"; common = javaVersion: let + javaVersionPlatform = "${javaVersion}-${platform}"; graalvmXXX-ce = stdenv.mkDerivation rec { pname = "graalvm${javaVersion}-ce"; - version = "20.2.0"; + version = "20.3.0"; srcs = [ (fetchurl { - sha256 = { "8" = "1s64zkkrns1ykh6dwpjrqy0hs9m1bb08cf7ss7msx33h9ivir5b0"; - "11" = "0aaf0sjsnlckhgsh3j4lph0shahw6slf4yndqcm2swc8i1dlpdsx"; - }.${javaVersion}; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${version}/graalvm-ce-java${javaVersion}-linux-amd64-${version}.tar.gz"; + sha256 = { "8-linux-amd64" = "195b20ivvv8ipjn3qq2313j8qf96ji93pqm99nvn20bq23wasp25"; + "11-linux-amd64" = "1mdk1zhazvvh1fa01bzi5v5fxhvx592xmbakx0y1137vykbayyjm"; + "8-darwin-amd64" = "1rrs471204p71knyxpjxymdi8ws98ph2kf5j0knk529g0d24rs01"; + "11-darwin-amd64" = "008dl8dbf37mv4wahb9hbd6jp8svvmpy1rgsiqkn3i4hypxnkf12"; + }.${javaVersionPlatform}; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${version}/graalvm-ce-java${javaVersionPlatform}-${version}.tar.gz"; }) (fetchurl { - sha256 = { "8" = "1cisyyzab4pdvzavnivhy9w6dwn36ybaxw40w767m142fbi06m3b"; - "11" = "0p4j6mxajmb0xl41c79154pk4vb8bffgg1nmwislahqjky9jkd4j"; - }.${javaVersion}; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${version}/native-image-installable-svm-java${javaVersion}-linux-amd64-${version}.jar"; + sha256 = { "8-linux-amd64" = "1rzbhllz28x5ps8n304v998hykr4m8z1gfg53ybi6laxhkbx3i13"; + "11-linux-amd64" = "09ipdl1489xnbckwl6sl9y7zy7kp5qf5fgf3kgz5d69jrk2z6rvf"; + "8-darwin-amd64" = "1iy2943jbrarh8bm9wy15xk7prnskqwik2ham07a6ybp4j4b81xi"; + "11-darwin-amd64" = "0vk2grlirghzc78kvwg66w0xriy5p8qkcp7qx83i62d7sj0kvwnf"; + }.${javaVersionPlatform}; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${version}/native-image-installable-svm-java${javaVersionPlatform}-${version}.jar"; }) (fetchurl { - sha256 = { "8" = "0rwwvk1mkfnl0b50xg7kh6015kjmsw2ra0ckrzmabl88z4bnzh2y"; - "11" = "0lc9as2a00j74lp7jby4p10vn5bbkiydzvzk28zfcbsp28p4wvwn"; - }.${javaVersion}; - url = "https://github.com/oracle/truffleruby/releases/download/vm-${version}/ruby-installable-svm-java${javaVersion}-linux-amd64-${version}.jar"; + sha256 = { "8-linux-amd64" = "0v98v44vblhyi3jhrngmvrkb3a6d607x4fpmrb4mrrsg75vbvc6d"; + "11-linux-amd64" = "0kb9472ilwqg40gyw1c4lmzkd9s763raw560sw80ljm3p75k4sc7"; + "8-darwin-amd64" = "192n9ckr4p8qirpxr67ji3wzxpng33yfr7kxynlrcp7b3ghfic6p"; + "11-darwin-amd64" = "1wqdk8wphywa00kl3xikiskclb84rx3nw5a4vi5y2n060kclcp22"; + }.${javaVersionPlatform}; + url = "https://github.com/oracle/truffleruby/releases/download/vm-${version}/ruby-installable-svm-java${javaVersionPlatform}-${version}.jar"; }) (fetchurl { - sha256 = { "8" = "0mj8p72qgvvrwpsbk0bsqldynlz1wq07icf951wq5xdbr0whj1gz"; - "11" = "1lkszqn4islsza011iabayv6riym0dwnkv83pkmk06b230qjfhzb"; - }.${javaVersion}; - url = "https://github.com/graalvm/graalpython/releases/download/vm-${version}/python-installable-svm-java${javaVersion}-linux-amd64-${version}.jar"; + sha256 = { "8-linux-amd64" = "1iskmkhrrwlhcq92g1ljvsfi9q403xxkwgzn9m282z5llh2fxv74"; + "11-linux-amd64" = "13bg2gs22rzbngnbw8j68jqgcknbiw30kpxac5jjcn55rf2ymvkz"; + "8-darwin-amd64" = "08pib13q7s5wymnbykkyif66ll146vznxw4yz12qwhb419882jc7"; + "11-darwin-amd64" = "0cb9lhc21yr2dnrm4kwa68laaczvsdnzpcbl2qix50d0v84xl602"; + }.${javaVersionPlatform}; + url = "https://github.com/graalvm/graalpython/releases/download/vm-${version}/python-installable-svm-java${javaVersionPlatform}-${version}.jar"; }) (fetchurl { - sha256 = { "8" = "1br7camk7y8ych43ws57096100f9kzjvqznh2flmws78ipcrrb66"; - "11" = "10swxspjvzh0j82lbpy38dckk69lw1pawqkhnj1hxd05ls36fwq5"; - }.${javaVersion}; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${version}/wasm-installable-svm-java${javaVersion}-linux-amd64-${version}.jar"; + sha256 = { "8-linux-amd64" = "12lvcl1vmc35wh3xw5dqca7yiijsd432x4lim3knzppipy7fmflq"; + "11-linux-amd64" = "1s8zfgjyyw6w53974h9a2ig8a1bvc97aplyrdziywfrijgp6zkqk"; + "8-darwin-amd64" = "06i1n42hkhcf1pfb2bly22ws4a09xgydsgh8b0kvjmb1fapd4paq"; + "11-darwin-amd64" = "1r2bqhfxnw09izxlsc562znlp3m9c1isqzhlki083h3vp548vv9s"; + }.${javaVersionPlatform}; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${version}/wasm-installable-svm-java${javaVersionPlatform}-${version}.jar"; }) ]; nativeBuildInputs = [ unzip perl ]; unpackPhase = '' unpack_jar() { jar=$1 - unzip -o $jar -d $out + unzip -q -o $jar -d $out perl -ne 'use File::Path qw(make_path); use File::Basename qw(dirname); if (/^(.+) = (.+)$/) { @@ -60,7 +72,27 @@ let mkdir -p $out arr=($srcs) - tar xf ''${arr[0]} -C $out --strip-components=1 + + # The tarball on Linux has the following directory structure: + # + # graalvm-ce-java11-20.3.0/* + # + # while on Darwin it looks like this: + # + # graalvm-ce-java11-20.3.0/Contents/Home/* + # + # We therefor use --strip-components=1 vs 3 depending on the platform. + tar xf ''${arr[0]} -C $out --strip-components=${if stdenv.isLinux then "1" else "3"} + + # Sanity check + if [ ! -d $out/bin ]; then + echo "The `bin` is directory missing after extracting the graalvm" + echo "tarball, please compare the directory structure of the" + echo "tarball with what happens in the unpackPhase (in particular" + echo "with regards to the `--strip-components` flag)." + exit 1 + fi + unpack_jar ''${arr[1]} unpack_jar ''${arr[2]} unpack_jar ''${arr[3]} @@ -68,7 +100,7 @@ let ''; installPhase = { - "8" = '' + "8-linux-amd64" = '' # BUG workaround http://mail.openjdk.java.net/pipermail/graal-dev/2017-December/005141.html substituteInPlace $out/jre/lib/security/java.security \ --replace file:/dev/random file:/dev/./urandom \ @@ -76,13 +108,13 @@ let # provide libraries needed for static compilation for f in ${glibc}/lib/* ${glibc.static}/lib/* ${zlib.static}/lib/*; do - ln -s $f $out/jre/lib/svm/clibraries/linux-amd64/$(basename $f) + ln -s $f $out/jre/lib/svm/clibraries/${platform}/$(basename $f) done # allow using external truffle-api.jar and languages not included in the distrubution rm $out/jre/lib/jvmci/parentClassLoader.classpath ''; - "11" = '' + "11-linux-amd64" = '' # BUG workaround http://mail.openjdk.java.net/pipermail/graal-dev/2017-December/005141.html substituteInPlace $out/conf/security/java.security \ --replace file:/dev/random file:/dev/./urandom \ @@ -90,10 +122,17 @@ let # provide libraries needed for static compilation for f in ${glibc}/lib/* ${glibc.static}/lib/* ${zlib.static}/lib/*; do - ln -s $f $out/lib/svm/clibraries/linux-amd64/$(basename $f) + ln -s $f $out/lib/svm/clibraries/${platform}/$(basename $f) done - ''; - }.${javaVersion}; + ''; + "8-darwin-amd64" = '' + # allow using external truffle-api.jar and languages not included in the distrubution + rm $out/jre/lib/jvmci/parentClassLoader.classpath + ''; + "11-darwin-amd64" = '' + echo "" + ''; + }.${javaVersionPlatform}; dontStrip = true; @@ -111,24 +150,31 @@ let "11" = "$out/lib/jli:$out/lib/server:$out/lib"; }.${javaVersion} }:${ - stdenv.lib.makeLibraryPath [ + lib.makeLibraryPath [ stdenv.cc.cc.lib # libstdc++.so.6 zlib # libz.so.1 ]}" + ${lib.optionalString stdenv.isLinux '' for f in $(find $out -type f -perm -0100); do patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$f" || true patchelf --set-rpath "$rpath" "$f" || true - if ldd "$f" | fgrep 'not found'; then echo "in file $f"; fi done + ''} ''; - propagatedBuildInputs = [ setJavaClassPath zlib ]; # $out/bin/native-image needs zlib to build native executables + # $out/bin/native-image needs zlib to build native executables. + propagatedBuildInputs = [ setJavaClassPath zlib ] ++ + # On Darwin native-image calls clang and it + # tries to include <Foundation/Foundation.h>, + # and Interactive Ruby (irb) requires OpenSSL + # headers. + lib.optionals stdenv.hostPlatform.isDarwin [ Foundation openssl ]; doInstallCheck = true; installCheckPhase = '' - echo ${stdenv.lib.escapeShellArg '' + echo ${lib.escapeShellArg '' public class HelloWorld { public static void main(String[] args) { System.out.println("Hello World"); @@ -141,22 +187,42 @@ let $out/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler HelloWorld | fgrep 'Hello World' # Ahead-Of-Time compilation - $out/bin/native-image --no-server HelloWorld + $out/bin/native-image -H:-CheckToolchain -H:+ReportExceptionStackTraces --no-server HelloWorld ./helloworld | fgrep 'Hello World' - # Ahead-Of-Time compilation with --static - $out/bin/native-image --no-server --static HelloWorld - ./helloworld | fgrep 'Hello World' - ''; + ${lib.optionalString stdenv.isLinux '' + # Ahead-Of-Time compilation with --static + # --static flag doesn't work for darwin + $out/bin/native-image --no-server --static HelloWorld + ./helloworld | fgrep 'Hello World' + ''} + + echo "Testing interpreted languages" + $out/bin/graalpython -c 'print(1 + 1)' + $out/bin/ruby -e 'puts(1 + 1)' + $out/bin/node -e 'console.log(1 + 1)' + + echo '1 + 1' | $out/bin/graalpython + + # TODO: `irb` on MacOS gives an error saying "Could not find OpenSSL + # headers, install via Homebrew or MacPorts or set OPENSSL_PREFIX", even + # though `openssl` is in `propagatedBuildInputs`. For more details see: + # https://github.com/NixOS/nixpkgs/pull/105815 + # echo '1 + 1' | $out/bin/irb + + echo '1 + 1' | $out/bin/node -i + ${lib.optionalString (javaVersion == "11") '' + echo '1 + 1' | $out/bin/jshell + ''}''; passthru.home = graalvmXXX-ce; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.graalvm.org/"; description = "High-Performance Polyglot VM"; license = with licenses; [ upl gpl2Classpath bsd3 ]; maintainers = with maintainers; [ bandresen volth hlolli glittershark ]; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; }; in diff --git a/pkgs/development/compilers/graalvm/default.nix b/pkgs/development/compilers/graalvm/default.nix index 337e0f735eb..fc30e37e4b7 100644 --- a/pkgs/development/compilers/graalvm/default.nix +++ b/pkgs/development/compilers/graalvm/default.nix @@ -270,7 +270,7 @@ in rec { --prefix PATH : ${lib.makeBinPath [ python27withPackages mercurial ]} \ --set FINDBUGS_HOME ${findbugs} ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/graalvm/mx"; description = "Command-line tool used for the development of Graal projects"; license = licenses.gpl2; @@ -527,7 +527,7 @@ in rec { enableParallelBuilding = true; passthru.home = graalvm8; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/oracle/graal"; description = "High-Performance Polyglot VM"; license = licenses.gpl2; diff --git a/pkgs/development/compilers/graalvm/enterprise-edition.nix b/pkgs/development/compilers/graalvm/enterprise-edition.nix index 690bfdb425c..c9c5206f6da 100644 --- a/pkgs/development/compilers/graalvm/enterprise-edition.nix +++ b/pkgs/development/compilers/graalvm/enterprise-edition.nix @@ -1,4 +1,4 @@ -{ stdenv, requireFile, perl, unzip, glibc, zlib, bzip2, gdk-pixbuf, xorg, glib, fontconfig, freetype, cairo, pango, gtk3, gtk2, ffmpeg, libGL, atk, alsaLib, libav_0_8, setJavaClassPath }: +{ lib, stdenv, requireFile, perl, unzip, glibc, zlib, bzip2, gdk-pixbuf, xorg, glib, fontconfig, freetype, cairo, pango, gtk3, gtk2, ffmpeg, libGL, atk, alsaLib, libav_0_8, setJavaClassPath }: let common = javaVersion: @@ -124,7 +124,7 @@ let "11" = "$out/lib/jli:$out/lib/server:$out/lib"; }.${javaVersion} }:${ - stdenv.lib.strings.makeLibraryPath [ glibc xorg.libXxf86vm xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender + lib.strings.makeLibraryPath [ glibc xorg.libXxf86vm xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender glib zlib bzip2 alsaLib fontconfig freetype pango gtk3 gtk2 cairo gdk-pixbuf atk ffmpeg libGL ]}" for f in $(find $out -type f -perm -0100); do @@ -141,7 +141,7 @@ let doInstallCheck = true; installCheckPhase = '' - echo ${stdenv.lib.escapeShellArg '' + echo ${lib.escapeShellArg '' public class HelloWorld { public static void main(String[] args) { System.out.println("Hello World"); @@ -167,7 +167,7 @@ let passthru.home = graalvmXXX-ee; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.graalvm.org/"; description = "High-Performance Polyglot VM"; license = licenses.unfree; diff --git a/pkgs/development/compilers/gwt/2.4.0.nix b/pkgs/development/compilers/gwt/2.4.0.nix index 14bf940fadf..e10d1012034 100644 --- a/pkgs/development/compilers/gwt/2.4.0.nix +++ b/pkgs/development/compilers/gwt/2.4.0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation { name = "gwt-java-2.4.0"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.gwtproject.org/"; description = "A development toolkit for building and optimizing complex browser-based applications"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/compilers/halide/default.nix b/pkgs/development/compilers/halide/default.nix index 1ff821edf80..69b7cd4d868 100644 --- a/pkgs/development/compilers/halide/default.nix +++ b/pkgs/development/compilers/halide/default.nix @@ -49,7 +49,7 @@ llvmPackages.stdenv.mkDerivation rec { description = "C++ based language for image processing and computational photography"; homepage = "https://halide-lang.org"; license = licenses.mit; - platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; + platforms = platforms.all; maintainers = [ maintainers.ck3d ]; }; } diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index a3110c0c1af..58451192396 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, coreutils, ocamlPackages, zlib, pcre, neko }: +{ lib, stdenv, fetchgit, coreutils, ocamlPackages, zlib, pcre, neko }: let inherit (ocamlPackages) ocaml camlp4; in @@ -74,7 +74,7 @@ let popd > /dev/null ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Programming language targeting JavaScript, Flash, NekoVM, PHP, C++"; homepage = "https://haxe.org"; license = with licenses; [ gpl2 bsd2 /*?*/ ]; # -> docs/license.txt diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix index c06e94a038f..d8495977e78 100644 --- a/pkgs/development/compilers/hhvm/default.nix +++ b/pkgs/development/compilers/hhvm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, pkg-config, boost, libunwind, libmemcached +{ lib, stdenv, fetchgit, cmake, pkg-config, boost, libunwind, libmemcached , pcre, libevent, gd, curl, libxml2, icu, flex, bison, openssl, zlib, php , expat, libcap, oniguruma, libdwarf, libmcrypt, tbb, gperftools, glog, libkrb5 , bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam, libpng @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { homepage = "https://hhvm.com"; license = "PHP/Zend"; platforms = [ "x86_64-linux" ]; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + maintainers = [ lib.maintainers.thoughtpolice ]; broken = true; # Since 2018-04-21, see https://hydra.nixos.org/build/73059373 }; } diff --git a/pkgs/development/compilers/hop/default.nix b/pkgs/development/compilers/hop/default.nix index fd3ef137ae6..8e5bd6a7df0 100644 --- a/pkgs/development/compilers/hop/default.nix +++ b/pkgs/development/compilers/hop/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, bigloo }: +{ lib, stdenv, fetchurl, bigloo }: # Compute the “release” version of bigloo (before the first dash, if any) let bigloo-release = - let inherit (stdenv.lib) head splitString; in + let inherit (lib) head splitString; in head (splitString "-" (builtins.parseDrvName bigloo.name).version) ; in @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { "--bigloolibdir=${bigloo}/lib/bigloo/${bigloo-release}/" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A multi-tier programming language for the Web 2.0 and the so-called diffuse Web"; homepage = "http://hop.inria.fr/"; license = licenses.gpl2Plus; diff --git a/pkgs/development/compilers/iasl/default.nix b/pkgs/development/compilers/iasl/default.nix index d68fba1d624..fb6bd41344a 100644 --- a/pkgs/development/compilers/iasl/default.nix +++ b/pkgs/development/compilers/iasl/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, fetchpatch, bison, flex}: +{lib, stdenv, fetchurl, fetchpatch, bison, flex}: stdenv.mkDerivation rec { pname = "iasl"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "Intel ACPI Compiler"; homepage = "http://www.acpica.org/"; - license = stdenv.lib.licenses.iasl; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.iasl; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/compilers/idris2/default.nix b/pkgs/development/compilers/idris2/default.nix index 275c2944462..ec0d8fe5c72 100644 --- a/pkgs/development/compilers/idris2/default.nix +++ b/pkgs/development/compilers/idris2/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, makeWrapper +{ lib, stdenv, fetchFromGitHub, makeWrapper , clang, chez }: # Uses scheme to bootstrap the build of idris2 stdenv.mkDerivation rec { pname = "idris2"; - version = "0.2.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "idris-lang"; repo = "Idris2"; rev = "v${version}"; - sha256 = "18m483vccijfh9z6x4zgi37fql3q765x3ypkwixv3rwq9nxnd6hm"; + sha256 = "0sa2lpb7n6xqfknwld9rzm4bnb6qcd0ja1n63cnc5v8wdzr8q7kh"; }; strictDeps = true; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; makeFlags = [ "PREFIX=$(out)" ] - ++ stdenv.lib.optional stdenv.isDarwin "OS="; + ++ lib.optional stdenv.isDarwin "OS="; # The name of the main executable of pkgs.chez is `scheme` buildFlags = [ "bootstrap-build" "SCHEME=scheme" ]; @@ -71,8 +71,8 @@ stdenv.mkDerivation rec { meta = { description = "A purely functional programming language with first class types"; homepage = "https://github.com/idris-lang/Idris2"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ wchresta ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ wchresta ]; inherit (chez.meta) platforms; }; } diff --git a/pkgs/development/compilers/inform6/default.nix b/pkgs/development/compilers/inform6/default.nix index 1d339a2b14b..f0c182f0207 100644 --- a/pkgs/development/compilers/inform6/default.nix +++ b/pkgs/development/compilers/inform6/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl }: +{ lib, stdenv, fetchurl, perl }: stdenv.mkDerivation rec { pname = "inform6"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Interactive fiction compiler and libraries"; longDescription = '' Inform 6 is a C-like programming language for writing interactive fiction @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.com/DavidGriffith/inform6unix"; changelog = "https://gitlab.com/DavidGriffith/inform6unix/-/raw/${version}/NEWS"; license = licenses.artistic2; - maintainers = with stdenv.lib.maintainers; [ ddelabru ]; + maintainers = with lib.maintainers; [ ddelabru ]; platforms = platforms.all; }; } diff --git a/pkgs/development/compilers/inform7/default.nix b/pkgs/development/compilers/inform7/default.nix index 8e5f02e792d..80349b7e6da 100644 --- a/pkgs/development/compilers/inform7/default.nix +++ b/pkgs/development/compilers/inform7/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, coreutils, perl, gnutar, gzip }: +{ lib, stdenv, fetchzip, coreutils, perl, gnutar, gzip }: let version = "6M62"; in stdenv.mkDerivation { @@ -21,7 +21,7 @@ in stdenv.mkDerivation { --replace "/usr/bin/perl" "${perl}/bin/perl" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A design system for interactive fiction"; homepage = "http://inform7.com/"; license = licenses.artistic2; diff --git a/pkgs/development/compilers/intel-graphics-compiler/default.nix b/pkgs/development/compilers/intel-graphics-compiler/default.nix index 8ca85817f9e..ebba160fc95 100644 --- a/pkgs/development/compilers/intel-graphics-compiler/default.nix +++ b/pkgs/development/compilers/intel-graphics-compiler/default.nix @@ -1,7 +1,7 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , bison , flex @@ -19,7 +19,7 @@ let }; inherit (llvmPkgs) llvm; inherit (if buildWithPatches then opencl-clang else llvmPkgs) clang clang-unwrapped spirv-llvm-translator; - inherit (stdenv.lib) getVersion optional optionals versionOlder versions; + inherit (lib) getVersion optional optionals versionOlder versions; in stdenv.mkDerivation rec { @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { "-DIGC_PREFERRED_LLVM_VERSION=${getVersion llvm}" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/intel/intel-graphics-compiler"; description = "LLVM-based compiler for OpenCL targeting Intel Gen graphics hardware"; license = licenses.mit; diff --git a/pkgs/development/compilers/intercal/default.nix b/pkgs/development/compilers/intercal/default.nix index 8b91e3f2c6d..d696b6801ed 100644 --- a/pkgs/development/compilers/intercal/default.nix +++ b/pkgs/development/compilers/intercal/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl -, pkgconfig +{ lib, stdenv, fetchurl +, pkg-config , bison, flex , makeWrapper }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "intercal"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ pkgconfig bison flex makeWrapper ]; + [ pkg-config bison flex makeWrapper ]; # Intercal invokes gcc, so we need an explicit PATH postInstall = '' diff --git a/pkgs/development/compilers/ios-cross-compile/9.2.nix b/pkgs/development/compilers/ios-cross-compile/9.2.nix index e64c0c912d9..688ca15177a 100644 --- a/pkgs/development/compilers/ios-cross-compile/9.2.nix +++ b/pkgs/development/compilers/ios-cross-compile/9.2.nix @@ -1,4 +1,4 @@ -{ stdenv, git, clang, +{ lib, git, clang, fetchFromGitHub, requireFile, openssl, xz, gnutar, automake, autoconf, libtool, clangStdenv } : @@ -57,9 +57,9 @@ clangStdenv.mkDerivation rec { meta = { description = "Provides an iOS cross compiler from 7.1 up to iOS-${version} and ldid"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; hydraPlatforms = []; - maintainers = with stdenv.lib.maintainers; [ fxfactorial ]; - license = stdenv.lib.licenses.gpl2; + maintainers = with lib.maintainers; [ fxfactorial ]; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix index 01e1eaca6e1..d1ac7bcd0ef 100644 --- a/pkgs/development/compilers/ispc/default.nix +++ b/pkgs/development/compilers/ispc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , cmake, which, m4, python3, bison, flex, llvmPackages # the default test target is sse4, but that is not supported by all Hydra agents @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { "-DARM_ENABLED=FALSE" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://ispc.github.io/"; description = "Intel 'Single Program, Multiple Data' Compiler, a vectorised language"; license = licenses.bsd3; diff --git a/pkgs/development/compilers/jasmin/default.nix b/pkgs/development/compilers/jasmin/default.nix index 7defdc5c689..c61f267bf1a 100644 --- a/pkgs/development/compilers/jasmin/default.nix +++ b/pkgs/development/compilers/jasmin/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , unzip , jdk8 @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { minimal-module = callPackage ./test-assemble-hello-world {}; }; - meta = with stdenv.lib; { + meta = with lib; { description = "An assembler for the Java Virtual Machine"; homepage = "http://jasmin.sourceforge.net/"; downloadPage = "https://sourceforge.net/projects/jasmin/files/latest/download"; diff --git a/pkgs/development/compilers/javacard-devkit/default.nix b/pkgs/development/compilers/javacard-devkit/default.nix index 5b691530d34..88371406387 100644 --- a/pkgs/development/compilers/javacard-devkit/default.nix +++ b/pkgs/development/compilers/javacard-devkit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, requireFile, unzip, makeWrapper, oraclejdk8, autoPatchelfHook +{ lib, stdenv, requireFile, unzip, makeWrapper, oraclejdk8, autoPatchelfHook , pcsclite }: @@ -62,8 +62,8 @@ stdenv.mkDerivation rec { For more details, please refer to the documentation by Oracle ''; homepage = "https://www.oracle.com/technetwork/java/embedded/javacard/overview/index.html"; - license = stdenv.lib.licenses.unfree; - maintainers = [ stdenv.lib.maintainers.ekleog ]; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.ekleog ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix index fd3270fa0d0..3b5465ac9c3 100644 --- a/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, openjdk11, fetchFromGitHub, jetbrains }: +{ lib, openjdk11, fetchFromGitHub, jetbrains }: openjdk11.overrideAttrs (oldAttrs: rec { pname = "jetbrains-jdk"; @@ -6,11 +6,11 @@ openjdk11.overrideAttrs (oldAttrs: rec { src = fetchFromGitHub { owner = "JetBrains"; repo = "JetBrainsRuntime"; - rev = "jb${stdenv.lib.replaceStrings ["."] ["_"] version}"; + rev = "jb${lib.replaceStrings ["."] ["_"] version}"; sha256 = "1gxqi6dkyriv9j29ppan638w1ns2g9m4q1sq7arf9kwqr05zim90"; }; patches = []; - meta = with stdenv.lib; { + meta = with lib; { description = "An OpenJDK fork to better support Jetbrains's products."; longDescription = '' JetBrains Runtime is a runtime environment for running IntelliJ Platform diff --git a/pkgs/development/compilers/julia/1.0.nix b/pkgs/development/compilers/julia/1.0.nix index 0325632ad0a..98d7ce90de3 100644 --- a/pkgs/development/compilers/julia/1.0.nix +++ b/pkgs/development/compilers/julia/1.0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchpatch, fetchurl, fetchzip +{ lib, stdenv, fetchpatch, fetchurl, fetchzip # build tools , gfortran, m4, makeWrapper, patchelf, perl, which, python2 , cmake @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { pcre2.dev blas lapack openlibm openspecfun readline utf8proc zlib ] - ++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices] + ++ lib.optionals stdenv.isDarwin [CoreServices ApplicationServices] ; patches = [ @@ -121,9 +121,9 @@ stdenv.mkDerivation rec { makeFlags = let - arch = stdenv.lib.head (stdenv.lib.splitString "-" stdenv.system); + arch = lib.head (lib.splitString "-" stdenv.system); march = { - x86_64 = stdenv.hostPlatform.platform.gcc.arch or "x86-64"; + x86_64 = stdenv.hostPlatform.gcc.arch or "x86-64"; i686 = "pentium4"; aarch64 = "armv8-a"; }.${arch} @@ -166,7 +166,7 @@ stdenv.mkDerivation rec { "USE_SYSTEM_ZLIB=1" ]; - LD_LIBRARY_PATH = assert (blas.isILP64 == lapack.isILP64); (stdenv.lib.makeLibraryPath [ + LD_LIBRARY_PATH = assert (blas.isILP64 == lapack.isILP64); (lib.makeLibraryPath [ arpack fftw fftwSinglePrec gmp libgit2 mpfr blas lapack openlibm openspecfun pcre2 ]); @@ -204,8 +204,8 @@ stdenv.mkDerivation rec { meta = { description = "High-level performance-oriented dynamical language for technical computing"; homepage = "https://julialang.org/"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ raskin rob garrison ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ raskin rob garrison ]; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]; }; } diff --git a/pkgs/development/compilers/julia/1.3.nix b/pkgs/development/compilers/julia/1.3.nix index 8096af0b320..da60fa8b988 100644 --- a/pkgs/development/compilers/julia/1.3.nix +++ b/pkgs/development/compilers/julia/1.3.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchzip, fetchFromGitHub +{ lib, stdenv, fetchurl, fetchzip, fetchFromGitHub # build tools , gfortran, m4, makeWrapper, patchelf, perl, which, python2 , cmake @@ -14,7 +14,7 @@ assert (!blas.isILP64) && (!lapack.isILP64); -with stdenv.lib; +with lib; let majorVersion = "1"; @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { pcre2.dev blas lapack openlibm openspecfun readline utf8proc zlib ] - ++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices] + ++ lib.optionals stdenv.isDarwin [CoreServices ApplicationServices] ; nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ]; @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { let arch = head (splitString "-" stdenv.system); march = { - x86_64 = stdenv.hostPlatform.platform.gcc.arch or "x86-64"; + x86_64 = stdenv.hostPlatform.gcc.arch or "x86-64"; i686 = "pentium4"; aarch64 = "armv8-a"; }.${arch} @@ -153,8 +153,8 @@ stdenv.mkDerivation rec { meta = { description = "High-level performance-oriented dynamical language for technical computing"; homepage = "https://julialang.org/"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ raskin rob garrison ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ raskin rob garrison ]; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; broken = stdenv.isi686; }; diff --git a/pkgs/development/compilers/julia/1.5.nix b/pkgs/development/compilers/julia/1.5.nix index be3cfc39635..a523336b7b9 100644 --- a/pkgs/development/compilers/julia/1.5.nix +++ b/pkgs/development/compilers/julia/1.5.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchzip, fetchFromGitHub +{ lib, stdenv, fetchurl, fetchzip, fetchFromGitHub # build tools , gfortran, m4, makeWrapper, patchelf, perl, which, python2 , cmake @@ -14,7 +14,7 @@ assert (!blas.isILP64) && (!lapack.isILP64); -with stdenv.lib; +with lib; let majorVersion = "1"; @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { arpack fftw fftwSinglePrec libgit2 libunwind mpfr pcre2.dev blas lapack openlibm openspecfun readline utf8proc zlib - ] ++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices]; + ] ++ lib.optionals stdenv.isDarwin [CoreServices ApplicationServices]; nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which cmake ]; @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { let arch = head (splitString "-" stdenv.system); march = { - x86_64 = stdenv.hostPlatform.platform.gcc.arch or "x86-64"; + x86_64 = stdenv.hostPlatform.gcc.arch or "x86-64"; i686 = "pentium4"; aarch64 = "armv8-a"; }.${arch} @@ -150,8 +150,8 @@ stdenv.mkDerivation rec { meta = { description = "High-level performance-oriented dynamical language for technical computing"; homepage = "https://julialang.org/"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ raskin rob garrison ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ raskin rob garrison ]; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]; broken = stdenv.isi686; }; diff --git a/pkgs/development/compilers/jwasm/default.nix b/pkgs/development/compilers/jwasm/default.nix index 8ce55c75795..2f1727ae0de 100644 --- a/pkgs/development/compilers/jwasm/default.nix +++ b/pkgs/development/compilers/jwasm/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , cmake }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "jwasm"; version = "2.13"; diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index 934c9a848b9..cd613c1b33b 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, jre, unzip }: +{ lib, stdenv, fetchurl, makeWrapper, jre, unzip }: let version = "1.4.21"; @@ -38,9 +38,9 @@ in stdenv.mkDerivation { and has external contributors. ''; homepage = "https://kotlinlang.org/"; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ ]; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/compilers/ldc/binary.nix b/pkgs/development/compilers/ldc/binary.nix index cbdb56efb17..3a07009296a 100644 --- a/pkgs/development/compilers/ldc/binary.nix +++ b/pkgs/development/compilers/ldc/binary.nix @@ -1,10 +1,11 @@ -{ stdenv, fetchurl, curl, tzdata, autoPatchelfHook, fixDarwinDylibNames, libxml2 +{ lib, stdenv, fetchurl, curl, tzdata, autoPatchelfHook, fixDarwinDylibNames, libxml2 , version, hashes }: -with stdenv; + let - OS = if hostPlatform.isDarwin then "osx" else hostPlatform.parsed.kernel.name; + inherit (stdenv) hostPlatform; + OS = if stdenv.hostPlatform.isDarwin then "osx" else hostPlatform.parsed.kernel.name; ARCH = toString hostPlatform.parsed.cpu.name; -in mkDerivation { +in stdenv.mkDerivation { pname = "ldc-bootstrap"; inherit version; diff --git a/pkgs/development/compilers/ldc/generic.nix b/pkgs/development/compilers/ldc/generic.nix index 19dc140a7e1..4261c2b6533 100644 --- a/pkgs/development/compilers/ldc/generic.nix +++ b/pkgs/development/compilers/ldc/generic.nix @@ -1,5 +1,5 @@ { version, ldcSha256 }: -{ stdenv, fetchurl, cmake, ninja, llvm_11, curl, tzdata +{ lib, stdenv, fetchurl, cmake, ninja, llvm_11, curl, tzdata , libconfig, lit, gdb, unzip, darwin, bash , callPackage, makeWrapper, runCommand, targetPackages , ldcBootstrap ? callPackage ./bootstrap.nix { } @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { # test depends on current year rm ldc-${version}-src/tests/d2/dmd-testsuite/compilable/ddocYear.d '' - + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' # https://github.com/NixOS/nixpkgs/issues/34817 rm -r ldc-${version}-src/tests/plugins/addFuncEntryCall ''; @@ -46,20 +46,20 @@ stdenv.mkDerivation rec { # Setting SHELL=$SHELL when dmd testsuite is run doesn't work on Linux somehow substituteInPlace tests/d2/dmd-testsuite/Makefile --replace "SHELL=/bin/bash" "SHELL=${bash}/bin/bash" '' - + stdenv.lib.optionalString stdenv.hostPlatform.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace runtime/phobos/std/socket.d --replace "assert(ih.addrList[0] == 0x7F_00_00_01);" "" '' - + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace runtime/phobos/std/socket.d --replace "foreach (name; names)" "names = []; foreach (name; names)" ''; nativeBuildInputs = [ cmake ldcBootstrap lit lit.python llvm_11 makeWrapper ninja unzip ] - ++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation ] - ++ stdenv.lib.optionals (!stdenv.hostPlatform.isDarwin) [ + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ # https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818 gdb ]; @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { makeFlags = [ "DMD=$DMD" ]; - fixNames = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' + fixNames = lib.optionalString stdenv.hostPlatform.isDarwin '' fixDarwinDylibNames() { local flags=() @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { ''; # https://github.com/ldc-developers/ldc/issues/2497#issuecomment-459633746 - additionalExceptions = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin + additionalExceptions = lib.optionalString stdenv.hostPlatform.isDarwin "|druntime-test-shared"; checkPhase = '' @@ -126,7 +126,7 @@ stdenv.mkDerivation rec { --set-default CC "${targetPackages.stdenv.cc}/bin/cc" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "The LLVM-based D compiler"; homepage = "https://github.com/ldc-developers/ldc"; # from https://github.com/ldc-developers/ldc/blob/master/LICENSE diff --git a/pkgs/development/compilers/llvm/10/clang/default.nix b/pkgs/development/compilers/llvm/10/clang/default.nix index d01d1a2a53d..35b7ab313d8 100644 --- a/pkgs/development/compilers/llvm/10/clang/default.nix +++ b/pkgs/development/compilers/llvm/10/clang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3, lld +{ lib, stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3, lld , fixDarwinDylibNames , enableManpages ? false }: @@ -19,8 +19,8 @@ let ''; nativeBuildInputs = [ cmake python3 lld ] - ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + ++ lib.optional enableManpages python3.pkgs.sphinx + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ libxml2 llvm ]; @@ -28,7 +28,7 @@ let "-DCMAKE_CXX_FLAGS=-std=c++14" "-DCLANGD_BUILD_XPC=OFF" "-DLLVM_ENABLE_RTTI=ON" - ] ++ stdenv.lib.optionals enableManpages [ + ] ++ lib.optionals enableManpages [ "-DCLANG_INCLUDE_DOCS=ON" "-DLLVM_ENABLE_SPHINX=ON" "-DSPHINX_OUTPUT_MAN=ON" @@ -49,9 +49,9 @@ let # Patch for standalone doc building sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt - '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + '' + lib.optionalString stdenv.hostPlatform.isMusl '' sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp - '' + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace tools/extra/clangd/CMakeLists.txt \ --replace "NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB" FALSE ''; @@ -90,10 +90,10 @@ let meta = { description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; homepage = "https://llvm.org/"; - license = stdenv.lib.licenses.ncsa; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.ncsa; + platforms = lib.platforms.all; }; - } // stdenv.lib.optionalAttrs enableManpages { + } // lib.optionalAttrs enableManpages { pname = "clang-manpages"; buildPhase = '' diff --git a/pkgs/development/compilers/llvm/10/compiler-rt.nix b/pkgs/development/compilers/llvm/10/compiler-rt.nix index 568bdff67c0..37515b5039d 100644 --- a/pkgs/development/compilers/llvm/10/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/10/compiler-rt.nix @@ -1,4 +1,4 @@ -{ stdenv, version, fetch, cmake, python3, llvm, libcxxabi }: +{ lib, stdenv, version, fetch, cmake, python3, llvm, libcxxabi }: let @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetch pname "1yjqjri753w0fzmxcyz687nvd97sbc9rsqrxzpq720na47hwh3fr"; nativeBuildInputs = [ cmake python3 llvm ]; - buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi; NIX_CFLAGS_COMPILE = [ "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" @@ -24,24 +24,24 @@ stdenv.mkDerivation rec { "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON" "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}" "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}" - ] ++ stdenv.lib.optionals (useLLVM || bareMetal || isMusl) [ + ] ++ lib.optionals (useLLVM || bareMetal || isMusl) [ "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" "-DCOMPILER_RT_BUILD_XRAY=OFF" "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF" "-DCOMPILER_RT_BUILD_PROFILE=OFF" - ] ++ stdenv.lib.optionals (useLLVM || bareMetal) [ + ] ++ lib.optionals (useLLVM || bareMetal) [ "-DCMAKE_C_COMPILER_WORKS=ON" "-DCMAKE_CXX_COMPILER_WORKS=ON" "-DCOMPILER_RT_BAREMETAL_BUILD=ON" "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}" - ] ++ stdenv.lib.optionals (useLLVM) [ + ] ++ lib.optionals (useLLVM) [ "-DCOMPILER_RT_BUILD_BUILTINS=ON" "-DCMAKE_C_FLAGS=-nodefaultlibs" #https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY" - ] ++ stdenv.lib.optionals (bareMetal) [ + ] ++ lib.optionals (bareMetal) [ "-DCOMPILER_RT_OS_DIR=baremetal" - ] ++ stdenv.lib.optionals (stdenv.hostPlatform.isDarwin) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ # The compiler-rt build infrastructure sniffs supported platforms on Darwin # and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails # when it tries to use libc++ and libc++api for i386. @@ -53,8 +53,8 @@ stdenv.mkDerivation rec { patches = [ ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory ./find-darwin-sdk-version.patch # don't test for macOS being >= 10.15 - ]# ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch - ++ stdenv.lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch; + ]# ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch + ++ lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch; # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks @@ -62,13 +62,13 @@ stdenv.mkDerivation rec { # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by # a flag and turn the flag off during the stdenv build. - postPatch = stdenv.lib.optionalString (!stdenv.isDarwin) '' + postPatch = lib.optionalString (!stdenv.isDarwin) '' substituteInPlace cmake/builtin-config-ix.cmake \ --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)' - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' substituteInPlace cmake/config-ix.cmake \ --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' - '' + stdenv.lib.optionalString (useLLVM) '' + '' + lib.optionalString (useLLVM) '' substituteInPlace lib/builtins/int_util.c \ --replace "#include <stdlib.h>" "" substituteInPlace lib/builtins/clear_cache.c \ @@ -78,9 +78,9 @@ stdenv.mkDerivation rec { ''; # Hack around weird upsream RPATH bug - postInstall = stdenv.lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) '' + postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) '' ln -s "$out/lib"/*/* "$out/lib" - '' + stdenv.lib.optionalString (useLLVM) '' + '' + lib.optionalString (useLLVM) '' ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/crtbegin.o ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/crtend.o ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/crtbeginS.o diff --git a/pkgs/development/compilers/llvm/10/default.nix b/pkgs/development/compilers/llvm/10/default.nix index 3d2cb3544b9..978f2895666 100644 --- a/pkgs/development/compilers/llvm/10/default.nix +++ b/pkgs/development/compilers/llvm/10/default.nix @@ -1,4 +1,4 @@ -{ lowPrio, newScope, pkgs, stdenv, cmake, gccForLibs +{ lowPrio, newScope, pkgs, lib, stdenv, cmake, gccForLibs , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith , buildPackages , buildLlvmTools # tools, but from the previous stage, for cross @@ -17,7 +17,7 @@ let clang-tools-extra_src = fetch "clang-tools-extra" "06n1yp638rh24xdxv9v2df0qajxbjz4w59b7dd4ky36drwmpi4yh"; - tools = stdenv.lib.makeExtensible (tools: let + tools = lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); mkExtraBuildCommands = cc: '' rsrc="$out/resource-root" @@ -26,8 +26,6 @@ let ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - '' + stdenv.lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) '' - echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags ''; in { @@ -101,15 +99,15 @@ let extraPackages = [ targetLlvmLibraries.libcxxabi targetLlvmLibraries.compiler-rt - ] ++ stdenv.lib.optionals (!stdenv.targetPlatform.isWasm) [ + ] ++ lib.optionals (!stdenv.targetPlatform.isWasm) [ targetLlvmLibraries.libunwind ]; extraBuildCommands = '' echo "-rtlib=compiler-rt -Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags - '' + stdenv.lib.optionalString (!stdenv.targetPlatform.isWasm) '' + '' + lib.optionalString (!stdenv.targetPlatform.isWasm) '' echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags - '' + stdenv.lib.optionalString stdenv.targetPlatform.isWasm '' + '' + lib.optionalString stdenv.targetPlatform.isWasm '' echo "-fno-exceptions" >> $out/nix-support/cc-cflags '' + mkExtraBuildCommands cc; }; @@ -161,12 +159,12 @@ let }); - libraries = stdenv.lib.makeExtensible (libraries: let + libraries = lib.makeExtensible (libraries: let callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); in { compiler-rt = callPackage ./compiler-rt.nix ({} // - (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { + (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { stdenv = overrideCC stdenv buildLlvmTools.lldClangNoCompilerRt; })); @@ -175,12 +173,12 @@ let libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; libcxx = callPackage ./libc++ ({} // - (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { + (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; })); libcxxabi = callPackage ./libc++abi.nix ({} // - (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { + (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; libunwind = libraries.libunwind; })); @@ -188,7 +186,7 @@ let openmp = callPackage ./openmp.nix {}; libunwind = callPackage ./libunwind.nix ({} // - (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { + (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; })); diff --git a/pkgs/development/compilers/llvm/10/libc++/default.nix b/pkgs/development/compilers/llvm/10/libc++/default.nix index 9b501aff1ab..a3fb0927345 100644 --- a/pkgs/development/compilers/llvm/10/libc++/default.nix +++ b/pkgs/development/compilers/llvm/10/libc++/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include" ''; - patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch; + patches = lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch; preConfigure = '' # Get headers from the cxxabi source so we can see private headers not installed by the cxxabi package @@ -22,8 +22,8 @@ stdenv.mkDerivation { patchShebangs utils/cat_files.py ''; nativeBuildInputs = [ cmake ] - ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python3 - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python3 + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ libcxxabi ]; @@ -31,13 +31,13 @@ stdenv.mkDerivation { "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" "-DLIBCXX_LIBCPPABI_VERSION=2" "-DLIBCXX_CXX_ABI=libcxxabi" - ] ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1" - ++ stdenv.lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON" - ++ stdenv.lib.optional stdenv.hostPlatform.isWasm [ + ] ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1" + ++ lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON" + ++ lib.optional stdenv.hostPlatform.isWasm [ "-DLIBCXX_ENABLE_THREADS=OFF" "-DLIBCXX_ENABLE_FILESYSTEM=OFF" "-DLIBCXX_ENABLE_EXCEPTIONS=OFF" - ] ++ stdenv.lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF"; + ] ++ lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF"; passthru = { isLLVM = true; @@ -46,7 +46,7 @@ stdenv.mkDerivation { meta = { homepage = "https://libcxx.llvm.org/"; description = "A new implementation of the C++ standard library, targeting C++11"; - license = with stdenv.lib.licenses; [ ncsa mit ]; - platforms = stdenv.lib.platforms.all; + license = with lib.licenses; [ ncsa mit ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/compilers/llvm/10/libc++abi.nix b/pkgs/development/compilers/llvm/10/libc++abi.nix index 7335d06e4fe..61f778fbc55 100644 --- a/pkgs/development/compilers/llvm/10/libc++abi.nix +++ b/pkgs/development/compilers/llvm/10/libc++abi.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version +{ lib, stdenv, cmake, fetch, libcxx, libunwind, llvm, version , enableShared ? !stdenv.hostPlatform.isStatic }: @@ -9,15 +9,15 @@ stdenv.mkDerivation { src = fetch "libcxxabi" "0yqs722y76cwvmfsq0lb917r9m3fci7bf5z3yzl71yz9n88ghzm9"; nativeBuildInputs = [ cmake ]; - buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind; + buildInputs = lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind; - cmakeFlags = stdenv.lib.optionals (stdenv.hostPlatform.useLLVM or false) [ + cmakeFlags = lib.optionals (stdenv.hostPlatform.useLLVM or false) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" - ] ++ stdenv.lib.optionals stdenv.hostPlatform.isWasm [ + ] ++ lib.optionals stdenv.hostPlatform.isWasm [ "-DLIBCXXABI_ENABLE_THREADS=OFF" "-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF" - ] ++ stdenv.lib.optionals (!enableShared) [ + ] ++ lib.optionals (!enableShared) [ "-DLIBCXXABI_ENABLE_SHARED=OFF" ]; @@ -27,11 +27,11 @@ stdenv.mkDerivation { unpackFile ${libcxx.src} unpackFile ${llvm.src} cmakeFlags+=" -DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_PATH=$PWD/$(ls -d libcxx-*)" - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' export TRIPLE=x86_64-apple-darwin - '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + '' + lib.optionalString stdenv.hostPlatform.isMusl '' patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch} - '' + stdenv.lib.optionalString stdenv.hostPlatform.isWasm '' + '' + lib.optionalString stdenv.hostPlatform.isWasm '' patch -p1 -d $(ls -d llvm-*) -i ${./libcxxabi-wasm.patch} ''; @@ -52,7 +52,7 @@ stdenv.mkDerivation { install -d -m 755 $out/include $out/lib install -m 644 lib/libc++abi.a $out/lib install -m 644 ../include/cxxabi.h $out/include - '' + stdenv.lib.optionalString enableShared '' + '' + lib.optionalString enableShared '' install -m 644 lib/libc++abi.so.1.0 $out/lib ln -s libc++abi.so.1.0 $out/lib/libc++abi.so ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1 @@ -61,8 +61,8 @@ stdenv.mkDerivation { meta = { homepage = "https://libcxxabi.llvm.org/"; description = "A new implementation of low level support for a standard C++ library"; - license = with stdenv.lib.licenses; [ ncsa mit ]; - maintainers = with stdenv.lib.maintainers; [ vlstill ]; - platforms = stdenv.lib.platforms.all; + license = with lib.licenses; [ ncsa mit ]; + maintainers = with lib.maintainers; [ vlstill ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/compilers/llvm/10/libunwind.nix b/pkgs/development/compilers/llvm/10/libunwind.nix index 8088ae97303..f0f45780a22 100644 --- a/pkgs/development/compilers/llvm/10/libunwind.nix +++ b/pkgs/development/compilers/llvm/10/libunwind.nix @@ -1,4 +1,4 @@ -{ stdenv, version, fetch, cmake, fetchpatch +{ lib, stdenv, version, fetch, cmake, fetchpatch , enableShared ? !stdenv.hostPlatform.isStatic }: @@ -10,5 +10,5 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - cmakeFlags = stdenv.lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF"; + cmakeFlags = lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF"; } diff --git a/pkgs/development/compilers/llvm/10/lld.nix b/pkgs/development/compilers/llvm/10/lld.nix index a0cb9c117a8..a94c1b5b0dd 100644 --- a/pkgs/development/compilers/llvm/10/lld.nix +++ b/pkgs/development/compilers/llvm/10/lld.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetch , cmake , libxml2 @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "The LLVM Linker"; homepage = "https://lld.llvm.org/"; - license = stdenv.lib.licenses.ncsa; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.ncsa; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/compilers/llvm/10/lldb.nix b/pkgs/development/compilers/llvm/10/lldb.nix index fc5edadd0a4..e7dd48a23ce 100644 --- a/pkgs/development/compilers/llvm/10/lldb.nix +++ b/pkgs/development/compilers/llvm/10/lldb.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetch , cmake , zlib @@ -25,7 +25,7 @@ stdenv.mkDerivation (rec { patches = [ ./lldb-procfs.patch ]; nativeBuildInputs = [ cmake python3 which swig lit ] - ++ stdenv.lib.optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.recommonmark ]; + ++ lib.optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.recommonmark ]; buildInputs = [ ncurses @@ -34,7 +34,7 @@ stdenv.mkDerivation (rec { libxml2 llvm ] - ++ stdenv.lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation @@ -49,11 +49,11 @@ stdenv.mkDerivation (rec { "-DLLVM_ENABLE_RTTI=OFF" "-DClang_DIR=${clang-unwrapped}/lib/cmake" "-DLLVM_EXTERNAL_LIT=${lit}/bin/lit" - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ "-DLLDB_USE_SYSTEM_DEBUGSERVER=ON" - ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.isDarwin) [ "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic - ] ++ stdenv.lib.optionals enableManpages [ + ] ++ lib.optionals enableManpages [ "-DLLVM_ENABLE_SPHINX=ON" "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" @@ -67,13 +67,13 @@ stdenv.mkDerivation (rec { ln -s $out/bin/lldb-vscode $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A next-generation high-performance debugger"; homepage = "https://lldb.llvm.org"; license = licenses.ncsa; platforms = platforms.all; }; -} // stdenv.lib.optionalAttrs enableManpages { +} // lib.optionalAttrs enableManpages { pname = "lldb-manpages"; buildPhase = '' diff --git a/pkgs/development/compilers/llvm/10/llvm.nix b/pkgs/development/compilers/llvm/10/llvm.nix index 7e6c7c02526..e951375a833 100644 --- a/pkgs/development/compilers/llvm/10/llvm.nix +++ b/pkgs/development/compilers/llvm/10/llvm.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetch , cmake , python3 @@ -22,10 +22,10 @@ }: let - inherit (stdenv.lib) optional optionals optionalString; + inherit (lib) optional optionals optionalString; # Used when creating a version-suffixed symlink of libLLVM.dylib - shortVersion = with stdenv.lib; + shortVersion = with lib; concatStringsSep "." (take 1 (splitString "." release_version)); in stdenv.mkDerivation (rec { @@ -158,11 +158,11 @@ in stdenv.mkDerivation (rec { meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = "https://llvm.org/"; - license = stdenv.lib.licenses.ncsa; - maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.ncsa; + maintainers = with lib.maintainers; [ lovek323 raskin dtzWill ]; + platforms = lib.platforms.all; }; -} // stdenv.lib.optionalAttrs enableManpages { +} // lib.optionalAttrs enableManpages { pname = "llvm-manpages"; buildPhase = '' diff --git a/pkgs/development/compilers/llvm/10/openmp.nix b/pkgs/development/compilers/llvm/10/openmp.nix index e3c1e66376a..2946c51fafe 100644 --- a/pkgs/development/compilers/llvm/10/openmp.nix +++ b/pkgs/development/compilers/llvm/10/openmp.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , fetch , cmake , llvm @@ -18,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Components required to build an executable OpenMP program"; homepage = "https://openmp.llvm.org/"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.mit; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/compilers/llvm/11/clang/default.nix b/pkgs/development/compilers/llvm/11/clang/default.nix index 24d6da97bf1..3a3e384ad98 100644 --- a/pkgs/development/compilers/llvm/11/clang/default.nix +++ b/pkgs/development/compilers/llvm/11/clang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3, lld +{ lib, stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3, lld , fixDarwinDylibNames , enableManpages ? false }: @@ -20,15 +20,15 @@ let ''; nativeBuildInputs = [ cmake python3 lld ] - ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + ++ lib.optional enableManpages python3.pkgs.sphinx + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ libxml2 llvm ]; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++14" "-DCLANGD_BUILD_XPC=OFF" - ] ++ stdenv.lib.optionals enableManpages [ + ] ++ lib.optionals enableManpages [ "-DCLANG_INCLUDE_DOCS=ON" "-DLLVM_ENABLE_SPHINX=ON" "-DSPHINX_OUTPUT_MAN=ON" @@ -48,9 +48,9 @@ let # Patch for standalone doc building sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt - '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + '' + lib.optionalString stdenv.hostPlatform.isMusl '' sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp - '' + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace tools/extra/clangd/CMakeLists.txt \ --replace "NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB" FALSE ''; @@ -89,10 +89,10 @@ let meta = { description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; homepage = "https://llvm.org/"; - license = stdenv.lib.licenses.ncsa; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.ncsa; + platforms = lib.platforms.all; }; - } // stdenv.lib.optionalAttrs enableManpages { + } // lib.optionalAttrs enableManpages { pname = "clang-manpages"; buildPhase = '' diff --git a/pkgs/development/compilers/llvm/11/compiler-rt.nix b/pkgs/development/compilers/llvm/11/compiler-rt.nix index 3f8c092fce2..091f327550b 100644 --- a/pkgs/development/compilers/llvm/11/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/11/compiler-rt.nix @@ -1,4 +1,4 @@ -{ stdenv, version, fetch, cmake, python3, llvm, libcxxabi }: +{ lib, stdenv, version, fetch, cmake, python3, llvm, libcxxabi }: let @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetch pname "1z470r8c5aahdwkmflglx998n0i77j8b1c69d7cir1kf27qy6yq8"; nativeBuildInputs = [ cmake python3 llvm ]; - buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi; NIX_CFLAGS_COMPILE = [ "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" @@ -24,24 +24,24 @@ stdenv.mkDerivation rec { "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON" "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}" "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}" - ] ++ stdenv.lib.optionals (stdenv.isDarwin) [ + ] ++ lib.optionals (stdenv.isDarwin) [ "-DDARWIN_macosx_OVERRIDE_SDK_VERSION=ON" - ] ++ stdenv.lib.optionals (useLLVM || bareMetal || isMusl) [ + ] ++ lib.optionals (useLLVM || bareMetal || isMusl) [ "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" "-DCOMPILER_RT_BUILD_XRAY=OFF" "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF" "-DCOMPILER_RT_BUILD_PROFILE=OFF" - ] ++ stdenv.lib.optionals (useLLVM || bareMetal) [ + ] ++ lib.optionals (useLLVM || bareMetal) [ "-DCMAKE_C_COMPILER_WORKS=ON" "-DCMAKE_CXX_COMPILER_WORKS=ON" "-DCOMPILER_RT_BAREMETAL_BUILD=ON" "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}" - ] ++ stdenv.lib.optionals (useLLVM) [ + ] ++ lib.optionals (useLLVM) [ "-DCOMPILER_RT_BUILD_BUILTINS=ON" "-DCMAKE_C_FLAGS=-nodefaultlibs" #https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY" - ] ++ stdenv.lib.optionals (bareMetal) [ + ] ++ lib.optionals (bareMetal) [ "-DCOMPILER_RT_OS_DIR=baremetal" ]; @@ -50,8 +50,8 @@ stdenv.mkDerivation rec { patches = [ ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory ./compiler-rt-X86-support-extension.patch # Add support for i486 i586 i686 by reusing i386 config - ]# ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch - ++ stdenv.lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch; + ]# ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch + ++ lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch; # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks @@ -59,15 +59,15 @@ stdenv.mkDerivation rec { # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by # a flag and turn the flag off during the stdenv build. - postPatch = stdenv.lib.optionalString (!stdenv.isDarwin) '' + postPatch = lib.optionalString (!stdenv.isDarwin) '' substituteInPlace cmake/builtin-config-ix.cmake \ --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)' - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' substituteInPlace cmake/builtin-config-ix.cmake \ --replace 'set(ARM64 arm64 arm64e)' 'set(ARM64)' substituteInPlace cmake/config-ix.cmake \ --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' - '' + stdenv.lib.optionalString (useLLVM) '' + '' + lib.optionalString (useLLVM) '' substituteInPlace lib/builtins/int_util.c \ --replace "#include <stdlib.h>" "" substituteInPlace lib/builtins/clear_cache.c \ @@ -77,9 +77,9 @@ stdenv.mkDerivation rec { ''; # Hack around weird upsream RPATH bug - postInstall = stdenv.lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) '' + postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) '' ln -s "$out/lib"/*/* "$out/lib" - '' + stdenv.lib.optionalString (useLLVM) '' + '' + lib.optionalString (useLLVM) '' ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/crtbegin.o ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/crtend.o ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/crtbeginS.o diff --git a/pkgs/development/compilers/llvm/11/default.nix b/pkgs/development/compilers/llvm/11/default.nix index b354bd6b44a..ca9ef4382b4 100644 --- a/pkgs/development/compilers/llvm/11/default.nix +++ b/pkgs/development/compilers/llvm/11/default.nix @@ -1,4 +1,4 @@ -{ lowPrio, newScope, pkgs, stdenv, cmake, gccForLibs +{ lowPrio, newScope, pkgs, lib, stdenv, cmake, gccForLibs , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith , buildPackages , buildLlvmTools # tools, but from the previous stage, for cross @@ -8,7 +8,7 @@ let release_version = "11.0.1"; candidate = ""; # empty or "rcN" - dash-candidate = stdenv.lib.optionalString (candidate != "") "-${candidate}"; + dash-candidate = lib.optionalString (candidate != "") "-${candidate}"; version = "${release_version}${dash-candidate}"; # differentiating these (variables) is important for RCs targetConfig = stdenv.targetPlatform.config; @@ -19,7 +19,7 @@ let clang-tools-extra_src = fetch "clang-tools-extra" "1j8n6n4l54k2lrdxh266y1fl4z8vy5dc76wsf0csk5n3ikfi38ic"; - tools = stdenv.lib.makeExtensible (tools: let + tools = lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); mkExtraBuildCommands = cc: '' rsrc="$out/resource-root" @@ -28,8 +28,6 @@ let ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - '' + stdenv.lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) '' - echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags ''; in { @@ -103,15 +101,15 @@ let extraPackages = [ targetLlvmLibraries.libcxxabi targetLlvmLibraries.compiler-rt - ] ++ stdenv.lib.optionals (!stdenv.targetPlatform.isWasm) [ + ] ++ lib.optionals (!stdenv.targetPlatform.isWasm) [ targetLlvmLibraries.libunwind ]; extraBuildCommands = '' echo "-rtlib=compiler-rt -Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags - '' + stdenv.lib.optionalString (!stdenv.targetPlatform.isWasm) '' + '' + lib.optionalString (!stdenv.targetPlatform.isWasm) '' echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags - '' + stdenv.lib.optionalString stdenv.targetPlatform.isWasm '' + '' + lib.optionalString stdenv.targetPlatform.isWasm '' echo "-fno-exceptions" >> $out/nix-support/cc-cflags '' + mkExtraBuildCommands cc; }; @@ -163,12 +161,12 @@ let }); - libraries = stdenv.lib.makeExtensible (libraries: let + libraries = lib.makeExtensible (libraries: let callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); in { compiler-rt = callPackage ./compiler-rt.nix ({} // - (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { + (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { stdenv = overrideCC stdenv buildLlvmTools.lldClangNoCompilerRt; })); @@ -177,12 +175,12 @@ let libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; libcxx = callPackage ./libc++ ({} // - (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { + (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; })); libcxxabi = callPackage ./libc++abi.nix ({} // - (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { + (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; libunwind = libraries.libunwind; })); @@ -190,7 +188,7 @@ let openmp = callPackage ./openmp.nix {}; libunwind = callPackage ./libunwind.nix ({} // - (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { + (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; })); diff --git a/pkgs/development/compilers/llvm/11/libc++/default.nix b/pkgs/development/compilers/llvm/11/libc++/default.nix index d0b581c0460..7a34977afe2 100644 --- a/pkgs/development/compilers/llvm/11/libc++/default.nix +++ b/pkgs/development/compilers/llvm/11/libc++/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { mv llvm-* llvm ''; - patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch; + patches = lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch; preConfigure = lib.optionalString stdenv.hostPlatform.isMusl '' patchShebangs utils/cat_files.py @@ -28,13 +28,13 @@ stdenv.mkDerivation { cmakeFlags = [ "-DLIBCXX_CXX_ABI=libcxxabi" - ] ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1" - ++ stdenv.lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON" - ++ stdenv.lib.optional stdenv.hostPlatform.isWasm [ + ] ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1" + ++ lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON" + ++ lib.optional stdenv.hostPlatform.isWasm [ "-DLIBCXX_ENABLE_THREADS=OFF" "-DLIBCXX_ENABLE_FILESYSTEM=OFF" "-DLIBCXX_ENABLE_EXCEPTIONS=OFF" - ] ++ stdenv.lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF"; + ] ++ lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF"; passthru = { isLLVM = true; @@ -43,7 +43,7 @@ stdenv.mkDerivation { meta = { homepage = "https://libcxx.llvm.org/"; description = "A new implementation of the C++ standard library, targeting C++11"; - license = with stdenv.lib.licenses; [ ncsa mit ]; - platforms = stdenv.lib.platforms.all; + license = with lib.licenses; [ ncsa mit ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/compilers/llvm/11/libc++abi.nix b/pkgs/development/compilers/llvm/11/libc++abi.nix index e87622b23b2..22e4ac4abe4 100644 --- a/pkgs/development/compilers/llvm/11/libc++abi.nix +++ b/pkgs/development/compilers/llvm/11/libc++abi.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version +{ lib, stdenv, cmake, fetch, libcxx, libunwind, llvm, version , enableShared ? !stdenv.hostPlatform.isStatic }: @@ -9,15 +9,15 @@ stdenv.mkDerivation { src = fetch "libcxxabi" "0gv8pxq95gvsybldj21hdfkmm0r5cn1z7jhd72l231n0lmb70saa"; nativeBuildInputs = [ cmake ]; - buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind; + buildInputs = lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind; - cmakeFlags = stdenv.lib.optionals (stdenv.hostPlatform.useLLVM or false) [ + cmakeFlags = lib.optionals (stdenv.hostPlatform.useLLVM or false) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" - ] ++ stdenv.lib.optionals stdenv.hostPlatform.isWasm [ + ] ++ lib.optionals stdenv.hostPlatform.isWasm [ "-DLIBCXXABI_ENABLE_THREADS=OFF" "-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF" - ] ++ stdenv.lib.optionals (!enableShared) [ + ] ++ lib.optionals (!enableShared) [ "-DLIBCXXABI_ENABLE_SHARED=OFF" ]; @@ -28,11 +28,11 @@ stdenv.mkDerivation { mv libcxx-* libcxx unpackFile ${llvm.src} mv llvm-* llvm - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' export TRIPLE=x86_64-apple-darwin - '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + '' + lib.optionalString stdenv.hostPlatform.isMusl '' patch -p1 -d libcxx -i ${../libcxx-0001-musl-hacks.patch} - '' + stdenv.lib.optionalString stdenv.hostPlatform.isWasm '' + '' + lib.optionalString stdenv.hostPlatform.isWasm '' patch -p1 -d llvm -i ${./libcxxabi-wasm.patch} ''; @@ -53,7 +53,7 @@ stdenv.mkDerivation { install -d -m 755 $out/include $out/lib install -m 644 lib/libc++abi.a $out/lib install -m 644 ../include/cxxabi.h $out/include - '' + stdenv.lib.optionalString enableShared '' + '' + lib.optionalString enableShared '' install -m 644 lib/libc++abi.so.1.0 $out/lib ln -s libc++abi.so.1.0 $out/lib/libc++abi.so ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1 @@ -62,8 +62,8 @@ stdenv.mkDerivation { meta = { homepage = "https://libcxxabi.llvm.org/"; description = "A new implementation of low level support for a standard C++ library"; - license = with stdenv.lib.licenses; [ ncsa mit ]; - maintainers = with stdenv.lib.maintainers; [ vlstill ]; - platforms = stdenv.lib.platforms.all; + license = with lib.licenses; [ ncsa mit ]; + maintainers = with lib.maintainers; [ vlstill ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/compilers/llvm/11/libunwind.nix b/pkgs/development/compilers/llvm/11/libunwind.nix index 5708b00c08a..1b5fe0f5788 100644 --- a/pkgs/development/compilers/llvm/11/libunwind.nix +++ b/pkgs/development/compilers/llvm/11/libunwind.nix @@ -1,4 +1,4 @@ -{ stdenv, version, fetch, cmake, fetchpatch +{ lib, stdenv, version, fetch, cmake, fetchpatch , enableShared ? !stdenv.hostPlatform.isStatic }: @@ -10,5 +10,5 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - cmakeFlags = stdenv.lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF"; + cmakeFlags = lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF"; } diff --git a/pkgs/development/compilers/llvm/11/lld.nix b/pkgs/development/compilers/llvm/11/lld.nix index af02a5d4750..cead886f49b 100644 --- a/pkgs/development/compilers/llvm/11/lld.nix +++ b/pkgs/development/compilers/llvm/11/lld.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetch , cmake , libxml2 @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "The LLVM Linker"; homepage = "https://lld.llvm.org/"; - license = stdenv.lib.licenses.ncsa; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.ncsa; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/compilers/llvm/11/lldb.nix b/pkgs/development/compilers/llvm/11/lldb.nix index 28bb75470a9..fcc73cfdeb6 100644 --- a/pkgs/development/compilers/llvm/11/lldb.nix +++ b/pkgs/development/compilers/llvm/11/lldb.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetch , cmake , zlib @@ -25,7 +25,7 @@ stdenv.mkDerivation (rec { patches = [ ./lldb-procfs.patch ]; nativeBuildInputs = [ cmake python3 which swig lit ] - ++ stdenv.lib.optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.recommonmark ]; + ++ lib.optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.recommonmark ]; buildInputs = [ ncurses @@ -34,7 +34,7 @@ stdenv.mkDerivation (rec { libxml2 llvm ] - ++ stdenv.lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation @@ -49,11 +49,11 @@ stdenv.mkDerivation (rec { "-DLLVM_ENABLE_RTTI=OFF" "-DClang_DIR=${clang-unwrapped}/lib/cmake" "-DLLVM_EXTERNAL_LIT=${lit}/bin/lit" - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ "-DLLDB_USE_SYSTEM_DEBUGSERVER=ON" - ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.isDarwin) [ "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic - ] ++ stdenv.lib.optionals enableManpages [ + ] ++ lib.optionals enableManpages [ "-DLLVM_ENABLE_SPHINX=ON" "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" @@ -67,13 +67,13 @@ stdenv.mkDerivation (rec { ln -s $out/bin/lldb-vscode $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A next-generation high-performance debugger"; homepage = "https://lldb.llvm.org"; license = licenses.ncsa; platforms = platforms.all; }; -} // stdenv.lib.optionalAttrs enableManpages { +} // lib.optionalAttrs enableManpages { pname = "lldb-manpages"; buildPhase = '' diff --git a/pkgs/development/compilers/llvm/11/llvm.nix b/pkgs/development/compilers/llvm/11/llvm.nix index 2c29a30d76f..868da1a5b20 100644 --- a/pkgs/development/compilers/llvm/11/llvm.nix +++ b/pkgs/development/compilers/llvm/11/llvm.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetch , cmake , python3 @@ -22,10 +22,10 @@ }: let - inherit (stdenv.lib) optional optionals optionalString; + inherit (lib) optional optionals optionalString; # Used when creating a version-suffixed symlink of libLLVM.dylib - shortVersion = with stdenv.lib; + shortVersion = with lib; concatStringsSep "." (take 1 (splitString "." release_version)); in stdenv.mkDerivation (rec { @@ -122,7 +122,7 @@ in stdenv.mkDerivation (rec { "-DCAN_TARGET_i386=false" ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "-DCMAKE_CROSSCOMPILING=True" - "-DLLVM_TABLEGEN=${buildPackages.llvm_10}/bin/llvm-tblgen" + "-DLLVM_TABLEGEN=${buildPackages.llvm_11}/bin/llvm-tblgen" ]; postBuild = '' @@ -152,7 +152,7 @@ in stdenv.mkDerivation (rec { ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib ''; - doCheck = stdenv.isLinux && (!stdenv.isx86_32); + doCheck = stdenv.isLinux && (!stdenv.isx86_32) && (!stdenv.hostPlatform.isMusl); checkTarget = "check-all"; @@ -160,11 +160,11 @@ in stdenv.mkDerivation (rec { meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = "https://llvm.org/"; - license = stdenv.lib.licenses.ncsa; - maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill primeos ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.ncsa; + maintainers = with lib.maintainers; [ lovek323 raskin dtzWill primeos ]; + platforms = lib.platforms.all; }; -} // stdenv.lib.optionalAttrs enableManpages { +} // lib.optionalAttrs enableManpages { pname = "llvm-manpages"; buildPhase = '' diff --git a/pkgs/development/compilers/llvm/11/openmp.nix b/pkgs/development/compilers/llvm/11/openmp.nix index 55a4ceb7e6e..5503a98ae5f 100644 --- a/pkgs/development/compilers/llvm/11/openmp.nix +++ b/pkgs/development/compilers/llvm/11/openmp.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , fetch , cmake , llvm @@ -18,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Components required to build an executable OpenMP program"; homepage = "https://openmp.llvm.org/"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.mit; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/compilers/llvm/5/clang/default.nix b/pkgs/development/compilers/llvm/5/clang/default.nix index a097e9167cd..21961f4f041 100644 --- a/pkgs/development/compilers/llvm/5/clang/default.nix +++ b/pkgs/development/compilers/llvm/5/clang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3 +{ lib, stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3 , fixDarwinDylibNames , enableManpages ? false }: @@ -19,15 +19,15 @@ let ''; nativeBuildInputs = [ cmake python3 ] - ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + ++ lib.optional enableManpages python3.pkgs.sphinx + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ libxml2 llvm ]; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++11" "-DLLVM_ENABLE_RTTI=ON" - ] ++ stdenv.lib.optionals enableManpages [ + ] ++ lib.optionals enableManpages [ "-DCLANG_INCLUDE_DOCS=ON" "-DLLVM_ENABLE_SPHINX=ON" "-DSPHINX_OUTPUT_MAN=ON" @@ -44,7 +44,7 @@ let # Patch for standalone doc building sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt - '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + '' + lib.optionalString stdenv.hostPlatform.isMusl '' sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp ''; @@ -80,10 +80,10 @@ let meta = { description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; homepage = "https://llvm.org/"; - license = stdenv.lib.licenses.ncsa; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.ncsa; + platforms = lib.platforms.all; }; - } // stdenv.lib.optionalAttrs enableManpages { + } // lib.optionalAttrs enableManpages { pname = "clang-manpages"; buildPhase = '' diff --git a/pkgs/development/compilers/llvm/5/compiler-rt.nix b/pkgs/development/compilers/llvm/5/compiler-rt.nix index e973be0a087..909c6b19053 100644 --- a/pkgs/development/compilers/llvm/5/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/5/compiler-rt.nix @@ -1,4 +1,4 @@ -{ stdenv, version, fetch, cmake, python3, llvm, libcxxabi }: +{ lib, stdenv, version, fetch, cmake, python3, llvm, libcxxabi }: let @@ -14,7 +14,7 @@ stdenv.mkDerivation { src = fetch "compiler-rt" "0ipd4jdxpczgr2w6lzrabymz6dhzj69ywmyybjjc1q397zgrvziy"; nativeBuildInputs = [ cmake python3 llvm ]; - buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi; NIX_CFLAGS_COMPILE = [ "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" @@ -24,24 +24,24 @@ stdenv.mkDerivation { "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON" "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}" "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}" - ] ++ stdenv.lib.optionals (useLLVM || bareMetal || isMusl) [ + ] ++ lib.optionals (useLLVM || bareMetal || isMusl) [ "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" "-DCOMPILER_RT_BUILD_XRAY=OFF" "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF" "-DCOMPILER_RT_BUILD_PROFILE=OFF" - ] ++ stdenv.lib.optionals (useLLVM || bareMetal) [ + ] ++ lib.optionals (useLLVM || bareMetal) [ "-DCMAKE_C_COMPILER_WORKS=ON" "-DCMAKE_CXX_COMPILER_WORKS=ON" "-DCOMPILER_RT_BAREMETAL_BUILD=ON" "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}" - ] ++ stdenv.lib.optionals (useLLVM) [ + ] ++ lib.optionals (useLLVM) [ "-DCOMPILER_RT_BUILD_BUILTINS=ON" "-DCMAKE_C_FLAGS=-nodefaultlibs" #https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY" - ] ++ stdenv.lib.optionals (bareMetal) [ + ] ++ lib.optionals (bareMetal) [ "-DCOMPILER_RT_OS_DIR=baremetal" - ] ++ stdenv.lib.optionals (stdenv.hostPlatform.isDarwin) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ # The compiler-rt build infrastructure sniffs supported platforms on Darwin # and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails # when it tries to use libc++ and libc++api for i386. @@ -53,19 +53,19 @@ stdenv.mkDerivation { patches = [ ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory ../7/compiler-rt-glibc.patch - ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch - ++ stdenv.lib.optional (stdenv.hostPlatform.libc == "glibc") ./compiler-rt-sys-ustat.patch - ++ stdenv.lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch; + ] ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch + ++ lib.optional (stdenv.hostPlatform.libc == "glibc") ./compiler-rt-sys-ustat.patch + ++ lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch; # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by # a flag and turn the flag off during the stdenv build. - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace cmake/config-ix.cmake \ --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' - '' + stdenv.lib.optionalString (useLLVM) '' + '' + lib.optionalString (useLLVM) '' substituteInPlace lib/builtins/int_util.c \ --replace "#include <stdlib.h>" "" substituteInPlace lib/builtins/clear_cache.c \ @@ -75,9 +75,9 @@ stdenv.mkDerivation { ''; # Hack around weird upsream RPATH bug - postInstall = stdenv.lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) '' + postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) '' ln -s "$out/lib"/*/* "$out/lib" - '' + stdenv.lib.optionalString (useLLVM) '' + '' + lib.optionalString (useLLVM) '' ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/linux/crtbegin.o ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/linux/crtend.o ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/linux/crtbeginS.o diff --git a/pkgs/development/compilers/llvm/5/default.nix b/pkgs/development/compilers/llvm/5/default.nix index 36495249d16..f03325cd427 100644 --- a/pkgs/development/compilers/llvm/5/default.nix +++ b/pkgs/development/compilers/llvm/5/default.nix @@ -1,4 +1,4 @@ -{ lowPrio, newScope, pkgs, stdenv, cmake, gccForLibs +{ lowPrio, newScope, pkgs, lib, stdenv, cmake, gccForLibs , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith , buildPackages , buildLlvmTools # tools, but from the previous stage, for cross @@ -17,7 +17,7 @@ let clang-tools-extra_src = fetch "clang-tools-extra" "018b3fiwah8f8br5i26qmzh6sjvzchpn358sn8v079m49f2jldm3"; - tools = stdenv.lib.makeExtensible (tools: let + tools = lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); mkExtraBuildCommands = cc: '' rsrc="$out/resource-root" @@ -25,8 +25,6 @@ let ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc" ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - '' + stdenv.lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) '' - echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags ''; in { @@ -75,7 +73,7 @@ let lldb = callPackage ./lldb.nix {}; }); - libraries = stdenv.lib.makeExtensible (libraries: let + libraries = lib.makeExtensible (libraries: let callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); in { diff --git a/pkgs/development/compilers/llvm/5/libc++/default.nix b/pkgs/development/compilers/llvm/5/libc++/default.nix index 687a613e074..164836e1a4c 100644 --- a/pkgs/development/compilers/llvm/5/libc++/default.nix +++ b/pkgs/development/compilers/llvm/5/libc++/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include" ''; - patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [ + patches = lib.optionals stdenv.hostPlatform.isMusl [ ../../libcxx-0001-musl-hacks.patch ]; @@ -26,8 +26,8 @@ stdenv.mkDerivation { patchShebangs utils/cat_files.py ''; nativeBuildInputs = [ cmake ] - ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python3 - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + ++ lib.optional stdenv.hostPlatform.isMusl python3 + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ libcxxabi ]; @@ -35,7 +35,7 @@ stdenv.mkDerivation { "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" "-DLIBCXX_LIBCPPABI_VERSION=2" "-DLIBCXX_CXX_ABI=libcxxabi" - ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1"; + ] ++ lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1"; passthru = { isLLVM = true; @@ -44,7 +44,7 @@ stdenv.mkDerivation { meta = { homepage = "https://libcxx.llvm.org/"; description = "A new implementation of the C++ standard library, targeting C++11"; - license = with stdenv.lib.licenses; [ ncsa mit ]; - platforms = stdenv.lib.platforms.unix; + license = with lib.licenses; [ ncsa mit ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/compilers/llvm/5/libc++abi.nix b/pkgs/development/compilers/llvm/5/libc++abi.nix index 96d6e78e01e..8fc9ef9fded 100644 --- a/pkgs/development/compilers/llvm/5/libc++abi.nix +++ b/pkgs/development/compilers/llvm/5/libc++abi.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version }: +{ lib, stdenv, cmake, fetch, libcxx, libunwind, llvm, version }: stdenv.mkDerivation { pname = "libc++abi"; @@ -7,15 +7,15 @@ stdenv.mkDerivation { src = fetch "libcxxabi" "12lp799rskr4fc2xr64qn4jfkjnfd8b1aymvsxyn4k9ar7r9pgqv"; nativeBuildInputs = [ cmake ]; - buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; + buildInputs = lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; postUnpack = '' unpackFile ${libcxx.src} unpackFile ${llvm.src} export cmakeFlags="-DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_PATH=$PWD/$(ls -d libcxx-*)" - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' export TRIPLE=x86_64-apple-darwin - '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + '' + lib.optionalString stdenv.hostPlatform.isMusl '' patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch} ''; @@ -44,8 +44,8 @@ stdenv.mkDerivation { meta = { homepage = "https://libcxxabi.llvm.org/"; description = "A new implementation of low level support for a standard C++ library"; - license = with stdenv.lib.licenses; [ ncsa mit ]; - maintainers = with stdenv.lib.maintainers; [ vlstill ]; - platforms = stdenv.lib.platforms.unix; + license = with lib.licenses; [ ncsa mit ]; + maintainers = with lib.maintainers; [ vlstill ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/compilers/llvm/5/lld.nix b/pkgs/development/compilers/llvm/5/lld.nix index 5f43f8235e1..244960cf41b 100644 --- a/pkgs/development/compilers/llvm/5/lld.nix +++ b/pkgs/development/compilers/llvm/5/lld.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetch , cmake , llvm @@ -24,8 +24,8 @@ stdenv.mkDerivation { meta = { description = "The LLVM Linker"; homepage = "https://lld.llvm.org/"; - license = stdenv.lib.licenses.ncsa; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.ncsa; + platforms = lib.platforms.all; badPlatforms = [ "x86_64-darwin" ]; }; } diff --git a/pkgs/development/compilers/llvm/5/lldb.nix b/pkgs/development/compilers/llvm/5/lldb.nix index 258535a7566..61a9e60391c 100644 --- a/pkgs/development/compilers/llvm/5/lldb.nix +++ b/pkgs/development/compilers/llvm/5/lldb.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetch , fetchpatch , cmake @@ -42,7 +42,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake python3 which swig ]; buildInputs = [ ncurses zlib libedit libxml2 llvm ] - ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ]; + ++ lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ]; CXXFLAGS = "-fno-rtti"; hardeningDisable = [ "format" ]; @@ -56,7 +56,7 @@ stdenv.mkDerivation { cp ../docs/lldb.1 $out/share/man/man1/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A next-generation high-performance debugger"; homepage = "https://llvm.org/"; license = licenses.ncsa; diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix index 2c2867c9937..c91e9420435 100644 --- a/pkgs/development/compilers/llvm/5/llvm.nix +++ b/pkgs/development/compilers/llvm/5/llvm.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetch , fetchpatch , cmake @@ -17,7 +17,7 @@ let # Used when creating a versioned symlinks of libLLVM.dylib - versionSuffixes = with stdenv.lib; + versionSuffixes = with lib; let parts = splitVersion release_version; in imap (i: _: concatStringsSep "." (take i parts)) parts; in @@ -35,10 +35,10 @@ stdenv.mkDerivation ({ ''; outputs = [ "out" "python" ] - ++ stdenv.lib.optional enableSharedLibraries "lib"; + ++ lib.optional enableSharedLibraries "lib"; nativeBuildInputs = [ cmake python3 ] - ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx; + ++ lib.optional enableManpages python3.pkgs.sphinx; buildInputs = [ libxml2 libffi ]; @@ -58,13 +58,13 @@ stdenv.mkDerivation ({ # stripLen = 1; #}) ]; - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace cmake/modules/AddLLVM.cmake \ --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \ --replace 'set(_install_rpath "@loader_path/../lib" ''${extra_libdir})' "" '' # Patch llvm-config to return correct library path based on --link-{shared,static}. - + stdenv.lib.optionalString (enableSharedLibraries) '' + + lib.optionalString (enableSharedLibraries) '' substitute '${./llvm-outputs.patch}' ./llvm-outputs.patch --subst-var lib patch -p1 < ./llvm-outputs.patch '' + '' @@ -72,9 +72,9 @@ stdenv.mkDerivation ({ substituteInPlace unittests/Support/CMakeLists.txt \ --replace "Path.cpp" "" rm unittests/Support/Path.cpp - '' + stdenv.lib.optionalString stdenv.isAarch64 '' + '' + lib.optionalString stdenv.isAarch64 '' patch -p0 < ${../aarch64.patch} - '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + '' + lib.optionalString stdenv.hostPlatform.isMusl '' patch -p1 -i ${../TLI-musl.patch} substituteInPlace unittests/Support/CMakeLists.txt \ --replace "add_subdirectory(DynamicLibrary)" "" @@ -98,18 +98,18 @@ stdenv.mkDerivation ({ "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" "-DTARGET_TRIPLE=${stdenv.hostPlatform.config}" ] - ++ stdenv.lib.optional enableSharedLibraries + ++ lib.optional enableSharedLibraries "-DLLVM_LINK_LLVM_DYLIB=ON" - ++ stdenv.lib.optionals enableManpages [ + ++ lib.optionals enableManpages [ "-DLLVM_BUILD_DOCS=ON" "-DLLVM_ENABLE_SPHINX=ON" "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" "-DSPHINX_WARNINGS_AS_ERRORS=OFF" ] - ++ stdenv.lib.optional (!isDarwin) + ++ lib.optional (!isDarwin) "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" - ++ stdenv.lib.optionals (isDarwin) [ + ++ lib.optionals (isDarwin) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" ]; @@ -126,18 +126,18 @@ stdenv.mkDerivation ({ mkdir -p $python/share mv $out/share/opt-viewer $python/share/opt-viewer '' - + stdenv.lib.optionalString enableSharedLibraries '' + + lib.optionalString enableSharedLibraries '' moveToOutput "lib/libLLVM-*" "$lib" moveToOutput "lib/libLLVM${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib" moveToOutput "lib/libLTO${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib" substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ --replace "\''${_IMPORT_PREFIX}/lib/libLLVM-" "$lib/lib/libLLVM-" '' - + stdenv.lib.optionalString (stdenv.isDarwin && enableSharedLibraries) '' + + lib.optionalString (stdenv.isDarwin && enableSharedLibraries) '' substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib" \ --replace "\''${_IMPORT_PREFIX}/lib/libLTO.dylib" "$lib/lib/libLTO.dylib" - ${stdenv.lib.concatMapStringsSep "\n" (v: '' + ${lib.concatMapStringsSep "\n" (v: '' ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${v}.dylib '') versionSuffixes} ''; @@ -150,11 +150,11 @@ stdenv.mkDerivation ({ meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = "https://llvm.org/"; - license = stdenv.lib.licenses.ncsa; - maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.ncsa; + maintainers = with lib.maintainers; [ lovek323 raskin dtzWill ]; + platforms = lib.platforms.all; }; -} // stdenv.lib.optionalAttrs enableManpages { +} // lib.optionalAttrs enableManpages { pname = "llvm-manpages"; buildPhase = '' diff --git a/pkgs/development/compilers/llvm/5/openmp.nix b/pkgs/development/compilers/llvm/5/openmp.nix index 452f5a3cfe5..169c9c50324 100644 --- a/pkgs/development/compilers/llvm/5/openmp.nix +++ b/pkgs/development/compilers/llvm/5/openmp.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , fetch , cmake , llvm @@ -18,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "Components required to build an executable OpenMP program"; homepage = "https://openmp.llvm.org/"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.mit; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/compilers/llvm/6/clang/default.nix b/pkgs/development/compilers/llvm/6/clang/default.nix index 63a79ffba8a..41202dd3f5d 100644 --- a/pkgs/development/compilers/llvm/6/clang/default.nix +++ b/pkgs/development/compilers/llvm/6/clang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3 +{ lib, stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3 , fixDarwinDylibNames , enableManpages ? false }: @@ -19,15 +19,15 @@ let ''; nativeBuildInputs = [ cmake python3 ] - ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + ++ lib.optional enableManpages python3.pkgs.sphinx + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ libxml2 llvm ]; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++11" "-DLLVM_ENABLE_RTTI=ON" - ] ++ stdenv.lib.optionals enableManpages [ + ] ++ lib.optionals enableManpages [ "-DCLANG_INCLUDE_DOCS=ON" "-DLLVM_ENABLE_SPHINX=ON" "-DSPHINX_OUTPUT_MAN=ON" @@ -44,7 +44,7 @@ let # Patch for standalone doc building sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt - '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + '' + lib.optionalString stdenv.hostPlatform.isMusl '' sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp ''; @@ -80,10 +80,10 @@ let meta = { description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; homepage = "https://llvm.org/"; - license = stdenv.lib.licenses.ncsa; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.ncsa; + platforms = lib.platforms.all; }; - } // stdenv.lib.optionalAttrs enableManpages { + } // lib.optionalAttrs enableManpages { pname = "clang-manpages"; buildPhase = '' diff --git a/pkgs/development/compilers/llvm/6/compiler-rt.nix b/pkgs/development/compilers/llvm/6/compiler-rt.nix index df61824e908..6e47ffe8aca 100644 --- a/pkgs/development/compilers/llvm/6/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/6/compiler-rt.nix @@ -1,4 +1,4 @@ -{ stdenv, version, fetch, cmake, python3, llvm, libcxxabi }: +{ lib, stdenv, version, fetch, cmake, python3, llvm, libcxxabi }: let @@ -14,7 +14,7 @@ stdenv.mkDerivation { src = fetch "compiler-rt" "1fcr3jn24yr8lh36nc0c4ikli4744i2q9m1ik67p1jymwwaixkgl"; nativeBuildInputs = [ cmake python3 llvm ]; - buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi; NIX_CFLAGS_COMPILE = [ "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" @@ -24,24 +24,24 @@ stdenv.mkDerivation { "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON" "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}" "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}" - ] ++ stdenv.lib.optionals (useLLVM || bareMetal || isMusl) [ + ] ++ lib.optionals (useLLVM || bareMetal || isMusl) [ "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" "-DCOMPILER_RT_BUILD_XRAY=OFF" "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF" "-DCOMPILER_RT_BUILD_PROFILE=OFF" - ] ++ stdenv.lib.optionals (useLLVM || bareMetal) [ + ] ++ lib.optionals (useLLVM || bareMetal) [ "-DCMAKE_C_COMPILER_WORKS=ON" "-DCMAKE_CXX_COMPILER_WORKS=ON" "-DCOMPILER_RT_BAREMETAL_BUILD=ON" "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}" - ] ++ stdenv.lib.optionals (useLLVM) [ + ] ++ lib.optionals (useLLVM) [ "-DCOMPILER_RT_BUILD_BUILTINS=ON" "-DCMAKE_C_FLAGS=-nodefaultlibs" #https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY" - ] ++ stdenv.lib.optionals (bareMetal) [ + ] ++ lib.optionals (bareMetal) [ "-DCOMPILER_RT_OS_DIR=baremetal" - ] ++ stdenv.lib.optionals (stdenv.hostPlatform.isDarwin) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ # The compiler-rt build infrastructure sniffs supported platforms on Darwin # and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails # when it tries to use libc++ and libc++api for i386. @@ -53,21 +53,21 @@ stdenv.mkDerivation { patches = [ ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory ../7/compiler-rt-glibc.patch - ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch - ++ stdenv.lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch; + ] ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch + ++ lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch; # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by # a flag and turn the flag off during the stdenv build. - postPatch = stdenv.lib.optionalString (!stdenv.isDarwin) '' + postPatch = lib.optionalString (!stdenv.isDarwin) '' substituteInPlace cmake/builtin-config-ix.cmake \ --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)' - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' substituteInPlace cmake/config-ix.cmake \ --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' - '' + stdenv.lib.optionalString (useLLVM) '' + '' + lib.optionalString (useLLVM) '' substituteInPlace lib/builtins/int_util.c \ --replace "#include <stdlib.h>" "" substituteInPlace lib/builtins/clear_cache.c \ @@ -77,9 +77,9 @@ stdenv.mkDerivation { ''; # Hack around weird upsream RPATH bug - postInstall = stdenv.lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) '' + postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) '' ln -s "$out/lib"/*/* "$out/lib" - '' + stdenv.lib.optionalString (useLLVM) '' + '' + lib.optionalString (useLLVM) '' ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/linux/crtbegin.o ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/linux/crtend.o ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/linux/crtbeginS.o diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix index 4c2e87ec5e1..a98314d1181 100644 --- a/pkgs/development/compilers/llvm/6/default.nix +++ b/pkgs/development/compilers/llvm/6/default.nix @@ -1,4 +1,4 @@ -{ lowPrio, newScope, pkgs, stdenv, cmake, gccForLibs +{ lowPrio, newScope, pkgs, lib, stdenv, cmake, gccForLibs , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith , buildPackages , buildLlvmTools # tools, but from the previous stage, for cross @@ -17,7 +17,7 @@ let clang-tools-extra_src = fetch "clang-tools-extra" "1w8ml7fyn4vyxmy59n2qm4r1k1kgwgwkaldp6m45fdv4g0kkfbhd"; - tools = stdenv.lib.makeExtensible (tools: let + tools = lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); mkExtraBuildCommands = cc: '' rsrc="$out/resource-root" @@ -25,8 +25,6 @@ let ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc" ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - '' + stdenv.lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) '' - echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags ''; in { @@ -75,7 +73,7 @@ let lldb = callPackage ./lldb.nix {}; }); - libraries = stdenv.lib.makeExtensible (libraries: let + libraries = lib.makeExtensible (libraries: let callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); in { diff --git a/pkgs/development/compilers/llvm/6/libc++/default.nix b/pkgs/development/compilers/llvm/6/libc++/default.nix index 129d06fe515..ac489db54fc 100644 --- a/pkgs/development/compilers/llvm/6/libc++/default.nix +++ b/pkgs/development/compilers/llvm/6/libc++/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include" ''; - patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [ + patches = lib.optionals stdenv.hostPlatform.isMusl [ ../../libcxx-0001-musl-hacks.patch ]; @@ -26,8 +26,8 @@ stdenv.mkDerivation { patchShebangs utils/cat_files.py ''; nativeBuildInputs = [ cmake ] - ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python3 - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + ++ lib.optional stdenv.hostPlatform.isMusl python3 + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ libcxxabi ]; @@ -35,7 +35,7 @@ stdenv.mkDerivation { "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" "-DLIBCXX_LIBCPPABI_VERSION=2" "-DLIBCXX_CXX_ABI=libcxxabi" - ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1"; + ] ++ lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1"; passthru = { isLLVM = true; @@ -44,7 +44,7 @@ stdenv.mkDerivation { meta = { homepage = "https://libcxx.llvm.org/"; description = "A new implementation of the C++ standard library, targeting C++11"; - license = with stdenv.lib.licenses; [ ncsa mit ]; - platforms = stdenv.lib.platforms.unix; + license = with lib.licenses; [ ncsa mit ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/compilers/llvm/6/libc++abi.nix b/pkgs/development/compilers/llvm/6/libc++abi.nix index 246bc6153e5..6e99f2d287a 100644 --- a/pkgs/development/compilers/llvm/6/libc++abi.nix +++ b/pkgs/development/compilers/llvm/6/libc++abi.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version }: +{ lib, stdenv, cmake, fetch, libcxx, libunwind, llvm, version }: stdenv.mkDerivation { pname = "libc++abi"; @@ -7,15 +7,15 @@ stdenv.mkDerivation { src = fetch "libcxxabi" "0prqvdj317qrc8nddaq1hh2ag9algkd9wbkj3y4mr5588k12x7r0"; nativeBuildInputs = [ cmake ]; - buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; + buildInputs = lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; postUnpack = '' unpackFile ${libcxx.src} unpackFile ${llvm.src} export cmakeFlags="-DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_PATH=$PWD/$(ls -d libcxx-*)" - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' export TRIPLE=x86_64-apple-darwin - '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + '' + lib.optionalString stdenv.hostPlatform.isMusl '' patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch} ''; @@ -44,8 +44,8 @@ stdenv.mkDerivation { meta = { homepage = "https://libcxxabi.llvm.org/"; description = "A new implementation of low level support for a standard C++ library"; - license = with stdenv.lib.licenses; [ ncsa mit ]; - maintainers = with stdenv.lib.maintainers; [ vlstill ]; - platforms = stdenv.lib.platforms.unix; + license = with lib.licenses; [ ncsa mit ]; + maintainers = with lib.maintainers; [ vlstill ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/compilers/llvm/6/lld.nix b/pkgs/development/compilers/llvm/6/lld.nix index da1acf3f5f3..b8038524805 100644 --- a/pkgs/development/compilers/llvm/6/lld.nix +++ b/pkgs/development/compilers/llvm/6/lld.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetch , cmake , libxml2 @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = { description = "The LLVM Linker"; homepage = "https://lld.llvm.org/"; - license = stdenv.lib.licenses.ncsa; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.ncsa; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/compilers/llvm/6/lldb.nix b/pkgs/development/compilers/llvm/6/lldb.nix index 0a138618574..7c6f8b1bd97 100644 --- a/pkgs/development/compilers/llvm/6/lldb.nix +++ b/pkgs/development/compilers/llvm/6/lldb.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetch , fetchpatch , cmake @@ -42,7 +42,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake python3 which swig ]; buildInputs = [ ncurses zlib libedit libxml2 llvm ] - ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ]; + ++ lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ]; CXXFLAGS = "-fno-rtti"; hardeningDisable = [ "format" ]; @@ -56,7 +56,7 @@ stdenv.mkDerivation { cp ../docs/lldb.1 $out/share/man/man1/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A next-generation high-performance debugger"; homepage = "https://llvm.org/"; license = licenses.ncsa; diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix index 07aaf1e9218..7d429e3ecf3 100644 --- a/pkgs/development/compilers/llvm/6/llvm.nix +++ b/pkgs/development/compilers/llvm/6/llvm.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetch , cmake , python3 @@ -17,10 +17,10 @@ }: let - inherit (stdenv.lib) optional optionals optionalString; + inherit (lib) optional optionals optionalString; # Used when creating a versioned symlinks of libLLVM.dylib - versionSuffixes = with stdenv.lib; + versionSuffixes = with lib; let parts = splitVersion release_version; in imap (i: _: concatStringsSep "." (take i parts)) parts; in @@ -136,7 +136,7 @@ stdenv.mkDerivation ({ + optionalString (stdenv.isDarwin && enableSharedLibraries) '' substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib" - ${stdenv.lib.concatMapStringsSep "\n" (v: '' + ${lib.concatMapStringsSep "\n" (v: '' ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${v}.dylib '') versionSuffixes} ''; @@ -149,11 +149,11 @@ stdenv.mkDerivation ({ meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = "https://llvm.org/"; - license = stdenv.lib.licenses.ncsa; - maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.ncsa; + maintainers = with lib.maintainers; [ lovek323 raskin dtzWill ]; + platforms = lib.platforms.all; }; -} // stdenv.lib.optionalAttrs enableManpages { +} // lib.optionalAttrs enableManpages { pname = "llvm-manpages"; buildPhase = '' diff --git a/pkgs/development/compilers/llvm/6/openmp.nix b/pkgs/development/compilers/llvm/6/openmp.nix index d6b00bb01ae..9de18065918 100644 --- a/pkgs/development/compilers/llvm/6/openmp.nix +++ b/pkgs/development/compilers/llvm/6/openmp.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , fetch , cmake , llvm @@ -18,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "Components required to build an executable OpenMP program"; homepage = "https://openmp.llvm.org/"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.mit; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/compilers/llvm/7/clang/default.nix b/pkgs/development/compilers/llvm/7/clang/default.nix index 0b1fdd53de9..4ab13441e36 100644 --- a/pkgs/development/compilers/llvm/7/clang/default.nix +++ b/pkgs/development/compilers/llvm/7/clang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3, lld +{ lib, stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3, lld , fixDarwinDylibNames , enableManpages ? false , enablePolly ? false # TODO: get this info from llvm (passthru?) @@ -20,21 +20,21 @@ let ''; nativeBuildInputs = [ cmake python3 ] - ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + ++ lib.optional enableManpages python3.pkgs.sphinx + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ libxml2 llvm lld ]; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++11" "-DLLVM_ENABLE_RTTI=ON" - ] ++ stdenv.lib.optionals enableManpages [ + ] ++ lib.optionals enableManpages [ "-DCLANG_INCLUDE_DOCS=ON" "-DLLVM_ENABLE_SPHINX=ON" "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] ++ stdenv.lib.optionals enablePolly [ + ] ++ lib.optionals enablePolly [ "-DWITH_POLLY=ON" "-DLINK_POLLY_INTO_TOOLS=ON" ]; @@ -52,9 +52,9 @@ let # Patch for standalone doc building sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt - '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + '' + lib.optionalString stdenv.hostPlatform.isMusl '' sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp - '' + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace tools/extra/clangd/CMakeLists.txt \ --replace "NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB" FALSE ''; @@ -91,10 +91,10 @@ let meta = { description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; homepage = "https://llvm.org/"; - license = stdenv.lib.licenses.ncsa; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.ncsa; + platforms = lib.platforms.all; }; - } // stdenv.lib.optionalAttrs enableManpages { + } // lib.optionalAttrs enableManpages { pname = "clang-manpages"; buildPhase = '' diff --git a/pkgs/development/compilers/llvm/7/compiler-rt.nix b/pkgs/development/compilers/llvm/7/compiler-rt.nix index bae9cf5fa0e..6320a3405d2 100644 --- a/pkgs/development/compilers/llvm/7/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/7/compiler-rt.nix @@ -1,4 +1,4 @@ -{ stdenv, version, fetch, cmake, python3, llvm, libcxxabi }: +{ lib, stdenv, version, fetch, cmake, python3, llvm, libcxxabi }: let @@ -14,7 +14,7 @@ stdenv.mkDerivation { src = fetch "compiler-rt" "1n48p8gjarihkws0i2bay5w9bdwyxyxxbpwyng7ba58jb30dlyq5"; nativeBuildInputs = [ cmake python3 llvm ]; - buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi; NIX_CFLAGS_COMPILE = [ "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" @@ -24,24 +24,24 @@ stdenv.mkDerivation { "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON" "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}" "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}" - ] ++ stdenv.lib.optionals (useLLVM || bareMetal || isMusl) [ + ] ++ lib.optionals (useLLVM || bareMetal || isMusl) [ "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" "-DCOMPILER_RT_BUILD_XRAY=OFF" "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF" "-DCOMPILER_RT_BUILD_PROFILE=OFF" - ] ++ stdenv.lib.optionals (useLLVM || bareMetal) [ + ] ++ lib.optionals (useLLVM || bareMetal) [ "-DCMAKE_C_COMPILER_WORKS=ON" "-DCMAKE_CXX_COMPILER_WORKS=ON" "-DCOMPILER_RT_BAREMETAL_BUILD=ON" "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}" - ] ++ stdenv.lib.optionals (useLLVM) [ + ] ++ lib.optionals (useLLVM) [ "-DCOMPILER_RT_BUILD_BUILTINS=ON" "-DCMAKE_C_FLAGS=-nodefaultlibs" #https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY" - ] ++ stdenv.lib.optionals (bareMetal) [ + ] ++ lib.optionals (bareMetal) [ "-DCOMPILER_RT_OS_DIR=baremetal" - ] ++ stdenv.lib.optionals (stdenv.hostPlatform.isDarwin) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ # The compiler-rt build infrastructure sniffs supported platforms on Darwin # and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails # when it tries to use libc++ and libc++api for i386. @@ -55,22 +55,22 @@ stdenv.mkDerivation { ./compiler-rt-glibc.patch ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory - ] ++ stdenv.lib.optional (useLLVM) ./crtbegin-and-end.patch - ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch - ++ stdenv.lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch; + ] ++ lib.optional (useLLVM) ./crtbegin-and-end.patch + ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch + ++ lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch; # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by # a flag and turn the flag off during the stdenv build. - postPatch = stdenv.lib.optionalString (!stdenv.isDarwin) '' + postPatch = lib.optionalString (!stdenv.isDarwin) '' substituteInPlace cmake/builtin-config-ix.cmake \ --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)' - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' substituteInPlace cmake/config-ix.cmake \ --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' - '' + stdenv.lib.optionalString (useLLVM) '' + '' + lib.optionalString (useLLVM) '' substituteInPlace lib/builtins/int_util.c \ --replace "#include <stdlib.h>" "" substituteInPlace lib/builtins/clear_cache.c \ @@ -80,9 +80,9 @@ stdenv.mkDerivation { ''; # Hack around weird upsream RPATH bug - postInstall = stdenv.lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) '' + postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) '' ln -s "$out/lib"/*/* "$out/lib" - '' + stdenv.lib.optionalString (useLLVM) '' + '' + lib.optionalString (useLLVM) '' ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/linux/crtbegin.o ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/linux/crtend.o ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/linux/crtbeginS.o diff --git a/pkgs/development/compilers/llvm/7/default.nix b/pkgs/development/compilers/llvm/7/default.nix index 3dd067ae607..111ccbb9a38 100644 --- a/pkgs/development/compilers/llvm/7/default.nix +++ b/pkgs/development/compilers/llvm/7/default.nix @@ -1,4 +1,4 @@ -{ lowPrio, newScope, pkgs, stdenv, cmake, gccForLibs +{ lowPrio, newScope, pkgs, lib, stdenv, cmake, gccForLibs , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith , buildPackages , buildLlvmTools # tools, but from the previous stage, for cross @@ -17,7 +17,7 @@ let clang-tools-extra_src = fetch "clang-tools-extra" "0lb4kdh7j2fhfz8kd6iv5df7m3pikiryk1vvwsf87spc90n09q0w"; - tools = stdenv.lib.makeExtensible (tools: let + tools = lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); mkExtraBuildCommands = cc: '' rsrc="$out/resource-root" @@ -25,8 +25,6 @@ let ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc" ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - '' + stdenv.lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) '' - echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags ''; in { @@ -103,9 +101,9 @@ let extraBuildCommands = '' echo "-rtlib=compiler-rt -Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags - '' + stdenv.lib.optionalString (!stdenv.targetPlatform.isWasm) '' + '' + lib.optionalString (!stdenv.targetPlatform.isWasm) '' echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags - '' + stdenv.lib.optionalString stdenv.targetPlatform.isWasm '' + '' + lib.optionalString stdenv.targetPlatform.isWasm '' echo "-fno-exceptions" >> $out/nix-support/cc-cflags '' + mkExtraBuildCommands cc; }; @@ -157,7 +155,7 @@ let }); - libraries = stdenv.lib.makeExtensible (libraries: let + libraries = lib.makeExtensible (libraries: let callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); in { @@ -172,12 +170,12 @@ let libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; libcxx = callPackage ./libc++ ({} // - (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { + (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; })); libcxxabi = callPackage ./libc++abi.nix ({} // - (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { + (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; libunwind = libraries.libunwind; })); diff --git a/pkgs/development/compilers/llvm/7/libc++/default.nix b/pkgs/development/compilers/llvm/7/libc++/default.nix index 27315672607..fb50c4e24d7 100644 --- a/pkgs/development/compilers/llvm/7/libc++/default.nix +++ b/pkgs/development/compilers/llvm/7/libc++/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include" ''; - patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch; + patches = lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch; prePatch = '' substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++" @@ -27,8 +27,8 @@ stdenv.mkDerivation { ''; nativeBuildInputs = [ cmake ] - ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python3 - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + ++ lib.optional stdenv.hostPlatform.isMusl python3 + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ libcxxabi ] ; @@ -36,8 +36,8 @@ stdenv.mkDerivation { "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" "-DLIBCXX_LIBCPPABI_VERSION=2" "-DLIBCXX_CXX_ABI=libcxxabi" - ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1" - ++ stdenv.lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF" ; + ] ++ lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1" + ++ lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF" ; passthru = { isLLVM = true; @@ -46,7 +46,7 @@ stdenv.mkDerivation { meta = { homepage = "https://libcxx.llvm.org/"; description = "A new implementation of the C++ standard library, targeting C++11"; - license = with stdenv.lib.licenses; [ ncsa mit ]; - platforms = stdenv.lib.platforms.unix; + license = with lib.licenses; [ ncsa mit ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/compilers/llvm/7/libc++abi.nix b/pkgs/development/compilers/llvm/7/libc++abi.nix index 4c46aeaa191..61879be91da 100644 --- a/pkgs/development/compilers/llvm/7/libc++abi.nix +++ b/pkgs/development/compilers/llvm/7/libc++abi.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, fetch, libcxx, llvm, version +{ lib, stdenv, cmake, fetch, libcxx, llvm, version , standalone ? false # on musl the shared objects don't build , enableShared ? !stdenv.hostPlatform.isStatic @@ -16,15 +16,15 @@ stdenv.mkDerivation { unpackFile ${libcxx.src} unpackFile ${llvm.src} cmakeFlagsArray=($cmakeFlagsArray -DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_PATH=$PWD/$(ls -d libcxx-*) ) - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' export TRIPLE=x86_64-apple-darwin - '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + '' + lib.optionalString stdenv.hostPlatform.isMusl '' patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch} ''; cmakeFlags = - stdenv.lib.optional standalone "-DLLVM_ENABLE_LIBCXX=ON" ++ - stdenv.lib.optional (!enableShared) "-DLIBCXXABI_ENABLE_SHARED=OFF"; + lib.optional standalone "-DLLVM_ENABLE_LIBCXX=ON" ++ + lib.optional (!enableShared) "-DLIBCXXABI_ENABLE_SHARED=OFF"; installPhase = if stdenv.isDarwin then '' @@ -42,17 +42,17 @@ stdenv.mkDerivation { else '' install -d -m 755 $out/include $out/lib install -m 644 lib/libc++abi.a $out/lib - ${stdenv.lib.optionalString enableShared "install -m 644 lib/libc++abi.so.1.0 $out/lib"} + ${lib.optionalString enableShared "install -m 644 lib/libc++abi.so.1.0 $out/lib"} install -m 644 ../include/cxxabi.h $out/include - ${stdenv.lib.optionalString enableShared "ln -s libc++abi.so.1.0 $out/lib/libc++abi.so"} - ${stdenv.lib.optionalString enableShared "ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1"} + ${lib.optionalString enableShared "ln -s libc++abi.so.1.0 $out/lib/libc++abi.so"} + ${lib.optionalString enableShared "ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1"} ''; meta = { homepage = "https://libcxxabi.llvm.org/"; description = "A new implementation of low level support for a standard C++ library"; - license = with stdenv.lib.licenses; [ ncsa mit ]; - maintainers = with stdenv.lib.maintainers; [ vlstill ]; - platforms = stdenv.lib.platforms.unix; + license = with lib.licenses; [ ncsa mit ]; + maintainers = with lib.maintainers; [ vlstill ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/compilers/llvm/7/lld.nix b/pkgs/development/compilers/llvm/7/lld.nix index 5e0568b6a09..f4c58abef8a 100644 --- a/pkgs/development/compilers/llvm/7/lld.nix +++ b/pkgs/development/compilers/llvm/7/lld.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetch , cmake , libxml2 @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = { description = "The LLVM Linker"; homepage = "https://lld.llvm.org/"; - license = stdenv.lib.licenses.ncsa; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.ncsa; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/compilers/llvm/7/lldb.nix b/pkgs/development/compilers/llvm/7/lldb.nix index d1508c46d0c..3fa5b411f63 100644 --- a/pkgs/development/compilers/llvm/7/lldb.nix +++ b/pkgs/development/compilers/llvm/7/lldb.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetch , cmake , zlib @@ -23,7 +23,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake perl python3 which swig ]; buildInputs = [ ncurses zlib libedit libxml2 llvm ] - ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ]; + ++ lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ]; postPatch = '' @@ -50,14 +50,14 @@ stdenv.mkDerivation { CXXFLAGS = "-fno-rtti"; hardeningDisable = [ "format" ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-I${libxml2.dev}/include/libxml2"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-I${libxml2.dev}/include/libxml2"; postInstall = '' mkdir -p $out/share/man/man1 cp ../docs/lldb.1 $out/share/man/man1/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A next-generation high-performance debugger"; homepage = "https://llvm.org/"; license = licenses.ncsa; diff --git a/pkgs/development/compilers/llvm/7/llvm.nix b/pkgs/development/compilers/llvm/7/llvm.nix index 69114c7ca23..2d6f0d18722 100644 --- a/pkgs/development/compilers/llvm/7/llvm.nix +++ b/pkgs/development/compilers/llvm/7/llvm.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetch , fetchpatch , cmake @@ -23,10 +23,10 @@ }: let - inherit (stdenv.lib) optional optionals optionalString; + inherit (lib) optional optionals optionalString; # Used when creating a versioned symlinks of libLLVM.dylib - versionSuffixes = with stdenv.lib; + versionSuffixes = with lib; let parts = splitVersion release_version; in imap (i: _: concatStringsSep "." (take i parts)) parts; @@ -158,7 +158,7 @@ in stdenv.mkDerivation ({ + optionalString (stdenv.isDarwin && enableSharedLibraries) '' substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib" - ${stdenv.lib.concatMapStringsSep "\n" (v: '' + ${lib.concatMapStringsSep "\n" (v: '' ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${v}.dylib '') versionSuffixes} ''; @@ -171,11 +171,11 @@ in stdenv.mkDerivation ({ meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = "https://llvm.org/"; - license = stdenv.lib.licenses.ncsa; - maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.ncsa; + maintainers = with lib.maintainers; [ lovek323 raskin dtzWill ]; + platforms = lib.platforms.all; }; -} // stdenv.lib.optionalAttrs enableManpages { +} // lib.optionalAttrs enableManpages { pname = "llvm-manpages"; buildPhase = '' diff --git a/pkgs/development/compilers/llvm/7/openmp.nix b/pkgs/development/compilers/llvm/7/openmp.nix index e36b236fd02..53f52c326c5 100644 --- a/pkgs/development/compilers/llvm/7/openmp.nix +++ b/pkgs/development/compilers/llvm/7/openmp.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , fetch , cmake , llvm @@ -18,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "Components required to build an executable OpenMP program"; homepage = "https://openmp.llvm.org/"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.mit; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/compilers/llvm/8/clang/default.nix b/pkgs/development/compilers/llvm/8/clang/default.nix index 0c00ce62715..8f44ffc0615 100644 --- a/pkgs/development/compilers/llvm/8/clang/default.nix +++ b/pkgs/development/compilers/llvm/8/clang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3, lld +{ lib, stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3, lld , fixDarwinDylibNames , enableManpages ? false , enablePolly ? false # TODO: get this info from llvm (passthru?) @@ -20,8 +20,8 @@ let ''; nativeBuildInputs = [ cmake python3 ] - ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + ++ lib.optional enableManpages python3.pkgs.sphinx + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ libxml2 llvm lld ]; @@ -29,13 +29,13 @@ let "-DCMAKE_CXX_FLAGS=-std=c++11" "-DCLANGD_BUILD_XPC=OFF" "-DLLVM_ENABLE_RTTI=ON" - ] ++ stdenv.lib.optionals enableManpages [ + ] ++ lib.optionals enableManpages [ "-DCLANG_INCLUDE_DOCS=ON" "-DLLVM_ENABLE_SPHINX=ON" "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] ++ stdenv.lib.optionals enablePolly [ + ] ++ lib.optionals enablePolly [ "-DWITH_POLLY=ON" "-DLINK_POLLY_INTO_TOOLS=ON" ]; @@ -62,9 +62,9 @@ let # Patch for standalone doc building sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt - '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + '' + lib.optionalString stdenv.hostPlatform.isMusl '' sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp - '' + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace tools/extra/clangd/CMakeLists.txt \ --replace "NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB" FALSE ''; @@ -101,10 +101,10 @@ let meta = { description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; homepage = "https://llvm.org/"; - license = stdenv.lib.licenses.ncsa; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.ncsa; + platforms = lib.platforms.all; }; - } // stdenv.lib.optionalAttrs enableManpages { + } // lib.optionalAttrs enableManpages { pname = "clang-manpages"; buildPhase = '' diff --git a/pkgs/development/compilers/llvm/8/compiler-rt.nix b/pkgs/development/compilers/llvm/8/compiler-rt.nix index 280204c6e35..2e49ef17346 100644 --- a/pkgs/development/compilers/llvm/8/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/8/compiler-rt.nix @@ -1,4 +1,4 @@ -{ stdenv, version, fetch, cmake, python3, llvm, libcxxabi }: +{ lib, stdenv, version, fetch, cmake, python3, llvm, libcxxabi }: let @@ -14,7 +14,7 @@ stdenv.mkDerivation { src = fetch "compiler-rt" "0dqqf8f930l8gag4d9qjgn1n0pj0nbv2anviqqhdi1rkhas8z0hi"; nativeBuildInputs = [ cmake python3 llvm ]; - buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi; NIX_CFLAGS_COMPILE = [ "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" @@ -24,24 +24,24 @@ stdenv.mkDerivation { "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON" "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}" "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}" - ] ++ stdenv.lib.optionals (useLLVM || bareMetal || isMusl) [ + ] ++ lib.optionals (useLLVM || bareMetal || isMusl) [ "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" "-DCOMPILER_RT_BUILD_XRAY=OFF" "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF" "-DCOMPILER_RT_BUILD_PROFILE=OFF" - ] ++ stdenv.lib.optionals (useLLVM || bareMetal) [ + ] ++ lib.optionals (useLLVM || bareMetal) [ "-DCMAKE_C_COMPILER_WORKS=ON" "-DCMAKE_CXX_COMPILER_WORKS=ON" "-DCOMPILER_RT_BAREMETAL_BUILD=ON" "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}" - ] ++ stdenv.lib.optionals (useLLVM) [ + ] ++ lib.optionals (useLLVM) [ "-DCOMPILER_RT_BUILD_BUILTINS=ON" "-DCMAKE_C_FLAGS=-nodefaultlibs" #https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY" - ] ++ stdenv.lib.optionals (bareMetal) [ + ] ++ lib.optionals (bareMetal) [ "-DCOMPILER_RT_OS_DIR=baremetal" - ] ++ stdenv.lib.optionals (stdenv.hostPlatform.isDarwin) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ # The compiler-rt build infrastructure sniffs supported platforms on Darwin # and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails # when it tries to use libc++ and libc++api for i386. @@ -53,22 +53,22 @@ stdenv.mkDerivation { patches = [ ../7/compiler-rt-glibc.patch ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory - ]# ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch - ++ stdenv.lib.optional (useLLVM) ./crtbegin-and-end.patch - ++ stdenv.lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch; + ]# ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch + ++ lib.optional (useLLVM) ./crtbegin-and-end.patch + ++ lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch; # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by # a flag and turn the flag off during the stdenv build. - postPatch = stdenv.lib.optionalString (!stdenv.isDarwin) '' + postPatch = lib.optionalString (!stdenv.isDarwin) '' substituteInPlace cmake/builtin-config-ix.cmake \ --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)' - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' substituteInPlace cmake/config-ix.cmake \ --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' - '' + stdenv.lib.optionalString (useLLVM) '' + '' + lib.optionalString (useLLVM) '' substituteInPlace lib/builtins/int_util.c \ --replace "#include <stdlib.h>" "" substituteInPlace lib/builtins/clear_cache.c \ @@ -78,9 +78,9 @@ stdenv.mkDerivation { ''; # Hack around weird upsream RPATH bug - postInstall = stdenv.lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) '' + postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) '' ln -s "$out/lib"/*/* "$out/lib" - '' + stdenv.lib.optionalString (useLLVM) '' + '' + lib.optionalString (useLLVM) '' ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/crtbegin.o ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/crtend.o ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/crtbeginS.o diff --git a/pkgs/development/compilers/llvm/8/default.nix b/pkgs/development/compilers/llvm/8/default.nix index 6e80737f32a..313b97455e5 100644 --- a/pkgs/development/compilers/llvm/8/default.nix +++ b/pkgs/development/compilers/llvm/8/default.nix @@ -1,4 +1,4 @@ -{ lowPrio, newScope, pkgs, stdenv, cmake, gccForLibs +{ lowPrio, newScope, pkgs, lib, stdenv, cmake, gccForLibs , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith , buildPackages , buildLlvmTools # tools, but from the previous stage, for cross @@ -17,7 +17,7 @@ let clang-tools-extra_src = fetch "clang-tools-extra" "1qf3097bc5ia8p6cpmbx985rjr3yaah5s8fc0nv7pw742yv7jw8q"; - tools = stdenv.lib.makeExtensible (tools: let + tools = lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); mkExtraBuildCommands = cc: '' rsrc="$out/resource-root" @@ -25,8 +25,6 @@ let ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc" ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - '' + stdenv.lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) '' - echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags ''; in { @@ -100,15 +98,15 @@ let extraPackages = [ targetLlvmLibraries.libcxxabi targetLlvmLibraries.compiler-rt - ] ++ stdenv.lib.optionals (!stdenv.targetPlatform.isWasm) [ + ] ++ lib.optionals (!stdenv.targetPlatform.isWasm) [ targetLlvmLibraries.libunwind ]; extraBuildCommands = '' echo "-rtlib=compiler-rt -Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags - '' + stdenv.lib.optionalString (!stdenv.targetPlatform.isWasm) '' + '' + lib.optionalString (!stdenv.targetPlatform.isWasm) '' echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags - '' + stdenv.lib.optionalString stdenv.targetPlatform.isWasm '' + '' + lib.optionalString stdenv.targetPlatform.isWasm '' echo "-fno-exceptions" >> $out/nix-support/cc-cflags '' + mkExtraBuildCommands cc; }; @@ -160,12 +158,12 @@ let }); - libraries = stdenv.lib.makeExtensible (libraries: let + libraries = lib.makeExtensible (libraries: let callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); in { compiler-rt = callPackage ./compiler-rt.nix ({} // - (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { + (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { stdenv = overrideCC stdenv buildLlvmTools.lldClangNoCompilerRt; })); @@ -174,12 +172,12 @@ let libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; libcxx = callPackage ./libc++ ({} // - (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { + (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; })); libcxxabi = callPackage ./libc++abi.nix ({} // - (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { + (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; libunwind = libraries.libunwind; })); @@ -187,7 +185,7 @@ let openmp = callPackage ./openmp.nix {}; libunwind = callPackage ./libunwind.nix ({} // - (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { + (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; })); diff --git a/pkgs/development/compilers/llvm/8/libc++/default.nix b/pkgs/development/compilers/llvm/8/libc++/default.nix index 7a3a33bfd7d..70e4d9e1a65 100644 --- a/pkgs/development/compilers/llvm/8/libc++/default.nix +++ b/pkgs/development/compilers/llvm/8/libc++/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include" ''; - patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch; + patches = lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch; prePatch = '' substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++" @@ -26,8 +26,8 @@ stdenv.mkDerivation { patchShebangs utils/cat_files.py ''; nativeBuildInputs = [ cmake ] - ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python3 - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python3 + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ libcxxabi ]; @@ -35,13 +35,13 @@ stdenv.mkDerivation { "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" "-DLIBCXX_LIBCPPABI_VERSION=2" "-DLIBCXX_CXX_ABI=libcxxabi" - ] ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1" - ++ stdenv.lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON" - ++ stdenv.lib.optional stdenv.hostPlatform.isWasm [ + ] ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1" + ++ lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON" + ++ lib.optional stdenv.hostPlatform.isWasm [ "-DLIBCXX_ENABLE_THREADS=OFF" "-DLIBCXX_ENABLE_FILESYSTEM=OFF" "-DLIBCXX_ENABLE_EXCEPTIONS=OFF" - ] ++ stdenv.lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF"; + ] ++ lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF"; passthru = { isLLVM = true; @@ -50,7 +50,7 @@ stdenv.mkDerivation { meta = { homepage = "https://libcxx.llvm.org/"; description = "A new implementation of the C++ standard library, targeting C++11"; - license = with stdenv.lib.licenses; [ ncsa mit ]; - platforms = stdenv.lib.platforms.all; + license = with lib.licenses; [ ncsa mit ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/compilers/llvm/8/libc++abi.nix b/pkgs/development/compilers/llvm/8/libc++abi.nix index 50a38dfa967..5a74981eba8 100644 --- a/pkgs/development/compilers/llvm/8/libc++abi.nix +++ b/pkgs/development/compilers/llvm/8/libc++abi.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version +{ lib, stdenv, cmake, fetch, libcxx, libunwind, llvm, version , enableShared ? !stdenv.hostPlatform.isStatic }: @@ -9,15 +9,15 @@ stdenv.mkDerivation { src = fetch "libcxxabi" "1vznz8n1z1h8af0ga451m98lc2hjnv4fyzl71napsvjhvk4g6nxp"; nativeBuildInputs = [ cmake ]; - buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind; + buildInputs = lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind; - cmakeFlags = stdenv.lib.optionals (stdenv.hostPlatform.useLLVM or false) [ + cmakeFlags = lib.optionals (stdenv.hostPlatform.useLLVM or false) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" - ] ++ stdenv.lib.optionals stdenv.hostPlatform.isWasm [ + ] ++ lib.optionals stdenv.hostPlatform.isWasm [ "-DLIBCXXABI_ENABLE_THREADS=OFF" "-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF" - ] ++ stdenv.lib.optionals (!enableShared) [ + ] ++ lib.optionals (!enableShared) [ "-DLIBCXXABI_ENABLE_SHARED=OFF" ]; @@ -27,11 +27,11 @@ stdenv.mkDerivation { unpackFile ${libcxx.src} unpackFile ${llvm.src} cmakeFlags+=" -DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_PATH=$PWD/$(ls -d libcxx-*)" - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' export TRIPLE=x86_64-apple-darwin - '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + '' + lib.optionalString stdenv.hostPlatform.isMusl '' patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch} - '' + stdenv.lib.optionalString stdenv.hostPlatform.isWasm '' + '' + lib.optionalString stdenv.hostPlatform.isWasm '' patch -p1 -d $(ls -d llvm-*) -i ${./libcxxabi-wasm.patch} ''; @@ -52,7 +52,7 @@ stdenv.mkDerivation { install -d -m 755 $out/include $out/lib install -m 644 lib/libc++abi.a $out/lib install -m 644 ../include/cxxabi.h $out/include - '' + stdenv.lib.optionalString enableShared '' + '' + lib.optionalString enableShared '' install -m 644 lib/libc++abi.so.1.0 $out/lib ln -s libc++abi.so.1.0 $out/lib/libc++abi.so ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1 @@ -61,8 +61,8 @@ stdenv.mkDerivation { meta = { homepage = "https://libcxxabi.llvm.org/"; description = "A new implementation of low level support for a standard C++ library"; - license = with stdenv.lib.licenses; [ ncsa mit ]; - maintainers = with stdenv.lib.maintainers; [ vlstill ]; - platforms = stdenv.lib.platforms.all; + license = with lib.licenses; [ ncsa mit ]; + maintainers = with lib.maintainers; [ vlstill ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/compilers/llvm/8/libunwind.nix b/pkgs/development/compilers/llvm/8/libunwind.nix index 6e765865282..d1bd54fbd34 100644 --- a/pkgs/development/compilers/llvm/8/libunwind.nix +++ b/pkgs/development/compilers/llvm/8/libunwind.nix @@ -1,4 +1,4 @@ -{ stdenv, version, fetch, cmake, fetchpatch +{ lib, stdenv, version, fetch, cmake, fetchpatch , enableShared ? !stdenv.hostPlatform.isStatic }: @@ -21,5 +21,5 @@ stdenv.mkDerivation { }) ]; - cmakeFlags = stdenv.lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF"; + cmakeFlags = lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF"; } diff --git a/pkgs/development/compilers/llvm/8/lld.nix b/pkgs/development/compilers/llvm/8/lld.nix index f890591b377..8009beb7bc1 100644 --- a/pkgs/development/compilers/llvm/8/lld.nix +++ b/pkgs/development/compilers/llvm/8/lld.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetch , cmake , libxml2 @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = { description = "The LLVM Linker"; homepage = "https://lld.llvm.org/"; - license = stdenv.lib.licenses.ncsa; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.ncsa; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/compilers/llvm/8/lldb.nix b/pkgs/development/compilers/llvm/8/lldb.nix index a22d27f9b29..83c171d2a57 100644 --- a/pkgs/development/compilers/llvm/8/lldb.nix +++ b/pkgs/development/compilers/llvm/8/lldb.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetch , cmake , zlib @@ -32,7 +32,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake python3 which swig ]; buildInputs = [ ncurses zlib libedit libxml2 llvm ] - ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ]; + ++ lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ]; CXXFLAGS = "-fno-rtti"; hardeningDisable = [ "format" ]; @@ -50,7 +50,7 @@ stdenv.mkDerivation { ln -s $out/bin/lldb-vscode $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A next-generation high-performance debugger"; homepage = "https://llvm.org/"; license = licenses.ncsa; diff --git a/pkgs/development/compilers/llvm/8/llvm.nix b/pkgs/development/compilers/llvm/8/llvm.nix index e3ca31313ce..9c2c3416aea 100644 --- a/pkgs/development/compilers/llvm/8/llvm.nix +++ b/pkgs/development/compilers/llvm/8/llvm.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetch , fetchpatch , cmake @@ -23,10 +23,10 @@ }: let - inherit (stdenv.lib) optional optionals optionalString; + inherit (lib) optional optionals optionalString; # Used when creating a version-suffixed symlink of libLLVM.dylib - shortVersion = with stdenv.lib; + shortVersion = with lib; concatStringsSep "." (take 1 (splitVersion release_version)); in stdenv.mkDerivation ({ @@ -155,11 +155,11 @@ in stdenv.mkDerivation ({ meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = "https://llvm.org/"; - license = stdenv.lib.licenses.ncsa; - maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.ncsa; + maintainers = with lib.maintainers; [ lovek323 raskin dtzWill ]; + platforms = lib.platforms.all; }; -} // stdenv.lib.optionalAttrs enableManpages { +} // lib.optionalAttrs enableManpages { pname = "llvm-manpages"; buildPhase = '' diff --git a/pkgs/development/compilers/llvm/8/openmp.nix b/pkgs/development/compilers/llvm/8/openmp.nix index 4eb43600dd6..b5d75d9c872 100644 --- a/pkgs/development/compilers/llvm/8/openmp.nix +++ b/pkgs/development/compilers/llvm/8/openmp.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , fetch , cmake , llvm @@ -18,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "Components required to build an executable OpenMP program"; homepage = "https://openmp.llvm.org/"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.mit; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/compilers/llvm/9/clang/default.nix b/pkgs/development/compilers/llvm/9/clang/default.nix index b880d843d59..87b29163f43 100644 --- a/pkgs/development/compilers/llvm/9/clang/default.nix +++ b/pkgs/development/compilers/llvm/9/clang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3, lld +{ lib, stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3, lld , fixDarwinDylibNames , enableManpages ? false , enablePolly ? false # TODO: get this info from llvm (passthru?) @@ -20,8 +20,8 @@ let ''; nativeBuildInputs = [ cmake python3 ] - ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + ++ lib.optional enableManpages python3.pkgs.sphinx + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ libxml2 llvm lld ]; @@ -29,13 +29,13 @@ let "-DCMAKE_CXX_FLAGS=-std=c++11" "-DCLANGD_BUILD_XPC=OFF" "-DLLVM_ENABLE_RTTI=ON" - ] ++ stdenv.lib.optionals enableManpages [ + ] ++ lib.optionals enableManpages [ "-DCLANG_INCLUDE_DOCS=ON" "-DLLVM_ENABLE_SPHINX=ON" "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] ++ stdenv.lib.optionals enablePolly [ + ] ++ lib.optionals enablePolly [ "-DWITH_POLLY=ON" "-DLINK_POLLY_INTO_TOOLS=ON" ]; @@ -55,9 +55,9 @@ let # Patch for standalone doc building sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt - '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + '' + lib.optionalString stdenv.hostPlatform.isMusl '' sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp - '' + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace tools/extra/clangd/CMakeLists.txt \ --replace "NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB" FALSE ''; @@ -96,10 +96,10 @@ let meta = { description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; homepage = "https://llvm.org/"; - license = stdenv.lib.licenses.ncsa; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.ncsa; + platforms = lib.platforms.all; }; - } // stdenv.lib.optionalAttrs enableManpages { + } // lib.optionalAttrs enableManpages { pname = "clang-manpages"; buildPhase = '' diff --git a/pkgs/development/compilers/llvm/9/compiler-rt.nix b/pkgs/development/compilers/llvm/9/compiler-rt.nix index 709d0c13477..2ab9dc8ffa2 100644 --- a/pkgs/development/compilers/llvm/9/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/9/compiler-rt.nix @@ -1,4 +1,4 @@ -{ stdenv, version, fetch, cmake, python3, llvm, libcxxabi }: +{ lib, stdenv, version, fetch, cmake, python3, llvm, libcxxabi }: let @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetch pname "0xwh79g3zggdabxgnd0bphry75asm1qz7mv3hcqihqwqr6aspgy2"; nativeBuildInputs = [ cmake python3 llvm ]; - buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi; NIX_CFLAGS_COMPILE = [ "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" @@ -24,24 +24,24 @@ stdenv.mkDerivation rec { "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON" "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}" "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}" - ] ++ stdenv.lib.optionals (useLLVM || bareMetal || isMusl) [ + ] ++ lib.optionals (useLLVM || bareMetal || isMusl) [ "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" "-DCOMPILER_RT_BUILD_XRAY=OFF" "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF" "-DCOMPILER_RT_BUILD_PROFILE=OFF" - ] ++ stdenv.lib.optionals (useLLVM || bareMetal) [ + ] ++ lib.optionals (useLLVM || bareMetal) [ "-DCMAKE_C_COMPILER_WORKS=ON" "-DCMAKE_CXX_COMPILER_WORKS=ON" "-DCOMPILER_RT_BAREMETAL_BUILD=ON" "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}" - ] ++ stdenv.lib.optionals (useLLVM) [ + ] ++ lib.optionals (useLLVM) [ "-DCOMPILER_RT_BUILD_BUILTINS=ON" "-DCMAKE_C_FLAGS=-nodefaultlibs" #https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY" - ] ++ stdenv.lib.optionals (bareMetal) [ + ] ++ lib.optionals (bareMetal) [ "-DCOMPILER_RT_OS_DIR=baremetal" - ] ++ stdenv.lib.optionals (stdenv.hostPlatform.isDarwin) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ # The compiler-rt build infrastructure sniffs supported platforms on Darwin # and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails # when it tries to use libc++ and libc++api for i386. @@ -53,21 +53,21 @@ stdenv.mkDerivation rec { patches = [ ../7/compiler-rt-glibc.patch ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory - ]# ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch - ++ stdenv.lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch; + ]# ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch + ++ lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch; # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by # a flag and turn the flag off during the stdenv build. - postPatch = stdenv.lib.optionalString (!stdenv.isDarwin) '' + postPatch = lib.optionalString (!stdenv.isDarwin) '' substituteInPlace cmake/builtin-config-ix.cmake \ --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)' - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' substituteInPlace cmake/config-ix.cmake \ --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' - '' + stdenv.lib.optionalString (useLLVM) '' + '' + lib.optionalString (useLLVM) '' substituteInPlace lib/builtins/int_util.c \ --replace "#include <stdlib.h>" "" substituteInPlace lib/builtins/clear_cache.c \ @@ -77,9 +77,9 @@ stdenv.mkDerivation rec { ''; # Hack around weird upsream RPATH bug - postInstall = stdenv.lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) '' + postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) '' ln -s "$out/lib"/*/* "$out/lib" - '' + stdenv.lib.optionalString (useLLVM) '' + '' + lib.optionalString (useLLVM) '' ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/crtbegin.o ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/crtend.o ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/crtbeginS.o diff --git a/pkgs/development/compilers/llvm/9/default.nix b/pkgs/development/compilers/llvm/9/default.nix index 6f5bdb8e8cc..dfb4981a5b7 100644 --- a/pkgs/development/compilers/llvm/9/default.nix +++ b/pkgs/development/compilers/llvm/9/default.nix @@ -1,4 +1,4 @@ -{ lowPrio, newScope, pkgs, stdenv, cmake, gccForLibs +{ lowPrio, newScope, pkgs, lib, stdenv, cmake, gccForLibs , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith , buildPackages , buildLlvmTools # tools, but from the previous stage, for cross @@ -17,7 +17,7 @@ let clang-tools-extra_src = fetch "clang-tools-extra" "01vgzd4k1q93nfs8gyl83mjlc4x0qsgfqw32lacbjzdxg0mdfvxj"; - tools = stdenv.lib.makeExtensible (tools: let + tools = lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); mkExtraBuildCommands = cc: '' rsrc="$out/resource-root" @@ -25,8 +25,6 @@ let ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc" ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - '' + stdenv.lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) '' - echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags ''; in { @@ -100,15 +98,15 @@ let extraPackages = [ targetLlvmLibraries.libcxxabi targetLlvmLibraries.compiler-rt - ] ++ stdenv.lib.optionals (!stdenv.targetPlatform.isWasm) [ + ] ++ lib.optionals (!stdenv.targetPlatform.isWasm) [ targetLlvmLibraries.libunwind ]; extraBuildCommands = '' echo "-rtlib=compiler-rt -Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags - '' + stdenv.lib.optionalString (!stdenv.targetPlatform.isWasm) '' + '' + lib.optionalString (!stdenv.targetPlatform.isWasm) '' echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags - '' + stdenv.lib.optionalString stdenv.targetPlatform.isWasm '' + '' + lib.optionalString stdenv.targetPlatform.isWasm '' echo "-fno-exceptions" >> $out/nix-support/cc-cflags '' + mkExtraBuildCommands cc; }; @@ -160,12 +158,12 @@ let }); - libraries = stdenv.lib.makeExtensible (libraries: let + libraries = lib.makeExtensible (libraries: let callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); in { compiler-rt = callPackage ./compiler-rt.nix ({} // - (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { + (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { stdenv = overrideCC stdenv buildLlvmTools.lldClangNoCompilerRt; })); @@ -174,12 +172,12 @@ let libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; libcxx = callPackage ./libc++ ({} // - (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { + (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; })); libcxxabi = callPackage ./libc++abi.nix ({} // - (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { + (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; libunwind = libraries.libunwind; })); @@ -187,7 +185,7 @@ let openmp = callPackage ./openmp.nix {}; libunwind = callPackage ./libunwind.nix ({} // - (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { + (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; })); diff --git a/pkgs/development/compilers/llvm/9/libc++/default.nix b/pkgs/development/compilers/llvm/9/libc++/default.nix index c70130d36a4..6ea1e28e7b4 100644 --- a/pkgs/development/compilers/llvm/9/libc++/default.nix +++ b/pkgs/development/compilers/llvm/9/libc++/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include" ''; - patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch; + patches = lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch; preConfigure = '' # Get headers from the cxxabi source so we can see private headers not installed by the cxxabi package @@ -22,8 +22,8 @@ stdenv.mkDerivation { patchShebangs utils/cat_files.py ''; nativeBuildInputs = [ cmake ] - ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python3 - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python3 + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ libcxxabi ]; @@ -31,13 +31,13 @@ stdenv.mkDerivation { "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" "-DLIBCXX_LIBCPPABI_VERSION=2" "-DLIBCXX_CXX_ABI=libcxxabi" - ] ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1" - ++ stdenv.lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON" - ++ stdenv.lib.optional stdenv.hostPlatform.isWasm [ + ] ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1" + ++ lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON" + ++ lib.optional stdenv.hostPlatform.isWasm [ "-DLIBCXX_ENABLE_THREADS=OFF" "-DLIBCXX_ENABLE_FILESYSTEM=OFF" "-DLIBCXX_ENABLE_EXCEPTIONS=OFF" - ] ++ stdenv.lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF"; + ] ++ lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF"; passthru = { isLLVM = true; @@ -46,7 +46,7 @@ stdenv.mkDerivation { meta = { homepage = "https://libcxx.llvm.org/"; description = "A new implementation of the C++ standard library, targeting C++11"; - license = with stdenv.lib.licenses; [ ncsa mit ]; - platforms = stdenv.lib.platforms.all; + license = with lib.licenses; [ ncsa mit ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/compilers/llvm/9/libc++abi.nix b/pkgs/development/compilers/llvm/9/libc++abi.nix index 13f033091be..e8e08f84801 100644 --- a/pkgs/development/compilers/llvm/9/libc++abi.nix +++ b/pkgs/development/compilers/llvm/9/libc++abi.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version +{ lib, stdenv, cmake, fetch, libcxx, libunwind, llvm, version , enableShared ? !stdenv.hostPlatform.isStatic }: @@ -9,15 +9,15 @@ stdenv.mkDerivation { src = fetch "libcxxabi" "1b4aiaa8cirx52vk2p5kfk57qmbqf1ipb4nqnjhdgqps9jm7iyg8"; nativeBuildInputs = [ cmake ]; - buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind; + buildInputs = lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind; - cmakeFlags = stdenv.lib.optionals (stdenv.hostPlatform.useLLVM or false) [ + cmakeFlags = lib.optionals (stdenv.hostPlatform.useLLVM or false) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" - ] ++ stdenv.lib.optionals stdenv.hostPlatform.isWasm [ + ] ++ lib.optionals stdenv.hostPlatform.isWasm [ "-DLIBCXXABI_ENABLE_THREADS=OFF" "-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF" - ] ++ stdenv.lib.optionals (!enableShared) [ + ] ++ lib.optionals (!enableShared) [ "-DLIBCXXABI_ENABLE_SHARED=OFF" ]; @@ -27,11 +27,11 @@ stdenv.mkDerivation { unpackFile ${libcxx.src} unpackFile ${llvm.src} cmakeFlags+=" -DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_PATH=$PWD/$(ls -d libcxx-*)" - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' export TRIPLE=x86_64-apple-darwin - '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + '' + lib.optionalString stdenv.hostPlatform.isMusl '' patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch} - '' + stdenv.lib.optionalString stdenv.hostPlatform.isWasm '' + '' + lib.optionalString stdenv.hostPlatform.isWasm '' patch -p1 -d $(ls -d llvm-*) -i ${./libcxxabi-wasm.patch} ''; @@ -52,7 +52,7 @@ stdenv.mkDerivation { install -d -m 755 $out/include $out/lib install -m 644 lib/libc++abi.a $out/lib install -m 644 ../include/cxxabi.h $out/include - '' + stdenv.lib.optionalString enableShared '' + '' + lib.optionalString enableShared '' install -m 644 lib/libc++abi.so.1.0 $out/lib ln -s libc++abi.so.1.0 $out/lib/libc++abi.so ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1 @@ -61,8 +61,8 @@ stdenv.mkDerivation { meta = { homepage = "https://libcxxabi.llvm.org/"; description = "A new implementation of low level support for a standard C++ library"; - license = with stdenv.lib.licenses; [ ncsa mit ]; - maintainers = with stdenv.lib.maintainers; [ vlstill ]; - platforms = stdenv.lib.platforms.all; + license = with lib.licenses; [ ncsa mit ]; + maintainers = with lib.maintainers; [ vlstill ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/compilers/llvm/9/libunwind.nix b/pkgs/development/compilers/llvm/9/libunwind.nix index 86756c53829..4c4c85512e3 100644 --- a/pkgs/development/compilers/llvm/9/libunwind.nix +++ b/pkgs/development/compilers/llvm/9/libunwind.nix @@ -1,4 +1,4 @@ -{ stdenv, version, fetch, cmake, fetchpatch +{ lib, stdenv, version, fetch, cmake, fetchpatch , enableShared ? !stdenv.hostPlatform.isStatic }: @@ -10,5 +10,5 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - cmakeFlags = stdenv.lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF"; + cmakeFlags = lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF"; } diff --git a/pkgs/development/compilers/llvm/9/lld.nix b/pkgs/development/compilers/llvm/9/lld.nix index a2b17a97cdc..8b12642d2a7 100644 --- a/pkgs/development/compilers/llvm/9/lld.nix +++ b/pkgs/development/compilers/llvm/9/lld.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetch , cmake , libxml2 @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "The LLVM Linker"; homepage = "https://lld.llvm.org/"; - license = stdenv.lib.licenses.ncsa; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.ncsa; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/compilers/llvm/9/lldb.nix b/pkgs/development/compilers/llvm/9/lldb.nix index 9c43287b166..8da5c0bef68 100644 --- a/pkgs/development/compilers/llvm/9/lldb.nix +++ b/pkgs/development/compilers/llvm/9/lldb.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetch , cmake , zlib @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { libxml2 llvm ] - ++ stdenv.lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { ln -s $out/bin/lldb-vscode $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A next-generation high-performance debugger"; homepage = "https://llvm.org/"; license = licenses.ncsa; diff --git a/pkgs/development/compilers/llvm/9/llvm.nix b/pkgs/development/compilers/llvm/9/llvm.nix index c46e54debe9..207dc242b91 100644 --- a/pkgs/development/compilers/llvm/9/llvm.nix +++ b/pkgs/development/compilers/llvm/9/llvm.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetch , cmake , python3 @@ -22,10 +22,10 @@ }: let - inherit (stdenv.lib) optional optionals optionalString; + inherit (lib) optional optionals optionalString; # Used when creating a version-suffixed symlink of libLLVM.dylib - shortVersion = with stdenv.lib; + shortVersion = with lib; concatStringsSep "." (take 1 (splitString "." release_version)); in stdenv.mkDerivation (rec { @@ -163,11 +163,11 @@ in stdenv.mkDerivation (rec { meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = "https://llvm.org/"; - license = stdenv.lib.licenses.ncsa; - maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.ncsa; + maintainers = with lib.maintainers; [ lovek323 raskin dtzWill ]; + platforms = lib.platforms.all; }; -} // stdenv.lib.optionalAttrs enableManpages { +} // lib.optionalAttrs enableManpages { pname = "llvm-manpages"; buildPhase = '' diff --git a/pkgs/development/compilers/llvm/9/openmp.nix b/pkgs/development/compilers/llvm/9/openmp.nix index 9fdcf9e6cff..416916f57ff 100644 --- a/pkgs/development/compilers/llvm/9/openmp.nix +++ b/pkgs/development/compilers/llvm/9/openmp.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , fetch , cmake , llvm @@ -18,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Components required to build an executable OpenMP program"; homepage = "https://openmp.llvm.org/"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.mit; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/compilers/llvm/multi.nix b/pkgs/development/compilers/llvm/multi.nix index b4f2f8f9d6f..60db622a73a 100644 --- a/pkgs/development/compilers/llvm/multi.nix +++ b/pkgs/development/compilers/llvm/multi.nix @@ -13,7 +13,12 @@ let chmod u+rw -R $out/lib cp -r ${basegcc.libc}/lib/* $(ls -d $out/lib/gcc/*/*) ''; - gcc_multi_sysroot = runCommand "gcc-multi-sysroot" {} '' + gcc_multi_sysroot = runCommand "gcc-multi-sysroot" { + passthru = { + inherit (gcc64) version; + lib = gcc_multi_sysroot; + }; + } '' mkdir -p $out/lib/gcc ln -s ${combine gcc64}/lib/gcc/* $out/lib/gcc/ @@ -32,17 +37,16 @@ let ''; clangMulti = clang.override { - # Only used for providing expected structure re:dynamic linkers, AFAIK - # Most of the magic is done by setting the --gcc-toolchain option below + # Only used for providing expected structure re:dynamic linkers, AFAIK Most + # of the magic is done by setting the --gcc-toolchain option via + # `gccForLibs`. libc = gcc_multi_sysroot; bintools = clang.bintools.override { libc = gcc_multi_sysroot; }; - extraBuildCommands = '' - sed -e '$a --gcc-toolchain=${gcc_multi_sysroot}' -i $out/nix-support/libc-cflags - ''; + gccForLibs = gcc_multi_sysroot; }; in clangMulti diff --git a/pkgs/development/compilers/llvm/rocm/clang.nix b/pkgs/development/compilers/llvm/rocm/clang.nix index 6bb23b77543..6ab0f894ca9 100644 --- a/pkgs/development/compilers/llvm/rocm/clang.nix +++ b/pkgs/development/compilers/llvm/rocm/clang.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , python @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { #undef CLANG_REPOSITORY ''; - postUnpack = stdenv.lib.optionalString (!(isNull clang-tools-extra_src)) '' + postUnpack = lib.optionalString (!(isNull clang-tools-extra_src)) '' ln -s ${clang-tools-extra_src} $sourceRoot/tools/extra ''; @@ -56,7 +56,12 @@ stdenv.mkDerivation rec { echo "$VCSVersion" > lib/Basic/VCSVersion.inc ''; - meta = with stdenv.lib; { + passthru = { + isClang = true; + inherit llvm; + }; + + meta = with lib; { description = "ROCm fork of the clang C/C++/Objective-C/Objective-C++ LLVM compiler frontend"; homepage = "https://llvm.org/"; license = with licenses; [ ncsa ]; diff --git a/pkgs/development/compilers/llvm/rocm/default.nix b/pkgs/development/compilers/llvm/rocm/default.nix index 36b42cef392..54a7733f4ba 100644 --- a/pkgs/development/compilers/llvm/rocm/default.nix +++ b/pkgs/development/compilers/llvm/rocm/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchFromGitHub, callPackage, wrapCCWith }: +{ lib, stdenv, fetchFromGitHub, callPackage, wrapCCWith }: let - version = "4.0.0"; + version = "4.0.1"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "llvm-project"; rev = "rocm-${version}"; - hash = "sha256-nIvqEk18NLtY8Hec2Iq6ufWMblzYJ8SOIXgqomtqa0s="; + hash = "sha256-5mQ8tN7A045JCF7tHKgAZAbyVmXOd6Wf0CVUiPA80YM="; }; in rec { clang = wrapCCWith rec { @@ -17,7 +17,6 @@ in rec { mkdir "$rsrc" ln -s "${cc}/lib/clang/$clang_version/include" "$rsrc" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - echo "--gcc-toolchain=${stdenv.cc.cc}" >> $out/nix-support/cc-cflags echo "-Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags rm $out/nix-support/add-hardening.sh touch $out/nix-support/add-hardening.sh diff --git a/pkgs/development/compilers/llvm/rocm/lld.nix b/pkgs/development/compilers/llvm/rocm/lld.nix index 34a094bf379..2a05331f7a0 100644 --- a/pkgs/development/compilers/llvm/rocm/lld.nix +++ b/pkgs/development/compilers/llvm/rocm/lld.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , cmake , libxml2 , llvm @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { --replace "\''${_IMPORT_PREFIX}/bin/lld" "$out/bin/lld" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "ROCm fork of the LLVM Linker"; homepage = "https://github.com/RadeonOpenCompute/llvm-project"; license = licenses.ncsa; diff --git a/pkgs/development/compilers/llvm/rocm/llvm.nix b/pkgs/development/compilers/llvm/rocm/llvm.nix index 909284a3e91..d6fe211c475 100644 --- a/pkgs/development/compilers/llvm/rocm/llvm.nix +++ b/pkgs/development/compilers/llvm/rocm/llvm.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , python3 @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { pname = "rocm-llvm"; outputs = [ "out" "python" ] - ++ stdenv.lib.optional enableSharedLibraries "lib"; + ++ lib.optional enableSharedLibraries "lib"; nativeBuildInputs = [ cmake python3 ]; @@ -44,10 +44,10 @@ in stdenv.mkDerivation rec { "-DLLVM_TARGETS_TO_BUILD=AMDGPU;${llvmNativeTarget}" ] ++ - stdenv.lib.optional + lib.optional enableSharedLibraries "-DLLVM_LINK_LLVM_DYLIB=ON" - ++ stdenv.lib.optionals enableManpages [ + ++ lib.optionals enableManpages [ "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" "-DLLVM_BUILD_DOCS=ON" "-DLLVM_ENABLE_SPHINX=ON" @@ -78,7 +78,7 @@ in stdenv.mkDerivation rec { postInstall = '' moveToOutput share/opt-viewer "$python" '' - + stdenv.lib.optionalString enableSharedLibraries '' + + lib.optionalString enableSharedLibraries '' moveToOutput "lib/libLLVM-*" "$lib" moveToOutput "lib/libLLVM${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib" substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ @@ -87,7 +87,7 @@ in stdenv.mkDerivation rec { passthru.src = src; - meta = with stdenv.lib; { + meta = with lib; { description = "ROCm fork of the LLVM compiler infrastructure"; homepage = "https://github.com/RadeonOpenCompute/llvm-project"; license = with licenses; [ ncsa ]; diff --git a/pkgs/development/compilers/lobster/default.nix b/pkgs/development/compilers/lobster/default.nix index 728049448e6..b65d640b475 100644 --- a/pkgs/development/compilers/lobster/default.nix +++ b/pkgs/development/compilers/lobster/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , unstableGitUpdater , cmake @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { updateScript = unstableGitUpdater { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://strlen.com/lobster"; description = "The Lobster programming language"; longDescription = '' diff --git a/pkgs/development/compilers/manticore/default.nix b/pkgs/development/compilers/manticore/default.nix index 8d2ad8e6bbc..1919f999805 100644 --- a/pkgs/development/compilers/manticore/default.nix +++ b/pkgs/development/compilers/manticore/default.nix @@ -5,7 +5,7 @@ let in stdenv.mkDerivation { pname = "manticore"; version = "2019.12.03"; - + src = fetchFromGitHub { owner = "ManticoreProject"; repo = "manticore"; @@ -14,9 +14,9 @@ in stdenv.mkDerivation { }; enableParallelBuilding = false; - + nativeBuildInputs = [ autoreconfHook ]; - + buildInputs = [ coreutils smlnj ]; autoreconfFlags = "-Iconfig -vfi"; @@ -28,8 +28,8 @@ in stdenv.mkDerivation { mv source repo_checkout cd repo_checkout chmod u+w . -R - ''; - + ''; + postPatch = '' patchShebangs . substituteInPlace configure.ac --replace 'MANTICORE_ROOT=`pwd`' 'MANTICORE_ROOT=$out/repo_checkout' @@ -40,14 +40,14 @@ in stdenv.mkDerivation { meta = { description = "A parallel, pure variant of Standard ML"; - longDescription = '' + longDescription = '' Manticore is a high-level parallel programming language aimed at general-purpose applications running on multi-core processors. Manticore supports parallelism at multiple levels: explicit concurrency and coarse-grain parallelism via CML-style constructs and fine-grain parallelism via various light-weight notations, such as parallel tuple expressions and NESL/Nepal-style - parallel array comprehensions. + parallel array comprehensions. ''; homepage = "http://manticore.cs.uchicago.edu/"; diff --git a/pkgs/development/compilers/matter-compiler/gemset.nix b/pkgs/development/compilers/matter-compiler/gemset.nix index 014fc226607..2ef9e911b82 100644 --- a/pkgs/development/compilers/matter-compiler/gemset.nix +++ b/pkgs/development/compilers/matter-compiler/gemset.nix @@ -9,4 +9,4 @@ }; version = "0.5.1"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/compilers/mcpp/default.nix b/pkgs/development/compilers/mcpp/default.nix index 023bae48b3e..efb5972e542 100644 --- a/pkgs/development/compilers/mcpp/default.nix +++ b/pkgs/development/compilers/mcpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch }: +{ lib, stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { pname = "mcpp"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }) ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://mcpp.sourceforge.net/"; description = "A portable c preprocessor"; license = licenses.bsd2; diff --git a/pkgs/development/compilers/mercury/default.nix b/pkgs/development/compilers/mercury/default.nix index d7029733381..e063c4c0921 100644 --- a/pkgs/development/compilers/mercury/default.nix +++ b/pkgs/development/compilers/mercury/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gcc, flex, bison, texinfo, jdk, erlang, makeWrapper +{ lib, stdenv, fetchurl, gcc, flex, bison, texinfo, jdk, erlang, makeWrapper , readline }: stdenv.mkDerivation rec { @@ -55,8 +55,8 @@ stdenv.mkDerivation rec { trade-offs. ''; homepage = "http://mercurylang.org"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = [ ]; }; } diff --git a/pkgs/development/compilers/meta-environment/meta-build-env/default.nix b/pkgs/development/compilers/meta-environment/meta-build-env/default.nix index a5c7054c3a6..454156c2d28 100644 --- a/pkgs/development/compilers/meta-environment/meta-build-env/default.nix +++ b/pkgs/development/compilers/meta-environment/meta-build-env/default.nix @@ -1,4 +1,6 @@ -{stdenv, fetchurl}: stdenv.mkDerivation { +{ lib, stdenv, fetchurl }: + +stdenv.mkDerivation { name = "meta-build-env-0.1"; src = fetchurl { url = "http://www.meta-environment.org/releases/meta-build-env-0.1.tar.gz"; @@ -6,6 +8,6 @@ }; meta = { - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/compilers/mezzo/default.nix b/pkgs/development/compilers/mezzo/default.nix index a90076c9ecc..4c535be4d49 100644 --- a/pkgs/development/compilers/mezzo/default.nix +++ b/pkgs/development/compilers/mezzo/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, menhir, yojson, ulex, pprint, fix, functory }: +{ lib, stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, menhir, yojson, ulex, pprint, fix, functory }: -if stdenv.lib.versionAtLeast ocaml.version "4.06" +if lib.versionAtLeast ocaml.version "4.06" then throw "mezzo is not available for OCaml ${ocaml.version}" else let - check-ocaml-version = with stdenv.lib; versionAtLeast (getVersion ocaml); + check-ocaml-version = with lib; versionAtLeast (getVersion ocaml); in assert check-ocaml-version "4"; @@ -24,7 +24,7 @@ stdenv.mkDerivation { buildInputs = [ ocaml findlib ocamlbuild yojson menhir ulex pprint fix functory ]; # Sets warning 3 as non-fatal - prePatch = stdenv.lib.optionalString (check-ocaml-version "4.02") '' + prePatch = lib.optionalString (check-ocaml-version "4.02") '' substituteInPlace myocamlbuild.pre.ml \ --replace '@1..3' '@1..2+3' ''; @@ -36,7 +36,7 @@ stdenv.mkDerivation { cp mezzo $out/bin/ ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://protz.github.io/mezzo/"; description = "A programming language in the ML tradition, which places strong emphasis on the control of aliasing and access to mutable memory"; license = licenses.gpl2; diff --git a/pkgs/development/compilers/microscheme/default.nix b/pkgs/development/compilers/microscheme/default.nix index ba3e388c399..ee2de8518f3 100644 --- a/pkgs/development/compilers/microscheme/default.nix +++ b/pkgs/development/compilers/microscheme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, vim, makeWrapper }: +{ lib, stdenv, fetchzip, vim, makeWrapper }: stdenv.mkDerivation rec { pname = "microscheme"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { make install PREFIX=$out ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://microscheme.org"; description = "A Scheme subset for Atmel microcontrollers"; longDescription = '' diff --git a/pkgs/development/compilers/miranda/default.nix b/pkgs/development/compilers/miranda/default.nix index 55d3976858b..298cb5e21ea 100644 --- a/pkgs/development/compilers/miranda/default.nix +++ b/pkgs/development/compilers/miranda/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { patchShebangs quotehostinfo ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Compiler for Miranda -- a pure, non-strict, polymorphic, higher order functional programming language"; homepage = "https://www.cs.kent.ac.uk/people/staff/dat/miranda/"; license = licenses.bsd2; diff --git a/pkgs/development/compilers/mit-scheme/default.nix b/pkgs/development/compilers/mit-scheme/default.nix index a3b320c384f..8cf709c10ae 100644 --- a/pkgs/development/compilers/mit-scheme/default.nix +++ b/pkgs/development/compilers/mit-scheme/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, makeWrapper, gnum4, texinfo, texLive, automake, +{ fetchurl, lib, stdenv, makeWrapper, gnum4, texinfo, texLive, automake, enableX11 ? false, xlibsWrapper ? null }: let @@ -63,7 +63,7 @@ stdenv.mkDerivation { # XXX: The `check' target doesn't exist. doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "MIT/GNU Scheme, a native code Scheme compiler"; longDescription = diff --git a/pkgs/development/compilers/mkcl/default.nix b/pkgs/development/compilers/mkcl/default.nix index baaf978d298..3656f1e0dd8 100644 --- a/pkgs/development/compilers/mkcl/default.nix +++ b/pkgs/development/compilers/mkcl/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, makeWrapper, gmp, gcc }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, gmp, gcc }: -with stdenv.lib; stdenv.mkDerivation rec { +with lib; stdenv.mkDerivation rec { pname = "mkcl"; version = "1.1.11"; diff --git a/pkgs/development/compilers/mlkit/default.nix b/pkgs/development/compilers/mlkit/default.nix index 45cb09d5a2a..5fc134f5ab2 100644 --- a/pkgs/development/compilers/mlkit/default.nix +++ b/pkgs/development/compilers/mlkit/default.nix @@ -1,21 +1,21 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, mlton }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, mlton }: stdenv.mkDerivation rec { pname = "mlkit"; - version = "4.5.2"; + version = "4.5.6"; src = fetchFromGitHub { owner = "melsman"; repo = "mlkit"; rev = "v${version}"; - sha256 = "1yk7phxnwkm94qs1gbxsr6sr11a0sgpcyjymmqwf0fsl5njgyb98"; + sha256 = "sha256-aa6dRcGTXGakJsHCvHXRKs5BHtIZi6V2r8348epzpVc="; }; nativeBuildInputs = [ autoreconfHook mlton ]; buildFlags = ["mlkit" "mlkit_libs"]; - meta = with stdenv.lib; { + meta = with lib; { description = "Standard ML Compiler and Toolkit"; homepage = "https://elsman.com/mlkit/"; license = licenses.gpl2Plus; diff --git a/pkgs/development/compilers/mlton/20130715.nix b/pkgs/development/compilers/mlton/20130715.nix index 52bb0a0775c..98b4aeda551 100644 --- a/pkgs/development/compilers/mlton/20130715.nix +++ b/pkgs/development/compilers/mlton/20130715.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, patchelf, gmp }: +{ lib, stdenv, fetchurl, patchelf, gmp }: let version = "20130715"; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { sourceRoot = "${pname}-${version}"; buildInputs = [ gmp ]; - nativeBuildInputs = stdenv.lib.optional stdenv.isLinux patchelf; + nativeBuildInputs = lib.optional stdenv.isLinux patchelf; makeFlags = [ "all-no-docs" ]; @@ -61,9 +61,9 @@ stdenv.mkDerivation rec { done substituteInPlace $(pwd)/../${usr_prefix}/bin/mlton --replace '/${usr_prefix}/lib/mlton' $(pwd)/../${usr_prefix}/lib/mlton - '' + stdenv.lib.optionalString stdenv.cc.isClang '' + '' + lib.optionalString stdenv.cc.isClang '' sed -i "s_ patch -s -p0 <gdtoa.hide-public-fns.patch_ patch -s -p0 <gdtoa.hide-public-fns.patch\n\tsed -i 's|printf(emptyfmt|printf(\"\"|g' ./gdtoa/arithchk.c_" ./runtime/Makefile - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' sed -i 's|XCFLAGS += -I/usr/local/include -I/sw/include -I/opt/local/include||' ./runtime/Makefile ''; @@ -79,13 +79,13 @@ stdenv.mkDerivation rec { # So the builder runs the binary compiler with gmp. export LD_LIBRARY_PATH=${gmp.out}/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH - '' + stdenv.lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.isLinux '' # Patch ELF interpreter. patchelf --set-interpreter ${dynamic_linker} $(pwd)/../${usr_prefix}/lib/mlton/mlton-compile for e in mllex mlyacc ; do patchelf --set-interpreter ${dynamic_linker} $(pwd)/../${usr_prefix}/bin/$e done - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' # Patch libgmp linking install_name_tool -change /opt/local/lib/libgmp.10.dylib ${gmp}/lib/libgmp.10.dylib $(pwd)/../${usr_prefix}/lib/mlton/mlton-compile install_name_tool -change /opt/local/lib/libgmp.10.dylib ${gmp}/lib/libgmp.10.dylib $(pwd)/../${usr_prefix}/bin/mlyacc diff --git a/pkgs/development/compilers/mlton/20180207-binary.nix b/pkgs/development/compilers/mlton/20180207-binary.nix index 2b4998f91c9..4846b58bf26 100644 --- a/pkgs/development/compilers/mlton/20180207-binary.nix +++ b/pkgs/development/compilers/mlton/20180207-binary.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, patchelf, gmp }: +{ lib, stdenv, fetchurl, patchelf, gmp }: let dynamic-linker = stdenv.cc.bintools.dynamicLinker; in @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { throw "Architecture not supported"; buildInputs = [ gmp ]; - nativeBuildInputs = stdenv.lib.optional stdenv.isLinux patchelf; + nativeBuildInputs = lib.optional stdenv.isLinux patchelf; buildPhase = '' make update \ @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { make install PREFIX=$out ''; - postFixup = stdenv.lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.isLinux '' patchelf --set-interpreter ${dynamic-linker} $out/lib/mlton/mlton-compile patchelf --set-rpath ${gmp}/lib $out/lib/mlton/mlton-compile @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { patchelf --set-interpreter ${dynamic-linker} $out/bin/$e patchelf --set-rpath ${gmp}/lib $out/bin/$e done - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' install_name_tool -change \ /opt/local/lib/libgmp.10.dylib \ ${gmp}/lib/libgmp.10.dylib \ diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix index 40d85be5a24..901848c693a 100644 --- a/pkgs/development/compilers/mono/generic.nix +++ b/pkgs/development/compilers/mono/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bison, pkg-config, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? false, cacert, Foundation, libobjc, python3, version, sha256, autoconf, libtool, automake, cmake, which +{ lib, stdenv, fetchurl, bison, pkg-config, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? false, cacert, Foundation, libobjc, python3, version, sha256, autoconf, libtool, automake, cmake, which , gnumake42 , enableParallelBuilding ? true , srcArchiveSuffix ? "tar.bz2" @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { buildInputs = [ glib gettext perl libgdiplus libX11 ncurses zlib python3 autoconf libtool ] - ++ (stdenv.lib.optionals stdenv.isDarwin [ Foundation libobjc ]); + ++ (lib.optionals stdenv.isDarwin [ Foundation libobjc ]); configureFlags = [ "--x-includes=${libX11.dev}/include" "--x-libraries=${libX11.out}/lib" "--with-libgdiplus=${libgdiplus}/lib/libgdiplus.so" ] - ++ stdenv.lib.optionals withLLVM [ + ++ lib.optionals withLLVM [ "--enable-llvm" "--with-llvm=${llvm}" ]; @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { preBuild = '' makeFlagsArray=(INSTALL=`type -tp install`) substituteInPlace mcs/class/corlib/System/Environment.cs --replace /usr/share "$out/share" - '' + stdenv.lib.optionalString withLLVM '' + '' + lib.optionalString withLLVM '' substituteInPlace mono/mini/aot-compiler.c --replace "llvm_path = g_strdup (\"\")" "llvm_path = g_strdup (\"${llvm}/bin/\")" ''; @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { inherit enableParallelBuilding; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://mono-project.com/"; description = "Cross platform, open source .NET development framework"; platforms = with platforms; darwin ++ linux; diff --git a/pkgs/development/compilers/mono/llvm.nix b/pkgs/development/compilers/mono/llvm.nix index 0a0f232227d..c69a4021677 100644 --- a/pkgs/development/compilers/mono/llvm.nix +++ b/pkgs/development/compilers/mono/llvm.nix @@ -39,13 +39,13 @@ stdenv.mkDerivation { cmakeFlags = with stdenv; [ "-DLLVM_ENABLE_FFI=ON" "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" - ] ++ stdenv.lib.optional (!isDarwin) "-DBUILD_SHARED_LIBS=ON"; + ] ++ lib.optional (!isDarwin) "-DBUILD_SHARED_LIBS=ON"; meta = { description = "Collection of modular and reusable compiler and toolchain technologies - Mono build"; homepage = "http://llvm.org/"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ thoughtpolice ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/compilers/mosml/default.nix b/pkgs/development/compilers/mosml/default.nix index 3d94303cbaa..ec8fa793cfd 100644 --- a/pkgs/development/compilers/mosml/default.nix +++ b/pkgs/development/compilers/mosml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gmp, perl }: +{ lib, stdenv, fetchurl, gmp, perl }: stdenv.mkDerivation rec { pname = "mosml"; @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { buildInputs = [ gmp perl ]; - makeFlags = [ "PREFIX=$(out)" ] ++ stdenv.lib.optionals stdenv.isDarwin [ "CC=cc" ]; + makeFlags = [ "PREFIX=$(out)" ] ++ lib.optionals stdenv.isDarwin [ "CC=cc" ]; src = fetchurl { url = "https://github.com/kfl/mosml/archive/ver-${version}.tar.gz"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { setSourceRoot = ''export sourceRoot="$(echo */src)"''; - meta = with stdenv.lib; { + meta = with lib; { description = "A light-weight implementation of Standard ML"; longDescription = '' Moscow ML is a light-weight implementation of Standard ML (SML), a strict diff --git a/pkgs/development/compilers/mozart/binary.nix b/pkgs/development/compilers/mozart/binary.nix index 66d642dbbbd..8366fd77a47 100644 --- a/pkgs/development/compilers/mozart/binary.nix +++ b/pkgs/development/compilers/mozart/binary.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper +{ lib, stdenv, fetchurl, makeWrapper , boost, gmp , tcl-8_5, tk-8_5 , emacs @@ -23,7 +23,7 @@ stdenv.mkDerivation { src = binaries.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}"); - libPath = stdenv.lib.makeLibraryPath + libPath = lib.makeLibraryPath [ stdenv.cc.cc boost gmp @@ -51,8 +51,8 @@ stdenv.mkDerivation { wrapProgram $out/bin/ozemulator --set OZHOME $out - ${stdenv.lib.optionalString (emacs != null) '' - wrapProgram $out/bin/oz --suffix PATH ":" ${stdenv.lib.makeBinPath [ emacs ]} + ${lib.optionalString (emacs != null) '' + wrapProgram $out/bin/oz --suffix PATH ":" ${lib.makeBinPath [ emacs ]} ''} sed -i $out/share/applications/oz.desktop \ @@ -63,7 +63,7 @@ stdenv.mkDerivation { patchShebangs $out ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.mozart-oz.org/"; description = "Multiplatform implementation of the Oz programming language"; longDescription = '' diff --git a/pkgs/development/compilers/mruby/default.nix b/pkgs/development/compilers/mruby/default.nix index eee4f2c64eb..25d35adff94 100644 --- a/pkgs/development/compilers/mruby/default.nix +++ b/pkgs/development/compilers/mruby/default.nix @@ -1,4 +1,4 @@ -{ stdenv, ruby, bison, rake, fetchFromGitHub }: +{ lib, stdenv, ruby, bison, rake, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "mruby"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "An embeddable implementation of the Ruby language"; homepage = "https://mruby.org"; maintainers = [ maintainers.nicknovitski ]; diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix index 89217db6818..ce053e87130 100644 --- a/pkgs/development/compilers/nasm/default.nix +++ b/pkgs/development/compilers/nasm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl }: +{ lib, stdenv, fetchurl, perl }: stdenv.mkDerivation rec { pname = "nasm"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { make test ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.nasm.us/"; description = "An 80x86 and x86-64 assembler designed for portability and modularity"; platforms = platforms.unix; diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix index 705b222a86c..8b157fb4ca0 100644 --- a/pkgs/development/compilers/neko/default.nix +++ b/pkgs/development/compilers/neko/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boehmgc, zlib, sqlite, pcre, cmake, pkgconfig +{ lib, stdenv, fetchurl, boehmgc, zlib, sqlite, pcre, cmake, pkg-config , git, apacheHttpd, apr, aprutil, libmysqlclient, mbedtls, openssl, pkgs, gtk2, libpthreadstubs }: @@ -11,12 +11,12 @@ stdenv.mkDerivation rec { sha256 = "1qv47zaa0vzhjlq5wb71627n7dbsxpc1gqpg0hsngjxnbnh1q46g"; }; - nativeBuildInputs = [ cmake pkgconfig git ]; + nativeBuildInputs = [ cmake pkg-config git ]; buildInputs = [ boehmgc zlib sqlite pcre apacheHttpd apr aprutil libmysqlclient mbedtls openssl libpthreadstubs ] - ++ stdenv.lib.optional stdenv.isLinux gtk2 - ++ stdenv.lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.Security + ++ lib.optional stdenv.isLinux gtk2 + ++ lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.Security pkgs.darwin.apple_sdk.frameworks.Carbon]; cmakeFlags = [ "-DRUN_LDCONFIG=OFF" ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { dontPatchELF = true; dontStrip = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A high-level dynamically typed programming language"; homepage = "https://nekovm.org"; license = licenses.lgpl21; diff --git a/pkgs/development/compilers/nextpnr/default.nix b/pkgs/development/compilers/nextpnr/default.nix index ebb6db31d5d..efb29985452 100644 --- a/pkgs/development/compilers/nextpnr/default.nix +++ b/pkgs/development/compilers/nextpnr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake +{ lib, stdenv, fetchFromGitHub, cmake , boost, python3, eigen , icestorm, trellis , llvmPackages @@ -12,7 +12,7 @@ let boostPython = boost.override { python = python3; enablePython = true; }; in -with stdenv; mkDerivation rec { +stdenv.mkDerivation rec { pname = "nextpnr"; version = "2021.01.02"; diff --git a/pkgs/development/compilers/obliv-c/default.nix b/pkgs/development/compilers/obliv-c/default.nix index 8fd6f33740e..8a647a31c7c 100644 --- a/pkgs/development/compilers/obliv-c/default.nix +++ b/pkgs/development/compilers/obliv-c/default.nix @@ -1,4 +1,4 @@ -{ stdenv, libgcrypt, fetchFromGitHub, ocamlPackages, perl }: +{ lib, stdenv, libgcrypt, fetchFromGitHub, ocamlPackages, perl }: stdenv.mkDerivation rec { pname = "obliv-c"; version = "0.0pre20180624"; @@ -34,9 +34,9 @@ stdenv.mkDerivation rec { meta = { inherit version; - description = ''A GCC wrapper that makes it easy to embed secure computation protocols inside regular C programs''; - license = stdenv.lib.licenses.bsd3; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + description = "A GCC wrapper that makes it easy to embed secure computation protocols inside regular C programs"; + license = lib.licenses.bsd3; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/compilers/ocaml/3.08.0.nix b/pkgs/development/compilers/ocaml/3.08.0.nix index cd621c131ff..5762bed41a4 100644 --- a/pkgs/development/compilers/ocaml/3.08.0.nix +++ b/pkgs/development/compilers/ocaml/3.08.0.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { checkTarget = ["opt.opt"]; meta = { - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/compilers/ocaml/3.10.0.nix b/pkgs/development/compilers/ocaml/3.10.0.nix index 8f26790020c..e3778457fd3 100644 --- a/pkgs/development/compilers/ocaml/3.10.0.nix +++ b/pkgs/development/compilers/ocaml/3.10.0.nix @@ -26,9 +26,9 @@ stdenv.mkDerivation (rec { meta = { homepage = "http://caml.inria.fr/ocaml"; - license = with stdenv.lib.licenses; [ qpl lgpl2 ]; + license = with lib.licenses; [ qpl lgpl2 ]; description = "Most popular variant of the Caml language"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; }) diff --git a/pkgs/development/compilers/ocaml/3.11.2.nix b/pkgs/development/compilers/ocaml/3.11.2.nix index 946013562c2..642b0d91b7f 100644 --- a/pkgs/development/compilers/ocaml/3.11.2.nix +++ b/pkgs/development/compilers/ocaml/3.11.2.nix @@ -3,7 +3,7 @@ let useX11 = stdenv.isi686 || stdenv.isx86_64; useNativeCompilers = stdenv.isi686 || stdenv.isx86_64 || stdenv.isMips; - inherit (stdenv.lib) optionals optionalString; + inherit (lib) optionals optionalString; in stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { [ (fetchurl { name = "0007-Fix-ocamlopt-w.r.t.-binutils-2.21.patch"; url = "http://caml.inria.fr/mantis/file_download.php?file_id=418&type=bug"; - sha256 = "612a9ac108bbfce2238aa5634123da162f0315dedb219958be705e0d92dcdd8e"; + sha256 = "612a9ac108bbfce2238aa5634123da162f0315dedb219958be705e0d92dcdd8e"; }) ]; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ln -sv $out/lib/ocaml/caml $out/include/caml ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://caml.inria.fr/ocaml"; license = with licenses; [ qpl /* compiler */ diff --git a/pkgs/development/compilers/ocaml/3.12.1.nix b/pkgs/development/compilers/ocaml/3.12.1.nix index f90d61744f5..781b5be0982 100644 --- a/pkgs/development/compilers/ocaml/3.12.1.nix +++ b/pkgs/development/compilers/ocaml/3.12.1.nix @@ -3,7 +3,7 @@ let useX11 = !stdenv.isAarch32 && !stdenv.isMips; useNativeCompilers = !stdenv.isMips; - inherit (stdenv.lib) optionals optionalString; + inherit (lib) optionals optionalString; in stdenv.mkDerivation rec { @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { nativeCompilers = useNativeCompilers; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://caml.inria.fr/ocaml"; branch = "3.12"; license = with licenses; [ diff --git a/pkgs/development/compilers/ocaml/4.00.1.nix b/pkgs/development/compilers/ocaml/4.00.1.nix index 81a8e0034fe..93e08740ddd 100644 --- a/pkgs/development/compilers/ocaml/4.00.1.nix +++ b/pkgs/development/compilers/ocaml/4.00.1.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, ncurses, xlibsWrapper }: +{ lib, stdenv, fetchurl, ncurses, xlibsWrapper }: let useX11 = !stdenv.isAarch32 && !stdenv.isMips; useNativeCompilers = !stdenv.isMips; - inherit (stdenv.lib) optional optionals optionalString; + inherit (lib) optional optionals optionalString; in stdenv.mkDerivation rec { @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { nativeCompilers = useNativeCompilers; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://caml.inria.fr/ocaml"; branch = "4.00"; license = with licenses; [ diff --git a/pkgs/development/compilers/ocaml/4.12.nix b/pkgs/development/compilers/ocaml/4.12.nix index 16649f09869..c422d2a15a3 100644 --- a/pkgs/development/compilers/ocaml/4.12.nix +++ b/pkgs/development/compilers/ocaml/4.12.nix @@ -1,9 +1,9 @@ import ./generic.nix { major_version = "4"; minor_version = "12"; - patch_version = "0-alpha3"; + patch_version = "0-beta1"; src = fetchTarball { - url = "http://caml.inria.fr/pub/distrib/ocaml-4.12/ocaml-4.12.0~alpha3.tar.xz"; - sha256 = "1hqlf9fi5gmvb6r13z5819rg6k813bw9ihgbbji67hhh4q361wlw"; + url = "http://caml.inria.fr/pub/distrib/ocaml-4.12/ocaml-4.12.0~beta1.tar.xz"; + sha256 = "1rny74mi0knl8byqg2naw1mgvn22c2zihlwvzbkd56j97flqsxsm"; }; } diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml.nix b/pkgs/development/compilers/ocaml/ber-metaocaml.nix index a6ddcd8ce8f..d3ab0d6e1c6 100644 --- a/pkgs/development/compilers/ocaml/ber-metaocaml.nix +++ b/pkgs/development/compilers/ocaml/ber-metaocaml.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , ncurses , libX11, xorgproto, buildEnv }: @@ -6,7 +6,7 @@ let useX11 = stdenv.isi686 || stdenv.isx86_64; x11deps = [ libX11 xorgproto ]; - inherit (stdenv.lib) optionals; + inherit (lib) optionals; baseOcamlBranch = "4.07"; baseOcamlVersion = "${baseOcamlBranch}.1"; @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { nativeCompilers = true; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Multi-Stage Programming extension for OCaml"; homepage = "http://okmij.org/ftp/ML/MetaOCaml.html"; license = with licenses; [ /* compiler */ qpl /* library */ lgpl2 ]; diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index 79aab1ffe83..d4a6b6250b5 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -6,17 +6,17 @@ let safeX11 = stdenv: !(stdenv.isAarch32 || stdenv.isMips); in -{ stdenv, fetchurl, ncurses, buildEnv, libunwind -, libX11, xorgproto, useX11 ? safeX11 stdenv && !stdenv.lib.versionAtLeast version "4.09" +{ lib, stdenv, fetchurl, ncurses, buildEnv, libunwind +, libX11, xorgproto, useX11 ? safeX11 stdenv && !lib.versionAtLeast version "4.09" , aflSupport ? false , flambdaSupport ? false , spaceTimeSupport ? false }: assert useX11 -> !stdenv.isAarch32 && !stdenv.isMips; -assert aflSupport -> stdenv.lib.versionAtLeast version "4.05"; -assert flambdaSupport -> stdenv.lib.versionAtLeast version "4.03"; -assert spaceTimeSupport -> stdenv.lib.versionAtLeast version "4.04"; +assert aflSupport -> lib.versionAtLeast version "4.05"; +assert flambdaSupport -> lib.versionAtLeast version "4.03"; +assert spaceTimeSupport -> lib.versionAtLeast version "4.04"; let src = args.src or (fetchurl { @@ -27,7 +27,7 @@ in let useNativeCompilers = !stdenv.isMips; - inherit (stdenv.lib) optional optionals optionalString; + inherit (lib) optional optionals optionalString; name = "ocaml${optionalString aflSupport "+afl"}${optionalString spaceTimeSupport "+spacetime"}${optionalString flambdaSupport "+flambda"}-${version}"; in @@ -47,7 +47,7 @@ stdenv.mkDerivation (args // { prefixKey = "-prefix "; configureFlags = let flags = new: old: - if stdenv.lib.versionAtLeast version "4.08" + if lib.versionAtLeast version "4.08" then new else old ; in optionals useX11 (flags @@ -59,11 +59,11 @@ stdenv.mkDerivation (args // { ; buildFlags = [ "world" ] ++ optionals useNativeCompilers [ "bootstrap" "world.opt" ]; - buildInputs = optional (!stdenv.lib.versionAtLeast version "4.07") ncurses + buildInputs = optional (!lib.versionAtLeast version "4.07") ncurses ++ optionals useX11 [ libX11 xorgproto ]; propagatedBuildInputs = optional spaceTimeSupport libunwind; installTargets = [ "install" ] ++ optional useNativeCompilers "installopt"; - preConfigure = optionalString (!stdenv.lib.versionAtLeast version "4.04") '' + preConfigure = optionalString (!lib.versionAtLeast version "4.04") '' CAT=$(type -tp cat) sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang ''; @@ -76,7 +76,7 @@ stdenv.mkDerivation (args // { nativeCompilers = useNativeCompilers; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://caml.inria.fr/ocaml"; branch = versionNoPatch; license = with licenses; [ @@ -105,7 +105,7 @@ stdenv.mkDerivation (args // { ''; platforms = with platforms; linux ++ darwin; - broken = stdenv.isAarch64 && !stdenv.lib.versionAtLeast version "4.06"; + broken = stdenv.isAarch64 && !lib.versionAtLeast version "4.06"; }; }) diff --git a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix index 8459f26367e..e13f3006be5 100644 --- a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix +++ b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xlibsWrapper, ncurses }: +{ lib, stdenv, fetchurl, xlibsWrapper, ncurses }: stdenv.mkDerivation ({ @@ -26,7 +26,7 @@ stdenv.mkDerivation ({ meta = { homepage = "http://www.metaocaml.org/"; - license = with stdenv.lib.licenses; [ qpl lgpl2 ]; + license = with lib.licenses; [ qpl lgpl2 ]; description = "A compiled, type-safe, multi-stage programming language"; broken = true; }; diff --git a/pkgs/development/compilers/opa/default.nix b/pkgs/development/compilers/opa/default.nix index 864bb8e1b26..5e648c9de4a 100644 --- a/pkgs/development/compilers/opa/default.nix +++ b/pkgs/development/compilers/opa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, which, perl, jdk +{ lib, stdenv, fetchFromGitHub, which, perl, jdk , ocamlPackages, openssl , coreutils, zlib, ncurses, makeWrapper , gcc, binutils, gnumake, nodejs @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { # Paths so the opa compiler code generation will use the same programs as were # used to build opa. - codeGeneratorPaths = stdenv.lib.makeBinPath [ ocamlPackages.ocaml gcc binutils gnumake nodejs ]; + codeGeneratorPaths = lib.makeBinPath [ ocamlPackages.ocaml gcc binutils gnumake nodejs ]; preConfigure = '' patchShebangs . @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { ocaml findlib ssl cryptokit camlzip ulex ocamlgraph camlp4 ]); - NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; + NIX_LDFLAGS = lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; postInstall = '' # Have compiler use same tools for code generation as used to build it. @@ -71,8 +71,8 @@ stdenv.mkDerivation rec { Opa is concise, simple, concurrent, dynamically distributed, and secure. ''; homepage = "http://opalang.org/"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.kkallio ]; - platforms = with stdenv.lib.platforms; unix; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.kkallio ]; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/development/compilers/open-watcom-bin/default.nix b/pkgs/development/compilers/open-watcom-bin/default.nix index a9c6b221065..9a1066dd3c2 100644 --- a/pkgs/development/compilers/open-watcom-bin/default.nix +++ b/pkgs/development/compilers/open-watcom-bin/default.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, fetchurl, qemu, expect, writeScript, writeScriptBin, ncurses, bash, coreutils }: +{ lib, stdenvNoCC, fetchurl, qemu, expect, writeScript, writeScriptBin, ncurses, bash, coreutils }: let @@ -112,7 +112,7 @@ stdenvNoCC.mkDerivation rec { done ''; - meta = with stdenvNoCC.lib; { + meta = with lib; { description = "A C/C++ Compiler (binary distribution)"; homepage = "http://www.openwatcom.org/"; license = licenses.watcom; diff --git a/pkgs/development/compilers/opendylan/bin.nix b/pkgs/development/compilers/opendylan/bin.nix index dbe7e44b1d7..9687f1b1a66 100644 --- a/pkgs/development/compilers/opendylan/bin.nix +++ b/pkgs/development/compilers/opendylan/bin.nix @@ -1,6 +1,6 @@ # Binaries provided by Open Dylan to be used to bootstrap from source. # The binaries can also be used as is. -{stdenv, fetchurl, patchelf, boehmgc, gnused, gcc, makeWrapper}: +{lib, stdenv, fetchurl, patchelf, boehmgc, gnused, gcc, makeWrapper}: stdenv.mkDerivation { name = "opendylan-2013.2"; @@ -22,11 +22,11 @@ stdenv.mkDerivation { tar --strip-components=1 -xjf "$src" -C "$out" interpreter="$(cat "$NIX_CC"/nix-support/dynamic-linker)" - for a in "$out"/bin/*; do + for a in "$out"/bin/*; do patchelf --set-interpreter "$interpreter" "$a" patchelf --set-rpath "$out/lib:${boehmgc.out}/lib" "$a" done - for a in "$out"/lib/*.so; do + for a in "$out"/lib/*.so; do patchelf --set-rpath "$out/lib:${boehmgc.out}/lib" "$a" done sed -i -e "s|\-lgc|\-L${boehmgc.out}\/lib -lgc|" $out/lib/config.jam @@ -36,7 +36,7 @@ stdenv.mkDerivation { meta = { homepage = "https://opendylan.org"; description = "A multi-paradigm functional and object-oriented programming language"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mit; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/compilers/opendylan/default.nix b/pkgs/development/compilers/opendylan/default.nix index 5abc40cc3bb..45b2454259f 100644 --- a/pkgs/development/compilers/opendylan/default.nix +++ b/pkgs/development/compilers/opendylan/default.nix @@ -1,5 +1,5 @@ # Build Open Dylan from source using the binary builds to bootstrap. -{stdenv, fetchgit, boehmgc, mps, gnused, opendylan-bootstrap, autoconf, automake, perl, makeWrapper, gcc }: +{lib, stdenv, fetchgit, boehmgc, mps, gnused, opendylan-bootstrap, autoconf, automake, perl, makeWrapper, gcc }: stdenv.mkDerivation { name = "opendylan-2016.1pre"; @@ -34,7 +34,7 @@ stdenv.mkDerivation { meta = { homepage = "https://opendylan.org"; description = "A multi-paradigm functional and object-oriented programming language"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mit; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix index 326aef1a562..18440a718d1 100644 --- a/pkgs/development/compilers/openjdk/11.nix +++ b/pkgs/development/compilers/openjdk/11.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, bash, pkgconfig, autoconf, cpio, file, which, unzip +{ stdenv, lib, fetchFromGitHub, bash, pkg-config, 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 @@ -25,7 +25,7 @@ let sha256 = "11j2rqz9nag5y562g99py4p72f2kv4wwwyrnaspmrzax00wynyx7"; }; - nativeBuildInputs = [ pkgconfig autoconf ]; + nativeBuildInputs = [ pkg-config autoconf ]; buildInputs = [ cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst @@ -136,7 +136,7 @@ let disallowedReferences = [ openjdk11-bootstrap ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://openjdk.java.net/"; license = licenses.gpl2; description = "The open-source Java Development Kit"; diff --git a/pkgs/development/compilers/openjdk/12.nix b/pkgs/development/compilers/openjdk/12.nix index 1de5d84a13b..f1c6d8493eb 100644 --- a/pkgs/development/compilers/openjdk/12.nix +++ b/pkgs/development/compilers/openjdk/12.nix @@ -1,7 +1,7 @@ -{ stdenv, lib, fetchurl, bash, pkgconfig, autoconf, cpio, file, which, unzip +{ stdenv, lib, fetchurl, bash, pkg-config, 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 +, libXcursor, libXrandr, fontconfig, openjdk11, fetchpatch , setJavaClassPath , headless ? false , enableJavaFX ? openjfx.meta.available, openjfx @@ -22,7 +22,7 @@ let sha256 = "1ndlxmikyy298z7lqpr1bd0zxq7yx6xidj8y3c8mw9m9fy64h9c7"; }; - nativeBuildInputs = [ pkgconfig autoconf ]; + nativeBuildInputs = [ pkg-config autoconf ]; buildInputs = [ cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst @@ -44,6 +44,11 @@ let url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch"; sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r"; }) + # Fix gnumake 4.3 incompatibility + (fetchpatch { + url = "https://github.com/openjdk/panama-foreign/commit/af5c725b8109ce83fc04ef0f8bf6aaf0b50c0441.patch"; + sha256 = "0ja84kih5wkjn58pml53s59qnavb1z92dc88cbgw7vcyqwc1gs0h"; + }) ] ++ lib.optionals (!headless && enableGnome2) [ ./swing-use-gtk-jdk10.patch ]; @@ -140,7 +145,7 @@ let disallowedReferences = [ openjdk11 ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://openjdk.java.net/"; license = licenses.gpl2; description = "The open-source Java Development Kit"; diff --git a/pkgs/development/compilers/openjdk/13.nix b/pkgs/development/compilers/openjdk/13.nix index 3c7ddfb8dd9..05e367e6314 100644 --- a/pkgs/development/compilers/openjdk/13.nix +++ b/pkgs/development/compilers/openjdk/13.nix @@ -1,7 +1,7 @@ -{ stdenv, lib, fetchurl, bash, pkgconfig, autoconf, cpio, file, which, unzip +{ stdenv, lib, fetchurl, bash, pkg-config, 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, openjdk13-bootstrap +, libXcursor, libXrandr, fontconfig, openjdk13-bootstrap, fetchpatch , setJavaClassPath , headless ? false , enableJavaFX ? openjfx.meta.available, openjfx @@ -22,7 +22,7 @@ let sha256 = "1871ziss7ny19rw8f7bay5vznmhpqbfi4ihn3yygs06wyxhm0zmv"; }; - nativeBuildInputs = [ pkgconfig autoconf ]; + nativeBuildInputs = [ pkg-config autoconf ]; buildInputs = [ cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst @@ -44,6 +44,11 @@ let url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch"; sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r"; }) + # Fix gnumake 4.3 incompatibility + (fetchpatch { + url = "https://github.com/openjdk/panama-foreign/commit/af5c725b8109ce83fc04ef0f8bf6aaf0b50c0441.patch"; + sha256 = "0ja84kih5wkjn58pml53s59qnavb1z92dc88cbgw7vcyqwc1gs0h"; + }) ] ++ lib.optionals (!headless && enableGnome2) [ ./swing-use-gtk-jdk13.patch ]; @@ -140,7 +145,7 @@ let disallowedReferences = [ openjdk13-bootstrap ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://openjdk.java.net/"; license = licenses.gpl2; description = "The open-source Java Development Kit"; diff --git a/pkgs/development/compilers/openjdk/14.nix b/pkgs/development/compilers/openjdk/14.nix index e851a5bf4b9..bda6444a8f9 100644 --- a/pkgs/development/compilers/openjdk/14.nix +++ b/pkgs/development/compilers/openjdk/14.nix @@ -55,6 +55,7 @@ let configureFlags = [ "--with-boot-jdk=${openjdk14-bootstrap.home}" + "--with-version-pre=" "--enable-unlimited-crypto" "--with-native-debug-symbols=internal" "--with-libjpeg=system" @@ -140,7 +141,7 @@ let disallowedReferences = [ openjdk14-bootstrap ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://openjdk.java.net/"; license = licenses.gpl2; description = "The open-source Java Development Kit"; diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index 050ca2a564a..96a01b0cd92 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, lndir, bash, cpio, file, which, unzip, zip +{ stdenv, lib, fetchurl, pkg-config, lndir, bash, cpio, file, which, unzip, zip , cups, freetype, alsaLib, cacert, perl, liberation_ttf, fontconfig, zlib , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor, libXrandr , libjpeg, giflib @@ -83,7 +83,7 @@ let outputs = [ "out" "jre" ]; - nativeBuildInputs = [ pkgconfig lndir ]; + nativeBuildInputs = [ pkg-config lndir ]; buildInputs = [ cpio file which unzip zip perl openjdk8-bootstrap zlib cups freetype alsaLib libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst diff --git a/pkgs/development/compilers/openjdk/darwin/11.nix b/pkgs/development/compilers/openjdk/darwin/11.nix index 0b659b95aa8..64654351886 100644 --- a/pkgs/development/compilers/openjdk/darwin/11.nix +++ b/pkgs/development/compilers/openjdk/darwin/11.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, setJavaClassPath, freetype }: +{ lib, stdenv, fetchurl, unzip, setJavaClassPath, freetype }: let jce-policies = fetchurl { # Ugh, unversioned URLs... I hope this doesn't change often enough to cause pain before we move to a Darwin source build of OpenJDK! @@ -52,7 +52,7 @@ let home = jdk; }; - meta = with stdenv.lib; { + meta = with lib; { license = licenses.gpl2; platforms = platforms.darwin; }; diff --git a/pkgs/development/compilers/openjdk/darwin/8.nix b/pkgs/development/compilers/openjdk/darwin/8.nix index 8afaf90f943..4df180c1f5a 100644 --- a/pkgs/development/compilers/openjdk/darwin/8.nix +++ b/pkgs/development/compilers/openjdk/darwin/8.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, setJavaClassPath, freetype }: +{ lib, stdenv, fetchurl, unzip, setJavaClassPath, freetype }: let jce-policies = fetchurl { # Ugh, unversioned URLs... I hope this doesn't change often enough to cause pain before we move to a Darwin source build of OpenJDK! @@ -56,7 +56,7 @@ let home = jdk; }; - meta = with stdenv.lib; { + meta = with lib; { license = licenses.gpl2; platforms = platforms.darwin; }; diff --git a/pkgs/development/compilers/openjdk/darwin/default.nix b/pkgs/development/compilers/openjdk/darwin/default.nix index f10ede2506a..8885db4115e 100644 --- a/pkgs/development/compilers/openjdk/darwin/default.nix +++ b/pkgs/development/compilers/openjdk/darwin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, setJavaClassPath, freetype }: +{ lib, stdenv, fetchurl, unzip, setJavaClassPath, freetype }: let jce-policies = fetchurl { # Ugh, unversioned URLs... I hope this doesn't change often enough to cause pain before we move to a Darwin source build of OpenJDK! @@ -52,7 +52,7 @@ let home = jdk; }; - meta = with stdenv.lib; { + meta = with lib; { license = licenses.gpl2; platforms = platforms.darwin; }; diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index ec0042809c6..ddd523ad787 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -55,6 +55,7 @@ let configureFlags = [ "--with-boot-jdk=${openjdk15-bootstrap.home}" + "--with-version-pre=" "--enable-unlimited-crypto" "--with-native-debug-symbols=internal" "--with-libjpeg=system" @@ -140,7 +141,7 @@ let disallowedReferences = [ openjdk15-bootstrap ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://openjdk.java.net/"; license = licenses.gpl2; description = "The open-source Java Development Kit"; diff --git a/pkgs/development/compilers/openjdk/openjfx/11.nix b/pkgs/development/compilers/openjdk/openjfx/11.nix index 513f4d968f6..8688831cdaa 100644 --- a/pkgs/development/compilers/openjdk/openjfx/11.nix +++ b/pkgs/development/compilers/openjdk/openjfx/11.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, writeText, gradleGen, pkgconfig, perl, cmake +{ stdenv, lib, fetchurl, writeText, gradleGen, pkg-config, perl, cmake , gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib, ffmpeg_3, python, ruby , openjdk11-bootstrap }: @@ -20,7 +20,7 @@ let }; buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg_3 ]; - nativeBuildInputs = [ gradle_ perl pkgconfig cmake gperf python ruby ]; + nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python ruby ]; dontUseCmakeConfigure = true; @@ -103,7 +103,7 @@ in makePackage { passthru.deps = deps; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://openjdk.java.net/projects/openjfx/"; license = licenses.gpl2; description = "The next-generation Java client toolkit"; diff --git a/pkgs/development/compilers/openjdk/openjfx/15.nix b/pkgs/development/compilers/openjdk/openjfx/15.nix index f406a3959fd..f9059ae2fc4 100644 --- a/pkgs/development/compilers/openjdk/openjfx/15.nix +++ b/pkgs/development/compilers/openjdk/openjfx/15.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, writeText, openjdk11_headless, gradleGen -, pkgconfig, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib +, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib , ffmpeg_3, python, ruby }: let @@ -22,7 +22,7 @@ let }; buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg_3 ]; - nativeBuildInputs = [ gradle_ perl pkgconfig cmake gperf python ruby ]; + nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python ruby ]; dontUseCmakeConfigure = true; @@ -65,9 +65,7 @@ let # Downloaded AWT jars differ by platform. outputHash = { x86_64-linux = "0hmyr5nnjgwyw3fcwqf0crqg9lny27jfirycg3xmkzbcrwqd6qkw"; - # The build-time dependencies don't currently build for i686, so no - # reason to fetch this one correctly either... - i686-linux = "0000000000000000000000000000000000000000000000000000"; + i686-linux = "0hx69p2z96p7jbyq4r20jykkb8gx6r8q2cj7m30pldlsw3650bqx"; }.${stdenv.system} or (throw "Unsupported platform"); }; @@ -107,7 +105,7 @@ in makePackage { passthru.deps = deps; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://openjdk.java.net/projects/openjfx/"; license = licenses.gpl2; description = "The next-generation Java client toolkit"; diff --git a/pkgs/development/compilers/openspin/default.nix b/pkgs/development/compilers/openspin/default.nix index fe10f43abd5..abf5623b582 100644 --- a/pkgs/development/compilers/openspin/default.nix +++ b/pkgs/development/compilers/openspin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { pname = "openspin"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { mv build/openspin $out/bin/openspin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Compiler for SPIN/PASM languages for Parallax Propeller MCU"; homepage = "https://github.com/parallaxinc/OpenSpin"; license = licenses.mit; diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index 17030cf5bf1..7a6cdf4d705 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -6,7 +6,7 @@ }: { swingSupport ? true -, stdenv +, lib, stdenv , requireFile , makeWrapper , unzip @@ -18,7 +18,6 @@ , config , glib , libxml2 -, libav_0_8 , ffmpeg_3 , libxslt , libGL @@ -85,7 +84,7 @@ let result = stdenv.mkDerivation rec { }; nativeBuildInputs = [ file ] - ++ stdenv.lib.optional installjce unzip; + ++ lib.optional installjce unzip; buildInputs = [ makeWrapper ]; @@ -149,7 +148,7 @@ let result = stdenv.mkDerivation rec { ''; postFixup = '' - rpath+="''${rpath:+:}${stdenv.lib.concatStringsSep ":" (map (a: "$jrePath/${a}") rSubPaths)}" + rpath+="''${rpath:+:}${lib.concatStringsSep ":" (map (a: "$jrePath/${a}") rSubPaths)}" # set all the dynamic linkers find $out -type f -perm -0100 \ @@ -171,10 +170,10 @@ let result = stdenv.mkDerivation rec { * libXt is only needed on amd64 */ libraries = - [stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg_3 libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk-pixbuf atk] ++ - (if swingSupport then [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc] else []); + [stdenv.cc.libc glib libxml2 ffmpeg_3 libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk-pixbuf atk] ++ + lib.optionals swingSupport [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc]; - rpath = stdenv.lib.strings.makeLibraryPath libraries; + rpath = lib.strings.makeLibraryPath libraries; passthru.mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins"; @@ -184,7 +183,7 @@ let result = stdenv.mkDerivation rec { passthru.architecture = architecture; - meta = with stdenv.lib; { + meta = with lib; { license = licenses.unfree; platforms = [ "i686-linux" "x86_64-linux" "armv7l-linux" "aarch64-linux" ]; # some inherit jre.meta.platforms }; diff --git a/pkgs/development/compilers/oraclejdk/jdk11-linux.nix b/pkgs/development/compilers/oraclejdk/jdk11-linux.nix index b73270e8dd8..eafe23c8e76 100644 --- a/pkgs/development/compilers/oraclejdk/jdk11-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk11-linux.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , requireFile , xorg , zlib @@ -9,12 +9,12 @@ let result = stdenv.mkDerivation rec { pname = "oraclejdk"; - version = "11.0.8"; + version = "11.0.10"; src = requireFile { name = "jdk-${version}_linux-x64_bin.tar.gz"; url = "https://www.oracle.com/java/technologies/javase-jdk11-downloads.html"; - sha256 = "6390878c91e29bad7b2483eb0b470620bd145269600f3b6a9d65724e6f83b6fd"; + sha256 = "94bd34f85ee38d3ef59e5289ec7450b9443b924c55625661fffe66b03f2c8de2"; }; installPhase = '' @@ -30,7 +30,7 @@ let result = stdenv.mkDerivation rec { ''; postFixup = '' - rpath="$out/lib/jli:$out/lib/server:$out/lib:${stdenv.lib.strings.makeLibraryPath [ zlib xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender freetype alsaLib]}" + rpath="$out/lib/jli:$out/lib/server:$out/lib:${lib.strings.makeLibraryPath [ zlib xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender freetype alsaLib]}" for f in $(find $out -name "*.so") $(find $out -type f -perm -0100); do patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$f" || true @@ -47,7 +47,7 @@ let result = stdenv.mkDerivation rec { dontStrip = true; # See: https://github.com/NixOS/patchelf/issues/10 - meta = with stdenv.lib; { + meta = with lib; { license = licenses.unfree; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/development/compilers/oraclejdk/jdk14-linux.nix b/pkgs/development/compilers/oraclejdk/jdk14-linux.nix index 427c7cedad1..b1655cd8b8f 100644 --- a/pkgs/development/compilers/oraclejdk/jdk14-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk14-linux.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , requireFile , xorg , zlib @@ -30,7 +30,7 @@ let result = stdenv.mkDerivation rec { ''; postFixup = '' - rpath="$out/lib/jli:$out/lib/server:$out/lib:${stdenv.lib.strings.makeLibraryPath [ stdenv.cc.cc zlib xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender freetype alsaLib]}" + rpath="$out/lib/jli:$out/lib/server:$out/lib:${lib.strings.makeLibraryPath [ stdenv.cc.cc zlib xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender freetype alsaLib]}" for f in $(find $out -name "*.so") $(find $out -type f -perm -0100); do patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$f" || true @@ -47,7 +47,7 @@ let result = stdenv.mkDerivation rec { dontStrip = true; # See: https://github.com/NixOS/patchelf/issues/10 - meta = with stdenv.lib; { + meta = with lib; { license = licenses.unfree; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix index 01d1ee8e980..206df75b9eb 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix @@ -1,10 +1,10 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "271"; - sha256.i686-linux = "nC1bRTDj0BPWqClLCfNIqdUn9HywUF8Z/pIV9Kq3LG0="; - sha256.x86_64-linux = "66eSamg7tlxvThxQLOYkNGxCsA+1Ux3ropbyVgtFLHg="; - sha256.armv7l-linux = "YZKX0iUf7yqUBUhlpHtVdYw6DBEu7E/pbfcVfK7HMxM="; - sha256.aarch64-linux = "bFRGnfmYIdXz5b/I8wlA/YiGXhCm/cVoOAU+Hlu4F0I="; + patchVersion = "281"; + sha256.i686-linux = "/yEY5O6MYNyjS5YSGZtgydb8th6jHQLNvI9tNPIh3+0="; + sha256.x86_64-linux = "hejH2nJIx0UPsQVWeniEHQlzWXhQd2wkpSf+sC7z5YY="; + sha256.armv7l-linux = "oXbW8hZxesDqwV79ANB4SdnS71O51ZApKbQhqq4i/EM="; + sha256.aarch64-linux = "oFH3TeIzVsFk6IZcDEHVDVJC7dSbGcwhdUH/WUXSNDM="; jceName = "jce_policy-8.zip"; sha256JCE = "19n5wadargg3v8x76r7ayag6p2xz1bwhrgdzjs9f4i6fvxz9jr4w"; } diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix index 210aa786cdd..40c89d0cc59 100644 --- a/pkgs/development/compilers/orc/default.nix +++ b/pkgs/development/compilers/orc/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, meson, ninja +{ lib, stdenv, fetchurl, meson, ninja , gtk-doc ? null, file, docbook_xsl , buildDevDoc ? gtk-doc != null }: let - inherit (stdenv.lib) optional optionals; + inherit (lib) optional optionals; in stdenv.mkDerivation rec { pname = "orc"; version = "0.4.32"; @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "The Oil Runtime Compiler"; homepage = "https://gstreamer.freedesktop.org/projects/orc.html"; # The source code implementing the Marsenne Twister algorithm is licensed diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix index b1f9dae4fcd..10067644813 100644 --- a/pkgs/development/compilers/osl/default.nix +++ b/pkgs/development/compilers/osl/default.nix @@ -1,4 +1,4 @@ -{ clangStdenv, stdenv, fetchFromGitHub, cmake, zlib, openexr, +{ clangStdenv, lib, fetchFromGitHub, cmake, zlib, openexr, openimageio, llvm, boost165, flex, bison, partio, pugixml, util-linux, python }: @@ -19,7 +19,7 @@ in clangStdenv.mkDerivation rec { cmakeFlags = [ "-DUSE_BOOST_WAVE=ON" "-DENABLERTTI=ON" ]; - preConfigure = '' patchShebangs src/liboslexec/serialize-bc.bash ''; + preConfigure = "patchShebangs src/liboslexec/serialize-bc.bash "; nativeBuildInputs = [ cmake boost_static flex bison]; buildInputs = [ @@ -29,7 +29,7 @@ in clangStdenv.mkDerivation rec { python # CMake doesn't check this? ]; # TODO: How important is partio? CMake doesn't seem to find it - meta = with stdenv.lib; { + meta = with lib; { description = "Advanced shading language for production GI renderers"; homepage = "http://opensource.imageworks.com/?p=osl"; maintainers = with maintainers; [ hodapp ]; diff --git a/pkgs/development/compilers/owl-lisp/default.nix b/pkgs/development/compilers/owl-lisp/default.nix index 93713af99b4..1d8ba03e72f 100644 --- a/pkgs/development/compilers/owl-lisp/default.nix +++ b/pkgs/development/compilers/owl-lisp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, coreutils, which }: +{ lib, stdenv, fetchFromGitLab, coreutils, which }: stdenv.mkDerivation rec { pname = "owl-lisp"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { # tests are run as part of the compilation process doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A functional Scheme for world domination"; homepage = "https://gitlab.com/owl-lisp/owl"; license = licenses.mit; diff --git a/pkgs/development/compilers/pakcs/curry-base.nix b/pkgs/development/compilers/pakcs/curry-base.nix index b34a2146383..c461d2caa93 100644 --- a/pkgs/development/compilers/pakcs/curry-base.nix +++ b/pkgs/development/compilers/pakcs/curry-base.nix @@ -1,5 +1,5 @@ { mkDerivation, base, Cabal, containers, directory, extra, filepath -, mtl, parsec, pretty, stdenv, time, transformers +, mtl, parsec, pretty, lib, time, transformers }: mkDerivation { pname = "curry-base"; @@ -12,5 +12,5 @@ mkDerivation { testHaskellDepends = [ base Cabal filepath mtl ]; homepage = "http://curry-language.org"; description = "Functions for manipulating Curry programs"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; } diff --git a/pkgs/development/compilers/pakcs/curry-frontend.nix b/pkgs/development/compilers/pakcs/curry-frontend.nix index b169578c7c3..88e88487594 100644 --- a/pkgs/development/compilers/pakcs/curry-frontend.nix +++ b/pkgs/development/compilers/pakcs/curry-frontend.nix @@ -1,6 +1,6 @@ { mkDerivation, base, bytestring, Cabal, containers, curry-base , directory, extra, file-embed, filepath, mtl, network-uri, pretty -, process, set-extra, stdenv, template-haskell, transformers +, process, set-extra, lib, template-haskell, transformers }: mkDerivation { pname = "curry-frontend"; @@ -22,5 +22,5 @@ mkDerivation { testHaskellDepends = [ base Cabal curry-base filepath ]; homepage = "http://curry-language.org"; description = "Compile the functional logic language Curry to several intermediate formats"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; } diff --git a/pkgs/development/compilers/pakcs/default.nix b/pkgs/development/compilers/pakcs/default.nix index 9f876ea914a..98fab9eb210 100644 --- a/pkgs/development/compilers/pakcs/default.nix +++ b/pkgs/development/compilers/pakcs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper +{ lib, stdenv, fetchurl, makeWrapper , haskellPackages, haskell , which, swiProlog, rlwrap, tk , curl, git, unzip, gnutar, coreutils, sqlite }: @@ -74,10 +74,10 @@ in stdenv.mkDerivation { # List of dependencies from currytools/cpm/src/CPM/Main.curry wrapProgram $out/pakcs/bin/cypm \ - --prefix PATH ":" "${stdenv.lib.makeBinPath [ curl git unzip gnutar coreutils sqlite ]}" + --prefix PATH ":" "${lib.makeBinPath [ curl git unzip gnutar coreutils sqlite ]}" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.informatik.uni-kiel.de/~pakcs/"; description = "An implementation of the multi-paradigm declarative language Curry"; license = licenses.bsd3; diff --git a/pkgs/development/compilers/pforth/default.nix b/pkgs/development/compilers/pforth/default.nix index ce228c2f1cb..44c6ea0a16a 100644 --- a/pkgs/development/compilers/pforth/default.nix +++ b/pkgs/development/compilers/pforth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation { version = "28"; @@ -29,8 +29,8 @@ stdenv.mkDerivation { meta = { description = "Portable ANSI style Forth written in ANSI C"; homepage = "http://www.softsynth.com/pforth/"; - license = stdenv.lib.licenses.publicDomain; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ yrashk ]; + license = lib.licenses.publicDomain; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ yrashk ]; }; } diff --git a/pkgs/development/compilers/picat/default.nix b/pkgs/development/compilers/picat/default.nix index 4898f991079..159dec05e29 100644 --- a/pkgs/development/compilers/picat/default.nix +++ b/pkgs/development/compilers/picat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib }: +{ lib, stdenv, fetchurl, zlib }: let ARCH = { @@ -9,11 +9,11 @@ let in stdenv.mkDerivation { pname = "picat"; - version = "3.0p3"; + version = "3.0p4"; src = fetchurl { - url = "http://picat-lang.org/download/picat30_3_src.tar.gz"; - sha256 = "052w0vk2xfmky5nv280ysb8in6vaph7i79yvbddqmahzszarq5hw"; + url = "http://picat-lang.org/download/picat30_4_src.tar.gz"; + sha256 = "1rwin44m7ni2h2v51sh2r8gj2k6wm6f86zgaylrria9jr57inpqj"; }; buildInputs = [ zlib ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation { buildPhase = "cd emu && make -j $NIX_BUILD_CORES -f Makefile.$ARCH"; installPhase = "mkdir -p $out/bin && cp picat $out/bin/picat"; - meta = with stdenv.lib; { + meta = with lib; { description = "Logic-based programming langage"; homepage = "http://picat-lang.org/"; license = licenses.mpl20; diff --git a/pkgs/development/compilers/polyml/5.6.nix b/pkgs/development/compilers/polyml/5.6.nix index 714adfb0e4c..7858e3f6dc1 100644 --- a/pkgs/development/compilers/polyml/5.6.nix +++ b/pkgs/development/compilers/polyml/5.6.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, autoreconfHook}: +{lib, stdenv, fetchurl, autoreconfHook}: let version = "5.6"; @@ -8,11 +8,11 @@ stdenv.mkDerivation { pname = "polyml"; inherit version; - prePatch = stdenv.lib.optionalString stdenv.isDarwin '' + prePatch = lib.optionalString stdenv.isDarwin '' substituteInPlace configure.ac --replace stdc++ c++ ''; - buildInputs = stdenv.lib.optional stdenv.isDarwin autoreconfHook; + buildInputs = lib.optional stdenv.isDarwin autoreconfHook; src = fetchurl { url = "mirror://sourceforge/polyml/polyml.${version}.tar.gz"; @@ -25,10 +25,10 @@ stdenv.mkDerivation { Poly/ML is a full implementation of Standard ML. ''; homepage = "https://www.polyml.org/"; - license = stdenv.lib.licenses.lgpl21; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.lgpl21; + platforms = with lib.platforms; linux; maintainers = [ #Add your name here! - stdenv.lib.maintainers.maggesi + lib.maintainers.maggesi ]; }; } diff --git a/pkgs/development/compilers/polyml/5.7.nix b/pkgs/development/compilers/polyml/5.7.nix index ce8c033e4be..5ac6990383c 100644 --- a/pkgs/development/compilers/polyml/5.7.nix +++ b/pkgs/development/compilers/polyml/5.7.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, gmp, libffi }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, gmp, libffi }: stdenv.mkDerivation rec { pname = "polyml"; version = "5.7.1"; - prePatch = stdenv.lib.optionalString stdenv.isDarwin '' + prePatch = lib.optionalString stdenv.isDarwin '' substituteInPlace configure.ac --replace stdc++ c++ ''; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ libffi gmp ]; - nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin autoreconfHook; + nativeBuildInputs = lib.optional stdenv.isDarwin autoreconfHook; configureFlags = [ "--enable-shared" @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { sha256 = "0j0wv3ijfrjkfngy7dswm4k1dchk3jak9chl5735dl8yrl8mq755"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Standard ML compiler and interpreter"; longDescription = '' Poly/ML is a full implementation of Standard ML. diff --git a/pkgs/development/compilers/polyml/default.nix b/pkgs/development/compilers/polyml/default.nix index 7b15a988e38..d2a15033422 100644 --- a/pkgs/development/compilers/polyml/default.nix +++ b/pkgs/development/compilers/polyml/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, gmp, libffi }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, gmp, libffi }: stdenv.mkDerivation rec { pname = "polyml"; version = "5.8.1"; - prePatch = stdenv.lib.optionalString stdenv.isDarwin '' + prePatch = lib.optionalString stdenv.isDarwin '' substituteInPlace configure.ac --replace stdc++ c++ ''; buildInputs = [ libffi gmp ]; - nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin autoreconfHook; + nativeBuildInputs = lib.optional stdenv.isDarwin autoreconfHook; configureFlags = [ "--enable-shared" @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { sha256 = "0gcx2fjiwsiazlyfhm7zlrd563blc4fy9w2mspib9divbavaxin6"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Standard ML compiler and interpreter"; longDescription = '' Poly/ML is a full implementation of Standard ML. diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index df80fe2fdb6..3a2e3c4b944 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, makeWrapper, pcre2, coreutils, which, libressl, libxml2, cmake, z3, substituteAll, +{ lib, stdenv, fetchFromGitHub, fetchurl, makeWrapper, pcre2, coreutils, which, libressl, libxml2, cmake, z3, substituteAll, cc ? stdenv.cc, lto ? !stdenv.isDarwin }: stdenv.mkDerivation (rec { @@ -80,29 +80,28 @@ stdenv.mkDerivation (rec { "PONYC_VERSION=${version}" "prefix=${placeholder "out"}" ] - ++ stdenv.lib.optionals stdenv.isDarwin [ "bits=64" ] - ++ stdenv.lib.optionals (stdenv.isDarwin && (!lto)) [ "lto=no" ]; + ++ lib.optionals stdenv.isDarwin [ "bits=64" ] + ++ lib.optionals (stdenv.isDarwin && (!lto)) [ "lto=no" ]; doCheck = true; NIX_CFLAGS_COMPILE = [ "-Wno-error=redundant-move" "-Wno-error=implicit-fallthrough" ]; - installPhase = '' - make config=release prefix=$out '' - + stdenv.lib.optionalString stdenv.isDarwin '' bits=64 '' - + stdenv.lib.optionalString (stdenv.isDarwin && (!lto)) '' lto=no '' + installPhase = "make config=release prefix=$out " + + lib.optionalString stdenv.isDarwin "bits=64 " + + lib.optionalString (stdenv.isDarwin && (!lto)) "lto=no " + '' install wrapProgram $out/bin/ponyc \ --prefix PATH ":" "${stdenv.cc}/bin" \ --set-default CC "$CC" \ - --prefix PONYPATH : "${stdenv.lib.makeLibraryPath [ pcre2 libressl (placeholder "out") ]}" + --prefix PONYPATH : "${lib.makeLibraryPath [ pcre2 libressl (placeholder "out") ]}" ''; # Stripping breaks linking for ponyc dontStrip = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Pony is an Object-oriented, actor-model, capabilities-secure, high performance programming language"; homepage = "https://www.ponylang.org"; license = licenses.bsd2; diff --git a/pkgs/development/compilers/ponyc/pony-corral.nix b/pkgs/development/compilers/ponyc/pony-corral.nix index 7cf3000e9db..5da1ec77016 100644 --- a/pkgs/development/compilers/ponyc/pony-corral.nix +++ b/pkgs/development/compilers/ponyc/pony-corral.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ponyc }: +{ lib, stdenv, fetchFromGitHub, ponyc }: stdenv.mkDerivation ( rec { pname = "corral"; @@ -15,7 +15,7 @@ stdenv.mkDerivation ( rec { installFlags = [ "prefix=${placeholder "out"}" "install" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Corral is a dependency management tool for ponylang (ponyc)"; homepage = "https://www.ponylang.io"; license = licenses.bsd2; diff --git a/pkgs/development/compilers/ponyc/pony-stable.nix b/pkgs/development/compilers/ponyc/pony-stable.nix index 3c1b2a0f91b..8e581050897 100644 --- a/pkgs/development/compilers/ponyc/pony-stable.nix +++ b/pkgs/development/compilers/ponyc/pony-stable.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, ponyc }: +{lib, stdenv, fetchFromGitHub, ponyc }: stdenv.mkDerivation rec { pname = "pony-stable"; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { meta = { description = "A simple dependency manager for the Pony language"; homepage = "https://www.ponylang.org"; - license = stdenv.lib.licenses.bsd2; - maintainers = with stdenv.lib.maintainers; [ dipinhora kamilchm patternspandemic ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ dipinhora kamilchm patternspandemic ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/compilers/prjxray-tools/default.nix b/pkgs/development/compilers/prjxray-tools/default.nix deleted file mode 100644 index 652b5458a75..00000000000 --- a/pkgs/development/compilers/prjxray-tools/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv -, fetchFromGitHub -, cmake -}: - -stdenv.mkDerivation rec { - pname = "prjxray-tools"; - version = "0.1-2676-gac8d30e3"; - - src = fetchFromGitHub { - owner = "SymbiFlow"; - repo = "prjxray"; - fetchSubmodules = true; - rev = "ac8d30e3fe2029122408888d2313844b3e0c265b"; - sha256 = "1ag7dk12hdhip821crwinncp8vgyzs0r85l1h2vbgn61lnxc7f4h"; - }; - - nativeBuildInputs = [ cmake ]; - - doCheck = true; - - meta = with stdenv.lib; { - description = "Documenting the Xilinx 7-series bit-stream format"; - homepage = "https://github.com/SymbiFlow/prjxray"; - license = licenses.isc; - platforms = platforms.all; - maintainers = with maintainers; [ mcaju ]; - }; -} diff --git a/pkgs/development/compilers/purescript/purescript/default.nix b/pkgs/development/compilers/purescript/purescript/default.nix index 8dd19ecf858..741d0ec7d1c 100644 --- a/pkgs/development/compilers/purescript/purescript/default.nix +++ b/pkgs/development/compilers/purescript/purescript/default.nix @@ -55,7 +55,7 @@ in stdenv.mkDerivation rec { minimal-module = pkgs.callPackage ./test-minimal-module {}; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A strongly-typed functional programming language that compiles to JavaScript"; homepage = "https://www.purescript.org/"; license = licenses.bsd3; diff --git a/pkgs/development/compilers/qbe/default.nix b/pkgs/development/compilers/qbe/default.nix index 436b03e499c..9ebcb2242dd 100644 --- a/pkgs/development/compilers/qbe/default.nix +++ b/pkgs/development/compilers/qbe/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchgit , unstableGitUpdater }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { passthru.updateScript = unstableGitUpdater { }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://c9x.me/compile/"; description = "A small compiler backend written in C"; maintainers = with maintainers; [ fgaz ]; diff --git a/pkgs/development/compilers/rasm/default.nix b/pkgs/development/compilers/rasm/default.nix index 37e07a230ae..c2415899f6b 100644 --- a/pkgs/development/compilers/rasm/default.nix +++ b/pkgs/development/compilers/rasm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { pname = "rasm"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { install -Dt $out/bin rasm ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.roudoudou.com/rasm/"; description = "Z80 assembler"; # use -n option to display all licenses diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix index 435813ee5e7..2807ddb6b5f 100644 --- a/pkgs/development/compilers/reason/default.nix +++ b/pkgs/development/compilers/reason/default.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, fetchFromGitHub, ocaml, findlib, dune_2 +{ lib, stdenv, makeWrapper, fetchFromGitHub, ocaml, findlib, dune_2 , fix, menhir, merlin-extend, ppx_tools_versioned, utop, cppo }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { --prefix OCAMLPATH : "$OCAMLPATH:$OCAMLFIND_DESTDIR" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://reasonml.github.io/"; description = "Facebook's friendly syntax to OCaml"; license = licenses.mit; diff --git a/pkgs/development/compilers/rgbds/default.nix b/pkgs/development/compilers/rgbds/default.nix index 4c8a4cfd4ef..6bc74971c4e 100644 --- a/pkgs/development/compilers/rgbds/default.nix +++ b/pkgs/development/compilers/rgbds/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, bison, flex, pkg-config, libpng}: +{lib, stdenv, fetchFromGitHub, bison, flex, pkg-config, libpng}: # TODO: byacc is the recommended parser generator but due to https://github.com/rednex/rgbds/issues/333 # it does not work for the moment. We should switch back to byacc as soon as the fix is integrated @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ bison flex pkg-config libpng ]; installFlags = [ "PREFIX=\${out}" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://rednex.github.io/rgbds/"; description = "A free assembler/linker package for the Game Boy and Game Boy Color"; license = licenses.mit; diff --git a/pkgs/development/compilers/rust/1_45.nix b/pkgs/development/compilers/rust/1_45.nix index 25ecb1dc001..13b1b3ef488 100644 --- a/pkgs/development/compilers/rust/1_45.nix +++ b/pkgs/development/compilers/rust/1_45.nix @@ -37,6 +37,7 @@ import ./default.nix { bootstrapHashes = { i686-unknown-linux-gnu = "e69689b0a1b66599cf83e7dd54f839419007e44376195e93e301a3175da3d854"; x86_64-unknown-linux-gnu = "a41df89a461a580536aeb42755e43037556fba2e527dd13a1e1bb0749de28202"; + x86_64-unknown-linux-musl = "7eeef2b7488ee96015db10bc52c43f6e023debc9a955ccb8efb382522bf35be9"; arm-unknown-linux-gnueabihf = "ea18ccdfb62a153c2d43d013fdec56993cc9267f1cdc6f3834df8a2b9b468f08"; armv7-unknown-linux-gnueabihf = "d44294732cf268ea84908f1135f574ab9489132a332eaa9d5bda547374b15d54"; aarch64-unknown-linux-gnu = "a2d74ebeec0b6778026b6c37814cdc91d14db3b0d8b6d69d036216f4d9cf7e49"; diff --git a/pkgs/development/compilers/rust/1_49.nix b/pkgs/development/compilers/rust/1_49.nix index a085d2b3022..3e76cdfe969 100644 --- a/pkgs/development/compilers/rust/1_49.nix +++ b/pkgs/development/compilers/rust/1_49.nix @@ -39,9 +39,11 @@ import ./default.nix { bootstrapHashes = { i686-unknown-linux-gnu = "7fdb8836a1f0427d5b47e6a2d496f67ebff04350407411f57cf20c9b3544e26f"; x86_64-unknown-linux-gnu = "950420a35b2dd9091f1b93a9ccd5abc026ca7112e667f246b1deb79204e2038b"; + x86_64-unknown-linux-musl = "4ed9627f57b4e0b9807fc5e7513d9731f4791668b7f875b9e44e65e21072c56f"; arm-unknown-linux-gnueabihf = "e68a81eebd4570343a0fc35cb8ee24cad911d6cee2e374f284b76546ca6636d5"; armv7-unknown-linux-gnueabihf = "3aed4a63ebdd57690a31d11afbe95e6407edc224a6769be5694a1ed43bf899cb"; aarch64-unknown-linux-gnu = "c4769418d8d89f432e4a3a21ad60f99629e4b13bbfc29aef7d9d51c4e8ee8a8a"; + aarch64-unknown-linux-musl = "ac4de580a28e45a9773b389b296d13bfeeb08263cb1f8343859577a54940dae9"; x86_64-apple-darwin = "20e727cad10f43e3abcedb2a80979ae26923038e0e8a855e8a783da255054113"; powerpc64le-unknown-linux-gnu = "e6457a0214f3b1b04bd5b2618bba7e3826e254216420dede2971b571a1c13bb1"; }; diff --git a/pkgs/development/compilers/rust/binary.nix b/pkgs/development/compilers/rust/binary.nix index b84e390e0b0..770cc3415f2 100644 --- a/pkgs/development/compilers/rust/binary.nix +++ b/pkgs/development/compilers/rust/binary.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, bash, curl, darwin, zlib +{ lib, stdenv, makeWrapper, bash, curl, darwin, zlib , version , src , platform @@ -6,7 +6,7 @@ }: let - inherit (stdenv.lib) optionalString; + inherit (lib) optionalString; inherit (darwin.apple_sdk.frameworks) Security; bootstrapping = versionType == "bootstrap"; @@ -24,7 +24,7 @@ rec { inherit version; inherit src; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.rust-lang.org/"; description = "A safe, concurrent, practical language"; maintainers = with maintainers; [ qknight ]; @@ -32,7 +32,7 @@ rec { }; buildInputs = [ bash ] - ++ stdenv.lib.optional stdenv.isDarwin Security; + ++ lib.optional stdenv.isDarwin Security; postPatch = '' patchShebangs . @@ -46,7 +46,7 @@ rec { patchelf \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ "$out/bin/rustc" - '' + optionalString (stdenv.lib.versionAtLeast version "1.46") + '' + optionalString (lib.versionAtLeast version "1.46") # rustc bootstrap needs libz starting from 1.46 '' ln -s ${zlib}/lib/libz.so.1 $out/lib/libz.so.1 @@ -76,7 +76,7 @@ rec { inherit version; inherit src; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.rust-lang.org/"; description = "A safe, concurrent, practical language"; maintainers = with maintainers; [ qknight ]; @@ -84,7 +84,7 @@ rec { }; buildInputs = [ makeWrapper bash ] - ++ stdenv.lib.optional stdenv.isDarwin Security; + ++ lib.optional stdenv.isDarwin Security; postPatch = '' patchShebangs . diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index e820b982620..3a7f29e3229 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -1,4 +1,4 @@ -{ stdenv, file, curl, pkgconfig, python3, openssl, cmake, zlib +{ lib, stdenv, file, curl, pkg-config, python3, openssl, cmake, zlib , installShellFiles, makeWrapper, libiconv, cacert, rustPlatform, rustc , CoreFoundation, Security }: @@ -16,9 +16,9 @@ rustPlatform.buildRustPackage { # changes hash of vendor directory otherwise dontUpdateAutotoolsGnuConfigScripts = true; - nativeBuildInputs = [ pkgconfig cmake installShellFiles makeWrapper ]; + nativeBuildInputs = [ pkg-config cmake installShellFiles makeWrapper ]; buildInputs = [ cacert file curl python3 openssl zlib ] - ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv ]; + ++ lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv ]; # cargo uses git-rs which is made for a version of libgit2 from recent master that # is not compatible with the current version in nixpkgs. @@ -54,7 +54,7 @@ rustPlatform.buildRustPackage { # Disable check phase as there are failures (4 tests fail) doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://crates.io"; description = "Downloads your Rust project's dependencies and builds your project"; maintainers = with maintainers; [ retrry ]; diff --git a/pkgs/development/compilers/rust/clippy.nix b/pkgs/development/compilers/rust/clippy.nix index 0546ad9bac1..a3597e9febf 100644 --- a/pkgs/development/compilers/rust/clippy.nix +++ b/pkgs/development/compilers/rust/clippy.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage { # changes hash of vendor directory otherwise dontUpdateAutotoolsGnuConfigScripts = true; - buildInputs = [ rustc rustc.llvm ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ rustc rustc.llvm ] ++ lib.optionals stdenv.isDarwin [ Security ]; # fixes: error: the option `Z` is only accepted on the nightly compiler RUSTC_BOOTSTRAP = 1; @@ -20,11 +20,11 @@ rustPlatform.buildRustPackage { # (/private/tmp/nix-build-clippy-1.36.0.drv-0/rustc-1.36.0-src/src/librustc_llvm) doCheck = false; - preFixup = stdenv.lib.optionalString stdenv.isDarwin '' + preFixup = lib.optionalString stdenv.isDarwin '' install_name_tool -add_rpath "${rustc}/lib" $out/bin/clippy-driver ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://rust-lang.github.io/rust-clippy/"; description = "A bunch of lints to catch common mistakes and improve your Rust code"; maintainers = with maintainers; [ basvandijk ]; diff --git a/pkgs/development/compilers/rust/print-hashes.sh b/pkgs/development/compilers/rust/print-hashes.sh index 9180ccb67d9..0639726f48d 100755 --- a/pkgs/development/compilers/rust/print-hashes.sh +++ b/pkgs/development/compilers/rust/print-hashes.sh @@ -10,9 +10,11 @@ set -euo pipefail PLATFORMS=( i686-unknown-linux-gnu x86_64-unknown-linux-gnu + x86_64-unknown-linux-musl arm-unknown-linux-gnueabihf armv7-unknown-linux-gnueabihf aarch64-unknown-linux-gnu + aarch64-unknown-linux-musl x86_64-apple-darwin powerpc64le-unknown-linux-gnu ) diff --git a/pkgs/development/compilers/rust/rls/default.nix b/pkgs/development/compilers/rust/rls/default.nix index 7534a52fe0f..ee860d78258 100644 --- a/pkgs/development/compilers/rust/rls/default.nix +++ b/pkgs/development/compilers/rust/rls/default.nix @@ -1,5 +1,5 @@ -{ stdenv, makeWrapper, fetchFromGitHub, rustPlatform -, openssh, openssl, pkgconfig, cmake, zlib, curl, libiconv +{ lib, stdenv, makeWrapper, fetchFromGitHub, rustPlatform +, openssh, openssl, pkg-config, cmake, zlib, curl, libiconv , CoreFoundation, Security }: rustPlatform.buildRustPackage { @@ -28,9 +28,9 @@ rustPlatform.buildRustPackage { # rls-rustc links to rustc_private crates CARGO_BUILD_RUSTFLAGS = if stdenv.isDarwin then "-C rpath" else null; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ openssh openssl curl zlib libiconv makeWrapper rustPlatform.rust.rustc.llvm ] - ++ (stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security ]); + ++ (lib.optionals stdenv.isDarwin [ CoreFoundation Security ]); doCheck = true; @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage { wrapProgram $out/bin/rls --set-default RUST_SRC_PATH ${rustPlatform.rustLibSrc} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Rust Language Server - provides information about Rust programs to IDEs and other tools"; homepage = "https://github.com/rust-lang/rls/"; license = with licenses; [ asl20 /* or */ mit ]; diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 570cd8b796f..315fe7c0c6d 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -1,8 +1,8 @@ -{ stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget +{ lib, stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget , llvmShared, llvmSharedForBuild, llvmSharedForHost, llvmSharedForTarget , fetchurl, file, python3 , darwin, cmake, rust, rustPlatform -, pkgconfig, openssl +, pkg-config, openssl , which, libffi , withBundledLLVM ? false , enableRustcDev ? true @@ -12,7 +12,7 @@ }: let - inherit (stdenv.lib) optionals optional optionalString concatStringsSep; + inherit (lib) optionals optional optionalString concatStringsSep; inherit (darwin.apple_sdk.frameworks) Security; in stdenv.mkDerivation rec { pname = "rustc"; @@ -117,7 +117,7 @@ in stdenv.mkDerivation rec { postPatch = '' patchShebangs src/etc - ${optionalString (!withBundledLLVM) ''rm -rf src/llvm''} + ${optionalString (!withBundledLLVM) "rm -rf src/llvm"} # Fix the configure script to not require curl as we won't use it sed -i configure \ @@ -133,7 +133,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ file python3 rustPlatform.rust.rustc cmake - which libffi removeReferencesTo pkgconfig + which libffi removeReferencesTo pkg-config ]; buildInputs = [ openssl ] @@ -143,7 +143,7 @@ in stdenv.mkDerivation rec { outputs = [ "out" "man" "doc" ]; setOutputFlags = false; - postInstall = stdenv.lib.optionalString enableRustcDev '' + postInstall = lib.optionalString enableRustcDev '' # install rustc-dev components. Necessary to build rls, clippy... python x.py dist rustc-dev tar xf build/dist/rustc-dev*tar.gz @@ -172,7 +172,7 @@ in stdenv.mkDerivation rec { passthru.llvm = llvmShared; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.rust-lang.org/"; description = "A safe, concurrent, practical language"; maintainers = with maintainers; [ madjar cstrahan globin havvy ]; diff --git a/pkgs/development/compilers/rust/rustfmt.nix b/pkgs/development/compilers/rust/rustfmt.nix index 6215c936c6d..b3191c242fe 100644 --- a/pkgs/development/compilers/rust/rustfmt.nix +++ b/pkgs/development/compilers/rust/rustfmt.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, Security }: +{ lib, stdenv, rustPlatform, Security }: rustPlatform.buildRustPackage rec { pname = "rustfmt"; @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { # changes hash of vendor directory otherwise dontUpdateAutotoolsGnuConfigScripts = true; - buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.isDarwin Security; # As of 1.0.0 and rustc 1.30 rustfmt requires a nightly compiler RUSTC_BOOTSTRAP = 1; @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { CFG_RELEASE = "${rustPlatform.rust.rustc.version}-nightly"; CFG_RELEASE_CHANNEL = "nightly"; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool for formatting Rust code according to style guidelines"; homepage = "https://github.com/rust-lang-nursery/rustfmt"; license = with licenses; [ mit asl20 ]; diff --git a/pkgs/development/compilers/sagittarius-scheme/default.nix b/pkgs/development/compilers/sagittarius-scheme/default.nix index dcc3457fe11..b421fe5d2ef 100644 --- a/pkgs/development/compilers/sagittarius-scheme/default.nix +++ b/pkgs/development/compilers/sagittarius-scheme/default.nix @@ -1,7 +1,7 @@ -{ stdenv +{ lib, stdenv , fetchurl , cmake -, pkgconfig +, pkg-config , libffi , boehmgc , openssl @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { # build extensions export ${platformLdLibraryPath}="$(pwd)/build" ''; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; - buildInputs = [ libffi boehmgc openssl zlib ] ++ stdenv.lib.optional odbcSupport libiodbc; + buildInputs = [ libffi boehmgc openssl zlib ] ++ lib.optional odbcSupport libiodbc; - meta = with stdenv.lib; { + meta = with lib; { description = "An R6RS/R7RS Scheme system"; longDescription = '' Sagittarius Scheme is a free Scheme implementation supporting diff --git a/pkgs/development/compilers/sbcl/2.0.9.nix b/pkgs/development/compilers/sbcl/2.0.9.nix index 148ecccf131..ada098ec182 100644 --- a/pkgs/development/compilers/sbcl/2.0.9.nix +++ b/pkgs/development/compilers/sbcl/2.0.9.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, writeText, sbclBootstrap +{ lib, stdenv, fetchurl, writeText, sbclBootstrap , sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit" , threadSupport ? (stdenv.isi686 || stdenv.isx86_64 || "aarch64-linux" == stdenv.hostPlatform.system) , disableImmobileSpace ? false @@ -70,17 +70,17 @@ stdenv.mkDerivation rec { export HOME=$PWD/test-home ''; - enableFeatures = with stdenv.lib; + enableFeatures = with lib; optional threadSupport "sb-thread" ++ optional stdenv.isAarch32 "arm"; - disableFeatures = with stdenv.lib; + disableFeatures = with lib; optional (!threadSupport) "sb-thread" ++ optionals disableImmobileSpace [ "immobile-space" "immobile-code" "compact-instance-header" ]; buildPhase = '' sh make.sh --prefix=$out --xc-host="${sbclBootstrapHost}" ${ - stdenv.lib.concatStringsSep " " + lib.concatStringsSep " " (builtins.map (x: "--with-${x}") enableFeatures ++ builtins.map (x: "--without-${x}") disableFeatures) } @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { installPhase = '' INSTALL_ROOT=$out sh install.sh '' - + stdenv.lib.optionalString (!purgeNixReferences) '' + + lib.optionalString (!purgeNixReferences) '' cp -r src $out/lib/sbcl cp -r contrib $out/lib/sbcl cat >$out/lib/sbcl/sbclrc <<EOF @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { EOF ''; - setupHook = stdenv.lib.optional purgeNixReferences (writeText "setupHook.sh" '' + setupHook = lib.optional purgeNixReferences (writeText "setupHook.sh" '' addEnvHooks "$targetOffset" _setSbclHome _setSbclHome() { export SBCL_HOME='@out@/lib/sbcl/' diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix index 81afe64ed53..cb42235bc8e 100644 --- a/pkgs/development/compilers/sbcl/bootstrap.nix +++ b/pkgs/development/compilers/sbcl/bootstrap.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper }: +{ lib, stdenv, fetchurl, makeWrapper }: let options = rec { @@ -65,11 +65,11 @@ stdenv.mkDerivation rec { --add-flags "--core $out/share/sbcl/sbcl.core" ''; - postFixup = stdenv.lib.optionalString (!stdenv.isAarch32 && stdenv.isLinux) '' + postFixup = lib.optionalString (!stdenv.isAarch32 && stdenv.isLinux) '' patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $out/share/sbcl/sbcl ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Lisp compiler"; homepage = "http://www.sbcl.org"; license = licenses.publicDomain; # and FreeBSD diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 3c7fca3c4b0..df80bb8af1d 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, writeText, sbclBootstrap +{ lib, stdenv, fetchurl, writeText, sbclBootstrap , sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit" , threadSupport ? (stdenv.isi686 || stdenv.isx86_64 || "aarch64-linux" == stdenv.hostPlatform.system) , disableImmobileSpace ? false @@ -70,17 +70,17 @@ stdenv.mkDerivation rec { export HOME=$PWD/test-home ''; - enableFeatures = with stdenv.lib; + enableFeatures = with lib; optional threadSupport "sb-thread" ++ optional stdenv.isAarch32 "arm"; - disableFeatures = with stdenv.lib; + disableFeatures = with lib; optional (!threadSupport) "sb-thread" ++ optionals disableImmobileSpace [ "immobile-space" "immobile-code" "compact-instance-header" ]; buildPhase = '' sh make.sh --prefix=$out --xc-host="${sbclBootstrapHost}" ${ - stdenv.lib.concatStringsSep " " + lib.concatStringsSep " " (builtins.map (x: "--with-${x}") enableFeatures ++ builtins.map (x: "--without-${x}") disableFeatures) } @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { installPhase = '' INSTALL_ROOT=$out sh install.sh '' - + stdenv.lib.optionalString (!purgeNixReferences) '' + + lib.optionalString (!purgeNixReferences) '' cp -r src $out/lib/sbcl cp -r contrib $out/lib/sbcl cat >$out/lib/sbcl/sbclrc <<EOF @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { EOF ''; - setupHook = stdenv.lib.optional purgeNixReferences (writeText "setupHook.sh" '' + setupHook = lib.optional purgeNixReferences (writeText "setupHook.sh" '' addEnvHooks "$targetOffset" _setSbclHome _setSbclHome() { export SBCL_HOME='@out@/lib/sbcl/' diff --git a/pkgs/development/compilers/scala/2.x.nix b/pkgs/development/compilers/scala/2.x.nix index 15c73f81400..a747206dff8 100644 --- a/pkgs/development/compilers/scala/2.x.nix +++ b/pkgs/development/compilers/scala/2.x.nix @@ -22,8 +22,8 @@ let }; "2.12" = { - version = "2.12.12"; - sha256 = "NSDNHzye//YrrudfMuUtHl3BIL4szzQGSeRw5I9Sfis="; + version = "2.12.13"; + sha256 = "17548sx7liskkadqiqaajmwp2w7bh9m2d8hp2mwyg8yslmjx4pcc"; tests = [ nixosTests.scala.scala_2_12 ]; pname = "scala_2_12"; }; @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { #!${stdenv.shell} set -o errexit PATH=${ - stdenv.lib.makeBinPath [ + lib.makeBinPath [ common-updater-scripts coreutils git diff --git a/pkgs/development/compilers/scala/dotty-bare.nix b/pkgs/development/compilers/scala/dotty-bare.nix index cefa4537c36..b173de58049 100644 --- a/pkgs/development/compilers/scala/dotty-bare.nix +++ b/pkgs/development/compilers/scala/dotty-bare.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, jre, ncurses }: +{ lib, stdenv, fetchurl, makeWrapper, jre, ncurses }: stdenv.mkDerivation rec { version = "0.26.0-RC1"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Research platform for new language concepts and compiler technologies for Scala"; longDescription = '' Dotty is a platform to try out new language concepts and compiler technologies for Scala. diff --git a/pkgs/development/compilers/sdcc/default.nix b/pkgs/development/compilers/sdcc/default.nix index 3d3d43a55e5..500c0b4d395 100644 --- a/pkgs/development/compilers/sdcc/default.nix +++ b/pkgs/development/compilers/sdcc/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, autoconf, bison, boost, flex, texinfo, zlib, gputils ? null +{ lib, stdenv, fetchurl, autoconf, bison, boost, flex, texinfo, zlib, gputils ? null , excludePorts ? [] }: -with stdenv.lib; +with lib; let # choices: mcs51 z80 z180 r2k r3ka gbz80 tlcs90 ds390 ds400 pic14 pic16 hc08 s08 stm8 diff --git a/pkgs/development/compilers/seexpr/default.nix b/pkgs/development/compilers/seexpr/default.nix index 4bf89973d7e..7fc1fc7b1b6 100644 --- a/pkgs/development/compilers/seexpr/default.nix +++ b/pkgs/development/compilers/seexpr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libpng, zlib, qt4, +{ lib, stdenv, fetchFromGitHub, cmake, libpng, zlib, qt4, bison, flex, libGLU, pythonPackages }: @@ -14,7 +14,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; buildInputs = [ libGLU libpng zlib qt4 pythonPackages.pyqt4 bison flex ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Embeddable expression evaluation engine from Disney Animation"; homepage = "https://www.disneyanimation.com/technology/seexpr.html"; maintainers = with maintainers; [ hodapp ]; diff --git a/pkgs/development/compilers/serpent/default.nix b/pkgs/development/compilers/serpent/default.nix index 2459127f425..775a78a9734 100644 --- a/pkgs/development/compilers/serpent/default.nix +++ b/pkgs/development/compilers/serpent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ... }: +{ lib, stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation { pname = "serpent"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { mv serpent $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Compiler for the Serpent language for Ethereum"; longDescription = '' Serpent is one of the high-level programming languages used to diff --git a/pkgs/development/compilers/shaderc/default.nix b/pkgs/development/compilers/shaderc/default.nix index 23532cc8446..678ab3adb06 100644 --- a/pkgs/development/compilers/shaderc/default.nix +++ b/pkgs/development/compilers/shaderc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, python3 }: +{ lib, stdenv, fetchFromGitHub, cmake, python3 }: # Like many google projects, shaderc doesn't gracefully support separately compiled dependencies, so we can't easily use # the versions of glslang and spirv-tools used by vulkan-loader. Exact revisions are taken from # https://github.com/google/shaderc/blob/known-good/known_good.json @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { cmakeFlags = [ "-DSHADERC_SKIP_TESTS=ON" ]; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "A collection of tools, libraries and tests for shader compilation"; license = [ licenses.asl20 ]; diff --git a/pkgs/development/compilers/smlnj/bootstrap.nix b/pkgs/development/compilers/smlnj/bootstrap.nix index 55d96266ac9..113b22768d9 100644 --- a/pkgs/development/compilers/smlnj/bootstrap.nix +++ b/pkgs/development/compilers/smlnj/bootstrap.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cpio, rsync, xar, makeWrapper }: +{ lib, stdenv, fetchurl, cpio, rsync, xar, makeWrapper }: stdenv.mkDerivation rec { pname = "smlnj-bootstrap"; @@ -36,8 +36,8 @@ stdenv.mkDerivation rec { meta = { description = "Compiler for the Standard ML '97 programming language"; homepage = "http://www.smlnj.org"; - license = stdenv.lib.licenses.free; - platforms = stdenv.lib.platforms.darwin; - maintainers = [ stdenv.lib.maintainers.jwiegley ]; + license = lib.licenses.free; + platforms = lib.platforms.darwin; + maintainers = [ lib.maintainers.jwiegley ]; }; } diff --git a/pkgs/development/compilers/smlnj/default.nix b/pkgs/development/compilers/smlnj/default.nix index 18562bc487a..3e987e8ccda 100644 --- a/pkgs/development/compilers/smlnj/default.nix +++ b/pkgs/development/compilers/smlnj/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: let version = "110.95"; baseurl = "http://smlnj.cs.uchicago.edu/dist/working/${version}"; @@ -79,7 +79,7 @@ in stdenv.mkDerivation { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Standard ML of New Jersey, a compiler"; homepage = "http://smlnj.org"; license = licenses.bsd3; diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index 0f0af33e700..546697d8efe 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -1,13 +1,12 @@ -{ gccStdenv, fetchzip, boost, cmake, ncurses, python3, coreutils +{ lib, gccStdenv, fetchzip, boost, cmake, ncurses, python3, coreutils , z3Support ? true, z3 ? null, cvc4Support ? true, cvc4 ? null , cln ? null, gmp ? null }: # compiling source/libsmtutil/CVC4Interface.cpp breaks on clang on Darwin, # general commandline tests fail at abiencoderv2_no_warning/ on clang on NixOS -let stdenv = gccStdenv; in -assert z3Support -> z3 != null && stdenv.lib.versionAtLeast z3.version "4.6.0"; +assert z3Support -> z3 != null && lib.versionAtLeast z3.version "4.6.0"; assert cvc4Support -> cvc4 != null && cln != null && gmp != null; let @@ -18,7 +17,7 @@ let sha256 = "0qnx5y6c90fphl9mj9d20j2dfgy6s5yr5l0xnzid0vh71zrp6jwv"; }; in -stdenv.mkDerivation rec { +gccStdenv.mkDerivation rec { pname = "solc"; version = "0.7.4"; @@ -36,20 +35,20 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBoost_USE_STATIC_LIBS=OFF" - ] ++ stdenv.lib.optionals (!z3Support) [ + ] ++ lib.optionals (!z3Support) [ "-DUSE_Z3=OFF" - ] ++ stdenv.lib.optionals (!cvc4Support) [ + ] ++ lib.optionals (!cvc4Support) [ "-DUSE_CVC4=OFF" ]; nativeBuildInputs = [ cmake ]; buildInputs = [ boost ] - ++ stdenv.lib.optionals z3Support [ z3 ] - ++ stdenv.lib.optionals cvc4Support [ cvc4 cln gmp ]; + ++ lib.optionals z3Support [ z3 ] + ++ lib.optionals cvc4Support [ cvc4 cln gmp ]; checkInputs = [ ncurses python3 ]; # Test fails on darwin for unclear reason - doCheck = stdenv.hostPlatform.isLinux; + doCheck = gccStdenv.hostPlatform.isLinux; checkPhase = '' while IFS= read -r -d ''' dir @@ -68,7 +67,7 @@ stdenv.mkDerivation rec { popd ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Compiler for Ethereum smart contract language Solidity"; homepage = "https://github.com/ethereum/solidity"; license = licenses.gpl3; diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix index ba13cd7b4b2..e57062642ba 100644 --- a/pkgs/development/compilers/souffle/default.nix +++ b/pkgs/development/compilers/souffle/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , perl, ncurses, zlib, sqlite, libffi , autoreconfHook, mcpp, bison, flex, doxygen, graphviz , makeWrapper @@ -6,7 +6,7 @@ let - toolsPath = stdenv.lib.makeBinPath [ mcpp ]; + toolsPath = lib.makeBinPath [ mcpp ]; in stdenv.mkDerivation rec { pname = "souffle"; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { outputs = [ "out" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A translator of declarative Datalog programs into the C++ language"; homepage = "https://souffle-lang.github.io/"; platforms = platforms.unix; diff --git a/pkgs/development/compilers/spasm-ng/default.nix b/pkgs/development/compilers/spasm-ng/default.nix index 8eb0ddb59ef..bd31719731e 100644 --- a/pkgs/development/compilers/spasm-ng/default.nix +++ b/pkgs/development/compilers/spasm-ng/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gcc, gmp, openssl, zlib }: +{ lib, stdenv, fetchFromGitHub, gcc, gmp, openssl, zlib }: stdenv.mkDerivation rec { pname = "spasm-ng"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { install -Dm755 spasm -t $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/alberthdev/spasm-ng"; description = "Z80 assembler with extra features to support development for TI calculators"; license = licenses.gpl2Plus; diff --git a/pkgs/development/compilers/spirv-llvm-translator/default.nix b/pkgs/development/compilers/spirv-llvm-translator/default.nix index 73af5f0c985..324e0b07ad8 100644 --- a/pkgs/development/compilers/spirv-llvm-translator/default.nix +++ b/pkgs/development/compilers/spirv-llvm-translator/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { # FIXME: CMake tries to run "/llvm-lit" which of course doesn't exist doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/KhronosGroup/SPIRV-LLVM-Translator"; description = "A tool and a library for bi-directional translation between SPIR-V and LLVM IR"; license = licenses.ncsa; diff --git a/pkgs/development/compilers/squeak/default.nix b/pkgs/development/compilers/squeak/default.nix index e94ebab50e6..7d531181d1d 100644 --- a/pkgs/development/compilers/squeak/default.nix +++ b/pkgs/development/compilers/squeak/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, cmake, coreutils, dbus, freetype, glib, gnused -, libpthreadstubs, pango, pkgconfig, libpulseaudio, which }: +{ lib, stdenv, fetchurl, cmake, coreutils, dbus, freetype, glib, gnused +, libpthreadstubs, pango, pkg-config, libpulseaudio, which }: stdenv.mkDerivation rec { pname = "squeak"; @@ -12,12 +12,12 @@ stdenv.mkDerivation rec { buildInputs = [ coreutils dbus freetype glib gnused libpthreadstubs pango libpulseaudio which ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; postPatch = '' for i in squeak.in squeak.sh.in; do substituteInPlace unix/cmake/$i --replace "PATH=" \ - "PATH=${stdenv.lib.makeBinPath [ coreutils gnused which ]} #" + "PATH=${lib.makeBinPath [ coreutils gnused which ]} #" done ''; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Smalltalk programming language and environment"; longDescription = '' Squeak is a full-featured implementation of the Smalltalk programming diff --git a/pkgs/development/compilers/stalin/default.nix b/pkgs/development/compilers/stalin/default.nix index e37b207b4f2..f47086b1ca2 100644 --- a/pkgs/development/compilers/stalin/default.nix +++ b/pkgs/development/compilers/stalin/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, ncompress, libX11 }: +{ fetchurl, lib, stdenv, ncompress, libX11 }: stdenv.mkDerivation rec { name = "stalin-0.11"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncompress libX11 ]; - buildPhase = '' ./build ''; + buildPhase = "./build "; installPhase = '' mkdir -p "$out/bin" @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.ece.purdue.edu/~qobi/software.html"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; description = "An optimizing Scheme compiler"; maintainers = [ ]; diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix index dadf374d5b6..ce666852e38 100644 --- a/pkgs/development/compilers/swi-prolog/default.nix +++ b/pkgs/development/compilers/swi-prolog/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, jdk, gmp, readline, openssl, unixODBC, zlib +{ lib, stdenv, fetchFromGitHub, jdk, gmp, readline, openssl, unixODBC, zlib , libarchive, db, pcre, libedit, libossp_uuid, libXpm -, libSM, libXt, freetype, pkgconfig, fontconfig +, libSM, libXt, freetype, pkg-config, fontconfig , cmake, libyaml, Security , libjpeg, libX11, libXext, libXft, libXinerama , extraLibraries ? [ jdk unixODBC libXpm libSM libXt freetype fontconfig ] @@ -26,14 +26,14 @@ stdenv.mkDerivation { fetchSubmodules = true; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ gmp readline openssl libarchive libyaml db pcre libedit libossp_uuid zlib ] - ++ stdenv.lib.optionals (withGui && !stdenv.isDarwin) [ libXpm libX11 libXext libXft libXinerama libjpeg ] + ++ lib.optionals (withGui && !stdenv.isDarwin) [ libXpm libX11 libXext libXft libXinerama libjpeg ] ++ extraLibraries - ++ stdenv.lib.optional stdenv.isDarwin Security; + ++ lib.optional stdenv.isDarwin Security; hardeningDisable = [ "format" ]; @@ -46,9 +46,9 @@ stdenv.mkDerivation { meta = { homepage = "https://www.swi-prolog.org"; description = "A Prolog compiler and interpreter"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.optionals (!withGui) stdenv.lib.platforms.darwin; - maintainers = [ stdenv.lib.maintainers.meditans ]; + platforms = lib.platforms.linux ++ lib.optionals (!withGui) lib.platforms.darwin; + maintainers = [ lib.maintainers.meditans ]; }; } diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index 2cabacadd75..53011560267 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , cmake , coreutils , glibc @@ -7,7 +7,7 @@ , perl , libedit , ninja -, pkgconfig +, pkg-config , sqlite , swig , bash @@ -121,7 +121,7 @@ let cmakeFlags = [ "-DGLIBC_INCLUDE_PATH=${stdenv.cc.libc.dev}/include" - "-DC_INCLUDE_DIRS=${stdenv.lib.makeSearchPathOutput "dev" "include" devInputs}:${libxml2.dev}/include/libxml2" + "-DC_INCLUDE_DIRS=${lib.makeSearchPathOutput "dev" "include" devInputs}:${libxml2.dev}/include/libxml2" "-DGCC_INSTALL_PREFIX=${gccForLibs}" ]; @@ -141,7 +141,7 @@ stdenv.mkDerivation { makeWrapper ninja perl - pkgconfig + pkg-config python rsync which @@ -155,7 +155,7 @@ stdenv.mkDerivation { libgit2 python ]; - propagatedUserEnvPkgs = [ git pkgconfig ]; + propagatedUserEnvPkgs = [ git pkg-config ]; hardeningDisable = [ "format" ]; # for LLDB @@ -282,7 +282,7 @@ stdenv.mkDerivation { installable_package=$INSTALLABLE_PACKAGE \ install_prefix=$out \ install_destdir=$SWIFT_INSTALL_DIR \ - extra_cmake_options="${stdenv.lib.concatStringsSep "," cmakeFlags}" + extra_cmake_options="${lib.concatStringsSep "," cmakeFlags}" ''; doCheck = true; @@ -321,9 +321,9 @@ stdenv.mkDerivation { ''; # Hack to avoid build and install directories in RPATHs. - preFixup = ''rm -rf $SWIFT_BUILD_ROOT $SWIFT_INSTALL_DIR''; + preFixup = "rm -rf $SWIFT_BUILD_ROOT $SWIFT_INSTALL_DIR"; - meta = with stdenv.lib; { + meta = with lib; { description = "The Swift Programming Language"; homepage = "https://github.com/apple/swift"; maintainers = with maintainers; [ dtzWill ]; @@ -331,6 +331,9 @@ stdenv.mkDerivation { # Swift doesn't support 32bit Linux, unknown on other platforms. platforms = platforms.linux; badPlatforms = platforms.i686; - broken = stdenv.isAarch64; # 2018-09-04, never built on Hydra + broken = true; # 2021-01-29 + knownVulnerabilities = [ + "CVE-2020-9861" + ]; }; } diff --git a/pkgs/development/compilers/symbiflow-vtr/default.nix b/pkgs/development/compilers/symbiflow-vtr/default.nix deleted file mode 100644 index 8735b12678c..00000000000 --- a/pkgs/development/compilers/symbiflow-vtr/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv -, fetchFromGitHub -, bison -, cmake -, flex -, pkg-config -}: - -stdenv.mkDerivation rec { - pname = "symbiflow-vtr"; - version = "8.0.0.rc2-4003-g8980e4621"; - - src = fetchFromGitHub { - owner = "SymbiFlow"; - repo = "vtr-verilog-to-routing"; - rev = "8980e46218542888fac879961b13aa7b0fba8432"; - sha256 = "1sq7f1f3dzfm48a9vq5nvp0zllby0nasm3pvqab70f4jaq0m1aaa"; - }; - - nativeBuildInputs = [ - bison - cmake - flex - pkg-config - ]; - - cmakeFlags = [ - "-DWITH_ODIN=OFF" - "-DWITH_ABC=OFF" - ]; - - doCheck = true; - - meta = with stdenv.lib; { - description = "SymbiFlow WIP changes for Verilog to Routing (VTR)"; - homepage = "https://github.com/SymbiFlow/vtr-verilog-to-routing"; - platforms = platforms.all; - maintainers = with maintainers; [ mcaju ]; - }; -} diff --git a/pkgs/development/compilers/symbiflow-yosys-plugins/default.nix b/pkgs/development/compilers/symbiflow-yosys-plugins/default.nix deleted file mode 100644 index b655f9d4873..00000000000 --- a/pkgs/development/compilers/symbiflow-yosys-plugins/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv -, fetchFromGitHub -, symbiflow-yosys -, zlib -, readline -}: - -stdenv.mkDerivation rec { - pname = "symbiflow-yosys-plugins"; - version = "1.0.0.7-0060-g7454cd6b"; - - src = fetchFromGitHub { - owner = "SymbiFlow"; - repo = "yosys-symbiflow-plugins"; - rev = "7454cd6b5e4fd22854e2ada219a5e3c3a06e0717"; - sha256 = "0r9r31p7fy4ylfrwvwlbivq5a03xrph34blxbxzx2c8bc02mbv0s"; - }; - - enableParallelBuilding = true; - - nativeBuildInputs = [ symbiflow-yosys ]; - - buildInputs = [ - readline - zlib - ]; - - makeFlags = [ "PLUGINS_DIR=${placeholder "out"}/share/yosys/plugins" ]; - - meta = with stdenv.lib; { - description = "Yosys SymbiFlow Plugins"; - homepage = "https://github.com/SymbiFlow/yosys-symbiflow-plugins"; - license = licenses.isc; - platforms = platforms.all; - maintainers = with maintainers; [ mcaju ]; - }; -} diff --git a/pkgs/development/compilers/symbiflow-yosys/default.nix b/pkgs/development/compilers/symbiflow-yosys/default.nix deleted file mode 100644 index b33003f312e..00000000000 --- a/pkgs/development/compilers/symbiflow-yosys/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv -, abc-verifier -, fetchFromGitHub -, yosys -, plugins ? [] -}: - -let - localAbc-verifier = abc-verifier.overrideAttrs (_: rec { - pname = "abc-verifier"; - version = "2020.06.22"; - - src = fetchFromGitHub { - owner = "YosysHQ"; - repo = "abc"; - rev = "341db25668f3054c87aa3372c794e180f629af5d"; - sha256 = "14cgv34vz5ljkcms6nrv19vqws2hs8bgjgffk5q03cbxnm2jxv5s"; - }; - - passthru.rev = src.rev; - }); -in - -(yosys.overrideAttrs (oldAttrs: rec { - pname = "symbiflow-yosys"; - version = "0.9+2406"; - - src = fetchFromGitHub { - owner = "SymbiFlow"; - repo = "yosys"; - rev = "d8b2d1a2b1a93057678cf49bb8f0329f191faba1"; - sha256 = "1w8jnqzabvzixjllhb6ak2n2gmjvsn6qd996i7z70bsq5rgdkq9g"; - }; -})).override { - abc-verifier = localAbc-verifier; - plugins = plugins; -} diff --git a/pkgs/development/compilers/terra/default.nix b/pkgs/development/compilers/terra/default.nix index e8478828c1b..bd50ea9caaa 100644 --- a/pkgs/development/compilers/terra/default.nix +++ b/pkgs/development/compilers/terra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub +{ lib, stdenv, fetchurl, fetchFromGitHub , llvmPackages, ncurses, lua }: @@ -34,13 +34,13 @@ stdenv.mkDerivation rec { --replace '-lcurses' '-lncurses' substituteInPlace src/terralib.lua \ - --subst-var-by NIX_LIBC_INCLUDE ${stdenv.lib.getDev stdenv.cc.libc}/include + --subst-var-by NIX_LIBC_INCLUDE ${lib.getDev stdenv.cc.libc}/include ''; preBuild = '' cat >Makefile.inc<<EOF - CLANG = ${stdenv.lib.getBin llvmPackages.clang-unwrapped}/bin/clang - LLVM_CONFIG = ${stdenv.lib.getBin llvmPackages.llvm}/bin/llvm-config + CLANG = ${lib.getBin llvmPackages.clang-unwrapped}/bin/clang + LLVM_CONFIG = ${lib.getBin llvmPackages.llvm}/bin/llvm-config EOF mkdir -p build @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { cp -rv release/include/terra $dev/include ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A low-level counterpart to Lua"; homepage = "http://terralang.org/"; platforms = platforms.x86_64; diff --git a/pkgs/development/compilers/teyjus/default.nix b/pkgs/development/compilers/teyjus/default.nix index 6768d0c1cbe..74ba1866b55 100644 --- a/pkgs/development/compilers/teyjus/default.nix +++ b/pkgs/development/compilers/teyjus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, omake, ocaml, flex, bison }: +{ lib, stdenv, fetchurl, omake, ocaml, flex, bison }: let version = "2.1"; @@ -25,10 +25,10 @@ stdenv.mkDerivation { installPhase = "mkdir -p $out/bin && cp tj* $out/bin"; - meta = with stdenv.lib; { + meta = with lib; { description = "An efficient implementation of the Lambda Prolog language"; homepage = "https://github.com/teyjus/teyjus"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; maintainers = [ maintainers.bcdarwin ]; platforms = platforms.linux; }; diff --git a/pkgs/development/compilers/tvm/default.nix b/pkgs/development/compilers/tvm/default.nix index 01c44718f11..2bb8b9d5be3 100644 --- a/pkgs/development/compilers/tvm/default.nix +++ b/pkgs/development/compilers/tvm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "tvm"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { # not mangle the legitimate use of the opt/ folder. dontFixCmake = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://tvm.apache.org/"; description = "An End to End Deep Learning Compiler Stack for CPUs, GPUs and accelerators"; license = licenses.asl20; diff --git a/pkgs/development/compilers/unison/default.nix b/pkgs/development/compilers/unison/default.nix index 7ae16a77a26..433e07c68b0 100644 --- a/pkgs/development/compilers/unison/default.nix +++ b/pkgs/development/compilers/unison/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoPatchelfHook +{ lib, stdenv, fetchurl, autoPatchelfHook , ncurses5, zlib, gmp , makeWrapper , less @@ -25,16 +25,16 @@ stdenv.mkDerivation rec { dontBuild = true; dontConfigure = true; - nativeBuildInputs = [ makeWrapper ] ++ (stdenv.lib.optional (!stdenv.isDarwin) autoPatchelfHook); - buildInputs = stdenv.lib.optionals (!stdenv.isDarwin) [ ncurses5 zlib gmp ]; + nativeBuildInputs = [ makeWrapper ] ++ (lib.optional (!stdenv.isDarwin) autoPatchelfHook); + buildInputs = lib.optionals (!stdenv.isDarwin) [ ncurses5 zlib gmp ]; installPhase = '' mkdir -p $out/bin mv ucm $out/bin - wrapProgram $out/bin/ucm --prefix PATH ":" "${stdenv.lib.makeBinPath [ less ]}"; + wrapProgram $out/bin/ucm --prefix PATH ":" "${lib.makeBinPath [ less ]}"; ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Modern, statically-typed purely functional language"; homepage = "https://unisonweb.org/"; license = with licenses; [ mit bsd3 ]; diff --git a/pkgs/development/compilers/urn/default.nix b/pkgs/development/compilers/urn/default.nix index 812792a125e..f7e338cf43f 100644 --- a/pkgs/development/compilers/urn/default.nix +++ b/pkgs/development/compilers/urn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, buildEnv, makeWrapper, lua, luajit, readline +{ lib, stdenv, fetchFromGitLab, buildEnv, makeWrapper, lua, luajit, readline , useLuaJit ? false , extraLibraries ? [] }: @@ -17,7 +17,7 @@ let [ lua ]; }; - inherit (stdenv.lib) optionalString concatMapStringsSep; + inherit (lib) optionalString concatMapStringsSep; in stdenv.mkDerivation { @@ -48,7 +48,7 @@ stdenv.mkDerivation { --prefix LD_LIBRARY_PATH : ${urn-rt}/lib/ ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://urn-lang.com"; description = "Yet another Lisp variant which compiles to Lua"; license = licenses.bsd3; diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix index ac324167f97..e2d9d1f226e 100644 --- a/pkgs/development/compilers/urweb/default.nix +++ b/pkgs/development/compilers/urweb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, file, openssl, mlton +{ lib, stdenv, fetchurl, file, openssl, mlton , libmysqlclient, postgresql, sqlite, gcc, icu }: @@ -39,8 +39,8 @@ stdenv.mkDerivation rec { meta = { description = "Advanced purely-functional web programming language"; homepage = "http://www.impredicative.com/ur/"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - maintainers = [ stdenv.lib.maintainers.thoughtpolice stdenv.lib.maintainers.sheganinans ]; + license = lib.licenses.bsd3; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + maintainers = [ lib.maintainers.thoughtpolice lib.maintainers.sheganinans ]; }; } diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 1964d74cf3a..222ad903ec1 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, flex, bison, libxslt, autoconf, autoreconfHook +{ stdenv, lib, fetchurl, fetchpatch, pkg-config, flex, bison, libxslt, autoconf, autoreconfHook , graphviz, glib, libiconv, libintl, libtool, expat, substituteAll }: @@ -70,7 +70,7 @@ let outputs = [ "out" "devdoc" ]; nativeBuildInputs = [ - pkgconfig flex bison libxslt + pkg-config flex bison libxslt ] ++ lib.optional (stdenv.isDarwin && (lib.versionAtLeast version "0.38")) expat ++ lib.optional disableGraphviz autoreconfHook # if we changed our ./configure script, need to reconfigure ++ extraNativeBuildInputs; @@ -92,7 +92,7 @@ let # }; # }; - meta = with stdenv.lib; { + meta = with lib; { description = "Compiler for GObject type system"; homepage = "https://wiki.gnome.org/Projects/Vala"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/compilers/vlang/default.nix b/pkgs/development/compilers/vlang/default.nix index fba11a06a6e..f53d6d4c382 100644 --- a/pkgs/development/compilers/vlang/default.nix +++ b/pkgs/development/compilers/vlang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, glfw, freetype, openssl, upx ? null }: +{ lib, stdenv, fetchFromGitHub, glfw, freetype, openssl, upx ? null }: assert stdenv.hostPlatform.isUnix -> upx != null; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; propagatedBuildInputs = [ glfw freetype openssl ] - ++ stdenv.lib.optional stdenv.hostPlatform.isUnix upx; + ++ lib.optional stdenv.hostPlatform.isUnix upx; buildPhase = '' runHook preBuild @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://vlang.io/"; description = "Simple, fast, safe, compiled language for developing maintainable software"; license = licenses.mit; diff --git a/pkgs/development/compilers/vyper/default.nix b/pkgs/development/compilers/vyper/default.nix index 3a584ab2018..81ee04edf08 100644 --- a/pkgs/development/compilers/vyper/default.nix +++ b/pkgs/development/compilers/vyper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, writeText, asttokens +{ lib, buildPythonPackage, fetchPypi, writeText, asttokens , pycryptodome, pytest_xdist, pytestcov, recommonmark, semantic-version, sphinx , sphinx_rtd_theme, pytestrunner }: @@ -45,7 +45,7 @@ buildPythonPackage rec { $out/bin/vyper "${sample-contract}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Pythonic Smart Contract Language for the EVM"; homepage = "https://github.com/vyperlang/vyper"; license = licenses.asl20; diff --git a/pkgs/development/compilers/wcc/default.nix b/pkgs/development/compilers/wcc/default.nix index b6030da49d3..644e9ad646a 100644 --- a/pkgs/development/compilers/wcc/default.nix +++ b/pkgs/development/compilers/wcc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, capstone, libbfd, libelf, libiberty, readline }: +{ lib, stdenv, fetchFromGitHub, capstone, libbfd, libelf, libiberty, readline }: stdenv.mkDerivation { pname = "wcc-unstable"; @@ -41,7 +41,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/endrazine/wcc"; description = "Witchcraft compiler collection: tools to convert and script ELF files"; license = licenses.mit; diff --git a/pkgs/development/compilers/wla-dx/default.nix b/pkgs/development/compilers/wla-dx/default.nix index 0cebbfa520f..b80b460d4de 100644 --- a/pkgs/development/compilers/wla-dx/default.nix +++ b/pkgs/development/compilers/wla-dx/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, cmake}: +{lib, stdenv, fetchFromGitHub, cmake}: stdenv.mkDerivation rec { pname = "wla-dx"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.villehelin.com/wla.html"; description = "Yet Another GB-Z80/Z80/6502/65C02/6510/65816/HUC6280/SPC-700 Multi Platform Cross Assembler Package"; license = licenses.gpl2; diff --git a/pkgs/development/compilers/x11basic/default.nix b/pkgs/development/compilers/x11basic/default.nix index 9bf6b3d2874..e48bbc90d61 100644 --- a/pkgs/development/compilers/x11basic/default.nix +++ b/pkgs/development/compilers/x11basic/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , automake, autoconf, readline , libX11, bluez, SDL2 }: @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { cp -r ../examples $out/share/. ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://x11-basic.sourceforge.net/"; description = "A Basic interpreter and compiler with graphics capabilities"; license = licenses.gpl2; diff --git a/pkgs/development/compilers/yap/default.nix b/pkgs/development/compilers/yap/default.nix index 100fb236c83..da10125c243 100644 --- a/pkgs/development/compilers/yap/default.nix +++ b/pkgs/development/compilers/yap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, readline, gmp, zlib }: +{ lib, stdenv, fetchurl, readline, gmp, zlib }: stdenv.mkDerivation rec { version = "6.3.3"; @@ -18,10 +18,10 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.dcc.fc.up.pt/~vsc/Yap/"; description = "A ISO-compatible high-performance Prolog compiler"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; - maintainers = [ stdenv.lib.maintainers.peti ]; - platforms = stdenv.lib.platforms.linux; + maintainers = [ lib.maintainers.peti ]; + platforms = lib.platforms.linux; broken = !stdenv.is64bit; # the linux 32 bit build fails. }; } diff --git a/pkgs/development/compilers/yasm/default.nix b/pkgs/development/compilers/yasm/default.nix index 923a11c1466..48c251d828a 100644 --- a/pkgs/development/compilers/yasm/default.nix +++ b/pkgs/development/compilers/yasm/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { name = "yasm-1.3.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0gv0slmm0qpq91za3v2v9glff3il594x5xsrbgab7xcmnh0ndkix"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.tortall.net/projects/yasm/"; description = "Complete rewrite of the NASM assembler"; license = licenses.bsd2; diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index a83100911d1..7d2191f8f45 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ stdenv, lib , abc-verifier , bash , bison @@ -12,7 +12,6 @@ , tcl , verilog , zlib -, plugins ? [] }: # NOTE: as of late 2020, yosys has switched to an automation robot that @@ -33,8 +32,6 @@ # ultimately less confusing than using dates. stdenv.mkDerivation rec { - inherit plugins; - pname = "yosys"; version = "0.9+3830"; @@ -46,17 +43,21 @@ stdenv.mkDerivation rec { }; enableParallelBuilding = true; - nativeBuildInputs = [ pkg-config protobuf flex bison python3 ]; + nativeBuildInputs = [ pkg-config bison flex ]; buildInputs = [ tcl readline libffi python3 protobuf zlib ]; makeFlags = [ "ENABLE_PROTOBUF=1" "PREFIX=${placeholder "out"}"]; - patchPhase = '' + patches = [ + ./plugin-search-dirs.patch + ]; + + postPatch = '' substituteInPlace ./Makefile \ --replace 'echo UNKNOWN' 'echo ${builtins.substring 0 10 src.rev}' + chmod +x ./misc/yosys-config.in - patchShebangs ./misc/yosys-config.in - patchShebangs tests + patchShebangs tests ./misc/yosys-config.in ''; preBuild = let @@ -75,7 +76,7 @@ stdenv.mkDerivation rec { fi if ! grep -q "YOSYS_VER := $version" Makefile; then - echo "ERROR: yosys version in Makefile isn't equivalent to version of the nix package ($version), failing." + echo "ERROR: yosys version in Makefile isn't equivalent to version of the nix package (${version}), failing." exit 1 fi ''; @@ -92,16 +93,11 @@ stdenv.mkDerivation rec { # add a symlink to fake things so that both variants work the same way. this # is also needed at build time for the test suite. postBuild = "ln -sfv ${abc-verifier}/bin/abc ./yosys-abc"; - postInstall = '' - ln -sfv ${abc-verifier}/bin/abc $out/bin/yosys-abc + postInstall = "ln -sfv ${abc-verifier}/bin/abc $out/bin/yosys-abc"; - mkdir -p $out/share/yosys/plugins - for plugin in $plugins; do - ln -sfv $plugin/share/yosys/plugins/* $out/share/yosys/plugins/ - done - ''; + setupHook = ./setup-hook.sh; - meta = with stdenv.lib; { + meta = with lib; { description = "Open RTL synthesis framework and tools"; homepage = "http://www.clifford.at/yosys/"; license = licenses.isc; diff --git a/pkgs/development/compilers/yosys/plugin-search-dirs.patch b/pkgs/development/compilers/yosys/plugin-search-dirs.patch new file mode 100644 index 00000000000..0cb0aee9c7e --- /dev/null +++ b/pkgs/development/compilers/yosys/plugin-search-dirs.patch @@ -0,0 +1,34 @@ +diff --git a/passes/cmds/plugin.cc b/passes/cmds/plugin.cc +index 3ed19497..f9534bd0 100644 +--- a/passes/cmds/plugin.cc ++++ b/passes/cmds/plugin.cc +@@ -75,8 +75,27 @@ void load_plugin(std::string filename, std::vector<std::string> aliases) + #endif + + void *hdl = dlopen(filename.c_str(), RTLD_LAZY|RTLD_LOCAL); +- if (hdl == NULL && orig_filename.find('/') == std::string::npos) +- hdl = dlopen((proc_share_dirname() + "plugins/" + orig_filename + ".so").c_str(), RTLD_LAZY|RTLD_LOCAL); ++ if (hdl == NULL && orig_filename.find('/') == std::string::npos) { ++ std::string install_dir = proc_share_dirname() + "plugins"; ++ ++ vector<string> all_dirs; ++ all_dirs.push_back(install_dir); ++ ++ char* plugin_dirs = getenv("NIX_YOSYS_PLUGIN_DIRS"); ++ if (plugin_dirs != NULL) { ++ std::string p(plugin_dirs), t; ++ std::stringstream ss(p); ++ ++ while(std::getline(ss, t, ':')) { ++ all_dirs.push_back(t); ++ } ++ } ++ ++ for (auto dir : all_dirs) { ++ hdl = dlopen((dir + "/" + orig_filename + ".so").c_str(), RTLD_LAZY|RTLD_LOCAL); ++ if (hdl != NULL) break; ++ } ++ } + if (hdl == NULL) + log_cmd_error("Can't load module `%s': %s\n", filename.c_str(), dlerror()); + loaded_plugins[orig_filename] = hdl; diff --git a/pkgs/development/compilers/yosys/plugins/bluespec.nix b/pkgs/development/compilers/yosys/plugins/bluespec.nix new file mode 100644 index 00000000000..58fef968e46 --- /dev/null +++ b/pkgs/development/compilers/yosys/plugins/bluespec.nix @@ -0,0 +1,32 @@ +{ stdenv, lib, fetchFromGitHub, pkg-config +, yosys, readline, zlib, bluespec +}: + +stdenv.mkDerivation { + pname = "yosys-bluespec"; + version = "2021.01.17"; + + src = fetchFromGitHub { + owner = "thoughtpolice"; + repo = "yosys-bluespec"; + rev = "3cfa22c2810b840f406610efe3d7657477c1b0ed"; + sha256 = "1r48128yisw5lpziaj3hq88acghwi94pvm4735xajx8dl79jkcng"; + }; + + buildInputs = [ yosys readline zlib bluespec ]; + nativeBuildInputs = [ pkg-config ]; + + doCheck = true; + makeFlags = [ + "PREFIX=$(out)/share/yosys/plugins" + "STATIC_BSC_PATH=${bluespec}/bin/bsc" + "STATIC_BSC_LIBDIR=${bluespec}/lib" + ]; + + meta = with lib; { + description = "Bluespec plugin for Yosys"; + license = licenses.isc; + platforms = platforms.all; + maintainers = with maintainers; [ thoughtpolice ]; + }; +} diff --git a/pkgs/development/compilers/yosys/plugins/ghdl.nix b/pkgs/development/compilers/yosys/plugins/ghdl.nix new file mode 100644 index 00000000000..ccf8efc7c80 --- /dev/null +++ b/pkgs/development/compilers/yosys/plugins/ghdl.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, fetchFromGitHub, pkg-config +, yosys, readline, zlib, ghdl +}: + +stdenv.mkDerivation { + pname = "yosys-ghdl"; + version = "2021.01.01"; + + src = fetchFromGitHub { + owner = "ghdl"; + repo = "ghdl-yosys-plugin"; + rev = "8b3e740fef9a653a20a838f1ade475960e1d379b"; + sha256 = "13kpcp37r11xgqd8aksddi40a5vpzqi7p8qgyjbs99lyscyli75x"; + }; + + buildInputs = [ yosys readline zlib ghdl ]; + nativeBuildInputs = [ pkg-config ]; + + doCheck = true; + installPhase = '' + mkdir -p $out/share/yosys/plugins + cp ghdl.so $out/share/yosys/plugins/ghdl.so + ''; + + meta = with lib; { + description = "GHDL plugin for Yosys"; + license = licenses.isc; + platforms = platforms.all; + maintainers = with maintainers; [ thoughtpolice ]; + }; +} diff --git a/pkgs/development/compilers/yosys/setup-hook.sh b/pkgs/development/compilers/yosys/setup-hook.sh new file mode 100644 index 00000000000..d01bbdd1a8c --- /dev/null +++ b/pkgs/development/compilers/yosys/setup-hook.sh @@ -0,0 +1,5 @@ +addYosysPluginPath() { + addToSearchPath NIX_YOSYS_PLUGIN_DIRS "$1/share/yosys/plugins" +} + +addEnvHooks "$targetOffset" addYosysPluginPath diff --git a/pkgs/development/compilers/z88dk/default.nix b/pkgs/development/compilers/z88dk/default.nix index 0fb73d42b7e..026a205cd26 100644 --- a/pkgs/development/compilers/z88dk/default.nix +++ b/pkgs/development/compilers/z88dk/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, makeWrapper, unzip, libxml2, m4, uthash, which }: +{ fetchFromGitHub, lib, stdenv, makeWrapper, unzip, libxml2, m4, uthash, which }: stdenv.mkDerivation rec { pname = "z88dk"; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { installTargets = [ "libs" "install" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.z88dk.org"; description = "z80 Development Kit"; license = licenses.clArtistic; diff --git a/pkgs/development/compilers/zasm/default.nix b/pkgs/development/compilers/zasm/default.nix index 174092496ba..97c7aa3c2ac 100644 --- a/pkgs/development/compilers/zasm/default.nix +++ b/pkgs/development/compilers/zasm/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, zlib, stdenv }: +{ fetchFromGitHub, zlib, lib, stdenv }: let libs-src = fetchFromGitHub { owner = "megatokio"; @@ -33,7 +33,7 @@ stdenv.mkDerivation { mv zasm $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Z80 / 8080 assembler (for unix-style OS)"; homepage = "https://k1.spdns.de/Develop/Projects/zasm/Distributions/"; license = licenses.bsd2; diff --git a/pkgs/development/compilers/zig/default.nix b/pkgs/development/compilers/zig/default.nix index 1a5cba37d47..bd96010e8bf 100644 --- a/pkgs/development/compilers/zig/default.nix +++ b/pkgs/development/compilers/zig/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, llvmPackages, libxml2, zlib, substituteAll }: +{ lib, stdenv, fetchFromGitHub, cmake, llvmPackages, libxml2, zlib, substituteAll }: llvmPackages.stdenv.mkDerivation rec { version = "0.7.1"; @@ -32,7 +32,7 @@ llvmPackages.stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "General-purpose programming language and toolchain for maintaining robust, optimal, and reusable software"; homepage = "https://ziglang.org/"; diff --git a/pkgs/development/compilers/zulu/8.nix b/pkgs/development/compilers/zulu/8.nix index bea32475f9a..e81cc412428 100644 --- a/pkgs/development/compilers/zulu/8.nix +++ b/pkgs/development/compilers/zulu/8.nix @@ -62,13 +62,13 @@ in stdenv.mkDerivation { EOF ''; - rpath = stdenv.lib.strings.makeLibraryPath libraries; + rpath = lib.strings.makeLibraryPath libraries; passthru = { home = zulu; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.azul.com/products/zulu/"; license = licenses.gpl2; description = "Certified builds of OpenJDK"; diff --git a/pkgs/development/compilers/zulu/default.nix b/pkgs/development/compilers/zulu/default.nix index 73e7bd7d338..63b95465c27 100644 --- a/pkgs/development/compilers/zulu/default.nix +++ b/pkgs/development/compilers/zulu/default.nix @@ -59,13 +59,13 @@ in stdenv.mkDerivation { EOF ''; - rpath = stdenv.lib.strings.makeLibraryPath libraries; + rpath = lib.strings.makeLibraryPath libraries; passthru = { home = zulu; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.azul.com/products/zulu/"; license = licenses.gpl2; description = "Certified builds of OpenJDK"; diff --git a/pkgs/development/compilers/zz/default.nix b/pkgs/development/compilers/zz/default.nix index 273873c8801..dade163c527 100644 --- a/pkgs/development/compilers/zz/default.nix +++ b/pkgs/development/compilers/zz/default.nix @@ -2,26 +2,37 @@ rustPlatform.buildRustPackage rec { pname = "zz"; - version = "0.1"; + version = "unstable-2021-01-26"; + # commit chosen by using the latest build from http://bin.zetz.it/ src = fetchFromGitHub { - owner = "aep"; + owner = "zetzit"; repo = "zz"; - rev = version; - sha256 = "0kqrfm2r9wn0p2c3lcprsy03p9qhrwjs990va8qi59jp704l84ad"; + rev = "0b5c52674e9adf795fbfb051d4dceef3126e669f"; + sha256 = "0bb77ll1g5i6a04ybpgx6lqsb74xs4v4nyqm9j4j6x24407h8l89"; }; nativeBuildInputs = [ makeWrapper ]; - cargoSha256 = "0yllcqxyyhwr9h0z8q84l0ms8x6jrqhpg79ik4xng6h5yf4ab0pq"; + cargoSha256 = "1lf4k3n89w2797c1yrj1dp97y8a8d5hnixr1nwa2qcq1sxmm5rcg"; + + postPatch = '' + # remove search path entry which would reference /build + sed -i '/env!("CARGO_MANIFEST_DIR")/d' src/lib.rs + ''; postInstall = '' - wrapProgram $out/bin/zz --prefix PATH ":" "${lib.getBin z3}/bin" + mkdir -p "$out/share/zz" + cp -r modules "$out/share/zz/" + + wrapProgram $out/bin/zz \ + --prefix PATH ":" "${lib.getBin z3}/bin" \ + --suffix ZZ_MODULE_PATHS ":" "$out/share/zz/modules" ''; meta = with lib; { description = "🍺🐙 ZetZ a zymbolic verifier and tranzpiler to bare metal C"; - homepage = "https://github.com/aep/zz"; + homepage = "https://github.com/zetzit/zz"; license = licenses.mit; maintainers = [ maintainers.marsam ]; }; diff --git a/pkgs/development/coq-modules/corn/default.nix b/pkgs/development/coq-modules/corn/default.nix index 9f2316f3177..6910f487c64 100644 --- a/pkgs/development/coq-modules/corn/default.nix +++ b/pkgs/development/coq-modules/corn/default.nix @@ -3,8 +3,14 @@ with lib; mkCoqDerivation rec { pname = "corn"; inherit version; - defaultVersion = if versions.range "8.6" "8.9" coq.coq-version then "8.8.1" else null; - release."8.8.1".sha256 = "0gh32j0f18vv5lmf6nb87nr5450w6ai06rhrnvlx2wwi79gv10wp"; + defaultVersion = switch coq.coq-version [ + { case = "8.6"; out = "8.8.1"; } + { case = (versions.range "8.7" "8.12"); out = "8.12.0"; } + ] null; + release = { + "8.8.1".sha256 = "0gh32j0f18vv5lmf6nb87nr5450w6ai06rhrnvlx2wwi79gv10wp"; + "8.12.0".sha256 = "0b92vhyzn1j6cs84z2182fn82hxxj0bqq7hk6cs4awwb3vc7dkhi"; + }; preConfigure = "patchShebangs ./configure.sh"; configureScript = "./configure.sh"; diff --git a/pkgs/development/coq-modules/math-classes/default.nix b/pkgs/development/coq-modules/math-classes/default.nix index c6b0dab0e0a..c5bd1098c0b 100644 --- a/pkgs/development/coq-modules/math-classes/default.nix +++ b/pkgs/development/coq-modules/math-classes/default.nix @@ -4,8 +4,8 @@ with lib; mkCoqDerivation { pname = "math-classes"; inherit version; - defaultVersion = if versions.range "8.6" "8.11" coq.coq-version then "8.11.0" else null; - release."8.11.0".sha256 = "1hjgncvm1m46lw6264w4dqsy8dbh74vhmzq52x0fba2yqlvy94sf"; + defaultVersion = if versions.range "8.6" "8.12" coq.coq-version then "8.12.0" else null; + release."8.12.0".sha256 = "14nd6a08zncrl5yg2gzk0xf4iinwq4hxnsgm4fyv07ydbkxfb425"; extraBuildInputs = [ bignums ]; diff --git a/pkgs/development/coq-modules/mathcomp-abel/default.nix b/pkgs/development/coq-modules/mathcomp-abel/default.nix new file mode 100644 index 00000000000..2a8c006b27c --- /dev/null +++ b/pkgs/development/coq-modules/mathcomp-abel/default.nix @@ -0,0 +1,23 @@ +{ coq, mkCoqDerivation, mathcomp, mathcomp-real-closed, lib, version ? null }: + +mkCoqDerivation { + + namePrefix = [ "coq" "mathcomp" ]; + pname = "abel"; + owner = "math-comp"; + + release."1.0.0".sha256 = "190jd8hb8anqsvr9ysr514pm5sh8qhw4030ddykvwxx9d9q6rbp3"; + + inherit version; + defaultVersion = with lib; with versions; switch [ coq.version mathcomp.version ] [ + { cases = [ (range "8.10" "8.13") (range "1.11.0" "1.12.0") ]; out = "1.0.0"; } + ] null; + + propagatedBuildInputs = [ mathcomp.field mathcomp-real-closed ]; + + meta = with lib; { + description = "Abel - Galois and Abel - Ruffini Theorems"; + license = licenses.cecill-b; + maintainers = [ maintainers.cohencyril ]; + }; +} diff --git a/pkgs/development/coq-modules/mathcomp-analysis/default.nix b/pkgs/development/coq-modules/mathcomp-analysis/default.nix index 9304335260a..7d63c903795 100644 --- a/pkgs/development/coq-modules/mathcomp-analysis/default.nix +++ b/pkgs/development/coq-modules/mathcomp-analysis/default.nix @@ -22,6 +22,7 @@ with lib; mkCoqDerivation { meta = { description = "Analysis library compatible with Mathematical Components"; + maintainers = [ maintainers.cohencyril ]; license = licenses.cecill-c; }; } diff --git a/pkgs/development/go-packages/generic/default.nix b/pkgs/development/go-packages/generic/default.nix index 3f85b6e0268..0a1b3a9a294 100644 --- a/pkgs/development/go-packages/generic/default.nix +++ b/pkgs/development/go-packages/generic/default.nix @@ -83,7 +83,7 @@ let GO111MODULE = "off"; GOFLAGS = lib.optionals (!allowGoReference) [ "-trimpath" ]; - GOARM = toString (stdenv.lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]); + GOARM = toString (lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]); configurePhase = args.configurePhase or '' runHook preConfigure diff --git a/pkgs/development/guile-modules/guile-cairo/default.nix b/pkgs/development/guile-modules/guile-cairo/default.nix index 31867d16b4c..15e3ccbb972 100644 --- a/pkgs/development/guile-modules/guile-cairo/default.nix +++ b/pkgs/development/guile-modules/guile-cairo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, guile, guile-lib, cairo, expat }: +{ lib, stdenv, fetchurl, pkg-config, guile, guile-lib, cairo, expat }: stdenv.mkDerivation rec { pname = "guile-cairo"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0yx0844p61ljd4d3d63qrawiygiw6ks02fwv2cqx7nav5kfd8ck2"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ guile cairo expat ]; enableParallelBuilding = true; diff --git a/pkgs/development/guile-modules/guile-fibers/default.nix b/pkgs/development/guile-modules/guile-fibers/default.nix index db16c91c4ef..3521853187c 100644 --- a/pkgs/development/guile-modules/guile-fibers/default.nix +++ b/pkgs/development/guile-modules/guile-fibers/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, guile, texinfo }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, guile, texinfo }: let version = "1.0.0"; @@ -13,7 +13,7 @@ in stdenv.mkDerivation { sha256 = "1r47m1m112kxf23xny99f0qkqsk6626iyc5jp7vzndfiyp5yskwi"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ guile texinfo ]; autoreconfPhase = "./autogen.sh"; diff --git a/pkgs/development/guile-modules/guile-gnome/default.nix b/pkgs/development/guile-modules/guile-gnome/default.nix index a02da829c7f..2dc07deac5c 100644 --- a/pkgs/development/guile-modules/guile-gnome/default.nix +++ b/pkgs/development/guile-modules/guile-gnome/default.nix @@ -1,5 +1,5 @@ { fetchurl, lib, stdenv, guile, guile-lib, gwrap -, pkgconfig, gconf, glib, gnome_vfs, gtk2 +, pkg-config, gconf, glib, gnome_vfs, gtk2 , libglade, libgnome, libgnomecanvas, libgnomeui , pango, guile-cairo, texinfo }: @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { }; buildInputs = [ - texinfo guile gwrap pkgconfig gconf glib gnome_vfs gtk2 + texinfo guile gwrap pkg-config gconf glib gnome_vfs gtk2 libglade libgnome libgnomecanvas libgnomeui pango guile-cairo - ] ++ stdenv.lib.optional doCheck guile-lib; + ] ++ lib.optional doCheck guile-lib; # The test suite tries to open an X display, which fails. doCheck = false; diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/development/guile-modules/guile-lib/default.nix index 6b860bd28da..34299b345ee 100644 --- a/pkgs/development/guile-modules/guile-lib/default.nix +++ b/pkgs/development/guile-modules/guile-lib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, guile, texinfo, pkgconfig }: +{ lib, stdenv, fetchurl, guile, texinfo, pkg-config }: assert stdenv ? cc && stdenv.cc.isGNU; @@ -13,7 +13,7 @@ in stdenv.mkDerivation { sha256 = "0aizxdif5dpch9cvs8zz5g8ds5s4xhfnwza2il5ji7fv2h7ks7bd"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ guile texinfo ]; doCheck = true; diff --git a/pkgs/development/guile-modules/guile-ncurses/default.nix b/pkgs/development/guile-modules/guile-ncurses/default.nix index eb10c0f1e59..8f879249a23 100644 --- a/pkgs/development/guile-modules/guile-ncurses/default.nix +++ b/pkgs/development/guile-modules/guile-ncurses/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, guile, ncurses, libffi }: +{ lib, stdenv, fetchurl, pkg-config, guile, ncurses, libffi }: let name = "guile-ncurses-${version}"; @@ -11,7 +11,7 @@ in stdenv.mkDerivation { sha256 = "153vv75gb7l62sp3666rc97i63rnaqbx2rjar7d9b5w81fhwv4r5"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ guile ncurses libffi ]; preConfigure = '' diff --git a/pkgs/development/guile-modules/guile-opengl/default.nix b/pkgs/development/guile-modules/guile-opengl/default.nix index f0580477653..effa651b99c 100644 --- a/pkgs/development/guile-modules/guile-opengl/default.nix +++ b/pkgs/development/guile-modules/guile-opengl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, guile }: +{ lib, stdenv, fetchurl, pkg-config, guile }: let name = "guile-opengl-${version}"; @@ -11,7 +11,7 @@ in stdenv.mkDerivation { sha256 = "13qfx4xh8baryxqrv986l848ygd0piqwm6s2s90pxk9c0m9vklim"; }; - nativeBuildInputs = [ pkgconfig guile ]; + nativeBuildInputs = [ pkg-config guile ]; meta = with lib; { description = "Guile bindings for the OpenGL graphics API"; diff --git a/pkgs/development/guile-modules/guile-reader/default.nix b/pkgs/development/guile-modules/guile-reader/default.nix index 47ef15ef4e2..eaf402a8605 100644 --- a/pkgs/development/guile-modules/guile-reader/default.nix +++ b/pkgs/development/guile-modules/guile-reader/default.nix @@ -1,7 +1,6 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkgconfig +{ lib, stdenv, fetchurl, fetchpatch, pkg-config , gperf, guile, guile-lib, libffi }: -with stdenv.lib; stdenv.mkDerivation rec { pname = "guile-reader"; @@ -12,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-OMK0ROrbuMDKt42QpE7D6/9CvUEMW4SpEBjO5+tk0rs="; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gperf guile guile-lib libffi ]; GUILE_SITE="${guile-lib}/share/guile/site"; diff --git a/pkgs/development/guile-modules/guile-sdl/default.nix b/pkgs/development/guile-modules/guile-sdl/default.nix index a676f65215d..8816e7b4ffc 100644 --- a/pkgs/development/guile-modules/guile-sdl/default.nix +++ b/pkgs/development/guile-modules/guile-sdl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, guile, buildEnv +{ lib, stdenv, fetchurl, pkg-config, guile, buildEnv , SDL, SDL_image, SDL_ttf, SDL_mixer }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0cjgs012a9922hn6xqwj66w6qmfs3nycnm56hyykx5n3g5p7ag01"; }; - nativeBuildInputs = [ pkgconfig guile ]; + nativeBuildInputs = [ pkg-config guile ]; buildInputs = [ SDL.dev SDL_image SDL_ttf SDL_mixer ]; diff --git a/pkgs/development/guile-modules/guile-sdl2/default.nix b/pkgs/development/guile-modules/guile-sdl2/default.nix index fe1567272ce..c3f5fdaefbd 100644 --- a/pkgs/development/guile-modules/guile-sdl2/default.nix +++ b/pkgs/development/guile-modules/guile-sdl2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, guile, libtool, pkgconfig +{ lib, stdenv, fetchurl, guile, libtool, pkg-config , SDL2, SDL2_image, SDL2_ttf, SDL2_mixer }: @@ -14,7 +14,7 @@ in stdenv.mkDerivation { sha256 = "118x0cg7fzbsyrfhy5f9ab7dqp9czgia0ycgzp6sn3nlsdrcnr4m"; }; - nativeBuildInputs = [ libtool pkgconfig ]; + nativeBuildInputs = [ libtool pkg-config ]; buildInputs = [ guile SDL2 SDL2_image SDL2_ttf SDL2_mixer ]; diff --git a/pkgs/development/guile-modules/guile-xcb/default.nix b/pkgs/development/guile-modules/guile-xcb/default.nix index d0cc719b625..2de44524425 100644 --- a/pkgs/development/guile-modules/guile-xcb/default.nix +++ b/pkgs/development/guile-modules/guile-xcb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, guile, texinfo }: +{ lib, stdenv, fetchurl, pkg-config, guile, texinfo }: let name = "guile-xcb-${version}"; @@ -11,7 +11,7 @@ in stdenv.mkDerivation { sha256 = "04dvbqdrrs67490gn4gkq9zk8mqy3mkls2818ha4p0ckhh0pm149"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ guile texinfo ]; preConfigure = '' diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 8fc6aee0aa1..1144ee0f823 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -64,7 +64,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "0w71kbz127fcli24sxsvd48l5xamwamjwhr18x9alam5cldqkkz1"; + sha256 = "1m9jfr5b0qwajwwmvcq02263bmnqgcqvpdr06sdwlfz3sxsjfp8r"; }; }).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; @@ -223,7 +223,7 @@ self: super: { # https://github.com/haskell-nix/hnix-store/issues/104 # Until unpin, which may hold off in time due to Stackage maintenence bottleneck # the 0_4_0_0 is used - hnix-store-core = self.hnix-store-core_0_4_0_0; # at least 1.7 + hnix-store-core = self.hnix-store-core_0_4_1_0; # at least 1.7 }); @@ -232,9 +232,11 @@ self: super: { # Until unpin, which may hold off in time due to Stackage maintenence bottleneck # the 0_4_0_0 is used hnix-store-remote = (super.hnix-store-remote.override { - hnix-store-core = self.hnix-store-core_0_4_0_0; # at least 1.7 + hnix-store-core = self.hnix-store-core_0_4_1_0; # at least 1.7 }); + # https://github.com/haskell-nix/hnix-store/issues/127 + hnix-store-core_0_4_1_0 = addTestToolDepend super.hnix-store-core_0_4_1_0 self.tasty-discover; # Fails for non-obvious reasons while attempting to use doctest. search = dontCheck super.search; @@ -521,6 +523,10 @@ self: super: { then self.buildHaskellPackages.tasty-discover else dontCheck super.tasty-discover); + # Known issue with nondeterministic test suite failure + # https://github.com/nomeata/tasty-expected-failure/issues/21 + tasty-expected-failure = dontCheck super.tasty-expected-failure; + # Waiting on https://github.com/RaphaelJ/friday/pull/36 friday = doJailbreak super.friday; @@ -681,34 +687,6 @@ self: super: { # The standard libraries are compiled separately. idris = generateOptparseApplicativeCompletion "idris" (dontCheck super.idris); - # build servant docs from the repository - servant = - let - ver = super.servant.version; - docs = pkgs.stdenv.mkDerivation { - name = "servant-sphinx-documentation-${ver}"; - src = "${pkgs.fetchFromGitHub { - owner = "haskell-servant"; - repo = "servant"; - rev = "v${ver}"; - sha256 = "0xk3czk3jhqjxhy0g8r2248m8yxgvmqhgn955k92z0h7p02lfs89"; - }}/doc"; - # Needed after sphinx 1.7.9 -> 1.8.3 - postPatch = '' - substituteInPlace conf.py --replace "'.md': CommonMarkParser," "" - ''; - nativeBuildInputs = with pkgs.buildPackages.python3Packages; [ sphinx recommonmark sphinx_rtd_theme ]; - makeFlags = [ "html" ]; - installPhase = '' - mv _build/html $out - ''; - }; - in overrideCabal super.servant (old: { - postInstall = old.postInstall or "" + '' - ln -s ${docs} ''${!outputDoc}/share/doc/servant - ''; - }); - # https://github.com/pontarius/pontarius-xmpp/issues/105 pontarius-xmpp = dontCheck super.pontarius-xmpp; @@ -837,8 +815,9 @@ self: super: { # https://github.com/haskell-hvr/cryptohash-sha512/pull/5#issuecomment-752796913 cryptohash-sha512 = dontCheck (doJailbreak super.cryptohash-sha512); - # Depends on tasty < 1.x, which we don't have. - cryptohash-sha256 = doJailbreak super.cryptohash-sha256; + # https://github.com/haskell-hvr/cryptohash-sha256/issues/11 + # Jailbreak is necessary to break out of tasty < 1.x dependency. + cryptohash-sha256 = markUnbroken (doJailbreak super.cryptohash-sha256); # Needs tasty-quickcheck ==0.8.*, which we don't have. cryptohash-sha1 = doJailbreak super.cryptohash-sha1; @@ -954,6 +933,10 @@ self: super: { # Work around overspecified constraint on github ==0.18. github-backup = doJailbreak super.github-backup; + # https://github.com/andrewthad/chronos/issues/62 + # doctests are failing on newer GHC versions + chronos = dontCheck super.chronos; + # Test suite depends on cabal-install doctest = dontCheck super.doctest; @@ -963,8 +946,12 @@ self: super: { # Generate cli completions for dhall. dhall = generateOptparseApplicativeCompletion "dhall" super.dhall; - dhall-json = generateOptparseApplicativeCompletions ["dhall-to-json" "dhall-to-yaml"] super.dhall-json; + # For reasons that are not quire clear 'dhall-json' won't compile without 'tasty 1.4' due to its tests + # https://github.com/commercialhaskell/stackage/issues/5795 + # This issue can be mitigated with 'dontCheck' which skips the tests and their compilation. + dhall-json = generateOptparseApplicativeCompletions ["dhall-to-json" "dhall-to-yaml"] (dontCheck super.dhall-json); dhall-nix = generateOptparseApplicativeCompletion "dhall-to-nix" super.dhall-nix; + dhall-yaml = generateOptparseApplicativeCompletions ["dhall-to-yaml-ng" "yaml-to-dhall"] super.dhall-yaml; # https://github.com/haskell-hvr/netrc/pull/2#issuecomment-469526558 netrc = doJailbreak super.netrc; @@ -1426,16 +1413,19 @@ self: super: { # https://github.com/haskell/haskell-language-server/issues/610 # https://github.com/haskell/haskell-language-server/issues/611 haskell-language-server = dontCheck (super.haskell-language-server.override { - lsp-test = dontCheck self.lsp-test_0_11_0_7; + lsp-test = dontCheck self.lsp-test; fourmolu = self.fourmolu_0_3_0_0; }); + # 2021-01-20 + # apply-refact 0.9.0.0 get's a build error with hls-hlint-plugin 0.8.0 + # https://github.com/haskell/haskell-language-server/issues/1240 + apply-refact = super.apply-refact_0_8_2_1; fourmolu = dontCheck super.fourmolu; + # 1. test requires internet # 2. dependency shake-bench hasn't been published yet so we also need unmarkBroken and doDistribute - ghcide = doDistribute (unmarkBroken (dontCheck - (super.ghcide.override { lsp-test = dontCheck self.lsp-test_0_11_0_7; }) - )); + ghcide = doDistribute (unmarkBroken (dontCheck (super.ghcide_0_7_0_0.override { lsp-test = dontCheck self.lsp-test; }))); refinery = doDistribute super.refinery_0_3_0_0; data-tree-print = doJailbreak super.data-tree-print; @@ -1458,6 +1448,9 @@ self: super: { # https://github.com/adnelson/semver-range/issues/15 semver-range = dontCheck super.semver-range; + # https://github.com/obsidiansystems/dependent-sum/issues/55 + dependent-sum = doJailbreak super.dependent-sum; + dependent-sum-aeson-orphans = appendPatch super.dependent-sum-aeson-orphans (pkgs.fetchpatch { # 2020-11-18: https://github.com/obsidiansystems/dependent-sum-aeson-orphans/pull/9 # Bump version bounds for ghc 8.10 @@ -1473,7 +1466,7 @@ self: super: { # base upper bound is incompatible with ghc 8.10 neuron = doJailbreak super.neuron; - reflex = appendPatches super.reflex [ + reflex = dontCheck (doJailbreak (appendPatches super.reflex [ # https://github.com/reflex-frp/reflex/pull/444 # Fixes for ghc 8.10 (pkgs.fetchpatch { @@ -1486,7 +1479,7 @@ self: super: { url = https://patch-diff.githubusercontent.com/raw/reflex-frp/reflex/pull/448.patch; sha256 = "0a8gcq9g8dyyafkvs54mi3fnisff20r0x0qzmhxcp9md61nkf7gq"; }) - ]; + ])); # 2020-11-19: jailbreaking because of pretty-simple bound out of date # https://github.com/kowainik/stan/issues/408 @@ -1534,7 +1527,7 @@ self: super: { # 2020-12-05: http-client is fixed on too old version essence-of-live-coding-warp = super.essence-of-live-coding-warp.override { - http-client = self.http-client_0_7_3; + http-client = self.http-client_0_7_4; }; # 2020-12-06: Restrictive upper bounds w.r.t. pandoc-types (https://github.com/owickstrom/pandoc-include-code/issues/27) @@ -1572,4 +1565,14 @@ self: super: { # https://github.com/jaspervdj/profiteur/issues/33 profiteur = doJailbreak super.profiteur; + # Test suite has overly strict bounds on tasty. + # https://github.com/input-output-hk/nothunks/issues/9 + nothunks = doJailbreak super.nothunks; + + # Allow building with recent versions of tasty. + lukko = doJailbreak super.lukko; + + # Allow building with older versions of http-client. + http-client-restricted = doJailbreak super.http-client-restricted; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index ab8f1f7e5f2..fa18d7507db 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -76,7 +76,7 @@ default-package-overrides: # haskell-language-server 0.5.0.0 doesn't accept newer versions - fourmolu ==0.2.* - refinery ==0.2.* - # Stackage Nightly 2021-01-05 + # Stackage Nightly 2021-01-29 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Angle ==1.0 @@ -209,7 +209,7 @@ default-package-overrides: - amazonka-waf ==1.6.1 - amazonka-workspaces ==1.6.1 - amazonka-xray ==1.6.1 - - amqp ==0.20.0 + - amqp ==0.20.0.1 - amqp-utils ==0.4.4.1 - annotated-wl-pprint ==0.7.0 - ansi-terminal ==0.10.3 @@ -224,7 +224,7 @@ default-package-overrides: - app-settings ==0.2.0.12 - appar ==0.1.8 - appendmap ==0.1.5 - - apply-refact ==0.8.2.1 + - apply-refact ==0.9.0.0 - apportionment ==0.0.0.3 - approximate ==0.3.2 - approximate-equality ==1.1.0.2 @@ -233,13 +233,13 @@ default-package-overrides: - arithmoi ==0.11.0.1 - array-memoize ==0.6.0 - arrow-extras ==0.1.0.1 - - ascii ==1.0.0.2 + - ascii ==1.0.1.0 - ascii-case ==1.0.0.2 - - ascii-char ==1.0.0.2 + - ascii-char ==1.0.0.6 - ascii-group ==1.0.0.2 - ascii-predicates ==1.0.0.2 - ascii-progress ==0.3.3.0 - - ascii-superset ==1.0.0.2 + - ascii-superset ==1.0.1.0 - ascii-th ==1.0.0.2 - asciidiagram ==1.3.3.3 - asif ==6.0.4 @@ -291,7 +291,7 @@ default-package-overrides: - base32string ==0.9.1 - base58-bytestring ==0.1.0 - base58string ==0.10.0 - - base64 ==0.4.2.2 + - base64 ==0.4.2.3 - base64-bytestring ==1.1.0.0 - base64-bytestring-type ==1.0.1 - base64-lens ==0.3.0 @@ -307,7 +307,7 @@ default-package-overrides: - benchpress ==0.2.2.15 - between ==0.11.0.0 - bibtex ==0.1.0.6 - - bifunctors ==5.5.9 + - bifunctors ==5.5.10 - bimap ==0.4.0 - bimap-server ==0.1.0.1 - bimaps ==0.1.0.2 @@ -323,7 +323,6 @@ default-package-overrides: - binary-search ==1.0.0.3 - binary-shared ==0.8.3 - binary-tagged ==0.3 - - binaryen ==0.0.5.0 - bindings-DSL ==1.0.25 - bindings-GLFW ==3.3.2.0 - bindings-libzip ==1.0.1 @@ -334,13 +333,14 @@ default-package-overrides: - bits-extra ==0.0.2.0 - bitset-word8 ==0.1.1.2 - bitvec ==1.0.3.0 + - bitwise-enum ==1.0.0.3 - blake2 ==0.3.0 - blanks ==0.5.0 - blas-carray ==0.1.0.1 - blas-comfort-array ==0.0.0.2 - blas-ffi ==0.1 - blaze-bootstrap ==0.1.0.1 - - blaze-builder ==0.4.1.0 + - blaze-builder ==0.4.2.1 - blaze-html ==0.9.1.2 - blaze-markup ==0.8.2.7 - blaze-svg ==0.3.6.1 @@ -362,7 +362,7 @@ default-package-overrides: - boundingboxes ==0.2.3 - bower-json ==1.0.0.1 - boxes ==0.1.5 - - brick ==0.58.1 + - brick ==0.59 - broadcast-chan ==0.2.1.1 - bsb-http-chunked ==0.0.0.4 - bson ==0.4.0.1 @@ -396,6 +396,7 @@ default-package-overrides: - c14n ==0.1.0.1 - c2hs ==0.28.7 - ca-province-codes ==1.0.0.0 + - cabal-debian ==5.1 - cabal-doctest ==1.0.8 - cabal-file ==0.1.1 - cabal-flatpak ==0.1.0.2 @@ -435,7 +436,7 @@ default-package-overrides: - charsetdetect-ae ==1.1.0.4 - Chart ==1.9.3 - chaselev-deque ==0.5.0.5 - - ChasingBottoms ==1.3.1.9 + - ChasingBottoms ==1.3.1.10 - cheapskate ==0.1.1.2 - cheapskate-highlight ==0.1.0.0 - cheapskate-lucid ==0.1.0.0 @@ -519,7 +520,7 @@ default-package-overrides: - conduit-extra ==1.3.5 - conduit-parse ==0.2.1.0 - conduit-zstd ==0.0.2.0 - - conferer ==1.0.0.0 + - conferer ==1.0.0.1 - conferer-aeson ==1.0.0.0 - conferer-hspec ==1.0.0.0 - conferer-warp ==1.0.0.0 @@ -538,6 +539,7 @@ default-package-overrides: - contravariant ==1.5.3 - contravariant-extras ==0.3.5.2 - control-bool ==0.2.1 + - control-dsl ==0.2.1.3 - control-monad-free ==0.6.2 - control-monad-omega ==0.3.2 - convertible ==1.1.1.0 @@ -571,7 +573,7 @@ default-package-overrides: - cryptohash-cryptoapi ==0.1.4 - cryptohash-md5 ==0.11.100.1 - cryptohash-sha1 ==0.11.100.1 - - cryptohash-sha256 ==0.11.101.0 + - cryptohash-sha256 ==0.11.102.0 - cryptonite ==0.27 - cryptonite-conduit ==0.2.2 - cryptonite-openssl ==0.7 @@ -635,6 +637,7 @@ default-package-overrides: - DBFunctor ==0.1.1.1 - dbus ==1.2.17 - dbus-hslogger ==0.1.0.1 + - debian ==4.0.2 - debian-build ==0.10.2.0 - debug-trace-var ==0.2.0 - dec ==0.0.3 @@ -652,11 +655,11 @@ default-package-overrides: - deriving-aeson ==0.2.6 - deriving-compat ==0.5.10 - derulo ==1.0.9 - - dhall ==1.37.1 - - dhall-bash ==1.0.35 - - dhall-json ==1.7.4 - - dhall-lsp-server ==1.0.12 - - dhall-yaml ==1.2.4 + - dhall ==1.38.0 + - dhall-bash ==1.0.36 + - dhall-json ==1.7.5 + - dhall-lsp-server ==1.0.13 + - dhall-yaml ==1.2.5 - di-core ==1.0.4 - di-monad ==1.3.1 - diagrams-solve ==0.1.2 @@ -674,7 +677,7 @@ default-package-overrides: - distributed-closure ==0.4.2.0 - distribution-opensuse ==1.1.1 - distributive ==0.6.2.1 - - dl-fedora ==0.7.5 + - dl-fedora ==0.7.6 - dlist ==0.8.0.8 - dlist-instances ==0.1.1.1 - dlist-nonempty ==0.1.1 @@ -706,6 +709,7 @@ default-package-overrides: - dyre ==0.8.12 - eap ==0.9.0.2 - earcut ==0.1.0.4 + - Earley ==0.13.0.1 - easy-file ==0.2.2 - Ebnf2ps ==1.0.15 - echo ==0.1.3 @@ -751,7 +755,7 @@ default-package-overrides: - epub-metadata ==4.5 - eq ==4.2.1 - equal-files ==0.0.5.3 - - equational-reasoning ==0.6.0.3 + - equational-reasoning ==0.7.0.0 - equivalence ==0.3.5 - erf ==2.0.0.0 - error-or ==0.1.2.0 @@ -874,7 +878,7 @@ default-package-overrides: - funcmp ==1.9 - function-builder ==0.3.0.1 - functor-classes-compat ==1 - - fusion-plugin ==0.2.1 + - fusion-plugin ==0.2.2 - fusion-plugin-types ==0.1.0 - fuzzcheck ==0.1.1 - fuzzy ==0.1.0.0 @@ -943,7 +947,7 @@ default-package-overrides: - ghc-typelits-extra ==0.4.2 - ghc-typelits-knownnat ==0.7.4 - ghc-typelits-natnormalise ==0.7.3 - - ghc-typelits-presburger ==0.3.0.1 + - ghc-typelits-presburger ==0.5.2.0 - ghci-hexcalc ==0.1.1.0 - ghcid ==0.8.7 - ghcjs-codemirror ==0.0.0.2 @@ -974,7 +978,7 @@ default-package-overrides: - github-rest ==1.0.3 - github-types ==0.2.1 - github-webhooks ==0.15.0 - - gitlab-haskell ==0.2.4 + - gitlab-haskell ==0.2.5 - gitrev ==1.3.1 - gl ==0.9 - glabrous ==2.0.2 @@ -983,7 +987,7 @@ default-package-overrides: - gloss ==1.13.2.1 - gloss-rendering ==1.13.1.1 - GLURaw ==2.0.0.4 - - GLUT ==2.7.0.15 + - GLUT ==2.7.0.16 - gluturtle ==0.0.58.1 - gnuplot ==0.5.6.1 - google-isbn ==1.0.3 @@ -1000,7 +1004,7 @@ default-package-overrides: - greskell-core ==0.1.3.5 - greskell-websocket ==0.1.2.5 - groom ==0.1.2.1 - - group-by-date ==0.1.0.3 + - group-by-date ==0.1.0.4 - groups ==0.5.2 - gtk-sni-tray ==0.1.6.0 - gtk-strut ==0.1.3.0 @@ -1009,7 +1013,7 @@ default-package-overrides: - hackage-db ==2.1.0 - hackage-security ==0.6.0.1 - haddock-library ==1.9.0 - - hadolint ==1.19.0 + - hadolint ==1.20.0 - hadoop-streaming ==0.2.0.3 - hakyll-convert ==0.3.0.3 - half ==0.3.1 @@ -1020,6 +1024,7 @@ default-package-overrides: - happstack-server ==7.7.0 - happy ==1.20.0 - HasBigDecimal ==0.1.1 + - hasbolt ==0.1.4.4 - hashable ==1.3.0.0 - hashable-time ==0.2.0.2 - hashids ==1.0.2.4 @@ -1035,6 +1040,7 @@ default-package-overrides: - haskell-lsp ==0.22.0.0 - haskell-lsp-types ==0.22.0.0 - haskell-names ==0.9.9 + - haskell-src ==1.0.3.1 - haskell-src-exts ==1.23.1 - haskell-src-exts-util ==0.2.5 - haskell-src-meta ==0.8.5 @@ -1058,12 +1064,11 @@ default-package-overrides: - heaps ==0.3.6.1 - hebrew-time ==0.1.2 - hedgehog ==1.0.4 - - hedgehog-classes ==0.2.5.1 - hedgehog-corpus ==0.2.0 - hedgehog-fakedata ==0.0.1.3 - hedgehog-fn ==1.0 - hedgehog-quickcheck ==0.1.1 - - hedis ==0.14.0 + - hedis ==0.14.1 - hedn ==0.3.0.2 - here ==1.2.13 - heredoc ==0.2.0.0 @@ -1114,7 +1119,7 @@ default-package-overrides: - hp2pretty ==0.9 - hpack ==0.34.3 - hpack-dhall ==0.5.2 - - hpc-codecov ==0.2.0.0 + - hpc-codecov ==0.2.0.1 - hpc-lcov ==1.0.1 - hprotoc ==2.4.17 - hruby ==0.3.8 @@ -1140,12 +1145,12 @@ default-package-overrides: - HsOpenSSL ==0.11.5.1 - HsOpenSSL-x509-system ==0.1.0.4 - hsp ==0.10.0 - - hspec ==2.7.5 + - hspec ==2.7.8 - hspec-attoparsec ==0.1.0.2 - hspec-checkers ==0.1.0.2 - hspec-contrib ==0.5.1 - - hspec-core ==2.7.5 - - hspec-discover ==2.7.5 + - hspec-core ==2.7.8 + - hspec-discover ==2.7.8 - hspec-expectations ==0.8.2 - hspec-expectations-lifted ==0.10.0 - hspec-expectations-pretty-diff ==0.7.2.5 @@ -1154,7 +1159,7 @@ default-package-overrides: - hspec-hedgehog ==0.0.1.2 - hspec-leancheck ==0.0.4 - hspec-megaparsec ==2.2.0 - - hspec-meta ==2.6.0 + - hspec-meta ==2.7.8 - hspec-need-env ==0.1.0.5 - hspec-parsec ==0 - hspec-smallcheck ==0.5.2 @@ -1168,6 +1173,7 @@ default-package-overrides: - HsYAML-aeson ==0.2.0.0 - hsyslog ==5.0.2 - htaglib ==1.2.0 + - HTF ==0.14.0.5 - html ==1.0.1.2 - html-conduit ==1.3.2.1 - html-entities ==1.1.4.3 @@ -1216,7 +1222,7 @@ default-package-overrides: - hw-json-simd ==0.1.1.0 - hw-json-simple-cursor ==0.1.1.0 - hw-json-standard-cursor ==0.2.3.1 - - hw-kafka-client ==4.0.1 + - hw-kafka-client ==4.0.2 - hw-mquery ==0.2.1.0 - hw-packed-vector ==0.2.1.0 - hw-parser ==0.1.1.0 @@ -1269,7 +1275,7 @@ default-package-overrides: - ini ==0.4.1 - inj ==1.0 - inline-c ==0.9.1.4 - - inline-c-cpp ==0.4.0.2 + - inline-c-cpp ==0.4.0.3 - inline-r ==0.10.4 - inliterate ==0.1.0 - input-parsers ==0.1.0.1 @@ -1323,7 +1329,7 @@ default-package-overrides: - jalaali ==1.0.0.0 - jira-wiki-markup ==1.3.2 - jose ==0.8.4 - - jose-jwt ==0.8.0 + - jose-jwt ==0.9.0 - js-chart ==2.9.4.1 - js-dgtable ==0.5.2 - js-flot ==0.8.3 @@ -1369,6 +1375,7 @@ default-package-overrides: - language-javascript ==0.7.1.0 - language-protobuf ==1.0.1 - language-python ==0.5.8 + - language-thrift ==0.12.0.0 - lapack ==0.3.2 - lapack-carray ==0.0.3 - lapack-comfort-array ==0.0.0.1 @@ -1404,7 +1411,7 @@ default-package-overrides: - libgit ==0.3.1 - libgraph ==1.14 - libjwt-typed ==0.2 - - libmpd ==0.9.3.0 + - libmpd ==0.10.0.0 - liboath-hs ==0.0.1.2 - libyaml ==0.1.2 - LibZip ==1.0.1 @@ -1423,6 +1430,7 @@ default-package-overrides: - list-predicate ==0.1.0.1 - list-singleton ==1.0.0.4 - list-t ==1.0.4 + - ListLike ==4.7.4 - listsafe ==0.1.0.1 - ListTree ==0.2.3 - little-logger ==0.3.1 @@ -1440,7 +1448,7 @@ default-package-overrides: - logging ==3.0.5 - logging-facade ==0.3.0 - logging-facade-syslog ==1 - - logict ==0.7.0.3 + - logict ==0.7.1.0 - logstash ==0.1.0.1 - loop ==0.3.0 - lrucache ==1.2.0.1 @@ -1449,7 +1457,7 @@ default-package-overrides: - lucid ==2.9.12 - lucid-cdn ==0.2.2.0 - lucid-extras ==0.2.2 - - lukko ==0.1.1.2 + - lukko ==0.1.1.3 - lz4-frame-conduit ==0.1.0.1 - lzma ==0.0.0.3 - lzma-conduit ==1.2.1 @@ -1464,11 +1472,11 @@ default-package-overrides: - markdown ==0.1.17.4 - markdown-unlit ==0.5.1 - markov-chain ==0.0.3.4 - - massiv ==0.5.9.0 - - massiv-io ==0.4.0.0 + - massiv ==0.6.0.0 + - massiv-io ==0.4.1.0 - massiv-persist ==0.1.0.0 - massiv-serialise ==0.1.0.0 - - massiv-test ==0.1.6 + - massiv-test ==0.1.6.1 - math-extras ==0.1.1.0 - math-functions ==0.3.4.1 - mathexpr ==0.3.0.0 @@ -1505,7 +1513,7 @@ default-package-overrides: - microlens-mtl ==0.2.0.1 - microlens-platform ==0.4.1 - microlens-process ==0.2.0.2 - - microlens-th ==0.4.3.8 + - microlens-th ==0.4.3.9 - microspec ==0.2.1.3 - microstache ==1.0.1.2 - midair ==0.2.0.1 @@ -1523,7 +1531,7 @@ default-package-overrides: - mintty ==0.1.2 - missing-foreign ==0.1.1 - MissingH ==1.4.3.0 - - mixed-types-num ==0.4.0.2 + - mixed-types-num ==0.4.1 - mltool ==0.2.0.1 - mmap ==0.5.9 - mmark ==0.0.7.2 @@ -1665,7 +1673,7 @@ default-package-overrides: - nvim-hs ==2.1.0.4 - nvim-hs-contrib ==2.0.0.0 - nvim-hs-ghcid ==2.0.0.0 - - o-clock ==1.2.0 + - o-clock ==1.2.0.1 - oauthenticated ==0.2.1.0 - ObjectName ==1.1.0.1 - odbc ==0.2.2 @@ -1749,7 +1757,8 @@ default-package-overrides: - pcre-heavy ==1.0.0.2 - pcre-light ==0.4.1.0 - pcre-utils ==0.1.8.1.1 - - pcre2 ==1.1.3.1 + - pcre2 ==1.1.4 + - pdfinfo ==1.5.4 - peano ==0.1.0.1 - pem ==0.2.4 - percent-format ==0.0.1 @@ -1816,7 +1825,7 @@ default-package-overrides: - postgresql-libpq ==0.9.4.3 - postgresql-libpq-notify ==0.2.0.0 - postgresql-orm ==0.5.1 - - postgresql-simple ==0.6.3 + - postgresql-simple ==0.6.4 - postgresql-typed ==0.6.1.2 - postgrest ==7.0.1 - pptable ==0.3.0.0 @@ -1848,6 +1857,7 @@ default-package-overrides: - primitive-unlifted ==0.1.3.0 - print-console-colors ==0.1.0.0 - probability ==0.2.7 + - process-extras ==0.7.4 - product-isomorphic ==0.0.3.3 - product-profunctors ==0.11.0.1 - profiterole ==0.1 @@ -1881,7 +1891,7 @@ default-package-overrides: - pureMD5 ==2.1.3 - purescript-bridge ==0.14.0.0 - pushbullet-types ==0.4.1.0 - - pusher-http-haskell ==2.0.0.2 + - pusher-http-haskell ==2.0.0.3 - pvar ==1.0.0.0 - PyF ==0.9.0.2 - qchas ==1.1.0.1 @@ -1939,7 +1949,7 @@ default-package-overrides: - read-editor ==0.1.0.2 - read-env-var ==1.0.0.0 - readable ==0.3.1 - - reanimate ==1.1.3.1 + - reanimate ==1.1.3.2 - reanimate-svg ==0.13.0.0 - rebase ==1.6.1 - record-dot-preprocessor ==0.2.7 @@ -1979,10 +1989,10 @@ default-package-overrides: - reliable-io ==0.0.1 - relude ==0.7.0.0 - renderable ==0.2.0.1 - - replace-attoparsec ==1.4.2.0 + - replace-attoparsec ==1.4.4.0 - replace-megaparsec ==1.4.4.0 - repline ==0.4.0.0 - - req ==3.8.0 + - req ==3.9.0 - req-conduit ==1.0.0 - rerebase ==1.6.1 - resistor-cube ==0.0.1.2 @@ -1999,7 +2009,7 @@ default-package-overrides: - rhine ==0.7.0 - rhine-gloss ==0.7.0 - rigel-viz ==0.2.0.0 - - rio ==0.1.19.0 + - rio ==0.1.20.0 - rio-orphans ==0.1.1.0 - rio-prettyprint ==0.1.1.0 - roc-id ==0.1.0.0 @@ -2021,12 +2031,12 @@ default-package-overrides: - safe-json ==1.1.1.1 - safe-money ==0.9 - safe-tensor ==0.2.1.0 - - safecopy ==0.10.3 + - safecopy ==0.10.3.1 - safeio ==0.0.5.0 - SafeSemaphore ==0.10.1 - salak ==0.3.6 - salak-yaml ==0.3.5.3 - - saltine ==0.1.1.0 + - saltine ==0.1.1.1 - salve ==1.0.10 - sample-frame ==0.0.3 - sample-frame-np ==0.0.4.1 @@ -2062,13 +2072,13 @@ default-package-overrides: - semigroupoids ==5.3.5 - semigroups ==0.19.1 - semiring-simple ==1.0.0.1 - - semirings ==0.5.4 + - semirings ==0.6 - semver ==0.4.0.1 - sendfile ==0.7.11.1 - seqalign ==0.2.0.4 - seqid ==0.6.2 - seqid-streams ==0.7.2 - - sequence-formats ==1.5.1.4 + - sequence-formats ==1.5.2 - sequenceTools ==1.4.0.5 - serf ==0.1.1.0 - serialise ==0.2.3.0 @@ -2113,6 +2123,7 @@ default-package-overrides: - shelltestrunner ==1.9 - shelly ==1.9.0 - shikensu ==0.3.11 + - shortcut-links ==0.5.1.1 - should-not-typecheck ==2.1.0 - show-combinators ==0.2.0.0 - siggy-chardust ==1.0.0 @@ -2132,10 +2143,10 @@ default-package-overrides: - singleton-bool ==0.1.5 - singleton-nats ==0.4.5 - singletons ==2.7 - - singletons-presburger ==0.3.0.1 + - singletons-presburger ==0.5.0.0 - siphash ==1.0.3 - sitemap-gen ==0.1.0.0 - - sized ==0.8.0.0 + - sized ==1.0.0.0 - skein ==1.0.9.4 - skews ==0.1.0.3 - skip-var ==0.1.1.0 @@ -2145,7 +2156,7 @@ default-package-overrides: - slack-progressbar ==0.1.0.1 - slist ==0.1.1.0 - slynx ==0.5.0.1 - - smallcheck ==1.2.0 + - smallcheck ==1.2.1 - smash ==0.1.1.0 - smash-aeson ==0.1.0.0 - smash-lens ==0.1.0.1 @@ -2160,7 +2171,7 @@ default-package-overrides: - soap-openssl ==0.1.0.2 - soap-tls ==0.1.1.4 - socks ==0.6.1 - - some ==1.0.1 + - some ==1.0.2 - sop-core ==0.5.0.1 - sort ==1.0.0.0 - sorted-list ==0.2.1.0 @@ -2232,7 +2243,7 @@ default-package-overrides: - string-conversions ==0.4.0.1 - string-interpolate ==0.3.0.2 - string-qq ==0.0.4 - - string-random ==0.1.3.0 + - string-random ==0.1.4.0 - string-transform ==1.1.1 - stringbuilder ==0.5.1 - stringsearch ==0.3.6.6 @@ -2254,7 +2265,7 @@ default-package-overrides: - swagger2 ==2.6 - sweet-egison ==0.1.1.3 - swish ==0.10.0.4 - - syb ==0.7.1 + - syb ==0.7.2.1 - symbol ==0.2.4 - symengine ==0.1.2.0 - symmetry-operations-symbols ==0.0.2.1 @@ -2282,19 +2293,20 @@ default-package-overrides: - tasty-ant-xml ==1.1.7 - tasty-dejafu ==2.0.0.7 - tasty-discover ==4.2.2 - - tasty-expected-failure ==0.11.1.2 + - tasty-expected-failure ==0.12.2 - tasty-focus ==1.0.1 - tasty-golden ==2.3.3.2 - - tasty-hedgehog ==1.0.0.2 + - tasty-hedgehog ==1.0.1.0 - tasty-hspec ==1.1.6 - tasty-hunit ==0.10.0.3 - tasty-hunit-compat ==0.2.0.1 - tasty-kat ==0.0.3 - tasty-leancheck ==0.0.1 - - tasty-lua ==0.2.3.1 + - tasty-lua ==0.2.3.2 - tasty-program ==1.0.5 - tasty-quickcheck ==0.10.1.2 - tasty-rerun ==1.1.18 + - tasty-silver ==3.1.15 - tasty-smallcheck ==0.8.2 - tasty-test-reporter ==0.1.1.4 - tasty-th ==0.1.7 @@ -2308,7 +2320,7 @@ default-package-overrides: - temporary-rc ==1.2.0.3 - temporary-resourcet ==0.1.0.1 - tensorflow-test ==0.1.0.0 - - tensors ==0.1.4 + - tensors ==0.1.5 - termbox ==0.3.0 - terminal-progress-bar ==0.4.1 - terminal-size ==0.3.2.1 @@ -2320,7 +2332,7 @@ default-package-overrides: - test-fun ==0.1.0.0 - testing-type-modifiers ==0.1.0.1 - texmath ==0.12.1 - - text-ansi ==0.1.0.2 + - text-ansi ==0.1.1 - text-binary ==0.2.1.1 - text-builder ==0.6.6.1 - text-conversions ==0.3.1 @@ -2433,11 +2445,12 @@ default-package-overrides: - type-level-natural-number ==2.0 - type-level-numbers ==0.1.1.1 - type-map ==0.1.6.0 - - type-natural ==0.9.0.0 + - type-natural ==1.0.0.0 - type-of-html ==1.6.1.2 - type-of-html-static ==0.1.0.2 - type-operators ==0.2.0.0 - type-spec ==0.4.0.0 + - typecheck-plugin-nat-simple ==0.1.0.2 - TypeCompose ==0.9.14 - typed-process ==0.2.6.0 - typed-uuid ==0.0.0.2 @@ -2458,7 +2471,6 @@ default-package-overrides: - unicode ==0.0.1.1 - unicode-show ==0.1.0.4 - unicode-transforms ==0.3.7.1 - - unification-fd ==0.10.0.1 - union-find ==0.2 - unipatterns ==0.0.0.0 - uniplate ==1.6.13 @@ -2468,18 +2480,18 @@ default-package-overrides: - unique-logic ==0.4 - unique-logic-tf ==0.5.1 - unit-constraint ==0.0.0 - - universe ==1.2 - - universe-base ==1.1.1 + - universe ==1.2.1 + - universe-base ==1.1.2 - universe-instances-base ==1.1 - - universe-instances-extended ==1.1.1 + - universe-instances-extended ==1.1.2 - universe-instances-trans ==1.1 - - universe-reverse-instances ==1.1 - - universe-some ==1.2 - - universum ==1.5.0 + - universe-reverse-instances ==1.1.1 + - universe-some ==1.2.1 + - universum ==1.7.2 - unix-bytestring ==0.3.7.3 - - unix-compat ==0.5.2 + - unix-compat ==0.5.3 - unix-time ==0.4.7 - - unliftio ==0.2.13.1 + - unliftio ==0.2.14 - unliftio-core ==0.2.0.1 - unliftio-pool ==0.2.1.1 - unlit ==0.4.0.0 @@ -2529,7 +2541,7 @@ default-package-overrides: - vector-split ==1.0.0.2 - vector-th-unbox ==0.2.1.7 - verbosity ==0.4.0.0 - - versions ==4.0.1 + - versions ==4.0.2 - vformat ==0.14.1.0 - vformat-aeson ==0.1.0.1 - vformat-time ==0.1.0.0 @@ -2537,13 +2549,13 @@ default-package-overrides: - vinyl ==0.13.0 - void ==0.7.3 - vty ==5.32 - - wai ==3.2.2.1 + - wai ==3.2.3 - wai-app-static ==3.1.7.2 - wai-conduit ==3.0.0.4 - wai-cors ==0.2.7 - wai-enforce-https ==0.0.2.1 - wai-eventsource ==3.0.0 - - wai-extra ==3.1.5 + - wai-extra ==3.1.6 - wai-feature-flags ==0.1.0.1 - wai-handler-launch ==3.0.3.1 - wai-logger ==2.3.6 @@ -2568,7 +2580,7 @@ default-package-overrides: - webex-teams-api ==0.2.0.1 - webex-teams-conduit ==0.2.0.1 - webex-teams-pipes ==0.2.0.1 - - webgear-server ==0.2.0 + - webgear-server ==0.2.1 - webrtc-vad ==0.1.0.3 - websockets ==0.12.7.2 - websockets-snap ==0.10.3.1 @@ -2623,7 +2635,7 @@ default-package-overrides: - xml-helpers ==1.0.0 - xml-html-qq ==0.1.0.1 - xml-indexed-cursor ==0.1.1.0 - - xml-lens ==0.2 + - xml-lens ==0.3 - xml-picklers ==0.3.6 - xml-to-json ==2.0.1 - xml-to-json-fast ==2.0.0 @@ -2631,7 +2643,7 @@ default-package-overrides: - xmlgen ==0.6.2.2 - xmonad ==0.15 - xmonad-contrib ==0.16 - - xmonad-extras ==0.15.2 + - xmonad-extras ==0.15.3 - xss-sanitize ==0.3.6 - xxhash-ffi ==0.2.0.0 - yaml ==0.11.5.0 @@ -2647,7 +2659,7 @@ default-package-overrides: - yesod-form ==1.6.7 - yesod-gitrev ==0.2.1 - yesod-newsfeed ==1.7.0.0 - - yesod-page-cursor ==2.0.0.1 + - yesod-page-cursor ==2.0.0.2 - yesod-paginator ==1.1.1.0 - yesod-persistent ==1.6.0.5 - yesod-sitemap ==1.6.0 @@ -2666,7 +2678,7 @@ default-package-overrides: - zeromq4-patterns ==0.3.1.0 - zim-parser ==0.2.1.0 - zio ==0.1.0.2 - - zip ==1.6.0 + - zip ==1.7.0 - zip-archive ==0.4.1 - zip-stream ==0.2.0.1 - zipper-extra ==0.1.3.2 @@ -2695,6 +2707,8 @@ extra-packages: - dependent-map == 0.2.4.0 # required by Hasura 1.3.1, 2020-08-20 - dependent-sum == 0.4 # required by Hasura 1.3.1, 2020-08-20 - network == 2.6.3.1 # required by pkgs/games/hedgewars/default.nix, 2020-11-15 + - ghcide == 0.7.0.0 # Needed for hls 0.8.0 + - apply-refact == 0.8.2.1 # Needed for hls 0.8.0 package-maintainers: peti: @@ -3283,6 +3297,7 @@ broken-packages: - atomic-primops-foreign - atomic-primops-vector - atomo + - atp - atp-haskell - ats-pkg - ats-setup @@ -3913,6 +3928,7 @@ broken-packages: - cgi-utils - cgrep - chainweb-mining-client + - chakra - chalkboard - chalkboard-viewer - character-cases @@ -3957,7 +3973,6 @@ broken-packages: - ChristmasTree - chromatin - chronograph - - chronos - chronos-bench - chu2 - chunks @@ -4070,7 +4085,6 @@ broken-packages: - cmt - cmv - cnc-spec-compiler - - co-log - co-log-polysemy - co-log-polysemy-formatting - co-log-sys @@ -4581,7 +4595,6 @@ broken-packages: - derive-gadt - derive-IG - derive-monoid - - derive-storable-plugin - derive-trie - derp-lib - describe @@ -4600,13 +4613,10 @@ broken-packages: - dhall-check - dhall-docs - dhall-fly - - dhall-json - - dhall-lsp-server - dhall-nix - dhall-nixpkgs - dhall-text - dhall-to-cabal - - dhall-yaml - dhcp-lease-parser - dhrun - dia-base @@ -4949,6 +4959,7 @@ broken-packages: - envstatus - epanet-haskell - epass + - ephemeral - epi-sim - epic - epoll @@ -5616,7 +5627,6 @@ broken-packages: - GLFW-OGL - GLFW-task - gli - - glicko - glider-nlp - GLMatrix - glob-posix @@ -8392,7 +8402,6 @@ broken-packages: - NoSlow - not-gloss-examples - notcpp - - nothunks - notifications-tray-icon - notmuch-haskell - notmuch-web @@ -8801,6 +8810,7 @@ broken-packages: - pinboard - pinboard-notes-backup - pinch + - pinch-gen - pinchot - ping - pinpon @@ -11014,13 +11024,10 @@ broken-packages: - unitym-yesod - universal-binary - universe - - universe-base - - universe-dependent-sum - universe-instances-base - universe-instances-extended - universe-instances-trans - universe-reverse-instances - - universe-some - universe-th - unix-fcntl - unix-handle @@ -11654,6 +11661,7 @@ broken-packages: - yxdb-utils - Z-Data - Z-IO + - Z-MessagePack - Z-YAML - z3-encoding - z85 diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 30476a1a6ce..06578f56535 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -500,7 +500,7 @@ self: super: builtins.intersectAttrs super { # requires autotools to build secp256k1 = addBuildTools super.secp256k1 [ pkgs.buildPackages.autoconf pkgs.buildPackages.automake pkgs.buildPackages.libtool ]; - # requires libsecp256k1 in pkgconfig-depends + # requires libsecp256k1 in pkg-config-depends secp256k1-haskell = addPkgconfigDepend super.secp256k1-haskell pkgs.secp256k1; # tests require git and zsh @@ -547,6 +547,12 @@ self: super: builtins.intersectAttrs super { # Break infinite recursion cycle between devtools and mprelude. devtools = super.devtools.override { mprelude = dontCheck super.mprelude; }; + # Break dependency cycle between tasty-hedgehog and tasty-expected-failure + tasty-hedgehog = dontCheck super.tasty-hedgehog; + + # Break dependency cycle between hedgehog, tasty-hedgehog and lifted-async + lifted-async = dontCheck super.lifted-async; + # loc and loc-test depend on each other for testing. Break that infinite cycle: loc-test = super.loc-test.override { loc = dontCheck self.loc; }; @@ -604,12 +610,12 @@ self: super: builtins.intersectAttrs super { git-annex = with pkgs; if (!stdenv.isLinux) then - let path = stdenv.lib.makeBinPath [ coreutils ]; + let path = lib.makeBinPath [ coreutils ]; in overrideCabal (addBuildTool super.git-annex makeWrapper) (_drv: { # This is an instance of https://github.com/NixOS/nix/pull/1085 # Fails with: # gpg: can't connect to the agent: File name too long - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace Test.hs \ --replace ', testCase "crypto" test_crypto' "" ''; @@ -798,7 +804,4 @@ self: super: builtins.intersectAttrs super { # tests depend on a specific version of solc hevm = dontCheck (doJailbreak super.hevm); - - # waiting for https://github.com/haskell/ThreadScope/pull/115 - threadscope = doJailbreak super.threadscope; } diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index e135374511f..582cf6df010 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, buildHaskellPackages, ghc +{ lib, stdenv, buildPackages, buildHaskellPackages, ghc , jailbreak-cabal, hscolour, cpphs, nodejs , ghcWithHoogle, ghcWithPackages }: @@ -7,7 +7,7 @@ let isCross = stdenv.buildPlatform != stdenv.hostPlatform; inherit (buildPackages) fetchurl removeReferencesTo - pkgconfig coreutils gnugrep gnused glibcLocales; + pkg-config coreutils gnugrep gnused glibcLocales; in { pname @@ -22,10 +22,10 @@ in , buildFlags ? [] , haddockFlags ? [] , description ? null -, doCheck ? !isCross && stdenv.lib.versionOlder "7.4" ghc.version +, doCheck ? !isCross && lib.versionOlder "7.4" ghc.version , doBenchmark ? false , doHoogle ? true -, doHaddockQuickjump ? doHoogle && stdenv.lib.versionAtLeast ghc.version "8.6" +, doHaddockQuickjump ? doHoogle && lib.versionAtLeast ghc.version "8.6" , editedCabalFile ? null # aarch64 outputs otherwise exceed 2GB limit , enableLibraryProfiling ? !(ghc.isGhcjs or stdenv.targetPlatform.isAarch64 or false) @@ -36,14 +36,14 @@ in , enableSharedLibraries ? !stdenv.hostPlatform.isStatic && (ghc.enableShared or false) , enableDeadCodeElimination ? (!stdenv.isDarwin) # TODO: use -dead_strip for darwin , enableStaticLibraries ? !(stdenv.hostPlatform.isWindows or stdenv.hostPlatform.isWasm) -, enableHsc2hsViaAsm ? stdenv.hostPlatform.isWindows && stdenv.lib.versionAtLeast ghc.version "8.4" +, enableHsc2hsViaAsm ? stdenv.hostPlatform.isWindows && lib.versionAtLeast ghc.version "8.4" , extraLibraries ? [], librarySystemDepends ? [], executableSystemDepends ? [] # On macOS, statically linking against system frameworks is not supported; # see https://developer.apple.com/library/content/qa/qa1118/_index.html # They must be propagated to the environment of any executable linking with the library , libraryFrameworkDepends ? [], executableFrameworkDepends ? [] , homepage ? "https://hackage.haskell.org/package/${pname}" -, platforms ? with stdenv.lib.platforms; all # GHC can cross-compile +, platforms ? with lib.platforms; all # GHC can cross-compile , hydraPlatforms ? null , hyperlinkSource ? true , isExecutable ? false, isLibrary ? !isExecutable @@ -54,7 +54,7 @@ in , doCoverage ? false , doHaddock ? !(ghc.isHaLVM or false) , passthru ? {} -, pkgconfigDepends ? [], libraryPkgconfigDepends ? [], executablePkgconfigDepends ? [], testPkgconfigDepends ? [], benchmarkPkgconfigDepends ? [] +, pkg-configDepends ? [], libraryPkgconfigDepends ? [], executablePkgconfigDepends ? [], testPkgconfigDepends ? [], benchmarkPkgconfigDepends ? [] , testDepends ? [], testHaskellDepends ? [], testSystemDepends ? [], testFrameworkDepends ? [] , benchmarkDepends ? [], benchmarkHaskellDepends ? [], benchmarkSystemDepends ? [], benchmarkFrameworkDepends ? [] , testTarget ? "" @@ -71,7 +71,7 @@ in , shellHook ? "" , coreSetup ? false # Use only core packages to build Setup.hs. , useCpphs ? false -, hardeningDisable ? stdenv.lib.optional (ghc.isHaLVM or false) "all" +, hardeningDisable ? lib.optional (ghc.isHaLVM or false) "all" , enableSeparateBinOutput ? false , enableSeparateDataOutput ? false , enableSeparateDocOutput ? doHaddock @@ -95,7 +95,7 @@ assert stdenv.hostPlatform.isWasm -> enableStaticLibraries == false; let - inherit (stdenv.lib) optional optionals optionalString versionOlder versionAtLeast + inherit (lib) optional optionals optionalString versionOlder versionAtLeast concatStringsSep enableFeature optionalAttrs; isGhcjs = ghc.isGhcjs or false; @@ -182,7 +182,7 @@ let parallelBuildingFlags = "-j$NIX_BUILD_CORES" + optionalString stdenv.isLinux " +RTS -A64M -RTS"; crossCabalFlagsString = - stdenv.lib.optionalString isCross (" " + stdenv.lib.concatStringsSep " " crossCabalFlags); + lib.optionalString isCross (" " + lib.concatStringsSep " " crossCabalFlags); buildFlagsString = optionalString (buildFlags != []) (" " + concatStringsSep " " buildFlags); @@ -213,7 +213,7 @@ let (enableFeature doBenchmark "benchmarks") "--enable-library-vanilla" # TODO: Should this be configurable? (enableFeature enableLibraryForGhci "library-for-ghci") - ] ++ optionals (enableDeadCodeElimination && (stdenv.lib.versionOlder "8.0.1" ghc.version)) [ + ] ++ optionals (enableDeadCodeElimination && (lib.versionOlder "8.0.1" ghc.version)) [ "--ghc-option=-split-sections" ] ++ optionals dontStrip [ "--disable-library-stripping" @@ -234,7 +234,7 @@ let isHaskellPkg = x: x ? isHaskellLibrary; - allPkgconfigDepends = pkgconfigDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends ++ + allPkgconfigDepends = pkg-configDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends ++ optionals doCheck testPkgconfigDepends ++ optionals doBenchmark benchmarkPkgconfigDepends; depsBuildBuild = [ nativeGhc ]; @@ -243,7 +243,7 @@ let optionals doCheck testToolDepends ++ optionals doBenchmark benchmarkToolDepends; nativeBuildInputs = - [ ghc removeReferencesTo ] ++ optional (allPkgconfigDepends != []) pkgconfig ++ + [ ghc removeReferencesTo ] ++ optional (allPkgconfigDepends != []) pkg-config ++ setupHaskellDepends ++ collectedToolDepends; propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends ++ libraryFrameworkDepends; otherBuildInputsHaskell = @@ -283,9 +283,9 @@ let continue fi ''; -in stdenv.lib.fix (drv: +in lib.fix (drv: -assert allPkgconfigDepends != [] -> pkgconfig != null; +assert allPkgconfigDepends != [] -> pkg-config != null; stdenv.mkDerivation ({ name = "${pname}-${version}"; @@ -423,7 +423,7 @@ stdenv.mkDerivation ({ echo configureFlags: $configureFlags ${setupCommand} configure $configureFlags 2>&1 | ${coreutils}/bin/tee "$NIX_BUILD_TOP/cabal-configure.log" - ${stdenv.lib.optionalString (!allowInconsistentDependencies) '' + ${lib.optionalString (!allowInconsistentDependencies) '' if ${gnugrep}/bin/egrep -q -z 'Warning:.*depends on multiple versions' "$NIX_BUILD_TOP/cabal-configure.log"; then echo >&2 "*** abort because of serious configure-time warning from Cabal" exit 1 @@ -455,7 +455,7 @@ stdenv.mkDerivation ({ ${optionalString doHoogle "--hoogle"} \ ${optionalString doHaddockQuickjump "--quickjump"} \ ${optionalString (isLibrary && hyperlinkSource) "--hyperlink-source"} \ - ${stdenv.lib.concatStringsSep " " haddockFlags} + ${lib.concatStringsSep " " haddockFlags} ''} runHook postHaddock ''; @@ -492,7 +492,7 @@ stdenv.mkDerivation ({ done ''} ${optionalString doCoverage "mkdir -p $out/share && cp -r dist/hpc $out/share"} - ${optionalString (enableSharedExecutables && isExecutable && !isGhcjs && stdenv.isDarwin && stdenv.lib.versionOlder ghc.version "7.10") '' + ${optionalString (enableSharedExecutables && isExecutable && !isGhcjs && stdenv.isDarwin && lib.versionOlder ghc.version "7.10") '' for exe in "${binDir}/"* ; do install_name_tool -add_rpath "$out/lib/ghc-${ghc.version}/${pname}-${version}" "$exe" done @@ -532,10 +532,10 @@ stdenv.mkDerivation ({ libraryPkgconfigDepends librarySystemDepends libraryToolDepends - pkgconfigDepends + pkg-configDepends setupHaskellDepends ; - } // stdenv.lib.optionalAttrs doCheck { + } // lib.optionalAttrs doCheck { inherit testDepends testFrameworkDepends @@ -544,7 +544,7 @@ stdenv.mkDerivation ({ testSystemDepends testToolDepends ; - } // stdenv.lib.optionalAttrs doBenchmark { + } // lib.optionalAttrs doBenchmark { inherit benchmarkDepends benchmarkFrameworkDepends @@ -561,7 +561,7 @@ stdenv.mkDerivation ({ inherit propagatedBuildInputs otherBuildInputs allPkgconfigDepends; haskellBuildInputs = isHaskellPartition.right; systemBuildInputs = isHaskellPartition.wrong; - isHaskellPartition = stdenv.lib.partition + isHaskellPartition = lib.partition isHaskellPkg (propagatedBuildInputs ++ otherBuildInputs ++ depsBuildBuild ++ nativeBuildInputs); }; @@ -608,22 +608,22 @@ stdenv.mkDerivation ({ ghcEnv = withPackages (_: otherBuildInputsHaskell ++ propagatedBuildInputs ++ - stdenv.lib.optionals (!isCross) setupHaskellDepends); + lib.optionals (!isCross) setupHaskellDepends); - ghcCommandCaps = stdenv.lib.toUpper ghcCommand'; + ghcCommandCaps = lib.toUpper ghcCommand'; in stdenv.mkDerivation ({ inherit name shellHook; - depsBuildBuild = stdenv.lib.optional isCross ghcEnvForBuild; + depsBuildBuild = lib.optional isCross ghcEnvForBuild; nativeBuildInputs = - [ ghcEnv ] ++ optional (allPkgconfigDepends != []) pkgconfig ++ + [ ghcEnv ] ++ optional (allPkgconfigDepends != []) pkg-config ++ collectedToolDepends; buildInputs = otherBuildInputsSystem; phases = ["installPhase"]; installPhase = "echo $nativeBuildInputs $buildInputs > $out"; LANG = "en_US.UTF-8"; - LOCALE_ARCHIVE = stdenv.lib.optionalString (stdenv.hostPlatform.libc == "glibc") "${buildPackages.glibcLocales}/lib/locale/locale-archive"; + LOCALE_ARCHIVE = lib.optionalString (stdenv.hostPlatform.libc == "glibc") "${buildPackages.glibcLocales}/lib/locale/locale-archive"; "NIX_${ghcCommandCaps}" = "${ghcEnv}/bin/${ghcCommand}"; "NIX_${ghcCommandCaps}PKG" = "${ghcEnv}/bin/${ghcCommand}-pkg"; # TODO: is this still valid? diff --git a/pkgs/development/haskell-modules/generic-stack-builder.nix b/pkgs/development/haskell-modules/generic-stack-builder.nix index 45c1a8fbd33..8b3020f8861 100644 --- a/pkgs/development/haskell-modules/generic-stack-builder.nix +++ b/pkgs/development/haskell-modules/generic-stack-builder.nix @@ -1,4 +1,4 @@ -{ stdenv, ghc, pkgconfig, glibcLocales +{ stdenv, ghc, pkg-config, glibcLocales , cacert, stack, makeSetupHook, lib }@depArgs: { buildInputs ? [] @@ -28,7 +28,7 @@ in stdenv.mkDerivation (args // { ++ lib.optional (stdenv.hostPlatform.libc == "glibc") glibcLocales; nativeBuildInputs = nativeBuildInputs - ++ [ ghc pkgconfig stack stackHook ]; + ++ [ ghc pkg-config stack stackHook ]; STACK_PLATFORM_VARIANT = "nix"; STACK_IN_NIX_SHELL = 1; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index ef86756d482..cfd4a5eac64 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1,6 +1,6 @@ /* hackage-packages.nix is an auto-generated file -- DO NOT EDIT! */ -{ pkgs, stdenv, callPackage }: +{ pkgs, lib, callPackage }: self: { @@ -14,7 +14,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base GLUT OpenGL random ]; description = "Examples of 3D graphics programming with OpenGL"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "3dmodels" = callPackage @@ -27,8 +27,8 @@ self: { attoparsec base bytestring linear packer ]; description = "3D model parsers"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -44,8 +44,8 @@ self: { base cairo containers gtk haskell98 mtl ]; description = "A tetris-like game (works with GHC 6.8.3 and Gtk2hs 0.9.13)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -57,8 +57,8 @@ self: { sha256 = "0vdq0hscpbl5a9bpf8fiykmyg2c3yvivb0mzcdy99ha0j1p4rwfh"; libraryHaskellDepends = [ base ]; description = "Abstract Application Interface"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -76,7 +76,7 @@ self: { test-framework-quickcheck2 ]; description = "An alternating list of two types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "AC-Angle" = callPackage @@ -87,7 +87,7 @@ self: { sha256 = "0ra97a4im3w2cq3mf17j8skn6bajs7rw7d0mmvcwgb9jd04b0idm"; libraryHaskellDepends = [ base ]; description = "Angles in degrees and radians"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "AC-Boolean" = callPackage @@ -98,7 +98,7 @@ self: { sha256 = "0id19wgp2jg2pf1gdhfzkyknjj19jii3pz0lva29x3lcck38rw2b"; libraryHaskellDepends = [ base ]; description = "Handle Boolean values generatically"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "AC-BuildPlatform" = callPackage @@ -109,8 +109,8 @@ self: { sha256 = "0vlhakc6mc4zzyvb54rgmskkj8hp43zy35giimk0g7i5068r2czh"; libraryHaskellDepends = [ base ]; description = "Detect which OS you're running on"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -122,7 +122,7 @@ self: { sha256 = "02v3b1pfhwnf3cl8kbxfkk0a7hdp0gqq5v4w9ka32zl1p007rz19"; libraryHaskellDepends = [ base ]; description = "Efficient RGB colour types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "AC-EasyRaster-GTK" = callPackage @@ -133,8 +133,8 @@ self: { sha256 = "082il76032biyan170p4qp13154nmkzil4v2wv7fmjn9z7v8w49b"; libraryHaskellDepends = [ array base gtk ]; description = "GTK+ pixel plotting"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -148,8 +148,8 @@ self: { editedCabalFile = "02k1fg86iyzbb0bxfn8r6s7z8bkahr8y02wps1l5j958jpckd6c9"; libraryHaskellDepends = [ base ]; description = "Efficient half-integer type"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -163,8 +163,8 @@ self: { editedCabalFile = "0faw83njfarccnad1hgy1cf3wmihfghk3qhw2s7zf6p84v6zc27y"; libraryHaskellDepends = [ base transformers ]; description = "A simple test framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -176,7 +176,7 @@ self: { sha256 = "0y2wzwfnlx50rzkdigmjy3dg5f91pmkf4gmnzjhs3r916d296gkq"; libraryHaskellDepends = [ base bytestring ]; description = "Trivial package for writing PPM images"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "AC-Random" = callPackage @@ -187,7 +187,7 @@ self: { sha256 = "1c00pcz0c4l2sdaj61zcmw68ckmqb7xlfykv489xms7ak4xl8nc1"; libraryHaskellDepends = [ base ]; description = "A pure Haskell PRNG"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "AC-Terminal" = callPackage @@ -200,8 +200,8 @@ self: { editedCabalFile = "1i9bjryhccdp8gfm9xs5bbfsy32hpyv2zckd95m7g6bc4jvp8cjm"; libraryHaskellDepends = [ ansi-terminal base ]; description = "Trivial wrapper over ansi-terminal"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -213,8 +213,8 @@ self: { sha256 = "044kiwc5g2irky0k3fg9l2qqnvcnh9vdx0yz8m1awnkab6mk0i3v"; libraryHaskellDepends = [ base ghc-prim ]; description = "Immutable arrays with plain integer indicies"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -228,8 +228,8 @@ self: { editedCabalFile = "05l4sk0lz9iml7282zh9pxqr538s6kjhhl6zrbdwlry21sn14pc0"; libraryHaskellDepends = [ base ]; description = "Efficient geometric vectors and transformations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -241,8 +241,8 @@ self: { sha256 = "0wcan2s75c89s1mxhcvvjgbpn8xqrhmwnfbsrszkzydw3x46465y"; libraryHaskellDepends = [ AC-Angle AC-Vector base ]; description = "Fancy type-system stuff for AC-Vector"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -258,8 +258,8 @@ self: { base list-extras mtl random random-shuffle void ]; description = "Essential features"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -287,8 +287,8 @@ self: { transformers tuple vector ]; description = "Efficient, high-level dynamic programming"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -315,8 +315,8 @@ self: { ]; benchmarkHaskellDepends = [ base criterion ForestStructures ]; description = "Dynamic programming on tree and forest structures"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -341,8 +341,8 @@ self: { tasty-th ]; description = "Dynamic programming for Set data structures"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -362,8 +362,8 @@ self: { ]; executableHaskellDepends = [ base containers directory ]; description = "foundational type classes for approximating exact real numbers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -379,8 +379,8 @@ self: { AERN-Real AERN-RnToRm base binary containers html stm time ]; description = "Compositional lazy dataflow networks for exact real number computation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -397,8 +397,8 @@ self: { test-framework-quickcheck2 ]; description = "arbitrary precision real interval arithmetic"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -422,8 +422,8 @@ self: { QuickCheck test-framework test-framework-quickcheck2 ]; description = "arbitrary precision real interval arithmetic"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -440,8 +440,8 @@ self: { test-framework-quickcheck2 ]; description = "arbitrary precision real interval arithmetic"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -458,8 +458,8 @@ self: { time ]; description = "polynomial function enclosures (PFEs) approximating exact real functions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -477,8 +477,8 @@ self: { glade glib gtk gtkglext mtl OpenGL stm time ]; description = "GL plotting of polynomial function enclosures (PFEs)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -496,7 +496,7 @@ self: { base bytestring cereal monads-tf random transformers ]; description = "Fast AES encryption/decryption for bytestrings"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "AFSM" = callPackage @@ -507,7 +507,7 @@ self: { sha256 = "0yy24nrl99b624x0d8k4w4505zx2b2n25frdq5ijn4j6fhjqwhz6"; libraryHaskellDepends = [ base ]; description = "Arrowized functional state machines"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "AGI" = callPackage @@ -520,8 +520,8 @@ self: { base mtl network parsec random syb unix ]; description = "A library for writing AGI scripts for Asterisk"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -536,7 +536,7 @@ self: { libraryHaskellDepends = [ base OpenAL StateVar transformers ]; librarySystemDepends = [ freealut ]; description = "A binding for the OpenAL Utility Toolkit"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) freealut;}; "AMI" = callPackage @@ -551,8 +551,8 @@ self: { base bytestring containers mtl network pureMD5 stm ]; description = "Low-level bindings for Asterisk Manager Interface (AMI)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -565,7 +565,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Num instance for Applicatives provided via the ANum newtype"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ASN1" = callPackage @@ -580,7 +580,7 @@ self: { base containers HUnit mtl NewBinary old-time pretty QuickCheck ]; description = "ASN.1 support for Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "AVar" = callPackage @@ -591,7 +591,7 @@ self: { sha256 = "0jggzjyms1w4p1ynv8m5yvya64kbxkjdis7wvy3lildmp0w0x0c7"; libraryHaskellDepends = [ base ]; description = "Mutable variables with Exception handling and concurrency support"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "AWin32Console" = callPackage @@ -602,8 +602,8 @@ self: { sha256 = "0il5bngj4919mmpm0rwmbx74ih3sfbqkaph6w12p49fs466sxkh1"; libraryHaskellDepends = [ base regex-compat Win32 ]; description = "A binding to a part of the ANSI escape code for the console"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + platforms = [ "armv7l-linux" ]; }) {}; "AbortT-monadstf" = callPackage @@ -614,8 +614,8 @@ self: { sha256 = "1ijv4bs299ijqbkspbg1kry627ra6p6qlkd74q4y2pvamrm4dn6f"; libraryHaskellDepends = [ AbortT-transformers base monads-tf ]; description = "Monads-tf instances for the AbortT monad transformer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -627,8 +627,8 @@ self: { sha256 = "1x2iw46nzfjj36pfdzv5n0q6f6l7kgz62gnxpsj2f5p7w10zlxai"; libraryHaskellDepends = [ AbortT-transformers base mtl ]; description = "mtl instances for the AbortT monad transformer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -646,8 +646,8 @@ self: { test-framework-quickcheck2 transformers ]; description = "A monad and monadic transformer providing \"abort\" functionality"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -671,8 +671,8 @@ self: { ]; testHaskellDepends = [ base hspec ]; description = "An easy-to-use video game framework for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -688,8 +688,8 @@ self: { isExecutable = true; libraryHaskellDepends = [ base ]; description = "Library for incremental computing"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -704,8 +704,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base ]; description = "Library for incremental computing"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -719,8 +719,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base haskell98 mtl ]; description = "Lisperati's adventure game in Lisp translated to Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -750,8 +750,8 @@ self: { time uniplate wai wai-extra wl-pprint ]; description = "Assessment services for the Advise-Me project"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -773,7 +773,7 @@ self: { ]; description = "Mapping between Aeson's JSON and Bson objects"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "Agata" = callPackage @@ -788,8 +788,8 @@ self: { base containers mtl QuickCheck tagged template-haskell ]; description = "Generator-generator for QuickCheck"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -823,8 +823,8 @@ self: { executableToolDepends = [ emacs ]; description = "A dependently typed functional programming language and proof assistant"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - maintainers = with stdenv.lib.maintainers; [ abbradar ]; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ abbradar ]; }) {inherit (pkgs) emacs;}; "Agda-executable" = callPackage @@ -838,7 +838,7 @@ self: { executableHaskellDepends = [ Agda base ]; description = "Command-line program for type-checking and compiling Agda programs"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "AhoCorasick" = callPackage @@ -852,8 +852,8 @@ self: { array base hashable mtl unordered-containers ]; description = "Aho-Corasick string matching algorithm"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -875,8 +875,8 @@ self: { ]; benchmarkHaskellDepends = [ base containers criterion ]; description = "Find the minimal subset/submap satisfying some property"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -905,8 +905,8 @@ self: { test-framework-quickcheck2 transformers ]; description = "Algorithmic music composition"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -920,8 +920,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base containers mtl pretty ]; description = "Example implementation of Algorithm W for Hindley-Milner type inference"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -938,8 +938,8 @@ self: { PrimitiveArray vector ]; description = "Collection of alignment algorithms"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -967,8 +967,8 @@ self: { async base filepath LambdaHack optparse-applicative ]; description = "Near-future Sci-Fi roguelike and tactical squad combat game"; - license = stdenv.lib.licenses.agpl3Plus; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.agpl3Plus; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -988,8 +988,8 @@ self: { process QuickCheck split transformers xml ]; description = "Android view hierarchy importer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -1001,8 +1001,8 @@ self: { sha256 = "01vpw9s93qq8c0zymp4qzv0ljn9jrnwi3x68qx9lcjr6spa0rkvm"; libraryHaskellDepends = [ base random ]; description = "Updated version of Yampa: a library for programming hybrid systems"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -1015,8 +1015,8 @@ self: { libraryHaskellDepends = [ base mtl multirec parsec ]; testHaskellDepends = [ base mtl multirec parsec ]; description = "Constructing, analyzing and destructing annotated trees"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -1030,7 +1030,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base mtl parsec xhtml ]; description = "Convert ANSI Terminal Sequences to nice HTML markup"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Aoide" = callPackage @@ -1044,7 +1044,7 @@ self: { base bytestring mtl process template-haskell ]; description = "A simple music library with the capability of generating .ly and .mid files."; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ApplePush" = callPackage @@ -1062,8 +1062,8 @@ self: { ]; executableHaskellDepends = [ base ]; description = "Library for Apple Push Notification Service"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -1075,8 +1075,8 @@ self: { sha256 = "1jmwixyv5msb3lmza7dljvm3l0x5mx8r93zr607sx9m5x9yhlsvr"; doHaddock = false; description = "Call AppleScript from Haskell, and then call back into Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -1088,8 +1088,8 @@ self: { sha256 = "1s7amy8ij5bgv8afbjdzqd3lflvhzrrh3cs3krl1rf73y8b1nqpy"; libraryHaskellDepends = [ base vector ]; description = "Function approximation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -1101,8 +1101,8 @@ self: { sha256 = "1yb209v3lab3knggplmwih1ww6qalf8v86j8ggv1gkhm5jkwz1yq"; libraryHaskellDepends = [ base ]; description = "Unboxed references, dynamic arrays and more"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -1114,8 +1114,8 @@ self: { sha256 = "1lv76m4qc1sabagllaagi7bpqf1mnmzsra333a77b6134mk2f9hb"; libraryHaskellDepends = [ base process ]; description = "A library to generate Netlist code from Arrow descriptions"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -1131,7 +1131,7 @@ self: { base containers mtl poly-rec requirements tagged template-haskell ]; description = "Strongly typed Attribute Grammars implemented using type-level programming"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "AttoBencode" = callPackage @@ -1151,8 +1151,8 @@ self: { test-framework-quickcheck2 ]; description = "Fast Bencode encoding and parsing library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -1169,8 +1169,8 @@ self: { utf8-string ]; description = "Simple lightweight JSON parser, generator & manipulator based on ByteString"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -1186,8 +1186,8 @@ self: { array base colour GLUT OpenGL random ]; description = "Visualisation of Strange Attractors in 3-Dimensions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -1201,8 +1201,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base containers parsec pretty ]; description = "Yet another parser generator for C/C++"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -1219,7 +1219,7 @@ self: { ]; description = "GUI library based upon generic programming (SYB3)"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -1231,8 +1231,8 @@ self: { sha256 = "0bw6856h75wks0mfvvqqm5i31sici1hacyl5zfj225jf9gn5q7dx"; libraryHaskellDepends = [ base COrdering ]; description = "Balanced binary trees using the AVL algorithm"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -1244,8 +1244,8 @@ self: { sha256 = "1ypq7m09ki5wbwkvmqdl7ch40cbdfhb91kq8n17im184r5liyxlc"; libraryHaskellDepends = [ base containers llvm random timeit ]; description = "Embedded BASIC"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -1272,8 +1272,8 @@ self: { unordered-containers ]; description = "Big Contact Map Tools"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -1302,7 +1302,7 @@ self: { ]; testToolDepends = [ alex happy hspec-discover ]; description = "A compiler front-end generator"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "BNFC-meta" = callPackage @@ -1320,7 +1320,7 @@ self: { template-haskell ]; description = "Deriving Parsers and Quasi-Quoters from BNF Grammars"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }) {}; "Baggins" = callPackage @@ -1333,8 +1333,8 @@ self: { editedCabalFile = "16206xd8lm8fkvpxbm19h403264xyjki07s9lam3pgq985xbqk35"; libraryHaskellDepends = [ base cairo containers mtl ]; description = "Tools for self-assembly"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -1350,8 +1350,8 @@ self: { base bifunctors hmidi mtl stm time transformers ]; description = "A Drum Machine DSL for Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -1381,7 +1381,7 @@ self: { ]; description = "An ad-hoc P2P chat program"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -1395,8 +1395,8 @@ self: { isExecutable = true; executableHaskellDepends = [ array base mtl random ]; description = "An interpreter for the Befunge-93 Programming Language"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -1414,8 +1414,8 @@ self: { base bytestring cassava deepseq directory statistics time vector ]; description = "Benchmark functions with history"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -1428,7 +1428,7 @@ self: { libraryHaskellDepends = [ base bytestring extensible-exceptions ]; librarySystemDepends = [ db ]; description = "Berkeley DB binding"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) db;}; "BerkeleyDBXML" = callPackage @@ -1442,8 +1442,8 @@ self: { libraryHaskellDepends = [ base BerkeleyDB bytestring ]; librarySystemDepends = [ db dbxml xercesc xqilla ]; description = "Berkeley DB XML binding"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) db; inherit (pkgs) dbxml; inherit (pkgs) xercesc; inherit (pkgs) xqilla;}; @@ -1456,8 +1456,8 @@ self: { sha256 = "14wjpfr9d8fpgl1jkpm2123lprr3hf3a6smkaflzkgxqlgcrkmyr"; libraryHaskellDepends = [ base besout ]; description = "Factorization of polynomials over finite field"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -1472,8 +1472,8 @@ self: { base containers mtl template-haskell th-extras ]; description = "The Bidirectional Generic Update Language"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -1487,7 +1487,7 @@ self: { isExecutable = true; executableHaskellDepends = [ array base bmp bytestring gloss ]; description = "Image editor for pixel art"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "BinderAnn" = callPackage @@ -1505,8 +1505,8 @@ self: { base containers ghc ghc-prim mtl split syb transformers ]; description = "Source-to-source plugin for enhancing EDSLs with static annotations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -1518,7 +1518,7 @@ self: { sha256 = "0am0487l7njngp2k6h3qfbhjs61d9ir9rp8iw1r5448b20n4fxas"; libraryHaskellDepends = [ base ]; description = "Common bin-packing heuristics"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "BioHMM" = callPackage @@ -1535,8 +1535,8 @@ self: { filepath parsec ParsecTools StockholmAlignment SVGFonts text vector ]; description = "Libary for Hidden Markov Models in HMMER3 format"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -1558,8 +1558,8 @@ self: { vector-read-instances zlib ]; description = "Base library for bioinformatics"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -1586,8 +1586,8 @@ self: { tasty-silver tasty-th text ]; description = "BLAST-related tools"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -1599,8 +1599,8 @@ self: { sha256 = "0m7n3c2ly6kly146xrxzx41g3pv0cylrmzpdgv5c54x9gvb1hg7w"; libraryHaskellDepends = [ base bytestring iteratee ]; description = "Vienna / DotBracket / ExtSS parsers"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -1623,8 +1623,8 @@ self: { vector vector-th-unbox ]; description = "European Nucleotide Archive data"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -1642,8 +1642,8 @@ self: { directory either-unwrap text vector word8 ]; description = "Ensembl related datastructures and functions"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -1659,8 +1659,8 @@ self: { base BiobaseXNA bytestring containers filemanip iteratee tuple ]; description = "Importer for FR3D resources"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -1685,8 +1685,8 @@ self: { text ]; description = "streaming FASTA parser"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -1704,8 +1704,8 @@ self: { http-conduit hxt mtl network Taxonomy text transformers ]; description = "Libary to interface with the Bioinformatics HTTP services - Entrez Ensembl"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -1726,8 +1726,8 @@ self: { either-unwrap hxt text ]; description = "Tools to query Bioinformatics HTTP services e.g. Entrez, Ensembl."; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -1766,8 +1766,8 @@ self: { base criterion lens text transformers ]; description = "Infernal data structures and tools"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -1779,8 +1779,8 @@ self: { sha256 = "0mwyyb7n232wgjipn9jsbqpcbxqms07adi5a6v14qaiynsjz4n1r"; libraryHaskellDepends = [ base bytestring containers iteratee ]; description = "Multiple Alignment Format"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -1808,8 +1808,8 @@ self: { test-framework-quickcheck2 test-framework-th ]; description = "Newick file format parser"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -1829,8 +1829,8 @@ self: { ]; executableHaskellDepends = [ cmdargs ]; description = "RNA folding training data"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -1848,8 +1848,8 @@ self: { filepath lens primitive PrimitiveArray repa split vector ]; description = "Import Turner RNA parameters"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -1882,8 +1882,8 @@ self: { vector-binary-instances vector-th-unbox ]; description = "Collection of types for bioinformatics"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -1899,8 +1899,8 @@ self: { base BiobaseTurner BiobaseXNA primitive PrimitiveArray vector ]; description = "Import Vienna energy parameters"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -1942,8 +1942,8 @@ self: { text tuple vector vector-binary-instances vector-th-unbox ]; description = "Efficient RNA/DNA/Protein Primary/Secondary Structure"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -1958,7 +1958,7 @@ self: { executableHaskellDepends = [ base haskell98 ]; description = "A preprocessor for Bird-style Literate Haskell comments with Haddock markup"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -1978,8 +1978,8 @@ self: { base bitstring bytestring mtl parallel primitive QuickCheck transformers vector ]; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -1987,14 +1987,14 @@ self: { ({ mkDerivation, base, bytestring, QuickCheck, template-haskell }: mkDerivation { pname = "BitSyntax"; - version = "0.3.2.1"; - sha256 = "0cc0nvmnybn68a1bvzqrvc5csaqvs3g50657slwjf2f686yi5q8r"; + version = "0.3.2.2"; + sha256 = "0615r1cb2sv9sj517vii3g2sf1k308q3r176i03jpjlb6vgfipkn"; libraryHaskellDepends = [ base bytestring QuickCheck template-haskell ]; description = "A module to aid in the (de)serialisation of binary data"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -2006,8 +2006,8 @@ self: { sha256 = "1pmmgg6n6pc0qvp5r4qxan32887132si0cayd0xh1g5v98fa9ari"; libraryHaskellDepends = [ base HTTP json2 ]; description = "A library to access bit.ly URL shortener."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -2025,8 +2025,8 @@ self: { HTTP http-conduit hxt mtl network transformers zip-archive ]; description = "Libary to interface with the NCBI blast REST interface"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -2049,7 +2049,7 @@ self: { ]; description = "Diagram editor"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -2074,8 +2074,8 @@ self: { ]; executableHaskellDepends = [ base cmdargs ]; description = "A tool for posting Haskelly articles to blogs"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -2097,8 +2097,8 @@ self: { ]; executableHaskellDepends = [ base BlogLiterately ]; description = "Include images in blog posts with inline diagrams code"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -2127,8 +2127,8 @@ self: { base containers criterion MissingH network-uri parsec ]; description = "A markdown-like markup language designed for blog posts"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.agpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -2140,7 +2140,7 @@ self: { sha256 = "0ryjgi70isgfv3nw3djzvb1saky40xqy536h6sr3mfpy2iqnim0c"; libraryHaskellDepends = [ base mtl ]; description = "Html document layout library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Blueprint" = callPackage @@ -2151,8 +2151,8 @@ self: { sha256 = "16cfmy4ndc15p6jdmyy08nqgv143dvs9xf4qg4mxa6x5r326pi94"; doHaddock = false; description = "Preview of a new build system"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -2174,7 +2174,7 @@ self: { testHaskellDepends = [ base process ]; description = "A simple document organizer with some wiki functionality"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -2186,7 +2186,7 @@ self: { sha256 = "1y7f8lqx86m06ccq1bjym2hywc7r17s2bvx16jswb2ibn09n08b7"; libraryHaskellDepends = [ base ]; description = "Generalized booleans and numbers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "BoundedChan" = callPackage @@ -2197,7 +2197,7 @@ self: { sha256 = "0vf4mlw08n056g5256cf46m5xsijng5gvjx7ccm4r132gznyl72k"; libraryHaskellDepends = [ array base ]; description = "Implementation of bounded channels"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Bravo" = callPackage @@ -2213,8 +2213,8 @@ self: { template-haskell ]; description = "Static text template generation library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -2226,8 +2226,8 @@ self: { sha256 = "13wwi7x898p51crzzp5rdrjgmsxsgbx7dgzgbaxdikxyrh216lmz"; libraryHaskellDepends = [ base bytestring network text ]; description = "A socker wrapper that makes the IO of sockets much cleaner"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -2252,8 +2252,8 @@ self: { http-conduit http-types string-qq temporary unix yaml ]; description = "Hits a set of urls periodically to bust caches"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -2264,15 +2264,15 @@ self: { }: mkDerivation { pname = "C-structs"; - version = "0.1.0.1"; - sha256 = "0b3mqp20am2yn7jbgxxg08rds1c5mxx827app23hrhsl4ysslfkg"; + version = "0.2.0.1"; + sha256 = "1l7mygk0ia93wqcm61v8mdlnspxscdplxg4qpffvx4ldfafxc7x9"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base doctest Glob HUnit QuickCheck template-haskell test-framework test-framework-hunit test-framework-quickcheck2 ]; description = "C-Structs implementation for Haskell"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "CBOR" = callPackage @@ -2292,8 +2292,8 @@ self: { QuickCheck test-framework test-framework-quickcheck2 ]; description = "Encode/Decode values to/from CBOR"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -2306,7 +2306,7 @@ self: { libraryHaskellDepends = [ base mtl ]; description = "Delimited continuations and dynamically scoped variables"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "CC-delcont-alt" = callPackage @@ -2323,8 +2323,8 @@ self: { testHaskellDepends = [ base doctest mtl ]; doHaddock = false; description = "Three new monad transformers for multi-prompt delimited control"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -2336,8 +2336,8 @@ self: { sha256 = "1s6bql9r78yfzgarm3i4f2glhc5w8qq91adhs15cnqj6h7768a5c"; libraryHaskellDepends = [ base mtl ]; description = "A monad transformers for multi-prompt delimited control"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -2349,8 +2349,8 @@ self: { sha256 = "07v388bzs8x9k1p677310rbh8baj1fdq3bhbqyvxqzx93kv8g381"; libraryHaskellDepends = [ base mtl ]; description = "A monad transformers for multi-prompt delimited control"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -2362,8 +2362,8 @@ self: { sha256 = "0fzjr73id8rlrcmf0j3y1qn4jnc8incqhhkp9wl35lig20kqy82m"; libraryHaskellDepends = [ base mtl ]; description = "A monad transformers for multi-prompt delimited control using refercence cells"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -2375,8 +2375,8 @@ self: { sha256 = "0zavw824xcr1jhmlpz9hmabhhi459y0s7z434lxalzha01j1wfih"; libraryHaskellDepends = [ base ref-tf transformers ]; description = "A monad transformers for multi-prompt delimited control using refercence cells"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -2394,8 +2394,8 @@ self: { executableHaskellDepends = [ array base containers haskell-src ]; executableToolDepends = [ happy ]; description = "preprocessor and library for Causal Commutative Arrows (CCA)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -2410,7 +2410,7 @@ self: { base bytestring hxt-regex-xmlschema utf8-string ]; description = "A W3C compliant (X)HTML generating library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "CLASE" = callPackage @@ -2425,8 +2425,8 @@ self: { base containers filepath mtl parsec template-haskell ]; description = "Cursor Library for A Structured Editor"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -2439,8 +2439,8 @@ self: { libraryHaskellDepends = [ base directory split time ]; testHaskellDepends = [ base doctest ]; description = "CLI tools"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -2459,8 +2459,8 @@ self: { ]; executableHaskellDepends = [ cmdargs ]; description = "Infernal covariance model comparison"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -2477,8 +2477,8 @@ self: { time ]; description = "cwmwl udp message queue"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -2490,8 +2490,8 @@ self: { sha256 = "1lkav4wkyrraq1f6kyqfyjrxasgkayg4hmyv8a1gkr4h484b1cx8"; libraryHaskellDepends = [ base ]; description = "An algebraic data type similar to Prelude Ordering"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -2506,8 +2506,8 @@ self: { enableSeparateDataOutput = true; executableHaskellDepends = [ base haskell98 ]; description = "A simple Brainfuck interpretter"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -2523,8 +2523,8 @@ self: { array base containers mtl parsec readline ]; description = "An interpreter of Hagino's Categorical Programming Language (CPL)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -2536,7 +2536,7 @@ self: { sha256 = "0dlb761kj33v9p53fw44gg4r7j8kcl4jxvvgi7rz0pv8v7nh6255"; libraryHaskellDepends = [ base ]; description = "Definition of a CSP core-language"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "CSPM-FiringRules" = callPackage @@ -2552,8 +2552,8 @@ self: { QuickCheck random tree-monad ]; description = "Firing rules semantic of CSPM"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -2571,8 +2571,8 @@ self: { ]; libraryToolDepends = [ alex ]; description = "A CSP-M parser compatible with FDR-2.91"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -2589,8 +2589,8 @@ self: { prettyclass syb ]; description = "An interpreter for CSPM"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -2604,8 +2604,8 @@ self: { array base containers CSPM-Frontend pretty ]; description = "some modules specific for the ProB tool"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -2631,8 +2631,8 @@ self: { prettyclass syb transformers xml ]; description = "cspm command line tool for analyzing CSPM specifications"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -2649,7 +2649,7 @@ self: { base containers hashable mtl unordered-containers ]; description = "Open records using closed type families"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "CV" = callPackage @@ -2678,7 +2678,7 @@ self: { libraryToolDepends = [ c2hs ]; description = "OpenCV based machine vision library"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {opencv_calib3d = null; opencv_contrib = null; opencv_core = null; opencv_features2d = null; opencv_flann = null; @@ -2711,8 +2711,8 @@ self: { ]; doCheck = false; description = "A framework for packaging Haskell software"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "Cabal_2_4_1_0" = callPackage @@ -2742,8 +2742,8 @@ self: { ]; doCheck = false; description = "A framework for packaging Haskell software"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "Cabal_3_2_1_0" = callPackage @@ -2773,8 +2773,8 @@ self: { ]; doCheck = false; description = "A framework for packaging Haskell software"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "Cabal-ide-backend" = callPackage @@ -2798,8 +2798,8 @@ self: { test-framework test-framework-hunit test-framework-quickcheck2 unix ]; description = "A framework for packaging Haskell software"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -2817,8 +2817,8 @@ self: { base bytestring directory filepath HDBC HDBC-sqlite3 process unix ]; description = "Search cabal packages by name"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -2830,8 +2830,8 @@ self: { sha256 = "0nd5yvhbxmabs0890y9gjjiq37h8c3blpplv2m13k29zkijwad04"; libraryHaskellDepends = [ base compdata directory free unix ]; description = "Separate and contain effects of IO monad"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -2854,8 +2854,8 @@ self: { sha256 = "06ri47cfskvpm65zb63kjrwwhzlmcp2f0z99hqkfw216p85648a3"; libraryHaskellDepends = [ base containers fgl parsec ]; description = "An implementation and DSL for the Carneades argumentation model"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -2872,8 +2872,8 @@ self: { base CarneadesDSL cmdargs containers Dung fgl ]; description = "A translation from the Carneades argumentation model into Dung's AFs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -2885,8 +2885,8 @@ self: { sha256 = "1g2da90bna28hla9akpqsg5d2ag4p59zwxr6vqdizjbcpy4d7xkl"; libraryHaskellDepends = [ base lens linear template-haskell ]; description = "Coordinate systems"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -2898,8 +2898,8 @@ self: { sha256 = "1ih8ydc29axckgidc5xvsdac5558gprscw667msh8qh41j9sshng"; libraryHaskellDepends = [ base comonad ghc-prim mtl void ]; description = "Playing with reified categorical composition"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -2926,8 +2926,8 @@ self: { test-framework-quickcheck2 text unordered-containers vector ]; description = "A CSV parsing and encoding library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -2939,8 +2939,8 @@ self: { sha256 = "10m7l701p3a2w0kxi2b93g2ii6s4s71zyjypqk3mi79siv8yilif"; libraryHaskellDepends = [ base mtl ]; description = "A monad for complex manipulation of a stream"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -2952,7 +2952,7 @@ self: { sha256 = "183pghm74vk1vdcn0mdn6g5q284sncpl1cc49lpczz1wbr15s89y"; libraryHaskellDepends = [ base free mmorph mtl transformers-base ]; description = "Generalized stream processors"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Chart" = callPackage @@ -2970,7 +2970,7 @@ self: { operational time vector ]; description = "A library for generating 2D Charts and Plots"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Chart-cairo" = callPackage @@ -2988,7 +2988,7 @@ self: { old-locale operational time ]; description = "Cairo backend for Charts"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Chart-diagrams" = callPackage @@ -3011,8 +3011,8 @@ self: { text time ]; description = "Diagrams backend for Charts"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -3031,8 +3031,8 @@ self: { base Chart colour data-default-class fltkhs operational text vector ]; description = "A backend for the Chart library for FLTKHS"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -3049,7 +3049,7 @@ self: { mtl old-locale time ]; description = "Utility functions for using the chart library with GTK"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Chart-gtk3" = callPackage @@ -3065,7 +3065,7 @@ self: { mtl old-locale time ]; description = "Utility functions for using the chart library with GTK"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Chart-simple" = callPackage @@ -3081,8 +3081,8 @@ self: { data-default-class gtk mtl old-locale time ]; description = "A wrapper for the chart library to assist with basic plots (Deprecated - use the Easy module instead)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -3109,8 +3109,8 @@ self: { ]; testHaskellDepends = [ base doctest ]; description = "Tests of the Charts library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -3120,8 +3120,8 @@ self: { }: mkDerivation { pname = "ChasingBottoms"; - version = "1.3.1.9"; - sha256 = "1acsmvdwsgry0i0qhmz0img71gq97wikmn9zgbqppl4n8a1d7bvh"; + version = "1.3.1.10"; + sha256 = "1flr56hd8ny0ddlv1agi0ikdjv5wgx0aba6xqdsn3nv6dyw9nbf3"; libraryHaskellDepends = [ base containers mtl QuickCheck random syb ]; @@ -3129,7 +3129,7 @@ self: { array base containers mtl QuickCheck random syb ]; description = "For testing partial and infinite values"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "CheatSheet" = callPackage @@ -3143,7 +3143,7 @@ self: { enableSeparateDataOutput = true; executableHaskellDepends = [ base containers directory ]; description = "A Haskell cheat sheet in PDF and literate formats"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Checked" = callPackage @@ -3154,8 +3154,8 @@ self: { sha256 = "1mr323rhh3lr6a5ni60n2kxz2k57763a3rrf7c6i18hxs9d4w2s4"; libraryHaskellDepends = [ base text ]; description = "Inbuilt checking for ultra reliable computing"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -3169,8 +3169,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base binary bytestring mtl network ]; description = "A platform independent mechanism to render graphics using vnc"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -3187,7 +3187,7 @@ self: { ]; description = "Alternative approach of 'read' that composes grammars instead of parsers"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -3199,7 +3199,7 @@ self: { sha256 = "111ccwiszrjy54y5hincyvjj97kmar9n26bbn902qa9jd9y9k3g9"; libraryHaskellDepends = [ aeson base text vector ]; description = "Cirru Parser in Haskell"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "Clash-Royale-Hack-Cheats" = callPackage @@ -3221,8 +3221,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "spam"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -3234,8 +3234,8 @@ self: { sha256 = "1277vn384hpxd7xnzg0gpr7ilnw5cqhsi11c24g9zsfqa36llwgk"; libraryHaskellDepends = [ base ChasingBottoms mtl QuickCheck ]; description = "Stating and checking laws for type class methods"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -3247,8 +3247,8 @@ self: { sha256 = "1yvkrzd3l7ijh3fqvkbzqv5vp4nv5z26fbxy91sfwh3zqlscpim9"; libraryHaskellDepends = [ base strict ]; description = "Prelude replacement using classes instead of concrete types where reasonable"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -3260,8 +3260,8 @@ self: { sha256 = "0kr9i13ch2wbcnxchrnx562r8ar7kb84gmk3cqxc40x5w416205f"; libraryHaskellDepends = [ base containers ]; description = "A light, clean and powerful utility library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -3273,7 +3273,7 @@ self: { sha256 = "1dr5ifmy5azib140bri9rzlq69jic430v9cv372jb42r78cci0iz"; libraryHaskellDepends = [ base directory unix utf8-string X11 ]; description = "System clipboard interface"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ClustalParser" = callPackage @@ -3293,8 +3293,8 @@ self: { testHaskellDepends = [ base hspec hspec-discover parsec text ]; testToolDepends = [ hspec-discover ]; description = "Libary for parsing Clustal tools output"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -3312,8 +3312,8 @@ self: { filepath mtl old-time pretty pureMD5 safe utf8-string ]; description = "A generic build tool"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -3325,7 +3325,7 @@ self: { sha256 = "0jj2iaa632s60dckj8s46g4vrlqc8x9fndkq0kzk8rk4jzwlbwsn"; libraryHaskellDepends = [ base ]; description = "LZF compression bindings"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Codec-Image-DevIL" = callPackage @@ -3337,7 +3337,7 @@ self: { libraryHaskellDepends = [ array base ]; librarySystemDepends = [ libdevil ]; description = "An FFI interface to the DevIL library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) libdevil;}; "Color" = callPackage @@ -3356,7 +3356,7 @@ self: { ]; benchmarkHaskellDepends = [ base colour criterion deepseq random ]; description = "Color spaces and conversions between them"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Combinatorrent" = callPackage @@ -3381,8 +3381,8 @@ self: { test-framework-quickcheck2 time ]; description = "A concurrent bittorrent client"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -3394,8 +3394,8 @@ self: { sha256 = "043dwvjkc1m2cz0rgiib7gv19ds1vn4cmf27lyw68nmc0lcm2v3d"; libraryHaskellDepends = [ base directory process ]; description = "A replacement for System.Exit and System.Process"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -3418,8 +3418,8 @@ self: { system-fileio system-filepath text ]; description = "Watch some files; Rerun a command"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -3437,8 +3437,8 @@ self: { IndexedList NestedFunctor PeanoWitnesses Stream Tape transformers ]; description = "A library for expressing spreadsheet-like computations as the fixed-points of comonads"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -3450,8 +3450,8 @@ self: { sha256 = "0gizrl90jn5cmadxzpdvfg7h11pkb0l12k891xw9v36j5yf4saj0"; libraryHaskellDepends = [ base containers transformers vector ]; description = "A generalization for containers that can be stripped of Nothing"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -3463,8 +3463,8 @@ self: { sha256 = "0mca09afj36zm3b7q3xn4gzkj4ggrlaz2g0zpssy4siam5rlc208"; libraryHaskellDepends = [ base ]; description = "A Cached variable for IO functions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -3476,8 +3476,8 @@ self: { sha256 = "0xnnkz67hh4mqx09wh17jpr9isgpcrc5xwp28afn3n8sz2y2mnxd"; libraryHaskellDepends = [ async base ]; description = "Mix concurrent and sequential computation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -3499,8 +3499,8 @@ self: { base binary Cabal containers glider-nlp HUnit text ]; description = "Information retrieval library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -3514,7 +3514,7 @@ self: { isExecutable = true; libraryHaskellDepends = [ base containers MissingH mtl parsec ]; description = "Configuration file reading & writing"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ConfigFileTH" = callPackage @@ -3528,7 +3528,7 @@ self: { ]; description = "Template haskell for reading ConfigFiles"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -3540,8 +3540,8 @@ self: { sha256 = "0fk7165abh4rw4jk6wy4f6y0qpakxlrs4mwrs3r2q7lz03jsyig2"; libraryHaskellDepends = [ base Dangerous MissingH mtl parsec ]; description = "Parse config files"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -3553,8 +3553,8 @@ self: { sha256 = "1if0hff6fn7zjj1vh16gxf2kldibh1dkscm8n33d1admvpjpw9sb"; libraryHaskellDepends = [ base ]; description = "Declare types as Configurable then specialize them all in one place"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -3566,7 +3566,7 @@ self: { sha256 = "1ywhrj2wq24my4cji5fm5cwb3j4yjwzch9hxncr7k989smjdmjpz"; libraryHaskellDepends = [ base Stream ]; description = "Trivial re-export of Wouter Swierstra's Stream package, avoiding module name clash"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Conscript" = callPackage @@ -3579,8 +3579,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base process ]; description = "Restart a command on STDIN activity"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -3592,8 +3592,8 @@ self: { sha256 = "0rhy5wq3v5hdryjn8pcsgqy4k772agj1rgq3021pjki7n3zm3dza"; libraryHaskellDepends = [ base dlist ghc-prim vector ]; description = "Repackages standard type classes with the ConstraintKinds extension"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -3605,8 +3605,8 @@ self: { sha256 = "03ham35vh49h780h7dxb6zs85rkdlry0nwi8wp6p9iamw952xi6i"; libraryHaskellDepends = [ base mtl ]; description = "A monad and monad transformer for consuming streams"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -3618,8 +3618,8 @@ self: { sha256 = "1paj8wx2k86i5xb11scbyca4fb2fnxgln5d661mcwxvs0i91jj1b"; libraryHaskellDepends = [ arrows base ]; description = "Control.Arrow.Transformer.Cont"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -3637,8 +3637,8 @@ self: { base containers criterion multiset QuickCheck statistics vector ]; description = "Implementation of the context algebra"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -3650,8 +3650,8 @@ self: { sha256 = "027dv53jrfk46dmiidnnrrdvhyin60i862znp414213w72yjrbhh"; libraryHaskellDepends = [ base template-haskell ]; description = "Practical typed lazy contracts"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -3663,7 +3663,7 @@ self: { sha256 = "1jyj42xrja8ic3lajgrfmign9n2bdfkaplnlhzcifd5wf30qj6fa"; libraryHaskellDepends = [ base BoundedChan stm ]; description = "A parallel producer/consumer engine (thread pool)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Control-Monad-MultiPass" = callPackage @@ -3683,8 +3683,8 @@ self: { test-framework test-framework-hunit test-framework-quickcheck2 ]; description = "A Library for Writing Multi-Pass Algorithms"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -3702,8 +3702,8 @@ self: { test-framework-hunit test-framework-quickcheck2 ]; description = "A variation on the ST monad with two type parameters"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -3715,8 +3715,8 @@ self: { sha256 = "1r70whihxczscp8j406sr4qqkf0abn125azald4cshqnp81rl2i4"; libraryHaskellDepends = [ base ghc pretty pretty-show ]; description = "A GHC plugin for printing GHC's internal Core data structures"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -3728,8 +3728,8 @@ self: { sha256 = "034g6c7dxdp13v1x16gvwgagpc7mw33hwd16cbb8yd3i91vf1w8z"; libraryHaskellDepends = [ base parsec pretty ]; description = "Manipulating Core Erlang source code"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -3748,8 +3748,8 @@ self: { ]; libraryToolDepends = [ c2hs ]; description = "Bindings to Mac OSX's CoreFoundation framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -3761,8 +3761,8 @@ self: { sha256 = "1cad9j7ivd6mfcff44773v8z3z2ilparxfikbnv0gab6csc9p1nw"; libraryHaskellDepends = [ base ]; description = "Type-safe coroutines using lightweight session types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -3783,8 +3783,8 @@ self: { utf8-string ]; description = "CouchDB interface"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -3801,8 +3801,8 @@ self: { ]; doHaddock = false; description = "Code for Haskell: the Craft of Functional Programming, 3rd ed"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -3820,7 +3820,7 @@ self: { ]; description = "Collects together existing Haskell cryptographic functions into a package"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "CurryDB" = callPackage @@ -3857,8 +3857,8 @@ self: { base bytestring mersenne-random-pure64 mtl ]; description = "CurryDB: In-memory Key/Value Database"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -3877,7 +3877,7 @@ self: { ]; description = "Real-Time Game Tournament Evaluator"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -3907,7 +3907,7 @@ self: { transformers-compat utf8-string xml-conduit xml-hamlet ]; description = "RFC 4918 WebDAV support"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "DBFunctor" = callPackage @@ -3934,8 +3934,8 @@ self: { text time transformers unordered-containers vector ]; description = "DBFunctor - Functional Data Management => ETL/ELT Data Processing in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -3949,8 +3949,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base containers parsec ]; description = "A command-line SQL interface for flat files (tdf,csv,etc.)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -3962,8 +3962,8 @@ self: { sha256 = "0l212yy40w8sjkv5m7rnd24fkihvnadv7szf10g9n5r34m4jb6lh"; libraryHaskellDepends = [ base bytestring ]; description = "D-Bus bindings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -3975,7 +3975,7 @@ self: { sha256 = "10f0c3y0y39rmvvvrvz426srb18wsv4qfzzx9r9zjac2m14b96jx"; libraryHaskellDepends = [ base deepseq HUnit parallel random ]; description = "Communication Free Learning-based constraint solver"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "DMuCheck" = callPackage @@ -3988,8 +3988,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base MuCheck ]; description = "Distributed Mutation Analysis framework for MuCheck"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -4015,7 +4015,7 @@ self: { unordered-containers ]; description = "Complete API bindings for DigitalOcean API V2"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "DOM" = callPackage @@ -4026,8 +4026,8 @@ self: { sha256 = "13zj4jg78y5s05gfi3j83izxw6d2csbvznd7mq900zlv4xwddw2b"; libraryHaskellDepends = [ base mtl WebBits ]; description = "DOM Level 2 bindings for the WebBits package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -4043,8 +4043,8 @@ self: { array base containers list-tries mtl QuickCheck safe semiring ]; description = "Pragmatic framework for dynamic programming"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -4069,7 +4069,7 @@ self: { executableHaskellDepends = [ base ]; description = "Darcs Patch Manager"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -4107,7 +4107,7 @@ self: { transformers vector ]; description = "utilities for DP"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "DRBG" = callPackage @@ -4131,7 +4131,7 @@ self: { prettyclass QuickCheck tagged test-framework test-framework-hunit ]; description = "Deterministic random bit generator (aka RNG, PRNG) based HMACs, Hashes, and Ciphers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "DSA" = callPackage @@ -4154,8 +4154,8 @@ self: { test-framework-hunit test-framework-quickcheck2 ]; description = "Implementation of DSA, based on the description of FIPS 186-4"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -4184,8 +4184,8 @@ self: { mtl semigroups template-haskell text time vector ]; description = "Database Supported Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -4208,7 +4208,7 @@ self: { ]; description = "A framework for using STM within distributed systems"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -4220,8 +4220,8 @@ self: { sha256 = "0m3697zw0j2l9fxx8flr83n8x03pva1hn74rgilgxdrsrifhds5l"; libraryHaskellDepends = [ base haskell-src-exts ]; description = "Data To Class transformation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -4233,8 +4233,8 @@ self: { sha256 = "0pnywhva7s5xp9xlxk6h56n3fjflna6zhk5qdb8wax7i1qbp85vs"; libraryHaskellDepends = [ base MaybeT mtl ]; description = "Monads for operations that can exit early and produce warnings"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -4265,8 +4265,8 @@ self: { utf8-string ]; description = "Dao is meta programming language with its own built-in interpreted language, designed with artificial intelligence applications in mind"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -4279,7 +4279,7 @@ self: { libraryHaskellDepends = [ base HaXml mtl parsec safe xml-parsec ]; description = "Code used by Patch-Shack that seemed sensible to open for reusability"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -4291,7 +4291,7 @@ self: { sha256 = "0lk0w64hyqkg99r9ccn5k1nh6rmd99z8d925px4cl09nin7hnm71"; libraryHaskellDepends = [ base ]; description = "Geometric angles"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Data-Hash-Consistent" = callPackage @@ -4306,7 +4306,7 @@ self: { base bytestring digest utf8-string vector vector-algorithms ]; description = "Provide a simple consistent hashing mechanism"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Data-Rope" = callPackage @@ -4318,7 +4318,7 @@ self: { libraryHaskellDepends = [ base bytestring unix ]; description = "Ropes, an alternative to (Byte)Strings"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -4335,7 +4335,7 @@ self: { testHaskellDepends = [ base tasty tasty-hspec ]; benchmarkHaskellDepends = [ base criterion ]; description = "A package for adding index column to data files"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "DataTreeView" = callPackage @@ -4352,8 +4352,8 @@ self: { MissingH monad-control mtl syb transformers-base ]; description = "A GTK widget for displaying arbitrary Data.Data.Data instances"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -4367,8 +4367,8 @@ self: { libraryHaskellDepends = [ base generic-lens microlens ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "Type safe data migrations"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -4397,8 +4397,8 @@ self: { ]; testHaskellDepends = [ base doctest filemanip QuickCheck ]; description = "Write clients for Meteor's DDP Protocol"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -4427,7 +4427,7 @@ self: { test-framework-quickcheck2 ]; description = "Decimal numbers with variable precision"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "DecisionTree" = callPackage @@ -4439,7 +4439,7 @@ self: { libraryHaskellDepends = [ base containers ]; description = "A very simple implementation of decision trees for discrete attributes"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -4451,8 +4451,8 @@ self: { sha256 = "1jbvb8yk291iimpqi8h302r8554k4j2p3k42znzppv1wqrbhvjyc"; libraryHaskellDepends = [ base haskell-src mtl TypeCompose ]; description = "Arrows for \"deep application\""; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -4470,8 +4470,8 @@ self: { ]; testHaskellDepends = [ base constraints mtl QuickCheck random ]; description = "A DSL for creating neural network"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -4492,7 +4492,7 @@ self: { ]; description = "A simple RTS game"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -4515,8 +4515,8 @@ self: { mtl options parallel text wl-pprint ]; description = "A demonstration interpreter for type system delta-lambda (of N.G. De-bruijn)"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -4528,7 +4528,7 @@ self: { sha256 = "0ywipcmnr3ysmx8m61yrymyn10lnizjfkk2q2scdfkrkgh7ayj7v"; libraryHaskellDepends = [ base containers xmonad xmonad-contrib ]; description = "A library for specifying xmonad key bindings with functionality"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Dflow" = callPackage @@ -4545,8 +4545,8 @@ self: { base HUnit QuickCheck test-framework test-framework-quickcheck2 ]; description = "Processing Real-time event streams"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -4564,8 +4564,8 @@ self: { test-framework-quickcheck2 ]; description = "O(ND) diff algorithm in haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "Diff" = callPackage @@ -4582,7 +4582,7 @@ self: { test-framework-quickcheck2 ]; description = "O(ND) diff algorithm in haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "DifferenceLogic" = callPackage @@ -4595,8 +4595,8 @@ self: { base containers fgl FirstOrderTheory HUnit ]; description = "A theory solver for conjunctions of literals in difference logic"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -4612,8 +4612,8 @@ self: { base deepseq fclabels mtl mwc-random parallel primitive vector ]; description = "Global optimization using Differential Evolution"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -4630,7 +4630,7 @@ self: { test-framework-quickcheck2 ]; description = "A data-type representing digits 0-9"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "DigitalOcean" = callPackage @@ -4648,8 +4648,8 @@ self: { ]; testHaskellDepends = [ base hspec lens mtl text ]; description = "A client library for the DigitalOcean API"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.agpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -4661,8 +4661,8 @@ self: { sha256 = "0bbg9w5n3b296g884y8qvgzsndqhzwh0mkn3dlp9nx4a7i321c97"; libraryHaskellDepends = [ base ]; description = "An n-dimensional hash using Morton numbers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -4675,8 +4675,8 @@ self: { libraryHaskellDepends = [ base Win32 ]; librarySystemDepends = [ dsound ]; description = "Partial binding to the Microsoft DirectSound API"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + platforms = [ "armv7l-linux" ]; }) {dsound = null;}; "DisTract" = callPackage @@ -4696,8 +4696,8 @@ self: { old-locale parsec pretty process template-haskell time xhtml ]; description = "Distributed Bug Tracking System"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -4714,8 +4714,8 @@ self: { ]; testHaskellDepends = [ base doctest ]; description = "Discussion support system"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -4730,8 +4730,8 @@ self: { libraryHaskellDepends = [ base bytestring ]; executableHaskellDepends = [ base bytestring ]; description = "Hash modules (currently Murmur3)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -4744,8 +4744,8 @@ self: { libraryHaskellDepends = [ base containers MonadRandom ]; testHaskellDepends = [ base containers MonadRandom ]; description = "A Haskell library for probability distributions"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -4762,7 +4762,7 @@ self: { base HUnit test-framework test-framework-hunit vector ]; description = "Distance transform function"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "DistanceUnits" = callPackage @@ -4773,7 +4773,7 @@ self: { sha256 = "0ls6rq4nqn3z9h9lagl8sff9q94zfm6gssa2jj1zfyfxl5869bas"; libraryHaskellDepends = [ base ]; description = "A comprehensive distance library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "DnaProteinAlignment" = callPackage @@ -4799,8 +4799,8 @@ self: { PrimitiveArray repa split vector ]; description = "Frameshift-aware alignment of protein sequences with DNA sequences"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -4818,8 +4818,8 @@ self: { base containers ghc ghc-paths haddock HUnit process ]; description = "Test interactive Haskell examples"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -4831,7 +4831,7 @@ self: { sha256 = "1hjdznp29kwj9cca0jxr3dds9cnfbss6sgn52wym2380az3jcvnz"; libraryHaskellDepends = [ base html ]; description = "Documentation types library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "DrHylo" = callPackage @@ -4849,8 +4849,8 @@ self: { ]; executableHaskellDepends = [ array base containers pretty ]; description = "A tool for deriving hylomorphisms"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -4868,8 +4868,8 @@ self: { base filepath old-time process random ]; description = "Program to derive type class instances"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -4884,8 +4884,8 @@ self: { enableSeparateDataOutput = true; executableHaskellDepends = [ base old-time process random ]; description = "Program to derive type class instances"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -4899,8 +4899,8 @@ self: { isExecutable = true; libraryHaskellDepends = [ base cmdargs containers parsec ]; description = "An implementation of the Dung argumentation frameworks"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -4927,7 +4927,7 @@ self: { ]; description = "Polymorphic protocol engine"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -4955,7 +4955,7 @@ self: { ]; description = "Cryptographic operations"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) openssl;}; @@ -4981,7 +4981,7 @@ self: { ]; description = "Network filtering exploration tools"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -5004,7 +5004,7 @@ self: { ]; description = "Network filtering exploration tools that rely on pcap"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -5022,8 +5022,8 @@ self: { array base criterion QuickCheck random vector ]; description = "Dynamic time warping of sequences"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -5037,8 +5037,8 @@ self: { base contravariant mtl time transformers ]; description = "dysFunctional Reactive Programming"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -5050,8 +5050,8 @@ self: { sha256 = "1pg6gwyrlvp6z08ab1qp783z9gm0xhnh337shf443f1bwbcz9m7f"; libraryHaskellDepends = [ base cairo DysFRP gtk mtl ]; description = "dysFunctional Reactive Programming on Cairo"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -5068,8 +5068,8 @@ self: { gtk ]; description = "dysFunctional Reactive Programming on Craftwerk"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -5081,7 +5081,7 @@ self: { sha256 = "1bkkzj1d0j4nisdl9jfmadjx32w35ipdw3k12krhzzlf5aiwnrf1"; libraryHaskellDepends = [ base containers ]; description = "ExtremlyEasyConfig - Extremly Simple parser for config files"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ENIG" = callPackage @@ -5100,7 +5100,7 @@ self: { unicode-transforms ]; description = "Auto Korean conjugator/adjustor/adopter/converter"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Earley" = callPackage @@ -5121,7 +5121,7 @@ self: { base criterion deepseq ListLike parsec ]; description = "Parsing all context-free grammars using Earley's algorithm"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Ebnf2ps" = callPackage @@ -5139,7 +5139,7 @@ self: { ]; executableToolDepends = [ happy ]; description = "Peter's Syntax Diagram Drawing Tool"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "EdisonAPI" = callPackage @@ -5150,7 +5150,7 @@ self: { sha256 = "0vmmlsj8ggbpwx6fkf5fvb6jp0zpx6iba6b28m80lllr2p8bi8wm"; libraryHaskellDepends = [ base mtl ]; description = "A library of efficient, purely-functional data structures (API)"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "EdisonCore" = callPackage @@ -5165,7 +5165,7 @@ self: { array base containers EdisonAPI mtl QuickCheck ]; description = "A library of efficient, purely-functional data structures (Core Implementations)"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "EditTimeReport" = callPackage @@ -5184,7 +5184,7 @@ self: { ]; description = "Query language and report generator for edit logs"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -5207,8 +5207,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "spam"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -5226,8 +5226,8 @@ self: { base monad-control transformers transformers-base ]; description = "EitherT monad transformer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -5268,7 +5268,7 @@ self: { union-find unordered-containers ]; description = "The Elm language module"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Emping" = callPackage @@ -5284,7 +5284,7 @@ self: { ]; description = "derives heuristic rules from nominal data"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -5296,8 +5296,8 @@ self: { sha256 = "0gcm29iafh3gpiqg34gcvyx2pyvgarp4kxl928c6f7x27hzbibv2"; libraryHaskellDepends = [ base containers ]; description = "A type class for empty containers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -5328,8 +5328,8 @@ self: { Taxonomy text transformers ]; description = "Libary to interface with the NCBI Entrez REST service"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -5342,7 +5342,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base smallcheck tasty tasty-hunit ]; description = "Non-crashing `Enum` operations"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "EnumContainers" = callPackage @@ -5353,8 +5353,8 @@ self: { sha256 = "14ckpgaviny3c0d1jn3blkkpri0cm8ac264y7kak965knjccq0k8"; libraryHaskellDepends = [ base containers deepseq ]; description = "Simple Enum-class-based int containers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -5366,8 +5366,8 @@ self: { sha256 = "1v3jp1l95kybvdlpvp6bd0ryihxrvlnpkqz7fl1n4vazhkqk6zjz"; libraryHaskellDepends = [ base containers ]; description = "More general IntMap replacement"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -5386,8 +5386,8 @@ self: { transformers ]; description = "Render math formula in ASCII, and perform some simplifications"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -5401,8 +5401,8 @@ self: { base containers HUnit mtl union-find-array ]; description = "A theory solver for conjunctions of literals in the theory of uninterpreted functions with equality"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -5422,8 +5422,8 @@ self: { regions safer-file-handles storablevector transformers unix ]; description = "Type-safe bindings to EsounD (ESD; Enlightened Sound Daemon)"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -5435,8 +5435,8 @@ self: { sha256 = "15xijkc23sqakwa4qmf2hvcn07kd9ahx3z15a6lr18cs43pbjw93"; libraryHaskellDepends = [ ansi-terminal base mtl ]; description = "Methods for estimating the progress of functions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -5461,8 +5461,8 @@ self: { ]; executablePkgconfigDepends = [ pcre ]; description = "A new implementation of the LambdaMOO server"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) pcre;}; @@ -5478,8 +5478,8 @@ self: { base containers ghc mtl operational random SafeSemaphore time unix ]; description = "A general data-flow framework"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -5498,8 +5498,8 @@ self: { array base containers deepseq Etage fgl mtl parallel random time ]; description = "Data-flow based graph algorithms"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -5514,8 +5514,8 @@ self: { enableSeparateDataOutput = true; executableHaskellDepends = [ base haskell98 SDL SDL-mixer ]; description = "A 2-D shooting game"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -5538,7 +5538,7 @@ self: { executableSystemDepends = [ libpcap ]; description = "A network analysis toolkit for Haskell"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) libpcap;}; @@ -5550,7 +5550,7 @@ self: { sha256 = "1a6bvi0y1pnzpx0x3arrardgkbs0m8ssfwcyxf6fim87wcb0jcgv"; libraryHaskellDepends = [ base ]; description = "Library for using euro currency, italian language"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Euterpea" = callPackage @@ -5566,7 +5566,7 @@ self: { heap PortMidi random stm ]; description = "Library for computer music research and education"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "EventSocket" = callPackage @@ -5581,8 +5581,8 @@ self: { base bytestring containers haskell98 mtl network ]; description = "Interfaces with FreeSwitch Event Socket"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -5602,8 +5602,8 @@ self: { random regex-compat time unix Unixutils zlib ]; description = "A grab bag of modules"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -5616,7 +5616,7 @@ self: { libraryHaskellDepends = [ base inline-c ]; testHaskellDepends = [ base hspec inline-c ]; description = "Haskell Foreign Accelerate Interface"; - license = stdenv.lib.licenses.lgpl3; + license = lib.licenses.lgpl3; }) {}; "FComp" = callPackage @@ -5641,8 +5641,8 @@ self: { template-haskell time uu-parsinglib ]; description = "Compose music"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -5657,7 +5657,7 @@ self: { executableHaskellDepends = [ array base containers haskell98 ]; description = "A set of computational morphology tools for Swedish diachronic lexicons"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -5670,8 +5670,8 @@ self: { libraryHaskellDepends = [ base ]; librarySystemDepends = [ fmodex64 ]; description = "The Haskell FModEx raw API"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {fmodex64 = null;}; @@ -5685,8 +5685,8 @@ self: { editedCabalFile = "0d6mjr7b37f5bgjijjgx4x4fgfmkbhksphzkaf0p5jyzxp45fasc"; libraryHaskellDepends = [ base containers ]; description = "Efficient simple pretty printing combinators"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -5698,7 +5698,7 @@ self: { sha256 = "0gsrfzk5g499r7xdhsaag53207bd015jwcrl2f9izmpa6gli5las"; libraryHaskellDepends = [ base containers matrix vector ]; description = "Basic concepts of finite state machines"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "FTGL" = callPackage @@ -5710,8 +5710,8 @@ self: { libraryHaskellDepends = [ base ]; librarySystemDepends = [ ftgl ]; description = "Portable TrueType font rendering for OpenGL using the Freetype2 library"; - license = stdenv.lib.licenses.bsd3; - platforms = [ "i686-linux" "x86_64-linux" ]; + license = lib.licenses.bsd3; + platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) ftgl;}; "FTGL-bytestring" = callPackage @@ -5727,8 +5727,8 @@ self: { ]; librarySystemDepends = [ ftgl ]; description = "Portable TrueType font rendering for OpenGL using the Freetype2 library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) ftgl;}; @@ -5747,8 +5747,8 @@ self: { strict ]; description = "A command-line FTP client"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -5773,8 +5773,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "spam"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -5790,8 +5790,8 @@ self: { AC-Angle base containers digits QuickCheck template-haskell ]; description = "A collection of facts about the real world"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -5803,8 +5803,8 @@ self: { sha256 = "1qhjqswx4qyfan3rpvvl1hgmf369krqprlr6x20hp34r2qw9s135"; libraryHaskellDepends = [ base base-unicode-symbols mmtl ]; description = "Failure Monad Transformer"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -5816,8 +5816,8 @@ self: { sha256 = "0yxaqyn6nxbyfkn5pmd7wh951dhdvkg1xgh5757f7hn00bx87wv1"; libraryHaskellDepends = [ base STMonadTrans vector ]; description = "A monad and monad transformer for pushing things onto a stack very fast"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -5834,8 +5834,8 @@ self: { pipes-bytestring ]; description = "Fasta and Fastq streaming"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -5849,7 +5849,7 @@ self: { libraryHaskellDepends = [ base QuickCheck template-haskell ]; testHaskellDepends = [ base QuickCheck template-haskell ]; description = "Data structure for fast query and update of cumulative sums"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "FermatsLastMargin" = callPackage @@ -5869,7 +5869,7 @@ self: { ]; description = "Annotate ps and pdf documents"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -5886,8 +5886,8 @@ self: { template-haskell ]; description = "Ferry Core Components"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -5901,8 +5901,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base containers mtl parsec ]; description = "Evaluation using F-Algebras"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -5919,8 +5919,8 @@ self: { vector-space ]; description = "Functional 3D"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -5936,8 +5936,8 @@ self: { base bytestring directory extensible-exceptions filepath mtl unix ]; description = "Expressive file and directory manipulation for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -5953,8 +5953,8 @@ self: { base bytestring directory filepath mtl unix-compat ]; description = "Expressive file and directory manipulation for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -5971,8 +5971,8 @@ self: { transformers ]; description = "Functions on System.FilePath"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -5988,8 +5988,8 @@ self: { base binary bytestring directory filepath mtl old-time ]; description = "File system data structure and monad transformer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -6006,8 +6006,8 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "File content extraction/rearrangement"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -6025,8 +6025,8 @@ self: { alg base foldable1 natural-induction peano universe-base ]; description = "Finite totally-ordered sets"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -6042,8 +6042,8 @@ self: { base bytestring http-conduit network old-locale time ]; description = "Obtain quote data from finance.yahoo.com"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -6060,8 +6060,8 @@ self: { time ]; description = "Obtain Treasury yield curve data"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -6073,7 +6073,7 @@ self: { sha256 = "197xvn05yysmibm1p5wzxfa256lvpbknr5d1l2ws6g40w1kpk717"; libraryHaskellDepends = [ base directory filepath ]; description = "Locate directory of original program"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "FiniteMap" = callPackage @@ -6084,8 +6084,8 @@ self: { sha256 = "1kf638h5gsc8fklhaw2jiad1r0ssgj8zkfmzywp85lrx5z529gky"; libraryHaskellDepends = [ base haskell98 ]; description = "A finite map implementation, derived from the paper: Efficient sets: a balancing act, S. Adams, Journal of functional programming 3(4) Oct 1993, pp553-562"; - license = stdenv.lib.licenses.bsdOriginal; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsdOriginal; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -6097,8 +6097,8 @@ self: { sha256 = "1941ickx8aj3qbkry4gz8ni6snh26gkdrgabpx9z588518q4x27i"; libraryHaskellDepends = [ base containers Proper ]; description = "Grammar and typeclass for first order theories"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -6110,7 +6110,7 @@ self: { sha256 = "0qfys17q3i56l20wzkpr8inq130j67kya022ynf0sgbc86avlrcn"; libraryHaskellDepends = [ base deepseq template-haskell ]; description = "Fixed point, large word, and large int numerical representations (types and common class instances)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Flippi" = callPackage @@ -6128,8 +6128,8 @@ self: { base cgi containers directory haskell98 old-time parsec xhtml ]; description = "Wiki"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -6141,7 +6141,7 @@ self: { sha256 = "0c38062vnjmy3fc5nxwg7sgbfabikaakgdsl34ka229s6w7pm8x3"; libraryHaskellDepends = [ base template-haskell ]; description = "Read and write hexadecimal floating point numbers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Focus" = callPackage @@ -6152,7 +6152,7 @@ self: { sha256 = "1f1ch6mxgaam1i4ryd1av879y2f8wn3wmg47h23w2l0pvgmxgrj1"; libraryHaskellDepends = [ base MissingH split ]; description = "Tools for focusing in on locations within numbers"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "Folly" = callPackage @@ -6166,7 +6166,7 @@ self: { libraryHaskellDepends = [ base containers parsec ]; executableHaskellDepends = [ base containers HUnit parsec ]; description = "A first order logic library in Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "FontyFruity" = callPackage @@ -6182,7 +6182,7 @@ self: { vector xml ]; description = "A true type file format loader"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ForSyDe" = callPackage @@ -6203,8 +6203,8 @@ self: { template-haskell type-level ]; description = "ForSyDe's Haskell-embedded Domain Specific Language"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -6226,7 +6226,7 @@ self: { ]; benchmarkHaskellDepends = [ base criterion ]; description = "Tree- and forest structures"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Forestry" = callPackage @@ -6252,8 +6252,8 @@ self: { ]; benchmarkHaskellDepends = [ base criterion ]; description = "Comparison of trees and forests"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -6265,8 +6265,8 @@ self: { sha256 = "0lzrggy1j15cajb6k5qhz2s8ddngr3hhhsj781ya45fcx82mngvj"; libraryHaskellDepends = [ base monad-control mtl resourcet ]; description = "Forkable monad transformers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -6291,8 +6291,8 @@ self: { transformers trifecta unordered-containers vector ]; description = "(Context-free) grammars in formal language theory"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -6315,8 +6315,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "spam"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -6337,8 +6337,8 @@ self: { array base cmdtheline containers criterion random strict ]; description = "Utilities to generate and solve puzzles"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -6369,7 +6369,7 @@ self: { ]; executableSystemDepends = [ libX11 ]; description = "Generates colorful wallpapers"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {inherit (pkgs.xorg) libX11;}; "Fractaler" = callPackage @@ -6385,8 +6385,8 @@ self: { executableHaskellDepends = [ base FTGL GLFW-b OpenGLRaw parallel random time ]; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -6418,7 +6418,7 @@ self: { ]; benchmarkHaskellDepends = [ base criterion pipes transformers ]; description = "Data frames For working with tabular data files"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Frames-beam" = callPackage @@ -6441,8 +6441,8 @@ self: { generics-sop hspec hspec-core QuickCheck text vinyl ]; description = "A library for accessing Postgres tables as in-memory data structures"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -6460,8 +6460,8 @@ self: { ]; testHaskellDepends = [ base Frames hspec pipes ]; description = "Alternative CSV parser for the Frames package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -6482,8 +6482,8 @@ self: { base foldl Frames random text vector vinyl ]; description = "Frames wrapper for map-reduce-folds and some extra folds helpers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -6501,7 +6501,7 @@ self: { ]; testHaskellDepends = [ base Frames streamly text vinyl ]; description = "A streamly layer for Frames I/O"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Frank" = callPackage @@ -6514,8 +6514,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base mtl newtype she void ]; description = "An experimental programming language with typed algebraic effects"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -6530,8 +6530,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base freetype2 OpenGL ]; description = "Loadable texture fonts for OpenGL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -6549,7 +6549,7 @@ self: { libraryHaskellDepends = [ base base-compat GLUT OpenGL random ]; executableHaskellDepends = [ base GLUT OpenGL random ]; description = "A lightweight, cross-platform, OpenGL-based game engine"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Fungi" = callPackage @@ -6568,8 +6568,8 @@ self: { mwc-random old-time process random transformers tuple ]; description = "Funge-98 interpreter written in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -6581,7 +6581,7 @@ self: { sha256 = "1nsmpph27yv0anrhhfqbpdqs2rrdbhm0jxzs3kk6ab32zb3ivhp2"; libraryHaskellDepends = [ base directory random transformers ]; description = "Genetic algorithm library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "GGg" = callPackage @@ -6594,8 +6594,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base bimap ]; description = "GGg cipher"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -6608,7 +6608,7 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ array base process ]; description = "A graphical viewer for Hood"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "GLFW" = callPackage @@ -6620,8 +6620,8 @@ self: { libraryHaskellDepends = [ base OpenGL ]; librarySystemDepends = [ libGL libX11 libXext libXfixes ]; description = "A Haskell binding for GLFW"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXfixes;}; @@ -6636,8 +6636,8 @@ self: { libraryHaskellDepends = [ base mtl OGL ]; librarySystemDepends = [ libX11 libXrandr ]; description = "A binding for GLFW (OGL)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXrandr;}; @@ -6655,7 +6655,7 @@ self: { test-framework-hunit ]; description = "Bindings to GLFW OpenGL library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "GLFW-b-demo" = callPackage @@ -6672,8 +6672,8 @@ self: { base GLFW-b mtl OpenGL pretty stm transformers ]; description = "GLFW-b demo"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -6687,8 +6687,8 @@ self: { base GLFW monad-task OpenGL transformers ]; description = "GLFW utility functions to use together with monad-task"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -6701,7 +6701,7 @@ self: { libraryHaskellDepends = [ base ]; librarySystemDepends = [ libGL libX11 ]; description = "Open OpenGL context windows in X11 with libX11"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11;}; "GLM" = callPackage @@ -6729,7 +6729,7 @@ self: { test-framework-th ]; description = "Simple Gridlab-D GLM parser and utilities"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "GLMatrix" = callPackage @@ -6740,8 +6740,8 @@ self: { sha256 = "13n80rplyl73ahk8cxgvs9gf655l063sd55spx0zvhw774vvxwv4"; libraryHaskellDepends = [ base OpenGLRaw ]; description = "Utilities for working with OpenGL matrices"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -6754,7 +6754,7 @@ self: { libraryHaskellDepends = [ base OpenGLRaw transformers ]; librarySystemDepends = [ libGL libGLU ]; description = "A raw binding for the OpenGL graphics system"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) libGL; inherit (pkgs) libGLU;}; "GLUT" = callPackage @@ -6763,15 +6763,15 @@ self: { }: mkDerivation { pname = "GLUT"; - version = "2.7.0.15"; - sha256 = "0271vnf6wllhxjwy0m348x90kv27aybxcbqkkglmd5w4cpwjg5g9"; + version = "2.7.0.16"; + sha256 = "0vdkfj4wjzigdpzgr5l001y9wkhwgl00mclr26gf93kps14fkymn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base containers OpenGL StateVar transformers ]; description = "A binding for the OpenGL Utility Toolkit"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "GLUtil" = callPackage @@ -6791,7 +6791,7 @@ self: { ]; libraryToolDepends = [ hpp ]; description = "Miscellaneous OpenGL utilities"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "GPX" = callPackage @@ -6807,8 +6807,8 @@ self: { xsd ]; description = "Parse GPX files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -6826,8 +6826,8 @@ self: { transformers ]; description = "Typesafe functional GPU graphics programming"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -6841,8 +6841,8 @@ self: { array base containers GPipe HaXml mtl Vec ]; description = "Load GPipe meshes from Collada files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -6861,7 +6861,7 @@ self: { ]; description = "Examples for the GPipes package"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -6874,8 +6874,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ async base containers GLFW-b GPipe stm ]; description = "GLFW OpenGL context creation for GPipe"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -6887,8 +6887,8 @@ self: { sha256 = "1yf74k3yvpj42ynivlkacp5zwxwsx3yyfxb2436ljrv3339kjkb4"; libraryHaskellDepends = [ base bitmap GPipe stb-image ]; description = "Load GPipe textures from filesystem"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -6907,8 +6907,8 @@ self: { base HUnit test-framework test-framework-hunit ]; description = "A library for GTA programming"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -6930,8 +6930,8 @@ self: { ]; libraryToolDepends = [ cpphs ]; description = "Some kind of game library or set of utilities"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -6949,8 +6949,8 @@ self: { base containers directory filepath mtl parsec transformers ]; description = "An Io interpreter in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -6962,7 +6962,7 @@ self: { sha256 = "0v91q0m90338qpxg4hnvb7n6vm1jap3y1rvn9kyzmnxh03rarpx2"; libraryHaskellDepends = [ base ]; description = "Non-adaptive Gaussian quadrature for numeric integraton"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "GeBoP" = callPackage @@ -6978,8 +6978,8 @@ self: { array base directory random wx wxcore ]; description = "Several games"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -7014,7 +7014,7 @@ self: { ]; description = "A natural language generator (specifically, an FB-LTAG surface realiser)"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -7028,8 +7028,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base haskell98 QuickCheck random ]; description = "Automatic SMS message generator"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -7049,7 +7049,7 @@ self: { executableHaskellDepends = [ base cmdargs ]; description = "Libary for processing the NCBI genbank format"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -7075,8 +7075,8 @@ self: { base QuickCheck tasty tasty-quickcheck tasty-th vector ]; description = "Hox gene clustering"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -7090,8 +7090,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base ]; description = "A general TicTacToe game implementation"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -7103,7 +7103,7 @@ self: { sha256 = "0g5frpzq8hr2wqbf91cxcyxqqsw06p1w9f1sm3k6v1hz13kpmspf"; libraryHaskellDepends = [ base ghc-prim pretty ]; description = "A generic, derivable, haskell pretty printer"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "GenussFold" = callPackage @@ -7130,8 +7130,8 @@ self: { test-framework-th ]; description = "MCFGs for Genus-1 RNA Pseudoknots"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -7144,7 +7144,7 @@ self: { libraryHaskellDepends = [ base bytestring bytestring-mmap syb ]; description = "Pure bindings for the MaxMind IP database"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "GeocoderOpenCage" = callPackage @@ -7157,7 +7157,7 @@ self: { libraryHaskellDepends = [ aeson base bytestring HTTP text ]; description = "Geocoder and Reverse Geocoding Service Wrapper"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -7169,7 +7169,7 @@ self: { sha256 = "1nb0q5hs9qqgygw35rbvanbjf9l6vjxrl6l4jp9dqwlnl1kdd88q"; libraryHaskellDepends = [ base ]; description = "Geodetic calculations"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "GeomPredicates" = callPackage @@ -7180,7 +7180,7 @@ self: { sha256 = "19scirh2hy9y9kv16pcp44v31cs3868ig28r8blj39gdv4wqxwcy"; libraryHaskellDepends = [ base ]; description = "Geometric predicates"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "GeomPredicates-SSE" = callPackage @@ -7191,8 +7191,8 @@ self: { sha256 = "18mdaf2j1svklka5ms9ihj07d9l92ivqjk0y8jv0l9ni44hrhxcq"; libraryHaskellDepends = [ base GeomPredicates ]; description = "Geometric predicates (Intel SSE)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -7205,8 +7205,8 @@ self: { libraryHaskellDepends = [ base constraints singletons ]; testHaskellDepends = [ base constraints singletons ]; description = "get stuff out of stuff"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -7219,7 +7219,7 @@ self: { libraryHaskellDepends = [ base text ]; description = "A Haskell implementation of a Generalized Search Tree (GiST)"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -7245,8 +7245,8 @@ self: { haskell-gi-base process temporary text transformers ]; description = "GIF creation utility"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -7258,7 +7258,7 @@ self: { sha256 = "10f9yl62gwnjmb0mbfffdzhwscpwpvq9gj52zsrz8w6z6sbkijbf"; libraryHaskellDepends = [ base directory extra old-time process ]; description = "to auto-do somethings"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "Gleam" = callPackage @@ -7269,8 +7269,8 @@ self: { sha256 = "08nabgn7v0rw4aihbihbijqgajrvyc7z7nl67jmka39fh5zm6blm"; libraryHaskellDepends = [ base mtl split threepenny-gui ]; description = "HTML Canvas graphics, animations and simulations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -7293,7 +7293,7 @@ self: { transformers transformers-compat ]; description = "Globbing library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "GlomeTrace" = callPackage @@ -7305,7 +7305,7 @@ self: { libraryHaskellDepends = [ array base GlomeVec ]; description = "Ray Tracing Library"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -7336,7 +7336,7 @@ self: { ]; description = "SDL Frontend for Glome ray tracer"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -7348,7 +7348,7 @@ self: { sha256 = "0wfabsdn4agmg459srnknkwqb7ri5knj9npzgzhilybwrrqq46v9"; libraryHaskellDepends = [ base ]; description = "Generate web-based charts using the Google Chart API"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "GoogleCodeJam" = callPackage @@ -7363,8 +7363,8 @@ self: { array base containers mtl parallel safe split transformers ]; description = "A monad for flexible parsing of Google Code Jam input files with automatic parallelization"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -7380,8 +7380,8 @@ self: { AttoJson base bytestring containers dataenc download-curl ]; description = "Haskell Interface to Google Directions API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -7397,8 +7397,8 @@ self: { base binary Crypto haskell98 HTTP mtl network split ]; description = "Interface to Google Safe Browsing API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -7412,7 +7412,7 @@ self: { base dataenc download-curl utf8-string xml ]; description = "Interface to Google Suggest API"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "GoogleTranslate" = callPackage @@ -7426,8 +7426,8 @@ self: { AttoJson base bytestring dataenc download-curl ]; description = "Interface to Google Translate API"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -7439,8 +7439,8 @@ self: { sha256 = "1w1w1p2cpndiilr002whm58bzqjh9cp9lw3jl7khdxh20c1dfzhy"; libraryHaskellDepends = [ base transformers ]; description = "A monad and monadic transformer providing \"goto\" functionality"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -7452,8 +7452,8 @@ self: { sha256 = "167lr6ps5yy3243zfa4nl1jq369xcrrspcglz9xgnx2q1z305w8x"; libraryHaskellDepends = [ base ]; description = "Grafos Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -7476,8 +7476,8 @@ self: { ]; testHaskellDepends = [ base ]; description = "Grammar products and higher-dimensional grammars"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -7496,8 +7496,8 @@ self: { ]; executableHaskellDepends = [ array base mtl ]; description = "Graph500 benchmark-related definitions and data set generator"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -7512,8 +7512,8 @@ self: { array base containers Graph500 mtl stm time ]; description = "GraphHammer Haskell graph analyses framework inspired by STINGER"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -7531,8 +7531,8 @@ self: { array base containers Graph500 GraphHammer mtl ]; description = "Test harness for TriangleCount analysis"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -7544,7 +7544,7 @@ self: { sha256 = "1wbcx3wb02adb7l4nchxla3laliz0h5q074vfw4z0ic833k977bq"; libraryHaskellDepends = [ array base containers ]; description = "Tarjan's algorithm for computing the strongly connected components of a graph"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Graphalyze" = callPackage @@ -7561,7 +7561,7 @@ self: { ]; description = "Graph-Theoretic Analysis library"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "Grempa" = callPackage @@ -7576,8 +7576,8 @@ self: { array base containers mtl QuickCheck template-haskell th-lift ]; description = "Embedded grammar DSL and LALR parser generator"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -7595,8 +7595,8 @@ self: { test-framework-quickcheck2 ]; description = "Parser and selection library for expression languages"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -7619,7 +7619,7 @@ self: { ]; description = "A declarative make-like interpreter"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "GrowlNotify" = callPackage @@ -7639,8 +7639,8 @@ self: { base binary bytestring Crypto haskell98 network ]; description = "Notification utility for Growl"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -7657,7 +7657,7 @@ self: { ]; description = "Convenience functions to extend Gtk2hs"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -7673,8 +7673,8 @@ self: { base bitmap bitmap-opengl gtk gtkglext GtkTV OpenGL stb-image time ]; description = "OpenGL support for Gtk-based GUIs for Tangible Values"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -7688,8 +7688,8 @@ self: { base gtk time TV TypeCompose vector-space ]; description = "Gtk-based GUIs for Tangible Values"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -7708,8 +7708,8 @@ self: { proplang ]; description = "A graphical REPL and development environment for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -7721,8 +7721,8 @@ self: { sha256 = "15mndbxm83q0d8ci3vj51zwrmzl0f5i5yqv0caw05vlzfsr4ib5i"; libraryHaskellDepends = [ base DeepArrow phooey TV TypeCompose ]; description = "GUIs for Tangible Values"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -7743,8 +7743,8 @@ self: { temporary vector ]; description = "The Haskell/R mixed programming environment"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -7769,8 +7769,8 @@ self: { utility-ht vector ]; description = "Hierarchical adaptive Bayesian quantum tomography for quantum bits"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -7786,7 +7786,7 @@ self: { executableHaskellDepends = [ array base ]; description = "A simple ARM emulator in haskell"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "HAppS-Data" = callPackage @@ -7802,8 +7802,8 @@ self: { syb-with-class template-haskell ]; description = "HAppS data manipulation libraries"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -7819,8 +7819,8 @@ self: { base containers HAppS-Data HAppS-State HAppS-Util hslogger mtl syb syb-with-class template-haskell ]; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -7841,8 +7841,8 @@ self: { xhtml ]; description = "Web related tools and services"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -7862,8 +7862,8 @@ self: { random stm syb template-haskell unix ]; description = "Event-based distributed state"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -7880,8 +7880,8 @@ self: { template-haskell ]; description = "Web framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -7893,7 +7893,7 @@ self: { sha256 = "1hwxh60b26chcd466vlpxc7hx3smdnfl40mfxpyh8j1597v2aqa3"; doHaddock = false; description = "OBSOLETE. Please use happstack-helpers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "HCL" = callPackage @@ -7914,8 +7914,8 @@ self: { base containers HUnit mtl QuickCheck random ]; description = "High-level library for building command line interfaces"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -7929,8 +7929,8 @@ self: { base mtl QuickCheck random random-shuffle ]; description = "A library for implementing a Deck of Cards"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -7949,7 +7949,7 @@ self: { array base bytestring fail QuickCheck random semigroups ]; description = "A library to read, write and manipulate MIDI, WAVE, and SoundFont2 files"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "HDBC" = callPackage @@ -7967,7 +7967,7 @@ self: { utf8-string ]; description = "Haskell Database Connectivity"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "HDBC-mysql" = callPackage @@ -7983,7 +7983,7 @@ self: { librarySystemDepends = [ mysqlclient openssl zlib ]; description = "MySQL driver for HDBC"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {mysqlclient = null; inherit (pkgs) openssl; inherit (pkgs) zlib;}; @@ -8003,7 +8003,7 @@ self: { ]; librarySystemDepends = [ unixODBC ]; description = "ODBC driver for HDBC"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) unixODBC;}; "HDBC-postgresql" = callPackage @@ -8023,7 +8023,7 @@ self: { ]; librarySystemDepends = [ postgresql ]; description = "PostgreSQL driver for HDBC"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) postgresql;}; "HDBC-postgresql-hstore" = callPackage @@ -8034,8 +8034,8 @@ self: { sha256 = "0657a1qy51bihh9gvpwpqpm4gch68rw32plnjcfdbc37yjq5dj1d"; libraryHaskellDepends = [ attoparsec base containers HDBC text ]; description = "Manipulate data in PostgreSQL \"hstore\" columns"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -8047,7 +8047,7 @@ self: { sha256 = "1qwnqb62zgmm4dy5qlcj04aczja6yn16c92jc63zkln9pcc7y1da"; libraryHaskellDepends = [ base HDBC ]; description = "Bracketed connection for HDBC"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "HDBC-sqlite3" = callPackage @@ -8062,7 +8062,7 @@ self: { libraryHaskellDepends = [ base bytestring HDBC mtl utf8-string ]; librarySystemDepends = [ sqlite ]; description = "Sqlite v3 driver for HDBC"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) sqlite;}; "HDRUtils" = callPackage @@ -8076,8 +8076,8 @@ self: { libraryHaskellDepends = [ array base colour containers mtl unix ]; librarySystemDepends = [ pfstools ]; description = "Utilities for reading, manipulating, and writing HDR images"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) pfstools;}; @@ -8089,8 +8089,8 @@ self: { sha256 = "08lry7w4zb7j81q9d7rjpz0chcbr9laxi4h9dz327pfcgmy083sy"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ mpfr ]; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) mpfr;}; @@ -8107,8 +8107,8 @@ self: { ]; librarySystemDepends = [ xlsxwriter zlib ]; description = "Create Excel files with Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {xlsxwriter = null; inherit (pkgs) zlib;}; @@ -8130,8 +8130,8 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "The library for generating a graphical interface on the web"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -8143,8 +8143,8 @@ self: { sha256 = "09h6wfalziw39c2sghj8qw82vyvnl01qlsam6ngkfkdirgj5sg5h"; libraryHaskellDepends = [ base c-storable-deriving ]; description = "A Queue with a random (weighted) pick function"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -8162,8 +8162,8 @@ self: { sed -i -e "s@ Extra-Lib-Dirs: /usr/local/lib@ Extra-Lib-Dirs: ${fuse}/lib@" HFuse.cabal ''; description = "HFuse is a binding for the Linux FUSE library"; - license = stdenv.lib.licenses.bsd3; - platforms = [ "i686-linux" "x86_64-linux" ]; + license = lib.licenses.bsd3; + platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) fuse;}; "HGE2D" = callPackage @@ -8179,8 +8179,8 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "2D game engine written in Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -8192,7 +8192,7 @@ self: { sha256 = "087k8i0bha3mzpqa3z3c6npl5vmccg7xcwl28lbv0yzbvj1qkg38"; libraryHaskellDepends = [ array base stm X11 ]; description = "A simple graphics library based on X11 or Win32"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "HGamer3D" = callPackage @@ -8210,7 +8210,7 @@ self: { ]; description = "Toolset for the Haskell Game Programmer"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "HGamer3D-API" = callPackage @@ -8227,7 +8227,7 @@ self: { ]; description = "Library to enable 3D game development for Haskell - API"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "HGamer3D-Audio" = callPackage @@ -8243,7 +8243,7 @@ self: { ]; description = "Toolset for the Haskell Game Programmer - Audio Functionality"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "HGamer3D-Bullet-Binding" = callPackage @@ -8255,7 +8255,7 @@ self: { libraryHaskellDepends = [ base HGamer3D-Data ]; description = "Windows Game Engine for the Haskell Programmer - Bullet Bindings"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "HGamer3D-CAudio-Binding" = callPackage @@ -8269,7 +8269,7 @@ self: { librarySystemDepends = [ HGamer3DCAudio015 ]; description = "Library to enable 3D game development for Haskell - cAudio Bindings"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {HGamer3DCAudio015 = null;}; "HGamer3D-CEGUI-Binding" = callPackage @@ -8286,7 +8286,7 @@ self: { ]; description = "A Toolset for the Haskell Game Programmer - CEGUI Bindings"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {CEGUIBase = null; CEGUIOgreRenderer = null; hg3dcegui050 = null;}; @@ -8304,7 +8304,7 @@ self: { ]; description = "Toolset for the Haskell Game Programmer - Game Engine and Utilities"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "HGamer3D-Data" = callPackage @@ -8320,7 +8320,7 @@ self: { ]; description = "Toolset for the Haskell Game Programmer - Data Definitions"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "HGamer3D-Enet-Binding" = callPackage @@ -8333,7 +8333,7 @@ self: { librarySystemDepends = [ enet hg3denet050 ]; description = "Enet Binding for HGamer3D"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) enet; hg3denet050 = null;}; "HGamer3D-GUI" = callPackage @@ -8349,7 +8349,7 @@ self: { ]; description = "GUI Functionality for HGamer3D"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "HGamer3D-Graphics3D" = callPackage @@ -8369,7 +8369,7 @@ self: { ]; description = "Toolset for the Haskell Game Programmer - 3D Graphics Functionality"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "HGamer3D-InputSystem" = callPackage @@ -8386,7 +8386,7 @@ self: { ]; description = "Joystick, Mouse and Keyboard Functionality for HGamer3D"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "HGamer3D-Network" = callPackage @@ -8402,7 +8402,7 @@ self: { ]; description = "Networking Functionality for HGamer3D"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "HGamer3D-OIS-Binding" = callPackage @@ -8419,7 +8419,7 @@ self: { librarySystemDepends = [ HGamer3DOIS015 ]; description = "Library to enable 3D game development for Haskell - OIS Bindings"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {HGamer3DOIS015 = null;}; "HGamer3D-Ogre-Binding" = callPackage @@ -8438,7 +8438,7 @@ self: { ]; description = "Ogre Binding for HGamer3D"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {OgreMain = null; OgrePaging = null; OgreProperty = null; OgreRTShaderSystem = null; OgreTerrain = null; hg3dogre050 = null;}; @@ -8457,7 +8457,7 @@ self: { librarySystemDepends = [ hg3dsdl2050 libX11 SDL2 ]; description = "SDL2 Binding for HGamer3D"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) SDL2; hg3dsdl2050 = null; inherit (pkgs.xorg) libX11;}; @@ -8475,7 +8475,7 @@ self: { ]; description = "SFML Binding for HGamer3D"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {hg3dsfml050 = null; sfml-audio = null; sfml-network = null; sfml-system = null; sfml-window = null;}; @@ -8491,7 +8491,7 @@ self: { ]; description = "Windowing and Event Functionality for HGamer3D"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "HGamer3D-Wire" = callPackage @@ -8509,7 +8509,7 @@ self: { ]; description = "Wire Functionality for HGamer3D"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "HGraphStorage" = callPackage @@ -8539,8 +8539,8 @@ self: { transformers zlib ]; description = "Graph database stored on disk"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -8552,8 +8552,8 @@ self: { sha256 = "1215nz6l3bbkld2fqqsc494xw4qw4vqavznaqxgja2p60w9mwg0q"; libraryHaskellDepends = [ base containers mtl template-haskell ]; description = "Hardware Description Language embedded in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -8565,8 +8565,8 @@ self: { sha256 = "0xvhzmsl1z6im36svjhcl4zlbnmpknlfn0m426cj5l06a3c5mfa8"; libraryHaskellDepends = [ base HJavaScript hsp mtl text ]; description = "HJScript is a Haskell EDSL for writing JavaScript programs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -8589,8 +8589,8 @@ self: { test-framework-hunit transformers ]; description = "A library to create a Java Virtual Machine and manipulate Java objects"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) jdk;}; @@ -8604,8 +8604,8 @@ self: { editedCabalFile = "05m2kgz0laxv9jl1qfc1sxndan9503010y3aadvfcsxi9cyg3j1j"; libraryHaskellDepends = [ base pretty ]; description = "HJavaScript is an abstract syntax for a typed subset of JavaScript"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -8625,8 +8625,8 @@ self: { parallel random template-haskell vector vector-heterogenous ]; description = "Algebraic foundation for homomorphic learning"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -8645,8 +8645,8 @@ self: { base ConstraintKinds containers heap HLearn-algebra HLearn-datastructures HLearn-distributions list-extras vector ]; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -8669,8 +8669,8 @@ self: { math-functions MonadRandom normaldistribution parsec primitive QuickCheck statistics vector vector-th-unbox ]; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -8686,8 +8686,8 @@ self: { base ConstraintKinds containers deepseq HLearn-algebra list-extras MonadRandom QuickCheck vector ]; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -8711,8 +8711,8 @@ self: { statistics template-haskell vector vector-th-unbox ]; description = "Distributions for use with the HLearn library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -8738,8 +8738,8 @@ self: { mtl process QuickCheck semigroups syb template-haskell ]; description = "Heterogeneous lists"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -8753,7 +8753,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base regex-applicative ]; description = "A preprocessor for HList labelable labels"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "HLogger" = callPackage @@ -8767,8 +8767,8 @@ self: { libraryHaskellDepends = [ base old-locale time ]; executableHaskellDepends = [ base old-locale time ]; description = "Simple, concurrent and easy-to-use logging library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -8779,8 +8779,8 @@ self: { version = "0.2.1"; sha256 = "01y8l76c56gysynbilp32yq0wfc129hl24siw8s9fmpn98qa71s6"; description = "A hidden markov model library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -8797,7 +8797,7 @@ self: { base data-default hashable mtl unordered-containers ]; description = "Fast heterogeneous maps and unconstrained typeable-like functionality"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "HMarkov" = callPackage @@ -8814,7 +8814,7 @@ self: { vector ]; description = "Markov-generated sequences"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "HNM" = callPackage @@ -8836,8 +8836,8 @@ self: { base containers glib gtk haskell98 mtl process regex-posix unix ]; description = "Happy Network Manager"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -8856,7 +8856,7 @@ self: { base math-functions parallel parallel-io random ]; description = "Haskell Numeric Library with pure functionality, R & MATLAB Syntax"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "HODE" = callPackage @@ -8868,8 +8868,8 @@ self: { libraryHaskellDepends = [ array base ]; librarySystemDepends = [ ode ]; description = "Binding to libODE"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) ode;}; @@ -8886,8 +8886,8 @@ self: { executableHaskellDepends = [ base ]; executablePkgconfigDepends = [ opencv ]; description = "A binding for the OpenCV computer vision library"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) opencv;}; @@ -8912,8 +8912,8 @@ self: { ]; testHaskellDepends = [ base HTF ]; description = "Generation of PDF documents"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -8936,8 +8936,8 @@ self: { parsec utf8-string ]; description = "Extract Haskell declarations by name"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -8955,7 +8955,7 @@ self: { testHaskellDepends = [ base hspec ]; description = "Phone number parser and validator - This is now DEPRECATED!"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "HPi" = callPackage @@ -8967,8 +8967,8 @@ self: { libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ bcm2835 ]; description = "GPIO, I2C and SPI functions for the Raspberry Pi"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {bcm2835 = null;}; @@ -8986,8 +8986,8 @@ self: { executableHaskellDepends = [ base glade glib gtk ]; executablePkgconfigDepends = [ plplotd-gnome2 ]; description = "A minimal monadic PLplot interface for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {plplotd-gnome2 = null;}; @@ -9007,7 +9007,7 @@ self: { ]; description = "A simple OpenGL Pong game based on GLFW"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -9025,8 +9025,8 @@ self: { HROOT-io HROOT-math HROOT-tree template-haskell ]; description = "Haskell binding to the ROOT data analysis framework"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -9040,8 +9040,8 @@ self: { base fficxx fficxx-runtime template-haskell ]; description = "Haskell binding to ROOT Core modules"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -9057,8 +9057,8 @@ self: { base fficxx fficxx-runtime HROOT-core HROOT-hist template-haskell ]; description = "Haskell binding to ROOT Graf modules"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -9074,8 +9074,8 @@ self: { base fficxx fficxx-runtime HROOT-core template-haskell ]; description = "Haskell binding to ROOT Hist modules"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -9091,8 +9091,8 @@ self: { base fficxx fficxx-runtime HROOT-core template-haskell ]; description = "Haskell binding to ROOT IO modules"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -9108,8 +9108,8 @@ self: { base fficxx fficxx-runtime HROOT-core template-haskell ]; description = "Haskell binding to ROOT Math modules"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -9125,8 +9125,8 @@ self: { base fficxx fficxx-runtime HROOT-core template-haskell ]; description = "Haskell binding to ROOT Tree modules"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -9141,8 +9141,8 @@ self: { enableSeparateDataOutput = true; executableHaskellDepends = [ array base directory haskell98 ]; description = "Haskell raytracer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -9163,8 +9163,8 @@ self: { array base Cabal containers directory filepath parsec process unix ]; description = "Generate FFI import declarations from C include files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -9183,8 +9183,8 @@ self: { ]; executableHaskellDepends = [ csv ]; description = "Gene Expression Programming evolutionary algorithm in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -9222,7 +9222,7 @@ self: { ]; description = "Convenience functions that use HSH, instances for HSH"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -9234,8 +9234,8 @@ self: { sha256 = "0snix2qdj1d66v6qj6fl0zizl617kjzbmxiswdd5i0b5lzjkpagb"; libraryHaskellDepends = [ base containers hashable hashtables ]; description = "Faux heterogeneous sets"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -9247,7 +9247,7 @@ self: { sha256 = "03gb5dd59mirwb11b98vbg60w2zwfsbr8akk7qbq01z7n7rkgsr7"; libraryHaskellDepends = [ base ]; description = "OpenStreetMap Slippy Map"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "HSmarty" = callPackage @@ -9266,8 +9266,8 @@ self: { ]; testHaskellDepends = [ aeson attoparsec base HTF text ]; description = "Small template engine"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -9284,7 +9284,7 @@ self: { markov-chain pure-fft random UISF ]; description = "Library for computer music education"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "HSoundFile" = callPackage @@ -9299,8 +9299,8 @@ self: { base binary bytestring filepath haskell98 mtl parallel ]; description = "Audio file reading/writing"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -9321,7 +9321,7 @@ self: { template-haskell text time void ]; description = "StringTemplate implementation in Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "HStringTemplateHelpers" = callPackage @@ -9338,7 +9338,7 @@ self: { ]; description = "Convenience functions and instances for HStringTemplate"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -9350,7 +9350,7 @@ self: { sha256 = "0vij1xp3gm7s0d5hqlpl6jm949gpimaxz8cr3njaa4kkgpw8yd4g"; libraryHaskellDepends = [ base containers ]; description = "Haskell Bindings for libsvm"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "HTF" = callPackage @@ -9363,8 +9363,8 @@ self: { }: mkDerivation { pname = "HTF"; - version = "0.14.0.3"; - sha256 = "138gh5a2nx25czhp9qpaav2lq7ff142q4n6sbkrglfsyn48rifqp"; + version = "0.14.0.5"; + sha256 = "1hgkymgb8v3f5s7i8nn01iml8mqvah4iyqiqcflj3ffbjb93v1zd"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal process ]; @@ -9385,8 +9385,8 @@ self: { unordered-containers ]; description = "The Haskell Test Framework"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -9409,7 +9409,7 @@ self: { pureMD5 split test-framework test-framework-hunit ]; description = "A library for client-side HTTP"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "HTTP-Simple" = callPackage @@ -9421,7 +9421,7 @@ self: { libraryHaskellDepends = [ base HTTP network ]; doHaddock = false; description = "DEPRECATED Enable simple wrappers to Network.HTTP"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "HTab" = callPackage @@ -9439,8 +9439,8 @@ self: { base cmdargs containers deepseq hylolib mtl random strict ]; description = "Tableau based theorem prover for hybrid logics"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -9458,8 +9458,8 @@ self: { array base mtl random SDL SDL-image SDL-ttf ]; description = "An SDL tic-tac-toe game"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -9469,10 +9469,25 @@ self: { pname = "HUnit"; version = "1.6.1.0"; sha256 = "1rpi52rnjpyv379rm6n3s706z6mv114aychf03dq456wfa4b7123"; + revision = "1"; + editedCabalFile = "1pb42lix1fzhvcc2g7kz5lw8fsz6kcj9b7almr7kvv38f8vmbn5i"; + libraryHaskellDepends = [ base call-stack deepseq ]; + testHaskellDepends = [ base call-stack deepseq filepath ]; + description = "A unit testing framework for Haskell"; + license = lib.licenses.bsd3; + }) {}; + + "HUnit_1_6_2_0" = callPackage + ({ mkDerivation, base, call-stack, deepseq, filepath }: + mkDerivation { + pname = "HUnit"; + version = "1.6.2.0"; + sha256 = "1as4sw5y39c3zrmr6sb8zbw74c9gdn4401y0dx45ih7zf6457dxh"; libraryHaskellDepends = [ base call-stack deepseq ]; testHaskellDepends = [ base call-stack deepseq filepath ]; description = "A unit testing framework for Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "HUnit-Diff" = callPackage @@ -9483,8 +9498,8 @@ self: { sha256 = "0dlsx6qicnrqkhb52jbgh31f0y6lxh32yl5gr6bg3fnqr36vc6x6"; libraryHaskellDepends = [ ansi-terminal base Diff groom HUnit ]; description = "Assertions for HUnit with difference reporting"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -9506,7 +9521,7 @@ self: { parsec text time timeit unordered-containers ]; description = "A test framework building on HUnit"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "HUnit-approx" = callPackage @@ -9518,7 +9533,7 @@ self: { libraryHaskellDepends = [ base call-stack HUnit ]; testHaskellDepends = [ base call-stack HUnit ]; description = "Approximate equality for floating point numbers with HUnit"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "HXMPP" = callPackage @@ -9544,8 +9559,8 @@ self: { xml-enumerator xml-types ]; description = "A (prototyped) easy to use XMPP library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -9563,8 +9578,8 @@ self: { template-haskell ]; description = "A Compiler from XQuery to Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -9579,8 +9594,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base HUnit mtl QuickCheck ]; description = "HaLeX enables modelling, manipulation and visualization of regular languages"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -9592,8 +9607,8 @@ self: { sha256 = "0q7fq5z0wrk2qg9n715033yp25dpl73g6iqkbvxbg2ahp9caq458"; libraryHaskellDepends = [ base bytestring serialport stm ]; description = "An Haskell library to drive the french Minitel through a serial port"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -9605,8 +9620,8 @@ self: { sha256 = "0li04k27pkq7ci1dfx4sl022ivl4gjqy5ny25jszifwrx4n4pmwz"; libraryHaskellDepends = [ base template-haskell th-lift ]; description = "Haskell bindings for Python"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -9641,8 +9656,8 @@ self: { parsec turtle ]; description = "the Haskell Refactorer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -9663,7 +9678,7 @@ self: { base parsec QuickCheck tasty tasty-quickcheck text ]; description = "The Haskell LaTeX library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "HaTeX-meta" = callPackage @@ -9681,8 +9696,8 @@ self: { haskell-src-exts mtl parsec ]; description = "This package is deprecated. From version 3, HaTeX does not need this anymore."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -9698,8 +9713,8 @@ self: { antiquoter base haskell-src-meta HaTeX template-haskell text ]; description = "Quasiquoters for HaTeX"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -9719,8 +9734,8 @@ self: { test-framework-quickcheck ]; description = "An implementation of the Version Space Algebra learning framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -9757,8 +9772,8 @@ self: { libraryHaskellDepends = [ base containers network old-locale ]; executableHaskellDepends = [ text time vty vty-ui ]; description = "Simple chat"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -9779,8 +9794,8 @@ self: { base Crypto directory hdaemonize hint mtl old-time parsec ]; description = "A Procmail Replacement as Haskell EDSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -9798,8 +9813,8 @@ self: { ]; testHaskellDepends = [ base Cabal containers HUnit tuple vector ]; description = "Aggression analysis for Tweets on Twitter"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -9811,8 +9826,8 @@ self: { sha256 = "1jp8cwlp6h1wvvkh71813i3lzxc7ckxzc7nvvcsjvcz0apxcl7vv"; libraryHaskellDepends = [ base bytestring network ]; description = "Haskell implementation of a HandlerSocket client (API)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -9833,7 +9848,7 @@ self: { ]; testHaskellDepends = [ base hspec hxt ]; description = "Work with HTML more easily in HXT"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Hangman" = callPackage @@ -9847,8 +9862,8 @@ self: { executableHaskellDepends = [ base random transformers ]; testHaskellDepends = [ base hspec transformers ]; description = "The classic game of Hangman"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -9866,8 +9881,8 @@ self: { base constraints generics-sop safe singletons ]; description = "Type Safe and End to End Decision Tree"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -9891,8 +9906,8 @@ self: { process sox template-haskell uu-parsinglib vector ]; description = "Harmony Analysis and Retrieval of Music"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -9914,7 +9929,7 @@ self: { uu-parsinglib ]; description = "Parsing and unambiguously representing musical chords"; - license = stdenv.lib.licenses.lgpl3; + license = lib.licenses.lgpl3; }) {}; "HasBigDecimal" = callPackage @@ -9926,7 +9941,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "A library for arbitrary precision decimal numbers"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "HasCacBDD" = callPackage @@ -9942,8 +9957,8 @@ self: { librarySystemDepends = [ CacBDD ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "Haskell bindings for CacBDD"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {CacBDD = null;}; @@ -9960,8 +9975,8 @@ self: { base haskell98 hmatrix hmatrix-special mtl parsec random ]; description = "A Haskell library for inference using Gaussian processes"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -9980,8 +9995,8 @@ self: { array base list-tries monad-loops mtl numbers parsec ]; description = "Minimalist R5RS Scheme interpreter"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -10001,7 +10016,7 @@ self: { ]; description = "Simple shell written in Haskell"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -10018,8 +10033,8 @@ self: { base containers directory ghc-prim HList tagged ]; description = "HaskRel, Haskell as a DBMS with support for the relational algebra"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -10043,8 +10058,8 @@ self: { graphviz haskell-src-exts HUnit pretty split syb text vector ]; description = "Haskell source code analysis program"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -10056,7 +10071,7 @@ self: { sha256 = "1jgim9g0jbv6k31aalq0yps843jmfx74k53lnd1p79kgad7670rz"; libraryHaskellDepends = [ array base containers random ]; description = "Combinatorics, group theory, commutative algebra, non-commutative algebra"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "HaskellLM" = callPackage @@ -10068,7 +10083,7 @@ self: { libraryHaskellDepends = [ base hmatrix ]; description = "Pure Haskell implementation of the Levenberg-Marquardt algorithm"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -10081,7 +10096,7 @@ self: { libraryHaskellDepends = [ base hmatrix random ]; description = "High Performance Neural Network in Haskell"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -10098,8 +10113,8 @@ self: { network-bsd old-time pretty text ]; description = "Client support for POP3, SMTP, and IMAP"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -10116,8 +10131,8 @@ self: { base bytestring connection data-default HaskellNet network tls ]; description = "Helpers to connect to SSL/TLS mail servers with HaskellNet"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -10141,8 +10156,8 @@ self: { test-framework-quickcheck2 time ]; description = "A concurrent bittorrent client"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -10156,8 +10171,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base cmdargs text ]; description = "Haskell Tutorials by Evgeny Ukhanov"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -10175,8 +10190,8 @@ self: { base containers HGL hmatrix MonadRandom random Yampa ]; description = "A reproduction of the Atari 1979 classic \"Asteroids\""; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -10195,7 +10210,7 @@ self: { text transformers ]; description = "mastodon client module for Haskell"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "Hate" = callPackage @@ -10218,8 +10233,8 @@ self: { random transformers vect vect-opengl vector ]; description = "A small 2D game framework"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -10241,8 +10256,8 @@ self: { network regex-posix SHA template-haskell time utf8-string ]; description = "Haskell Web Application Kit"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -10269,8 +10284,8 @@ self: { snap-core snap-server tar text transformers xhtml-combinators zlib ]; description = "The Hayoo! search engine for Haskell API search on hackage"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -10282,7 +10297,7 @@ self: { sha256 = "04ppwm7vfzndrys8x1n8vfb41vzwx59r9xp4dkbiqmrms390pj6q"; libraryHaskellDepends = [ base mtl process strict ]; description = "A small cross-platform library for reading and modifying the system clipboard"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Hedi" = callPackage @@ -10303,8 +10318,8 @@ self: { base editline mtl parsec pretty process QuickCheck regex-posix ]; description = "Line oriented editor"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -10323,8 +10338,8 @@ self: { ]; testHaskellDepends = [ base linear subhask ]; description = "automatically improve your code's numeric stability"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -10343,8 +10358,8 @@ self: { unamb yjtools ]; description = "Message-based middleware layer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -10362,8 +10377,8 @@ self: { gtkglext IfElse mtl OpenGL parallel pretty random ]; description = "Purely functional 2D graphics for visualization"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -10380,8 +10395,8 @@ self: { vector ]; description = "A multi-index set with advanced query capabilites"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -10396,7 +10411,7 @@ self: { ]; description = "A Haskell binding for Chipmunk"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "Hipmunk-Utils" = callPackage @@ -10408,8 +10423,8 @@ self: { libraryHaskellDepends = [ base Hipmunk linear StateVar ]; testHaskellDepends = [ base ]; description = "Useful functions for Hipmunk"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -10428,7 +10443,7 @@ self: { ]; description = "A playground for testing Hipmunk"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "Hish" = callPackage @@ -10447,8 +10462,8 @@ self: { executableHaskellDepends = [ base directory MissingH process regex-tdfa time ]; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -10459,7 +10474,7 @@ self: { version = "0.1.0.2"; sha256 = "00f0a3lbpc7s70lzmnf9a7hjzc3yv8nfxcvz5nparr34x585zbxl"; libraryHaskellDepends = [ base containers gnuplot ]; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Hmpf" = callPackage @@ -10477,7 +10492,7 @@ self: { ]; description = "An MPD client designed for a Home Theatre PC"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -10502,8 +10517,8 @@ self: { ]; testHaskellDepends = [ base process QuickCheck ]; description = "Lightweight algorithmic debugging"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -10515,7 +10530,7 @@ self: { sha256 = "0y29gnbxrlj9fh0d5naa7ia1xs36fimszcbzif2zdw451jkk97r9"; libraryHaskellDepends = [ base ]; description = "Monoids with holes"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Holumbus-Distribution" = callPackage @@ -10535,7 +10550,7 @@ self: { ]; description = "intra- and inter-program communication"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "Holumbus-MapReduce" = callPackage @@ -10557,7 +10572,7 @@ self: { ]; description = "a distributed MapReduce framework"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "Holumbus-Searchengine" = callPackage @@ -10577,8 +10592,8 @@ self: { SHA unix ]; description = "A search and indexing engine"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -10599,7 +10614,7 @@ self: { ]; description = "a distributed storage system"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "Homology" = callPackage @@ -10629,8 +10644,8 @@ self: { ]; testHaskellDepends = [ base process random ]; description = "A Simple Key Value Store"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -10644,7 +10659,7 @@ self: { testHaskellDepends = [ base doctest hspec ]; benchmarkHaskellDepends = [ base criterion ]; description = "Parser for host and port pairs like localhost:22"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "Hricket" = callPackage @@ -10657,8 +10672,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base containers ]; description = "A Cricket scoring application"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -10686,8 +10701,8 @@ self: { ]; testHaskellDepends = [ base directory filepath process ]; description = "A Library and Preprocessor that makes it easier to create shared libs from Haskell programs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -10699,7 +10714,7 @@ self: { sha256 = "1kdf2yq3v8lr84h2pf1ydi6vrqfr685vbkxjz4ai5wd2mij8i361"; libraryHaskellDepends = [ array base random ]; description = "A haskell interface to Lester Ingber's adaptive simulating annealing code"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "HsHTSLib" = callPackage @@ -10719,8 +10734,8 @@ self: { base bytestring conduit tasty tasty-golden tasty-hunit vector ]; description = "Bindings to htslib"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) zlib;}; @@ -10732,8 +10747,8 @@ self: { sha256 = "1yifhxk1m3z2i7gaxgwlmk6cv2spbpx8fny4sn59ybca8wd9z7ps"; libraryHaskellDepends = [ base ]; description = "Haskell binding to libharu (http://libharu.sourceforge.net/)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -10750,8 +10765,8 @@ self: { ]; libraryPkgconfigDepends = [ hyperestraier qdbm ]; description = "HyperEstraier binding for Haskell"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {hyperestraier = null; qdbm = null;}; @@ -10765,8 +10780,8 @@ self: { libraryHaskellDepends = [ base bytestring containers ]; librarySystemDepends = [ Judy ]; description = "Judy bindings, and some nice APIs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {Judy = null;}; @@ -10781,7 +10796,7 @@ self: { librarySystemDepends = [ openssl ]; testHaskellDepends = [ base bytestring ]; description = "Partial OpenSSL binding for Haskell"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {inherit (pkgs) openssl;}; "HsOpenSSL-x509-system" = callPackage @@ -10792,7 +10807,7 @@ self: { sha256 = "15mp70bqg1lzp971bzp6wym3bwzvxb76hzbgckygbfa722xyymhr"; libraryHaskellDepends = [ base bytestring HsOpenSSL unix ]; description = "Use the system's native CA certificate store with HsOpenSSL"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "HsParrot" = callPackage @@ -10806,8 +10821,8 @@ self: { base bytestring HsSyck pretty pugs-DrIFT ]; description = "Haskell integration with Parrot virtual machine"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -10819,8 +10834,8 @@ self: { sha256 = "15j8zm12lcp4gm8kmciw3xy7qckqmlygn0d2difsdb598y5ijz2z"; libraryHaskellDepends = [ base ]; description = "Haskell interface to embedded Perl 5 interpreter"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -10832,8 +10847,8 @@ self: { sha256 = "1yx4dzcjmykk4nzrh888jhikb8x635dpx7g27rgnlaiy5nid3pc7"; libraryHaskellDepends = [ base bytestring mtl stm ]; description = "Partial Subversion (SVN) binding for Haskell"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -10848,7 +10863,7 @@ self: { base bytestring hashtables syb utf8-string ]; description = "Fast, lightweight YAML loader and dumper"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "HsTools" = callPackage @@ -10859,7 +10874,7 @@ self: { sha256 = "0banfivx4xc0j3c1qmda31gvvrqqsg12fzizcpman2fvdlk7kn5l"; libraryHaskellDepends = [ base ghc-prim ]; description = "Haskell helper functions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "HsWebots" = callPackage @@ -10882,8 +10897,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Webots bindings for Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {Controller = null; driver = null;}; @@ -10907,7 +10922,7 @@ self: { text ]; description = "Pure Haskell YAML 1.2 processor"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }) {}; "HsYAML-aeson" = callPackage @@ -10925,7 +10940,7 @@ self: { unordered-containers vector ]; description = "JSON to YAML Adapter"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; }) {}; "Hsed" = callPackage @@ -10948,8 +10963,8 @@ self: { regex-posix ]; description = "Stream Editor in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -10967,8 +10982,8 @@ self: { base containers parsec pretty process smtLib transformers ]; description = "Haskell library for easy interaction with SMT-LIB 2 compliant solvers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -10984,8 +10999,8 @@ self: { aeson base containers lens lens-aeson mtl transformers wreq ]; description = "API for controlling Philips Hue lights"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -11003,8 +11018,8 @@ self: { executableHaskellDepends = [ base text ]; testHaskellDepends = [ base tasty tasty-golden ]; description = "Easily bulk import CSV data to SQL Server"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -11022,7 +11037,7 @@ self: { ]; benchmarkHaskellDepends = [ array base criterion Munkres random ]; description = "A Linear Sum Assignment Problem (LSAP) solver"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "Hydrogen" = callPackage @@ -11042,8 +11057,8 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "The library for generating a WebGL scene for the web"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -11058,8 +11073,8 @@ self: { libraryHaskellDepends = [ array base QuickCheck ]; 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; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -11071,8 +11086,8 @@ self: { sha256 = "1p4h2hxwzp0bxkzh864vkqbwychi0j2c3rqck9vk5kfax5i1jfz8"; libraryHaskellDepends = [ base containers directory ]; description = "Indexable, serializable form of Data.Dynamic"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -11088,8 +11103,8 @@ self: { array base bytestring containers random ]; description = "Iterated Function System generation for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -11110,7 +11125,7 @@ self: { ]; description = "Editor and interpreter for Interaction Nets"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -11123,8 +11138,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base mtl ]; description = "Region based resource management for the IO monad"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -11143,8 +11158,8 @@ self: { base bits-atomic ghc-prim HUnit QuickCheck time ]; description = "Atomic compare and swap for IORefs and STRefs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -11156,7 +11171,7 @@ self: { sha256 = "1w6f7jnjm4n0s4mr18yqv81rsnrh8f6806x523gnqljbyak18p1l"; libraryHaskellDepends = [ base mtl QuickCheck Stream ]; description = "A pure specification of the IO monad"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "IPv6Addr" = callPackage @@ -11174,7 +11189,7 @@ self: { base HUnit test-framework test-framework-hunit text ]; description = "Library to deal with IPv6 address text representations"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "IPv6DB" = callPackage @@ -11202,8 +11217,8 @@ self: { aeson base hspec http-client http-types vector ]; description = "A RESTful microService for IPv6-related data"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -11216,7 +11231,7 @@ self: { libraryHaskellDepends = [ array base GlomeVec ]; description = "Library for generating grids of hexagons and pentagons mapped to a sphere"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -11228,7 +11243,7 @@ self: { sha256 = "1kfx1bwfjczj93a8yqz1n8snqiq5655qgzwv1lrycry8wb1vzlwa"; libraryHaskellDepends = [ base mtl ]; description = "Anaphoric and miscellaneous useful control-flow"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Imlib" = callPackage @@ -11239,7 +11254,7 @@ self: { sha256 = "075x1vcrxdwknzbad05l08i5c79svf714yvv6990ffvsfykiilry"; libraryHaskellDepends = [ array base X11 ]; librarySystemDepends = [ imlib2 ]; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) imlib2;}; "ImperativeHaskell" = callPackage @@ -11250,8 +11265,8 @@ self: { sha256 = "06px87hc6gz7n372lvpbq0g2v2s0aghd3k5a1ajgn5hbxirhnpwb"; libraryHaskellDepends = [ base mtl template-haskell ]; description = "A library for writing Imperative style haskell"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -11274,8 +11289,8 @@ self: { sha256 = "1i7gv3iqjj4j026k0ywmksbpjyqxlgb0f6bq2v0p9pkrj5q3jxfm"; libraryHaskellDepends = [ base PeanoWitnesses ]; description = "Length- and element-indexed lists sitting somewhere between homogeneous and fully heterogeneous"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -11287,8 +11302,8 @@ self: { sha256 = "03c0jlnlnqm6faiandfg0kzajffk03aazkrqwav3g4vc3cdqwfgp"; libraryHaskellDepends = [ base haskell98 ]; description = "liftA2 for infix operators"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -11301,8 +11316,8 @@ self: { libraryHaskellDepends = [ base parsec QuickCheck ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "Convert integers in various bases to and from strings"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -11315,7 +11330,7 @@ self: { libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers ]; description = "Dynamically sized graph library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "InternedData" = callPackage @@ -11341,7 +11356,7 @@ self: { base bytestring containers criterion deepseq text ]; description = "Data interning (with compact regions where possible)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Interpolation" = callPackage @@ -11355,7 +11370,7 @@ self: { ]; description = "Multiline strings, interpolation and templating"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "Interpolation-maxs" = callPackage @@ -11367,7 +11382,7 @@ self: { libraryHaskellDepends = [ base syb template-haskell ]; description = "Multiline strings, interpolation and templating"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "IntervalMap" = callPackage @@ -11385,7 +11400,7 @@ self: { weigh ]; description = "Containers for intervals, with efficient search"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Irc" = callPackage @@ -11401,8 +11416,8 @@ self: { ]; testHaskellDepends = [ base doctest ]; description = "DSL for IRC bots"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -11434,8 +11449,8 @@ self: { vector ]; description = "A typeclass to determine if a given value is null"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -11453,8 +11468,8 @@ self: { hjson json JSONb parsec text vector ]; description = "A combinator library on top of a generalised JSON type"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -11468,8 +11483,8 @@ self: { base bytestring json JSON-Combinator JSONb ]; description = "Example uses of the JSON-Combinator library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -11481,7 +11496,7 @@ self: { sha256 = "1xda2dy2mizpvxvn3gyhx7aql7pi26zvw044r3bm14xr5qj11q26"; libraryHaskellDepends = [ base parsec ]; description = "Parse JSON"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "JSONb" = callPackage @@ -11501,8 +11516,8 @@ self: { containers utf8-string ]; description = "JSON parser that uses byte strings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -11522,8 +11537,8 @@ self: { stm template-haskell unix zlib ]; description = "Some utility functions for JYU projects"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -11535,8 +11550,8 @@ self: { sha256 = "0ivqfk1rac1hv5j6nlsbpcm5yjqwpic34mdq9gf2m63lygqkbwqp"; libraryHaskellDepends = [ base hosc ]; description = "control JackMiniMix"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -11553,8 +11568,8 @@ self: { base binary bytestring language-java-classfile ]; description = "A utility to print the SourceFile attribute of one or more Java class files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -11568,8 +11583,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base ]; description = "A utility to print the target version of Java class files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -11582,7 +11597,7 @@ self: { libraryHaskellDepends = [ base Euterpea random ]; description = "Library for modeling jazz improvisation"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "Jdh" = callPackage @@ -11593,8 +11608,8 @@ self: { sha256 = "0zg7xh3apm7x3c9gz876k5cis5jpng1bzf6g9ywbmmndry6dn1c0"; libraryHaskellDepends = [ base ]; description = "A Json implementation for Haskell, with JavaScript Values and Encoding/Decoding"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -11617,8 +11632,8 @@ self: { base containers mtl parsec pretty syb WebBits WebBits-Html ]; description = "Design-by-contract for JavaScript"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -11640,8 +11655,8 @@ self: { test-framework-hunit text ]; description = "Combinators for bidirectional JSON parsing"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -11658,8 +11673,8 @@ self: { aeson base bytestring json-autotype text ]; description = "JuPyTer notebook parser"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -11676,7 +11691,7 @@ self: { transformers vector zlib ]; description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "JuicyPixels-blp" = callPackage @@ -11699,8 +11714,8 @@ self: { text-show unordered-containers ]; description = "BLP format decoder/encoder over JuicyPixels library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -11730,7 +11745,7 @@ self: { ]; testToolDepends = [ tasty-discover ]; description = "Blurhash is a very compact represenation of a placeholder for an image"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "JuicyPixels-canvas" = callPackage @@ -11741,8 +11756,8 @@ self: { sha256 = "0y791kwg9gc3nlz5sbpszd7wiqr5b5bwmgvafyjzk9xnlxlc7xcm"; libraryHaskellDepends = [ base containers JuicyPixels ]; description = "Functions for drawing lines, squares and so on pixel by pixel"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -11760,7 +11775,7 @@ self: { testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ base criterion JuicyPixels ]; description = "Efficiently scale, crop, flip images with JuicyPixels"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "JuicyPixels-repa" = callPackage @@ -11773,7 +11788,7 @@ self: { base bytestring JuicyPixels repa vector ]; description = "Convenience functions to obtain array representations of images"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "JuicyPixels-scale-dct" = callPackage @@ -11792,7 +11807,7 @@ self: { base base-compat carray fft JuicyPixels time ]; description = "Scale JuicyPixels images with DCT"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "JuicyPixels-stbir" = callPackage @@ -11808,7 +11823,7 @@ self: { ]; libraryToolDepends = [ c2hs ]; description = "Scale JuicyPixels images with stb_image_resize"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "JuicyPixels-util" = callPackage @@ -11819,7 +11834,7 @@ self: { sha256 = "1b2rx5g8kd83hl50carr02mz21gvkasnsddw1f3pfvfsyfv3yyrc"; libraryHaskellDepends = [ base JuicyPixels vector ]; description = "Convert JuicyPixel images into RGBA format, flip, trim and so on"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "JunkDB" = callPackage @@ -11834,8 +11849,8 @@ self: { aeson base binary bytestring conduit data-default directory filepath mtl network resourcet ]; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -11850,8 +11865,8 @@ self: { libraryHaskellDepends = [ base bytestring conduit directory filepath JunkDB mtl resourcet ]; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -11866,8 +11881,8 @@ self: { libraryHaskellDepends = [ base bytestring conduit hashable hashtables JunkDB mtl resourcet ]; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -11879,8 +11894,8 @@ self: { sha256 = "16il25s1fb4b6ih6njsqxx7p7x0fc0kcwa5vqn7n7knqph6vvjaa"; libraryHaskellDepends = [ base ]; description = "A simple and comprehensive Haskell parsing library"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -11893,7 +11908,7 @@ self: { libraryHaskellDepends = [ array base ]; testHaskellDepends = [ base Cabal ]; description = "Knuth–Morris–Pratt string searching algorithm"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "KSP" = callPackage @@ -11904,8 +11919,8 @@ self: { sha256 = "19sjr9vavxnbv5yp2c01gy6iz1q2abllcsf378n15f3z064ffqn6"; libraryHaskellDepends = [ base ]; description = "A library with the kerbal space program universe and demo code"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -11917,11 +11932,22 @@ self: { sha256 = "1mzdaj6h21is3fwnckzq5zcxd4zqahsdppsx65bv5vdplsiadrw5"; libraryHaskellDepends = [ base hmatrix ]; description = "A slightly extended Kalman filter"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; + "Kawaii-Parser" = callPackage + ({ mkDerivation, base, containers, mtl }: + mkDerivation { + pname = "Kawaii-Parser"; + version = "0.0.0"; + sha256 = "163rh1vciljl35wc5wrcr1ky2vb536pv6hhnl3r97mfjc9c9k2wm"; + libraryHaskellDepends = [ base containers mtl ]; + description = "A simple parsing library"; + license = lib.licenses.bsd3; + }) {}; + "KdTree" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { @@ -11931,7 +11957,7 @@ self: { libraryHaskellDepends = [ base QuickCheck ]; testHaskellDepends = [ base QuickCheck ]; description = "KdTree, for efficient search in K-dimensional point clouds"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Ketchup" = callPackage @@ -11946,8 +11972,8 @@ self: { base base64-bytestring bytestring directory mime-types network text ]; description = "A super small web framework for those who don't like big and fancy codebases"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -11974,7 +12000,7 @@ self: { ]; description = "A compiler from Curry to Haskell"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {kics = null;}; "KiCS-debugger" = callPackage @@ -11996,7 +12022,7 @@ self: { ]; description = "debug features for kics"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "KiCS-prophecy" = callPackage @@ -12012,7 +12038,7 @@ self: { executableHaskellDepends = [ base KiCS ]; description = "a transformation used by the kics debugger"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "Kleislify" = callPackage @@ -12023,7 +12049,7 @@ self: { sha256 = "0f7f6sxb774h9dx6xy6wbcrc5b2i27k9m5ay3hq9hqsjg86qmxyl"; libraryHaskellDepends = [ base ]; description = "Variants of Control.Arrow functions, specialised to kleislis."; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Konf" = callPackage @@ -12035,7 +12061,7 @@ self: { libraryHaskellDepends = [ base containers parsec ]; description = "A configuration language and a parser"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "Kriens" = callPackage @@ -12046,8 +12072,8 @@ self: { sha256 = "1b6r4860qnnszs4giaidd8z1xch8vvq8qdyb9linrdhxpf5ad3sw"; libraryHaskellDepends = [ base ]; description = "Category for Continuation Passing Style"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -12064,7 +12090,7 @@ self: { ]; description = "Library for automated composition and musical learning"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "KyotoCabinet" = callPackage @@ -12078,8 +12104,8 @@ self: { libraryHaskellDepends = [ base bytestring extensible-exceptions ]; librarySystemDepends = [ kyotocabinet ]; description = "Kyoto Cabinet DB bindings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) kyotocabinet;}; @@ -12097,8 +12123,8 @@ self: { base cairo containers gtk mtl old-time parsec random ]; description = "Plant growing programming game"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -12115,8 +12141,8 @@ self: { ]; librarySystemDepends = [ openblasCompat ]; description = "Linear Algebra on Typed Spaces"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) openblasCompat;}; @@ -12132,7 +12158,7 @@ self: { base bytestring hspec lens mtl vector ]; description = "LC-3 virtual machine"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "LDAP" = callPackage @@ -12148,7 +12174,7 @@ self: { testHaskellDepends = [ base HUnit ]; testSystemDepends = [ openldap ]; description = "Haskell binding for C LDAP API"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) openldap;}; "LDAPv3" = callPackage @@ -12171,8 +12197,8 @@ self: { tasty-quickcheck text text-short ]; description = "Lightweight Directory Access Protocol (LDAP) version 3"; - license = stdenv.lib.licenses.gpl2Plus; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -12185,7 +12211,7 @@ self: { libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base ]; description = "A continuation-based parser library"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "LRU" = callPackage @@ -12196,8 +12222,8 @@ self: { sha256 = "0yppxz78y5myh9f53yqz6naqj15vk2h7fl3h8h8dps72zw9c5aqn"; libraryHaskellDepends = [ base containers QuickCheck ]; description = "Implements an LRU data structure"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -12218,8 +12244,8 @@ self: { ]; benchmarkHaskellDepends = [ base criterion time ]; description = "LTS: Labelled Transition System"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -12231,7 +12257,7 @@ self: { sha256 = "0liqz3n2ycidwmg8iz7mbm0d087fcfgphvbip8bsn0hpwlf10dvw"; libraryHaskellDepends = [ base transformers ]; description = "Tree with only leaves carrying the data"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "LambdaCalculator" = callPackage @@ -12248,7 +12274,7 @@ self: { base binary bytestring haskeline mtl parsec pretty ]; description = "A basic lambda calculator with beta reduction and a REPL"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "LambdaDB" = callPackage @@ -12263,7 +12289,7 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck ]; description = "On-memory Database using Lambda Function environment"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "LambdaDesigner" = callPackage @@ -12280,8 +12306,8 @@ self: { lens-aeson matrix text transformers vector ]; description = "A type-safe EDSL for TouchDesigner written in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -12314,8 +12340,8 @@ self: { ]; testHaskellDepends = [ async base filepath optparse-applicative ]; description = "A game engine library for tactical squad ASCII roguelike dungeon crawlers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -12335,8 +12361,8 @@ self: { vector ]; description = "Graphical Interaction Net Evaluator for Optimal Evaluation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -12352,8 +12378,8 @@ self: { base binary bytestring hmatrix random random-shuffle split ]; description = "A configurable and extensible neural network library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -12378,8 +12404,8 @@ self: { test-framework-quickcheck2 th-instances transformers tuple uniplate ]; description = "Quasiquoter, and Arbitrary helpers for the lambda calculus"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -12398,7 +12424,7 @@ self: { ]; description = "Simple shell for evaluating lambda expressions"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -12411,8 +12437,8 @@ self: { libraryHaskellDepends = [ base filepath hspec mtl process text ]; testHaskellDepends = [ base filepath hspec mtl process text ]; description = "A library to easily host Haskell based programming competitions"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -12429,8 +12455,8 @@ self: { pipes-parse ]; description = "Library for RedPitaya"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -12443,7 +12469,7 @@ self: { libraryHaskellDepends = [ base ]; description = "A transfinite cardinal arithmetic library including all known large cardinals"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "Lastik" = callPackage @@ -12459,8 +12485,8 @@ self: { pureMD5 SHA zip-archive ]; description = "A library for compiling programs in a variety of languages"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -12497,7 +12523,7 @@ self: { base binary byteable bytestring criterion cryptonite memory ]; description = "Lazy PBKDF2 generator"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "LazyVault" = callPackage @@ -12510,8 +12536,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base directory filepath unix ]; description = "A simple sandboxing tool for Haskell packages"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -12527,8 +12553,8 @@ self: { executableHaskellDepends = [ base containers hmatrix vector ]; testHaskellDepends = [ base containers hmatrix vector ]; description = "The most frequently used machine learning tools"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -12542,8 +12568,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base directory random SDL SDL-ttf ]; description = "A Snake II clone written using SDL"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -12564,8 +12590,8 @@ self: { libraryPkgconfigDepends = [ ncurses ]; libraryToolDepends = [ c2hs ]; description = "Haskell bindings for libclang (a C++ parsing library)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (self.llvmPackages) clang; inherit (pkgs) ncurses;}; @@ -12585,7 +12611,7 @@ self: { utf8-string ]; description = "Bindings to libzip, a library for manipulating zip archives"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Limit" = callPackage @@ -12596,8 +12622,8 @@ self: { sha256 = "1yd8c443ql17daicn3r9jiwxxjlpqnpnvkbxcszjha4i4ar94zq1"; libraryHaskellDepends = [ base ]; description = "Wrapper for data that can be unbounded"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -12612,8 +12638,8 @@ self: { array base cmdargs haskell98 QuickCheck ]; description = "Partition the sequence of items to the subsequences in the order given"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -12641,7 +12667,7 @@ self: { base bytestring containers criterion deepseq text ]; description = "Collection of types for natural language"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "LinkChecker" = callPackage @@ -12658,8 +12684,8 @@ self: { base containers haskell98 HTTP mtl network tagsoup ]; description = "Check a bunch of local html files for broken links"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -12672,8 +12698,8 @@ self: { libraryHaskellDepends = [ base binary bytestring HTF mtl ]; testHaskellDepends = [ base binary bytestring HTF mtl ]; description = "Algorithmic Doom map generation"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -12687,7 +12713,7 @@ self: { editedCabalFile = "11ws93cdzz7k4nvcld2d74155mdgcvyi6f6an7gpf9z4k523c11n"; libraryHaskellDepends = [ base transformers ]; description = "List monad transformer and class"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ListLike" = callPackage @@ -12708,7 +12734,7 @@ self: { random text utf8-string vector ]; description = "Generalized support for list-like structures"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ListT" = callPackage @@ -12726,8 +12752,8 @@ self: { base smallcheck tasty tasty-smallcheck transformers util ]; description = "List transformer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -12741,7 +12767,7 @@ self: { base directory filepath List transformers ]; description = "Trees and monadic trees expressed as monadic lists where the underlying monad is a list"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ListWriter" = callPackage @@ -12753,7 +12779,7 @@ self: { libraryHaskellDepends = [ base mtl ]; testHaskellDepends = [ base hspec ]; description = "define a list constant using Monadic syntax other than overhead [,]"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ListZipper" = callPackage @@ -12764,7 +12790,7 @@ self: { sha256 = "0z3izxpl21fxz43jpx7zqs965anb3gp5vidv3pwwznr88ss2j6a9"; libraryHaskellDepends = [ base QuickCheck ]; description = "Simple zipper for lists"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "LiterateMarkdown" = callPackage @@ -12780,8 +12806,8 @@ self: { testHaskellDepends = [ base ]; doHaddock = false; description = "Converter to convert from .lhs to .md and vice versa."; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -12793,8 +12819,8 @@ self: { sha256 = "0jplyy09i2rr5l8qzkyd41wwi7yj3sxlrz8f36ygdwxnwqfk2w01"; libraryHaskellDepends = [ base ]; description = "Logic"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -12831,8 +12857,8 @@ self: { ]; benchmarkHaskellDepends = [ base cereal criterion deepseq ]; description = "a parallel implementation of logic programming using distributed tree exploration"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -12854,10 +12880,10 @@ self: { ]; librarySystemDepends = [ openmpi ]; description = "an adapter for LogicGrowsOnTrees that uses MPI"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; - }) {inherit (pkgs) openmpi;}; + }) {openmpi = null;}; "LogicGrowsOnTrees-network" = callPackage ({ mkDerivation, base, cereal, cmdtheline, composition, containers @@ -12881,8 +12907,8 @@ self: { random stm test-framework test-framework-hunit transformers ]; description = "an adapter for LogicGrowsOnTrees that uses multiple processes running in a network"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -12909,8 +12935,8 @@ self: { ]; benchmarkHaskellDepends = [ base criterion LogicGrowsOnTrees ]; description = "an adapter for LogicGrowsOnTrees that uses multiple processes for parallelism"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -12931,8 +12957,8 @@ self: { utf8-string ]; description = "An execution and testing framework for the Linden Scripting Language (LSL)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -12953,8 +12979,8 @@ self: { time-http unix zlib ]; description = "HTTP Daemonic Library"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -12983,8 +13009,8 @@ self: { transformers ]; description = "A static website and blog generator"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -12997,8 +13023,8 @@ self: { libraryHaskellDepends = [ base containers mtl ]; testHaskellDepends = [ base containers mtl ]; description = "Generate MASM code from haskell"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -13010,8 +13036,8 @@ self: { sha256 = "0yh84vybrxs6bv3z4qx4n9m4xwsb4kw21l35s5v4gg8yllgbb79r"; libraryHaskellDepends = [ base bytestring hidapi mtl ]; description = "Haskell interface for controlling the mBot educational robot"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -13030,8 +13056,8 @@ self: { ]; executableHaskellDepends = [ cmdargs split ]; description = "Folding algorithm based on nucleotide cyclic motifs"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -13057,8 +13083,8 @@ self: { ]; libraryToolDepends = [ cpphs ]; description = "stateful, RESTful web framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -13070,8 +13096,8 @@ self: { sha256 = "0nlj914ahipyfqv1l7qr66pa0a8g4g6ks6mipc38z5f1jy0kjrva"; libraryHaskellDepends = [ base transformers ]; description = "The category of monads"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -13099,8 +13125,8 @@ self: { tasty-quickcheck tasty-th ]; description = "Library for using Mixed Integer Programming (MIP)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -13125,8 +13151,8 @@ self: { tasty tasty-hunit tasty-quickcheck tasty-th ]; description = "A GLPK backend to the MIP library"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) glpk;}; @@ -13138,8 +13164,8 @@ self: { sha256 = "04yvf4a07cy47qzl9p8x45qbk2i6yapfps7hx85p589338s8b72y"; libraryHaskellDepends = [ base ghc-prim monad-loops ref-mtl stm ]; description = "Michael-Scott queue"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -13153,8 +13179,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base containers mtl parsec ]; description = "Builds decks out of a meta"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -13184,8 +13210,8 @@ self: { template-haskell tf-random time transformers unix ]; description = "Automatic inductive functional programmer by systematic search"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -13204,8 +13230,8 @@ self: { transformers vector ]; description = "Haskell library to interact with Mailchimp JSON API Version 3.0"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -13222,8 +13248,8 @@ self: { ]; testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; description = "Class of key-value maps"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -13237,7 +13263,7 @@ self: { testHaskellDepends = [ base ]; benchmarkHaskellDepends = [ base ]; description = "mapWith: like fmap, but with additional parameters (isFirst, isLast, etc)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Mapping" = callPackage @@ -13248,8 +13274,8 @@ self: { sha256 = "1yz7dgmhlkqmf3fc2y32j9lr01zfjjqy9pnnj3bh03b9khblw0pn"; libraryHaskellDepends = [ base ]; description = "Mapping"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.agpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -13263,8 +13289,8 @@ self: { editedCabalFile = "1045p10l7smabidysk52m16sgqgfpa70ny8nwyn56238i02cd7ir"; libraryHaskellDepends = [ base mtl ]; description = "MaybeT monad transformer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -13276,8 +13302,8 @@ self: { sha256 = "034v9n6ldjn1hsv4rphvysbykm8x0jqa2prbw7k28fkp6m30j74x"; libraryHaskellDepends = [ base monads-tf transformers ]; description = "MaybeT monad transformer compatible with monads-tf (deprecated)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -13289,8 +13315,8 @@ self: { sha256 = "189w8dpxyq7gksca6k08hb4vpanpz06c99akgzpcpjy0i7k22ily"; libraryHaskellDepends = [ base monads-fd transformers ]; description = "MaybeT monad transformer using transformers instead of mtl"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -13310,8 +13336,8 @@ self: { pretty random regex-posix time ]; description = "Console-based Role Playing Game"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -13323,8 +13349,8 @@ self: { sha256 = "0rnbg7w3qc3xsbzpw5is7w7qdjl2kqbr1acc744aggwlibazl59w"; libraryHaskellDepends = [ base vector ]; description = "Mean shift algorithm"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -13336,8 +13362,8 @@ self: { sha256 = "1vy8ykjy9cpv661byqv21775zbyciqx2hf77c1nl58nn34x0s2ds"; libraryHaskellDepends = [ base ]; description = "A library for units of measurement"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -13349,8 +13375,8 @@ self: { sha256 = "1qqdvrhqm187gi9dj78z9ijcrrk6wv0a9cx060aa0278nayr4b2w"; libraryHaskellDepends = [ base machines ]; description = "mecha are the most complex composite machines known to humanity, lets build them well!"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -13362,8 +13388,8 @@ self: { sha256 = "00vmxrydynn8kjqn48q6kmd802m4q4y1n7cqq33vsi482ijrjak1"; libraryHaskellDepends = [ base machines ]; description = "mecha are the most complex composite machines known to humanity, lets build them well!"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -13377,7 +13403,7 @@ self: { isExecutable = true; libraryHaskellDepends = [ base newtype-generics ]; description = "Trie-based memo functions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "MetaHDBC" = callPackage @@ -13393,7 +13419,7 @@ self: { ]; description = "Statically checked database access"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -13405,8 +13431,8 @@ self: { sha256 = "0gbxayv4wv7zk53iqvsvsbby1js5zlwf6802rix6h3fx4xpzllab"; libraryHaskellDepends = [ base containers stringtable-atom ]; description = "A meta-object system for Haskell based on Perl 6"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -13418,8 +13444,8 @@ self: { sha256 = "1ks5h3vlla2d86wvf2a4z1qifsinya2skq8ygdk45ynnwk735y4x"; libraryHaskellDepends = [ base hstats ]; description = "Evaluation metrics commonly used in supervised machine learning"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -13438,8 +13464,8 @@ self: { process time ]; description = "Haskell mailing list manager"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -13456,8 +13482,8 @@ self: { WaveFront ]; description = "OpenGL for dummies"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -13474,8 +13500,8 @@ self: { transformers url wreq xml ]; description = "Interface for Microsoft Translator"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -13496,7 +13522,7 @@ self: { executableToolDepends = [ alex happy ]; description = "A toy dependently typed programming language with type-based termination"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "MissingH" = callPackage @@ -13519,7 +13545,7 @@ self: { old-time parsec regex-compat time unix ]; description = "Large utility library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "MissingK" = callPackage @@ -13530,7 +13556,7 @@ self: { sha256 = "1x8ygk64v1crj92zwdv2jh7rw5n53k0wx0bkjmkjn2x1vklsdinz"; libraryHaskellDepends = [ base glib template-haskell ]; description = "Useful types and definitions missing from other libraries"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "MissingM" = callPackage @@ -13547,7 +13573,7 @@ self: { test-framework-quickcheck2 transformers ]; description = "findM and other missing 'M's"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "MissingPy" = callPackage @@ -13558,8 +13584,8 @@ self: { sha256 = "0390ap25qj6a37jllsih39q5apgvwdjdw5m7jgfrllkp5bng6yj6"; libraryHaskellDepends = [ anydbm base MissingH ]; description = "Haskell interface to Python"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -13582,8 +13608,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "spam"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -13595,7 +13621,7 @@ self: { sha256 = "1n90lfrvfr1ni7ninlxbs4wk0m7mibdpi9sy26ifih51nmk8nziq"; libraryHaskellDepends = [ base numeric-prelude ]; description = "Modular arithmetic via Numeric-Prelude"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }) {}; "Moe" = callPackage @@ -13609,8 +13635,8 @@ self: { libraryHaskellDepends = [ base GLUT random ]; executableHaskellDepends = [ base GLUT random ]; description = "A FRP library based on signal functions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -13626,8 +13652,8 @@ self: { aeson base bytestring containers text unordered-containers ]; description = "Utilities working with MoeDict.tw JSON dataset"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -13643,8 +13669,8 @@ self: { base extensible-exceptions MonadCatchIO-transformers ]; description = "Monad-transformer version of the Control.Exception module"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -13656,8 +13682,8 @@ self: { sha256 = "0jfq5v1jigxl9mnnvpqph9ayq840s9nyb5srym04mbicri4gbjan"; libraryHaskellDepends = [ base MonadCatchIO-mtl mtl primitive ]; description = "Polymorphic combinators for working with foreign functions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -13673,8 +13699,8 @@ self: { base extensible-exceptions monads-tf transformers ]; description = "Monad-transformer compatible version of the Control.Exception module"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -13690,8 +13716,8 @@ self: { base MonadCatchIO-transformers primitive transformers ]; description = "Polymorphic combinators for working with foreign functions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -13703,8 +13729,8 @@ self: { sha256 = "1jq8ms16karqqa6qxp4n24f2v4bcc8n8mzfjm6b6q3n8hg7dj8yd"; libraryHaskellDepends = [ base free mmorph mtl transformers ]; description = "Methods for composing monads"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -13721,8 +13747,8 @@ self: { libraryHaskellDepends = [ base parsec template-haskell ]; executableHaskellDepends = [ base haskell98 process ]; description = "Automatically generate layered monads"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -13734,7 +13760,7 @@ self: { sha256 = "1nmy7dfzrkd8yfv5i9vlmjq9khnyi76ayvkzgcf783v5hfzcn4mh"; libraryHaskellDepends = [ base mtl ]; description = "MonadPrompt, implementation & examples"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "MonadRandom" = callPackage @@ -13749,7 +13775,7 @@ self: { base mtl primitive random transformers transformers-compat ]; description = "Random-number generation monad"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "MonadRandomLazy" = callPackage @@ -13760,7 +13786,7 @@ self: { sha256 = "0zqw3g69dx72rjmmbjjgvv06jr7j64fy4c4zkqyra4h5hxflb282"; libraryHaskellDepends = [ base MonadRandom mtl random ]; description = "Lazy monad for psuedo random-number generation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "MonadStack" = callPackage @@ -13771,8 +13797,8 @@ self: { sha256 = "0fsnc17dxmv3qnmz54gw3wy2camgp23ip9jfi543xqks0l8n7gcz"; libraryHaskellDepends = [ base mtl ]; description = "Generalizing lift to monad stacks"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -13788,7 +13814,7 @@ self: { executableHaskellDepends = [ array base directory GLUT OpenGL ]; description = "2-D arcade scroller"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -13804,8 +13830,8 @@ self: { executableHaskellDepends = [ ansi-terminal base process time ]; testHaskellDepends = [ ansi-terminal base doctest process time ]; description = "A minimalistic CLI Pomodoro timer"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -13824,8 +13850,8 @@ self: { array base containers directory free free-game mtl ]; description = "A simple tetris clone"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -13837,8 +13863,8 @@ self: { sha256 = "0250xqc5fgl8mg9yb0ykbfmxnyxacqbvi692irgfw89gf9vkh886"; libraryHaskellDepends = [ base ]; description = "Monad transformer library with uniform liftings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -13850,8 +13876,8 @@ self: { sha256 = "0svdyfzv4xlwjnc61wwik8a60a5667lhsys49sgry65a1v2csnv0"; libraryHaskellDepends = [ base Monatron transformers ]; description = "MonadIO instances for the Monatron transformers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -13863,8 +13889,8 @@ self: { sha256 = "1p8s2agsni56h7vlydbhy7qhi0qkwafpcrsfafrlg44gvpwff15y"; libraryHaskellDepends = [ base containers haskell98 mtl ]; description = "Symbolic computations in strict monoidal categories with LaTeX output"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -13876,7 +13902,7 @@ self: { sha256 = "1dglyak17db7q9nd6s255w2zh8lh192vidyjvgvh53vbybymb20z"; libraryHaskellDepends = [ base containers split ]; description = "Morse code"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "MuCheck" = callPackage @@ -13896,8 +13922,8 @@ self: { temporary time ]; description = "Automated Mutation Testing"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -13912,8 +13938,8 @@ self: { libraryHaskellDepends = [ base HUnit MuCheck ]; executableHaskellDepends = [ base HUnit MuCheck ]; description = "Automated Mutation Testing for HUnit tests"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -13928,8 +13954,8 @@ self: { libraryHaskellDepends = [ base hspec hspec-core MuCheck ]; executableHaskellDepends = [ base hspec hspec-core MuCheck ]; description = "Automated Mutation Testing for Hspec tests"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -13944,8 +13970,8 @@ self: { libraryHaskellDepends = [ base MuCheck QuickCheck ]; executableHaskellDepends = [ base MuCheck QuickCheck ]; description = "Automated Mutation Testing for QuickCheck tests"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -13960,8 +13986,8 @@ self: { libraryHaskellDepends = [ base MuCheck smallcheck ]; executableHaskellDepends = [ base MuCheck smallcheck ]; description = "Automated Mutation Testing for SmallCheck tests"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -13973,7 +13999,7 @@ self: { sha256 = "169mgcyls0dsifnbp615r4i3g64ga2vbczsiv4aq17d1nma8sw19"; libraryHaskellDepends = [ array base ]; description = "Munkres' assignment algorithm (hungarian method)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Munkres-simple" = callPackage @@ -13984,8 +14010,8 @@ self: { sha256 = "0k5v37qrhb8i5hfx9jvkggjmry2jrzw967s17l2x561qmm59c2rb"; libraryHaskellDepends = [ array base bimap containers Munkres ]; description = "Simple and typesafe layer over the Munkres package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -14005,7 +14031,7 @@ self: { transformers unliftio-core vector xml-conduit xml-types ]; description = "interface to MusicBrainz XML2 and JSON web services"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "MusicBrainz-libdiscid" = callPackage @@ -14052,8 +14078,8 @@ self: { base QuickCheck tasty tasty-quickcheck tasty-th vector ]; description = "Most likely order of mutation events in RNA"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -14069,8 +14095,8 @@ self: { executableHaskellDepends = [ base containers ]; benchmarkHaskellDepends = [ base time ]; description = "Generate all primes"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -14084,8 +14110,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base HCL HTTP network regex-compat ]; description = "Simple application for calculating n-grams using Google"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -14098,7 +14124,7 @@ self: { libraryHaskellDepends = [ base containers ]; description = "A transparent nested Map structure"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -14139,8 +14165,8 @@ self: { test-framework-hunit test-framework-quickcheck2 time ]; description = "A Haskell interface to Lego Mindstorms NXT"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {bluetooth = null;}; @@ -14159,8 +14185,8 @@ self: { unordered-containers ]; description = "Generate NXC Code from DSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -14182,7 +14208,7 @@ self: { ]; testToolDepends = [ tasty-discover ]; description = "Easy-and-safe-to-use high-level Haskell bindings to NaCl"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "NameGenerator" = callPackage @@ -14195,7 +14221,7 @@ self: { editedCabalFile = "01ma6068mnwn9f7jpa5g8kkl7lyhl5wnpw9ad44zz9gki1mrw37i"; libraryHaskellDepends = [ base containers random ]; description = "A name generator written in Haskell"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "NanoProlog" = callPackage @@ -14209,8 +14235,8 @@ self: { libraryHaskellDepends = [ base containers ListLike uu-parsinglib ]; executableHaskellDepends = [ base uu-parsinglib ]; description = "Very small interpreter for a Prolog-like language"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -14223,7 +14249,7 @@ self: { libraryHaskellDepends = [ base containers ghc-prim vector ]; description = "Naperian Functors for APL-like programming"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "NaperianNetCDF" = callPackage @@ -14237,8 +14263,8 @@ self: { libraryHaskellDepends = [ base hnetcdf Naperian vector ]; executableHaskellDepends = [ base hnetcdf Naperian split ]; description = "Instances of NcStore for hypercuboids"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -14268,8 +14294,8 @@ self: { mwc-random random unordered-containers vector ]; description = "Simple scoring schemes for word alignments"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -14283,8 +14309,8 @@ self: { isExecutable = true; libraryHaskellDepends = [ base bytestring strict ]; description = "Natural sorting for strings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -14302,8 +14328,8 @@ self: { base containers ContextAlgebra lattices multiset QuickCheck ]; description = "Context Algebra of near"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -14326,8 +14352,8 @@ self: { network stm vector ]; description = "Simple networked key/value store"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -14339,8 +14365,8 @@ self: { sha256 = "1kmv20haxkqn1cwy9g59nmjpn5x1rng2rrd8y3gwxfdwn8blc735"; libraryHaskellDepends = [ base comonad distributive ]; description = "Nested composition of functors with a type index tracking nesting"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -14352,7 +14378,7 @@ self: { sha256 = "1sdlnjnlbk5b04zyhr7574g2ghcivzvkxnm2aak4h9bik00gb1lv"; libraryHaskellDepends = [ base random vector ]; description = "A port of John Skilling's nested sampling C code to Haskell"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }) {}; "NetSNMP" = callPackage @@ -14365,8 +14391,8 @@ self: { librarySystemDepends = [ net_snmp ]; testHaskellDepends = [ base bytestring HUnit process ]; description = "Bindings for net-snmp's C API for clients"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {net_snmp = null;}; @@ -14387,7 +14413,7 @@ self: { ]; description = "High-level abstraction over 9P protocol"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "NewBinary" = callPackage @@ -14399,7 +14425,7 @@ self: { libraryHaskellDepends = [ array base integer ]; description = "A binary I/O library"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {integer = null;}; @@ -14411,7 +14437,7 @@ self: { sha256 = "1k6qdp4zmqjl2f6cqy1zzzl6ncb2m9r0qgh4c24i2h5kkxmm3cab"; libraryHaskellDepends = [ base binary ]; description = "9P2000 in pure Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Ninjas" = callPackage @@ -14430,8 +14456,8 @@ self: { networked-game random ]; description = "Ninja game"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -14443,7 +14469,7 @@ self: { sha256 = "0g9vqkpcmn66922z2yqp29h4kp2n2xnz1rva294h0kh39hiklrlv"; libraryHaskellDepends = [ base template-haskell ]; description = "Placeholder package to preserve debug ability via conditional builds"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "NoSlow" = callPackage @@ -14462,8 +14488,8 @@ self: { storablevector template-haskell uvector vector ]; description = "Microbenchmarks for various array libraries"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -14476,8 +14502,8 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Remove all the functions come from Debug.Trace after debugging"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -14489,7 +14515,7 @@ self: { sha256 = "0sjyq8nilqhmlhbagi1ms2zh7fyhzci9w5hj3dyxpd2ccq1bbvyq"; libraryHaskellDepends = [ array base data-default vector ]; description = "A Haskell coherent noise generator based on libnoise"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Nomyx" = callPackage @@ -14508,8 +14534,8 @@ self: { Nomyx-Core Nomyx-Language Nomyx-Web safe stm time ]; description = "A Nomic game in haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -14536,8 +14562,8 @@ self: { template-haskell temporary text time unix ]; description = "A Nomic game in haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -14557,8 +14583,8 @@ self: { time-recurrence ]; description = "Language to express rules for Nomic"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -14576,8 +14602,8 @@ self: { time time-recurrence ]; description = "Language to express rules for Nomic"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -14602,8 +14628,8 @@ self: { web-routes-happstack web-routes-regular web-routes-th ]; description = "Web gui for Nomyx"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -14615,8 +14641,8 @@ self: { sha256 = "0nycv791c6b5bcaz5y9wm3wxn1p930p163qs1rpdiix04fnaxgxl"; libraryHaskellDepends = [ base ]; description = "Library providing a non-empty list datatype, and total functions operating on it"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -14633,8 +14659,8 @@ self: { test-framework-hunit test-framework-quickcheck2 ]; description = "A list with a length of at least one"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -14646,7 +14672,7 @@ self: { sha256 = "0ycnwn09izajv330l7a31mc0alifqmxjsn9qmfswwnbg6i4jmnyb"; libraryHaskellDepends = [ base ]; description = "Instances of numeric classes for functions and tuples"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "NumLazyByteString" = callPackage @@ -14657,7 +14683,7 @@ self: { sha256 = "17ca34hxaz9xk3ykkzp14n7wb31aiza12859k3rmvwhnq4j89jqs"; libraryHaskellDepends = [ base binary bytestring ]; description = "Num, Enum, Eq, Integral, Ord, Real, and Show instances for Lazy ByteStrings"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "NumberSieves" = callPackage @@ -14668,8 +14694,8 @@ self: { sha256 = "1w8y46ivli37rlhkdrnw13qv6f0m13a88w0qkfw949b09vdp2nw2"; libraryHaskellDepends = [ array base ]; description = "Number Theoretic Sieves: primes, factorization, and Euler's Totient"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -14682,8 +14708,8 @@ self: { libraryHaskellDepends = [ base containers primes ]; testHaskellDepends = [ base containers HUnit primes ]; description = "A library for number theoretic computations, written in Haskell"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -14712,8 +14738,8 @@ self: { ADPfusion base ghc-prim mtl primitive PrimitiveArray vector ]; description = "Nussinov78 using the ADPfusion library"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -14725,8 +14751,8 @@ self: { sha256 = "1m7qx5zydz5jpk6a55k7rzchlwmkd91gsiqmn26qqn50ab3di35j"; libraryHaskellDepends = [ base ]; description = "A little library to calculate nutrition values of food items"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -14738,8 +14764,8 @@ self: { sha256 = "1w8lpi2r315b4ry234gi4rq09j92zvhr9ibxwsig6544cbb5g8qm"; libraryHaskellDepends = [ base mtl ]; description = "A context aware binding for the OpenGL graphics system"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -14764,8 +14790,8 @@ self: { ]; executableHaskellDepends = [ base filepath ]; description = "ONC RPC (aka Sun RPC) and XDR library"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -14781,8 +14807,8 @@ self: { base comonad-transformers containers data-lens hxt newtype ]; description = "Parse OpenStreetMap files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -14802,8 +14828,8 @@ self: { ]; testHaskellDepends = [ base bytestring tasty tasty-hunit time ]; description = "HMAC-Based and Time-Based One-Time Passwords (HOTP & TOTP)"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -14815,8 +14841,8 @@ self: { sha256 = "05lrqq4008vnfs2x8kxlyrgdvxmzk04rqvn0w65b691bp3vwnbf9"; libraryHaskellDepends = [ base containers ghc template-haskell ]; description = "Object oriented programming for haskell using multiparameter typeclasses"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -14832,8 +14858,8 @@ self: { comctl32 comdlg32 gdi32 kernel32 ole32 shell32 user32 winmm winspool ]; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {comctl32 = null; comdlg32 = null; gdi32 = null; kernel32 = null; ole32 = null; shell32 = null; user32 = null; @@ -14847,7 +14873,7 @@ self: { sha256 = "046jm94rmm46cicd31pl54vdvfjvhd9ffbfycy2lxzc0fliyznvj"; libraryHaskellDepends = [ base transformers ]; description = "Explicitly handled object names"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Obsidian" = callPackage @@ -14864,8 +14890,8 @@ self: { mwc-random process rdtsc text value-supply vector ]; description = "Embedded language for GPU Programming"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "Octree" = callPackage @@ -14882,8 +14908,8 @@ self: { base criterion deepseq ghc-prim lens linear QuickCheck ]; description = "Simple unbalanced Octree for storing data about 3D points"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -14897,8 +14923,8 @@ self: { testHaskellDepends = [ base hspec QuickCheck ]; benchmarkHaskellDepends = [ base criterion ]; description = "Provides a wrapper for deriving word types with fewer bits"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -14911,8 +14937,8 @@ self: { libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers HUnit ]; description = "Integer sets and relations using Presburger arithmetic"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -14949,8 +14975,8 @@ self: { text text-zipper time transformers vector vty ]; description = "Text UI library for performing parallel remote SSH operations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -14962,7 +14988,7 @@ self: { sha256 = "15ls6kkf953288q7rsc49bvw467ll4nq28hvsgbaazdn7hf75ixc"; libraryHaskellDepends = [ base ]; description = "Singleton Tuple"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Only" = callPackage @@ -14975,7 +15001,7 @@ self: { editedCabalFile = "1ahk7p34kmh041mz7lyc10nhcxgv2i4z8nvzxvqm2x34gslmsbzr"; libraryHaskellDepends = [ base deepseq ]; description = "The 1-tuple type or single-value \"collection\""; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "OpenAFP" = callPackage @@ -14991,8 +15017,8 @@ self: { hashtables mtl process regex-compat ]; description = "IBM AFP document format parser and generator"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -15013,8 +15039,8 @@ self: { xhtml ]; description = "Assorted utilities to work with AFP data streams"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -15033,7 +15059,7 @@ self: { ]; librarySystemDepends = [ openal ]; description = "A binding to the OpenAL cross-platform 3D audio API"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) openal;}; "OpenCL" = callPackage @@ -15047,8 +15073,8 @@ self: { libraryToolDepends = [ c2hs ]; testHaskellDepends = [ base QuickCheck ]; description = "Haskell high-level wrapper for OpenCL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {OpenCL = null;}; @@ -15060,8 +15086,8 @@ self: { sha256 = "1a9nlrmxp3jwc3hbj79xm35aypfby04qy01fk4vyrp19diiinl07"; libraryHaskellDepends = [ base bytestring mtl ]; description = "The OpenCL Standard for heterogenous data-parallel computing"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -15073,8 +15099,8 @@ self: { sha256 = "0xlm26jksp4jf1dhkpg4708r1ak5mjdc5x5fjp4fhizmzlk3348s"; libraryHaskellDepends = [ base bytestring mtl ]; description = "The OpenCL Standard for heterogenous data-parallel computing"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -15093,7 +15119,7 @@ self: { text transformers ]; description = "A binding for the OpenGL graphics system"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "OpenGLCheck" = callPackage @@ -15106,8 +15132,8 @@ self: { base checkers haskell98 OpenGL QuickCheck ]; description = "Quickcheck instances for various data structures"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -15124,7 +15150,7 @@ self: { ]; librarySystemDepends = [ libGL ]; description = "A raw binding for the OpenGL graphics system"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) libGL;}; "OpenGLRaw21" = callPackage @@ -15136,7 +15162,7 @@ self: { libraryHaskellDepends = [ OpenGLRaw ]; description = "The intersection of OpenGL 2.1 and OpenGL 3.1 Core"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "OpenSCAD" = callPackage @@ -15155,8 +15181,8 @@ self: { tasty tasty-hunit testpack ]; description = "ADT wrapper and renderer for OpenSCAD models"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -15168,8 +15194,8 @@ self: { sha256 = "0ad96lbwcwl7vvk5vx1mmb0wj28c541jwd9nsm7l5na9qdxfhzvj"; libraryHaskellDepends = [ base GLUT OpenGL OpenGLRaw OpenVGRaw ]; description = "OpenVG (ShivaVG-0.2.1) binding"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -15181,8 +15207,8 @@ self: { sha256 = "1fdg5b8f2x36x6gmdkazkmhqgknagd0kzr70hydygsmqbf2im5x2"; libraryHaskellDepends = [ base OpenGLRaw ]; description = "Raw binding to OpenVG (ShivaVG-0.2.1 implementation)."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -15194,8 +15220,8 @@ self: { sha256 = "1b880lrzdxww3j19zspnj49ifsn89n0ac1h5xf7nn83847k8q2qk"; libraryHaskellDepends = [ array base containers mtl ]; description = "Groebner basis computation for Operads"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -15207,7 +15233,7 @@ self: { sha256 = "07l2fagp60ykhsr3dxclkfgg1pxawj2xf0wxrn3dksjdlx0hg5j5"; libraryHaskellDepends = [ base hashable syb ]; description = "The OptDir type for representing optimization directions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "OrPatterns" = callPackage @@ -15223,8 +15249,8 @@ self: { template-haskell ]; description = "A quasiquoter for or-patterns"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -15244,8 +15270,8 @@ self: { random ]; description = "Unofficial Haskell Client Library for the Orchestrate.io API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -15265,7 +15291,7 @@ self: { ]; benchmarkHaskellDepends = [ base criterion ]; description = "Efficient ordered (by popcount) enumeration of bits"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Ordinals" = callPackage @@ -15276,7 +15302,7 @@ self: { sha256 = "04xk74rl2d6vp1kn197hsbkkwdvwvqpjqg3kgkpkl2i0r90y8lsi"; libraryHaskellDepends = [ base ]; description = "Ordinal arithmetic"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Ordinary" = callPackage @@ -15291,8 +15317,8 @@ self: { executableHaskellDepends = [ base safe threepenny-gui ]; testHaskellDepends = [ base safe threepenny-gui ]; description = "A Programming Language in Construction"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -15308,8 +15334,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base ]; description = "spam"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -15321,7 +15347,7 @@ self: { sha256 = "08mkq72zv9ywp002vwjk7gl6pq6915zdd06sp4ap935aqdjrhn0p"; libraryHaskellDepends = [ base containers ghc-prim mtl ]; description = "Arrow parser combinators similar to Parsec"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "PBKDF2" = callPackage @@ -15334,8 +15360,8 @@ self: { editedCabalFile = "0gnvhijrjj39z9y4m1ic2nys2yi3ida7yh93b9q88r6i02m2k23f"; libraryHaskellDepends = [ base binary bytestring Crypto random ]; description = "Make password-based security schemes more secure"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -15350,7 +15376,7 @@ self: { ]; description = "Extension to Show: templating, catalogizing, languages, parameters, etc"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -15368,7 +15394,7 @@ self: { ]; description = "An addon to PCLT package: enchance PCLT catalog with PostgreSQL powers"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -15382,7 +15408,7 @@ self: { isExecutable = true; libraryHaskellDepends = [ base bytestring containers ]; description = "A library for analysis of 3-D protein coordinates"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "PPrinter" = callPackage @@ -15393,8 +15419,8 @@ self: { sha256 = "1fcvjrsq40nc2z4dg5f3bkz9h8psp89ay28k1jnwxqgh74xnylzc"; libraryHaskellDepends = [ base containers ]; description = "A generic derivable Haskell pretty printer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -15408,7 +15434,7 @@ self: { editedCabalFile = "0n1yrv1x1dxbjn9hjr8lk4k5in9c75ixzldlmszayi26bvax7329"; libraryHaskellDepends = [ base ]; description = "Priority Search Queue"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "PTQ" = callPackage @@ -15426,7 +15452,7 @@ self: { ]; description = "An implementation of Montague's PTQ"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -15446,8 +15472,8 @@ self: { random smtp-mail text time transformers ]; description = "This is a package which includes Assignments, Email, User and Reviews modules for Programming in Haskell course"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -15474,8 +15500,8 @@ self: { stringtable-atom utf8-string uuid ]; description = "Page-oriented extraction and composition library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -15494,8 +15520,8 @@ self: { test-framework-quickcheck2 test-framework-th ]; description = "a simple Paillier cryptosystem"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -15516,8 +15542,8 @@ self: { ]; executableHaskellDepends = [ base ]; description = "Pandoc support for literate Agda"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -15542,8 +15568,8 @@ self: { typelevel-tensor vector ]; description = "a code generator for partial differential equations solvers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -15562,7 +15588,7 @@ self: { base hspec Parallel-Arrows-Definition split ]; description = "BaseSpecs used for @Parallel-Arrows-Definition@ and Co"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "Parallel-Arrows-Definition" = callPackage @@ -15573,7 +15599,7 @@ self: { sha256 = "1zdsvg0nx2vnvgx9vcwq8l1kanfp056mmiscs3716lswkrvhdlbf"; libraryHaskellDepends = [ base deepseq split ]; description = "Multithreaded evaluation using Arrows"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "Parallel-Arrows-Eden" = callPackage @@ -15593,8 +15619,8 @@ self: { Parallel-Arrows-Definition QuickCheck split ]; description = "Eden based backend for @Parallel-Arrows-Definition@"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -15614,7 +15640,7 @@ self: { Parallel-Arrows-Definition split ]; description = "GpH based backend for @Parallel-Arrows-Definition@ in a multicore variant"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "Parallel-Arrows-ParMonad" = callPackage @@ -15633,7 +15659,7 @@ self: { Parallel-Arrows-Definition split ]; description = "Par Monad (@monad-par@) based backend for @Parallel-Arrows-Definition@"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "Parry" = callPackage @@ -15650,8 +15676,8 @@ self: { old-locale process random RSA SafeSemaphore time unix ]; description = "A proven synchronization server for high performance computing"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -15663,7 +15689,7 @@ self: { sha256 = "11vshnbxfl8p38aix4h2b0vms8j58agwxbmhd9pkxai764sl6j7g"; libraryHaskellDepends = [ base parsec ]; description = "Parsec combinators for more complex objects"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "ParserFunction" = callPackage @@ -15674,7 +15700,7 @@ self: { sha256 = "0l0j1mdycqsb5d32l7h0giwrj5yj54523gdn0bvim2vz67qrbxrq"; libraryHaskellDepends = [ base containers parsec ]; description = "Parse and evaluate mathematical expressions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "PartialTypeSignatures" = callPackage @@ -15685,7 +15711,7 @@ self: { sha256 = "04c01bcfrb79av2j9bivlwanmycasn7gjnc9gb5jm6gkwyvgv0h3"; libraryHaskellDepends = [ base containers syb template-haskell ]; description = "emulate partial type signatures with template haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "PasswordGenerator" = callPackage @@ -15696,8 +15722,8 @@ self: { sha256 = "12lxylmpi2f1ahy6w1n7jmwn9kay4hajgr95xbnqqdzv4dw6whzw"; libraryHaskellDepends = [ base QuickCheck ]; description = "Simple library for generating passwords"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -15712,7 +15738,7 @@ self: { libraryHaskellDepends = [ base cmdargs HTTP network network-uri ]; executableHaskellDepends = [ base cmdargs ]; description = "CLI for pasting to lpaste.net"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "PathTree" = callPackage @@ -15728,8 +15754,8 @@ self: { base QuickCheck test-framework test-framework-quickcheck2 ]; description = "A tree used to merge and maintain paths"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -15742,8 +15768,8 @@ self: { libraryHaskellDepends = [ base bytestring text ]; librarySystemDepends = [ libxml2 ]; description = "Relational optimiser and code generator"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) libxml2;}; @@ -15755,7 +15781,7 @@ self: { sha256 = "0ss4p40gkqcw9bdh5iy0yar56gpsanrxld74q5dxvakrf8m6cqmz"; libraryHaskellDepends = [ base ]; description = "simple Peano numbers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "PeanoWitnesses" = callPackage @@ -15766,8 +15792,8 @@ self: { sha256 = "1g83jws23grl84gnq89rnppw6q7vsbhi9hk6lp5dq2n4818kamgg"; libraryHaskellDepends = [ base ]; description = "GADT type witnesses for Peano-style natural numbers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -15784,8 +15810,8 @@ self: { ]; librarySystemDepends = [ cmph ]; description = "A perfect hashing library for mapping bytestrings to values"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {cmph = null;}; @@ -15797,8 +15823,8 @@ self: { sha256 = "0lmmsvqbnw0k321254xfqlzmddvymy0mj50ax7caqj2fnarfgy4l"; libraryHaskellDepends = [ base ReplicateEffects ]; description = "Permutations of effectful computations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -15817,8 +15843,8 @@ self: { base containers maximal-cliques parallel vector ]; description = "A versatile library for topological data analysis"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -15843,8 +15869,8 @@ self: { string-conversions temporary text time ]; description = "Personal Happstack Server Utils"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -15856,8 +15882,8 @@ self: { sha256 = "1453rjp5whl9vywiq8i86vjfa8ys1ppwabhvlibqwsbx804q9yhr"; libraryHaskellDepends = [ base filepath process unix ]; description = "Process piping library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -15869,8 +15895,8 @@ self: { sha256 = "07rzwkhz4b6nymygrhcz07dxl8fnvfrmfpcdj9qz3mwrcyf1kp9n"; libraryHaskellDepends = [ base template-haskell ]; description = "Partial isomorphisms"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -15889,7 +15915,7 @@ self: { base containers directory mtl random regex-compat ]; description = "Play Hangman Game"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "PlayingCards" = callPackage @@ -15904,8 +15930,8 @@ self: { base HUnit MonadRandom QuickCheck random-shuffle ]; description = "Playing cards api"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -15927,8 +15953,8 @@ self: { transformers vector ]; description = "Real-time line plotter for generic data"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -15948,8 +15974,8 @@ self: { process random ]; description = "So far just a lint like program for PL/SQL. Diff and refactoring tools are planned"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -15961,7 +15987,7 @@ self: { sha256 = "047aw1pka7xsqnshbmirkxd80m92w96xfb0kpi1a22bx0kpgg58w"; libraryHaskellDepends = [ base containers regex-tdfa ]; description = "Pluralize English words"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "Pollutocracy" = callPackage @@ -15975,7 +16001,7 @@ self: { executableHaskellDepends = [ array base clock GLUT random ]; description = "An imaginary world"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -15989,8 +16015,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base bytestring network splice ]; description = "high-performance distributed reverse / forward proxy & tunneling for TCP"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -16005,8 +16031,8 @@ self: { libraryHaskellDepends = [ base ]; librarySystemDepends = [ alsaLib ]; description = "A binding for PortMedia/PortMidi"; - license = stdenv.lib.licenses.bsd3; - platforms = [ "i686-linux" "x86_64-linux" ]; + license = lib.licenses.bsd3; + platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) alsaLib;}; "PostgreSQL" = callPackage @@ -16018,7 +16044,7 @@ self: { libraryHaskellDepends = [ base mtl ]; description = "Thin wrapper over the C postgresql library"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "Prelude" = callPackage @@ -16031,8 +16057,8 @@ self: { editedCabalFile = "14z8gv75jnvykk5naqcqqrdcx7160kzd3gnfdvx6rw4nqzsi6hw1"; libraryHaskellDepends = [ base ]; description = "A Prelude module replacement"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -16066,7 +16092,7 @@ self: { vector-th-unbox ]; description = "Efficient multidimensional arrays"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "PrimitiveArray-Pretty" = callPackage @@ -16088,8 +16114,8 @@ self: { test-framework-th ]; description = "Pretty-printing for primitive arrays"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -16101,7 +16127,7 @@ self: { sha256 = "0n1gva510p69vy25zvjkzwqqz2gilbns1wnrzz2p22rjkkbrinvx"; libraryHaskellDepends = [ base haskell98 pretty template-haskell ]; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -16114,7 +16140,7 @@ self: { libraryHaskellDepends = [ base containers stm ]; description = "Read single output from an array of inputs - channels with priorities"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -16126,8 +16152,8 @@ self: { sha256 = "0vmjg91yq4p0121ypjx4l1hh77j8xj6ha7awdvrjk5fjmz9xryh3"; libraryHaskellDepends = [ base MaybeT MonadRandom mtl ]; description = "Probability distribution monads"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -16142,7 +16168,7 @@ self: { libraryHaskellDepends = [ base old-time random ]; executableHaskellDepends = [ base old-time random ]; description = "Propositional Logic"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Proper" = callPackage @@ -16156,8 +16182,8 @@ self: { libraryHaskellDepends = [ base containers syb ]; executableHaskellDepends = [ base containers HUnit parsec syb ]; description = "An implementation of propositional logic in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -16169,7 +16195,7 @@ self: { sha256 = "0mx3kgkcbhppz2p6g8vb9yx27219ca2w7k36j60vfhszni1c4gid"; libraryHaskellDepends = [ base mtl ]; description = "Proximity sets in N dimensions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Pugs" = callPackage @@ -16193,8 +16219,8 @@ self: { random stm stringtable-atom text time utf8-string ]; description = "A Perl 6 Implementation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -16214,8 +16240,8 @@ self: { executableHaskellDepends = [ base ]; doHaddock = false; description = "A networked event handling framework for hooking into other programs"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -16231,7 +16257,7 @@ self: { base network parsec Pup-Events-PQueue stm transformers ]; description = "A networked event handling framework for hooking into other programs"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "Pup-Events-Demo" = callPackage @@ -16249,8 +16275,8 @@ self: { Pup-Events-Server stm ]; description = "A networked event handling framework for hooking into other programs"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -16262,7 +16288,7 @@ self: { sha256 = "0sngiqxzj5kif452s2hn3x1kv257815c5v19dp4wqazbyc373iwx"; libraryHaskellDepends = [ base stm ]; description = "A networked event handling framework for hooking into other programs"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "Pup-Events-Server" = callPackage @@ -16277,8 +16303,8 @@ self: { base network parsec Pup-Events-PQueue stm transformers ]; description = "A networked event handling framework for hooking into other programs"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -16301,8 +16327,8 @@ self: { process template-haskell temporary text ]; description = "Quasiquotations for a python like interpolated string formater"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -16314,8 +16340,8 @@ self: { sha256 = "19xbnqm90b1wsxbjhjm1q1mld0rv4p6ga1chzl4i00yccpwsh7g8"; libraryHaskellDepends = [ base containers mtl old-time random ]; description = "The Quantum IO Monad is a library for defining quantum computations in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -16327,8 +16353,8 @@ self: { sha256 = "0vbkvc0d7j4awvdiqs0kgz3fa9m0991zlzhs3w7rxi8if2crkn47"; libraryHaskellDepends = [ base random vector ]; description = "A library for fast, easy-to-use Q-learning"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -16340,8 +16366,8 @@ self: { sha256 = "1f3wxc8ipb8ka02xq2snjs5wgl10mk528zjkpwdw5wf3fldhz037"; libraryHaskellDepends = [ base random vector ]; description = "QuadEdge structure for representing triangulations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -16354,8 +16380,8 @@ self: { libraryHaskellDepends = [ base composition lens ]; testHaskellDepends = [ base composition lens QuickCheck ]; description = "QuadTree library for Haskell, with lens support"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -16372,7 +16398,7 @@ self: { th-lift-instances ]; description = "A QuasiQuoter for Text"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Quelea" = callPackage @@ -16391,8 +16417,8 @@ self: { time transformers tuple unix uuid z3 zeromq4-haskell ]; description = "Programming with Eventual Consistency over Cassandra"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -16407,8 +16433,8 @@ self: { libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base haskell-src-exts ]; description = "Annotation Framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -16426,7 +16452,7 @@ self: { ]; testHaskellDepends = [ base deepseq process ]; description = "Automatic testing of Haskell programs"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "QuickCheck-GenT" = callPackage @@ -16437,7 +16463,7 @@ self: { sha256 = "0bn594bgvavbphm5543kqljcc7hgxk4ir0fcdjw399sbfaxpn5yz"; libraryHaskellDepends = [ base mtl QuickCheck random ]; description = "A GenT monad transformer for QuickCheck library"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "QuickCheck-safe" = callPackage @@ -16450,7 +16476,7 @@ self: { editedCabalFile = "0my9s0kcxkizbfckb35l5hyr1pmhx32l2lviy7zqh93mlmv9ig4s"; libraryHaskellDepends = [ base containers QuickCheck ]; description = "Safe reimplementation of QuickCheck's core"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "QuickCheckVariant" = callPackage @@ -16462,8 +16488,8 @@ self: { libraryHaskellDepends = [ base QuickCheck ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "Generator of \"valid\" and \"invalid\" data in a type class"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -16487,8 +16513,8 @@ self: { websockets-snap ]; description = "Quick and easy data visualization with Haskell"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -16503,8 +16529,8 @@ self: { aeson attoparsec base bytestring either text ]; description = "Quick JSON extractions with Aeson"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -16522,8 +16548,8 @@ self: { base directory filepath pandoc-types process split ]; executableHaskellDepends = [ base pandoc-types ]; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -16540,7 +16566,7 @@ self: { base HUnit lens linear test-framework test-framework-hunit vector ]; description = "The RANSAC algorithm for parameter estimation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "RBTree" = callPackage @@ -16551,7 +16577,7 @@ self: { sha256 = "0p46b105lixbxqjz8pwxf4asl4s7zdh2ss3nvgmp1rclqfg6cwrq"; libraryHaskellDepends = [ base ]; description = "Pure haskell Red-Black-Tree implemetation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "RESTng" = callPackage @@ -16568,7 +16594,7 @@ self: { ]; description = "A framework for writing RESTful applications"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "RFC1751" = callPackage @@ -16584,7 +16610,7 @@ self: { base bytestring cereal hspec QuickCheck vector ]; description = "RFC-1751 library for Haskell"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "RJson" = callPackage @@ -16599,8 +16625,8 @@ self: { array base bytestring containers iconv mtl parsec syb-with-class ]; description = "A reflective JSON serializer/parser"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -16613,8 +16639,8 @@ self: { libraryHaskellDepends = [ base binary bytestring ]; testHaskellDepends = [ base binary bytestring hspec ]; description = "RLP serialization as defined in Ethereum Yellow Paper"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -16635,8 +16661,8 @@ self: { ]; executableSystemDepends = [ canlib ftd2xx ]; description = "Binding to code that controls a Segway RMP"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {canlib = null; ftd2xx = null;}; @@ -16659,8 +16685,8 @@ self: { base BiobaseTurner BiobaseVienna BiobaseXNA cmdargs ]; description = "RNA secondary structure prediction"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -16680,8 +16706,8 @@ self: { containers HsTools primitive PrimitiveArray RNAFold split vector ]; description = "RNA secondary structure folding"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -16707,8 +16733,8 @@ self: { ]; executableHaskellDepends = [ bytestring cmdargs file-embed ]; description = "Multi-target RNA sequence design"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -16728,8 +16754,8 @@ self: { ]; executableHaskellDepends = [ cmdargs ]; description = "Draw RNA secondary structures"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -16762,8 +16788,8 @@ self: { text time vector ViennaRNAParser ]; description = "Unsupervized construction of RNA family models"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -16784,8 +16810,8 @@ self: { ]; executableHaskellDepends = [ cmdargs split ]; description = "RNA folding with non-canonical basepairs and base-triplets"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -16806,7 +16832,7 @@ self: { SHA tagged test-framework test-framework-quickcheck2 ]; description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1."; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "RSolve" = callPackage @@ -16820,7 +16846,7 @@ self: { libraryHaskellDepends = [ base containers lens mtl ]; executableHaskellDepends = [ base containers lens mtl ]; testHaskellDepends = [ base containers lens mtl ]; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "RabbitMQ" = callPackage @@ -16841,7 +16867,7 @@ self: { ]; description = "AMQP 0-9-1 client library for RabbitMQ servers"; license = "BSD-3-Clause AND GPL-3.0-or-later"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -16861,8 +16887,8 @@ self: { sdl2-image sdl2-mixer time ]; description = "A puzzle game written in Haskell with a cat in lead role"; - license = stdenv.lib.licenses.bsd3; - platforms = [ "i686-linux" "x86_64-linux" ]; + license = lib.licenses.bsd3; + platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ]; }) {}; "Random123" = callPackage @@ -16881,7 +16907,7 @@ self: { ]; benchmarkHaskellDepends = [ base criterion random ]; description = "Haskell port of Random123 library"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "RandomDotOrg" = callPackage @@ -16892,8 +16918,8 @@ self: { sha256 = "0rfarn424wsvvwvi7b1qzvzc63dxfqmlyrfd0hdcvmgkq5h2iy4c"; libraryHaskellDepends = [ base HTTP-Simple network ]; description = "Interface to random.org"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -16907,7 +16933,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base random-fu ]; description = "Randomness intuition trainer"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "Range" = callPackage @@ -16918,8 +16944,8 @@ self: { sha256 = "0759508s75zba89jjr56sqpm7idgwsxynmf9zl9hwrz9q11fxrqh"; libraryHaskellDepends = [ base ]; description = "Data structure for managing ranges"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -16934,7 +16960,7 @@ self: { libraryHaskellDepends = [ base HUnit QuickCheck ]; testHaskellDepends = [ base HUnit QuickCheck ]; description = "Ranged sets for Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Ranka" = callPackage @@ -16951,7 +16977,7 @@ self: { ]; description = "HTTP to XMPP omegle chats gate"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -16972,8 +16998,8 @@ self: { filepath ghc GLUT monad-loops OpenGL OpenGLRaw time Yampa ]; description = "Soccer simulation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -16991,7 +17017,7 @@ self: { primitive transformers vector vector-algorithms ]; description = "A pure haskell drawing engine"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Rattus" = callPackage @@ -17008,7 +17034,7 @@ self: { ]; testHaskellDepends = [ base containers ]; description = "A modal FRP language"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ReadArgs" = callPackage @@ -17023,7 +17049,7 @@ self: { executableHaskellDepends = [ base system-filepath text ]; testHaskellDepends = [ base hspec system-filepath text ]; description = "Simple command line argument parsing"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Redmine" = callPackage @@ -17046,8 +17072,8 @@ self: { transformers ]; description = "Library to access Redmine's REST services"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -17059,8 +17085,8 @@ self: { sha256 = "15qikbjbydbabc26skhavshzrsaz17a71q8hfxqvi5ix2bhhz4hm"; libraryHaskellDepends = [ base ghc-prim ]; description = "Generic Mutable Ref Abstraction Layer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -17076,7 +17102,7 @@ self: { base binary bytestring containers hashtables stringsearch ]; description = "Write to and read from ByteStrings maintaining internal memory references"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Referees" = callPackage @@ -17096,8 +17122,8 @@ self: { base cmdargs cond containers directory ]; description = "A utility for computing distributions of material to review among reviewers"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -17113,8 +17139,8 @@ self: { base containers mtl template-haskell transformers ]; description = "Generic programming library with representation types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -17126,8 +17152,8 @@ self: { sha256 = "194nbnbrf5g3d2pch6z9zapzhi0i2z30vpgjj0h5x8bfwzpf1527"; libraryHaskellDepends = [ base ]; description = "Composable replication schemes of applicative functors"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -17146,8 +17172,8 @@ self: { base directory HTTP json mtl network process random ]; description = "Haskell bindings to ReviewBoard"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -17159,8 +17185,8 @@ self: { sha256 = "065plckw5r16aalkf51y7hs2xjandad3hgfly795wakqfhdnrajw"; libraryHaskellDepends = [ base ]; description = "Tiny library to replace classic if/else"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -17189,8 +17215,8 @@ self: { algebra base criterion deepseq massiv scheduler sscript ]; description = "Parallel implementation of Ritt-Wu's algorithm"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -17214,8 +17240,8 @@ self: { ]; testHaskellDepends = [ base directory doctest hspec lens vector ]; description = "quasiquoter for inline-R code"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -17240,8 +17266,8 @@ self: { test-framework-quickcheck2 ]; description = "Limits the size of a directory's contents"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -17253,7 +17279,7 @@ self: { sha256 = "1gixw6793i4bcf1fsawfqdgvib5q7b1972fi0prrcwq7cp7nrgwr"; libraryHaskellDepends = [ base ]; description = "All hail the Royal Monad!"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "RtMidi" = callPackage @@ -17271,8 +17297,8 @@ self: { executableHaskellDepends = [ base pretty-simple vector ]; testHaskellDepends = [ base tasty tasty-hunit vector ]; description = "Haskell wrapper for RtMidi, the lightweight, cross-platform MIDI I/O library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) alsaLib;}; @@ -17284,8 +17310,8 @@ self: { sha256 = "0pwxsvkpdr4vzr6cpgjmkr55ip6ns3gcv8pma7dwzg21myx9c3vl"; libraryHaskellDepends = [ base containers stm transformers ]; description = "Reactive Extensions for Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -17306,8 +17332,8 @@ self: { Prelude text text-short time X ]; description = "Library for accessing S3 compatible storage services"; - license = stdenv.lib.licenses.gpl3Plus; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -17325,8 +17351,8 @@ self: { gnuplot hp2any-core parsec process utf8-string vector ]; description = "A benchmark suite for runtime and heap measurements over a series of inputs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -17346,8 +17372,8 @@ self: { ]; executableHaskellDepends = [ base ]; description = "ESCRIPT: a human friendly language for programming Bitcoin scripts"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -17364,8 +17390,8 @@ self: { base containers hspec QuickCheck scalendar text time ]; description = "This is a library for handling calendars and resource availability based on the \"top-nodes algorithm\" and set operations"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -17380,7 +17406,7 @@ self: { libraryHaskellDepends = [ base ]; librarySystemDepends = [ SDL ]; description = "Binding to libSDL"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) SDL;}; "SDL-gfx" = callPackage @@ -17394,7 +17420,7 @@ self: { libraryHaskellDepends = [ base SDL ]; librarySystemDepends = [ SDL_gfx ]; description = "Binding to libSDL_gfx"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) SDL_gfx;}; "SDL-image" = callPackage @@ -17408,7 +17434,7 @@ self: { libraryHaskellDepends = [ base SDL ]; librarySystemDepends = [ SDL_image ]; description = "Binding to libSDL_image"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) SDL_image;}; "SDL-mixer" = callPackage @@ -17422,7 +17448,7 @@ self: { libraryHaskellDepends = [ base SDL ]; librarySystemDepends = [ SDL_mixer ]; description = "Binding to libSDL_mixer"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) SDL_mixer;}; "SDL-mpeg" = callPackage @@ -17435,7 +17461,7 @@ self: { libraryHaskellDepends = [ base SDL ]; librarySystemDepends = [ smpeg ]; description = "Binding to the SMPEG library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) smpeg;}; "SDL-ttf" = callPackage @@ -17449,7 +17475,7 @@ self: { libraryHaskellDepends = [ base SDL ]; librarySystemDepends = [ SDL_ttf ]; description = "Binding to libSDL_ttf"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) SDL_ttf;}; "SDL2-ttf" = callPackage @@ -17461,8 +17487,8 @@ self: { libraryHaskellDepends = [ base SDL2 ]; librarySystemDepends = [ SDL2_ttf ]; description = "Binding to libSDL-ttf"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {SDL2 = null; inherit (pkgs) SDL2_ttf;}; @@ -17481,8 +17507,8 @@ self: { sfml-audio sfml-graphics sfml-network sfml-system sfml-window ]; description = "SFML bindings"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {csfml-audio = null; csfml-graphics = null; csfml-network = null; csfml-system = null; csfml-window = null; @@ -17497,8 +17523,8 @@ self: { sha256 = "001h9y9395mz6fr58s1i8svn4pyy5iqbkzzsp19xdphh4w69za9g"; libraryHaskellDepends = [ base mtl SFML template-haskell ]; description = "Higher level library on top of SFML"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -17510,8 +17536,8 @@ self: { sha256 = "077yvys00kp8lmkvc4mbynmkk9nn2ib5rh38bqcw0wnwsvl7140i"; libraryHaskellDepends = [ array base SDL Sprig ]; description = "SFont SDL Bitmap Fonts"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -17523,8 +17549,8 @@ self: { sha256 = "0aj15lp5wbldaa9ndfvni1iq7kcrjv1syln9yz77jg6p8ndk61jv"; libraryHaskellDepends = [ base mtl ]; description = "Small geometry library for dealing with vectors and collision detection"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -17539,7 +17565,7 @@ self: { executableHaskellDepends = [ base GLUT OpenGL SG ]; description = "An example of using the SG and OpenGL libraries"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -17551,8 +17577,8 @@ self: { sha256 = "1qwrhb7nw22v7j6d9x3a1ps9l7mjpwjy13zxssmimwfhbch055v3"; libraryHaskellDepends = [ base mtl ]; description = "(updated) Small geometry library for dealing with vectors and collision detection"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -17572,7 +17598,7 @@ self: { test-framework-quickcheck2 ]; description = "Implementations of the SHA suite of message digest functions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "SHA2" = callPackage @@ -17585,7 +17611,7 @@ self: { AES base bytestring monads-tf transformers ]; description = "Fast, incremental SHA hashing for bytestrings"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "SJW" = callPackage @@ -17594,8 +17620,8 @@ self: { }: mkDerivation { pname = "SJW"; - version = "0.1.2.2"; - sha256 = "0ffwlsm8ynmi1nyx1a8j65p9llk7s68g3srkgk1i47rvddn70h6q"; + version = "0.1.2.3"; + sha256 = "10ky2pd83wng5bgpqimdyxvhlfpwbssgh576ss28f1rzm6b8wqcm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -17608,8 +17634,8 @@ self: { testHaskellDepends = [ base Cabal directory filepath random ]; benchmarkHaskellDepends = [ base directory filepath random time ]; description = "The Simple Javascript Wrench"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -17626,8 +17652,8 @@ self: { old-time ]; description = "A simple SMTP client library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -17644,8 +17670,8 @@ self: { ]; libraryToolDepends = [ c2hsc ]; description = "Declarative coördination language for streaming networks"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -17661,7 +17687,7 @@ self: { base hashable HDBC HDBC-sqlite3 mtl unordered-containers ]; description = "Calculate db-data dependencies of functions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "SSTG" = callPackage @@ -17676,8 +17702,8 @@ self: { executableHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers ]; description = "STG Symbolic Execution"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -17689,8 +17715,8 @@ self: { sha256 = "18bz9qxsl7lq3j18ilczi175j3djwlpckzj5a65l4dj7d1sw1c35"; libraryHaskellDepends = [ attoparsec base bytestring cereal text ]; description = "STL 3D geometry format parsing and pretty-printing"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -17706,8 +17732,8 @@ self: { base binary bytestring transformers usb vector ]; description = "STLink USB interface in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -17724,8 +17750,8 @@ self: { transformers ]; description = "control a STM32F103 microcontroller"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -17737,7 +17763,7 @@ self: { sha256 = "0m6vvj4mfmmn1r21aglwdb6801bwr0ks60vbwz7y1cb97vsdad9v"; libraryHaskellDepends = [ base ]; description = "Definition for Peripherals,Registers and Fields from STM32F103xx.svd"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "STMonadTrans" = callPackage @@ -17753,7 +17779,7 @@ self: { array base tasty tasty-hunit tasty-quickcheck transformers ]; description = "A monad transformer version of the ST monad"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "SVD2HS" = callPackage @@ -17768,8 +17794,8 @@ self: { base containers pretty text xml-conduit xml-lens ]; description = "translate a SVD of a Microcontroller to Haskell tables"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -17787,8 +17813,8 @@ self: { base haskell98 language-c pretty svgutils syb xml ]; description = "Code generation tool for Quartz code from a SVG"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -17809,8 +17835,8 @@ self: { diagrams-lib directory parsec split text vector xml ]; description = "Fonts from the SVG-Font format"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -17822,7 +17848,7 @@ self: { sha256 = "1a4rmp1rn6jv8nkab688i146ywiv4w6fp5bpm0slwgda2x0h6lp4"; libraryHaskellDepends = [ base parsec ]; description = "Parsing the path command of SVG"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "SWMMoutGetMB" = callPackage @@ -17838,7 +17864,7 @@ self: { pipes-bytestring pipes-parse split ]; description = "A parser for SWMM 5 binary .OUT files"; - license = stdenv.lib.licenses.lgpl3; + license = lib.licenses.lgpl3; }) {}; "SableCC2Hs" = callPackage @@ -17857,8 +17883,8 @@ self: { wl-pprint-text xml ]; description = "Generate a parser (in Haskell) with the SableCC parser generator"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -17870,7 +17896,7 @@ self: { sha256 = "0ybi5r4635yjx41ig54bm426fbdzrivc5kn8fwqxmzm62ai0v623"; libraryHaskellDepends = [ base ]; description = "Library for safe (pattern match free) functions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "SafeSemaphore" = callPackage @@ -17884,7 +17910,7 @@ self: { libraryHaskellDepends = [ base containers stm ]; testHaskellDepends = [ base HUnit ]; description = "Much safer replacement for QSemN, QSem, and SampleVar"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Salsa" = callPackage @@ -17896,8 +17922,8 @@ self: { libraryHaskellDepends = [ base bytestring file-embed ]; librarySystemDepends = [ glib mono ]; description = "A .NET Bridge for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) glib; inherit (pkgs) mono;}; @@ -17921,8 +17947,8 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base data-default either hlint hspec mtl ]; description = "Saturnin CI / Job System"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -17951,8 +17977,8 @@ self: { semirings vector vector-th-unbox ]; description = "Base types and classes for statistics, sciences and humanities"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -17977,8 +18003,8 @@ self: { text th-lift-instances time unordered-containers ]; description = "Scientific workflow management system"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -17995,8 +18021,8 @@ self: { random SciFlow stm unordered-containers ]; description = "Scientific workflow management system"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -18015,8 +18041,8 @@ self: { regex-compat sqlite-simple unix ]; description = "Size limited temp filesystem based on fuse"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -18035,8 +18061,8 @@ self: { random stm time unix ]; description = "A cross platform P2P VPN application built using Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -18050,8 +18076,8 @@ self: { editedCabalFile = "0rvalvvjadb0i0rh9z5lgw2hca4a9yw3cg2f6gcx7h30f5dp8x1j"; libraryHaskellDepends = [ base bytestring ]; description = "simple static linked SHA3 using private symbols and the ref impl"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -18065,7 +18091,7 @@ self: { isExecutable = true; libraryHaskellDepends = [ base ]; description = "Data structure for querying the set (or count) of intervals covering given point"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "SelectSequencesFromMSA" = callPackage @@ -18089,8 +18115,8 @@ self: { base cmdargs directory either-unwrap ]; description = "Selects a representative subset of sequences from multiple sequence alignment"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -18109,8 +18135,8 @@ self: { split tagsoup text ]; description = "Command-line tool for maintaining the Semantique database"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -18122,8 +18148,8 @@ self: { sha256 = "1mdw1z50gr02j5hycki5rl95b1yk7xfrdk056ajw9ghw48s0jpx6"; libraryHaskellDepends = [ base bytestring containers mtl ]; description = "A semigroup"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -18135,8 +18161,8 @@ self: { sha256 = "0vk63ni1a93win8if032nps5y0xi245cmjqq2j4xfsdddg5bdln5"; libraryHaskellDepends = [ base bytestring vector ]; description = "Sequence Alignment"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -18152,8 +18178,8 @@ self: { base directory filepath hslogger mtl old-locale random time ]; description = "Easy Loggingframework"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -18167,8 +18193,8 @@ self: { testHaskellDepends = [ base containers util ]; benchmarkHaskellDepends = [ base containers gauge util ]; description = "See README for more info"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -18196,7 +18222,7 @@ self: { filepath mtl parsec QuickCheck regex-tdfa ]; description = "Shell script analysis tool"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "Shellac" = callPackage @@ -18209,8 +18235,8 @@ self: { editedCabalFile = "1nq7j00vfrhfzkbsgr6j28zr339gx5bcvq6x9mvh9qvs2jmcdz1z"; libraryHaskellDepends = [ base directory mtl unix ]; description = "A framework for creating shell envinronments"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -18224,8 +18250,8 @@ self: { editedCabalFile = "0ws8prjzj4j9yf1mqdnvlpv367cx4wfqa5jq5n6x7g9npwmd5ya0"; libraryHaskellDepends = [ base Shellac Shellac-readline ]; description = "\"compatline\" backend module for Shellac"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -18239,8 +18265,8 @@ self: { editedCabalFile = "1wyal7nqnl5sj74d9mid2dw35d37b40v132cg3zhw9ys24k0jl6v"; libraryHaskellDepends = [ base editline Shellac ]; description = "Editline backend module for Shellac"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -18252,8 +18278,8 @@ self: { sha256 = "0lhm2j8gl2vk4qasb2d6ips6qnvb4bg0mpb7mczqhahzq3i38sh4"; libraryHaskellDepends = [ base haskeline mtl Shellac ]; description = "Haskeline backend module for Shellac"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -18267,8 +18293,8 @@ self: { editedCabalFile = "019p7q1nmi2v7rb1rjnch4zaz506c4ry28mkivhkqiq3ay1m86hs"; libraryHaskellDepends = [ base readline Shellac ]; description = "Readline backend module for Shellac"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -18289,8 +18315,8 @@ self: { base QuickCheck tasty tasty-quickcheck tasty-th vector ]; description = "grammars for TSP and SHP"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -18302,7 +18328,7 @@ self: { sha256 = "1nq4i4h43nfh86f6wgwng1ps6mcdl1ba96x9wsjl3qzn3blavyfh"; libraryHaskellDepends = [ base ]; description = "Show for * -> *"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Shpadoinkle" = callPackage @@ -18319,7 +18345,7 @@ self: { transformers unliftio wai wai-app-static warp ]; description = "A programming model for declarative, high performance user interface"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Shpadoinkle-backend-pardiff" = callPackage @@ -18337,8 +18363,8 @@ self: { transformers-base unliftio ]; description = "A Virtual Dom in pure Haskell, based on Html as an Alignable Functor"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -18349,15 +18375,15 @@ self: { }: mkDerivation { pname = "Shpadoinkle-backend-snabbdom"; - version = "0.3.0.0"; - sha256 = "0ff87nxa7ff3j400k5a65in8jj00m6bk46pmana0a8k1d7ln7fsk"; + version = "0.3.0.1"; + sha256 = "0452znn1q558n1dy52j493y7f9lml57cnqbmdmqv28zq12sxpypm"; libraryHaskellDepends = [ base exceptions file-embed ghcjs-dom jsaddle monad-control mtl Shpadoinkle text transformers-base unliftio ]; description = "Use the high-performance Snabbdom virtual dom library written in JavaScript"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -18369,8 +18395,8 @@ self: { sha256 = "0kxfsm4g6mwwcrpq8bm83v32jpp97bsvl6ay0ynnmss0yf70ymmi"; libraryHaskellDepends = [ base compactable Shpadoinkle text ]; description = "A backend for rendering Shpadoinkle as Text"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -18382,7 +18408,7 @@ self: { sha256 = "0zkiv0h37a3x3569xfvfzdy0dywxhcfx12jddqf9bpfyqsxmf42a"; libraryHaskellDepends = [ aeson base jsaddle lens text unliftio ]; description = "Support for the native browser console"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Shpadoinkle-debug" = callPackage @@ -18393,7 +18419,7 @@ self: { sha256 = "1yvr3d40aa6sl3gpyr24a5hij63jm2p0jrx0kac7asjihvd6fk2g"; libraryHaskellDepends = [ aeson base jsaddle lens text unliftio ]; description = "Debugging tools for Shpadoinkle applications"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Shpadoinkle-developer-tools" = callPackage @@ -18416,8 +18442,8 @@ self: { Shpadoinkle-backend-pardiff Shpadoinkle-html stm text time unliftio ]; description = "Chrome extension to aide in development"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -18436,8 +18462,8 @@ self: { unliftio ]; description = "Shpadoinkle as a static site"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -18469,8 +18495,8 @@ self: { sqlite-simple stm text unliftio wai wai-app-static warp ]; description = "Example usages of Shpadoinkle"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -18489,8 +18515,8 @@ self: { time transformers unliftio ]; description = "A typed, template generated Html DSL, and helpers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -18502,29 +18528,31 @@ self: { sha256 = "1310ipmw2z8gdnvaqx1bydvc4p1iyhc7xv31vwbx2aszhmi873kq"; libraryHaskellDepends = [ base lens Shpadoinkle text ]; description = "Lens combinators for Shpadoinkle applications"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Shpadoinkle-router" = callPackage ({ mkDerivation, aeson, base, bytestring, compactable, exceptions - , ghcjs-dom, http-api-data, http-media, jsaddle, jsaddle-warp, lens - , network-uri, servant, servant-client, servant-client-js + , ghcjs-dom, http-api-data, http-media, http-types, jsaddle + , jsaddle-warp, lens, network-uri, servant, servant-client + , servant-client-js, servant-rawm, servant-rawm-server , servant-server, Shpadoinkle, Shpadoinkle-backend-static, text , unliftio, wai, wai-app-static, warp }: mkDerivation { pname = "Shpadoinkle-router"; - version = "0.2.0.1"; - sha256 = "0qbjczrfvcihm595rsp1k6svgr05vcrcmc9376wy5vrdwnimvn58"; + version = "0.3.0.0"; + sha256 = "1wdr71khi7nmyz4ksf7hy6ya470687wmv4x7bvv7qq2z2dsy5ns2"; libraryHaskellDepends = [ aeson base bytestring compactable exceptions ghcjs-dom - http-api-data http-media jsaddle jsaddle-warp lens network-uri - servant servant-client servant-client-js servant-server Shpadoinkle + http-api-data http-media http-types jsaddle jsaddle-warp lens + network-uri servant servant-client servant-client-js servant-rawm + servant-rawm-server servant-server Shpadoinkle Shpadoinkle-backend-static text unliftio wai wai-app-static warp ]; description = "A single page application rounter for Shpadoinkle based on Servant"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -18548,8 +18576,8 @@ self: { quickcheck-classes-base ]; description = "A collection of common reusable types and components"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -18561,7 +18589,7 @@ self: { sha256 = "105rnyrqzagfgbfdxbdx4wqhvdfxkd8d5jaxkyqd1zyvf0chi858"; libraryHaskellDepends = [ base ]; description = "4-way trie fuzzy search"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Shu-thing" = callPackage @@ -18574,7 +18602,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base GLUT ]; description = "A vector shooter game"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "SimpleAES" = callPackage @@ -18585,7 +18613,7 @@ self: { sha256 = "0s85xgwrhldyr2w3kcn9f72yjajmpz3d4dizq9p9z97rx4qva4vj"; libraryHaskellDepends = [ base binary bytestring mwc-random ]; description = "Fast AES encryption/decryption for bytestrings"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "SimpleEA" = callPackage @@ -18598,7 +18626,7 @@ self: { base mersenne-random-pure64 MonadRandom ]; description = "Simple evolutionary algorithm framework"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "SimpleGL" = callPackage @@ -18612,8 +18640,8 @@ self: { base GLFW JuicyPixels OpenGL SimpleH vector ]; description = "A Simple Graphics Library from the SimpleH framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -18631,7 +18659,7 @@ self: { ]; description = "A light, clean and powerful Haskell utility library"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "SimpleLog" = callPackage @@ -18650,8 +18678,8 @@ self: { template-haskell text th-lift time transformers transformers-base ]; description = "Simple, configurable logging"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -18672,8 +18700,8 @@ self: { base cmdargs dyre transformers wai-routes warp ]; description = "A simple static file server, for when apache is overkill"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -18686,29 +18714,28 @@ self: { libraryHaskellDepends = [ base split ]; testHaskellDepends = [ base Cabal ]; description = "Simple table generator"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "Sit" = callPackage - ({ mkDerivation, alex, array, base, containers, data-lens-light - , happy, mtl - }: + ({ mkDerivation, array, base, containers, data-lens-light, mtl }: mkDerivation { pname = "Sit"; - version = "0.2017.5.2"; - sha256 = "1hal35bp7jw2dwmnd68p27hn19mgpdf28lpf8nh0qja59gxk4lff"; - revision = "2"; - editedCabalFile = "1chbiyvp02yn03pvqd4r4z3yprb7yiwmxmw2kl6gr5aml9923w41"; - isLibrary = false; + version = "0.2021.1.18"; + sha256 = "045xbxf0jyxr6510mcfhnfbj2p0kka5l45cydlxchhwg75z8snmi"; + revision = "1"; + editedCabalFile = "0vd1j410rp27g9cbzd3b1ymv02gfmi7pcnqzgpnppi9kc0nrr6kl"; + isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; - executableHaskellDepends = [ + libraryHaskellDepends = [ array base containers data-lens-light mtl ]; - executableToolDepends = [ alex happy ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; description = "Prototypical type checker for Type Theory with Sized Natural Numbers"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "SizeCompare" = callPackage @@ -18735,8 +18762,8 @@ self: { ]; testHaskellDepends = [ base file-embed ]; description = "Generate slides from Haskell code"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -18752,8 +18779,8 @@ self: { base containers DifferenceLogic FirstOrderTheory HUnit Proper ]; description = "A tiny, lazy SMT solver"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -18765,8 +18792,8 @@ self: { sha256 = "0wmdzl3anbbfqik2kl2wjy57cd9r3ix8h8g28rmzqbvlajrvqcv1"; libraryHaskellDepends = [ base parsec transformers ]; description = "Library for parsing SMTLIB2"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -18789,8 +18816,8 @@ self: { executableSystemDepends = [ zip ]; executableToolDepends = [ cpphs ]; description = "E-library directory based on FUSE virtual file system"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) zip;}; @@ -18807,8 +18834,8 @@ self: { transformers ]; description = "Abstract full system simulator"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -18828,8 +18855,8 @@ self: { random zlib ]; description = "Football simulation framework for teaching functional programming"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -18849,8 +18876,8 @@ self: { SoccerFun ]; description = "OpenGL UI for the SoccerFun framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -18863,8 +18890,8 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck ]; description = "Sonnex is an alternative to Soundex for french language"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -18884,7 +18911,7 @@ self: { ]; description = "Static code analysis using graph-theoretic techniques"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -18902,7 +18929,7 @@ self: { JuicyPixels OpenAL OpenGL vector Win32 ]; description = "Assorted utility modules"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "SpaceInvaders" = callPackage @@ -18917,8 +18944,8 @@ self: { isExecutable = true; executableHaskellDepends = [ array base HGL random Yampa ]; description = "Video game"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -18940,8 +18967,8 @@ self: { text ]; description = "Simple space pirate roguelike"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -18953,8 +18980,8 @@ self: { sha256 = "1rf9r69a2k3qfmy2nvwm3gdimncjglsv698rdc8i8gnjwrr0c1i2"; libraryHaskellDepends = [ base monad-loops ref-mtl stm ]; description = "Lock free Spin Counter"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -18968,7 +18995,7 @@ self: { attoparsec base extra mtl mwc-random text ]; description = "Random text generation based on spintax"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Spock" = callPackage @@ -18993,8 +19020,8 @@ self: { unordered-containers vault wai wai-extra ]; description = "Another Haskell web framework for rapid development"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -19006,7 +19033,7 @@ self: { sha256 = "1wqbq8vgq5sifybw32prkmcjwm2dqz4z3sv8ci4s603a2sril7h7"; libraryHaskellDepends = [ aeson base deepseq hvect reroute ]; description = "Another Haskell web framework for rapid development"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Spock-api-ghcjs" = callPackage @@ -19021,8 +19048,8 @@ self: { aeson base bytestring ghcjs-base hvect Spock-api text ]; description = "Another Haskell web framework for rapid development"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -19034,7 +19061,7 @@ self: { sha256 = "0ra8y036vilsb75jb0lsfbdraygz6jm7b5l9002n7ixypbp2adya"; libraryHaskellDepends = [ base hvect mtl Spock-api Spock-core ]; description = "Another Haskell web framework for rapid development"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Spock-auth" = callPackage @@ -19045,8 +19072,8 @@ self: { sha256 = "1vcrl5dqjn0ri9ybza2yv80xvbv2iwrz5hj5rbhgy6i803ixlpx0"; libraryHaskellDepends = [ base http-types Spock text time ]; description = "Provides authentification helpers for Spock"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -19075,7 +19102,7 @@ self: { unordered-containers wai ]; description = "Another Haskell web framework for rapid development"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Spock-digestive" = callPackage @@ -19091,7 +19118,7 @@ self: { unordered-containers wai ]; description = "Digestive functors support for Spock"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "Spock-lucid" = callPackage @@ -19102,8 +19129,8 @@ self: { sha256 = "15r3vk78vbhqi09liq0a3zabya845zfmblqahgw6r2jjx49da9ii"; libraryHaskellDepends = [ base lucid Spock transformers ]; description = "Lucid support for Spock"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -19121,8 +19148,8 @@ self: { ]; testHaskellDepends = [ base containers HTF stm vector ]; description = "Background workers for Spock"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -19134,7 +19161,7 @@ self: { sha256 = "14d3fk0cal0svb2clbhbbk48fygwvb0k01aawfm72576mrz9mb18"; libraryHaskellDepends = [ base xml ]; description = "Write support for Excel's SpreadsheetML format"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Sprig" = callPackage @@ -19145,8 +19172,8 @@ self: { sha256 = "06jxs1hc69viv38nvafhn8ilj3xn2j9k543abgd8p69gc95w1lbn"; libraryHaskellDepends = [ base SDL ]; description = "Binding to Sprig"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -19160,7 +19187,7 @@ self: { editedCabalFile = "1n4zyl9iagzjx3i3zb5w24mf5x51nwwnnzrrc1rgkflvxlirm9md"; libraryHaskellDepends = [ base deepseq nats stm ]; description = "Stack data structure"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Stasis" = callPackage @@ -19174,8 +19201,8 @@ self: { libraryHaskellDepends = [ base containers ]; executableHaskellDepends = [ base ]; description = "A simple MVCC like library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -19187,7 +19214,7 @@ self: { sha256 = "12qg01aksbnc7cdh01y4z4jwrrhhwcakc9gh6ywxhq1bj591a9pf"; libraryHaskellDepends = [ base stm transformers ]; description = "State variables"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "StateVar-transformer" = callPackage @@ -19198,7 +19225,7 @@ self: { sha256 = "1dbpxwjz6yf4ap20wm5ngvd0i0knkjsdahmd90ymddqj82v8w3d0"; libraryHaskellDepends = [ base mtl transformers ]; description = "State variables"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "StatisticalMethods" = callPackage @@ -19209,7 +19236,7 @@ self: { sha256 = "1h90i6crknxv23zryqi7mfzg65g1ydv62mza1hiri66jlmdahir6"; libraryHaskellDepends = [ base statistics tuple vector ]; description = "Collection of useful statistical methods"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "StockholmAlignment" = callPackage @@ -19225,8 +19252,8 @@ self: { vector ]; description = "Libary for Stockholm aligmnent format"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -19242,8 +19269,8 @@ self: { base binary bytestring network time utf8-string ]; description = "Client library for Stomp brokers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -19255,8 +19282,8 @@ self: { sha256 = "1cicz4d5kyl9j4y3p79m3fk56vcqk3220a6y536dw525x6180dzw"; libraryHaskellDepends = [ base containers ]; description = "An abstract data type designed for the exchange of tree-like data structures"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -19276,8 +19303,8 @@ self: { Strafunski-StrategyLib template-haskell ]; description = "Converts SDF to Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -19291,8 +19318,8 @@ self: { editedCabalFile = "1g9ksfgcz8fjasn78zq7w1yw9wk87i4gd5i0pf31gnf4l3963yz8"; libraryHaskellDepends = [ base directory mtl syb transformers ]; description = "Library for strategic programming"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -19310,8 +19337,8 @@ self: { ]; testHaskellDepends = [ base blaze-builder bytestring hspec text ]; description = "General purpose templates in haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -19323,7 +19350,7 @@ self: { sha256 = "1sskndywpm1gi4bs4i1gah73jk49inlscg4jzcqhq0phb8f886xk"; libraryHaskellDepends = [ base mtl ]; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "Stream" = callPackage @@ -19334,7 +19361,7 @@ self: { sha256 = "1l87l0kl4awzdyx6b28npwy6xf03r39d89iharsh06zgnd4y42wr"; libraryHaskellDepends = [ base lazysmallcheck QuickCheck ]; description = "A library for manipulating infinite lists"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "StrictBench" = callPackage @@ -19347,7 +19374,7 @@ self: { libraryHaskellDepends = [ base benchpress parallel ]; description = "Benchmarking code through strict evaluation"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -19366,8 +19393,8 @@ self: { base deepseq generics-sop HUnit QuickCheck ]; description = "StrictCheck: Keep Your Laziness In Check"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -19379,7 +19406,7 @@ self: { sha256 = "1wbixjgzad3s9jj16kl0gvwg82g3hqvkag9wr5j58w98a4qyqw8i"; libraryHaskellDepends = [ base ]; description = "String manipulation utilities"; - license = stdenv.lib.licenses.lgpl3; + license = lib.licenses.lgpl3; }) {}; "SuffixStructures" = callPackage @@ -19405,8 +19432,8 @@ self: { base bytestring cmdargs criterion deepseq mwc-random vector ]; description = "Suffix array construction"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -19423,7 +19450,7 @@ self: { ]; description = "Library which aids constructing generic (SYB3-based) widgets"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -19441,7 +19468,7 @@ self: { ]; description = "Syntax Macros in the form of an EDSL"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -19462,8 +19489,8 @@ self: { pretty statistics template-haskell time vector ]; description = "Sybase 15 sysmon reports processor"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -19484,8 +19511,8 @@ self: { base Cabal directory filepath process unix ]; description = "Testing By Convention"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -19502,8 +19529,8 @@ self: { mtl numeric-tools parallel ]; description = "Utilities for condensed matter physics tight binding calculations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -19520,7 +19547,7 @@ self: { RefSerialize stm text ]; description = "A Transactional cache with user-defined persistence"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "THEff" = callPackage @@ -19531,7 +19558,7 @@ self: { sha256 = "0rpjd93lsqg3dqfjndm9l1nzyrbfs5nnvc61lmbmbhg0bcy0jms8"; libraryHaskellDepends = [ base template-haskell ]; description = "TH implementation of effects"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "TORCS" = callPackage @@ -19553,7 +19580,7 @@ self: { executableHaskellDepends = [ base bytestring Yampa ]; description = "Bindings to the TORCS vehicle simulator"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -19576,8 +19603,8 @@ self: { sha256 = "0vz9j5vjypnkbzld18f6kczfj54disf43x5052s4n7gqzsjxpxvb"; libraryHaskellDepends = [ base DeepArrow TypeCompose ]; description = "Tangible Values -- composable interfaces"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -19593,8 +19620,8 @@ self: { array base containers mtl template-haskell transformers ]; description = "Template Your Boilerplate - a Template Haskell version of SYB"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -19610,7 +19637,7 @@ self: { base containers HaXml mtl pretty template-haskell ]; description = "Ferry Table Algebra"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Tables" = callPackage @@ -19623,8 +19650,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base cookbook ]; description = "A client for Quill databases"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -19638,8 +19665,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base parsec xhtml ]; description = "Tool to render CSV into tables of various formats"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -19659,7 +19686,7 @@ self: { mtl optparse-applicative text ]; description = "Tahin Password Generator"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Tainted" = callPackage @@ -19670,7 +19697,7 @@ self: { sha256 = "1mjr81z42qhwa6njlvlsslpzbbpiab88ns8g8amskwv159gk6mlb"; libraryHaskellDepends = [ base mtl ]; description = "Tainted type, and associated operations"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Takusen" = callPackage @@ -19683,8 +19710,8 @@ self: { isExecutable = true; libraryHaskellDepends = [ base mtl old-time time ]; description = "Database library with left-fold interface, for PostgreSQL, Oracle, SQLite, ODBC"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -19696,8 +19723,8 @@ self: { sha256 = "1d66l67cicn3q4a6glfxfkhc9cjm7vqi0bnyjad0bzyyv409j6bp"; libraryHaskellDepends = [ base comonad distributive Stream ]; description = "Bidirectionally infinite streams, akin to the tape of a Turing machine"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -19716,8 +19743,8 @@ self: { xmonad-contrib ]; description = "A collection of tools which can be used to access taskwarrior from xmonad"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -19733,8 +19760,8 @@ self: { aeson base bytestring either-unwrap fgl parsec text vector ]; description = "Libary for parsing, processing and vizualization of taxonomy data"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -19754,8 +19781,8 @@ self: { EntrezHTTP fgl hxt parsec process Taxonomy text vector ]; description = "Tool for parsing, processing, comparing and visualizing taxonomy data"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -19766,8 +19793,10 @@ self: { }: mkDerivation { pname = "TeX-my-math"; - version = "0.202.0.0"; - sha256 = "0aiw7ag87kcwz47hasr0k79b9dvm0waf3j2qf5p7l2lld438chsb"; + version = "0.202.1.0"; + sha256 = "1cp3spzlssnnzvnxvkg59h4nnv2icvld9mdkhn97b043kvmbp4hl"; + revision = "2"; + editedCabalFile = "1j3nbbljj89mhhcld7dzgmixilfikwng05zcndsisnz75r1kp1gv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -19782,8 +19811,8 @@ self: { template-haskell text ]; description = "Render general Haskell math to LaTeX. Or: math typesetting with high signal-to-noise–ratio."; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -19799,8 +19828,8 @@ self: { array base containers mtl SDL SDL-image SDL-mixer SFont Sprig ]; description = "TeaHS Game Creation Library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -19812,7 +19841,7 @@ self: { sha256 = "0kyg43ah15fpvy8gypacimjnhb7j250jqksg6w5znz57fg0rari4"; libraryHaskellDepends = [ base ]; description = "Tensor data types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "TernaryTrees" = callPackage @@ -19826,7 +19855,7 @@ self: { libraryHaskellDepends = [ base binary ]; executableHaskellDepends = [ base ]; description = "Efficient pure ternary tree Sets and Maps"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "TestExplode" = callPackage @@ -19844,7 +19873,7 @@ self: { process text ]; description = "Generates testcases from program-snippets"; - license = stdenv.lib.licenses.lgpl3; + license = lib.licenses.lgpl3; }) {}; "Theora" = callPackage @@ -19856,7 +19885,7 @@ self: { libraryHaskellDepends = [ base ]; librarySystemDepends = [ ogg theora ]; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {ogg = null; theora = null;}; @@ -19868,8 +19897,8 @@ self: { sha256 = "0fl6pk2vp765gyzc4afjdg0lgbnh5v08gfbp0kzny4ng25bmxqwa"; libraryHaskellDepends = [ base cairo gtk mtl ]; description = "Purely functional 2D drawing"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -19881,7 +19910,7 @@ self: { sha256 = "0rpcv6kw351ykj36f83qdqygrhk4ylqlcgcswxl8gg1v33jaaqmz"; libraryHaskellDepends = [ base ]; description = "Mutable objects that reside in their own threads"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "Thrift" = callPackage @@ -19898,7 +19927,7 @@ self: { ]; description = "Haskell bindings for the Apache Thrift RPC system"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "Tic-Tac-Toe" = callPackage @@ -19911,7 +19940,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base safe ]; description = "Tic Tac Toe in your command line!"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "TicTacToe" = callPackage @@ -19927,8 +19956,8 @@ self: { test-framework-hunit test-framework-quickcheck2 ]; description = "A sub-project (exercise) for a functional programming course"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -19940,7 +19969,7 @@ self: { sha256 = "02plz1y7lmvp3jpl5srsnx2nkl6yhhfn6pqj00szs688cahk2dik"; libraryHaskellDepends = [ base binary bytestring dataenc ]; description = "TigerHash with C implementation"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }) {}; "TimePiece" = callPackage @@ -19963,8 +19992,8 @@ self: { SDL-ttf ]; description = "A simple tile-based digital clock screen saver"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -19976,8 +20005,8 @@ self: { sha256 = "1xxadd8pqbgl0z8vrqn8fm6x0c9l2y3a7irjmjkh9750x6hdb4b9"; libraryHaskellDepends = [ base mtl ]; description = "Simple implementation of call-by-need using Launchbury's semantics"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -19989,8 +20018,8 @@ self: { sha256 = "0y8bl6w3ix2zjhm10wazgi70sr02ydc3hrwjbr6whk341n140wsh"; libraryHaskellDepends = [ base HTTP network ]; description = "Use TinyURL to compress URLs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -20004,8 +20033,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base containers matrix random ]; description = "Game for Lounge Marmelade"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -20021,7 +20050,7 @@ self: { executableHaskellDepends = [ base containers mtl parsec ]; description = "Constraint solving framework employed by the Helium Compiler"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -20041,8 +20070,8 @@ self: { ]; testToolDepends = [ markdown-unlit ]; description = "A total map datatype"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -20060,8 +20089,8 @@ self: { test-framework-quickcheck2 ]; description = "Tournament related algorithms"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -20073,7 +20102,7 @@ self: { sha256 = "0la19yynd7bpswi9012hf0vl9c4fdnn8p6y0287xanmdcs9zqz16"; libraryHaskellDepends = [ base ]; description = "Functions that should have been in Debug.Trace"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "TransformeR" = callPackage @@ -20090,8 +20119,8 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck ]; description = "eDSL in R for Safe Variable Transformarion"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -20105,8 +20134,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base containers mtl ]; description = "Tutorial on monad transformers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -20118,7 +20147,7 @@ self: { sha256 = "04n1ld6h3q71iqnvwyabzj69vdy2x98w0drriyx13ykywbd31036"; libraryHaskellDepends = [ base containers ]; description = "A library to apply transformation to containers so as to maximize sharing of unchanged subcomponents"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "TreeCounter" = callPackage @@ -20129,8 +20158,8 @@ self: { sha256 = "06ci4v8gflsgi73wrpqvhb7w3mdkbjgidhqf95yyk4wiga1mrzal"; libraryHaskellDepends = [ base ref-mtl stm ]; description = "Wait-free Tree Counter"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -20142,8 +20171,8 @@ self: { sha256 = "1lcj166i8f7850fqjv7xqxdn6zwpdynzxn3bf243wdnwmnn5pysx"; libraryHaskellDepends = [ base ]; description = "A collection of heaps and search trees"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -20155,7 +20184,7 @@ self: { sha256 = "0d1k4nblcnksh2j6b4v14r2xd2kn6cmqmyqhmy6wyz3kr0lyzxqd"; libraryHaskellDepends = [ base containers transformers ]; description = "Transformer for Data.Tree"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "Treiber" = callPackage @@ -20166,8 +20195,8 @@ self: { sha256 = "09sd9p1y3zqkfahkp1vgdnlvgv1vnvdl7kdzccsd41h1h61fz3jd"; libraryHaskellDepends = [ base ghc-prim monad-loops ref-mtl stm ]; description = "Lock free Treiber stack"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -20184,8 +20213,8 @@ self: { optparse-applicative time ]; description = "A simple trend Graph script"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -20203,8 +20232,8 @@ self: { th-expand-syns transformers unpack-funcs vector ]; description = "Automatic type inference of generalized tries with Template Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -20224,7 +20253,7 @@ self: { tagged ]; description = "An implementation of the Twofish Symmetric-key cipher"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "TypeClass" = callPackage @@ -20243,8 +20272,8 @@ self: { SDL SDL-ttf transformers ]; description = "Typing speed game"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -20258,7 +20287,7 @@ self: { editedCabalFile = "1pxg6az5vkl0zvs3zdvvvnhxqawd9fkkd44jmzzzyyibppgni6x4"; libraryHaskellDepends = [ base base-orphans ]; description = "Type composition classes & instances"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "TypeIlluminator" = callPackage @@ -20271,8 +20300,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base haskell98 ]; description = "TypeIlluminator is a prototype tool exploring debugging of type errors/"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -20284,8 +20313,8 @@ self: { sha256 = "1css4pb2x514s396c35brghgn3pgysdps8k09k1wcx5k2qpg90cx"; libraryHaskellDepends = [ base ]; description = "Some Nat-indexed types for GHC"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -20299,7 +20328,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base containers directory time ]; description = "Command Line Typing speed tester"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "UISF" = callPackage @@ -20314,7 +20343,7 @@ self: { array arrows base containers deepseq GLUT OpenGL stm transformers ]; description = "Library for Arrowized Graphical User Interfaces"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "UMM" = callPackage @@ -20332,7 +20361,7 @@ self: { ]; description = "A small command-line accounting tool"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -20350,8 +20379,8 @@ self: { QuickCheck regular template-haskell ]; description = "Library for maintaining correctness of URLs within an application"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -20363,8 +20392,8 @@ self: { sha256 = "1l62z7798bby4fbrz62ic802g8zah3flb2pmsd3ky7y5903s3nxr"; libraryHaskellDepends = [ attoparsec base bytestring containers ]; description = "DEPRECATED A simple, liberal URL parser"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -20388,8 +20417,8 @@ self: { base bytestring directory filepath hspec JuicyPixels time ]; description = "Processing popular picture formats into .c or .raw format in RGB565"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -20410,8 +20439,8 @@ self: { base bytestring criterion hashable QuickCheck quickcheck-instances ]; description = "It provides the functionality like unix \"uniq\" utility"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ kiwi ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ kiwi ]; }) {}; "Unixutils" = callPackage @@ -20427,7 +20456,7 @@ self: { process-extras pureMD5 regex-tdfa unix zlib ]; description = "A crude interface between Haskell and Unix-like operating systems"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Unixutils-shadow" = callPackage @@ -20438,7 +20467,7 @@ self: { sha256 = "11m8lgq2rjvh7j8si7sqixf4k4ns65jy0zp6apqp0xc23c1znyr7"; libraryHaskellDepends = [ base unix ]; description = "A simple interface to shadow passwords (aka, shadow.h)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Updater" = callPackage @@ -20449,8 +20478,8 @@ self: { sha256 = "0iry59pyd4iy0cmj6flr05lbk3696l1z8wswqcfp8q8m5ibykkz0"; libraryHaskellDepends = [ base ]; description = "Monadic FRP library based on stm"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -20462,8 +20491,8 @@ self: { sha256 = "1y21v5k7s9sj8z5r3czp5i80x40zvyqxzr1xl28ardwj5q5rrvzp"; libraryHaskellDepends = [ base cgi MaybeT mtl ]; description = "Url dispatcher. Helps to retain friendly URLs in web applications."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -20475,7 +20504,7 @@ self: { sha256 = "01xb68qh29q6b0pdxvadqw7q1p855k14jdz1qjlhg6785n0qp954"; libraryHaskellDepends = [ base containers random ]; description = "Some useful functions and shorthands"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "UtilityTM" = callPackage @@ -20486,7 +20515,7 @@ self: { sha256 = "1mjy3w4sw32rbmm13yhmpidfsj91v3p58jvki16z0kzk3fswpa85"; libraryHaskellDepends = [ base ]; description = "Utility functions that are missing from the standard library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "VKHS" = callPackage @@ -20516,8 +20545,8 @@ self: { regexpr text ]; description = "Provides access to Vkontakte social network via public API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -20541,8 +20570,8 @@ self: { aeson base doctest megaparsec prettyprinter text ]; description = "VRML parser and generator for Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -20556,8 +20585,8 @@ self: { base bifunctors semigroupoids semigroups ]; description = "A data-type like Either but with an accumulating Applicative"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -20569,7 +20598,7 @@ self: { sha256 = "0hyk553pdn72zc1i82njz3md8ycmzfiwi799y08qr3fg0i8r88zm"; libraryHaskellDepends = [ array base ghc-prim ]; description = "Fixed-length lists and low-dimensional linear algebra"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Vec-Boolean" = callPackage @@ -20580,8 +20609,8 @@ self: { sha256 = "0zxxpychddmlrv7r190gn4dl282ak4qfk2d92l24qxi9fds1rshk"; libraryHaskellDepends = [ base Boolean Vec ]; description = "Provides Boolean instances for the Vec package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -20593,8 +20622,8 @@ self: { sha256 = "0qsi1s8qp3fkr5alh2m7y1a1lm5xypjvmk174ywf0aga2y20bblm"; libraryHaskellDepends = [ base OpenGLRaw Vec ]; description = "Instances and functions to interoperate Vec and OpenGL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -20606,8 +20635,8 @@ self: { sha256 = "0jwi9kgij8xd0419nkksgffwcn94fz6ijdq8s29b771409a1pkfc"; doHaddock = false; description = "This package is obsolete"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -20619,7 +20648,7 @@ self: { sha256 = "1hv8idxv9gniwwjs67q75bbcc5ry9r05cxjmsxk0q54l8zscdss2"; libraryHaskellDepends = [ base Peano ]; description = "a simple peano-indexed vector type"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Verba" = callPackage @@ -20633,8 +20662,8 @@ self: { enableSeparateDataOutput = true; executableHaskellDepends = [ base containers matrix ]; description = "A solver for the WordBrain game"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -20655,7 +20684,7 @@ self: { testToolDepends = [ c2hs ]; description = "ViennaRNA v2 bindings"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "ViennaRNA-extras" = callPackage @@ -20678,8 +20707,8 @@ self: { tasty-th vector ]; description = "ViennaRNA v2 extensions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -20696,7 +20725,7 @@ self: { ]; testHaskellDepends = [ base hspec parsec ]; description = "Libary for parsing ViennaRNA package output"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "Villefort" = callPackage @@ -20726,8 +20755,8 @@ self: { unbounded-delays webdriver ]; description = "Villefort is a task manager and time tracker"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -20739,20 +20768,20 @@ self: { sha256 = "1jpw465n1abwi17s0yixg31f2zx28a24k3vh3kx59lknrw8q9jz1"; libraryHaskellDepends = [ base ]; description = "A binding for the Vulkan API"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "VulkanMemoryAllocator" = callPackage ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "VulkanMemoryAllocator"; - version = "0.3.11"; - sha256 = "0xlw2znk6lzblc9iv13fiy2zxngglc9ylzb1lj6qcfdnbi1sr9n0"; + version = "0.3.12"; + sha256 = "0j46hhwfqbry6w8l8wj0p486rsyvxkk6dbvhd1sjkha6cy5cvar4"; libraryHaskellDepends = [ base bytestring transformers vector vulkan ]; description = "Bindings to the VulkanMemoryAllocator library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; platforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; @@ -20769,8 +20798,8 @@ self: { base bytestring containers parseargs ]; description = "WAVE audio file IO library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -20784,8 +20813,8 @@ self: { testHaskellDepends = [ base directory filepath ]; doHaddock = false; description = "Generic text-editor logic for use with fixed-width fonts"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -20800,8 +20829,8 @@ self: { libraryHaskellDepends = [ base brick microlens vty WEditor ]; executableHaskellDepends = [ base brick vty WEditor ]; description = "Text-editor widget with dynamic line-wrapping for use with Brick"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -20814,8 +20843,8 @@ self: { libraryHaskellDepends = [ base hyphenation WEditor ]; testHaskellDepends = [ base directory hyphenation WEditor ]; description = "Language-specific hyphenation policies for WEditor"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -20832,8 +20861,8 @@ self: { base directory filepath mtl unix WL500gPLib ]; description = "A simple command line tools to control the Asus WL500gP router"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -20848,8 +20877,8 @@ self: { libraryHaskellDepends = [ base curl mtl tagsoup ]; executableHaskellDepends = [ base ]; description = "A simple library to access to the WL 500gP router from the Haskell code"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -20869,8 +20898,8 @@ self: { base bytestring cryptohash hspec lens random split vector ]; description = "WebMoney authentication module"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -20882,8 +20911,8 @@ self: { sha256 = "13vfszyfyxwz4zi8zilifd0jad1gwlr75x931q8qbpi1kwr7mivk"; libraryHaskellDepends = [ base haskell98 parsec ]; description = "Convert the WURFL file into a Parsec parser"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -20896,8 +20925,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers wx wxcore ]; description = "WXDiffCtrl"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -20916,8 +20945,8 @@ self: { ]; executableHaskellDepends = [ directory ghc-paths process ]; description = "WASH is a family of EDSLs for programming Web applications in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -20934,8 +20963,8 @@ self: { QuickCheck text transformers vector ]; description = "Parsers and utilities for the OBJ WaveFront 3D model format"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -20951,7 +20980,7 @@ self: { aeson base bytestring HTTP text unordered-containers ]; description = "Library for interacting with the Weather Underground JSON API"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "WebBits" = callPackage @@ -20962,8 +20991,8 @@ self: { sha256 = "1frmnjbpgm76dzs1p4766fb6isqc3pxv4dnj8sdhnfliv5j0xv2z"; libraryHaskellDepends = [ base containers mtl parsec pretty syb ]; description = "JavaScript analysis tools"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -20980,7 +21009,7 @@ self: { ]; description = "JavaScript analysis tools"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -20997,8 +21026,8 @@ self: { base multiplate multiplate-simplified transformers WebBits ]; description = "A Multiplate instance for JavaScript"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -21017,8 +21046,8 @@ self: { xhtml ]; description = "Continuation based web programming for Happstack"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -21033,8 +21062,8 @@ self: { libraryHaskellDepends = [ base parsec ]; executableHaskellDepends = [ base parsec ]; description = "Logic interpreter"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -21061,8 +21090,8 @@ self: { template-haskell text transformers unordered-containers vector ]; description = "Regexp-like engine to scrap web data"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -21087,8 +21116,8 @@ self: { test-framework-quickcheck2 text ]; description = "The frictionless WAI Framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -21100,8 +21129,8 @@ self: { sha256 = "0rzpf8z414qvkbks16zizsxsinvbdxbm1n0dbav11p286791xx1j"; libraryHaskellDepends = [ base parsec ]; description = "A parser for wikimedia style article markup"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -21114,19 +21143,19 @@ self: { revision = "1"; editedCabalFile = "1ia6dk2fvxg3gzqdmcypdka6fcnnrza23hq1rhslj53jy3qzs3kn"; description = "A binding to part of the Win32 library"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + platforms = lib.platforms.none; }) {}; - "Win32_2_10_1_0" = callPackage + "Win32_2_11_0_0" = callPackage ({ mkDerivation }: mkDerivation { pname = "Win32"; - version = "2.10.1.0"; - sha256 = "1il70gh3ysmp4pnhk7dxcbd0c0mh5ay33b9ijmmj0ikmbw0nfpbv"; + version = "2.11.0.0"; + sha256 = "179v0jypafjnh98gl8wr6z6pq1r5h740xzm2b6axd2d33zlnacfm"; description = "A binding to Windows Win32 API"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + platforms = lib.platforms.none; }) {}; "Win32-console" = callPackage @@ -21137,8 +21166,8 @@ self: { sha256 = "0117f413db3qr09m7rc09q44mbhahjkaqczb04g5f24x7fbwrn39"; libraryHaskellDepends = [ base Win32 ]; description = "Binding to the Win32 console API"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + platforms = [ "armv7l-linux" ]; }) {}; "Win32-dhcp-server" = callPackage @@ -21149,8 +21178,8 @@ self: { sha256 = "0r0629nnjmlw245czxf4gyzrl0zhgm3fjgjy1bs8622zsvfdavrz"; libraryHaskellDepends = [ base text Win32 Win32-errors ]; description = "Win32 DHCP Server Management API"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + platforms = [ "armv7l-linux" ]; }) {}; "Win32-errors" = callPackage @@ -21164,8 +21193,8 @@ self: { libraryHaskellDepends = [ base template-haskell text Win32 ]; testHaskellDepends = [ base hspec QuickCheck Win32 ]; description = "Alternative error handling for Win32 foreign calls"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + platforms = [ "armv7l-linux" ]; }) {}; "Win32-extras" = callPackage @@ -21179,8 +21208,8 @@ self: { libraryHaskellDepends = [ base Win32 ]; librarySystemDepends = [ imm32 msimg32 ]; description = "Provides missing Win32 API"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + platforms = [ "armv7l-linux" ]; }) {imm32 = null; msimg32 = null;}; "Win32-junction-point" = callPackage @@ -21191,8 +21220,8 @@ self: { sha256 = "1pvlvhdp4wcz8kn5nldhrkryz03dmzyzvjbm8x1ri9kwq1icd941"; libraryHaskellDepends = [ base text Win32 Win32-errors ]; description = "Support for manipulating NTFS junction points"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + platforms = [ "armv7l-linux" ]; }) {}; "Win32-notify" = callPackage @@ -21205,8 +21234,8 @@ self: { isExecutable = true; libraryHaskellDepends = [ base containers directory Win32 ]; description = "A binding to part of the Win32 library for file notification"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + platforms = [ "armv7l-linux" ]; }) {}; "Win32-security" = callPackage @@ -21219,8 +21248,8 @@ self: { isExecutable = true; libraryHaskellDepends = [ base text Win32 Win32-errors ]; description = "Haskell bindings to a security-related functions of the Windows API"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + platforms = [ "armv7l-linux" ]; }) {}; "Win32-services" = callPackage @@ -21232,8 +21261,8 @@ self: { libraryHaskellDepends = [ base Win32 Win32-errors ]; librarySystemDepends = [ Advapi32 ]; description = "Windows service applications"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + platforms = [ "armv7l-linux" ]; }) {Advapi32 = null;}; "Win32-services-wrapper" = callPackage @@ -21248,8 +21277,8 @@ self: { base directory filepath Win32 Win32-errors Win32-services ]; description = "Wrapper code for making a Win32 service"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + platforms = [ "armv7l-linux" ]; }) {}; "Win32-shortcut" = callPackage @@ -21263,8 +21292,8 @@ self: { libraryHaskellDepends = [ base mtl th-utilities Win32 ]; librarySystemDepends = [ libossp_uuid ole32 ]; description = "Support for manipulating shortcuts (.lnk files) on Windows"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + platforms = lib.platforms.none; }) {inherit (pkgs) libossp_uuid; ole32 = null;}; "Wired" = callPackage @@ -21280,8 +21309,8 @@ self: { base chalmers-lava2000 containers mtl QuickCheck ]; description = "Wire-aware hardware description"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -21321,8 +21350,8 @@ self: { tasty-th text ]; description = "Bigram word pair alignments"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -21336,8 +21365,8 @@ self: { editedCabalFile = "08i5izbni7xism94h6ncmdvfy88gny2vybapv0fkzgw3wyf6arhq"; libraryHaskellDepends = [ array base containers filepath ]; description = "Haskell interface to the WordNet database"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -21351,8 +21380,8 @@ self: { editedCabalFile = "1wdx2xv6zxvwkz3jkkd4vcdf9hyyivbfwyln9dd30m67ip7illp3"; libraryHaskellDepends = [ array base containers filepath ]; description = "Haskell interface to the WordNet database"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -21368,7 +21397,7 @@ self: { executableHaskellDepends = [ base boxes cmdargs ]; description = "Plaintext prose redundancy linter"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "Workflow" = callPackage @@ -21387,8 +21416,8 @@ self: { extensible-exceptions mtl old-time RefSerialize stm TCache vector ]; description = "Workflow patterns over a monad for thread state logging & recovery"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -21404,7 +21433,7 @@ self: { ]; description = "Generic (SYB3) construction of wxHaskell widgets"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -21436,7 +21465,7 @@ self: { libX11 libXext libXinerama libXrandr libXrender libXScrnSaver ]; description = "A binding to the X11 graphics library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXScrnSaver; inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXrender;}; @@ -21452,8 +21481,8 @@ self: { libraryHaskellDepends = [ base X11 ]; librarySystemDepends = [ libX11 ]; description = "Missing bindings to the X11 graphics library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs.xorg) libX11;}; @@ -21465,8 +21494,8 @@ self: { sha256 = "11jxlaad9jgjddd5v8ygy2rdrajrbm9dlp6f0mslvxa2wzn4v4r3"; libraryHaskellDepends = [ base X11 ]; description = "A binding to the resource management functions missing from X11"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -21479,8 +21508,8 @@ self: { libraryHaskellDepends = [ base X11 ]; librarySystemDepends = [ Xdamage ]; description = "A binding to the Xdamage X11 extension library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {Xdamage = null;}; @@ -21493,8 +21522,8 @@ self: { libraryHaskellDepends = [ base X11 ]; librarySystemDepends = [ Xfixes ]; description = "A binding to the Xfixes X11 extension library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {Xfixes = null;}; @@ -21518,7 +21547,7 @@ self: { sha256 = "19p71lc0hihfn0xzl29j01kd0zf9yalspwj7dava0ybc1rm3g62h"; libraryHaskellDepends = [ base X11 ]; description = "A binding to the Xshape X11 extension library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "XAttr" = callPackage @@ -21541,8 +21570,8 @@ self: { libraryHaskellDepends = [ base Win32 ]; librarySystemDepends = [ xinput ]; description = "Bindings for the DirectX XInput library"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + platforms = [ "armv7l-linux" ]; }) {inherit (pkgs.xorg) xinput;}; "XML" = callPackage @@ -21561,8 +21590,8 @@ self: { ]; testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; description = "Extensible Markup Language"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "XMLParser" = callPackage @@ -21573,7 +21602,7 @@ self: { sha256 = "1vdgbmf27ghvyjzkcymsz9fgv9lcss41n5hiyqc58nzg0w18r0ik"; libraryHaskellDepends = [ base parsec ]; description = "A library to parse xml"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "XMMS" = callPackage @@ -21587,7 +21616,7 @@ self: { librarySystemDepends = [ xmmsclient xmmsclient-glib ]; description = "XMMS2 client library"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {xmmsclient = null; xmmsclient-glib = null;}; @@ -21604,8 +21633,8 @@ self: { base haskell98 hsdns mtl network parsec random utf8-string ]; description = "XMPP library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -21632,8 +21661,8 @@ self: { rdf4h text unordered-containers vector ]; description = "An implementation of a polynomial-time top-down parser suitable for NLP"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -21646,7 +21675,7 @@ self: { libraryHaskellDepends = [ base ]; libraryPkgconfigDepends = [ libXau ]; description = "A binding to the X11 authentication library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs.xorg) libXau;}; "Xec" = callPackage @@ -21664,8 +21693,8 @@ self: { old-time SHA unix ]; description = "Gtk command launcher with identicon"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -21677,8 +21706,8 @@ self: { sha256 = "0dv5nvvqy6w0ndjyab4bwhjpw1hlx8xi4bv2jw4rl8v6y68bilk1"; libraryHaskellDepends = [ base mtl transformers ]; description = "A library for writing XML and HTML"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -21690,8 +21719,8 @@ self: { sha256 = "11g1gipc9v81h5jzndr3j7j4mwr4lva9b52fd0hml4mrzf6vj2dx"; libraryHaskellDepends = [ base ]; description = "Pure haskell implementation of xorshift128plus random number generator"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -21712,8 +21741,8 @@ self: { SDL-image SDL-mixer SDL-ttf transformers ]; description = "Yet Another Pong Clone using SDL"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -21725,8 +21754,8 @@ self: { sha256 = "17pp79yr8jfmhx85vlr5kx7q5wha48p3ra7l4ligd583yxzvlnif"; libraryHaskellDepends = [ array base HGL Yampa ]; description = "Yampa-based library for programming robots"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -21761,8 +21790,8 @@ self: { yesod-recaptcha yesod-static ]; description = "A simple blog engine powered by Yesod"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -21791,7 +21820,7 @@ self: { ]; description = "YAML reference implementation"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -21808,7 +21837,7 @@ self: { ]; testHaskellDepends = [ base ]; description = "Elegant Functional Reactive Programming Language for Hybrid Systems"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Yampa-core" = callPackage @@ -21821,7 +21850,7 @@ self: { isExecutable = true; libraryHaskellDepends = [ base deepseq random vector-space ]; description = "Library for programming hybrid systems"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "YampaSynth" = callPackage @@ -21839,8 +21868,8 @@ self: { array base bytestring containers HCodecs Yampa ]; description = "Software synthesizer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -21852,7 +21881,7 @@ self: { sha256 = "1krp17rw25b7a280rf3idpfzkx39kpfcjqwznz96y0d2sdqbhg6p"; libraryHaskellDepends = [ base containers parsec ]; description = "A Minimal JSON Parser & Printer for Haskell"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "Yogurt" = callPackage @@ -21868,8 +21897,8 @@ self: { syb time ]; description = "A MUD client library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -21889,35 +21918,36 @@ self: { ]; executableSystemDepends = [ readline ]; description = "A functional MUD client"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) readline;}; "Z-Data" = callPackage - ({ mkDerivation, base, Cabal, case-insensitive, deepseq, ghc-prim - , hashable, hspec, hspec-discover, HUnit, integer-gmp, primitive - , QuickCheck, quickcheck-instances, scientific, tagged - , template-haskell, time, unordered-containers + ({ mkDerivation, base, bytestring, Cabal, case-insensitive + , containers, deepseq, ghc-prim, hashable, hspec, hspec-discover + , HUnit, integer-gmp, primitive, QuickCheck, quickcheck-instances + , scientific, tagged, template-haskell, time, unordered-containers }: mkDerivation { pname = "Z-Data"; - version = "0.3.0.0"; - sha256 = "09pai7qhw6pjzrs05ac51f3v1ms0gdhkyp01jqkxzr9sllsbrgaq"; + version = "0.5.0.0"; + sha256 = "07yx0mh1h0p5qsw0sn20mcz542h5dh3p6l3nbzqrjvdpp22s27h0"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ - base case-insensitive deepseq ghc-prim hashable integer-gmp - primitive QuickCheck scientific tagged template-haskell time - unordered-containers + base bytestring case-insensitive containers deepseq ghc-prim + hashable integer-gmp primitive QuickCheck scientific tagged + template-haskell time unordered-containers ]; testHaskellDepends = [ - base hashable hspec HUnit integer-gmp primitive QuickCheck - quickcheck-instances scientific time + base containers hashable hspec HUnit integer-gmp primitive + QuickCheck quickcheck-instances scientific time + unordered-containers ]; testToolDepends = [ hspec-discover ]; description = "Array, vector and text"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -21925,12 +21955,12 @@ self: { ({ mkDerivation, base, bytestring, containers, exceptions, hashable , hspec, hspec-discover, HUnit, primitive, QuickCheck , quickcheck-instances, scientific, stm, time, unix-time - , unordered-containers, word8, Z-Data, zlib + , unordered-containers, Z-Data, zlib }: mkDerivation { pname = "Z-IO"; - version = "0.3.0.0"; - sha256 = "0nsjqs9xyj8rw2wqml48la5mv7haf5117r4cqi02g35b57f7dq40"; + version = "0.4.0.0"; + sha256 = "0jyx2mghm40llcvilg6m9120wfngvpmsggy7xy6zdf29lz3v9bd5"; libraryHaskellDepends = [ base containers exceptions primitive stm time unix-time unordered-containers Z-Data @@ -21938,12 +21968,40 @@ self: { libraryToolDepends = [ hspec-discover ]; testHaskellDepends = [ base bytestring hashable hspec HUnit primitive QuickCheck - quickcheck-instances scientific word8 Z-Data zlib + quickcheck-instances scientific Z-Data zlib ]; testToolDepends = [ hspec-discover ]; description = "Simple and high performance IO toolkit for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + + "Z-MessagePack" = callPackage + ({ mkDerivation, base, containers, deepseq, hashable, hspec + , hspec-discover, HUnit, integer-gmp, primitive, QuickCheck + , quickcheck-instances, scientific, tagged, time + , unordered-containers, Z-Data, Z-IO + }: + mkDerivation { + pname = "Z-MessagePack"; + version = "0.1.0.0"; + sha256 = "0ck21z1yqjx4w86h7z4ndj0fkpx7bfxfr9p5ls8687b71wxyzn6z"; + revision = "2"; + editedCabalFile = "14p2w38wrc8m66421wdl7q7fn21vk4b5m2mi2sa79wnaibv43d1n"; + libraryHaskellDepends = [ + base containers deepseq hashable integer-gmp primitive QuickCheck + scientific tagged time unordered-containers Z-Data Z-IO + ]; + testHaskellDepends = [ + base containers hashable hspec HUnit primitive QuickCheck + quickcheck-instances scientific time unordered-containers Z-Data + Z-IO + ]; + testToolDepends = [ hspec-discover ]; + description = "MessagePack"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -21953,15 +22011,15 @@ self: { }: mkDerivation { pname = "Z-YAML"; - version = "0.2.0.0"; - sha256 = "0q0hyqvkirmlfbs6j1b892p1m3nf7n44nj7mbv0c9b5y2cjr44zi"; + version = "0.3.0.0"; + sha256 = "1z5k6qd9hsbwlvxcmy442g8fk7707fccwa9l8b518psp29nd7kzm"; libraryHaskellDepends = [ base primitive scientific transformers unordered-containers Z-Data Z-IO ]; description = "YAML tools"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -21975,8 +22033,8 @@ self: { editedCabalFile = "17dsvvbv3kf0b85l15fdkbvfpjhcmqw3j54j8av59wqhqncgnx2r"; libraryHaskellDepends = [ base vect ]; description = "Polymer growth simulation method"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -21992,8 +22050,8 @@ self: { base CC-delcont containers mtl network unix ]; description = "Oleg's Zipper FS"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -22008,8 +22066,8 @@ self: { enableSeparateDataOutput = true; executableHaskellDepends = [ array base gtk mtl random ]; description = "A Z-machine interpreter"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -22021,7 +22079,7 @@ self: { sha256 = "05cnpl9c6i0j8jqr4j43b32jgryv34gahimhp9g1m45idgnl2sn0"; libraryHaskellDepends = [ base TypeCompose ]; description = "Zipping folds"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ZipperAG" = callPackage @@ -22032,7 +22090,7 @@ self: { sha256 = "0nl08r7s3r5hr5jag499fillca16wsb8yqz1dlzydvacqcklcxr9"; libraryHaskellDepends = [ base syz ]; description = "An implementationg of Attribute Grammars using Functional Zippers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Zora" = callPackage @@ -22049,7 +22107,7 @@ self: { ]; testHaskellDepends = [ base containers random tasty tasty-hunit ]; description = "Graphing library wrapper + assorted useful functions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "Zwaluw" = callPackage @@ -22060,8 +22118,8 @@ self: { sha256 = "1crvcvni5gzpc1c6cnaqqp0gng1l9gk9d8ac23967nvp82xav7s1"; libraryHaskellDepends = [ base ]; description = "Combinators for bidirectional URL routing"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -22081,7 +22139,7 @@ self: { ]; description = "Compare genome assemblies"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -22095,7 +22153,7 @@ self: { testHaskellDepends = [ base HUnit text ]; description = "Parser for a language similar to Cucumber's Gherkin"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "abc-puzzle" = callPackage @@ -22111,7 +22169,7 @@ self: { array base minisat random random-shuffle Safe ]; description = "Generate instances of the ABC Logic Puzzle"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "abcBridge" = callPackage @@ -22135,8 +22193,8 @@ self: { tasty-hunit tasty-quickcheck vector ]; description = "Bindings for ABC, A System for Sequential Synthesis and Verification"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {abc = null;}; @@ -22150,8 +22208,8 @@ self: { base parsec prettify process semigroups ]; description = "Haskell representation and parser for ABC notation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -22171,8 +22229,8 @@ self: { scientific text time unordered-containers uuid vector ]; description = "interconversion between aeson and bson"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -22185,8 +22243,8 @@ self: { libraryHaskellDepends = [ base comonad ]; testHaskellDepends = [ base comonad tasty tasty-quickcheck ]; description = "Simple boolean tests to see if a value abides by certain properties"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -22206,8 +22264,8 @@ self: { test-framework test-framework-hunit text ]; description = "Parse ABNF and generate parsers for the specified document"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -22219,7 +22277,7 @@ self: { sha256 = "18jwswjxwzc9bjiy4ds6hw2a74ki797jmfcifxd2ga4kh7ri1ah9"; libraryHaskellDepends = [ array base containers random time ]; description = "Abstract, parameterized interface to mutable Deques"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "abstract-deque-tests" = callPackage @@ -22239,7 +22297,7 @@ self: { test-framework-hunit time ]; description = "A test-suite for any queue or double-ended queue satisfying an interface"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "abstract-par" = callPackage @@ -22250,7 +22308,7 @@ self: { sha256 = "0q6qsniw4wks2pw6wzncb1p1j3k6al5njnvm2v5n494hplwqg2i4"; libraryHaskellDepends = [ base deepseq ]; description = "Type classes generalizing the functionality of the 'monad-par' library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "abstract-par-accelerate" = callPackage @@ -22263,8 +22321,8 @@ self: { abstract-par accelerate array base vector ]; description = "Provides the class ParAccelerate, nothing more"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -22280,8 +22338,8 @@ self: { base profunctors transformers transformers-compat vinyl ]; description = "Abstract binding trees for Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -22295,8 +22353,8 @@ self: { base hashable unordered-containers vector ]; description = "Aho-Corasick string matching algorithm in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -22308,8 +22366,8 @@ self: { sha256 = "1nsnbvllwznbqycw33f09vfgqvqmqfkcbi367clm6k4v6rfswzl3"; libraryHaskellDepends = [ ac-machine base conduit text ]; description = "Drive Aho-Corasick machines in Conduit pipelines"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -22329,8 +22387,8 @@ self: { ]; benchmarkHaskellDepends = [ criterion rerebase ]; description = "Sequence optimized for monoidal construction and folding"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -22358,7 +22416,7 @@ self: { ]; testHaskellDepends = [ base doctest ]; description = "An embedded language for accelerated array processing"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "accelerate-arithmetic" = callPackage @@ -22376,8 +22434,8 @@ self: { accelerate accelerate-utility base QuickCheck ]; description = "Linear algebra and interpolation using the Accelerate framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -22406,8 +22464,8 @@ self: { vector-th-unbox wide-word ]; description = "Fixed-length large integer arithmetic for Accelerate"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "accelerate-blas" = callPackage @@ -22435,8 +22493,8 @@ self: { criterion deepseq hmatrix mwc-random mwc-random-accelerate ]; description = "Numeric Linear Algebra in Accelerate"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "accelerate-cublas" = callPackage @@ -22463,8 +22521,8 @@ self: { base cuda hmatrix pooled-io random timeit utility-ht ]; description = "Basic Linear Algebra using native CUBLAS library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "accelerate-cuda" = callPackage @@ -22488,8 +22546,8 @@ self: { template-haskell text transformers unix unordered-containers ]; description = "Accelerate backend for NVIDIA GPUs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "accelerate-cufft" = callPackage @@ -22507,8 +22565,8 @@ self: { accelerate-utility base cuda cufft ]; description = "Accelerate frontend to the CUFFT library (Fourier transform)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "accelerate-examples" = callPackage @@ -22548,8 +22606,8 @@ self: { repa-io scientific vector vector-algorithms ]; description = "Examples using the Accelerate library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "accelerate-fft" = callPackage @@ -22573,8 +22631,8 @@ self: { tasty tasty-hedgehog ]; description = "FFT using the Accelerate library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "accelerate-fftw" = callPackage @@ -22589,8 +22647,8 @@ self: { accelerate accelerate-io base carray fft storable-complex ]; description = "Accelerate frontend to the FFTW library (Fourier transform)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -22616,8 +22674,8 @@ self: { accelerate-utility base criterion utility-ht ]; description = "Fast Fourier transform and convolution using the Accelerate framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -22636,8 +22694,8 @@ self: { accelerate-fourier base criterion ]; description = "Compare different implementations of the Fast Fourier Transform"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "accelerate-io" = callPackage @@ -22648,7 +22706,7 @@ self: { sha256 = "048md40pfacxa1mbzncybxzwp9fzmsaq8i94pd8ai677n2zyw5cg"; libraryHaskellDepends = [ accelerate base ]; description = "Convert between Accelerate arrays and raw pointers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "accelerate-io-JuicyPixels" = callPackage @@ -22663,8 +22721,8 @@ self: { accelerate accelerate-io-vector base JuicyPixels vector ]; description = "Convert between Accelerate arrays and JuicyPixels images"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "accelerate-io-array" = callPackage @@ -22680,8 +22738,8 @@ self: { accelerate array base hedgehog tasty tasty-hedgehog ]; description = "Convert between Accelerate and array"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "accelerate-io-bmp" = callPackage @@ -22694,8 +22752,8 @@ self: { accelerate accelerate-io-bytestring base bmp ]; description = "Convert between Accelerate arrays and BMP images"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "accelerate-io-bytestring" = callPackage @@ -22706,8 +22764,8 @@ self: { sha256 = "15j42ahdcqpy4xbpp1xibfbjcrijy0hpfxp4k53qkb9bcqaknyq1"; libraryHaskellDepends = [ accelerate base bytestring ]; description = "Convert between Accelerate and ByteString"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "accelerate-io-cereal" = callPackage @@ -22721,8 +22779,8 @@ self: { accelerate accelerate-io-bytestring base cereal ]; description = "Binary serialisation of Accelerate arrays using cereal"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "accelerate-io-repa" = callPackage @@ -22733,8 +22791,8 @@ self: { sha256 = "084gzvfwz6prwra5393lfm5hgvssxwij0cdf24fq5nahzn7x2wrp"; libraryHaskellDepends = [ accelerate base repa ]; description = "Convert between Accelerate and Repa arrays"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "accelerate-io-serialise" = callPackage @@ -22749,7 +22807,7 @@ self: { accelerate accelerate-io-bytestring base serialise ]; description = "Binary serialisation of Accelerate arrays using serialise"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "accelerate-io-vector" = callPackage @@ -22765,8 +22823,8 @@ self: { accelerate base hedgehog tasty tasty-hedgehog vector ]; description = "Convert between Accelerate and vector"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "accelerate-kullback-liebler" = callPackage @@ -22792,8 +22850,8 @@ self: { benchmarkToolDepends = [ cpphs ]; doHaddock = false; description = "Kullback-Liebler divergence"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "accelerate-llvm" = callPackage @@ -22813,7 +22871,7 @@ self: { unordered-containers vector ]; description = "Accelerate backend component generating LLVM IR"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "accelerate-llvm-native" = callPackage @@ -22835,8 +22893,8 @@ self: { libraryToolDepends = [ c2hs ]; testHaskellDepends = [ accelerate base ]; description = "Accelerate backend for multicore CPUs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -22858,8 +22916,8 @@ self: { ]; testHaskellDepends = [ accelerate base ]; description = "Accelerate backend for NVIDIA GPUs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "accelerate-random" = callPackage @@ -22870,8 +22928,8 @@ self: { sha256 = "1wqy11aw99gq7hd0g539synsh6kv8j4a09p9b1k29hpanjr009kd"; libraryHaskellDepends = [ accelerate base mwc-random ]; description = "Generate Accelerate arrays filled with high quality pseudorandom numbers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -22894,8 +22952,8 @@ self: { smallcheck tasty tasty-hunit tasty-quickcheck tasty-smallcheck ]; description = "a typesafe way encode accelerate matrices and vectors"; - license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -22907,8 +22965,8 @@ self: { sha256 = "1wdxypkgkjngrlkw4fnxqqqbcy3chaw5fim0xyzcbh52zd0b62wh"; libraryHaskellDepends = [ accelerate base utility-ht ]; description = "Utility functions for the Accelerate framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -22920,8 +22978,8 @@ self: { sha256 = "16hgs81cs3zgbvsprh9lzvyxbh58g7rijf1d4j0dkrpnqnrvg0hy"; libraryHaskellDepends = [ base bytestring HTTP json network text ]; description = "A Haskell implementation of the Accentuate.us API."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -22933,8 +22991,8 @@ self: { sha256 = "13kg8mjrnif88r0w7b041x4vmzdm9aqrx4fskc3qv3smpq2q2ngs"; libraryHaskellDepends = [ base filepath old-time time unix ]; description = "Cross-platform support for retrieving file access times"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -22961,8 +23019,8 @@ self: { th-format unliftio unliftio-core uuid ]; description = "Provides Access Token for Services"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -22974,7 +23032,7 @@ self: { sha256 = "0dlszai5bz05algxm98kjhnjwa7mwj620d52vrsc4fxds8q84sjg"; libraryHaskellDepends = [ base bifunctors lens semigroups ]; description = "Data type like Either but with accumulating error type"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ace" = callPackage @@ -22992,7 +23050,7 @@ self: { base bifunctors hspec HUnit mtl parsec text ]; description = "Attempto Controlled English parser and printer"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "achille" = callPackage @@ -23015,8 +23073,8 @@ self: { tasty-hunit text time ]; description = "A library for building static site generators"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -23048,7 +23106,7 @@ self: { base criterion directory mtl random system-fileio system-filepath ]; description = "Add ACID guarantees to any serializable Haskell data structure"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "acid-state-dist" = callPackage @@ -23073,8 +23131,8 @@ self: { acid-state base criterion directory mtl safecopy ]; description = "A replication backend for acid-state"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -23090,8 +23148,8 @@ self: { acid-state base directory HsOpenSSL network safecopy ]; description = "Add TLS support for Data.Acid.Remote"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -23103,7 +23161,7 @@ self: { sha256 = "0bwlsdxk3lbir90xhar7xd83cwarqcm0a86gvwaghknpil2ay4cg"; libraryHaskellDepends = [ base process ]; description = "Writing and calling ACL2 from Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "acme-all-monad" = callPackage @@ -23114,8 +23172,8 @@ self: { sha256 = "1qay7m16yjsjg8anbinkagb2v8r67k5wsppkrwyskn9jcb1wnbgv"; libraryHaskellDepends = [ base transformers ]; description = "A monad which is powerful enough to interpret any action"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -23131,7 +23189,7 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "A full featured empty project"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "acme-cadre" = callPackage @@ -23142,7 +23200,7 @@ self: { sha256 = "1nclcq48r547rgmd4h0hf498z27d15lp4da9yb3a3sy7qk6m92bi"; libraryHaskellDepends = [ base ]; description = "car, cdr and more"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "acme-circular-containers" = callPackage @@ -23160,7 +23218,7 @@ self: { base containers doctest doctest-discover graph-wrapper ]; description = "Spineless containers which are fast to read but inefficient to update"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "acme-cofunctor" = callPackage @@ -23171,7 +23229,7 @@ self: { sha256 = "0ydlnp0bbl5haci3a5x59sj2biylmpkqwzy749fhp8jn1cr8fg4x"; libraryHaskellDepends = [ base ]; description = "A Cofunctor is a structure from category theory dual to Functor"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "acme-colosson" = callPackage @@ -23182,7 +23240,7 @@ self: { sha256 = "0mfnav0wb0ks365n3kghaic6nasp3qaznhmsdccx35h164ixj9vc"; libraryHaskellDepends = [ base random ]; description = "Determines whether it is numberwang"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "acme-comonad" = callPackage @@ -23193,8 +23251,8 @@ self: { sha256 = "1sc0alwdgfls18y4q4y0qkbzqm4fgzd9yv6dwwnzw3472vsz2x8s"; libraryHaskellDepends = [ base comonad ]; description = "A more efficient dualization"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -23209,7 +23267,7 @@ self: { libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base ]; description = "Maybe gives you a cute boy"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "acme-cutegirl" = callPackage @@ -23223,7 +23281,7 @@ self: { libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base ]; description = "Maybe gives you a cute girl"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "acme-default" = callPackage @@ -23234,7 +23292,7 @@ self: { sha256 = "0hkx2zpk3w9vh1jdhpwkd7x7hwr3zf5z9n6f30rjrbyqmxnicpip"; libraryHaskellDepends = [ base ]; description = "A class for types with a distinguished aesthetically pleasing value"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "acme-dont" = callPackage @@ -23246,7 +23304,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "A \"don't\" construct"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "acme-flipping-tables" = callPackage @@ -23257,8 +23315,8 @@ self: { sha256 = "1xl5gwc67acg47fdkgrn7sjvvvnc4sjf5vifph0jb3c7gv93n757"; libraryHaskellDepends = [ base ]; description = "Stop execution with rage"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -23270,7 +23328,7 @@ self: { sha256 = "0b99f1js5w5904rw20xfmg8sfv0l8fdcnp90jx4rrczcirp6h6iq"; libraryHaskellDepends = [ base ]; description = "The best applicative functors"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "acme-grawlix" = callPackage @@ -23281,7 +23339,7 @@ self: { sha256 = "170cvi3b13wb8imfz3yc3323v2dnyhrr080syjqam477ahwggwsn"; libraryHaskellDepends = [ base ]; description = "More readable names for commonly used symbols"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "acme-hq9plus" = callPackage @@ -23292,8 +23350,8 @@ self: { sha256 = "0da4ysj74fmhcbbvxxfb6w97pr870518k90vwnc3z8kglj1ni187"; libraryHaskellDepends = [ base ]; description = "An embedded DSL for the HQ9+ programming language"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -23311,8 +23369,8 @@ self: { base bytestring extensible-exceptions mtl network pretty ]; description = "fastest Haskell PONG server in the world"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -23327,8 +23385,8 @@ self: { libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base ]; description = "Evil inventions in the Tri-State area"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -23341,7 +23399,7 @@ self: { libraryHaskellDepends = [ base ]; description = "The only true way to do IO in Haskell!"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "acme-iot" = callPackage @@ -23352,7 +23410,7 @@ self: { sha256 = "0y43prc9ykkbyvrq879ys753cijphmya7ig1m3v1g7fwyy9n23gx"; libraryHaskellDepends = [ base ghc-prim mtl transformers ]; description = "IO monad transformer"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "acme-kitchen-sink" = callPackage @@ -23363,8 +23421,8 @@ self: { sha256 = "0b587ryd63zyap7c3a1dnm25y0k9a6i2sx26xzg0wrq8hfh0f815"; libraryHaskellDepends = [ base ]; description = "A place for dumping that does-not-feel-right code while you improve it"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -23376,8 +23434,8 @@ self: { sha256 = "039pz5lw3p8iy1gaijvbc8296djxcziw70a0rnw0iz3iy29w1fmc"; libraryHaskellDepends = [ base text ]; description = "free your haskell from the tyranny of npm!"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.agpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -23389,7 +23447,7 @@ self: { sha256 = "08issbr9lgc2saqvgs80sxl1sgi7ig5jg6iykv1g1zl5k1kv2a32"; libraryHaskellDepends = [ base parsec random random-shuffle text ]; description = "LOLSPEAK translator"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "acme-lookofdisapproval" = callPackage @@ -23400,7 +23458,7 @@ self: { sha256 = "194xvcab14bs3b3nrayxp4z3da60afxa9cmip58mkms5016kwhis"; libraryHaskellDepends = [ base ]; description = "Express your disapproval"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "acme-memorandom" = callPackage @@ -23411,7 +23469,7 @@ self: { sha256 = "1l6kxmdb7fi47ldfpcqbl6h4dnzw6zw0ahxmvx6sxwxm3x4hynhi"; libraryHaskellDepends = [ base MemoTrie random ]; description = "Memoized random number generation"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "acme-microwave" = callPackage @@ -23422,7 +23480,7 @@ self: { sha256 = "136lwxcimj241nq9l0x7icxk1q9xz826sg07d40yj87shir52j39"; libraryHaskellDepends = [ base ]; description = "The eighth wonder of the world, kitchen math!"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "acme-miscorder" = callPackage @@ -23433,8 +23491,8 @@ self: { sha256 = "180fs64vlbxb2700qq8hzzz82kkmpknakkbk66ddkk1pdl7nm0j4"; libraryHaskellDepends = [ base random ]; description = "Miscellaneous newtypes for orderings of discutable use"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -23446,7 +23504,7 @@ self: { sha256 = "0nvkgdj04i21gq5k541an8zjz0hzzy7dpi384yrhcyh14jsxhqz5"; libraryHaskellDepends = [ base stm ]; description = "Cause serious international side effects"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "acme-mutable-package" = callPackage @@ -23460,8 +23518,8 @@ self: { setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base ]; description = "A mutable package"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -23473,8 +23531,8 @@ self: { sha256 = "0lnrsndx7r00b7vgh9jmp5j635m4pb2bzx0lfhqidkzfc2llzwsm"; libraryHaskellDepends = [ base time ]; description = "An interface to the philosophical and metaphysical \"now\""; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -23486,8 +23544,8 @@ self: { sha256 = "1p5rdssdmds6yqgv3yvlh835h180h9q9430j8i6qrhygqn8lmv87"; libraryHaskellDepends = [ base template-haskell ]; description = "Define the less than and add and subtract for nats"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -23500,7 +23558,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "A name for omitted definitions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "acme-one" = callPackage @@ -23511,7 +23569,7 @@ self: { sha256 = "11sgx648g5594w8m8x8r25x7s61jyyxazp5dcfyglvhc7zlrrvbb"; doHaddock = false; description = "The identity element of package dependencies"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "acme-operators" = callPackage @@ -23522,8 +23580,8 @@ self: { sha256 = "1wf12iphv12srygdvhy7xyja453dzjmm6kd9l2qp00fx986zd01w"; libraryHaskellDepends = [ base ]; description = "Operators of base, all in one place!"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -23535,8 +23593,8 @@ self: { sha256 = "1kjfpihicb6f3kn5gzr0ya8f73g4y3kvw7y4plv67cpbc1icnpjl"; libraryHaskellDepends = [ acme-left-pad base ]; description = "The flexibility of Haskell and the safety of PHP"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -23548,7 +23606,7 @@ self: { sha256 = "02gml2db5vigkwkx99lqzjkpfaqdc74x16bgdx62kf7r3nn37my9"; libraryHaskellDepends = [ base split ]; description = "Make more than one point in numeric literals"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "acme-realworld" = callPackage @@ -23559,7 +23617,7 @@ self: { sha256 = "0ffhichjhhic7d5cjypmd2zmcq0dpqiz5ygsw0y67v83hry0vf8r"; libraryHaskellDepends = [ base ]; description = "Primitives for manipulating the state of the universe"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "acme-safe" = callPackage @@ -23571,7 +23629,7 @@ self: { libraryHaskellDepends = [ acme-dont base ]; description = "Safe versions of some infamous haskell functions such as fromJust"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "acme-schoenfinkel" = callPackage @@ -23588,8 +23646,8 @@ self: { test-framework-th ]; description = "Proper names for curry and uncurry"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -23602,7 +23660,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "Smuggle arbitrary values in arbitrary types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "acme-strfry" = callPackage @@ -23613,8 +23671,8 @@ self: { sha256 = "1r6xnkyx22khzq6hlb8bk0fnbb6hlwbf12wajhx8vcxa7bkhh8lb"; libraryHaskellDepends = [ base bytestring ]; description = "A binding to the glibc strfry function"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -23628,8 +23686,8 @@ self: { editedCabalFile = "0i5hark97zl45iyiijxj07d2pg112kh3jcmjmscpbss5l5n02h23"; libraryHaskellDepends = [ base ]; description = "Stringly Typed Programming"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -23641,7 +23699,7 @@ self: { sha256 = "1anj8yygzcqkl4nwqwbrmwsqda84qcl8yzq7pgx2b7p895xcfa68"; libraryHaskellDepends = [ base mtl ]; description = "A Haskell port of the C/PHP strtok function"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "acme-this" = callPackage @@ -23654,8 +23712,8 @@ self: { editedCabalFile = "1xizmz9yyhxkkaynlk9x0l1nv5maz0shk3d1ipaphc9c6q4b1mjq"; libraryHaskellDepends = [ base template-haskell ]; description = "import This"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -23667,7 +23725,7 @@ self: { sha256 = "1dfwn0n4hg6zs4ikz6jzkn2spwsvchs1jgq7662aq4ljyp7f1rvb"; libraryHaskellDepends = [ base ghc-prim mtl transformers ]; description = "An easy way to perform and unperform IO and other stateful actions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "acme-year" = callPackage @@ -23680,7 +23738,7 @@ self: { testHaskellDepends = [ base time ]; benchmarkHaskellDepends = [ base criterion ]; description = "Get the current year"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "acme-zalgo" = callPackage @@ -23693,7 +23751,7 @@ self: { editedCabalFile = "1l2m9hh6mbc59h17z17gcfzgza25jj912d413pw1q37r3v4y0a1c"; libraryHaskellDepends = [ array base random ]; description = "A somewhat flexible Zalgo̐ te̳͜x̥̖̉̓͞t̍̌̔ ̀̃t̴̢̞̜͓̝r̶̬̆̂̒͟á̧̡͎͔̯̰̕n̹̾̓ͬͦ̍͘ṡ̢͓͉ͮ͆l̠̖̹̗̳̖̽̌ͤ͞a͚̭͙̹̲ͭͩt͈͐o̢̭͇͍̟͐ͬ̾ͪ͜r͇.̸̅ͭ̐̀̊ͨ͛"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "acme-zero" = callPackage @@ -23704,8 +23762,8 @@ self: { sha256 = "06d4hpda8qwwq9wzkgx6fpiq39l1md8sfm9hnvh4r95xyg5q53f6"; doHaddock = false; description = "The absorbing element of package dependencies"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -23729,8 +23787,8 @@ self: { relude tasty tasty-golden text ]; description = "AcousticBrainz API client"; - license = stdenv.lib.licenses.cc0; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.cc0; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -23742,7 +23800,7 @@ self: { sha256 = "1spw70dw8x6d9dy5wg47fim4kpsvzgr25nmwpv8c4wd8g3gmnqmw"; libraryHaskellDepends = [ base transformers ]; description = "Abstraction over management of resources"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "action-permutations" = callPackage @@ -23753,7 +23811,7 @@ self: { sha256 = "0rhlzpwshixpnqma7sk28f22dkwz39b6lcwnzmd31rcnz5cyw6d4"; libraryHaskellDepends = [ base ]; description = "Execute a set of actions (e.g. parsers) in each possible order"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "active" = callPackage @@ -23773,8 +23831,8 @@ self: { base lens linear QuickCheck semigroupoids semigroups vector ]; description = "Abstractions for animation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -23803,8 +23861,8 @@ self: { utf8-string xhtml ]; description = "Haskell code presentation tool"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -23818,8 +23876,8 @@ self: { editedCabalFile = "1v2sw9n9kiqc7cy0v1923ld645dykmk57bgdrgdgfv6qkfp6ghdd"; libraryHaskellDepends = [ base QuickCheck ]; description = "Basic definitions for activehs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -23831,8 +23889,8 @@ self: { sha256 = "1a9x42x0bysia00672qala6q6g5dgdfzwlzk2969c7q9gsxf63y9"; libraryHaskellDepends = [ aeson base network-uri text time ]; description = "ActivityPub Haskell Library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -23846,8 +23904,8 @@ self: { aeson base text time unordered-containers ]; description = "An interface to the ActivityStreams specification"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -23860,8 +23918,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base haskell98 stm time ]; description = "Actors with multi-headed receive clauses"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -23877,8 +23935,8 @@ self: { ]; doHaddock = false; description = "Semigroup actions and torsors"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -23899,7 +23957,7 @@ self: { testHaskellDepends = [ base directory doctest filepath ]; benchmarkHaskellDepends = [ base criterion erf ]; description = "Automatic Differentiation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "adaptive-containers" = callPackage @@ -23910,8 +23968,8 @@ self: { sha256 = "16h0zi55hf9g07xisbcmgkx72m9laiqykh2r9nh2siczx3sxi1qk"; libraryHaskellDepends = [ base ]; description = "Self optimizing container types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -23923,8 +23981,8 @@ self: { sha256 = "1kf4d3qf8nv61c7pajv234b2vil84c2cq40csnm456lg55qh53r1"; libraryHaskellDepends = [ base template-haskell type-level ]; description = "Self-optimizing tuple types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -23939,8 +23997,8 @@ self: { base bytestring cereal containers mtl network ]; description = "Android Debug Bridge (ADB) protocol"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -23962,7 +24020,7 @@ self: { parsec-permutation strict text time ]; description = "Convert adblock config files to privoxy format"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "addLicenseInfo" = callPackage @@ -23975,7 +24033,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base process ]; description = "Adds license info to the top of a file"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "addy" = callPackage @@ -23996,8 +24054,8 @@ self: { tasty tasty-hedgehog tasty-hunit text text-icu validation-selective ]; description = "A full-featured library for parsing, validating, and rendering email addresses"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -24016,7 +24074,7 @@ self: { ]; description = "Ad-hoc P2P network protocol"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -24038,8 +24096,8 @@ self: { test-framework-quickcheck2 vector ]; description = "Approximate dictionary searching"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -24055,8 +24113,8 @@ self: { testHaskellDepends = [ base hs-functors ]; benchmarkHaskellDepends = [ base gauge hs-functors ]; description = "See README for more info"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -24080,7 +24138,7 @@ self: { testHaskellDepends = [ base distributive generic-deriving hspec ]; testToolDepends = [ hspec-discover ]; description = "Adjunctions and representable functors"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "adler32" = callPackage @@ -24093,7 +24151,7 @@ self: { librarySystemDepends = [ zlib ]; testHaskellDepends = [ base bytestring hspec ]; description = "An implementation of Adler-32, supporting rolling checksum operation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) zlib;}; "adobe-swatch-exchange" = callPackage @@ -24113,8 +24171,8 @@ self: { base binary bytestring data-binary-ieee754 language-css mtl pretty ]; description = "parse Adobe Swatch Exchange files and (optionally) output .css files with the colors"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -24135,8 +24193,8 @@ self: { test-framework test-framework-hunit test-framework-quickcheck2 ]; description = "ADP for multiple context-free languages"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -24156,8 +24214,8 @@ self: { test-framework-quickcheck2 ]; description = "Subword construction in adp-multi using monadiccp"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -24169,8 +24227,8 @@ self: { sha256 = "0cp14n2l3scbsp7f6s4r19ngn2ympns03pm6s07hdkpavvgli1zg"; libraryHaskellDepends = [ base ]; description = "Modelling, rendering and quantitative analysis on attack defense trees"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -24193,8 +24251,8 @@ self: { ]; testHaskellDepends = [ base directory filepath HUnit text ]; description = "Advent of Code REST API bindings and servant API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -24226,7 +24284,7 @@ self: { template-haskell th-lift th-lift-instances ]; description = "Parse Advent of Code ASCII art letters"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "aern2-mp" = callPackage @@ -24244,8 +24302,8 @@ self: { ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "Multi-precision ball (interval) arithmetic"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -24269,8 +24327,8 @@ self: { ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "Exact real numbers via Cauchy sequences and MPFR"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -24303,7 +24361,7 @@ self: { these time time-compat unordered-containers uuid-types vector ]; description = "Fast JSON parsing and encoding"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "aeson-applicative" = callPackage @@ -24314,8 +24372,8 @@ self: { sha256 = "0plbpln1glmf8a53f4nag1lx7sy8lcali6f1m526zifgak99p3qz"; libraryHaskellDepends = [ aeson base text unordered-containers ]; description = "make To/From JSOn instances from an applicative description"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -24328,7 +24386,7 @@ self: { libraryHaskellDepends = [ aeson attoparsec base ]; testHaskellDepends = [ base ]; description = "Embed an Attoparsec text parser into an Aeson parser"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "aeson-better-errors" = callPackage @@ -24345,7 +24403,7 @@ self: { transformers-compat unordered-containers vector void ]; description = "Better error messages when decoding JSON values"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "aeson-bson" = callPackage @@ -24362,7 +24420,7 @@ self: { ]; description = "Mapping between Aeson's JSON and Bson objects"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "aeson-casing" = callPackage @@ -24378,7 +24436,7 @@ self: { aeson base tasty tasty-hunit tasty-quickcheck tasty-th ]; description = "Tools to change the formatting of field names in Aeson instances"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "aeson-coerce" = callPackage @@ -24389,7 +24447,7 @@ self: { sha256 = "0i6pv9hkwp4h7wwmnr6lwaqjkwykdgqkvpycm7fpyrlw5ipkp728"; libraryHaskellDepends = [ aeson base bytestring containers text ]; description = "Initial project template from stack"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "aeson-combinators" = callPackage @@ -24409,7 +24467,7 @@ self: { aeson base bytestring doctest hspec text utf8-string ]; description = "Aeson combinators for dead simple JSON decoding"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "aeson-commit" = callPackage @@ -24425,7 +24483,7 @@ self: { aeson aeson-qq base tasty tasty-hspec text ]; description = "Parse Aeson data with commitment"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "aeson-compat" = callPackage @@ -24453,7 +24511,7 @@ self: { time-locale-compat unordered-containers vector ]; description = "Compatibility layer for aeson"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "aeson-decode" = callPackage @@ -24471,8 +24529,8 @@ self: { aeson-qq base containers hedgehog text time ]; description = "Easy functions for converting from Aeson.Value"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -24485,7 +24543,7 @@ self: { libraryHaskellDepends = [ aeson base containers ]; testHaskellDepends = [ aeson base containers ]; description = "Apply default value to FromJSON instacnes' Maybe fields"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "aeson-deriving" = callPackage @@ -24503,7 +24561,7 @@ self: { aeson base hedgehog regex-tdfa text unordered-containers ]; description = "data types for compositional, type-directed serialization"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "aeson-diff" = callPackage @@ -24530,7 +24588,7 @@ self: { quickcheck-instances text unordered-containers vector ]; description = "Extract and apply patches to JSON documents"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "aeson-diff-generic" = callPackage @@ -24549,8 +24607,8 @@ self: { th-abstraction time unordered-containers uuid-types vector ]; description = "Apply a json-patch to any haskell datatype"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -24579,7 +24637,7 @@ self: { tasty-quickcheck time time-parsers unordered-containers vector ]; description = "Extra goodies for aeson"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "aeson-filthy" = callPackage @@ -24597,8 +24655,8 @@ self: { aeson base bytestring doctest text time unordered-containers ]; description = "Several newtypes and combinators for dealing with less-than-cleanly JSON input"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -24613,7 +24671,7 @@ self: { ]; testHaskellDepends = [ base ]; description = "Tools for creating flat JSON serializations"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "aeson-flatten" = callPackage @@ -24627,7 +24685,7 @@ self: { libraryHaskellDepends = [ aeson base text unordered-containers ]; testHaskellDepends = [ aeson base bytestring hspec ]; description = "JSON flatten for Aeson"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "aeson-flowtyped" = callPackage @@ -24648,8 +24706,8 @@ self: { unordered-containers vector ]; description = "Create Flow type definitions from Haskell data types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -24675,7 +24733,7 @@ self: { aeson aeson-qq base dependent-sum hspec HUnit ]; description = "Derivation of Aeson instances for GADTs"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "aeson-generic-compat" = callPackage @@ -24686,7 +24744,7 @@ self: { sha256 = "1kr3waa46k3619yvif0zh4lx7s0zhyghlr1c5kkrvg432i8wmdm6"; libraryHaskellDepends = [ aeson base ]; description = "Compatible generic class names of Aeson"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "aeson-helper" = callPackage @@ -24699,7 +24757,7 @@ self: { aeson base text unordered-containers vector ]; description = "Aeson helper func"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "aeson-injector" = callPackage @@ -24723,8 +24781,8 @@ self: { scientific swagger2 tasty tasty-hunit tasty-quickcheck text vector ]; description = "Injecting fields into aeson values"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -24741,7 +24799,7 @@ self: { ]; testHaskellDepends = [ base doctest ]; description = "Aeson instances for iproute types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "aeson-json-ast" = callPackage @@ -24752,7 +24810,7 @@ self: { sha256 = "0p9da4cpbj811b9va2rhhn95cqckhabhr9k4fjfd536dzrxqjigz"; libraryHaskellDepends = [ aeson base json-ast ]; description = "Integration layer for \"json-ast\" and \"aeson\""; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "aeson-lens" = callPackage @@ -24768,7 +24826,7 @@ self: { ]; testHaskellDepends = [ base doctest ]; description = "Lens of Aeson"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "aeson-match-qq" = callPackage @@ -24788,8 +24846,8 @@ self: { aeson aeson-qq base hspec unordered-containers ]; description = "Declarative JSON matchers"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -24810,8 +24868,8 @@ self: { unordered-containers vector ]; description = "Fast JSON parsing and encoding (deprecated)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -24831,7 +24889,7 @@ self: { optics-extra scientific text unordered-containers vector ]; description = "Law-abiding optics for aeson"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "aeson-options" = callPackage @@ -24844,8 +24902,8 @@ self: { editedCabalFile = "0sibi1vhgkx0v082iffpqxg1mshrwd1d1s3xnpaqn0rdpfpja31d"; libraryHaskellDepends = [ aeson base ]; description = "Options to derive FromJSON/ToJSON instances"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -24861,7 +24919,7 @@ self: { aeson base parsec scientific text unordered-containers vector ]; description = "Alternative JSON parser based on Parsec and Aeson"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "aeson-picker" = callPackage @@ -24873,7 +24931,7 @@ self: { libraryHaskellDepends = [ aeson base lens lens-aeson text ]; testHaskellDepends = [ base hspec text ]; description = "Tiny library to get fields from JSON format"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "aeson-prefix" = callPackage @@ -24889,8 +24947,8 @@ self: { ]; testHaskellDepends = [ aeson base bytestring hspec mtl text ]; description = "Hiearchical prefixing for aeson"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -24912,7 +24970,7 @@ self: { aeson attoparsec base bytestring cmdargs ]; description = "JSON pretty-printing library and command-line tool"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "aeson-qq" = callPackage @@ -24933,7 +24991,7 @@ self: { parsec scientific template-haskell text vector ]; description = "JSON quasiquoter for Haskell"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "aeson-quick" = callPackage @@ -24953,7 +25011,7 @@ self: { ]; benchmarkHaskellDepends = [ aeson base bytestring criterion text ]; description = "Quick JSON extractions with Aeson"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "aeson-result" = callPackage @@ -24964,7 +25022,7 @@ self: { sha256 = "10bnzh7vlh42sip0z7mvx5jxrsi7p2s3vqy55pfg2pb17czzly2y"; libraryHaskellDepends = [ aeson aeson-helper base text ]; description = "API Result for aeson"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "aeson-schema" = callPackage @@ -24993,8 +25051,8 @@ self: { test-framework-quickcheck2 text unordered-containers vector ]; description = "Haskell JSON schema validator and parser generator"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -25024,8 +25082,8 @@ self: { megaparsec template-haskell text th-test-utils unordered-containers ]; description = "Easily consume JSON data on-demand with type-safety"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -25038,7 +25096,7 @@ self: { libraryHaskellDepends = [ aeson base cereal ]; testHaskellDepends = [ aeson base cereal hspec HUnit ]; description = "Simple serialization functions for aeson types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "aeson-smart" = callPackage @@ -25054,8 +25112,8 @@ self: { vector ]; description = "Smart derivation of Aeson instances"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -25071,8 +25129,8 @@ self: { aeson attoparsec base bytestring HsOpenSSL http-streams io-streams ]; description = "An HTTP client library for JSON-based APIs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -25092,8 +25150,8 @@ self: { vector ]; description = "Transform JSON"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -25113,8 +25171,8 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ aeson base hspec ]; description = "Aeson instances for the Tiled map editor"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -25127,7 +25185,7 @@ self: { libraryHaskellDepends = [ aeson base bytestring failure text ]; testHaskellDepends = [ base hspec ]; description = "A generalization of Aeson over Failure"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "aeson-typescript" = callPackage @@ -25149,8 +25207,8 @@ self: { th-abstraction unordered-containers ]; description = "Generate TypeScript definition files from your ADTs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -25168,8 +25226,8 @@ self: { aeson attoparsec base bytestring scientific text ]; description = "Utilities for working with Aeson"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -25187,7 +25245,7 @@ self: { text text-builder transformers unordered-containers vector ]; description = "API for parsing \"aeson\" JSON tree into Haskell types"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "aeson-via" = callPackage @@ -25201,7 +25259,7 @@ self: { aeson aeson-casing base newtype-generics text ]; description = "Wrappers to derive-via Aeson ToJSON/FromJSON typeclasses"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "aeson-with" = callPackage @@ -25217,7 +25275,7 @@ self: { vector ]; description = "withXField combinators for aeson"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "aeson-yak" = callPackage @@ -25228,7 +25286,7 @@ self: { sha256 = "0x5a5z0bmiljl9rfapyq6srffp6v3g25qvy0x692a5as66y5ahxg"; libraryHaskellDepends = [ aeson base ]; description = "Handle JSON that may or may not be a list, or exist"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "aeson-yaml" = callPackage @@ -25251,7 +25309,7 @@ self: { ]; testToolDepends = [ tasty-discover ]; description = "Output any Aeson value as YAML (pure Haskell library)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "affection" = callPackage @@ -25270,8 +25328,8 @@ self: { monad-parallel mtl OpenGL sdl2 stm text uuid vector ]; description = "A simple Game Engine using SDL"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -25285,7 +25343,7 @@ self: { editedCabalFile = "1avxd17y9k0afqjgb8gq254a6ys7dpncgiyrp6mxbngdcvjyahyc"; libraryHaskellDepends = [ alg base ]; description = "Affine spaces (generalized)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "affine-invariant-ensemble-mcmc" = callPackage @@ -25300,8 +25358,8 @@ self: { base containers mwc-random primitive split vector ]; description = "General-purpose sampling"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -25312,7 +25370,7 @@ self: { version = "0.1.0.0"; sha256 = "1bldljkgsb9v7ss3l87mm4r9wjpp3z02hjnfdnp84pmaj0b34vam"; libraryHaskellDepends = [ base ]; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "afis" = callPackage @@ -25334,7 +25392,7 @@ self: { test-framework-quickcheck2 ]; description = "Anti-forensic Information Splitter"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "afv" = callPackage @@ -25351,8 +25409,8 @@ self: { base bytestring directory language-c mtl process yices ]; description = "Infinite state model checking of iterative C programs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -25366,8 +25424,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base containers uuagc uulib ]; description = "Attribute Grammar picture generation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -25388,8 +25446,8 @@ self: { pandoc snap-core snap-server transformers utf8-string xhtml ]; description = "Http server for Agda (prototype)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -25410,8 +25468,8 @@ self: { ]; executableHaskellDepends = [ Agda base network-uri transformers ]; description = "Render just the Agda snippets of a literate Agda file to HTML"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -25428,8 +25486,8 @@ self: { pandoc-types ]; description = "Literate Agda support using agda-snippets, for Hakyll pages"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -25452,8 +25510,8 @@ self: { ]; testHaskellDepends = [ base containers filepath hspec text ]; description = "Check for unused code in an Agda project"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -25469,7 +25527,7 @@ self: { base directory filepath optparse-applicative ]; description = "Translate .agda files into .lagda.tex files."; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "agentx" = callPackage @@ -25490,8 +25548,8 @@ self: { snmp time transformers unix ]; description = "AgentX protocol for write SNMP subagents"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -25524,8 +25582,8 @@ self: { base QuickCheck tasty tasty-ant-xml tasty-quickcheck ]; description = "And-inverter graphs in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -25554,8 +25612,8 @@ self: { base checkers lens QuickCheck tasty tasty-hunit tasty-quickcheck ]; description = "Aeronautical Information Package (AIP)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -25571,7 +25629,7 @@ self: { array base bytestring containers directory filepath mtl text time ]; description = "air"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "air-extra" = callPackage @@ -25587,7 +25645,7 @@ self: { parsec regexpr text time ]; description = "air-extra"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "air-spec" = callPackage @@ -25599,7 +25657,7 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base hspec text ]; description = "air spec helper"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "air-th" = callPackage @@ -25610,8 +25668,8 @@ self: { sha256 = "0rhp56qvwiwlrs7pvpbslybvlp4xnllfjab6pap2chxgywas34pq"; libraryHaskellDepends = [ air base template-haskell ]; description = "air"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -25631,8 +25689,8 @@ self: { transformers utf8-string wai ]; description = "An Airbrake notifier for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -25662,8 +25720,8 @@ self: { transformers wai ]; description = "A Webmachine-inspired HTTP library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -25681,8 +25739,8 @@ self: { ]; testHaskellDepends = [ base ]; description = "Requesting and introspecting Tables within an Airtable project"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -25699,7 +25757,7 @@ self: { random semigroups vector ]; description = "A multi-method simulation library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "aivika-branches" = callPackage @@ -25714,7 +25772,7 @@ self: { aivika aivika-transformers base containers mtl mwc-random random ]; description = "Nested discrete event simulation module for the Aivika library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "aivika-distributed" = callPackage @@ -25731,8 +25789,8 @@ self: { distributed-process exceptions mtl mwc-random random stm time ]; description = "Parallel distributed discrete event simulation module for the Aivika library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -25749,7 +25807,7 @@ self: { network-uri parallel-io split ]; description = "Simulation experiments for the Aivika library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "aivika-experiment-cairo" = callPackage @@ -25765,7 +25823,7 @@ self: { colour lens ]; description = "Cairo-based charting backend for the Aivika simulation library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "aivika-experiment-chart" = callPackage @@ -25782,7 +25840,7 @@ self: { data-default-class filepath lens mtl split ]; description = "Simulation experiments with charting for the Aivika library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "aivika-experiment-diagrams" = callPackage @@ -25798,8 +25856,8 @@ self: { colour containers filepath lens ]; description = "Diagrams-based charting backend for the Aivika simulation library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -25816,7 +25874,7 @@ self: { unordered-containers ]; description = "GPSS-like DSL for Aivika"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "aivika-lattice" = callPackage @@ -25832,7 +25890,7 @@ self: { random ]; description = "Nested discrete event simulation module for the Aivika library using lattice"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "aivika-realtime" = callPackage @@ -25848,7 +25906,7 @@ self: { random stm time vector ]; description = "Soft real-time simulation module for the Aivika library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "aivika-transformers" = callPackage @@ -25864,7 +25922,7 @@ self: { semigroups vector ]; description = "Transformers for the Aivika simulation library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ajhc" = callPackage @@ -25891,8 +25949,8 @@ self: { regex-compat syb temporary unix utf8-string zlib ]; description = "Haskell compiler that produce binary through C language"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -25906,7 +25964,7 @@ self: { libraryPkgconfigDepends = [ openal ]; libraryToolDepends = [ c2hs ]; description = "OpenAL 1.1 raw API."; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) openal;}; "alarmclock" = callPackage @@ -25924,7 +25982,7 @@ self: { async base clock hspec stm time unbounded-delays ]; description = "Wake up and perform an action at a certain time"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "alea" = callPackage @@ -25940,7 +25998,7 @@ self: { base optparse-applicative random text ]; description = "a diceware passphrase generator"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "alerta" = callPackage @@ -25958,8 +26016,8 @@ self: { servant-server text time ]; description = "Bindings to the alerta REST API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -25971,7 +26029,7 @@ self: { sha256 = "14fyckdwwhp786z2gg6m92xmz0rbvqwalj0bylqagi9n295ni74f"; libraryHaskellDepends = [ base blaze-html text ]; description = "Alert messages for web applications"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "alex" = callPackage @@ -25988,7 +26046,7 @@ self: { executableToolDepends = [ happy ]; testHaskellDepends = [ base process ]; description = "Alex is a tool for generating lexical analysers in Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "alex-meta" = callPackage @@ -26004,7 +26062,7 @@ self: { ]; libraryToolDepends = [ alex happy ]; description = "Quasi-quoter for Alex lexers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "alex-prelude" = callPackage @@ -26015,8 +26073,8 @@ self: { sha256 = "1ngxkr7jvy48pgq0sjqpi7a84qjm4fjny64hxksyvbj08l2rn7ha"; libraryHaskellDepends = [ base time ]; description = "Collection of useful functions for writing console applications"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -26031,8 +26089,8 @@ self: { base bytestring deepseq template-haskell text ]; description = "A set of functions for a common use case of Alex"; - license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -26051,8 +26109,8 @@ self: { text xmlgen ]; description = "utility library for Alfred version 2"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -26074,7 +26132,7 @@ self: { quickcheck-instances text ]; description = "Fast Aho-Corasick string searching"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "alg" = callPackage @@ -26087,7 +26145,7 @@ self: { editedCabalFile = "0rm66k502d8la140ffawd38yaf0hr92h8x7xrq6krn6ypljwql0v"; libraryHaskellDepends = [ base dual util ]; description = "Algebraic structures"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "alga" = callPackage @@ -26119,8 +26177,8 @@ self: { tf-random transformers ]; description = "Algorithmic automation for various DAWs"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -26139,7 +26197,7 @@ self: { semigroupoids semigroups tagged transformers void ]; description = "Constructive abstract algebra"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "algebra-checkers" = callPackage @@ -26156,8 +26214,8 @@ self: { syb template-haskell th-instance-reification transformers ]; description = "Model and test API surfaces algebraically"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -26173,8 +26231,8 @@ self: { aeson base containers fgl mtl parsec template-haskell transformers ]; description = "Infrastructure for DAG-shaped relational algebra plans"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -26193,7 +26251,7 @@ self: { QuickCheck quickspec ]; description = "Companion library for the book Algebra-Driven Design by Sandy Maguire"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "algebra-sql" = callPackage @@ -26219,8 +26277,8 @@ self: { process template-haskell text time transformers ]; description = "Relational Algebra and SQL Code Generation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -26232,8 +26290,8 @@ self: { sha256 = "15gv6w9vz02960r6bd0k979vi6kj7pfxg705ajbrsd1pnwklfnwh"; libraryHaskellDepends = [ accelerate base ]; description = "General linear algebra structures"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -26247,7 +26305,7 @@ self: { editedCabalFile = "0w3845hl7cppdk3zvhmz0zic7sbcklfircx97wf9dhh40q3qdcmi"; libraryHaskellDepends = [ base syb template-haskell ]; description = "Conversions between algebraic classes and F-algebras"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "algebraic-graphs" = callPackage @@ -26266,7 +26324,7 @@ self: { QuickCheck transformers ]; description = "A library for algebraic graph construction and transformation"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "algebraic-graphs-io" = callPackage @@ -26292,7 +26350,7 @@ self: { ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "I/O utilities and datasets for algebraic-graphs"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "algebraic-prelude" = callPackage @@ -26307,8 +26365,8 @@ self: { algebra base basic-prelude lens semigroups ]; description = "Algebraically structured Prelude"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -26334,8 +26392,8 @@ self: { ]; benchmarkHaskellDepends = [ base criterion ]; description = "An implementation of Knuth's algorithm S"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -26361,8 +26419,8 @@ self: { ]; testToolDepends = [ tasty-discover ]; description = "A client implementing the Algolia search API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -26374,7 +26432,7 @@ self: { sha256 = "1bv7x687ga563kdnl23smrspljq32bkaarq4zdg071glqckrffq9"; libraryHaskellDepends = [ base containers transformers vector ]; description = "Sequence alignment algorithms"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "align-text" = callPackage @@ -26387,8 +26445,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base optparse-applicative text ]; description = "A simple unix filter to align text on specified substrings"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -26400,7 +26458,7 @@ self: { sha256 = "0hmnp08k04c0ag9fyp5sajg54r4gi57vrd9krk4g8y8fri0fgc00"; libraryHaskellDepends = [ base ]; description = "An aligned ForeignPtr type"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "alist" = callPackage @@ -26411,7 +26469,7 @@ self: { sha256 = "0ydq2sxyfgij0rf54i3ajj4hdqjawhcdsgi822yrkq86xjvsxc4w"; libraryHaskellDepends = [ base ]; description = "lists with O(1) append"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "allocated-processor" = callPackage @@ -26422,7 +26480,7 @@ self: { sha256 = "0jhz3q0972snrgd9c7lr934ddkwllwgw6anj7ax8hj4zi0zc615m"; libraryHaskellDepends = [ base vector-space ]; description = "Functional combinators for monadic actions that require allocation and de-allocation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "alloy" = callPackage @@ -26433,7 +26491,7 @@ self: { sha256 = "0hy3x87idw60rx2plv69i7hd22qxircvasvx9cjbd1w603vqk8zh"; libraryHaskellDepends = [ base containers mtl syb vector ]; description = "Generic programming library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "alloy-proxy-fd" = callPackage @@ -26444,7 +26502,7 @@ self: { sha256 = "1fhk5ydnf0l0n579gqg5lfg2cc9z8xbgqsqzgkpcw0046kp53rjw"; libraryHaskellDepends = [ alloy base mtl ]; description = "Some add-on instances for the Alloy library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ally-invest" = callPackage @@ -26464,8 +26522,8 @@ self: { http-client-tls safe text time ]; description = "Ally Invest integration library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -26477,7 +26535,7 @@ self: { sha256 = "03x715jcrsxfs2d08hsg3y5f6a4bnlzfxsmhzimvpdp9bw0psn90"; libraryHaskellDepends = [ base ]; description = "Recurse while a predicate is satisfied"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "alms" = callPackage @@ -26499,8 +26557,8 @@ self: { stm syb template-haskell transformers tuple ]; description = "a practical affine language"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -26521,8 +26579,8 @@ self: { transformers unix ]; description = "A compiler for the Alpha language"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -26543,8 +26601,8 @@ self: { tasty-hedgehog tasty-hspec tasty-hunit text ]; description = "A character between a-z"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -26568,7 +26626,7 @@ self: { ]; description = "Alpino data manipulation tools"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "alsa" = callPackage @@ -26584,8 +26642,8 @@ self: { ]; librarySystemDepends = [ alsaLib ]; description = "Binding to the ALSA Library API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) alsaLib;}; @@ -26598,8 +26656,8 @@ self: { libraryHaskellDepends = [ base extensible-exceptions ]; libraryPkgconfigDepends = [ alsaLib ]; description = "Binding to the ALSA Library API (Exceptions)"; - license = stdenv.lib.licenses.bsd3; - platforms = [ "i686-linux" "x86_64-linux" ]; + license = lib.licenses.bsd3; + platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) alsaLib;}; "alsa-gui" = callPackage @@ -26616,8 +26674,8 @@ self: { alsa-core alsa-seq base midi midi-alsa wx wxcore ]; description = "Some simple interactive programs for sending MIDI control messages via ALSA"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -26639,7 +26697,7 @@ self: { executableSystemDepends = [ alsaLib ]; description = "Bindings for the ALSA sequencer API (MIDI stuff)"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) alsaLib;}; @@ -26653,8 +26711,8 @@ self: { librarySystemDepends = [ alsaLib ]; libraryToolDepends = [ c2hs ]; description = "Bindings to the ALSA simple mixer API"; - license = stdenv.lib.licenses.bsd3; - platforms = [ "i686-linux" "x86_64-linux" ]; + license = lib.licenses.bsd3; + platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) alsaLib;}; "alsa-pcm" = callPackage @@ -26673,8 +26731,8 @@ self: { ]; libraryPkgconfigDepends = [ alsaLib ]; description = "Binding to the ALSA Library API (PCM audio)"; - license = stdenv.lib.licenses.bsd3; - platforms = [ "i686-linux" "x86_64-linux" ]; + license = lib.licenses.bsd3; + platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) alsaLib;}; "alsa-pcm-tests" = callPackage @@ -26687,8 +26745,8 @@ self: { isExecutable = true; executableHaskellDepends = [ alsa base ]; description = "Tests for the ALSA audio signal library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -26709,8 +26767,8 @@ self: { ]; libraryPkgconfigDepends = [ alsaLib ]; description = "Binding to the ALSA Library API (MIDI sequencer)"; - license = stdenv.lib.licenses.bsd3; - platforms = [ "i686-linux" "x86_64-linux" ]; + license = lib.licenses.bsd3; + platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) alsaLib;}; "alsa-seq-tests" = callPackage @@ -26723,8 +26781,8 @@ self: { isExecutable = true; executableHaskellDepends = [ alsa base ]; description = "Tests for the ALSA sequencer library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -26736,8 +26794,8 @@ self: { sha256 = "1jcc6cx0jj5ddvyq8xii9ar67ic3vlmy351qgybn74clpipgdyrm"; libraryHaskellDepends = [ base composition ]; description = "Alternative combinators for unorthodox function composition"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -26749,8 +26807,8 @@ self: { sha256 = "1l6fjvh38qh3jqz3hvf4km3bzyp9x9w6hn9qk0rvs2z7bkasssl9"; libraryHaskellDepends = [ base ]; description = "Extra utilities for alternatives"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -26768,8 +26826,8 @@ self: { base lifted-base monad-control transformers transformers-base ]; description = "IO as Alternative instance (deprecated)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -26781,7 +26839,7 @@ self: { sha256 = "1cf7akvr9nac1483chh7rd3xp5i5zk78f245lw9ixj6v133lnis2"; libraryHaskellDepends = [ base vector ]; description = "Use vectors instead of lists for many and some"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "alternators" = callPackage @@ -26796,7 +26854,7 @@ self: { base lens mmorph mtl newtype-generics stm transformers ]; description = "Handy functions when using transformers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "altfloat" = callPackage @@ -26808,7 +26866,7 @@ self: { libraryHaskellDepends = [ base ghc-prim integer-gmp ]; description = "Alternative floating point support for GHC"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "alto" = callPackage @@ -26832,8 +26890,8 @@ self: { ]; executableHaskellDepends = [ base warp ]; description = "Implement a menu experience fit for web users"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -26850,7 +26908,7 @@ self: { base bytestring cereal tasty tasty-hunit tasty-quickcheck ]; description = "HTTP Alternative Services"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "alure" = callPackage @@ -26863,10 +26921,20 @@ self: { librarySystemDepends = [ alure ]; description = "A Haskell binding for ALURE"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) alure;}; + "always" = callPackage + ({ mkDerivation }: + mkDerivation { + pname = "always"; + version = "0.1"; + sha256 = "15fwq1pmb3d46cgsj59q3iz2qs0lgvq5b9d6gxfysnjlm3sp0ivw"; + description = "provides a typeclass that is always satisfied"; + license = lib.licenses.bsd3; + }) {}; + "amazon-emailer" = callPackage ({ mkDerivation, base, bytestring, configurator, http-conduit , lifted-base, mime-mail, mime-mail-ses, postgresql-simple @@ -26883,8 +26951,8 @@ self: { mime-mail-ses postgresql-simple resourcet text time ]; description = "A queue daemon for Amazon's SES with a PostgreSQL table as a queue"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -26899,8 +26967,8 @@ self: { base mtl snap snaplet-postgresql-simple text ]; description = "Client library for amazon-emailer daemon"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -26926,8 +26994,8 @@ self: { base bytestring http-conduit text transformers ]; description = "Connector for Amazon Products API"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -26952,8 +27020,8 @@ self: { ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Comprehensive Amazon Web Services SDK"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -26971,7 +27039,7 @@ self: { time unordered-containers ]; description = "Amazon Alexa For Business SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-apigateway" = callPackage @@ -26988,7 +27056,7 @@ self: { time unordered-containers ]; description = "Amazon API Gateway SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-application-autoscaling" = callPackage @@ -27005,7 +27073,7 @@ self: { time unordered-containers ]; description = "Amazon Application Auto Scaling SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-appstream" = callPackage @@ -27022,7 +27090,7 @@ self: { time unordered-containers ]; description = "Amazon AppStream SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-appsync" = callPackage @@ -27039,7 +27107,7 @@ self: { time unordered-containers ]; description = "Amazon AppSync SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-athena" = callPackage @@ -27056,7 +27124,7 @@ self: { time unordered-containers ]; description = "Amazon Athena SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-autoscaling" = callPackage @@ -27073,7 +27141,7 @@ self: { time unordered-containers ]; description = "Amazon Auto Scaling SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-autoscaling-plans" = callPackage @@ -27090,7 +27158,7 @@ self: { time unordered-containers ]; description = "Amazon Auto Scaling Plans SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-batch" = callPackage @@ -27107,7 +27175,7 @@ self: { time unordered-containers ]; description = "Amazon Batch SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-budgets" = callPackage @@ -27124,7 +27192,7 @@ self: { time unordered-containers ]; description = "Amazon Budgets SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-certificatemanager" = callPackage @@ -27141,7 +27209,7 @@ self: { time unordered-containers ]; description = "Amazon Certificate Manager SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-certificatemanager-pca" = callPackage @@ -27158,7 +27226,7 @@ self: { time unordered-containers ]; description = "Amazon Certificate Manager Private Certificate Authority SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-cloud9" = callPackage @@ -27175,7 +27243,7 @@ self: { time unordered-containers ]; description = "Amazon Cloud9 SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-clouddirectory" = callPackage @@ -27192,7 +27260,7 @@ self: { time unordered-containers ]; description = "Amazon CloudDirectory SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-cloudformation" = callPackage @@ -27209,7 +27277,7 @@ self: { time unordered-containers ]; description = "Amazon CloudFormation SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-cloudfront" = callPackage @@ -27226,7 +27294,7 @@ self: { time unordered-containers ]; description = "Amazon CloudFront SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-cloudhsm" = callPackage @@ -27243,7 +27311,7 @@ self: { time unordered-containers ]; description = "Amazon CloudHSM SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-cloudhsmv2" = callPackage @@ -27260,7 +27328,7 @@ self: { time unordered-containers ]; description = "Amazon CloudHSM V2 SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-cloudsearch" = callPackage @@ -27277,7 +27345,7 @@ self: { time unordered-containers ]; description = "Amazon CloudSearch SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-cloudsearch-domains" = callPackage @@ -27294,7 +27362,7 @@ self: { time unordered-containers ]; description = "Amazon CloudSearch Domain SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-cloudtrail" = callPackage @@ -27311,7 +27379,7 @@ self: { time unordered-containers ]; description = "Amazon CloudTrail SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-cloudwatch" = callPackage @@ -27328,7 +27396,7 @@ self: { time unordered-containers ]; description = "Amazon CloudWatch SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-cloudwatch-events" = callPackage @@ -27345,7 +27413,7 @@ self: { time unordered-containers ]; description = "Amazon CloudWatch Events SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-cloudwatch-logs" = callPackage @@ -27362,7 +27430,7 @@ self: { time unordered-containers ]; description = "Amazon CloudWatch Logs SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-codebuild" = callPackage @@ -27379,7 +27447,7 @@ self: { time unordered-containers ]; description = "Amazon CodeBuild SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-codecommit" = callPackage @@ -27396,7 +27464,7 @@ self: { time unordered-containers ]; description = "Amazon CodeCommit SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-codedeploy" = callPackage @@ -27413,7 +27481,7 @@ self: { time unordered-containers ]; description = "Amazon CodeDeploy SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-codepipeline" = callPackage @@ -27430,7 +27498,7 @@ self: { time unordered-containers ]; description = "Amazon CodePipeline SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-codestar" = callPackage @@ -27447,7 +27515,7 @@ self: { time unordered-containers ]; description = "Amazon CodeStar SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-cognito-identity" = callPackage @@ -27464,7 +27532,7 @@ self: { time unordered-containers ]; description = "Amazon Cognito Identity SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-cognito-idp" = callPackage @@ -27481,7 +27549,7 @@ self: { time unordered-containers ]; description = "Amazon Cognito Identity Provider SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-cognito-sync" = callPackage @@ -27498,7 +27566,7 @@ self: { time unordered-containers ]; description = "Amazon Cognito Sync SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-comprehend" = callPackage @@ -27515,7 +27583,7 @@ self: { time unordered-containers ]; description = "Amazon Comprehend SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-config" = callPackage @@ -27532,7 +27600,7 @@ self: { time unordered-containers ]; description = "Amazon Config SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-connect" = callPackage @@ -27549,7 +27617,7 @@ self: { time unordered-containers ]; description = "Amazon Connect Service SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-core" = callPackage @@ -27581,7 +27649,7 @@ self: { tasty-hunit tasty-quickcheck template-haskell text time ]; description = "Core data types and functionality for Amazonka libraries"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-cost-explorer" = callPackage @@ -27598,7 +27666,7 @@ self: { time unordered-containers ]; description = "Amazon Cost Explorer Service SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-cur" = callPackage @@ -27615,7 +27683,7 @@ self: { time unordered-containers ]; description = "Amazon Cost and Usage Report Service SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-datapipeline" = callPackage @@ -27632,7 +27700,7 @@ self: { time unordered-containers ]; description = "Amazon Data Pipeline SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-devicefarm" = callPackage @@ -27649,7 +27717,7 @@ self: { time unordered-containers ]; description = "Amazon Device Farm SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-directconnect" = callPackage @@ -27666,7 +27734,7 @@ self: { time unordered-containers ]; description = "Amazon Direct Connect SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-discovery" = callPackage @@ -27683,7 +27751,7 @@ self: { time unordered-containers ]; description = "Amazon Application Discovery Service SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-dms" = callPackage @@ -27700,7 +27768,7 @@ self: { time unordered-containers ]; description = "Amazon Database Migration Service SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-ds" = callPackage @@ -27717,7 +27785,7 @@ self: { time unordered-containers ]; description = "Amazon Directory Service SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-dynamodb" = callPackage @@ -27734,7 +27802,7 @@ self: { time unordered-containers ]; description = "Amazon DynamoDB SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-dynamodb-dax" = callPackage @@ -27751,7 +27819,7 @@ self: { time unordered-containers ]; description = "Amazon DynamoDB Accelerator (DAX) SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-dynamodb-streams" = callPackage @@ -27768,7 +27836,7 @@ self: { time unordered-containers ]; description = "Amazon DynamoDB Streams SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-ec2" = callPackage @@ -27785,7 +27853,7 @@ self: { time unordered-containers ]; description = "Amazon Elastic Compute Cloud SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-ecr" = callPackage @@ -27802,7 +27870,7 @@ self: { time unordered-containers ]; description = "Amazon EC2 Container Registry SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-ecs" = callPackage @@ -27819,7 +27887,7 @@ self: { time unordered-containers ]; description = "Amazon EC2 Container Service SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-efs" = callPackage @@ -27836,7 +27904,7 @@ self: { time unordered-containers ]; description = "Amazon Elastic File System SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-elasticache" = callPackage @@ -27853,7 +27921,7 @@ self: { time unordered-containers ]; description = "Amazon ElastiCache SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-elasticbeanstalk" = callPackage @@ -27870,7 +27938,7 @@ self: { time unordered-containers ]; description = "Amazon Elastic Beanstalk SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-elasticsearch" = callPackage @@ -27887,7 +27955,7 @@ self: { time unordered-containers ]; description = "Amazon Elasticsearch Service SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-elastictranscoder" = callPackage @@ -27904,7 +27972,7 @@ self: { time unordered-containers ]; description = "Amazon Elastic Transcoder SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-elb" = callPackage @@ -27921,7 +27989,7 @@ self: { time unordered-containers ]; description = "Amazon Elastic Load Balancing SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-elbv2" = callPackage @@ -27938,7 +28006,7 @@ self: { time unordered-containers ]; description = "Amazon Elastic Load Balancing SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-emr" = callPackage @@ -27955,7 +28023,7 @@ self: { time unordered-containers ]; description = "Amazon Elastic MapReduce SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-fms" = callPackage @@ -27972,7 +28040,7 @@ self: { time unordered-containers ]; description = "Amazon Firewall Management Service SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-gamelift" = callPackage @@ -27989,7 +28057,7 @@ self: { time unordered-containers ]; description = "Amazon GameLift SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-glacier" = callPackage @@ -28006,7 +28074,7 @@ self: { time unordered-containers ]; description = "Amazon Glacier SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-glue" = callPackage @@ -28023,7 +28091,7 @@ self: { time unordered-containers ]; description = "Amazon Glue SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-greengrass" = callPackage @@ -28040,7 +28108,7 @@ self: { time unordered-containers ]; description = "Amazon Greengrass SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-guardduty" = callPackage @@ -28057,7 +28125,7 @@ self: { time unordered-containers ]; description = "Amazon GuardDuty SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-health" = callPackage @@ -28074,7 +28142,7 @@ self: { time unordered-containers ]; description = "Amazon Health APIs and Notifications SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-iam" = callPackage @@ -28091,7 +28159,7 @@ self: { time unordered-containers ]; description = "Amazon Identity and Access Management SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-iam-policy" = callPackage @@ -28112,7 +28180,7 @@ self: { aeson aeson-pretty base bytestring doctest hspec ]; description = "Amazon IAM Policy Document DSL and Combinators"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-importexport" = callPackage @@ -28129,7 +28197,7 @@ self: { time unordered-containers ]; description = "Amazon Import/Export SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-inspector" = callPackage @@ -28146,7 +28214,7 @@ self: { time unordered-containers ]; description = "Amazon Inspector SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-iot" = callPackage @@ -28163,7 +28231,7 @@ self: { time unordered-containers ]; description = "Amazon IoT SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-iot-analytics" = callPackage @@ -28180,7 +28248,7 @@ self: { time unordered-containers ]; description = "Amazon IoT Analytics SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-iot-dataplane" = callPackage @@ -28197,7 +28265,7 @@ self: { time unordered-containers ]; description = "Amazon IoT Data Plane SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-iot-jobs-dataplane" = callPackage @@ -28214,7 +28282,7 @@ self: { time unordered-containers ]; description = "Amazon IoT Jobs Data Plane SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-kinesis" = callPackage @@ -28231,7 +28299,7 @@ self: { time unordered-containers ]; description = "Amazon Kinesis SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-kinesis-analytics" = callPackage @@ -28248,7 +28316,7 @@ self: { time unordered-containers ]; description = "Amazon Kinesis Analytics SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-kinesis-firehose" = callPackage @@ -28265,7 +28333,7 @@ self: { time unordered-containers ]; description = "Amazon Kinesis Firehose SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-kinesis-video" = callPackage @@ -28282,7 +28350,7 @@ self: { time unordered-containers ]; description = "Amazon Kinesis Video Streams SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-kinesis-video-archived-media" = callPackage @@ -28299,7 +28367,7 @@ self: { time unordered-containers ]; description = "Amazon Kinesis Video Streams Archived Media SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-kinesis-video-media" = callPackage @@ -28316,7 +28384,7 @@ self: { time unordered-containers ]; description = "Amazon Kinesis Video Streams Media SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-kms" = callPackage @@ -28333,7 +28401,7 @@ self: { time unordered-containers ]; description = "Amazon Key Management Service SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-lambda" = callPackage @@ -28350,7 +28418,7 @@ self: { time unordered-containers ]; description = "Amazon Lambda SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-lex-models" = callPackage @@ -28367,7 +28435,7 @@ self: { time unordered-containers ]; description = "Amazon Lex Model Building Service SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-lex-runtime" = callPackage @@ -28384,7 +28452,7 @@ self: { time unordered-containers ]; description = "Amazon Lex Runtime Service SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-lightsail" = callPackage @@ -28401,7 +28469,7 @@ self: { time unordered-containers ]; description = "Amazon Lightsail SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-marketplace-analytics" = callPackage @@ -28418,7 +28486,7 @@ self: { time unordered-containers ]; description = "Amazon Marketplace Commerce Analytics SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-marketplace-entitlement" = callPackage @@ -28435,7 +28503,7 @@ self: { time unordered-containers ]; description = "Amazon Marketplace Entitlement Service SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-marketplace-metering" = callPackage @@ -28452,7 +28520,7 @@ self: { time unordered-containers ]; description = "Amazon Marketplace Metering SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-mechanicalturk" = callPackage @@ -28469,7 +28537,7 @@ self: { time unordered-containers ]; description = "Amazon Mechanical Turk SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-mediaconvert" = callPackage @@ -28486,7 +28554,7 @@ self: { time unordered-containers ]; description = "Amazon Elemental MediaConvert SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-medialive" = callPackage @@ -28503,7 +28571,7 @@ self: { time unordered-containers ]; description = "Amazon Elemental MediaLive SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-mediapackage" = callPackage @@ -28520,7 +28588,7 @@ self: { time unordered-containers ]; description = "Amazon Elemental MediaPackage SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-mediastore" = callPackage @@ -28537,7 +28605,7 @@ self: { time unordered-containers ]; description = "Amazon Elemental MediaStore SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-mediastore-dataplane" = callPackage @@ -28554,7 +28622,7 @@ self: { time unordered-containers ]; description = "Amazon Elemental MediaStore Data Plane SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-migrationhub" = callPackage @@ -28571,7 +28639,7 @@ self: { time unordered-containers ]; description = "Amazon Migration Hub SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-ml" = callPackage @@ -28588,7 +28656,7 @@ self: { time unordered-containers ]; description = "Amazon Machine Learning SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-mobile" = callPackage @@ -28605,7 +28673,7 @@ self: { time unordered-containers ]; description = "Amazon Mobile SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-mq" = callPackage @@ -28622,7 +28690,7 @@ self: { time unordered-containers ]; description = "Amazon MQ SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-opsworks" = callPackage @@ -28639,7 +28707,7 @@ self: { time unordered-containers ]; description = "Amazon OpsWorks SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-opsworks-cm" = callPackage @@ -28656,7 +28724,7 @@ self: { time unordered-containers ]; description = "Amazon OpsWorks for Chef Automate SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-organizations" = callPackage @@ -28673,7 +28741,7 @@ self: { time unordered-containers ]; description = "Amazon Organizations SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-pinpoint" = callPackage @@ -28690,7 +28758,7 @@ self: { time unordered-containers ]; description = "Amazon Pinpoint SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-polly" = callPackage @@ -28707,7 +28775,7 @@ self: { time unordered-containers ]; description = "Amazon Polly SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-pricing" = callPackage @@ -28724,7 +28792,7 @@ self: { time unordered-containers ]; description = "Amazon Price List Service SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-rds" = callPackage @@ -28741,7 +28809,7 @@ self: { time unordered-containers ]; description = "Amazon Relational Database Service SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-redshift" = callPackage @@ -28758,7 +28826,7 @@ self: { time unordered-containers ]; description = "Amazon Redshift SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-rekognition" = callPackage @@ -28775,7 +28843,7 @@ self: { time unordered-containers ]; description = "Amazon Rekognition SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-resourcegroups" = callPackage @@ -28792,7 +28860,7 @@ self: { time unordered-containers ]; description = "Amazon Resource Groups SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-resourcegroupstagging" = callPackage @@ -28809,7 +28877,7 @@ self: { time unordered-containers ]; description = "Amazon Resource Groups Tagging API SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-route53" = callPackage @@ -28826,7 +28894,7 @@ self: { time unordered-containers ]; description = "Amazon Route 53 SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-route53-autonaming" = callPackage @@ -28843,7 +28911,7 @@ self: { time unordered-containers ]; description = "Amazon Route 53 Auto Naming SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-route53-domains" = callPackage @@ -28860,7 +28928,7 @@ self: { time unordered-containers ]; description = "Amazon Route 53 Domains SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-s3" = callPackage @@ -28877,7 +28945,7 @@ self: { time unordered-containers ]; description = "Amazon Simple Storage Service SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-s3-streaming" = callPackage @@ -28896,8 +28964,8 @@ self: { dlist exceptions http-client lens mmorph mtl ]; description = "Provides conduits to upload data to S3 using the Multipart API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -28915,7 +28983,7 @@ self: { time unordered-containers ]; description = "Amazon SageMaker Service SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-sagemaker-runtime" = callPackage @@ -28932,7 +29000,7 @@ self: { time unordered-containers ]; description = "Amazon SageMaker Runtime SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-sdb" = callPackage @@ -28949,7 +29017,7 @@ self: { time unordered-containers ]; description = "Amazon SimpleDB SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-secretsmanager" = callPackage @@ -28966,7 +29034,7 @@ self: { time unordered-containers ]; description = "Amazon Secrets Manager SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-serverlessrepo" = callPackage @@ -28983,7 +29051,7 @@ self: { time unordered-containers ]; description = "Amazon ServerlessApplicationRepository SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-servicecatalog" = callPackage @@ -29000,7 +29068,7 @@ self: { time unordered-containers ]; description = "Amazon Service Catalog SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-ses" = callPackage @@ -29017,7 +29085,7 @@ self: { time unordered-containers ]; description = "Amazon Simple Email Service SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-shield" = callPackage @@ -29034,7 +29102,7 @@ self: { time unordered-containers ]; description = "Amazon Shield SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-sms" = callPackage @@ -29051,7 +29119,7 @@ self: { time unordered-containers ]; description = "Amazon Server Migration Service SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-snowball" = callPackage @@ -29068,7 +29136,7 @@ self: { time unordered-containers ]; description = "Amazon Import/Export Snowball SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-sns" = callPackage @@ -29085,7 +29153,7 @@ self: { time unordered-containers ]; description = "Amazon Simple Notification Service SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-sqs" = callPackage @@ -29102,7 +29170,7 @@ self: { time unordered-containers ]; description = "Amazon Simple Queue Service SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-ssm" = callPackage @@ -29119,7 +29187,7 @@ self: { time unordered-containers ]; description = "Amazon Simple Systems Manager (SSM) SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-stepfunctions" = callPackage @@ -29136,7 +29204,7 @@ self: { time unordered-containers ]; description = "Amazon Step Functions SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-storagegateway" = callPackage @@ -29153,7 +29221,7 @@ self: { time unordered-containers ]; description = "Amazon Storage Gateway SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-sts" = callPackage @@ -29170,7 +29238,7 @@ self: { time unordered-containers ]; description = "Amazon Security Token Service SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-support" = callPackage @@ -29187,7 +29255,7 @@ self: { time unordered-containers ]; description = "Amazon Support SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-swf" = callPackage @@ -29204,7 +29272,7 @@ self: { time unordered-containers ]; description = "Amazon Simple Workflow Service SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-test" = callPackage @@ -29225,7 +29293,7 @@ self: { unordered-containers yaml ]; description = "Common functionality for Amazonka library test-suites"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-transcribe" = callPackage @@ -29242,7 +29310,7 @@ self: { time unordered-containers ]; description = "Amazon Transcribe Service SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-translate" = callPackage @@ -29259,7 +29327,7 @@ self: { time unordered-containers ]; description = "Amazon Translate SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-waf" = callPackage @@ -29276,7 +29344,7 @@ self: { time unordered-containers ]; description = "Amazon WAF SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-waf-regional" = callPackage @@ -29293,7 +29361,7 @@ self: { time unordered-containers ]; description = "Amazon WAF Regional SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-workdocs" = callPackage @@ -29310,7 +29378,7 @@ self: { time unordered-containers ]; description = "Amazon WorkDocs SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-workmail" = callPackage @@ -29327,7 +29395,7 @@ self: { time unordered-containers ]; description = "Amazon WorkMail SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-workspaces" = callPackage @@ -29344,7 +29412,7 @@ self: { time unordered-containers ]; description = "Amazon WorkSpaces SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amazonka-xray" = callPackage @@ -29361,7 +29429,7 @@ self: { time unordered-containers ]; description = "Amazon X-Ray SDK"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "amby" = callPackage @@ -29386,8 +29454,8 @@ self: { testHaskellDepends = [ base doctest tasty tasty-hunit vector ]; benchmarkHaskellDepends = [ base statistics ]; description = "Statistical data visualization"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -29419,7 +29487,7 @@ self: { ]; description = "Toolsuite for automated design of business processes"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -29431,8 +29499,8 @@ self: { }: mkDerivation { pname = "amqp"; - version = "0.20.0"; - sha256 = "1vi8kccvvnym8v4cnsghkiicbjzvkbc7binr12priqmvwvis34rv"; + version = "0.20.0.1"; + sha256 = "10qj4776b3sjifij3qic2bafd01jn8s0pfgm1yd74nyhjx50s19p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -29447,7 +29515,7 @@ self: { split stm text vector ]; description = "Client library for AMQP servers (currently only RabbitMQ)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "amqp-conduit" = callPackage @@ -29467,8 +29535,8 @@ self: { amqp base bytestring conduit hspec HUnit resourcet transformers ]; description = "Conduit bindings for AMQP (see amqp package)"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -29485,8 +29553,8 @@ self: { amqp base bytestring hspec process streamly testcontainers text ]; description = "A simple streamly wrapper for amqp"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -29507,7 +29575,7 @@ self: { utf8-string x509-system ]; description = "AMQP toolset for the command line"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "amqp-worker" = callPackage @@ -29533,8 +29601,8 @@ self: { aeson amqp base bytestring data-default exceptions monad-control monad-loops mtl resource-pool server split text transformers-base ]; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {server = null;}; @@ -29570,7 +29638,7 @@ self: { testHaskellDepends = [ base case-insensitive hspec QuickCheck ]; benchmarkHaskellDepends = [ base bytestring criterion ]; description = "Find strings with permutations (anagrams) that match a regular expression"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "analyze" = callPackage @@ -29592,8 +29660,8 @@ self: { tasty-quickcheck text unordered-containers vector ]; description = "making data science easy and safe with data frames"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -29610,8 +29678,8 @@ self: { snap-core time ]; description = "Client for analyze service"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -29634,7 +29702,7 @@ self: { system-fileio system-filepath text ]; description = "Simple literate programming preprocessor"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "anansi-hscolour" = callPackage @@ -29649,7 +29717,7 @@ self: { anansi base bytestring containers hscolour monads-tf text ]; description = "Colorized looms for Anansi"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "anansi-pandoc" = callPackage @@ -29664,8 +29732,8 @@ self: { anansi base bytestring containers monads-tf pandoc text ]; description = "Looms which use Pandoc to parse and produce a variety of formats"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -29692,8 +29760,8 @@ self: { tagsoup text time vector ]; description = "Anatomy: Atomo documentation system"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -29705,8 +29773,8 @@ self: { sha256 = "1wn0kap7bw6sp9yi1awcmxh11s5ra4b44qbf97plsvrmpfz15cc5"; libraryHaskellDepends = [ base process ]; description = "Android methods exposed to Haskell"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -29718,8 +29786,8 @@ self: { sha256 = "07mgmpcwj7xi3ibmlcz45l645s5cbfnkr1brlhrzbnbyx72x7dr6"; libraryHaskellDepends = [ base data-default ]; description = "Turn regular Haskell programs into Android Activities"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -29746,8 +29814,8 @@ self: { base basic-prelude directory hspec hxt QuickCheck stringable ]; description = "A pretty printer for Android Lint errors"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -29775,8 +29843,8 @@ self: { unordered-containers ]; description = "Process management and supervision daemon"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -29805,8 +29873,8 @@ self: { ]; benchmarkHaskellDepends = [ base criterion ]; description = "A small, general-purpose programming language"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -29818,7 +29886,7 @@ self: { sha256 = "0csbs9yrl8vhlgs7zax06shqlhcjs38q91wnkz5d3f6a4588lyqi"; libraryHaskellDepends = [ base bytestring text ]; description = "Convert camelCase to snake_case and vice versa"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "animascii" = callPackage @@ -29839,8 +29907,8 @@ self: { ]; testHaskellDepends = [ ansi-terminal-game base hspec parsec ]; description = "text-file based ASCII animator"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -29857,8 +29925,8 @@ self: { ]; testHaskellDepends = [ aeson base containers hspec vector ]; description = "Animation for sprites"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -29877,8 +29945,8 @@ self: { text ]; description = "Animation for sprites"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -29900,8 +29968,8 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-hspec ]; description = "Convert sprite frames to animate files"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -29927,8 +29995,8 @@ self: { ]; executableHaskellDepends = [ base ]; description = "Preview tool for sprite animation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -29940,8 +30008,8 @@ self: { sha256 = "0wpx0jv2zyphhxi84bw4h1bw6apbazcadfxzzj90ddc3cb5lhv9n"; libraryHaskellDepends = [ aeson animate base sdl2 sdl2-image ]; description = "sdl2 + animate auxiliary library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -29962,7 +30030,7 @@ self: { ]; executableHaskellDepends = [ base data-default ]; description = "Tools for interacting with Anki database"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "annah" = callPackage @@ -29985,8 +30053,8 @@ self: { base morte optparse-applicative system-fileio system-filepath text ]; description = "Medium-level language that desugars to Morte"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -29998,7 +30066,7 @@ self: { sha256 = "00f0pyf2fxdvwwz9bz3mpp7db39p1m83frvlif74kp0y1x8r20yp"; libraryHaskellDepends = [ base ]; description = "Semigroups with annihilators and utility functions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "annotated-fix" = callPackage @@ -30009,8 +30077,8 @@ self: { sha256 = "1lhyllmi8j9r5mdr5pngw1s1xzs1cwv2hh2ym8kkdrxvrq93dk2i"; libraryHaskellDepends = [ base recursion-schemes ]; description = "A fixpoint of a functor that can be annotated"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -30024,7 +30092,7 @@ self: { editedCabalFile = "138k24qxvl90l7dwdw1b3w36mpw93n0xi0nljblqg88pxg7jcvjx"; libraryHaskellDepends = [ base ]; description = "The Wadler/Leijen Pretty Printer, with annotation support"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "anonymous-sums" = callPackage @@ -30035,8 +30103,8 @@ self: { sha256 = "1bf27vzv21wi634vridxm2mvfjp3wwfwv50pcbdpzscwn4yc3if7"; libraryHaskellDepends = [ base lens template-haskell ]; description = "Anonymous sum types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -30048,8 +30116,8 @@ self: { sha256 = "0a7f7d3xzn8nl9gyzr4wl7m83aszmw42nd0dj8b875khh7i01h0b"; libraryHaskellDepends = [ anonymous-sums base QuickCheck ]; description = "QuickCheck functions to accompany the anonymous-sums package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -30061,7 +30129,7 @@ self: { sha256 = "1aj7p937c48laz5kkhil45lgkjiivcidky6vxxp3q5yvkymsijvb"; libraryHaskellDepends = [ base ]; description = "Haskell package to generate ANSI escape codes for styling strings in the terminal"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "ansi-pretty" = callPackage @@ -30081,7 +30149,7 @@ self: { vector ]; description = "AnsiPretty for ansi-wl-pprint"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ansi-terminal" = callPackage @@ -30094,7 +30162,7 @@ self: { isExecutable = true; libraryHaskellDepends = [ base colour ]; description = "Simple ANSI terminal support, with Windows compatibility"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ansi-terminal_0_11" = callPackage @@ -30107,8 +30175,8 @@ self: { isExecutable = true; libraryHaskellDepends = [ base colour ]; description = "Simple ANSI terminal support, with Windows compatibility"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "ansi-terminal-game" = callPackage @@ -30134,8 +30202,8 @@ self: { linebreak mtl QuickCheck random split terminal-size timers-tick ]; description = "sdl-like functions for terminal applications, based on ansi-terminal"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -30151,7 +30219,7 @@ self: { isExecutable = true; libraryHaskellDepends = [ ansi-terminal base ]; description = "The Wadler/Leijen Pretty Printer for colored ANSI terminal output"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ansigraph" = callPackage @@ -30165,8 +30233,8 @@ self: { libraryHaskellDepends = [ ansi-terminal base ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "Terminal-based graphing via ANSI and Unicode"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -30192,8 +30260,8 @@ self: { time time-locale-compat yesod yesod-auth ]; description = "A web interface to Antisplice dungeons"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.agpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -30216,8 +30284,8 @@ self: { transformers ]; description = "Referring expressions for definitions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -30243,8 +30311,8 @@ self: { ironforge mtl network plugins time transformers ]; description = "This is an IRC bot for Mafia and Resistance"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.agpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -30262,8 +30330,8 @@ self: { http-conduit resourcet safe text transformers ]; description = "Interface for antigate.com captcha recognition API"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -30279,7 +30347,7 @@ self: { executableHaskellDepends = [ base containers QuickCheck ]; description = "Define the language containment (=subtyping) relation on regulare expressions"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -30301,8 +30369,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -30316,8 +30384,8 @@ self: { aeson antiope-s3 avro base bytestring text ]; description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -30344,8 +30412,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -30368,8 +30436,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -30389,8 +30457,8 @@ self: { testHaskellDepends = [ base hspec ]; testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -30415,8 +30483,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -30438,8 +30506,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -30468,8 +30536,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -30499,8 +30567,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -30524,8 +30592,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -30552,8 +30620,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -30569,7 +30637,7 @@ self: { testHaskellDepends = [ base hedgehog hspec hw-hspec-hedgehog ]; testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "antiprimes" = callPackage @@ -30581,7 +30649,7 @@ self: { libraryHaskellDepends = [ base primes ]; testHaskellDepends = [ base hspec ]; description = "Initial project template from stack"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "antiquoter" = callPackage @@ -30592,8 +30660,8 @@ self: { sha256 = "1qv5iid7az7bn1jf6r7ffg5qqbcs8ypf78j4vrs5ajwp39jnbiiy"; libraryHaskellDepends = [ base syb template-haskell ]; description = "Combinator library for quasi- and anti-quoting"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -30610,8 +30678,8 @@ self: { transformers ]; description = "An engine for text-based dungeons"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.agpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -30636,8 +30704,8 @@ self: { unordered-containers ]; description = "A Haskell implementation of the ANTLR top-down parser generator"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -30658,8 +30726,8 @@ self: { base bytestring enumerator haskell98 regex-posix ]; description = "Haskell binding to the ANTLR parser generator C runtime library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {antlr3c = null;}; @@ -30676,7 +30744,7 @@ self: { libraryHaskellDepends = [ base containers MissingH mtl ]; description = "Interface for DBM-like database systems"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -30689,8 +30757,8 @@ self: { libraryHaskellDepends = [ base ghc-prim integer-gmp ]; testHaskellDepends = [ base ghc-prim ]; description = "prelude for Algebra of Programming"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -30711,8 +30779,8 @@ self: { tasty tasty-hunit tasty-quickcheck ]; description = "An implementation of the AOS signatures"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -30733,8 +30801,8 @@ self: { base colour language-haskell-extract pango template-haskell ]; description = "Bindings to libaosd, a library for Cairo-based on-screen displays"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) libaosd;}; @@ -30747,7 +30815,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base inspection-testing transformers ]; description = "Self-normalizing applicative expressions"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "ap-reflect" = callPackage @@ -30758,7 +30826,7 @@ self: { sha256 = "16hh3ava0qc8w2y04a8gdh2qfxclh2mhim9zv17d16wlx9dq9qgs"; libraryHaskellDepends = [ base ]; description = "Partial evaluation reflection a la simple-reflect"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "apache-md5" = callPackage @@ -30784,7 +30852,7 @@ self: { ]; benchmarkSystemDepends = [ openssl ]; description = "Apache specific MD5 digest algorighm"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) openssl;}; "apart" = callPackage @@ -30807,8 +30875,8 @@ self: { base comonad contravariant free hedgehog lens semigroupoids ]; description = "Get all your structure and rip it apart"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -30826,7 +30894,7 @@ self: { testHaskellDepends = [ base containers linear QuickCheck vector ]; benchmarkHaskellDepends = [ base criterion linear ]; description = "Fast Entity-Component-System library for game programming"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "apecs-gloss" = callPackage @@ -30841,7 +30909,7 @@ self: { apecs apecs-physics base containers gloss linear ]; description = "Simple gloss renderer for apecs"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "apecs-physics" = callPackage @@ -30857,7 +30925,7 @@ self: { apecs base containers inline-c linear template-haskell vector ]; description = "2D physics for apecs"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "apecs-physics-gloss" = callPackage @@ -30868,7 +30936,7 @@ self: { sha256 = "075rpm4l1na7j79vkh7n5c806zj7vvj2qxrxq6pkb6k6364ff249"; libraryHaskellDepends = [ apecs apecs-physics base gloss ]; description = "Gloss rendering for apecs-physics"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "apecs-stm" = callPackage @@ -30884,8 +30952,8 @@ self: { vector ]; description = "STM stores for apecs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -30907,8 +30975,8 @@ self: { xdg-basedir ]; description = "Server and community browser for the game Tremulous"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -30930,8 +30998,8 @@ self: { text transformers ]; description = "Library for easily building REST API wrappers in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -30948,7 +31016,7 @@ self: { ]; testHaskellDepends = [ aeson base HUnit lens ]; description = "option of aeson's deriveJSON"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "api-maker" = callPackage @@ -30971,7 +31039,7 @@ self: { transformers-base ]; description = "Package to make APIs"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "api-monobank" = callPackage @@ -30993,8 +31061,8 @@ self: { aeson base bytestring http-client http-conduit stm text time ]; testHaskellDepends = [ base bytestring hs-coindesk-api ]; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {hs-coindesk-api = null;}; @@ -31010,7 +31078,7 @@ self: { base bytestring directory opentheory-unicode ]; description = "OpenTheory unicode character API"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "api-rpc-factom" = callPackage @@ -31035,8 +31103,8 @@ self: { ]; testHaskellDepends = [ base bytestring ]; description = "RPC API client for Factom"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -31060,8 +31128,8 @@ self: { remote-monad text time transformers ]; description = "simple json-rpc client for PegNet"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -31096,8 +31164,8 @@ self: { tasty-quickcheck template-haskell text time unordered-containers ]; description = "DSL for generating API boilerplate and docs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -31118,8 +31186,8 @@ self: { ]; testHaskellDepends = [ base bytestring text ]; description = "Api bindings for Yoti services"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -31152,8 +31220,8 @@ self: { tasty-hunit tasty-quickcheck wai wai-extra ]; description = "Simple and type safe web framework that generate web API documentation"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -31173,8 +31241,8 @@ self: { monad-control resourcet text wai ]; description = "authenticate support for apiary web framework"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -31192,8 +31260,8 @@ self: { clientsession data-default-class time unix-compat vault ]; description = "clientsession support for apiary web framework"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -31209,8 +31277,8 @@ self: { apiary base blaze-builder blaze-html bytestring cookie time wai ]; description = "Cookie support for apiary web framework"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -31222,8 +31290,8 @@ self: { sha256 = "0dkvj03ay44m49pmm96y9nvyqlrw91kyw0pzm6wraspagbvs57nm"; libraryHaskellDepends = [ apiary base blaze-builder wai-extra ]; description = "eventsource support for apiary web framework"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -31243,8 +31311,8 @@ self: { monad-control text transformers types-compat vault wai ]; description = "helics support for apiary web framework"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -31261,8 +31329,8 @@ self: { text transformers wai ]; description = "A http client for Apiary"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -31280,8 +31348,8 @@ self: { monad-control monad-logger transformers transformers-base ]; description = "fast-logger support for apiary web framework"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -31300,8 +31368,8 @@ self: { monad-control text transformers types-compat ]; description = "memcached client for apiary web framework"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -31319,8 +31387,8 @@ self: { mongoDB resource-pool text time transformers ]; description = "mongoDB support for apiary web framework"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -31338,8 +31406,8 @@ self: { resource-pool resourcet transformers transformers-base ]; description = "persistent support for apiary web framework"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -31359,8 +31427,8 @@ self: { purescript text transformers types-compat unordered-containers ]; description = "purescript compiler for apiary web framework"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -31372,8 +31440,8 @@ self: { sha256 = "0b9m165qs7nd9iisbkkx0vpdkv37bh0vvrwq769bjc2k8qkqspwl"; libraryHaskellDepends = [ apiary base hedis transformers ]; description = "redis support for apiary web framework"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -31385,8 +31453,8 @@ self: { sha256 = "01z4r0sfm562wssfpqs3yzgwrprh8jzp0xsck4z099pwjknfi4i4"; libraryHaskellDepends = [ apiary base wai ]; description = "session support for apiary web framework"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -31398,8 +31466,8 @@ self: { sha256 = "0z43lqjz51r3mw92drjkrl3m8na7ldick76vqas0dr17v1d4qdsw"; libraryHaskellDepends = [ apiary base wai-websockets websockets ]; description = "websockets support for apiary web framework"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -31412,7 +31480,7 @@ self: { libraryHaskellDepends = [ aeson base bytestring lens wreq ]; testHaskellDepends = [ base ]; description = "Consumer library for anapioficeandfire.com"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "apis" = callPackage @@ -31432,8 +31500,8 @@ self: { unordered-containers utf8-string yql ]; description = "A Template Haskell library for generating type safe API calls"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -31462,7 +31530,7 @@ self: { x509-store x509-system x509-validation ]; description = "Apple Push Notification service HTTP/2 integration"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "apotiki" = callPackage @@ -31491,8 +31559,8 @@ self: { wai-middleware-static zlib ]; description = "a faster debian repository"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -31507,8 +31575,8 @@ self: { base containers criterion deepseq lens mtl ]; description = "applicative (functional) bidirectional programming beyond composition chains"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -31527,7 +31595,7 @@ self: { base containers directory hspec HUnit mtl parsec text ]; description = "A library to manage application settings (INI file-like)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "appar" = callPackage @@ -31538,7 +31606,7 @@ self: { sha256 = "07v3h766q9mnhphsm53718h1lds147ix7dj15kc5hnsj4vffvkn4"; libraryHaskellDepends = [ base bytestring ]; description = "A simple applicative parser"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "appc" = callPackage @@ -31563,8 +31631,8 @@ self: { aeson base hspec hspec-smallcheck semver smallcheck text uuid ]; description = "app container types and tools"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -31577,7 +31645,7 @@ self: { libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers hspec QuickCheck ]; description = "Map with a Semigroup and Monoid instances delegating to Semigroup of the elements"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "applicative-extras" = callPackage @@ -31588,7 +31656,7 @@ self: { sha256 = "1svsf8mvb816nksg1dh4dz3cms2zx2hjprz2z7h3zidpxmzs0pr8"; libraryHaskellDepends = [ base ]; description = "Instances for Applicative"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "applicative-fail" = callPackage @@ -31606,8 +31674,8 @@ self: { base checkers mtl QuickCheck tasty tasty-quickcheck ]; description = "Applicative functor and monad which collects all your fails"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -31619,7 +31687,7 @@ self: { sha256 = "0rnjl7yz6nga4qi0jdvhf911yf1qk6gy2fm5236bsgc50d5wbaw0"; libraryHaskellDepends = [ base ]; description = "Applicative-based numeric instances"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "applicative-parsec" = callPackage @@ -31635,8 +31703,8 @@ self: { base mtl QuickCheck test-framework test-framework-quickcheck2 ]; description = "An applicative parser combinator library"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -31650,8 +31718,8 @@ self: { editedCabalFile = "0ccdnkl3pxkwcg7m3xalqwax1gzaj3hg85zb219y7cfva2pvz1jp"; libraryHaskellDepends = [ base haskell-src-meta template-haskell ]; description = "Quasiquoters for idiom brackets and an applicative do-notation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -31667,12 +31735,12 @@ self: { base haskell-src-exts haskell-src-meta mtl syb template-haskell ]; description = "Write applicative programs in direct style (generalizes idiom brackets)"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; - "apply-refact" = callPackage + "apply-refact_0_8_2_1" = callPackage ({ mkDerivation, base, containers, directory, extra, filemanip , filepath, ghc, ghc-boot-th, ghc-exactprint, optparse-applicative , process, refact, silently, syb, tasty, tasty-expected-failure @@ -31699,7 +31767,39 @@ self: { tasty tasty-expected-failure tasty-golden transformers unix-compat ]; description = "Perform refactorings specified by the refact library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "apply-refact" = callPackage + ({ mkDerivation, base, containers, directory, extra, filemanip + , filepath, ghc, ghc-boot-th, ghc-exactprint, optparse-applicative + , process, refact, silently, syb, tasty, tasty-expected-failure + , tasty-golden, transformers, uniplate, unix-compat + }: + mkDerivation { + pname = "apply-refact"; + version = "0.9.0.0"; + sha256 = "1w6andxlap50vi2cwdy7x5xp2q1qyd67g4vs860gddcv8nir69qc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers directory extra filemanip ghc ghc-boot-th + ghc-exactprint process refact syb transformers uniplate unix-compat + ]; + executableHaskellDepends = [ + base containers directory extra filemanip filepath ghc ghc-boot-th + ghc-exactprint optparse-applicative process refact syb transformers + uniplate unix-compat + ]; + testHaskellDepends = [ + base containers directory extra filemanip filepath ghc ghc-boot-th + ghc-exactprint optparse-applicative process refact silently syb + tasty tasty-expected-failure tasty-golden transformers uniplate + unix-compat + ]; + description = "Perform refactorings specified by the refact library"; + license = lib.licenses.bsd3; }) {}; "apportionment" = callPackage @@ -31710,7 +31810,7 @@ self: { sha256 = "062v4a1ip7zy20b03z1jajqy2ylx5fl74p7px54b1vajf6vx0wcg"; libraryHaskellDepends = [ base containers utility-ht ]; description = "Round a set of numbers while maintaining its sum"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "approveapi" = callPackage @@ -31737,8 +31837,8 @@ self: { semigroups text time transformers unordered-containers vector ]; description = "ApproveAPI Haskell Client"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -31765,8 +31865,8 @@ self: { vector ]; description = "Easy-to-use reasonable way of emulating approximate in Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -31798,7 +31898,7 @@ self: { ]; description = "Approximate randomization test"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "approximate" = callPackage @@ -31820,7 +31920,7 @@ self: { base directory doctest filepath semigroups simple-reflect ]; description = "Approximate discrete values and numbers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "approximate-equality" = callPackage @@ -31831,7 +31931,7 @@ self: { sha256 = "0pxvyb5a6vh0isba81flv7wjlwfn091xrma7g6wzr08bvqmix883"; libraryHaskellDepends = [ base type-level-natural-number ]; description = "Newtype wrappers for approximate equality"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ar-timestamp-wiper" = callPackage @@ -31845,7 +31945,7 @@ self: { libraryHaskellDepends = [ base bytestring ]; executableHaskellDepends = [ base bytestring ]; description = "Wipes time stamps from .a files (like ar -D)"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "arb-fft" = callPackage @@ -31868,8 +31968,8 @@ self: { base containers QuickCheck tasty tasty-quickcheck vector ]; description = "Pure Haskell arbitrary length FFT library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -31886,8 +31986,8 @@ self: { ]; librarySystemDepends = [ arbb_dev ]; description = "FFI binding to the Intel Array Building Blocks (ArBB) virtual machine"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {arbb_dev = null;}; @@ -31912,8 +32012,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Datadog client for Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -31931,7 +32031,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "LRU cache based on STM"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "arbor-monad-counter" = callPackage @@ -31952,8 +32052,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Counter library for submitting metrics to a backend such as datadog"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -31977,7 +32077,7 @@ self: { testHaskellDepends = [ base hedgehog hspec hw-hspec-hedgehog ]; testToolDepends = [ hspec-discover ]; description = "Simple logging library"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "arbor-monad-metric" = callPackage @@ -32000,8 +32100,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Core metric library for publishing metrics"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -32027,8 +32127,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Metric library backend for datadog"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -32047,7 +32147,7 @@ self: { postgresql-simple text ]; description = "Convenience types and functions for postgresql-simple"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "arbtt" = callPackage @@ -32076,7 +32176,7 @@ self: { transformers unix utf8-string ]; description = "Automatic Rule-Based Time Tracker"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }) {}; "arcgrid" = callPackage @@ -32090,7 +32190,7 @@ self: { libraryHaskellDepends = [ base parsec parsec-numeric ]; executableHaskellDepends = [ base ]; description = "Parse ESRI/ArcInfo (ArcGrid) raster GIS files"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "arcgrid-viewer" = callPackage @@ -32105,43 +32205,69 @@ self: { arcgrid base bytestring gloss transformers ]; description = "Simple viewer for ESRI/ArcInfo (ArcGrid) geospatial data"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "arch-hs" = callPackage - ({ mkDerivation, aeson, algebraic-graphs, base, bytestring, Cabal - , conduit, conduit-extra, containers, deepseq, Diff, directory - , filepath, hackage-db, megaparsec, microlens, microlens-th + ({ mkDerivation, aeson, algebraic-graphs, arch-web, base + , bytestring, Cabal, conduit, conduit-extra, containers, deepseq + , Diff, directory, filepath, hackage-db, http-client + , http-client-tls, megaparsec, microlens, microlens-th , neat-interpolation, optparse-applicative, polysemy, prettyprinter - , prettyprinter-ansi-terminal, req, split, tar-conduit + , prettyprinter-ansi-terminal, servant-client, split, tar-conduit , template-haskell, text }: mkDerivation { pname = "arch-hs"; - version = "0.6.2.0"; - sha256 = "10v2n1m5608g2lqgn16bwwhlafbj2hhnsnvm22pfff4ahnvj7880"; + version = "0.7.0.0"; + sha256 = "0nlsxlqmjg0nw9dgd3l8s1zphzcwrbcvmv30s5y5xbfm06zc5wc7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson algebraic-graphs base bytestring Cabal conduit conduit-extra - containers deepseq Diff directory filepath hackage-db megaparsec - microlens microlens-th neat-interpolation optparse-applicative - polysemy prettyprinter prettyprinter-ansi-terminal req split - tar-conduit template-haskell text + aeson algebraic-graphs arch-web base bytestring Cabal conduit + conduit-extra containers deepseq Diff directory filepath hackage-db + http-client http-client-tls megaparsec microlens microlens-th + neat-interpolation optparse-applicative polysemy prettyprinter + prettyprinter-ansi-terminal servant-client split tar-conduit + template-haskell text ]; executableHaskellDepends = [ - aeson algebraic-graphs base bytestring Cabal conduit conduit-extra - containers deepseq Diff directory filepath hackage-db megaparsec - microlens microlens-th neat-interpolation optparse-applicative - polysemy prettyprinter prettyprinter-ansi-terminal req split - tar-conduit template-haskell text + aeson algebraic-graphs arch-web base bytestring Cabal conduit + conduit-extra containers deepseq Diff directory filepath hackage-db + http-client http-client-tls megaparsec microlens microlens-th + neat-interpolation optparse-applicative polysemy prettyprinter + prettyprinter-ansi-terminal servant-client split tar-conduit + template-haskell text ]; description = "Distribute hackage packages to archlinux"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; + "arch-web" = callPackage + ({ mkDerivation, aeson, base, deriving-aeson, exceptions + , http-client, http-client-tls, http-types, HUnit, lens, mtl + , servant, servant-client, servant-client-core, text, time + }: + mkDerivation { + pname = "arch-web"; + version = "0.1.0"; + sha256 = "1wiy4swpi3ca8sri2drycfr6i674da2kgiplfng7jcjlxr5nmdpz"; + libraryHaskellDepends = [ + aeson base deriving-aeson exceptions http-client http-client-tls + http-types lens mtl servant servant-client servant-client-core text + time + ]; + testHaskellDepends = [ + aeson base deriving-aeson exceptions http-client http-client-tls + http-types HUnit lens mtl servant servant-client + servant-client-core text time + ]; + description = "Arch Linux official and AUR web interface binding"; + license = lib.licenses.mit; + }) {}; + "archive" = callPackage ({ mkDerivation, base, bytestring, debian, debian-mirror, directory , Extra, filepath, help, HUnit, mtl, network, old-locale, pretty @@ -32160,8 +32286,8 @@ self: { regex-posix time unix Unixutils xhtml ]; description = "A library and programs for creating hardlinked incremental archives or backups"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {debian-mirror = null; help = null;}; @@ -32178,8 +32304,8 @@ self: { ]; libraryToolDepends = [ cpphs ]; description = "Common interface using libarchive"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -32195,7 +32321,7 @@ self: { base bytestring composition-prelude dir-traverse ]; description = "Backpack signature for archive libraries"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "archive-tar" = callPackage @@ -32210,7 +32336,7 @@ self: { ]; libraryToolDepends = [ cpphs ]; description = "Common interface using the tar package"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "archive-tar-bytestring" = callPackage @@ -32226,7 +32352,7 @@ self: { ]; libraryToolDepends = [ cpphs ]; description = "Common interface using the tar-bytestring package"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "archiver" = callPackage @@ -32244,8 +32370,8 @@ self: { base bytestring containers process random ]; description = "Archive supplied URLs in WebCite & Internet Archive"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -32261,8 +32387,8 @@ self: { base Cabal containers directory filepath pretty ]; description = "Support for working with Arch Linux packages"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -32288,8 +32414,8 @@ self: { strict-concurrency xhtml ]; description = "Website maintenance for Arch Linux packages"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -32305,8 +32431,8 @@ self: { base containers download-curl feed tagsoup ]; description = "Convert Arch Linux package updates in RSS to pretty markdown"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -32317,16 +32443,16 @@ self: { }: mkDerivation { pname = "arduino-copilot"; - version = "1.5.2"; - sha256 = "04qy06aws4qwg5slakj12jkwvfcrg960spj0g1c42lfb582ybrm6"; + version = "1.5.3"; + sha256 = "18aa6qqgk1cd5adydyby7xm3imrg739hhmdl0m67b61gf7f3ch3x"; libraryHaskellDepends = [ base containers copilot copilot-c99 copilot-language directory filepath mtl optparse-applicative temporary ]; testHaskellDepends = [ base directory process temporary ]; description = "Arduino programming in haskell using the Copilot stream DSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -32352,8 +32478,8 @@ self: { base criterion directory mtl semigroups ]; description = "A journaled data store"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -32370,8 +32496,8 @@ self: { time ]; description = "Generate Attribute-Relation File Format (ARFF) files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -32385,8 +32511,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base directory wx ]; description = "An interpreter for the Argh! programming language in wxHaskell"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -32413,8 +32539,8 @@ self: { QuickCheck ]; description = "Measure your code's complexity"; - license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -32433,8 +32559,8 @@ self: { base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck ]; description = "Memory-hard password hash and proof-of-work function"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -32447,8 +32573,8 @@ self: { libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers HTF HUnit ]; description = "Command line parsing framework for console applications"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -32466,8 +32592,8 @@ self: { base bimap containers glib gtk HDBC indents mtl parsec ]; description = "A computer assisted argumentation transcription and editing software"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -32495,8 +32621,8 @@ self: { tasty-hunit utf8-string ]; description = "Go-to-definition for Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -32520,8 +32646,8 @@ self: { regex-posix safe split system-filepath text time ]; description = "Watcher and runner for Hspec"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -32550,8 +32676,8 @@ self: { lens-aeson process protolude QuickCheck temporary text unix ]; description = "Run docker-compose with help from Nix/NixOS"; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ roberth ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ roberth ]; }) {}; "arith-encode" = callPackage @@ -32573,7 +32699,7 @@ self: { base binary containers hashable HUnit-Plus unordered-containers ]; description = "A practical arithmetic encoding (aka Godel numbering) library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "arithmatic" = callPackage @@ -32584,7 +32710,7 @@ self: { sha256 = "0pxlla3jmpb4ll0hn8xvfb32kqx8053alvis9cryq060m3bd09aq"; libraryHaskellDepends = [ base ]; description = "do things with numbers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "arithmetic" = callPackage @@ -32611,7 +32737,7 @@ self: { opentheory-prime opentheory-primitive QuickCheck random ]; description = "Natural number arithmetic"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "arithmetic-circuits" = callPackage @@ -32645,8 +32771,8 @@ self: { process-extras protolude semirings text vector wl-pprint-text ]; description = "Arithmetic circuits for zkSNARKs"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -32677,7 +32803,7 @@ self: { mod random semirings vector ]; description = "Efficient basic number-theoretic functions"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "arity-generic-liftA" = callPackage @@ -32691,7 +32817,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; description = "Provides an arity-generic version of the liftA2, liftA3... liftAn functions."; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "armada" = callPackage @@ -32705,7 +32831,7 @@ self: { executableHaskellDepends = [ base GLUT mtl OpenGL stm ]; description = "Space-based real time strategy game"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -32726,8 +32852,8 @@ self: { aeson base bytestring containers directory hspec HUnit lens text ]; description = "Prevent serialization backwards compatibility problems using golden tests"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -32742,8 +32868,8 @@ self: { libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base ]; description = "Library for reading ARPA n-gram models"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -32767,8 +32893,8 @@ self: { base hmatrix hspec QuickCheck vector vector-algorithms ]; description = "Solve large scale eigenvalue problems"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) arpack;}; @@ -32780,8 +32906,8 @@ self: { sha256 = "1ixqnwxd36l2j3873hwnfip17k2nzncbvsx7pnprqzv9z59mf4rv"; libraryHaskellDepends = [ base ]; description = "Mutable and immutable arrays"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "array-builder" = callPackage @@ -32795,8 +32921,8 @@ self: { libraryHaskellDepends = [ array-chunks base primitive run-st ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Builders for arrays"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -32814,8 +32940,8 @@ self: { tasty-quickcheck ]; description = "Lists of chunks"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -32841,8 +32967,8 @@ self: { test-framework-quickcheck2 test-framework-th ]; description = "A simple interpreter for arrayForth, the language used on GreenArrays chips"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -32857,8 +32983,8 @@ self: { array base doctest doctest-driver-gen hspec ]; description = "IsList instances of Array for OverloadedLists extension"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -32870,7 +32996,7 @@ self: { sha256 = "1p05vg8mdyad03aa7s1nrgw5xqgl80f6l7v0llhmi1q4xnrqrj3n"; libraryHaskellDepends = [ array base ]; description = "Memoization combinators using arrays for finite sub-domains of functions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "array-primops" = callPackage @@ -32887,8 +33013,8 @@ self: { ]; benchmarkHaskellDepends = [ base criterion ghc-prim ]; description = "Extra foreign primops for primitive arrays"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -32900,7 +33026,7 @@ self: { sha256 = "1gh7gmbm0djr78dqkf8q3ap9yk4gm3dq48k8jad9ssp3w19wpkan"; libraryHaskellDepends = [ array base ]; description = "Primitive functions for updating many elements in mutable arrays at once"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "arrayfire" = callPackage @@ -32924,8 +33050,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Haskell bindings to the ArrayFire general-purpose GPU library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {af = null;}; @@ -32943,8 +33069,8 @@ self: { tasty-smallcheck ]; description = "Memory-efficient ArrayList implementation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -32956,7 +33082,7 @@ self: { sha256 = "0v3ab3h3rg38dvmyqqfsysgfpib8i81s87wr965cf7lxhfx3lg61"; libraryHaskellDepends = [ base ]; description = "Extra functions for Control.Arrow"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "arrow-improve" = callPackage @@ -32970,8 +33096,8 @@ self: { arrows base pointed profunctors semigroupoids ]; description = "Improved arrows"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -32983,8 +33109,8 @@ self: { sha256 = "11rzpq8mml00amb0hd09bwwhpn199jr8mxp0454ljkpbgqc5jm9s"; libraryHaskellDepends = [ base containers fail mtl ]; description = "List arrows for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -32996,8 +33122,8 @@ self: { sha256 = "02zampc6cc5a9fvdvxkz2r6i5sxf5w0qilsvsx8jxiw4kprbghii"; libraryHaskellDepends = [ base ]; description = "Utilities for working with ArrowApply instances more naturally"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -33012,7 +33138,7 @@ self: { executableHaskellDepends = [ array base containers haskell-src ]; description = "preprocessor translating arrow notation into Haskell 98"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -33034,7 +33160,7 @@ self: { executableHaskellDepends = [ base haskell-src-exts NoHoed ]; description = "A preprocessor and quasiquoter for translating arrow notation"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -33046,7 +33172,7 @@ self: { sha256 = "02db4byzz8xb4c36y0v867g9kd3a9p04r4cj1np717k20qrwjnpn"; libraryHaskellDepends = [ base Stream ]; description = "Arrow classes and transformers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "artery" = callPackage @@ -33059,8 +33185,8 @@ self: { base containers profunctors transformers ]; description = "A simple, arrow-based reactive programming"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -33074,8 +33200,8 @@ self: { editedCabalFile = "09hmx0x4fz80kby7w1n9rc7sibbmpsvl4i3rc3h91hs53ban4yd4"; libraryHaskellDepends = [ aeson base bytestring containers text ]; description = "Basic types and instances for Valve's Artifact Card-set API"; - license = stdenv.lib.licenses.agpl3Plus; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.agpl3Plus; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -33099,7 +33225,7 @@ self: { file-embed hashable parsec process shell-escape template-haskell ]; description = "Archive execution tool"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "arxiv" = callPackage @@ -33126,8 +33252,8 @@ self: { ]; testHaskellDepends = [ base hedgehog jwt mtl text time ]; description = "Atlassian Service Authentication Protocol"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -33139,7 +33265,7 @@ self: { sha256 = "1c5ip8q9b6xnvh3li03iilmqz33rrlis78zs0lh4jva67b37akqk"; libraryHaskellDepends = [ base MissingH ]; description = "Generic markup builder"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "ascii" = callPackage @@ -33149,14 +33275,14 @@ self: { }: mkDerivation { pname = "ascii"; - version = "1.0.0.2"; - sha256 = "13v1zpll4x72ib5pwrs01kkhw5yc5xq8aazwm9zfni9452sw3r3w"; + version = "1.0.1.0"; + sha256 = "0px41v49i3czchlv09dnbivlrk1zci4b2mg0xkrp6nwyzb9z4xyr"; libraryHaskellDepends = [ ascii-case ascii-char ascii-group ascii-predicates ascii-superset ascii-th base bytestring data-ascii text ]; description = "The ASCII character set and encoding"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "ascii-art-to-unicode" = callPackage @@ -33171,7 +33297,7 @@ self: { executableHaskellDepends = [ base strict ]; testHaskellDepends = [ base doctest ]; description = "ASCII Art to Unicode Box Drawing converter"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ascii-case" = callPackage @@ -33182,18 +33308,18 @@ self: { sha256 = "1qs1rccslixsg4szgp7y98sqhhn0asp9qmk9vfrwdjfipmf3z72p"; libraryHaskellDepends = [ ascii-char base hashable ]; description = "ASCII letter case"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "ascii-char" = callPackage ({ mkDerivation, base, hashable }: mkDerivation { pname = "ascii-char"; - version = "1.0.0.2"; - sha256 = "0pglcppji9irbz0fjc6hb1fv7qjbjcii6k4qdv389l7kbb77w318"; + version = "1.0.0.6"; + sha256 = "049xccazgjb1zzqbzpgcw77hsl5j3j8l7f0268wxjy87il3wfnx3"; libraryHaskellDepends = [ base hashable ]; description = "A Char type representing an ASCII character"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "ascii-cows" = callPackage @@ -33204,7 +33330,7 @@ self: { sha256 = "0ddnjsqmaqrs2kxys32zqpmvkyway4dqj35x2q3gqxmsir3qg8zq"; libraryHaskellDepends = [ base random-extras random-fu text ]; description = "A collection of ASCII cows. Moo."; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ascii-flatten" = callPackage @@ -33218,8 +33344,8 @@ self: { libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base text ]; description = "Flattens European non-ASCII characaters into ASCII"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -33231,7 +33357,7 @@ self: { sha256 = "19l50ksqa7jdsl0pmrmy8q8jbgmb1j3hr63jjzys220f0agsgcwr"; libraryHaskellDepends = [ ascii-char base hashable ]; description = "ASCII character groups"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "ascii-holidays" = callPackage @@ -33246,7 +33372,7 @@ self: { base random random-shuffle terminfo time ]; description = "ASCII animations for the holidays!"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "ascii-predicates" = callPackage @@ -33257,7 +33383,7 @@ self: { sha256 = "0dzrxqhq7vqplg4aanc4kindwpizv3d777ri81sj1m1zn3vzvrrq"; libraryHaskellDepends = [ ascii-char base ]; description = "Various categorizations of ASCII characters"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "ascii-progress" = callPackage @@ -33277,7 +33403,7 @@ self: { async base concurrent-output data-default hspec QuickCheck time ]; description = "A simple progress bar for the console"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "ascii-string" = callPackage @@ -33299,8 +33425,8 @@ self: { tasty-quickcheck ]; description = "Compact representation of ASCII strings"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -33308,13 +33434,13 @@ self: { ({ mkDerivation, ascii-char, base, bytestring, hashable, text }: mkDerivation { pname = "ascii-superset"; - version = "1.0.0.2"; - sha256 = "1wanvb18h1jlf33f6zr7l1swvagdhw5w3554fsvjq1dm37nygd5m"; + version = "1.0.1.0"; + sha256 = "1d4yfcy8yr6zimpv8mq8lsf8sd85rg4m8x7l81lr6wan2wx54gh6"; libraryHaskellDepends = [ ascii-char base bytestring hashable text ]; description = "Representing ASCII with refined supersets"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "ascii-table" = callPackage @@ -33330,8 +33456,8 @@ self: { vector wl-pprint-extras ]; description = "ASCII table"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -33346,7 +33472,7 @@ self: { ascii-char ascii-superset base template-haskell ]; description = "Template Haskell support for ASCII"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "ascii-vector-avc" = callPackage @@ -33368,8 +33494,8 @@ self: { split zlib ]; description = "Process Ascii Vectors for Advantest 93k"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -33382,8 +33508,8 @@ self: { libraryHaskellDepends = [ base bytestring conduit ]; testHaskellDepends = [ base bytestring conduit hspec ]; description = "Conduit for encoding ByteString into Ascii85"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -33398,7 +33524,7 @@ self: { libraryHaskellDepends = [ array base ]; testHaskellDepends = [ base hspec random raw-strings-qq silently ]; description = "Line charts in terminal"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "asciidiagram" = callPackage @@ -33421,7 +33547,7 @@ self: { optparse-applicative rasterific-svg svg-tree text ]; description = "Pretty rendering of Ascii diagram into svg or png"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "asic" = callPackage @@ -33435,7 +33561,7 @@ self: { executableHaskellDepends = [ asil base bytestring utf8-string ]; description = "Action Script Instrumentation Compiler"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -33478,7 +33604,7 @@ self: { ]; testToolDepends = [ doctest-discover hspec-discover ]; description = "Library for creating and querying segmented feeds"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "asil" = callPackage @@ -33497,7 +33623,7 @@ self: { ]; description = "Action Script Instrumentation Library"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -33512,8 +33638,8 @@ self: { aeson base hashable primitive scientific text ]; description = "asn type and encoding/decoding"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -33538,8 +33664,8 @@ self: { test-framework test-framework-hunit text vector ]; description = "Encode and decode ASN.1"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -33556,8 +33682,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring cereal mtl text ]; description = "ASN1 data reader and writer in RAW, BER and DER forms"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -33576,7 +33702,7 @@ self: { asn1-types base bytestring hourglass mtl tasty tasty-quickcheck ]; description = "ASN1 data reader and writer in RAW, BER and DER forms"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "asn1-parse" = callPackage @@ -33589,7 +33715,7 @@ self: { asn1-encoding asn1-types base bytestring ]; description = "Simple monadic parser for ASN1 stream types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "asn1-types" = callPackage @@ -33600,7 +33726,7 @@ self: { sha256 = "1a119qxhxhr0yn37r26dkydm6g5kykdkx98ghb59i4ipa6i95vkq"; libraryHaskellDepends = [ base bytestring hourglass memory ]; description = "ASN.1 types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "asn1dump" = callPackage @@ -33617,7 +33743,7 @@ self: { asn1-encoding asn1-types base bytestring pem ]; description = "Dump ASN1 structure"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "aspell-pipe" = callPackage @@ -33628,7 +33754,7 @@ self: { sha256 = "09dw4v4j5pmqi8pdh3p7kk7f8pph5w33s7vd21fgvhv3arnrj6p8"; libraryHaskellDepends = [ async base process text ]; description = "Pipe-based interface to the Aspell program"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "assembler" = callPackage @@ -33642,8 +33768,8 @@ self: { libraryHaskellDepends = [ base containers ghc-binary parsec ]; executableHaskellDepends = [ base containers ghc-binary parsec ]; description = "Haskell Assembler"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {ghc-binary = null;}; @@ -33660,8 +33786,8 @@ self: { base bytestring Cabal directory filepath system-posix-redirect ]; description = "Helpers for Control.Exception.assert"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -33674,7 +33800,7 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base pretty-show text ]; description = "Syntactic sugar improving 'assert' and 'error'"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "assertions" = callPackage @@ -33689,8 +33815,8 @@ self: { libraryHaskellDepends = [ ansi-terminal base containers ]; testHaskellDepends = [ base interpolate process ]; description = "A simple testing framework"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -33702,7 +33828,7 @@ self: { sha256 = "1c0678qjkr1q3pi20ch05k8ri4zxcc1drc4j44fvb1sz7b8y260c"; libraryHaskellDepends = [ base Cabal directory filepath ]; description = "A build-time Cabal library that bundles executables with assets"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "asset-map" = callPackage @@ -33719,8 +33845,8 @@ self: { ]; testHaskellDepends = [ base hspec ]; description = "Asset map support for the JavaScript broccoli-asset-rev library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -33734,8 +33860,8 @@ self: { librarySystemDepends = [ assimp ]; libraryToolDepends = [ c2hs ]; description = "The Assimp asset import library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) assimp;}; @@ -33747,7 +33873,7 @@ self: { sha256 = "0kqlizznjy94fm8zr1ng633yxbinjff7cnsiaqs7m33ix338v66q"; libraryHaskellDepends = [ base bifunctors tagged ]; description = "swap and assoc: Symmetric and Semigroupy Bifunctors"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "assoc-list" = callPackage @@ -33759,7 +33885,7 @@ self: { libraryHaskellDepends = [ base contravariant ]; testHaskellDepends = [ base contravariant doctest hedgehog ]; description = "Association lists (lists of tuples)"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "assoc-listlike" = callPackage @@ -33772,7 +33898,7 @@ self: { libraryHaskellDepends = [ base contravariant ListLike ]; testHaskellDepends = [ base contravariant doctest hedgehog ]; description = "Association lists (list-like collections of tuples)"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "assumpta" = callPackage @@ -33793,8 +33919,8 @@ self: { quickcheck-io ]; description = "An SMTP client library"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -33813,7 +33939,7 @@ self: { ]; testHaskellDepends = [ base bytestring hspec mtl QuickCheck text ]; description = "Core functionality for an SMTP client"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }) {}; "ast-monad" = callPackage @@ -33827,8 +33953,8 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "A library for constructing AST by using do-notation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -33843,8 +33969,8 @@ self: { libraryHaskellDepends = [ ast-monad base text ]; testHaskellDepends = [ ast-monad base hspec text ]; description = "A library for writing JSON"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -33857,7 +33983,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "vocabulary representation for predicting program properties"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "astar" = callPackage @@ -33870,7 +33996,7 @@ self: { base hashable psqueues unordered-containers ]; description = "General A* search algorithm"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "astar-monad" = callPackage @@ -33881,7 +34007,7 @@ self: { sha256 = "1df99k3c299nzfxbqnzkqggagf7l8p2fwa9igxy9ydg8b0rqc6xf"; libraryHaskellDepends = [ base logict mtl ]; testHaskellDepends = [ base hspec lens logict mtl ]; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "astrds" = callPackage @@ -33900,8 +34026,8 @@ self: { SDL-image SDL-mixer SDL-ttf unix ]; description = "an incomplete 2d space game"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -33919,7 +34045,7 @@ self: { test-framework-quickcheck2 time ]; description = "Amateur astronomical computations"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "astview" = callPackage @@ -33939,8 +34065,8 @@ self: { glib Glob gtk gtksourceview2 hint mtl process syb ]; description = "A GTK-based abstract syntax tree viewer for custom languages and parsers"; - license = stdenv.lib.licenses.bsdOriginal; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsdOriginal; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -33952,7 +34078,7 @@ self: { sha256 = "1rqqlngmcdd7i1gww95lyim971w8xv0hjg20h0j8av4y29pjxfyn"; libraryHaskellDepends = [ base containers syb ]; description = "Interfacing between hint and astview"; - license = stdenv.lib.licenses.bsdOriginal; + license = lib.licenses.bsdOriginal; }) {}; "async" = callPackage @@ -33972,7 +34098,7 @@ self: { base HUnit stm test-framework test-framework-hunit ]; description = "Run IO operations asynchronously and wait for their results"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "async-ajax" = callPackage @@ -33983,7 +34109,7 @@ self: { sha256 = "012j2kbf4829g4xzbzc1vqb9ybhr05v4zlipvhcn4pqmfb3vgshi"; libraryHaskellDepends = [ async base ghcjs-ajax text ]; description = "Crossbrowser async AJAX Bindings for GHCJS"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "async-combinators" = callPackage @@ -34004,8 +34130,8 @@ self: { ]; testToolDepends = [ tasty-discover ]; description = "Async combinators"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -34022,8 +34148,8 @@ self: { base concurrency dejafu HUnit hunit-dejafu ]; description = "Run MonadConc operations asynchronously and wait for their results"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -34035,7 +34161,7 @@ self: { sha256 = "0hyc27mphjpc7m9khs47ch0q6j6hy2hmibk82vzrfmc3rfjxa1hd"; libraryHaskellDepends = [ async base deepseq split ]; description = "Useful concurrent combinators"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "async-extras" = callPackage @@ -34051,7 +34177,7 @@ self: { transformers-base ]; description = "Extra Utilities for the Async Library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "async-io-either" = callPackage @@ -34062,7 +34188,7 @@ self: { sha256 = "0sksphy0i46w83kw3fhksiyhz9nn337d4xc3ppihdksi79a6ncph"; libraryHaskellDepends = [ async base retry transformers ]; description = "Could be useful"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "async-manager" = callPackage @@ -34076,8 +34202,8 @@ self: { libraryHaskellDepends = [ async base stm unordered-containers ]; executableHaskellDepends = [ async base stm unordered-containers ]; description = "A thread manager for async"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -34098,7 +34224,7 @@ self: { transformers-base ]; description = "A modified version of async that supports worker groups and many-to-many task dependencies"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "async-refresh" = callPackage @@ -34120,7 +34246,7 @@ self: { test-framework-hunit text ]; description = "Package implementing core logic for refreshing of expiring data"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "async-refresh-tokens" = callPackage @@ -34142,7 +34268,7 @@ self: { test-framework-hunit unliftio ]; description = "Package implementing core logic for refreshing of expiring access tokens"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "async-timer" = callPackage @@ -34160,8 +34286,8 @@ self: { async base containers criterion tasty tasty-hunit ]; description = "Provides API for timer based execution of IO actions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -34173,8 +34299,8 @@ self: { sha256 = "0vfx2ikw61sic35n4ayy7rng6izpafksz7lh4xgkcmbg627vkm8s"; libraryHaskellDepends = [ base ]; description = "Distinguish between synchronous and asynchronous exceptions"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -34188,7 +34314,7 @@ self: { editedCabalFile = "0vh6k6397f3y03y28shx0gf0lvdlb6pdcdhd1j8r1svhjbyphfdp"; libraryHaskellDepends = [ array base containers ghc-prim ]; description = "serialisation for Haskell values with sharing support"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }) {}; "aterm-utils" = callPackage @@ -34202,8 +34328,8 @@ self: { libraryHaskellDepends = [ aterm base mtl transformers wl-pprint ]; executableHaskellDepends = [ aterm base transformers wl-pprint ]; description = "Utility functions for working with aterms as generated by Minitermite"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -34217,7 +34343,7 @@ self: { editedCabalFile = "0h3y24p4296qxwcmynsrqwnxpk024p9c835yh8s366skcjwmhk4x"; libraryHaskellDepends = [ base ]; description = "Arrow Transformer Library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "atlassian-connect-core" = callPackage @@ -34242,8 +34368,8 @@ self: { ]; libraryPkgconfigDepends = [ zlib ]; description = "Atlassian Connect snaplet for the Snap Framework and helper code"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) zlib;}; @@ -34265,8 +34391,8 @@ self: { scientific text time-units unordered-containers vector ]; description = "Code that helps you create a valid Atlassian Connect Descriptor"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -34283,7 +34409,7 @@ self: { base HUnit test-framework test-framework-hunit ]; description = "1976 US Standard Atmosphere Model"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "atmos-dimensional" = callPackage @@ -34294,7 +34420,7 @@ self: { sha256 = "19rlcp1zn3k838c5ixsn6i09nclfwvd9prbirxy5fmch0yjlp39d"; libraryHaskellDepends = [ atmos base dimensional ]; description = "dimensional wrapper on atmos package"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "atmos-dimensional-tf" = callPackage @@ -34305,8 +34431,8 @@ self: { sha256 = "05g2v7ppbcvaw0dk9f0z0gb7k33c4lk2cm2ziyqahxmwsz928khm"; libraryHaskellDepends = [ atmos base dimensional-tf ]; description = "dimensional-tf wrapper on atmos package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -34331,8 +34457,8 @@ self: { QuickCheck resourcet text time transformers ]; description = "An interface of ATND API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -34344,7 +34470,7 @@ self: { sha256 = "111lz39q12rvh2iigxakcnf2firxgbgm462id805n3z7rmg8f807"; libraryHaskellDepends = [ base bimap containers mtl process syb ]; description = "An EDSL for embedded hard realtime applications"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "atom-basic" = callPackage @@ -34359,7 +34485,7 @@ self: { base base64-bytestring bytestring network network-uri text time ]; description = "Basic Atom feed construction"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "atom-conduit" = callPackage @@ -34386,7 +34512,7 @@ self: { uri-bytestring xml-conduit xml-types ]; description = "Streaming parser/renderer for the Atom 1.0 standard (RFC 4287)."; - license = stdenv.lib.licenses.cc0; + license = lib.licenses.cc0; }) {}; "atom-msp430" = callPackage @@ -34397,8 +34523,8 @@ self: { sha256 = "02h1g35f3bd3cjjhr28g63vk1mnghshq9586wa922rfl79jp6jcs"; libraryHaskellDepends = [ atom base mtl ]; description = "Convenience functions for using Atom with the MSP430 microcontroller family"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -34414,7 +34540,7 @@ self: { base directory filelock filepath io-string-like ]; description = "Functions to atomically write to files"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "atomic-modify" = callPackage @@ -34425,8 +34551,8 @@ self: { sha256 = "0j4zhr02bmkpar80vzxxj91qyz97wi7kia79q20a1y3sqbmx2sk5"; libraryHaskellDepends = [ base stm ]; description = "A typeclass for mutable references that have an atomic modify operation"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -34438,7 +34564,7 @@ self: { sha256 = "0gidqyk913vhcz3q4vnpadx3vkkrwb66rqhsxvdba8g2p5z63a12"; libraryHaskellDepends = [ base ghc-prim primitive ]; description = "A safe approach to CAS and other atomic ops in Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "atomic-primops-foreign" = callPackage @@ -34456,8 +34582,8 @@ self: { base bits-atomic HUnit test-framework test-framework-hunit time ]; description = "An atomic counter implemented using the FFI"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -34470,8 +34596,8 @@ self: { libraryHaskellDepends = [ atomic-primops base primitive vector ]; testHaskellDepends = [ base vector ]; description = "Atomic operations on Data.Vector types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -34490,7 +34616,7 @@ self: { base bytestring filepath hspec temporary text unix-compat ]; description = "Atomically write to a file"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "atomo" = callPackage @@ -34515,8 +34641,28 @@ self: { time vector ]; description = "A highly dynamic, extremely simple, very fun programming language"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + + "atp" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, containers, generic-random + , mtl, process, QuickCheck, text, tptp + }: + mkDerivation { + pname = "atp"; + version = "0.1.0.0"; + sha256 = "0n71mch62mkqn4ibq6n0k26fxk0rl63j7rzj4wpc038awjgxcfr8"; + libraryHaskellDepends = [ + ansi-wl-pprint base containers mtl process text tptp + ]; + testHaskellDepends = [ + base containers generic-random mtl QuickCheck text + ]; + description = "Interface to automated theorem provers"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -34534,8 +34680,8 @@ self: { ]; testHaskellDepends = [ base containers HUnit time ]; description = "Translation from Ocaml to Haskell of John Harrison's ATP code"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -34547,7 +34693,7 @@ self: { sha256 = "0rlv4ikz8k1yjwnqq6yrk1cf4dv9y8jw5i1qaa9m7k6sya2dy6ci"; libraryHaskellDepends = [ base mtl ]; description = "A small collection of monad (transformer) instances"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "ats-format" = callPackage @@ -34567,7 +34713,7 @@ self: { process text toml-parser ]; description = "A source-code formatter for ATS"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ats-pkg" = callPackage @@ -34601,8 +34747,8 @@ self: { ]; doHaddock = false; description = "A build tool for ATS"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -34621,8 +34767,8 @@ self: { zlib ]; description = "ATS scripts for Cabal builds"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -34640,8 +34786,8 @@ self: { testHaskellDepends = [ base hspec ]; testSystemDepends = [ storable ]; description = "Marshal ATS types into Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {storable = null;}; @@ -34653,8 +34799,8 @@ self: { sha256 = "1gvq04ds62kk88r2210mxd1fggp6vf5p8j5hci9vqkkss1hy9rxh"; libraryHaskellDepends = [ base failure ]; description = "Concrete data type for handling extensible exceptions as failures. (deprecated)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -34674,8 +34820,8 @@ self: { ]; testHaskellDepends = [ base doctest ]; description = "A script I use to run \"attic\" for my backups"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -34699,8 +34845,8 @@ self: { test-framework-hunit text ]; description = "Efficient parsing and serialisation of S-Expressions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -34723,8 +34869,8 @@ self: { ]; testHaskellDepends = [ base doctest Glob QuickCheck ]; description = "Minimal mail delivery agent (MDA) for local mail with maildir support"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -34755,7 +34901,7 @@ self: { transformers unordered-containers vector ]; description = "Fast combinator parsing for bytestrings and text"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "attoparsec-arff" = callPackage @@ -34766,7 +34912,7 @@ self: { sha256 = "1jf9065pqmdfshkd0cqiamhivs9an4slqx82n7yj0kkhdxw5lyq4"; libraryHaskellDepends = [ attoparsec base bytestring ]; description = "An ARFF file parser using Attoparsec"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }) {}; "attoparsec-base64" = callPackage @@ -34777,7 +34923,7 @@ self: { sha256 = "1rvkc7kaya42a8djkyj642r5dq952gwkhinif9r22ijaic656cq8"; libraryHaskellDepends = [ attoparsec base bytestring text word8 ]; description = "Fetch only base64 characters, erroring in the attoparsec monad on failure"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "attoparsec-binary" = callPackage @@ -34788,7 +34934,7 @@ self: { sha256 = "02vswxsgayw50xli7mbacsjmk1diifzkfgnyfn9ck5mk41dl9rh5"; libraryHaskellDepends = [ attoparsec base bytestring ]; description = "Binary processing extensions to Attoparsec"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "attoparsec-conduit" = callPackage @@ -34800,7 +34946,7 @@ self: { libraryHaskellDepends = [ base conduit ]; doHaddock = false; description = "Consume attoparsec parsers via conduit. (deprecated)"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "attoparsec-csv" = callPackage @@ -34812,7 +34958,7 @@ self: { libraryHaskellDepends = [ attoparsec base text ]; description = "A parser for CSV files that uses Attoparsec"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "attoparsec-data" = callPackage @@ -34828,7 +34974,7 @@ self: { uuid ]; description = "Parsers for the standard Haskell data types"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "attoparsec-enumerator" = callPackage @@ -34841,8 +34987,8 @@ self: { attoparsec base bytestring enumerator text ]; description = "Pass input from an enumerator to an Attoparsec parser"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -34854,7 +35000,7 @@ self: { sha256 = "0z25pc3rq98ysk92jclr90n35982a566sxri51yh1s9c24vd8k4d"; libraryHaskellDepends = [ attoparsec base ]; description = "Port of parsec's expression parser to attoparsec"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "attoparsec-ip" = callPackage @@ -34870,8 +35016,8 @@ self: { attoparsec base ip QuickCheck tasty tasty-quickcheck text vector ]; description = "Parse IP data types with attoparsec"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -34887,7 +35033,7 @@ self: { attoparsec base base-compat-batteries text time time-compat ]; description = "Parsing of ISO 8601 dates, originally from aeson"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "attoparsec-iteratee" = callPackage @@ -34902,8 +35048,8 @@ self: { attoparsec base bytestring iteratee transformers ]; description = "An adapter to convert attoparsec Parsers into blazing-fast Iteratees"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -34921,7 +35067,7 @@ self: { ]; testToolDepends = [ markdown-unlit ]; description = "An Attoparsec compatibility layer for Parsec"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "attoparsec-path" = callPackage @@ -34937,7 +35083,7 @@ self: { attoparsec base QuickCheck quickcheck-instances text ]; description = "Convenience bindings between path and attoparsec"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "attoparsec-text" = callPackage @@ -34948,8 +35094,8 @@ self: { sha256 = "1qq42lp1sah80a6lnnafi6pwl61b4w4q4jk1pbb7pg5p06mmk315"; libraryHaskellDepends = [ array attoparsec base containers text ]; description = "(deprecated)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -34961,8 +35107,8 @@ self: { sha256 = "0cffcwji141js09r7avb15b08xl4s8cgk5vxyrqaq7zw40hhb1gz"; libraryHaskellDepends = [ attoparsec-text base enumerator text ]; description = "(deprecated)"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -34978,7 +35124,7 @@ self: { attoparsec base bytestring scientific text time ]; description = "Attoparsec parsers of time"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "attoparsec-trans" = callPackage @@ -34989,8 +35135,8 @@ self: { sha256 = "0lsbl7hhirr13jmn6fc4g5443j73p4rxjgxvv967n5dsp7xrjaa7"; libraryHaskellDepends = [ attoparsec base transformers ]; description = "Interleaved effects for attoparsec parsers"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -35012,8 +35158,8 @@ self: { quickcheck-instances strict tasty tasty-quickcheck text vector ]; description = "URI parser / printer using attoparsec"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -35031,7 +35177,7 @@ self: { QuickCheck ]; description = "Variable-length integer decoding for Attoparsec"; - license = stdenv.lib.licenses.lgpl3; + license = lib.licenses.lgpl3; }) {}; "attosplit" = callPackage @@ -35042,8 +35188,8 @@ self: { sha256 = "01sh8k9n9040xqx1lbn74rcf59j54n5861d9db1y5cdy7qssxyg4"; libraryHaskellDepends = [ attoparsec base bytestring ]; description = "Split a lazy bytestring at boundaries defined by an attoparsec parser"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -35060,8 +35206,8 @@ self: { array base Cabal directory epic haskell98 ]; description = "Embedded Turtle language compiler in Haskell, with Epic output"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -35083,7 +35229,7 @@ self: { transformers utility-ht xml-basic ]; description = "Interchange with the Audacity sound signal editor"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "audiovisual" = callPackage @@ -35103,8 +35249,8 @@ self: { random template-haskell transformers vector void WAVE ]; description = "A battery-included audiovisual framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -35125,7 +35271,7 @@ self: { executablePkgconfigDepends = [ augeas ]; description = "A Haskell FFI wrapper for the Augeas API"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) augeas;}; @@ -35144,8 +35290,8 @@ self: { process ]; description = "Renaming media collections in a breeze"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -35166,8 +35312,8 @@ self: { base http-client http-client-tls tasty tasty-hunit ]; description = "Access metadata from the Arch Linux User Repository"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -35184,8 +35330,8 @@ self: { mtl text ]; description = "ArchLinux AUR json v5 API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -35222,8 +35368,8 @@ self: { versions ]; description = "A secure package manager for Arch Linux and the AUR"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -35243,7 +35389,7 @@ self: { resourcet text transformers unordered-containers xml-conduit ]; description = "Authentication methods for Haskell web applications"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "authenticate-kerberos" = callPackage @@ -35254,7 +35400,7 @@ self: { sha256 = "06k8xi9n44xq63dpmcv4l0vg35y19dk5x1ibyay05w58k4kv4fdq"; libraryHaskellDepends = [ base process text ]; description = "Authentication methods for Haskell web applications"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "authenticate-ldap" = callPackage @@ -35265,8 +35411,8 @@ self: { sha256 = "1wsx43l7jl40jpzhiv2fjc1mnpsaaryrjpqaiyqsn3ahacsy4ly5"; libraryHaskellDepends = [ base LDAP text transformers ]; description = "LDAP authentication for Haskell web applications"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -35287,7 +35433,7 @@ self: { transformers transformers-compat ]; description = "Library to authenticate with OAuth for Haskell web applications"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "authinfo-hs" = callPackage @@ -35298,8 +35444,8 @@ self: { sha256 = "1jv0y4y2ig8dx95xw3zbxc1h9mv3wi3r8xqx00llmf2qs6wgdlp5"; libraryHaskellDepends = [ attoparsec base network text ]; description = "Password querying for .authinfo"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -35318,8 +35464,8 @@ self: { transformers trifecta ]; description = "A library for writing papers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -35337,7 +35483,7 @@ self: { profunctors random semigroups transformers ]; description = "Denotative, locally stateful programming DSL & platform"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "auto-update" = callPackage @@ -35349,7 +35495,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base exceptions hspec HUnit retry ]; description = "Efficiently run periodic, on-demand actions"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "autoapply" = callPackage @@ -35367,7 +35513,7 @@ self: { ]; testHaskellDepends = [ base doctest ]; description = "Template Haskell to automatically pass values to functions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "autoexporter" = callPackage @@ -35381,7 +35527,7 @@ self: { libraryHaskellDepends = [ base Cabal directory filepath ]; executableHaskellDepends = [ base ]; description = "Automatically re-export modules"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "autom" = callPackage @@ -35396,8 +35542,8 @@ self: { base bytestring colour ghc-prim gloss JuicyPixels random vector ]; description = "Generates and displays patterns from next nearest neighbors cellular automata"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -35422,8 +35568,8 @@ self: { tasty tasty-hunit tasty-leancheck tasty-quickcheck ]; description = "automata"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -35442,7 +35588,7 @@ self: { base bytestring cryptonite quickcheck-simple ]; description = "Automotive CSE emulation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "automotive-cse" = callPackage @@ -35461,7 +35607,7 @@ self: { quickcheck-simple ]; description = "Automotive CSE emulation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "autonix-deps" = callPackage @@ -35482,8 +35628,8 @@ self: { regex-tdfa resourcet semigroups text transformers xml ]; description = "Library for Nix expression dependency generation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -35507,8 +35653,8 @@ self: { autonix-deps base containers lens mtl ]; description = "Generate dependencies for KDE 5 Nix expressions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -35520,8 +35666,8 @@ self: { sha256 = "1z1w6bvsfhnia2dxihcay6a9va2ik1bg805zkfb0vn4vcxn76dcc"; libraryHaskellDepends = [ base Cabal dir-traverse filepath ]; description = "Custom Setup to automate package modules discovery"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -35536,7 +35682,7 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base directory mtl process unix ]; description = "EDSL for Procmail scripts"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "avahi" = callPackage @@ -35550,7 +35696,7 @@ self: { libraryHaskellDepends = [ base bytestring dbus text ]; executableHaskellDepends = [ base bytestring dbus text ]; description = "Minimal DBus bindings for Avahi daemon (http://avahi.org)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "avatar-generator" = callPackage @@ -35563,8 +35709,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base JuicyPixels random ]; description = "A simple random avatar icon generator"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -35578,7 +35724,7 @@ self: { editedCabalFile = "0x6inm86nkc8cnsgnblfxhmhld0mpbvvx9pi8cdiysp7xkac3j4h"; libraryHaskellDepends = [ base semigroups vector-space ]; description = "An average (arithmetic mean) monoid"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "avers" = callPackage @@ -35592,8 +35738,8 @@ self: { pname = "avers"; version = "0.0.17.1"; sha256 = "1x96fvx0z7z75c39qcggw70qvqnw7kzjf0qqxb3jwg3b0fmdhi8v"; - revision = "38"; - editedCabalFile = "0jbvk8azs2x63cfxbppa67qg27zirgash448g7vmf07jqb8405cb"; + revision = "39"; + editedCabalFile = "1y77mk83yap8yx5wlybpr06wwy3qvmq0svqc4c6dfyvjd9wjvsdv"; libraryHaskellDepends = [ aeson attoparsec base bytestring clock containers cryptonite filepath inflections memory MonadRandom mtl network network-uri @@ -35611,8 +35757,8 @@ self: { rethinkdb-client-driver text ]; description = "Server-side implementation of the Avers storage model"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -35629,8 +35775,8 @@ self: { vector ]; description = "Types describing the core and extended Avers APIs"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -35649,8 +35795,8 @@ self: { swagger2 text unordered-containers ]; description = "Swagger documentation for the Avers API"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -35671,8 +35817,8 @@ self: { transformers wai wai-websockets websockets ]; description = "Server implementation of the Avers API"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -35698,7 +35844,7 @@ self: { ]; description = "Diagrams for the Cessna 172 aircraft in aviation"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {aviation-cessna172-weight-balance = null; aviation-units = null; aviation-weight-balance = null;}; @@ -35716,8 +35862,8 @@ self: { base QuickCheck test-framework test-framework-quickcheck2 ]; description = "A compile-time balanced AVL tree"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -35729,8 +35875,8 @@ self: { sha256 = "1k2nw0ibxbr8dhw9css6vryqd8p5klfvk5vxz6h9w61z8y32f430"; libraryHaskellDepends = [ base dependent-sum mtl process shake ]; description = "AVR Crosspack actions for shake build systems"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -35768,7 +35914,7 @@ self: { random raw-strings-qq text transformers unordered-containers vector ]; description = "Avro serialization support for Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "avro-piper" = callPackage @@ -35802,8 +35948,8 @@ self: { unordered-containers ]; description = "Tool for decoding avro"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -35823,7 +35969,7 @@ self: { ]; testHaskellDepends = [ attoparsec base lens pretty-show text ]; description = "Parse aviation weather reports"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "awesome-prelude" = callPackage @@ -35834,8 +35980,8 @@ self: { sha256 = "0mvfirb41jnjvq4mpky0xpdrh238hjwslfqg82ksnam001sxnpng"; libraryHaskellDepends = [ base ]; description = "A prelude which I can be happy with. Based on base-prelude."; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -35851,8 +35997,8 @@ self: { aeson attoparsec awesomium-raw base containers text vector ]; description = "High-level Awesomium bindings"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -35864,8 +36010,8 @@ self: { sha256 = "175hgqix2j26579g0rrryl86w7qvla95nvf4lwfxsxxwqgcq3zpd"; libraryHaskellDepends = [ awesomium awesomium-raw base GLUT ]; description = "Utilities for using Awesomium with GLUT"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -35879,8 +36025,8 @@ self: { librarySystemDepends = [ awesomium ]; libraryToolDepends = [ c2hs ]; description = "Low-level Awesomium bindings"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {awesomium = null;}; @@ -35918,7 +36064,7 @@ self: { tasty-quickcheck text time transformers transformers-base ]; description = "Amazon Web Services (AWS) for Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "aws-cloudfront-signed-cookies" = callPackage @@ -35941,7 +36087,7 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base hedgehog neat-interpolation ]; description = "Generate signed cookies for AWS CloudFront"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "aws-cloudfront-signer" = callPackage @@ -35957,8 +36103,8 @@ self: { crypto-pubkey-types RSA time ]; description = "For signing AWS CloudFront HTTP URL requests"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -35978,8 +36124,8 @@ self: { configuration-tools mtl text transformers ]; description = "Configuration types, parsers & renderers for AWS services"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -35997,8 +36143,8 @@ self: { http-conduit http-types json-togo resourcet text transformers ]; description = "Conduit-based interface for AWS DynamoDB"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -36021,8 +36167,8 @@ self: { resourcet scientific text time ]; description = "Haskell bindings for Amazon DynamoDB Streams"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -36046,8 +36192,8 @@ self: { unordered-containers ]; description = "Helper function and types for working with amazonka"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -36077,8 +36223,8 @@ self: { unordered-containers vector yaml ]; description = "AWS EC2/VPC, ELB and CloudWatch client library for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -36101,8 +36247,8 @@ self: { aeson base io-streams system-filepath turtle ]; description = "Capture and manage AWS EC2 known_host pubkeys"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -36125,8 +36271,8 @@ self: { aeson base Cabal containers QuickCheck regex-compat safe text ]; description = "Haskell suite for the Elastic Transcoder service"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -36152,8 +36298,8 @@ self: { tagged tasty tasty-quickcheck text time transformers ]; description = "Bindings for Amazon Web Services (AWS) General Reference"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -36179,8 +36325,8 @@ self: { tasty tasty-quickcheck text transformers ]; description = "Bindings for Amazon Kinesis"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -36215,8 +36361,8 @@ self: { monad-control mtl optparse-applicative text transformers ]; description = "A producer & consumer client library for AWS Kinesis"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -36245,8 +36391,8 @@ self: { time transformers ]; description = "Reshard AWS Kinesis streams in response to Cloud Watch metrics"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -36266,8 +36412,8 @@ self: { lens-aeson mtl old-locale text time wreq zip-archive ]; description = "Haskell bindings for AWS Lambda"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -36287,7 +36433,7 @@ self: { ]; testHaskellDepends = [ base hspec ]; description = "Haskell runtime for AWS Lambda"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "aws-lambda-haskell-runtime-wai" = callPackage @@ -36310,8 +36456,8 @@ self: { unordered-containers vault wai ]; description = "Run wai applications on AWS Lambda"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -36334,11 +36480,24 @@ self: { ]; executableHaskellDepends = [ aeson base lens lens-aeson text ]; description = "Haskell on AWS Lambda Runtime API"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; + "aws-larpi" = callPackage + ({ mkDerivation, aeson, base, bytestring, modern-uri, req, text }: + mkDerivation { + pname = "aws-larpi"; + version = "0.1.0.0"; + sha256 = "04z5wcvkcvq961zc9pg79k6340vgm6rdws6lfjysl5jrwr5sfxg9"; + libraryHaskellDepends = [ + aeson base bytestring modern-uri req text + ]; + description = "Package Haskell functions for easy use on AWS Lambda"; + license = lib.licenses.mit; + }) {}; + "aws-mfa-credentials" = callPackage ({ mkDerivation, amazonka, amazonka-core, amazonka-sts, base , exceptions, filelock, filepath, freer-effects, ini, lens @@ -36357,8 +36516,8 @@ self: { process text time unordered-containers ]; description = "Keep your AWS credentials file up to date with MFA-carrying credentials"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -36384,8 +36543,8 @@ self: { resourcet statistics text time transformers vector ]; description = "Performance Tests for the Haskell bindings for Amazon Web Services (AWS)"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -36403,8 +36562,8 @@ self: { resourcet text time xml-conduit xml-hamlet ]; description = "Amazon Route53 DNS service plugin for the aws package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -36433,8 +36592,8 @@ self: { transformers ]; description = "AWS SDK for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -36456,8 +36615,8 @@ self: { template-haskell text time time-locale-compat ]; description = "The text converter for aws-sdk"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -36478,8 +36637,8 @@ self: { base bytestring conduit hspec mtl resourcet text xml-conduit ]; description = "The xml parser for aws-sdk package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -36499,8 +36658,8 @@ self: { testHaskellDepends = [ base tasty tasty-hspec ]; benchmarkHaskellDepends = [ base criterion ]; description = "Wrapper over Amazonka's SES"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -36524,8 +36683,8 @@ self: { filepath http-types old-locale safe text time ]; description = "Amazon Web Services (AWS) Signature v4 HTTP request signer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -36543,8 +36702,8 @@ self: { conduit lens mtl resourcet text timespan unordered-containers ]; description = "Dead simple bindings to commonly used AWS Services"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -36568,8 +36727,8 @@ self: { tasty tasty-quickcheck text transformers ]; description = "Bindings for AWS SNS Version 2013-03-31"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -36621,8 +36780,8 @@ self: { ]; testToolDepends = [ hpack tasty-discover ]; description = "The Axel programming language"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -36639,8 +36798,8 @@ self: { transient transient-universe ]; description = "Web EDSL for running in browsers and server nodes using transient"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -36660,8 +36819,8 @@ self: { semigroups template-haskell th-printf transformers ]; description = "Specify axioms for type classes and quickCheck all available instances"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {control-invariants = null;}; @@ -36680,8 +36839,8 @@ self: { ]; testHaskellDepends = [ base hspec shelly text urbit-hob ]; description = "Interact with Azimuth from Haskell"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -36700,8 +36859,8 @@ self: { base Diff directory filepath hspec options process unix ]; description = "A simple DevOps tool which will never \"reach\" enterprice level"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -36719,8 +36878,8 @@ self: { http-conduit http-types network time ]; description = "Windows Azure ACS"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -36739,8 +36898,8 @@ self: { wreq ]; description = "send email with microsoft azure"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -36768,8 +36927,8 @@ self: { libraryToolDepends = [ proto-lens-protoc ]; testHaskellDepends = [ base ]; description = "Azure Functions Worker"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -36788,8 +36947,8 @@ self: { tls-extra transformers ]; description = "Haskell bindings for the Microsoft Azure Service Management API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -36807,8 +36966,8 @@ self: { conduit connection http-client http-conduit http-types network text ]; description = "Haskell wrapper over Microsoft Azure ServiceBus REST API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -36838,8 +36997,8 @@ self: { unix-compat utf8-string ]; description = "A simple library for accessing Azure blob storage"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -36865,7 +37024,7 @@ self: { ]; benchmarkHaskellDepends = [ base criterion pipes ]; description = "Immutable disk-based B* trees"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "b9" = callPackage @@ -36906,8 +37065,8 @@ self: { text unordered-containers vector yaml ]; description = "A tool and library for building virtual machine images"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -36921,7 +37080,7 @@ self: { librarySystemDepends = [ babl ]; libraryPkgconfigDepends = [ babl ]; description = "Haskell bindings to BABL library"; - license = stdenv.lib.licenses.lgpl3; + license = lib.licenses.lgpl3; }) {inherit (pkgs) babl;}; "babylon" = callPackage @@ -36938,7 +37097,7 @@ self: { ]; description = "An implementation of a simple 2-player board game"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -36971,8 +37130,8 @@ self: { unliftio-core ]; description = "A client library to access Backblaze B2 cloud storage in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -36991,7 +37150,7 @@ self: { ]; description = "Rotates backdrops for X11 displays using Imagemagic"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -37013,7 +37172,7 @@ self: { mwc-random time vector ]; description = "Heterogeneous automatic differentation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "backstop" = callPackage @@ -37036,8 +37195,8 @@ self: { base filepath HUnit process QuickCheck unix ]; description = "Backstop a target directory by source directories"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -37053,7 +37212,7 @@ self: { testHaskellDepends = [ base primes tasty tasty-hunit ]; testToolDepends = [ tasty-discover ]; description = "A backtracking monad"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "backtracking-exceptions" = callPackage @@ -37069,8 +37228,8 @@ self: { transformers ]; description = "A monad transformer for backtracking exceptions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -37082,8 +37241,8 @@ self: { sha256 = "1akxm0v23gnph5jxwi20wq4lk07vd2kpiqns550k499yw95vqyam"; libraryHaskellDepends = [ base transformers ]; description = "A state monad that runs the state in reverse through the computation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -37098,7 +37257,7 @@ self: { executableHaskellDepends = [ base gd X11 ]; description = "braindead utility to compose Xinerama backgrounds"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "bag" = callPackage @@ -37109,8 +37268,8 @@ self: { sha256 = "18n7ggrfm39mn4rva661hkxj75gjx2p3jcm0hlzpcshxyk93iblr"; libraryHaskellDepends = [ base ]; description = "A simple stable bag"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -37144,8 +37303,8 @@ self: { wai wai-extra warp ]; description = "Continuous integration system"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -37169,8 +37328,8 @@ self: { http-client-tls text time ]; description = "Shipwire API client"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -37192,7 +37351,7 @@ self: { ]; description = "A blog engine on Hack"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -37214,7 +37373,7 @@ self: { ]; description = "bamboo-launcher"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -37233,7 +37392,7 @@ self: { ]; description = "A highlight middleware"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -37252,8 +37411,8 @@ self: { haskell98 hxt mps utf8-string xhtml ]; description = "A photo album middleware"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -37272,8 +37431,8 @@ self: { hack-contrib hcheat mps network rss utf8-string xhtml ]; description = "bamboo blueprint theme"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -37297,7 +37456,7 @@ self: { ]; description = "bamboo mini html5 theme"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -37315,8 +37474,8 @@ self: { base com directory filepath old-time pretty process regex-compat ]; description = "A Windows Installer (MSI) generator framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -37331,7 +37490,7 @@ self: { executableHaskellDepends = [ base cmdargs samtools ]; description = "A program to extract various information from BAM alignmnet files"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -37346,8 +37505,8 @@ self: { libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base ]; description = "For when a type should never be an instance of a class"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -37360,8 +37519,8 @@ self: { libraryHaskellDepends = [ base time ]; testHaskellDepends = [ base hspec HUnit QuickCheck time ]; description = "A library for determining US bank holidays"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -37374,7 +37533,7 @@ self: { libraryHaskellDepends = [ base containers time ]; testHaskellDepends = [ base containers hspec QuickCheck time ]; description = "Calculation of bank holidays in England and Wales"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "banwords" = callPackage @@ -37393,8 +37552,8 @@ self: { vector ]; description = "Generalized word blacklister"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -37411,19 +37570,19 @@ self: { base distributive QuickCheck tasty tasty-hunit tasty-quickcheck ]; description = "Classes for working with types that can change clothes"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "barbies-th" = callPackage ({ mkDerivation, barbies, base, split, template-haskell }: mkDerivation { pname = "barbies-th"; - version = "0.1.7"; - sha256 = "1wzy8j4i9mp1vlfkrixc49nv1c6prqspvhkjdwp16bvdz4fgbvpq"; + version = "0.1.8"; + sha256 = "19cznyjds09l8k844bhc1k2m50w455j7n13826z0np01a23qhyad"; libraryHaskellDepends = [ barbies base split template-haskell ]; testHaskellDepends = [ barbies base ]; description = "Create strippable HKD via TH"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "barbly" = callPackage @@ -37443,8 +37602,8 @@ self: { text ]; description = "Create status bar menus for macOS from executables"; - license = stdenv.lib.licenses.bsd3; - platforms = [ "x86_64-darwin" ]; + license = lib.licenses.bsd3; + platforms = [ "armv7l-linux" "x86_64-darwin" ]; }) {}; "barchart" = callPackage @@ -37458,8 +37617,8 @@ self: { libraryHaskellDepends = [ base csv diagrams filepath ]; executableHaskellDepends = [ base cmdargs csv diagrams filepath ]; description = "Creating Bar Charts in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -37471,8 +37630,8 @@ self: { sha256 = "14blxjhapn9g7cp7374f5s2nln7wgyb7a6z50gp04lnqf1aw6kmg"; libraryHaskellDepends = [ base bytestring HPDF ]; description = "Generate Code 128 barcodes as PDFs"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -37484,8 +37643,8 @@ self: { sha256 = "0hja4lrgv1faqaq41wzf1r88aw4pin8jh60k9n65yd0sxi1103a7"; libraryHaskellDepends = [ base containers QuickCheck text time ]; description = "QuickCheck implementations for common types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -37507,7 +37666,7 @@ self: { ]; description = "A web based environment for learning and tinkering with Haskell"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "barrie" = callPackage @@ -37519,7 +37678,7 @@ self: { libraryHaskellDepends = [ base containers filepath glib gtk ]; description = "Declarative Gtk GUI library"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -37544,8 +37703,8 @@ self: { base bytestring lens-family-core tasty tasty-golden ]; description = "Shields.io style badge generator"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -37557,8 +37716,8 @@ self: { sha256 = "014nc21wnrklsvy5z7w4v9p9psn6bl210l7v97gj42cv6a8jk5nm"; libraryHaskellDepends = [ base comonad mtl transformers ]; description = "Implementation of barrier monad, can use custom front/back type"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -37572,8 +37731,8 @@ self: { ghc-prim invalid-cabal-flag-settings rts ]; description = "Basic libraries"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {invalid-cabal-flag-settings = null;}; @@ -37585,7 +37744,7 @@ self: { sha256 = "1nyvkaij4m01jndw72xl8931czz1xp6jpnynpajabys2ahabb9jk"; libraryHaskellDepends = [ base unix ]; description = "A compatibility layer for base"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "base-compat-batteries" = callPackage @@ -37600,7 +37759,7 @@ self: { testHaskellDepends = [ base hspec QuickCheck ]; testToolDepends = [ hspec-discover ]; description = "base-compat with extra batteries"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "base-compat-migrate" = callPackage @@ -37614,8 +37773,8 @@ self: { libraryHaskellDepends = [ base base-compat ]; doHaddock = false; description = "Helps migrating projects to base-compat(-batteries)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -37631,7 +37790,7 @@ self: { base base16-bytestring base64-bytestring bytestring text ]; description = "Binary-to-text encodings (e.g. base64)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "base-feature-macros" = callPackage @@ -37643,8 +37802,8 @@ self: { libraryHaskellDepends = [ base ]; doHaddock = false; description = "Semantic CPP feature macros for base"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -37656,8 +37815,8 @@ self: { sha256 = "19k6kl66p71pza23b1n5njmj97k1pdlcm6brl1danfaxlflsmcms"; libraryHaskellDepends = [ base ]; description = "This library provides some instances for extra GHC.Generic typeclass such as Int8, Word16 and some unboxed types as well."; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -37669,8 +37828,8 @@ self: { sha256 = "0d0i8ndh2j42qf8ns9wprkjiffy3hyybgvs9nbf67yd50di6p263"; libraryHaskellDepends = [ base ]; description = "The IO functions included in base delimited into small, composable classes"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -37683,7 +37842,7 @@ self: { libraryHaskellDepends = [ base ]; doHaddock = false; description = "\"base\" package sans \"Prelude\" module"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "base-orphans" = callPackage @@ -37697,7 +37856,7 @@ self: { testHaskellDepends = [ base hspec QuickCheck ]; testToolDepends = [ hspec-discover ]; description = "Backwards-compatible orphan instances for base"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "base-prelude" = callPackage @@ -37708,7 +37867,7 @@ self: { sha256 = "0nn5v2y9kl7i3n21250m7cvn55lvkmzj22wx6q4kaag5ycwwczrs"; libraryHaskellDepends = [ base ]; description = "The most complete prelude formed solely from the \"base\" package"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "base-unicode-symbols" = callPackage @@ -37719,7 +37878,7 @@ self: { sha256 = "0qkhp4ybmx4nbqqkrmw3hkm47bv61i2wpi20qb09wvk10g2dcr23"; libraryHaskellDepends = [ base ]; description = "Unicode alternatives for common functions and operators"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "base16" = callPackage @@ -37745,7 +37904,7 @@ self: { random-bytestring text ]; description = "Fast RFC 4648-compliant Base16 encoding"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "base16-bytestring" = callPackage @@ -37759,7 +37918,7 @@ self: { libraryHaskellDepends = [ base bytestring ghc-prim ]; testHaskellDepends = [ base bytestring ]; description = "Fast base16 (hex) encoding and decoding for ByteStrings"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "base16-bytestring_1_0_1_0" = callPackage @@ -37778,8 +37937,8 @@ self: { ]; benchmarkHaskellDepends = [ base bytestring criterion deepseq ]; description = "RFC 4648-compliant Base16 encodings for ByteStrings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "base16-lens" = callPackage @@ -37796,7 +37955,7 @@ self: { ]; testHaskellDepends = [ base doctest lens ]; description = "Optics for the Base16 library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "base32" = callPackage @@ -37821,7 +37980,7 @@ self: { base bytestring criterion deepseq memory random-bytestring text ]; description = "Fast RFC 4648-compliant Base32 encoding"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "base32-bytestring" = callPackage @@ -37836,8 +37995,8 @@ self: { testHaskellDepends = [ base bytestring hspec QuickCheck ]; benchmarkHaskellDepends = [ base bytestring criterion ]; description = "Fast base32 and base32hex codec for ByteStrings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -37855,7 +38014,7 @@ self: { libraryHaskellDepends = [ base base32 bytestring lens text ]; testHaskellDepends = [ base doctest lens ]; description = "Optics for the Base32 library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "base32-z-bytestring" = callPackage @@ -37875,8 +38034,8 @@ self: { base bytestring criterion z-base32-bytestring ]; description = "Fast z-base32 and z-base32hex codec for ByteStrings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {z-base32-bytestring = null;}; @@ -37890,7 +38049,7 @@ self: { libraryHaskellDepends = [ aeson base binary bytestring text ]; testHaskellDepends = [ base binary bytestring hspec text ]; description = "Fast and safe representation of a Base-32 string"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "base58-bytestring" = callPackage @@ -37908,7 +38067,7 @@ self: { ]; benchmarkHaskellDepends = [ base bytestring criterion ]; description = "Implementation of BASE58 transcoding for ByteStrings"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "base58address" = callPackage @@ -37928,7 +38087,7 @@ self: { ]; description = "Parsing and serialization for Base58 addresses (Bitcoin and Ripple)"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "base58string" = callPackage @@ -37941,7 +38100,7 @@ self: { libraryHaskellDepends = [ aeson base binary bytestring text ]; testHaskellDepends = [ base binary bytestring hspec text ]; description = "Fast and safe representation of a Base-58 string"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "base62" = callPackage @@ -37961,8 +38120,8 @@ self: { wide-word ]; description = "Base62 encoding and decoding"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -37973,10 +38132,8 @@ self: { }: mkDerivation { pname = "base64"; - version = "0.4.2.2"; - sha256 = "05ins0i1561d4gfz6h7fxx8pj8i1qkskz8dgh8pfxa1llzmr856i"; - revision = "1"; - editedCabalFile = "1rlvmg18f2d2rdyzvvzk0is4073j5arx9qirgvshjx67kic2lzqm"; + version = "0.4.2.3"; + sha256 = "1hdqswxhgjrg8akl5v99hbm02gkpagsbx4i7fxbzdys1k0bj3gxw"; libraryHaskellDepends = [ base bytestring deepseq ghc-byteorder text text-short ]; @@ -37988,8 +38145,8 @@ self: { base base64-bytestring bytestring criterion deepseq random-bytestring text ]; - description = "Fast RFC 4648-compliant Base64 encoding"; - license = stdenv.lib.licenses.bsd3; + description = "A modern RFC 4648-compliant Base64 library"; + license = lib.licenses.bsd3; }) {}; "base64-bytes" = callPackage @@ -38013,8 +38170,8 @@ self: { random ]; description = "Base64 encoding of byte sequences"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -38036,7 +38193,7 @@ self: { base bytestring containers criterion deepseq ]; description = "Fast base64 encoding and decoding for ByteStrings"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "base64-bytestring_1_2_0_1" = callPackage @@ -38055,8 +38212,8 @@ self: { ]; benchmarkHaskellDepends = [ base bytestring criterion deepseq ]; description = "Fast base64 encoding and decoding for ByteStrings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "base64-bytestring-type" = callPackage @@ -38079,7 +38236,7 @@ self: { tasty-quickcheck ]; description = "A newtype around ByteString, for base64 encoding"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "base64-conduit" = callPackage @@ -38098,8 +38255,8 @@ self: { transformers ]; description = "Base64-encode and decode streams of bytes. (deprecated)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -38115,7 +38272,7 @@ self: { libraryHaskellDepends = [ base base64 bytestring lens text ]; testHaskellDepends = [ base doctest lens ]; description = "Optics for the Base64 library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "base64-string" = callPackage @@ -38127,7 +38284,7 @@ self: { libraryHaskellDepends = [ base ]; description = "Base64 implementation for String's"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "base91" = callPackage @@ -38148,7 +38305,7 @@ self: { base bytestring mono-traversable QuickCheck text ]; description = "A Generic Base91 Encoder & Decoder"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "basement" = callPackage @@ -38161,7 +38318,7 @@ self: { editedCabalFile = "1l95bzmn23cmx386hk3d3r0ykdaibh9rp489lcnba5g56kiy4hxg"; libraryHaskellDepends = [ base ghc-prim ]; description = "Foundation scrap box of array & string"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "basen" = callPackage @@ -38179,7 +38336,7 @@ self: { ]; testToolDepends = [ tasty-discover ]; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "basen-bytestring" = callPackage @@ -38190,7 +38347,7 @@ self: { sha256 = "131aamd4kq7jdmpl4ammgqgykbh81mkziaf0kpic5c20al4a73lp"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring QuickCheck ]; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "baserock-schema" = callPackage @@ -38217,8 +38374,8 @@ self: { yaml-pretty-extras ]; description = "Baserock Definitions Schema"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -38230,8 +38387,8 @@ self: { sha256 = "038xxyjy3c9rpz1cf811dy1yxjyjq3cjphq7h6ivj73qpfx6bwch"; libraryHaskellDepends = [ base network pureMD5 utf8-string ]; description = "A BaseX client for Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -38248,7 +38405,7 @@ self: { shell-escape ]; description = "Bash generation library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "basic" = callPackage @@ -38263,8 +38420,8 @@ self: { base stm template-haskell transformers util ]; description = "Lifting values from base types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -38276,7 +38433,7 @@ self: { sha256 = "0gz4jpdp0zjn5yils4wplrg2mghpmxsh9f9yv07n81qb8mxwhg5p"; libraryHaskellDepends = [ base ]; description = "A small package to access the cpuid instruction directly"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "basic-lens" = callPackage @@ -38287,7 +38444,7 @@ self: { sha256 = "1qnlzxbwz9fh78sw78xs0sf3wx94m5ipw1adfaf02d291z81mrys"; libraryHaskellDepends = [ base template-haskell ]; description = "Basic lens type and functions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "basic-prelude" = callPackage @@ -38303,7 +38460,7 @@ self: { unordered-containers vector ]; description = "An enhanced core prelude; a common foundation for alternate preludes"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "basic-sop" = callPackage @@ -38316,8 +38473,8 @@ self: { base deepseq generics-sop QuickCheck text ]; description = "Basic examples and functions for generics-sop"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -38335,7 +38492,7 @@ self: { ]; description = "An interpreter for a small functional language"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -38353,7 +38510,7 @@ self: { ]; testHaskellDepends = [ base hspec stm timespan ]; description = "Simplify queuing up data and processing it in batch"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "batch-rename" = callPackage @@ -38366,7 +38523,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base directory filepath Glob ]; description = "Make Linux or MacOS do things like \"rename *.mp3 *.mp4\""; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "batchd" = callPackage @@ -38397,8 +38554,8 @@ self: { wai-middleware-static warp x509-store yaml ]; description = "Batch processing toolset for Linux / Unix"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -38412,8 +38569,8 @@ self: { aeson base containers http-conduit text ]; description = "API client for Battle.Net"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -38427,8 +38584,8 @@ self: { base battlenet http-conduit text yesod-core ]; description = "Yesod integration for the battlenet package"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -38446,8 +38603,8 @@ self: { swagger2 template-haskell text vector ]; description = "Core definitions for BattlePlace.io service"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -38461,8 +38618,8 @@ self: { base battleplace servant servant-client ]; description = "Public API definitions of BattlePlace.io service"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -38486,8 +38643,8 @@ self: { executableHaskellDepends = [ base containers ]; testHaskellDepends = [ base QuickCheck ]; description = "Compute number of possible arrangements in the battleship game"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -38520,8 +38677,8 @@ self: { wai-handler-fastcgi yesod ]; description = "A web-based implementation of battleships including an AI opponent"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -38541,8 +38698,8 @@ self: { statistics stm transformers vector ]; description = "Framework for inferring generative probabilistic models with Gibbs sampling"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -38560,8 +38717,8 @@ self: { base cmdargs directory filepath hxt hxt-xpath listsafe MissingH ]; description = "HTML Coverage Reports for Rules_Haskell"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -38576,7 +38733,7 @@ self: { libraryHaskellDepends = [ base directory filepath transformers ]; executableHaskellDepends = [ base filepath ]; description = "Locate Bazel runfiles location"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "bbdb" = callPackage @@ -38588,7 +38745,7 @@ self: { libraryHaskellDepends = [ base parsec ]; testHaskellDepends = [ base hspec parsec ]; description = "Ability to read, write, and modify BBDB files"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "bbi" = callPackage @@ -38608,8 +38765,8 @@ self: { tasty-golden tasty-hunit vector ]; description = "Tools for reading Big Binary Indexed files, e.g., bigBed, bigWig"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -38629,8 +38786,8 @@ self: { aeson base containers country doctest hspec iso639 QuickCheck text ]; description = "Language tags as specified by BCP 47"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -38650,8 +38807,8 @@ self: { base bcp47 cassava hspec path-pieces persistent QuickCheck ]; description = "BCP47 orphan instances"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -38665,7 +38822,7 @@ self: { base bytestring data-default entropy memory ]; description = "Haskell bindings to the bcrypt password hash"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bdcs" = callPackage @@ -38710,8 +38867,8 @@ self: { persistent-sqlite persistent-template resourcet text time unix ]; description = "Tools for managing a content store of software packages"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) ostree;}; @@ -38748,8 +38905,8 @@ self: { string-conversions string-qq temporary text time wai warp ]; description = "BDCS API Server"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) libgit2-glib;}; @@ -38767,8 +38924,8 @@ self: { test-framework-hunit ]; description = "Behavior-Driven Development DSL"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -38780,7 +38937,7 @@ self: { sha256 = "17zapldywid4xq0a6qdxh6hnk5igjjgplfydnr800xdpicicbrww"; libraryHaskellDepends = [ base bytestring ]; description = "Simple, fast binary diff/patch"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "bdo" = callPackage @@ -38795,8 +38952,8 @@ self: { libraryHaskellDepends = [ aeson base network text url ]; executableHaskellDepends = [ aeson base network text url ]; description = "Update CSS in the browser without reloading the page"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -38816,8 +38973,8 @@ self: { pretty semigroups tagged text time uniplate ]; description = "A type-safe SQL mapper for Haskell that doesn't use Template Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -38855,8 +39012,8 @@ self: { postgresql-simple QuickCheck splitmix ]; description = "DB migration library for beam, targeting Postgres"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -38878,8 +39035,8 @@ self: { base bytestring tasty tasty-hunit text time ]; description = "Type-safe, feature-complete SQL query and manipulation interface for Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -38900,8 +39057,8 @@ self: { uuid-types vector ]; description = "SQL DDL support and migrations support library for Beam"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -38919,8 +39076,8 @@ self: { hashable mtl mysql network-uri scientific text time ]; description = "Connection layer between beam and MySQL/MariaDB"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -38936,8 +39093,8 @@ self: { base beam-core beam-migrate lens postgresql-simple ]; description = "A newtype for wrapping newtypes into beam schemas"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -38964,8 +39121,8 @@ self: { postgresql-simple tasty tasty-hunit text tmp-postgres uuid vector ]; description = "Connection layer between beam and postgres"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -38988,8 +39145,8 @@ self: { tasty-expected-failure tasty-hunit text time ]; description = "Beam driver for SQLite"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -39011,8 +39168,8 @@ self: { template-haskell text ]; description = "Template Haskell utilities for beam"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -39037,8 +39194,8 @@ self: { integer-gmp murmur-hash ]; description = "Generic serializer/deserializer with compact representation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -39054,7 +39211,7 @@ self: { base dunai MonadRandom mtl simple-affine-space transformers ]; description = "FRP Yampa replacement implemented with Monadic Stream Functions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "beautifHOL" = callPackage @@ -39068,7 +39225,7 @@ self: { executableHaskellDepends = [ array base haskell98 mtl ]; description = "A pretty-printer for higher-order logic"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -39096,8 +39253,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Implementation of the Bech32 cryptocurrency address format (BIP 0173)"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -39115,8 +39272,8 @@ self: { testHaskellDepends = [ base bech32 hspec template-haskell ]; testToolDepends = [ hspec-discover ]; description = "Template Haskell extensions to the Bech32 library"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -39133,8 +39290,8 @@ self: { ]; testHaskellDepends = [ base QuickCheck ]; description = "Efficient Matrix and Vector operations in 100% Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -39158,8 +39315,8 @@ self: { unordered-containers vector ]; description = "Bindings to the beeminder.com JSON API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -39183,8 +39340,8 @@ self: { utf8-string xhtml ]; description = "Bein is a provenance and workflow management system for bioinformatics"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -39213,8 +39370,8 @@ self: { tasty-hunit tasty-quickcheck ]; description = "HTTP client DSL"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -39234,7 +39391,7 @@ self: { base criterion optparse-applicative process silently text turtle ]; description = "Command-line benchmark tool"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bench-graph" = callPackage @@ -39250,8 +39407,8 @@ self: { ]; testHaskellDepends = [ base split text ]; description = "Plot and compare benchmarks"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -39278,8 +39435,8 @@ self: { ]; testHaskellDepends = [ base split text ]; description = "Show, plot and compare benchmark results"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -39291,7 +39448,7 @@ self: { sha256 = "1zwk05lf76xcdbqrbaid3whmn04injrg7dnlji2v2i5li0pnpr3c"; libraryHaskellDepends = [ base process random time ]; description = "Test the time it takes to run a haskell function"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "benchpress" = callPackage @@ -39305,7 +39462,7 @@ self: { libraryHaskellDepends = [ base mtl time ]; executableHaskellDepends = [ base bytestring time ]; description = "Micro-benchmarking with detailed statistics"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bencode" = callPackage @@ -39324,7 +39481,7 @@ self: { base bytestring containers hspec QuickCheck ]; description = "Parsers and printers for bencoded data"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bencodex" = callPackage @@ -39347,8 +39504,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Bencodex reader/writer for Haskell"; - license = stdenv.lib.licenses.gpl3Plus; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -39372,7 +39529,7 @@ self: { attoparsec base bencode bytestring criterion deepseq ghc-prim ]; description = "A library for encoding and decoding of BEncode data"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bento" = callPackage @@ -39383,7 +39540,7 @@ self: { sha256 = "14li436dp33r4fygkbxr6rjljdamc0yhxv34wafsy4xsv8h898pb"; libraryHaskellDepends = [ base ]; description = "🍱 Manage stateful components"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "berkeleydb" = callPackage @@ -39395,8 +39552,8 @@ self: { libraryHaskellDepends = [ base binary bytestring ]; librarySystemDepends = [ db ]; description = "Pretty BerkeleyDB v4 binding"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) db;}; @@ -39422,8 +39579,8 @@ self: { parseargs process transformers ]; description = "An implementation of Python 3"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -39446,8 +39603,8 @@ self: { tasty-hunit tasty-smallcheck ]; description = "BERT implementation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -39459,8 +39616,8 @@ self: { sha256 = "0bv68nn6ijf1wv57kwp4yj6s75g960pds0n9wihxwkr4hh5azls1"; libraryHaskellDepends = [ base ]; description = "Extended GCD of polynomials over F_p[x]"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -39487,8 +39644,8 @@ self: { test-framework-quickcheck2 test-framework-th ]; description = "Betfair API bindings. Bet on sports on betting exchanges."; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -39505,8 +39662,8 @@ self: { ]; testHaskellDepends = [ base hspec QuickCheck smallcheck ]; description = "A codec for beta code (http://en.wikipedia.org/wiki/Beta_Code)."; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -39529,8 +39686,8 @@ self: { random stm time-units vty ]; description = "A horizontal version of tetris for braille users"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -39542,7 +39699,7 @@ self: { sha256 = "0pa6f7vadslvff0hlm939r2h8k130f16l2sjnzci79n54q9kadw3"; libraryHaskellDepends = [ base ]; description = "Function combinator \"between\" and derived combinators"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bf-cata" = callPackage @@ -39570,8 +39727,8 @@ self: { template-haskell unix ]; description = "Bidirectionalization for Free! (POPL'09)"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -39583,7 +39740,7 @@ self: { sha256 = "1qswfjrij01g7g85iiyxpvk1k5hgnf6ll7jcf6b33k6dawi3a4qr"; libraryHaskellDepends = [ base containers mtl ]; description = "\"Bidirectionalization for Free\" for Monomorphic Transformations"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bglib" = callPackage @@ -39604,7 +39761,7 @@ self: { serialport stm ]; description = "Implementation of the BGAPI serial protocol"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "bgmax" = callPackage @@ -39615,8 +39772,8 @@ self: { sha256 = "0cgxdq5dfs9dvj5ly9sd52pf75yslrnds45hg9nwv5zrfld90rdv"; libraryHaskellDepends = [ attoparsec base bytestring time ]; description = "Parse BgMax-files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -39632,8 +39789,8 @@ self: { base bytestring mtl parallel pipes streaming-commons ]; description = "Blocked GZip"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -39656,7 +39813,7 @@ self: { ]; description = "Simple terminal GUI for local hoogle"; license = "(BSD-3-Clause OR Apache-2.0)"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -39679,8 +39836,8 @@ self: { ]; executableToolDepends = [ alex happy ]; description = "A database based bibliography manager for BibTeX"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -39694,7 +39851,7 @@ self: { isExecutable = true; libraryHaskellDepends = [ base latex parsec utility-ht ]; description = "Parse, format and processing BibTeX files"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bidirectional" = callPackage @@ -39706,8 +39863,8 @@ self: { libraryHaskellDepends = [ base profunctors ]; testHaskellDepends = [ base hedgehog mtl ]; description = "Simple bidirectional serialization and deserialization"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -39727,8 +39884,8 @@ self: { template-haskell unix utf8-string xhtml ]; description = "Prototype Implementation of Combining Syntactic and Semantic Bidirectionalization (ICFP'10)"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -39741,7 +39898,7 @@ self: { libraryHaskellDepends = [ base bytestring mtl ]; description = "Specification of generators and parsers"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -39754,7 +39911,7 @@ self: { libraryHaskellDepends = [ base bytestring dataenc mtl ]; description = "Extra helper functions for bidirectional specifications"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -39768,7 +39925,7 @@ self: { editedCabalFile = "1yc56avikf0xnmd7cm2hh93vgwcpxyiw1d208s4hp80i8iprkp2n"; libraryHaskellDepends = [ base category ]; description = "Bifunctors"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bifunctors" = callPackage @@ -39778,8 +39935,8 @@ self: { }: mkDerivation { pname = "bifunctors"; - version = "5.5.9"; - sha256 = "0c0zm9n085a6zna91yq9c14xwpwi72wn9xlsgzpza9r9bmy5jv05"; + version = "5.5.10"; + sha256 = "03d96df4j1aq9z7hrk3n519g3h7fjgjf82fmgp6wxxbaigyrqwp7"; libraryHaskellDepends = [ base base-orphans comonad containers tagged template-haskell th-abstraction transformers @@ -39790,7 +39947,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Bifunctors"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bighugethesaurus" = callPackage @@ -39823,8 +39980,8 @@ self: { uu-parsinglib ]; description = "A parser for the Billboard chord dataset"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -39843,7 +40000,7 @@ self: { ]; description = "Leksah library"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -39863,7 +40020,7 @@ self: { ]; description = "Leksah plugin base"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -39886,7 +40043,7 @@ self: { ]; description = "Leksah plugin base"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {leksah-dummy = null; leksah-main = null; leksah-plugin-pane = null;}; @@ -39905,7 +40062,7 @@ self: { ]; description = "Leksah library"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -39922,7 +40079,7 @@ self: { ]; description = "Leksah library"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -39941,7 +40098,7 @@ self: { base containers deepseq exceptions QuickCheck template-haskell ]; description = "Bidirectional mapping between two key types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bimap-server" = callPackage @@ -39956,7 +40113,7 @@ self: { aeson base bimap binary directory http-types unix wai warp ]; description = "Two-column database server"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bimaps" = callPackage @@ -39983,7 +40140,7 @@ self: { vector ]; description = "bijections with multiple implementations"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bin" = callPackage @@ -39998,7 +40155,7 @@ self: { base dec deepseq fin hashable QuickCheck ]; description = "Bin: binary natural numbers"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; }) {}; "binary_0_8_8_0" = callPackage @@ -40024,8 +40181,8 @@ self: { unordered-containers zlib ]; description = "Binary serialisation for Haskell values using lazy ByteStrings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "binary-bits" = callPackage @@ -40044,8 +40201,8 @@ self: { test-framework-quickcheck2 ]; description = "Bit parsing/writing on top of binary"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -40057,8 +40214,8 @@ self: { sha256 = "1w3cwnliaw1dxgg1zgsg13hp4qdhxb18pfrm99bhmfq81p26ghk8"; libraryHaskellDepends = [ base binary bytestring mtl ]; description = "Flexible way to ease transmission of binary data"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -40078,7 +40235,7 @@ self: { quickcheck-assertions resourcet ]; description = "data serialization/deserialization conduit library"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "binary-derive" = callPackage @@ -40089,8 +40246,8 @@ self: { sha256 = "1rb4fpx5hlq661md7nrpgpmi7jjdq3r1ky6q9vxl6f72h085acvl"; libraryHaskellDepends = [ base binary ghc-prim ]; description = "Automatic deriving of Binary using GHC.Generics"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -40102,7 +40259,7 @@ self: { sha256 = "1246lsk6bfwkrcspdsavmbz5ym3dvjc8ik3r0nc2if9x55cx5rqm"; libraryHaskellDepends = [ base binary ]; description = "Simple wrappers around enum types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "binary-ext" = callPackage @@ -40127,8 +40284,8 @@ self: { transformers-base ]; description = "An alternate with strong-typed errors for `Data.Binary.Get` monad from `binary` package."; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -40144,8 +40301,8 @@ self: { base bytestring monads-tf peggy template-haskell ]; description = "read/write binary file"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -40161,7 +40318,7 @@ self: { base binary bytestring data-binary-ieee754 syb text ]; description = "Generic binary serialisation using binary and syb"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "binary-ieee754" = callPackage @@ -40172,7 +40329,7 @@ self: { sha256 = "0m2dxr5a4rb18jh1xj5yxjpjybn6bz5pjxd2cx06nd6dif4qki0m"; libraryHaskellDepends = [ array base binary ]; description = "Backport ieee754 float double combinators to older binary"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "binary-indexed-tree" = callPackage @@ -40184,7 +40341,7 @@ self: { libraryHaskellDepends = [ array base ]; description = "Binary Indexed Trees (a.k.a. Fenwick Trees)."; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -40210,7 +40367,7 @@ self: { time-compat unordered-containers vector ]; description = "Orphan instances for binary"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "binary-io" = callPackage @@ -40229,7 +40386,7 @@ self: { async base binary bytestring hspec process stm ]; description = "Read and write values of types that implement Binary"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "binary-list" = callPackage @@ -40245,7 +40402,7 @@ self: { ]; benchmarkHaskellDepends = [ base criterion ]; description = "Lists of length a power of two"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "binary-literal-qq" = callPackage @@ -40258,7 +40415,7 @@ self: { editedCabalFile = "0rs6ymklp25lmk0hs8paxi4d8qjxjqpmbg2jbpzdagci39h3m9b1"; libraryHaskellDepends = [ base template-haskell ]; description = "Extends Haskell with binary literals"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "binary-orphans" = callPackage @@ -40277,7 +40434,7 @@ self: { tasty-quickcheck ]; description = "Compatibility package for binary; provides instances"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "binary-parser" = callPackage @@ -40295,7 +40452,7 @@ self: { tasty-quickcheck ]; description = "A highly-efficient but limited parser API specialised for bytestrings"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "binary-parsers" = callPackage @@ -40324,7 +40481,7 @@ self: { unordered-containers vector ]; description = "Extends binary with parsec/attoparsec style parsing combinators"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "binary-protocol" = callPackage @@ -40335,8 +40492,8 @@ self: { sha256 = "1hn6jc4j20z8ni7rpcyamam898yl6jy7zinrhy2rdjvx0p5br13h"; libraryHaskellDepends = [ base binary bytestring mtl ]; description = "Monad to ease implementing a binary network protocol"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -40352,8 +40509,8 @@ self: { base binary bytestring mtl zeromq-haskell ]; description = "Monad to ease implementing a binary network protocol over ZeroMQ"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -40370,8 +40527,8 @@ self: { base directory doctest filepath hspec QuickCheck ]; description = "Binary and exponential searches"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -40383,7 +40540,7 @@ self: { sha256 = "0qdbz2qvvqiaqp859fn00470gzxpvw8k3v0wqclgqps3zj9g9854"; libraryHaskellDepends = [ base bytestring cborg serialise ]; description = "Yet Another Binary Serialisation Library (compatibility shim)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "binary-shared" = callPackage @@ -40405,7 +40562,7 @@ self: { sha256 = "06v3qxyl2mvwi3y29rxxf91b2vxvlh5gfznwlnzb4mxzd00aakgl"; libraryHaskellDepends = [ base binary bytestring containers mtl ]; description = "Simple wrapper around Data.Binary, which adds StateT to Get/Put monads."; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "binary-store" = callPackage @@ -40425,8 +40582,8 @@ self: { base binary-list QuickCheck tasty tasty-quickcheck ]; description = "Format to store data using the binary transform"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {binary-transform = null;}; @@ -40444,8 +40601,8 @@ self: { QuickCheck ]; description = "data serialization/deserialization io-streams library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -40458,7 +40615,7 @@ self: { libraryHaskellDepends = [ array base bytestring mtl ]; testHaskellDepends = [ base bytestring ]; description = "Binary deserialisation using strict ByteStrings"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "binary-tagged" = callPackage @@ -40488,8 +40645,8 @@ self: { unordered-containers ]; description = "Tagged binary serialisation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -40508,7 +40665,7 @@ self: { test-framework test-framework-quickcheck2 ]; benchmarkHaskellDepends = [ base criterion random ]; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "binary-typed" = callPackage @@ -40529,8 +40686,8 @@ self: { base binary bytestring criterion deepseq ]; description = "Type-safe binary serialization"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -40542,7 +40699,7 @@ self: { sha256 = "1i183ab4bbq3yarijnb2pwgbi9k1w1nc0fs6ph8d8xnysj6ws8l8"; libraryHaskellDepends = [ base binary ]; description = "VarInt encoding/decoding via Data.Binary"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "binarydefer" = callPackage @@ -40553,20 +40710,20 @@ self: { sha256 = "06q255kip3j31bmj01fqkikvjxbklvcaa1kv3al8v04nkqx6rg3p"; libraryHaskellDepends = [ base ]; description = "Binary serialization with deferred loading"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "binaryen" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "binaryen"; - version = "0.0.5.0"; - sha256 = "0n3w222k1jbijqgjy1kngwx4hjny7qzw3w2gx82qxycbmm1sb1qg"; + version = "0.0.6.0"; + sha256 = "0jc61n8piz75032d9h6azswkvnhlfvxpn3lhl7jj5ry0xm4g3a7p"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; doHaddock = false; description = "Haskell bindings to binaryen"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bind-marshal" = callPackage @@ -40583,8 +40740,8 @@ self: { numeric-prelude random stm strict transformers type-level-tf unix ]; description = "Data marshaling library that uses type level equations to optimize buffering"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -40599,8 +40756,8 @@ self: { libraryHaskellDepends = [ base stm ]; testHaskellDepends = [ base HTF HUnit QuickCheck random ]; description = "Data Binding"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -40615,8 +40772,8 @@ self: { libraryHaskellDepends = [ base binding-core gtk mtl ]; testHaskellDepends = [ base binding-core directory gtk ]; description = "Data Binding in Gtk2Hs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -40631,8 +40788,8 @@ self: { libraryHaskellDepends = [ base binding-core stm wx wxcore ]; testHaskellDepends = [ base binding-core directory wx ]; description = "Data Binding in WxHaskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -40644,7 +40801,7 @@ self: { sha256 = "0zczf1yfjnfzdzv33j33vcc71zsf88a5qxsdmswxrpzika3rs6i0"; libraryHaskellDepends = [ base ]; description = "Deprecated package"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bindings-DSL" = callPackage @@ -40655,7 +40812,7 @@ self: { sha256 = "0kqrd78nspl3lk4a0fqn47d8dirjg3b24dkvkigcrlb81hw35pk3"; libraryHaskellDepends = [ base ]; description = "FFI domain specific language, on top of hsc2hs"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bindings-EsounD" = callPackage @@ -40667,8 +40824,8 @@ self: { libraryHaskellDepends = [ base bindings-audiofile bindings-DSL ]; libraryPkgconfigDepends = [ esound ]; description = "Low level bindings to EsounD (ESD; Enlightened Sound Daemon)"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {esound = null;}; @@ -40690,7 +40847,7 @@ self: { base HUnit test-framework test-framework-hunit ]; description = "Low-level bindings to GLFW OpenGL library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXcursor; inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXfixes; inherit (pkgs.xorg) libXi; @@ -40707,8 +40864,8 @@ self: { libraryHaskellDepends = [ base ]; librarySystemDepends = [ K8055D ]; description = "Bindings to Velleman K8055 dll"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {K8055D = null;}; @@ -40721,8 +40878,8 @@ self: { libraryHaskellDepends = [ base bindings-DSL ]; libraryPkgconfigDepends = [ apr ]; description = "Low level bindings to Apache Portable Runtime (APR)"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) apr;}; @@ -40735,8 +40892,8 @@ self: { libraryHaskellDepends = [ base bindings-apr bindings-DSL ]; libraryPkgconfigDepends = [ apr-util ]; description = "Low level bindings to Apache Portable Runtime Utility (APR Utility)"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {apr-util = null;}; @@ -40749,7 +40906,7 @@ self: { libraryHaskellDepends = [ base bindings-DSL ]; libraryPkgconfigDepends = [ audiofile ]; description = "Low level bindings to audiofile"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {inherit (pkgs) audiofile;}; "bindings-bfd" = callPackage @@ -40764,8 +40921,8 @@ self: { librarySystemDepends = [ bfd opcodes ]; libraryToolDepends = [ alex happy ]; description = "Bindings for libbfd, a library of the GNU `binutils'"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {bfd = null; opcodes = null;}; @@ -40778,8 +40935,8 @@ self: { libraryHaskellDepends = [ bindings-DSL ]; librarySystemDepends = [ dttools ]; description = "Bindings to the CCTools WorkQueue C library"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {dttools = null;}; @@ -40799,7 +40956,7 @@ self: { librarySystemDepends = [ codec2 ]; executableHaskellDepends = [ base binary bytestring split ]; description = "Very low-level FFI bindings for Codec2"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }) {inherit (pkgs) codec2;}; "bindings-common" = callPackage @@ -40810,8 +40967,8 @@ self: { sha256 = "1zbm8v5xp4pay6h0y24ngf8nw96ab0zr754b9n2zczadiarccmcb"; libraryHaskellDepends = [ base ]; description = "This package is obsolete. Look for bindings-DSL instead."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -40825,8 +40982,8 @@ self: { librarySystemDepends = [ dc1394 ]; libraryToolDepends = [ c2hs ]; description = "Library for using firewire (iidc-1394) cameras"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {dc1394 = null;}; @@ -40839,8 +40996,8 @@ self: { libraryHaskellDepends = [ base bindings-DSL bindings-posix ]; libraryPkgconfigDepends = [ directfb ]; description = "Low level bindings to DirectFB"; - license = stdenv.lib.licenses.bsd3; - platforms = [ "i686-linux" "x86_64-linux" ]; + license = lib.licenses.bsd3; + platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) directfb;}; "bindings-eskit" = callPackage @@ -40853,8 +41010,8 @@ self: { librarySystemDepends = [ eskit ]; libraryPkgconfigDepends = [ eskit ]; description = "Bindings to ESKit"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {eskit = null;}; @@ -40867,8 +41024,8 @@ self: { libraryHaskellDepends = [ base bindings-DSL ]; libraryPkgconfigDepends = [ fann ]; description = "Low level bindings to FANN neural network library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {fann = null;}; @@ -40881,8 +41038,8 @@ self: { libraryHaskellDepends = [ base bindings-DSL ]; libraryPkgconfigDepends = [ fluidsynth ]; description = "Haskell FFI bindings for fluidsynth software synthesizer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) fluidsynth;}; @@ -40895,8 +41052,8 @@ self: { libraryHaskellDepends = [ base bindings-DSL ]; librarySystemDepends = [ friso ]; description = "Low level bindings for friso"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {friso = null;}; @@ -40909,7 +41066,7 @@ self: { libraryHaskellDepends = [ base bindings-DSL ]; libraryPkgconfigDepends = [ glib ]; description = "Low level bindings to GLib"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) glib;}; "bindings-gobject" = callPackage @@ -40921,7 +41078,7 @@ self: { libraryHaskellDepends = [ base bindings-DSL bindings-glib ]; libraryPkgconfigDepends = [ glib ]; description = "Low level bindings supporting GObject and derived libraries"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) glib;}; "bindings-gpgme" = callPackage @@ -40933,7 +41090,7 @@ self: { libraryHaskellDepends = [ base bindings-DSL ]; librarySystemDepends = [ gpgme ]; description = "Project bindings-* raw interface to gpgme"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) gpgme;}; "bindings-gsl" = callPackage @@ -40945,8 +41102,8 @@ self: { libraryHaskellDepends = [ base bindings-DSL ]; libraryPkgconfigDepends = [ gsl ]; description = "Low level bindings to GNU GSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) gsl;}; @@ -40959,7 +41116,7 @@ self: { libraryHaskellDepends = [ base bindings-DSL bindings-glib ]; libraryPkgconfigDepends = [ gts ]; description = "Low level bindings supporting GTS, the GNU Triangulated Surface Library"; - license = stdenv.lib.licenses.lgpl3; + license = lib.licenses.lgpl3; }) {inherit (pkgs) gts;}; "bindings-hamlib" = callPackage @@ -40976,8 +41133,8 @@ self: { librarySystemDepends = [ hamlib ]; executableHaskellDepends = [ base ]; description = "Hamlib bindings for Haskell"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) hamlib;}; @@ -40989,8 +41146,8 @@ self: { sha256 = "1d94irqliswjqx65k147mj8i9j34xhfn5lyk5xa7ycf3m5b1g95z"; libraryHaskellDepends = [ base bindings-DSL ]; description = "Project bindings-* raw interface to HDF5 library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -41004,7 +41161,7 @@ self: { librarySystemDepends = [ blas liblapack ]; description = "Low level bindings to the C levmar (Levenberg-Marquardt) library"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) blas; liblapack = null;}; "bindings-libcddb" = callPackage @@ -41016,7 +41173,7 @@ self: { libraryHaskellDepends = [ base bindings-DSL ]; libraryPkgconfigDepends = [ libcddb ]; description = "Low level binding to libcddb"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) libcddb;}; "bindings-libffi" = callPackage @@ -41028,7 +41185,7 @@ self: { libraryHaskellDepends = [ base bindings-DSL ]; libraryPkgconfigDepends = [ libffi ]; description = "Low level bindings to libffi"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) libffi;}; "bindings-libftdi" = callPackage @@ -41041,7 +41198,7 @@ self: { libraryPkgconfigDepends = [ libftdi libusb ]; description = "Low level bindings to libftdi"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) libftdi; libusb = null;}; @@ -41054,8 +41211,8 @@ self: { libraryHaskellDepends = [ base bindings-DSL ]; librarySystemDepends = [ g15 ]; description = "Bindings to libg15"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {g15 = null;}; @@ -41067,8 +41224,8 @@ self: { sha256 = "18vjsgvndmxbxvyapxkgkx36qgh2yrdg8dfaqpcd9zr3yl84kxnq"; libraryHaskellDepends = [ base bindings-DSL ]; description = "Low level bindings to libpci"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -41081,8 +41238,8 @@ self: { libraryHaskellDepends = [ base bindings-DSL ]; libraryPkgconfigDepends = [ librrd ]; description = "Low level bindings to RRDtool"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {librrd = null;}; @@ -41099,8 +41256,8 @@ self: { ]; librarySystemDepends = [ stemmer ]; description = "Binding for libstemmer with low level binding"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {stemmer = null;}; @@ -41113,8 +41270,8 @@ self: { libraryHaskellDepends = [ base bindings-DSL ]; libraryPkgconfigDepends = [ libusb ]; description = "Low level bindings to libusb"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {libusb = null;}; @@ -41127,8 +41284,8 @@ self: { libraryHaskellDepends = [ base bindings-DSL ]; librarySystemDepends = [ v4l2 ]; description = "bindings to libv4l2 for Linux"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {v4l2 = null;}; @@ -41141,7 +41298,7 @@ self: { libraryHaskellDepends = [ base bindings-DSL ]; libraryPkgconfigDepends = [ libzip ]; description = "Low level bindings to libzip"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) libzip;}; "bindings-linux-videodev2" = callPackage @@ -41152,8 +41309,8 @@ self: { sha256 = "0k8h0i8qfmx6fg5d7mbh57brp8h896j9070bss9jmds4bhizhpw9"; libraryHaskellDepends = [ base bindings-DSL ioctl ]; description = "bindings to Video For Linux Two (v4l2) kernel interfaces"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -41166,8 +41323,8 @@ self: { libraryHaskellDepends = [ base bindings-DSL ]; librarySystemDepends = [ lxc ]; description = "Direct Haskell bindings to LXC (Linux containers) C API"; - license = stdenv.lib.licenses.bsd3; - platforms = [ "i686-linux" "x86_64-linux" ]; + license = lib.licenses.bsd3; + platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) lxc;}; "bindings-mmap" = callPackage @@ -41178,7 +41335,7 @@ self: { sha256 = "19qdf5z6mf8j8inlnax0nv1wiv4va27z4a303hpkbgda459093nd"; libraryHaskellDepends = [ bindings-posix ]; description = "(deprecated) see bindings-posix instead"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bindings-monetdb-mapi" = callPackage @@ -41190,8 +41347,8 @@ self: { libraryHaskellDepends = [ base ]; libraryPkgconfigDepends = [ monetdb-mapi ]; description = "Low-level bindings for the MonetDB API (mapi)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {monetdb-mapi = null;}; @@ -41203,8 +41360,8 @@ self: { sha256 = "18i68ivsrdndjpfnyq6dlmmkkx22v3rp619nm26af8ka3qai12j5"; libraryHaskellDepends = [ base bindings-DSL ]; description = "bindings to mpdecimal library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -41222,7 +41379,7 @@ self: { base bytestring hspec HUnit QuickCheck quickcheck-io ]; description = "bindings to nettle crypto library"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {inherit (pkgs) nettle;}; "bindings-parport" = callPackage @@ -41233,7 +41390,7 @@ self: { sha256 = "1q404clpqzv0gik80ycipl94hvj27397z5cw1cs7b0yxlypllg3j"; libraryHaskellDepends = [ base bindings-DSL ]; description = "parport bindings"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bindings-portaudio" = callPackage @@ -41245,7 +41402,7 @@ self: { libraryHaskellDepends = [ base bindings-DSL vector ]; libraryPkgconfigDepends = [ portaudio ]; description = "Low-level bindings to portaudio library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) portaudio;}; "bindings-posix" = callPackage @@ -41256,7 +41413,7 @@ self: { sha256 = "02bcb40jpwylcl48g48r2yd3j7pmij94975r3dcnmyk76kyp3fc3"; libraryHaskellDepends = [ base bindings-DSL ]; description = "Project bindings-* raw interface to Posix"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bindings-potrace" = callPackage @@ -41268,7 +41425,7 @@ self: { libraryHaskellDepends = [ base bindings-DSL ]; librarySystemDepends = [ potrace ]; description = "Low-level bindings to the potrace bitmap tracing library"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }) {inherit (pkgs) potrace;}; "bindings-ppdev" = callPackage @@ -41279,8 +41436,8 @@ self: { sha256 = "18px429hplpabfhapwasbdgw8ynfm3vr5rf81pp173j1z0bv4ygq"; libraryHaskellDepends = [ base bindings-DSL ioctl ]; description = "PPDev bindings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -41301,7 +41458,7 @@ self: { base cmdargs containers directory filepath process text unix ]; description = "Wrapping saga_cmd"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "bindings-sane" = callPackage @@ -41313,7 +41470,7 @@ self: { libraryHaskellDepends = [ base bindings-DSL ]; libraryPkgconfigDepends = [ sane-backends ]; description = "FFI bindings to libsane"; - license = stdenv.lib.licenses.lgpl3; + license = lib.licenses.lgpl3; }) {inherit (pkgs) sane-backends;}; "bindings-sc3" = callPackage @@ -41327,7 +41484,7 @@ self: { librarySystemDepends = [ scsynth ]; description = "Low-level bindings to the SuperCollider synthesis engine library"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {scsynth = null;}; @@ -41344,7 +41501,7 @@ self: { executableHaskellDepends = [ base ]; description = "Low level bindings to SIPC"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {sipc = null;}; @@ -41356,7 +41513,7 @@ self: { sha256 = "0fiibm7nrsx9pzi2lvhhbw71bah6s22h3jvn417ng3lj6ghhzii6"; libraryHaskellDepends = [ base bindings-DSL ]; description = "Low-level bindings to sophia library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bindings-sqlite3" = callPackage @@ -41368,7 +41525,7 @@ self: { libraryHaskellDepends = [ base bindings-DSL ]; libraryPkgconfigDepends = [ sqlite ]; description = "Low level bindings to sqlite3"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) sqlite;}; "bindings-svm" = callPackage @@ -41379,7 +41536,7 @@ self: { sha256 = "1nnmyxn28qdfy2sclnxv2mf2d426vrzgs7f0vvqri6fkjnvmk11b"; libraryHaskellDepends = [ base bindings-DSL ]; description = "Low level bindings to libsvm"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bindings-uname" = callPackage @@ -41390,7 +41547,7 @@ self: { sha256 = "1lsw4dh5vgmfvrx62ns5kmngzlmjzbxkx43x5i2k5qlmzp1pa3hk"; libraryHaskellDepends = [ base ]; description = "Low-level binding to POSIX uname(3)"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "bindings-wlc" = callPackage @@ -41403,8 +41560,8 @@ self: { librarySystemDepends = [ wlc ]; testHaskellDepends = [ base ]; description = "Bindings against the wlc library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {wlc = null;}; @@ -41417,8 +41574,8 @@ self: { libraryHaskellDepends = [ base ]; librarySystemDepends = [ gmp yices ]; description = "Bindings to the Yices theorem prover"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) gmp; inherit (pkgs) yices;}; "bindynamic" = callPackage @@ -41431,8 +41588,8 @@ self: { editedCabalFile = "0mq2h1j1xd52irb35y9j0znxzpk661w3dl4d5a011sln4jd3f663"; libraryHaskellDepends = [ base binary bytestring rank1dynamic ]; description = "A variation of Data.Dynamic.Dynamic with a Binary instance"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -41451,8 +41608,8 @@ self: { base containers directory dlist filepath ]; description = "Embed data into object files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -41469,8 +41626,8 @@ self: { base binembed bytestring containers filepath ]; description = "Example project using binembed to embed data in object files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -41484,7 +41641,7 @@ self: { base binary bytestring data-binary-ieee754 ]; description = "A collection of various methods for reading and writing bini files"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bins" = callPackage @@ -41502,7 +41659,7 @@ self: { tagged vector-sized ]; description = "Aggregate continuous values into discrete bins"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "binsm" = callPackage @@ -41520,7 +41677,7 @@ self: { ]; description = "binary files splitter and merger"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "bio" = callPackage @@ -41541,7 +41698,7 @@ self: { executableHaskellDepends = [ base bytestring random ]; description = "A bioinformatics library"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -41558,8 +41715,8 @@ self: { ]; testHaskellDepends = [ base bytestring hspec QuickCheck ]; description = "Initial project template from stack"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -41574,7 +41731,7 @@ self: { ]; description = "Library for reading ace assembly files"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -41587,7 +41744,7 @@ self: { libraryHaskellDepends = [ base biocore bytestring ]; description = "Data structures and helper functions for calculating alignments"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -41602,7 +41759,7 @@ self: { libraryHaskellDepends = [ base bytestring stringable ]; description = "A bioinformatics library"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -41615,7 +41772,7 @@ self: { libraryHaskellDepends = [ base biocore bytestring ]; description = "Library for reading fasta sequence files"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -41628,7 +41785,7 @@ self: { libraryHaskellDepends = [ base biocore bytestring ]; description = "A library for reading FASTQ files"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -41651,8 +41808,8 @@ self: { unordered-containers vector vector-algorithms zlib ]; description = "bioinformatics support library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -41689,8 +41846,8 @@ self: { random ]; description = "A collection of bioinformatics tools"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -41707,7 +41864,7 @@ self: { ]; description = "Library for reading phd sequence files"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -41725,7 +41882,7 @@ self: { executableHaskellDepends = [ cmdargs unordered-containers ]; description = "Library and executables for working with PSL files"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -41742,8 +41899,8 @@ self: { libraryHaskellDepends = [ array base binary biocore bytestring ]; executableHaskellDepends = [ array base cmdargs mtl ]; description = "Library and executables for working with SFF files"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -41766,8 +41923,8 @@ self: { transformers zlib-conduit ]; description = "Parsing and rendering of Stockholm files (used by Pfam, Rfam and Infernal)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -41788,7 +41945,7 @@ self: { bytestring hedgehog tasty tasty-hedgehog tasty-hunit ]; description = "BIP-0032: Hierarchical Deterministic Wallets for Bitcoin and other cryptocurrencies"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "birch-beer" = callPackage @@ -41822,8 +41979,8 @@ self: { lens optparse-generic sparse-linear-algebra text text-show vector ]; description = "Plot a colorful tree"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -41844,8 +42001,8 @@ self: { haskell98 MissingH mtl parsec process rallod ]; description = "A simple, sinatra-inspired web framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -41858,8 +42015,8 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Birds of Paradise"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -41877,7 +42034,7 @@ self: { base configurator directory filepath mtl selda selda-sqlite text ]; description = "A small tool that clears qutebrowser cookies"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "bisect-binary" = callPackage @@ -41897,8 +42054,8 @@ self: { yaml ]; description = "Determine relevant parts of binary data"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -41930,7 +42087,7 @@ self: { ]; description = "Plays chess"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -41943,8 +42100,8 @@ self: { libraryHaskellDepends = [ base numeric-qq ]; testHaskellDepends = [ base directory doctest filepath ]; description = "A bit array (aka bitset, bitmap, bit vector) API for numeric types"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -41964,7 +42121,7 @@ self: { tasty-hunit tasty-quickcheck ]; description = "Encode binary protocols with some odd bit numbers into a bytestring"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bit-stream" = callPackage @@ -41984,8 +42141,8 @@ self: { ]; benchmarkHaskellDepends = [ base criterion ]; description = "Lazy, infinite, compact stream of Bool with O(1) indexing"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -42002,7 +42159,7 @@ self: { base QuickCheck tasty tasty-quickcheck tasty-th vector ]; description = "Simple bit vectors for Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bitarray" = callPackage @@ -42015,7 +42172,7 @@ self: { editedCabalFile = "10fk92v9afjqk43zi621jxl0n8kci0xjj32lz3vqa9xbh67zjz45"; libraryHaskellDepends = [ array base ]; description = "Mutable and immutable bit arrays"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bitcoin-address" = callPackage @@ -42036,8 +42193,8 @@ self: { hedgehog tasty tasty-hedgehog tasty-hunit ]; description = "Bitcoin address generation and rendering. Parsing coming soon."; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -42062,8 +42219,8 @@ self: { http-client lens text wreq ]; description = "Provides access to the RPC API of Bitcoin Core"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -42086,8 +42243,8 @@ self: { lens text wreq ]; description = "Higher level constructs on top of the bitcoin-api package"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -42108,32 +42265,32 @@ self: { base bitcoin-tx bitcoin-types bytestring hexstring hspec ]; description = "Utility functions for manipulating bitcoin blocks"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; "bitcoin-compact-filters" = callPackage - ({ mkDerivation, aeson, base, bitstream, bytestring, cereal - , haskoin-core, memory, tasty, tasty-hunit, tasty-quickcheck, text - , transformers + ({ mkDerivation, aeson, base, base16-bytestring, bitstream + , bytestring, cereal, haskoin-core, memory, tasty, tasty-hunit + , tasty-quickcheck, text, transformers }: mkDerivation { pname = "bitcoin-compact-filters"; - version = "0.1.0.0"; - sha256 = "0ikirjf0n0np0l6mjfyfxvp367imbmb3g092m4mq457ja8yp7r8m"; + version = "0.1.0.1"; + sha256 = "1ifs7yi34x5nfhy0bs9w6arz7f6kwfxl0wgl6s0iwd1z94s5ysk1"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base bitstream bytestring cereal haskoin-core memory text - transformers + base base16-bytestring bitstream bytestring cereal haskoin-core + memory text transformers ]; testHaskellDepends = [ aeson base bytestring cereal haskoin-core tasty tasty-hunit tasty-quickcheck text ]; description = "BIP 158 compact block filters"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -42148,7 +42305,7 @@ self: { libraryHaskellDepends = [ base bytestring cryptonite memory ]; testHaskellDepends = [ base bytestring tasty tasty-hunit time ]; description = "Bitcoin hash primitives"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "bitcoin-hs" = callPackage @@ -42171,8 +42328,8 @@ self: { random tasty tasty-hunit tasty-quickcheck time transformers ]; description = "Partial implementation of the Bitcoin protocol (as of 2013)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -42190,7 +42347,7 @@ self: { tasty-hunit ]; description = "Bitcoin keys"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "bitcoin-payment-channel" = callPackage @@ -42231,7 +42388,7 @@ self: { ]; description = "Instant, two-party Bitcoin payments"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {blockchain-restful-address-index-api = null;}; @@ -42255,8 +42412,8 @@ self: { test-framework-quickcheck2 text unix unordered-containers watchdog ]; description = "Library to communicate with the Satoshi Bitcoin daemon"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -42274,8 +42431,8 @@ self: { ]; testHaskellDepends = [ base bytestring hspec ]; description = "Compilation, manipulation and decompilation of Bitcoin scripts"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -42288,6 +42445,8 @@ self: { pname = "bitcoin-scripting"; version = "0.1.0"; sha256 = "1hd45rr4mq7dizdw7d1wkypr15azaaqc4fy6rkr9gim93jzc8707"; + revision = "1"; + editedCabalFile = "002i80rqigg3avydg9xhsa8ppyjw6a0r39hbimdghmv8db4wnpbl"; libraryHaskellDepends = [ attoparsec base base16-bytestring bytestring cereal containers haskoin-core text transformers @@ -42297,8 +42456,8 @@ self: { tasty-hunit tasty-quickcheck text ]; description = "Resources for working with miniscript, and script descriptors"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -42319,8 +42478,8 @@ self: { base bitcoin-script bytestring hexstring hspec ]; description = "Utility functions for manipulating bitcoin transactions"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -42340,7 +42499,7 @@ self: { base base58string bytestring hexstring hspec ]; description = "Provides consistent low-level types used commonly among Bitcoin implementations"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "bitcoind-regtest" = callPackage @@ -42352,6 +42511,8 @@ self: { pname = "bitcoind-regtest"; version = "0.2.0.0"; sha256 = "06sk8kb3vjf7a2k7rhqpc7j1lbqd69xyhb25dc8bk7110m5l38cf"; + revision = "1"; + editedCabalFile = "15qqqvrx3ikbzvws2n5mywqlpsg8g437gsdj19cdfa6cc4bd8kqh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -42367,8 +42528,8 @@ self: { servant-client tasty tasty-hunit temporary text ]; description = "A library for working with bitcoin-core regtest networks"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -42382,14 +42543,16 @@ self: { pname = "bitcoind-rpc"; version = "0.2.0.0"; sha256 = "0y5y5bdbhc1kcdk2nwjv2x5nz9vg5j38mc3l9pjyizz1s5yzn9rc"; + revision = "1"; + editedCabalFile = "0zg4ym032v3bzr24ap9afl05difcxgd4wwipbvfbjybka1dwwr97"; libraryHaskellDepends = [ aeson base base16-bytestring bitcoin-compact-filters bytestring cereal haskoin-core http-client scientific servant servant-client servant-jsonrpc-client text time transformers ]; description = "A streamlined interface to bitcoin core using Haskoin types and Servant"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -42405,8 +42568,8 @@ self: { base Bitly directory filepath regexpr ]; description = "A command line tool to access bit.ly URL shortener."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -42418,7 +42581,7 @@ self: { sha256 = "1flrfbrsnlcal7qyvl1wb0p8c14w0mvvkmgs7d943jqnlh4gay5m"; libraryHaskellDepends = [ base bytestring ]; description = "A library for handling and manipulating bitmaps (rectangular pixel arrays)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bitmap-opengl" = callPackage @@ -42429,7 +42592,7 @@ self: { sha256 = "1wq1p0vvif750gpyh2kq3agzwga3hx0fq28irbw5dgrz462dd9pv"; libraryHaskellDepends = [ base bitmap OpenGL ]; description = "OpenGL support for Data.Bitmap."; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bitmaps" = callPackage @@ -42445,8 +42608,8 @@ self: { stb-image string-class tagged zlib ]; description = "Bitmap library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -42464,7 +42627,7 @@ self: { libraryHaskellDepends = [ base bytes mtl transformers ]; testHaskellDepends = [ base doctest ]; description = "Various bit twiddling and bitwise serialization primitives"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bits-atomic" = callPackage @@ -42477,8 +42640,8 @@ self: { isExecutable = true; libraryHaskellDepends = [ base ]; description = "Atomic bit operations on memory locations for low-level synchronization"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -42494,7 +42657,7 @@ self: { testHaskellDepends = [ base bits bytestring hspec QuickCheck ]; benchmarkHaskellDepends = [ base bytestring criterion ]; description = "Bits instance for bytestrings"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bits-bytestring-lazy" = callPackage @@ -42511,7 +42674,7 @@ self: { base bits-bytestring bytestring criterion ]; description = "Bits instance for lazy bytestrings"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bits-conduit" = callPackage @@ -42528,8 +42691,8 @@ self: { base bytestring conduit criterion random ]; description = "Bitstream support for Conduit"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -42550,7 +42713,7 @@ self: { testToolDepends = [ doctest-discover hspec-discover ]; benchmarkHaskellDepends = [ base criterion ghc-prim vector ]; description = "Useful bitwise operations"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bits-extras" = callPackage @@ -42564,8 +42727,8 @@ self: { libraryHaskellDepends = [ base ]; librarySystemDepends = [ gcc_s ]; description = "Efficient high-level bit operations not found in Data.Bits"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {gcc_s = null;}; @@ -42588,8 +42751,8 @@ self: { ]; benchmarkSystemDepends = [ gmp ]; description = "A space-efficient set data structure"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) gmp;}; @@ -42614,7 +42777,7 @@ self: { th-lift-instances vector ]; description = "Space efficient set of Word8 and some pre-canned sets useful for parsing HTTP"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "bitspeak" = callPackage @@ -42633,7 +42796,7 @@ self: { executablePkgconfigDepends = [ gtk2 pango ]; description = "Proof-of-concept tool for writing using binary choices"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) gtk2; inherit (pkgs) pango;}; @@ -42652,7 +42815,7 @@ self: { base base-unicode-symbols bytestring QuickCheck vector ]; description = "Fast, packed, strict and lazy bit streams with stream fusion"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "bitstring" = callPackage @@ -42663,7 +42826,7 @@ self: { sha256 = "1ix2x4v76wq5148k1aax69cf8sk14cd0z362dz1d2qmj9qxsnsw8"; libraryHaskellDepends = [ base bytestring ]; description = "Lazy bit strings"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bittorrent" = callPackage @@ -42695,8 +42858,8 @@ self: { network QuickCheck quickcheck-instances text time ]; description = "Bittorrent protocol implementation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -42717,7 +42880,7 @@ self: { ]; executableHaskellDepends = [ base text turtle ]; description = "Bindings for the Bittrex API"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bitvec" = callPackage @@ -42741,7 +42904,7 @@ self: { base containers gauge integer-gmp random vector ]; description = "Space-efficient bit vectors"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) gmp;}; "bitvec_1_1_0_0" = callPackage @@ -42764,8 +42927,8 @@ self: { base containers gauge integer-gmp random vector ]; description = "Space-efficient bit vectors"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "bitwise" = callPackage @@ -42780,7 +42943,7 @@ self: { testHaskellDepends = [ base QuickCheck ]; benchmarkHaskellDepends = [ array base bytestring criterion ]; description = "fast multi-dimensional unboxed bit packed Bool arrays"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bitwise-enum" = callPackage @@ -42803,8 +42966,8 @@ self: { aeson array base deepseq gauge mono-traversable vector wide-word ]; description = "Bitwise operations on bounded enumerations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -42828,8 +42991,8 @@ self: { http-types microlens safe text time ]; description = "A Haskell library for working with the BitX bitcoin exchange"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -42845,8 +43008,8 @@ self: { base-noprelude containers directory regexpr text ]; description = "A lousy Prelude replacement by a lousy dude"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -42858,8 +43021,8 @@ self: { sha256 = "1wp1542cjcypz339f9b5qxcgf1ppilbxgi8861s5d9p89zrgimij"; libraryHaskellDepends = [ base containers text ]; description = "A lousy Prelude replacement by a lousy dude"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -42871,7 +43034,7 @@ self: { sha256 = "0av4gkh2vr9righ26hbagh8j30i8k4sp3af98lmwm5gf81vs5az4"; libraryHaskellDepends = [ base containers ]; description = "BK-tree implementation"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "bkr" = callPackage @@ -42894,8 +43057,8 @@ self: { http-conduit MissingH pureMD5 random strict text unix utf8-string ]; description = "Backup utility for backing up to cloud storage services (S3 only right now)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -42907,7 +43070,7 @@ self: { sha256 = "1d2iz48n0ayn0hi9xa110pxy1mv5a4m21rmbpvs6ki1a7cv4ghn9"; libraryHaskellDepends = [ array base containers ]; description = "A set data structure with approximate searching"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bla" = callPackage @@ -42921,8 +43084,8 @@ self: { enableSeparateDataOutput = true; executableHaskellDepends = [ base haskell98 unix ]; description = "a stupid cron"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -42943,7 +43106,7 @@ self: { ]; testHaskellDepends = [ base QuickCheck ]; description = "The pirate bay client"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "blacktip" = callPackage @@ -42964,7 +43127,7 @@ self: { async base criterion network-info time ]; description = "Decentralized, k-ordered unique ID generator"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "blake2" = callPackage @@ -42982,7 +43145,7 @@ self: { ]; benchmarkHaskellDepends = [ base bytestring criterion ]; description = "A library providing BLAKE2"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "blake3" = callPackage @@ -42994,7 +43157,7 @@ self: { libraryHaskellDepends = [ base memory ]; testHaskellDepends = [ base memory tasty tasty-hunit ]; description = "BLAKE3 hashing algorithm"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "blakesum" = callPackage @@ -43005,8 +43168,8 @@ self: { sha256 = "15k3vf9jqcw1a9gyppkhn5ibj7ld8mb2irfhbwd3plj86xyxxa0g"; libraryHaskellDepends = [ base bytestring text vector ]; description = "The BLAKE SHA-3 candidate hashes, in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -43024,8 +43187,8 @@ self: { base blakesum bytestring haskell98 text vector ]; description = "The BLAKE SHA-3 candidate hashes, in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -43040,8 +43203,8 @@ self: { pname = "blank-canvas"; version = "0.7.3"; sha256 = "1g10959ly5nv2xfhax4pamzxnxkqbniahplc5za8k5r4nq1vjrm2"; - revision = "1"; - editedCabalFile = "0ji3z1582rhflcdi49hd83mkwkyz432h1b1vvhyfgq9ccckmwp2p"; + revision = "2"; + editedCabalFile = "00nv87d38agrnqp1bhlk5id78r23k2fk7pqnar1lzg2wr39b1mvi"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base base-compat-batteries base64-bytestring bytestring @@ -43050,7 +43213,7 @@ self: { wai wai-extra warp ]; description = "HTML5 Canvas Graphics Library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "blanks" = callPackage @@ -43069,7 +43232,7 @@ self: { tasty tasty-hunit text ]; description = "Fill-in-the-blanks - A library factoring out substitution from ASTs"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "blas" = callPackage @@ -43080,8 +43243,8 @@ self: { sha256 = "1q6fkw2bsppymy5wi7mgkl09caij52xplw64786548z9i95r0bli"; libraryHaskellDepends = [ base ieee QuickCheck storable-complex ]; description = "Bindings to the BLAS library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -43098,7 +43261,7 @@ self: { transformers ]; description = "Auto-generated interface to Fortran BLAS via CArrays"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "blas-comfort-array" = callPackage @@ -43114,7 +43277,7 @@ self: { storable-complex transformers ]; description = "Auto-generated interface to Fortran BLAS via comfort-array"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "blas-ffi" = callPackage @@ -43128,7 +43291,7 @@ self: { libraryHaskellDepends = [ base netlib-ffi ]; libraryPkgconfigDepends = [ blas ]; description = "Auto-generated interface to Fortran BLAS"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) blas;}; "blas-hs" = callPackage @@ -43141,7 +43304,7 @@ self: { librarySystemDepends = [ blas ]; testHaskellDepends = [ base vector ]; description = "Low-level Haskell bindings to Blas"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {inherit (pkgs) blas;}; "blastxml" = callPackage @@ -43155,7 +43318,7 @@ self: { ]; description = "Library for reading Blast XML output"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -43173,8 +43336,8 @@ self: { base blaze-html dates directory HaTeX process split tagsoup text ]; description = "Blog in LaTeX"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -43186,7 +43349,7 @@ self: { sha256 = "01n6cw3fjmlj5pmdy122ch4kbf6srvwlz356rr6nxfrm0ndcxp38"; doHaddock = false; description = "None"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "blaze-bootstrap" = callPackage @@ -43197,7 +43360,7 @@ self: { sha256 = "0qsis1hwd8sqcciibxwy8p6irszwa2fy5m75qxp46ymfal5lrdak"; libraryHaskellDepends = [ base blaze-html text ]; description = "Blaze helper functions for bootstrap pages"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "blaze-builder" = callPackage @@ -43207,17 +43370,15 @@ self: { }: mkDerivation { pname = "blaze-builder"; - version = "0.4.1.0"; - sha256 = "05681dih2d8s96an945wkbwl05w8ddbcfx8n3r3ck79ydyb8pz4i"; - revision = "1"; - editedCabalFile = "1p66mh9z3aqgind755xzf39pvl2hwjnwrlwiwyj653yzb1gn6c9j"; + version = "0.4.2.1"; + sha256 = "01hbx82djckj2x74sk9kc79111djq7f2af3zl5i21y9zkjy8js3f"; libraryHaskellDepends = [ base bytestring deepseq text ]; testHaskellDepends = [ base bytestring HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 text utf8-string ]; description = "Efficient buffered output"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "blaze-builder-conduit" = callPackage @@ -43229,7 +43390,7 @@ self: { libraryHaskellDepends = [ base conduit ]; doHaddock = false; description = "Convert streams of builders to streams of bytestrings. (deprecated)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "blaze-builder-enumerator" = callPackage @@ -43247,8 +43408,8 @@ self: { streaming-commons transformers ]; description = "Enumeratees for the incremental conversion of builders to bytestrings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -43267,8 +43428,8 @@ self: { ]; testHaskellDepends = [ base colonnade doctest ]; description = "blaze-html backend for colonnade"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -43284,7 +43445,7 @@ self: { base containers directory filepath tagsoup ]; description = "Tool to convert HTML to BlazeHtml code"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "blaze-html" = callPackage @@ -43305,7 +43466,7 @@ self: { test-framework-quickcheck2 text ]; description = "A blazingly fast HTML combinator library for Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "blaze-html-contrib" = callPackage @@ -43320,8 +43481,8 @@ self: { base blaze-html cgi data-default network safe text ]; description = "Some contributions to add handy things to blaze html"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -43333,8 +43494,8 @@ self: { sha256 = "11bw5ywvi7dlz5inch3z0vlg936ch1rnp99bh4nmwskvszidd7kg"; libraryHaskellDepends = [ base blaze-html bytestring hexpat text ]; description = "A hexpat backend for blaze-html"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -43350,8 +43511,8 @@ self: { base blaze-markup bytestring html-truncate tagsoup text ]; description = "A truncator for blaze-html"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -43373,8 +43534,8 @@ self: { text unordered-containers vector ]; description = "tiny library for encoding json"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -43392,7 +43553,7 @@ self: { tasty-hunit tasty-quickcheck text ]; description = "A blazingly fast markup combinator library for Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "blaze-shields" = callPackage @@ -43405,7 +43566,7 @@ self: { base blaze-html blaze-markup blaze-svg text ]; description = "create svg by Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "blaze-svg" = callPackage @@ -43416,7 +43577,7 @@ self: { sha256 = "0q5a4wam0sidng0cfsivwkyph9snyilk7rsdx4vb6wz9l6xz397n"; libraryHaskellDepends = [ base blaze-markup mtl ]; description = "SVG combinator library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "blaze-textual" = callPackage @@ -43437,7 +43598,7 @@ self: { test-framework test-framework-quickcheck2 ]; description = "Fast rendering of common datatypes"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "blaze-textual-native" = callPackage @@ -43453,8 +43614,8 @@ self: { time vector ]; description = "Fast rendering of common datatypes (deprecated)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -43466,7 +43627,7 @@ self: { sha256 = "03gx3ylxz7xa86ngi33dm347ni6a4mcq4fizlx3majpfdk5fs38c"; libraryHaskellDepends = [ base blaze-html blaze-markup ]; description = "..."; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "blazeT" = callPackage @@ -43483,8 +43644,8 @@ self: { transformers ]; description = "A true monad (transformer) version of the blaze-markup and blaze-html libraries"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -43516,8 +43677,8 @@ self: { quickcheck-instances random text transformers uuid ]; description = "Bluetooth Low Energy (BLE) peripherals"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -43533,7 +43694,7 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "Password entry tool"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "blink1" = callPackage @@ -43551,8 +43712,8 @@ self: { base bytestring text unix usb vector ]; description = "Control library for blink(1) LED from ThingM"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -43571,8 +43732,8 @@ self: { old-time parseargs pretty ]; description = "Python to bytecode compiler"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -43588,8 +43749,8 @@ self: { base binary bytestring containers mtl pretty utf8-string ]; description = "Support code for Blip"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -43613,8 +43774,8 @@ self: { text time transformers unordered-containers ]; description = "Generic blockchain implementation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -43636,8 +43797,8 @@ self: { ]; testHaskellDepends = [ base ]; description = "Blockhash perceptual image hash algorithm"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -43649,7 +43810,7 @@ self: { sha256 = "00xlj503h6073f9sk7a1p2b66nw2lryyvxxbawwz030mjdb6hgps"; libraryHaskellDepends = [ base containers parallel ]; description = "Composable, blocking transactions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "blogination" = callPackage @@ -43670,8 +43831,8 @@ self: { ]; executableHaskellDepends = [ base ConfigFile haskell98 old-time ]; description = "Very simple static blog software"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -43700,8 +43861,8 @@ self: { unix-compat unordered-containers vector ]; description = "Elasticsearch client library for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -43724,8 +43885,8 @@ self: { http-client-tls lens retry tasty tasty-hunit text time ]; description = "Adds convenient Amazon ElasticSearch Service authentication to Bloodhound"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -43743,7 +43904,7 @@ self: { test-framework-quickcheck2 ]; description = "Pure and impure Bloom Filter implementations"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bloomfilter-redis" = callPackage @@ -43764,8 +43925,8 @@ self: { ]; benchmarkHaskellDepends = [ base criterion random ]; description = "Distributed bloom filters on Redis (using the Hedis client)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -43787,8 +43948,8 @@ self: { text ]; description = "BLOSUM generator"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -43804,7 +43965,7 @@ self: { executableHaskellDepends = [ base GLFW OpenGL ]; description = "OpenGL Logic Game"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -43822,8 +43983,8 @@ self: { base blubber-server bytestring cereal containers gloss network unix ]; description = "The blubber client; connects to the blubber server"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -43845,8 +44006,8 @@ self: { process random scotty text transformers unix ]; description = "The blubber server, serves blubber clients"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.agpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -43873,7 +44034,7 @@ self: { base data-default deepseq hspec mtl QuickCheck time ]; description = "Configurable blue light filter"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXrandr;}; "bludigon" = callPackage @@ -43899,7 +44060,7 @@ self: { base data-default deepseq hspec mtl QuickCheck time ]; description = "Configurable blue light filter"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXrandr;}; "bluemix-sdk" = callPackage @@ -43914,7 +44075,7 @@ self: { aeson base bytestring http-client http-types text vector ]; description = "Bindings to Bluemix APIs"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bluetile" = callPackage @@ -43936,8 +44097,8 @@ self: { ]; executablePkgconfigDepends = [ gtk2 ]; description = "full-featured tiling for the GNOME desktop environment"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) gtk2;}; @@ -43951,8 +44112,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base gtk ]; description = "Utilities for Bluetile"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -43968,8 +44129,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base ]; description = "spam"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -43991,8 +44152,8 @@ self: { ]; executableHaskellDepends = [ base ]; description = "Convert between pointfree and pointful expressions"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -44004,7 +44165,7 @@ self: { sha256 = "1k6s5z520dadj38y7ja0m4syrg094gyq14c63i6wx2701zj3viiw"; libraryHaskellDepends = [ base binary bytestring ]; description = "Read and write uncompressed BMP image files"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "bno055-haskell" = callPackage @@ -44017,8 +44178,8 @@ self: { base bytestring cereal h2c mtl resourcet ]; description = "Library for communication with the Bosch BNO055 orientation sensor"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -44070,7 +44231,7 @@ self: { transformers unix ]; description = "Copy a directory tree, making zero-size sparse copies of big files"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }) {}; "bogre-banana" = callPackage @@ -44087,8 +44248,8 @@ self: { base hogre hois monad-control random reactive-banana ]; executableHaskellDepends = [ base hogre hois random ]; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -44117,8 +44278,8 @@ self: { ]; testToolDepends = [ tasty-discover ]; description = "Generate Haskell boilerplate"; - license = stdenv.lib.licenses.gpl3Plus; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -44142,8 +44303,8 @@ self: { unordered-containers vector ]; description = "Bolt driver for Neo4j"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -44169,8 +44330,8 @@ self: { aeson base bytestring containers directory filepath megaparsec text ]; description = "Analytic sampler compiler for combinatorial systems"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -44188,7 +44349,7 @@ self: { QuickCheck transformers unordered-containers vector ]; description = "Uniform random generators"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "bond" = callPackage @@ -44221,8 +44382,8 @@ self: { tasty-golden tasty-hunit tasty-quickcheck text unordered-containers ]; description = "Bond schema compiler and code generator"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -44251,8 +44412,8 @@ self: { base bytestring criterion filepath vector ]; description = "Runtime support for BOND serialization"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -44274,8 +44435,8 @@ self: { ]; testHaskellDepends = [ base ]; description = "Bond code generator for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -44303,8 +44464,8 @@ self: { base criterion data-default-class type-level-sets ]; description = "Anonymous records and overloaded labels"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -44316,8 +44477,8 @@ self: { sha256 = "1d3wzj4nh8f436wfqhdlhrpxhrrhqh97wrfyykm26bnngy4kdsk6"; libraryHaskellDepends = [ base bookkeeper type-level-sets ]; description = "Permissions for bookkeeper records"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -44334,7 +44495,7 @@ self: { ]; testHaskellDepends = [ base doctest Glob ]; description = "A module for bookkeeping by double entry"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "bookkeeping-jp" = callPackage @@ -44350,7 +44511,7 @@ self: { ]; testHaskellDepends = [ base doctest Glob ]; description = "Helper functions for Japanese bookkeeping"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "bool-extras" = callPackage @@ -44361,7 +44522,7 @@ self: { sha256 = "008m43f04ncx2c24c241gzwjyyglw8rwpq2gsakqkw0nwz3czs61"; libraryHaskellDepends = [ base ]; description = "A fold function for Bool"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bool8" = callPackage @@ -44372,7 +44533,7 @@ self: { sha256 = "0hrh3sh19hjdjjm5g1xwvhkf8l13qdrdrxvnylh8sn3d54krhixw"; libraryHaskellDepends = [ base ]; description = "Alternative Bool type stored as byte"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "boolean-like" = callPackage @@ -44387,7 +44548,7 @@ self: { attoparsec base bytestring containers semigroups text vector ]; description = "Logical combinatory operations dealing with datatypes representing booleans by their constructors"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "boolean-list" = callPackage @@ -44398,7 +44559,7 @@ self: { sha256 = "1vqn1igmsgq6nry9bpz5vhggbm3j8kc3p6d6wy16nf94z10nq3qs"; libraryHaskellDepends = [ base bytestring HUnit ]; description = "convert numbers to binary coded lists"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "boolean-normal-forms" = callPackage @@ -44414,8 +44575,8 @@ self: { base cond containers QuickCheck tasty tasty-quickcheck ]; description = "Boolean normal form: NNF, DNF & CNF"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -44435,8 +44596,8 @@ self: { testHaskellDepends = [ base ]; testSystemDepends = [ boolector ]; description = "Haskell bindings for the Boolector SMT solver"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) boolector;}; "boolexpr" = callPackage @@ -44447,8 +44608,8 @@ self: { sha256 = "14v894clplpcc1visqn337p7vmacj5hgx41vr60pwvflmv98d8xn"; libraryHaskellDepends = [ base parsec ]; description = "Boolean expressions with various representations and search queries"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -44460,7 +44621,7 @@ self: { sha256 = "0057303m23p81v60jcsc3p7n2rs2rzrvbg5m18pc0fk95q2q2rim"; doHaddock = false; description = "None"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "boolsimplifier" = callPackage @@ -44473,7 +44634,7 @@ self: { editedCabalFile = "0xqm0vn9i49b75fnvnvcnr9m4zwvhqynrkcjdxghrsxayg420lnh"; libraryHaskellDepends = [ base containers ]; description = "Simplification tools for simple propositional formulas"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "boomange" = callPackage @@ -44491,7 +44652,7 @@ self: { base containers descrilo directory filepath simtreelo ]; description = "A bookmarks manager with an HTML generator"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "boombox" = callPackage @@ -44506,8 +44667,8 @@ self: { base bytestring comonad semigroupoids semigroups transformers ]; description = "Chronokinetic stream sources and incremental consumers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -44521,7 +44682,7 @@ self: { base mtl semigroups template-haskell text ]; description = "Library for invertible parsing and printing"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "boomslang" = callPackage @@ -44540,8 +44701,8 @@ self: { font-opengl-basic4x6 GLFW-b MonadRandom mtl OpenGL ]; description = "Boomshine clone"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -44554,7 +44715,7 @@ self: { libraryHaskellDepends = [ base mtl text ]; testHaskellDepends = [ base ]; description = "OOP primitives for Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "boopadoop" = callPackage @@ -44577,8 +44738,8 @@ self: { base bytestring containers primes semialign split vector WAVE ]; description = "Mathematically sound sound synthesis"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -44591,7 +44752,7 @@ self: { libraryHaskellDepends = [ base exceptions mtl ]; testHaskellDepends = [ base exceptions hspec mtl ]; description = "IoC Monad in Haskell"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "boots-app" = callPackage @@ -44615,8 +44776,8 @@ self: { ]; executableHaskellDepends = [ base time ]; description = "Factory for quickly building an application"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -44634,8 +44795,8 @@ self: { servant servant-client text unordered-containers ]; description = "Factory for quickly building a microservice"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -44655,8 +44816,8 @@ self: { servant-swagger swagger2 text unordered-containers vault wai warp ]; description = "Factory for quickly building a web application"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -44668,7 +44829,7 @@ self: { sha256 = "19dm3l8v8ggllpgvq20avna6wph6i2w50aabxynvw4kw9m6c3c44"; libraryHaskellDepends = [ base text ]; description = "Bootstrap CSS Framework type-safe interface"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "bordacount" = callPackage @@ -44680,7 +44841,7 @@ self: { libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "Implementation of the Borda count election method"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "borel" = callPackage @@ -44711,8 +44872,8 @@ self: { zeromq4-haskell ]; description = "Metering System for OpenStack metrics provided by Vaultaire"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -44733,7 +44894,7 @@ self: { vec ]; description = "Boring and Absurd types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "boring-game" = callPackage @@ -44748,7 +44909,7 @@ self: { executableHaskellDepends = [ base gloss ]; testHaskellDepends = [ base ]; description = "An educational game"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "boring-window-switcher" = callPackage @@ -44762,8 +44923,8 @@ self: { libraryHaskellDepends = [ base gtk transformers X11 ]; executableHaskellDepends = [ base ]; description = "A boring window switcher"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -44775,8 +44936,8 @@ self: { sha256 = "0crs1c6v298zqkjzkdgicigx22gvp9xv7bjlynbyckvx0lrvfmrc"; libraryHaskellDepends = [ arrows base Stream ]; description = "bots for functional reactive programming"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -44788,7 +44949,7 @@ self: { sha256 = "0kdqz901fpdgggmkm9rpnpv7gma9c8d887bszhnz6xd3v96gg7xn"; libraryHaskellDepends = [ base semigroups zero ]; description = "Like Maybe, but with a different Monoid instance"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "botpp" = callPackage @@ -44802,7 +44963,7 @@ self: { libraryHaskellDepends = [ base bytestring ]; description = "Build tool for Lambdabot"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -44828,7 +44989,7 @@ self: { transformers-compat vector void ]; description = "Making de Bruijn Succ Less"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bound-extras" = callPackage @@ -44850,7 +45011,7 @@ self: { transformers utf8-string ]; description = "ScopeH and ScopeT extras for bound"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bound-gen" = callPackage @@ -44861,7 +45022,7 @@ self: { sha256 = "1il4vb497d0195mhvra5djkn3mbdzd8dmcnffpqh1pv1pj8n8hwp"; libraryHaskellDepends = [ base bound monad-gen mtl ]; description = "Unwrap Scope's with globally fresh values"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "bounded-array" = callPackage @@ -44872,8 +45033,8 @@ self: { sha256 = "0zv5a82rm6hwikgls2hw9d18igvfgw655s5pw5h1xbwcv1d8d0ji"; libraryHaskellDepends = [ array base ]; description = "Arrays with a value for every index"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -44886,7 +45047,7 @@ self: { libraryHaskellDepends = [ base containers deepseq ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "A strict, immutable, thread-safe, single-ended, bounded queue"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bounded-tchan" = callPackage @@ -44897,7 +45058,7 @@ self: { sha256 = "12c78dz3y1ly05hckd9pf0j4fpknk383qyb5yrhps4sc2m3i9k9w"; libraryHaskellDepends = [ base stm ]; description = "Bounded Transactional channels (queues)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "boundingboxes" = callPackage @@ -44908,7 +45069,7 @@ self: { sha256 = "0r3mffqxqadn8qklq3kr0ggirkficfj8ic1fxgki2zrc5jm4f2g8"; libraryHaskellDepends = [ base lens ]; description = "A generic boundingbox for an arbitrary vector"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bower-json" = callPackage @@ -44928,7 +45089,7 @@ self: { aeson base bytestring tasty tasty-hunit text unordered-containers ]; description = "Read bower.json from Haskell"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "bowntz" = callPackage @@ -44943,13 +45104,13 @@ self: { base containers GLUT hosc hsc3 random ]; description = "audio-visual pseudo-physical simulation of colliding circles"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; "box" = callPackage - ({ mkDerivation, attoparsec, base, comonad, concurrency + ({ mkDerivation, attoparsec, base, comonad, concurrency, containers , contravariant, dejafu, doctest, exceptions, generic-lens, lens , mmorph, mtl, numhask, numhask-space, optparse-generic , profunctors, random, text, time, transformers, transformers-base @@ -44957,23 +45118,23 @@ self: { }: mkDerivation { pname = "box"; - version = "0.6.2"; - sha256 = "1mwmz97s8mvan8fn8ps0gnzsidar1ygjfkgrcjglfklh5bmm8823"; + version = "0.6.3"; + sha256 = "1qdl8n9icp8v8hpk4jd3gsg8wrr469q4y6h6p1h6n6f899rwpv5c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - attoparsec base comonad concurrency contravariant exceptions lens - mmorph numhask numhask-space profunctors text time transformers - transformers-base + attoparsec base comonad concurrency containers contravariant + exceptions lens mmorph numhask numhask-space profunctors text time + transformers transformers-base ]; executableHaskellDepends = [ - base concurrency dejafu exceptions generic-lens lens mtl numhask - optparse-generic random text transformers websockets + base concurrency containers dejafu exceptions generic-lens lens mtl + numhask optparse-generic random text transformers websockets ]; testHaskellDepends = [ base doctest numhask ]; description = "boxes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -44990,8 +45151,8 @@ self: { ]; testHaskellDepends = [ base doctest numhask ]; description = "See readme.md"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -45015,8 +45176,8 @@ self: { ]; testHaskellDepends = [ base doctest numhask ]; description = "Box websockets"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -45028,7 +45189,7 @@ self: { sha256 = "12a3jj3z1gni8925n16ipqyah8vg244lx88v289f2rldiyvh3bvf"; libraryHaskellDepends = [ base ghc-prim ]; description = "A hack to use GHC.Prim primitives in GHCi"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "boxes" = callPackage @@ -45040,7 +45201,7 @@ self: { libraryHaskellDepends = [ base split ]; testHaskellDepends = [ base QuickCheck split ]; description = "2D text pretty-printing library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bpann" = callPackage @@ -45051,7 +45212,7 @@ self: { sha256 = "02c8xyzs4kz9cx7ql48kq5cxf686vvd5mqrprkikynif9r4dk7w8"; libraryHaskellDepends = [ base random split ]; description = "backpropagation neuronal network"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bpath" = callPackage @@ -45068,7 +45229,7 @@ self: { ]; testHaskellDepends = [ base ]; description = "A minimal typed unix path library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "braid" = callPackage @@ -45090,8 +45251,8 @@ self: { diagrams-svg split ]; description = "Types and functions to work with braids and Khovanov homology"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -45105,8 +45266,8 @@ self: { isExecutable = true; executableHaskellDepends = [ array base containers parsec ]; description = "primitive imperative language"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -45132,7 +45293,7 @@ self: { sha256 = "1c1xg56dh0qbiy7jga436pmp8x8rhkkpf3gb54kqg8asajswdh0s"; libraryHaskellDepends = [ base directory process ]; description = "BrainFuck monad"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "brainfuck-tut" = callPackage @@ -45146,7 +45307,7 @@ self: { libraryHaskellDepends = [ array base ]; executableHaskellDepends = [ array base ]; description = "A simple BF interpreter"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "brainheck" = callPackage @@ -45165,7 +45326,7 @@ self: { executableHaskellDepends = [ base optparse-applicative text ]; benchmarkHaskellDepends = [ base criterion text ]; description = "Brainh*ck interpreter in haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "break" = callPackage @@ -45176,7 +45337,7 @@ self: { sha256 = "0wpj29a8lpimb0mjif4f6jmx6q9pkpkn5xplmkbjzkqgxi0bp23n"; libraryHaskellDepends = [ base mtl transformers ]; description = "Break from a loop"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "breakout" = callPackage @@ -45190,7 +45351,7 @@ self: { executableHaskellDepends = [ base haskgame mtl SDL ]; description = "A simple Breakout game implementation"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -45214,8 +45375,8 @@ self: { warp-tls ]; description = "a url shortener"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -45229,8 +45390,8 @@ self: { isExecutable = true; executableHaskellDepends = [ array base parallel random SDL ]; description = "A Haskell implementation of the Brian's Brain cellular automaton"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -45243,8 +45404,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.58.1"; - sha256 = "0qsmj4469avxmbh7210msjwvz7fa98axxvf7198x0hb2y7vdpcz5"; + version = "0.59"; + sha256 = "1nkx7b6688ba0h8kw8xzqamj9zpdjyrdpmg8h18v3l03hw5jcszf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -45257,7 +45418,7 @@ self: { base containers microlens QuickCheck vector ]; description = "A declarative terminal user interface library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "brick-dropdownmenu" = callPackage @@ -45275,8 +45436,8 @@ self: { pointedlist vector vty ]; description = "A drop-down menu widget for brick"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -45296,7 +45457,7 @@ self: { base brick comonad containers directory directory-tree filepath free vector vty ]; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "brick-skylighting" = callPackage @@ -45313,7 +45474,7 @@ self: { base brick containers skylighting-core text vty ]; description = "Show syntax-highlighted text in your Brick UI"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bricks" = callPackage @@ -45336,8 +45497,8 @@ self: { parsec template-haskell text transformers ]; description = "Bricks is a lazy functional language based on Nix"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -45356,8 +45517,8 @@ self: { base containers doctest either-list-functions text ]; description = "..."; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -45373,8 +45534,8 @@ self: { base bricks-internal containers hedgehog template-haskell text ]; description = "..."; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -45395,8 +45556,8 @@ self: { bricks-syntax containers doctest hedgehog parsec text ]; description = "..."; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -45417,8 +45578,8 @@ self: { doctest hedgehog template-haskell text ]; description = "..."; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -45439,8 +45600,8 @@ self: { exceptions hint text ]; description = "..."; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -45461,8 +45622,8 @@ self: { base binary cmdargs containers directory filepath text ]; description = "Simple part of speech tagger"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -45495,8 +45656,8 @@ self: { yaml ]; description = "Haskell source code formatter"; - license = stdenv.lib.licenses.agpl3; - maintainers = with stdenv.lib.maintainers; [ maralorn ]; + license = lib.licenses.agpl3; + maintainers = with lib.maintainers; [ maralorn ]; }) {}; "broadcast-chan" = callPackage @@ -45512,7 +45673,7 @@ self: { libraryHaskellDepends = [ base transformers unliftio-core ]; benchmarkHaskellDepends = [ async base criterion deepseq stm ]; description = "Closable, fair, single-wakeup channel type that avoids 0 reader space leaks"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "broadcast-chan-conduit" = callPackage @@ -45532,7 +45693,7 @@ self: { base broadcast-chan-tests conduit containers ]; description = "Conduit-based parallel streaming code for broadcast-chan"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "broadcast-chan-pipes" = callPackage @@ -45550,7 +45711,7 @@ self: { base broadcast-chan-tests containers foldl pipes pipes-safe ]; description = "Pipes-based parallel streaming code for broadcast-chan"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "broadcast-chan-tests" = callPackage @@ -45574,7 +45735,7 @@ self: { base broadcast-chan containers foldl monad-loops random ]; description = "Helpers for generating tests for broadcast-chan"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "broccoli" = callPackage @@ -45585,8 +45746,8 @@ self: { sha256 = "084nil9rfs3xpp4rk3qlwf6gsaljm57g7divfzd88dk9np6q5iwh"; libraryHaskellDepends = [ base containers stm time ]; description = "Small library for interactive functional programs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -45614,8 +45775,8 @@ self: { ]; testToolDepends = [ tasty-discover ]; description = "Finds broken links in text files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -45629,8 +45790,8 @@ self: { librarySystemDepends = [ broker ]; testHaskellDepends = [ base bytestring hspec ]; description = "Haskell bindings to Broker, Bro's messaging library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {broker = null;}; @@ -45648,8 +45809,8 @@ self: { aeson base bytestring network-uri text time tz uuid-types ]; description = "Common types and URIs for the BronyRadioGermany API bindings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -45670,8 +45831,8 @@ self: { time uuid ]; description = "Streaming interface for the BronyRadioGermany API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -45691,8 +45852,8 @@ self: { base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck ]; description = "Brotli (RFC7932) compression and decompression"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) brotli;}; @@ -45713,8 +45874,8 @@ self: { test-framework-hunit test-framework-quickcheck2 ]; description = "Conduit interface for Brotli (RFC7932) compression"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -45735,8 +45896,8 @@ self: { test-framework-hunit test-framework-quickcheck2 ]; description = "IO-Streams interface for Brotli (RFC7932) compression"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -45753,8 +45914,8 @@ self: { unordered-containers wreq ]; description = "A reader and interface for the Browser Capabilities Project data files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -45778,7 +45939,7 @@ self: { base blaze-builder bytestring deepseq gauge semigroups ]; description = "Chunked HTTP transfer encoding for bytestring builders"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bsd-sysctl" = callPackage @@ -45789,8 +45950,8 @@ self: { sha256 = "0wflh3ncd47j2v70m6lbdmaif974fimv3dd4wyj6krb03vq6lvpd"; libraryHaskellDepends = [ base ]; description = "Access to the BSD sysctl(3) interface"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -45812,8 +45973,8 @@ self: { test-framework-quickcheck2 text time ]; description = "BSON documents are JSON-like objects with a standard binary encoding"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -45825,8 +45986,8 @@ self: { sha256 = "11a8k6rngz5rdgccwnifiydsfc87hlgy4mp6chi30m2jvdq92imb"; libraryHaskellDepends = [ base bson ghc-prim text ]; description = "Generic functionality for BSON"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -45838,8 +45999,8 @@ self: { sha256 = "03ifgmifk0dx6fzws1qlx3c1nslrkvwman5g3c4iag842bl03gxp"; libraryHaskellDepends = [ base bson ghc-prim ]; description = "Generics functionality for BSON"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -45851,8 +46012,8 @@ self: { sha256 = "0q5ixrfgybf80q0x2p80qjy1kqarm2129hmzzqgcpn7jvqbv8fyp"; libraryHaskellDepends = [ base bson lens text ]; description = "BSON lenses"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -45867,7 +46028,7 @@ self: { ]; description = "Mapping between BSON and algebraic data types"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "bspack" = callPackage @@ -45886,7 +46047,7 @@ self: { base blaze-builder bytestring criterion sandi ]; description = "A simple and fast bytestring packer"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bsparse" = callPackage @@ -45899,8 +46060,8 @@ self: { editedCabalFile = "0vlcwcgmlk4ghwhiyy4234driyvq5ap5g587nmf23fh8b54g7j3q"; libraryHaskellDepends = [ base bytestring ]; description = "A simple unassuming parser for bytestring"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -45920,8 +46081,8 @@ self: { ]; benchmarkHaskellDepends = [ base clock ghc-prim hashable ]; description = "B-Tree on Unmanaged Heap"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -45945,7 +46106,7 @@ self: { ]; description = "A backend agnostic, concurrent BTree"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -45959,7 +46120,7 @@ self: { isExecutable = true; libraryHaskellDepends = [ base bytestring time unix ]; description = "Bindings to the btrfs API"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "buchhaltung" = callPackage @@ -45997,8 +46158,8 @@ self: { text time transformers unordered-containers vector yaml ]; description = "Automates most of your plain text accounting data entry in ledger format"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -46020,8 +46181,8 @@ self: { ]; benchmarkHaskellDepends = [ bug criterion rerebase ]; description = "Simple mutable low-level buffer for IO"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -46046,8 +46207,8 @@ self: { text vector ]; description = "Library for efficiently building up buffers, one piece at a time"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -46076,8 +46237,8 @@ self: { aeson base buffer-builder bytestring criterion deepseq text vector ]; description = "Serialize Aeson values with Data.BufferBuilder"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -46091,7 +46252,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base ]; description = "Read from stdin and write to stdout in large blocks"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "buffet" = callPackage @@ -46120,8 +46281,8 @@ self: { ]; doHaddock = false; description = "Assembles many Dockerfiles in one"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -46138,8 +46299,8 @@ self: { transformers ]; description = "An implementation of Buffon machines"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -46153,7 +46314,7 @@ self: { base mtl multiset random template-haskell ]; description = "Perfect simulation of discrete random variables"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bug" = callPackage @@ -46164,7 +46325,7 @@ self: { sha256 = "1xfynvp5fyn46gg3p5qq9cmb1dnw2dyf3bz6w5wdvikfvs19dwhq"; libraryHaskellDepends = [ base template-haskell ]; description = "Better alternatives to the \"error\" function"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "bugsnag-haskell" = callPackage @@ -46189,8 +46350,8 @@ self: { aeson aeson-qq base doctest hspec text time unliftio yaml ]; description = "Bugsnag error reporter for Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -46208,7 +46369,7 @@ self: { ]; testHaskellDepends = [ aeson base bytestring hedgehog ]; description = "A Bugsnag client for Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bugzilla" = callPackage @@ -46228,8 +46389,8 @@ self: { time transformers unordered-containers vector ]; description = "A Haskell interface to the Bugzilla native REST API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -46252,7 +46413,7 @@ self: { transformers unordered-containers vector ]; description = "A Haskell interface to the Bugzilla native REST API"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "build" = callPackage @@ -46269,8 +46430,8 @@ self: { ]; testHaskellDepends = [ base containers extra mtl transformers ]; description = "Build systems a la carte"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -46282,8 +46443,8 @@ self: { sha256 = "1jrvgm2k6m8k9hj7h727pf357zydmhq1ndl1z39ag6294xd2rgpx"; libraryHaskellDepends = [ base bytestring containers dlist text ]; description = "Typeclass for builders of linear data structures"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -46300,8 +46461,8 @@ self: { process stm temporary text time ]; description = "Rehackable components for writing buildbots and test harnesses"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -46315,8 +46476,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base buildbox parseargs ]; description = "Tools for working with buildbox benchmark result files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -46331,8 +46492,8 @@ self: { base byte-order primitive primitive-unaligned ]; description = "bounded ByteArray builder type"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -46370,8 +46531,8 @@ self: { vector ]; description = "A library and an executable that provide an easy API for a Haskell IDE"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -46385,8 +46546,8 @@ self: { libraryPkgconfigDepends = [ bullet ]; libraryToolDepends = [ c2hs ]; description = "A wrapper for the Bullet physics engine"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) bullet;}; @@ -46424,8 +46585,8 @@ self: { tasty-hunit tasty-quickcheck text ]; description = "Bulletproofs are short zero-knowledge proofs without a trusted setup"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -46450,8 +46611,8 @@ self: { reflex-dom-helpers text time witherable ]; description = "Reflex infused with bulma (css)"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -46471,8 +46632,8 @@ self: { base Cabal containers fclabels process regex-compat split strict ]; description = "Automatically bump package versions, also transitively"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -46488,8 +46649,8 @@ self: { executableHaskellDepends = [ base cmdargs text unix ]; testHaskellDepends = [ base doctest hspec ]; description = "CLI tool to beautify JSON string"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -46507,8 +46668,8 @@ self: { aeson base bitcoin-script bytestring cassava process scientific ]; description = "List OP_RETURN cryptocurrency transaction outputs"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -46526,7 +46687,7 @@ self: { ]; testHaskellDepends = [ base containers hspec QuickCheck text ]; description = "Parse and render URI templates"; - license = stdenv.lib.licenses.isc; + license = lib.licenses.isc; }) {}; "burst-detection" = callPackage @@ -46539,8 +46700,8 @@ self: { testHaskellDepends = [ base ]; benchmarkHaskellDepends = [ base criterion ]; description = "Burst detection algorithms"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -46557,8 +46718,8 @@ self: { base bytestring errors serialport transformers ]; description = "Haskell interface to the Bus Pirate binary interface"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -46575,8 +46736,8 @@ self: { pretty time ]; description = "Almost but not quite entirely unlike FRP"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -46593,8 +46754,8 @@ self: { parsec pretty time ]; description = "Almost but not quite entirely unlike FRP"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -46611,8 +46772,8 @@ self: { network old-locale pretty time ]; description = "Almost but not quite entirely unlike FRP"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -46645,7 +46806,7 @@ self: { testSystemDepends = [ libpcap ]; testPkgconfigDepends = [ gio-unix ]; description = "Draw sequence diagrams of D-Bus traffic"; - license = stdenv.lib.licenses.lgpl21Plus; + license = lib.licenses.lgpl21Plus; }) {gio-unix = null; inherit (pkgs) libpcap; system-glib = pkgs.glib;}; @@ -46667,7 +46828,7 @@ self: { multistate pretty transformers unsafe ]; description = "Chops a command or program invocation into digestable pieces"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "butter" = callPackage @@ -46688,8 +46849,8 @@ self: { network-simple stm template-haskell text transformers ]; description = "Monad Transformer for Asyncronous Message Passing"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -46711,8 +46872,8 @@ self: { base bytestring gl-capture GLUT OpenGLRaw repa repa-devil ]; description = "butterfly tilings"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -46726,7 +46887,7 @@ self: { isExecutable = true; libraryHaskellDepends = [ base ghc-prim integer-gmp ]; description = "Bit-vector arithmetic library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bv-embed" = callPackage @@ -46737,7 +46898,7 @@ self: { sha256 = "0afywcb7n2h2vycxg47myaqz49xrlnjpyq753smildjlkl79jx79"; libraryHaskellDepends = [ base ]; description = "Define embeddings of small bit vectors into larger ones"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bv-little" = callPackage @@ -46764,7 +46925,7 @@ self: { smallcheck ]; description = "Efficient little-endian bit vector library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bv-sized" = callPackage @@ -46782,8 +46943,8 @@ self: { base bytestring hedgehog parameterized-utils tasty tasty-hedgehog ]; description = "a bitvector datatype that is parameterized by the vector width"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -46807,8 +46968,8 @@ self: { optparse-applicative relude tasty tasty-hunit terminfo-hs text ]; description = "Library for creating command-line interfaces (colors, menus, etc.)"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -46820,8 +46981,8 @@ self: { sha256 = "0x4yh9li0pi2r9pjih000a143iw9kaz7r4z72510kv6kzkkcr9mn"; libraryHaskellDepends = [ base bytestring word24 ]; description = "data from/to ByteString"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -46837,7 +46998,7 @@ self: { base extra hspec parsec parsec-numbers text ]; description = "Read strings describing a number of bytes like 2Kb and 0.5 MiB"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "byte-order" = callPackage @@ -46849,7 +47010,7 @@ self: { libraryHaskellDepends = [ base primitive primitive-unaligned ]; testHaskellDepends = [ base primitive ]; description = "Portable big-endian and little-endian conversions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "byteable" = callPackage @@ -46861,7 +47022,7 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring ]; description = "Type class for sequence of bytes"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bytearray-parsing" = callPackage @@ -46872,8 +47033,8 @@ self: { sha256 = "1b1lz0y1a20v05bpa4xlxchc6k025gmm17hj3ysmv6j2i3k8micd"; libraryHaskellDepends = [ base bytestring primitive text ]; description = "Parsing of bytearray-based data"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -46904,8 +47065,8 @@ self: { base byteslice gauge natural-arithmetic primitive text-short ]; description = "Serialize to a small byte arrays"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -46920,7 +47081,7 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring ]; description = "Flexible byte dump helpers for human readers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bytehash" = callPackage @@ -46946,8 +47107,8 @@ self: { primitive-unlifted split unordered-containers ]; description = "Universal hashing of bytes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -46963,8 +47124,8 @@ self: { base bytebuild byteslice natural-arithmetic posix-api primitive ]; description = "Fast logging"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -46976,7 +47137,7 @@ self: { sha256 = "06995paxbxk8lldvarqpb3ygcjbg4v8dk4scib1rjzwlhssvn85x"; libraryHaskellDepends = [ base ]; description = "Exposes the native endianness or byte ordering of the system"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bytes" = callPackage @@ -46989,8 +47150,8 @@ self: { pname = "bytes"; version = "0.17"; sha256 = "11gacfxcn9f3v5a1phlgi7mwwrnyh51sfsym573g6i4v2zqfrwi3"; - revision = "2"; - editedCabalFile = "1i49q0zdh1a1pnbhcrbla9l8xgays6gvq9bbx9k5iv469n4ppjbd"; + revision = "4"; + editedCabalFile = "0vxmahjxskyddq3gmr2b2ix5h33ywk6fmv17vqfbh8mhfbb26113"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base binary binary-orphans bytestring cereal containers hashable @@ -46999,7 +47160,7 @@ self: { ]; testHaskellDepends = [ base directory doctest filepath ]; description = "Sharing code for serialization between binary and cereal"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "byteset" = callPackage @@ -47012,7 +47173,7 @@ self: { editedCabalFile = "1lgxxxrmw4g32pa861n6qbfpzwv14wfjrlp4hv5zd9hygy6v6q2p"; libraryHaskellDepends = [ base binary ]; description = "Set of bytes"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "byteslice" = callPackage @@ -47022,8 +47183,8 @@ self: { }: mkDerivation { pname = "byteslice"; - version = "0.2.4.0"; - sha256 = "0f2dw5kf9gg41ns5hb0aarrv24yqv9cdzgl9hgdcf8jj5j3qj6di"; + version = "0.2.5.0"; + sha256 = "0sl5jbfni6sx6srlfdpj0cb0pjw38cf3fyxsnaldbap2wfd3ncyr"; libraryHaskellDepends = [ base bytestring primitive primitive-addr primitive-unlifted run-st tuples vector @@ -47034,8 +47195,8 @@ self: { ]; benchmarkHaskellDepends = [ base gauge primitive ]; description = "Slicing managed and unmanaged memory"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -47060,8 +47221,8 @@ self: { base byteslice bytestring gauge primitive ]; description = "Nonresumable byte parser"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -47075,8 +47236,8 @@ self: { editedCabalFile = "0qhx61v75cqpgrb88h5gpc4a6vg17dgrw555q2kgi2hvip61z5lr"; libraryHaskellDepends = [ base deepseq ghc-prim integer-gmp ]; description = "Fast, compact, strict and lazy byte strings with a list interface"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "bytestring-arbitrary" = callPackage @@ -47093,8 +47254,8 @@ self: { base bytestring criterion cryptohash QuickCheck ]; description = "Arbitrary instances for ByteStrings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -47107,7 +47268,7 @@ self: { libraryHaskellDepends = [ base bytestring deepseq ]; doHaddock = false; description = "The new bytestring builder, packaged outside of GHC"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bytestring-builder-varword" = callPackage @@ -47123,8 +47284,8 @@ self: { attoparsec attoparsec-varword base bytestring hspec QuickCheck ]; description = "Variable-length integer encoding"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -47138,8 +47299,8 @@ self: { editedCabalFile = "05q4ilixyd4zc15imh7x7gqwv4pmicyjj9zx5fhx1p1ps89jiap3"; libraryHaskellDepends = [ base bytestring utf8-string ]; description = "Classes for automatic conversion to and from strict and lazy bytestrings. (deprecated)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -47164,7 +47325,7 @@ self: { base bytestring criterion text transformers ]; description = "Type-classes to convert values to and from ByteString"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "bytestring-csv" = callPackage @@ -47175,8 +47336,8 @@ self: { sha256 = "0x7qklb36jwxry1ih5x3jw7s861vlvd5g9h7yn7b2x64c0phyj0r"; libraryHaskellDepends = [ array base bytestring dlist ]; description = "Parse CSV formatted data efficiently"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -47188,7 +47349,7 @@ self: { sha256 = "0iq59if3in08ssashk80wvh6yh1yr115387fi9kj952v6bzvzw1q"; libraryHaskellDepends = [ base bytestring ]; description = "Simple, fast binary diff/patch"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "bytestring-encoding" = callPackage @@ -47205,7 +47366,7 @@ self: { tasty-th text ]; description = "ByteString ↔ Text converter based on GHC.IO.Encoding"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bytestring-encodings" = callPackage @@ -47219,7 +47380,7 @@ self: { testHaskellDepends = [ base bytestring hedgehog ]; benchmarkHaskellDepends = [ base bytestring gauge text ]; description = "checks to see if a given bytestring adheres to a certain encoding"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "bytestring-from" = callPackage @@ -47238,7 +47399,7 @@ self: { ]; description = "A type-class to convert values from ByteString"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "bytestring-handle" = callPackage @@ -47257,7 +47418,7 @@ self: { test-framework-hunit test-framework-quickcheck2 ]; description = "ByteString-backed Handles"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bytestring-lexing" = callPackage @@ -47270,7 +47431,7 @@ self: { editedCabalFile = "0icnbv83h542vkmn51ykzc4w1g7nl4w6d6lj79909hnwr2g10616"; libraryHaskellDepends = [ base bytestring ]; description = "Parse and produce literals efficiently from strict or lazy bytestrings"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }) {}; "bytestring-mmap" = callPackage @@ -47281,7 +47442,7 @@ self: { sha256 = "1bv9xf4cpph1cbdwv6rbmq8ppi5wjpgd97lwln5l9ky5rvnaxg3v"; libraryHaskellDepends = [ base bytestring unix ]; description = "mmap support for strict ByteStrings"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bytestring-nums" = callPackage @@ -47294,7 +47455,7 @@ self: { isExecutable = true; libraryHaskellDepends = [ base bytestring containers ]; description = "Parse numeric literals from ByteStrings"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bytestring-plain" = callPackage @@ -47309,8 +47470,8 @@ self: { base bytestring deepseq ghc-prim hashable ]; description = "Plain byte strings ('ForeignPtr'-less 'ByteString's)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -47327,7 +47488,7 @@ self: { base bytestring terminal-progress-bar text time ]; description = "A library for tracking the consumption of a lazy ByteString"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bytestring-read" = callPackage @@ -47350,8 +47511,8 @@ self: { text ]; description = "fast ByteString to number converting library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -47365,8 +47526,8 @@ self: { testHaskellDepends = [ base bytestring hspec HUnit rematch ]; doHaddock = false; description = "Rematch support for ByteString"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -47379,7 +47540,7 @@ self: { libraryHaskellDepends = [ base bytestring deepseq ]; testHaskellDepends = [ base bytestring QuickCheck ]; description = "Backport copy of ShortByteString"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bytestring-show" = callPackage @@ -47396,8 +47557,8 @@ self: { array base binary bytestring containers integer-gmp ]; description = "Efficient conversion of values into readable byte strings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -47421,7 +47582,7 @@ self: { ]; benchmarkHaskellDepends = [ criterion rerebase ]; description = "An efficient strict bytestring builder"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "bytestring-substring" = callPackage @@ -47432,8 +47593,8 @@ self: { sha256 = "1vn1r8m0ldydnrazyckkn4lpv3g5ns37j91a5649jnrprjpy08dn"; libraryHaskellDepends = [ base bytestring pipes primitive ]; description = "break bytestrings up into substrings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -47450,8 +47611,8 @@ self: { attoparsec base bytestring Cabal hspec QuickCheck text time ]; description = "Library for Time parsing from ByteString"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -47466,7 +47627,7 @@ self: { base byteorder bytestring QuickCheck vector ]; description = "Convert between ByteString and Vector.Storable without copying"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bytestring-tree-builder" = callPackage @@ -47487,7 +47648,7 @@ self: { base-prelude bytestring criterion deepseq ]; description = "A very efficient ByteString builder implementation based on the binary tree"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "bytestring-trie" = callPackage @@ -47500,8 +47661,8 @@ self: { editedCabalFile = "1qpv52ywp8r30s3m9qyjiqiwa6clg3zp095yhs2d4533amprryly"; libraryHaskellDepends = [ base binary bytestring ]; description = "An efficient finite map from (byte)strings to values"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -47520,8 +47681,8 @@ self: { testHaskellDepends = [ base bytestring cryptohash QuickCheck ]; benchmarkHaskellDepends = [ base bytestring criterion QuickCheck ]; description = "Bytestrings with typenat lengths"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -47533,8 +47694,8 @@ self: { sha256 = "1g99vbp14ki563lb41y1fxlgvdmrmq1y0xsk0ia1m438rdpnh2qd"; libraryHaskellDepends = [ base ]; description = "Combinator parsing with Data.ByteString.Lazy"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -47546,8 +47707,8 @@ self: { sha256 = "019axq65hmgmszkc1lyyyy8rpv5xkjbf1pmgz1bz0hnc8lgv58pd"; libraryHaskellDepends = [ base ]; description = "Combinator parsing with Data.ByteString.Lazy"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -47559,8 +47720,8 @@ self: { sha256 = "07hx3072zg9y3kj6h99yl8fd3n115x4z8z411c1cpx1hj292d57f"; libraryHaskellDepends = [ base bytestring ]; description = "A ReadP style parser library for ByteString"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -47573,7 +47734,7 @@ self: { libraryHaskellDepends = [ base safe ]; testHaskellDepends = [ base Cabal HUnit QuickCheck ]; description = "Human friendly conversion between byte units (KB, MB, GB...)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bz2" = callPackage @@ -47597,7 +47758,7 @@ self: { ]; benchmarkToolDepends = [ cpphs ]; description = "Bindings to libbz2"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bzip-signature" = callPackage @@ -47610,7 +47771,7 @@ self: { base bytestring composition-prelude lens ]; description = "Backpack signature for BZip compression"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "bzlib" = callPackage @@ -47622,7 +47783,7 @@ self: { libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ bzip2 ]; description = "Compression and decompression in the bzip2 format"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) bzip2;}; "bzlib-conduit" = callPackage @@ -47648,7 +47809,7 @@ self: { resourcet ]; description = "Streaming compression/decompression via conduits"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) bzip2;}; "c-dsl" = callPackage @@ -47659,8 +47820,8 @@ self: { sha256 = "04hj3d26rp7ibv15n48y4xkfld3nnh6dqn8shxvw1h546z1316pw"; libraryHaskellDepends = [ base language-c ]; description = "A higher level DSL on top of language-c"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -47672,8 +47833,8 @@ self: { sha256 = "1za4wcrjrxqk8yqy1bddzxw8xxx0vlxyy31dj1glb5azx6qh7qp2"; libraryHaskellDepends = [ base ]; description = "C IO"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -47694,8 +47855,8 @@ self: { executableHaskellDepends = [ base options ]; testHaskellDepends = [ base ]; description = "Simpe mosquito MQTT binding able to work with the Amazons IoT"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) mosquitto;}; @@ -47708,7 +47869,7 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base ]; description = "CStorable class"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "c-storable-deriving" = callPackage @@ -47719,7 +47880,7 @@ self: { sha256 = "0zx6r7sfaxl4k2s2b213vm12fskcssy01b828i8rqxixwfjjshv8"; libraryHaskellDepends = [ base ghc-prim ]; description = "Generate C-like storable instances from datatypes"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "c0check" = callPackage @@ -47733,7 +47894,7 @@ self: { executableHaskellDepends = [ base c0parser ]; description = "Simple C0 Syntax Check"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -47746,7 +47907,7 @@ self: { libraryHaskellDepends = [ base parsec ]; description = "Simple C0 Parser"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -47758,8 +47919,8 @@ self: { sha256 = "1i62ilk95p1vjyk7gl1fv7lwq6yk3ysfn3v1bbyfpabf97gzr0d9"; libraryHaskellDepends = [ base network unix ]; description = "C10k server library using prefork"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -47773,7 +47934,7 @@ self: { librarySystemDepends = [ libxml2 ]; libraryPkgconfigDepends = [ libxml2 ]; description = "Bindings to the c14n implementation in libxml"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {inherit (pkgs) libxml2;}; "c2ats" = callPackage @@ -47795,8 +47956,8 @@ self: { base HUnit test-framework test-framework-hunit test-framework-th ]; description = "Translate C code into ATS"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -47821,7 +47982,7 @@ self: { transformers ]; description = "C->Haskell FFI tool that gives some cross-language type safety"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }) {}; "c2hs-extra" = callPackage @@ -47833,7 +47994,7 @@ self: { libraryHaskellDepends = [ base ]; libraryToolDepends = [ c2hs ]; description = "Convenient marshallers for complicate C types"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "c2hsc" = callPackage @@ -47858,7 +48019,7 @@ self: { ]; testHaskellDepends = [ base here hspec logging monad-logger text ]; description = "Convert C API header files to .hsc and .hsc.helper.c files"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ca" = callPackage @@ -47871,7 +48032,7 @@ self: { editedCabalFile = "1s7qxji4a44qrsmfajrpzjfg06aksxxf41b5y8bgrc93m2iyn4xw"; libraryHaskellDepends = [ alg base ]; description = "Cellular Automata"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ca-province-codes" = callPackage @@ -47883,7 +48044,7 @@ self: { libraryHaskellDepends = [ aeson base text ]; testHaskellDepends = [ aeson base hspec QuickCheck text ]; description = "ISO 3166-2:CA Province Codes and Names"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cab" = callPackage @@ -47893,8 +48054,8 @@ self: { }: mkDerivation { pname = "cab"; - version = "0.2.18"; - sha256 = "0ic1ivxiv217ls4g38q5dwrb8sbsrzvdm6c0idv9ancpjmm8k8jl"; + version = "0.2.19"; + sha256 = "0rn8b8fydrm8ad0va0pg016y5ph3dc0xashg0rqfjhzv8kwzlkzk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -47906,8 +48067,8 @@ self: { directory filepath process ]; description = "A maintenance command of Haskell cabal packages"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -47922,8 +48083,8 @@ self: { libraryHaskellDepends = [ base youProbablyWantCapitalCabal ]; doHaddock = false; description = "placeholder for Cabal package, you want the upper case Cabal"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {youProbablyWantCapitalCabal = null;}; @@ -47935,8 +48096,8 @@ self: { sha256 = "0m3xq3k4s6rn90vd2sp115jyb722vi9wgih3lz05fnc2bypyg6zi"; libraryHaskellDepends = [ base Cabal filepath ]; description = "Cabal support for creating AppImage applications"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.agpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -47954,8 +48115,8 @@ self: { base Cabal directory filepath HTTP optparse-applicative ]; description = "Check how up-to-date your .cabal dependencies are."; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -47967,7 +48128,7 @@ self: { sha256 = "16hhvsqdj91pgzlgmwpba8ajjp2jssyf71rw9pwrixshj6826ps2"; libraryHaskellDepends = [ base Cabal directory extra filepath ]; description = "Build time library that autodetects exposed modules"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "cabal-bounds" = callPackage @@ -47991,8 +48152,8 @@ self: { base directory filepath Glob process tasty tasty-golden ]; description = "A command line program for managing the dependency versions in a cabal file"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -48004,7 +48165,7 @@ self: { sha256 = "004xr0f59fg6h6rxlf7sf6m2mi6p32h2z3vs9b56hddmxp3gn4vl"; libraryHaskellDepends = [ base Cabal ]; description = "Adds executable dependencies to the Cabal build"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cabal-bundle-clib" = callPackage @@ -48020,8 +48181,8 @@ self: { time ]; description = "Bundling C/C++ projects in Cabal package made easy"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -48057,8 +48218,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "CI Assistant for Haskell projects"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -48081,8 +48242,8 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base filepath tasty tasty-golden ]; description = "A command line program for extracting compiler arguments from a cabal file"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -48096,8 +48257,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base Cabal optparse-applicative ]; description = "Repeatable builds for cabalized Haskell projects"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -48117,8 +48278,8 @@ self: { mtl optparse-applicative pretty process tar utf8-string ]; description = "query tools for the local cabal database"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -48143,7 +48304,7 @@ self: { ]; executableHaskellDepends = [ base Cabal debian lens mtl pretty ]; description = "Create a Debianization for a Cabal package"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cabal-dependency-licenses" = callPackage @@ -48158,8 +48319,8 @@ self: { base Cabal containers directory filepath ]; description = "Compose a list of a project's transitive dependencies with their licenses"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -48182,8 +48343,8 @@ self: { ]; executableToolDepends = [ cabal-install ]; description = "Manage sandboxed Haskell build environments"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -48197,8 +48358,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base Cabal directory filepath ]; description = "show dist dir of 'cabal copy/install'"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -48212,7 +48373,7 @@ self: { editedCabalFile = "05v1awad3d1wvc763xcgvxm4n6n7bs7byc6s14kdbw35zcaddlcb"; libraryHaskellDepends = [ base Cabal directory filepath ]; description = "A Setup.hs helper for doctests running"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cabal-edit" = callPackage @@ -48233,7 +48394,7 @@ self: { optparse-applicative process store time ]; description = "Cabal utility"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "cabal-file" = callPackage @@ -48256,7 +48417,7 @@ self: { simple-cabal simple-cmd simple-cmd-args ]; description = "Cabal file access"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cabal-file-th" = callPackage @@ -48271,8 +48432,8 @@ self: { ]; testHaskellDepends = [ base Cabal ]; description = "Template Haskell expressions for reading fields from a project's cabal file"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -48297,7 +48458,7 @@ self: { zlib ]; description = "Generate a FlatPak manifest from a Cabal package description"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cabal-fmt" = callPackage @@ -48325,7 +48486,7 @@ self: { doHaddock = false; description = "Format .cabal files"; license = "GPL-3.0-or-later AND BSD-3-Clause"; - maintainers = with stdenv.lib.maintainers; [ maralorn ]; + maintainers = with lib.maintainers; [ maralorn ]; }) {}; "cabal-ghc-dynflags" = callPackage @@ -48336,8 +48497,8 @@ self: { sha256 = "13kxlmz5w0aazafrlignd55zclwl9sb213jry4vhfibgjrg18w8f"; libraryHaskellDepends = [ base Cabal ghc transformers ]; description = "Conveniently configure GHC's dynamic flags for use with Cabal projects"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -48354,8 +48515,8 @@ self: { base Cabal directory filepath process ]; description = "Set up ghci with options taken from a .cabal file"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -48373,8 +48534,8 @@ self: { base containers directory options parsec process split temporary ]; description = "Generate graphs of install-time Cabal dependencies"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -48405,7 +48566,7 @@ self: { ]; doCheck = false; description = "Give Haskell development tools access to Cabal project environment"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "cabal-info" = callPackage @@ -48425,8 +48586,8 @@ self: { base Cabal filepath optparse-applicative ]; description = "Read information from cabal files"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -48458,8 +48619,8 @@ self: { mv bash-completion $out/share/bash-completion/completions ''; description = "The command-line interface for Cabal and Hackage"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ peti ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ peti ]; }) {}; "cabal-install-bundle" = callPackage @@ -48478,8 +48639,8 @@ self: { ]; executableSystemDepends = [ zlib ]; description = "The (bundled) command-line interface for Cabal and Hackage"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) zlib;}; @@ -48499,8 +48660,8 @@ self: { old-time pretty process random time unix zlib ]; description = "Temporary version of cabal-install for ghc-7.2"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -48520,8 +48681,8 @@ self: { old-time pretty process random time unix zlib ]; description = "Temporary version of cabal-install for ghc-7.4"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -48551,7 +48712,7 @@ self: { ]; description = "Utilities to work with cabal-install files"; license = "GPL-2.0-or-later AND BSD-3-Clause"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -48568,8 +48729,8 @@ self: { transformers unordered-containers ]; description = "Lenses and traversals for the Cabal library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -48596,7 +48757,7 @@ self: { test-framework test-framework-hunit text ]; description = "Cabal support for creating Mac OSX application bundles"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cabal-meta" = callPackage @@ -48617,8 +48778,8 @@ self: { base hspec shelly system-filepath text unix ]; description = "build multiple packages at once"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -48636,8 +48797,8 @@ self: { base containers directory filepath process simple-get-opt vty ]; description = "A monitor for cabal builds"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -48655,8 +48816,8 @@ self: { base bytestring containers directory HTTP process tar ]; description = "Avoid Cabal dependency hell by constraining to known good versions. (deprecated)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -48684,7 +48845,7 @@ self: { semialign singleton-bool text these topograph transformers vector ]; description = "Library and utility for processing cabal's plan.json file"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; }) {}; "cabal-progdeps" = callPackage @@ -48697,8 +48858,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base Cabal directory filepath ]; description = "Show dependencies of program being built in current directory"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -48715,8 +48876,8 @@ self: { uniplate ]; description = "Helpers for quering .cabal files or hackageDB's 00-index.tar"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -48738,7 +48899,7 @@ self: { simple-cabal simple-cmd simple-cmd-args time unix ]; description = "RPM packaging tool for Haskell Cabal-based packages"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "cabal-scripts" = callPackage @@ -48751,7 +48912,7 @@ self: { libraryHaskellDepends = [ base ]; doHaddock = false; description = "Shell scripts for support of Cabal maintenance"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cabal-setup" = callPackage @@ -48764,8 +48925,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base Cabal ]; description = "The user interface for building and installing Cabal packages"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -48783,7 +48944,7 @@ self: { base bytestring cereal directory filepath process tar zlib ]; description = "Sign and verify Cabal packages"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cabal-sort" = callPackage @@ -48802,8 +48963,8 @@ self: { filepath process transformers utility-ht ]; description = "Topologically sort cabal packages"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -48825,8 +48986,8 @@ self: { system-fileio system-filepath tar text transformers ]; description = "Alternative install procedure to avoid the diamond dependency issue"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -48842,8 +49003,8 @@ self: { base Cabal filepath ghc pqc QuickCheck ]; description = "Automated test tool for cabal projects"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -48861,7 +49022,7 @@ self: { executableHaskellDepends = [ base directory filepath unix ]; testHaskellDepends = [ base hspec process regex-posix ]; description = "A program for finding temporary build file during cabal-test"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cabal-test-compat" = callPackage @@ -48872,7 +49033,7 @@ self: { sha256 = "15lxyrza1n9saac1awjx482gi7wq3sshqf4ich6k9xkfj464lrdq"; libraryHaskellDepends = [ base Cabal QuickCheck ]; description = "Compatibility interface of cabal test-suite"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cabal-test-quickcheck" = callPackage @@ -48885,8 +49046,8 @@ self: { editedCabalFile = "1q0zs98z8wvr0gzy27ff688fpsgwxjypwjsyzs8v2v6gqd49iwri"; libraryHaskellDepends = [ base Cabal QuickCheck ]; description = "QuickCheck for Cabal"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -48902,7 +49063,7 @@ self: { base binary bytestring Cabal containers ghc template-haskell ]; description = "Helper functions for writing custom Setup.hs scripts."; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cabal-uninstall" = callPackage @@ -48915,7 +49076,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base directory filepath mtl process ]; description = "Uninstall cabal packages"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cabal-upload" = callPackage @@ -48928,8 +49089,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base filepath HTTP network ]; description = "Command-line tool for uploading packages to Hackage"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -48949,8 +49110,8 @@ self: { filepath mtl pretty process ]; description = "Create Arch Linux packages from Cabal packages"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -48966,8 +49127,8 @@ self: { base Cabal hsemail hxt parsec process ]; description = "Cabal to Description-of-a-Project (DOAP)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -48982,8 +49143,8 @@ self: { libraryHaskellDepends = [ base Cabal directory filepath ]; executableHaskellDepends = [ base curl directory ]; description = "make gentoo's .ebuild file from .cabal file"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -49002,8 +49163,8 @@ self: { text unordered-containers yaml ]; description = "A tool to generate .ghci file from .cabal"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -49016,8 +49177,8 @@ self: { }: mkDerivation { pname = "cabal2nix"; - version = "2.15.6"; - sha256 = "0jkdy36qpi7b7a14dg0iqgn4k3cia8wj1yi8pg82v430rspnkfdb"; + version = "2.16.0"; + sha256 = "0kxxn218r1r9fia72zv8xzb8yji5y2jbwzqz033ljvwbm3abxp2k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -49040,8 +49201,8 @@ self: { export HOME="$TMPDIR/home" ''; description = "Convert Cabal files into Nix build instructions"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ peti ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ peti ]; }) {}; "cabal2spec" = callPackage @@ -49062,8 +49223,8 @@ self: { ]; 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 ]; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ peti ]; }) {}; "cabalQuery" = callPackage @@ -49081,8 +49242,8 @@ self: { base Cabal containers directory MissingH ]; description = "A simple tool to query cabal files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -49098,7 +49259,7 @@ self: { executableHaskellDepends = [ base directory filepath process ]; testHaskellDepends = [ base directory doctest filepath process ]; description = "alias for cabal install from given git repo"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "cabalgraph" = callPackage @@ -49117,8 +49278,8 @@ self: { base bytestring Cabal containers directory filepath pretty process ]; description = "Generate pretty graphs of module trees from cabal files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -49137,8 +49298,8 @@ self: { text ]; description = "Provides access to the cabal file data for shell scripts"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -49154,7 +49315,7 @@ self: { executableHaskellDepends = [ base Cabal cabalrpmdeps haskell98 ]; description = "Create mandriva rpm from cabal package"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -49170,7 +49331,7 @@ self: { executableHaskellDepends = [ base Cabal filepath haskell98 ]; description = "Autogenerate rpm dependencies from cabal files"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -49184,8 +49345,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base Cabal ]; description = "Verify installed package version against user-specified constraints"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -49204,8 +49365,8 @@ self: { process unix ]; description = "Cabal binary sandboxes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -49218,8 +49379,8 @@ self: { libraryHaskellDepends = [ base bytestring text ]; librarySystemDepends = [ cabocha ]; testHaskellDepends = [ base text-format ]; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {cabocha = null;}; @@ -49236,7 +49397,7 @@ self: { ]; testHaskellDepends = [ base clock hspec stm transformers ]; description = "An in-memory key/value store with expiration support"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cache-polysemy" = callPackage @@ -49254,8 +49415,8 @@ self: { base cache clock hashable polysemy polysemy-plugin ]; description = "cached hashmaps"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -49273,8 +49434,8 @@ self: { quickcheck-assertions shake text ]; description = "Cache values to disk"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -49289,7 +49450,7 @@ self: { libraryHaskellDepends = [ base stm time transformers ]; executableHaskellDepends = [ base ]; description = "A simple library to cache a single IO action with timeout"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "cached-traversable" = callPackage @@ -49304,7 +49465,7 @@ self: { base binary bytestring containers directory filepath mtl ]; description = "Transparent, persistent caching of lazy, traversable structures"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "caching" = callPackage @@ -49322,8 +49483,8 @@ self: { base dlist hashable mtl psqueues ref-tf transformers ]; description = "Cache combinators"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -49340,8 +49501,8 @@ self: { base hspec stm stm-containers text time timespan ]; description = "A vault-style cache implementation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -49382,7 +49543,7 @@ self: { temporary ]; description = "Command line client for Nix binary cache hosting https://cachix.org"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {inherit (pkgs) boost; inherit (pkgs) nix;}; "cachix-api" = callPackage @@ -49413,7 +49574,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Servant HTTP API specification for https://cachix.org"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "cacophony" = callPackage @@ -49440,8 +49601,8 @@ self: { async base base16-bytestring bytestring criterion deepseq ]; description = "A library implementing the Noise protocol"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -49458,7 +49619,7 @@ self: { base binary bytestring hspec QuickCheck random ]; description = "That rabbit's got a vicious streak a mile wide!"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "caf" = callPackage @@ -49469,7 +49630,7 @@ self: { sha256 = "1yrl3ffkfwgs4kljx57m1ldam087s7iby2qs74c4crxkrcj0j7a8"; libraryHaskellDepends = [ base ]; description = "A library of Concurrency Abstractions using Futures"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cafeteria-prelude" = callPackage @@ -49480,8 +49641,8 @@ self: { sha256 = "1iyasmd8zcg98vy7ffhxyyr664f02ird5z7rks9n67ixv7n60mrl"; libraryHaskellDepends = [ base ]; description = "Prelude subsets—take only what you want!"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -49500,8 +49661,8 @@ self: { mtl optparse-applicative process protocol-buffers protocol-buffers-descriptor template-haskell temporary text ]; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -49520,7 +49681,7 @@ self: { ]; libraryPkgconfigDepends = [ cairo ]; description = "Binding to the Cairo library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) cairo;}; "cairo-appbase" = callPackage @@ -49534,7 +49695,7 @@ self: { enableSeparateDataOutput = true; executableHaskellDepends = [ base cairo glib gtk ]; description = "A template for building new GUI applications using GTK and Cairo"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cairo-canvas" = callPackage @@ -49547,7 +49708,7 @@ self: { isExecutable = true; libraryHaskellDepends = [ base cairo linear mtl random time ]; description = "Simpler drawing API for Cairo"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "cairo-core" = callPackage @@ -49567,8 +49728,8 @@ self: { libraryPkgconfigDepends = [ cairo ]; libraryToolDepends = [ c2hs ]; description = "Cairo Haskell binding (partial)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) cairo;}; @@ -49592,7 +49753,7 @@ self: { ]; description = "A build-system library and driver"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -49622,8 +49783,8 @@ self: { transformers utf8-string ]; description = "Third cake the Makefile EDSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -49641,8 +49802,8 @@ self: { base GLUT gluturtle lojbanParser yjsvg yjtools ]; description = "run turtle like LOGO with lojban"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -49657,8 +49818,8 @@ self: { libraryHaskellDepends = [ base containers ]; executableHaskellDepends = [ base ]; description = "Calendar Layout Algorithm"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -49672,7 +49833,7 @@ self: { librarySystemDepends = [ cal3d ]; description = "Haskell binding to the Cal3D animation library"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {cal3d = null;}; @@ -49688,7 +49849,7 @@ self: { executableHaskellDepends = [ base cal3d cal3d-opengl OpenGL SDL ]; description = "Examples for the Cal3d animation library"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -49701,38 +49862,39 @@ self: { libraryHaskellDepends = [ base cal3d OpenGL ]; description = "OpenGL rendering for the Cal3D animation library"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; "calamity" = callPackage ({ mkDerivation, aeson, async, base, bytestring, colour - , concurrent-extra, containers, data-default-class, data-flags - , deepseq, deque, df1, di-core, di-polysemy, exceptions, fmt, focus - , generic-lens, generic-override, generic-override-aeson, hashable - , http-date, http-types, lens, lens-aeson, megaparsec, mime-types - , mtl, polysemy, polysemy-plugin, reflection, safe-exceptions + , concurrent-extra, connection, containers, data-default-class + , data-flags, deepseq, deque, df1, di-core, di-polysemy, exceptions + , fmt, focus, generic-lens, generic-override + , generic-override-aeson, hashable, http-client, http-date + , http-types, lens, lens-aeson, megaparsec, mime-types, mtl + , polysemy, polysemy-plugin, reflection, req, safe-exceptions , scientific, stm, stm-chans, stm-containers, text, text-show, time - , typerep-map, unagi-chan, unboxing-vector, unordered-containers - , vector, websockets, wreq, wuss + , tls, typerep-map, unagi-chan, unboxing-vector + , unordered-containers, vector, websockets, x509-system }: mkDerivation { pname = "calamity"; - version = "0.1.23.1"; - sha256 = "162vjlzd2w98c5w8smjy6y7sywa7dfmv780g6ij4spzn1611l2z5"; - libraryHaskellDepends = [ - aeson async base bytestring colour concurrent-extra containers - data-default-class data-flags deepseq deque df1 di-core di-polysemy - exceptions fmt focus generic-lens generic-override - generic-override-aeson hashable http-date http-types lens - lens-aeson megaparsec mime-types mtl polysemy polysemy-plugin - reflection safe-exceptions scientific stm stm-chans stm-containers - text text-show time typerep-map unagi-chan unboxing-vector - unordered-containers vector websockets wreq wuss + version = "0.1.24.1"; + sha256 = "14q0s17an5vk2gq9vcy0ghd30zg1dj3q5vdln86mnd4v34wkpfr2"; + libraryHaskellDepends = [ + aeson async base bytestring colour concurrent-extra connection + containers data-default-class data-flags deepseq deque df1 di-core + di-polysemy exceptions fmt focus generic-lens generic-override + generic-override-aeson hashable http-client http-date http-types + lens lens-aeson megaparsec mime-types mtl polysemy polysemy-plugin + reflection req safe-exceptions scientific stm stm-chans + stm-containers text text-show time tls typerep-map unagi-chan + unboxing-vector unordered-containers vector websockets x509-system ]; description = "A library for writing discord bots in haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -49746,8 +49908,8 @@ self: { isExecutable = true; executableHaskellDepends = [ array base harpy haskell98 mtl ]; description = "A small compiler for arithmetic expressions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -49769,8 +49931,8 @@ self: { base containers gtk parsec plot-gtk-ui QuickCheck ]; description = "A calculator repl, with variables, functions & Mathematica like dynamic plots"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -49792,7 +49954,7 @@ self: { ]; description = "Calculation tool and library supporting units"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -49810,8 +49972,8 @@ self: { base containers cpphs lens mtl parsec transformers ]; description = "a logic programming language based on the calculus of constructions"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -49827,7 +49989,7 @@ self: { base containers html old-time utility-ht ]; description = "List years with the same calendars"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "calenderweek" = callPackage @@ -49842,8 +50004,8 @@ self: { base megaparsec optparse-generic text time ]; description = "Commandline tool to get week of the year"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -49869,8 +50031,8 @@ self: { WAVE ]; description = "The call game engine"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -49892,8 +50054,8 @@ self: { hspec lens mtl process split trifecta unix ]; description = "A simple library to call Alloy given a specification"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -49912,8 +50074,8 @@ self: { ]; executableHaskellDepends = [ base bytestring data-msgpack mtl ]; description = "Call Haskell functions from other languages via serialization and dynamic libraries"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -49926,7 +50088,20 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base nanospec ]; description = "Use GHC call-stacks in a backward compatible way"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; + }) {}; + + "call-stack_0_3_0" = callPackage + ({ mkDerivation, base, nanospec }: + mkDerivation { + pname = "call-stack"; + version = "0.3.0"; + sha256 = "0ski7ihdxah7x4x07qgkjljg8hzqs9d6aa5k4cmr40bzp3i8s3mq"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base nanospec ]; + description = "Use GHC call-stacks in a backward compatible way"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "camfort" = callPackage @@ -49963,8 +50138,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "CamFort - Cambridge Fortran infrastructure"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) flint;}; @@ -49979,7 +50154,7 @@ self: { enableSeparateDataOutput = true; executableHaskellDepends = [ base bytestring Imlib terminfo ]; description = "write image files onto 256(or 24bit) color terminals"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "campfire" = callPackage @@ -49997,8 +50172,8 @@ self: { transformers unordered-containers url ]; description = "Haskell implementation of the Campfire API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -50011,7 +50186,7 @@ self: { libraryHaskellDepends = [ base mtl ]; testHaskellDepends = [ base deepseq hspec HUnit mtl ]; description = "Generic implementation of the Has and CoHas patterns"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "candid" = callPackage @@ -50043,8 +50218,8 @@ self: { tasty-smallcheck template-haskell text unordered-containers vector ]; description = "Candid integration"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -50056,8 +50231,8 @@ self: { sha256 = "1srixf1m7pzgr16y2xfckhi0xk9js68ps9zw8kvnw01c37x85f48"; libraryHaskellDepends = [ arithmoi array base containers random ]; description = "Arithmetic for Psychedelically Large Numbers"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -50069,8 +50244,8 @@ self: { sha256 = "0dg9d4v08gykbjmzafpakgwc51mq5d5m6ilmhp68czpl30sqjhwf"; libraryHaskellDepends = [ base deepseq directory filepath ]; description = "Abstract data type for canonical file paths"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -50094,8 +50269,8 @@ self: { ]; benchmarkHaskellDepends = [ base bytestring containers criterion ]; description = "Canonical JSON for signing and hashing JSON values"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -50107,7 +50282,7 @@ self: { sha256 = "1dkw0w43ajjgpczp8hmclr93v9scl75rlnsmxdjvwmv9phpj5559"; libraryHaskellDepends = [ base unix yaml ]; description = "A pattern for configuring programs"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "canteven-http" = callPackage @@ -50126,8 +50301,8 @@ self: { transformers unix uuid wai wai-extra ]; description = "Utilities for HTTP programming"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -50139,8 +50314,8 @@ self: { sha256 = "1vcax1ipkd8s44pasr8qdrgjav4n2jnxd2qwamrl7kf6lm1i8n18"; libraryHaskellDepends = [ aeson base ]; description = "data types to describe HTTP services"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -50158,8 +50333,8 @@ self: { template-haskell text time transformers yaml ]; description = "A canteven way of setting up logging for your program"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -50175,8 +50350,8 @@ self: { base Cabal old-locale time timezone-series tz ]; description = "Date / time parsing utilities that try to guess the date / time format"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -50193,7 +50368,7 @@ self: { text ]; description = "A few utilites and helpers for using Template Haskell in your projects"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "cantor" = callPackage @@ -50215,8 +50390,8 @@ self: { hxt-xpath parsec QuickCheck split ]; description = "Application for analysis of java source code"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -50234,7 +50409,7 @@ self: { testHaskellDepends = [ base containers hspec mtl ]; testToolDepends = [ hspec-discover ]; description = "Convert data to and from a natural number representation"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "cao" = callPackage @@ -50256,7 +50431,7 @@ self: { executableToolDepends = [ alex happy ]; description = "CAO Compiler"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -50271,8 +50446,8 @@ self: { enableSeparateDataOutput = true; executableHaskellDepends = [ array base containers haskell98 ]; description = "Interprets and debug the cap language"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -50296,8 +50471,8 @@ self: { unliftio ]; description = "Extensional capabilities and deriving combinators"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -50319,7 +50494,7 @@ self: { tasty-hunit tasty-smallcheck teardown time uuid ]; description = "OTP-like supervision trees in Haskell"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "capnp" = callPackage @@ -50358,8 +50533,8 @@ self: { safe-exceptions stm supervisors text transformers vector ]; description = "Cap'n Proto for Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -50371,8 +50546,8 @@ self: { sha256 = "0sik7svknaam6fhlvb4p1ijwaiwrgssrdl9gmq1wmfx66g069xi9"; libraryHaskellDepends = [ base ]; description = "A list-like type for lazy sequences, with a user-defined termination value"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -50388,8 +50563,8 @@ self: { base Cabal directory filepath process ]; description = "A simple wrapper over cabal-install to operate in project-private mode"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -50412,8 +50587,8 @@ self: { transformers utility-ht ]; description = "Simple web-server for organizing car-pooling for an event"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -50438,8 +50613,8 @@ self: { test-framework-hunit test-framework-quickcheck2 transformers ]; description = "High-level OpenGL bindings"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -50454,8 +50629,8 @@ self: { base mysql-simple postgresql-simple split time ]; description = "some spaghetti code"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -50473,8 +50648,8 @@ self: { base bytestring filepath haskell98 IfElse MissingH ]; description = "Drop emails from threads being watched into special CC folder"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -50496,8 +50671,8 @@ self: { QuickCheck quiet random text transformers vector ]; description = "Algorithms for coin selection and fee balancing"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -50530,8 +50705,8 @@ self: { ]; testToolDepends = [ cardano-tx ]; description = "Library utilities for constructing and signing Cardano transactions"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {cardano-binary = null; cardano-crypto = null; cardano-crypto-wrapper = null; cardano-ledger = null; @@ -50554,8 +50729,8 @@ self: { highlighting-kate mtl pandoc pango process text time ]; description = "A presentation tool written with Haskell"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -50573,7 +50748,7 @@ self: { testHaskellDepends = [ array base ix-shapable QuickCheck ]; benchmarkHaskellDepends = [ array base ]; description = "A C-compatible array library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "carte" = callPackage @@ -50591,8 +50766,8 @@ self: { time transformers tuple ]; description = "Carte: A commandline pastebin server"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -50621,8 +50796,8 @@ self: { time transformers ]; description = "Specify Cabal files in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -50642,7 +50817,7 @@ self: { time unix unordered-containers vector ]; description = "A hashing class for content-addressed storage"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "cas-hashable-s3" = callPackage @@ -50658,7 +50833,7 @@ self: { resourcet ]; description = "ContentHashable instances for S3 objects"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "cas-store" = callPackage @@ -50682,7 +50857,7 @@ self: { tasty tasty-hunit unix ]; description = "A content-addressed storage"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "casa-abbreviations-and-acronyms" = callPackage @@ -50704,8 +50879,8 @@ self: { optparse-applicative wreq ]; description = "CASA Abbreviations and Acronyms"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -50727,7 +50902,7 @@ self: { unliftio-core unordered-containers ]; description = "Client for Casa"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "casa-types" = callPackage @@ -50745,7 +50920,7 @@ self: { path-pieces persistent text ]; description = "Types for Casa"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "casa-types_0_0_2" = callPackage @@ -50761,8 +50936,8 @@ self: { path-pieces persistent text ]; description = "Types for Casa"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "casadi-bindings" = callPackage @@ -50786,8 +50961,8 @@ self: { test-framework-hunit test-framework-quickcheck2 vector ]; description = "mid-level bindings to CasADi"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {casadi = null;}; @@ -50804,8 +50979,8 @@ self: { ]; libraryPkgconfigDepends = [ casadi_control ]; description = "low level bindings to casadi-control"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {casadi_control = null;}; @@ -50822,8 +50997,8 @@ self: { ]; librarySystemDepends = [ casadi ]; description = "autogenerated low level bindings to casadi"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {casadi = null;}; @@ -50836,8 +51011,8 @@ self: { libraryHaskellDepends = [ base containers vector ]; librarySystemDepends = [ casadi ]; description = "low level bindings to CasADi"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {casadi = null;}; @@ -50854,8 +51029,8 @@ self: { ]; libraryPkgconfigDepends = [ casadi_ipopt_interface ]; description = "low level bindings to casadi-ipopt_interface"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {casadi_ipopt_interface = null;}; @@ -50872,8 +51047,8 @@ self: { ]; libraryPkgconfigDepends = [ casadi_snopt_interface ]; description = "low level bindings to casadi-snopt_interface"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {casadi_snopt_interface = null;}; @@ -50890,8 +51065,8 @@ self: { utf8-string web-routes ]; description = "DSL for HTML CSS (Cascading Style Sheets)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -50907,7 +51082,7 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base HUnit ]; description = "Convert between different cases"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "case-insensitive" = callPackage @@ -50924,7 +51099,7 @@ self: { ]; benchmarkHaskellDepends = [ base bytestring criterion deepseq ]; description = "Case insensitive string comparison"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "case-insensitive-match" = callPackage @@ -50945,7 +51120,7 @@ self: { text ]; description = "A simplified, faster way to do case-insensitive matching"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cased" = callPackage @@ -50956,8 +51131,8 @@ self: { sha256 = "08xdc0mpp6b6inaxh6cr6ni08sy2ahfcbq8xbs3m4cfqbrqfd543"; libraryHaskellDepends = [ base text ]; description = "Track string casing in its type"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ jb55 ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jb55 ]; }) {}; "caseof" = callPackage @@ -50968,8 +51143,8 @@ self: { sha256 = "1j8r8ldaxgyvka3zpqfl8qp0mbwrnh1s1xl5fgx3jjzqxlisfdp3"; libraryHaskellDepends = [ base template-haskell ]; description = "Combinators for casing on constructors"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -50988,8 +51163,8 @@ self: { ]; benchmarkHaskellDepends = [ criterion mwc-random rerebase ]; description = "A converter for spinal, snake and camel cases"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -51006,8 +51181,8 @@ self: { base deepseq haskell98 HaXml network parallel pretty ]; description = "the Computer Algebra SHell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -51022,7 +51197,7 @@ self: { libraryHaskellDepends = [ base split ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Convert between various source code casing conventions"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "casr-logbook" = callPackage @@ -51037,7 +51212,7 @@ self: { ]; description = "CASR 61.345 Pilot Personal Logbook"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "casr-logbook-html" = callPackage @@ -51057,7 +51232,7 @@ self: { ]; description = "CASR 61.345 Pilot Personal Logbook HTML output"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "casr-logbook-meta" = callPackage @@ -51074,7 +51249,7 @@ self: { ]; description = "Meta-information about entries in a CASR 61.345 logbook (casr-logbook)"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "casr-logbook-meta-html" = callPackage @@ -51095,7 +51270,7 @@ self: { ]; description = "Meta-information about entries in a CASR 61.345 logbook (casr-logbook) HTML output"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "casr-logbook-reports" = callPackage @@ -51114,7 +51289,7 @@ self: { ]; description = "CASR 61.345 logbook (casr-logbook) reports."; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "casr-logbook-reports-html" = callPackage @@ -51135,7 +51310,7 @@ self: { ]; description = "CASR 61.345 logbook reports HTML output"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "casr-logbook-reports-meta" = callPackage @@ -51154,7 +51329,7 @@ self: { ]; description = "Reports on meta-information about entries in a CASR 61.345 logbook (casr-logbook)"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "casr-logbook-reports-meta-html" = callPackage @@ -51177,7 +51352,7 @@ self: { ]; description = "HTML output for reports on meta-information about entries in a CASR 61.345 logbook"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "casr-logbook-types" = callPackage @@ -51196,7 +51371,7 @@ self: { ]; description = "CASR 61.345 Pilot Personal Logbook"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "cassandra-cql" = callPackage @@ -51214,8 +51389,8 @@ self: { uuid ]; description = "Haskell client for Cassandra's CQL protocol"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -51228,7 +51403,7 @@ self: { libraryHaskellDepends = [ base bytestring containers Thrift ]; description = "thrift bindings to the cassandra database"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "cassava" = callPackage @@ -51255,7 +51430,7 @@ self: { test-framework-quickcheck2 text unordered-containers vector ]; description = "A CSV parsing and encoding library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cassava-conduit" = callPackage @@ -51275,8 +51450,8 @@ self: { ]; benchmarkHaskellDepends = [ base criterion ]; description = "Conduit interface for cassava package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -51295,7 +51470,7 @@ self: { base bytestring cassava template-haskell vector ]; description = "CSV-file embedding library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cassava-generic" = callPackage @@ -51311,7 +51486,7 @@ self: { unordered-containers vector ]; description = "Cassave instances for functor-like datatypes like `Either String a`"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cassava-megaparsec" = callPackage @@ -51329,7 +51504,7 @@ self: { base bytestring cassava hspec hspec-megaparsec vector ]; description = "Megaparsec parser of CSV files that plays nicely with Cassava"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "cassava-records" = callPackage @@ -51351,8 +51526,8 @@ self: { unordered-containers vector ]; description = "Auto-generation of records data type"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -51374,7 +51549,7 @@ self: { tasty-quickcheck vector ]; description = "io-streams interface for the cassava CSV library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cassette" = callPackage @@ -51385,8 +51560,8 @@ self: { sha256 = "04qnk1s4bdj3wbbxdwzzvpnhkcgma8c4qfkg454ybg7f8kyv6h7x"; libraryHaskellDepends = [ base ]; description = "A combinator library for simultaneously defining parsers and pretty printers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -51414,8 +51589,8 @@ self: { test-framework-quickcheck2 text Thrift time ]; description = "A high level driver for the Cassandra datastore"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -51427,7 +51602,7 @@ self: { sha256 = "14dwsy80v1k0d9ksxb83h5lrz311d3nsgzcxxvivcdj4jzjlbm94"; libraryHaskellDepends = [ base ]; description = "Abstact cast pattern"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "castagnoli" = callPackage @@ -51445,8 +51620,8 @@ self: { ]; testHaskellDepends = [ base bytestring primitive text ]; description = "Portable CRC-32C"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {primitive-slice = null;}; @@ -51469,7 +51644,7 @@ self: { ]; testToolDepends = [ tasty-discover ]; description = "Multicast, thread-safe, and fast logger"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "castle" = callPackage @@ -51487,8 +51662,8 @@ self: { system-filepath text ]; description = "A tool to manage shared cabal-install sandboxes"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -51503,8 +51678,8 @@ self: { enableSeparateDataOutput = true; executableHaskellDepends = [ base gtk haskell98 mtl parsec ]; description = "Equation Manipulator"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -51517,8 +51692,8 @@ self: { libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "Exposes a Template Haskell function for generating catamorphisms"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -51530,8 +51705,8 @@ self: { sha256 = "05fvrkvqyj7xdn6vvdwhfbym7rg9fl7r7lzzcsr2cx59iqi23frx"; libraryHaskellDepends = [ base mtl transformers ]; description = "MonadThrow and MonadCatch, using functional dependencies"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -51543,8 +51718,8 @@ self: { sha256 = "1kx6195mfnw4aqmcd1m4s8z5l1s8zh69in00p9a0mxm3xj3pfvpl"; libraryHaskellDepends = [ base newtype pointless-haskell void ]; description = "Categorical Monoids and Semirings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -51556,7 +51731,7 @@ self: { sha256 = "18ihv16g4w0s6n89c64j4998hbsgzhp5w9ph2gdkygq7f30cx7f2"; libraryHaskellDepends = [ base void ]; description = "Categories"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "category" = callPackage @@ -51567,7 +51742,7 @@ self: { sha256 = "0iya7q3b1z1bxv4amsibmc1lrmf7dng76nzcnanwy300jm1n42w7"; libraryHaskellDepends = [ alg base dual transformers ]; description = "Categorical types and classes"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "category-extras" = callPackage @@ -51594,8 +51769,8 @@ self: { ]; doHaddock = false; description = "A meta-package documenting various packages inspired by category theory"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -51607,7 +51782,7 @@ self: { sha256 = "198bpnmmkwzx9z0n850pgzr2i9yw0kmd4g2m3fhifkhgy6zfidji"; libraryHaskellDepends = [ base bytestring comonad text ]; description = "Highbrow approach to type-safe printf format specifications"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "category-traced" = callPackage @@ -51620,8 +51795,8 @@ self: { editedCabalFile = "0c4bb2wa3yd1blnji9i1bpx883y2q7aklqckyr5n8c5bzwwyb9ql"; libraryHaskellDepends = [ base categories ]; description = "Traced monoidal categories"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -51641,8 +51816,8 @@ self: { template-haskell terminal-size transformers vcs-revision ]; description = "Simple tool to display text files with line numbers and paging"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -51654,7 +51829,7 @@ self: { sha256 = "0kydmb5f714pfgjz6drqi91m43bgs2sfap2nbww92xxyjbcls3j6"; libraryHaskellDepends = [ aeson base transformers validity ]; description = "Keep track of warnings and errors during calculations"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cautious-file" = callPackage @@ -51672,8 +51847,8 @@ self: { base bytestring directory filepath unix ]; description = "Ways to write a file cautiously, to reduce the chances of problems such as data loss due to crashes or power failures"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -51690,8 +51865,8 @@ self: { base cautious genvalidity genvalidity-hspec genvalidity-hspec-aeson hspec QuickCheck ]; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -51708,8 +51883,8 @@ self: { ]; testHaskellDepends = [ base base16-bytestring hspec ]; description = "Cayenne Low Power Payload"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ sorki ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ sorki ]; }) {}; "cayley-client" = callPackage @@ -51728,8 +51903,8 @@ self: { ]; testHaskellDepends = [ aeson base hspec unordered-containers ]; description = "A Haskell client for the Cayley graph database"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -51742,7 +51917,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base random ]; description = "Complex numbers, quaternions, octonions, sedenions, etc"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "cblrepo" = callPackage @@ -51765,7 +51940,7 @@ self: { ]; description = "Tool to maintain a database of CABAL packages and their dependencies"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "cbor-tool" = callPackage @@ -51786,7 +51961,7 @@ self: { scientific text unordered-containers vector ]; description = "A tool for manipulating CBOR"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cborg" = callPackage @@ -51810,7 +51985,7 @@ self: { tasty-hunit tasty-quickcheck text vector ]; description = "Concise Binary Object Representation (CBOR)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cborg-json" = callPackage @@ -51833,7 +52008,7 @@ self: { zlib ]; description = "A library for encoding JSON as CBOR"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ccast" = callPackage @@ -51844,7 +52019,7 @@ self: { sha256 = "1yls8b1kjmdc8gh1i4vaaav1sgvfccyjfqxjpvb7gw27ivma3v7l"; libraryHaskellDepends = [ base template-haskell ]; description = "typesafe c-style casts; useful for FFI"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cci" = callPackage @@ -51866,8 +52041,8 @@ self: { process random time ]; description = "Bindings for the CCI networking library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {cci = null;}; @@ -51879,8 +52054,8 @@ self: { sha256 = "18gnm6skzdnh6cis7l7v3d5813zn6irw6nywg6shffrn8v2y6xh7"; libraryHaskellDepends = [ base bytestring ]; description = "A Haskell implementation of the CCNx network protocol"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -51897,8 +52072,8 @@ self: { ]; librarySystemDepends = [ dttools ]; description = "High-level interface to CCTools' WorkQueue library"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {dttools = null;}; @@ -51920,7 +52095,7 @@ self: { testHaskellDepends = [ base hspec ]; benchmarkHaskellDepends = [ base bytestring criterion ]; description = "Extract dependencies from C code"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cedict" = callPackage @@ -51938,7 +52113,7 @@ self: { ]; description = "Convenient Chinese phrase & character lookup"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -51953,8 +52128,8 @@ self: { libraryHaskellDepends = [ base bytestring text time ]; testHaskellDepends = [ base directory doctest filepath ]; description = "CEF log format"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -51968,8 +52143,8 @@ self: { librarySystemDepends = [ cef ]; libraryPkgconfigDepends = [ gtk2 ]; description = "Raw CEF3 bindings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {cef = null; inherit (pkgs) gtk2;}; @@ -51981,8 +52156,8 @@ self: { sha256 = "0h4k5mcbpxxv7nd9vf3nc2ynsnncc97q3q5s58gj10q2qpmvl1v7"; libraryHaskellDepends = [ base cef3-raw ]; description = "Simple wrapper around cef3-raw"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -52006,8 +52181,8 @@ self: { text transformers vaultaire-common ]; description = "Common Haskell types and encoding for OpenStack Ceilometer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -52021,8 +52196,8 @@ self: { libraryPkgconfigDepends = [ gtk2 ]; libraryToolDepends = [ c2hs ]; description = "Cairo-based CellRenderer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) gtk2;}; @@ -52047,8 +52222,8 @@ self: { ]; testHaskellDepends = [ base hspec raw-strings-qq ]; description = "A tool to build a novel"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -52076,8 +52251,8 @@ self: { ]; testHaskellDepends = [ base ]; description = "Protect and control API access with cerberus"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -52097,7 +52272,7 @@ self: { test-framework-quickcheck2 ]; description = "A binary serialization library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cereal-conduit" = callPackage @@ -52117,7 +52292,7 @@ self: { base bytestring cereal conduit HUnit mtl transformers ]; description = "Turn Data.Serialize Gets and Puts into Sources, Sinks, and Conduits"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cereal-data-dword" = callPackage @@ -52128,7 +52303,7 @@ self: { sha256 = "14z0h7hz170l1zhz7add01q9n0v2diijskdrwfzqhvcka7a69566"; libraryHaskellDepends = [ base cereal data-dword ]; description = "Integration of \"cereal\" and \"data-dword\""; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "cereal-derive" = callPackage @@ -52139,8 +52314,8 @@ self: { sha256 = "04mlg1r2qvrwdzcfbf1aqs4bf9n2gc7cwv73fbhld2ji5naa6fwb"; libraryHaskellDepends = [ base cereal ghc-prim ]; description = "Automatic deriving of Serialize using GHC.Generics"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -52152,8 +52327,8 @@ self: { sha256 = "0lpsj4f7v4sgrr6lf8jl07xwj8j3i3wj23as0imswk71f7xwfnnk"; libraryHaskellDepends = [ base bytestring cereal enumerator ]; description = "Deserialize things with cereal and enumerator"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -52165,8 +52340,8 @@ self: { sha256 = "1gr22ziz9bj4q3y8j1vg46m648zqvbajfdks8p64xc28ci25pw2s"; libraryHaskellDepends = [ array base cereal ]; description = "Floating point support for the 'cereal' serialization library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -52189,8 +52364,8 @@ self: { criterion io-streams ]; description = "io-streams support for the cereal binary serialization library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -52214,8 +52389,8 @@ self: { unordered-containers vector ]; description = "An extended serialization library on top of \"cereal\""; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -52238,8 +52413,8 @@ self: { criterion io-streams transformers ]; description = "Use cereal to encode/decode io-streams"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -52251,7 +52426,7 @@ self: { sha256 = "0k1ml0z5rksvrhz15i9afld7bybgylqmy5nmvik3p98zd3s1ayiw"; libraryHaskellDepends = [ base cereal text ]; description = "Data.Text instances for the cereal serialization library"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "cereal-time" = callPackage @@ -52263,8 +52438,8 @@ self: { libraryHaskellDepends = [ base cereal time ]; testHaskellDepends = [ base cereal hspec QuickCheck time ]; description = "Serialize instances for types from `time` package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -52278,7 +52453,7 @@ self: { base cereal hashable unordered-containers ]; description = "Integration of \"cereal\" and \"unordered-containers\""; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "cereal-uuid" = callPackage @@ -52289,7 +52464,7 @@ self: { sha256 = "1jg8rkndb1q1l0dnqrkkl0mlsxkcyqcfldb5k8kk9d2lg3plz030"; libraryHaskellDepends = [ base cereal uuid ]; description = "Integration of \"cereal\" and \"uuid\""; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "cereal-vector" = callPackage @@ -52301,7 +52476,7 @@ self: { libraryHaskellDepends = [ base bytestring cereal vector ]; testHaskellDepends = [ base cereal QuickCheck vector ]; description = "Serialize instances for Data.Vector types."; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "certificate" = callPackage @@ -52322,8 +52497,8 @@ self: { directory filepath mtl pem process time ]; description = "Certificates and Key Reader/Writer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -52341,8 +52516,8 @@ self: { test-framework-th ]; description = "Exact real arithmetic using continued fractions"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -52359,8 +52534,8 @@ self: { aeson base containers hspec raw-strings-qq ]; description = "A library getting the environment when running on Cloud Foundry"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -52378,8 +52553,8 @@ self: { base bytestring containers data-default dequeue mtl ]; description = "cfipu processor for toy brainfuck-like language"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -52398,8 +52573,8 @@ self: { value-supply ]; description = "Constraint Functional-Logic Programming in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -52417,8 +52592,8 @@ self: { base bytestring containers data-default dequeue mtl ]; description = "cfopu processor"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -52439,8 +52614,8 @@ self: { unordered-containers utf8-string void ]; description = "Parser for categorial grammars"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -52460,8 +52635,8 @@ self: { ]; doHaddock = false; description = "generates Haskell bindings and C wrappers for C++ libraries"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -52480,7 +52655,7 @@ self: { parsec time xhtml ]; description = "A library for writing CGI programs"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cgi-undecidable" = callPackage @@ -52491,7 +52666,7 @@ self: { sha256 = "1xh3q0s7398gd3513ycxypnj0m9jn0kdbb7459dsb459kbvzdpab"; libraryHaskellDepends = [ base cgi mtl ]; description = "Undecidable instances for the cgi package"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cgi-utils" = callPackage @@ -52504,8 +52679,8 @@ self: { editedCabalFile = "0lnx7n8pagi3pw57cz4nz01lhfjmsyhk3z3kwgfrmdyrb3kb276z"; libraryHaskellDepends = [ base cgi containers mtl random ]; description = "Simple modular utilities for CGI/FastCGI (sessions, etc.)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -52531,8 +52706,8 @@ self: { unordered-containers utf8-string yaml ]; description = "Command line tool"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -52545,7 +52720,7 @@ self: { libraryHaskellDepends = [ base containers JuicyPixels ]; testHaskellDepends = [ base containers hspec JuicyPixels ]; description = "Library decoding chain codes from images"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "chainweb-mining-client" = callPackage @@ -52571,8 +52746,57 @@ self: { wai-extra ]; description = "Mining Client for Kadena Chainweb"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + + "chakra" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cryptonite + , data-default, data-has, dotenv, envy, fast-logger, hspec + , http-types, iproute, jose, lens, mtl, network, network-uri + , options, optparse-simple, prometheus-client + , prometheus-metrics-ghc, rio, servant-auth, servant-auth-server + , servant-server, streaming-commons, string-conversions, text, time + , transformers, unordered-containers, wai, wai-cli, wai-extra + , wai-middleware-prometheus, warp + }: + mkDerivation { + pname = "chakra"; + version = "0.1.0"; + sha256 = "00ygnyvif8z8x9xasa3s9yahsawdmkjg43afczd5i0p3clfg6385"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal base bytestring cryptonite data-default + data-has dotenv envy fast-logger http-types iproute jose lens mtl + network network-uri options prometheus-client + prometheus-metrics-ghc rio servant-auth servant-auth-server + servant-server streaming-commons string-conversions text time + transformers unordered-containers wai wai-cli wai-extra + wai-middleware-prometheus warp + ]; + executableHaskellDepends = [ + aeson ansi-terminal base bytestring cryptonite data-default + data-has dotenv envy fast-logger http-types iproute jose lens mtl + network network-uri options optparse-simple prometheus-client + prometheus-metrics-ghc rio servant-auth servant-auth-server + servant-server streaming-commons string-conversions text time + transformers unordered-containers wai wai-cli wai-extra + wai-middleware-prometheus warp + ]; + testHaskellDepends = [ + aeson ansi-terminal base bytestring cryptonite data-default + data-has dotenv envy fast-logger hspec http-types iproute jose lens + mtl network network-uri options prometheus-client + prometheus-metrics-ghc rio servant-auth servant-auth-server + servant-server streaming-commons string-conversions text time + transformers unordered-containers wai wai-cli wai-extra + wai-middleware-prometheus warp + ]; + description = "A REST Web Api server template for building (micro)services"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -52584,7 +52808,7 @@ self: { sha256 = "1iyyz3rmnry3myw985qmqjyikhq41dw16rjs5gfgqbx7j1wrykpj"; libraryHaskellDepends = [ base ]; description = "Terminal string styling"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "chalkboard" = callPackage @@ -52602,8 +52826,8 @@ self: { data-reify directory GLUT OpenGLRaw process time ]; description = "Combinators for building and processing 2D images"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -52615,8 +52839,8 @@ self: { sha256 = "1gvnp176j8gd0s6wzq10zpiqkn3wma99pwn3f78wgxm9rh588gh2"; libraryHaskellDepends = [ array base chalkboard GLUT OpenGL time ]; description = "OpenGL based viewer for chalkboard rendered images"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -52629,7 +52853,7 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ array base process random ]; description = "Hardware description EDSL"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "chan" = callPackage @@ -52641,7 +52865,7 @@ self: { libraryHaskellDepends = [ async base stm ]; testHaskellDepends = [ async base stm ]; description = "Some extra kit for Chans"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "chan-split" = callPackage @@ -52652,7 +52876,7 @@ self: { sha256 = "1mzvrxcf263gs61hj7gafra1cqvpfbzy7rza7ql0xvnmj2g2ybrc"; libraryHaskellDepends = [ base stm ]; description = "Concurrent Chans as read/write pairs. Also provides generic Chan pair class."; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "change-monger" = callPackage @@ -52666,7 +52890,7 @@ self: { libraryHaskellDepends = [ base process ]; executableHaskellDepends = [ directory ]; description = "Parse VCS changelogs into ChangeLogs"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "changelogged" = callPackage @@ -52695,7 +52919,7 @@ self: { unordered-containers ]; description = "Changelog manager for Git projects"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "char-decode" = callPackage @@ -52709,7 +52933,7 @@ self: { libraryHaskellDepends = [ base bytestring text ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; description = "Convert legacy byte encodings to and from Unicode"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "char-qq" = callPackage @@ -52720,7 +52944,7 @@ self: { sha256 = "01mbavg50g64bmlvjr499hzv1975imri2zwj91964g58xghfba9q"; libraryHaskellDepends = [ base template-haskell ]; description = "Quasiquoters for characters and codepoints"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "character-cases" = callPackage @@ -52739,8 +52963,8 @@ self: { template-haskell ]; description = "Exposes subspecies types of Char. And naming cases."; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -52764,8 +52988,8 @@ self: { random snap snap-core snap-extras snap-server text xmlhtml ]; description = "Rapid prototyping websites with Snap and Heist"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -52777,13 +53001,13 @@ self: { pname = "charset"; version = "0.3.7.1"; sha256 = "1gn0m96qpjww8hpp2g1as5yy0wcwy4iq73h3kz6g0yxxhcl5sh9x"; - revision = "1"; - editedCabalFile = "1z6nxw2g9vgsjq0g159sk8mwj68lwzxzi5iv5ynha0h85jcqxszy"; + revision = "2"; + editedCabalFile = "002x3yan7632nqgwk0a7f3wvchgm95pdwqh225va8dnn1lr9pi1z"; libraryHaskellDepends = [ array base bytestring containers semigroups unordered-containers ]; description = "Fast unicode character sets based on complemented PATRICIA tries"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "charsetdetect" = callPackage @@ -52824,8 +53048,8 @@ self: { filepath hashable lens optparse-applicative text time ]; description = "Command-line utility to draw charts from input data easily"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -52837,35 +53061,40 @@ self: { sha256 = "0sfv86c9sj8ihrrv56kk61fkzikxh765rz4lrp5paymri5l0m408"; libraryHaskellDepends = [ base Chart ]; description = "Easily render histograms with Chart"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; "chart-svg" = callPackage - ({ mkDerivation, attoparsec, base, Color, containers, doctest - , generic-lens, lens, lucid, numhask, numhask-space, pretty-simple + ({ mkDerivation, attoparsec, base, bytestring, Color, concurrency + , cubicbezier, doctest, foldl, generic-lens, JuicyPixels, lens + , linear, lucid, numhask, numhask-space, reanimate, reanimate-svg , scientific, tagsoup, text, time, transformers - , unordered-containers, web-rep + , unordered-containers, vector }: mkDerivation { pname = "chart-svg"; - version = "0.1.3"; - sha256 = "0b3hpxm7xjw8pjhpcla46jdsjhqxxb3ga0jmmj97wn6w971yphi1"; + version = "0.2.0"; + sha256 = "1w7381r9zfj02c5r6fbza1x2qdxyqpgb3dj2wld73pzcladszp34"; + revision = "1"; + editedCabalFile = "18ilaajn42jni3pgzyc9f7z6ph3jyf0wrjfv9jnsp3ypyjj7yjn3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - attoparsec base Color generic-lens lens lucid numhask numhask-space - pretty-simple scientific tagsoup text time transformers web-rep + attoparsec base Color cubicbezier foldl generic-lens JuicyPixels + lens linear lucid numhask numhask-space reanimate reanimate-svg + scientific tagsoup text time transformers unordered-containers ]; executableHaskellDepends = [ - base containers generic-lens lens lucid numhask numhask-space text - transformers unordered-containers web-rep + attoparsec base bytestring concurrency foldl JuicyPixels lens + linear lucid numhask numhask-space reanimate reanimate-svg text + time transformers unordered-containers vector ]; testHaskellDepends = [ base doctest numhask ]; - description = "Charts in SVG"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + description = "Charting library targetting SVGs"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -52889,8 +53118,8 @@ self: { executableHaskellDepends = [ base numhask ]; testHaskellDepends = [ base doctest numhask ]; description = "See readme.md"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -52915,8 +53144,8 @@ self: { tasty-hspec ]; description = "Native haskell charts"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -52944,8 +53173,8 @@ self: { aeson async base bytestring containers http-types mtl one-liner process scientific text wai warp ]; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -52968,7 +53197,7 @@ self: { vector ]; description = "Chase & Lev work-stealing lock-free double-ended queues (deques)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "chassis" = callPackage @@ -52987,7 +53216,7 @@ self: { profunctors rio text time vinyl ]; description = "Prelude with algebraic constructs and polykinds on"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "chatter" = callPackage @@ -53021,8 +53250,8 @@ self: { tasty-quickcheck text tokenize unordered-containers ]; description = "A library of simple NLP algorithms"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -53040,7 +53269,7 @@ self: { template-haskell text time transformers unix ]; description = "Some monad transformers and typeclasses for text in- and output abstraction"; - license = stdenv.lib.licenses.agpl3; + license = lib.licenses.agpl3; }) {}; "chatty-text" = callPackage @@ -53053,8 +53282,8 @@ self: { editedCabalFile = "11vpzarrbk0jlsnamrnf4xp3gzkgwrbs6x5mr9m5rr4lrw1f9q0v"; libraryHaskellDepends = [ base chatty transformers ]; description = "Provides some classes and types for dealing with text, using the fundaments of Chatty"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.agpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -53066,7 +53295,7 @@ self: { sha256 = "1pzg0bf73shwl91x4011khw62wgv33y5862gq110q8g913w4jrjw"; libraryHaskellDepends = [ base mtl text transformers ]; description = "Some utilities every serious chatty-based application may need"; - license = stdenv.lib.licenses.agpl3; + license = lib.licenses.agpl3; }) {}; "chatwork" = callPackage @@ -53094,8 +53323,8 @@ self: { servant-server text warp ]; description = "The ChatWork API in Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -53117,7 +53346,7 @@ self: { ]; executableHaskellDepends = [ base blaze-html bytestring text ]; description = "Experimental markdown processor"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cheapskate-highlight" = callPackage @@ -53134,7 +53363,7 @@ self: { base blaze-html cheapskate highlighting-kate text ]; description = "Code highlighting for cheapskate"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cheapskate-lucid" = callPackage @@ -53147,7 +53376,7 @@ self: { editedCabalFile = "197nx95xw21i7zyvgzcgnr36ab6vrk17c66iz8ndwz61vp1jf6hc"; libraryHaskellDepends = [ base blaze-html cheapskate lucid ]; description = "Use cheapskate with Lucid"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cheapskate-terminal" = callPackage @@ -53173,8 +53402,8 @@ self: { hscolour terminal-size text ]; description = "Initial project template from stack"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -53187,7 +53416,7 @@ self: { libraryHaskellDepends = [ base bytestring email-validate ]; librarySystemDepends = [ resolv ]; description = "Confirm whether an email is valid and probably existant"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {resolv = null;}; "check-pvp" = callPackage @@ -53206,8 +53435,8 @@ self: { haskell-src-exts hse-cpp non-empty tagged transformers utility-ht ]; description = "Check whether module and package imports conform to the PVP"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -53221,8 +53450,8 @@ self: { editedCabalFile = "110g32gvn5cjdf4cbvv642asziinsh50b1c5675qzza77jg7hwid"; libraryHaskellDepends = [ base ]; description = "Bounds-checking integer types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -53236,7 +53465,7 @@ self: { array base QuickCheck random semigroupoids ]; description = "Check properties on standard classes and data structures"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "checkmate" = callPackage @@ -53266,8 +53495,8 @@ self: { QuickCheck quickcheck-text temporary text ]; description = "Generate checklists relevant to a given patch"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.agpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -53279,7 +53508,7 @@ self: { sha256 = "0327lihvibnhs2c0gnmm13g6iaw53ka3w2j1rng4d1vnrxphyyik"; libraryHaskellDepends = [ base explicit-exception utility-ht ]; description = "Compute and verify checksums of ISBN, IBAN, etc"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "chell" = callPackage @@ -53297,7 +53526,7 @@ self: { template-haskell text transformers ]; description = "A simple and intuitive library for automated testing"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "chell-hunit" = callPackage @@ -53308,7 +53537,7 @@ self: { sha256 = "18p9rhs81b43jb95dqg650h3cajsw45w7cgsavkm18h0qhrz41kb"; libraryHaskellDepends = [ base chell HUnit ]; description = "HUnit support for the Chell testing library"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "chell-quickcheck" = callPackage @@ -53319,37 +53548,37 @@ self: { sha256 = "0n8c57n88r2bx0bh8nabsz07m42rh23ahs3hgyzf8gr76l08zq03"; libraryHaskellDepends = [ base chell QuickCheck random ]; description = "QuickCheck support for the Chell testing library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; "cherry-core-alpha" = callPackage - ({ mkDerivation, async, base, base64-bytestring, binary, bytestring - , case-insensitive, cherry-core, containers, directory, ghc-prim - , hspec, hspec-discover, http-client, http-client-tls, http-types - , mtl, network, safe-exceptions, scientific, stm, text-utf8, time - , unix, utf8-string, vector, wai, wai-extra, wai-middleware-static - , warp + ({ mkDerivation, aeson, async, base, base64-bytestring, binary + , bytestring, case-insensitive, cherry-core, containers, directory + , ghc-prim, hspec, hspec-discover, http-client, http-client-tls + , http-types, jose-jwt, mtl, network, postgresql-libpq + , safe-exceptions, scientific, stm, text, text-utf8, time, unix + , utf8-string, vector, wai, wai-extra, wai-middleware-static, warp }: mkDerivation { pname = "cherry-core-alpha"; - version = "0.3.0.0"; - sha256 = "03plsrwzji653psjwsxmafsl24cyx6260x15cfpmb7fka5rdfs5i"; + version = "0.5.0.0"; + sha256 = "018ad2angm8n6dfw0sz3bamg38vzgv7j97vfpiidd575mf89imkn"; libraryHaskellDepends = [ - async base base64-bytestring binary bytestring case-insensitive - containers directory ghc-prim http-client http-client-tls - http-types mtl network safe-exceptions scientific stm text-utf8 - time unix utf8-string vector wai wai-extra wai-middleware-static - warp + aeson async base base64-bytestring binary bytestring + case-insensitive containers directory ghc-prim http-client + http-client-tls http-types jose-jwt mtl network postgresql-libpq + safe-exceptions scientific stm text text-utf8 time unix utf8-string + vector wai wai-extra wai-middleware-static warp ]; testHaskellDepends = [ base cherry-core containers hspec text-utf8 ]; testToolDepends = [ hspec-discover ]; description = "The core library for Cherry Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {cherry-core = null;}; @@ -53383,8 +53612,8 @@ self: { process random stm text time unordered-containers vector ]; description = "Basic chess library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -53398,7 +53627,7 @@ self: { array attoparsec base bytestring containers ]; description = "Simple library for validating chess moves and parsing PGN files"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "chevalier-common" = callPackage @@ -53415,8 +53644,8 @@ self: { protobuf text unordered-containers vaultaire-common zeromq4-haskell ]; description = "Query interface for Chevalier"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -53441,8 +53670,8 @@ self: { typed-process unix unliftio ]; description = "tmux api"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -53464,7 +53693,7 @@ self: { ]; benchmarkHaskellDepends = [ base gauge mtl random ]; description = "Lazy infinite streams with O(1) indexing"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "chiphunk" = callPackage @@ -53482,8 +53711,8 @@ self: { ]; libraryToolDepends = [ c2hs ]; description = "Haskell bindings for Chipmunk2D physics engine"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -53503,8 +53732,8 @@ self: { ]; testHaskellDepends = [ base ]; description = "Helper for the Major System"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -53516,7 +53745,7 @@ self: { sha256 = "0qcyf6nqi0nyhbf3xwyib95y29j5ir94d5vg449mkpr92crf8ryk"; libraryHaskellDepends = [ base ]; description = "A solution to boolean blindness"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "choose" = callPackage @@ -53527,8 +53756,8 @@ self: { sha256 = "1kzyl1n7shrsagkaqxb9ac9iyjzxn4f1f7hmxgid12iwfd5yqsg3"; libraryHaskellDepends = [ base MonadRandom ]; description = "Choose random elements from a stream"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -53545,8 +53774,8 @@ self: { base choose optparse-applicative text ]; description = "Command-line program to choose random element from a stream"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -53564,8 +53793,8 @@ self: { test-framework-hunit test-framework-quickcheck2 ]; description = "A module containing basic functions that the prelude does not offer"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -53583,8 +53812,8 @@ self: { test-framework-hunit test-framework-quickcheck2 ]; description = "A module containing basic geo functions"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -53600,8 +53829,8 @@ self: { base containers deepseq extensible-exceptions pretty stm ]; description = "An implementation of concurrency ideas from Communicating Sequential Processes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -53613,8 +53842,8 @@ self: { sha256 = "1x14xl9hm9n3zczj6xhffvpac09q5a13i94fhkq2kzj2s3rk1b4z"; libraryHaskellDepends = [ base chp chp-plus mtl ]; description = "MTL class instances for the CHP library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -53631,8 +53860,8 @@ self: { QuickCheck stm ]; description = "A set of high-level concurrency utilities built on Communicating Haskell Processes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -53648,8 +53877,8 @@ self: { base containers deepseq mtl pretty TypeCompose ]; description = "A mirror implementation of chp that generates a specification of the program"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -53661,8 +53890,8 @@ self: { sha256 = "0d4hcqpjxmns1fhq918s6z9f4bxlbjlkxzq5xkpqwjxpzy83wq23"; libraryHaskellDepends = [ base chp chp-plus transformers ]; description = "Transformers instances for the CHP library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -53679,8 +53908,8 @@ self: { pqueue unordered-containers ]; description = "Constraint Handling Rules"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -53699,7 +53928,7 @@ self: { unordered-containers vector ]; description = "Datatypes required for chr library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "chr-lang" = callPackage @@ -53718,8 +53947,8 @@ self: { ]; executableHaskellDepends = [ base chr-data ]; description = "AST + surface language around chr"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -53733,8 +53962,8 @@ self: { editedCabalFile = "0h3qyn306sxqsvxmz9hfba169nkc3hx7ygkxr5j2sz033fvi31jc"; libraryHaskellDepends = [ base containers uulib ]; description = "Parsing for chr library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -53748,7 +53977,7 @@ self: { editedCabalFile = "15v5bv7azi7qw33rg849wggpy07ingd8fp24dm0azwgwsqd05mb9"; libraryHaskellDepends = [ base containers ]; description = "Pretty printing for chr library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "chromatin" = callPackage @@ -53783,8 +54012,8 @@ self: { strings transformers typed-process unliftio ]; description = "neovim package manager"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -53798,8 +54027,8 @@ self: { base deepseq ghc-prim thyme vector-space ]; description = "measure timings of data evaluation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -53816,7 +54045,7 @@ self: { aeson base bytestring hourglass hspec QuickCheck vector ]; description = "Time to manipulate time"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "chronos" = callPackage @@ -53844,9 +54073,7 @@ self: { text thyme time vector ]; description = "A performant time library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + license = lib.licenses.bsd3; }) {}; "chronos-bench" = callPackage @@ -53866,8 +54093,8 @@ self: { executableHaskellDepends = [ base optparse-applicative ]; benchmarkHaskellDepends = [ base ]; description = "Benchmarking tool with focus on comparing results"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -53881,7 +54108,7 @@ self: { editedCabalFile = "04fh1g2wfm69hz1hjg4ds2c3npdx6z2mgwddlkqr2sdbnngnmv10"; libraryHaskellDepends = [ base Cabal chs-deps ]; description = "Cabal with c2hs dependencies"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "chs-deps" = callPackage @@ -53898,7 +54125,7 @@ self: { testHaskellDepends = [ base bytestring tasty tasty-hunit ]; benchmarkHaskellDepends = [ base bytestring criterion ]; description = "c2hs dependency analyzer"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "chu2" = callPackage @@ -53915,8 +54142,8 @@ self: { utf8-string ]; description = "FFI for Chu2 Agda Web Server Interface"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -53935,7 +54162,7 @@ self: { testHaskellDepends = [ base HUnit text transformers unix ]; description = "Behaviour Driven Development like Cucumber for Haskell"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "chunked-data" = callPackage @@ -53950,7 +54177,7 @@ self: { base bytestring containers semigroups text transformers vector ]; description = "Typeclasses for dealing with various chunked data representations"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "chunks" = callPackage @@ -53962,7 +54189,7 @@ self: { libraryHaskellDepends = [ base haskell98 parsec template-haskell ]; description = "Simple template library with static safety"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -53978,8 +54205,8 @@ self: { executableHaskellDepends = [ base binary bytestring text ]; testHaskellDepends = [ base binary bytestring HUnit text ]; description = "Human-readable storage of text/binary objects"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -53991,8 +54218,8 @@ self: { sha256 = "018k9a014q4zprsla5k5hrdq1zwpp7hmckc0ldaj7nf6vg1hxas2"; libraryHaskellDepends = [ base ]; description = "Automatically convert Generic instances to and from church representations"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -54005,7 +54232,7 @@ self: { libraryHaskellDepends = [ base ]; doHaddock = false; description = "Removed; please see fmlist"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "church-maybe" = callPackage @@ -54016,8 +54243,8 @@ self: { sha256 = "0zcpqsaq5ic8zw88r1kqjb592qy174b0ljjhj5qp90cvzmm7bwyz"; libraryHaskellDepends = [ base deepseq semigroupoids semigroups ]; description = "Church encoded Maybe"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -54031,7 +54258,7 @@ self: { base bifunctors semigroups transformers ]; description = "Church encoded pair"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "churros" = callPackage @@ -54049,8 +54276,8 @@ self: { async base containers doctest random stm time unagi-chan ]; description = "Channel/Arrow based streaming computation library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -54073,8 +54300,8 @@ self: { uuid wreq ]; description = "Cielo API v3 Bindings for Haskell"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.agpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -54086,8 +54313,8 @@ self: { sha256 = "0farjdyq6w33jm0qqdkfd6l7b8rr6k55dqfha643mj6nh1y904az"; libraryHaskellDepends = [ base bytestring language-c ]; description = "An interface to CIL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -54108,7 +54335,7 @@ self: { executableHaskellDepends = [ base bytestring groom text ]; testHaskellDepends = [ base hspec ]; description = "Simple C-like programming language"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "cinvoke" = callPackage @@ -54120,8 +54347,8 @@ self: { libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ cinvoke ]; description = "A binding to cinvoke"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {cinvoke = null;}; @@ -54133,8 +54360,8 @@ self: { sha256 = "0518cbfyjh13ghihvnxvbhlw4060cqw5047bdrflphmigwbvpplb"; libraryHaskellDepends = [ base monad-stm mtl parallel-io stm ]; description = "A monad for concurrent IO on a thread pool"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -54160,7 +54387,7 @@ self: { crypto-cipher-types mtl ]; description = "Fast AES cipher implementation with advanced mode of operations"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cipher-aes128" = callPackage @@ -54183,7 +54410,7 @@ self: { base bytestring cereal criterion crypto-api entropy tagged ]; description = "AES and common modes using AES-NI when available"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cipher-blowfish" = callPackage @@ -54208,8 +54435,8 @@ self: { crypto-cipher-types mtl ]; description = "Blowfish cipher"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -54235,7 +54462,7 @@ self: { crypto-cipher-types mtl ]; description = "Camellia block cipher primitives"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cipher-des" = callPackage @@ -54260,7 +54487,7 @@ self: { crypto-cipher-types mtl ]; description = "DES and 3DES primitives"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cipher-rc4" = callPackage @@ -54285,7 +54512,7 @@ self: { crypto-cipher-types deepseq mtl ]; description = "Fast RC4 cipher implementation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cipher-rc5" = callPackage @@ -54296,7 +54523,7 @@ self: { sha256 = "0l9lhyqn74mlgwm4mplm94i0x2xjmvnxnp8nm3h6aj8v5ishl1md"; libraryHaskellDepends = [ base split ]; description = "Pure RC5 implementation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ciphersaber2" = callPackage @@ -54310,8 +54537,8 @@ self: { libraryHaskellDepends = [ array base bytestring ]; executableHaskellDepends = [ array base bytestring parseargs ]; description = "Implementation of CipherSaber2 RC4 cryptography"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -54323,7 +54550,7 @@ self: { sha256 = "0n3m7kjyqic10dl06zic5qjb1yb1ff8jn9d1wchrarkprcw25knc"; libraryHaskellDepends = [ base directory mtl ]; description = "A Compiler IR Compiler"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "circle-packing" = callPackage @@ -54336,7 +54563,7 @@ self: { editedCabalFile = "1jp1b6l5v1llmggy316s4bb78wjvgq8iya0i2zz4k5v6l5dl8ln2"; libraryHaskellDepends = [ base ]; description = "Simple heuristic for packing discs of varying radii in a circle"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "circlehs" = callPackage @@ -54353,8 +54580,8 @@ self: { text time transformers unordered-containers ]; description = "The CircleCI REST API for Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -54383,7 +54610,7 @@ self: { unordered-containers ]; description = "An implementation of the \"circuit breaker\" pattern to disable repeated calls to a failing system"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "circular" = callPackage @@ -54400,8 +54627,8 @@ self: { ]; benchmarkHaskellDepends = [ base criterion vector ]; description = "Circular fixed-sized mutable vectors"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -54413,7 +54640,7 @@ self: { sha256 = "11qnc8rbw9zxrsaa49x5wmkrnr0vi6pgb1j18nrn40sbbww95xrz"; libraryHaskellDepends = [ aeson base text vector ]; description = "Cirru Parser in Haskell"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "cisco-spark-api" = callPackage @@ -54441,7 +54668,7 @@ self: { http-conduit http-types network-uri text wai warp ]; description = "DEPRECATED in favor of webex-teams-api"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "citation-resolve" = callPackage @@ -54464,8 +54691,8 @@ self: { base directory doctest filepath hspec MissingH QuickCheck ]; description = "convert document IDs such as DOI, ISBN, arXiv ID to bibliographic reference"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -54478,8 +54705,8 @@ self: { }: mkDerivation { pname = "citeproc"; - version = "0.3.0.3"; - sha256 = "0ck7hw1md1bwfl0qzkj0vg8ippmymcmvw84srr15rhaqgiqx9v4n"; + version = "0.3.0.5"; + sha256 = "18ybi21fmw9rkd4m74dgy1cf3i9l79bpalm79427kass8mv4wpia"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -54492,7 +54719,7 @@ self: { text timeit transformers ]; description = "Generates citations and bibliography from CSL styles"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }) {}; "citeproc-hs" = callPackage @@ -54511,8 +54738,8 @@ self: { syb time utf8-string ]; description = "A Citation Style Language implementation in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -54532,8 +54759,8 @@ self: { pandoc pandoc-types parsec tagsoup texmath utf8-string yaml ]; description = "A Pandoc filter for processing bibliographic references with citeproc-hs"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -54551,7 +54778,7 @@ self: { test-framework-quickcheck2 ]; description = "Bindings to CityHash"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "cj-token" = callPackage @@ -54573,8 +54800,8 @@ self: { base hspec jwt QuickCheck text text-conversions time ]; description = "A new Haskeleton package"; - license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -54592,8 +54819,8 @@ self: { ]; testHaskellDepends = [ base ]; description = "Data about Chinese, Japanese and Korean characters and languages"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -54607,8 +54834,8 @@ self: { testHaskellDepends = [ base criterion random ]; benchmarkHaskellDepends = [ base criterion ]; description = "Clifford Algebra of three dimensional space"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -54620,8 +54847,8 @@ self: { sha256 = "0sa1gaclh7b3mpqiiyqqn2gqfwkwj2ig5yzjk1y0hkzyc7rz4l3k"; libraryHaskellDepends = [ base cl3 hmatrix ]; description = "Interface to/from Cl3 and HMatrix"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -54633,8 +54860,8 @@ self: { sha256 = "15431azhvwk2fcd3aca5snpqrp8kf7zdlbyxh99i1xfdhvq4vc78"; libraryHaskellDepends = [ base cl3 linear ]; description = "Interface to/from Cl3 and Linear"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -54653,8 +54880,8 @@ self: { split ]; description = "Simple CLI RPN calculator"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -54689,8 +54916,8 @@ self: { tasty-th transformers-compat ]; description = "Compiles Clafer models to other formats: Alloy, JavaScript, JSON, HTML, Dot"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -54723,8 +54950,8 @@ self: { tasty-hunit tasty-th transformers transformers-compat ]; description = "claferIG is an interactive tool that generates instances of Clafer models"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -54744,8 +54971,8 @@ self: { utf8-string ]; description = "A wiki-based IDE for literate modeling with Clafer"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -54758,8 +54985,8 @@ self: { libraryHaskellDepends = [ aeson base bytestring text ]; testHaskellDepends = [ aeson base bytestring ]; description = "JSON Compilation Database Format encoding and decoding"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -54782,8 +55009,8 @@ self: { librarySystemDepends = [ clang ]; testHaskellDepends = [ base bytestring lens ]; description = "Pure C++ code analysis with libclang"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (self.llvmPackages) clang;}; @@ -54799,8 +55026,8 @@ self: { base bytestring directory safe strict time ]; description = "Command-line spaced-repetition software"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -54818,8 +55045,8 @@ self: { lens-aeson scientific text unordered-containers vector wreq ]; description = "API Client for the Clarifai API"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -54839,8 +55066,8 @@ self: { th-lift time transformers utility-ht vhdl ]; description = "CAES Language for Synchronous Hardware (CLaSH)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -54870,8 +55097,8 @@ self: { ]; executableHaskellDepends = [ base ]; description = "CAES Language for Synchronous Hardware"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -54909,8 +55136,8 @@ self: { tasty-hunit template-haskell text transformers unordered-containers ]; description = "CAES Language for Synchronous Hardware - As a Library"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -54925,8 +55152,8 @@ self: { libraryHaskellDepends = [ base clash-prelude deepseq ghc-typelits-knownnat QuickCheck ]; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -54965,8 +55192,8 @@ self: { base criterion deepseq template-haskell ]; description = "CAES Language for Synchronous Hardware - Prelude library"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -54980,7 +55207,7 @@ self: { libraryHaskellDepends = [ base clash-prelude QuickCheck ]; description = "QuickCheck instances for various types in the CλaSH Prelude"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "clash-systemverilog" = callPackage @@ -54997,8 +55224,8 @@ self: { unordered-containers wl-pprint-text ]; description = "CAES Language for Synchronous Hardware - SystemVerilog backend"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -55016,8 +55243,8 @@ self: { unordered-containers wl-pprint-text ]; description = "CAES Language for Synchronous Hardware - Verilog backend"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -55035,8 +55262,8 @@ self: { unordered-containers wl-pprint-text ]; description = "CAES Language for Synchronous Hardware - VHDL backend"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -55048,7 +55275,7 @@ self: { sha256 = "03d4ygqhqbg4cvfjp8c5cyy0fkgf1fpzc1li45bqc555jrxwszwr"; libraryHaskellDepends = [ base containers mtl ]; description = "Library for classification of media files"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "classify-frog" = callPackage @@ -55079,8 +55306,8 @@ self: { xml-basic ]; description = "Classify sounds produced by Xenopus laevis"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -55097,8 +55324,8 @@ self: { vector wreq ]; description = "Super simple InfluxDB package in Classy-MTL style"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -55119,8 +55346,8 @@ self: { executableHaskellDepends = [ base miso rfc ]; testHaskellDepends = [ base miso rfc ]; description = "Typeclass based support for Miso, the Tasty Web Framework for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -55136,8 +55363,8 @@ self: { base lifted-base monad-control parallel resourcet transformers ]; description = "Fork of the monad-parallel package using monad-control"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -55164,7 +55391,7 @@ self: { base containers hspec QuickCheck transformers unordered-containers ]; description = "A typeclass-based Prelude"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "classy-prelude-conduit" = callPackage @@ -55183,7 +55410,7 @@ self: { base bytestring conduit hspec QuickCheck transformers ]; description = "classy-prelude together with conduit functions"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "classy-prelude-yesod" = callPackage @@ -55201,7 +55428,7 @@ self: { yesod-static ]; description = "Provide a classy prelude including common Yesod functionality"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "classyplate" = callPackage @@ -55215,8 +55442,8 @@ self: { libraryHaskellDepends = [ base template-haskell ]; benchmarkHaskellDepends = [ base criterion parallel uniplate ]; description = "Fuseable type-class based generics"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -55230,7 +55457,7 @@ self: { testHaskellDepends = [ base hspec hspec-discover mtl text ]; testToolDepends = [ hspec-discover ]; description = "CSS preprocessor as embedded Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "clckwrks" = callPackage @@ -55264,8 +55491,8 @@ self: { librarySystemDepends = [ openssl ]; libraryToolDepends = [ hsx2hs ]; description = "A secure, reliable content management system (CMS) and blogging platform"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) openssl;}; @@ -55288,8 +55515,8 @@ self: { parsec ]; description = "a command-line interface for adminstrating some aspects of clckwrks"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -55311,8 +55538,8 @@ self: { ]; executableToolDepends = [ hsx2hs ]; description = "clckwrks.com"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -55338,8 +55565,8 @@ self: { ]; libraryToolDepends = [ hsx2hs ]; description = "bug tracking plugin for clckwrks"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -55363,8 +55590,8 @@ self: { ]; libraryToolDepends = [ hsx2hs ]; description = "ircbot plugin for clckwrks"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -55389,8 +55616,8 @@ self: { uuid uuid-orphans web-plugins web-routes web-routes-th ]; description = "mailing list plugin for clckwrks"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -55413,8 +55640,8 @@ self: { web-routes web-routes-th ]; description = "media plugin for clckwrks"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -55440,8 +55667,8 @@ self: { ]; libraryToolDepends = [ hsx2hs ]; description = "support for CMS/Blogging in clckwrks"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -55466,8 +55693,8 @@ self: { web-routes-th ]; description = "support redirects for CMS/Blogging in clckwrks"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -55485,8 +55712,8 @@ self: { mtl text web-plugins ]; description = "simple bootstrap based template for clckwrks"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -55504,8 +55731,8 @@ self: { web-plugins ]; description = "simple bootstrap based template for clckwrks"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -55518,8 +55745,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base clckwrks hsp text ]; description = "geo bootstrap based template for clckwrks"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -55531,8 +55758,8 @@ self: { sha256 = "04sh2077pn67y1apgzx6rp4z15dw7qbvwg6yrwg416k40ilz7nbd"; libraryHaskellDepends = [ base bytestring hashable text ]; description = "Haskell bindings to Google's Compact Language Detector 2"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -55550,7 +55777,7 @@ self: { base cmdargs containers directory HSH IfElse ]; description = "Keep your home dir clean by finding old conf files"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "clean-unions" = callPackage @@ -55561,8 +55788,8 @@ self: { sha256 = "1y4cj15s6gjcazwk0iycyc2qs7chrqcvchf4g5h4xnf2x8ld4i21"; libraryHaskellDepends = [ base ]; description = "Open unions without need for Typeable"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -55581,8 +55808,8 @@ self: { wl-pprint-extras wl-pprint-terminfo ]; description = "Colorized LESS"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -55597,8 +55824,8 @@ self: { libraryHaskellDepends = [ base containers mtl parsec ]; executableHaskellDepends = [ parsec ]; description = "A CSS preprocessor"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -55610,8 +55837,8 @@ self: { sha256 = "1x2q496jqvgqjbwncszl1h9ylkq6rn8h2fsp7w771xkyslfq46xy"; libraryHaskellDepends = [ base containers mtl parsec ]; description = "Lexes C++ code into simple tokens"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -55628,7 +55855,7 @@ self: { libraryHaskellDepends = [ base basement foundation ]; executableHaskellDepends = [ base basement foundation ]; description = "CLI"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cli-builder" = callPackage @@ -55644,8 +55871,8 @@ self: { ]; testHaskellDepends = [ base doctest filemanip hspec QuickCheck ]; description = "Simple project template from stack"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -55665,8 +55892,8 @@ self: { terminal-size text time transformers which ]; description = "Miscellaneous utilities for building and working with command line interfaces"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -55683,8 +55910,8 @@ self: { logging-effect megaparsec mtl text ]; description = "Bindings to the git command-line interface"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -55701,8 +55928,8 @@ self: { text ]; description = "Bindings to the nix command-line interface"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -55714,7 +55941,7 @@ self: { sha256 = "09ycy8500si810ysn70khc2np1zy21a1647kva8lkcj4pjbb1bvx"; libraryHaskellDepends = [ base directory process ]; description = "Helper setup scripts for packaging command-line tools"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "click-clack" = callPackage @@ -55733,7 +55960,7 @@ self: { ]; description = "Toy game (tetris on billiard board). Hipmunk in action."; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "clickhouse-haskell" = callPackage @@ -55769,8 +55996,8 @@ self: { unordered-containers uri-encode uuid vector word8 ]; description = "A Haskell library as database client for Clickhouse"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -55796,7 +56023,7 @@ self: { transformers ]; description = "Securely store session data in a client-side cookie"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "clif" = callPackage @@ -55813,8 +56040,8 @@ self: { ]; benchmarkHaskellDepends = [ base time ]; description = "A Clifford algebra number type for Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -55847,8 +56074,8 @@ self: { base criterion numeric-prelude stream-fusion ]; description = "A Clifford algebra library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -55868,8 +56095,8 @@ self: { optparse-applicative pointedlist process time vector vty ]; description = "Command Line Interface File Manager"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -55892,7 +56119,7 @@ self: { unliftio-core ]; description = "Building blocks for a GHCi-like REPL with colon-commands"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "clingo" = callPackage @@ -55911,8 +56138,8 @@ self: { ]; librarySystemDepends = [ clingo ]; description = "Haskell bindings to the Clingo ASP solver"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) clingo;}; @@ -55924,8 +56151,8 @@ self: { sha256 = "0qhi727irlkvi4ygx5qvd6h1zzz22588lymi39s0gcjir473a538"; libraryHaskellDepends = [ base process ]; description = "A simple Haskell library for copying text to the clipboard in a cross-platform way"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -55937,8 +56164,8 @@ self: { sha256 = "0s4n8d07190yarkxpa2kjphkm6lw2ljgwcix3x6m3lxcxrvc3nr0"; libraryHaskellDepends = [ base ]; description = "Haskell API to clipper (2d polygon union/intersection/xor/clipping API)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -55964,8 +56191,8 @@ self: { assertions base data-default filepath old-locale parsec time ]; description = "A parser/generator for Kindle-format clipping files (`My Clippings.txt`),"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -55978,8 +56205,8 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Tiny library to pretty print sparklines onto the CLI"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -55992,7 +56219,7 @@ self: { libraryHaskellDepends = [ base natural-induction peano ]; description = "Counted list"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "clit" = callPackage @@ -56014,8 +56241,8 @@ self: { ]; executableHaskellDepends = [ base ]; description = "Post tweets from stdin"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -56033,7 +56260,7 @@ self: { base foldl process system-filepath temporary text turtle ]; description = "Clone and benchmark Haskell cabal projects"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "clock" = callPackage @@ -56046,7 +56273,21 @@ self: { testHaskellDepends = [ base tasty tasty-quickcheck ]; benchmarkHaskellDepends = [ base criterion ]; description = "High-resolution clock functions: monotonic, realtime, cputime"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; + }) {}; + + "clock_0_8_2" = callPackage + ({ mkDerivation, base, criterion, tasty, tasty-quickcheck }: + mkDerivation { + pname = "clock"; + version = "0.8.2"; + sha256 = "0qg4ljwmw28vvxjzr4sknh8220abjcx2b0sq3ljqprh3qw8b2p8b"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base tasty tasty-quickcheck ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "High-resolution clock functions: monotonic, realtime, cputime"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "clock-extras" = callPackage @@ -56058,7 +56299,7 @@ self: { libraryHaskellDepends = [ base clock ]; testHaskellDepends = [ base hspec ]; description = "A couple functions that probably should be in the 'clock' package"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "clocked" = callPackage @@ -56074,8 +56315,8 @@ self: { ]; libraryPkgconfigDepends = [ QtCore ]; description = "timer functionality to clock IO commands"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {QtCore = null;}; @@ -56092,8 +56333,8 @@ self: { timezone-series ]; description = "Parse IRC logs such as the #haskell logs on tunes.org"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -56113,8 +56354,8 @@ self: { system-fileio system-filepath text transformers ]; description = "Clone all github repositories from a given user"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -56134,7 +56375,7 @@ self: { ]; testToolDepends = [ markdown-unlit ]; description = "Integers bounded by a closed interval"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "closure" = callPackage @@ -56145,8 +56386,8 @@ self: { sha256 = "1z9clkwjpj01g258h8bldlc759vwsgdlyppn29sr11kyani1zjwf"; libraryHaskellDepends = [ base hashable unordered-containers ]; description = "Depth- and breadth-first set closures"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -56170,8 +56411,8 @@ self: { ]; doHaddock = false; description = "The Cloud Haskell Application Platform"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -56200,8 +56441,8 @@ self: { optparse-applicative text these transformers yaml ]; description = "A tool for interacting with AWS CloudFormation"; - license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -56218,8 +56459,8 @@ self: { crypto-pubkey-types old-locale RSA time ]; description = "CloudFront URL signer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -56235,7 +56476,7 @@ self: { array base binary bytestring containers network time unix zlib ]; description = "Haskell CloudI API"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "cloudyfs" = callPackage @@ -56255,7 +56496,7 @@ self: { ]; description = "A cloud in the file system"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "clr-bindings" = callPackage @@ -56271,7 +56512,7 @@ self: { ]; testHaskellDepends = [ base ]; description = "Glue between clr-host and clr-typed"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "clr-host" = callPackage @@ -56291,7 +56532,7 @@ self: { librarySystemDepends = [ glib mono ]; testHaskellDepends = [ base ]; description = "Hosting the Common Language Runtime"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) glib; inherit (pkgs) mono;}; "clr-inline" = callPackage @@ -56320,8 +56561,8 @@ self: { pipes process split template-haskell temporary text transformers ]; description = "Quasiquoters for inline C# and F#"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -56333,7 +56574,7 @@ self: { sha256 = "1mnwxfmhz548bb1g17bddhmvd6lzl66bfi1a7f0j3phh7lgna4s1"; libraryHaskellDepends = [ base text ]; description = "Marshaling for the clr"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "clr-typed" = callPackage @@ -56345,7 +56586,7 @@ self: { libraryHaskellDepends = [ base clr-marshal ghc-prim text tuple ]; testHaskellDepends = [ base clr-marshal hspec text ]; description = "A strongly typed Haskell interface to the CLR type system"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "clr-win-linker" = callPackage @@ -56360,7 +56601,7 @@ self: { base directory pipes pipes-safe process ]; description = "A GHC linker wrapper tool to workaround a GHC >8.2 bug"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cltw" = callPackage @@ -56373,7 +56614,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base curl mtl random tagsoup ]; description = "Command line Twitter utility"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "clua" = callPackage @@ -56390,8 +56631,8 @@ self: { base bytestring containers haskell98 language-c pretty pretty-show ]; description = "C to Lua data wrapper generator"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -56403,7 +56644,7 @@ self: { sha256 = "1h1n349sq2lpikpvzzarz74200b8k7dkdjpp4rpkx79xdlfc58pc"; libraryHaskellDepends = [ base containers tree-fun ]; description = "Calculate the clumpiness of leaf properties in a tree"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "cluss" = callPackage @@ -56414,8 +56655,8 @@ self: { sha256 = "1q5km2f8zwnzcwnzj0khnszsgrb1x53zp0ryjwz2nfx9ajvh7zgg"; libraryHaskellDepends = [ base template-haskell ]; description = "simple alternative to type classes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -56441,8 +56682,8 @@ self: { base criterion hierarchical-clustering matrices mwc-random vector ]; description = "High performance clustering algorithms"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -56462,7 +56703,7 @@ self: { ]; description = "Tools for manipulating sequence clusters"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -56481,7 +56722,7 @@ self: { libraryToolDepends = [ c2hs ]; description = "Bindings to the Clutter animation library"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) clutter; inherit (pkgs) pango;}; @@ -56500,7 +56741,7 @@ self: { ]; description = "CMA-ES wrapper in Haskell"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "cmake-syntax" = callPackage @@ -56517,7 +56758,7 @@ self: { base bytestring hspec raw-strings-qq trifecta ]; description = "Parser for the CMake syntax (CMakeLists.txt and .cmake files)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cmark" = callPackage @@ -56534,7 +56775,7 @@ self: { base blaze-html cheapskate criterion discount markdown sundown text ]; description = "Fast, accurate CommonMark (Markdown) parser and renderer"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cmark-gfm" = callPackage @@ -56551,7 +56792,7 @@ self: { base blaze-html cheapskate criterion discount markdown sundown text ]; description = "Fast, accurate GitHub Flavored Markdown parser and renderer"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cmark-highlight" = callPackage @@ -56567,8 +56808,8 @@ self: { base blaze-html cmark highlighting-kate text ]; description = "Code highlighting for cmark"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -56582,7 +56823,7 @@ self: { editedCabalFile = "1mizbv18bl8qrgz27wlz7sb6cfhblmp7p7gh7dqq8g0r4djrvqg5"; libraryHaskellDepends = [ base cmark lucid ]; description = "Use cmark with Lucid"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cmark-patterns" = callPackage @@ -56593,8 +56834,8 @@ self: { sha256 = "15pdlcc0ak1pbx7qz6w5xfv4g9wkapx0flxqqkhcksa4k1h3hr1f"; libraryHaskellDepends = [ base cmark ]; description = "Pattern synonyms for cmark"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -56613,8 +56854,8 @@ self: { base base-prelude cmark containers hspec QuickCheck text ]; description = "Represent cmark-parsed Markdown as a tree of sections"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -56626,8 +56867,8 @@ self: { sha256 = "1hb92cgblmwp49lv0x0ib8g557mhjk6db7ihnim75ldii2f93dnm"; libraryHaskellDepends = [ base ]; description = "A binding to the standard C math library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -56647,8 +56888,8 @@ self: { ]; executableHaskellDepends = [ base Cabal filepath ]; description = "Data model, parser, serialiser and transformations for Content MathML 3"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -56665,8 +56906,8 @@ self: { base hspec hspec-laws HUnit QuickCheck quickcheck-instances text ]; description = "Library to compose and reuse command line fragments"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -56684,7 +56925,7 @@ self: { base filepath process template-haskell transformers ]; description = "Command line argument processing"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cmdargs-browser" = callPackage @@ -56704,7 +56945,7 @@ self: { process text transformers wai wai-handler-launch ]; description = "Helper to enter cmdargs command lines using a web browser"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cmdlib" = callPackage @@ -56717,8 +56958,8 @@ self: { isExecutable = true; libraryHaskellDepends = [ base mtl split syb transformers ]; description = "a library for command line parsing & online help"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -56740,8 +56981,8 @@ self: { test-framework test-framework-hunit transformers ]; description = "Declarative command-line option parsing and documentation library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -56754,8 +56995,8 @@ self: { libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers hedgehog ]; description = "(C)oncurrent (M)onoidal (F)olds"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -56767,7 +57008,7 @@ self: { sha256 = "1hym074a8akzg3c96b1yczmdw5pgn4g0ahqxsxhg8d0kf8lzi5ph"; libraryHaskellDepends = [ base ]; description = "Events and Channels as in Concurrent ML"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cmonad" = callPackage @@ -56778,8 +57019,8 @@ self: { sha256 = "07adwhpsmg3q4nhifjpdjv2dy1m08n0qkvlssmbl3b6gklvb82sk"; libraryHaskellDepends = [ array base ]; description = "A library for C-like programming"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -56798,8 +57039,8 @@ self: { ]; testSystemDepends = [ cmph ]; description = "low level interface to CMPH"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {cmph = null;}; @@ -56814,8 +57055,8 @@ self: { base ghc magic-tyfams should-not-typecheck ]; description = "Compare types of any kinds"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -56842,8 +57083,8 @@ self: { ]; testToolDepends = [ tasty-discover ]; description = "Write consistent git commit messages"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -56886,8 +57127,8 @@ self: { parsec StockholmAlignment template-haskell text vector ]; description = "Detailed visualization of CMs, HMMs and their comparisions"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -56909,8 +57150,8 @@ self: { prettyclass process split stringtable-atom unix zlib ]; description = "Compiler/Translator for CnC Specification Files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -56922,7 +57163,7 @@ self: { sha256 = "12vybpji4bxwn8in18xqp4l2js1cbnn8fgk3r6m5c8idp769ph2m"; libraryHaskellDepends = [ array base bytestring file-embed text ]; description = "Chinese/Mandarin <-> English dictionary, Chinese lexer"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "co-log" = callPackage @@ -56948,9 +57189,7 @@ self: { executableToolDepends = [ markdown-unlit ]; testHaskellDepends = [ base co-log-core hedgehog ]; description = "Composable Contravariant Comonadic Logging Library"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + license = lib.licenses.mpl20; }) {}; "co-log-concurrent" = callPackage @@ -56961,7 +57200,7 @@ self: { sha256 = "07z4aklk7dc2fhbc30kd9hbdvq71sa4ip6r2pyifcpn3p2pr3mna"; libraryHaskellDepends = [ base co-log-core stm ]; description = "Asynchronous backend for co-log library"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "co-log-core" = callPackage @@ -56975,7 +57214,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest Glob ]; description = "Composable Contravariant Comonadic Logging Library"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "co-log-json" = callPackage @@ -56990,7 +57229,7 @@ self: { aeson base bytestring co-log-core containers string-conv text ]; description = "Structured messages support in co-log ecosystem"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "co-log-polysemy" = callPackage @@ -57004,8 +57243,8 @@ self: { libraryHaskellDepends = [ base co-log-core polysemy ]; executableHaskellDepends = [ base co-log-core polysemy ]; description = "Composable Contravariant Comonadic Logging Library"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -57029,8 +57268,8 @@ self: { polysemy-plugin ]; description = "A Polysemy logging effect for high quality (unstructured) logs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -57051,8 +57290,8 @@ self: { universum unix ]; description = "Syslog implementation on top of 'co-log-core'"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -57071,8 +57310,8 @@ self: { base generic-random tasty tasty-quickcheck tasty-travis ]; description = "Command-line options and DSV parsing and printing"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -57098,7 +57337,7 @@ self: { linear megaparsec mtl parallel random split template-haskell text ]; description = "Computational biology toolkit to collaborate with researchers in constructive protein engineering"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cobot-io" = callPackage @@ -57109,8 +57348,8 @@ self: { }: mkDerivation { pname = "cobot-io"; - version = "0.1.3.12"; - sha256 = "1jj9ip12zmy8qh080skm9fawasxprfbwiyzywilga7lr573wxb88"; + version = "0.1.3.13"; + sha256 = "0qi07canqwnwfvmbsp1j9lyklnn8h909r6js94xlpin1qa7dpjda"; libraryHaskellDepends = [ array attoparsec base binary bytestring containers data-msgpack deepseq http-conduit hyraxAbif lens linear mtl split text vector @@ -57121,8 +57360,8 @@ self: { neat-interpolation QuickCheck split text vector ]; description = "Biological data file formats and IO"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -57146,8 +57385,8 @@ self: { regex-tdfa text ]; description = "Biological data file formats and IO"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {RNA = null;}; @@ -57159,8 +57398,8 @@ self: { sha256 = "1ax4c19xkszahcxvwc1wa1hrgk6ajck5sbprbplsi1gc9jj4g7jm"; libraryHaskellDepends = [ base containers ]; description = "Simple system for generating code"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -57173,7 +57412,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Windows code page library for Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "codec" = callPackage @@ -57195,8 +57434,8 @@ self: { tasty-quickcheck ]; description = "Simple bidirectional serialization"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -57211,8 +57450,8 @@ self: { libraryHaskellDepends = [ base bytestring containers text zlib ]; testHaskellDepends = [ base bytestring filepath process text ]; description = "Erlang VM byte code assembler"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -57235,8 +57474,8 @@ self: { QuickCheck regex-compat ]; description = "Cross-platform structure serialisation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -57248,7 +57487,7 @@ self: { sha256 = "0kbn76g6ly1pjd9higi0k0f26hplm0jhz85b23inn0bjli14n2cl"; libraryHaskellDepends = [ base bytestring ]; description = "A library to read and write mailboxes in mbox format"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "codec-rpm" = callPackage @@ -57271,8 +57510,8 @@ self: { HUnit parsec pretty text ]; description = "A library for manipulating RPM files"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -57296,8 +57535,8 @@ self: { ]; testHaskellDepends = [ base HUnit ]; description = "Codecov.io support for Haskell."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -57316,8 +57555,8 @@ self: { MissingH process regex-posix time ]; description = "Tool that automatically runs arbitrary commands when files change on disk"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -57331,8 +57570,8 @@ self: { editedCabalFile = "11kw4xs61c5d3kvlanx9waws8sj5k4d5445a8w1p5zx69x9im7bg"; libraryHaskellDepends = [ base curl mtl network tagsoup ]; description = "Submit and retrieve paste output from CodePad.org."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -57360,8 +57599,8 @@ self: { test-framework test-framework-hunit text time witherable ]; description = "Graphics library for CodeWorld"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -57387,8 +57626,8 @@ self: { http-client-tls network process transformers yaml ]; description = "A ctags file generator for cabal project dependencies"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -57404,8 +57643,8 @@ self: { base comonad haskell-src-meta parsec template-haskell uniplate ]; description = "A notation for comonads, analogous to the do-notation for monads"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -57418,7 +57657,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base unliftio ]; description = "Having trouble deriving instances because of type roles? Solve it here!"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "coerce-util" = callPackage @@ -57429,7 +57668,7 @@ self: { sha256 = "0v4ymcrqij8q9s8pcgbfrnl8y379fki3zp80lg4xqvbx0i89vsxf"; libraryHaskellDepends = [ base ]; description = "utils for Data.Coerce"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "coercible-subtypes" = callPackage @@ -57442,7 +57681,7 @@ self: { editedCabalFile = "05bd9lp5jp31ac039vq0p58kr03g5ai3cyymc4ikhbnl3x44hx4d"; libraryHaskellDepends = [ base profunctors ]; description = "Coercible but only in one direction"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "coercible-utils" = callPackage @@ -57455,8 +57694,8 @@ self: { testHaskellDepends = [ base ]; benchmarkHaskellDepends = [ base gauge ]; description = "Utility functions for Coercible types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -57469,7 +57708,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base containers ]; description = "Extra utilities for manipulating nominal and representational coercions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "coformat" = callPackage @@ -57507,7 +57746,7 @@ self: { xml-conduit yaml ]; description = "Generate clang-format config based on some existing code base"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cofunctor" = callPackage @@ -57518,7 +57757,7 @@ self: { sha256 = "0xn4k1c7l9z3g0slbwvlfg9kpfq8jbk0qf9363qz7azv7ks1149p"; libraryHaskellDepends = [ base ]; description = "DEPRECATED: use the \"contravariant\" package"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cognimeta-utils" = callPackage @@ -57545,7 +57784,7 @@ self: { ]; description = "Utilities for Cognimeta products (such as perdure). API may change often."; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "coin" = callPackage @@ -57569,7 +57808,7 @@ self: { ]; description = "Simple account manager"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -57608,8 +57847,8 @@ self: { transformers unordered-containers uuid websockets ]; description = "Connector library for the coinbase exchange"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -57642,8 +57881,8 @@ self: { unagi-streams unordered-containers uuid vector websockets wuss ]; description = "Client for Coinbase Pro"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -57662,8 +57901,8 @@ self: { array base combinat containers tasty tasty-hunit ]; description = "Equivariant CSM classes of coincident root loci"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -57687,8 +57926,8 @@ self: { ListZipper monad-atom mtl nlp-scores split swift-lda text vector ]; description = "Colada implements incremental word class class induction using online LDA"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -57706,8 +57945,8 @@ self: { pipes-attoparsec pipes-network text transformers ]; description = "Rudimentary JSON-RPC 2.0 client over raw TCP."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -57723,7 +57962,7 @@ self: { executableHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring hspec ]; description = "File transfer via QR Codes"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "collada-output" = callPackage @@ -57740,8 +57979,8 @@ self: { base collada-types containers SVGPath time vector xml ]; description = "Generate animated 3d objects in COLLADA"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -57753,7 +57992,7 @@ self: { sha256 = "1qs1bxxkjb6clszv8mahbmwdwbqpdr5hcxwn3nq5d6wc2xgb4y6r"; libraryHaskellDepends = [ base containers OpenGL tuple vector ]; description = "Data exchange between graphics applications"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "collapse-duplication" = callPackage @@ -57775,8 +58014,8 @@ self: { base bytestring cassava containers lens optparse-generic split ]; description = "Collapse the duplication output into clones and return their frequencies"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -57790,8 +58029,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base ]; description = "utility for collapsing adjacent writes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -57814,8 +58053,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Collection+JSON—Hypermedia Type Tools"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -57829,8 +58068,8 @@ self: { array base bytestring containers QuickCheck ]; description = "Useful standard collections types and related functions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -57844,8 +58083,8 @@ self: { editedCabalFile = "073x7vwgsj2xcqpywqdwk7pbj9zc9sinm17sknafgyxacx1r15xl"; libraryHaskellDepends = [ array base QuickCheck ]; description = "API for collection data structures"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -57861,8 +58100,8 @@ self: { array base bytestring collections-api containers ]; description = "Useful standard collections types and related functions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -57895,8 +58134,8 @@ self: { ansi-wl-pprint base doctest fast-logger QuickCheck semigroupoids ]; description = "Generic types and functions for columnar encoding and decoding"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -57921,8 +58160,8 @@ self: { friday-devil split v4l2 vector vector-space yaml ]; description = "Count colors in images"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -57935,7 +58174,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Styled console text output using ANSI escape sequences"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "colorize-haskell" = callPackage @@ -57949,7 +58188,7 @@ self: { libraryHaskellDepends = [ ansi-terminal base haskell-lexer ]; executableHaskellDepends = [ ansi-terminal base haskell-lexer ]; description = "Highligt Haskell source"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "colorless" = callPackage @@ -57971,8 +58210,8 @@ self: { aeson base containers hspec scientific text tuple vector ]; description = "Colorless | The Programmatic IDL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -57989,8 +58228,8 @@ self: { text-conversions ]; description = "Http Client addon for Colorless"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -58004,8 +58243,8 @@ self: { aeson base colorless mtl scotty text wai ]; description = "Scotty server add-on for Colorless"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -58019,7 +58258,7 @@ self: { editedCabalFile = "0q152j8ybnga46azvfg3xmsjk01lz4wkhlli07cd92803vc4d6dl"; libraryHaskellDepends = [ base lens linear profunctors ]; description = "A type for colors"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "colour" = callPackage @@ -58036,7 +58275,7 @@ self: { base QuickCheck random test-framework test-framework-quickcheck2 ]; description = "A model for human colour/color perception"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "colour-accelerate" = callPackage @@ -58047,7 +58286,7 @@ self: { sha256 = "1j7ff2wb58yf346z2abr1v1yq498fxm498rdf1g62ppf6vkdplw8"; libraryHaskellDepends = [ accelerate base ]; description = "Working with colours in Accelerate"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "colour-space" = callPackage @@ -58064,8 +58303,8 @@ self: { linear linearmap-category manifolds semigroups vector-space ]; description = "Instances of the manifold-classes for colour types"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -58077,7 +58316,7 @@ self: { sha256 = "1iglvl6k8vrq45h5r8r2ng575dgg30jfw1zq19zld72914mmvjdz"; libraryHaskellDepends = [ ansi-terminal base bytestring text ]; description = "Convenient interface for printing colourful messages"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "coltrane" = callPackage @@ -58093,8 +58332,8 @@ self: { wai-extra warp ]; description = "A jazzy, minimal web framework for Haskell, inspired by Sinatra"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -58115,8 +58354,8 @@ self: { ]; doHaddock = false; description = "Enhanced serialization using seeking"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -58134,8 +58373,8 @@ self: { template-haskell text time unordered-containers vector ]; description = "A CSV toolkit based on cassava and enum-text"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -58147,8 +58386,8 @@ self: { sha256 = "1y6zm63jyigf631f2b0bqw1yhmr6hifaspqivy7qy30brmr5a27m"; doHaddock = false; description = "Haskell COM support library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -58167,8 +58406,8 @@ self: { ]; executableHaskellDepends = [ base text ]; description = "Commonmark processing in pure haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "comark-html" = callPackage @@ -58187,8 +58426,8 @@ self: { base cmark comark-syntax comark-testutils criterion deepseq text ]; description = "Commonmark (markdown) to HTML renderer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {comark-testutils = null;}; @@ -58214,8 +58453,8 @@ self: { text ]; description = "Parser for Commonmark (markdown)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {comark-testutils = null;}; @@ -58227,8 +58466,8 @@ self: { sha256 = "0y1fp6griivzzxwp621cm2mrizxmrnjazhayl21aqfp7mb5i4ib2"; libraryHaskellDepends = [ base containers deepseq ]; description = "Definitions of AST that represents a Commonmark (markdown) document"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -58252,8 +58491,8 @@ self: { transformers ]; description = "Generate and manipulate various combinatorial objects"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -58273,7 +58512,7 @@ self: { test-framework-quickcheck2 transformers ]; description = "Generate and manipulate various combinatorial objects"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "combinat-diagrams" = callPackage @@ -58289,8 +58528,8 @@ self: { linear transformers ]; description = "Graphical representations for various combinatorial objects"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -58312,8 +58551,8 @@ self: { template-haskell th-lift trifecta void ]; description = "SKI Combinator interpreter"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -58332,7 +58571,7 @@ self: { array base containers QuickCheck transformers utility-ht ]; description = "Count, enumerate, rank and unrank combinatorial objects"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "combinatorial-problems" = callPackage @@ -58348,7 +58587,7 @@ self: { ]; description = "A number of data structures to represent and allow the manipulation of standard combinatorial problems, used as test problems in computer science"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -58360,7 +58599,7 @@ self: { sha256 = "101b3lycfav6wqdqjhs0v93vgy4g3pfn5xyimip0x3alq0q2ix9a"; libraryHaskellDepends = [ base ]; description = "Efficient computation of common combinatoric functions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "combobuffer" = callPackage @@ -58375,8 +58614,8 @@ self: { base containers template-haskell vector vector-space ]; description = "Various buffer implementations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -58399,7 +58638,7 @@ self: { base ChasingBottoms containers QuickCheck tagged ]; description = "Arrays where the index type is a function of the shape type"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "comfort-graph" = callPackage @@ -58417,7 +58656,7 @@ self: { base containers QuickCheck transformers utility-ht ]; description = "Graph structure with type parameters for nodes and edges"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "comic" = callPackage @@ -58433,8 +58672,8 @@ self: { time uuid ]; description = "A format for describing comics"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -58448,7 +58687,7 @@ self: { testHaskellDepends = [ base QuickCheck text ]; description = "CSV Parser & Producer"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "command" = callPackage @@ -58459,7 +58698,7 @@ self: { sha256 = "0qj6i5r1iz3d8visqpd74xwkribxzs4p66b1vgp0i3jiqgfrn2hw"; libraryHaskellDepends = [ base deepseq process ]; description = "Conveniently run shell commands"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "command-qq" = callPackage @@ -58475,7 +58714,7 @@ self: { base doctest hspec template-haskell text transformers ]; description = "Quasiquoters for external commands"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }) {}; "commander" = callPackage @@ -58490,8 +58729,8 @@ self: { executableHaskellDepends = [ base containers ]; testHaskellDepends = [ base ]; description = "pattern matching against string based commands"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -58508,7 +58747,7 @@ self: { ]; testHaskellDepends = [ base commandert text unordered-containers ]; description = "A command line argument/option parser library"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "commandert" = callPackage @@ -58520,7 +58759,7 @@ self: { libraryHaskellDepends = [ base mtl ]; testHaskellDepends = [ base hspec mtl ]; description = "A monad for commanders"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "commodities" = callPackage @@ -58543,8 +58782,8 @@ self: { lens QuickCheck semigroups thyme transformers ]; description = "Library for working with commoditized amounts and price histories"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -58555,8 +58794,8 @@ self: { }: mkDerivation { pname = "commonmark"; - version = "0.1.1.2"; - sha256 = "13gk08gigih75zq7kwc101yxmxvj3hvfyi67ap13nrabv70l6zjm"; + version = "0.1.1.3"; + sha256 = "1hwbii1d56979l0svvjayzhmwa25s66l36bb08hjq6p36lkv2a1v"; libraryHaskellDepends = [ base bytestring containers parsec text transformers ]; @@ -58567,7 +58806,7 @@ self: { base bytestring containers criterion text transformers ]; description = "Pure Haskell commonmark parser"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "commonmark-cli" = callPackage @@ -58587,7 +58826,7 @@ self: { pretty-simple text ]; description = "Command-line commonmark converter and highlighter"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "commonmark-extensions" = callPackage @@ -58611,7 +58850,7 @@ self: { base bytestring commonmark containers criterion text transformers ]; description = "Pure Haskell commonmark parser"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "commonmark-pandoc" = callPackage @@ -58626,7 +58865,7 @@ self: { base commonmark commonmark-extensions containers pandoc-types text ]; description = "Bridge between commonmark and pandoc AST"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "commsec" = callPackage @@ -58641,8 +58880,8 @@ self: { base bytestring cipher-aes128 crypto-api network ]; description = "Provide communications security using symmetric ephemeral keys"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -58661,8 +58900,8 @@ self: { network RSA ]; description = "Key agreement for commsec"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -58680,7 +58919,7 @@ self: { tasty-hunit tasty-quickcheck vector ]; description = "Commutative binary operations"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "comonad" = callPackage @@ -58696,7 +58935,7 @@ self: { transformers transformers-compat ]; description = "Comonads"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "comonad-extras" = callPackage @@ -58712,7 +58951,7 @@ self: { transformers ]; description = "Exotic comonad transformers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "comonad-random" = callPackage @@ -58724,7 +58963,7 @@ self: { libraryHaskellDepends = [ base category-extras random ]; description = "Comonadic interface for random values"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "comonad-transformers" = callPackage @@ -58736,7 +58975,7 @@ self: { libraryHaskellDepends = [ base comonad ]; doHaddock = false; description = "This package has been merged into comonad 4.0"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "comonads-fd" = callPackage @@ -58748,7 +58987,7 @@ self: { libraryHaskellDepends = [ base comonad ]; doHaddock = false; description = "This package has been merged into comonad 4.0"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "compact" = callPackage @@ -58761,7 +59000,7 @@ self: { libraryHaskellDepends = [ base binary bytestring ghc-compact ]; testHaskellDepends = [ base directory ]; description = "Non-GC'd, contiguous storage for immutable data structures"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "compact-list" = callPackage @@ -58773,8 +59012,8 @@ self: { libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base ]; description = "An append only list in a compact region"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -58788,8 +59027,8 @@ self: { array base binary bytestring containers ]; description = "Compact Data.Map implementation using Data.Binary"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -58809,8 +59048,8 @@ self: { transformers ]; description = "Mutable arrays living on the compact heap"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -58824,8 +59063,8 @@ self: { libraryHaskellDepends = [ base compact ghc-prim primitive vector ]; testHaskellDepends = [ base compact hspec ]; description = "Mutable vector with different GC characteristics"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -58840,7 +59079,7 @@ self: { libraryHaskellDepends = [ base mtl primitive transformers ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; description = "Stacks, queues, and deques with compact representations"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "compact-socket" = callPackage @@ -58856,8 +59095,8 @@ self: { unix ]; description = "Socket functions for compact normal form"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -58871,8 +59110,8 @@ self: { editedCabalFile = "03cw0x4dg0qwaysf2sndyzm27sva6x415dxd70fs2vcbys5m1j8j"; libraryHaskellDepends = [ base bytestring ]; description = "Fast, packed and strict strings with Unicode support, based on bytestrings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -58886,8 +59125,8 @@ self: { editedCabalFile = "1akx1kzpirl1fc3lfcrsa88jvrk023f9qyj2b2fbpz4p11d07qfc"; libraryHaskellDepends = [ base bytestring ]; description = "Same as compact-string except with a small fix so it builds on ghc-6.12"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -58904,8 +59143,8 @@ self: { base primitive QuickCheck random tasty tasty-hunit tasty-quickcheck ]; description = "Small vectors of small integers stored very compactly"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -58917,8 +59156,8 @@ self: { sha256 = "1qw47ps6bnp6xwaksqq7plry0ivsm18f0vf79yi1n755w6p49648"; libraryHaskellDepends = [ base containers transformers vector ]; description = "A typeclass for structures which can be catMaybed, filtered, and partitioned"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -58931,7 +59170,7 @@ self: { libraryHaskellDepends = [ base vector ]; testHaskellDepends = [ base containers hspec QuickCheck ]; description = "A read-only memory-efficient key-value store"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "compare-type" = callPackage @@ -58942,7 +59181,7 @@ self: { sha256 = "1s6p3ni8pqxbp08ci4w6y646wrh60s0g34figrwdcqrywscyicsb"; libraryHaskellDepends = [ base ]; description = "compare types of any kinds in haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "compdata" = callPackage @@ -58969,8 +59208,8 @@ self: { template-haskell th-expand-syns transformers uniplate ]; description = "Compositional Data Types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -58986,8 +59225,8 @@ self: { base compdata containers criterion projection ]; description = "Tree automata on Compositional Data Types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -59009,8 +59248,8 @@ self: { unordered-containers vector ]; description = "Compositional Data Types on DAGs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -59026,7 +59265,7 @@ self: { base composition containers deriving-compat fixplate tree-view ]; description = "Compdata basics implemented on top of Fixplate"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "compdata-param" = callPackage @@ -59046,8 +59285,8 @@ self: { test-framework-hunit transformers ]; description = "Parametric Compositional Data Types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -59065,7 +59304,7 @@ self: { pandoc pandoc-throw path rio vinyl ]; description = "Parse a Pandoc to a composite value"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "compdoc-dhall-decoder" = callPackage @@ -59083,7 +59322,7 @@ self: { text ]; description = "Allows you to write FromDhall instances for Compdoc"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "compendium-client" = callPackage @@ -59099,8 +59338,8 @@ self: { servant-client text ]; description = "Client for the Compendium schema server"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -59124,7 +59363,7 @@ self: { ]; benchmarkHaskellDepends = [ base criterion ]; description = "Compensated floating-point arithmetic"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "competition" = callPackage @@ -59135,8 +59374,8 @@ self: { sha256 = "07c6b6yai8x9i8qndimzmyp5bzhwckis8kg207n152gnskk7i3zn"; libraryHaskellDepends = [ base filepath parsec ]; description = "Helpers and runners for code competitions"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -59148,8 +59387,8 @@ self: { sha256 = "0a1pp1jafra1agsx2jizdb33afzg02w6jh4a4pyw5w71kzqfrril"; libraryHaskellDepends = [ base MissingH ]; description = "Haskell functionality for quickly assembling simple compilers"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -59166,7 +59405,7 @@ self: { base binary parsec tasty tasty-hunit tasty-quickcheck tasty-th text ]; description = "Parser for common compiler warning formats"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }) {}; "complex-generic" = callPackage @@ -59179,8 +59418,8 @@ self: { editedCabalFile = "00v0mr5fc090wph3s9ks3ppf81nqbkd0yfa347fkn3zrq3daqr8f"; libraryHaskellDepends = [ base template-haskell ]; description = "complex numbers with non-mandatory RealFloat"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -59192,7 +59431,7 @@ self: { sha256 = "0q0ffpqir4f2ch7d7p2fxgb73n7dg7xf19rg78an7i7zdl430cfj"; libraryHaskellDepends = [ base ]; description = "A simple integration function to integrate a complex-valued complex functions"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "complexity" = callPackage @@ -59208,8 +59447,8 @@ self: { transformers ]; description = "Empirical algorithmic complexity"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -59230,7 +59469,7 @@ self: { teardown ]; description = "Monad for allocation and cleanup of application resources"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "componentm-devel" = callPackage @@ -59243,7 +59482,7 @@ self: { base componentm foreign-store rio teardown ]; description = "Easy REPL driven development using ComponentM"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "composable-associations" = callPackage @@ -59255,7 +59494,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base lens tasty tasty-hunit ]; description = "Types and helpers for composing types into a single larger key-value type"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "composable-associations-aeson" = callPackage @@ -59274,7 +59513,7 @@ self: { aeson base bytestring doctest tasty tasty-hunit tasty-quickcheck ]; description = "Aeson ToJSON/FromJSON implementation for the types of composable-associations"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "compose-ltr" = callPackage @@ -59286,7 +59525,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "More intuitive, left-to-right function composition"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "compose-trans" = callPackage @@ -59297,8 +59536,8 @@ self: { sha256 = "0p2fd0knfbfjk4s0aalzrsrzpxffrykmaprxyakbgs1lmp4jyq9z"; libraryHaskellDepends = [ base mtl ]; description = "Composable monad transformers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -59326,7 +59565,7 @@ self: { unordered-containers vector vinyl ]; description = "JSON for Vinyl records"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "composite-aeson-cofree-list" = callPackage @@ -59341,7 +59580,7 @@ self: { aeson base composite-aeson composite-aeson-writeonly free vector ]; description = "Print a Cofree [] as a JSON value"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "composite-aeson-path" = callPackage @@ -59352,7 +59591,7 @@ self: { sha256 = "08p988iq7y76px61dlj5jq35drmnrf4khi27wpqgh3pg9d96yihx"; libraryHaskellDepends = [ base composite-aeson path ]; description = "Formatting data for the path library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "composite-aeson-refined" = callPackage @@ -59367,7 +59606,7 @@ self: { aeson-better-errors base composite-aeson mtl refined ]; description = "composite-aeson support for Refined from the refined package"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "composite-aeson-throw" = callPackage @@ -59382,7 +59621,7 @@ self: { aeson aeson-better-errors base composite-aeson exceptions ]; description = "MonadThrow behaviour for composite-aeson"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "composite-aeson-writeonly" = callPackage @@ -59396,7 +59635,7 @@ self: { aeson aeson-better-errors base composite-aeson ]; description = "WriteOnly indicators for composite-aeson"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "composite-base" = callPackage @@ -59419,7 +59658,7 @@ self: { unliftio-core vinyl ]; description = "Shared utilities for composite-* packages"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "composite-binary" = callPackage @@ -59430,7 +59669,7 @@ self: { sha256 = "07d88krkpplprnw57j4bqi71p8bmj0wz28yw41wgl2p5g2h7zccp"; libraryHaskellDepends = [ base binary composite-base ]; description = "Orphan binary instances"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "composite-ekg" = callPackage @@ -59444,7 +59683,7 @@ self: { base composite-base ekg-core lens text vinyl ]; description = "EKG Metrics for Vinyl records"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "composite-hashable" = callPackage @@ -59455,7 +59694,7 @@ self: { sha256 = "0zwv6m9nzz0g3ngmfznxh6wmprhcgdbfxrsgylnr6990ppk0bmg1"; libraryHaskellDepends = [ base composite-base hashable ]; description = "Orphan hashable instances"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "composite-opaleye" = callPackage @@ -59477,8 +59716,8 @@ self: { vinyl ]; description = "Opaleye SQL for Vinyl records"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -59500,8 +59739,8 @@ self: { lens QuickCheck swagger2 template-haskell text vinyl ]; description = "Swagger for Vinyl records"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -59513,7 +59752,7 @@ self: { sha256 = "0y5xz4q5z2lw3jy3fdm5rl19sd969cdpq1a44ar45dpab0qffr41"; libraryHaskellDepends = [ base composite-base ]; description = "Tuple functions for composite records"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "composite-xstep" = callPackage @@ -59524,7 +59763,7 @@ self: { sha256 = "18q75ynlywr6yap6nn11x5kzxncn0b6ghmvbg642617pznznpfm9"; libraryHaskellDepends = [ base composite-base vinyl ]; description = "ReaderT transformer pattern for higher kinded composite data"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "composition" = callPackage @@ -59534,7 +59773,7 @@ self: { version = "1.0.2.1"; sha256 = "0smdyzcnfwiab1wnazmk4szali1ckh7dqcdp9vn7qnnabq7k08vi"; description = "Combinators for unorthodox function composition"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "composition-extra" = callPackage @@ -59545,7 +59784,7 @@ self: { sha256 = "0abipab6bx138rynpkh4daj53bv5yqbw94zfswysyq6iix529669"; libraryHaskellDepends = [ base composition contravariant ]; description = "Combinators for unorthodox structure composition"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "composition-prelude" = callPackage @@ -59556,7 +59795,7 @@ self: { sha256 = "151inlk43m96pnasc6llsjh8vxyc9b1i7xdgf1sp5p5072bzq305"; libraryHaskellDepends = [ base ]; description = "Higher-order function combinators"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "composition-tree" = callPackage @@ -59568,8 +59807,8 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest QuickCheck ]; description = "Composition trees for arbitrary monoids"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -59589,8 +59828,8 @@ self: { testHaskellDepends = [ base c smallcheck tasty tasty-smallcheck ]; benchmarkHaskellDepends = [ base c criterion ]; description = "Compositional Data Types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {c = null;}; @@ -59603,7 +59842,7 @@ self: { libraryHaskellDepends = [ base ]; benchmarkHaskellDepends = [ base-prelude ]; description = "Sum and Product types and such"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "comprehensions-ghc" = callPackage @@ -59617,8 +59856,8 @@ self: { libraryHaskellDepends = [ base base-unicode-symbols ghc syb util ]; testHaskellDepends = [ base ]; description = "Plugin to generalize comprehensions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -59638,8 +59877,8 @@ self: { semigroupoids semigroups unordered-containers ]; description = "Compressed containers and reducers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -59652,7 +59891,7 @@ self: { libraryHaskellDepends = [ base mtl ]; description = "Common compression algorithms"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "compstrat" = callPackage @@ -59667,8 +59906,8 @@ self: { base compdata mtl template-haskell th-expand-syns transformers ]; description = "Strategy combinators for compositional data types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -59686,8 +59925,8 @@ self: { template-haskell th-expand-syns ]; description = "Automatically converting ASTs into compositional data types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -59739,8 +59978,8 @@ self: { test-framework-hunit transformers type-natural vector ]; description = "Well-kinded computational algebra library, currently supporting Groebner basis"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -59757,8 +59996,8 @@ self: { vector ]; description = "Collection of algorithms in Computational Geometry"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -59770,8 +60009,8 @@ self: { sha256 = "1kyg3dmgq5z0217rxgljs3x7x3xvcdly2aqj2ky4h4kbw1h0r260"; libraryHaskellDepends = [ base ]; description = "Advanced notions of computation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -59783,7 +60022,7 @@ self: { sha256 = "05xwqvcdnk8bsyj698ab9jxpa1nk23pf3m7wi9mwmw0q8n99fngd"; libraryHaskellDepends = [ base template-haskell ]; description = "A library for postfix control flow"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "conceit" = callPackage @@ -59797,7 +60036,7 @@ self: { base bifunctors semigroupoids semigroups void ]; description = "Concurrent actions that may fail with a value"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "concise" = callPackage @@ -59814,7 +60053,7 @@ self: { tasty-quickcheck text ]; description = "Utilities for Control.Lens.Cons"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "concorde" = callPackage @@ -59825,7 +60064,7 @@ self: { sha256 = "0903lrj6bzajjdr01hbld1jm6vf7assn84hqk4kgrrs1mr3ykc20"; libraryHaskellDepends = [ base containers process safe temporary ]; description = "Simple interface to the Concorde solver for the Traveling Salesperson Problem"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "concraft" = callPackage @@ -59849,8 +60088,8 @@ self: { transformers vector vector-binary zlib ]; description = "Morphological disambiguation based on constrained CRFs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -59872,8 +60111,8 @@ self: { ]; executableHaskellDepends = [ cmdargs ]; description = "Part-of-speech tagger for Croatian"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -59902,8 +60141,8 @@ self: { dhall filepath pedestrian-dag sgd tagset-positional text ]; description = "Morphological tagger for Polish"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -59948,7 +60187,7 @@ self: { ]; description = "Library for the Concrete data format"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -59966,7 +60205,7 @@ self: { ]; description = "Automatically generated Thrift definitions for the Concrete data format"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -59987,7 +60226,7 @@ self: { ]; description = "A parser driven by a standard RELAX NG schema with concrete syntax extensions"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -60007,8 +60246,8 @@ self: { test-framework-quickcheck2 ]; description = "Binary and Hashable instances for TypeRep"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -60024,7 +60263,7 @@ self: { base free mtl natural-transformation stm transformers ]; description = "A client side web UI framework for Haskell. Core framework."; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "concurrency" = callPackage @@ -60040,7 +60279,7 @@ self: { transformers ]; description = "Typeclasses, functions, and data types for concurrency and STM"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "concurrency-benchmarks" = callPackage @@ -60062,8 +60301,8 @@ self: { async base deepseq gauge mtl random streamly transformers ]; description = "Benchmarks to compare concurrency APIs"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -60075,7 +60314,7 @@ self: { sha256 = "13idx7w5k8rk3qqls3yn9xqwk116xsqb36ya3vxkb5x4q4vix3mv"; libraryHaskellDepends = [ base ]; description = "Simple thread barriers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "concurrent-batch" = callPackage @@ -60086,7 +60325,7 @@ self: { sha256 = "1f77p053hpiaf7xp916rff9hp29hisk7cwxcq72l5v4h4g3ps59d"; libraryHaskellDepends = [ base clock stm ]; description = "Concurrent batching queue based on STM with timeout"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "concurrent-buffer" = callPackage @@ -60105,8 +60344,8 @@ self: { ]; benchmarkHaskellDepends = [ bug criterion rerebase ]; description = "Concurrent expanding buffer"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -60131,7 +60370,7 @@ self: { ]; testHaskellDepends = [ async base dns hspec ]; description = "Concurrent DNS cache"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "concurrent-extra" = callPackage @@ -60148,7 +60387,7 @@ self: { unbounded-delays ]; description = "Extra concurrency primitives"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "concurrent-hashtable" = callPackage @@ -60172,8 +60411,8 @@ self: { hashable random stm stm-containers unordered-containers vector ]; description = "Thread-safe hash tables for multi-cores!"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {dictionary-type = null;}; @@ -60195,8 +60434,8 @@ self: { ]; benchmarkHaskellDepends = [ base machines time ]; description = "Concurrent networked stream transducers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -60213,7 +60452,7 @@ self: { terminal-size text transformers unix ]; description = "Ungarble output from several threads or commands"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }) {}; "concurrent-resource-map" = callPackage @@ -60225,7 +60464,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base containers random stm ]; description = "Concurrent resource map"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "concurrent-rpc" = callPackage @@ -60236,7 +60475,7 @@ self: { sha256 = "0k0iwax6nx4jvqh7rawis5dp7lxx8bc3r3x0rr8qy7vsp14lmvgg"; libraryHaskellDepends = [ base ]; description = "An abstraction for inter-thread RPC based on MVars"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "concurrent-sa" = callPackage @@ -60247,7 +60486,7 @@ self: { sha256 = "1szvw0vih5jx2hvgb3h7mqh05im3pw687h7dshiy4ii5vs9pi6d6"; libraryHaskellDepends = [ base MonadRandom ]; description = "Concurrent simulated annealing system"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "concurrent-split" = callPackage @@ -60258,7 +60497,7 @@ self: { sha256 = "0i9gak7q3ay8g1kzq7dg0bs36bg88n7kwy3h1r6jrni7mz7jh05f"; libraryHaskellDepends = [ base ]; description = "MVars and Channels with distinguished input and output side"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "concurrent-st" = callPackage @@ -60269,7 +60508,7 @@ self: { sha256 = "08zjpyf1jrsn161z9dngag63s47vrvz4m8aani9lvmlacbzpjfwd"; libraryHaskellDepends = [ base ghc-prim ]; description = "Concurrent Haskell in ST"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "concurrent-state" = callPackage @@ -60282,8 +60521,8 @@ self: { isExecutable = true; libraryHaskellDepends = [ base exceptions mtl stm transformers ]; description = "MTL-like library using TVars"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -60298,7 +60537,7 @@ self: { libraryHaskellDepends = [ base ghc-prim hashable ]; testHaskellDepends = [ base containers ]; description = "A fast concurrent unique identifier supply with a pure API"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "concurrent-utilities" = callPackage @@ -60311,7 +60550,7 @@ self: { editedCabalFile = "1jf0sx6yq557aspa3wm12hkc64pmfnc39kbc5wsa2k7ksash3k15"; libraryHaskellDepends = [ base ]; description = "More utilities and broad-used datastructures for concurrency"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "concurrentoutput" = callPackage @@ -60322,7 +60561,7 @@ self: { sha256 = "0fd372awmxrngbcb2phyzy3az9j2327kdhjnm7c5mm808vix67a8"; libraryHaskellDepends = [ base ]; description = "Ungarble output from several threads"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cond" = callPackage @@ -60333,7 +60572,7 @@ self: { sha256 = "12xcjxli1scd4asr4zc77i5q9qka2100gx97hv3vv12l7gj7d703"; libraryHaskellDepends = [ base ]; description = "Basic conditional and boolean operators with monadic variants"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "condor" = callPackage @@ -60354,8 +60593,8 @@ self: { base binary Cabal containers glider-nlp HUnit text ]; description = "Information retrieval library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -60367,8 +60606,8 @@ self: { sha256 = "1raf8mrnfnn90ymcnyhqf1kzb9mpfsk83qlmajibjd8n94iq76nd"; libraryHaskellDepends = [ array base ]; description = "Library for Condorcet voting"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -60380,8 +60619,8 @@ self: { sha256 = "1jdslfnwyh7l10xhk9i0293p0qnw0xsd70d5xgpc6xlijhrsg8wp"; libraryHaskellDepends = [ array base containers random stm time ]; description = "a library for live coding and real-time musical applications"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -60393,7 +60632,7 @@ self: { sha256 = "1plml14h5d31jr3bvjjgaxcdqssxqfwwnbz9c5gvjlds6lla145p"; doHaddock = false; description = "a library for displaying musical time in a terminal-based clock"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "conductive-hsc3" = callPackage @@ -60409,8 +60648,8 @@ self: { hosc hsc3 random ]; description = "a library with examples of using Conductive with hsc3"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -60422,8 +60661,8 @@ self: { sha256 = "16bdsjv64fc3ydv230rja5q9rqzlr4vd9mh3jabiyahck44imrvi"; libraryHaskellDepends = [ base conductive-base random ]; description = "a library of functions which are useful for composing music"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -60440,7 +60679,7 @@ self: { transformers ]; description = "Lightweight composable continuation-based stream processors"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "conduit" = callPackage @@ -60468,7 +60707,7 @@ self: { transformers vector ]; description = "Streaming data processing library"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "conduit-algorithms" = callPackage @@ -60503,7 +60742,7 @@ self: { streaming-commons transformers unliftio-core vector ]; description = "Conduit-based algorithms"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "conduit-audio" = callPackage @@ -60516,7 +60755,7 @@ self: { editedCabalFile = "0zldqx1r2wmvqwg8r6x7v65h2nqr7fjcxab74f0f5i1nqsd5b51a"; libraryHaskellDepends = [ base conduit vector ]; description = "Combinators to efficiently slice and dice audio streams"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "conduit-audio-lame" = callPackage @@ -60535,8 +60774,8 @@ self: { librarySystemDepends = [ mp3lame ]; libraryToolDepends = [ c2hs ]; description = "conduit-audio interface to the LAME MP3 library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {mp3lame = null;}; @@ -60556,8 +60795,8 @@ self: { librarySystemDepends = [ samplerate ]; libraryToolDepends = [ c2hs ]; description = "conduit-audio interface to the libsamplerate resampling library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {samplerate = null;}; @@ -60574,7 +60813,7 @@ self: { transformers ]; description = "conduit-audio interface to the libsndfile audio file library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "conduit-combinators" = callPackage @@ -60586,7 +60825,7 @@ self: { libraryHaskellDepends = [ base ]; doHaddock = false; description = "DEPRECATED Functionality merged into the conduit package itself"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "conduit-concurrent-map" = callPackage @@ -60602,7 +60841,7 @@ self: { ]; testHaskellDepends = [ base conduit hspec HUnit say ]; description = "Concurrent, order-preserving mapping Conduit"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "conduit-connection" = callPackage @@ -60622,7 +60861,7 @@ self: { test-framework test-framework-hunit transformers ]; description = "Conduit source and sink for Network.Connection."; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "conduit-extra" = callPackage @@ -60650,7 +60889,7 @@ self: { base bytestring bytestring-builder conduit gauge transformers ]; description = "Batteries included conduit: adapters for common libraries"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "conduit-find" = callPackage @@ -60684,8 +60923,8 @@ self: { transformers-base unix-compat ]; description = "A file-finding conduit that allows user control over traversals"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -60706,8 +60945,8 @@ self: { base bytestring conduit criterion mtl text ]; description = "Conduit for character encoding conversion"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -60719,7 +60958,7 @@ self: { sha256 = "0ys65vs5wb412bimmsmkmf14krk2339n9rswynnwy3rdb74bsswf"; libraryHaskellDepends = [ base conduit mtl ]; description = "Merge multiple sorted conduits"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "conduit-network-stream" = callPackage @@ -60734,8 +60973,8 @@ self: { base bytestring conduit mtl network-conduit resourcet ]; description = "A base layer for network protocols using Conduits"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -60758,7 +60997,7 @@ self: { tasty-hunit ]; description = "Parsing framework based on conduit"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "conduit-resumablesink" = callPackage @@ -60774,8 +61013,8 @@ self: { base bytestring conduit hspec resourcet transformers void ]; description = "Allows conduit to resume sinks to feed multiple sources into it"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -60799,8 +61038,8 @@ self: { test-framework-hunit throttle-io-stream unliftio unliftio-core ]; description = "Throttle Conduit Producers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -60820,8 +61059,8 @@ self: { executableHaskellDepends = [ attoparsec base conduit resourcet ]; testHaskellDepends = [ attoparsec base conduit hspec resourcet ]; description = "Conduits for tokenizing streams"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -60846,8 +61085,8 @@ self: { resourcet text transformers unix unliftio unordered-containers ]; description = "Virtual file system for Conduit; disk, pure, and in-memory impls"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -60874,8 +61113,8 @@ self: { zip-archive ]; description = "Zip archive interface for the Conduit Virtual File System"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -60894,7 +61133,7 @@ self: { quickcheck-instances tasty tasty-quickcheck zstd ]; description = "Conduit-based ZStd Compression"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "conf" = callPackage @@ -60910,8 +61149,8 @@ self: { base HUnit test-framework test-framework-hunit test-framework-th ]; description = "Parser for Haskell-based configuration files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -60928,7 +61167,7 @@ self: { aeson base binary bytestring directory hspec QuickCheck ]; description = "read, parse json config"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "confcrypt" = callPackage @@ -60963,8 +61202,8 @@ self: { parser-combinators QuickCheck tasty tasty-hunit tasty-quickcheck text transformers ]; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -60974,8 +61213,8 @@ self: { }: mkDerivation { pname = "conferer"; - version = "1.0.0.0"; - sha256 = "0hxlr45yfzv1lxw9lz7mk5risshdhmznxz0xqx5bsdyl7nbd79pv"; + version = "1.0.0.1"; + sha256 = "0cfn6aj265qs1qk5z942g5l2cz2gsj35bapxynj4c90wjl89wz5r"; libraryHaskellDepends = [ base bytestring containers directory filepath text ]; @@ -60984,7 +61223,7 @@ self: { QuickCheck text ]; description = "Configuration management library"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "conferer-aeson" = callPackage @@ -61004,7 +61243,7 @@ self: { unordered-containers vector ]; description = "conferer's source for reading json files"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "conferer-dhall" = callPackage @@ -61024,8 +61263,8 @@ self: { hspec text ]; description = "Configuration for reading dhall files"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -61038,7 +61277,7 @@ self: { libraryHaskellDepends = [ base conferer hedis text ]; testHaskellDepends = [ base conferer hedis hspec text ]; description = "conferer's FromConfig instances for hedis settings"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "conferer-hspec" = callPackage @@ -61050,7 +61289,7 @@ self: { libraryHaskellDepends = [ base conferer hspec-core text ]; testHaskellDepends = [ base conferer hspec hspec-core text ]; description = "conferer's FromConfig instances for hspec Config"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "conferer-provider-dhall" = callPackage @@ -61070,8 +61309,8 @@ self: { directory hspec text ]; description = "Configuration for reading dhall files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -61092,8 +61331,8 @@ self: { unordered-containers vector ]; description = "conferer's provider for reading json files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -61112,8 +61351,8 @@ self: { base conferer conferer-provider-json hspec yaml ]; description = "Configuration for reading yaml files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -61132,7 +61371,7 @@ self: { base conferer hspec snap-core snap-server text ]; description = "conferer's FromConfig instances for snap Config"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "conferer-source-dhall" = callPackage @@ -61152,8 +61391,8 @@ self: { directory hspec text ]; description = "Configuration for reading dhall files"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -61174,8 +61413,8 @@ self: { unordered-containers vector ]; description = "conferer's source for reading json files"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -61193,8 +61432,8 @@ self: { base conferer conferer-source-json hspec yaml ]; description = "Configuration for reading yaml files"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -61210,7 +61449,7 @@ self: { base conferer hspec http-types text wai warp ]; description = "conferer's FromConfig instances for warp settings"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "conferer-yaml" = callPackage @@ -61222,7 +61461,7 @@ self: { libraryHaskellDepends = [ base conferer conferer-aeson yaml ]; testHaskellDepends = [ base conferer conferer-aeson hspec yaml ]; description = "Configuration for reading yaml files"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "confetti" = callPackage @@ -61243,7 +61482,7 @@ self: { base tasty tasty-hunit tasty-smallcheck text ]; description = "A simple config file swapping tool"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "conffmt" = callPackage @@ -61260,8 +61499,8 @@ self: { base language-conf megaparsec optparse-applicative pretty text ]; description = "A .conf file formatter"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -61276,8 +61515,8 @@ self: { libraryHaskellDepends = [ base deiko-config exceptions text ]; testHaskellDepends = [ base deiko-config tasty tasty-hunit text ]; description = "derive typeclass instances for decoding types from HOCON conf"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -61298,7 +61537,7 @@ self: { base containers directory hedgehog ini text unordered-containers ]; description = "A library for simple INI-based configuration files"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "config-manager" = callPackage @@ -61319,7 +61558,7 @@ self: { text time unordered-containers ]; description = "Configuration management"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "config-parser" = callPackage @@ -61331,8 +61570,8 @@ self: { libraryHaskellDepends = [ base parsec text ]; testHaskellDepends = [ base extra hspec lens parsec text ]; description = "Parse config files using parsec and generate parse errors on unhandled keys"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -61350,8 +61589,8 @@ self: { ]; testHaskellDepends = [ base config-value text ]; description = "Schema definitions for the config-value package"; - license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ kiwi ]; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ kiwi ]; }) {}; "config-select" = callPackage @@ -61366,8 +61605,8 @@ self: { base directory filepath unix vty-menu ]; description = "A small program for swapping out dot files"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -61382,8 +61621,8 @@ self: { libraryToolDepends = [ alex happy ]; testHaskellDepends = [ base text ]; description = "Simple, layout-based value language similar to YAML or JSON"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ kiwi ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ kiwi ]; }) {}; "config-value-getopt" = callPackage @@ -61396,8 +61635,8 @@ self: { editedCabalFile = "1b5wfbqjjx6y8ll5h3vp2cmcdrcnjd3295y8ykd25yjx6f3swsja"; libraryHaskellDepends = [ base config-value text ]; description = "Interface between config-value and System.GetOpt"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -61426,8 +61665,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "parser for config files, shell variables, command line args"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.agpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -61439,8 +61678,8 @@ self: { sha256 = "1jqc5xpbxrlnpxk2yci861gpxl5c9vm9lffchrpp1hk8ag5wkxk1"; libraryHaskellDepends = [ base containers ]; description = "Simple data type for application configuration"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -61472,7 +61711,7 @@ self: { unordered-containers yaml ]; description = "Tools for specifying and parsing configurations"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "configurator" = callPackage @@ -61494,7 +61733,7 @@ self: { test-framework-hunit text ]; description = "Configuration management"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "configurator-export" = callPackage @@ -61511,7 +61750,7 @@ self: { ]; testHaskellDepends = [ base ]; description = "Pretty printer and exporter for configurations from the \"configurator\" library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "configurator-ng" = callPackage @@ -61534,8 +61773,8 @@ self: { test-framework-hunit text ]; description = "The next generation of configuration management"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -61556,7 +61795,7 @@ self: { test-framework-hunit text ]; description = "Reduced parser for configurator-ng config files"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "confsolve" = callPackage @@ -61574,8 +61813,8 @@ self: { time unordered-containers ]; description = "A command line tool for resolving conflicts of file synchronizers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -61587,8 +61826,8 @@ self: { sha256 = "1pj4kby5pba1xfz2fvv2lij7h2i8crf3qkhgs3rp4ziay0jkg18v"; libraryHaskellDepends = [ array base containers ]; description = "Decidable congruence relations for Haskell: up to you whether this is a joke"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -61600,7 +61839,7 @@ self: { sha256 = "1is3j61ra1whjpm8rq89yj9rscqj1ipgqlnh1nwvyzi2nggl06ya"; libraryHaskellDepends = [ base containers random ]; description = "Sparse matrix linear-equation solver"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "conjure" = callPackage @@ -61620,8 +61859,8 @@ self: { old-time parsec pretty random stm unix ]; description = "A BitTorrent client"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -61639,8 +61878,8 @@ self: { ]; testToolDepends = [ markdown-unlit ]; description = "Tools for functors from Hask^k to Hask"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -61655,8 +61894,8 @@ self: { libraryHaskellDepends = [ base text ]; executableHaskellDepends = [ base text ]; description = "A logger for a concurrent program"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -61676,7 +61915,7 @@ self: { socks tls x509 x509-store x509-system x509-validation ]; description = "Simple and easy network connections API"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "connection-pool" = callPackage @@ -61693,7 +61932,7 @@ self: { streaming-commons time transformers-base ]; description = "Connection pool built on top of resource-pool and streaming-commons"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "connection-string" = callPackage @@ -61709,8 +61948,8 @@ self: { ]; testHaskellDepends = [ base doctest text ]; description = "A library for parsing connection strings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -61727,8 +61966,8 @@ self: { ]; testHaskellDepends = [ base hedgehog ]; description = "Orders, Galois connections, and lattices"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -61746,8 +61985,8 @@ self: { ]; testHaskellDepends = [ base lifted-async transformers ]; description = "Eventually consistent STM transactions"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -61765,8 +62004,8 @@ self: { parsec parsec-extra split transformers unix utility-ht ]; description = "Interpret the command line and a config file as commands and options"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -61778,7 +62017,7 @@ self: { sha256 = "07s4p41hjsalbaayxq2j973f3wnk8d7aybvl84fww7sz6mj7kvhw"; libraryHaskellDepends = [ base ]; description = "console user prompts"; - license = stdenv.lib.licenses.lgpl3; + license = lib.licenses.lgpl3; }) {}; "console-style" = callPackage @@ -61789,7 +62028,7 @@ self: { sha256 = "0zxxs59bzgf81d3ww285znmmciij3rswfgyc89ngxb6p86l8x0bd"; libraryHaskellDepends = [ base mtl transformers ]; description = "Styled console text output using ANSI escape sequences"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "const-math-ghc-plugin" = callPackage @@ -61801,8 +62040,8 @@ self: { libraryHaskellDepends = [ base containers ghc ]; testHaskellDepends = [ base directory process ]; description = "Compiler plugin for constant math elimination"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -61814,7 +62053,7 @@ self: { sha256 = "16s8y035f30gyla620diwnsqi8lbmmfyxjpj4dlq24d45k5wfnsd"; libraryHaskellDepends = [ attoparsec base bytestring vector ]; description = "Parse ByteStrings of a prescribed length"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "constr-eq" = callPackage @@ -61825,8 +62064,8 @@ self: { sha256 = "0vk3cz6897vjnn1q7y1sqxy42ii4pq5h7jxw1zyybi99p6c4vgm6"; libraryHaskellDepends = [ base ]; description = "Equality by only Constructor"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -61838,7 +62077,7 @@ self: { sha256 = "00bd12gkv5yrqn52dyw3yjk2yind3m6d11k2d517gxanq9jqyx2c"; libraryHaskellDepends = [ base ]; description = "Generalization of standard Functor, Foldable, and Traversable classes"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }) {}; "constrained-categories" = callPackage @@ -61853,8 +62092,8 @@ self: { base contravariant fail semigroups tagged trivial-constraint void ]; description = "Constrained clones of the category-theory type classes, using ConstraintKinds"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -61874,8 +62113,8 @@ self: { testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; benchmarkHaskellDepends = [ base criterion ]; description = "Constrained Categories"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -61888,8 +62127,8 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Dynamic typing with retained constraints"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -61913,8 +62152,8 @@ self: { smallcheck transformers vector ]; description = "Typeclasses and instances for monads with constraints"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -61928,7 +62167,7 @@ self: { editedCabalFile = "0vlmsqgx7cpl65ibmx23hdqdyplgvbn144j9plkmrcs5aam1jsdj"; libraryHaskellDepends = [ base ]; description = "Normalised Deep Embeddings for Constrained Type-Class Instances"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "constrained-platform-instances" = callPackage @@ -61941,7 +62180,7 @@ self: { array base constrained containers vector ]; description = "Instances of standard platform types for 'constrained' package"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }) {}; "constraint" = callPackage @@ -61954,7 +62193,7 @@ self: { editedCabalFile = "0ivca43m1lqi75462z4hacvzs27whqzjnby7y7jjji8kqaw8wlda"; libraryHaskellDepends = [ base category unconstrained ]; description = "Reified constraints"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "constraint-classes" = callPackage @@ -61965,7 +62204,7 @@ self: { sha256 = "08b9rsvrmwkb1gl3x7d24cpghfband7cgzw4ldvxzjqvgmnyf9jy"; libraryHaskellDepends = [ base constraints transformers ]; description = "Various typeclasses using ConstraintKinds"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "constraint-manip" = callPackage @@ -61976,8 +62215,8 @@ self: { sha256 = "1kxg2iid906rw53r12rha8q3031ixdi3wlviprswig911x9c0zbk"; libraryHaskellDepends = [ base indextype ]; description = "Some conviencience type functions for manipulating constraints"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -61989,7 +62228,7 @@ self: { sha256 = "1v1m5vvicjmmz7mdp6fqf75fi2vf0hy25fyxgxpd4d7fbbyjvnh1"; libraryHaskellDepends = [ base category constraint reflection ]; description = "Constraint reflection"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "constraint-tuples" = callPackage @@ -62000,7 +62239,7 @@ self: { sha256 = "16f9y0q771f3mc38g8jpr875c8grjav6sg9lwbhg7nmcvcczwqk2"; libraryHaskellDepends = [ base ]; description = "Partially applicable constraint tuples"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "constraints" = callPackage @@ -62019,7 +62258,7 @@ self: { testHaskellDepends = [ base hspec ]; testToolDepends = [ hspec-discover ]; description = "Constraint manipulation"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }) {}; "constraints-deriving" = callPackage @@ -62040,7 +62279,7 @@ self: { base bytestring filepath ghc ghc-paths path path-io ]; description = "Manipulating constraints and deriving class instances programmatically"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "constraints-emerge" = callPackage @@ -62056,8 +62295,8 @@ self: { ]; testHaskellDepends = [ base constraints hspec transformers ]; description = "Defer instance lookups until runtime"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -62074,7 +62313,7 @@ self: { libraryHaskellDepends = [ base constraints template-haskell ]; executableHaskellDepends = [ aeson base constraints ]; description = "Utility package for constraints"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "constrictor" = callPackage @@ -62085,7 +62324,7 @@ self: { sha256 = "17vdyc2r9fgblh2pjwdrya7iyrb83ay09zhpfvn80rrrj3d2nd8x"; libraryHaskellDepends = [ base ghc-prim transformers ]; description = "strict versions of many things in base"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "construct" = callPackage @@ -62111,7 +62350,7 @@ self: { ]; testToolDepends = [ markdown-unlit ]; description = "Haskell version of the Construct library for easy specification of file formats"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "constructible" = callPackage @@ -62126,8 +62365,8 @@ self: { base binary-search complex-generic integer-roots ]; description = "Exact computation with constructible real numbers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -62139,8 +62378,8 @@ self: { sha256 = "17ab0vkq5w3zwh76ws7b82wbc0871qdmvrxhxga78h3h0axjiz1x"; libraryHaskellDepends = [ base QuickCheck type-level ]; description = "A library of constructive algebra"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -62165,8 +62404,8 @@ self: { tasty-hunit text transformers typed-process unliftio uuid ]; description = "A consul client for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -62193,8 +62432,8 @@ self: { transformers transformers-base ]; description = "Concurrent PostgreSQL data consumers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -62208,8 +62447,8 @@ self: { base containers convert lens text vector ]; description = "Containers abstraction and utilities"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -62221,7 +62460,7 @@ self: { sha256 = "1vlwaf363ymxpq0ry3h1lbn1dlyvf0dmja1q410ks0byz8kc77r7"; libraryHaskellDepends = [ base vector ]; description = "Functions for building containers from a known number of elements"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "container-classes" = callPackage @@ -62232,7 +62471,7 @@ self: { sha256 = "18mx50mp9pv1a33kcwmckz6r4a0j6rlc1165ivn9cj8iiwpmd6pv"; libraryHaskellDepends = [ base ]; description = "Generic classes for interacting with different container types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "containers_0_6_4_1" = callPackage @@ -62243,8 +62482,8 @@ self: { sha256 = "0vn43a7bf49pih9b65b359xf3658d96dpm9j35i8x8j61vlrcsid"; libraryHaskellDepends = [ array base deepseq ]; description = "Assorted concrete container types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "containers-accelerate" = callPackage @@ -62262,8 +62501,8 @@ self: { hashable-accelerate hedgehog tasty tasty-hedgehog ]; description = "Hashing-based container types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "containers-benchmark" = callPackage @@ -62280,8 +62519,8 @@ self: { base bytestring containers criterion deepseq ghc-prim random ]; description = "Extensive benchmark suite for containers package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -62293,7 +62532,7 @@ self: { sha256 = "0l9d7hj66fygpsbjw6wy4l11c9cw739lvkrypapwihav7jzva541"; libraryHaskellDepends = [ base containers deepseq ]; description = "Provide orphan NFData instances for containers as needed. (deprecated)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "containers-unicode-symbols" = callPackage @@ -62304,7 +62543,7 @@ self: { sha256 = "006znsrwz3sssvg53mail2xd98hq6y4l83140sd2fzyg4df25js7"; libraryHaskellDepends = [ base base-unicode-symbols containers ]; description = "Unicode alternatives for common functions and operators"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "containers-verified" = callPackage @@ -62315,8 +62554,8 @@ self: { sha256 = "08cwfn71ffvjfp252l3whic90rqyq1jvrk0m9xp54kh3g2rdqma9"; libraryHaskellDepends = [ containers ]; description = "Formally verified drop-in replacement of containers"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -62341,8 +62580,8 @@ self: { hspec memory mtl resourcet temporary ]; description = "Store and retrieve data from an on-disk store"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -62358,7 +62597,7 @@ self: { testHaskellDepends = [ async base ghc-prim hspec ]; testToolDepends = [ hspec-discover ]; description = "Thread-indexed, nested contexts"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "context-free-art" = callPackage @@ -62381,7 +62620,7 @@ self: { base bifunctors blaze-markup blaze-svg HUnit random text text-show ]; description = "Generate art from context-free grammars"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "context-free-grammar" = callPackage @@ -62404,8 +62643,8 @@ self: { test-framework-quickcheck2 ]; description = "Basic algorithms on context-free grammars"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -62424,7 +62663,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Modify HTTP requests/responses using context"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "context-resource" = callPackage @@ -62437,7 +62676,7 @@ self: { testHaskellDepends = [ async base context hspec ]; testToolDepends = [ hspec-discover ]; description = "Thread-safe, pool-compatible resource provider"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "context-stack" = callPackage @@ -62450,8 +62689,8 @@ self: { base classy-prelude mtl unordered-containers ]; description = "An abstraction of a stack and stack-based monadic context"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -62470,7 +62709,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Add request-specific (or not!) context to your WAI applications"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "contiguous" = callPackage @@ -62493,8 +62732,8 @@ self: { base primitive random random-shuffle weigh ]; description = "Unified interface for primitive arrays"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -62506,8 +62745,8 @@ self: { sha256 = "0jfqxz0v107xw6mjr0wb1abb6v5zd3siy7z0gk9nqcvyacb80z4a"; libraryHaskellDepends = [ base contiguous primitive ]; description = "contiguous with bounds checks"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -62519,8 +62758,8 @@ self: { sha256 = "0nnxr6yihb82c7in0hsb7k9jkjccx5040pvxj5gb06ahzz5ls5yn"; libraryHaskellDepends = [ base contiguous primitive semirings ]; description = "dft of contiguous memory structures"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -62537,8 +62776,8 @@ self: { transformers-base ]; description = "Monads with suspension and arbitrary-spot reentry"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -62552,7 +62791,7 @@ self: { testHaskellDepends = [ base hspec ]; benchmarkHaskellDepends = [ base criterion ]; description = "Types and functions for working with continued fractions in Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "continued-fractions" = callPackage @@ -62569,7 +62808,7 @@ self: { test-framework-quickcheck2 ]; description = "Continued fractions"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "continuum" = callPackage @@ -62585,8 +62824,8 @@ self: { libraryHaskellDepends = [ base bytestring cereal containers mtl nanomsg-haskell time ]; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -62601,8 +62840,8 @@ self: { libraryHaskellDepends = [ base bytestring cereal containers mtl nanomsg-haskell time ]; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -62614,7 +62853,7 @@ self: { sha256 = "146g43sqa23n1qg100jvz5m1jcjfxx4rxzmc8559b6apys9ys4br"; libraryHaskellDepends = [ base ]; description = "Arrow and contravariant tracers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "contracheck-applicative" = callPackage @@ -62629,7 +62868,7 @@ self: { base containers contravariant generics-sop microlens mmorph ]; description = "Validation types/typeclass based on the contravariance"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "contravariant" = callPackage @@ -62640,7 +62879,7 @@ self: { sha256 = "1haxsq7jl95gzmbjdr2pgza9b7j0j3f26wwkf494gphz6c76yls4"; libraryHaskellDepends = [ base StateVar transformers ]; description = "Contravariant functors"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "contravariant-extras" = callPackage @@ -62655,7 +62894,7 @@ self: { base contravariant template-haskell template-haskell-compat-v0208 ]; description = "Extras for the \"contravariant\" package"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "control" = callPackage @@ -62671,8 +62910,8 @@ self: { base basic stm template-haskell transformers ]; description = "Class of monad transformers which control operations can be lifted thru"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -62684,7 +62923,7 @@ self: { sha256 = "10amxm1ff7xhd8g66n65wkbb8d17n77v1nmwxkbzhrask398asp4"; libraryHaskellDepends = [ base ]; description = "Useful combinators for boolean expressions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "control-dotdotdot" = callPackage @@ -62695,7 +62934,7 @@ self: { sha256 = "0rwi5zwvqn18g7qyp9aw51w3yzkqbff9g7rcqdk1l871fvq8qhha"; libraryHaskellDepends = [ base ]; description = "Haskell operator `g ... f = \\x1 .. xn -> g (f x1 .. xn)`."; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "control-dsl" = callPackage @@ -62713,7 +62952,7 @@ self: { base containers doctest doctest-discover temporary ]; description = "An alternative to monads in do-notation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "control-event" = callPackage @@ -62725,7 +62964,7 @@ self: { libraryHaskellDepends = [ base containers stm time ]; testHaskellDepends = [ base containers stm time ]; description = "Event scheduling system"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "control-iso" = callPackage @@ -62740,8 +62979,8 @@ self: { base bytestring newtype-generics profunctors text ]; description = "A typeclass for type isomorphisms"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -62753,8 +62992,8 @@ self: { sha256 = "140n27vdbyjz5qycrwlrmyd7s48fxcl6msl16g7czg40k5y23j5s"; libraryHaskellDepends = [ attempt base transformers ]; description = "Monad transformer for attempt. (deprecated)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -62771,7 +63010,7 @@ self: { transformers-base ]; description = "Explicitly typed, checked exceptions with stack traces"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "control-monad-exception-monadsfd" = callPackage @@ -62786,8 +63025,8 @@ self: { base control-monad-exception monads-fd transformers ]; description = "Monads-fd instances for the EMT exceptions monad transformer"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -62803,7 +63042,7 @@ self: { base control-monad-exception monads-tf transformers ]; description = "Monads-tf instances for the EMT exceptions monad transformer"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "control-monad-exception-mtl" = callPackage @@ -62815,7 +63054,7 @@ self: { libraryHaskellDepends = [ base control-monad-exception mtl ]; doHaddock = false; description = "MTL instances for the EMT exceptions monad transformer"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "control-monad-failure" = callPackage @@ -62826,8 +63065,8 @@ self: { sha256 = "1g304wb1fhx81iw2vv7nv6cp2qmy69frwiv3vax85lxw03s4nlkq"; libraryHaskellDepends = [ base failure transformers ]; description = "A class for monads which can fail with an error. (deprecated)"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -62839,8 +63078,8 @@ self: { sha256 = "0j9i85vq033789vx2589mfqwk954hqy1wla527ssbyf05k6vkn8j"; libraryHaskellDepends = [ base failure mtl ]; description = "A class for monads which can fail with an error for mtl 1 (deprecated)"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -62852,7 +63091,7 @@ self: { sha256 = "1habgf7byffqf1rqjkzpihvdhclaafgqsqpfpwp3fgpj5ayk1j33"; libraryHaskellDepends = [ base transformers ]; description = "Free monads and monad transformers"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "control-monad-loop" = callPackage @@ -62863,7 +63102,7 @@ self: { sha256 = "003k4pp6wgn30m9ksbh8680f0klzsvd90wsl9jpqs9lpg14hi6zj"; libraryHaskellDepends = [ base transformers transformers-base ]; description = "Simple monad transformer for imperative-style loops"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "control-monad-omega" = callPackage @@ -62874,7 +63113,7 @@ self: { sha256 = "1zx92zyvv10w61rzwhn1d4kggzmi9hggsyjcdav424280x31wb7n"; libraryHaskellDepends = [ base ]; description = "A breadth-first list monad"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "control-monad-queue" = callPackage @@ -62885,7 +63124,7 @@ self: { sha256 = "1dfiys93i7wnbf33dgb324gp57ab5y7pn405hq8iciq2c7kzfa6l"; libraryHaskellDepends = [ base ]; description = "Reusable corecursive queues, via continuations"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "control-timeout" = callPackage @@ -62896,7 +63135,7 @@ self: { sha256 = "1g1x6c4dafckwcw48v83f3nm2sxv8kynwv8ib236ay913ycgayvg"; libraryHaskellDepends = [ base containers stm time ]; description = "Timeout handling"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "contstuff" = callPackage @@ -62907,7 +63146,7 @@ self: { sha256 = "0rw2bslajjch057fsxf881wi39bsd9y6196j0kb0lz47r0zn8003"; libraryHaskellDepends = [ base transformers ]; description = "Fast, easy to use CPS-based monad transformers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "contstuff-monads-tf" = callPackage @@ -62918,8 +63157,8 @@ self: { sha256 = "0j4y76ar0m642jxcyrvlrxagawrlq637cvx3fqprw5sl5cslgxh5"; libraryHaskellDepends = [ base contstuff monads-tf ]; description = "ContStuff instances for monads-tf transformers (deprecated)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -62931,8 +63170,8 @@ self: { sha256 = "0b5vskp1bxqpi4ffcxwjw6kr0jd6n8v8jlhf03p54ckfd5ym4ai6"; libraryHaskellDepends = [ base contstuff transformers ]; description = "Deprecated interface between contstuff 0.7.0 and the transformers package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -62944,7 +63183,7 @@ self: { sha256 = "0y28m7kgphknra0w2kzf0g4m2bdj604nr3f22xng46nl7kljbpvj"; libraryHaskellDepends = [ base ]; description = "Limit operations for converging sequences"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "conversion" = callPackage @@ -62957,7 +63196,7 @@ self: { editedCabalFile = "17hrwyhlcch970vb4gk793xhcpg035n0gxypbjz58vkka04j3d4d"; libraryHaskellDepends = [ base-prelude ]; description = "Universal converter between values of different types"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "conversion-bytestring" = callPackage @@ -62968,7 +63207,7 @@ self: { sha256 = "0ybh702mrwjvm48i03bb5hfiiz5qypyxyz5n14wai0kjn4ks1qwh"; libraryHaskellDepends = [ base-prelude bytestring conversion ]; description = "\"Conversion\" instances for the \"bytestring\" library"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "conversion-case-insensitive" = callPackage @@ -62979,7 +63218,7 @@ self: { sha256 = "14mf5jincplqrdln6xja0c840mmj4khd5n3z5f4glgpnmk9r3dcp"; libraryHaskellDepends = [ case-insensitive conversion ]; description = "\"Conversion\" instances for the \"case-insensitive\" library"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "conversion-text" = callPackage @@ -62994,7 +63233,7 @@ self: { base-prelude bytestring conversion conversion-bytestring text ]; description = "\"Conversion\" instances for the \"text\" library"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "conversions" = callPackage @@ -63015,8 +63254,8 @@ self: { source-constraints template-haskell text unliftio-core ]; description = "Injective explicit total and partial conversions"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -63034,8 +63273,8 @@ self: { lens template-haskell text utf8-string ]; description = "Safe and unsafe data conversion utilities with strong type-level operation. checking."; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -63059,8 +63298,8 @@ self: { pipes-bytestring pipes-csv text vector ]; description = "Convert the annotation of a gene to another in a delimited file using a variety of different databases"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -63078,7 +63317,7 @@ self: { base bytestring containers mtl old-locale old-time text time ]; description = "Typeclasses and instances for converting between types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "convertible-ascii" = callPackage @@ -63094,8 +63333,8 @@ self: { convertible-text failure text ]; description = "convertible instances for ascii"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -63116,8 +63355,8 @@ self: { time ]; description = "Typeclasses and instances for converting between types (deprecated)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -63129,7 +63368,7 @@ self: { sha256 = "0bdsdq5m4skh3sh6dfz7jrdcsnyg5vb392n6gcqm9s1m0749r4b3"; libraryHaskellDepends = [ base directory strict ]; description = "Tiered general-purpose libraries with domain-specific applications"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cookie" = callPackage @@ -63149,7 +63388,7 @@ self: { text time ]; description = "HTTP cookie parsing and rendering"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "cookies" = callPackage @@ -63162,8 +63401,8 @@ self: { base bytestring chronos hashable text time ]; description = "web cookies"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -63176,8 +63415,8 @@ self: { libraryHaskellDepends = [ base lens papa transformers ]; testHaskellDepends = [ base HUnit lens ]; description = "A representation of latitude and longitude"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -63198,8 +63437,8 @@ self: { ]; executableHaskellDepends = [ base copilot-c99 copilot-libraries ]; description = "A stream DSL for writing embedded C programs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -63222,8 +63461,8 @@ self: { language-c99-simple pretty process QuickCheck ]; description = "A compiler for Copilot targeting C99"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -63240,8 +63479,8 @@ self: { pretty process ]; description = "Copilot interface to a C model-checker"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -63253,7 +63492,7 @@ self: { sha256 = "0l13zqycini9fkiy90i0dzi831lqv8lwpdk0dzrk9r0c545iy2ga"; libraryHaskellDepends = [ base dlist mtl pretty ]; description = "An intermediate representation for Copilot"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "copilot-language" = callPackage @@ -63269,8 +63508,8 @@ self: { ghc-prim mtl ]; description = "A Haskell-embedded DSL for monitoring hard real-time distributed systems"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -63286,8 +63525,8 @@ self: { array base containers copilot-language data-reify mtl parsec ]; description = "Libraries for the Copilot language"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -63303,8 +63542,8 @@ self: { base containers copilot-core directory filepath pretty sbv ]; description = "A compiler for CoPilot targeting SBV"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -63322,8 +63561,8 @@ self: { directory mtl parsec pretty process random transformers xml ]; description = "k-induction for Copilot"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -63343,8 +63582,8 @@ self: { ]; testHaskellDepends = [ base hlint ]; description = "Haskell interface to the Fedora Copr system"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -63371,7 +63610,7 @@ self: { which ]; description = "Yet another shell monad"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "core" = callPackage @@ -63382,8 +63621,8 @@ self: { sha256 = "1fqgfbd3in8l84250kda67paakz4sr2ywf5qzsy403546w7q9ccz"; libraryHaskellDepends = [ base bytestring parsec pretty ]; description = "External core parser and pretty printer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -63403,7 +63642,7 @@ self: { executableHaskellDepends = [ array base ]; executableToolDepends = [ alex happy ]; description = "compile your own mini functional language with Core"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "core-data" = callPackage @@ -63420,7 +63659,7 @@ self: { scientific text unordered-containers vector ]; description = "Convenience wrappers around common data structures and encodings"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "core-haskell" = callPackage @@ -63435,8 +63674,8 @@ self: { base haskeline haskell-src-exts hint ]; description = "A subset of Haskell using in UCC for teaching purpose"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -63458,7 +63697,7 @@ self: { transformers unix ]; description = "Opinionated Haskell Interoperability"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "core-text" = callPackage @@ -63475,7 +63714,7 @@ self: { prettyprinter template-haskell text text-short ]; description = "A rope type based on a finger tree over UTF-8 fragments"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "corebot-bliki" = callPackage @@ -63501,8 +63740,8 @@ self: { yesod ]; description = "A bliki written using yesod. Uses pandoc to process files stored in git."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -63520,7 +63759,7 @@ self: { executableHaskellDepends = [ base process unix ]; testHaskellDepends = [ base process ]; description = "Write your main like it can call itself back"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "corenlp-parser" = callPackage @@ -63540,8 +63779,8 @@ self: { ]; librarySystemDepends = [ rocksdb ]; description = "Launches CoreNLP and parses the JSON output"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) rocksdb;}; @@ -63552,8 +63791,8 @@ self: { }: mkDerivation { pname = "cornea"; - version = "0.3.0.1"; - sha256 = "0kdj6ii6k8x9i87vgfl2cjlwkj4vls09w781xab6ix7h264asi71"; + version = "0.3.1.2"; + sha256 = "04iika5r5w3347w87b8whwrxym5nzvgl5pr76fpxw78fwvi1nvzk"; libraryHaskellDepends = [ base-noprelude either lens lifted-base monad-control mtl relude template-haskell th-abstraction transformers @@ -63564,7 +63803,7 @@ self: { ]; description = "classy optical monadic state"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "coroutine-enumerator" = callPackage @@ -63576,7 +63815,7 @@ self: { libraryHaskellDepends = [ base enumerator monad-coroutine ]; description = "Bridge between the monad-coroutine and enumerator packages"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -63589,7 +63828,7 @@ self: { libraryHaskellDepends = [ base iteratee monad-coroutine ]; description = "Bridge between the monad-coroutine and iteratee packages"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -63601,8 +63840,8 @@ self: { sha256 = "1hgpy3fswhars994mz3756firiy0g5brx7w9is4nfhg8mr5vf3yg"; libraryHaskellDepends = [ base either free mtl transformers ]; description = "Object-oriented programming realization using coroutine"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -63621,8 +63860,8 @@ self: { vector ]; description = "A CouchDB view server for Haskell"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -63649,8 +63888,8 @@ self: { ]; testToolDepends = [ couchdb ]; description = "A modern, lightweight, complete client for CouchDB"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) couchdb;}; "couchdb-conduit" = callPackage @@ -63679,8 +63918,8 @@ self: { unordered-containers ]; description = "Couch DB client library using http-conduit and aeson"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -63708,8 +63947,8 @@ self: { utf8-string vector ]; description = "Couch DB client library using http-enumerator and aeson"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -63721,7 +63960,7 @@ self: { sha256 = "1az2vr1rjq4pfgzswwbwgfq4kcb8kq759vn5kl7ghzaqr7b6vkgx"; libraryHaskellDepends = [ base ]; description = "Bijective mappings between values and possibly infinite prefixes of [0..]"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "countable" = callPackage @@ -63737,7 +63976,7 @@ self: { base bytestring silently tasty tasty-golden tasty-hunit ]; description = "Countable, Searchable, Finite, Empty classes"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "countable-inflections" = callPackage @@ -63753,8 +63992,8 @@ self: { ]; testHaskellDepends = [ base hspec QuickCheck text ]; description = "Countable Text Inflections"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -63766,8 +64005,8 @@ self: { sha256 = "0jc34nrbzxzilrr1s2k7krrp9g5xc40hpf2srw6mccfrcsyacsnc"; libraryHaskellDepends = [ base containers ]; description = "An object frequency counter"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -63788,7 +64027,7 @@ self: { base QuickCheck quickcheck-classes tasty tasty-quickcheck ]; description = "Country data type and functions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "country-codes" = callPackage @@ -63804,8 +64043,8 @@ self: { libraryHaskellDepends = [ aeson base deepseq shakespeare text ]; testHaskellDepends = [ aeson base HTF HUnit ]; description = "ISO 3166 country codes and i18n names"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -63830,8 +64069,8 @@ self: { test-framework test-framework-hunit ]; description = "A message-passing library for simplifying network applications"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -63851,8 +64090,8 @@ self: { optparse-applicative process stm text time unix ]; description = "Simple and flexible CI system"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -63865,8 +64104,8 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec HUnit QuickCheck ]; description = "Exhaustivity Checking Library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -63880,7 +64119,7 @@ self: { base groups primitive refined semirings ]; description = "Coya monoids"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cparsing" = callPackage @@ -63896,8 +64135,8 @@ self: { split template-haskell transformers ]; description = "A simple C++ parser with preprocessor features. C++ refactorings included."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -63917,8 +64156,8 @@ self: { resourcet ]; description = "Conduit-based CPIO"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -63949,8 +64188,8 @@ self: { ]; testHaskellDepends = [ base hspec hspec-megaparsec megaparsec ]; description = "Build tool for C"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -63968,8 +64207,8 @@ self: { ]; librarySystemDepends = [ cplex ]; description = "high-level CPLEX interface"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) cplex;}; "cplusplus-th" = callPackage @@ -63985,8 +64224,8 @@ self: { ]; testHaskellDepends = [ base process QuickCheck ]; description = "C++ Foreign Import Generation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -64000,7 +64239,7 @@ self: { testHaskellDepends = [ base bytestring hspec ]; benchmarkHaskellDepends = [ base bytestring criterion ]; description = "Bindings for C++ demangling routines"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cpphs" = callPackage @@ -64033,7 +64272,7 @@ self: { base bytestring criterion crypto-random mtl ]; description = "Crypto Pseudo Random Number Generator using AES in counter mode"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cprng-aes-effect" = callPackage @@ -64051,8 +64290,8 @@ self: { extensible-effects ]; description = "Run random effect using cprng-aes, a crypto pseudo number generator"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -64067,7 +64306,7 @@ self: { enableSeparateDataOutput = true; executableHaskellDepends = [ base containers directory parallel ]; description = "Symbolic cryptographic protocol analyzer"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cpu" = callPackage @@ -64081,7 +64320,7 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base ]; description = "Cpu information and properties helpers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cpuid" = callPackage @@ -64105,7 +64344,7 @@ self: { sha256 = "0mans1i26w3rl1vvf9isn8y6lvmn9dlf2c0znbgjxj605jcy7cyi"; libraryHaskellDepends = [ attoparsec base bytestring deepseq ]; description = "Haskell Library for Checking CPU Information"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "cpuperf" = callPackage @@ -64118,8 +64357,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base mtl process ]; description = "Modify the cpu frequency on OpenBSD systems"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -64135,8 +64374,8 @@ self: { testHaskellDepends = [ base text ]; testPkgconfigDepends = [ python3 ]; description = "Bindings for libpython"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) python3;}; @@ -64159,7 +64398,7 @@ self: { ]; description = "Cassandra CQL binary protocol"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "cql-io" = callPackage @@ -64186,8 +64425,8 @@ self: { ]; doHaddock = false; description = "Cassandra CQL client"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -64199,8 +64438,8 @@ self: { sha256 = "14mr1i7g61h25fn2xa02iyzq1mxcgzkisfmiakdakiya4zxjk10f"; libraryHaskellDepends = [ base bytestring cql-io tinylog ]; description = "Tinylog integration for cql-io"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -64213,7 +64452,7 @@ self: { libraryHaskellDepends = [ base ]; doHaddock = false; description = "Command-Query Responsibility Segregation"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "cqrs-core" = callPackage @@ -64229,8 +64468,8 @@ self: { uuid-types ]; description = "Command-Query Responsibility Segregation"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -64252,8 +64491,8 @@ self: { transformers uuid-types wai-extra wai-middleware-static warp ]; description = "Example for cqrs package"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -64270,8 +64509,8 @@ self: { ]; testHaskellDepends = [ base cqrs-core cqrs-testkit hspec random ]; description = "Memory backend for the cqrs package"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -64295,8 +64534,8 @@ self: { pg-harness-client postgresql-libpq random resource-pool uuid-types ]; description = "PostgreSQL backend for the cqrs package"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -64317,8 +64556,8 @@ self: { text transformers ]; description = "SQLite3 backend for the cqrs package"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -64335,8 +64574,8 @@ self: { transformers ]; description = "Command-Query Responsibility Segregation Test Support"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -64354,8 +64593,8 @@ self: { lifted-base random transformers uuid-types ]; description = "Command-Query Responsibility Segregation Test Support"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -64368,7 +64607,7 @@ self: { libraryHaskellDepends = [ base ]; doHaddock = false; description = "Command-Query Responsibility Segregation. Modules for the basic types."; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "cr" = callPackage @@ -64386,8 +64625,8 @@ self: { base cmdargs directory process shelly text transformers unix ]; description = "Code review tool"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -64401,7 +64640,7 @@ self: { librarySystemDepends = [ crack ]; description = "A haskell binding to cracklib"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {crack = null;}; @@ -64416,7 +64655,7 @@ self: { libraryHaskellDepends = [ array base FloatingHex ]; executableHaskellDepends = [ array base FloatingHex ]; description = "Crack various integer, floating-point data formats"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "craft" = callPackage @@ -64447,8 +64686,8 @@ self: { base hspec hspec-megaparsec megaparsec QuickCheck ]; description = "A UNIX configuration management library in Haskell"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -64462,8 +64701,8 @@ self: { isExecutable = true; libraryHaskellDepends = [ base colour mtl vector-space ]; description = "2D graphics library with integrated TikZ output"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -64475,8 +64714,8 @@ self: { sha256 = "16in87l2v49k785fldm7fvprywg0v497kz29jr22y91q5j5gnm4z"; libraryHaskellDepends = [ base cairo craftwerk mtl ]; description = "Cairo backend for Craftwerk"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -64494,8 +64733,8 @@ self: { base cairo containers craftwerk craftwerk-cairo gtk mtl ]; description = "Gtk UI for Craftwerk"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -64516,8 +64755,8 @@ self: { tagsoup text time ]; description = "Simulation user crawl paths"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -64550,8 +64789,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "HTTP Racing Library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -64569,8 +64808,8 @@ self: { ]; benchmarkHaskellDepends = [ base bytestring criterion ]; description = "Implements various Cyclic Redundancy Checks (CRC)"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -64582,8 +64821,8 @@ self: { sha256 = "15x3xwq2vyg474m09jak1c2zx9w5acpfjgmy5jj4asxj33z9n7bz"; libraryHaskellDepends = [ base bytestring ]; description = "Calculate the crc16-ccitt"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -64595,7 +64834,7 @@ self: { sha256 = "0x943wmcbj679kj7q2a2ipjycq17ajm71m487vkb8b6gdrdy8f2z"; libraryHaskellDepends = [ array base ]; description = "Compute CRC16 checksums using a lookup table"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "crc32c" = callPackage @@ -64612,7 +64851,7 @@ self: { base bytestring hspec hspec-core QuickCheck ]; description = "Haskell bindings for crc32c"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "crdt" = callPackage @@ -64628,8 +64867,8 @@ self: { safe stm time vector ]; description = "Conflict-free replicated data types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -64648,8 +64887,8 @@ self: { ]; testHaskellDepends = [ base hspec ]; description = "Garbage collected event folding CRDT"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -64675,8 +64914,8 @@ self: { test-framework-quickcheck2 ]; description = "Framework for artificial life experiments"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -64696,8 +64935,8 @@ self: { executableHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring tasty tasty-hunit ]; description = "Library to access secure credential storage providers"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -64719,7 +64958,7 @@ self: { testHaskellDepends = [ base ]; description = "Secure Credentials Storage and Distribution"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "credentials-cli" = callPackage @@ -64744,7 +64983,7 @@ self: { ]; description = "Secure Credentials Administration"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "crf-chain1" = callPackage @@ -64761,8 +65000,8 @@ self: { parallel random sgd vector vector-binary-instances vector-th-unbox ]; description = "First-order, linear-chain conditional random fields"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -64782,8 +65021,8 @@ self: { vector-binary vector-th-unbox ]; description = "First-order, constrained, linear-chain conditional random fields"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -64801,8 +65040,8 @@ self: { logfloat monad-codec parallel sgd vector vector-binary ]; description = "Second-order, generic, constrained, linear conditional random fields"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -64821,8 +65060,8 @@ self: { vector-binary vector-th-unbox ]; description = "Second-order, tiered, constrained, linear conditional random fields"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -64851,8 +65090,8 @@ self: { vector ]; description = "Crit-bit maps and sets"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -64890,7 +65129,7 @@ self: { tasty-quickcheck vector ]; description = "Robust, reliable performance measurement and analysis"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "criterion-compare" = callPackage @@ -64911,8 +65150,8 @@ self: { data-default filepath lens lucid optparse-applicative text vector ]; description = "A simple tool for visualising differences in Criterion benchmark results"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -64928,7 +65167,7 @@ self: { aeson base base-compat binary containers deepseq vector ]; description = "Criterion measurement functionality and associated types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "criterion-plus" = callPackage @@ -64955,8 +65194,8 @@ self: { transformers transformers-base vector ]; description = "Enhancement of the \"criterion\" benchmarking library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -64975,8 +65214,8 @@ self: { aeson base blaze-html blaze-markup bytestring containers filepath ]; description = "Convert criterion output to HTML reports"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -64993,8 +65232,8 @@ self: { unix ]; description = "CRIU RPC client"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -65008,8 +65247,8 @@ self: { libraryHaskellDepends = [ base proto-lens proto-lens-protoc ]; libraryPkgconfigDepends = [ protobuf ]; description = "Criu RPC protocol buffer types"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) protobuf;}; @@ -65025,8 +65264,8 @@ self: { libraryHaskellDepends = [ base containers free mtl text ]; testHaskellDepends = [ base containers hedgehog hspec mtl ]; description = "A Conflict-Free Replicated JSON Datatype for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -65038,8 +65277,8 @@ self: { sha256 = "1fgsmf2k0v1j7b3gv06q9c65410qa2ivl59rwkm7j931wsymsg26"; libraryHaskellDepends = [ base digits QuickCheck safe ]; description = "An implementation of Douglas Crockford's base32 encoding"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -65058,8 +65297,8 @@ self: { mersenne-random-pure64 mtl parallel ]; description = "An offline renderer supporting ray tracing and photon mapping"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -65082,7 +65321,7 @@ self: { ]; benchmarkHaskellDepends = [ attoparsec base criterion text time ]; description = "Cron datatypes and Attoparsec parser"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "cron-compat" = callPackage @@ -65103,8 +65342,8 @@ self: { text time transformers ]; description = "Cron datatypes and Attoparsec parser"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -65122,7 +65361,7 @@ self: { text transformers unordered-containers vector ]; description = "Another bloated standard library"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "cruncher-types" = callPackage @@ -65134,8 +65373,8 @@ self: { libraryHaskellDepends = [ aeson base containers lens text ]; testHaskellDepends = [ base hlint ]; description = "Request and Response types for Eval.so's API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -65154,8 +65393,8 @@ self: { transformers unix ]; description = "A runghc replacement with transparent caching"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -65177,8 +65416,8 @@ self: { tasty-quickcheck ]; description = "Pure Haskell implelementation for GNU SHA512 crypt algorithm"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -65196,7 +65435,7 @@ self: { base bytestring cereal entropy tagged transformers ]; description = "A generic interface for cryptographic operations"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "crypto-api-tests" = callPackage @@ -65215,7 +65454,7 @@ self: { test-framework-quickcheck2 ]; description = "A test framework and KATs for cryptographic operations"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "crypto-cipher-benchmarks" = callPackage @@ -65231,8 +65470,8 @@ self: { securemem ]; description = "Generic cryptography cipher benchmarks"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -65255,7 +65494,7 @@ self: { test-framework test-framework-hunit test-framework-quickcheck2 ]; description = "Generic cryptography cipher tests"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "crypto-cipher-types" = callPackage @@ -65267,7 +65506,7 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base byteable bytestring securemem ]; description = "Generic cryptography cipher types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "crypto-classical" = callPackage @@ -65284,8 +65523,8 @@ self: { ]; testHaskellDepends = [ base bytestring QuickCheck ]; description = "An educational tool for studying classical cryptography schemes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -65307,8 +65546,8 @@ self: { cryptocipher cryptohash-cryptoapi hspec skein transformers ]; description = "Conduit interface for cryptographic operations (from crypto-api)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -65330,7 +65569,7 @@ self: { ]; testHaskellDepends = [ base HUnit QuickCheck ]; description = "An Enigma machine simulator with display"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "crypto-keys-ssh" = callPackage @@ -65343,8 +65582,8 @@ self: { base base64-bytestring binary bytestring ]; description = "Like crypto-pubkey-openssh but not dependent on any specific crypto library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -65365,8 +65604,8 @@ self: { executableHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring hspec QuickCheck ]; description = "Multihash library on top of cryptonite crypto library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -65390,7 +65629,7 @@ self: { ]; benchmarkHaskellDepends = [ base bytestring criterion mtl ]; description = "Cryptographic numbers: functions and algorithms"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "crypto-pubkey" = callPackage @@ -65416,7 +65655,7 @@ self: { cryptohash deepseq mtl ]; description = "Public Key cryptography"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "crypto-pubkey-openssh" = callPackage @@ -65439,8 +65678,8 @@ self: { QuickCheck tasty tasty-quickcheck temporary ]; description = "OpenSSH keys decoder/encoder"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -65452,7 +65691,7 @@ self: { sha256 = "0q0wlzjmpx536h1zcdzrpxjkvqw8abj8z0ci38138kpch4igbnby"; libraryHaskellDepends = [ asn1-encoding asn1-types base ]; description = "Generic cryptography Public keys algorithm types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "crypto-random" = callPackage @@ -65465,7 +65704,7 @@ self: { editedCabalFile = "1ax1iafbbqkcrvjnnxlvqh2zgpx8xzcbxl6l870207bpzwrja2f1"; libraryHaskellDepends = [ base bytestring securemem unix vector ]; description = "Simple cryptographic random related types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "crypto-random-api" = callPackage @@ -65476,7 +65715,7 @@ self: { sha256 = "0z49kwgjj7rz235642q64hbkgp0zl6ipn29xd19yb75xc5q7gsan"; libraryHaskellDepends = [ base bytestring entropy ]; description = "Simple random generators API for cryptography related code"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "crypto-random-effect" = callPackage @@ -65494,8 +65733,8 @@ self: { transformers ]; description = "A random effect using crypto-random"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -65512,7 +65751,7 @@ self: { transformers-base ]; description = "Cryptographic random number generator"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "crypto-simple" = callPackage @@ -65526,8 +65765,8 @@ self: { base bytestring cryptonite hspec QuickCheck ]; description = "A simple high level encryption interface based on cryptonite"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -65549,18 +65788,18 @@ self: { ]; testToolDepends = [ tasty-discover ]; description = "Easy-and-safe-to-use high-level cryptography based on Sodium"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "crypto-token" = callPackage ({ mkDerivation, array, base, cryptonite, memory }: mkDerivation { pname = "crypto-token"; - version = "0.0.0.0"; - sha256 = "1azvzzf4w6q76fbggw4f4inqibkvzy9chpdd01349rm8b0nyfh50"; + version = "0.0.1"; + sha256 = "1djn3fhxm639qarjjrax60p3kva54baj8sdcdlng02034kjzx6i6"; libraryHaskellDepends = [ array base cryptonite memory ]; description = "crypto tokens"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "crypto-totp" = callPackage @@ -65575,7 +65814,7 @@ self: { base bytestring cereal containers cryptohash tagged unix ]; description = "Provides generation and verification services for time-based one-time keys"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cryptocipher" = callPackage @@ -65591,8 +65830,8 @@ self: { cipher-rc4 crypto-cipher-types ]; description = "Symmetrical block and stream ciphers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -65611,8 +65850,8 @@ self: { ]; testHaskellDepends = [ base hspec hspec-expectations MissingH ]; description = "Haskell wrapper for the cryptocompare API"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -65636,8 +65875,8 @@ self: { tasty-hunit text transformers ]; description = "Interledger Crypto-Conditions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -65659,7 +65898,7 @@ self: { ]; benchmarkHaskellDepends = [ base byteable bytestring criterion ]; description = "collection of crypto hashes, fast, pure and practical"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cryptohash-conduit" = callPackage @@ -65675,7 +65914,7 @@ self: { transformers ]; description = "cryptohash conduit"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cryptohash-cryptoapi" = callPackage @@ -65691,7 +65930,7 @@ self: { base bytestring cereal crypto-api cryptonite memory tagged ]; description = "Crypto-api interfaces for cryptohash"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cryptohash-md5" = callPackage @@ -65711,7 +65950,7 @@ self: { ]; benchmarkHaskellDepends = [ base bytestring criterion ]; description = "Fast, pure and practical MD5 implementation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cryptohash-sha1" = callPackage @@ -65731,19 +65970,18 @@ self: { ]; benchmarkHaskellDepends = [ base bytestring criterion ]; description = "Fast, pure and practical SHA-1 implementation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cryptohash-sha256" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, criterion - , SHA, tasty, tasty-hunit, tasty-quickcheck + , cryptohash-sha256-pure, SHA, tasty, tasty-hunit, tasty-quickcheck }: mkDerivation { pname = "cryptohash-sha256"; - version = "0.11.101.0"; - sha256 = "1p85vajcgw9hmq8zsz9krzx0vxh7aggwbg5w9ws8w97avcsn8xaj"; - revision = "4"; - editedCabalFile = "00p6sx2n1pzykm3my68hjfk8l66g66rh7inrfcnkd5mhilqdcqxr"; + version = "0.11.102.0"; + sha256 = "0685s4hfighzywvvn05cfff5bl2xz3wq0pfncv6zca4iba3ykmla"; + configureFlags = [ "-fuse-cbits" ]; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring ]; @@ -65751,10 +65989,14 @@ self: { base base16-bytestring bytestring SHA tasty tasty-hunit tasty-quickcheck ]; - benchmarkHaskellDepends = [ base bytestring criterion ]; + benchmarkHaskellDepends = [ + base bytestring criterion cryptohash-sha256-pure SHA + ]; description = "Fast, pure and practical SHA-256 implementation"; - license = stdenv.lib.licenses.bsd3; - }) {}; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {cryptohash-sha256-pure = null;}; "cryptohash-sha512" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, criterion @@ -65764,8 +66006,8 @@ self: { pname = "cryptohash-sha512"; version = "0.11.100.1"; sha256 = "1abi23dr3vzslkh0cx24cdn2gy88jjm4qr6rcm543ajyaywqns8h"; - revision = "4"; - editedCabalFile = "0iqs51a58w71j1zz3rn9kical63yvvqqqrc6971mh6wfscyi1gqr"; + revision = "5"; + editedCabalFile = "0ccvr3sp7mnllbd430l91b5ij70gg3g05nm9n6qaxzx2vaqdlyc2"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base base16-bytestring bytestring SHA tasty tasty-hunit @@ -65773,7 +66015,7 @@ self: { ]; benchmarkHaskellDepends = [ base bytestring criterion ]; description = "Fast, pure and practical SHA-512 implementation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cryptoids" = callPackage @@ -65792,8 +66034,8 @@ self: { directory exceptions filepath memory ]; description = "Reversable and secure encoding of object ids as a bytestring"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -65807,8 +66049,8 @@ self: { editedCabalFile = "0c3cq648sh5cpj0isknhayamzgzv8avixxfpzr4riags70jr28ld"; libraryHaskellDepends = [ base cryptoids-types exceptions ]; description = "Typeclass-based interface to cryptoids"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -65826,8 +66068,8 @@ self: { aeson base binary deepseq hashable http-api-data path-pieces ]; description = "Shared types for encrypting internal object identifiers before exposure"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -65864,8 +66106,8 @@ self: { base criterion deepseq directory filepath sbv text ]; description = "Cryptol: The Language of Cryptography"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -65888,7 +66130,30 @@ self: { base bytestring deepseq gauge memory random ]; description = "Cryptography Primitives sink"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; + }) {}; + + "cryptonite_0_28" = callPackage + ({ mkDerivation, base, basement, bytestring, deepseq, gauge + , ghc-prim, integer-gmp, memory, random, tasty, tasty-hunit + , tasty-kat, tasty-quickcheck + }: + mkDerivation { + pname = "cryptonite"; + version = "0.28"; + sha256 = "1nx568qv25dxhbii7lzf1hbv0dyz95z715mmxjnnrkgpwdm8ibbl"; + libraryHaskellDepends = [ + base basement bytestring deepseq ghc-prim integer-gmp memory + ]; + testHaskellDepends = [ + base bytestring memory tasty tasty-hunit tasty-kat tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base bytestring deepseq gauge memory random + ]; + description = "Cryptography Primitives sink"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "cryptonite-conduit" = callPackage @@ -65911,7 +66176,7 @@ self: { tasty-hunit tasty-quickcheck ]; description = "cryptonite conduit"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cryptonite-openssl" = callPackage @@ -65931,7 +66196,7 @@ self: { tasty-quickcheck ]; description = "Crypto stuff using OpenSSL cryptographic library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) openssl;}; "cryptostore" = callPackage @@ -65952,7 +66217,7 @@ self: { tasty-hunit tasty-quickcheck x509 ]; description = "Serialization of cryptographic data types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cryptsy-api" = callPackage @@ -65973,8 +66238,8 @@ self: { unordered-containers vector ]; description = "Bindings for Cryptsy cryptocurrency exchange API"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.agpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -65986,8 +66251,8 @@ self: { sha256 = "14mh098kgckncips17bdsbg08q78xk1114174zq860z4znmc1gxv"; libraryHaskellDepends = [ base crc16-table MaybeT serialport ]; description = "Control Crystalfontz LCD displays"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -66015,8 +66280,8 @@ self: { sha256 = "123x10ircbj8lrsqapf6cb9b3ibjgp1q8l862a3i6i0ak7ash49f"; libraryHaskellDepends = [ base ghc ]; description = "Compiler plugin for common subexpression elimination"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -66048,8 +66313,8 @@ self: { base criterion simple-vec3 strict vector ]; description = "Analytical CSG (Constructive Solid Geometry) library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -66065,7 +66330,7 @@ self: { base csound-expression csound-sampler sharc-timbre transformers ]; description = "a gallery of Csound instruments"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "csound-controllers" = callPackage @@ -66076,7 +66341,7 @@ self: { sha256 = "1p2fa00djwyrv7fdrngawmk3r41q6a4mlsqgdm4qajmivbj0sg9m"; libraryHaskellDepends = [ base csound-expression ]; testHaskellDepends = [ base csound-expression ]; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "csound-expression" = callPackage @@ -66095,7 +66360,7 @@ self: { process temporal-media transformers ]; description = "library to make electronic music"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "csound-expression-dynamic" = callPackage @@ -66112,7 +66377,7 @@ self: { deriving-compat hashable transformers wl-pprint ]; description = "dynamic core for csound-expression library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "csound-expression-opcodes" = callPackage @@ -66127,7 +66392,7 @@ self: { base csound-expression-dynamic csound-expression-typed transformers ]; description = "opcodes for the library csound-expression"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "csound-expression-typed" = callPackage @@ -66147,7 +66412,7 @@ self: { NumInstances temporal-media transformers wl-pprint ]; description = "typed core for the library csound-expression"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "csound-sampler" = callPackage @@ -66158,7 +66423,7 @@ self: { sha256 = "0mi7w39adkn5l1h05arfap3c0ddb8j65wv96i3jrswpc3ljf3b2y"; libraryHaskellDepends = [ base csound-expression transformers ]; description = "A musical sampler based on Csound"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "csp" = callPackage @@ -66188,8 +66453,8 @@ self: { base directory filepath haskeline libcspm mtl ]; description = "A command line type checker for CSPM files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -66201,8 +66466,8 @@ self: { sha256 = "029r1a6w76v9nqf70w3p5yqjmmnba4xyi3ldx10wl526d247r9r9"; libraryHaskellDepends = [ base containers pretty ]; description = "AST and pretty printer for CSPm"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -66214,8 +66479,8 @@ self: { sha256 = "150gdsf059x658z6cbclrydzbynw06nhrpf4i1l9gwb6siarvjv9"; libraryHaskellDepends = [ base mtl text ]; description = "Minimal monadic CSS DSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -66232,8 +66497,8 @@ self: { shakespeare text ]; description = "Defining and manipulating css easing strings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -66256,8 +66521,8 @@ self: { base QuickCheck test-framework test-framework-quickcheck2 text ]; description = "Parsing, rendering and manipulating css selectors in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -66279,7 +66544,7 @@ self: { base criterion deepseq directory scientific text ]; description = "High-performance CSS tokenizer and serializer"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "css-text" = callPackage @@ -66291,7 +66556,7 @@ self: { libraryHaskellDepends = [ attoparsec base text ]; testHaskellDepends = [ attoparsec base hspec QuickCheck text ]; description = "CSS parser and renderer"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "csv" = callPackage @@ -66302,7 +66567,7 @@ self: { sha256 = "00767ai09wm7f0yzmpqck3cpgxncpr9djnmmz5l17ajz69139x4c"; libraryHaskellDepends = [ base filepath parsec ]; description = "CSV loader and dumper"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "csv-conduit" = callPackage @@ -66328,7 +66593,7 @@ self: { test-framework test-framework-hunit text transformers vector ]; description = "A flexible, fast, conduit-based CSV parser library for Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "csv-enumerator" = callPackage @@ -66345,8 +66610,8 @@ self: { directory enumerator safe transformers unix-compat ]; description = "A flexible, fast, enumerator-based CSV parser library for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -66365,7 +66630,7 @@ self: { ]; description = "A collection of CSV tools"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -66377,7 +66642,7 @@ self: { sha256 = "1p5waqb9sj3xjrc01isqbii282sxs865ciyy03f7kzi66as5j6g9"; libraryHaskellDepends = [ base containers csv filepath process ]; description = "Scripts for manipulating tables stored as CSV files"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "csv-to-qif" = callPackage @@ -66398,7 +66663,7 @@ self: { split spreadsheet ]; description = "A small program that will read csv files and create qif files"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ctemplate" = callPackage @@ -66410,8 +66675,8 @@ self: { libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ ctemplate ]; description = "Binding to the Google ctemplate library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {ctemplate = null;}; @@ -66423,8 +66688,8 @@ self: { sha256 = "0sqrg04zlwq62jggjvrd1dq7a2alwx2190w6b19d3jn51n0s907m"; libraryHaskellDepends = [ array base ]; description = "packaging of Manuel Chakravarty's CTK Light for Hackage"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -66441,8 +66706,8 @@ self: { libraryHaskellDepends = [ array base chatty-text chatty-utils ]; executableHaskellDepends = [ array base chatty-text chatty-utils ]; description = "A programming language for text modification"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -66466,7 +66731,7 @@ self: { random-shuffle stm transformers unordered-containers ]; description = "Non-blocking concurrent map"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "cube" = callPackage @@ -66483,8 +66748,8 @@ self: { base bytestring cereal containers hspec STL ]; description = "Cubic DSL for 3D printing"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -66503,7 +66768,7 @@ self: { ]; executableToolDepends = [ alex happy ]; description = "Implementation of Univalence in Cubical Sets"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "cubicbezier" = callPackage @@ -66521,7 +66786,7 @@ self: { ]; testHaskellDepends = [ base parsec tasty tasty-hunit ]; description = "Efficient manipulating of 2D cubic bezier curves"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cubicspline" = callPackage @@ -66532,7 +66797,7 @@ self: { sha256 = "0ycv395qskjw8xryzam6skc92m4iixf6065grvfh23avlsffsv2v"; libraryHaskellDepends = [ base hmatrix safe ]; description = "Natural cubic spline interpolation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cublas" = callPackage @@ -66549,8 +66814,8 @@ self: { ]; libraryToolDepends = [ c2hs ]; description = "FFI bindings to the CUDA BLAS library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "cuboid" = callPackage @@ -66563,8 +66828,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base GLUT Yampa ]; description = "3D Yampa/GLUT Puzzle Game"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -66587,8 +66852,8 @@ self: { ]; doHaddock = false; description = "Haskell Implementation of Cuckoo Filters"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -66615,7 +66880,7 @@ self: { tasty tasty-hunit tasty-quickcheck time ]; description = "Pure and impure Cuckoo Filter"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "cuda" = callPackage @@ -66635,8 +66900,8 @@ self: { libraryToolDepends = [ c2hs ]; executableHaskellDepends = [ base pretty ]; description = "FFI binding to the CUDA interface for programming NVIDIA GPUs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "cudd" = callPackage @@ -66649,7 +66914,7 @@ self: { librarySystemDepends = [ cudd ]; libraryToolDepends = [ c2hs ]; description = "Bindings to the CUDD binary decision diagrams library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) cudd;}; "cue-sheet" = callPackage @@ -66674,7 +66939,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Support for construction, rendering, and parsing of CUE sheets"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cufft" = callPackage @@ -66691,8 +66956,8 @@ self: { libraryHaskellDepends = [ base cuda ]; libraryToolDepends = [ c2hs ]; description = "Haskell bindings for the CUFFT library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "curl" = callPackage @@ -66706,7 +66971,7 @@ self: { libraryHaskellDepends = [ base bytestring containers ]; librarySystemDepends = [ curl ]; description = "Haskell binding to libcurl"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) curl;}; "curl-aeson" = callPackage @@ -66717,7 +66982,7 @@ self: { sha256 = "1fpi448f6bgf3rbw3zxf7r9nwyhv9q67zan5sixnad1y7lqxivrx"; libraryHaskellDepends = [ aeson base curl text utf8-string ]; description = "Communicate with HTTP service using JSON"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "curl-cookiejar" = callPackage @@ -66732,7 +66997,7 @@ self: { attoparsec base bytestring conduit conduit-extra http-client time ]; description = "Parsing and pretty-printing of cURL/wget cookie jars"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "curl-runnings" = callPackage @@ -66764,8 +67029,8 @@ self: { raw-strings-qq text ]; description = "A framework for declaratively writing curl based API tests"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -66781,7 +67046,7 @@ self: { testHaskellDepends = [ base hspec ]; description = "bindings to libcurl, the multiprotocol file transfer library"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "currencies" = callPackage @@ -66793,7 +67058,7 @@ self: { libraryHaskellDepends = [ base text ]; testHaskellDepends = [ base hspec text ]; description = "Currencies representation, pretty printing and conversion"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "currency" = callPackage @@ -66808,7 +67073,7 @@ self: { ]; description = "Types representing standard and non-standard currencies"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "currency-codes" = callPackage @@ -66824,8 +67089,8 @@ self: { ]; testHaskellDepends = [ aeson base bson hspec QuickCheck ]; description = "ISO-4217 Currency Codes"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -66841,8 +67106,8 @@ self: { aeson base http-conduit text unordered-containers ]; description = "Typesafe currency conversion"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -66854,7 +67119,7 @@ self: { sha256 = "18lg46fzpz207bd60hbcas6ippw0wnsc8n93pnz775ks5y7apyr5"; libraryHaskellDepends = [ base old-locale process split ]; description = "Get the current system locale in System.Locale format"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "curry" = callPackage @@ -66867,7 +67132,7 @@ self: { editedCabalFile = "15blz8y7jvxznm3j6sak4kcqq5c4apd4fkh60ixc36pbgc2q9kip"; libraryHaskellDepends = [ base ]; description = "Curry types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "curry-base" = callPackage @@ -66884,7 +67149,7 @@ self: { ]; testHaskellDepends = [ base Cabal filepath mtl ]; description = "Functions for manipulating Curry programs"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "curry-frontend" = callPackage @@ -66911,8 +67176,8 @@ self: { ]; testHaskellDepends = [ base Cabal curry-base filepath ]; description = "Compile the functional logic language Curry to several intermediate formats"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -66930,7 +67195,7 @@ self: { http-types mtl regex-pcre text transformers wai warp ]; description = "A simple HTTP server framework"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "curryer-rpc" = callPackage @@ -66960,8 +67225,8 @@ self: { async base bytestring criterion network winery ]; description = "Fast, Haskell RPC"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -66976,7 +67241,7 @@ self: { benchmarkHaskellDepends = [ base ]; description = "Easy to use FFI Bridge for using Rust in Haskell"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "cursedcsv" = callPackage @@ -66995,8 +67260,8 @@ self: { natural-sort parseargs primitive regex-tdfa safe unix vector ]; description = "Terminal tool for viewing tabular data"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -67013,7 +67278,7 @@ self: { validity-text ]; description = "Purely Functional Cursors"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "cursor-brick" = callPackage @@ -67023,7 +67288,7 @@ self: { version = "0.1.0.0"; sha256 = "018i8yrdcj69qf00vz1sx7is5cx1a7vn5b8kr9b226n7vxlr3nzd"; libraryHaskellDepends = [ base brick cursor text ]; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "cursor-fuzzy-time" = callPackage @@ -67038,7 +67303,7 @@ self: { base containers cursor deepseq fuzzy-time megaparsec microlens text time validity validity-time ]; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "cursor-fuzzy-time-gen" = callPackage @@ -67064,8 +67329,8 @@ self: { benchmarkHaskellDepends = [ base criterion cursor-fuzzy-time genvalidity-criterion QuickCheck ]; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -67091,7 +67356,7 @@ self: { base criterion cursor genvalidity-criterion ]; description = "Generators for Purely Functional Cursors"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "curve25519" = callPackage @@ -67109,7 +67374,7 @@ self: { test-framework test-framework-hunit test-framework-quickcheck2 ]; description = "Fast implementations of the curve25519 elliptic curve primitives"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "curves" = callPackage @@ -67125,8 +67390,8 @@ self: { base bytestring containers filepath HaXml JuicyPixels QuickCheck ]; description = "Library for drawing curve based images"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -67144,8 +67409,8 @@ self: { ]; libraryToolDepends = [ c2hs ]; description = "FFI bindings to CUDA Solver, a LAPACK-like library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "cusparse" = callPackage @@ -67160,8 +67425,8 @@ self: { libraryHaskellDepends = [ base cuda half storable-complex ]; libraryToolDepends = [ c2hs ]; description = "FFI bindings to the CUDA Sparse BLAS library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "custom-prelude" = callPackage @@ -67173,7 +67438,7 @@ self: { libraryHaskellDepends = [ base basic-prelude monad-loops ]; description = "An enhanced prelude, serving as a foundation for my projects"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -67211,7 +67476,7 @@ self: { testPkgconfigDepends = [ pocketsphinx sphinxbase ]; testToolDepends = [ c2hs ]; description = "Cuts out uninteresting parts of videos by detecting silences"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {inherit (pkgs) pocketsphinx; inherit (pkgs) sphinxbase;}; "cutter" = callPackage @@ -67228,7 +67493,7 @@ self: { base bytestring explicit-exception spreadsheet utility-ht ]; description = "Cut files according to a position list"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cv-combinators" = callPackage @@ -67247,8 +67512,8 @@ self: { allocated-processor base HOpenCV vector-space ]; description = "Functional Combinators for Computer Vision"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -67260,7 +67525,7 @@ self: { sha256 = "0ywwkwm3sfm8dx447512jm57pdy8sr29z6bvnd3q58h5prz3r2nm"; libraryHaskellDepends = [ aeson base text ]; description = "simple and efficient cve datatype"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "cyclotomic" = callPackage @@ -67278,7 +67543,7 @@ self: { test-framework-quickcheck2 test-framework-smallcheck ]; description = "A subfield of the complex numbers for exact calculation"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "cypher" = callPackage @@ -67297,8 +67562,8 @@ self: { transformers-base unordered-containers vector ]; description = "Haskell bindings for the neo4j \"cypher\" query language"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -67311,7 +67576,7 @@ self: { libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base transformers ]; description = "CZipWith class and deriving via TH"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "d-bus" = callPackage @@ -67341,8 +67606,8 @@ self: { tasty-quickcheck tasty-th text xml-hamlet ]; description = "Permissively licensed D-Bus client library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -67355,7 +67620,7 @@ self: { libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base doctest ]; description = "Digits 0-9"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "d3d11binding" = callPackage @@ -67374,8 +67639,8 @@ self: { ]; executableHaskellDepends = [ base c-storable-deriving vect Win32 ]; description = "A raw binding for the directX 11"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + platforms = [ "armv7l-linux" ]; }) {D3DCompiler = null; d3d11 = null; d3dx11 = null; d3dxof = null; dxgi = null; dxguid = null;}; @@ -67387,8 +67652,8 @@ self: { sha256 = "0wrxvfgss9fiv1pwsdi1md0plc4mf9sadkhgm46dsfq16dwrp3q2"; libraryHaskellDepends = [ base mtl random text ]; description = "Declarative visualization on a web browser with DSL approach"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -67401,7 +67666,7 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base directory unix ]; description = "Start background daemons by double-forking"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "daemons" = callPackage @@ -67429,7 +67694,7 @@ self: { test-framework-hunit unix ]; description = "Daemons in Haskell made fun and easy"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "dag" = callPackage @@ -67445,8 +67710,8 @@ self: { base hspec QuickCheck quickcheck-instances ]; description = "Compile-time, type-safe directed acyclic graphs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -67465,8 +67730,8 @@ self: { ]; testHaskellDepends = [ base bytestring hspec HUnit QuickCheck ]; description = "Parsing dAmn messages"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -67489,8 +67754,8 @@ self: { ]; executableHaskellDepends = [ base optparse-applicative ]; description = "Basic Slack bot framework"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -67521,8 +67786,8 @@ self: { utf8-string ]; description = "Dao is meta programming language with its own built-in interpreted language, designed with artificial intelligence applications in mind"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -67541,8 +67806,8 @@ self: { prednote rainbow text time transformers ]; description = "Prints a series of dates"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -67592,7 +67857,7 @@ self: { mv contrib/darcs_completion $out/share/bash-completion/completions/darcs ''; description = "a distributed, interactive, smart revision control system"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; }) {}; "darcs-benchmark" = callPackage @@ -67614,8 +67879,8 @@ self: { zlib ]; description = "Comparative benchmark suite for darcs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -67648,7 +67913,7 @@ self: { executableSystemDepends = [ curl ]; description = "a distributed, interactive, smart revision control system"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) curl;}; @@ -67668,7 +67933,7 @@ self: { ]; description = "Tools to help manage Debian packages with Darcs"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -67691,7 +67956,7 @@ self: { executableSystemDepends = [ curl ncurses zlib ]; description = "David's Advanced Version Control System"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) curl; inherit (pkgs) ncurses; inherit (pkgs) zlib;}; @@ -67712,8 +67977,8 @@ self: { directory filepath hashed-storage mtl old-time utf8-string ]; description = "Import/export git fast-import streams to/from darcs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -67732,8 +67997,8 @@ self: { time ]; description = "Generate graphs of darcs repository activity"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -67752,7 +68017,7 @@ self: { ]; description = "Darcs repository monitor (sends email)"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -67766,7 +68031,7 @@ self: { libraryHaskellDepends = [ base ]; doHaddock = false; description = "Shell scripts for support of darcs workflow"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "darcs2dot" = callPackage @@ -67783,8 +68048,8 @@ self: { base containers darcs graph-wrapper string-conversions ]; description = "Outputs dependencies of darcs patches in dot format"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -67813,7 +68078,7 @@ self: { ]; description = "Darcs repository UI and hosting/collaboration app (hub.darcs.net branch)."; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -67837,7 +68102,7 @@ self: { ]; description = "Track application of Darcs patches"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -67865,8 +68130,8 @@ self: { base binary bytestring criterion transformers ]; description = "Utility and parser for DarkPlaces demo files"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -67883,8 +68148,8 @@ self: { ]; testHaskellDepends = [ base bytestring hspec hspec-core ]; description = "Darkplaces rcon client library"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -67914,8 +68179,8 @@ self: { text ]; description = "Darplaces rcon utility"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -67933,8 +68198,8 @@ self: { libraryToolDepends = [ alex ]; testHaskellDepends = [ base bytestring hspec QuickCheck ]; description = "Parser for darkplaces colorful text"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -67955,8 +68220,8 @@ self: { text transformers ]; description = "Convert package Haddock to Dash docsets (IDE docs)"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -67968,7 +68233,7 @@ self: { sha256 = "0f1yvvzr24qgrx6k2g101s7vp012802iw6kli903n28nig93yn0x"; libraryHaskellDepends = [ array base containers transformers ]; description = "Utilities for accessing and manipulating fields of records"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-accessor-monadLib" = callPackage @@ -67980,7 +68245,7 @@ self: { libraryHaskellDepends = [ base data-accessor monadLib ]; description = "Accessor functions for monadLib's monads"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "data-accessor-monads-fd" = callPackage @@ -67993,8 +68258,8 @@ self: { base data-accessor monads-fd transformers ]; description = "Use Accessor to access state in monads-fd State monad class"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -68008,8 +68273,8 @@ self: { base data-accessor monads-tf transformers ]; description = "Use Accessor to access state in monads-tf State monad type family"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -68021,7 +68286,7 @@ self: { sha256 = "1i8lk0vy04giixng5addgj740cbvwlc7g62qgrmhfip0w9k93kqh"; libraryHaskellDepends = [ base data-accessor mtl ]; description = "Use Accessor to access state in mtl State monad class"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-accessor-template" = callPackage @@ -68037,7 +68302,7 @@ self: { base data-accessor template-haskell utility-ht ]; description = "Utilities for accessing and manipulating fields of records"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-accessor-transformers" = callPackage @@ -68048,7 +68313,7 @@ self: { sha256 = "0yp030vafbpddl27m606aibbbr5ar5j5bsv4bksscz3cq4yq5j10"; libraryHaskellDepends = [ base data-accessor transformers ]; description = "Use Accessor to access state in transformers State monad"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-as" = callPackage @@ -68059,7 +68324,7 @@ self: { sha256 = "1rqdffwyxrnvsrqchnknjdmdz7afzhplyalnrclrm5zm6gj0dlia"; libraryHaskellDepends = [ base profunctors ]; description = "Simple extensible sum"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "data-ascii" = callPackage @@ -68075,7 +68340,7 @@ self: { text ]; description = "Type-safe, bytestring-based ASCII values"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-aviary" = callPackage @@ -68086,8 +68351,8 @@ self: { sha256 = "03jhlb7w98bwx5xa23as9i6id0qxcl4f7k9rql2cgcy8nxf7c2xn"; libraryHaskellDepends = [ base ]; description = "Combinator birds"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -68099,8 +68364,8 @@ self: { sha256 = "1l95mrl6333hp46vsv54fglg4gwz8p14z3rysx6115blc81yx18x"; libraryHaskellDepends = [ base ]; description = "Utilities for accessing and comparing types based on so called bases - representations with limited polymorphism"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -68124,8 +68389,8 @@ self: { aeson base lens postgresql-simple string-conv time ]; description = "A database library with a focus on ease of use, type safety and useful error messages"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -68137,7 +68402,7 @@ self: { sha256 = "02nzg1barhqhpf4x26mpzvk7jd29nali033qy01adjplv2z5m5sr"; libraryHaskellDepends = [ base binary ]; description = "Parser/Serialiser for IEEE-754 floating-point values"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "data-bword" = callPackage @@ -68149,7 +68414,7 @@ self: { libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base tasty tasty-quickcheck ]; description = "Extra operations on binary words of fixed length"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-carousel" = callPackage @@ -68162,7 +68427,7 @@ self: { editedCabalFile = "1sk3qvn9pb1l170qqrxwv9mxj80p5276zzwl0rfn5403mpa1gajn"; libraryHaskellDepends = [ base containers lens ]; description = "A rotating sequence data structure"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "data-category" = callPackage @@ -68172,7 +68437,7 @@ self: { version = "0.10"; sha256 = "1mb72r17982w2sslmvi5nzpf7i702iikc7j4h68gzlfnm426jk9q"; description = "Category theory"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-cell" = callPackage @@ -68183,7 +68448,7 @@ self: { sha256 = "03liak61gr90i48rd4dlm5lhr8z9v02nn6kdy33sinbpm6313agr"; libraryHaskellDepends = [ base ]; description = "Generic cellular data representation library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-check" = callPackage @@ -68195,8 +68460,8 @@ self: { libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "Library for checking and normalization of data (e.g. from web forms)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -68208,7 +68473,7 @@ self: { sha256 = "0xjn7iqlsgi51h8gz4x40kc2qb5lwf6nw5kjwgkck1w5gjfd11yw"; libraryHaskellDepends = [ base deepseq ]; description = "Type-indexed runtime-checked properties"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-clist" = callPackage @@ -68221,7 +68486,7 @@ self: { editedCabalFile = "13hg7a3d4ky8b765dl03ryxg28lq8iaqj5ky3j51r0i1i4f2a9hy"; libraryHaskellDepends = [ base deepseq QuickCheck ]; description = "Simple functional ring type"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-combinator-gen" = callPackage @@ -68232,8 +68497,8 @@ self: { sha256 = "0f1qw5rk9x3yd7nfhkwmpig7a6dc46yzl78fi8aaxpwqbsazpkjy"; libraryHaskellDepends = [ base template-haskell ]; description = "Generate a special combinator from any data type"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -68245,7 +68510,7 @@ self: { sha256 = "15bifxba0yddpq5yz23hq9k2s7vkzcrwjpwvbw0kkjf3wjjay5bp"; libraryHaskellDepends = [ base constraints ]; description = "Define Backwards Compatibility Schemes for Arbitrary Data"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "data-concurrent-queue" = callPackage @@ -68256,8 +68521,8 @@ self: { sha256 = "0rmn4pq5pgvam78vxp4y7431jai8dklml322r4nw47jjc1m20kmv"; libraryHaskellDepends = [ base stm ]; description = "A Library for directional queues"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -68269,8 +68534,8 @@ self: { sha256 = "0hdkj8fpa0mmi57ljl744kkh6hk99d4x8dbm2djprw7rvrj5irg8"; libraryHaskellDepends = [ base ]; description = "Data construction abstractions including Constructor, Destructor, Maker, Destroyer, Producer and Consumer"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -68286,7 +68551,7 @@ self: { testHaskellDepends = [ base QuickCheck ]; benchmarkHaskellDepends = [ base criterion deepseq QuickCheck ]; description = "Generically compare data by their constructors"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-cycle" = callPackage @@ -68300,8 +68565,8 @@ self: { base collections-api collections-base-instances ]; description = "a cyclic doubly linked list"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -68319,7 +68584,7 @@ self: { data-default-instances-dlist data-default-instances-old-locale ]; description = "A class for types with a default value"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-default-class" = callPackage @@ -68330,7 +68595,7 @@ self: { sha256 = "0miyjz8d4jyvqf2vp60lyfbnflx6cj2k8apmm9ly1hq0y0iv80ag"; libraryHaskellDepends = [ base ]; description = "A class for types with a default value"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-default-extra" = callPackage @@ -68356,7 +68621,7 @@ self: { data-default-instances-vector ]; description = "A class for types with a default value"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-default-generics" = callPackage @@ -68377,7 +68642,7 @@ self: { text time unordered-containers vector ]; description = "A class for types with a default value"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-default-instances-base" = callPackage @@ -68388,7 +68653,7 @@ self: { sha256 = "0ym1sw3ssdzzifxxhh76qlv8kkmb2iclc158incv1dklyr9y8kw4"; libraryHaskellDepends = [ base data-default-class ]; description = "Default instances for types in base"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-default-instances-bytestring" = callPackage @@ -68401,7 +68666,7 @@ self: { editedCabalFile = "0gpdba4y17rp0kp9pd2qj6r4pnrc86vx47fkk3zfkggmv73pa82r"; libraryHaskellDepends = [ base bytestring data-default-class ]; description = "Default instances for (lazy and strict) ByteString, Builder and ShortByteString"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-default-instances-case-insensitive" = callPackage @@ -68414,7 +68679,7 @@ self: { editedCabalFile = "0w8k7zjxwbj1y2acxadg956pfpf7y70jc23wgjivqvafbv69ra25"; libraryHaskellDepends = [ case-insensitive data-default-class ]; description = "Default instance for CI type from case-insensitive package"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-default-instances-containers" = callPackage @@ -68425,7 +68690,7 @@ self: { sha256 = "06h8xka031w752a7cjlzghvr8adqbl95xj9z5zc1b62w02phfpm5"; libraryHaskellDepends = [ base containers data-default-class ]; description = "Default instances for types in containers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-default-instances-dlist" = callPackage @@ -68436,7 +68701,7 @@ self: { sha256 = "0narkdqiprhgayjiawrr4390h4rq4pl2pb6mvixbv2phrc8kfs3x"; libraryHaskellDepends = [ base data-default-class dlist ]; description = "Default instances for types in dlist"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-default-instances-new-base" = callPackage @@ -68447,7 +68712,7 @@ self: { sha256 = "0hzi7szmjf2df3v4aaid6pk6i4ma25k78v5mcxkhd6w52ifg67c3"; libraryHaskellDepends = [ base data-default-class ]; description = "Default instances for types in newer versions of base package"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-default-instances-old-locale" = callPackage @@ -68458,7 +68723,7 @@ self: { sha256 = "00h81i5phib741yj517p8mbnc48myvfj8axzsw44k34m48lv1lv0"; libraryHaskellDepends = [ base data-default-class old-locale ]; description = "Default instances for types in old-locale"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-default-instances-text" = callPackage @@ -68471,7 +68736,7 @@ self: { editedCabalFile = "01125vbzwq35rkppm96x8fnwjyfid7x6ay6wq8n0qhr0skhcp2js"; libraryHaskellDepends = [ base data-default-class text ]; description = "Default instances for (lazy and strict) Text and Text Builder"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-default-instances-unordered-containers" = callPackage @@ -68486,7 +68751,7 @@ self: { data-default-class unordered-containers ]; description = "Default instances for unordered-containers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-default-instances-vector" = callPackage @@ -68499,7 +68764,7 @@ self: { editedCabalFile = "0piq9b9ywzyk12glndy9w6dka6d5zrc1mywq5j032li3j6sbwy4a"; libraryHaskellDepends = [ data-default-class vector ]; description = "Default instances for types defined in vector package"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-dispersal" = callPackage @@ -68520,8 +68785,8 @@ self: { test-framework-quickcheck2 vector ]; description = "Space-efficient and privacy-preserving data dispersal algorithms"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -68539,7 +68804,7 @@ self: { testHaskellDepends = [ base hspec tagged ]; benchmarkHaskellDepends = [ base criterion ]; description = "Extensible records and polymorphic variants"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-diverse-lens" = callPackage @@ -68555,8 +68820,8 @@ self: { ]; testHaskellDepends = [ base data-diverse hspec lens tagged ]; description = "Isos & Lens for Data.Diverse.Many and Prisms for Data.Diverse.Which"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -68573,7 +68838,7 @@ self: { ]; testHaskellDepends = [ base tasty tasty-quickcheck ]; description = "Stick two binary words together to get a bigger one"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-easy" = callPackage @@ -68591,8 +68856,8 @@ self: { QuickCheck safe text transformers unix ]; description = "Consistent set of utility functions for Maybe, Either, List and Monoids"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -68606,8 +68871,8 @@ self: { base data-flags data-serializer data-sword ]; description = "Executable and Linkable Format (ELF) data structures"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -68632,8 +68897,8 @@ self: { hashable utf8-string ]; description = "Embed files and other binary blobs inside executables without Template Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -68645,8 +68910,8 @@ self: { sha256 = "0brfvlx7hihgnlc87r3n17dncbydfwxs49dc8kgppxycqqss6vh1"; libraryHaskellDepends = [ base ]; description = "Combinator emoticons: data-aviary in the flavor of emoticons"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -68658,7 +68923,7 @@ self: { sha256 = "1h1abz87nha7cpw50yvf8fwvcca350wnnz2d3z9k30sg6wq4y7cc"; libraryHaskellDepends = [ base ]; description = "Endian-sensitive data"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-extend-generic" = callPackage @@ -68672,7 +68937,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "Extend Haskell data or newtype like in OOP languages"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-extra" = callPackage @@ -68683,7 +68948,7 @@ self: { sha256 = "0py4a3mzqga25y6y1sirvc9369n3b7y5kpm5f9m613yjlypv6pc1"; doHaddock = false; description = "None"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-filepath" = callPackage @@ -68698,8 +68963,8 @@ self: { base bifunctors ghc-prim semigroups split template-haskell ]; description = "A type safe file path data structure"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -68719,7 +68984,7 @@ self: { executableHaskellDepends = [ base containers data-default ]; testHaskellDepends = [ base containers data-default hspec ]; description = "Generate data-files Cabal file field from existing files"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-filter" = callPackage @@ -68730,7 +68995,7 @@ self: { sha256 = "1yz22b42rqsf4i9p4lnl06l8id3f1a84dng96q2nk1mmih9v3pbm"; libraryHaskellDepends = [ base data-default ]; description = "Utilities for filtering"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }) {}; "data-fin" = callPackage @@ -68746,8 +69011,8 @@ self: { smallcheck tagged ]; description = "Finite totally ordered sets"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -68760,8 +69025,8 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; description = "Simple integral finite set"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -68773,7 +69038,7 @@ self: { sha256 = "184rz8ypgrb3sxy9wiaq321d82p689w7dcwkc0qkjlabd7nv6ncy"; libraryHaskellDepends = [ base deepseq hashable ]; description = "Fixpoint data types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-fix-cse" = callPackage @@ -68784,7 +69049,7 @@ self: { sha256 = "1v8ffi5c0sz8q2fla6fab4css3pkjmi0knx5d04mvffhw66bjhbz"; libraryHaskellDepends = [ base containers data-fix transformers ]; description = "Common subexpression elimination for the fixploint types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-flags" = callPackage @@ -68795,7 +69060,7 @@ self: { sha256 = "183h2dzqrp9wl4sg59sijlhqw5pgi10xgw7cx8vz1s86rkia3hj8"; libraryHaskellDepends = [ base template-haskell ]; description = "A package for working with bit masks and flags in general"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-flagset" = callPackage @@ -68806,8 +69071,8 @@ self: { sha256 = "0ygvzrcb2vskjf203svk9wpv8lw4447rd218zvys4a0787ss1aw2"; libraryHaskellDepends = [ base ]; description = "An efficient data type for sets of flags"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -68819,7 +69084,7 @@ self: { sha256 = "1415cf59wkf1599qcqmrpn9m4v9br3d763v1809mwg9bm2310x65"; libraryHaskellDepends = [ base containers ]; description = "Fold function applications. Framework for variadic functions."; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-forest" = callPackage @@ -68831,7 +69096,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; description = "A simple multi-way tree data structure"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "data-fresh" = callPackage @@ -68842,7 +69107,7 @@ self: { sha256 = "1hz30myv78mw4sf19k1yg4qikrnxsa5ng0ff4naxyz1zyi2m87f1"; libraryHaskellDepends = [ base free transformers ]; description = "Interface and functor transformers for fresh values"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-function-meld" = callPackage @@ -68853,7 +69118,7 @@ self: { sha256 = "0gnnd23cwhg8l46a4y3brb059mhh9a05l8qbwpf6avl5cj5jkgwd"; libraryHaskellDepends = [ base ]; description = "Map the arguments and return value of functions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-function-tacit" = callPackage @@ -68864,7 +69129,7 @@ self: { sha256 = "0fxmacmcnzvzspscliqbx31rmvif7ymc1knjijmx9pb92yaibcla"; libraryHaskellDepends = [ base ]; description = "Write functions in tacit (pointless) style using Applicative and De Bruijn index notation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-has" = callPackage @@ -68876,7 +69141,7 @@ self: { libraryHaskellDepends = [ base ]; benchmarkHaskellDepends = [ base criterion transformers ]; description = "Simple extensible product"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-hash" = callPackage @@ -68892,7 +69157,7 @@ self: { base QuickCheck test-framework test-framework-quickcheck2 ]; description = "Combinators for building fast hashing functions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-index" = callPackage @@ -68904,7 +69169,7 @@ self: { libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base doctest ]; description = "Extending the concept of indices for lists and other containers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-interval" = callPackage @@ -68924,8 +69189,8 @@ self: { QuickCheck syb tasty tasty-hunit tasty-quickcheck tasty-th ]; description = "Interval datatype, interval arithmetic and interval-based containers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -68937,7 +69202,7 @@ self: { sha256 = "0m5xww8zvsa0whxl89wndpbdz9p5n03q3h3a904nqrxh966psfkb"; libraryHaskellDepends = [ base ]; description = "A simple lazy, infinite trie from integers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-ivar" = callPackage @@ -68948,8 +69213,8 @@ self: { sha256 = "1vnbmvihkrcknys33sam9zlb5qk5qqkxz6w3wamsbdmpp0q6zfb2"; libraryHaskellDepends = [ base containers ]; description = "Write-once variables with concurrency support"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -68965,7 +69230,7 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Json Token datatype"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-kiln" = callPackage @@ -68980,8 +69245,8 @@ self: { base containers data-fix IfElse mtl transformers ]; description = "Sculpt mutable recursive data with reference equality; bake it using a data kiln into an immutable lazy structure"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -68993,8 +69258,8 @@ self: { sha256 = "0vck7a3vgdqml2pg3ilkw41d52pmx452sgh2h2q4qzysq26vw49w"; libraryHaskellDepends = [ base convert data-construction lens ]; description = "Data layering utilities. Layer is a data-type which wrapps other one, but keeping additional information. If you want to access content of simple newtype object, use Lens.Wrapper instead."; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -69006,7 +69271,7 @@ self: { sha256 = "1w8r4vw731dmam8vcidz9a4wb2swqd5djsf9vkkxihxnphh0a1x5"; libraryHaskellDepends = [ base bytestring vector ]; description = "Read/write arbitrary binary layouts to a \"Data.Vector.Storable\"."; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-lens" = callPackage @@ -69021,8 +69286,8 @@ self: { base comonad containers semigroupoids transformers ]; description = "Used to be Haskell 98 Lenses"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -69036,8 +69301,8 @@ self: { base comonad data-lens mtl transformers ]; description = "Lenses"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -69050,8 +69315,8 @@ self: { libraryHaskellDepends = [ base data-lens ixset ]; testHaskellDepends = [ QuickCheck ]; description = "A Lens for IxSet"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -69063,7 +69328,7 @@ self: { sha256 = "0vmkvhl7zcsaxnx7d7b59cnrdnlnr9cfn910rpn34jny7fkydlvj"; libraryHaskellDepends = [ base mtl template-haskell ]; description = "Simple lenses, minimum dependencies"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "data-lens-template" = callPackage @@ -69074,8 +69339,8 @@ self: { sha256 = "1w1a32298naha7sv8d0v018l8z1bmwpwnb3jg09a3n65ci9hy2zm"; libraryHaskellDepends = [ base data-lens template-haskell ]; description = "Utilities for Data.Lens"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -69087,7 +69352,7 @@ self: { sha256 = "0r3y66lxgk0sdg500xnz0fvg4dvzvx47imnw0qkici22b9d92kv8"; libraryHaskellDepends = [ base ]; description = "Utilities for working with sequences within lists"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "data-list-zigzag" = callPackage @@ -69098,7 +69363,7 @@ self: { sha256 = "1gfgdn4v9gs2chmrxn1xh66qa8ivn8w4nb5vv1jg9y3isnvjax6q"; libraryHaskellDepends = [ base ]; description = "A list but with a balanced enumeration of Cartesian product"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-map-multikey" = callPackage @@ -69109,8 +69374,8 @@ self: { sha256 = "04h4k2zn6w8rahzyr80hwf8mvsmzgbqh7aw2138sva874bsk9mkf"; libraryHaskellDepends = [ base containers ]; description = "Data.Map with multiple, unique keys"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -69122,7 +69387,7 @@ self: { sha256 = "1mvfc1xri3kgkx5q7za01bqg1x3bfvbgcffw5vwl6jmq4hh1sd5l"; libraryHaskellDepends = [ array base data-inttrie ]; description = "Combinators for building memo tables"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-msgpack" = callPackage @@ -69148,7 +69413,7 @@ self: { base bytestring criterion deepseq QuickCheck ]; description = "A Haskell implementation of MessagePack"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-msgpack-types" = callPackage @@ -69165,7 +69430,7 @@ self: { ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "A Haskell implementation of MessagePack"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-named" = callPackage @@ -69176,7 +69441,7 @@ self: { sha256 = "03f4xc4ayql17s48ajza2ny79j885mcmp0x3mrwcfdc42dlnd7nb"; libraryHaskellDepends = [ attoparsec base binary containers text ]; description = "Data types for named entities"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-nat" = callPackage @@ -69187,8 +69452,8 @@ self: { sha256 = "1yzxkch0xzy76iyad0yshfnpvz38xklqdlyj8lgqnqsllw0vwh0m"; libraryHaskellDepends = [ base semigroups ]; description = "data Nat = Zero | Succ Nat"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -69200,8 +69465,8 @@ self: { sha256 = "0z8m23kw8mj6hhy1r8y1vvlxxpwl273dhanszig2673a1sw0l98l"; libraryHaskellDepends = [ base bytestring failure text time ]; description = "Represent hierachichal structures, called objects in JSON. (deprecated)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -69218,8 +69483,8 @@ self: { failure JSONb text ]; description = "Serialize JSON data to/from Haskell using the data-object library. (deprecated)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -69238,8 +69503,8 @@ self: { failure text transformers yaml ]; description = "Serialize data to and from Yaml files (deprecated)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -69251,7 +69516,7 @@ self: { sha256 = "0wp6qqq6k1zbdw9bv9gkzdiz6y8wp8r7zsqbjh54c43j3i7vdvwx"; libraryHaskellDepends = [ base ]; description = "A data type for non-exclusive disjunction"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-ordlist" = callPackage @@ -69262,7 +69527,7 @@ self: { sha256 = "03a9ix1fcx08viwv2jg5ndw1qbkydyyrmjvqr9wasmcik9x1wv3g"; libraryHaskellDepends = [ base ]; description = "Set and bag operations on ordered lists"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-partition" = callPackage @@ -69273,7 +69538,7 @@ self: { sha256 = "05i8fg9q7fpc9jalhwbqpw6pfki2flqj4nqwgs3yfi0hvasvgjjb"; libraryHaskellDepends = [ base containers ]; description = "A pure disjoint set (union find) data structure"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-pprint" = callPackage @@ -69286,8 +69551,8 @@ self: { editedCabalFile = "0gk2x4z7m0816gq6p22y5y8r1iydi4154xbn474i9nsbk56kp2by"; libraryHaskellDepends = [ base deepseq mtl parallel pretty time ]; description = "Prettyprint and compare Data values"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -69299,8 +69564,8 @@ self: { sha256 = "0ylimakhw37klz2axg8qrdhwag34mfa1byb2z2mz2i8z0w4737j8"; libraryHaskellDepends = [ base ]; description = "Reference cells that need two independent indices to be accessed"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -69319,8 +69584,8 @@ self: { test-framework test-framework-hunit test-framework-quickcheck2 ]; description = "R-Tree is a spatial data structure similar to Quadtrees or B-Trees"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -69332,7 +69597,7 @@ self: { sha256 = "0xqgzcpp9b0y2w5h1nln529dizdplhpfl41vxvbhxxcdkng3j53v"; libraryHaskellDepends = [ base data-accessor stm transformers ]; description = "Unify STRef and IORef in plain Haskell 98"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-reify" = callPackage @@ -69351,7 +69616,7 @@ self: { testHaskellDepends = [ base base-compat hspec ]; testToolDepends = [ hspec-discover ]; description = "Reify a recursive data structure into an explicit graph"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-reify-cse" = callPackage @@ -69362,8 +69627,8 @@ self: { sha256 = "0vjfpbp0maqwirvi8j21z9qbs396l76dk5npn8zxac56j0i6l62r"; libraryHaskellDepends = [ base containers data-reify ]; description = "Common Sub-Expression Elimination for graphs generated by Data.Reify."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -69375,8 +69640,8 @@ self: { sha256 = "14k4agv5z8vlvb21vmfz9x1dcz6cgph6ix6qrac9mfyylywdffa9"; libraryHaskellDepends = [ base generic-deriving lens ]; description = "Alternative to Show data printing utility"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -69388,8 +69653,8 @@ self: { sha256 = "0186py0zj9k987vxbsaxbckc7ik64rx87kq3mzkjzvam9qcc0rmj"; libraryHaskellDepends = [ base poly-control prologue ]; description = "Data types for returning results distinguishable by types"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -69401,8 +69666,8 @@ self: { sha256 = "13bqp3vvsc6i6lcvw480i08fz2rm3f8varwyhvrp44dzv2q8zkl1"; libraryHaskellDepends = [ base bytestring containers text vector ]; description = "A typeclass for reversing order of contents"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -69415,7 +69680,7 @@ self: { libraryHaskellDepends = [ base bytestring bytestring-mmap unix ]; description = "Ropes, an alternative to (Byte)Strings"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -69427,8 +69692,8 @@ self: { sha256 = "01gv16yz5y3wyc370a2snihz95wdnl7sk1jz9k7aypixsaw28a2f"; libraryHaskellDepends = [ base lens typelevel ]; description = "Recursive tuple data structure. It is very usefull when implementing some lo-level operations, allowing to traverse different elements using Haskell's type classes."; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -69447,7 +69712,7 @@ self: { base binary bytestring cereal tasty tasty-quickcheck ]; description = "Common API for serialization libraries"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-size" = callPackage @@ -69460,8 +69725,8 @@ self: { base bytestring containers deepseq text ]; description = "Profiling of data structures"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -69473,8 +69738,8 @@ self: { sha256 = "0h6z4yibjbnzck2fvh9mnppz9j0lzgx8nzmzm08q5yzmzjydy3rk"; libraryHaskellDepends = [ base vector-space ]; description = "Deprecated. Now called \"spacepart\". Space partitioning data structures."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -69486,8 +69751,8 @@ self: { sha256 = "1xllcy2yn26shmcibnjczi7nm3mp9rqa6685iqc8a8vcic7mqcj9"; libraryHaskellDepends = [ base hashable unordered-containers ]; description = "A collection of standards representable by simple data types"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -69514,8 +69779,8 @@ self: { pretty-simple text time ]; description = "ARM SVD and CubeMX XML parser and pretty printer for STM32 family"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ sorki ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ sorki ]; }) {}; "data-store" = callPackage @@ -69541,8 +69806,8 @@ self: { vector ]; description = "Type safe, in-memory dictionary with multidimensional keys"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -69561,8 +69826,8 @@ self: { test-framework test-framework-hunit test-framework-quickcheck2 ]; description = "An efficient implementation of maps from strings to arbitrary values"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -69583,8 +69848,8 @@ self: { ]; executableToolDepends = [ alex happy ]; description = "Program that infers the fastest data structure available for your program"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -69601,8 +69866,8 @@ self: { ]; testHaskellDepends = [ base tasty tasty-quickcheck ]; description = "Shorter binary words"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -69614,7 +69879,7 @@ self: { sha256 = "0j6jsgj3lhx6ps3xs90vbgyvzmlr3sfl33r6rz34rvb29gs171n8"; libraryHaskellDepends = [ base ]; description = "Tensor and Group typeclasses"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "data-textual" = callPackage @@ -69634,7 +69899,7 @@ self: { text-printer type-hint ]; description = "Human-friendly textual representations"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-timeout" = callPackage @@ -69649,7 +69914,7 @@ self: { base data-textual parsers stm tagged text-printer transformers-base ]; description = "64-bit timeouts of nanosecond precision"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-transform" = callPackage @@ -69660,7 +69925,7 @@ self: { sha256 = "0l0pbr0fg7i09lv05bhv0gl80x2mxxyvxa0n5jdknh5xfphqga96"; libraryHaskellDepends = [ base containers mtl ]; description = "Functions to transform data structures"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-tree-print" = callPackage @@ -69673,7 +69938,7 @@ self: { editedCabalFile = "00qpzhm3lndhpql8aj93aj6r3x9n0gw3nx6n0q60xxrd6agyjifq"; libraryHaskellDepends = [ base pretty syb ]; description = "Print Data instances as a nested tree"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-treify" = callPackage @@ -69684,7 +69949,7 @@ self: { sha256 = "03xchr2h0f54rlcq285xaq5bakjq13mbjwz3xi3kfa6i71rr2rk9"; libraryHaskellDepends = [ base containers ty ]; description = "Reify a recursive data structure into an explicit graph"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "data-type" = callPackage @@ -69695,8 +69960,8 @@ self: { sha256 = "1x3wsnilp9sxy061sfmyyg0f6b0k2lxvi0g4qf2gkldrz32c4qvj"; libraryHaskellDepends = [ base ]; description = "Basic type wrangling types and classes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -69708,8 +69973,8 @@ self: { sha256 = "0zhpr40sf1vqa4k7f4j5crjkd701xls86whxrhdq8v8h08ssxvxj"; libraryHaskellDepends = [ base ]; description = "utilities for handle data"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -69726,8 +69991,8 @@ self: { base containers hspec regex-tdfa template-haskell ]; description = "A library for creating type safe validations"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -69739,8 +70004,8 @@ self: { sha256 = "11ia37q28xz8a87xkc8yyvqqd3qzfvcbdnp2caxdbzvdnjbazhmk"; libraryHaskellDepends = [ base safe ]; description = "A variant data type, useful for modeling dynamically-typed programming languages"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -69757,7 +70022,7 @@ self: { ]; testHaskellDepends = [ async base vector ]; description = "Dynamic growable resizable mutable generic vector"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "database-id-class" = callPackage @@ -69768,8 +70033,8 @@ self: { sha256 = "0zm053ll1vwd5gdwq4p3zpl9f010q894nk3djaad3ry4y2mirsc4"; libraryHaskellDepends = [ aeson base ]; description = "Class for types with a database id"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -69785,8 +70050,8 @@ self: { aeson base database-id-class groundhog template-haskell ]; description = "HasId/Groundhog interop"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -69804,7 +70069,7 @@ self: { postgresql-simple text time transformers ]; description = "Database versioning and migration (experimental)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "database-study" = callPackage @@ -69815,8 +70080,8 @@ self: { sha256 = "1aqp7a46p758f1q99cn700mgc1dic896gpsih3vj2fmffqj42gd7"; libraryHaskellDepends = [ base containers ]; description = "Demonstrate how a database can be implemented the functional way"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -69844,8 +70109,8 @@ self: { transformers-base unliftio unordered-containers vector ]; description = "Datadog client for Haskell. Supports both the HTTP API and StatsD."; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -69881,8 +70146,8 @@ self: { ]; testToolDepends = [ tasty-discover ]; description = "Datadog tracing client and mock agent"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -69896,7 +70161,7 @@ self: { isExecutable = true; libraryHaskellDepends = [ array base containers ]; description = "Data encoding library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "datafix" = callPackage @@ -69928,8 +70193,8 @@ self: { filepath ghc ghc-paths lattices primitive text transformers turtle ]; description = "Fixing data-flow problems"; - license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -69953,8 +70218,8 @@ self: { aeson base bytestring containers hspec HUnit parsec vector ]; description = "Generate Graphviz documents from a Haskell representation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -69972,7 +70237,7 @@ self: { testHaskellDepends = [ base hspec QuickCheck stm ]; benchmarkHaskellDepends = [ base criterion stm ]; description = "A Pure-Haskell Timely Dataflow System"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "datalog" = callPackage @@ -69999,8 +70264,8 @@ self: { text ]; description = "An implementation of datalog in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -70019,7 +70284,7 @@ self: { ]; description = "Tool to help pack files into the minimum number of CDs/DVDs/etc"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -70041,7 +70306,7 @@ self: { scientific string-conversions text unordered-containers vector wreq ]; description = "Client for DataRobot API"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "datasets" = callPackage @@ -70071,8 +70336,8 @@ self: { req safe-exceptions streaming ]; description = "Classical data sets for statistics and machine learning"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -70091,8 +70356,8 @@ self: { attoparsec base base64-bytestring bytestring HTF text ]; description = "Handle data-urls"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -70104,7 +70369,7 @@ self: { sha256 = "0grhcbd0rhdn0cf1fz82x8pv8cmxfhndlcwyrax4mnnr3pql9kmb"; libraryHaskellDepends = [ base bytestring ]; description = "Date cacher"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "date-conversions" = callPackage @@ -70116,8 +70381,8 @@ self: { libraryHaskellDepends = [ base dates time ]; testHaskellDepends = [ base dates hspec QuickCheck time ]; description = "Date conversions"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -70134,8 +70399,8 @@ self: { ]; testHaskellDepends = [ base hspec ]; description = "Small library for parsing different dates formats"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -70155,7 +70420,7 @@ self: { ]; description = "Utilities to make Data.Time.* easier to use"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -70175,7 +70440,7 @@ self: { ]; description = "Utilities to make Data.Time.* easier to use."; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -70190,8 +70455,8 @@ self: { libraryHaskellDepends = [ base parsec pretty text time ]; executableHaskellDepends = [ base filepath parsec pretty text ]; description = "Generates DDL suggestions based on a CSV file"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -70207,8 +70472,8 @@ self: { base binary containers mtl transformers vector vector-binary ]; description = "Directed acyclic word graphs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -70229,7 +70494,7 @@ self: { tasty-quickcheck tasty-smallcheck ]; description = "Directed acyclic word graphs"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "dbcleaner" = callPackage @@ -70241,8 +70506,8 @@ self: { libraryHaskellDepends = [ base postgresql-simple text ]; testHaskellDepends = [ base hspec postgresql-simple text ]; description = "Clean database tables automatically around hspec tests"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -70256,8 +70521,8 @@ self: { base binary bytestring monad-loops rwlock ]; description = "Read and write XBase \".dbf\" files"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -70278,8 +70543,8 @@ self: { base binary bytestring haskell98 process uulib ]; description = "Decompiler Bytecode Java"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -70298,8 +70563,8 @@ self: { text time ]; description = "A *simple* database migration tool"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -70326,7 +70591,7 @@ self: { yaml-light ]; description = "An implementation of relational database \"migrations\""; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "dbmigrations-mysql" = callPackage @@ -70347,8 +70612,8 @@ self: { base dbmigrations HUnit mysql mysql-simple process ]; description = "The dbmigrations tool built for MySQL databases"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -70367,8 +70632,8 @@ self: { base dbmigrations HDBC HDBC-postgresql HUnit process ]; description = "The dbmigrations tool built for PostgreSQL databases"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -70383,8 +70648,8 @@ self: { executableHaskellDepends = [ base dbmigrations HDBC-sqlite3 ]; testHaskellDepends = [ base dbmigrations HDBC HDBC-sqlite3 HUnit ]; description = "The dbmigrations tool built for SQLite databases"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -70412,7 +70677,35 @@ self: { benchmarkHaskellDepends = [ base criterion ]; doCheck = false; description = "A client library for the D-Bus IPC system"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; + }) {}; + + "dbus_1_2_18" = callPackage + ({ mkDerivation, base, bytestring, cereal, conduit, containers + , criterion, deepseq, directory, exceptions, extra, filepath, lens + , network, parsec, process, QuickCheck, random, resourcet, split + , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text + , th-lift, transformers, unix, vector, xml-conduit, xml-types + }: + mkDerivation { + pname = "dbus"; + version = "1.2.18"; + sha256 = "15ggmggzgzf0xmj80rj14dyk83vra6yzm5pm92psnc4spn213p73"; + libraryHaskellDepends = [ + base bytestring cereal conduit containers deepseq exceptions + filepath lens network parsec random split template-haskell text + th-lift transformers unix vector xml-conduit xml-types + ]; + testHaskellDepends = [ + base bytestring cereal containers directory extra filepath network + parsec process QuickCheck random resourcet tasty tasty-hunit + tasty-quickcheck text transformers unix vector + ]; + benchmarkHaskellDepends = [ base criterion ]; + doCheck = false; + description = "A client library for the D-Bus IPC system"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; }) {}; "dbus-client" = callPackage @@ -70427,8 +70720,8 @@ self: { base containers dbus-core monads-tf text transformers ]; description = "Monadic and object-oriented interfaces to DBus"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -70446,8 +70739,8 @@ self: { network parsec text unix vector xml-types ]; description = "Low-level D-Bus protocol implementation"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -70464,7 +70757,7 @@ self: { base dbus hslogger optparse-applicative ]; description = "Expose a dbus server to control hslogger"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "dbus-qq" = callPackage @@ -70480,8 +70773,8 @@ self: { ]; testHaskellDepends = [ base containers dbus QuickCheck ]; description = "Quasi-quoter for DBus functions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -70497,7 +70790,7 @@ self: { base containers dbus syb template-haskell text ]; description = "TemplateHaskell generator of DBus bindings"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "dbus-th-introspection" = callPackage @@ -70517,7 +70810,7 @@ self: { base cmdargs containers dbus dbus-th template-haskell ]; description = "Generate bindings for DBus calls by using DBus introspection and dbus-th"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "dclabel" = callPackage @@ -70539,8 +70832,8 @@ self: { quickcheck-instances ]; description = "This packge is deprecated. See the the \"LIO.DCLabel\" in the \"lio\" package."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -70552,8 +70845,8 @@ self: { sha256 = "1bfc9ip4fqzjzlzppkrnspnm6gc50f4rkf0wngnxyj7f79fvjr6k"; libraryHaskellDepends = [ base pretty QuickCheck ]; description = "The Disjunction Category Label Format"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -70573,8 +70866,8 @@ self: { executableHaskellDepends = [ base filepath optparse-applicative ]; testHaskellDepends = [ base ]; description = "DCPU-16 Emulator & Assembler"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -70586,8 +70879,8 @@ self: { sha256 = "1mw0qn7c6ag2w6gn6pwpjf979m3p5v3p9a1kal2x8g8ncx98dcn5"; libraryHaskellDepends = [ base dates time ]; description = "Discordian Date Types for Haskell"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -70603,8 +70896,8 @@ self: { base containers deepseq parsec transformers wl-pprint ]; description = "Disciplined Disciple Compiler common utilities"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -70624,8 +70917,8 @@ self: { deepseq directory filepath mtl process text time ]; description = "Disciplined Disciple Compiler build framework"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -70638,8 +70931,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base filepath ]; description = "Disciplined Disciple Compiler base libraries"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -70656,8 +70949,8 @@ self: { parsec text transformers wl-pprint ]; description = "Disciplined Disciple Compiler core language and type checker"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -70671,8 +70964,8 @@ self: { base containers ddc-core ddc-core-tetra ]; description = "Disciplined Disciple Compiler PHP code generator"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -70688,8 +70981,8 @@ self: { array base containers ddc-base ddc-core deepseq mtl transformers ]; description = "Disciplined Disciple Compiler semantic evaluator for the core language"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -70707,8 +71000,8 @@ self: { ddc-core-tetra deepseq limp limp-cbc mtl transformers ]; description = "Disciplined Disciple Compiler data flow compiler"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -70725,8 +71018,8 @@ self: { ddc-core-simpl mtl text transformers ]; description = "Disciplined Disciple Compiler LLVM code generator"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -70742,8 +71035,8 @@ self: { array base containers ddc-core deepseq mtl text transformers ]; description = "Disciplined Disciple Compiler C code generator"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -70759,8 +71052,8 @@ self: { array base containers ddc-core deepseq mtl transformers ]; description = "Disciplined Disciple Compiler code transformations"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -70777,8 +71070,8 @@ self: { mtl pretty-show text transformers ]; description = "Disciplined Disciple Compiler intermediate language"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -70798,8 +71091,8 @@ self: { deepseq directory filepath mtl process time transformers ]; description = "Disciplined Disciple Compiler top-level driver"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -70811,8 +71104,8 @@ self: { sha256 = "0pbsnxzlbx9xblqf9199wrl80aard59l3193gm8gzxx7ispfhs3f"; libraryHaskellDepends = [ base containers ddc-base directory ]; description = "Disciplined Disciple Compiler user interface support"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -70829,8 +71122,8 @@ self: { mtl pretty-show text transformers ]; description = "Disciplined Disciple Compiler source language"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -70853,8 +71146,8 @@ self: { process transformers ]; description = "Disciplined Disciple Compiler command line tools"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -70872,8 +71165,8 @@ self: { base buildbox containers directory filepath process random stm ]; description = "Disciplined Disciple Compiler test driver and buildbot"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -70892,8 +71185,8 @@ self: { haskeline haskell-src-exts ]; description = "Disciple Core language interactive interpreter"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -70920,7 +71213,7 @@ self: { base criterion free-vector-spaces lens linear vector ]; description = "Delay differential equations"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "dead-code-detection" = callPackage @@ -70945,8 +71238,8 @@ self: { string-conversions uniplate ]; description = "detect dead code in haskell projects"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -70962,8 +71255,8 @@ self: { base containers parsec template-haskell transformers vector ]; description = "Dead simple JSON parser, with some Template Haskell sugar"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -70993,7 +71286,7 @@ self: { base Cabal HUnit parsec pretty regex-tdfa text ]; description = "Modules for working with the Debian package system"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "debian-binary" = callPackage @@ -71007,7 +71300,7 @@ self: { libraryHaskellDepends = [ base directory filepath HSH ]; description = "Utilities to work with debian binary packages"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "debian-build" = callPackage @@ -71025,7 +71318,7 @@ self: { ]; executableHaskellDepends = [ base filepath transformers ]; description = "Debian package build sequence tools"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "debug" = callPackage @@ -71053,8 +71346,8 @@ self: { aeson base bytestring containers directory extra filepath text ]; description = "Simple trace-based debugger"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -71066,7 +71359,7 @@ self: { sha256 = "19k9f92pjh52qnr31l0468hn2klkb8wszs7azwczvxzg8aq7krld"; libraryHaskellDepends = [ base groom process temporary ]; description = "Display a colorized diff between two Haskell values"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "debug-dump" = callPackage @@ -71077,7 +71370,7 @@ self: { sha256 = "0il889gy8fdi1yxm7f1nmj4s5gxqyq35jm8p5fax6yhj6lmyciwl"; libraryHaskellDepends = [ base bytestring directory random text ]; description = "File-based debug output"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "debug-me" = callPackage @@ -71105,8 +71398,8 @@ self: { wai-websockets warp websockets ]; description = "secure remote debugging"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.agpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -71123,8 +71416,8 @@ self: { aeson base debug-hoed directory filepath yaml ]; description = "A preprocessor for the debug package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {debug-hoed = null;}; @@ -71137,7 +71430,7 @@ self: { libraryHaskellDepends = [ base clock containers ]; testHaskellDepends = [ base ]; description = "Debug.Trace equivalent for timing computations"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "debug-trace-var" = callPackage @@ -71148,8 +71441,8 @@ self: { sha256 = "12dlnvzvnjk6z37pnajmghd5wcrzkf4pkpc0r2nrjp4h3p9pjkqp"; libraryHaskellDepends = [ base template-haskell unicode-show ]; description = "You do not have to write variable names twice in Debug.Trace"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -71164,8 +71457,8 @@ self: { libraryHaskellDepends = [ base lens random transformers ]; executableHaskellDepends = [ base ]; description = "More useful trace functions for investigating bugs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -71178,7 +71471,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "Convert Unicode characters with burrs to their ASCII counterparts"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "dec" = callPackage @@ -71191,7 +71484,7 @@ self: { editedCabalFile = "1v5f5yby0cld1ziqqgkcx8b50qkpviplspm82a6wl7lw28cjm0hs"; libraryHaskellDepends = [ base ]; description = "Decidable propositions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "decepticons" = callPackage @@ -71202,8 +71495,8 @@ self: { sha256 = "1fnp2c2rdpihvxm5j22z1mrf8pnpcnasvfsrlg7lvg5m76md7k3v"; libraryHaskellDepends = [ base comonad-transformers ]; description = "The categorical dual of transformers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -71219,8 +71512,8 @@ self: { base functor-products microlens singletons vinyl ]; description = "Combinators for manipulating dependently-typed predicates"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -71235,8 +71528,8 @@ self: { libraryHaskellDepends = [ base binary binary-bits deepseq mtl ]; testHaskellDepends = [ base binary doctest hspec QuickCheck ]; description = "An implementation of the General Decimal Arithmetic Specification"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -71251,8 +71544,8 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Preprocessing decimal literals more or less as they are (instead of via fractions)"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -71272,7 +71565,7 @@ self: { ]; testHaskellDepends = [ base mwc-probability ]; description = "DIY Markov Chains"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "decode-utf8" = callPackage @@ -71288,7 +71581,7 @@ self: { api-opentheory-unicode base opentheory-unicode ]; description = "Decode a UTF-8 byte stream on standard input"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "decoder-conduit" = callPackage @@ -71299,8 +71592,8 @@ self: { sha256 = "0z5krcl4xd385f7v2bsnfyr7zidqwfjvc6b432gbbn2vcrx966c7"; libraryHaskellDepends = [ base binary bytestring conduit ]; description = "Conduit for decoding ByteStrings using Data.Binary.Get"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -71324,7 +71617,7 @@ self: { ]; description = "A type-checker for the λΠ-modulo calculus"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -71343,8 +71636,8 @@ self: { testHaskellDepends = [ base doctest rank2classes ]; testToolDepends = [ markdown-unlit ]; description = "Deep natural and unnatural tree transformations, including attribute grammars"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -71361,8 +71654,8 @@ self: { base containers doctest HUnit mtl QuickCheck safe transformers ]; description = "A library that provides deep-level programming style and(or) notation on Applicative and Monad"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -71390,8 +71683,8 @@ self: { test-framework-quickcheck2 vector ]; description = "Deep Learning in Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -71410,8 +71703,8 @@ self: { array base ghc-prim HUnit test-framework test-framework-hunit ]; description = "Deep evaluation of data structures"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "deepseq-bounded" = callPackage @@ -71434,8 +71727,8 @@ self: { parallel random syb template-haskell ]; description = "Bounded deepseq, including support for generic deriving"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -71454,7 +71747,7 @@ self: { base deepseq ghc-prim HUnit test-framework test-framework-hunit ]; description = "GHC.Generics-based Control.DeepSeq.rnf implementation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "deepseq-instances" = callPackage @@ -71465,7 +71758,7 @@ self: { sha256 = "0shhk3hqy02qkrbbd85sbzhga7pvk6fwjnadnp6dkip55gllm24z"; libraryHaskellDepends = [ array base deepseq stm ]; description = "Candidate NFData Instances for Types in base"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "deepseq-magic" = callPackage @@ -71476,8 +71769,8 @@ self: { sha256 = "15nisjmhcfippz153b8l8f291halkgbrync5c2v6xwkh07ibn7yp"; libraryHaskellDepends = [ base ]; description = "Deep evaluation of data structures without NFData"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -71490,8 +71783,8 @@ self: { libraryHaskellDepends = [ base deepseq template-haskell ]; testHaskellDepends = [ base deepseq template-haskell ]; description = "Template Haskell based deriver for optimised NFData instances"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -71503,8 +71796,8 @@ self: { sha256 = "1hisk6yfq4182ak7d1mi1kmnwwlcl8w7gwc8wqkq4l8m3zfyij8k"; libraryHaskellDepends = [ base directory filepath hsmagick ]; description = "A DeepZoom image slicer. Only known to work on 32bit Linux"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -71516,8 +71809,8 @@ self: { sha256 = "1rz37w83awji034spyv4cnfbqb6r98r1bbvzh2i979qh5c5s6ckg"; libraryHaskellDepends = [ base cluss ]; description = "default arguments in haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -71540,7 +71833,7 @@ self: { tasty-quickcheck ]; description = "Abstractions over deferred folds"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "definitive-base" = callPackage @@ -71557,7 +71850,7 @@ self: { ]; description = "The base modules of the Definitive framework"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "definitive-filesystem" = callPackage @@ -71578,7 +71871,7 @@ self: { ]; description = "A library that enable you to interact with the filesystem in a definitive way"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "definitive-graphics" = callPackage @@ -71601,7 +71894,7 @@ self: { ]; description = "A definitive package allowing you to open windows, read image files and render text to be displayed or saved"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "definitive-parser" = callPackage @@ -71619,7 +71912,7 @@ self: { ]; description = "A parser combinator library for the Definitive framework"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "definitive-reactive" = callPackage @@ -71638,7 +71931,7 @@ self: { ]; description = "A simple Reactive library"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "definitive-sound" = callPackage @@ -71658,7 +71951,7 @@ self: { ]; description = "A definitive package to handle sound and play it back"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "deiko-config" = callPackage @@ -71673,7 +71966,7 @@ self: { array base containers exceptions mtl parsec text transformers ]; description = "Small and typesafe configuration library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "dejafu" = callPackage @@ -71689,7 +71982,7 @@ self: { leancheck profunctors random transformers ]; description = "A library for unit-testing concurrent programs"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "deka" = callPackage @@ -71701,8 +71994,8 @@ self: { libraryHaskellDepends = [ base bytestring parsec transformers ]; librarySystemDepends = [ mpdec ]; description = "Decimal floating point arithmetic"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {mpdec = null;}; @@ -71723,8 +72016,8 @@ self: { ]; testHaskellDepends = [ base bytestring deka QuickCheck quickpull ]; description = "Tests for deka, decimal floating point arithmetic"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -71741,8 +72034,8 @@ self: { ]; testHaskellDepends = [ AC-Vector base HUnit QuickCheck ]; description = "Build a Delaunay triangulation of a set of points"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -71759,7 +72052,7 @@ self: { ]; testHaskellDepends = [ async base dimensional exceptions time ]; description = "More useful and humain delaying functions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "delicious" = callPackage @@ -71773,8 +72066,8 @@ self: { base bytestring curl feed json nano-md5 xml ]; description = "Accessing the del.icio.us APIs from Haskell (v2)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -71790,8 +72083,8 @@ self: { attoparsec base binary bytestring bytestring-show ]; description = "Parse character delimited textual data"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -71804,8 +72097,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base uhc-util uulib ]; description = "Library for dealing with tab and/or comma (or other) separated files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -71829,8 +72122,8 @@ self: { ]; testHaskellDepends = [ base directory filepath hspec ]; description = "A library for detecting file changes"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -71852,8 +72145,8 @@ self: { base binary bytestring containers monad-atom nlp-scores text ]; description = "Online entropy-based model of lexical category acquisition"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -71865,8 +72158,8 @@ self: { sha256 = "0kq6kz064jy6x1b7x46h2a9mf9n5irzbkzr4dd2by4yvac9yc5kw"; libraryHaskellDepends = [ base ]; description = "Generalized the Prelude more functionally"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -71879,8 +72172,8 @@ self: { libraryHaskellDepends = [ base free transformers ]; testHaskellDepends = [ base hspec ]; description = "Demarcating transformed monad"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -71895,8 +72188,8 @@ self: { libraryHaskellDepends = [ base directory filepath ]; executableHaskellDepends = [ base directory filepath ]; description = "Functions supporting bulk file and directory name normalization"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -71921,8 +72214,8 @@ self: { transformers transformers-compat vector ]; description = "Mutable and immutable dense multidimensional arrays"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -71944,8 +72237,8 @@ self: { tasty-quickcheck ]; description = "Dense int-set"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -71964,7 +72257,41 @@ self: { ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "Simple and incomplete pure haskell implementation of linear algebra"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; + }) {}; + + "dep-t" = callPackage + ({ mkDerivation, base, mtl, rank2classes, tasty, tasty-hunit + , template-haskell, transformers, unliftio-core + }: + mkDerivation { + pname = "dep-t"; + version = "0.1.3.0"; + sha256 = "1bzf2czbml949an6gffc7jh898ba2axfh87phnrla0595x7nrx21"; + libraryHaskellDepends = [ base mtl transformers unliftio-core ]; + testHaskellDepends = [ + base mtl rank2classes tasty tasty-hunit template-haskell + transformers unliftio-core + ]; + description = "Reader-like monad transformer for dependency injection"; + license = lib.licenses.bsd3; + }) {}; + + "dep-t-advice" = callPackage + ({ mkDerivation, base, dep-t, doctest, mtl, rank2classes, sop-core + , tasty, tasty-hunit, template-haskell, transformers + }: + mkDerivation { + pname = "dep-t-advice"; + version = "0.3.0.0"; + sha256 = "00nqf37x877s5arkwv55cki068gpgq64yns4qhp039az2mfr4g9q"; + libraryHaskellDepends = [ base dep-t sop-core ]; + testHaskellDepends = [ + base dep-t doctest mtl rank2classes sop-core tasty tasty-hunit + template-haskell transformers + ]; + description = "Giving good advice to functions in a DepT environment"; + license = lib.licenses.bsd3; }) {}; "dependency" = callPackage @@ -71981,7 +72308,7 @@ self: { testHaskellDepends = [ base containers hspec ]; benchmarkHaskellDepends = [ base containers criterion ]; description = "Dependency resolution for package management"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "dependent-hashmap" = callPackage @@ -72000,8 +72327,8 @@ self: { mtl unordered-containers ]; description = "Dependent hash maps"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -72016,7 +72343,7 @@ self: { libraryHaskellDepends = [ base containers dependent-sum ]; description = "Dependent finite maps (partial dependent products)"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "dependent-map" = callPackage @@ -72032,7 +72359,7 @@ self: { ]; description = "Dependent finite maps (partial dependent products)"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "dependent-monoidal-map" = callPackage @@ -72048,8 +72375,8 @@ self: { dependent-sum dependent-sum-aeson-orphans ]; description = "Dependent map that uses semigroup mappend"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -72061,8 +72388,8 @@ self: { sha256 = "0rvl1svd0ya8wrmlimkcb7iki33gvpm5h0ix9vac2id38l4a4fh9"; libraryHaskellDepends = [ base lens mtl prologue ]; description = "Control structure similar to Control.Monad.State, allowing multiple nested states, distinguishable by provided phantom types."; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -72074,8 +72401,8 @@ self: { sha256 = "07hs9s78wiybwjwkal2yq65hdavq0gg1h2ld7wbph61s2nsfrpm8"; libraryHaskellDepends = [ base ]; description = "Dependent sum type"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; }) {}; "dependent-sum" = callPackage @@ -72086,7 +72413,7 @@ self: { sha256 = "0aj63gvak0y4mgxndykqfg5w958hf7lp5blml2z647rjgy85bjw1"; libraryHaskellDepends = [ base constraints-extras some ]; description = "Dependent sum type"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "dependent-sum-aeson-orphans" = callPackage @@ -72102,7 +72429,7 @@ self: { dependent-sum some ]; description = "JSON instances for DSum, DMap, and Some"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "dependent-sum-template" = callPackage @@ -72118,7 +72445,7 @@ self: { ]; testHaskellDepends = [ base constraints-extras dependent-sum ]; description = "Template Haskell code to generate instances of classes in dependent-sum package"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "depends" = callPackage @@ -72139,8 +72466,8 @@ self: { transformers yaml-config ]; description = "A simple configuration management tool for Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -72160,7 +72487,7 @@ self: { ]; description = "Analyze quality of nucleotide sequences"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -72177,7 +72504,7 @@ self: { ]; testHaskellDepends = [ base containers hspec QuickCheck ]; description = "Double-ended priority queues"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "deptrack-core" = callPackage @@ -72188,8 +72515,8 @@ self: { sha256 = "11v9yvvsp3m3igpqqqqkx1cp648s87xpa4d06vbsxnz4k6yp4bjj"; libraryHaskellDepends = [ base containers dlist mtl parsec ]; description = "DepTrack Core types and model"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -72208,8 +72535,8 @@ self: { text ]; description = "DepTrack applied to DevOps"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -72222,8 +72549,8 @@ self: { libraryHaskellDepends = [ base containers deptrack-core dotgen ]; testHaskellDepends = [ base containers deptrack-core dotgen ]; description = "Facilitate Graphviz representations of DepTrack dependencies"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -72242,7 +72569,7 @@ self: { tasty-quickcheck ]; description = "Double-ended queues"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "dequeue" = callPackage @@ -72256,8 +72583,8 @@ self: { libraryHaskellDepends = [ base QuickCheck safe ]; testHaskellDepends = [ base Cabal cabal-test-quickcheck ]; description = "A typeclass and an implementation for double-ended queues"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -72270,7 +72597,7 @@ self: { libraryHaskellDepends = [ base fgl ]; description = "Find derangements of lists"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -72285,7 +72612,7 @@ self: { ]; description = "Typeset Derivation Trees via MetaPost"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -72306,8 +72633,8 @@ self: { ]; executableHaskellDepends = [ base ]; description = "A program and library to derive instances for data types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -72319,8 +72646,8 @@ self: { sha256 = "0bggj2jb3bbgxcz75v8q2yx29v88skiwjaj3fxkkynnv5zvrbgwr"; libraryHaskellDepends = [ base instant-generics template-haskell ]; description = "Macro to derive instances for Instant-Generics using Template Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -72332,8 +72659,8 @@ self: { sha256 = "08zhyn9xcmhrrnh7y2a1r7v4nmgm2af0d41ns0wjqais67rzsxsp"; libraryHaskellDepends = [ base data-default ]; description = "Generic instances for enumerating complex data types"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -72355,8 +72682,8 @@ self: { base haskell-src-exts haskell-src-meta template-haskell ]; description = "Instance deriving for (a subset of) GADTs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -72370,7 +72697,7 @@ self: { base bifunctors reflection template-haskell ]; description = "Derive class instances though various kinds of lifting"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "derive-monoid" = callPackage @@ -72385,8 +72712,8 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base semigroups ]; description = "derive Semigroup/Monoid/IsList"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -72400,7 +72727,7 @@ self: { testHaskellDepends = [ base hspec QuickCheck ]; benchmarkHaskellDepends = [ base criterion deepseq ]; description = "Derive Storable instances with GHC.Generics."; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "derive-storable-plugin" = callPackage @@ -72419,9 +72746,7 @@ self: { base criterion deepseq derive-storable ]; description = "GHC core plugin supporting the derive-storable package"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + license = lib.licenses.mit; }) {}; "derive-topdown" = callPackage @@ -72436,7 +72761,7 @@ self: { base mtl primitive syb template-haskell th-expand-syns transformers ]; description = "Help Haskellers derive class instances for composited data types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "derive-trie" = callPackage @@ -72447,8 +72772,8 @@ self: { sha256 = "11c378mh5razibd9ljffm5353v4plrgvkfb62p6029f04sf29jnc"; libraryHaskellDepends = [ array base containers template-haskell ]; description = "Automatic derivation of Trie implementations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -72465,7 +72790,7 @@ self: { aeson base hspec template-haskell text unordered-containers ]; description = "Derive ToJSON/FromJSON instances in a more prefix-friendly manner"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "deriving-aeson" = callPackage @@ -72477,7 +72802,7 @@ self: { libraryHaskellDepends = [ aeson base ]; testHaskellDepends = [ aeson base bytestring ]; description = "Type driven generic aeson instance customisation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "deriving-compat" = callPackage @@ -72500,7 +72825,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Backports of GHC deriving extensions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "deriving-show-simple" = callPackage @@ -72512,7 +72837,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base HUnit ]; description = "Derive a Show instance without field selector names"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "derp" = callPackage @@ -72523,7 +72848,7 @@ self: { sha256 = "0g8y98qjjampbwnxhvjzrs2jczh2mcwsacjq95jxpidgsld00shk"; libraryHaskellDepends = [ base containers ]; description = "Derivative Parsing"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "derp-lib" = callPackage @@ -72534,8 +72859,8 @@ self: { sha256 = "0j883w01k9scz6cfxljkw9s2kgs9f7vdxyyxxhlvvkgzb0050v0x"; libraryHaskellDepends = [ base derp ]; description = "combinators based on parsing with derivatives (derp) package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -72551,7 +72876,7 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base HUnit ]; description = "Parse and render JSON simply"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "describe" = callPackage @@ -72572,8 +72897,8 @@ self: { profunctors QuickCheck template-haskell text transformers ]; description = "Combinators for describing binary data structures"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -72585,7 +72910,7 @@ self: { sha256 = "00rk7m54igmrsi8j2fmql7c5wgyg7x5ws8397753470x5k2qv2ap"; libraryHaskellDepends = [ base ]; description = "Loads a list of items with fields"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "descript-lang" = callPackage @@ -72619,8 +72944,8 @@ self: { transformers yaml ]; description = "Library, interpreter, and CLI for Descript programming language"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -72640,7 +72965,7 @@ self: { aeson base bifunctors containers hspec HUnit mtl text transformers ]; description = "Self-describing consumers/parsers; forms, cmd-line args, JSON, etc"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "desert" = callPackage @@ -72660,7 +72985,7 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "a simple build tool for OCaml projects"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "despair" = callPackage @@ -72671,7 +72996,7 @@ self: { sha256 = "0nl1sgbvxgg5ajgwj24l6qxlsin5g0bly50j8w7sg7jkn3v0r9kc"; libraryHaskellDepends = [ base random ]; description = "Despair"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "deterministic-game-engine" = callPackage @@ -72683,8 +73008,8 @@ self: { libraryHaskellDepends = [ base mtl ]; testHaskellDepends = [ base hspec ]; description = "Simple deterministic game engine"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -72707,7 +73032,7 @@ self: { template-haskell ]; description = "JSON and CSV encoding for rationals as decimal point numbers"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "detour-via-uom" = callPackage @@ -72728,8 +73053,8 @@ self: { uom-plugin ]; description = "JSON and CSV encoding for quantities"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -72748,7 +73073,7 @@ self: { unordered-containers zlib ]; description = "Markov chain text generator"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "deunicode" = callPackage @@ -72761,8 +73086,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base bytestring utf8-string ]; description = "Get rid of unicode (utf-8) symbols in Haskell sources"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -72781,8 +73106,8 @@ self: { text unix unordered-containers ]; description = "A small tool to make it easier to update program managed by Angel"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -72804,8 +73129,8 @@ self: { source-constraints tasty tasty-mgolden text typed-process ]; description = "Haskell development tool agregate"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -72819,8 +73144,8 @@ self: { base bytestring containers elf hdis86 syb ]; description = "Find gadgets for return-oriented programming on x86"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -72840,7 +73165,7 @@ self: { time ]; description = "Type, render and parse the df1 hierarchical structured log format"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "df1-html" = callPackage @@ -72860,7 +73185,7 @@ self: { text time xmlbf ]; description = "Render and parse df1 logs as HTML"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "dfinity-radix-tree" = callPackage @@ -72895,8 +73220,8 @@ self: { tasty-quickcheck temporary text transformers unordered-containers ]; description = "A generic data integrity layer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) leveldb;}; @@ -72908,7 +73233,7 @@ self: { sha256 = "1ybq5bnh85dbr9lfx5d6qw87x9qc8fs0yvbi1a6860an13lvrzy7"; libraryHaskellDepends = [ base scientific ]; description = "A package for precise decimal arithmatic using rationals"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "dfsbuild" = callPackage @@ -72928,7 +73253,7 @@ self: { ]; description = "Build Debian From Scratch CD/DVD images"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -72941,8 +73266,8 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base Cabal QuickCheck ]; description = "Implementation of DGIM algorithm"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -72954,8 +73279,8 @@ self: { sha256 = "100xlxqhy33kllyb4dy7q0bwwy5wn9w45qy1cb5f0yb0dqff1pnx"; libraryHaskellDepends = [ base HTTP mtl network split ]; description = "Haskell front-end for DGS' bot interface"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -73007,8 +73332,8 @@ self: { ]; doCheck = false; description = "A configuration language guaranteed to terminate"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "dhall" = callPackage @@ -73030,10 +73355,10 @@ self: { }: mkDerivation { pname = "dhall"; - version = "1.37.1"; - sha256 = "16qpasw41wcgbi9ljrs43dn2ajw25yipm8kxri6v5fwj3gyzj24d"; + version = "1.38.0"; + sha256 = "0ifxi9i7ply640s2cgljjczvmblgz0ryp2p9yxgng3qm5ai58229"; revision = "1"; - editedCabalFile = "11sjra0k7sdy0xcbhlxvjjpd4h7ki9dcrndcpaq71qlgdql32w24"; + editedCabalFile = "067hh41cnmjskf3y3kzlwsisw6v5bh9mbmhg5jfapm1y5xp6gw9r"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -73064,7 +73389,7 @@ self: { ]; doCheck = false; description = "A configuration language guaranteed to terminate"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "dhall-bash" = callPackage @@ -73073,8 +73398,8 @@ self: { }: mkDerivation { pname = "dhall-bash"; - version = "1.0.35"; - sha256 = "0v7br83m3zhz4pa98yrzbikkvldgrprjq0z5amimjsk8lcdmpq8k"; + version = "1.0.36"; + sha256 = "0hg45xjl1pcla9xbds40qrxcx2h6b4ysw8kbx8hpnaqaazr2jrw0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73085,7 +73410,7 @@ self: { base bytestring dhall optparse-generic text ]; description = "Compile Dhall to Bash"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "dhall-check" = callPackage @@ -73102,8 +73427,8 @@ self: { base containers dhall directory filepath fsnotify text trifecta ]; description = "Check all dhall files in a project"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -73116,10 +73441,8 @@ self: { }: mkDerivation { pname = "dhall-docs"; - version = "1.0.3"; - sha256 = "0cinkgcihn15zws18nff42lcpmzv4cg7k8wxmcwa93k7qvw01i2p"; - revision = "1"; - editedCabalFile = "1wzwfgv6bpgjq0day372gyxg9vrcmkf5sbzvm0lv4p39z0qcgpna"; + version = "1.0.4"; + sha256 = "0x6x5b9kh0in35jsgj2dghyxsqjdjrw7s9kngyjcn7v2ycklcifl"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -73135,8 +73458,8 @@ self: { turtle ]; description = "Generate HTML docs from a dhall package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -73169,8 +73492,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Translate concourse config from Dhall to YAML"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -73183,10 +73506,8 @@ self: { }: mkDerivation { pname = "dhall-json"; - version = "1.7.4"; - sha256 = "1qzlv7wvap1ivgv7fi9ikqa9nm9z9kbbca5zvddh3njcdk6i73n9"; - revision = "1"; - editedCabalFile = "0njh1c7c4dcm5ya4w79mf11m5v9gnacyd7lrz7j4ipk4wdgwinvi"; + version = "1.7.5"; + sha256 = "1fpkp8xkcw2abcigypyl0ji6910jyshlqwhf48yfwn6dsgbyw6iy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73202,9 +73523,7 @@ self: { aeson base bytestring dhall tasty tasty-hunit tasty-silver text ]; description = "Convert between Dhall and JSON or YAML"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + license = lib.licenses.bsd3; }) {}; "dhall-lex" = callPackage @@ -73223,7 +73542,7 @@ self: { testHaskellDepends = [ base bytestring hspec hspec-dirstream ]; benchmarkHaskellDepends = [ base bytestring criterion ]; description = "Lexer for the Dhall language"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "dhall-lsp-server" = callPackage @@ -73236,10 +73555,8 @@ self: { }: mkDerivation { pname = "dhall-lsp-server"; - version = "1.0.12"; - sha256 = "0gp9pa3pdm49ya6awdi1qjbycxdihz2z11mzmfnr5m2gf0vrjzpp"; - revision = "1"; - editedCabalFile = "1yiazwsvbz2yzc8jdvr6nq7p882pkcr2hfyxsn73j288cwdyl02r"; + version = "1.0.13"; + sha256 = "0cj51xdmpp0w7ndzbz4yn882agvhbnsss3myqlhfi4y91lb8f1ak"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73254,9 +73571,7 @@ self: { QuickCheck tasty tasty-hspec text ]; description = "Language Server Protocol (LSP) server for Dhall"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + license = lib.licenses.mit; }) {}; "dhall-nix" = callPackage @@ -73265,8 +73580,8 @@ self: { }: mkDerivation { pname = "dhall-nix"; - version = "1.1.19"; - sha256 = "0w3vxqn1h39f17mg246ydxni02civ3fm85s0wi4ks6iy1ng4dw0a"; + version = "1.1.20"; + sha256 = "14d9icvgmrphnbjjwlskh88p7vgphgb0xqd91p217bf2xhl9k2xd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73277,8 +73592,8 @@ self: { base dhall hnix optparse-generic text ]; description = "Dhall to Nix compiler"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -73290,8 +73605,8 @@ self: { }: mkDerivation { pname = "dhall-nixpkgs"; - version = "1.0.3"; - sha256 = "03apykbil3x3j7ndapfgmf39p7l62d1lrn2ad1m6k5xqnd8nqlxf"; + version = "1.0.4"; + sha256 = "0yr7z17dvmr1zipk29fmzm46myxxsz514587n6a7h00c56dyvnc3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -73300,11 +73615,29 @@ self: { prettyprinter text transformers turtle ]; description = "Convert Dhall projects to Nix packages"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; + "dhall-recursive-adt" = callPackage + ({ mkDerivation, base, data-fix, dhall, either, hedgehog + , neat-interpolation, recursion-schemes, tasty, tasty-hedgehog + , tasty-hunit + }: + mkDerivation { + pname = "dhall-recursive-adt"; + version = "0.1.0.0"; + sha256 = "01wk6xsakbhsx14s59f0rj32mlccgxgc29a3n5d3b923yd5w64zm"; + libraryHaskellDepends = [ base data-fix dhall recursion-schemes ]; + testHaskellDepends = [ + base dhall either hedgehog neat-interpolation recursion-schemes + tasty tasty-hedgehog tasty-hunit + ]; + description = "Convert recursive ADTs from and to Dhall"; + license = lib.licenses.cc0; + }) {}; + "dhall-text" = callPackage ({ mkDerivation, base, dhall, optparse-applicative, text }: mkDerivation { @@ -73319,8 +73652,8 @@ self: { base dhall optparse-applicative text ]; description = "Template text using Dhall"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -73349,8 +73682,8 @@ self: { tasty tasty-golden tasty-hunit text ]; description = "Compile Dhall expressions to Cabal files"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -73362,10 +73695,8 @@ self: { }: mkDerivation { pname = "dhall-yaml"; - version = "1.2.4"; - sha256 = "0xm1dsim5x83k6kp5g9yv08ixf6l4p2mm666m4vsylx98y5nwmag"; - revision = "1"; - editedCabalFile = "1mmsymbj57r49kj520f9hrw9bk80y29p3av68b1hmrcaiixqs87a"; + version = "1.2.5"; + sha256 = "0fax4p85344yrzk1l21j042mm02p0idp396vkq71x3dpiniq0mwf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73381,9 +73712,7 @@ self: { tasty-hunit text ]; description = "Convert between Dhall and YAML"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + license = lib.licenses.gpl3; }) {}; "dhcp-lease-parser" = callPackage @@ -73401,8 +73730,8 @@ self: { attoparsec base bytestring chronos ip tasty tasty-hunit ]; description = "Parse a DHCP lease file"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -73436,8 +73765,8 @@ self: { ]; doHaddock = false; description = "Dhall/YAML configurable concurrent integration test executor"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -73453,7 +73782,7 @@ self: { base containers df1 di-core di-df1 di-handle di-monad exceptions ]; description = "Typeful hierarchical structured logging using di, mtl and df1"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "di-core" = callPackage @@ -73472,7 +73801,7 @@ self: { tasty-quickcheck time ]; description = "Typeful hierarchical structured logging without monad towers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "di-df1" = callPackage @@ -73491,7 +73820,7 @@ self: { time ]; description = "Write logs in the df1 format using the di logging framework"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "di-handle" = callPackage @@ -73504,7 +73833,7 @@ self: { base bytestring di-core exceptions unix ]; description = "IO support for file handles in di-core"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "di-monad" = callPackage @@ -73519,7 +73848,7 @@ self: { base containers di-core exceptions mtl pipes stm transformers ]; description = "mtl flavoured typeful hierarchical structured logging for di-core"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "di-polysemy" = callPackage @@ -73532,7 +73861,7 @@ self: { base df1 di-core di-df1 di-handle polysemy ]; description = "DI logger wrapped for Polysemy"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "dia-base" = callPackage @@ -73545,8 +73874,8 @@ self: { editedCabalFile = "0jp6vxj2m984dl7gnphs7119zxs8pplhq73nnicvbhjcliixyl6w"; libraryHaskellDepends = [ base deepseq ]; description = "An EDSL for teaching Haskell with diagrams - data types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -73564,8 +73893,8 @@ self: { base containers data-pprint deepseq dia-base mtl xhtml ]; description = "An EDSL for teaching Haskell with diagrams - functions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -73582,8 +73911,8 @@ self: { ]; doHaddock = false; description = "Embedded domain-specific language for declarative vector graphics"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -73597,8 +73926,8 @@ self: { editedCabalFile = "1cqibxx1a00m8nl9k48c0m0ln589rr4qw3f41xl1jk68b83r3x1k"; libraryHaskellDepends = [ base cubicbezier diagrams-lib ]; description = "deprecated, part of diagrams-contrib since 1.4"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -73624,8 +73953,8 @@ self: { Rasterific time ]; description = "Braille diagrams with plain text"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -73654,8 +73983,8 @@ self: { filepath JuicyPixels lens svg-builder ]; description = "hint-based build service for the diagrams graphics EDSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -73678,8 +74007,8 @@ self: { vector ]; description = "Cairo backend for diagrams drawing EDSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -73698,8 +74027,8 @@ self: { optparse-applicative statestack text ]; description = "HTML5 canvas backend for diagrams drawing EDSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -73728,8 +74057,8 @@ self: { test-framework-hunit test-framework-quickcheck2 ]; description = "Collection of user contributions to diagrams EDSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -73749,8 +74078,8 @@ self: { monoid-extras mtl profunctors semigroups unordered-containers ]; description = "Core libraries for diagrams EDSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -73766,8 +74095,8 @@ self: { base containers diagrams-lib fgl graphviz split ]; description = "Graph layout and drawing with GraphViz and diagrams"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -73783,8 +74112,8 @@ self: { base cairo diagrams-cairo diagrams-lib gtk ]; description = "Backend for rendering diagrams directly to GTK windows"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -73815,8 +74144,8 @@ self: { tasty-quickcheck ]; description = "Preprocessor for embedding diagrams in Haddock documentation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -73833,8 +74162,8 @@ self: { transformers ]; description = "HsQML (Qt5) backend for Diagrams"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "diagrams-html5" = callPackage @@ -73852,8 +74181,8 @@ self: { statestack static-canvas text ]; description = "HTML5 canvas backend for diagrams drawing EDSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -73887,8 +74216,8 @@ self: { ]; benchmarkHaskellDepends = [ base criterion diagrams-core ]; description = "Embedded domain-specific language for declarative graphics"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -73914,8 +74243,8 @@ self: { filepath linear optparse-applicative pandoc-types text ]; description = "A Pandoc filter to express diagrams inline using the Haskell EDSL _Diagrams_"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -73933,8 +74262,8 @@ self: { monoid-extras mtl semigroups split vector-space ]; description = "PDF backend for diagrams drawing EDSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -73954,8 +74283,8 @@ self: { optparse-applicative process split texrunner time vector zlib ]; description = "PGF backend for diagrams drawing EDSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -73976,8 +74305,8 @@ self: { statestack ]; description = "Postscript backend for diagrams drawing EDSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -73992,8 +74321,8 @@ self: { array base colour diagrams-core diagrams-lib ]; description = "Draw QR codes to SVG, PNG, PDF or PS files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -74016,8 +74345,8 @@ self: { ]; testHaskellDepends = [ base diagrams-core diagrams-lib ]; description = "Rasterific backend for diagrams"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -74035,8 +74364,8 @@ self: { monoid-extras mtl reflex reflex-dom reflex-dom-contrib ]; description = "reflex backend for diagrams drawing EDSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "diagrams-rubiks-cube" = callPackage @@ -74051,8 +74380,8 @@ self: { adjunctions base data-default-class diagrams-lib distributive lens ]; description = "Library for drawing the Rubik's Cube"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -74069,7 +74398,7 @@ self: { base deepseq tasty tasty-hunit tasty-quickcheck ]; description = "Pure Haskell solver routines used by diagrams"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "diagrams-svg" = callPackage @@ -74090,8 +74419,8 @@ self: { optparse-applicative semigroups split svg-builder text ]; description = "SVG backend for diagrams drawing EDSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -74105,8 +74434,8 @@ self: { base diagrams-core diagrams-lib dlist mtl ]; description = "TikZ backend for diagrams drawing EDSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -74124,8 +74453,8 @@ self: { base cairo diagrams-cairo diagrams-lib wx wxcore ]; description = "Backend for rendering diagrams in wxWidgets"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -74143,8 +74472,8 @@ self: { webkitgtk3 ]; description = "Simple dialog-based user interfaces"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "dialogflow-fulfillment" = callPackage @@ -74164,7 +74493,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "A Dialogflow Fulfillment library for Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "dib" = callPackage @@ -74187,8 +74516,8 @@ self: { base containers directory filepath mtl process time ]; description = "A simple, forward build system"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -74202,7 +74531,7 @@ self: { isExecutable = true; libraryHaskellDepends = [ base parsec random-fu transformers ]; description = "Simplistic D&D style dice-rolling system"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "dice-entropy-conduit" = callPackage @@ -74221,7 +74550,7 @@ self: { test-framework-quickcheck2 transformers ]; description = "Cryptographically secure n-sided dice via rejection sampling"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; }) {}; "dice2tex" = callPackage @@ -74234,8 +74563,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base ]; description = "Convert a Diceware wordlist into a printer-ready LaTeX file"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -74249,8 +74578,8 @@ self: { base binary bytestring pretty safe time ]; description = "A library for reading and writing DICOM files in the Explicit VR Little Endian transfer syntax"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -74279,8 +74608,8 @@ self: { random tagged text time ]; description = "Tools to handle StarDict dictionaries"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -74294,7 +74623,7 @@ self: { editedCabalFile = "1mn7jcc7h3b8f1pn9zigqp6mc2n0qb66lms5qnrx4zswdv5w9439"; libraryHaskellDepends = [ base containers ]; description = "Sharing/memoization of class members"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "dictparser" = callPackage @@ -74309,8 +74638,8 @@ self: { executableHaskellDepends = [ base parsec ]; testHaskellDepends = [ base hspec parsec ]; description = "Parsec parsers for the DICT format produced by dictfmt -t"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -74328,8 +74657,8 @@ self: { tasty-quickcheck ]; description = "Discrete Interval Encoding Trees"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -74341,8 +74670,8 @@ self: { sha256 = "19sn53b4sb0sa7ibcz9wvpn3vhja0yx62p8f9ibawrycm4cpbpzl"; libraryHaskellDepends = [ base Enum util ]; description = "Diff and patch"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -74358,7 +74687,7 @@ self: { testHaskellDepends = [ base Diff ]; description = "A diff algorithm based on recursive longest common substrings"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "diff-parse" = callPackage @@ -74370,7 +74699,7 @@ self: { libraryHaskellDepends = [ attoparsec base text ]; testHaskellDepends = [ attoparsec base hspec text ]; description = "A parser for diff file formats"; - license = stdenv.lib.licenses.agpl3; + license = lib.licenses.agpl3; }) {}; "diff3" = callPackage @@ -74386,7 +74715,7 @@ self: { base QuickCheck test-framework test-framework-quickcheck2 ]; description = "Perform a 3-way difference of documents"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "diffarray" = callPackage @@ -74397,7 +74726,7 @@ self: { sha256 = "0p95i1xzp0bdm0zrdil79rfxfyz372y2qjdxyvxdzxvfb1mvalcm"; libraryHaskellDepends = [ array base ]; description = "DiffArray"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "diffcabal" = callPackage @@ -74415,8 +74744,8 @@ self: { process ]; description = "Diff two .cabal files syntactically"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -74436,7 +74765,7 @@ self: { parallel-io process process-extras unix ]; description = "Tools for diffing stdout"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "difference-monoid" = callPackage @@ -74455,8 +74784,8 @@ self: { adjunctions base comonad containers deepseq distributive doctest groups hedgehog hedgehog-checkers QuickCheck semigroupoids ]; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -74482,8 +74811,8 @@ self: { text-show vector ]; description = "Finds out whether an entity comes from different distributions (statuses)"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -74497,8 +74826,8 @@ self: { editedCabalFile = "0gkcsdf9jrfs5lwhayl808flwlv446mixdn3n91v5gsxbcqqrsi7"; libraryHaskellDepends = [ base containers ]; description = "diff on maps"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -74524,8 +74853,8 @@ self: { tasty-hunit text ]; description = "Generate todo lists from source code"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -74537,7 +74866,7 @@ self: { sha256 = "1156jr67fjpp68r2qnq0py80cmk42cz356aarqsd8al98dnvxxn6"; libraryHaskellDepends = [ base math-functions ]; description = "A (deprecated) implementation of the digamma function"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "digest" = callPackage @@ -74549,7 +74878,7 @@ self: { libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ zlib ]; description = "Various cryptographic hashes for bytestrings; CRC32 and Adler32 for now"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) zlib;}; "digest-pure" = callPackage @@ -74562,7 +74891,7 @@ self: { testHaskellDepends = [ array base bytestring digest QuickCheck ]; description = "Pure hash functions for bytestrings"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "digest-sig" = callPackage @@ -74576,7 +74905,7 @@ self: { libraryHaskellDepends = [ base bytestring ]; doHaddock = false; description = "Signature for digest"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "digestive-bootstrap" = callPackage @@ -74592,8 +74921,8 @@ self: { digestive-functors-blaze http-types text ]; description = "Speed up form designing using digestive functors and bootstrap"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -74610,8 +74939,8 @@ self: { lucid-foundation text ]; description = "Speed up form designing using digestive functors and foundation"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -74633,7 +74962,7 @@ self: { test-framework-quickcheck2 text time ]; description = "A practical formlet library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "digestive-functors-aeson" = callPackage @@ -74654,8 +74983,8 @@ self: { tasty-hunit text ]; description = "Run digestive-functors forms against JSON"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -74671,7 +75000,7 @@ self: { base blaze-html blaze-markup digestive-functors text ]; description = "Blaze frontend for the digestive-functors library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "digestive-functors-happstack" = callPackage @@ -74686,8 +75015,8 @@ self: { base bytestring digestive-functors happstack-server text ]; description = "Happstack backend for the digestive-functors library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -74704,7 +75033,7 @@ self: { xmlhtml ]; description = "Heist frontend for the digestive-functors library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "digestive-functors-hsp" = callPackage @@ -74716,8 +75045,8 @@ self: { libraryHaskellDepends = [ base digestive-functors hsp hsx text ]; libraryToolDepends = [ trhsx ]; description = "HSP support for digestive-functors"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -74729,7 +75058,7 @@ self: { sha256 = "176vc7gsm0379100imk1i8y8r2gx0l66dijgmxkqbq1qwkjfizs5"; libraryHaskellDepends = [ base digestive-functors lucid text ]; description = "Lucid frontend for the digestive-functors library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "digestive-functors-scotty" = callPackage @@ -74747,7 +75076,7 @@ self: { wai-extra ]; description = "Scotty backend for the digestive-functors library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "digestive-functors-snap" = callPackage @@ -74763,7 +75092,7 @@ self: { mtl snap-core text ]; description = "Snap backend for the digestive-functors library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "digit" = callPackage @@ -74784,7 +75113,7 @@ self: { tasty tasty-hedgehog tasty-hspec tasty-hunit text ]; description = "A data-type representing digits 0-9 and other combinations"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "digitalocean-kzs" = callPackage @@ -74801,8 +75130,8 @@ self: { ]; testHaskellDepends = [ base doctest hspec ]; description = "digitalocean api for haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -74815,8 +75144,8 @@ self: { libraryHaskellDepends = [ base QuickCheck ]; testHaskellDepends = [ base QuickCheck ]; description = "Converts integers to lists of digits and back"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -74835,7 +75164,7 @@ self: { ]; testHaskellDepends = [ base fgl hashable massiv QuickCheck ]; description = "Directed Graphs"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "dihaa" = callPackage @@ -74852,7 +75181,7 @@ self: { base FontyFruity JuicyPixels Rasterific vector ]; description = "ASCII based Diagram drawing in Haskell (Idea based on ditaa)"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }) {}; "dijkstra-simple" = callPackage @@ -74864,7 +75193,7 @@ self: { libraryHaskellDepends = [ base containers fingertree ]; testHaskellDepends = [ base containers fingertree hspec ]; description = "A simpler Dijkstra shortest paths implementation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "dimensional" = callPackage @@ -74887,7 +75216,7 @@ self: { testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ base criterion deepseq ]; description = "Statically checked physical dimensions, using Type Families and Data Kinds"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "dimensional-codata" = callPackage @@ -74898,8 +75227,8 @@ self: { sha256 = "1bmal7i0zvfivri5w7fbl4n0gyybnr2wy2cvz21b33jrzjblr1g0"; libraryHaskellDepends = [ base dimensional numtype-dk ]; description = "CODATA Recommended Physical Constants with Dimensional Types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -74911,8 +75240,8 @@ self: { sha256 = "052daw4kj1ivj3h2lvs39m3xz1xy5ra8fj5pmpfnjmjgg5kfv2w1"; libraryHaskellDepends = [ base numtype-tf time ]; description = "Statically checked physical dimensions, implemented using type families"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -74928,7 +75257,7 @@ self: { base Cabal constraints-deriving QuickCheck ]; description = "Safe type-level dimensionality for multidimensional data"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "dingo-core" = callPackage @@ -74951,8 +75280,8 @@ self: { unordered-containers wai wai-eventsource wai-extra warp web-css ]; description = "Dingo is a Rich Internet Application platform based on the Warp web server"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -74972,8 +75301,8 @@ self: { shakespeare-js template-haskell text transformers ]; description = "Dingo Example"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -74992,8 +75321,8 @@ self: { unordered-containers ]; description = "Dingo Widgets"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -75014,7 +75343,7 @@ self: { base tasty tasty-quickcheck tasty-th text unordered-containers ]; description = "A convenient tagless EDSL"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "diohsc" = callPackage @@ -75039,7 +75368,7 @@ self: { unix x509 x509-store x509-validation ]; description = "Gemini client"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "diophantine" = callPackage @@ -75051,8 +75380,8 @@ self: { libraryHaskellDepends = [ array base ]; libraryToolDepends = [ happy ]; description = "A quadratic diophantine equation solving library"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -75068,8 +75397,8 @@ self: { base containers HUnit parsec transformers TypeNat ]; description = "Diplomacy board game"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -75093,8 +75422,8 @@ self: { TypeNat wai warp warp-tls ]; description = "Play Diplomacy over HTTP"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -75111,7 +75440,7 @@ self: { base criterion directory dirstream pipes pipes-safe system-filepath ]; description = "Simple directory traversal library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "direct-binary-files" = callPackage @@ -75122,8 +75451,8 @@ self: { sha256 = "0ci6av8sgrlsn12dbpvqf3imq9w1hm2ll5np2fz7gh9760vvdidr"; libraryHaskellDepends = [ base bytestring mtl ]; description = "Serialization and deserialization monads for streams and ByteStrings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -75135,7 +75464,7 @@ self: { sha256 = "0698l8zylkgafx8g91icysz6rq2lyrnd25blhday67s9vkdpbvxh"; libraryHaskellDepends = [ base unix ]; description = "Library to switch to daemon mode using built-in OS facilities"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "direct-fastcgi" = callPackage @@ -75150,8 +75479,8 @@ self: { base bytestring containers mtl network utf8-string ]; description = "Native implementation of the FastCGI protocol"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -75170,8 +75499,8 @@ self: { transformers-base unix utf8-string ]; description = "Native webserver that acts as a library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -75183,7 +75512,7 @@ self: { sha256 = "09hv06hslz83gpqfxxv6bfg4i6l7pfv82jxab4lf8g964ciaa42q"; libraryHaskellDepends = [ base bytestring ]; description = "An implementation of the MurmurHash3 algorithm"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "direct-plugins" = callPackage @@ -75194,8 +75523,8 @@ self: { sha256 = "03f7jrx0skqiirvpzzakk3wwwdjanjxpzv8j5nwpzvqpb4syshcr"; libraryHaskellDepends = [ base ghc ghc-paths ]; description = "Lightweight replacement for Plugins, specific to GHC"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -75215,8 +75544,8 @@ self: { base bytestring directory filepath safe-exceptions ]; description = "Bindings to RocksDB"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -75233,7 +75562,7 @@ self: { base base16-bytestring bytestring directory HUnit temporary text ]; description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support."; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "directed-cubical" = callPackage @@ -75249,8 +75578,8 @@ self: { unordered-containers vector ]; description = "Finite directed cubical complexes and associated algorithms"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -75263,8 +75592,8 @@ self: { libraryHaskellDepends = [ base filepath time unix ]; testHaskellDepends = [ base filepath time unix ]; description = "Platform-agnostic library for filesystem operations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "directory-contents" = callPackage @@ -75283,8 +75612,8 @@ self: { executableHaskellDepends = [ base filepath text ]; testHaskellDepends = [ base filepath ]; description = "Recursively build, navigate, and operate on a tree of directory contents"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -75309,7 +75638,7 @@ self: { transformers unix unordered-containers ]; description = "Directory layout DSL"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "directory-listing-webpage-parser" = callPackage @@ -75323,7 +75652,7 @@ self: { base bytestring network-uri tagsoup text time ]; description = "directory listing webpage parser"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "directory-tree" = callPackage @@ -75335,7 +75664,7 @@ self: { libraryHaskellDepends = [ base directory filepath ]; testHaskellDepends = [ base directory filepath process ]; description = "A simple directory-like tree datatype, with useful IO functions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "direm" = callPackage @@ -75348,8 +75677,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base directory ]; description = "Deletes a directory and retains its contents in the parent directory"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -75365,8 +75694,8 @@ self: { aeson base containers hblock safecopy text time unordered-containers ]; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -75383,7 +75712,7 @@ self: { ]; testHaskellDepends = [ base hspec log-domain mwc-random vector ]; description = "Multivariate Dirichlet distribution"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "dirstream" = callPackage @@ -75400,7 +75729,7 @@ self: { base directory pipes pipes-safe system-fileio system-filepath unix ]; description = "Easily stream directory contents in constant memory"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "dirtree" = callPackage @@ -75422,7 +75751,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "A small library for working with directories"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "disassembler" = callPackage @@ -75433,7 +75762,7 @@ self: { sha256 = "1yg1mb9w679m1iml0rx2i6gq1ps8s56da4dvn2knvkgg7m1cr39c"; libraryHaskellDepends = [ array base containers mtl parsec ]; description = "Disassembler for X86 & AMD64 machine code"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "discogs-haskell" = callPackage @@ -75456,8 +75785,8 @@ self: { transformers ]; description = "Client for Discogs REST API"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -75469,7 +75798,7 @@ self: { sha256 = "0axz9k5j9yfk58icnycr93b6d5fqylgqlxi8v7w5sv1n28hrpvvj"; libraryHaskellDepends = [ base containers ]; description = "DisCoCat implementation"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "discord-gateway" = callPackage @@ -75486,8 +75815,8 @@ self: { aeson base discord-types hslogger transformers url websockets wuss ]; description = "An API wrapper for Discord in Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -75511,7 +75840,7 @@ self: { ]; executableHaskellDepends = [ base text unliftio ]; description = "Write bots for Discord in Haskell"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "discord-hs" = callPackage @@ -75527,8 +75856,8 @@ self: { websockets ]; description = "An API wrapper for Discord in Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -75560,8 +75889,8 @@ self: { unboxing-vector unordered-containers vector ]; description = "Discord verification bot"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -75581,8 +75910,8 @@ self: { hslogger http-client mtl req stm text time url ]; description = "An API wrapper for Discord in Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -75601,8 +75930,8 @@ self: { vector ]; description = "Type information for discord-hs"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -75614,8 +75943,8 @@ self: { sha256 = "0ykbfisrb6k8vsqx5avv99j0z4j4615hmql263h12jzhjxfzd22d"; libraryHaskellDepends = [ base time ]; description = "library for handling Discordian calendar dates"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -75628,7 +75957,7 @@ self: { libraryHaskellDepends = [ base bytestring text ]; librarySystemDepends = [ markdown ]; description = "Haskell bindings to the discount Markdown library"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {markdown = null;}; "discrete" = callPackage @@ -75641,8 +75970,8 @@ self: { editedCabalFile = "1ary1xyh2gy099p1madapfqhw2r1ys1pd8xg396xxaas4vjmqqkh"; libraryHaskellDepends = [ base ]; description = "replacement for enum"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -75654,7 +75983,7 @@ self: { sha256 = "1in70wlm6qcmc743v0w1lha4wffjinbwsgcyq44gzk0lb79ix6lb"; libraryHaskellDepends = [ base ]; description = "Discrete Intervals"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "discrete-space-map" = callPackage @@ -75669,32 +75998,35 @@ self: { adjunctions base comonad distributive keys semigroupoids ]; description = "A discrete space map"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "discrimination" = callPackage ({ mkDerivation, array, base, containers, contravariant, criterion - , deepseq, ghc-prim, hashable, integer-gmp, primitive, profunctors - , promises, semigroups, transformers, transformers-compat - , unordered-containers, vector, void + , deepseq, ghc-prim, hashable, integer-gmp, primitive, promises + , QuickCheck, quickcheck-instances, splitmix, tasty + , tasty-quickcheck, transformers, unordered-containers, vector + , vector-algorithms }: mkDerivation { pname = "discrimination"; - version = "0.4"; - sha256 = "085lhsvyp4d135p9yhgyl2s92f4cjdsghk1nsp8mjjddh6hxl20a"; - revision = "1"; - editedCabalFile = "0xi8c19cz3gm208g0dl6f2pks3skqmif2zml8j40r77ajxnf6anl"; + version = "0.4.1"; + sha256 = "0p0hryrp15bc8cjfr2hypkg35fy1m30hr19s9p6rj91cxxgjbfq2"; libraryHaskellDepends = [ array base containers contravariant deepseq ghc-prim hashable - integer-gmp primitive profunctors promises semigroups transformers - transformers-compat vector void + integer-gmp primitive promises transformers + ]; + testHaskellDepends = [ + base containers criterion deepseq hashable QuickCheck + quickcheck-instances splitmix tasty tasty-quickcheck + unordered-containers vector vector-algorithms ]; benchmarkHaskellDepends = [ - base containers criterion deepseq ghc-prim primitive - unordered-containers + base containers criterion deepseq ghc-prim hashable primitive + splitmix unordered-containers vector vector-algorithms ]; description = "Fast generic linear-time sorting, joins and container construction"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "disjoint-containers" = callPackage @@ -75713,8 +76045,8 @@ self: { tasty-quickcheck ]; description = "Disjoint containers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -75731,8 +76063,8 @@ self: { base containers HUnit mtl QuickCheck transformers ]; description = "Persistent disjoint-sets, a.k.a union-find."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -75745,8 +76077,8 @@ self: { libraryHaskellDepends = [ base primitive ref-tf vector ]; testHaskellDepends = [ base hspec primitive ref-tf vector ]; description = "Monadic disjoint set"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -75758,7 +76090,7 @@ self: { sha256 = "0yy4gp5jhfsj3gbk7gh3yplxkxxfsmrl84chp4wfr4v46ff9pc2m"; libraryHaskellDepends = [ array base ]; description = "Imperative ST/IO based disjoint set data structure"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "disk-free-space" = callPackage @@ -75771,7 +76103,7 @@ self: { editedCabalFile = "0x0wjycr3rhw9vcq51b4sz8cf7mcvx7whhywv72y25r9385lxb3i"; libraryHaskellDepends = [ base ]; description = "Retrieve information about disk space usage"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "diskhash" = callPackage @@ -75789,7 +76121,7 @@ self: { test-framework-hunit test-framework-quickcheck2 test-framework-th ]; description = "Disk-based hash table"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "display" = callPackage @@ -75800,7 +76132,7 @@ self: { sha256 = "0hn1zdis621h87r4mr35vic9473iwqcdjnmmfgs1j5dfsh62kd6b"; libraryHaskellDepends = [ base bytestring text ]; description = "Display things for humans to read"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "display-haskell-do" = callPackage @@ -75811,7 +76143,7 @@ self: { sha256 = "0j2rsmgmkfwy0w96y1qzr5vmhr16qgd46rka8ya17rakb4rzvi3q"; libraryHaskellDepends = [ aeson base text ]; description = "A display API for HaskellDO"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "disposable" = callPackage @@ -75822,7 +76154,7 @@ self: { sha256 = "0kzyzbhhjm005fi2n59j4in58kps4rciaza9pzi0qd2xnn9j5iqv"; libraryHaskellDepends = [ base ghcjs-base-stub stm ]; description = "Allows storing different resource-releasing actions together"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "dist-upload" = callPackage @@ -75836,8 +76168,8 @@ self: { libraryHaskellDepends = [ base Cabal directory filepath process ]; doHaddock = false; description = "Generate/Upload cabal package to Hackage"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -75851,8 +76183,8 @@ self: { editedCabalFile = "0iysmnl4p1fsb4zd0mmr6q7zc7w90jrwcxxm7vi38658x19r8qmq"; libraryHaskellDepends = [ base ]; description = "Useful distance datatype and functions"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -75865,7 +76197,7 @@ self: { libraryHaskellDepends = [ base time ]; testHaskellDepends = [ base hspec QuickCheck time ]; description = "Generate readable distances between times"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "distributed-closure" = callPackage @@ -75884,7 +76216,7 @@ self: { executableHaskellDepends = [ async base binary bytestring ]; testHaskellDepends = [ base binary hspec QuickCheck ]; description = "Serializable closures for distributed programming"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "distributed-fork" = callPackage @@ -75902,7 +76234,7 @@ self: { ]; testHaskellDepends = [ base tasty tasty-hunit unix ]; description = "Like 'forkIO', but uses remote machines instead of local threads"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "distributed-fork-aws-lambda" = callPackage @@ -75928,8 +76260,8 @@ self: { base distributed-fork tasty tasty-hunit text ]; description = "AWS Lambda backend for distributed-fork"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -75954,8 +76286,8 @@ self: { base binary bytestring network-transport-tcp ]; description = "Cloud Haskell: Erlang-style concurrency in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -75983,8 +76315,8 @@ self: { test-framework-hunit transformers ]; description = "Cloud Haskell Async API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -76007,8 +76339,8 @@ self: { rank1dynamic transformers unix ]; description = "Microsoft Azure backend for Cloud Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -76038,8 +76370,8 @@ self: { test-framework test-framework-hunit transformers ]; description = "The Cloud Haskell Application Platform"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -76055,8 +76387,8 @@ self: { base distributed-process ekg-core text unordered-containers ]; description = "Collect node stats for EKG"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -76092,8 +76424,8 @@ self: { test-framework-quickcheck2 time transformers unordered-containers ]; description = "Execution Framework for The Cloud Haskell Application Platform"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -76124,8 +76456,8 @@ self: { transformers unordered-containers ]; description = "Cloud Haskell Extras"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -76158,8 +76490,8 @@ self: { test-framework-quickcheck2 time transformers unordered-containers ]; description = "The Cloud Haskell implementation of Erlang/OTP gen_statem"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -76185,8 +76517,8 @@ self: { test-framework-hunit transformers ]; description = "monad-control style typeclass and transformer instances for Process monad"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -76203,8 +76535,8 @@ self: { transformers-base ]; description = "Orphan instances for MonadBase and MonadBaseControl"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -76225,8 +76557,8 @@ self: { ]; executableHaskellDepends = [ base distributed-process mtl ]; description = "Peer-to-peer node discovery for Cloud Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -76257,8 +76589,8 @@ self: { test-framework-quickcheck2 time transformers unordered-containers ]; description = "The Cloud Haskell Application Platform"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -76291,8 +76623,8 @@ self: { unordered-containers ]; description = "Cloud Haskell Extended Process Registry"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -76315,8 +76647,8 @@ self: { transformers ]; description = "Simple zero-configuration backend for Cloud Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -76348,8 +76680,8 @@ self: { test-framework-hunit time transformers unordered-containers ]; description = "Supervisors for The Cloud Haskell Application Platform"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -76369,8 +76701,8 @@ self: { stm test-framework test-framework-hunit ]; description = "Cloud Haskell Test Support"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -76407,8 +76739,8 @@ self: { test-framework-quickcheck2 time transformers unordered-containers ]; description = "Task Framework for The Cloud Haskell Application Platform"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -76432,8 +76764,8 @@ self: { test-framework ]; description = "Tests and test support tools for distributed-process"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -76462,8 +76794,8 @@ self: { network-transport-tcp transformers ]; description = "A Zookeeper back-end for Cloud Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -76479,7 +76811,7 @@ self: { base binary bytestring containers deepseq rank1dynamic ]; description = "Compositional, type-safe, polymorphic static values and closures"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "distribution" = callPackage @@ -76492,8 +76824,8 @@ self: { array base containers MonadRandom random ]; description = "Finite discrete probability distributions"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -76503,16 +76835,16 @@ self: { }: mkDerivation { pname = "distribution-nixpkgs"; - version = "1.3.1"; - sha256 = "1113qizh931inpim0ajfwihcvlp26n1l4bf36v0jakd34k70mm8g"; + version = "1.4.0"; + sha256 = "1935lg05bfzwrvppi11r05nhwa1gkmvv0xqv1kqkbc87bk6pvp5g"; libraryHaskellDepends = [ aeson base bytestring Cabal containers deepseq language-nix lens pretty process split ]; testHaskellDepends = [ base deepseq hspec lens ]; description = "Types and functions to manipulate the Nixpkgs distribution"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ peti ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ peti ]; }) {}; "distribution-opensuse" = callPackage @@ -76533,7 +76865,7 @@ self: { executableHaskellDepends = [ base containers text turtle ]; testHaskellDepends = [ base ]; description = "Types, functions, and tools to manipulate the openSUSE distribution"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "distribution-plot" = callPackage @@ -76549,8 +76881,8 @@ self: { distribution lens ]; description = "Easily plot distributions from the distribution package.."; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -76566,7 +76898,7 @@ self: { testHaskellDepends = [ base generic-deriving hspec ]; testToolDepends = [ hspec-discover ]; description = "Distributive functors -- Dual to Traversable"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ditto" = callPackage @@ -76579,7 +76911,7 @@ self: { base containers mtl semigroups text torsor ]; description = "ditto is a type-safe HTML form generation and validation library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ditto-lucid" = callPackage @@ -76590,7 +76922,7 @@ self: { sha256 = "1if543wf7div8ww90ifdh75i2w99lhbfh8pfnzmd1yaw2j1m35ff"; libraryHaskellDepends = [ base ditto lucid path-pieces text ]; description = "Add support for using lucid with Ditto"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "diversity" = callPackage @@ -76612,8 +76944,8 @@ self: { base containers fasta optparse-applicative pipes semigroups ]; description = "Quantify the diversity of a population"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -76651,8 +76983,8 @@ self: { time vector ]; description = "A wiki implemented with a firm theoretical foundation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -76668,8 +77000,8 @@ self: { ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "Hit drums with haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -76685,7 +77017,7 @@ self: { array base containers haskeline mtl pretty ]; description = "Generate Haskell code from a type"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "djinn-ghc" = callPackage @@ -76700,7 +77032,7 @@ self: { async base containers djinn-lib ghc mtl transformers ]; description = "Generate Haskell code from a type. Bridge from Djinn to GHC API."; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "djinn-lib" = callPackage @@ -76713,7 +77045,7 @@ self: { editedCabalFile = "0zz4q631wpxdm4h499j0m1kin4n1ahnwzb0x2jh6vd463i89xlbk"; libraryHaskellDepends = [ base containers mtl pretty ]; description = "Generate Haskell code from a type. Library extracted from djinn package."; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "djinn-th" = callPackage @@ -76726,30 +77058,30 @@ self: { base containers logict template-haskell ]; description = "Generate executable Haskell code from a type"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; "dl-fedora" = callPackage - ({ mkDerivation, base, bytestring, directory, filepath + ({ mkDerivation, base, bytestring, directory, extra, filepath , http-directory, http-types, optparse-applicative, regex-posix , simple-cmd, simple-cmd-args, text, time, unix, xdg-userdirs }: mkDerivation { pname = "dl-fedora"; - version = "0.7.5"; - sha256 = "1x4gdnb2k1ywvaniif7j2lsbavadaghvcpbdnms3x13s4cg18lyh"; + version = "0.7.6"; + sha256 = "03npp2cq1259w590am87v0r4q48pfjq2zb2b04hymlr6hi3a8xw5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base bytestring directory filepath http-directory http-types + base bytestring directory extra filepath http-directory http-types optparse-applicative regex-posix simple-cmd simple-cmd-args text time unix xdg-userdirs ]; description = "Fedora image download tool"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -76762,7 +77094,7 @@ self: { libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base Cabal QuickCheck ]; description = "Difference lists"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "dlist_1_0" = callPackage @@ -76774,8 +77106,8 @@ self: { libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base QuickCheck ]; description = "Difference lists"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "dlist-instances" = callPackage @@ -76786,7 +77118,7 @@ self: { sha256 = "0nsgrr25r4qxv2kpn7i20hra8jjkyllxfrhh5hml3ysjdz010jni"; libraryHaskellDepends = [ base dlist semigroups ]; description = "Difference lists instances"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "dlist-nonempty" = callPackage @@ -76810,7 +77142,7 @@ self: { base base-compat criterion dlist dlist-instances ]; description = "Non-empty difference lists"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "dmc" = callPackage @@ -76822,7 +77154,7 @@ self: { libraryHaskellDepends = [ base process ]; testHaskellDepends = [ base hspec process QuickCheck ]; description = "cmd for common cases"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "dmcc" = callPackage @@ -76850,8 +77182,8 @@ self: { monad-control monad-logger random stm text unix unliftio websockets ]; description = "AVAYA DMCC API bindings and WebSockets server for AVAYA"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -76867,8 +77199,8 @@ self: { base containers directory lens mtl process transformers ]; description = "Complete bindings to the dmenu and dmenu2 command line tools"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -76886,8 +77218,8 @@ self: { base containers directory dmenu lens mtl process transformers ]; description = "dmenu script for killing applications. Sortable by process id or CPU/MEM usage."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -76905,8 +77237,8 @@ self: { base containers directory dmenu lens mtl process transformers ]; description = "Mounting and unmounting linux devices as user with dmenu and pmount"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -76924,8 +77256,8 @@ self: { base containers directory dmenu lens mtl process transformers ]; description = "dmenu script for searching the web with customizable search engines"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -76950,7 +77282,7 @@ self: { doHaddock = false; testTarget = "spec"; description = "DNS library in Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "dnscache" = callPackage @@ -76968,8 +77300,8 @@ self: { ]; executableHaskellDepends = [ base ]; description = "Caching DNS resolver library and mass DNS resolver utility"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -76982,8 +77314,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers hsdns HUnit network ]; description = "Asynchronous DNS RBL lookup"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -76996,8 +77328,8 @@ self: { libraryHaskellDepends = [ base transformers ]; librarySystemDepends = [ dns_sd ]; description = "DNS service discovery bindings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {dns_sd = null;}; @@ -77011,7 +77343,7 @@ self: { testHaskellDepends = [ base hspec ]; benchmarkHaskellDepends = [ base criterion mtl text ]; description = "Do notation for free"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "do-notation" = callPackage @@ -77023,7 +77355,7 @@ self: { libraryHaskellDepends = [ base indexed ]; testHaskellDepends = [ base indexed ]; description = "Generalize do-notation to work on monads and indexed monads simultaneously"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "do-notation-dsl" = callPackage @@ -77039,7 +77371,7 @@ self: { base containers doctest doctest-discover temporary ]; description = "An alternative to monads"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "dobutok" = callPackage @@ -77050,8 +77382,8 @@ self: { sha256 = "06wi9p4gyxqiwaih1hg5p4wypi77si5y8c1akqsvh3ssr0sds74r"; libraryHaskellDepends = [ base ]; description = "Creates the time intervals for CLI changing messages on the screen"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -77063,7 +77395,7 @@ self: { sha256 = "1qps4zvk3qn2d93778cs2b6kf1k9fjgw5248hyx9v0n05crfw2i8"; libraryHaskellDepends = [ base ]; description = "The library is intended to print updated messages on the terminal screen"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "dobutokO-effects" = callPackage @@ -77074,7 +77406,7 @@ self: { sha256 = "10xpr7nqhx1djsgcgfr40v7axkl8a0fxx16vrpvr7h525ygyibp5"; libraryHaskellDepends = [ base dobutokO-frequency ]; description = "A library to deal with SoX effects and possibilities"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "dobutokO-frequency" = callPackage @@ -77085,7 +77417,7 @@ self: { sha256 = "11ngz39dqdcv6xkff9b590cbhd94gx1q71v6cz3birmhvbf8qwrm"; libraryHaskellDepends = [ base ]; description = "Helps to create experimental music. Working with frequencies and types."; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "dobutokO-poetry" = callPackage @@ -77107,7 +77439,7 @@ self: { uniqueness-periods vector ]; description = "Helps to order the 7 or less Ukrainian words to obtain somewhat suitable for poetry or music text"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "dobutokO-poetry-general" = callPackage @@ -77118,7 +77450,7 @@ self: { sha256 = "0gdhihblshxq70av2x8ni7vywdfic750kwq7qsbhagrqr71fvqb1"; libraryHaskellDepends = [ base mmsyn3 mmsyn6ukr mmsyn7s vector ]; description = "Helps to order the 7 or less words (first of all the Ukrainian ones) to obtain somewhat suitable for poetry or music text"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "dobutokO-poetry-general-languages" = callPackage @@ -77134,7 +77466,7 @@ self: { uniqueness-periods-general vector ]; description = "Helps to order the 7 or less words to obtain somewhat suitable for poetry or music text"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "dobutokO2" = callPackage @@ -77157,7 +77489,7 @@ self: { mmsyn7ukr process uniqueness-periods vector ]; description = "Helps to create experimental music from a file (or its part) and a Ukrainian text"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "dobutokO3" = callPackage @@ -77173,7 +77505,7 @@ self: { mmsyn7s mmsyn7ukr process vector ]; description = "Helps to create more complex experimental music from a file (especially timbre)"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "dobutokO4" = callPackage @@ -77189,7 +77521,7 @@ self: { vector-doublezip ]; description = "Helps to create experimental music. Uses SoX inside."; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "doc-review" = callPackage @@ -77214,8 +77546,8 @@ self: { xml-basic ]; description = "Document review Web application, like http://book.realworldhaskell.org/"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -77234,8 +77566,8 @@ self: { text ]; description = "Checks Haddock comments for pitfalls and version changes"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -77254,8 +77586,8 @@ self: { old-locale tagsoup time ]; description = "Generate an HTML index of installed Haskell packages and their documentation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -77289,8 +77621,8 @@ self: { vector ]; description = "An API client for docker written in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -77313,8 +77645,8 @@ self: { turtle ]; description = "Builds a docker image and caches all of its intermediate stages"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -77348,8 +77680,8 @@ self: { ]; testHaskellDepends = [ base HTF text vector ]; description = "A build tool for multiple docker image layers"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -77362,7 +77694,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "A Haskell DSL for generating Dockerfiles"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "dockerfile-creator" = callPackage @@ -77383,7 +77715,7 @@ self: { hspec language-docker megaparsec mtl process template-haskell text th-lift th-lift-instances time ]; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "doclayout" = callPackage @@ -77401,7 +77733,7 @@ self: { ]; benchmarkHaskellDepends = [ base criterion mtl text ]; description = "A prettyprinting library for laying out text documents"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "docopt" = callPackage @@ -77421,8 +77753,8 @@ self: { template-haskell text th-lift ]; description = "A command-line interface parser that will make you smile"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -77443,7 +77775,7 @@ self: { unordered-containers vinyl yaml ]; description = "Vinyl-based records with hierarchical field names, default values and documentation"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "docstrings" = callPackage @@ -77456,7 +77788,7 @@ self: { base containers heredoc template-haskell ]; description = "Docstrings for documentation in the repl"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "doctemplates" = callPackage @@ -77482,7 +77814,7 @@ self: { aeson base containers criterion doclayout filepath mtl text ]; description = "Pandoc-style document templates"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "doctest" = callPackage @@ -77511,7 +77843,7 @@ self: { stringbuilder syb transformers ]; description = "Test interactive Haskell examples"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "doctest_0_17" = callPackage @@ -77540,8 +77872,8 @@ self: { stringbuilder syb transformers ]; description = "Test interactive Haskell examples"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "doctest-discover" = callPackage @@ -77563,7 +77895,7 @@ self: { testHaskellDepends = [ base doctest ]; doHaddock = false; description = "Easy way to run doctests via cabal"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "doctest-discover-configurator" = callPackage @@ -77587,8 +77919,8 @@ self: { testHaskellDepends = [ base doctest ]; doHaddock = false; description = "Easy way to run doctests via cabal (no aeson dependency, uses configurator instead)"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -77604,8 +77936,8 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; description = "Generate driver file for doctest's cabal integration"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -77621,7 +77953,7 @@ self: { base doctest-lib QuickCheck semigroups transformers ]; description = "Run doctest's in a Cabal.Test.exitcode-stdio environment"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "doctest-lib" = callPackage @@ -77632,7 +77964,7 @@ self: { sha256 = "1vswam0dhw52dihgnzirh18gqs8rj8h6jd7pl6y1mg2f9f9zmih2"; libraryHaskellDepends = [ base ]; description = "Parts of doctest exposed as library"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "doctest-prop" = callPackage @@ -77644,8 +77976,8 @@ self: { libraryHaskellDepends = [ base HUnit QuickCheck ]; testHaskellDepends = [ base doctest HUnit QuickCheck ]; description = "Allow QuickCheck-style property testing within doctest"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -77662,8 +77994,8 @@ self: { servant-client text ]; description = "Low-level bindings to the DocuSign API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -77680,8 +78012,8 @@ self: { servant-client text ]; description = "Low-level bindings to the DocuSign API (only what is necessary for docusign-client)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -77701,8 +78033,8 @@ self: { http-types servant-client servant-client-core text uuid ]; description = "Client bindings for the DocuSign API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -77721,8 +78053,8 @@ self: { optparse-generic text uuid ]; description = "DocuSign examples"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -77749,8 +78081,8 @@ self: { tasty-hunit temporary ]; description = "Documentation generator for Vim plug-ins"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -77779,8 +78111,8 @@ self: { urlencoded utility-ht ]; description = "Automatic Bibtex and fulltext of scientific articles"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -77801,7 +78133,7 @@ self: { test-framework-quickcheck2 test-framework-th ]; description = "Flag packer & handler for flaggable data"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "dollaridoos" = callPackage @@ -77812,7 +78144,7 @@ self: { sha256 = "1pipbyfpny8mq540rpfkgkwbc3mc13yf6xm1h9vxm0fnaa8kcbw9"; libraryHaskellDepends = [ base profunctors semigroups ]; description = "A newtype for monetary values"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "dom-events" = callPackage @@ -77824,7 +78156,7 @@ self: { libraryHaskellDepends = [ base text unordered-containers ]; testHaskellDepends = [ base ]; description = "DOM Events expressed as Haskell types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "dom-lt" = callPackage @@ -77832,13 +78164,13 @@ self: { }: mkDerivation { pname = "dom-lt"; - version = "0.2.2"; - sha256 = "0hf0wf4fl671awf87f0r7r4a57cgm88x666081c0wy16qchahffw"; + version = "0.2.2.1"; + sha256 = "1gaavi6fqzsl5di889880m110a1hrlylbjckm6bg24sv8nn96glp"; libraryHaskellDepends = [ array base containers ]; testHaskellDepends = [ base containers HUnit ]; benchmarkHaskellDepends = [ base containers criterion deepseq ]; description = "The Lengauer-Tarjan graph dominators algorithm"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "dom-parser" = callPackage @@ -77859,7 +78191,7 @@ self: { xml-conduit ]; description = "Simple monadic DOM parser"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "dom-selector" = callPackage @@ -77879,7 +78211,7 @@ self: { template-haskell text th-lift xml-conduit ]; description = "DOM traversal by CSS selectors for xml-conduit package"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "domain" = callPackage @@ -77903,8 +78235,8 @@ self: { tasty-hunit tasty-quickcheck template-haskell text th-orphans ]; description = "Codegen helping you define domain models"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -77923,7 +78255,7 @@ self: { ]; testHaskellDepends = [ base doctest pretty-simple ]; description = "Domain authentication library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "domain-core" = callPackage @@ -77939,8 +78271,8 @@ self: { th-lift-instances ]; description = "Low-level API of \"domain\""; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -77959,8 +78291,8 @@ self: { ]; testHaskellDepends = [ domain optics rerebase ]; description = "Integration of domain with optics"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -77976,7 +78308,7 @@ self: { executableHaskellDepends = [ base containers lens mtl random ]; testHaskellDepends = [ base containers hspec lens mtl random ]; description = "A simulator for the board game Dominion"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "domplate" = callPackage @@ -77992,8 +78324,8 @@ self: { yaml ]; description = "A simple templating library using HTML5 as its template language"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -78007,7 +78339,7 @@ self: { isExecutable = true; libraryHaskellDepends = [ base text ]; description = "Datatypes and encoding for graphviz dot files"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "dot-linker" = callPackage @@ -78033,8 +78365,8 @@ self: { unordered-containers ]; description = "Initial project template from stack"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -78048,7 +78380,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base containers graphviz hxt text ]; description = "Converter from GraphViz .dot format to yEd GraphML"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "dotenv" = callPackage @@ -78076,7 +78408,7 @@ self: { hspec-megaparsec megaparsec process text transformers yaml ]; description = "Loads environment variables from dotenv files"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "dotfs" = callPackage @@ -78107,8 +78439,8 @@ self: { ]; doHaddock = false; description = "Filesystem to manage and parse dotfiles"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -78122,7 +78454,7 @@ self: { isExecutable = true; libraryHaskellDepends = [ base containers ]; description = "A simple interface for building .dot graph files."; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "dotnet-timespan" = callPackage @@ -78133,7 +78465,7 @@ self: { sha256 = "1hws424hf4ifijmz2xn3jvwvayll5jig83bgkl9zavwipkzqvjnq"; libraryHaskellDepends = [ base ]; description = ".NET TimeSpan"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "double-conversion" = callPackage @@ -78150,7 +78482,7 @@ self: { test-framework-quickcheck2 text ]; description = "Fast conversion between double precision floating point and text"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "double-extra" = callPackage @@ -78166,7 +78498,7 @@ self: { rawstring-qm text ]; description = "Missing presentations for Double numbers (fixed, scientific etc.)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "double-metaphone" = callPackage @@ -78188,8 +78520,8 @@ self: { sha256 = "0libb7w3a8ffcr08x6s3xqzhbkxb8n111f53g638jr0xpz3r98yv"; libraryHaskellDepends = [ base ]; description = "Doublify API toolkit for Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -78201,7 +78533,7 @@ self: { sha256 = "19h3inxxxcblsbakm93mblhg8g68qc699c13cnska65ij50h3jwd"; libraryHaskellDepends = [ acl2 base ]; description = "The Dove verification language"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "dovin" = callPackage @@ -78228,7 +78560,7 @@ self: { ]; testToolDepends = [ tasty-discover ]; description = "A proof assistant for Magic: The Gathering puzzles"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "dow" = callPackage @@ -78246,8 +78578,8 @@ self: { array base directory elerea GLFW mersenne-random OpenGL ]; description = "Dungeons of Wor"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -78260,7 +78592,7 @@ self: { libraryHaskellDepends = [ base bytestring feed tagsoup xml ]; testHaskellDepends = [ base hspec ]; description = "High-level file download based on URLs"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "download-curl" = callPackage @@ -78273,7 +78605,7 @@ self: { editedCabalFile = "032f19gn7bnx3fpfdwclm1z1hsxaya6yml7p2hcg3b2ad6d11pyl"; libraryHaskellDepends = [ base bytestring curl feed tagsoup xml ]; description = "High-level file download based on URLs"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "download-media-content" = callPackage @@ -78290,8 +78622,8 @@ self: { base bytestring filepath http-enumerator tagsoup text ]; description = "Simple tool to download images from RSS feeds (e.g. Flickr, Picasa)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -78308,8 +78640,8 @@ self: { base directory filepath network-uri process safe ]; description = "A small, low-dependency library that provides turn-key file download over HTTP and HTTPS"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -78321,8 +78653,8 @@ self: { sha256 = "0sqvxyj3aybqvjlrz2a93lnp1vbjiqikysm575wizri2rd3vfj1l"; libraryHaskellDepends = [ base ]; description = "A Haskell library for using Dozenal (Duodecimal - Base 12) numbers"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -78342,8 +78674,8 @@ self: { reflection scientific text transformers ]; description = "dozens api library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -78357,8 +78689,8 @@ self: { array base ghc-prim pretty random vector ]; description = "Data Parallel Haskell common config and debugging functions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -78377,8 +78709,8 @@ self: { old-time parseargs random vector ]; description = "Data Parallel Haskell example programs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -78395,8 +78727,8 @@ self: { template-haskell vector ]; description = "Data Parallel Haskell common definitions used by other dph-lifted packages"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -78412,8 +78744,8 @@ self: { array base dph-base dph-prim-par ghc random template-haskell vector ]; description = "Data Parallel Haskell lifted array combinators. (deprecated version)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -78430,8 +78762,8 @@ self: { pretty random template-haskell vector ]; description = "Data Parallel Haskell lifted array combinators"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -78443,7 +78775,7 @@ self: { sha256 = "0csgd8ghbxv1vwp95dn98qv1zp8229fffm9j274bmjg857588i97"; doHaddock = false; description = "(deprecated)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "dph-prim-interface" = callPackage @@ -78454,8 +78786,8 @@ self: { sha256 = "17m03gylc61d7mx26rz70kwmi014rv1g14683vraa1b77pci5h8j"; libraryHaskellDepends = [ base dph-base random vector ]; description = "Data Parallel Haskell segmented arrays. (abstract interface)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -78472,8 +78804,8 @@ self: { vector ]; description = "Data Parallel Haskell segmented arrays. (production version)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -78489,8 +78821,8 @@ self: { base dph-base dph-prim-interface ghc-prim primitive random vector ]; description = "Data Parallel Haskell segmented arrays. (sequential implementation)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -78502,7 +78834,7 @@ self: { sha256 = "10s6qq4ayh85wvhnyl7dfdr72a76irvg83s71lww8ig988599ygp"; doHaddock = false; description = "(deprecated)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "dpkg" = callPackage @@ -78522,8 +78854,8 @@ self: { testSystemDepends = [ dpkg ]; testPkgconfigDepends = [ libdpkg ]; description = "libdpkg bindings"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) dpkg; libdpkg = null;}; @@ -78537,8 +78869,8 @@ self: { base containers deepseq random semigroups ]; description = "A generic implementation of dynamic partial-order reduction (DPOR) for testing arbitrary models of concurrency"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -78562,7 +78894,7 @@ self: { optparse-applicative streaming-commons unix unordered-containers ]; description = "a lightweight DNS proxy server"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "drClickOn" = callPackage @@ -78573,8 +78905,8 @@ self: { sha256 = "10rcmqa2x5xlh5pqfsg9dagf2lmrwc2bby3zklzv3x4s3yqg2ar3"; libraryHaskellDepends = [ base containers ]; description = "Monadic FRP"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -78595,8 +78927,8 @@ self: { template-haskell text transformers ]; description = "Automatic derivation of optimized QuickCheck random generators"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -78614,7 +78946,7 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "playing draw poker"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "drawille" = callPackage @@ -78628,8 +78960,8 @@ self: { libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers hspec QuickCheck ]; description = "A port of asciimoo's drawille to haskell"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -78652,8 +78984,8 @@ self: { time unordered-containers vector ]; description = "Library and program for querying DVB (Dresdner Verkehrsbetriebe AG)"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -78663,15 +78995,15 @@ self: { }: mkDerivation { pname = "drifter"; - version = "0.2.4"; - sha256 = "012x67lncwlrf2kjmfki4lz3sclpj1gjf7wyszagwm523grp1qly"; + version = "0.3.0"; + sha256 = "079y7yzws7lghgazkc7qprz43q4bv0qjnxh7rmcrrwfs5acm1x34"; libraryHaskellDepends = [ base containers fgl text ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck text ]; description = "Simple schema management for arbitrary databases"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -78692,8 +79024,8 @@ self: { base drifter either postgresql-simple tasty tasty-hunit text ]; description = "PostgreSQL support for the drifter schema migration tool"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -78713,8 +79045,8 @@ self: { tasty-hunit text time transformers ]; description = "SQLite support for the drifter schema migraiton tool"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -78726,7 +79058,7 @@ self: { sha256 = "1c5mv0klhdavbsaa1mng0q15vy0cz6x8ijfzgaf1f18yyxvb0q1q"; libraryHaskellDepends = [ base exceptions mtl transformers ]; description = "Boozy streaming library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "drmaa" = callPackage @@ -78739,8 +79071,8 @@ self: { librarySystemDepends = [ drmaa ]; libraryToolDepends = [ c2hs ]; description = "A Haskell bindings to the DRMAA C library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {drmaa = null;}; @@ -78759,8 +79091,8 @@ self: { aeson base bytestring containers extensible formatting hspec microlens req servant-server text warp ]; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -78789,8 +79121,8 @@ self: { servant-client-core text ]; description = "Dropbox API client"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -78812,8 +79144,8 @@ self: { urlencoded utf8-string ]; description = "A library to access the Dropbox HTTP API"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -78832,8 +79164,8 @@ self: { time ]; description = "A command line tool for resolving dropbox conflicts. Deprecated! Please use confsolve."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -78849,7 +79181,7 @@ self: { isExecutable = true; libraryHaskellDepends = [ array base bytestring pureMD5 ]; description = "An implementation of the Drunken Bishop visual fingerprinting algorithm"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ds-kanren" = callPackage @@ -78863,8 +79195,8 @@ self: { libraryHaskellDepends = [ base containers logict ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; description = "A subset of the miniKanren language"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -78884,8 +79216,8 @@ self: { string-conversions ]; description = "Helper functions for setting up Double Submit Cookie defense for forms"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -78913,8 +79245,8 @@ self: { test-framework-quickcheck2 text vector ]; description = "SQL backend for Database Supported Haskell (DSH)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -78932,8 +79264,8 @@ self: { parallel primitive repa strict transformers vector ]; description = "DSMC library for rarefied gas dynamics"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -78953,8 +79285,8 @@ self: { mtl repa strict transformers vector ]; description = "DSMC toolkit for rarefied gas dynamics"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -78966,8 +79298,8 @@ self: { sha256 = "1vv32n736ncjsy4psp8zlqmpp0r7mncjq65zwkhq5i99jx4chb1q"; libraryHaskellDepends = [ base parsec ]; description = "Haskell Doge Serialized Object Notation Parser"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -78979,8 +79311,8 @@ self: { sha256 = "1zflz9vhcz7psssn6hrizmwdmrvpagxhl0648k6f1n9xj50kp99y"; libraryHaskellDepends = [ base parsec ]; description = "DSON parser"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -78995,7 +79327,7 @@ self: { libraryHaskellDepends = [ array base containers random ]; testHaskellDepends = [ array base containers QuickCheck ]; description = "Haskell Digital Signal Processing"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2Only; }) {}; "dstring" = callPackage @@ -79006,8 +79338,8 @@ self: { sha256 = "15zy1dhfs87hxq1qm54ym0pdhvg7l76m7vy5y06dnksb1sblhaqm"; libraryHaskellDepends = [ base base-unicode-symbols dlist ]; description = "Difference strings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -79030,7 +79362,7 @@ self: { text vector ]; description = "DSV (delimiter-separated values)"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "dtab" = callPackage @@ -79050,7 +79382,7 @@ self: { libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ base bytestring ]; description = "Harmonix (Guitar Hero, Rock Band) DTA/DTB metadata library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "dtd" = callPackage @@ -79069,8 +79401,8 @@ self: { uri-conduit xml-catalog xml-conduit xml-types ]; description = "Parse and render DTD files (deprecated)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -79086,8 +79418,8 @@ self: { attoparsec base containers dtd-types text xml-types ]; description = "Parse and render XML DTDs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -79099,7 +79431,7 @@ self: { sha256 = "1h5ypjnpjim2lwlc6jfp8ixqg7zbkj7fg2kpnlwnyj29n9g58rka"; libraryHaskellDepends = [ base text xml-types ]; description = "Basic types for representing XML DTDs"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "dtrace" = callPackage @@ -79112,7 +79444,7 @@ self: { isExecutable = true; libraryHaskellDepends = [ base ]; description = "Haskell interface to the DTrace system tracing utility"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "dtw" = callPackage @@ -79129,8 +79461,8 @@ self: { test-framework-quickcheck2 thyme vector vector-space ]; description = "(Fast) Dynamic Time Warping"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -79144,7 +79476,7 @@ self: { editedCabalFile = "1cm80lc3p8bpzj0crxccx2fp33p171gz4j56r9fc5g5kza390nrb"; libraryHaskellDepends = [ base ]; description = "Dual category"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "dual-game" = callPackage @@ -79163,7 +79495,7 @@ self: { base bifunctors cereal gloss network websockets ]; description = "Network multiplayer 2D shooting game"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "dual-tree" = callPackage @@ -79181,8 +79513,8 @@ self: { base monoid-extras QuickCheck semigroups testing-feat ]; description = "Rose trees with cached and accumulating monoidal annotations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -79200,7 +79532,7 @@ self: { ]; description = "Automatically generate dual constructions"; license = "AGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -79226,7 +79558,7 @@ self: { tasty-quickcheck text time uri-bytestring xml-conduit xml-types ]; description = "XML streaming parser/renderer for the Dublin Core standard elements"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "duckling" = callPackage @@ -79257,7 +79589,7 @@ self: { ]; description = "A Haskell library for parsing text into structured data"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "duet" = callPackage @@ -79284,8 +79616,8 @@ self: { monad-logger mtl parsec syb text ]; description = "A tiny language, a subset of Haskell (with type classes) aimed at aiding teachers to teach Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -79295,18 +79627,16 @@ self: { }: mkDerivation { pname = "dumb-cas"; - version = "0.2.0.0"; - sha256 = "1zcq9r2p5gjpfivprjp9hspqpayrj9in2jck5vf5ibxpc671isb4"; - revision = "2"; - editedCabalFile = "1a6xj7qszi815xr5nks13593kc90wqalq78kxsnmmhn2m2r1aq2q"; + version = "0.2.1.0"; + sha256 = "1fxamg2npi1arhsjyxgbzcn50m3y9kn9ganc79gbn8xcx252rp63"; libraryHaskellDepends = [ base containers decimal-literals hashable template-haskell unordered-containers ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "A computer “algebra” system that knows nothing about algebra, at the core"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -79327,7 +79657,7 @@ self: { template-haskell text ]; description = "Dumps the names and values of expressions to ease debugging"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "dump-core" = callPackage @@ -79344,8 +79674,8 @@ self: { text ]; description = "A plug-in for rendering GHC core"; - license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -79362,7 +79692,7 @@ self: { ]; testHaskellDepends = [ base tasty tasty-hunit transformers ]; description = "Generalised reactive framework supporting classic, arrowized and monadic FRP"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "dunai-core" = callPackage @@ -79376,8 +79706,8 @@ self: { base MonadRandom transformers transformers-base ]; description = "Generalised reactive framework supporting classic, arrowized and monadic FRP. (Core library fork.)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -79391,7 +79721,7 @@ self: { base dunai normaldistribution QuickCheck ]; description = "Testing library for Dunai"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "duplo" = callPackage @@ -79427,8 +79757,8 @@ self: { base HUnit MissingH QuickCheck tasty tasty-hunit tasty-quickcheck ]; description = "Frontend development build tool"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -79442,8 +79772,8 @@ self: { editedCabalFile = "018pwi48hx6jcy9gkbbc4gcbjxa2n8b4lbfmd18mnm49ymwyyqlv"; libraryHaskellDepends = [ base bytestring directory filepath ]; description = "durable/atomic file system writes (from rio package)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -79460,7 +79790,7 @@ self: { base doctest hspec parsec template-haskell time ]; description = "A tiny compile-time time utility library inspired by zeit/ms"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "dustme" = callPackage @@ -79482,7 +79812,7 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "Initial project template from stack"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "dvault" = callPackage @@ -79500,8 +79830,8 @@ self: { process vector ]; description = "Dead simple password manager"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -79524,8 +79854,8 @@ self: { test-framework-quickcheck2 unordered-containers ]; description = "Efficient automatic differentiation and code generation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -79539,8 +79869,8 @@ self: { libraryPkgconfigDepends = [ dvdread ]; libraryToolDepends = [ c2hs ]; description = "A monadic interface to libdvdread"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {dvdread = null;}; @@ -79552,8 +79882,8 @@ self: { sha256 = "0dp6acmrvlns85nzbbh65vd6fjam04h11kxd9bk6j6hqa2qaqa43"; libraryHaskellDepends = [ base bytestring filepath transformers ]; description = "Read/write DVI and TFM file"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -79566,7 +79896,7 @@ self: { libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "Dvorak encoding for Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "dwarf" = callPackage @@ -79578,8 +79908,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base binary bytestring containers ]; description = "Parser for DWARF debug format"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -79595,7 +79925,7 @@ self: { base binary bytestring containers text text-show transformers ]; description = "Parser for DWARF debug format"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "dwarfadt" = callPackage @@ -79614,8 +79944,8 @@ self: { ]; executableHaskellDepends = [ base containers dwarf-el ]; description = "High-level wrapper around the dwarf library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -79628,7 +79958,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "A minimal testing library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "dx9base" = callPackage @@ -79639,8 +79969,8 @@ self: { sha256 = "16gwlpxfgh78sx7cb2ryqklhz5smhwk51ma260d6rg082nhy5y3i"; libraryHaskellDepends = [ base Win32 ]; description = "Backend for a binding to the Microsoft DirectX 9 API"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + platforms = [ "armv7l-linux" ]; }) {}; "dx9d3d" = callPackage @@ -79652,8 +79982,8 @@ self: { libraryHaskellDepends = [ base dx9base Win32 ]; librarySystemDepends = [ d3d9 ]; description = "A binding to the Microsoft DirectX 9 API"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + platforms = [ "armv7l-linux" ]; }) {d3d9 = null;}; "dx9d3dx" = callPackage @@ -79665,8 +79995,8 @@ self: { libraryHaskellDepends = [ base dx9base dx9d3d Win32 ]; librarySystemDepends = [ d3dx9 ]; description = "A binding to the Microsoft DirectX 9 D3DX API"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + platforms = [ "armv7l-linux" ]; }) {d3dx9 = null;}; "dyckword" = callPackage @@ -79682,8 +80012,8 @@ self: { libraryHaskellDepends = [ base exact-combinatorics text ]; testHaskellDepends = [ ansi-terminal base hspec text ]; description = "A library for working with binary Dyck words"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -79697,8 +80027,8 @@ self: { isExecutable = true; libraryHaskellDepends = [ base generics-sop ]; description = "Programatically identify space leaks in your program"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -79715,7 +80045,7 @@ self: { text unordered-containers vector ]; description = "A dynamic type for Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "dynamic-cabal" = callPackage @@ -79736,8 +80066,8 @@ self: { tasty-hunit tasty-th ]; description = "Access the functions from the Cabal library without depending on it"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -79754,7 +80084,7 @@ self: { base cairo colour GLFW-b GLUtil OpenGL pango pipes transformers ]; description = "Draw and update graphs in real time with OpenGL"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "dynamic-graphs" = callPackage @@ -79781,8 +80111,8 @@ self: { ]; benchmarkHaskellDepends = [ base criterion primitive ]; description = "Dynamic graph algorithms"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -79794,7 +80124,7 @@ self: { sha256 = "1agk7q556yf6v776568apvc4dgvxiqfshina12f69ky8afvjr6qz"; libraryHaskellDepends = [ base containers template-haskell unix ]; description = "Automatically derive dynamic linking methods from a data type"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "dynamic-loader" = callPackage @@ -79810,7 +80140,7 @@ self: { base directory ghc-prim hashable hashtables time transformers ]; description = "lightweight loader of GHC-based modules or packages"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "dynamic-mvector" = callPackage @@ -79821,8 +80151,8 @@ self: { sha256 = "0hsy9mgnl2yf94kqxy69wgmr5hjqxpp55qvij3f53sxxywjrxdi2"; libraryHaskellDepends = [ base primitive vector ]; description = "A wrapper around MVector that enables pushing, popping and extending"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -79841,8 +80171,8 @@ self: { base doctest ghc hspec lens QuickCheck transformers ]; description = "Object-oriented programming with duck typing and singleton classes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -79869,8 +80199,8 @@ self: { vector-space ]; description = "Interactive diagram windows"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -79891,8 +80221,8 @@ self: { HUnit-Plus unordered-containers utf8-string ]; description = "A pretty-print library that employs a dynamic programming algorithm for optimal rendering"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -79908,7 +80238,7 @@ self: { base binary bytestring hashable unordered-containers ]; description = "Optionally serializable dynamic state keyed by type"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }) {}; "dynamodb-simple" = callPackage @@ -79935,8 +80265,8 @@ self: { unordered-containers ]; description = "Typesafe library for working with DynamoDB database"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -79949,8 +80279,8 @@ self: { libraryHaskellDepends = [ base ghc ghc-paths ]; testHaskellDepends = [ base ghc ghc-paths hspec ]; description = "Dynamically runtime loading packages"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -79982,8 +80312,8 @@ self: { test-framework-hunit test-framework-quickcheck2 vector ]; description = "your dynamic optimization buddy"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -80000,7 +80330,7 @@ self: { process time unix xdg-basedir ]; description = "Dynamic reconfiguration in Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "dywapitchtrack" = callPackage @@ -80011,8 +80341,8 @@ self: { sha256 = "1fmn8aypgcvmbpfs0dr8yfkqq4p5jw2mh0wldjhhl6bffymkszgf"; libraryHaskellDepends = [ base bytestring transformers ]; description = "Bindings to the dywapitchtrack pitch tracking library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -80048,8 +80378,8 @@ self: { unordered-containers vector ]; description = "Configure dzen2 bars in Dhall language"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -80062,7 +80392,7 @@ self: { libraryHaskellDepends = [ base colour process ]; description = "Utilities for creating inputs for dzen"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -80076,8 +80406,8 @@ self: { libraryHaskellDepends = [ base dlist template-haskell ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "Template Haskell library for writing monadic expressions more easily"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -80092,7 +80422,7 @@ self: { libraryHaskellDepends = [ base bytestring network ]; description = "Socket operations with timeouts"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "eap" = callPackage @@ -80109,7 +80439,7 @@ self: { base binary bytestring cryptonite memory mtl pretty-hex ]; description = "Extensible Authentication Protocol (EAP)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "earclipper" = callPackage @@ -80124,8 +80454,8 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base filepath hspec ]; description = "Ear Clipping Triangulation"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -80137,7 +80467,7 @@ self: { sha256 = "0nssl7n697rzwlfb5lq4kl64j4mrb4i19rp5kzjpmc7iin9fzxsf"; libraryHaskellDepends = [ base vector ]; description = "Binding to C++ earcut library"; - license = stdenv.lib.licenses.isc; + license = lib.licenses.isc; }) {}; "early" = callPackage @@ -80158,8 +80488,8 @@ self: { ]; testHaskellDepends = [ base ]; description = "Early return syntax in do-notation (GHC plugin)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -80171,7 +80501,7 @@ self: { sha256 = "1psg2d64igvjgskzk8y92xxbh14rzlnvcpv8l3nqx8x5950hxdxk"; libraryHaskellDepends = [ base data-default ]; description = "Robert Penner's easing equations"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "easy-api" = callPackage @@ -80186,8 +80516,8 @@ self: { aeson base bytestring either http-conduit mtl resourcet text ]; description = "Utility code for building HTTP API bindings more quickly"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -80200,7 +80530,7 @@ self: { libraryHaskellDepends = [ base hspec ]; testHaskellDepends = [ base hspec ]; description = "Parses command line arguments"; - license = stdenv.lib.licenses.lgpl3; + license = lib.licenses.lgpl3; }) {}; "easy-bitcoin" = callPackage @@ -80217,8 +80547,8 @@ self: { deepseq lens postgresql-simple safe text ]; description = "types and functions for bitcoin applications"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -80230,7 +80560,7 @@ self: { sha256 = "0zmlcz723051qpn8l8vi51c5rx1blwrw4094jcshkmj8p9r2xxaj"; libraryHaskellDepends = [ base directory filepath time unix ]; description = "Cross-platform File handling"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "easyjson" = callPackage @@ -80245,8 +80575,8 @@ self: { base mtl parsec text unordered-containers vector ]; description = "Haskell JSON library with an emphasis on simplicity, minimal dependencies, and ease of use"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -80258,8 +80588,8 @@ self: { sha256 = "18kndgvdj2apjpfga6fp7m16y1gx8zrwp3c5vfj03sx4v6jvciqk"; libraryHaskellDepends = [ base process ]; description = "A tiny plotting library, utilizes gnuplot for plotting"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -80271,7 +80601,7 @@ self: { sha256 = "0vj9j41706lalxc2sankpnxrn3mg650wfd4rl6yw32pns6bdq86f"; libraryHaskellDepends = [ base bytestring containers mtl zlib ]; description = "User-friendly creation of EPS, PostScript, and PDF files"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "easytensor" = callPackage @@ -80292,8 +80622,8 @@ self: { base constraints-deriving dimensions time ]; description = "Pure, type-indexed haskell vector, matrix, and tensor library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -80305,8 +80635,8 @@ self: { sha256 = "0gi8p76x7h78frv3yrg6a7qnzjczx3j7warqclc36pkwv050dn3i"; libraryHaskellDepends = [ base dimensions easytensor vulkan-api ]; description = "Use easytensor with vulkan-api"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -80326,8 +80656,8 @@ self: { base directory hedgehog profunctors transformers unix ]; description = "Simple, expressive testing library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -80339,8 +80669,8 @@ self: { sha256 = "0r3pl63fxrrfafwp3791xh0c47pb4jqqcm9lk52g0gaqg0s8x5qk"; libraryHaskellDepends = [ base time ]; description = "Time in ebeats"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -80359,8 +80689,8 @@ self: { aeson base bytestring cond directory parsec ]; description = "Parser combinators & EBNF, BFFs!"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -80380,7 +80710,7 @@ self: { QuickCheck SHA ]; description = "The Amazon EC2 style signature calculator"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ec2-unikernel" = callPackage @@ -80399,8 +80729,8 @@ self: { directory filepath lens process semigroups temporary text time unix ]; description = "A handy tool for uploading unikernels to Amazon's EC2"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -80419,8 +80749,8 @@ self: { testHaskellDepends = [ base base16-bytestring bytestring Cabal ]; benchmarkHaskellDepends = [ base bytestring criterion random ]; description = "Elliptic Curve Cryptography for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -80432,8 +80762,8 @@ self: { sha256 = "1j2h568k2j8kpclvam3hghi13ddyas5d7c8nf469gwr80wmnyqxs"; libraryHaskellDepends = [ base bytestring eccrypto ]; description = "provides \"ed25519\" API using \"eccrypto\""; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -80450,7 +80780,7 @@ self: { ]; description = "Basic ECDSA signing implementation"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "echo" = callPackage @@ -80465,7 +80795,7 @@ self: { isExecutable = true; libraryHaskellDepends = [ base process ]; description = "A cross-platform, cross-console way to handle echoing terminal input"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ecma262" = callPackage @@ -80483,8 +80813,8 @@ self: { ]; executableHaskellDepends = [ base ]; description = "A ECMA-262 interpreter library"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -80500,7 +80830,7 @@ self: { base containers kan-extensions mtl transformers ]; description = "A GHC.Generics based entity component system."; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ecu" = callPackage @@ -80518,8 +80848,8 @@ self: { ]; executableSystemDepends = [ canlib ]; description = "Tools for automotive ECU development"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {canlib = null;}; @@ -80539,7 +80869,7 @@ self: { ]; benchmarkHaskellDepends = [ base bytestring criterion deepseq ]; description = "Ed25519 cryptographic signatures"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "ed25519-donna" = callPackage @@ -80550,7 +80880,7 @@ self: { sha256 = "0kpqh4fzij9152sazbwxmbzv1b16ih17lwmr1bkii2xi5kkjbnvd"; libraryHaskellDepends = [ base bytestring crypto-api ]; description = "Haskell bindings to ed25519-donna (Elliptical Curve Signature Scheme)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "eddie" = callPackage @@ -80567,8 +80897,8 @@ self: { base bifunctors classy-prelude hint optparse-applicative safe ]; description = "Command line file filtering with haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -80600,8 +80930,8 @@ self: { tasty-golden text ]; description = "Templating language with similar syntax and features to Liquid or Jinja2"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -80613,8 +80943,8 @@ self: { sha256 = "1wbasb9lsw2rycl2ibd8r9p3d9dl8gd75390qsc83znqx802ylxj"; libraryHaskellDepends = [ base containers deepseq parallel ]; description = "Semi-explicit parallel programming library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -80626,8 +80956,8 @@ self: { sha256 = "1bf5zw1x4f6a801ig2b8b84kbnmp0asn804gkm18v9fjcchz3j9q"; libraryHaskellDepends = [ base edenmodules parallel ]; description = "Semi-explicit parallel programming skeleton library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -80648,8 +80978,8 @@ self: { ghc-events-parallel gtk mtl text zip-archive ]; description = "A Tool to Visualize Parallel Functional Program Executions"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -80661,7 +80991,7 @@ self: { sha256 = "0zxg57381wi23r17mgzl16ajgg61icxyy25kxyxyji9hw5aw22nw"; libraryHaskellDepends = [ base binary bytestring text ]; description = "EDF parsing library"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }) {}; "edge" = callPackage @@ -80679,8 +81009,8 @@ self: { ALUT base cmdtheline containers gloss OpenAL random wraparound ]; description = "Top view space combat arcade game"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -80708,8 +81038,8 @@ self: { tasty-hunit tasty-quickcheck ]; description = "Tools for efficient immutable graphs"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -80721,8 +81051,8 @@ self: { sha256 = "1bznnqa4jmaj315sp1r0zr8g15s91yxbzdglki733hvwrsir05dj"; libraryHaskellDepends = [ base bytestring cereal hedis ]; description = "Statically typechecked client for Redis"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -80743,8 +81073,8 @@ self: { ]; testToolDepends = [ tasty-discover ]; description = "A monad for rewriting things"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -80768,7 +81098,7 @@ self: { array base containers criterion deepseq process random time unix ]; description = "Levenshtein and restricted Damerau-Levenshtein edit distances"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "edit-distance-linear" = callPackage @@ -80789,7 +81119,7 @@ self: { array base bytestring criterion text text-metrics ]; description = "Efficient implementation of the Levenshtein edit distance in linear memory"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "edit-distance-vector" = callPackage @@ -80803,7 +81133,7 @@ self: { base QuickCheck quickcheck-instances vector ]; description = "Calculate edit distances and edit scripts between vectors"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "edit-lenses" = callPackage @@ -80816,8 +81146,8 @@ self: { base containers data-default lattices mtl ]; description = "Symmetric, stateful edit lenses"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -80831,7 +81161,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base ]; description = "Programs demoing the use of symmetric, stateful edit lenses"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "editable" = callPackage @@ -80842,8 +81172,8 @@ self: { sha256 = "15jz0b913xd8yd3nzk4vrlj0vzbhjarl05h9j0mdcfgxns5j0yxi"; libraryHaskellDepends = [ base text vty vty-ui ]; description = "Interactive editors for Generics"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -80855,8 +81185,8 @@ self: { sha256 = "101zhzja14n8bhbrly7w2aywx3sxyzgyjdrmgpg4gn4alf4lzdlz"; libraryHaskellDepends = [ base ]; description = "Bindings to the editline library (libedit)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -80879,7 +81209,7 @@ self: { base bytestring conduit conduit-extra resourcet ]; description = "Open the user's $VISUAL or $EDITOR for text input"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "editpipe" = callPackage @@ -80896,7 +81226,7 @@ self: { base optparse-applicative process temporary unix ]; description = "Edit stdin using an editor before sending to stdout"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "effect-handlers" = callPackage @@ -80914,8 +81244,8 @@ self: { testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ base criterion ]; description = "A library for writing extensible algebraic effects and handlers. Similar to extensible-effects but with deep handlers."; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -80927,8 +81257,8 @@ self: { sha256 = "0lrx586ij1c09hv1rj14l2xi3papzdg8496kas6czdld0kfj8kw1"; libraryHaskellDepends = [ base type-level-sets ]; description = "Embeds effect systems and program logics into Haskell using graded monads and parameterised monads"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -80940,8 +81270,8 @@ self: { sha256 = "08zalj8svp78ykqbf5nhd6khgygz8dplcvjd19w3hvgm08y4kxqi"; libraryHaskellDepends = [ base constraints mtl transformers ]; description = "Reducing the pain of transformer stacks with duplicated effects"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -80963,7 +81293,7 @@ self: { ]; description = "A monadic embedding of aspect oriented programming"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "effective-aspects-mzv" = callPackage @@ -80984,7 +81314,7 @@ self: { ]; description = "A monadic embedding of aspect oriented programming, using \"Monads, Zippers and Views\" instead of mtl"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "effects" = callPackage @@ -80995,7 +81325,7 @@ self: { sha256 = "06cx0l9vxpjpgc1cxai19hw9rxfq89m61qvf7wxp1w2xd6yqa7xk"; libraryHaskellDepends = [ base containers newtype-generics void ]; description = "Computational Effects"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "effects-parser" = callPackage @@ -81006,7 +81336,7 @@ self: { sha256 = "0vjjld95kg02a4nr2a0lwlcwaq3867qvbbjk8b1g6fd3d1qj456r"; libraryHaskellDepends = [ base effects ]; description = "Parser Effect for the Control.Effects Library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "effet" = callPackage @@ -81026,7 +81356,7 @@ self: { transformers-base ]; description = "An Effect System based on Type Classes"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "effin" = callPackage @@ -81037,8 +81367,8 @@ self: { sha256 = "1kq5n25m7bzw4zrz35b5zc8r4q0p0ai801hdf7r537fim0ia973x"; libraryHaskellDepends = [ base mtl ]; description = "A Typeable-free implementation of extensible effects"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -81074,8 +81404,8 @@ self: { ]; benchmarkHaskellDepends = [ base criterion transformers ]; description = "Programming language with non-linear pattern-matching against non-free data"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -81097,8 +81427,8 @@ self: { ]; testToolDepends = [ tasty-discover ]; description = "Manipulating Egison patterns: abstract syntax, parser, and pretty-printer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -81118,8 +81448,8 @@ self: { ]; testToolDepends = [ tasty-discover ]; description = "Parser and pretty printer for Egison pattern expressions in Haskell source code"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -81142,8 +81472,8 @@ self: { ]; testToolDepends = [ tasty-discover ]; description = "Parser and pretty printer for Egison pattern expressions to use with TH"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -81157,8 +81487,8 @@ self: { base egison mtl parsec template-haskell ]; description = "A quasi quotes for using Egison expression in Haskell code"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -81177,8 +81507,8 @@ self: { transformers ]; description = "A tutorial program for the Egison programming language"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -81190,7 +81520,7 @@ self: { sha256 = "05yjwrywpmh58rgx2if1za78g0x9xziv74cpvwnp7pr9b4s9i6zv"; libraryHaskellDepends = [ base ]; description = "Egyptian fractions in Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ehaskell" = callPackage @@ -81209,7 +81539,7 @@ self: { ]; description = "like eruby, ehaskell is embedded haskell"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -81230,8 +81560,8 @@ self: { transformers ]; description = "Embedded haskell template using quasiquotes"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -81250,8 +81580,8 @@ self: { ]; librarySystemDepends = [ eibclient ]; description = "EIBd Client"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {eibclient = null;}; @@ -81271,8 +81601,8 @@ self: { base binary bytestring ghc-prim mtl primitive transformers vector ]; description = "Eigen C++ library (linear algebra: matrices, sparse matrices, vectors, numerical solvers)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -81293,7 +81623,7 @@ self: { base QuickCheck test-framework test-framework-quickcheck2 ]; description = "Combinators for working with sums"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "either-both" = callPackage @@ -81305,7 +81635,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; description = "Either or both"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "either-list-functions" = callPackage @@ -81317,8 +81647,8 @@ self: { libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base doctest ]; description = "Functions involving lists of Either"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -81334,7 +81664,7 @@ self: { testHaskellDepends = [ base doctest hspec transformers ]; testToolDepends = [ doctest-discover hspec-discover ]; description = "‘MonadFail’ instance for a wrapper of ‘ExceptT String m a’"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "either-unwrap" = callPackage @@ -81345,8 +81675,8 @@ self: { sha256 = "0g1f5m7bcpnyg2sdvwx8x34ml6dqfrn326s8pbfciaqqf7wddayc"; libraryHaskellDepends = [ base ]; description = "Functions for probing and unwrapping values inside of Either"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -81358,7 +81688,7 @@ self: { sha256 = "069w3qbyghs1w8wqimj54dwblq5rx1ylgflzzc4cwnjn0aqzgs45"; doHaddock = false; description = "None"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ejdb2-binding" = callPackage @@ -81378,8 +81708,8 @@ self: { aeson base directory tasty tasty-hunit unordered-containers vector ]; description = "Binding to EJDB2 C library, an embedded JSON noSQL database"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {ejdb2 = null; libejdb2 = null;}; @@ -81400,7 +81730,7 @@ self: { snap-server text time transformers unordered-containers ]; description = "Remote monitoring of processes"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ekg-bosun" = callPackage @@ -81417,8 +81747,8 @@ self: { text time unordered-containers vector wreq ]; description = "Send ekg metrics to a Bosun instance"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -81435,8 +81765,8 @@ self: { vector ]; description = "An EKG backend to send statistics to Carbon (part of Graphite monitoring tools)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -81454,8 +81784,8 @@ self: { lens resourcet semigroups text time unordered-containers ]; description = "An ekg backend for Amazon Cloudwatch"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -81474,7 +81804,7 @@ self: { ]; benchmarkHaskellDepends = [ base ]; description = "Tracking of system metrics"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ekg-elastic" = callPackage @@ -81490,8 +81820,8 @@ self: { unordered-containers wreq ]; description = "Push metrics to elastic"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -81509,8 +81839,8 @@ self: { http-client lens req text time unordered-containers ]; description = "Push metrics to elasticsearch"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -81527,7 +81857,7 @@ self: { unordered-containers vector ]; description = "An EKG backend to send statistics to influxdb"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ekg-json" = callPackage @@ -81543,7 +81873,7 @@ self: { aeson base ekg-core text unordered-containers ]; description = "JSON encoding of ekg metrics"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ekg-log" = callPackage @@ -81559,8 +81889,8 @@ self: { time unix unordered-containers ]; description = "Push metrics to a log file"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -81580,7 +81910,7 @@ self: { ]; testHaskellDepends = [ base ]; description = "Easily expose your EKG metrics to Prometheus"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "ekg-push" = callPackage @@ -81597,8 +81927,8 @@ self: { base bytestring ekg-core text time unordered-containers ]; description = "Small framework to push metric deltas to a broadcast channel using the ekg-core library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -81619,8 +81949,8 @@ self: { unordered-containers ]; description = "Passes ekg statistics to rrdtool"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -81636,7 +81966,7 @@ self: { base bytestring ekg-core network text time unordered-containers ]; description = "Push metrics to statsd"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ekg-wai" = callPackage @@ -81656,8 +81986,8 @@ self: { text time transformers unordered-containers wai wai-app-static warp ]; description = "Remote monitoring of processes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -81669,7 +81999,7 @@ self: { sha256 = "1am1j05z79prlybq3hg8vr4gwhl354af4dg9y1qr57vpp6gcpfwv"; libraryHaskellDepends = [ base hmatrix safe ]; description = "Find the elbow point"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "electrum-mnemonic" = callPackage @@ -81681,7 +82011,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-quickcheck ]; description = "easy to remember mnemonic for a high-entropy value"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "elenco-albero" = callPackage @@ -81693,7 +82023,7 @@ self: { libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "make tree from a list"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "elerea" = callPackage @@ -81707,7 +82037,7 @@ self: { base containers transformers transformers-base ]; description = "A minimalistic FRP library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "elerea-examples" = callPackage @@ -81720,8 +82050,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base elerea GLFW OpenGL ]; description = "Example applications for Elerea"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -81734,7 +82064,7 @@ self: { libraryHaskellDepends = [ base elerea SDL ]; description = "Elerea FRP wrapper for SDL"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "elevator" = callPackage @@ -81745,8 +82075,8 @@ self: { sha256 = "1m509dh5k9ci87g22gd2j8lfg4hm4wn156gvd86p3r636c5hbdw2"; libraryHaskellDepends = [ base extensible transformers ]; description = "Immediately lifts to a desired level"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -81759,7 +82089,7 @@ self: { libraryHaskellDepends = [ base binary bytestring ]; testHaskellDepends = [ base bytestring containers hspec ]; description = "An Elf parser"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "eliminators" = callPackage @@ -81779,7 +82109,7 @@ self: { testHaskellDepends = [ base hspec singleton-nats singletons ]; testToolDepends = [ hspec-discover ]; description = "Dependently typed elimination functions using singletons"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "elision" = callPackage @@ -81793,8 +82123,8 @@ self: { libraryHaskellDepends = [ base profunctors ]; executableHaskellDepends = [ base ]; description = "Arrows with holes"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -81820,8 +82150,8 @@ self: { tasty-quickcheck text wl-pprint-text ]; description = "Elliptic curve library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -81838,7 +82168,7 @@ self: { aeson base containers hspec QuickCheck text ]; description = "Derive Elm types and Json code from Haskell types, using aeson's options"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "elm-build-lib" = callPackage @@ -81854,7 +82184,7 @@ self: { template-haskell ]; description = "Compile Elm code to JS within Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "elm-compiler" = callPackage @@ -81892,7 +82222,7 @@ self: { unordered-containers ]; description = "Values to help with elm-package, elm-make, and elm-lang.org."; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "elm-core-sources" = callPackage @@ -81907,7 +82237,7 @@ self: { base bytestring containers file-embed template-haskell ]; description = "Source files for the Elm runtime and standard libraries"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "elm-export" = callPackage @@ -81929,7 +82259,7 @@ self: { ]; description = "A library to generate Elm types from Haskell source"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "elm-export-persistent" = callPackage @@ -81938,15 +82268,15 @@ self: { }: mkDerivation { pname = "elm-export-persistent"; - version = "0.2.0"; - sha256 = "09by77av5p18q89ryzid52zcr153mgx0zsksp5vg8ps6an5apirc"; + version = "1.0.0"; + sha256 = "1x7h7q4yplczf53d91z7v0s7rb0j4fz7v0rbh4k6sz5yyjj22k1c"; libraryHaskellDepends = [ aeson base elm-export persistent scientific text unordered-containers ]; description = "elm-export persistent entities"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ jb55 ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jb55 ]; }) {}; "elm-get" = callPackage @@ -81971,7 +82301,7 @@ self: { mtl network optparse-applicative process vector ]; description = "Tool for sharing and using Elm libraries"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "elm-hybrid" = callPackage @@ -81985,7 +82315,7 @@ self: { ]; testHaskellDepends = [ base ]; description = "Combine Elm with Haskell for data based applications"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "elm-init" = callPackage @@ -82005,7 +82335,7 @@ self: { directory file-embed filepath process text time ]; description = "Set up basic structure for an elm project"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "elm-make" = callPackage @@ -82025,7 +82355,7 @@ self: { optparse-applicative text ]; description = "A build tool for Elm projects"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "elm-package" = callPackage @@ -82054,7 +82384,7 @@ self: { time unordered-containers vector zip-archive ]; description = "Package manager for Elm libraries"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "elm-reactor" = callPackage @@ -82078,7 +82408,7 @@ self: { unordered-containers websockets websockets-snap ]; description = "Interactive development tool for Elm programs"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "elm-repl" = callPackage @@ -82103,7 +82433,7 @@ self: { test-framework test-framework-hunit test-framework-quickcheck2 ]; description = "a REPL for Elm"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "elm-server" = callPackage @@ -82122,7 +82452,7 @@ self: { process snap-core snap-server unordered-containers ]; description = "Server for developing Elm projects"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "elm-street" = callPackage @@ -82132,8 +82462,8 @@ self: { }: mkDerivation { pname = "elm-street"; - version = "0.1.0.3"; - sha256 = "106qaw496kry8rcjyz4nwfn4i4pgygjw6zvfnqrld52mdqjbyxbv"; + version = "0.1.0.4"; + sha256 = "1dnpzc70qznbm3f678lxzkfbyihcqhlg185db09q64aj20hls5d6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -82145,8 +82475,8 @@ self: { 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; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -82167,7 +82497,7 @@ self: { unordered-containers ]; description = "Elm syntax and pretty-printing"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "elm-websocket" = callPackage @@ -82196,8 +82526,8 @@ self: { warp websockets ]; description = "Generate ELM code from a Wai websocket application"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -82213,7 +82543,7 @@ self: { base blaze-markup Elm shakespeare-js text yesod-core ]; description = "The Elm language Yesod compatibility module"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "elm2nix" = callPackage @@ -82238,7 +82568,7 @@ self: { ]; testHaskellDepends = [ base ]; description = "Turn your Elm project into buildable Nix project"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "elminator" = callPackage @@ -82256,7 +82586,7 @@ self: { aeson base containers mtl template-haskell text ]; description = "Generate ELM types/encoders/decoders from Haskell types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "elo" = callPackage @@ -82268,7 +82598,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty ]; description = "Elo Rating Library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "elocrypt" = callPackage @@ -82291,7 +82621,7 @@ self: { ]; description = "Generate easy-to-remember, hard-to-guess passwords"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "elsa" = callPackage @@ -82312,8 +82642,8 @@ self: { executableHaskellDepends = [ base mtl ]; testHaskellDepends = [ base directory filepath tasty tasty-hunit ]; description = "A tiny language for understanding the lambda-calculus"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -82331,8 +82661,8 @@ self: { aeson base bytestring elynx-tools optparse-applicative slynx tlynx ]; description = "Validate and (optionally) redo ELynx analyses"; - license = stdenv.lib.licenses.gpl3Plus; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -82355,7 +82685,7 @@ self: { base containers elynx-tools hmatrix hspec mwc-random vector ]; description = "Simulate molecular sequences along trees"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; }) {}; "elynx-nexus" = callPackage @@ -82367,7 +82697,7 @@ self: { libraryHaskellDepends = [ attoparsec base bytestring ]; testHaskellDepends = [ base hspec ]; description = "Import and export Nexus files"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; }) {}; "elynx-seq" = callPackage @@ -82387,7 +82717,7 @@ self: { base bytestring elynx-tools hspec matrices vector ]; description = "Handle molecular sequences"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; }) {}; "elynx-tools" = callPackage @@ -82409,7 +82739,7 @@ self: { vector zlib ]; description = "Tools for ELynx"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; }) {}; "elynx-tree" = callPackage @@ -82434,8 +82764,8 @@ self: { base criterion elynx-tools microlens mwc-random parallel ]; description = "Handle phylogenetic trees"; - license = stdenv.lib.licenses.gpl3Plus; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -82454,8 +82784,8 @@ self: { base doctest tasty tasty-hspec tasty-quickcheck xkbcommon ]; description = "library to parse emacs style keybinding into the modifiers and the chars"; - license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -82475,8 +82805,8 @@ self: { transformers-base vector void ]; description = "Utilities to write Emacs dynamic modules"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -82493,8 +82823,8 @@ self: { old-time parsec process time ]; description = "Sending eMail in Haskell made easy"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -82516,8 +82846,8 @@ self: { tasty-quickcheck text time ]; description = "Parsing and rendering of email and MIME headers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -82533,8 +82863,8 @@ self: { aeson attoparsec base bytestring containers HTTP network ]; description = "A simple wrapper to send emails via the api of the service postmark (http://postmarkapp.com/)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -82551,7 +82881,7 @@ self: { ]; testHaskellDepends = [ base bytestring doctest hspec QuickCheck ]; description = "Email address validation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "email-validate-json" = callPackage @@ -82562,7 +82892,7 @@ self: { sha256 = "06fwm2m83pqp1l4sij7vmxhcry2w8dcp52cwwvpkfimw8iszxqqc"; libraryHaskellDepends = [ aeson base email-validate text ]; description = "Aeson instances for email-validate"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "email-validator" = callPackage @@ -82587,7 +82917,7 @@ self: { parallel-io pcre-light tasty tasty-hunit ]; description = "Perform basic syntax and deliverability checks on email addresses"; - license = stdenv.lib.licenses.agpl3; + license = lib.licenses.agpl3; }) {}; "emailaddress" = callPackage @@ -82607,8 +82937,8 @@ self: { ]; testHaskellDepends = [ base doctest Glob ]; description = "Wrapper around email-validate library adding instances for common type classes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -82631,8 +82961,8 @@ self: { text-icu time word8 ]; description = "An email parser that will parse everything"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -82649,8 +82979,8 @@ self: { base filepath her-lexer MissingH process ]; description = "Embed the values in scope in the haddock documentation of the module"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -82662,8 +82992,8 @@ self: { sha256 = "07xc7kdnlbfwr08zhgjphbcmn8ycilp6pna3nk4y0w2hw87g7db0"; libraryHaskellDepends = [ base embeddock time ]; description = "Example of using embeddock"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -82675,8 +83005,8 @@ self: { sha256 = "1nk689j21ghaiymqnddlf4j8pgb9z61xflfrcgxw3zrxiv5jslk6"; libraryHaskellDepends = [ base chronos ]; description = "execute actions periodically while avoiding drift"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -82695,8 +83025,8 @@ self: { ]; executableHaskellDepends = [ base ]; description = "support for embroidery formats in haskell"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -82727,7 +83057,7 @@ self: { vector vector-sized ]; description = "Empirical Mode Decomposition and Hilbert-Huang Transform"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "emgm" = callPackage @@ -82739,8 +83069,8 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base HUnit QuickCheck syb ]; description = "Extensible and Modular Generics for the Masses"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -82759,7 +83089,7 @@ self: { ]; executableHaskellDepends = [ base ]; description = "emoji utility"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "emojis" = callPackage @@ -82771,7 +83101,7 @@ self: { libraryHaskellDepends = [ base containers text ]; testHaskellDepends = [ base HUnit text ]; description = "Conversion between emoji characters and their names"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "empty" = callPackage @@ -82782,7 +83112,7 @@ self: { sha256 = "0ap7qby3n5qiwf791z4li05h0l6p6xi899wkmg6x8z6bb8z9q2d9"; doHaddock = false; description = "Ceci n'est pas une package"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "empty-monad" = callPackage @@ -82793,8 +83123,8 @@ self: { sha256 = "0h68fff0qpyapkpsqcd6mgg8nyxcbjsw389dv8z8vm4hrqh1pip5"; libraryHaskellDepends = [ base ]; description = "A container that always has no values"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -82811,8 +83141,8 @@ self: { libraryToolDepends = [ c2hs ]; testHaskellDepends = [ base ]; description = "Binding to the Enchant library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) enchant;}; @@ -82833,7 +83163,7 @@ self: { transformers transformers-base ]; description = "Catching all exceptions from within an enclosed computation"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "encode-string" = callPackage @@ -82849,7 +83179,7 @@ self: { base bytestring QuickCheck quickcheck-instances text ]; description = "Safe string conversion and encoding"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "encoding" = callPackage @@ -82870,8 +83200,8 @@ self: { ]; testHaskellDepends = [ base bytestring HUnit QuickCheck ]; description = "A library for various character encodings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -82885,8 +83215,8 @@ self: { base chunked-data deepseq transformers-base ]; description = "Encoding-aware file I/O"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -82910,8 +83240,8 @@ self: { universum ]; description = "Typed encryption with persistent support"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -82929,7 +83259,7 @@ self: { base between data-default-class mtl transformers ]; description = "Endomorphism utilities"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "eng-stemmer" = callPackage @@ -82948,7 +83278,7 @@ self: { base containers doctest tasty tasty-hunit text ]; description = "An English language stemmer (Porter2)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "engine-io" = callPackage @@ -82966,8 +83296,8 @@ self: { unordered-containers vector websockets ]; description = "A Haskell implementation of Engine.IO"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -82986,8 +83316,8 @@ self: { pipes-attoparsec pipes-wai socket-io text transformers unordered-containers wai wai-websockets websockets ]; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -83004,8 +83334,8 @@ self: { base bytestring containers engine-io io-streams lifted-base snap-core unordered-containers websockets websockets-snap ]; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -83024,8 +83354,8 @@ self: { wai-websockets websockets ]; description = "An @engine-io@ @ServerAPI@ that is compatible with @Wai@"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -83042,8 +83372,8 @@ self: { base bytestring conduit conduit-extra engine-io http-types text unordered-containers wai wai-websockets websockets yesod-core ]; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -83055,7 +83385,7 @@ self: { sha256 = "1akk15q4nn1c0d36x224qikq7639kz05dfvnxck71h4y3hkl1inj"; libraryHaskellDepends = [ base ]; description = "A numeric type for managing and automating engineering units"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "entangle" = callPackage @@ -83071,8 +83401,8 @@ self: { ]; executableHaskellDepends = [ base matrix quipper-core ]; description = "An application (and library) to convert quipper circuits into Qpmc models"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -83087,7 +83417,7 @@ self: { setupHaskellDepends = [ base Cabal directory filepath process ]; libraryHaskellDepends = [ base bytestring unix ]; description = "A platform independent entropy source"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "entwine" = callPackage @@ -83116,8 +83446,8 @@ self: { transformers-either ]; description = "entwine - Concurrency tools"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -83134,7 +83464,7 @@ self: { base generic-random hspec microlens QuickCheck template-haskell ]; description = "Generate an ADT being a subset of another ADT, and the corresponding mappings"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "enum-text" = callPackage @@ -83150,8 +83480,8 @@ self: { unordered-containers ]; description = "A text rendering and parsing toolkit for enumerated types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -83168,8 +83498,8 @@ self: { base bytestring enum-text fmt rio text ]; description = "Making fmt available with rio"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -83181,7 +83511,7 @@ self: { sha256 = "1m3f79acnrssz89490vwxp1dabqadzda3a95yg6gh6mpn7x0gkw5"; libraryHaskellDepends = [ base ]; description = "small enum types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "enum-utf8" = callPackage @@ -83197,8 +83527,8 @@ self: { unordered-containers ]; description = "An experimental Utf8 parsing toolkit for enumerated types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -83210,7 +83540,7 @@ self: { sha256 = "1v94y0a3rlkg3qlbv70d1zj2vjhssf1f89xlgb5cnsy9az07517q"; libraryHaskellDepends = [ base control-monad-omega tagged ]; description = "A typeclass for enumerating all values a type"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "enumerate" = callPackage @@ -83229,8 +83559,8 @@ self: { ]; executableHaskellDepends = [ base ]; description = "enumerate all the values in a finite type (automatically)"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -83251,8 +83581,8 @@ self: { testHaskellDepends = [ base doctest hspec QuickCheck ]; benchmarkHaskellDepends = [ base criterion deepseq ]; description = "simple package for inverting functions and testing totality, via brute enumeration of the domain"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -83269,7 +83599,7 @@ self: { ]; testHaskellDepends = [ arith-encode base binary HUnit-Plus ]; description = "A practical API for building recursive enumeration procedures and enumerating datatypes"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "enumerator" = callPackage @@ -83285,8 +83615,8 @@ self: { base bytestring containers text transformers ]; description = "Reliable, high-performance processing with left-fold enumerators"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -83298,8 +83628,8 @@ self: { sha256 = "0xbrkv65m206qlvnjlbfb52kvjhw91rdnihwv3y31p2qj5zlz29p"; libraryHaskellDepends = [ base enumerator mtl ]; description = "Enumerator instances for monads-fd classes"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -83311,8 +83641,8 @@ self: { sha256 = "0s47j6pf05nwl105i2vwvsn18gis1v96gid85kj49ngb8ax0pjsp"; libraryHaskellDepends = [ base enumerator monads-tf ]; description = "Enumerator instances for monads-tf classes"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -83324,8 +83654,8 @@ self: { sha256 = "1fq4zmhc825bmyslfm7kbsa29qq773cgrz4npj2bcfl0jkbl3ndc"; libraryHaskellDepends = [ base enummapset-th ]; description = "Finitely represented /total/ EnumMaps"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -83350,8 +83680,8 @@ self: { base containers criterion deepseq mtl ]; description = "Map of maps using Enum types as keys"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -83363,7 +83693,7 @@ self: { sha256 = "0p4klnhwr10yiv3w209vl1j09280257z0pz626ynbxbff4mh9wg4"; libraryHaskellDepends = [ base containers deepseq ]; description = "Enum wrappers for IntMap and IntSet"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "enummapset" = callPackage @@ -83381,7 +83711,7 @@ self: { test-framework test-framework-hunit test-framework-quickcheck2 ]; description = "IntMap and IntSet with Enum keys/elements"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "enummapset-th" = callPackage @@ -83394,7 +83724,7 @@ self: { base containers deepseq template-haskell ]; description = "TH-generated EnumSet/EnumMap wrappers around IntSet/IntMap"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "enumset" = callPackage @@ -83408,7 +83738,7 @@ self: { base data-accessor semigroups storable-record ]; description = "Sets of enumeration values represented by machine words"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "env-extra" = callPackage @@ -83426,8 +83756,8 @@ self: { base exceptions tasty tasty-hunit text transformers ]; description = "Safe helpers for accessing and modifying environment variables"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -83457,8 +83787,8 @@ self: { transformers ]; description = "Pull configuration information from the ENV"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -83473,7 +83803,7 @@ self: { libraryHaskellDepends = [ aeson base http-api-data mtl text ]; testHaskellDepends = [ base doctest Glob ]; description = "Defines generic 'Envelope' type to wrap reponses from a JSON API"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "envparse" = callPackage @@ -83485,7 +83815,7 @@ self: { libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers hspec text ]; description = "Parse environment variables"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "envstatus" = callPackage @@ -83506,8 +83836,8 @@ self: { base ConfigFile parsec PyF tasty tasty-hspec ]; description = "Display efficiently the state of the local environment"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -83527,7 +83857,7 @@ self: { transformers ]; description = "An environmentally friendly way to deal with environment variables"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "envy-extensible" = callPackage @@ -83544,7 +83874,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Provides FromEnv in envy instance for Record of extensible"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "epanet-haskell" = callPackage @@ -83555,8 +83885,8 @@ self: { sha256 = "1jpz58zlkhgf2fl4fzicpdkqqdbwy3sw56dga8yvjmgv5zcqqshx"; libraryHaskellDepends = [ base ]; description = "Haskell binding for EPANET"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -83568,8 +83898,32 @@ self: { sha256 = "0sg5pipzc4s9xq83ari7rigjbvhyh76kqnp57i98bs3k54ba53ym"; libraryHaskellDepends = [ base stm time ]; description = "Baisc, Erlang-like message passing supporting sockets"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + + "ephemeral" = callPackage + ({ mkDerivation, attoparsec, base, box, box-csv, chart-svg + , concurrency, doctest, lens, lucid, mealy, microlens, moo + , mwc-probability, numhask, numhask-array, numhask-space, primitive + , profunctors, random, text, time, transformers + , unordered-containers + }: + mkDerivation { + pname = "ephemeral"; + version = "0.0.1"; + sha256 = "1xxdifw1mcyfgz4749z136xqxmxbm26v0x0yk8238wm08i80y8fy"; + libraryHaskellDepends = [ + attoparsec base box box-csv chart-svg concurrency lens lucid mealy + microlens moo mwc-probability numhask numhask-array numhask-space + primitive profunctors random text time transformers + unordered-containers + ]; + testHaskellDepends = [ base doctest numhask ]; + description = "See readme.md"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -83590,8 +83944,8 @@ self: { trifecta vector ]; description = "A library for simulating epidemics as birth-death processes"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -83609,8 +83963,8 @@ self: { array base Cabal directory mtl process ]; description = "Compiler for a simple functional language"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -83625,7 +83979,7 @@ self: { libraryHaskellDepends = [ base unix ]; description = "epoll bindings"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -83638,8 +83992,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base exceptions mtl ]; description = "Basic Erlang-like process support for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -83657,7 +84011,7 @@ self: { base bytestring filepath old-time utf8-string xml zip-archive ]; description = "EPUB E-Book construction support library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "epub-metadata" = callPackage @@ -83680,7 +84034,7 @@ self: { utf8-string zip-archive ]; description = "Library for parsing epub document metadata"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "epub-tools" = callPackage @@ -83701,7 +84055,7 @@ self: { base directory epub-metadata filepath HUnit mtl parsec regex-compat ]; description = "Command line utilities for working with epub files"; - license = stdenv.lib.licenses.isc; + license = lib.licenses.isc; }) {}; "epubname" = callPackage @@ -83717,8 +84071,8 @@ self: { base directory epub-metadata mtl regex-compat ]; description = "Rename epub ebook files based on meta information"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -83730,7 +84084,7 @@ self: { sha256 = "1bcvjpbdis79dd09i07l7rjkh7j79qbpwb731rgr9k9215268wfa"; libraryHaskellDepends = [ base semigroupoids ]; description = "Leibnizian equality"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "equal-files" = callPackage @@ -83753,17 +84107,17 @@ self: { "equational-reasoning" = callPackage ({ mkDerivation, base, containers, template-haskell, th-desugar - , th-extras, void + , void }: mkDerivation { pname = "equational-reasoning"; - version = "0.6.0.3"; - sha256 = "003prif9pjjcj67nv6hxr0y70ik5qg1sddzh82y97a1l7m6kigfq"; + version = "0.7.0.0"; + sha256 = "0l6gyq43byh6cy2pblb9a4qjy7w5k9maa97c076dxlsf53myj01h"; libraryHaskellDepends = [ - base containers template-haskell th-desugar th-extras void + base containers template-haskell th-desugar void ]; description = "Proof assistant for Haskell using DataKinds & PolyKinds"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "equational-reasoning-induction" = callPackage @@ -83776,8 +84130,8 @@ self: { base singletons template-haskell th-extras ]; description = "Proof assistant for Haskell using DataKinds & PolyKinds"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -83799,8 +84153,8 @@ self: { tasty-hunit time ]; description = "Application level triggered, and edge triggered event multiqueues"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -83821,7 +84175,7 @@ self: { transformers transformers-compat ]; description = "Maintaining an equivalence relation implemented as union-find using STT"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "erd" = callPackage @@ -83844,7 +84198,7 @@ self: { parsec raw-strings-qq tasty tasty-hunit text yaml ]; description = "An entity-relationship diagram generator from a plain text description"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "erf" = callPackage @@ -83855,7 +84209,7 @@ self: { sha256 = "0dxk2r32ajmmc05vaxcp0yw6vgv4lkbmh8jcshncn98xgsfbgw14"; libraryHaskellDepends = [ base ]; description = "The error function, erf, and related functions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "erf-native" = callPackage @@ -83867,7 +84221,7 @@ self: { libraryHaskellDepends = [ base polynomial ]; description = "Native Haskell implementation of the interface from the erf package"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -83884,7 +84238,7 @@ self: { ]; description = "FFI interface to Erlang"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -83897,8 +84251,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers text ]; description = "A text censorship library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -83917,8 +84271,8 @@ self: { aeson aeson-pretty base bytestring containers eros text ]; description = "DEPRECATED in favor of eros-http"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -83938,8 +84292,8 @@ self: { warp ]; description = "JSON HTTP interface to Eros"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -83954,7 +84308,7 @@ self: { libraryHaskellDepends = [ base containers text ]; executableHaskellDepends = [ base containers text ]; description = "Source code error pretty printing"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "errno" = callPackage @@ -83965,7 +84319,7 @@ self: { sha256 = "0jix16b2c24pfbc3rig01nl68zdwpi28zzbciscalmq8lkpp10fa"; libraryHaskellDepends = [ base mtl ]; description = "a FFI utility"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "error-analyze" = callPackage @@ -83977,7 +84331,7 @@ self: { libraryHaskellDepends = [ base text ]; testHaskellDepends = [ base HUnit tasty tasty-hunit text ]; description = "Parse ghc and cabal error messages and give their causes for easier resolution"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "error-codes" = callPackage @@ -83989,8 +84343,8 @@ self: { libraryHaskellDepends = [ base primitive primitive-unlifted ]; testHaskellDepends = [ base ]; description = "Error code functions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -84013,8 +84367,8 @@ self: { unordered-containers ]; description = "Provides API for enriching errors with contexts"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -84026,8 +84380,8 @@ self: { sha256 = "0rv59fhlfr03qis957mjgl4gyk1i5axfyvr680z3ykbfd3k5gc1s"; libraryHaskellDepends = [ base either mtl transformers ]; description = "Error Continuations"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -84039,8 +84393,8 @@ self: { sha256 = "0k0rpscg4h55215mgkd72yd5la3f2im21vlsgyg7v4pkrxd1cj1j"; libraryHaskellDepends = [ base mtl text text-render ]; description = "A useful type for collecting error messages"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -84052,8 +84406,8 @@ self: { sha256 = "0ch7c537fp52yg3qmc1v9rs4y70cc0zyb3g3i0bmmhgdhxd90bm5"; libraryHaskellDepends = [ base template-haskell ]; description = "An error replacement with call-site metadata"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -84065,7 +84419,7 @@ self: { sha256 = "1gfi3jvag662xbsiv75ndb8p9s3c7j6lny15a9gqk8wd4l71myid"; libraryHaskellDepends = [ base template-haskell ]; description = "error functions that show file location information"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "error-message" = callPackage @@ -84080,8 +84434,8 @@ self: { ansi-wl-pprint base containers either-unwrap InfixApplicative mtl ]; description = "Composable error messages"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -84093,7 +84447,7 @@ self: { sha256 = "0ry06vhz7mrl7i587vw3pv2ralh8aw7km6jfhagww0hmckwdjqmm"; libraryHaskellDepends = [ base containers text ]; description = "Composable, hierarchical errors"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "error-or-utils" = callPackage @@ -84104,7 +84458,7 @@ self: { sha256 = "14n5h69wknns3b6ij8avdijwlpwykalkpvx2q57cg6zv0ywnvmwz"; libraryHaskellDepends = [ base containers error-or text ]; description = "Utilities using ErrorOr datatype"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "error-util" = callPackage @@ -84115,8 +84469,8 @@ self: { sha256 = "01jfbq43ps6wjl9z5l1g8zfdi225mfn3xy59n6vrfxh0vsi1c6fz"; libraryHaskellDepends = [ base transformers ]; description = "Set of utils and operators for error handling"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -84129,7 +84483,7 @@ self: { libraryHaskellDepends = [ base base-orphans ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "An orphan Eq instance for ErrorCall"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "errors" = callPackage @@ -84144,7 +84498,7 @@ self: { base exceptions safe text transformers transformers-compat ]; description = "Simplified error-handling"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "errors-ext" = callPackage @@ -84163,8 +84517,8 @@ self: { monad-control monad-loops mtl transformers ]; description = "`bracket`-like functions for `ExceptT` over `IO` monad"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -84188,8 +84542,8 @@ self: { base directory doctest filepath QuickCheck template-haskell ]; description = "A script to concatenate AIP ERSA"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -84216,8 +84570,8 @@ self: { ]; testHaskellDepends = [ array base directory doctest filepath ]; description = "A monad for expressing SAT or QSAT problems using observable sharing"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -84235,8 +84589,8 @@ self: { array base containers ersatz toysolver transformers ]; description = "toysat driver as backend for ersatz"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -84259,8 +84613,8 @@ self: { aeson attoparsec base bytestring yaml ]; description = "Easy Runtime Templates"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -84277,8 +84631,8 @@ self: { base bytestring hspec QuickCheck silently text ]; description = "ANSI Escape Sequence Text Decoration Made Easy"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -84300,7 +84654,7 @@ self: { base doctest hspec QuickCheck quickcheck-properties ]; description = "Produce Text with terminal escape sequences"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "escoger" = callPackage @@ -84326,8 +84680,8 @@ self: { ]; doHaddock = false; description = "Terminal fuzzy selector"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -84351,8 +84705,8 @@ self: { ]; doHaddock = false; description = "Esotericbot is a sophisticated, lightweight IRC bot"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -84417,8 +84771,8 @@ self: { yesod-form yesod-static yesod-test ]; description = "Espial is an open-source, web-based bookmarking server"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.agpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -84447,7 +84801,7 @@ self: { tagged text time transformers unliftio unordered-containers vector ]; description = "Type-safe EDSL for SQL queries on persistent backends"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ess" = callPackage @@ -84458,8 +84812,8 @@ self: { sha256 = "0pxrs9vr6gc61md9q4rxdc5fikvjandqw2rygs0xamrqlna51bcq"; libraryHaskellDepends = [ base ]; description = "The type-level S combinator in Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -84483,7 +84837,7 @@ self: { test-framework-quickcheck2 transformers ]; description = "General purpose live coding framework"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "essence-of-live-coding-gloss" = callPackage @@ -84498,7 +84852,7 @@ self: { base essence-of-live-coding foreign-store gloss syb transformers ]; description = "General purpose live coding framework - Gloss backend"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "essence-of-live-coding-gloss-example" = callPackage @@ -84516,7 +84870,7 @@ self: { transformers ]; description = "General purpose live coding framework - Gloss example"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "essence-of-live-coding-pulse" = callPackage @@ -84531,7 +84885,7 @@ self: { base essence-of-live-coding foreign-store pulse-simple transformers ]; description = "General purpose live coding framework - pulse backend"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "essence-of-live-coding-pulse-example" = callPackage @@ -84549,7 +84903,7 @@ self: { pulse-simple transformers vector ]; description = "General purpose live coding framework - pulse backend example"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "essence-of-live-coding-quickcheck" = callPackage @@ -84565,7 +84919,7 @@ self: { transformers ]; description = "General purpose live coding framework - QuickCheck integration"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "essence-of-live-coding-warp" = callPackage @@ -84581,7 +84935,7 @@ self: { ]; testHaskellDepends = [ base essence-of-live-coding http-client ]; description = "General purpose live coding framework"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "estimator" = callPackage @@ -84595,7 +84949,7 @@ self: { ad base distributive lens linear reflection ]; description = "State-space estimation algorithms such as Kalman Filters"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "estimators" = callPackage @@ -84611,8 +84965,8 @@ self: { prettyclass QuickCheck text ]; description = "Tool for managing probability estimation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -84630,7 +84984,7 @@ self: { ]; description = "Repeats from ESTs"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -84648,7 +85002,7 @@ self: { ]; testHaskellDepends = [ aeson base rio tasty tasty-hunit ]; description = "Declarative configuration spec for Haskell projects"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "etcd" = callPackage @@ -84667,7 +85021,7 @@ self: { testHaskellDepends = [ async base hspec MonadRandom mtl text ]; description = "Client for etcd, a highly-available key value store"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "eternal" = callPackage @@ -84683,8 +85037,8 @@ self: { base base-unicode-symbols transformers utf8-string ]; description = "everything breaking the Fairbairn threshold"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -84705,8 +85059,8 @@ self: { quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck ]; description = "Native event-sourcing database"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -84724,8 +85078,8 @@ self: { potoki QuickCheck text time timestamp ]; description = "Automatic timestamping for Eternity"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -84754,8 +85108,8 @@ self: { base criterion deepseq lens mtl transformers ]; description = "Monad transformers and classes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -84779,8 +85133,8 @@ self: { hspec protolude text wl-pprint-text ]; description = "A Ethereum contract analyzer"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -84808,8 +85162,8 @@ self: { base ethereum-analyzer-deps hflags monad-logger protolude ]; description = "A CLI frontend for ethereum-analyzer"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -84827,7 +85181,7 @@ self: { containers deepseq fast-logger global-lock monad-logger split text ]; description = "Stripped dependencies of ethereum-analyzer"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "ethereum-analyzer-webui" = callPackage @@ -84855,8 +85209,8 @@ self: { base ethereum-analyzer ethereum-analyzer-deps hflags monad-logger ]; description = "A web frontend for ethereum-analyzer"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -84885,8 +85239,8 @@ self: { base containers HUnit test-framework test-framework-hunit ]; description = "A Haskell version of an Ethereum client"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -84911,8 +85265,8 @@ self: { transformers ]; description = "A modified Merkle Patricia DB"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -84931,7 +85285,7 @@ self: { base HUnit test-framework test-framework-hunit ]; description = "Ethereum Recursive Length Prefix Encoding"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "eths-rlp" = callPackage @@ -84947,7 +85301,7 @@ self: { base bytestring doctest hspec QuickCheck quickcheck-instances ]; description = "Ethereum Recursive Length Prefix Encoding"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "ety" = callPackage @@ -84967,7 +85321,7 @@ self: { base bytestring curl random text-icu utf8-string xml ]; description = "Random etymology online entry"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "euler" = callPackage @@ -84980,7 +85334,7 @@ self: { testHaskellDepends = [ base hspec ]; testToolDepends = [ hspec-discover ]; description = "Mathematics utilities for Haskell"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "euler-tour-tree" = callPackage @@ -85003,7 +85357,7 @@ self: { tasty-quickcheck ]; description = "Euler tour trees"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "euphoria" = callPackage @@ -85027,8 +85381,8 @@ self: { base criterion deepseq enummapset-th unordered-containers ]; description = "Dynamic network FRP with events and continuous values"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -85046,8 +85400,8 @@ self: { http-types monad-control mtl time ]; description = "Free foreign exchange/currency feed from the European Central Bank"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -85065,7 +85419,7 @@ self: { libraryPkgconfigDepends = [ libevdev ]; libraryToolDepends = [ c2hs ]; description = "Bindings to libevdev"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) libevdev;}; "evdev-streamly" = callPackage @@ -85081,7 +85435,7 @@ self: { streamly streamly-fsnotify unix ]; description = "Bridge for working with evdev and streamly"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "eve" = callPackage @@ -85099,7 +85453,7 @@ self: { base data-default hspec hspec-core lens mtl ]; description = "An extensible event framework"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "eve-cli" = callPackage @@ -85115,8 +85469,8 @@ self: { base bytestring eve lens mtl text vty ]; testHaskellDepends = [ base bytestring eve lens mtl text vty ]; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -85128,7 +85482,7 @@ self: { sha256 = "1d0bxg1dg66g1yv291cp4jh3xv3caxrddqrwb0g6g1929dl019fa"; libraryHaskellDepends = [ base ghc-prim primitive ]; description = "Efficient effect handlers based on evidence translation"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "event" = callPackage @@ -85141,8 +85495,8 @@ self: { base containers semigroups transformers ]; description = "Monoidal, monadic and first-class events"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -85154,8 +85508,8 @@ self: { sha256 = "1jkrc1k0ixjs95fvj36gr08igpx5vqff5zc6bi9f04ldxqz4wbap"; libraryHaskellDepends = [ base monads-tf yjtools ]; description = "library for event driven programming"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -85167,7 +85521,7 @@ self: { sha256 = "1515v1khdkr145z5inrm2ardhpzfsbncpl5wmfd9nmilw97da9ld"; libraryHaskellDepends = [ base containers ]; description = "Event handlers"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "event-list" = callPackage @@ -85202,8 +85556,8 @@ self: { prettyclass priority-queue stateref ]; description = "Event-graph simulation monad transformer"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -85219,7 +85573,7 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Initial project template from stack"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "eventful-core" = callPackage @@ -85241,7 +85595,7 @@ self: { uuid ]; description = "Core module for eventful"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "eventful-dynamodb" = callPackage @@ -85264,8 +85618,8 @@ self: { quickcheck-instances safe text unordered-containers vector ]; description = "Library for eventful DynamoDB event stores"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -85285,7 +85639,7 @@ self: { safe stm ]; description = "In-memory implementations for eventful"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "eventful-postgresql" = callPackage @@ -85307,8 +85661,8 @@ self: { persistent-postgresql text ]; description = "Postgres implementations for eventful"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -85327,8 +85681,8 @@ self: { persistent-template text uuid ]; description = "Common library for SQL event stores"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -85351,8 +85705,8 @@ self: { text uuid ]; description = "SQLite implementations for eventful"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -85368,7 +85722,7 @@ self: { aeson aeson-casing base eventful-core extra hspec monad-logger text ]; description = "Common module used for eventful tests"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "eventlog2html" = callPackage @@ -85391,8 +85745,8 @@ self: { ]; executableHaskellDepends = [ aeson base filepath text ]; description = "Visualise an eventlog"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -85411,8 +85765,8 @@ self: { suspend text timers websockets ]; description = "A different take on an IO system. Based on Amanda's IO loop, this eventloop takes a function that maps input events to output events. It can easily be extended by modules that represent IO devices or join multiple modules together."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -85432,7 +85786,7 @@ self: { string-conversions text transformers-base unordered-containers uuid ]; description = "Provides an eventsourcing high level API"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "eventsource-geteventstore-store" = callPackage @@ -85456,8 +85810,8 @@ self: { tasty tasty-hspec transformers-base ]; description = "GetEventStore store implementation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -85474,7 +85828,7 @@ self: { text transformers-base uuid ]; description = "Provides common test specification for Store implementation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "eventsource-stub-store" = callPackage @@ -85495,7 +85849,7 @@ self: { streaming tasty tasty-hspec ]; description = "An in-memory stub store implementation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "eventsourced" = callPackage @@ -85516,7 +85870,7 @@ self: { base blaze-builder bytestring HUnit wai-extra ]; description = "Server-Sent Events the UNIX way"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "eventsourcing" = callPackage @@ -85537,7 +85891,7 @@ self: { unordered-containers ]; description = "CQRS/ES library"; - license = stdenv.lib.licenses.isc; + license = lib.licenses.isc; }) {}; "eventsourcing-postgresql" = callPackage @@ -85553,7 +85907,7 @@ self: { stm unordered-containers ]; description = "PostgreSQL adaptor for eventsourcing"; - license = stdenv.lib.licenses.isc; + license = lib.licenses.isc; }) {}; "eventstore" = callPackage @@ -85587,9 +85941,9 @@ self: { unordered-containers uuid vector ]; description = "EventStore TCP Client"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; platforms = [ "x86_64-darwin" "x86_64-linux" ]; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -85601,7 +85955,7 @@ self: { sha256 = "1rc0g5rn8hzglm2b4biaf8jvj5kb2j1s5vsxnm24q2gvrvjg03sx"; libraryHaskellDepends = [ async base stm ]; description = "Run a process every so often"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "every-bit-counts" = callPackage @@ -85612,8 +85966,8 @@ self: { sha256 = "0r959iyd5nsw3sj7p0gwsccdgaald9lwisg0lvq9qynyz09kh4vj"; libraryHaskellDepends = [ base haskell98 ]; description = "A functional pearl on encoding and decoding using question-and-answer strategies"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -85633,8 +85987,8 @@ self: { ]; executableToolDepends = [ alex happy uuagc ]; description = "An interpreter for EWE programming language"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -85650,7 +86004,7 @@ self: { base exceptions hashable stm time transformers vector ]; description = "Another fork of resource-pool, with a MonadIO and MonadCatch constraint"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "exact-combinatorics" = callPackage @@ -85661,7 +86015,7 @@ self: { sha256 = "1ay98m9prmd1pi85v2n0rs2432hzb7mxizzg79sv0ln24an8amvj"; libraryHaskellDepends = [ base ]; description = "Efficient exact computation of combinatoric functions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "exact-cover" = callPackage @@ -85675,8 +86029,8 @@ self: { libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers tasty tasty-hunit ]; description = "Efficient exact cover solver"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -85695,7 +86049,7 @@ self: { base numtype-dk QuickCheck tasty tasty-hunit tasty-quickcheck ]; description = "Exact rational multiples of pi (and integer powers of pi)"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "exact-real" = callPackage @@ -85715,7 +86069,7 @@ self: { ]; benchmarkHaskellDepends = [ base criterion ]; description = "Exact real arithmetic"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "exact-real-positional" = callPackage @@ -85726,8 +86080,8 @@ self: { sha256 = "0qh1aqyi2k7djwqykj888hxjisip9ahg2ap43cj0xmdvfh9p0351"; libraryHaskellDepends = [ base ]; description = "Framework for Exact Real Arithmetic in the Positional Number System"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -85742,7 +86096,7 @@ self: { libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base ]; description = "Example Haskell Project"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "except-exceptions" = callPackage @@ -85755,8 +86109,8 @@ self: { editedCabalFile = "09i2w1ry7vmjc0a4d05a4hs7kdj3brn5jrxsy638f6acj41g5dhk"; libraryHaskellDepends = [ base exceptions transformers ]; description = "Safely deal with exceptions in ExceptT"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -85768,7 +86122,7 @@ self: { sha256 = "0hph7mng5llcvazq9mqh9pndgbjjwivgmhpqlbf4r1xii7c0ymnx"; libraryHaskellDepends = [ base template-haskell ]; description = "Exception type hierarchy with TemplateHaskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "exception-mailer" = callPackage @@ -85779,7 +86133,7 @@ self: { sha256 = "068zhr90gldin0f6xafqp1pncf6rhhm3gagnvn6r3p0kx060ia23"; libraryHaskellDepends = [ base hslogger mime-mail text ]; description = "Catch all runtime exceptions and send an email"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "exception-monads-fd" = callPackage @@ -85794,8 +86148,8 @@ self: { base exception-transformers monads-fd transformers ]; description = "Exception monad transformer instances for monads-fd classes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -85811,7 +86165,7 @@ self: { base exception-transformers monads-tf transformers ]; description = "Exception monad transformer instances for monads-tf classes"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "exception-mtl" = callPackage @@ -85824,7 +86178,7 @@ self: { base exception-transformers mtl transformers ]; description = "Exception monad transformer instances for mtl classes"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "exception-transformers" = callPackage @@ -85841,7 +86195,7 @@ self: { transformers-compat ]; description = "Type classes and monads for unchecked extensible exceptions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "exception-via" = callPackage @@ -85852,7 +86206,7 @@ self: { sha256 = "046f787jw3v1c61q9c9canq0m266wv39rsk0613fyrhl96sss66m"; libraryHaskellDepends = [ base template-haskell ]; description = "DerivingVia for your hierarchical exceptions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "exceptional" = callPackage @@ -85863,8 +86217,8 @@ self: { sha256 = "01lzx4ihdvyivjnkvn78hcdsk83dvm6iy9v5q1f28kd1iv96x1ns"; libraryHaskellDepends = [ base exceptions ]; description = "Essentially the Maybe type with error messages"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -85880,8 +86234,8 @@ self: { testHaskellDepends = [ base hspec process temporary ]; benchmarkHaskellDepends = [ base criterion deepseq ]; description = "An exception-free readFile for use with '+RTS -xc -RTS' projects"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -85904,8 +86258,8 @@ self: { test-framework-hunit test-framework-quickcheck2 transformers ]; description = "Extensible optionally-pure exceptions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "exchangerates" = callPackage @@ -85933,8 +86287,8 @@ self: { validity-containers validity-time yaml ]; description = "A Haskell client for https://exchangeratesapi.io/"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -85949,8 +86303,8 @@ self: { libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base directory process text ]; description = "Tool to run stack exec prj-exe more easy"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -85975,7 +86329,7 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Provides the SHA1 hash of the program executable"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "executable-path" = callPackage @@ -85986,7 +86340,7 @@ self: { sha256 = "0vxwmnsvx13cawcyhbyljkds0l1vr996ijldycx7nj0asjv45iww"; libraryHaskellDepends = [ base directory filepath unix ]; description = "Finding out the full path of the executable"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "executor" = callPackage @@ -85998,8 +86352,8 @@ self: { libraryHaskellDepends = [ async base process ]; testHaskellDepends = [ async base doctest hspec process ]; description = "Shell helpers"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -86030,11 +86384,36 @@ self: { mtl multistate process transformers ]; description = "Tool to search/generate (haskell) expressions with a given type"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; + "exh" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, containers + , hspec, html-conduit, http-client, http-client-tls, in-other-words + , language-javascript, megaparsec, optics-core, optics-th, text + , time, transformers, xml-conduit, xml-optics + }: + mkDerivation { + pname = "exh"; + version = "1.0.0"; + sha256 = "0s5br96spx4v67mvl09w4kpcwvps65zp6qx5qpvrq63a0ncclp7l"; + libraryHaskellDepends = [ + aeson base bytestring conduit containers html-conduit http-client + in-other-words language-javascript megaparsec optics-core optics-th + text time transformers xml-conduit xml-optics + ]; + testHaskellDepends = [ + aeson base bytestring conduit containers hspec html-conduit + http-client http-client-tls in-other-words language-javascript + megaparsec optics-core optics-th text time transformers xml-conduit + xml-optics + ]; + description = "A library for crawling exhentai"; + license = lib.licenses.bsd3; + }) {}; + "exhaustive" = callPackage ({ mkDerivation, base, generics-sop, template-haskell, transformers }: @@ -86046,7 +86425,7 @@ self: { base generics-sop template-haskell transformers ]; description = "Compile time checks that a computation considers producing data through all possible constructors"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "exherbo-cabal" = callPackage @@ -86070,8 +86449,8 @@ self: { ]; testHaskellDepends = [ base doctest ]; description = "Exheres generator for cabal packages"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -86084,8 +86463,8 @@ self: { libraryHaskellDepends = [ base ]; librarySystemDepends = [ exif ]; description = "A Haskell binding to a subset of libexif"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) exif;}; @@ -86105,7 +86484,7 @@ self: { string-conversions temporary text unordered-containers vector ]; description = "Haskell bindings to ExifTool"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "exigo-schema" = callPackage @@ -86130,8 +86509,8 @@ self: { resourcet template-haskell temporary text ]; description = "database schema for exigo marking/assessment tools"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -86153,7 +86532,7 @@ self: { QuickCheck singletons tasty tasty-hunit tasty-quickcheck ]; description = "Dependent pairs and their instances"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "exinst-aeson" = callPackage @@ -86171,7 +86550,7 @@ self: { aeson base bytestring exinst QuickCheck tasty tasty-quickcheck ]; description = "Dependent pairs and their instances"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "exinst-bytes" = callPackage @@ -86191,7 +86570,7 @@ self: { tasty tasty-quickcheck ]; description = "Dependent pairs and their instances"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "exinst-cereal" = callPackage @@ -86210,7 +86589,7 @@ self: { tasty-quickcheck ]; description = "Dependent pairs and their instances"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "exinst-deepseq" = callPackage @@ -86221,8 +86600,8 @@ self: { sha256 = "0q9fq5w6lir3qqybf8d0j0hhs33zsvv1xg49669cv5irl9hixh9z"; libraryHaskellDepends = [ base constraints deepseq exinst ]; description = "Derive instances for the `deepseq` library for your existential types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -86236,8 +86615,8 @@ self: { base constraints exinst hashable singletons ]; description = "Derive instances for the `hashable` library for your existential types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -86256,7 +86635,7 @@ self: { base binary exinst QuickCheck serialise tasty tasty-quickcheck ]; description = "Dependent pairs and their instances"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "exist" = callPackage @@ -86267,7 +86646,7 @@ self: { sha256 = "0w2ip29f99qzi3wxicydkv991ws0lhnar3w0qka54r2mjb3xzrk9"; libraryHaskellDepends = [ base base-unicode-symbols util ]; description = "Dependent sum type"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "exist-instances" = callPackage @@ -86282,7 +86661,7 @@ self: { base base-unicode-symbols constraint exist util ]; description = "Instances for \"exist\" package (requires more language extensions and dependencies)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "existential" = callPackage @@ -86302,8 +86681,8 @@ self: { unordered-containers ]; description = "Existential types with lens-like accessors"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {control-invariants = null;}; @@ -86315,8 +86694,8 @@ self: { sha256 = "1f7v2f7jmqx0nkl2wla88mnb21nava74b73rvsmfbj4kxmwchsgy"; libraryHaskellDepends = [ base contravariant ]; description = "Existential datatypes holding evidence of constraints"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -86328,7 +86707,7 @@ self: { sha256 = "00cyli96zkyqhjr3lqzrislqyk72xwm2dcqvjagklidh32d4k8ja"; libraryHaskellDepends = [ base ]; description = "Exit codes as defined by BSD"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "exitcode" = callPackage @@ -86348,8 +86727,8 @@ self: { tasty-hunit tasty-quickcheck transformers ]; description = "Monad transformer for exit codes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -86364,7 +86743,7 @@ self: { libraryToolDepends = [ c2hs ]; description = "Compression and decompression in the exomizer format"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "exotic-list-monads" = callPackage @@ -86379,7 +86758,7 @@ self: { testHaskellDepends = [ base hspec hspec-core QuickCheck ]; testToolDepends = [ hspec-discover ]; description = "Non-standard monads on lists and non-empty lists"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "exp-cache" = callPackage @@ -86401,7 +86780,7 @@ self: { testHaskellDepends = [ base HUnit QuickCheck random tasty tasty-hunit tasty-quickcheck ]; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "exp-extended" = callPackage @@ -86412,8 +86791,8 @@ self: { sha256 = "14bz6wfzd8b51s09d2psg5hv5zq4f8lplgx0yvd3n0z704x3mcy6"; libraryHaskellDepends = [ base ]; description = "floating point with extended exponent range"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -86438,7 +86817,7 @@ self: { base bimap containers gauge prettyprinter raw-strings-qq ]; description = "Linear programming over exponent pairs"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "expand" = callPackage @@ -86452,7 +86831,7 @@ self: { ]; description = "Extensible Pandoc"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -86468,8 +86847,8 @@ self: { base bytestring enumerator hexpat text transformers xml-types ]; description = "Enumerator-based API for Expat"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -86502,7 +86881,7 @@ self: { unliftio-core vector ]; description = "Perform scientific experiments stored in a DB, and generate reports"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "expiring-cache-map" = callPackage @@ -86520,7 +86899,7 @@ self: { base bytestring containers hashable time unordered-containers ]; description = "General purpose simple caching"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "expiring-containers" = callPackage @@ -86543,8 +86922,8 @@ self: { tasty-hunit tasty-quickcheck timestamp ]; description = "Expiring containers"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -86556,7 +86935,7 @@ self: { sha256 = "0mkc7d346vdsjg83a253986w4pps53r262w1if91q16kx6qci7yy"; libraryHaskellDepends = [ base ]; description = "Create values which expire after a period of time"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "explain" = callPackage @@ -86571,8 +86950,8 @@ self: { ansi-wl-pprint base haskell-src-exts ]; description = "Show how expressions are parsed"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -86587,8 +86966,8 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Fully-flexible polymorphic lenses, without any bizarre profunctors"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -86600,8 +86979,8 @@ self: { sha256 = "0g20kblzvhx53mi82frpx29x0nsfjrzsanqq8f6yw22lh47pbm4y"; libraryHaskellDepends = [ base ]; description = "explicit computation of determinant of small matrices"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -86615,7 +86994,7 @@ self: { isExecutable = true; libraryHaskellDepends = [ base deepseq semigroups transformers ]; description = "Exceptions which are explicit in the type signature"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "explicit-iomodes" = callPackage @@ -86626,8 +87005,8 @@ self: { sha256 = "0irz1zy6iaipym73x343zvr6cqym6ci2vbjbyr564d29ymd6ldzd"; libraryHaskellDepends = [ base base-unicode-symbols tagged ]; description = "File handles with explicit IOModes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -86639,8 +87018,8 @@ self: { sha256 = "0h3dlgkd2gx8zr3sh949nhqgrdg943dgpp4v1n599jjjpqpw16hj"; libraryHaskellDepends = [ base bytestring explicit-iomodes ]; description = "Extends explicit-iomodes with ByteString operations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -86652,8 +87031,8 @@ self: { sha256 = "12ny5wa1j1wp8fbg5k8zkv4a3axmssxcvfvhg3frsm4dych6hmyg"; libraryHaskellDepends = [ base explicit-iomodes text ]; description = "Extends explicit-iomodes with Text operations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -86667,8 +87046,8 @@ self: { base containers derive mtl template-haskell ]; description = "Explicit Sharing of Monadic Effects"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -86682,8 +87061,8 @@ self: { isExecutable = true; executableHaskellDepends = [ array base directory pngload ]; description = "Experimental Plot data Reconstructor"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -86704,8 +87083,8 @@ self: { test-framework test-framework-hunit test-framework-quickcheck2 ]; description = "A distribution of the 'containers' package, with all modules exposed"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -86719,7 +87098,7 @@ self: { testHaskellDepends = [ base leancheck ]; benchmarkHaskellDepends = [ base leancheck ]; description = "Dynamically-typed expressions involving applications and variables"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "expression-parser" = callPackage @@ -86730,8 +87109,8 @@ self: { sha256 = "1ldp1f2c823byx4ag8jpmq9bhw26lq98fz7ljqslffs37pc098qs"; libraryHaskellDepends = [ base ]; description = "Generalization of parsec's expression parser"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -86749,8 +87128,8 @@ self: { ]; testHaskellDepends = [ base singletons text ]; description = "Expressions and Formulae a la carte"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -86769,8 +87148,8 @@ self: { base containers expressions singletons transformers z3 ]; description = "Encode and Decode expressions from Z3 ASTs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -86799,8 +87178,8 @@ self: { tasty tasty-hunit text unordered-containers wl-pprint ]; description = "A simple expressions language based on row types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -86818,8 +87197,8 @@ self: { pretty syb ]; description = "Libraries for processing GHC Core"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -86842,8 +87221,8 @@ self: { xml ]; description = "automated printing for extemp speakers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -86856,7 +87235,7 @@ self: { libraryHaskellDepends = [ attoparsec base template-haskell text ]; testHaskellDepends = [ attoparsec base template-haskell text ]; description = "TH to define a new record data type that extends the existing record data type"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "extended-categories" = callPackage @@ -86867,8 +87246,8 @@ self: { sha256 = "1dg9zvqszlg5v3mygazzgm84qlkcmpryv3vv4x3zwrzi1g0idq72"; libraryHaskellDepends = [ base constraints ghc-prim tagged ]; description = "Extended Categories"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -86881,7 +87260,7 @@ self: { libraryHaskellDepends = [ base transformers vector ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "Heap and Vector container types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "extended-containers-lens" = callPackage @@ -86892,7 +87271,7 @@ self: { sha256 = "107nfyrp62h6qwc3ra08cd9vyaanc7442wcbfmm83aw05fav3p43"; libraryHaskellDepends = [ base extended-containers lens ]; description = "lens instances for extended-containers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "extended-reals" = callPackage @@ -86909,7 +87288,7 @@ self: { tasty-th ]; description = "Extension of real numbers with positive/negative infinities"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "extensible" = callPackage @@ -86931,7 +87310,7 @@ self: { ]; testHaskellDepends = [ base lens QuickCheck template-haskell ]; description = "Extensible, efficient, optics-friendly data types and effects"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "extensible-data" = callPackage @@ -86946,8 +87325,8 @@ self: { base data-lens hashable template-haskell unordered-containers ]; description = "Sums/products/lists/trees which can be extended in other modules"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -86973,7 +87352,7 @@ self: { test-framework-quickcheck2 test-framework-th ]; description = "An Alternative to Monad Transformers"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "extensible-effects-concurrent" = callPackage @@ -87007,8 +87386,8 @@ self: { base criterion deepseq extensible-effects text unliftio ]; description = "Message passing concurrency as extensible-effect"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -87020,7 +87399,7 @@ self: { sha256 = "1273nqws9ij1rp1bsq5jc7k2jxpqa0svawdbim05lf302y0firbc"; libraryHaskellDepends = [ base ]; description = "Extensible exceptions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "extensible-skeleton" = callPackage @@ -87038,8 +87417,8 @@ self: { ]; testHaskellDepends = [ base extensible ]; description = "Operational-based extensible effect library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -87051,7 +87430,7 @@ self: { sha256 = "0s51rvsg41dymk173fxf7065yynlgx234xjs149lzm00gcwv92r6"; libraryHaskellDepends = [ base lens ]; description = "light-weight, extensible sums and products over types and kinds"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "extensions" = callPackage @@ -87078,7 +87457,7 @@ self: { hspec-hedgehog text ]; description = "Parse Haskell Language Extensions"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "external-sort" = callPackage @@ -87091,8 +87470,8 @@ self: { base binary bytestring EdisonAPI EdisonCore ]; description = "Sort large arrays on your hard drive. Kind of like the unix util sort."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -87111,7 +87490,7 @@ self: { base directory filepath QuickCheck quickcheck-instances unix ]; description = "Extra functions I use"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "extract-dependencies" = callPackage @@ -87131,8 +87510,8 @@ self: { async base Cabal containers package-description-remote ]; description = "Given a hackage package outputs the list of its dependencies"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -87144,7 +87523,7 @@ self: { sha256 = "1bf0naqx0gb66dr7g58lfaba87zmg09ynzdb3cyyymwcv4l1knp8"; libraryHaskellDepends = [ base transformers ]; description = "A functor, where the \"stored\" value is isomorphic to Identity"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "extractelf" = callPackage @@ -87162,8 +87541,8 @@ self: { optparse-applicative ]; description = "Extract an ELF's metadata and sections into files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -87179,8 +87558,8 @@ self: { aeson base bytestring http-client http-client-tls text time ]; description = "API Client for ExtraLife team and user data"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -87197,7 +87576,7 @@ self: { ]; testHaskellDepends = [ base express leancheck speculate ]; description = "generalize counter-examples of test properties"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ez-couch" = callPackage @@ -87220,8 +87599,8 @@ self: { vector ]; description = "A high level static library for working with CouchDB"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -87235,8 +87614,8 @@ self: { editedCabalFile = "1x0fskz64l9xvywiif9jmmnjkkr7pbdri9y6k3cxgl47yipi0kf2"; libraryHaskellDepends = [ base transformers z3 ]; description = "Z3 bonds with pure interface"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -87248,8 +87627,8 @@ self: { sha256 = "1vxhfr4wqm2bclnq15lp4q496w3916ll9chj6mcqbn0r64bmmkn8"; libraryHaskellDepends = [ base template-haskell ]; description = "Generate a special f-algebra combinator from any data type"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -87265,8 +87644,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base ]; description = "Spam"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -87278,8 +87657,8 @@ self: { sha256 = "0apgad2rqpgxypm10n98agmfrlxydcawvsvyafdwj8jhynfycx03"; libraryHaskellDepends = [ base free ]; description = "Faceted computation for dynamic information flow security"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -87303,7 +87682,7 @@ self: { base containers parsec pretty QuickCheck random time ]; description = "Factoring integers and polynomials"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "factory" = callPackage @@ -87329,7 +87708,7 @@ self: { ]; description = "Rational arithmetic in an irrational world"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -87343,8 +87722,8 @@ self: { editedCabalFile = "03v6p3vlilz6vk5xlvw3r31cqicx3m1xjii9shcqpacxvlh2zzlp"; libraryHaskellDepends = [ base exceptions mtl template-haskell ]; description = "Refined types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -87362,8 +87741,8 @@ self: { HTTP MissingH text unordered-containers utf8-string vector ]; description = "A driver for the Factual API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -87375,7 +87754,7 @@ self: { sha256 = "00n5m3fa14y882rnzw7pwc154bgp46rhvvj2cghldvybxmj61zgm"; libraryHaskellDepends = [ base ]; description = "Forward Automatic Differentiation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fadno" = callPackage @@ -87395,8 +87774,8 @@ self: { base containers fadno-xml hspec hspec-contrib HUnit lens ]; description = "Minimal library for music generation and notation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -87413,8 +87792,8 @@ self: { diagrams-rasterific lens random ]; description = "Braid representations in Haskell"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -87429,8 +87808,8 @@ self: { base containers Decimal lens mtl parsec xml ]; description = "XML/XSD combinators/schemas/codegen"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -87442,7 +87821,7 @@ self: { sha256 = "18nlj6xvnggy61gwbyrpmvbdkq928wv0wx2zcsljb52kbhddnp3d"; doHaddock = false; description = "Forward-compatible MonadFail class"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "failable" = callPackage @@ -87453,7 +87832,7 @@ self: { sha256 = "1vffrjywaxwfpzb6a34il772mkkaqwv9372aibijnvwf82rnglwg"; libraryHaskellDepends = [ base mtl transformers ]; description = "A 'Failable' error monad class to unify failure across monads that can fail"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "failable-list" = callPackage @@ -87464,8 +87843,8 @@ self: { sha256 = "0bq0q9n4wnacjqs517i12kl56m16n5ff4gk8kamh87gqkd58w06x"; libraryHaskellDepends = [ base ]; description = "A list-like type for lazy streams, which might terminate with an error"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -87477,7 +87856,7 @@ self: { sha256 = "0jimc2x46zq7wnmzfbnqi67jl8yhbvr0fa65ljlc9p3fns9mca3p"; libraryHaskellDepends = [ base transformers ]; description = "A simple type class for success/failure computations. (deprecated)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "failure-detector" = callPackage @@ -87493,8 +87872,8 @@ self: { base QuickCheck tasty tasty-quickcheck time ]; description = "Failure Detectors implimented in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -87512,7 +87891,7 @@ self: { testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; benchmarkHaskellDepends = [ base criterion ]; description = "Lists with fair choice"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fair-predicates" = callPackage @@ -87524,7 +87903,7 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base ]; description = "Fair Predicates"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "fake" = callPackage @@ -87540,8 +87919,8 @@ self: { ]; testHaskellDepends = [ base hspec random text time ]; description = "Randomly generated fake data"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -87554,8 +87933,8 @@ self: { libraryHaskellDepends = [ base base-prelude split X11 ]; librarySystemDepends = [ libXtst ]; description = "A crossplatform library to simulate keyboard input"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs.xorg) libXtst;}; @@ -87588,8 +87967,8 @@ self: { template-haskell text time unordered-containers vector yaml ]; description = "Library for producing fake data"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -87601,7 +87980,7 @@ self: { sha256 = "0rf4mr9977p70vsinr3iga6l5wzkxnkxd52j4jmdmrk5b6i3flcp"; libraryHaskellDepends = [ attoparsec base text ]; testHaskellDepends = [ attoparsec base hspec text ]; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fakedata-quickcheck" = callPackage @@ -87617,8 +87996,8 @@ self: { base fakedata hspec hspec-core QuickCheck random regex-tdfa text ]; description = "Fake a -> Gen a"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -87635,7 +88014,7 @@ self: { base containers exceptions hspec QuickCheck ]; description = "Extensible fake file system for testing"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "fakepull" = callPackage @@ -87647,7 +88026,7 @@ self: { libraryHaskellDepends = [ base exceptions mtl ]; testHaskellDepends = [ base exceptions hspec mtl QuickCheck ]; description = "Monad to pull from fake stream-like objects"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "faker" = callPackage @@ -87659,7 +88038,7 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base gimlh random split ]; description = "Pure Haskell library for generating fake data"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "faktory" = callPackage @@ -87681,8 +88060,8 @@ self: { testHaskellDepends = [ aeson base hspec markdown-unlit ]; testToolDepends = [ markdown-unlit ]; description = "Faktory Worker for Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -87694,7 +88073,7 @@ self: { sha256 = "0jj806klxagv65ddxb85gdy89m46p4yqxr9y5s5gc4arb5xzlwjq"; libraryHaskellDepends = [ base transformers ]; testHaskellDepends = [ base transformers ]; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "falling-turnip" = callPackage @@ -87713,8 +88092,8 @@ self: { repa-algorithms vector ]; description = "Falling sand game/cellular automata simulation using regular parallel arrays"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -87734,7 +88113,7 @@ self: { ]; description = "A fun falling blocks game"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -87746,7 +88125,7 @@ self: { sha256 = "1yqbq038axx9a2j3kbdm11w3fgvkix2w7dqhrbf353r2n8vigxg8"; libraryHaskellDepends = [ base ]; description = "Reifies arbitrary terms into types that can be reflected back into terms"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "family-tree" = callPackage @@ -87762,8 +88141,8 @@ self: { unordered-containers ]; description = "A family tree library for the Haskell programming language"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -87777,7 +88156,7 @@ self: { testHaskellDepends = [ base bytestring hspec QuickCheck ]; benchmarkHaskellDepends = [ base bytestring criterion ]; description = "Fast hash functions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fast-arithmetic" = callPackage @@ -87795,8 +88174,8 @@ self: { ]; doHaddock = false; description = "Fast functions on integers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -87816,7 +88195,7 @@ self: { scientific template-haskell text unordered-containers vector ]; description = "Fast ByteString Builder"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "fast-combinatorics" = callPackage @@ -87834,8 +88213,8 @@ self: { testHaskellDepends = [ base hspec ]; benchmarkHaskellDepends = [ base criterion ]; description = "Fast combinatorics"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -87855,8 +88234,8 @@ self: { benchmarkHaskellDepends = [ base digits gauge ]; doHaddock = false; description = "Integer-to-digits conversion"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -87872,7 +88251,7 @@ self: { base containers mtl process temporary text transformers ]; description = "Solve classical planning problems (STRIPS/SAS+) using Haskell & Fast Downward"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fast-logger" = callPackage @@ -87891,7 +88270,7 @@ self: { testHaskellDepends = [ base bytestring directory hspec ]; testToolDepends = [ hspec-discover ]; description = "A fast logging system"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fast-math" = callPackage @@ -87902,7 +88281,7 @@ self: { sha256 = "15dyw88z9abiv6n40fz4g3jpj9v6qbxvqaf0ds32wh46igf1s425"; libraryHaskellDepends = [ base ]; description = "Non IEEE-754 compliant compile-time floating-point optimisations"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fast-mult" = callPackage @@ -87913,7 +88292,7 @@ self: { sha256 = "0lpgfb1a2kf0c9w9br2izzqn0f66pchydnq87a7z74lzs5jm1bba"; libraryHaskellDepends = [ base ghc-prim integer-gmp strict-base ]; description = "Numeric type with asymptotically faster multiplications"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fast-nats" = callPackage @@ -87924,8 +88303,8 @@ self: { sha256 = "1kp34h0ghpr3hwkbybwy954kbbdkbychzhjh4g1q44b2a8rgi5w1"; libraryHaskellDepends = [ base ]; description = "Natural Numbers with no overhead"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -87952,7 +88331,7 @@ self: { base bytestring tasty tasty-hunit text void ]; description = "Fast incremental vi and emacs tags"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fast-tagsoup" = callPackage @@ -87967,7 +88346,7 @@ self: { base bytestring containers tagsoup text text-icu ]; description = "Fast parsing and extracting information from (possibly malformed) HTML/XML documents"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fast-tagsoup-utf8-only" = callPackage @@ -87978,7 +88357,7 @@ self: { sha256 = "10svhgjvp1802jawr1s5chkincl2xhh6k0grm60f216jpasbvff4"; libraryHaskellDepends = [ base bytestring tagsoup text ]; description = "Fast parser for tagsoup package"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fasta" = callPackage @@ -87995,8 +88374,8 @@ self: { pipes-attoparsec pipes-bytestring pipes-group pipes-text split text ]; description = "A simple, mindless parser for fasta files"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -88008,8 +88387,8 @@ self: { sha256 = "1nqrfrhw8gd3blfzrwbf7pm4wwqbxfaw640bzx62kwh7x2h6v3cm"; libraryHaskellDepends = [ base hmatrix vector ]; description = "Bayesian modeling algorithms accelerated for particular model structures"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -88022,7 +88401,7 @@ self: { libraryHaskellDepends = [ base bytestring cgi ]; librarySystemDepends = [ fcgi ]; description = "A Haskell library for writing FastCGI programs"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) fcgi;}; "fastedit" = callPackage @@ -88043,8 +88422,8 @@ self: { QuickCheck ]; description = "find nearest neighbours by edit-distance"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -88061,8 +88440,8 @@ self: { network-fancy ]; description = "Fast Internet Relay Chat (IRC) library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -88082,8 +88461,8 @@ self: { ]; testHaskellDepends = [ base hspec text ]; description = "A highly experimental Fastly API client"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -88102,7 +88481,7 @@ self: { ]; benchmarkHaskellDepends = [ base bytestring criterion ]; description = "A fast, but bare bones, bytestring parser combinators library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fastpbkdf2" = callPackage @@ -88122,7 +88501,7 @@ self: { base bytestring criterion cryptonite pbkdf ]; description = "Haskell bindings to the fastpbkdf2 C library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) openssl;}; "fastsum" = callPackage @@ -88141,8 +88520,8 @@ self: { base deepseq ghc-prim hashable template-haskell ]; description = "A fast open-union type suitable for 100+ contained alternatives"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -88157,8 +88536,8 @@ self: { base bytestring cassava hxt network-uri text ]; description = "Utilities for working with DuckDuckHack's FatHead Instant Answers"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -88170,8 +88549,8 @@ self: { sha256 = "04m6hfj0sqhmq89fwfq4igz1rc0p3rzkhfg6fzsw5kyda2c8bbz0"; libraryHaskellDepends = [ base yices ]; description = "A fault tree analysis library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -88186,8 +88565,8 @@ self: { }: mkDerivation { pname = "fay"; - version = "0.24.1.0"; - sha256 = "0cihrggbxmjfz34kbf7nbzn20v2sapfjql6hc5m68rbiiysb8jk3"; + version = "0.24.2.0"; + sha256 = "08s7cp2nq9nbr56jzapjf3vylnc6vb4xmf6qwcwvnjwzlvzfv96c"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -88202,8 +88581,8 @@ self: { ]; executableHaskellDepends = [ base mtl optparse-applicative split ]; description = "A compiler for Fay, a Haskell subset that compiles to JavaScript"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -88211,13 +88590,13 @@ self: { ({ mkDerivation, base, fay }: mkDerivation { pname = "fay-base"; - version = "0.21.1.1"; - sha256 = "09fnivdghxc750gpsa3hr7vgj3hff21zj7k73dfkxbkaj48bpf7q"; + version = "0.21.2.0"; + sha256 = "04dzwjwli88mxjl1cdmqbmnqjyn9mvc808vpf0lhv5kxky90078c"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base fay ]; description = "The base package for Fay"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -88235,8 +88614,8 @@ self: { base Cabal data-default directory fay filepath safe split text ]; description = "Compile Fay code on cabal install, and ad-hoc recompile during development"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -88251,8 +88630,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ fay-base ]; description = "DOM FFI wrapper library for Fay"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -88265,8 +88644,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ fay-base fay-text ]; description = "W3C compliant implementation of GeoPosition API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -88279,8 +88658,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ fay-base fay-jquery ]; description = "Clientside HTML generation for fay"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -88293,8 +88672,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ fay-base fay-text ]; description = "jQuery bindings for Fay"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -88307,8 +88686,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ fay-base ]; description = "Like IORef but for Fay"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -88321,8 +88700,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ fay-base ]; description = "SimpleJSON library for Fay"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -88337,8 +88716,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ fay fay-base text ]; description = "Fay Text type represented as JavaScript strings"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -88351,8 +88730,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ fay-base ]; description = "Persistent FFI bindings for using jsUri in Fay"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -88365,8 +88744,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ fay-base ]; description = "Websockets FFI library for Fay"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -88393,7 +88772,7 @@ self: { unliftio ]; description = "Bindings to Facebook's API"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fb-persistent" = callPackage @@ -88404,8 +88783,8 @@ self: { sha256 = "1il06mlvvjybfnqpdnir9nr1g0irf84fa4q8lzavrlqgny8f294s"; libraryHaskellDepends = [ base cereal fb persistent text time ]; description = "Provides Persistent instances to Facebook types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -88434,8 +88813,8 @@ self: { ]; testHaskellDepends = [ aeson base bytestring filepath hspec text ]; description = "High-level bindings to Facebook Messenger Platform API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -88452,8 +88831,8 @@ self: { unordered-containers ]; description = "Algo for Formal Concept Analysis"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.agpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -88470,8 +88849,8 @@ self: { ]; testHaskellDepends = [ base hspec mtl ]; description = "Cache a function (a -> b)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -88491,8 +88870,8 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "A faster way to navigate directories using the command line"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -88508,8 +88887,8 @@ self: { executableHaskellDepends = [ base first-class-families ]; testHaskellDepends = [ base doctest first-class-families Glob ]; description = "Data structures and algorithms for first-class-families"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -88522,8 +88901,8 @@ self: { isLibrary = false; isExecutable = true; description = "TBA"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -88535,8 +88914,8 @@ self: { sha256 = "1yvsnk9awik143jh2268w1l5x70kmky60gac10fy2y1450dcn65x"; libraryHaskellDepends = [ base cgi HaXml xhtml ]; description = "Server-Side Integration for FCKeditor"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -88556,7 +88935,7 @@ self: { ]; benchmarkHaskellDepends = [ base criterion ]; description = "First class accessor labels implemented as lenses"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fclabels-monadlib" = callPackage @@ -88567,8 +88946,8 @@ self: { sha256 = "1j15fxrpwnjnbjkswsy6jxn8f0bj2nhcdsf5976i7rka7gsjzr3d"; libraryHaskellDepends = [ base fclabels monadLib ]; description = "MonadLib monadic interface for the \"fclabels\" package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -88600,8 +88979,8 @@ self: { test-framework test-framework-hunit test-framework-quickcheck2 text ]; description = "Admin API for Firebase Cloud Messaging"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -88613,7 +88992,7 @@ self: { sha256 = "1n4zk1i7g34w0wk5zy8n4r63xbglxf62h8j78kv5fc2yn95l30vh"; libraryHaskellDepends = [ base containers dbus ]; description = "Desktop Notifications client"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fdo-trash" = callPackage @@ -88633,8 +89012,8 @@ self: { base Diff directory filepath old-locale parsec time unix url ]; description = "Utilities related to freedesktop Trash standard"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -88646,7 +89025,7 @@ self: { sha256 = "03jpdg50g43lb3akfyfs0yh630igqfm0dg62bk4s5yv23cmbn8vf"; libraryHaskellDepends = [ base containers microlens-platform mtl ]; testHaskellDepends = [ base containers microlens-platform mtl ]; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "feature-flags" = callPackage @@ -88657,7 +89036,7 @@ self: { sha256 = "1lssjgksq0k2dd7l5lmzxnr9f5zk3gbh386zfmcqgc4iczdzfk0f"; libraryHaskellDepends = [ base text ]; description = "A simple library for dynamically enabling and disabling functionality"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "feature-flipper" = callPackage @@ -88675,8 +89054,8 @@ self: { base bytestring containers digest hspec mtl text ]; description = "A minimally obtrusive feature flag library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -88698,8 +89077,8 @@ self: { persistent persistent-postgresql ]; description = "A minimally obtrusive feature flag library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -88722,7 +89101,7 @@ self: { sha256 = "0hynmwic940vmna0czavbp1wx856ad9am7i6r0d2hq8jynrsin5w"; libraryHaskellDepends = [ base ]; description = "Library for Fedora distribution versions"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "fedora-haskell-tools" = callPackage @@ -88741,7 +89120,7 @@ self: { process simple-cmd simple-cmd-args split time unix ]; description = "Building and maintenance tools for Fedora Haskell"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "fedora-img-dl" = callPackage @@ -88761,8 +89140,8 @@ self: { xdg-userdirs ]; description = "Fedora image download tool"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -88785,8 +89164,8 @@ self: { io-streams lens text ]; description = "Haskell interface to the Fedora Packages webapp API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -88802,7 +89181,7 @@ self: { executableHaskellDepends = [ base QuickCheck ]; testHaskellDepends = [ base QuickCheck ]; description = "Short description of your package"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "feed" = callPackage @@ -88828,7 +89207,7 @@ self: { ]; testToolDepends = [ markdown-unlit ]; description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds."; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "feed-cli" = callPackage @@ -88846,8 +89225,8 @@ self: { base directory feed old-locale old-time time xml ]; description = "A simple command line interface for creating and updating feeds like RSS"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -88865,8 +89244,8 @@ self: { time-interval time-units timerep transformers utf8-string ]; description = "Watch RSS/Atom feeds (and do with them whatever you like)"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -88883,8 +89262,8 @@ self: { network-uri text transformers ]; description = "Utility for fetching feeds with redirect info and HTML link detection"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -88923,8 +89302,8 @@ self: { tasty-smallcheck temporary text transformers ]; description = "CI service around gipeda"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -88946,8 +89325,8 @@ self: { raw-strings-qq scotty text transformers wai warp wreq xml ]; description = "Translate syndication feeds"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.agpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -88966,8 +89345,8 @@ self: { regex-posix tagsoup time utf8-string ]; description = "(unsupported)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -88984,8 +89363,8 @@ self: { base bytestring download-curl feed hs-twitter ]; description = "Send posts from a feed to Twitter"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -89013,8 +89392,8 @@ self: { executableSystemDepends = [ mxnet ]; executableToolDepends = [ c2hs ]; description = "FFI to MXNet"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) mxnet;}; @@ -89042,8 +89421,8 @@ self: { optparse-applicative palette Rasterific repa rio store ]; description = "Cocodataset with cocoapi"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -89070,8 +89449,8 @@ self: { executableSystemDepends = [ mxnet ]; testHaskellDepends = [ base fei-base hspec streaming ]; description = "mxnet dataiters"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) mxnet;}; @@ -89101,8 +89480,8 @@ self: { stm-conduit vector ]; description = "Some datasets"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -89123,8 +89502,8 @@ self: { optparse-applicative random-source repa resourcet rio store ]; description = "fei examples"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -89141,8 +89520,8 @@ self: { text transformers-base vector ]; description = "A collection of standard models"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -89164,8 +89543,8 @@ self: { transformers-base type-combinators uuid wl-pprint-text ]; description = "Train a neural network with MXNet in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -89194,8 +89573,8 @@ self: { base criterion data-default deepseq feldspar-language ]; description = "Compiler for the Feldspar language"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {gcc_s = null;}; @@ -89219,8 +89598,8 @@ self: { tasty-quickcheck tasty-th utf8-string ]; description = "A functional embedded language for DSP and parallelism"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -89238,8 +89617,8 @@ self: { feldspar-language imperative-edsl mainland-pretty monadic-edsl-priv ]; description = "Signal Processing extension for Feldspar"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {feldspar-compiler-shim = null; monadic-edsl-priv = null;}; @@ -89262,7 +89641,7 @@ self: { api-opentheory-unicode base opentheory-unicode ]; description = "Converting a chess position from FEN notation to text"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "fences" = callPackage @@ -89274,7 +89653,7 @@ self: { libraryHaskellDepends = [ base ]; doHaddock = false; description = "To be written"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "fenfire" = callPackage @@ -89294,7 +89673,7 @@ self: { executableSystemDepends = [ raptor ]; description = "Graph-based notetaking system"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {raptor = null;}; @@ -89320,8 +89699,8 @@ self: { tasty-hunit tasty-quickcheck time ]; description = "Generate and verify HMAC-based authentication tokens"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -89352,8 +89731,8 @@ self: { yesod yesod-test ]; description = "Remote multi-db SQLCipher server"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -89365,8 +89744,8 @@ self: { sha256 = "1gssbkwg9lqm3ajqkkcjnxjz8nhz855ki2hi5n2di3dappr73f0b"; libraryHaskellDepends = [ base containers regex-compat ]; description = "Simple functions for loading config files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -89381,8 +89760,8 @@ self: { libraryHaskellDepends = [ base HTTP json network utf8-string ]; executableHaskellDepends = [ base pretty ]; description = "Haskell binding to the FriendFeed API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -89404,8 +89783,8 @@ self: { unordered-containers ]; description = "automatic C++ binding generation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -89417,7 +89796,7 @@ self: { sha256 = "05ljkq3zv8nfx4xhvqql13qd81v46bnxnja8f8590yrf3zfqg87x"; libraryHaskellDepends = [ base bytestring template-haskell ]; description = "Runtime for fficxx-generated library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ffmpeg-light" = callPackage @@ -89439,7 +89818,7 @@ self: { ffmpeg libavcodec libavdevice libavformat libswscale ]; description = "Minimal bindings to the FFmpeg library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) ffmpeg; libavcodec = null; libavdevice = null; libavformat = null; libswscale = null;}; @@ -89456,8 +89835,8 @@ self: { base bytestring haskell98 hs-ffmpeg SDL stm ]; description = "Tutorials on ffmpeg usage to play video/audio"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -89475,7 +89854,7 @@ self: { libraryPkgconfigDepends = [ fftw fftwFloat ]; testHaskellDepends = [ base carray QuickCheck storable-complex ]; description = "Bindings to the FFTW library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) fftw; inherit (pkgs) fftwFloat;}; "fftwRaw" = callPackage @@ -89487,7 +89866,7 @@ self: { libraryHaskellDepends = [ base ]; librarySystemDepends = [ fftw ]; description = "Low level bindings to FFTW"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) fftw;}; "ffunctor" = callPackage @@ -89506,8 +89885,8 @@ self: { ]; testToolDepends = [ tasty-discover ]; description = "FFunctor typeclass"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -89525,7 +89904,7 @@ self: { testHaskellDepends = [ base containers hspec QuickCheck ]; benchmarkHaskellDepends = [ base deepseq microbench ]; description = "Martin Erwig's Functional Graph Library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fgl-arbitrary" = callPackage @@ -89537,7 +89916,7 @@ self: { libraryHaskellDepends = [ base fgl QuickCheck ]; testHaskellDepends = [ base containers fgl hspec QuickCheck ]; description = "QuickCheck support for fgl"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fgl-extras-decompositions" = callPackage @@ -89548,8 +89927,8 @@ self: { sha256 = "0p9dv7hq312wjqzm2ha4rafnmd1vplzwd5vk5fmzypgl2a1cz42s"; libraryHaskellDepends = [ base containers fgl ]; description = "Graph decomposition algorithms"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -89561,7 +89940,7 @@ self: { sha256 = "0vwafx0rggksg5i7cx4r2bs5wa6csb5p39vpix425zr3l6vggrxq"; libraryHaskellDepends = [ base dotgen fgl ]; description = "Convert FGL graphs to dot (graphviz) files"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fib" = callPackage @@ -89572,7 +89951,7 @@ self: { sha256 = "17pk2fzgr4jjmpam52vmqg69927gfsl81w61h7q9zsf1vzd0qnix"; libraryHaskellDepends = [ base-noprelude integer-gmp semirings ]; description = "fibonacci algebra"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fibon" = callPackage @@ -89593,8 +89972,8 @@ self: { process regex-compat statistics syb tabular time vector ]; description = "Tools for running and analyzing Haskell benchmarks"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -89606,7 +89985,7 @@ self: { sha256 = "18jqb4ynjsnpvydzpqzh7l5wyrjb3s3kxgc6a6ipwb6w2hygyf7k"; libraryHaskellDepends = [ base ]; description = "Fast computation of Fibonacci numbers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ficketed" = callPackage @@ -89626,8 +90005,8 @@ self: { wai wai-app-static warp ]; description = "update statically hosted file in a push stule through socketed"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -89643,8 +90022,8 @@ self: { array base containers fclabels monads-fd transformers ]; description = "First-class record field combinators with infix record field syntax"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -89660,7 +90039,7 @@ self: { base base64-bytestring containers json mtl utf8-string ]; description = "Abusing monadic syntax JSON objects generation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fieldwise" = callPackage @@ -89672,8 +90051,8 @@ self: { libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base template-haskell ]; description = "Provides Fieldwise typeclass for operations of fields of records treated as independent components"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -89685,8 +90064,8 @@ self: { sha256 = "03bxiicvfwia5g0whg454ph2s34n8firjcqhn6d7qvbim338hkxq"; libraryHaskellDepends = [ base containers parsec pretty ]; description = "Manipulation of FIG files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -89700,8 +90079,8 @@ self: { base bytestring clock directory zip-archive ]; description = "Provide a uniform interface over file archives and directories"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -89717,8 +90096,8 @@ self: { base parsec process system-filepath template-haskell text ]; description = "Quasiquoter for system commands involving filepaths"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -89735,7 +90114,7 @@ self: { ]; testHaskellDepends = [ base filepath ]; description = "Use Template Haskell to embed file contents directly"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "file-embed-lzma" = callPackage @@ -89754,7 +90133,7 @@ self: { ]; testHaskellDepends = [ base bytestring ]; description = "Use Template Haskell to embed (LZMA compressed) data"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "file-embed-poly" = callPackage @@ -89772,8 +90151,8 @@ self: { base bytestring directory file-embed filepath hspec ]; description = "Use Template Haskell to embed file contents directly"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -89791,8 +90170,8 @@ self: { ]; testHaskellDepends = [ base lifted-base process ]; description = "common functions that show file location information"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -89815,7 +90194,7 @@ self: { regex-compat regex-pcre ]; description = "Takes a Haskell source-code file and outputs its modules"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "file-path-th" = callPackage @@ -89832,7 +90211,7 @@ self: { base directory file-embed filepath template-haskell ]; description = "Template Haskell utilities for filepaths"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "file-templates" = callPackage @@ -89850,7 +90229,7 @@ self: { transformers unordered-containers ]; description = "Use templates for files and directories"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "filecache" = callPackage @@ -89869,8 +90248,8 @@ self: { base containers directory filepath hspec stm temporary ]; description = "A cache system associating values to files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -89892,8 +90271,8 @@ self: { base directory either mtl tasty tasty-hunit text time transformers ]; description = "Diffing and patching module"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -89906,7 +90285,7 @@ self: { libraryHaskellDepends = [ base unix ]; testHaskellDepends = [ async base process ]; description = "Portable interface to file locking (flock / LockFileEx)"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "filemanip" = callPackage @@ -89921,7 +90300,7 @@ self: { base bytestring directory filepath mtl unix-compat ]; description = "Expressive file and directory manipulation for Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fileneglect" = callPackage @@ -89932,8 +90311,8 @@ self: { sha256 = "1s00jlq6cbab0fasx0ngg1n3ilzi634d4a4aday4jngsnvbwb735"; libraryHaskellDepends = [ base hinotify stm ]; description = "Block thread until a file stops being modified"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -89948,8 +90327,8 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck ]; description = "Library for manipulating FilePaths in a cross platform way"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "filepath-bytestring" = callPackage @@ -89961,7 +90340,7 @@ self: { libraryHaskellDepends = [ base bytestring unix ]; testHaskellDepends = [ base bytestring filepath QuickCheck ]; description = "Library for manipulating RawFilePaths in a cross platform way"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "filepath-crypto" = callPackage @@ -89980,8 +90359,8 @@ self: { cryptoids-types exceptions filepath sandi template-haskell ]; description = "Reversable and secure encoding of object ids as filepaths"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -89993,8 +90372,8 @@ self: { sha256 = "08rb2nafnh5vx7i6i3ddhq4h1s2ffgz8ailap5knr1xl7izgyywp"; libraryHaskellDepends = [ base base-io-access filepath ]; description = "IO Access for filepath"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -90011,8 +90390,8 @@ self: { transformers ]; description = "Functions on System.FilePath"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -90025,7 +90404,7 @@ self: { libraryHaskellDepends = [ base directory extra filepath ]; testHaskellDepends = [ base directory extra filepath QuickCheck ]; description = "File path glob-like matching"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fileplow" = callPackage @@ -90041,8 +90420,8 @@ self: { base bytestring hspec mtl QuickCheck temporary ]; description = "Library to process and search large files or a collection of files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -90063,7 +90442,7 @@ self: { base Diff directory filepath HUnit mtl time ]; description = "Interface for versioning file stores"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "filesystem-abstractions" = callPackage @@ -90080,8 +90459,8 @@ self: { base bytestring list-tries posix-paths semigroups ]; description = "A shared set of abstractions and types for representing filessytem data"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -90103,8 +90482,8 @@ self: { transformers ]; description = "Use system-filepath data types with conduits. (deprecated)"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -90120,8 +90499,8 @@ self: { base enumerator system-fileio system-filepath transformers unix ]; description = "Enumerator-based API for manipulating the filesystem"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -90138,8 +90517,8 @@ self: { filepath mtl unix ]; description = "Recursively manipulate and traverse filesystems as lazy rose trees"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -90156,8 +90535,8 @@ self: { ]; testHaskellDepends = [ base doctest hspec unordered-containers ]; description = "Flexible string substitution"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -90179,7 +90558,7 @@ self: { executableHaskellDepends = [ aeson base bytestring scotty ]; testHaskellDepends = [ base bytestring HUnit ]; description = "Filterable request logging wai middleware. Change how data is logged and when."; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "filters-basic" = callPackage @@ -90190,7 +90569,7 @@ self: { sha256 = "09q6fb8cv7di67wb8zhky8qpbwivzax59xik1zbcjf3sp465a337"; libraryHaskellDepends = [ base ]; description = "Allows to change the structure of the function output"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "filtrable" = callPackage @@ -90201,7 +90580,7 @@ self: { sha256 = "11jas9w611pslc3hanybsdwrh4292zvgigng8y4cv7gm0j908xng"; libraryHaskellDepends = [ base transformers ]; description = "Class of filtrable containers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "filtrable_0_1_6_0" = callPackage @@ -90215,8 +90594,8 @@ self: { libraryHaskellDepends = [ base containers transformers ]; testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; description = "Class of filtrable containers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "fin" = callPackage @@ -90232,7 +90611,7 @@ self: { libraryHaskellDepends = [ base dec deepseq hashable QuickCheck ]; testHaskellDepends = [ base inspection-testing tagged ]; description = "Nat and Fin: peano naturals and finite numbers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "final" = callPackage @@ -90243,7 +90622,7 @@ self: { sha256 = "189vby5ym6hcjpz6y9chlgkyzl8wnndqkhzk7s7qy8mksr3g66f9"; libraryHaskellDepends = [ base stm transformers ]; description = "utility to add extra safety to monadic returns"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "final-pretty-printer" = callPackage @@ -90258,8 +90637,8 @@ self: { ansi-terminal base containers exceptions mtl temporary text ]; description = "Extensible pretty printing with semantic annotations and proportional fonts"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -90285,8 +90664,8 @@ self: { optparse-applicative text tree-fun unordered-containers ]; description = "Find the clumpiness of labels in a tree"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -90321,8 +90700,8 @@ self: { transformers-base unix-compat ]; description = "A file-finding conduit that allows user control over traversals"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -90334,8 +90713,8 @@ self: { sha256 = "1iiyfp8p0iaf39brii95wp6887ds63bx8qrrm4raks8y4b1hflrc"; libraryHaskellDepends = [ base Cabal directory filepath mtl ]; description = "Initial project template from stack"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -90354,8 +90733,8 @@ self: { http-directory simple-cmd-args text ]; description = "List http/html files"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -90373,7 +90752,7 @@ self: { test-framework-quickcheck2 ]; description = "Generic finger-tree structure, with example instances"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fingertree-psqueue" = callPackage @@ -90384,8 +90763,8 @@ self: { sha256 = "14kc0ijx44q7whniickjj3h9ag1pixn51dlxjs6n2ypaclcjz34z"; libraryHaskellDepends = [ base fingertree ]; description = "Implementation of priority search queues as finger trees"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -90397,8 +90776,8 @@ self: { sha256 = "1ja8cqxpqhvssbcywph3zna946g1li5hlzsqab9lhg6vw0baakdn"; libraryHaskellDepends = [ base ]; description = "Generic finger-tree structure using type families"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -90423,7 +90802,7 @@ self: { template-haskell typelits-witnesses vector vector-sized ]; description = "A better, more type-safe Enum"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; }) {}; "finitary-derive" = callPackage @@ -90446,8 +90825,8 @@ self: { hedgehog-classes ]; description = "Flexible and easy deriving of type classes for finitary types"; - license = stdenv.lib.licenses.gpl3Plus; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -90466,7 +90845,23 @@ self: { base hedgehog hspec hspec-hedgehog optics-core ]; description = "Prisms and Isos between finitary types"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; + }) {}; + + "finite" = callPackage + ({ mkDerivation, array, base, Cabal, containers, hashable + , QuickCheck, template-haskell + }: + mkDerivation { + pname = "finite"; + version = "1.4.1.2"; + sha256 = "10hnqz4klgrpfbvla07h8yghpv22bsyijf0cibfzwl9j779vb4nc"; + libraryHaskellDepends = [ + array base containers hashable QuickCheck template-haskell + ]; + testHaskellDepends = [ base Cabal hashable QuickCheck ]; + description = "Finite ranges via types"; + license = lib.licenses.mit; }) {}; "finite-field" = callPackage @@ -90486,7 +90881,7 @@ self: { tasty-hunit tasty-quickcheck tasty-th ]; description = "Finite Fields"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "finite-typelits" = callPackage @@ -90497,7 +90892,7 @@ self: { sha256 = "0iyp9fyd2ki9qcmk9infz9p6rjhsx9jrs3f5yz0yqs8vj5na81yj"; libraryHaskellDepends = [ base deepseq ]; description = "A type inhabited by finitely many values, indexed by type-level naturals"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "finito" = callPackage @@ -90515,7 +90910,7 @@ self: { base numeric-domains propeller split transformers ]; description = "Constraint Solver for Finite Domains"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "firebase-database" = callPackage @@ -90542,7 +90937,7 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Google Firebase Database SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {nano-http = null;}; @@ -90560,7 +90955,7 @@ self: { http-types mtl regex-pcre text transformers wai warp ]; description = "A simple HTTP server framework"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "firefly-example" = callPackage @@ -90576,8 +90971,8 @@ self: { aeson base blaze-html firefly mtl text wai ]; description = "A simple example using Firefly"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -90590,8 +90985,8 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; description = "First and Last generalized to return up to n values"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -90606,7 +91001,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest Glob ]; description = "First class type families"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "first-class-instances" = callPackage @@ -90623,8 +91018,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "First class typeclass instances"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -90636,7 +91031,7 @@ self: { sha256 = "1bh8ndf77pfh851d7szx0q2lpima6zm1d652s9j7jzchr7icyjvs"; libraryHaskellDepends = [ base transformers ]; description = "First class patterns and pattern matching, using type families"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "firstify" = callPackage @@ -90653,8 +91048,8 @@ self: { base containers directory filepath homeomorphic mtl Safe yhccore ]; description = "Defunctionalisation for Yhc Core"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -90679,7 +91074,7 @@ self: { ]; description = "Calculates file-size frequency-distribution"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -90699,8 +91094,8 @@ self: { QuickCheck text ]; description = "FIT file decoder"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -90724,8 +91119,8 @@ self: { statistics vector ]; description = "Parse FITS files"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -90739,7 +91134,7 @@ self: { librarySystemDepends = [ cfitsio ]; description = "A library for reading and writing data files in the FITS data format"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) cfitsio;}; @@ -90756,7 +91151,7 @@ self: { testHaskellDepends = [ base leancheck ]; benchmarkHaskellDepends = [ base pretty ]; description = "refining property sets for testing Haskell programs"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fix-imports" = callPackage @@ -90779,8 +91174,8 @@ self: { mtl pretty process split test-karya text time uniplate ]; description = "Program to manage the imports of a haskell module"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -90795,7 +91190,7 @@ self: { libraryHaskellDepends = [ base mmtl ]; description = "Simple fix-expression parser"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -90807,8 +91202,8 @@ self: { sha256 = "01fxzhd2wqzp0paba64q5psfc4qvc4b8i88rdkn6mxlkm21gkp6y"; libraryHaskellDepends = [ base containers gitit ]; description = "Gitit plugin: Turn some Haskell symbols into pretty math symbols"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -90820,7 +91215,7 @@ self: { sha256 = "10l2sh179xarb774q92cff2gkb20rsrlilfwp1fk61rzmz9yn64j"; libraryHaskellDepends = [ base ]; description = "Signed 15.16 precision fixed point arithmetic"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fixed-length" = callPackage @@ -90834,7 +91229,7 @@ self: { base non-empty storable-record tfp utility-ht ]; description = "Lists with statically known length based on non-empty package"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fixed-list" = callPackage @@ -90845,7 +91240,7 @@ self: { sha256 = "1gpv0p7xyzmrrq20irf0mpggnc0vm5hpq36j4vd1xlq6bplq1xmb"; libraryHaskellDepends = [ base ]; description = "A fixed length list type"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fixed-point" = callPackage @@ -90856,8 +91251,8 @@ self: { sha256 = "010gx32av4cn5bqq1zrrcah50ay528vw01fvv1xhfpkrx1ll9wka"; libraryHaskellDepends = [ base ]; description = "Binary fixed-point arithmetic"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -90869,8 +91264,8 @@ self: { sha256 = "029mn44d1i794b1pbpa0zmf6b20zl0cvsf77mbfdkqnyx8986883"; libraryHaskellDepends = [ base fixed-point vector ]; description = "Unbox instances for the fixed-point package"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -90882,8 +91277,8 @@ self: { sha256 = "10b29gqy3rpwd5wf2b65p0llm8ksyp1p7k43rm1n5g5z67wkd7dx"; libraryHaskellDepends = [ base fixed-point vector-space ]; description = "vector-space instances for the fixed-point package"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -90899,8 +91294,8 @@ self: { base hmpfr integer-gmp reflection tagged template-haskell ]; description = "Fixed Precision Arithmetic"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -90912,8 +91307,8 @@ self: { sha256 = "0vb5h2v2qx19d7xibf7ksv2cha2pngh49mfpkh43f9vrwc6042ph"; libraryHaskellDepends = [ array base tagged ]; description = "Fixed-size wrapper for StorableArray, providing a Storable instance. Deprecated - use storable-static-array instead."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -90925,8 +91320,8 @@ self: { sha256 = "0rk5ym38m48khss38v8x09sdfz2nyhw7bw3dbjzy5qad09nzsipl"; libraryHaskellDepends = [ async base clock time ]; description = "Pure Haskell library to repeat an action at a specific frequency"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -90939,7 +91334,7 @@ self: { libraryHaskellDepends = [ base deepseq primitive ]; testHaskellDepends = [ base doctest filemanip primitive ]; description = "Generic vectors with statically known size"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fixed-vector-binary" = callPackage @@ -90955,8 +91350,8 @@ self: { base binary fixed-vector tasty tasty-quickcheck ]; description = "Binary instances for fixed-vector"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -90973,8 +91368,8 @@ self: { base fixed-vector serialise tasty tasty-quickcheck ]; description = "Binary instances for fixed-vector"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -90991,8 +91386,8 @@ self: { base cereal fixed-vector tasty tasty-quickcheck ]; description = "Cereal instances for fixed-vector"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -91010,7 +91405,7 @@ self: { libraryHaskellDepends = [ base deepseq fixed-vector primitive ]; testHaskellDepends = [ base doctest fixed-vector ]; description = "Library for working with product types generically"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fixed-width" = callPackage @@ -91021,8 +91416,8 @@ self: { sha256 = "0gxmw70d1bdqjqrz3d1an009x7bqzlv41dfydp7b49ina5as9ry7"; libraryHaskellDepends = [ base ]; description = "Fixed width subsets of an Int64/Word64"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -91034,7 +91429,7 @@ self: { sha256 = "01ss9rzg2r4gii6f7771n4vdyg022skyws6ncc3l62xycgz153a7"; libraryHaskellDepends = [ base random ]; description = "A fixed-precision real number type"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fixedwidth-hs" = callPackage @@ -91050,7 +91445,7 @@ self: { aeson attoparsec base bytestring text ]; description = "Quick parsing of fixed-width data formats"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "fixer" = callPackage @@ -91078,8 +91473,8 @@ self: { validity-time yaml ]; description = "A Haskell client for http://fixer.io/"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -91101,8 +91496,8 @@ self: { tasty tasty-quickcheck temporary ]; description = "File-backed recursive data structures"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -91127,8 +91522,8 @@ self: { old-time QuickCheck text ]; description = "FIX (co)parser"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -91150,8 +91545,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Opininated testing framework for mtl style (spies, stubs, and mocks)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -91168,7 +91563,7 @@ self: { base containers QuickCheck tasty tasty-quickcheck ]; description = "Uniplate-style generic traversals for optionally annotated fixed-point types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fixpoint" = callPackage @@ -91179,7 +91574,7 @@ self: { sha256 = "05h1cw1gpnwk1qjlia4l27j375cva8pp75fzn99w2rxsv6khszpb"; libraryHaskellDepends = [ base ]; description = "Data types as fixpoints"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fixtime" = callPackage @@ -91190,7 +91585,7 @@ self: { sha256 = "1walxcyi1wrv28vgy318c88z3mprz6mc8qfhbjgxb156iwfv80w5"; libraryHaskellDepends = [ base time ]; description = "Some fixes to the time package"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }) {}; "fizz-buzz" = callPackage @@ -91201,7 +91596,7 @@ self: { sha256 = "1c0nar70857awmzxh6w12xvplqrgp1qh2r7rlnaqvwcfzqkghav4"; libraryHaskellDepends = [ base ]; description = "Functional Fizz/Buzz"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fizzbuzz" = callPackage @@ -91212,8 +91607,8 @@ self: { sha256 = "0iia37wsxvaff28ln4l9hzdg458vcnak3jj4kjnsrbbfysan5wlx"; libraryHaskellDepends = [ base ]; description = "test"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -91231,8 +91626,8 @@ self: { async base bytestring network-simple optparse-applicative ]; description = "FizzBuzz as a service"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -91259,8 +91654,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Complete high-level binding to libFLAC"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {FLAC = null;}; @@ -91281,8 +91676,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Support for writing picture to FLAC metadata blocks with JuicyPixels"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -91300,7 +91695,7 @@ self: { base binary deepseq HTTP optparse-applicative process ]; description = "Verify FLAC files ripped form CD using AccurateRip™"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "flags-applicative" = callPackage @@ -91316,7 +91711,7 @@ self: { ]; testHaskellDepends = [ base containers hspec text ]; description = "Applicative flag parsing"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "flamethrower" = callPackage @@ -91327,8 +91722,8 @@ self: { sha256 = "10kfy1cnp721hgz6lbc28y7hkjhbv6gpk2jff6nk2avrfbaqqd8x"; libraryHaskellDepends = [ base template-haskell text ]; description = "A template engine for HTML"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -91345,8 +91740,8 @@ self: { base either optparse-applicative pipes ]; description = "FlameGraphs of profiling"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -91391,8 +91786,8 @@ self: { these turtle unliftio-path vinyl ]; description = "Generate language learning flashcards from video"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -91419,7 +91814,7 @@ self: { unordered-containers vector ]; description = "Principled and efficient bit-oriented binary serialization"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "flat-maybe" = callPackage @@ -91430,8 +91825,8 @@ self: { sha256 = "0kxyr7k47lsw7xg523kf98d57p6i1iz5dmyp91zg1xs2hsbjgvlq"; libraryHaskellDepends = [ base ghc-prim ]; description = "Strict Maybe without space and indirection overhead"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -91450,7 +91845,7 @@ self: { ]; testHaskellDepends = [ base vector ]; description = "Painless general-purpose sampling"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "flat-tex" = callPackage @@ -91463,7 +91858,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base directory parsec ]; description = "flatten a latex multi-file latex document and remove all comments"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }) {}; "flatbuffers" = callPackage @@ -91498,8 +91893,8 @@ self: { scientific template-haskell text text-manipulate vector ]; description = "Haskell implementation of the FlatBuffers protocol"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -91514,8 +91909,8 @@ self: { libraryHaskellDepends = [ base constraints transformers ]; testHaskellDepends = [ base tasty tasty-quickcheck transformers ]; description = "Work generically on your datatype without knowing its shape nor its contents"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -91531,7 +91926,7 @@ self: { base containers template-haskell th-extras transformers ]; description = "Generate default function implementations for complex type classes"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "flexible-time" = callPackage @@ -91542,8 +91937,8 @@ self: { sha256 = "179k0r58r5s0g1vfs7ab382iq7qf5xbrnmvx2y8p86pz8fcz7a8l"; libraryHaskellDepends = [ base bytestring unix-time ]; description = "simple extension of Data.UnixTime."; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -91558,7 +91953,7 @@ self: { libraryHaskellDepends = [ base text ]; executableHaskellDepends = [ base bytestring text ]; description = "A configurable reimplementation of unlit"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "flexiwrap" = callPackage @@ -91569,8 +91964,8 @@ self: { sha256 = "0vvl9w3i374k720sscbcsbha89fcfk1hcvdr0nk4y7gkp13xwdba"; libraryHaskellDepends = [ base data-type mtl QuickCheck ]; description = "Flexible wrappers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -91584,8 +91979,8 @@ self: { base data-type flexiwrap mtl smallcheck ]; description = "SmallCheck (Serial) instances for flexiwrap"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -91598,7 +91993,7 @@ self: { libraryHaskellDepends = [ base clock ]; testHaskellDepends = [ base clock hspec QuickCheck ]; description = "work with durations of time using the Flick as the smallest unit"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "flickr" = callPackage @@ -91616,8 +92011,8 @@ self: { ]; executableHaskellDepends = [ xhtml ]; description = "Haskell binding to the Flickr API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -91629,7 +92024,7 @@ self: { sha256 = "17w40nfmdb4crg23fnqn663i4a60dx5714rcyaiqllm4r25n5qv9"; libraryHaskellDepends = [ base bytestring parsec utf8-string ]; description = "A parser for IGC files"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "flight-kml" = callPackage @@ -91652,7 +92047,7 @@ self: { tasty-quickcheck tasty-smallcheck template-haskell time ]; description = "Parsing of pilot tracklogs dumped as KML"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "flink-statefulfun" = callPackage @@ -91673,8 +92068,8 @@ self: { ]; libraryToolDepends = [ proto-lens-protoc ]; description = "Flink stateful functions SDK"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -91688,7 +92083,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base process safe-exceptions ]; description = "e.g. `flip systemctl foo.service start` does `systemctl start foo.service`"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "flippers" = callPackage @@ -91701,7 +92096,7 @@ self: { editedCabalFile = "1d3k5prcb5nl7gwq30h4n7qsbl86hrj42zpvrqwsr9lir2jss279"; libraryHaskellDepends = [ base ]; description = "Variations on flip for multiple arguments"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "flite" = callPackage @@ -91717,8 +92112,8 @@ self: { array base containers haskell98 parsec ]; description = "f-lite compiler, interpreter and libraries"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -91739,7 +92134,7 @@ self: { base bytestring mtl parsec regex-compat text ]; description = "Generate flow charts from your code base"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "float-binstring" = callPackage @@ -91755,8 +92150,8 @@ self: { attoparsec base hspec HUnit QuickCheck split text ]; description = "C99 printf \"%a\" style formatting and parsing"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -91768,7 +92163,7 @@ self: { sha256 = "0f4nrj5qy6j6d9ll22zjkbgvw2rx0x2w7nllhl929zdbmhxrjk73"; libraryHaskellDepends = [ base integer-gmp ]; description = "FFI bindings for C _Float128"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "floating-bits" = callPackage @@ -91781,8 +92176,8 @@ self: { testHaskellDepends = [ base ]; benchmarkHaskellDepends = [ base criterion ]; description = "Conversions between floating and integral values"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -91794,7 +92189,7 @@ self: { sha256 = "1zsxjwgm8nkphnmsbz03yvplc2r02qybb387n910j4j6vya98khc"; libraryHaskellDepends = [ array base integer-gmp ]; description = "Alternative faster String representations for Double and Float, String representations for more general numeric types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "flock" = callPackage @@ -91812,7 +92207,7 @@ self: { ]; description = "Wrapper for flock(2)"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "floskell" = callPackage @@ -91847,7 +92242,7 @@ self: { haskell-src-exts text utf8-string ]; description = "A flexible Haskell source code pretty printer"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "flow" = callPackage @@ -91859,7 +92254,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base HUnit ]; description = "Write more understandable Haskell"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "flow-er" = callPackage @@ -91871,8 +92266,8 @@ self: { libraryHaskellDepends = [ base flow ]; testHaskellDepends = [ base doctest flow QuickCheck ]; description = "More directional operators"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -91891,7 +92286,7 @@ self: { base containers dotgen mtl parsec QuickCheck ]; description = "Library and binary to generate sequence/flow diagrams from plain text source"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "flowdock" = callPackage @@ -91910,8 +92305,8 @@ self: { pipes-parse template-haskell text unordered-containers uuid ]; description = "Flowdock client library for Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -91948,8 +92343,8 @@ self: { transformers unordered-containers vector ]; description = "API integration with Flowdock"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -91977,8 +92372,8 @@ self: { tasty-quickcheck text time unordered-containers ]; description = "Flowdock REST API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -91997,7 +92392,7 @@ self: { ]; description = "Analyze 454 flowgrams (.SFF files)"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -92010,8 +92405,8 @@ self: { libraryHaskellDepends = [ base containers syb ]; testHaskellDepends = [ base QuickCheck ]; description = "Generalized Flow Locks Framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -92030,8 +92425,8 @@ self: { directory MonadRandom mtl random ]; description = "Simulate 454 pyrosequencing"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -92064,8 +92459,8 @@ self: { ]; testToolDepends = [ alex happy ]; description = "A layout spec language for memory managers implemented in Rust"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -92090,8 +92485,8 @@ self: { base directory filepath mtl OpenGLRaw parsec text ]; description = "FLTK bindings"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) fltk14; inherit (pkgs) libGL; inherit (pkgs) libGLU; inherit (pkgs) pkg-config;}; @@ -92109,8 +92504,8 @@ self: { base bytestring directory fltkhs process stm ]; description = "FLTKHS demos. Please scroll to the bottom for more information."; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "fltkhs-fluid-demos" = callPackage @@ -92123,8 +92518,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base bytestring fltkhs ]; description = "Fltkhs Fluid Demos"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "fltkhs-fluid-examples" = callPackage @@ -92137,8 +92532,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base bytestring fltkhs ]; description = "Fltkhs Fluid Examples"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -92152,8 +92547,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base fltkhs ]; description = "Fltkhs template project"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "fltkhs-themes" = callPackage @@ -92171,8 +92566,8 @@ self: { ]; librarySystemDepends = [ fontconfig ]; description = "A set of themed widgets that provides drop in replacements to the ones in FLTKHS"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) fontconfig;}; "fluent-logger" = callPackage @@ -92196,8 +92591,8 @@ self: { ]; benchmarkHaskellDepends = [ base criterion ]; description = "A structured logger for Fluentd (Haskell)"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -92214,7 +92609,7 @@ self: { ]; description = "Conduit interface for fluent-logger"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "fluffy" = callPackage @@ -92234,7 +92629,7 @@ self: { resource-pool text time uuid-types yesod-core yesod-static ]; description = "A simple web application as a online practice website for XDU SE 2017 fall SPM"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "fluffy-parser" = callPackage @@ -92249,8 +92644,8 @@ self: { base binary bytestring pandoc parsec postgresql-simple ]; description = "The parser for fluffy to parsec the question bank in .docx type"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -92273,7 +92668,7 @@ self: { aeson base containers hspec scientific text vector ]; description = "Code-generated, Auto-versioned, & Smart Web APIs"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fluid-idl-http-client" = callPackage @@ -92289,7 +92684,7 @@ self: { text-conversions ]; description = "Http Client addon for Fluid"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fluid-idl-scotty" = callPackage @@ -92302,7 +92697,7 @@ self: { aeson base fluid-idl mtl scotty text wai ]; description = "Scotty server add-on for Fluid"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fluidsynth" = callPackage @@ -92316,8 +92711,8 @@ self: { libraryHaskellDepends = [ base bindings-DSL containers directory ]; librarySystemDepends = [ fluidsynth ]; description = "Haskell bindings to FluidSynth"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) fluidsynth;}; @@ -92333,7 +92728,7 @@ self: { testHaskellDepends = [ async base hspec QuickCheck stm ]; benchmarkHaskellDepends = [ async base deepseq old-time stm ]; description = "Concurrent bouded blocking queues optimized for flushing. Both IO and STM implementations."; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "flux-monoid" = callPackage @@ -92344,8 +92739,8 @@ self: { sha256 = "0aa5p8604j63zz8rfxcp4p4110k27ys5dcy980kg5hjzba7aj54m"; libraryHaskellDepends = [ base ]; description = "A monoid for tracking changes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -92363,8 +92758,8 @@ self: { base directory filepath mtl process Unixutils ]; description = "A Friendly Markup language without syntax"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -92376,7 +92771,7 @@ self: { sha256 = "19h95ph7lh7llw6j1v1rssrdi5k7xw8x0iac9rgzss371s2w3g9d"; libraryHaskellDepends = [ base ]; description = "FoldMap lists"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fmt" = callPackage @@ -92403,7 +92798,7 @@ self: { text vector ]; description = "A new formatting library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fmt-for-rio" = callPackage @@ -92414,8 +92809,8 @@ self: { sha256 = "0hxf1cgch4l5vwnsg4449ing3qi40kpfcwjg4l807sw0b18ccwar"; libraryHaskellDepends = [ base enum-text-rio ]; description = "Adaptor for getting fmt to work with rio"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -92428,8 +92823,8 @@ self: { libraryHaskellDepends = [ ansi-terminal base fmt ]; testHaskellDepends = [ ansi-terminal base fmt ]; description = "ANSI terminal colors formatters for fmt library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -92451,7 +92846,7 @@ self: { unordered-containers wai wai-extra ]; description = "A functional web framework"; - license = stdenv.lib.licenses.isc; + license = lib.licenses.isc; }) {}; "fn-extra" = callPackage @@ -92470,8 +92865,8 @@ self: { wai-extra wai-util xmlhtml ]; description = "Extras for Fn, a functional web framework"; - license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -92489,7 +92884,7 @@ self: { tasty-quickcheck ]; description = "A general abstraction for manipulating elements of container data structures"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "focuslist" = callPackage @@ -92513,7 +92908,7 @@ self: { QuickCheck tasty tasty-hedgehog tasty-hspec template-haskell ]; description = "Lists with a focused element"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fold-debounce" = callPackage @@ -92529,7 +92924,7 @@ self: { ]; testHaskellDepends = [ base hspec stm time ]; description = "Fold multiple events that happen in a given period of time"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fold-debounce-conduit" = callPackage @@ -92548,7 +92943,7 @@ self: { base conduit hspec resourcet stm transformers ]; description = "Regulate input traffic from conduit Source with Control.FoldDebounce"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "foldable-ix" = callPackage @@ -92559,7 +92954,7 @@ self: { sha256 = "1lvf1n8mnv3imlry4nqdv8c2c930yic0raqs2awnbmyyy1c6fc79"; libraryHaskellDepends = [ base ]; description = "Functions to find out the indices of the elements in the Foldable structures"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "foldable1" = callPackage @@ -92570,7 +92965,7 @@ self: { sha256 = "02p9wg0rcp7qvjp588y6r2szz7ja5x1idl04vn3hr7mbrbjq9ml5"; libraryHaskellDepends = [ base transformers util ]; description = "Foldable types with at least 1 element"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "foldl" = callPackage @@ -92593,7 +92988,7 @@ self: { testHaskellDepends = [ base doctest ]; benchmarkHaskellDepends = [ base criterion ]; description = "Composable, streaming, and efficient left folds"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "foldl-exceptions" = callPackage @@ -92607,7 +93002,7 @@ self: { libraryHaskellDepends = [ base foldl safe-exceptions ]; testHaskellDepends = [ base doctest ]; description = "Exception handling with FoldM"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "foldl-incremental" = callPackage @@ -92628,8 +93023,8 @@ self: { ]; benchmarkHaskellDepends = [ base containers criterion foldl ]; description = "incremental folds"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -92654,8 +93049,8 @@ self: { base criterion foldl mwc-random statistics vector ]; description = "Statistical functions from the statistics package implemented as Folds"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -92682,8 +93077,8 @@ self: { base criterion foldl lens-family-core ]; description = "Transducers for foldl folds"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -92705,8 +93100,8 @@ self: { text transformers ]; description = "Attoparsec and foldl-transduce integration"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -92732,7 +93127,7 @@ self: { base bytestring deepseq directory doctest filepath mtl semigroups ]; description = "Beautiful Folding"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "folds-common" = callPackage @@ -92745,8 +93140,8 @@ self: { libraryHaskellDepends = [ base containers folds ]; testHaskellDepends = [ base containers tasty tasty-quickcheck ]; description = "A playground of common folds for folds"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -92765,7 +93160,7 @@ self: { array base containers gloss optparse-applicative xml ]; description = "Toolset for Folger Shakespeare Library's XML annotated plays"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "follow" = callPackage @@ -92793,8 +93188,8 @@ self: { text time transformers unordered-containers yaml ]; description = "Haskell library to follow content published on any subject"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -92819,7 +93214,7 @@ self: { path text unix utf8-string ]; description = "Be notified when a file gets appended, solely with what was added. Warning - only works on linux and for files that are strictly appended, like log files."; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "follower" = callPackage @@ -92837,8 +93232,8 @@ self: { old-locale strict time ]; description = "Follow Tweets anonymously"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -92846,13 +93241,13 @@ self: { ({ mkDerivation, base, foma }: mkDerivation { pname = "foma"; - version = "0.1.1.0"; - sha256 = "1aiy4bizzx5g87lvlx8xy24rxvzh093mlaavxkcr542fq9ki8yb3"; + version = "0.1.2.0"; + sha256 = "1g9wy1zn0mi2lgfpprhh8q5sy0cvf5pbk2yrkr2911pn7g00jdc4"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ foma ]; description = "Simple Haskell bindings for Foma"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) foma;}; @@ -92864,7 +93259,7 @@ self: { sha256 = "1njwikgrsm52diq84j6lgjcndssk3ihmgp7fndwjq9m2v2h346gh"; libraryHaskellDepends = [ base ]; description = "A Font Awesome data type enumerating all icon classes"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "font-opengl-basic4x6" = callPackage @@ -92878,8 +93273,8 @@ self: { libraryHaskellDepends = [ base OpenGL ]; executableHaskellDepends = [ base GLFW-b OpenGL ]; description = "Basic4x6 font for OpenGL"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -92896,7 +93291,7 @@ self: { ]; description = "Paper soccer, an OpenGL game"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -92912,7 +93307,7 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Initial project template from stack"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "for-free" = callPackage @@ -92928,8 +93323,8 @@ self: { transformers ]; description = "Functor, Monad, MonadPlus, etc for free"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -92950,8 +93345,8 @@ self: { transformers vector ]; description = "A library accelerates imperative style programming"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -92968,8 +93363,8 @@ self: { base containers data-default-class lens linear ]; description = "Simple force-directed layout"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -92984,7 +93379,7 @@ self: { executableHaskellDepends = [ base process transformers ]; description = "Run a command on files with magic substituion support (sequencing and regexp)"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -92996,8 +93391,8 @@ self: { sha256 = "17wsqrq1zq1p80gnrfsvks5bhickfqj5mh2prbzzkzb3s28l1mby"; libraryHaskellDepends = [ aeson base text ]; description = "A Haskell library for working with forecast.io data."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -93009,7 +93404,7 @@ self: { sha256 = "1pj30p7z5nq8j95z9c4kjv6spandfch3r0dvx3n8wsbh3270dvxj"; libraryHaskellDepends = [ base ]; description = "Types and instances for implementing a Storable with different peek and poke"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "foreign-store" = callPackage @@ -93020,7 +93415,7 @@ self: { sha256 = "1p436dn6l5zjzizcsj0hn10s2n907gr7c8y89i4sm3h69lhqlw86"; libraryHaskellDepends = [ base ]; description = "Store a stable pointer in a foreign context to be retrieved later"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "foreign-var" = callPackage @@ -93033,8 +93428,8 @@ self: { editedCabalFile = "077s05370sx7pn053z1y6ygjg77dsvpcd5r8ivx9q9rk8m1hdjgr"; libraryHaskellDepends = [ base stm transformers ]; description = "Encapsulating mutatable state in external libraries"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -93050,8 +93445,8 @@ self: { aeson base comonad deepseq free hashable profunctors semigroupoids ]; description = "Tree and Forest types"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -93073,8 +93468,8 @@ self: { aeson base bytestring containers HUnit mtl tasty tasty-hunit ]; description = "Recursively delete CloudFormation stacks and their dependants"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -93089,8 +93484,8 @@ self: { libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base ]; description = "Library for generating fake placeholder data"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -93102,7 +93497,7 @@ self: { sha256 = "0qnl3bvqiwh6d7lm3w06is5ivh025c7024695m7fzajvzbpk67jp"; libraryHaskellDepends = [ base transformers ]; description = "An implementation of forkIO for monad stacks"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "forma" = callPackage @@ -93120,7 +93515,7 @@ self: { ]; testHaskellDepends = [ aeson base containers hspec mtl text ]; description = "Parse and validate forms in JSON format"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "formal" = callPackage @@ -93142,8 +93537,8 @@ self: { parsec process text transformers urlencoded wl-pprint-text ]; description = "A statically typed, functional programming language"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -93156,8 +93551,8 @@ self: { libraryHaskellDepends = [ haskell2010 parsec ]; testHaskellDepends = [ haskell2010 parsec QuickCheck ]; description = "Rendering from and scanning to format strings"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -93170,7 +93565,7 @@ self: { libraryHaskellDepends = [ base text ]; testHaskellDepends = [ base hspec text ]; description = "Various number formatting functions"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "format-status" = callPackage @@ -93187,8 +93582,8 @@ self: { base data-concurrent-queue old-locale stm text time ]; description = "A utility for writing the date to dzen2"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -93206,8 +93601,8 @@ self: { ]; testHaskellDepends = [ base doctest numhask ]; description = "Number text formatting"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -93228,8 +93623,8 @@ self: { lens old-locale QuickCheck text time ]; description = "Business-quality formatting of numbers, dates, and other things"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -93248,7 +93643,7 @@ self: { ]; testHaskellDepends = [ base hspec semigroups text ]; description = "Combinator-based type-safe formatting (like printf() or FORMAT)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "formatting_7_1_1" = callPackage @@ -93268,8 +93663,8 @@ self: { scientific text time transformers ]; description = "Combinator-based type-safe formatting (like printf() or FORMAT)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "forml" = callPackage @@ -93293,8 +93688,8 @@ self: { process text urlencoded utf8-string zlib ]; description = "A statically typed, functional programming language"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -93311,8 +93706,8 @@ self: { transformers xhtml ]; description = "Formlets implemented in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -93329,8 +93724,8 @@ self: { ]; libraryToolDepends = [ trhsx ]; description = "HSP support for Formlets"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -93352,8 +93747,8 @@ self: { ansi-wl-pprint base containers lens text trifecta ]; description = "Formura is a simple language to describe stencil computation"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -93381,8 +93776,8 @@ self: { type-level ]; description = "ForSyDe's Haskell-embedded Domain Specific Language"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -93399,7 +93794,7 @@ self: { base directory doctest hspec old-time process QuickCheck random ]; description = "ForSyDe's Haskell-embedded Domain Specific Language"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "forth-hll" = callPackage @@ -93410,8 +93805,8 @@ self: { sha256 = "1hmcicxnxcl99chidkbg1kspjzpxxcw8qh4lrwvmlpz2knzf11g3"; libraryHaskellDepends = [ array-forth base free mtl ]; description = "A simple eDSL for generating arrayForth code"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -93440,8 +93835,8 @@ self: { filepath GenericPretty hspec mtl pretty text uniplate ]; description = "Parser and anlyses for Fortran standards 66, 77, 90 and 95"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -93456,8 +93851,8 @@ self: { libraryHaskellDepends = [ ansi-terminal base text ]; testHaskellDepends = [ base doctest hspec ]; description = "Interactive terminal prompt"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -93469,7 +93864,7 @@ self: { sha256 = "0q11h91mlbaflxl35sya5r4h9r5d18v5ib0hplrzcnsgwchdcd3f"; libraryHaskellDepends = [ base SafeSemaphore stm unagi-chan ]; description = "Concurrent channels with a forwarding primitive"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "foscam-directory" = callPackage @@ -93488,8 +93883,8 @@ self: { base directory doctest filepath QuickCheck template-haskell ]; description = "Foscam File format"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -93509,8 +93904,8 @@ self: { base directory doctest filepath parsec QuickCheck template-haskell ]; description = "Foscam File format"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -93537,8 +93932,8 @@ self: { base directory doctest filepath QuickCheck template-haskell ]; description = "Foscam File format"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -93554,7 +93949,7 @@ self: { testHaskellDepends = [ base basement ]; benchmarkHaskellDepends = [ base basement gauge ]; description = "Alternative prelude with batteries and no dependencies"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "foundation-edge" = callPackage @@ -93565,7 +93960,7 @@ self: { sha256 = "0dqpalqn9p10vmz3sw60aga76rpi4d92hrvq2v91pv44p1iva2mb"; libraryHaskellDepends = [ bytestring foundation text ]; description = "foundation's edge with the conventional set of packages"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fountain" = callPackage @@ -93576,7 +93971,7 @@ self: { sha256 = "0mxzrvrag2qwn22llklmdkcf4icd8n9ifg1awd9q7ffll8a1a67p"; libraryHaskellDepends = [ base containers random ]; description = "A fountain codec"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fourmolu" = callPackage @@ -93604,7 +93999,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "A formatter for Haskell source code"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fourmolu_0_3_0_0" = callPackage @@ -93632,8 +94027,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "A formatter for Haskell source code"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "fp-ieee" = callPackage @@ -93651,8 +94046,8 @@ self: { ]; benchmarkHaskellDepends = [ base gauge ]; description = "IEEE 754-2019 compliant operations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -93689,8 +94084,8 @@ self: { optparse-applicative process safe text unordered-containers ]; description = "Simple interface to the FP Complete IDE API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -93709,7 +94104,7 @@ self: { base bytestring cryptonite integer-logarithms vector ]; description = "Format-preserving encryption"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "fpipe" = callPackage @@ -93720,7 +94115,7 @@ self: { sha256 = "1b6r19yy9wh5w8xb0ajjxsd2qyzjnkgyav1975qv92wwxslyxwr8"; libraryHaskellDepends = [ base ]; description = "F#-style composition and application"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fplll" = callPackage @@ -93736,8 +94131,8 @@ self: { libraryPkgconfigDepends = [ fplll ]; testHaskellDepends = [ base ]; description = "Haskell bindings to <https://fplll.github.io/fplll/ fplll>"; - license = stdenv.lib.licenses.lgpl21Plus; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21Plus; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) fplll;}; @@ -93749,7 +94144,7 @@ self: { sha256 = "15qpfi3b9vnpm17q3y64nsrhlj5vi9rgrgysjfk98aw1gkj9mvv4"; libraryHaskellDepends = [ base ]; description = "A library for NLA operations"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fpnla-examples" = callPackage @@ -93773,8 +94168,8 @@ self: { test-framework-quickcheck2 time vector ]; description = "Example implementations for FPNLA library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -93800,8 +94195,8 @@ self: { test-framework-quickcheck2 ]; description = "IEEE754r floating point conformance tests"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -93820,7 +94215,7 @@ self: { ]; description = "Installed package query tool for Gentoo Linux"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "fractal" = callPackage @@ -93833,7 +94228,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base ]; description = "Draw Newton, Julia and Mandelbrot fractals"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fractals" = callPackage @@ -93845,8 +94240,8 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base integer-gmp QuickCheck ]; description = "A collection of useful fractal curve encoders"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -93858,8 +94253,8 @@ self: { sha256 = "0ajkrp7babip4y0symj65yanyazsazp7lsbbsa3il2b6kp9fwgxd"; libraryHaskellDepends = [ base semigroups ]; description = "Fractions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -93875,7 +94270,7 @@ self: { executableHaskellDepends = [ array base GLUT OpenGL random ]; description = "A 3-D First Person Shooter Game"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -93899,8 +94294,8 @@ self: { ]; executableHaskellDepends = [ pretty ]; description = "A simple web framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {ghc-binary = null;}; @@ -93912,7 +94307,7 @@ self: { sha256 = "0wy1c9xgd6ykymqciga1sla83wfdwy17p88bygfp6pflbc0rw57g"; libraryHaskellDepends = [ base frame pandoc ]; description = "A markdown to Frame GUI writer for Pandoc"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "franchise" = callPackage @@ -93923,8 +94318,8 @@ self: { sha256 = "144fywp5fcix5i06wvwvzwsr19bgxpajx7bi7jw43hnm3rlcj4vr"; libraryHaskellDepends = [ base ]; description = "A package for configuring and building Haskell software"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -93951,7 +94346,7 @@ self: { base bytestring network optparse-applicative stm vector ]; description = "Append-only database"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fraxl" = callPackage @@ -93970,8 +94365,8 @@ self: { ]; benchmarkHaskellDepends = [ base time ]; description = "Cached and parallel data fetching"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -93991,8 +94386,8 @@ self: { text uuid ]; description = "RabbitMQ Messaging API supporting request-response"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -94013,7 +94408,7 @@ self: { transformers transformers-base ]; description = "Monads for free"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "free_5_1_6" = callPackage @@ -94031,8 +94426,8 @@ self: { transformers transformers-base ]; description = "Monads for free"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "free-algebras" = callPackage @@ -94052,8 +94447,8 @@ self: { mtl transformers ]; description = "Free algebras"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -94065,7 +94460,7 @@ self: { sha256 = "1s5fdl7sgqhwk3zqrbv9qjzp7r12wyh4pwz38yywzhc32gl0vm4r"; libraryHaskellDepends = [ base ]; description = "free categories"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "free-category" = callPackage @@ -94082,8 +94477,8 @@ self: { ]; benchmarkHaskellDepends = [ base criterion ]; description = "efficient data types for free categories and arrows"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -94095,8 +94490,8 @@ self: { sha256 = "1caiwxhm2wx0cnr2g4zvk2qv170jps14lf9j1q40qvx5qy3fxwlz"; libraryHaskellDepends = [ base type-aligned ]; description = "Free monads suitable for concurrent computation"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -94111,7 +94506,7 @@ self: { libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base ]; description = "An extensible effects library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "free-functors" = callPackage @@ -94128,7 +94523,7 @@ self: { profunctors template-haskell transformers ]; description = "Free functors, adjoint to functors that forget class constraints"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "free-game" = callPackage @@ -94149,8 +94544,8 @@ self: { StateVar template-haskell transformers vector void ]; description = "Create games for free"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -94167,8 +94562,8 @@ self: { time transformers ]; description = "An HTTP Client based on Free Monads"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -94184,8 +94579,8 @@ self: { base comonad-transformers free kan-extensions mtl transformers ]; description = "Operational Applicative, Alternative, Monad and MonadPlus from free types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -94201,8 +94596,8 @@ self: { base containers haskell-src haskell-src-exts mtl pretty syb ]; description = "Automatic generation of free theorems"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -94221,8 +94616,8 @@ self: { ]; executableHaskellDepends = [ cgi free-theorems utf8-string xhtml ]; description = "Automatically Generating Counterexamples to Naive Free Theorems"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -94240,8 +94635,8 @@ self: { old-locale old-time parsec pretty syb utf8-string xhtml ]; description = "Taming Selective Strictness"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -94260,8 +94655,8 @@ self: { utf8-string xhtml ]; description = "Taming Selective Strictness"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -94281,8 +94676,8 @@ self: { process time xhtml ]; description = "CGI-based web interface for the free-theorems package"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -94298,8 +94693,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base ]; description = "Spam"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -94315,8 +94710,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base ]; description = "Spam"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -94334,7 +94729,7 @@ self: { base lens linear MemoTrie pragmatic-show vector vector-space ]; description = "Instantiate the classes from the vector-space package with types from linear"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "free-vl" = callPackage @@ -94351,7 +94746,7 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base containers mtl tasty tasty-hunit ]; description = "van Laarhoven encoded Free Monad with Extensible Effects"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "freekick2" = callPackage @@ -94373,7 +94768,7 @@ self: { ]; description = "A soccer game"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -94393,8 +94788,8 @@ self: { transformers ]; description = "A generalisation of the Category->Functor->Applicative->Monad hierarchy and more"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -94409,8 +94804,8 @@ self: { librarySystemDepends = [ freenect freenect_sync ]; libraryPkgconfigDepends = [ libfreenect ]; description = "Interface to the Kinect device"; - license = stdenv.lib.licenses.bsd3; - platforms = [ "i686-linux" "x86_64-linux" ]; + license = lib.licenses.bsd3; + platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) freenect; freenect_sync = null; libfreenect = null;}; @@ -94431,7 +94826,7 @@ self: { ]; benchmarkHaskellDepends = [ base criterion free mtl ]; description = "Implementation of the Freer Monad"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "freer-converse" = callPackage @@ -94447,8 +94842,8 @@ self: { base freer-effects tasty tasty-hunit tasty-quickcheck text ]; description = "Handle effects conversely using monadic conversation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -94469,8 +94864,8 @@ self: { ]; benchmarkHaskellDepends = [ base criterion free mtl ]; description = "Implementation of effect system for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -94482,7 +94877,7 @@ self: { sha256 = "14d5683z37xyahrw6dbcv516lmc8vasl1bc6zvdy3wr4y4g1qyzd"; libraryHaskellDepends = [ base ]; description = "Freer indexed monad for type-level resource-aware effectual operations"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "freer-simple" = callPackage @@ -94509,7 +94904,7 @@ self: { base criterion extensible-effects free mtl ]; description = "Implementation of a friendly effect system for Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "freer-simple-catching" = callPackage @@ -94521,8 +94916,8 @@ self: { libraryHaskellDepends = [ base freer-simple ]; testHaskellDepends = [ base freer-simple hspec ]; description = "Checked runtime exceptions with freer-simple"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -94543,8 +94938,8 @@ self: { http-types ]; description = "Make HTTP requests with freer-simple!"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -94557,8 +94952,8 @@ self: { libraryHaskellDepends = [ base containers freer-simple time ]; testHaskellDepends = [ base containers freer-simple hspec time ]; description = "Automatic profling of freer-simple programs"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -94571,8 +94966,8 @@ self: { libraryHaskellDepends = [ base containers freer-simple random ]; testHaskellDepends = [ base containers freer-simple hspec random ]; description = "Random number generators using freer-simple"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -94585,8 +94980,8 @@ self: { libraryHaskellDepends = [ base freer-simple time ]; testHaskellDepends = [ base freer-simple hspec time ]; description = "freer-simple interface to IO based time functions"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -94604,8 +94999,8 @@ self: { array base cpphs directory mtl parallel pretty random syb ]; description = "A Haskell syntax extension for generalised sections"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -94627,8 +95022,8 @@ self: { aeson base bytestring containers data-default hspec hspec-core ]; description = "Access the Freesound Project database"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -94643,8 +95038,8 @@ self: { base boundingboxes bytestring freetype2 linear ]; description = "Single line text rendering for OpenGL ES"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -94659,7 +95054,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base template-haskell ]; description = "Haskell bindings for FreeType 2 library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "french-cards" = callPackage @@ -94671,7 +95066,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec HUnit ]; description = "French Playing Cards"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "freq" = callPackage @@ -94688,8 +95083,8 @@ self: { testHaskellDepends = [ base bytestring containers hedgehog ]; benchmarkHaskellDepends = [ base bytestring containers gauge ]; description = "Are you ready to get freaky?"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -94706,7 +95101,7 @@ self: { ]; description = "Fresco binding for Haskell"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "fresh" = callPackage @@ -94717,8 +95112,8 @@ self: { sha256 = "1441yv55bwmiwnr6jsccq91anq8vhc2a4ka0irn3i2i9cjzw0gkw"; libraryHaskellDepends = [ base containers haskell-src-exts syb ]; description = "Introduce fresh variables into Haskell source code"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -94741,7 +95136,7 @@ self: { base QuickCheck test-framework test-framework-quickcheck2 vector ]; description = "A functional image processing library for Haskell"; - license = stdenv.lib.licenses.lgpl3; + license = lib.licenses.lgpl3; }) {}; "friday-devil" = callPackage @@ -94757,8 +95152,8 @@ self: { ]; librarySystemDepends = [ libdevil ]; description = "Uses the DevIL C library to read and write images from and to files and memory buffers"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) libdevil;}; @@ -94775,7 +95170,7 @@ self: { base bytestring file-embed friday hspec JuicyPixels ]; description = "Converts between the Friday and JuicyPixels image types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "friday-scale-dct" = callPackage @@ -94790,25 +95185,25 @@ self: { base base-compat carray fft friday vector ]; description = "Scale Friday images with DCT"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; "friendly" = callPackage - ({ mkDerivation, base, bifunctors, lens, optparse-applicative }: + ({ mkDerivation, base, bifunctors, optparse-applicative }: mkDerivation { pname = "friendly"; - version = "0.1.0.2"; - sha256 = "18j9nw76rwsikf5wyv33mw04mn4xmdnk757c26zfbcx8rkcwjqzn"; + version = "0.1.0.3"; + sha256 = "1djmj4nmn4g36iab0z7npgc34vvfspvafr5a4bblnv41glx1wpc1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base bifunctors lens optparse-applicative + base bifunctors optparse-applicative ]; description = "Attempt to pretty-print any input"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -94823,7 +95218,7 @@ self: { libraryHaskellDepends = [ base old-locale time ]; testHaskellDepends = [ base hspec old-locale time ]; description = "Print time information in friendly ways"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "frisby" = callPackage @@ -94836,7 +95231,7 @@ self: { array base containers fail mtl semigroups ]; description = "Linear time composable parser for PEG grammars"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "from-sum" = callPackage @@ -94848,7 +95243,7 @@ self: { libraryHaskellDepends = [ base transformers ]; testHaskellDepends = [ base doctest Glob ]; description = "Combinators for working with Maybe and Either"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fromhtml" = callPackage @@ -94862,7 +95257,7 @@ self: { libraryHaskellDepends = [ base bytestring process-extras text ]; executableHaskellDepends = [ base bytestring process-extras text ]; description = "Simple adapter for transformation of HTML to other formats"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "front" = callPackage @@ -94881,8 +95276,8 @@ self: { fay-dom fay-websockets mtl stm text websockets ]; description = "A reactive frontend web framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -94899,7 +95294,7 @@ self: { attoparsec base bytestring hspec QuickCheck text yaml ]; description = "Parses frontmatter as used in Jekyll markdown files"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "frotate" = callPackage @@ -94913,7 +95308,7 @@ self: { executableHaskellDepends = [ base optparse-applicative time ]; testHaskellDepends = [ base doctest ]; description = "Advanced rotation of backups and other things"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "frown" = callPackage @@ -94927,7 +95322,7 @@ self: { executableHaskellDepends = [ base directory ]; description = "LALR(k) parser generator"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -94939,8 +95334,8 @@ self: { sha256 = "18mnxlwlyh4q18xc9svpwma3qgwp473dfg1z1rmdll6za82zmvzn"; libraryHaskellDepends = [ base containers mtl ]; description = "Arduino programming without the hassle of C"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -94955,8 +95350,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers mtl transformers ]; description = "Principled practical FRP"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -94972,8 +95367,8 @@ self: { base containers frpnow gloss mtl transformers ]; description = "Program awesome stuff with Gloss and frpnow!"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -94990,8 +95385,8 @@ self: { base containers frpnow glib gtk mtl transformers ]; description = "Program GUIs with GTK and frpnow!"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -95005,8 +95400,8 @@ self: { base containers frpnow glib gtk3 mtl text ]; description = "Program GUIs with GTK3 and frpnow!"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -95021,8 +95416,8 @@ self: { libraryHaskellDepends = [ base frpnow vty ]; executableHaskellDepends = [ base containers frpnow vty ]; description = "Program terminal applications with vty and frpnow!"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -95037,7 +95432,7 @@ self: { libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base ]; description = "Lexical extension for Quasi-Quotations using French-Quotes"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fs-events" = callPackage @@ -95048,8 +95443,8 @@ self: { sha256 = "0jw6cx9fzzs8r20acjq8nq8zjhwiwnvg1b0kc97c2sij1bhw6pw4"; libraryHaskellDepends = [ base ]; description = "A haskell binding to the FSEvents API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -95061,8 +95456,8 @@ self: { sha256 = "1lhvq4pqgsc52hzgh39ijw4yqw6r4pgq7shv8y5xfgyjibzkmf8m"; libraryHaskellDepends = [ base hint ]; description = "csv parser for fsh"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -95074,7 +95469,7 @@ self: { sha256 = "1scmvhbsn988x6j4a94ibg1c7adrxf8lzn06n9n1iv62bjd450m3"; libraryHaskellDepends = [ base ]; description = "some F# operators, high priority pipes"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fsmActions" = callPackage @@ -95089,8 +95484,8 @@ self: { base containers fgl filepath graphviz MissingH mtl parsec pretty ]; description = "Finite state machines and FSM actions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -95114,7 +95509,7 @@ self: { unix-compat ]; description = "Cross platform library for file change notification"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fsnotify-conduit" = callPackage @@ -95133,7 +95528,7 @@ self: { transformers ]; description = "Get filesystem notifications as a stream of events"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "fst" = callPackage @@ -95152,8 +95547,8 @@ self: { ]; testHaskellDepends = [ base QuickCheck ]; description = "Finite state transducers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -95165,8 +95560,8 @@ self: { sha256 = "07lx4928d1fnjbpfmky4jhhk7sqj98b11vdbv4f67p3bwfn5lrp8"; libraryHaskellDepends = [ base directory filepath ]; description = "File system utilities for Haskell that are missing from built in libraries"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -95186,8 +95581,8 @@ self: { system-filepath text time-units turtle ]; description = "Wait and observe events on the filesystem for a path, with a timeout"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -95208,8 +95603,8 @@ self: { base directory fsnotify haskeline optparse-applicative process ]; description = "File System watching tool with cli and slave functionalities"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -95228,7 +95623,7 @@ self: { regex-pcre-builtin system-filepath unix ]; description = "Watch a file/directory and run a command when it's modified"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ft-generator" = callPackage @@ -95241,8 +95636,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base mtl parsec ]; description = "implementation accompanying a WFLP'19 paper"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -95260,8 +95655,8 @@ self: { base base-unicode-symbols bytestring safe transformers usb ]; description = "A thin layer over USB to communicate with FTDI chips"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -95279,7 +95674,7 @@ self: { ]; testHaskellDepends = [ base bytestring tasty tasty-hspec ]; description = "Transfer files with FTP and FTPS"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "ftp-client-conduit" = callPackage @@ -95295,7 +95690,7 @@ self: { ]; testHaskellDepends = [ base ]; description = "Transfer file with FTP and FTPS with Conduit"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "ftp-conduit" = callPackage @@ -95311,8 +95706,8 @@ self: { utf8-string ]; description = "FTP client package with conduit interface based off http-conduit"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -95331,7 +95726,7 @@ self: { ]; description = "FTP Client and Server Library"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -95343,7 +95738,7 @@ self: { sha256 = "1gj7j6mpfgv7ra3v9pm8gbvzbdmcvjri4zzmllx84d138l983k6g"; libraryHaskellDepends = [ base ShowF type-unary ]; description = "Depth-typed functor-based trees, both top-down and bottom-up"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ftshell" = callPackage @@ -95361,8 +95756,8 @@ self: { base containers free-theorems mtl pretty Shellac Shellac-readline ]; description = "Shell interface to the FreeTheorems library"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -95374,7 +95769,7 @@ self: { sha256 = "0g0qy0lcixbjm5srmfl1dnci4m09zwqcs5dpknpnsdc4b4l3925r"; libraryHaskellDepends = [ base ]; description = "A recapitulated prelude with minimal dependencies and profligate exports"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "full-sessions" = callPackage @@ -95385,8 +95780,8 @@ self: { sha256 = "0irm1zrggjl9zrapzxfl3kj32d81k30c8nbmr3bf9ramjg65xm90"; libraryHaskellDepends = [ base ghc network ]; description = "a monad for protocol-typed network programming"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -95407,7 +95802,7 @@ self: { array base containers QuickCheck tasty tasty-quickcheck text vector ]; description = "In-memory full text search engine"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fullstop" = callPackage @@ -95426,8 +95821,8 @@ self: { base HUnit QuickCheck tasty tasty-hunit tasty-quickcheck ]; description = "Simple sentence segmenter"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -95456,8 +95851,8 @@ self: { unordered-containers utf8-string vcs-web-hook-parse ]; description = "IRC bot for fun, learning, creativity and collaboration"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -95476,8 +95871,8 @@ self: { network-uri ]; description = "Report events to FunBot over a JSON/HTTP API"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -95489,7 +95884,7 @@ self: { sha256 = "075h2iwa4vjhl2ckv7qv4n5s1zfvsnsam06xsznhqpjb9m2m1208"; libraryHaskellDepends = [ aeson base text ]; description = "Interact with FunBot's external events"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "funbot-git-hook" = callPackage @@ -95508,8 +95903,8 @@ self: { hit network-uri template text utf8-string ]; description = "Git hook which sends events to FunBot"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -95522,8 +95917,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base filepath pretty process ]; description = "Functional MetaPost is a Haskell frontend to the MetaPost language"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ peti ]; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ peti ]; }) {}; "funcons-intgen" = callPackage @@ -95542,8 +95937,8 @@ self: { iml-tools mtl pretty regex-applicative split text uu-cco ]; description = "Generate Funcons interpreters from CBS description files"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {iml-tools = null;}; @@ -95561,8 +95956,8 @@ self: { base containers funcons-tools gll text ]; description = "call-by-value lambda-calculus with meta-programming"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -95578,8 +95973,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base funcons-tools funcons-values ]; description = "A modular interpreter for executing SIMPLE funcons"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -95605,8 +96000,8 @@ self: { random-strings regex-applicative split text TypeCompose vector ]; description = "A modular interpreter for executing funcons"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -95622,8 +96017,8 @@ self: { base bv containers multiset text vector ]; description = "Library providing values and operations on values in a fixed universe"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -95636,7 +96031,7 @@ self: { libraryHaskellDepends = [ base tagged ]; testHaskellDepends = [ base tagged ]; description = "Create poly variadic functions for monoidal results"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "function-combine" = callPackage @@ -95647,8 +96042,8 @@ self: { sha256 = "1m8bmqxb9kar3y8zv22qs2a6kzd636m5li1r2q4y6pps0nglv9i9"; libraryHaskellDepends = [ base data-type ]; description = "Combining functions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -95660,8 +96055,8 @@ self: { sha256 = "0dxym6xrylngw8r5spi246nmi8fvvxxx776qismcr04zqshv7ygw"; libraryHaskellDepends = [ base numeric-prelude ]; description = "Instances of the Algebra.* classes for functions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -95673,8 +96068,8 @@ self: { sha256 = "1la9xqm5gs6a6cb18wyx9wr0nx6p5ryhczvb72d0zm6xrjrf0r5s"; libraryHaskellDepends = [ base HList ]; description = "Combinators that allow for a more functional/monadic style of Arrow programming"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -95686,7 +96081,7 @@ self: { sha256 = "1l72f0zz2hfhxydsmi0kqcq7mwib0cvk050mdhgyqgqdglphdpi9"; libraryHaskellDepends = [ base ]; description = "KMP implemented on haskell's built-in cons-cell-based lists"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "functor" = callPackage @@ -95699,8 +96094,8 @@ self: { editedCabalFile = "1cjr0x65q1hmls7jszmngbibbif1l9jipjgkndpr33d84ry10hnj"; libraryHaskellDepends = [ base category ]; description = "Functors"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -95712,7 +96107,7 @@ self: { sha256 = "0jshf7and80p0gq26zz83xj4p3ff8lppa5252qg0646xsr06lfkr"; doHaddock = false; description = "This package has been subsumed by semigroupoids"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "functor-classes-compat" = callPackage @@ -95729,7 +96124,7 @@ self: { base containers hashable unordered-containers vector ]; description = "Data.Functor.Classes instances for core packages"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "functor-combinators" = callPackage @@ -95756,8 +96151,8 @@ self: { semigroupoids tasty tasty-hedgehog transformers trivial-constraint ]; description = "Tools for functor combinator-based program design"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -95774,7 +96169,7 @@ self: { TypeCompose ]; description = "Functor combinators with tries & zippers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "functor-friends" = callPackage @@ -95785,8 +96180,8 @@ self: { sha256 = "1apbdfhmhw1f30w62wwq6nr98pqhqbadp9c05vc424jm82v0169d"; libraryHaskellDepends = [ base recursion-schemes ]; description = "Friendly helpers for your recursion schemes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -95800,8 +96195,8 @@ self: { editedCabalFile = "0nvk9hff0vd3s7q67pb4my5vfz1y954y0l8vlbbmdx9i20r1m8nf"; libraryHaskellDepends = [ base template-haskell ]; description = "Infix operators for mapping over compositions of functors. Lots of them."; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -95813,7 +96208,7 @@ self: { sha256 = "1qfrnny4qsn94n24q705z8d9gh9llz9nbyqbyy7hwh79bf1rkrcg"; libraryHaskellDepends = [ base ]; description = "Monad-style combinators for functors"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "functor-products" = callPackage @@ -95824,8 +96219,8 @@ self: { sha256 = "12rybs7d7m38sfnh9vqs375mzc0k8y0g0dgmwn2c23k9dn5r55jv"; libraryHaskellDepends = [ base microlens singletons text vinyl ]; description = "General functor products for various Foldable instances"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -95837,8 +96232,8 @@ self: { sha256 = "1sf4d3af4kf341g7slpylm2113cy0597fngr5ldlds8znylspmms"; libraryHaskellDepends = [ base ghc-prim lens ]; description = "Collection of functor utilities, providing handy operators, like generalization of (.)."; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -95850,8 +96245,8 @@ self: { sha256 = "1aa4f6yp4vrrrs3rswhjxw2gij3mwn8yf299kgv42wd03xazyxrs"; libraryHaskellDepends = [ base ]; description = "Data.FunctorM (compatibility package)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -95863,7 +96258,7 @@ self: { sha256 = "0nfnjxihn0nhj0rhi1wvqax1f95wskr3fwb7c2clz4lvsma6bfg6"; libraryHaskellDepends = [ base ]; description = "(.:) and friends, syntax for Functor and Applicative."; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "funflow" = callPackage @@ -95902,8 +96297,8 @@ self: { text unix ]; description = "Workflows with arrows"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -95925,8 +96320,8 @@ self: { tasty-hunit temporary unix ]; description = "Utility functions for using funflow with nix"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -95943,7 +96338,7 @@ self: { TypeCompose ]; description = "GLL parser with simple combinator interface"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "funion" = callPackage @@ -95960,8 +96355,8 @@ self: { base bytestring directory filepath haskell98 HFuse unix ]; description = "A unioning file-system using HFuse"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -95977,8 +96372,8 @@ self: { testHaskellDepends = [ base hscolour ipprint tasty tasty-hspec ]; benchmarkHaskellDepends = [ base criterion hscolour ipprint ]; description = "funnyPrint function to colorize GHCi output"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -95990,8 +96385,8 @@ self: { sha256 = "0zblrfg8mfbc1hzxb36hk2lb3c167xmpcvg8h595m9kjpdmj4ayw"; libraryHaskellDepends = [ base mtl ]; description = "A generalization of pattern matching"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -96013,8 +96408,8 @@ self: { QuickCheck random time ]; description = "A modern DPLL-style SAT solver"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -96026,8 +96421,8 @@ self: { sha256 = "0jf8yhk45n06avl9avgmawvazsz585i7jppvcds6pjd8pqdb2qk4"; libraryHaskellDepends = [ base ]; description = "Type-level function utilities"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -96048,7 +96443,7 @@ self: { testToolDepends = [ markdown-unlit ]; benchmarkHaskellDepends = [ base gauge transformers ]; description = "A fast, flexible, fused effect system"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fused-effects-exceptions" = callPackage @@ -96065,7 +96460,7 @@ self: { ]; testToolDepends = [ markdown-unlit ]; description = "Handle exceptions thrown in IO with fused-effects"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fused-effects-lens" = callPackage @@ -96077,7 +96472,7 @@ self: { libraryHaskellDepends = [ base fused-effects microlens ]; testHaskellDepends = [ base fused-effects hspec microlens ]; description = "Monadic lens combinators for fused-effects"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fused-effects-mwc-random" = callPackage @@ -96095,7 +96490,7 @@ self: { testHaskellDepends = [ base fused-effects mwc-random vector ]; benchmarkHaskellDepends = [ base fused-effects-random gauge ]; description = "High-quality random number generation as an effect"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fused-effects-optics" = callPackage @@ -96106,7 +96501,7 @@ self: { sha256 = "16q5b7b46k4hi8c46kq57dxidh2djzksc7s8jb65k341bbvlsy1w"; libraryHaskellDepends = [ base fused-effects optics-core ]; description = "Bridge between the optics and fused-effects ecosystems"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fused-effects-random" = callPackage @@ -96117,7 +96512,7 @@ self: { sha256 = "0krcyx4hhvkxh0rbfwxb52xgb4rl45dflyx3aw8xryp6wn9my770"; libraryHaskellDepends = [ base fused-effects random transformers ]; description = "Random number generation for fused-effects"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fused-effects-readline" = callPackage @@ -96136,7 +96531,7 @@ self: { ]; testHaskellDepends = [ base ]; description = "A readline-like effect and carrier for fused-effects"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fused-effects-resumable" = callPackage @@ -96149,8 +96544,8 @@ self: { base deepseq fused-effects transformers ]; description = "Resumable exceptions for the fused-effects ecosystem"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -96167,8 +96562,8 @@ self: { unliftio-pool ]; description = "A fused-effects adapter for squeal-postgresql"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -96185,8 +96580,8 @@ self: { base fused-effects tasty tasty-hunit template-haskell ]; description = "Template Haskell helpers for fused-effects"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -96201,8 +96596,8 @@ self: { libraryHaskellDepends = [ base pipes-safe transformers void ]; testHaskellDepends = [ base directory doctest filepath ]; description = "Effectful streaming library based on shortcut fusion techniques"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -96212,14 +96607,14 @@ self: { }: mkDerivation { pname = "fusion-plugin"; - version = "0.2.1"; - sha256 = "08v43q428s6nw3diqaasdr0c9arrzvzvldcybj8wp2r66aw613ic"; + version = "0.2.2"; + sha256 = "1d7avmbrqgvp9c4jyrlw344hml29f3vy5m5fgyrsd1z3g4fymakb"; libraryHaskellDepends = [ base containers directory filepath fusion-plugin-types ghc syb time transformers ]; description = "GHC plugin to make stream fusion more predictable"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.asl20; }) {}; "fusion-plugin-types" = callPackage @@ -96230,36 +96625,36 @@ self: { sha256 = "14lzymjna6faiwj7bdm1jrz42jfj3w1wi2hv66mldjhadf45613d"; libraryHaskellDepends = [ base ]; description = "Types for the fusion-plugin package"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "futhark" = callPackage ({ mkDerivation, aeson, alex, ansi-terminal, array, base, binary - , blaze-html, bytestring, cmark-gfm, containers, directory - , directory-tree, dlist, file-embed, filepath, free, gitrev, happy - , haskeline, language-c-quote, mainland-pretty, megaparsec, mtl - , neat-interpolation, parallel, parser-combinators, pcg-random - , process, process-extras, QuickCheck, regex-tdfa, sexp-grammar - , srcloc, tasty, tasty-hunit, tasty-quickcheck, template-haskell - , temporary, terminal-size, text, time, transformers - , unordered-containers, utf8-string, vector - , vector-binary-instances, versions, zip-archive, zlib + , blaze-html, bytestring, bytestring-to-vector, cmark-gfm + , containers, directory, directory-tree, dlist, file-embed + , filepath, free, gitrev, happy, haskeline, language-c-quote + , mainland-pretty, megaparsec, mtl, neat-interpolation, parallel + , parser-combinators, pcg-random, process, process-extras + , QuickCheck, regex-tdfa, sexp-grammar, srcloc, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, temporary, terminal-size + , text, time, transformers, unordered-containers, utf8-string + , vector, vector-binary-instances, versions, zip-archive, zlib }: mkDerivation { pname = "futhark"; - version = "0.18.5"; - sha256 = "1v81b2snf5famnm8fx3kbqcsrqb80kb29yk98lvljiflnq5bkmb4"; + version = "0.18.6"; + sha256 = "0bp837b6myis5kvyy0rg3py01fcyyj7qws7kqvci3mjyi9x57k7w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-terminal array base binary blaze-html bytestring - cmark-gfm containers directory directory-tree dlist file-embed - filepath free gitrev haskeline language-c-quote mainland-pretty - megaparsec mtl neat-interpolation parallel pcg-random process - process-extras regex-tdfa sexp-grammar srcloc template-haskell - temporary terminal-size text time transformers unordered-containers - utf8-string vector vector-binary-instances versions zip-archive - zlib + bytestring-to-vector cmark-gfm containers directory directory-tree + dlist file-embed filepath free gitrev haskeline language-c-quote + mainland-pretty megaparsec mtl neat-interpolation parallel + pcg-random process process-extras regex-tdfa sexp-grammar srcloc + template-haskell temporary terminal-size text time transformers + unordered-containers utf8-string vector vector-binary-instances + versions zip-archive zlib ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ base text ]; @@ -96268,7 +96663,7 @@ self: { sexp-grammar tasty tasty-hunit tasty-quickcheck text ]; description = "An optimising compiler for a functional, array-oriented language"; - license = stdenv.lib.licenses.isc; + license = lib.licenses.isc; }) {}; "futhask" = callPackage @@ -96282,7 +96677,7 @@ self: { libraryHaskellDepends = [ base directory raw-strings-qq split ]; executableHaskellDepends = [ base directory raw-strings-qq split ]; description = "Generate Haskell wrappers for Futhark libraries"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "futun" = callPackage @@ -96295,8 +96690,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base bytestring network unix ]; description = "Simple IP-over-UDP tunnel using TUNTAP"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -96308,8 +96703,8 @@ self: { sha256 = "1gvv1m6sfxdc28h4rzp5dh6hrz6nfh031nhs192606v8wg78m3ri"; libraryHaskellDepends = [ base ]; description = "Supposed to mimics and enhance proposed C++ \"future\" features"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -96321,7 +96716,7 @@ self: { sha256 = "10whksji6r1bilmj2fxcccg89zh7c08s2zfn07r6wj3xgschrckv"; libraryHaskellDepends = [ base transformers ]; description = "realtime resource handling with manual concurrency"; - license = stdenv.lib.licenses.lgpl3; + license = lib.licenses.lgpl3; }) {}; "futures" = callPackage @@ -96332,7 +96727,7 @@ self: { sha256 = "0dx484i5q58yw3h6j9qp42x546vkky3sc29cqbr9969sfilmbqz8"; libraryHaskellDepends = [ base ]; description = "Simple and fast implementation of Future"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "fuzzcheck" = callPackage @@ -96350,7 +96745,7 @@ self: { base hspec hspec-expectations HUnit QuickCheck ]; description = "A simple checker for stress testing monadic code"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fuzzy" = callPackage @@ -96362,7 +96757,7 @@ self: { libraryHaskellDepends = [ base monoid-subclasses ]; testHaskellDepends = [ base HUnit ]; description = "Filters a list based on a fuzzy string search"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "fuzzy-dates" = callPackage @@ -96374,7 +96769,7 @@ self: { libraryHaskellDepends = [ base hourglass hspec lens parsec ]; testHaskellDepends = [ base hourglass hspec lens parsec ]; description = "Libary for parsing dates in strings in varied formats"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fuzzy-parse" = callPackage @@ -96393,7 +96788,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Tools for processing unstructured text data"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "fuzzy-time" = callPackage @@ -96407,7 +96802,7 @@ self: { libraryHaskellDepends = [ base containers deepseq megaparsec text time validity validity-time ]; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "fuzzy-time-gen" = callPackage @@ -96431,8 +96826,8 @@ self: { benchmarkHaskellDepends = [ base criterion fuzzy-time genvalidity-criterion ]; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -96453,8 +96848,8 @@ self: { test-framework-hunit test-framework-quickcheck2 time ]; description = "Translates high-level definitions of \"fuzzily\" scheduled objects (e.g. play this commercial 10 times per hour between 9:00-13:00) to a list of accurately scheduled objects using glpk-hs."; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -96474,7 +96869,7 @@ self: { unordered-containers vector ]; description = "Fuzzy set for approximate string matching"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fuzzytime" = callPackage @@ -96506,7 +96901,7 @@ self: { ]; testHaskellDepends = [ async base hspec ]; description = "Fast Mutable Vars"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "fwgl" = callPackage @@ -96521,8 +96916,8 @@ self: { base hashable transformers unordered-containers vect vector Yampa ]; description = "Game engine"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -96539,8 +96934,8 @@ self: { unordered-containers vect vector ]; description = "FWGL GLFW backend"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -96556,8 +96951,8 @@ self: { base fwgl ghcjs-base hashable unordered-containers vect ]; description = "FWGL GHCJS backend"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -96569,7 +96964,7 @@ self: { sha256 = "1awscv2y8ywcyyn08hdmlh3qdjs33akr7grfdfls59rmhidg4fhd"; libraryHaskellDepends = [ base ]; description = "Horizontally composable effects"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "g-npm" = callPackage @@ -96582,8 +96977,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base HTTP json ]; description = "Generate Gentoo ebuilds from NodeJS/npm packages"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -96616,8 +97011,8 @@ self: { tasty-hunit text time unordered-containers ]; description = "Haskell symbolic execution engine"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -96629,8 +97024,8 @@ self: { sha256 = "1g42xkc4jc1a94s1krr1yrn191f8d6rmcpwk9ndwzk3nwby9v1vf"; libraryHaskellDepends = [ base g2 ]; description = "G2Q allows constraint programming, via writing Haskell predicates"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -96643,8 +97038,8 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "A theorem prover for propositional logic that uses G4ip"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -96662,7 +97057,7 @@ self: { executableToolDepends = [ happy ]; testHaskellDepends = [ base ]; description = "Theorem prover for intuitionistic propositional logic using G4ip"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "gact" = callPackage @@ -96680,7 +97075,7 @@ self: { ]; description = "General Alignment Clustering Tool"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -96707,8 +97102,8 @@ self: { vector ]; description = "FFTs over finite fields"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -96734,8 +97129,8 @@ self: { protolude QuickCheck semirings vector wl-pprint-text ]; description = "Galois field library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -96750,7 +97145,7 @@ self: { executableHaskellDepends = [ array base hscurses random text ]; testHaskellDepends = [ array base hspec ]; description = "Conway's Game of Life"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "game-probability" = callPackage @@ -96761,8 +97156,8 @@ self: { sha256 = "1wl29h702g79kwy4ca35x1q37aaj3rphf1i9vdm2hmd44bzrwvkk"; libraryHaskellDepends = [ base containers probability random ]; description = "Simple probability library for dice rolls, card games and similar"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -96788,7 +97183,7 @@ self: { executableHaskellDepends = [ base cairo containers glib gtk time ]; description = "Game clock that shows two analog clock faces"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -96819,8 +97214,8 @@ self: { tasty-quickcheck text time ]; description = "Tool for generating TOTP MFA tokens"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -96841,8 +97236,8 @@ self: { test-framework-quickcheck2 ]; description = "Gamma function and related functions"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -96854,7 +97249,7 @@ self: { sha256 = "0gj7ln0xq1a7zzxhyl636z854xfq714kmh2ld30ll0dskr701l1p"; libraryHaskellDepends = [ base containers mtl stm transformers ]; description = "Non-deterministic parallelism with bags"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "garepinoh" = callPackage @@ -96868,8 +97263,8 @@ self: { libraryHaskellDepends = [ base haskeline transformers ]; executableHaskellDepends = [ base haskeline transformers ]; description = "reverse prefix notation calculator and calculation library"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -96881,7 +97276,7 @@ self: { sha256 = "0r8wybcqn7g24q8abrw757h76r75l4jh4hjx91yh44h4c1r6k4yf"; doHaddock = false; description = "TBA"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "gargoyle" = callPackage @@ -96896,7 +97291,7 @@ self: { base directory filelock filepath network process unix ]; description = "Automatically spin up and spin down local daemons"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "gargoyle-postgresql" = callPackage @@ -96917,7 +97312,7 @@ self: { base bytestring gargoyle process text unix ]; description = "Manage PostgreSQL servers with gargoyle"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "gargoyle-postgresql-connect" = callPackage @@ -96936,8 +97331,8 @@ self: { gargoyle-postgresql-nix postgresql-simple resource-pool ]; description = "Connect to gargoyle-managed postgresql instances"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -96958,8 +97353,8 @@ self: { base gargoyle gargoyle-postgresql which ]; description = "Manage PostgreSQL servers with gargoyle and nix"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -96972,7 +97367,7 @@ self: { libraryHaskellDepends = [ base mtl transformers ]; testHaskellDepends = [ base hspec mtl transformers ]; description = "A monad transformer for keeping track of where you've come from"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "garsia-wachs" = callPackage @@ -96983,7 +97378,7 @@ self: { sha256 = "0mks5nwc19i0wsc5hhxh0ji2bh0224y3r89b3p9dfzzn64n3za6v"; libraryHaskellDepends = [ base ]; description = "A Functional Implementation of the Garsia-Wachs Algorithm"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "gas" = callPackage @@ -96994,8 +97389,8 @@ self: { sha256 = "1khapcq5yfx46pmc3y5nax8p5v5ckbis8v4f53jng6j59cd27c3f"; libraryHaskellDepends = [ base free transformers ]; description = "Limit how many steps a program may take"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -97007,7 +97402,7 @@ self: { sha256 = "0dhna3mj7mdyk1n0x3barpn5g4hkjl9fnbr403xym1dm8rl7r7hg"; libraryHaskellDepends = [ base binary containers mtl QuickCheck ]; description = "A framework of algebraic classes"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "gather" = callPackage @@ -97018,8 +97413,8 @@ self: { sha256 = "0ajh8ygks61knc17vgsm5dsnqhkcrz2s0gaw6xyppq415wijgv0m"; libraryHaskellDepends = [ base ]; description = "An applicative for parsing unordered things, heterogenous sorting"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -97039,7 +97434,7 @@ self: { ]; benchmarkHaskellDepends = [ base ]; description = "small framework for performance measurement and analysis"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "gbu" = callPackage @@ -97054,8 +97449,8 @@ self: { base containers fgl Graphalyze haskell98 mtl regex-posix ]; description = "planar graph embedding into a plane"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -97067,7 +97462,7 @@ self: { sha256 = "0cql0csrwqddpw28qmpr47mcnszmdc2szwvbnardr86pmjhvgwph"; libraryHaskellDepends = [ base ]; description = "Poor Richard's Memory Manager"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "gc-monitoring-wai" = callPackage @@ -97083,8 +97478,8 @@ self: { unordered-containers wai ]; description = "a wai application to show GHC.GCStats"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -97114,8 +97509,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "GCode processor"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ sorki ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ sorki ]; }) {}; "gconf" = callPackage @@ -97131,8 +97526,8 @@ self: { libraryPkgconfigDepends = [ GConf ]; libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the GNOME configuration database system"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs.gnome2) GConf;}; @@ -97149,7 +97544,7 @@ self: { expat fontconfig freetype gd libjpeg libpng zlib ]; description = "A Haskell binding to a subset of the GD graphics library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) expat; inherit (pkgs) fontconfig; inherit (pkgs) freetype; inherit (pkgs) gd; inherit (pkgs) libjpeg; inherit (pkgs) libpng; @@ -97186,8 +97581,8 @@ self: { tasty-th text time unordered-containers vector websockets wuss ]; description = "API Wrapping for Coinbase's GDAX exchange"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -97202,7 +97597,7 @@ self: { libraryHaskellDepends = [ base bytestring megaparsec text time ]; testHaskellDepends = [ base hspec megaparsec QuickCheck text ]; description = "GDELT V2 (Global Database of Events, Language, and Tone)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "gdiff" = callPackage @@ -97213,7 +97608,7 @@ self: { sha256 = "1d0d8f8bfw7ld6a1d5y6syzdha5qsm909mqzd5gfqcbi2wnh8aqc"; libraryHaskellDepends = [ base ]; description = "Generic diff and patch"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "gdiff-ig" = callPackage @@ -97228,8 +97623,8 @@ self: { array base ghc-prim instant-generics template-haskell ]; description = "Generic diff for the instant-generics library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -97248,8 +97643,8 @@ self: { base containers gdiff mtl template-haskell th-expand-syns uniplate ]; description = "Generate gdiff GADTs and Instances"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -97268,7 +97663,7 @@ self: { transformers ]; description = "recursive atomic build system"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "gdp" = callPackage @@ -97282,7 +97677,7 @@ self: { libraryHaskellDepends = [ base lawful ]; executableHaskellDepends = [ base ]; description = "Reason about invariants and preconditions with ghosts of departed proofs"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "gearbox" = callPackage @@ -97295,7 +97690,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base GLUT OpenGLRaw Vec ]; description = "zooming rotating fractal gears graphics demo"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "gedcom" = callPackage @@ -97312,8 +97707,8 @@ self: { ]; testHaskellDepends = [ base hspec megaparsec text-all ]; description = "Parser for the GEDCOM genealogy file format"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -97334,8 +97729,8 @@ self: { text-icu time ]; description = "Geek blog engine"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -97360,7 +97755,7 @@ self: { ]; description = "Geek blog engine server"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -97381,8 +97776,8 @@ self: { librarySystemDepends = [ gegl ]; libraryPkgconfigDepends = [ gegl ]; description = "Haskell bindings to GEGL library"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) gegl;}; @@ -97401,8 +97796,8 @@ self: { ]; executableHaskellDepends = [ base linear mtl vector ]; description = "A graphics description language"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -97420,8 +97815,8 @@ self: { ]; testHaskellDepends = [ base ]; description = "FreeType2 based text rendering for the gelatin realtime rendering system"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -97433,8 +97828,8 @@ self: { sha256 = "0yp3z4sz52f21zvdy1xmd0bvpicbnv4wa53937rq1vw2jv60xx2r"; libraryHaskellDepends = [ base FontyFruity gelatin linear vector ]; description = "Gelatin's support for rendering TTF outlines, using FontyFruity"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -97456,8 +97851,8 @@ self: { ]; executableHaskellDepends = [ base gelatin lens linear mtl vector ]; description = "OpenGL rendering routines for the gelatin-picture graphics EDSL"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -97475,8 +97870,8 @@ self: { libraryHaskellDepends = [ base gelatin-gl mtl sdl2 transformers ]; executableHaskellDepends = [ base either filepath sdl2 ]; description = "An SDL2 backend for the gelatin renderer"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -97489,8 +97884,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring filepath gelatin ]; description = "Gelatin's OpenGL shaders"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -97506,7 +97901,7 @@ self: { base gemini-server network-uri transformers ]; description = "A simple Happstack-style Gemini router"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "gemini-server" = callPackage @@ -97524,7 +97919,7 @@ self: { utf8-string ]; description = "A lightweight server for the Gemini protocol"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "gemini-textboard" = callPackage @@ -97545,7 +97940,7 @@ self: { network-uri nonce sqlite-simple text time transformers ]; description = "A barebones textboard for the Gemini protocol"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "gemstone" = callPackage @@ -97563,7 +97958,7 @@ self: { ]; description = "A simple library of helpers for SDL+GL games"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -97579,8 +97974,8 @@ self: { base bytestring Cabal containers filepath hackage-db pretty ]; description = "Code to generate instances for the package \"ghc-instances\""; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -97598,8 +97993,8 @@ self: { base bytestring optparse-applicative random vector ]; description = "Create wordlist-based passwords easily"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -97616,8 +98011,8 @@ self: { transformers ]; description = "A testing framework inspired by QuickCheck and SmallCheck"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -97633,8 +98028,8 @@ self: { libraryHaskellDepends = [ attoparsec base text ]; executableHaskellDepends = [ attoparsec base text ]; description = "Identify a persons gender by their first name"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -97650,8 +98045,8 @@ self: { librarySystemDepends = [ genders ]; testHaskellDepends = [ base bytestring hspec network vector ]; description = "Bindings to libgenders"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {genders = null;}; @@ -97667,7 +98062,7 @@ self: { ]; testHaskellDepends = [ base ]; description = "Library for generating interface documentation from types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "general-games" = callPackage @@ -97683,7 +98078,7 @@ self: { ]; testHaskellDepends = [ base hspec HUnit MonadRandom ]; description = "Library supporting simulation of a number of games"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "general-prelude" = callPackage @@ -97697,8 +98092,8 @@ self: { base lens pointless-fun strict system-filepath ]; description = "Prelude replacement using generalized type classes where possible"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -97710,8 +98105,8 @@ self: { sha256 = "1rwz2ribijj5hb2isg0yz6hb2mwyjhzfg0ys041yb43qlcbhkhdd"; libraryHaskellDepends = [ base List transformers ]; description = "Python-generators notation for creation of monadic lists"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -97723,8 +98118,8 @@ self: { sha256 = "0i51xx2hhjqjdvyzy2jza921jcfhy37azyp1cfaakvrj9kxl2w2q"; libraryHaskellDepends = [ base mtl random ]; description = "Actually useful monadic random value generators"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -97744,8 +98139,8 @@ self: { base HUnit QuickCheck test-framework test-framework-hunit ]; description = "stringly-named getters for generic data"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -97762,7 +98157,7 @@ self: { unordered-containers vector ]; description = "Derivation of Aeson instances using GHC generics"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "generic-arbitrary" = callPackage @@ -97773,7 +98168,7 @@ self: { sha256 = "1imw36k5kxfl7ik0mzjxa8xzqg6hs3k253kpi19a9l53wxa0mwv9"; libraryHaskellDepends = [ base QuickCheck ]; description = "Generic implementation for QuickCheck's Arbitrary"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "generic-binary" = callPackage @@ -97784,8 +98179,8 @@ self: { sha256 = "1h6xs56c351137mjc3hdba7yfcw8jy9dvzj0vdrgwm0dprn0xh29"; libraryHaskellDepends = [ base binary bytestring ghc-prim ]; description = "Generic Data.Binary derivation using GHC generics."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -97801,8 +98196,8 @@ self: { base HUnit test-framework test-framework-hunit ]; description = "Automatically convert Generic instances to and from church representations"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -97815,7 +98210,7 @@ self: { libraryHaskellDepends = [ base template-haskell th-abstraction ]; testHaskellDepends = [ base HUnit ]; description = "Constraints via Generic"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "generic-data" = callPackage @@ -97841,7 +98236,7 @@ self: { ]; benchmarkHaskellDepends = [ base criterion deepseq ]; description = "Deriving instances with GHC.Generics and related utilities"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "generic-data-surgery" = callPackage @@ -97857,7 +98252,7 @@ self: { base generic-data show-combinators tasty tasty-hunit ]; description = "Surgery for generic data types"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "generic-deepseq" = callPackage @@ -97870,7 +98265,7 @@ self: { editedCabalFile = "16x2sj8wq6wbda93910r8vyddi1j4yzzr0172bih0anc93mrmvaq"; libraryHaskellDepends = [ base ghc-prim ]; description = "Generic deep evaluation of data structures"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "generic-deriving" = callPackage @@ -97889,7 +98284,7 @@ self: { testHaskellDepends = [ base hspec template-haskell ]; testToolDepends = [ hspec-discover ]; description = "Generic programming library for generalised deriving"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "generic-deriving_1_14" = callPackage @@ -97906,8 +98301,8 @@ self: { testHaskellDepends = [ base hspec template-haskell ]; testToolDepends = [ hspec-discover ]; description = "Generic programming library for generalised deriving"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "generic-enum" = callPackage @@ -97919,8 +98314,8 @@ self: { libraryHaskellDepends = [ array base bytestring ]; testHaskellDepends = [ array base bytestring hspec ]; description = "An Enum class that fixes some deficiences with Prelude's Enum"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -97932,8 +98327,8 @@ self: { sha256 = "1wwhbn3hpanr5ya1dc8spaf1r38sc1hglpz3d6mqizlna0p9a68l"; libraryHaskellDepends = [ base ]; description = "Generically derived enumerations"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -97945,7 +98340,7 @@ self: { sha256 = "084rfdmcw071dslnw86n2w58xiqhkaldf7qjcmlizykqc15si5xh"; libraryHaskellDepends = [ base containers text ]; description = "Generic Environment Generator"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "generic-functor" = callPackage @@ -97957,7 +98352,7 @@ self: { libraryHaskellDepends = [ ap-normalize base ]; testHaskellDepends = [ base transformers ]; description = "Deriving generalized functors with GHC.Generics"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "generic-lens" = callPackage @@ -97975,7 +98370,26 @@ self: { base doctest HUnit inspection-testing lens profunctors ]; description = "Generically derive traversals, lenses and prisms"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; + }) {}; + + "generic-lens_2_1_0_0" = callPackage + ({ mkDerivation, base, doctest, generic-lens-core, HUnit + , inspection-testing, lens, profunctors, text + }: + mkDerivation { + pname = "generic-lens"; + version = "2.1.0.0"; + sha256 = "1qxabrbzgd32i2fv40qw4f44akvfs1impjvcs5pqn409q9zz6kfd"; + libraryHaskellDepends = [ + base generic-lens-core profunctors text + ]; + testHaskellDepends = [ + base doctest HUnit inspection-testing lens profunctors + ]; + description = "Generically derive traversals, lenses and prisms"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "generic-lens-core" = callPackage @@ -97986,7 +98400,19 @@ self: { sha256 = "0h7fjh3zk8lkkmdj3w3wg72gbmnr8wz9wfm58ryvx0036l284qji"; libraryHaskellDepends = [ base indexed-profunctors text ]; description = "Generically derive traversals, lenses and prisms"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; + }) {}; + + "generic-lens-core_2_1_0_0" = callPackage + ({ mkDerivation, base, indexed-profunctors, text }: + mkDerivation { + pname = "generic-lens-core"; + version = "2.1.0.0"; + sha256 = "0ja72rn7f7a24bmgqb6rds1ic78jffy2dzrb7sx8gy3ld5mlg135"; + libraryHaskellDepends = [ base indexed-profunctors text ]; + description = "Generically derive traversals, lenses and prisms"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "generic-lens-labels" = callPackage @@ -97997,8 +98423,8 @@ self: { sha256 = "0lhzxknz8117zc28d7l9wfvln5lp7alxfx8f6q4b986i93dzkl09"; libraryHaskellDepends = [ base generic-lens ]; description = "GHC.OverloadedLabels.IsLabel instance for lenses from ghc-generics"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -98013,7 +98439,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Monomorphic field lens like with generic-lens"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "generic-lucid-scaffold" = callPackage @@ -98024,8 +98450,8 @@ self: { sha256 = "13lry3hqqrqgk5z9dc6q6hr70iqky4ssra2l71y51gnrg1kprkrz"; libraryHaskellDepends = [ base lucid text ]; description = "General-purpose web page scaffold for Lucid"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -98037,7 +98463,7 @@ self: { sha256 = "1h27gd7f0px3xgan9liqwav8xhl0smn6nhdmi7ggd18mjafa1ngv"; libraryHaskellDepends = [ base generics-sop ]; description = "First class pattern matching"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "generic-maybe" = callPackage @@ -98058,8 +98484,8 @@ self: { ]; benchmarkHaskellDepends = [ base criterion deepseq ]; description = "A generic version of Data.Maybe"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -98071,7 +98497,7 @@ self: { sha256 = "1pradfv1i2z73f3vxx78ahmfsdszcgi44kn29aww2hdgf2np5l6g"; libraryHaskellDepends = [ base ]; description = "Derive monoid instances for product types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "generic-optics" = callPackage @@ -98089,7 +98515,26 @@ self: { base doctest HUnit inspection-testing optics-core ]; description = "Generically derive traversals, lenses and prisms"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; + }) {}; + + "generic-optics_2_1_0_0" = callPackage + ({ mkDerivation, base, doctest, generic-lens-core, HUnit + , inspection-testing, optics-core, text + }: + mkDerivation { + pname = "generic-optics"; + version = "2.1.0.0"; + sha256 = "04szdpcaxiaw9n1cry020mcrcirypfq3qxwr7h8h34b2mffvnl25"; + libraryHaskellDepends = [ + base generic-lens-core optics-core text + ]; + testHaskellDepends = [ + base doctest HUnit inspection-testing optics-core + ]; + description = "Generically derive traversals, lenses and prisms"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "generic-optics-lite" = callPackage @@ -98103,7 +98548,7 @@ self: { libraryHaskellDepends = [ base generic-lens-lite optics-core ]; testHaskellDepends = [ base optics-core ]; description = "Monomorphic field opics like with generic-lens"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "generic-override" = callPackage @@ -98114,7 +98559,7 @@ self: { sha256 = "13v5zrhhzjzm4fib5zjsp4sf1hhgx9450mmy4v12h7bgljz8xfd5"; libraryHaskellDepends = [ base ]; description = "Provides functionality for overriding instances for generic derivation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "generic-override-aeson" = callPackage @@ -98126,8 +98571,8 @@ self: { libraryHaskellDepends = [ aeson base generic-override ]; testHaskellDepends = [ aeson base generic-override hspec text ]; description = "Provides orphan instances necessary for integrating generic-override and aeson"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -98146,8 +98591,8 @@ self: { base bytestring containers tasty tasty-hunit text vector ]; description = "Pretty printing for Generic value"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -98162,7 +98607,7 @@ self: { base deepseq inspection-testing QuickCheck ]; description = "Generic random generators for QuickCheck"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "generic-records" = callPackage @@ -98173,7 +98618,7 @@ self: { sha256 = "0xga8vm89xjgzmnz5032kqyq1q8nhbf01n55xjgda4kfjzkx1yr0"; libraryHaskellDepends = [ base ]; description = "Magic record operations using generics"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "generic-server" = callPackage @@ -98184,8 +98629,8 @@ self: { sha256 = "0bl3gfqdw6sdwcailzkzmpz433cpxf6np9w9qnkwwa05xhcpd2k6"; libraryHaskellDepends = [ base bytestring network ]; description = "Simple generic TCP/IP server"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -98198,8 +98643,8 @@ self: { libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base ghc-prim hspec QuickCheck ]; description = "Generic implementation of Storable"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -98212,7 +98657,7 @@ self: { libraryHaskellDepends = [ base ]; description = "Generic Tree data type"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -98226,8 +98671,8 @@ self: { editedCabalFile = "1dxf7c66vncw8zn0848g0bk2i2msbrb4njzvkzwvlaiphq0gqg10"; libraryHaskellDepends = [ base containers transformers ]; description = "A map, where the keys may be complex structured data"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -98242,8 +98687,8 @@ self: { base HaXml mtl syb-with-class template-haskell ]; description = "Marshalling Haskell values to/from XML"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -98258,8 +98703,8 @@ self: { libraryHaskellDepends = [ base generic-deriving hxt text ]; testHaskellDepends = [ base hxt tasty tasty-hunit tasty-th ]; description = "Generic generation of HXT XmlPickler instances using GHC Generics"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -98278,7 +98723,7 @@ self: { ]; testToolDepends = [ markdown-unlit ]; description = "A library for generic programming that aims to be easy to understand"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "generics-mrsop" = callPackage @@ -98292,8 +98737,8 @@ self: { base containers mtl sop-core template-haskell ]; description = "Generic Programming with Mutually Recursive Sums of Products"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -98305,8 +98750,8 @@ self: { sha256 = "01fkfk18h8dpl6w3ipx85ay9qj8s56xl7022ids21a0slyc4ml4s"; libraryHaskellDepends = [ base generics-mrsop ]; description = "Reimplementation of the gdiff algorithm for generics-mrsop"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -98328,7 +98773,7 @@ self: { base criterion deepseq template-haskell ]; description = "Generic Programming using True Sums of Products"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "generics-sop-lens" = callPackage @@ -98339,7 +98784,7 @@ self: { sha256 = "1yl74pz6r2zf9sspzbqg6xvr6k9b5irq3c3pjrf5ih6hfrz4k1ks"; libraryHaskellDepends = [ base generics-sop lens ]; description = "Lenses for types in generics-sop"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "genericserialize" = callPackage @@ -98351,8 +98796,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base ]; description = "Serialization library using Data.Generics"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -98380,8 +98825,8 @@ self: { persistent-sqlite persistent-template text ]; description = "Opinionated bootstrapping for Haskell web services"; - license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -98405,8 +98850,8 @@ self: { persistent-template text ]; description = "Opinionated bootstrapping for Haskell web services"; - license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -98420,8 +98865,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base random-fu ]; description = "A Genetic Algorithm library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -98446,7 +98891,7 @@ self: { executableHaskellDepends = [ base GenI ]; description = "GenI graphical user interface"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -98470,8 +98915,8 @@ self: { base bytestring cmdargs directory filepath GenI json text ]; description = "Companion tools for use with the GenI surface realiser"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -98492,7 +98937,7 @@ self: { ]; description = "Conversion utility for the GenI generator"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -98505,7 +98950,7 @@ self: { libraryHaskellDepends = [ base containers mtl template-haskell ]; testHaskellDepends = [ base containers mtl template-haskell ]; description = "Generate generalized fmap, foldMap and traverse"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "geniplate" = callPackage @@ -98516,8 +98961,8 @@ self: { sha256 = "01cwyf5kql4hf76p1ssqpmhaxyl7rmnmqwv644wgd0j8km8b6szc"; libraryHaskellDepends = [ base mtl template-haskell ]; description = "Use Template Haskell to generate Uniplate-like functions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -98529,7 +98974,7 @@ self: { sha256 = "08w4rslxzv6z85qzam1yazjb6vrzcr55vsjjyjgsi86pb1a8hr3b"; libraryHaskellDepends = [ base mtl template-haskell ]; description = "Use Template Haskell to generate Uniplate-like functions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "geniserver" = callPackage @@ -98551,7 +98996,7 @@ self: { ]; description = "Simple HTTP server for GenI results"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -98563,8 +99008,8 @@ self: { sha256 = "1a9b2h4swfwx5zwcyr2zdhxdxi9f68pwpglijxhxb5javjc4dppr"; libraryHaskellDepends = [ base MonadRandom syb syz ]; description = "Genetic programming library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -98577,8 +99022,8 @@ self: { libraryHaskellDepends = [ base parsec transformers ]; testHaskellDepends = [ base HUnit parsec transformers ]; description = "Gentle markup language"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -98593,7 +99038,7 @@ self: { libraryHaskellDepends = [ base QuickCheck random validity ]; testHaskellDepends = [ base hspec hspec-core QuickCheck ]; description = "Testing utilities for the validity library"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "genvalidity-aeson" = callPackage @@ -98615,7 +99060,7 @@ self: { aeson base genvalidity genvalidity-hspec hspec ]; description = "GenValidity support for aeson"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "genvalidity-bytestring" = callPackage @@ -98640,7 +99085,7 @@ self: { QuickCheck ]; description = "GenValidity support for ByteString"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "genvalidity-containers" = callPackage @@ -98664,7 +99109,7 @@ self: { QuickCheck ]; description = "GenValidity support for containers"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "genvalidity-criterion" = callPackage @@ -98681,7 +99126,7 @@ self: { base criterion genvalidity QuickCheck ]; description = "Criterion benchmarks for generators"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "genvalidity-hspec" = callPackage @@ -98700,7 +99145,7 @@ self: { base genvalidity hspec hspec-core QuickCheck ]; description = "Standard spec's for GenValidity instances"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "genvalidity-hspec-aeson" = callPackage @@ -98722,7 +99167,7 @@ self: { validity ]; description = "Standard spec's for aeson-related instances"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "genvalidity-hspec-binary" = callPackage @@ -98741,7 +99186,7 @@ self: { base binary genvalidity genvalidity-property hspec validity ]; description = "Standard spec's for binary-related Instances"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "genvalidity-hspec-cereal" = callPackage @@ -98761,7 +99206,7 @@ self: { validity ]; description = "Standard spec's for cereal-related instances"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "genvalidity-hspec-hashable" = callPackage @@ -98782,7 +99227,7 @@ self: { hspec hspec-core QuickCheck validity ]; description = "Standard spec's for Hashable instances"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "genvalidity-hspec-optics" = callPackage @@ -98801,7 +99246,7 @@ self: { microlens validity ]; description = "Standard spec's for lens"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "genvalidity-hspec-persistent" = callPackage @@ -98821,7 +99266,7 @@ self: { genvalidity-text hspec persistent QuickCheck text validity ]; description = "Standard spec's for persistent-related instances"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "genvalidity-mergeful" = callPackage @@ -98846,7 +99291,7 @@ self: { benchmarkHaskellDepends = [ base criterion genvalidity-criterion mergeful ]; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "genvalidity-mergeless" = callPackage @@ -98872,7 +99317,7 @@ self: { benchmarkHaskellDepends = [ base criterion genvalidity-criterion mergeless ]; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "genvalidity-path" = callPackage @@ -98892,7 +99337,7 @@ self: { base criterion genvalidity genvalidity-criterion path QuickCheck ]; description = "GenValidity support for Path"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "genvalidity-property" = callPackage @@ -98908,7 +99353,7 @@ self: { ]; testHaskellDepends = [ base directory doctest filepath ]; description = "Standard properties for functions on `Validity` types"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "genvalidity-scientific" = callPackage @@ -98926,7 +99371,7 @@ self: { base genvalidity genvalidity-hspec hspec QuickCheck scientific ]; description = "GenValidity support for Scientific"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "genvalidity-text" = callPackage @@ -98949,7 +99394,7 @@ self: { base criterion genvalidity genvalidity-criterion QuickCheck text ]; description = "GenValidity support for Text"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "genvalidity-time" = callPackage @@ -98969,7 +99414,7 @@ self: { base criterion genvalidity-criterion time ]; description = "GenValidity support for time"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "genvalidity-typed-uuid" = callPackage @@ -98993,7 +99438,7 @@ self: { QuickCheck typed-uuid ]; description = "Generators for Phantom-Typed version of UUID"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "genvalidity-unordered-containers" = callPackage @@ -99014,7 +99459,7 @@ self: { validity ]; description = "GenValidity support for unordered-containers"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "genvalidity-uuid" = callPackage @@ -99036,7 +99481,7 @@ self: { base criterion genvalidity genvalidity-criterion QuickCheck uuid ]; description = "GenValidity support for UUID"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "genvalidity-vector" = callPackage @@ -99054,7 +99499,7 @@ self: { base genvalidity genvalidity-hspec hspec vector ]; description = "GenValidity support for vector"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "geo-resolver" = callPackage @@ -99076,8 +99521,8 @@ self: { test-framework-hunit test-framework-quickcheck2 ]; description = "Performs geo location lookups and parses the results"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -99094,7 +99539,7 @@ self: { array base binary bytestring bzlib template-haskell th-lift ]; description = "High precision conversion between GPS and UK Grid"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "geocalc" = callPackage @@ -99105,7 +99550,7 @@ self: { sha256 = "1bvbvrkxh8dvm796ilpp294qlacid6aap2ljdi9pmz1lkf20fxjg"; libraryHaskellDepends = [ base ]; description = "Libary for calculating distances between two coordinates in WSG84"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "geocode-google" = callPackage @@ -99120,7 +99565,7 @@ self: { base containers hjson HTTP network network-uri ]; description = "Geocoding using the Google Web API"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "geodetic" = callPackage @@ -99136,8 +99581,8 @@ self: { base directory doctest filepath QuickCheck template-haskell ]; description = "Geodetic calculations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -99149,8 +99594,8 @@ self: { sha256 = "1v7dl3nl9gp8pj469sk41k8nz34s1dngpinif06v8bbpms31i0bd"; libraryHaskellDepends = [ base dimensional lens semigroups ]; description = "Types for geodetic operations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -99170,7 +99615,7 @@ self: { test-framework-hunit test-framework-quickcheck2 ]; description = "Terrestrial coordinate systems and geodetic calculations"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "geohash" = callPackage @@ -99181,7 +99626,7 @@ self: { sha256 = "1pdx4pnq893kkjmgg0bgh9bfvfqdvzfq5fi02zfyhw3h8h4k05v4"; libraryHaskellDepends = [ array base ]; description = "Geohash latitudes and longitudes"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "geoip2" = callPackage @@ -99197,7 +99642,7 @@ self: { reinterpret-cast text ]; description = "Pure haskell interface to MaxMind GeoIP database"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "geojson" = callPackage @@ -99218,7 +99663,7 @@ self: { tasty-quickcheck text validation ]; description = "A thin GeoJSON Layer above the aeson library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "geojson-types" = callPackage @@ -99229,8 +99674,8 @@ self: { sha256 = "10kcrvimb7mdy59bk7x7nwkzhp85ws4511xakcl6bgiwhls39x4j"; libraryHaskellDepends = [ aeson base bson bytestring lens text ]; description = "GeoJSON data types including JSON/BSON conversion"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -99249,8 +99694,8 @@ self: { siphon test-framework test-framework-hunit text ]; description = "Geolite CSV Parser"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -99263,8 +99708,8 @@ self: { libraryHaskellDepends = [ base ieee754 linear QuickCheck ]; testHaskellDepends = [ base ieee754 linear QuickCheck ]; description = "package for geometry in euklidean 2d space"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -99285,8 +99730,8 @@ self: { ]; testSystemDepends = [ geos ]; description = "Bindings for GEOS"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) geos;}; @@ -99305,8 +99750,8 @@ self: { time ]; description = "Fetch from emusic using .emx files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -99318,8 +99763,8 @@ self: { sha256 = "0jsr8cmbnllcswdvf1rp11sc6cpjhwr22x7kx9sk3dw8bv772jjc"; libraryHaskellDepends = [ base ]; description = "Command-line parser"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -99339,7 +99784,7 @@ self: { QuickCheck safe silently tagged ]; description = "Create command line interfaces with ease"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "getopt-simple" = callPackage @@ -99350,7 +99795,7 @@ self: { sha256 = "1pf40nc3jzprv4wn9h8mr0nhzxzilffgkapxg3k0qksfxydzv7pp"; libraryHaskellDepends = [ base containers ]; description = "A \"System.Console.GetOpt\" wrapper to make simple use case easy."; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "gf" = callPackage @@ -99385,7 +99830,7 @@ self: { preBuild = ''export LD_LIBRARY_PATH=`pwd`/dist/build''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH''; description = "Grammatical Framework"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "ggtsTC" = callPackage @@ -99399,8 +99844,8 @@ self: { enableSeparateDataOutput = true; executableHaskellDepends = [ base containers parsec ]; description = "A type checker and runtime system of rCOS/g (impl. of ggts-FCS)."; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -99418,8 +99863,8 @@ self: { base directory github memory text vector ]; description = "Github Standard Labeler"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -99439,7 +99884,7 @@ self: { executableHaskellDepends = [ aeson base bytestring ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "Script helpers for interacting with GitHub"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ghc_8_10_2" = callPackage @@ -99458,8 +99903,8 @@ self: { terminfo time transformers unix ]; description = "The GHC API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "ghc-api-compat" = callPackage @@ -99471,7 +99916,7 @@ self: { libraryHaskellDepends = [ ghc ]; doHaddock = false; description = "GHC-API compatibility helpers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ghc-boot_8_8_3" = callPackage @@ -99488,8 +99933,8 @@ self: { base binary bytestring directory filepath ghc-boot-th ]; description = "Shared functionality between GHC and its boot libraries"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "ghc-boot-th_8_10_2" = callPackage @@ -99500,8 +99945,8 @@ self: { sha256 = "1jic3l319b02f8b4r87c48645xhn5784vhgz2mp7d0zi2srrsfcz"; libraryHaskellDepends = [ base ]; description = "Shared functionality between GHC and the `template-haskell` library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "ghc-byteorder" = callPackage @@ -99514,7 +99959,7 @@ self: { testHaskellDepends = [ base ]; doHaddock = false; description = "\"GHC.ByteOrder\" API Compatibility Layer"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ghc-call-stack-extras" = callPackage @@ -99525,7 +99970,7 @@ self: { sha256 = "01gvyl2r7jqxca33gdavv6l2a6yz4xh2ndmb4v0y2mdgc9sskymc"; libraryHaskellDepends = [ base ]; description = "Extra utilities for HasCallStack"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ghc-check" = callPackage @@ -99542,7 +99987,7 @@ self: { safe-exceptions template-haskell transformers ]; description = "detect mismatches between compile-time and run-time versions of the ghc api"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ghc-clippy-plugin" = callPackage @@ -99559,8 +100004,8 @@ self: { base dhall ghc text text-icu text-regex-replace ]; description = "Override GHC error messages to the user's liking"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -99574,8 +100019,8 @@ self: { editedCabalFile = "09l51r0nk7vj6a9crz7q5sv4962mnq18xb6zkxfl6cnm28v85nsk"; libraryHaskellDepends = [ base bytestring ghc-prim ]; description = "In memory storage of deeply evaluated data structure"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "ghc-core" = callPackage @@ -99592,7 +100037,7 @@ self: { base colorize-haskell directory filepath pcre-light process ]; description = "Display GHC's core and assembly output in a pager"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ghc-core-html" = callPackage @@ -99610,7 +100055,7 @@ self: { base blaze-html bytestring containers mtl parsec process ]; description = "Core to HTML display"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ghc-core-smallstep" = callPackage @@ -99622,21 +100067,23 @@ self: { libraryHaskellDepends = [ base ghc ]; testHaskellDepends = [ base ghc ghc-paths ]; description = "A small-step semantics for Core"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; "ghc-datasize" = callPackage - ({ mkDerivation, base, deepseq, ghc-heap, ghc-prim }: + ({ mkDerivation, base, deepseq, ghc-lib-parser-ex, ghc-prim }: mkDerivation { pname = "ghc-datasize"; - version = "0.2.2"; - sha256 = "19iapv0m2g7d5i88pg9h19r89hafwj5f3h5682sp37irl4mzwkww"; - libraryHaskellDepends = [ base deepseq ghc-heap ghc-prim ]; + version = "0.2.3"; + sha256 = "1sbzharb72ngbq10mqvia4yb71mkhk5s5n1xd8nm11xpvqy4q28k"; + libraryHaskellDepends = [ + base deepseq ghc-lib-parser-ex ghc-prim + ]; description = "Determine the size of data structures in GHC's memory"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -99646,14 +100093,14 @@ self: { }: mkDerivation { pname = "ghc-dump-core"; - version = "0.1.1.0"; - sha256 = "0mksk6qhsnjd19yx79nw3dygfsfkyq52mdywikg21s67j8d4dxv5"; + version = "0.1.2.0"; + sha256 = "0yv811iyjx4iklj44bhipmiwlxl8bx27866i32icnl5ds86ws7la"; libraryHaskellDepends = [ base bytestring directory filepath ghc serialise text ]; description = "An AST and compiler plugin for dumping GHC's Core representation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -99678,20 +100125,20 @@ self: { process unordered-containers vector ]; description = "Dump GHC's parsed, renamed, and type checked ASTs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; "ghc-dump-util" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bytestring, ghc-dump-core - , hashable, optparse-applicative, regex-tdfa, regex-tdfa-text - , serialise, text, unordered-containers + , hashable, optparse-applicative, regex-tdfa, serialise, text + , unordered-containers }: mkDerivation { pname = "ghc-dump-util"; - version = "0.1.1.0"; - sha256 = "0x93y0ymf3fl977j3c3liz1c52q5b2fw5h1ivsw3dazpmrm62n7m"; + version = "0.1.2.0"; + sha256 = "1j85mscsc1g647r4d3v72lqclsi8bw174di6w9n24x0bq3rqskxi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -99700,11 +100147,10 @@ self: { ]; executableHaskellDepends = [ ansi-wl-pprint base ghc-dump-core optparse-applicative regex-tdfa - regex-tdfa-text ]; - description = "Handy tools for working with @ghc-dump@ dumps"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + description = "Handy tools for working with ghc-dump dumps"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -99716,8 +100162,8 @@ self: { sha256 = "0aw4wnbzfw031xqmq0lpi4zz2md1f43nj921ni91mhdl5xgqcajm"; libraryHaskellDepends = [ base ghc ]; description = "Explicitly prevent sharing"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -99737,7 +100183,7 @@ self: { executableHaskellDepends = [ base containers ]; testHaskellDepends = [ base ]; description = "Library and tool for parsing .eventlog files from GHC"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ghc-events-analyze" = callPackage @@ -99760,8 +100206,8 @@ self: { th-lift th-lift-instances transformers unordered-containers ]; description = "Analyze and visualize event logs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -99785,8 +100231,8 @@ self: { array base binary bytestring containers transformers ]; description = "Library and tool for parsing .eventlog files from parallel GHC"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -99810,7 +100256,7 @@ self: { ghc-boot ghc-paths HUnit mtl silently syb ]; description = "ExactPrint for GHC"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ghc-gc-tune" = callPackage @@ -99823,7 +100269,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base directory filepath process ]; description = "Graph performance of Haskell programs with different GC flags"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ghc-generic-instances" = callPackage @@ -99834,8 +100280,8 @@ self: { sha256 = "0264ma0w85fwypnagd0l4zfs1wi1yk16rygn6fhpzgsxycwmg47h"; libraryHaskellDepends = [ base ghc ]; description = "Derived instances of GHC.Generic of the GHC AST"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -99855,7 +100301,7 @@ self: { ]; testHaskellDepends = [ base deepseq ]; description = "Extract the heap representation of Haskell values and thunks"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ghc-hotswap" = callPackage @@ -99867,7 +100313,7 @@ self: { libraryHaskellDepends = [ base concurrent-extra deepseq ghci ]; description = "Library for hot-swapping shared objects in GHC"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "ghc-imported-from" = callPackage @@ -99903,8 +100349,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Find the Haddock documentation for a symbol"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -99926,8 +100372,8 @@ self: { process template-haskell time unix ]; description = "Easily import all instances contained in GHC distributed libraries"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -99940,8 +100386,8 @@ self: { libraryHaskellDepends = [ base ghc hashable ]; testHaskellDepends = [ base inspection-testing ]; description = "A magic typeclass that just does it"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -99961,7 +100407,7 @@ self: { ]; libraryToolDepends = [ alex happy ]; description = "The GHC API, decoupled from GHC versions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ghc-lib-parser" = callPackage @@ -99980,7 +100426,7 @@ self: { ]; libraryToolDepends = [ alex happy ]; description = "The GHC API, decoupled from GHC versions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ghc-lib-parser-ex" = callPackage @@ -100000,7 +100446,7 @@ self: { tasty-hunit uniplate ]; description = "Algorithms on GHC parse trees"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ghc-make" = callPackage @@ -100015,7 +100461,7 @@ self: { base process shake unordered-containers ]; description = "Accelerated version of ghc --make"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ghc-man-completion" = callPackage @@ -100028,8 +100474,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base parsec process ]; description = "Generate a bash completion from the GHC manpage"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -100076,8 +100522,8 @@ self: { base criterion directory filepath temporary ]; description = "Happy Haskell Hacking"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.agpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -100092,7 +100538,7 @@ self: { base exceptions extensible-exceptions ghc mtl ]; description = "An mtl compatible version of the Ghc-Api monads and monad-transformers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ghc-options" = callPackage @@ -100114,8 +100560,8 @@ self: { transformers unix ]; description = "Utilities for extracting GHC options needed to compile a given Haskell target"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {bin-package-db = null;}; @@ -100141,8 +100587,8 @@ self: { test-framework-hunit test-framework-quickcheck2 ]; description = "A parallel wrapper for 'ghc --make'"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -100155,7 +100601,7 @@ self: { libraryHaskellDepends = [ base ghc ]; libraryToolDepends = [ cpphs happy ]; description = "Haskell source parser from GHC"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "ghc-paths" = callPackage @@ -100169,7 +100615,7 @@ self: { setupHaskellDepends = [ base Cabal directory ]; libraryHaskellDepends = [ base ]; description = "Knowledge of GHC's installation directories"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ghc-pkg-autofix" = callPackage @@ -100186,8 +100632,8 @@ self: { base Cabal cmdargs filepath parsec process split ]; description = "Simple utility to fix BROKEN package dependencies for cabal-install"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -100202,8 +100648,8 @@ self: { base Cabal directory filepath ghc ghc-paths ]; description = "Provide library support for ghc-pkg information"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -100219,8 +100665,8 @@ self: { testHaskellDepends = [ base ]; doHaddock = false; description = "Type checker plugins without the type checking"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -100232,8 +100678,8 @@ self: { sha256 = "06nc87f4mcqcddllysb75qj942y5mmdwss7h9z3m0m93lbxxy6a2"; libraryHaskellDepends = [ rts ]; description = "GHC primitives"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "ghc-prof" = callPackage @@ -100254,7 +100700,7 @@ self: { tasty-hunit temporary text ]; description = "Library for parsing GHC time and allocation profiling reports"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ghc-prof-aeson" = callPackage @@ -100266,7 +100712,7 @@ self: { libraryHaskellDepends = [ aeson base text vector ]; testHaskellDepends = [ aeson base bytestring hspec ]; description = "Parser for GHC's JSON profiling output"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ghc-prof-aeson-flamegraph" = callPackage @@ -100284,7 +100730,7 @@ self: { optparse-applicative text vector ]; description = "Turn GHC `-pj` profiling output into FlameGraph format"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ghc-prof-flamegraph" = callPackage @@ -100300,7 +100746,7 @@ self: { base filepath optparse-applicative process ]; description = "Generates flamegraphs from GHC .prof files."; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "ghc-proofs" = callPackage @@ -100312,8 +100758,8 @@ self: { libraryHaskellDepends = [ base ghc ]; testHaskellDepends = [ base transformers ]; description = "GHC plugin to prove program equations by simplification"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -100325,7 +100771,7 @@ self: { sha256 = "1hg5iddlh87hir5vqjby2bihah4xcyarsfcgff3gd8l2h7mqi2dn"; doHaddock = false; description = "None"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ghc-session" = callPackage @@ -100344,8 +100790,8 @@ self: { ]; executableHaskellDepends = [ base transformers ]; description = "Simplified GHC API"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -100361,8 +100807,8 @@ self: { base binary bytestring directory filepath ghc ghc-paths ]; description = "Simplified interface to the GHC API"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -100379,7 +100825,7 @@ self: { base ghc ghc-paths QuickCheck tasty tasty-hunit tasty-quickcheck ]; description = "Constructs Haskell syntax trees for the GHC API"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ghc-srcspan-plugin" = callPackage @@ -100390,8 +100836,8 @@ self: { sha256 = "10zh7i4nx4ds3f1d7m2m1caqnxmi3dh6a900fl8mcp6a09isvglh"; libraryHaskellDepends = [ array base containers ghc hpc ]; description = "Generic GHC Plugin for annotating Haskell code with source location data"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -100403,8 +100849,8 @@ self: { sha256 = "0rwx7l89r5yfi1187c0zgx1ph2rsagyvrizb1c0vnbyrwhpbslh0"; libraryHaskellDepends = [ base ghc ]; description = "Data and Typeable instances for the GHC API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -100416,8 +100862,8 @@ self: { sha256 = "0mfnlp0z64999cc3jgzi3x5s428gs5jsqmmbr2n5v7shh0csnff4"; libraryHaskellDepends = [ base bytestring ghc syb ]; description = "Scrap Your Boilerplate utilities for the GHC API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -100433,7 +100879,7 @@ self: { testHaskellDepends = [ base hspec text ]; testToolDepends = [ hspec-discover ]; description = "Syntax highlighter for Haskell using lexer of GHC itself"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ghc-tags-core" = callPackage @@ -100462,8 +100908,8 @@ self: { pipes-attoparsec pipes-bytestring text ]; description = "a library to work with tags created from Haskell parsed tree"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -100485,8 +100931,8 @@ self: { pipes-bytestring pipes-safe text ]; description = "A compiler plugin which generates tags file from GHC parsed syntax tree"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -100498,8 +100944,8 @@ self: { sha256 = "13qhwjbhyi3nrjdvc0fdgxf4kz55my541mz2j3sndpxsmbymqs3m"; libraryHaskellDepends = [ base ghc ]; description = "Utilities for writing GHC type-checker plugins"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; }) {}; "ghc-tcplugins-extra" = callPackage @@ -100510,7 +100956,7 @@ self: { sha256 = "0v9y444gydfyk56y7adpabd633yv1d8jmddvgg272n8jpdpagw67"; libraryHaskellDepends = [ base ghc ]; description = "Utilities for writing GHC type-checker plugins"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }) {}; "ghc-time-alloc-prof" = callPackage @@ -100529,8 +100975,8 @@ self: { temporary text ]; description = "Library for parsing GHC time and allocation profiling reports"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -100542,7 +100988,7 @@ self: { sha256 = "074pvam1mb5sranh04i6xcs55vgk3h45vg0mdxnbxc3jmmv76lgi"; libraryHaskellDepends = [ base ]; description = "Provides bindings to functions starting and stopping the RTS timers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ghc-trace-events" = callPackage @@ -100554,7 +101000,7 @@ self: { libraryHaskellDepends = [ base bytestring text ]; benchmarkHaskellDepends = [ base bytestring criterion ]; description = "Faster traceEvent and traceMarker, and binary object logging for eventlog"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ghc-typelits-extra" = callPackage @@ -100577,7 +101023,7 @@ self: { tasty-hunit ]; description = "Additional type-level operations on GHC.TypeLits.Nat"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }) {}; "ghc-typelits-knownnat" = callPackage @@ -100597,7 +101043,7 @@ self: { base ghc-typelits-natnormalise tasty tasty-hunit tasty-quickcheck ]; description = "Derive KnownNat constraints from other KnownNat constraints"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }) {}; "ghc-typelits-natnormalise" = callPackage @@ -100613,25 +101059,32 @@ self: { ]; testHaskellDepends = [ base tasty tasty-hunit template-haskell ]; description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }) {}; "ghc-typelits-presburger" = callPackage - ({ mkDerivation, base, containers, ghc, ghc-tcplugins-extra, mtl - , pretty, reflection, syb, transformers + ({ mkDerivation, base, containers, equational-reasoning, ghc + , ghc-tcplugins-extra, mtl, pretty, reflection, syb, tasty + , tasty-discover, tasty-expected-failure, tasty-hunit, text + , transformers }: mkDerivation { pname = "ghc-typelits-presburger"; - version = "0.3.0.1"; - sha256 = "0h403zi5lqbpygpqw5469fafz1cgh5mcx96sp0iw4scnmh7z3cj9"; + version = "0.5.2.0"; + sha256 = "0ny7paq8ykc4ycag1dlb9mlpv17dh9a6csh22abj6bls5rx4iljr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers ghc ghc-tcplugins-extra mtl pretty reflection syb transformers ]; + testHaskellDepends = [ + base equational-reasoning tasty tasty-discover + tasty-expected-failure tasty-hunit text + ]; + testToolDepends = [ tasty-discover ]; description = "Presburger Arithmetic Solver for GHC Type-level natural numbers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ghc-usage" = callPackage @@ -100645,8 +101098,8 @@ self: { libraryHaskellDepends = [ base containers ghc ]; executableHaskellDepends = [ base ghc-paths unix ]; description = "Print minimal export lists"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -100665,8 +101118,8 @@ self: { svgcairo text transformers xdot ]; description = "Live visualization of data structures in GHCi"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -100678,7 +101131,7 @@ self: { sha256 = "1xsfznfypgmv67qdxm8zvl8n84hj47akjn9fsdi66b8flbx8c0gm"; libraryHaskellDepends = [ base directory ghc time ]; description = "Dump the ghc flags during compilation"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }) {}; "ghci_8_10_2" = callPackage @@ -100695,8 +101148,8 @@ self: { ghc-boot-th ghc-heap template-haskell transformers unix ]; description = "The library supporting GHC's interactive interpreter"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "ghci-dap" = callPackage @@ -100721,8 +101174,8 @@ self: { time transformers unix ]; description = "ghci-dap is a GHCi having DAP interface"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -100734,8 +101187,8 @@ self: { sha256 = "1jlym5k2d43avkgw7ff3pdaad5j2q5yq803cy74bgy0z69x77v1w"; libraryHaskellDepends = [ base cairo colour diagrams gtk ]; description = "Display simple diagrams from ghci"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -100754,8 +101207,8 @@ self: { mtl process unix ]; description = "An implementation of ghci using the Haskeline line-input library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -100768,7 +101221,7 @@ self: { libraryHaskellDepends = [ base binary ]; testHaskellDepends = [ base binary doctest QuickCheck ]; description = "GHCi as a Hex Calculator interactive"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ghci-history-parser" = callPackage @@ -100780,8 +101233,8 @@ self: { libraryHaskellDepends = [ base parsec ]; testHaskellDepends = [ base doctest hspec parsec ]; description = "parse output of ghci \":history\" command"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -100793,8 +101246,8 @@ self: { sha256 = "06lg1czsr6k5h18aks33p2kbahiidhv7xsrv7n1fcvqsgglzgk3z"; libraryHaskellDepends = [ base ghc MissingH ]; description = "A library for interactively evaluating Haskell code"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -100816,8 +101269,8 @@ self: { haskeline process syb time transformers unix ]; description = "Next generation GHCi"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -100829,8 +101282,8 @@ self: { sha256 = "01syl5c6ana4m8d3jc5pbi64zf3c4l2x0r7jwkizm7kymszmbns5"; libraryHaskellDepends = [ base hscolour ipprint ]; description = "colored pretty-printing within ghci"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -100847,7 +101300,7 @@ self: { wai-app-static warp websockets ]; description = "A websocket server that survives GHCi reloads"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ghcid" = callPackage @@ -100873,10 +101326,10 @@ self: { fsnotify process tasty tasty-hunit terminal-size time unix ]; description = "GHCi based bare bones IDE"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; - "ghcide" = callPackage + "ghcide_0_7_0_0" = callPackage ({ mkDerivation, aeson, array, async, base, base16-bytestring , binary, bytestring, case-insensitive, containers, cryptohash-sha1 , data-default, deepseq, directory, extra, filepath, fingertree @@ -100929,9 +101382,71 @@ self: { aeson base directory filepath shake shake-bench text yaml ]; description = "The core of an IDE"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - maintainers = with stdenv.lib.maintainers; [ maralorn ]; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ maralorn ]; + broken = true; + }) {shake-bench = null;}; + + "ghcide" = callPackage + ({ mkDerivation, aeson, array, async, base, base16-bytestring + , binary, bytestring, case-insensitive, containers, cryptohash-sha1 + , data-default, deepseq, directory, dlist, extra, filepath + , fingertree, fuzzy, ghc, ghc-boot, ghc-boot-th, ghc-check + , ghc-exactprint, ghc-paths, ghc-typelits-knownnat, gitrev, Glob + , haddock-library, hashable, haskell-lsp, haskell-lsp-types + , heapsize, hie-bios, hie-compat, hls-plugin-api, hslogger + , implicit-hie-cradle, lens, lsp-test, mtl, network-uri + , opentelemetry, optparse-applicative, parallel, prettyprinter + , prettyprinter-ansi-terminal, process, QuickCheck + , quickcheck-instances, record-dot-preprocessor, record-hasfield + , regex-tdfa, retrie, rope-utf16-splay, safe, safe-exceptions + , shake, shake-bench, sorted-list, stm, syb, tasty + , tasty-expected-failure, tasty-hunit, tasty-quickcheck + , tasty-rerun, text, time, transformers, unix, unordered-containers + , utf8-string, vector, yaml + }: + mkDerivation { + pname = "ghcide"; + version = "0.7.2.0"; + sha256 = "1d35vfwg906djfr2klrql7crgcyabfad12akalx25jc6c7pacv1d"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson array async base base16-bytestring binary bytestring + case-insensitive containers cryptohash-sha1 data-default deepseq + directory dlist extra filepath fingertree fuzzy ghc ghc-boot + ghc-boot-th ghc-check ghc-exactprint ghc-paths Glob haddock-library + hashable haskell-lsp haskell-lsp-types heapsize hie-bios hie-compat + hls-plugin-api hslogger implicit-hie-cradle lens mtl network-uri + opentelemetry parallel prettyprinter prettyprinter-ansi-terminal + regex-tdfa retrie rope-utf16-splay safe safe-exceptions shake + sorted-list stm syb text time transformers unix + unordered-containers utf8-string vector + ]; + executableHaskellDepends = [ + aeson base bytestring containers data-default directory extra + filepath gitrev hashable haskell-lsp haskell-lsp-types heapsize + hie-bios hls-plugin-api lens lsp-test optparse-applicative process + safe-exceptions shake text unordered-containers + ]; + testHaskellDepends = [ + aeson base binary bytestring containers data-default directory + extra filepath ghc ghc-typelits-knownnat haddock-library + haskell-lsp haskell-lsp-types hls-plugin-api lens lsp-test + network-uri optparse-applicative process QuickCheck + quickcheck-instances record-dot-preprocessor record-hasfield + rope-utf16-splay safe safe-exceptions shake tasty + tasty-expected-failure tasty-hunit tasty-quickcheck tasty-rerun + text + ]; + benchmarkHaskellDepends = [ + aeson base directory filepath shake shake-bench text yaml + ]; + description = "The core of an IDE"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ maralorn ]; broken = true; }) {shake-bench = null;}; @@ -100943,7 +101458,7 @@ self: { sha256 = "0yf2lpd7n891i61w1g0zbmi2zv93a2jzifxdsrqj39wxhl6afpc6"; libraryHaskellDepends = [ aeson base http-types text ]; description = "Crossbrowser AJAX Bindings for GHCJS"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "ghcjs-base_0_2_0_0" = callPackage @@ -100969,8 +101484,8 @@ self: { test-framework-hunit test-framework-quickcheck2 text ]; description = "base library for GHCJS"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {ghcjs-prim = null;}; @@ -100988,7 +101503,7 @@ self: { scientific text transformers unordered-containers vector ]; description = "Allow GHCJS projects to compile under GHC and develop using intero"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ghcjs-codemirror" = callPackage @@ -101000,7 +101515,7 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base ]; description = "Installs CodeMirror JavaScript files"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "ghcjs-dom" = callPackage @@ -101015,7 +101530,7 @@ self: { base containers ghcjs-dom-jsaddle text transformers ]; description = "DOM library that supports both GHCJS and GHC"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "ghcjs-dom-hello" = callPackage @@ -101036,8 +101551,8 @@ self: { base ghcjs-dom jsaddle-warp jsaddle-webkit2gtk mtl ]; description = "GHCJS DOM Hello World, an example package"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "ghcjs-dom-jsaddle" = callPackage @@ -101049,7 +101564,7 @@ self: { libraryHaskellDepends = [ jsaddle-dom ]; doHaddock = false; description = "DOM library that supports both GHCJS and GHC using jsaddle"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "ghcjs-dom-jsffi" = callPackage @@ -101059,8 +101574,8 @@ self: { version = "0.9.4.0"; sha256 = "02m0qszdl3kxyhjrzj1ph9gwbr9jkzak2v1b47v6ywsm7hmjgn7w"; description = "DOM library using JSFFI and GHCJS"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -101075,8 +101590,8 @@ self: { base glib gtk3 text transformers webkitgtk3 ]; description = "DOM library that supports both GHCJS and WebKitGTK"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "ghcjs-fetch" = callPackage @@ -101093,8 +101608,8 @@ self: { aeson base bytestring case-insensitive ghcjs-base-stub http-types ]; description = "GHCJS bindings for the JavaScript Fetch API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -101111,8 +101626,8 @@ self: { transient transient-universe ]; description = "Client-side web EDSL for transient nodes running in the web browser"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -101124,7 +101639,7 @@ self: { sha256 = "0b3hj0gm9gcgwpg8f7vxy87fasgpgn27ciyafhmy6b4fnnmn41kn"; libraryHaskellDepends = [ base transformers ]; description = "GHCJS version of Perch library"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "ghcjs-promise" = callPackage @@ -101135,8 +101650,8 @@ self: { sha256 = "06zq3bqcrci7zgkgphkhv5awzw75ivg6hn9avx9c4yp2c1ra3593"; libraryHaskellDepends = [ base ghcjs-base protolude ]; description = "Bidirectional bidings to javascript's promise"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -101155,8 +101670,8 @@ self: { template-haskell ]; description = "Virtual-dom bindings for GHCJS"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {ghcjs-ffiqq = null; ghcjs-prim = null;}; @@ -101174,7 +101689,7 @@ self: { base base64-bytestring binary bytestring ghcjs-base text ]; description = "Deprecated: use ghcjs-base's native websockets"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "ghcjs-xhr" = callPackage @@ -101185,8 +101700,8 @@ self: { sha256 = "07nra5d0hc70v23wqaivwj96lakiz34vv96m9khi5y9f5lsads0l"; libraryHaskellDepends = [ base ghcjs-base text ]; description = "XmlHttpRequest (\"AJAX\") bindings for GHCJS"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -101213,8 +101728,8 @@ self: { wai-websockets warp websockets yesod yesod-static ]; description = "Interactive Haskell interpreter in a browser"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -101233,8 +101748,8 @@ self: { regex-tdfa-text scientific text ]; description = "GHC .prof files viewer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -101248,7 +101763,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base zenc ]; description = "Decode Z-encoded strings from GHC"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ghost-buster" = callPackage @@ -101260,7 +101775,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "Existential type utilites"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ght" = callPackage @@ -101284,7 +101799,7 @@ self: { ]; description = "Trivial routines for inspecting git repositories"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -101304,7 +101819,7 @@ self: { ]; libraryPkgconfigDepends = [ atk ]; description = "Atk bindings"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; }) {inherit (pkgs) atk;}; "gi-cairo" = callPackage @@ -101327,7 +101842,7 @@ self: { setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" ''; description = "Cairo bindings"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; }) {inherit (pkgs) cairo;}; "gi-cairo-again" = callPackage @@ -101342,8 +101857,8 @@ self: { base cairo-core haskell-gi-base template-haskell ]; description = "Bridge between packages gi-* and cairo-core"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -101359,7 +101874,7 @@ self: { base gi-cairo gi-cairo-render haskell-gi-base mtl ]; description = "GI friendly Binding to the Cairo library"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; }) {}; "gi-cairo-render" = callPackage @@ -101376,7 +101891,7 @@ self: { libraryPkgconfigDepends = [ cairo ]; libraryToolDepends = [ c2hs ]; description = "GI friendly Binding to the Cairo library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) cairo;}; "gi-dbusmenu" = callPackage @@ -101395,7 +101910,7 @@ self: { ]; libraryPkgconfigDepends = [ libdbusmenu ]; description = "Dbusmenu bindings"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; }) {inherit (pkgs) libdbusmenu;}; "gi-dbusmenugtk3" = callPackage @@ -101419,7 +101934,7 @@ self: { ]; libraryPkgconfigDepends = [ gtk3 libdbusmenu-gtk3 ]; description = "DbusmenuGtk bindings"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; }) {inherit (pkgs) gtk3; inherit (pkgs) libdbusmenu-gtk3;}; "gi-gdk" = callPackage @@ -101443,7 +101958,7 @@ self: { ]; libraryPkgconfigDepends = [ gtk3 ]; description = "Gdk bindings"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; }) {inherit (pkgs) gtk3;}; "gi-gdk_4_0_2" = callPackage @@ -101467,8 +101982,8 @@ self: { ]; libraryPkgconfigDepends = [ gtk4 ]; description = "Gdk bindings"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; }) {gtk4 = null;}; "gi-gdkpixbuf" = callPackage @@ -101489,7 +102004,7 @@ self: { ]; libraryPkgconfigDepends = [ gdk-pixbuf ]; description = "GdkPixbuf bindings"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; }) {inherit (pkgs) gdk-pixbuf;}; "gi-gdkx11" = callPackage @@ -101511,7 +102026,7 @@ self: { ]; libraryPkgconfigDepends = [ gtk3 ]; description = "GdkX11 bindings"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; }) {inherit (pkgs) gtk3;}; "gi-gdkx11_4_0_2" = callPackage @@ -101533,8 +102048,8 @@ self: { ]; libraryPkgconfigDepends = [ gtk4-x11 ]; description = "GdkX11 bindings"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; }) {gtk4-x11 = null;}; "gi-ggit" = callPackage @@ -101555,7 +102070,7 @@ self: { ]; libraryPkgconfigDepends = [ libgit2-glib ]; description = "libgit2-glib bindings"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; }) {inherit (pkgs) libgit2-glib;}; "gi-gio" = callPackage @@ -101574,7 +102089,7 @@ self: { ]; libraryPkgconfigDepends = [ glib ]; description = "Gio bindings"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; "gi-girepository" = callPackage @@ -101593,7 +102108,7 @@ self: { ]; libraryPkgconfigDepends = [ gobject-introspection ]; description = "GIRepository (gobject-introspection) bindings"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; }) {inherit (pkgs) gobject-introspection;}; "gi-glib" = callPackage @@ -101612,7 +102127,7 @@ self: { ]; libraryPkgconfigDepends = [ glib ]; description = "GLib bindings"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; "gi-gobject" = callPackage @@ -101631,7 +102146,7 @@ self: { ]; libraryPkgconfigDepends = [ glib ]; description = "GObject bindings"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; "gi-graphene" = callPackage @@ -101650,8 +102165,8 @@ self: { ]; libraryPkgconfigDepends = [ graphene-gobject ]; description = "Graphene bindings"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; broken = true; }) {graphene-gobject = null;}; @@ -101676,8 +102191,8 @@ self: { ]; libraryPkgconfigDepends = [ gtk4 ]; description = "Gsk bindings"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; broken = true; }) {gtk4 = null;}; @@ -101697,7 +102212,7 @@ self: { ]; libraryPkgconfigDepends = [ gstreamer ]; description = "GStreamer bindings"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; }) {inherit (pkgs.gst_all_1) gstreamer;}; "gi-gstaudio" = callPackage @@ -101718,8 +102233,8 @@ self: { ]; libraryPkgconfigDepends = [ gst-plugins-base ]; description = "GStreamerAudio bindings"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs.gst_all_1) gst-plugins-base;}; @@ -101741,7 +102256,7 @@ self: { ]; libraryPkgconfigDepends = [ gst-plugins-base ]; description = "GStreamerBase bindings"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; }) {inherit (pkgs.gst_all_1) gst-plugins-base;}; "gi-gstpbutils" = callPackage @@ -101765,8 +102280,8 @@ self: { ]; libraryPkgconfigDepends = [ gstreamer-pbutils ]; description = "GStreamer Plugins Base Utils bindings"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; broken = true; }) {gstreamer-pbutils = null;}; @@ -101788,8 +102303,8 @@ self: { ]; libraryPkgconfigDepends = [ gstreamer-tag ]; description = "GStreamer Tag bindings"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; broken = true; }) {gstreamer-tag = null;}; @@ -101811,7 +102326,7 @@ self: { ]; libraryPkgconfigDepends = [ gst-plugins-base ]; description = "GStreamerVideo bindings"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; }) {inherit (pkgs.gst_all_1) gst-plugins-base;}; "gi-gtk" = callPackage @@ -101835,7 +102350,7 @@ self: { ]; libraryPkgconfigDepends = [ gtk3 ]; description = "Gtk bindings"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; }) {inherit (pkgs) gtk3;}; "gi-gtk_4_0_3" = callPackage @@ -101859,8 +102374,8 @@ self: { ]; libraryPkgconfigDepends = [ gtk4 ]; description = "Gtk bindings"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; }) {gtk4 = null;}; "gi-gtk-declarative" = callPackage @@ -101884,8 +102399,8 @@ self: { unordered-containers vector ]; description = "Declarative GTK+ programming in Haskell"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -101904,8 +102419,8 @@ self: { pipes-concurrency text ]; description = "Declarative GTK+ programming in Haskell in the style of Pux"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -101923,7 +102438,7 @@ self: { gi-gtk haskell-gi-base mtl text transformers ]; description = "A wrapper for gi-gtk, adding a few more idiomatic API parts on top"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; }) {}; "gi-gtkosxapplication" = callPackage @@ -101944,8 +102459,8 @@ self: { ]; libraryPkgconfigDepends = [ gtk-mac-integration-gtk3 ]; description = "GtkosxApplication bindings"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; broken = true; }) {gtk-mac-integration-gtk3 = null;}; @@ -101970,8 +102485,8 @@ self: { ]; libraryPkgconfigDepends = [ gtksheet ]; description = "GtkSheet bindings"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; broken = true; }) {gtksheet = null;}; @@ -101996,7 +102511,7 @@ self: { ]; libraryPkgconfigDepends = [ gtksourceview3 ]; description = "GtkSource bindings"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; }) {inherit (pkgs) gtksourceview3;}; "gi-handy" = callPackage @@ -102020,8 +102535,8 @@ self: { ]; libraryPkgconfigDepends = [ libhandy ]; description = "libhandy bindings"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) libhandy;}; @@ -102041,7 +102556,7 @@ self: { ]; libraryPkgconfigDepends = [ harfbuzz harfbuzz-gobject ]; description = "HarfBuzz bindings"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; }) {inherit (pkgs) harfbuzz; harfbuzz-gobject = null;}; "gi-ibus" = callPackage @@ -102062,7 +102577,7 @@ self: { ]; libraryPkgconfigDepends = [ ibus ]; description = "IBus bindings"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; }) {inherit (pkgs) ibus;}; "gi-javascriptcore" = callPackage @@ -102081,8 +102596,8 @@ self: { ]; libraryPkgconfigDepends = [ webkitgtk ]; description = "JavaScriptCore bindings"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) webkitgtk;}; "gi-notify" = callPackage @@ -102103,7 +102618,7 @@ self: { ]; libraryPkgconfigDepends = [ libnotify ]; description = "Libnotify bindings"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; }) {inherit (pkgs) libnotify;}; "gi-ostree" = callPackage @@ -102124,8 +102639,8 @@ self: { ]; libraryPkgconfigDepends = [ ostree ]; description = "OSTree bindings"; - license = stdenv.lib.licenses.lgpl21; - platforms = [ "i686-linux" "x86_64-linux" ]; + license = lib.licenses.lgpl21; + platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) ostree;}; "gi-pango" = callPackage @@ -102150,7 +102665,7 @@ self: { setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" ''; description = "Pango bindings"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; }) {inherit (pkgs) cairo; inherit (pkgs) pango;}; "gi-pangocairo" = callPackage @@ -102176,7 +102691,7 @@ self: { setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" ''; description = "PangoCairo bindings"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; }) {inherit (pkgs) cairo; inherit (pkgs) pango;}; "gi-poppler" = callPackage @@ -102197,8 +102712,8 @@ self: { ]; libraryPkgconfigDepends = [ poppler_gi ]; description = "Poppler bindings"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) poppler_gi;}; @@ -102220,7 +102735,7 @@ self: { ]; libraryPkgconfigDepends = [ libsecret ]; description = "Libsecret bindings"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; }) {inherit (pkgs) libsecret;}; "gi-soup" = callPackage @@ -102241,7 +102756,7 @@ self: { ]; libraryPkgconfigDepends = [ libsoup ]; description = "Libsoup bindings"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; }) {inherit (pkgs) libsoup;}; "gi-vte" = callPackage @@ -102265,7 +102780,7 @@ self: { ]; libraryPkgconfigDepends = [ vte_291 ]; description = "Vte bindings"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; }) {vte_291 = pkgs.vte;}; "gi-webkit" = callPackage @@ -102287,8 +102802,8 @@ self: { libraryPkgconfigDepends = [ webkitgtk24x-gtk3 ]; doHaddock = false; description = "WebKit bindings"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) webkitgtk24x-gtk3;}; "gi-webkit2" = callPackage @@ -102312,8 +102827,8 @@ self: { ]; libraryPkgconfigDepends = [ webkitgtk ]; description = "WebKit2 bindings"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) webkitgtk;}; "gi-webkit2webextension" = callPackage @@ -102337,8 +102852,8 @@ self: { ]; libraryPkgconfigDepends = [ webkitgtk ]; description = "WebKit2-WebExtension bindings"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) webkitgtk;}; "gi-wnck" = callPackage @@ -102361,8 +102876,8 @@ self: { ]; libraryPkgconfigDepends = [ libwnck ]; description = "Wnck bindings"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) libwnck;}; @@ -102382,7 +102897,7 @@ self: { ]; libraryPkgconfigDepends = [ xlibsWrapper ]; description = "xlib bindings"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; }) {inherit (pkgs) xlibsWrapper;}; "giak" = callPackage @@ -102401,8 +102916,8 @@ self: { filepath mtl process semigroups stm stm-chans text unix wybor ]; description = "Fuzzy finder for cabal executables"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -102414,7 +102929,7 @@ self: { sha256 = "1hxdgff1rw3yp3a2p26bj6034jgc458bdzma1xkbh9pahlhwhs2l"; libraryHaskellDepends = [ base split ]; description = "Haskell parser for GIML"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "ginger" = callPackage @@ -102446,7 +102961,7 @@ self: { utf8-string ]; description = "An implementation of the Jinja2 template language in Haskell"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "gingersnap" = callPackage @@ -102467,7 +102982,7 @@ self: { transformers ]; description = "Consistent and safe JSON APIs with snap-core and (by default) postgresql-simple"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ginsu" = callPackage @@ -102490,8 +103005,8 @@ self: { ]; executableSystemDepends = [ openssl ]; description = "Ginsu Gale Client"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) openssl;}; @@ -102510,7 +103025,7 @@ self: { ]; libraryPkgconfigDepends = [ system-glib ]; description = "Binding to GIO"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; }) {system-glib = pkgs.glib;}; "gipeda" = callPackage @@ -102532,8 +103047,8 @@ self: { unordered-containers vector yaml ]; description = "Git Performance Dashboard"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -102559,8 +103074,8 @@ self: { network-uri text ]; description = "Giphy HTTP API wrapper and CLI search tool"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -102578,8 +103093,8 @@ self: { aeson base bytestring conduit http-conduit text ]; description = "A reliable command-line client for gist.github.com"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -102604,8 +103119,8 @@ self: { ]; doCheck = false; description = "Git operations in haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -102624,8 +103139,8 @@ self: { system-filepath text transformers unix ]; description = "Determine which Git repositories need actions to be taken"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -102653,8 +103168,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "8.20201129"; - sha256 = "10fxl5215x0hqhmwd387xpzgvz4w190lylwr0rihxhy5mwdvf943"; + version = "8.20210127"; + sha256 = "1hsmaw70lfza1g5j6b9zbwqkkr374m18p7qb4nl952pj42a46vv3"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -102697,8 +103212,8 @@ self: { checkPhase = ''PATH+=":$PWD" git-annex test''; enableSharedExecutables = false; description = "manage files with git, without checking their contents into git"; - license = stdenv.lib.licenses.agpl3; - maintainers = with stdenv.lib.maintainers; [ peti ]; + license = lib.licenses.agpl3; + maintainers = with lib.maintainers; [ peti ]; }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; @@ -102721,7 +103236,7 @@ self: { base brick hspec microlens optparse-applicative process vector vty ]; description = "git checkout command-line tool"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "git-checklist" = callPackage @@ -102740,7 +103255,7 @@ self: { ]; description = "Maintain per-branch checklists in Git"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -102762,8 +103277,8 @@ self: { ]; testToolDepends = [ tasty-discover ]; description = "A simple parser for Git configuration files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -102783,8 +103298,8 @@ self: { ]; executableHaskellDepends = [ base relude ]; description = "Haskell Git Helper Tool"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -102805,8 +103320,8 @@ self: { test-framework-quickcheck2 time utf8-string ]; description = "Bindings to the date parsing from Git"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -102822,7 +103337,7 @@ self: { base directory filepath process template-haskell ]; description = "Use TH to embed Git repo information"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }) {}; "git-fmt" = callPackage @@ -102844,8 +103359,8 @@ self: { pipes-concurrency process temporary text time ]; description = "Custom git command for formatting code"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -102868,7 +103383,7 @@ self: { process text ]; description = "A Git subcommand to show total addition, deletion per file"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "git-gpush" = callPackage @@ -102888,8 +103403,8 @@ self: { transformers ]; description = "More intelligent push-to-GitHub utility"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -102903,8 +103418,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base base-compat process ]; description = "Move a git branch"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -102921,7 +103436,7 @@ self: { http-types network-uri text ]; description = "git-lfs protocol"; - license = stdenv.lib.licenses.agpl3; + license = lib.licenses.agpl3; }) {}; "git-mediate" = callPackage @@ -102939,7 +103454,7 @@ self: { optparse-applicative process unix-compat ]; description = "Tool to help resolving git conflicts"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }) {}; "git-monitor" = callPackage @@ -102962,8 +103477,8 @@ self: { template-haskell text time transformers unix unordered-containers ]; description = "Passively snapshots working tree changes efficiently"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -102980,8 +103495,8 @@ self: { enumerator filepath zlib-enum ]; description = "Git object and its parser"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -103013,8 +103528,8 @@ self: { optparse-applicative text ]; description = "Git remote helper to store git objects on IPFS"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -103027,13 +103542,13 @@ self: { }: mkDerivation { pname = "git-repair"; - version = "1.20200504"; - sha256 = "1k5sildrc46mhwxzwxfjxv267322gavcvvs3gc56mz1vfs8ip4b8"; + version = "1.20210111"; + sha256 = "08kdip1pg300yr50xwyklf9xpmcq8pgkym60yz97qj83yhlcszb7"; isLibrary = false; isExecutable = true; setupHaskellDepends = [ - base bytestring Cabal data-default directory exceptions filepath - filepath-bytestring hslogger IfElse mtl process split unix + async base bytestring Cabal data-default directory exceptions + filepath filepath-bytestring hslogger IfElse mtl process split unix unix-compat ]; executableHaskellDepends = [ @@ -103043,8 +103558,8 @@ self: { split text time transformers unix unix-compat utf8-string ]; description = "repairs a damaged git repository"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.agpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -103064,8 +103579,8 @@ self: { ]; executableHaskellDepends = [ base Cabal ]; description = "A sanity checker for your git history"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -103095,8 +103610,8 @@ self: { ]; testToolDepends = [ git ]; description = "A framework for pre-commit checks"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -103116,7 +103631,7 @@ self: { base mtl parsec tasty tasty-hunit tasty-quickcheck tasty-smallcheck ]; description = "More efficient replacement to the great git-radar"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "gitcache" = callPackage @@ -103133,7 +103648,7 @@ self: { base cryptonite directory filepath process utf8-string ]; description = "Simple git utility to use and manage clone cache"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "gitdo" = callPackage @@ -103152,8 +103667,8 @@ self: { optparse-applicative sqlite-simple system-filepath text turtle wreq ]; description = "Create Github issues out of TODO comments in code"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -103173,7 +103688,7 @@ self: { temporary unliftio ]; description = "Compile git revision info into Haskell projects"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "github" = callPackage @@ -103203,7 +103718,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Access to the GitHub API, v3"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "github-backup" = callPackage @@ -103230,8 +103745,8 @@ self: { ]; executableToolDepends = [ git ]; description = "backs up everything github knows about a repository, to the repository"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) git;}; @@ -103257,8 +103772,8 @@ self: { vector vector-instances ]; description = "Access to the GitHub API, v3"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -103275,7 +103790,7 @@ self: { wai-logger warp ]; description = "GitHub webhooks library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "github-release" = callPackage @@ -103295,7 +103810,7 @@ self: { ]; executableHaskellDepends = [ base ]; description = "Upload files to GitHub releases"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "github-rest" = callPackage @@ -103318,7 +103833,7 @@ self: { tasty-quickcheck text time transformers unliftio unliftio-core ]; description = "Query the GitHub REST API programmatically"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "github-tools" = callPackage @@ -103337,8 +103852,8 @@ self: { http-client-tls monad-parallel tabular tagsoup text time vector ]; description = "Various Github helper utilities"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.agpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -103358,7 +103873,7 @@ self: { ]; description = "Type definitions for objects used by the GitHub v3 API"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "github-utils" = callPackage @@ -103369,8 +103884,8 @@ self: { sha256 = "1d7g1rzaqg19bc41vqvcdxdi37z9h7ajy3khsqa4pwbfavj412a5"; libraryHaskellDepends = [ base basic-prelude github text ]; description = "Useful functions that use the GitHub API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -103389,8 +103904,8 @@ self: { uuid vector ]; description = "GitHub WebHook Handler"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -103409,8 +103924,8 @@ self: { github-webhook-handler snap-core uuid ]; description = "GitHub WebHook Handler implementation for Snap"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -103429,7 +103944,7 @@ self: { ]; testHaskellDepends = [ aeson base bytestring hspec text vector ]; description = "Aeson instances for GitHub Webhook payloads"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "githud" = callPackage @@ -103454,8 +103969,8 @@ self: { tasty-smallcheck ]; description = "Heads up, and you see your GIT context"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -103474,8 +103989,8 @@ self: { text ]; description = "Apply GitHub .gitignore templates to already existing repositories."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -103528,8 +104043,8 @@ self: { ]; testHaskellDepends = [ base hspec rio ]; description = "Gitlab Web API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -103540,8 +104055,8 @@ self: { }: mkDerivation { pname = "gitlab-haskell"; - version = "0.2.4"; - sha256 = "1p2sgxnr5xgh0wz3q5vf6xqy827nrplfbcpfwa6kgqxiqgsfsdv2"; + version = "0.2.5"; + sha256 = "13dlbl2hlvmplxjypg14llpbxf0a9x2f4lk0kkn46f63mn0fy83x"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring connection http-conduit http-types temporary @@ -103549,7 +104064,7 @@ self: { ]; testHaskellDepends = [ aeson base bytestring tasty tasty-hunit ]; description = "A Haskell library for the GitLab web API"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "gitlib" = callPackage @@ -103571,8 +104086,8 @@ self: { unliftio-core unordered-containers ]; description = "API library for working with Git repositories"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -103600,8 +104115,8 @@ self: { tagged text transformers ]; description = "Gitlib repository backend that uses the git command-line tool"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -103619,8 +104134,8 @@ self: { hspec-expectations HUnit ]; description = "Run tests between repositories"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -103647,8 +104162,8 @@ self: { transformers ]; description = "Libgit2 backend for gitlib"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -103678,8 +104193,8 @@ self: { monad-logger resourcet temporary text transformers ]; description = "Gitlib repository backend for storing Git objects in Amazon S3"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -103693,8 +104208,8 @@ self: { base exceptions gitlib mtl transformers ]; description = "Sample backend for gitlib showing the basic structure for any backend"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -103713,8 +104228,8 @@ self: { unliftio-core ]; description = "Test library for confirming gitlib backend compliance"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -103733,8 +104248,8 @@ self: { unordered-containers ]; description = "Generic utility functions for working with Git repositories"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -103750,7 +104265,7 @@ self: { base base-compat directory filepath process template-haskell ]; description = "Compile git revision info into Haskell projects"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "gitson" = callPackage @@ -103775,8 +104290,8 @@ self: { aeson base criterion directory random transformers ]; description = "A document store library for Git + JSON"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -103792,8 +104307,8 @@ self: { aeson base bytestring exceptions lens lens-aeson mtl text wreq ]; description = "Gitter.im API client"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -103821,8 +104336,8 @@ self: { text ]; description = "CLI Giphy search tool with previews in iTerm 2"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -103835,7 +104350,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "Gilbert-Johnson-Keerthi (GJK) collision detection algorithm"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "gjk2d" = callPackage @@ -103846,7 +104361,7 @@ self: { sha256 = "1wpaiaki61a7wl56qv6ycz9hgc9f8wvqdcqxpxaqvndxmri4njsv"; libraryHaskellDepends = [ base linear ]; testHaskellDepends = [ base linear ]; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "gl" = callPackage @@ -103863,7 +104378,7 @@ self: { ]; librarySystemDepends = [ libGL ]; description = "Complete OpenGL raw bindings"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) libGL;}; "gl-capture" = callPackage @@ -103874,7 +104389,7 @@ self: { sha256 = "0pcan0fpb1mfwda69f8z8pdrdav79rdm31yvmrk98dca7al7k583"; libraryHaskellDepends = [ base bytestring OpenGL ]; description = "simple image capture from OpenGL"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "glabrous" = callPackage @@ -103894,7 +104409,7 @@ self: { base directory either hspec text unordered-containers ]; description = "A template DSL library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "glade" = callPackage @@ -103910,8 +104425,8 @@ self: { libraryHaskellDepends = [ base glib gtk ]; libraryPkgconfigDepends = [ libglade ]; description = "Binding to the glade library"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs.gnome2) libglade;}; @@ -103923,8 +104438,8 @@ self: { sha256 = "06kzakvssmldjgx0s8qm0a3cd9glmwrdnh690sv708jcvg8x45y3"; libraryHaskellDepends = [ base glade HaXml template-haskell ]; description = "Automagically declares getters for widget handles in specified interface file"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -103949,7 +104464,7 @@ self: { transformers ]; description = "A simply typed lambda calculus interpreter, written with GADTs"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "glapp" = callPackage @@ -103965,8 +104480,8 @@ self: { base containers GLFW-b lens mtl OpenGL ]; description = "An OpenGL micro framework"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -103980,7 +104495,7 @@ self: { editedCabalFile = "15zppqxc064yqc0wrmlnhaji2lg95fg598ikz03c3j4w1g5v1wdb"; libraryHaskellDepends = [ base vector ]; description = "Graphical Lasso algorithm"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "glaze" = callPackage @@ -103991,7 +104506,7 @@ self: { sha256 = "18925rqf3ah1k7xcb15zk0gcbc4slvvhr5lsz32fh96gid089cdv"; libraryHaskellDepends = [ base lens ]; description = "Framework for rendering things with metadata/headers and values"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "glazier" = callPackage @@ -104012,8 +104527,8 @@ self: { tagged transformers unliftio unliftio-core ]; description = "Extensible effects using ContT, State and variants"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -104029,8 +104544,8 @@ self: { base glazier mmorph pipes stm stm-extras transformers ]; description = "A threaded rendering framework using glaizer and pipes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -104050,8 +104565,8 @@ self: { newtype-generics stm tagged transformers unliftio unliftio-core ]; description = "ReactJS binding using Glazier.Command."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -104076,8 +104591,8 @@ self: { unordered-containers ]; description = "Examples of using glazier-react"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -104097,8 +104612,8 @@ self: { lens-misc monadlist mtl tagged transformers ]; description = "Generic widget library using glazier-react"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -104123,8 +104638,8 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Tiny cli to fetch PR info from gitlab"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -104142,25 +104657,23 @@ self: { ]; libraryPkgconfigDepends = [ glib ]; description = "Binding to the GLIB library for Gtk2Hs"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; "glicko" = callPackage ({ mkDerivation, base, containers, data-default, deepseq, hspec - , lens, parallel, QuickCheck, statistics + , parallel, statistics }: mkDerivation { pname = "glicko"; - version = "0.1.1.1"; - sha256 = "1hsa50qanq44kxnayd4g5winbqk4lqccsd05hksnxqi2ql9aj3pi"; + version = "0.3.0.2"; + sha256 = "1vx9sk2w1914c7y7cr89yvps44xpd4n2pwnk3v337d8bqhanl1jp"; libraryHaskellDepends = [ - base containers data-default deepseq lens parallel statistics + base containers data-default deepseq parallel statistics ]; - testHaskellDepends = [ base data-default hspec lens QuickCheck ]; + testHaskellDepends = [ base data-default hspec ]; description = "Glicko-2 implementation in Haskell"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + license = lib.licenses.gpl3; }) {}; "glider-nlp" = callPackage @@ -104172,8 +104685,8 @@ self: { libraryHaskellDepends = [ base containers text ]; testHaskellDepends = [ base Cabal containers hspec text ]; description = "Natural Language Processing library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -104188,7 +104701,7 @@ self: { enableSeparateDataOutput = true; executableHaskellDepends = [ base ppm split ]; description = "A simple ray tracer in an early stage of development"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "glirc" = callPackage @@ -104218,8 +104731,8 @@ self: { executableHaskellDepends = [ base lens text vty ]; testHaskellDepends = [ base HUnit ]; description = "Console IRC client"; - license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ kiwi ]; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ kiwi ]; }) {}; "gll" = callPackage @@ -104235,7 +104748,7 @@ self: { TypeCompose ]; description = "GLL parser with simple combinator interface"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "glob-posix" = callPackage @@ -104253,8 +104766,8 @@ self: { ]; benchmarkHaskellDepends = [ base criterion Glob MissingH ]; description = "Haskell bindings for POSIX glob library"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -104272,8 +104785,8 @@ self: { syntax-trees-fork-bairyn tagged template-haskell ]; description = "Library enabling unique top-level declarations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -104294,8 +104807,8 @@ self: { test-framework-hunit test-framework-quickcheck2 transformers ]; description = "Global mutable configuration"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -104307,7 +104820,7 @@ self: { sha256 = "0b2sz9ag6wcr0amgrx08l7924brfansnh9rv64wg9s3nk4ni2sxp"; libraryHaskellDepends = [ base ]; description = "A global lock implemented without unsafePerformIO"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "global-variables" = callPackage @@ -104318,8 +104831,8 @@ self: { sha256 = "0fvhh6q6z114qyi5rhwzxhrlqfhx6af97187b49lyvx2k9zkzvzp"; libraryHaskellDepends = [ base containers stm ]; description = "Namespaced, global, and top-level mutable variables without unsafePerformIO"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -104344,7 +104857,7 @@ self: { doHaddock = false; description = "ray tracer"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -104360,7 +104873,7 @@ self: { base bmp bytestring containers ghc-prim gloss-rendering GLUT OpenGL ]; description = "Painless 2D vector graphics, animations and simulations"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "gloss-accelerate" = callPackage @@ -104375,7 +104888,7 @@ self: { accelerate base gloss gloss-rendering linear-accelerate ]; description = "Extras to interface Gloss and Accelerate"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "gloss-algorithms" = callPackage @@ -104386,7 +104899,7 @@ self: { sha256 = "0wx546hm1afgq0al5bk1g2qfgg9r520whm6igz18lkc9fsksjfgd"; libraryHaskellDepends = [ base containers ghc-prim gloss ]; description = "Data structures and algorithms for working with 2D graphics"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "gloss-banana" = callPackage @@ -104399,8 +104912,8 @@ self: { editedCabalFile = "0nia67zywmxyvcnlk0a906dijh9h7m6w48330n9gs2mjkhkyqb13"; libraryHaskellDepends = [ base gloss reactive-banana ]; description = "An Interface for gloss in terms of a reactive-banana Behavior"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -104412,8 +104925,8 @@ self: { sha256 = "17gwy13z4lymm9dpj26q4ihcl198gqn9kpcjdw8lcgfcg4gxszsm"; libraryHaskellDepends = [ base bytestring gloss repa repa-devil ]; description = "Display images in Gloss using libdevil for decoding"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -104433,8 +104946,8 @@ self: { gloss-raster random repa repa-algorithms repa-io vector ]; description = "Examples using the gloss library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -104454,8 +104967,8 @@ self: { executableHaskellDepends = [ base gloss ]; testHaskellDepends = [ base directory filepath gloss JuicyPixels ]; description = "Export Gloss pictures to png, bmp, tga, tiff, gif and juicy-pixels-image"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -104467,8 +104980,8 @@ self: { sha256 = "01k9600f9lv65n9bi2v40gzcl14gg9cm27fxz8yk4kx1hk5hv980"; libraryHaskellDepends = [ base gloss gloss-juicy ]; description = "Gloss wrapper that simplifies writing games"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -104490,7 +105003,7 @@ self: { base bmp bytestring gloss JuicyPixels vector ]; description = "Load any image supported by Juicy.Pixels in your gloss application"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "gloss-raster" = callPackage @@ -104505,7 +105018,7 @@ self: { base containers ghc-prim gloss gloss-rendering repa ]; description = "Parallel rendering of raster images"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "gloss-raster-accelerate" = callPackage @@ -104520,8 +105033,8 @@ self: { accelerate base colour-accelerate gloss gloss-accelerate ]; description = "Parallel rendering of raster images using Accelerate"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "gloss-rendering" = callPackage @@ -104536,7 +105049,7 @@ self: { base bmp bytestring containers GLUT OpenGL ]; description = "Gloss picture data types and rendering functions"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "gloss-sodium" = callPackage @@ -104547,8 +105060,8 @@ self: { sha256 = "0ygjqzb1pn092j0d0gcwhxdv940rdlvpaj1gxa347mdgvp4jb9za"; libraryHaskellDepends = [ base gloss sodium ]; description = "A Sodium interface to the Gloss drawing package"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.agpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -104567,8 +105080,8 @@ self: { testSystemDepends = [ glpk ]; testToolDepends = [ tasty-discover ]; description = "Low-level Haskell bindings to GLPK"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) glpk;}; @@ -104577,8 +105090,8 @@ self: { }: mkDerivation { pname = "glpk-hs"; - version = "0.7"; - sha256 = "0cbdlidq14hmhndlgxid4gdzyg0jlm5habp5389xl3zkbmm2hni9"; + version = "0.8"; + sha256 = "0zmf5f9klc7adcrmmf9nxrbqh97bx8l6wazsbyx6idymj6brz0qp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base containers deepseq gasp mtl ]; @@ -104587,8 +105100,8 @@ self: { array base containers deepseq gasp mtl ]; description = "Comprehensive GLPK linear programming bindings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) glpk;}; @@ -104599,16 +105112,16 @@ self: { }: mkDerivation { pname = "gltf-codec"; - version = "0.1.0.1"; - sha256 = "0qdwk4ygvhdp4x8bkw101b50wc8zfb6bb54zpxaxkmva40hcv2c2"; + version = "0.1.0.2"; + sha256 = "07zf9lzin22clixmvgvam6h995jfq2wzqz4498qv60jlcj88zzmh"; libraryHaskellDepends = [ aeson base base64-bytestring binary bytestring scientific text unordered-containers vector ]; testHaskellDepends = [ base bytestring directory filepath shower ]; description = "glTF scene loader"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -104638,8 +105151,8 @@ self: { transformers-base unordered-containers ]; description = "Make better services"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -104664,7 +105177,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Make better services and clients"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "glue-core" = callPackage @@ -104688,7 +105201,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Make better services and clients"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "glue-ekg" = callPackage @@ -104712,7 +105225,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Make better services and clients"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "glue-example" = callPackage @@ -104732,7 +105245,7 @@ self: { transformers-base unordered-containers ]; description = "Make better services and clients"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "gluturtle" = callPackage @@ -104745,7 +105258,7 @@ self: { base convertible GLUT stm yjsvg yjtools ]; description = "turtle like LOGO with glut"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "gmap" = callPackage @@ -104760,8 +105273,8 @@ self: { array AvlTree base COrdering QuickCheck random ]; description = "Composable maps and generic tries"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -104780,8 +105293,8 @@ self: { priority-queue qd reflection Vec ]; description = "Mandelbrot Set explorer using GTK"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -104794,7 +105307,7 @@ self: { libraryHaskellDepends = [ base ]; librarySystemDepends = [ gmp ]; description = "GMP integer conversions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) gmp;}; "gnome-desktop" = callPackage @@ -104810,7 +105323,7 @@ self: { ]; description = "Randomly set a picture as the GNOME desktop background"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -104827,7 +105340,7 @@ self: { libraryPkgconfigDepends = [ libgnome-keyring ]; libraryToolDepends = [ c2hs ]; description = "Bindings for libgnome-keyring"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {inherit (pkgs.gnome3) gnome-keyring; inherit (pkgs) libgnome-keyring;}; @@ -104846,7 +105359,7 @@ self: { libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the GNOME Virtual File System library"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {gnome-vfs = null; gnome-vfs_module = null;}; @@ -104874,8 +105387,8 @@ self: { conduit conduit-extra lens sbp tasty tasty-golden tasty-hunit time ]; description = "GNSS Converters"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -104898,8 +105411,8 @@ self: { testPkgconfigDepends = [ libidn ]; testToolDepends = [ c2hs ]; description = "Bindings for GNU IDN"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) libidn;}; @@ -104921,7 +105434,7 @@ self: { utility-ht ]; description = "2D and 3D plots using gnuplot"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "gnutls" = callPackage @@ -104935,7 +105448,7 @@ self: { librarySystemDepends = [ gnutls ]; libraryPkgconfigDepends = [ gnutls ]; description = "Bindings for GNU libgnutls"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {inherit (pkgs) gnutls;}; "goa" = callPackage @@ -104949,8 +105462,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base directory filepath process ]; description = "GHCi bindings to lambdabot"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -104970,8 +105483,8 @@ self: { ]; executableHaskellDepends = [ base ]; description = "Core imports for Geometric Optimization Libraries"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -104986,8 +105499,8 @@ self: { libraryHaskellDepends = [ base goal-core hmatrix vector ]; executableHaskellDepends = [ base goal-core ]; description = "Scientific computing on geometric objects"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -105007,8 +105520,8 @@ self: { ]; executableHaskellDepends = [ base goal-core goal-geometry vector ]; description = "Manifolds of probability distributions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -105032,8 +105545,8 @@ self: { vector ]; description = "Mealy based simulation tools"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -105051,7 +105564,7 @@ self: { testHaskellDepends = [ base bytestring cereal QuickCheck safe ]; description = "Time Series Compression"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "goatee" = callPackage @@ -105060,16 +105573,16 @@ self: { }: mkDerivation { pname = "goatee"; - version = "0.3.1.3"; - sha256 = "16nsgb1gf7mn35pchigrankl8q7p6cvgsxzbb3ab93jqm8kjxmyn"; + version = "0.4.0"; + sha256 = "1nbdqmln6v6r3kdj8vxv4dm903vaxh97mlg19fg8yihm00cbpipd"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers mtl parsec template-haskell ]; testHaskellDepends = [ base containers HUnit mtl parsec ]; description = "A monadic take on a 2,500-year-old board game - library"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.agpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -105079,8 +105592,8 @@ self: { }: mkDerivation { pname = "goatee-gtk"; - version = "0.3.1.3"; - sha256 = "0sp819fzgflsfj1glgdmw2qhb97rzdy6nargdmwvaxfay925p8aw"; + version = "0.4.0"; + sha256 = "1iffzqmzxxa9aplvnncdj9lc3nvdi8rbnnyl0cb7irhyj7k21k5i"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -105090,8 +105603,8 @@ self: { executableHaskellDepends = [ base gtk ]; testHaskellDepends = [ base HUnit ]; description = "A monadic take on a 2,500-year-old board game - GTK+ UI"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.agpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -105113,8 +105626,8 @@ self: { executableHaskellDepends = [ base criterion random weigh ]; testHaskellDepends = [ base hspec hspec-core ]; description = "Go-style channels"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -105137,8 +105650,8 @@ self: { libraryToolDepends = [ c2hs ]; doHaddock = false; description = "Haskell bindings for the Godot game engine API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -105150,8 +105663,8 @@ self: { sha256 = "1whl3fvwxh26nsb4l6brljsmwl891w5yxlsv69mdfvfb1rl7p64f"; libraryHaskellDepends = [ base ghc-prim ]; description = "The Gofer 2.30 standard prelude"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -105174,7 +105687,7 @@ self: { ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "Extensible interface to Web APIs"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "goggles-gcs" = callPackage @@ -105190,7 +105703,7 @@ self: { text unix-time ]; description = "`goggles` interface to Google Cloud Storage"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "gogol" = callPackage @@ -105214,7 +105727,7 @@ self: { ]; description = "Comprehensive Google Services SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-abusiveexperiencereport" = callPackage @@ -105226,7 +105739,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Abusive Experience Report SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-acceleratedmobilepageurl" = callPackage @@ -105238,7 +105751,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Accelerated Mobile Pages (AMP) URL SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-accessapproval" = callPackage @@ -105250,7 +105763,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Access Approval SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-accesscontextmanager" = callPackage @@ -105262,7 +105775,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Access Context Manager SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-adexchange-buyer" = callPackage @@ -105274,7 +105787,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Ad Exchange Buyer SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-adexchange-seller" = callPackage @@ -105286,7 +105799,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Ad Exchange Seller SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-adexchangebuyer2" = callPackage @@ -105298,7 +105811,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Ad Exchange Buyer API II SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-adexperiencereport" = callPackage @@ -105310,7 +105823,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Ad Experience Report SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-admin-datatransfer" = callPackage @@ -105322,7 +105835,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Admin Data Transfer SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-admin-directory" = callPackage @@ -105334,7 +105847,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Admin Directory SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-admin-emailmigration" = callPackage @@ -105346,7 +105859,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Email Migration API v2 SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-admin-reports" = callPackage @@ -105358,7 +105871,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Admin Reports SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-adsense" = callPackage @@ -105370,7 +105883,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google AdSense Management SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-adsense-host" = callPackage @@ -105382,7 +105895,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google AdSense Host SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-affiliates" = callPackage @@ -105394,7 +105907,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Affiliate Network SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-alertcenter" = callPackage @@ -105406,7 +105919,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google G Suite Alert Center SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-analytics" = callPackage @@ -105418,7 +105931,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Analytics SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-analyticsreporting" = callPackage @@ -105430,7 +105943,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Analytics Reporting SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-android-enterprise" = callPackage @@ -105442,7 +105955,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Play EMM SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-android-publisher" = callPackage @@ -105454,7 +105967,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Play Developer SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-androiddeviceprovisioning" = callPackage @@ -105466,7 +105979,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Android Device Provisioning Partner SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-androidmanagement" = callPackage @@ -105478,7 +105991,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Android Management SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-appengine" = callPackage @@ -105490,7 +106003,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google App Engine Admin SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-apps-activity" = callPackage @@ -105502,7 +106015,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Drive Activity SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-apps-calendar" = callPackage @@ -105514,7 +106027,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Calendar SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-apps-licensing" = callPackage @@ -105526,7 +106039,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Enterprise License Manager SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-apps-reseller" = callPackage @@ -105538,7 +106051,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Enterprise Apps Reseller SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-apps-tasks" = callPackage @@ -105550,7 +106063,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Tasks SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-appstate" = callPackage @@ -105562,7 +106075,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google App State SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-autoscaler" = callPackage @@ -105574,7 +106087,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Compute Engine Autoscaler SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-bigquery" = callPackage @@ -105586,7 +106099,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google BigQuery SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-bigquerydatatransfer" = callPackage @@ -105598,7 +106111,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google BigQuery Data Transfer SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-bigtableadmin" = callPackage @@ -105610,7 +106123,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Bigtable Admin SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-billing" = callPackage @@ -105622,7 +106135,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Billing SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-binaryauthorization" = callPackage @@ -105634,7 +106147,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Binary Authorization SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-blogger" = callPackage @@ -105646,7 +106159,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Blogger SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-books" = callPackage @@ -105658,7 +106171,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Books SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-chat" = callPackage @@ -105670,7 +106183,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Hangouts Chat SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-civicinfo" = callPackage @@ -105682,7 +106195,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Civic Information SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-classroom" = callPackage @@ -105694,7 +106207,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Classroom SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-cloudasset" = callPackage @@ -105706,7 +106219,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Asset SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-clouderrorreporting" = callPackage @@ -105718,7 +106231,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Stackdriver Error Reporting SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-cloudfunctions" = callPackage @@ -105730,7 +106243,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Functions SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-cloudidentity" = callPackage @@ -105742,7 +106255,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Identity SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-cloudiot" = callPackage @@ -105754,7 +106267,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud IoT SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-cloudkms" = callPackage @@ -105766,7 +106279,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Key Management Service (KMS) SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-cloudmonitoring" = callPackage @@ -105778,7 +106291,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Monitoring SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-cloudprivatecatalog" = callPackage @@ -105790,7 +106303,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Private Catalog SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-cloudprivatecatalogproducer" = callPackage @@ -105802,7 +106315,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Private Catalog Producer SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-cloudprofiler" = callPackage @@ -105814,7 +106327,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Stackdriver Profiler SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-cloudscheduler" = callPackage @@ -105826,7 +106339,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Scheduler SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-cloudsearch" = callPackage @@ -105838,7 +106351,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Search SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-cloudshell" = callPackage @@ -105850,7 +106363,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Shell SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-cloudtasks" = callPackage @@ -105862,7 +106375,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Tasks SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-cloudtrace" = callPackage @@ -105874,7 +106387,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Stackdriver Trace SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-commentanalyzer" = callPackage @@ -105886,7 +106399,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Perspective Comment Analyzer SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-composer" = callPackage @@ -105898,7 +106411,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Composer SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-compute" = callPackage @@ -105910,7 +106423,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Compute Engine SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-consumersurveys" = callPackage @@ -105922,7 +106435,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Consumer Surveys SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-container" = callPackage @@ -105934,7 +106447,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Kubernetes Engine SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-containeranalysis" = callPackage @@ -105946,7 +106459,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Container Analysis SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-containerbuilder" = callPackage @@ -105958,7 +106471,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Build SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-core" = callPackage @@ -105981,7 +106494,7 @@ self: { testHaskellDepends = [ base tasty ]; description = "Core data types and functionality for Gogol libraries"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-customsearch" = callPackage @@ -105993,7 +106506,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google CustomSearch SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-dataflow" = callPackage @@ -106005,7 +106518,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Dataflow SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-datafusion" = callPackage @@ -106017,7 +106530,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Data Fusion SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-dataproc" = callPackage @@ -106029,7 +106542,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Dataproc SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-datastore" = callPackage @@ -106041,7 +106554,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Datastore SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-debugger" = callPackage @@ -106053,7 +106566,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Stackdriver Debugger SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-deploymentmanager" = callPackage @@ -106065,7 +106578,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Deployment Manager SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-dfareporting" = callPackage @@ -106077,7 +106590,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google DCM/DFA Reporting And Trafficking SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-dialogflow" = callPackage @@ -106089,7 +106602,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Dialogflow SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-digitalassetlinks" = callPackage @@ -106101,7 +106614,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Digital Asset Links SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-discovery" = callPackage @@ -106113,7 +106626,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google API Discovery Service SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-dlp" = callPackage @@ -106125,7 +106638,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Data Loss Prevention (DLP) SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-dns" = callPackage @@ -106137,7 +106650,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud DNS SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-docs" = callPackage @@ -106149,7 +106662,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Docs SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-doubleclick-bids" = callPackage @@ -106161,7 +106674,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google DoubleClick Bid Manager SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-doubleclick-search" = callPackage @@ -106173,7 +106686,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google DoubleClick Search SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-drive" = callPackage @@ -106185,7 +106698,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Drive SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-driveactivity" = callPackage @@ -106197,7 +106710,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Drive Activity SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-factchecktools" = callPackage @@ -106209,7 +106722,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Fact Check Tools SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-file" = callPackage @@ -106221,7 +106734,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Filestore SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-firebase-dynamiclinks" = callPackage @@ -106233,7 +106746,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Firebase Dynamic Links SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-firebase-rules" = callPackage @@ -106245,7 +106758,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Firebase Rules SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-firebasehosting" = callPackage @@ -106257,7 +106770,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Firebase Hosting SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-firebaseremoteconfig" = callPackage @@ -106269,7 +106782,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Firebase Remote Config SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-firestore" = callPackage @@ -106281,7 +106794,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Firestore SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-fitness" = callPackage @@ -106293,7 +106806,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Fitness SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-fonts" = callPackage @@ -106305,7 +106818,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Fonts Developer SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-freebasesearch" = callPackage @@ -106317,7 +106830,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Freebase Search SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-fusiontables" = callPackage @@ -106329,7 +106842,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Fusion Tables SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-games" = callPackage @@ -106341,7 +106854,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Play Game Services SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-games-configuration" = callPackage @@ -106353,7 +106866,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Play Game Services Publishing SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-games-management" = callPackage @@ -106365,7 +106878,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Play Game Services Management SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-genomics" = callPackage @@ -106377,7 +106890,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Genomics SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-gmail" = callPackage @@ -106389,7 +106902,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Gmail SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-groups-migration" = callPackage @@ -106401,7 +106914,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Groups Migration SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-groups-settings" = callPackage @@ -106413,7 +106926,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Groups Settings SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-healthcare" = callPackage @@ -106425,7 +106938,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Healthcare SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-iam" = callPackage @@ -106437,7 +106950,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Identity and Access Management (IAM) SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-iamcredentials" = callPackage @@ -106449,7 +106962,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google IAM Service Account Credentials SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-iap" = callPackage @@ -106461,7 +106974,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Identity-Aware Proxy SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-identity-toolkit" = callPackage @@ -106473,7 +106986,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Identity Toolkit SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-indexing" = callPackage @@ -106485,7 +106998,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Indexing SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-jobs" = callPackage @@ -106497,7 +107010,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Talent Solution SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-kgsearch" = callPackage @@ -106509,7 +107022,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Knowledge Graph Search SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-language" = callPackage @@ -106521,7 +107034,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Natural Language SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-latencytest" = callPackage @@ -106533,7 +107046,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Network Performance Monitoring SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-libraryagent" = callPackage @@ -106545,7 +107058,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Library Agent SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-logging" = callPackage @@ -106557,7 +107070,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Stackdriver Logging SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-manufacturers" = callPackage @@ -106569,7 +107082,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Manufacturer Center SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-maps-coordinate" = callPackage @@ -106581,7 +107094,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Maps Coordinate SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-maps-engine" = callPackage @@ -106593,7 +107106,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Maps Engine SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-mirror" = callPackage @@ -106605,7 +107118,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Mirror SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-ml" = callPackage @@ -106617,7 +107130,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Machine Learning Engine SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-monitoring" = callPackage @@ -106629,7 +107142,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Stackdriver Monitoring SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-oauth2" = callPackage @@ -106641,7 +107154,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google OAuth2 SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-oslogin" = callPackage @@ -106653,7 +107166,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud OS Login SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-pagespeed" = callPackage @@ -106665,7 +107178,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google PageSpeed Insights SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-partners" = callPackage @@ -106677,7 +107190,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Partners SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-people" = callPackage @@ -106689,7 +107202,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google People SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-photoslibrary" = callPackage @@ -106701,7 +107214,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Photos Library SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-play-moviespartner" = callPackage @@ -106713,7 +107226,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Play Movies Partner SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-playcustomapp" = callPackage @@ -106725,7 +107238,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Play Custom App Publishing SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-plus" = callPackage @@ -106737,7 +107250,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google + SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-plus-domains" = callPackage @@ -106749,7 +107262,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google + Domains SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-poly" = callPackage @@ -106761,7 +107274,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Poly SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-prediction" = callPackage @@ -106773,7 +107286,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Prediction SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-proximitybeacon" = callPackage @@ -106785,7 +107298,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Proximity Beacon SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-pubsub" = callPackage @@ -106797,7 +107310,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Pub/Sub SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-qpxexpress" = callPackage @@ -106809,7 +107322,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google QPX Express SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-redis" = callPackage @@ -106821,7 +107334,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Memorystore for Redis SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-remotebuildexecution" = callPackage @@ -106833,7 +107346,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Remote Build Execution SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-replicapool" = callPackage @@ -106845,7 +107358,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Replica Pool SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-replicapool-updater" = callPackage @@ -106857,7 +107370,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Compute Engine Instance Group Updater SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-resourcemanager" = callPackage @@ -106869,7 +107382,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Resource Manager SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-resourceviews" = callPackage @@ -106881,7 +107394,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Compute Engine Instance Groups SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-run" = callPackage @@ -106893,7 +107406,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Run SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-runtimeconfig" = callPackage @@ -106905,7 +107418,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Runtime Configuration SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-safebrowsing" = callPackage @@ -106917,7 +107430,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Safe Browsing SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-script" = callPackage @@ -106929,7 +107442,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Apps Script SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-searchconsole" = callPackage @@ -106941,7 +107454,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Search Console URL Testing Tools SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-securitycenter" = callPackage @@ -106953,7 +107466,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Security Command Center SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-servicebroker" = callPackage @@ -106965,7 +107478,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Service Broker SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-serviceconsumermanagement" = callPackage @@ -106977,7 +107490,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Service Consumer Management SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-servicecontrol" = callPackage @@ -106989,7 +107502,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Service Control SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-servicemanagement" = callPackage @@ -107001,7 +107514,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Service Management SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-servicenetworking" = callPackage @@ -107013,7 +107526,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Service Networking SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-serviceusage" = callPackage @@ -107025,7 +107538,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Service Usage SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-serviceuser" = callPackage @@ -107037,7 +107550,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Service User SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-sheets" = callPackage @@ -107049,7 +107562,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Sheets SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-shopping-content" = callPackage @@ -107061,7 +107574,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Content API for Shopping SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-siteverification" = callPackage @@ -107073,7 +107586,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Site Verification SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-slides" = callPackage @@ -107085,7 +107598,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Slides SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-sourcerepo" = callPackage @@ -107097,7 +107610,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Source Repositories SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-spanner" = callPackage @@ -107109,7 +107622,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Spanner SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-spectrum" = callPackage @@ -107121,7 +107634,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Spectrum Database SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-speech" = callPackage @@ -107133,7 +107646,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Speech-to-Text SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-sqladmin" = callPackage @@ -107145,7 +107658,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud SQL Admin SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-storage" = callPackage @@ -107157,7 +107670,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Storage JSON SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-storage-transfer" = callPackage @@ -107169,7 +107682,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Storage Transfer SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-streetviewpublish" = callPackage @@ -107181,7 +107694,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Street View Publish SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-surveys" = callPackage @@ -107193,7 +107706,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Surveys SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-tagmanager" = callPackage @@ -107205,7 +107718,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Tag Manager SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-taskqueue" = callPackage @@ -107217,7 +107730,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google TaskQueue SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-testing" = callPackage @@ -107229,7 +107742,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Testing SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-texttospeech" = callPackage @@ -107241,7 +107754,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Text-to-Speech SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-toolresults" = callPackage @@ -107253,7 +107766,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Tool Results SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-tpu" = callPackage @@ -107265,7 +107778,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud TPU SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-tracing" = callPackage @@ -107277,7 +107790,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Tracing SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-translate" = callPackage @@ -107289,7 +107802,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Translation SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-urlshortener" = callPackage @@ -107301,7 +107814,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google URL Shortener SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-useraccounts" = callPackage @@ -107313,7 +107826,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud User Accounts SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-vault" = callPackage @@ -107325,7 +107838,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google G Suite Vault SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-videointelligence" = callPackage @@ -107337,7 +107850,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Video Intelligence SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-vision" = callPackage @@ -107349,7 +107862,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Vision SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-webmaster-tools" = callPackage @@ -107361,7 +107874,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Search Console SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-websecurityscanner" = callPackage @@ -107373,7 +107886,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google Web Security Scanner SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-youtube" = callPackage @@ -107385,7 +107898,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google YouTube Data SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-youtube-analytics" = callPackage @@ -107397,7 +107910,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google YouTube Analytics SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gogol-youtube-reporting" = callPackage @@ -107409,7 +107922,7 @@ self: { libraryHaskellDepends = [ base gogol-core ]; description = "Google YouTube Reporting SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "goldplate" = callPackage @@ -107429,8 +107942,8 @@ self: { unordered-containers ]; description = "A lightweight golden test runner"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -107442,8 +107955,8 @@ self: { sha256 = "0njlbvlqzm9282rwk21klr3jq6m46i2qz46xbsdhw9jg2dawq97j"; libraryHaskellDepends = [ base renderable transformers varying ]; description = "Graphical user interfaces that are renderable, change over time and eventually produce a value"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -107463,8 +107976,8 @@ self: { random scientific stm text time unordered-containers ]; description = "Client for the Google Cloud APIs"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -107476,7 +107989,7 @@ self: { sha256 = "12ib4y8cjg0dvvizy8yxgjaqvyawdy7vxmh1ab12b4yg40wwsg6g"; libraryHaskellDepends = [ aeson base bytestring HTTP lens mtl ]; description = "Simple interface to the google.com/dictionary API"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "google-drive" = callPackage @@ -107499,8 +108012,8 @@ self: { hspec-expectations-lifted load-env text time ]; description = "Google Drive API access"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -107519,8 +108032,8 @@ self: { syb text time ]; description = "Google HTML5 Slide generator"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -107535,7 +108048,7 @@ self: { libraryHaskellDepends = [ aeson base bytestring conduit conduit-extra http-conduit text ]; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "google-mail-filters" = callPackage @@ -107551,8 +108064,8 @@ self: { ]; testHaskellDepends = [ base google-search text time xml-conduit ]; description = "Write GMail filters and output to importable XML"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -107569,8 +108082,8 @@ self: { text ]; description = "Bindings to the Google Geocoding API (formerly Maps Geocoding API)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -107591,8 +108104,8 @@ self: { base bytestring hoauth2 hspec http-conduit load-env text ]; description = "Google OAuth2 token negotiation"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -107612,8 +108125,8 @@ self: { testHaskellDepends = [ base tasty tasty-hspec ]; benchmarkHaskellDepends = [ base criterion ]; description = "Opininated use of Google Authentication for ease"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -107631,7 +108144,7 @@ self: { ]; testHaskellDepends = [ base hspec ]; description = "Get Google OAuth2 token for CLI tools"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "google-oauth2-jwt" = callPackage @@ -107646,8 +108159,8 @@ self: { base base64-bytestring bytestring HsOpenSSL RSA text unix-time ]; description = "Get a signed JWT for Google Service Accounts"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -107659,8 +108172,8 @@ self: { sha256 = "1jn22iykcl6694lsshj7xxnqx33d6spqlr2q93v6ak3yaygxd7hr"; libraryHaskellDepends = [ base free nats text time ]; description = "EDSL for Google and GMail search expressions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -107684,8 +108197,8 @@ self: { wai-extra warp ]; description = "Google APIs for server to server applications"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -107705,8 +108218,8 @@ self: { servant servant-client servant-JuicyPixels text utf8-string ]; description = "Bindings to the Google Maps Static API (formerly Static Maps API)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -107723,8 +108236,8 @@ self: { servant-client text transformers ]; description = "Google Translate API bindings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -107742,8 +108255,8 @@ self: { http-enumerator http-types mtl text time timerep transformers url ]; description = "Haskell implementation of the Google+ API v1"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -107762,8 +108275,8 @@ self: { test-framework-hunit test-framework-quickcheck2 text ]; description = "Google Polyline Encoder/Decoder"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -107784,7 +108297,7 @@ self: { mime-types network optparse-applicative text wai warp ]; description = "proxy gopher over http"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "gopherbot" = callPackage @@ -107802,7 +108315,7 @@ self: { ]; description = "Spidering robot to download files from Gopherspace"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -107831,8 +108344,8 @@ self: { unordered-containers vector wreq ]; description = "GoPro Plus Client API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -107851,8 +108364,8 @@ self: { unordered-containers ]; description = "Core of FRP game engine called Gore&Ash"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -107870,8 +108383,8 @@ self: { resourcet transformers transformers-base unordered-containers ]; description = "Gore&Ash engine extension that implements actor style of programming"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -107894,8 +108407,8 @@ self: { test-framework test-framework-hunit transformers ]; description = "Core module for Gore&Ash engine that embeds async IO actions into game loop"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -107921,8 +108434,8 @@ self: { text-show time transformers unordered-containers vector ]; description = "Demonstration game for Gore&Ash game engine"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -107939,8 +108452,8 @@ self: { transformers unordered-containers ]; description = "Core module for Gore&Ash engine for GLFW input events"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -107960,8 +108473,8 @@ self: { lambdacube-compiler lambdacube-gl mtl text unordered-containers ]; description = "Core module for Gore&Ash engine that do something"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -107980,8 +108493,8 @@ self: { unordered-containers ]; description = "Core module for gore-and-ash with logging utilities"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -108003,8 +108516,8 @@ self: { typesafe-endian unordered-containers ]; description = "Core module for Gore&Ash engine with low level network API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -108023,8 +108536,8 @@ self: { unordered-containers ]; description = "Gore&Ash core module for integration with SDL library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -108044,8 +108557,8 @@ self: { hashable mtl text unordered-containers ]; description = "Gore&Ash module for high level network synchronization"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -108065,7 +108578,7 @@ self: { scientific text unix unordered-containers vector ]; description = "A Haskell Vault KVv2 secret engine client"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "gotta-go-fast" = callPackage @@ -108083,7 +108596,7 @@ self: { word-wrap ]; description = "A command line utility for practicing typing"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "gpah" = callPackage @@ -108103,8 +108616,8 @@ self: { uniplate uu-parsinglib zlib ]; description = "Generic Programming Use in Hackage"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -108116,7 +108629,7 @@ self: { sha256 = "1fm0k6n6fb5a3wvmb2l6k4zq3sdfxv16cb2y2zmjgxgj5n3gy9s8"; libraryHaskellDepends = [ base ]; description = "Generalized Pitch Class Sets for Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "gpio" = callPackage @@ -108138,7 +108651,7 @@ self: { base directory exceptions monad-control optparse-generic safe ]; description = "Haskell GPIO interface, designed specifically for the RaspberryPi"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "gpolyline" = callPackage @@ -108149,7 +108662,7 @@ self: { sha256 = "01bsl7s8r33jgvk9lyca02awj43acii8spa6sskz19ivhm2adcr8"; libraryHaskellDepends = [ base split ]; description = "Pure module for encoding/decoding Google Polyline"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "gps" = callPackage @@ -108169,8 +108682,8 @@ self: { test-framework-quickcheck2 time vector ]; description = "For manipulating GPS coordinates and trails"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -108191,8 +108704,8 @@ self: { tar time xsd ]; description = "GPS to HTML Summary Report"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -108209,8 +108722,8 @@ self: { void xml-conduit xml-types ]; description = "Read GPX files using conduits"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -108224,8 +108737,8 @@ self: { testHaskellDepends = [ base hedgehog ]; benchmarkHaskellDepends = [ base criterion ]; description = "Applicative non-linear consumption"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -108238,8 +108751,8 @@ self: { libraryHaskellDepends = [ base containers grab text ]; testHaskellDepends = [ base containers hedgehog text ]; description = "Applicative parsers for form parameter lists"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -108256,8 +108769,8 @@ self: { base directory filepath hspec network process stm unix ]; description = "Library to write graceful shutdown / upgrade service"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -108276,8 +108789,8 @@ self: { aeson aeson-pretty base bytestring Diff tasty tasty-hunit ]; description = "API for creating grafana dashboards represented as json"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -108296,8 +108809,8 @@ self: { aeson base containers hspec mtl test-fixture text ]; description = "Monadic correlated log events"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -108321,8 +108834,8 @@ self: { ]; testToolDepends = [ markdown-unlit ]; description = "A Haskell client for Grakn"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -108341,7 +108854,7 @@ self: { ]; description = "A parsing library of context-free grammar combinators"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -108377,8 +108890,8 @@ self: { rank2classes text ]; description = "parsers that combine into grammars"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -108395,8 +108908,8 @@ self: { grapefruit-ui ]; description = "Examples using the Grapefruit library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -108414,8 +108927,8 @@ self: { arrows base containers fingertree semigroups TypeCompose ]; description = "Functional Reactive Programming core"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -108427,8 +108940,8 @@ self: { sha256 = "0j1jy4rq11gk7j08cz7skdqlbnjrciiv0vi491lvmbbwmvf15cd6"; libraryHaskellDepends = [ arrows base grapefruit-frp ]; description = "A record system for Functional Reactive Programming"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -108447,8 +108960,8 @@ self: { grapefruit-records ]; description = "Declarative user interface programming"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -108468,8 +108981,8 @@ self: { grapefruit-records grapefruit-ui gtk3 transformers ]; description = "GTK+-based backend for declarative user interface programming"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -108484,7 +108997,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; description = "Class of graphs"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "graph-core" = callPackage @@ -108504,8 +109017,8 @@ self: { unordered-containers vector ]; description = "Fast, memory efficient and persistent graph implementation"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -108530,7 +109043,7 @@ self: { mwc-random QuickCheck ]; description = "Functions for generating structured or random FGL graphs"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "graph-matchings" = callPackage @@ -108541,8 +109054,8 @@ self: { sha256 = "0dzkv13w06hkxg2vkbblpskvsq02c2ay06rw2j4vyjpw13hms5bv"; libraryHaskellDepends = [ base containers fgl ]; description = "An implementation of algorithms for matchings in graphs"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -108556,8 +109069,8 @@ self: { base base-unicode-symbols containers mtl ]; description = "Monadic graph rewriting of hypergraphs with ports and multiedges"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -108577,8 +109090,8 @@ self: { graph-rewriting-layout OpenGL parsec ]; description = "Interactive graph rewriting system implementing various well-known combinators"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -108595,8 +109108,8 @@ self: { graph-rewriting-layout OpenGL ]; description = "OpenGL interface for interactive port graph rewriting"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -108618,8 +109131,8 @@ self: { OpenGL parsec ]; description = "Lambdascope, an optimal evaluator of the lambda calculus, as an interactive graph-rewriting system"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -108635,8 +109148,8 @@ self: { AC-Vector base base-unicode-symbols graph-rewriting ]; description = "Force-directed node placement intended for incremental graph drawing"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -108656,8 +109169,8 @@ self: { graph-rewriting-layout OpenGL parsec ]; description = "Two evalutors of the SKI combinator calculus as interactive graph rewrite systems"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -108673,8 +109186,8 @@ self: { base base-unicode-symbols containers graph-rewriting ]; description = "Evaluation strategies for port-graph rewriting systems"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -108696,8 +109209,8 @@ self: { uu-parsinglib ]; description = "Evaluate first-order applicative term rewrite systems interactively using graph reduction"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -108718,8 +109231,8 @@ self: { graph-rewriting-layout IndentParser OpenGL parsec ]; description = "Evaluator of the lambda-calculus in an interactive graph rewriting system with explicit sharing"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -108731,8 +109244,8 @@ self: { sha256 = "1a9qq5gpyxg6j6ja3kjldnf11wywjvvxpwvgiahlsrmwfw2c8d74"; libraryHaskellDepends = [ array base bytestring containers ]; description = "Serialization of data structures with references"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -108748,8 +109261,8 @@ self: { base containers fgl mtl parsec syb template-haskell ]; description = "A simple wrapper & quasi quoter for fgl"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -108765,8 +109278,8 @@ self: { base containers data-lens data-lens-template mtl ]; description = "Graph walk abstraction"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -108783,7 +109296,7 @@ self: { array base containers deepseq hspec QuickCheck ]; description = "A wrapper around the standard Data.Graph with a less awkward interface"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "graphbuilder" = callPackage @@ -108800,8 +109313,8 @@ self: { test-framework-quickcheck2 ]; description = "A declarative, monadic graph construction language for small graphs"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -108818,8 +109331,8 @@ self: { mtl transformers ]; description = "A minimal Graph Theory library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -108837,8 +109350,8 @@ self: { base bitmap bitmap-opengl FTGL OpenGL stb-image ]; description = "A functional interface to 2D drawing in OpenGL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -108854,8 +109367,8 @@ self: { base bitmap-opengl containers hxt OpenGL stb-image transformers ]; description = "Load 3D geometry in the COLLADA format"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -108867,8 +109380,8 @@ self: { sha256 = "0bcqj0n8qqaqfrn21qgkf8si5qgxl3qlsc8djy0rqhnfi2grb8nh"; libraryHaskellDepends = [ base haskell98 OpenGL QuickCheck ]; description = "Classes for renderable objects"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -108887,8 +109400,8 @@ self: { ]; executableHaskellDepends = [ base CV wx wxcore ]; description = "Tools for creating graphical UIs, based on wxHaskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -108909,7 +109422,7 @@ self: { testHaskellDepends = [ base hspec QuickCheck ]; benchmarkHaskellDepends = [ base criterion deepseq ]; description = "Graphs and networks library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "graphmod" = callPackage @@ -108927,7 +109440,7 @@ self: { pretty ]; description = "Present the module dependencies of a program as a \"dot\" graph"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "graphmod-plugin" = callPackage @@ -108945,8 +109458,8 @@ self: { ]; executableHaskellDepends = [ base ]; description = "A reimplementation of graphmod as a source plugin"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -108972,7 +109485,7 @@ self: { ]; description = "Haskell GraphQL implementation"; license = "MPL-2.0 AND BSD-3-Clause"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -109002,8 +109515,8 @@ self: { attoparsec base criterion exceptions protolude transformers ]; description = "GraphQL API"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -109034,8 +109547,8 @@ self: { tasty tasty-hunit template-haskell text transformers unliftio-core ]; description = "A client for Haskell programs to query a GraphQL API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -109051,8 +109564,8 @@ self: { aeson aeson-helper base graphql text unordered-containers vector ]; description = "GraphQL Utils"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -109064,8 +109577,8 @@ self: { sha256 = "0sm0j1d2h6b2d3ksbbdyvzyvwl306mb64yikwkdwp2izfy387lwg"; libraryHaskellDepends = [ base containers json text ]; description = "GraphQL interface middleware for SQL databases"; - license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -109083,7 +109596,7 @@ self: { array base containers transformers transformers-compat void ]; description = "A simple monadic graph library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "graphted" = callPackage @@ -109094,8 +109607,8 @@ self: { sha256 = "0y2nqsygqcxb0w7x1irikqqx10m209nihqmxqy1s18snrlvh06c9"; libraryHaskellDepends = [ base indexed ]; description = "Graph indexed monads"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -109113,8 +109626,8 @@ self: { base containers dotgen haskell-src-exts haskell98 uniplate ]; description = "A simple tool to illustrate dependencies between Haskell types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -109142,8 +109655,8 @@ self: { ]; testToolDepends = [ markdown-unlit ]; description = "A declarative library for describing dependencies between data"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -109171,8 +109684,8 @@ self: { ]; testToolDepends = [ markdown-unlit ]; description = "A declarative library for describing dependencies between data"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -109199,7 +109712,7 @@ self: { testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ base criterion deepseq text ]; description = "Bindings to Graphviz for graph visualisation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) graphviz;}; "graql" = callPackage @@ -109216,8 +109729,8 @@ self: { testHaskellDepends = [ base hspec markdown-unlit text ]; testToolDepends = [ markdown-unlit ]; description = "Execute Graql queries on a Grakn graph"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -109242,8 +109755,8 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "GRASP implementation for the AMMM project"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -109260,7 +109773,7 @@ self: { ]; testHaskellDepends = [ base hspec text ]; description = "Generate Gravatar image URLs"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "gray-code" = callPackage @@ -109272,8 +109785,8 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck ]; description = "Gray code encoder/decoder"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -109290,7 +109803,7 @@ self: { base QuickCheck test-framework test-framework-quickcheck2 ]; description = "Gray encoding schemes"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "graylog" = callPackage @@ -109312,7 +109825,7 @@ self: { ]; description = "Support for graylog output"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "greencard" = callPackage @@ -109326,8 +109839,8 @@ self: { libraryHaskellDepends = [ base ]; executableHaskellDepends = [ array base containers pretty ]; description = "GreenCard, a foreign function pre-processor for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -109340,8 +109853,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ array base containers greencard pretty ]; description = "A foreign function interface pre-processor library for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -109362,7 +109875,7 @@ self: { ]; executablePkgconfigDepends = [ libXau xcb xdmcp xlibsWrapper ]; description = "Simple clipboard manager to be integrated with rofi"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs.xorg) libXau; xcb = null; xdmcp = null; inherit (pkgs) xlibsWrapper;}; @@ -109378,8 +109891,8 @@ self: { base binary bytestring clock hostname network stm system-uuid time ]; description = "A scalable distributed logger with a high-precision global time axis"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -109403,8 +109916,8 @@ self: { ]; testHaskellDepends = [ aeson-qq base hspec lens lens-aeson mtl ]; description = "Graph database client for TinkerPop3 Gremlin Server"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -109428,8 +109941,8 @@ self: { ]; benchmarkHaskellDepends = [ base bytestring criterion hmatrix ]; description = "Practical Deep Learning in Haskell"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -109447,7 +109960,7 @@ self: { ]; description = "Generalised replicate functions"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "greskell" = callPackage @@ -109468,7 +109981,7 @@ self: { hspec text unordered-containers ]; description = "Haskell binding for Gremlin graph query language"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "greskell-core" = callPackage @@ -109489,7 +110002,7 @@ self: { text unordered-containers vector ]; description = "Haskell binding for Gremlin graph query language - core data types and tools"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "greskell-websocket" = callPackage @@ -109511,7 +110024,7 @@ self: { vector ]; description = "Haskell client for Gremlin Server using WebSocket serializer"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "grid" = callPackage @@ -109527,7 +110040,7 @@ self: { base QuickCheck test-framework test-framework-quickcheck2 ]; description = "Tools for working with regular grids (graphs, lattices)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "grid-proto" = callPackage @@ -109549,8 +110062,8 @@ self: { sdl2-mixer sdl2-ttf StateVar text vector ]; description = "Grid-based prototyping framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -109563,8 +110076,8 @@ self: { libraryHaskellDepends = [ base earclipper gjk gridbox ]; testHaskellDepends = [ base earclipper gjk gridbox hspec ]; description = "Collision detection for GridBox"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -109577,7 +110090,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "A grid box model"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "gridfs" = callPackage @@ -109595,7 +110108,7 @@ self: { ]; description = "GridFS (MongoDB file storage) implementation"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gridland" = callPackage @@ -109613,8 +110126,8 @@ self: { SDL-image SDL-mixer tuple vector ]; description = "Grid-based multimedia engine"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -109637,7 +110150,7 @@ self: { adjunctions base comonad deepseq distributive gauge singletons vector ]; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "grm" = callPackage @@ -109658,8 +110171,8 @@ self: { ]; executableToolDepends = [ happy ]; description = "grm grammar converter"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -109674,7 +110187,7 @@ self: { libraryHaskellDepends = [ base haskell-src-exts ]; executableHaskellDepends = [ base ]; description = "Pretty printing for well-behaved Show instances"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "groot" = callPackage @@ -109723,8 +110236,8 @@ self: { vector yaml ]; description = "Command line utility to manage AWS ECS resources"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -109739,8 +110252,8 @@ self: { libraryHaskellDepends = [ base mtl ncurses ]; executableHaskellDepends = [ base lens mtl ncurses ]; description = "A spoof on gloss for terminal animation"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -109760,7 +110273,7 @@ self: { transformers transformers-base transformers-compat ]; description = "Type-safe datatype-database mapping library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "groundhog-converters" = callPackage @@ -109778,8 +110291,8 @@ self: { groundhog-th tasty tasty-hunit tasty-quickcheck ]; description = "Extended Converter Library for groundhog embedded types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -109803,7 +110316,7 @@ self: { groundhog-th mtl ]; description = "Type-safe datatype-database mapping library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "groundhog-mysql" = callPackage @@ -109820,7 +110333,7 @@ self: { mysql mysql-simple resource-pool resourcet text time transformers ]; description = "MySQL backend for the groundhog library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "groundhog-postgresql" = callPackage @@ -109838,7 +110351,7 @@ self: { time transformers vector ]; description = "PostgreSQL backend for the groundhog library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "groundhog-sqlite" = callPackage @@ -109855,7 +110368,7 @@ self: { resource-pool resourcet text transformers unordered-containers ]; description = "Sqlite3 backend for the groundhog library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "groundhog-th" = callPackage @@ -109871,25 +110384,25 @@ self: { text time unordered-containers yaml ]; description = "Type-safe datatype-database mapping library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "group-by-date" = callPackage - ({ mkDerivation, base, explicit-exception, filemanip, hsshellscript - , pathtype, time, transformers, unix-compat, utility-ht + ({ mkDerivation, base, explicit-exception, filemanip, pathtype + , shell-utility, time, transformers, unix-compat, utility-ht }: mkDerivation { pname = "group-by-date"; - version = "0.1.0.3"; - sha256 = "0lz2ygmzxanrcnhzpqcxi1fqh75c349fcrkd13jgih10zkgk86jh"; + version = "0.1.0.4"; + sha256 = "1k5bnk1kz25zgky5rqb214gq5adkz6qi6p16gk0hvy54iyjdj9sa"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base explicit-exception filemanip hsshellscript pathtype time + base explicit-exception filemanip pathtype shell-utility time transformers unix-compat utility-ht ]; description = "Shell command for grouping files by dates into folders"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "group-theory" = callPackage @@ -109904,7 +110417,7 @@ self: { libraryHaskellDepends = [ base containers groups ]; testHaskellDepends = [ base doctest ]; description = "The theory of groups"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "group-with" = callPackage @@ -109920,8 +110433,8 @@ self: { base Cabal containers hspec hspec-expectations QuickCheck ]; description = "Classify objects by key-generating function, like SQL GROUP BY"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -109939,7 +110452,7 @@ self: { base code-page criterion optparse-applicative random utility-ht ]; description = "Replacement definition of Data.List.GroupBy"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "grouped-list" = callPackage @@ -109954,8 +110467,8 @@ self: { testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; benchmarkHaskellDepends = [ base criterion ]; description = "Grouped lists. Equal consecutive elements are grouped."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -109967,7 +110480,7 @@ self: { sha256 = "0gpjlq9f2il4vp7ihh1sf5g2jr1rbi5big5c6dhjk961n8b1dq0z"; libraryHaskellDepends = [ base ]; description = "A Groupoid class"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "groupoids" = callPackage @@ -109979,7 +110492,7 @@ self: { libraryHaskellDepends = [ base semigroupoids ]; doHaddock = false; description = "This package has been absorbed into semigroupoids 4.0"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "groups" = callPackage @@ -109990,7 +110503,7 @@ self: { sha256 = "0ghabk9r3pqccwfshy80p460awv0niyfi3nirg5bqnxm923c4njn"; libraryHaskellDepends = [ base ]; description = "Groups"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "groups-generic" = callPackage @@ -110001,8 +110514,8 @@ self: { sha256 = "1rnil9qashpvrjxmziymf447pnqpqpnga0lxlk7413y4dprn2rad"; libraryHaskellDepends = [ base generic-data groups ]; description = "Generically derive Group instances"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -110022,7 +110535,7 @@ self: { ]; testToolDepends = [ tasty-discover ]; description = "Mutable vector with efficient appends"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "growler" = callPackage @@ -110043,8 +110556,8 @@ self: { unordered-containers vector wai wai-extra warp ]; description = "A revised version of the scotty library that attempts to be simpler and more performant"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -110056,8 +110569,8 @@ self: { sha256 = "1ymvgsrqhnym2wv5j8mbhh8i3r7y0jcz19k927qmffqk7sacfxg1"; libraryHaskellDepends = [ base proto-lens proto-lens-runtime ]; description = "Generated messages and instances for etcd gRPC"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -110074,8 +110587,8 @@ self: { network proto-lens proto-lens-runtime ]; description = "gRPC client for etcd"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -110104,8 +110617,8 @@ self: { async base bytestring criterion proto3-suite random ]; description = "Haskell implementation of gRPC layered on shared C library"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -110131,8 +110644,8 @@ self: { transformers turtle unix ]; description = "Haskell implementation of gRPC layered on shared C library"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {gpr = null; inherit (pkgs) grpc;}; @@ -110154,8 +110667,8 @@ self: { old-locale OpenGL OpenGLRaw parallel qd qd-vec ruff time Vec ]; description = "fractal explorer GUI using the ruff library"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -110174,8 +110687,8 @@ self: { random ruff Vec ]; description = "Mandelbrot Set examples using ruff and gruff"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -110193,7 +110706,7 @@ self: { ]; libraryPkgconfigDepends = [ gsasl ]; description = "Bindings for GNU libgsasl"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {inherit (pkgs) gsasl;}; "gsc-weighting" = callPackage @@ -110204,7 +110717,7 @@ self: { sha256 = "0y80j5qk601c965assl8d91k9bpvzijn2z0w64n2ksij9lm6b8p5"; libraryHaskellDepends = [ base hierarchical-clustering ]; description = "Generic implementation of Gerstein/Sonnhammer/Chothia weighting"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "gscholar-rss" = callPackage @@ -110221,8 +110734,8 @@ self: { base feed http-conduit scalpel-core text uri xml-types ]; description = "scrapes google scholar, provides RSS feed"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -110235,8 +110748,8 @@ self: { setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base vector ]; description = "Bindings the the GSL random number generation facilities"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -110248,8 +110761,8 @@ self: { sha256 = "1qf5m3zksn16mlgavrwbq6yd1mbyafy27qf1ws4nmkxl8ci0k48i"; libraryHaskellDepends = [ base gsl-random random-fu ]; description = "Instances for using gsl-random with random-fu"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -110267,8 +110780,8 @@ self: { base containers mtl parsec permute sindre text X11 ]; description = "A visual generic menu"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "gssapi" = callPackage @@ -110282,7 +110795,7 @@ self: { libraryHaskellDepends = [ base bytestring resourcet transformers ]; librarySystemDepends = [ gssapi_krb5 krb5 ]; description = "libgssapi and libkrb5 bindings for haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {gssapi_krb5 = null; inherit (pkgs) krb5;}; "gssapi-wai" = callPackage @@ -110298,7 +110811,7 @@ self: { http-types vault wai wai-extra ]; description = "WAI Middleware for SPNEGO authentiaction"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "gstorable" = callPackage @@ -110314,8 +110827,8 @@ self: { base generic-storable ghc-prim hspec QuickCheck ]; description = "Generic implementation of Storable"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -110335,8 +110848,8 @@ self: { libraryPkgconfigDepends = [ gst-plugins-base gstreamer ]; libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the GStreamer open source multimedia framework"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; broken = true; }) {gst-plugins-base = null; gstreamer = null;}; @@ -110370,8 +110883,8 @@ self: { base csv directory filepath rowrecord split ]; description = "The General Transit Feed Specification format"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -110387,8 +110900,8 @@ self: { base protocol-buffers protocol-buffers-descriptor ]; description = "GTFS RealTime protobafs library (autogenerated from .proto file)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -110407,7 +110920,7 @@ self: { ]; libraryPkgconfigDepends = [ gtk2 ]; description = "Binding to the Gtk+ graphical user interface library"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; }) {inherit (pkgs) gtk2;}; "gtk-helpers" = callPackage @@ -110422,7 +110935,7 @@ self: { array base gio glib gtk mtl process template-haskell ]; description = "A collection of auxiliary operations and widgets related to Gtk+"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "gtk-jsinput" = callPackage @@ -110433,7 +110946,7 @@ self: { sha256 = "0fjlk6z8j77l35k9cdzgbyf1w5wd0v0k1sry78vf7f6j4mvv8wb0"; libraryHaskellDepends = [ base gtk json transformers ]; description = "A simple custom form widget for gtk which allows inputing of JSON values"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "gtk-largeTreeStore" = callPackage @@ -110449,7 +110962,7 @@ self: { ]; testHaskellDepends = [ base containers gtk3 hspec ]; description = "Large TreeStore support for gtk2hs"; - license = stdenv.lib.licenses.lgpl3; + license = lib.licenses.lgpl3; }) {}; "gtk-mac-integration" = callPackage @@ -110465,8 +110978,8 @@ self: { libraryHaskellDepends = [ array base containers glib gtk mtl ]; libraryPkgconfigDepends = [ gtk-mac-integration-gtk2 ]; description = "Bindings for the Gtk/OS X integration library"; - license = stdenv.lib.licenses.lgpl21; - platforms = [ "x86_64-darwin" ]; + license = lib.licenses.lgpl21; + platforms = [ "armv7l-linux" "x86_64-darwin" ]; }) {inherit (pkgs) gtk-mac-integration-gtk2;}; "gtk-serialized-event" = callPackage @@ -110483,8 +110996,8 @@ self: { ]; libraryPkgconfigDepends = [ gtk2 ]; description = "GTK+ Serialized event"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) gtk2;}; @@ -110496,7 +111009,7 @@ self: { sha256 = "1qqfhaap2996015h3jkgg9j3hyxrh88wn6kba29ys0q1h35f8yws"; libraryHaskellDepends = [ base gtk ]; description = "A simple custom form widget for gtk which allows single LOC creation/updating of list views"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "gtk-sni-tray" = callPackage @@ -110526,7 +111039,7 @@ self: { optparse-applicative status-notifier-item text unix ]; description = "A standalone StatusNotifierItem/AppIndicator tray"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) gtk3;}; "gtk-strut" = callPackage @@ -110537,7 +111050,7 @@ self: { sha256 = "19p3w1zvnaazfd01yy4cl00sl53xc7kqgqhsw7l3psadmwk6x4w1"; libraryHaskellDepends = [ base gi-gdk gi-gtk text transformers ]; description = "Libary for creating strut windows with gi-gtk"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "gtk-toggle-button-list" = callPackage @@ -110548,7 +111061,7 @@ self: { sha256 = "14hb7nxf4l0q7hab8dzll8dh5ccb4hhc8arywijdgdrz4i2s2706"; libraryHaskellDepends = [ base gtk ]; description = "A simple custom form widget for gtk which allows single LOC creation/updating of toggle button lists"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "gtk-toy" = callPackage @@ -110559,8 +111072,8 @@ self: { sha256 = "0zf3k0c5h5wcgkqr8np5kvgz4c9nha86k5whsn4f1wk0ikj98dfq"; libraryHaskellDepends = [ base containers gtk ]; description = "Convenient Gtk canvas with mouse and keyboard input"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -110573,7 +111086,7 @@ self: { libraryHaskellDepends = [ base glib gtk3 ]; libraryPkgconfigDepends = [ xlibsWrapper ]; description = "A wrapper around the eggtraymanager library for Linux system trays"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; }) {inherit (pkgs) xlibsWrapper;}; "gtk2hs-buildtools" = callPackage @@ -110594,7 +111107,7 @@ self: { libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ base ]; description = "Tools to build the Gtk2Hs suite of User Interface libraries"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }) {}; "gtk2hs-cast-glade" = callPackage @@ -110610,7 +111123,7 @@ self: { ]; description = "A type class for cast functions of Gtk2hs: glade package"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gtk2hs-cast-glib" = callPackage @@ -110622,7 +111135,7 @@ self: { libraryHaskellDepends = [ base glib ]; description = "A type class for cast functions of Gtk2hs: glib package"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gtk2hs-cast-gnomevfs" = callPackage @@ -110638,7 +111151,7 @@ self: { ]; description = "A type class for cast functions of Gtk2hs: gnomevfs package"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gtk2hs-cast-gtk" = callPackage @@ -110654,7 +111167,7 @@ self: { ]; description = "A type class for cast functions of Gtk2hs: gtk package"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gtk2hs-cast-gtkglext" = callPackage @@ -110670,7 +111183,7 @@ self: { ]; description = "A type class for cast functions of Gtk2hs: gtkglext package"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gtk2hs-cast-gtksourceview2" = callPackage @@ -110687,7 +111200,7 @@ self: { ]; description = "A type class for cast functions of Gtk2hs: gtksourceview2 package"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gtk2hs-cast-th" = callPackage @@ -110699,7 +111212,7 @@ self: { libraryHaskellDepends = [ base hint template-haskell ]; description = "A type class for cast functions of Gtk2hs: TH package"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "gtk2hs-hello" = callPackage @@ -110712,8 +111225,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base glib gtk3 transformers ]; description = "Gtk2Hs Hello World, an example package"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -110726,7 +111239,7 @@ self: { libraryHaskellDepends = [ base cairo glib gtk mtl ]; description = "Adds a module to gtk2hs allowing layouts to be defined using reverse polish notation"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -110747,7 +111260,7 @@ self: { ]; libraryPkgconfigDepends = [ gtk3 ]; description = "Binding to the Gtk+ 3 graphical user interface library"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; }) {inherit (pkgs) gtk3;}; "gtk3-helpers" = callPackage @@ -110762,7 +111275,7 @@ self: { array base gio glib gtk3 mtl process template-haskell ]; description = "A collection of auxiliary operations and widgets related to Gtk"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "gtk3-mac-integration" = callPackage @@ -110778,8 +111291,8 @@ self: { libraryHaskellDepends = [ array base containers glib gtk3 mtl ]; libraryPkgconfigDepends = [ gtk-mac-integration-gtk3 ]; description = "Bindings for the Gtk/OS X integration library"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; broken = true; }) {gtk-mac-integration-gtk3 = null;}; @@ -110798,8 +111311,8 @@ self: { libraryPkgconfigDepends = [ gtkglext ]; libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the GTK+ OpenGL Extension"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) gtk2; inherit (pkgs.gnome2) gtkglext; inherit (pkgs) libGLU; inherit (pkgs.xorg) libICE; @@ -110821,8 +111334,8 @@ self: { libraryPkgconfigDepends = [ gtkimageview ]; libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the GtkImageView library"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) gtkimageview;}; @@ -110842,7 +111355,7 @@ self: { ]; description = "Gnome rsync progress display"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -110862,8 +111375,8 @@ self: { libraryPkgconfigDepends = [ gtksourceview ]; libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the GtkSourceView library"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) gtksourceview;}; @@ -110883,8 +111396,8 @@ self: { libraryPkgconfigDepends = [ gtksourceview3 ]; libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the GtkSourceView library"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) gtksourceview3;}; @@ -110896,7 +111409,7 @@ self: { sha256 = "15a6g0bkjf9r0zl7x61ip05kb7k4rf7yxr7z8jybs5q8g78i1b0c"; libraryHaskellDepends = [ base ]; description = "Memory allocation with added stress tests and integrity checks"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "guarded-rewriting" = callPackage @@ -110907,8 +111420,8 @@ self: { sha256 = "04396pd4c4yqpw6ai5ciigva9l3acdz7yn4d5hvyks52khv5fsf9"; libraryHaskellDepends = [ base instant-generics ]; description = "Datatype-generic rewriting with preconditions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -110920,8 +111433,8 @@ self: { sha256 = "1xaj8zl6cbgks3r0asbnkz1ixq1hlglpjxdymj6ikyjq955sxmzj"; libraryHaskellDepends = [ base HList ]; description = "Generate simple combinators given their type"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -110934,7 +111447,7 @@ self: { libraryHaskellDepends = [ base bytestring text uuid uuid-types ]; testHaskellDepends = [ base HUnit ]; description = "A simple wrapper around uuid"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "gulcii" = callPackage @@ -110948,8 +111461,8 @@ self: { enableSeparateDataOutput = true; executableHaskellDepends = [ base cairo containers filepath gtk ]; description = "graphical untyped lambda calculus interactive interpreter"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -110961,7 +111474,7 @@ self: { sha256 = "0vvzlfnvh9r9jqf7v83d0piqpvl40sg0mswf9f41vncgzg0z79v2"; libraryHaskellDepends = [ base ]; description = "The first 1001 Fibonacci numbers, retrieved from the Gutenberg Project"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "gw" = callPackage @@ -110974,8 +111487,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base unix ]; description = "ghcWithPackages cmdline util"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -110989,8 +111502,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base extra GiveYouAHead ]; description = "A binary version of GiveYouAHead"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -111012,8 +111525,8 @@ self: { base exceptions http-client servant-client ]; description = "REST client to the gym-http-api project"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -111037,8 +111550,8 @@ self: { stm template-haskell transformers utf8-string vinyl ]; description = "Haskell library for retrieving data from various booru image sites"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -111062,8 +111575,8 @@ self: { tasty-hunit tasty-quickcheck temporary time transformers unix ]; description = "High Level Binding for GnuPG Made Easy (gpgme)"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -111087,8 +111600,8 @@ self: { base containers hspec QuickCheck split text ]; description = "Reversi game in haskell/blank-canvas"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -111115,8 +111628,8 @@ self: { vector-algorithms vty ]; description = "An Implementation of Game 2048"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -111128,8 +111641,8 @@ self: { sha256 = "16aljqvzf8n1js0drqii99z3v8xba0468w27c9vmf5w483awkqjb"; libraryHaskellDepends = [ base bytestring mtl resourcet ]; description = "Bindings to Linux I2C with support for repeated-start transactions"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -111145,8 +111658,8 @@ self: { base bytestring containers mtl serialport time ]; description = "Control your Arduino board from Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -111174,7 +111687,7 @@ self: { libraryToolDepends = [ c2hs ]; description = "An FFI binding to CMU/Long's BDD library"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {bdd = null; mem = null;}; @@ -111191,7 +111704,7 @@ self: { libraryToolDepends = [ c2hs ]; description = "An FFI binding to the CUDD library"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) cudd; epd = null; inherit (pkgs) mtr; inherit (pkgs) st; util = null;}; @@ -111208,8 +111721,8 @@ self: { executableHaskellDepends = [ base hashable ]; testHaskellDepends = [ base hashable ]; description = "Conceptual modelling support for Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -111226,7 +111739,7 @@ self: { libraryToolDepends = [ c2hs ]; description = "interface to CSound API"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {csound64 = null; inherit (pkgs) libsndfile;}; @@ -111238,8 +111751,8 @@ self: { sha256 = "1ays1qy2zsl3h49ryr2y9dymfv1ak1m1d0jvarmqwg3nb49armhm"; libraryHaskellDepends = [ base containers directory process ]; description = "A simple library for representing and minimising DFAs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -111252,8 +111765,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base cereal vector ]; description = "F(2^e) math for cryptography"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -111270,8 +111783,8 @@ self: { text time zlib ]; description = "Haskell GELF library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -111295,8 +111808,8 @@ self: { filepath hooplext mtl parsec pretty template-haskell transformers ]; description = "A library for analyzing and transforming LLVM (3.5) assembly codes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {hooplext = null;}; @@ -111314,8 +111827,8 @@ self: { old-locale old-time pureMD5 random time ]; description = "Library to interact with the @Mollom anti-spam service"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -111330,8 +111843,8 @@ self: { libraryHaskellDepends = [ base hOff-parser OpenGL ]; executableHaskellDepends = [ base GLFW hOff-parser OpenGL parsec ]; description = "The tool to transform the OFF to other image format"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -111343,7 +111856,7 @@ self: { sha256 = "1vjvn4sr9nb7dd0in57kay6sb49nqzs377v6k9570h5faaj1dyci"; libraryHaskellDepends = [ base parsec ]; description = "The parser to parser the OFF(Object File Format, Princeton ModelNet)"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "hOpenPGP" = callPackage @@ -111390,7 +111903,7 @@ self: { zlib ]; description = "native Haskell implementation of OpenPGP (RFC4880)"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hPDB" = callPackage @@ -111409,8 +111922,8 @@ self: { text unordered-containers vector zlib ]; description = "Protein Databank file format library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -111437,8 +111950,8 @@ self: { iterable linear mtl process template-haskell text time vector ]; description = "Examples for hPDB library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -111454,8 +111967,8 @@ self: { aeson base bytestring http-conduit network text ]; description = "Pushover.net API functions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -111467,8 +111980,8 @@ self: { sha256 = "1kc03mgsxijszdvxw4qwq4fnd0ln61v08rk9y1k6kx9vyqc7bilc"; libraryHaskellDepends = [ array base containers unix ]; description = "R bindings and interface"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -111480,7 +111993,7 @@ self: { sha256 = "188rs1g2yacka8c4wbqkhwjrin95f3ribm8007lqsxiapaj1d89y"; libraryHaskellDepends = [ attoparsec base bytestring ]; description = "haskell implementation of RESP (REdis Serialization Protocol)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hS3" = callPackage @@ -111499,7 +112012,7 @@ self: { network-uri old-locale old-time random regex-compat utf8-string ]; description = "Interface to Amazon's Simple Storage Service (S3)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hScraper" = callPackage @@ -111515,8 +112028,8 @@ self: { process regex-compat text transformers ]; description = "A Haskell library to scrape and crawl web-pages"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -111533,8 +112046,8 @@ self: { utf8-string ]; description = "Interface to Amazon's SimpleDB service"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -111548,8 +112061,8 @@ self: { libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base ]; description = "Parser, print and manipulate structures in PDB file format"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -111561,8 +112074,8 @@ self: { sha256 = "08zmzzwbvqsyz7v5grjwg81434bdr3zkkd12ifhk76xg2p0xfhmk"; libraryHaskellDepends = [ base containers hmatrix random ]; description = "Multidimensional arrays and simple tensor computations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -111579,7 +112092,7 @@ self: { executableSystemDepends = [ blas liblapack ]; description = "Optimal variable selection in chain graphical model"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) blas; liblapack = null;}; @@ -111597,7 +112110,7 @@ self: { base directory gtk3 process split text ]; description = "A Gtk mixer GUI application for FreeBSD"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "haar" = callPackage @@ -111613,8 +112126,8 @@ self: { base QuickCheck test-framework test-framework-quickcheck2 ]; description = "Haar wavelet transforms"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -111639,8 +112152,8 @@ self: { ]; executableHaskellDepends = [ base text ]; description = "Haskell message bot framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -111652,28 +112165,32 @@ self: { sha256 = "07h9a8l32j6j5ssrl7f1j02jlmn5f7c48h88fn7lbzhj24kqasl3"; libraryHaskellDepends = [ base ]; description = "customizable pretty printer library for tables"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "hablo" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, directory - , filepath, lucid, mtl, optparse-applicative, parsec, template - , text, time, unix + ({ mkDerivation, aeson, base, bytestring, Cabal, containers + , directory, filepath, lucid, mtl, optparse-applicative, parsec + , SJW, template, text, time, unix }: mkDerivation { pname = "hablo"; - version = "1.0.1.0"; - sha256 = "1jbbh8d2xdcdgm4kq4yn6i6h9g996m2zqklg8s5b5h5jlzk7hfvs"; - isLibrary = false; + version = "1.1.0.1"; + sha256 = "0jn547idw8ypa5b6wbavpwr4haidgh89gg61bscpxn0psx6r5ahc"; + isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; - executableHaskellDepends = [ + libraryHaskellDepends = [ aeson base bytestring containers directory filepath lucid mtl - optparse-applicative parsec template text time unix + optparse-applicative parsec SJW template text time unix + ]; + executableHaskellDepends = [ base mtl ]; + testHaskellDepends = [ + base Cabal containers directory filepath lucid mtl text ]; description = "A minimalist static blog generator"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -111685,8 +112202,8 @@ self: { }: mkDerivation { pname = "hablog"; - version = "0.7.1"; - sha256 = "1nn88hpp1q1y96px18qvc9q6gq51dl6m1m9hiipr64a6rngryxiy"; + version = "0.8.0"; + sha256 = "0w3mcc06gzrjfyailr9lb4niydfx7gp1pcwizyh87qkhrgxcpnk7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -111696,8 +112213,8 @@ self: { ]; executableHaskellDepends = [ base optparse-applicative text ]; description = "A blog system"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -111709,7 +112226,7 @@ self: { sha256 = "0m0wfg74kmpz6ydldz5h9z5xd54957v1rprl9wal9sjr0pzl28a7"; libraryHaskellDepends = [ base mtl template-haskell ]; description = "Template Haskell framework for automatic FFI code generation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hack" = callPackage @@ -111721,7 +112238,7 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring data-default ]; description = "a Haskell Webserver Interface"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hack-contrib" = callPackage @@ -111740,8 +112257,8 @@ self: { time utf8-string ]; description = "Hack contrib"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -111759,7 +112276,7 @@ self: { ]; description = "Hack helper that renders Press templates"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -111777,8 +112294,8 @@ self: { utf8-string ]; description = "hack-frontend-happstack"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -111790,7 +112307,7 @@ self: { sha256 = "0m0af44jv03djn5i2lgrnnvvcdqx44qppfx76m1bwr7gv1vzm432"; libraryHaskellDepends = [ base bytestring cgi containers hack ]; description = "Allows programs written against MonadCGI to run with any hack handler. (deprecated)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hack-handler-cgi" = callPackage @@ -111801,8 +112318,8 @@ self: { sha256 = "0pm8vs94dbaahqrdwfffwa1jb9ghyjnq48sirlw1dj2gcsa3np2x"; libraryHaskellDepends = [ base bytestring hack ]; description = "Hack handler using CGI protocol. (deprecated)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -111822,7 +112339,7 @@ self: { ]; description = "hack handler implementation using epoll"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -111842,7 +112359,7 @@ self: { librarySystemDepends = [ event ]; description = "Hack EvHTTP (libevent) Handler"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {event = null;}; @@ -111855,8 +112372,8 @@ self: { libraryHaskellDepends = [ base bytestring hack hack-handler-cgi ]; librarySystemDepends = [ fcgi ]; description = "Hack handler direct to fastcgi (deprecated)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) fcgi;}; @@ -111874,8 +112391,8 @@ self: { mtl network ]; description = "Hack Happstack server handler"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -111892,8 +112409,8 @@ self: { base bytestring containers data-default hack hyena network ]; description = "Hyena hack handler"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -111909,7 +112426,7 @@ self: { ]; description = "Hack Kibro handler"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -111925,8 +112442,8 @@ self: { base bytestring failure hack network web-encodings ]; description = "A simplistic HTTP server handler for Hack. (deprecated)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -111940,8 +112457,8 @@ self: { base bytestring hack split web-encodings ]; description = "Applies some basic redirect rules to get cleaner paths. (deprecated)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -111957,8 +112474,8 @@ self: { base clientsession hack old-locale predicates time web-encodings ]; description = "Middleware for easily keeping session data in client cookies. (deprecated)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -111970,7 +112487,7 @@ self: { sha256 = "1x7526939h7g44yyscyk324gdb40cryyiffh13iinf8aw1rach70"; libraryHaskellDepends = [ base hack split zlib ]; description = "Automatic gzip compression of responses. (deprecated)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hack-middleware-jsonp" = callPackage @@ -111985,8 +112502,8 @@ self: { base bytestring bytestring-class hack web-encodings ]; description = "Automatic wrapping of JSON responses to convert into JSONP. (deprecated)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -111998,7 +112515,7 @@ self: { sha256 = "1b6jzdisv58scyzb9pxhqrnz74sy0j96jkbbnf84wccwbwn4rf28"; libraryHaskellDepends = [ base bytestring data-default ]; description = "a Haskell Webserver Interface (V2)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hack2-contrib" = callPackage @@ -112014,7 +112531,7 @@ self: { hack2 network-uri text time ]; description = "Hack2 contrib"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hack2-contrib-extra" = callPackage @@ -112032,7 +112549,7 @@ self: { filepath hack2 hack2-contrib network old-locale old-time time ]; description = "Hack2 contrib extra"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hack2-handler-happstack-server" = callPackage @@ -112049,8 +112566,8 @@ self: { happstack-server mtl network ]; description = "Hack2 Happstack server handler"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -112071,8 +112588,8 @@ self: { stm text unix zeromq-haskell ]; description = "Hack2 Mongrel2 HTTP handler"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -112091,8 +112608,8 @@ self: { snap-server ]; description = "Hack2 Snap server handler"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -112109,8 +112626,8 @@ self: { air base data-default hack2 hack2-interface-wai warp ]; description = "Hack2 warp handler"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -112127,7 +112644,7 @@ self: { http-types network safe wai ]; description = "Hack2 interface to WAI"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hackage-api" = callPackage @@ -112145,8 +112662,8 @@ self: { ]; testHaskellDepends = [ base http-client-tls servant-client ]; description = "An API binding to Hackage API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -112167,8 +112684,8 @@ self: { filepath tar time utf8-string ]; description = "Access cabal-install's Hackage database via Data.Map"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ peti ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ peti ]; }) {}; "hackage-diff" = callPackage @@ -112187,8 +112704,8 @@ self: { haskell-src-exts HTTP mtl process text ]; description = "Compare the public API of different versions of a Hackage library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -112218,8 +112735,8 @@ self: { base monad-logger optparse-applicative ]; description = "Simple mirroring utility for Hackage"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -112238,7 +112755,7 @@ self: { old-locale old-time parsedate ]; description = "Generate cumulative graphs of hackage uploads"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hackage-processing" = callPackage @@ -112251,8 +112768,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base Cabal containers hackage-db ]; description = "Process 00-index.tar.gz from Hackage"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -112276,8 +112793,8 @@ self: { unordered-containers wai warp zlib zlib-conduit ]; description = "Provide a proxy for Hackage which modifies responses in some way. (deprecated)"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -112300,8 +112817,8 @@ self: { zlib ]; description = "Manage secure file-based package repositories"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -112331,7 +112848,7 @@ self: { unordered-containers vector zlib ]; description = "Hackage security library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hackage-security-HTTP" = callPackage @@ -112346,7 +112863,7 @@ self: { base bytestring hackage-security HTTP mtl network network-uri zlib ]; description = "Hackage security bindings against the HTTP library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hackage-server" = callPackage @@ -112384,8 +112901,8 @@ self: { vector xml zlib ]; description = "The Hackage web server"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -112404,7 +112921,7 @@ self: { old-time parsedate tagsoup ]; description = "Generate sparkline graphs of hackage statistics"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hackage-whatsnew" = callPackage @@ -112422,8 +112939,8 @@ self: { temporary ]; description = "Check for differences between working directory and hackage"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -112437,8 +112954,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base download feed tagsoup ]; description = "Convert Hackage RSS feeds to wiki format for publishing on Haskell.org"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -112452,8 +112969,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base feed feed2twitter ]; description = "Send new Hackage releases to Twitter"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -112471,8 +112988,8 @@ self: { base Cabal containers directory filepath mtl process regex-tdfa ]; description = "Hackage testing tool"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -112497,8 +113014,8 @@ self: { quickcheck-instances ]; description = "API for Hacker News"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -112515,7 +113032,7 @@ self: { enableSeparateDataOutput = true; executableHaskellDepends = [ base ]; description = "\"Hack\" like a programmer in movies and games!"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hackmanager" = callPackage @@ -112535,8 +113052,8 @@ self: { ]; executableHaskellDepends = [ base optparse-applicative text ]; description = "Generate useful files for Haskell projects"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -112588,8 +113105,8 @@ self: { transformers-base ]; description = "Lightweight Erlang-style actors for Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -112601,8 +113118,8 @@ self: { sha256 = "0nxcl3v9gnnyjzdpk30m2pmrhwcva9rky2dxrj4nnkr67ajm2dj0"; libraryHaskellDepends = [ base stm ]; description = "Practical actors for Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -112619,8 +113136,8 @@ self: { doCheck = false; preCheck = "unset GHC_PACKAGE_PATH"; description = "A documentation-generation tool for Haskell libraries"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -112637,8 +113154,8 @@ self: { doCheck = false; preCheck = "unset GHC_PACKAGE_PATH"; description = "A documentation-generation tool for Haskell libraries"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -112663,8 +113180,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "A documentation-generation tool for Haskell libraries"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -112689,8 +113206,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "A documentation-generation tool for Haskell libraries"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -112702,8 +113219,8 @@ self: { sha256 = "1nqq7k8ssl6h1d501d8ayzsdlihnbfrqy4l5z43msc6lr7ffvz2r"; libraryHaskellDepends = [ base ]; description = "A documentation-only package exemplifying haddock markup features"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -112722,8 +113239,8 @@ self: { array base Cabal containers directory filepath ghc ghc-paths pretty ]; description = "A documentation-generation tool for Haskell libraries"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -112744,8 +113261,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Library exposing some functionality of Haddock"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "haddock-library" = callPackage @@ -112767,7 +113284,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Library exposing some functionality of Haddock"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }) {}; "haddock-test" = callPackage @@ -112782,8 +113299,8 @@ self: { base bytestring Cabal directory filepath process syb xhtml xml ]; description = "Test utilities for Haddock"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -112805,8 +113322,8 @@ self: { sqlite-simple tagsoup text transformers ]; description = "Generate docset of Dash by Haddock haskell documentation tool"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -112818,8 +113335,8 @@ self: { }: mkDerivation { pname = "hadolint"; - version = "1.19.0"; - sha256 = "0idvjk0nz9m28qcbkzcs2mjrbx543jj0gh8hj0s0lnj3nlpk0b46"; + version = "1.20.0"; + sha256 = "1wb2q26najfmmgvj35wvinvip4l1d3k5mazrang4cr3ch8v1nv6w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -112835,7 +113352,7 @@ self: { ShellCheck split text ]; description = "Dockerfile Linter JavaScript API"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "hadoop-formats" = callPackage @@ -112852,8 +113369,8 @@ self: { librarySystemDepends = [ snappy ]; testHaskellDepends = [ base bytestring filepath text vector ]; description = "Read/write file formats commonly used by Hadoop"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) snappy;}; @@ -112874,8 +113391,8 @@ self: { ]; testHaskellDepends = [ base protobuf tasty tasty-hunit vector ]; description = "Use the Hadoop RPC interface from Haskell"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -112891,7 +113408,7 @@ self: { testHaskellDepends = [ base bytestring conduit extra hspec ]; testToolDepends = [ hspec-discover ]; description = "A simple Hadoop streaming library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hadoop-tools" = callPackage @@ -112917,8 +113434,8 @@ self: { tasty-quickcheck vector ]; description = "Fast command line tools for working with Hadoop"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -112937,7 +113454,7 @@ self: { ]; testHaskellDepends = [ base doctest filemanip process ]; description = "Confirm delegation of NS and MX records"; - license = stdenv.lib.licenses.agpl3; + license = lib.licenses.agpl3; }) {}; "hafar" = callPackage @@ -112949,8 +113466,8 @@ self: { libraryHaskellDepends = [ base intervals mtl ]; testHaskellDepends = [ base intervals mtl QuickCheck ]; description = "Affine arithmetic library for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -112977,8 +113494,8 @@ self: { base directory filemanip filepath optparse-applicative ]; description = "A static site generator with blogging/comments support"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -113000,7 +113517,7 @@ self: { test-framework-hunit test-framework-quickcheck2 ]; description = "A graph library offering mutable, immutable, and inductive graphs"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "haha" = callPackage @@ -113014,7 +113531,7 @@ self: { libraryHaskellDepends = [ base containers time ]; executableHaskellDepends = [ base containers time ]; description = "A simple library for creating animated ascii art on ANSI terminals"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hahp" = callPackage @@ -113031,8 +113548,8 @@ self: { ]; executableHaskellDepends = [ base time ]; description = "Analytic Hierarchy Process"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.agpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -113055,8 +113572,8 @@ self: { tasty-hunit tasty-th text ]; description = "A typed template engine, subset of jinja2"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -113077,7 +113594,7 @@ self: { netrc network-uri optparse-applicative parsec process text wreq ]; description = "A service for pull-based continuous deployment based on hydra"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "hailgun" = callPackage @@ -113095,7 +113612,7 @@ self: { transformers ]; description = "Mailgun REST api interface for Haskell"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hailgun-send" = callPackage @@ -113110,8 +113627,8 @@ self: { base bytestring configurator hailgun text ]; description = "A program to send emails throught the Mailgun api"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -113127,7 +113644,7 @@ self: { base email-validate hailgun mtl text transformers ]; description = "Easy-to-use wrapper for the hailgun package"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hails" = callPackage @@ -113168,8 +113685,8 @@ self: { wai-test ]; description = "Multi-app web platform framework"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {quickcheck-lio-instances = null;}; @@ -113188,7 +113705,7 @@ self: { iterio-server mongoDB mtl ]; description = "Dynamic launcher of Hails applications"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }) {}; "hairy" = callPackage @@ -113216,8 +113733,8 @@ self: { base criterion http-types mtl persistent scotty time wai wai-extra ]; description = "A JSON REST API"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -113247,8 +113764,8 @@ self: { ]; benchmarkHaskellDepends = [ base criterion deepseq ghc-prim ]; description = "A probabilistic programming embedded DSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -113276,8 +113793,8 @@ self: { sha256 = "1ddmnzan16vn0fbp1fgsidahayihhr0vw8saypdqq7lnhqw8j9d4"; libraryHaskellDepends = [ base HTTP network ]; description = "Akismet spam protection library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -113292,8 +113809,8 @@ self: { libraryHaskellDepends = [ base transformers ]; executableHaskellDepends = [ base ]; description = "Minimal akka-inspired actor library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -113310,8 +113827,8 @@ self: { ]; testHaskellDepends = [ base QuickCheck ]; description = "A mako-like quasi-quoter template library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -113351,8 +113868,8 @@ self: { ]; testToolDepends = [ utillinux ]; description = "A static website compiler library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) utillinux;}; @@ -113367,8 +113884,8 @@ self: { base directory filepath hakyll pandoc process ]; description = "A package allowing to write Hakyll blog posts in Rmd"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -113385,8 +113902,8 @@ self: { transformers xhtml ]; description = "Wrapper to integrate literate Agda files with Hakyll"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -113403,8 +113920,8 @@ self: { pandoc pandoc-types process text ]; description = "Hakyll extension for rendering Coq code using Alectryon"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -113416,8 +113933,8 @@ self: { sha256 = "11dl3rqls2yxkmycx63xr1cix4adk6b29sbwr4v5n48bqamr7p1j"; libraryHaskellDepends = [ base blaze-html blaze-markup hakyll ]; description = "Blaze templates for Hakyll"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -113433,8 +113950,8 @@ self: { libraryHaskellDepends = [ base hakyll pandoc ]; executableHaskellDepends = [ base directory filepath hakyll ]; description = "Extra modules for the hakyll website compiler"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -113451,8 +113968,8 @@ self: { ]; testHaskellDepends = [ base blaze-html bytestring cassava hspec ]; description = "Generate Html tables from Csv files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -113471,8 +113988,8 @@ self: { ]; executableHaskellDepends = [ base hakyll ]; description = "Compile Elm code for inclusion in Hakyll static site"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -113484,8 +114001,8 @@ self: { sha256 = "0mkbsivifggi64k97ssxb0dskzwf7h0sny4m8gmkdsvwqjhfdjam"; libraryHaskellDepends = [ base hakyll hyphenation split tagsoup ]; description = "automatic hyphenation for Hakyll"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -113511,7 +114028,7 @@ self: { ]; description = "A Hakyll library for internationalization"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "hakyll-contrib-links" = callPackage @@ -113530,8 +114047,8 @@ self: { base binary QuickCheck test-framework test-framework-quickcheck2 ]; description = "A hakyll library that helps maintain a separate links database"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -113545,8 +114062,8 @@ self: { pname = "hakyll-convert"; version = "0.3.0.3"; sha256 = "0i5g4xs0az8znisl8vm60r3m2y3s9dhh8cdb0bl8c5ikqcrlscjf"; - revision = "1"; - editedCabalFile = "1qp2lr6pq6xiw5g7srr2bkg4nj7zrywgrdhly2alk91ix0vxqrmp"; + revision = "2"; + editedCabalFile = "0jzc6c8z173mcvrndxny5dx24mx5p10p7pkp68lkl1jl135np6bp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -113562,7 +114079,7 @@ self: { temporary text time xml-types ]; description = "Convert from other blog engines to Hakyll"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hakyll-dhall" = callPackage @@ -113582,8 +114099,8 @@ self: { ]; executableHaskellDepends = [ base dhall hakyll ]; description = "Dhall compiler for Hakyll"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -113598,8 +114115,8 @@ self: { base containers data-default filepath hakyll ]; description = "Allow Hakyll to create hierarchical menues from directories"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -113614,7 +114131,7 @@ self: { base blaze-html blaze-markup Elm hakyll mtl ]; description = "Hakyll wrapper for the Elm compiler"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hakyll-favicon" = callPackage @@ -113628,8 +114145,8 @@ self: { libraryHaskellDepends = [ base filepath hakyll ]; executableHaskellDepends = [ base hakyll ]; testHaskellDepends = [ base ]; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -113644,8 +114161,8 @@ self: { base filestore hakyll time time-locale-compat ]; description = "FileStore utilities for Hakyll"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -113667,8 +114184,8 @@ self: { JuicyPixels JuicyPixels-extra tasty tasty-hunit ]; description = "Hakyll utilities to work with images"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -113680,8 +114197,8 @@ self: { sha256 = "1w8wmqdfxf9w4mb9k77gak9iqxysa7mbb5phfh9a0hy30vx2qb1d"; libraryHaskellDepends = [ base hakyll ogmarkup ]; description = "Integrate ogmarkup document with Hakyll"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -113693,8 +114210,8 @@ self: { sha256 = "03s51ql10g6vjsrzwxa2jwff4wckp7vf3sg9r6hdsbh30l4720il"; libraryHaskellDepends = [ base bytestring hakyll typed-process ]; description = "Hakyll compiler for arbitrary external processes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -113710,8 +114227,8 @@ self: { aeson-pretty base data-default-class filepath hakyll hsass ]; description = "Hakyll SASS compiler over hsass"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -113723,8 +114240,8 @@ self: { sha256 = "1c86lzfri5s3xzh5qyw1rpbv1wag26vbxl7pbcmjl25ad380riax"; libraryHaskellDepends = [ base containers hakyll ]; description = "Adds series functionality to hakyll"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -113742,8 +114259,8 @@ self: { base blaze-html containers hakyll shakespeare text ]; description = "Hakyll Hamlet compiler"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -113765,8 +114282,8 @@ self: { regex-posix split tasty tasty-hunit tasty-quickcheck ]; description = "A shortcode extension module for Hakyll"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -113776,15 +114293,15 @@ self: { }: mkDerivation { pname = "hakyll-shortcut-links"; - version = "0.1.0.0"; - sha256 = "0zhz0yixcv9xabr47rpcncxg3bwjx7la0g0hx37qfws5aqlvsz4v"; + version = "0.1.0.1"; + sha256 = "0dk30mw5jk14my7b3j5s0z89z2bwc6a6yxc7sl1c1k71zl56zm39"; libraryHaskellDepends = [ base hakyll mtl pandoc-types parsec shortcut-links text ]; testHaskellDepends = [ base hspec mtl pandoc text ]; description = "Use shortcut-links in markdown file for Hakyll"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -113801,29 +114318,31 @@ self: { ]; testHaskellDepends = [ base directory hakyll tasty tasty-hunit ]; description = "Typescript and javascript hakyll compilers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; "hal" = callPackage - ({ mkDerivation, aeson, base, bytestring, conduit, conduit-extra - , containers, envy, exceptions, http-client, http-conduit - , http-types, mtl, text, time + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , case-insensitive, conduit, conduit-extra, containers, envy + , exceptions, http-client, http-conduit, http-types, mtl, text + , time, unordered-containers }: mkDerivation { pname = "hal"; - version = "0.4.5"; - sha256 = "01qs6bw9fg86vs122nyamfq29g9l3hr8m1bmrmsn0iinrhzisasp"; + version = "0.4.6"; + sha256 = "07xzkb9yavrh17d64gm3pc08jr8cb53lm5fdw6apcn7826ys76vh"; revision = "1"; - editedCabalFile = "1i2fqq0bwmsibfyk7v5nd2myb0sxlkv3xy93ypsfdx6nrsnbb4vq"; + editedCabalFile = "01mx3i40i3xhn9i1bbdppp20df2l305zgzl9r4y02dfzcsy3xff5"; libraryHaskellDepends = [ - aeson base bytestring conduit conduit-extra containers envy - exceptions http-client http-conduit http-types mtl text time + aeson base base64-bytestring bytestring case-insensitive conduit + conduit-extra containers envy exceptions http-client http-conduit + http-types mtl text time unordered-containers ]; description = "A runtime environment for Haskell applications running on AWS Lambda"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -113852,8 +114371,8 @@ self: { test-framework-hunit ]; description = "A tool to generate missing import statements for Haskell modules"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -113871,7 +114390,7 @@ self: { test-framework-quickcheck2 ]; description = "Half-precision floating-point"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "halfs" = callPackage @@ -113894,8 +114413,8 @@ self: { fingertree HFuse mtl QuickCheck random time unix ]; description = "The HAskelL File System (\"halfs\" -- intended for use on the HaLVM)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -113910,7 +114429,7 @@ self: { libraryHaskellDepends = [ base directory HaXml pandoc ]; description = "Haskell Static Web Page Generator"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -113940,8 +114459,8 @@ self: { time ]; description = "A live recompiler"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -113958,8 +114477,8 @@ self: { base doctest hspec matrix matrix-as-xyz parsec QuickCheck ]; description = "Symmetry operations generater of Hall Symbols"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -113980,8 +114499,8 @@ self: { test-framework-hunit test-framework-quickcheck2 ]; description = "Library implementing Halma rules"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -114000,8 +114519,8 @@ self: { gtk halma mtl mvc pipes timeit ]; description = "GTK application for playing Halma"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -114026,8 +114545,8 @@ self: { vector ]; description = "Telegram bot for playing Halma"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -114041,7 +114560,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base hint process ]; description = "looks for functions given a set of example input/outputs"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }) {}; "halves" = callPackage @@ -114053,8 +114572,8 @@ self: { libraryHaskellDepends = [ base lens ]; testHaskellDepends = [ base hedgehog lens ]; description = "Split or combine data structures to and from halves, quarters, eighths"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -114074,8 +114593,8 @@ self: { mime-types network-uri simple-tar text XenDevice ]; description = "A simple, static HaLVM web server"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {HALVMCore = null; XenDevice = null;}; @@ -114102,7 +114621,7 @@ self: { ]; testHaskellDepends = [ base bytestring ]; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -114114,7 +114633,7 @@ self: { sha256 = "19792k9pwpkqwqznxm00nbq22swnayz7fv60ly0wsw5zmf1g6wv8"; libraryHaskellDepends = [ base HCodecs newtype ]; description = "Binding to the OS level Midi services (fork of system-midi)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hamilton" = callPackage @@ -114139,7 +114658,7 @@ self: { vector-sized vty ]; description = "Physics on generalized coordinate systems using Hamiltonian Mechanics and AD"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hamlet" = callPackage @@ -114151,7 +114670,7 @@ self: { libraryHaskellDepends = [ base shakespeare ]; doHaddock = false; description = "Haml-like template files that are compile-time checked (deprecated)"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hampp" = callPackage @@ -114169,8 +114688,8 @@ self: { preprocessor-tools ]; description = "Haskell macro preprocessor"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -114194,8 +114713,8 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Interpreter for SQL-structure definitions in YAML (YamSql)"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -114209,8 +114728,8 @@ self: { editedCabalFile = "1dik6zsi0x310m2x9qy64c0b4bd2gag1l6v1nsh09xqj7vlfpp5v"; libraryHaskellDepends = [ array base deepseq hashable ]; description = "A purely functional and persistent hash map"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -114232,7 +114751,7 @@ self: { optparse-applicative resourcet stm-conduit unix ]; description = "Intel AMT serial-over-lan (SOL) client"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hamusic" = callPackage @@ -114251,8 +114770,8 @@ self: { ]; executableHaskellDepends = [ filepath ]; description = "Library to handle abstract music"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -114265,21 +114784,21 @@ self: { libraryHaskellDepends = [ base text ]; testHaskellDepends = [ base text ]; description = "Convert Halfwidth Katakana to Fullwidth Katakana"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hanabi-dealer" = callPackage ({ mkDerivation, base, containers, random }: mkDerivation { pname = "hanabi-dealer"; - version = "0.10.2.0"; - sha256 = "0axqpa1p7lzxym8nyppc3nhbfzis8y71ywi444v3w6syyvh06ygf"; + version = "0.11.0.1"; + sha256 = "1w4zxjs6253rxkfhhsvcvpfzzslaxyb3m2c6nbh22l6a1li9bcm9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers random ]; description = "Hanabi card game"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -114291,7 +114810,7 @@ self: { sha256 = "1ldfq3y9h9wvhqd3qs99hdi0d02016s7vkmf74p6wppkrzgfs3xn"; libraryHaskellDepends = [ base ]; description = "This package is deprecated. It formerly contained Haskell utilities for data structures and data manipulation."; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "handa-gdata" = callPackage @@ -114320,8 +114839,8 @@ self: { split time unix-compat utf8-string xml ]; description = "Library and command-line utility for accessing Google services and APIs"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -114341,7 +114860,7 @@ self: { aeson base bytestring containers scientific ]; description = "Geographic and Geometric Data"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "handa-opengl" = callPackage @@ -114357,7 +114876,7 @@ self: { split vector-space ]; description = "Utility functions for OpenGL and GLUT"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "handle-like" = callPackage @@ -114368,8 +114887,8 @@ self: { sha256 = "1h3wl4pqnz53ijrw8656j1rgfj61adzvgxm0qvg74wl3hi83xkgd"; libraryHaskellDepends = [ base bytestring ]; description = "HandleLike class"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -114390,8 +114909,8 @@ self: { base bytestring tasty tasty-hunit tasty-th ]; description = "A DSL to describe common shell operations and interpeters for running them locally and remotely"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -114415,7 +114934,7 @@ self: { ]; testHaskellDepends = [ base ]; description = "API Client for the handwriting.io API."; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hangman" = callPackage @@ -114429,7 +114948,7 @@ self: { enableSeparateDataOutput = true; executableHaskellDepends = [ base mtl random utility-ht ]; description = "Hangman implementation in Haskell written in two hours"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hannahci" = callPackage @@ -114450,8 +114969,8 @@ self: { wai-middleware-static yaml ]; description = "Simple Continuous Integration/Deployment System"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.agpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -114475,8 +114994,8 @@ self: { tasty-quickcheck ]; description = "Network Stack"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -114488,8 +115007,8 @@ self: { sha256 = "10zj129s6l4gf9acvs1yahdwv5vqj9kqwshvfjdak3gbi7arw48s"; libraryHaskellDepends = [ base bytestring hans pcap ]; description = "Driver for real ethernet devices for HaNS"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -114501,8 +115020,8 @@ self: { sha256 = "07jspsi8y921n5m5ar93w4gqaff4mjx79ss416ccm4s1k4l2km0b"; libraryHaskellDepends = [ base bytestring hans pfq ]; description = "Driver for real ethernet devices for HaNS"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {pfq = null;}; @@ -114534,8 +115053,8 @@ self: { split text transformers unix utf8-string ]; description = "Korean spell checker"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -114554,8 +115073,8 @@ self: { base checkers hspec QuickCheck quickcheck-text text ]; description = "Graphviz code generation with Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -114586,7 +115105,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "A deployment library for Haskell applications"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "happindicator" = callPackage @@ -114604,8 +115123,8 @@ self: { libraryPkgconfigDepends = [ libappindicator-gtk2 ]; libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the appindicator library"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) libappindicator-gtk2;}; @@ -114620,8 +115139,8 @@ self: { libraryHaskellDepends = [ base glib gtk3 ]; libraryPkgconfigDepends = [ libappindicator-gtk3 ]; description = "Binding to the appindicator library"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) libappindicator-gtk3;}; @@ -114640,7 +115159,7 @@ self: { ]; description = "\"Haskell Applets\" provides an event handler and a canvas for building simple GUI apps"; license = "AGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -114663,7 +115182,7 @@ self: { ]; description = "The \"Haskell Applets\" Gtk+ ver. 2 back-end for \"happlets\"."; license = "AGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -114677,8 +115196,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base directory filepath ]; description = "A small program for counting the comments in haskell source"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -114692,8 +115211,8 @@ self: { libraryHaskellDepends = [ base bytestring HAppS-Server hsp mtl plugins ]; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -114710,8 +115229,8 @@ self: { hsp mtl network plugins RJson ]; description = "Utilities for using HSP templates in HAppS applications"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -114736,8 +115255,8 @@ self: { syb ]; description = "A Happstack Tutorial that is its own web 2.0-type demo."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -114752,8 +115271,8 @@ self: { libraryHaskellDepends = [ base happstack-server ]; doHaddock = false; description = "The haskell application server stack + code generation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -114772,8 +115291,8 @@ self: { random ]; description = "A Happstack Authentication Suite"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -114803,8 +115322,8 @@ self: { web-routes-happstack web-routes-hsp web-routes-th ]; description = "Happstack Authentication Library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -114821,7 +115340,7 @@ self: { mtl safecopy transformers-base ]; description = "client-side session data"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "happstack-contrib" = callPackage @@ -114841,8 +115360,8 @@ self: { old-time syb unix ]; description = "Web related tools and services"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -114864,8 +115383,8 @@ self: { syb-with-class-instances-text template-haskell text time ]; description = "Happstack data manipulation libraries"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -114883,8 +115402,8 @@ self: { happstack-server mtl random template-haskell time xhtml ]; description = "Cross-request user interactions for Happstack"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -114910,8 +115429,8 @@ self: { web-routes-mtl ]; description = "A package for building Facebook applications using Happstack"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -114928,7 +115447,7 @@ self: { utf8-string ]; description = "Happstack extension for use with FastCGI"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "happstack-fay" = callPackage @@ -114943,8 +115462,8 @@ self: { aeson base fay happstack-fay-ajax happstack-server mtl ]; description = "Support for using Fay with Happstack"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -114957,8 +115476,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ fay-base fay-jquery ]; description = "Support for using Fay with Happstack"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -114979,8 +115498,8 @@ self: { web-routes web-routes-happstack web-routes-hsp web-routes-th ]; description = "Glue code for using Happstack with acid-state, web-routes, reform, and HSP"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -114992,8 +115511,8 @@ self: { sha256 = "1l12gyyqzblb9psk6692r9xw640jxzyxqldfyg2yrzz8y0zi649a"; libraryHaskellDepends = [ base happstack-server shakespeare text ]; description = "Support for Hamlet HTML templates in Happstack"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -115010,8 +115529,8 @@ self: { heist mtl text ]; description = "Support for using Heist templates in Happstack"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -115035,8 +115554,8 @@ self: { text utf8-string ]; description = "Convenience functions for Happstack"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -115053,7 +115572,7 @@ self: { utf8-string ]; description = "Support for using HSP templates in Happstack"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "happstack-hstringtemplate" = callPackage @@ -115068,8 +115587,8 @@ self: { base bytestring happstack-server hslogger HStringTemplate mtl ]; description = "Support for using HStringTemplate in Happstack"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -115088,8 +115607,8 @@ self: { syb-with-class template-haskell ]; description = "Efficient relational queries on Haskell sets"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -115107,8 +115626,8 @@ self: { jmacro text utf8-string wl-pprint-text ]; description = "Support for using JMacro with Happstack"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -115122,8 +115641,8 @@ self: { base bytestring happstack-server mtl text ]; description = "Happstack minus the useless stuff"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -115139,8 +115658,8 @@ self: { base happstack-server monad-peel mtl transformers ]; description = "monad-peel instances for Happstack types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -115156,8 +115675,8 @@ self: { base happstack-server mtl plugins-auto template-haskell th-lift ]; description = "The haskell application server stack + reload"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -115186,7 +115705,7 @@ self: { base bytestring containers HUnit parsec zlib ]; description = "Web related tools and services"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "happstack-server-tls" = callPackage @@ -115204,7 +115723,7 @@ self: { ]; librarySystemDepends = [ openssl ]; description = "extend happstack-server with https:// support (TLS/SSL)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) openssl;}; "happstack-server-tls-cryptonite" = callPackage @@ -115221,8 +115740,8 @@ self: { happstack-server hslogger network sendfile time tls unix ]; description = "Extend happstack-server with native HTTPS support (TLS/SSL)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -115243,8 +115762,8 @@ self: { stm syb template-haskell unix ]; description = "Event-based distributed state"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -115260,7 +115779,7 @@ self: { base containers happstack-server list-tries transformers ]; description = "Support for static URL routing with overlap detection for Happstack"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "happstack-util" = callPackage @@ -115283,8 +115802,8 @@ self: { template-haskell time unix unix-compat ]; description = "Web framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -115306,8 +115825,8 @@ self: { web-routes-happstack web-routes-th ]; description = "Utilities for using YUI3 with Happstack"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -115327,8 +115846,8 @@ self: { 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; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; }) {}; "happy" = callPackage @@ -115343,7 +115862,7 @@ self: { executableHaskellDepends = [ array base containers mtl ]; testHaskellDepends = [ base process ]; description = "Happy is a parser generator for Haskell"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }) {}; "happy-dot" = callPackage @@ -115361,7 +115880,7 @@ self: { array base clock language-dot transformers xml ]; description = "Parser for dot made with happy"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "happy-hour" = callPackage @@ -115372,8 +115891,8 @@ self: { sha256 = "1pj61x1ynspk3avfsy9735blzggz78r4b35gin1bza619gp9yzsb"; libraryHaskellDepends = [ base Chart Chart-diagrams ]; description = "Generate simple okay-looking bar plots without much effort"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -115390,7 +115909,7 @@ self: { ]; libraryToolDepends = [ happy ]; description = "Quasi-quoter for Happy parsers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "happybara" = callPackage @@ -115406,8 +115925,8 @@ self: { time transformers transformers-base ]; description = "Acceptance test framework for web applications"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -115427,8 +115946,8 @@ self: { process text time transformers transformers-base vector word8 ]; description = "WebKit Happybara driver"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -115440,8 +115959,8 @@ self: { sha256 = "0vh9ig9mvg12qgysk7gbqwiib3m2ciwi10asb1i0x25xjp585shi"; libraryHaskellDepends = [ base directory filepath process ]; description = "WebKit Server binary for Happybara (taken from capybara-webkit)"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -115460,8 +115979,8 @@ self: { base hspec QuickCheck quickcheck-instances ]; description = "Capstone bindings for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) capstone;}; @@ -115477,8 +115996,8 @@ self: { base containers parsec split tagsoup text transformers ]; description = "jQuery for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -115500,8 +116019,8 @@ self: { QuickCheck random template-haskell vector ]; description = "A Haskell implementation of the Quil instruction set for quantum computing"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -115516,7 +116035,7 @@ self: { aeson base bytestring directory filepath text ]; description = "HAR spec in Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "harchive" = callPackage @@ -115535,7 +116054,7 @@ self: { executableSystemDepends = [ openssl sqlite ]; description = "Networked content addressed backup and restore software"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) openssl; inherit (pkgs) sqlite;}; @@ -115553,8 +116072,8 @@ self: { mtl operational-alacarte pretty syntactic ]; description = "Deep embedding of hardware descriptions with code generation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -115575,8 +116094,8 @@ self: { ]; testToolDepends = [ markdown-unlit ]; description = "Haskell program configuration using higher kinded data"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -115596,7 +116115,7 @@ self: { ]; description = "A Gentoo package query tool"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -115622,8 +116141,8 @@ self: { base containers derive hlint hslogger hspec HUnit QuickCheck ]; description = "A web service specification compiler that generates implementation and tests"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -115640,8 +116159,8 @@ self: { ]; libraryPkgconfigDepends = [ groonga ]; description = "Low level bindings for Groonga"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) groonga;}; @@ -115660,8 +116179,8 @@ self: { scotty text time transformers wai-extra ]; description = "Yet another Groonga http server"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -115673,7 +116192,7 @@ self: { sha256 = "0n30bvpfijaji8p2lk3vc0dfcgd2sclwakvbi31jma4z1i03k89q"; libraryHaskellDepends = [ base ]; description = "HaRP allows pattern-matching with regular expressions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "harpy" = callPackage @@ -115689,8 +116208,8 @@ self: { template-haskell ]; description = "Runtime code generation for x86 machine code"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -115711,8 +116230,8 @@ self: { aeson base bytestring file-embed hspec time ]; description = "Bindings for Harvest API"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -115726,8 +116245,8 @@ self: { isExecutable = true; libraryHaskellDepends = [ base QuickCheck ]; description = "Entity based records"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -115739,8 +116258,8 @@ self: { sha256 = "0yyrfd8mgxwyfgwcg61q7yj2cq2zj6zlk1l340y4vzj71r53qgc4"; libraryHaskellDepends = [ base has template-haskell ]; description = "Template Haskell function for Has records"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -115751,8 +116270,10 @@ self: { }: mkDerivation { pname = "hasbolt"; - version = "0.1.4.3"; - sha256 = "1sfnr6qrv95ryf6c4hpj3vj8v6y64qjjd2fnz4x9i37win9wcb1z"; + version = "0.1.4.4"; + sha256 = "0kk1lamyms1mf8d290c3asnvgk51i8sqj810whms2a5346w9n4ll"; + revision = "1"; + editedCabalFile = "1bnbhq6k2af08riyaplfgm2lzghhi3nc0ijiw0yk1y5pq618zhxy"; libraryHaskellDepends = [ base binary bytestring connection containers data-binary-ieee754 data-default mtl network text @@ -115761,8 +116282,8 @@ self: { base bytestring containers hspec QuickCheck text ]; description = "Haskell driver for Neo4j 3+ (BOLT protocol)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -115788,8 +116309,8 @@ self: { ]; testHaskellDepends = [ base doctest ]; description = "Extras for hasbolt library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -115831,7 +116352,7 @@ self: { base bytestring conduit cryptohash hex path ]; description = "Decompress SAPCAR archives"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }) {}; "hascard" = callPackage @@ -115866,8 +116387,8 @@ self: { tasty-quickcheck text vector vty word-wrap ]; description = "A TUI for reviewing notes using 'flashcards' written with markdown-like syntax"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -115889,8 +116410,8 @@ self: { network safe-exceptions stm template-haskell uuid ]; description = "Cassandra driver for haskell"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -115910,7 +116431,7 @@ self: { ]; description = "Hascat Web Server"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "hascat-lib" = callPackage @@ -115928,7 +116449,7 @@ self: { ]; description = "Hascat Package"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "hascat-setup" = callPackage @@ -115950,7 +116471,7 @@ self: { doHaddock = false; description = "Hascat Installation helper"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "hascat-system" = callPackage @@ -115967,7 +116488,7 @@ self: { ]; description = "Hascat System Package"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "hash" = callPackage @@ -115985,8 +116506,8 @@ self: { ]; testHaskellDepends = [ base directory doctest filepath ]; description = "Hashing tools"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -116002,7 +116523,7 @@ self: { base base16-bytestring blake2 bytestring directory filepath ]; description = "Hash as cache"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "hash-tree" = callPackage @@ -116021,7 +116542,7 @@ self: { memory QuickCheck ]; description = "Merkle Hash Tree"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hashable" = callPackage @@ -116048,7 +116569,7 @@ self: { base bytestring criterion ghc-prim integer-gmp siphash text ]; description = "A class for types that can be converted to a hash value"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hashable-accelerate" = callPackage @@ -116059,8 +116580,8 @@ self: { sha256 = "04cfwd1vyz4xm87ah3x1avs2yzqi6ygcd3sl70v50g492dfl6738"; libraryHaskellDepends = [ accelerate base template-haskell ]; description = "A class for types which can be converted into a hash value"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "hashable-extras" = callPackage @@ -116079,8 +116600,8 @@ self: { ]; testHaskellDepends = [ base directory doctest filepath ]; description = "Higher-rank Hashable"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -116099,8 +116620,8 @@ self: { ]; benchmarkHaskellDepends = [ base criterion ghc-prim hashable ]; description = "Automatically generates Hashable instances with GHC.Generics."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -116114,8 +116635,8 @@ self: { editedCabalFile = "00ngp3hqp3i0xbx00vdgv92pq0n1q5dffjfjni5bnb3rzlafsvvl"; libraryHaskellDepends = [ base hashable sorted-list time ]; description = "Provides instances missing from Hashable"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -116129,7 +116650,7 @@ self: { editedCabalFile = "1dr7ak803ngrhpv43dy25jm18gfzn02gzd3hm31dzcjv3mxsmbrk"; libraryHaskellDepends = [ base hashable time ]; description = "Hashable instances for Data.Time"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hashabler" = callPackage @@ -116147,8 +116668,8 @@ self: { template-haskell text ]; description = "Principled, portable & extensible hashing of data and types, including an implementation of the FNV-1a and SipHash algorithms"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -116167,8 +116688,8 @@ self: { extensible-exceptions filepath mmap mtl zlib ]; description = "Hashed file storage support code"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -116182,8 +116703,8 @@ self: { editedCabalFile = "16lgwd9wsjbqjbibg1qmgbb24r6x2rcsihc205cddjs3qxk8mkdc"; libraryHaskellDepends = [ base containers simple-money ]; description = "A library for working with HashFlare.io contracts and hashrates"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -116196,7 +116717,7 @@ self: { libraryHaskellDepends = [ base bytestring containers split ]; testHaskellDepends = [ base bytestring containers split ]; description = "Hashids generates short, unique, non-sequential ids from numbers"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hashing" = callPackage @@ -116219,7 +116740,7 @@ self: { array base bytestring cryptonite mtl QuickCheck template-haskell ]; description = "A pure haskell library implements several hash algorithms"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hashmap" = callPackage @@ -116230,7 +116751,7 @@ self: { sha256 = "0ma7svf9nanlfbj9nkk6bzk4m98i7xd71xrdc3a5dmmws5yba1nw"; libraryHaskellDepends = [ base containers deepseq hashable ]; description = "Persistent containers Map and Set based on hashing"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hashmap-throw" = callPackage @@ -116241,7 +116762,7 @@ self: { sha256 = "0dibdmpb6nyhn37xfdw8wgam4a2w8b3hl04ivg08d1ybq4a4m1k5"; libraryHaskellDepends = [ base exceptions hashable hashmap ]; description = "Throw behaviour for hashmap lookup"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hashrename" = callPackage @@ -116257,7 +116778,7 @@ self: { base bytestring cryptohash directory filepath ]; description = "Rename every file in a directory with his SHA1 hash"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "hashring" = callPackage @@ -116273,8 +116794,8 @@ self: { base QuickCheck test-framework test-framework-quickcheck2 ]; description = "Efficient consistent hashing"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -116293,7 +116814,7 @@ self: { unordered-containers ]; description = "Benchmark of hash table implementations"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hashtables" = callPackage @@ -116314,7 +116835,7 @@ self: { vector ]; description = "Mutable hash tables in the ST monad"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hashtables-plus" = callPackage @@ -116335,8 +116856,8 @@ self: { transformers ]; description = "Extensions for a \"hashtables\" library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -116348,8 +116869,8 @@ self: { sha256 = "03wn142r0sh7adfghjqwb2mgq4rgkqs8nq2rx2jq717dr2xp987n"; libraryHaskellDepends = [ base containers mtl ]; description = "Process-Based Discrete Event Simulation library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -116367,8 +116888,8 @@ self: { base constraints ghc-prim reflection tagged transformers void ]; description = "Categories"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -116387,8 +116908,8 @@ self: { regex-compat xhtml ]; description = "Generate homepages for cabal packages"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -116407,7 +116928,7 @@ self: { ]; description = "Utility to generate bindings for BlackBerry Cascades"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "haskakafka" = callPackage @@ -116431,7 +116952,7 @@ self: { base bytestring containers either-unwrap hspec regex-posix ]; description = "Kafka bindings for Haskell"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {inherit (pkgs) rdkafka;}; "haskanoid" = callPackage @@ -116451,7 +116972,7 @@ self: { ]; description = "A breakout game written in Yampa using SDL"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "haskarrow" = callPackage @@ -116468,8 +116989,8 @@ self: { base cmdargs containers cpphs directory her-lexer split ]; description = "A dialect of haskell with order of execution based on dependency resolution"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -116490,8 +117011,8 @@ self: { http-types monads-tf stm text wai warp ]; description = "Easily-extensible chatbot for Slack messaging service"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -116516,8 +117037,8 @@ self: { transformers unix-compat ]; description = "Computes and audits file hashes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -116536,7 +117057,7 @@ self: { process-extras text ]; description = "Generate tags file for Haskell project and its nearest deps"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "haskeem" = callPackage @@ -116555,7 +117076,7 @@ self: { ]; description = "A small scheme interpreter"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -116580,8 +117101,8 @@ self: { base bytestring containers HUnit process text unix ]; description = "A command-line interface for user input, written in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "haskeline-class" = callPackage @@ -116592,8 +117113,8 @@ self: { sha256 = "0xgdq2xgw2ccyfzkj5n36s5n6km5l947d2iy4y1qms8kbc05zmfl"; libraryHaskellDepends = [ base haskeline mtl ]; description = "Class interface for working with Haskeline"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -116604,7 +117125,7 @@ self: { version = "0.4.0.0"; sha256 = "0bbjbrhxdms8wbv1dh129l2pkqw5rfva26121ayfx5vr8h7aa7zf"; libraryHaskellDepends = [ ansi-terminal base haskeline mtl safe ]; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "haskelisp" = callPackage @@ -116617,8 +117138,8 @@ self: { editedCabalFile = "0h900mw5kzd9fvywpbhfd9acnfwp3qk7nfi9yr9ibamjb8s87cm1"; libraryHaskellDepends = [ base containers mtl protolude text ]; description = "Write Emacs module in Haskell, using Emacs 25's Dynamic Module feature"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -116644,8 +117165,8 @@ self: { base binary bytestring foundation lens text ]; description = "Haskell Application BlockChain Interface (ABCI) Server Library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -116668,8 +117189,8 @@ self: { xml2json ]; description = "haskell client of aliyun service"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -116702,8 +117223,8 @@ self: { transformers ]; description = "Transform text from the command-line using Haskell expressions"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -116716,7 +117237,7 @@ self: { libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring QuickCheck random ]; description = "A bcrypt implementation for haskell"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "haskell-bitmex-client" = callPackage @@ -116742,8 +117263,8 @@ self: { http-client-tls katip mtl text time websockets ]; description = "Complete BitMEX Client"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -116771,8 +117292,8 @@ self: { semigroups text time transformers unordered-containers vector ]; description = "Auto-generated bitmex API Client"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -116792,8 +117313,8 @@ self: { base bytestring mtl QuickCheck tasty tasty-quickcheck tasty-th ]; description = "BrainFuck interpreter"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -116824,8 +117345,8 @@ self: { ]; doHaddock = false; description = "Cabal package script generator for Travis-CI"; - license = stdenv.lib.licenses.gpl3Plus; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -116846,8 +117367,8 @@ self: { ]; executableHaskellDepends = [ base directory process ]; description = "Library for parallel programming in the Intel Concurrent Collections paradigm"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -116859,8 +117380,8 @@ self: { sha256 = "1iz94kyq1xn3v89aay282qglv2sh41b04p8vaygwm22v1g4b4kk7"; libraryHaskellDepends = [ base process ]; description = "Simple CoffeeScript API"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -116880,8 +117401,8 @@ self: { base bimap boolean-list bytestring containers ]; description = "compress files"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -116897,8 +117418,8 @@ self: { base containers lens pretty-show protolude split text ]; description = "Core Types for NLP"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -116910,8 +117431,8 @@ self: { sha256 = "1r0vhaxcsszrcqnw70gz8xpfrqddmxf9kpka63gix1bjic4alzjn"; libraryHaskellDepends = [ base deepseq ]; description = "Small modules for a Haskell course in which Haskell is taught by implementing Prelude functionality"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -116926,7 +117447,7 @@ self: { libraryHaskellDepends = [ base containers ]; executableHaskellDepends = [ base unix ]; description = "Haskell implementation of the DAP interface data"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "haskell-debug-adapter" = callPackage @@ -116961,8 +117482,8 @@ self: { process resourcet safe-exceptions text ]; description = "Haskell Debug Adapter"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -116979,8 +117500,8 @@ self: { ]; testHaskellDepends = [ base ]; description = "Client library for the Disque datastore"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -117003,8 +117524,8 @@ self: { executableHaskellDepends = [ base ghc text ]; testHaskellDepends = [ base ]; description = "A program to find and display the docs and type of a name"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -117017,8 +117538,8 @@ self: { libraryHaskellDepends = [ base eigen vector ]; testHaskellDepends = [ base eigen vector ]; description = "Some utility functions for haskell-eigen library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -117031,7 +117552,7 @@ self: { libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base syb template-haskell ]; description = "Simple parser parser from Haskell to TemplateHaskell expressions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "haskell-fake-user-agent" = callPackage @@ -117044,7 +117565,7 @@ self: { editedCabalFile = "03pqk1bc2j5xfchwmccbyq2sa57fy7w3ky6apa0wjr4zwni17pb5"; libraryHaskellDepends = [ base bytestring lens tagsoup wreq ]; description = "Simple library for retrieving current user agent strings"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "haskell-formatter" = callPackage @@ -117071,8 +117592,8 @@ self: { QuickCheck tasty tasty-hunit ]; description = "Haskell source code formatter"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -117099,8 +117620,8 @@ self: { system-filepath text transformers transformers-base unix ]; description = "A Haskell ftp server with configurable backend"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -117117,8 +117638,8 @@ self: { ]; testHaskellDepends = [ base directory doctest filepath ]; description = "Typesafe generation of haskell source code"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -117140,7 +117661,7 @@ self: { base filepath haskell-src-exts old-locale time uniplate ]; description = "GetText runtime library implementation in pure Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "haskell-gi" = callPackage @@ -117162,7 +117683,7 @@ self: { libraryPkgconfigDepends = [ glib gobject-introspection ]; testHaskellDepends = [ base doctest process ]; description = "Generate Haskell bindings for GObject Introspection capable libraries"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; "haskell-gi-base" = callPackage @@ -117174,7 +117695,7 @@ self: { libraryHaskellDepends = [ base bytestring containers text ]; libraryPkgconfigDepends = [ glib ]; description = "Foundation for libraries generated by haskell-gi"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; "haskell-gi-overloading" = callPackage @@ -117185,7 +117706,7 @@ self: { sha256 = "0ak8f79ia9zlk94zr02sq8bqi5n5pd8ria8w1dj3adcdvpw9gmry"; doHaddock = false; description = "Overloading support for haskell-gi"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "haskell-go-checkers" = callPackage @@ -117198,8 +117719,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base containers gloss ]; description = "Go and Checkers game in Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -117218,7 +117739,7 @@ self: { tagsoup text wreq ]; description = "Simple library for accessing Google Trends"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "haskell-holes-th" = callPackage @@ -117230,8 +117751,8 @@ self: { libraryHaskellDepends = [ base template-haskell transformers ]; testHaskellDepends = [ base template-haskell transformers ]; description = "Infer haskell code by given type"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -117254,8 +117775,8 @@ self: { tasty-hunit ]; description = "Bindings to the igraph C library (v0.8.0)."; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -117274,7 +117795,7 @@ self: { ]; executableHaskellDepends = [ base ]; description = "create haskell import graph for graphviz"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "haskell-in-space" = callPackage @@ -117287,8 +117808,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base HGL random ]; description = "'Asteroids' arcade games"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -117308,8 +117829,58 @@ self: { servant-client split text unordered-containers vector wai ]; description = "Haskell bindings to the Kubernetes API (via swagger-codegen)"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + + "haskell-language-server" = callPackage + ({ mkDerivation, aeson, base, binary, blaze-markup, brittany + , bytestring, containers, data-default, deepseq, directory, extra + , filepath, floskell, fourmolu, ghc, ghc-boot-th, ghc-paths, ghcide + , gitrev, hashable, haskell-lsp, hie-bios, hls-class-plugin + , hls-eval-plugin, hls-explicit-imports-plugin, hls-hlint-plugin + , hls-plugin-api, hls-retrie-plugin, hls-tactics-plugin, hslogger + , hspec, hspec-core, hspec-expectations, lens, lsp-test, mtl + , optparse-applicative, optparse-simple, ormolu, process + , regex-tdfa, safe-exceptions, shake, stm, stylish-haskell, tasty + , tasty-ant-xml, tasty-expected-failure, tasty-golden, tasty-hunit + , tasty-rerun, temporary, text, transformers, unordered-containers + , with-utf8, yaml + }: + mkDerivation { + pname = "haskell-language-server"; + version = "0.8.0.0"; + sha256 = "0s02llij5qb1z3na43zg51p5r80jpgwxkdv4mzi6m5xb7pppax42"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers data-default directory extra filepath ghc ghcide + gitrev haskell-lsp hls-plugin-api hslogger optparse-applicative + optparse-simple process shake text unordered-containers + ]; + executableHaskellDepends = [ + aeson base binary brittany bytestring containers deepseq directory + extra filepath floskell fourmolu ghc ghc-boot-th ghc-paths ghcide + gitrev hashable haskell-lsp hie-bios hls-class-plugin + hls-eval-plugin hls-explicit-imports-plugin hls-hlint-plugin + hls-plugin-api hls-retrie-plugin hls-tactics-plugin hslogger lens + mtl optparse-applicative optparse-simple ormolu process regex-tdfa + safe-exceptions shake stylish-haskell temporary text transformers + unordered-containers with-utf8 + ]; + testHaskellDepends = [ + aeson base blaze-markup bytestring containers data-default + directory extra filepath haskell-lsp hie-bios hls-plugin-api + hslogger hspec hspec-core hspec-expectations lens lsp-test process + stm tasty tasty-ant-xml tasty-expected-failure tasty-golden + tasty-hunit tasty-rerun temporary text transformers + unordered-containers yaml + ]; + testToolDepends = [ ghcide ]; + description = "LSP server for GHC"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -117321,7 +117892,7 @@ self: { sha256 = "1mb3np20ig0hbgnfxrzr3lczq7ya4p76g20lvnxch8ikck61afii"; libraryHaskellDepends = [ base ]; description = "A fully compliant Haskell 98 lexer"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "haskell-lsp" = callPackage @@ -117350,10 +117921,10 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Haskell library for the Microsoft Language Server Protocol"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; - "haskell-lsp_0_23_0_0" = callPackage + "haskell-lsp_0_24_0_0" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , containers, data-default, directory, filepath, hashable , haskell-lsp-types, hslogger, hspec, hspec-discover, lens, mtl @@ -117362,8 +117933,8 @@ self: { }: mkDerivation { pname = "haskell-lsp"; - version = "0.23.0.0"; - sha256 = "07vyfqqvgaxg06yrawiwfffv511jlamhh4p7i0hwx60xdgpg11xh"; + version = "0.24.0.0"; + sha256 = "0gw289wy91h0qv4filw3glw3rrjvmr5j591wrdiwc1bl3w56bpig"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -117379,8 +117950,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Haskell library for the Microsoft Language Server Protocol"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "haskell-lsp-client" = callPackage @@ -117400,8 +117971,8 @@ self: { base directory haskell-lsp lens process text unix ]; description = "A haskell package to build your own Language Server client"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -117419,25 +117990,25 @@ self: { lens network-uri scientific text unordered-containers ]; description = "Haskell library for the Microsoft Language Server Protocol, data types"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; - "haskell-lsp-types_0_23_0_0" = callPackage + "haskell-lsp-types_0_24_0_0" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, data-default , deepseq, filepath, hashable, lens, network-uri, scientific, text , unordered-containers }: mkDerivation { pname = "haskell-lsp-types"; - version = "0.23.0.0"; - sha256 = "0dz0980681khfn229aky3bsclj86xkril2y0ln3wr7g9v77ypbq7"; + version = "0.24.0.0"; + sha256 = "1p7k2g2xs95ylsnnz2np0w8c7p5dzmlss41g0kzblaz5n3352kbn"; libraryHaskellDepends = [ aeson base binary bytestring data-default deepseq filepath hashable lens network-uri scientific text unordered-containers ]; description = "Haskell library for the Microsoft Language Server Protocol, data types"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "haskell-menu" = callPackage @@ -117448,7 +118019,7 @@ self: { sha256 = "18s8g82v3h4b7maz6di43vfym6d3w16j4rbh5sjh4ps26yjnnfy4"; libraryHaskellDepends = [ base containers ]; description = "A simple menu system for Haskell programs"; - license = stdenv.lib.licenses.lgpl3; + license = lib.licenses.lgpl3; }) {}; "haskell-ml" = callPackage @@ -117467,8 +118038,8 @@ self: { executableHaskellDepends = [ base hmatrix random-shuffle ]; testHaskellDepends = [ base MonadRandom ]; description = "Machine learning in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -117481,7 +118052,7 @@ self: { libraryHaskellDepends = [ array base bytestring cereal ]; testHaskellDepends = [ array base bytestring cereal hspec ]; description = "A cereal-based parser for the Modbus protocol"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "haskell-mpfr" = callPackage @@ -117493,7 +118064,7 @@ self: { libraryHaskellDepends = [ base ghc-prim integer-gmp ]; description = "Correctly-rounded arbitrary-precision floating-point arithmetic"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -117513,8 +118084,8 @@ self: { librarySystemDepends = [ open-pal open-rte openmpi ]; libraryToolDepends = [ c2hs ]; description = "Distributed parallel programming in Haskell using MPI"; - license = stdenv.lib.licenses.bsd3; - }) {open-pal = null; open-rte = null; inherit (pkgs) openmpi;}; + license = lib.licenses.bsd3; + }) {open-pal = null; open-rte = null; openmpi = null;}; "haskell-names" = callPackage ({ mkDerivation, aeson, base, bytestring, containers @@ -117536,7 +118107,7 @@ self: { tasty tasty-golden traverse-with-class ]; description = "Name resolution library for Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "haskell-neo4j-client" = callPackage @@ -117567,8 +118138,8 @@ self: { unordered-containers vector ]; description = "A Haskell neo4j client"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -117583,8 +118154,8 @@ self: { ]; testHaskellDepends = [ base ]; description = "OpenFlow protocol in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -117606,8 +118177,8 @@ self: { system-fileio system-filepath text turtle ]; description = "Manage nix overrides for haskell packages"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -117626,8 +118197,8 @@ self: { transformers transformers-compat ]; description = "Haskell suite library for package management and integration with Cabal"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -117647,8 +118218,8 @@ self: { old-locale poppler template-haskell time zlib ]; description = "Tool for presenting PDF-based presentations"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -117677,8 +118248,8 @@ self: { ]; executableToolDepends = [ alex happy ]; description = "A test system for the Haskell Platform environment"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -117700,8 +118271,8 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "A terminal music player based on afplay"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -117719,7 +118290,7 @@ self: { ]; description = "A library for generating 2D plots painlessly"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -117735,8 +118306,8 @@ self: { testHaskellDepends = [ base bytestring hspec inline-c text ]; testPkgconfigDepends = [ libpostal ]; description = "Haskell binding for the libpostal library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {libpostal = null;}; @@ -117760,7 +118331,7 @@ self: { unordered-containers vector ]; description = "A haskell library for PostGIS geometry types"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "haskell-proxy-list" = callPackage @@ -117778,7 +118349,7 @@ self: { text wreq ]; description = "Simple library for retrieving proxy servers info from https://proxy-list.org"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "haskell-qrencode" = callPackage @@ -117790,7 +118361,7 @@ self: { libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ qrencode ]; description = "Haskell bindings for libqrencode"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) qrencode;}; "haskell-read-editor" = callPackage @@ -117802,8 +118373,8 @@ self: { libraryHaskellDepends = [ base directory process ]; testHaskellDepends = [ base directory hspec process ]; description = "Opens a temporary file on the system's EDITOR and returns the resulting edits"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -117820,8 +118391,8 @@ self: { transformers ]; description = "Reflect Haskell types"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -117833,8 +118404,8 @@ self: { sha256 = "03d8c1gnxd923f3fqqw06w3ibnd20llfgd7s5jgkscc872i5ghz6"; libraryHaskellDepends = [ base syb ]; description = "A DSL for expressing natural deduction rules in Haskell"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -117849,7 +118420,7 @@ self: { libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base ]; description = "Let the Haskell logo talk to your users!"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "haskell-snake" = callPackage @@ -117869,7 +118440,7 @@ self: { base containers lens linear mtl random sdl2 sdl2-ttf text vector ]; description = "Snake game implemetation in Haskell using SDL2"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "haskell-spacegoo" = callPackage @@ -117885,8 +118456,8 @@ self: { text vector vector-space ]; description = "Client API for Rocket Scissor Spacegoo"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -117896,13 +118467,13 @@ self: { pname = "haskell-src"; version = "1.0.3.1"; sha256 = "0cjigvshk4b8wqdk0v0hz9ag1kyjjsmqsy4a1m3n28ac008cg746"; - revision = "1"; - editedCabalFile = "1li6czcs54wnij6qnvpx6f66iiw023pggb3zl3jvp74qqflcf5sg"; + revision = "2"; + editedCabalFile = "1qrhcyr0y7j8la3970pg80w3h3pprsp3nisgg1l41wfsr2m7smnf"; libraryHaskellDepends = [ array base pretty syb ]; libraryToolDepends = [ happy ]; description = "Support for manipulating Haskell source code"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -117923,7 +118494,7 @@ self: { ]; doCheck = false; description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "haskell-src-exts-observe" = callPackage @@ -117936,8 +118507,8 @@ self: { editedCabalFile = "1n4f4yylk09g95040g6pbcygzp95yadihv0sxr4sj87j0d4xa6fc"; libraryHaskellDepends = [ base haskell-src-exts Hoed ]; description = "Observable orphan instances for haskell-src-exts"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -117951,8 +118522,8 @@ self: { base haskell-src-exts lens template-haskell ]; description = "Prisms with newtype wrappers for haskell-src-exts"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -117969,8 +118540,8 @@ self: { ]; testHaskellDepends = [ base haskell-src-exts hspec ]; description = "A quasiquoter for haskell-src-exts"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -117984,8 +118555,8 @@ self: { isExecutable = true; libraryHaskellDepends = [ base haskell-src-exts ]; description = "Pretty print haskell code with comments"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -117997,7 +118568,7 @@ self: { sha256 = "1jfdjaikmjx9sfairp4jjn0vzhw5vhwrg43y082ddpc1bgx2jw7m"; libraryHaskellDepends = [ base haskell-src-exts ]; description = "A simplified view on the haskell-src-exts AST"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "haskell-src-exts-util" = callPackage @@ -118013,7 +118584,7 @@ self: { transformers uniplate ]; description = "Helper functions for working with haskell-src-exts trees"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "haskell-src-match" = callPackage @@ -118033,8 +118604,8 @@ self: { base filepath hspec interpolatedstring-perl6 template-haskell text ]; description = "Testing code generators piece by piece"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -118056,7 +118627,7 @@ self: { template-haskell ]; description = "Parse source to template-haskell abstract syntax"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "haskell-src-meta-mwotton" = callPackage @@ -118072,8 +118643,8 @@ self: { template-haskell ]; description = "Parse source to template-haskell abstract syntax"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -118092,8 +118663,8 @@ self: { testHaskellDepends = [ base bytestring hspec typed-process ]; testToolDepends = [ hspec-discover ]; description = "haskell-stack-trace-plugin"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -118106,7 +118677,7 @@ self: { libraryHaskellDepends = [ base lens semigroups text time ]; testHaskellDepends = [ base doctest ]; description = "Some useful wrappers and functions for building time ranges"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "haskell-to-elm" = callPackage @@ -118128,7 +118699,7 @@ self: { unordered-containers ]; description = "Generate Elm types and JSON encoders and decoders from Haskell types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "haskell-token-utils" = callPackage @@ -118151,8 +118722,8 @@ self: { mtl pretty QuickCheck rosezipper semigroups syb uniplate ]; description = "Utilities to tie up tokens to an AST"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -118169,8 +118740,8 @@ self: { uniplate ]; description = "Haskell AST for efficient tooling"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -118188,8 +118759,8 @@ self: { safe split template-haskell uniplate ]; description = "Creating the Haskell-Tools AST from GHC's representations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -118206,8 +118777,8 @@ self: { references ]; description = "Facilities for generating new parts of the Haskell-Tools AST"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -118223,8 +118794,8 @@ self: { base containers ghc haskell-tools-ast mtl references uniplate ]; description = "Conversions on Haskell-Tools AST to prepare for refactorings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -118242,8 +118813,8 @@ self: { references safe split template-haskell transformers uniplate ]; description = "Creating the Haskell-Tools AST from GHC's representations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -118275,8 +118846,8 @@ self: { template-haskell time transformers uniplate ]; description = "Refactoring Tool for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -118312,8 +118883,8 @@ self: { time ]; description = "Command-line frontend for Haskell-tools Refact"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -118347,8 +118918,8 @@ self: { tasty-hunit ]; description = "Background process for Haskell-tools that editors can connect to"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -118373,8 +118944,8 @@ self: { ]; executableHaskellDepends = [ base ]; description = "Debugging Tools for Haskell-tools"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -118405,8 +118976,8 @@ self: { tasty-hunit websockets ]; description = "A web-based demo for Haskell-tools Refactor"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -118437,8 +119008,8 @@ self: { template-haskell time transformers uniplate ]; description = "Refactoring Tool for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -118455,8 +119026,8 @@ self: { uniplate ]; description = "Pretty printing of Haskell-Tools AST"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -118486,8 +119057,8 @@ self: { transformers uniplate ]; description = "Refactoring Tool for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -118509,8 +119080,8 @@ self: { tasty tasty-hunit ]; description = "Facilities for generating new parts of the Haskell-Tools AST"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -118544,8 +119115,8 @@ self: { test-framework-quickcheck2 time x509 ]; description = "A Haskell Tor Node"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -118559,8 +119130,8 @@ self: { base containers haskell-src-exts pretty ]; description = "A type checker for Haskell/haskell-src-exts"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -118572,8 +119143,8 @@ self: { sha256 = "0fv533nac6dlawgffr1kvn4xpv63hdcb4wgyqbbg2s6dg9a2hw38"; libraryHaskellDepends = [ base process ]; description = "Simple TypeScript API"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -118585,8 +119156,8 @@ self: { sha256 = "1pqh1v0klpi8iq882l5gk0fsf87kabq6rw1wjwkiq6fvw8cc1l97"; libraryHaskellDepends = [ base binary bytestring network ]; description = "Haskell implementation of the Tokyo Tyrant binary protocol"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -118629,7 +119200,7 @@ self: { executableHaskellDepends = [ base hspec text ]; executableToolDepends = [ hspec-discover ]; description = "Haskell XMPP (eXtensible Message Passing Protocol, a.k.a. Jabber) library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "haskell2010" = callPackage @@ -118640,8 +119211,8 @@ self: { sha256 = "1s0avb08b5iwaym42jz783mk1az9kmjf3zmhfag0kzdw10qcnz4m"; libraryHaskellDepends = [ array base ghc-prim ]; description = "Compatibility with Haskell 2010"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -118653,8 +119224,8 @@ self: { sha256 = "02amj6wza3aaw3i84yjh6zwn7v5g3v1d748ajc7gv6cpd4904pzq"; libraryHaskellDepends = [ array base ]; description = "Haskell 2020[draft] Standard Library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -118670,8 +119241,8 @@ self: { array base directory old-locale old-time process time ]; description = "Compatibility with Haskell 98"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -118687,8 +119258,8 @@ self: { array base directory old-locale old-time process time ]; description = "Compatibility with Haskell 98"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -118704,8 +119275,8 @@ self: { base containers directory mtl old-locale old-time pretty time ]; description = "A library of combinators for generating and executing SQL statements"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -118717,8 +119288,8 @@ self: { sha256 = "1l9ifff33xbgdr6fahnzz00nb7va2r0i3pncjd1j8bbnyya1w2kl"; libraryHaskellDepends = [ base containers haskelldb HDBC ]; description = "Bracketed HDBC session for HaskellDB"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -118734,8 +119305,8 @@ self: { base haskelldb haskelldb-connect-hdbc HDBC MonadCatchIO-mtl mtl ]; description = "Bracketed HaskellDB HDBC session using MonadCatchIO-mtl"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -118752,8 +119323,8 @@ self: { MonadCatchIO-transformers transformers ]; description = "Bracketed HaskellDB HDBC session using MonadCatchIO-transformers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -118770,8 +119341,8 @@ self: { MonadCatchIO-transformers transformers ]; description = "Bracketed HaskellDB HDBC session using MonadCatchIO-transformers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -118788,8 +119359,8 @@ self: { monad-control transformers-base ]; description = "Bracketed HaskellDB HDBC session using lifted-base"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -118804,8 +119375,8 @@ self: { libraryHaskellDepends = [ base haskell98 haskelldb mtl plugins ]; executableHaskellDepends = [ haskelldb ]; description = "HaskellDB support for the dynamically loaded drivers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -118823,8 +119394,8 @@ self: { base containers directory haskelldb mtl old-time ]; description = "An experimental HaskellDB back-end in pure Haskell (no SQL)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -118840,8 +119411,8 @@ self: { base containers convertible haskelldb HDBC mtl old-time ]; description = "HaskellDB support for HDBC"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -118859,8 +119430,8 @@ self: { base haskelldb haskelldb-hdbc HDBC HDBC-mysql mtl ]; description = "HaskellDB support for the HDBC MySQL driver"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -118878,8 +119449,8 @@ self: { base haskelldb haskelldb-hdbc HDBC HDBC-odbc mtl ]; description = "HaskellDB support for the HDBC ODBC driver"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -118898,8 +119469,8 @@ self: { ]; executableSystemDepends = [ postgresql ]; description = "HaskellDB support for the HDBC PostgreSQL driver"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) postgresql;}; @@ -118917,8 +119488,8 @@ self: { base haskelldb haskelldb-hdbc HDBC HDBC-sqlite3 mtl ]; description = "HaskellDB support for the HDBC SQLite driver"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -118930,8 +119501,8 @@ self: { sha256 = "0j1aqix21pqcsw7skl897pd1ir6hg836g4zb2h5338h4gih6blx0"; libraryHaskellDepends = [ base haskelldb hsql mtl old-time ]; description = "HaskellDB support for HSQL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -118949,8 +119520,8 @@ self: { base haskelldb haskelldb-hsql hsql hsql-mysql mtl ]; description = "HaskellDB support for the HSQL MySQL driver"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -118968,8 +119539,8 @@ self: { base haskelldb haskelldb-hsql hsql hsql-odbc mtl ]; description = "HaskellDB support for the HSQL ODBC driver"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -118987,8 +119558,8 @@ self: { base haskelldb haskelldb-hsql hsql hsql-oracle mtl ]; description = "HaskellDB support for the HSQL Oracle driver"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {hsql-oracle = null;}; @@ -119006,8 +119577,8 @@ self: { base haskelldb haskelldb-hsql hsql hsql-postgresql mtl ]; description = "HaskellDB support for the HSQL PostgreSQL driver"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -119025,8 +119596,8 @@ self: { base haskelldb haskelldb-hsql hsql hsql-sqlite mtl ]; description = "HaskellDB support for the HSQL SQLite driver"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {hsql-sqlite = null;}; @@ -119044,8 +119615,8 @@ self: { base haskelldb haskelldb-hsql hsql hsql-sqlite3 mtl ]; description = "HaskellDB support for the HSQL SQLite3 driver"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -119057,8 +119628,8 @@ self: { sha256 = "12whvz0qy9lqk1frfl5px9lhr1nwy519vj2z9c3g8nqjzscwzayb"; libraryHaskellDepends = [ base haskelldb mtl template-haskell ]; description = "Template Haskell utilities for HaskellDB"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -119069,8 +119640,8 @@ self: { version = "1.0.0"; sha256 = "01652m0bym80400navqlpdv5n0gfgnfzd1d0857f3kd13ksqk2hy"; description = "HaskellDB support for WXHaskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -119086,8 +119657,8 @@ self: { base containers haskell-src-exts mtl template-haskell ]; description = "For parsing Haskell-ish languages"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -119111,8 +119682,8 @@ self: { test-framework-quickcheck2 ]; description = "A scrabble library capturing the core game logic of scrabble"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -119130,8 +119701,8 @@ self: { base cryptohash directory either filepath mtl process text ]; description = "Command line tool for running Haskell scripts with a hashbang"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -119164,7 +119735,7 @@ self: { vector ]; description = "Elm to Haskell translation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "haskelzinc" = callPackage @@ -119180,8 +119751,8 @@ self: { base containers directory filepath parsec pretty process ]; description = "CP in Haskell through MiniZinc"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -119196,8 +119767,8 @@ self: { libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base ]; description = "Compiler from I- to S-Expressions for the Scheme Programming Language"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -119225,8 +119796,8 @@ self: { vector ]; description = "A transactional, ACID compliant, embeddable key-value store"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -119250,7 +119821,7 @@ self: { transformers vector ]; description = "B+-tree implementation in Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "haskey-mtl" = callPackage @@ -119270,8 +119841,8 @@ self: { transformers ]; description = "A monad transformer supporting Haskey transactions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -119283,8 +119854,8 @@ self: { sha256 = "061dhk7d9d8mnb1rs7077q383sqlby8s31ips8jjadkkhyxi5lvz"; libraryHaskellDepends = [ base containers haskell98 SDL SDL-ttf ]; description = "Haskell game library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -119301,8 +119872,8 @@ self: { text time unordered-containers ]; description = "Haskell bindings to refheap"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -119322,8 +119893,8 @@ self: { th-lift unordered-containers ]; description = "The core logical system of HaskHOL, an EDSL for HOL theorem proving"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -119344,7 +119915,7 @@ self: { ]; executableHaskellDepends = [ base ]; description = "Haskell Evaluation inside of LaTeX code"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "haskmon" = callPackage @@ -119360,8 +119931,8 @@ self: { vector ]; description = "A haskell wrapper for PokeAPI.co (www.pokeapi.co)"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -119387,8 +119958,8 @@ self: { test-framework test-framework-hunit test-framework-quickcheck2 text ]; description = "Implementation of the Bitcoin protocol"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -119406,8 +119977,8 @@ self: { mtl network-bitcoin text transformers transformers-base ]; description = "An adapter for haskoin to network-bitcoin"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -119439,8 +120010,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Bitcoin & Bitcoin Cash library for Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -119463,8 +120034,8 @@ self: { test-framework-quickcheck2 ]; description = "Implementation of Bitcoin cryptographic primitives"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -119496,8 +120067,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "P2P library for Bitcoin and Bitcoin Cash"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -119520,8 +120091,8 @@ self: { test-framework test-framework-hunit test-framework-quickcheck2 ]; description = "Implementation of the Bitcoin network protocol messages"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -119546,8 +120117,8 @@ self: { test-framework-quickcheck2 ]; description = "Implementation of Bitcoin script parsing and evaluation"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -119593,8 +120164,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Storage and index for Bitcoin and Bitcoin Cash"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -119620,8 +120191,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Data for Haskoin Store"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -119644,8 +120215,8 @@ self: { test-framework test-framework-hunit test-framework-quickcheck2 ]; description = "Utility functions for the Network.Haskoin project"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -119688,8 +120259,8 @@ self: { unordered-containers ]; description = "Implementation of a Bitcoin SPV Wallet with BIP32 and multisig support"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -119708,7 +120279,7 @@ self: { ]; description = "Web Application Abstraction"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -119725,7 +120296,7 @@ self: { ]; description = "Integrating HttpSpec with Haskoon"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -119744,7 +120315,7 @@ self: { ]; description = "Integrating HttpSpec with Haskoon"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -119770,7 +120341,7 @@ self: { ]; description = "The Haskore Computer Music System"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -119789,7 +120360,7 @@ self: { ]; description = "Routines for realtime playback of Haskore songs"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -119812,7 +120383,7 @@ self: { ]; description = "Haskore back-end for SuperCollider"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -119833,7 +120404,7 @@ self: { ]; description = "Music rendering coded in Haskell"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -119845,7 +120416,7 @@ self: { sha256 = "1aq8lwyj4whz4llkwgx7n44rnrhk6ykyi8cpb0cjsabk3h29mm0b"; libraryHaskellDepends = [ base ]; description = "The February 2000 version of Haskore"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "haskseg" = callPackage @@ -119870,7 +120441,7 @@ self: { random-shuffle text vector zlib ]; description = "Simple unsupervised segmentation model"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hasktags" = callPackage @@ -119898,7 +120469,7 @@ self: { utf8-string ]; description = "Produces ctags \"tags\" and etags \"TAGS\" files for Haskell programs"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hasktorch" = callPackage @@ -119927,8 +120498,8 @@ self: { ]; doHaddock = false; description = "Torch for tensors and neural networks in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -119958,8 +120529,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Code generation tools for Hasktorch"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -119976,7 +120547,7 @@ self: { base hasktorch-types-th hspec QuickCheck text ]; description = "Testing library for Hasktorch's FFI bindings"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hasktorch-ffi-th" = callPackage @@ -119994,8 +120565,8 @@ self: { base hasktorch-ffi-tests hasktorch-types-th hspec QuickCheck text ]; description = "Bindings to Torch"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {ATen = null;}; @@ -120018,8 +120589,8 @@ self: { hasktorch-types-thc hspec QuickCheck text ]; description = "Bindings to Cutorch"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {ATen = null;}; @@ -120048,8 +120619,8 @@ self: { ]; doHaddock = false; description = "Core Hasktorch abstractions wrapping FFI bindings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -120075,8 +120646,8 @@ self: { ]; doHaddock = false; description = "Backpack signatures for Tensor operations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -120092,8 +120663,8 @@ self: { base hasktorch-signatures-types hasktorch-types-th ]; description = "Functions to partially satisfy tensor signatures"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -120110,8 +120681,8 @@ self: { ]; doHaddock = false; description = "Signatures for support tensors in hasktorch"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -120126,7 +120697,7 @@ self: { libraryHaskellDepends = [ base deepseq ]; doHaddock = false; description = "Core types for Hasktorch backpack signatures"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hasktorch-types-th" = callPackage @@ -120140,7 +120711,7 @@ self: { libraryHaskellDepends = [ base inline-c ]; libraryToolDepends = [ c2hs ]; description = "C-types for Torch"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hasktorch-types-thc" = callPackage @@ -120152,7 +120723,7 @@ self: { libraryHaskellDepends = [ base hasktorch-types-th inline-c ]; libraryToolDepends = [ c2hs ]; description = "C-types for Cutorch"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hasktorch-zoo" = callPackage @@ -120172,8 +120743,8 @@ self: { vector ]; description = "Neural architectures in hasktorch"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -120198,8 +120769,8 @@ self: { ]; benchmarkHaskellDepends = [ base criterion ]; description = "Haskus binary format manipulation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -120219,8 +120790,8 @@ self: { optparse-applicative optparse-simple process temporary text yaml ]; description = "Haskus system build tool"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -120243,8 +120814,8 @@ self: { base containers doctest tasty tasty-quickcheck ]; description = "Haskus utility modules"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -120261,8 +120832,8 @@ self: { haskus-utils-data template-haskell text ]; description = "Compatibility modules with other external packages (ByteString, etc.)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -120280,8 +120851,8 @@ self: { ]; testHaskellDepends = [ base doctest ]; description = "Haskus data utility modules"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -120296,8 +120867,8 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; description = "Haskus types utility modules"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -120320,8 +120891,8 @@ self: { ]; benchmarkHaskellDepends = [ base criterion deepseq QuickCheck ]; description = "Variant and EADT"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -120338,8 +120909,8 @@ self: { haskus-utils-compat lucid text ]; description = "Haskus web"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -120371,8 +120942,8 @@ self: { persistent-template split tagsoup text time utf8-string ]; description = "HTTP server"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -120387,8 +120958,8 @@ self: { libraryHaskellDepends = [ base mtl old-time wtk ]; executableHaskellDepends = [ mtl old-time QuickCheck time wtk ]; description = "Loan calculator engine"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -120407,8 +120978,8 @@ self: { wtk-gtk ]; description = "Loan calculator Gtk GUI. Based on haslo (Haskell Loan) library."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -120439,7 +121010,7 @@ self: { ]; benchmarkHaskellDepends = [ base criterion directory text ]; description = "CSS Minifier"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hasparql-client" = callPackage @@ -120450,8 +121021,8 @@ self: { sha256 = "1ln0kdm40y6l8sncrjl0mj9bpd30ffg3msaxyd6fq520ypyws9pm"; libraryHaskellDepends = [ base HTTP monads-fd network xml ]; description = "This package enables to write SPARQL queries to remote endpoints"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -120464,7 +121035,7 @@ self: { libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ aspell ]; description = "Haskell bindings to aspell"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {inherit (pkgs) aspell;}; "hasql" = callPackage @@ -120492,7 +121063,7 @@ self: { ]; benchmarkHaskellDepends = [ bug criterion rerebase ]; description = "An efficient PostgreSQL driver with a flexible mapping API"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hasql-backend" = callPackage @@ -120508,8 +121079,8 @@ self: { vector ]; description = "API for backends of \"hasql\""; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -120532,8 +121103,8 @@ self: { vector ]; description = "Encodable and Decodable classes for hasql"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -120556,8 +121127,8 @@ self: { tasty-hunit tasty-quickcheck ]; description = "A declarative abstraction over PostgreSQL Cursor"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -120575,8 +121146,8 @@ self: { contravariant-extras hasql hasql-transaction transformers ]; description = "An abstraction for simultaneous fetching from multiple PostgreSQL cursors"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -120597,8 +121168,8 @@ self: { tasty-quickcheck ]; description = "Toolkit for constructing Hasql statements dynamically"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -120617,8 +121188,8 @@ self: { vector ]; description = "Generic encoder and decoder deriving for Hasql"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -120635,7 +121206,7 @@ self: { time uuid vector ]; description = "Implicit definitions for Hasql, such as default codecs for standard types"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hasql-migration" = callPackage @@ -120655,7 +121226,7 @@ self: { base bytestring hasql hasql-transaction hspec transformers ]; description = "PostgreSQL Schema Migrations"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hasql-notifications" = callPackage @@ -120677,7 +121248,7 @@ self: { executableHaskellDepends = [ base hasql ]; testHaskellDepends = [ base bytestring hasql hspec QuickCheck ]; description = "LISTEN/NOTIFY support for Hasql"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hasql-optparse-applicative" = callPackage @@ -120692,7 +121263,7 @@ self: { base-prelude hasql hasql-pool optparse-applicative ]; description = "\"optparse-applicative\" parsers for \"hasql\""; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hasql-pipes" = callPackage @@ -120707,7 +121278,7 @@ self: { base bytestring-tree-builder hasql pipes pipes-safe protolude ]; description = "A pipe to stream a postgres database cursor in the hasql ecosystem"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hasql-pool" = callPackage @@ -120719,7 +121290,7 @@ self: { libraryHaskellDepends = [ base-prelude hasql resource-pool time ]; testHaskellDepends = [ base-prelude hasql hspec ]; description = "A pool of connections for Hasql"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hasql-postgres" = callPackage @@ -120754,8 +121325,8 @@ self: { QuickCheck quickcheck-instances scientific text time vector ]; description = "A \"PostgreSQL\" backend for the \"hasql\" library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -120770,8 +121341,8 @@ self: { base-prelude hasql-postgres optparse-applicative ]; description = "An \"optparse-applicative\" parser for \"hasql-postgres\""; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -120806,8 +121377,8 @@ self: { resource-pool split stm text time tmp-postgres transformers ]; description = "A PostgreSQL backed queue"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -120824,8 +121395,8 @@ self: { unordered-containers vector ]; description = "A somewhat opinionated \"simpler\" API to hasql"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -120844,8 +121415,8 @@ self: { text uuid vector ]; description = "Template Haskell utilities for Hasql"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -120864,7 +121435,7 @@ self: { ]; testHaskellDepends = [ async hasql rebase ]; description = "Composable abstraction over retryable transactions for Hasql"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hasql-url" = callPackage @@ -120880,8 +121451,8 @@ self: { ]; testHaskellDepends = [ base hasql tasty tasty-quickcheck ]; description = "Parse PostgreSQL connection URI into Hasql.Connection Settings"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -120897,7 +121468,7 @@ self: { base binary bytestring dlist mtl mysql-haskell scientific text time ]; description = "composable SQL generation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hastache" = callPackage @@ -120925,8 +121496,8 @@ self: { base bytestring directory HUnit mtl syb text ]; description = "Haskell implementation of Mustache templates"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -120943,8 +121514,8 @@ self: { unordered-containers vector ]; description = "render hastache templates using aeson values"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -120958,8 +121529,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base curl filepath mtl ]; description = "A universal pastebin tool, written in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -120979,8 +121550,8 @@ self: { wai wai-websockets warp websockets ]; description = "Framework for type-safe, distributed web applications"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -121008,8 +121579,8 @@ self: { unix utf8-string ]; description = "Haskell To ECMAScript compiler"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {bin-package-db = null;}; @@ -121024,8 +121595,8 @@ self: { base data-default haste-compiler transformers ]; description = "Google API bindings for the Haste compiler"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "haste-lib" = callPackage @@ -121043,8 +121614,8 @@ self: { utf8-string ]; description = "Base libraries for haste-compiler"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -121059,8 +121630,8 @@ self: { base containers directory filepath haste-lib ]; description = "A port of blaze-markup and blaze-html to Haste"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -121072,8 +121643,8 @@ self: { sha256 = "1a92ahmphsr0dgj1jlp2cxpq5yy59b3avw3gzmv0jzrds41p3ic8"; libraryHaskellDepends = [ base haste-compiler transformers ]; description = "Create, navigate and modify the DOM tree with composable syntax, with the haste compiler"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; }) {}; "haste-prim" = callPackage @@ -121084,8 +121655,8 @@ self: { sha256 = "1gmvvqy0xy396r3jnfmdhh70j7k73qs38cw9znwgl8jjywpzrmw5"; libraryHaskellDepends = [ base ghc-prim integer-gmp ]; description = "Low level primitives for the Haste compiler"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -121111,7 +121682,7 @@ self: { ]; testHaskellDepends = [ base ]; description = "A program to download subtitle files"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hasty-hamiltonian" = callPackage @@ -121128,7 +121699,7 @@ self: { ]; testHaskellDepends = [ ad base mwc-probability ]; description = "Speedy traversal through parameter space"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hat" = callPackage @@ -121152,7 +121723,7 @@ self: { ]; description = "The Haskell tracer, generating and viewing Haskell execution traces"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "hatex-guide" = callPackage @@ -121168,8 +121739,8 @@ self: { transformers ]; description = "HaTeX User's Guide"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -121193,7 +121764,7 @@ self: { ]; description = "XMPP client with 9P and (optionally) GTK interfaces"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "hath" = callPackage @@ -121213,7 +121784,7 @@ self: { base cmdargs process split tasty tasty-hunit tasty-quickcheck ]; description = "Hath manipulates network blocks in CIDR notation"; - license = stdenv.lib.licenses.agpl3; + license = lib.licenses.agpl3; }) {}; "hats" = callPackage @@ -121243,8 +121814,8 @@ self: { async attoparsec base bytestring criterion random stm ]; description = "Haskell client for the NATS messaging system"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -121267,8 +121838,8 @@ self: { base test-framework test-framework-quickcheck2 ]; description = "A truth table generator for classical propositional logic"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -121291,7 +121862,7 @@ self: { base http-client http-client-tls monad-logger text ]; description = "Library for checking for weak/compromised passwords"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "haven" = callPackage @@ -121310,8 +121881,8 @@ self: { http-types mtl process SHA temporary transformers xml ]; description = "Recursively retrieve maven dependencies"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -121336,8 +121907,8 @@ self: { tasty-hunit tasty-quickcheck text ]; description = "Implementation of the rules of Love Letter"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -121359,8 +121930,8 @@ self: { regex-tdfa SHA time utf8-string ]; description = "A twitter client for GTK+. Beta version."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -121386,8 +121957,8 @@ self: { text transformers ]; description = "Haskell cash-flow and tax simulation"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -121414,7 +121985,7 @@ self: { unordered-containers ]; description = "A Haskell library for efficient, concurrent, and concise data access"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "haxl-amazonka" = callPackage @@ -121430,8 +122001,8 @@ self: { transformers ]; description = "Haxl data source for accessing AWS services through amazonka"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -121454,8 +122025,8 @@ self: { unordered-containers vector ]; description = "An example Haxl data source for accessing the Facebook Graph API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -121480,8 +122051,8 @@ self: { utf8-string zlib ]; description = "Readable HaxBall replays"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -121502,7 +122073,7 @@ self: { utf8-string ]; description = "XML-RPC client and server library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "haxr-th" = callPackage @@ -121513,8 +122084,8 @@ self: { sha256 = "1h1g4r7c5k3rja49ip4m21f2sscn06xjxharnlyazvvs6mzfysif"; libraryHaskellDepends = [ base haxr template-haskell ]; description = "Automatic deriving of XML-RPC structs for Haskell records"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -121531,8 +122102,8 @@ self: { url ]; description = "A simple HTTP proxy server library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -121553,8 +122124,8 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base process xml ]; description = "Haskell bindings for the C Wayland library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) libGL; inherit (pkgs) wayland;}; @@ -121573,8 +122144,8 @@ self: { pandoc url ]; description = "Hayoo CLI"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -121593,8 +122164,8 @@ self: { base cairo filepath glade gtk haskell98 process svgcairo time unix ]; description = "N-back memory game"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -121624,8 +122195,8 @@ self: { vector ]; description = "Bayesian Networks"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -121642,8 +122213,8 @@ self: { base directory ghc ghc-mod ghc-paths libhbb ]; description = "Haskell Busy Bee, a backend for text editors"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -121655,8 +122226,8 @@ self: { sha256 = "1glld44m6h8yfh5h63w9q5isy238j0j312ycx43va1xa80x5r4dq"; libraryHaskellDepends = [ base bytestring Decimal digits split ]; description = "Packed binary-coded decimal (BCD) serialization"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -121672,8 +122243,8 @@ self: { attoparsec base blaze-builder bytestring containers network ]; description = "Client for the beanstalkd workqueue service"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -121692,8 +122263,8 @@ self: { ]; executableSystemDepends = [ SDL_mixer ]; description = "A simple step sequencer GUI"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) SDL_mixer;}; @@ -121730,8 +122301,8 @@ self: { optparse-applicative parsec primitive text transformers vector ]; description = "An optimizing Brainfuck compiler and evaluator"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -121749,8 +122320,8 @@ self: { librarySystemDepends = [ blas liblapack ]; testHaskellDepends = [ base hspec primitive vector ]; description = "Human friendly BLAS and Lapack bindings for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) blas; liblapack = null;}; @@ -121770,8 +122341,8 @@ self: { hashable path-pieces safecopy text unordered-containers uuid vector ]; description = "A mutable vector that provides indexation on the datatype fields it stores"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -121806,7 +122377,7 @@ self: { executableHaskellDepends = [ base ]; description = "Minimal extensible web-browser"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "hbro-contrib" = callPackage @@ -121839,7 +122410,7 @@ self: { ]; description = "Third-party extensions to hbro"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "hburg" = callPackage @@ -121859,8 +122430,8 @@ self: { ]; executableToolDepends = [ alex happy ]; description = "Haskell Bottom Up Rewrite Generator"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -121873,7 +122444,7 @@ self: { libraryHaskellDepends = [ base containers gasp mtl ]; description = "Haskell CAD library"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -121887,8 +122458,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base bytestring language-c ]; description = "A toy C compiler"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -121901,8 +122472,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base colour random ]; description = "haskell cg (minus)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -121918,8 +122489,8 @@ self: { base cairo colour filepath hcg-minus process ]; description = "haskell cg (minus) (cairo rendering)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -121932,8 +122503,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base mps ]; description = "A collection of code cheatsheet"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -121966,8 +122537,8 @@ self: { text-format-heavy unix unix-bytestring unordered-containers yaml ]; description = "Implementation of checkers (\"draughts\") board game - server application"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -121984,8 +122555,8 @@ self: { array attoparsec base containers hlint hspec QuickCheck text ]; description = "Chess library"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -122006,8 +122577,8 @@ self: { ]; testHaskellDepends = [ base directory doctest filepath ]; description = "A testing library for command line applications"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -122030,8 +122601,8 @@ self: { async base bytestring HUnit network QuickCheck random ]; description = "CoAP implementation for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -122055,7 +122626,7 @@ self: { base base64-bytestring bytestring criterion ghc-prim reflection ]; description = "An implementation of the Consistent Overhead Byte Stuffing algorithm"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hcom" = callPackage @@ -122066,8 +122637,8 @@ self: { sha256 = "1ps6q3sn0dlkhxkwgpq9jj0rklrnsgsrrlk63g9jr8lfris2wlzq"; doHaddock = false; description = "Haskell COM support library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -122085,7 +122656,7 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base data-default HUnit ieee754 mtl ]; description = "Easily convert between latitude/longitude, UTM and OSGB"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hcount" = callPackage @@ -122105,8 +122676,8 @@ self: { stan text ]; description = "Haskell name counts"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -122123,8 +122694,8 @@ self: { random stm time ]; description = "A simple job scheduler, which just runs some IO action at a given time"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -122145,8 +122716,8 @@ self: { base directory HaskellForMaths QuickCheck text ]; description = "Virtual Rubik's cube of arbitrary size"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -122159,8 +122730,8 @@ self: { libraryHaskellDepends = [ base unix ]; librarySystemDepends = [ bluetooth cwiid ]; description = "Library to interface with the wiimote"; - license = stdenv.lib.licenses.gpl2; - platforms = [ "i686-linux" "x86_64-linux" ]; + license = lib.licenses.gpl2; + platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ]; }) {bluetooth = null; inherit (pkgs) cwiid;}; "hdaemonize" = callPackage @@ -122175,7 +122746,7 @@ self: { base bytestring extensible-exceptions filepath hsyslog mtl unix ]; description = "Library to handle the details of writing daemons for UNIX"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hdaemonize-buildfix" = callPackage @@ -122190,8 +122761,8 @@ self: { base extensible-exceptions filepath hsyslog mtl unix ]; description = "Library to handle the details of writing daemons for UNIX"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -122208,8 +122779,8 @@ self: { vector ]; description = "Deserialize from HDBC rows to FromJSON instances"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -122221,8 +122792,8 @@ self: { sha256 = "034zsmqgavh4ns69f6j4a1afyqbd1b7h35macmf20vzxj0j0bawj"; libraryHaskellDepends = [ attoparsec base containers HDBC text ]; description = "Manipulate data in PostgreSQL \"hstore\" columns"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -122261,8 +122832,8 @@ self: { time uuid ]; description = "Haskell Database Independent interface"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -122283,8 +122854,8 @@ self: { resourcet test-framework test-framework-quickcheck2 transformers ]; description = "Conduit glue for HDBI"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -122312,8 +122883,8 @@ self: { test-framework-quickcheck2 text time uuid ]; description = "PostgreSQL driver for hdbi"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -122333,8 +122904,8 @@ self: { test-framework text ]; description = "SQlite driver for HDBI"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -122354,8 +122925,8 @@ self: { test-framework-hunit test-framework-quickcheck2 text time uuid ]; description = "test suite for testing HDBI"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -122375,8 +122946,8 @@ self: { network process syb time transformers unix ]; description = "Persistent GHC powered background server for FAST haskell development tools"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -122395,7 +122966,7 @@ self: { ]; description = "HDF: Uniform Rate Audio Signal Processing in Haskell"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -122416,7 +122987,7 @@ self: { libraryToolDepends = [ c2hs ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "High-level bindings to the HDF5 \"lite\" interface"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) hdf5;}; "hdiff" = callPackage @@ -122448,8 +123019,8 @@ self: { prettyprinter-ansi-terminal QuickCheck text ]; description = "Pattern-Expression-based differencing of arbitrary types"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -122464,8 +123035,8 @@ self: { base cgi Crypto network parsec random time ]; description = "Server-side HTTP Digest (RFC2617) in the CGI monad"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -122484,8 +123055,8 @@ self: { executableHaskellDepends = [ array base haskell98 pretty ]; executableToolDepends = [ happy ]; description = "An IDL compiler for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -122497,8 +123068,8 @@ self: { sha256 = "0qr8d4qbvkncv4im0iwwdr9khvkyy4ky8wnwxri1jqhylcq8vdks"; libraryHaskellDepends = [ base bytestring containers QuickCheck ]; description = "Interface to the udis86 disassembler for x86 and x86-64 / AMD64"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -122511,8 +123082,8 @@ self: { libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ markdown ]; description = "Haskell bindings to the Discount markdown library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {markdown = null;}; @@ -122526,8 +123097,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base directory process unix vty ]; description = "a small display manager"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -122555,8 +123126,8 @@ self: { unordered-containers vector ]; description = "A Digital Ocean client in Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -122581,8 +123152,8 @@ self: { ]; testHaskellDepends = [ base containers mtl ]; description = "Haskell docs tool"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -122609,8 +123180,8 @@ self: { network-transport-tcp random template-haskell time ]; description = "Haskell distributed parallel Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -122626,8 +123197,8 @@ self: { array base bytestring cereal containers deepseq template-haskell ]; description = "Explicit closures in Haskell distributed parallel Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -122647,8 +123218,8 @@ self: { ]; benchmarkHaskellDepends = [ base criterion deepseq primitive ]; description = "Haskell implementation of High Dynamic Range (HDR) Histograms"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -122664,7 +123235,7 @@ self: { base case-insensitive megaparsec parser-combinators selective ]; description = "More informative parser"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "headergen" = callPackage @@ -122683,8 +123254,8 @@ self: { time ]; description = "Creates a header for a haskell source file"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -122712,7 +123283,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "License Header Manager"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "heap" = callPackage @@ -122724,7 +123295,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck ]; description = "Heaps in Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "heap-console" = callPackage @@ -122742,8 +123313,8 @@ self: { testHaskellDepends = [ base hspec ]; testToolDepends = [ hspec-discover ]; description = "interactively inspect Haskell values at runtime"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -122755,7 +123326,7 @@ self: { sha256 = "0vg39qm8g69n10ys9v9knnaq5dqdjndj6ffy0xb78bwrr3rm5mci"; libraryHaskellDepends = [ base ]; description = "Asymptotically optimal Brodal/Okasaki heaps"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "heapsize" = callPackage @@ -122773,7 +123344,7 @@ self: { ]; benchmarkHaskellDepends = [ base criterion deepseq primitive ]; description = "Determine the size of runtime data structures"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "heapsort" = callPackage @@ -122786,8 +123357,8 @@ self: { isExecutable = true; executableHaskellDepends = [ array base ]; description = "Heapsort of MArrays as a demo of imperative programming"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -122803,8 +123374,8 @@ self: { base co-log co-log-core ekg ekg-core ekg-statsd heart-core text ]; description = "An opinionated app prelude and framework in the UnliftIO style"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -122824,8 +123395,8 @@ self: { unliftio-core unordered-containers ]; description = "An opinionated library prelude in the UnliftIO style"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -122837,8 +123408,8 @@ self: { sha256 = "059dx7paaniwmxgyzapv0542jf8yb4vzbg8501d2j779ixvzm80d"; libraryHaskellDepends = [ async base io-streams time ]; description = "Heartbeats for io-streams"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -122868,8 +123439,8 @@ self: { vector ]; description = "Find and annotate ITDs"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -122893,8 +123464,8 @@ self: { pipes pipes-text safe text turtle vector ]; description = "Find and annotate ITDs with assembly or read pair joining"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -122913,7 +123484,7 @@ self: { text ]; description = "Compression and decompression using heatshrink"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "heavy-log-shortcuts" = callPackage @@ -122928,8 +123499,8 @@ self: { base fast-logger heavy-logger monad-control text text-format-heavy ]; description = "Simle api for heavy logger"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -122951,8 +123522,8 @@ self: { thread-local-storage transformers-base ]; description = "Full-weight logging based on fast-logger"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -122968,8 +123539,8 @@ self: { amazonka-core base binary heavy-logger template-haskell text ]; description = "heavy-logger compatibility with amazonka-core logging"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -122990,8 +123561,8 @@ self: { text text-format-heavy ]; description = "Orphan instances for data types in heavy-logger package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -123004,8 +123575,8 @@ self: { libraryHaskellDepends = [ base time ]; testHaskellDepends = [ base hspec QuickCheck time ]; description = "Hebrew dates and prayer times"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -123018,8 +123589,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base cereal crypto-api hF2 ]; description = "Elliptic Curve Cryptography for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -123032,7 +123603,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "Oh heck, it's a heckin' case conversion library"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "heckle" = callPackage @@ -123051,8 +123622,8 @@ self: { ]; executableHaskellDepends = [ base directory process split ]; description = "Jekyll in Haskell (feat. LaTeX)"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -123077,7 +123648,7 @@ self: { base containers mmorph mtl pretty-show text transformers ]; description = "Release with confidence"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hedgehog-checkers" = callPackage @@ -123092,8 +123663,8 @@ self: { base containers hedgehog semigroupoids semigroups ]; testHaskellDepends = [ base either hedgehog ]; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -123105,8 +123676,8 @@ self: { sha256 = "0zfk967xzpwfh3y3ys8d0c3zcz251dnp41xha11613ji3yfk0wff"; libraryHaskellDepends = [ base hedgehog hedgehog-checkers lens ]; testHaskellDepends = [ base hedgehog hedgehog-checkers lens ]; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -123127,7 +123698,7 @@ self: { aeson base binary comonad containers hedgehog vector ]; description = "Hedgehog will eat your typeclass bugs"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hedgehog-corpus" = callPackage @@ -123138,7 +123709,7 @@ self: { sha256 = "194pj8mjia5v4mc0hcyxgipf15j0dr44w02r1bcf89b4b8vnk5hq"; libraryHaskellDepends = [ base ]; description = "hedgehog-corpus"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hedgehog-fakedata" = callPackage @@ -123150,8 +123721,8 @@ self: { libraryHaskellDepends = [ base fakedata hedgehog random ]; testHaskellDepends = [ base containers fakedata hedgehog ]; description = "Use 'fakedata' with 'hedgehog'"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -123167,7 +123738,7 @@ self: { base contravariant hedgehog transformers ]; description = "Function generation for `hedgehog`"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hedgehog-gen" = callPackage @@ -123180,7 +123751,7 @@ self: { base bytestring hedgehog text typerep-map ]; description = "Customizable Gen for ADT using Generics"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hedgehog-gen-json" = callPackage @@ -123204,8 +123775,8 @@ self: { timerep tz unordered-containers vector ]; description = "JSON generators for Hedgehog"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -123217,8 +123788,8 @@ self: { sha256 = "1166jwk3f4bfw54qaxk3q3gxrfmffwwfkmd8xyvwj7i3whwzxq0f"; libraryHaskellDepends = [ base hedgehog ]; description = "GHC Generics automatically derived hedgehog generators"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -123236,8 +123807,8 @@ self: { ]; testHaskellDepends = [ base hedgehog ]; description = "Golden testing capabilities for hedgehog using Aeson"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -123251,7 +123822,7 @@ self: { editedCabalFile = "0ddmwz3ngamij2k4paf7508dnzqn4qjpgwypbpr8d6s2y95jbvfh"; libraryHaskellDepends = [ base hedgehog QuickCheck transformers ]; description = "Use QuickCheck generators in Hedgehog and vice versa"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hedgehog-servant" = callPackage @@ -123274,8 +123845,8 @@ self: { string-conversions text ]; description = "Hedgehog property testing for Servant APIs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -123288,8 +123859,8 @@ self: { }: mkDerivation { pname = "hedis"; - version = "0.14.0"; - sha256 = "114k87mi7manyqa90vjjjlfbdwpg3g3dxiwc16v2zyrw56n28mfv"; + version = "0.14.1"; + sha256 = "0n7hwg8mp4v512g7s8cblmai0j00l1149bbdacm6s7d0plnk0qqd"; libraryHaskellDepends = [ async base bytestring bytestring-lexing containers deepseq errors exceptions HTTP mtl network network-uri resource-pool scanner stm @@ -123301,7 +123872,7 @@ self: { ]; benchmarkHaskellDepends = [ base mtl time ]; description = "Client library for the Redis datastore: supports full command set, pipelining"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hedis-config" = callPackage @@ -123316,8 +123887,8 @@ self: { aeson base bytestring hedis scientific text time ]; description = "Easy trivial configuration for Redis"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -123328,7 +123899,7 @@ self: { version = "0.1.0.1"; sha256 = "165a7pw1i1i9gxljmx03zavza5qjyir09bwk067cfr5an9razvq6"; libraryHaskellDepends = [ base envy hedis scientific time ]; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hedis-monadic" = callPackage @@ -123344,7 +123915,7 @@ self: { transformers-compat ]; description = "A la MonadReader for Redis connection"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hedis-namespace" = callPackage @@ -123359,8 +123930,8 @@ self: { executableHaskellDepends = [ base bytestring hedis mtl ]; testHaskellDepends = [ base ]; description = "Initial project template from stack"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -123382,8 +123953,8 @@ self: { test-framework test-framework-hunit transformers ]; description = "Caching mandatory data with Redis"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -123395,8 +123966,8 @@ self: { sha256 = "1dq7rpqg35caqj664q2ndqgd59mq7cfjahkaka5mlk1k5yjvz7av"; libraryHaskellDepends = [ base bytestring either hedis mtl ]; description = "A simplified API for hedis"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -123414,8 +123985,8 @@ self: { test-framework-hunit transformers ]; description = "Tags for hedis"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -123437,7 +124008,7 @@ self: { base containers hedgehog megaparsec text time uuid-types vector ]; description = "EDN parsing and encoding"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hedn-functor" = callPackage @@ -123454,8 +124025,8 @@ self: { base containers hedn recursion-schemes text vector ]; description = "Base functor for EDN AST"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -123471,8 +124042,8 @@ self: { executableHaskellDepends = [ base haskeline ]; testHaskellDepends = [ base doctest ]; description = "A small library and executable for generating dice rolls"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -123498,8 +124069,8 @@ self: { testHaskellDepends = [ base tasty tasty-hspec ]; benchmarkHaskellDepends = [ base criterion weigh ]; description = "Tidy data in Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -123518,8 +124089,8 @@ self: { transformers ]; description = "An extensible build helper for haskell, in the vein of leiningen"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -123562,7 +124133,7 @@ self: { vector xmlhtml ]; description = "An Haskell template system supporting both HTML5 and XML"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "heist-aeson" = callPackage @@ -123578,8 +124149,8 @@ self: { vector xmlhtml ]; description = "Use JSON directly from Heist templates"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -123593,8 +124164,8 @@ self: { base heist template-haskell text xmlhtml ]; description = "Adding support for asynchronous updates (\"AJAX\") with heist"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -123617,7 +124188,7 @@ self: { executableToolDepends = [ alex happy ]; description = "Typechecking terms of the Edinburgh Logical Framework (LF)"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "helics" = callPackage @@ -123640,8 +124211,8 @@ self: { newrelic-collector-client newrelic-common newrelic-transaction ]; description = "New Relic® agent SDK wrapper for Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {newrelic-collector-client = null; newrelic-common = null; newrelic-transaction = null;}; @@ -123660,8 +124231,8 @@ self: { base bytestring data-default-class helics vault wai ]; description = "New Relic® agent SDK wrapper for wai"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -123675,8 +124246,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base containers mtl parsec process ]; description = "An incomplete Elisp compiler"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -123701,7 +124272,7 @@ self: { ]; description = "The Helium Compiler"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -123717,7 +124288,7 @@ self: { base bytestring deepseq lifted-base mtl random text transformers ]; description = "A backwards-compatible, modern replacement for the Prelude"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "helix" = callPackage @@ -123741,8 +124312,8 @@ self: { aeson base hspec hspec-wai hspec-wai-json text wai ]; description = "Web development micro framework for haskell with typesafe URLs"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -123767,8 +124338,8 @@ self: { ]; executableHaskellDepends = [ base transformers utf8-string ]; description = "A Haskell shell based on shell-conduit"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -123788,8 +124359,8 @@ self: { mtl network regex-pcre safe stm tar utf8-string zlib ]; description = "Distributed hackage mirror"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -123814,8 +124385,8 @@ self: { base containers Lucu mtl network regex-posix ]; description = "Simple, distributed, anonymous data sharing network"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -123829,7 +124400,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base ]; description = "Hello World, an example package"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "helm" = callPackage @@ -123851,7 +124422,7 @@ self: { executableHaskellDepends = [ base linear random ]; testHaskellDepends = [ base hspec ]; description = "A functionally reactive game engine"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "help-esb" = callPackage @@ -123867,8 +124438,8 @@ self: { uuid ]; description = "A Haskell client for the Help.com team's ESB."; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -123886,8 +124457,8 @@ self: { array base binary bytestring hemkay-core portaudio ]; description = "A module music mixer and player"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -123899,7 +124470,7 @@ self: { sha256 = "0br41879jynw3dzb2hlb07m55zmzgyim6gi8i48bzimbi70c9z89"; libraryHaskellDepends = [ array base binary bytestring ]; description = "A device independent module music mixer"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hemokit" = callPackage @@ -123928,8 +124499,8 @@ self: { testHaskellDepends = [ base bytestring hspec HUnit vector ]; benchmarkHaskellDepends = [ base conduit criterion mtl ]; description = "Haskell port of the Emokit EEG project"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -123950,8 +124521,8 @@ self: { transformers uuid ]; description = "Haskell bindings to Xen hypervisor interface"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {xenctrl = null;}; @@ -123966,8 +124537,8 @@ self: { base bitset bytestring network typesafe-endian ]; description = "Bindings and high level interface for to ENet v1.3.9"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -123979,8 +124550,8 @@ self: { sha256 = "0b7syzfzbcznjb98hi4k8bp46ss08s9qg2763bnnm1b10i7km23z"; libraryHaskellDepends = [ bytestring haskell2010 lha ]; description = "HEPEVT parser"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -123992,8 +124563,8 @@ self: { sha256 = "1hbx48r8zdmyr5qjf0b3pagmamj8pibsp7ca7bxdgk4jz8pxv2my"; libraryHaskellDepends = [ base mtl split ]; description = "A lexer for Haskell source code"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -124005,8 +124576,8 @@ self: { sha256 = "1gkcd9ikaxjirxh8haq8b9a372n1dlaq63n9xzq9gsyazkxz7lgn"; libraryHaskellDepends = [ base her-lexer parsec transformers ]; description = "Parsec frontend to \"her-lexer\" for Haskell source code"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -124024,8 +124595,8 @@ self: { base containers ghc-prim indents mtl parsec regex-posix ]; description = "HAML to ERB translator"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -124084,8 +124655,8 @@ self: { ]; doHaddock = false; description = "Runs Continuous Integration tasks on your machines"; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ roberth ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ roberth ]; }) {bdw-gc = null; inherit (pkgs) boost; inherit (pkgs) nix;}; "hercules-ci-api-agent" = callPackage @@ -124115,8 +124686,8 @@ self: { time uuid ]; description = "API definition for Hercules CI Agent to talk to hercules-ci.com or Hercules CI Enterprise"; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ roberth ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ roberth ]; }) {}; "hercules-ci-api-core" = callPackage @@ -124138,8 +124709,8 @@ self: { string-conv swagger2 text time uuid ]; description = "Types and convenience modules use across Hercules CI API packages"; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ roberth ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ roberth ]; }) {}; "here" = callPackage @@ -124154,7 +124725,7 @@ self: { base haskell-src-meta mtl parsec template-haskell ]; description = "Here docs & interpolated strings via quasiquotation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "heredoc" = callPackage @@ -124165,7 +124736,7 @@ self: { sha256 = "0h0g2f7yscwl1ba1yn3jnz2drvd6ns9m910hwlmq3kdq3k39y3f9"; libraryHaskellDepends = [ base template-haskell ]; description = "multi-line string / here document using QuasiQuotes"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "heredocs" = callPackage @@ -124181,8 +124752,8 @@ self: { ]; testHaskellDepends = [ base bytestring doctest text ]; description = "Heredocument on Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -124195,7 +124766,7 @@ self: { libraryHaskellDepends = [ base time ]; testHaskellDepends = [ base doctest ]; description = "haskell time manipulation in a 'kerf like' style"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hermit" = callPackage @@ -124224,8 +124795,8 @@ self: { temporary ]; description = "Haskell Equational Reasoning Model-to-Implementation Tunnel"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -124241,8 +124812,8 @@ self: { base containers ghc ghc-prim hermit syb template-haskell ]; description = "HERMIT plugin for optimizing Scrap-Your-Boilerplate traversals"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -124263,8 +124834,8 @@ self: { mtl optparse-applicative semigroups split vty ]; description = "A command-line manager for delicious kitchen recipes"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -124279,7 +124850,7 @@ self: { libraryHaskellDepends = [ base random text ]; executableHaskellDepends = [ base random text ]; description = "Think back of the five tenets of hero club"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "heroku" = callPackage @@ -124291,7 +124862,7 @@ self: { libraryHaskellDepends = [ base network-uri text ]; testHaskellDepends = [ base hspec network-uri text ]; description = "helpers for deploying to Heroku"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "heroku-persistent" = callPackage @@ -124307,7 +124878,7 @@ self: { ]; testHaskellDepends = [ base hspec persistent-postgresql ]; description = "Parse DATABASE_URL into configuration types for Persistent"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "herringbone" = callPackage @@ -124326,8 +124897,8 @@ self: { transformers unix-compat ]; description = "A library for compiling and serving static web assets"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -124344,8 +124915,8 @@ self: { system-filepath template-haskell text ]; description = "Embed preprocessed web assets in your executable with Template Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -124362,8 +124933,8 @@ self: { system-filepath text time wai wai-app-static ]; description = "Wai adapter for the Herringbone web asset preprocessor"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -124390,8 +124961,8 @@ self: { process text time uniplate unix ]; description = "the Haskell Extensible Shell: Haskell for Bash-style scripts"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -124410,7 +124981,7 @@ self: { ]; description = "Haskell's embedded SQL"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -124431,8 +125002,8 @@ self: { base criterion deepseq hvect template-haskell vinyl ]; description = "Fast heterogeneous data structures"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -124444,7 +125015,7 @@ self: { sha256 = "1fnzj37kya5gqjchm3yq0709ay50n0spb24x5rxkxfbl0yy2nzk7"; libraryHaskellDepends = [ base ]; description = "Pure heterogeneous maps"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "heterocephalus" = callPackage @@ -124462,7 +125033,7 @@ self: { ]; testHaskellDepends = [ base doctest Glob ]; description = "A type-safe template engine for working with front end development tools"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "heterogeneous-list-literals" = callPackage @@ -124474,8 +125045,8 @@ self: { libraryHaskellDepends = [ base Only ]; testHaskellDepends = [ base ]; description = "Allows the use of tuples as literals for Heterogeneous collections"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -124493,8 +125064,8 @@ self: { base constraint-manip hspec indextype polydata ]; description = "A heterogeneous list type"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -124512,7 +125083,7 @@ self: { executableSystemDepends = [ ncurses ]; description = "Text Tetris"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) ncurses;}; @@ -124527,8 +125098,8 @@ self: { base containers deepseq parallel random text ]; description = "A genetic programming based on tree structure"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -124576,7 +125147,7 @@ self: { ]; testSystemDepends = [ secp256k1 ]; description = "Ethereum virtual machine evaluator"; - license = stdenv.lib.licenses.agpl3; + license = lib.licenses.agpl3Only; }) {inherit (pkgs) libff; inherit (pkgs) secp256k1;}; "hevolisa" = callPackage @@ -124592,8 +125163,8 @@ self: { base bytestring cairo filepath haskell98 ]; description = "Genetic Mona Lisa problem in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -124612,8 +125183,8 @@ self: { base bytestring cairo dph-seq filepath haskell98 ]; description = "Genetic Mona Lisa problem in Haskell - using Data Parallel Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -124625,7 +125196,7 @@ self: { sha256 = "1mc66758254d93m7vab7q6lhn7qphzxd6wyc3v6yq1diy0gji4va"; libraryHaskellDepends = [ base bytestring ]; description = "Convert strings into hexadecimal and back"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hex-text" = callPackage @@ -124638,8 +125209,8 @@ self: { libraryHaskellDepends = [ base base16-bytestring bytestring text ]; testHaskellDepends = [ base doctest ]; description = "ByteString-Text hexidecimal conversions"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -124651,8 +125222,8 @@ self: { sha256 = "1bx49z3ycc24bsn0x0617x0gmgapan6qnwnwq6v0w06gjrahr4r4"; libraryHaskellDepends = [ base containers ]; description = "Haskell scripting interface for HexChat"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -124665,7 +125236,7 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base ]; description = "A library for forming hexdumps"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "hexif" = callPackage @@ -124676,8 +125247,8 @@ self: { sha256 = "1asv5vs694mcifffvm5a4gsplpz7frk3p3zr9lqqv1f172ql9lql"; libraryHaskellDepends = [ base binary bytestring filepath ]; description = "Reading Exif data form a JPEG file with Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -124696,8 +125267,8 @@ self: { random ]; description = "A small game based on domino-like hexagonal tiles"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -124710,7 +125281,7 @@ self: { libraryHaskellDepends = [ base bytestring extra ]; testHaskellDepends = [ base bytestring ]; description = "XML subset DOM parser"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hexml-lens" = callPackage @@ -124730,8 +125301,8 @@ self: { base bytestring doctest hexml hspec lens QuickCheck wreq ]; description = "Lenses for the hexml package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -124749,7 +125320,7 @@ self: { ]; librarySystemDepends = [ expat ]; description = "XML parser/formatter based on expat"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) expat;}; "hexpat-iteratee" = callPackage @@ -124766,8 +125337,8 @@ self: { List parallel transformers ]; description = "Chunked XML parsing using iteratees"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -124783,7 +125354,7 @@ self: { base bytestring deepseq hexpat hexpat-tagsoup lens ]; description = "Lenses for Hexpat"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hexpat-pickle" = callPackage @@ -124799,7 +125370,7 @@ self: { utf8-string ]; description = "XML picklers based on hexpat, source-code-similar to those of the HXT package"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hexpat-pickle-generic" = callPackage @@ -124816,8 +125387,8 @@ self: { test-framework-quickcheck2 ]; description = "Picklers for de/serialising Generic data types to and from XML"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -124833,7 +125404,7 @@ self: { base bytestring hexpat List mtl parser-combinators text transformers ]; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hexpat-tagsoup" = callPackage @@ -124844,7 +125415,7 @@ self: { sha256 = "0481446ba5m0h8lxmp216gzll0wr77mhk6hvm087749fwjj597aj"; libraryHaskellDepends = [ base hexpat tagsoup ]; description = "Parse (possibly malformed) HTML to hexpat tree"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hexpr" = callPackage @@ -124858,8 +125429,8 @@ self: { base data-ref either mtl parsec transformers ]; description = "A framework for symbolic, homoiconic languages"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -124877,8 +125448,8 @@ self: { mime-types mtl text transformers vault wai warp ]; description = "An express-like http framework"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -124894,8 +125465,8 @@ self: { base bytestring containers parsec template-haskell ]; description = "Hexadecimal ByteString literals, with placeholders that bind variables"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -124913,7 +125484,7 @@ self: { ]; testHaskellDepends = [ base binary bytestring hspec text ]; description = "Fast and safe representation of a hex string"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hext" = callPackage @@ -124929,8 +125500,8 @@ self: { ]; executableHaskellDepends = [ base text ]; description = "a text classification library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -124942,7 +125513,7 @@ self: { sha256 = "0iq6kj7mijxppjghpqx19s79sj6k1jqf21gfi8jqbj6bq7j2cdvj"; libraryHaskellDepends = [ base ]; description = "Generic and niche utility functions and more for Haskell"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "hextream" = callPackage @@ -124965,8 +125536,8 @@ self: { tasty tasty-golden tasty-hunit text ]; description = "Streaming-friendly XML parsers"; - license = stdenv.lib.licenses.cc0; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.cc0; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -124998,8 +125569,8 @@ self: { utf8-string wai wai-extra warp ]; description = "A server for Eye-Fi SD cards"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -125021,8 +125592,8 @@ self: { universe-base ]; description = "Heyting and Boolean algebras"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -125038,8 +125609,8 @@ self: { librarySystemDepends = [ doublefann ]; libraryPkgconfigDepends = [ fann ]; description = "Haskell binding to the FANN library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {doublefann = null; fann = null;}; @@ -125058,8 +125629,8 @@ self: { MonadCatchIO-transformers network transformers ]; description = "Flash debugger"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -125075,8 +125646,8 @@ self: { libraryHaskellDepends = [ base eprocess mtl ]; executableHaskellDepends = [ wx wxcore ]; description = "Four in a Row in Haskell!!"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -125088,7 +125659,7 @@ self: { sha256 = "0lmjgwgfp1s2ag2fbi6n8yryafb5qz87yb0p122lxzm3487sf98h"; libraryHaskellDepends = [ base containers template-haskell text ]; description = "Command line flag parser, very similar to Google's gflags"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "hfmt" = callPackage @@ -125117,8 +125688,8 @@ self: { base HUnit test-framework test-framework-hunit ]; description = "Haskell source code formatter"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -125138,8 +125709,8 @@ self: { ]; executableHaskellDepends = [ base ]; description = "Hess-Smith panel code for inviscid 2-d airfoil analysis"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -125156,7 +125727,7 @@ self: { ]; testHaskellDepends = [ base base-unicode-symbols hspec text ]; description = "Simple Haskell formatting"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hfov" = callPackage @@ -125167,8 +125738,8 @@ self: { sha256 = "04qwmjxm06akvpakc5imcx0ls9zlsz74s4r9p7xzj0q5fv20z09l"; libraryHaskellDepends = [ base ]; description = "Field-of-view calculation for low-resolution 2D raster grids"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -125187,8 +125758,8 @@ self: { gd GLUT OpenGL OpenGLRaw ]; description = "OpenGL fractal renderer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -125204,7 +125775,7 @@ self: { librarySystemDepends = [ Cocoa ]; libraryToolDepends = [ CoreServices ]; description = "File/folder watching for OS X"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; platforms = [ "x86_64-darwin" ]; }) {inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;}; @@ -125219,8 +125790,8 @@ self: { base containers haskell-src mtl pretty syb ]; description = "A library for fusing a subset of Haskell programs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -125240,7 +125811,7 @@ self: { ]; description = "Tools to help manage Debian packages with Mercurial"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -125263,8 +125834,8 @@ self: { sha256 = "08a8lmh1rg3d1rmpfhcc2fzyc0kybqhzahx4hrvfrqjw7czcnmrw"; libraryHaskellDepends = [ array base haskell98 mtl ]; description = "Haskell Genetic Algorithm Library"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -125283,8 +125854,8 @@ self: { test-framework test-framework-hunit ]; description = "GDB Machine Interface: program-driven control of GDB"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -125302,8 +125873,8 @@ self: { transformers transformers-base unordered-containers ]; description = "A Gearman client for Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -125320,7 +125891,7 @@ self: { ]; description = "Random generation of modal and hybrid logic formulas"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -125332,8 +125903,8 @@ self: { sha256 = "0l460mmbla7354dldil0d7qzba7dp4jhhsna0s27gdd9aad4flsd"; libraryHaskellDepends = [ base containers ]; description = "A geometric library with bindings to GPC"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -125360,7 +125931,7 @@ self: { ]; testHaskellDepends = [ base doctest doctest-discover QuickCheck ]; description = "Geometric Algorithms, Data structures, and Data types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hgeometry-combinatorial" = callPackage @@ -125391,7 +125962,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Data structures, and Data types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hgeometry-ipe" = callPackage @@ -125423,8 +125994,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Reading and Writing ipe7 files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -125445,8 +126016,8 @@ self: { ]; testHaskellDepends = [ base doctest ]; description = "Writing geometric primitives from HGeometry as SVG Files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -125461,8 +126032,8 @@ self: { librarySystemDepends = [ geos ]; testHaskellDepends = [ base MissingH ]; description = "Simple Haskell bindings to GEOS C API"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) geos;}; @@ -125485,8 +126056,8 @@ self: { base Cabal containers deepseq filepath haskell-src-exts uniplate ]; description = "Bindings to libintl.h (gettext, bindtextdomain)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -125510,8 +126081,8 @@ self: { testHaskellDepends = [ base hspec spherical ]; doHaddock = false; description = "Library and for GIS with Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -125532,8 +126103,8 @@ self: { ]; executableHaskellDepends = [ base cmdargs directory ]; description = "Haskell bindings to the GitHub API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -125550,7 +126121,7 @@ self: { ]; description = "Various animations generated using HGL"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {HTam = null;}; @@ -125558,15 +126129,13 @@ self: { ({ mkDerivation, base, ghc-prim, integer-gmp, QuickCheck }: mkDerivation { pname = "hgmp"; - version = "0.1.1"; - sha256 = "1hisbcpz47x2lbqf8vzwis7qw7xhvx22lv7dcyhm9vsmsh5741dr"; - revision = "4"; - editedCabalFile = "00rg7f223716dlqk0w92ixnyj7a9imj6yqcs5qx833jv7lk8lbyj"; + version = "0.1.2"; + sha256 = "1sqnywh4h1nklcpci60n427m1kahkza1vy1j60jmq3lnlrbgzfzk"; libraryHaskellDepends = [ base ghc-prim integer-gmp ]; testHaskellDepends = [ base QuickCheck ]; description = "Haskell interface to GMP"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -125586,7 +126155,7 @@ self: { ]; description = "An haskell port of the java version of gom"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -125598,8 +126167,8 @@ self: { sha256 = "0j6ybi8f5csa9rpbpy8dc9p6l6vf2qh2zk589a9nqj2phllz7mwf"; libraryHaskellDepends = [ base bytestring network ]; description = "Gopher server"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -125622,8 +126191,8 @@ self: { ansi-terminal base optparse-applicative ]; description = "Search Haskell source code from the command line"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -125639,7 +126208,7 @@ self: { aeson base bytestring directory filepath process template-haskell ]; description = "Compile Mercurial (hg) version info into Haskell code"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hgrib" = callPackage @@ -125657,8 +126226,8 @@ self: { libraryToolDepends = [ c2hs ]; testHaskellDepends = [ base directory hspec ]; description = "Unofficial bindings for GRIB API"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {grib_api = null;}; @@ -125671,8 +126240,8 @@ self: { libraryHaskellDepends = [ base ]; librarySystemDepends = [ harp ]; description = "Binding to libharp"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {harp = null;}; @@ -125699,8 +126268,8 @@ self: { ghc-boot hlint hspec process syb ]; description = "Happy Haskell Programming"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -125714,8 +126283,8 @@ self: { setupHaskellDepends = [ base Cabal directory ]; libraryHaskellDepends = [ base ]; description = "Bindings to https://www.open-mpi.org/projects/hwloc"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -125746,7 +126315,7 @@ self: { temporary text time ]; description = "Generate scaffold for cabal project"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hi-file-parser" = callPackage @@ -125760,7 +126329,7 @@ self: { libraryHaskellDepends = [ base binary bytestring rio vector ]; testHaskellDepends = [ base binary bytestring hspec rio vector ]; description = "Parser for GHC's hi files"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hi3status" = callPackage @@ -125780,8 +126349,8 @@ self: { ]; executableHaskellDepends = [ base dbus process ]; description = "Status line for i3bar"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -125802,7 +126371,7 @@ self: { ]; description = "Relatively efficient Tcl interpreter with support for basic operations"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -125817,7 +126386,7 @@ self: { executableHaskellDepends = [ array base bytestring mtl network ]; description = "haskell robot for IChat protocol"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -125831,7 +126400,7 @@ self: { libraryPkgconfigDepends = [ hidapi ]; libraryToolDepends = [ c2hs ]; description = "Interface to hidapi library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) hidapi;}; "hid-examples" = callPackage @@ -125865,8 +126434,8 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq ]; doHaddock = false; description = "Examples to accompany the book \"Haskell in Depth\""; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -125883,7 +126452,7 @@ self: { ]; librarySystemDepends = [ systemd ]; description = "Haskell bindings to HIDAPI"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {inherit (pkgs) systemd;}; "hidden-char" = callPackage @@ -125897,8 +126466,8 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "Provides cross-platform getHiddenChar function"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -125929,7 +126498,7 @@ self: { unordered-containers yaml ]; description = "Set up a GHC API session"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hie-compat" = callPackage @@ -125945,7 +126514,7 @@ self: { transformers ]; description = "HIE files for GHC 8.6 and other HIE file backports"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "hie-core" = callPackage @@ -125981,35 +126550,35 @@ self: { parser-combinators tasty tasty-hunit text ]; description = "The core of an IDE"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; "hiedb" = callPackage - ({ mkDerivation, algebraic-graphs, array, base, bytestring - , containers, directory, filepath, ghc, ghc-paths, hie-compat - , hspec, lucid, mtl, optparse-applicative, process, sqlite-simple - , terminal-size, text, time + ({ mkDerivation, algebraic-graphs, ansi-terminal, array, base + , bytestring, containers, directory, extra, filepath, ghc + , ghc-paths, hie-compat, hspec, lucid, mtl, optparse-applicative + , process, sqlite-simple, temporary, text }: mkDerivation { pname = "hiedb"; - version = "0.1.0.0"; - sha256 = "0bzhg7dambm97qk3r9p2k0kd4qbllghfxiannjiqnwmar7c4zaxw"; + version = "0.3.0.1"; + sha256 = "1ci68q5r42rarmj12vrmggnj7c7jb8sw3wnmzrq2gn7vqhrr05jc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - algebraic-graphs array base bytestring containers directory - filepath ghc hie-compat lucid mtl optparse-applicative - sqlite-simple terminal-size text time + algebraic-graphs ansi-terminal array base bytestring containers + directory extra filepath ghc hie-compat lucid mtl + optparse-applicative sqlite-simple text ]; executableHaskellDepends = [ base ghc-paths ]; testHaskellDepends = [ - base directory filepath ghc ghc-paths hspec process + base directory filepath ghc ghc-paths hspec process temporary ]; description = "Generates a references DB from .hie files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -126021,8 +126590,8 @@ self: { sha256 = "11fjfmdjzvid0352d346p5xf44bl7dn8bd8pms5pi34xysdyr7pg"; libraryHaskellDepends = [ base containers HUnit mtl multiset ]; description = "Automated clustering of arbitrary elements in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -126036,7 +126605,7 @@ self: { libraryHaskellDepends = [ array base containers ]; testHaskellDepends = [ base hspec HUnit QuickCheck ]; description = "Fast algorithms for single, average/UPGMA and complete linkage clustering"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hierarchical-clustering-diagrams" = callPackage @@ -126055,8 +126624,8 @@ self: { HUnit ]; description = "Draw diagrams of dendrograms made by hierarchical-clustering"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -126068,8 +126637,8 @@ self: { sha256 = "1yzhw7kgz5iljm8ndh5kyr18367cl6l120m1gkn5x9hpsh9mlamm"; libraryHaskellDepends = [ base template-haskell ]; description = "Template Haskell functions to easily create exception hierarchies"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -126100,8 +126669,8 @@ self: { filepath hmatrix lens optparse-generic safe text text-show vector ]; description = "Hierarchical spectral clustering of a graph"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -126124,8 +126693,8 @@ self: { transformers-compat ]; description = "Predicated traversal of generated trees"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -126141,8 +126710,8 @@ self: { base directory filepath mtl old-time stm timers-updatable ]; description = "Notification library for a filesystem hierarchy"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -126163,27 +126732,30 @@ self: { executableHaskellDepends = [ base cmdargs ]; testHaskellDepends = [ base ]; description = "WiFi connection script generator"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "higgledy" = callPackage - ({ mkDerivation, barbies, base, doctest, generic-lens, hspec, lens - , markdown-unlit, named, QuickCheck + ({ mkDerivation, barbies, base, base-compat, Cabal, cabal-doctest + , doctest, generic-lens, generic-lens-core, hspec, lens + , markdown-unlit, named, QuickCheck, template-haskell }: mkDerivation { pname = "higgledy"; - version = "0.3.1.0"; - sha256 = "0az05c14l7k9nsfkh4qwpqf1dwlnapgkf5s1v6yfr1rjba0r4bmw"; + version = "0.4.1.0"; + sha256 = "1z67vip2appsl4f2qf70pqdnyjp6byaa4n3x8scp1aa94hg1xj3h"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - barbies base generic-lens named QuickCheck + barbies base generic-lens generic-lens-core named QuickCheck ]; testHaskellDepends = [ - barbies base doctest hspec lens named QuickCheck + barbies base base-compat doctest hspec lens named QuickCheck + template-haskell ]; testToolDepends = [ markdown-unlit ]; description = "Partial types as a type constructor"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -126199,7 +126771,7 @@ self: { executableHaskellDepends = [ base ghc ]; description = "Memory usage statistics"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -126223,7 +126795,7 @@ self: { transformers transformers-base unliftio ]; description = "A rich monadic API for working with leveldb databases"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "higherorder" = callPackage @@ -126236,8 +126808,8 @@ self: { editedCabalFile = "0nflwfx4gng0kk2lxfsrrk10sgjln7jq4zl3ydv8i0n4m472b1y5"; libraryHaskellDepends = [ base ]; description = "Some higher order functions for Bool and []"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -126255,8 +126827,8 @@ self: { aeson base bytestring criterion deepseq text ]; description = "Spec based JSON parsing/serialisation"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -126275,8 +126847,8 @@ self: { aeson base bytestring highjson hspec lens QuickCheck swagger2 text ]; description = "Derive swagger instances from highjson specs"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -126297,8 +126869,8 @@ self: { QuickCheck swagger2 text ]; description = "Template Haskell helpers for highjson specs"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -126330,7 +126902,7 @@ self: { ]; benchmarkHaskellDepends = [ base criterion ]; description = "Command line tool for highlighting parts of files matching a regex"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "highlight-versions" = callPackage @@ -126346,8 +126918,8 @@ self: { ansi-terminal base Cabal containers hackage-db ]; description = "Highlight package versions which differ from the latest version on Hackage"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -126365,7 +126937,7 @@ self: { base blaze-html bytestring filepath mtl pcre-light text ]; description = "source code highlighting"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "highlighter2" = callPackage @@ -126382,7 +126954,7 @@ self: { base blaze-html bytestring containers filepath mtl pcre-light text ]; description = "source code highlighting"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "highlighting-kate" = callPackage @@ -126423,7 +126995,7 @@ self: { transformers ]; description = "Generate STL models from SRTM elevation data"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "himerge" = callPackage @@ -126442,7 +127014,7 @@ self: { ]; description = "Haskell Graphical User Interface for Emerge"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {mozembed = null;}; @@ -126463,8 +127035,8 @@ self: { base bytestring directory gtk HTTP http-conduit network temporary ]; description = "Simple gtk2hs image viewer. Point it at an image and fire away."; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -126486,8 +127058,8 @@ self: { unordered-containers vector ]; description = "multithreaded snmp poller for riemann"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -126522,8 +127094,8 @@ self: { haskell-src-exts mtl utf8-string ]; description = "Extensible Haskell pretty printer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -126540,8 +127112,8 @@ self: { ]; testHaskellDepends = [ base containers hspec ]; description = "Template for Hindley-Milner based languages"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -126557,7 +127129,7 @@ self: { base containers deepseq hinduce-missingh parallel vector ]; description = "Apriori algorithm for association rule mining"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hinduce-classifier" = callPackage @@ -126568,8 +127140,8 @@ self: { sha256 = "1cdx916xkpsy2ilsmmdkyqax2gb0cx6sgkydvjbiw7qibd76ylza"; libraryHaskellDepends = [ base hinduce-missingh layout ]; description = "Interface and utilities for classifiers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -126587,8 +127159,8 @@ self: { base convertible hinduce-classifier hinduce-missingh layout ]; description = "Decision Tree Classifiers for hInduce"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -126608,8 +127180,8 @@ self: { layout vector ]; description = "Example data for hInduce"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -126621,7 +127193,7 @@ self: { sha256 = "1606fz8qhvwqidi798y3mxlmbmwn8yp3a4cl59j4i8s05vgbaj9z"; libraryHaskellDepends = [ base ]; description = "Utility functions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hinfo" = callPackage @@ -126640,7 +127212,7 @@ self: { ]; testHaskellDepends = [ aeson base optparse-applicative text yaml ]; description = "Command Line App With Info on your Haskell App"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hinit" = callPackage @@ -126670,8 +127242,8 @@ self: { base fused-effects path-io quickcheck-text ]; description = "Generic project initialization tool"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -126686,8 +127258,8 @@ self: { libraryHaskellDepends = [ async base containers directory unix ]; testHaskellDepends = [ base directory ]; description = "Haskell binding to inotify"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "hinotify" = callPackage @@ -126701,7 +127273,7 @@ self: { libraryHaskellDepends = [ async base bytestring containers unix ]; testHaskellDepends = [ base bytestring directory unix ]; description = "Haskell binding to inotify"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hinotify-bytestring" = callPackage @@ -126719,7 +127291,7 @@ self: { base bytestring directory posix-paths unix utf8-string ]; description = "Haskell binding to inotify, using ByteString filepaths"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hinquire" = callPackage @@ -126739,8 +127311,8 @@ self: { test-framework-quickcheck2 test-framework-th ]; description = "Generate armet style query strings"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -126757,7 +127329,7 @@ self: { ]; description = "Installer wrapper for Haskell applications"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -126778,7 +127350,7 @@ self: { base containers directory exceptions filepath HUnit stm unix ]; description = "Runtime Haskell interpreter (GHC API wrapper)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hint-server" = callPackage @@ -126793,8 +127365,8 @@ self: { base eprocess exceptions hint monad-loops mtl ]; description = "A server process that runs hint"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -126816,8 +127388,8 @@ self: { base directory exceptions extensible-exceptions filepath HUnit unix ]; description = "Runtime Haskell interpreter (GHC API wrapper)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -126844,8 +127416,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Haskell / Erlang interoperability library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -126861,7 +127433,7 @@ self: { executableHaskellDepends = [ base haskell98 random ]; description = "Space Invaders"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -126873,8 +127445,8 @@ self: { sha256 = "137jjwcs3a9n2zybkqqfdy2m1a2ahpdcmficwfmn7ykdz487xcsq"; libraryHaskellDepends = [ base haskell98 Stream ]; description = "Streams and Unique Fixed Points"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -126899,8 +127471,8 @@ self: { base criterion deepseq repa repa-algorithms vector ]; description = "Haskell Image Processing (HIP) Library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -126925,8 +127497,8 @@ self: { wreq ]; description = "A library for building HipChat Bots"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -126945,8 +127517,8 @@ self: { string-conversions text time ]; description = "Hipchat API bindings in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -126962,8 +127534,8 @@ self: { base containers hgeometry hxt parsec split text text-format ]; description = "Support for reading and writing ipe7 files (http://ipe7.sourceforge.net)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -126979,7 +127551,7 @@ self: { base bytestring directory functors mtl ]; description = "an IPS patcher"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hircules" = callPackage @@ -126998,7 +127570,7 @@ self: { ]; description = "IRC client"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -127019,8 +127591,8 @@ self: { vector-space ]; description = "Calculates IRT 2PL and 3PL models"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -127036,8 +127608,8 @@ self: { base bytestring conduit http-conduit http-types text time ]; description = "Unofficial API bindings to KISSmetrics"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -127061,8 +127633,8 @@ self: { hist-pl-fusion hist-pl-lexicon hist-pl-lmf pipes polimorf ]; description = "Umbrella package for the historical dictionary of Polish"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -127077,8 +127649,8 @@ self: { base binary containers dawg text text-binary ]; description = "A generic, DAWG-based dictionary"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -127095,8 +127667,8 @@ self: { text text-binary ]; description = "Merging historical dictionary with PoliMorf"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -127113,8 +127685,8 @@ self: { hist-pl-types pipes text transformers ]; description = "A binary representation of the historical dictionary of Polish"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -127126,8 +127698,8 @@ self: { sha256 = "146vz15fig8k1wcvcw7fg64abxvg1nyarvhigz9jkzf5yngkzwvm"; libraryHaskellDepends = [ base hist-pl-types polysoup text ]; description = "LMF parsing for the historical dictionary of Polish"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -127139,7 +127711,7 @@ self: { sha256 = "146ywyh67a0hasgcpfmffrj8w1kg6anksaa3mm9f80k83shqhvrb"; libraryHaskellDepends = [ base parsec ]; description = "A simple EDSL for transliteration rules"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hist-pl-types" = callPackage @@ -127150,8 +127722,8 @@ self: { sha256 = "0i13aj1xcwap0k3w48vyiiganbvj93zydawmw3gw7m0kr6nl5l9v"; libraryHaskellDepends = [ base binary text text-binary ]; description = "Types in the historical dictionary of Polish"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -127166,7 +127738,7 @@ self: { libraryHaskellDepends = [ base deepseq ghc-prim primitive vector ]; benchmarkHaskellDepends = [ base criterion mwc-random vector ]; description = "Library for histograms creation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "histogram-fill-binary" = callPackage @@ -127177,7 +127749,7 @@ self: { sha256 = "0dkvdc5sbnarpdam9gg6q1rvc5xx51pga0whzf6mq81yjn2ydvqy"; libraryHaskellDepends = [ base binary histogram-fill vector ]; description = "Binary instances for histogram-fill package"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "histogram-fill-cereal" = callPackage @@ -127188,7 +127760,7 @@ self: { sha256 = "1kaj56b7cp2c4s0fdkirw48igy54zhdrcrjsjpyv4cnywq8nvqrq"; libraryHaskellDepends = [ base cereal histogram-fill vector ]; description = "Binary instances for histogram-fill package"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "historian" = callPackage @@ -127205,8 +127777,8 @@ self: { base containers directory filepath process regex-compat regex-posix ]; description = "Extract the interesting bits from shell history"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -127225,8 +127797,8 @@ self: { base bytestring containers git hashable hashtables hourglass ]; description = "Git like program in haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -127242,8 +127814,8 @@ self: { base containers fgl hashable hit transformers unordered-containers ]; description = "Use graph algorithms to access and manipulate Git repos"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -127265,8 +127837,8 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base github hspec text ]; description = "Haskell Git Helper Tool"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -127283,8 +127855,8 @@ self: { text unordered-containers vector ]; description = "Jcase library for Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -127296,7 +127868,7 @@ self: { sha256 = "0wmzxwi24q7r0yxnalzqnn3k0bzf7wc4ql26dv94pvzir156kahj"; libraryHaskellDepends = [ base containers hjson parsec ]; description = "XPath-like syntax for querying JSON"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hjs" = callPackage @@ -127314,8 +127886,8 @@ self: { array base bytestring containers directory mtl parsec regex-compat ]; description = "JavaScript Parser"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -127339,7 +127911,7 @@ self: { base directory extra filepath process unix ]; description = "Haskell implementation of a javascript minifier"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hjson" = callPackage @@ -127350,7 +127922,7 @@ self: { sha256 = "1r59g5ypqjsldflsddg7pzpa6j8jps5nwm4h9cwiw7qk734rjik8"; libraryHaskellDepends = [ base containers parsec ]; description = "JSON parsing library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hjson-query" = callPackage @@ -127361,8 +127933,8 @@ self: { sha256 = "0sj86rm5pz0q9079f5kjnpz51dxvvq72waaf8h64jzrrhkpz8mlx"; libraryHaskellDepends = [ base containers hjson ]; description = "library for querying from JSON"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -127384,8 +127956,8 @@ self: { vector ]; description = "JSON Pointer library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -127416,8 +127988,8 @@ self: { wai-app-static warp ]; description = "JSON Schema library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -127438,7 +128010,7 @@ self: { tasty-quickcheck text transformers unordered-containers ]; description = "Majority Judgment"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "hjugement-cli" = callPackage @@ -127467,8 +128039,8 @@ self: { time transformers unix unordered-containers ]; description = "Majority Judgment and Helios-C command line tool"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -127496,7 +128068,7 @@ self: { transformers ]; description = "A cryptographic protocol for the Majority Judgment"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "hkd" = callPackage @@ -127522,7 +128094,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ aeson base ]; description = "Apply default value for optional field of HKD"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hkd-delta" = callPackage @@ -127533,8 +128105,8 @@ self: { sha256 = "0qb20y6nca61h4mpgyhi6xfcwxf4q92pscr5zqd8yklfcz4qqyz9"; libraryHaskellDepends = [ base ]; description = "Definition of \"Delta structures\" for higher kinded data"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -127546,8 +128118,8 @@ self: { sha256 = "0s3siyp85k84c9j1srg8y78ia6yj9s6vls9y1hnkgsmg1mx755qg"; libraryHaskellDepends = [ base profunctors ]; description = "Generic lens/prism/traversal-kinded data"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -127560,7 +128132,7 @@ self: { libraryHaskellDepends = [ base byteable bytestring cryptohash ]; testHaskellDepends = [ base byteable bytestring cryptohash hspec ]; description = "Implementation of HKDF (RFC 5869)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hkgr" = callPackage @@ -127579,7 +128151,7 @@ self: { simple-cmd-args xdg-basedir ]; description = "Simple Hackage release workflow for package maintainers"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "hkt" = callPackage @@ -127594,8 +128166,8 @@ self: { base hspec inspection-testing protolude text ]; description = "A library for higher kinded types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -127615,7 +128187,7 @@ self: { template-haskell transformers uniplate utf8-string ]; description = "A library to build valid LaTeX files"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hlbfgsb" = callPackage @@ -127633,8 +128205,8 @@ self: { base HUnit test-framework test-framework-hunit vector ]; description = "Haskell binding to L-BFGS-B version 3.0"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) gfortran;}; @@ -127656,8 +128228,8 @@ self: { array base bytestring bytestring-csv containers haskell98 parallel ]; description = "Fast algorithm for mining closed frequent itemsets"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -127680,7 +128252,7 @@ self: { websockets ]; description = "Web Socket interface to Leap Motion controller"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hledger" = callPackage @@ -127694,8 +128266,8 @@ self: { }: mkDerivation { pname = "hledger"; - version = "1.20.2"; - sha256 = "1mk7d6ajwh5i9c8klgzk9j06yc8l24gi2nf6blyan14d9s7l85br"; + version = "1.20.3"; + sha256 = "1wy45ppcakml2wk021yr8kqv0q0x85vms8kx0npjawzbs498qqx9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -127723,8 +128295,8 @@ self: { utility-ht wizards ]; description = "Command-line interface for the hledger accounting system"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ peti ]; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ peti ]; }) {}; "hledger-api" = callPackage @@ -127748,8 +128320,8 @@ self: { wai-extra warp ]; description = "Web API server for the hledger accounting tool"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -127769,7 +128341,7 @@ self: { ]; description = "A pie chart image generator for the hledger accounting tool"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -127783,7 +128355,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base hledger-lib text time ]; description = "Compares the transactions in two ledger files"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "hledger-flow" = callPackage @@ -127806,7 +128378,7 @@ self: { base containers foldl HUnit path path-io stm text turtle ]; description = "An hledger workflow focusing on automated statement import and classification"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "hledger-iadd" = callPackage @@ -127841,7 +128413,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "A terminal UI as drop-in replacement for hledger add"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hledger-interest" = callPackage @@ -127859,8 +128431,8 @@ self: { base Cabal Decimal hledger-lib mtl text time ]; description = "computes interest for a given account"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ peti ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ peti ]; }) {}; "hledger-irr" = callPackage @@ -127878,8 +128450,8 @@ self: { text time ]; description = "computes the internal rate of return of an investment"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -127895,8 +128467,8 @@ self: { }: mkDerivation { pname = "hledger-lib"; - version = "1.20.2"; - sha256 = "10iz6jjkighsj00shw8hj22p14zp4dd9r7l4hmpbwql1hfz53g1b"; + version = "1.20.3"; + sha256 = "0pm6ckim1krkg4x7azspsnc1alwynqnjdhxrda764xyrz9s0r8cp"; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal array base base-compat-batteries blaze-markup bytestring call-stack cassava cassava-megaparsec @@ -127916,7 +128488,7 @@ self: { uglymemo unordered-containers utf8-string ]; description = "A reusable library providing the core functionality of hledger"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "hledger-makeitso" = callPackage @@ -127937,7 +128509,7 @@ self: { base containers foldl HUnit stm text turtle ]; description = "An hledger workflow focusing on automated statement import and classification"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "hledger-stockquotes" = callPackage @@ -127947,8 +128519,8 @@ self: { }: mkDerivation { pname = "hledger-stockquotes"; - version = "0.1.0.0"; - sha256 = "19xn7rzrg4nw1dfdfm1hn7k0wdwrw8416rn28inkbkbn1f9mqgk5"; + version = "0.1.1.0"; + sha256 = "1srgl70zsixbfgmh22psg7q4wqfiay2jiybyvml42iv712n7z8xx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -127960,7 +128532,7 @@ self: { base hedgehog tasty tasty-hedgehog tasty-hunit ]; description = "Generate HLedger Price Directives From Daily Stock Quotes"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hledger-ui" = callPackage @@ -127972,8 +128544,8 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.20.2"; - sha256 = "1ns1zjmpbxn3rg5ldplh57h0yfmas6bqa9z6nmk52bw9qf0b05zw"; + version = "1.20.3"; + sha256 = "02g6xdxif67fjj6rjskw69cxhx2irwv7sk0b1slr20nch122pzl1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -127983,8 +128555,8 @@ self: { split text text-zipper time transformers unix vector vty ]; description = "Curses-style terminal interface for the hledger accounting system"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ peti ]; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ peti ]; }) {}; "hledger-vty" = callPackage @@ -128002,7 +128574,7 @@ self: { ]; description = "A curses-style console interface for the hledger accounting tool"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -128019,8 +128591,8 @@ self: { }: mkDerivation { pname = "hledger-web"; - version = "1.20.2"; - sha256 = "0898nsd4y4fzk8ri4wxykcyvrb9165mkak392ir1b5nz19nys1xf"; + version = "1.20.3"; + sha256 = "1dz3lwp86dlmdrnj5hda12219x03xw8csxk0bjysn43rjzxag4q4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -128038,8 +128610,8 @@ self: { base hledger hledger-lib hspec text yesod yesod-test ]; description = "Web-based user interface for the hledger accounting system"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ peti ]; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ peti ]; }) {}; "hlibBladeRF" = callPackage @@ -128053,8 +128625,8 @@ self: { libraryPkgconfigDepends = [ libbladeRF ]; testHaskellDepends = [ base hlint ]; description = "Haskell binding to libBladeRF SDR library"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) libbladeRF;}; @@ -128070,7 +128642,7 @@ self: { libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base ]; description = "Bindings to https://github.com/anrieff/libcpuid"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hlibev" = callPackage @@ -128082,8 +128654,8 @@ self: { libraryHaskellDepends = [ base network ]; librarySystemDepends = [ ev ]; description = "FFI interface to libev"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {ev = null;}; @@ -128096,8 +128668,8 @@ self: { libraryHaskellDepends = [ base ]; librarySystemDepends = [ fam ]; description = "FFI interface to libFAM"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) fam;}; @@ -128112,7 +128684,7 @@ self: { testHaskellDepends = [ base process ]; testToolDepends = [ git ]; description = "Low-level bindings to libgit2"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {inherit (pkgs) git; inherit (pkgs) openssl;}; "hlibsass" = callPackage @@ -128127,7 +128699,7 @@ self: { librarySystemDepends = [ libsass ]; testHaskellDepends = [ base hspec ]; description = "Low-level bindings to Libsass"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {inherit (pkgs) libsass;}; "hlint" = callPackage @@ -128139,8 +128711,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "3.2.6"; - sha256 = "1i1qqqi6qdfa3py48cns6c41xn6qr8rsfg7rn4i22qr86zp8ikp5"; + version = "3.2.7"; + sha256 = "0z6gxndrh7blzapkdn6fq1pkbkjlmbgjbq9ydnvy2wm00fb3v73g"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -128152,8 +128724,8 @@ self: { ]; executableHaskellDepends = [ base ]; description = "Source code suggestions"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ maralorn ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ maralorn ]; }) {}; "hlint-test" = callPackage @@ -128167,7 +128739,7 @@ self: { libraryHaskellDepends = [ base hlint ]; executableHaskellDepends = [ base hlint ]; description = "Run hlint in test suite"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hlist" = callPackage @@ -128180,7 +128752,7 @@ self: { editedCabalFile = "0qcvl0krnhyvvn857p1b6mc65mglbplywcmx8n8vb8ikw5vhkh68"; libraryHaskellDepends = [ base ]; description = "Heterogeneous list"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hlivy" = callPackage @@ -128197,8 +128769,8 @@ self: { resourcet text transformers unordered-containers ]; description = "Client library for the Apache Livy REST API"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -128210,8 +128782,8 @@ self: { sha256 = "1q3jsnxy7x0lv7wqfv9hlqnr22661k4agbb8yjbhj32fxyjqrn4f"; libraryHaskellDepends = [ base old-locale time ]; description = "Simple, concurrent, extendable and easy-to-use logging library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -128230,8 +128802,8 @@ self: { base bytestring curl regex-base regex-posix ]; description = "Library and utility interfacing to longurl.org"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -128249,8 +128821,8 @@ self: { hlrdb-core memory random store time unordered-containers zstd ]; description = "High-level Redis Database"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -128269,8 +128841,8 @@ self: { unordered-containers ]; description = "High-level Redis Database Core API"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -128284,7 +128856,125 @@ self: { libraryHaskellDepends = [ base containers hcg-minus hps ]; description = "Haskell Lindenmayer Systems"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + + "hls-class-plugin" = callPackage + ({ mkDerivation, aeson, base, containers, ghc, ghc-exactprint + , ghcide, haskell-lsp, hls-plugin-api, lens, shake, text + , transformers, unordered-containers + }: + mkDerivation { + pname = "hls-class-plugin"; + version = "0.1.0.1"; + sha256 = "198r8kly4fgm9xsngkzhljbq1j764asc0xba757zasmgndvri2r7"; + libraryHaskellDepends = [ + aeson base containers ghc ghc-exactprint ghcide haskell-lsp + hls-plugin-api lens shake text transformers unordered-containers + ]; + description = "Class/instance management plugin for Haskell Language Server"; + license = lib.licenses.asl20; + }) {}; + + "hls-eval-plugin" = callPackage + ({ mkDerivation, aeson, base, containers, deepseq, Diff, directory + , extra, filepath, ghc, ghc-boot-th, ghc-paths, ghcide, hashable + , haskell-lsp, haskell-lsp-types, hls-plugin-api + , parser-combinators, pretty-simple, QuickCheck, safe-exceptions + , shake, temporary, text, time, transformers, unordered-containers + }: + mkDerivation { + pname = "hls-eval-plugin"; + version = "0.1.0.5"; + sha256 = "1vfsvhn7b5w537hsri6bz36c547pxv13jyjvj1a5934jzyzvv9qn"; + libraryHaskellDepends = [ + aeson base containers deepseq Diff directory extra filepath ghc + ghc-boot-th ghc-paths ghcide hashable haskell-lsp haskell-lsp-types + hls-plugin-api parser-combinators pretty-simple QuickCheck + safe-exceptions shake temporary text time transformers + unordered-containers + ]; + description = "Eval plugin for Haskell Language Server"; + license = lib.licenses.asl20; + }) {}; + + "hls-exactprint-utils" = callPackage + ({ mkDerivation, base, dlist, ghc, ghc-exactprint, ghcide + , haskell-lsp-types, hls-plugin-api, retrie, syb, text + , transformers + }: + mkDerivation { + pname = "hls-exactprint-utils"; + version = "0.5.0.1"; + sha256 = "16d2hi50197mz4nc0zfdizs9i431a89j99klyv6yxmdmxjpf9cx2"; + libraryHaskellDepends = [ + base dlist ghc ghc-exactprint ghcide haskell-lsp-types + hls-plugin-api retrie syb text transformers + ]; + description = "Common utilities to interaction between ghc-exactprint and HLS plugins"; + license = lib.licenses.asl20; + }) {}; + + "hls-explicit-imports-plugin" = callPackage + ({ mkDerivation, aeson, base, containers, deepseq, ghc, ghcide + , haskell-lsp-types, hls-plugin-api, shake, text + , unordered-containers + }: + mkDerivation { + pname = "hls-explicit-imports-plugin"; + version = "0.1.0.0"; + sha256 = "0il51ndiw16h5kgclwzx8p1pwv6ph808406bh52nq1bjyadlwkk2"; + libraryHaskellDepends = [ + aeson base containers deepseq ghc ghcide haskell-lsp-types + hls-plugin-api shake text unordered-containers + ]; + description = "Explicit imports plugin for Haskell Language Server"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + + "hls-haddock-comments-plugin" = callPackage + ({ mkDerivation, base, containers, ghc, ghc-exactprint, ghcide + , haskell-lsp-types, hls-plugin-api, text, unordered-containers + }: + mkDerivation { + pname = "hls-haddock-comments-plugin"; + version = "0.1.0.0"; + sha256 = "12zs6yq39jpg3x6w9y5a5jri5rfh8qpxawdhmhiqm067zjnj9xi4"; + revision = "1"; + editedCabalFile = "0kddmrlmcsa1d22mqzw1wsh82x4nn0ff4xbwci7585i9z61mzhg2"; + libraryHaskellDepends = [ + base containers ghc ghc-exactprint ghcide haskell-lsp-types + hls-plugin-api text unordered-containers + ]; + description = "Haddock comments plugin for Haskell Language Server"; + license = lib.licenses.asl20; + }) {}; + + "hls-hlint-plugin" = callPackage + ({ mkDerivation, aeson, apply-refact, base, binary, bytestring + , containers, data-default, deepseq, Diff, directory, extra + , filepath, ghc, ghcide, hashable, haskell-lsp, hlint + , hls-plugin-api, hslogger, lens, regex-tdfa, shake, temporary + , text, transformers, unordered-containers + }: + mkDerivation { + pname = "hls-hlint-plugin"; + version = "0.1.0.0"; + sha256 = "1sjbdzdrl4r0ar75z5znrv5iyim2hmf52c6r5hgmyn7wmhzbpvnq"; + revision = "1"; + editedCabalFile = "1al6a1kzhymxrpq5mvz1nlyhfcnjsz3ygqkafa8llb6hzsff6m7s"; + libraryHaskellDepends = [ + aeson apply-refact base binary bytestring containers data-default + deepseq Diff directory extra filepath ghc ghcide hashable + haskell-lsp hlint hls-plugin-api hslogger lens regex-tdfa shake + temporary text transformers unordered-containers + ]; + description = "Hlint integration plugin with Haskell Language Server"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -128297,13 +128987,81 @@ self: { pname = "hls-plugin-api"; version = "0.6.0.0"; sha256 = "0dnd20mb0id0l2dz6j3ckfrjyfm3mjys0kf11z3a684i4bc0w1pi"; + revision = "2"; + editedCabalFile = "0726nm80c7xfg6bxac32bg8yjszw5b0fq27jsg0w7dg2rg4zy1ji"; libraryHaskellDepends = [ aeson base containers data-default Diff hashable haskell-lsp hslogger lens process regex-tdfa shake text unix unordered-containers ]; description = "Haskell Language Server API for plugin communication"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; + }) {}; + + "hls-retrie-plugin" = callPackage + ({ mkDerivation, aeson, base, containers, deepseq, directory, extra + , ghc, ghcide, hashable, haskell-lsp, haskell-lsp-types + , hls-plugin-api, retrie, safe-exceptions, shake, text + , transformers, unordered-containers + }: + mkDerivation { + pname = "hls-retrie-plugin"; + version = "0.1.0.0"; + sha256 = "1h928dvycyj4lxhn73zv58hgvc4yccr5dv7bbc6nsq62762f75j4"; + libraryHaskellDepends = [ + aeson base containers deepseq directory extra ghc ghcide hashable + haskell-lsp haskell-lsp-types hls-plugin-api retrie safe-exceptions + shake text transformers unordered-containers + ]; + description = "Retrie integration plugin for Haskell Language Server"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + + "hls-splice-plugin" = callPackage + ({ mkDerivation, aeson, base, containers, dlist, foldl, ghc + , ghc-exactprint, ghcide, haskell-lsp, hls-exactprint-utils + , hls-plugin-api, lens, retrie, shake, syb, text, transformers + , unordered-containers + }: + mkDerivation { + pname = "hls-splice-plugin"; + version = "0.1.0.0"; + sha256 = "10zqgczp1mx81ac8fh59dp1hipfh09w4hnxylqjhj6c6wzgwa4cj"; + libraryHaskellDepends = [ + aeson base containers dlist foldl ghc ghc-exactprint ghcide + haskell-lsp hls-exactprint-utils hls-plugin-api lens retrie shake + syb text transformers unordered-containers + ]; + description = "HLS Plugin to expand TemplateHaskell Splices and QuasiQuotes"; + license = lib.licenses.asl20; + }) {}; + + "hls-tactics-plugin" = callPackage + ({ mkDerivation, aeson, base, checkers, containers, deepseq + , directory, extra, filepath, fingertree, generic-lens, ghc + , ghc-boot-th, ghc-exactprint, ghc-source-gen, ghcide, haskell-lsp + , hie-bios, hls-plugin-api, hspec, hspec-discover, lens, mtl + , QuickCheck, refinery, retrie, shake, syb, text, transformers + }: + mkDerivation { + pname = "hls-tactics-plugin"; + version = "0.5.1.0"; + sha256 = "150hbhdj0rxiyslqfvwzqiyyc0pdvkbfjizv33ldbq8gmwn6lf52"; + libraryHaskellDepends = [ + aeson base containers deepseq directory extra filepath fingertree + generic-lens ghc ghc-boot-th ghc-exactprint ghc-source-gen ghcide + haskell-lsp hls-plugin-api lens mtl refinery retrie shake syb text + transformers + ]; + testHaskellDepends = [ + base checkers containers ghc hie-bios hls-plugin-api hspec mtl + QuickCheck + ]; + testToolDepends = [ hspec-discover ]; + description = "Tactics plugin for Haskell Language Server"; + license = lib.licenses.asl20; }) {}; "hlwm" = callPackage @@ -128318,8 +129076,8 @@ self: { isExecutable = true; libraryHaskellDepends = [ base stm transformers unix X11 ]; description = "Bindings to the herbstluftwm window manager"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -128335,7 +129093,7 @@ self: { ]; description = "Haskell LilyPond"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -128354,8 +129112,8 @@ self: { ]; executableHaskellDepends = [ base ]; description = "A tool and library for Markov chains based text generation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -128369,8 +129127,8 @@ self: { base containers mtl network parsec xhtml ]; description = "Simple wikitext-like markup format implementation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -128390,7 +129148,7 @@ self: { ]; librarySystemDepends = [ openblasCompat ]; description = "Numeric Linear Algebra"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) openblasCompat;}; "hmatrix-backprop" = callPackage @@ -128412,7 +129170,7 @@ self: { microlens microlens-platform vector-sized vinyl ]; description = "hmatrix operations lifted for backprop"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hmatrix-banded" = callPackage @@ -128426,8 +129184,8 @@ self: { libraryHaskellDepends = [ base hmatrix transformers ]; librarySystemDepends = [ liblapack ]; description = "HMatrix interface to LAPACK functions for banded matrices"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {liblapack = null;}; @@ -128439,7 +129197,7 @@ self: { sha256 = "0cbnxzl9ymqnyrikwk13d660l3hmi4ln5zdx0q814k8b7hyvsnkb"; libraryHaskellDepends = [ base bytestring cassava hmatrix vector ]; description = "CSV encoding and decoding for hmatrix"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hmatrix-glpk" = callPackage @@ -128451,7 +129209,7 @@ self: { libraryHaskellDepends = [ base containers hmatrix ]; librarySystemDepends = [ glpk ]; description = "Linear Programming based on GLPK"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {inherit (pkgs) glpk;}; "hmatrix-gsl" = callPackage @@ -128466,7 +129224,7 @@ self: { ]; libraryPkgconfigDepends = [ gsl ]; description = "Numerical computation"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {inherit (pkgs) gsl;}; "hmatrix-gsl-stats" = callPackage @@ -128482,7 +129240,7 @@ self: { ]; libraryPkgconfigDepends = [ gsl ]; description = "GSL Statistics interface"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) gsl;}; "hmatrix-mmap" = callPackage @@ -128493,8 +129251,8 @@ self: { sha256 = "03z1f1xqw4hqh41q6hh8p103cl7dg9hqcawqlinapfmkvw5mzy8d"; libraryHaskellDepends = [ base hmatrix mmap ]; description = "Memory map Vector from disk into memory efficiently"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -128515,7 +129273,7 @@ self: { ]; benchmarkHaskellDepends = [ base criterion hmatrix ]; description = "Low-level machine learning auxiliary functions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) blas; liblapack = null;}; "hmatrix-nipals" = callPackage @@ -128528,8 +129286,8 @@ self: { isExecutable = true; libraryHaskellDepends = [ base hmatrix ]; description = "NIPALS method for Principal Components Analysis on large data-sets"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -128542,7 +129300,7 @@ self: { libraryHaskellDepends = [ base hmatrix nlopt-haskell vector ]; testHaskellDepends = [ base doctest ]; description = "Interface HMatrix with the NLOPT minimizer"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hmatrix-quadprogpp" = callPackage @@ -128554,7 +129312,7 @@ self: { libraryHaskellDepends = [ base hmatrix vector ]; librarySystemDepends = [ QuadProgpp ]; description = "Bindings to the QuadProg++ quadratic programming library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) QuadProgpp;}; "hmatrix-repa" = callPackage @@ -128565,7 +129323,7 @@ self: { sha256 = "1gki1qp8gi8953iqq9i6nsxrjjgjqsq7q105icjp585f01la9hsi"; libraryHaskellDepends = [ base hmatrix repa vector ]; description = "Adaptors for interoperability between hmatrix and repa"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hmatrix-sparse" = callPackage @@ -128578,8 +129336,8 @@ self: { libraryHaskellDepends = [ base hmatrix ]; librarySystemDepends = [ mkl_core mkl_intel mkl_sequential ]; description = "Sparse linear solver"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {mkl_core = null; mkl_intel = null; mkl_sequential = null;}; @@ -128591,7 +129349,7 @@ self: { sha256 = "1mywr61kr852sbff26n9x95kswx9l4ycbv6s68qsbkh02xzqq7qz"; libraryHaskellDepends = [ base hmatrix hmatrix-gsl ]; description = "Interface to GSL special functions"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "hmatrix-static" = callPackage @@ -128607,7 +129365,7 @@ self: { ]; description = "hmatrix with vector and matrix sizes encoded in types"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -128635,8 +129393,8 @@ self: { base bytestring cassava clock hmatrix optparse-applicative ]; description = "hmatrix interface to sundials"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {sundials_arkode = null; sundials_cvode = null;}; @@ -128652,8 +129410,8 @@ self: { testHaskellDepends = [ base hmatrix hspec QuickCheck vector ]; benchmarkHaskellDepends = [ base criterion hmatrix vector ]; description = "SVDLIBC bindings for HMatrix"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -128669,8 +129427,8 @@ self: { base haskell-src-exts haskell-src-meta hmatrix template-haskell ]; description = "MATLAB-like syntax for hmatrix vectors and matrices"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -128688,8 +129446,8 @@ self: { testHaskellDepends = [ base HUnit QuickCheck random ]; benchmarkHaskellDepends = [ base HUnit QuickCheck random ]; description = "Tests for hmatrix"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -128706,7 +129464,7 @@ self: { base ghc-typelits-knownnat hedgehog hmatrix vector vector-sized ]; description = "Conversions between hmatrix and vector-sized types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hmeap" = callPackage @@ -128722,7 +129480,7 @@ self: { ]; description = "Haskell Meapsoft Parser"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -128743,7 +129501,7 @@ self: { ]; description = "Haskell Meapsoft Parser Utilities"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -128759,7 +129517,7 @@ self: { base binary containers monad-stm stm transformers ]; description = "In-memory relational database"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hmenu" = callPackage @@ -128772,8 +129530,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base MissingH process ]; description = "CLI fuzzy finder and launcher"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -128793,8 +129551,8 @@ self: { executableHaskellDepends = [ base probable vector ]; testHaskellDepends = [ base HUnit vector ]; description = "HMEP Multi Expression Programming – a genetic programming variant"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -128806,7 +129564,7 @@ self: { sha256 = "0q2b2hk6s0fnyw67yfrbmiv7m2cwdcz1q86zzcna4ci5gyv0j07d"; libraryHaskellDepends = [ base stm ]; description = "Binding to the OS level MIDI services"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hmk" = callPackage @@ -128826,7 +129584,7 @@ self: { ]; description = "A make alternative based on Plan9's mk"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -128842,8 +129600,8 @@ self: { array base data-memocombinators list-extras logfloat ]; description = "A hidden markov model library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -128862,8 +129620,8 @@ self: { ]; testHaskellDepends = [ base QuickCheck ]; description = "Hidden Markov Models using HMatrix primitives"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -128884,8 +129642,8 @@ self: { ]; testHaskellDepends = [ base QuickCheck ]; description = "Hidden Markov Models using LAPACK primitives"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -128907,7 +129665,7 @@ self: { executableSystemDepends = [ ncurses ]; description = "An ncurses mp3 player written in Haskell"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) ncurses;}; @@ -128941,7 +129699,7 @@ self: { libraryHaskellDepends = [ base integer-gmp ]; librarySystemDepends = [ mpfr ]; description = "Haskell binding to the MPFR library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) mpfr;}; "hmt" = callPackage @@ -128962,7 +129720,7 @@ self: { ]; description = "Haskell Music Theory"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -128981,7 +129739,7 @@ self: { ]; description = "Haskell Music Theory Diagrams"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -129001,7 +129759,7 @@ self: { ]; description = "Interpreter for the MUMPS langugae"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -129031,8 +129789,8 @@ self: { ]; testSystemDepends = [ netcdf ]; description = "Haskell NetCDF library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) netcdf;}; @@ -129089,7 +129847,7 @@ self: { template-haskell text time transformers unordered-containers ]; description = "Haskell implementation of the Nix language"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hnix-store-core" = callPackage @@ -129117,58 +129875,54 @@ self: { ]; testToolDepends = [ tasty-discover ]; description = "Core effects for interacting with the Nix store"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; - "hnix-store-core_0_4_0_0" = callPackage + "hnix-store-core_0_4_1_0" = callPackage ({ mkDerivation, algebraic-graphs, attoparsec, base , base16-bytestring, base64-bytestring, binary, bytestring, cereal , containers, cryptohash-md5, cryptohash-sha1, cryptohash-sha256 - , cryptohash-sha512, directory, filepath, hashable, io-streams - , lifted-base, monad-control, mtl, nix-derivation, process - , process-extras, saltine, tasty, tasty-discover, tasty-golden - , tasty-hspec, tasty-hunit, tasty-quickcheck, temporary, text, time - , unix, unordered-containers, vector + , cryptohash-sha512, directory, filepath, hashable, lifted-base + , monad-control, mtl, nix-derivation, process, saltine, tasty + , tasty-golden, tasty-hspec, tasty-hunit, tasty-quickcheck + , temporary, text, time, unix, unordered-containers, vector }: mkDerivation { pname = "hnix-store-core"; - version = "0.4.0.0"; - sha256 = "05fwh5y82qy4qzi32xgk8dmndd8r074rvfl2nxyg3f3ydqpcmmr2"; + version = "0.4.1.0"; + sha256 = "05yblps7x9r4hwszinx2s4rcfr8q1d1y6r29mn6jzydjwvdyhgj0"; libraryHaskellDepends = [ algebraic-graphs attoparsec base base16-bytestring - base64-bytestring binary bytestring cereal containers - cryptohash-md5 cryptohash-sha1 cryptohash-sha256 cryptohash-sha512 - directory filepath hashable lifted-base monad-control mtl - nix-derivation saltine text time unix unordered-containers vector + base64-bytestring bytestring cereal containers cryptohash-md5 + cryptohash-sha1 cryptohash-sha256 cryptohash-sha512 directory + filepath hashable lifted-base monad-control mtl nix-derivation + saltine text time unix unordered-containers vector ]; testHaskellDepends = [ attoparsec base base16-bytestring base64-bytestring binary - bytestring containers directory filepath io-streams process - process-extras tasty tasty-discover tasty-golden tasty-hspec - tasty-hunit tasty-quickcheck temporary text unix + bytestring containers directory filepath process tasty tasty-golden + tasty-hspec tasty-hunit tasty-quickcheck temporary text unix ]; - testToolDepends = [ tasty-discover ]; description = "Core effects for interacting with the Nix store"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; }) {}; "hnix-store-remote" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring, containers - , filepath, hnix-store-core, mtl, network, nix-derivation, text - , time, unix, unordered-containers, vector + , hnix-store-core, mtl, network, nix-derivation, text, time + , unordered-containers }: mkDerivation { pname = "hnix-store-remote"; - version = "0.4.0.0"; - sha256 = "0l9gb5b415im1bjrbx6k0ah92763hgm1ns6kxfl5mxwij52kzc32"; + version = "0.4.1.0"; + sha256 = "1w6x756hh7429ci2kdsl9psxbsq8k829x802dblv652d33wl0fkc"; libraryHaskellDepends = [ - attoparsec base binary bytestring containers filepath - hnix-store-core mtl network nix-derivation text time unix - unordered-containers vector + attoparsec base binary bytestring containers hnix-store-core mtl + network nix-derivation text time unordered-containers ]; description = "Remote hnix store"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "hnn" = callPackage @@ -129186,7 +129940,7 @@ self: { vector-binary-instances zlib ]; description = "A reasonably fast and simple neural network library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hnock" = callPackage @@ -129201,7 +129955,7 @@ self: { executableHaskellDepends = [ base text ]; testHaskellDepends = [ base ]; description = "A Nock interpreter"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hnop" = callPackage @@ -129214,7 +129968,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base ]; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "hnormalise" = callPackage @@ -129255,8 +130009,8 @@ self: { aeson attoparsec base criterion random text ]; description = "Log message normalisation tool producing structured JSON messages"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -129272,8 +130026,8 @@ self: { ]; testHaskellDepends = [ base compdata patch-combinators ]; description = "Generic rewrite rules with safe treatment of variables and binders"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -129291,8 +130045,8 @@ self: { old-locale random RSA SHA time utf8-string ]; description = "A Haskell implementation of OAuth 1.0a protocol."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -129313,7 +130067,7 @@ self: { uri-bytestring-aeson ]; description = "Haskell OAuth2 authentication client"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hob" = callPackage @@ -129340,8 +130094,8 @@ self: { base containers gtk3 gtksourceview3 hspec mtl text ]; description = "A source code editor aiming for the convenience of use"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -129359,8 +130113,8 @@ self: { base filemanip filepath fsnotify system-filepath text ]; description = "A small file watcher for OSX"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -129378,8 +130132,8 @@ self: { tagged template-haskell th-expand-syns transformers vector ]; description = "A library for canonically representing terms with binding"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -129399,8 +130153,8 @@ self: { testHaskellDepends = [ base bytestring tasty tasty-hunit ]; testSystemDepends = [ ocilib ]; description = "FFI binding to OCILIB"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {ocilib = null;}; @@ -129443,8 +130197,8 @@ self: { tasty-smallcheck text unordered-containers word8 ]; description = "Interact with the docker registry and generate nix build instructions"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -129457,7 +130211,7 @@ self: { libraryHaskellDepends = [ base hspec MissingH parsec split ]; testHaskellDepends = [ base hspec MissingH parsec split ]; description = "Small library for typesafe's configuration specification"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hodatime" = callPackage @@ -129480,8 +130234,8 @@ self: { ]; benchmarkHaskellDepends = [ base criterion random ]; description = "A fully featured date/time library based on Nodatime"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -129500,8 +130254,8 @@ self: { text time ]; description = "hoe: Haskell One-liner Evaluator"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -129514,7 +130268,7 @@ self: { libraryHaskellDepends = [ base mtl star-to-star template-haskell ]; description = "defining @mtl@-ready monads as * -> * fixed-points"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "hog" = callPackage @@ -129531,8 +130285,8 @@ self: { base cmdargs filepath irc network old-locale time unix ]; description = "Simple IRC logger bot"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -129550,8 +130304,8 @@ self: { array base bytestring containers HUnit mtl old-locale random time ]; description = "Library and tools to manipulate the Ogg container format"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -129577,8 +130331,8 @@ self: { optparse-applicative servant-client text time transformers ]; description = "Bindings to the Toggl.com REST API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -129594,8 +130348,8 @@ self: { libraryToolDepends = [ cgen cgen-hs grgen ]; doHaddock = false; description = "Haskell binding to a subset of OGRE"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {OGRE = null; OgreMain = null; cgen-hs = null; grgen = null;}; @@ -129611,8 +130365,8 @@ self: { executableHaskellDepends = [ base hogre ]; executableSystemDepends = [ OgreMain ]; description = "Examples for using Hogre"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {OgreMain = null;}; @@ -129628,8 +130382,8 @@ self: { librarySystemDepends = [ OIS ]; executableHaskellDepends = [ base X11 ]; description = "OIS bindings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {OIS = null;}; @@ -129643,7 +130397,7 @@ self: { editedCabalFile = "1xp8l236gflh5njl3s8f0d2ahqypks70pfjnawskc0fcnl818qpa"; libraryHaskellDepends = [ base either mtl ]; description = "Some convenience facilities for hoisting errors into a monad"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hol" = callPackage @@ -129673,8 +130427,8 @@ self: { transformers ]; description = "Higher order logic"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -129686,8 +130440,8 @@ self: { sha256 = "1j2ql6izsd85skd6l9j1qfg7pj5rf513096s9bkvqip9bb4ibr4r"; libraryHaskellDepends = [ base random safe ]; description = "An engine for Texas hold'em Poker"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -129699,8 +130453,8 @@ self: { sha256 = "05ba87wk9b5i5b4gsfvsj16rv91dqsmzyys6b5fkssrxh2ika36c"; libraryHaskellDepends = [ base containers ]; description = "Higher kinded type removal"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -129712,7 +130466,7 @@ self: { sha256 = "13f6f647ykssqgdqw4fp7gnr2ardxbcn41ksgs15v5dx1n1xvan1"; doHaddock = false; description = "None"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "holmes" = callPackage @@ -129736,7 +130490,7 @@ self: { ]; testToolDepends = [ markdown-unlit tasty-discover ]; description = "Tools and combinators for solving constraint problems"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "holy-project" = callPackage @@ -129770,8 +130524,8 @@ self: { ]; doCheck = false; description = "Start your Haskell project with cabal, git and tests"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -129783,8 +130537,8 @@ self: { sha256 = "1wm15bdz02sjgpz2n266xd50q3p6mncnv8mhimky6ps1kmzb5r6c"; libraryHaskellDepends = [ base containers mtl QuickCheck ]; description = "Homeomorphic Embedding Test"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -129798,8 +130552,8 @@ self: { array base directory haskell98 random time ]; description = "Haskell Offline Music Manipulation And Generation EDSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -129814,7 +130568,7 @@ self: { ]; description = "DirectSound extension (Windows) for the Hommage sound library"; license = "GPL"; - platforms = stdenv.lib.platforms.none; + platforms = [ "armv7l-linux" ]; }) {}; "homoiconic" = callPackage @@ -129826,8 +130580,8 @@ self: { libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base ]; description = "Constructs FAlgebras from typeclasses, making Haskell functions homoiconic"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -129842,7 +130596,7 @@ self: { setupHaskellDepends = [ base Cabal directory ]; libraryHaskellDepends = [ base OneTuple Only single-tuple ]; description = "Homotuple, all whose elements are the same type"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "homplexity" = callPackage @@ -129869,8 +130623,8 @@ self: { base filepath haskell-src-exts hspec template-haskell ]; description = "Haskell code quality tool"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -129884,7 +130638,7 @@ self: { isExecutable = true; libraryHaskellDepends = [ base hourglass split ]; executableHaskellDepends = [ base hourglass split ]; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "honi" = callPackage @@ -129900,8 +130654,8 @@ self: { testHaskellDepends = [ base hspec HUnit ]; testSystemDepends = [ freenect OpenNI2 ]; description = "OpenNI 2 binding"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {OpenNI2 = null; inherit (pkgs) freenect;}; @@ -129913,7 +130667,7 @@ self: { sha256 = "102jw5j89amgvz3k3b05plpw9pjkhg1rjpjpcvpxq11x8mfdxyhf"; libraryHaskellDepends = [ base ]; description = "Cross-platform interface to the PC speaker"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "hoobuddy" = callPackage @@ -129931,8 +130685,8 @@ self: { mtl process yaml ]; description = "Simple tool for fetching and merging hoogle data"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -129945,8 +130699,8 @@ self: { libraryHaskellDepends = [ array base FPretty ghc-prim ]; testHaskellDepends = [ base ghc-prim ]; description = "Debugging by observing in place"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -129958,8 +130712,8 @@ self: { sha256 = "15rj6qfyhihzc5svl3dwkn387x7bbkl5am7h0kj5jjj8hv2q1pnc"; libraryHaskellDepends = [ base ]; description = "Dummy package to disable Hood without having to remove all the calls to observe"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -129971,8 +130725,8 @@ self: { sha256 = "0iyi1zljywamfaqc0mbd1xw3gn1hq0lcdgx688rr8zliw23jix02"; libraryHaskellDepends = [ array base ]; description = "Debugging by observing in place"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -129990,8 +130744,8 @@ self: { array astar base containers hfov monad-loops mtl ncurses random ]; description = "A small, toy roguelike"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -130012,8 +130766,8 @@ self: { ]; executableHaskellDepends = [ base cmdargs hoodle-core ]; description = "Executable for hoodle"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -130030,8 +130784,8 @@ self: { strict text ]; description = "text builder for hoodle file format"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -130064,8 +130818,8 @@ self: { ]; librarySystemDepends = [ libX11 libXi ]; description = "Core library for hoodle"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXi;}; @@ -130091,8 +130845,8 @@ self: { unordered-containers xournal-parser ]; description = "extra hoodle tools"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -130110,8 +130864,8 @@ self: { lens mtl strict text transformers xournal-types ]; description = "Hoodle file parser"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -130138,8 +130892,8 @@ self: { base cmdargs directory directory-tree filepath gtk3 ]; description = "publish hoodle files as a static web site"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -130160,8 +130914,8 @@ self: { uuid ]; description = "Hoodle file renderer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -130178,8 +130932,8 @@ self: { vector ]; description = "Data types for programs for hoodle file format"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -130212,7 +130966,7 @@ self: { executableHaskellDepends = [ base ]; testTarget = "--test-option=--no-net"; description = "Haskell API Search"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hoogle-index" = callPackage @@ -130231,8 +130985,8 @@ self: { optparse-applicative process temporary transformers ]; description = "Easily generate Hoogle indices for installed packages"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -130244,8 +130998,8 @@ self: { sha256 = "0gwdqpml8kn8xxxaq628d4way29k2f31f5av49fx7qj150h5qs5b"; libraryHaskellDepends = [ base directory process text ]; description = "run executables in a directory as hooks"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -130262,7 +131016,7 @@ self: { network stm ]; description = "Abstraction over creating network connections with SOCKS5 and TLS"; - license = stdenv.lib.licenses.isc; + license = lib.licenses.isc; }) {}; "hoop" = callPackage @@ -130283,8 +131037,8 @@ self: { parsec pretty template-haskell text ]; description = "Object-Oriented Programming in Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -130304,8 +131058,8 @@ self: { test-framework-hunit ]; description = "A library to support dataflow analysis and optimization"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -130329,8 +131083,8 @@ self: { snap-core snap-server text time transformers unix xml ]; description = "Haskell Media Server"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -130347,8 +131101,8 @@ self: { libraryToolDepends = [ c2hs ]; testHaskellDepends = [ base QuickCheck ]; description = "Haskell binding to libopencc"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) opencc;}; @@ -130368,8 +131122,8 @@ self: { test-framework-quickcheck2 ]; description = "Haskell bindings for OpenCL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {OpenCL = null;}; @@ -130401,7 +131155,7 @@ self: { ]; executableToolDepends = [ alex happy ]; description = "hOpenPGP-based command-line tools"; - license = stdenv.lib.licenses.agpl3Plus; + license = lib.licenses.agpl3Plus; }) {}; "hopenssl" = callPackage @@ -130416,8 +131170,8 @@ self: { librarySystemDepends = [ openssl ]; testHaskellDepends = [ base bytestring HUnit ]; description = "FFI Bindings to OpenSSL's EVP Digest Interface"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ peti ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ peti ]; }) {inherit (pkgs) openssl;}; "hopfield" = callPackage @@ -130448,8 +131202,8 @@ self: { QuickCheck random vector ]; description = "Hopfield Networks, Boltzmann Machines and Clusters"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {MagickCore = null; inherit (pkgs) imagemagick;}; @@ -130472,7 +131226,7 @@ self: { test-framework-quickcheck2 vector ]; description = "Hopfield Networks for unsupervised learning in Haskell"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hopfli" = callPackage @@ -130486,7 +131240,7 @@ self: { libraryHaskellDepends = [ base bytestring zlib ]; testHaskellDepends = [ base bytestring hspec QuickCheck zlib ]; description = "Bidings to Google's Zopfli compression library"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "hoppy-docs" = callPackage @@ -130500,8 +131254,8 @@ self: { base haskell-src hoppy-generator hoppy-runtime ]; description = "C++ FFI generator - Documentation"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.agpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -130518,8 +131272,8 @@ self: { process temporary text ]; description = "C++ FFI generator - Code generator"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.agpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -130533,8 +131287,8 @@ self: { base Cabal containers directory filepath ]; description = "C++ FFI generator - Runtime support"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -130549,8 +131303,8 @@ self: { base filepath haskell-src hoppy-generator ]; description = "C++ FFI generator - Standard library bindings"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -130583,8 +131337,8 @@ self: { filepath process QuickCheck text transformers vector ]; description = "Handy Operations on Power Series"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -130604,8 +131358,8 @@ self: { ]; executableToolDepends = [ alex happy ]; description = "A language based on homotopy type theory with an interval type"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -130623,7 +131377,7 @@ self: { timezone-series ]; description = "date time"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "horizon" = callPackage @@ -130634,8 +131388,8 @@ self: { sha256 = "1qx27i0xlrgcrdzp6lc06skipj888cfdxwwfrd7fyig48jn3wyd4"; libraryHaskellDepends = [ AC-Angle base time ]; description = "Sunrise and sunset UTC approximations from latitude and longitude coordinates"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -130654,8 +131408,8 @@ self: { ]; executableHaskellDepends = [ base optparse-applicative text ]; description = "Rename function definitions returned by SMT solvers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -130673,7 +131427,7 @@ self: { time transformers ]; description = "Haskell Open Sound Control"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "hosc-json" = callPackage @@ -130692,7 +131446,7 @@ self: { ]; description = "Haskell Open Sound Control JSON Serialisation"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -130714,7 +131468,7 @@ self: { ]; description = "Haskell Open Sound Control Utilities"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {www-minus = null;}; @@ -130733,7 +131487,7 @@ self: { hashable iproute microlens-th text ]; description = "Network Host Addresses"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hostname" = callPackage @@ -130744,7 +131498,7 @@ self: { sha256 = "0p6gm4328946qxc295zb6vhwhf07l1fma82vd0siylnsnsqxlhwv"; libraryHaskellDepends = [ base ]; description = "A very simple package providing a cross-platform means of determining the hostname"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hostname-validate" = callPackage @@ -130755,7 +131509,7 @@ self: { sha256 = "0my8g4kqf9mz7ii79ff53rwkx3yv9kkn4jbm60q4b7g1rzhb3bvz"; libraryHaskellDepends = [ attoparsec base bytestring ]; description = "Validate hostnames e.g. localhost or foo.co.uk."; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hosts-server" = callPackage @@ -130772,8 +131526,8 @@ self: { attoparsec base bytestring data-default dns iproute network ]; description = "An dns server which is extremely easy to config"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -130792,8 +131546,8 @@ self: { haskell-src-exts optparse-applicative split ]; description = "Generates ctags for Haskell, incorporating import lists and qualified imports"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -130805,8 +131559,8 @@ self: { sha256 = "1c614gvwypfqaj4gqsdimqq40i34w393vikq5hhy3d4qll2qp8hv"; libraryHaskellDepends = [ base plugins ]; description = "Simple code hotswapping"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -130826,7 +131580,7 @@ self: { base bytestring deepseq gauge mtl old-locale time ]; description = "simple performant time related library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hourglass-fuzzy-parsing" = callPackage @@ -130837,8 +131591,8 @@ self: { sha256 = "188mw1z8n650y3qik98x2m70sr8q66x4l4pg34mirk6kg4mgzy37"; libraryHaskellDepends = [ base hourglass parsec ]; description = "A small library for parsing more human friendly date/time formats"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -130855,7 +131609,7 @@ self: { aeson base hourglass hspec hspec-expectations text ]; description = "Orphan Aeson instances to hourglass"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "houseman" = callPackage @@ -130884,8 +131638,8 @@ self: { streaming-commons temporary text time trifecta unix ]; description = "A Haskell implementation of Foreman"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -130898,7 +131652,7 @@ self: { libraryHaskellDepends = [ base indexed ]; testHaskellDepends = [ base do-notation indexed ]; description = "Non-interactive proof assistant monad for first-order logic"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hp2any-core" = callPackage @@ -130914,8 +131668,8 @@ self: { old-locale process time ]; description = "Heap profiling helper library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -130937,8 +131691,8 @@ self: { ]; executableSystemDepends = [ freeglut libGL libGLU ]; description = "Real-time heap graphing utility and profile stream server with a reusable graphing module"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) freeglut; inherit (pkgs) libGL; inherit (pkgs) libGLU;}; @@ -130960,8 +131714,8 @@ self: { glib gtk gtkglext hp2any-core hp2any-graph OpenGL time ]; description = "A utility to visualise and compare heap profiles"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -130976,7 +131730,7 @@ self: { enableSeparateDataOutput = true; executableHaskellDepends = [ base containers filepath ]; description = "A tool for converting GHC heap-profiles to HTML"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hp2pretty" = callPackage @@ -130994,7 +131748,7 @@ self: { optparse-applicative semigroups text ]; description = "generate pretty graphs from heap profiles"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hpack" = callPackage @@ -131032,7 +131786,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "A modern format for Haskell packages"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hpack-convert" = callPackage @@ -131063,8 +131817,8 @@ self: { split temporary text unordered-containers vector yaml ]; description = "Convert Cabal manifests into hpack's package.yamls"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -131095,8 +131849,8 @@ self: { tasty-golden text transformers utf8-string yaml ]; description = "hpack's dhalling"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -131114,8 +131868,8 @@ self: { aeson base cmdargs filepath hpaco-lib strict utf8-string yaml ]; description = "Modular template compiler"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -131133,8 +131887,8 @@ self: { mtl parsec safe split strict transformers ]; description = "Modular template compiler library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -131156,8 +131910,8 @@ self: { process time wx wxcore ]; description = "A scrapbook for Haskell developers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -131170,8 +131924,8 @@ self: { libraryHaskellDepends = [ base ]; librarySystemDepends = [ papi ]; description = "Binding for the PAPI library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) papi;}; @@ -131200,7 +131954,7 @@ self: { ]; description = "Haskell paste web site"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -131220,8 +131974,8 @@ self: { lifted-base network optparse-applicative process safe utf8-string ]; description = "A command-line client for hpaste.org"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -131238,7 +131992,7 @@ self: { utf8-string word8 ]; description = "Support for well-typed paths"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hpath-directory" = callPackage @@ -131261,7 +132015,7 @@ self: { process time unix unix-bytestring utf8-string ]; description = "Alternative to 'directory' package with ByteString based filepaths"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hpath-filepath" = callPackage @@ -131272,7 +132026,7 @@ self: { sha256 = "01sclksryvl8z56asxda2q4wx0snc89482xlav6mrgzxsi432a07"; libraryHaskellDepends = [ base bytestring unix word8 ]; description = "ByteString based filepath manipulation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hpath-io" = callPackage @@ -131289,7 +132043,7 @@ self: { safe-exceptions streamly time unix ]; description = "High-level IO operations on files/directories"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hpath-posix" = callPackage @@ -131300,7 +132054,7 @@ self: { sha256 = "1gxqrlxcm01ysd3hs61rhzfa3inxsj1w0hncydf1q66skshabzmf"; libraryHaskellDepends = [ base bytestring hpath-filepath unix ]; description = "Some low-level POSIX glue code, that is not in 'unix'"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hpc_0_6_0_3" = callPackage @@ -131315,8 +132069,8 @@ self: { base containers directory filepath time ]; description = "Code Coverage Library for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "hpc-codecov" = callPackage @@ -131325,8 +132079,8 @@ self: { }: mkDerivation { pname = "hpc-codecov"; - version = "0.2.0.0"; - sha256 = "0ha97zldwbsx86ji4sjaw9jf7kzgrk41zabzdd1b6sdlf20p883k"; + version = "0.2.0.1"; + sha256 = "0gbgrq5xv393mg7xgqddw18hqwhrz11nrqblcrcjpm4cdbkxwf5q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -131337,7 +132091,7 @@ self: { base directory filepath tar tasty tasty-hunit ]; description = "Generate codecov report from hpc data"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hpc-coveralls" = callPackage @@ -131362,8 +132116,8 @@ self: { ]; testHaskellDepends = [ base HUnit ]; description = "Coveralls.io support for Haskell."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -131390,7 +132144,7 @@ self: { ]; testToolDepends = [ tasty-discover ]; description = "Convert HPC output into LCOV format"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hpc-strobe" = callPackage @@ -131401,7 +132155,7 @@ self: { sha256 = "1fgw4pf72684mi7s5pqvfj75s8y004rxf3ww377kyrlw1mb7405c"; libraryHaskellDepends = [ base filepath hpc ]; description = "Hpc-generated strobes for a running Haskell program"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hpc-threshold" = callPackage @@ -131418,7 +132172,7 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base deepseq hspec ]; description = "Ensure the code coverage is above configured thresholds"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hpc-tracer" = callPackage @@ -131436,8 +132190,8 @@ self: { unix ]; description = "Tracer with AJAX interface"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -131461,7 +132215,7 @@ self: { base bytestring memory optparse-applicative semigroups utf8-string ]; description = "A tool for looking through PDF file using Haskell"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hpg" = callPackage @@ -131474,8 +132228,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base random ]; description = "a simple password generator"; - license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -131505,8 +132259,8 @@ self: { protolude QuickCheck ]; description = "Monads for GPIO in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -131523,8 +132277,8 @@ self: { transformers ]; description = "monadic, reactive Formlets running in the Web browser"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "hplaylist" = callPackage @@ -131539,7 +132293,7 @@ self: { executableHaskellDepends = [ base directory filepath process ]; description = "Application for managing playlist files on a music player"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -131560,7 +132314,7 @@ self: { ]; description = "Podcast Aggregator (downloader)"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -131581,7 +132335,7 @@ self: { executableHaskellDepends = [ base directory filepath time ]; testHaskellDepends = [ base bytestring transformers ]; description = "A Haskell pre-processor"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hpqtypes" = callPackage @@ -131610,8 +132364,8 @@ self: { unordered-containers uuid-types vector ]; description = "Haskell bindings to libpqtypes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) postgresql;}; @@ -131625,6 +132379,8 @@ self: { pname = "hpqtypes-extras"; version = "1.10.3.0"; sha256 = "1ifr6z89ki541b9x3kpyf10vbn3anhfcq8ppqwyp5zvmkx0q3wqs"; + revision = "1"; + editedCabalFile = "0pa13k78w0xm59pvlsd9rmg9ddi3jkc918j5i0hb4vlxcaivq34y"; libraryHaskellDepends = [ base base16-bytestring bytestring containers cryptohash exceptions fields-json hpqtypes lifted-base log-base monad-control mtl safe @@ -131635,8 +132391,8 @@ self: { tasty-hunit text transformers uuid-types ]; description = "Extra utilities for hpqtypes library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -131666,8 +132422,8 @@ self: { ]; executableToolDepends = [ alex ]; description = "Parse Google Protocol Buffer specifications"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -131696,8 +132452,8 @@ self: { ]; executableToolDepends = [ alex ]; description = "Parse Google Protocol Buffer specifications"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -131720,7 +132476,7 @@ self: { wai-extra warp warp-tls ]; description = "a lightweight HTTP proxy server, and more"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "hps" = callPackage @@ -131733,7 +132489,7 @@ self: { libraryHaskellDepends = [ base filepath hcg-minus process ]; description = "Haskell Postscript"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -131750,7 +132506,7 @@ self: { executableHaskellDepends = [ base cairo gtk hps random ]; description = "Cairo rendering for the haskell postscript library"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -131762,8 +132518,8 @@ self: { sha256 = "0w1yyrv4k7fi016084j4k1lh6jgxg5502r83zszr9cjc6rraj8fc"; libraryHaskellDepends = [ base vector ]; description = "A nice implementation of the k-Means algorithm"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -131777,7 +132533,7 @@ self: { libraryToolDepends = [ c2hs ]; description = "Haskell bindings for libpuz"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "hpygments" = callPackage @@ -131792,8 +132548,8 @@ self: { aeson base bytestring process process-extras ]; description = "Highlight source code using Pygments"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -131810,7 +132566,7 @@ self: { ]; description = "AI of Pylos game with GLUT interface"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -131826,8 +132582,8 @@ self: { base lens optparse-applicative parsec text ]; description = "pyrg utility done right"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -131857,8 +132613,8 @@ self: { base criterion deepseq megaparsec text validation ]; description = "Python language tools"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -131889,7 +132645,7 @@ self: { ]; description = "HQuantLib is a port of essencial parts of QuantLib to Haskell"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -131902,7 +132658,7 @@ self: { libraryHaskellDepends = [ base time ]; description = "HQuantLib Time is a business calendar functions extracted from HQuantLib"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -131920,7 +132676,7 @@ self: { test-framework-hunit text xmlhtml ]; description = "A query language for transforming HTML5"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hranker" = callPackage @@ -131933,8 +132689,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base HCL NonEmpty ]; description = "Basic utility for ranking a list of items"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -131954,8 +132710,8 @@ self: { ]; testHaskellDepends = [ base hset transformers-base ]; description = "Generalization of MonadReader and ReaderT using hset"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -131971,8 +132727,8 @@ self: { base comonad hreader hset lens lens-action profunctors ]; description = "Optics for hreader package"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -132001,8 +132757,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "A Type dependent Highlevel HTTP client library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -132027,8 +132783,8 @@ self: { ]; testToolDepends = [ hspec-discover markdown-unlit ]; description = "Conduit streaming support for Hreq"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -132049,8 +132805,8 @@ self: { ]; testHaskellDepends = [ base doctest ]; description = "Core functionality for Hreq Http client library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -132063,7 +132819,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base process tasty tasty-hunit ]; description = "File size in human readable format"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hricket" = callPackage @@ -132076,8 +132832,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base containers ]; description = "A Cricket scoring application"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -132103,8 +132859,8 @@ self: { base containers hspec hspec-core HUnit kazura-queue QuickCheck ]; description = "A Riemann Client for Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -132127,7 +132883,7 @@ self: { aeson attoparsec base QuickCheck text vector ]; description = "Embed a Ruby intepreter in your Haskell program !"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) ruby;}; "hs-GeoIP" = callPackage @@ -132139,7 +132895,7 @@ self: { libraryHaskellDepends = [ base bytestring deepseq ]; librarySystemDepends = [ GeoIP ]; description = "Haskell bindings to the MaxMind GeoIPCity database via the C library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {GeoIP = null;}; "hs-bibutils" = callPackage @@ -132171,8 +132927,8 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion cryptohash ]; benchmarkSystemDepends = [ libb2 ]; description = "A cryptohash-inspired library for blake2"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) libb2;}; @@ -132191,8 +132947,8 @@ self: { tasty-quickcheck ]; description = "Compression and decompression in the brotli format"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {brotlidec = null; brotlienc = null;}; @@ -132204,7 +132960,7 @@ self: { sha256 = "02dd7kli8nm01jxs0p8imqvbdr4yzqizi6bwyyr228p3wscbdsn8"; libraryHaskellDepends = [ base bytestring gd random ]; description = "Generate images suitable for use as CAPTCHAs in online web-form security"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hs-carbon" = callPackage @@ -132216,7 +132972,7 @@ self: { libraryHaskellDepends = [ base deepseq mtl parallel random ]; testHaskellDepends = [ base HUnit ]; description = "A Haskell framework for parallel monte carlo simulations"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hs-carbon-examples" = callPackage @@ -132233,8 +132989,8 @@ self: { base deepseq gloss hs-carbon monad-loops mtl tf-random ]; description = "Example Monte Carlo simulations implemented with Carbon"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -132250,8 +133006,8 @@ self: { array base bytestring bytestring-mmap directory filepath mtl ]; description = "A library for reading CDB (Constant Database) files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -132272,8 +133028,8 @@ self: { base containers directory filepath megaparsec ]; description = "Conllu validating parser and utils"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -132303,8 +133059,8 @@ self: { regex-tdfa template-haskell text time ]; description = "Dependency Injection library for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -132317,8 +133073,8 @@ self: { libraryHaskellDepends = [ base ghc-prim ]; librarySystemDepends = [ ole32 oleaut32 ]; description = "Pragmatic .NET interop for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {ole32 = null; oleaut32 = null;}; @@ -132341,7 +133097,7 @@ self: { raw-strings-qq template-haskell text time ]; description = "Haskell bindings for a very compact embedded ECMAScript (JavaScript) engine"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hs-excelx" = callPackage @@ -132356,8 +133112,8 @@ self: { base bytestring containers mtl text time xml-conduit zip-archive ]; description = "HS-Excelx provides basic read-only access to Excel 2007 and 2010 documents in XLSX format"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -132369,8 +133125,8 @@ self: { sha256 = "0j52drd3pb6ssgngfqxdsvvjjnx11nsmxwjsin6cmbv0nifpyq51"; libraryHaskellDepends = [ base bytestring haskell98 ]; description = "Bindings to FFMPEG library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -132384,8 +133140,8 @@ self: { libraryHaskellDepends = [ base ]; librarySystemDepends = [ fltk fltk_images ]; description = "Binding to GUI library FLTK"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) fltk; fltk_images = null;}; @@ -132397,7 +133153,7 @@ self: { sha256 = "1cigaggilr05pgizj11g5c40ln38zb5q8p0igliamkhx7fz3axis"; libraryHaskellDepends = [ base dual tagged transformers ]; description = "Functors from products of Haskell and its dual to Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hs-gchart" = callPackage @@ -132409,7 +133165,7 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base mtl ]; description = "Haskell wrapper for the Google Chart API"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hs-gen-iface" = callPackage @@ -132427,8 +133183,8 @@ self: { haskell-src-exts hse-cpp mtl tagged ]; description = "Utility to generate haskell-names interface files"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -132444,8 +133200,8 @@ self: { base containers directory filepath parsec process ]; description = "Haskell wrapper around the GIZA++ toolkit"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -132458,8 +133214,8 @@ self: { libraryHaskellDepends = [ base haskell-src ]; testHaskellDepends = [ base haskell-src hspec ]; description = "Haskell source code analyzer"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -132471,7 +133227,7 @@ self: { sha256 = "04dm8c5ilaw4agljfp7k31ln2j5m1shyg4zb3x36rjkbs807z8sf"; libraryHaskellDepends = [ base hs-functors ]; description = "Indexed applicative functors and monads"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hs-java" = callPackage @@ -132490,8 +133246,8 @@ self: { filepath Glob LibZip MissingH mtl parsec utf8-string ]; description = "Java .class files assembler/disassembler"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -132505,8 +133261,8 @@ self: { aeson base bytestring HTTP network text ]; description = "JSON-RPC client library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -132533,8 +133289,8 @@ self: { test-framework test-framework-hunit test-framework-quickcheck2 ]; description = "Logo interpreter written in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -132559,8 +133315,8 @@ self: { base bytestring lens managed QuickCheck tasty tasty-hunit tasty-quickcheck ]; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {mesos = null; inherit (pkgs) protobuf;}; "hs-multiaddr" = callPackage @@ -132578,8 +133334,8 @@ self: { base bytestring either-unwrap hs-multihash hspec iproute sandi ]; description = "Multiaddr library"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {hs-multihash = null;}; @@ -132593,8 +133349,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base HandsomeSoup hxt random ]; description = "Name generator"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -132609,7 +133365,7 @@ self: { libraryHaskellDepends = [ base text ]; executableHaskellDepends = [ base containers emojis text ]; description = "The OpenMoji emoji dataset"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hs-pattrans" = callPackage @@ -132634,8 +133390,8 @@ self: { testHaskellDepends = [ base hspec QuickCheck ]; testToolDepends = [ hspec-discover ]; description = "DSL for musical patterns and transformation, based on contravariant functors"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -132655,8 +133411,8 @@ self: { array base directory glib gtk MonadPrompt mtl random ]; description = "Programmer's Mine Sweeper in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -132668,7 +133424,7 @@ self: { sha256 = "1xwdikiqy2dxyzr6wx51wy51vifsvshblx7kkhfqd7izjf87ww8f"; libraryHaskellDepends = [ base bytestring ]; description = "PHP session and values serialization"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hs-pkg-config" = callPackage @@ -132681,8 +133437,8 @@ self: { editedCabalFile = "1kj5lrv2a9mgzqbwkznpsgjgs5s9wnwrcsab2mykxpkm8f71nk81"; libraryHaskellDepends = [ base data-default-class text ]; description = "Create pkg-config configuration files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -132703,8 +133459,8 @@ self: { zip-archive ]; description = "A library for Passbook pass creation & signing"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -132719,7 +133475,7 @@ self: { libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base ]; description = "Bindings to C pipe functions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hs-profunctors" = callPackage @@ -132730,7 +133486,7 @@ self: { sha256 = "09iylf1xjxsikjyaib9902na33bkfs8nv3wasyvikg4g82xqay5y"; libraryHaskellDepends = [ base hs-functors ]; description = "Profunctors from Haskell to Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hs-re" = callPackage @@ -132741,8 +133497,8 @@ self: { sha256 = "0rx7shfjyi9k910mvzskykqxnijl8rrh08c0bkqlmqwisyhl7wbb"; libraryHaskellDepends = [ array base regex-base regex-posix ]; description = "Easy to use Regex"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -132759,8 +133515,8 @@ self: { unordered-containers ]; description = "A Haskell client for RQlite"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -132781,8 +133537,8 @@ self: { executableSystemDepends = [ notifier ]; testHaskellDepends = [ base protolude ]; description = "Experimental! Wraps this awesome rust library so you can use it in haskell. https://docs.rs/crate/notify"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {notifier = null;}; @@ -132803,8 +133559,8 @@ self: { base containers hspec tasty tasty-hunit xml-conduit ]; description = "Simple and easy web scraping and automation in Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -132820,7 +133576,7 @@ self: { libraryHaskellDepends = [ base directory network ]; testHaskellDepends = [ base HUnit network temporary unix ]; description = "Write a server supporting Server::Starter's protocol in Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hs-snowtify" = callPackage @@ -132836,8 +133592,8 @@ self: { base either safe safe-exceptions text turtle ]; description = "snowtify send your result of `stack build` (`stack test`) to notify-daemon :dog2:"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -132856,8 +133612,8 @@ self: { ]; executableHaskellDepends = [ base ]; description = "Convert an eventlog into the speedscope json format"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -132875,8 +133631,8 @@ self: { base HTTP json mime network old-locale old-time random utf8-string ]; description = "Haskell binding to the Twitter API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -132892,7 +133648,7 @@ self: { executableHaskellDepends = [ base HTTP json mtl network pretty ]; description = "Commandline Twitter feed archiver"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -132904,8 +133660,8 @@ self: { sha256 = "0qb7gsbki3ciqddxp9j46rnx64vv622n2p9vidv1b000wbmmrz15"; libraryHaskellDepends = [ base old-locale time ]; description = "Implements the RFC 2426 vCard 3.0 spec"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -132925,8 +133681,8 @@ self: { base bytestring containers filepath tasty tasty-hunit temporary ]; description = "Client library for Facebook's Watchman tool"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -132947,7 +133703,7 @@ self: { base bytestring criterion ghc-prim zlib ]; description = "Haskell bindings to the Zstandard compression algorithm"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hs2048" = callPackage @@ -132971,7 +133727,7 @@ self: { base criterion hastache random statistics ]; description = "A 2048 clone in Haskell"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hs2ats" = callPackage @@ -132995,7 +133751,7 @@ self: { ]; benchmarkHaskellDepends = [ base criterion ]; description = "Create ATS types from Haskell types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hs2bf" = callPackage @@ -133013,8 +133769,8 @@ self: { array base containers directory filepath haskell-src mtl ]; description = "Haskell to Brainfuck compiler"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -133033,7 +133789,7 @@ self: { ]; description = "Generate graphviz-code from Haskell-code"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "hs2ps" = callPackage @@ -133045,8 +133801,8 @@ self: { libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base hspec template-haskell ]; description = "Translate Haskell types to PureScript"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -133071,8 +133827,8 @@ self: { sha256 = "0p77xndqpqfyjw9y7q791pysrpz3zkimw8mcxyfl4yrh34sammx9"; libraryHaskellDepends = [ base bytestring unix ]; description = "I2C access for Haskell and Linux"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -133085,7 +133841,7 @@ self: { libraryHaskellDepends = [ base lens ]; testHaskellDepends = [ base HUnit lens ]; description = "PID control loop"; - license = stdenv.lib.licenses.lgpl3; + license = lib.licenses.lgpl3; }) {}; "hsSqlite3" = callPackage @@ -133102,7 +133858,7 @@ self: { ]; description = "Sqlite3 bindings"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -133115,8 +133871,8 @@ self: { libraryHaskellDepends = [ array base bytestring dlist mtl ]; librarySystemDepends = [ xenctrl ]; description = "FFI bindings to the Xen Control library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {xenctrl = null;}; @@ -133149,7 +133905,7 @@ self: { uuid xml-conduit ]; description = "Akamai API(Edgegrid and Netstorage)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hsaml2" = callPackage @@ -133176,8 +133932,8 @@ self: { network-uri semigroups string-conversions time x509 ]; description = "OASIS Security Assertion Markup Language (SAML) V2.0"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) libxml2;}; @@ -133202,30 +133958,26 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Integrating Sass into Haskell applications"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hsautogui" = callPackage - ({ mkDerivation, base, containers, cpython, mtl, python + ({ mkDerivation, base, containers, cpython, hspec, mtl , template-haskell, text }: mkDerivation { pname = "hsautogui"; - version = "0.2.0"; - sha256 = "0xcacp9r8iw9rqd5yawj5haznkjv6agigg5y4j1s0rhykc1s440n"; - isLibrary = true; - isExecutable = true; + version = "0.3.0"; + sha256 = "1bw0z2jkijqd2rrwwm4zrrz9l44b59fy1rzkr37wagfc59gp9g68"; libraryHaskellDepends = [ base containers cpython mtl template-haskell text ]; - librarySystemDepends = [ python ]; - executableHaskellDepends = [ base ]; - executableSystemDepends = [ python ]; + testHaskellDepends = [ base cpython hspec ]; description = "Haskell bindings for PyAutoGUI, a library for automating user interaction"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; - }) {inherit (pkgs) python;}; + }) {}; "hsay" = callPackage ({ mkDerivation, base, Hclip, HTTP, process, unix }: @@ -133238,8 +133990,8 @@ self: { enableSeparateDataOutput = true; executableHaskellDepends = [ base Hclip HTTP process unix ]; description = "(ab)Use Google Translate as a speech synthesiser"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -133257,7 +134009,7 @@ self: { base bytestring containers directory filepath preprocessor-tools ]; description = "Preprocesses a file, adding blobs from files as string literals"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hsbackup" = callPackage @@ -133275,8 +134027,8 @@ self: { old-locale strict time ]; description = "simple utility for rolling filesystem backups"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -133290,8 +134042,8 @@ self: { isExecutable = true; executableHaskellDepends = [ attoparsec base text vector ]; description = "A command line calculator"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -133314,8 +134066,8 @@ self: { test-framework-hunit text time ]; description = "Launch and gather data from Haskell and non-Haskell benchmarks"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -133334,8 +134086,8 @@ self: { time ]; description = "Backend for uploading benchmark data to CodeSpeed"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -133359,8 +134111,8 @@ self: { split statistics text ]; description = "Backend for uploading benchmark data to Google Fusion Tables"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -133380,7 +134132,7 @@ self: { ]; testHaskellDepends = [ base tasty tasty-hspec ]; description = "A preprocessor that helps with writing Haskell bindings to C code"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hsc3" = callPackage @@ -133399,8 +134151,8 @@ self: { transformers vector ]; description = "Haskell SuperCollider"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -133417,7 +134169,7 @@ self: { ]; description = "Haskell SuperCollider Auditor"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -133431,7 +134183,7 @@ self: { libraryHaskellDepends = [ base cairo gtk hosc hsc3 split ]; description = "haskell supercollider cairo drawing"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -133450,7 +134202,7 @@ self: { ]; description = "haskell supercollider data"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -133464,7 +134216,7 @@ self: { libraryHaskellDepends = [ base hsc3 safe ]; description = "Haskell SuperCollider Unit Generator Database"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -133478,7 +134230,7 @@ self: { libraryHaskellDepends = [ base directory filepath hsc3 process ]; description = "haskell supercollider graph drawing"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -133499,7 +134251,7 @@ self: { ]; description = "FORTH SUPERCOLLIDER"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -133525,7 +134277,7 @@ self: { executableHaskellDepends = [ base ]; description = "Haskell SuperCollider Graphs"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -133547,7 +134299,7 @@ self: { ]; description = "Haskell SuperCollider Language"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -133568,7 +134320,7 @@ self: { ]; description = "LISP SUPERCOLLIDER"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -133587,7 +134339,7 @@ self: { ]; description = "Haskell SuperCollider Plotting"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -133608,7 +134360,7 @@ self: { ]; description = "Create and control scsynth processes"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -133622,7 +134374,7 @@ self: { libraryHaskellDepends = [ base hsc3 ]; description = "Haskell SuperCollider Record Variants"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -133641,7 +134393,7 @@ self: { ]; description = "hsc3 re-writing"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -133669,7 +134421,7 @@ self: { ]; description = "SuperCollider server resource management and synchronization"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -133683,7 +134435,7 @@ self: { libraryHaskellDepends = [ base bytestring hosc ]; description = "Haskell SuperCollider SoundFile"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -133701,7 +134453,7 @@ self: { ]; description = "Haskell SuperCollider SoundFile"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -133715,7 +134467,7 @@ self: { libraryHaskellDepends = [ base hsc3 ]; description = "Unsafe Haskell SuperCollider"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -133738,7 +134490,7 @@ self: { ]; description = "Haskell SuperCollider Utilities"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -133765,8 +134517,8 @@ self: { regex-compat temporary text transformers unix ]; description = "Very simple file/directory structure scaffolding writer monad EDSL"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -133782,7 +134534,7 @@ self: { librarySystemDepends = [ camwire_1394 dc1394_control raw1394 ]; description = "Haskell bindings to IIDC1394 cameras, via Camwire"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {camwire_1394 = null; dc1394_control = null; raw1394 = null;}; @@ -133799,8 +134551,8 @@ self: { Thrift ]; description = "cassandra database interface"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -133815,8 +134567,8 @@ self: { libraryHaskellDepends = [ aeson base bytestring ghc-prim HTTP ]; executableHaskellDepends = [ aeson base bytestring ghc-prim HTTP ]; description = "Command line client and library for SoundCloud.com"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -133831,7 +134583,7 @@ self: { libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base random random-shuffle ]; description = "minimal ncurses-like library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hschema" = callPackage @@ -133848,7 +134600,7 @@ self: { natural-transformation profunctors text unordered-containers vector ]; description = "Describe schemas for your Haskell data types"; - license = stdenv.lib.licenses.lgpl3; + license = lib.licenses.lgpl3; }) {}; "hschema-aeson" = callPackage @@ -133877,7 +134629,7 @@ self: { scientific text time unordered-containers vector ]; description = "Describe schemas for your Haskell data types"; - license = stdenv.lib.licenses.lgpl3; + license = lib.licenses.lgpl3; }) {}; "hschema-prettyprinter" = callPackage @@ -133895,7 +134647,7 @@ self: { vector ]; description = "Describe schemas for your Haskell data types"; - license = stdenv.lib.licenses.lgpl3; + license = lib.licenses.lgpl3; }) {}; "hschema-quickcheck" = callPackage @@ -133912,7 +134664,7 @@ self: { quickcheck-instances text unordered-containers vector ]; description = "Describe schemas for your Haskell data types"; - license = stdenv.lib.licenses.lgpl3; + license = lib.licenses.lgpl3; }) {}; "hsclock" = callPackage @@ -133926,7 +134678,7 @@ self: { executableHaskellDepends = [ base cairo glib gtk old-time ]; description = "An elegant analog clock using Haskell, GTK and Cairo"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -133964,8 +134716,8 @@ self: { base directory mtl process test-simple Unixutils ]; description = "cscope like browser for Haskell code"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -133981,7 +134733,7 @@ self: { base directory filepath process time ]; description = "Haskell shell script template"; - license = stdenv.lib.licenses.isc; + license = lib.licenses.isc; }) {}; "hscuid" = callPackage @@ -134000,8 +134752,8 @@ self: { executableHaskellDepends = [ base criterion ]; testHaskellDepends = [ base containers text ]; description = "Collision-resistant IDs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -134032,7 +134784,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base hscurses random safe unix ]; description = "hscurses swimming fish example"; - license = stdenv.lib.licenses.isc; + license = lib.licenses.isc; }) {}; "hsdev" = callPackage @@ -134075,8 +134827,8 @@ self: { hformat hspec lens lens-aeson mtl text ]; description = "Haskell development library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -134090,7 +134842,7 @@ self: { libraryHaskellDepends = [ base bytestring hosc ]; description = "Haskell SDIF"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -134105,8 +134857,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base cairo containers HUnit parsec ]; description = "hsdip - a Diplomacy parser/renderer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -134123,8 +134875,8 @@ self: { libraryHaskellDepends = [ base containers network ]; librarySystemDepends = [ adns ]; description = "Asynchronous DNS Resolver"; - license = stdenv.lib.licenses.lgpl3; - maintainers = with stdenv.lib.maintainers; [ peti ]; + license = lib.licenses.lgpl3; + maintainers = with lib.maintainers; [ peti ]; }) {inherit (pkgs) adns;}; "hsdns-cache" = callPackage @@ -134139,8 +134891,8 @@ self: { base hsdns network SafeSemaphore text time unordered-containers ]; description = "Caching asynchronous DNS resolver"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -134152,7 +134904,7 @@ self: { sha256 = "0k2bmsk6d3ym7z71bwxicc0b8wsw0camjgxgbybx4pdz0261dc7f"; libraryHaskellDepends = [ base cpphs haskell-src-exts ]; description = "Preprocess+parse haskell code"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hsebaysdk" = callPackage @@ -134169,7 +134921,7 @@ self: { time transformers unordered-containers ]; description = "Haskell eBay SDK"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hsemail" = callPackage @@ -134181,8 +134933,8 @@ self: { libraryHaskellDepends = [ base parsec time time-compat ]; testHaskellDepends = [ base hspec parsec time ]; description = "Parsec parsers for the Internet Message format (e-mail)"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ peti ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ peti ]; }) {}; "hsemail-ns" = callPackage @@ -134194,7 +134946,7 @@ self: { libraryHaskellDepends = [ base mtl old-time parsec ]; testHaskellDepends = [ base doctest hspec old-time parsec ]; description = "Internet Message Parsers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hsendxmpp" = callPackage @@ -134212,7 +134964,7 @@ self: { ]; description = "sendxmpp clone, sending XMPP messages via CLI"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "hsenv" = callPackage @@ -134232,8 +134984,8 @@ self: { io-streams mtl process safe split unix ]; description = "Virtual Haskell Environment builder"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -134247,7 +134999,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base cmdargs wai-app-static warp ]; description = "Simple http server in haskell"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hset" = callPackage @@ -134259,8 +135011,8 @@ self: { libraryHaskellDepends = [ base deepseq tagged type-fun ]; testHaskellDepends = [ base HUnit tagged ]; description = "Primitive list with elements of unique types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -134279,7 +135031,7 @@ self: { base binary bytestring containers hspec HUnit iconv text time ]; description = "EXIF handling library in pure Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hsfacter" = callPackage @@ -134290,8 +135042,8 @@ self: { sha256 = "1j7pny0yjpx5qw2d9br723dyic4v09k1qbvrham57p9qxn9m5b0q"; libraryHaskellDepends = [ base containers language-puppet text ]; description = "A small and ugly library that emulates the output of the puppet facter program"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -134307,8 +135059,8 @@ self: { base hdaemonize hslogger network process ]; description = "Incremental builder for flash"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -134322,8 +135074,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base ghc ]; description = "Z-decoder"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -134347,8 +135099,8 @@ self: { uri-encode ]; description = "Salesforce API Client"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -134362,7 +135114,7 @@ self: { librarySystemDepends = [ gcrypt gnutls ]; description = "Library wrapping the GnuTLS API"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {gcrypt = null; inherit (pkgs) gnutls;}; @@ -134376,7 +135128,7 @@ self: { librarySystemDepends = [ gcrypt gnutls ]; description = "Library wrapping the GnuTLS API"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {gcrypt = null; inherit (pkgs) gnutls;}; @@ -134389,8 +135141,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers random stm time ]; description = "An implementation of the GSOM clustering algorithm"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -134438,7 +135190,7 @@ self: { librarySystemDepends = [ blas liblapack ]; libraryPkgconfigDepends = [ gsl ]; description = "Signal processing and EEG data analysis"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) blas; inherit (pkgs) gsl; liblapack = null;}; "hsilop" = callPackage @@ -134454,7 +135206,7 @@ self: { base directory filepath haskeline xdg-basedir ]; description = "RPN calculator"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hsimport" = callPackage @@ -134481,7 +135233,7 @@ self: { ]; doHaddock = false; description = "Extend the import list of a Haskell source file"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hsini" = callPackage @@ -134500,7 +135252,7 @@ self: { tasty-quickcheck tasty-th ]; description = "ini configuration files"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hsinspect" = callPackage @@ -134522,8 +135274,8 @@ self: { transformers ]; description = "Inspect Haskell source files"; - license = stdenv.lib.licenses.gpl3Plus; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -134554,8 +135306,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "LSP interface over the hsinspect binary"; - license = stdenv.lib.licenses.gpl3Plus; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -134576,7 +135328,7 @@ self: { optparse-applicative process safe-exceptions transformers ]; description = "Install Haskell software"; - license = stdenv.lib.licenses.isc; + license = lib.licenses.isc; }) {}; "hskeleton" = callPackage @@ -134587,8 +135339,8 @@ self: { sha256 = "0f06xir28rzpwphk14gkpww8l7gbws4habhm26915idpnd4bva2w"; libraryHaskellDepends = [ base Cabal ]; description = "Skeleton for new Haskell programs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -134604,8 +135356,8 @@ self: { base Cabal directory filepath process unix ]; description = "HSlackBuilder automatically generates slackBuild scripts from a cabal package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -134619,8 +135371,8 @@ self: { libraryHaskellDepends = [ base containers ]; librarySystemDepends = [ svm ]; description = "A FFI binding to libsvm"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {svm = null;}; @@ -134637,8 +135389,8 @@ self: { base Cabal hint MemoTrie process regex-compat ]; description = "Resolves links to Haskell identifiers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -134658,7 +135410,7 @@ self: { ]; testHaskellDepends = [ base HUnit ]; description = "Versatile logging framework"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hslogger-reader" = callPackage @@ -134676,8 +135428,8 @@ self: { attoparsec base hslogger optparse-applicative text text-icu time ]; description = "Parsing hslogger-produced logs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -134689,8 +135441,8 @@ self: { sha256 = "1fg7nz63c3nbpibm5q4mm7rvch7ihf3rlbh6jnhdj6qdspvm38p8"; libraryHaskellDepends = [ base hslogger mtl template-haskell ]; description = "Automatic generation of hslogger functions"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -134729,8 +135481,8 @@ self: { base conduit hspec QuickCheck split stm transformers ]; description = "A library to work with, or as, a logstash server"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -134753,7 +135505,7 @@ self: { quickcheck-instances tasty tasty-hunit tasty-quickcheck text ]; description = "Bindings to Lua, an embeddable scripting language"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {inherit (pkgs) lua5_3;}; "hslua_1_3_0" = callPackage @@ -134775,8 +135527,8 @@ self: { quickcheck-instances tasty tasty-hunit tasty-quickcheck text ]; description = "Bindings to Lua, an embeddable scripting language"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) lua5_3;}; "hslua-aeson" = callPackage @@ -134797,7 +135549,7 @@ self: { quickcheck-instances scientific text unordered-containers vector ]; description = "Allow aeson data types to be used with lua"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hslua-module-doclayout" = callPackage @@ -134813,7 +135565,7 @@ self: { base doclayout hslua tasty tasty-hunit tasty-lua ]; description = "Lua module wrapping Text.DocLayout."; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hslua-module-system" = callPackage @@ -134831,7 +135583,7 @@ self: { base hslua tasty tasty-hunit tasty-lua text ]; description = "Lua module wrapper around Haskell's System module"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hslua-module-text" = callPackage @@ -134847,7 +135599,7 @@ self: { base hslua tasty tasty-hunit tasty-lua text ]; description = "Lua module for text"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hsluv-haskell" = callPackage @@ -134859,8 +135611,8 @@ self: { libraryHaskellDepends = [ base colour ]; testHaskellDepends = [ aeson base bytestring colour containers ]; description = "HSLuv conversion utility"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -134884,8 +135636,8 @@ self: { freetype2 GraphicsMagick lcms libxml2 ]; description = "FFI bindings for the GraphicsMagick library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {GraphicsMagick = null; inherit (pkgs) bzip2; freetype2 = null; jasper = null; inherit (pkgs) lcms; inherit (pkgs) libjpeg; @@ -134905,7 +135657,7 @@ self: { ]; testHaskellDepends = [ base containers HUnit mtl ]; description = "A collection of miscellaneous modules"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hsmodetweaks" = callPackage @@ -134922,8 +135674,8 @@ self: { base containers directory hpack protolude text ]; description = "Tool for generating .dir-locals.el for intero"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -134935,8 +135687,8 @@ self: { sha256 = "08gbrwrc85in34nrgjm0zr5sjz2zbjc7hk2zlpvk1dq8x62a6wsg"; libraryHaskellDepends = [ array base directory network old-time ]; description = "Simple SMTP Client"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -134950,7 +135702,7 @@ self: { librarySystemDepends = [ libsndfile ]; libraryToolDepends = [ c2hs ]; description = "Haskell bindings for libsndfile"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; }) {inherit (pkgs) libsndfile;}; "hsndfile-storablevector" = callPackage @@ -134961,7 +135713,7 @@ self: { sha256 = "1n7jw14pnixiv1z50lb7yzwyyl3yd3gdfg5w0gx0m52pnmqiav9z"; libraryHaskellDepends = [ base hsndfile storablevector ]; description = "Haskell bindings for libsndfile (Data.StorableVector interface)"; - license = stdenv.lib.licenses.lgpl2; + license = lib.licenses.lgpl2; }) {}; "hsndfile-vector" = callPackage @@ -134972,7 +135724,7 @@ self: { sha256 = "1598bf87llbiri1qh8zirhbsd94c9vhd41lf9vialqrykbmi3zig"; libraryHaskellDepends = [ base hsndfile vector ]; description = "Haskell bindings for libsndfile (Data.Vector interface)"; - license = stdenv.lib.licenses.lgpl2; + license = lib.licenses.lgpl2; }) {}; "hsnock" = callPackage @@ -134993,8 +135745,8 @@ self: { test-framework-hunit test-framework-quickcheck2 ]; description = "Nock 5K interpreter"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -135006,7 +135758,7 @@ self: { sha256 = "0f8xpmzmg71l7qn1vjvzncsx8r7vfpzvlnlq0029ixf64gshbmzl"; libraryHaskellDepends = [ base vector ]; description = "A coherent 3d noise library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hsns" = callPackage @@ -135019,8 +135771,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base network pcap ]; description = "a miniature network sniffer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -135039,8 +135791,8 @@ self: { stm stm-chans text ]; description = "Haskell NSQ client"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -135057,8 +135809,8 @@ self: { libraryHaskellDepends = [ array base mtl network old-time random ]; executableHaskellDepends = [ unix ]; description = "Libraries to use SNTP protocol and small client/server implementations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -135083,8 +135835,8 @@ self: { test-framework-quickcheck2 ]; description = "Haskell library that supports command-line flag processing"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -135123,8 +135875,8 @@ self: { time wai ]; description = "Iron, Hawk, Oz: Web auth protocols"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -135136,7 +135888,7 @@ self: { sha256 = "1ayfywgrlmzivsq6lirmgvl65x1shf8041lzw2yh245rkmd91lsf"; libraryHaskellDepends = [ base mtl text ]; description = "Haskell Server Pages is a library for writing dynamic server-side web pages"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hsp-cgi" = callPackage @@ -135147,8 +135899,8 @@ self: { sha256 = "0m1xylqzmi2c1c92zk5bq6232id9fmjlx4s88ic2fvf5a389n11n"; libraryHaskellDepends = [ base containers harp hsp network ]; description = "Facilitates running Haskell Server Pages web pages as CGI programs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -135160,7 +135912,7 @@ self: { sha256 = "10za4f07a5agg3zgy32fdz02vg9fl344qswhzj5mnx8wpnxmr3y6"; libraryHaskellDepends = [ base bytestring dataenc gd ]; description = "Sparklines for Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hsparql" = callPackage @@ -135181,8 +135933,8 @@ self: { test-framework-hunit text wai warp ]; description = "A SPARQL query generator and DSL, and a client to query a SPARQL server"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -135199,7 +135951,7 @@ self: { ]; description = "Haskell Spear Parser"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -135209,29 +135961,13 @@ self: { }: mkDerivation { pname = "hspec"; - version = "2.7.5"; - sha256 = "0dyd0rb5sh5b72v14qmgwnv2fq76wiz9h8k0027bl8lsl0a77gmv"; + version = "2.7.8"; + sha256 = "0v6bf6ir6h97mys797amr8idl1a6w1gpvj7ps3k0gkxwrnsyvynh"; libraryHaskellDepends = [ base hspec-core hspec-discover hspec-expectations QuickCheck ]; description = "A Testing Framework for Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hspec_2_7_6" = callPackage - ({ mkDerivation, base, hspec-core, hspec-discover - , hspec-expectations, QuickCheck - }: - mkDerivation { - pname = "hspec"; - version = "2.7.6"; - sha256 = "0ynd111mwm5ykl74nb7ac7mz1b9xvs1hqjdksfm83dy2sj4axwpx"; - libraryHaskellDepends = [ - base hspec-core hspec-discover hspec-expectations QuickCheck - ]; - description = "A Testing Framework for Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; }) {}; "hspec-attoparsec" = callPackage @@ -135249,7 +135985,7 @@ self: { attoparsec base bytestring hspec hspec-expectations text ]; description = "Utility functions for testing your attoparsec parsers with hspec"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hspec-bracket" = callPackage @@ -135260,7 +135996,7 @@ self: { sha256 = "1d6262frfaghmq77nqsvcalm6w4jl7bn995bkphx461skhm8n300"; libraryHaskellDepends = [ base hspec ]; description = "The bracket definitions for Hspec"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hspec-checkers" = callPackage @@ -135272,7 +136008,7 @@ self: { libraryHaskellDepends = [ base checkers hspec ]; testHaskellDepends = [ base checkers hspec ]; description = "Allows to use checkers properties from hspec"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hspec-contrib" = callPackage @@ -135286,7 +136022,7 @@ self: { libraryHaskellDepends = [ base hspec-core HUnit ]; testHaskellDepends = [ base hspec hspec-core HUnit QuickCheck ]; description = "Contributed functionality for Hspec"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hspec-core" = callPackage @@ -135297,35 +136033,10 @@ self: { }: mkDerivation { pname = "hspec-core"; - version = "2.7.5"; - sha256 = "0pgmy4r47pdya1h5g1mk4idjs7c2b5dqa5xkqgqn2v60bg32n17p"; - libraryHaskellDepends = [ - ansi-terminal array base call-stack clock deepseq directory - filepath hspec-expectations HUnit QuickCheck quickcheck-io random - setenv stm tf-random transformers - ]; - testHaskellDepends = [ - ansi-terminal array base call-stack clock deepseq directory - filepath hspec-expectations hspec-meta HUnit process QuickCheck - quickcheck-io random setenv silently stm temporary tf-random - transformers - ]; - testToolDepends = [ hspec-meta ]; - testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'"; - description = "A Testing Framework for Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hspec-core_2_7_6" = callPackage - ({ mkDerivation, ansi-terminal, array, base, call-stack, clock - , deepseq, directory, filepath, hspec-expectations, hspec-meta - , HUnit, process, QuickCheck, quickcheck-io, random, setenv - , silently, stm, temporary, tf-random, transformers - }: - mkDerivation { - pname = "hspec-core"; - version = "2.7.6"; - sha256 = "1j9kpvjf1yz3bl32cklxz8dnykc48ya67lin4r2hvbzcd3kg63rf"; + version = "2.7.8"; + sha256 = "10c7avvjcrpy3nrf5xng4177nmxvz0gmc83h7qlnljcp3rkimbvd"; + revision = "1"; + editedCabalFile = "0hjp0lq7lg5a12ym43jprx7rc4c8mcd8gh7whpgpn5qmp9z4hyyg"; libraryHaskellDepends = [ ansi-terminal array base call-stack clock deepseq directory filepath hspec-expectations HUnit QuickCheck quickcheck-io random @@ -135340,8 +136051,7 @@ self: { testToolDepends = [ hspec-meta ]; testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'"; description = "A Testing Framework for Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; }) {}; "hspec-dirstream" = callPackage @@ -135359,7 +136069,7 @@ self: { ]; testHaskellDepends = [ base hspec ]; description = "Helper functions to simplify adding integration tests"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hspec-discover" = callPackage @@ -135367,27 +136077,8 @@ self: { }: mkDerivation { pname = "hspec-discover"; - version = "2.7.5"; - sha256 = "1d049y6g15s2rvng8gzbnv0fybfhyxjs3hp200fg8kwzq7vzkvmf"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base directory filepath ]; - executableHaskellDepends = [ base directory filepath ]; - testHaskellDepends = [ - base directory filepath hspec-meta QuickCheck - ]; - testToolDepends = [ hspec-meta ]; - description = "Automatically discover and run Hspec tests"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hspec-discover_2_7_6" = callPackage - ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck - }: - mkDerivation { - pname = "hspec-discover"; - version = "2.7.6"; - sha256 = "12n26rxdrpk54fqrgrdj7r8kyq3fla3na10j4pnsjkir72bvhd17"; + version = "2.7.8"; + sha256 = "0z2ysmy4qzv4jyb5yqmavhmbhqk2ch0cmaj18i9jvbg0y7fpsn67"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath ]; @@ -135397,8 +136088,7 @@ self: { ]; testToolDepends = [ hspec-meta ]; description = "Automatically discover and run Hspec tests"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; }) {}; "hspec-expectations" = callPackage @@ -135410,7 +136100,7 @@ self: { libraryHaskellDepends = [ base call-stack HUnit ]; testHaskellDepends = [ base call-stack HUnit nanospec ]; description = "Catchy combinators for HUnit"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hspec-expectations-json" = callPackage @@ -135427,8 +136117,8 @@ self: { ]; testHaskellDepends = [ aeson-qq base hspec ]; description = "Hspec expectations for JSON Values"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -135445,7 +136135,7 @@ self: { ]; testHaskellDepends = [ base hspec lens silently ]; description = "Hspec expectations for the lens stuff"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }) {}; "hspec-expectations-lifted" = callPackage @@ -135456,7 +136146,7 @@ self: { sha256 = "0a1qwz0n80lph8m9cq6cb06m8bsmqgg8ifx0acpylvrrkd8g3k92"; libraryHaskellDepends = [ base hspec-expectations transformers ]; description = "A version of hspec-expectations generalized to MonadIO"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hspec-expectations-match" = callPackage @@ -135472,8 +136162,8 @@ self: { ]; testHaskellDepends = [ base hspec ]; description = "An hspec expectation that asserts a value matches a pattern"; - license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -135489,8 +136179,8 @@ self: { base deepseq hspec-expectations wl-pprint-extras wl-pprint-terminfo ]; description = "hspec-expectations with pretty printing on failure"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -135507,7 +136197,7 @@ self: { ]; testHaskellDepends = [ aeson base hspec HUnit text ]; description = "Catchy combinators for HUnit"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hspec-experimental" = callPackage @@ -135519,8 +136209,8 @@ self: { libraryHaskellDepends = [ base hspec HUnit QuickCheck ]; testHaskellDepends = [ base hspec-meta ]; description = "An experimental DSL for testing on top of Hspec"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -135538,7 +136228,7 @@ self: { executableHaskellDepends = [ base directory optparse-applicative ]; testHaskellDepends = [ base directory hspec hspec-core silently ]; description = "Golden tests for hspec"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hspec-golden-aeson" = callPackage @@ -135559,7 +136249,7 @@ self: { quickcheck-arbitrary-adt silently transformers ]; description = "Use tests to monitor changes in Aeson serialization"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hspec-hashable" = callPackage @@ -135575,8 +136265,8 @@ self: { base hashable hspec hspec-core QuickCheck silently ]; description = "Initial project template from stack"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -135595,7 +136285,7 @@ self: { ]; testHaskellDepends = [ base hedgehog hspec ]; description = "Integrate Hedgehog and Hspec!"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hspec-jenkins" = callPackage @@ -135606,8 +136296,8 @@ self: { sha256 = "16aql0fyssc16z85isskccq93dj5i1pydblnf2q1np7z6pl1azy2"; libraryHaskellDepends = [ base blaze-markup hspec ]; description = "Jenkins-friendly XML formatter for Hspec"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -135621,7 +136311,7 @@ self: { testHaskellDepends = [ base hspec markdown-unlit QuickCheck ]; testToolDepends = [ markdown-unlit ]; description = "Document and test laws for standard type classes"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hspec-leancheck" = callPackage @@ -135633,7 +136323,7 @@ self: { libraryHaskellDepends = [ base hspec hspec-core HUnit leancheck ]; testHaskellDepends = [ base hspec leancheck ]; description = "LeanCheck support for the Hspec test framework"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hspec-megaparsec" = callPackage @@ -135649,35 +136339,32 @@ self: { ]; testHaskellDepends = [ base hspec hspec-expectations megaparsec ]; description = "Utility functions for testing Megaparsec parsers with Hspec"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hspec-meta" = callPackage ({ mkDerivation, ansi-terminal, array, base, call-stack, clock - , deepseq, directory, filepath, hspec-expectations, HUnit - , QuickCheck, quickcheck-io, random, setenv, stm, time - , transformers + , deepseq, directory, filepath, QuickCheck, quickcheck-io, random + , setenv, stm, time, transformers }: mkDerivation { pname = "hspec-meta"; - version = "2.6.0"; - sha256 = "1n1a4633wfivylglji8920f67mx7qz8j4q58n8p7dxk6yg4h3mz6"; - revision = "1"; - editedCabalFile = "1qh3j6mhlz2bvdk8qc5fa4nqh93q4vqnvxmqqisg4agacnvyp4b2"; + version = "2.7.8"; + sha256 = "0sfj0n2hy1r8ifysgbcmfdygcd7vyzr13ldkcp0l2ml337f8j0si"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-terminal array base call-stack clock deepseq directory - filepath hspec-expectations HUnit QuickCheck quickcheck-io random - setenv stm time transformers + filepath QuickCheck quickcheck-io random setenv stm time + transformers ]; executableHaskellDepends = [ ansi-terminal array base call-stack clock deepseq directory - filepath hspec-expectations HUnit QuickCheck quickcheck-io random - setenv stm time transformers + filepath QuickCheck quickcheck-io random setenv stm time + transformers ]; description = "A version of Hspec which is used to test Hspec itself"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hspec-monad-control" = callPackage @@ -135692,8 +136379,8 @@ self: { base hspec-core monad-control transformers transformers-base ]; description = "Orphan instances of MonadBase and MonadBaseControl for SpecM"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -135710,7 +136397,7 @@ self: { ]; testHaskellDepends = [ base hspec ]; description = "A testing framework for Haskell using Hspec"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "hspec-need-env" = callPackage @@ -135724,7 +136411,7 @@ self: { libraryHaskellDepends = [ base hspec-core hspec-expectations ]; testHaskellDepends = [ base hspec hspec-core setenv transformers ]; description = "Read environment variables for hspec tests"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hspec-parsec" = callPackage @@ -135738,7 +136425,7 @@ self: { libraryHaskellDepends = [ base hspec-expectations parsec ]; testHaskellDepends = [ base hspec parsec ]; description = "Hspec expectations for testing Parsec parsers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hspec-pg-transact" = callPackage @@ -135754,8 +136441,8 @@ self: { text tmp-postgres ]; description = "Helpers for creating database tests with hspec and pg-transact"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -135774,7 +136461,7 @@ self: { ]; testHaskellDepends = [ base hspec hspec-contrib transformers ]; description = "Test Framework for checking server's status"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hspec-setup" = callPackage @@ -135803,8 +136490,8 @@ self: { projectroot QuickCheck split strict ]; description = "Add an hspec test-suite in one command"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -135816,8 +136503,8 @@ self: { sha256 = "0b4y84vqyx22kihr0sbbxzr6sdz99hi2rhyl09r8ddzkzqadfii3"; libraryHaskellDepends = [ hspec test-shouldbe ]; description = "Convenience wrapper and utilities for hspec"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -135834,7 +136521,7 @@ self: { ]; testHaskellDepends = [ base hspec mtl stm ]; description = "Find slow test cases"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hspec-smallcheck" = callPackage @@ -135853,7 +136540,7 @@ self: { smallcheck ]; description = "SmallCheck support for the Hspec testing framework"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hspec-snap" = callPackage @@ -135876,8 +136563,8 @@ self: { transformers ]; description = "A library for testing with Hspec and the Snap Web Framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -135889,7 +136576,7 @@ self: { sha256 = "1svdw7z92cxfflyahq1gn6kfb33p7pl4byqp5a4baj7b5gd18rqg"; libraryHaskellDepends = [ base directory hspec safe strict ]; description = "Simple project template from stack"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hspec-structured-formatter" = callPackage @@ -135899,8 +136586,8 @@ self: { version = "0.1.0.3"; sha256 = "008gm0qvhvp6z6a9sq5vpljqb90258apd83rkzy47k3bczy1sgmj"; libraryHaskellDepends = [ base hspec ]; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -135915,7 +136602,7 @@ self: { libraryHaskellDepends = [ base hspec-core ]; testHaskellDepends = [ base hspec hspec-core ]; description = "Table-driven (by-example) HSpec tests"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hspec-test-framework" = callPackage @@ -135930,7 +136617,7 @@ self: { base hspec hspec-contrib hspec-core HUnit QuickCheck ]; description = "Run test-framework tests with Hspec"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hspec-test-framework-th" = callPackage @@ -135946,7 +136633,7 @@ self: { ]; testHaskellDepends = [ base hspec-test-framework HUnit ]; description = "Run test-framework tests with Hspec"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hspec-test-sandbox" = callPackage @@ -135958,8 +136645,8 @@ self: { libraryHaskellDepends = [ base hspec hspec-core test-sandbox ]; testHaskellDepends = [ base hspec test-sandbox ]; description = "Hspec convenience functions for use with test-sandbox"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -135983,7 +136670,7 @@ self: { wai-extra ]; description = "Experimental Hspec support for testing WAI applications"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hspec-wai_0_11_1" = callPackage @@ -136006,8 +136693,8 @@ self: { wai-extra ]; description = "Experimental Hspec support for testing WAI applications"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "hspec-wai-json" = callPackage @@ -136024,7 +136711,7 @@ self: { ]; testHaskellDepends = [ base hspec hspec-wai ]; description = "Testing JSON APIs with hspec-wai"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hspec-wai-json_0_11_0" = callPackage @@ -136041,8 +136728,8 @@ self: { ]; testHaskellDepends = [ base hspec hspec-wai ]; description = "Testing JSON APIs with hspec-wai"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "hspec-webdriver" = callPackage @@ -136059,8 +136746,8 @@ self: { stm text transformers unordered-containers webdriver ]; description = "Write end2end web application tests using webdriver and hspec"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -136074,8 +136761,8 @@ self: { editedCabalFile = "1q0pw1ggki7h839jicf2k0lllbm219qjcr3407hvcih9vfkbw03j"; libraryHaskellDepends = [ base hspec hspec-discover ]; description = "Alpha version of Hspec 2.0"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -136087,8 +136774,8 @@ self: { sha256 = "0y45jizkf2kfj3yjjkq96kavkfp74vf5dyyjvi9pj3kshf8sx8il"; libraryHaskellDepends = [ base hspec QuickCheckVariant ]; description = "Spec for testing properties for variant types"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -136107,8 +136794,8 @@ self: { RSA unix utf8-string ]; description = "Wrapper for PKCS #11 interface"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -136120,7 +136807,7 @@ self: { sha256 = "1qnqg2gg93l5dp2nyvvaq7n58gsnljvbafbhfpvys48g5ry2dk7a"; libraryHaskellDepends = [ base old-time ]; description = "Session handler for HSP"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "hspread" = callPackage @@ -136135,8 +136822,8 @@ self: { base binary bytestring containers extensible-exceptions network ]; description = "A client library for the spread toolkit"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -136151,8 +136838,8 @@ self: { libraryHaskellDepends = [ array base bytestring vty ]; doHaddock = false; description = "A terminal presentation tool"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -136178,8 +136865,8 @@ self: { test-framework-hunit ]; description = "The Haskell Stream Processor command line utility"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -136191,8 +136878,8 @@ self: { sha256 = "0i53n42ynq22fzlz4kpmri4q4abmi4dz8bz0izn307is1pmk4bby"; libraryHaskellDepends = [ base old-time ]; description = "Database access from Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -136207,8 +136894,8 @@ self: { libraryHaskellDepends = [ base Cabal hsql ]; librarySystemDepends = [ mysqlclient ]; description = "MySQL driver for HSQL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {mysqlclient = null;}; @@ -136221,8 +136908,8 @@ self: { libraryHaskellDepends = [ base hsql old-time ]; librarySystemDepends = [ unixODBC ]; description = "A Haskell Interface to ODBC"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) unixODBC;}; @@ -136235,8 +136922,8 @@ self: { libraryHaskellDepends = [ base hsql old-time ]; librarySystemDepends = [ postgresql ]; description = "A Haskell Interface to PostgreSQL via the PQ library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) postgresql;}; @@ -136249,8 +136936,8 @@ self: { libraryHaskellDepends = [ base hsql ]; librarySystemDepends = [ sqlite ]; description = "SQLite3 driver for HSQL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) sqlite;}; @@ -136272,8 +136959,8 @@ self: { base containers directory QuickCheck tagged text ]; description = "Haskell binding for Qt Quick"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {qt5 = null;}; "hsqml-datamodel" = callPackage @@ -136285,8 +136972,8 @@ self: { libraryHaskellDepends = [ base hsqml template-haskell text ]; libraryPkgconfigDepends = [ qt5 ]; description = "HsQML (Qt5) data model"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {qt5 = null;}; "hsqml-datamodel-vinyl" = callPackage @@ -136301,8 +136988,8 @@ self: { base exceptions hsqml-datamodel type-list vinyl ]; description = "HsQML DataModel instances for Vinyl Rec"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "hsqml-demo-manic" = callPackage @@ -136318,8 +137005,8 @@ self: { base containers hsqml MonadRandom text ]; description = "HsQML-based clone of Pipe Mania"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "hsqml-demo-morris" = callPackage @@ -136337,8 +137024,8 @@ self: { base containers deepseq directory hsqml OddWord text ]; description = "HsQML-based implementation of Nine Men's Morris"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "hsqml-demo-notes" = callPackage @@ -136356,8 +137043,8 @@ self: { base containers hsqml sqlite-simple text transformers ]; description = "Sticky notes example program implemented in HsQML"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "hsqml-demo-samples" = callPackage @@ -136371,8 +137058,8 @@ self: { enableSeparateDataOutput = true; executableHaskellDepends = [ base hsqml OpenGL OpenGLRaw text ]; description = "HsQML sample programs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "hsqml-morris" = callPackage @@ -136390,8 +137077,8 @@ self: { base containers deepseq directory hsqml OddWord tagged ]; description = "HsQML-based implementation of Nine Men's Morris"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "hsreadability" = callPackage @@ -136414,8 +137101,8 @@ self: { text ]; description = "Access to the Readability API"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -136430,8 +137117,8 @@ self: { attoparsec base bytestring network utf8-string ]; description = "RELP (Reliable Event Logging Protocol) server implementation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -136446,7 +137133,7 @@ self: { testHaskellDepends = [ base tasty tasty-hunit unix ]; description = "Haskell bindings to libseccomp"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {seccomp = null;}; @@ -136470,7 +137157,7 @@ self: { memory stm tasty tasty-hunit tasty-quickcheck ]; description = "SSH protocol implementation"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hsshellscript" = callPackage @@ -136485,6 +137172,19 @@ self: { license = "LGPL"; }) {}; + "hsshellscript_3_5_0" = callPackage + ({ mkDerivation, base, c2hs, directory, parsec, random, unix }: + mkDerivation { + pname = "hsshellscript"; + version = "3.5.0"; + sha256 = "1gdj6b3b0b71jcmxd5wc42gs9v5s37jqd1jwryif84qbiq8rskgr"; + libraryHaskellDepends = [ base directory parsec random unix ]; + libraryToolDepends = [ c2hs ]; + description = "Haskell for Unix shell scripting tasks"; + license = "LGPL"; + hydraPlatforms = lib.platforms.none; + }) {}; + "hssourceinfo" = callPackage ({ mkDerivation, base, containers, directory, filepath, regexpr }: mkDerivation { @@ -136497,7 +137197,7 @@ self: { base containers directory filepath regexpr ]; description = "get haskell source code info"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hssqlppp" = callPackage @@ -136518,8 +137218,8 @@ self: { tasty tasty-hunit template-haskell text transformers uniplate ]; description = "SQL parser and type checker"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -136538,8 +137238,8 @@ self: { base hssqlppp syb tasty tasty-hunit template-haskell text ]; description = "hssqlppp extras which need template-haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -136562,8 +137262,8 @@ self: { ]; executableToolDepends = [ cpphs ]; description = "Haskell version of tar CLI utility"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -136579,7 +137279,7 @@ self: { array base hmatrix hmatrix-gsl-stats random vector ]; description = "Statistics"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hstats" = callPackage @@ -136590,8 +137290,8 @@ self: { sha256 = "1a0rzbnbxd7r9b0ibs74nzijbdhj019wssdk1fls2r9i0w1v6i9h"; libraryHaskellDepends = [ base ]; description = "Statistical Computing in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -136603,8 +137303,8 @@ self: { sha256 = "092q52yyb1xdji1y72bdcgvp8by2w1z9j717sl1gmh2p89cpjrs4"; libraryHaskellDepends = [ base bytestring mtl network text ]; description = "Quick and dirty statsd interface"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -136622,8 +137322,8 @@ self: { base directory filepath ghc ghc-paths HUnit mtl QuickCheck random ]; description = "Runs tests via QuickCheck1 and HUnit; like quickCheck-script but uses GHC api"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -136637,8 +137337,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base haskell-src-exts ]; description = "Takes haskell source on stdin, parses it, then prettyprints it to stdout"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -136667,8 +137367,8 @@ self: { test-framework-quickcheck2 ]; description = "Distributed instant messaging over Tor"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; }) {}; "hstox" = callPackage @@ -136695,8 +137395,8 @@ self: { executableHaskellDepends = [ base process ]; testHaskellDepends = [ async base ]; description = "A Tox protocol implementation in Haskell"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -136721,8 +137421,8 @@ self: { base bytestring conduit resourcet transformers ]; description = "Tradeking API bindings for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -136740,8 +137440,8 @@ self: { base cmdargs directory filepath haskell-src-exts syb text vector ]; description = "Checks Haskell source code for style compliance"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -136762,8 +137462,8 @@ self: { mtl parallel QuickCheck random unordered-containers vector xml ]; description = "A two player abstract strategy game"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -136785,8 +137485,8 @@ self: { system-filepath text text-format time transformers unix ]; description = "One-time, faithful conversion of Subversion repositories to Git"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -136815,8 +137515,8 @@ self: { http-client http-client-tls hxt QuickCheck text ]; description = "Sudoku game with a GTK3 interface"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -136836,7 +137536,7 @@ self: { shakespeare text transformers ]; description = "Synthesizable Verilog DSL supporting for multiple clock and reset"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hswip" = callPackage @@ -136849,7 +137549,7 @@ self: { librarySystemDepends = [ ncurses readline swipl ]; description = "embedding prolog in haskell"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) ncurses; inherit (pkgs) readline; swipl = null;}; @@ -136866,8 +137566,8 @@ self: { isExecutable = true; libraryHaskellDepends = [ base haskell-src-exts mtl utf8-string ]; description = "HSX (Haskell Source with XML) allows literal XML syntax in Haskell source code"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -136881,8 +137581,8 @@ self: { base hsp jmacro mtl text wl-pprint-text ]; description = "hsp+jmacro support"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -136894,8 +137594,8 @@ self: { sha256 = "1051fh4yjnsax60v4rfh5r87n660ygq033gmg710nm3gw57ihkl2"; libraryHaskellDepends = [ base hsx mtl ]; description = "XHTML utilities to use together with HSX"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -136918,7 +137618,7 @@ self: { template-haskell utf8-string ]; description = "HSX (Haskell Source with XML) allows literal XML syntax in Haskell source code"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hsyscall" = callPackage @@ -136929,8 +137629,8 @@ self: { sha256 = "0ysi317vwgksaq78k31sb8s34rjjhl4w8ncvycfsmmdnv7cdg2ld"; libraryHaskellDepends = [ base ]; description = "FFI to syscalls"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -136946,8 +137646,8 @@ self: { isExecutable = true; libraryHaskellDepends = [ base ]; description = "FFI interface to syslog(3) from POSIX.1-2001"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ peti ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ peti ]; }) {}; "hsyslog-tcp" = callPackage @@ -136962,8 +137662,8 @@ self: { base bytestring hsyslog hsyslog-udp network text time ]; description = "syslog over TCP"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -136980,7 +137680,7 @@ self: { ]; testHaskellDepends = [ base hspec time ]; description = "Log to syslog over a network via UDP"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hszephyr" = callPackage @@ -136992,8 +137692,8 @@ self: { libraryHaskellDepends = [ base bytestring mtl time ]; librarySystemDepends = [ com_err zephyr ]; description = "Simple libzephyr bindings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {com_err = null; zephyr = null;}; @@ -137013,7 +137713,7 @@ self: { testHaskellDepends = [ base directory filepath hspec ]; testToolDepends = [ hspec-discover ]; description = "Bindings to TagLib, audio meta-data library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) taglib;}; "htags" = callPackage @@ -137028,8 +137728,8 @@ self: { base directory filepath haskell-src mtl ]; description = "A Haskell98 parsing tags program similar to ctags"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -137047,8 +137747,8 @@ self: { base bytestring bzlib directory filepath old-locale tar time zlib ]; description = "Command-line tar archive utility"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -137060,7 +137760,7 @@ self: { sha256 = "18kgglc22k4v66hh9yf2qa7zx60ka2xl9bvzpinvc5v4zv0prl7l"; libraryHaskellDepends = [ base ]; description = "Tautology Proving Logic in Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "htdp-image" = callPackage @@ -137076,8 +137776,8 @@ self: { base gloss HUnit test-framework test-framework-hunit ]; description = "Beginner friendly graphics library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -137093,8 +137793,8 @@ self: { libraryToolDepends = [ gcc ]; executableHaskellDepends = [ base ]; description = "A library for testing correctness of pseudo random number generators in Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) gcc;}; @@ -137111,8 +137811,8 @@ self: { zlib ]; description = "Import from the Tiled map editor"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -137126,7 +137826,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base process time ]; description = "Timing utility for the command line"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "htirage" = callPackage @@ -137142,7 +137842,7 @@ self: { base containers QuickCheck tasty tasty-quickcheck text transformers ]; description = "Equiprobable draw from publicly verifiable random data"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "htlset" = callPackage @@ -137153,8 +137853,8 @@ self: { sha256 = "0i7qipq0dbyd9zqjl1n6sxzma066293gpbxwqwd84wiw3vw2gz3w"; libraryHaskellDepends = [ base containers ]; description = "Heterogenous Set"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -137166,7 +137866,7 @@ self: { sha256 = "0q9hmfii62kc82ijlg238fxrzxhsivn42x5wd6ffcr9xldg4jd8c"; libraryHaskellDepends = [ base ]; description = "HTML combinator library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "html-charset" = callPackage @@ -137190,8 +137890,8 @@ self: { base bytestring doctest doctest-discover hlint QuickCheck ]; description = "Determine character encoding of HTML documents/fragments"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -137212,7 +137912,7 @@ self: { base bytestring containers deepseq hspec HUnit text xml-conduit ]; description = "Parse HTML documents using xml-conduit datatypes"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "html-email-validate" = callPackage @@ -137229,7 +137929,7 @@ self: { ]; benchmarkHaskellDepends = [ base criterion text ]; description = "Validating an email address against HTML standard"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "html-entities" = callPackage @@ -137244,7 +137944,7 @@ self: { attoparsec base base-prelude text unordered-containers ]; description = "A codec library for HTML-escaped text and HTML-entities"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "html-entity" = callPackage @@ -137264,7 +137964,7 @@ self: { ]; testHaskellDepends = [ base doctest ]; description = "HTML entity decoding and encoding for Text"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "html-entity-map" = callPackage @@ -137280,7 +137980,7 @@ self: { base criterion text unordered-containers ]; description = "Map from HTML5 entity names to the corresponding Unicode text"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "html-kure" = callPackage @@ -137291,8 +137991,8 @@ self: { sha256 = "1x72f3r6nayv03y0a7x5dyj2lnbli14nmqi5i7i8isqbngsvca0l"; libraryHaskellDepends = [ base hxt kure ]; description = "HTML rewrite engine, using KURE"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -137331,7 +138031,7 @@ self: { attoparsec base criterion deepseq tagsoup text ]; description = "A high-performance HTML tokenizer"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "html-rules" = callPackage @@ -137342,8 +138042,8 @@ self: { sha256 = "1k0jqx1mlcar6z8ggrz3fv1nzilkwdxvg3gvsb3pg7nvbkhz5lpw"; libraryHaskellDepends = [ base lens mtl tagsoup transformers ]; description = "Perform traversals of HTML structures using sets of rules"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -137366,8 +138066,8 @@ self: { tasty-hunit tasty-quickcheck ]; description = "An \"attoparsec\"-based HTML tokenizer"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -137379,7 +138079,7 @@ self: { sha256 = "1d66kdg81774b8isw1mfkl54sgmaz0n04n6shd5jjz18sjwyxp14"; libraryHaskellDepends = [ base tagsoup ]; description = "A HTML truncator"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "html-validator-cli" = callPackage @@ -137406,7 +138106,7 @@ self: { hspec http-conduit text utf8-string ]; description = "A command-line interface for https://validator.w3.org/"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "html2hamlet" = callPackage @@ -137425,7 +138125,7 @@ self: { optparse-declarative regex-tdfa text wl-pprint-text xml-conduit ]; description = "HTML to Hamlet converter"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "html5-entity" = callPackage @@ -137439,7 +138139,7 @@ self: { libraryHaskellDepends = [ base containers text ]; benchmarkHaskellDepends = [ base containers criterion ]; description = "A library for looking up and validating HTML5 entities"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "htn" = callPackage @@ -137451,7 +138151,7 @@ self: { libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers hspec ]; description = "resolver using htn algorithm"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "htodo" = callPackage @@ -137464,7 +138164,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base HDBC HDBC-sqlite3 ]; description = "A todo application"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "htoml" = callPackage @@ -137489,7 +138189,7 @@ self: { unordered-containers vector ]; description = "Parser for TOML files"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "htoml-megaparsec" = callPackage @@ -137515,7 +138215,7 @@ self: { benchmarkHaskellDepends = [ base criterion text ]; doHaddock = false; description = "Parser for TOML files"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "htrace" = callPackage @@ -137526,7 +138226,7 @@ self: { sha256 = "0ar1w9p6ppag2vp8kw6byirhfdfs4r639pjh5icnyiiliz6jkvlx"; libraryHaskellDepends = [ base ]; description = "Hierarchical tracing for debugging of lazy evaluation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hts" = callPackage @@ -137539,7 +138239,7 @@ self: { libraryHaskellDepends = [ base hmt xml ]; description = "Haskell Music Typesetting"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -137563,8 +138263,8 @@ self: { htsn-common hxt MissingH network process tasty tasty-hunit unix ]; description = "Parse XML files from The Sports Network feed"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -137578,7 +138278,7 @@ self: { ansi-terminal base hslogger transformers ]; description = "Display/logging facilities used by both htsn and htsn-import"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "htsn-import" = callPackage @@ -137607,8 +138307,8 @@ self: { split tasty tasty-hunit time transformers tuple ]; description = "Import XML files from The Sports Network into an RDBMS"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -137620,8 +138320,8 @@ self: { sha256 = "15wbafj54yfipp3pfqk0yd5qlzm76457mngv1fs899sp31y2m2cv"; libraryHaskellDepends = [ base containers ]; description = "Heterogenous Sets"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -137634,7 +138334,7 @@ self: { libraryHaskellDepends = [ base bytestring ]; description = "Functions for working with HTTP Accept headers"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "http-api-data" = callPackage @@ -137661,7 +138361,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Converting to/from HTTP API data like URL pieces, headers and query parameters"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "http-api-data_0_4_3" = callPackage @@ -137686,8 +138386,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Converting to/from HTTP API data like URL pieces, headers and query parameters"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "http-attoparsec" = callPackage @@ -137698,8 +138398,8 @@ self: { sha256 = "12l892fix11mrvm10awwvv31y59q5rb6gb0sqjp6l4p4ym9ngqa3"; libraryHaskellDepends = [ attoparsec base bytestring http-types ]; description = "Attoparsec parsers for http-types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -137727,25 +138427,25 @@ self: { ]; doCheck = false; description = "An HTTP client engine"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; - "http-client_0_7_3" = callPackage - ({ mkDerivation, array, async, base, blaze-builder, bytestring - , case-insensitive, containers, cookie, deepseq, directory - , exceptions, filepath, ghc-prim, hspec, http-types, memory - , mime-types, monad-control, network, network-uri, random, stm - , streaming-commons, text, time, transformers, zlib + "http-client_0_7_4" = callPackage + ({ mkDerivation, array, async, base, base64-bytestring + , blaze-builder, bytestring, case-insensitive, containers, cookie + , deepseq, directory, exceptions, filepath, ghc-prim, hspec + , http-types, mime-types, monad-control, network, network-uri + , random, stm, streaming-commons, text, time, transformers, zlib }: mkDerivation { pname = "http-client"; - version = "0.7.3"; - sha256 = "0jpy5rlv4iwq79h5p37g0nnh5ff2qi4swxx8xmr98v0znvz6wc8i"; + version = "0.7.4"; + sha256 = "1a4vhhn8y5qcqd4i2q7pl9jqfrsh65nkv32qcsc80cjy2bcqivjs"; libraryHaskellDepends = [ - array base blaze-builder bytestring case-insensitive containers - cookie deepseq exceptions filepath ghc-prim http-types memory - mime-types network network-uri random stm streaming-commons text - time transformers + array base base64-bytestring blaze-builder bytestring + case-insensitive containers cookie deepseq exceptions filepath + ghc-prim http-types mime-types network network-uri random stm + streaming-commons text time transformers ]; testHaskellDepends = [ async base blaze-builder bytestring case-insensitive containers @@ -137754,8 +138454,8 @@ self: { ]; doCheck = false; description = "An HTTP client engine"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "http-client-auth" = callPackage @@ -137773,8 +138473,8 @@ self: { transformers utf8-string ]; description = "HTTP authorization (both basic and digest) done right"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -137787,7 +138487,7 @@ self: { libraryHaskellDepends = [ base http-client ]; doHaddock = false; description = "Frontend support for using http-client with conduit (deprecated)"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "http-client-extra" = callPackage @@ -137806,7 +138506,7 @@ self: { http-types random text transformers ]; description = "wrapper for http-client exposing cookies"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "http-client-lens" = callPackage @@ -137821,8 +138521,8 @@ self: { base bytestring http-client http-types lens network ]; description = "Optics for http-client"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -137835,7 +138535,7 @@ self: { libraryHaskellDepends = [ base http-client ]; doHaddock = false; description = "Generate multipart uploads for http-client. (deprecated)"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "http-client-openssl" = callPackage @@ -137854,7 +138554,7 @@ self: { ]; doCheck = false; description = "http-client backend using the OpenSSL library"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "http-client-openssl_0_3_3" = callPackage @@ -137873,8 +138573,8 @@ self: { ]; doCheck = false; description = "http-client backend using the OpenSSL library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "http-client-overrides" = callPackage @@ -137896,7 +138596,7 @@ self: { base bytestring http-client tasty tasty-hunit text ]; description = "HTTP client overrides"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "http-client-request-modifiers" = callPackage @@ -137912,8 +138612,8 @@ self: { network network-uri ]; description = "Convenient monadic HTTP request modifiers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -137923,14 +138623,14 @@ self: { }: mkDerivation { pname = "http-client-restricted"; - version = "0.0.3"; - sha256 = "1xn84430haz2r9ikkxbi6awgpi0ybc7d7gp1plqhxq43ws626sam"; + version = "0.0.4"; + sha256 = "0jljvfjbdjxj61m6nznysbh9y7nszrzmdv0i8ndxgshnmc19q9h1"; libraryHaskellDepends = [ base connection data-default http-client http-client-tls network network-bsd utf8-string ]; description = "restricting the servers that http-client will use"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "http-client-session" = callPackage @@ -137945,8 +138645,8 @@ self: { base-prelude bytestring either http-client mtl-prelude ]; description = "A simple abstraction over the \"http-client\" connection manager"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -137963,8 +138663,8 @@ self: { io-streams mtl transformers ]; description = "http-client for io-streams supporting openssl"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -137991,7 +138691,7 @@ self: { benchmarkHaskellDepends = [ base gauge http-client ]; doCheck = false; description = "http-client backend using the connection package and tls library"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "http-client-websockets" = callPackage @@ -138009,8 +138709,8 @@ self: { base bytestring hspec http-client-tls network-uri websockets ]; description = "Glue code for http-client and websockets"; - license = stdenv.lib.licenses.cc0; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.cc0; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -138028,7 +138728,7 @@ self: { directory mtl network text transformers unordered-containers ]; description = "Common types for HTTP clients and servers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "http-conduit" = callPackage @@ -138056,7 +138756,7 @@ self: { ]; doCheck = false; description = "HTTP client package with conduit interface and HTTPS support"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "http-conduit-browser" = callPackage @@ -138082,8 +138782,8 @@ self: { resourcet text time transformers wai warp ]; description = "Browser interface to the http-conduit package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -138101,8 +138801,8 @@ self: { http-client-openssl http-types network network-uri text time zlib ]; description = "HTTP downloader tailored for web-crawler needs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -138119,7 +138819,7 @@ self: { base bytestring doctest hspec old-locale time ]; description = "HTTP Date parser/formatter"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "http-directory" = callPackage @@ -138137,8 +138837,8 @@ self: { ]; testHaskellDepends = [ base hspec text ]; description = "http directory listing library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -138156,8 +138856,8 @@ self: { ]; testHaskellDepends = [ aeson base hspec ]; description = "High level HTTP client for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -138184,7 +138884,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Verified downloads with retries"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "http-encodings" = callPackage @@ -138201,7 +138901,7 @@ self: { base bytestring HTTP iconv mime mtl parsec text utf8-string zlib ]; description = "A library for encoding and decoding bodies of HTTP messages"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "http-enumerator" = callPackage @@ -138225,8 +138925,8 @@ self: { utf8-string zlib-enum ]; description = "HTTP client package with enumerator interface and HTTPS support. (deprecated)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -138238,8 +138938,8 @@ self: { sha256 = "1x073nw7fagbj16x42n7xgyr5liv69l0g4ig1f4adzdc9p997l27"; libraryHaskellDepends = [ attoparsec base bytestring ]; description = "Attoparsec-based parsers for the RFC-2616 HTTP grammar rules"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -138262,7 +138962,7 @@ self: { ]; description = "HTTP and WebSocket client based on io-streams"; license = "BSD-3-Clause AND GPL-2.0-or-later"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -138285,8 +138985,8 @@ self: { tasty-quickcheck text wai wai-extra ]; description = "Generic kinds and types for working with HTTP"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -138305,7 +139005,7 @@ self: { base bytestring hspec http-types QuickCheck quickcheck-instances ]; description = "A low-level HTTP library"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "http-link-header" = callPackage @@ -138329,7 +139029,7 @@ self: { base criterion directory network-uri text transformers ]; description = "A parser and writer for the HTTP Link header as specified in RFC 5988 \"Web Linking\""; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "http-link-header_1_2_0" = callPackage @@ -138353,8 +139053,8 @@ self: { network-uri text transformers ]; description = "A parser and writer for the HTTP Link header per RFC 5988"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; }) {}; "http-listen" = callPackage @@ -138371,8 +139071,8 @@ self: { base bytestring exceptions HTTP network transformers ]; description = "Listen to HTTP requests and handle them in arbitrary ways"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -138385,8 +139085,8 @@ self: { pname = "http-media"; version = "0.8.0.0"; sha256 = "0lww5cxrc9jlvzsysjv99lca33i4rb7cll66p3c0rdpmvz8pk0ir"; - revision = "3"; - editedCabalFile = "1ndz5x6njl35h73il5c6qpaqd4ynvg21n6k7sb8aq09gfbg544d8"; + revision = "4"; + editedCabalFile = "0qg6x92i3w2q7zarr08kmicychkwskfi04xaxkqkg0cw6jnpnhhh"; libraryHaskellDepends = [ base bytestring case-insensitive containers utf8-string ]; @@ -138395,7 +139095,7 @@ self: { test-framework test-framework-quickcheck2 utf8-string ]; description = "Processing HTTP Content-Type and Accept headers"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "http-mock" = callPackage @@ -138411,7 +139111,7 @@ self: { ]; testHaskellDepends = [ base ]; description = "HTTP mocking and expectations library for Haskell"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "http-monad" = callPackage @@ -138430,8 +139130,8 @@ self: { network-uri parsec semigroups transformers utility-ht ]; description = "Monad abstraction for HTTP allowing lazy transfer and non-I/O simulation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -138448,8 +139148,8 @@ self: { transformers ]; description = "A type unsafe http library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -138469,8 +139169,8 @@ self: { http-types pipes pipes-bytestring pipes-safe transformers wai ]; description = "Serve a WAI application with http-pony"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -138482,7 +139182,7 @@ self: { sha256 = "14fbqw5bqsbyvr99g4bpk54n38mz2ilkyb6979rgdr2fpvzkv6rr"; libraryHaskellDepends = [ base case-insensitive lens profunctors ]; description = "Tag http headers as case insensitive"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "http-pony-transformer-http" = callPackage @@ -138497,7 +139197,7 @@ self: { attoparsec base bytestring pipes pipes-attoparsec transformers ]; description = "Transform raw TCP stream to a basic HTTP type"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "http-pony-transformer-startline" = callPackage @@ -138510,7 +139210,7 @@ self: { attoparsec base bytestring http-types lens ]; description = "transform HTTP startlines to tuples"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "http-proxy" = callPackage @@ -138537,8 +139237,8 @@ self: { vault wai wai-conduit warp warp-tls ]; description = "A library for writing HTTP and HTTPS proxies"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -138554,7 +139254,7 @@ self: { aeson base bytestring http-conduit network-uri text ]; description = "Simple http queries"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "http-querystring" = callPackage @@ -138570,8 +139270,8 @@ self: { base bytestring containers doctest hspec http-types QuickCheck ]; description = "The HTTP query builder"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -138591,8 +139291,8 @@ self: { transformers unordered-containers ]; description = "Declarative DSL for parsing an HTTP response"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -138617,7 +139317,7 @@ self: { transformers unliftio wai warp ]; description = "Reverse proxy HTTP requests, either over raw sockets or with WAI"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "http-rfc7807" = callPackage @@ -138637,8 +139337,8 @@ self: { servant servant-server tasty tasty-hunit text ]; description = "RFC7807 style response messages"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -138654,8 +139354,8 @@ self: { base HTTP mime network network-uri text unix url utf8-string ]; description = "A library for writing Haskell web servers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -138669,8 +139369,8 @@ self: { isExecutable = true; libraryHaskellDepends = [ base network ]; description = "A simple websever with an interact style API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -138702,7 +139402,7 @@ self: { unordered-containers ]; description = "An HTTP client using io-streams"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "http-test" = callPackage @@ -138721,7 +139421,7 @@ self: { ]; executableHaskellDepends = [ base ]; description = "Test framework for HTTP APIs"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "http-trace" = callPackage @@ -138740,7 +139440,7 @@ self: { ]; executableHaskellDepends = [ base ]; description = "Tracking http redirects"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "http-types" = callPackage @@ -138758,7 +139458,7 @@ self: { base bytestring doctest hspec QuickCheck quickcheck-instances text ]; description = "Generic HTTP types for Haskell (for both client and server code)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "http-wget" = callPackage @@ -138769,8 +139469,8 @@ self: { sha256 = "1sbg4gpx8ikaxb15wflm7fnjnkr32fj07bva62z54dsm630s37fx"; libraryHaskellDepends = [ base failure process transformers ]; description = "Provide a simple HTTP client interface by wrapping the wget command line tool. (deprecated)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -138802,7 +139502,7 @@ self: { mwc-random network-byte-order psqueues stm ]; description = "HTTP/2 library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "http2-client" = callPackage @@ -138820,7 +139520,7 @@ self: { ]; testHaskellDepends = [ base ]; description = "A native HTTP2 client library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "http2-client-exe" = callPackage @@ -138839,7 +139539,7 @@ self: { lifted-async lifted-base optparse-applicative time tls ]; description = "A command-line http2 client"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "http2-client-grpc" = callPackage @@ -138858,8 +139558,8 @@ self: { ]; testHaskellDepends = [ base ]; description = "Implement gRPC-over-HTTP2 clients"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -138876,8 +139576,8 @@ self: { zlib ]; description = "Encoders based on `proto-lens` for gRPC over HTTP2"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -138896,7 +139596,7 @@ self: { proto3-wire zlib ]; description = "Encoders based on `proto3-wire` for gRPC over HTTP2"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "http2-grpc-types" = callPackage @@ -138910,7 +139610,7 @@ self: { base binary bytestring case-insensitive zlib ]; description = "Types for gRPC over HTTP2 common for client and servers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "httpd-shed" = callPackage @@ -138923,7 +139623,7 @@ self: { isExecutable = true; libraryHaskellDepends = [ base network network-bsd network-uri ]; description = "A simple web-server with an interact style API"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "https-everywhere-rules" = callPackage @@ -138946,8 +139646,8 @@ self: { taggy-lens text text-icu ]; description = "High-level access to HTTPS Everywhere rulesets"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -138962,8 +139662,8 @@ self: { base directory filepath functor-infix text ]; description = "Low-level (i.e. XML) access to HTTPS Everywhere rulesets."; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -138982,7 +139682,7 @@ self: { ]; description = "Specification of HTTP request/response generators and parsers"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -138996,8 +139696,8 @@ self: { isExecutable = true; executableHaskellDepends = [ alsa-pcm base carray fft gloss ]; description = "harmonic analyser and tuner for musical instruments"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -139025,8 +139725,8 @@ self: { ]; testSystemDepends = [ tvm_runtime ]; description = "Bindings for TVM machine learning framework"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {tvm_runtime = null;}; @@ -139040,8 +139740,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base OpenGL random SDL ]; description = "A two player abstract strategy game"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -139060,7 +139760,7 @@ self: { process regex-compat unix utf8-string ]; description = "For multiplexing GHC installations and providing development sandboxes"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hubigraph" = callPackage @@ -139072,7 +139772,7 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers haxr mtl ]; description = "A haskell wrap for Ubigraph"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hubris" = callPackage @@ -139097,7 +139797,7 @@ self: { executableSystemDepends = [ ruby ]; description = "Support library for Hubris, the Ruby <=> Haskell bridge"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) ruby;}; "huck" = callPackage @@ -139117,8 +139817,8 @@ self: { unordered-containers ]; description = "huck"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -139130,7 +139830,7 @@ self: { sha256 = "0ajyqwnpdhby9h6skl3l0dys53ycnyq7y7r72ma7x0b5rdi3djd2"; libraryHaskellDepends = [ base ]; description = "Haskell IOT on Intel Edison and other Linux computers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "huff" = callPackage @@ -139150,8 +139850,8 @@ self: { libraryToolDepends = [ alex ]; executableHaskellDepends = [ base ]; description = "A fast-foward-based planner"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -139163,8 +139863,8 @@ self: { sha256 = "191llv4s64jrh8cma43r5z740avd5picja5fr45l4mi2gwmkx4s3"; libraryHaskellDepends = [ base containers fingertree ]; description = "Pure Haskell implementation of the Huffman encoding algorithm"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -139181,8 +139881,8 @@ self: { yhccore ]; description = "Hugs Front-end to Yhc Core"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -139209,40 +139909,43 @@ self: { mtl network split strict text time unix utf8-string ]; description = "IRC server written in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; "hum" = callPackage - ({ mkDerivation, base, brick, bytestring, containers, directory - , filepath, lens, libmpd, mtl, relude, template-haskell, text - , text-zipper, time, transformers, vector, vty, witherable-class + ({ mkDerivation, array, base, brick, bytestring, containers + , directory, filepath, lens, libmpd, mtl, regex-tdfa, relude + , template-haskell, text, text-zipper, time, transformers, vector + , vty, witherable }: mkDerivation { pname = "hum"; - version = "0.1.0.0"; - sha256 = "06zyjg2i0kk4wnzrcax7rff710rpafqwz4rv75wq09vr65wvvj1y"; + version = "0.2.0.0"; + sha256 = "144b1161rvlmayklvgm7cajs0jz5bhlbcgrq288pvymlyl4f962b"; + revision = "1"; + editedCabalFile = "07d19lqi5djdsda976qr1w8ps535dxxjsp0lr43b62cinw2ssnki"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base brick bytestring containers directory filepath lens libmpd mtl - relude template-haskell text text-zipper time transformers vector - vty witherable-class + array base brick bytestring containers directory filepath lens + libmpd mtl regex-tdfa relude template-haskell text text-zipper time + transformers vector vty witherable ]; executableHaskellDepends = [ - base brick bytestring containers directory filepath lens libmpd mtl - relude template-haskell text text-zipper time transformers vector - vty witherable-class + array base brick bytestring containers directory filepath lens + libmpd mtl regex-tdfa relude template-haskell text text-zipper time + transformers vector vty witherable ]; testHaskellDepends = [ - base brick bytestring containers directory filepath lens libmpd mtl - relude template-haskell text text-zipper time transformers vector - vty witherable-class + array base brick bytestring containers directory filepath lens + libmpd mtl regex-tdfa relude template-haskell text text-zipper time + transformers vector vty witherable ]; description = "A TUI MPD client, inspired by ncmpcpp"; - license = stdenv.lib.licenses.gpl2Plus; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -139254,8 +139957,8 @@ self: { sha256 = "0lr2m5gci1k0x7w1i49cb6nhbnnkym4raaagn916ahf79y05jv7d"; libraryHaskellDepends = [ base text ]; description = "A lawless typeclass for parsing text entered by humans"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -139269,7 +139972,7 @@ self: { testHaskellDepends = [ base doctest Glob time ]; benchmarkHaskellDepends = [ base criterion ]; description = "Provide duration helper"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "human-text" = callPackage @@ -139280,8 +139983,8 @@ self: { sha256 = "0v6wrs9mcmiwk9ladjcibw1yqpbbl0y6v9i3ni39v0byby0a2zpa"; libraryHaskellDepends = [ base text ]; description = "A lawless typeclass for converting values to human-friendly text"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -139293,8 +139996,8 @@ self: { sha256 = "0pzfhp65afkdc33pjbxzcf68c02w6nq8sxqspfwbn78dghg9cbrn"; libraryHaskellDepends = [ base bytestring deepseq ghc text ]; description = "Redefinition-free prelude alternative"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -139320,7 +140023,7 @@ self: { ]; description = "Haskell UPnP Media Server"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -139343,7 +140046,7 @@ self: { QuickCheck split ]; description = "CSS-like syntax for file system manipulation"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hunit-dejafu" = callPackage @@ -139354,7 +140057,7 @@ self: { sha256 = "11d52blw31mcsg7c3w1f7khy3vk2p03h4c5z6ja6wb9k5bg4d004"; libraryHaskellDepends = [ base dejafu exceptions HUnit ]; description = "Deja Fu support for the HUnit test framework"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hunit-gui" = callPackage @@ -139369,8 +140072,8 @@ self: { libraryHaskellDepends = [ base cairo gtk haskell98 HUnit ]; executableHaskellDepends = [ base cairo gtk haskell98 HUnit ]; description = "A GUI testrunner for HUnit"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -139382,7 +140085,7 @@ self: { sha256 = "089l8n1yjcf6sypr76r8p0djwpcqaa5xdk1d0m2k9piig9fnzr40"; libraryHaskellDepends = [ base HUnit parsec ]; description = "An HUnit Testable instance for Parsec parser unit tests"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hunit-rematch" = callPackage @@ -139394,8 +140097,8 @@ self: { libraryHaskellDepends = [ base HUnit rematch ]; testHaskellDepends = [ base hspec HUnit rematch ]; description = "HUnit support for rematch"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -139415,7 +140118,7 @@ self: { ]; description = "Unpacker tool with DWIM"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -139432,8 +140135,8 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq stm ]; benchmarkPkgconfigDepends = [ hunspell ]; description = "Hunspell thread-safe FFI bindings for spell checking"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) hunspell;}; @@ -139465,8 +140168,8 @@ self: { time ]; description = "A search and indexing engine"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -139490,8 +140193,8 @@ self: { wai-extra wai-middleware-static warp ]; description = "A search and indexing engine server"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -139515,8 +140218,8 @@ self: { time transformers unordered-containers ]; description = "A Command line Interface for the Hunt server"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {hunt-client = null;}; @@ -139545,8 +140248,8 @@ self: { http-types QuickCheck simple temporary transformers wai wai-extra ]; description = "Upload packages or documentation to a hackage server"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -139562,8 +140265,8 @@ self: { array base bytestring containers kangaroo ]; description = "Extract function names from Windows DLLs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -139576,8 +140279,8 @@ self: { }: mkDerivation { pname = "hurl"; - version = "2.0.0.0"; - sha256 = "0rr4v8dbbkasg68zkv6z2p4ib12kazqjrad4s0z7h6l7hy6rqwbz"; + version = "2.1.0.0"; + sha256 = "0n467hgj8ybgqa69snsj6c199f0ipavxwjn2pb47q1vns6prlwd0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -139588,8 +140291,8 @@ self: { ]; executableHaskellDepends = [ base directory network-uri ]; description = "Haskell URL resolver"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -139608,8 +140311,8 @@ self: { aeson base bytestring containers here hspec text ]; description = "Haskell bindings for Hurriyet API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -139634,8 +140337,8 @@ self: { parsec process transformers ]; description = "R5RS Scheme interpreter, compiler, and library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -139651,8 +140354,8 @@ self: { array base containers husk-scheme json mtl transformers ]; description = "Extra libraries for the husk Scheme platform"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -139671,7 +140374,7 @@ self: { ]; description = "A simple command line calculator"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -139692,8 +140395,8 @@ self: { websockets wuss ]; description = "A program for the button on Reddit"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -139707,8 +140410,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base parsec parsec-numbers ]; description = "Quick implemention of Hutton's Razor"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -139720,8 +140423,8 @@ self: { sha256 = "0i8h380nszd7hk7x6l7qx0ri6k12551li2m77gspzakcf47l6ldp"; libraryHaskellDepends = [ base easyplot ]; description = "Fuzzy logic library with support for T1, IT2, GT2"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -139734,7 +140437,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "Simple strict heterogeneous lists"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hvega" = callPackage @@ -139753,7 +140456,7 @@ self: { tasty-golden text unordered-containers ]; description = "Create Vega-Lite visualizations (version 4) in Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hvega-theme" = callPackage @@ -139764,7 +140467,7 @@ self: { sha256 = "0g2h5is0gbr43fn8pbfj2nzh4wlgx6kjayq4lcnbr10z0j3vpqpv"; libraryHaskellDepends = [ base hvega text ]; description = "Theme for hvega"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "hw-aeson" = callPackage @@ -139783,7 +140486,7 @@ self: { ]; testToolDepends = [ doctest-discover hspec-discover ]; description = "Convenience functions for Aeson"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hw-all" = callPackage @@ -139810,8 +140513,8 @@ self: { hw-string-parse hw-succinct hw-uri hw-xml ]; description = "Demo library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -139848,7 +140551,7 @@ self: { ]; doHaddock = false; description = "Balanced parentheses"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hw-bits" = callPackage @@ -139871,7 +140574,7 @@ self: { testToolDepends = [ doctest-discover hspec-discover ]; benchmarkHaskellDepends = [ base criterion vector ]; description = "Bit manipulation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hw-ci-assist" = callPackage @@ -139892,8 +140595,8 @@ self: { testToolDepends = [ hspec-discover ]; doHaddock = false; description = "CI Assistant for Haskell projects"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -139919,7 +140622,7 @@ self: { base bytestring conduit criterion mmap vector ]; description = "Conduits for tokenizing streams"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hw-conduit-merges" = callPackage @@ -139936,7 +140639,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Additional merges and joins for Conduit"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hw-diagnostics" = callPackage @@ -139949,7 +140652,7 @@ self: { testHaskellDepends = [ base doctest doctest-discover ]; testToolDepends = [ doctest-discover ]; description = "Diagnostics library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hw-dsv" = callPackage @@ -139990,8 +140693,8 @@ self: { mmap vector ]; description = "Unbelievably fast streaming DSV file parser"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -140025,7 +140728,7 @@ self: { base bits-extra bytestring criterion hw-bits hw-prim vector ]; description = "File Dump"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hw-eliasfano" = callPackage @@ -140064,7 +140767,7 @@ self: { hw-hspec-hedgehog hw-int hw-packed-vector hw-prim mmap vector ]; description = "Elias-Fano"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hw-excess" = callPackage @@ -140089,7 +140792,7 @@ self: { base bytestring criterion hw-prim vector ]; description = "Excess"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hw-fingertree" = callPackage @@ -140107,7 +140810,7 @@ self: { ]; testToolDepends = [ doctest-discover hspec-discover ]; description = "Generic finger-tree structure, with example instances"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hw-fingertree-strict" = callPackage @@ -140127,7 +140830,7 @@ self: { ]; testToolDepends = [ doctest-discover hspec-discover ]; description = "Generic strict finger-tree structure"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hw-hedgehog" = callPackage @@ -140141,7 +140844,7 @@ self: { testHaskellDepends = [ base doctest doctest-discover ]; testToolDepends = [ doctest-discover ]; description = "Extra hedgehog functionality"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hw-hspec-hedgehog" = callPackage @@ -140160,7 +140863,7 @@ self: { ]; testToolDepends = [ doctest-discover hspec-discover ]; description = "Interoperability between hspec and hedgehog"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hw-int" = callPackage @@ -140178,7 +140881,7 @@ self: { ]; testToolDepends = [ doctest-discover hspec-discover ]; description = "Additional facilities for Integers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hw-ip" = callPackage @@ -140209,7 +140912,7 @@ self: { testToolDepends = [ doctest-discover hspec-discover ]; doHaddock = false; description = "Library for manipulating IP addresses and CIDR blocks"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hw-json" = callPackage @@ -140253,8 +140956,8 @@ self: { ]; doHaddock = false; description = "Memory efficient JSON parser"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -140284,8 +140987,8 @@ self: { base bytestring criterion hw-json lens ]; description = "Lens for hw-json"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -140312,8 +141015,8 @@ self: { ]; testToolDepends = [ doctest-discover ]; description = "SIMD-based JSON semi-indexer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -140351,8 +141054,8 @@ self: { base bytestring criterion directory mmap ]; description = "Memory efficient JSON parser"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -140392,8 +141095,8 @@ self: { base bytestring criterion directory mmap ]; description = "Memory efficient JSON parser"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -140420,8 +141123,8 @@ self: { transformers unordered-containers ]; description = "Avro support for Kafka infrastructure"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -140432,8 +141135,8 @@ self: { }: mkDerivation { pname = "hw-kafka-client"; - version = "4.0.1"; - sha256 = "05ahw4cdp5kk5j4rbjf1bdvivg3nhiaaf68p902mp8jcbh7fz9sf"; + version = "4.0.2"; + sha256 = "166gi8mj2ljv4xcjrhi2pgjmnj112998fzbzjfpf5ckj54d20ch9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -140446,7 +141149,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Kafka bindings for Haskell"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {inherit (pkgs) rdkafka;}; "hw-kafka-conduit" = callPackage @@ -140471,7 +141174,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Conduit bindings for hw-kafka-client"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hw-mquery" = callPackage @@ -140493,7 +141196,7 @@ self: { ]; testToolDepends = [ doctest-discover hspec-discover ]; description = "Monadic query DSL"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hw-packed-vector" = callPackage @@ -140526,7 +141229,7 @@ self: { base criterion directory hedgehog hspec hw-prim vector ]; description = "Packed Vector"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hw-parser" = callPackage @@ -140546,7 +141249,7 @@ self: { ]; testToolDepends = [ doctest-discover hspec-discover ]; description = "Simple parser support"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hw-prim" = callPackage @@ -140573,7 +141276,7 @@ self: { base bytestring criterion mmap transformers vector ]; description = "Primitive functions and data types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hw-prim-bits" = callPackage @@ -140593,8 +141296,8 @@ self: { ]; benchmarkHaskellDepends = [ base criterion vector ]; description = "Primitive support for bit manipulation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -140634,7 +141337,7 @@ self: { ]; doHaddock = false; description = "Rank-select"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hw-rankselect-base" = callPackage @@ -140660,7 +141363,7 @@ self: { base bits-extra criterion hw-bits hw-prim vector ]; description = "Rank-select base"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hw-simd" = callPackage @@ -140692,8 +141395,8 @@ self: { transformers vector ]; description = "SIMD library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -140722,7 +141425,7 @@ self: { transformers vector ]; description = "Primitive functions and data types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hw-string-parse" = callPackage @@ -140734,7 +141437,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base bytestring hspec QuickCheck vector ]; description = "String parser"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hw-succinct" = callPackage @@ -140752,7 +141455,7 @@ self: { mono-traversable text vector word8 ]; description = "Succint datastructures"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hw-uri" = callPackage @@ -140787,8 +141490,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Supports IO on URIs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -140803,7 +141506,7 @@ self: { libraryHaskellDepends = [ base bytestring hw-prim vector ]; testHaskellDepends = [ base hspec QuickCheck vector ]; description = "Vector type with convenient typeclass instances"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hw-xml" = callPackage @@ -140846,7 +141549,7 @@ self: { resourcet vector ]; description = "XML parser based on succinct data structures"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hwall-auth-iitk" = callPackage @@ -140864,8 +141567,8 @@ self: { unix ]; description = "Initial version of firewall Authentication for IITK network"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -140888,8 +141591,8 @@ self: { transformers ]; description = "Haskell Web Library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -140910,8 +141613,8 @@ self: { executableToolDepends = [ alex happy ]; testHaskellDepends = [ array base Cabal containers mtl ]; description = "An implementation of Neil D. Jones' While language"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -140930,7 +141633,7 @@ self: { base directory extra filepath hint simple-cmd-args ]; description = "Commandline text processing with Haskell functions"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hworker" = callPackage @@ -140951,8 +141654,8 @@ self: { text time uuid ]; description = "A reliable at-least-once job queue built on top of redis"; - license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -140969,8 +141672,8 @@ self: { time unordered-containers ]; description = "Library for sending email with Amazon's SES and hworker"; - license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -141003,8 +141706,8 @@ self: { containers hedgehog hspec magic-wormhole protolude saltine text ]; description = "magic-wormhole client"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -141023,8 +141726,8 @@ self: { regex-compat text unix ]; description = "Simple Haskell Web Server"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -141044,8 +141747,8 @@ self: { base bytestring Cabal criterion cryptohash parallel ]; description = "Hashing with SL2"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -141057,8 +141760,8 @@ self: { sha256 = "0kfsc85k4vgdbkryrw80rgpjzzbavwqqzqylc95h80vm7xnlg2p9"; libraryHaskellDepends = [ base bytestring fingertree hwsl2 ]; description = "A hashed byte-vector based on algebraic hashes and finger trees"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -141072,8 +141775,8 @@ self: { base bytestring hwsl2 reducers semigroups ]; description = "Semigroup and Reducer instances for Data.Hash.SL2"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -141085,8 +141788,8 @@ self: { sha256 = "04wkgql6gs9glmp9kj5awis5b15vmwgkyqzi814k9514k3c7c1rb"; libraryHaskellDepends = [ base ]; description = "Haskell extras (missing utility functions)"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -141105,8 +141808,8 @@ self: { xml-types ]; description = "Haskell XMPP (Jabber Client) Command Line Interface (CLI)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -141133,8 +141836,8 @@ self: { ]; executableHaskellDepends = [ base cmdargs ]; description = "A pen notetaking program written in haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -141153,7 +141856,7 @@ self: { parsec ]; description = "A collection of tools for processing XML with Haskell"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hxt-binary" = callPackage @@ -141169,7 +141872,7 @@ self: { ]; description = "Serialisation and deserialisation of HXT XmlTrees"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "hxt-cache" = callPackage @@ -141186,7 +141889,7 @@ self: { ]; description = "Cache for HXT XML Documents and other binary data"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "hxt-charproperties" = callPackage @@ -141197,7 +141900,7 @@ self: { sha256 = "1bk88hj2pqlvcnyfncqyb9j7w9vvdxcq3cgr0w2l09c0abas23pm"; libraryHaskellDepends = [ base ]; description = "Character properties and classes for XML and Unicode"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hxt-css" = callPackage @@ -141210,7 +141913,7 @@ self: { isExecutable = true; libraryHaskellDepends = [ base hxt parsec split ]; description = "CSS selectors for HXT"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hxt-curl" = callPackage @@ -141222,7 +141925,7 @@ self: { libraryHaskellDepends = [ base bytestring curl hxt parsec ]; description = "LibCurl interface for HXT"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "hxt-expat" = callPackage @@ -141234,7 +141937,7 @@ self: { libraryHaskellDepends = [ base bytestring hexpat hxt ]; description = "Expat parser for HXT"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "hxt-extras" = callPackage @@ -141245,7 +141948,7 @@ self: { sha256 = "1bv8kcra2vgjbp7k0yczlrfbjh7ib2xixaqpnnd60hq84878nzb1"; libraryHaskellDepends = [ base hxt ]; description = "Extra functions for HXT"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hxt-filter" = callPackage @@ -141262,7 +141965,7 @@ self: { ]; description = "A collection of tools for processing XML with Haskell (Filter variant)"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "hxt-http" = callPackage @@ -141277,7 +141980,7 @@ self: { base bytestring HTTP hxt network network-uri parsec ]; description = "Interface to native Haskell HTTP package HTTP"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hxt-pickle-utils" = callPackage @@ -141290,8 +141993,8 @@ self: { editedCabalFile = "0d5fg718y7xzw76ip33q0w1liqk70q9074qkd198mjnijxjcrkf3"; libraryHaskellDepends = [ base hxt mtl ]; description = "Utility functions for using HXT picklers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -141313,7 +142016,7 @@ self: { base bytestring criterion deepseq parsec text ]; description = "A regular expression library for W3C XML Schema regular expressions"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hxt-relaxng" = callPackage @@ -141329,7 +142032,7 @@ self: { network-uri parsec ]; description = "The HXT RelaxNG validator"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hxt-tagsoup" = callPackage @@ -141345,7 +142048,7 @@ self: { ]; description = "TagSoup parser for HXT"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "hxt-unicode" = callPackage @@ -141356,7 +142059,7 @@ self: { sha256 = "0rj48cy8z4fl3zpg5bpa458kqr83adav6jnqv4i71dclpprj6n3v"; libraryHaskellDepends = [ base hxt-charproperties ]; description = "Unicode en-/decoding functions for utf8, iso-latin-* and other encodings"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hxt-xpath" = callPackage @@ -141371,7 +142074,7 @@ self: { ]; description = "The XPath modules for HXT"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "hxt-xslt" = callPackage @@ -141387,7 +142090,7 @@ self: { ]; description = "The XSLT modules for HXT"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "hxthelper" = callPackage @@ -141399,7 +142102,7 @@ self: { libraryHaskellDepends = [ base bytestring encoding hxt mtl ]; description = "Helper functions for HXT"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -141411,8 +142114,8 @@ self: { sha256 = "0faiyflyhmn2y0bs920qgm9xkj9i69lzxhsg4rxffal989gi32z8"; libraryHaskellDepends = [ base cgi fastcgi libxml mtl xslt ]; description = "Minimal webframework using fastcgi, libxml2 and libxslt"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -141426,8 +142129,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base containers HUnit random ]; description = "A Yahtzee game implementation in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -141449,8 +142152,8 @@ self: { unordered-containers ]; description = "Literate-style Documentation Generator"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -141467,8 +142170,8 @@ self: { base containers haskell98 mtl parsec ]; description = "A implementation of a type-checker for Lambda-H"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -141484,7 +142187,7 @@ self: { base deepseq primitive semigroups vector ]; description = "Hybrid vectors e.g. Mixed Boxed/Unboxed vectors"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hydra-hs" = callPackage @@ -141497,8 +142200,8 @@ self: { librarySystemDepends = [ sixense_x64 ]; testHaskellDepends = [ base ]; description = "Haskell binding to the Sixense SDK for the Razer Hydra"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {sixense_x64 = null;}; @@ -141530,8 +142233,8 @@ self: { text time transformers unix ]; description = "NCurses interface to view multiple ByteString streams in parallel"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -141548,8 +142251,8 @@ self: { ]; testHaskellDepends = [ base Cabal containers mtl QuickCheck ]; description = "An alternate Prelude"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -141570,8 +142273,8 @@ self: { hydrogen-parsing hydrogen-prelude hydrogen-syntax ]; description = "Hydrogen Data"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -141587,8 +142290,8 @@ self: { base containers hydrogen-multimap hydrogen-prelude ]; description = "Hydrogen Command Line Arguments Parser"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -141600,8 +142303,8 @@ self: { sha256 = "0d9457sarii5z1m2p1jzfk1g1ix2bm0s3ghfw7gab1w74i3hlh88"; libraryHaskellDepends = [ base hydrogen-parsing hydrogen-prelude ]; description = "Hydrogen Data"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -141613,8 +142316,8 @@ self: { sha256 = "0ik68a85yxdz12sgfpqi7bagkhvm9qgvl2bgplm2anxjsxcqbi93"; libraryHaskellDepends = [ base containers ghc-prim ]; description = "Hydrogen Multimap"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -141628,8 +142331,8 @@ self: { base containers hydrogen-prelude parsec ]; description = "Hydrogen Parsing Utilities"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -141649,8 +142352,8 @@ self: { regex-base regex-tdfa strict text time transformers uuid ]; description = "Hydrogen Prelude"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -141662,8 +142365,8 @@ self: { sha256 = "0hdvvp3kxc66y6bxzcrjqp7wc6s21isvfra0ps53j69jmnzqd2mh"; libraryHaskellDepends = [ base hydrogen-prelude parsec ]; description = "Hydrogen Prelude /w Parsec"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -141680,8 +142383,8 @@ self: { uuid ]; description = "Hydrogen Syntax"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -141696,8 +142399,8 @@ self: { base containers hydrogen-prelude parsec time ]; description = "Hydrogen Tools"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -141709,7 +142412,7 @@ self: { sha256 = "04v39lvh0z0ig6igsz7ncfasag3j6pdbsa86gyp63n4g325fmf38"; libraryHaskellDepends = [ base ]; description = "Hydrogen Version Type"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hyena" = callPackage @@ -141726,8 +142429,8 @@ self: { mtl network network-bytestring unix ]; description = "Simple web application server"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -141749,8 +142452,8 @@ self: { process text wai warp websockets ]; description = "WebGL live-coding environment for writing shaders with Hylogen"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -141762,7 +142465,7 @@ self: { sha256 = "0ha9bn7mqyqwpxzzcd4p0hm59dbrf3rcnpyihjkgnb7j4wk1f1rx"; libraryHaskellDepends = [ base data-reify vector-space ]; description = "GLSL embedded in Haskell"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "hylolib" = callPackage @@ -141778,7 +142481,7 @@ self: { ]; description = "Tools for hybrid logics related programs"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -141794,7 +142497,7 @@ self: { executableHaskellDepends = [ base hylolib mtl ]; description = "Tableau based theorem prover for hybrid logics"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -141811,7 +142514,7 @@ self: { ]; description = "Very small programs for hybrid logics"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -141823,7 +142526,7 @@ self: { sha256 = "14vl52v4qshdyp45qrg8ii8xzpi6n05qdgz3ri59wis8hdw1v06z"; libraryHaskellDepends = [ base blaze-html deepseq text ]; description = "Display class for the HyperHaskell graphical Haskell interpreter"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hyper-extra" = callPackage @@ -141838,8 +142541,8 @@ self: { base diagrams-lib diagrams-svg hyper QuickCheck svg-builder text ]; description = "Display instances for the HyperHaskell graphical Haskell interpreter"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -141859,8 +142562,8 @@ self: { hint hyper scotty text transformers ]; description = "Server back-end for the HyperHaskell graphical Haskell interpreter"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -141879,8 +142582,8 @@ self: { pipes pretty ]; description = "a fast, trustworthy HTTP(s) server built"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -141896,8 +142599,8 @@ self: { adjunctions base distributive profunctors transformers ]; description = "Hyperfunctions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -141925,8 +142628,8 @@ self: { base hspec lens QuickCheck text unordered-containers ]; description = "Reliable performance measurement with robust data export"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -141952,7 +142655,7 @@ self: { simple-reflect ]; description = "An approximate streaming (constant space) unique object counter"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hyperloglogplus" = callPackage @@ -141968,8 +142671,8 @@ self: { ]; testHaskellDepends = [ base HUnit semigroups tasty tasty-hunit ]; description = "Approximate cardinality estimation using constant space"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -141985,8 +142688,8 @@ self: { aeson attoparsec base bytestring http-enumerator http-types ]; description = "A thin wrapper for the Hyperpublic API"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -141998,7 +142701,7 @@ self: { sha256 = "0pnp5d1a0hwn6jm8v6i7yygd831q2bvsz6qb9n8db8n17lfxikx4"; libraryHaskellDepends = [ base containers ]; description = "Text hyphenation algorithm"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hyphenation" = callPackage @@ -142009,8 +142712,8 @@ self: { pname = "hyphenation"; version = "0.8"; sha256 = "09c9xpygjnq7kqcaybls91s7g1cv40rg54dn9w1svk973h0lgyii"; - revision = "1"; - editedCabalFile = "0h8k3hj2lrmj4fg8q34v6q4pskmpci9v8z3hby8gamjmlgivsqjf"; + revision = "2"; + editedCabalFile = "0y10glmsgnc67f2y8d6irgwyz9fahg9dv2sidqx1r6rfbs02416i"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ @@ -142020,7 +142723,7 @@ self: { base containers doctest unordered-containers ]; description = "Configurable Knuth-Liang hyphenation"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }) {}; "hypher" = callPackage @@ -142049,8 +142752,8 @@ self: { transformers-base unordered-containers vector ]; description = "A Haskell neo4j client"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -142095,7 +142798,7 @@ self: { librarySystemDepends = [ z3 ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "Bindings for the Z3 Theorem Prover"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) z3;}; "hzaif" = callPackage @@ -142112,7 +142815,7 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "This package is Zaif Exchange Api wrapper"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hzenhan" = callPackage @@ -142124,7 +142827,7 @@ self: { libraryHaskellDepends = [ base containers text ]; testHaskellDepends = [ base containers QuickCheck text ]; description = "Zenhan library for Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hzenity" = callPackage @@ -142139,7 +142842,7 @@ self: { base containers data-default process process-extras text time ]; description = "Haskell interface to Zenity dialogs"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "hzk" = callPackage @@ -142157,7 +142860,7 @@ self: { ]; testSystemDepends = [ zookeeper_mt ]; description = "Haskell client library for Apache Zookeeper"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) zookeeper_mt;}; "hzulip" = callPackage @@ -142181,8 +142884,8 @@ self: { scotty stm stm-conduit text transformers ]; description = "A haskell wrapper for the Zulip API"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -142203,8 +142906,8 @@ self: { base containers hspec tasty tasty-hspec text ]; description = "Internationalization for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -142224,7 +142927,7 @@ self: { transformers turtle ]; description = "Base i3blocks written in haskell"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "i3ipc" = callPackage @@ -142241,8 +142944,8 @@ self: { ]; testHaskellDepends = [ aeson base bytestring hspec ]; description = "A type-safe wrapper around i3's IPC"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -142261,8 +142964,8 @@ self: { time ]; description = "iCalendar data types, parser, and printer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -142275,7 +142978,7 @@ self: { libraryHaskellDepends = [ base interleavableIO mtl ]; description = "Version of Control.Exception using InterleavableIO."; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "iap-verifier" = callPackage @@ -142291,8 +142994,8 @@ self: { monads-tf text transformers ]; description = "A simple wrapper of In-App-Purchase receipt validate APIs"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -142309,8 +143012,8 @@ self: { attoparsec base bytestring network unix ]; description = "An API for the Interactive Brokers Trading Workstation written in pure Haskell"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -142329,8 +143032,8 @@ self: { ]; testHaskellDepends = [ base HUnit tasty tasty-hunit text ]; description = "Validate and generate IBANs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -142342,7 +143045,7 @@ self: { sha256 = "0yrdh4y0ssldg0lmrbr6yk0zg2sihirp3mnh20dvg3m887kdhrj1"; libraryHaskellDepends = [ base dbus directory unix xdg-basedir ]; description = "A simple uncomplete ibus api"; - license = stdenv.lib.licenses.lgpl3; + license = lib.licenses.lgpl3; }) {}; "ical" = callPackage @@ -142363,8 +143066,8 @@ self: { executableHaskellDepends = [ base time ]; testHaskellDepends = [ base ]; description = "iCalendar format parser and org-mode converter"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -142410,8 +143113,8 @@ self: { wai-websockets warp websockets ]; description = "A fast JSON document store with push notification support"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ rkrzr ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ rkrzr ]; }) {}; "icfpc2020-galaxy" = callPackage @@ -142422,7 +143125,7 @@ self: { sha256 = "17m8vp3kikpscagb40972r9a8i6ng8wjc697zdslj5zl95rpyrvd"; libraryHaskellDepends = [ base ghc-prim transformers ]; description = "A strange message received at the Pegovka observatory"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "icon-fonts" = callPackage @@ -142433,7 +143136,7 @@ self: { sha256 = "0lc5filf2xydjrsq9d5qlwz3y76pn590pjiqjjhibkk4dhnys3gs"; libraryHaskellDepends = [ base ]; description = "Package for handling icon fonts in Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "iconv" = callPackage @@ -142444,7 +143147,7 @@ self: { sha256 = "0m5m0ph5im443xcz60wm1zp98bnmf8l1b5gfllxwhjriwdl52hin"; libraryHaskellDepends = [ base bytestring ]; description = "String encoding conversion"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "iconv-typed" = callPackage @@ -142460,8 +143163,8 @@ self: { ]; testHaskellDepends = [ base ]; description = "Type safe iconv wrapper"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -142508,8 +143211,8 @@ self: { test-framework test-framework-hunit text unix utf8-string ]; description = "An IDE backend library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -142534,8 +143237,8 @@ self: { unix-compat ]; description = "Shared library used be ide-backend and ide-backend-server"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -142547,7 +143250,7 @@ self: { sha256 = "1zj1glpyhmgpkxy4n96aqqf3s1gl2irl8ksnx4i9y4nwvs06qzj0"; libraryHaskellDepends = [ base ]; description = "RTS for the IDE backend"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "ide-backend-server" = callPackage @@ -142570,8 +143273,8 @@ self: { transformers unix unordered-containers zlib ]; description = "An IDE backend server"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -142591,8 +143294,8 @@ self: { QuickCheck random streaming-commons time uniplate wai wl-pprint ]; description = "Feedback services for intelligent tutoring systems"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -142611,7 +143314,7 @@ self: { ]; description = "Interactive domain reasoner for logic and mathematics"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -142625,8 +143328,8 @@ self: { base containers ideas parsec QuickCheck ]; description = "Common types for mathematical domain reasoners"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -142642,8 +143345,8 @@ self: { base containers ideas ideas-math-types ]; description = "Interactive domain reasoner for statistics"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -142656,8 +143359,8 @@ self: { libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers hspec QuickCheck ]; description = "Idempotent monoids"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -142680,7 +143383,7 @@ self: { base bytestring criterion JuicyPixels random tf-random ]; description = "Flexible generation of identicons"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "identicon-style-squares" = callPackage @@ -142700,7 +143403,7 @@ self: { base bytestring cryptohash identicon JuicyPixels ]; description = "Squares style for the identicon package"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "identifiers" = callPackage @@ -142724,8 +143427,8 @@ self: { base binary bytestring cereal criterion deepseq text ]; description = "Numeric identifiers for values"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -142751,8 +143454,8 @@ self: { MissingH polyparse process text utf8-string ]; description = "ID3v2 (tagging standard for MP3 files) library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -142764,7 +143467,7 @@ self: { sha256 = "04w2mp9wa4mzdz4njx47j081jia8y000b46cw8vmx44fx8gv1zwp"; libraryHaskellDepends = [ base punycode stringprep text ]; description = "Implements IDNA (RFC 3490)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "idna2008" = callPackage @@ -142775,8 +143478,8 @@ self: { sha256 = "1pd62pr1hyk565mxc15f5lxyms58bywcqll5ya6cnzw20lv4lzlz"; libraryHaskellDepends = [ base punycode split ]; description = "Converts Unicode hostnames into ASCII"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -142797,7 +143500,7 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "A project manage tool for Idris"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "idris" = callPackage @@ -142841,8 +143544,8 @@ self: { time transformers ]; description = "Functional Programming Language with Dependent Types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) gmp;}; @@ -142854,7 +143557,7 @@ self: { sha256 = "0ckhmy10l4kchr5bg1hlygrj86ij0wrj3r8in9g3c3jhh00dx3km"; libraryHaskellDepends = [ base ]; description = "Utilities for dealing with IEEE floating point numbers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ieee-utils" = callPackage @@ -142865,8 +143568,8 @@ self: { sha256 = "0548m1xjvzf65kkklmqjr2f5h85zdfpvxmdbx5rcg33zi8aiqfgk"; libraryHaskellDepends = [ base ]; description = "ieee-utils"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -142878,7 +143581,7 @@ self: { sha256 = "0x0mkvnf3q4yfh7bi7hv6364gy0l57syzy9xgzyax8z94zh465c3"; libraryHaskellDepends = [ base ]; description = "ieee-utils"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ieee754" = callPackage @@ -142889,7 +143592,7 @@ self: { sha256 = "1lcs521g9lzy9d7337vg4w7q7s8500rfqy7rcifcz6pm6yfgyb8f"; libraryHaskellDepends = [ base ]; description = "Utilities for dealing with IEEE floating point numbers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ieee754-parser" = callPackage @@ -142916,8 +143619,8 @@ self: { ]; testHaskellDepends = [ base bytestring HUnit stocks ]; description = "Library for the IEX Trading API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -142929,7 +143632,7 @@ self: { sha256 = "078lg8b6n4bhlhh6ax4k4n8k8fk7hiwcnzyr4h9zbq6vczl77xi8"; libraryHaskellDepends = [ base ]; description = "(?) and (?>) conditional operator"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ifcxt" = callPackage @@ -142943,8 +143646,8 @@ self: { libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; description = "put if statements within type constraints"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -142972,7 +143675,7 @@ self: { base HUnit test-framework test-framework-hunit ]; description = "An inductive-form set constraint solver"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ig" = callPackage @@ -142993,8 +143696,8 @@ self: { time transformers transformers-base unordered-containers ]; description = "Bindings to Instagram's API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -143017,8 +143720,8 @@ self: { transformers wl-pprint-text ]; description = "An keyboard-driven interactive graph editor"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -143037,8 +143740,8 @@ self: { libraryPkgconfigDepends = [ ige-mac-integration ]; libraryToolDepends = [ gtk2hs-buildtools ]; description = "Bindings for the Gtk/OS X integration library"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; broken = true; }) {ige-mac-integration = null;}; @@ -143058,8 +143761,8 @@ self: { executableHaskellDepends = [ base directory path ]; testHaskellDepends = [ base HTF text ]; description = "Handle ignore files of different VCSes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -143077,8 +143780,8 @@ self: { librarySystemDepends = [ igraph ]; libraryToolDepends = [ c2hs ]; description = "Bindings to the igraph C library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) igraph;}; @@ -143092,7 +143795,7 @@ self: { ad base poly semirings text vector-space ]; description = "International Geomagnetic Reference Field"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ihaskell" = callPackage @@ -143127,8 +143830,8 @@ self: { raw-strings-qq setenv shelly text transformers ]; description = "A Haskell backend kernel for the IPython project"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -143144,8 +143847,8 @@ self: { aeson aeson-pretty base bytestring here ihaskell text ]; description = "IHaskell display instances for Aeson"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -143157,8 +143860,8 @@ self: { sha256 = "1vb4x6h6bs3liq1bbnhs3ns0zrk4czy63zmkp1q075g7fq1fh7hw"; libraryHaskellDepends = [ base ihaskell ]; description = "IHaskell display instances for basic types"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -143170,8 +143873,8 @@ self: { sha256 = "1733lg13v3pn95249gxbxrvbwfg2a95badvf98vkx6hx2mbxv9q7"; libraryHaskellDepends = [ base blaze-html blaze-markup ihaskell ]; description = "IHaskell display instances for blaze-html types"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -143188,8 +143891,8 @@ self: { ihaskell ]; description = "IHaskell display instances for charts types"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -143206,8 +143909,8 @@ self: { directory ihaskell text ]; description = "IHaskell display instances for diagram types"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -143219,8 +143922,8 @@ self: { sha256 = "1cbfhv9kg33dj28mn6mhhi363pz9jr2kw4ph64ga1fiawlj563l0"; libraryHaskellDepends = [ base classy-prelude ihaskell ]; description = "IHaskell display instances for basic types"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -143232,8 +143935,8 @@ self: { sha256 = "1qdcx0y52w805z5dg2xwsy1ykbbk05i4k04y0w3r4r3wwjvq3kk6"; libraryHaskellDepends = [ base bytestring gnuplot ihaskell ]; description = "IHaskell display instance for Gnuplot (from gnuplot package)"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -143245,8 +143948,8 @@ self: { sha256 = "1min39vd75rn7vwpmggf8a30fhlv5zphhmckb5a4g6lqg5v1kf1y"; libraryHaskellDepends = [ base bytestring ihaskell process ]; description = "IHaskell display instance for GraphViz (external binary)"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -143258,8 +143961,8 @@ self: { sha256 = "0rsfavpxm14bbrjcsi9rps3p1bjhhgvam0znhn8vwfmic3fpsda8"; libraryHaskellDepends = [ base HaTeX ihaskell text ]; description = "IHaskell display instances for hatex"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -143271,8 +143974,8 @@ self: { sha256 = "0k7h33cqj58dv4hrsdjgnbykh036mrvbw6cbr98xlkdq5062pnzp"; libraryHaskellDepends = [ aeson base hvega ihaskell text ]; description = "IHaskell display instance for hvega types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -143290,8 +143993,8 @@ self: { ihaskell-blaze inline-r template-haskell temporary ]; description = "Embed R quasiquotes and plots in IHaskell notebooks"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -143306,8 +144009,8 @@ self: { base bytestring directory ihaskell JuicyPixels ]; description = "IHaskell - IHaskellDisplay instances of the image types of the JuicyPixels package"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -143324,8 +144027,8 @@ self: { text utf8-string ]; description = "IHaskell display instances for bytestrings"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -143341,8 +144044,8 @@ self: { aeson base here ihaskell parsec random text unordered-containers ]; description = "IHaskell display instances for Parsec"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -143354,8 +144057,8 @@ self: { sha256 = "12bi8im5489kmy0d26kn3hljkj4c1xynsa97h6nh5dp53awklm3y"; libraryHaskellDepends = [ base bytestring hmatrix ihaskell plot ]; description = "IHaskell display instance for Plot (from plot package)"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -143373,8 +144076,8 @@ self: { ihaskell ihaskell-blaze Rlang-QQ split stm template-haskell xformat ]; description = "a rDisp quasiquote to show plots from Rlang-QQ in IHaskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -143392,8 +144095,8 @@ self: { text unix unordered-containers vector vinyl ]; description = "IPython standard widgets for IHaskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -143407,7 +144110,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base process ]; description = "Interpolated Haskell"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "ihttp" = callPackage @@ -143425,8 +144128,8 @@ self: { ]; executableHaskellDepends = [ base network ]; description = "Incremental HTTP iteratee"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -143444,7 +144147,7 @@ self: { base criterion lens loop transformers vector ]; description = "Optimised list functions for doing index-related things"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "illuminate" = callPackage @@ -143464,8 +144167,8 @@ self: { executableHaskellDepends = [ array base containers html xhtml ]; executableToolDepends = [ alex ]; description = "A fast syntax highlighting library built with alex"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -143479,7 +144182,7 @@ self: { editedCabalFile = "1wl2sv2g7iwxldk582h1z6a2b3ks4wzk8rx8bflcxwlh6s4kq0s7"; libraryHaskellDepends = [ base bytestring ]; description = "Determine the type of an image by reading the first bytes"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "imagefilters" = callPackage @@ -143490,7 +144193,7 @@ self: { sha256 = "1n7awx8wsm6z0sp54jri3sp403n14wzr08vjj4a422q1lf306l3y"; libraryHaskellDepends = [ base gd ]; description = "Image Filters (contrast, brightness, gaussian blur, etc)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "imagemagick" = callPackage @@ -143515,7 +144218,7 @@ self: { testPkgconfigDepends = [ imagemagick ]; description = "bindings to imagemagick library"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) imagemagick;}; "imagepaste" = callPackage @@ -143534,8 +144237,8 @@ self: { template-haskell transformers vcs-revision ]; description = "Command-line image paste utility"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -143556,7 +144259,7 @@ self: { base bytestring conduit conduit-extra hspec resourcet ]; description = "Determine the size of some common image formats"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "imap" = callPackage @@ -143582,8 +144285,8 @@ self: { tasty-quickcheck text transformers word8 ]; description = "An efficient IMAP client library, with SSL and streaming"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -143601,8 +144304,8 @@ self: { base bytestring directory HaskellNet HsOpenSSL network text ]; description = "Downloads email from imap SSL servers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -143625,7 +144328,7 @@ self: { ]; description = "Minimalistic reference manager"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -143641,8 +144344,8 @@ self: { base data-default-class http-client req text xml-conduit xml-lens ]; description = "A function to post an image to imgur"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -143663,8 +144366,8 @@ self: { base curl directory haskell98 hxt hxt-xpath url ]; description = "Uploader for Imgur"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -143677,8 +144380,8 @@ self: { libraryHaskellDepends = [ base imj-base imj-prelude mtl ]; testHaskellDepends = [ base ]; description = "Animation Framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -143703,8 +144406,8 @@ self: { ansi-terminal base imj-prelude mtl text time ]; description = "Game engine with geometry, easing, animated text, delta rendering"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -143725,8 +144428,8 @@ self: { executableHaskellDepends = [ base imj-prelude ]; testHaskellDepends = [ base imj-base mtl text ]; description = "A game with flying numbers and 8-bit color animations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -143742,8 +144445,8 @@ self: { base imj-prelude optparse-applicative ]; description = "An application to determine the maximum capacity of stdout buffer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -143755,8 +144458,8 @@ self: { sha256 = "1nv3fxps3i4znibv98qygxdl22dzri5zkw6hjaqajb4nlnh4bd0v"; libraryHaskellDepends = [ base mtl text ]; description = "Prelude library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -143795,8 +144498,8 @@ self: { typed-process typerep-map uri-bytestring xml-conduit xml-types ]; description = "Execute arbitrary actions for each item from RSS/Atom feeds"; - license = stdenv.lib.licenses.cc0; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.cc0; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -143815,8 +144518,8 @@ self: { base lifted-base stm tasty tasty-hunit transformers ]; description = "Spawn threads that never die (unless told to do so)"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "immortal" = callPackage @@ -143830,7 +144533,7 @@ self: { libraryHaskellDepends = [ base stm unliftio-core ]; testHaskellDepends = [ base stm tasty tasty-hunit transformers ]; description = "Spawn threads that never die (unless told to do so)"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "immortal-queue" = callPackage @@ -143842,7 +144545,7 @@ self: { libraryHaskellDepends = [ async base immortal ]; testHaskellDepends = [ base stm tasty tasty-hunit ]; description = "Build a pool of queue-processing worker threads"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "immortal-worker" = callPackage @@ -143858,8 +144561,8 @@ self: { unliftio-core ]; description = "Create worker threads that logs exceptions and restarts"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -143883,8 +144586,8 @@ self: { parsec richreports split staticanalysis text uxadt ]; description = "Multi-platform parser analyzer and generator"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -143910,8 +144613,8 @@ self: { tasty-th ]; description = "Deep embedding of imperative programs with code generation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -143928,8 +144631,8 @@ self: { operational-alacarte pretty syntactic ]; description = "Deep embedding of VHDL programs with code generation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -143942,8 +144645,8 @@ self: { libraryHaskellDepends = [ base containers named template-haskell ]; doHaddock = false; description = "Framework for defaulting superclasses"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -143974,7 +144677,7 @@ self: { testHaskellDepends = [ base hspec parsec ]; benchmarkHaskellDepends = [ base criterion parsec ]; description = "A math-inspired programmatic 2D & 3D CAD system"; - license = stdenv.lib.licenses.agpl3; + license = lib.licenses.agpl3; }) {}; "implicit-hie" = callPackage @@ -144000,7 +144703,7 @@ self: { hspec-attoparsec text transformers yaml ]; description = "Auto generate hie-bios cradles & hie.yaml"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "implicit-hie-cradle" = callPackage @@ -144020,7 +144723,7 @@ self: { ]; testHaskellDepends = [ base ]; description = "Auto generate hie-bios cradles"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "implicit-logging" = callPackage @@ -144033,8 +144736,8 @@ self: { editedCabalFile = "02x6cmbxyw26y5azhjrx8461vngsj27l0a255xvhg2pl25zwfbfs"; libraryHaskellDepends = [ base mtl time transformers ]; description = "A logging framework built around implicit parameters"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -144046,8 +144749,8 @@ self: { sha256 = "1da01fnwxf1350ywawvl58qf479q2rz81wi9s8lvw2n3d75qpn8i"; libraryHaskellDepends = [ base data-default-class ]; description = "Named and unnamed implicit parameters with defaults"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -144080,8 +144783,8 @@ self: { universum unordered-containers ]; description = "Tool for haskell imports refactoring"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -144094,8 +144797,8 @@ self: { libraryHaskellDepends = [ base directory filepath mtl ]; testHaskellDepends = [ base directory filepath mtl ]; description = "Generate code for importing directories automatically"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -144107,8 +144810,8 @@ self: { sha256 = "0557f8a9aaslkhpyp7b6zidg88a3472ya31rp8amqf71393nvkqp"; libraryHaskellDepends = [ base lens ]; description = "Set of data and type definitions of impossible types. Impossible types are useful when declaring type classes / type families instances that should not be expanded by GHC until a specific type is provided in order to keep the types nice and readable."; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -144129,8 +144832,8 @@ self: { ]; testHaskellDepends = [ base Cabal Imprevu ]; description = "Reactive programming language based on a DSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {Imprevu = null;}; @@ -144151,8 +144854,8 @@ self: { ]; testHaskellDepends = [ base Cabal ]; description = "Imprevu support for Happstack"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "imprint" = callPackage @@ -144166,8 +144869,8 @@ self: { libraryHaskellDepends = [ base binary bytestring constraints ]; testHaskellDepends = [ base binary constraints hspec ]; description = "Serialization of arbitrary Haskell expressions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -144179,8 +144882,8 @@ self: { sha256 = "0z8w7lgk263ickb4l3ajhvy1bjq38bbiiw6c048a3yn4h8kpg67a"; libraryHaskellDepends = [ base mtl yices ]; description = "An imperative, verifiable programming language for high assurance applications"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -144203,7 +144906,7 @@ self: { ]; benchmarkHaskellDepends = [ base criterion ]; description = "Mutable containers in Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "in-other-words" = callPackage @@ -144224,7 +144927,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "A higher-order effect system where the sky's the limit"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "inbox" = callPackage @@ -144235,7 +144938,7 @@ self: { sha256 = "12012di97775da8ijv0qjwaxls36kvly0j7nvqqj15ai3kf9yarq"; libraryHaskellDepends = [ async base error-or text time ]; description = "Inbox for asychronous messages"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "inc-ref" = callPackage @@ -144246,7 +144949,7 @@ self: { sha256 = "0hr25bdwq2a1mj74wb8dvb95jyfqx13rz0h4makyb5kqlhxz40xl"; libraryHaskellDepends = [ base stm ]; description = "A STM reference useful for incremental computing"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "inch" = callPackage @@ -144268,8 +144971,8 @@ self: { presburger pretty ]; description = "A type-checker for Haskell with integer constraints"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -144281,8 +144984,8 @@ self: { sha256 = "1dsrx48srmrqcw4y60prgnzxzr7nc7vyzjv0nnr2vaay3j6pxkii"; libraryHaskellDepends = [ base ]; description = "Simple parser combinators for lexical analysis"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -144301,7 +145004,7 @@ self: { testHaskellDepends = [ base bytestring ]; benchmarkHaskellDepends = [ base bytestring criterion ]; description = "Inclusion of files in executables at compile-time"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "incremental" = callPackage @@ -144317,7 +145020,7 @@ self: { ]; testHaskellDepends = [ base ]; description = "incremental update library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "incremental-computing" = callPackage @@ -144337,8 +145040,8 @@ self: { ]; benchmarkHaskellDepends = [ base containers deepseq QuickCheck ]; description = "Incremental computing"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -144362,8 +145065,8 @@ self: { QuickCheck ]; description = "Package for doing incremental computations on maps"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -144387,7 +145090,7 @@ self: { base bytestring criterion deepseq monoid-subclasses text ]; description = "Generic parser library capable of providing partial results from partial input"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "incremental-sat-solver" = callPackage @@ -144398,7 +145101,7 @@ self: { sha256 = "1a75jkv48awijwdch0lnvcxdihh8ns9rflzgsbbhw8p34k1jpz8s"; libraryHaskellDepends = [ base containers mtl ]; description = "Simple, Incremental SAT Solving as a Library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "increments" = callPackage @@ -144417,8 +145120,8 @@ self: { test-framework test-framework-quickcheck2 ]; description = "type classes for incremental updates to data"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -144433,7 +145136,7 @@ self: { libraryHaskellDepends = [ base containers text ]; executableHaskellDepends = [ base optparse-applicative text ]; description = "Fix your indentation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "indentation" = callPackage @@ -144449,8 +145152,8 @@ self: { parsec parsers trifecta ]; description = "Indentation sensitive parsing combinators for Parsec and Trifecta"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -144462,8 +145165,8 @@ self: { sha256 = "1l1zk5wz9x0m4ird1qk8shi1fkcm3sq2nwkjj6wz2sicp0xkx6h9"; libraryHaskellDepends = [ base mtl ]; description = "Indentation sensitive parsing combinators core library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -144478,8 +145181,8 @@ self: { libraryHaskellDepends = [ base indentation-core mtl parsec ]; testHaskellDepends = [ base parsec tasty tasty-hunit ]; description = "Indentation sensitive parsing combinators for Parsec"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -144496,8 +145199,8 @@ self: { ]; testHaskellDepends = [ base tasty tasty-hunit trifecta ]; description = "Indentation sensitive parsing combinators for Trifecta"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -144511,7 +145214,7 @@ self: { isExecutable = true; libraryHaskellDepends = [ base mtl parsec ]; description = "A parser for indentation based structures"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "indents" = callPackage @@ -144523,7 +145226,7 @@ self: { libraryHaskellDepends = [ base mtl parsec ]; testHaskellDepends = [ base mtl parsec tasty tasty-hunit ]; description = "indentation sensitive parser-combinators for parsec"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "index-core" = callPackage @@ -144534,8 +145237,8 @@ self: { sha256 = "014fr720vvl1zs0hl6ljsa1dskwby6zqrlwrrhv0pk1nsmxbilbm"; libraryHaskellDepends = [ base ]; description = "Indexed Types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -144557,8 +145260,8 @@ self: { unordered-containers vector vector-th-unbox ]; description = "Tools for entity indexation"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -144570,7 +145273,7 @@ self: { sha256 = "1hpmzg9ziqgng4wh4g0x4p6sdvn9f31hymwxdvfffydzqq70k17g"; libraryHaskellDepends = [ base ]; description = "Haskell98 indexed functors, monads, comonads"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "indexed-containers" = callPackage @@ -144583,7 +145286,7 @@ self: { testHaskellDepends = [ base hspec ]; testToolDepends = [ hspec-discover ]; description = "Simple, no-frills indexed lists"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "indexed-do-notation" = callPackage @@ -144597,7 +145300,7 @@ self: { base haskell-src-meta indexed template-haskell ]; description = "Do notation for indexed monads"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "indexed-extras" = callPackage @@ -144610,7 +145313,7 @@ self: { editedCabalFile = "0103q2ns33wmcnlhda2lcrz2x1kr2cyfxpv7akj6y09k7q19ir77"; libraryHaskellDepends = [ base bifunctors indexed mtl pointed ]; description = "Indexed functors, monads and comonads that require extensions to Haskell98"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "indexed-free" = callPackage @@ -144621,7 +145324,7 @@ self: { sha256 = "1172vxhyzyf061mnlb8dndnvycjk3shxhiqd8hdz42ipv223admx"; libraryHaskellDepends = [ base indexed ]; description = "indexed monads for free"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "indexed-list-literals" = callPackage @@ -144633,7 +145336,7 @@ self: { libraryHaskellDepends = [ base Only ]; testHaskellDepends = [ base hspec ]; description = "Type safe indexed list literals"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "indexed-profunctors" = callPackage @@ -144644,7 +145347,7 @@ self: { sha256 = "0rdvj62rapkkj5zv5jyx2ynfwn2iszx1w2q08j9ik17zklqv9pri"; libraryHaskellDepends = [ base ]; description = "Utilities for indexed profunctors"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "indexed-traversable" = callPackage @@ -144655,7 +145358,7 @@ self: { sha256 = "0fc18vdm1894yjbjkj9wjm27bf37ac3gvkzak677mgiw2pinmhvs"; libraryHaskellDepends = [ array base containers transformers ]; description = "FunctorWithIndex, FoldableWithIndex, TraversableWithIndex"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }) {}; "indexed-traversable-instances" = callPackage @@ -144679,7 +145382,7 @@ self: { vector ]; description = "More instances of FunctorWithIndex, FoldableWithIndex, TraversableWithIndex"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }) {}; "indextype" = callPackage @@ -144691,8 +145394,8 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "A series of type families and constraints for \"indexable\" types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -144704,7 +145407,7 @@ self: { sha256 = "1dw0fy3v2hfvlaw371af2c288v4p0wyg43h88clswids3nh1lpn8"; libraryHaskellDepends = [ base gtk HDBC HDBC-sqlite3 ]; description = "Indian Language Font Converter"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "indices" = callPackage @@ -144719,8 +145422,8 @@ self: { testHaskellDepends = [ base QuickCheck ]; benchmarkHaskellDepends = [ base criterion deepseq ]; description = "Multi-dimensional statically bounded indices"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -144746,8 +145449,8 @@ self: { raw-strings-qq template-haskell text time ]; description = "A collection of implementations of IndieWeb algorithms"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -144783,8 +145486,8 @@ self: { ]; testToolDepends = [ tasty-discover ]; description = "Convenient imperative eDSL over Lorentz"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {cleveland = null;}; @@ -144797,8 +145500,8 @@ self: { libraryHaskellDepends = [ array base deepseq vector ]; testHaskellDepends = [ array base deepseq QuickCheck text vector ]; description = "Non-contiguous interval data types with potentially infinite ranges"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -144817,7 +145520,7 @@ self: { base directory filepath hspec text text-metrics ]; description = "Infer software license from a given license file"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "infer-upstream" = callPackage @@ -144834,8 +145537,8 @@ self: { ansi-wl-pprint base github optparse-applicative parsec process text ]; description = "Find the repository from where a given repo was forked"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -144856,8 +145559,8 @@ self: { unordered-containers wai ]; description = "The Infernal Machine - An AWS Lambda Custom Runtime for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -144878,8 +145581,8 @@ self: { ]; executableHaskellDepends = [ base optparse-applicative parsec ]; description = "Type inference and checker for JavaScript (experimental)"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -144891,7 +145594,7 @@ self: { sha256 = "18sf9798nna155xix71lw68k19r7ayk9kmppjzd76yxa61r38g41"; libraryHaskellDepends = [ base ]; description = "Exhaustively searchable infinite sets"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "infinity" = callPackage @@ -144906,8 +145609,8 @@ self: { executableHaskellDepends = [ base binary Cabal filepath ghc irc plugins ]; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -144920,7 +145623,7 @@ self: { libraryHaskellDepends = [ base containers haskell-src ]; description = "Infix expression re-parsing (for HsParser library)"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -144940,7 +145643,7 @@ self: { base containers hspec hspec-megaparsec megaparsec QuickCheck text ]; description = "Inflections library for Haskell"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "inflist" = callPackage @@ -144952,8 +145655,8 @@ self: { libraryHaskellDepends = [ base QuickCheck ]; testHaskellDepends = [ base QuickCheck ]; description = "An infinite list type and operations thereon"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -144981,7 +145684,7 @@ self: { template-haskell time vector ]; description = "Haskell client library for InfluxDB"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "informative" = callPackage @@ -145009,8 +145712,8 @@ self: { time-locale-compat yesod yesod-auth yesod-core yesod-form ]; description = "A yesod subsite serving a wiki"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.agpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -145027,7 +145730,7 @@ self: { ]; testHaskellDepends = [ base hspec unordered-containers ]; description = "Quick and easy configuration files in the INI format"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ini-qq" = callPackage @@ -145041,8 +145744,8 @@ self: { libraryHaskellDepends = [ base ini template-haskell text ]; testHaskellDepends = [ base HUnit ini raw-strings-qq text ]; description = "Quasiquoter for INI"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -145062,8 +145765,8 @@ self: { testpack trifecta ]; description = "Processing for .ini files with duplicate sections and options"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -145075,8 +145778,8 @@ self: { sha256 = "0k3bl5adj512bzqysapnggvf6fmi0hs3mvxkymsh9af7gan8y504"; libraryHaskellDepends = [ base ]; description = "Initialization and Deinitialization of 'Storable' values"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -145087,7 +145790,7 @@ self: { version = "1.0"; sha256 = "1dhssqy5369vzcxkkrv8bi5bjz0z67dawwzc27mz9m40bq7324j0"; description = "A class for injective (one-to-one) functions"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "inj-base" = callPackage @@ -145098,7 +145801,7 @@ self: { sha256 = "1cvhk4ww55nd85rwhaagaz2fihcakrqxy9r37jdp3jghaybk9p9d"; libraryHaskellDepends = [ base inj ]; description = "'Inj' instances for 'base'"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "inject" = callPackage @@ -145117,7 +145820,7 @@ self: { attoparsec base hspec hspec-expectations process text ]; description = "A minimalistic template engine"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "inject-function" = callPackage @@ -145128,8 +145831,8 @@ self: { sha256 = "1iw82rzw2w3y40zndz3mxpa7k5ds8zs87ccvp228s4zva0mp5ddl"; libraryHaskellDepends = [ base ]; description = "Monadic functions with injected parameters"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -145158,8 +145861,8 @@ self: { uniplate ]; description = "Inline some Assembly in ur Haskell!"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -145185,25 +145888,26 @@ self: { unordered-containers vector ]; description = "Write Haskell source files including C code inline. No FFI required."; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "inline-c-cpp" = callPackage ({ mkDerivation, base, containers, hspec, inline-c, safe-exceptions - , template-haskell + , template-haskell, vector }: mkDerivation { pname = "inline-c-cpp"; - version = "0.4.0.2"; - sha256 = "0nb7n2q47jbny7rj9y1hn6lnailnmpy4y7j6jaalny123kxsdipp"; + version = "0.4.0.3"; + sha256 = "0bqrhyic3cw1pqg7knsmkqx5swpr4kvf9bmz0mhmqbl6brmv5il0"; libraryHaskellDepends = [ base containers inline-c safe-exceptions template-haskell ]; testHaskellDepends = [ - base containers hspec inline-c safe-exceptions + base containers hspec inline-c safe-exceptions template-haskell + vector ]; description = "Lets you embed C++ code into Haskell"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "inline-c-win32" = callPackage @@ -145218,7 +145922,7 @@ self: { base containers inline-c template-haskell Win32 ]; description = "Win32 API Context for the inline-c library"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "inline-java" = callPackage @@ -145242,8 +145946,8 @@ self: { base criterion deepseq jni jvm singletons ]; description = "Java interop via inline Java code in Haskell modules"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -145278,8 +145982,8 @@ self: { template-haskell vector ]; description = "Seamlessly call R from Haskell and vice versa. No FFI required."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) R;}; @@ -145300,7 +146004,7 @@ self: { executableHaskellDepends = [ base text ]; testHaskellDepends = [ base text ]; description = "Interactive literate programming"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "input-parsers" = callPackage @@ -145316,7 +146020,7 @@ self: { text transformers ]; description = "Extension of the parsers library with more capability and efficiency"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "inquire" = callPackage @@ -145329,8 +146033,8 @@ self: { isExecutable = true; executableHaskellDepends = [ aether base text ]; description = "Console client for encyclopedias"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {aether = null;}; @@ -145355,7 +146059,7 @@ self: { unordered-containers ]; description = "Associative containers retaining insertion order for traversals"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "inserts" = callPackage @@ -145366,8 +146070,8 @@ self: { sha256 = "1m72ysfd2g2jszvcihh7zbfxvpj2a8qjq3ra4vs4bjzpja4kh477"; libraryHaskellDepends = [ attoparsec base bytestring dlist ]; description = "Stupid simple bytestring templates"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -145385,7 +146089,7 @@ self: { async base bytestring cmdargs pipes pipes-network ]; description = "A simple proxy for debugging plaintext protocols communication"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "inspection-testing" = callPackage @@ -145401,7 +146105,7 @@ self: { ]; testHaskellDepends = [ base ]; description = "GHC plugin to do inspection testing"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "inspector-wrecker" = callPackage @@ -145423,8 +146127,8 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Create benchmarks from the HAR files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -145438,8 +146142,8 @@ self: { }: mkDerivation { pname = "instana-haskell-trace-sdk"; - version = "0.3.0.0"; - sha256 = "0dy947230ing6mv4xvd8ahiwfhkz557n2mrvi86whns8jbb71nbv"; + version = "0.4.0.0"; + sha256 = "0cg1i7whiwg07zsby5zr3q3pqg24js3zvrd2rwlpfvqx1pkf3qxh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -145459,8 +146163,8 @@ self: { regex-tdfa retry scientific text unix unordered-containers ]; description = "SDK for adding custom Instana tracing support to Haskell applications"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -145472,7 +146176,7 @@ self: { sha256 = "0wvb3hia5n0nmfd5ih17qp6f7517s164c5mhrn29ai7vv20x6vbx"; libraryHaskellDepends = [ base mtl transformers ]; description = "Controls how the compiler searches for instances using type families"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "instance-map" = callPackage @@ -145488,8 +146192,8 @@ self: { aeson base binary bytestring containers hspec mtl template-haskell ]; description = "Template haskell utilities for helping with deserialization etc. of existential types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -145506,8 +146210,8 @@ self: { aeson base instant-generics tasty tasty-quickcheck ]; description = "Generic Aeson instances through instant-generics"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -145524,8 +146228,8 @@ self: { base bytes instant-generics tasty tasty-quickcheck ]; description = "Generic Serial instances through instant-generics"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -145537,8 +146241,8 @@ self: { sha256 = "088fwsj4hllp96ik91wpqyjfjcb5n64sb6b4fqfvplcsn3zzlvv0"; libraryHaskellDepends = [ base deepseq instant-generics ]; description = "Generic NFData instances through instant-generics"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -145552,8 +146256,8 @@ self: { editedCabalFile = "1z5224dfrwlz29clxb2x2s4cn88sfgmq4264zj4vgkkgakvp848w"; libraryHaskellDepends = [ base containers syb template-haskell ]; description = "Generic programming library with a sum of products view"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -145565,8 +146269,8 @@ self: { sha256 = "0xrs81j6dmwd5xb69rn24ibngkhrs51n9kr8bs292vhj0awm3y4b"; libraryHaskellDepends = [ base hashable instant-generics ]; description = "Generic Hashable instances through instant-generics"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -145581,7 +146285,7 @@ self: { libraryHaskellDepends = [ base instant-generics mtl ]; description = "Heterogenous Zipper in Instant Generics"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -145601,8 +146305,8 @@ self: { http-types network scotty text wai wai-extra ]; description = "Basic HTTP gateway to save articles to Instapaper"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.agpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -145614,8 +146318,8 @@ self: { sha256 = "0wh95zjdv9j1n3ccg2j08av43qnb9vmiyvqvyi70p47dr481npl8"; libraryHaskellDepends = [ base containers mersenne-random vector ]; description = "Fast artifical neural networks"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -145627,7 +146331,7 @@ self: { sha256 = "1fc3vgxxzk6rw0y6d40jiyrc66fd1ig7nk4bdmfn1q595q5iwnz3"; libraryHaskellDepends = [ array base containers music-diatonic ]; description = "Render Instrument Chords"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "int-cast" = callPackage @@ -145645,7 +146349,7 @@ self: { base QuickCheck test-framework test-framework-quickcheck2 ]; description = "Checked conversions between integral types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "int-multimap" = callPackage @@ -145666,8 +146370,8 @@ self: { unordered-containers ]; description = "A data structure that associates each Int key with a set of values"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -145682,8 +146386,8 @@ self: { libraryHaskellDepends = [ base containers primitive ]; testHaskellDepends = [ base containers doctest primitive ]; description = "Advent of Code 2019 intcode interpreter"; - license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -145695,8 +146399,8 @@ self: { sha256 = "06302vwkc99l5gdbk3r25w84gi9cj18jcf8ipi189vpnmw42awwf"; libraryHaskellDepends = [ ghc-prim ]; description = "Integer library based on GMP"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "integer-logarithms" = callPackage @@ -145714,7 +146418,7 @@ self: { tasty-smallcheck ]; description = "Integer logarithms"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "integer-pure" = callPackage @@ -145724,8 +146428,8 @@ self: { version = "1.0"; sha256 = "0lrhf6mw90bfph3hbyxv3n7g2n2xnjfq4qnhyhw4ml76k4yybmxa"; description = "A pure-Haskell implementation of arbitrary-precision Integers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -145744,7 +146448,7 @@ self: { base smallcheck tasty tasty-hunit tasty-quickcheck tasty-smallcheck ]; description = "Integer roots and perfect powers"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "integer-simple" = callPackage @@ -145755,7 +146459,7 @@ self: { sha256 = "1z8hfl4wnsb3bypv3arms0sbvixkalhlcchv35vwziy5wnflnsvn"; libraryHaskellDepends = [ ghc-prim ]; description = "Simple Integer library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "integration" = callPackage @@ -145766,7 +146470,7 @@ self: { sha256 = "0bsqad6q4kc0wykswwqykcn6nd4wj6yd9dzpg075h2n1mmg3h9qc"; libraryHaskellDepends = [ base parallel ]; description = "Fast robust numeric integration via tanh-sinh quadrature"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "integreat" = callPackage @@ -145792,8 +146496,8 @@ self: { vector ]; description = "Integrate different assays"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -145812,8 +146516,8 @@ self: { ]; librarySystemDepends = [ intel_aes ]; description = "Hardware accelerated AES encryption and Random Number Generation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {intel_aes = null;}; @@ -145834,8 +146538,8 @@ self: { testHaskellDepends = [ base ]; doHaddock = false; description = "A GHC Core plugin for intensional datatype refinement checking"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -145852,7 +146556,7 @@ self: { base bytestring hspec main-tester mtl silently ]; description = "instantly create REPL from any function"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "interactive-plot" = callPackage @@ -145871,7 +146575,7 @@ self: { ]; executableHaskellDepends = [ base ]; description = "Interactive quick time series plotting"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "interchangeable" = callPackage @@ -145882,7 +146586,7 @@ self: { sha256 = "1r0gxwbl2k4i9r7jlbmabr1088q8nk1an4nhf79gsx2ybfdzlndh"; libraryHaskellDepends = [ base containers ]; description = "A type class for interchangeable data"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "interleavableGen" = callPackage @@ -145896,7 +146600,7 @@ self: { executableHaskellDepends = [ base directory haskell-src hint mtl ]; description = "Generates a version of a module using InterleavableIO"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "interleavableIO" = callPackage @@ -145908,7 +146612,7 @@ self: { libraryHaskellDepends = [ base mtl ]; description = "Use other Monads in functions that asks for an IO Monad"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "interleave" = callPackage @@ -145919,7 +146623,7 @@ self: { sha256 = "062ixqbrrmamwv3fj6vpfcxy35p37i1wpmsxk1gl9n06n0lg9a8c"; libraryHaskellDepends = [ base ]; description = "Combinators for supporting interleaving of different behaviours"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "interlude" = callPackage @@ -145948,8 +146652,8 @@ self: { string-conv text transformers witherable ]; description = "Prelude replacement based on protolude"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -145961,11 +146665,13 @@ self: { pname = "intern"; version = "0.9.3"; sha256 = "1pbk804kq5p25ixrihhpfgy0fwj8i6cybxlhk42krzni7ad7gx4k"; + revision = "1"; + editedCabalFile = "1cjlmvg55nn9fd1f0jfmgy1rjys7gna3x3qknnpcmndq6vzg1mrl"; libraryHaskellDepends = [ array base bytestring hashable text unordered-containers ]; description = "Efficient hash-consing for arbitrary data types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "internetmarke" = callPackage @@ -145984,7 +146690,7 @@ self: { ]; description = "Shell command for constructing custom stamps for German Post"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -146011,8 +146717,8 @@ self: { transformers ]; description = "Complete interactive development program for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -146044,7 +146750,7 @@ self: { text transformers unordered-containers vector ]; description = "Tracery-like randomized text interpolation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "interpol" = callPackage @@ -146067,8 +146773,8 @@ self: { test-framework-hunit ]; description = "GHC preprocessor and library to enable variable interpolation in strings"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -146086,7 +146792,7 @@ self: { quickcheck-instances template-haskell text ]; description = "String interpolation done right"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "interpolatedstring-perl6" = callPackage @@ -146103,7 +146809,7 @@ self: { base bytestring haskell-src-meta template-haskell text ]; description = "QuasiQuoter for Perl6-style multi-line interpolated strings"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "interpolatedstring-qq" = callPackage @@ -146118,8 +146824,8 @@ self: { base haskell-src-meta-mwotton template-haskell ]; description = "QuasiQuoter for Ruby-style multi-line interpolated strings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -146135,8 +146841,8 @@ self: { base haskell-src-meta-mwotton template-haskell ]; description = "DO NOT USE THIS. interpolatedstring-qq works now."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -146155,8 +146861,8 @@ self: { base bytestring haskell-src-meta HUnit template-haskell text ]; description = "QuasiQuoter for multi-line interpolated strings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -146173,7 +146879,7 @@ self: { array base containers QuickCheck utility-ht ]; description = "piecewise linear and cubic Hermite interpolation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "interpolator" = callPackage @@ -146194,7 +146900,7 @@ self: { product-profunctors profunctors QuickCheck template-haskell text ]; description = "Runtime interpolation of environment variables in records using profunctors"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "interprocess" = callPackage @@ -146208,7 +146914,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base typed-process ]; description = "Shared memory and control structures for IPC"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "interruptible" = callPackage @@ -146226,8 +146932,8 @@ self: { ]; testHaskellDepends = [ base Cabal either transformers ]; description = "Monad transformers that can be run and resumed later, conserving their context"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -146239,7 +146945,7 @@ self: { sha256 = "1z0ca16vp3j9l2nkzg8gck2jrysqn2fw4vxr2br0j41fp7iss5wx"; libraryHaskellDepends = [ base base-prelude transformers ]; description = "An abstraction over interspersing monadic actions"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "interval" = callPackage @@ -146253,8 +146959,8 @@ self: { libraryHaskellDepends = [ base deepseq fingertree ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Intervals with adherences"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -146267,7 +146973,7 @@ self: { libraryHaskellDepends = [ base time ]; testHaskellDepends = [ base hspec QuickCheck time ]; description = "An implementation of Allen's interval algebra for temporal logic"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "interval-functor" = callPackage @@ -146279,7 +146985,7 @@ self: { libraryHaskellDepends = [ base transformers ]; testHaskellDepends = [ base hedgehog ]; description = "Intervals of functors"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "intervals" = callPackage @@ -146299,7 +147005,7 @@ self: { base directory doctest filepath QuickCheck template-haskell ]; description = "Interval Arithmetic"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "intmap-graph" = callPackage @@ -146310,7 +147016,7 @@ self: { sha256 = "0g4kf7d4yh29jlb5a2f8awjbmaan2f7m1ybkcihayp83lvjld4v0"; libraryHaskellDepends = [ base containers text vector word8 ]; description = "A graph library that allows to explore edges after their type"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "intricacy" = callPackage @@ -146333,7 +147039,7 @@ self: { ]; executablePkgconfigDepends = [ ncurses ]; description = "A game of competitive puzzle-design"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {inherit (pkgs) ncurses;}; "intrinsic-superclasses" = callPackage @@ -146348,7 +147054,7 @@ self: { base containers haskell-src-meta mtl template-haskell ]; description = "A quasiquoter for better instance deriving and default methods"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "intro" = callPackage @@ -146370,7 +147076,7 @@ self: { writer-cps-mtl ]; description = "Safe and minimal prelude"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "intro-prelude" = callPackage @@ -146385,8 +147091,8 @@ self: { testHaskellDepends = [ intro ]; doHaddock = false; description = "Intro reexported as Prelude"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -146407,8 +147113,8 @@ self: { validity-containers ]; description = "A prelude for safe new projects"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -146428,8 +147134,8 @@ self: { introduction path path-io QuickCheck time ]; description = "A prelude for the tests of safe new projects"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -146441,8 +147147,8 @@ self: { sha256 = "044nw8z2ga46mal9pr64vsc714n4dibx0k2lwgnrkk49729c7lk0"; libraryHaskellDepends = [ base bits-extras bytestring deepseq ]; description = "Pure, mergeable, succinct Int sets"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -146462,7 +147168,7 @@ self: { base containers criterion random unordered-containers vector ]; description = "An imperative integer set written in Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "invariant" = callPackage @@ -146484,7 +147190,7 @@ self: { testHaskellDepends = [ base hspec QuickCheck template-haskell ]; testToolDepends = [ hspec-discover ]; description = "Haskell98 invariant functors"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }) {}; "invertible" = callPackage @@ -146502,7 +147208,7 @@ self: { ]; testHaskellDepends = [ base QuickCheck transformers ]; description = "bidirectional arrows, bijective functions, and invariant functors"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "invertible-grammar" = callPackage @@ -146521,7 +147227,7 @@ self: { tagged template-haskell text transformers ]; description = "Invertible parsing combinators framework"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "invertible-hlist" = callPackage @@ -146532,8 +147238,8 @@ self: { sha256 = "1824j4k8y5mn16vyk1h3mb72gr19j6rc833w24yqjxjlqw81y3y5"; libraryHaskellDepends = [ base HList invertible ]; description = "invertible functions and instances for HList"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -146547,7 +147253,7 @@ self: { base hxt hxt-charproperties invertible mtl ]; description = "invertible transformer instances for HXT Picklers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "invertible-syntax" = callPackage @@ -146558,8 +147264,8 @@ self: { sha256 = "0kyi7gq0a792v4lwmpq8i56vzwk6g7cjc3lbpxch47jsqv8lfhbp"; libraryHaskellDepends = [ base partial-isomorphisms ]; description = "Invertible syntax descriptions for both parsing and pretty printing"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -146571,7 +147277,7 @@ self: { sha256 = "1nms6w5b8apdz9xlwdqyj9n4m0b192simxg9zl7pv8zkyklyb3aw"; libraryHaskellDepends = [ base bytestring containers text vector ]; description = "Semigroups with involution"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "io-capture" = callPackage @@ -146589,8 +147295,8 @@ self: { base bytestring hspec hspec-core streaming-bytestring unix ]; description = "Capture IO actions' stdout and stderr"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -146610,8 +147316,8 @@ self: { base hspec lifted-base monad-control transformers ]; description = "Choice for IO and lifted IO"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -146624,7 +147330,7 @@ self: { libraryHaskellDepends = [ base time ]; testHaskellDepends = [ base ]; description = "Easy I/O model to learn IO monad"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "io-manager" = callPackage @@ -146638,7 +147344,7 @@ self: { libraryHaskellDepends = [ base containers ]; executableHaskellDepends = [ base containers ]; description = "Skeleton library around the IO monad"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "io-memoize" = callPackage @@ -146649,7 +147355,7 @@ self: { sha256 = "0ga85wdvz67jjx8qh6f687kfikcrfmp7winn13v6na7vlaqs2ly7"; libraryHaskellDepends = [ async base ]; description = "Memoize IO actions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "io-reactive" = callPackage @@ -146663,8 +147369,8 @@ self: { libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base ]; description = "An API for generating TIMBER style reactive objects"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -146677,7 +147383,7 @@ self: { libraryHaskellDepends = [ base stm ]; testHaskellDepends = [ base hspec transformers ]; description = "Exception safe resource management with dynamic regions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "io-storage" = callPackage @@ -146688,7 +147394,7 @@ self: { sha256 = "1ga9bd7iri6vlsxnjx765yy3bxc4lbz644wyw88yzvpjgz6ga3cs"; libraryHaskellDepends = [ base containers ]; description = "A key-value store in the IO monad"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "io-streams" = callPackage @@ -146714,7 +147420,7 @@ self: { time transformers vector zlib zlib-bindings ]; description = "Simple, composable, and easy-to-use stream I/O"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "io-streams-haproxy" = callPackage @@ -146735,7 +147441,7 @@ self: { test-framework-hunit transformers ]; description = "HAProxy protocol 1.5 support for io-streams"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "io-streams-http" = callPackage @@ -146751,7 +147457,7 @@ self: { transformers ]; description = "http-client for io-streams"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "io-string-like" = callPackage @@ -146764,7 +147470,7 @@ self: { editedCabalFile = "0fn9zq62js0xybfbhd673hbh5zp0l2v1p2ddknwkclh4i01i03i6"; libraryHaskellDepends = [ base binary bytestring text ]; description = "Classes to handle Prelude style IO functions for different datatypes"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "io-throttle" = callPackage @@ -146778,7 +147484,7 @@ self: { libraryHaskellDepends = [ base SafeSemaphore threads ]; testHaskellDepends = [ base ]; description = "Limit number of IO actions started per second"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "ioctl" = callPackage @@ -146791,8 +147497,8 @@ self: { editedCabalFile = "15i0plam5pr3zkvmmy0g5q9v1fwvp49r4gsyx3y5j89svyffwqaq"; libraryHaskellDepends = [ base network unix ]; description = "Type-safe I/O control package"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -146813,8 +147519,8 @@ self: { base containers ivory ivory-backend-c mtl ]; description = "EDSL for concurrent, realtime, embedded programming on top of Ivory"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -146826,7 +147532,7 @@ self: { sha256 = "1iwi1675ggfwfh5as0zj19q4375b58hrb3g4jfn8myrhlhncixpl"; libraryHaskellDepends = [ base ]; description = "iorefs with a unique stable index"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "iostring" = callPackage @@ -146837,8 +147543,8 @@ self: { sha256 = "0bqi5b8j0i56nqm2fw2ylk6qnc2hm41qx36p93hs0f8javpmv1nn"; libraryHaskellDepends = [ base bytestring path text ]; description = "A class of strings that can be involved in IO"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -146850,8 +147556,8 @@ self: { sha256 = "1nvysb0nmx42q0ilr09nzbsmr7mbbclhgl0iikibhhfb34r2afx0"; libraryHaskellDepends = [ base ]; description = "run IOs in a single thread"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -146863,8 +147569,8 @@ self: { sha256 = "0ylwrim2wfx3v03syd8v0iwf9kbw9154wlxsp8wc1d3n6sz7p1cc"; libraryHaskellDepends = [ base ]; description = "Supports the automatic undoing of IO operations when an exception is thrown"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -146877,8 +147583,8 @@ self: { }: mkDerivation { pname = "ip"; - version = "1.7.2"; - sha256 = "10jcqc7x48kfslyahl9i4pb1qmjfg1fjznc5w7kl9kx2cxivbwig"; + version = "1.7.3"; + sha256 = "0xcn9la0c2illw53xn8m2w2jpfi9yivzl2w54l62cj2fn7l9l5cf"; libraryHaskellDepends = [ aeson attoparsec base bytebuild byteslice bytesmith bytestring deepseq hashable natural-arithmetic primitive text text-short @@ -146895,8 +147601,8 @@ self: { text ]; description = "Library for IP and MAC addresses"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -146911,8 +147617,8 @@ self: { libraryHaskellDepends = [ base cpu network template-haskell ]; testHaskellDepends = [ base cpu network tasty tasty-hunit ]; description = "Quasiquoter for IP addresses"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -146924,8 +147630,8 @@ self: { sha256 = "1ccr15yn2ska5wgwlcnfpi9w1xxkly0pwqibmdl9a1ggmwfsskv0"; libraryHaskellDepends = [ base binary bytestring iproute ]; description = "IP2Location Haskell package for IP geolocation"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -146937,8 +147643,8 @@ self: { sha256 = "1hi1q0kiqqp96w29y9699s66rmyr7k0fp6s7z86ll9n3bmf0a4g4"; libraryHaskellDepends = [ base binary bytestring iproute ]; description = "IP2Proxy Haskell package for proxy detection"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -146952,7 +147658,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base cmdargs IPv6Addr text ]; description = "Commandline tool to deal with IPv6 address text representations"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ipatch" = callPackage @@ -146970,8 +147676,8 @@ self: { unix ]; description = "interactive patch editor"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -146987,8 +147693,8 @@ self: { base binary bytestring dlist mtl network network-bytestring stm ]; description = "High level inter-process communication library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -147005,7 +147711,7 @@ self: { ]; testHaskellDepends = [ base hspec unix ]; description = "Simple inter-process communication through IPCVars"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "ipfs" = callPackage @@ -147030,8 +147736,8 @@ self: { text vector yaml ]; description = "Access IPFS locally and remotely"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -147047,8 +147753,8 @@ self: { aeson base bytestring http-media http-types servant text ]; description = "Auto-generated IPFS HTTP API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -147070,8 +147776,8 @@ self: { text ]; description = "IPLD Content-IDentifiers <https://github.com/ipld/cid>"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -147093,8 +147799,8 @@ self: { libraryPkgconfigDepends = [ ipopt nlopt ]; libraryToolDepends = [ c2hs ]; description = "haskell binding to ipopt and nlopt including automatic differentiation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) ipopt; inherit (pkgs) nlopt;}; @@ -147106,8 +147812,8 @@ self: { sha256 = "08x8lfy0dll09y7cvfgmif5gvj7j2kxd8qac3fndmq4z45wiy90s"; libraryHaskellDepends = [ base haskell-src sr-extra ]; description = "Tiny helper for pretty-printing values in ghci console"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -147129,7 +147835,7 @@ self: { QuickCheck safe ]; description = "IP Routing Table"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "iptables-helpers" = callPackage @@ -147147,8 +147853,8 @@ self: { ]; executableHaskellDepends = [ base QuickCheck syb ]; description = "iptables rules parser/printer library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -147173,8 +147879,8 @@ self: { time unix utf8-string ]; description = "web-interface for iptables"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -147198,7 +147904,7 @@ self: { unordered-containers vector ]; description = "Data structure for working with Jupyter notebooks (ipynb)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ipython-kernel" = callPackage @@ -147220,7 +147926,7 @@ self: { transformers unordered-containers uuid zeromq4-haskell ]; description = "A library for creating kernels for IPython frontends"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "irc" = callPackage @@ -147237,7 +147943,7 @@ self: { test-framework-hunit test-framework-quickcheck2 ]; description = "A small library for parsing IRC messages"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "irc-bytestring" = callPackage @@ -147248,7 +147954,7 @@ self: { sha256 = "09n4y93x74wblbz89s1hwzmanwwi72cj0baz72485svarg55kid7"; libraryHaskellDepends = [ attoparsec base bytestring ]; description = "serialization and parsing of IRC messages"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "irc-client" = callPackage @@ -147268,7 +147974,7 @@ self: { x509-store x509-validation ]; description = "An IRC client library"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "irc-colors" = callPackage @@ -147279,7 +147985,7 @@ self: { sha256 = "1xl38bq1b6w7z8q0frra4h76lyk63bsy5i1qd34pdgwvikd2rkh0"; libraryHaskellDepends = [ base text ]; description = "Colourize your IRC strings"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "irc-conduit" = callPackage @@ -147297,7 +148003,7 @@ self: { x509-validation ]; description = "Streaming IRC message library using conduits"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "irc-core" = callPackage @@ -147316,8 +148022,8 @@ self: { ]; testHaskellDepends = [ base hashable HUnit text ]; description = "IRC core library for glirc"; - license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ kiwi ]; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ kiwi ]; }) {}; "irc-ctcp" = callPackage @@ -147328,7 +148034,7 @@ self: { sha256 = "16mp9dpp57id760zc932dszd5r1ncskwwxrp0djka5r1alddjz6n"; libraryHaskellDepends = [ base bytestring text ]; description = "A CTCP encoding and decoding library for IRC clients"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "irc-dcc" = callPackage @@ -147352,8 +148058,8 @@ self: { tasty-hspec tasty-quickcheck utf8-string ]; description = "A DCC message parsing and helper library for IRC clients"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -147374,8 +148080,8 @@ self: { transformers unordered-containers ]; description = "Library for writing fun IRC bots"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -147394,8 +148100,8 @@ self: { time-units unordered-containers ]; description = "Another library for writing IRC clients"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -147412,8 +148118,8 @@ self: { ]; testHaskellDepends = [ base text ]; description = "Add color and style decorations to IRC messages"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -147427,8 +148133,8 @@ self: { base irc-fun-types regex-applicative text ]; description = "Types and functions for working with the IRC protocol"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -147440,8 +148146,8 @@ self: { sha256 = "15q9sfpazrnplj8yp1v641amnw8zcvwb9wp8siy8fbhi6gcx5lip"; libraryHaskellDepends = [ base hashable text ]; description = "Common types for IRC related packages"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -147464,7 +148170,7 @@ self: { parsec random SafeSemaphore stm time unix ]; description = "A library for writing IRC bots"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ircbouncer" = callPackage @@ -147475,7 +148181,7 @@ self: { sha256 = "1bn0m9x89pqknz8gn8gk9is6w6px4hznp3fqqb5dxwssmmjm99zm"; doHaddock = false; description = "None"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ireal" = callPackage @@ -147486,7 +148192,7 @@ self: { sha256 = "0wxwr74rhf2kmx8dz629k707ir10w4mlkvis50v113kh87d990lj"; libraryHaskellDepends = [ base QuickCheck ]; description = "Real numbers and intervals with relatively efficient exact arithmetic"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "iri" = callPackage @@ -147512,8 +148218,8 @@ self: { tasty-quickcheck ]; description = "RFC-based resource identifier library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -147541,8 +148247,8 @@ self: { base extra multistate text transformers unordered-containers yaml ]; description = "Automated Local Cabal Package Testing and Uploading"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -147554,8 +148260,8 @@ self: { sha256 = "1yi1ia4ii6xg17ndp0v47cix0ds6bbrsbf0pghcmx3y4b55v0dlr"; libraryHaskellDepends = [ aeson base http-client lens text wreq ]; description = "Iron.IO message queueing client library"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -147578,8 +148284,8 @@ self: { antisplice base chatty chatty-utils mtl transformers ]; description = "A technical demo for Antisplice"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -147591,8 +148297,8 @@ self: { sha256 = "05a1k70cj4rlaz7yx84m7riz6zhsb588vfyzkza2gr4i5wlhjr6c"; libraryHaskellDepends = [ ad base data-default-class statistics ]; description = "Item Response Theory functions for use in computerized adaptive testing"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -147605,7 +148311,7 @@ self: { libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base template-haskell ]; description = "Generic pattern predicates"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "isbn" = callPackage @@ -147617,7 +148323,7 @@ self: { libraryHaskellDepends = [ base text ]; testHaskellDepends = [ base hspec text ]; description = "ISBN Validation and Manipulation"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "isdicom" = callPackage @@ -147636,8 +148342,8 @@ self: { base directory doctest filepath QuickCheck template-haskell ]; description = "An executable and library to determine if a file is a DICOM file"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -147649,8 +148355,8 @@ self: { sha256 = "10f09br33xy5ldl924kfnnlc5ilwq44hd17s2qdf9jm75q4sa7d5"; libraryHaskellDepends = [ base vacuum ]; description = "Check whether a value has been evaluated"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -147664,7 +148370,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base gtk3 ]; description = "A program to show the size of image and whether suitable for wallpaper"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "islink" = callPackage @@ -147675,7 +148381,7 @@ self: { sha256 = "1mxfs8k0znc7v2iynjnhr4k5c9as4ip37ybvxnvjfqy4dld9rgyg"; libraryHaskellDepends = [ base unordered-containers ]; description = "Check if an HTML element is a link"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ismtp" = callPackage @@ -147691,8 +148397,8 @@ self: { lifted-base monad-control netlines network vector ]; description = "Advanced ESMTP library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -147705,7 +148411,7 @@ self: { libraryHaskellDepends = [ base mtl profunctors ]; testHaskellDepends = [ base mtl ]; description = "Deriving via arbitrary isomorphisms"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "iso3166-country-codes" = callPackage @@ -147729,7 +148435,7 @@ self: { sha256 = "1s15vb00nqxnmm59axapipib1snh6q5qhfdw7pgb9vdsz8i86jqj"; libraryHaskellDepends = [ base ]; description = "ISO-639-1 language codes"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "iso8583-bitmaps" = callPackage @@ -147745,7 +148451,7 @@ self: { th-lift ]; description = "Parse and merge ISO 8583-style bitmaps"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "iso8601-duration" = callPackage @@ -147764,8 +148470,8 @@ self: { time ]; description = "Types and parser for ISO8601 durations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -147778,7 +148484,7 @@ self: { libraryHaskellDepends = [ base time ]; testHaskellDepends = [ base hspec HUnit time ]; description = "Convert to/from the ISO 8601 time format"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "isobmff" = callPackage @@ -147803,8 +148509,8 @@ self: { base binary bytestring criterion tagged type-spec ]; description = "A parser and generator for the ISO-14496-12/14 base media file format"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -147829,8 +148535,8 @@ self: { base binary bytestring criterion tagged type-spec ]; description = "A (bytestring-) builder for the ISO-14496-12 base media file format"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -147847,8 +148553,8 @@ self: { unordered-containers uri vector ]; description = "Bindings to the isoHunt torrent search API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -147867,8 +148573,8 @@ self: { base containers hspec megaparsec QuickCheck ]; description = "Isotopic masses and relative abundances"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -147881,7 +148587,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "Positive integers test"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "it-has" = callPackage @@ -147893,7 +148599,7 @@ self: { libraryHaskellDepends = [ base generic-lens ]; testHaskellDepends = [ base generic-lens QuickCheck ]; description = "Automatically derivable Has instances"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "itanium-abi" = callPackage @@ -147911,7 +148617,7 @@ self: { base HUnit process test-framework test-framework-hunit ]; description = "An implementation of name mangling/demangling for the Itanium ABI"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "itcli" = callPackage @@ -147929,8 +148635,8 @@ self: { time uuid yaml ]; description = "Issue Tracker for the CLI"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -147958,8 +148664,8 @@ self: { vty ]; description = "A brick Widget for selectable summary of many elements on a terminal"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -147978,8 +148684,8 @@ self: { test-framework-hunit test-framework-quickcheck2 vector ]; description = "iteratees for statistical processing"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -147998,8 +148704,8 @@ self: { ]; librarySystemDepends = [ zlib ]; description = "Iteratee-based IO with pipe operators"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) zlib;}; @@ -148014,7 +148720,7 @@ self: { base mtl tagged template-haskell vector ]; description = "API for hierarchical multilevel collections"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "iteratee" = callPackage @@ -148043,8 +148749,8 @@ self: { mtl transformers transformers-base unix ]; description = "Iteratee-based I/O"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -148057,8 +148763,8 @@ self: { libraryHaskellDepends = [ base bytestring iteratee mtl ]; librarySystemDepends = [ bzip2 zlib ]; description = "Enumeratees for compressing and decompressing streams"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) bzip2; inherit (pkgs) zlib;}; @@ -148076,8 +148782,8 @@ self: { base bytestring containers ListLike MonadCatchIO-mtl mtl unix ]; description = "Iteratee-based I/O"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -148093,8 +148799,8 @@ self: { base iteratee ListLike parsec reference transformers ]; description = "Package allowing parsec parser initeratee"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -148108,8 +148814,8 @@ self: { base iteratee stm stm-chans transformers ]; description = "Concurrent iteratees using STM"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -148126,8 +148832,8 @@ self: { transformers unix ]; description = "Library for building servers with IterIO"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -148144,8 +148850,8 @@ self: { libraryHaskellDepends = [ base base64-bytestring bytestring ]; executableHaskellDepends = [ base bytestring ]; description = "Enable graphical display of images inline on some terminals"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -148159,8 +148865,8 @@ self: { editedCabalFile = "0pd14gfdpd12h1vlrk3dfg5vxlpd1jv2zi32nxic7p09wz59dkpk"; libraryHaskellDepends = [ base iterm-show JuicyPixels ]; description = "Orphan Show instances for JuciyPixels image types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -148178,8 +148884,8 @@ self: { base diagrams-lib diagrams-rasterific iterm-show JuicyPixels ]; description = "Orphan Show instances for diagrams package that render inline in some terminals"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -148196,7 +148902,7 @@ self: { alg base smallcheck tasty tasty-smallcheck ]; description = "Intervals"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ivar-simple" = callPackage @@ -148207,7 +148913,7 @@ self: { sha256 = "0a8wm3jj5widp3awdsgl8jidxyhw97d9iijl65frwd9kjfzsc678"; libraryHaskellDepends = [ base ]; description = "Write once concurrency primitives"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "ivor" = callPackage @@ -148225,8 +148931,8 @@ self: { base binary containers directory haskell98 mtl parsec ]; description = "Theorem proving library based on dependent type theory"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -148245,8 +148951,8 @@ self: { ]; libraryToolDepends = [ alex happy ]; description = "Safe embedded C programming"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -148262,7 +148968,7 @@ self: { base directory filepath HStringTemplate text utf8-string ]; description = "Manage additional data files during Ivory compilation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ivory-avr-atmega328p-registers" = callPackage @@ -148275,8 +148981,8 @@ self: { base base-compat ivory ivory-hw monadLib ]; description = "Ivory register bindings for the Atmega328p"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -148297,8 +149003,8 @@ self: { process srcloc template-haskell ]; description = "Ivory C backend"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -148317,8 +149023,8 @@ self: { ]; executableHaskellDepends = [ base ivory ivory-backend-c ]; description = "Ivory bit-data support"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -148337,8 +149043,8 @@ self: { base base-compat containers ivory monadLib tasty tasty-hunit ]; description = "Simple concrete evaluator for Ivory programs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -148361,8 +149067,8 @@ self: { monadLib pretty QuickCheck template-haskell ]; description = "Ivory examples"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -148375,8 +149081,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base filepath ivory ivory-artifact ]; description = "Ivory hardware model (STM32F4)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -148393,8 +149099,8 @@ self: { monadLib pretty ]; description = "Ivory compiler optimizations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -148416,8 +149122,8 @@ self: { ivory-stdlib monadLib process QuickCheck tasty tasty-hunit ]; description = "QuickCheck driver for Ivory"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -148434,8 +149140,8 @@ self: { base base-compat filepath ivory ivory-artifact monadLib ]; description = "Serialization library for Ivory"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -148448,8 +149154,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base filepath ivory ivory-artifact ]; description = "Ivory standard library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -148465,8 +149171,8 @@ self: { base invertible-syntax partial-isomorphisms snap snap-core ]; description = "A lightweight web framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -148479,7 +149185,7 @@ self: { libraryHaskellDepends = [ base ]; librarySystemDepends = [ wirelesstools ]; description = "Bindings for the iw C library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) wirelesstools;}; "ix" = callPackage @@ -148498,7 +149204,7 @@ self: { testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; benchmarkHaskellDepends = [ base criterion ]; description = "Indexed monads"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ix-shapable" = callPackage @@ -148509,7 +149215,7 @@ self: { sha256 = "08ljlzywnw0h8ijwb6yh4r8l6z7bbknwxv9cjq7lkfx7m2vgy1sh"; libraryHaskellDepends = [ array base ]; description = "Reshape multi-dimensional arrays"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ixdopp" = callPackage @@ -148522,8 +149228,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base preprocessor-tools syb ]; description = "A preprocessor for expanding \"ixdo\" notation for indexed monads"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -148537,8 +149243,8 @@ self: { editedCabalFile = "064bqv1i43car216ajjiq7j9vz2ha0rxhmpin83ajrchva1yd7sq"; libraryHaskellDepends = [ base ghc-prim ]; description = "Embeds effect systems into Haskell using parameteric effect monads"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -148557,7 +149263,7 @@ self: { base Cabal containers HUnit QuickCheck random ]; description = "Efficient relational queries on Haskell sets"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ixset-typed" = callPackage @@ -148576,7 +149282,7 @@ self: { base containers HUnit QuickCheck tasty tasty-hunit tasty-quickcheck ]; description = "Efficient relational queries on Haskell sets"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ixset-typed-binary-instance" = callPackage @@ -148587,7 +149293,7 @@ self: { sha256 = "1jgqc1ys5pvfkha8pyddz5f01qsmv9a83xw0q75njk8zhqajlyvx"; libraryHaskellDepends = [ base binary ixset-typed ]; description = "Binary instance for ixset-typed"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "ixset-typed-conversions" = callPackage @@ -148603,7 +149309,7 @@ self: { zipper-extra ]; description = "Conversions from ixset-typed to other containers"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "ixset-typed-hashable-instance" = callPackage @@ -148614,7 +149320,7 @@ self: { sha256 = "0bwajqlj1kpis2616lrmcymmag66fkmdrsrj0r3kf8j6090zxmyv"; libraryHaskellDepends = [ base hashable ixset-typed ]; description = "Hashable instance for ixset-typed"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "ixshader" = callPackage @@ -148630,8 +149336,8 @@ self: { template-haskell text ]; description = "A shallow embedding of the OpenGL Shading Language in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -148651,8 +149357,8 @@ self: { haskell98 hoauth mtl old-locale parsec time utf8-string xml ]; description = "CLI (command line interface) to YQL"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -148661,15 +149367,13 @@ self: { }: mkDerivation { pname = "j"; - version = "0.2.1.0"; - sha256 = "1r2lldy35sfzqrd82v2fj113l10mhvllf4yxbkrfy0y7wv0c5v8n"; - revision = "1"; - editedCabalFile = "022ah42q1ba8ank33jn5r9h7fbs3579mlrk6ks8q7vbcm4rnalj0"; + version = "0.2.1.1"; + sha256 = "14mmqdkh73idqsxsvgvz5nfv7n0ashj35amawzy63zs80hfmqcf2"; libraryHaskellDepends = [ base bytestring repa unix ]; testHaskellDepends = [ base bytestring repa tasty tasty-hunit ]; description = "J in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -148690,8 +149394,8 @@ self: { strings syb transformers ]; description = "j2hs"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -148703,7 +149407,7 @@ self: { sha256 = "1654hjzagmnaq3p9irjgdg0crgx01v2r3qnprb09a32xg4cf6xam"; libraryHaskellDepends = [ base ]; description = "Extra functions I require in base"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "jack" = callPackage @@ -148736,8 +149440,8 @@ self: { libraryPkgconfigDepends = [ libjack2 ]; libraryToolDepends = [ c2hs ]; description = "DEPRECATED Bindings to the JACK Audio Connection Kit"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) libjack2;}; @@ -148749,8 +149453,8 @@ self: { sha256 = "03ysmgg5f3dsimskqw5vpnrv5jg4gf1gd0khmf0s1ilfm1jc1nfd"; libraryHaskellDepends = [ base hosc ]; description = "control JackMiniMix"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -148763,8 +149467,8 @@ self: { libraryHaskellDepends = [ base binary bytestring vector ]; testHaskellDepends = [ base doctest ]; description = "Roots of two shifted Jacobi polynomials (Legendre and Radau) to double precision"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -148790,8 +149494,8 @@ self: { ]; testToolDepends = [ tasty-discover ]; description = "Generate flamegraphs from Jaeger .json dumps."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -148807,8 +149511,8 @@ self: { base containers directory monads-fd transformers ]; description = "Jailed IO monad"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -148822,8 +149526,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base Cabal ]; description = "Strip version restrictions from Cabal files"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ peti ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ peti ]; }) {}; "jalaali" = callPackage @@ -148836,7 +149540,7 @@ self: { testHaskellDepends = [ base hspec time ]; benchmarkHaskellDepends = [ base deepseq time ]; description = "Jalaali calendar systems"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "jalla" = callPackage @@ -148859,7 +149563,7 @@ self: { ]; description = "Higher level functions for linear algebra. Wraps BLAS and LAPACKE."; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) blas; cblas = null; lapacke = null;}; @@ -148880,7 +149584,7 @@ self: { ]; executableHaskellDepends = [ base boxes directory filepath ]; description = "Export sheet music and audio from Windows/Mac app Jammit"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "japanese-calendar" = callPackage @@ -148892,7 +149596,7 @@ self: { libraryHaskellDepends = [ base time ]; testHaskellDepends = [ base hspec QuickCheck time ]; description = "Data type of Japanese Calendar (Wareki)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "japanese-holidays" = callPackage @@ -148905,7 +149609,7 @@ self: { testHaskellDepends = [ base doctest hspec time ]; testToolDepends = [ hspec-discover ]; description = "Japanese holidays utility"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "jarfind" = callPackage @@ -148926,7 +149630,7 @@ self: { ]; description = "Tool for searching java classes, members and fields in classfiles and JAR archives"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -148948,8 +149652,8 @@ self: { ]; doHaddock = false; description = "Jarification of Haskell sources"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -148969,8 +149673,8 @@ self: { executableHaskellDepends = [ aeson base bytestring text ]; testHaskellDepends = [ aeson base bytestring text ]; description = "A fast JASONETTE-iOS JSON combinator library for haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -148987,7 +149691,7 @@ self: { executableToolDepends = [ alex happy ]; description = "Create immutable algebraic data structures for Java"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "java-bridge" = callPackage @@ -149010,8 +149714,8 @@ self: { named-records names split strings syb ]; description = "Bindings to the JNI and a high level interface generator"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -149023,8 +149727,8 @@ self: { sha256 = "0wjxm0h5xlsab7iphcabb66c7gjxy7hyb502inlj5zxq1ic5ghzv"; libraryHaskellDepends = [ base java-bridge transformers ]; description = "Utilities for working with the java-bridge package"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -149036,8 +149740,8 @@ self: { sha256 = "1ms8m95mara3pp7qdg8jn2ajbq3zj8pnbs1b9jhpxbdkl5220768"; libraryHaskellDepends = [ base diet ]; description = "Functions to simulate Java's Character class"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -149052,7 +149756,7 @@ self: { libraryHaskellDepends = [ base random-shuffle ]; executableHaskellDepends = [ base ]; description = "The etude of the Haskell programming"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "java-reflect" = callPackage @@ -149063,8 +149767,8 @@ self: { sha256 = "1vdfq3c8chqhss6jiy139yrm45mij4kjdwxf2wrsfm4064j0n3wc"; libraryHaskellDepends = [ base containers hx java-bridge ]; description = "Tools for reflecting on Java classes"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -149086,7 +149790,7 @@ self: { ]; description = "Java class files"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "javascript-bridge" = callPackage @@ -149107,8 +149811,8 @@ self: { executableHaskellDepends = [ base scotty text ]; testHaskellDepends = [ aeson base scotty stm text time wai-extra ]; description = "Remote Monad for JavaScript on the browser"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -149129,7 +149833,7 @@ self: { ]; executableHaskellDepends = [ base ghcjs-base-stub ]; description = "Extra javascript functions when using GHCJS"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "javasf" = callPackage @@ -149149,8 +149853,8 @@ self: { base directory doctest filepath QuickCheck ]; description = "A utility to print the SourceFile attribute of one or more Java class files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -149167,8 +149871,8 @@ self: { base directory doctest filepath QuickCheck ]; description = "A utility to print the target version of Java class files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -149190,8 +149894,8 @@ self: { aeson-pretty base optparse-applicative text ]; description = "Just Build It - a \"do what I mean\" abstraction for Haskell build tools"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -149207,8 +149911,8 @@ self: { aeson base bytestring http-conduit text transformers ]; description = "JCDecaux self-service bicycles API client"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -149227,8 +149931,8 @@ self: { ]; executableHaskellDepends = [ base mtl network ]; description = "Implementation of Java Debug Interface"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -149250,8 +149954,8 @@ self: { ]; executableHaskellDepends = [ base optparse-applicative text ]; description = "Generate a cabal freeze file from a stack.yaml"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -149275,8 +149979,8 @@ self: { ]; testHaskellDepends = [ base containers tasty-hspec text ]; description = "Generate nix for Jenkins plugins"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -149306,8 +150010,8 @@ self: { transformers ]; description = "Extract all JavaScript from an HTML page and consolidate it in one script"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -149330,8 +150034,8 @@ self: { quantities regex-compat ]; description = "Unit conversion and manipulation library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -149347,7 +150051,7 @@ self: { executableHaskellDepends = [ base text ]; testHaskellDepends = [ base parsec tasty tasty-hunit text ]; description = "Handle Jira wiki markup"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "jmacro" = callPackage @@ -149373,8 +150077,8 @@ self: { unordered-containers vector wl-pprint-text ]; description = "QuasiQuotation library for programmatic generation of Javascript code"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -149393,8 +150097,8 @@ self: { vector ]; description = "JSON-RPC clients and servers using JMacro, and evented client-server Reactive Programming"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -149411,8 +150115,8 @@ self: { jmacro-rpc mtl ]; description = "Happstack backend for jmacro-rpc"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -149428,8 +150132,8 @@ self: { aeson base bytestring containers jmacro jmacro-rpc mtl snap-core ]; description = "Snap backend for jmacro-rpc"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -149450,8 +150154,8 @@ self: { ]; testHaskellDepends = [ base protolude tasty ]; description = "Common utilities for running a web service"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -149464,8 +150168,8 @@ self: { libraryHaskellDepends = [ base casing free jmacro ]; testHaskellDepends = [ base casing free jmacro ]; description = "Jmonkey is very restricted but handy EDSL for JavaScript"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -149486,8 +150190,8 @@ self: { libraryToolDepends = [ cpphs ]; testHaskellDepends = [ base hspec singletons ]; description = "Complete JNI raw bindings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) jdk;}; @@ -149513,8 +150217,8 @@ self: { QuickCheck stm ]; description = "A job queue library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -149535,8 +150239,8 @@ self: { time transformers warp ]; description = "A library for creating a jobs management website running custom jobs"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -149549,8 +150253,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base haskell98 multisetrewrite stm ]; description = "Parallel Join Patterns with Guards and Propagation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -149564,8 +150268,8 @@ self: { aeson base bytestring lens text url wreq ]; description = "Bindings for Join push notifications"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -149577,8 +150281,8 @@ self: { sha256 = "0hjlyyylbh471696v9b1jckm7d4gfp1ka978sr1j0005d03gwv35"; libraryHaskellDepends = [ base ]; description = "Join list - symmetric list type"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -149594,7 +150298,7 @@ self: { adjunctions base comonad distributive transformers ]; description = "Trying to compose non-composable"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "jonathanscard" = callPackage @@ -149609,8 +150313,8 @@ self: { base bytestring containers HTTP json mtl network old-locale time ]; description = "An implementation of the Jonathan's Card API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -149629,7 +150333,7 @@ self: { testHaskellDepends = [ base hspec HUnit markdown-unlit ]; testToolDepends = [ hspec-discover markdown-unlit ]; description = "Geographical Position Calculations"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "jort" = callPackage @@ -149643,7 +150347,7 @@ self: { executableHaskellDepends = [ array base gtk ]; description = "JP's own ray tracer"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "jose" = callPackage @@ -149673,31 +150377,31 @@ self: { vector x509 ]; description = "Javascript Object Signing and Encryption and JSON Web Token library"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "jose-jwt" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal - , containers, criterion, cryptonite, doctest, either, hspec, HUnit - , memory, mtl, QuickCheck, text, time, transformers - , transformers-compat, unordered-containers, vector + , containers, criterion, cryptonite, hspec, HUnit, memory, mtl + , QuickCheck, text, time, transformers, transformers-compat + , unordered-containers, vector }: mkDerivation { pname = "jose-jwt"; - version = "0.8.0"; - sha256 = "1hmnkmbhmw78k35g3h3b016p0b4rrax9s8izp5xfrsqqxkl9ic2g"; + version = "0.9.0"; + sha256 = "1dnkyzs7kk2lxz2kj3x6v8w1lypsr0rppyn78s7w5sr89y924752"; libraryHaskellDepends = [ aeson attoparsec base bytestring cereal containers cryptonite - either memory mtl text time transformers transformers-compat + memory mtl text time transformers transformers-compat unordered-containers vector ]; testHaskellDepends = [ - aeson base bytestring cryptonite doctest either hspec HUnit memory - mtl QuickCheck text unordered-containers vector + aeson base bytestring cryptonite hspec HUnit memory mtl QuickCheck + text unordered-containers vector ]; benchmarkHaskellDepends = [ base bytestring criterion cryptonite ]; description = "JSON Object Signing and Encryption Library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "jot" = callPackage @@ -149715,8 +150419,8 @@ self: { yaml ]; description = "Tiny markdown notebook"; - license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -149728,8 +150432,8 @@ self: { sha256 = "1hnfapr21zpfyiywa4zzmwa518jzg73dnmaakrbvvpcmr4fvh9qx"; libraryHaskellDepends = [ base mtl ]; description = "A library for decoding JPEG files written in pure Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -149741,7 +150445,7 @@ self: { sha256 = "0k31r994cw1w79v2zqkj64jhbfyym1j96vawvqc5pvw2mjk1f5in"; libraryHaskellDepends = [ base containers fingertree lens vector ]; description = "Jump point search for Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "js-chart" = callPackage @@ -149754,7 +150458,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Obtain minified chart.js code"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "js-dgtable" = callPackage @@ -149767,7 +150471,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Obtain minified jquery.dgtable code"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "js-flot" = callPackage @@ -149780,7 +150484,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base HTTP ]; description = "Obtain minified flot code"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "js-good-parts" = callPackage @@ -149791,8 +150495,8 @@ self: { sha256 = "0i3r3xl8hi2a3d6hrj77vbfi54bkq4pidrjcz13vz4az9dvz6k75"; libraryHaskellDepends = [ base wl-pprint ]; description = "Javascript: The Good Parts -- AST & Pretty Printer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -149807,7 +150511,7 @@ self: { testHaskellDepends = [ base HTTP ]; doCheck = false; description = "Obtain minified jQuery code"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "jsaddle" = callPackage @@ -149828,7 +150532,7 @@ self: { transformers unliftio-core unordered-containers vector ]; description = "Interface for JavaScript that works with GHCJS and GHC"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "jsaddle-clib" = callPackage @@ -149843,7 +150547,7 @@ self: { aeson base base-compat bytestring data-default jsaddle text ]; description = "Interface for JavaScript that works with GHCJS and GHC"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "jsaddle-dom" = callPackage @@ -149859,7 +150563,7 @@ self: { base base-compat exceptions jsaddle lens text transformers ]; description = "DOM library that uses jsaddle to support both GHCJS and GHC"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "jsaddle-hello" = callPackage @@ -149872,8 +150576,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base jsaddle lens text ]; description = "JSaddle Hello World, an example package"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -149900,7 +150604,7 @@ self: { websockets ]; description = "Interface for JavaScript that works with GHCJS and GHC"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "jsaddle-webkit2gtk" = callPackage @@ -149919,8 +150623,8 @@ self: { jsaddle text unix webkit2gtk3-javascriptcore ]; description = "Interface for JavaScript that works with GHCJS and GHC"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "jsaddle-webkitgtk" = callPackage @@ -149938,8 +150642,8 @@ self: { webkitgtk3-javascriptcore ]; description = "Interface for JavaScript that works with GHCJS and GHC"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "jsaddle-wkwebview" = callPackage @@ -149955,8 +150659,8 @@ self: { text ]; description = "Interface for JavaScript that works with GHCJS and GHC"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -149973,8 +150677,8 @@ self: { webkitgtk3-javascriptcore ]; description = "High level interface for webkit-javascriptcore"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "jsmw" = callPackage @@ -149985,8 +150689,8 @@ self: { sha256 = "1r36w2h5007qln56gnyyd7w6bcqiymn1jw287z0waf4fhpy02ygq"; libraryHaskellDepends = [ base DOM mtl WebBits ]; description = "Javascript Monadic Writer base package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -150004,7 +150708,7 @@ self: { array base bytestring containers mtl parsec pretty syb text ]; description = "Support for serialising Haskell to and from JSON"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "json-alt" = callPackage @@ -150015,8 +150719,8 @@ self: { sha256 = "1ivmbm5gw362vlss1w5s2z7byrzxdh8z1qdfsh0xmywkvwx56l5q"; libraryHaskellDepends = [ aeson base ]; description = "Union 'alternative' or Either that has untagged JSON encoding"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -150038,7 +150742,7 @@ self: { lens lens-aeson text unordered-containers url ]; description = "Utilities for generating JSON-API payloads"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "json-api-lib" = callPackage @@ -150062,7 +150766,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Utilities for generating JSON-API payloads"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "json-assertions" = callPackage @@ -150077,8 +150781,8 @@ self: { aeson base indexed indexed-free lens lens-aeson text ]; description = "Test that your (Aeson) JSON encoding matches your expectations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -150094,7 +150798,7 @@ self: { base scientific text unordered-containers vector ]; description = "Universal JSON AST datastructure"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "json-ast-json-encoder" = callPackage @@ -150111,8 +150815,8 @@ self: { json-encoder scientific text unordered-containers vector ]; description = "Encoders of JSON AST"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -150127,8 +150831,8 @@ self: { base json-ast QuickCheck quickcheck-instances ]; description = "Compatibility layer for \"json-ast\" and \"QuickCheck\""; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -150163,8 +150867,8 @@ self: { unordered-containers vector ]; description = "Automatic type declaration for JSON input data"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -150187,8 +150891,8 @@ self: { bytestringparser-temporary containers utf8-string ]; description = "JSON parser that uses byte strings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -150207,8 +150911,8 @@ self: { unordered-containers utf8-string vector ]; description = "Data structure agnostic JSON serialization"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -150224,7 +150928,7 @@ self: { testHaskellDepends = [ base-prelude bytestring text ]; benchmarkHaskellDepends = [ aeson criterion rebase ]; description = "Direct-to-bytes JSON Builder"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "json-directory" = callPackage @@ -150246,8 +150950,8 @@ self: { aeson base bytestring filepath mtl process text ]; description = "Load JSON from files in a directory structure"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -150265,8 +150969,8 @@ self: { contravariant-extras scientific semigroups text ]; description = "A direct-to-bytes single-pass JSON encoder with a declarative DSL"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -150284,8 +150988,8 @@ self: { enumerator json-types text transformers ]; description = "Pure-Haskell utilities for dealing with JSON with the enumerator package. (deprecated)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -150302,8 +151006,8 @@ self: { unordered-containers yaml ]; description = "Utility functions to extend Aeson"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -150320,7 +151024,7 @@ self: { ]; testHaskellDepends = [ base bytestring filepath hspec ]; description = "JSON Feed"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "json-fu" = callPackage @@ -150341,8 +151045,8 @@ self: { text time unordered-containers vector ]; description = "Generic JSON serialization / deserialization"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -150367,8 +151071,8 @@ self: { tasty-quickcheck tasty-smallcheck ]; description = "Incremental JSON parser with early termination and a declarative DSL"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -150381,8 +151085,8 @@ self: { libraryHaskellDepends = [ base json ]; testHaskellDepends = [ base hspec json QuickCheck ]; description = "Extends Text.JSON to handle literal JS objects."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -150396,7 +151100,7 @@ self: { editedCabalFile = "0bs7fa02jjq9r7bn3vlwn4xq93yllj62h3bb5g2lsihx1svk7lkn"; libraryHaskellDepends = [ attoparsec base base-prelude text ]; description = "JSON Pointer parsing and interpretation utilities"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "json-pointer-aeson" = callPackage @@ -150411,7 +151115,7 @@ self: { aeson base-prelude json-pointer unordered-containers vector ]; description = "Integration layer for \"json-pointer\" and \"aeson\""; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "json-pointer-hasql" = callPackage @@ -150427,8 +151131,8 @@ self: { aeson either hasql json-pointer rebase transformers ]; description = "JSON Pointer extensions for Hasql"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -150453,7 +151157,7 @@ self: { ]; testToolDepends = [ tasty-discover ]; description = "JSON Pointer (RFC 6901) parsing, access, and modification"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "json-python" = callPackage @@ -150469,8 +151173,8 @@ self: { ]; libraryPkgconfigDepends = [ python ]; description = "Call python inline from haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) python;}; @@ -150488,7 +151192,7 @@ self: { ]; description = "Json Quasiquatation library for Haskell"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "json-rpc" = callPackage @@ -150519,7 +151223,7 @@ self: { vector ]; description = "Fully-featured JSON-RPC 2.0 library"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "json-rpc-client" = callPackage @@ -150546,8 +151250,8 @@ self: { test-framework-quickcheck2 text unordered-containers vector ]; description = "JSON-RPC 2.0 on the client side."; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -150568,7 +151272,7 @@ self: { aeson base QuickCheck quickcheck-simple text ]; description = "Generic encoder and decode for JSON-RPC"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "json-rpc-server" = callPackage @@ -150592,7 +151296,7 @@ self: { text unordered-containers vector ]; description = "JSON-RPC 2.0 on the server side."; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "json-schema" = callPackage @@ -150617,8 +151321,8 @@ self: { generic-aeson tasty tasty-hunit tasty-th text vector ]; description = "Types and type classes for defining JSON schemas"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -150628,15 +151332,15 @@ self: { }: mkDerivation { pname = "json-sop"; - version = "0.2.0.4"; - sha256 = "0q1p15whyyzpggfnqm4vy9p8l12xlxmnc4d82ykxl8rxzhbjkh0i"; + version = "0.2.0.5"; + sha256 = "1sdc2ywdra75nqlc5829f0clfi91fdqyrcmik1nrxrdnxr4yzhvh"; libraryHaskellDepends = [ aeson base generics-sop lens-sop tagged text time transformers unordered-containers vector ]; description = "Generics JSON (de)serialization using generics-sop"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -150652,7 +151356,7 @@ self: { aeson aeson-pretty base bytestring libgit time-units ]; description = "Keep program state in JSON files"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "json-stream" = callPackage @@ -150672,7 +151376,7 @@ self: { scientific text unordered-containers vector ]; description = "Incremental applicative JSON parser"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "json-syntax" = callPackage @@ -150700,8 +151404,8 @@ self: { primitive scientific-notation text ]; description = "High-performance JSON parser and encoder"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -150733,7 +151437,7 @@ self: { microlens-platform mtl nonempty-containers raw-strings-qq recursion-schemes text unordered-containers vector ]; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "json-togo" = callPackage @@ -150750,8 +151454,8 @@ self: { transformers unordered-containers vector ]; description = "Effectful parsing of JSON documents"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -150779,8 +151483,8 @@ self: { scientific-notation text ]; description = "Tokenize JSON"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -150800,8 +151504,8 @@ self: { scientific string-conversions tar text unordered-containers vector ]; description = "A collection of JSON tools"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -150825,8 +151529,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "A polymorphic, type-safe, json-structured tracing library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -150838,7 +151542,7 @@ self: { sha256 = "088if9qv0didjyb6y1583viihjgc4nwr61qfjqdg9rzc2ya6vqdn"; libraryHaskellDepends = [ base containers text ]; description = "Basic types for representing JSON"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "json2" = callPackage @@ -150854,8 +151558,8 @@ self: { parsec pretty time utf8-string ]; description = "Library provides support for JSON"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -150871,8 +151575,8 @@ self: { base containers HDBC json2 json2-types time utf8-string ]; description = "Support JSON for SQL Database"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -150884,7 +151588,7 @@ self: { sha256 = "0gr5mfi68hvk8wajw6wbimmwxd0rgjwqrg3mjyfppkr1nwkyfzpr"; libraryHaskellDepends = [ base containers ]; description = "Defined JSON data types and function for renders JSON to string"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "json2yaml" = callPackage @@ -150897,7 +151601,7 @@ self: { isExecutable = true; executableHaskellDepends = [ aeson base bytestring yaml ]; description = "Utility to convert a file from JSON to YAML format. (deprecated)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "json5hs" = callPackage @@ -150912,7 +151616,7 @@ self: { array base bytestring containers mtl pretty syb text ]; description = "Serialising to and from JSON5"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "jsonextfilter" = callPackage @@ -150932,8 +151636,8 @@ self: { unordered-containers vector ]; description = "Filter select values in JSON objects to unix programs"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -150944,8 +151648,8 @@ self: { }: mkDerivation { pname = "jsonifier"; - version = "0.1.0.5"; - sha256 = "0qx296dnhb7gdf1zybs20pa0fgi2zz6wbb4x9kcr31p7z51hd07v"; + version = "0.1.0.6"; + sha256 = "0yhczdq3m79xbg04hcahl2c75kipm5szahr7bmj8xjml4zxzd3bk"; libraryHaskellDepends = [ base bytestring ptr-poker scientific text ]; @@ -150954,8 +151658,8 @@ self: { aeson buffer-builder gauge rerebase text-builder ]; description = "Fast and simple JSON encoding toolkit"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -150977,7 +151681,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Library to parse and execute JSONPath"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "jsonresume" = callPackage @@ -150992,8 +151696,8 @@ self: { aeson base bytestring old-locale text time unordered-containers ]; description = "Parser and datatypes for the JSON Resume format"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -151014,8 +151718,8 @@ self: { aeson base bytestring conduit conduit-extra hspec text ]; description = "JSON-RPC 2.0 server over a Conduit."; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -151047,8 +151751,8 @@ self: { scientific text uniplate unordered-containers vector ]; description = "JSON to JSON Schema"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -151070,8 +151774,8 @@ self: { aeson base bytestring containers process tagged text ]; description = "JSON Schema generator from Algebraic data type"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -151092,8 +151796,8 @@ self: { vector ]; description = "Interpolate JSON object values into SQL strings"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -151114,8 +151818,8 @@ self: { vector ]; description = "JSON to TSV transformer"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -151136,8 +151840,8 @@ self: { unordered-containers vector xlsx ]; description = "json to xlsx converter"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -151162,7 +151866,7 @@ self: { ]; testToolDepends = [ tasty-discover ]; description = "Cherry picking in JSON objects"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "jspath" = callPackage @@ -151177,8 +151881,8 @@ self: { base bytestring bytestring-trie JSONb utf8-string ]; description = "Extract substructures from JSON by following a path"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -151203,8 +151907,8 @@ self: { wai-middleware-static warp ]; description = "Manage users in MariaDB >= 10.1.1"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -151231,8 +151935,8 @@ self: { optparse-applicative text unordered-containers yaml ]; description = "Tableau-based theorem prover for justification logic"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -151248,8 +151952,8 @@ self: { librarySystemDepends = [ Judy ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "Fast, scalable, mutable dynamic arrays, maps and hashes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {Judy = null;}; @@ -151266,7 +151970,7 @@ self: { ]; executableHaskellDepends = [ base JuicyPixels ]; description = "Draw and fill lines, rectangles and polygons"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "juicy-gcode" = callPackage @@ -151284,7 +151988,7 @@ self: { svg-tree text ]; description = "SVG to G-Code converter"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "jukebox" = callPackage @@ -151305,7 +152009,7 @@ self: { libraryToolDepends = [ alex ]; executableHaskellDepends = [ base ]; description = "A first-order reasoning toolbox"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "jump" = callPackage @@ -151317,7 +152021,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base criterion hspec ]; description = "Nothing to see here, move along"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "jumpthefive" = callPackage @@ -151331,7 +152035,7 @@ self: { libraryHaskellDepends = [ base parallel ]; executableHaskellDepends = [ base parallel ]; description = "an elementary symmetric chiffre for pragmatically protecting one's effects"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "junit-xml" = callPackage @@ -151344,7 +152048,7 @@ self: { libraryHaskellDepends = [ base text xml-conduit ]; testHaskellDepends = [ base tasty tasty-golden ]; description = "Producing JUnit-style XML test reports"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "jupyter" = callPackage @@ -151371,8 +152075,8 @@ self: { unordered-containers zeromq4-haskell ]; description = "A library for creating and using Jupyter kernels"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -151389,7 +152093,7 @@ self: { base containers ghc-prim hspec QuickCheck should-not-typecheck ]; description = "Keyed container types with type-checked proofs of key presence"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }) {}; "jvm" = callPackage @@ -151412,8 +152116,8 @@ self: { base criterion deepseq jni singletons text ]; description = "Call JVM methods from Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -151438,8 +152142,8 @@ self: { base criterion deepseq jvm split vector ]; description = "Provides batched marshalling of values between Java and Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -151472,8 +152176,8 @@ self: { text vector ]; description = "A library for reading Java class-files"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -151490,8 +152194,8 @@ self: { fingertree pretty zlib ]; description = "A parser for JVM bytecode files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -151516,8 +152220,8 @@ self: { base criterion deepseq jvm streaming text vector ]; description = "Expose Java iterators as streams from the streaming package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -151546,7 +152250,7 @@ self: { unordered-containers vector x509 x509-store ]; description = "JSON Web Token (JWT) decoding and encoding"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "kademlia" = callPackage @@ -151567,8 +152271,8 @@ self: { tasty-hunit tasty-quickcheck transformers transformers-compat ]; description = "An implementation of the Kademlia DHT Protocol"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -151580,7 +152284,7 @@ self: { sha256 = "07x6dsc4d4f3vksi21fxd1vix9wqsydrl17f2xq8858m2ay0j28j"; doHaddock = false; description = "TBA"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "kafka-client" = callPackage @@ -151599,8 +152303,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Low-level Haskell client library for Apache Kafka 0.7."; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -151615,8 +152319,8 @@ self: { libraryHaskellDepends = [ base containers hw-kafka-client ]; testHaskellDepends = [ base hw-kafka-client monad-parallel text ]; description = "Synchronous Kafka Client"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -151637,8 +152341,8 @@ self: { aeson base binary bytestring cereal linear milena mtl ]; description = "UI device events via a Kafka message broker"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -151653,8 +152357,8 @@ self: { libraryHaskellDepends = [ base GLUT kafka-device OpenGL ]; executableHaskellDepends = [ base GLUT kafka-device OpenGL ]; description = "GLUT events via a Kafka message broker"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -151675,8 +152379,8 @@ self: { aeson base binary bytestring cereal kafka-device yaml ]; description = "Linux joystick events via a Kafka message broker"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -151695,8 +152399,8 @@ self: { aeson base hleap kafka-device websockets ]; description = "Leap Motion events via a Kafka message broker"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -151717,8 +152421,8 @@ self: { aeson base binary bytestring cereal kafka-device yaml ]; description = "Linux SpaceNavigator events via a Kafka message broker"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -151733,8 +152437,8 @@ self: { libraryHaskellDepends = [ base kafka-device vrpn ]; executableHaskellDepends = [ base kafka-device vrpn ]; description = "VRPN events via a Kafka message broker"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -151757,8 +152461,8 @@ self: { ]; doHaddock = false; description = "Haskell Kaleidoscope tutorial"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -151778,8 +152482,8 @@ self: { random-fu-multivariate ]; description = "Kalman and particle filters and smoothers"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -151798,7 +152502,7 @@ self: { transformers transformers-compat ]; description = "Kan extensions, Kan lifts, the Yoneda lemma, and (co)density (co)monads"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "kangaroo" = callPackage @@ -151809,8 +152513,8 @@ self: { sha256 = "1l7b71dhrxd2g3nbqg3h0n5dvgxr23av1cy1f0mvw347y91rx36x"; libraryHaskellDepends = [ array base ]; description = "Binary parsing with random access"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -151837,7 +152541,7 @@ self: { ]; benchmarkHaskellDepends = [ aeson base containers criterion text ]; description = "Perform 漢字検定 (Japan Kanji Aptitude Test) level analysis on Japanese Kanji"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "kansas-comet" = callPackage @@ -151856,7 +152560,7 @@ self: { transformers unordered-containers ]; description = "A JavaScript push mechanism based on the comet idiom"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "kansas-lava" = callPackage @@ -151878,8 +152582,8 @@ self: { sized-types strict template-haskell ]; description = "Kansas Lava is a hardware simulator and VHDL generator"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -151899,8 +152603,8 @@ self: { kansas-lava network sized-types ]; description = "FPGA Cores Written in Kansas Lava"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -151919,8 +152623,8 @@ self: { kansas-lava kansas-lava-cores netlist network sized-types ]; description = "Kansas Lava support files for the Papilio FPGA board"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -151937,8 +152641,8 @@ self: { base containers kansas-lava mustache shake text vector ]; description = "Shake rules for building Kansas Lava projects"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -151954,8 +152658,8 @@ self: { base comonad containers minioperational mtl transformers ]; description = "Good stateful automata"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -151983,8 +152687,8 @@ self: { raw-strings-qq text vector ]; description = "Haskell bindings for Spark Dataframes and Datasets"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -152003,7 +152707,7 @@ self: { aeson attoparsec base hspec text unordered-containers vector ]; description = "A simple template engine, inspired by jinja2"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "katip" = callPackage @@ -152038,7 +152742,7 @@ self: { safe-exceptions text time transformers unix ]; description = "A structured logging framework"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "katip-datadog" = callPackage @@ -152060,7 +152764,7 @@ self: { safe-exceptions tasty tasty-hunit text unordered-containers ]; description = "Datadog scribe for the Katip logging framework"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "katip-elasticsearch" = callPackage @@ -152091,8 +152795,8 @@ self: { unordered-containers uuid ]; description = "ElasticSearch scribe for the Katip logging framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -152106,8 +152810,8 @@ self: { aeson base bytestring hw-kafka-client katip ]; description = "Katip scribe to send logs to Kafka"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -152124,7 +152828,7 @@ self: { unliftio ]; description = "Logstash backend for katip"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "katip-logzio" = callPackage @@ -152150,7 +152854,7 @@ self: { uri-bytestring vector warp ]; description = "Logz.IO scribe for the Katip logging framework"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "katip-raven" = callPackage @@ -152166,8 +152870,8 @@ self: { unordered-containers ]; description = "Katip scribe for raven (https://sentry.io)"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -152184,8 +152888,8 @@ self: { text time ]; description = "Katip scribe that logs to Rollbar"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -152204,8 +152908,8 @@ self: { aeson base katip scientific text unordered-containers ]; description = "A katip scribe for logging to json"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -152222,8 +152926,8 @@ self: { ]; testHaskellDepends = [ base ]; description = "Syslog Katip Scribe"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -152245,8 +152949,8 @@ self: { executableHaskellDepends = [ base bytestring mtl ]; testHaskellDepends = [ base bytestring directory mtl ]; description = "Client for the Kattis judge system"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -152280,8 +152984,8 @@ self: { filepath hxt ilist json mtl parsec regex-tdfa text transformers ]; description = "A haskell implementation of Katydid"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -152303,7 +153007,7 @@ self: { ]; testHaskellDepends = [ base hedgehog text unordered-containers ]; description = "Key-value store in single files"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "kawaii" = callPackage @@ -152328,8 +153032,8 @@ self: { warp warp-tls ]; description = "Utilities for serving static sites and blogs with Wai/Warp"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -152352,8 +153056,8 @@ self: { tasty-smallcheck text ]; description = "stats.NBA.com library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -152376,7 +153080,7 @@ self: { atomic-primops base criterion primitive stm ]; description = "Fast concurrent queues much inspired by unagi-chan"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "kbq-gu" = callPackage @@ -152408,8 +153112,8 @@ self: { ]; testHaskellDepends = [ base kcd-parser tasty tasty-hunit ]; description = "Kayak .kcd parsing library."; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {kcd-parser = null;}; @@ -152423,8 +153127,8 @@ self: { base lens linear vector vector-algorithms ]; description = "A simple k-d tree implementation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -152443,8 +153147,8 @@ self: { process ]; description = "Build profiles for kdesrc-build"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -152463,7 +153167,7 @@ self: { process ]; description = "Build profiles for kdesrc-build"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "kdt" = callPackage @@ -152481,7 +153185,7 @@ self: { MonadRandom QuickCheck ]; description = "Fast and flexible k-d trees for various types of point queries"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "keccak" = callPackage @@ -152507,8 +153211,8 @@ self: { base bytestring cryptonite gauge memory ]; description = "cryptographic functions based on the sponge construction"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -152536,7 +153240,7 @@ self: { ]; testHaskellDepends = [ base ]; description = "Initial project template from stack"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "keep-alive" = callPackage @@ -152548,7 +153252,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "TCP keep alive implementation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "keera-callbacks" = callPackage @@ -152559,7 +153263,7 @@ self: { sha256 = "1xgxg30za69nfk8y83bmskjq2w3r3afg4gc507wkn91xdah93niq"; libraryHaskellDepends = [ base mtl ]; description = "Mutable memory locations with callbacks"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "keera-hails-i18n" = callPackage @@ -152575,8 +153279,8 @@ self: { utf8-string ]; description = "Rapid Gtk Application Development - I18N"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -152588,7 +153292,7 @@ self: { sha256 = "1j7vhkghdh4hrap7g2xshpd2fw3acgwvi68f2c01mqmfi5dl4z2n"; libraryHaskellDepends = [ base ]; description = "Haskell on Gtk rails - Gtk-based controller for MVC applications"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "keera-hails-mvc-environment-gtk" = callPackage @@ -152604,8 +153308,8 @@ self: { keera-hails-mvc-view-gtk ]; description = "Haskell on Gtk rails - Gtk-based global environment for MVC applications"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -152622,8 +153326,8 @@ self: { template-haskell ]; description = "Rapid Gtk Application Development - Reactive Protected Light Models"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -152640,8 +153344,8 @@ self: { template-haskell ]; description = "Rapid Gtk Application Development - Protected Reactive Models"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -152653,7 +153357,7 @@ self: { sha256 = "16c6nh5fqw2r42nxs3x27rqbpscypjzgqnprl99241giwcvy98x1"; libraryHaskellDepends = [ base directory filepath MissingK ]; description = "Haskell on Gtk rails - Easy handling of configuration files"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "keera-hails-mvc-solutions-gtk" = callPackage @@ -152674,8 +153378,8 @@ self: { network network-uri template-haskell ]; description = "Haskell on Gtk rails - Common solutions to recurrent problems in Gtk applications"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -152687,7 +153391,7 @@ self: { sha256 = "0jkwbpw23ba5z83nfk51hp8wsfkrbbiwr0f6bvx39wzz1v81n58p"; libraryHaskellDepends = [ base ]; description = "Haskell on Gtk rails - Generic View for MVC applications"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "keera-hails-mvc-view-gtk" = callPackage @@ -152700,7 +153404,7 @@ self: { base gtk gtk-helpers keera-hails-mvc-view ]; description = "Haskell on Gtk rails - Gtk-based View for MVC applications"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "keera-hails-reactive-cbmvar" = callPackage @@ -152718,8 +153422,8 @@ self: { base directory filepath hlint process regex-posix ]; description = "Reactive Haskell on Rails - CBMVars as reactive values"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -152735,8 +153439,8 @@ self: { base directory fsnotify keera-hails-reactivevalues system-filepath ]; description = "Haskell on Rails - Files as Reactive Values"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -152753,8 +153457,8 @@ self: { keera-hails-reactivevalues mtl transformers ]; description = "Haskell on Gtk rails - Reactive Fields for Gtk widgets"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -152772,8 +153476,8 @@ self: { keera-hails-reactivevalues mtl transformers ]; description = "Keera Hails Reactive bindings for HTML DOM via GHCJS"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -152789,8 +153493,8 @@ self: { base bytestring keera-hails-reactivevalues network network-bsd ]; description = "Haskell on Rails - Sockets as Reactive Values"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -152805,8 +153509,8 @@ self: { base keera-callbacks keera-hails-reactivevalues ]; description = "Haskell on Rails - Polling based Readable RVs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -152820,8 +153524,8 @@ self: { base keera-hails-reactivevalues wx wxcore ]; description = "Haskell on Rails - Reactive Fields for WX widgets"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -152837,8 +153541,8 @@ self: { base keera-callbacks keera-hails-reactivevalues time Yampa ]; description = "Haskell on Rails - FRP Yampa Signal Functions as RVs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -152850,8 +153554,8 @@ self: { sha256 = "1c72sc68wqvsxhjr7y16k7iw784swk8wfp2j7xw0y0ggdjlamn0x"; libraryHaskellDepends = [ base keera-hails-reactivevalues lens ]; description = "Reactive Haskell on Rails - Lenses applied to Reactive Values"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -152871,8 +153575,8 @@ self: { ]; testToolDepends = [ cabal-install ]; description = "Haskell on Rails - Reactive Values"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -152908,7 +153612,7 @@ self: { executableSystemDepends = [ SDL_mixer ]; description = "Get notifications when your sitting posture is inappropriate"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) SDL_mixer;}; "keiretsu" = callPackage @@ -152930,7 +153634,7 @@ self: { ]; description = "Multi-process orchestration for development and integration testing"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "kempe" = callPackage @@ -152941,8 +153645,8 @@ self: { }: mkDerivation { pname = "kempe"; - version = "0.1.1.1"; - sha256 = "0mianbsn02vzbb0fr6pgxsij0jrpnhmbah9n2fcl3fj9xzcb6ac7"; + version = "0.1.1.2"; + sha256 = "1nmmka06zin3i4y30510c56yk3vjxvnndfb38w4v557xr94rirkd"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -152964,8 +153668,8 @@ self: { ]; doHaddock = false; description = "Kempe compiler"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -152988,8 +153692,8 @@ self: { mtl process resourcet temporary-resourcet text transformers ]; description = "Manage and abstract your packer configurations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -153011,7 +153715,7 @@ self: { QuickCheck temporary ]; description = "Haskell implementation of nix-hash"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "keter" = callPackage @@ -153044,8 +153748,8 @@ self: { base bytestring conduit hspec HUnit transformers unix ]; description = "Web application deployment manager, focusing on Haskell web frameworks"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -153067,7 +153771,7 @@ self: { ]; description = "a dAmn ↔ IRC proxy"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -153079,7 +153783,7 @@ self: { sha256 = "18wgalv0hr5ndr7mbywr7ilyc504kzf28xyymmkj1fm66wb93n4k"; libraryHaskellDepends = [ base transformers ]; description = "Type-safe unconstrained dynamic typing"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "key-state" = callPackage @@ -153091,7 +153795,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "Manage key and button states and statuses"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "key-vault" = callPackage @@ -153105,7 +153809,7 @@ self: { base base-unicode-symbols containers key util ]; description = "Store of values of arbitrary types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "keycloak-hs" = callPackage @@ -153128,7 +153832,7 @@ self: { unordered-containers word8 wreq ]; executableHaskellDepends = [ base hslogger ]; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "keycode" = callPackage @@ -153143,7 +153847,7 @@ self: { base containers ghc-prim template-haskell ]; description = "Maps web browser keycodes to their corresponding keyboard keys"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "keyed" = callPackage @@ -153154,8 +153858,8 @@ self: { sha256 = "0q53nv4babmvj1nzc2my3d88aqm8yxl10rd396y62z7412jvnp5q"; libraryHaskellDepends = [ base containers vector ]; description = "Generic indexing for many data structures"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -153167,7 +153871,7 @@ self: { sha256 = "0hf7lmx8bgl5lh1i71x56nfbgnp8xrqfza3s5acq9i16g21ri292"; libraryHaskellDepends = [ base bytestring containers text xeno ]; description = "Tools for macOS .keylayout files"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "keyring" = callPackage @@ -153180,8 +153884,8 @@ self: { isExecutable = true; libraryHaskellDepends = [ base udbus ]; description = "Keyring access"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -153200,7 +153904,7 @@ self: { unordered-containers ]; description = "Keyed functors and containers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "keysafe" = callPackage @@ -153229,8 +153933,8 @@ self: { unix unix-compat utf8-string wai warp zxcvbn-c ]; description = "back up a secret key securely to the cloud"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.agpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -153262,8 +153966,8 @@ self: { unordered-containers ]; description = "Managing stores of secret things"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -153280,8 +153984,8 @@ self: { mmap storable-record ]; description = "Pure Haskell key/value store implementation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -153303,8 +154007,8 @@ self: { base containers hspec parsec parseerror-eq ]; description = "Extract data from a keyword-args config file format"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -153324,8 +154028,8 @@ self: { parsec text transformers unix unordered-containers yaml ]; description = "Command-line file tagging and organization tool"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.agpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -153338,8 +154042,8 @@ self: { libraryHaskellDepends = [ base containers stm ]; testHaskellDepends = [ base stm ]; description = "A lightweight, structured-concurrency library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -153351,7 +154055,7 @@ self: { sha256 = "0yfyx4jyz0n3p2w6pca3nxc72s01240n3siy5sx883ldz706adls"; doHaddock = false; description = "None"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "kicad-data" = callPackage @@ -153372,8 +154076,8 @@ self: { test-framework-quickcheck2 ]; description = "Parser and writer for KiCad files"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -153391,8 +154095,8 @@ self: { vector ]; description = "Parses kat.ph torrent dumps"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -153411,8 +154115,8 @@ self: { test-framework-hunit test-framework-quickcheck2 vector ]; description = "Kick Channels: bounded channels with non-blocking writes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -153431,8 +154135,8 @@ self: { base bytestring cmdargs hostname old-time parsec twine ]; description = "Process KIF iOS test logs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -153444,7 +154148,7 @@ self: { sha256 = "0wq0jfi8jdah6mwc6amrfjs5ld0bz86y53va9sm0hzvpiyb4bpcq"; libraryHaskellDepends = [ base ]; description = "Utilities to work with lists of types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "kind-generics" = callPackage @@ -153455,7 +154159,7 @@ self: { sha256 = "1ldfi5rvs3mxlbpy0nfyx8mq58xjkk76c13fmvmgqcpgb8gvmrnx"; libraryHaskellDepends = [ base kind-apply ]; description = "Generic programming in GHC style for arbitrary kinds and GADTs"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "kind-generics-th" = callPackage @@ -153471,7 +154175,7 @@ self: { ]; testHaskellDepends = [ base kind-generics template-haskell ]; description = "Template Haskell support for generating `GenericK` instances"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "kinds" = callPackage @@ -153482,7 +154186,7 @@ self: { sha256 = "169f2b0nn7mkjws6c5sb3mih2p6snhfq42bkfds3zxz01y53v2g5"; libraryHaskellDepends = [ base ]; description = "Emulation of subkinds and subkind polymorphism"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "kit" = callPackage @@ -153502,8 +154206,8 @@ self: { unordered-containers yaml ]; description = "A dependency manager for Xcode (Objective-C) projects"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -153525,8 +154229,8 @@ self: { step-function text transformers ]; description = "Kleene algebra"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -153544,7 +154248,7 @@ self: { base base-compat deepseq doctest QuickCheck template-haskell ]; description = "A list type based on the Kleene star and plus"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "kmeans" = callPackage @@ -153555,7 +154259,7 @@ self: { sha256 = "02rc3bd2cp1fp0fxbzqiy34s5gn38j8hgviilz1584z05jhj97ix"; libraryHaskellDepends = [ base ]; description = "K-means clustering algorithm"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "kmeans-par" = callPackage @@ -153576,8 +154280,8 @@ self: { base criterion deepseq metric normaldistribution random vector ]; description = "Sequential and parallel implementations of Lloyd's algorithm"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -153594,8 +154298,8 @@ self: { executableHaskellDepends = [ base probable vector ]; benchmarkHaskellDepends = [ base criterion QuickCheck vector ]; description = "An implementation of the kmeans clustering algorithm based on the vector package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -153615,8 +154319,8 @@ self: { ]; executableHaskellDepends = [ base ]; description = "Advanced keyboard remapping utility"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -153629,8 +154333,8 @@ self: { libraryHaskellDepends = [ array base QuickCheck ]; testHaskellDepends = [ array base QuickCheck ]; description = "KMP algorithm implementation, based on Deterministic Finite State Automata"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -153652,8 +154356,8 @@ self: { base comfort-array llvm-extra llvm-tf QuickCheck tfp utility-ht ]; description = "Repa-like array processing using LLVM JIT"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -153667,8 +154371,8 @@ self: { base knead llvm-extra llvm-tf utility-ht ]; description = "Linear algebra and interpolation using LLVM JIT"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -153686,7 +154390,7 @@ self: { testHaskellDepends = [ base ]; doHaddock = false; description = "Ties the knot on data structures that reference each other by unique keys"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "knit-haskell" = callPackage @@ -153720,8 +154424,8 @@ self: { random-source store streamly text ]; description = "a minimal Rmarkdown sort-of-thing for haskell, by way of Pandoc"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -153733,7 +154437,7 @@ self: { sha256 = "05qj7s04p5pbasivyxc06l0jbii250zjnvb3l1y2sfhglb7q8b4c"; libraryHaskellDepends = [ base bytestring transformers ]; description = "Memory-backed handles"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "knots" = callPackage @@ -153751,8 +154455,8 @@ self: { ]; executableHaskellDepends = [ base containers parallel ]; description = "Khovanov homology computations"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -153766,8 +154470,8 @@ self: { testHaskellDepends = [ base HUnit ]; doHaddock = false; description = "\"map German words to code representing pronunciation\""; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -153784,8 +154488,8 @@ self: { unjson utf8-string yaml ]; description = "JSON config file parsing based on unjson"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -153803,7 +154507,7 @@ self: { monad-control mtl time transformers transformers-base ]; description = "Utilities for working with many HStringTemplate templates from files"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "koofr-client" = callPackage @@ -153821,7 +154525,7 @@ self: { http-types mtl ]; description = "Client to Koofr API"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "korea-holidays" = callPackage @@ -153840,7 +154544,7 @@ self: { aeson base hspec monad-extras split template-haskell time yaml ]; description = "Korea Holidays"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "korfu" = callPackage @@ -153856,7 +154560,7 @@ self: { ]; description = "The Korfu ORF Utility"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -153872,8 +154576,8 @@ self: { libraryHaskellDepends = [ base directory filepath mtl time unix ]; libraryToolDepends = [ c2hs ]; description = "A binding to the kqueue event library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -153891,8 +154595,8 @@ self: { aeson base bytestring http-client http-client-tls mtl ]; description = "Kraken.io API client"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -153923,8 +154627,8 @@ self: { PyF req safe-exceptions text unordered-containers ]; description = "Krank checks your code source comments for important markers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -153950,8 +154654,8 @@ self: { raw-strings-qq text vector ]; description = "Haskell bindings for Spark Dataframes and Datasets"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -153977,8 +154681,8 @@ self: { base bytestring criterion monad-logger mtl ]; description = "KRPC protocol implementation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -153990,8 +154694,8 @@ self: { sha256 = "1xj9bnwiws3rnax3rlf67p8dh487w07xl99h81a9j1wjkqysldym"; libraryHaskellDepends = [ base gamma random-fu roots vector ]; description = "Kolmogorov distribution and Kolmogorov-Smirnov test"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -154003,7 +154707,7 @@ self: { sha256 = "0lvdb3z73nm5csnrvjd3dvzxm411ns8wz07wcpaxqk26szc5igv1"; libraryHaskellDepends = [ base directory ]; description = "System management tooling"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "ktx" = callPackage @@ -154015,8 +154719,8 @@ self: { libraryHaskellDepends = [ base bytestring OpenGL ]; libraryPkgconfigDepends = [ egl glew ]; description = "A binding for libktx from Khronos"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {egl = null; inherit (pkgs) glew;}; @@ -154026,8 +154730,8 @@ self: { }: mkDerivation { pname = "ktx-codec"; - version = "0.0.1.1"; - sha256 = "1qvkcmxilvlwsbp5pidkh3njwsj6k19ybz8jw5mcm90zdhx3gya0"; + version = "0.0.1.2"; + sha256 = "14vv1c7n8ms2y18ks08i5hr09av9y2gn677rki4swfdhgy3zamcp"; libraryHaskellDepends = [ base binary bytestring containers text vector ]; @@ -154036,8 +154740,8 @@ self: { vector ]; description = "Khronos texture format"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -154073,8 +154777,8 @@ self: { x509-validation yaml ]; description = "Client library for Kubernetes"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -154102,8 +154806,8 @@ self: { semigroups text time transformers unordered-containers vector ]; description = "Auto-generated kubernetes-client-core API Client"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -154120,7 +154824,7 @@ self: { unordered-containers ]; description = "Create Kubernetes Admission Webhooks in Haskell"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "kuifje" = callPackage @@ -154131,8 +154835,8 @@ self: { sha256 = "0f7ldw506g4r6f7s803iwq49syfl1zmxdyyr62arbzg6h5qg81j7"; libraryHaskellDepends = [ base boxes containers lens ]; description = "A Quantitative Information Flow aware programming language"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -154146,8 +154850,8 @@ self: { editedCabalFile = "07x04clvlzl2wr20pmis52jfyw4fanyaq00zx76r2zn7zdcvysy3"; libraryHaskellDepends = [ base dlist transformers ]; description = "Combinators for Strategic Programming"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -154159,8 +154863,8 @@ self: { sha256 = "0bfcmx1fz521vkc2lrbpyvaqcy4c29h5xp6wmyxvgrjjnq32ld1b"; libraryHaskellDepends = [ base kure template-haskell ]; description = "Generator for Boilerplate KURE Combinators"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -154193,8 +154897,8 @@ self: { ]; testHaskellDepends = [ base ]; description = "Find the alpha emoji"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -154207,7 +154911,7 @@ self: { libraryHaskellDepends = [ base bytestring cereal ]; librarySystemDepends = [ kyotocabinet ]; description = "Mid level bindings to Kyoto Cabinet"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) kyotocabinet;}; "l-bfgs-b" = callPackage @@ -154219,8 +154923,8 @@ self: { libraryHaskellDepends = [ base vector ]; librarySystemDepends = [ lbfgsb ]; description = "Bindings to L-BFGS-B, Fortran code for limited-memory quasi-Newton bound-constrained optimization"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {lbfgsb = null;}; @@ -154232,7 +154936,7 @@ self: { sha256 = "182w8l9h2zw8lxr1fahnmcasbd09z2z00ii7gkmq2y95dm3k4w0a"; libraryHaskellDepends = [ base text time ]; description = "Enables providing localization as typeclass instances in separate files"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "labeled-graph" = callPackage @@ -154243,8 +154947,8 @@ self: { sha256 = "060nvnlh1h8vxi6k2hsz79fn4xypangdj5v4q0kc6abyf9garf7r"; libraryHaskellDepends = [ base labeled-tree ]; description = "Labeled graph structure"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -154256,7 +154960,7 @@ self: { sha256 = "1cnnyic5z5y21hpxpmx66ph34mjyysckgiasmzg7yx202y2ih7s7"; libraryHaskellDepends = [ base ]; description = "Labeled tree structure"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "labels" = callPackage @@ -154267,7 +154971,7 @@ self: { sha256 = "04rh8c9ncd9radarz4fjka9hc3i6crvibpyj3y8qpij0acmw1d76"; libraryHaskellDepends = [ base template-haskell ]; description = "Anonymous records via named tuples"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "laborantin-hs" = callPackage @@ -154290,8 +154994,8 @@ self: { random split text transformers uuid ]; description = "an experiment management framework"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -154315,8 +155019,8 @@ self: { attoparsec base bytestring preamble tasty tasty-hunit ]; description = "LabSat TCP Interface Wrapper"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -154338,8 +155042,8 @@ self: { parsec QuickCheck random safecopy template-haskell transformers ]; description = "A complicated turn-based game"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -154373,8 +155077,8 @@ self: { yesod-static ]; description = "A complicated turn-based game - Web server"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -154387,8 +155091,8 @@ self: { libraryHaskellDepends = [ base servant servant-foreign text ]; testHaskellDepends = [ base hspec servant servant-foreign text ]; description = "Generate Ruby clients from Servant APIs"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -154400,7 +155104,7 @@ self: { sha256 = "0d65dqvbfrrvgdnagjyiq8xf7635rd46wda722g85dxzxr1l7mbn"; libraryHaskellDepends = [ base ]; description = "fizzy n dizzy"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "lagrangian" = callPackage @@ -154420,8 +155124,8 @@ self: { test-framework-hunit test-framework-quickcheck2 vector ]; description = "Solve Lagrange multiplier problems"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -154441,8 +155145,8 @@ self: { template-haskell text transformers ]; description = "Minimalistic type-checked compile-time template engine"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -154454,7 +155158,7 @@ self: { sha256 = "07i0fw7hvkzky9rwrnh4b3i35crbv4mkj0w001dwkgsh1flzh95f"; libraryHaskellDepends = [ base ]; description = "Lambda Calculi Abstract Syntax Trees"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "lambda-bridge" = callPackage @@ -154468,8 +155172,8 @@ self: { libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base ]; description = "A bridge from Haskell (on a CPU) to VHDL on a FPGA"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -154489,8 +155193,8 @@ self: { ]; testHaskellDepends = [ base containers hlint hspec HUnit ]; description = "A lambda calculus interpreter"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -154506,7 +155210,7 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Lambda Calculus interpreter"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "lambda-canvas" = callPackage @@ -154517,8 +155221,8 @@ self: { sha256 = "14wl1w1sc0j1yjfad5v00346ccxp0grfs1677hnjqwisashdac92"; libraryHaskellDepends = [ base GLUT mtl OpenGL time ]; description = "Educational drawing canvas for FP explorers"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -154545,8 +155249,8 @@ self: { test-framework-quickcheck2 ]; description = "a Paralell-DEVS implementaion based on distributed-process"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -154561,8 +155265,8 @@ self: { base containers funspection mtl read-bounded ]; description = "Declarative command-line parser with type-driven pattern matching"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -154574,7 +155278,7 @@ self: { sha256 = "0s3y55yqa5js1q3rfq8dgdip6rnjag4w5j5vdldghq9ax5yph3gd"; libraryHaskellDepends = [ base ]; description = "A library to emulate laceholders similar to Scala"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "lambda-sampler" = callPackage @@ -154590,7 +155294,7 @@ self: { base QuickCheck test-framework test-framework-quickcheck2 ]; description = "Boltzmann sampler utilities for lambda calculus"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "lambda-toolbox" = callPackage @@ -154603,8 +155307,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base ]; description = "An application to work with the lambda calculus (for learning)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -154618,8 +155322,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base parsec ]; description = "Untyped Lambda calculus to JavaScript compiler"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -154631,8 +155335,8 @@ self: { sha256 = "19c2bxipilb2lag7qzk4ajlzqch574dbhqk9cna13ijsjiyq24nd"; libraryHaskellDepends = [ base parsec ]; testHaskellDepends = [ base parsec ]; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -154647,7 +155351,7 @@ self: { executableHaskellDepends = [ base haskell98 html ]; description = "RSS 2.0 feed generator"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -154665,8 +155369,8 @@ self: { base bytestring haskeline lambdaBase mtl network ]; description = "..."; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -154858,7 +155562,7 @@ self: { ]; description = "Utility libraries for the advanced IRC bot, Lambdabot"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -154885,7 +155589,7 @@ self: { ]; description = "Lambdabot plugin for XMPP (Jabber) protocol"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "lambdabot-zulip" = callPackage @@ -154905,8 +155609,8 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base hspec HUnit text ]; description = "Lambdabot for Zulip Chat"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -154925,8 +155629,8 @@ self: { base cmdargs containers dyre glade gtk mtl network webkit ]; description = "Webkit Browser"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "lambdacms-core" = callPackage @@ -154950,8 +155654,8 @@ self: { base classy-prelude classy-prelude-yesod hspec yesod yesod-core ]; description = "LambdaCms 'core' subsite for Yesod apps"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -154968,8 +155672,8 @@ self: { time yesod yesod-form ]; description = "LambdaCms \"media\" extension"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -154983,8 +155687,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base editline mtl pretty ]; description = "A simple lambda cube type checker"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -154998,8 +155702,8 @@ self: { base bullet lambdacube-engine mtl vector ]; description = "Example for combining LambdaCube and Bullet"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -155024,8 +155728,8 @@ self: { aeson base bytestring filepath optparse-applicative ]; description = "LambdaCube 3D is a DSL to program GPUs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -155041,8 +155745,8 @@ self: { base bytestring bytestring-trie containers mtl vector ]; description = "LambdaCube 3D IR"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -155059,8 +155763,8 @@ self: { mtl vector ]; description = "LambdaCube 3D EDSL definition"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -155080,8 +155784,8 @@ self: { vector-algorithms xml zip-archive ]; description = "3D rendering engine written entirely in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -155098,8 +155802,8 @@ self: { base elerea GLFW-b lambdacube-engine mtl ]; description = "Examples for LambdaCube"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -155118,8 +155822,8 @@ self: { vector vector-algorithms ]; description = "OpenGL 3.3 Core Profile backend for LambdaCube 3D"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -155131,8 +155835,8 @@ self: { sha256 = "1xq1l27p5k863yklhiw0ldrq5ri9h5fg7wj7k2nbbwm7860mha0z"; libraryHaskellDepends = [ aeson base containers mtl text vector ]; description = "LambdaCube 3D intermediate representation of 3D graphics pipelines"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -155154,8 +155858,8 @@ self: { vector ]; description = "Samples for LambdaCube 3D"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -155177,7 +155881,7 @@ self: { ]; description = "Type-Safe LaTeX EDSL"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -155203,8 +155907,8 @@ self: { twitter-conduit twitter-types utf8-string ]; description = "Lambdabot running as a twitter bot. Similar to the @fsibot f# bot."; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -155218,8 +155922,8 @@ self: { base clash-prelude Lambdaya template-haskell ]; description = "Fpga bus core and serialization for RedPitaya"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -155237,8 +155941,8 @@ self: { attoparsec attoparsec-enumerator base bytestring enumerator gtk mtl ]; description = "Diff Viewer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -155264,8 +155968,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Fairly complete high-level binding to LAME encoder"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {mp3lame = null;}; @@ -155282,8 +155986,8 @@ self: { ]; testHaskellDepends = [ bizzlelude containers tasty tasty-hunit ]; description = "A strange and unnecessary selective test-running library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -155295,8 +155999,8 @@ self: { sha256 = "1nmyirpf07q7lrgfdqxwaspa173a2g3077gy9k7rpviw8pg2az0w"; libraryHaskellDepends = [ base bytestring http-streams Mapping ]; description = "A Lisp"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.agpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -155329,8 +156033,8 @@ self: { text ]; description = "Parser, pretty-printer, and more for the Modula-2 programming language"; - license = stdenv.lib.licenses.gpl3Plus; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -155349,8 +156053,8 @@ self: { vector ]; description = "ASN.1 encoding and decoding"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -155370,7 +156074,7 @@ self: { base HUnit parsec syb test-framework test-framework-hunit ]; description = "Parsing of ASN1 definitions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "language-ats" = callPackage @@ -155381,8 +156085,8 @@ self: { }: mkDerivation { pname = "language-ats"; - version = "1.7.10.2"; - sha256 = "10lanbzbaywyc3a8lq2ndgmpqq2kgpm4vkjxw7gl4irzjn3206yg"; + version = "1.7.10.3"; + sha256 = "0snidchidgzxwizbzaxf1gn547ga6kdf8pi03p6p5g9ffb8mv372"; enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-wl-pprint array base composition-prelude containers deepseq @@ -155394,7 +156098,7 @@ self: { ]; benchmarkHaskellDepends = [ base criterion ]; description = "Parser and pretty-printer for ATS"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "language-avro" = callPackage @@ -155412,7 +156116,7 @@ self: { avro base hspec hspec-megaparsec megaparsec text vector ]; description = "Language definition and parser for AVRO files"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "language-bash" = callPackage @@ -155430,7 +156134,7 @@ self: { tasty-expected-failure tasty-golden tasty-hunit tasty-quickcheck ]; description = "Parsing and pretty-printing Bash shell scripts"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "language-boogie" = callPackage @@ -155452,8 +156156,8 @@ self: { stream-monad time transformers ]; description = "Interpreter and language infrastructure for Boogie"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -155472,7 +156176,7 @@ self: { libraryToolDepends = [ alex happy ]; testHaskellDepends = [ base directory filepath process ]; description = "Analysis and generation of C code"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "language-c_0_9_0_1" = callPackage @@ -155490,8 +156194,8 @@ self: { libraryToolDepends = [ alex happy ]; testHaskellDepends = [ base directory filepath process ]; description = "Analysis and generation of C code"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "language-c-comments" = callPackage @@ -155504,8 +156208,8 @@ self: { libraryHaskellDepends = [ array base language-c ]; libraryToolDepends = [ alex ]; description = "Extracting comments from C code"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -155522,8 +156226,8 @@ self: { template-haskell ]; description = "Inline C & Objective-C code in Haskell for language interoperability"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -155548,7 +156252,7 @@ self: { test-framework-hunit ]; description = "C/CUDA/OpenCL/Objective-C quasiquoting library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "language-c99" = callPackage @@ -155559,7 +156263,7 @@ self: { sha256 = "0k4a1chca328sa3w7aghhi446kqfrbp6h5jaj2rddd8f8qjz5pag"; libraryHaskellDepends = [ base pretty ]; description = "An implementation of the C99 AST that strictly follows the standard"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "language-c99-simple" = callPackage @@ -155572,7 +156276,7 @@ self: { base language-c99 language-c99-util mtl ]; description = "C-like AST to simplify writing C99 programs"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "language-c99-util" = callPackage @@ -155583,7 +156287,7 @@ self: { sha256 = "0rdwb29d2aa9mqkn5b4acwviymxy18sjfmzr01j7n3j4n3q4d2lz"; libraryHaskellDepends = [ base language-c99 ]; description = "Utilities for language-c99"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "language-cil" = callPackage @@ -155594,7 +156298,7 @@ self: { sha256 = "1150fzhkn9zfxmam27wf2nyhai0ab66aaw8fqak559v39p0nri10"; libraryHaskellDepends = [ base bool-extras ]; description = "Manipulating Common Intermediate Language AST"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "language-conf" = callPackage @@ -155617,8 +156321,8 @@ self: { pretty QuickCheck semigroups text transformers ]; description = "Conf parsers and pretty-printers for the Haskell programming language"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -155633,8 +156337,8 @@ self: { libraryHaskellDepends = [ array base parsec pretty text ]; libraryToolDepends = [ alex ]; description = "C# source code manipulation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -155646,7 +156350,7 @@ self: { sha256 = "0gwsa9i9jxlnp60z3dh1rkk2zds74llxwjxzrsnhbmi71rmmiggx"; libraryHaskellDepends = [ base pretty ]; description = "CSS 2.1 syntax"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "language-dart" = callPackage @@ -155658,8 +156362,8 @@ self: { libraryHaskellDepends = [ base pretty ]; testHaskellDepends = [ base hspec raw-strings-qq ]; description = "Manipulating Dart source: abstract syntax and pretty-printer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -155699,8 +156403,8 @@ self: { ]; doHaddock = false; description = "A language for generative literature"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -155722,7 +156426,7 @@ self: { megaparsec prettyprinter QuickCheck split text time ]; description = "Dockerfile parser, pretty-printer and embedded DSL"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "language-dockerfile" = callPackage @@ -155750,8 +156454,8 @@ self: { transformers unordered-containers yaml ]; description = "Dockerfile linter, parser, pretty-printer and embedded DSL"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -155767,7 +156471,7 @@ self: { executableHaskellDepends = [ base mtl ]; testHaskellDepends = [ base parsec ]; description = "A library for the analysis and creation of Graphviz DOT files"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "language-ecmascript" = callPackage @@ -155792,8 +156496,8 @@ self: { uniplate ]; description = "JavaScript parser and pretty-printer library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -155809,8 +156513,8 @@ self: { base containers language-ecmascript parsec uniplate ]; description = "JavaScript static analysis library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -155829,8 +156533,8 @@ self: { ]; libraryToolDepends = [ alex ]; description = "Parser and pretty printer for the Eiffel language"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -155848,8 +156552,8 @@ self: { testHaskellDepends = [ base hspec mtl pretty protolude ]; testToolDepends = [ doctest ]; description = "Generate elm code"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -155863,8 +156567,8 @@ self: { libraryHaskellDepends = [ array base haskell-src parsec syb ]; libraryToolDepends = [ alex happy ]; description = "Fortran lexer and parser, language support, and extensions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -155876,8 +156580,8 @@ self: { sha256 = "12yh49zh9wissms20rbvgzw5i5wlc8m1iqwkxg68f52g7mk6clrf"; libraryHaskellDepends = [ base bifunctors parsers ]; description = "Something similar to Dijkstra's guarded command language"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -155891,7 +156595,7 @@ self: { editedCabalFile = "0gkllr25h5msjvlcx1pch6a4ndm7yymdqh4ya95drc7gns0kz1zc"; libraryHaskellDepends = [ base text ]; description = "Datatypes and parsing/printing functions to represent the Gemini markup language"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "language-glsl" = callPackage @@ -155912,7 +156616,7 @@ self: { base HUnit parsec prettyclass test-framework test-framework-hunit ]; description = "GLSL abstract syntax tree, parser, and pretty-printer"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "language-go" = callPackage @@ -155924,7 +156628,7 @@ self: { libraryHaskellDepends = [ array base parsec utf8-string ]; description = "A library for analysis and synthesis of Go code"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -155937,8 +156641,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring cereal containers ]; description = "Guess at which language a text is written in using trigrams"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -155952,7 +156656,7 @@ self: { editedCabalFile = "1chx4g8ngb1hpyh3r9rbl8rkjkm67klms4wmw3p1g2llg47vvqip"; libraryHaskellDepends = [ base regex-posix template-haskell ]; description = "Module to automatically extract functions from the local code"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "language-hcl" = callPackage @@ -155976,8 +156680,8 @@ self: { base criterion directory filepath text ]; description = "HCL parsers and pretty-printers for the Haskell programming language"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -155997,7 +156701,7 @@ self: { base directory filepath mtl tasty tasty-hunit tasty-quickcheck ]; description = "Java source manipulation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "language-java-classfile" = callPackage @@ -156014,8 +156718,8 @@ self: { data-flags deepseq language-java LibZip mtl parsec utf8-string ]; description = "Parser for Java .class files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -156037,7 +156741,7 @@ self: { QuickCheck utf8-light utf8-string ]; description = "Parser for JavaScript"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "language-js" = callPackage @@ -156049,7 +156753,7 @@ self: { libraryHaskellDepends = [ base parsec ]; testHaskellDepends = [ base hspec parsec ]; description = "javascript parser for es6 and es7"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "language-kort" = callPackage @@ -156072,8 +156776,8 @@ self: { base bytestring QuickCheck smaoin text vocabulary-kadma ]; description = "Parser and serializer for the Kort information language"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -156098,8 +156802,8 @@ self: { base criterion directory filepath text ]; description = "Lua parser and pretty-printer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -156116,8 +156820,8 @@ self: { ]; testHaskellDepends = [ base ]; description = "Initial project template from stack"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -156143,8 +156847,8 @@ self: { tasty-hunit tasty-quickcheck unordered-containers ]; description = "Lua parser and pretty printer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -156159,8 +156863,8 @@ self: { libraryHaskellDepends = [ base mtl parsec pretty ]; executableHaskellDepends = [ base pretty ]; description = "Parser, pretty-printer, and AST types for the MIXAL assembly language"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -156199,8 +156903,8 @@ self: { versions ]; description = "A library for dealing with the Ninja build language"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -156216,8 +156920,8 @@ self: { base deepseq lens parsec-class pretty QuickCheck ]; description = "Data types and functions to represent the Nix language"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ peti ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ peti ]; }) {}; "language-oberon" = callPackage @@ -156248,8 +156952,8 @@ self: { grammatical-parsers prettyprinter tasty tasty-hunit text ]; description = "Parser, pretty-printer, and more for the Oberon programming language"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -156267,8 +156971,8 @@ self: { ]; libraryToolDepends = [ alex happy ]; description = "Analysis and generation of Objective C code"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -156294,8 +156998,8 @@ self: { string-qq tasty tasty-golden tasty-hunit ]; description = "Language tools for manipulating OCaml programs in Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) zlib;}; @@ -156312,8 +157016,8 @@ self: { libraryHaskellDepends = [ attoparsec base bytestring ]; executableHaskellDepends = [ attoparsec base bytestring ]; description = "A simple parser for OpenSCAD"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -156334,8 +157038,8 @@ self: { test-framework-quickcheck2 text ]; description = "Pig parser in haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -156347,7 +157051,7 @@ self: { sha256 = "1wxihyf320xsqi114dbl2cwylkc261d5wgd7migb1lh23gxnhhz2"; libraryHaskellDepends = [ base megaparsec text ]; description = "Language definition and parser for Protocol Buffers"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "language-puppet" = callPackage @@ -156389,8 +157093,8 @@ self: { transformers unordered-containers vector ]; description = "Tools to parse and evaluate the Puppet DSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -156407,7 +157111,7 @@ self: { ]; libraryToolDepends = [ alex happy ]; description = "Parsing and pretty printing of Python code"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "language-python-colour" = callPackage @@ -156422,8 +157126,8 @@ self: { base haskell98 language-python xhtml ]; description = "Generate coloured XHTML for Python code"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -156437,7 +157141,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base language-python ]; description = "testing code for the language-python library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "language-qux" = callPackage @@ -156453,8 +157157,8 @@ self: { transformers ]; description = "Utilities for working with the Qux language"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -156484,8 +157188,8 @@ self: { statistics weigh ]; description = "Parsing and pretty printing of Rust code"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -156500,7 +157204,7 @@ self: { ansi-wl-pprint base bytestring containers text ]; description = "AST and pretty printer for Sally"; - license = stdenv.lib.licenses.isc; + license = lib.licenses.isc; }) {}; "language-sh" = callPackage @@ -156514,8 +157218,8 @@ self: { base directory filepath mtl parsec pcre-light ]; description = "A package for parsing shell scripts"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -156534,7 +157238,7 @@ self: { test-framework-hunit test-framework-quickcheck2 transformers ]; description = "AST and parser for the ZeroC Slice language (Specification language for ICE)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "language-spelling" = callPackage @@ -156554,8 +157258,8 @@ self: { base bytestring criterion random-shuffle time ]; description = "Various tools to detect/correct mistakes in words"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -156571,8 +157275,8 @@ self: { array base bytestring containers mtl template-haskell utf8-string ]; description = "Full parser and generator for SQL as implemented by SQLite3"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -156587,8 +157291,8 @@ self: { libraryHaskellDepends = [ array base hashable text ]; testHaskellDepends = [ base deepseq tasty tasty-hunit text ]; description = "A parser and printer for the SyGuS 2.0 language."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -156611,8 +157315,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Parser and pretty printer for the Thrift IDL format"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -156635,8 +157339,8 @@ self: { text ]; description = "A Parser for the Type Language"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -156648,8 +157352,8 @@ self: { sha256 = "07lm3d4m7c6j2b5gywqm05189iwkh2zjiv5xwwmcw1fm2a63r2zd"; libraryHaskellDepends = [ base containers parsec pretty ]; description = "A library for working with TypeScript Definition files"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -156661,8 +157365,8 @@ self: { sha256 = "03n5cnr71zq3fl0ajjiyzjq2x2848lwd9gfp4kjkkjaxw0lb6bka"; libraryHaskellDepends = [ base pretty ]; description = "VHDL AST and pretty printer in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -156675,8 +157379,8 @@ self: { libraryHaskellDepends = [ base parsec wl-pprint ]; testHaskellDepends = [ base HUnit ]; description = "Parser and Pretty Printer for WebIDL"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -156690,7 +157394,7 @@ self: { testHaskellDepends = [ base deepseq ]; benchmarkHaskellDepends = [ base criterion deepseq QuickCheck ]; description = "Matrix programming library"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "lapack" = callPackage @@ -156721,8 +157425,8 @@ self: { unique-logic-tf utility-ht ]; description = "Numerical Linear Algebra using LAPACK"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -156739,8 +157443,8 @@ self: { transformers ]; description = "Auto-generated interface to Fortran LAPACK via CArrays"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -156757,8 +157461,8 @@ self: { storable-complex transformers ]; description = "Auto-generated interface to Fortran LAPACK via comfort-array"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -156771,8 +157475,8 @@ self: { libraryHaskellDepends = [ base netlib-ffi ]; libraryPkgconfigDepends = [ liblapack ]; description = "Auto-generated interface to Fortran LAPACK"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {liblapack = null;}; @@ -156797,7 +157501,7 @@ self: { unordered-containers utility-ht vector ]; description = "Generator for Haskell interface to Fortran LAPACK"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "large-hashable" = callPackage @@ -156825,8 +157529,8 @@ self: { deepseq safecopy text transformers ]; description = "Efficiently hash (large) Haskell values"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -156844,7 +157548,7 @@ self: { test-framework-hunit test-framework-quickcheck2 ]; description = "Provides Word128, Word192 and Word256 and a way of producing other large words if required"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "lat" = callPackage @@ -156863,8 +157567,8 @@ self: { HDBC-sqlite3 hsini HTTP mtl old-locale regex-compat tagsoup time ]; description = "Tool to track security alerts on LWN"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -156895,8 +157599,8 @@ self: { transformers ]; description = "Find the latest version of a package on npm"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -156908,7 +157612,7 @@ self: { sha256 = "10m0l0wlrkkl474sdmi7cl6w6kqyqzcp05h7jdacxhzbxyf8nahw"; libraryHaskellDepends = [ base containers utility-ht ]; description = "Parse, format and process LaTeX files"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "latex-formulae-hakyll" = callPackage @@ -156926,8 +157630,8 @@ self: { pandoc-types ]; description = "Use actual LaTeX to render formulae inside Hakyll pages"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -156946,8 +157650,8 @@ self: { transformers ]; description = "A library for rendering LaTeX formulae as images using an actual LaTeX installation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -156969,8 +157673,8 @@ self: { base latex-formulae-image pandoc-types ]; description = "Render LaTeX formulae in pandoc documents to images with an actual LaTeX installation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -156993,7 +157697,7 @@ self: { executableHaskellDepends = [ base HaTeX process template-haskell ]; testHaskellDepends = [ base ]; description = "Function table specifications in latex"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "latex-live-snippets" = callPackage @@ -157008,7 +157712,7 @@ self: { base directory filepath lens MissingH ]; description = "Automatically inline Haskell snippets into LaTeX documents"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "latex-svg-hakyll" = callPackage @@ -157023,8 +157727,8 @@ self: { base hakyll latex-svg-image latex-svg-pandoc lrucache pandoc-types ]; description = "Use actual LaTeX to render formulae inside Hakyll pages"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -157042,8 +157746,8 @@ self: { directory filepath parsec process temporary transformers ]; description = "A library for rendering LaTeX formulae as SVG using an actual LaTeX"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -157063,8 +157767,8 @@ self: { ]; executableHaskellDepends = [ base latex-svg-image pandoc-types ]; description = "Render LaTeX formulae in pandoc documents to images with an actual LaTeX"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -157091,8 +157795,8 @@ self: { universe-reverse-instances unordered-containers ]; description = "Fine-grained library for constructing and manipulating lattices"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -157125,8 +157829,8 @@ self: { unordered-containers uuid vector ]; description = "Server-side SDK for integrating with LaunchDarkly"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -157144,8 +157848,8 @@ self: { ]; executableHaskellDepends = [ base ]; description = "High and low-level interface to the Novation Launchpad midi controller"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -157157,7 +157861,7 @@ self: { sha256 = "014drjks30wij31fm371q5d8m6x3fpf3z52dim6zmxxv0r0pjmh0"; libraryHaskellDepends = [ base ]; description = "Assert the lawfulness of your typeclass instances"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "lawless-concurrent-machines" = callPackage @@ -157178,8 +157882,8 @@ self: { ]; benchmarkHaskellDepends = [ base machines time ]; description = "Concurrent networked stream transducers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -157191,7 +157895,7 @@ self: { sha256 = "0hmsqpm3jakp5q274q47c9gvb2i4asc25nrfypblkvnpvnh6q172"; libraryHaskellDepends = [ base ]; description = "Common mathematical laws"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "lax" = callPackage @@ -157202,7 +157906,7 @@ self: { sha256 = "12f0k2545nk50cvs3gd41dhsfls19xkhvn3avhmgx69y57mhalcy"; libraryHaskellDepends = [ base ]; description = "Lax arrows"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "layered-state" = callPackage @@ -157224,8 +157928,8 @@ self: { criterion deepseq either kan-extensions mtl-c timeit ]; description = "Control structure similar to Control.Monad.State, allowing multiple nested states, distinguishable by provided phantom types."; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -157237,8 +157941,8 @@ self: { sha256 = "1yn8swgxb908wslcnh04919m9rzy47dxgawns89zw5v1gbq3wmdf"; libraryHaskellDepends = [ base transformers ]; description = "Modular type class machinery for monad transformer stacks"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -157258,8 +157962,8 @@ self: { OpenGLRaw pretty-show ]; description = "A prototypical 2d platform game"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -157271,8 +157975,8 @@ self: { sha256 = "126r47n5aaz3ksl7fwfc5lg5wniy46lscr1c3z7d2sdk10rhbql9"; libraryHaskellDepends = [ base convertible hinduce-missingh ]; description = "Turn values into pretty text or markup"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -157284,8 +157988,8 @@ self: { sha256 = "0rm0w5l4g865ais4rg3vdfx6fyzp1dginlhlabvqclbjwwzkiyqi"; libraryHaskellDepends = [ base blaze-html containers text ]; description = "Template and widgets for Bootstrap2 to use with Text.Blaze.Html5"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -157297,8 +158001,8 @@ self: { sha256 = "1ddynm3jl7c4jakxk2lxy954a9245j2664an0kyh9inn51j17p9r"; libraryHaskellDepends = [ alex-tools base text ]; description = "A collection of different layout implementations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -157314,8 +158018,8 @@ self: { base container layered-state prologue terminal-text text ]; description = "General layouting library. Currently supports layouting 2D areas and can be used as a backend for text pretty printing or automatic windows layouting managers."; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -157327,7 +158031,7 @@ self: { sha256 = "02a9iw0ns12hszi5rim4x6pa15y3zycmbcmcwmsr6m31rzgz8ryp"; libraryHaskellDepends = [ base comonad ]; description = "Explicit laziness for Haskell"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "lazy-csv" = callPackage @@ -157341,7 +158045,7 @@ self: { libraryHaskellDepends = [ base bytestring ]; executableHaskellDepends = [ base bytestring ]; description = "Efficient lazy parsers for CSV (comma-separated values)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "lazy-hash" = callPackage @@ -157359,8 +158063,8 @@ self: { template-haskell vector-space ]; description = "Identifiers for not-yet-computed values"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -157381,8 +158085,8 @@ self: { temporary ]; description = "Storing computed values for re-use when the same program runs again"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -157394,7 +158098,7 @@ self: { sha256 = "0fbvm8wwvp4xm4rq2mdfnrra7c88dps91j7ay2vn7iqmpdkcwly9"; libraryHaskellDepends = [ base ]; description = "Lazy IO"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "lazy-io-streams" = callPackage @@ -157407,8 +158111,8 @@ self: { editedCabalFile = "0pn446g45naqh92g9mib98fw5xznbp6r4x27acmnqrmlcqjz9jsm"; libraryHaskellDepends = [ base bytestring io-streams ]; description = "Get lazy with your io-streams"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -157425,8 +158129,8 @@ self: { testHaskellDepends = [ base doctest lens ]; testToolDepends = [ markdown-unlit ]; description = "Lazy-Spined Monadic Priority Queues"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -157438,8 +158142,8 @@ self: { sha256 = "1vicd1yzcz3kw3r0widfx04j4qbzz4912j5v8c2bhd0z9hvc22vp"; libraryHaskellDepends = [ base size-based ]; description = "Finds values satisfying a lazy predicate"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -157451,8 +158155,8 @@ self: { sha256 = "0bc2n7x8fydmzc84yb5zbdaca1r4qwpk7zlvbgcycycr87fk7p7n"; libraryHaskellDepends = [ array base ]; description = "Efficient implementation of lazy monolithic arrays (lazy in indexes)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -157472,8 +158176,8 @@ self: { aeson base hspec microstache text transformers ]; description = "An EDSL for programming the Game Boy"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -157487,7 +158191,7 @@ self: { isExecutable = true; libraryHaskellDepends = [ base transformers unsafe ]; description = "Run IO actions lazily while respecting their order"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "lazyset" = callPackage @@ -157504,8 +158208,8 @@ self: { base containers data-ordlist time timeit ]; description = "Set and Map from lazy/infinite lists"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -157517,7 +158221,7 @@ self: { sha256 = "0lqggm75m1qd34lzqj3ibvnjwhjqvq16cab8zxm4yzn7j2sxzm4x"; libraryHaskellDepends = [ base ]; description = "A library for demand-driven testing of Haskell programs"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "lazysplines" = callPackage @@ -157528,7 +158232,7 @@ self: { sha256 = "13ll6w4g0pv2bq5dsyiz4v9ywsdax6pjzb1d64fsqvq1zqr490ix"; libraryHaskellDepends = [ base ]; description = "Differential solving with lazy splines"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "lbfgs" = callPackage @@ -157540,7 +158244,7 @@ self: { libraryHaskellDepends = [ array base vector ]; description = "L-BFGS optimization"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "lca" = callPackage @@ -157553,7 +158257,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; description = "O(log n) persistent online lowest common ancestor search without preprocessing"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "lcs" = callPackage @@ -157565,7 +158269,7 @@ self: { libraryHaskellDepends = [ array base ]; description = "Find longest common sublist of two lists"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "ld-intervals" = callPackage @@ -157576,8 +158280,8 @@ self: { sha256 = "1mi94kdc61d4vhzvcr4gvzy3zl2wrd4i353gpmmaxp652rm9xm99"; libraryHaskellDepends = [ base ]; description = "Data structures for representing arbitrary intervals"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -157593,8 +158297,8 @@ self: { base containers ghc-prim mtl random-fu random-source rvar vector ]; description = "Online Latent Dirichlet Allocation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -157613,7 +158317,7 @@ self: { ]; testHaskellDepends = [ base bytestring hspec process semigroups ]; description = "Pure Haskell LDAP Client Library"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }) {}; "ldapply" = callPackage @@ -157631,8 +158335,8 @@ self: { unordered-containers ]; description = "LDIF idempotent apply tool"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -157655,8 +158359,8 @@ self: { ]; testHaskellDepends = [ base HUnit ]; description = "The LDAP Data Interchange Format (LDIF) tools"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -157675,8 +158379,8 @@ self: { base blaze-html directory filepath pandoc split ]; description = "A simple portfolio generator"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -157695,8 +158399,8 @@ self: { seqaid template-haskell ]; description = "Robust space leak, and its strictification"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -157712,8 +158416,8 @@ self: { base base-unicode-symbols text-utf8 transformers util ]; description = "Bonds to Lean theorem prover"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -157732,7 +158436,7 @@ self: { template-haskell ]; description = "A maximally lazy, simple implementation of the Peano numbers with minimal dependencies"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "leancheck" = callPackage @@ -157744,7 +158448,7 @@ self: { libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base ]; description = "Enumerative property-based testing"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "leancheck-enum-instances" = callPackage @@ -157755,7 +158459,7 @@ self: { sha256 = "0l14npnkwdr3vcdjv2b20a0g3cka0nd93cm6hrq16dcphm1ckaj1"; libraryHaskellDepends = [ base enum-types leancheck ]; description = "listable instances for small enum types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "leancheck-instances" = callPackage @@ -157773,7 +158477,7 @@ self: { base bytestring containers leancheck nats text ]; description = "Common LeanCheck instances"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "leankit-api" = callPackage @@ -157786,7 +158490,7 @@ self: { aeson base bytestring colour curl split ]; description = "LeanKit API"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "leanpub-concepts" = callPackage @@ -157797,7 +158501,7 @@ self: { sha256 = "1vf62iryqmj8ll16cm5xpwaqzlhw8rb7p6pshm87assm9lnw3k8c"; libraryHaskellDepends = [ base bytestring text ]; description = "Types for the Leanpub API"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "leanpub-wreq" = callPackage @@ -157814,8 +158518,8 @@ self: { time transformers unordered-containers wreq ]; description = "Use the Leanpub API via Wreq"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -157829,8 +158533,8 @@ self: { editedCabalFile = "1n3r1c58626nzqmjb068kz3ckb3xsn9v62i70yvzk2g6j29fpz2g"; libraryHaskellDepends = [ base time ]; testHaskellDepends = [ base tasty tasty-hunit time ]; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -157843,7 +158547,7 @@ self: { libraryHaskellDepends = [ base time ]; testHaskellDepends = [ base QuickCheck time ]; description = "Leap seconds announced at library release time"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "learn" = callPackage @@ -157854,8 +158558,8 @@ self: { sha256 = "1i2rn4pmgbqxj0xsjqp5rh50lv6zgnblbjgwmqh5cxb3dsillvpj"; libraryHaskellDepends = [ base containers ]; description = "Learning Algorithms"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -157876,7 +158580,7 @@ self: { base gloss gnuplot not-gloss spatial-math ]; description = "Haskell code for learning physics"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "learn-physics-examples" = callPackage @@ -157893,8 +158597,8 @@ self: { base gloss gnuplot learn-physics not-gloss spatial-math ]; description = "examples for learn-physics"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -157910,7 +158614,7 @@ self: { base containers deepseq hmatrix random-fu random-source vector ]; description = "Yet another library for hidden Markov models"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "leb128" = callPackage @@ -157929,8 +158633,8 @@ self: { ]; benchmarkHaskellDepends = [ base bytestring criterion deepseq ]; description = "LEB128 encoding logic for and in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -157947,7 +158651,7 @@ self: { base bytestring tasty tasty-hunit tasty-quickcheck ]; description = "LEB128 and SLEB128 encoding"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "leetify" = callPackage @@ -157961,8 +158665,8 @@ self: { enableSeparateDataOutput = true; executableHaskellDepends = [ base containers ]; description = "Leetify text"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -157976,7 +158680,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base hscharm random random-shuffle ]; description = "left4dead-inspired roguelike"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "legion" = callPackage @@ -157997,8 +158701,8 @@ self: { stm text time transformers unix uuid wai wai-extra warp ]; description = "Distributed, stateful, homogeneous microservice framework"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -158024,8 +158728,8 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "A discovery service based on Legion"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -158045,8 +158749,8 @@ self: { ]; testHaskellDepends = [ base ]; description = "Client library for communicating with legion-discovery"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -158068,8 +158772,8 @@ self: { ]; testHaskellDepends = [ base ]; description = "Extra non-essential utilities for building legion applications"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -158108,7 +158812,7 @@ self: { executableHaskellDepends = [ base gi-gtk-hs leksah-server stm ]; description = "Haskell IDE written in Haskell"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) gtk3;}; "leksah-server" = callPackage @@ -158146,7 +158850,7 @@ self: { ]; description = "Metadata collection for leksah"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -158163,8 +158867,8 @@ self: { io-streams mtl scientific text vector ]; description = "Bindings for the LendingClub marketplace API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -158183,8 +158887,8 @@ self: { pname = "lens"; version = "4.19.2"; sha256 = "0fy2vr5r11cc6ana8m2swqgs3zals4kims55vd6119bi76p5iy2j"; - revision = "2"; - editedCabalFile = "1bp6s0ifwdmzv946krxgxqakw02iriqmzvvcypwrgcynrn9wkn9y"; + revision = "3"; + editedCabalFile = "1anqghjbi0wyvqpg7qcbph5rfq78sjpdavrajh4z6f20kzy4mn45"; setupHaskellDepends = [ base Cabal cabal-doctest filepath ]; libraryHaskellDepends = [ array base base-orphans bifunctors bytestring call-stack comonad @@ -158206,7 +158910,7 @@ self: { generic-deriving transformers unordered-containers vector ]; description = "Lenses, Folds and Traversals"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }) {}; "lens-accelerate" = callPackage @@ -158217,7 +158921,7 @@ self: { sha256 = "1sk3iy5qv24mifx0gwd5z714lf3y3s4zpbff09mqk42whk2sdd0y"; libraryHaskellDepends = [ accelerate base lens ]; description = "Instances to mix lens with Accelerate"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "lens-action" = callPackage @@ -158236,7 +158940,7 @@ self: { ]; testHaskellDepends = [ base directory doctest filepath ]; description = "Monadic Getters and Folds"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "lens-aeson" = callPackage @@ -158259,7 +158963,7 @@ self: { base doctest generic-deriving semigroups simple-reflect ]; description = "Law-abiding lenses for aeson"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "lens-core" = callPackage @@ -158281,7 +158985,7 @@ self: { sha256 = "0kkwb32ndhxhlz01pn4xh825x95l8g45cs4h5wxkjh24rywl3rrp"; libraryHaskellDepends = [ base bytestring cassava lens ]; testHaskellDepends = [ base bytestring cassava lens ]; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "lens-datetime" = callPackage @@ -158292,7 +158996,7 @@ self: { sha256 = "1m6cns38xggw8kcc9h0mf4q024cvc8njm7n33f8gi7hwyxxqs7xv"; libraryHaskellDepends = [ base lens time ]; description = "Lenses for Data.Time.* types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "lens-errors" = callPackage @@ -158304,7 +159008,7 @@ self: { libraryHaskellDepends = [ base either lens ]; testHaskellDepends = [ base containers either hspec lens ]; description = "Error handling in lens chains"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "lens-family" = callPackage @@ -158319,7 +159023,7 @@ self: { base containers lens-family-core mtl transformers ]; description = "Lens Families"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "lens-family_2_1_0" = callPackage @@ -158334,8 +159038,8 @@ self: { base containers lens-family-core mtl transformers ]; description = "Lens Families"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "lens-family-core" = callPackage @@ -158346,7 +159050,7 @@ self: { sha256 = "0ni6s873hy2h3b316835ssmlyr05yinb3a8jq5b01p9ppp9zrd0r"; libraryHaskellDepends = [ base containers transformers ]; description = "Haskell 2022 Lens Families"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "lens-family-core_2_1_0" = callPackage @@ -158357,8 +159061,8 @@ self: { sha256 = "1jjzm2f4ixjwysyk8gybzpb98rlf2mmzn0nfg8qvhkf5gl87jv3v"; libraryHaskellDepends = [ base containers transformers ]; description = "Haskell 2022 Lens Families"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "lens-family-th" = callPackage @@ -158370,7 +159074,7 @@ self: { libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base hspec template-haskell transformers ]; description = "Generate lens-family style lenses"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "lens-filesystem" = callPackage @@ -158388,8 +159092,8 @@ self: { base directory filepath hspec lens lens-action ]; description = "Lens interface for your filesystem; still a bit experimental"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -158401,8 +159105,8 @@ self: { sha256 = "0zz2w01knsj1zn9vj8g3dbhvh0sgnibr5wm9dn91qv0bmps745z7"; libraryHaskellDepends = [ base ghc-prim profunctors tagged ]; description = "Integration of lenses with OverloadedLabels"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -158414,7 +159118,7 @@ self: { sha256 = "1jyqxi83imkyd318m17p2z84zqaxyb08mk5gy7q7saay2blmz4jr"; libraryHaskellDepends = [ base lens tagged template-haskell ]; description = "Miscellaneous lens utilities"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "lens-named" = callPackage @@ -158425,7 +159129,7 @@ self: { sha256 = "1w6y1caah0yr7gilwsv7ji7pp3mz1m9wlx5zpq0n0z1q2wbdsmfp"; libraryHaskellDepends = [ base lens template-haskell ]; description = "Helper for use with lens"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "lens-prelude" = callPackage @@ -158442,8 +159146,8 @@ self: { mtl text time transformers unordered-containers vector ]; description = "Alternate prelude that exports lens combinators"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -158463,7 +159167,7 @@ self: { base doctest filepath lens process tasty tasty-hunit ]; description = "Optics for system processes"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "lens-properties" = callPackage @@ -158476,7 +159180,7 @@ self: { editedCabalFile = "1ky3xzh3cgam5ncx7n25xbll7vqw3x7vyhprfmxm34pshkxbrjh7"; libraryHaskellDepends = [ base lens QuickCheck transformers ]; description = "QuickCheck properties for lens"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "lens-regex" = callPackage @@ -158496,7 +159200,7 @@ self: { base directory doctest filepath regex-posix ]; description = "Lens powered regular expression"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "lens-regex-pcre" = callPackage @@ -158520,7 +159224,7 @@ self: { template-haskell text ]; description = "A lensy interface to regular expressions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "lens-simple" = callPackage @@ -158535,8 +159239,8 @@ self: { base lens-family lens-family-core lens-family-th mtl transformers ]; description = "simplified import of elementary lens-family combinators"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -158550,7 +159254,7 @@ self: { base fclabels generics-sop transformers ]; description = "Computing lenses generically using generics-sop"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "lens-text-encoding" = callPackage @@ -158561,8 +159265,8 @@ self: { sha256 = "1yxab87ci6gl0c5gsdd8pb780ai8lmxxa3fxkpl1shv1pw124fsv"; libraryHaskellDepends = [ base bytestring lens text ]; description = "Isomorphisms and prisms for text <=> bytestring conversions"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -158577,8 +159281,8 @@ self: { libraryHaskellDepends = [ base ghc lens ]; executableHaskellDepends = [ base ghc ghc-exactprint lens ]; description = "Rewrites Template Haskell splices using the API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -158590,8 +159294,8 @@ self: { sha256 = "1hrp9d6qja7yc3zj68w3hylgflyfsvh79m8daw9030yjdxm525za"; libraryHaskellDepends = [ base lens time ]; description = "lens for Data.Time"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -158608,8 +159312,8 @@ self: { base containers dwergaz hlint lens-family text toml-parser ]; description = "Lenses for toml-parser"; - license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -158622,8 +159326,8 @@ self: { libraryHaskellDepends = [ base lens ]; testHaskellDepends = [ base doctest ]; description = "Tutorial for the lens library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -158635,8 +159339,8 @@ self: { sha256 = "0lsdp6rgacsa13fppa2dfn2nz8cdrvj5clmlshzrv1h0423hfgbp"; libraryHaskellDepends = [ base singletons ]; description = "Type-level lenses using singletons"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -158653,8 +159357,8 @@ self: { template-haskell ]; description = "Collection of missing lens utilities"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -158669,7 +159373,7 @@ self: { libraryHaskellDepends = [ base lens xml ]; testHaskellDepends = [ base lens xml ]; description = "Lenses for the xml package"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "lenses" = callPackage @@ -158680,7 +159384,7 @@ self: { sha256 = "1wwl0f1f1scflnbjgqcinkpvpvhn21942bfbg8vlimdap6i5d49h"; libraryHaskellDepends = [ base mtl template-haskell ]; description = "Simple Functional Lenses"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "lensref" = callPackage @@ -158692,8 +159396,8 @@ self: { libraryHaskellDepends = [ base monad-control mtl transformers ]; testHaskellDepends = [ base ]; description = "References which can be joined and on which lenses can be applied"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -158705,8 +159409,8 @@ self: { }: mkDerivation { pname = "lentil"; - version = "1.4.1.0"; - sha256 = "07zlmds8450sa54axx91ppxil6jfafx78ba3lxrr6jpdvzc73w55"; + version = "1.5.0.0"; + sha256 = "1fkgaf4vgn2b8pkvcc9x3dmigqrq4qp31xvjmp3h0g9s1bm9ay5z"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -158720,8 +159424,8 @@ self: { semigroups terminal-progress-bar text ]; description = "frugal issue tracker"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -158739,7 +159443,7 @@ self: { base base-unicode-symbols hs-functors transformers ]; description = "Van Laarhoven lenses"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "lenz-mtl" = callPackage @@ -158757,7 +159461,7 @@ self: { ]; description = "mtl operations with Van Laarhoven lenses"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "lenz-template" = callPackage @@ -158775,7 +159479,7 @@ self: { ]; description = "Van Laarhoven lens templates"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "less-arbitrary" = callPackage @@ -158787,13 +159491,13 @@ self: { }: mkDerivation { pname = "less-arbitrary"; - version = "0.1.4.0"; - sha256 = "1rd21mnvr3wwzbl09070jmzbg7zl05kviaggpycyxybj4sq8lxm3"; + version = "0.1.7.0"; + sha256 = "0j1qnd3qz6kiivhmbs5a4hnw1wm13q794s7b5rrin62x8dz7kcp0"; libraryHaskellDepends = [ base containers email-validate generic-arbitrary genvalidity genvalidity-hspec genvalidity-property hashable hspec mtl - QuickCheck random scientific text time transformers - unordered-containers validity vector + QuickCheck quickcheck-classes random scientific text time + transformers unordered-containers validity vector ]; testHaskellDepends = [ base containers email-validate generic-arbitrary genvalidity @@ -158803,7 +159507,7 @@ self: { vector ]; description = "Linear time testing with variant of Arbitrary class that always terminates"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "level-monad" = callPackage @@ -158814,8 +159518,8 @@ self: { sha256 = "1l5jyhpvbcj4fmyggp8bjy4gx9igcydply3yb1s23fxdcz0b638a"; libraryHaskellDepends = [ base fmlist ]; description = "Non-Determinism Monad for Level-Wise Search"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -158840,7 +159544,7 @@ self: { tasty tasty-quickcheck temporary transformers ]; description = "Haskell bindings to LevelDB"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) leveldb;}; "leveldb-haskell-fork" = callPackage @@ -158863,7 +159567,7 @@ self: { QuickCheck transformers ]; description = "Haskell bindings to LevelDB"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) leveldb;}; "levmar" = callPackage @@ -158874,8 +159578,8 @@ self: { sha256 = "0v2mfqw4irzpfq100i1rm5djfqzvxilq9i7pcslsb92jkcv2zgbc"; libraryHaskellDepends = [ base bindings-levmar hmatrix vector ]; description = "An implementation of the Levenberg-Marquardt algorithm"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -158889,8 +159593,8 @@ self: { isExecutable = true; libraryHaskellDepends = [ base Chart colour data-accessor levmar ]; description = "Plots the results of the Levenberg-Marquardt algorithm in a chart"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -158910,8 +159614,8 @@ self: { testHaskellDepends = [ base util ]; benchmarkHaskellDepends = [ base gauge util ]; description = "See README for more info"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -158928,7 +159632,7 @@ self: { base deepseq regex-applicative srcloc tasty tasty-hunit ]; description = "Simple lexer based on applicative regular expressions"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "lfst" = callPackage @@ -158940,8 +159644,8 @@ self: { libraryHaskellDepends = [ base containers doctest lattices ]; testHaskellDepends = [ base doctest QuickCheck ]; description = "L-Fuzzy Set Theory implementation in Haskell"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -158969,8 +159673,8 @@ self: { vector ]; description = "Lens GUI Toolkit"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -158982,8 +159686,8 @@ self: { sha256 = "0a5h1d0sdnpy209k4zkmcrrxl4b000226hif098bqs9pngpbgki1"; libraryHaskellDepends = [ haskell2010 ]; description = "Data structures for the Les Houches Accord"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -159004,7 +159708,7 @@ self: { ]; description = "Simple spreadsheet program"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -159018,8 +159722,8 @@ self: { isExecutable = true; enableSeparateDataOutput = true; description = "LHC Haskell Compiler"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -159031,8 +159735,8 @@ self: { sha256 = "08725r5i71ni9ip4qbc5fr111j256rsii936yvxbd7kbbw4ap2a9"; libraryHaskellDepends = [ bytestring haskell2010 HaXml lha ]; description = "Parser and writer for Les-Houches event files"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -159051,8 +159755,8 @@ self: { base cmdargs filepath haskell-src-exts syb uu-parsinglib ]; description = "Literate highlighter preprocessor for lhs2tex"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -159067,7 +159771,7 @@ self: { enableSeparateDataOutput = true; executableHaskellDepends = [ base directory filepath Glob ]; description = "Compile lhs in bird style to md, html, hs"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "lhs2tex" = callPackage @@ -159102,8 +159806,8 @@ self: { base directory filepath process regex-posix ]; description = "Tool for using pdflatex with .lhs files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -159119,7 +159823,7 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "A binding to the libBF library"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "libGenI" = callPackage @@ -159136,7 +159840,7 @@ self: { ]; description = "A natural language generator (specifically, an FB-LTAG surface realiser)"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -159167,8 +159871,8 @@ self: { base bytestring criterion tar tar-conduit temporary ]; description = "Haskell interface to libarchive"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) libarchive;}; @@ -159185,7 +159889,7 @@ self: { ]; librarySystemDepends = [ archive ]; description = "Read many archive formats with libarchive and conduit"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {archive = null;}; "libconfig" = callPackage @@ -159205,8 +159909,8 @@ self: { libraryToolDepends = [ c2hs ]; testHaskellDepends = [ base doctest doctest-prop lens ]; description = "Haskell bindings to libconfig"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) libconfig;}; @@ -159227,8 +159931,8 @@ self: { base directory filepath mtl test-framework ]; description = "A library providing a parser, type checker and evaluator for CSPM"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -159241,8 +159945,8 @@ self: { libraryHaskellDepends = [ base unix ]; librarySystemDepends = [ expect tcl ]; description = "Library for interacting with console applications via pseudoterminals"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) expect; inherit (pkgs) tcl;}; @@ -159256,7 +159960,7 @@ self: { librarySystemDepends = [ ffi ]; libraryPkgconfigDepends = [ libffi ]; description = "A binding to libffi"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {ffi = null; inherit (pkgs) libffi;}; "libffi-dynamic" = callPackage @@ -159268,7 +159972,7 @@ self: { libraryHaskellDepends = [ base contravariant hashable intern ]; librarySystemDepends = [ ffi ]; description = "LibFFI interface with dynamic bidirectional type-driven binding generation"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {ffi = null;}; "libfuse3" = callPackage @@ -159292,8 +159996,8 @@ self: { ]; benchmarkHaskellDepends = [ base bytestring criterion unix ]; description = "A Haskell binding for libfuse-3.x"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) fuse3;}; @@ -159305,7 +160009,7 @@ self: { sha256 = "08km9y2wqz426c5c6r49ar5snl8ss1w7d55yqivksdkwk3fn0k0x"; libraryHaskellDepends = [ base mtl process ]; description = "Simple Git Wrapper"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "libgraph" = callPackage @@ -159322,7 +160026,7 @@ self: { array base containers monads-tf process union-find ]; description = "Store and manipulate data in a graph"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "libhbb" = callPackage @@ -159345,8 +160049,8 @@ self: { base bytestring ghc ghc-paths hspec mtl syb ]; description = "Backend for text editors to provide better Haskell editing support"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -159365,8 +160069,8 @@ self: { http-types resource-pool stm text ]; description = "libinfluxdb"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -159395,8 +160099,8 @@ self: { xml-conduit ]; description = "Jenkins API interface"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -159427,8 +160131,8 @@ self: { transformers unordered-containers uuid ]; description = "A Haskell implementation of JSON Web Token (JWT)"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -159455,8 +160159,8 @@ self: { xml-html-conduit-lens ]; description = "Lastfm API interface"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -159492,8 +160196,8 @@ self: { test-framework-th text time transformers ]; description = "Prelude based on protolude for GHC 8 and beyond"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -159507,8 +160211,8 @@ self: { base bindings-DSL enumerator mtl vector ]; description = "liblinear iteratee"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -159522,8 +160226,8 @@ self: { isExecutable = true; libraryHaskellDepends = [ base ]; description = "FFI interface to libltdl"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -159536,8 +160240,8 @@ self: { libraryHaskellDepends = [ base bytestring data-default vector ]; librarySystemDepends = [ modbus ]; description = "Haskell bindings to the C modbus library"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {modbus = null;}; @@ -159570,20 +160274,20 @@ self: { test-framework-th text time transformers ]; description = "Prelude based on protolude for GHC 8 and beyond"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; "libmpd" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers - , data-default-class, filepath, hspec, mtl, network, QuickCheck - , safe-exceptions, text, time, unix, utf8-string + , data-default-class, filepath, hspec, hspec-discover, mtl, network + , QuickCheck, safe-exceptions, text, time, unix, utf8-string }: mkDerivation { pname = "libmpd"; - version = "0.9.3.0"; - sha256 = "08bi0m7kxh2ppkabq5vsx1cwz3i1y4y7w4j0g1hi9q9raml6y0y9"; + version = "0.10.0.0"; + sha256 = "088vlir0n3wps2p5ydgyx51p41nfjcm2v02sszpyjj3c8z7f4qkh"; libraryHaskellDepends = [ attoparsec base bytestring containers data-default-class filepath mtl network safe-exceptions text time utf8-string @@ -159593,8 +160297,9 @@ self: { hspec mtl network QuickCheck safe-exceptions text time unix utf8-string ]; + testToolDepends = [ hspec-discover ]; description = "An MPD client library"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "libnix" = callPackage @@ -159612,8 +160317,8 @@ self: { base directory errors protolude tasty tasty-hunit text ]; description = "Bindings to the nix package manager"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -159626,7 +160331,7 @@ self: { libraryHaskellDepends = [ base bytestring glib gtk ]; librarySystemDepends = [ libnotify ]; description = "Bindings to libnotify library"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {inherit (pkgs) libnotify;}; "libnvvm" = callPackage @@ -159644,8 +160349,8 @@ self: { base bytestring Cabal HUnit test-framework test-framework-hunit ]; description = "FFI binding to libNVVM, a compiler SDK component from NVIDIA"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {nvvm = null;}; "liboath-hs" = callPackage @@ -159666,8 +160371,8 @@ self: { executableHaskellDepends = [ base bytestring time ]; testHaskellDepends = [ base ]; description = "Bindings to liboath"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {liboath = null; oath = null;}; @@ -159683,8 +160388,8 @@ self: { base CC-delcont containers mtl template-haskell unix ]; description = "An evolving collection of Oleg Kiselyov's Haskell modules"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -159698,8 +160403,8 @@ self: { librarySystemDepends = [ pafe ]; testHaskellDepends = [ base bytestring iconv transformers ]; description = "Wrapper for libpafe"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {pafe = null;}; @@ -159712,8 +160417,8 @@ self: { libraryHaskellDepends = [ base bytestring unix ]; librarySystemDepends = [ postgresql ]; description = "libpq binding for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) postgresql;}; @@ -159765,8 +160470,8 @@ self: { ]; testToolDepends = [ tasty-discover ]; description = "Raft consensus algorithm"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -159778,8 +160483,8 @@ self: { sha256 = "07xg59f48jw78mjbx83bz1rc2fxvdnlb08cdfd7hwkj43a127kxn"; libraryHaskellDepends = [ base bytestring curl ]; description = "Wrapper to Random.org API"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -159800,8 +160505,8 @@ self: { vector ]; description = "Bindings to the Librato API"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -159820,7 +160525,7 @@ self: { text uri-bytestring url ]; description = "Use Libravatar, the decentralized avatar delivery service"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "librdkafka" = callPackage @@ -159831,7 +160536,7 @@ self: { sha256 = "09iyvp3271l5a1idklzxdcs3wxmjxqigkn1cjjv4vk8vww6zwzkb"; doHaddock = false; description = "TBA"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "libretls" = callPackage @@ -159848,8 +160553,8 @@ self: { libraryPkgconfigDepends = [ libtls ]; testHaskellDepends = [ base containers hspec HUnit libressl ]; description = "libtls bindings"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {libressl = null; libtls = null;}; @@ -159862,7 +160567,7 @@ self: { libraryHaskellDepends = [ base split ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "Use Roman Numerals as a Numeric Datatype (sort of)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "libsodium" = callPackage @@ -159880,7 +160585,7 @@ self: { ]; testPkgconfigDepends = [ libsodium ]; description = "Low-level bindings to the libsodium C library"; - license = stdenv.lib.licenses.isc; + license = lib.licenses.isc; }) {inherit (pkgs) libsodium;}; "libssh2" = callPackage @@ -159898,8 +160603,8 @@ self: { libraryPkgconfigDepends = [ libssh2 ]; libraryToolDepends = [ c2hs ]; description = "FFI bindings to libssh2 SSH2 client library (http://libssh2.org/)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) libssh2;}; @@ -159917,8 +160622,8 @@ self: { base bytestring conduit libssh2 stm transformers ]; description = "Conduit wrappers for libssh2 FFI bindings (see libssh2 package)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -159937,7 +160642,7 @@ self: { http-conduit profunctors text ]; description = "StackExchange API interface"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "libsystemd-daemon" = callPackage @@ -159956,8 +160661,8 @@ self: { base HUnit network test-framework test-framework-hunit ]; description = "Haskell bindings for libsystemd-daemon"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; broken = true; }) {libsystemd-daemon = null; systemd-daemon = null;}; @@ -159977,7 +160682,7 @@ self: { ]; libraryPkgconfigDepends = [ systemd ]; description = "Haskell bindings to libsystemd-journal"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) systemd;}; "libtagc" = callPackage @@ -159991,8 +160696,8 @@ self: { librarySystemDepends = [ taglib ]; libraryPkgconfigDepends = [ taglib ]; description = "Binding to TagLib C library"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) taglib;}; @@ -160007,7 +160712,7 @@ self: { libraryHaskellDepends = [ base bytestring ]; libraryPkgconfigDepends = [ libtelnet ]; description = "Bindings to libtelnet"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; }) {inherit (pkgs) libtelnet;}; "libversion" = callPackage @@ -160019,7 +160724,7 @@ self: { libraryHaskellDepends = [ base bytestring ]; libraryPkgconfigDepends = [ libversion ]; description = "Haskell binding to libversion"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) libversion;}; "libvirt-hs" = callPackage @@ -160032,7 +160737,7 @@ self: { libraryPkgconfigDepends = [ libvirt ]; libraryToolDepends = [ c2hs ]; description = "FFI bindings to libvirt virtualization API (http://libvirt.org)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) libvirt;}; "libvorbis" = callPackage @@ -160043,7 +160748,7 @@ self: { sha256 = "19mx07gvwsqhbish8cbbiplgpw75birn19sl0hhn2300kpryyxfb"; libraryHaskellDepends = [ base bytestring cpu ]; description = "Haskell binding for libvorbis, for decoding Ogg Vorbis audio files"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "libxls" = callPackage @@ -160054,8 +160759,8 @@ self: { sha256 = "03klm9s27v06s65ypy6bsshnif20mprhynvqrmcw90brzmgiihf6"; libraryHaskellDepends = [ base bindings-DSL ]; description = "Bindings to libxls"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -160071,7 +160776,7 @@ self: { libraryHaskellDepends = [ base bytestring mtl ]; librarySystemDepends = [ libxml2 ]; description = "Binding to libxml2"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) libxml2;}; "libxml-enumerator" = callPackage @@ -160086,8 +160791,8 @@ self: { base bytestring enumerator libxml-sax text transformers xml-types ]; description = "Enumerator-based API for libXML's SAX interface"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -160101,7 +160806,7 @@ self: { librarySystemDepends = [ libxml2 ]; libraryPkgconfigDepends = [ libxml2 ]; description = "Bindings for the libXML2 SAX interface"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {inherit (pkgs) libxml2;}; "libxslt" = callPackage @@ -160113,8 +160818,8 @@ self: { libraryHaskellDepends = [ base bytestring libxml ]; librarySystemDepends = [ xslt ]; description = "Binding to libxslt"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {xslt = null;}; @@ -160126,7 +160831,7 @@ self: { sha256 = "1dcpbsjg6n305l07isxmavgp01lbv1qggy16acjyxjlz35pxchlg"; libraryHaskellDepends = [ base bytestring conduit resourcet ]; description = "Low-level, streaming YAML interface"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "libzfs" = callPackage @@ -160144,7 +160849,7 @@ self: { executableHaskellDepends = [ base mtl transformers ]; executableSystemDepends = [ nvpair zfs ]; description = "Bindings to libzfs, for dealing with the Z File System and Zpools"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {nvpair = null; inherit (pkgs) zfs;}; "licensor" = callPackage @@ -160164,7 +160869,7 @@ self: { base Cabal cmdargs containers directory ]; description = "A license compatibility helper"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "lie" = callPackage @@ -160178,8 +160883,8 @@ self: { libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base ]; description = "Lie Algebras"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -160194,7 +160899,7 @@ self: { enableSeparateDataOutput = true; executableHaskellDepends = [ array base GLUT OpenGL random ]; description = "Conway's Life cellular automaton"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "life-sync" = callPackage @@ -160220,7 +160925,7 @@ self: { text tomland ]; description = "Synchronize personal configs across multiple machines"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "lift-generics" = callPackage @@ -160242,7 +160947,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "GHC.Generics-based Language.Haskell.TH.Syntax.lift implementation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "lift-read-show" = callPackage @@ -160253,7 +160958,7 @@ self: { sha256 = "0sp725nflvqzxvhycjj1v9j46y4cx1vvbr9k6pfwz585n35gs1a0"; libraryHaskellDepends = [ base ]; description = "Helper methods to define `Read1`, `Read2`, `Show1`, `Show2` instances"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "lifted-async" = callPackage @@ -160274,7 +160979,7 @@ self: { ]; benchmarkHaskellDepends = [ async base criterion deepseq ]; description = "Run lifted IO operations asynchronously and wait for their results"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "lifted-base" = callPackage @@ -160295,7 +161000,7 @@ self: { base criterion monad-control monad-peel transformers ]; description = "lifted IO operations from the base library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "lifted-base-tf" = callPackage @@ -160318,8 +161023,8 @@ self: { base criterion lifted-base monad-control monad-peel transformers ]; description = "lifted IO operations from the base library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -160337,8 +161042,8 @@ self: { lifted-async lifted-base mtl safe stm text transformers ]; description = "A sensible set of defaults for writing lifted custom Preludes"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -160355,7 +161060,7 @@ self: { transformers-base transformers-compat ]; description = "STM operations lifted through monad transformer stacks"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "lifted-threads" = callPackage @@ -160370,7 +161075,7 @@ self: { base monad-control threads transformers-base ]; description = "lifted IO operations from the threads library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "lifter" = callPackage @@ -160388,8 +161093,8 @@ self: { array base bitmap bytestring directory filepath gloss mtl stb-image ]; description = "A boulderdash-like game and solution validator"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -160401,8 +161106,8 @@ self: { sha256 = "03h30lbhppi9hmpsc8fhsrsad6w9sjs9n53lz76czz3iqaknkcrb"; libraryHaskellDepends = [ base text ]; description = "Expand ligatures in unicode text"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -160414,7 +161119,7 @@ self: { sha256 = "1hxfx514ar9hr9gqzzdgd7avfvlsvr7lv6hgza5k04b2xm73ysrp"; libraryHaskellDepends = [ base ]; description = "Lightweight Implementation of Generics and Dynamics"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "light" = callPackage @@ -160428,7 +161133,7 @@ self: { libraryHaskellDepends = [ base containers gjk2d lens linear mtl ]; testHaskellDepends = [ base containers lens linear QuickCheck ]; description = "a simple physics engine"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "lightning-haskell" = callPackage @@ -160449,8 +161154,8 @@ self: { aeson api-builder base bytestring hspec text transformers ]; description = "Haskell client for lightning-viz REST API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -160482,8 +161187,8 @@ self: { ]; testToolDepends = [ tasty-discover ]; description = "LightStep OpenTracing client library"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -160500,8 +161205,8 @@ self: { ]; libraryToolDepends = [ alex happy ]; description = "Lighttpd configuration file tools"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -160518,8 +161223,8 @@ self: { template-haskell ]; description = "A QuasiQuoter for lighttpd configuration files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -160536,8 +161241,8 @@ self: { prettify process semigroups vector-space ]; description = "Bindings to Lilypond"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -160554,7 +161259,7 @@ self: { base containers QuickCheck tasty tasty-quickcheck tasty-th ]; description = "representation of Integer Linear Programs"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "limp-cbc" = callPackage @@ -160571,8 +161276,8 @@ self: { base limp QuickCheck tasty tasty-quickcheck ]; description = "bindings for integer linear programming solver Coin/CBC"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -160584,7 +161289,7 @@ self: { sha256 = "0yfw2m1l7240xir3qa8i11c5q7appaji4kgcjyhdc0rz6p3j55iy"; libraryHaskellDepends = [ base NumInstances vector ]; description = "Low-dimensional matrices and vectors for graphics and physics"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "linda" = callPackage @@ -160595,8 +161300,8 @@ self: { sha256 = "0d58i69hvry9vzr4i7f1yhhm99808vqw238hfjc3sr51plc1is45"; libraryHaskellDepends = [ base hmatrix HUnit ]; description = "LINear Discriminant Analysis"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -160626,8 +161331,8 @@ self: { base containers hashable mtl random-fu rosezipper text uuid warp ]; description = "Zen gardening, based on l-systems"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -160639,7 +161344,7 @@ self: { sha256 = "07gz4lbvyzahffcp6f1f87zl20kf834iswh671vb8vxffigrz5y1"; libraryHaskellDepends = [ base ]; description = "L-systems in Haskell"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "line" = callPackage @@ -160662,7 +161367,7 @@ self: { text time transformers ]; description = "Haskell SDK for the LINE API"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "line-bot-sdk" = callPackage @@ -160696,8 +161401,8 @@ self: { servant-client-core servant-server text time transformers wai warp ]; description = "Haskell SDK for LINE Messaging API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -160711,7 +161416,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base ]; description = "Convert newlines in text"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "line-drawing" = callPackage @@ -160723,8 +161428,8 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "raster line drawing"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -160738,7 +161443,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base ]; description = "Display the number of bytes of each line"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "line2pdf" = callPackage @@ -160752,7 +161457,7 @@ self: { libraryHaskellDepends = [ base bytestring containers ]; executableHaskellDepends = [ base bytestring containers ]; description = "Simple command-line utility to convert text into PDF"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "linear" = callPackage @@ -160768,6 +161473,8 @@ self: { pname = "linear"; version = "1.21.3"; sha256 = "12gn571cfchrj9zir30c86vib3ppjia5908di21pnsfy6dmw6994"; + revision = "1"; + editedCabalFile = "17cbb44yyfcxz9fybv05yxli8gdfka415dwrp7vh804q7qxs5vna"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ adjunctions base base-orphans binary bytes cereal containers @@ -160780,7 +161487,34 @@ self: { simple-reflect test-framework test-framework-hunit vector ]; description = "Linear Algebra"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; + }) {}; + + "linear_1_21_4" = callPackage + ({ mkDerivation, adjunctions, base, base-orphans, binary, bytes + , bytestring, cereal, containers, deepseq, distributive, ghc-prim + , hashable, HUnit, lens, random, reflection, semigroupoids + , semigroups, simple-reflect, tagged, template-haskell + , test-framework, test-framework-hunit, transformers + , transformers-compat, unordered-containers, vector, void + }: + mkDerivation { + pname = "linear"; + version = "1.21.4"; + sha256 = "019dsw4xqcmz8g0hanc3xsl0k1pqzxkhp9jz1sf12mqsgs6jj0zr"; + libraryHaskellDepends = [ + adjunctions base base-orphans binary bytes cereal containers + deepseq distributive ghc-prim hashable lens random reflection + semigroupoids semigroups tagged template-haskell transformers + transformers-compat unordered-containers vector void + ]; + testHaskellDepends = [ + base binary bytestring deepseq HUnit reflection simple-reflect + test-framework test-framework-hunit vector + ]; + description = "Linear Algebra"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "linear-accelerate" = callPackage @@ -160797,7 +161531,7 @@ self: { ]; testHaskellDepends = [ base doctest ]; description = "Lifting linear vector spaces into Accelerate"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "linear-algebra-cblas" = callPackage @@ -160817,8 +161551,8 @@ self: { QuickCheck test-framework test-framework-quickcheck2 ]; description = "A linear algebra library with bindings to BLAS and LAPACK"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -160840,8 +161574,8 @@ self: { utility-ht ]; description = "Compute resistance of linear electrical circuits"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -160867,8 +161601,8 @@ self: { tasty-smallcheck ]; description = "A simple library for linear codes (coding theory, error correction)"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -160881,7 +161615,7 @@ self: { libraryHaskellDepends = [ base containers QuickCheck ]; testHaskellDepends = [ base containers hspec QuickCheck ]; description = "A simple grammar for building linear equations and inclusive inequalities"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "linear-maps" = callPackage @@ -160895,8 +161629,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers HUnit ]; description = "Finite maps for linear use"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -160912,8 +161646,8 @@ self: { base distributive lens linear OpenGL OpenGLRaw tagged ]; description = "Isomorphisms between linear and OpenGL types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -160926,7 +161660,7 @@ self: { libraryHaskellDepends = [ base bytestring network ]; testHaskellDepends = [ base hspec network tasty-hspec ]; description = "Typed sockets"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "linear-tests" = callPackage @@ -160941,7 +161675,7 @@ self: { base hspec hspec-core lens linear QuickCheck ]; description = "Linear Algebra"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "linear-vect" = callPackage @@ -160952,8 +161686,8 @@ self: { sha256 = "0i6z10pgqcykkygl6kq63phx5hvwi2d84j2f5vw4nrnic59sm9jy"; libraryHaskellDepends = [ base random ]; description = "A low-dimensional linear algebra library, operating on the Num typeclass"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -160965,7 +161699,7 @@ self: { sha256 = "0lrrgix4m2sbfw9ydcqnx45lka0grl8ndiiy3cs1xg4xpcy2fkjw"; libraryHaskellDepends = [ base sbv ]; description = "Use SMT solvers to solve linear systems over integers and rationals"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "linearmap-category" = callPackage @@ -160984,8 +161718,8 @@ self: { semigroups tagged transformers vector vector-space ]; description = "Native, complete, matrix-free linear algebra"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -160999,8 +161733,8 @@ self: { base containers ghc-prim mtl transformers ]; description = "Linear scan register allocator, formally verified in Coq"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -161021,8 +161755,8 @@ self: { lens-family-core linearscan QuickCheck transformers ]; description = "Makes it easy to use the linearscan register allocator with Hoopl"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -161034,7 +161768,7 @@ self: { sha256 = "1fds2mgsijfsc96dq95skn562iv2r341zr7v0qsz48y9fh97s3p7"; libraryHaskellDepends = [ base hyphenation ]; description = "breaks strings to fit width"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "linenoise" = callPackage @@ -161054,7 +161788,7 @@ self: { base bytestring exceptions mtl text unliftio-core ]; description = "A lightweight readline-replacement library for Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "lines-of-action" = callPackage @@ -161065,8 +161799,8 @@ self: { sha256 = "1sikhdahhxqi9i285zphbpnz60vyxjdhvz2qd70hmy7x3ckymb42"; libraryHaskellDepends = [ base containers mtl safe ]; description = "Lines of Action, 2-player strategy board game"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -161089,7 +161823,7 @@ self: { ]; testHaskellDepends = [ base hspec ]; description = "File extension based programming language detection"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "linguistic-ordinals" = callPackage @@ -161100,7 +161834,7 @@ self: { sha256 = "11f01j9qak8rhaj84gkx27qhfc334cj9pchi7qcb6brpqbwgdsik"; libraryHaskellDepends = [ base text ]; description = "Express Integral types as linguistic ordinals (1st, 2nd, 3rd, etc)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "link-relations" = callPackage @@ -161115,7 +161849,7 @@ self: { base bytestring hashable unordered-containers uri-bytestring ]; description = "Use web link relation types (RFC 5988) in Haskell"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "linkchk" = callPackage @@ -161133,7 +161867,7 @@ self: { ]; description = "linkchk is a network interface link ping monitor"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -161150,8 +161884,8 @@ self: { base containers extcore filepath process ]; description = "Combines multiple GHC Core modules into a single module"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -161164,8 +161898,8 @@ self: { libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base ]; description = "A pure linked list which is mutable through iterators"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -161188,8 +161922,8 @@ self: { base containers criterion deepseq hashable unordered-containers ]; description = "Persistent LinkedHashMap data structure"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -161212,8 +161946,8 @@ self: { uri-bytestring wai wreq ]; description = "A Haskell library for the Slack API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -161240,8 +161974,8 @@ self: { uri-encode wai warp ]; description = "Lightweight library for building HTTP API"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -161259,8 +161993,8 @@ self: { quickcheck-instances text ]; description = "Aeson JSON support for Linnet"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -161281,8 +162015,8 @@ self: { quickcheck-classes quickcheck-instances wai warp ]; description = "Conduit-backed support for streaming in Linnet"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -161304,8 +162038,8 @@ self: { text ]; description = "Bindings to the Linode API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -161322,8 +162056,8 @@ self: { ]; testHaskellDepends = [ base hspec ]; description = "Haskell wrapper for the Linode v4 API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -161340,8 +162074,8 @@ self: { ]; libraryPkgconfigDepends = [ blkid ]; description = "Linux libblkid"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; broken = true; }) {blkid = null;}; @@ -161353,8 +162087,8 @@ self: { sha256 = "0dd1ii1n6y9frilnkxikzahp9xrh3i334i7syvd8fyxp51dpzgy1"; libraryHaskellDepends = [ base filepath ]; description = "Very basic interface to the Linux CGroup Virtual Filesystem"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -161368,7 +162102,7 @@ self: { editedCabalFile = "1gnjyc8q7xq60pm362hwibwh97jw8pv66xvqv88cm9nbh0ccf6q2"; libraryHaskellDepends = [ base bytestring time unix ]; description = "Bindings to Linux evdev input device interface"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "linux-file-extents" = callPackage @@ -161381,7 +162115,7 @@ self: { isExecutable = true; libraryHaskellDepends = [ base unix ]; description = "Retrieve file fragmentation information under Linux"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "linux-framebuffer" = callPackage @@ -161393,7 +162127,7 @@ self: { libraryHaskellDepends = [ base bindings-DSL unix ]; description = "Linux fbdev (framebuffer device, /dev/fbX) utility functions"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "linux-inotify" = callPackage @@ -161404,7 +162138,7 @@ self: { sha256 = "1dl71xkfjlwjsmv0mqf2fpkfjl3hyzk5q1drsykg7rdblpjfbzlc"; libraryHaskellDepends = [ base bytestring hashable unix ]; description = "Thinner binding to the Linux Kernel's inotify interface"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "linux-kmod" = callPackage @@ -161416,8 +162150,8 @@ self: { libraryHaskellDepends = [ base directory ]; libraryPkgconfigDepends = [ libkmod ]; description = "Linux kernel modules support"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {libkmod = null;}; @@ -161429,7 +162163,7 @@ self: { sha256 = "12bwrniaxg6gm347jdgbf535pdz4z57pkyiwa98c903y9q9ssnyi"; libraryHaskellDepends = [ base bytestring ]; description = "Mount and unmount filesystems"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "linux-namespaces" = callPackage @@ -161440,7 +162174,7 @@ self: { sha256 = "1rvkzfmd07sz46k059ly80cjgwx67igfw8zsw8c6ljsp3hsdn4hl"; libraryHaskellDepends = [ base bytestring unix ]; description = "Work with linux namespaces: create new or enter existing ones"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "linux-perf" = callPackage @@ -161462,8 +162196,8 @@ self: { unix ]; description = "Read files generated by perf on Linux"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -161481,8 +162215,8 @@ self: { base bytestring mmap posix-waitpid process template-haskell unix ]; description = "Wrapping of Linux' ptrace(2)"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -161494,7 +162228,7 @@ self: { sha256 = "0rpq5sm557gm227id2rfsffgr47lrj4d4kpzh194d74dx2qkg5g6"; libraryHaskellDepends = [ base bytestring ]; description = "Read, set and list extended attributes"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "linx-gateway" = callPackage @@ -161514,8 +162248,8 @@ self: { test-framework-quickcheck2 ]; description = "Implementation of the Enea LINX gateway protocol"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -161527,7 +162261,7 @@ self: { sha256 = "04hcbvxskjji04sxx4jydac62sh6h7jlggn7kfwm8axmwjczjjqs"; libraryHaskellDepends = [ base bytestring containers hashable ]; description = "Labeled IO Information Flow Control Library"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "lio-eci11" = callPackage @@ -161544,7 +162278,7 @@ self: { ]; description = "Labeled IO library"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -161561,7 +162295,7 @@ self: { ]; description = "Labeled File System interface for LIO"; license = "GPL"; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ]; }) {}; "lio-simple" = callPackage @@ -161585,8 +162319,8 @@ self: { simple-templates text ]; description = "LIO support for the Simple web framework"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -161598,8 +162332,8 @@ self: { sha256 = "07bkxv6cmjf75jy31gbzs4nkjlynhkg8qv2idl71xilgzpnalk3c"; libraryHaskellDepends = [ base QuickCheck ]; description = "Generators for random sequences of English-like nonsense text"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -161624,8 +162358,8 @@ self: { ]; benchmarkHaskellDepends = [ aeson attoparsec base criterion text ]; description = "Liquid template language library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -161639,8 +162373,8 @@ self: { setupHaskellDepends = [ base Cabal liquidhaskell ]; libraryHaskellDepends = [ base liquid-ghc-prim liquidhaskell ]; description = "Drop-in base replacement for LiquidHaskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -161656,8 +162390,8 @@ self: { setupHaskellDepends = [ base Cabal liquidhaskell ]; libraryHaskellDepends = [ bytestring liquid-base liquidhaskell ]; description = "LiquidHaskell specs for the bytestring package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -161673,8 +162407,8 @@ self: { setupHaskellDepends = [ base Cabal liquidhaskell ]; libraryHaskellDepends = [ containers liquid-base liquidhaskell ]; description = "LiquidHaskell specs for the containers package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -161708,7 +162442,7 @@ self: { testSystemDepends = [ git nettools z3 ]; doCheck = false; description = "Predicate Abstraction-based Horn-Clause/Implication Constraint Solver"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) git; inherit (pkgs) nettools; inherit (pkgs) ocaml; inherit (pkgs) z3;}; @@ -161722,8 +162456,8 @@ self: { setupHaskellDepends = [ base Cabal liquidhaskell ]; libraryHaskellDepends = [ ghc-prim liquidhaskell ]; description = "Drop-in ghc-prim replacement for LiquidHaskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -161738,8 +162472,8 @@ self: { setupHaskellDepends = [ base Cabal liquidhaskell ]; libraryHaskellDepends = [ liquid-base liquidhaskell parallel ]; description = "LiquidHaskell specs for the parallel package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -161759,8 +162493,8 @@ self: { liquid-prelude liquid-vector liquidhaskell process ]; description = "A battery-included platform for LiquidHaskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -161777,8 +162511,8 @@ self: { bytestring containers liquid-base liquidhaskell ]; description = "General utility modules for LiquidHaskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -161792,8 +162526,8 @@ self: { setupHaskellDepends = [ base Cabal liquidhaskell ]; libraryHaskellDepends = [ liquid-base liquidhaskell vector ]; description = "LiquidHaskell specs for the vector package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -161834,7 +162568,7 @@ self: { ]; testSystemDepends = [ z3 ]; description = "Liquid Types for Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) z3;}; "liquidhaskell-cabal" = callPackage @@ -161847,8 +162581,8 @@ self: { editedCabalFile = "0c76lchw32dzfn8q4qckxqjzcnw909x7niiwlzadas8mv9p93ybl"; libraryHaskellDepends = [ base Cabal directory filepath ]; description = "Liquid Haskell integration for Cabal and Stack"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -161865,7 +162599,7 @@ self: { executableHaskellDepends = [ base liquidhaskell-cabal ]; description = "Demo of Liquid Haskell integration for Cabal and Stack"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "lispparser" = callPackage @@ -161876,7 +162610,7 @@ self: { sha256 = "1hj5fwmzxp2gw2gx86wa1fy36jmmh3sf8kd4acc8x0rghpmlw0w8"; libraryHaskellDepends = [ base parsec ]; description = "Simple parser for LISP S-expressions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "list-duplicate" = callPackage @@ -161888,7 +162622,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "Group and delete duplicates from a list"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "list-extras" = callPackage @@ -161899,7 +162633,7 @@ self: { sha256 = "15vjk6y3zwiffm1x8wlzv6203ykzm2phalqlq4zhmhcj2wd70viw"; libraryHaskellDepends = [ base ]; description = "Common not-so-common functions for lists"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "list-filter" = callPackage @@ -161911,7 +162645,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "Special takes and drops on lists"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "list-fusion-probe" = callPackage @@ -161923,8 +162657,8 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "testing list fusion for success"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -161936,7 +162670,7 @@ self: { sha256 = "0w9f68cr4k0p8zl81y8ax19i6ypzks0y27hdlz71wwmgn5v2y63l"; libraryHaskellDepends = [ base ]; description = "Functions for grouping a list into sublists"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "list-mux" = callPackage @@ -161947,8 +162681,8 @@ self: { sha256 = "147zb156g79a5p1w0b9vcvjy5x7nsrhng5rgjqq3cy3xpbam4nys"; libraryHaskellDepends = [ base ]; description = "List Multiplexing"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -161961,7 +162695,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "Predicates on lists"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "list-prompt" = callPackage @@ -161981,8 +162715,8 @@ self: { ansi-terminal base data-default hspec stm terminal-size vty ]; description = "A simple list prompt UI for the terminal"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -162009,8 +162743,8 @@ self: { MissingH tasty tasty-hunit tasty-quickcheck ]; description = "List all remote forwards for mail accounts stored in a SQL database"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -162022,7 +162756,7 @@ self: { sha256 = "0mb2kwj3gvykwh0iywwzqdnma27nxs1hl1rvnp3qxi893p4ikyiw"; libraryHaskellDepends = [ base ]; description = "Easily and clearly create lists with only one element in them"; - license = stdenv.lib.licenses.isc; + license = lib.licenses.isc; }) {}; "list-t" = callPackage @@ -162038,7 +162772,7 @@ self: { ]; testHaskellDepends = [ base-prelude HTF mmorph mtl-prelude ]; description = "ListT done right"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "list-t-attoparsec" = callPackage @@ -162056,8 +162790,8 @@ self: { attoparsec base-prelude either hspec list-t list-t-text text ]; description = "An \"attoparsec\" adapter for \"list-t\""; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -162081,8 +162815,8 @@ self: { list-t-attoparsec list-t-text text xml-types ]; description = "Streaming HTML parser"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -162098,8 +162832,8 @@ self: { base-prelude bytestring http-client list-t mtl-prelude ]; description = "A streaming HTTP client"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -162116,7 +162850,7 @@ self: { resource-pool stm ]; description = "A \"libcurl\"-based streaming HTTP client"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "list-t-text" = callPackage @@ -162135,8 +162869,8 @@ self: { quickcheck-instances text transformers ]; description = "A streaming text codec"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -162149,7 +162883,7 @@ self: { libraryHaskellDepends = [ base mtl ]; testHaskellDepends = [ base doctest ]; description = "List monad transformer"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "list-tries" = callPackage @@ -162167,7 +162901,7 @@ self: { test-framework test-framework-hunit test-framework-quickcheck2 ]; description = "Tries and Patricia tries: finite sets and maps for list keys"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "list-tuple" = callPackage @@ -162186,7 +162920,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "List-like operations for tuples"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "list-witnesses" = callPackage @@ -162202,8 +162936,8 @@ self: { vinyl ]; description = "Witnesses for working with type-level lists"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -162215,8 +162949,8 @@ self: { sha256 = "0sklydccvdbxnj0c79lj7pcvw5v0bkycs9zp566gdcfy08qcjq79"; libraryHaskellDepends = [ base ]; description = "Provides zips with default values"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -162239,8 +162973,8 @@ self: { tasty-hedgehog tasty-hunit tasty-quickcheck transformers ]; description = "A list zipper"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -162258,8 +162992,8 @@ self: { servant servant-client text time transformers ]; description = "A client library to the ListenBrainz project"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -162271,8 +163005,8 @@ self: { sha256 = "0mkhnqn7wxspzxvivhaksxmxp7d6x9bazhl28nl9gck56bpa90sm"; libraryHaskellDepends = [ base bytestring ListLike text vector ]; description = "Extra instances of the ListLike class"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -162284,7 +163018,7 @@ self: { sha256 = "0qjziksh6gl6v8rzvqajkcbakbby5j3i4z2jk6w6zs89b93rwnln"; libraryHaskellDepends = [ base list-extras split ]; description = "Functions for dealing with lists"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "lists-flines" = callPackage @@ -162295,7 +163029,7 @@ self: { sha256 = "0srpivpf43xn0zj64phq90hkrchjih92sxx984c5zx9nrrcvyxwf"; libraryHaskellDepends = [ base ]; description = "Additional data and structures to some 'String'-related lists"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "listsafe" = callPackage @@ -162306,7 +163040,7 @@ self: { sha256 = "0scd74fv6gzl7yi5ssb1z9kwwfyx9p39yqprnzbpvspvxm3k41qs"; libraryHaskellDepends = [ base exceptions ]; description = "Safe wrappers for partial list functions, supporting MonadThrow"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "liszt" = callPackage @@ -162341,8 +163075,8 @@ self: { vector vector-th-unbox winery ]; description = "Append only key-list database"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -162363,7 +163097,7 @@ self: { ]; description = "A simple tool for literate programming"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -162375,8 +163109,8 @@ self: { sha256 = "06n4svp0qss78l8827qmppmd63877wq01d6w9xagd10vn3c4hs2j"; libraryHaskellDepends = [ base ]; description = "Non-overloaded functions for concrete literals"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -162396,8 +163130,8 @@ self: { unliftio-core ]; description = "Basic logging based on co-log"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -162414,7 +163148,7 @@ self: { resourcet unliftio-core ]; description = "When you need just the RIO monad"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "live-sequencer" = callPackage @@ -162442,7 +163176,7 @@ self: { ]; description = "Live coding of MIDI music"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -162465,8 +163199,8 @@ self: { ]; executableHaskellDepends = [ base mvc pipes ]; description = "Liveplotting"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {andromeda = null;}; @@ -162478,8 +163212,8 @@ self: { sha256 = "0393ccnlink30492aw1gyv4jzd7rsckd8ymkm1wgbpma13vkf67h"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ picosat ]; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) picosat;}; @@ -162491,7 +163225,7 @@ self: { sha256 = "057bp1f1mpzlgg408b02x1bdzsixrrkcl1536nyvhp43rvxmgj61"; libraryHaskellDepends = [ base ]; description = "Purely functional sets and heaps"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "llsd" = callPackage @@ -162511,8 +163245,8 @@ self: { time utf8-string uuid ]; description = "An implementation of the LLSD data system"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -162529,8 +163263,8 @@ self: { type-level ]; description = "Bindings to the LLVM compiler toolkit"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -162558,8 +163292,8 @@ self: { llvm-data-interop transformers uniplate unordered-containers ]; description = "A Haskell library for analyzing LLVM bitcode"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -162571,8 +163305,8 @@ self: { sha256 = "1f76nb85hnidp06v6lbl4aasac4h7ff9r8i054m8cnby2vc59r4n"; libraryHaskellDepends = [ base mtl ]; description = "FFI bindings to the LLVM compiler toolkit"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -162593,8 +163327,8 @@ self: { ]; libraryToolDepends = [ c2hs ]; description = "The base types for a mostly pure Haskell LLVM analysis library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -162606,8 +163340,8 @@ self: { sha256 = "07q6dvwkg7h6qkwq0a7719g82anipj2pk0xid5p24pvzssa9z22w"; libraryHaskellDepends = [ base llvm-base ]; description = "Utilities for bindings to the LLVM compiler toolkit"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -162628,8 +163362,8 @@ self: { ]; libraryToolDepends = [ c2hs ]; description = "A low-level data interoperability binding for LLVM"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -162647,8 +163381,8 @@ self: { storable-enum storable-record tfp transformers utility-ht ]; description = "Support for writing an EDSL with LLVM-JIT as target"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -162667,8 +163401,8 @@ self: { tfp transformers unsafe utility-ht ]; description = "Processor specific intrinsics for the llvm interface"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -162694,8 +163428,8 @@ self: { ]; doHaddock = false; description = "Utility functions for the llvm interface"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -162710,8 +163444,8 @@ self: { libraryHaskellDepends = [ base enumset ]; librarySystemDepends = [ LLVM ]; description = "FFI bindings to the LLVM compiler toolkit"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {LLVM = null;}; @@ -162729,8 +163463,8 @@ self: { base bytestring containers regex-posix utility-ht ]; description = "Tools for maintaining the llvm-ffi package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -162757,8 +163491,8 @@ self: { transformers transformers-compat ]; description = "General purpose LLVM bindings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {llvm-config = null;}; @@ -162779,8 +163513,8 @@ self: { test-framework-hunit test-framework-quickcheck2 ]; description = "Pure Haskell LLVM functionality (no FFI)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -162804,8 +163538,8 @@ self: { base containers HUnit llvm-general-pure tasty tasty-hunit ]; description = "QuasiQuoting llvm code for llvm-general"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -162832,7 +163566,7 @@ self: { transformers ]; description = "General purpose LLVM bindings"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {llvm-config = null;}; "llvm-hs-pretty" = callPackage @@ -162852,7 +163586,7 @@ self: { tasty-hspec tasty-hunit text transformers ]; description = "A pretty printer for LLVM IR"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "llvm-hs-pure" = callPackage @@ -162872,7 +163606,7 @@ self: { base containers mtl tasty tasty-hunit tasty-quickcheck transformers ]; description = "Pure Haskell LLVM functionality (no FFI)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "llvm-ht" = callPackage @@ -162887,8 +163621,8 @@ self: { base bytestring directory mtl process type-level ]; description = "Bindings to the LLVM compiler toolkit with some custom extensions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -162907,8 +163641,8 @@ self: { base Cabal explicit-exception process transformers utility-ht ]; description = "Generate Pkg-Config configuration file for LLVM"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -162925,8 +163659,8 @@ self: { template-haskell th-abstraction ]; description = "A pretty printing library inspired by the llvm binding"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -162953,8 +163687,8 @@ self: { base bytestring directory filepath llvm-pretty process ]; description = "LLVM bitcode parsing library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -162976,8 +163710,8 @@ self: { testHaskellDepends = [ base QuickCheck tfp utility-ht ]; doHaddock = false; description = "Bindings to the LLVM compiler toolkit using type families"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -163005,8 +163739,8 @@ self: { process-conduit unordered-containers ]; description = "Useful tools built on llvm-analysis"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -163019,7 +163753,7 @@ self: { libraryHaskellDepends = [ array base ]; librarySystemDepends = [ lmdb ]; description = "Lightning MDB bindings"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }) {inherit (pkgs) lmdb;}; "lmdb-high-level" = callPackage @@ -163041,7 +163775,7 @@ self: { test-framework test-framework-hunit test-framework-quickcheck2 text ]; description = "Higher level API for working with LMDB"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "lmdb-simple" = callPackage @@ -163056,7 +163790,7 @@ self: { testHaskellDepends = [ base hspec QuickCheck ]; benchmarkHaskellDepends = [ base criterion ]; description = "Simple API for LMDB"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "lmonad" = callPackage @@ -163076,8 +163810,8 @@ self: { transformers-base ]; description = "LMonad is an Information Flow Control (IFC) framework for Haskell applications"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -163098,8 +163832,8 @@ self: { yesod-persistent ]; description = "LMonad for Yesod integrates LMonad's IFC with Yesod web applications"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -163111,8 +163845,8 @@ self: { sha256 = "1vszir1b79fdn545k3k86mgqhivyg8s5vv5v24y4cp4cc47aiwmi"; libraryHaskellDepends = [ base containers hslogger PSQueue stm ]; description = "Client-side load balancing utilities"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -163129,7 +163863,7 @@ self: { base directory doctest hspec parsec temporary ]; description = "Load environment variables from a file"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "load-font" = callPackage @@ -163145,8 +163879,8 @@ self: { libraryHaskellDepends = [ base ]; libraryToolDepends = [ c2hs ]; description = "A cross platform library for loading bundled fonts into your application"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -163158,7 +163892,7 @@ self: { sha256 = "13q2yxqyzkh099jwz32plmdc71p4w2gkajx5bbi3fkvl2gylqlk6"; libraryHaskellDepends = [ base ]; description = "Load average parsing from /proc/loadavg and bindings to getloadavg (3)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "loc" = callPackage @@ -163170,7 +163904,7 @@ self: { libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers doctest hedgehog ]; description = "Types representing line and column positions and ranges in text files"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "loc-test" = callPackage @@ -163181,7 +163915,7 @@ self: { sha256 = "0jg6p0lfd5xgrwbmlskj5f1x8l5b0b3dqh460ds2nii8isccgvcq"; libraryHaskellDepends = [ base containers hedgehog loc ]; description = "Test-related utilities related to the /loc/ package"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "local-address" = callPackage @@ -163192,8 +163926,8 @@ self: { sha256 = "1846lhs0jc8finxcp1hfgifzs7hwzzxvmmv03laxzl63p5h2k8x9"; libraryHaskellDepends = [ base network ]; description = "Functions to get local interface address"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -163211,7 +163945,7 @@ self: { ]; description = "Generalised local search within Haskell, for applications in combinatorial optimisation"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -163223,7 +163957,7 @@ self: { sha256 = "1172rmrk5xgqsy9igg9bspbybvhmbpakvjijn6gnp715a01gfadd"; libraryHaskellDepends = [ base containers text transformers ]; description = "Library for localization (l10n)"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "localize" = callPackage @@ -163241,8 +163975,8 @@ self: { transformers ]; description = "GNU Gettext-based messages localization library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -163254,8 +163988,8 @@ self: { sha256 = "15mkhpp2r9l94qkqdxfc0llw9nbxcj8n3a70qs5lmv416a1i4qk2"; libraryHaskellDepends = [ base text ]; description = "Source location helpers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -163268,8 +164002,8 @@ self: { libraryHaskellDepends = [ base ]; benchmarkHaskellDepends = [ base criterion ]; description = "Location-aware variants of partial functions"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ gridaphobe ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ gridaphobe ]; }) {}; "located-monad-logger" = callPackage @@ -163280,8 +164014,8 @@ self: { sha256 = "1xkckg3qgqrqmkli9d6cbzqf5aanqpbxchy650yflpjygwapn4xn"; libraryHaskellDepends = [ base monad-logger text ]; description = "Location-aware logging without Template Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -163300,7 +164034,7 @@ self: { base bytestring containers cryptonite hspec HUnit QuickCheck ]; description = "Human exchangable identifiers and locators"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "loch" = callPackage @@ -163314,8 +164048,8 @@ self: { libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base ]; description = "Support for precise error locations in source files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -163327,7 +164061,7 @@ self: { sha256 = "1hvdkcyrlnv65q8x8h0441x30wr9bbfbg3961xd3fy9an5r961fc"; libraryHaskellDepends = [ base pretty template-haskell ]; description = "Support for precise error locations in source files (Template Haskell version)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "lock-file" = callPackage @@ -163347,7 +164081,7 @@ self: { test-framework test-framework-hunit test-framework-quickcheck2 ]; description = "Provide exclusive access to a resource using lock file"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "locked-poll" = callPackage @@ -163368,8 +164102,8 @@ self: { regex-genex tasty tasty-golden tasty-hunit tasty-quickcheck time ]; description = "Very simple poll lock"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -163390,7 +164124,7 @@ self: { ghc-prim HUnit test-framework test-framework-hunit ]; description = "Michael and Scott lock-free queues"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "lockpool" = callPackage @@ -163401,7 +164135,7 @@ self: { sha256 = "004lipzc3rbvixhmx4ssngmpsp3pcrdd1hw9byqmi0jp4xm17xxi"; libraryHaskellDepends = [ base clock stm ]; description = "set a maximum on the number of concurrent actions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "log" = callPackage @@ -163427,8 +164161,8 @@ self: { transformers-base ]; description = "Structured logging solution with multiple backends"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -163448,7 +164182,7 @@ self: { transformers-base unliftio-core unordered-containers ]; description = "Structured logging solution (base package)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "log-domain" = callPackage @@ -163471,7 +164205,7 @@ self: { base doctest generic-deriving semigroups simple-reflect ]; description = "Log-domain arithmetic"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "log-effect" = callPackage @@ -163493,7 +164227,7 @@ self: { transformers-base ]; description = "An extensible log effect using extensible-effects"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "log-effect-syslog" = callPackage @@ -163509,7 +164243,7 @@ self: { transformers-base ]; description = "Syslog functions for log-effect"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "log-elasticsearch" = callPackage @@ -163529,7 +164263,7 @@ self: { vector ]; description = "Structured logging solution (Elasticsearch back end)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "log-postgres" = callPackage @@ -163550,8 +164284,8 @@ self: { text-show time unordered-containers vector ]; description = "Structured logging solution (PostgreSQL back end)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -163574,8 +164308,8 @@ self: { unjson vector wai warp ]; description = "Utils for working with logs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -163611,8 +164345,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Flexible, configurable, monadic and pretty logging"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -163627,7 +164361,7 @@ self: { executableHaskellDepends = [ base containers json parsec ]; description = "Turn log file records into JSON"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -163658,8 +164392,8 @@ self: { time vformat vformat-aeson vformat-time yaml ]; description = "A python logging style log library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -163679,8 +164413,8 @@ self: { base bytestring fast-logger hspec uuid-types ]; description = "Request logger middleware for Logentries"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -163692,7 +164426,7 @@ self: { sha256 = "10kza99pzs0ajn6xqd66sm059xp43i2sl0mnd8257q1av1qvsx7p"; libraryHaskellDepends = [ array base ]; description = "Log-domain floating point numbers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "logger" = callPackage @@ -163709,8 +164443,8 @@ self: { time-locale-compat transformers transformers-compat unagi-chan ]; description = "Fast & extensible logging framework"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -163729,7 +164463,7 @@ self: { ]; executableHaskellDepends = [ base protolude stm ]; description = "Run FastLogger in a thread and direct all queued messages to it"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "logging" = callPackage @@ -163747,7 +164481,7 @@ self: { ]; testHaskellDepends = [ base hspec unix ]; description = "Simplified logging in IO for application writers"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "logging-effect" = callPackage @@ -163770,7 +164504,7 @@ self: { prettyprinter text time ]; description = "A mtl-style monad transformer for general purpose & compositional logging"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "logging-effect-extra" = callPackage @@ -163789,8 +164523,8 @@ self: { ]; executableHaskellDepends = [ base ]; description = "Supplemental packages for `logging-effect`"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -163809,8 +164543,8 @@ self: { ]; executableHaskellDepends = [ base logging-effect prettyprinter ]; description = "TH splices to augment log messages with file info"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -163829,8 +164563,8 @@ self: { ]; executableHaskellDepends = [ base logging-effect prettyprinter ]; description = "Handy logging handler combinators"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -163843,7 +164577,7 @@ self: { libraryHaskellDepends = [ base call-stack transformers ]; testHaskellDepends = [ base hspec ]; description = "Simple logging abstraction that allows multiple back-ends"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "logging-facade-journald" = callPackage @@ -163862,7 +164596,7 @@ self: { unordered-containers ]; description = "Journald back-end for logging-facade"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "logging-facade-syslog" = callPackage @@ -163873,8 +164607,8 @@ self: { sha256 = "1acfkmr3cgprij9sfa0hfqyni6s8py22s3n0xa8qhy3syz1j72zb"; libraryHaskellDepends = [ base hsyslog logging-facade ]; description = "A logging back-end to syslog(3) for the logging-facade library"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ peti ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ peti ]; }) {}; "logic-TPTP" = callPackage @@ -163921,8 +164655,8 @@ self: { PropLogic safe set-extra syb ]; description = "Framework for propositional and first order logic, theorem proving"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -163934,21 +164668,38 @@ self: { sha256 = "061x6g92334m2776xclh8mcbjind3l595pggc0g7yi4qzs31zbdc"; libraryHaskellDepends = [ base logict transformers ]; description = "Backtracking mutable references in the ST and IO monads"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; - "logict" = callPackage + "logict_0_7_0_3" = callPackage ({ mkDerivation, base, mtl, tasty, tasty-hunit }: mkDerivation { pname = "logict"; version = "0.7.0.3"; sha256 = "0psihirap7mrn3ly1h9dvgvgjsqbqwji8m13fm48zl205mpfh73r"; + revision = "1"; + editedCabalFile = "13hxmzaxd5iv9hjad5kw9infq0lxsgypqqb2z1i1939604a90qp4"; libraryHaskellDepends = [ base mtl ]; testHaskellDepends = [ base mtl tasty tasty-hunit ]; description = "A backtracking logic-programming monad"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "logict" = callPackage + ({ mkDerivation, async, base, mtl, tasty, tasty-hunit }: + mkDerivation { + pname = "logict"; + version = "0.7.1.0"; + sha256 = "1d22b7r8lnak5k8ars166cxbk1lv7gf8g0qs604irsx2s474ybi7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base mtl ]; + testHaskellDepends = [ async base mtl tasty tasty-hunit ]; + description = "A backtracking logic-programming monad"; + license = lib.licenses.bsd3; }) {}; "logict-state" = callPackage @@ -163959,8 +164710,8 @@ self: { sha256 = "17rx8rj6m4jny52zh4daw6ac9pyp0yns470nm0bf2z9y69mfr63g"; libraryHaskellDepends = [ base logict mtl transformers ]; description = "Library for logic programming based on haskell package logict"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -163973,7 +164724,7 @@ self: { libraryHaskellDepends = [ base deepseq text ]; testHaskellDepends = [ base text ]; description = "Log Level Datatype"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "logplex-parse" = callPackage @@ -163985,8 +164736,8 @@ self: { libraryHaskellDepends = [ base iso8601-time parsec text time ]; testHaskellDepends = [ base hspec time ]; description = "Parse Heroku application/logplex documents"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -163999,7 +164750,7 @@ self: { libraryHaskellDepends = [ base hsyslog logging-facade time ]; testHaskellDepends = [ base hspec hsyslog logging-facade time ]; description = "A logging framework for Haskell"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "logstash" = callPackage @@ -164017,7 +164768,7 @@ self: { stm-chans time tls unbounded-delays unliftio ]; description = "Logstash client library for Haskell"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "lojban" = callPackage @@ -164039,8 +164790,8 @@ self: { ]; executableHaskellDepends = [ haskell98 ]; description = "Useful utilities for the Lojban language"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -164055,8 +164806,8 @@ self: { libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base ]; description = "lojban parser"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -164071,8 +164822,8 @@ self: { libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base ]; description = "lojban to xiragan"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -164086,8 +164837,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base lojbanParser yjtools ]; description = "Prolog with lojban"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -164116,8 +164867,8 @@ self: { ]; testHaskellDepends = [ base test-framework ]; description = "A library for lattice cryptography"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -164138,8 +164889,8 @@ self: { test-framework time ]; description = "Lattice-based cryptographic applications using <https://hackage.haskell.org/package/lol lol>."; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -164156,8 +164907,8 @@ self: { MonadRandom split statistics ]; description = "A library for benchmarking <https://hackage.haskell.org/package/lol lol>."; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -164179,8 +164930,8 @@ self: { text-format transformers ]; description = "Calculus for LOL (λω language)"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -164200,8 +164951,8 @@ self: { testHaskellDepends = [ base lol lol-apps test-framework ]; benchmarkHaskellDepends = [ base DRBG lol lol-apps MonadRandom ]; description = "A fast C++ backend for <https://hackage.haskell.org/package/lol lol>."; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -164221,8 +164972,8 @@ self: { testHaskellDepends = [ base lol-tests ]; benchmarkHaskellDepends = [ base DRBG lol lol-benches ]; description = "A repa backend for <https://hackage.haskell.org/package/lol lol>."; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -164242,8 +164993,8 @@ self: { ]; testHaskellDepends = [ base lol test-framework ]; description = "A library for testing <https://hackage.haskell.org/package/lol Λ ∘ λ>."; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -164268,8 +165019,8 @@ self: { monad-classes tasty tasty-hunit text text-format transformers ]; description = "Type inferencer for LOL (λω language)"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -164287,8 +165038,8 @@ self: { template utf8-string ]; description = "A minimum web dev DSL in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -164300,7 +165051,7 @@ self: { sha256 = "0byrpngsh1a8w9n5nbw9lfmj4nmh33avzfh883zw9ya10pfa7x3g"; libraryHaskellDepends = [ base integer-gmp ]; description = "FFI bindings for C long double"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "longboi" = callPackage @@ -164311,8 +165062,8 @@ self: { sha256 = "0jm231i9mnbkn8ffdv6w2mhd95i8lwlbxi5h9nywvqbclgf95977"; libraryHaskellDepends = [ base ]; description = "Dependently-typed linked list implementation"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -164344,8 +165095,8 @@ self: { tasty-hunit tasty-quickcheck template-haskell ]; description = "Fast Brute-force search using parallelism"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -164360,8 +165111,8 @@ self: { libraryHaskellDepends = [ base primitive template-haskell ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Statically generate lookup tables using Template Haskell"; - license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -164378,7 +165129,7 @@ self: { base criterion foldl mtl random vector ]; description = "Fast loops (for when GHC can't optimize forM_)"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "loop-effin" = callPackage @@ -164389,8 +165140,8 @@ self: { sha256 = "02x02m98ka1y8f1jjqwfwmsyx29g583gnr4jdm5syqxfr0dz6c52"; libraryHaskellDepends = [ base effin ]; description = "control-monad-loop port for effin"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -164402,8 +165153,8 @@ self: { sha256 = "1yvw91gn1iyw72rbq455zzrbb3pq8ph9cv1c6800qzjyxx0694bd"; libraryHaskellDepends = [ base mtl ]; description = "A monad transformer supporting various styles of while loop"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -164421,8 +165172,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "inline self-recursive definitions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -164440,8 +165191,8 @@ self: { testHaskellDepends = [ aeson base hspec optparse-applicative text time unliftio ]; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -164459,8 +165210,8 @@ self: { testHaskellDepends = [ base tasty tasty-quickcheck ]; benchmarkHaskellDepends = [ base criterion transformers vector ]; description = "Fast imperative-style loops"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -164479,8 +165230,8 @@ self: { process random ]; description = "Find all biological feedback loops within an ecosystem graph"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -164521,8 +165272,8 @@ self: { unordered-containers utf8-string wai-logger xml-conduit yaml ]; description = "A command line interface to online radios"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -164537,8 +165288,8 @@ self: { libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base ]; description = "Library for generating filler text"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -164551,8 +165302,8 @@ self: { }: mkDerivation { pname = "lorentz"; - version = "0.9.0"; - sha256 = "195z7kx7jv0118pbashbc441sf69xag5q43jwkdyf53cmvnxqcwq"; + version = "0.9.1"; + sha256 = "1f4rf4q6gfiz55qlfpkzk19nq6fw92ri3a1smyv4r55i50jr07rm"; libraryHaskellDepends = [ aeson-pretty base bimap bytestring constraints containers data-default first-class-families fmt interpolate lens morley @@ -164561,8 +165312,8 @@ self: { with-utf8 ]; description = "EDSL for the Michelson Language"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -164576,8 +165327,8 @@ self: { librarySystemDepends = [ loris ]; libraryToolDepends = [ c2hs ]; description = "interface to Loris API"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {loris = null;}; @@ -164596,8 +165347,8 @@ self: { process split ]; description = "Minecraft 1.7 server proxy that answers to queries when the server is offline"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -164616,7 +165367,7 @@ self: { ]; description = "An implementation of an adictive two-player card game"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -164630,7 +165381,7 @@ self: { base bytestring JuicyPixels text vector ]; description = "Turning images into text using Braille font"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "loup" = callPackage @@ -164650,8 +165401,8 @@ self: { ]; executableHaskellDepends = [ base optparse-generic shakers ]; description = "Amazon Simple Workflow Service Wrapper for Work Pools"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -164663,8 +165414,8 @@ self: { sha256 = "1xwxsg4bz83xg4sjm69vz7zaxi7wjnn2xlqs8gha78ylpq105szw"; libraryHaskellDepends = [ base gl linear vector ]; description = "Basic gl wrapper and reference"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -164677,7 +165428,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Low dimensional linear algebra"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "lp-diagrams" = callPackage @@ -164695,7 +165446,7 @@ self: { vector ]; description = "An EDSL for diagrams based based on linear constraints"; - license = stdenv.lib.licenses.agpl3; + license = lib.licenses.agpl3; }) {}; "lp-diagrams-svg" = callPackage @@ -164715,7 +165466,7 @@ self: { ]; description = "SVG Backend for lp-diagrams"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -164727,7 +165478,7 @@ self: { sha256 = "11avhnjnb89rvn2s41jhh5r40zgp7r6kb5c0hcfiibpabqvv46pw"; libraryHaskellDepends = [ base containers contravariant ]; description = "a simple, pure LRU cache"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "lrucaching" = callPackage @@ -164747,7 +165498,7 @@ self: { base containers deepseq hashable hspec QuickCheck transformers ]; description = "LRU cache"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "lrucaching-haxl" = callPackage @@ -164758,7 +165509,7 @@ self: { sha256 = "0pn2f671ak1grzjigyvan5wagh9vyqhsz86jfy1z281rd2pw4gk2"; libraryHaskellDepends = [ base hashable haxl lrucaching psqueues ]; description = "Combine lrucaching and haxl"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ls-usb" = callPackage @@ -164776,8 +165527,8 @@ self: { usb-id-database vector ]; description = "List USB devices"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -164795,8 +165546,8 @@ self: { base bytestring Cabal containers directory filepath pretty process ]; description = "List exported modules from a set of .cabal files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -164827,7 +165578,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Haskell library for the Microsoft Language Server Protocol"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "lsp-test" = callPackage @@ -164854,10 +165605,10 @@ self: { text unordered-containers ]; description = "Functional test framework for LSP servers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; - "lsp-test_0_11_0_7" = callPackage + "lsp-test_0_12_0_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base , bytestring, conduit, conduit-parse, containers, data-default , Diff, directory, filepath, Glob, haskell-lsp, hspec, lens, mtl @@ -164866,8 +165617,8 @@ self: { }: mkDerivation { pname = "lsp-test"; - version = "0.11.0.7"; - sha256 = "01var9nm3kpw65jaz4rvky35ibrpfjyhfas9bi8avrw1vh2ybkcn"; + version = "0.12.0.0"; + sha256 = "1zc43j7xyfxv2i9vinx82yhkrr6m4gz46jwn9p39k76ld6j8nzpd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -164881,8 +165632,8 @@ self: { text unordered-containers ]; description = "Functional test framework for LSP servers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "lsp-types" = callPackage @@ -164903,7 +165654,7 @@ self: { temporary text unordered-containers ]; description = "Haskell library for the Microsoft Language Server Protocol, data types"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "lss" = callPackage @@ -164923,8 +165674,8 @@ self: { language-css-attoparsec text ]; description = "Lexical Style Sheets - a language for writing styles that is focused around lexical (ie, static) scoping and re-use of large components"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {language-css-attoparsec = null;}; @@ -164940,8 +165691,8 @@ self: { base haskell98 uu-parsinglib wx wxcore ]; description = "Paint an L-System Grammar"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -164973,24 +165724,28 @@ self: { text transformers unordered-containers ]; description = "Parameterized file evaluator"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "lti13" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, http-client - , http-types, jose-jwt, oidc-client, safe-exceptions, text + ({ mkDerivation, aeson, base, bytestring, containers, file-embed + , hspec, http-client, http-types, jose-jwt, oidc-client, QuickCheck + , safe-exceptions, text, th-utilities }: mkDerivation { pname = "lti13"; - version = "0.1.2.2"; - sha256 = "18l5sj2rv3lfis6hcaymn8vv7w6dbsnzl9wsfml5vfmlpb4jw8fw"; + version = "0.2.0.0"; + sha256 = "004zic7k2a4cii4ny3vbnwn7vwrzbfvi971xz8wgsnvnjmjnpfsq"; libraryHaskellDepends = [ aeson base bytestring containers http-client http-types jose-jwt oidc-client safe-exceptions text ]; + testHaskellDepends = [ + aeson base bytestring file-embed hspec QuickCheck text th-utilities + ]; description = "Core functionality for LTI 1.3."; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -165010,7 +165765,7 @@ self: { wai wai-extra xml-conduit xml-hamlet yesod-core ]; description = "Partial implementation of a service provider for LTI 1.1."; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "ltk" = callPackage @@ -165031,7 +165786,7 @@ self: { libraryPkgconfigDepends = [ gtk3 ]; description = "Leksah tool kit"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) gtk3;}; @@ -165043,7 +165798,7 @@ self: { sha256 = "0h3jxngsdmakcr35zapxjaykjsqs44lxxk86d5i4rg0gi0i9qw3g"; libraryHaskellDepends = [ base vcd ]; description = "Using linear temporal logic (LTL) to verify embedded software and hardware"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "lua-bc" = callPackage @@ -165061,8 +165816,8 @@ self: { vector ]; description = "Lua bytecode parser"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -165079,7 +165834,7 @@ self: { vector ]; description = "Library for loading Lua bytecode"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "luachunk" = callPackage @@ -165095,8 +165850,8 @@ self: { text ]; description = "Library functions for reading and writing Lua chunks"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -165118,8 +165873,8 @@ self: { text-binary ]; description = "Helpers for Haskell integration with Lua"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -165131,7 +165886,7 @@ self: { sha256 = "1dsm7cg0i930r5dn8591aabkl0p8b5l348pccdvi7p0g7asx451h"; libraryHaskellDepends = [ base unamb ]; description = "information operators: least upper bound (lub) and greatest lower bound (glb)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "lucid" = callPackage @@ -165156,7 +165911,7 @@ self: { base blaze-builder bytestring criterion deepseq text transformers ]; description = "Clear to write, read and edit DSL for HTML"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "lucid-cdn" = callPackage @@ -165167,7 +165922,7 @@ self: { sha256 = "119d92xc047r98pw0phxplm57nc2jdjz6smkas9hr95mck0d16db"; libraryHaskellDepends = [ base lucid ]; description = "Curated list of CDN imports for lucid"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "lucid-colonnade" = callPackage @@ -165178,8 +165933,8 @@ self: { sha256 = "0gbpfh1ky5pq0f0rz619hxfgll4yj0ky056dvrvq0s741l3gnhv8"; libraryHaskellDepends = [ base colonnade lucid text ]; description = "Helper functions for using lucid with colonnade"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -165196,7 +165951,7 @@ self: { ]; testHaskellDepends = [ base directory lucid ]; description = "Generate more HTML with Lucid - Bootstrap, Rdash, Vega-Lite, Leaflet JS, Email"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "lucid-foundation" = callPackage @@ -165212,7 +165967,7 @@ self: { base hspec QuickCheck quickcheck-instances ]; description = "Basic Zurb Foundation API in Lucid"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "lucid-svg" = callPackage @@ -165225,7 +165980,7 @@ self: { base blaze-builder lucid text transformers ]; description = "DSL for SVG using lucid for HTML"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "lucienne" = callPackage @@ -165247,7 +166002,7 @@ self: { ]; description = "Server side feed aggregator/reader"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -165259,8 +166014,8 @@ self: { sha256 = "0ix7x28kmd3iarydl709vqd041h0qx6kv582c8ca54z8ag7lzynz"; libraryHaskellDepends = [ base digits QuickCheck ]; description = "An implementation of Luhn's check digit algorithm"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -165276,8 +166031,8 @@ self: { base containers haskell98 haskgame MaybeT mtl SDL ]; description = "Purely FunctionaL User Interface"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -165292,8 +166047,8 @@ self: { aeson base http-client lens text vector wreq ]; description = "An unofficial client for the LUIS NLP service"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -165307,8 +166062,8 @@ self: { libraryHaskellDepends = [ air base bytestring libffi ]; librarySystemDepends = [ objc ]; description = "Simple ObjectiveC runtime binding"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {objc = null;}; @@ -165318,23 +166073,6 @@ self: { }: mkDerivation { pname = "lukko"; - version = "0.1.1.2"; - sha256 = "1lh7cv0fqbrn8sf54xz74wq991bl8p67jcyq4ing3khcvh9x2yca"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ - async base bytestring filepath singleton-bool tasty - tasty-expected-failure tasty-hunit temporary - ]; - description = "File locking"; - license = "GPL-2.0-or-later AND BSD-3-Clause"; - }) {}; - - "lukko_0_1_1_3" = callPackage - ({ mkDerivation, async, base, bytestring, filepath, singleton-bool - , tasty, tasty-expected-failure, tasty-hunit, temporary - }: - mkDerivation { - pname = "lukko"; version = "0.1.1.3"; sha256 = "07xb926kixqv5scqdl8w34z42zjzdpbq06f0ha3f3nm3rxhgn3m8"; libraryHaskellDepends = [ base ]; @@ -165344,7 +166082,6 @@ self: { ]; description = "File locking"; license = "GPL-2.0-or-later AND BSD-3-Clause"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lumberjack" = callPackage @@ -165365,7 +166102,7 @@ self: { base contravariant exceptions mtl prettyprinter text ]; description = "Trek through your code forest and make logs"; - license = stdenv.lib.licenses.isc; + license = lib.licenses.isc; }) {}; "luminance" = callPackage @@ -165381,8 +166118,8 @@ self: { semigroups transformers vector void ]; description = "Type-safe, type-level and stateless graphics framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -165401,8 +166138,8 @@ self: { resourcet transformers ]; description = "Luminance samples"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -165416,8 +166153,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base haskell-src-exts text vector ]; description = "Create ctags compatible tags files for Haskell programs"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -165430,8 +166167,8 @@ self: { libraryHaskellDepends = [ base mtl parsec transformers ]; testHaskellDepends = [ base mtl parsec ]; description = "Tools for lexing and utilizing lexemes that integrate with Parsec"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -165459,8 +166196,8 @@ self: { text time transformers vector ]; description = "Parallel scheduler, LVar data structures, and infrastructure to build more"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -165483,8 +166220,8 @@ self: { array base containers directory filepath parsec wl-pprint ]; description = "The Lazy Virtual Machine (LVM)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -165508,8 +166245,8 @@ self: { sha256 = "0nxwmbcfbwpd4dx1zmcdxrb9n7q12v17khi4h4qi7hiwy2zxk8wv"; libraryHaskellDepends = [ base bindings-lxc mtl transformers ]; description = "High level Haskell bindings to LXC (Linux containers)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -165539,8 +166276,8 @@ self: { base exceptions hspec hspec-core random text turtle uuid ]; description = "LXD client written in Haskell"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -165561,7 +166298,7 @@ self: { test-framework-hunit test-framework-quickcheck2 text yaml ]; description = "Read the configuration file of the standard LXD client"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "lye" = callPackage @@ -165578,8 +166315,8 @@ self: { base containers free HCodecs lens parsers transformers trifecta ]; description = "A Lilypond-compiling music box"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -165597,7 +166334,7 @@ self: { base bytestring criterion deepseq quicklz snappy ]; description = "LZ4 compression for ByteStrings"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "lz4-bytes" = callPackage @@ -165613,8 +166350,8 @@ self: { base byteslice primitive tasty tasty-quickcheck ]; description = "Bindings to LZ4"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -165638,8 +166375,8 @@ self: { base bytestring bytestring-arbitrary conduit QuickCheck resourcet ]; description = "LZ4 compression for conduits"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -165668,8 +166405,8 @@ self: { unliftio-core ]; description = "Conduit implementing the official LZ4 frame streaming format"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -165688,7 +166425,7 @@ self: { base bytestring criterion filepath temporary ]; description = "lz4 bindings for Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "lzip" = callPackage @@ -165699,8 +166436,8 @@ self: { sha256 = "0ccwckq0gkrnahf224s59gsdd9baay1dfc8fh1kz2r87rbygzsk7"; libraryHaskellDepends = [ base bytestring ]; description = "Lzip compression / Lzlib bindings"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -165721,7 +166458,7 @@ self: { base bytestring criterion filepath temporary ]; description = "lzlib bindings"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "lzma" = callPackage @@ -165740,7 +166477,7 @@ self: { base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck ]; description = "LZMA/XZ compression and decompression"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) lzma;}; "lzma-clib" = callPackage @@ -165751,8 +166488,8 @@ self: { sha256 = "1mczl0vb4zsh9y9wng30wb645crzxrhh3c19qiqhwarsxyw9rv8a"; doHaddock = false; description = "liblzma C library and headers for use by LZMA bindings"; - license = stdenv.lib.licenses.publicDomain; - platforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + platforms = lib.platforms.none; }) {}; "lzma-conduit" = callPackage @@ -165772,7 +166509,7 @@ self: { test-framework test-framework-hunit test-framework-quickcheck2 ]; description = "Conduit interface for lzma/xz compression"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "lzma-enumerator" = callPackage @@ -165793,8 +166530,8 @@ self: { test-framework-hunit test-framework-quickcheck2 ]; description = "Enumerator interface for lzma/xz compression"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) lzma;}; @@ -165815,8 +166552,8 @@ self: { test-framework-hunit test-framework-quickcheck2 ]; description = "IO-Streams interface for lzma/xz compression"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -165832,8 +166569,8 @@ self: { testHaskellDepends = [ base bytestring tasty tasty-hunit ]; benchmarkHaskellDepends = [ base bytestring criterion ]; description = "minilzo bundled for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -165850,8 +166587,8 @@ self: { ]; testHaskellDepends = [ base bytestring Cabal ]; description = "Library for talking to the mDNSResponder daemon"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -165868,8 +166605,8 @@ self: { base containers template-haskell text vector ]; description = "Monadic Abstracting Abstract Machines (MAAM) built on Galois Transformers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -165881,8 +166618,8 @@ self: { sha256 = "0zhjpszj8qm1kqx2q7g9a41crbmqvqis7qlx65a1l36ywk78gnyd"; libraryHaskellDepends = [ base network transformers ]; description = "Static Mandatory Access Control in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -165903,8 +166640,8 @@ self: { saltine transformers ]; description = "A toolkit for working with macaroons"; - license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -165931,7 +166668,7 @@ self: { testHaskellDepends = [ attoparsec base bytestring hspec ]; description = "Macbeth - A beautiful and minimalistic FICS client"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -165945,7 +166682,7 @@ self: { isExecutable = true; libraryHaskellDepends = [ base binary parsec process ]; description = "Obtain the host MAC address on *NIX and Windows"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "machination" = callPackage @@ -165957,7 +166694,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "Plot charts as unicode strings"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "machinecell" = callPackage @@ -165975,8 +166712,8 @@ self: { base doctest hspec mtl profunctors QuickCheck semigroups ]; description = "Arrow based stream transducers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -166001,7 +166738,7 @@ self: { base conduit criterion mtl pipes streaming ]; description = "Networked stream transducers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "machines-amazonka" = callPackage @@ -166022,8 +166759,8 @@ self: { monad-control mtl resourcet stm stm-containers time transformers ]; description = "Machine transducers for Amazonka calls"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -166044,8 +166781,8 @@ self: { attoparsec base bytestring machines tasty tasty-hunit text ]; description = "Parse machines streams with attoparsec parsers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -166057,8 +166794,8 @@ self: { sha256 = "0lh6q99xfmxl53gkxlrbjh1pfbkff8faxr9fycks98cfcmnlbzv0"; libraryHaskellDepends = [ base binary bytestring machines ]; description = "Binary utilities for the machines library"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -166070,8 +166807,8 @@ self: { sha256 = "1rlc5pr70z899zjs2q5p7qy5pm9gjpnm9pww934cxmlwrp1sck9b"; libraryHaskellDepends = [ base bytestring machines ]; description = "ByteString support for machines"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -166087,8 +166824,8 @@ self: { base directory filepath machines machines-io transformers ]; description = "Directory (system) utilities for the machines library"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -166100,8 +166837,8 @@ self: { sha256 = "1n8skhf48q7dissrq7hpgsccjgh1hspjqh331m58z8id9xry133g"; libraryHaskellDepends = [ base bytestring machines text ]; description = "Transcode encodings with machines"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -166117,8 +166854,8 @@ self: { base bytestring chunked-data machines transformers ]; description = "IO utilities for the machines library"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -166133,8 +166870,8 @@ self: { base chunked-data machines machines-io process ]; description = "Process (system) utilities for the machines library"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -166149,8 +166886,8 @@ self: { base basic-prelude machines streaming-commons ]; description = "Decompression support for machines"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -166163,8 +166900,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base binary bytestring ]; description = "Parser for Mach-O object format"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -166188,7 +166925,7 @@ self: { unordered-containers ]; description = "An API client library for Mackerel"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "maclight" = callPackage @@ -166212,8 +166949,8 @@ self: { base HUnit test-framework test-framework-hunit ]; description = "Control screen and keyboard backlights on MACs under Linux"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -166229,8 +166966,8 @@ self: { base containers managed mtl profunctors tagged transformers ]; description = "Haskell bindings to C-based Mac OS SDK frameworks"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -166250,8 +166987,8 @@ self: { filepath graph-visit mtl process transformers unix ]; description = "Make a macosx app standalone deployable"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -166276,8 +167013,8 @@ self: { process unix uuid ]; description = "Alternative rm command for macOS that remove files/dirs to the system trash"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -166300,7 +167037,7 @@ self: { random-shuffle raw-strings-qq transformers ]; description = "Monadic DSL for building constraint solvers using basic propagators"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "madlang" = callPackage @@ -166330,8 +167067,8 @@ self: { testHaskellDepends = [ base hspec hspec-megaparsec text ]; benchmarkHaskellDepends = [ base criterion megaparsec text ]; description = "Randomized templating language DSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -166347,8 +167084,8 @@ self: { executableHaskellDepends = [ array base containers mtl random ]; executableSystemDepends = [ ncurses ]; description = "Rogue-like"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) ncurses;}; @@ -166361,7 +167098,7 @@ self: { libraryHaskellDepends = [ base ]; librarySystemDepends = [ file ]; description = "Interface to C file/magic library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) file;}; "magic-tyfams" = callPackage @@ -166372,8 +167109,8 @@ self: { sha256 = "1vgbbmv2807cyi6hh2137nw6dldn84qall828d64lg2ja6zj6xii"; libraryHaskellDepends = [ base ghc ghc-tcplugins-extra syb ]; description = "Write plugins for magic type families with ease"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -166404,8 +167141,8 @@ self: { spake2 stm tasty tasty-hedgehog tasty-hspec ]; description = "Interact with Magic Wormhole"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -166436,8 +167173,8 @@ self: { wai-middleware-metrics ]; description = "A web framework that integrates Servant, RIO, EKG, fast-logger, wai-cli…"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -166455,8 +167192,8 @@ self: { base comfort-array lapack transformers utility-ht ]; description = "Compute solutions for Magico puzzle"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -166470,8 +167207,8 @@ self: { libraryHaskellDepends = [ base deepseq profunctors semigroups ]; testHaskellDepends = [ base ghc-prim ]; description = "magma is an algebraic structure"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -166483,7 +167220,7 @@ self: { sha256 = "006axj7hwdiq3gyxx9rpqz9ji1g7xpal7j8wrlgfa2as1s73076b"; libraryHaskellDepends = [ base ]; description = "Magma-like objects"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "mahoro" = callPackage @@ -166504,7 +167241,7 @@ self: { ]; description = "ImageBoards to XMPP gate"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -166526,8 +167263,8 @@ self: { text ]; description = "A simple static web server"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -166550,8 +167287,8 @@ self: { optparse-applicative resource-pool time ]; description = "Preconfigured email connection pool on top of smtp"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -166567,8 +167304,8 @@ self: { aeson base bytestring mtl text time xml zip-archive zlib ]; description = "A parser library for DMARC and SMTP TLS reports"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.agpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -166593,7 +167330,7 @@ self: { tasty-hunit ]; description = "Count mailboxes in a SQL database"; - license = stdenv.lib.licenses.agpl3; + license = lib.licenses.agpl3; }) {}; "mailchimp" = callPackage @@ -166611,8 +167348,8 @@ self: { ]; testHaskellDepends = [ base hspec ]; description = "Bindings for the MailChimp API"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -166631,8 +167368,8 @@ self: { text transformers wai-extra ]; description = "MailChimp subscription request handler"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -166652,8 +167389,8 @@ self: { these time transformers unordered-containers wreq ]; description = "API binding for Mailgun"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -166670,7 +167407,7 @@ self: { base bytestring hspec hspec-core QuickCheck text ]; description = "Capture stdout/stderr/exit code, and replace stdin of your main function"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "mainland-pretty" = callPackage @@ -166683,7 +167420,7 @@ self: { base containers srcloc text transformers ]; description = "Pretty printing designed for printing source code"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "majordomo" = callPackage @@ -166703,8 +167440,8 @@ self: { base bytestring cmdargs threads unix ]; description = "Majordomo protocol for ZeroMQ"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -166716,8 +167453,8 @@ self: { sha256 = "1442xw8i9jgk3hqavqikks98qs9l3i37lk63xyzpdgnlkfqapzka"; libraryHaskellDepends = [ haskell2010 ]; description = "Boyer-Moore Majority Vote Algorithm"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -166736,7 +167473,7 @@ self: { ]; description = "Change duplicated files into hard-links"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -166748,8 +167485,8 @@ self: { sha256 = "1bls9gfdlwvaq90g2dllc4vb2rrp6zplx12g35byx6xvwj26lxra"; libraryHaskellDepends = [ base mono-traversable ]; description = "Make a MonoFoldable type into an ordinary Foldable type"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -166770,8 +167507,8 @@ self: { github haskeline lens lens-datetime mtl process text time ]; description = "Make a cabalized package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -166783,8 +167520,8 @@ self: { sha256 = "0sc2fa45a046lw5x5z839gb1zk0d5nj663ghxajiclm6iw65kl2n"; libraryHaskellDepends = [ base directory filepath HSH process ]; description = "Helper for writing redo scripts in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -166802,8 +167539,8 @@ self: { tasty-quickcheck text ]; description = "Simple Makefile parser and generator"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -166831,8 +167568,8 @@ self: { unordered-containers ]; description = "Database migration and testing as a library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -166848,7 +167585,7 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Static Website Generator in Haskell"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "managed" = callPackage @@ -166859,7 +167596,7 @@ self: { sha256 = "00wzfy9facwgimrilz7bxaigr79w10733h8zfgyhll644p2rnz38"; libraryHaskellDepends = [ base transformers ]; description = "A monad for managed values"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "manatee" = callPackage @@ -166879,8 +167616,8 @@ self: { template-haskell text unix utf8-string ]; description = "The Haskell/Gtk+ Integrated Live Environment"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -166906,8 +167643,8 @@ self: { ]; doHaddock = false; description = "Virtual package to install all Manatee packages"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; }) {}; "manatee-anything" = callPackage @@ -166927,8 +167664,8 @@ self: { split stm text unix utf8-string ]; description = "Multithread interactive input/search framework for Manatee"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -166948,8 +167685,8 @@ self: { mtl stm text utf8-string webkit ]; description = "Browser extension for Manatee"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; }) {}; "manatee-core" = callPackage @@ -166972,8 +167709,8 @@ self: { template-haskell text time unix utf8-string ]; description = "The core of Manatee"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -166996,8 +167733,8 @@ self: { old-time regex-tdfa stm template-haskell text utf8-string ]; description = "Download Manager extension for Manatee"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -167018,8 +167755,8 @@ self: { filepath gtk gtksourceview2 manatee-core regex-tdfa stm text ]; description = "Editor extension for Manatee"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -167040,8 +167777,8 @@ self: { manatee-core mtl old-locale old-time stm text utf8-string ]; description = "File manager extension for Manatee"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -167062,8 +167799,8 @@ self: { gtkimageview manatee-core regex-tdfa stm text utf8-string ]; description = "Image viewer extension for Manatee"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -167088,8 +167825,8 @@ self: { regex-posix split stm template-haskell text unix utf8-string ]; description = "IRC client extension for Manatee"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -167111,8 +167848,8 @@ self: { text time unix utf8-string ]; description = "Mplayer client extension for Manatee"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -167133,8 +167870,8 @@ self: { manatee-core mtl poppler stm text utf8-string ]; description = "PDF viewer extension for Manatee"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -167154,8 +167891,8 @@ self: { proc stm text ]; description = "Process manager extension for Manatee"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -167176,8 +167913,8 @@ self: { filepath gtk manatee-core stm text utf8-string webkit ]; description = "Feed reader extension for Manatee"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; }) {}; "manatee-template" = callPackage @@ -167196,8 +167933,8 @@ self: { filepath gtk gtksourceview2 manatee-core regex-tdfa stm text ]; description = "Template code to create Manatee application"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -167217,8 +167954,8 @@ self: { stm text unix vte ]; description = "Terminal Emulator extension for Manatee"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -167238,8 +167975,8 @@ self: { filepath gtk manatee-core regex-tdfa stm text ]; description = "Welcome module to help user play Manatee quickly"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -167253,7 +167990,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base ]; description = "Simple mancala game"; - license = stdenv.lib.licenses.lgpl3; + license = lib.licenses.lgpl3; }) {}; "mandrill" = callPackage @@ -167277,8 +168014,8 @@ self: { tasty-quickcheck text ]; description = "Library for interfacing with the Mandrill JSON API"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -167297,8 +168034,8 @@ self: { array base bytestring containers directory filepath GLUT hslua time ]; description = "A zooming visualisation of the Mandelbrot Set as many Julia Sets"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -167337,8 +168074,8 @@ self: { unordered-containers utf8-string vector wai warp x509-system ]; description = "Bindings to the MangoPay API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -167355,8 +168092,8 @@ self: { semigroups vector-space ]; description = "Sampling random points on general manifolds"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -167386,8 +168123,8 @@ self: { tasty-hunit tasty-quickcheck vector-space ]; description = "Coordinate-free hypersurfaces"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -167399,7 +168136,7 @@ self: { sha256 = "1bvmr0gcfj7zd0rff0qjlzjy8hqdbh52ljiiazrmqmb9abdsciq3"; libraryHaskellDepends = [ base call-stack tagged vector-space ]; description = "The basic classes for the manifolds hierarchy"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "map-classes" = callPackage @@ -167415,7 +168152,7 @@ self: { utility-ht ]; description = "A set of classes and instances for working with key/value mappings"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "map-exts" = callPackage @@ -167429,8 +168166,8 @@ self: { libraryHaskellDepends = [ base containers ]; executableHaskellDepends = [ base bytestring cassava containers ]; description = "Extensions to Data.Map"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -167458,7 +168195,7 @@ self: { unordered-containers ]; description = "foldl wrappers for map-reduce"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "map-syntax" = callPackage @@ -167476,7 +168213,7 @@ self: { base containers deepseq hspec HUnit mtl QuickCheck transformers ]; description = "Syntax sugar for defining maps"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "mapalgebra" = callPackage @@ -167496,8 +168233,8 @@ self: { tasty-hunit tasty-quickcheck vector ]; description = "Efficient, polymorphic Map Algebra"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -167520,8 +168257,8 @@ self: { ]; testHaskellDepends = [ base containers hspec parsec QuickCheck ]; description = "A functional programming language focused around maps"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -167537,7 +168274,7 @@ self: { aeson base bytestring exceptions goggles mtl req text ]; description = "Bindings to the MapQuest API"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "maquinitas-tidal" = callPackage @@ -167548,7 +168285,7 @@ self: { sha256 = "0apr5qkir3b6mnczi50lf3p349p1q3bl1sn4yg9dls2n3m147mf7"; libraryHaskellDepends = [ base tidal ]; description = "library for MIDI control of hardware"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "marihana" = callPackage @@ -167564,7 +168301,7 @@ self: { executableHaskellDepends = [ base directory filepath process ]; testHaskellDepends = [ base directory filepath process ]; description = "Minimal tool to make your blog in Haskell"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "marionetta" = callPackage @@ -167581,8 +168318,8 @@ self: { base containers gloss mtl splines vector vector-space ]; description = "A study of marionetta movements"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -167606,7 +168343,7 @@ self: { containers directory filepath hspec text transformers ]; description = "Convert Markdown to HTML, with XSS protection"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "markdown-kate" = callPackage @@ -167628,8 +168365,8 @@ self: { system-filepath text transformers ]; description = "Convert Markdown to HTML, with XSS protection"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -167641,8 +168378,8 @@ self: { sha256 = "0cq0s9yixkg98vhsgiv1xjia2cn0b4q6gjl1wv0q7yrm26anaqcq"; libraryHaskellDepends = [ base monads-tf papillon ]; description = "markdown parser with papillon"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -167664,7 +168401,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Literate Haskell support for Markdown"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "markdown2svg" = callPackage @@ -167682,8 +168419,8 @@ self: { papillon png-file yjsvg ]; description = "markdown to svg converter"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -167696,8 +168433,8 @@ self: { libraryHaskellDepends = [ base deepseq ghc-prim ]; testHaskellDepends = [ base ]; description = "Pretty-printing library, with scoping, based on pretty"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -167709,7 +168446,7 @@ self: { sha256 = "1ka44rvrl9ppshbjmk95997cna670bqwjsharcr9qsalp6pchmdf"; libraryHaskellDepends = [ base ]; description = "Simple interpreter for Markov's normal algorithms"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "markov-chain" = callPackage @@ -167737,7 +168474,7 @@ self: { ]; testToolDepends = [ tasty-discover ]; description = "Computations for Markov chain usage models"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }) {}; "markov-processes" = callPackage @@ -167753,8 +168490,8 @@ self: { ]; testHaskellDepends = [ assertions base bifunctors memoize random ]; description = "Hidden Markov processes"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -167767,8 +168504,8 @@ self: { libraryHaskellDepends = [ base comonad MonadRandom ]; testHaskellDepends = [ base HTF MonadRandom ]; description = "Realizations of Markov chains"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -167787,8 +168524,8 @@ self: { text transformers-base urlpath ]; description = "Abstraction for HTML-embedded content"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -167809,8 +168546,8 @@ self: { pandoc temporary text transformers webkit ]; description = "A simple markup document preview (markdown, textile, reStructuredText)"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; }) {}; "marmalade-upload" = callPackage @@ -167837,8 +168574,8 @@ self: { aeson base exceptions tasty tasty-hunit text transformers ]; description = "Upload packages to Marmalade"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -167873,8 +168610,8 @@ self: { ]; testHaskellDepends = [ base bytestring hspec ]; description = "Client library for Vaultaire"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -167890,8 +168627,8 @@ self: { array base bytestring colour gloss MonadRandom mtl random ]; description = "Generates mountainous terrain using a random walk algorithm"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -167907,7 +168644,7 @@ self: { base bytestring kan-extensions lens mtl ]; description = "A ContT-based wrapper for Haskell-to-C marshalling functions"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "marvin" = callPackage @@ -167941,8 +168678,8 @@ self: { ]; testHaskellDepends = [ base hspec ]; description = "A framework for modular, portable chat bots"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -167959,8 +168696,8 @@ self: { ]; testHaskellDepends = [ base hspec text ]; description = "Compile time string interpolation a la Scala and CoffeeScript"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -167984,7 +168721,7 @@ self: { base configurator dlist parsek pretty ]; description = "Markup language preprocessor for Haskell"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }) {}; "masakazu-bot" = callPackage @@ -168006,8 +168743,8 @@ self: { twitter-types ]; description = "@minamiyama1994_bot on haskell"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -168023,29 +168760,28 @@ self: { array base bytestring ghc-prim integer-gmp network text ]; description = "Fast and extensible bytestring builder"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "massiv" = callPackage - ({ mkDerivation, base, bytestring, data-default-class, deepseq - , doctest, exceptions, mersenne-random-pure64, primitive - , QuickCheck, random, scheduler, splitmix, template-haskell - , unliftio-core, vector + ({ mkDerivation, base, bytestring, deepseq, doctest, exceptions + , mersenne-random-pure64, primitive, QuickCheck, random, scheduler + , splitmix, template-haskell, unliftio-core, vector }: mkDerivation { pname = "massiv"; - version = "0.5.9.0"; - sha256 = "11i527mnyznpyqwr61cr3jhx4xs3y8m7948mqp6rwkis6lnvl2ms"; + version = "0.6.0.0"; + sha256 = "12p3gcrz3nwry99xhxfrz51aiswm5ira2hyxl4q1g3jfi8vwgcd0"; libraryHaskellDepends = [ - base bytestring data-default-class deepseq exceptions primitive - scheduler unliftio-core vector + base bytestring 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; + license = lib.licenses.bsd3; }) {}; "massiv-io" = callPackage @@ -168056,8 +168792,8 @@ self: { }: mkDerivation { pname = "massiv-io"; - version = "0.4.0.0"; - sha256 = "18q09pz563jp8lmnvmcynmhrk6pmqxr8whlcp6f9kilkzy7hzy9k"; + version = "0.4.1.0"; + sha256 = "1g20n4h1x03i7q36a6d65v2ylmrr6m8s2g91jnpx1lj7a91hc5c7"; libraryHaskellDepends = [ base bytestring Color data-default-class deepseq exceptions filepath JuicyPixels massiv netpbm unliftio vector @@ -168067,7 +168803,7 @@ self: { QuickCheck random template-haskell ]; description = "Import/export of Image files into massiv Arrays"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "massiv-persist" = callPackage @@ -168087,8 +168823,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Compatibility of 'massiv' with 'persist'"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -168109,7 +168845,7 @@ self: { base deepseq doctest hspec QuickCheck template-haskell unliftio ]; description = "Work stealing scheduler for Massiv (Массив) and other parallel applications"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "massiv-serialise" = callPackage @@ -168126,8 +168862,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Compatibility of 'massiv' with 'serialise'"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -168139,8 +168875,8 @@ self: { }: mkDerivation { pname = "massiv-test"; - version = "0.1.6"; - sha256 = "1cg41rkk19jyvkkx3nkd10lq738cg5kv29nrzwxqcm5v308av38i"; + version = "0.1.6.1"; + sha256 = "0f2f401flik0sj1wqlzghhr0dxbz2lyvlb4ij38n3m2vgpkgkd57"; libraryHaskellDepends = [ base bytestring data-default-class deepseq exceptions hspec massiv primitive QuickCheck scheduler unliftio vector @@ -168150,7 +168886,7 @@ self: { hspec massiv mwc-random primitive QuickCheck scheduler vector ]; description = "Library that contains generators, properties and tests for Massiv Array Library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "master-plan" = callPackage @@ -168174,8 +168910,8 @@ self: { random-shuffle text ]; description = "The project management tool for hackers"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -168189,7 +168925,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base random ]; description = "console mastermind decypher"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "matchable" = callPackage @@ -168207,7 +168943,7 @@ self: { ]; testHaskellDepends = [ base containers doctest hspec ]; description = "A type class for Matchable Functors"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "matchable-th" = callPackage @@ -168223,7 +168959,7 @@ self: { ]; testHaskellDepends = [ base containers matchable ]; description = "Generates Matchable instances using TemplateHaskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "matcher" = callPackage @@ -168238,7 +168974,7 @@ self: { base base-prelude profunctors success text transformers ]; description = "A composable abstraction for checking or converting a context value"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "matchers" = callPackage @@ -168250,8 +168986,8 @@ self: { libraryHaskellDepends = [ base bytestring prednote text ]; librarySystemDepends = [ pcre ]; description = "Text matchers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) pcre;}; @@ -168264,7 +169000,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hedgehog ]; description = "A variety of mathematical utilities"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "math-functions" = callPackage @@ -168287,7 +169023,7 @@ self: { base data-default-class gauge random vector ]; description = "Collection of tools for numeric computations"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }) {}; "math-grads" = callPackage @@ -168304,8 +169040,8 @@ self: { ]; testHaskellDepends = [ array base containers hspec random ]; description = "Library containing graph data structures and graph algorithms"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -168317,8 +169053,8 @@ self: { sha256 = "0l8jv0zm1mar6848n5jyd6dzy02q0cvkgvgnry9db382i1r4g9bq"; libraryHaskellDepends = [ base ]; description = "Class for interpolation of values"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -168330,8 +169066,8 @@ self: { sha256 = "092qbl1x0l6hcm9vn3nx3gyxnqcfx3z2kkfkqw5zmmmyn9zkjsgx"; libraryHaskellDepends = [ base ]; description = "Typeclass for metric spaces"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -168350,7 +169086,7 @@ self: { ]; testToolDepends = [ tasty-discover ]; description = "A library for formulating and solving math programs"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "math-programming-glpk" = callPackage @@ -168372,8 +169108,8 @@ self: { testSystemDepends = [ glpk ]; testToolDepends = [ tasty-discover ]; description = "A GLPK backend to the math-programming library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) glpk;}; @@ -168389,8 +169125,8 @@ self: { base math-programming tasty tasty-hunit tasty-quickcheck text ]; description = "Utility functions for testing implementations of the math-programming library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -168417,8 +169153,8 @@ self: { test-framework-hunit time unix url ]; description = "A program for creating and managing a static weblog with LaTeX math and diagrams"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -168430,7 +169166,7 @@ self: { sha256 = "1bbi9368zg50xvhn0lkrza1fpfi1cjz21lxyay6qb9v2r7h0mhr3"; libraryHaskellDepends = [ base data-default-class ]; description = "Parse and evaluate math expressions with variables and functions"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "mathflow" = callPackage @@ -168449,8 +169185,8 @@ self: { template-haskell text ]; description = "Dependently typed tensorflow modeler"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -168470,7 +169206,7 @@ self: { graphviz HTTP process safe tagsoup text ]; description = "Discover your (academic) ancestors!"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }) {}; "mathista" = callPackage @@ -168493,7 +169229,7 @@ self: { ]; testHaskellDepends = [ base hspec parsec ]; description = "A small programming language for numerical computing"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "mathlink" = callPackage @@ -168509,8 +169245,8 @@ self: { ]; libraryToolDepends = [ c2hs ]; description = "Write Mathematica packages in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -168533,8 +169269,8 @@ self: { ]; executableSystemDepends = [ eng mat mx ]; description = "Matlab bindings and interface"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {eng = null; mat = null; inherit (pkgs) mx;}; "matplotlib" = callPackage @@ -168556,7 +169292,7 @@ self: { tasty tasty-expected-failure tasty-golden tasty-hunit temporary ]; description = "Bindings to Matplotlib; a Python plotting library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "matrices" = callPackage @@ -168573,7 +169309,7 @@ self: { ]; benchmarkHaskellDepends = [ base criterion vector ]; description = "native matrix based on vector"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "matrix" = callPackage @@ -168592,7 +169328,7 @@ self: { testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; benchmarkHaskellDepends = [ base criterion ]; description = "A native implementation of matrix operations"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "matrix-as-xyz" = callPackage @@ -168609,8 +169345,8 @@ self: { base doctest hspec matrix parsec QuickCheck ]; description = "Read and Display Jones-Faithful notation for spacegroup and planegroup"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -168629,7 +169365,7 @@ self: { ]; testToolDepends = [ tasty-discover ]; description = "Optics for the \"matrix\" package"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "matrix-market" = callPackage @@ -168640,8 +169376,8 @@ self: { sha256 = "1hzpjkmwr24073mf9i13rx3n23ri0b5vmvwx8k9lxbrg1821hy28"; libraryHaskellDepends = [ base bytestring ]; description = "Read and write NIST Matrix Market files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -168661,7 +169397,7 @@ self: { base directory exceptions hspec QuickCheck ]; description = "Parsing and serialization functions for the NIST Matrix Market format"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }) {}; "matrix-market-pure" = callPackage @@ -168672,7 +169408,7 @@ self: { sha256 = "05jjf5wnxhbafrca1qfzlrxvysy5bff22mzk45pia5b9gwdhygn1"; libraryHaskellDepends = [ array base containers ]; description = "Pure and composable reader and writer of the Matrix Market format"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "matrix-sized" = callPackage @@ -168693,8 +169429,8 @@ self: { tasty-quickcheck vector ]; description = "Haskell matrix library with interface to C++ linear algebra libraries"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -168714,7 +169450,7 @@ self: { vector ]; description = "Type-safe matrix operations"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "matroid" = callPackage @@ -168726,7 +169462,7 @@ self: { libraryHaskellDepends = [ base containers hspec QuickCheck ]; testHaskellDepends = [ base containers hspec QuickCheck ]; description = "matroid (combinatorial pre-geometries) library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "matsuri" = callPackage @@ -168746,7 +169482,7 @@ self: { ]; description = "ncurses XMPP client"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -168786,8 +169522,8 @@ self: { Unique uuid ]; description = "Terminal client for the Mattermost chat system"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ kiwi ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ kiwi ]; }) {}; "mattermost-api" = callPackage @@ -168815,8 +169551,8 @@ self: { text unordered-containers ]; description = "Client API for Mattermost chat system"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ kiwi ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ kiwi ]; }) {}; "mattermost-api-qc" = callPackage @@ -168831,8 +169567,8 @@ self: { base containers mattermost-api QuickCheck text time ]; description = "QuickCheck instances for the Mattermost client API library"; - license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ kiwi ]; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ kiwi ]; }) {}; "maude" = callPackage @@ -168847,8 +169583,8 @@ self: { base directory filepath process process-extras temporary text xml ]; description = "An interface to the Maude rewriting system"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -168870,8 +169606,8 @@ self: { vector ]; description = "Compute Maximum Entropy Distributions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -168896,7 +169632,7 @@ self: { ]; description = "Hayes and Wilson's maxent learning algorithm for phonotactic grammars"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -168919,7 +169655,7 @@ self: { ]; description = "GUI for maxent-learner-hw"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -168931,7 +169667,7 @@ self: { sha256 = "1sbmykgb5lrd32rih09d8d0r5isz4nh5slfyd93dgln7ag3hb7bh"; libraryHaskellDepends = [ base containers vector ]; description = "Enumerate all maximal cliques of a graph"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "maxsharing" = callPackage @@ -168952,8 +169688,8 @@ self: { process uuagc uuagc-cabal ]; description = "Maximal sharing of terms in the lambda calculus with letrec"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -168966,7 +169702,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Simple higher order function for Maybe"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "maybench" = callPackage @@ -168984,8 +169720,8 @@ self: { base benchpress Cabal directory filepath mtl process time ]; description = "Automated benchmarking tool"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -168999,7 +169735,7 @@ self: { editedCabalFile = "11jikczq21fnhsvr6n33qbb5q6ixbhab4s0js8n39zwgmglighz5"; libraryHaskellDepends = [ base safe text time time-locale-compat ]; description = "Read and write standard mailbox files"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "mbox-tools" = callPackage @@ -169017,8 +169753,8 @@ self: { process pureMD5 ]; description = "A collection of tools to process mbox files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -169037,7 +169773,7 @@ self: { utility-ht ]; description = "List contents of an mbox file containing e-mails"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "mbtiles" = callPackage @@ -169055,7 +169791,7 @@ self: { ]; testHaskellDepends = [ base HUnit ]; description = "Haskell MBTiles client"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "mbug" = callPackage @@ -169080,8 +169816,8 @@ self: { tagsoup text time xdg-basedir ]; description = "download bugs mailboxes"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -169108,8 +169844,8 @@ self: { base binary bytestring criterion deepseq groups ]; description = "Bindings to mcl, a generic and fast pairing-based cryptography library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) gmpxx; mcl = null; inherit (pkgs) openssl;}; @@ -169129,8 +169865,8 @@ self: { MissingH polyparse process text unix ]; description = "Machine Configuration Manager"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -169143,8 +169879,8 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base gloss ]; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -169172,8 +169908,8 @@ self: { base criterion log-domain microlens mwc-random ]; description = "Sample from a posterior using Markov chain Monte Carlo"; - license = stdenv.lib.licenses.gpl3Plus; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -169189,8 +169925,8 @@ self: { base containers hakaru hmatrix mwc-random primitive statistics ]; description = "Combinators for MCMC sampling"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -169202,8 +169938,8 @@ self: { sha256 = "14z1x9dqnjj391nrlngs9s887yqh3arc7kfgk0m3d89vrkc185vq"; libraryHaskellDepends = [ base MonadRandom ]; description = "MCMC applied to probabilistic program synthesis"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -169217,7 +169953,7 @@ self: { base containers mwc-probability transformers ]; description = "Common types for sampling"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "mcpi" = callPackage @@ -169231,8 +169967,8 @@ self: { libraryHaskellDepends = [ base network split transformers ]; executableHaskellDepends = [ base transformers ]; description = "Connect to MineCraft running on a Raspberry PI"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -169251,8 +169987,8 @@ self: { transformers wreq ]; description = "Haskell interface to Fedora's mdapi"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -169272,8 +170008,8 @@ self: { ansi-terminal base directory pandoc terminfo ]; description = "Markdown viewer in your terminal"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -169287,7 +170023,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base process ]; description = "Command-line tool to run a command on each of the items"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "mdp" = callPackage @@ -169303,53 +170039,54 @@ self: { executableHaskellDepends = [ base vector ]; testHaskellDepends = [ base HTF HUnit QuickCheck vector ]; description = "Tools for solving Markov Decision Processes"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; "mealstrom" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers - , hashable, list-t, postgresql-simple, resource-pool, stm + , deferred-folds, hashable, postgresql-simple, resource-pool, stm , stm-containers, tasty, tasty-hunit, text, time, uuid }: mkDerivation { pname = "mealstrom"; - version = "0.0.1.0"; - sha256 = "1nsbh00c5d5n1w3vkf63s9y9snbqvk5f590a8gyp00ikz85m3c23"; + version = "0.0.1.1"; + sha256 = "1bif2siwyijnwmz4mgsi88rv81w8ksyri7d4lxrrkhi581jy8f4s"; libraryHaskellDepends = [ - aeson async base bytestring containers hashable list-t + aeson async base bytestring containers deferred-folds hashable postgresql-simple resource-pool stm stm-containers text time uuid ]; testHaskellDepends = [ - aeson async base bytestring hashable list-t postgresql-simple - resource-pool stm stm-containers tasty tasty-hunit text time uuid + aeson async base bytestring deferred-folds hashable + postgresql-simple resource-pool stm stm-containers tasty + tasty-hunit text time uuid ]; description = "Manipulate FSMs and store them in PostgreSQL"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; "mealy" = callPackage - ({ mkDerivation, adjunctions, backprop, base, containers, doctest - , folds, generic-lens, hmatrix, lens, mwc-probability, mwc-random - , numhask, numhask-array, primitive, profunctors, tdigest, text - , vector, vector-algorithms + ({ mkDerivation, adjunctions, base, containers, doctest, folds + , generic-lens, lens, matrix, mwc-probability, numhask + , numhask-array, primitive, profunctors, tdigest, text, vector + , vector-algorithms }: mkDerivation { pname = "mealy"; - version = "0.0.1"; - sha256 = "0z7hf1blzhgrjmrf7s2dpgmg73157j476g17i7m52zgfgq4vmym9"; + version = "0.0.3"; + sha256 = "0gv4vi8ppbrhi8j2xwhnw96sybs2ci2ja6s37ggv4g0lxbxin17m"; libraryHaskellDepends = [ - adjunctions backprop base containers folds generic-lens hmatrix - lens mwc-probability mwc-random numhask numhask-array primitive - profunctors tdigest text vector vector-algorithms + adjunctions base containers folds generic-lens lens matrix + mwc-probability numhask numhask-array primitive profunctors tdigest + text vector vector-algorithms ]; testHaskellDepends = [ base doctest numhask ]; description = "See readme.md"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -169361,7 +170098,7 @@ self: { sha256 = "12px5awgvblmpyfr92f83gkbhnr8qy8ip3h3gqnp46yhy6yr2js3"; libraryHaskellDepends = [ base semigroups ]; description = "calculate varieties of mean/average using semigroup"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "mecab" = callPackage @@ -169373,8 +170110,8 @@ self: { libraryHaskellDepends = [ base bytestring text ]; librarySystemDepends = [ mecab ]; description = "A Haskell binding to MeCab"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) mecab;}; @@ -169386,8 +170123,8 @@ self: { sha256 = "0r9n04r6rv9dn38l469h40mk7fbmjwq0m72jvq69qahjw11y5lns"; libraryHaskellDepends = [ base machines ]; description = "mecha are the most complex composite machines known to humanity, lets build them well!"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -169401,7 +170138,7 @@ self: { isExecutable = true; libraryHaskellDepends = [ base ]; description = "A constructive solid geometry (CSG) modeling language"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "mechs" = callPackage @@ -169412,8 +170149,8 @@ self: { sha256 = "04z4qsjmls6h1ndczirldprn42pngm9v8g7kbmwilp7gk1zl0wyx"; libraryHaskellDepends = [ base machines ]; description = "mecha are the most complex composite machines known to humanity, lets build them well!"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -169431,7 +170168,7 @@ self: { base bytestring storable-endian transformers utility-ht ]; description = "Parse song module files from Amiga MED and OctaMED"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "medea" = callPackage @@ -169458,7 +170195,7 @@ self: { QuickCheck quickcheck-instances text unordered-containers vector ]; description = "A schema language for JSON"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "mediabus" = callPackage @@ -169488,8 +170225,8 @@ self: { template-haskell text time transformers type-spec vector ]; description = "Multimedia streaming on top of Conduit"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -169517,8 +170254,8 @@ self: { time vector ]; description = "Mediabus plugin for the Frauenhofer ISO-14496-3 AAC FDK"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {fdk-aac = null;}; @@ -169556,8 +170293,8 @@ self: { tagged template-haskell text time transformers type-spec vector ]; description = "Receive and Send RTP Packets"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -169570,7 +170307,7 @@ self: { libraryHaskellDepends = [ base heap ]; testHaskellDepends = [ base QuickCheck ]; description = "Constant-time queries for the median of a stream of numeric data"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "mediawiki" = callPackage @@ -169588,8 +170325,8 @@ self: { base HTTP mime network pretty utf8-string xml ]; description = "Interfacing with the MediaWiki API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -169633,8 +170370,8 @@ self: { servant-client servant-server text time ]; description = "Haskell SDK for communicating with the Medium API"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -169655,7 +170392,7 @@ self: { QuickCheck semigroupoids semigroups ]; description = "A silly container"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }) {}; "mega-sdist" = callPackage @@ -169673,8 +170410,8 @@ self: { yaml ]; description = "Handles uploading to Hackage from mega repos"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -169686,8 +170423,8 @@ self: { sha256 = "158j4wc9j8vpi3k095nfsimjavfmrxgzil3d4a3yqphpk96fz9ci"; libraryHaskellDepends = [ base megaparsec mtl text ]; description = "lisp parser using mega-parsec"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -169710,7 +170447,7 @@ self: { base containers criterion deepseq text weigh ]; description = "Monadic parser combinators"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }) {}; "megaparsec-tests" = callPackage @@ -169736,7 +170473,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Test utilities and the test suite of Megaparsec"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }) {}; "meldable-heap" = callPackage @@ -169750,7 +170487,7 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base ]; description = "Asymptotically optimal, Coq-verified meldable heaps, AKA priority queues"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "mellon-core" = callPackage @@ -169769,8 +170506,8 @@ self: { quickcheck-instances time transformers ]; description = "Control physical access devices"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -169782,8 +170519,8 @@ self: { sha256 = "0hg878il0d31lfqwkb3rsd7gxbhs5cb1sxgc3rwdv70fdg63iirp"; libraryHaskellDepends = [ base hpio mellon-core protolude ]; description = "GPIO support for mellon"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -169825,8 +170562,8 @@ self: { wai wai-extra warp ]; description = "A REST web service for Mellon controllers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -169848,8 +170585,8 @@ self: { base containers HUnit mtl test-framework test-framework-hunit ]; description = "A functional scripting language"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -169866,7 +170603,7 @@ self: { th-lift ]; description = "Indices for type level lists"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "membrain" = callPackage @@ -169882,7 +170619,7 @@ self: { base doctest Glob hedgehog hspec type-spec ]; description = "Type-safe memory units"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "memcache" = callPackage @@ -169892,8 +170629,8 @@ self: { }: mkDerivation { pname = "memcache"; - version = "0.2.0.1"; - sha256 = "0p6qyw15nx1l0b7h029hjkhgz7zvc19c4bfm2pkx53hm96gxjxqg"; + version = "0.3.0.1"; + sha256 = "0sbfzmdq0rqzrvrjk7yzkn0mfadbz3dxj1d9n8f3s9mz3s8bv328"; libraryHaskellDepends = [ base binary blaze-builder bytestring data-default-class hashable network resource-pool time vector @@ -169903,8 +170640,8 @@ self: { ]; benchmarkHaskellDepends = [ base bytestring criterion ]; description = "A memcached client library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -169924,8 +170661,8 @@ self: { memcache-haskell mtl network resourcet split ]; description = "Conduit library for memcache procotol"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -169948,8 +170685,8 @@ self: { test-framework-hunit test-framework-quickcheck2 test-framework-th ]; description = "Memcache procotol library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -169962,7 +170699,7 @@ self: { libraryHaskellDepends = [ base bytestring network utf8-light ]; description = "haskell bindings for memcached"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "memcached-binary" = callPackage @@ -169984,8 +170721,8 @@ self: { base bytestring data-default-class hspec HUnit network process ]; description = "memcached client using binary protocol"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -170002,7 +170739,7 @@ self: { base bytestring cereal hspec QuickCheck vector ]; description = "Efficient in memory indexed database"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "memexml" = callPackage @@ -170013,7 +170750,7 @@ self: { sha256 = "1x3gi54d1yzxi2046vb62dxa6jvbhggsazh4dasxcbjc1pkq6pp8"; libraryHaskellDepends = [ base hxt ]; description = "Library for reading Meme XML output"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "meminfo" = callPackage @@ -170026,7 +170763,7 @@ self: { editedCabalFile = "0i6znbcw4yyf8jzkixx5dxbklzfnh79hmywvwwamdmjgi39akpi5"; libraryHaskellDepends = [ attoparsec base bytestring containers ]; description = "Library for reading `/proc/meminfo`"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "memis" = callPackage @@ -170051,8 +170788,8 @@ self: { wai-middleware-static warp ]; description = "Memis Efficient Manual Image Sorting"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -170064,8 +170801,8 @@ self: { sha256 = "1vy3673dvf0crs384vhi56i7bir9k8yk3cjcrcc7bn15qyclif19"; libraryHaskellDepends = [ base containers ]; description = "Pointer equality memoization"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -170077,7 +170814,7 @@ self: { sha256 = "0x6vpf5kcr4icli0hjdqzphbpsakh0yn2ih2jyh65hnk1nh4j8n7"; libraryHaskellDepends = [ base direct-sqlite text ]; description = "memoize functions using SQLite3 database"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "memoization-utils" = callPackage @@ -170093,8 +170830,8 @@ self: { ]; testHaskellDepends = [ base hspec time time-units ]; description = "Utilities for memoizing functions"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -170107,7 +170844,7 @@ self: { libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base ]; description = "A memoization library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "memorable-bits" = callPackage @@ -170135,7 +170872,7 @@ self: { ]; benchmarkHaskellDepends = [ base bytestring criterion random ]; description = "Generate human memorable strings from binary data"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }) {}; "memory" = callPackage @@ -170153,7 +170890,7 @@ self: { ]; testHaskellDepends = [ base basement bytestring foundation ]; description = "memory and related abstraction stuff"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "memorypool" = callPackage @@ -170168,8 +170905,8 @@ self: { base containers transformers unsafe vector ]; description = "basic memory pool outside of haskell heap/GC"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -170211,8 +170948,8 @@ self: { tasty-th vector ]; description = "Haskell binding for Menoh DNN inference library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {menoh = null;}; @@ -170231,8 +170968,8 @@ self: { aeson base hspec QuickCheck regex-tdfa scientific text ]; description = "Data Validation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -170259,7 +170996,7 @@ self: { base bytestring directory HUnit optparse-applicative text ]; description = "Haskell binding to Mercury API for ThingMagic RFID readers"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "merge-bash-history" = callPackage @@ -170278,7 +171015,7 @@ self: { executableHaskellDepends = [ base optparse-applicative text ]; testHaskellDepends = [ base ]; description = "command line utility to merge bash_history"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "mergeful" = callPackage @@ -170293,7 +171030,7 @@ self: { aeson base containers deepseq mtl text time validity validity-containers validity-time ]; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "mergeful-persistent" = callPackage @@ -170317,8 +171054,8 @@ self: { validity validity-persistent ]; description = "Support for using mergeful from persistent-based databases"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {genvalidity-persistent = null; validity-persistent = null;}; @@ -170333,7 +171070,7 @@ self: { libraryHaskellDepends = [ aeson base containers deepseq mtl validity validity-containers ]; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "mergeless-persistent" = callPackage @@ -170357,8 +171094,8 @@ self: { text validity ]; description = "Support for using mergeless from persistent-based databases"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {genvalidity-persistent = null;}; @@ -170384,7 +171121,7 @@ self: { memory merkle-tree mwc-random QuickCheck random random-bytestring ]; description = "Merkle Tree Logs"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "merkle-patricia-db" = callPackage @@ -170410,8 +171147,8 @@ self: { test-framework-hunit transformers ]; description = "A modified Merkle Patricia DB"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -170431,8 +171168,8 @@ self: { random tasty tasty-quickcheck ]; description = "An implementation of a Merkle tree and merkle tree proofs of inclusion"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -170444,7 +171181,7 @@ self: { sha256 = "193qz3wn7lz18aywddr9qyn8v08ifv2yxwr68c67p5mn8vr8mvmw"; libraryHaskellDepends = [ base old-time ]; description = "Generate high quality pseudorandom numbers using a SIMD Fast Mersenne Twister"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "mersenne-random-pure64" = callPackage @@ -170457,7 +171194,7 @@ self: { editedCabalFile = "0pxq0xz42x60993rl4pr4pia80jv1xcqh6njvjzfvn75018j4gw5"; libraryHaskellDepends = [ base random time ]; description = "Generate high quality pseudorandom numbers purely using a Mersenne Twister"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "messagepack" = callPackage @@ -170479,7 +171216,7 @@ self: { test-framework-quickcheck2 test-framework-th ]; description = "Serialize instance for Message Pack Object"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "messagepack-rpc" = callPackage @@ -170496,8 +171233,8 @@ self: { base bytestring cereal containers messagepack network-simple ]; description = "Message Pack RPC over TCP"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -170511,8 +171248,8 @@ self: { base bytestring HTTP http-conduit network ]; description = "Messente SMS Gateway"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -170524,8 +171261,8 @@ self: { sha256 = "0pxsg67r2z0f9zxr8m98sndlii0bixyxwgjkc31z5743ciw9ch0c"; libraryHaskellDepends = [ base loch-th template-haskell ]; description = "Utility library providing miscellaneous meta-programming utilities"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -170542,8 +171279,8 @@ self: { mwc-random transformers vector ]; description = "Provides the monad-par interface, but based on modular scheduler \"mix-ins\""; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -170561,8 +171298,8 @@ self: { array base meta-par QuickCheck transformers vector ]; description = "Support for integrated Accelerate computations within Meta-par"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -170574,8 +171311,8 @@ self: { sha256 = "0860ggpksvaagrb1gqvnpp8gx6xd6h05dqg2ciis6i2my9gxmcmz"; libraryHaskellDepends = [ base text time ]; description = "metadata library for semantic web"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -170588,7 +171325,7 @@ self: { libraryHaskellDepends = [ arrows base random Stream ]; description = "Generalised local search within Haskell, for applications in combinatorial optimisation"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -170601,7 +171338,7 @@ self: { libraryHaskellDepends = [ base ]; description = "metamorphisms: ana . cata or understanding folds and unfolds"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "metaplug" = callPackage @@ -170612,8 +171349,8 @@ self: { sha256 = "086n9kqyi2jqki31jgylm0r63ahgvw3pf7mi5hln2m86a5x4ij4n"; libraryHaskellDepends = [ base Cabal filepath ghc haskell98 ]; description = "a tiny ghc api wrapper"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -170639,8 +171376,8 @@ self: { base checkers lens QuickCheck tasty tasty-hunit tasty-quickcheck ]; description = "Australian METAR"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -170665,8 +171402,8 @@ self: { base checkers lens QuickCheck tasty tasty-hunit tasty-quickcheck ]; description = "HTTP for METAR"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -170674,13 +171411,13 @@ self: { ({ mkDerivation, base, hspec, hspec-discover, rio, transformers }: mkDerivation { pname = "method"; - version = "0.1.0.0"; - sha256 = "0j8jvjc663gkmx7bpzj30q1sfqpxjg16166xklvvgk0i01zh4rw7"; + version = "0.2.0.0"; + sha256 = "0vgh0ri5r1jsfax5qafvkqqnkywk4qayaw54dwhh5i3p1n5cqkqa"; libraryHaskellDepends = [ base rio transformers ]; testHaskellDepends = [ base hspec rio transformers ]; testToolDepends = [ hspec-discover ]; description = "rebindable methods for improving testability"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "metric" = callPackage @@ -170698,8 +171435,8 @@ self: { base QuickCheck test-framework test-framework-quickcheck2 vector ]; description = "Metric spaces"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -170722,7 +171459,7 @@ self: { async base HUnit lens mwc-random primitive QuickCheck ]; description = "High-performance application metric tracking"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "metricsd-client" = callPackage @@ -170733,8 +171470,8 @@ self: { sha256 = "1q807wvmj1q605257jj60h0j2wal6ypjiad9wkjmv836p3mis5q9"; libraryHaskellDepends = [ base network ]; description = "Client for the metrics aggregator Metricsd"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -170751,7 +171488,7 @@ self: { unliftio unordered-containers ]; description = "A simple tcp and udp socket server framework"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "metro-socket" = callPackage @@ -170767,7 +171504,7 @@ self: { transformers unliftio ]; description = "Socket transport for metro"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "metro-transport-crypto" = callPackage @@ -170785,7 +171522,7 @@ self: { base bytestring cryptonite metro QuickCheck quickcheck-instances ]; description = "Crypto transport for metro"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "metro-transport-tls" = callPackage @@ -170801,7 +171538,7 @@ self: { x509-validation ]; description = "TLS transport for metro"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "metro-transport-websockets" = callPackage @@ -170812,7 +171549,7 @@ self: { sha256 = "1jyy3sssz8ixwqdlf8zph05pfrm6qnf56sjsq8bx6yah9psy92dg"; libraryHaskellDepends = [ base bytestring metro websockets ]; description = "Websockets transport for metro"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "metro-transport-xor" = callPackage @@ -170823,7 +171560,7 @@ self: { sha256 = "1hx839sxd2lrx6vsxswi4i88x1d1489jcdmh2vbnc2dvnssnqcpv"; libraryHaskellDepends = [ base bytestring metro unliftio ]; description = "XOR transport for metro"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "metronome" = callPackage @@ -170836,8 +171573,8 @@ self: { base data-lens data-lens-template hosc stm ]; description = "Time Synchronized execution"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -170858,8 +171595,8 @@ self: { base deepseq hspec HUnit QuickCheck should-not-typecheck ]; description = "Typesafe music composition"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -170871,8 +171608,8 @@ self: { sha256 = "0ayz8sdxakrwb0arnbq9rv876f5jbkmycj3jr00p82vhfdyvwll2"; libraryHaskellDepends = [ base containers mtl transformers ]; description = "Pure Profunctor Functional Lenses"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -170889,7 +171626,7 @@ self: { ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Equation solver and calculator à la metafont"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "mgeneric" = callPackage @@ -170902,8 +171639,8 @@ self: { base containers lens mtl template-haskell ]; description = "Generics with multiple parameters"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -170919,8 +171656,8 @@ self: { base haskell-src-meta parsec split template-haskell ]; description = "Multiple Instance for Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -170936,8 +171673,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base ]; description = "spam"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -170966,7 +171703,7 @@ self: { wai-websockets warp websockets yaml ]; description = "A Micro service gateway"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "micro-recursion-schemes" = callPackage @@ -170983,8 +171720,8 @@ self: { libraryToolDepends = [ cpphs ]; testHaskellDepends = [ base HUnit template-haskell ]; description = "Simple recursion schemes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -171008,19 +171745,19 @@ self: { tasty tasty-quickcheck text unordered-containers vector ]; description = "A tiny JSON library with light dependency footprint"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "microbase" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "microbase"; - version = "4.14.0.0.6"; - sha256 = "1wnng6ik7p4id5p7crbk9gwy0c4rg2rggkphc4wqfmc2zgpl1ywq"; + version = "4.15.0.0.1"; + sha256 = "0dslfkfvjr5zfdw5vmxi1xrblvy3g0l13d38m4c30rgl3nhxyjlm"; libraryHaskellDepends = [ base ]; doHaddock = false; description = "A minimal base to work around GHC bugs"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "microbench" = callPackage @@ -171031,7 +171768,7 @@ self: { sha256 = "05yphn77rxg7zqpn27292yvmah2634hqfx2mgfyp5yws5ickrvkg"; libraryHaskellDepends = [ base time ]; description = "Microbenchmark Haskell code"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "microc" = callPackage @@ -171046,7 +171783,7 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "microc compiler"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "microformats2-parser" = callPackage @@ -171082,8 +171819,8 @@ self: { raw-strings-qq template-haskell text time xml-lens ]; description = "A Microformats 2 parser"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -171099,8 +171836,8 @@ self: { aeson base data-default-class pandoc-types setters text time ]; description = "Microformats 2 types (with Aeson instances)"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -171112,8 +171849,8 @@ self: { sha256 = "1dfkiiiksb4wnf6kgxmla37w1xmmxpzim4ribjckvn58pd2hn2a0"; libraryHaskellDepends = [ base primitive vector ]; description = "Array-backed extensible records"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -171125,7 +171862,7 @@ self: { sha256 = "1z6zdprpr193a56r5s67q75554rrqyp2kk6srxn1gif7fd54sj2f"; libraryHaskellDepends = [ base ]; description = "A tiny lens library with no dependencies"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "microlens_0_4_12_0" = callPackage @@ -171136,8 +171873,8 @@ self: { sha256 = "10q7gl9yavcln58sxdxzih7ff0ixxq5hpd87icvxw97yqf1p6hmm"; libraryHaskellDepends = [ base ]; description = "A tiny lens library with no dependencies"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "microlens-aeson" = callPackage @@ -171158,7 +171895,7 @@ self: { text unordered-containers vector ]; description = "Law-abiding lenses for Aeson, using microlens"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "microlens-contra" = callPackage @@ -171169,7 +171906,7 @@ self: { sha256 = "1ny9qhvd7rfzdkq4jdcgh4mfia856rsgpdhg8lprfprh6p7lhy5m"; libraryHaskellDepends = [ base microlens ]; description = "True folds and getters for microlens"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "microlens-each" = callPackage @@ -171180,8 +171917,8 @@ self: { sha256 = "00bk2vriwh8aj2c6n5g2w84pfq0nssfa62iw97dm9c3zkp558wxj"; libraryHaskellDepends = [ base microlens ]; description = "'each' for microlens"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -171197,7 +171934,7 @@ self: { array base bytestring containers microlens transformers ]; description = "microlens + array, bytestring, containers, transformers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "microlens-ghc_0_4_13" = callPackage @@ -171212,8 +171949,8 @@ self: { array base bytestring containers microlens transformers ]; description = "microlens + array, bytestring, containers, transformers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "microlens-mtl" = callPackage @@ -171228,7 +171965,7 @@ self: { base microlens mtl transformers transformers-compat ]; description = "microlens support for Reader/Writer/State from mtl"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "microlens-platform" = callPackage @@ -171244,7 +171981,7 @@ self: { text unordered-containers vector ]; description = "microlens + all batteries included (best for apps)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "microlens-platform_0_4_2" = callPackage @@ -171260,8 +171997,8 @@ self: { text unordered-containers vector ]; description = "microlens + all batteries included (best for apps)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "microlens-process" = callPackage @@ -171278,27 +172015,10 @@ self: { libraryHaskellDepends = [ base filepath microlens process ]; testHaskellDepends = [ base doctest microlens process ]; description = "Micro-optics for the process library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "microlens-th" = callPackage - ({ mkDerivation, base, containers, microlens, template-haskell - , th-abstraction, transformers - }: - mkDerivation { - pname = "microlens-th"; - version = "0.4.3.8"; - sha256 = "0dy3vrqcw7ahlcwcqfw8jhisy4yj58f91pk4djqqvj8lnx74cm9f"; - libraryHaskellDepends = [ - base containers microlens template-haskell th-abstraction - transformers - ]; - testHaskellDepends = [ base microlens ]; - description = "Automatic generation of record lenses for microlens"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "microlens-th_0_4_3_9" = callPackage ({ mkDerivation, base, containers, microlens, tagged , template-haskell, th-abstraction, transformers }: @@ -171312,8 +172032,7 @@ self: { ]; testHaskellDepends = [ base microlens tagged ]; description = "Automatic generation of record lenses for microlens"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; }) {}; "micrologger" = callPackage @@ -171330,8 +172049,8 @@ self: { ]; testHaskellDepends = [ aeson base hspec text ]; description = "A super simple logging module"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -171349,8 +172068,8 @@ self: { http-media mtl safe servant servant-client text time xml ]; description = "Bindings to the Microsoft Translator API"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -171362,7 +172081,7 @@ self: { sha256 = "0615gdbsk7i3w71adjp69zabw4mli965wffm2h846hp6pjj31xcb"; libraryHaskellDepends = [ base QuickCheck time ]; description = "Tiny QuickCheck test library with minimal dependencies"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "microstache" = callPackage @@ -171382,7 +172101,7 @@ self: { aeson base bytestring containers hspec parsec text ]; description = "Mustache templates for Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "microtimer" = callPackage @@ -171393,7 +172112,7 @@ self: { sha256 = "09w8jn6g8fq3zsp2ahdrzv33mvayh8vladmc2wf8pbmpmdii0kap"; libraryHaskellDepends = [ base time ]; description = "A tiny library for benchmarking IO actions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "mida" = callPackage @@ -171424,8 +172143,8 @@ self: { tf-random transformers ]; description = "Language for algorithmic generation of MIDI files"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -171437,7 +172156,7 @@ self: { sha256 = "1dkja5arps41wanhv1jnkf99xrc8f5aiimp27myd595lqqdr87s2"; libraryHaskellDepends = [ base containers safe stm ]; description = "Hot-swappable FRP"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "midi" = callPackage @@ -171472,8 +172191,8 @@ self: { alsa-seq base data-accessor midi utility-ht ]; description = "Convert between datatypes of the midi and the alsa packages"; - license = stdenv.lib.licenses.bsd3; - platforms = [ "i686-linux" "x86_64-linux" ]; + license = lib.licenses.bsd3; + platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ]; }) {}; "midi-music-box" = callPackage @@ -171492,8 +172211,8 @@ self: { optparse-applicative utility-ht ]; description = "Convert MIDI file to music box punch tape"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -171515,7 +172234,7 @@ self: { ]; benchmarkHaskellDepends = [ base bytestring criterion ]; description = "A simple and fast library for working with MIDI messages"; - license = stdenv.lib.licenses.lgpl3; + license = lib.licenses.lgpl3; }) {}; "midi-util" = callPackage @@ -171529,7 +172248,7 @@ self: { base containers event-list midi non-negative ]; description = "Utility functions for processing MIDI files"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "midi-utils" = callPackage @@ -171545,8 +172264,8 @@ self: { base bytestring directory event-list midi parsec process ]; description = "Utilities for working with MIDI data"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -171566,8 +172285,8 @@ self: { random transformers utility-ht wx wxcore ]; description = "A Memory-like (Concentration, Pairs, ...) game for tones"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -171585,8 +172304,8 @@ self: { alsa-core alsa-seq base containers gtk mtl stm ]; description = "A control midi surface"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -171607,8 +172326,8 @@ self: { hslogger network parsec time unix webserver ]; description = "Simple Web Server in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -171641,7 +172360,7 @@ self: { ]; testHaskellDepends = [ base hspec http-client ]; description = "High performance web server on WAI/warp"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "mighty-metropolis" = callPackage @@ -171661,7 +172380,7 @@ self: { base containers foldl hspec mcmc-types mwc-probability mwc-random ]; description = "The Metropolis algorithm"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "migrant-core" = callPackage @@ -171677,8 +172396,8 @@ self: { base HUnit QuickCheck tasty tasty-hunit tasty-quickcheck text ]; description = "Semi-automatic database schema migrations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -171697,8 +172416,8 @@ self: { tasty tasty-hunit tasty-quickcheck text ]; description = "Semi-automatic database schema migrations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -171719,8 +172438,8 @@ self: { tasty tasty-hunit tasty-quickcheck text ]; description = "Semi-automatic database schema migrations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -171738,8 +172457,8 @@ self: { tasty-quickcheck text ]; description = "Semi-automatic database schema migrations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -171754,7 +172473,7 @@ self: { libraryHaskellDepends = [ base bytestring ]; description = "MikMod bindings"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -171780,8 +172499,8 @@ self: { tasty-quickcheck ]; description = "Lambda calculus interpreter"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -171798,8 +172517,8 @@ self: { http-types mtl wai wai-extra ]; description = "A minimum web dev DSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -171823,8 +172542,8 @@ self: { tasty-hspec tasty-quickcheck ]; description = "A Kafka client for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -171838,7 +172557,7 @@ self: { editedCabalFile = "07r4kyjm2bk8knyhbfivgxlxnxp7qqlcnzp61f2hi7d1s7clg290"; libraryHaskellDepends = [ base text ]; description = "Working with MIME types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "mime-directory" = callPackage @@ -171854,7 +172573,7 @@ self: { ]; description = "A library for parsing/printing the text/directory mime type"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -171872,7 +172591,7 @@ self: { ]; testHaskellDepends = [ base blaze-builder bytestring hspec text ]; description = "Compose MIME email messages"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "mime-mail-ses" = callPackage @@ -171901,7 +172620,7 @@ self: { base bytestring case-insensitive tasty tasty-hunit time ]; description = "Send mime-mail messages via Amazon SES"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "mime-string" = callPackage @@ -171918,7 +172637,7 @@ self: { ]; description = "MIME implementation for String's"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "mime-types" = callPackage @@ -171929,7 +172648,7 @@ self: { sha256 = "1lkipa4v73z3l5lqs6sdhl898iq41kyxv2jb9agsajzgd58l6cha"; libraryHaskellDepends = [ base bytestring containers text ]; description = "Basic mime-type handling types and functions"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "min-max-pqueue" = callPackage @@ -171946,7 +172665,7 @@ self: { base containers criterion integer-logarithms random ]; description = "Double-ended priority queues"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "minecraft" = callPackage @@ -171957,7 +172676,7 @@ self: { sha256 = "07h6hgq4k1wm4ldwb29fgmmbl9ygrlbq3qv3ymfvc25l5rvgss4h"; doHaddock = false; description = "TBA"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "minecraft-data" = callPackage @@ -171975,8 +172694,8 @@ self: { time vector zlib ]; description = "a DSL for generating minecraft commands and levels"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -171992,7 +172711,7 @@ self: { executableHaskellDepends = [ base directory mtl random ]; description = "Minesweeper simulation using neural networks"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "minesweeper" = callPackage @@ -172011,8 +172730,8 @@ self: { filepath glade gtk random time ]; description = "Minesweeper game which is always solvable without guessing"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -172034,8 +172753,8 @@ self: { executableHaskellDepends = [ base sort ]; testHaskellDepends = [ base hspec primes ]; description = "Template Haskell Implementation of Egison Pattern Matching"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -172047,7 +172766,7 @@ self: { sha256 = "16fdzbfspxqi0h7v6gn25n065anvk9zm28236qvfwbvr9l2ki172"; libraryHaskellDepends = [ base vector ]; description = "Bindings to Miniball, a smallest enclosing ball library"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "miniforth" = callPackage @@ -172068,8 +172787,8 @@ self: { base containers lens mtl parsec readline ]; description = "Miniature FORTH-like interpreter"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -172085,8 +172804,8 @@ self: { array base bytestring containers mtl semigroups text transformers ]; description = "A minimalistic lens library, providing only the simplest, most basic lens functionality"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -172118,8 +172837,8 @@ self: { ]; testToolDepends = [ tasty-discover ]; description = "A SDL2-based graphics library, batteries-included"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -172140,8 +172859,8 @@ self: { ]; executableHaskellDepends = [ base lens minilight mtl ]; description = "A binding library of minilight for Lua langauge"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -172154,7 +172873,7 @@ self: { libraryHaskellDepends = [ base containers directory filepath ]; description = "Minimal ini like configuration library with a few extras"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "minimorph" = callPackage @@ -172170,7 +172889,7 @@ self: { base HUnit test-framework test-framework-hunit text ]; description = "English spelling functions with an emphasis on simplicity"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "minimung" = callPackage @@ -172183,8 +172902,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base GLUT haskell98 unix ]; description = "Shows how to run grabber on Mac OS X"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -172222,7 +172941,7 @@ self: { unordered-containers xml-conduit ]; description = "A MinIO Haskell Library for Amazon S3 compatible cloud storage"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "minions" = callPackage @@ -172237,8 +172956,8 @@ self: { ansi-terminal base MissingH process time ]; description = "A fast parallel ssh tool"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -172255,8 +172974,8 @@ self: { transformers ]; description = "fast and simple operational monad"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -172274,7 +172993,7 @@ self: { ]; description = "simple 1-to-N interprocess communication"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -172294,8 +173013,8 @@ self: { old-locale old-time process safe split template-haskell ]; description = "Minimalistic file rotation utility"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -172307,7 +173026,7 @@ self: { sha256 = "089jam2cbwf4m16sgb9wh4zkgbmpfsg647lng3kyjs5d3m02i5dd"; libraryHaskellDepends = [ async base ]; description = "A Haskell bundle of the Minisat SAT solver"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "minisat-solver" = callPackage @@ -172319,7 +173038,7 @@ self: { libraryHaskellDepends = [ base containers transformers ]; benchmarkHaskellDepends = [ base containers easyrender ]; description = "High-level Haskell bindings for the MiniSat SAT solver"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "ministg" = callPackage @@ -172337,8 +173056,8 @@ self: { transformers xhtml ]; description = "an interpreter for an operational semantics for the STG machine"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -172353,7 +173072,7 @@ self: { base containers filepath OpenGL stb-truetype ]; description = "Layout and render text with TrueType fonts using OpenGL"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "miniutter" = callPackage @@ -172370,7 +173089,7 @@ self: { base containers HUnit test-framework test-framework-hunit text ]; description = "Simple English clause creation from arbitrary words"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "minizinc-process" = callPackage @@ -172390,8 +173109,8 @@ self: { aeson base hashable hedgehog hspec hspec-hedgehog ]; description = "A set of helpers to call minizinc models"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -172406,7 +173125,7 @@ self: { base mono-traversable semigroups transformers ]; description = "Express the minimum length of a container in its type"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "minst-idx" = callPackage @@ -172419,8 +173138,8 @@ self: { libraryHaskellDepends = [ base binary bytestring vector ]; testHaskellDepends = [ base binary directory hspec vector ]; description = "Read and write IDX data that is used in e.g. the MINST database."; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -172432,7 +173151,7 @@ self: { sha256 = "1njhz7wjmsk5pbr7gfkl95k50npkmm0iyxp3j93bbsg4rmxzg2kw"; libraryHaskellDepends = [ base ]; description = "A reliable way to detect the presence of a MinTTY console on Windows"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "mios" = callPackage @@ -172455,8 +173174,8 @@ self: { base bytestring ghc-prim hspec primitive vector ]; description = "A Minisat-based CDCL SAT solver in Haskell"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -172475,8 +173194,8 @@ self: { transformers twitter-conduit ]; description = "Tweet mirror"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -172498,7 +173217,7 @@ self: { ]; executableHaskellDepends = [ monad-loops regex-base regex-pcre ]; description = "fortune-mod clone"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "mismi-core" = callPackage @@ -172521,8 +173240,8 @@ self: { mmorph resourcet transformers ]; description = "AWS Library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {mismi-core-test = null;}; @@ -172535,7 +173254,7 @@ self: { libraryHaskellDepends = [ base mismi-p text ]; testHaskellDepends = [ base hedgehog mismi-p text ]; description = "AWS Library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "mismi-p" = callPackage @@ -172548,7 +173267,7 @@ self: { editedCabalFile = "1nhb8lz21qn4rmgwn0b8vr771fcpykg13zvp7qsrsz5jvd3ylifg"; libraryHaskellDepends = [ base text ]; description = "A commmon prelude for the mismi project"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "mismi-s3" = callPackage @@ -172589,8 +173308,8 @@ self: { text transformers unix uuid ]; description = "AWS Library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {mismi-core-test = null; mismi-s3-core-test = null;}; @@ -172603,7 +173322,7 @@ self: { libraryHaskellDepends = [ attoparsec base mismi-p text ]; testHaskellDepends = [ base hedgehog mismi-p text ]; description = "AWS Library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "miso" = callPackage @@ -172622,8 +173341,8 @@ self: { network-uri servant servant-lucid text transformers vector ]; description = "A tasty Haskell front-end framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -172635,8 +173354,8 @@ self: { sha256 = "02xcj7ic4fh3h08h89naa2rl0rkksqx426wx8k8v0zl0d7rd12jc"; libraryHaskellDepends = [ aeson base ghcjs-base miso ]; description = "Miso state transition logger"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -172649,8 +173368,8 @@ self: { isLibrary = false; isExecutable = true; description = "A tasty Haskell front-end framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -172668,7 +173387,7 @@ self: { attoparsec base bytestring containers pretty-simple text ]; description = "Convert HTML to miso View syntax"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "miss" = callPackage @@ -172698,8 +173417,8 @@ self: { unix ]; description = "A Haskell git implimentation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -172718,8 +173437,8 @@ self: { mtl posix-paths ]; description = "Useability extras built on top of miss"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -172731,7 +173450,7 @@ self: { sha256 = "11f8pknbarlj956nmalqhd2v704z7d7xbi61hs1q8vb2p36kc6wy"; libraryHaskellDepends = [ base ]; description = "Convenience functions for FFI work"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "missing-py2" = callPackage @@ -172745,34 +173464,35 @@ self: { anydbm base Cabal directory HUnit MissingH ]; description = "Haskell interface to Python"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; "miv" = callPackage - ({ mkDerivation, aeson, async, base, concurrent-output, directory - , filepath, filepattern, ghc-prim, hashable, hspec, monad-parallel - , process, SafeSemaphore, text, time, unix-compat - , unordered-containers, xdg-basedir, yaml + ({ mkDerivation, async, base, bytestring, concurrent-output + , containers, directory, filepath, filepattern, ghc-prim, hspec + , HsYAML, monad-parallel, process, SafeSemaphore, text, time + , unix-compat, unordered-containers, xdg-basedir }: mkDerivation { pname = "miv"; - version = "0.4.6"; - sha256 = "1xf4frjvccjvkzgx9ha9q2i6ig5bx3z37igjb3s7a9zvqnvig06g"; + version = "0.4.8"; + sha256 = "1b3lplsnjf992rvidj48swccl8f8aqdik1sf481g7vwv2mz7d7m6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aeson async base concurrent-output directory filepath filepattern - ghc-prim hashable monad-parallel process SafeSemaphore text time - unix-compat unordered-containers xdg-basedir yaml + async base bytestring concurrent-output containers directory + filepath filepattern ghc-prim HsYAML monad-parallel process + SafeSemaphore text time unix-compat unordered-containers + xdg-basedir ]; testHaskellDepends = [ - aeson base directory ghc-prim hashable hspec monad-parallel process - text time unordered-containers yaml + base bytestring containers directory ghc-prim hspec HsYAML + monad-parallel process text time unordered-containers ]; description = "Vim plugin manager written in Haskell"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "mix-arrows" = callPackage @@ -172783,8 +173503,8 @@ self: { sha256 = "0m70l09bmr8b95d87rpz4vdircdar2rsvnamr2g07542wx024931"; libraryHaskellDepends = [ base ]; description = "Mixing effects of one arrow into another one"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -172801,8 +173521,8 @@ self: { array base containers simple-tabular ]; description = "Find optimal mixed strategies for two-player games"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -172812,15 +173532,15 @@ self: { }: mkDerivation { pname = "mixed-types-num"; - version = "0.4.0.2"; - sha256 = "0kirxpnmwwnbxamwpzrxyx69n482xhifqpr5id73pfni7lrd126p"; + version = "0.4.1"; + sha256 = "159zx9b5p3g1ywhnbihjbxkpxylgrkhhrswmazymqbh49f4s758y"; libraryHaskellDepends = [ base hspec hspec-smallcheck mtl QuickCheck smallcheck template-haskell ]; testHaskellDepends = [ base hspec hspec-smallcheck QuickCheck ]; description = "Alternative Prelude with numeric and logic expressions typed bottom-up"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "mixpanel-client" = callPackage @@ -172843,8 +173563,8 @@ self: { ]; testToolDepends = [ hspec-discover markdown-unlit ]; description = "Mixpanel client"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -172860,7 +173580,7 @@ self: { executableHaskellDepends = [ base directory filepath haskell98 ]; description = "Makes an OS X .app bundle from a binary."; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -172880,7 +173600,7 @@ self: { ]; description = "Generate cabal files for a Haskell project"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -172895,8 +173615,8 @@ self: { libraryHaskellDepends = [ base mtl parsec pretty ]; executableHaskellDepends = [ base mtl parsec pretty ]; description = "Minimal ML language to to demonstrate the W type infererence algorithm"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -172908,8 +173628,8 @@ self: { sha256 = "06mwmahyp781wigjva12kz7w75vjkkprl8k1yiqd1yd0162vp31k"; libraryHaskellDepends = [ base haskell98 ]; description = "Monadic List alternative to lazy I/O"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -172933,7 +173653,7 @@ self: { vector ]; description = "Machine Learning Toolbox"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "mm2" = callPackage @@ -172944,8 +173664,8 @@ self: { sha256 = "0zn629lm41z6b59snnjkqdk41ryimjhd5yapiwykl5fg0f7wmap3"; libraryHaskellDepends = [ base vector ]; description = "The library that can be used for optimization of multiple (Ord a) => a -> b transformations"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -172959,7 +173679,7 @@ self: { isExecutable = true; libraryHaskellDepends = [ base bytestring ]; description = "Memory mapped files for POSIX and Windows"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "mmark" = callPackage @@ -172988,7 +173708,7 @@ self: { ]; benchmarkHaskellDepends = [ base criterion text weigh ]; description = "Strict markdown processor for writers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "mmark-cli" = callPackage @@ -173011,7 +173731,7 @@ self: { unordered-containers ]; description = "Command line interface to the MMark markdown processor"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "mmark-ext" = callPackage @@ -173033,7 +173753,7 @@ self: { testHaskellDepends = [ base hspec lucid mmark skylighting text ]; testToolDepends = [ hspec-discover ]; description = "Commonly useful extensions for the MMark markdown processor"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "mmorph" = callPackage @@ -173046,7 +173766,7 @@ self: { base mtl transformers transformers-compat ]; description = "Monad morphisms"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "mmsyn2" = callPackage @@ -173057,7 +173777,7 @@ self: { sha256 = "06n8vxqafc698ahml782klb41g9bfsvqdrl4k0blnn3m3vavnzxy"; libraryHaskellDepends = [ base vector ]; description = "The library that can be used for multiple (Ord a) => a -> b transformations"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "mmsyn2-array" = callPackage @@ -173068,7 +173788,7 @@ self: { sha256 = "0dcvs5s11s840fvl17h5qrz5x6fmzvvjkfxmbk8r0p13n4k2a0ny"; libraryHaskellDepends = [ base ]; description = "A library with less dependencies that can be used for multiple Ord a => a -> b transformations"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "mmsyn3" = callPackage @@ -173079,7 +173799,7 @@ self: { sha256 = "0fpn0lzr93aaha9741spc7vmlg5c4x5wb3p4qvxzp57w85zqdwm3"; libraryHaskellDepends = [ base directory ]; description = "A small library to deal with executable endings"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "mmsyn4" = callPackage @@ -173093,7 +173813,7 @@ self: { libraryHaskellDepends = [ base directory mmsyn3 process ]; executableHaskellDepends = [ base directory mmsyn3 process ]; description = "The \"glue\" between electronic tables and GraphViz"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "mmsyn5" = callPackage @@ -173104,7 +173824,7 @@ self: { sha256 = "0xbdmlq71pjnsls67mydrfzajnnyyzp0dvzgrg2lms3pssvzs6f1"; libraryHaskellDepends = [ base ]; description = "Various additional operations on lists (some with intermediate Monads)"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "mmsyn6ukr" = callPackage @@ -173127,7 +173847,7 @@ self: { ukrainian-phonetics-basic vector ]; description = "A musical instrument synthesizer or a tool for Ukrainian language listening"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "mmsyn6ukr-array" = callPackage @@ -173150,7 +173870,7 @@ self: { ukrainian-phonetics-basic-array ]; description = "A musical instrument synthesizer or a tool for Ukrainian language listening"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "mmsyn7h" = callPackage @@ -173172,8 +173892,8 @@ self: { process vector ]; description = "Produces a sound recording specified by the Ukrainian text"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -173194,7 +173914,7 @@ self: { base directory mmsyn2 mmsyn3 mmsyn7ukr process vector ]; description = "Modifies the amplitudes of the Ukrainian sounds representations created by mmsyn7ukr package"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "mmsyn7s" = callPackage @@ -173208,7 +173928,7 @@ self: { libraryHaskellDepends = [ base mmsyn2 mmsyn5 mmsyn6ukr vector ]; executableHaskellDepends = [ base mmsyn2 mmsyn5 mmsyn6ukr vector ]; description = "Shows a sorted list of the Ukrainian sounds representations that can be used by mmsyn7 series of programs"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "mmsyn7ukr" = callPackage @@ -173229,7 +173949,18 @@ self: { base bytestring directory mmsyn2 mmsyn3 mmsyn6ukr process vector ]; description = "A simple basic interface to some SoX functionality or to produce a voice that can be used by mmsyn7h"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; + }) {}; + + "mmsyn7ukr-common" = callPackage + ({ mkDerivation, base, directory, mmsyn3, process }: + mkDerivation { + pname = "mmsyn7ukr-common"; + version = "0.1.1.0"; + sha256 = "000xkm0yvj6sxmnkzax98gc3rv0cfkfglfznf84p32axmxa4vg0q"; + libraryHaskellDepends = [ base directory mmsyn3 process ]; + description = "Some common for mmsyn7ukr and mmsyn7ukr-array functionality using SoX"; + license = lib.licenses.mit; }) {}; "mmtf" = callPackage @@ -173249,8 +173980,8 @@ self: { http-conduit QuickCheck text ]; description = "Macromolecular Transmission Format implementation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -173262,8 +173993,8 @@ self: { sha256 = "0bb19l52s56y2dwyskvjwdal7387ii2dg9cc1l6f341y3695nj7l"; libraryHaskellDepends = [ base ]; description = "Modular Monad transformer library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -173277,8 +174008,8 @@ self: { editedCabalFile = "1iby6x0pkqz4447nr5aqpzch2msqb76bdypcprpi5y8djr51x248"; libraryHaskellDepends = [ base mmtl ]; description = "MonadBase type-class for mmtl"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -173292,7 +174023,7 @@ self: { libraryHaskellDepends = [ base binary bytestring vector ]; testHaskellDepends = [ base binary directory hspec vector ]; description = "Read and write IDX data that is used in e.g. the MNIST database."; - license = stdenv.lib.licenses.lgpl3; + license = lib.licenses.lgpl3; }) {}; "moan" = callPackage @@ -173308,8 +174039,8 @@ self: { tagset-positional text zlib ]; description = "Language-agnostic analyzer for positional morphosyntactic tags"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -173328,7 +174059,7 @@ self: { relude text wai warp yaml ]; description = "A HTTP server for testing HTTP clients"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }) {}; "mock-time" = callPackage @@ -173350,7 +174081,7 @@ self: { unliftio-core ]; description = "Mock time in tests"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "mockazo" = callPackage @@ -173368,7 +174099,7 @@ self: { base constraints hspec multistate relude template-haskell ]; description = "Mock records of functions easily"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "mockery" = callPackage @@ -173388,7 +174119,7 @@ self: { temporary ]; description = "Support functions for automated testing"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "mod" = callPackage @@ -173409,7 +174140,7 @@ self: { ]; benchmarkHaskellDepends = [ base time ]; description = "Fast type-safe modular arithmetic"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "modbus-tcp" = callPackage @@ -173422,7 +174153,7 @@ self: { base bytestring cereal mtl transformers ]; description = "Communicate with Modbus devices over TCP"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "model" = callPackage @@ -173441,7 +174172,7 @@ self: { base containers doctest filemanip ghc-prim pretty tasty tasty-hunit ]; description = "Derive a model of a data type using Generics"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "modelicaparser" = callPackage @@ -173457,8 +174188,8 @@ self: { ansi-terminal base containers filepath parsec QuickCheck ]; description = "A parser for the modelica language"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -173485,7 +174216,7 @@ self: { base bytestring criterion deepseq megaparsec text weigh ]; description = "Modern library for working with URIs"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "modify-fasta" = callPackage @@ -173508,8 +174239,8 @@ self: { semigroups split text transformers ]; description = "Modify fasta (and CLIP) files in several optional ways"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -173530,8 +174261,8 @@ self: { base directory filepath haskell98 mtl utf8-string ]; description = "Haskell source splitter driven by special comments"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -173543,7 +174274,7 @@ self: { sha256 = "1igg7am4z1kfvpyp5a53rsqan5i209rp1s0z9xamqydx60ilc2s3"; libraryHaskellDepends = [ base ghc-typelits-knownnat ]; description = "Type-safe modular arithmetic"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "modular-arithmetic" = callPackage @@ -173555,7 +174286,7 @@ self: { libraryHaskellDepends = [ base typelits-witnesses ]; testHaskellDepends = [ base doctest typelits-witnesses ]; description = "A type for integers modulo some constant"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "modular-prelude" = callPackage @@ -173572,8 +174303,8 @@ self: { system-filepath text transformers unordered-containers vector ]; description = "A new Prelude featuring first class modules"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -173585,8 +174316,8 @@ self: { sha256 = "1izinrgd9a6sm57isg8jgs4wjidczwqcxl6vg5h4gy5zz9dg8xnx"; libraryHaskellDepends = [ base classy-prelude modular-prelude ]; description = "Reifying ClassyPrelude a la ModularPrelude"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -173602,8 +174333,8 @@ self: { base hmatrix sparse-linear-algebra spectral-clustering vector ]; description = "Find the modularity of a network"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -173634,8 +174365,8 @@ self: { base containers filepath haskell-src-exts HUnit process ]; description = "Clean up module imports, split and merge modules"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -173652,8 +174383,8 @@ self: { transformers ]; description = "Template Haskell for introspecting a module's declarations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -173673,8 +174404,8 @@ self: { nats pandoc-types parsec prettify process semigroups text ]; description = "Modular C code generator"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -173690,8 +174421,8 @@ self: { air base bytestring data-default dlist mtl text ]; description = "html with style"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -173714,8 +174445,8 @@ self: { unordered-containers ]; description = "A functional firewall killer"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -173738,8 +174469,8 @@ self: { old-locale old-time parsec process transformers unix utility-ht ]; description = "Modular Haskell Web Server"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -173770,8 +174501,8 @@ self: { smallcheck stm text time unordered-containers vector ]; description = "A glorified string replacement tool"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -173797,8 +174528,8 @@ self: { tasty-hunit time ]; description = "Mollie API client for Haskell http://www.mollie.com"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -173815,7 +174546,7 @@ self: { transformers-compat ]; description = "A better error monad transformer"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "monad-atom" = callPackage @@ -173826,8 +174557,8 @@ self: { sha256 = "16dnp6wz0s56gm58k6m5cv5c47hb2vz1m4a3pqvrg3j97y344c3q"; libraryHaskellDepends = [ base containers ghc-prim mtl ]; description = "Monadically convert object to unique integers and back"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -173839,8 +174570,8 @@ self: { sha256 = "1k4rcrdjjs52p9mnsbwp0gmb2inivhcqw044l56dbc080yxrk32j"; libraryHaskellDepends = [ base containers ghc-prim mtl ]; description = "Monadically map objects to unique ints"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -173852,7 +174583,7 @@ self: { sha256 = "0zjyy9apc5zr51nh31p3f6bzbnfbc40hkf9p52370ynj4513lz4r"; libraryHaskellDepends = [ base exceptions ]; description = "An applicative monad that batches commands for later more efficient execution"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "monad-bayes" = callPackage @@ -173884,8 +174615,8 @@ self: { process vector ]; description = "A library for probabilistic programming"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -173898,7 +174629,7 @@ self: { libraryHaskellDepends = [ base ]; doHaddock = false; description = "This package has been removed"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "monad-branch" = callPackage @@ -173909,8 +174640,8 @@ self: { sha256 = "0g82ccql6pmj319ji3zpmxab78qwdlrjsl7cdfhjvv4m1i4kmzdf"; libraryHaskellDepends = [ base mtl transformers ]; description = "Monadic abstraction for computations that can be branched and run independently"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -173926,7 +174657,7 @@ self: { base contravariant invariant MonadRandom mtl primitive transformers ]; description = "Monad, monad transformer, and typeclass representing choices"; - license = stdenv.lib.licenses.agpl3; + license = lib.licenses.agpl3; }) {}; "monad-chronicle" = callPackage @@ -173942,7 +174673,7 @@ self: { transformers-compat ]; description = "These as a transformer, ChronicleT"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "monad-classes" = callPackage @@ -173963,7 +174694,7 @@ self: { transformers ]; description = "more flexible mtl"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "monad-classes-logging" = callPackage @@ -173981,7 +174712,7 @@ self: { base logging-effect monad-classes tasty tasty-hunit transformers ]; description = "monad-classes based typeclass for Ollie's logging-effect LoggingT"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "monad-codec" = callPackage @@ -173994,7 +174725,7 @@ self: { base binary containers data-lens-light mtl ]; description = "Monadic conversion between complex data structures and unique integers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "monad-connect" = callPackage @@ -174009,7 +174740,7 @@ self: { base bytestring connection exceptions transformers ]; description = "Transformer for TCP connection with TLS and SOCKS support"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "monad-control" = callPackage @@ -174024,7 +174755,7 @@ self: { base stm transformers transformers-base transformers-compat ]; description = "Lift control operations, like exception catching, through monad transformers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "monad-control-aligned" = callPackage @@ -174039,7 +174770,7 @@ self: { base stm transformers transformers-base transformers-compat ]; description = "Just like monad-control, except less efficient, and the monadic state terms are all * -> *"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "monad-control-identity" = callPackage @@ -174054,7 +174785,7 @@ self: { base monad-control transformers transformers-base ]; description = "Stronger classes than monad-control"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "monad-coroutine" = callPackage @@ -174085,7 +174816,7 @@ self: { ]; testHaskellDepends = [ base hlint tasty tasty-hspec ]; description = "A monad transformer for weighted graph searches"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "monad-exception" = callPackage @@ -174101,8 +174832,8 @@ self: { transformers-base ]; description = "Exstensible monadic exceptions"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -174118,7 +174849,7 @@ self: { base mmorph monad-control stm transformers transformers-base ]; description = "Extra utility functions for working with monads"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "monad-finally" = callPackage @@ -174134,7 +174865,7 @@ self: { transformers-base transformers-compat ]; description = "Guard monadic computations with cleanup actions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "monad-fork" = callPackage @@ -174145,8 +174876,8 @@ self: { sha256 = "15xwavq4yc3xfif4isjh9m0q9h1bh7pmv2i3rh99sndmd34cdpwc"; libraryHaskellDepends = [ base monad-control ]; description = "Type class for monads which support a fork operation"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -174158,7 +174889,7 @@ self: { sha256 = "0rc4r6sg29sjgh9xsk7q80h0lixhyxs60bszj5dnn8yf7w18b15y"; libraryHaskellDepends = [ base mtl transformers ]; description = "A simple monad for generating fresh integers"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "monad-hash" = callPackage @@ -174174,7 +174905,7 @@ self: { ]; testHaskellDepends = [ base bytestring cryptonite transformers ]; description = "Monad transformer for incremental hashing"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "monad-http" = callPackage @@ -174195,8 +174926,8 @@ self: { transformers transformers-compat ]; description = "A class of monads which can do http requests"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -174208,8 +174939,8 @@ self: { sha256 = "09hpl7ah5ivsrx4xlk96d129n1j4wpx7kj6l95zwadyaz7rj9fp7"; libraryHaskellDepends = [ base ]; description = "Monads with an unsaveInterleaveIO-like operation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -174224,7 +174955,7 @@ self: { base coercion-extras mmorph mtl transformers ]; description = "A reader monad that gives the environment access to the entire transformer stack"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "monad-io-adapter" = callPackage @@ -174241,7 +174972,7 @@ self: { ]; testHaskellDepends = [ base hspec transformers-base ]; description = "Adapters between MonadIO and MonadBase IO"; - license = stdenv.lib.licenses.isc; + license = lib.licenses.isc; }) {}; "monad-journal" = callPackage @@ -174256,7 +174987,7 @@ self: { base monad-control mtl transformers transformers-base ]; description = "Pure logger typeclass and monad transformer"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "monad-levels" = callPackage @@ -174271,8 +175002,8 @@ self: { base constraints transformers transformers-compat ]; description = "Specific levels of monad transformers"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -174291,8 +175022,8 @@ self: { base containers deepseq hspec logict mtl QuickCheck ]; description = "Monad transformers for combining local and global state"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -174312,8 +175043,8 @@ self: { monad-control template-haskell text text-show transformers ]; description = "A simple and fast logging monad"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -174335,7 +175066,7 @@ self: { transformers-compat unliftio-core ]; description = "A class of monads which can log messages"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "monad-logger-extras" = callPackage @@ -174353,7 +175084,7 @@ self: { ]; executableHaskellDepends = [ base monad-logger ]; description = "Utilities for composing loggers, coloring output, plus a few orphan instances"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "monad-logger-json" = callPackage @@ -174367,7 +175098,7 @@ self: { aeson base monad-logger template-haskell text ]; description = "JSON-friendly Logging APIs"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "monad-logger-logstash" = callPackage @@ -174383,7 +175114,7 @@ self: { transformers unliftio ]; description = "Logstash backend for monad-logger"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "monad-logger-prefix" = callPackage @@ -174401,7 +175132,7 @@ self: { ]; benchmarkHaskellDepends = [ base criterion monad-logger ]; description = "Add prefixes to your monad-logger output"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "monad-logger-syslog" = callPackage @@ -174418,7 +175149,7 @@ self: { base bytestring fast-logger hsyslog monad-logger text transformers ]; description = "syslog output for monad-logger"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "monad-loops" = callPackage @@ -174430,7 +175161,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Monadic loops"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "monad-loops-stm" = callPackage @@ -174441,7 +175172,7 @@ self: { sha256 = "0y7j2xpr1s7ggwm3vvpb5mlagsnxhq9qpncapibhk2pbf2d5r7as"; libraryHaskellDepends = [ base stm ]; description = "Monadic loops for STM"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "monad-lrs" = callPackage @@ -174460,8 +175191,8 @@ self: { test-framework-quickcheck2 ]; description = "a monad to calculate linear recursive sequence"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -174477,7 +175208,7 @@ self: { base base-compat MonadRandom mtl random transformers ]; description = "Markov process monad"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "monad-memo" = callPackage @@ -174500,7 +175231,7 @@ self: { array base containers criterion primitive transformers vector ]; description = "Memoization monad transformer"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "monad-mersenne-random" = callPackage @@ -174513,8 +175244,8 @@ self: { editedCabalFile = "1kyfaridmi15wcib9gxns6v252pdhgsbyi303sqrvwhwpx9n3rl4"; libraryHaskellDepends = [ base mersenne-random-pure64 ]; description = "An efficient random generator monad, based on the Mersenne Twister"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -174532,7 +175263,7 @@ self: { ]; testHaskellDepends = [ base ]; description = "A convenient wrapper around EKG metrics"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "monad-metrics-extensible" = callPackage @@ -174552,8 +175283,8 @@ self: { stm text ]; description = "An extensible and type-safe wrapper around EKG metrics"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -174572,8 +175303,8 @@ self: { ]; testHaskellDepends = [ base hspec mtl ]; description = "A monad transformer for mocking mtl-style typeclasses"; - license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -174585,8 +175316,8 @@ self: { sha256 = "18h24zdvbffnwr2xh4qahakr80z8ly65pmksmk3ngjykxrvif2vx"; libraryHaskellDepends = [ base exceptions mtl transformers ]; description = "Open recursion for when you need it"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -174598,7 +175329,7 @@ self: { sha256 = "1x65jvh816a296y2ds8vysfzl83am4pwwrnap4zdg0prpcxfpwl8"; libraryHaskellDepends = [ base containers mtl text vector ]; description = "Monad for observation extraction"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "monad-par" = callPackage @@ -174624,7 +175355,7 @@ self: { time ]; description = "A library for parallel programming based on a monad"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "monad-par-extras" = callPackage @@ -174639,7 +175370,7 @@ self: { abstract-par base cereal deepseq mtl random transformers ]; description = "Combinators and extra features for Par monads"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "monad-parallel" = callPackage @@ -174653,7 +175384,7 @@ self: { base parallel transformers transformers-compat ]; description = "Parallel execution of monadic computations"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "monad-parallel-progressbar" = callPackage @@ -174668,8 +175399,8 @@ self: { base monad-parallel monadIO terminal-progress-bar ]; description = "Parallel execution of monadic computations with a progress bar"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -174681,8 +175412,8 @@ self: { sha256 = "08rm902kclapqh1iafjrsqspf0szhbx5jaqv6hh9p5zbg8ipdkhc"; libraryHaskellDepends = [ base mtl stm ]; description = "Parameterized monads"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -174702,7 +175433,7 @@ self: { test-framework-hunit transformers ]; description = "Lift control operations like exception catching through monad transformers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "monad-persist" = callPackage @@ -174723,8 +175454,8 @@ self: { persistent-template text transformers ]; description = "An mtl-style typeclass and transformer for persistent"; - license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -174736,7 +175467,7 @@ self: { sha256 = "1vi6g65hdyq5vq78mfag0qljxgzb6vq83m82x3cpgjl7dr9k5h1x"; libraryHaskellDepends = [ base primitive transformers ]; description = "Type class for monad transformers stack with pirimitive base monad"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "monad-products" = callPackage @@ -174747,7 +175478,7 @@ self: { sha256 = "1skcjjkn14fh92l4rx3akxjg1c85jqhnlwvkkzqwz9g15bdy3gq2"; libraryHaskellDepends = [ base semigroupoids ]; description = "Monad products"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "monad-ran" = callPackage @@ -174758,8 +175489,8 @@ self: { sha256 = "04y9s2b4hz2f8khr0q62xy0f6l2v896s7x03i3s18i14bwscqlax"; libraryHaskellDepends = [ base ghc-prim mtl ]; description = "Fast monads and monad transformers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -174776,8 +175507,8 @@ self: { ]; testHaskellDepends = [ base hspec ]; description = "Record and replay the results of monadic actions"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -174789,7 +175520,7 @@ self: { sha256 = "0hc9dbqhd609lzn79c25zwhm55262i9yip16ag9rysxv6rxbshml"; libraryHaskellDepends = [ base mmorph mtl transformers ]; description = "Resumption and reactive resumption monads for Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "monad-skeleton" = callPackage @@ -174800,7 +175531,7 @@ self: { sha256 = "17jm69pwysx2kbx06n80iy396nbj5dys9iwdivargfzx7xql0s59"; libraryHaskellDepends = [ base ]; description = "Monads of program skeleta"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "monad-st" = callPackage @@ -174811,7 +175542,7 @@ self: { sha256 = "025zi9xzliwgyasq5hrfxwzg4ksj3kj0ys2kp62fi1n4ddbih64f"; libraryHaskellDepends = [ base transformers ]; description = "Provides a MonadST class"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "monad-state" = callPackage @@ -174826,8 +175557,8 @@ self: { AbortT-transformers base fclabels monads-tf transformers ]; description = "Utility library for monads, particularly those involving state"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -174840,8 +175571,8 @@ self: { libraryHaskellDepends = [ base transformers ]; testHaskellDepends = [ base stm ]; description = "Concise, overloaded accessors for IORef, STRef, TVar"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -174858,8 +175589,8 @@ self: { libraryHaskellDepends = [ base exceptions ghc-prim primitive ]; testHaskellDepends = [ base hspec HUnit ]; description = "ST monad with efficient explicit errors"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -174874,8 +175605,8 @@ self: { base bytestring containers deepseq monads-tf ]; description = "ST-like monad capturing variables to regions and supporting IO"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -174887,8 +175618,8 @@ self: { sha256 = "007rsq9x0dq8xmiimgqb0v8k15xizx63qmc76b1b8a66nfsd9w56"; libraryHaskellDepends = [ base monad-stlike-io stm ]; description = "ST-like monad capturing variables to regions and supporting STM"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -174900,7 +175631,7 @@ self: { sha256 = "09bbhbj9zg928j3dnvvxsrv8hw1c7s0vj0wffrhs810aqlf1m9xp"; libraryHaskellDepends = [ base stm transformers ]; description = "MonadSTM class analogous to MonadIO"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "monad-supply" = callPackage @@ -174912,7 +175643,7 @@ self: { libraryHaskellDepends = [ base mtl transformers ]; description = "Stateful supply monad"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "monad-task" = callPackage @@ -174923,8 +175654,8 @@ self: { sha256 = "02qp31w0zgms07b13km3aiina4iqbzxkiajab3b0czmc17xv4kx4"; libraryHaskellDepends = [ base mtl transformers ]; description = "A monad transformer that turns event processing into co-routine programming"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -174937,7 +175668,7 @@ self: { libraryHaskellDepends = [ base mtl time ]; testHaskellDepends = [ base mtl time ]; description = "Type class for monads which carry the notion of the current time"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "monad-timing" = callPackage @@ -174954,8 +175685,8 @@ self: { ]; testHaskellDepends = [ base containers hlint hspec transformers ]; description = "Monad transformer for recording timing events"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -174967,8 +175698,8 @@ self: { sha256 = "0jv3pcmbm3bph42hhr4i0l3dchapixf5j5gd7ybs9j3bbk3yydk9"; libraryHaskellDepends = [ base ]; description = "A transactional state monad"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -174982,8 +175713,8 @@ self: { editedCabalFile = "1qkccw4xd4i112d6mkw8dgsnwfrnqcg1shk9s5cwyn55pwlmnn3x"; libraryHaskellDepends = [ base mtl unordered-containers ]; description = "Generic first-order unification"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -174999,7 +175730,7 @@ self: { base constraints monad-control transformers transformers-base ]; description = "Typeclasses for representing monad transformer unlifting"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "monad-unlift-ref" = callPackage @@ -175016,7 +175747,7 @@ self: { mutable-containers resourcet stm transformers transformers-base ]; description = "Typeclasses for representing monad transformer unlifting"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "monad-validate" = callPackage @@ -175036,7 +175767,7 @@ self: { text transformers transformers-base unordered-containers vector ]; description = "A monad transformer for data validation"; - license = stdenv.lib.licenses.isc; + license = lib.licenses.isc; }) {}; "monad-var" = callPackage @@ -175047,8 +175778,8 @@ self: { sha256 = "1amlkcwwmgqscq0w660lawnwz07swlmiz8g61qn0fb1vmfpvas88"; libraryHaskellDepends = [ base base-compat stm ]; description = "Generic operations over variables"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -175060,8 +175791,8 @@ self: { sha256 = "1hmigg0cbrsdvf6s0z2wn3s81q12qg3c30jjlsrw4jdfwv1qn13f"; libraryHaskellDepends = [ base transformers ]; description = "Wrap functions such as catch around different monads"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -175073,7 +175804,7 @@ self: { sha256 = "1a3gb70fkh28ck13zdkphdip2kzdcivzdrsg9fdn3nci9scbdp2w"; libraryHaskellDepends = [ base mtl stm ]; description = "Overloading of concurrency variables"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "monadLib" = callPackage @@ -175086,7 +175817,7 @@ self: { editedCabalFile = "072k4hnqkrfq80yh4qz2zw72fn43zm8l5rbjnckjaqdx4l315p11"; libraryHaskellDepends = [ base ]; description = "A collection of monad transformers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "monadLib-compose" = callPackage @@ -175097,8 +175828,8 @@ self: { sha256 = "14byhdcby094qpgmkblysnplz5r88xnfk7rnfddihzz4jgjzlvy1"; libraryHaskellDepends = [ base monadLib ]; description = "Arrow-like monad composition for monadLib"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -175110,8 +175841,8 @@ self: { sha256 = "1k1jqi0q2n34xd07qp3fd4jw48iq4909m1pq2dm90sg46n6003sr"; libraryHaskellDepends = [ base transformers ]; description = "The Acme and AcmeT monads"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -175139,7 +175870,7 @@ self: { transformers-compat ]; description = "A monad for using CryptoRandomGen"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "monadfibre" = callPackage @@ -175165,7 +175896,7 @@ self: { array base stm transformers transformers-compat ]; description = "Boxed and unboxed arrays for monad transformers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "monadic-recursion-schemes" = callPackage @@ -175181,8 +175912,8 @@ self: { ]; testHaskellDepends = [ base ]; description = "Recursion Schemes for Monadic version"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -175200,8 +175931,8 @@ self: { ]; testHaskellDepends = [ base ]; description = "Constraint Programming"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -175220,8 +175951,8 @@ self: { ]; testHaskellDepends = [ base ]; description = "Constraint Programming"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {gecodeint = null; gecodekernel = null; gecodesearch = null; gecodeset = null; gecodesupport = null;}; @@ -175234,7 +175965,7 @@ self: { sha256 = "18hbi4vxj9lfcla11b17sb88ysskxavq00zmrjx62cpyzkp85yxh"; libraryHaskellDepends = [ base monads-tf transformers ]; description = "Reversibly allow monad transformer stacks to run in IO"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "monadlist" = callPackage @@ -175245,7 +175976,7 @@ self: { sha256 = "1zpxqp5zhcpk4358xqrapvkcfyazpdsdlrw3g14518y2kwnfifq6"; libraryHaskellDepends = [ base ]; description = "Monadic versions of list functions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "monadloc" = callPackage @@ -175256,7 +175987,7 @@ self: { sha256 = "1a773nysrsj61ka7bdacb0i7dxlgb1fjz3x5w9c1w1dv7rmhynmj"; libraryHaskellDepends = [ base template-haskell transformers ]; description = "A class for monads which can keep a monadic call trace"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "monadloc-pp" = callPackage @@ -175273,8 +176004,8 @@ self: { base filepath haskell-src-exts monadloc pretty syb ]; description = "A preprocessor for generating monadic call traces"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -175294,8 +176025,8 @@ self: { monad-control template-haskell text text-show transformers ]; description = "A simple and fast logging monad"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -175309,7 +176040,7 @@ self: { base monad-control mtl transformers-base ]; description = "A monoid for monads"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "monadplus" = callPackage @@ -175322,8 +176053,8 @@ self: { editedCabalFile = "11v5zdsb9mp1rxvgcrxcr2xnc610xi16krwa9r4i5d6njmphfbdp"; libraryHaskellDepends = [ base ]; description = "Haskell98 partial maps and filters over MonadPlus"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -175335,8 +176066,8 @@ self: { sha256 = "1iqr5p3va5sxmpvydwqz2src54j5njcyrzn9p5apc60nv7yv6x4c"; libraryHaskellDepends = [ base mtl transformers ]; description = "Monad classes, using functional dependencies"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -175348,7 +176079,7 @@ self: { sha256 = "1wdhskwa6dw8qljbvwpyxj8ca6y95q2np7z4y4q6bpf4anmd5794"; libraryHaskellDepends = [ base transformers ]; description = "Monad classes, using type families"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "monadtransform" = callPackage @@ -175359,7 +176090,7 @@ self: { sha256 = "0i586zh6247jfmkw2x27j0aq47yz1c71irj9iwrlx1zrmvzak1yv"; libraryHaskellDepends = [ base transformers ]; description = "A type-class for transforming monads (homomorphism) in a transformer"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "monarch" = callPackage @@ -175377,8 +176108,8 @@ self: { ]; testHaskellDepends = [ base doctest ]; description = "Monadic interface for TokyoTyrant"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -175402,8 +176133,8 @@ self: { timerep transformers wai warp ]; description = "Haskell bindings for the Mondo API"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -175415,8 +176146,8 @@ self: { sha256 = "069jmlnrgia36ncl5mqaqq0iaqwrhx6ig5jjnlxr40vfdi4m4dw6"; libraryHaskellDepends = [ base bindings-monetdb-mapi ]; description = "Mid-level bindings for the MonetDB API (mapi)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -175429,8 +176160,8 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; description = "Money"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -175463,8 +176194,8 @@ self: { nonce parsec random random-shuffle stm text tls transformers-base ]; description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -175485,8 +176216,8 @@ self: { text transformers ]; description = "message queue using MongoDB"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -175504,8 +176235,8 @@ self: { case-insensitive containers http-types text zeromq-haskell ]; description = "Mongrel2 Handler Library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -175519,8 +176250,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base filepath hinotify process ]; description = "Do things when files change"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -175545,8 +176276,8 @@ self: { base containers directory mtl optparse-applicative process unix ]; description = "A system state collecting library and application"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -175558,8 +176289,8 @@ self: { sha256 = "1qnbw9pd06czwyj2xcsjdigg7bj8d23p3ljnnkgd3d0r67qxxlxm"; libraryHaskellDepends = [ base bytestring text vector ]; description = "Folds for monomorphic containers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -175583,7 +176314,7 @@ self: { ]; benchmarkHaskellDepends = [ base gauge mwc-random vector ]; description = "Type classes for mapping, folding, and traversing monomorphic containers"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "mono-traversable-instances" = callPackage @@ -175600,7 +176331,7 @@ self: { semigroupoids semigroups transformers vector-instances ]; description = "Extra typeclass instances for mono-traversable"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "mono-traversable-keys" = callPackage @@ -175618,7 +176349,7 @@ self: { vector-instances ]; description = "Type-classes for interacting with monomorphic containers with a key"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "mono-traversable-wrapper" = callPackage @@ -175629,7 +176360,7 @@ self: { sha256 = "1jv40qwj08vfsy06cdrwdi05j06b1q3q7p30gh60ccq9l8y1qi2d"; libraryHaskellDepends = [ base mono-traversable ]; description = "Wrapper providing Foldable instance for MonoFoldables"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "monoid" = callPackage @@ -175640,8 +176371,8 @@ self: { sha256 = "13k5s9y37igvrsfbw5q76zy10fm585dijx10qk32c4agih9fxyfv"; libraryHaskellDepends = [ base containers lens mtl ]; description = "Monoid type classes, designed in modular way, distinguish Monoid from Mempty and Semigroup. This design allows mempty operation don't bring Semigroups related constraints until (<>) is used."; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -175653,8 +176384,8 @@ self: { sha256 = "1sq2ll3ac3fxb0gdcy6gzjlv5j17pnrj8zs2bhi2s96dx2gp6zrv"; libraryHaskellDepends = [ base mtl ]; description = "A library for (left, right) zero monoids and backtracking with cut"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -175670,8 +176401,8 @@ self: { libraryHaskellDepends = [ base groups semigroupoids semigroups ]; benchmarkHaskellDepends = [ base criterion semigroups ]; description = "Various extra monoid-related definitions and utilities"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -175684,8 +176415,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers ]; description = "a practical monoid implementation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -175697,7 +176428,7 @@ self: { sha256 = "14xs1nvf0ngx4jvinkhzq3ainhs159zx0396z88y21vvc8kw42i5"; libraryHaskellDepends = [ base ]; description = "Support for modifying record fields of monoidal type"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "monoid-statistics" = callPackage @@ -175717,7 +176448,7 @@ self: { base math-functions QuickCheck tasty tasty-quickcheck ]; description = "Monoids for calculation of statistics of sample"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "monoid-subclasses" = callPackage @@ -175736,7 +176467,7 @@ self: { tasty tasty-quickcheck text vector ]; description = "Subclasses of Monoid"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "monoid-transformer" = callPackage @@ -175747,7 +176478,7 @@ self: { sha256 = "1243r77m5ywphwyhw7kn9vb2ha5m5zj375bd61fprdfiwi3z3as3"; libraryHaskellDepends = [ base semigroups ]; description = "Monoid counterparts to some ubiquitous monad transformers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "monoidal-containers" = callPackage @@ -175765,7 +176496,7 @@ self: { semigroups these unordered-containers ]; description = "Containers with monoidal accumulation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "monoidplus" = callPackage @@ -175778,8 +176509,8 @@ self: { base contravariant semigroups transformers ]; description = "Extra classes/functions about monoids"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -175795,8 +176526,8 @@ self: { array base bytestring containers fingertree parallel text ]; description = "Deprecated: Use 'reducers'"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -175808,7 +176539,7 @@ self: { sha256 = "0x7fig4ms5qqiah4847ghl13s2r1xv2372hj6xrhjw6bdfh85cln"; libraryHaskellDepends = [ base ]; description = "Library to convert polymorphic datatypes to/from its monomorphic represetation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "monopati" = callPackage @@ -175824,8 +176555,8 @@ self: { base directory free hedgehog peano split transformers ]; description = "Well-typed paths"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -175846,8 +176577,8 @@ self: { zeromq-haskell ]; description = "Riak Resolution Proxy"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {riak-bump = null; stats-web = null;}; @@ -175869,8 +176600,8 @@ self: { unordered-containers zeromq-haskell ]; description = "Riak Resolution Proxy Client"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {riak-bump = null; stats-web = null;}; @@ -175891,8 +176622,8 @@ self: { test-framework-quickcheck2 transformers vector ]; description = "A monad and transformer for Monte Carlo calculations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -175913,8 +176644,8 @@ self: { time-compat ]; description = "Month, YearMonth, Quarter, YearQuarter types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -175931,8 +176662,8 @@ self: { base containers smallcheck tasty tasty-quickcheck tasty-smallcheck ]; description = "a 'Monus' is a commutative monoid that allows a notion of substraction"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -175956,8 +176687,8 @@ self: { timerep transformers wai warp ]; description = "Haskell bindings for the Monzo API"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -175979,8 +176710,8 @@ self: { MonadRandom mtl parallel random random-shuffle time vector ]; description = "Genetic algorithm library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -175997,7 +176728,7 @@ self: { text time transformers yaml ]; description = "A web service framework for Haskell, similar in purpose to dropwizard"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "more-containers" = callPackage @@ -176009,7 +176740,7 @@ self: { libraryHaskellDepends = [ base binary containers ]; testHaskellDepends = [ base binary containers hspec ]; description = "A few more collections"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "more-extensible-effects" = callPackage @@ -176020,7 +176751,7 @@ self: { sha256 = "1sl4m02ji5my13kajcr2csqm24jph01qsihxj5dj66cxgw99idq1"; libraryHaskellDepends = [ base ]; description = "Initial project template from stack"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "morfette" = callPackage @@ -176040,8 +176771,8 @@ self: { pretty QuickCheck text utf8-string vector ]; description = "A tool for supervised learning of morphology"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -176059,8 +176790,8 @@ self: { ]; librarySystemDepends = [ morfeusz ]; description = "Bindings to the morphological analyser Morfeusz"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {morfeusz = null;}; @@ -176078,8 +176809,8 @@ self: { }: mkDerivation { pname = "morley"; - version = "1.11.0"; - sha256 = "06l83vida9kyyh9xc4rhjp7q36iq2knn4p2mrl9j7nvsinrqprcn"; + version = "1.12.0"; + sha256 = "0cfmcrasf2cfirsa6xb1aznj75bwnzmiy9irirk1i9p2bx4aqy5m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -176097,8 +176828,8 @@ self: { morley-prelude named optparse-applicative text vinyl with-utf8 ]; description = "Developer tools for the Michelson Language"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -176110,7 +176841,7 @@ self: { sha256 = "1nrwrz54xg0v9v8f1caccpdav1d0nnjqy8r8wmj5cgf9y30jfzjf"; libraryHaskellDepends = [ base-noprelude universum ]; description = "A custom prelude used in Morley"; - license = stdenv.lib.licenses.agpl3Plus; + license = lib.licenses.agpl3Plus; }) {}; "morloc" = callPackage @@ -176148,8 +176879,8 @@ self: { tasty-quickcheck template-haskell text unordered-containers yaml ]; description = "A multi-lingual, typed, workflow language"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -176169,7 +176900,7 @@ self: { ]; executableHaskellDepends = [ base ]; description = "A simple database migrator for PostgreSQL"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "morpheus-graphql" = callPackage @@ -176193,7 +176924,7 @@ self: { template-haskell text transformers unordered-containers vector ]; description = "Morpheus GraphQL"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "morpheus-graphql-cli" = callPackage @@ -176213,8 +176944,8 @@ self: { base bytestring filepath morpheus-graphql optparse-applicative ]; description = "Morpheus GraphQL CLI"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -176238,7 +176969,7 @@ self: { unordered-containers ]; description = "Morpheus GraphQL Client"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "morpheus-graphql-core" = callPackage @@ -176263,7 +176994,7 @@ self: { th-lift-instances transformers unordered-containers vector ]; description = "Morpheus GraphQL Core"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "morpheus-graphql-subscriptions" = callPackage @@ -176286,7 +177017,7 @@ self: { unordered-containers uuid websockets ]; description = "Morpheus GraphQL Subscriptions"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "morphisms" = callPackage @@ -176296,7 +177027,7 @@ self: { version = "0.1.1"; sha256 = "0waj252x6xpxaph50l248r0xf44xzfsz6jpmza5mwi9qf1br6dws"; description = "It's all about functions"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "morphisms-functors" = callPackage @@ -176307,8 +177038,8 @@ self: { sha256 = "1mv2sjn68n55482496icg84nbf3mn85fizf4q42781qn689np60q"; libraryHaskellDepends = [ morphisms ]; description = "Functors, theirs compositions and transformations"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -176320,8 +177051,8 @@ self: { sha256 = "16p5wj9yq6qsbzaqsx0p33fkginkf5mbqg4y7pak2wx1v7aqll2m"; libraryHaskellDepends = [ morphisms morphisms-functors ]; description = "Inventory is state and store"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -176333,8 +177064,8 @@ self: { sha256 = "1d5jbjp8ih1fsna8w2mkw217ybsxdhyh7acq0r7b9iwngh52jj6b"; libraryHaskellDepends = [ morphisms ]; description = "Algebraic structures"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -176368,8 +177099,8 @@ self: { ]; benchmarkHaskellDepends = [ base criterion system-filepath text ]; description = "A bare-bones calculus of constructions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -176388,8 +177119,8 @@ self: { stm-chans transformers ]; description = "Generación interactiva de mosaicos"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -176401,7 +177132,7 @@ self: { sha256 = "0c80pf189gkxr3zrf8r5rsw5gli1kk4q4pd3giww9wxwpc2nyjln"; libraryHaskellDepends = [ base ]; description = "Mosquitto client library bindings"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "moss" = callPackage @@ -176417,7 +177148,7 @@ self: { unix-compat ]; description = "Haskell client for Moss"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "moto" = callPackage @@ -176442,7 +177173,7 @@ self: { safe-exceptions tasty tasty-hunit tasty-quickcheck text time ]; description = "General purpose migrations library"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "moto-postgresql" = callPackage @@ -176458,8 +177189,8 @@ self: { text ]; description = "PostgreSQL-based migrations registry for moto"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -176481,7 +177212,7 @@ self: { ]; testHaskellDepends = [ base indexed indexed-extras row-types ]; description = "Type-safe effectful state machines in Haskell"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "motor-diagrams" = callPackage @@ -176500,8 +177231,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Generate state diagrams from Motor FSM typeclasses"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -176519,8 +177250,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Reflect on Motor FSM typeclasses to obtain runtime representations"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -176533,7 +177264,7 @@ self: { libraryHaskellDepends = [ base bytestring ]; description = "Mounts and umounts filesystems"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -176568,8 +177299,8 @@ self: { system-filepath text time ]; description = "Plays videos using GStreamer and GTK+"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -176582,7 +177313,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "This is a library for calculating moving averages on lists of numbers"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "mp" = callPackage @@ -176606,8 +177337,8 @@ self: { simple-ui template-haskell text unix utf8-string vty ]; description = "Music player for linux"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -176624,7 +177355,7 @@ self: { ]; description = "MP3 decoder for teaching"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "mpdmate" = callPackage @@ -176639,8 +177370,8 @@ self: { base directory network powermate unix ]; description = "MPD/PowerMate executable"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -176653,7 +177384,7 @@ self: { libraryHaskellDepends = [ base ]; librarySystemDepends = [ mpg123 ]; description = "Mpg132 bindings"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) mpg123;}; "mpi-hs" = callPackage @@ -176672,7 +177403,7 @@ self: { testHaskellDepends = [ base monad-loops ]; testSystemDepends = [ mpich ]; description = "MPI bindings for Haskell"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {inherit (pkgs) mpich;}; "mpi-hs-binary" = callPackage @@ -176689,7 +177420,7 @@ self: { executableHaskellDepends = [ base mpi-hs ]; testHaskellDepends = [ base ]; description = "MPI bindings for Haskell"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "mpi-hs-cereal" = callPackage @@ -176706,7 +177437,7 @@ self: { executableHaskellDepends = [ base mpi-hs ]; testHaskellDepends = [ base ]; description = "MPI bindings for Haskell"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "mpi-hs-store" = callPackage @@ -176723,7 +177454,7 @@ self: { executableHaskellDepends = [ base mpi-hs ]; testHaskellDepends = [ base ]; description = "MPI bindings for Haskell"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "mplayer-spot" = callPackage @@ -176743,7 +177474,7 @@ self: { ]; executableHaskellDepends = [ base ]; description = "Save your spot when watching movies with @mplayer@"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "mpppc" = callPackage @@ -176757,7 +177488,7 @@ self: { ]; description = "Multi-dimensional parametric pretty-printer with color"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -176776,8 +177507,8 @@ self: { base devtools source-constraints text unliftio-core ]; description = "A minimalish prelude"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -176794,8 +177525,8 @@ self: { orders text transformers ]; description = "a monadic, extensible pretty printing library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -176807,8 +177538,8 @@ self: { sha256 = "11c62m19ngap44fv4gnv0ln8iff1b08dg2vclj16jx1fj8pqps9y"; libraryHaskellDepends = [ base containers dbus mtl ]; description = "Interface for MPRIS"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -176826,8 +177557,8 @@ self: { base containers haskell98 mtl parsec pretty transformers unbound ]; description = "Simple equational reasoning for a Haskell-ish language"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -176847,8 +177578,8 @@ self: { utf8-string ]; description = "simply oo"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -176873,8 +177604,8 @@ self: { ]; executableToolDepends = [ c2hs ]; description = "A work in progress Multipath TCP path manager"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -176893,8 +177624,8 @@ self: { base directory filepath gtk mtl process template-haskell unix ]; description = "A minimalist mpv GUI written in I/O heavy Haskell"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -176923,8 +177654,8 @@ self: { base binary bytestring criterion text ]; description = "An MQTT protocol implementation"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -176941,8 +177672,8 @@ self: { stm text transformers ]; description = "A MQTT client library"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -176955,7 +177686,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "A simple way to read environment variables in Haskell"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "mrifk" = callPackage @@ -176969,7 +177700,7 @@ self: { executableHaskellDepends = [ array base containers mtl ]; description = "Decompiles Glulx files"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -176981,8 +177712,8 @@ self: { sha256 = "1qmfki808284yz8l5l30s10q6idhlmp864wi6xbk14chh331xaiw"; libraryHaskellDepends = [ base ]; description = "Modular Refiable Matching, first-class matches"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -177003,8 +177734,8 @@ self: { base doctest profunctors tasty tasty-quickcheck vector ]; description = "metric spaces"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -177028,7 +177759,7 @@ self: { x509-system ]; description = "TDS Protocol implemented in Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "msgpack" = callPackage @@ -177050,8 +177781,8 @@ self: { async base bytestring QuickCheck tasty tasty-quickcheck ]; description = "A Haskell implementation of MessagePack"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -177070,8 +177801,8 @@ self: { ]; testHaskellDepends = [ aeson base msgpack tasty tasty-hunit ]; description = "Aeson adapter for MessagePack"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -177098,8 +177829,8 @@ self: { base bytestring criterion deepseq QuickCheck ]; description = "A Haskell implementation of MessagePack"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -177121,8 +177852,8 @@ self: { executableHaskellDepends = [ base cmdargs directory peggy ]; testHaskellDepends = [ base hspec ]; description = "An IDL Compiler for MessagePack"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -177143,8 +177874,8 @@ self: { ]; testHaskellDepends = [ async base mtl network tasty tasty-hunit ]; description = "A MessagePack-RPC Implementation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -177166,8 +177897,8 @@ self: { ]; testHaskellDepends = [ async base bytestring hspec mtl network ]; description = "A MessagePack-RPC Implementation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -177189,7 +177920,7 @@ self: { QuickCheck text unordered-containers vector ]; description = "A Haskell implementation of MessagePack"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "msh" = callPackage @@ -177205,8 +177936,8 @@ self: { template-haskell text ]; description = "Object-Oriented Programming in Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -177220,8 +177951,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base bytestring hid split ]; description = "A command line tool to change backlit colors of your MSI keyboards"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -177242,7 +177973,7 @@ self: { text time tls uuid-types ]; description = "SQL Server client library implemented in Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "mstate" = callPackage @@ -177253,7 +177984,7 @@ self: { sha256 = "13jv04skkb0ysxx9gswynp7fg7yz3nwy5zhzp209fbwr9izxcm05"; libraryHaskellDepends = [ base fail monad-peel mtl stm ]; description = "MState: A consistent State monad for concurrent applications"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "msu" = callPackage @@ -177270,7 +178001,7 @@ self: { base directory filepath mtl parsec process xdg-basedir ]; description = "Monitor Setup Utility"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "mtgoxapi" = callPackage @@ -177296,8 +178027,8 @@ self: { text time transformers unordered-containers vector watchdog ]; description = "Library to communicate with Mt.Gox"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -177309,8 +178040,8 @@ self: { sha256 = "1xmy5741h8cyy0d91ahvqdz2hykkk20l8br7lg1rccnkis5g80w8"; libraryHaskellDepends = [ base transformers ]; description = "Monad classes, using functional dependencies"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "mtl-c" = callPackage @@ -177321,8 +178052,8 @@ self: { sha256 = "12zays8x0b65dc11s95f5j6gwz2kksh9md5m9cpal1yj5qydmmrd"; libraryHaskellDepends = [ base mtl transformers ]; description = "Very strict CPS'd transformers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -177335,7 +178066,7 @@ self: { libraryHaskellDepends = [ base mtl ]; doHaddock = false; description = "Backported Control.Monad.Except module from mtl"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "mtl-evil-instances" = callPackage @@ -177350,8 +178081,8 @@ self: { base monad-control mtl transformers transformers-base ]; description = "Instances for the mtl classes for all monad transformers"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -177363,8 +178094,8 @@ self: { sha256 = "1v7wm6gsp3c9kad6slxwj68s3050zqkv6k4n5h827vgx7na694pz"; libraryHaskellDepends = [ base mtl transformers ]; description = "Higher order versions of MTL classes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -177376,7 +178107,7 @@ self: { sha256 = "0cqjl0mcnj6qgx46qxjygndzlgch4mc0q0sm3wbd4fynjfhdv9n4"; libraryHaskellDepends = [ base mtl transformers ]; description = "Reexports of most definitions from \"mtl\" and \"transformers\""; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "mtl-tf" = callPackage @@ -177387,8 +178118,8 @@ self: { sha256 = "0z9vinxhbbg4lpf8mxi0h3jbz4kv6x3ih05q44kjh4z8mpm9szzy"; libraryHaskellDepends = [ base transformers ]; description = "Monad Transformer Library with Type Families"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -177408,7 +178139,7 @@ self: { base contravariant hspec hspec-core lens mtl profunctors ]; description = "MTL classes without the functional dependency"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "mtl-uplift" = callPackage @@ -177420,7 +178151,7 @@ self: { libraryHaskellDepends = [ base mtl ]; testHaskellDepends = [ base mtl ]; description = "Lift substacks of monad transformer stacks"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "mtlparse" = callPackage @@ -177442,8 +178173,8 @@ self: { sha256 = "0s0cniqn1fb7rq14w3wjh7mkzkxpndj1h1wrgssxds6cs3vkk4dn"; libraryHaskellDepends = [ base mtl QuickCheck ]; description = "Monad transformer library with type indexes, providing 'free' copies"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -177457,7 +178188,7 @@ self: { librarySystemDepends = [ mtp ]; description = "Bindings to libmtp"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {mtp = null;}; @@ -177469,7 +178200,7 @@ self: { sha256 = "1l4kjrmr5v8pkhf48w0ym6dlrsvaf21p3x5sykq1rxwp821cqglv"; libraryHaskellDepends = [ base bifunctors ]; description = "Tree with Meta and Content parameters"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "mtsl" = callPackage @@ -177480,7 +178211,7 @@ self: { sha256 = "02zfqimal6f5a1wldfy4abk7mvmvac71j9m01bxzw5ydmm057wgh"; libraryHaskellDepends = [ base mtl ]; description = "Reified monad transformer stacks"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "mu-avro" = callPackage @@ -177491,8 +178222,8 @@ self: { }: mkDerivation { pname = "mu-avro"; - version = "0.4.0.2"; - sha256 = "1g8cww3lz5dlgri34m0fjpc8sbs64f4fcxx8h1mamgzn5f3f2z7h"; + version = "0.4.0.3"; + sha256 = "01sygrx80jfi6xygrgj2chqjr0fllld807p26rggfdzwp9p6pc9b"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -177501,10 +178232,12 @@ self: { mu-schema sop-core tagged template-haskell text time transformers unordered-containers uuid vector ]; - executableHaskellDepends = [ avro base bytestring mu-schema ]; + executableHaskellDepends = [ + avro base bytestring containers mu-schema + ]; description = "Avro serialization support for Mu microservices"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -177518,8 +178251,8 @@ self: { }: mkDerivation { pname = "mu-graphql"; - version = "0.4.1.0"; - sha256 = "0qi6sc0vwzdayjhfr0rqvrfp1ydcy9fwhyzkmc488gfafi0xc1gj"; + version = "0.5.0.1"; + sha256 = "1mcm8db1q0sjzxyjhxd140l966vq6yh8hj1p2xx8yzqmagsfv7kx"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -177531,11 +178264,11 @@ self: { websockets ]; executableHaskellDepends = [ - base conduit mu-rpc mu-schema regex-tdfa text wai-extra warp + aeson base conduit mu-rpc mu-schema regex-tdfa text wai-extra warp ]; description = "GraphQL support for Mu"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -177550,6 +178283,8 @@ self: { pname = "mu-grpc-client"; version = "0.4.0.1"; sha256 = "030b8ajbplb1w5llzm8vn8jpwa7v4kw0y8zli8xagc50k19wp75v"; + revision = "2"; + editedCabalFile = "1zs17a684mww8ppgams79xbr019mlr27bxnnhvyhq3k5y1lwz7dh"; libraryHaskellDepends = [ async avro base bytestring conduit http2 http2-client http2-client-grpc http2-grpc-types mu-grpc-common mu-optics @@ -177557,8 +178292,8 @@ self: { stm-conduit template-haskell text th-abstraction tracing ]; description = "gRPC clients from Mu definitions"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -177571,13 +178306,15 @@ self: { pname = "mu-grpc-common"; version = "0.4.0.0"; sha256 = "0rn0gkvxfd8j6ayzixapm3nagjszf50xjr8d59v7vfqh61kwrx83"; + revision = "1"; + editedCabalFile = "06749nqdaki8w84inpbw52kdkdiban3znlvdjl7brh37rmwmi2sn"; libraryHaskellDepends = [ avro base binary bytestring http2-grpc-proto3-wire http2-grpc-types mu-avro mu-protobuf mu-rpc mu-schema ]; description = "gRPC for Mu, common modules for client and server"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -177589,8 +178326,8 @@ self: { }: mkDerivation { pname = "mu-grpc-server"; - version = "0.4.0.0"; - sha256 = "0wnqalcsj7j2ny999nw818ncy292f3kmmbwc2ci14d43zgrjdi3v"; + version = "0.5.0.0"; + sha256 = "1k5fq8daxhl7rm27craj0rn7k3j1k4qrphh6ckpn3sa2y4zrrrl5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -177604,8 +178341,8 @@ self: { stm-conduit wai warp warp-grpc warp-tls ]; description = "gRPC servers for Mu definitions"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -177622,8 +178359,8 @@ self: { mu-avro mu-schema resourcet ]; description = "Utilities for interoperation between Mu and Kafka"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -177639,8 +178376,8 @@ self: { base containers generic-lens lens mu-rpc mu-schema sop-core text ]; description = "Lenses for @mu-schema@ terms"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -177655,8 +178392,8 @@ self: { base containers mu-schema optics-core sop-core ]; description = "Optics for @mu-schema@ terms"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -177673,8 +178410,8 @@ self: { transformers ]; description = "Utilities for interoperation between Mu and Persistent"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -177684,42 +178421,42 @@ self: { }: mkDerivation { pname = "mu-prometheus"; - version = "0.4.0.0"; - sha256 = "060fx3svjiwzyfifmwrzcvm23xp332yb91fb4hh7whcmi2q415c8"; + version = "0.5.0.0"; + sha256 = "02a31v12z2cp5ykgmin50lz3c8zvhrras41n53hvc0s043483ibz"; libraryHaskellDepends = [ base lifted-base monad-control mu-rpc prometheus-client text wai wai-middleware-prometheus ]; description = "Metrics support for Mu using Prometheus"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; "mu-protobuf" = callPackage - ({ mkDerivation, base, bytestring, compendium-client, http-client - , http2-grpc-proto3-wire, language-protobuf, mu-rpc, mu-schema - , proto3-wire, servant-client-core, sop-core, template-haskell - , text + ({ mkDerivation, base, bytestring, compendium-client, containers + , http-client, http2-grpc-proto3-wire, language-protobuf, mu-rpc + , mu-schema, proto3-wire, servant-client-core, sop-core + , template-haskell, text }: mkDerivation { pname = "mu-protobuf"; - version = "0.4.0.3"; - sha256 = "0wc562fw89l3qmyf28axj41cyj88ppkg0jsif9rsrdgj4ypq2zrj"; + version = "0.4.2.0"; + sha256 = "07mgld1cmpynhdih7ppki8xw85zpknv0ipn7fvn79bj53s0nx6vg"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base bytestring compendium-client http-client + base bytestring compendium-client containers http-client http2-grpc-proto3-wire language-protobuf mu-rpc mu-schema proto3-wire servant-client-core sop-core template-haskell text ]; executableHaskellDepends = [ - base bytestring mu-schema proto3-wire text + base bytestring containers mu-schema proto3-wire text ]; description = "Protocol Buffers serialization and gRPC schema import for Mu microservices"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -177729,15 +178466,15 @@ self: { }: mkDerivation { pname = "mu-rpc"; - version = "0.4.0.1"; - sha256 = "0s1q12nl6q3smnmmk2f1qhs0bk3sarmjcabvnj06vw6ciivnx16z"; + version = "0.5.0.0"; + sha256 = "15a950ig348h0fxfvzq4pj8s8rryn18cd26vmrcmx7s6w32zlzyr"; libraryHaskellDepends = [ aeson base conduit http-types mtl mu-schema sop-core template-haskell text wai ]; description = "Protocol-independent declaration of services and servers"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -177756,8 +178493,8 @@ self: { vector ]; description = "Format-independent schemas for serialization"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -177768,8 +178505,8 @@ self: { }: mkDerivation { pname = "mu-servant-server"; - version = "0.4.0.0"; - sha256 = "0iwcrqbldfvjg9g7pq1r9gw8avhrl4m9fxjcr7gbci2fwalx7901"; + version = "0.5.0.0"; + sha256 = "0szd3byklap7a2dwqxq12vj99vgpa7vaqv5l3cvm1016in30l1yd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -177781,8 +178518,8 @@ self: { aeson base conduit mu-rpc mu-schema servant-server text warp ]; description = "Servant servers for Mu definitions"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -177796,8 +178533,8 @@ self: { base containers mu-rpc text tracing-control ]; description = "Tracing support for Mu"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -177833,8 +178570,8 @@ self: { base directory free hspec mtl QuickCheck time unix ]; description = "Multi-version deployer for web applications"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -177856,7 +178593,7 @@ self: { ]; description = "Continuous deployment server for use with GitHub"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "muesli" = callPackage @@ -177872,8 +178609,8 @@ self: { psqueues time ]; description = "A simple document-oriented database"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -177895,7 +178632,7 @@ self: { ]; executableHaskellDepends = [ base ]; description = "Safely evaluate pure Haskell expressions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "mulang" = callPackage @@ -177927,8 +178664,8 @@ self: { ]; testToolDepends = [ alex happy ]; description = "An intermediate language designed to perform advanced code analysis"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -177940,8 +178677,8 @@ self: { sha256 = "1if1ip22y7w59lkyshn4ic4p46zrfs4kcdzzjai9l8xbscavgdl6"; libraryHaskellDepends = [ base ]; description = "MULTEXT-East morphosyntactic descriptors"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -177963,8 +178700,8 @@ self: { base HUnit test-framework test-framework-hunit ]; description = "A tool supporting multi cabal project builds"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -177978,7 +178715,7 @@ self: { testHaskellDepends = [ base containers hspec ]; testToolDepends = [ hspec-discover ]; description = "A few multimap variants"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "multi-instance" = callPackage @@ -177990,8 +178727,8 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; description = "Typeclasses augmented with a phantom type parameter"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -178004,8 +178741,8 @@ self: { libraryHaskellDepends = [ base composition containers ]; testHaskellDepends = [ base containers HTF ]; description = "Trie of sets, as a model for compound names having multiple values"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -178026,8 +178763,8 @@ self: { base tasty tasty-hunit tasty-quickcheck text ]; description = "A network address format"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -178046,8 +178783,8 @@ self: { base QuickCheck tasty tasty-quickcheck tasty-th ]; description = "Command lines for options that take multiple arguments"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -178060,8 +178797,8 @@ self: { }: mkDerivation { pname = "multibase"; - version = "0.1.1"; - sha256 = "08r3imyvgi6ahgfqpjcxfr3xg4zj2cvw4g2lzqs04ncipzrw5rnf"; + version = "0.1.2"; + sha256 = "036caj0dzhzp065dhy05flz2j5qml5pirs1y95np4hf2xv9jk32h"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson base base16-bytestring base32-z-bytestring base58-bytestring @@ -178070,8 +178807,8 @@ self: { ]; testHaskellDepends = [ base doctest QuickCheck template-haskell ]; description = "Self-identifying base encodings, implementation of <https://github.com/multiformats/multihash>"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -178090,7 +178827,7 @@ self: { transformers ]; description = "create many files from one"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "multifocal" = callPackage @@ -178115,8 +178852,8 @@ self: { process syb ]; description = "Bidirectional Two-level Transformation of XML Schemas"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -178140,8 +178877,8 @@ self: { cryptohash hex io-streams optparse-applicative ]; description = "Multihash library and CLI executable"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -178161,7 +178898,7 @@ self: { ]; testHaskellDepends = [ base cryptonite doctest hedgehog ]; description = "Self-identifying hashes, implementation of <https://github.com/multiformats/multihash>"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "multihash-serialise" = callPackage @@ -178178,8 +178915,8 @@ self: { ]; testHaskellDepends = [ base cryptonite hedgehog serialise ]; description = "CBOR encoding of multihashes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -178191,7 +178928,7 @@ self: { sha256 = "1bripl4vqj275n4wnka7vrdcjyyppbc773pfsbmvfjvl2qqi5jrb"; libraryHaskellDepends = [ base hashable unordered-containers ]; description = "hashmap from keys to hashsets"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "multilinear" = callPackage @@ -178212,8 +178949,8 @@ self: { ]; benchmarkHaskellDepends = [ base criterion deepseq weigh ]; description = "Comprehensive and efficient (multi)linear algebra implementation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -178237,8 +178974,8 @@ self: { base criterion deepseq directory either multilinear transformers ]; description = "Conduit-based input/output capability for multilinear package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -178250,7 +178987,7 @@ self: { sha256 = "0d3l5q4yvmywl6i9ip96zz0fvhjdh00mfbbniphbjxsi8wlwack3"; libraryHaskellDepends = [ base containers ]; description = "A multimap"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "multipart" = callPackage @@ -178261,7 +178998,7 @@ self: { sha256 = "0p6n4knxpjv70nbl6cmd6x7gkdjsjqp4ya7fz00bfrqp7jvhlivn"; libraryHaskellDepends = [ base bytestring parsec stringsearch ]; description = "Parsers for the HTTP multipart format"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "multipart-names" = callPackage @@ -178277,7 +179014,7 @@ self: { base HUnit lens test-framework test-framework-hunit ]; description = "Handling of multipart names in various casing styles"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "multipass" = callPackage @@ -178293,8 +179030,8 @@ self: { newtype unordered-containers ]; description = "Folding data with multiple named passes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -178306,8 +179043,8 @@ self: { sha256 = "0m4wmh5iib5g1qxzj23q330gznib7q80r405df10k9685aqafgn3"; libraryHaskellDepends = [ base parsec utf8-string ]; description = "Parser and builder for unix-path-like objects"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -178322,7 +179059,7 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base transformers ]; description = "Lightweight generic library for mutually recursive data types"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "multiplate-simplified" = callPackage @@ -178334,8 +179071,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base multiplate transformers ]; description = "Shorter, more generic functions for Multiplate"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -178352,8 +179089,8 @@ self: { base containers fez-conf mtl process ]; description = "Wrapper program for duplicity, adding config files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -178374,7 +179111,7 @@ self: { text unordered-containers ]; description = "Generalized system for reading and writing to distributed systems that have primary/replica topologies"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "multipool-persistent" = callPackage @@ -178394,7 +179131,7 @@ self: { unordered-containers ]; description = "Read and write from appropriate persistent sql instances in replicated environments"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "multipool-persistent-postgresql" = callPackage @@ -178418,8 +179155,8 @@ self: { unliftio-core unordered-containers ]; description = "Read and write appropriately from both master and replicated postgresql instances"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -178440,7 +179177,7 @@ self: { base bytestring mtl multipool postgresql-simple resource-pool unliftio-core unordered-containers ]; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "multiprocess" = callPackage @@ -178451,7 +179188,7 @@ self: { sha256 = "06f1yq4x9jc7cv8nxsqbm47xbv6b2cp1q8xkbhlqr9dbz8cvf5my"; libraryHaskellDepends = [ base ]; description = "Multiprocess architecture library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "multirec" = callPackage @@ -178463,8 +179200,8 @@ self: { libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base ]; description = "Generic programming for families of recursive datatypes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -178480,8 +179217,8 @@ self: { base containers mtl multirec syb template-haskell th-expand-syns ]; description = "Alternative multirec instances deriver"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -178493,8 +179230,8 @@ self: { sha256 = "1cj1rfjqxwc06vr5w12fqbcpjb0fjsphf8vp40sp2naizpvvnmzs"; libraryHaskellDepends = [ base binary multirec ]; description = "Generic Data.Binary instances using MultiRec."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -178511,7 +179248,7 @@ self: { base checkers doctest QuickCheck tasty tasty-quickcheck ]; description = "The Data.MultiSet container type"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "multiset-comb" = callPackage @@ -178524,7 +179261,7 @@ self: { editedCabalFile = "1amjahzg4lpgmhf4v456waa216afjpq3gcb45pqid5km9z1ycjdg"; libraryHaskellDepends = [ base containers transformers ]; description = "Combinatorial algorithms over multisets"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "multisetrewrite" = callPackage @@ -178536,8 +179273,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base haskell98 stm ]; description = "Multi-set rewrite rules with guards and a parallel execution scheme"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -178556,7 +179293,7 @@ self: { ]; testHaskellDepends = [ base hspec transformers ]; description = "like mtl's ReaderT / WriterT / StateT, but more than one contained value/type"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "multivariant" = callPackage @@ -178586,8 +179323,8 @@ self: { transformers ]; description = "Multivariant assignments generation language"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -178606,8 +179343,8 @@ self: { base smallcheck tasty tasty-smallcheck Vector ]; description = "Vectors of packed tuples"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {Vector = null;}; @@ -178628,8 +179365,8 @@ self: { HStringTemplate markdown MissingH process text ]; description = "Static blog generator"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -178647,7 +179384,7 @@ self: { ]; description = "MUtually Recursive Definitions Explicitly Represented"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -178673,8 +179410,8 @@ self: { ]; testHaskellDepends = [ base ]; description = "Simple CUI Twitter Client"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -178686,7 +179423,7 @@ self: { sha256 = "1bb58kfnzvx3mpc0rc0dhqc1fk36nm8prd6gvf20gk6lxaadpfc9"; libraryHaskellDepends = [ base bytestring ]; description = "MurmurHash2 implementation for Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "murmur3" = callPackage @@ -178706,7 +179443,7 @@ self: { test-framework-hunit test-framework-quickcheck2 ]; description = "Pure Haskell implementation of the MurmurHash3 x86_32 algorithm"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "murmurhash3" = callPackage @@ -178717,8 +179454,8 @@ self: { sha256 = "1hz6rf1qrzgixx19bn9hnp07jfb61wnrjq5bgqnd3px569afwdb2"; libraryHaskellDepends = [ haskell2010 ]; description = "32-bit non-cryptographic hashing"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -178745,8 +179482,8 @@ self: { ]; testHaskellDepends = [ base classy-prelude ]; description = "Minimalist MPD client"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -178758,7 +179495,7 @@ self: { sha256 = "0cxbhk25kn3hpkmb6h0brcf03yyi6kaz3i3l3lv2rzgfxv14a2pg"; libraryHaskellDepends = [ average base semigroups ]; description = "Abstract representation of musical articulation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "music-diatonic" = callPackage @@ -178770,7 +179507,7 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base ]; description = "Implementation of basic western musical theory objects"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "music-dynamics" = callPackage @@ -178784,7 +179521,7 @@ self: { average base music-dynamics-literal semigroups ]; description = "Abstract representation of musical dynamics"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "music-dynamics-literal" = callPackage @@ -178795,7 +179532,7 @@ self: { sha256 = "19bql45aqjfkhvpkfbvfcsc8p1mzg93n966r1yv5rwps6s2x86d5"; libraryHaskellDepends = [ base semigroups ]; description = "Overloaded dynamics literals"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "music-graphics" = callPackage @@ -178811,8 +179548,8 @@ self: { music-score process ]; description = "Diagrams-based visualization of musical data structures"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -178835,8 +179572,8 @@ self: { vector-space vector-space-points ]; description = "Musical instruments, parts and playing techniques"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -178854,8 +179591,8 @@ self: { positive semigroups type-unary vector-space vector-space-points ]; description = "Musical pitch representation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -178869,7 +179606,7 @@ self: { editedCabalFile = "0v86clbcjkgg7psx8jbxq4za66v8ln1vkr7ywrm0vz6vbgkg356f"; libraryHaskellDepends = [ base semigroups ]; description = "Overloaded pitch literals"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "music-preludes" = callPackage @@ -178896,8 +179633,8 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base process tasty tasty-golden ]; description = "Some useful preludes for the Music Suite"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -178921,8 +179658,8 @@ self: { transformers-compat vector-space vector-space-points ]; description = "Musical score and part representation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -178942,8 +179679,8 @@ self: { music-preludes music-score semigroups unordered-containers ]; description = "Interaction with Sibelius"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -178963,8 +179700,8 @@ self: { ]; doHaddock = false; description = "A set of libraries for composition, analysis and manipulation of music"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -178982,8 +179719,8 @@ self: { base Cabal containers directory fgl process shelly split text unix ]; description = "Utility for developing the Music Suite"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -178995,8 +179732,8 @@ self: { }: mkDerivation { pname = "musicScroll"; - version = "0.3.1.0"; - sha256 = "0ssf841r00zgy8h1l2041hs936mpsqpp4nwr3v6w4b5bva2p9jhn"; + version = "0.3.2.1"; + sha256 = "0q6hglv26qpy1prx4is0jbhgb9xsxkpxbknyah9mcfn7c52cx0c0"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -179008,8 +179745,8 @@ self: { executableHaskellDepends = [ base ]; executablePkgconfigDepends = [ gtk3 ]; description = "Supply your tunes info without leaving your music player"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) gtk3;}; @@ -179043,8 +179780,8 @@ self: { test-framework-smallcheck text time transformers xmlhtml ]; description = "Send an email to all MusicBrainz editors"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -179063,8 +179800,8 @@ self: { transformers ]; description = "Sound synthesis library, to be used with GHCJS and Web Audio API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {ghcjs-prim = null;}; @@ -179080,8 +179817,8 @@ self: { base containers directory HaXml old-time pretty ]; description = "MusicXML format encoded as Haskell type and functions of reading and writting"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -179099,7 +179836,7 @@ self: { reverse-apply semigroups type-unary xml ]; description = "A representation of the MusicXML format"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "mustache" = callPackage @@ -179128,7 +179865,7 @@ self: { lens process tar temporary text unordered-containers wreq yaml zlib ]; description = "A mustache template parser library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "mustache-haskell" = callPackage @@ -179152,8 +179889,8 @@ self: { vector ]; description = "Straight implementation of mustache templates"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -179173,7 +179910,7 @@ self: { ]; description = "Utility to generate Haskell code from Mustache templates"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "mutable" = callPackage @@ -179194,7 +179931,7 @@ self: { transformers vector vinyl ]; description = "Automatic piecewise-mutable references for your types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "mutable-containers" = callPackage @@ -179213,7 +179950,7 @@ self: { ]; benchmarkHaskellDepends = [ base containers gauge vector ]; description = "Abstactions and concrete implementations of mutable containers"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "mutable-iter" = callPackage @@ -179228,8 +179965,8 @@ self: { base iteratee MonadCatchIO-transformers transformers vector ]; description = "iteratees based upon mutable buffers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -179248,7 +179985,7 @@ self: { ]; benchmarkHaskellDepends = [ base extra primitive ]; description = "Interoperate mutable references with regular lens"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "mute-unmute" = callPackage @@ -179266,8 +180003,8 @@ self: { process ]; description = "Watches your screensaver and (un)mutes music when you (un)lock the screen"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -179279,8 +180016,8 @@ self: { sha256 = "09diqzb4vp7bcg6v16fgjb70mi68i8srnyxf6qga58va6avbc4wg"; libraryHaskellDepends = [ base safe-exceptions ]; description = "A trivial lock based on MVar"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -179297,8 +180034,8 @@ self: { pipes-concurrency transformers ]; description = "Model-view-controller"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -179310,8 +180047,8 @@ self: { sha256 = "125bwc79qcmwb8dn8yqkrxlbqf3vwdzhjx66c69j2jbrp70061n6"; libraryHaskellDepends = [ async base foldl mvc ]; description = "Concurrent and combinable updates"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -179330,8 +180067,8 @@ self: { maccatcher mtl network parsec time uuid ]; description = "Client library for metaverse systems like Second Life"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -179347,7 +180084,7 @@ self: { base containers mwc-random primitive transformers ]; description = "Sampling function-based probability distributions"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "mwc-probability-transition" = callPackage @@ -179366,7 +180103,7 @@ self: { base hspec logging-effect mwc-probability QuickCheck ]; description = "A Markov stochastic transition operator with logging"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "mwc-random" = callPackage @@ -179380,7 +180117,7 @@ self: { ]; doCheck = false; description = "Fast, high quality pseudo random number generation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "mwc-random_0_15_0_1" = callPackage @@ -179404,8 +180141,8 @@ self: { ]; doCheck = false; description = "Fast, high quality pseudo random number generation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "mwc-random-accelerate" = callPackage @@ -179416,7 +180153,7 @@ self: { sha256 = "1a8b36l60p29461y0gacgjzarlyrncl54r7x4zh2rgvs2w7mjdc5"; libraryHaskellDepends = [ accelerate base mwc-random ]; description = "Generate Accelerate arrays filled with high quality pseudorandom numbers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "mwc-random-monad" = callPackage @@ -179431,7 +180168,7 @@ self: { base monad-primitive mwc-random primitive transformers vector ]; description = "Monadic interface for mwc-random"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "mx-state-codes" = callPackage @@ -179443,7 +180180,7 @@ self: { libraryHaskellDepends = [ aeson base text ]; testHaskellDepends = [ aeson base hspec QuickCheck text ]; description = "ISO 3166-2:MX State Codes and Names"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "mxnet" = callPackage @@ -179463,8 +180200,8 @@ self: { libraryToolDepends = [ c2hs ]; testHaskellDepends = [ base tasty tasty-hunit vector ]; description = "MXNet interface in Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) mxnet;}; @@ -179482,8 +180219,8 @@ self: { ]; testHaskellDepends = [ base hspec mxnet streaming ]; description = "mxnet dataiters"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -179497,8 +180234,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base mxnet ]; description = "Examples for MXNet in Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -179524,8 +180261,8 @@ self: { streaming-utils unordered-containers vector ]; description = "Train a neural network with MXNet in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -179539,8 +180276,8 @@ self: { librarySystemDepends = [ mxnet ]; libraryToolDepends = [ c2hs ]; description = "NNVM interface in Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) mxnet;}; @@ -179565,8 +180302,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "spam"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -179591,8 +180328,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "spam"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -179617,8 +180354,8 @@ self: { ansi-terminal base Cabal Euterpea QuickCheck ]; description = "None"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -179642,8 +180379,8 @@ self: { http-client-tls network-uri text yaml ]; description = "Export from MyAnimeList"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -179657,7 +180394,7 @@ self: { base cgi curl directory mtl process split ]; description = "Binding to mybitcoin.com's Shopping Cart Interface."; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "myo" = callPackage @@ -179680,8 +180417,8 @@ self: { ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Haskell binding to the Myo armband"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -179698,8 +180435,8 @@ self: { regex-posix snap snap-core time ]; description = "Sessions and continuations for Snap web apps"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -179719,8 +180456,8 @@ self: { snap-core snap-server text time ]; description = "Example projects using mysnapsession"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -179736,7 +180473,7 @@ self: { librarySystemDepends = [ mysql ]; testHaskellDepends = [ base bytestring hspec ]; description = "A low-level MySQL client library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) mysql;}; "mysql-effect" = callPackage @@ -179753,8 +180490,8 @@ self: { base bytestring extensible-effects mysql mysql-simple ]; description = "An extensible mysql effect using extensible-effects and mysql-simple"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -179778,7 +180515,7 @@ self: { base bytestring io-streams tasty tasty-hunit text time vector ]; description = "pure haskell MySQL driver"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "mysql-haskell-nem" = callPackage @@ -179793,7 +180530,7 @@ self: { base bytestring io-streams mysql-haskell scientific text time ]; description = "Adds a interface like mysql-simple to mysql-haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "mysql-haskell-openssl" = callPackage @@ -179809,8 +180546,8 @@ self: { wire-streams ]; description = "TLS support for mysql-haskell package using openssl"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -179829,7 +180566,7 @@ self: { ]; testHaskellDepends = [ base blaze-builder hspec text ]; description = "A mid-level MySQL client library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "mysql-simple-quasi" = callPackage @@ -179844,8 +180581,8 @@ self: { base haskell-src-meta mysql-simple template-haskell ]; description = "Quasi-quoter for use with mysql-simple"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -179861,8 +180598,8 @@ self: { base mysql mysql-simple template-haskell typedquery utf8-string ]; description = "Typed extension to mysql simple"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -179881,8 +180618,8 @@ self: { ]; executableHaskellDepends = [ base text ]; description = "Bindings for Mystem morphological analyzer executabe"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -179907,8 +180644,8 @@ self: { unordered-containers wai wai-extra wai-middleware-static warp ]; description = "Web application to view and kill MySQL queries"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -179931,8 +180668,8 @@ self: { ]; testHaskellDepends = [ bytestring text ]; description = "A Haskell client for the Myxine GUI server"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -179944,8 +180681,8 @@ self: { sha256 = "044x87jzyqsg5npp3s0mncgcl0gv26h6hzhc7bbgjja95x16ma2l"; libraryHaskellDepends = [ base transformers ]; description = "Implementation of the \"Monads, Zippers and Views\" (Schrijvers and Oliveira, ICFP'11)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -179963,7 +180700,7 @@ self: { ]; testHaskellDepends = [ base doctest ]; description = "An n-ary version of Functor"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "n-m" = callPackage @@ -179978,7 +180715,7 @@ self: { executableHaskellDepends = [ base HSH mtl process ]; description = "Utility to call iwconfig"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "n-tuple" = callPackage @@ -179989,8 +180726,8 @@ self: { sha256 = "0gq2s7cfivzspr446h21c79md6wzg2q8wzmx8kivbxiixsr3bxva"; libraryHaskellDepends = [ base singletons vector ]; description = "Homogeneous tuples of arbitrary length"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -180004,7 +180741,7 @@ self: { libraryHaskellDepends = [ base binary bytestring containers text ]; testHaskellDepends = [ base hspec ]; description = "Abstract Protocol Loop"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "n2o-nitro" = callPackage @@ -180019,7 +180756,7 @@ self: { base base64-bytestring binary bytestring containers n2o text ]; description = "Nitro Elements, Events and Actions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "n2o-protocols" = callPackage @@ -180035,8 +180772,8 @@ self: { time ]; description = "N2O Protocols Starter Pack"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -180055,8 +180792,8 @@ self: { websockets ]; description = "N2O adapter for WebSockets"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -180071,7 +180808,7 @@ self: { libraryHaskellDepends = [ base bifunctors exceptions mtl text ]; testHaskellDepends = [ base hspec QuickCheck text ]; description = "Package for writing monitoring plugins"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "nagios-config" = callPackage @@ -180085,7 +180822,7 @@ self: { libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base ]; description = "EDSL to specify Nagios configuration files"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "nagios-perfdata" = callPackage @@ -180103,7 +180840,7 @@ self: { base bytestring hspec HUnit MissingH transformers ]; description = "Parse Nagios performance data"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "nagios-plugin-ekg" = callPackage @@ -180126,8 +180863,8 @@ self: { base bytestring hspec HUnit nagios-check text transformers ]; description = "Monitor ekg metrics via Nagios"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -180166,8 +180903,8 @@ self: { unliftio-core unordered-containers uuid vector wai warp ]; description = "Client library for the Nakadi Event Broker"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -180182,7 +180919,7 @@ self: { libraryHaskellDepends = [ aeson attoparsec base lens text wreq ]; executableHaskellDepends = [ base text ]; description = "Tool to keep namecoin names updated and well"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "named" = callPackage @@ -180196,7 +180933,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Named parameters (keyword arguments) for Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "named-formlet" = callPackage @@ -180211,7 +180948,7 @@ self: { base blaze-html bytestring containers mtl text transformers ]; description = "A simple formlet library with named formlets"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "named-lock" = callPackage @@ -180222,8 +180959,8 @@ self: { sha256 = "1db12f2q395yk6pwz5gnb2q0kf4s868z8d1vvwa7vngnfc1h924i"; libraryHaskellDepends = [ base containers ]; description = "A named lock that is created on demand"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -180235,18 +180972,21 @@ self: { sha256 = "0ykcmmnns63zjfd00kd9941c33l19n9c5b5xkin4n7r9v0qvirwr"; libraryHaskellDepends = [ base binary names template-haskell ]; description = "Flexible records with named fields"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "named-servant" = callPackage ({ mkDerivation, base, named, servant }: mkDerivation { pname = "named-servant"; - version = "0.2.0"; - sha256 = "0ixpm43sgir02a9y8i7rvalxh6h7vlcwgi2hmis0lq0w8pmw5m53"; + version = "0.3.0"; + sha256 = "14a55ww538c39wmacazdchrinc098yw9kbv44z4dw1739zhsghb6"; + revision = "1"; + editedCabalFile = "1xrbz9vhb61wkjb1amswvpb9sfslg1258vqlm880angc18i3dyi7"; libraryHaskellDepends = [ base named servant ]; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + description = "support records and named (from the named package) parameters in servant"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -180256,14 +180996,16 @@ self: { }: mkDerivation { pname = "named-servant-client"; - version = "0.2.0"; - sha256 = "1yklvwdrf74m0ipsvn0b88slmhidri6f4n7jz7njz5i594qg7zdn"; + version = "0.3.0"; + sha256 = "1ilzhvdvspd8wddv6yypvl6whbzsa3pzqz2a8ikmk0l3vkskv60d"; + revision = "1"; + editedCabalFile = "19frg1vj2zzibdrbmxdmjfas31z5hwhy7kjkk28vm20y51h4lir3"; libraryHaskellDepends = [ base named named-servant servant servant-client-core ]; description = "client support for named-servant"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -180273,14 +181015,16 @@ self: { }: mkDerivation { pname = "named-servant-server"; - version = "0.2.0"; - sha256 = "03mqkkf3l6abml6w5p04389c7haya7bp637vvaq43z0cxgpxs4mp"; + version = "0.3.0"; + sha256 = "14v1sgfz6agsbiy2938chy0vi4j4jd1swdhwb9g2yg068m3262k3"; + revision = "1"; + editedCabalFile = "0880w18l18hjnrpf0j4z0rd98waai3431gzakqm53zh8zs75lcll"; libraryHaskellDepends = [ base named named-servant servant servant-server text ]; description = "server support for named-servant"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -180293,8 +181037,8 @@ self: { libraryHaskellDepends = [ base singletons text ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Dependently-typed sums and products, tagged by field name"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -180313,8 +181057,8 @@ self: { base case-insensitive QuickCheck tasty tasty-hunit tasty-quickcheck ]; description = "fortran90 namelist parser/pretty printer"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -180326,7 +181070,7 @@ self: { sha256 = "0sjjp90zfrkjavj8fqyscnvc9d72mkvv8f7ajd47jba92mhwzr5g"; libraryHaskellDepends = [ base template-haskell ]; description = "Type level names"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "names-th" = callPackage @@ -180337,7 +181081,7 @@ self: { sha256 = "12ally0n6ixsxj0zwbvw439dbx29phvh0rd6l5sd0c5a514a32aa"; libraryHaskellDepends = [ base containers template-haskell ]; description = "Manipulate name strings for TH"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "namespace" = callPackage @@ -180349,8 +181093,8 @@ self: { libraryHaskellDepends = [ base containers monoid-extras ]; testHaskellDepends = [ base ]; description = "A Generic Haskell library for managing namespaces"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -180368,7 +181112,7 @@ self: { test-framework-quickcheck2 ]; description = "A threadsafe binding to glibc's crypt_r function"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "nano-erl" = callPackage @@ -180379,7 +181123,7 @@ self: { sha256 = "04pfk3a9m6fgspyk2vriixldsx2y9p2jcwzfjfvpgjiq5dl602ip"; libraryHaskellDepends = [ base stm ]; description = "Small library for Erlang-style actor semantics"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "nano-hmac" = callPackage @@ -180391,8 +181135,8 @@ self: { libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ openssl ]; description = "Bindings to OpenSSL HMAC"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) openssl;}; @@ -180407,8 +181151,8 @@ self: { libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ openssl ]; description = "Efficient, ByteString bindings to OpenSSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) openssl;}; @@ -180427,7 +181171,7 @@ self: { ]; description = "A toy dependently-typed language"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "nanocurses" = callPackage @@ -180439,8 +181183,8 @@ self: { libraryHaskellDepends = [ base bytestring unix ]; librarySystemDepends = [ ncurses ]; description = "Simple Curses binding"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) ncurses;}; @@ -180453,8 +181197,8 @@ self: { libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ nanomsg ]; description = "nanomsg - scalability protocols library"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) nanomsg;}; @@ -180479,8 +181223,8 @@ self: { base bytestring criterion zeromq4-haskell ]; description = "Bindings to the nanomsg library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) nanomsg;}; @@ -180492,8 +181236,8 @@ self: { sha256 = "00ghdzkzshk24g7v42hq7zq0dxsq8vjpkslj41dxdnx0zizwbn3m"; libraryHaskellDepends = [ base bytestring ListLike ]; description = "An implementation of attoparsec-like parser around list-like"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -180506,7 +181250,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec silently ]; description = "A lightweight implementation of a subset of Hspec's API"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "nanovg" = callPackage @@ -180527,8 +181271,8 @@ self: { libraryToolDepends = [ c2hs ]; testHaskellDepends = [ base containers hspec inline-c QuickCheck ]; description = "Haskell bindings for nanovg"; - license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; broken = true; }) {GLEW = null; inherit (pkgs) glew; inherit (pkgs) libGL; inherit (pkgs) libGLU;}; @@ -180547,8 +181291,8 @@ self: { base GLFW-b monad-loops nanovg OpenGL safe-exceptions text ]; description = "Simple interface to rendering with NanoVG"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -180568,8 +181312,8 @@ self: { kanji microlens microlens-aeson optparse-applicative text ]; description = "Performs 漢字検定 (Japan Kanji Aptitude Test) level analysis on given Kanji"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -180587,8 +181331,8 @@ self: { adjunctions base comonad distributive free streams transformers ]; description = "Efficient representable functors"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -180608,7 +181352,7 @@ self: { doHaddock = false; description = "A library for working with anything map related"; license = "(Apache-2.0 OR BSD-3-Clause)"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -180620,8 +181364,8 @@ self: { sha256 = "1ng1rzj1lf6h9g3pk8gsz05bnck72rp5j62iwn82vlcw8pyk0fsc"; libraryHaskellDepends = [ base HDBC HUnit mtl QuickCheck random ]; description = "Query SQL databases using Nested Relational Calculus embedded in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -180633,7 +181377,7 @@ self: { sha256 = "1v43c1dr72qn8mymnwcq6an8sqxjaxhac037k4gbv8z8bg18zmf5"; libraryHaskellDepends = [ base ]; description = "Lazy binary natural numbers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "nat-sized-numbers" = callPackage @@ -180645,8 +181389,8 @@ self: { libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base doctest hedgehog QuickCheck ]; description = "Variable-sized numbers from type-level nats"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -180663,8 +181407,8 @@ self: { http-types multiset tls transformers xml ]; description = "NationStates API client"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -180685,7 +181429,7 @@ self: { executableHaskellDepends = [ base optparse-applicative ]; testHaskellDepends = [ base ]; description = "Native library manager for Windows"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "nats" = callPackage @@ -180698,7 +181442,7 @@ self: { editedCabalFile = "02ww45nskca28fsbh74iy0z4rm0yshws7lrxld45y053hrn1jdzc"; doHaddock = false; description = "Natural numbers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "nats-client" = callPackage @@ -180724,8 +181468,8 @@ self: { ]; benchmarkHaskellDepends = [ base criterion time ]; description = "Another Haskell client for NATS (https://nats.io)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -180746,8 +181490,8 @@ self: { random text ]; description = "Haskell API for NATS messaging system"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -180766,7 +181510,7 @@ self: { tasty-hunit tasty-quickcheck transformers ]; description = "Natural number"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "natural-arithmetic" = callPackage @@ -180777,7 +181521,7 @@ self: { sha256 = "0zw1dax3a67cpilq57ykbrjybz9kc45qflpr6mwfz79hpx9pcld0"; libraryHaskellDepends = [ base ]; description = "Arithmetic of natural numbers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "natural-induction" = callPackage @@ -180790,7 +181534,7 @@ self: { editedCabalFile = "012kjygd54rxinmaplqnbw0hkfm4wp829j0afjxr6h40x22gwzn5"; libraryHaskellDepends = [ base peano ]; description = "Induction over natural numbers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "natural-number" = callPackage @@ -180806,8 +181550,8 @@ self: { type-level-natural-number-induction ]; description = "Natural numbers tagged with a type-level representation of the number"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -180819,7 +181563,7 @@ self: { sha256 = "0cj9lnnlvry425bkixqv9fh5b9xhy7dmwcqsxprj6lamccvxspwn"; libraryHaskellDepends = [ base ]; description = "Natural numbers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "natural-sort" = callPackage @@ -180830,7 +181574,7 @@ self: { sha256 = "0l3bkbqzrlpdhzazqqlx71ah0m13ypa0981qvw3sn9q8d0sbfwkv"; libraryHaskellDepends = [ base bytestring parsec text ]; description = "User-friendly text collation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "natural-transformation" = callPackage @@ -180848,7 +181592,7 @@ self: { base containers quickcheck-instances tasty tasty-quickcheck ]; description = "A natural transformation package"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "naturalcomp" = callPackage @@ -180859,7 +181603,7 @@ self: { sha256 = "1l594lkd3yb52lhh0raygvk3jlzwkcc2pmcqjmg02dmd6j6mw42x"; libraryHaskellDepends = [ base text utf8-string ]; description = "Natural-order string comparison"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "naturals" = callPackage @@ -180870,7 +181614,7 @@ self: { sha256 = "1ay291833dcah411zc3r4qjilaw8x13ljlnb5z40d1s7784djm16"; libraryHaskellDepends = [ base ]; description = "Constructors and related functions for natural numbers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "naver-translate" = callPackage @@ -180885,8 +181629,8 @@ self: { aeson base iso639 lens lens-aeson network-uri random text wreq ]; description = "Interface to Naver Translate"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -180906,8 +181650,8 @@ self: { test-framework-hunit test-framework-quickcheck2 text zlib ]; description = "A parser/serializer for Minecraft's Named Binary Tag (NBT) data format"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -180926,7 +181670,7 @@ self: { stm unix ]; description = "CPU load and memory usage indicators for i3bar"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "ncurses" = callPackage @@ -180943,7 +181687,7 @@ self: { librarySystemDepends = [ ncurses ]; libraryToolDepends = [ c2hs ]; description = "Modernised bindings to GNU ncurses"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {inherit (pkgs) ncurses;}; "ndjson-conduit" = callPackage @@ -180956,7 +181700,7 @@ self: { aeson attoparsec base bytestring conduit ]; description = "Conduit-based parsing and serialization for newline delimited JSON"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "neat" = callPackage @@ -180970,8 +181714,8 @@ self: { libraryHaskellDepends = [ base filepath parsec ]; executableHaskellDepends = [ base filepath parsec ]; description = "A Fast Retargetable Template Engine"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -180990,7 +181734,7 @@ self: { tasty-quickcheck ]; description = "A quasiquoter for neat and simple multiline text interpolation"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "needle" = callPackage @@ -181006,8 +181750,8 @@ self: { template-haskell text vector ]; description = "ASCII-fied arrow notation"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -181024,8 +181768,8 @@ self: { random transformers ]; description = "A NEAT library for Haskell"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -181045,8 +181789,8 @@ self: { random ]; description = "Port of the NeHe OpenGL tutorials to Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -181065,7 +181809,7 @@ self: { old-time process time ]; description = "General tools for Neil"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "neither" = callPackage @@ -181076,8 +181820,8 @@ self: { sha256 = "192l840yb1pprfjjq7ax5xaraagl1pbmsidkg1yibp6r4azd61yf"; libraryHaskellDepends = [ base failure transformers ]; description = "Provide versions of Either with good monad and applicative instances. (deprecated)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -181098,8 +181842,8 @@ self: { process random tagged tasty tasty-hunit tasty-smallcheck temporary ]; description = "Neko VM code generation and disassembly library"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -181121,7 +181865,7 @@ self: { random text transformers ]; description = "a TCP tunnel with packet length obfuscation"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "nemesis" = callPackage @@ -181136,7 +181880,7 @@ self: { base containers directory dlist Glob lens mtl process time ]; description = "a task management tool for Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "nemesis-titan" = callPackage @@ -181153,8 +181897,8 @@ self: { nemesis random uuid ]; description = "A collection of Nemesis tasks to bootstrap a Haskell project with a focus on continuous integration"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -181188,8 +181932,8 @@ self: { semigroups text time transformers unordered-containers vector ]; description = "Neptune Client"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -181216,8 +181960,8 @@ self: { polysoup sgd tagsoup temporary text text-binary tokenize vector ]; description = "Nerf, a named entity recognition tool based on linear-chain CRFs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -181236,8 +181980,8 @@ self: { base bytestring doctest Glob lens tasty tasty-hunit text ]; description = "Lens-based HTTP toolkit"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -181253,8 +181997,8 @@ self: { base bytestring http-types lens nero text wai wai-extra ]; description = "WAI adapter for Nero server applications"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -181266,8 +182010,8 @@ self: { sha256 = "1ddr0hs9x7r74f5bb00fbi0z87cfkxp21m5ikp5qgyblqb09940s"; libraryHaskellDepends = [ base nero nero-wai warp ]; description = "Run Nero server applications with Warp"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -181283,8 +182027,8 @@ self: { base bytestring containers text transformers unix ]; testHaskellDepends = [ base bytestring containers hedgehog text ]; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -181314,8 +182058,8 @@ self: { wai-middleware-verbs wai-transformers ]; description = "Declarative, compositional Wai responses"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -181332,8 +182076,8 @@ self: { base QuickCheck test-framework test-framework-quickcheck2 ]; description = "List-like data structures with O(log(n)) random access"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -181346,7 +182090,7 @@ self: { libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers hspec ]; description = "Nested set model implementation"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "nestedmap" = callPackage @@ -181362,8 +182106,8 @@ self: { base base-unicode-symbols containers data-ordlist hspec QuickCheck ]; description = "A library for nested maps"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -181379,8 +182123,8 @@ self: { base bytestring containers ghc-binary hslogger monad-loops network ]; description = "Concurrent over the network execution library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {ghc-binary = null;}; @@ -181393,8 +182137,8 @@ self: { }: mkDerivation { pname = "net-mqtt"; - version = "0.7.0.1"; - sha256 = "0gfym6fv92afbv1b126bnviw3qh4m9dim9q046kbh4h5sxah61ab"; + version = "0.7.1.0"; + sha256 = "1l19hmc3623gsx1yv0wcbgcy22p549zyrvfv44khzd45fl3fxfb7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -181414,8 +182158,8 @@ self: { tasty-quickcheck text websockets ]; description = "An MQTT Protocol Implementation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -181432,8 +182176,8 @@ self: { base HUnit lens net-mqtt tasty tasty-hunit tasty-quickcheck ]; description = "Optics for net-mqtt"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -181455,8 +182199,8 @@ self: { optparse-applicative random stm text uuid ]; description = "Make RPC calls via an MQTT broker"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -181481,8 +182225,8 @@ self: { hspec text time vector ]; description = "A graph database middleware to maintain a time-varying graph"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -181503,8 +182247,8 @@ self: { base doctest doctest-discover hspec net-spider optparse-applicative ]; description = "CLI option parsers for NetSpider objects"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -181523,8 +182267,8 @@ self: { base doctest doctest-discover hspec net-spider pangraph text ]; description = "Conversion between net-spider and pangraph"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -181546,8 +182290,8 @@ self: { text ]; description = "NetSpider data model and utility for RPL networks"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -181574,8 +182318,8 @@ self: { net-spider net-spider-cli net-spider-rpl optparse-applicative text ]; description = "CLI executable of NetSpider.RPL."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -181589,8 +182333,8 @@ self: { editedCabalFile = "00wqr9nnjn8hm0r8xa5qrgqva5r0pcf32hlksrqhkzy12yl2kv08"; libraryHaskellDepends = [ base bytestring hosc network ]; description = "Netclock protocol"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -181605,7 +182349,7 @@ self: { libraryHaskellDepends = [ base bindings-DSL ]; librarySystemDepends = [ libsodium ]; description = "Bindings to the low-level netcode.io library."; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) libsodium;}; "netcore" = callPackage @@ -181636,8 +182380,8 @@ self: { random syb ]; description = "The NetCore compiler and runtime system for OpenFlow networks"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -181666,8 +182410,8 @@ self: { random stm transformers vty ]; description = "NetEase Cloud Music FM client in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -181681,7 +182425,7 @@ self: { array base carray netlib-ffi transformers ]; description = "Helper modules for CArray wrappers to BLAS and LAPACK"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "netlib-comfort-array" = callPackage @@ -181694,7 +182438,7 @@ self: { base comfort-array netlib-ffi transformers ]; description = "Helper modules for comfort-array wrappers to BLAS and LAPACK"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "netlib-ffi" = callPackage @@ -181709,7 +182453,7 @@ self: { base guarded-allocation storable-complex transformers ]; description = "Helper modules for FFI to BLAS and LAPACK"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "netlines" = callPackage @@ -181727,8 +182471,8 @@ self: { ]; executableHaskellDepends = [ base HTF random ]; description = "Enumerator tools for text-based network protocols"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -181747,7 +182491,7 @@ self: { ]; executableHaskellDepends = [ base ]; description = "Netlink communication for Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "netlist" = callPackage @@ -181758,7 +182502,7 @@ self: { sha256 = "0f3fwgpg0p3ajgxfzbqr4z04ly5cdbhjxms5xbd0k2ixdwgyxm67"; libraryHaskellDepends = [ base binary containers syb ]; description = "Netlist AST"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "netlist-to-vhdl" = callPackage @@ -181769,7 +182513,7 @@ self: { sha256 = "1f62l4i1l1z47gbrv49xx5y78ykcf6iq6bish3sx5fw46mhcr1j4"; libraryHaskellDepends = [ base netlist pretty ]; description = "Convert a Netlist AST to VHDL"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "netpbm" = callPackage @@ -181788,7 +182532,7 @@ self: { testHaskellDepends = [ base bytestring hspec HUnit vector ]; benchmarkHaskellDepends = [ base bytestring criterion ]; description = "Loading PBM, PGM, PPM image files"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "netrc" = callPackage @@ -181806,7 +182550,7 @@ self: { base bytestring tasty tasty-golden tasty-quickcheck ]; description = "Parser for .netrc files"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "netrium" = callPackage @@ -181825,8 +182569,8 @@ self: { base containers directory filepath HaXml pretty process ]; description = "Contract normaliser and simulator"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -181843,8 +182587,8 @@ self: { transformers ]; description = "Simplify static Networking tasks"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -181858,8 +182602,8 @@ self: { base bytestring enumerator transformers ]; description = "Enumerator-based netstring parsing"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -181885,7 +182629,7 @@ self: { test-framework-quickcheck2 ]; description = "safe nettle binding"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {inherit (pkgs) nettle;}; "nettle-frp" = callPackage @@ -181901,8 +182645,8 @@ self: { network-data random time ]; description = "FRP for controlling networks of OpenFlow switches"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -181918,8 +182662,8 @@ self: { base containers directory filepath mtl nettle-openflow unix ]; description = "DSL for describing OpenFlow networks, and a compiler generating NetKit labs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -181936,8 +182680,8 @@ self: { mtl network parsec syb ]; description = "OpenFlow protocol messages, binary formats, and servers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -181954,7 +182698,7 @@ self: { transformers ]; description = "Functional reactive programming library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "netwire-input" = callPackage @@ -181965,7 +182709,7 @@ self: { sha256 = "1f9xxlcpy2brqn5hv0mdc428fav402jsqa1b8h4s8b09qa3v1ii9"; libraryHaskellDepends = [ base deepseq netwire ]; description = "Input handling abstractions for netwire"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "netwire-input-glfw" = callPackage @@ -181982,7 +182726,7 @@ self: { base containers deepseq GLFW-b mtl netwire-input stm ]; description = "GLFW instance of netwire-input"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "netwire-input-javascript" = callPackage @@ -181997,8 +182741,8 @@ self: { base containers ghcjs-base netwire netwire-input transformers ]; description = "JavaScript instance of netwire-input"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -182021,8 +182765,8 @@ self: { transformers vinyl vinyl-gl ]; description = "Netwire/GLFW/VinylGL input handling demo"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -182039,8 +182783,8 @@ self: { base bytestring doctest HUnit test-framework test-framework-hunit ]; description = "Low-level networking interface"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "network" = callPackage @@ -182055,7 +182799,7 @@ self: { testHaskellDepends = [ base bytestring directory hspec HUnit ]; testToolDepends = [ hspec-discover ]; description = "Low-level networking interface"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "network_3_1_2_1" = callPackage @@ -182074,8 +182818,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Low-level networking interface"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "network-address" = callPackage @@ -182093,8 +182837,8 @@ self: { base Cabal QuickCheck test-framework test-framework-quickcheck2 ]; description = "IP data structures and textual representation"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -182117,8 +182861,8 @@ self: { hspec-expectations mtl network network-simple transformers uuid ]; description = "Haskell API for I2P anonymous networking"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -182148,8 +182892,8 @@ self: { text transformers ]; description = "Haskell API for Tor anonymous networking"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -182167,8 +182911,8 @@ self: { http-client-tls http-types text time tls ]; description = "Toolkit for building http client libraries over Network.Http.Conduit"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -182190,8 +182934,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Arbitrary Instances for Network Types"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -182215,8 +182959,8 @@ self: { ]; doCheck = false; description = "Utility functions for running a parser against a socket"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -182239,8 +182983,8 @@ self: { unordered-containers vector ]; description = "An interface to bitcoind"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -182254,7 +182998,7 @@ self: { editedCabalFile = "1hc3jdbmpq2wxh82xfx452v2m2l97jbdaqqbmj5nz4lljxa2696r"; libraryHaskellDepends = [ base deepseq network ]; description = "POSIX network database (<netdb.h>) API"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "network-builder" = callPackage @@ -182275,8 +183019,8 @@ self: { base cabal-test-bin hspec hspec-server process ]; description = "Linux NetworkNameSpace Builder"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -182289,7 +183033,7 @@ self: { libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring doctest ]; description = "Network byte order utilities"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "network-bytestring" = callPackage @@ -182302,8 +183046,8 @@ self: { editedCabalFile = "0znp4qkad1sd650kjqhbbrr2ap7bb772g3db92k7r2rrydr19cdl"; libraryHaskellDepends = [ base bytestring network unix ]; description = "Fast, memory-efficient, low-level networking"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -182317,8 +183061,8 @@ self: { base bytestring network text time vector ]; description = "A Haskell implementation of the Carbon protocol (part of the Graphite monitoring tools)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -182331,7 +183075,7 @@ self: { libraryHaskellDepends = [ base conduit ]; doHaddock = false; description = "Stream socket data using conduits. (deprecated)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "network-conduit-tls" = callPackage @@ -182351,7 +183095,7 @@ self: { base bytestring conduit conduit-extra connection HUnit mtl ]; description = "Create TLS-aware network code with conduits"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "network-connection" = callPackage @@ -182366,8 +183110,8 @@ self: { base bytestring containers network network-bytestring stm ]; description = "A wrapper around a generic stream-like connection"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -182379,7 +183123,7 @@ self: { sha256 = "0zbwplzrr899lj0ig2nyq58cayy6f8pkn4wnqbrd1i50lhq61szz"; libraryHaskellDepends = [ base bytestring cereal pretty ]; description = "Library for network data structures and their serialization"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "network-dbus" = callPackage @@ -182396,7 +183140,7 @@ self: { ]; description = "D-Bus"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "network-dns" = callPackage @@ -182418,8 +183162,8 @@ self: { base data-serializer data-textual network-ip posix-socket ]; description = "Domain Name System data structures"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -182435,8 +183179,8 @@ self: { base bytestring enumerator network transformers ]; description = "Enumerators for network sockets"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -182448,7 +183192,7 @@ self: { sha256 = "0myzfvmv6xny7nmq2p5dhyrz8yl7n48p4brkarkacs07k1zyldj9"; libraryHaskellDepends = [ base bytestring ]; description = "Networking support with a cleaner API"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "network-hans" = callPackage @@ -182459,8 +183203,8 @@ self: { sha256 = "1gv1y0iz90r30rmp8g40ksf39fvgznjihy68sspahpf8r24srlwq"; libraryHaskellDepends = [ base bytestring hans parsec ]; description = "HaNS to Network shims for easier HaNS integration"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -182472,8 +183216,8 @@ self: { sha256 = "0hxbzzdjrxnx9pknsbma7iyfr3pxrsff5n9mhbkpaqaizhibq7q7"; libraryHaskellDepends = [ array base containers mtl ]; description = "data and parsers for Ethernet, TCP, UDP, IPv4, IPv6, ICMP, DHCP, TFTP"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -182487,7 +183231,7 @@ self: { editedCabalFile = "07kiw56lhc56kqrnvpa11f5nnnid6by3aq00jrkcbbg7w0q71a6d"; libraryHaskellDepends = [ base ]; description = "Access the local computer's basic network configuration"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "network-interfacerequest" = callPackage @@ -182498,8 +183242,8 @@ self: { sha256 = "0qa5rbbcw9axg7mj4kjj027hfsclnw85cj8nmi6jvrzq2yhhk56c"; libraryHaskellDepends = [ base bytestring ioctl network ]; description = "Haskell bindings for the ifreq structure"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -182521,7 +183265,7 @@ self: { text-printer ]; description = "Internet Protocol data structures"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "network-manager-tui" = callPackage @@ -182545,7 +183289,7 @@ self: { ]; doHaddock = false; description = "network-manager tui"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "network-messagepack-rpc" = callPackage @@ -182561,7 +183305,7 @@ self: { unordered-containers ]; description = "MessagePack RPC"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "network-messagepack-rpc-websocket" = callPackage @@ -182581,8 +183325,8 @@ self: { network-messagepack-rpc QuickCheck skews text wss-client ]; description = "WebSocket backend for MessagePack RPC"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -182599,7 +183343,7 @@ self: { ]; description = "Send metrics to Ganglia, Graphite, and statsd"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "network-minihttp" = callPackage @@ -182618,8 +183362,8 @@ self: { old-locale stm tagsoup time unix ]; description = "A ByteString based library for writing HTTP(S) servers and clients"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -182632,7 +183376,7 @@ self: { libraryHaskellDepends = [ base binary bytestring network unix ]; description = "Recvmsg and sendmsg bindings"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "network-msgpack-rpc" = callPackage @@ -182654,8 +183398,8 @@ self: { ]; testHaskellDepends = [ async base bytestring hspec mtl network ]; description = "A MessagePack-RPC Implementation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -182667,7 +183411,7 @@ self: { sha256 = "0whvi0pbwjy6dbwfdf9rv1j3yr3lcmfp3q7a8pwq63g537l4l2l3"; libraryHaskellDepends = [ base network network-bsd ]; description = "Simple multicast library"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "network-netpacket" = callPackage @@ -182683,8 +183427,8 @@ self: { network-interfacerequest ]; description = "Haskell bindings for low-level packet sockets (AF_PACKET)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -182701,7 +183445,7 @@ self: { ]; description = "Library for writing PGI applications"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "network-protocol-xmpp" = callPackage @@ -182717,8 +183461,8 @@ self: { text transformers xml-types ]; description = "Client library for the XMPP protocol"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -182736,8 +183480,8 @@ self: { containers control-timeout network network-bytestring stm ]; description = "A cross-platform RPC library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -182749,7 +183493,7 @@ self: { sha256 = "0w3dmwk03j4n01xkiq8m4sqa27bskh239mpw7m4ihjmkxqcwc5gl"; libraryHaskellDepends = [ base bytestring network ]; description = "Simple network runner library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "network-server" = callPackage @@ -182764,7 +183508,7 @@ self: { executableHaskellDepends = [ base network unix ]; description = "A light abstraction over sockets & co. for servers"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -182780,8 +183524,8 @@ self: { base base64-bytestring bytestring network ]; description = "Provide a service at the data type level"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -182798,7 +183542,7 @@ self: { transformers ]; description = "Simple network sockets usage patterns"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "network-simple-sockaddr" = callPackage @@ -182813,8 +183557,8 @@ self: { base bytestring directory exceptions network transformers ]; description = "network-simple for resolved addresses"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -182833,7 +183577,7 @@ self: { x509-validation ]; description = "Simple interface to TLS secured network sockets"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "network-simple-ws" = callPackage @@ -182849,7 +183593,7 @@ self: { websockets ]; description = "Simple interface to WebSockets"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "network-simple-wss" = callPackage @@ -182865,8 +183609,8 @@ self: { safe-exceptions websockets ]; description = "Simple interface to TLS secured WebSockets"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -182878,8 +183622,8 @@ self: { sha256 = "00qf22nwzsv8229gb7yqaaafiz573xl4v78mn1zf9ajvwzvwb63r"; libraryHaskellDepends = [ base network ]; description = "Type-safe, portable alternative to getSocketOption/setSocketOption"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -182896,8 +183640,8 @@ self: { transformers ]; description = "ByteString and Text streams for networking"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -182919,8 +183663,8 @@ self: { random-fu statistics stm text transformers vector ]; description = "A few network topic model implementations for bayes-stack"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -182936,7 +183680,7 @@ self: { base binary bytestring deepseq hashable transformers ]; description = "Network abstraction layer"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "network-transport-amqp" = callPackage @@ -182961,8 +183705,8 @@ self: { tasty-hunit ]; description = "AMQP-based transport layer for distributed-process (aka Cloud Haskell)"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -182974,7 +183718,7 @@ self: { sha256 = "0i2rwl1hwbp87kvnhfc6h0v2zy1hbfgrz0wx1vicd9m76nzbynx3"; libraryHaskellDepends = [ base bytestring network-transport ]; description = "Compose network transports"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "network-transport-inmemory" = callPackage @@ -182994,8 +183738,8 @@ self: { base network-transport network-transport-tests ]; description = "In-memory instantiation of Network.Transport"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -183015,7 +183759,7 @@ self: { base bytestring network network-transport network-transport-tests ]; description = "TCP instantiation of Network.Transport"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "network-transport-tests" = callPackage @@ -183031,7 +183775,7 @@ self: { random ]; description = "Unit tests for Network.Transport implementations"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "network-transport-zeromq" = callPackage @@ -183059,7 +183803,7 @@ self: { base binary bytestring criterion distributed-process ]; description = "ZeroMQ backend for network-transport"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "network-types-icmp" = callPackage @@ -183071,7 +183815,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Types for representing ICMP and ICMPv6 messages"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "network-uri" = callPackage @@ -183089,7 +183833,7 @@ self: { test-framework-quickcheck2 ]; description = "URI manipulation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "network-uri-flag" = callPackage @@ -183103,7 +183847,7 @@ self: { libraryHaskellDepends = [ network network-uri ]; doHaddock = false; description = "Pseudo-package encapsulating flag(network-uri) Cabal boilerplate"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "network-uri-json" = callPackage @@ -183120,8 +183864,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "FromJSON and ToJSON Instances for Network.URI"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -183133,7 +183877,7 @@ self: { sha256 = "1z4qqdr2b64pf5xx73bqgjrlqnvi0x6ziqqbzc7x1ka736cdak2w"; libraryHaskellDepends = [ base network-uri ]; description = "Lenses for network-uri"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "network-uri-static" = callPackage @@ -183145,7 +183889,7 @@ self: { libraryHaskellDepends = [ base network-uri template-haskell ]; testHaskellDepends = [ base doctest ]; description = "A small utility to declare type-safe static URIs"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "network-voicetext" = callPackage @@ -183161,8 +183905,8 @@ self: { resourcet transformers utf8-string ]; description = "VoiceText Web API wrapper"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -183174,8 +183918,8 @@ self: { sha256 = "1fnqc1vbahy6zy632s9kam8bv7108bhmynyh2iwkqb7ybkkj37i9"; libraryHaskellDepends = [ base wai ]; description = "A routing library for wai"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -183189,8 +183933,8 @@ self: { isExecutable = true; libraryHaskellDepends = [ base haskell98 network webserver ]; description = "WebSocket library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -183208,8 +183952,8 @@ self: { base binary bytestring containers network time transformers ]; description = "Networked-game support library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -183242,8 +183986,8 @@ self: { testHaskellDepends = [ base doctest Glob hspec MonadRandom ]; benchmarkHaskellDepends = [ base criterion ]; description = "Neural Networks in native Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -183255,7 +183999,7 @@ self: { sha256 = "1pmgy3qmijkw3g542pg9wxzqncql3h2mh7slibgz8x0w9sfydmbd"; libraryHaskellDepends = [ base constraints ]; description = "Yet Another High Performance and Extendable Neural Network in Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "neural-network-blashs" = callPackage @@ -183274,8 +184018,8 @@ self: { base blas-hs hmatrix hspec neural-network-base QuickCheck vector ]; description = "Yet Another High Performance and Extendable Neural Network in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -183293,8 +184037,8 @@ self: { ]; librarySystemDepends = [ blas ]; description = "Yet Another High Performance and Extendable Neural Network in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) blas;}; @@ -183352,8 +184096,8 @@ self: { ]; doHaddock = false; description = "Future-proof system for plain-text notes"; - license = stdenv.lib.licenses.agpl3; - maintainers = with stdenv.lib.maintainers; [ maralorn ]; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ maralorn ]; }) {}; "newhope" = callPackage @@ -183384,8 +184128,8 @@ self: { trifecta vector ]; description = "Library implementing the NewHope cryptographic key-exchange protocol"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -183399,8 +184143,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base directory old-time ]; description = "List ports newer than N days on a FreeBSD system"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -183429,8 +184173,8 @@ self: { unordered-containers warp ]; description = "A basic newsletter implimentation, using various backends"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -183446,8 +184190,8 @@ self: { base exceptions lens machines mailgun mime-mail mtl newsletter text ]; description = "A mailgun backend for the newsletter package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -183465,7 +184209,7 @@ self: { libraryHaskellDepends = [ base containers fixedprec random ]; executableHaskellDepends = [ base random time ]; description = "Exact and approximate synthesis of quantum circuits"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "newt" = callPackage @@ -183485,8 +184229,8 @@ self: { ]; executableHaskellDepends = [ base cmdargs containers mtl ]; description = "A trivially simple app to create things from simple templates"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -183500,7 +184244,7 @@ self: { editedCabalFile = "0261ljw57c7l7mw3z553s6ak8lmgyqwmfhk1m2jv6snra2i5shs4"; libraryHaskellDepends = [ base ]; description = "A typeclass and set of functions for working with newtypes"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "newtype-deriving" = callPackage @@ -183516,8 +184260,8 @@ self: { transformers-base ]; description = "Instance derivers for newtype wrappers"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -183536,7 +184280,7 @@ self: { testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ base gauge semigroups ]; description = "A typeclass and set of functions for working with newtypes"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "newtype-th" = callPackage @@ -183552,8 +184296,8 @@ self: { base haskell-src-meta newtype syb template-haskell ]; description = "A template haskell deriver to create Control.Newtype instances."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -183570,8 +184314,8 @@ self: { random ]; description = "Newtype Wrapper Zoo"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -183583,7 +184327,7 @@ self: { sha256 = "1s1mzy1m3wpawv1ci85dl02105v550l1fdi5rxi5gqnxb0jrg4fs"; libraryHaskellDepends = [ base Kleislify newtype ]; description = "Extra functions for the Control.Newtype typeclass"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "next-ref" = callPackage @@ -183595,8 +184339,8 @@ self: { libraryHaskellDepends = [ base stm ]; testHaskellDepends = [ base hspec ]; description = "A concurrency primitive for a slow consumer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -183608,8 +184352,8 @@ self: { sha256 = "0wld4nc6hcv642km60vvjyclsfwnpfavq59mqm8fm3a73al4csyw"; libraryHaskellDepends = [ base parsec pretty QuickCheck ]; description = "NextStep style plist parser and printer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -183621,7 +184365,7 @@ self: { sha256 = "1yrw6skp2n8fd874481bfalli8lcglakhdggdsj8dm036wpm935a"; libraryHaskellDepends = [ base deepseq ]; description = "NF data type to statically enforce normal form"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "nfc" = callPackage @@ -183636,8 +184380,8 @@ self: { librarySystemDepends = [ nfc ]; libraryToolDepends = [ c2hs ]; description = "libnfc bindings"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {nfc = null;}; @@ -183659,7 +184403,7 @@ self: { zlib ]; description = "Ngram models for compressing and classifying text"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ngrams-loader" = callPackage @@ -183677,8 +184421,8 @@ self: { ]; executableHaskellDepends = [ base parseargs ]; description = "Ngrams loader based on http://www.ngrams.info format"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -183695,7 +184439,7 @@ self: { unix ]; description = "Helper module for Nginx haskell module"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ngx-export-tools" = callPackage @@ -183710,7 +184454,7 @@ self: { aeson base binary bytestring ngx-export safe template-haskell ]; description = "Extra tools for Nginx haskell module"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ngx-export-tools-extra" = callPackage @@ -183732,8 +184476,8 @@ self: { unordered-containers ]; description = "More extra tools for Nginx haskell module"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -183750,8 +184494,8 @@ self: { ]; testHaskellDepends = [ base HUnit QuickCheck ]; description = "High performance CSS EDSL"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -183772,8 +184516,8 @@ self: { test-framework-hunit ]; description = "Packed, strict nibble arrays with a list interface (ByteString for nibbles)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -183797,8 +184541,8 @@ self: { shakespeare text transformers type-of-html weigh ]; description = "A fast and nice HTML templating library with distinct compilation/rendering phases"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -183812,7 +184556,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base nicify-lib ]; description = "Pretty print the standard output of default `Show` instances"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "nicify-lib" = callPackage @@ -183823,7 +184567,7 @@ self: { sha256 = "0cp76s0msf1i8a7pkzjl6qgi18n7zdya3pg90ml1dnidg5nzh9kx"; libraryHaskellDepends = [ base parsec transformers ]; description = "Pretty print the standard output of default `Show` instances"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "nicovideo-translator" = callPackage @@ -183845,8 +184589,8 @@ self: { ]; executableHaskellDepends = [ base ]; description = "Nico Nico Douga (ニコニコ動画) Comment Translator"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.agpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -183868,7 +184612,7 @@ self: { ]; description = "Command line utility publishes Nike+ runs on blogs and Twitter"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -183880,7 +184624,7 @@ self: { sha256 = "1k177w8lccpqq4mwj089v7fbqvbrqskqxqj0gaingm0kmskggaaj"; libraryHaskellDepends = [ base integer-logarithms ]; description = "Finite nimber arithmetic"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "nirum" = callPackage @@ -183918,8 +184662,8 @@ self: { unordered-containers ]; description = "IDL compiler and RPC/distributed object framework for microservices"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -183933,7 +184677,7 @@ self: { editedCabalFile = "08hgvqbb13n2scs4shqjdyzm7kblgllndk0429pdiwdx21k5391q"; libraryHaskellDepends = [ base bytestring http-conduit xml ]; description = "Haskell interface to the nist random beacon"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "nitro" = callPackage @@ -183944,8 +184688,8 @@ self: { sha256 = "17aqzk1kq670fwawia0qjmd8ld1b0h8zh0w8j8x4y48hlzyb75xb"; libraryHaskellDepends = [ base bytestring ]; description = "Haskell bindings for Nitro"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -183982,7 +184726,7 @@ self: { unordered-containers ]; description = "Easy dependency management for Nix projects"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "nix-delegate" = callPackage @@ -184001,8 +184745,8 @@ self: { ]; executableHaskellDepends = [ base ]; description = "Convenient utility for distributed Nix builds"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -184021,8 +184765,8 @@ self: { optparse-generic text turtle ]; description = "Deploy Nix-built software to a NixOS machine"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -184047,27 +184791,27 @@ self: { ]; benchmarkHaskellDepends = [ attoparsec base criterion text ]; description = "Parse and render *.drv files"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ sorki ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ sorki ]; }) {}; "nix-diff" = callPackage - ({ mkDerivation, attoparsec, base, containers, Diff, mtl + ({ mkDerivation, attoparsec, base, containers, Diff, directory, mtl , nix-derivation, optparse-applicative, text, unix, vector }: mkDerivation { pname = "nix-diff"; - version = "1.0.10"; - sha256 = "0lcm4s28c4dgry3r1wj5zmb59izfi6vvyivxkpgyv9fhqmyiid4c"; + version = "1.0.11"; + sha256 = "0pi0nqhv48f90ls40whifw1lcld5sw3hcrz7kzy14s4sc6ln9543"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - attoparsec base containers Diff mtl nix-derivation + attoparsec base containers Diff directory mtl nix-derivation optparse-applicative text unix vector ]; description = "Explain why two Nix derivations differ"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ terlar ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ terlar ]; }) {}; "nix-eval" = callPackage @@ -184083,7 +184827,7 @@ self: { testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; description = "Evaluate Haskell expressions using Nix to get packages"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -184113,8 +184857,8 @@ self: { testToolDepends = [ tasty-discover ]; doHaddock = false; description = "Convert a tree of files into fixed-output derivations"; - license = stdenv.lib.licenses.agpl3Plus; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.agpl3Plus; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -184134,8 +184878,8 @@ self: { attoparsec base filepath hspec QuickCheck text ]; description = "Parse and render .narinfo files"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ sorki ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ sorki ]; }) {}; "nix-paths" = callPackage @@ -184147,8 +184891,8 @@ self: { libraryHaskellDepends = [ base process ]; libraryToolDepends = [ nix ]; description = "Knowledge of Nix's installation directories"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ peti ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ peti ]; }) {inherit (pkgs) nix;}; "nix-thunk" = callPackage @@ -184175,8 +184919,8 @@ self: { base cli-extras optparse-applicative text ]; description = "Lightweight dependency management with Nix"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -184207,8 +184951,8 @@ self: { transformers unordered-containers vector yaml zlib ]; description = "cabal/stack to nix translation tools"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -184230,8 +184974,8 @@ self: { typed-process unordered-containers vty ]; description = "Interactively browse a Nix store paths dependencies"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ utdemir ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ utdemir ]; }) {}; "nixdu" = callPackage @@ -184251,7 +184995,7 @@ self: { typed-process unordered-containers vty ]; description = "Interactively browse a Nix store paths dependencies"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "nixfmt" = callPackage @@ -184273,7 +185017,7 @@ self: { base cmdargs directory filepath safe-exceptions text unix ]; description = "An opinionated formatter for Nix"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "nixfromnpm" = callPackage @@ -184299,8 +185043,8 @@ self: { transformers unix unordered-containers ]; description = "Generate nix expressions from npm packages"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -184312,7 +185056,7 @@ self: { sha256 = "1q38cs0747fyf94y35cq734yzmsdcyfmmk5w6qv563jns55qj36c"; doHaddock = false; description = "this package is obsolete; see cabal2nix instead"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "nixpkgs-update" = callPackage @@ -184336,8 +185080,8 @@ self: { text time unix vector ]; description = "Tool for semi-automatic updating of nixpkgs repository"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -184356,8 +185100,8 @@ self: { zlib ]; description = "Manipulating the National Corpus of Polish (NKJP)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -184371,7 +185115,7 @@ self: { librarySystemDepends = [ nlopt ]; testHaskellDepends = [ base vector ]; description = "Low-level bindings to the NLOPT optimization library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) nlopt;}; "nlp-scores" = callPackage @@ -184382,8 +185126,8 @@ self: { sha256 = "0cxa6f4y3416hlal4wnqf0qpq82zj9x58nprnaw3s2kdxxav0d9m"; libraryHaskellDepends = [ base containers strict ]; description = "Scoring functions commonly used for evaluation in NLP and IR"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -184399,8 +185143,8 @@ self: { base containers nlp-scores split text ]; description = "NLP scoring command-line programs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -184417,8 +185161,8 @@ self: { libraryPkgconfigDepends = [ glib libnm-glib ]; executableHaskellDepends = [ base ]; description = "Network Manager, binding to libnm-glib"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {g = null; inherit (pkgs) glib; libnm-glib = null; nm-glib = null;}; @@ -184432,7 +185176,7 @@ self: { libraryHaskellDepends = [ base bytestring utf8-string ]; description = "Bindings to the Nyctergatis Markup Engine"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "nmis-parser" = callPackage @@ -184444,8 +185188,8 @@ self: { libraryHaskellDepends = [ base containers megaparsec ]; testHaskellDepends = [ base Nmis ]; description = "NMIS file parser"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {Nmis = null;}; @@ -184460,7 +185204,7 @@ self: { libraryHaskellDepends = [ base random split ]; testHaskellDepends = [ base tasty tasty-hspec tasty-quickcheck ]; description = "A tiny neural network"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "nntp" = callPackage @@ -184476,7 +185220,7 @@ self: { ]; description = "Library to connect to an NNTP Server"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -184488,7 +185232,7 @@ self: { sha256 = "19yswbnwwfp7n33irdk12vggczhxp198cjd68jdbaz1wcd00ryld"; libraryHaskellDepends = [ base ]; description = "Workaround for GHC bug #2189"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "no-role-annots" = callPackage @@ -184500,8 +185244,8 @@ self: { libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base template-haskell ]; description = "Role annotations without -XRoleAnnotations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -184513,7 +185257,7 @@ self: { sha256 = "1jczx8d4ah74wiishdcv335hlr0330wwq0vfb5rv4gmrvbpkgllf"; libraryHaskellDepends = [ base ]; description = "A type class for choosing sentinel-like values"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "noether" = callPackage @@ -184535,8 +185279,8 @@ self: { testHaskellDepends = [ base hedgehog ]; benchmarkHaskellDepends = [ base criterion ]; description = "Math in Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -184550,8 +185294,8 @@ self: { isExecutable = true; executableHaskellDepends = [ array base containers regex-compat ]; description = "Parse and compare nofib runs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -184565,8 +185309,8 @@ self: { isExecutable = true; executableHaskellDepends = [ array base containers regex-compat ]; description = "Parse and compare nofib runs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -184590,8 +185334,8 @@ self: { base HTF HUnit parsec QuickCheck string-qq ]; description = "A friendly language for graphic design"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -184608,8 +185352,8 @@ self: { regex-compat text yaml ]; description = "A static site generator"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -184634,8 +185378,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Name-binding & alpha-equivalence"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -184647,7 +185391,7 @@ self: { sha256 = "1wd2vd0qn8ln3a5r29gikdcr4c2c2rf43p6kq3wmqm8ww30djgca"; libraryHaskellDepends = [ base containers ]; description = "Binders and alpha-equivalence made easy"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "nomyx-api" = callPackage @@ -184668,8 +185412,8 @@ self: { swagger2 text transformers wai wai-cors wai-extra warp yaml ]; description = "REST API for Nomyx"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "nomyx-core" = callPackage @@ -184697,8 +185441,8 @@ self: { ]; testHaskellDepends = [ base Cabal ]; description = "A Nomic game in haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "nomyx-language" = callPackage @@ -184717,8 +185461,8 @@ self: { time-recurrence ]; description = "Language to express rules for Nomic"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "nomyx-library" = callPackage @@ -184735,8 +185479,8 @@ self: { shortcut time time-recurrence ]; description = "Library of rules for Nomyx"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "nomyx-server" = callPackage @@ -184757,8 +185501,8 @@ self: { ]; testHaskellDepends = [ base Cabal ]; description = "A Nomic game in haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "nomyx-web" = callPackage @@ -184782,8 +185526,8 @@ self: { split stm text time web-routes web-routes-happstack web-routes-th ]; description = "Web gui for Nomyx"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {nomyx-auth = null;}; @@ -184799,7 +185543,7 @@ self: { ]; testHaskellDepends = [ base containers QuickCheck utility-ht ]; description = "List-like structures with static restrictions on the number of elements"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "non-empty-containers" = callPackage @@ -184809,7 +185553,7 @@ self: { version = "0.1.4.0"; sha256 = "1frjpvx3nzymkwyxz0zc4p11pvxdihx3d3hi31w3d9qanwncbc96"; libraryHaskellDepends = [ base containers semigroupoids ]; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "non-empty-sequence" = callPackage @@ -184820,7 +185564,7 @@ self: { sha256 = "0a6xk2ijj3lzhqzdrk6q89538d1a62aw8x0ccvkq2kyl1dlahwc0"; libraryHaskellDepends = [ base containers semigroups ]; description = "Non-empty sequence"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "non-empty-text" = callPackage @@ -184833,7 +185577,7 @@ self: { testHaskellDepends = [ base doctest Glob hspec QuickCheck text ]; description = "Non empty Data.Text type"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "non-empty-zipper" = callPackage @@ -184845,8 +185589,8 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base checkers QuickCheck ]; description = "The Zipper for NonEmpty"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -184877,7 +185621,7 @@ self: { unliftio unliftio-core ]; description = "Generate cryptographic nonces"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "nondeterminism" = callPackage @@ -184900,7 +185644,7 @@ self: { sha256 = "1ymndk1aqaw0n0vgj9gbajm5ma21ld77g0a06z92frqi8wvp67ii"; libraryHaskellDepends = [ base comonad semigroups ]; description = "NonEmpty for Alternative types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "nonempty-containers" = callPackage @@ -184921,7 +185665,7 @@ self: { semigroupoids tasty tasty-hedgehog text these vector ]; description = "Non-empty variants of containers data types, with full API"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "nonempty-lift" = callPackage @@ -184935,8 +185679,8 @@ self: { libraryHaskellDepends = [ base comonad semigroupoids ]; testHaskellDepends = [ base hedgehog hedgehog-classes ]; description = "nonempty structure"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -184952,7 +185696,7 @@ self: { libraryHaskellDepends = [ base deepseq primitive vector ]; testHaskellDepends = [ base doctest ]; description = "Non-empty vectors"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "nonemptymap" = callPackage @@ -184963,7 +185707,7 @@ self: { sha256 = "1pzs51kmsyarv62qqbskhw2xlkjp74bwcgs9a8ri1jk96m64rg94"; libraryHaskellDepends = [ base containers semigroupoids ]; description = "A NonEmptyMap Implementation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "nonfree" = callPackage @@ -184974,7 +185718,7 @@ self: { sha256 = "0qm1iwm3y69z146w64wx5wwa4cdpa0ka7gz055dalf06xky35qji"; libraryHaskellDepends = [ base ]; description = "Free structures sans laws"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "nonlinear-optimization" = callPackage @@ -185004,7 +185748,7 @@ self: { ad base nonlinear-optimization primitive reflection vector ]; description = "Wrapper of nonlinear-optimization package for using with AD package"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "nonlinear-optimization-backprop" = callPackage @@ -185022,7 +185766,7 @@ self: { reflection vector ]; description = "Wrapper of nonlinear-optimization package for using with backprop package"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "noodle" = callPackage @@ -185037,7 +185781,7 @@ self: { executableHaskellDepends = [ base directory filepath ]; description = "the noodle programming language"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "normaldistribution" = callPackage @@ -185048,7 +185792,7 @@ self: { sha256 = "1q7p0bx435amqb7r9qksix0mrbpnqsyfb44chjyz6xkgjj0s6yvd"; libraryHaskellDepends = [ base random ]; description = "Minimum fuss normally distributed random values"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "normalization-insensitive" = callPackage @@ -185071,8 +185815,8 @@ self: { ]; benchmarkHaskellDepends = [ base bytestring criterion deepseq ]; description = "Normalization insensitive string comparison"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -185094,7 +185838,7 @@ self: { base bytestring cassava containers optparse-generic text vector ]; description = "Normalize data using a variety of methods"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "normalize-imports" = callPackage @@ -185108,7 +185852,7 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "Sort and align Haskell import statements"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "not-gloss" = callPackage @@ -185124,7 +185868,7 @@ self: { vector vector-binary-instances ]; description = "Painless 3D graphics, no affiliation with gloss"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "not-gloss-examples" = callPackage @@ -185141,8 +185885,8 @@ self: { base containers GLUT linear not-gloss spatial-math X11 ]; description = "examples for not-gloss"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -185155,7 +185899,7 @@ self: { libraryHaskellDepends = [ base ]; description = "Useful utility functions that only depend on base"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "notcpp" = callPackage @@ -185167,8 +185911,8 @@ self: { libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base template-haskell ]; description = "Avoiding the C preprocessor via cunning use of Template Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -185187,9 +185931,7 @@ self: { base containers ghc-prim hedgehog random stm tasty tasty-hedgehog ]; description = "Examine values for unexpected thunks"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + license = lib.licenses.mit; }) {}; "notifications-tray-icon" = callPackage @@ -185214,8 +185956,8 @@ self: { base bytestring github haskeline hslogger optparse-applicative text transformers tuple ]; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -185235,7 +185977,7 @@ self: { librarySystemDepends = [ notmuch talloc ]; libraryToolDepends = [ c2hs ]; description = "Haskell binding to Notmuch, the mail indexer"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {inherit (pkgs) notmuch; inherit (pkgs) talloc;}; "notmuch-haskell" = callPackage @@ -185254,7 +185996,7 @@ self: { executableSystemDepends = [ notmuch ]; description = "Binding for notmuch MUA library"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) notmuch;}; @@ -185293,7 +186035,7 @@ self: { ]; description = "A web interface to the notmuch email indexer"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -185311,7 +186053,7 @@ self: { base bifunctors lens mtl semigroupoids semigroups transformers ]; description = "A data type for representing numeric values, except zero"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "now-haskell" = callPackage @@ -185347,8 +186089,8 @@ self: { unordered-containers vector ]; description = "Zeit Now haskell-side integration and introspection tools"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -185363,7 +186105,7 @@ self: { libraryHaskellDepends = [ base bytestring template-haskell ]; testHaskellDepends = [ base bytestring template-haskell ]; description = "Here document without variable expansion like PHP Nowdoc"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "np-extras" = callPackage @@ -185376,8 +186118,8 @@ self: { editedCabalFile = "1imcizgbckwcmxwjicads55g0v6abprz3g69b6blkkgmcq5r9x6b"; libraryHaskellDepends = [ base containers numeric-prelude primes ]; description = "NumericPrelude extras"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -185393,8 +186135,8 @@ self: { base binary containers numeric-prelude reflection tagged ]; description = "Linear algebra for the numeric-prelude framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -185413,8 +186155,8 @@ self: { old-locale process split time unix ]; description = "A collection of random tools"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -185435,7 +186177,7 @@ self: { stm-conduit text unliftio ]; description = "Concurrency library in the style of Erlang/OTP"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "nri-env-parser" = callPackage @@ -185449,7 +186191,7 @@ self: { base modern-uri network-uri nri-prelude text ]; description = "Read environment variables as settings to build 12-factor apps"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "nri-prelude" = callPackage @@ -185473,7 +186215,7 @@ self: { pretty-show safe-exceptions terminal-size text time vector ]; description = "A Prelude inspired by the Elm programming language"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "nsis" = callPackage @@ -185488,7 +186230,7 @@ self: { base directory process transformers uniplate ]; description = "DSL for producing Windows Installer using NSIS"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "nth-prime" = callPackage @@ -185506,7 +186248,7 @@ self: { base opentheory-prime opentheory-primitive ]; description = "Computing the nth prime"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "ntha" = callPackage @@ -185527,7 +186269,7 @@ self: { executableHaskellDepends = [ base containers haskeline lens mtl ]; testHaskellDepends = [ base containers hspec pretty ]; description = "A tiny statically typed functional programming language"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "nthable" = callPackage @@ -185537,7 +186279,7 @@ self: { version = "0.1"; sha256 = "1qi1wq7wbnp3sv3c2v4185mnq80646vcsnqq16mqlshiy164wsly"; libraryHaskellDepends = [ base type-level ]; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ntp-control" = callPackage @@ -185555,8 +186297,8 @@ self: { base bytestring bytestring-lexing cereal network old-locale time ]; description = "Client library for NTP control messaging"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -185581,8 +186323,8 @@ self: { base basic-prelude bytestring conduit optparse-generic ]; description = "NTRIP client"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -185594,7 +186336,7 @@ self: { sha256 = "0raz6azyj7a3fygpmylhz38b75zy57xdrginbhj2d6vwzxhkmscd"; libraryHaskellDepends = [ base ]; description = "N-ary sum/product types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "nuha" = callPackage @@ -185606,8 +186348,8 @@ self: { libraryHaskellDepends = [ base vector ]; testHaskellDepends = [ base vector ]; description = "Multidimensional arrays, Linear algebra, Numerical analysis"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -185625,8 +186367,8 @@ self: { wai-extra warp ]; description = "HTML5 Canvas Graphics Library - forked Blank Canvas"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -185638,8 +186380,8 @@ self: { sha256 = "19vwgyscil4rmgfnla8msmhgamn6j3wfy7wqghb539byca0gim0c"; libraryHaskellDepends = [ base ]; description = "A package for working with nullary type classes"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -185652,8 +186394,8 @@ self: { libraryHaskellDepends = [ base bytestring pipes ]; testHaskellDepends = [ base hspec pipes ]; description = "Initial project template from stack"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -185665,7 +186407,7 @@ self: { sha256 = "0ikhjcjwziv55gnf79fhajhgp5m3441snxg8amc241h5iw4rls8x"; libraryHaskellDepends = [ base inj ]; description = "Non-negative numbers"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "number" = callPackage @@ -185676,7 +186418,7 @@ self: { sha256 = "0la9dx2072f0gjrfq8p33qal7ma4202x5f8h2n4bhwkjln67n5bj"; libraryHaskellDepends = [ base ]; description = "A library for real numbers"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "number-length" = callPackage @@ -185695,7 +186437,7 @@ self: { ]; benchmarkHaskellDepends = [ base criterion ]; description = "Number of digits in a number in decimal and hexadecimal representation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "number-show" = callPackage @@ -185708,7 +186450,7 @@ self: { editedCabalFile = "1lsxi6704g6svw0834haggp6j97kb6r51583lr2a3kn1ni2zh60c"; libraryHaskellDepends = [ base microlens microlens-th ]; description = "Flexible and accurate (for a given precision) numerical->string conversion"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "numbered-semigroups" = callPackage @@ -185721,8 +186463,8 @@ self: { editedCabalFile = "04wkhb2r275nax8wh00w6c4pxfaky190g2bsviw39jyi7wr2f33c"; libraryHaskellDepends = [ base call-stack semigroups ]; description = "A sequence of semigroups, for composing stuff in multiple spatial directions"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -185734,7 +186476,7 @@ self: { sha256 = "0hh4km2zbvs7rsb142f1rifqvwzajh0grgky2vyyyf48dk5plrlv"; libraryHaskellDepends = [ base containers vector ]; description = "Combinators for creating bijections from some type to the natural numbers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "numbers" = callPackage @@ -185750,7 +186492,7 @@ self: { base QuickCheck test-framework test-framework-quickcheck2 ]; description = "Various number types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "numerals" = callPackage @@ -185771,8 +186513,8 @@ self: { ]; benchmarkHaskellDepends = [ base criterion ]; description = "Convert numbers to number words"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -185794,8 +186536,8 @@ self: { fingertree HUnit test-framework test-framework-hunit ]; description = "Convert numbers to number words"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -185807,7 +186549,7 @@ self: { sha256 = "0n5wcg2snpivbp6giqrcd1y97215y6n3hbgbnb6w2gi7qsmyyq10"; libraryHaskellDepends = [ base ]; description = "Numeric Domains"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "numeric-extras" = callPackage @@ -185818,7 +186560,7 @@ self: { sha256 = "1mk11c0gz1yjy5b8dvq6czfny57pln0bs7x28fz38qyr44872067"; libraryHaskellDepends = [ base ]; description = "Useful tools from the C standard library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "numeric-limits" = callPackage @@ -185829,7 +186571,7 @@ self: { sha256 = "0lsi0my45lpd30vjbwdbzhisz8r3lryvg1c80qcmwipnxklnr5cb"; libraryHaskellDepends = [ base ]; description = "Various floating point limit related constants"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "numeric-ode" = callPackage @@ -185857,8 +186599,8 @@ self: { mtl plots vector vector-space ]; description = "Ode solvers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -185878,7 +186620,7 @@ self: { semigroups storable-record utility-ht ]; description = "An experimental alternative hierarchy of numeric type classes"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "numeric-qq" = callPackage @@ -185895,8 +186637,8 @@ self: { testHaskellDepends = [ base directory doctest filepath ]; doCheck = false; description = "Quasi-quoters for numbers of different bases"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -185923,8 +186665,8 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec HUnit QuickCheck ]; description = "A framework for numeric ranges"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -185937,7 +186679,7 @@ self: { libraryHaskellDepends = [ base ieee754 primitive vector ]; testHaskellDepends = [ base HUnit ]; description = "Collection of numerical tools for integration, differentiation etc"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "numerical" = callPackage @@ -185958,8 +186700,8 @@ self: { transformers vector ]; description = "core package for Numerical Haskell project"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -185971,7 +186713,7 @@ self: { sha256 = "1f9ar8kdwzi8xarzb7mrq204v1n3n8kh0fbqv06l9677vv1pc19v"; libraryHaskellDepends = [ base ]; description = "Peano numbers with attendant bells and whistles"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "numhask" = callPackage @@ -185986,7 +186728,7 @@ self: { base bifunctors mmorph protolude text transformers ]; description = "numeric classes"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "numhask_0_7_1_0" = callPackage @@ -186002,8 +186744,8 @@ self: { ]; testHaskellDepends = [ base doctest QuickCheck ]; description = "A numeric class hierarchy"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "numhask-array" = callPackage @@ -186019,8 +186761,8 @@ self: { ]; testHaskellDepends = [ base doctest numhask ]; description = "Multi-dimensional array interface for numhask"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -186037,8 +186779,8 @@ self: { ]; testHaskellDepends = [ base doctest numhask ]; description = "numerical free algebras"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -186055,8 +186797,8 @@ self: { ]; testHaskellDepends = [ base hedgehog numhask numhask-prelude ]; description = "Laws and tests for numhask"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -186073,8 +186815,8 @@ self: { ]; testHaskellDepends = [ base doctest ]; description = "See readme.md"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -186087,8 +186829,8 @@ self: { libraryHaskellDepends = [ base numhask protolude ]; testHaskellDepends = [ doctest ]; description = "A numeric prelude"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -186109,8 +186851,8 @@ self: { base doctest numhask-prelude numhask-test tasty ]; description = "Numbers that are range representations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -186129,8 +186871,8 @@ self: { ]; testHaskellDepends = [ base doctest numhask ]; description = "Numerical spaces"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -186147,8 +186889,8 @@ self: { ]; testHaskellDepends = [ base numhask-prelude QuickCheck tasty ]; description = "Laws and tests for numhask"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -186160,7 +186902,7 @@ self: { sha256 = "0bbl7f3qd26sa92k73qni3r1jwxxrfq5k19hcvh5rgdh5ig9d6v8"; doHaddock = false; description = "None"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "numtype" = callPackage @@ -186171,7 +186913,7 @@ self: { sha256 = "1pdawf6zyany5jz5jmszwbm7ms7c125if52v9cw0chy0xz5ahdym"; libraryHaskellDepends = [ base ]; description = "Type-level (low cardinality) integers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "numtype-dk" = callPackage @@ -186184,7 +186926,7 @@ self: { editedCabalFile = "0892xm8vyyvl1glg4vniz8r5ydg1nz3zmbpgk5mxdih6wi6nmpy4"; libraryHaskellDepends = [ base ]; description = "Type-level integers, using TypeNats, Data Kinds, and Closed Type Families"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "numtype-tf" = callPackage @@ -186195,7 +186937,7 @@ self: { sha256 = "00bnz9k4nq21z4vax37qjv6ra2jvlshk0jlici1w8y9rx39zrjyx"; libraryHaskellDepends = [ base ]; description = "Type-level (low cardinality) integers, implemented using type families"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "nurbs" = callPackage @@ -186215,7 +186957,7 @@ self: { base base-unicode-symbols hspec lens linear ]; description = "NURBS"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "nuxeo" = callPackage @@ -186234,7 +186976,7 @@ self: { http-types text time url ]; executableHaskellDepends = [ base optparse-applicative text ]; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "nvim-hs" = callPackage @@ -186273,7 +187015,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Haskell plugin backend for neovim"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "nvim-hs-contrib" = callPackage @@ -186296,7 +187038,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Haskell plugin backend for neovim"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "nvim-hs-ghcid" = callPackage @@ -186316,7 +187058,7 @@ self: { ]; executableHaskellDepends = [ base nvim-hs ]; description = "Neovim plugin that runs ghcid to update the quickfix list"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "nvvm" = callPackage @@ -186335,8 +187077,8 @@ self: { ]; libraryToolDepends = [ c2hs ]; description = "FFI bindings to NVVM"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "nyan" = callPackage @@ -186349,7 +187091,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base bytestring mtl ncurses text ]; description = "Bored? Nyan cat!"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "nylas" = callPackage @@ -186366,8 +187108,8 @@ self: { pipes-bytestring pipes-http pipes-parse text time wreq ]; description = "Client for the Nylas API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -186386,8 +187128,8 @@ self: { base cairo containers glade glib gtk mtl parsec random ]; description = "An interactive GUI for manipulating L-systems"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -186414,7 +187156,7 @@ self: { text vector ]; description = "A bullet-hell game made with SDL2"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "o-clock" = callPackage @@ -186423,8 +187165,8 @@ self: { }: mkDerivation { pname = "o-clock"; - version = "1.2.0"; - sha256 = "0l8bwv0sagfpyfray4g1nnwb8zl4b2nljwxxwhh71vfhz620vrkx"; + version = "1.2.0.1"; + sha256 = "039p0jjpmlkbz21szfj4abnjyi0k34m6b8fqpsmyj94nbq1qldy4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ghc-prim ]; @@ -186435,7 +187177,7 @@ self: { ]; testToolDepends = [ doctest markdown-unlit ]; description = "Type-safe time library"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "oanda-rest-api" = callPackage @@ -186459,8 +187201,8 @@ self: { text thyme transformers vector ]; description = "Client to the OANDA REST API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -186483,8 +187225,8 @@ self: { uri-bytestring xml-conduit xml-conduit-writer ]; description = "Extensible Resource Descriptor"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -186504,7 +187246,7 @@ self: { ]; testHaskellDepends = [ base bytestring ]; description = "Fully Automatic Luxury OAuth 1.0a headers"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "oauth2-jwt-bearer" = callPackage @@ -186529,8 +187271,8 @@ self: { streaming-commons text warp x509 x509-store ]; description = "OAuth2 jwt-bearer client flow as per rfc7523"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -186556,8 +187298,8 @@ self: { network-uri text time transformers ]; description = "Simple OAuth for http-client"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -186582,8 +187324,8 @@ self: { ]; testHaskellDepends = [ base ]; description = "Communicate to OBD interfaces over ELM327"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -186601,7 +187343,7 @@ self: { testHaskellDepends = [ array base containers text ]; description = "Ordered Reduced Binary Decision Diagrams"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -186622,7 +187364,7 @@ self: { doHaddock = false; description = "Oberon0 Compiler"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -186642,8 +187384,8 @@ self: { OpenGL OpenGLCheck QuickCheck ]; description = "Reads and writes obj models"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -186664,8 +187406,8 @@ self: { tasty-quickcheck ]; description = "Rather unique identifier for things that need to be stored"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -186684,8 +187426,8 @@ self: { unordered-containers void witherable ]; description = "Composable objects"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -186709,8 +187451,8 @@ self: { ]; testToolDepends = [ tasty-discover ]; description = "An implementation of the Oblivious Transfer protocol in Haskell"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -186722,7 +187464,7 @@ self: { sha256 = "0hi9y867yg48nv0756ylblxmsdw9vkfg72n0bb0ali227695d6qb"; libraryHaskellDepends = [ base transformers ]; description = "Continuation patterns"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "observable-sharing" = callPackage @@ -186733,7 +187475,7 @@ self: { sha256 = "1lqig0r4f7gqjdymsc4jpwspc3jr01xkmk5cgiqr5ngxvk6zw3j0"; libraryHaskellDepends = [ base containers ]; description = "Simple observable sharing"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ocaml-export" = callPackage @@ -186760,8 +187502,8 @@ self: { wai-extra warp ]; description = "Convert Haskell types in OCaml types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -186774,7 +187516,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Object capability based IO"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "ochan" = callPackage @@ -186792,8 +187534,8 @@ self: { async base bytestring mtl oref text transformers ]; description = "Owned channels in the Ownership Monad"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -186810,7 +187552,7 @@ self: { ]; testHaskellDepends = [ base doctest Glob ]; description = "A module to manage payroll books for Japanese companies"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "octane" = callPackage @@ -186834,8 +187576,8 @@ self: { rattletrap text ]; description = "Parse Rocket League replays"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -186866,8 +187608,8 @@ self: { base base-compat dotenv hspec hspec-expectations text transformers ]; description = "A tested, minimal wrapper around GitHub's API"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -186888,8 +187630,8 @@ self: { array base bytestring containers hexpr mtl parsec symbol text ]; description = "Lisp with more dynamism, more power, more simplicity"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -186906,8 +187648,8 @@ self: { ]; librarySystemDepends = [ libGL libX11 libXinerama ovr systemd ]; description = "Oculus Rift ffi providing head tracking data"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXinerama; ovr = null; @@ -186938,8 +187680,8 @@ self: { ]; benchmarkHaskellDepends = [ async base text weigh ]; description = "Haskell binding to the ODBC API, aimed at SQL Server driver"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) unixODBC;}; @@ -186991,8 +187733,8 @@ self: { ]; testToolDepends = [ tasty-discover ]; description = "A full-featured PostgreSQL-backed job queue (with an admin UI)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -187008,8 +187750,8 @@ self: { aeson base bytestring containers text unordered-containers ]; description = "Provides Go package metadata"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -187030,8 +187772,8 @@ self: { ]; testToolDepends = [ c2hs ]; description = "Oracle Database Bindings"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "oeis" = callPackage @@ -187047,7 +187789,7 @@ self: { base HUnit test-framework test-framework-hunit ]; description = "Interface to the Online Encyclopedia of Integer Sequences (OEIS)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "oeis2" = callPackage @@ -187066,8 +187808,8 @@ self: { text vector ]; description = "Interface for Online Encyclopedia of Integer Sequences (OEIS)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -187079,8 +187821,8 @@ self: { sha256 = "03sb2bmjw8v01908zkzmw8njsmqy5k2hcnv6ajbia7n8qawyhivj"; libraryHaskellDepends = [ base parsec3 vector ]; description = "A parser for simplified-syntax OFF files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -187095,7 +187837,7 @@ self: { libraryHaskellDepends = [ base parsec pretty time ]; executableHaskellDepends = [ base parsec pretty time ]; description = "Parser for OFX data"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ogmarkup" = callPackage @@ -187111,8 +187853,8 @@ self: { base hspec hspec-megaparsec megaparsec shakespeare text ]; description = "A lightweight markup language for story writers"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -187136,8 +187878,8 @@ self: { test-framework-quickcheck2 text-format-simple ]; description = "Interface to the Ohloh API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -187154,8 +187896,8 @@ self: { ]; executableHaskellDepends = [ base directory filepath parallel ]; description = "Library for purely functional lazy interactions with the outer world"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -187181,8 +187923,8 @@ self: { time ]; description = "OpenID Connect 1.0 library for RP"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -187195,8 +187937,8 @@ self: { libraryHaskellDepends = [ base hogre ]; librarySystemDepends = [ OIS ]; description = "wrapper for OIS input manager for use with hogre"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {OIS = null;}; @@ -187210,7 +187952,7 @@ self: { editedCabalFile = "04b9vn007hlvsrx4ksd3r8r3kbyaj2kvwxchdrmd4370qzi8p6gs"; libraryHaskellDepends = [ base ]; description = "locale library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "old-time" = callPackage @@ -187223,7 +187965,7 @@ self: { editedCabalFile = "1j6ln1dkvhdvnwl33bp0xf9lhc4sybqk0aw42p8cq81xwwzbn7y9"; libraryHaskellDepends = [ base old-locale ]; description = "Time library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "old-version" = callPackage @@ -187235,7 +187977,7 @@ self: { libraryHaskellDepends = [ base ]; description = "Basic versioning library"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "olwrapper" = callPackage @@ -187260,8 +188002,8 @@ self: { snap-loader-static snap-server snaplet-fay text ]; description = "An OpenLayers JavaScript Wrapper and Webframework with snaplet-fay"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -187273,8 +188015,8 @@ self: { sha256 = "1wiasb3f22g47n54jhxv1c74a0ghxsknrakjdgj3fqlw878g3aan"; libraryHaskellDepends = [ base ]; description = "Actor pattern utilities"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -187292,8 +188034,8 @@ self: { safe-exceptions template-haskell text unix wai ]; description = "Haskell utilities for building embedded Elm programs"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -187308,8 +188050,8 @@ self: { base monad-logger safe-exceptions transformers ]; description = "Monad transformer providing MonadFail"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -187325,8 +188067,8 @@ self: { base http-types monad-logger safe-exceptions uuid wai ]; description = "om-http-logging"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -187344,8 +188086,8 @@ self: { base optparse-applicative shakespeare-text shelly text ]; description = "A simple tool to generate OMakefile for latex files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -187365,8 +188107,8 @@ self: { transformers transformers-base unordered-containers vector-space ]; description = "Render engine"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -187385,8 +188127,8 @@ self: { array base containers directory filepath pretty time ]; description = "A purely functional programming language and a proof system"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -187405,7 +188147,7 @@ self: { ]; description = "Data encoding and decoding command line utilities"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "omnifmt" = callPackage @@ -187432,8 +188174,8 @@ self: { temporary text time ]; description = "A pretty-printer wrapper to faciliate ease of formatting during development"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -187452,8 +188194,8 @@ self: { wai wai-extra warp ]; description = "\"Haskell on a Horse\" - A combinatorial web framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -187474,8 +188216,8 @@ self: { base bytestring GenericPretty network process random ]; description = "Program that sends traffic through SSH tunnels on-demand"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -187487,8 +188229,8 @@ self: { sha256 = "09knyhswd0jgiwx1p1qra1hppnkny7yqjrzmqspxdxjhl0zs91fz"; libraryHaskellDepends = [ base containers parsec tagsoup ]; description = "HTML-parsing primitives for Parsec"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -187509,7 +188251,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "memoization for IO actions and functions"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "one-line-aeson-text" = callPackage @@ -187522,7 +188264,7 @@ self: { libraryHaskellDepends = [ aeson base text unordered-containers ]; testHaskellDepends = [ base doctest ]; description = "Pretty-printing short Aeson values as text"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "one-liner" = callPackage @@ -187541,7 +188283,7 @@ self: { ]; testHaskellDepends = [ base contravariant HUnit ]; description = "Constraint-based generics"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "one-liner-instances" = callPackage @@ -187552,7 +188294,7 @@ self: { sha256 = "1gy900nd5n6cffqw63hlkqg4ly86wjlfqgdcm1zy2nyx7dxg914k"; libraryHaskellDepends = [ base one-liner random ]; description = "Generics-based implementations for common typeclasses"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "one-time-password" = callPackage @@ -187570,7 +188312,7 @@ self: { base bytestring cryptonite tasty tasty-hunit time ]; description = "HMAC-Based and Time-Based One-Time Passwords"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "oneOfN" = callPackage @@ -187581,7 +188323,7 @@ self: { sha256 = "05gycp2zvq08bjl9dx1lm3cjr12i50k3cwq4al34y1rlp2r531lk"; libraryHaskellDepends = [ base ]; description = "Anonymous coproduct type"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "oneormore" = callPackage @@ -187592,8 +188334,8 @@ self: { sha256 = "1lz429abk7qqwfya3wa1m5pcyyldagcmmc0ghjfbl8byhkaax63p"; libraryHaskellDepends = [ base ]; description = "A never-empty list type"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -187614,8 +188356,8 @@ self: { ]; testHaskellDepends = [ base doctest numhask ]; description = "See readme.md"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -187634,8 +188376,8 @@ self: { ]; testHaskellDepends = [ base doctest numhask-prelude ]; description = "See readme.md"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -187660,8 +188402,8 @@ self: { sha256 = "0iy4hpibiz6v93kz8jv5phb96sh6ygcdakf9vqss5d5622s5pgf1"; libraryHaskellDepends = [ base ]; description = "partition lenses"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -187673,8 +188415,8 @@ self: { sha256 = "1d0yn5bj04ircxbi12rx80kds54zssmq4j9kqyk05nmv506x76k0"; libraryHaskellDepends = [ base smallcheck ]; description = "Code for the Haskell course taught at the Odessa National University in 2012"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -187686,7 +188428,7 @@ self: { sha256 = "0xpm2adf47clhzpwd833w706mc5xfxwr2wp4aywigy11687f9bly"; libraryHaskellDepends = [ base ]; description = "Support for OO-like prototypes"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }) {}; "op" = callPackage @@ -187698,8 +188440,8 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base containers doctest ]; description = "Common operators encouraging large-scale easy reading"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -187730,7 +188472,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "An SQL-generating DSL targeting PostgreSQL"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "opaleye-classy" = callPackage @@ -187748,8 +188490,8 @@ self: { product-profunctors transformers ]; description = "Opaleye wrapped up in classy MTL attire"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -187774,8 +188516,8 @@ self: { QuickCheck semigroups sqlite-simple time ]; description = "An SQL-generating DSL targeting SQLite"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -187797,8 +188539,8 @@ self: { base opaleye postgresql-simple product-profunctors ]; description = "A monad transformer for Opaleye"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -187814,8 +188556,8 @@ self: { base constraints recursion-schemes row-types template-haskell ]; description = "Open algebraic data types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -187835,8 +188577,8 @@ self: { ]; executableHaskellDepends = [ base ]; description = "Open algebraic data type examples"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -187851,7 +188593,7 @@ self: { libraryHaskellDepends = [ base process ]; executableHaskellDepends = [ base ]; description = "Open a web browser from Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "open-haddock" = callPackage @@ -187864,8 +188606,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base basic-prelude text turtle ]; description = "Open haddock HTML documentation"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -187889,7 +188631,7 @@ self: { ]; description = "Conversion between markup formats"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -187902,8 +188644,8 @@ self: { libraryHaskellDepends = [ base either mtl transformers ]; testHaskellDepends = [ base ]; description = "A mechanism similar to checked exceptions that integrates with MTL and transformer stacks"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -187914,7 +188656,7 @@ self: { version = "0.1"; sha256 = "0dz6ci2i43mghp0v40q11pz2q3511m25sxds44dixish14cs5gym"; libraryHaskellDepends = [ attoparsec base conduit mtl text ]; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "open-typerep" = callPackage @@ -187931,8 +188673,8 @@ self: { testHaskellDepends = [ base syntactic ]; benchmarkHaskellDepends = [ base criterion ]; description = "Open type representations and dynamic types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -187947,8 +188689,8 @@ self: { libraryHaskellDepends = [ base type-fun ]; executableHaskellDepends = [ base type-fun ]; description = "Extensible, type-safe unions"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -187966,7 +188708,7 @@ self: { ]; testHaskellDepends = [ base mtl tasty tasty-hunit witness ]; description = "open witnesses"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "openai-hs" = callPackage @@ -187988,8 +188730,8 @@ self: { servant-client-core text vector ]; description = "Unofficial OpenAI client"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -188004,7 +188746,7 @@ self: { aeson base casing servant text time vector ]; description = "Unofficial OpenAI servant types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "openapi-petstore" = callPackage @@ -188031,8 +188773,8 @@ self: { semigroups text time transformers unordered-containers vector ]; description = "Auto-generated openapi-petstore API Client"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -188052,8 +188794,8 @@ self: { yaml ]; description = "Types for OpenAPI"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -188089,8 +188831,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "OpenAPI 3.0 data model"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -188127,8 +188869,8 @@ self: { yaml ]; description = "OpenAPI3 Haskell Client Code Generator"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -188140,8 +188882,8 @@ self: { sha256 = "1cvcqv6fx9jszrlv46xn7b3rfxk4bymzc42ndzzvnpwj592yd55i"; libraryHaskellDepends = [ aeson base data-default text time ]; description = "A Haskell implementation of the Swiss Meteo Net data API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -188155,7 +188897,7 @@ self: { librarySystemDepends = [ atomspace-cwrapper ]; description = "Haskell Bindings for the AtomSpace"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {atomspace-cwrapper = null;}; "opencv" = callPackage @@ -188186,7 +188928,7 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion repa ]; hardeningDisable = [ "bindnow" ]; description = "Haskell binding to OpenCV-3.x"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) opencv3;}; "opencv-extra" = callPackage @@ -188210,7 +188952,7 @@ self: { template-haskell text transformers vector ]; description = "Haskell binding to OpenCV-3.x extra modules"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "opencv-raw" = callPackage @@ -188222,8 +188964,8 @@ self: { libraryHaskellDepends = [ base bindings-DSL Cabal vector ]; libraryPkgconfigDepends = [ opencv ]; description = "Raw Haskell bindings to OpenCV >= 2.0"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) opencv;}; @@ -188235,8 +188977,8 @@ self: { sha256 = "1bv729ljw07arz9fzg0nqj6fkpwkxkjds073cz3zr9in0a5b1531"; libraryHaskellDepends = [ base hxt template-haskell th-lift ]; description = "A library for working with Open Data Tables"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -188253,7 +188995,7 @@ self: { ]; description = "Fetch exchange rates from OpenExchangeRates.org"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "openexr-write" = callPackage @@ -188270,7 +189012,7 @@ self: { ]; testHaskellDepends = [ base bytestring directory hspec vector ]; description = "Library for writing images in OpenEXR HDR file format"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "openflow" = callPackage @@ -188287,7 +189029,7 @@ self: { ]; description = "OpenFlow"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "opengl-dlp-stereo" = callPackage @@ -188303,7 +189045,7 @@ self: { base data-default GLUT OpenGL vector ]; description = "Library and example for using DLP stereo in OpenGL"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "opengl-spacenavigator" = callPackage @@ -188319,7 +189061,7 @@ self: { base binary data-default GLUT OpenGL ]; description = "Library and example for using a SpaceNavigator-compatible 3-D mouse with OpenGL"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "opengles" = callPackage @@ -188343,8 +189085,8 @@ self: { ]; testHaskellDepends = [ base ]; description = "Functional interface for OpenGL 4.1+ and OpenGL ES 2.0+"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {EGL = null; GLESv2 = null;}; @@ -188363,7 +189105,7 @@ self: { network network-uri time xml ]; description = "An implementation of the OpenID-2.0 spec."; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "openid-connect" = callPackage @@ -188388,8 +189130,8 @@ self: { tasty-hunit text time unordered-containers ]; description = "An OpenID Connect library that does all the heavy lifting for you"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -188414,7 +189156,7 @@ self: { ]; description = "Implementation of the OpenPGP message format"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "openpgp-Crypto" = callPackage @@ -188436,7 +189178,7 @@ self: { ]; description = "Implementation of cryptography for use with OpenPGP using the Crypto library"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "openpgp-asciiarmor" = callPackage @@ -188456,7 +189198,7 @@ self: { ]; benchmarkHaskellDepends = [ base bytestring criterion ]; description = "OpenPGP (RFC4880) ASCII Armor codec"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "openpgp-crypto-api" = callPackage @@ -188482,7 +189224,7 @@ self: { ]; description = "Implement cryptography for OpenPGP using crypto-api compatible libraries"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "opensoundcontrol-ht" = callPackage @@ -188498,7 +189240,7 @@ self: { ]; description = "Haskell OpenSoundControl utilities"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -188518,7 +189260,7 @@ self: { text transformers ]; description = "Haskell API Wrapper for the Open Source License API"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "openssh-github-keys" = callPackage @@ -188540,8 +189282,8 @@ self: { base hspec keyword-args octohat optparse-applicative parsec text ]; description = "Fetch OpenSSH keys from a GitHub team"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -188558,8 +189300,8 @@ self: { ]; testHaskellDepends = [ base cereal hedgehog time ]; description = "Haskell implementation of openssh protocol primitives"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -188571,7 +189313,7 @@ self: { sha256 = "1p59wlkirz4dwyhsnzzzbvy2cwfizn2zky5sxrsmnrzfkbpx1ig5"; libraryHaskellDepends = [ base directory HsOpenSSL time unix ]; description = "Create OpenSSL keypairs"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "openssl-streams" = callPackage @@ -188590,7 +189332,7 @@ self: { test-framework-hunit ]; description = "OpenSSL network support for io-streams"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "opentelemetry" = callPackage @@ -188604,7 +189346,7 @@ self: { libraryHaskellDepends = [ base bytestring exceptions ghc-trace-events hashable ]; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "opentelemetry-extra" = callPackage @@ -188640,7 +189382,7 @@ self: { ]; testToolDepends = [ tasty-discover ]; benchmarkHaskellDepends = [ base gauge opentelemetry ]; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "opentelemetry-http-client" = callPackage @@ -188653,8 +189395,8 @@ self: { libraryHaskellDepends = [ base http-client http-types opentelemetry text ]; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -188681,7 +189423,7 @@ self: { ghc-events http-client http-types opentelemetry opentelemetry-extra splitmix text typed-process unordered-containers ]; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "opentelemetry-wai" = callPackage @@ -188695,7 +189437,7 @@ self: { libraryHaskellDepends = [ base bytestring http-types opentelemetry text wai ]; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "opentheory" = callPackage @@ -188707,7 +189449,7 @@ self: { libraryHaskellDepends = [ base opentheory-primitive QuickCheck ]; testHaskellDepends = [ base opentheory-primitive QuickCheck ]; description = "The standard theory library"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "opentheory-bits" = callPackage @@ -188723,7 +189465,7 @@ self: { QuickCheck ]; description = "Natural number to bit-list conversions"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "opentheory-byte" = callPackage @@ -188739,7 +189481,7 @@ self: { opentheory-probability QuickCheck ]; description = "Bytes"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "opentheory-char" = callPackage @@ -188761,8 +189503,8 @@ self: { random ]; description = "Unicode characters"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -188780,7 +189522,7 @@ self: { base opentheory opentheory-primitive QuickCheck ]; description = "The divides relation on natural numbers"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "opentheory-fibonacci" = callPackage @@ -188798,7 +189540,7 @@ self: { base opentheory opentheory-primitive opentheory-stream QuickCheck ]; description = "Fibonacci numbers"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "opentheory-parser" = callPackage @@ -188815,7 +189557,7 @@ self: { base opentheory opentheory-primitive QuickCheck ]; description = "Stream parsers"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "opentheory-prime" = callPackage @@ -188835,7 +189577,7 @@ self: { opentheory-stream QuickCheck ]; description = "Prime natural numbers"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "opentheory-primitive" = callPackage @@ -188847,7 +189589,7 @@ self: { libraryHaskellDepends = [ base QuickCheck random ]; testHaskellDepends = [ base QuickCheck random ]; description = "Haskell primitives used by OpenTheory packages"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "opentheory-probability" = callPackage @@ -188861,7 +189603,7 @@ self: { base opentheory opentheory-primitive QuickCheck ]; description = "Probability"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "opentheory-stream" = callPackage @@ -188875,7 +189617,7 @@ self: { base opentheory opentheory-primitive QuickCheck ]; description = "Infinite stream types"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "opentheory-unicode" = callPackage @@ -188896,7 +189638,7 @@ self: { opentheory-primitive opentheory-probability QuickCheck ]; description = "Unicode characters"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "opentok" = callPackage @@ -188928,8 +189670,8 @@ self: { unordered-containers utf8-string uuid ]; description = "An OpenTok SDK for Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -188947,8 +189689,8 @@ self: { pretty-hex time unordered-containers vector ]; description = "Opentype loading and writing"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -188971,8 +189713,8 @@ self: { base directory optparse-applicative time xdg-basedir ]; description = "Access data at OpenWeatherMap"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -188989,8 +189731,8 @@ self: { ]; testHaskellDepends = [ base doctest filemanip hspec QuickCheck ]; description = "Simple project template from stack"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -189005,7 +189747,7 @@ self: { libraryHaskellDepends = [ base mtl ]; executableHaskellDepends = [ base mtl random ]; description = "Implementation of difficult monads made easy with operational semantics"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "operational-alacarte" = callPackage @@ -189017,7 +189759,7 @@ self: { libraryHaskellDepends = [ base mtl ]; testHaskellDepends = [ base ]; description = "A version of Operational suitable for extensible EDSLs"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "operational-class" = callPackage @@ -189028,7 +189770,7 @@ self: { sha256 = "02z766b5a6fa7dgmw3qa1xryijf2im9n79gnjq0m5pd2hv5vja4b"; libraryHaskellDepends = [ base operational transformers ]; description = "MonadProgram typeclass for the operational package"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "operational-extra" = callPackage @@ -189043,8 +189785,8 @@ self: { base bytestring operational text time transformers ]; description = "Interpretation functions and simple instruction sets for operational"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -189063,8 +189805,8 @@ self: { text-builder unordered-containers ]; description = "Compiler for OpLang, an esoteric programming language"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -189076,7 +189818,7 @@ self: { sha256 = "1bnr6lkcf2qs7pvrmd8a5xmklcg67l64b776hzclfvxqy1qil29x"; libraryHaskellDepends = [ base directory xml ]; description = "Representing and handling OPML subscription information"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "opml-conduit" = callPackage @@ -189104,7 +189846,7 @@ self: { uri-bytestring xml-conduit ]; description = "Streaming parser/renderer for the OPML 2.0 format."; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "opn" = callPackage @@ -189122,8 +189864,8 @@ self: { process text unordered-containers ]; description = "Open files or URLs using associated programs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -189152,7 +189894,7 @@ self: { unordered-containers vector ]; description = "Optics as an abstract interface"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "optics-core" = callPackage @@ -189167,7 +189909,7 @@ self: { array base containers indexed-profunctors transformers ]; description = "Optics as an abstract interface: core definitions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "optics-extra" = callPackage @@ -189184,7 +189926,7 @@ self: { optics-core text transformers unordered-containers vector ]; description = "Extra utilities and instances for optics-core"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "optics-th" = callPackage @@ -189203,7 +189945,7 @@ self: { ]; testHaskellDepends = [ base optics-core tagged ]; description = "Optics construction using TemplateHaskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "optics-vl" = callPackage @@ -189218,7 +189960,7 @@ self: { base indexed-profunctors optics-core profunctors ]; description = "Utilities for compatibility with van Laarhoven optics"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "optima" = callPackage @@ -189235,8 +189977,8 @@ self: { ]; testHaskellDepends = [ attoparsec-data rerebase ]; description = "Simple command line interface arguments parser"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -189252,8 +189994,8 @@ self: { base bytestring hasql hasql-pool optima text time ]; description = "Command-line arguments parsing for Hasql"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -189278,8 +190020,8 @@ self: { base bytestring criterion deepseq vector ]; description = "Optimal Block boundary determination for rsync-like behaviours"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -189295,8 +190037,8 @@ self: { ad base distributive linear semigroupoids vector ]; description = "Numerical optimization"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -189315,8 +190057,8 @@ self: { uniplate wl-pprint ]; description = "A supercompiler for f-lite"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -189328,7 +190070,7 @@ self: { sha256 = "1m02b0wcsmfdlmh5cnwfylnpc1cizmfcmjxdiwab5bjbbi0xvkaj"; libraryHaskellDepends = [ base ]; description = "A strict version of Maybe"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "optional" = callPackage @@ -189342,8 +190084,8 @@ self: { base directory doctest filepath QuickCheck ]; description = "Using type-classes for optional function arguments"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -189357,7 +190099,7 @@ self: { editedCabalFile = "0fda6mhm44qpbc9hfkf6jxnm3a7qszabywsmxa2iw0dz734a9xl3"; libraryHaskellDepends = [ base ]; description = "Optional function arguments"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "options" = callPackage @@ -189373,7 +190115,7 @@ self: { base chell chell-quickcheck containers monads-tf transformers ]; description = "A powerful and easy-to-use command-line option parser"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "options-time" = callPackage @@ -189385,8 +190127,8 @@ self: { libraryHaskellDepends = [ base options time ]; testHaskellDepends = [ base chell options time ]; description = "Command-line option types for dates and times"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -189405,7 +190147,7 @@ self: { ]; testHaskellDepends = [ base bytestring QuickCheck ]; description = "Utilities and combinators for parsing command line options"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "optparse-applicative_0_16_1_0" = callPackage @@ -189421,8 +190163,8 @@ self: { ]; testHaskellDepends = [ base QuickCheck ]; description = "Utilities and combinators for parsing command line options"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "optparse-applicative-simple" = callPackage @@ -189438,8 +190180,8 @@ self: { ]; testHaskellDepends = [ attoparsec-data rerebase ]; description = "Simple command line interface arguments parser"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -189451,7 +190193,7 @@ self: { sha256 = "0paa7r64y0nb9yv3x387pdid68lnc1gn2m28kcli55dvh1x4wwxr"; libraryHaskellDepends = [ base mtl ]; description = "Declarative command line option parser"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "optparse-enum" = callPackage @@ -189465,8 +190207,8 @@ self: { base enum-text fmt optparse-applicative text ]; description = "An enum-text based toolkit for optparse-applicative"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -189483,7 +190225,7 @@ self: { system-filepath text time transformers void ]; description = "Auto-generate a command-line parser for your datatype"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "optparse-generic_1_4_4" = callPackage @@ -189499,8 +190241,8 @@ self: { transformers void ]; description = "Auto-generate a command-line parser for your datatype"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "optparse-helper" = callPackage @@ -189513,8 +190255,8 @@ self: { editedCabalFile = "13zhsnpdw3kckjrc3sz2i5cqgxwd6sisvik02q0j43d940jmmdk0"; libraryHaskellDepends = [ base optparse-applicative ]; description = "Helper functions for optparse-applicative"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -189533,7 +190275,7 @@ self: { ]; testHaskellDepends = [ base bytestring directory ]; description = "Simple interface to optparse-applicative"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "optparse-text" = callPackage @@ -189545,7 +190287,7 @@ self: { libraryHaskellDepends = [ base optparse-applicative text ]; testHaskellDepends = [ base hspec optparse-applicative text ]; description = "Data.Text helpers for optparse-applicative"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "optparse-version" = callPackage @@ -189555,7 +190297,7 @@ self: { version = "0.3.0.0"; sha256 = "08mv8ah4g5xs91245gpgh6r0mgdz6rk7ykk1ywr8gfwn3dx1zm7x"; libraryHaskellDepends = [ base optparse-applicative ]; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "orbits" = callPackage @@ -189576,7 +190318,7 @@ self: { tagged tasty tasty-quickcheck tasty-th units units-defs ]; description = "Types and functions for Kepler orbits"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "orc" = callPackage @@ -189593,8 +190335,8 @@ self: { base deepseq monadIO mtl process random stm ]; description = "Orchestration-style co-ordination EDSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -189618,8 +190360,8 @@ self: { wreq ]; description = "An API client for http://orchestrate.io/."; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -189640,8 +190382,8 @@ self: { salvia-extras stm time unix xml ]; description = "Haskell Wiki Library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -189661,8 +190403,8 @@ self: { salvia-extras stm ]; description = "Haskell Wiki Demo"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -189674,7 +190416,7 @@ self: { sha256 = "062wkfpww1ic3xiy26k22369azk5wjlpn5wm5xh1w75kc9crv263"; libraryHaskellDepends = [ base void ]; description = "Creating Ord instances instantly"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "order-maintenance" = callPackage @@ -189690,8 +190432,8 @@ self: { base Cabal cabal-test-quickcheck containers QuickCheck transformers ]; description = "Algorithms for the order maintenance problem with a safe interface"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -189709,7 +190451,7 @@ self: { base containers criterion deepseq random ]; description = "Order statistic trees based on weight-balanced trees"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "order-statistics" = callPackage @@ -189724,8 +190466,8 @@ self: { base containers math-functions statistics vector vector-space ]; description = "L-Estimators for robust statistics"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -189738,7 +190480,7 @@ self: { libraryHaskellDepends = [ base ]; description = "A definition of Posets"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "ordered-containers" = callPackage @@ -189749,7 +190491,7 @@ self: { sha256 = "1j92dm36s0cfhc7s4k3dk36ibkvr6w1nhaq6q1m5vkbh1qrwfnn7"; libraryHaskellDepends = [ base containers ]; description = "Set- and Map-like types that remember the order elements were inserted"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "orderly-workers" = callPackage @@ -189760,7 +190502,7 @@ self: { sha256 = "0w032z05yxl7zqdganxvd8rklzli5k8bya2648hk8scl51q98390"; libraryHaskellDepends = [ base stm ]; description = "Fork concurrent worker threads and produce ordered results"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "orders" = callPackage @@ -189773,7 +190515,7 @@ self: { editedCabalFile = "1ilyg95l97xp4ym402g499ysfbwqsw413kpk4gvi5hd861xx2laj"; libraryHaskellDepends = [ base containers ]; description = "basic orders"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ordinal" = callPackage @@ -189792,8 +190534,8 @@ self: { testHaskellDepends = [ base hspec QuickCheck text ]; testToolDepends = [ hspec-discover ]; description = "Convert numbers to words in different languages"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -189808,8 +190550,8 @@ self: { libraryHaskellDepends = [ base containers transformers vector ]; testHaskellDepends = [ base directory process split ]; description = "Push-pull implementation of discrete-time FRP"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -189824,8 +190566,8 @@ self: { ]; testHaskellDepends = [ base containers either mtl transformers ]; description = "Owned references in the Ownership Monad"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -189843,8 +190585,8 @@ self: { ]; testHaskellDepends = [ base megaparsec tasty tasty-hunit text ]; description = "Parser for Emacs org-mode files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -189859,8 +190601,8 @@ self: { base containers hashable lucid org-mode text ]; description = "Lucid integration for org-mode"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -189874,7 +190616,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base parsec regex-compat ]; description = "Basic org to anki exporter"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "organize-imports" = callPackage @@ -189887,8 +190629,8 @@ self: { isExecutable = true; executableHaskellDepends = [ attoparsec base text ]; description = "Organize scala imports"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -189908,8 +190650,8 @@ self: { QuickCheck random regex-posix syb text ]; description = "Org Mode library for haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -189932,7 +190674,7 @@ self: { thyme unordered-containers ]; description = "A collection of Attoparsec combinators for parsing org-mode flavored documents"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "orgstat" = callPackage @@ -189941,12 +190683,12 @@ self: { , diagrams-svg, directory, exceptions, filepath, fmt, formatting , hashable, hspec, HUnit, lens, mtl, optparse-simple, orgmode-parse , process, QuickCheck, quickcheck-text, text, time, transformers - , turtle, universum, yaml + , turtle, universum, unordered-containers, yaml }: mkDerivation { pname = "orgstat"; - version = "0.1.8"; - sha256 = "072xdy9kg853l7lskm1knkk63pnyqh44s7zakplb37x46rcsj4jc"; + version = "0.1.9"; + sha256 = "09psfz4a2amgcyq00ygjp6zakzf5yx2y2kjykz62wncwpqkgnf53"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -189957,16 +190699,17 @@ self: { yaml ]; executableHaskellDepends = [ - base bytestring directory exceptions filepath formatting - optparse-simple universum + attoparsec base bytestring directory exceptions filepath formatting + optparse-simple orgmode-parse text time turtle universum + unordered-containers ]; testHaskellDepends = [ base colour hspec HUnit lens QuickCheck quickcheck-text text time transformers universum ]; description = "Statistics visualizer for org-mode"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -189985,8 +190728,8 @@ self: { base HUnit test-framework test-framework-hunit ]; description = "An un-SYB framework for transforming heterogenous data through folds"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -190006,7 +190749,7 @@ self: { http-types iso8601-time lens mtl string-conversions text time unordered-containers word8 wreq ]; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "orizentic" = callPackage @@ -190027,8 +190770,8 @@ self: { ]; testHaskellDepends = [ base hspec jwt mtl time ]; description = "Token-based authentication and authorization"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -190059,7 +190802,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "A formatter for Haskell source code"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "orthotope" = callPackage @@ -190079,7 +190822,7 @@ self: { test-framework-quickcheck2 vector ]; description = "Multidimensional arrays inspired by APL"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "os-release" = callPackage @@ -190099,7 +190842,7 @@ self: { pretty-simple tasty tasty-golden tasty-hspec text ]; description = "/etc/os-release helpers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "osc" = callPackage @@ -190114,8 +190857,8 @@ self: { attoparsec base binary bytestring data-binary-ieee754 network ]; description = "A library to handle messages in the OSC protocol"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -190127,8 +190870,8 @@ self: { sha256 = "1452a2y085xbj5q83g6y8f9vrxmlq804i8kyx6rfwyzfvzq5s3ic"; libraryHaskellDepends = [ base colour gloss random ]; description = "Implements an osculatory packing (kissing circles) algorithm and display"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -190148,7 +190891,7 @@ self: { ]; executableHaskellDepends = [ base process ]; description = "Show keys pressed with an on-screen display (Linux only)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "oset" = callPackage @@ -190164,8 +190907,8 @@ self: { testHaskellDepends = [ base containers hspec ]; testToolDepends = [ hspec-discover ]; description = "An insertion-order-preserving set"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -190185,8 +190928,8 @@ self: { base conduit exceptions hspec resourcet text xml-conduit xml-types ]; description = "Parse and operate on OSM data in efficient way"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -190208,8 +190951,8 @@ self: { text time transformers transformers-base ]; description = "Download Open Street Map tiles"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -190228,8 +190971,8 @@ self: { process temporary ]; description = "Better conversion of Oxford Scholarship Online material to PDF"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -190242,8 +190985,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base binary bytestring containers ]; description = "Parser for OS X static archive format"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -190264,8 +191007,8 @@ self: { test-framework-hunit test-framework-quickcheck2 text ]; description = "Real-time collaborative editing with Operational Transformation"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -190291,8 +191034,8 @@ self: { aeson base binary bytestring h-gpgme text yaml ]; description = "OTP Authenticator (a la google) command line client"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -190310,8 +191053,8 @@ self: { base containers parsec split uniplate ]; description = "Pretty-printer for Ott parse trees"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -190336,7 +191079,7 @@ self: { vector-algorithms ]; description = "External sorting package based on Conduit"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "overhang" = callPackage @@ -190347,7 +191090,7 @@ self: { sha256 = "07iafybg45130jhwin6jj2fnkgcwra367f5df91xn34kaj9zas0x"; libraryHaskellDepends = [ base ]; description = "Hang loose with your lambdas!"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "overload" = callPackage @@ -190362,7 +191105,7 @@ self: { base simple-effects template-haskell th-expand-syns ]; description = "Finite overloading"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "overloaded" = callPackage @@ -190388,8 +191131,8 @@ self: { ]; doHaddock = false; description = "Overloaded pragmas as a plugin"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -190411,8 +191154,8 @@ self: { test-framework-hunit ]; description = "Overloaded Records based on current GHC proposal"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -190426,8 +191169,8 @@ self: { testHaskellDepends = [ base doctest ]; benchmarkHaskellDepends = [ base criterion ]; description = "An alternative to some of the Prelude"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -190443,8 +191186,8 @@ self: { array base bytestring lens transformers vector ]; description = "Bidirectional fast ByteString packer/unpacker"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -190459,8 +191202,8 @@ self: { ]; testHaskellDepends = [ base ]; description = "Fetches a 'GenericPackageDescription' from Hackage"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -190479,8 +191222,8 @@ self: { base Cabal filemanip filepath groom packdeps process ]; description = "Utilities for working with cabal packages and your package database"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -190496,8 +191239,8 @@ self: { base Cabal Diff filepath haskell-src-exts ]; description = "Haskell Package Versioning Tool"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -190511,7 +191254,7 @@ self: { testHaskellDepends = [ base ]; benchmarkHaskellDepends = [ base ]; description = "Universal build and CI testing for Haskell packages"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "packdeps" = callPackage @@ -190535,7 +191278,7 @@ self: { base Cabal containers optparse-applicative process semigroups text ]; description = "Check your cabal packages for lagging dependencies"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "packed" = callPackage @@ -190551,8 +191294,8 @@ self: { base containers ghc-prim hedgehog tasty tasty-hedgehog tasty-hunit ]; benchmarkHaskellDepends = [ base gauge ]; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -190580,8 +191323,8 @@ self: { vector-binary-instances ]; description = "Generation and traversal of highly compressed directed acyclic word graphs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -190600,8 +191343,8 @@ self: { ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; description = "Efficient “spreadsheet table” like maps with multiple marginals"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -190615,8 +191358,8 @@ self: { editedCabalFile = "1kqbbvvpb0zn19dp4lx598iwgpbswz1qvclrcy5v27vjivzk9hyb"; libraryHaskellDepends = [ array base ]; description = "(Deprecated) Packed Strings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -190633,7 +191376,7 @@ self: { base bytestring tasty tasty-hunit tasty-quickcheck ]; description = "Fast byte serializer and unserializer"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "packer-messagepack" = callPackage @@ -190651,8 +191394,8 @@ self: { base bytestring containers hedgehog packer safe-exceptions text ]; description = "MessagePack Serialization an Deserialization for Packer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -190672,8 +191415,8 @@ self: { QuickCheck ]; description = "Serialization library for GHC"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -190694,8 +191437,8 @@ self: { process split ]; description = "Tool for detecting redundant Cabal package dependencies"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -190709,8 +191452,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base deepseq directory-tree ]; description = "Read whole Pacman database which pushes it into the memory cache"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -190726,8 +191469,8 @@ self: { base containers hmidi minioperational transformers ]; description = "Controlling padKONTROL native mode"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -190746,7 +191489,7 @@ self: { servant-client servant-client-core time ]; description = "API to the Paddle payment processor"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "pads-haskell" = callPackage @@ -190773,8 +191516,8 @@ self: { transformers ]; description = "PADS data description language for Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -190793,8 +191536,8 @@ self: { ]; executableHaskellDepends = [ base text wreq ]; description = "Pagarme API wrapper"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -190816,7 +191559,7 @@ self: { ]; executableHaskellDepends = [ base bytestring conduit-extra text ]; description = "Open up a pager, like 'less' or 'more'"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }) {}; "pagerduty" = callPackage @@ -190840,7 +191583,7 @@ self: { ]; description = "Client library for PagerDuty Integration and REST APIs"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "pagination" = callPackage @@ -190854,7 +191597,7 @@ self: { libraryHaskellDepends = [ base deepseq exceptions ]; testHaskellDepends = [ base exceptions hspec QuickCheck ]; description = "Framework-agnostic pagination boilerplate"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pagure-cli" = callPackage @@ -190872,7 +191615,7 @@ self: { optparse-applicative simple-cmd-args text ]; description = "Pagure client"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }) {}; "pagure-hook-receiver" = callPackage @@ -190887,8 +191630,8 @@ self: { base containers scotty shelly text transformers unix ]; description = "Receive hooks from pagure and do things with them"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -190904,7 +191647,7 @@ self: { executableHaskellDepends = [ base ]; description = "Colorization of text for command-line output"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "pairing" = callPackage @@ -190930,8 +191673,8 @@ self: { MonadRandom protolude tasty-quickcheck ]; description = "Bilinear pairings"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -190947,8 +191690,8 @@ self: { array base colour containers MonadRandom ]; description = "Utilities for choosing and creating color schemes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -190962,7 +191705,7 @@ self: { isExecutable = true; executableHaskellDepends = [ array base bytestring containers ]; description = "Finding palindromes in strings"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pam" = callPackage @@ -190977,9 +191720,9 @@ self: { librarySystemDepends = [ pam ]; libraryToolDepends = [ c2hs ]; description = "Haskell binding for C PAM API"; - license = stdenv.lib.licenses.bsd3; - platforms = [ "i686-linux" "x86_64-linux" ]; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ]; + hydraPlatforms = lib.platforms.none; broken = true; }) {pam = null;}; @@ -190997,8 +191740,8 @@ self: { testHaskellDepends = [ base byteslice primitive ]; benchmarkHaskellDepends = [ base byteslice gauge primitive ]; description = "Parse syslog traffic from PAN-OS"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -191020,7 +191763,7 @@ self: { ]; description = "A simple static blog engine"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -191043,8 +191786,8 @@ self: { }: mkDerivation { pname = "pandoc"; - version = "2.11.3.2"; - sha256 = "1p4l6h9wpsfqxvziwx4vvsq02jdwwwqq92gvrdxi4ad2q7nlgivr"; + version = "2.11.4"; + sha256 = "1x8s6gidcij81vcxhj3pday484dyxn3d5s9sz0rh3nfml80cgkyk"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; @@ -191077,8 +191820,8 @@ self: { mv "man/"*.1 $out/share/man/man1/ ''; description = "Conversion between markup formats"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ peti ]; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ peti ]; }) {}; "pandoc-citeproc" = callPackage @@ -191113,7 +191856,7 @@ self: { ]; doCheck = false; description = "Supports using pandoc with citeproc"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pandoc-citeproc-preamble" = callPackage @@ -191130,7 +191873,7 @@ self: { base directory filepath pandoc-types process text-conversions ]; description = "Insert a preamble before pandoc-citeproc's bibliography"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "pandoc-crossref" = callPackage @@ -191166,7 +191909,7 @@ self: { utility-ht ]; description = "Pandoc filter for cross-references"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }) {}; "pandoc-csv2table" = callPackage @@ -191181,8 +191924,8 @@ self: { libraryHaskellDepends = [ base csv pandoc pandoc-types text ]; executableHaskellDepends = [ base csv pandoc pandoc-types ]; description = "Convert CSV to Pandoc Table Markdown"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -191194,7 +191937,7 @@ self: { sha256 = "032fx8fy134hysg10y5c57c7jkvq8lkc0q2r8ylc54qbfmvqd820"; libraryHaskellDepends = [ base dhall either pandoc text ]; description = "Decodes pandoc to dhall"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pandoc-emphasize-code" = callPackage @@ -191219,7 +191962,7 @@ self: { ]; testToolDepends = [ tasty-discover ]; description = "A Pandoc filter for emphasizing code in fenced blocks"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "pandoc-filter-graphviz" = callPackage @@ -191238,37 +191981,40 @@ self: { directory filepath pandoc pandoc-types process text ]; description = "A Pandoc filter to use graphviz"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; "pandoc-filter-indent" = callPackage - ({ mkDerivation, base, blaze-html, blaze-markup + ({ mkDerivation, base, blaze-html, blaze-markup, containers , ghc-syntax-highlighter, HaTeX, optics-core, optics-th - , pandoc-types, text + , optparse-applicative, pandoc-types, QuickCheck, quickcheck-text + , skylighting, text }: mkDerivation { pname = "pandoc-filter-indent"; - version = "0.2.1.0"; - sha256 = "1jc5a977490jfqnhvqzg5zqs22r10x094mfqd26ynqq9fx7pa580"; + version = "0.3.1.0"; + sha256 = "1ys7v9ygy07c4jxraqmbb1fqswhh0fydcgd5zcfjln2sjb637947"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base blaze-html blaze-markup ghc-syntax-highlighter HaTeX - optics-core optics-th pandoc-types text + optics-core optics-th pandoc-types skylighting text ]; executableHaskellDepends = [ - base blaze-html blaze-markup ghc-syntax-highlighter HaTeX - optics-core optics-th pandoc-types text + base blaze-html blaze-markup containers ghc-syntax-highlighter + HaTeX optics-core optics-th optparse-applicative pandoc-types + skylighting text ]; testHaskellDepends = [ base blaze-html blaze-markup ghc-syntax-highlighter HaTeX - optics-core optics-th pandoc-types text + optics-core optics-th pandoc-types QuickCheck quickcheck-text + skylighting text ]; description = "Pandoc filter formatting Haskell code fragments using GHC lexer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -191285,7 +192031,7 @@ self: { skylighting-extensions skylighting-modding text ]; description = "Syntax highlighting customization for Pandoc"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "pandoc-include" = callPackage @@ -191305,8 +192051,8 @@ self: { ]; doHaddock = false; description = "Include other Markdown files"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -191331,7 +192077,7 @@ self: { tasty-hunit text ]; description = "A Pandoc filter for including code from source files"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "pandoc-japanese-filters" = callPackage @@ -191350,8 +192096,8 @@ self: { pandoc-types shelly system-fileio system-filepath text ]; description = "Japanese-specific markup filters for pandoc"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -191363,8 +192109,8 @@ self: { sha256 = "0prc0wv808l1l7m6rg78r6alwqgajj0h2yn3w7sgxmsvxdr8aj1w"; libraryHaskellDepends = [ base containers lens pandoc-types text ]; description = "Lenses for Pandoc documents"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -191378,7 +192124,7 @@ self: { base containers pandoc-types relude text ]; description = "Extract \"contextual links\" from Pandoc"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pandoc-markdown-ghci-filter" = callPackage @@ -191403,8 +192149,8 @@ self: { tasty-hunit tasty-quickcheck text ]; description = "Pandoc-filter to evaluate `code` section in markdown and auto-embed output"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -191427,7 +192173,7 @@ self: { ]; description = "Pandoc filter to include CSV files"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -191451,8 +192197,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Render and insert PlantUML diagrams with Pandoc"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -191466,8 +192212,8 @@ self: { }: mkDerivation { pname = "pandoc-plot"; - version = "1.0.2.0"; - sha256 = "10iwhwr3161mx438bi3q9m15wj60fs5hr6q90g3jqiv6w18n6zdm"; + version = "1.0.2.1"; + sha256 = "0yi1dh6d1zxzrpmh32v0c7v921qjyxmmapzv56vh0ih8mi3ggbji"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -191487,7 +192233,7 @@ self: { base criterion pandoc-types template-haskell text ]; description = "A Pandoc filter to include figures generated from code blocks using your plotting toolkit of choice"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; }) {}; "pandoc-pyplot" = callPackage @@ -191517,8 +192263,8 @@ self: { mtl pandoc-types tasty tasty-hspec tasty-hunit temporary text ]; description = "A Pandoc filter to include figures generated from Python code blocks"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -191533,8 +192279,8 @@ self: { libraryHaskellDepends = [ base monad-gen pandoc pandoc-types ]; executableHaskellDepends = [ base pandoc-types ]; description = "Convert Pandoc Markdown-style footnotes into sidenotes"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -191552,7 +192298,7 @@ self: { base bytestring containers extra pandoc pandoc-types text ]; description = "Pandoc filter to customize links, images and paragraphs"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pandoc-throw" = callPackage @@ -191563,7 +192309,7 @@ self: { sha256 = "1i737mv2sgm65c53ggrxnscga92fya5khb5nhgbg1nnqgy2sjkm8"; libraryHaskellDepends = [ base exceptions pandoc ]; description = "MonadThrow behaviour for Pandoc"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "pandoc-types" = callPackage @@ -191586,7 +192332,7 @@ self: { ]; benchmarkHaskellDepends = [ base criterion text ]; description = "Types for representing a structured document"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pandoc-unlit" = callPackage @@ -191599,8 +192345,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base pandoc ]; description = "Literate Haskell support for GitHub's Markdown flavor"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -191618,8 +192364,8 @@ self: { text transformers ]; description = "Utility functions to work with Pandoc in Haskell applications"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -191638,17 +192384,17 @@ self: { temporary text ]; description = "Pandoc filter for native Vim code highlighting"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pandora" = callPackage ({ mkDerivation }: mkDerivation { pname = "pandora"; - version = "0.3.4"; - sha256 = "0xmf75v6b5cj083fjxz3hl6cj9ix2v68h8ix5zrh94qik5is4rl7"; + version = "0.3.5"; + sha256 = "1cw6wm122zwbn61980vqr2prsc3qpnnaqgk0m3wvxs03dygarpja"; description = "A box of patterns and paradigms"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "pang-a-lambda" = callPackage @@ -191667,8 +192413,8 @@ self: { transformers Yampa ]; description = "A super-pang clone"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -191688,7 +192434,7 @@ self: { ]; libraryPkgconfigDepends = [ pango ]; description = "Binding to the Pango text rendering engine"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; }) {inherit (pkgs) pango;}; "pangraph" = callPackage @@ -191705,8 +192451,8 @@ self: { ]; testHaskellDepends = [ base bytestring containers HUnit ]; description = "A set of parsers for graph languages and conversions to graph libaries"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -191728,8 +192474,8 @@ self: { QuickCheck syb tagged tasty tasty-quickcheck ]; description = "Pandoc filter to unwrap nested blocks"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {lazysmallcheck2012 = null;}; @@ -191741,7 +192487,7 @@ self: { sha256 = "0hidfg8yzp5vzq8y422c442b45jkr8a9s38s8n78wyi5811fpp0m"; libraryHaskellDepends = [ base gitrev template-haskell ]; description = "A convenient way to panic"; - license = stdenv.lib.licenses.isc; + license = lib.licenses.isc; }) {}; "panpipe" = callPackage @@ -191762,8 +192508,8 @@ self: { base pandoc QuickCheck tasty tasty-quickcheck ]; description = "Pandoc filter to execute code blocks"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -191792,8 +192538,8 @@ self: { ]; testHaskellDepends = [ base doctest Glob hspec QuickCheck ]; description = "Pansite: a simple web site management tool"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -191835,7 +192581,7 @@ self: { unliftio unordered-containers vector yaml zip-archive ]; description = "Content addressable Haskell package management"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pantry-tmp" = callPackage @@ -191889,8 +192635,8 @@ self: { zip-archive ]; description = "Content addressable Haskell package management"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -191914,8 +192660,8 @@ self: { papa-x-export papa-x-implement ]; description = "Reasonable default import"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -191929,8 +192675,8 @@ self: { base papa-base-export papa-base-implement ]; description = "Prelude with only useful functions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -191942,8 +192688,8 @@ self: { sha256 = "120b3ks9h3m9w6z365hmqrcp349kh3w8ii4kgki1zxjhh9z05mnm"; libraryHaskellDepends = [ base semigroups ]; description = "Prelude with only useful functions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -191955,8 +192701,8 @@ self: { sha256 = "07wpz625sdsjajaf3imqns92hs4h5gwjlmmfsr5mk9rbb3zph7ck"; libraryHaskellDepends = [ base papa-base-export semigroups ]; description = "Useful base functions reimplemented"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -191972,7 +192718,7 @@ self: { base papa-bifunctors-export papa-bifunctors-implement ]; description = "Prelude with only useful functions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "papa-bifunctors-export" = callPackage @@ -191985,7 +192731,7 @@ self: { editedCabalFile = "1d5jvb35as6kb9nmv99gv38v7rzl7c9mdg3ypwzmdqg0646m9k7m"; libraryHaskellDepends = [ base bifunctors ]; description = "export useful functions from `bifunctors`"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "papa-bifunctors-implement" = callPackage @@ -191996,7 +192742,7 @@ self: { sha256 = "0s1hcpchiz9xrip25z677lkglmflnqibrvy98xmn2ppzp489pm24"; libraryHaskellDepends = [ base bifunctors ]; description = "useful `bifunctors` functions reimplemented"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "papa-export" = callPackage @@ -192016,8 +192762,8 @@ self: { base directory doctest filepath QuickCheck template-haskell ]; description = "Reasonable default import"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -192039,8 +192785,8 @@ self: { base directory doctest filepath QuickCheck template-haskell ]; description = "Reasonable default import"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -192057,8 +192803,8 @@ self: { base directory doctest filepath QuickCheck template-haskell ]; description = "Third party libraries"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -192072,7 +192818,7 @@ self: { base papa-lens-export papa-lens-implement ]; description = "Prelude with only useful functions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "papa-lens-export" = callPackage @@ -192083,7 +192829,7 @@ self: { sha256 = "1sckrsfljk8r9jkjv1ccpzw6bk4fq50zwvkddhfidjrjnfvkycfb"; libraryHaskellDepends = [ base lens ]; description = "export useful functions from `lens`"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "papa-lens-implement" = callPackage @@ -192094,7 +192840,7 @@ self: { sha256 = "1x7439f7s625mdhnphvwy4pj7llpj6qsvzgvhzjcfg9m3n2a8bn4"; libraryHaskellDepends = [ base lens ]; description = "useful `lens` functions reimplemented"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "papa-prelude" = callPackage @@ -192110,8 +192856,8 @@ self: { base directory doctest filepath QuickCheck template-haskell ]; description = "Prelude with only useful functions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -192128,8 +192874,8 @@ self: { base directory doctest filepath QuickCheck template-haskell ]; description = "Prelude with only useful functions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -192146,8 +192892,8 @@ self: { base directory doctest filepath QuickCheck template-haskell ]; description = "Prelude with only useful functions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -192164,8 +192910,8 @@ self: { base directory doctest filepath QuickCheck template-haskell ]; description = "Prelude with only useful functions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -192182,8 +192928,8 @@ self: { base directory doctest filepath QuickCheck template-haskell ]; description = "Prelude with only useful functions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -192199,8 +192945,8 @@ self: { base papa-semigroupoids-export papa-semigroupoids-implement ]; description = "Prelude with only useful functions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -192212,7 +192958,7 @@ self: { sha256 = "0arqnnavjmpk0r9rfmpkyr3cxgc3gcr01ym8p15ix0iv0svghhx3"; libraryHaskellDepends = [ base semigroupoids ]; description = "export useful functions from `semigroupoids`"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "papa-semigroupoids-implement" = callPackage @@ -192223,8 +192969,8 @@ self: { sha256 = "0walc4zzm8cyjmjl577zrc01lkgf321r8law5mwhlr7n9ihiqfxg"; libraryHaskellDepends = [ base semigroupoids semigroups ]; description = "useful `semigroupoids` functions reimplemented"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -192236,7 +192982,7 @@ self: { sha256 = "1dvnnpdbiaxry2mxsfxlm0c42zi8ssx0sxj6m9z5mihwcf76cpld"; libraryHaskellDepends = [ base papa-x-export papa-x-implement ]; description = "Prelude with only useful functions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "papa-x-export" = callPackage @@ -192247,7 +192993,7 @@ self: { sha256 = "1l0rklbpg9py2cbp22qlshcxh51wxv9ayiixqh32q70jsgfbkind"; libraryHaskellDepends = [ base ]; description = "export useful functions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "papa-x-implement" = callPackage @@ -192258,7 +193004,7 @@ self: { sha256 = "1hwd93nig7vgqsdy3qyxrgvjcq8wwbj98z6r66wpp7lw8jfpqhff"; libraryHaskellDepends = [ base ]; description = "useful functions reimplemented"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "paphragen" = callPackage @@ -192271,8 +193017,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base bytestring containers ]; description = "A passphrase generator"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -192293,8 +193039,8 @@ self: { base directory filepath monads-tf template-haskell transformers ]; description = "packrat parser"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -192308,8 +193054,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base ]; description = "Packrat parsing; linear-time parsers for grammars in TDPL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -192332,8 +193078,8 @@ self: { wai-app-static wai-websockets warp websockets word8 ]; description = "The Haskell library and examples for the kids programming robot paprika"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -192350,8 +193096,8 @@ self: { base hedgehog refined template-haskell validators ]; description = "ParDual class for Parallel <-> Sequential"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -192363,7 +193109,7 @@ self: { sha256 = "0rmv6wyisdg4srzjykikqqigfji6x5zn1cz2v3cyl0dms4yr4lig"; libraryHaskellDepends = [ base directory filepath parallel-io ]; description = "Traverse a directory in parallel"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "para" = callPackage @@ -192374,7 +193120,7 @@ self: { sha256 = "0l5abmqi548s10f87m124ld4hhphhl1szljyc04a13fah4dsqjbh"; libraryHaskellDepends = [ base ]; description = "Text paragraph formatting"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "paragon" = callPackage @@ -192401,8 +193147,8 @@ self: { ]; executableToolDepends = [ alex ]; description = "Paragon"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -192416,7 +193162,7 @@ self: { editedCabalFile = "0shw96f4fc3vbr2vrnsk794qcsxyv3ra3snhw4wng81rkapp54y6"; libraryHaskellDepends = [ array base containers deepseq ghc-prim ]; description = "Parallel programming library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "parallel-io" = callPackage @@ -192433,7 +193179,7 @@ self: { base containers extensible-exceptions random ]; description = "Combinators for executing IO actions in parallel on a thread pool"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "parallel-tasks" = callPackage @@ -192448,8 +193194,8 @@ self: { base bytestring cereal deepseq here old-locale stm time transformers vector vector-algorithms ]; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -192461,7 +193207,7 @@ self: { sha256 = "08r8xl3x5zvsy3d3ss9m9l7kb0dyp7hjrwxlnz7g2jl7p5x8rjbd"; libraryHaskellDepends = [ base parallel tree-monad ]; description = "Parallel Tree Search"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "parameterized" = callPackage @@ -192473,8 +193219,8 @@ self: { libraryHaskellDepends = [ base data-diverse transformers ]; testHaskellDepends = [ base data-diverse hspec transformers ]; description = "Parameterized/indexed monoids and monads using only a single parameter type variable"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -192486,7 +193232,7 @@ self: { sha256 = "0fsghadd533qzav40xi3yfb8xmfv4wqsqmb0bk93rczyzyff2900"; libraryHaskellDepends = [ base template-haskell type-level ]; description = "Parameterized data library implementing lightweight dependent types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "parameterized-utils" = callPackage @@ -192497,8 +193243,8 @@ self: { }: mkDerivation { pname = "parameterized-utils"; - version = "2.1.1"; - sha256 = "18z0ykpvr7m8ffqpqwnclnyifig61n9l41w3hn39f37455z1dy39"; + version = "2.1.2.0"; + sha256 = "0ksyhlg8vmrmdayzi2zpb33xggb7mv7vgbm6kgzr0knxbh3nm7jc"; libraryHaskellDepends = [ base base-orphans constraints containers deepseq ghc-prim hashable hashtables lens mtl template-haskell text th-abstraction vector @@ -192508,8 +193254,8 @@ self: { tasty-ant-xml tasty-hedgehog tasty-hunit ]; description = "Classes and data structures for working with data-kind indexed types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -192528,7 +193274,7 @@ self: { base bytestring tasty tasty-golden tasty-hunit temporary ]; description = "Generate labelled test/benchmark trees from sets of parameters"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "paranoia" = callPackage @@ -192553,8 +193299,8 @@ self: { ]; testHaskellDepends = [ base ]; description = "http proxy server"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -192566,8 +193312,8 @@ self: { sha256 = "0598hz6zqcn4lh5y3vr54z4jh4ampxnh8rq29k6p5vnmrpvn4lq4"; libraryHaskellDepends = [ base mtl ]; description = "Generalised parser combinators"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -192579,8 +193325,8 @@ self: { sha256 = "0bc2gyvc1i3l3p702zs6hfkab7fmc7li5kh4mdzy3a91gzgsl3jh"; libraryHaskellDepends = [ attoparsec base mtl parco ]; description = "Generalised parser combinators - Attoparsec interface"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -192592,8 +193338,8 @@ self: { sha256 = "0m3dsjay3av4y0v4j76wxybmk4mkjdhqq81w1wsfr173d4blgxf3"; libraryHaskellDepends = [ base mtl parco parsec ]; description = "Generalised parser combinators - Parsec interface"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -192609,8 +193355,8 @@ self: { base bytestring containers mtl text transformers utf8-string word8 ]; description = "A simple parser-combinator library, a bit like Parsec but without the frills"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -192639,8 +193385,8 @@ self: { ]; executableToolDepends = [ alex happy ]; description = "Examples to accompany the book \"Parallel and Concurrent Programming in Haskell\""; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -192652,8 +193398,8 @@ self: { sha256 = "0b05zrc3v1hczasgg8ir83qfsz52lq02kwgn9nd39wnfliw6a4n0"; libraryHaskellDepends = [ base ]; description = "A library for cause-effect relationships"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -192677,7 +193423,7 @@ self: { base bytestring parser-combinators random tasty tasty-hunit text ]; description = "Parser combinators with fast-path and slower fallback for error reporting"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "parochial" = callPackage @@ -192700,8 +193446,8 @@ self: { base Cabal optparse-generic protolude ]; description = "Help Manage project specific documentation"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.agpl3Only; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -192738,8 +193484,8 @@ self: { mtl process QuickCheck text ]; description = "Streaming Parquet reader"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -192751,7 +193497,7 @@ self: { sha256 = "0amh3h49xi65kx8l34cy5jkai1f0d9l1qxp4937f3cjf7afif0pj"; libraryHaskellDepends = [ array base bytestring parsec ]; description = "DIMACS CNF parser library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "parse-gcstats" = callPackage @@ -192770,7 +193516,7 @@ self: { text ]; description = "Parse machine-readable GHC GC stats"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "parse-help" = callPackage @@ -192787,8 +193533,8 @@ self: { ]; testHaskellDepends = [ cmdargs ]; description = "generate command line arguments from a --help output"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -192804,8 +193550,8 @@ self: { executableHaskellDepends = [ base containers ]; testHaskellDepends = [ base process ]; description = "Parse command-line arguments"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -192824,8 +193570,8 @@ self: { base HUnit mtl test-framework test-framework-hunit ]; description = "Monadic parser combinators"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "parsec-class" = callPackage @@ -192836,7 +193582,7 @@ self: { sha256 = "0wqpivsrjsp9996fz6lb06rxl3860afc4l8hbx8d1vxhwv2lx702"; libraryHaskellDepends = [ base parsec ]; description = "Class of types that can be constructed from their text representation"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "parsec-extra" = callPackage @@ -192847,7 +193593,7 @@ self: { sha256 = "00n7vzkkd70ndjlxhwnnl4mlh0892idc813kj4j1a14xa85sndj9"; libraryHaskellDepends = [ base monads-tf parsec ]; description = "Some miscellaneous basic string parsers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "parsec-free" = callPackage @@ -192862,8 +193608,8 @@ self: { base bytestring containers free lens mtl parsec text transformers ]; description = "Parsec API encoded as a deeply-embedded DSL, for debugging and analysis"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -192875,7 +193621,7 @@ self: { sha256 = "1gzy4v3r02kvdxvgg1nj83mmb6aph2v4ilf9c7y6nbvi2x49l0bp"; libraryHaskellDepends = [ base parsec ]; description = "Utilities for parsing numbers from strings"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "parsec-numeric" = callPackage @@ -192893,7 +193639,7 @@ self: { ]; description = "Parsec combinators for parsing Haskell numeric types"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "parsec-parsers" = callPackage @@ -192907,8 +193653,8 @@ self: { libraryHaskellDepends = [ base parsec parsers ]; testHaskellDepends = [ base directory doctest filepath ]; description = "Parsing instances for Parsec"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -192921,7 +193667,7 @@ self: { libraryHaskellDepends = [ base parsec ]; testHaskellDepends = [ base parsec QuickCheck ]; description = "Applicative permutation parser for Parsec intended as a replacement for Text.Parsec.Perm."; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "parsec-pratt" = callPackage @@ -192935,8 +193681,8 @@ self: { libraryHaskellDepends = [ base containers parsec ]; executableHaskellDepends = [ base containers mtl parsec pretty ]; description = "Pratt Parser combinator for Parsec"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -192948,7 +193694,7 @@ self: { sha256 = "1pzspf5fimjlki5fn3lxz1kdpd9pf2ww8z9sf08zaiyfp4ms15n1"; libraryHaskellDepends = [ base parsec tagsoup ]; description = "Parsec parsers for Tagsoup tag streams"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "parsec-trace" = callPackage @@ -192959,7 +193705,7 @@ self: { sha256 = "085899pyr7sff5d5zgr9pmflv3384hwm7p2b5k2lf0pcnvzf2mgw"; libraryHaskellDepends = [ base containers mtl parsec ]; description = "Add a hierarchical trace to Parsec parsers"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "parsec-utils" = callPackage @@ -192970,7 +193716,7 @@ self: { sha256 = "0pfdl9zsdzxcbjh37234djcbg6sdhqzx3fnin0b55hxn78k26ivi"; libraryHaskellDepends = [ base parsec ]; description = "Utility functions and combinators for Text.Parsec"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "parsec1" = callPackage @@ -192981,7 +193727,7 @@ self: { sha256 = "1v9kq4g378v8pkj8ldpqwh9dwlng5idbxqqb8ywmzdjnglih34rf"; libraryHaskellDepends = [ base ]; description = "Portable monadic parser combinators"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "parsec2" = callPackage @@ -192992,8 +193738,8 @@ self: { sha256 = "075y56pbi02ssyb965di1b6d2047jdjwq2wp2maraqjm6gdk824y"; libraryHaskellDepends = [ base ]; description = "Monadic parser combinators"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -193005,8 +193751,8 @@ self: { sha256 = "00p3kffqmsi6lvxbpa60nql3lgm9vnxsspp8m0jz2d2hfl7hadqf"; libraryHaskellDepends = [ base bytestring mtl text ]; description = "Monadic parser combinators"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -193018,7 +193764,7 @@ self: { sha256 = "0i7fvbhvvmf5nld51kv9v0vpb42dlnpivxcl7ll0zwa3gzks2cm5"; libraryHaskellDepends = [ base parsec ]; description = "Utilities for parsing numbers from Char sequences"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "parsedate" = callPackage @@ -193029,7 +193775,7 @@ self: { sha256 = "0gsylvm8srddmh3g3ysjgqqmgp0ddg6pdi2sz15v6nrvsqfabiip"; libraryHaskellDepends = [ base old-locale old-time parsec ]; description = "Data and time parsing for CalendarTime"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "parseerror-eq" = callPackage @@ -193041,8 +193787,8 @@ self: { libraryHaskellDepends = [ base parsec ]; testHaskellDepends = [ base hspec parsec ]; description = "Adds and Eq instance for Parsec's ParseError if needed"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -193054,7 +193800,7 @@ self: { sha256 = "090yhbbh2i5lwfwrfml0n54ziy8mz3mgmwnykr4ab06w1ylc2zh4"; libraryHaskellDepends = [ base ]; description = "Parallel Parsing Processes"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "parsely" = callPackage @@ -193064,8 +193810,8 @@ self: { version = "0.1"; sha256 = "16sg32qs1kq184wk6d83z20b9firh1kjmysqwd2aqaiyq37zjyyb"; libraryHaskellDepends = [ base mtl parsec ]; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -193077,7 +193823,7 @@ self: { sha256 = "0k95nvgnl5820y094yfh7b868l0xd1diclm4kx9560p5rm02w5h3"; libraryHaskellDepends = [ base ]; description = "Lightweight package providing commonly useful parser combinators"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "parser-combinators-tests" = callPackage @@ -193099,8 +193845,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Test suite of parser-combinators"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -193116,8 +193862,8 @@ self: { aeson base bytestring haskell-src-exts text ]; description = "Prints Haskell parse trees in JSON"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -193132,8 +193878,8 @@ self: { libraryHaskellDepends = [ base containers mtl ]; testHaskellDepends = [ base containers hspec mtl ]; description = "An interface to create production rules using augmented grammars"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -193155,8 +193901,8 @@ self: { test-framework-quickcheck2 ]; description = "TH parser generator for splitting bytestring into fixed-width fields"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -193178,7 +193924,7 @@ self: { attoparsec base bytestring parsec QuickCheck quickcheck-instances ]; description = "Parsing combinators"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "parsers-megaparsec" = callPackage @@ -193195,8 +193941,8 @@ self: { base fail megaparsec mtl parsers semigroups text transformers ]; description = "`parsers` instances for Megaparsec"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -193220,8 +193966,8 @@ self: { array base binary bytestring containers deepseq mtl ]; description = "NMR-STAR file format parser"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -193233,8 +193979,8 @@ self: { sha256 = "0vbayvk989m85qfxxls74rn0v8ylb5l7lywp30sw2wybvi4r08lg"; libraryHaskellDepends = [ base bytestring text ]; description = "Monadic parser combinators derived from Parsec"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -193255,7 +194001,7 @@ self: { base QuickCheck tasty tasty-hunit tasty-quickcheck text ]; description = "Parser combinators with slicing, error recovery, and syntax highlighting"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "partage" = callPackage @@ -193273,8 +194019,8 @@ self: { ]; testHaskellDepends = [ base containers HUnit tasty tasty-hunit ]; description = "Parsing factorized"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -193286,7 +194032,7 @@ self: { sha256 = "1pgmiddwhk40bzhwznv6lwmxglsnp41z45qhpd5cm0nh2wmzgx5p"; libraryHaskellDepends = [ base ]; description = "A nullary type class for partial functions"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "partial-handler" = callPackage @@ -193297,7 +194043,7 @@ self: { sha256 = "0cf1748zyr07zv0ffi44rf5b9f7ygdybbdcl7m7c0zj14kq2miwl"; libraryHaskellDepends = [ base ]; description = "A composable exception handler"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "partial-isomorphisms" = callPackage @@ -193308,7 +194054,7 @@ self: { sha256 = "0r51ykq6i11gzypv93bnw8pzn4zdyrabiiqfpbhpvs0rj6k1ymac"; libraryHaskellDepends = [ base template-haskell ]; description = "Partial isomorphisms"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "partial-lens" = callPackage @@ -193323,8 +194069,8 @@ self: { base comonad-transformers data-lens transformers ]; description = "Haskell 98 Partial Lenses"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -193342,7 +194088,7 @@ self: { test-framework-quickcheck2 ]; description = "Provides typeclass suitable for types admitting a partial order"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "partial-records" = callPackage @@ -193353,8 +194099,8 @@ self: { sha256 = "0vp5d0jdbk451a563a4hzkycyqh41w6plb39dfn0bv6li4a5qp8h"; libraryHaskellDepends = [ base template-haskell transformers ]; description = "Template haskell utilities for constructing records with default values"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -193367,7 +194113,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest hedgehog ]; description = "A partial binary associative operator"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "partial-semigroup-hedgehog" = callPackage @@ -193378,7 +194124,7 @@ self: { sha256 = "0n0j8xlrz66mzkvrsa083b9057n3rgbir7pwqxqycwzgj18g68s6"; libraryHaskellDepends = [ base hedgehog partial-semigroup ]; description = "Property testing for partial semigroups using Hedgehog"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "partial-semigroup-test" = callPackage @@ -193390,7 +194136,7 @@ self: { libraryHaskellDepends = [ partial-semigroup-hedgehog ]; doHaddock = false; description = "Testing utilities for the partial-semigroup package"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "partial-uri" = callPackage @@ -193402,7 +194148,7 @@ self: { libraryHaskellDepends = [ base network-uri ]; description = "Datatype for passing around unresolved URIs"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "partly" = callPackage @@ -193424,8 +194170,8 @@ self: { aeson base base64-bytestring binary bytestring QuickCheck vector ]; description = "Inspect, create, and alter MBRs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -193444,8 +194190,8 @@ self: { mwc-random pretty primitive process random ]; description = "Parallel code generation for hierarchical Bayesian modeling"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -193473,8 +194219,8 @@ self: { random ]; description = "a simple password manager"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -193495,8 +194241,8 @@ self: { passman-core resourcet text X11 yaml ]; description = "Deterministic password generator command line interface"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; }) {}; "passman-core" = callPackage @@ -193521,8 +194267,8 @@ self: { ]; doHaddock = false; description = "Deterministic password generator core"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; }) {}; "password" = callPackage @@ -193545,7 +194291,7 @@ self: { template-haskell text ]; description = "Hashing and checking of passwords"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "password-instances" = callPackage @@ -193568,7 +194314,7 @@ self: { template-haskell text ]; description = "typeclass instances for password package"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "passwords" = callPackage @@ -193579,8 +194325,8 @@ self: { sha256 = "0x345pfa28abj152kkr1afnaraf4r8pj0216ack79brxvdhlk6li"; libraryHaskellDepends = [ base containers MonadRandom random ]; description = "Password generation/validation library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -193597,8 +194343,8 @@ self: { ]; testHaskellDepends = [ base hspec microlens protolude ]; description = "PostgreSQL Abstract Syntax Tree Assember"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -193610,8 +194356,8 @@ self: { sha256 = "1425gzss5maqzrphrvvsw60lkapwg3wfjx10c59qkylx63k5ixjl"; libraryHaskellDepends = [ base HTTP network ]; description = "Interface to the past.is URL shortening service"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -193626,7 +194372,7 @@ self: { executableHaskellDepends = [ base bytestring mtl ]; description = "A simple command line pasting utility"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -193655,8 +194401,8 @@ self: { base directory QuickCheck tasty tasty-hunit tasty-quickcheck text ]; description = "Terminal-based presentations using Pandoc"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -193677,7 +194423,7 @@ self: { ]; testHaskellDepends = [ base directory filemanip filepath hlint ]; description = "Data structures for describing changes to other data structures"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "patch-combinators" = callPackage @@ -193689,7 +194435,7 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base ]; description = "A library for patching functions and data structures"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "patch-image" = callPackage @@ -193714,8 +194460,8 @@ self: { unordered-containers utility-ht vector ]; description = "Compose a big image from overlapping parts"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "patches-vector" = callPackage @@ -193733,8 +194479,8 @@ self: { base criterion doctest hspec QuickCheck vector ]; description = "Patches (diffs) on vectors: composable, mergeable, and invertible"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -193759,7 +194505,7 @@ self: { genvalidity-property hspec mtl QuickCheck validity ]; description = "Support for well-typed paths"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "path_0_8_0" = callPackage @@ -193781,8 +194527,8 @@ self: { genvalidity-property hspec mtl QuickCheck template-haskell validity ]; description = "Support for well-typed paths"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "path-binary-instance" = callPackage @@ -193793,7 +194539,7 @@ self: { sha256 = "19ck3ja66vcgl90wyw6r9d2h50kdv9gjs7sxjgciam6v6867vb0y"; libraryHaskellDepends = [ base binary path ]; description = "Binary instance for Path"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "path-dhall-instance" = callPackage @@ -193804,7 +194550,7 @@ self: { sha256 = "17igz9936lfivph9rr04075sp7ik5k8byljw2vj0zx8lnznjwn6a"; libraryHaskellDepends = [ base dhall either path text ]; description = "ToDhall and FromDhall instances for Path"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "path-extensions" = callPackage @@ -193815,7 +194561,7 @@ self: { sha256 = "0pvjb26arsj892addi9x26v8naislh87x6av70k8fjnsish3pnj5"; libraryHaskellDepends = [ base exceptions path ]; description = "Enumeration of common filetype extensions for use with the path library"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "path-extra" = callPackage @@ -193832,7 +194578,7 @@ self: { tasty-quickcheck text ]; description = "URLs without host information"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "path-io" = callPackage @@ -193852,7 +194598,7 @@ self: { unix-compat ]; description = "Interface to ‘directory’ package for users of ‘path’"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "path-like" = callPackage @@ -193863,7 +194609,7 @@ self: { sha256 = "1hr58zcgcybd34zzas5kf0jgcm5z2wdlbhskwj9233503nnlwkq9"; libraryHaskellDepends = [ base path ]; description = "PathLike, FileLike and DirLike type classes for the Path library"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "path-pieces" = callPackage @@ -193877,8 +194623,8 @@ self: { libraryHaskellDepends = [ base text time ]; testHaskellDepends = [ base hspec HUnit QuickCheck text ]; description = "Components of paths"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ psibi ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ psibi ]; }) {}; "path-text-utf8" = callPackage @@ -193891,7 +194637,7 @@ self: { base bytestring path safe-exceptions text ]; description = "Read and write UTF-8 text files"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "path-utils" = callPackage @@ -193902,7 +194648,7 @@ self: { sha256 = "0k6wfy8vzddfhxsd5zlbjd4397syqhdg6i8v49d218m0qqfhzkpj"; libraryHaskellDepends = [ base exceptions path split text ]; description = "Handful of simple utility functions for the path library"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "pathfinding" = callPackage @@ -193913,7 +194659,7 @@ self: { sha256 = "1d1vpkx4gl438b71mni80n46yrhz57z2hq2p9j2fkkpxj3k72y80"; libraryHaskellDepends = [ base containers ]; description = "pathfinding in grid and graphs"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "pathfindingcore" = callPackage @@ -193931,8 +194677,8 @@ self: { array base-noprelude bizzlelude tasty tasty-hunit ]; description = "A toy pathfinding library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -193944,7 +194690,7 @@ self: { sha256 = "04877061vp9fv5qd0cdazmn8dd1l0zsqpxvw1awvbzjyfzl31k1y"; libraryHaskellDepends = [ base bytestring random ]; description = "Pathological ByteStrings for testing"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "paths" = callPackage @@ -193962,7 +194708,7 @@ self: { time ]; description = "Library for representing and manipulating type-safe file paths"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pathtype" = callPackage @@ -193981,7 +194727,7 @@ self: { ]; testHaskellDepends = [ base random ]; description = "Type-safe replacement for System.FilePath etc"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pathwalk" = callPackage @@ -193993,7 +194739,7 @@ self: { libraryHaskellDepends = [ base directory filepath transformers ]; testHaskellDepends = [ base ]; description = "Path walking utilities for Haskell programs"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "patience" = callPackage @@ -194004,7 +194750,7 @@ self: { sha256 = "1i1b37lgi31c17yrjyf8pdm4nf5lq8vw90z3rri78hf0k66d0p3i"; libraryHaskellDepends = [ base containers ]; description = "Patience diff and longest increasing subsequence"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "patronscraper" = callPackage @@ -194017,8 +194763,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base HandsomeSoup hxt ]; description = "A webpage scraper for Patreon which dumps a list of patrons to a text file"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -194030,7 +194776,7 @@ self: { sha256 = "13q7bj19hd60rnjfc05wxlyck8llxy11z3mns8kxg197wxrdkhkg"; libraryHaskellDepends = [ base mtl ]; description = "Arrows for Pretty Printing"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "pattern-matcher" = callPackage @@ -194042,7 +194788,7 @@ self: { libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers mtl QuickCheck ]; description = "A library for compiling pattern-matching to decision trees"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pattern-trie" = callPackage @@ -194066,7 +194812,7 @@ self: { base bytestring containers criterion deepseq hashable text ]; description = "Pattern tries"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "patterns" = callPackage @@ -194083,7 +194829,7 @@ self: { ]; description = "Common patterns in message-oriented applications"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -194097,7 +194843,7 @@ self: { testHaskellDepends = [ base hspec vector ]; benchmarkHaskellDepends = [ base criterion mwc-random vector ]; description = "Greatest convex majorants and least concave minorants"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; }) {}; "paymill" = callPackage @@ -194109,7 +194855,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "This is an unofficial client for the Paymill API"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "paypal-adaptive-hoops" = callPackage @@ -194133,8 +194879,8 @@ self: { test-framework-hunit text ]; description = "Client for a limited part of PayPal's Adaptive Payments API"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -194151,8 +194897,8 @@ self: { mtl old-locale text time wai ]; description = "PayPal API, currently supporting \"ButtonManager\""; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -194169,8 +194915,8 @@ self: { http-types lens safe text time wreq ]; description = "A client to connect to PayPal's REST API (v1)"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -194186,8 +194932,8 @@ self: { base containers HTTP network process ]; description = "pastebin command line application"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -194207,8 +194953,8 @@ self: { ]; testHaskellDepends = [ base parsec tasty tasty-hunit ]; description = "Utility CLI for working with protobuf files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -194220,8 +194966,8 @@ self: { sha256 = "16dki82d9x6rpkbax090ax8ynwjxv31cvpzpy51ynq83kjg3v2z9"; libraryHaskellDepends = [ base hslua string-qq ]; description = "pbc for HsLua"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -194240,7 +194986,7 @@ self: { base binary byteable bytedump bytestring cryptohash utf8-string ]; description = "Haskell implementation of the PBKDF functions from RFC-2898"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pcap" = callPackage @@ -194251,7 +194997,7 @@ self: { sha256 = "0pydw62qqw61sxfd8x9vvwgpgl3zp6mqv8rm4c825ymzyipjxsg7"; libraryHaskellDepends = [ base bytestring network time ]; description = "A system-independent interface for user-level packet capture"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pcap-conduit" = callPackage @@ -194264,7 +195010,7 @@ self: { base bytestring conduit pcap transformers ]; description = "Conduit <-> libpcap"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pcap-enumerator" = callPackage @@ -194278,8 +195024,8 @@ self: { base bytestring enumerator pcap transformers ]; description = "Convert a pcap into an enumerator"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -194309,8 +195055,8 @@ self: { genvalidity-property hspec hspec-core lens QuickCheck resourcet text unliftio-core validity ]; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -194335,8 +195081,8 @@ self: { test-framework-hunit text vector ]; description = "PCD file loader"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -194354,8 +195100,8 @@ self: { transformers void ]; description = "A one file compiler for PCF"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -194370,8 +195116,8 @@ self: { base binary bytestring containers vector zlib ]; description = "PCF font parsing and rendering library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -194387,8 +195133,8 @@ self: { base bytestring pcf-font template-haskell vector ]; description = "Template Haskell for embedding text rendered using PCF fonts"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -194406,7 +195152,7 @@ self: { ]; testHaskellDepends = [ base doctest ]; description = "Haskell bindings to the PCG random number generator"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pcgen" = callPackage @@ -194421,7 +195167,7 @@ self: { testHaskellDepends = [ base hspec QuickCheck random ]; benchmarkHaskellDepends = [ base criterion deepseq random ]; description = "A fast, pseudorandom number generator"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "pcre-heavy" = callPackage @@ -194440,7 +195186,7 @@ self: { ]; testHaskellDepends = [ base doctest Glob ]; description = "A regexp (regex) library on top of pcre-light you can actually use"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "pcre-less" = callPackage @@ -194451,7 +195197,7 @@ self: { sha256 = "1widnpz4r2az96lwxrq21vm21j9j7b4sn86kqn2iih3xs2dpwqf9"; libraryHaskellDepends = [ array base regex-pcre ]; description = "Nicer interface to regex-pcre"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pcre-light" = callPackage @@ -194464,7 +195210,7 @@ self: { librarySystemDepends = [ pcre ]; testHaskellDepends = [ base bytestring containers HUnit mtl ]; description = "Portable regex library for Perl 5 compatible regular expressions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) pcre;}; "pcre-light-extra" = callPackage @@ -194475,8 +195221,8 @@ self: { sha256 = "1kjh36gglszd16rsh0rm2q5fxjlfipzld4hw0l2r23y0flbqkbvx"; libraryHaskellDepends = [ base bytestring pcre-light ]; description = "pcre-light extra functionality"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -194493,7 +195239,7 @@ self: { ]; testHaskellDepends = [ base bytestring HUnit regex-pcre-builtin ]; description = "Perl-like substitute and split for PCRE regexps"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pcre2" = callPackage @@ -194503,8 +195249,8 @@ self: { }: mkDerivation { pname = "pcre2"; - version = "1.1.3.1"; - sha256 = "1gm9dd2b2vsx24i3am66ml5xx951994h06p20b7fi22g8xh66hh2"; + version = "1.1.4"; + sha256 = "0wrw2slmkxxmw3zx85f9xv8374fsvhxsyf1l149fvkaqnvf19bs2"; libraryHaskellDepends = [ base containers mtl template-haskell text ]; @@ -194516,7 +195262,7 @@ self: { regex-pcre-builtin template-haskell text ]; description = "Regular expressions via the PCRE2 C library (included)"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "pdf-slave" = callPackage @@ -194541,8 +195287,8 @@ self: { shelly system-filepath text transformers yaml ]; description = "Tool to generate PDF from haskintex templates and YAML input"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -194576,8 +195322,8 @@ self: { base lens optparse-applicative text wai-extra warp ]; description = "Web service for pdf-slave tool"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {pdf-slave-server-api = null;}; @@ -194593,8 +195339,8 @@ self: { aeson base base64-bytestring bytestring containers text ]; description = "Template format definition for pdf-slave tool"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -194611,8 +195357,8 @@ self: { pdf-toolbox-core text ]; description = "A collection of tools for processing PDF files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -194629,8 +195375,8 @@ self: { transformers zlib-bindings ]; description = "A collection of tools for processing PDF files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -194649,8 +195395,8 @@ self: { transformers ]; description = "A collection of tools for processing PDF files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -194671,8 +195417,8 @@ self: { transformers ]; description = "Simple pdf viewer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -194705,7 +195451,7 @@ self: { base mtl old-locale process-extras text time time-locale-compat ]; description = "Wrapper around the pdfinfo command"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pdfname" = callPackage @@ -194722,8 +195468,8 @@ self: { base directory filepath optparse-applicative pdfinfo text ]; description = "Name a PDF file using information from the pdfinfo command"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -194739,8 +195485,8 @@ self: { base directory pdfinfo process temporary ]; description = "split two-column PDFs, so there is one column per page"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -194762,8 +195508,8 @@ self: { testHaskellDepends = [ base hspec text ]; testToolDepends = [ hspec-discover ]; description = "Extracts text from PDF using poppler"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {poppler-cpp = null;}; @@ -194780,8 +195526,8 @@ self: { base directory filepath ghc ghc-paths old-time process ]; description = "pdynload is polymorphic dynamic linking library"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -194797,8 +195543,8 @@ self: { base derive GLUT List template-haskell time TypeCompose ]; description = "Experiemental library for composable interactive programs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -194813,7 +195559,7 @@ self: { libraryHaskellDepends = [ base ]; description = "Peano numbers"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "peano-inf" = callPackage @@ -194824,7 +195570,7 @@ self: { sha256 = "1w8rvlckqcy41ciq2csb2nf83l969nwvvrrlm0x1yzf5i6ibg33b"; libraryHaskellDepends = [ base containers lazysmallcheck ]; description = "Lazy Peano numbers including observable infinity value"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pec" = callPackage @@ -194848,8 +195594,8 @@ self: { old-time process shake syb uniplate wl-pprint ]; description = "pec embedded compiler"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -194862,8 +195608,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base binary bytestring containers ]; description = "Parser for PE/COFF format"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -194884,8 +195630,8 @@ self: { QuickCheck tasty tasty-hunit tasty-quickcheck text ]; description = "An implementation of Pedersen commitment schemes"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -194899,8 +195645,8 @@ self: { editedCabalFile = "1434n6ncyyryjqzn3xcg73nwvcr6si7cnf2k8g2qrp0xmrq0nx8b"; libraryHaskellDepends = [ array base binary containers ]; description = "A pedestrian implementation of directed acyclic graphs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -194918,8 +195664,8 @@ self: { base containers filepath haskeline logict mtl parsec ]; description = "a lazy non-deterministic concatenative programming language"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -194938,8 +195684,8 @@ self: { template-haskell ]; description = "The Parser Generator for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -194957,8 +195703,8 @@ self: { QuickCheck ]; description = "Package to solve the Generalized Pell Equation"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -194977,7 +195723,7 @@ self: { test-framework-hunit test-framework-quickcheck2 ]; description = "Privacy Enhanced Mail (PEM) format reader and writer"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pencil" = callPackage @@ -195000,8 +195746,8 @@ self: { base doctest mtl text unordered-containers ]; description = "Static site generator"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -195013,7 +195759,7 @@ self: { sha256 = "12c5bzn3ac8783lny56n7rd8a1ik4ayfm1pr5v7gm7z53f7iz0qy"; libraryHaskellDepends = [ base containers parsec ]; description = "Tools for manipulating the Penn TreeBank"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "penntreebank-megaparsec" = callPackage @@ -195033,8 +195779,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Parser combinators for trees in the Penn Treebank format"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -195063,8 +195809,8 @@ self: { tasty tasty-quickcheck text time transformers ]; description = "Extensible double-entry accounting system"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -195083,8 +195829,8 @@ self: { pretty-show semigroups text transformers ]; description = "Deprecated - use penny package instead"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -195106,8 +195852,8 @@ self: { pretty-show rainbow semigroups split text time transformers ]; description = "Deprecated - use penny package instead"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -195143,8 +195889,8 @@ self: { tasty-hunit tasty-quickcheck tasty-smallcheck text uuid websockets ]; description = "Create beautiful diagrams just by typing mathematical notation in plain text"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -195156,8 +195902,8 @@ self: { sha256 = "1qy8hghpvp9idiq4ksn55n1dpx7823s7mjfvqfgrmhj0xl1b1y54"; libraryHaskellDepends = [ base binary bytestring haskell98 ]; description = "A parser for PE object files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -195177,8 +195923,8 @@ self: { base bytestring criterion network-uri ]; description = "Percent encode/decode ByteStrings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -195191,7 +195937,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base leancheck ]; description = "simple printf-style string formatting"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "perceptron" = callPackage @@ -195202,8 +195948,8 @@ self: { sha256 = "0w1vrsv43z92y6vsv9nzs2pjlqkhrxvzh53r2722530lzff34m78"; libraryHaskellDepends = [ base ]; description = "The perceptron learning algorithm"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -195231,8 +195977,8 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq filepath ]; benchmarkToolDepends = [ cpphs ]; description = "Find duplicate images"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -195262,7 +196008,7 @@ self: { ]; description = "Robust persistence for acyclic immutable data"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "peregrin" = callPackage @@ -195279,8 +196025,8 @@ self: { transformers ]; description = "Database migration support for use in other libraries"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -195297,8 +196043,8 @@ self: { ]; testHaskellDepends = [ base deepseq doctest rdtsc ]; description = "Low-level run time measurement"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -195321,8 +196067,8 @@ self: { text vector ]; description = "analysis example using perf"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -195352,7 +196098,7 @@ self: { vector ]; description = "Perfect minimal hashing implementation in native Haskell"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "perfect-vector-shuffle" = callPackage @@ -195378,7 +196124,7 @@ self: { vector ]; description = "Library for performing vector shuffles"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "perfecthash" = callPackage @@ -195401,8 +196147,8 @@ self: { unordered-containers ]; description = "A perfect hashing library for mapping bytestrings to values"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -195420,8 +196166,8 @@ self: { ]; testHaskellDepends = [ base doctest ]; description = "Perhaps, a monad"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -195443,7 +196189,7 @@ self: { ]; testHaskellDepends = [ base hspec HUnit text time ]; description = "Parse and format date periods, collapse and expand their text representations"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "periodic" = callPackage @@ -195458,8 +196204,8 @@ self: { executableHaskellDepends = [ base cereal hedis text time ]; testHaskellDepends = [ base cereal hedis hspec text time ]; description = "A reliable at-least-once periodic job scheduler backed by redis"; - license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -195477,7 +196223,7 @@ self: { periodic-common resource-pool transformers unliftio ]; description = "Periodic task system haskell client"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "periodic-client-exe" = callPackage @@ -195501,7 +196247,7 @@ self: { streaming-commons text unix-time unliftio warp websockets ]; description = "Periodic task system haskell client executables"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "periodic-common" = callPackage @@ -195517,7 +196263,7 @@ self: { text unliftio vector ]; description = "Periodic task system common"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "periodic-polynomials" = callPackage @@ -195528,7 +196274,7 @@ self: { sha256 = "1y7hj8cjdy5zpp7sg7yfaafcid7ssf23g4az6fwk2hrcrk97sf2i"; libraryHaskellDepends = [ base vector ]; description = "A library for working with periodic polynomials (very basic functionality)"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "periodic-server" = callPackage @@ -195557,8 +196303,8 @@ self: { unliftio ]; description = "Periodic task system haskell server"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -195575,8 +196321,8 @@ self: { base HUnit mtl test-framework test-framework-hunit ]; description = "permutation Applicative and Monad with many mtl instances"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -195591,8 +196337,8 @@ self: { setupHaskellDepends = [ base Cabal process ]; libraryHaskellDepends = [ base ghc-prim QuickCheck ]; description = "A library for permutations and combinations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -195616,8 +196362,8 @@ self: { tasty-smallcheck universe-base ]; description = "Permutations of finite sets"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -195629,8 +196375,8 @@ self: { sha256 = "03g1d9h26f1id0pnaigy9xy1cv5pvzqcjrwgzn75xnnbm5c3y9ch"; libraryHaskellDepends = [ base mtl ]; description = "Generalised permutation parser combinator"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -195648,7 +196394,7 @@ self: { test-framework-quickcheck2 text ]; description = "Minimal serialization library with focus on performance"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "persist-state" = callPackage @@ -195667,7 +196413,7 @@ self: { test-framework-quickcheck2 text ]; description = "Serialization library with state and leb128 encoding"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "persist2er" = callPackage @@ -195682,8 +196428,8 @@ self: { base optparse-applicative persistent text ]; description = "Transforms persist's quasi-quoted syntax into ER format"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -195704,7 +196450,7 @@ self: { ]; testHaskellDepends = [ base quickcheck-simple ]; description = "Binding between SQL database values and haskell records"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "persistable-types-HDBC-pg" = callPackage @@ -195724,7 +196470,7 @@ self: { base relational-query relational-query-HDBC text-postgresql ]; description = "HDBC and Relational-Record instances of PostgreSQL extended types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "persistent" = callPackage @@ -195751,8 +196497,8 @@ self: { text time transformers unordered-containers vector ]; description = "Type-safe, multi-backend data serialization"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ psibi ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ psibi ]; }) {}; "persistent-audit" = callPackage @@ -195781,8 +196527,8 @@ self: { persistent-sqlite persistent-template text time transformers ]; description = "Parses a Persist Model file and produces Audit Models"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -195794,8 +196540,8 @@ self: { sha256 = "09akf8vpkn2jskf1vf9mq96sakqzr7mfs8hhri8qlbkwx3i5nr6f"; libraryHaskellDepends = [ base cereal persistent text ]; description = "Helper functions for writing Persistent instances"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -195815,8 +196561,8 @@ self: { base bytestring hspec persistent-postgresql text ]; description = "Parse DATABASE_URL into configuration types for Persistent"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -195837,7 +196583,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Documentation DSL for persistent entities"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "persistent-equivalence" = callPackage @@ -195848,8 +196594,8 @@ self: { sha256 = "14nn01bbwskllbccgcnwnjwzyws6vppqv4l51n6pcvhwbphn18qz"; libraryHaskellDepends = [ array base diffarray ]; description = "Persistent equivalence relations (aka union-find)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -195861,7 +196607,7 @@ self: { sha256 = "1a9h7dfj9v47di4pwg3fwzwa550fh8wj2ri1w2kd8xbw9xym5kqk"; libraryHaskellDepends = [ base persistent text ]; description = "Derive Persistent classes generically"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "persistent-hssqlppp" = callPackage @@ -195877,8 +196623,8 @@ self: { persistent-template template-haskell text th-lift ]; description = "Declare Persistent entities using SQL SELECT query syntax"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -195890,7 +196636,7 @@ self: { sha256 = "0nmk138kv020aa0pw29l177rb6rji4rnmw4ndnkn1xvp8gh3w0yn"; libraryHaskellDepends = [ base bytestring iproute persistent ]; description = "Persistent instances for types in iproute"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "persistent-iproute" = callPackage @@ -195906,7 +196652,7 @@ self: { path-pieces persistent text ]; description = "Persistent instances for types in iproute"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "persistent-map" = callPackage @@ -195923,7 +196669,7 @@ self: { ]; description = "A thread-safe (STM) persistency interface for finite map types"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -195948,8 +196694,8 @@ self: { temporary text time yaml ]; description = "Manual migrations for the persistent library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -195977,8 +196723,8 @@ self: { unliftio-core ]; description = "Backend for the persistent library using mongoDB"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -196004,7 +196750,7 @@ self: { unliftio ]; description = "Monad transformer for the persistent API"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "persistent-mysql" = callPackage @@ -196030,7 +196776,7 @@ self: { unliftio-core ]; description = "Backend for the persistent library using MySQL database server"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "persistent-mysql-haskell" = callPackage @@ -196062,8 +196808,8 @@ self: { unliftio-core ]; description = "A pure haskell backend for the persistent library using MySQL database server"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -196074,8 +196820,8 @@ self: { }: mkDerivation { pname = "persistent-odbc"; - version = "0.2.1.0"; - sha256 = "058nmmqnl1pz7cyvfnbgid3kqbfl95g9xqgxs00z5fbkz5kwg5rl"; + version = "0.2.1.1"; + sha256 = "1c44mq7y20s0xk88azp2aa5wv8kn7g1blw987rp0chb03mljkwja"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -196084,8 +196830,8 @@ self: { transformers ]; description = "Backend for the persistent library using ODBC"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -196107,7 +196853,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Efficient and correct pagination for persistent or esqueleto queries"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "persistent-parser" = callPackage @@ -196119,7 +196865,7 @@ self: { libraryHaskellDepends = [ attoparsec base text ]; testHaskellDepends = [ attoparsec base hspec text ]; description = "Parse persistent model files"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "persistent-postgresql" = callPackage @@ -196149,7 +196895,7 @@ self: { vector ]; description = "Backend for the persistent library using postgresql"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "persistent-protobuf" = callPackage @@ -196165,8 +196911,8 @@ self: { protocol-buffers-descriptor template-haskell text ]; description = "Template-Haskell helpers for integrating protobufs with persistent"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -196189,7 +196935,7 @@ self: { resourcet template-haskell text unliftio ]; description = "Provides a quasi-quoter for raw SQL for persistent"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "persistent-ratelimit" = callPackage @@ -196200,8 +196946,8 @@ self: { sha256 = "05h7wlw82ljjic50qhzlldhidz344id1fpf0yaxrhqvx7wkgyi2m"; libraryHaskellDepends = [ base time yesod ]; description = "A library for rate limiting activities with a persistent backend"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -196225,7 +196971,7 @@ self: { time transformers utf8-string ]; description = "Backend for persistent library using Redis"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "persistent-refs" = callPackage @@ -196238,7 +196984,7 @@ self: { base containers mtl ref-fd transformers ]; description = "Haskell references backed by an IntMap for persistence and reversibility"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "persistent-relational-record" = callPackage @@ -196261,8 +197007,8 @@ self: { test-framework test-framework-hunit test-framework-th text time ]; description = "relational-record on persisten backends"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -196283,7 +197029,7 @@ self: { aeson base hspec http-api-data persistent QuickCheck text ]; description = "Database agnostic, spatially indexed type for geographic points"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "persistent-sqlite" = callPackage @@ -196314,8 +197060,8 @@ self: { time transformers unliftio-core ]; description = "Backend for the persistent library using sqlite3"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ psibi ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ psibi ]; }) {inherit (pkgs) sqlite;}; "persistent-template" = callPackage @@ -196342,8 +197088,8 @@ self: { template-haskell text ]; description = "Type-safe, non-relational, multi-backend persistence"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ psibi ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ psibi ]; }) {}; "persistent-template-classy" = callPackage @@ -196363,8 +197109,8 @@ self: { template-haskell text ]; description = "Generate classy lens field accessors for persistent models"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -196388,8 +197134,8 @@ self: { transformers-base unliftio unliftio-core unordered-containers ]; description = "Tests for Persistent"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -196414,7 +197160,7 @@ self: { resource-pool resourcet template-haskell text transformers ]; description = "Type safe access to multiple database schemata"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "persistent-vector" = callPackage @@ -196431,8 +197177,8 @@ self: { ]; benchmarkHaskellDepends = [ base containers criterion deepseq ]; description = "A persistent sequence based on array mapped tries"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -196462,8 +197208,8 @@ self: { utf8-string ]; description = "Backend for persistent library using Zookeeper"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -196480,8 +197226,8 @@ self: { unordered-containers ]; description = "Persona (BrowserID) library"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.agpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -196503,8 +197249,8 @@ self: { pem persona scotty shakespeare text time transformers unix wai x509 ]; description = "Persona (BrowserID) Identity Provider"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.agpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -196520,7 +197266,7 @@ self: { executableHaskellDepends = [ base process ]; description = "Proof Editor for Sequent Calculus"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -196547,8 +197293,8 @@ self: { x509-store ]; description = "Pretty Easy YOshikuni-made TLS library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -196566,8 +197312,8 @@ self: { crypto-pubkey-types monads-tf word24 x509 x509-store ]; description = "Codec parts of Pretty Easy YOshikuni-made TLS library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -196584,8 +197330,8 @@ self: { base QuickCheck test-framework test-framework-quickcheck2 ]; description = "A Pretty Extraordinary Zipper library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -196602,8 +197348,8 @@ self: { ]; testHaskellDepends = [ base HUnit text ]; description = "PostgreSQL database performance insights"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -196623,8 +197369,8 @@ self: { async base ini postgresql-simple random scotty text transformers ]; description = "REST service and library for creating/consuming temporary PostgreSQL databases"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.agpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -196636,7 +197382,7 @@ self: { sha256 = "06gqra5q20sc13slh5vz95bi1vq0ai43qfh7npcyv258zwv40qnh"; libraryHaskellDepends = [ base bytestring HTTP ]; description = "Client library for pg-harness-server"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }) {}; "pg-harness-server" = callPackage @@ -196655,8 +197401,8 @@ self: { warp ]; description = "REST service for creating temporary PostgreSQL databases"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.agpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -196682,8 +197428,8 @@ self: { resource-pool ]; description = "Initial project template from stack"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -196707,8 +197453,8 @@ self: { test-framework test-framework-quickcheck2 text ]; description = "Simple storage interface to PostgreSQL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -196730,8 +197476,8 @@ self: { postgresql-libpq postgresql-simple tmp-postgres ]; description = "A postgresql-simple transaction monad"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -196757,8 +197503,8 @@ self: { tagsoup text time transformers unix vector vty ]; description = "browse directory listing webpages and download files from them"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -196771,8 +197517,8 @@ self: { libraryHaskellDepends = [ base containers pretty ]; librarySystemDepends = [ gu pgf ]; description = "Bindings to the C version of the PGF runtime"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {gu = null; inherit (pkgs) pgf;}; @@ -196784,7 +197530,7 @@ self: { sha256 = "1s3kch1qsxrfzk9sa4b0jn9vzjhw7dvh1sajgnnz97gl5y0gydmv"; libraryHaskellDepends = [ array base bytestring parsec ]; description = "Pure Haskell implementation of PGM image format"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pgp-wordlist" = callPackage @@ -196801,7 +197547,7 @@ self: { tasty-quickcheck text ]; description = "Translate between binary data and a human-readable collection of words"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pgsql-simple" = callPackage @@ -196820,8 +197566,8 @@ self: { network old-locale pcre-light text time utf8-string ]; description = "A mid-level PostgreSQL client library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -196846,8 +197592,8 @@ self: { uuid vector ]; description = "Streaming Postgres bindings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -196860,7 +197606,7 @@ self: { libraryHaskellDepends = [ base transformers ]; benchmarkHaskellDepends = [ base criterion transformers vector ]; description = "Phantom State Transformer. Like State Monad, but without values."; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "phasechange" = callPackage @@ -196874,8 +197620,8 @@ self: { array base ghc-prim monad-st primitive vector ]; description = "Freezing, thawing, and copy elision"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -196890,8 +197636,8 @@ self: { base bytestring containers QuickCheck text ]; description = "Incremental multiple pass parser library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -196910,7 +197656,7 @@ self: { ]; testSystemDepends = [ pHash ]; description = "Haskell bindings to pHash, the open source perceptual hash library"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {pHash = null;}; "phizzle" = callPackage @@ -196926,7 +197672,7 @@ self: { ]; testHaskellDepends = [ base ]; description = "Library for checking if a given link is in a phishtank json file"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "phoityne" = callPackage @@ -196949,8 +197695,8 @@ self: { ]; testHaskellDepends = [ base hspec ]; description = "Deprecated - ghci debug viewer with simple editor"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -196973,7 +197719,7 @@ self: { text transformers ]; description = "Haskell Debug Adapter for Visual Studio Code"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "phone-metadata" = callPackage @@ -196987,7 +197733,7 @@ self: { testHaskellDepends = [ base hspec ]; description = "Phonenumber Metadata - NOTE: this is now deprecated!"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "phone-numbers" = callPackage @@ -197001,8 +197747,8 @@ self: { libraryToolDepends = [ c2hs ]; testHaskellDepends = [ base bytestring ]; description = "Haskell bindings to the libphonenumber library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {phonenumber = null; inherit (pkgs) protobuf;}; @@ -197020,8 +197766,8 @@ self: { HsOpenSSL http-conduit network time transformers ]; description = "Push notifications for Android and iOS"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -197033,7 +197779,7 @@ self: { sha256 = "0pjvjqxp37n901s16ys5qq5rzblamz8izvsd1992w06bcyrs36cw"; libraryHaskellDepends = [ array base containers regex-compat ]; description = "Phonetic codes: Soundex and Phonix"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "phonetic-languages-common" = callPackage @@ -197044,7 +197790,7 @@ self: { sha256 = "16m215rydybgn7wi5g3lh694z8zja2yr7b5p1rn33vgph2h5i8v7"; libraryHaskellDepends = [ base subG subG-instances vector ]; description = "A generalization of the uniqueness-periods-vector-common package"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "phonetic-languages-constaints" = callPackage @@ -197055,7 +197801,7 @@ self: { sha256 = "17n4m9zbl1h6g76wxrqxc3wwcd0m5qjmbiakvmvbcdv7nffc8xyh"; libraryHaskellDepends = [ base vector ]; description = "Constraints to filter the needed permutations"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "phonetic-languages-constraints" = callPackage @@ -197066,7 +197812,7 @@ self: { sha256 = "11m389rpz7ddvmkf5wrasc41kmy67fki234fjcgi1djk8iawp5pw"; libraryHaskellDepends = [ base subG subG-instances vector ]; description = "Constraints to filter the needed permutations"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "phonetic-languages-constraints-array" = callPackage @@ -197077,7 +197823,7 @@ self: { sha256 = "0mxn7xvggiii4cmpqmxx5mkk660z9q8s3n09kaqbmwszf5l86ynd"; libraryHaskellDepends = [ base subG ]; description = "Constraints to filter the needed permutations"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "phonetic-languages-examples" = callPackage @@ -197110,7 +197856,7 @@ self: { vector ]; description = "A generalization of the uniqueness-periods-vector-examples functionality"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "phonetic-languages-filters-array" = callPackage @@ -197121,7 +197867,7 @@ self: { sha256 = "0gi2hbdzb62s0hvx9j8w936bwiypv6xvh5xndmx4w1kf8r2lkagy"; libraryHaskellDepends = [ base filters-basic mmsyn2-array ]; description = "Allows to change the structure of the function output"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "phonetic-languages-general" = callPackage @@ -197137,7 +197883,7 @@ self: { subG vector ]; description = "A generalization of the uniqueness-periods-vector-general functionality"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "phonetic-languages-permutations" = callPackage @@ -197148,7 +197894,7 @@ self: { sha256 = "1y6izwnlphy528y6j4qg97pzi4nkw7j8vnlp63brnil9wd5765wa"; libraryHaskellDepends = [ base subG subG-instances vector ]; description = "Commonly used versions of the phonetic-languages-common package"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "phonetic-languages-permutations-array" = callPackage @@ -197159,7 +197905,7 @@ self: { sha256 = "1r8fwdphn3h9zpbrdbbgmqjwv6gwcl205ahr3kqwz6sfg78bflj4"; libraryHaskellDepends = [ base subG ]; description = "Permutations and universal set related functions for the phonetic-languages series"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "phonetic-languages-plus" = callPackage @@ -197178,7 +197924,7 @@ self: { uniqueness-periods-vector-stats ]; description = "Some common shared between different packages functions"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "phonetic-languages-properties" = callPackage @@ -197195,7 +197941,7 @@ self: { phonetic-languages-vector ukrainian-phonetics-basic vector ]; description = "A generalization of the uniqueness-periods-vector-properties package"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "phonetic-languages-rhythmicity" = callPackage @@ -197206,7 +197952,7 @@ self: { sha256 = "1ljblyk0m1fs3n2gj72w6gs62dxjk5gsn8x6p7fwlwhvaa316wm3"; libraryHaskellDepends = [ base ]; description = "Allows to estimate the rhythmicity metrices for the text (usually, the Ukrainian poetic one)"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "phonetic-languages-simplified-base" = callPackage @@ -197220,7 +197966,7 @@ self: { base phonetic-languages-permutations-array subG ]; description = "A simplified version of the phonetic-languages functionality common for some different realizations"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "phonetic-languages-simplified-common" = callPackage @@ -197235,7 +197981,7 @@ self: { base phonetic-languages-permutations subG subG-instances vector ]; description = "A simplified version of the phonetic-languages-functionality"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "phonetic-languages-simplified-examples-array" = callPackage @@ -197247,13 +197993,13 @@ self: { , phonetic-languages-simplified-base , phonetic-languages-simplified-examples-common , phonetic-languages-simplified-properties-array - , phonetic-languages-ukrainian-array, print-info, subG + , phonetic-languages-ukrainian-array, subG , ukrainian-phonetics-basic-array, uniqueness-periods-vector-stats }: mkDerivation { pname = "phonetic-languages-simplified-examples-array"; - version = "0.2.1.0"; - sha256 = "12ri0dv6ifswnp983asa0yyd7xl58ic22payxpri6653f58lkc4h"; + version = "0.3.0.0"; + sha256 = "17akng54rj8mn4ic9h1a806b03nqsigkyjggfskf4k1z9x84hdf4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -197275,34 +198021,30 @@ self: { phonetic-languages-rhythmicity phonetic-languages-simplified-base phonetic-languages-simplified-examples-common phonetic-languages-simplified-properties-array - phonetic-languages-ukrainian-array print-info subG + phonetic-languages-ukrainian-array subG ukrainian-phonetics-basic-array uniqueness-periods-vector-stats ]; description = "Helps to create Ukrainian texts with the given phonetic properties"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "phonetic-languages-simplified-examples-common" = callPackage ({ mkDerivation, base, heaps, mmsyn2-array , phonetic-languages-constraints-array - , phonetic-languages-simplified-common - , phonetic-languages-simplified-properties-lists-double , phonetic-languages-ukrainian-array, subG , ukrainian-phonetics-basic-array }: mkDerivation { pname = "phonetic-languages-simplified-examples-common"; - version = "0.1.0.0"; - sha256 = "0khgv7gycsr1qvc0d158ics2zmxvpybrr5k105ifq93y2qgcjqpa"; + version = "0.1.1.0"; + sha256 = "09h63czjpab863gi7806k1yw4q9mykszvvnb3zwbv9i97nfbvnfa"; libraryHaskellDepends = [ base heaps mmsyn2-array phonetic-languages-constraints-array - phonetic-languages-simplified-common - phonetic-languages-simplified-properties-lists-double phonetic-languages-ukrainian-array subG ukrainian-phonetics-basic-array ]; description = "Some commonly used by phonetic-languages-simplified* series functions"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "phonetic-languages-simplified-lists-examples" = callPackage @@ -197336,7 +198078,7 @@ self: { uniqueness-periods-vector-stats vector ]; description = "Simplified and somewhat optimized version of the phonetic-languages-examples"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "phonetic-languages-simplified-properties-array" = callPackage @@ -197346,14 +198088,14 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-properties-array"; - version = "0.1.1.0"; - sha256 = "0ildphgb5dd2s5hc4nr7ii9q9dzm0qa7vc2j4yjcis72jjzjx6nd"; + version = "0.1.2.0"; + sha256 = "1vxjq0ki7slmgp1sq481srnqzcy8sazl0c2vqdkyz0hsx5hi8lyv"; libraryHaskellDepends = [ base phonetic-languages-rhythmicity phonetic-languages-simplified-base ukrainian-phonetics-basic-array ]; description = "A generalization of the uniqueness-periods-vector-properties package"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "phonetic-languages-simplified-properties-lists" = callPackage @@ -197371,7 +198113,7 @@ self: { vector ]; description = "A generalization of the uniqueness-periods-vector-properties package"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "phonetic-languages-simplified-properties-lists-double" = callPackage @@ -197389,7 +198131,7 @@ self: { vector ]; description = "A generalization of the uniqueness-periods-vector-properties package"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "phonetic-languages-ukrainian" = callPackage @@ -197400,7 +198142,7 @@ self: { sha256 = "1z9frcwvy9njq1flk3hd2n4z8l4ad7f248w8h1pgjl1fbz6fv9dc"; libraryHaskellDepends = [ base mmsyn2 mmsyn5 vector ]; description = "Prepares Ukrainian text to be used as a phonetic language text"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "phonetic-languages-ukrainian-array" = callPackage @@ -197411,7 +198153,7 @@ self: { sha256 = "0h88qcdkckgn5cjyjiwvdxci8p04h12xr6jj5pjp4wzqyp6a5wcf"; libraryHaskellDepends = [ base mmsyn2-array mmsyn5 ]; description = "Prepares Ukrainian text to be used as a phonetic language text"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "phonetic-languages-vector" = callPackage @@ -197422,7 +198164,7 @@ self: { sha256 = "12mhmrfpdkxl00yfvy5jc74c7xnrj10pcydnn3xdhzj0fvp1zrll"; libraryHaskellDepends = [ base vector ]; description = "A generalization of the functionality of the uniqueness-periods-vector package"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "phooey" = callPackage @@ -197437,8 +198179,8 @@ self: { array base mtl reactive TypeCompose wx wxcore ]; description = "Functional user interfaces"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -197460,8 +198202,8 @@ self: { regex-posix time unix ]; description = "Rename photo image files based on EXIF shoot date"; - license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -197475,8 +198217,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base mtl SDL transformers ]; description = "A fractal viewer"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -197509,8 +198251,8 @@ self: { vector ]; description = "Utility for clustering phylogenetic trees in Newick format based on Robinson-Foulds distance"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -197522,7 +198264,7 @@ self: { sha256 = "07ysi2xq73g29pv4c3zvwq9zf1yjl2aszb1zkim49n00f5bxfnqc"; libraryHaskellDepends = [ base ]; description = "dimensions, quantities and constants"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pi-calculus" = callPackage @@ -197542,8 +198284,8 @@ self: { io-streams mtl network parsec RSA transformers ]; description = "Applied pi-calculus interpreter"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -197567,8 +198309,8 @@ self: { QuickCheck transformers unbound-generics ]; description = "Demo implementation of typechecker for dependently-typed language"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -197594,8 +198336,8 @@ self: { ]; testHaskellDepends = [ base ]; description = "Lightweight access control solution for the pijul vcs"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.agpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -197617,7 +198359,7 @@ self: { ]; executableHaskellDepends = [ base text ]; description = "Control an Adafruit character LCD and keypad kit on a Raspberry Pi"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pia-forward" = callPackage @@ -197637,8 +198379,8 @@ self: { xdg-basedir ]; description = "Set up port forwarding with the Private Internet Access VPN service"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -197661,8 +198403,8 @@ self: { base containers errors filepath network streams text transformers ]; description = "Remotely controlling Java Swing applications"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -197677,8 +198419,8 @@ self: { libraryHaskellDepends = [ base hmatrix JuicyPixels vector ]; executableHaskellDepends = [ base cli hmatrix ]; description = "simple image manipulation functions"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -197690,8 +198432,8 @@ self: { sha256 = "13c1n06v6mh9lyplfg0y1gdijk2mhxg4ln59v7i2z4j1y65y8cz9"; libraryHaskellDepends = [ base containers network stm text ]; description = "Instant StatsD in Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -197714,8 +198456,8 @@ self: { base containers mtl picosat pretty QuickCheck ]; description = "Utilities for symbolic predicate logic expressions"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -197748,8 +198490,8 @@ self: { parsec scientific text unordered-containers vector ]; description = "Fast combinator parsing for bytestrings and text"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -197762,7 +198504,7 @@ self: { libraryHaskellDepends = [ base containers transformers ]; testHaskellDepends = [ base containers random rdtsc transformers ]; description = "Bindings to the PicoSAT solver"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "pictikz" = callPackage @@ -197775,8 +198517,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base matrix transformers xml ]; description = "Converts a svg image to tikz code"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -197793,7 +198535,7 @@ self: { libraryHaskellDepends = [ base directory process unix ]; executableHaskellDepends = [ base ]; description = "Do signal handling and orphan reaping for Unix PID1 init processes"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "pidfile" = callPackage @@ -197804,7 +198546,7 @@ self: { sha256 = "0z0k923gb0b01r35x1qp4i1743mcn84cj3m12ss7jbxql768jigf"; libraryHaskellDepends = [ base unix ]; description = "Run an IO action protected by a pidfile"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pier" = callPackage @@ -197824,8 +198566,8 @@ self: { transformers unordered-containers yaml ]; description = "Yet another Haskell build system"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -197845,8 +198587,8 @@ self: { http-types process shake temporary text unix ]; description = "A library for writing forwards-declared build systems in haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -197860,8 +198602,8 @@ self: { isExecutable = true; libraryHaskellDepends = [ array base containers Imlib mtl ]; description = "A Piet interpreter"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -197878,8 +198620,8 @@ self: { base containers random random-shuffle ]; description = "dice game"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -197894,7 +198636,7 @@ self: { enableSeparateDataOutput = true; executableHaskellDepends = [ base mtl parsec text ]; description = "Yet another text-to-html converter"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pinboard" = callPackage @@ -197918,8 +198660,8 @@ self: { text time transformers unliftio unliftio-core unordered-containers ]; description = "Access to the Pinboard API"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -197940,35 +198682,55 @@ self: { transformers ]; description = "Back up the notes you've saved to Pinboard"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; "pinch" = callPackage - ({ mkDerivation, array, base, bytestring, containers, deepseq - , ghc-prim, hashable, hspec, hspec-discover, QuickCheck, semigroups - , text, unordered-containers, vector + ({ mkDerivation, array, async, base, bytestring, cereal, containers + , deepseq, ghc-prim, hashable, hspec, hspec-discover, network + , network-run, QuickCheck, semigroups, text, unordered-containers + , vector }: mkDerivation { pname = "pinch"; - version = "0.3.5.0"; - sha256 = "0bw7pfywa9qr6mrs340znqgzhg9yy8brh6v833wvk87sxjs8psdv"; - revision = "1"; - editedCabalFile = "1pl6cymb93lpjqsll87y7avwrw2w5k237gyyhqr05yfcsrjky8rp"; + version = "0.4.0.0"; + sha256 = "0xn79n8r42wl48fkbbplyhj4ykfky7kzzj96qb8qn0w1f70pi3i2"; libraryHaskellDepends = [ - array base bytestring containers deepseq ghc-prim hashable - semigroups text unordered-containers vector + array base bytestring cereal containers deepseq ghc-prim hashable + network semigroups text unordered-containers vector ]; libraryToolDepends = [ hspec-discover ]; testHaskellDepends = [ - base bytestring containers hspec QuickCheck semigroups text - unordered-containers vector + async base bytestring cereal containers hspec network network-run + QuickCheck semigroups text unordered-containers vector ]; testToolDepends = [ hspec-discover ]; description = "An alternative implementation of Thrift for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + + "pinch-gen" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath + , language-thrift, megaparsec, mtl, optparse-applicative + , prettyprinter, text, unordered-containers + }: + mkDerivation { + pname = "pinch-gen"; + version = "0.4.0.0"; + sha256 = "03fpcy2mdq83mpx4hv6x57csdwd07pkqcfqc0wd10zys77i75s46"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring directory filepath language-thrift megaparsec mtl + optparse-applicative prettyprinter text unordered-containers + ]; + description = "A code generator for the pinch Thrift library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -197987,8 +198749,8 @@ self: { transformers ]; description = "Write grammars, not parsers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -198012,7 +198774,7 @@ self: { base containers linear mtl sdl2 sdl2-image stm text ]; description = "Functional 2D Game Framework"; - license = stdenv.lib.licenses.zlib; + license = lib.licenses.zlib; }) {}; "ping" = callPackage @@ -198030,8 +198792,8 @@ self: { stm transformers ]; description = "icmp echo requests"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -198053,7 +198815,7 @@ self: { attoparsec base hspec iproute QuickCheck quickcheck-text ]; description = "Attoparsec parsers of ping utility"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "ping-wrapper" = callPackage @@ -198076,7 +198838,7 @@ self: { ]; testHaskellDepends = [ base ]; description = "Haskell Ping wrapper"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "pinpon" = callPackage @@ -198110,8 +198872,8 @@ self: { ]; testHaskellDepends = [ base doctest protolude ]; description = "A gateway for various cloud notification services"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -198123,8 +198885,8 @@ self: { sha256 = "0h6k00k85pn0jajk3rvvfnrfwlkllprhv00x0qd9zg9gg7lf7zkc"; libraryHaskellDepends = [ base enumerator pipes transformers ]; description = "A bidirectional bridge between pipes and iteratees"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -198141,7 +198903,7 @@ self: { base bytestring editor-open Hclip safe ]; description = "Open your editor, pipe the output to the system clipboard"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }) {}; "piped" = callPackage @@ -198162,7 +198924,7 @@ self: { ]; testToolDepends = [ tasty-discover ]; description = "Conduit with a smaller core"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pipeline" = callPackage @@ -198173,7 +198935,7 @@ self: { sha256 = "1bz7pfyfgc1cps5pwy31m5z3r6kxi5c4661qa60q333y0rd2y2j1"; libraryHaskellDepends = [ base transformers ]; description = "Continuation patterns"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pipes" = callPackage @@ -198196,7 +198958,7 @@ self: { base criterion mtl optparse-applicative transformers ]; description = "Compositional pipelines"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pipes-aeson" = callPackage @@ -198212,7 +198974,7 @@ self: { pipes-bytestring pipes-parse transformers ]; description = "Encode and decode JSON streams using Aeson and Pipes"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pipes-async" = callPackage @@ -198232,8 +198994,8 @@ self: { stm transformers-base ]; description = "A higher-level interface to using concurrency with pipes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -198253,7 +199015,7 @@ self: { text transformers ]; description = "Attoparsec and Pipes integration"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pipes-attoparsec-streaming" = callPackage @@ -198273,8 +199035,8 @@ self: { attoparsec base bytestring pipes-core transformers ]; description = "Streaming parsing in the pipes-core framework with Attoparsec"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -198290,8 +199052,8 @@ self: { base bytestring mtl parallel pipes streaming-commons ]; description = "Blocked GZip"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -198313,7 +199075,7 @@ self: { smallcheck tasty tasty-hunit tasty-smallcheck transformers ]; description = "Encode and decode binary streams using the pipes and binary libraries"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pipes-break" = callPackage @@ -198329,7 +199091,7 @@ self: { ]; testHaskellDepends = [ base bytestring mtl pipes QuickCheck ]; description = "Pipes to group by any delimiter (such as lines with carriage returns)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pipes-brotli" = callPackage @@ -198345,8 +199107,8 @@ self: { base bytestring pipes pipes-bytestring QuickCheck ]; description = "Brotli (RFC7932) compressors and decompressors for the Pipes package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -198363,7 +199125,7 @@ self: { transformers ]; description = "ByteString support for pipes"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pipes-bzip" = callPackage @@ -198386,7 +199148,7 @@ self: { ]; benchmarkHaskellDepends = [ base ]; description = "Streaming compression/decompression via pipes"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) bzip2;}; "pipes-cacophony" = callPackage @@ -198402,8 +199164,8 @@ self: { libraryHaskellDepends = [ base bytestring cacophony pipes ]; testHaskellDepends = [ base hlint ]; description = "Pipes for Noise-secured network connections"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -198418,7 +199180,7 @@ self: { libraryHaskellDepends = [ base lens mtl pipes pipes-extras ]; testHaskellDepends = [ base hspec pipes transformers ]; description = "Allows instances for Category, Arrow and ArrowChoice for Pipes"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pipes-cborg" = callPackage @@ -198439,7 +199201,7 @@ self: { tasty tasty-quickcheck transformers ]; description = "Encode and decode cborg streams using the pipes and cborg libraries"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pipes-cellular" = callPackage @@ -198450,7 +199212,7 @@ self: { sha256 = "0j0ayzvc9k3fmd9j37p41z50nqp4hwyywashcvng23qgp7m4ahdc"; libraryHaskellDepends = [ base bytestring data-cell pipes ]; description = "Pipes-based combinators for cellular data processing"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pipes-cellular-csv" = callPackage @@ -198464,7 +199226,7 @@ self: { base bytestring data-cell pipes pipes-cellular ]; description = "Efficient pipes-based cellular CSV codec"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pipes-cereal" = callPackage @@ -198479,8 +199241,8 @@ self: { base bytestring cereal mtl pipes pipes-bytestring pipes-parse ]; description = "Encode and decode binary streams using the pipes and cereal libraries"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -198496,8 +199258,8 @@ self: { base bytestring cereal-plus errors mtl pipes pipes-bytestring text ]; description = "A streaming serialization library on top of \"pipes\" and \"cereal-plus\""; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -198515,7 +199277,7 @@ self: { async base bytestring pipes pipes-safe process stm unix ]; description = "Streaming to and from subprocesses using Pipes"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pipes-concurrency" = callPackage @@ -198533,7 +199295,7 @@ self: { ]; testHaskellDepends = [ async base pipes stm ]; description = "Concurrency for the pipes ecosystem"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pipes-conduit" = callPackage @@ -198544,8 +199306,8 @@ self: { sha256 = "1nzylhmi3f2m0xnqgx0m9g0p5pwl6xnidsz8ykzmv8wafrh60dh8"; libraryHaskellDepends = [ base conduit mtl pipes-core ]; description = "Conduit adapters"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -198561,8 +199323,8 @@ self: { base categories lifted-base monad-control transformers void ]; description = "Compositional pipelines"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -198574,8 +199336,8 @@ self: { sha256 = "1v2bm2cmzb6a7bmpv8byrb5x4k5pivp3s8ma6r6dwhldic294jgf"; libraryHaskellDepends = [ base courier pipes ]; description = "Pipes utilities for interfacing with the courier message-passing framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -198597,7 +199359,7 @@ self: { test-framework test-framework-hunit vector ]; description = "Fast, streaming csv parser"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "pipes-errors" = callPackage @@ -198608,8 +199370,8 @@ self: { sha256 = "1vbpchs3v08sc1rfa9fl89wzxg9ak823xjbkl0k37ycwwc36fn76"; libraryHaskellDepends = [ base errors pipes ]; description = "Integration between pipes and errors"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -198637,8 +199399,8 @@ self: { transformers zlib zlib-conduit zlib-enum ]; description = "Various basic utilities for Pipes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -198657,7 +199419,7 @@ self: { base HUnit pipes test-framework test-framework-hunit transformers ]; description = "Extra utilities for pipes"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pipes-fastx" = callPackage @@ -198672,7 +199434,7 @@ self: { attoparsec base bytestring pipes pipes-attoparsec pipes-bytestring ]; description = "Streaming parsers for Fasta and Fastq"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pipes-files" = callPackage @@ -198699,8 +199461,8 @@ self: { text transformers unix ]; description = "Fast traversal of directory trees using pipes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -198723,7 +199485,7 @@ self: { mtl pipes pipes-concurrency pipes-misc stm transformers ]; description = "Reactively combines Producers so that a value is yielded as soon as possible"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pipes-group" = callPackage @@ -198741,7 +199503,7 @@ self: { ]; testHaskellDepends = [ base doctest lens-family-core ]; description = "Group streams into substreams"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pipes-http" = callPackage @@ -198758,7 +199520,7 @@ self: { base bytestring http-client http-client-tls pipes ]; description = "HTTP client with pipes interface"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pipes-illumina" = callPackage @@ -198773,8 +199535,8 @@ self: { base bytestring directory filepath pipes pipes-bgzf ]; description = "Illumina NGS data processing"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -198788,7 +199550,7 @@ self: { editedCabalFile = "06vg9vlczmmlpvqnnwn12kyb9c741y50hl8ky0vvdlkwlb90zncq"; libraryHaskellDepends = [ base containers heaps pipes ]; description = "Interleave and merge streams of elements"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pipes-io" = callPackage @@ -198802,8 +199564,8 @@ self: { libraryHaskellDepends = [ base pipes pipes-parse ]; testHaskellDepends = [ base hspec pipes ]; description = "Stateful IO streams based on pipes"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -198821,7 +199583,7 @@ self: { pipes-safe text transformers transformers-base ]; description = "Kafka in the Pipes ecosystem"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "pipes-key-value-csv" = callPackage @@ -198844,8 +199606,8 @@ self: { QuickCheck reflection text transformers vinyl vinyl-utils ]; description = "Streaming processing of CSV files preceded by key-value pairs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -198862,7 +199624,7 @@ self: { base bytestring lens mtl pipes pipes-group QuickCheck ]; description = "Pipes for grouping by lines with carriage returns"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pipes-lzma" = callPackage @@ -198881,7 +199643,7 @@ self: { base bytestring pipes pipes-bytestring QuickCheck ]; description = "LZMA compressors and decompressors for the Pipes package"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pipes-misc" = callPackage @@ -198901,7 +199663,7 @@ self: { base hspec lens mmorph pipes pipes-concurrency stm transformers ]; description = "Miscellaneous utilities for pipes, required by glazier-tutorial"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pipes-mongodb" = callPackage @@ -198913,8 +199675,8 @@ self: { libraryHaskellDepends = [ base monad-control mongoDB pipes ]; testHaskellDepends = [ base monad-control mongoDB pipes text ]; description = "Stream results from MongoDB"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -198931,7 +199693,7 @@ self: { transformers ]; description = "Use network sockets together with the pipes library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pipes-network-tls" = callPackage @@ -198948,7 +199710,7 @@ self: { pipes-network pipes-safe tls transformers ]; description = "TLS-secured network connections support for pipes"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pipes-network-ws" = callPackage @@ -198961,7 +199723,7 @@ self: { base bytestring network-simple-ws pipes ]; description = "WebSockets support for pipes"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pipes-ordered-zip" = callPackage @@ -198973,7 +199735,7 @@ self: { 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; + license = lib.licenses.bsd3; }) {}; "pipes-p2p" = callPackage @@ -198990,8 +199752,8 @@ self: { network-simple-sockaddr pipes pipes-concurrency pipes-network ]; description = "P2P network nodes with pipes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -199010,8 +199772,8 @@ self: { network-simple-sockaddr pipes pipes-network pipes-p2p ]; description = "Examples using pipes-p2p"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -199023,7 +199785,7 @@ self: { sha256 = "1a87q6l610rhxr23qfzzzif3zpfjhw3mg5gfcyjwqac25hdq73yj"; libraryHaskellDepends = [ base pipes transformers ]; description = "Parsing infrastructure for the pipes ecosystem"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pipes-postgresql-simple" = callPackage @@ -199040,7 +199802,7 @@ self: { pipes-safe postgresql-simple stm text transformers ]; description = "Convert various postgresql-simple calls to work with pipes"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "pipes-protolude" = callPackage @@ -199062,8 +199824,8 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Alternate Prelude for the pipes ecosystem"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -199075,7 +199837,7 @@ self: { sha256 = "1xsb0cxksrrkv81yk9qb7b3g7niz3sc7sz0960hxn16hwjymkv5k"; libraryHaskellDepends = [ base mwc-random pipes vector ]; description = "Producers for handling randomness"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pipes-rt" = callPackage @@ -199089,8 +199851,8 @@ self: { libraryHaskellDepends = [ base mwc-random pipes time ]; executableHaskellDepends = [ base pipes time ]; description = "A few pipes to control the timing of yields"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -199113,8 +199875,8 @@ self: { QuickCheck tasty tasty-quickcheck text ]; description = "A simple interface for streaming data to and from Amazon S3"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -199131,7 +199893,7 @@ self: { transformers transformers-base ]; description = "Safety for the pipes ecosystem"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pipes-shell" = callPackage @@ -199151,8 +199913,8 @@ self: { pipes-safe process stm stm-chans text ]; description = "Create proper Pipes from System.Process"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -199166,8 +199928,8 @@ self: { base pipes pipes-safe sqlite-simple text ]; description = "Functions that smash Pipes and sqlite-simple together"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -199185,7 +199947,7 @@ self: { pipes-safe streaming-commons text transformers ]; description = "properly streaming text"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pipes-transduce" = callPackage @@ -199208,8 +199970,8 @@ self: { base doctest foldl free pipes tasty tasty-hunit text ]; description = "Interfacing pipes with foldl folds"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -199225,8 +199987,8 @@ self: { base monad-primitive pipes primitive transformers vector ]; description = "Various proxies for streaming data into vectors"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -199242,7 +200004,7 @@ self: { base blaze-builder bytestring http-types pipes transformers wai ]; description = "A port of wai-conduit for the pipes ecosystem"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "pipes-websockets" = callPackage @@ -199260,7 +200022,7 @@ self: { ]; executableHaskellDepends = [ base ]; description = "WebSockets in the Pipes framework"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pipes-zeromq4" = callPackage @@ -199277,8 +200039,8 @@ self: { base bytestring pipes pipes-safe semigroups zeromq4-haskell ]; description = "Pipes integration for ZeroMQ messaging"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -199299,7 +200061,7 @@ self: { tasty-hunit tasty-quickcheck ]; description = "Zlib and GZip compression and decompression for Pipes streams"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pisigma" = callPackage @@ -199318,8 +200080,8 @@ self: { mtl parsec text utf8-string ]; description = "A dependently typed core language"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -199342,8 +200104,8 @@ self: { base bytestring optparse-applicative text unordered-containers yaml ]; description = "Account management tool"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -199364,8 +200126,8 @@ self: { transformers ]; description = "Pitch tracking library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -199389,8 +200151,8 @@ self: { ]; testHaskellDepends = [ base hspec ]; description = "A library and a CLI tool for accessing Pivotal Tracker API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -199414,7 +200176,7 @@ self: { uri-encode vector ]; description = "Pixela client"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pixelated-avatar-generator" = callPackage @@ -199435,8 +200197,8 @@ self: { base bytestring hspec JuicyPixels QuickCheck ]; description = "A library and application for generating pixelated avatars"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -199461,7 +200223,7 @@ self: { base extra sdl2 sdl2-gfx sdl2-image sdl2-mixer sdl2-ttf text ]; description = "Haskell game engine like fantasy console"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "pkcs1" = callPackage @@ -199493,8 +200255,8 @@ self: { QuickCheck tasty tasty-hunit tasty-quickcheck transformers x509 ]; description = "PKCS#10 library"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -199507,8 +200269,8 @@ self: { libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring Cabal HUnit QuickCheck ]; description = "PKCS #7 padding in Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -199522,8 +200284,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base Cabal split ]; description = "Package dependency graph for installed packages"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -199543,8 +200305,8 @@ self: { http-directory simple-cmd simple-cmd-args text ]; description = "Package tree diff tool"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -199557,7 +200319,7 @@ self: { libraryHaskellDepends = [ base containers ]; description = "Implementation of the PKTree spatial index data structure"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "placeholders" = callPackage @@ -199568,7 +200330,7 @@ self: { sha256 = "0ih35n2pw5gr9ggj2xz5zfcs4bdk200fdw6q9hdy3xna7maphak5"; libraryHaskellDepends = [ base template-haskell ]; description = "Placeholders for use while developing Haskell code"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "plaid" = callPackage @@ -199599,7 +200361,7 @@ self: { microlens microlens-th pretty-simple QuickCheck text time wai ]; description = "Plaid.com api integration library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "plailude" = callPackage @@ -199610,8 +200372,8 @@ self: { sha256 = "13hqkz0p3c81d7v3qnbcf90cxyb15na9icfjch4hw0222i6kn21i"; libraryHaskellDepends = [ base bytestring mtl time unix ]; description = "plaimi's prelude"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -199632,8 +200394,8 @@ self: { tasty tasty-hunit transformers ]; description = "Applicative/Arrow for resource estimation and progress tracking"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -199652,8 +200414,8 @@ self: { ]; testHaskellDepends = [ base hspec path path-io ]; description = "Failure-tolerant file and directory editing"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -199670,8 +200432,8 @@ self: { deepseq ]; description = "A representation of planar graphs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -199695,8 +200457,8 @@ self: { unliftio-core ]; description = "Token Introspection for PlanB"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -199751,8 +200513,8 @@ self: { uuid-types vault vector vector-builder writer-cps-mtl ]; description = "Planet Mitchell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -199769,8 +200531,8 @@ self: { tasty-rerun weigh ]; description = "Planet Mitchell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -199782,8 +200544,8 @@ self: { sha256 = "049dqzxygj81kzb5zqpw8cc3ql1hakwl3j84dzqhrc6vk6r9a50q"; libraryHaskellDepends = [ adjunctions base protolude ]; description = "The core of a numeric prelude, taken from numhask"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -199797,8 +200559,8 @@ self: { base bytestring containers mtl utf8-string ]; description = "Simple templating library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -199822,8 +200584,8 @@ self: { ]; testHaskellDepends = [ base containers fgl hspec vector ]; description = "General Framework for compiler development"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -199847,7 +200609,7 @@ self: { attoparsec base bytestring filepath hspec text word8 ]; description = "Library and executable for working with playlist files"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "playlists-http" = callPackage @@ -199865,7 +200627,7 @@ self: { text transformers ]; description = "Library to glue together playlists and http-client"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "plex" = callPackage @@ -199883,7 +200645,7 @@ self: { async base bytestring deepseq hspec QuickCheck unix ]; description = "run a subprocess, combining stdout and stderr"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "plist" = callPackage @@ -199895,8 +200657,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base base64-bytestring bytestring hxt ]; description = "Generate and parse Mac OS X property list format"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -199920,8 +200682,8 @@ self: { text time ]; description = "Remote monad for editing plists"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -199942,7 +200704,7 @@ self: { ]; description = "Plivo API wrapper for Haskell"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "plocketed" = callPackage @@ -199955,8 +200717,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base optparse-applicative socketed ]; description = "plot data from stdin through socketed"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -199972,7 +200734,7 @@ self: { array base cairo colour hmatrix mtl pango transformers ]; description = "A plotting library, exportable as eps/pdf/svg/png or renderable with gtk"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "plot-gtk" = callPackage @@ -199983,8 +200745,8 @@ self: { sha256 = "1fq75kg8f1sm9bmn89w5c54arr2y1xv0lswbvnxc4rmfc98l82lw"; libraryHaskellDepends = [ base glib gtk hmatrix mtl plot process ]; description = "GTK plots and interaction with GHCi"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -200001,8 +200763,8 @@ self: { base cairo colour fixed-vector gtk hmatrix plot text vector ]; description = "A quick way to use Mathematica like Manipulation abilities"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -200016,8 +200778,8 @@ self: { base glib gtk3 hmatrix mtl plot process ]; description = "GTK3 plots and interaction with GHCi"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -200034,8 +200796,8 @@ self: { base colour gtk hmatrix plot text vector ]; description = "A plotting tool with Mathematica like Manipulation abilities"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -200054,7 +200816,7 @@ self: { ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "A lightweight plotting library, exporting to SVG"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "plot-light-examples" = callPackage @@ -200074,7 +200836,7 @@ self: { scientific text time ]; description = "Example binaries for plot-light"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "plotfont" = callPackage @@ -200102,7 +200864,7 @@ self: { microlens-th text time ]; description = "Haskell bindings to Plotly.js"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "ploton" = callPackage @@ -200121,7 +200883,7 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "A useful cli tool to draw figures"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "plots" = callPackage @@ -200146,8 +200908,8 @@ self: { semigroups split statistics time transformers vector ]; description = "Diagrams based plotting library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -200159,7 +200921,7 @@ self: { sha256 = "17vr3c9dnd1jabx66qih7z19mk0irrxzab51gl5gifcgdxlf4s3x"; libraryHaskellDepends = [ base curl split ]; description = "Plotserver API"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "plucky" = callPackage @@ -200171,7 +200933,7 @@ self: { libraryHaskellDepends = [ base transformers ]; testHaskellDepends = [ base mtl ]; description = "A library and technique for handling errors via plucking constraints"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "plugins" = callPackage @@ -200188,8 +200950,8 @@ self: { ghc-prim haskell-src process random split ]; description = "Dynamic linking for Haskell and C objects"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -200206,8 +200968,8 @@ self: { ]; testHaskellDepends = [ base directory process ]; description = "Automatic recompilation and reloading of haskell modules"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -200226,8 +200988,8 @@ self: { base QuickCheck tasty tasty-quickcheck tasty-th template-haskell ]; description = "Dynamic linking for embedded DSLs with staged compilation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -200239,8 +201001,8 @@ self: { sha256 = "1lih19zjz5yrrjvrgk8zv5xrvld57ykdxxhdrvhwh6bqyzzarqjj"; libraryHaskellDepends = [ base template-haskell ]; description = "Pointless plumbing combinators"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -200253,8 +201015,8 @@ self: { libraryHaskellDepends = [ base semigroups ]; testHaskellDepends = [ base hedgehog hedgehog-classes ]; description = "Plurality monad: Zero, one, or at least two"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -200267,8 +201029,8 @@ self: { libraryHaskellDepends = [ base bytestring containers ]; testHaskellDepends = [ base hspec ]; description = "Pluralize"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -200288,7 +201050,7 @@ self: { ]; executableHaskellDepends = [ base bytestring linear vector ]; description = "PLY file loader"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "plzwrk" = callPackage @@ -200307,8 +201069,8 @@ self: { ]; testHaskellDepends = [ base hspec mtl text unordered-containers ]; description = "A front-end framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -200324,8 +201086,8 @@ self: { array base binary-file bytestring monads-tf template-haskell zlib ]; description = "read/write png file"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -200342,8 +201104,8 @@ self: { array base bytestring haskell98 mtl parsec zlib ]; description = "Pure Haskell loader for PNG images"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -200356,8 +201118,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ array base bytestring mtl parsec zlib ]; description = "Pure Haskell loader for PNG images"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -200369,7 +201131,7 @@ self: { sha256 = "0h6wsqv6c36cmk30gs3rjdjbxxq9zih49pmzhj2dh9nyxsqbj2yw"; libraryHaskellDepends = [ base bytestring ]; description = "PNM image format header parsing and pretty printing"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pocket" = callPackage @@ -200384,8 +201146,8 @@ self: { aeson base bytestring exceptions http-conduit http-types text ]; description = "Bindings for the Pocket API"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -200420,8 +201182,8 @@ self: { hspec-test-sandbox shakespeare test-sandbox text transformers ]; description = "Multi-backend (zookeeper and sqlite) DNS Server using persistent-library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -200440,8 +201202,8 @@ self: { ]; testToolDepends = [ markdown-unlit ]; description = "Point octree, with bounding boxes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -200460,7 +201222,7 @@ self: { transformers-compat unordered-containers ]; description = "Pointed and copointed data"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pointedalternative" = callPackage @@ -200471,8 +201233,8 @@ self: { sha256 = "12l380hgl17l0jxdx38kipvnip6gz4p9n27n03h9q37k5qhzjfha"; libraryHaskellDepends = [ base mtl semigroups transformers ]; description = "Alternative done right"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -200484,7 +201246,7 @@ self: { sha256 = "16xsrzqql7i4z6a3xy07sqnbyqdmcar1jiacla58y4mvkkwb0g3l"; libraryHaskellDepends = [ base binary ]; description = "A zipper-like comonad which works as a list, tracking a position"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pointfree" = callPackage @@ -200509,7 +201271,7 @@ self: { ]; description = "Tool for refactoring expressions into pointfree form"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "pointfree-fancy" = callPackage @@ -200531,8 +201293,8 @@ self: { testHaskellDepends = [ base HUnit QuickCheck ]; doHaddock = false; description = "Tool for refactoring expressions into pointfree form"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -200551,8 +201313,8 @@ self: { ]; executableHaskellDepends = [ base ]; description = "Pointful refactoring tool"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -200564,7 +201326,7 @@ self: { sha256 = "0m5hwd0mr7bmb2sbs1qa7l65xrr5h2wjznknsrk1ga08qkd5jp6h"; libraryHaskellDepends = [ base ]; description = "Some common point-free combinators"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pointless-haskell" = callPackage @@ -200575,8 +201337,8 @@ self: { sha256 = "0f0bnd6dyi1ancdxd2hkszshws9d8jz8iamz5pir0i4nsj69mqyx"; libraryHaskellDepends = [ base GHood process syb ]; description = "Pointless Haskell library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -200592,8 +201354,8 @@ self: { base containers derive pointless-haskell process QuickCheck ]; description = "Pointless Lenses library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -200609,8 +201371,8 @@ self: { base containers mtl pointless-haskell pointless-lenses process ]; description = "Pointless Rewrite library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -200642,8 +201404,8 @@ self: { unboxing-vector unordered-containers vector ]; description = "Discord verification bot"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -200660,8 +201422,8 @@ self: { proto-lens text ]; description = "Haskell types for the Pokemon Go protobuf protocol"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -200674,8 +201436,8 @@ self: { libraryHaskellDepends = [ array base mtl random vector ]; librarySystemDepends = [ poker-eval ]; description = "Binding to libpoker-eval"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {poker-eval = null;}; @@ -200693,8 +201455,8 @@ self: { HTTP http-client http-conduit http-types strict text time ]; description = "PokitDok Platform API Client for Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -200706,7 +201468,7 @@ self: { sha256 = "1f0anpxc57vxa5z0x4wrfay0g1sw2qwnz5nkz74y9vmh8vd99kkh"; libraryHaskellDepends = [ base ]; description = "Complex numbers in polar form"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "polar-configfile" = callPackage @@ -200718,8 +201480,8 @@ self: { libraryHaskellDepends = [ base containers mtl parsec ]; testHaskellDepends = [ base containers HUnit MissingH mtl parsec ]; description = "Fork of ConfigFile for Polar Game Engine"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -200732,8 +201494,8 @@ self: { libraryHaskellDepends = [ base containers lens mtl ]; testHaskellDepends = [ base containers hspec ]; description = "High-level shader compiler framework"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -200752,8 +201514,8 @@ self: { text-binary transformers ]; description = "A library for manipulating the historical dictionary of Polish (deprecated)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -200779,7 +201541,7 @@ self: { base Cabal directory filepath hedgehog hspec relude text ]; description = "Haskell PVP version adviser"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "polimorf" = callPackage @@ -200790,7 +201552,7 @@ self: { sha256 = "0pdz9fwqdwhqm1l81jnji3nm8y51dmfg5i84ggp8gmqfsiczvbj3"; libraryHaskellDepends = [ base binary containers text ]; description = "Handling the PoliMorf dictionary"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "poll" = callPackage @@ -200801,7 +201563,7 @@ self: { sha256 = "0agdl2bxw7ca05kqyc8dix4kvjdh67i91hn1scmcngjd3gz8gzmr"; libraryHaskellDepends = [ base enumset utility-ht ]; description = "Bindings to poll.h"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "poly" = callPackage @@ -200825,7 +201587,7 @@ self: { base deepseq gauge mod semirings vector ]; description = "Polynomials"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "poly-arity" = callPackage @@ -200836,7 +201598,7 @@ self: { sha256 = "0afxrwq5is4l954kmlqm76g0zpy4jw6vvx2275q8xph4zr2ac46b"; libraryHaskellDepends = [ base constraints ]; description = "Tools for working with functions of undetermined arity"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "poly-cont" = callPackage @@ -200847,8 +201609,8 @@ self: { sha256 = "05pkz6v2xyva73ibb5v97c7fh5zjpvkhahfgnnxycrlnsag5ckgy"; libraryHaskellDepends = [ base mtl transformers ]; description = "Poly-kinded continuations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -200860,8 +201622,8 @@ self: { sha256 = "044xsfpxwp3h7vsx86y2d099qmgiiknslmh3jjfnbr2qy9aj73r6"; libraryHaskellDepends = [ base lens ]; description = "This package provides abstraction for polymorphic controls, like PolyMonads or PolyApplicatives"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -200873,7 +201635,7 @@ self: { sha256 = "1csi81i0j3hk2gsc3c0rx939i67b0mj2pi064giw20yspqqjrp27"; libraryHaskellDepends = [ base requirements ]; description = "Polykinded extensible records"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "polyToMonoid" = callPackage @@ -200884,7 +201646,7 @@ self: { sha256 = "068acarrpd66682yjscm6l5k9kj9p8zxbf3hi76kz7gvkhkbsjj8"; libraryHaskellDepends = [ base ]; description = "Polyvariadic functions mapping to a given monoid"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "polydata" = callPackage @@ -200902,8 +201664,8 @@ self: { base constraint-manip hspec indextype polydata-core ]; description = "Wrap together data and it's constraints"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -200915,8 +201677,8 @@ self: { sha256 = "1wdi8a1s235knb98bmhfqvy7qbqvj804dx6rn846x8aj50drjjqv"; libraryHaskellDepends = [ base ]; description = "Core data definitions for the \"polydata\" package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -200929,7 +201691,7 @@ self: { libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base ]; description = "Polygonal maps"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "polynom" = callPackage @@ -200952,7 +201714,7 @@ self: { ]; description = "Polynomial types and operations"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "polynomial" = callPackage @@ -200974,8 +201736,8 @@ self: { test-framework-quickcheck2 vector vector-space ]; description = "Polynomials"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -201033,7 +201795,7 @@ self: { transformers type-errors type-errors-pretty unagi-chan ]; description = "Higher-order, low-boilerplate free monads"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "polysemy-RandomFu" = callPackage @@ -201054,8 +201816,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Experimental, RandomFu effect and interpreters for polysemy"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -201078,7 +201840,7 @@ self: { ]; description = "Polysemy effect for chronos"; license = "BSD-2-Clause-Patent"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -201094,7 +201856,7 @@ self: { base containers exceptions extra polysemy polysemy-zoo ]; description = "Extra Input and Output functions for polysemy.."; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "polysemy-fs" = callPackage @@ -201109,7 +201871,7 @@ self: { base bytestring path polysemy rio temporary text unliftio-path ]; description = "Low level filesystem operations for polysemy"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "polysemy-fskvstore" = callPackage @@ -201124,7 +201886,7 @@ self: { base bytestring path polysemy polysemy-zoo rio unliftio-path ]; description = "Run a KVStore as a filesystem in polysemy"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "polysemy-http" = callPackage @@ -201157,7 +201919,7 @@ self: { ]; description = "Polysemy effect for http-client"; license = "BSD-2-Clause-Patent"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -201174,7 +201936,7 @@ self: { unliftio-path ]; description = "Run a KVStore as a single json file in polysemy"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "polysemy-methodology" = callPackage @@ -201189,8 +201951,8 @@ self: { base co-log-polysemy polysemy polysemy-plugin polysemy-zoo ]; description = "Domain modelling algebra for polysemy"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -201207,8 +201969,8 @@ self: { polysemy-vinyl vinyl ]; description = "Functions for using polysemy-methodology with composite"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -201220,8 +201982,8 @@ self: { sha256 = "1ym2da08wy5pbdijrvn769w644dyma8hc010f8phqjnpkhq4j0z5"; libraryHaskellDepends = [ base optics polysemy polysemy-zoo ]; description = "Optics for Polysemy"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -201237,8 +201999,8 @@ self: { base path polysemy polysemy-extra polysemy-plugin ]; description = "Polysemy versions of Path functions"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -201262,7 +202024,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Disambiguate obvious uses of effects"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "polysemy-resume" = callPackage @@ -201282,7 +202044,7 @@ self: { ]; description = "Polysemy error tracking"; license = "BSD-2-Clause-Patent"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -201307,7 +202069,7 @@ self: { ]; description = "Polysemy effects for testing"; license = "BSD-2-Clause-Patent"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -201332,7 +202094,7 @@ self: { ]; description = "Polysemy effect for time"; license = "BSD-2-Clause-Patent"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -201347,7 +202109,7 @@ self: { libraryHaskellDepends = [ base formatting path path-utils polysemy text turtle ]; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "polysemy-vinyl" = callPackage @@ -201358,7 +202120,7 @@ self: { sha256 = "1545a125bfgi5314dxhak5dnx9h5kwanzgbp1f88f96hlxik1rjh"; libraryHaskellDepends = [ base polysemy polysemy-extra vinyl ]; description = "Functions for mapping vinyl records in polysemy"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "polysemy-webserver" = callPackage @@ -201379,7 +202141,7 @@ self: { polysemy-plugin text wai wai-websockets warp websockets ]; description = "Start web servers from within a Polysemy effect stack"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "polysemy-zoo" = callPackage @@ -201403,7 +202165,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Experimental, user-contributed effects and interpreters for polysemy"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "polyseq" = callPackage @@ -201423,8 +202185,8 @@ self: { ]; executableHaskellDepends = [ cgi free-theorems utf8-string xhtml ]; description = "Taming Selective Strictness"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -201438,7 +202200,7 @@ self: { base containers deepseq polyparse tagsoup ]; description = "Online XML parsing with polyparse and tagsoup"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "polytypeable" = callPackage @@ -201449,8 +202211,8 @@ self: { sha256 = "0vb2adm97ypi553lsjz7333q3dg9fmi0incrxlikqixk0f3ajaq8"; libraryHaskellDepends = [ base ]; description = "Typeable for polymorphic types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -201462,8 +202224,8 @@ self: { sha256 = "1hbpamgqsmsjkzjjva15f566yra77hwasp88b6y68nx9qa36a821"; libraryHaskellDepends = [ base haskell98 polytypeable ]; description = "Utilities for polytypeable"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -201478,7 +202240,7 @@ self: { libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base ]; description = "Creation and application of polyvariadic functions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pomaps" = callPackage @@ -201503,8 +202265,8 @@ self: { base criterion deepseq lattices random vector ]; description = "Maps and sets of partial orders"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -201523,8 +202285,8 @@ self: { process time unix wx wxcore ]; description = "pomodoro timer"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -201548,8 +202310,8 @@ self: { ]; testHaskellDepends = [ base hspec protolude ]; description = "Initial project template from stack"; - license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -201561,8 +202323,8 @@ self: { sha256 = "1nq4z063g429hxwf4vbyyr2b2s7sn325m0h6ggf793inlj48ci0h"; libraryHaskellDepends = [ base mtl ]; description = "PEG parser combinator"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -201580,8 +202342,8 @@ self: { ]; testHaskellDepends = [ base hspec network QuickCheck ]; description = "A simple embedded pingable server that runs in the background"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -201601,7 +202363,7 @@ self: { ]; description = "Extended Personal Media Network (XPMN) media server"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "pontarius-xmpp" = callPackage @@ -201639,8 +202401,8 @@ self: { ]; benchmarkHaskellDepends = [ base criterion ]; description = "An XMPP client library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -201657,7 +202419,7 @@ self: { ]; description = "XEPs implementation on top of pontarius-xmpp"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "pontarius-xpmn" = callPackage @@ -201673,7 +202435,7 @@ self: { ]; description = "Extended Personal Media Network (XPMN) library"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "pony" = callPackage @@ -201686,7 +202448,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base ]; description = "Can I have a pony?"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pool" = callPackage @@ -201699,8 +202461,8 @@ self: { editedCabalFile = "0lf9m19hl5asyb85xc8h34kh0iqpfdpwzil4lm5lskvn4fbi77n7"; libraryHaskellDepends = [ base monad-control transformers ]; description = "Thread-safe resource pools. (deprecated)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -201718,8 +202480,8 @@ self: { base monad-control resource-pool resourcet transformers ]; description = "Resource pool allocations via ResourceT. (deprecated)"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -201738,7 +202500,7 @@ self: { utility-ht ]; description = "Run jobs on a limited number of threads and support data dependencies"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pop3-client" = callPackage @@ -201750,8 +202512,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base mtl network ]; description = "POP3 Client Library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -201765,7 +202527,7 @@ self: { libraryHaskellDepends = [ base directory haskell98 unix ]; description = "popenhs is a popen-like library for Haskell"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -201787,8 +202549,8 @@ self: { testHaskellDepends = [ base containers hspec QuickCheck store ]; testToolDepends = [ hspec-discover ]; description = "Static key-value storage backed by poppy"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -201809,8 +202571,8 @@ self: { libraryPkgconfigDepends = [ gdk-pixbuf gtk2 pango poppler_gi ]; libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the Poppler"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) gdk-pixbuf; inherit (pkgs) gtk2; inherit (pkgs) pango; inherit (pkgs) poppler_gi;}; @@ -201823,7 +202585,7 @@ self: { sha256 = "06z723fgqwvcxgxy63pqwmjb6xkcl69xmdry117f0i5rhy0aix3y"; libraryHaskellDepends = [ base ]; description = "Empty Cabal package"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "porcupine-core" = callPackage @@ -201865,8 +202627,8 @@ self: { unliftio-core unordered-containers url vector vinyl yaml zlib ]; description = "Express portable, composable and reusable data tasks and pipelines"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -201895,8 +202657,8 @@ self: { text transformers unordered-containers ]; description = "A location accessor for porcupine to connect to HTTP sources/sinks"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -201927,8 +202689,8 @@ self: { unordered-containers ]; description = "A location accessor for porcupine to connect to AWS S3 sources/sinks"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -201947,7 +202709,7 @@ self: { ]; executableHaskellDepends = [ base warp ]; description = "A minimalist HTTP server framework written on top of wai"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "port-utils" = callPackage @@ -201959,7 +202721,7 @@ self: { libraryHaskellDepends = [ base network ]; testHaskellDepends = [ async base hspec network stm transformers ]; description = "Utilities for creating and waiting on ports"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "portable-lines" = callPackage @@ -201970,7 +202732,7 @@ self: { sha256 = "1l94p3s56a3kfqc8fzqc52z12rhg3c8xsmgcw1i20dnl8aygalsh"; libraryHaskellDepends = [ base bytestring ]; description = "Alternative 'lines' implementation that understands CR-LF and CR"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "portable-template-haskell-lens" = callPackage @@ -201981,7 +202743,7 @@ self: { sha256 = "14xg0zdyml5jx8jbgrk7b3697qs2schxjrb9iviqi1hnkcaqq75q"; libraryHaskellDepends = [ base lens template-haskell ]; description = "Lenses for the AST of Template Haskell 2.11 and Template Haskell < 2.11"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "portager" = callPackage @@ -202000,8 +202762,8 @@ self: { ]; testHaskellDepends = [ base containers hspec mtl QuickCheck text ]; description = "DSL for configuring Gentoo portage"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -202015,7 +202777,7 @@ self: { librarySystemDepends = [ portaudio ]; description = "Haskell bindings for the PortAudio library"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) portaudio;}; "porte" = callPackage @@ -202032,8 +202794,8 @@ self: { base bytestring containers extensible-exceptions stringsearch ]; description = "FreeBSD ports index search and analysis tool"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -202045,7 +202807,7 @@ self: { sha256 = "12pvav3xx4mdjnvza15yhkdcphxlsjns2s1i66h2nfgbb9lc8h0q"; libraryHaskellDepends = [ base ]; description = "Implementation of the Porter stemming algorithm"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ports" = callPackage @@ -202057,7 +202819,7 @@ self: { libraryHaskellDepends = [ base haskell98 unix ]; description = "The Haskell Ports Library"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -202070,7 +202832,7 @@ self: { libraryHaskellDepends = [ base directory process ]; description = "Library to interact with port tools on FreeBSD"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "poseidon" = callPackage @@ -202092,8 +202854,8 @@ self: { text time unordered-containers uuid ]; description = "Simple extensible library to run SQL file against PostgreSQL database"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -202114,8 +202876,8 @@ self: { QuickCheck scientific text time unordered-containers uuid ]; description = "Extension of Poseidon library for Postgis (Spatial and Geographic objects for PostgreSQL)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -202127,7 +202889,7 @@ self: { sha256 = "034vlx889sgwvn7g2s1vl3w0nf1vs0c2c1gc0vn77wd9l1vw0hfg"; libraryHaskellDepends = [ base nats semigroups ]; description = "Positive integers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "positron" = callPackage @@ -202144,8 +202906,8 @@ self: { ]; testHaskellDepends = [ base ]; description = "Experiment"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -202163,8 +202925,8 @@ self: { ]; librarySystemDepends = [ acl ]; description = "Support for Posix ACL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) acl;}; @@ -202185,8 +202947,8 @@ self: { base primitive primitive-unlifted tasty tasty-hunit ]; description = "posix bindings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) systemd;}; @@ -202198,7 +202960,7 @@ self: { sha256 = "1462njrxsfb26xavpwji17p172bsy6ivicsjzfvh8sq60rqyzjv1"; libraryHaskellDepends = [ base ]; description = "POSIX error codes"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "posix-escape" = callPackage @@ -202209,7 +202971,7 @@ self: { sha256 = "0yrx8cr6qximfy0vh7qqljlkj27q9gksrnqmqbnj2hk5bsa5l48w"; libraryHaskellDepends = [ base ]; description = "Quote arguments to be passed through the Unix shell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "posix-filelock" = callPackage @@ -202221,7 +202983,7 @@ self: { libraryHaskellDepends = [ base transformers unix ]; description = "Nice wrapper around POSIX fcntl advisory locks"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "posix-paths" = callPackage @@ -202240,7 +203002,7 @@ self: { base bytestring criterion directory filepath process unix ]; description = "POSIX filepath/directory functionality"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "posix-pty" = callPackage @@ -202253,7 +203015,7 @@ self: { librarySystemDepends = [ util ]; testHaskellDepends = [ base bytestring process ]; description = "Pseudo terminal interaction with subprocesses"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {util = null;}; "posix-realtime" = callPackage @@ -202264,8 +203026,8 @@ self: { sha256 = "01yz9p66m8w5418mqrrbz33dib97pscw329382wh0bi75swvlb39"; libraryHaskellDepends = [ base bytestring unix ]; description = "POSIX Realtime functionality"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -202282,7 +203044,7 @@ self: { transformers-base unix ]; description = "Bindings to the POSIX socket API"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "posix-timer" = callPackage @@ -202293,7 +203055,7 @@ self: { sha256 = "01s9hd23xcgdnryi72vj635435ccryv98a911l0zipxmvq4d8ri8"; libraryHaskellDepends = [ base transformers-base unix ]; description = "Bindings to POSIX clock and timer functions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "posix-waitpid" = callPackage @@ -202306,8 +203068,8 @@ self: { editedCabalFile = "12amy5ss3myr4c8bl5k3qpx3y78sp4pw4jdzvcg5sncpq7np3hdh"; libraryHaskellDepends = [ base unix ]; description = "Low-level wrapping of POSIX waitpid(2)"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -202325,7 +203087,7 @@ self: { base directory process split time timerep transformers unix X11 ]; description = "Sleep tracker for X11, using XScreenSaver extension and manual input"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "possible" = callPackage @@ -202336,7 +203098,7 @@ self: { sha256 = "1r3xg8yni440h0yzcq5a4w27l3877y7bdvx70jf6agcyqhsl4ppj"; libraryHaskellDepends = [ base ]; description = "Three valued Data.Maybe"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "possibly" = callPackage @@ -202347,7 +203109,7 @@ self: { sha256 = "08pannfx1831xp4zj4q3qp64vjr208df83qdwvzzlrn9ffc9ikaj"; libraryHaskellDepends = [ base ]; description = "type Possibly a = Either String a"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "post-mess-age" = callPackage @@ -202358,7 +203120,7 @@ self: { sha256 = "0k6njm7fbj7y6bzqkfpdby4az13i2sqg7lacnn5ry2hkrfqrmxnh"; libraryHaskellDepends = [ base ]; description = "Send messages to a handle concurrently without getting them mixed"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "postcodes" = callPackage @@ -202369,8 +203131,8 @@ self: { sha256 = "1z0d5pl11jymd0jj1k50si35lq2af3y0apiyz6mbi25zl5x49bi8"; libraryHaskellDepends = [ aeson base bytestring HTTP ]; description = "A library that gets postcode information from the uk-postcodes.com"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -202389,8 +203151,8 @@ self: { base bytestring filepath postgresql-simple process ]; description = "Library for easily running embedded PostgreSQL server for tests"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -202407,7 +203169,7 @@ self: { ]; testHaskellDepends = [ base hspec ]; description = "An Options type representing options for postgres connections"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "postgres-tmp" = callPackage @@ -202418,8 +203180,8 @@ self: { sha256 = "1zx5inxczzlhyb5f89f92f0ngzln49qahzraqr6ksvi5r7n7gk86"; libraryHaskellDepends = [ base bytestring postgresql-simple text ]; description = "Create a temporary database that is deleted after performing some operation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -202452,8 +203214,8 @@ self: { time unordered-containers wai-extra websockets ]; description = "Middleware to map LISTEN/NOTIFY messages to Websockets"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -202483,7 +203245,7 @@ self: { ]; benchmarkHaskellDepends = [ criterion rerebase ]; description = "Encoders and decoders for the PostgreSQL's binary format"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "postgresql-common" = callPackage @@ -202499,7 +203261,7 @@ self: { attoparsec base bytestring postgresql-simple ]; description = "Library for sharing common PostgreSQL types across Haskell PostgreSQL libraries"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "postgresql-common-persistent" = callPackage @@ -202517,7 +203279,7 @@ self: { base bytestring persistent postgresql-common text ]; description = "Persistent compatibility for postgresql-common"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "postgresql-config" = callPackage @@ -202533,7 +203295,7 @@ self: { resource-pool time ]; description = "Types for easy adding postgresql configuration to your program"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "postgresql-connector" = callPackage @@ -202550,7 +203312,7 @@ self: { resourcet time transformers-base ]; description = "Initial project postgresql-connector from stack"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "postgresql-copy-escape" = callPackage @@ -202561,7 +203323,7 @@ self: { sha256 = "08ld3rqjjjhlikcv1cpxjqs8wlsjhvv7qq9fjb032hx6mvcqwz0i"; libraryHaskellDepends = [ base bytestring ]; description = "Format data to feed to a PostgreSQL COPY FROM statement"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "postgresql-cube" = callPackage @@ -202572,7 +203334,7 @@ self: { sha256 = "0jla8rxnrk995qxyp5dgwm2d6yrcafyz5mj7yqr6v5jyzh6b59c3"; libraryHaskellDepends = [ base bytestring postgresql-simple ]; description = "Cube support for postgresql-simple"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "postgresql-error-codes" = callPackage @@ -202583,7 +203345,7 @@ self: { sha256 = "1r1dv1pi1z16q0v1329g2j856j3afdlhv42qhgdabl9p4wyrvm76"; libraryHaskellDepends = [ bytestring ]; description = "PostgreSQL error codes"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "postgresql-libpq" = callPackage @@ -202597,7 +203359,7 @@ self: { librarySystemDepends = [ postgresql ]; testHaskellDepends = [ base bytestring ]; description = "low-level binding to libpq"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) postgresql;}; "postgresql-libpq-notify" = callPackage @@ -202614,7 +203376,7 @@ self: { tmp-postgres ]; description = "Minimal dependency PostgreSQL notifications library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "postgresql-lo-stream" = callPackage @@ -202630,8 +203392,8 @@ self: { postgresql-simple ]; description = "Utilities for streaming PostgreSQL LargeObjects"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -202649,8 +203411,8 @@ self: { ]; testHaskellDepends = [ base generics-sop hspec postgresql-simple ]; description = "Generic deserialization of PostgreSQL rows based on column names"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -202695,7 +203457,7 @@ self: { testHaskellDepends = [ base hspec ]; testToolDepends = [ hspec-discover ]; description = "Converter for question mark style and dollar sign style of PostgreSQL SQL"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "postgresql-pure" = callPackage @@ -202744,7 +203506,7 @@ self: { text time utf8-string vector ]; description = "pure Haskell PostgreSQL driver"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "postgresql-query" = callPackage @@ -202759,8 +203521,8 @@ self: { }: mkDerivation { pname = "postgresql-query"; - version = "3.8.0"; - sha256 = "1bk355kqsiyxn269bp5icf5s80p2bzxy08r8g8llainppjxnq8n8"; + version = "3.8.1"; + sha256 = "09lld8fibwn0brszpz040pr8q7b5wrpc9fzdw8pwf7gfsb02wvx1"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder bytestring containers data-default exceptions file-embed haskell-src-meta hreader hset @@ -202775,8 +203537,8 @@ self: { tasty-quickcheck tasty-th text time ]; description = "Sql interpolating quasiquote plus some kind of primitive ORM using it"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -202798,7 +203560,7 @@ self: { base basic-prelude optparse-applicative shelly text time ]; description = "PostgreSQL Schema Management"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "postgresql-simple" = callPackage @@ -202806,34 +203568,6 @@ self: { , bytestring, bytestring-builder, case-insensitive, containers , cryptohash-md5, filepath, hashable, HUnit, inspection-testing , Only, postgresql-libpq, scientific, tasty, tasty-golden - , tasty-hunit, template-haskell, text, time, transformers - , uuid-types, vector - }: - mkDerivation { - pname = "postgresql-simple"; - version = "0.6.3"; - sha256 = "193rh38gzgpy41y6826hs4zdp01xw2fpjncwm281cm1ibrmh68pq"; - libraryHaskellDepends = [ - aeson attoparsec base bytestring bytestring-builder - case-insensitive containers hashable Only postgresql-libpq - scientific template-haskell text time transformers uuid-types - vector - ]; - testHaskellDepends = [ - aeson base base16-bytestring bytestring case-insensitive containers - cryptohash-md5 filepath HUnit inspection-testing postgresql-libpq - tasty tasty-golden tasty-hunit text time vector - ]; - benchmarkHaskellDepends = [ base vector ]; - description = "Mid-Level PostgreSQL client library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "postgresql-simple_0_6_4" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base16-bytestring - , bytestring, bytestring-builder, case-insensitive, containers - , cryptohash-md5, filepath, hashable, HUnit, inspection-testing - , Only, postgresql-libpq, scientific, tasty, tasty-golden , tasty-hunit, template-haskell, text, time-compat, transformers , uuid-types, vector }: @@ -202854,8 +203588,7 @@ self: { ]; benchmarkHaskellDepends = [ base vector ]; description = "Mid-Level PostgreSQL client library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; }) {}; "postgresql-simple-bind" = callPackage @@ -202875,8 +203608,8 @@ self: { base bytestring hspec postgresql-simple text ]; description = "FFI-like bindings for PostgreSQL stored functions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -202892,7 +203625,7 @@ self: { base haskell-src-meta mtl parsec postgresql-simple template-haskell ]; description = "Interpolated SQL queries via quasiquotation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "postgresql-simple-migration" = callPackage @@ -202915,8 +203648,8 @@ self: { ]; testHaskellDepends = [ base bytestring hspec postgresql-simple ]; description = "PostgreSQL Schema Migrations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -202936,8 +203669,8 @@ self: { transformers ]; description = "Implementation of named parameters for `postgresql-simple` library"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -202961,7 +203694,7 @@ self: { optparse-applicative postgres-options postgresql-simple ]; description = "An optparse-applicative and envy parser for postgres options"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "postgresql-simple-queue" = callPackage @@ -202986,8 +203719,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "A PostgreSQL backed queue"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -202999,8 +203732,8 @@ self: { sha256 = "05plsdm4i4nw35pcbbk1yb91gpj6jq5hygsqijdmnsxyl9d6vbby"; libraryHaskellDepends = [ base generics-sop postgresql-simple ]; description = "Generic functions for postgresql-simple"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -203017,8 +203750,8 @@ self: { transformers typedquery utf8-string ]; description = "Typed extension for PostgreSQL simple"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -203039,7 +203772,7 @@ self: { base postgresql-simple tasty tasty-quickcheck ]; description = "Parse postgres:// url into ConnectInfo"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "postgresql-syntax" = callPackage @@ -203063,8 +203796,8 @@ self: { tasty-quickcheck ]; description = "PostgreSQL AST parsing and rendering"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -203078,7 +203811,7 @@ self: { base monad-control mtl postgresql-simple ]; description = "a transactional monad on top of postgresql-simple"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "postgresql-tx" = callPackage @@ -203089,7 +203822,7 @@ self: { sha256 = "1q8yh16wxgfdvr3090i395ba20lzv2iyq5sswrzm9slcbnan353d"; libraryHaskellDepends = [ base transformers ]; description = "A safe transaction monad for use with various PostgreSQL Haskell libraries"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "postgresql-tx-monad-logger" = callPackage @@ -203100,7 +203833,7 @@ self: { sha256 = "00gyhjfq13rknh4hpizmfizqv84b8l8ziik36gjyq1vsmfg5da43"; libraryHaskellDepends = [ base monad-logger postgresql-tx ]; description = "postgresql-tx interfacing for use with monad-logger"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "postgresql-tx-query" = callPackage @@ -203119,8 +203852,8 @@ self: { postgresql-tx-simple transformers transformers-base ]; description = "postgresql-tx interfacing for use with postgresql-query"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -203136,7 +203869,7 @@ self: { base bytestring postgresql-simple postgresql-tx transformers ]; description = "postgresql-tx interfacing for use with postgresql-simple"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "postgresql-tx-squeal" = callPackage @@ -203152,8 +203885,8 @@ self: { records-sop squeal-postgresql unliftio ]; description = "postgresql-tx interfacing for use with squeal-postgresql"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -203167,8 +203900,8 @@ self: { base postgresql-simple postgresql-tx-squeal ]; description = "Connection interop from postgresql-simple connections to postgresql-libpq connections"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -203197,7 +203930,7 @@ self: { base bytestring criterion network time tls ]; description = "PostgreSQL interface with compile-time SQL type checking, optional HDBC backend"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "postgresql-typed-lifted" = callPackage @@ -203213,8 +203946,8 @@ self: { postgresql-typed transformers-base ]; description = "postgresql-typed operations lifted to any instance of MonadBase or MonadBaseControl"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -203263,8 +203996,8 @@ self: { time transformers-base wai wai-extra ]; description = "REST API for any Postgres database"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -203300,8 +204033,8 @@ self: { wai-extra ]; description = "PostgREST extension to map LISTEN/NOTIFY messages to Websockets"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -203320,8 +204053,8 @@ self: { pipes-parse tls uuid ]; description = "SMTP server library to receive emails from within Haskell programs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -203340,8 +204073,8 @@ self: { http-types network-api-support text ]; description = "Library for postmarkapp.com HTTP Api"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -203358,8 +204091,8 @@ self: { http-streams io-streams text time ]; description = "Send email via Postmark using io-streams"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -203381,7 +204114,7 @@ self: { ]; description = "Postmaster ESMTP Server"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -203395,8 +204128,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base binary bytestring split ]; description = "Command line Dreamcast VMU filesystem toolset"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -203408,8 +204141,8 @@ self: { sha256 = "1hc7jp7q6mdqva40v0dppihp1bnl30h7vxnkawg0kmczq5p9js35"; libraryHaskellDepends = [ potoki-core ]; description = "Simple streaming in IO"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -203432,8 +204165,8 @@ self: { tasty-hunit tasty-quickcheck ]; description = "Streaming serialization"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -203456,8 +204189,8 @@ self: { tasty-hunit tasty-quickcheck ]; description = "Integration of \"potoki\" and \"conduit\""; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -203485,8 +204218,8 @@ self: { ]; benchmarkHaskellDepends = [ criterion rerebase ]; description = "Low-level components of \"potoki\""; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -203502,8 +204235,8 @@ self: { acquire base bytestring hasql potoki-core profunctors text vector ]; description = "Integration of \"potoki\" and \"hasql\""; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -203517,8 +204250,8 @@ self: { acquire base bytestring potoki-core zlib ]; description = "Streaming ZLib decompression"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -203535,7 +204268,7 @@ self: { JuicyPixels vector ]; description = "Trace bitmap images to paths using potrace"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }) {}; "potrace-diagrams" = callPackage @@ -203548,8 +204281,8 @@ self: { editedCabalFile = "1iwsxi5zkqqjf9wr460bqjpghcvjhpgqgk27a11ji6bpdf6gnhga"; libraryHaskellDepends = [ base diagrams-lib JuicyPixels potrace ]; description = "Potrace bindings for the diagrams library"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -203564,8 +204297,8 @@ self: { libraryHaskellDepends = [ base directory unix ]; executableHaskellDepends = [ base ]; description = "bindings for Griffin PowerMate USB"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -203577,8 +204310,8 @@ self: { sha256 = "0z3nqv8l9h0kwdaqb2vnk7vx5d0hmx02giv2k01llk7vznlkqqny"; libraryHaskellDepends = [ base ]; description = "Tools for PowerPC programs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -203592,7 +204325,7 @@ self: { libraryHaskellDepends = [ async base contravariant timespan ]; testHaskellDepends = [ async base hspec stm ]; description = "A flexible job queue with exchangeable backends"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "powerqueue-distributed" = callPackage @@ -203610,7 +204343,7 @@ self: { ]; testHaskellDepends = [ async base hspec powerqueue stm timespan ]; description = "A distributed worker backend for powerqueu"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "powerqueue-levelmem" = callPackage @@ -203636,8 +204369,8 @@ self: { ]; benchmarkSystemDepends = [ leveldb snappy ]; description = "A high performance in memory and LevelDB backend for powerqueue"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) leveldb; inherit (pkgs) snappy;}; @@ -203651,8 +204384,8 @@ self: { aws-simple base powerqueue text timespan ]; description = "A Amazon SQS backend for powerqueue"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -203664,7 +204397,7 @@ self: { sha256 = "0nzvxi1ybfxb1zqkbfqfic8j3mf3r6i2zdyjf7x41rz6m6lhqfcy"; libraryHaskellDepends = [ base mtl ]; description = "a tiny PPM image generator"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pprecord" = callPackage @@ -203675,8 +204408,8 @@ self: { sha256 = "1gpr6sndh3pc43f1aks7wq8h969bbj2rc01rvaq9pkdnwqlqr7r4"; libraryHaskellDepends = [ base boxes ]; description = "A library for pretty printing Records"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -203700,7 +204433,7 @@ self: { ]; testToolDepends = [ markdown-unlit ]; description = "Pretty Print containers in a tabular format"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "pqc" = callPackage @@ -203711,8 +204444,8 @@ self: { sha256 = "1n71qhlxn9js5cizyqdq9f7m08m5j0354871r8b47bnzdi2kqkc4"; libraryHaskellDepends = [ base QuickCheck random stm ]; description = "Parallel batch driver for QuickCheck"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -203725,7 +204458,7 @@ self: { libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base deepseq QuickCheck ]; description = "Reliable, persistent, fast priority queues"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pqueue-mtl" = callPackage @@ -203740,8 +204473,8 @@ self: { base containers ghc-prim MaybeT mtl stateful-mtl uvector ]; description = "Fully encapsulated monad transformers with queuelike functionality"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -203760,8 +204493,8 @@ self: { base bytestring data-default directory json mps ]; description = "Practice Room"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -203782,8 +204515,8 @@ self: { unordered-containers vector ]; description = "A pragmatic Prelude"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -203800,7 +204533,7 @@ self: { base tasty tasty-hunit tasty-quickcheck vector-space ]; description = "Alternative Show class that gives shorter view if possible"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "prairie" = callPackage @@ -203818,7 +204551,7 @@ self: { ]; testHaskellDepends = [ aeson base ]; description = "A first class record field library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "preamble" = callPackage @@ -203839,8 +204572,8 @@ self: { unordered-containers uuid ]; description = "Yet another prelude"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -203860,7 +204593,7 @@ self: { ]; description = "Diff Cabal packages"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "precursor" = callPackage @@ -203876,8 +204609,8 @@ self: { ]; testHaskellDepends = [ base doctest QuickCheck ]; description = "Prelude replacement"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -203889,8 +204622,8 @@ self: { sha256 = "09kpqc281r4inrcnlsqspry6bvyzpa8npmjzqmmnpxscz58fq8nb"; libraryHaskellDepends = [ base hashable hashtables HSet ]; description = "Simple cached predicates"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -203919,8 +204652,8 @@ self: { tries unordered-containers ]; description = "Predicative tries"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -203932,8 +204665,8 @@ self: { sha256 = "03rw51jpfcl827nrv1fxlghqwg0mk89l1rkqwd743lnsydwzi15h"; libraryHaskellDepends = [ base ]; description = "Helper class for passing context along a predicate value"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -203941,14 +204674,12 @@ self: { ({ mkDerivation, adjunctions, base, deepseq, lens, mtl }: mkDerivation { pname = "predicate-transformers"; - version = "0.7.0.2"; - sha256 = "0wkd7xz3d4sifx9cxm9rnjskhxrbdyqpdspi0sa6jr1ckmq25zpf"; - revision = "1"; - editedCabalFile = "1b02l2fdfxvlsvhcmkpsp0vzc0igsd0nrb64yb7af5a7z08cc9c0"; + version = "0.7.0.3"; + sha256 = "0ipbl4wq95z61h7jd0x5jv5m01vw69v6qqif4nwx9wp7mjfdp7z0"; libraryHaskellDepends = [ adjunctions base deepseq lens mtl ]; description = "A library for writing predicates and transformations over predicates in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -203975,8 +204706,8 @@ self: { tasty-quickcheck template-haskell text these time ]; description = "Predicates, Refinement types and Dsl"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -203988,7 +204719,7 @@ self: { sha256 = "0ly64xml5gbazyq07s409swgysvlwjc19w4x46yp1684ifv0gghf"; libraryHaskellDepends = [ base ]; description = "A couple of convenience functions for forming predicates"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "predictive" = callPackage @@ -203999,7 +204730,7 @@ self: { sha256 = "0n1ilbr3zs8gaji37xn5iab5nwk02my3g18x8bci6pp8znisrbi0"; libraryHaskellDepends = [ base containers ]; description = "Predict the future, backtrack on failure"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "prednote" = callPackage @@ -204020,8 +204751,8 @@ self: { tasty tasty-quickcheck tasty-th text transformers ]; description = "Evaluate and display trees of predicates"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -204044,8 +204775,8 @@ self: { rainbow-tests text ]; description = "Tests and QuickCheck generators to accompany prednote"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -204059,7 +204790,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base bytestring ]; description = "Prefetch stdin even before stdout is ready"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "prefix-expression" = callPackage @@ -204070,7 +204801,7 @@ self: { sha256 = "0brw6rrykfsg67ckcfs3d5x4n7m8c6vbnh9hqrk1iq9whlz6vpwy"; libraryHaskellDepends = [ base regex-pcre-builtin ]; testHaskellDepends = [ base hspec ]; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "prefix-units" = callPackage @@ -204087,7 +204818,7 @@ self: { test-framework-quickcheck2 ]; description = "A basic library for SI/binary prefix units"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "prefork" = callPackage @@ -204109,8 +204840,8 @@ self: { base cab containers directory filepath hspec process stm unix ]; description = "A library for building a prefork-style server quickly"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -204130,8 +204861,8 @@ self: { text-conversions time tuple unordered-containers vector ]; description = "Prelude for applications"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -204153,8 +204884,8 @@ self: { string-conversions ]; description = "A larger alternative to the Prelude"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -204166,7 +204897,7 @@ self: { sha256 = "1mv00d5k5wqb39iyghdbf4lfqznwb1whcc9a564ly4wzka70y9f1"; libraryHaskellDepends = [ base ]; description = "Provide Prelude and Data.List with fixed content across GHC versions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "prelude-edsl" = callPackage @@ -204177,7 +204908,7 @@ self: { sha256 = "0ms63ggqciin92qld07cx6110n534idk38hzj7c69jw68cz3bw1f"; libraryHaskellDepends = [ base ]; description = "An EDSL-motivated subset of the Prelude"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "prelude-extras" = callPackage @@ -204188,7 +204919,7 @@ self: { sha256 = "0xzqdf3nl2h0ra4gnslm1m1nsxlsgc0hh6ky3vn578vh11zhifq9"; libraryHaskellDepends = [ base ]; description = "Higher order versions of Prelude classes"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "prelude-generalize" = callPackage @@ -204199,8 +204930,8 @@ self: { sha256 = "0h452pn7zs97z5gv2p3x9pg61phphwcw5y5g1w38k3gihdvym8jl"; libraryHaskellDepends = [ base comonad logict transformers ]; description = "Another kind of alternate Prelude file"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -204214,8 +204945,8 @@ self: { isExecutable = true; libraryHaskellDepends = [ base utf8-string ]; description = "Prelude for rest of us"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -204227,7 +204958,7 @@ self: { sha256 = "1avj11a5bqn8sxizzh1fxhw3dvd55xsimbbhdwymxfn45vvfswr7"; libraryHaskellDepends = [ base ]; description = "A slightly better (but conservative) Prelude"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "prelude-safeenum" = callPackage @@ -204238,7 +204969,7 @@ self: { sha256 = "09wp6b7bvnp2wz0kigwm4vfca74phh3bbpqybqdgm60isfaz3yfl"; libraryHaskellDepends = [ base ]; description = "A redefinition of the Prelude's Enum class in order to render it safe"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "prelude2010" = callPackage @@ -204249,7 +204980,7 @@ self: { sha256 = "0f4ggnm3a57b4gqw07fq3ash43dxsy0bmg16b8wj33yik96qk06l"; libraryHaskellDepends = [ prelude-compat ]; description = "Provide Prelude with fixed content across GHC versions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "preludeplus" = callPackage @@ -204260,7 +204991,7 @@ self: { sha256 = "08sxfgr8xh0rbg9nv3k93970mjcqgjyv1qy0kmwksl11fsih6sr3"; libraryHaskellDepends = [ base containers ]; description = "Generalizes List functions and replaces partials with NonEmpty equivalents"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "preprocess-haskell" = callPackage @@ -204279,8 +205010,8 @@ self: { system-filepath temporary text turtle unix ]; description = "Preprocess Haskell Repositories"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -204301,8 +205032,8 @@ self: { base directory haskell-src-exts hspec process temporary ]; description = "Remove cpp annotations to get the source ready for static analysis"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -204314,21 +205045,21 @@ self: { sha256 = "0m825wnz7vs3as10glfzy7j0laf6j9w566isly95005gj2sb0lwp"; libraryHaskellDepends = [ base mtl parsec syb ]; description = "A framework for extending Haskell's syntax via quick-and-dirty preprocessors"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "preql" = callPackage ({ mkDerivation, aeson, alex, array, base, binary-parser , bytestring, bytestring-strict-builder, containers, contravariant - , generic-random, happy, hedgehog, mtl, postgresql-binary - , postgresql-libpq, scientific, syb, tasty, tasty-hedgehog - , tasty-hunit, template-haskell, text, th-lift-instances, time - , transformers, uuid, vector, vector-sized + , criterion, deepseq, generic-random, happy, hedgehog, mtl + , postgresql-binary, postgresql-libpq, scientific, syb, tasty + , tasty-hedgehog, tasty-hunit, template-haskell, text + , th-lift-instances, time, transformers, uuid, vector, vector-sized }: mkDerivation { pname = "preql"; - version = "0.4"; - sha256 = "142vq05flg052016npvh1xrk3w1dkks5gn58ivning6w1d0z1v1a"; + version = "0.5"; + sha256 = "13lyk12x8i34q5s6dc9q7mzhax7662r7frhiiklvd0s0ksk25rqq"; libraryHaskellDepends = [ aeson array base binary-parser bytestring bytestring-strict-builder contravariant mtl postgresql-binary postgresql-libpq scientific syb @@ -204344,9 +205075,16 @@ self: { time transformers uuid vector vector-sized ]; testToolDepends = [ alex happy ]; + benchmarkHaskellDepends = [ + aeson array base binary-parser bytestring bytestring-strict-builder + contravariant criterion deepseq mtl postgresql-binary + postgresql-libpq scientific syb template-haskell text + th-lift-instances time transformers uuid vector vector-sized + ]; + benchmarkToolDepends = [ alex happy ]; description = "safe PostgreSQL queries using Quasiquoters"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -204361,8 +205099,8 @@ self: { libraryHaskellDepends = [ base containers pretty ]; testHaskellDepends = [ base QuickCheck ]; description = "A decision procedure for quantifier-free linear arithmetic"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -204374,8 +205112,8 @@ self: { sha256 = "0ys2ibfh518r9rg9bl2m5cmyfxmri47g8wg7q0n5fcbsh4sb7s5s"; libraryHaskellDepends = [ base template-haskell ]; description = "Make presentations for data types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -204388,7 +205126,7 @@ self: { libraryHaskellDepends = [ base containers json mtl parsec ]; description = "Text template library targeted at the web / HTML generation"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -204408,8 +205146,8 @@ self: { scientific text transformers ]; description = "An HDBC connector for Presto"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -204421,7 +205159,7 @@ self: { sha256 = "18bwgz2cgkd6n9gwpwipv2bc6d5501mflmr0r2akwy98q2gb9qg8"; libraryHaskellDepends = [ base containers semigroups ]; description = "Haskell2010 structured text formatting"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pretty_1_1_3_6" = callPackage @@ -204434,8 +205172,8 @@ self: { testHaskellDepends = [ base deepseq ghc-prim QuickCheck ]; benchmarkHaskellDepends = [ base criterion ]; description = "Pretty-printing library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "pretty-class" = callPackage @@ -204446,7 +205184,7 @@ self: { sha256 = "1qdfp2kpahzflq9a3idwmb0pqs4l7almxn5rbw5gp2pmdx81p3am"; libraryHaskellDepends = [ base pretty ]; description = "Pretty printing class similar to Show"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pretty-compact" = callPackage @@ -204481,7 +205219,7 @@ self: { base data-default Diff tasty tasty-hunit tasty-test-reporter text ]; description = "Pretty printing a diff of two values"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pretty-display" = callPackage @@ -204496,7 +205234,7 @@ self: { executableHaskellDepends = [ ansi-wl-pprint base pretty-show ]; testHaskellDepends = [ base ]; description = "Typeclass for human-readable display"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pretty-error" = callPackage @@ -204509,7 +205247,7 @@ self: { base basic-prelude bytestring pretty-show ]; description = "Pretty error messages for runtime invariants"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "pretty-ghci" = callPackage @@ -204533,8 +205271,8 @@ self: { base directory filepath prettyprinter process ]; description = "Functionality for beautifying GHCi"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -204546,7 +205284,7 @@ self: { sha256 = "0c8pa0rdb2q8rf4acy4gww0hj5lrzclzdh52yi2aiaaij4lqzir7"; libraryHaskellDepends = [ base bytestring ]; description = "A library for hex dumps of ByteStrings"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pretty-loc" = callPackage @@ -204557,7 +205295,7 @@ self: { sha256 = "196slpa651p7yq8107c4pkwdfkfmg2bn6ibyqz22c46psklyrisb"; libraryHaskellDepends = [ base text ]; description = "Tracking and highlighting of locations in source files"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pretty-ncols" = callPackage @@ -204568,8 +205306,8 @@ self: { sha256 = "0bvd8wgjrj9g86b1z8m9mjzswibrmhasgajnkgr2dlizl5lg7faq"; libraryHaskellDepends = [ base pretty ]; description = "A implementation of multi-column layout w/ Text.PrettyPrint"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -204587,7 +205325,7 @@ self: { validity validity-time ]; description = "Pretty relative time"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "pretty-show" = callPackage @@ -204607,7 +205345,7 @@ self: { libraryToolDepends = [ happy ]; executableHaskellDepends = [ base ]; description = "Tools for working with derived `Show` instances and generic inspection of values"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "pretty-show-ansi-wl" = callPackage @@ -204623,7 +205361,7 @@ self: { ]; libraryToolDepends = [ happy ]; description = "Like pretty-show, but only for ansi-wl-pprint"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "pretty-simple" = callPackage @@ -204647,8 +205385,8 @@ self: { ]; benchmarkHaskellDepends = [ base criterion text ]; description = "pretty printer for data types with a 'Show' instance"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ cdepillabout ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ cdepillabout ]; }) {}; "pretty-sop" = callPackage @@ -204663,7 +205401,7 @@ self: { testHaskellDepends = [ base generics-sop pretty-show ]; testToolDepends = [ markdown-unlit ]; description = "A generic pretty-printer using generics-sop"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pretty-terminal" = callPackage @@ -204679,7 +205417,7 @@ self: { libraryHaskellDepends = [ base text ]; executableHaskellDepends = [ base text ]; description = "Styling and coloring terminal output with ANSI escape sequences"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pretty-tree" = callPackage @@ -204690,20 +205428,20 @@ self: { sha256 = "0cf856qjacc0lmiina44s00i17ga2qrfr7wdlxhwiqdmpsh5g3fw"; libraryHaskellDepends = [ base boxes containers ]; description = "Pretty-print trees"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pretty-types" = callPackage ({ mkDerivation, base, hspec, mtl, tagged }: mkDerivation { pname = "pretty-types"; - version = "0.3.0.1"; - sha256 = "06dkyk3zdi9wv77yza0vgwl9v8zhyazyhdjbffkqpism07c80rgv"; + version = "0.4.0.0"; + sha256 = "0vfsriviwbrbs9kwg8jwfk5ih9ckv1bfgdxbkcqz8cfaxmbqx4f7"; libraryHaskellDepends = [ base mtl tagged ]; testHaskellDepends = [ base hspec tagged ]; description = "A small pretty printing DSL for complex types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -204715,7 +205453,7 @@ self: { sha256 = "08vqwhbda9qyqmgg469w0ijy090j5wj9xwd54ph6m0rzypbjw8hd"; libraryHaskellDepends = [ base ]; description = "prettier function composition by (°)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "prettyclass" = callPackage @@ -204726,7 +205464,7 @@ self: { sha256 = "11l9ajci7nh1r547hx8hgxrhq8mh5gdq30pdf845wvilg9p48dz5"; libraryHaskellDepends = [ base pretty ]; description = "Pretty printing class similar to Show"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "prettyprinter" = callPackage @@ -204751,7 +205489,7 @@ self: { QuickCheck random text transformers ]; description = "A modern, easy to use, well-documented, extensible pretty-printer"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }) {}; "prettyprinter-ansi-terminal" = callPackage @@ -204769,7 +205507,7 @@ self: { text ]; description = "ANSI terminal backend for the »prettyprinter« package"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }) {}; "prettyprinter-compat-annotated-wl-pprint" = callPackage @@ -204780,7 +205518,7 @@ self: { sha256 = "0plkzvwbqilmh711fbbki9r37i01n00kmzr6cxjgjw0ak1m2djbn"; libraryHaskellDepends = [ base prettyprinter text ]; description = "Drop-in compatibility package to migrate from »annotated-wl-pprint« to »prettyprinter«"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }) {}; "prettyprinter-compat-ansi-wl-pprint" = callPackage @@ -204797,7 +205535,7 @@ self: { base prettyprinter prettyprinter-ansi-terminal text ]; description = "Drop-in compatibility package to migrate from »ansi-wl-pprint« to »prettyprinter«"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }) {}; "prettyprinter-compat-wl-pprint" = callPackage @@ -204810,7 +205548,7 @@ self: { editedCabalFile = "0cb1i1hmr6wl8lacy3w822h273lapqhp537snxgbmhf9xvfckbpr"; libraryHaskellDepends = [ base prettyprinter text ]; description = "Prettyprinter compatibility module for previous users of the wl-pprint package"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }) {}; "prettyprinter-convert-ansi-wl-pprint" = callPackage @@ -204827,7 +205565,7 @@ self: { ]; testHaskellDepends = [ base doctest ]; description = "Converter from »ansi-wl-pprint« documents to »prettyprinter«-based ones"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }) {}; "prettyprinter-graphviz" = callPackage @@ -204838,7 +205576,7 @@ self: { sha256 = "1lqf296jr2jfg86apn729payq2rkk95pdidl7n62xx4bniax7fvm"; libraryHaskellDepends = [ base graphviz prettyprinter text ]; description = "A prettyprinter backend for graphviz"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "prettyprinter-lucid" = callPackage @@ -204849,8 +205587,8 @@ self: { sha256 = "0m8dbxzs22zbahpr6r1frlfqyw581wyg92vswm3gi2qqpj406djh"; libraryHaskellDepends = [ base lucid prettyprinter text ]; description = "A prettyprinter backend for lucid"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -204864,8 +205602,8 @@ self: { editedCabalFile = "120lhr6g3grsybq5bp0vg38cdb78dysq8nwa206ghzigaxs34vcd"; libraryHaskellDepends = [ base prettyprinter vty ]; description = "prettyprinter backend for vty"; - license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -204881,8 +205619,8 @@ self: { base containers pretty strict-data text util-plus ]; description = "The method of previewing data (instead of wholly show-ing it)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -204894,7 +205632,7 @@ self: { sha256 = "15igqxb77ycl9lfs1bl1l9x3cynsg4kqzkr54q46ly4l315bsrq4"; libraryHaskellDepends = [ ghc-prim ]; description = "An ergonomic but conservative interface to ghc-prim"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "prim-array" = callPackage @@ -204907,8 +205645,8 @@ self: { editedCabalFile = "120v58dhida6ms5wd4skw32y2mc70594dhipmz2zp4kjcqmllmdq"; libraryHaskellDepends = [ base ghc-prim primitive semigroups ]; description = "Primitive byte array with type variable"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -204921,8 +205659,8 @@ self: { libraryHaskellDepends = [ base primitive ]; testHaskellDepends = [ base QuickCheck quickcheck-classes ]; description = "Prim typeclass instances"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -204934,8 +205672,8 @@ self: { sha256 = "0fyjxpk4xllkh3r5b7fbb4sb6whxwbdm5lr9zn44qb9v4g0nx2d8"; libraryHaskellDepends = [ base ghc-prim primitive semigroups ]; description = "Primitive byte array with type variable"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -204951,7 +205689,7 @@ self: { testHaskellDepends = [ base HUnit QuickCheck spoon ]; benchmarkHaskellDepends = [ base criterion ghc-prim spoon ]; description = "Catch errors thrown from pure computations using primops"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "prim-uniq" = callPackage @@ -204962,22 +205700,29 @@ self: { sha256 = "1l7jlv3pfasn89n2wpgff972npy423vqsidkkn5crxfyqjyzxbdv"; libraryHaskellDepends = [ base dependent-sum primitive ]; description = "Opaque unique identifiers in primitive state monads"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "primal" = callPackage - ({ mkDerivation, base, deepseq, doctest, template-haskell - , transformers + ({ mkDerivation, array, atomic-primops, base, bytestring, criterion + , deepseq, doctest, hspec, QuickCheck, quickcheck-classes-base + , template-haskell, transformers, unliftio }: mkDerivation { pname = "primal"; - version = "0.2.0.0"; - sha256 = "1vr6rrg4hapivlny2bi47swhm2rwjdzrsxz4r97d4gdydr5vphln"; - libraryHaskellDepends = [ base deepseq transformers ]; - testHaskellDepends = [ base doctest template-haskell ]; + version = "0.3.0.0"; + sha256 = "17rq3azyw7lg6svspv5jbj4x474yb75rzgqxr5s6dfa597djkhqc"; + libraryHaskellDepends = [ array base deepseq transformers ]; + testHaskellDepends = [ + base bytestring deepseq doctest hspec QuickCheck + quickcheck-classes-base template-haskell + ]; + benchmarkHaskellDepends = [ + atomic-primops base criterion unliftio + ]; description = "Primeval world of Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -204987,8 +205732,8 @@ self: { }: mkDerivation { pname = "primal-memory"; - version = "0.2.0.0"; - sha256 = "00yw3m0bjgm3pns60clfy6g905ylwkipw82rwqx3aacgny1hbjy0"; + version = "0.3.0.0"; + sha256 = "0dkx0n8rfagb942h4xfycq9gpk3d670jzd6dn4hzj5v58zriw0ip"; libraryHaskellDepends = [ base bytestring deepseq primal text ]; testHaskellDepends = [ base bytestring doctest primal QuickCheck template-haskell @@ -204997,11 +205742,23 @@ self: { base criterion deepseq primal primitive random ]; description = "Unified interface for memory managemenet"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; + "prime" = callPackage + ({ mkDerivation, base, hspec }: + mkDerivation { + pname = "prime"; + version = "0.1.1"; + sha256 = "18bfxyzazf5d8hfakrags3l3hbn75zws4ihl9bj59c52if5l6fbm"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + description = "prime number tools"; + license = lib.licenses.gpl3; + }) {}; + "primes" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -205010,7 +205767,7 @@ self: { sha256 = "0ny6fzr967d1fifk050k95j9snnbjjif2bxf3v9s93k3zdc6bmkl"; libraryHaskellDepends = [ base ]; description = "Efficient, purely functional generation of prime numbers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "primes-type" = callPackage @@ -205023,8 +205780,8 @@ self: { testHaskellDepends = [ base HTF primes ]; benchmarkHaskellDepends = [ base criterion primes ]; description = "Type-safe prime numbers"; - license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -205040,7 +205797,7 @@ self: { executableHaskellDepends = [ base foundation ]; executableSystemDepends = [ primesieve ]; description = "FFI bindings for the primesieve library"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {inherit (pkgs) primesieve;}; "primitive" = callPackage @@ -205061,7 +205818,7 @@ self: { transformers-compat ]; description = "Primitive memory-related operations"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "primitive-addr" = callPackage @@ -205072,7 +205829,7 @@ self: { sha256 = "06r1p56wm8rbjxnlaqbmc3rbsj1rsv5scwnh80lsn0xw56jc70a2"; libraryHaskellDepends = [ base primitive ]; description = "Addresses to unmanaged memory"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "primitive-atomic" = callPackage @@ -205084,8 +205841,8 @@ self: { libraryHaskellDepends = [ base primitive primitive-unlifted ]; testHaskellDepends = [ base primitive primitive-unlifted ]; description = "Wrappers for primops around atomic operations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -205097,8 +205854,8 @@ self: { sha256 = "1h4gsririgjw8p72dz2p91yq8mxr37qca8rshmxmkmmds8yv6w1s"; libraryHaskellDepends = [ base primitive ]; description = "primitive functions with bounds-checking"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -205124,8 +205881,8 @@ self: { base containers gauge ghc-prim primitive primitive-unlifted random ]; description = "containers backed by arrays"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -205137,8 +205894,8 @@ self: { sha256 = "1xnyyw76kh42fy1b1wkc143bg3588gbp48990xdskcad1aj4fyan"; libraryHaskellDepends = [ primitive ]; description = "convenience class for PrimMonad m/PrimState m"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -205161,8 +205918,8 @@ self: { quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck ]; description = "Extras for the \"primitive\" library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -205175,8 +205932,8 @@ self: { libraryHaskellDepends = [ base primitive ]; testHaskellDepends = [ base primitive QuickCheck ]; description = "using the `Prim` interface for the FFI"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -205188,8 +205945,8 @@ self: { sha256 = "0sbn3h426i6i609iyybar10lywpsklgfkzp355cg8dpfp4a3ibsf"; libraryHaskellDepends = [ base primitive ]; testHaskellDepends = [ base doctest QuickCheck ]; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -205207,8 +205964,8 @@ self: { tasty-quickcheck ]; description = "Arrays of Maybes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -205220,7 +205977,7 @@ self: { sha256 = "0aspdlzx1xaw1fyiy8vnzadbklpg7hn2mb1g9qmw2vpkxglpspmi"; libraryHaskellDepends = [ base primitive ]; description = "Types for offsets into unboxed arrays"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "primitive-simd" = callPackage @@ -205234,8 +205991,8 @@ self: { libraryHaskellDepends = [ base ghc-prim primitive vector ]; benchmarkHaskellDepends = [ base criterion deepseq random vector ]; description = "SIMD data types and functions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -205257,8 +206014,8 @@ self: { ]; benchmarkHaskellDepends = [ base gauge ghc-prim primitive random ]; description = "Sort primitive arrays"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -205270,8 +206027,8 @@ self: { sha256 = "1kdrzam5m2svxrpa7k3byg061i5xs0lc6q12hwgiq6l09savql6j"; libraryHaskellDepends = [ base primitive ]; description = "primitive operations on StableNames"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -205284,7 +206041,7 @@ self: { libraryHaskellDepends = [ base primitive ]; testHaskellDepends = [ base primitive ]; description = "Unaligned access to primitive arrays"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "primitive-unlifted" = callPackage @@ -205296,7 +206053,7 @@ self: { libraryHaskellDepends = [ base bytestring primitive text-short ]; testHaskellDepends = [ base primitive stm ]; description = "Primitive GHC types with unlifted types inside"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "primitive-unlifted_1_0_0_0" = callPackage @@ -205315,8 +206072,8 @@ self: { tasty-quickcheck ]; description = "Primitive GHC types with unlifted types inside"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "primula-board" = callPackage @@ -205339,7 +206096,7 @@ self: { ]; description = "ImageBoard on Happstack and HSP"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -205359,7 +206116,7 @@ self: { ]; description = "Jabber-bot for primula-board ImageBoard"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -205376,8 +206133,8 @@ self: { unordered-containers vector vinyl ]; description = "Classes and data structures complementing the singletons library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -205392,7 +206149,7 @@ self: { libraryHaskellDepends = [ ansi-terminal base ]; executableHaskellDepends = [ base ]; description = "Print all ANSI console colors"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "print-debugger" = callPackage @@ -205403,8 +206160,8 @@ self: { sha256 = "10c4dsf0kz5ydbx5gr8dzcd280l6nj8dd6h77k56ggy5icnhx6p8"; libraryHaskellDepends = [ base split ]; description = "Debug print formatting library"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -205416,7 +206173,7 @@ self: { sha256 = "02wl9hq7jkz4yzkb744xwgnbss0w2sdpi02d3ms2q5rvc03ixnh6"; libraryHaskellDepends = [ base ]; description = "Can be used to coordinate the printing output"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "printcess" = callPackage @@ -205432,8 +206189,8 @@ self: { base containers hspec HUnit lens mtl QuickCheck transformers ]; description = "Pretty printing with indentation, mixfix operators, and automatic line breaks"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -205449,7 +206206,7 @@ self: { base bytestring containers data-default template-haskell ]; description = "A Perl printf like formatter"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "printf-safe" = callPackage @@ -205460,7 +206217,7 @@ self: { sha256 = "17bazxp86h96r12ca7mr1k7krh3zxh7dipgx5p6n8h08dgfsmijl"; libraryHaskellDepends = [ base ]; description = "Type safe interface for Text.Printf"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "prints" = callPackage @@ -205475,8 +206232,8 @@ self: { base hscolour pretty-show pretty-simple text transformers ]; description = "The Artist Formerly Known as Prints"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -205490,7 +206247,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base xosd ]; description = "Simple tool to display some text on an on-screen display"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "priority-queue" = callPackage @@ -205501,8 +206258,8 @@ self: { sha256 = "0nsiil0yl32m80a1kpg3z0wd5fxwkpz2lzf66pa06iy24q0rz5lf"; libraryHaskellDepends = [ base containers queue reord stateref ]; description = "Simple implementation of a priority queue"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -205520,7 +206277,7 @@ self: { ]; executableHaskellDepends = [ base ]; description = "Cooperative task prioritization"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "private-hackage-uploader" = callPackage @@ -205538,7 +206295,7 @@ self: { ]; executableHaskellDepends = [ base directory shelly text ]; description = "Upload a package to the public or private hackage, building its docs"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "privileged-concurrency" = callPackage @@ -205553,7 +206310,7 @@ self: { base contravariant lifted-base stm unliftio unliftio-core ]; description = "Provides privilege separated versions of the concurrency primitives"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "prizm" = callPackage @@ -205571,7 +206328,7 @@ self: { test-framework-hunit test-framework-quickcheck2 ]; description = "Convert colors to different color spaces, interpolate colors, and transform colors"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "probability" = callPackage @@ -205585,7 +206342,7 @@ self: { base containers random transformers utility-ht ]; description = "Probabilistic Functional Programming"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "probable" = callPackage @@ -205605,8 +206362,8 @@ self: { base criterion mwc-random mwc-random-monad vector ]; description = "Easy and reasonably efficient probabilistic programming and random generation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -205625,8 +206382,8 @@ self: { xformat ]; description = "Parse process information for Linux"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -205642,22 +206399,22 @@ self: { attoparsec base bytestring network unix ]; description = "Parse /proc/net/{tcp,tcp6,udp,udp6}"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; - "process_1_6_10_0" = callPackage + "process_1_6_11_0" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory, filepath , unix }: mkDerivation { pname = "process"; - version = "1.6.10.0"; - sha256 = "01c50qhrsvymbifa3lzyq6g4hmj6jl3awjp1jmbhdkmfdfaq3v16"; + version = "1.6.11.0"; + sha256 = "0nv8c2hnx1l6xls6b61l8sm7j250qfbj1fjj5n6m15ppk9f0d9jd"; libraryHaskellDepends = [ base deepseq directory filepath unix ]; testHaskellDepends = [ base bytestring directory ]; description = "Process libraries"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "process-conduit" = callPackage @@ -205677,8 +206434,8 @@ self: { base bytestring conduit conduit-extra hspec resourcet ]; description = "Conduits for processes (deprecated)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -205696,7 +206453,7 @@ self: { ]; testHaskellDepends = [ base HUnit ]; description = "Process extras"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "process-iterio" = callPackage @@ -205714,8 +206471,8 @@ self: { base bytestring cpphs iterIO process transformers ]; description = "IterIO Process Library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -205727,8 +206484,8 @@ self: { sha256 = "1899ybhnsj22sir2l933lhkk9fpcgjbb4qd6gscnby28qcs5bwbv"; libraryHaskellDepends = [ base directory filepath unix ]; description = "Process libraries"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -205745,8 +206502,8 @@ self: { base bytestring deepseq ListLike process text ]; description = "Process extras"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -205763,8 +206520,8 @@ self: { text time unix utf8-string ]; description = "Run a process and do reportsing on its progress"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -205781,8 +206538,8 @@ self: { template-haskell text ]; description = "Quasi-Quoters for exec process"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -205814,8 +206571,8 @@ self: { void ]; description = "Streaming interface to system processes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -205834,8 +206591,8 @@ self: { transformers ]; description = "Web graphic applications with processing.js."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -205852,7 +206609,7 @@ self: { transformers utf8-string vector-space ]; description = "Computer graphics for kids and artists with Processing implemented in Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "processmemory" = callPackage @@ -205863,8 +206620,8 @@ self: { sha256 = "12p7974x43w06jwaf7hlv2wxlgqnq9kb10mgjl9c4l7hbpbg3y0z"; libraryHaskellDepends = [ base binary bytestring process ]; description = "C bindings for the gnu-extension functions process_vm_readv and process_vm_writev"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -205880,7 +206637,7 @@ self: { array attoparsec base bytestring containers deepseq mtl ]; description = "a creation kit for instruction sets and cpu simulators and development tools"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "procrastinating-structure" = callPackage @@ -205892,7 +206649,7 @@ self: { libraryHaskellDepends = [ base procrastinating-variable ]; description = "Pure structures that can be incrementally created in impure code"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "procrastinating-variable" = callPackage @@ -205903,8 +206660,8 @@ self: { sha256 = "12px0nk7j74hyfzcvxacd9020gk3cd3ijqb7fjmmg8y33354jkc4"; libraryHaskellDepends = [ base ]; description = "Haskell values that cannot be evaluated immediately"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -205916,8 +206673,8 @@ self: { sha256 = "1md75jc32nfnvs7ygf1mna00gl0wmimp2lkdcs9r9v0iy4b1hr5m"; libraryHaskellDepends = [ attoparsec base bytestring ]; description = "get information on processes in Linux"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -205936,7 +206693,7 @@ self: { base bytestring hspec HUnit process QuickCheck text ]; description = "An IO library for testing interactive command line programs"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "producer" = callPackage @@ -205953,8 +206710,8 @@ self: { tasty-quickcheck ]; description = "Simple streaming datatype"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -205968,7 +206725,7 @@ self: { editedCabalFile = "0ssd2yc8c3h2y5yra8y49sphxwpj8jd7ss6h058nabld0hrbvjm2"; libraryHaskellDepends = [ base category ]; description = "Product category"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "product-isomorphic" = callPackage @@ -205980,7 +206737,7 @@ self: { libraryHaskellDepends = [ base template-haskell th-data-compat ]; testHaskellDepends = [ base template-haskell ]; description = "Weaken applicative functor on products"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "product-profunctors" = callPackage @@ -205999,7 +206756,7 @@ self: { testHaskellDepends = [ base profunctors ]; benchmarkHaskellDepends = [ base criterion deepseq ]; description = "product-profunctors"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "prof-flamegraph" = callPackage @@ -206012,8 +206769,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base optparse-applicative ]; description = "Generate flamegraphs from ghc RTS .prof files"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -206029,8 +206786,8 @@ self: { base containers filepath haskell98 parsec ]; description = "Convert GHC profiles into GraphViz's dot format"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -206049,8 +206806,8 @@ self: { base containers filepath haskell-src-exts semigroups uniplate zenc ]; description = "generate pretty source from time/allocation profiles"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -206069,7 +206826,7 @@ self: { scientific text ]; description = "Restructure GHC profile reports"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "profiteur" = callPackage @@ -206089,7 +206846,7 @@ self: { scientific text unordered-containers vector ]; description = "Treemap visualiser for GHC prof files"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "profunctor-arrows" = callPackage @@ -206100,7 +206857,7 @@ self: { sha256 = "136d594l4magjibq44fs64bqafvcdy8jm2gijs6x1whpab0vl44k"; libraryHaskellDepends = [ base comonad lawz profunctors ]; description = "Profunctor arrows"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "profunctor-extras" = callPackage @@ -206112,7 +206869,7 @@ self: { libraryHaskellDepends = [ base profunctors ]; doHaddock = false; description = "This package has been absorbed into profunctors 4.0"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "profunctor-misc" = callPackage @@ -206123,7 +206880,7 @@ self: { sha256 = "0akgx4gasd0p0skqrr29xdm0yp0dppzx21skk00is0lrwmldhqkg"; libraryHaskellDepends = [ base comonad contravariant profunctors ]; description = "Profunctor miscellany"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "profunctor-monad" = callPackage @@ -206139,8 +206896,8 @@ self: { base hashable mtl transformers unordered-containers ]; description = "Monadic bidirectional programming"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -206162,8 +206919,8 @@ self: { ]; executableHaskellDepends = [ base doctest mtl ]; description = "A compact optics library compatible with the typeclasses in profunctors"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {coapplicative = null;}; @@ -206182,7 +206939,7 @@ self: { tagged transformers ]; description = "Profunctors"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "profunctors_5_6_1" = callPackage @@ -206198,8 +206955,8 @@ self: { tagged transformers ]; description = "Profunctors"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "progress" = callPackage @@ -206210,8 +206967,8 @@ self: { sha256 = "0cac4v6k2nrpglnf3680y334kw4k0s6xfm86wrfyszl5sq2a7w94"; libraryHaskellDepends = [ base time ]; description = "Simple progress tracking & projection library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -206223,8 +206980,8 @@ self: { sha256 = "1mdzwbzkf9ja7i21hds26gqn2ll4hnidbcq145yigkfzv93r6hq6"; libraryHaskellDepends = [ ansi-terminal async base stm ]; description = "Live diagnostics for concurrent activity"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -206238,8 +206995,8 @@ self: { editedCabalFile = "1a20ziwki29chw069jqrjm2rb64j4sfxbi7xyqxqd6vh9gpwdmm1"; libraryHaskellDepends = [ base deepseq mtl time ]; description = "Functionality for reporting function progress"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -206253,8 +207010,8 @@ self: { isExecutable = true; libraryHaskellDepends = [ base io-reactive ]; description = "Progressbar API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -206271,8 +207028,8 @@ self: { txt-sushi ]; description = "Automates the recording and graphing of criterion benchmarks"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -206291,8 +207048,8 @@ self: { process text ]; description = "Multilabel classification model which learns sequentially (online)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -206306,7 +207063,7 @@ self: { librarySystemDepends = [ proj ]; description = "Haskell bindings for the Proj4 C dynamic library"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) proj;}; @@ -206377,8 +207134,8 @@ self: { vector-binary-instances websockets winery ]; description = "Relational Algebra Engine"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -206400,7 +207157,7 @@ self: { QuickCheck resourcet text transformers ]; description = "Specify Haskell project templates and generate files"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "projectile" = callPackage @@ -206419,8 +207176,8 @@ self: { tasty-hunit tasty-rerun text vector ]; description = "Go to README.md"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -206434,7 +207191,7 @@ self: { editedCabalFile = "02ykpvapl8ypzrggf0b6bdcy6wcwbkwrczhbq3ccc02282lv8pc0"; libraryHaskellDepends = [ base ]; description = "Projection function for arbitrarily nested binary product types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "projectroot" = callPackage @@ -206446,7 +207203,7 @@ self: { libraryHaskellDepends = [ base directory ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "Bindings to the projectroot C logic"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "prolens" = callPackage @@ -206462,8 +207219,8 @@ self: { base doctest hedgehog hspec hspec-hedgehog inspection-testing ]; description = "Profunctor-based lightweight implementation of optics"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -206480,7 +207237,7 @@ self: { transformers ]; description = "A Prolog interpreter written in Haskell"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "prolog-graph" = callPackage @@ -206497,8 +207254,8 @@ self: { base cmdargs fgl graphviz mtl prolog prolog-graph-lib text ]; description = "A command line tool to visualize query resolution in Prolog"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -206510,7 +207267,7 @@ self: { sha256 = "1qxikgryyh47zm0qwbsa7lpqmiphbl1askjjjc0rfr9dh5f0wclr"; libraryHaskellDepends = [ base fgl graphviz mtl prolog text ]; description = "Generating images of resolution trees for Prolog queries"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "prologue" = callPackage @@ -206535,31 +207292,31 @@ self: { transformers transformers-base typelevel vector ]; description = "Better, more general Prelude exporting common utilities"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; "prolude" = callPackage - ({ mkDerivation, aeson, base, bytestring, cassava, containers - , generic-random, lens, mongoDB, mtl, network-uri, persistent - , persistent-mongoDB, QuickCheck, quickcheck-instances + ({ mkDerivation, aeson, amazonka, base, bytestring, cassava + , containers, generic-random, lens, mongoDB, mtl, network-uri + , persistent, persistent-mongoDB, QuickCheck, quickcheck-instances , safe-exceptions, scientific, servant, swagger2, text, time, uuid , vector }: mkDerivation { pname = "prolude"; - version = "0.0.0.15"; - sha256 = "1hm24qz13yrhvg8a0xx781pv29lbxzdzazk7byfjqv4dsy8c7mkp"; + version = "0.0.0.17"; + sha256 = "1c98ybwv8jdswkx80q2wlxr7jqll6kyy07lyk2rc27phxb153slk"; libraryHaskellDepends = [ - aeson base bytestring cassava containers generic-random lens - mongoDB mtl network-uri persistent persistent-mongoDB QuickCheck - quickcheck-instances safe-exceptions scientific servant swagger2 - text time uuid vector + aeson amazonka base bytestring cassava containers generic-random + lens mongoDB mtl network-uri persistent persistent-mongoDB + QuickCheck quickcheck-instances safe-exceptions scientific servant + swagger2 text time uuid vector ]; description = "ITProTV's custom prelude"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -206577,7 +207334,7 @@ self: { http-client-tls http-types network-uri text transformers wai warp ]; description = "Prometheus Haskell Client"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "prometheus-client" = callPackage @@ -206603,7 +207360,7 @@ self: { base bytestring criterion random text utf8-string ]; description = "Haskell client library for http://prometheus.io."; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "prometheus-effect" = callPackage @@ -206630,8 +207387,8 @@ self: { testHaskellDepends = [ base text weigh ]; benchmarkHaskellDepends = [ base criterion text ]; description = "Instrument applications with metrics and publish/push to Prometheus"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -206648,7 +207405,7 @@ self: { ]; testHaskellDepends = [ base doctest prometheus-client ]; description = "Metrics exposing GHC runtime information for use with prometheus-client"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "prometheus-proc" = callPackage @@ -206664,7 +207421,7 @@ self: { unix unix-memory ]; description = "Export metrics from /proc for the current process"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "prometheus-wai-middleware" = callPackage @@ -206684,7 +207441,7 @@ self: { async base http-types prometheus wai warp ]; description = "Instrument a wai application with various metrics"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "promise" = callPackage @@ -206695,8 +207452,8 @@ self: { sha256 = "1hzsprmw15apc654n77ima1pgs9nj6287d412jb5z37154bd0nfg"; libraryHaskellDepends = [ async base ]; description = "A monadic interface for async"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -206708,7 +207465,7 @@ self: { sha256 = "0q7jjk9dqli4vi46j94gywxp0fp80b7r0k0g4ymyf8n12lcr0z5z"; libraryHaskellDepends = [ base primitive ]; description = "Lazy demand-driven promises"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "prompt" = callPackage @@ -206723,7 +207480,7 @@ self: { base base-compat mtl transformers transformers-compat ]; description = "Monad (and transformer) for deferred-effect pure prompt-response queries"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "pronounce" = callPackage @@ -206739,8 +207496,8 @@ self: { base binary containers filepath mtl safe text ]; description = "A library for interfacing with the CMU Pronouncing Dictionary"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -206752,8 +207509,8 @@ self: { sha256 = "1wcm5wxzqm4lq340l3ga15cmjfabpf8njnvma3zagwyhmndabxfw"; libraryHaskellDepends = [ base ]; description = "Proof Combinators used in Liquid Haskell for Theorem Proving"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -206769,8 +207526,8 @@ self: { base colour containers directory filepath repa repa-devil spawn ]; description = "Functional synthesis of images and animations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -206782,7 +207539,7 @@ self: { sha256 = "00v1j1mv5dl6vivkfqv9w9jvw1jh3085mpkax5x0cyndhqcw027x"; libraryHaskellDepends = [ base ]; description = "A Simple Propagator Library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "propellor" = callPackage @@ -206804,7 +207561,7 @@ self: { ]; executableHaskellDepends = [ base ]; description = "property-based host configuration management in haskell"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }) {}; "properties" = callPackage @@ -206815,8 +207572,8 @@ self: { sha256 = "04a35zxgps9rn6y86x3jf6gma6kjl8izmnyl45hz64cl9yb5dwwi"; libraryHaskellDepends = [ base ]; description = "check quickCheck properties in real time"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -206828,7 +207585,7 @@ self: { sha256 = "1amgzvg7xp7i5ppxmyhh1dhbv4zgwwvg9cdrc719flsndxp4xvar"; libraryHaskellDepends = [ base ]; description = "common properties"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "property-list" = callPackage @@ -206847,8 +207604,8 @@ self: { transformers vector xml ]; description = "Apple property list parser"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -206860,8 +207617,8 @@ self: { sha256 = "1vm01qvd0jgcdpqx3p2h6gafhxi5x7bs8r5a6xsk4zz6cc1cbw4m"; libraryHaskellDepends = [ base glade glib gtk ]; description = "A library for functional GUI development"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -206874,7 +207631,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest QuickCheck ]; description = "Reusable quickcheck properties"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "prosidy" = callPackage @@ -206901,8 +207658,8 @@ self: { tasty-quickcheck text ]; description = "A simple language for writing documents"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -206919,8 +207676,8 @@ self: { prosidy text unordered-containers ]; description = "A DSL for processing Prosidy documents"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -206939,7 +207696,7 @@ self: { base deepseq free hspec inspection-testing kan-extensions ]; description = "Explore continuations with trepidation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "prosper" = callPackage @@ -206956,8 +207713,8 @@ self: { io-streams mtl text transformers vector ]; description = "Bindings to the Prosper marketplace API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -206976,8 +207733,8 @@ self: { libraryPkgconfigDepends = [ libpulse libpulse-simple ]; libraryToolDepends = [ c2hs ]; description = "Simple audio library for Windows, Linux, OSX"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {libpulse = null; libpulse-simple = null; inherit (pkgs) libpulseaudio;}; @@ -206995,8 +207752,8 @@ self: { libraryPkgconfigDepends = [ SDL2 ]; libraryToolDepends = [ c2hs ]; description = "Simple audio library for SDL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) SDL2;}; @@ -207036,8 +207793,8 @@ self: { unliftio utf8-string ]; description = "neovim project manager"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -207059,7 +207816,7 @@ self: { base bytestring QuickCheck tasty tasty-quickcheck vector ]; description = "A lens-based implementation of protocol buffers in Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "proto-lens-arbitrary" = callPackage @@ -207074,8 +207831,8 @@ self: { base bytestring containers lens-family proto-lens QuickCheck text ]; description = "Arbitrary instances for proto-lens"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -207097,8 +207854,8 @@ self: { proto-lens-runtime test-framework test-framework-hunit ]; description = "Utilities functions to proto-lens"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -207115,8 +207872,8 @@ self: { lens-labels proto-lens text ]; description = "Protocol buffers for describing the definitions of messages"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -207133,7 +207890,7 @@ self: { proto-lens-runtime text vector ]; description = "JSON protobuf encoding for proto-lens"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "proto-lens-optparse" = callPackage @@ -207146,7 +207903,7 @@ self: { base optparse-applicative proto-lens text ]; description = "Adapting proto-lens to optparse-applicative ReadMs"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "proto-lens-protobuf-types" = callPackage @@ -207164,7 +207921,7 @@ self: { ]; libraryToolDepends = [ proto-lens-protoc protobuf ]; description = "Basic protocol buffer message types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) protobuf;}; "proto-lens-protoc" = callPackage @@ -207185,7 +207942,7 @@ self: { lens-family pretty proto-lens proto-lens-runtime text ]; description = "Protocol buffer compiler for the proto-lens library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) protobuf;}; "proto-lens-runtime" = callPackage @@ -207201,7 +207958,7 @@ self: { text vector ]; doHaddock = false; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "proto-lens-setup" = callPackage @@ -207217,7 +207974,7 @@ self: { proto-lens-protoc temporary text ]; description = "Cabal support for codegen with proto-lens"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "proto3-suite" = callPackage @@ -207257,8 +208014,8 @@ self: { text transformers turtle vector ]; description = "A low level library for writing out data in the Protocol Buffers wire format"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -207282,7 +208039,7 @@ self: { tasty-quickcheck text ]; description = "A low-level implementation of the Protocol Buffers (version 3) wire format"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "proto3-wire_1_2_0" = callPackage @@ -207295,6 +208052,8 @@ self: { pname = "proto3-wire"; version = "1.2.0"; sha256 = "1xrnrh4njnw6af8xxg9xhcxrscg0g644jx4l9an4iqz6xmjp2nk2"; + revision = "1"; + editedCabalFile = "14cjzgh364b836sg7szwrkvmm19hg8w57hdbsrsgwa7k9rhqi349"; libraryHaskellDepends = [ base bytestring cereal containers deepseq ghc-prim hashable parameterized primitive QuickCheck safe text transformers @@ -207305,8 +208064,8 @@ self: { tasty-quickcheck text transformers vector ]; description = "A low-level implementation of the Protocol Buffers (version 3) wire format"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; }) {}; "protobuf" = callPackage @@ -207327,7 +208086,7 @@ self: { tasty tasty-hunit tasty-quickcheck text unordered-containers ]; description = "Google Protocol Buffers via GHC.Generics"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "protobuf-native" = callPackage @@ -207350,8 +208109,8 @@ self: { protocol-buffers-fork QuickCheck text utf8-string ]; description = "Protocol Buffers via C++"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -207377,7 +208136,7 @@ self: { hspec parsec QuickCheck quickcheck-instances split text ]; description = "Simple Protocol Buffers library (proto2)"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "protocol" = callPackage @@ -207388,8 +208147,8 @@ self: { sha256 = "16pbhfggw46jdjyljqr6dr0mlzmfhvwmw3lg1s5rp90zg4jgvha0"; libraryHaskellDepends = [ base freer-indexed singletons ]; description = "Model distributed system as type-level multi-party protocol"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -207407,7 +208166,7 @@ self: { directory filepath mtl parsec syb text utf8-string vector ]; description = "Parse Google Protocol Buffer specifications"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "protocol-buffers-descriptor" = callPackage @@ -207423,7 +208182,7 @@ self: { base bytestring containers protocol-buffers ]; description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "protocol-buffers-descriptor-fork" = callPackage @@ -207439,8 +208198,8 @@ self: { base bytestring containers protocol-buffers-fork ]; description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -207457,8 +208216,8 @@ self: { utf8-string ]; description = "Parse Google Protocol Buffer specifications"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -207475,7 +208234,7 @@ self: { template-haskell text transformers ]; description = "parser and printer for radius protocol packet"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "protocol-radius-test" = callPackage @@ -207492,7 +208251,7 @@ self: { ]; testHaskellDepends = [ base quickcheck-simple ]; description = "testsuit of protocol-radius haskell package"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "protolude" = callPackage @@ -207511,7 +208270,7 @@ self: { mtl mtl-compat stm text transformers transformers-compat ]; description = "A small prelude"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "protolude-lifted" = callPackage @@ -207525,8 +208284,8 @@ self: { async base lifted-async lifted-base protolude ]; description = "Protolude with lifted-base and lifted-async"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -207543,8 +208302,8 @@ self: { adjunctions base bifunctors comonad compactable containers contravariant distributive linear mtl profunctors tagged ]; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -207563,8 +208322,8 @@ self: { test-framework-hunit ]; description = "Simple XML templating library"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -207576,8 +208335,8 @@ self: { sha256 = "1kzinhdy622gzg3mzfln15vgi890i2l3lkrgrw0n0yb08r2n53i7"; libraryHaskellDepends = [ base monads-tf ]; description = "prototype-based programming on Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -207598,8 +208357,8 @@ self: { unordered-containers wai warp ]; description = "The server for ProveEverywhere"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -207618,8 +208377,8 @@ self: { time ]; description = "Computations that automatically track data dependencies"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -207631,7 +208390,7 @@ self: { sha256 = "0ldcyvzg5i4axkn5qwgkc8vrc0f0715842ca41d7237p1bh98s4r"; libraryHaskellDepends = [ base ]; description = "Make functions consume Proxy instead of undefined"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "proxy" = callPackage @@ -207642,7 +208401,7 @@ self: { sha256 = "1465mvkdq9cv202sj2hiwa8a2a07906dww2msan235fvkrnhj9jz"; libraryHaskellDepends = [ base ]; description = "proxy helpers"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "proxy-kindness" = callPackage @@ -207653,8 +208412,8 @@ self: { sha256 = "0wpzj6hnlxvgd7lfd2921mrk97aw7ljf77jry3my97zdapkxz8i7"; libraryHaskellDepends = [ base tagged ]; description = "A library for kind-polymorphic manipulation and inspection of Proxy values"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -207666,8 +208425,8 @@ self: { sha256 = "12lwn64znci7l5l7sa3g7hm0rmnjvykci7k65mz5c2zdwx3zgvdd"; libraryHaskellDepends = [ base ]; description = "Mapping of Proxy Types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -207697,8 +208456,8 @@ self: { base containers hspec monad-logger mtl stm ]; description = "Language support for the PureScript programming language"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -207723,8 +208482,8 @@ self: { tasty-th temporary ]; description = "Reading/Writing OPB/WBO files used in pseudo boolean competition"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -207738,8 +208497,8 @@ self: { editedCabalFile = "1xc7acqd7zss6zd2n43n0kd5qiv1i8m5wlnskrw5sdj7i1ddsrj5"; libraryHaskellDepends = [ base semigroups ]; description = "A tagged rose-tree with short circuited unique leaves"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -207751,7 +208510,7 @@ self: { sha256 = "112g7qxn7vl5702gzx2kdg55rvvp9g0gc50dvcwlrgvrsvsdy6c9"; libraryHaskellDepends = [ base template-haskell time ]; description = "cpp-style built-in macros using Template Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "psi" = callPackage @@ -207764,7 +208523,7 @@ self: { base bytestring deepseq semigroups text ]; description = "Yet another custom Prelude"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "psql-helpers" = callPackage @@ -207775,7 +208534,7 @@ self: { sha256 = "1x0r68mfv56rp87j8ick875wbq3qzkii9ia60amx6xr40x1acg7i"; libraryHaskellDepends = [ base postgresql-simple ]; description = "A small collection of helper functions to generate postgresql queries"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "psql-utils" = callPackage @@ -207790,7 +208549,7 @@ self: { aeson base hashable postgresql-simple resource-pool time ]; description = "PostgreSQL Simple util tools"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "psqueues" = callPackage @@ -207815,7 +208574,7 @@ self: { hashable mtl PSQueue random unordered-containers ]; description = "Pure priority search queues"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pstemmer" = callPackage @@ -207829,7 +208588,7 @@ self: { libraryHaskellDepends = [ base text ]; executableHaskellDepends = [ base text ]; description = "A Haskell Implementation of the Porter Stemmer"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pthread" = callPackage @@ -207842,7 +208601,7 @@ self: { testHaskellDepends = [ base hspec hspec-discover ]; testToolDepends = [ hspec-discover ]; description = "Bindings for the pthread library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ptr" = callPackage @@ -207862,7 +208621,7 @@ self: { tasty-quickcheck ]; description = "Abstractions for operations on pointers"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "ptr-poker" = callPackage @@ -207877,8 +208636,8 @@ self: { testHaskellDepends = [ hedgehog numeric-limits rerebase ]; benchmarkHaskellDepends = [ gauge rerebase ]; description = "Pointer poking action construction and composition toolkit"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -207897,7 +208656,7 @@ self: { base bytestring hedis optparse-generic pipes pipes-bytestring text ]; description = "Pipe stdin to a redis pub/sub channel"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "publicsuffix" = callPackage @@ -207912,7 +208671,7 @@ self: { testHaskellDepends = [ base hspec ]; benchmarkHaskellDepends = [ base criterion random ]; description = "The publicsuffix list exposed as proper Haskell types"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "publicsuffixlist" = callPackage @@ -207931,7 +208690,7 @@ self: { utf8-string ]; description = "Is a given string a domain suffix?"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "publicsuffixlistcreate" = callPackage @@ -207948,8 +208707,8 @@ self: { ]; testHaskellDepends = [ base cereal HUnit publicsuffixlist ]; description = "Create the publicsuffixlist package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -207977,8 +208736,8 @@ self: { unordered-containers ]; description = "Publishing tools for papers, books, and presentations"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -208011,8 +208770,8 @@ self: { tasty-quickcheck tasty-smallcheck ]; description = "PubNub Haskell SDK"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -208031,8 +208790,8 @@ self: { ]; executableHaskellDepends = [ fastcgi ]; description = "A library for Google/SixApart pubsub hub interaction"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -208062,8 +208821,8 @@ self: { test-framework-quickcheck2 text time vector ]; description = "A CLI assistant"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -208080,8 +208839,8 @@ self: { ]; testHaskellDepends = [ base bytestring tasty tasty-hunit ]; description = "pugixml binding"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -208105,8 +208864,8 @@ self: { pretty random stm utf8-string ]; description = "DrIFT with pugs-specific rules"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -208120,7 +208879,7 @@ self: { libraryHaskellDepends = [ base bytestring ]; description = "Fast, lightweight YAML loader and dumper"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "pugs-compat" = callPackage @@ -208139,8 +208898,8 @@ self: { syb time unix utf8-string ]; description = "Portable Haskell/POSIX layer for Pugs"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -208152,8 +208911,8 @@ self: { sha256 = "1px8qvz7afws2w8scplxs4zm628anvh5ssbf0ba9hajh686h133i"; libraryHaskellDepends = [ array base haskell98 ]; description = "Haskell PCRE binding"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -208165,7 +208924,7 @@ self: { sha256 = "0npq49hm17h3p7acmvbg10qkqx74asbk3f6c2rlw7zaa1zhb9r6d"; libraryHaskellDepends = [ async base containers time ]; description = "Synchronize actions to a time pulse"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "pulse-simple" = callPackage @@ -208177,7 +208936,7 @@ self: { libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ libpulseaudio ]; description = "binding to Simple API of pulseaudio"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) libpulseaudio;}; "pulseaudio" = callPackage @@ -208191,7 +208950,7 @@ self: { libraryHaskellDepends = [ base containers stm unix ]; librarySystemDepends = [ libpulseaudio ]; description = "A low-level (incomplete) wrapper around the pulseaudio client asynchronous api"; - license = stdenv.lib.licenses.lgpl3; + license = lib.licenses.lgpl3; }) {inherit (pkgs) libpulseaudio;}; "punkt" = callPackage @@ -208209,8 +208968,8 @@ self: { base mtl regex-tdfa tasty tasty-hunit tasty-quickcheck text ]; description = "Multilingual unsupervised sentence tokenization with Punkt"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -208227,7 +208986,7 @@ self: { base bytestring cereal encoding HUnit mtl QuickCheck text ]; description = "Encode unicode strings to ascii forms according to RFC 3492"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "puppetresources" = callPackage @@ -208245,8 +209004,8 @@ self: { mtl text ]; description = "A program that displays the puppet resources associated to a node given .pp files."; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -208265,8 +209024,8 @@ self: { base bytestring containers mtl test-simple Unixutils vector ]; description = "Another pure-haskell CDB (Constant Database) implementation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -208278,7 +209037,7 @@ self: { sha256 = "1zzravfgxbx07c38pf0p73a9nzjk2pbq3hzfw8v9zkqj95b3l94i"; libraryHaskellDepends = [ base ]; description = "Fast Fourier Transform"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pure-io" = callPackage @@ -208291,8 +209050,8 @@ self: { editedCabalFile = "04r055y62f46lxhm4wbfmdk115fslw7lapw06r16lzb1l48m0phj"; libraryHaskellDepends = [ base containers mtl safe ]; description = "Pure IO monad"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -208304,8 +209063,8 @@ self: { sha256 = "125vnkjx6n7pgflk9iqg7b6daw55a1rdfi9pfgp39ikfcx9vhb3p"; libraryHaskellDepends = [ base containers ]; description = "A pure priority queue"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -208324,8 +209083,8 @@ self: { test-framework-quickcheck2 ]; description = "Tests for the pure-priority-queue package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -208341,7 +209100,7 @@ self: { testHaskellDepends = [ base hspec mono-traversable QuickCheck random-shuffle transformers ]; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "pure-zlib" = callPackage @@ -208366,8 +209125,8 @@ 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; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -208388,7 +209147,7 @@ self: { QuickCheck test-framework test-framework-quickcheck2 ]; description = "A Haskell-only implementation of the MD5 digest (hash) algorithm"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "purebred-email" = callPackage @@ -208415,7 +209174,7 @@ self: { tasty-hedgehog tasty-hunit tasty-quickcheck text time ]; description = "types and parser for email messages (including MIME)"; - license = stdenv.lib.licenses.agpl3; + license = lib.licenses.agpl3; }) {}; "purescheme-wai-routing-core" = callPackage @@ -208437,8 +209196,8 @@ self: { ]; testHaskellDepends = [ base ]; description = "Simple Routing functions for Wai Applications"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -208511,8 +209270,8 @@ self: { testToolDepends = [ happy hspec-discover ]; doCheck = false; description = "PureScript Programming Language Compiler"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -208533,7 +209292,7 @@ self: { base containers hspec hspec-expectations-pretty-diff text ]; description = "Generate PureScript data types from Haskell data types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "purescript-bundle-fast" = callPackage @@ -208550,7 +209309,7 @@ self: { base containers directory filepath optparse-applicative text vector ]; description = "A fast alternative to Purescript's `psc-bundle` to be used during development"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "purescript-iso" = callPackage @@ -208579,8 +209338,8 @@ self: { zeromq4-simple ]; description = "Isomorphic trivial data type definitions over JSON"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -208603,8 +209362,8 @@ self: { optparse-applicative purescript text ]; description = "TypeScript Declaration File (.d.ts) generator for PureScript"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -208621,7 +209380,7 @@ self: { ]; executableHaskellDepends = [ base text ]; description = "A cli client for pursuit"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "push-notifications" = callPackage @@ -208640,8 +209399,8 @@ self: { resourcet text time transformers ]; description = "Push notifications for Android and iOS"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -208665,8 +209424,8 @@ self: { tls-extra transformers unordered-containers xml-conduit ]; description = "A server-side library for sending push notifications"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -208692,8 +209451,8 @@ self: { ]; testHaskellDepends = [ aeson base hspec ]; description = "Send push notifications to mobile iOS devices"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -208713,8 +209472,8 @@ self: { stm text tls tls-extra unordered-containers xml-types ]; description = "A server-side library for sending/receiving push notifications through CCS (Google Cloud Messaging)"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -208733,8 +209492,8 @@ self: { unordered-containers xml-conduit yesod ]; description = "A general library for sending/receiving push notif. through dif. services."; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -208751,7 +209510,7 @@ self: { ]; testHaskellDepends = [ base hspec ]; description = "Simple push support for pushbullet"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pushbullet-types" = callPackage @@ -208767,7 +209526,7 @@ self: { time unordered-containers ]; description = "Datatypes used by the Pushbullet APIs"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "pusher-haskell" = callPackage @@ -208783,8 +209542,8 @@ self: { ]; testHaskellDepends = [ base hspec ]; description = "A Pusher.com client written in Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -208795,8 +209554,8 @@ self: { }: mkDerivation { pname = "pusher-http-haskell"; - version = "2.0.0.2"; - sha256 = "0ci2wg0y3762n1in8jyw1dpjljdynhl4bfp9506kfkc6ym9j2q1a"; + version = "2.0.0.3"; + sha256 = "0h53y0jxk1nyqwyr4f0nry0gl64s1w8ay15fips4drql37apbq1v"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring cryptonite hashable http-client http-client-tls http-types memory text time @@ -208806,7 +209565,7 @@ self: { aeson base bytestring hspec QuickCheck text unordered-containers ]; description = "Haskell client library for the Pusher Channels HTTP API"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "pusher-ws" = callPackage @@ -208825,8 +209584,8 @@ self: { unordered-containers websockets wuss ]; description = "Implementation of the Pusher WebSocket protocol"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -208852,8 +209611,8 @@ self: { transformers unix unordered-containers yaml ]; description = "Tool to synchronize directories with rsync, zfs or git-annex"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -208874,7 +209633,7 @@ self: { base bytestring http-client tasty tasty-hunit text time ]; description = "A Haskell Pushover API library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "putlenses" = callPackage @@ -208890,8 +209649,8 @@ self: { template-haskell transformers ]; description = "Put-based lens library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -208923,8 +209682,8 @@ self: { tasty tasty-hspec tasty-hunit text yaml ]; description = "Creating graphics for pencil puzzles"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -208943,8 +209702,8 @@ self: { puzzle-draw yaml ]; description = "Creating graphics for pencil puzzles, command line tools"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -208963,7 +209722,7 @@ self: { async base deepseq genvalidity hspec primitive QuickCheck ]; description = "Mutable variable with primitive values"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pvd" = callPackage @@ -208982,8 +209741,8 @@ self: { ]; executableSystemDepends = [ libdevil ]; description = "A photo viewer daemon application with remote controlling abilities"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) libdevil;}; @@ -209007,7 +209766,7 @@ self: { ]; testHaskellDepends = [ base cryptonite tasty tasty-quickcheck ]; description = "Public Verifiable Secret Sharing"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "pwstore-cli" = callPackage @@ -209028,7 +209787,7 @@ self: { test-framework-hunit ]; description = "Command line interface for the pwstore library"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "pwstore-fast" = callPackage @@ -209043,7 +209802,7 @@ self: { base base64-bytestring binary byteable bytestring cryptohash random ]; description = "Secure password storage"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pwstore-purehaskell" = callPackage @@ -209058,7 +209817,7 @@ self: { base base64-bytestring byteable bytestring random SHA ]; description = "Secure password storage, in pure Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "pxsl-tools" = callPackage @@ -209088,8 +209847,8 @@ self: { ]; libraryPkgconfigDepends = [ python ]; description = "Call python inline from haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) python;}; @@ -209106,8 +209865,8 @@ self: { ]; libraryPkgconfigDepends = [ python ]; description = "Call python inline from haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) python;}; @@ -209131,8 +209890,8 @@ self: { test-framework-hunit ]; description = "Serialization/deserialization using Python Pickle format"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -209151,8 +209910,8 @@ self: { base doctest lens lens-properties tasty tasty-quickcheck ]; description = "Efficient alternating finger trees"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -209166,8 +209925,8 @@ self: { base fclabels QuickCheck template-haskell ]; description = "Compile time generation of operation invariance tests for QuickCheck"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -209184,7 +209943,7 @@ self: { executableHaskellDepends = [ base hmatrix ]; testHaskellDepends = [ base hmatrix linear tasty tasty-hunit ]; description = "A library for implementing Quantum Algorithms"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "qd" = callPackage @@ -209196,8 +209955,8 @@ self: { libraryHaskellDepends = [ base floatshow ]; librarySystemDepends = [ qd ]; description = "double-double and quad-double number type via libqd"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {qd = null;}; @@ -209209,8 +209968,8 @@ self: { sha256 = "0lj5kg0sjkck89phvi239xb2k7hxmxg9dh7yg2df2iaj4c2m2ync"; libraryHaskellDepends = [ base qd Vec ]; description = "'Vec' instances for 'qd' types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -209229,8 +209988,8 @@ self: { ]; testHaskellDepends = [ base transformers ]; description = "Simple prover"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -209254,8 +210013,8 @@ self: { process simple-sql-parser split sqlite-simple syb text zlib ]; description = "Command line tool qhs, SQL queries on CSV and TSV files"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -209268,8 +210027,8 @@ self: { libraryHaskellDepends = [ base vector ]; librarySystemDepends = [ qhull ]; description = "Simple bindings to Qhull, a library for computing convex hulls"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) qhull;}; @@ -209289,8 +210048,8 @@ self: { tasty-quickcheck text time ]; description = "A simple QIF file format parser / printer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -209311,8 +210070,8 @@ self: { template-haskell ]; description = "Typesafe library for linear algebra"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -209329,7 +210088,7 @@ self: { ]; testHaskellDepends = [ base hspec ]; description = "Implementation of interpolated multiline strings"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "qnap-decrypt" = callPackage @@ -209360,7 +210119,7 @@ self: { temporary utf8-string ]; description = "Decrypt files encrypted by QNAP's Hybrid Backup Sync"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "qq-literals" = callPackage @@ -209374,7 +210133,7 @@ self: { libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base network-uri template-haskell ]; description = "Compile-time checked literal values via QuasiQuoters"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "qr-imager" = callPackage @@ -209393,8 +210152,8 @@ self: { libraryPkgconfigDepends = [ qrencode ]; testHaskellDepends = [ base hspec ]; description = "Library to generate images"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) qrencode;}; @@ -209414,8 +210173,8 @@ self: { ]; executableHaskellDepends = [ base bytestring ]; description = "Library to generate QR codes from bytestrings and objects and scale image files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -209428,7 +210187,7 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ array base containers mtl vector ]; description = "QR Code library in pure Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "qrcode-core" = callPackage @@ -209444,7 +210203,7 @@ self: { text vector ]; description = "QR code library in pure Haskell"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "qrcode-juicypixels" = callPackage @@ -209460,7 +210219,7 @@ self: { vector ]; description = "Converts a qrcode-core image to JuicyPixels"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "qsem" = callPackage @@ -209471,8 +210230,8 @@ self: { sha256 = "1y9c22jr0frflgzmpzpz4d7zgcz7wbql8xwr6bx912rh6gm4gx9h"; libraryHaskellDepends = [ base ghc-prim ]; description = "quantity semaphores"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -209490,7 +210249,7 @@ self: { ]; description = "Qt bindings"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {qtc_core = null; qtc_gui = null; qtc_network = null; qtc_opengl = null; qtc_script = null; qtc_tools = null;}; @@ -209506,8 +210265,8 @@ self: { libraryHaskellDepends = [ base process qtah-generator ]; librarySystemDepends = [ qtbase ]; description = "Qt bindings for Haskell - C++ library"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs.qt5) qtbase;}; @@ -209525,8 +210284,8 @@ self: { base binary bytestring containers filepath hoppy-runtime qtah-qt5 ]; description = "Example programs for Qtah Qt bindings"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -209549,8 +210308,8 @@ self: { ]; doHaddock = false; description = "Generator for Qtah Qt bindings"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -209570,8 +210329,8 @@ self: { libraryToolDepends = [ qtbase ]; testHaskellDepends = [ base hoppy-runtime HUnit ]; description = "Qt bindings for Haskell"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs.qt5) qtbase;}; @@ -209585,7 +210344,7 @@ self: { aeson attoparsec base http-types mtl text ]; description = "Convenience parser combinators for URI query strings"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "quadratic-irrational" = callPackage @@ -209605,7 +210364,7 @@ self: { tasty tasty-quickcheck ]; description = "An implementation of quadratic irrationals"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "quandl-api" = callPackage @@ -209622,7 +210381,7 @@ self: { text time time-locale-compat unordered-containers ]; description = "Quandl.com API library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "quantfin" = callPackage @@ -209641,8 +210400,8 @@ self: { ]; executableHaskellDepends = [ base ]; description = "Quant finance library in pure Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -209661,8 +210420,8 @@ self: { unordered-containers vector ]; description = "Rage against the quantification"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -209683,7 +210442,7 @@ self: { regex-compat ]; description = "Unit conversion and manipulation library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "quantum-arrow" = callPackage @@ -209695,7 +210454,7 @@ self: { libraryHaskellDepends = [ base MonadRandom mtl QuickCheck random ]; description = "An embedding of quantum computation as a Haskell arrow"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -209718,8 +210477,8 @@ self: { executableHaskellDepends = [ base haskeline mtl ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "Retrieve, store and manage real quantum random data"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -209741,8 +210500,8 @@ self: { servant-server stm text time uuid wai wai-extra warp warp-tls ]; description = "Coronavirus quarantine timer web app for your things"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -209761,8 +210520,8 @@ self: { ]; executableToolDepends = [ alex happy ]; description = "Quite Useless DB"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -209785,8 +210544,8 @@ self: { ]; executableHaskellDepends = [ base ]; description = "Quenya verb conjugator"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.agpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -209806,8 +210565,8 @@ self: { ]; benchmarkHaskellDepends = [ base criterion text ]; description = "Analysis and parsing library for SQL queries"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -209824,8 +210583,8 @@ self: { unordered-containers ]; description = "Demo package containing queryparser examples"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -209845,8 +210604,8 @@ self: { text unordered-containers yaml ]; description = "Parsing for Hive SQL queries"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -209866,8 +210625,8 @@ self: { text unordered-containers yaml ]; description = "Parsing for Presto SQL queries"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -209887,8 +210646,8 @@ self: { text unordered-containers yaml ]; description = "Parsing for Vertica SQL queries"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -209907,7 +210666,7 @@ self: { ]; description = "Picklers for de/serialising Generic data types to and from query strings"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "questioner" = callPackage @@ -209922,8 +210681,8 @@ self: { ansi-terminal base readline terminal-size ]; description = "A package for prompting values from the command-line"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -209935,7 +210694,7 @@ self: { sha256 = "0fx2svkj2sy2wd056lha9h20hy2z6gjspzl11jmv7i3rdwwfr6f7"; libraryHaskellDepends = [ base stm ]; description = "Abstraction typeclasses for queue-like things"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "queuelike" = callPackage @@ -209946,8 +210705,8 @@ self: { sha256 = "0nvs9ln55wrczpn948i4z110rbfp0rv2wv8iz94lbyxhilhyjf1z"; libraryHaskellDepends = [ array base containers mtl stateful-mtl ]; description = "A library of queuelike data structures, both functional and stateful"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -209959,7 +210718,7 @@ self: { sha256 = "1bccyvm300bkm3n98ayjc3syfcakjnf26bs2mdqdjimdfw2f0g6n"; libraryHaskellDepends = [ base QuickCheck ]; description = "Generator random test data for QuickCheck"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "quick-schema" = callPackage @@ -209978,8 +210737,8 @@ self: { vector ]; description = "Slimmed down json schema language and validator"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -210001,7 +210760,7 @@ self: { testHaskellDepends = [ base ]; description = "quick & easy benchmarking of command-line programs"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -210020,8 +210779,8 @@ self: { thyme yaml ]; description = "QuickBooks API binding"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -210038,7 +210797,7 @@ self: { base hspec lens QuickCheck template-haskell transformers ]; description = "Generic typeclasses for generating arbitrary ADTs"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "quickcheck-arbitrary-template" = callPackage @@ -210055,8 +210814,8 @@ self: { tasty-quickcheck template-haskell ]; description = "Generate QuickCheck Gen for Sum Types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -210069,7 +210828,7 @@ self: { libraryHaskellDepends = [ base ieee754 pretty-show QuickCheck ]; testHaskellDepends = [ base hspec ieee754 QuickCheck ]; description = "HUnit like assertions for QuickCheck"; - license = stdenv.lib.licenses.lgpl3; + license = lib.licenses.lgpl3; }) {}; "quickcheck-classes" = callPackage @@ -210092,7 +210851,7 @@ self: { semigroupoids tagged tasty tasty-quickcheck transformers vector ]; description = "QuickCheck common typeclasses"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "quickcheck-classes-base" = callPackage @@ -210108,7 +210867,7 @@ self: { QuickCheck tagged transformers ]; description = "QuickCheck common typeclasses from `base`"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "quickcheck-combinators" = callPackage @@ -210118,7 +210877,7 @@ self: { version = "0.0.5"; sha256 = "0qdjls949kmcv8wj3a27p4dz8nb1dq4i99zizkw7qyqn47r9ccxd"; libraryHaskellDepends = [ base QuickCheck unfoldable-restricted ]; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "quickcheck-enum-instances" = callPackage @@ -210129,7 +210888,7 @@ self: { sha256 = "117lpk15z288ad1bzakwf1z0jcdm7w5c0584lzwpgkmgqr3jgzdc"; libraryHaskellDepends = [ base enum-types QuickCheck ]; description = "arbitrary instances for small enum types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "quickcheck-higherorder" = callPackage @@ -210145,7 +210904,7 @@ self: { libraryHaskellDepends = [ base QuickCheck test-fun ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; description = "QuickCheck extension for higher-order properties"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "quickcheck-instances" = callPackage @@ -210170,7 +210929,7 @@ self: { ]; benchmarkHaskellDepends = [ base bytestring QuickCheck ]; description = "Common quickcheck instances"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "quickcheck-io" = callPackage @@ -210181,7 +210940,7 @@ self: { sha256 = "08k4v7pkgjf30pv5j2dfv1gqv6hclxlniyq2sps8zq4zswcr2xzv"; libraryHaskellDepends = [ base HUnit QuickCheck ]; description = "Use HUnit assertions as QuickCheck properties"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "quickcheck-poly" = callPackage @@ -210197,8 +210956,8 @@ self: { regex-tdfa ]; description = "Automating QuickCheck for polymorphic and overlaoded properties"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -210210,7 +210969,7 @@ self: { sha256 = "0hr61w1wpah1p4h87iz17aby53ysa8waqsl0als8b69in0zyv29w"; libraryHaskellDepends = [ base ]; description = "QuickCheck properties for standard type classes"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "quickcheck-property-comb" = callPackage @@ -210221,8 +210980,8 @@ self: { sha256 = "0wqz2amhwf1djbwwdin142mzp94mxbzb12khznijissjdz38knp5"; libraryHaskellDepends = [ base mtl QuickCheck ]; description = "Combinators for Quickcheck Property construction and diagnostics"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -210234,8 +210993,8 @@ self: { sha256 = "0sp7592jfh6i8xsykl2lv8bspnp755fnpqvqa09dhwq6hm0r1r9c"; libraryHaskellDepends = [ base either QuickCheck transformers ]; description = "A monad for generating QuickCheck properties without Arbitrary instances"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -210251,8 +211010,8 @@ self: { base containers QuickCheck regex-genex regex-tdfa ]; description = "Generate regex-constrained strings for QuickCheck"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -210268,8 +211027,8 @@ self: { base hxt hxt-relaxng QuickCheck quickcheck-regex ]; description = "Generate RelaxNG-constrained XML documents for QuickCheck"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -210282,8 +211041,8 @@ self: { libraryHaskellDepends = [ base QuickCheck rematch ]; testHaskellDepends = [ base hspec HUnit QuickCheck rematch ]; description = "QuickCheck support for rematch"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -210299,8 +211058,8 @@ self: { base lens QuickCheck template-haskell th-printf ]; description = "Customizable reports for quickcheck properties"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -210314,7 +211073,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base directory process QuickCheck ]; description = "Automated test tool for QuickCheck"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "quickcheck-simple" = callPackage @@ -210325,7 +211084,7 @@ self: { sha256 = "0ah32y1p39p3d0696zp4mlf4bj67ggh73sb8nvf21snkwll86dai"; libraryHaskellDepends = [ base QuickCheck ]; description = "Test properties and default-mains for QuickCheck"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "quickcheck-special" = callPackage @@ -210338,7 +211097,7 @@ self: { editedCabalFile = "1whwmij115vw0qwkzlkc4z4yhj7iwwqjhf5aaxn5np0gh2gzihb3"; libraryHaskellDepends = [ base QuickCheck special-values ]; description = "Edge cases and special values for QuickCheck Arbitrary instances"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "quickcheck-state-machine" = callPackage @@ -210375,8 +211134,8 @@ self: { tree-diff unliftio unliftio-core vector wai warp ]; description = "Test monadic programs using state machine based models"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -210400,8 +211159,8 @@ self: { strict tasty tasty-quickcheck temporary ]; description = "Test monadic programs using state machine based models"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -210418,8 +211177,8 @@ self: { base QuickCheck tasty tasty-quickcheck text ]; description = "Helper to build generators with Text.StringRandom"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -210432,7 +211191,7 @@ self: { libraryHaskellDepends = [ base binary bytestring QuickCheck text ]; testHaskellDepends = [ base bytestring QuickCheck text ]; description = "Alternative arbitrary instance for Text"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "quickcheck-transformer" = callPackage @@ -210443,7 +211202,7 @@ self: { sha256 = "0al0p44qi9j829zcnv43kqf4pxaxr6fb48vkq1an15hdk6svx11j"; libraryHaskellDepends = [ base QuickCheck random transformers ]; description = "A GenT monad transformer for QuickCheck library"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "quickcheck-unicode" = callPackage @@ -210454,7 +211213,7 @@ self: { sha256 = "0s43s1bzbg3gwsjgm7fpyksd1339f0m26dlw2famxwyzgvm0a80k"; libraryHaskellDepends = [ base QuickCheck ]; description = "Generator and shrink functions for testing Unicode-related software"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }) {}; "quickcheck-webdriver" = callPackage @@ -210465,8 +211224,8 @@ self: { sha256 = "12jkj8jy4f0mix658pd8jfgwx268fs3bbqz90mac1vvag4c72i0h"; libraryHaskellDepends = [ base QuickCheck transformers webdriver ]; description = "Utilities for using WebDriver with QuickCheck"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -210478,7 +211237,7 @@ self: { sha256 = "0shigzw0r59cwa22f56522qfv0lsaq1z2861lgy1lhhclzswr6zg"; libraryHaskellDepends = [ base QuickCheck template-haskell ]; description = "Get counterexamples from QuickCheck as Haskell values"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "quickjs-hs" = callPackage @@ -210501,7 +211260,7 @@ self: { tasty-quickcheck text unordered-containers vector ]; description = "Wrapper for the QuickJS Javascript Engine"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "quicklz" = callPackage @@ -210518,7 +211277,7 @@ self: { test-framework-quickcheck2 ]; description = "QuickLZ compression for ByteStrings"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }) {}; "quickpull" = callPackage @@ -210533,8 +211292,8 @@ self: { executableHaskellDepends = [ base directory filepath QuickCheck ]; testHaskellDepends = [ base directory filepath QuickCheck ]; description = "Generate Main module with QuickCheck tests"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -210549,7 +211308,7 @@ self: { libraryHaskellDepends = [ base vector ]; testHaskellDepends = [ base doctest QuickCheck vector ]; benchmarkHaskellDepends = [ base criterion random vector ]; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "quickset" = callPackage @@ -210560,8 +211319,8 @@ self: { sha256 = "0xiw57wi9z567nmp4h0vfcw3sr9dciy29jadn47bvi3q278v7zdy"; libraryHaskellDepends = [ base vector vector-algorithms ]; description = "Very fast and memory-compact query-only set and map structures"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -210573,7 +211332,7 @@ self: { sha256 = "1aa56ng45la91kd40hvqmg5mdprmw7mdgg0zjfz0l71qg2yka14a"; libraryHaskellDepends = [ aeson attoparsec base bytestring text ]; description = "Quick JSON extractions with Aeson"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "quickspec" = callPackage @@ -210591,7 +211350,7 @@ self: { twee-lib uglymemo ]; description = "Equational laws for free!"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "quickterm" = callPackage @@ -210609,7 +211368,7 @@ self: { ]; executableHaskellDepends = [ base ]; description = "An interface for describing and executing terminal applications"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "quicktest" = callPackage @@ -210624,8 +211383,8 @@ self: { base directory haskell98 mtl process ]; description = "A reflective batch tester for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -210644,8 +211403,8 @@ self: { servant-server text warp ]; description = "A quick webapp generator for any file processing tool"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -210658,7 +211417,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Generic deriving of Read/Show with no record labels"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "quipper" = callPackage @@ -210674,8 +211433,8 @@ self: { ]; doHaddock = false; description = "Meta-package for Quipper"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -210699,8 +211458,8 @@ self: { ]; executableHaskellDepends = [ base ]; description = "A set of algorithms implemented in Quipper"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -210716,8 +211475,8 @@ self: { ]; doHaddock = false; description = "Meta-package for Quipper"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -210729,8 +211488,8 @@ self: { sha256 = "0kj7836h61h13kw4k74wfa96pr0w12k32mmmy0ry43wmk56zy318"; libraryHaskellDepends = [ base Cabal process quipper-language ]; description = "Some functions to aid in the creation of Cabal packages for Quipper"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -210746,8 +211505,8 @@ self: { base containers mtl primes random template-haskell ]; description = "An embedded, scalable functional programming language for quantum computing"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -210768,8 +211527,8 @@ self: { ]; doHaddock = false; description = "Miscellaneous code snippets that illustrate various Quipper features"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -210790,8 +211549,8 @@ self: { ]; executableHaskellDepends = [ base process ]; description = "Quipper, an embedded functional programming language for quantum computation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -210814,8 +211573,8 @@ self: { quipper-utils random ]; description = "The standard libraries for Quipper"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -210832,8 +211591,8 @@ self: { quipper-core random template-haskell unix ]; description = "An embedded, scalable functional programming language for quantum computing"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -210855,8 +211614,8 @@ self: { ]; doHaddock = false; description = "Miscellaneous stand-alone tools for Quipper"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -210873,8 +211632,8 @@ self: { base containers mtl newsynth process random template-haskell unix ]; description = "Utility libraries for Quipper"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -210886,8 +211645,8 @@ self: { sha256 = "1gg02lnrd2c1wq8zhbj8n355v23ijzm5nj0jyply91sppjma9w7x"; libraryHaskellDepends = [ base mmorph transformers ]; description = "Quiver finite stream processing library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -210904,8 +211663,8 @@ self: { ]; testHaskellDepends = [ base hspec QuickCheck quiver transformers ]; description = "Binary serialisation support for Quivers"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -210917,8 +211676,8 @@ self: { sha256 = "1iwp6z76n2iramd21l2j9gvsqzq3j90qprblscp1yvk73fq4vcmz"; libraryHaskellDepends = [ base bytestring quiver ]; description = "Quiver combinators for bytestring streaming"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -210930,8 +211689,8 @@ self: { sha256 = "0l8c5vhhbjlijvx27mda62y6sq6lr7irva6c47fhvf26zfgx41p8"; libraryHaskellDepends = [ base data-cell quiver ]; description = "Quiver combinators for cellular data processing"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -210947,8 +211706,8 @@ self: { base bytestring data-cell quiver quiver-bytestring ]; description = "Quiver combinators for cellular CSV data processing"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -210960,8 +211719,8 @@ self: { sha256 = "0k0822yzlxkb6b46834hm3bad3x1gma1gqcjl9ryxpqsl73nc4mp"; libraryHaskellDepends = [ base enumerator quiver ]; description = "Bridge between Quiver and Iteratee paradigms"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -210974,8 +211733,8 @@ self: { libraryHaskellDepends = [ base dlist quiver ]; testHaskellDepends = [ base hspec QuickCheck quiver ]; description = "Group and chunk values within a Quiver"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -210993,8 +211752,8 @@ self: { base bytestring http-client http-client-tls quiver ]; description = "Adapter to stream over HTTP(s) with quiver"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -211010,8 +211769,8 @@ self: { base exceptions quiver resourcet transformers transformers-base ]; description = "Extra instances for Quiver"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -211024,8 +211783,8 @@ self: { libraryHaskellDepends = [ base quiver ]; testHaskellDepends = [ base hspec QuickCheck quiver ]; description = "Interleave values from multiple Quivers"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -211049,8 +211808,8 @@ self: { quiver-instances resourcet temporary transformers ]; description = "Sort the values in a quiver"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -211069,8 +211828,8 @@ self: { base hspec postgresql-simple raw-strings-qq text ]; description = "Test helpers which help generate data for projects that use postgresql"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -211095,8 +211854,8 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base HUnit mtl ]; description = "A Quoridor implementation in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -211112,7 +211871,7 @@ self: { ]; benchmarkHaskellDepends = [ base template-haskell ]; description = "Divide without division"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "qux" = callPackage @@ -211130,8 +211889,8 @@ self: { llvm-general mtl optparse-applicative pretty ]; description = "Command line binary for working with the Qux language"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -211154,7 +211913,7 @@ self: { ukrainian-phonetics-basic-array ]; description = "Can be used to calculate the durations of the approximations of the Ukrainian phonemes"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "r3x-haskell-sdk" = callPackage @@ -211180,7 +211939,7 @@ self: { aeson base blaze-html bytestring case-insensitive containers cookie http-types mtl regex-pcre text transformers wai warp ]; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "raaz" = callPackage @@ -211206,8 +211965,8 @@ self: { pretty ]; description = "The raaz cryptographic library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -211237,8 +211996,8 @@ self: { sha256 = "19g2lc3vmnapccdxf390cmkfl9bd3agcn01kk8ccd4lmaqn2c12d"; libraryHaskellDepends = [ array base containers data-reify ]; description = "Reverse Automatic Differentiation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -211253,8 +212012,8 @@ self: { libraryHaskellDepends = [ base profunctors ]; testHaskellDepends = [ base HUnit lens ]; description = "Isomorphisms for measurements that use radians"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -211271,8 +212030,8 @@ self: { base Cabal containers hspec lens parsec QuickCheck ]; description = "Chemistry"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -211288,8 +212047,8 @@ self: { base Cabal containers hspec parsec QuickCheck ]; description = "Chemistry"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -211305,7 +212064,7 @@ self: { base binary bytestring cryptonite iproute lens memory ]; description = "Remote Authentication Dial In User Service (RADIUS)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "radix" = callPackage @@ -211318,8 +212077,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base filepath ]; description = "Command-line tool for emitting numbers in various bases"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -211344,7 +212103,7 @@ self: { unordered-containers ]; description = "Radix tree data structive over short byte-strings"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "radixtree" = callPackage @@ -211365,7 +212124,7 @@ self: { benchmarkHaskellDepends = [ attoparsec base criterion deepseq QuasiText text vector ]; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "rados-haskell" = callPackage @@ -211388,8 +212147,8 @@ self: { async base bytestring criterion mtl transformers ]; description = "librados haskell bindings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {rados = null;}; @@ -211408,8 +212167,8 @@ self: { tostring zlib ]; description = "Miscellaneous Haskell utilities for data structures and data manipulation"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -211432,8 +212191,8 @@ self: { ]; testHaskellDepends = [ base containers HUnit process ]; description = "Compiler and editor for the esolang rail"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -211457,8 +212216,8 @@ self: { transformers vector ]; description = "Decrypt Ruby on Rails sessions in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -211474,7 +212233,7 @@ self: { base bytestring lens QuickCheck terminfo text ]; description = "Print text to terminal with colors and effects"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "rainbow-tests" = callPackage @@ -211489,8 +212248,8 @@ self: { barecheck base QuickCheck rainbow terminfo text ]; description = "Tests and QuickCheck generators to accompany rainbow"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -211510,7 +212269,7 @@ self: { tasty-quickcheck text ]; description = "Two-dimensional box pretty printing, with colors"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "rake" = callPackage @@ -211551,8 +212310,8 @@ self: { ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "distributed-process node"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -211569,8 +212328,8 @@ self: { transformers vector zlib ]; description = "Stream based PDF library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -211595,8 +212354,8 @@ self: { http-types lens req servant-server text warp ]; description = "The Rakuten API in Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -211616,7 +212375,7 @@ self: { ]; benchmarkHaskellDepends = [ base criterion vector ]; description = "Random access lists"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; }) {}; "ral-lens" = callPackage @@ -211629,7 +212388,7 @@ self: { editedCabalFile = "0j7lxlbj2klhcx12xixp3glhbvc9k1pccaiqm2kqr5l3lkrcnirv"; libraryHaskellDepends = [ base bin fin lens ral ]; description = "Length-indexed random access lists: lens utilities"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; }) {}; "ral-optics" = callPackage @@ -211642,23 +212401,25 @@ self: { editedCabalFile = "0b2j3iqzbaly8niw3snsmn1z5a34kv4jw8sh3fscsja6zfx0ffgv"; libraryHaskellDepends = [ base bin fin optics-core ral ]; description = "Length-indexed random access lists: optics utilities"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; }) {}; "ralist" = callPackage - ({ mkDerivation, base, criterion, deepseq, hspec }: + ({ mkDerivation, base, criterion, deepseq, hspec + , indexed-traversable, transformers + }: mkDerivation { pname = "ralist"; - version = "0.2.1.1"; - sha256 = "0fy8c36ygdn609nq6wasc685y3z7g188nkhym7bpb7rigi1si7xj"; - revision = "1"; - editedCabalFile = "187idyc9b2q476xxxnpgglf818vp701ww0ir5j4dn96g0qwni8xb"; - libraryHaskellDepends = [ base ]; + version = "0.3.0.0"; + sha256 = "1qy6y7fcylbp6lym7y1k0bg28imhrfxrkvlfrm9mxg3lhvl71mrf"; + libraryHaskellDepends = [ + base deepseq indexed-traversable transformers + ]; testHaskellDepends = [ base hspec ]; benchmarkHaskellDepends = [ base criterion deepseq ]; description = "Random access list with a list compatible interface"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -211671,8 +212432,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base haskell98 ]; description = "'$' in reverse"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -211688,8 +212449,8 @@ self: { aeson base bytestring text unordered-containers yaml ]; description = "RESTful API Modeling Language (RAML) library for Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -211703,7 +212464,7 @@ self: { testHaskellDepends = [ base hspec ]; benchmarkHaskellDepends = [ base criterion ]; description = "🏰 Determine how intervals relate to each other"; - license = stdenv.lib.licenses.isc; + license = lib.licenses.isc; }) {}; "ramus" = callPackage @@ -211717,7 +212478,7 @@ self: { testHaskellDepends = [ base hspec QuickCheck quickcheck-io ]; benchmarkHaskellDepends = [ base criterion ]; description = "Elm signal system for Haskell"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "rand-vars" = callPackage @@ -211728,8 +212489,8 @@ self: { sha256 = "165jvx59vzmpxp7gw60ivfka77kgc1irwijikkwja7jb4dm4ay3x"; libraryHaskellDepends = [ array base IntervalMap mtl random ]; description = "Random variable library, with Functor, Applicative and Monad instances"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -211748,8 +212509,8 @@ self: { unix ]; description = "Program for picking a random file"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -211764,8 +212525,8 @@ self: { base containers microspec tf-random vector ]; description = "Easy-to-use randomness for livecoding"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -211780,7 +212541,7 @@ self: { libraryHaskellDepends = [ base time ]; testHaskellDepends = [ base ]; description = "random number library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "random_1_2_0" = callPackage @@ -211805,8 +212566,8 @@ self: { base gauge mtl rdtsc split splitmix time ]; description = "Pseudo-random number generation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "random-access-file" = callPackage @@ -211828,7 +212589,7 @@ self: { vector ]; description = "Random file access methods, supporting application-level page cache"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "random-access-list" = callPackage @@ -211839,8 +212600,8 @@ self: { sha256 = "1ymbs3f38l6ch0nphsy9pi32yb1a4hazn3grm9fl0dvgqw28xl8r"; libraryHaskellDepends = [ array base containers ]; description = "Random-access lists in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -211858,7 +212619,7 @@ self: { mwc-random pcg-random primitive random ]; description = "Efficient generation of random bytestrings"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "random-class" = callPackage @@ -211871,7 +212632,7 @@ self: { editedCabalFile = "125p09srh4kxj5bnjsl3i2jn4q09ci3kbyb96pb9kmzz1jn4i0rz"; libraryHaskellDepends = [ base primitive transformers util ]; description = "Class of random value generation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "random-derive" = callPackage @@ -211882,8 +212643,8 @@ self: { sha256 = "08irzyg8cgigj009zp5hg33gdwranrdyyzrxhmwyib6fm5bmsj8p"; libraryHaskellDepends = [ base random template-haskell ]; description = "A Template Haskell helper for deriving Random instances"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -211895,8 +212656,8 @@ self: { sha256 = "1m28np0zfabp1n1d08przh35bxfr1l7d39kj4a5z61jkchmsaxyf"; libraryHaskellDepends = [ base extensible-effects random ]; description = "A simple random generator library for extensible-effects"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -211908,8 +212669,8 @@ self: { sha256 = "0p1n5dfdsp00q9mlhd7xcl93k5d0wji91p59858gmfx9xf8j0p0h"; libraryHaskellDepends = [ base effin random ]; description = "A simple random generator library for effin"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -211924,7 +212685,7 @@ self: { array base containers random-fu random-source ]; description = "Additional functions for random values"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "random-fu" = callPackage @@ -211941,7 +212702,7 @@ self: { random-source rvar syb template-haskell transformers vector ]; description = "Random number generation"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "random-fu_0_2_7_7" = callPackage @@ -211958,8 +212719,8 @@ self: { random-source rvar syb template-haskell transformers vector ]; description = "Random number generation"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; }) {}; "random-fu-multivariate" = callPackage @@ -211971,7 +212732,7 @@ self: { libraryHaskellDepends = [ base hmatrix mtl random-fu ]; testHaskellDepends = [ base ]; description = "Multivariate distributions for random-fu"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "random-hypergeometric" = callPackage @@ -211988,8 +212749,8 @@ self: { QuickCheck random-fu vector ]; description = "Random variate generation from hypergeometric distributions"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -212001,7 +212762,7 @@ self: { sha256 = "1sj88ccw4pnqlwbga78pvsvzib4irg7xzz4lhqs89xkdz7l043dy"; libraryHaskellDepends = [ base QuickCheck random safe text ]; description = "Expose Random and Arbitrary instances"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "random-shuffle" = callPackage @@ -212012,7 +212773,7 @@ self: { sha256 = "0586bnlh0g2isc44jbjvafkcl4yw6lp1db8x6vr0pza0y08l8w2j"; libraryHaskellDepends = [ base MonadRandom random ]; description = "Random shuffle implementation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "random-source" = callPackage @@ -212029,7 +212790,7 @@ self: { primitive random stateref syb template-haskell th-extras ]; description = "Generic basis for random number generators"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "random-source_0_3_0_11" = callPackage @@ -212046,8 +212807,8 @@ self: { primitive random stateref syb template-haskell th-extras ]; description = "Generic basis for random number generators"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; }) {}; "random-stream" = callPackage @@ -212058,8 +212819,8 @@ self: { sha256 = "0q191kz3hmjzrgs143nja5gcis07igb38f51mwqw64zx7vjqvx66"; libraryHaskellDepends = [ base binary bytestring random ]; description = "An infinite stream of random data"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -212076,7 +212837,7 @@ self: { bytestring entropy ]; description = "Generate a random base 16, 58, or 64 string"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "random-strings" = callPackage @@ -212091,7 +212852,7 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base containers mtl QuickCheck ]; description = "Generate random strings with specific qualities"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "random-tree" = callPackage @@ -212107,7 +212868,7 @@ self: { transformers tree-fun ]; description = "Create random trees"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "random-variates" = callPackage @@ -212127,7 +212888,7 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base directory HUnit random ]; description = "\"Uniform RNG => Non-Uniform RNGs\""; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "randomgen" = callPackage @@ -212145,7 +212906,7 @@ self: { ]; executableSystemDepends = [ openssl ]; description = "A fast, SMP parallel random data generator"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) openssl;}; "randproc" = callPackage @@ -212156,7 +212917,7 @@ self: { sha256 = "0fb0239fwvn1n3rbdr03k4kx1igzbb638a1iq0ln1k1i1fpaayd7"; libraryHaskellDepends = [ base ]; description = "Data structures and support functions for working with random processes"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "randsolid" = callPackage @@ -212169,7 +212930,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base random X11 ]; description = "Set the background of your root window to a random colour"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "range" = callPackage @@ -212186,7 +212947,7 @@ self: { test-framework-quickcheck2 ]; description = "An efficient and versatile range library"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "range-set-list" = callPackage @@ -212204,7 +212965,7 @@ self: { base containers deepseq hashable tasty tasty-quickcheck ]; description = "Memory efficient sets with ranges of elements"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "range-space" = callPackage @@ -212224,8 +212985,8 @@ self: { test-framework-quickcheck2 time vector-space vector-space-points ]; description = "A Range type with vector-space instances"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -212237,8 +212998,8 @@ self: { sha256 = "01n1m3ibi44pjg04mg16j751fjzkspmnq8bzxz55qbyi22wshnwc"; libraryHaskellDepends = [ base containers primitive vector ]; description = "Linear range-min algorithms"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -212250,7 +213011,7 @@ self: { sha256 = "1ymvmvfvzkdxblg691g9n5y94gpiz782jgyvaisg5mydzj1s1fyv"; libraryHaskellDepends = [ base containers ]; description = "Ranges and various functions on them"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "rank-product" = callPackage @@ -212268,7 +213029,7 @@ self: { base bytestring cassava containers lens optparse-generic vector ]; description = "Find the rank product of a data set"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "rank1dynamic" = callPackage @@ -212284,7 +213045,7 @@ self: { base HUnit test-framework test-framework-hunit ]; description = "Like Data.Dynamic/Data.Typeable but with support for rank-1 polymorphic types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "rank2classes" = callPackage @@ -212305,7 +213066,7 @@ self: { ]; testToolDepends = [ markdown-unlit ]; description = "standard type constructor class hierarchy, only with methods of rank 2 types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "rapid" = callPackage @@ -212320,8 +213081,8 @@ self: { async base containers foreign-store stm ]; description = "Rapid prototyping with GHCi: hot reloading of running components and reload-surviving values"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -212337,8 +213098,8 @@ self: { base clock kan-extensions process transformers unix ]; description = "External terminal support for rapid"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -212363,8 +213124,8 @@ self: { base eve hspec lens QuickCheck quickcheck-instances text yi-rope ]; description = "A modular text editor"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -212384,8 +213145,8 @@ self: { rasa-ext-logger rasa-ext-slate rasa-ext-views rasa-ext-vim yi-rope ]; description = "Example user config for Rasa"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -212400,8 +213161,8 @@ self: { base containers data-default lens rasa text ]; description = "Rasa Ext for useful buffer utilities"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -212416,8 +213177,8 @@ self: { base containers data-default lens rasa text ]; description = "Rasa Ext for running commands"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -212433,8 +213194,8 @@ self: { base data-default lens mtl rasa text text-lens yi-rope ]; description = "Rasa Ext adding cursor(s)"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -212451,8 +213212,8 @@ self: { yi-rope ]; description = "Rasa Ext for filesystem actions"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -212464,8 +213225,8 @@ self: { sha256 = "1wv3bkfq92h7b91x88mzqcijbpb2kh7zkgg4ljxdx59qi4lb7hry"; libraryHaskellDepends = [ base lens mtl rasa ]; description = "Rasa Ext for logging state/actions"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -212482,8 +213243,8 @@ self: { text vty yi-rope ]; description = "Rasa extension for rendering to terminal with vty"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -212495,8 +213256,8 @@ self: { sha256 = "0grfj3qxlmk63x5cxrbibkhrrgij077f7sr0kj6vcl0np7a5dl98"; libraryHaskellDepends = [ base data-default lens rasa yi-rope ]; description = "Rasa Ext for populating status-bar"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -212508,8 +213269,8 @@ self: { sha256 = "198phwvsndsk149rj744znjzw8w2n0238pbv07d7rfs2c1987s04"; libraryHaskellDepends = [ base data-default lens rasa ]; description = "Rasa Ext managing rendering styles"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -212526,8 +213287,8 @@ self: { yi-rope ]; description = "Rasa Ext managing rendering views"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -212546,8 +213307,8 @@ self: { ]; testHaskellDepends = [ base hspec ]; description = "Rasa Ext for vim bindings"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -212576,8 +213337,8 @@ self: { tasty-quickcheck vector ]; description = "A command-line client for Reddit"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -212605,7 +213366,7 @@ self: { optparse-applicative Rasterific svg-tree ]; description = "SVG renderer based on Rasterific"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "rate-limit" = callPackage @@ -212616,7 +213377,7 @@ self: { sha256 = "0zb19vwzyj1vg890776r3bprmjzhs9kr2r1vqa42nxv9nvwvnljm"; libraryHaskellDepends = [ base stm time time-units ]; description = "A basic library for rate-limiting IO actions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ratel" = callPackage @@ -212634,7 +213395,7 @@ self: { ]; testHaskellDepends = [ base filepath hspec ]; description = "Notify Honeybadger about exceptions"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "ratel-wai" = callPackage @@ -212649,7 +213410,7 @@ self: { base bytestring case-insensitive containers http-client ratel wai ]; description = "Notify Honeybadger about exceptions via a WAI middleware"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "ratelimiter" = callPackage @@ -212667,7 +213428,7 @@ self: { base containers extra mtl time timespan vector ]; description = "In-memory rate limiter"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "rating-chgk-info" = callPackage @@ -212695,8 +213456,8 @@ self: { testHaskellDepends = [ base-noprelude relude ]; benchmarkHaskellDepends = [ base-noprelude gauge relude ]; description = "Client for rating.chgk.info API and CSV tables (documentation in Russian)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -212708,7 +213469,7 @@ self: { sha256 = "17mqfqvh59vid7sb0vr029az4pn8bb83axf706ngc6i5lir49709"; libraryHaskellDepends = [ base ]; description = "Implementations of several rating systems: Elo, Glicko, etc"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ratio-int" = callPackage @@ -212719,7 +213480,7 @@ self: { sha256 = "06kqr4iyi184sa8y2vdkw5h0pvh5f8lwcqb8mbcn34lpqm961s7g"; libraryHaskellDepends = [ base ]; description = "Fast specialisation of Data.Ratio for Int."; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "rational-list" = callPackage @@ -212735,8 +213496,8 @@ self: { base QuickCheck test-framework test-framework-quickcheck2 ]; description = "finite or repeating lists"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -212770,8 +213531,8 @@ self: { unix unordered-containers utf8-string ]; description = "Forward build system, with caching and speculation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -212783,8 +213544,8 @@ self: { }: mkDerivation { pname = "rattletrap"; - version = "9.3.2"; - sha256 = "06mb7z1w56hvwl9gbkmbbib01760ix93x03bdl0ybpb6hhffq7r3"; + version = "9.3.3"; + sha256 = "0c2q48vbqkvhd0m3sahn7ja8bxpj9xkgw2hkg9chrhj0amyp5xzk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -212795,8 +213556,8 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base bytestring filepath HUnit temporary ]; description = "Parse and generate Rocket League replays"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -212817,7 +213578,7 @@ self: { aeson base bytestring hspec time unordered-containers ]; description = "Haskell client for Sentry logging service"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "raven-haskell-scotty" = callPackage @@ -212832,8 +213593,8 @@ self: { base bytestring case-insensitive mtl raven-haskell scotty text wai ]; description = "Sentry http interface for Scotty web server"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -212857,8 +213618,8 @@ self: { tasty-th ]; description = "Resource-Aware Feldspar"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -212871,7 +213632,7 @@ self: { libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base HUnit ]; description = "Raw string literals for Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "rawfilepath" = callPackage @@ -212883,7 +213644,7 @@ self: { libraryHaskellDepends = [ base bytestring unix ]; testHaskellDepends = [ base bytestring ]; description = "Use RawFilePath instead of FilePath"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "rawr" = callPackage @@ -212900,8 +213661,8 @@ self: { ]; benchmarkHaskellDepends = [ base criterion deepseq ]; description = "Anonymous extensible records"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -212913,7 +213674,7 @@ self: { sha256 = "1zk82akj2p4hl9hqwr30fixqfkjlpnb02qwhhflvcpv8gnxpg88i"; libraryHaskellDepends = [ base bytestring template-haskell text ]; description = "Simple raw string quotation and dictionary interpolation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "raz" = callPackage @@ -212930,8 +213691,8 @@ self: { base containers criterion deepseq MonadRandom random transformers ]; description = "Random Access Zippers"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -212950,8 +213711,8 @@ self: { ]; testHaskellDepends = [ base QuickCheck regex-applicative smaoin ]; description = "Common text/parsing tools for Razom language packages"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -212972,7 +213733,7 @@ self: { ]; description = "RESTful Bitcoin Payment Channel Protocol Servant API description"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {bitcoin-payment-protocol = null;}; @@ -212988,7 +213749,7 @@ self: { executableHaskellDepends = [ base bio bytestring containers ]; description = "Mask nucleotide (EST) sequences in Fasta format"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -213011,8 +213772,8 @@ self: { ]; benchmarkHaskellDepends = [ base gauge mwc-random ]; description = "Randomized Binary Search Trees"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -213036,8 +213797,8 @@ self: { base dde hmatrix Learning linear random vector ]; description = "Reservoir Computing, fast RNNs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -213053,8 +213814,8 @@ self: { base binary bytestring data-binary-ieee754 network QuickCheck split ]; description = "Haskell client for Rserve"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -213083,7 +213844,7 @@ self: { primitive rdtsc time transformers ]; description = "Read-Copy-Update for Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "rdf" = callPackage @@ -213101,7 +213862,7 @@ self: { base bytestring criterion deepseq text ]; description = "Representation and Incremental Processing of RDF Data"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "rdf4h" = callPackage @@ -213131,7 +213892,7 @@ self: { ]; benchmarkHaskellDepends = [ base criterion deepseq text ]; description = "A library for RDF processing in Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "rdioh" = callPackage @@ -213153,8 +213914,8 @@ self: { transformers urlencoded ]; description = "A Haskell wrapper for Rdio's API"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -213166,7 +213927,7 @@ self: { sha256 = "0l6r5v6bgqf7lq9j6bf7w362bz7bv4xrsbz90ns60v4dyqjskjal"; libraryHaskellDepends = [ base ]; description = "Binding for the rdtsc machine instruction"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "rdtsc-enolan" = callPackage @@ -213177,7 +213938,7 @@ self: { sha256 = "0v3x7ga4gx5q4gwh8xdhb2arlmjyilr9igz28wysy9qqlcdw775q"; libraryHaskellDepends = [ base ]; description = "Binding to sources of high-efficiency, high-precision, monotonically increasing relative time"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "re2" = callPackage @@ -213190,7 +213951,7 @@ self: { librarySystemDepends = [ re2 ]; testHaskellDepends = [ base bytestring HUnit vector ]; description = "Bindings to the re2 regular expression library"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {inherit (pkgs) re2;}; "react-flux" = callPackage @@ -213208,8 +213969,8 @@ self: { unordered-containers ]; description = "A binding to React based on the Flux application architecture for GHCJS"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -213221,8 +213982,8 @@ self: { sha256 = "171q9h2yd78bcwsbhzhggin9wvnwc560vr73zw7abbx2q8aik4q4"; libraryHaskellDepends = [ aeson base react-flux servant text ]; description = "Allow react-flux stores to send requests to a servant server"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -213240,8 +214001,8 @@ self: { unordered-containers void ]; description = "Haskell React bindings"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -213259,8 +214020,8 @@ self: { aeson aeson-pretty base bytestring scotty time transformers ]; description = "react-tutorial web server"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.agpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -213275,8 +214036,8 @@ self: { libraryHaskellDepends = [ base mtl QuickCheck ]; executableHaskellDepends = [ base mtl QuickCheck ]; description = "pluggable pure logic serializable reactor"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -213294,7 +214055,7 @@ self: { ]; description = "Push-pull functional reactive programming"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "reactive-bacon" = callPackage @@ -213306,8 +214067,8 @@ self: { libraryHaskellDepends = [ base old-time stm ]; testHaskellDepends = [ base containers HUnit old-time stm ]; description = "FRP (functional reactive programming) framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -213329,8 +214090,8 @@ self: { reactive-midyim transformers utility-ht ]; description = "Programmatically edit MIDI events via ALSA and reactive-banana"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -213353,8 +214114,8 @@ self: { unordered-containers vault ]; description = "Library for functional reactive programming (FRP)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -213371,8 +214132,8 @@ self: { ]; testHaskellDepends = [ base doctest ]; description = "home (etc) automation using reactive-banana"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.agpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -213388,8 +214149,8 @@ self: { base non-empty reactive-banana transformers utility-ht ]; description = "Extend reactive-banana to multiple events per time point"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -213406,8 +214167,8 @@ self: { ]; testHaskellDepends = [ base ]; description = "Simple reactive programming with GTK GObject Introspection"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -213424,8 +214185,8 @@ self: { SDL-ttf ]; description = "Reactive Banana bindings for SDL"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -213438,8 +214199,8 @@ self: { libraryHaskellDepends = [ base reactive-banana sdl2 ]; testHaskellDepends = [ base ]; description = "Reactive Banana integration with SDL2"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -213454,8 +214215,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base reactive-banana threepenny-gui ]; description = "Examples for the reactive-banana library, using threepenny-gui"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -213473,8 +214234,8 @@ self: { base cabal-macosx reactive-banana wx wxcore ]; description = "Examples for the reactive-banana library, using wxHaskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -213491,8 +214252,8 @@ self: { vector-space ]; description = "Connect Reactive and FieldTrip"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -213508,8 +214269,8 @@ self: { base GLUT old-time OpenGL reactive vector-space ]; description = "Connects Reactive and GLUT"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -213521,7 +214282,7 @@ self: { sha256 = "115zjaymcx1dm7lwdqjq810j664a2kj8phrvjkhfkdsl95srqc85"; libraryHaskellDepends = [ base ]; description = "minimal fork of io-reactive"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "reactive-io" = callPackage @@ -213532,7 +214293,7 @@ self: { sha256 = "0s7a29cfzb2j5xvqykx1n5naci2np36zjs3qyq0i4yzjf3qprr63"; libraryHaskellDepends = [ base transformers ]; description = "IO-oriented FRP library"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "reactive-jack" = callPackage @@ -213552,8 +214313,8 @@ self: { utility-ht ]; description = "Process MIDI events via reactive-banana and JACK"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -213573,8 +214334,8 @@ self: { transformers utility-ht ]; description = "Process MIDI events via reactive-banana"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -213591,8 +214352,8 @@ self: { base monad-parallel SDL stm transformers ]; description = "Reactive programming via imperative threads"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -213611,7 +214372,7 @@ self: { ]; description = "An alternate implementation of push-pull FRP"; license = "GPL"; - platforms = stdenv.lib.platforms.none; + platforms = [ "armv7l-linux" ]; }) {}; "reactor" = callPackage @@ -213627,8 +214388,8 @@ self: { transformers ]; description = "Reactor - task parallel reactive programming"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -213640,8 +214401,8 @@ self: { sha256 = "0b2syhxan3fpf9h1zq3izpb8bgsl4qrk975afy3r2ji6dhjq81cl"; libraryHaskellDepends = [ base ]; description = "Class for reading bounded values"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -213664,8 +214425,8 @@ self: { testHaskellDepends = [ base bytestring containers directory hspec text ]; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -213679,7 +214440,7 @@ self: { isExecutable = true; libraryHaskellDepends = [ base directory process ]; description = "Opens a temporary file on the system's EDITOR and returns the resulting edits"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "read-env-var" = callPackage @@ -213691,7 +214452,7 @@ self: { libraryHaskellDepends = [ base exceptions transformers ]; testHaskellDepends = [ base doctest Glob ]; description = "Functions for safely reading environment variables"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "read-io" = callPackage @@ -213703,8 +214464,8 @@ self: { libraryHaskellDepends = [ base containers directory filepath ]; testHaskellDepends = [ base containers directory filepath hspec ]; description = "Read IO library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -213725,7 +214486,7 @@ self: { aeson base http-conduit optparse-applicative text xml-conduit ]; description = "Extracts text of main article from HTML document"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "readable" = callPackage @@ -213736,7 +214497,7 @@ self: { sha256 = "1ja39cg26wy2fs00gi12x7iq5k8i366pbqi3p916skfa5jnkfc3h"; libraryHaskellDepends = [ base bytestring text ]; description = "Reading from Text and ByteString"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "readcsv" = callPackage @@ -213749,7 +214510,7 @@ self: { editedCabalFile = "1lcgpdjlv1kaasyhk327cvkw4ar06mr7ks8xrkvxf27njdiv035s"; libraryHaskellDepends = [ base ]; description = "Lightweight CSV parser/emitter based on ReadP"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "reader-soup" = callPackage @@ -213766,7 +214527,7 @@ self: { transformers transformers-base unliftio-core vinyl ]; description = "Vinyl-based reader-like monad composition"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "readline" = callPackage @@ -213779,7 +214540,7 @@ self: { librarySystemDepends = [ ncurses readline ]; description = "An interface to the GNU readline library"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) ncurses; inherit (pkgs) readline;}; @@ -213791,8 +214552,8 @@ self: { sha256 = "1gfxs3wfdkkarxil2an5l58syrm2vajj0qpshzabzchni32yxic8"; libraryHaskellDepends = [ base readline StateVar ]; description = "Readline with variables (setX/getY) wrapped in state vars"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -213814,8 +214575,8 @@ self: { executableHaskellDepends = [ base numhask ]; testHaskellDepends = [ base doctest numhask ]; description = "Literate programming support"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -213829,8 +214590,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base bliplib parseargs ]; description = "Read and pretty print Python bytecode (.pyc) files."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -213848,8 +214609,8 @@ self: { base binary bytestring data-binary-ieee754 filepath monad-loops ]; description = "Code for reading ESRI Shapefiles"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -213866,7 +214627,7 @@ self: { base quickcheck-instances tasty tasty-quickcheck time ]; description = "Tiny library to calculate date considering when your day realy ends"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "really-simple-xml-parser" = callPackage @@ -213877,8 +214638,8 @@ self: { sha256 = "1qmrfisnvm9a25a9ssg4r466yna69vzbwn7s7f4zql28cndg3syy"; libraryHaskellDepends = [ base parsec ]; description = "A really simple XML parser"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -213896,8 +214657,8 @@ self: { }: mkDerivation { pname = "reanimate"; - version = "1.1.3.1"; - sha256 = "0x2pfbf712lixpj1mv1gvv26xi80shiq3798mkd0kqmvzkz57aqz"; + version = "1.1.3.2"; + sha256 = "006fj47pm7lqs4haq0i0nmz6syqx3v07qgnh4vjqlyqixk22cyy5"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson ansi-terminal array attoparsec base base64-bytestring @@ -213915,8 +214676,8 @@ self: { tasty-rerun temporary text vector ]; description = "Animation library based on SVGs"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -213942,8 +214703,8 @@ self: { tasty-quickcheck tasty-rerun temporary text typed-process vector ]; description = "SVG file loader and serializer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -213965,7 +214726,7 @@ self: { QuickCheck quickcheck-instances text time ]; description = "Generate Reason types from Haskell"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "reasonable-lens" = callPackage @@ -213976,8 +214737,8 @@ self: { sha256 = "0ic239ikxqsk4qjnyraka3jn4pjmmsgwqyga6zmqlw7z1kpgaxam"; libraryHaskellDepends = [ base mtl split template-haskell ]; description = "Lens implementation. It is more small but adequately."; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -213991,7 +214752,7 @@ self: { editedCabalFile = "1ky8nncf441i32hni0090lm5vrh67dqvj99c09c1i58gxjad4gln"; libraryHaskellDepends = [ base ]; description = "Just size Operational Monad implementation"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "rebase" = callPackage @@ -214012,7 +214773,7 @@ self: { transformers unordered-containers uuid vector void ]; description = "A more progressive alternative to the \"base\" package"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "rebase_1_10_0_1" = callPackage @@ -214033,8 +214794,8 @@ self: { transformers unordered-containers uuid vector vector-instances void ]; description = "A more progressive alternative to the \"base\" package"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "rebindable" = callPackage @@ -214045,7 +214806,7 @@ self: { sha256 = "0zd1ik544hcfwmxwg0jvfsw6giwkzppf7hb573a9ck0xm6daslp7"; libraryHaskellDepends = [ base data-default-class indexed ]; description = "A library to facilitate rebinding of Haskell syntax"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "recaptcha" = callPackage @@ -214056,7 +214817,7 @@ self: { sha256 = "03a3f34lcd387112pfa931wwna58av5yv4jvx4nl0zkryp1p4qd2"; libraryHaskellDepends = [ base HTTP network network-uri xhtml ]; description = "Functions for using the reCAPTCHA service in web applications"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "recommender-als" = callPackage @@ -214071,7 +214832,7 @@ self: { base containers data-default-class hmatrix parallel random vector ]; description = "Recommendations using alternating least squares algorithm"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "record" = callPackage @@ -214086,8 +214847,8 @@ self: { base base-prelude basic-lens template-haskell transformers ]; description = "Anonymous records"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -214104,8 +214865,8 @@ self: { ]; testHaskellDepends = [ aeson base-prelude hspec record ]; description = "Instances of \"aeson\" classes for the \"record\" types"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -214123,7 +214884,7 @@ self: { executableHaskellDepends = [ base extra ]; testHaskellDepends = [ base extra filepath record-hasfield ]; description = "Preprocessor to allow record.field syntax"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "record-encode" = callPackage @@ -214139,8 +214900,8 @@ self: { base doctest generics-sop hspec QuickCheck vector ]; description = "Generic encoding of records"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -214164,8 +214925,8 @@ self: { test-framework-hunit ]; description = "Utilities for working with OpenGL's GLSL shading language and Nikita Volkov's \"Record\"s"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -214178,7 +214939,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "A version of GHC.Records as available in future GHCs."; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "record-preprocessor" = callPackage @@ -214197,8 +214958,8 @@ self: { benchmarkHaskellDepends = [ base-prelude basic-lens record ]; doHaddock = false; description = "Compiler preprocessor introducing a syntactic extension for anonymous records"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -214222,8 +214983,8 @@ self: { base-prelude conversion conversion-text record text ]; description = "A library for parsing and processing the Haskell syntax sprinkled with anonymous records"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -214236,7 +214997,7 @@ self: { libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base ]; description = "Alter your records with ease"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "records" = callPackage @@ -214249,8 +215010,8 @@ self: { editedCabalFile = "01ydi3gzgr72z56i1rdq10g4xrfz2f9vz6vn03mp84r74k5zdgrv"; libraryHaskellDepends = [ base kinds type-functions ]; description = "A flexible record system"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -214269,7 +215030,7 @@ self: { base deepseq generics-sop hspec should-not-typecheck ]; description = "Record subtyping and record utilities with generics-sop"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "records-th" = callPackage @@ -214285,8 +215046,8 @@ self: { type-functions unordered-containers ]; description = "Template Haskell declarations for the records package"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -214298,7 +215059,7 @@ self: { sha256 = "0k5as7i7xyas6qhpr7wpnnf0rc93nsh4s9gsxdsk72xkwd86chkj"; libraryHaskellDepends = [ base composition-prelude ]; description = "A recursion schemes library for Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "recursion-schemes" = callPackage @@ -214315,7 +215076,7 @@ self: { ]; testHaskellDepends = [ base HUnit template-haskell transformers ]; description = "Representing common recursion patterns as higher-order functions"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }) {}; "recursion-schemes-ext" = callPackage @@ -214334,7 +215095,7 @@ self: { base criterion deepseq recursion-schemes ]; description = "Amateur addenda to recursion-schemes"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "recursion-schemes-ix" = callPackage @@ -214350,7 +215111,7 @@ self: { base containers hspec mtl QuickCheck singlethongs ]; description = "Recursion schemes over indexed Functors"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "recursive-line-count" = callPackage @@ -214367,7 +215128,7 @@ self: { base bytestring containers filepath gtk mtl process ]; description = "Count lines in files and display them hierarchically"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "recursors" = callPackage @@ -214379,8 +215140,8 @@ self: { libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base hspec QuickCheck template-haskell ]; description = "Auto-generate final encodings and their isomorphisms using Template Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -214399,8 +215160,8 @@ self: { ]; doHaddock = false; description = "Extensible records and variants indexed by a type-level Red-Black tree"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -214413,7 +215174,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "Red Black Trees implemented in Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "redHandlers" = callPackage @@ -214431,7 +215192,7 @@ self: { ]; description = "Monadic HTTP request handlers combinators to build a standalone web apps"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "reddit" = callPackage @@ -214454,8 +215215,8 @@ self: { http-client http-client-tls text time transformers yaml ]; description = "Library for interfacing with Reddit's API"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -214472,7 +215233,7 @@ self: { old-time utf8-string ]; description = "A driver for Redis key-value database"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "redis-hs" = callPackage @@ -214483,8 +215244,8 @@ self: { sha256 = "1irayxwkdksc9v70g7il7zl7pmkrim2admcgjwcm9inyca7618wg"; libraryHaskellDepends = [ base bytestring network utf8-string ]; description = "A simple Redis library for Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -214513,7 +215274,7 @@ self: { base bytestring criterion hedis redis-resp tinylog transformers ]; description = "Yet another redis client"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "redis-job-queue" = callPackage @@ -214524,7 +215285,7 @@ self: { sha256 = "1znjmgmlha2adwrmfgbyr10hg0lw99xas610cswf4c9hrbw0gqjy"; libraryHaskellDepends = [ aeson base bytestring hedis ]; description = "Simple priority job queue backed by Redis"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "redis-resp" = callPackage @@ -214541,7 +215302,7 @@ self: { double-conversion operational semigroups split transformers ]; description = "REdis Serialization Protocol (RESP) implementation"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "redis-simple" = callPackage @@ -214552,8 +215313,8 @@ self: { sha256 = "0kzs5lc2y40dzx57k0klz0k9zijhi7mh0awi6rzhzd3h5z1gdr43"; libraryHaskellDepends = [ base binary bytestring redis ]; description = "Simple redis bindings for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -214569,7 +215330,7 @@ self: { aeson async base bytestring hashable haxl hedis network time ]; description = "Combine redis caching and haxl"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "redland" = callPackage @@ -214581,8 +215342,8 @@ self: { libraryHaskellDepends = [ base deepseq ]; libraryPkgconfigDepends = [ raptor2 redland ]; description = "Redland RDF library bindings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {raptor2 = null; redland = null;}; @@ -214600,7 +215361,7 @@ self: { base bytestring containers directory filepath process pureMD5 ]; description = "software build system, make replacement, implementation of djb's redo"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "reduce-equations" = callPackage @@ -214625,8 +215386,8 @@ self: { text ]; description = "Simplify a set of equations by removing redundancies"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -214639,14 +215400,14 @@ self: { pname = "reducers"; version = "3.12.3"; sha256 = "09wf8pl9ycglcv6qj5ba26gkg2s5iy81hsx9xp0q8na0cwvp71ki"; - revision = "1"; - editedCabalFile = "1v0r75wkaahxdv4y0sqgcikvgwymiz12fa8nkk59n1g4x9nng9wb"; + revision = "2"; + editedCabalFile = "1kd38n9h2hxl09khvkvkhnflgm6rbky1zkw3iazlpb8xk9zkk39s"; libraryHaskellDepends = [ array base bytestring containers fingertree hashable semigroupoids semigroups text transformers unordered-containers ]; description = "Semigroups, specialized containers and a general map/reduce framework"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "reedsolomon" = callPackage @@ -214673,8 +215434,8 @@ self: { base criterion exceptions loop mtl primitive vector ]; description = "Reed-Solomon Erasure Coding in Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -214688,8 +215449,8 @@ self: { base hamid HCodecs stm time vector-space ]; description = "A reimplementation of the Reactive library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -214700,7 +215461,7 @@ self: { version = "0.1.0.0"; sha256 = "0lraykl190x0cj65z495c11vi4pcg3g8gz1bdgdndf6662lp56x9"; libraryHaskellDepends = [ base crypto-api ]; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }) {}; "ref" = callPackage @@ -214711,8 +215472,8 @@ self: { sha256 = "109illgbz4g4a6qavgc4wvyxfjvjhyrxa2gpps67avmr1v90gihr"; libraryHaskellDepends = [ base ghc-prim ]; description = "Generic Mutable Ref Abstraction Layer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -214729,7 +215490,7 @@ self: { unordered-containers ]; description = "Extra stuff for mutable references"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ref-fd" = callPackage @@ -214740,7 +215501,7 @@ self: { sha256 = "1camr7cv1fglicyp2ivv7qv1yidj36zxcglfvmw7giqdj7r7j5w8"; libraryHaskellDepends = [ base stm transformers ]; description = "A type class for monads with references using functional dependencies"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ref-mtl" = callPackage @@ -214751,8 +215512,8 @@ self: { sha256 = "0wijkaf3qyp6qjz0cwyhb89z5jrcz792hx8m9a43xrp7v2f84080"; libraryHaskellDepends = [ base mtl stm transformers ]; description = "A type class for monads with references compatible with the mtl2 library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -214764,7 +215525,7 @@ self: { sha256 = "0pq9pm8jsx9w1q81pf5pvc361ad8dbyklw94jq47drr2i0dc7n20"; libraryHaskellDepends = [ base stm transformers ]; description = "A type class for monads with references using type families"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "refact" = callPackage @@ -214775,7 +215536,7 @@ self: { sha256 = "0v0zxcx29b8jxs2kgy9csykqcp8kzhdvyylw2xfwmj4pfxr2kl0a"; libraryHaskellDepends = [ base ]; description = "Specify refactorings to perform with apply-refact"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "refcount" = callPackage @@ -214796,8 +215557,8 @@ self: { unordered-containers ]; description = "Container with element counts"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -214809,7 +215570,7 @@ self: { sha256 = "1gqbbiwhx5wq1g73m3apwyrrpapqzimincmw2b64fpkkykq66dq1"; libraryHaskellDepends = [ base stm ]; description = "A class for references in Haskell"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "references" = callPackage @@ -214831,8 +215592,8 @@ self: { uniplate ]; description = "Selectors for reading and updating data"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -214850,8 +215611,8 @@ self: { base clippard cmdargs directory filepath haskheap network ]; description = "A command-line tool for pasting to https://www.refheap.com"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -214869,7 +215630,7 @@ self: { ]; testHaskellDepends = [ base doctest QuickCheck ]; description = "Refinement types with static and runtime checking"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "refined-http-api-data" = callPackage @@ -214880,8 +215641,8 @@ self: { sha256 = "0064cz00lp023kbn5vqpcsgjzsxd5a9s5fl1klsq6jlk1cmi5c0m"; libraryHaskellDepends = [ base http-api-data refined text ]; description = "http-api-data instances for refined types"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -214898,7 +215659,7 @@ self: { base checkers exceptions hspec logict mmorph mtl QuickCheck ]; description = "Toolkit for building proof automation systems"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "refinery_0_3_0_0" = callPackage @@ -214914,8 +215675,8 @@ self: { base checkers exceptions hspec logict mmorph mtl QuickCheck ]; description = "Toolkit for building proof automation systems"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "reflection" = callPackage @@ -214930,7 +215691,7 @@ self: { testHaskellDepends = [ base containers hspec QuickCheck ]; testToolDepends = [ hspec-discover ]; description = "Reifies arbitrary terms into types that can be reflected back into terms"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "reflection-extras" = callPackage @@ -214944,8 +215705,8 @@ self: { aeson base constraints lens reflection tagged ]; description = "Utilities for the reflection package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -214958,7 +215719,7 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base type-aligned ]; description = "Efficient free and operational monads"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "reflex" = callPackage @@ -214996,7 +215757,7 @@ self: { loch-th mtl primitive process ref-tf split stm time transformers ]; description = "Higher-order Functional Reactive Programming"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "reflex-animation" = callPackage @@ -215012,8 +215773,8 @@ self: { semigroups vector-space ]; description = "Continuous animations support for reflex"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -215039,8 +215800,8 @@ self: { witherable ]; description = "Reflex bindings for TCP sockets"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -215061,8 +215822,8 @@ self: { ]; executableHaskellDepends = [ base http-types reflex wai ]; description = "Reflex interface to `wai`"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -215083,8 +215844,8 @@ self: { ]; executableHaskellDepends = [ base lens reflex witherable ]; description = "A basic Reflex host for backend work"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -215102,8 +215863,8 @@ self: { base bytestring jsaddle-webkit2gtk reflex reflex-dom-core text ]; description = "Functional Reactive Web Apps with Reflex"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ maralorn ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ maralorn ]; }) {}; "reflex-dom-colonnade" = callPackage @@ -215119,8 +215880,8 @@ self: { semigroups text vector ]; description = "Use colonnade with reflex-dom"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "reflex-dom-contrib" = callPackage @@ -215138,8 +215899,8 @@ self: { string-conv text time transformers ]; description = "A playground for experimenting with infrastructure and common code for reflex applications"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "reflex-dom-core" = callPackage @@ -215178,8 +215939,8 @@ self: { websockets which ]; description = "Functional Reactive Web Apps with Reflex"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {chrome-test-utils = null;}; @@ -215198,8 +215959,8 @@ self: { ]; executableHaskellDepends = [ base reflex-dom text ]; description = "A reflex-dom widget to draw on a canvas with a fragment shader program"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "reflex-dom-helpers" = callPackage @@ -215215,8 +215976,8 @@ self: { ]; testHaskellDepends = [ base ]; description = "Html tag helpers for reflex-dom"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "reflex-dom-pandoc" = callPackage @@ -215235,7 +215996,7 @@ self: { reflex reflex-dom-core safe skylighting text time ]; description = "Render Pandoc documents to HTML using reflex-dom"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "reflex-dom-retractable" = callPackage @@ -215250,8 +216011,8 @@ self: { base containers jsaddle mtl ref-tf reflex reflex-dom ]; description = "Routing and retractable back button for reflex-dom"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -215267,8 +216028,8 @@ self: { base containers lens reflex reflex-dom-core safe text ]; description = "Reflex functions for SVG elements"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -215291,8 +216052,8 @@ self: { these ]; description = "various dynamic containers for Reflex"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -215304,7 +216065,7 @@ self: { sha256 = "0mv17j5g0h7y1ym4563xr1vc0sdvw0g4wdpx0a9aryk3i0k0i4mx"; libraryHaskellDepends = [ base deepseq reflex ]; description = "External reference with reactivity support"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "reflex-fsnotify" = callPackage @@ -215319,8 +216080,8 @@ self: { base containers directory filepath fsnotify reflex ]; description = "Reflex FRP interface for watching files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -215345,8 +216106,8 @@ self: { time ]; description = "Interact with a GADT API in your reflex-dom application"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -215374,8 +216135,8 @@ self: { base directory process reflex reflex-process temporary ]; description = "A GHCi widget library for use in reflex applications"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -215401,8 +216162,8 @@ self: { reflex text ]; description = "Helper functions to use reflex with gi-gtk"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -215418,8 +216179,8 @@ self: { base dependent-sum gloss mtl reflex transformers ]; description = "An reflex interface for gloss"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -215447,8 +216208,8 @@ self: { reflex-transformers transformers ]; description = "A simple scene-graph using reflex and gloss"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -215465,8 +216226,8 @@ self: { template-haskell text ]; description = "Use jsx-like syntax in Reflex"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "reflex-libtelnet" = callPackage @@ -215482,8 +216243,8 @@ self: { dependent-sum-template lens libtelnet reflex ]; description = "Reflex bindings for libtelnet"; - license = stdenv.lib.licenses.gpl3Plus; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -215499,8 +216260,8 @@ self: { base jsaddle mtl reflex reflex-external-ref text ]; description = "Localization library for reflex"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -215518,8 +216279,8 @@ self: { base containers reflex reflex-dom reflex-localize text ]; description = "Helper widgets for reflex-localize"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -215535,7 +216296,7 @@ self: { base jsaddle mtl reflex reflex-external-ref ]; description = "Utilities to split reflex app to authorized and not authorized contexts"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "reflex-orphans" = callPackage @@ -215551,8 +216312,8 @@ self: { base deepseq dependent-map mtl ref-tf reflex tasty tasty-hunit ]; description = "Useful missing instances for Reflex"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -215578,8 +216339,8 @@ self: { process ref-tf reflex unix ]; description = "Reflex FRP interface for running system processes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -215599,8 +216360,8 @@ self: { ]; executableHaskellDepends = [ base mtl reflex ]; description = "SDL2 and reflex FRP"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -215621,7 +216382,7 @@ self: { ref-tf reflex these transformers ]; description = "reflex host methods for testing without external events"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "reflex-transformers" = callPackage @@ -215636,8 +216397,8 @@ self: { base containers lens mtl reflex semigroups stateWriter transformers ]; description = "Collections and switchable Monad transformers for Reflex"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -215664,8 +216425,8 @@ self: { base containers reflex text time transformers vty ]; description = "Reflex FRP host and widgets for VTY applications"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -215677,7 +216438,7 @@ self: { sha256 = "0dl0jz5ibcj4vafpf0a0v52rac4nmmif69817g7qgxavc093nq82"; libraryHaskellDepends = [ base containers mtl semigroups text ]; description = "reform is a type-safe HTML form generation and validation library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "reform-blaze" = callPackage @@ -215690,7 +216451,7 @@ self: { base blaze-html blaze-markup reform text ]; description = "Add support for using blaze-html with Reform"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "reform-hamlet" = callPackage @@ -215703,7 +216464,7 @@ self: { base blaze-markup reform shakespeare text ]; description = "Add support for using Hamlet with Reform"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "reform-happstack" = callPackage @@ -215718,7 +216479,7 @@ self: { base bytestring happstack-server mtl random reform text utf8-string ]; description = "Happstack support for reform"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "reform-hsp" = callPackage @@ -215729,7 +216490,7 @@ self: { sha256 = "1vjbj41yl158h59wcx190jb4s627bhrhcbp21ykn93n4j454kfns"; libraryHaskellDepends = [ base hsp hsx2hs reform text ]; description = "Add support for using HSP with Reform"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "reform-lucid" = callPackage @@ -215740,7 +216501,7 @@ self: { sha256 = "1a3jfk0i87vqwxxlspzy44lf2i3bxxxy20pnbysczzf8i113y9zi"; libraryHaskellDepends = [ base lucid path-pieces reform text ]; description = "Add support for using lucid with Reform"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "reformat" = callPackage @@ -215751,8 +216512,8 @@ self: { sha256 = "1cvffbx2vhv18k4p95p0ddcxzyn8f10hg2bxa2da60fy9zkjg3am"; libraryHaskellDepends = [ base parsec ]; description = "The parser and render to parsec and render the string"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -215776,8 +216537,8 @@ self: { base base-unicode-symbols category gauge hs-functors transformers ]; description = "See README for more info"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -215793,8 +216554,8 @@ self: { isExecutable = true; libraryHaskellDepends = [ base data-default exceptions lens mtl ]; description = "Environment Monad with automatic resource refreshment"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -215807,7 +216568,7 @@ self: { libraryHaskellDepends = [ aeson base containers text ]; testHaskellDepends = [ base ]; description = "Formatted JSON generator for API server inspired by normalizr"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "refurb" = callPackage @@ -215837,8 +216598,8 @@ self: { these these-lens thyme transformers-base vector-space ]; description = "Tools for maintaining a database"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -215852,8 +216613,8 @@ self: { editedCabalFile = "1dzisg5cdb2jrcp6xmkzmgzd00phqhgf1iddlm2c10x49lbqsrld"; libraryHaskellDepends = [ base ]; description = "Register allocation API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -215877,8 +216638,8 @@ self: { benchmarkHaskellDepends = [ base criterion ]; doHaddock = false; description = "Register allocation by graph colorization"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -215890,7 +216651,7 @@ self: { sha256 = "18m8di3syz0r01bq9vpglk5x87sw6y38wqnl8zg3z80i67fzfd4m"; libraryHaskellDepends = [ base ]; description = "Types used in register allocation API"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "regex" = callPackage @@ -215909,7 +216670,7 @@ self: { time-locale-compat transformers unordered-containers utf8-string ]; description = "Toolkit for regex-base"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "regex-applicative" = callPackage @@ -215932,7 +216693,7 @@ self: { parsers parsers-megaparsec ]; description = "Regex-based parsing with applicative interface"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "regex-applicative-text" = callPackage @@ -215945,7 +216706,7 @@ self: { editedCabalFile = "1jgmhqhlhj9zhxwikmhiq71fj1900iqiyg6r9l5y7xjk7arwscmi"; libraryHaskellDepends = [ base regex-applicative text ]; description = "regex-applicative on text"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "regex-base" = callPackage @@ -215960,7 +216721,7 @@ self: { array base bytestring containers mtl text ]; description = "Common \"Text.Regex.*\" API for Regex matching"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "regex-compat" = callPackage @@ -215973,7 +216734,7 @@ self: { editedCabalFile = "1d2k9zj51rhy695vlx6cfcmik6a0yyk5kl6aza7nqsqc6zwhidif"; libraryHaskellDepends = [ array base regex-base regex-posix ]; description = "Replaces/Enhances \"Text.Regex\""; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "regex-compat-tdfa" = callPackage @@ -215984,7 +216745,7 @@ self: { sha256 = "1p90fn90yhp7fvljjdqjp41cszidcfz4pw7fwvzyx4739b98x8sg"; libraryHaskellDepends = [ array base regex-base regex-tdfa ]; description = "Unicode Support version of Text.Regex, using regex-tdfa"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "regex-deriv" = callPackage @@ -216001,8 +216762,8 @@ self: { hashtables mtl parallel parsec regex-base ]; description = "Replaces/Enhances Text.Regex. Implementing regular expression matching using Brzozowski's Deriviatives"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -216016,8 +216777,8 @@ self: { editedCabalFile = "089gzj8yih2f4ijyk9c49zyq6cws68z2rnklhiww9f3nb75lg6a9"; libraryHaskellDepends = [ base mtl parsec regex-base ]; description = "Replaces/Enhances Text.Regex"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -216038,7 +216799,7 @@ self: { stringsearch tagged text ]; description = "PCRE wrapper"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "regex-easy" = callPackage @@ -216053,7 +216814,7 @@ self: { array base bytestring regex-pcre string-conversions ]; description = "sugar for regex-pcre"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "regex-examples" = callPackage @@ -216088,7 +216849,7 @@ self: { utf8-string ]; description = "Tutorial, tests and example programs for regex"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "regex-generator" = callPackage @@ -216106,8 +216867,8 @@ self: { base bytestring hspec HUnit random regex-pcre ]; description = "Generate a random string from a PCRE"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -216127,7 +216888,7 @@ self: { executableHaskellDepends = [ base containers mtl regex-tdfa sbv ]; description = "From a regex, generate all possible strings it can match"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "regex-parsec" = callPackage @@ -216140,8 +216901,8 @@ self: { editedCabalFile = "19y0kgmqpcz4k0l3cfjbxirq844zqm71gaz7117pm399x8bz1df7"; libraryHaskellDepends = [ base parsec regex-base ]; description = "Replaces/Enhances Text.Regex"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -216160,7 +216921,7 @@ self: { ]; libraryPkgconfigDepends = [ pcre ]; description = "PCRE Backend for \"Text.Regex\" (regex-base)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) pcre;}; "regex-pcre-builtin" = callPackage @@ -216175,7 +216936,7 @@ self: { array base bytestring containers regex-base text ]; description = "PCRE Backend for \"Text.Regex\" (regex-base)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "regex-pcre-text" = callPackage @@ -216191,8 +216952,8 @@ self: { text ]; description = "Text-based PCRE API for regex-base"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -216209,8 +216970,8 @@ self: { parsec regex-base ]; description = "Replaces/Enhances Text.Regex. Implementing regular expression matching using Antimirov's partial derivatives."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -216226,7 +216987,7 @@ self: { array base bytestring containers regex-base ]; description = "POSIX Backend for \"Text.Regex\" (regex-base)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "regex-posix-clib" = callPackage @@ -216237,7 +216998,7 @@ self: { sha256 = "1y4vmiq1xksxxd84yvyark6axsz51ywb6slswbddlxbdpcpfday7"; doHaddock = false; description = "\"Regex for Windows\" C library"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; }) {}; "regex-posix-unittest" = callPackage @@ -216255,8 +217016,8 @@ self: { array base bytestring containers mtl regex-base regex-posix ]; description = "Unit tests for the plaform's Posix regex library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -216278,7 +217039,7 @@ self: { text utf8-string ]; description = "Pure Haskell Tagged DFA Backend for \"Text.Regex\" (regex-base)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "regex-tdfa-pipes" = callPackage @@ -216293,8 +217054,8 @@ self: { array base lens monads-tf pipes regex-base regex-tdfa ]; description = "Parse with regular expressions on Producers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -216306,8 +217067,8 @@ self: { sha256 = "1l0yk2m2k4ybjx3pidcn2xpij9cnyi76ar74llf09vwv764mh36f"; libraryHaskellDepends = [ base regex-tdfa template-haskell ]; description = "Quasi-quoter for TDFA (extended POSIX) regular expressions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -216323,8 +217084,8 @@ self: { array base bytestring containers ghc-prim mtl parsec regex-base ]; description = "Replaces/Enhances Text.Regex"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -216338,8 +217099,8 @@ self: { editedCabalFile = "00swglzmdw30g4bn47z6j71all0djjb2hjm7bkfl7pza4wv14wpv"; libraryHaskellDepends = [ array base regex-base regex-tdfa text ]; description = "Text interface for regex-tdfa"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -216358,8 +217119,8 @@ self: { array base bytestring containers mtl regex-base regex-tdfa ]; description = "Unit tests for the regex-tdfa"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -216377,8 +217138,8 @@ self: { array base bytestring regex-base regex-tdfa utf8-string ]; description = "This combines regex-tdfa with utf8-string to allow searching over UTF8 encoded lazy bytestrings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -216393,8 +217154,8 @@ self: { libraryHaskellDepends = [ base regex-base ]; librarySystemDepends = [ tre ]; description = "Replaces/Enhances Text.Regex"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) tre;}; @@ -216406,8 +217167,8 @@ self: { sha256 = "02pwls2yfp9y6g7lcfnkxjfbz3h280y9ifqh870bis16fa8dy6gv"; libraryHaskellDepends = [ base ]; description = "Type-level regular expressions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -216426,7 +217187,7 @@ self: { unordered-containers ]; description = "Toolkit for regex-base"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "regex-wrapper" = callPackage @@ -216444,8 +217205,8 @@ self: { text ]; description = "Types that can only be constructed if they match a regular expression"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -216457,8 +217218,8 @@ self: { sha256 = "1dmhvnz6sj80kdnm2v7n0lvx8g9arhf9pqqzkn0rwzfhr2by0ss4"; libraryHaskellDepends = [ base haskell98 parsec ]; description = "A regular expression library for W3C XML Schema regular expressions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -216514,8 +217275,8 @@ self: { base containers derive-trie template-haskell weighted-regexp ]; description = "Regular Expressions on Tries"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -216539,8 +217300,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base ]; description = "Regular expressions via symbolic manipulation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -216554,8 +217315,8 @@ self: { base bytestring pcre-light template-haskell ]; description = "A quasiquoter for PCRE regexes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -216570,8 +217331,8 @@ self: { base base-unicode-symbols regions transformers ]; description = "Regional memory pointers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -216587,8 +217348,8 @@ self: { base base-unicode-symbols monad-control transformers ]; description = "Provides the region monad for safely opening and working with scarce resources"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -216604,8 +217365,8 @@ self: { base-unicode-symbols monads-fd regions transformers ]; description = "Monads-fd instances for the RegionT monad transformer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -216621,8 +217382,8 @@ self: { base-unicode-symbols monads-tf regions transformers ]; description = "Monads-tf instances for the RegionT monad transformer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -216634,8 +217395,8 @@ self: { sha256 = "1s0sr42k1kmwgmrnj5zcan0j9br8xrrm1vdnj6yhliqdfz41ifc0"; libraryHaskellDepends = [ base-unicode-symbols mtl regions ]; description = "mtl instances for the RegionT monad transformer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -216647,8 +217408,8 @@ self: { sha256 = "0zsvpsqksms9fh0zwyngb0sm1scffi47ipphgfn7b5m3km9z6cjj"; libraryHaskellDepends = [ base ]; description = "A computationally universal register machine implementation at the type-level"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -216676,7 +217437,7 @@ self: { ]; testToolDepends = [ tasty-discover ]; description = "data structure for assembling components"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "registry-hedgehog" = callPackage @@ -216687,8 +217448,8 @@ self: { }: mkDerivation { pname = "registry-hedgehog"; - version = "0.2.1.1"; - sha256 = "1s94xb7ma6rq81z30wjaczy2w3v1myqwhkx257p4nh69dv4wzd8d"; + version = "0.3.0.0"; + sha256 = "0ardmwsaxlk9g062bf2xiigbjbnqbf7iz9s8xwjzj8nh8rrs252z"; libraryHaskellDepends = [ base containers hedgehog mmorph multimap protolude registry tasty tasty-discover tasty-hedgehog tasty-th template-haskell text @@ -216701,8 +217462,8 @@ self: { ]; testToolDepends = [ tasty-discover ]; description = "utilities to work with Hedgehog generators and `registry`"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -216714,8 +217475,8 @@ self: { sha256 = "00b4n4gw5y0mpayb0zlkvz91nfrpbspz22kqhpvdnxbb4zcz7pnj"; libraryHaskellDepends = [ ad base vector ]; description = "Linear and logistic regression through automatic differentiation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -216727,8 +217488,8 @@ self: { sha256 = "0f74xwyrnz39cl24kazvk8rd3px2l2ycx6a5jaqlab6wiwi5xclq"; libraryHaskellDepends = [ base vector ]; description = "Simple linear and quadratic regression"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -216742,8 +217503,8 @@ self: { editedCabalFile = "0hrr2drpmrsb3jim2lgfx7nx2pvycdvfff51j2v3ihgdy8d8zqrw"; libraryHaskellDepends = [ base template-haskell ]; description = "Generic programming library for regular datatypes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -216755,8 +217516,8 @@ self: { sha256 = "0x1sbps0ccwpvf6fx1jnbjxylqsvvfzkkynliip9jyh6gkhm44vx"; libraryHaskellDepends = [ base binary deepseq QuickCheck regular ]; description = "Additional functions for regular: arbitrary, coarbitrary, and binary get/put"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -216772,8 +217533,8 @@ self: { applicative-extras base fclabels formlets json mtl regular xhtml ]; description = "Generic programming for the web"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -216785,8 +217546,8 @@ self: { sha256 = "1qjx4xsidnpr2as3m2ir97ap5vc9cw6a0z332g53ifx9gskjli9f"; libraryHaskellDepends = [ base hxt regular text ]; description = "Generic generation of HXT XmlPickler instances using Regular"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -216802,7 +217563,7 @@ self: { testHaskellDepends = [ base directory QuickCheck text vty vty-ui ]; description = "to make notes and reduce impact on idle time on writing other programms"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -216820,8 +217581,8 @@ self: { base cmdargs parallel-io shelly split system-filepath text ]; description = "Rebuild default.hoo from many .hoo files in the current directory"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -216839,8 +217600,8 @@ self: { attoparsec base bytestring containers directory regex-tdfa split ]; description = "Process lists easily"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -216852,8 +217613,8 @@ self: { sha256 = "0vg05idyiy3havw8rlsky7x4y34mpk6by9500r7rb921xgpdq70a"; libraryHaskellDepends = [ base containers mtl ]; description = "Reify records to Maps and back again"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -216870,7 +217631,7 @@ self: { executableHaskellDepends = [ base ghc ]; description = "Serialize data"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -216886,7 +217647,7 @@ self: { testHaskellDepends = [ base data-binary-ieee754 hspec loop ]; benchmarkHaskellDepends = [ base criterion data-binary-ieee754 ]; description = "Memory reinterpretation casts for Float/Double and Word32/Word64"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "relacion" = callPackage @@ -216897,8 +217658,8 @@ self: { sha256 = "1jq3ii9j8s7q8fr7ac2pdr2l33jvzsyyq70cjd9q1spqa1v6k976"; libraryHaskellDepends = [ array base containers ]; description = "A relation data structure"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -216917,7 +217678,7 @@ self: { tasty tasty-hspec text vector ]; description = "Sensible RLP encoding"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "relation" = callPackage @@ -216935,7 +217696,7 @@ self: { ]; testToolDepends = [ doctest-discover hspec-discover ]; description = "A data structure representing Relations on Sets"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "relational-postgresql8" = callPackage @@ -216952,8 +217713,8 @@ self: { relational-query-HDBC template-haskell time transformers ]; description = "PostgreSQL v8.x driver for haskell-relational-record"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -216978,7 +217739,7 @@ self: { base containers product-isomorphic quickcheck-simple transformers ]; description = "Typeful, Modular, Relational, algebraic query engine"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "relational-query-HDBC" = callPackage @@ -217002,7 +217763,7 @@ self: { base convertible HDBC QuickCheck quickcheck-simple ]; description = "HDBC instance of relational-query and typed query interface for HDBC"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "relational-query-postgresql-pure" = callPackage @@ -217028,8 +217789,8 @@ self: { postgresql-pure relational-query relational-query-HDBC ]; description = "The connector of relational-record and postgresql-pure"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -217047,7 +217808,7 @@ self: { product-isomorphic relational-query relational-query-HDBC ]; description = "Meta package of Relational Record"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "relational-record-examples" = callPackage @@ -217070,7 +217831,7 @@ self: { base product-isomorphic relational-query template-haskell time ]; description = "Examples of Haskell Relationa Record"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "relational-schemas" = callPackage @@ -217086,7 +217847,7 @@ self: { template-haskell time ]; description = "RDBMSs' schema templates for relational-query"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "relative-date" = callPackage @@ -217100,8 +217861,8 @@ self: { base concatenative datetime mtl parsec time ]; description = "Durations and generalized time parsing"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -217120,8 +217881,8 @@ self: { ]; executableHaskellDepends = [ base ]; description = "Automation of Haskell package release process"; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ maralorn ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ maralorn ]; }) {}; "relevant-time" = callPackage @@ -217132,8 +217893,8 @@ self: { sha256 = "0978g03dlkgx45hxzk3lwl68iln8jnf0hldchac4yqp4c9rsxf22"; libraryHaskellDepends = [ aeson base chronos text torsor ]; description = "humanised relevant time"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -217147,7 +217908,7 @@ self: { isExecutable = true; libraryHaskellDepends = [ base bindings-DSL ]; description = "Bindings to the low-level reliable.io library."; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "relit" = callPackage @@ -217158,7 +217919,7 @@ self: { sha256 = "03cnra0yfpijp65p1x0wv4fvc1p1l27lcb00k22ijrcy2mxqr9cg"; libraryHaskellDepends = [ base regex-base template-haskell ]; description = "Literal for regular expression"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "reload" = callPackage @@ -217193,8 +217954,8 @@ self: { websockets ]; description = "A web based Haskell IDE"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -217216,7 +217977,7 @@ self: { ]; benchmarkHaskellDepends = [ base gauge unordered-containers ]; description = "Safe, performant, user-friendly and lightweight Haskell Standard Library"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "remark" = callPackage @@ -217235,8 +217996,8 @@ self: { base GenericPretty tasty tasty-golden tasty-hunit ]; description = "A DSL for marking student work"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -217258,8 +218019,8 @@ self: { base GenericPretty tasty tasty-golden tasty-hunit ]; description = "A DSL for marking student work"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -217272,7 +218033,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec HUnit ]; description = "A simple api for matchers"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "rematch-text" = callPackage @@ -217284,7 +218045,7 @@ self: { libraryHaskellDepends = [ base rematch text ]; testHaskellDepends = [ base hspec HUnit rematch text ]; description = "`rematch` matchers for Data.Text"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "remote" = callPackage @@ -217301,8 +218062,8 @@ self: { pureMD5 stm syb template-haskell time utf8-string ]; description = "Cloud Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -217318,8 +218079,8 @@ self: { array base ghc ghc-paths json network ]; description = "Interface to ghci debugger"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -217344,8 +218105,8 @@ self: { tasty-quickcheck text ]; description = "Remote Monad implementation of the JSON RPC protocol"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -217363,8 +218124,8 @@ self: { aeson base lens natural-transformation remote-json wreq ]; description = "Web client wrapper for remote-json"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -217382,8 +218143,8 @@ self: { scotty text transformers warp ]; description = "Web server wrapper for remote-json"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -217406,8 +218167,8 @@ self: { quickcheck-instances tasty tasty-quickcheck ]; description = "An parametrizable Remote Monad, and parametrizable Applicative Functor"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -217440,8 +218201,8 @@ self: { system-filepath text time transformers-base ]; description = "A library for client-server applications based on custom protocols"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -217457,8 +218218,8 @@ self: { base bytestring fmt semigroups text transformers ]; description = "Simple Utf8 wrapper for ByteString Builder with conversion classes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -217470,7 +218231,7 @@ self: { sha256 = "1idn0jg74wm3ksy5n4jk2dzsij64r1byghr6qc03g4d85n6mmsni"; libraryHaskellDepends = [ base containers hashable transformers ]; description = "An API for managing renderable resources"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "reord" = callPackage @@ -217481,7 +218242,7 @@ self: { sha256 = "07lxnfj0q565ydjzgcnb9dhjlrs7s1h6ybam7aic68lfd4p0hr7y"; libraryHaskellDepends = [ base ]; description = "Ad-hoc Ord instances"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "reorderable" = callPackage @@ -217497,7 +218258,7 @@ self: { ]; description = "Define compound types that do not depend on member order"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "repa" = callPackage @@ -217514,7 +218275,7 @@ self: { base bytestring ghc-prim QuickCheck template-haskell vector ]; description = "High performance, regular, shape polymorphic parallel arrays"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "repa-algorithms" = callPackage @@ -217527,8 +218288,8 @@ self: { editedCabalFile = "0lvb1sn95qca9m1b8cy0a2j9gjzqm8g5v68ykglffjskv78d0jfm"; libraryHaskellDepends = [ base repa vector ]; description = "Algorithms using the Repa array library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -217546,8 +218307,8 @@ self: { repa-convert repa-eval repa-scalar repa-stream text vector ]; description = "Bulk array representations and operators"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -217560,8 +218321,8 @@ self: { libraryHaskellDepends = [ base repa ]; doHaddock = false; description = "(deprecated)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -217577,8 +218338,8 @@ self: { base bytestring double-conversion primitive repa-scalar text vector ]; description = "Packing and unpacking flat tables"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -217591,8 +218352,8 @@ self: { libraryHaskellDepends = [ base repa transformers ]; librarySystemDepends = [ libdevil ]; description = "Support for image reading and writing of Repa arrays using in-place FFI calls"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) libdevil;}; @@ -217604,8 +218365,8 @@ self: { sha256 = "13dla66r1k85zibic3291xdwgv8hf44z9i6814p14xk8cqgbj9an"; libraryHaskellDepends = [ base ghc-prim ]; description = "Low-level parallel operators on bulk random-accessble arrays"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -217626,8 +218387,8 @@ self: { template-haskell vector ]; description = "Examples using the Repa array library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -217648,7 +218409,7 @@ self: { base criterion deepseq random repa repa-algorithms ]; description = "Perform fft with repa via FFTW"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "repa-flow" = callPackage @@ -217666,8 +218427,8 @@ self: { vector ]; description = "Data-parallel data flows"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -217685,7 +218446,7 @@ self: { base binary bmp bytestring old-time repa vector ]; description = "Read and write Repa arrays in various formats"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "repa-linear-algebra" = callPackage @@ -217696,8 +218457,8 @@ self: { sha256 = "18lryk19dfcgq8d09lyc4bchg3gxlr1n8k4m50np2zmhk911n3jn"; libraryHaskellDepends = [ base hmatrix repa vector ]; description = "HMatrix operations for Repa"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -217714,8 +218475,8 @@ self: { mtl ]; description = "Data Flow Fusion GHC Plugin"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -217733,8 +218494,8 @@ self: { base bytestring double-conversion primitive time vector ]; description = "Scalar data types and conversions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -217746,8 +218507,8 @@ self: { sha256 = "1kldz4d4cv0vliqw78ywbcfgh0mw4i5cd93j0jdagvhsbhlxlp5k"; libraryHaskellDepends = [ base ghc ghc-prim vector ]; description = "Series Expressionss API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -217766,7 +218527,7 @@ self: { base directory filepath hsndfile hsndfile-vector repa vector ]; description = "Reading and writing sound files with repa arrays"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "repa-stream" = callPackage @@ -217777,8 +218538,8 @@ self: { sha256 = "0xdsnfmm8pw1daprz609h5qmiz9qdiv7n1zxk0yvxqmfpm3r4kl9"; libraryHaskellDepends = [ base mtl primitive repa-scalar vector ]; description = "Stream functions not present in the vector library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -217799,7 +218560,7 @@ self: { executableHaskellDepends = [ base gloss repa ]; description = "Provides high-level access to webcams"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -217813,8 +218574,8 @@ self: { base ghc ghc-paths haskell-src-exts parsec ]; description = "IRC friendly REPL library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -217833,7 +218594,7 @@ self: { semigroupoids text transformers ]; description = "Toolkit for quickly whipping up config files and command-line interfaces"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "replace-attoparsec" = callPackage @@ -217841,21 +218602,6 @@ self: { }: mkDerivation { pname = "replace-attoparsec"; - version = "1.4.2.0"; - sha256 = "02amqp8gbsdvbbb55p6bab6hfhmcc1xijs0dc8677l9iv1q628yq"; - libraryHaskellDepends = [ attoparsec base bytestring text ]; - testHaskellDepends = [ - attoparsec base bytestring Cabal parsers text - ]; - description = "Find, replace, and split string patterns with Attoparsec parsers (instead of regex)"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "replace-attoparsec_1_4_4_0" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, Cabal, parsers, text - }: - mkDerivation { - pname = "replace-attoparsec"; version = "1.4.4.0"; sha256 = "06js4adbzvm2qn18vlaaxhav2dq1hqp825lmsvpg69cylp72fzif"; libraryHaskellDepends = [ attoparsec base bytestring text ]; @@ -217863,8 +218609,7 @@ self: { attoparsec base bytestring Cabal parsers text ]; description = "Find, replace, and split string patterns with Attoparsec parsers (instead of regex)"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; }) {}; "replace-megaparsec" = callPackage @@ -217880,7 +218625,7 @@ self: { ]; testHaskellDepends = [ base bytestring Cabal megaparsec text ]; description = "Find, replace, and split string patterns with Megaparsec parsers (instead of regex)"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }) {}; "replica" = callPackage @@ -217901,8 +218646,8 @@ self: { QuickCheck quickcheck-instances template-haskell text wai wai-websockets websockets ]; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -217929,8 +218674,8 @@ self: { executableHaskellDepends = [ base bytestring hedis-namespace mtl ]; testHaskellDepends = [ base ]; description = "Initial project template from stack"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -217947,7 +218692,7 @@ self: { ]; testHaskellDepends = [ base containers mtl process ]; description = "Haskeline wrapper for GHCi-like REPL interfaces"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "repo-based-blog" = callPackage @@ -217975,8 +218720,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Blogging module using blaze html for markup"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -217992,8 +218737,8 @@ self: { base base-unicode-symbols dstring random string-combinators ]; description = "Render overloaded expressions to their textual representation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -218005,7 +218750,7 @@ self: { sha256 = "1ypfb65ghjwxzsx525lcqc3f6pdr357lw6c2xgn54d4f3xi6xphj"; libraryHaskellDepends = [ base containers syb text ]; description = "Tree representation and pretty-printing of data structures based on SYB"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "representable-functors" = callPackage @@ -218023,8 +218768,8 @@ self: { transformers ]; description = "Representable functors"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -218037,7 +218782,7 @@ self: { libraryHaskellDepends = [ base ]; doHaddock = false; description = "This package has been absorbed into profunctor-extras"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "representable-tries" = callPackage @@ -218055,8 +218800,8 @@ self: { semigroups transformers ]; description = "Tries from representations of polynomial functors"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -218071,8 +218816,8 @@ self: { base mtl syb syz text transformers uniplate ]; description = "Scrap Your Reprinter"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -218085,8 +218830,8 @@ self: { libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base hspec ]; description = "Define and combine \"materialized\" projections"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -218100,10 +218845,8 @@ self: { }: mkDerivation { pname = "req"; - version = "3.8.0"; - sha256 = "1qd0bawdxig6sldlhqgj8cpkzfy7da9yy0wkvzs6mps6yk14kbap"; - revision = "1"; - editedCabalFile = "1gkd25bg87r0dr8rb04r3scjfm66v88905490fiy4x1826gj9cv0"; + version = "3.9.0"; + sha256 = "1hapa7f6n6xzw43w6zka3x8hp546h992axm6m8rcxl042j9p95b3"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson authenticate-oauth base blaze-builder bytestring @@ -218120,7 +218863,7 @@ self: { testToolDepends = [ hspec-discover ]; doCheck = false; description = "Easy-to-use, type-safe, expandable, high-level HTTP client library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "req-conduit" = callPackage @@ -218144,8 +218887,8 @@ self: { base bytestring conduit conduit-extra req resourcet temporary weigh ]; description = "Conduit helpers for the req HTTP client library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -218168,8 +218911,8 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "Provides OAuth2 authentication for use with Req"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -218185,8 +218928,8 @@ self: { executableHaskellDepends = [ aeson base modern-uri req text ]; testHaskellDepends = [ base hspec modern-uri req ]; description = "Provides URI/URL helper functions for use with Req"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -218203,8 +218946,8 @@ self: { base http-client http-types HUnit lens tasty tasty-hunit wai wreq ]; description = "A local http server to catch the HTTP redirect"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -218216,8 +218959,8 @@ self: { sha256 = "1aqcsm9a3zd11k7d4nbvxsy7l35fr77z7gyhrl7rvflnixid29ws"; libraryHaskellDepends = [ base free mtl transformers ]; description = "A transformer for generic requests"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -218249,7 +218992,7 @@ self: { mtl optparse-generic relude text ]; description = "Scrap your qualified import clutter"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "requirements" = callPackage @@ -218260,7 +219003,7 @@ self: { sha256 = "1s0s3p0dy07222ks83w3spfw9df33q5lggqv3dw4m9hd5x16a6zi"; libraryHaskellDepends = [ base ]; description = "Abstraction to manage user defined Type Errors"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "rere" = callPackage @@ -218286,7 +219029,7 @@ self: { fin parsec vec ]; description = "Regular-expressions extended with fixpoints for context-free powers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "rerebase" = callPackage @@ -218297,7 +219040,7 @@ self: { sha256 = "0lyi925jk6jbi3qc5xmv61ag07ff9d3xxmf9hfjlblqw2y9fsy93"; libraryHaskellDepends = [ rebase ]; description = "Reexports from \"base\" with a bunch of other standard libraries"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "rerebase_1_10_0_1" = callPackage @@ -218308,8 +219051,8 @@ self: { sha256 = "0kqcd80a4z1hynmdwb78dzif0iim6gwk9pdzkgzspf8kxir5adf3"; libraryHaskellDepends = [ rebase ]; description = "Reexports from \"base\" with a bunch of other standard libraries"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "reroute" = callPackage @@ -218333,7 +219076,7 @@ self: { random regex-compat text unordered-containers vector ]; description = "abstract implementation of typed and untyped web routing"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "rescue" = callPackage @@ -218364,8 +219107,8 @@ self: { transformers-base world-peace ]; description = "More understandable exceptions"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -218389,8 +219132,8 @@ self: { http-types network process QuickCheck unix warp ]; description = "Reserve reloads web applications"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -218402,8 +219145,8 @@ self: { sha256 = "0ywskms53cnhyywryvsr6mi9qyba6l6dncpj0hx59k0rdr5nb25h"; libraryHaskellDepends = [ base containers random ]; description = "Unweighted reservoir sampling"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -218415,8 +219158,8 @@ self: { sha256 = "1arv9mcbg5xa6vzv6k85mcxdz38x26ipwhk8613qdd94a2hhf8nx"; libraryHaskellDepends = [ base ghc-prim ralist semigroupoids ]; description = "High performance variable binders"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -218430,8 +219173,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base comfort-array lapack ]; description = "Compute total resistance of a cube of resistors"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -218450,8 +219193,8 @@ self: { base bytestring directory filepath tasty tasty-hunit ]; description = "Domain Name Service (DNS) lookup via the libresolv standard library routines"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; }) {}; "resolv" = callPackage @@ -218462,6 +219205,8 @@ self: { pname = "resolv"; version = "0.1.2.0"; sha256 = "0wa6wsh6i52q4ah2z0hgzlks325kigch4yniz0y15nw4skxbm8l1"; + revision = "1"; + editedCabalFile = "19pm4cg28viyl7r0viz4wfmm9w4nqxkjlb6kknfqcajjqmdacqad"; libraryHaskellDepends = [ base base16-bytestring binary bytestring containers ]; @@ -218469,7 +219214,7 @@ self: { base bytestring directory filepath tasty tasty-hunit ]; description = "Domain Name Service (DNS) lookup via the libresolv standard library routines"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; }) {}; "resolve" = callPackage @@ -218486,8 +219231,8 @@ self: { hslogger iproute network parsec stm stm-containers transformers ]; description = "A name resolusion library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -218506,8 +219251,8 @@ self: { optparse-applicative process unix ]; description = "Remove trivial conflict markers in a git repository"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -218526,8 +219271,8 @@ self: { test-framework test-framework-hunit test-framework-quickcheck2 ]; description = "A port of the package 'resourcet' for extensible effects"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -218541,8 +219286,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base bytestring directory ]; description = "Embed data files via C and FFI"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -218559,7 +219304,7 @@ self: { vector ]; description = "A high-performance striped resource pooling implementation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "resource-pool-catchio" = callPackage @@ -218575,8 +219320,8 @@ self: { transformers-base vector ]; description = "Fork of resource-pool, with a MonadCatchIO constraint"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -218592,7 +219337,7 @@ self: { base free kan-extensions monad-control resource-pool transformers ]; description = "A monadic interface for resource-pool"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "resource-simple" = callPackage @@ -218608,8 +219353,8 @@ self: { transformers transformers-base ]; description = "Allocate resources which are guaranteed to be released"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -218626,7 +219371,7 @@ self: { ]; testHaskellDepends = [ base exceptions hspec transformers ]; description = "Deterministic allocation and freeing of scarce resources"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "resourcet-pool" = callPackage @@ -218637,7 +219382,7 @@ self: { sha256 = "1jf6sbyhxrqbkdxiv330rk46kdvbrr0c4pybnm9cmij9wdqs15bd"; libraryHaskellDepends = [ base resource-pool resourcet ]; description = "A small library to convert a Pool into an Acquire"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "respond" = callPackage @@ -218665,8 +219410,8 @@ self: { aeson base fast-logger http-types text wai ]; description = "process and route HTTP requests and generate responses on top of WAI"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -218688,8 +219433,8 @@ self: { transformers-base transformers-compat uri-encode utf8-string ]; description = "Utility library for use in generated API client libraries"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -218717,8 +219462,8 @@ self: { transformers transformers-compat unordered-containers ]; description = "Rest API library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -218741,8 +219486,8 @@ self: { ]; executableHaskellDepends = [ base base-compat rest-gen ]; description = "Example project for rest"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -218770,8 +219515,8 @@ self: { test-framework-hunit ]; description = "Documentation and client generation from rest definition"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -218789,8 +219534,8 @@ self: { base containers happstack-server mtl rest-core rest-gen utf8-string ]; description = "Rest driver for Happstack"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -218808,8 +219553,8 @@ self: { snap-core unordered-containers uri-encode utf8-string ]; description = "Rest driver for Snap"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -218826,8 +219571,8 @@ self: { unordered-containers ]; description = "Maps with stringy keys that can be transcoded to JSON and XML"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -218847,8 +219592,8 @@ self: { generic-xmlpickler hxt json-schema rest-stringmap text uuid ]; description = "Silk Rest Framework Types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -218868,8 +219613,8 @@ self: { mime-types mtl rest-core text unordered-containers wai ]; description = "Rest driver for WAI applications"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -218881,8 +219626,8 @@ self: { sha256 = "0bar7sy53pylq13wkbb4j3i7y81g6y203njkh9vlid7nh109j409"; libraryHaskellDepends = [ aeson base bytestring unix ]; description = "Minimal live coding library for model-view-event-update applications"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -218902,8 +219647,8 @@ self: { readable snap snap-core snap-extras template-haskell text time time-locale-compat xmlhtml ]; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -218922,7 +219667,7 @@ self: { base bytestring containers tasty tasty-hunit temporary text ]; description = "Easy Git repository serialization"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "restricted-workers" = callPackage @@ -218940,8 +219685,8 @@ self: { transformers-base unix ]; description = "Running worker processes under system resource restrictions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -218956,8 +219701,8 @@ self: { libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base directory filepath utf8-string ]; description = "Convert between camel case and separated words style"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -218970,7 +219715,7 @@ self: { libraryHaskellDepends = [ base bifunctors keys mtl transformers ]; testHaskellDepends = [ base ]; description = "Encode success or at least one error"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "resumable-exceptions" = callPackage @@ -218982,7 +219727,7 @@ self: { libraryHaskellDepends = [ base mtl ]; description = "A monad transformer for resumable exceptions"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "rethinkdb" = callPackage @@ -219005,8 +219750,8 @@ self: { testHaskellDepends = [ base doctest ]; benchmarkHaskellDepends = [ aeson async base criterion text ]; description = "A driver for RethinkDB 2.2"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -219035,8 +219780,8 @@ self: { base criterion text time unordered-containers vector ]; description = "Client driver for RethinkDB"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -219052,8 +219797,8 @@ self: { aeson base mtl rethinkdb text transformers unordered-containers ]; description = "Useful tools for modeling data with rethinkdb"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -219073,8 +219818,8 @@ self: { unordered-containers utf8-string vector ]; description = "RethinkDB driver for Haskell"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -219103,7 +219848,7 @@ self: { syb tasty tasty-hunit temporary text unordered-containers ]; description = "A powerful, easy-to-use codemodding tool for Haskell"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "retry" = callPackage @@ -219123,7 +219868,7 @@ self: { tasty-hedgehog tasty-hunit time transformers ]; description = "Retry combinators for monadic actions that may fail"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "retryer" = callPackage @@ -219136,8 +219881,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base optparse-applicative process ]; description = "Retry failed commands"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -219152,7 +219897,7 @@ self: { libraryHaskellDepends = [ base mtl ]; testHaskellDepends = [ base ]; description = "Reverse State monad transformer"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "revdectime" = callPackage @@ -219176,7 +219921,7 @@ self: { sha256 = "0iw1j2xr5dy29a1bwcg7fqk3lv72izr0nhj31rn45w53py1367nb"; libraryHaskellDepends = [ base ]; description = "Standard version of the reverse apply operator"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "reverse-arguments" = callPackage @@ -219187,7 +219932,7 @@ self: { sha256 = "0f9dz654rqz0yrh1qvl6947ds5pfl2bsy7gnv4i8swlaj1n8dmzi"; libraryHaskellDepends = [ base ]; description = "Reverse the arguments of arbitrary functions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "reverse-geocoding" = callPackage @@ -219202,8 +219947,8 @@ self: { aeson base iso3166-country-codes lens lens-aeson text wreq ]; description = "Simple reverse geocoding using OpenStreeMap"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -219217,8 +219962,8 @@ self: { isExecutable = true; executableHaskellDepends = [ array base process ]; description = "Text-only reversi (aka othelo) game"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -219234,8 +219979,8 @@ self: { base bytestring directory multiarg process ]; description = "open file and rewrite it with new contents"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -219255,8 +220000,8 @@ self: { ]; executableHaskellDepends = [ base prettyprinter ]; description = "Inspection of rewriting steps"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -219268,8 +220013,8 @@ self: { sha256 = "0gnd8awqjnm905m29yldy3z7w7jvilj5svijz63lzmwbjknfh6bs"; libraryHaskellDepends = [ base containers regular ]; description = "Generic rewriting library for regular datatypes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -219287,7 +220032,7 @@ self: { pcre-light template-haskell ]; description = "A quasi-quoter for typeful results of regex captures"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "rezoom" = callPackage @@ -219306,7 +220051,7 @@ self: { ]; description = "Github resume generator"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -219340,8 +220085,8 @@ self: { warp wreq ]; description = "Robert Fischer's Common library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -219353,8 +220098,8 @@ self: { sha256 = "1s3r5wpap3rj7fxx1wvxjk5671jcnllvplz631vagwbyl9p755zh"; libraryHaskellDepends = [ base envy network rfc-prelude time ]; description = "Environment variable support from the Robert Fischer Commons"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -219372,8 +220117,8 @@ self: { rfc-prelude scientific servant-server vector wreq ]; description = "The HTTP client extensions from the Robert Fischer Commons"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -219397,8 +220142,8 @@ self: { tuple unliftio unliftio-core uuid-types ]; description = "The Prelude from the Robert Fischer Commons"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -219415,8 +220160,8 @@ self: { rfc-prelude transformers ]; description = "The PostgreSQL extensions from the Robert Fischer Commons"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -219428,8 +220173,8 @@ self: { sha256 = "00r8mghkgqgf6mh4v5jspahdcpb3bj5i82rmiyasv01a7gp6gzsg"; libraryHaskellDepends = [ base hedis rfc-env rfc-prelude time ]; description = "The Redis extensions from the Robert Fischer Commons"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -219451,8 +220196,8 @@ self: { servant-server servant-swagger servant-swagger-ui swagger2 wai wreq ]; description = "The Servant extensions from the Robert Fischer Commons"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -219464,7 +220209,7 @@ self: { sha256 = "065x5fgsqdi4d5sjd1gridwshag3afdbip1g8qi4jz41xdi2xm38"; libraryHaskellDepends = [ base network-simple rfc1413-types ]; description = "rfc1413 server"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "rfc1413-types" = callPackage @@ -219477,7 +220222,7 @@ self: { editedCabalFile = "1v55q9z4k4c4qb30hmavf3hvwi1i9a351i12ycwzmlj0vv382byk"; libraryHaskellDepends = [ base bytestring ]; description = "An rfc1413 parser and response renderer"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "rfc1751" = callPackage @@ -219493,7 +220238,7 @@ self: { base bytestring cereal hspec QuickCheck vector ]; description = "RFC-1751 library for Haskell"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "rfc3339" = callPackage @@ -219505,7 +220250,7 @@ self: { libraryHaskellDepends = [ base timerep ]; doHaddock = false; description = "Parse and display time according to RFC3339 (deprecated)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "rfc5051" = callPackage @@ -219517,7 +220262,7 @@ self: { libraryHaskellDepends = [ base containers text ]; testHaskellDepends = [ base text ]; description = "Simple unicode collation as per RFC5051"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "rg" = callPackage @@ -219536,8 +220281,8 @@ self: { vector ]; description = "A dynamic/unbounded alternative to Bounded Enum"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -219549,7 +220294,7 @@ self: { sha256 = "0vhqw2hylv0228g48b4q81fs0pjgmv68rzlasnz39g6yqddws97c"; libraryHaskellDepends = [ base ]; description = "Haskell types for working with RGB colors"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "rhbzquery" = callPackage @@ -219569,7 +220314,7 @@ self: { ]; testHaskellDepends = [ base simple-cmd ]; description = "Bugzilla query tool"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }) {}; "rhine" = callPackage @@ -219586,7 +220331,7 @@ self: { simple-affine-space time transformers vector-sized ]; description = "Functional Reactive Programming with type-level clocks"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "rhine-gloss" = callPackage @@ -219600,7 +220345,7 @@ self: { libraryHaskellDepends = [ base dunai gloss rhine transformers ]; executableHaskellDepends = [ base ]; description = "Gloss backend for Rhine"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "rhythm-game-tutorial" = callPackage @@ -219618,8 +220363,8 @@ self: { base call containers lens mtl objective split ]; description = "Haskell rhythm game tutorial"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -219653,7 +220398,7 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion semigroups ]; description = "A Haskell client for the Riak decentralized data store"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "riak-protobuf" = callPackage @@ -219669,7 +220414,7 @@ self: { ]; description = "Haskell types for the Riak protocol buffer API"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "riak-protobuf-lens" = callPackage @@ -219691,7 +220436,7 @@ self: { ]; description = "Lenses for riak-protobuf"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "rib" = callPackage @@ -219721,8 +220466,8 @@ self: { safe-exceptions shake text time wai wai-app-static warp ]; description = "Static site generator based on Shake"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -219744,7 +220489,7 @@ self: { text time wai wai-app-static warp ]; description = "Static site generator based on Shake"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ribbit" = callPackage @@ -219755,8 +220500,8 @@ self: { sha256 = "076m5w4w08z8migb0v8vb6lybs06x1bfvxqfi9g633lz464hyi9v"; libraryHaskellDepends = [ base Only postgresql-simple text time ]; description = "Type-level Relational DB combinators"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -219791,7 +220536,7 @@ self: { ]; description = "api extensions for nvim-hs"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "ribosome-root" = callPackage @@ -219823,7 +220568,7 @@ self: { ]; description = "api extensions for nvim-hs"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "ribosome-test" = callPackage @@ -219845,7 +220590,7 @@ self: { ]; description = "test helpers for ribosome"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "richreports" = callPackage @@ -219856,7 +220601,7 @@ self: { sha256 = "0mik0m6nziwm6z517wkxdmjp92nh3qz1m8yk3x5897zafgs1y5kk"; libraryHaskellDepends = [ ascetic base MissingH ]; description = "Integrated pretty-printing and error/static analysis reporting"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "ridley" = callPackage @@ -219884,8 +220629,8 @@ self: { tasty-quickcheck text ]; description = "Quick metrics to grow your app strong"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -219903,8 +220648,8 @@ self: { ]; testHaskellDepends = [ base ]; description = "Handy metrics that don't belong to ridley"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -219934,8 +220679,8 @@ self: { test-framework-hunit test-framework-quickcheck2 ]; description = "A Riemann client for Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -219954,8 +220699,8 @@ self: { ]; executableHaskellDepends = [ base bytestring filepath ]; description = "RIFF parser for Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -219972,7 +220717,7 @@ self: { ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "A mid-level wrapper for vega-lite"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ring-buffer" = callPackage @@ -219986,8 +220731,8 @@ self: { libraryHaskellDepends = [ base exceptions mtl primitive vector ]; testHaskellDepends = [ base HUnit QuickCheck vector ]; description = "A concurrent, mutable ring-buffer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -220004,8 +220749,8 @@ self: { ]; testHaskellDepends = [ base HUnit primitive QuickCheck ]; description = "mutable ring buffers with atomic updates in GHC Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -220022,7 +220767,7 @@ self: { semigroupoids ]; description = "Ring-like objects"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "rio" = callPackage @@ -220033,8 +220778,8 @@ self: { }: mkDerivation { pname = "rio"; - version = "0.1.19.0"; - sha256 = "04kvpirwz86pj7izaa0la601xyqnqzsspg43z10vxnc1whjp5rsm"; + version = "0.1.20.0"; + sha256 = "0x5b5c0y97b5n1lvbcsqlkhbv4nbbznx1w1fp3a17a03pz7qf61s"; libraryHaskellDepends = [ base bytestring containers deepseq directory exceptions filepath hashable microlens microlens-mtl mtl primitive process text time @@ -220048,7 +220793,7 @@ self: { unordered-containers vector ]; description = "A standard library for Haskell"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "rio-orphans" = callPackage @@ -220068,7 +220813,7 @@ self: { resourcet rio transformers-base ]; description = "Orphan instances for the RIO type in the rio package"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "rio-prettyprint" = callPackage @@ -220084,7 +220829,7 @@ self: { path rio text ]; description = "Pretty-printing for RIO"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "riot" = callPackage @@ -220104,7 +220849,7 @@ self: { executableSystemDepends = [ ncurses ]; description = "Riot is an Information Organisation Tool"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) ncurses;}; @@ -220125,7 +220870,7 @@ self: { ]; description = "Ripple payment system library"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "ripple-federation" = callPackage @@ -220143,7 +220888,7 @@ self: { ]; description = "Utilities and types to work with the Ripple federation protocol"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "risc-v" = callPackage @@ -220162,8 +220907,8 @@ self: { testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; benchmarkHaskellDepends = [ base criterion ]; description = "RISC-V"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -220172,15 +220917,15 @@ self: { }: mkDerivation { pname = "risc386"; - version = "0.0.20130719"; - sha256 = "0i0fkg4vys3n31jwazrajirywxmk7idjv2kz3nlb8kwriqc6d723"; + version = "0.0.20210125"; + sha256 = "0fc551nvmqgl1sj3c45bwjzc9ksqbwg17dzkipyyzdrgi1shawn2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base containers mtl pretty ]; executableToolDepends = [ alex happy ]; description = "Reduced instruction set i386 simulator"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -220195,8 +220940,8 @@ self: { libraryHaskellDepends = [ base mtl QuickCheck ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "Haskell representation of the RISC-V instruction set architecture"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -220217,7 +220962,7 @@ self: { unordered-containers vector ]; description = "Parses and renders RISON strings"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "rivers" = callPackage @@ -220228,8 +220973,8 @@ self: { sha256 = "0x7r04mwxwnqckfk865dckml4am11zx80a9k5kc91kz5ikq1ns64"; libraryHaskellDepends = [ base lazysmallcheck oeis QuickCheck ]; description = "Rivers are like Streams, but different"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -220243,8 +220988,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base rivet-core rivet-simple-deploy ]; description = "A project management tool for Haskell applications"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -220256,7 +221001,7 @@ self: { sha256 = "0gpvlxrg6m4avxk6zhym20mx7ha2qdjr1dkjzjwsvyk4fhcjk399"; libraryHaskellDepends = [ base postgresql-simple rivet-core text ]; description = "Rivet migration library postgresql backend"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "rivet-autoimporter" = callPackage @@ -220269,7 +221014,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base directory filepath ]; description = "Database migration library; automatic importer"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "rivet-core" = callPackage @@ -220281,7 +221026,7 @@ self: { libraryHaskellDepends = [ base text ]; testHaskellDepends = [ base ]; description = "Database migration library; core functionality"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "rivet-migration" = callPackage @@ -220292,8 +221037,8 @@ self: { sha256 = "1vg6ns5scq5nqyj2w070hswynji8pqfh654qa3zjda2xhna5mnbd"; libraryHaskellDepends = [ base postgresql-simple text ]; description = "Postgresql migration support for project management tool"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -220305,8 +221050,8 @@ self: { sha256 = "1003sm8mpnc7l7fbp1j08cvc55va54arp6j0qdg2cc2m8cy5bpxf"; libraryHaskellDepends = [ base configurator mtl rivet-core text ]; description = "Basic deployment support for project management tool"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -220332,8 +221077,8 @@ self: { base containers mtl unordered-containers ]; description = "Collection of Reinforcement Learning algorithms"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -220356,8 +221101,8 @@ self: { network-simple random transformers ]; description = "A Haskell codec for RL-Glue"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -220369,7 +221114,7 @@ self: { sha256 = "17v8sbgfk1mnm6qfqsnrjcm2nh7i2bibgyr6bh0bic8cfcx0haia"; libraryHaskellDepends = [ base ]; description = "Lists with cheap snocs"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "rlwe-challenges" = callPackage @@ -220393,8 +221138,8 @@ self: { ]; executableHaskellDepends = [ ansi-terminal base options time ]; description = "Ring-LWE/LWR challenges using Lol"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -220411,8 +221156,8 @@ self: { base containers HUnit test-framework test-framework-hunit ]; description = "Restricted monad library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -220441,8 +221186,8 @@ self: { ]; benchmarkHaskellDepends = [ base bytestring criterion ]; description = "Haskell implementation of the RNCryptor file format"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -220460,7 +221205,7 @@ self: { ]; benchmarkHaskellDepends = [ base criterion ]; description = "RNG within an IORef for convenient concurrent use"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "rob" = callPackage @@ -220481,8 +221226,8 @@ self: { executableHaskellDepends = [ base cmdargs ]; testHaskellDepends = [ base directory ]; description = "Simple projects generator"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -220502,8 +221247,8 @@ self: { monad-control mtl process resourcet text time unix ]; description = "A build daemon for Haskell development"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -220525,7 +221270,7 @@ self: { servant-client servant-flatten servant-server string-conversions ]; description = "Automatic session-aware servant testing"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "robot" = callPackage @@ -220539,7 +221284,7 @@ self: { ]; description = "Simulate keyboard and mouse events"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "robots-txt" = callPackage @@ -220558,8 +221303,8 @@ self: { transformers ]; description = "Parser for robots.txt"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -220574,8 +221319,8 @@ self: { libraryHaskellDepends = [ base vector ]; testHaskellDepends = [ base hspec HUnit ]; description = "ROC online clustering algorithm"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -220593,8 +221338,8 @@ self: { base containers gloss optparse-applicative roc-cluster ]; description = "Gloss interactive demo for roc-cluster package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -220614,7 +221359,7 @@ self: { vector-sized ]; description = "Implementation of the ROC National ID standard"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "rock" = callPackage @@ -220639,8 +221384,8 @@ self: { hashable hedgehog mtl unordered-containers ]; description = "A build system for incremental, parallel, and demand-driven computations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -220663,8 +221408,8 @@ self: { QuickCheck resourcet temporary transformers ]; description = "Haskell bindings to RocksDB"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) rocksdb;}; @@ -220685,7 +221430,7 @@ self: { string-conversions unliftio ]; description = "Haskell bindings for RocksDB"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) rocksdb;}; "rocksdb-query" = callPackage @@ -220704,8 +221449,8 @@ self: { base cereal data-default hspec rocksdb-haskell-jprupp unliftio ]; description = "RocksDB database querying library for Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -220724,7 +221469,7 @@ self: { ]; description = "Sci-fi roguelike game. Client application."; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "roguestar-engine" = callPackage @@ -220745,7 +221490,7 @@ self: { ]; description = "Sci-fi roguelike game. Backend."; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "roguestar-gl" = callPackage @@ -220763,7 +221508,7 @@ self: { ]; description = "Sci-fi roguelike game. Client library."; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "roguestar-glut" = callPackage @@ -220777,7 +221522,7 @@ self: { executableHaskellDepends = [ base GLUT roguestar-gl rsagl ]; description = "Sci-fi roguelike game. GLUT front-end."; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "roku-api" = callPackage @@ -220792,8 +221537,8 @@ self: { base bytestring http-client network text xml xml-extractors ]; description = "Bindings to Roku's External Control API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -220805,7 +221550,7 @@ self: { sha256 = "181lmjmvv6285q5zh6cf991jw7d6f0g225vya3iqqb8vn8qjz7g2"; libraryHaskellDepends = [ base containers ]; description = "Composable class-based roles"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "rollbar" = callPackage @@ -220821,8 +221566,8 @@ self: { network resourcet text vector ]; description = "error tracking through rollbar.com"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -220840,8 +221585,8 @@ self: { executableHaskellDepends = [ base rollbar-client ]; testHaskellDepends = [ base ]; description = "Simple CLI tool to perform commons tasks such as tracking deploys"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -220865,8 +221610,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Core library to communicate with Rollbar API"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -220889,8 +221634,8 @@ self: { QuickCheck text unordered-containers ]; description = "Core Rollbar data types and APIs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -220915,8 +221660,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Provides error reporting capabilities to WAI based applications through Rollbar API"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -220938,8 +221683,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Provides error reporting capabilities to Yesod applications through Rollbar API"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -220960,8 +221705,8 @@ self: { base optparse-applicative random regex-applicative ]; description = "Playing with applicatives and dice!"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -220973,7 +221718,7 @@ self: { sha256 = "1l39dlq8pn38b48iwqgrnh83h74qkmm34l5m9a0rbg76s2z04c43"; libraryHaskellDepends = [ base stm ]; description = "Bounded channel for STM that discards old entries when full"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "roman-numerals" = callPackage @@ -220986,7 +221731,7 @@ self: { base base-unicode-symbols bytestring text ]; description = "Parsing and pretty printing of Roman numerals"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "romkan" = callPackage @@ -221003,7 +221748,7 @@ self: { test-framework-hunit text ]; description = "Japanese Romaji <-> Japanese Kana conversion library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ron" = callPackage @@ -221022,7 +221767,7 @@ self: { ]; benchmarkHaskellDepends = [ base criterion deepseq integer-gmp ]; description = "RON"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ron-rdt" = callPackage @@ -221038,8 +221783,8 @@ self: { transformers unordered-containers ]; description = "Replicated Data Types (RON-RDT)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -221057,8 +221802,8 @@ self: { ron-rdt template-haskell text transformers ]; description = "RON-Schema"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -221076,8 +221821,8 @@ self: { mtl network-info ron ron-rdt stm text tf-random transformers ]; description = "RON Storage"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -221089,7 +221834,7 @@ self: { sha256 = "0xzsz4w153mbkkkv07558xkv83fph4g98hvjf6iljwvbbp47l0j9"; libraryHaskellDepends = [ base tagged ]; description = "Root-finding algorithms (1-dimensional)"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "rope" = callPackage @@ -221102,8 +221847,8 @@ self: { base bytestring fingertree mtl utf8-string ]; description = "Tools for manipulating fingertrees of bytestrings with optional annotations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -221120,7 +221865,7 @@ self: { base QuickCheck tasty tasty-hunit tasty-quickcheck text ]; description = "Ropes optimised for updating using UTF-16 code units and row/column pairs"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "rosa" = callPackage @@ -221140,7 +221885,7 @@ self: { wreq ]; description = "Query the namecoin blockchain"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "rose" = callPackage @@ -221154,7 +221899,7 @@ self: { libraryHaskellDepends = [ base comonad free indexed-traversable ]; testHaskellDepends = [ base QuickCheck quickcheck-classes ]; description = "rose trees"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "rose-trees" = callPackage @@ -221182,8 +221927,8 @@ self: { unordered-containers witherable ]; description = "Various trie implementations in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -221199,8 +221944,8 @@ self: { base containers deepseq minilens mtl transformers ]; description = "Trees with polymorphic paths to nodes, combining properties of Rose Trees and Tries"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -221216,8 +221961,8 @@ self: { testHaskellDepends = [ base containers hspec QuickCheck ]; testToolDepends = [ hspec-discover ]; description = "Common rose tree/forest functions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -221229,7 +221974,7 @@ self: { sha256 = "1g6ppa8cappdbq9923lsac504dfjh0ks64gbm6qbihrc34f4zavc"; libraryHaskellDepends = [ base containers ]; description = "Generic zipper implementation for Data.Tree"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "roshask" = callPackage @@ -221261,8 +222006,8 @@ self: { filepath mtl pureMD5 tasty tasty-hunit testpack transformers ]; description = "Haskell support for the ROS robotics framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -221280,8 +222025,8 @@ self: { lens-family-core pureMD5 template-haskell text ]; description = "ROS message parser, render, TH"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -221299,8 +222044,8 @@ self: { base filepath monad-logger rosmsg rospkg stack temporary text ]; description = "ROS message management tools"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -221321,7 +222066,7 @@ self: { executableHaskellDepends = [ base text ]; testHaskellDepends = [ base ]; description = "ROS package system information"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "rosso" = callPackage @@ -221332,8 +222077,8 @@ self: { sha256 = "0cz5kqpvq9qjkdy2x3y6aqia3armawjjsnv2pxifl0l6f9hhrvis"; libraryHaskellDepends = [ base containers deepseq ]; description = "General purpose utility library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -221346,7 +222091,7 @@ self: { libraryHaskellDepends = [ base bytestring text ]; testHaskellDepends = [ base bytestring hspec QuickCheck text ]; description = "Fast ROT13 cipher for Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "rotating-log" = callPackage @@ -221365,8 +222110,8 @@ self: { base bytestring directory filepath time time-locale-compat ]; description = "Size-limited, concurrent, automatically-rotating log writer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -221383,7 +222128,7 @@ self: { base QuickCheck semigroups tasty tasty-quickcheck ]; description = "A simple round-robin data type"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "rounded" = callPackage @@ -221401,8 +222146,8 @@ self: { libraryPkgconfigDepends = [ mpfr ]; testHaskellDepends = [ base long-double ]; description = "Correctly-rounded arbitrary-precision floating-point arithmetic"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) gmp; inherit (pkgs) mpfr;}; @@ -221427,8 +222172,8 @@ self: { array base deepseq fp-ieee gauge primitive vector ]; description = "Directed rounding for built-in floating types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -221440,8 +222185,8 @@ self: { sha256 = "1d2vaijcna8gwcrhsjpclqw4gjdvdpmnrlyszqzcxnqf0l206a6y"; libraryHaskellDepends = [ array base numeric-extras ]; description = "Explicit floating point rounding mode wrappers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -221457,7 +222202,7 @@ self: { base containers pretty safe template-haskell text xml-types ]; description = "Bidirectional (de-)serialization"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "roundtrip-aeson" = callPackage @@ -221477,8 +222222,8 @@ self: { aeson base bytestring lens-aeson roundtrip text vector ]; description = "Un-/parse JSON with roundtrip invertible syntax definitions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -221490,7 +222235,7 @@ self: { sha256 = "1lad64y877rf36dgldkc7qcg5xagjc00z4cf2r1ahamv379df8d7"; libraryHaskellDepends = [ base mtl parsec roundtrip ]; description = "Bidirectional (de-)serialization"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "roundtrip-xml" = callPackage @@ -221511,8 +222256,8 @@ self: { text xml-enumerator xml-types ]; description = "Bidirectional (de-)serialization for XML"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -221529,7 +222274,7 @@ self: { ]; description = "Utility to generate routes for use with yesod-routes"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "route-planning" = callPackage @@ -221547,8 +222292,8 @@ self: { base directory doctest filepath QuickCheck ]; description = "A library and utilities for creating a route"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -221565,7 +222310,7 @@ self: { benchmarkHaskellDepends = [ base criterion ]; doHaddock = false; description = "Row types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "row-types" = callPackage @@ -221583,7 +222328,7 @@ self: { testHaskellDepends = [ base generic-lens ]; benchmarkHaskellDepends = [ base deepseq gauge ]; description = "Open Records and Variants"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "rowdy" = callPackage @@ -221595,7 +222340,7 @@ self: { libraryHaskellDepends = [ base containers dlist mtl ]; testHaskellDepends = [ base containers dlist hspec mtl ]; description = "An EDSL for web application routes"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "rowdy-yesod" = callPackage @@ -221607,7 +222352,7 @@ self: { libraryHaskellDepends = [ base rowdy yesod-core ]; testHaskellDepends = [ base hspec rowdy yesod-core ]; description = "An EDSL for web application routes"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "rowrecord" = callPackage @@ -221618,8 +222363,8 @@ self: { sha256 = "0gcrdy75f0rqfayn37frwcixb086x4s7dygphxhxbpvyl8sjnl0l"; libraryHaskellDepends = [ base containers template-haskell ]; description = "Build records from lists of strings, as from CSV files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -221636,8 +222381,8 @@ self: { template-haskell th-lift ]; description = "type safe rpcs provided as basic IO actions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -221656,8 +222401,8 @@ self: { ]; executableHaskellDepends = [ base ]; description = "a remote procedure call framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -221677,8 +222422,8 @@ self: { hslogger iproute parsec unix ]; description = "Receiver Policy Framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -221692,8 +222437,8 @@ self: { isExecutable = true; libraryHaskellDepends = [ base directory filepath HaXml process ]; description = "Cozy little project to question unruly rpm packages"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -221718,8 +222463,8 @@ self: { ]; testHaskellDepends = [ base extra hspec simple-cmd unix ]; description = "Order RPM packages by dependencies"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -221736,8 +222481,8 @@ self: { ]; testHaskellDepends = [ base hspec text ]; description = "Recurrence rule parser and formatter"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -221757,8 +222502,8 @@ self: { rsagl-math stm Vec Vec-OpenGLRaw ]; description = "The RogueStar Animation and Graphics Library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -221774,8 +222519,8 @@ self: { array arrows base containers mtl old-time random rsagl-math stm ]; description = "The RogueStar Animation and Graphics Library: Functional Reactive Programming"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -221792,8 +222537,8 @@ self: { random Vec Vec-OpenGLRaw ]; description = "The RogueStar Animation and Graphics Library: Mathematics"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -221807,7 +222552,7 @@ self: { testHaskellDepends = [ base QuickCheck safe ]; description = "Range set"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "rspp" = callPackage @@ -221818,8 +222563,8 @@ self: { sha256 = "132s7pbm49fgpiq7znr72h52wcmwblljblr0s0krr56593gp2rry"; libraryHaskellDepends = [ base ]; description = "A Rational Street Performer Protocol solver"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -221833,8 +222578,8 @@ self: { editedCabalFile = "0ql1ffjw0g1sdyz9icin4cq86i5b9ljzhvpivfbbyaipg2nc9z0s"; libraryHaskellDepends = [ base HaXml network network-uri time ]; description = "A library for generating RSS 2.0 feeds."; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -221865,8 +222610,8 @@ self: { tasty-quickcheck text time uri-bytestring xml-conduit xml-types ]; description = "Streaming parser/renderer for the RSS standard"; - license = stdenv.lib.licenses.cc0; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.cc0; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -221890,8 +222635,8 @@ self: { text time transformers utf8-string ]; description = "watches an RSS/Atom feed and writes it to an IRC channel"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -221903,8 +222648,8 @@ self: { sha256 = "14l2jww91w993b61xn1m9y9wh27dvy1l1x2fh7g9f0l8mc5a9dpv"; libraryHaskellDepends = [ base ghc-prim ]; description = "stream-fusion framework from vector"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -221933,8 +222678,8 @@ self: { tasty-hunit tasty-quickcheck text word24 ]; description = "Haskell bindings for RTCM"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -221947,7 +222692,7 @@ self: { libraryHaskellDepends = [ base ]; description = "dynamic linker tools for Haskell"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "rtlsdr" = callPackage @@ -221960,8 +222705,8 @@ self: { librarySystemDepends = [ rtl-sdr ]; libraryToolDepends = [ c2hs ]; description = "Bindings to librtlsdr"; - license = stdenv.lib.licenses.bsd3; - platforms = [ "i686-linux" "x86_64-linux" ]; + license = lib.licenses.bsd3; + platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) rtl-sdr;}; "rtnetlink" = callPackage @@ -221983,8 +222728,8 @@ self: { base bytestring exceptions hspec linux-namespaces socket unix ]; description = "Manipulate network devices, addresses, and routes on Linux"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -222001,8 +222746,8 @@ self: { mtl network split utf8-string ]; description = "A library for communicating with RTorrent over its XML-RPC interface"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -222023,7 +222768,7 @@ self: { QuickCheck temporary utf8-string ]; description = "Parsing and manipulation of rtorrent state file contents"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "rts-loader" = callPackage @@ -222042,8 +222787,8 @@ self: { ]; executableHaskellDepends = [ base Cabal process ]; description = "Dynamically load Haskell libraries"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -222061,8 +222806,8 @@ self: { libraryToolDepends = [ c2hs ]; testHaskellDepends = [ base ]; description = "Binding to the C++ audio stretching library Rubber Band"; - license = stdenv.lib.licenses.gpl3; - platforms = [ "i686-linux" "x86_64-linux" ]; + license = lib.licenses.gpl3; + platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) rubberband;}; "ruby-marshal" = callPackage @@ -222080,8 +222825,8 @@ self: { base bytestring cereal containers fail hspec mtl string-conv vector ]; description = "Parse a subset of Ruby objects serialised with Marshal.dump."; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -222098,8 +222843,8 @@ self: { process template-haskell trifecta ]; description = "rubyish quasiquoters"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -222111,8 +222856,8 @@ self: { sha256 = "1id3rpfzqwhnmv2w4p35a70zfanwrpazix27ak1hzaz1jd2yfmz5"; libraryHaskellDepends = [ array base mtl parsec safe strict Vec ]; description = "relatively useful fractal functions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -222134,8 +222879,8 @@ self: { smallcheck template-haskell ]; description = "Pliable records"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -222154,8 +222899,8 @@ self: { base Cabal containers mtl shuffle uhc-util uuagc uuagc-cabal uulib ]; description = "Ruler tool for UHC"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -222174,7 +222919,7 @@ self: { uulib ]; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -222186,7 +222931,7 @@ self: { sha256 = "1ra8rv7cbsj1x8vfd3sbynd7a73v9arfimzcfhg9j6blqcii2i2d"; libraryHaskellDepends = [ base data-default filepath process ]; description = "Running newly generated Haskell source module"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "run-st" = callPackage @@ -222197,8 +222942,8 @@ self: { sha256 = "11if8xwv22ry0mxrglg3pcx3cx8ljnq56f3m9vjkr9jcj2881dvf"; libraryHaskellDepends = [ base primitive primitive-unlifted ]; description = "runST without boxing penalty"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -222210,8 +222955,8 @@ self: { sha256 = "07drd0xvkg06p2fsbncafnr7wzkrs4m6sfs1szbbscggw3pxh4fp"; libraryHaskellDepends = [ base ]; description = "A collection of explicit Runge-Kutta methods of various orders"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -222229,7 +222974,7 @@ self: { base cmdargs directory filepath old-time process ]; description = "runghc replacement for fast repeated runs"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "runhs" = callPackage @@ -222248,8 +222993,8 @@ self: { ]; testHaskellDepends = [ base directory hspec process ]; description = "Stack wrapper for single-file Haskell programs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -222267,8 +223012,8 @@ self: { async base bytestring optparse-applicative process stm ]; description = "Run multiple commands, interleaving output and errors"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -222280,7 +223025,7 @@ self: { sha256 = "12fn0lsil0rj0pj0ixzppsdw2fmj0cnzci4fh11z9rcggwbz6pms"; testHaskellDepends = [ base data-memocombinators time ]; description = "A simple memoization helper library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "runtime-arbitrary" = callPackage @@ -222291,8 +223036,8 @@ self: { sha256 = "1lb9c174vmbcjpm4y1j2jwngbzx5s0s1iiq8iam5g87h475k2bh1"; libraryHaskellDepends = [ base ifcxt QuickCheck template-haskell ]; description = "Runtime generation of Arbitrary values"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -222310,8 +223055,8 @@ self: { testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; benchmarkHaskellDepends = [ base criterion ]; description = "RISC-V"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -222327,7 +223072,7 @@ self: { base MonadPrompt mtl random-source transformers ]; description = "Random Variables"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "rwlock" = callPackage @@ -222338,7 +223083,7 @@ self: { sha256 = "0isx32ayaqh7vhcyl11ykdy8f1chs1fdw73h3c2r53k989yfkmba"; libraryHaskellDepends = [ base monad-loops-stm stm syb ]; description = "Multiple-read / single-write locks"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "rws" = callPackage @@ -222358,11 +223103,29 @@ self: { test-framework-quickcheck2 ]; description = "Packet Generation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; + "rz-pipe" = callPackage + ({ mkDerivation, aeson, base, bytestring, HTTP, process + , utf8-string + }: + mkDerivation { + pname = "rz-pipe"; + version = "0.1.0"; + sha256 = "0x8mdry5l8b4dnpi43g2vqj9haggi7asnjhdz864bw17gr53g8vx"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring HTTP process utf8-string + ]; + executableHaskellDepends = [ aeson base ]; + description = "Pipe interface for Rizin"; + license = lib.licenses.mit; + }) {}; + "s-cargot" = callPackage ({ mkDerivation, base, containers, HUnit, parsec, QuickCheck, text }: @@ -222375,7 +223138,7 @@ self: { libraryHaskellDepends = [ base containers parsec text ]; testHaskellDepends = [ base HUnit parsec QuickCheck text ]; description = "A flexible, extensible s-expression library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "s-cargot-letbind" = callPackage @@ -222387,7 +223150,7 @@ self: { libraryHaskellDepends = [ base s-cargot text ]; testHaskellDepends = [ base HUnit parsec s-cargot text ]; description = "Enables let-binding and let-expansion for s-cargot defined S-expressions"; - license = stdenv.lib.licenses.isc; + license = lib.licenses.isc; }) {}; "s-expression" = callPackage @@ -222401,8 +223164,8 @@ self: { libraryHaskellDepends = [ base derive-monoid lens semigroups ]; executableHaskellDepends = [ base ]; description = "simple general-purpose s-expressions"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -222424,7 +223187,7 @@ self: { case-insensitive cryptohash http-types time utf8-string ]; description = "Pre-signed Amazon S3 URLs"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "safe" = callPackage @@ -222436,7 +223199,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base deepseq QuickCheck ]; description = "Library of safe (exception free) functions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "safe-access" = callPackage @@ -222447,7 +223210,7 @@ self: { sha256 = "13fw3b4sgrqymkq27n0727y5m8d3h6h44lfb9faip98bakr5d8v5"; libraryHaskellDepends = [ base mtl transformers ]; description = "A simple environment to control access to data"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "safe-buffer-monad" = callPackage @@ -222462,8 +223225,8 @@ self: { base hspec mtl safe-exceptions stm unliftio ]; description = "A monadic buffer resilient to exceptions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -222475,8 +223238,8 @@ self: { sha256 = "059mn68pj57dvjzmv3vypv0askx02f4hlalbzsr34cn2h7ndw6df"; libraryHaskellDepends = [ base ]; description = "A friendly shorthand for an old friend"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -222496,7 +223259,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Safe and very efficient arithmetic operations on fixed decimal point numbers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "safe-exceptions" = callPackage @@ -222510,7 +223273,7 @@ self: { libraryHaskellDepends = [ base deepseq exceptions transformers ]; testHaskellDepends = [ base hspec void ]; description = "Safe, consistent, and easy exception handling"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "safe-exceptions-checked" = callPackage @@ -222528,7 +223291,7 @@ self: { ]; testHaskellDepends = [ base hspec ]; description = "Safe, checked exceptions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "safe-failure" = callPackage @@ -222539,7 +223302,7 @@ self: { sha256 = "102fjardfdf9zy0vyalgq6m1l64356b0a0xaam49j31lqgfldaw7"; libraryHaskellDepends = [ base failure ]; description = "Library for safe functions (deprecated)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "safe-failure-cme" = callPackage @@ -222552,7 +223315,7 @@ self: { base control-monad-exception safe-failure ]; description = "control-monad-exception Instances for safe-failure"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "safe-foldable" = callPackage @@ -222563,7 +223326,7 @@ self: { sha256 = "1l87j0liv0hgdv3f3d4s4962df5q5xcyhmnfz2fj773r1v62wzya"; libraryHaskellDepends = [ base ]; description = "Safe wrappers for null-partial Foldable operations"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "safe-freeze" = callPackage @@ -222574,8 +223337,8 @@ self: { sha256 = "12mqgak0rla20n9b4m6ynx64bwr06njcr849csc0z0r573xw2v33"; libraryHaskellDepends = [ base indexed mtl vector ]; description = "Support for safely freezing multiple arrays in the ST monad"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -222587,8 +223350,8 @@ self: { sha256 = "0an3hy28fpdw3v5gjx13fbszzp4r2p65l8mgks0pdflscf2cwwv5"; libraryHaskellDepends = [ base stm template-haskell ]; description = "Safe top-level mutable variables which scope like ordinary values"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -222613,7 +223376,7 @@ self: { temporary text time unordered-containers uuid uuid-types vector ]; description = "Automatic JSON format versioning"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "safe-lazy-io" = callPackage @@ -222627,8 +223390,8 @@ self: { base extensible-exceptions parallel strict-io ]; description = "A library providing safe lazy IO features"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -222646,8 +223409,8 @@ self: { base hspec hspec-core QuickCheck should-not-typecheck ]; description = "Tired of accidentally calling length on tuples? Relief at last!"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -222669,7 +223432,7 @@ self: { tasty-hunit tasty-quickcheck text vector-space ]; description = "Type-safe and lossless encoding and manipulation of money, fiat currencies, crypto currencies and precious metals"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "safe-money-aeson" = callPackage @@ -222686,7 +223449,7 @@ self: { text ]; description = "Instances from the aeson library for the safe-money library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "safe-money-cereal" = callPackage @@ -222703,7 +223466,7 @@ self: { tasty-quickcheck ]; description = "Instances from the cereal library for the safe-money library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "safe-money-serialise" = callPackage @@ -222720,7 +223483,7 @@ self: { tasty-quickcheck ]; description = "Instances from the serialise library for the safe-money library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "safe-money-store" = callPackage @@ -222737,7 +223500,7 @@ self: { text ]; description = "Instances from the store library for the safe-money library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "safe-money-xmlbf" = callPackage @@ -222754,7 +223517,7 @@ self: { xmlbf ]; description = "Instances from the xmlbf library for the safe-money library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "safe-plugins" = callPackage @@ -222769,8 +223532,8 @@ self: { base directory filepath haskell-src-exts plugins Unixutils ]; description = "A small wrapper over hs-plugins to allow loading safe plugins"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -222790,8 +223553,8 @@ self: { th-lift ]; description = "Well-typed, flexible and variadic printf for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -222807,7 +223570,7 @@ self: { base constraints containers deepseq hmatrix mtl singletons ]; description = "Dependently typed tensor algebra"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "safecopy" = callPackage @@ -222818,8 +223581,8 @@ self: { }: mkDerivation { pname = "safecopy"; - version = "0.10.3"; - sha256 = "142ghv6pa3y0s7x141x9f9r5sn0315vvkfw6f7lgnndlncs5y354"; + version = "0.10.3.1"; + sha256 = "0y2jpykad7inzndw4azb2wdp4zp3smjax95sdcxycw5x88rxdra1"; libraryHaskellDepends = [ array base bytestring cereal containers generic-data old-time template-haskell text time transformers vector @@ -222830,7 +223593,7 @@ self: { template-haskell time vector ]; description = "Binary serialization with version control"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "safecopy-migrate" = callPackage @@ -222847,8 +223610,8 @@ self: { microlens safecopy template-haskell th-abstraction uniplate ]; description = "Making SafeCopy migrations easier"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -222872,8 +223635,8 @@ self: { template-haskell time vector ]; description = "Binary serialization with version control"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -222891,8 +223654,8 @@ self: { test-framework-quickcheck2 ]; description = "overflow-checked Int type"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -222915,7 +223678,7 @@ self: { test-framework-th unix ]; description = "Write output to disk atomically"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "safepath" = callPackage @@ -222927,8 +223690,8 @@ self: { libraryHaskellDepends = [ base text validity ]; testHaskellDepends = [ base doctest ]; description = "Safe Paths in Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -222945,8 +223708,8 @@ self: { regional-pointers regions transformers ]; description = "Type-safe file handling"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -222963,8 +223726,8 @@ self: { safer-file-handles transformers ]; description = "Extends safer-file-handles with ByteString operations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -222980,8 +223743,8 @@ self: { explicit-iomodes-text regions safer-file-handles text transformers ]; description = "Extends safer-file-handles with Text operations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -222993,8 +223756,8 @@ self: { sha256 = "00ykmy44paghgc3m731p1hh00zv11416pl2xil4cav7vrr43nb6h"; libraryHaskellDepends = [ base blaze-html containers text ]; description = "A simple type-safe routing library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -223010,8 +223773,8 @@ self: { base containers ghc ghc-syb-utils HUnit syb ]; description = "Obtain homogeneous values from arbitrary values, transforming or culling data"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -223034,8 +223797,8 @@ self: { unordered-containers vector ]; description = "Fast JSON parsing powered by Chad Austin's sajson library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -223057,8 +223820,8 @@ self: { ]; executableToolDepends = [ cpphs ]; description = "Compression command-line tool"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -223079,7 +223842,7 @@ self: { aeson base bytestring hspec time unordered-containers ]; description = "Haskell representation of messages exchanged on the sakura.io platform."; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "salak" = callPackage @@ -223108,7 +223871,7 @@ self: { base criterion data-default mtl text time ]; description = "Configuration (re)Loader and Parser"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "salak-toml" = callPackage @@ -223130,8 +223893,8 @@ self: { base criterion salak text time tomland unordered-containers ]; description = "Configuration Loader for toml"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -223153,7 +223916,7 @@ self: { base conduit criterion libyaml salak text ]; description = "Configuration Loader for yaml"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "saltine" = callPackage @@ -223163,8 +223926,8 @@ self: { }: mkDerivation { pname = "saltine"; - version = "0.1.1.0"; - sha256 = "1apcyc39mraqg9394scwqrdc3aaxvry22pl648gyp73z9dfrk5wf"; + version = "0.1.1.1"; + sha256 = "1bgr6vrmw18qr8akabxz6w3hwhlqi6zsnr23n70hkvwvcap1lnx7"; libraryHaskellDepends = [ base bytestring hashable profunctors ]; libraryPkgconfigDepends = [ libsodium ]; testHaskellDepends = [ @@ -223172,7 +223935,7 @@ self: { test-framework-quickcheck2 ]; description = "Cryptography that's easy to digest (NaCl/libsodium bindings)"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {inherit (pkgs) libsodium;}; "saltine-quickcheck" = callPackage @@ -223191,8 +223954,8 @@ self: { base bytestring-arbitrary QuickCheck saltine tasty tasty-quickcheck ]; description = "Quickcheck implementations for some NaCl data"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) libsodium;}; @@ -223205,7 +223968,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base HUnit ]; description = "Semantic version numbers and constraints"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "salvia" = callPackage @@ -223225,8 +223988,8 @@ self: { utf8-string ]; description = "Modular web application framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -223249,8 +224012,8 @@ self: { ]; doHaddock = false; description = "Demo Salvia servers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -223271,8 +224034,8 @@ self: { transformers utf8-string ]; description = "Collection of non-fundamental handlers for the Salvia web server"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -223289,8 +224052,8 @@ self: { utf8-string ]; description = "Salvia webserver protocol suite supporting URI, HTTP, Cookie and MIME"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -223308,8 +224071,8 @@ self: { random safe salvia salvia-protocol stm time utf8-string ]; description = "Session support for the Salvia webserver"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -223326,8 +224089,8 @@ self: { utf8-string ]; description = "Websocket implementation for the Salvia Webserver"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -223341,7 +224104,7 @@ self: { isExecutable = true; libraryHaskellDepends = [ base QuickCheck storable-record ]; description = "Handling of samples in an (audio) signal"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "sample-frame-np" = callPackage @@ -223352,7 +224115,7 @@ self: { sha256 = "091nz5w5511xl8hp2q8dfvs4jz15nkhz22rr97zga0vmn0hpdnxi"; libraryHaskellDepends = [ base numeric-prelude sample-frame ]; description = "Orphan instances for types from sample-frame and numericprelude"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "sampling" = callPackage @@ -223369,7 +224132,7 @@ self: { testHaskellDepends = [ base ]; benchmarkHaskellDepends = [ base criterion ]; description = "Sample values from collections"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "samtools" = callPackage @@ -223384,8 +224147,8 @@ self: { librarySystemDepends = [ zlib ]; libraryToolDepends = [ c2hs ]; description = "Binding to the C samtools library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) zlib;}; @@ -223406,8 +224169,8 @@ self: { base bytestring conduit filepath resourcet samtools transformers ]; description = "Conduit interface to SAM/BAM format files through samtools"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -223423,8 +224186,8 @@ self: { base bytestring enumerator samtools transformers ]; description = "Enumerator interface to SamTools library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -223441,8 +224204,8 @@ self: { base bytestring iteratee samtools transformers ]; description = "Iteratee interface to SamTools library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -223462,7 +224225,7 @@ self: { ]; benchmarkHaskellDepends = [ base bytestring criterion ]; description = "Data encoding library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "sandlib" = callPackage @@ -223473,8 +224236,8 @@ self: { sha256 = "07wh6va4rpf6vvxnjqbmwfna3rg20ysjh2pnzylz6xzlayzq0pkx"; libraryHaskellDepends = [ base ]; description = "SAND data serialization and manipulation library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -223493,8 +224256,8 @@ self: { process text unix-compat ]; description = "Manages Cabal sandboxes to avoid rebuilding packages"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -223506,8 +224269,8 @@ self: { sha256 = "0x8d5n2mydhwl9h7vzk7nr58b2aym9xb21p4m21rfa6vy6r2n438"; libraryHaskellDepends = [ base deepseq portaudio ]; description = "audio library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -223535,8 +224298,8 @@ self: { network process text unordered-containers vector ]; description = "A universal quickfix toolkit and his protocol"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -223553,8 +224316,8 @@ self: { simple-pipe ]; description = "SASL implementation using simple-pipe"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -223569,7 +224332,7 @@ self: { executableHaskellDepends = [ base ]; description = "CNF SATisfier"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -223588,7 +224351,7 @@ self: { ]; description = "A minimal SAT solver"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -223608,7 +224371,7 @@ self: { testHaskellDepends = [ array base ]; description = "SAT encoding monad"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -223625,7 +224388,7 @@ self: { ]; description = "driver for external satchmo backends"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -223644,7 +224407,7 @@ self: { ]; description = "examples that show how to use satchmo"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -223661,7 +224424,7 @@ self: { ]; description = "funsat driver as backend for satchmo"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -223674,7 +224437,7 @@ self: { libraryHaskellDepends = [ base containers process satchmo ]; description = "minisat driver as backend for satchmo"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -223690,8 +224453,8 @@ self: { array base containers satchmo toysolver ]; description = "toysat driver as backend for satchmo"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -223710,8 +224473,8 @@ self: { unix ]; description = "re-export of the random generators from Hedgehog"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -223730,8 +224493,8 @@ self: { ]; testHaskellDepends = [ base bytestring hspec ]; description = "Monadic streaming XML parser"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -223751,7 +224514,7 @@ self: { base bytestring gauge text transformers unliftio ]; description = "Send textual messages to a Handle in a thread-friendly way"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "say-my-name" = callPackage @@ -223762,7 +224525,7 @@ self: { sha256 = "1fc9jgyapdc0rlni6l60b8ya272vg8km8p97pb52f4gj5z48zk3j"; libraryHaskellDepends = [ base ]; description = "Require explicit type application for some type variables"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "sbp" = callPackage @@ -223789,7 +224552,7 @@ self: { ]; testHaskellDepends = [ base basic-prelude tasty tasty-hunit ]; description = "SwiftNav's SBP Library"; - license = stdenv.lib.licenses.lgpl3; + license = lib.licenses.lgpl3; }) {}; "sbp2udp" = callPackage @@ -223809,7 +224572,7 @@ self: { streaming-commons ]; description = "SBP to UDP"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "sbv" = callPackage @@ -223840,7 +224603,7 @@ self: { gauge mtl process random silently syb time ]; description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) z3;}; "sbvPlugin" = callPackage @@ -223859,8 +224622,8 @@ self: { base directory filepath process tasty tasty-golden ]; description = "Formally prove properties of Haskell programs using SBV/SMT"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -223880,8 +224643,8 @@ self: { proto-lens sc2-proto sc2-support text websockets ]; description = "Low-level Starcraft II API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -223901,8 +224664,8 @@ self: { ]; libraryToolDepends = [ proto-lens-protoc protoc ]; description = "A protocol buffer model for the Starcraft II bot API"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {protoc = null;}; @@ -223919,8 +224682,8 @@ self: { text ]; description = "Support and utility library for sc2hs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -223949,7 +224712,7 @@ self: { ]; description = "An interface to the Starcraft II bot API"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "sc3-rdu" = callPackage @@ -223962,7 +224725,7 @@ self: { libraryHaskellDepends = [ base hsc3 hsc3-db ]; description = "Haskell bindings to sc3-rdu (sc3 rd ugens)"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -223980,8 +224743,8 @@ self: { bytestring enumerator mtl network network-enumerator ]; description = "Library for writing fast/scalable TCP-based services"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -223995,8 +224758,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base filepath gd ]; description = "Scale an image to a new geometry"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -224013,8 +224776,8 @@ self: { base containers hspec QuickCheck text time ]; description = "This is a library for handling calendars and resource availability based on the \"top-nodes algorithm\" and set operations"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -224041,8 +224804,8 @@ self: { aeson base hspec lens regex-compat stm text transformers wreq ]; description = "Test webhooks locally"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -224059,7 +224822,7 @@ self: { http-client-tls scalpel-core tagsoup text ]; description = "A high level web scraping library for Haskell"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "scalpel-core" = callPackage @@ -224078,7 +224841,7 @@ self: { testHaskellDepends = [ base HUnit regex-base regex-tdfa tagsoup ]; benchmarkHaskellDepends = [ base criterion tagsoup text ]; description = "A high level web scraping library for Haskell"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "scalpel-search" = callPackage @@ -224094,8 +224857,8 @@ self: { base hspec scalpel scalpel-core tagsoup text uri ]; description = "scalpel scrapers for search engines"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -224111,7 +224874,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base parsec ]; description = "lexical style suggestions for source code"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "scan-metadata" = callPackage @@ -224128,8 +224891,8 @@ self: { generic-lens hw-aeson hw-ip lens mtl text thyme unliftio-core ]; description = "Metadata types for Albedo Scanners"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -224142,8 +224905,8 @@ self: { libraryHaskellDepends = [ accelerate array base dph-base HUnit ]; testHaskellDepends = [ array base HUnit ]; description = "An implementation of the Scan Vector Machine instruction set in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -224156,7 +224919,7 @@ self: { libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base ]; description = "Easy and type-safe format strings for parsing and printing"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "scanner" = callPackage @@ -224173,7 +224936,7 @@ self: { attoparsec base bytestring cereal criterion text ]; description = "Fast non-backtracking incremental combinator parsing for bytestrings"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "scanner-attoparsec" = callPackage @@ -224185,7 +224948,7 @@ self: { libraryHaskellDepends = [ attoparsec base scanner ]; testHaskellDepends = [ attoparsec base bytestring hspec scanner ]; description = "Inject attoparsec parser with backtracking into non-backtracking scanner"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "scat" = callPackage @@ -224208,7 +224971,7 @@ self: { vector ]; description = "Generates unique passwords for various websites from a single password"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "scc" = callPackage @@ -224241,7 +225004,7 @@ self: { ]; description = "Streaming component combinators"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -224258,8 +225021,8 @@ self: { OpenGL process ]; description = "Scene Graph"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -224275,8 +225038,8 @@ self: { base bytestring cgi extensible-exceptions network ]; description = "A Haskell library for writing SCGI programs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -224294,8 +225057,8 @@ self: { base directory filepath old-locale time xturtle ]; description = "Marge schedules and show EVR"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -224317,7 +225080,7 @@ self: { transformers ]; description = "Pure deterministic scheduled computations"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; }) {}; "schedule-planner" = callPackage @@ -224336,8 +225099,8 @@ self: { options text text-icu transformers wai warp ]; description = "Find the ideal lesson layout"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -224358,7 +225121,7 @@ self: { template-haskell unliftio vector ]; description = "Work stealing scheduler"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "schedyield" = callPackage @@ -224369,8 +225132,8 @@ self: { sha256 = "0lzhxlfxa660vx4y49gbg2q76v8dda00h3rznj5fhdjj29pkypgp"; libraryHaskellDepends = [ base ]; description = "Exposes standard POSIX function sched_yield"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -224385,8 +225148,8 @@ self: { base groom hspec msgpack-binary QuickCheck ]; description = "Encoding-independent schemas for Haskell data types"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -224411,8 +225174,8 @@ self: { unordered-containers ]; description = "schema guided serialization"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -224425,8 +225188,8 @@ self: { }: mkDerivation { pname = "schematic"; - version = "0.5.0.0"; - sha256 = "0mq38m08gj90gyk38lj4vyyfz0d6qrpxlpqjizqvyj4k3hqqy4ka"; + version = "0.5.1.0"; + sha256 = "1blbm7pmfwn2v1s60as98gw09c6c3l370xpx4b1w4vsq9ap9k7l8"; libraryHaskellDepends = [ aeson base bytestring containers hjsonschema mtl profunctors regex-tdfa regex-tdfa-text scientific singletons smallcheck tagged @@ -224441,8 +225204,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "JSON-biased spec and validation tool"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -224488,7 +225251,7 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Converts ScholarlyMarkdown documents to HTML5/LaTeX/Docx format"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -224522,8 +225285,8 @@ self: { scholdoc-types temporary text yaml ]; description = "Scholdoc fork of pandoc-citeproc"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -224547,7 +225310,7 @@ self: { ]; description = "Scholdoc fork of texmath"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -224564,7 +225327,7 @@ self: { ]; description = "Scholdoc fork of pandoc-types"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -224576,7 +225339,7 @@ self: { sha256 = "1wwbalfkfg66azr9zizscvdc2csi9q73d6wq5bwbiq33z522nwxy"; libraryHaskellDepends = [ base ]; description = "Transformation of n-ary functions to unary functions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "sci-ratio" = callPackage @@ -224588,8 +225351,8 @@ self: { libraryHaskellDepends = [ base hashable ]; testHaskellDepends = [ base ]; description = "Rational numbers in scientific notation"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -224623,8 +225386,8 @@ self: { network process regex safe split terminal-size text tls x509-store ]; description = "Haskell query for SciDB via shim"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -224636,7 +225399,7 @@ self: { sha256 = "0h60pdq3r32wl9h49i08iq496yf0qwvd0qmlmnk9jy5x3zcdwjmd"; libraryHaskellDepends = [ base ]; description = "Mathematical/physical/chemical constants"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "science-constants-dimensional" = callPackage @@ -224650,7 +225413,7 @@ self: { base dimensional numtype-dk science-constants ]; description = "Mathematical/physical/chemical constants"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "scientific" = callPackage @@ -224673,7 +225436,7 @@ self: { ]; benchmarkHaskellDepends = [ base criterion ]; description = "Numbers represented using scientific notation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "scientific-notation" = callPackage @@ -224698,8 +225461,8 @@ self: { primitive run-st scientific ]; description = "Scientific notation intended for tokenization"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -224725,8 +225488,8 @@ self: { utf8-string ]; description = "Haskell IDE library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -224761,8 +225524,8 @@ self: { utf8-string vector zlib ]; description = "Command-line interface for browsing and searching packages documentation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -224777,7 +225540,7 @@ self: { executableHaskellDepends = [ base bytestring containers process ]; description = "Generates graphviz file of scons dependency information"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -224795,8 +225558,8 @@ self: { mwc-random time unix zoom-cache ]; description = "An interactive renderer for plotting time-series data"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -224820,8 +225583,8 @@ self: { zoom-cache ]; description = "An interactive renderer for plotting time-series data"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -224839,8 +225602,8 @@ self: { persistent resource-pool scotty stm text transformers wai warp ]; description = "scotty with batteries included"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -224874,7 +225637,7 @@ self: { weigh ]; description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "scotty-binding-play" = callPackage @@ -224892,8 +225655,8 @@ self: { base bytestring hspec http-client HUnit scotty text transformers ]; description = "The Play Framework style data binding in Scotty"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -224908,8 +225671,8 @@ self: { base blaze-builder blaze-html mtl scotty wai ]; description = "blaze-html integration for Scotty"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -224928,7 +225691,7 @@ self: { transformers ]; description = "Cookie management helper functions for Scotty framework"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "scotty-fay" = callPackage @@ -224950,8 +225713,8 @@ self: { transformers wai wai-test ]; description = "Fay integration for Scotty"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -224965,8 +225728,8 @@ self: { base ditto ditto-lucid lucid scotty text ]; description = "Html form validation using `ditto`"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -224983,8 +225746,8 @@ self: { executableHaskellDepends = [ aeson base scotty text ]; testHaskellDepends = [ base ]; description = "Response format helper for the Scotty web framework"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -225001,8 +225764,8 @@ self: { warp ]; description = "Easy Mustache templating support for Scotty"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -225014,7 +225777,7 @@ self: { sha256 = "06wcvjpaar8zd2y6p9j4pxs4l7rkw84s1kmcvacafkw43h1d2bx2"; libraryHaskellDepends = [ base haxl scotty text ]; description = "Combine scotty and haxl"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "scotty-params-parser" = callPackage @@ -225030,8 +225793,8 @@ self: { unordered-containers ]; description = "HTTP-request's query parameters parser abstraction for \"scotty\""; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -225044,7 +225807,7 @@ self: { libraryHaskellDepends = [ base bytestring scotty text wai ]; testHaskellDepends = [ base doctest ]; description = "Redirect to a normalized path"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "scotty-resource" = callPackage @@ -225059,8 +225822,8 @@ self: { base containers http-types scotty text transformers wai ]; description = "A Better way of modeling web resources"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -225086,8 +225849,8 @@ self: { string-conversions text wai ]; description = "Webmachine-style REST library for scotty"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -225106,8 +225869,8 @@ self: { wai ]; description = "Adding session functionality to scotty"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -225121,8 +225884,8 @@ self: { base scotty transformers wai warp warp-tls ]; description = "TLS for Scotty"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -225138,7 +225901,7 @@ self: { aeson aeson-result base http-types scotty text ]; description = "Scotty utils library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "scotty-view" = callPackage @@ -225154,8 +225917,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base scotty text transformers ]; executableHaskellDepends = [ base scotty text transformers ]; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -225177,8 +225940,8 @@ self: { ]; testHaskellDepends = [ base bytestring io-streams ]; description = "An SCP protocol implementation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -225198,8 +225961,8 @@ self: { parallel split ]; description = "Scrabble play generation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -225223,8 +225986,8 @@ self: { base extensible rio scrapbook-core tasty tasty-hunit yaml ]; description = "collect posts of site that is wrote in config yaml using feed or scraping"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -225246,8 +226009,8 @@ self: { tasty-hunit xml-conduit xml-types yaml ]; description = "Core Package for scrapbook"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -225274,8 +226037,8 @@ self: { test-framework-quickcheck2 text validation ]; description = "Scrape websites for changes"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -225302,8 +226065,8 @@ self: { tasty-quickcheck-laws transformers ]; description = "Stack of error, reader, writer, state, and prompt monad transformers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -225326,8 +226089,8 @@ self: { url ]; description = "Scrobbling server"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -225348,7 +226111,7 @@ self: { vector ]; description = "scroll(6), a roguelike game"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }) {}; "scrypt" = callPackage @@ -225368,7 +226131,7 @@ self: { test-framework-hunit test-framework-quickcheck2 ]; description = "Stronger password hashing via sequential memory-hard functions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "scrz" = callPackage @@ -225392,7 +226155,7 @@ self: { ]; description = "Process management and supervision daemon"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "scuttlebutt-types" = callPackage @@ -225409,7 +226172,7 @@ self: { ]; testHaskellDepends = [ aeson base bytestring hspec text ]; description = "generic types for Secure Scuttlebutt"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "scythe" = callPackage @@ -225424,8 +226187,8 @@ self: { libraryToolDepends = [ alex ]; executableHaskellDepends = [ base bytestring ]; description = "Fast CSV lexing on ByteString"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -225448,7 +226211,7 @@ self: { executableToolDepends = [ alex ]; description = "Automatic generation of Isabelle/HOL correctness proofs for security protocols"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -225467,8 +226230,8 @@ self: { vector ]; description = "Distributed SDE solver"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -225486,7 +226249,7 @@ self: { test-framework-hunit transformers ]; description = "A parser for SDF version 2.1 using Parsec"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "sdl-try-drivers" = callPackage @@ -225499,7 +226262,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base pretty-simple sdl2 text ]; description = "small testing tool for sdl2 and accelerated drivers"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "sdl2" = callPackage @@ -225520,7 +226283,7 @@ self: { libraryPkgconfigDepends = [ SDL2 ]; testHaskellDepends = [ base deepseq linear vector weigh ]; description = "Both high- and low-level bindings to the SDL library (version 2.0.6+)."; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) SDL2;}; "sdl2-cairo" = callPackage @@ -225531,7 +226294,7 @@ self: { sha256 = "1diz8irrrc7mvy5fnm679xpl3dyy9ynr7a6d900yi3dn0zamq939"; libraryHaskellDepends = [ base cairo linear sdl2 ]; description = "Render with Cairo on SDL textures"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "sdl2-cairo-image" = callPackage @@ -225546,8 +226309,8 @@ self: { base cairo convertible JuicyPixels linear sdl2 sdl2-cairo vector ]; description = "An image loading and rendering library for sdl2 / sdl2-cairo"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -225571,8 +226334,8 @@ self: { base Cabal hspec hspec-core lrucache QuickCheck stm ]; description = "image compositing with sdl2 - declarative style"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -225586,8 +226349,8 @@ self: { editedCabalFile = "09bgygx1il6j4s243frlm4xl0z5drpdqn8fdgsid8m5b2m8c48ya"; libraryHaskellDepends = [ base sdl2 ]; description = "Run of the mill, frames per second timer implementation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -225611,7 +226374,7 @@ self: { libraryPkgconfigDepends = [ SDL2 SDL2_gfx ]; executableHaskellDepends = [ base linear sdl2 vector ]; description = "Bindings to SDL2_gfx"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_gfx;}; "sdl2-image" = callPackage @@ -225632,7 +226395,7 @@ self: { libraryPkgconfigDepends = [ SDL2 SDL2_image ]; executableHaskellDepends = [ base sdl2 text ]; description = "Bindings to SDL2_image"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_image;}; "sdl2-mixer" = callPackage @@ -225654,8 +226417,8 @@ self: { librarySystemDepends = [ SDL2_mixer ]; libraryPkgconfigDepends = [ SDL2_mixer ]; description = "Bindings to SDL2_mixer"; - license = stdenv.lib.licenses.bsd3; - platforms = [ "i686-linux" "x86_64-linux" ]; + license = lib.licenses.bsd3; + platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) SDL2_mixer;}; "sdl2-sprite" = callPackage @@ -225675,7 +226438,7 @@ self: { base optparse-simple sdl2 sdl2-image split text ]; description = "Sprite previewer/animator"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "sdl2-ttf" = callPackage @@ -225693,8 +226456,8 @@ self: { ]; libraryPkgconfigDepends = [ SDL2 SDL2_ttf ]; description = "Bindings to SDL2_ttf"; - license = stdenv.lib.licenses.bsd3; - platforms = [ "i686-linux" "x86_64-linux" ]; + license = lib.licenses.bsd3; + platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_ttf;}; "sdnv" = callPackage @@ -225705,7 +226468,7 @@ self: { sha256 = "1hckjr6fprw2y7wb4zz035rnhqj6xs7djnlkhdyzmir9g5xa3cr6"; libraryHaskellDepends = [ base binary bytestring ]; description = "Self-delimiting numeric values encoding library"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }) {}; "sdr" = callPackage @@ -225736,9 +226499,9 @@ self: { base criterion primitive storable-complex vector ]; description = "A software defined radio library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; platforms = [ "x86_64-darwin" "x86_64-linux" ]; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -225763,7 +226526,7 @@ self: { ]; description = "Small web framework using Warp and WAI"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "seakale" = callPackage @@ -225774,8 +226537,8 @@ self: { sha256 = "0pb0d0y7cxry6np5412j7d2xm5wlp97gc15za3iqc7n38bdffjvy"; libraryHaskellDepends = [ base bytestring free mtl text ]; description = "Pure SQL layer on top of other libraries"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -225791,8 +226554,8 @@ self: { base bytestring free mtl postgresql-libpq seakale time ]; description = "PostgreSQL backend for Seakale"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -225808,8 +226571,8 @@ self: { base bytestring free mtl recursion-schemes seakale ]; description = "Helpers to test code using Seakale"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -225821,7 +226584,7 @@ self: { sha256 = "0x2m280qbfaswr2gk26d26dwg2s3v1nk4n93zh2fh1ikpkw13dfq"; libraryHaskellDepends = [ base template-haskell ]; description = "Template Haskell support for global configuration data"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "search" = callPackage @@ -225839,7 +226602,7 @@ self: { ]; testHaskellDepends = [ base directory doctest filepath ]; description = "Infinite search in finite time with Hilbert's epsilon"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "search-algorithms" = callPackage @@ -225851,7 +226614,7 @@ self: { libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers doctest hspec ]; description = "Common graph search algorithms"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "sec" = callPackage @@ -225862,8 +226625,8 @@ self: { sha256 = "1ryl0nm1a37r606xhxy6ykf3c8c1gml6gdqna428w8y3a2vg5q2v"; libraryHaskellDepends = [ base template-haskell ]; description = "Semantic Editor Combinators"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -225879,7 +226642,7 @@ self: { executableHaskellDepends = [ base haskeline ]; testHaskellDepends = [ base ]; description = "A Haskell implementation of the SECD abstract machine"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "secdh" = callPackage @@ -225894,8 +226657,8 @@ self: { libraryHaskellDepends = [ base containers ]; executableHaskellDepends = [ base containers ]; description = "SECDH Machine Simulator"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -225903,12 +226666,12 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "seclib"; - version = "1.1.0.2"; - sha256 = "0jbgdd3mh126c3n0sblvd7rbcnnzrfyfajrj9xcsj7zi7jqvs8nw"; + version = "1.1.0.3"; + sha256 = "1ikkjxnl7p3gdzf7fsx9bakd9j6xg5wm5rgyz0n8f2n4nx0r04db"; libraryHaskellDepends = [ base ]; description = "A simple library for static information-flow security in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -225936,8 +226699,8 @@ self: { ]; testToolDepends = [ cpphs ]; description = "Second Transfer HTTP/2 web server"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -225961,8 +226724,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Bindings for secp256k1 library from Bitcoin Core"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) secp256k1;}; @@ -225988,7 +226751,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Bindings for secp256k1"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {inherit (pkgs) secp256k1;}; "secp256k1-legacy" = callPackage @@ -226013,8 +226776,8 @@ self: { test-framework-hunit test-framework-quickcheck2 ]; description = "fork of secp256k1"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -226032,8 +226795,8 @@ self: { base containers diagrams-cairo diagrams-lib haskell-qrencode random ]; description = "Secret Santa game assigner using QR-Codes"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -226054,7 +226817,7 @@ self: { test-framework test-framework-quickcheck2 vector ]; description = "Information-theoretic secure secret sharing"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; }) {}; "secrm" = callPackage @@ -226067,8 +226830,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base haskell98 ]; description = "Example of writing \"secure\" file removal in Haskell rather than C"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -226084,8 +226847,8 @@ self: { base bytestring directory HsOpenSSL network process transformers ]; description = "Secure point-to-point connectivity library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -226097,8 +226860,8 @@ self: { sha256 = "0af16j1j77849idfs7cb0hvi1wkf60qlnkfdvqnp40qrwzpbqn9c"; libraryHaskellDepends = [ base bytestring containers network ]; description = "Setups secure (unsorted) UDP packet transfer"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -226112,7 +226875,7 @@ self: { base byteable bytestring ghc-prim memory ]; description = "abstraction to an auto scrubbing and const time eq, memory chunk"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "sednaDBXML" = callPackage @@ -226128,8 +226891,8 @@ self: { ]; librarySystemDepends = [ sedna ]; description = "Sedna C API XML Binding"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {sedna = null;}; @@ -226149,8 +226912,8 @@ self: { symmetry-operations-symbols ]; description = "Read and Display Seitz Symbol"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -226169,7 +226932,7 @@ self: { uuid-types ]; description = "Multi-backend, high-level EDSL for interacting with SQL databases"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "selda-json" = callPackage @@ -226182,7 +226945,7 @@ self: { editedCabalFile = "1gajzv8zhj8i3bxzjh81vjn8j2igh3nrawfpddvxg1ayb5l2d2y0"; libraryHaskellDepends = [ aeson base bytestring selda text ]; description = "JSON support for the Selda database library"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "selda-postgresql" = callPackage @@ -226200,7 +226963,7 @@ self: { selda-json text time uuid-types ]; description = "PostgreSQL backend for the Selda database EDSL"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "selda-sqlite" = callPackage @@ -226218,7 +226981,7 @@ self: { uuid-types ]; description = "SQLite backend for the Selda database EDSL"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "select" = callPackage @@ -226229,7 +226992,7 @@ self: { sha256 = "180cj5m0bap1lb19s68icpn1dvk2s395cmlcc6dnwz3mpbj5alj0"; libraryHaskellDepends = [ base ]; description = "Wrap the select(2) POSIX function"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "selections" = callPackage @@ -226240,7 +227003,7 @@ self: { sha256 = "0vl7rqrz0p5m7iwymaw3b8l2kbaikwhmkhq82hq79581vj99fdpw"; libraryHaskellDepends = [ base ]; description = "Combinators for operating with selections over an underlying functor"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "selective" = callPackage @@ -226257,7 +227020,7 @@ self: { tasty-quickcheck transformers ]; description = "Selective applicative functors"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "selectors" = callPackage @@ -226273,8 +227036,8 @@ self: { ]; libraryToolDepends = [ alex happy ]; description = "CSS Selectors for DOM traversal"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -226286,8 +227049,8 @@ self: { sha256 = "0vr3d891pj947lv2grgbc83nm828gz9bbz6dp8mnf9bsji3ih7l7"; libraryHaskellDepends = [ base HTTP HUnit mtl network pretty ]; description = "Test web applications through a browser"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -226307,8 +227070,8 @@ self: { ]; testHaskellDepends = [ base hspec text webdriver ]; description = "Run the selenium standalone server for usage with webdriver"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -226328,8 +227091,8 @@ self: { ]; executableHaskellDepends = [ base ]; description = "A Haskell library to make self-extracting executables"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -226341,7 +227104,7 @@ self: { sha256 = "100a427r8xjfv7fsh7khj3db9klqwnalfy33w23khxqp7k1bkq3n"; libraryHaskellDepends = [ base directory executable-path unix ]; description = "Restarts the current executable (on binary change)"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "selinux" = callPackage @@ -226353,8 +227116,8 @@ self: { libraryHaskellDepends = [ base unix ]; librarySystemDepends = [ selinux ]; description = "SELinux bindings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {selinux = null;}; @@ -226366,7 +227129,7 @@ self: { sha256 = "17vfwyjr3pxzjf35lhqqxid5bds52vk0gdqmnq4hvbjin3l07l98"; libraryHaskellDepends = [ base ]; description = "Framework and service for analyzing and diffing untrusted code"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "semantic-source" = callPackage @@ -226386,8 +227149,8 @@ self: { base hedgehog tasty tasty-hedgehog tasty-hunit text ]; description = "Types and functionality for working with source code"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -226399,7 +227162,7 @@ self: { sha256 = "1349pzjs91xayx4dib520037mmgh4lvyc0wjx8h8yf492dvfbdkr"; libraryHaskellDepends = [ base ]; description = "Various concurrency abstractions built on top of semaphores"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "semdoc" = callPackage @@ -226419,8 +227182,8 @@ self: { ]; executableHaskellDepends = [ base ]; description = "Evaluate code snippets in Literate Haskell"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.agpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -226436,8 +227199,8 @@ self: { base lens profunctors semigroupoids transformers tuple-morph ]; description = "Weakened partial isomorphisms, reversible computations"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -226454,7 +227217,7 @@ self: { unordered-containers vector ]; description = "Align and Zip type-classes from the common Semialign ancestor"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "semialign-extras" = callPackage @@ -226472,8 +227235,8 @@ self: { ]; testHaskellDepends = [ base doctest QuickCheck ]; description = "Extra functions for working with Semialigns"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -226492,7 +227255,7 @@ self: { vector ]; description = "SemialignWithIndex, i.e. izipWith and ialignWith"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "semialign-optics" = callPackage @@ -226510,7 +227273,7 @@ self: { unordered-containers vector ]; description = "SemialignWithIndex, i.e. izipWith and ialignWith"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "semibounded-lattices" = callPackage @@ -226522,8 +227285,8 @@ self: { libraryHaskellDepends = [ base containers lattices ]; testHaskellDepends = [ base ]; description = "A Haskell implementation of semibounded lattices"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -226535,7 +227298,7 @@ self: { sha256 = "0ciq1jnc0d9d8jph9103v04vphiz7xqa69a8f4dmmcf3bjsk6bhh"; libraryHaskellDepends = [ base profunctors semigroupoids ]; description = "Semigroupoids that depend on PolyKinds"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "semigroupoids" = callPackage @@ -226554,7 +227317,7 @@ self: { transformers-compat unordered-containers ]; description = "Semigroupoids: Category sans id"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "semigroupoids-syntax" = callPackage @@ -226574,8 +227337,8 @@ self: { base directory doctest filepath QuickCheck template-haskell ]; description = "RebindableSyntax using the semigroupoids package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -226587,7 +227350,7 @@ self: { sha256 = "0j36cha1wb9vxnd8axfna92b2q5hnrn3ap8d8yin89c69gk63rvr"; libraryHaskellDepends = [ base ]; description = "Anything that associates"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "semigroups-actions" = callPackage @@ -226598,8 +227361,8 @@ self: { sha256 = "0vns2vdchszw34i12s9rfl4cm76ympfrivpb397j2vzg2i7bghqb"; libraryHaskellDepends = [ base containers semigroups ]; description = "Semigroups actions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -226618,7 +227381,7 @@ self: { base doctest QuickCheck quickcheck-instances ]; description = "Semilattices"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "semiring" = callPackage @@ -226631,8 +227394,8 @@ self: { isExecutable = true; libraryHaskellDepends = [ base Boolean containers monoids ]; description = "Semirings, ring-like structures used for dynamic programming applications"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -226658,8 +227421,8 @@ self: { base containers criterion random vector ]; description = "Basic semiring class and instances"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -226671,27 +227434,11 @@ self: { sha256 = "0a7xd58jl3dm03z2wv4iyp3dfjnpydn3lmlz25azqna57x9ip3f0"; libraryHaskellDepends = [ base ]; description = "A module for dealing with semirings"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "semirings" = callPackage ({ mkDerivation, base, base-compat-batteries, containers, hashable - , integer-gmp, unordered-containers - }: - mkDerivation { - pname = "semirings"; - version = "0.5.4"; - sha256 = "16lsxg0nzi7d4kr5xibgy9q46fxrga10yzh0jy4jzpyy5axwwysw"; - libraryHaskellDepends = [ - base base-compat-batteries containers hashable integer-gmp - unordered-containers - ]; - description = "two monoids as one, in holy haskimony"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "semirings_0_6" = callPackage - ({ mkDerivation, base, base-compat-batteries, containers, hashable , unordered-containers }: mkDerivation { @@ -226702,8 +227449,7 @@ self: { base base-compat-batteries containers hashable unordered-containers ]; description = "two monoids as one, in holy haskimony"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; }) {}; "semver" = callPackage @@ -226720,7 +227466,7 @@ self: { testHaskellDepends = [ base tasty tasty-hunit text ]; benchmarkHaskellDepends = [ base criterion text ]; description = "Representation, manipulation, and de/serialisation of Semantic Versions"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "semver-range" = callPackage @@ -226739,7 +227485,7 @@ self: { unordered-containers ]; description = "An implementation of semver and semantic version ranges"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "sendfile" = callPackage @@ -226750,7 +227496,7 @@ self: { sha256 = "0988snmx3bylpw3kcq8hsgji8idc6xcrcfp275qjv3apfdgc9rp0"; libraryHaskellDepends = [ base bytestring network ]; description = "A portable sendfile library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "sendgrid-haskell" = callPackage @@ -226766,8 +227512,8 @@ self: { monad-control text transformers ]; description = "Sengrid API"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -226786,37 +227532,36 @@ self: { base lens semigroups tasty tasty-hunit text wreq ]; description = "Sendgrid v3 API library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; "sensei" = callPackage - ({ mkDerivation, ansi-terminal, base, base-compat, bytestring - , directory, filepath, fsnotify, hspec, hspec-meta, hspec-wai + ({ mkDerivation, ansi-terminal, base, bytestring, directory + , filepath, fsnotify, hspec, hspec-discover, hspec-meta, hspec-wai , http-client, http-types, interpolate, mockery, network, process , silently, stm, text, time, unix, wai, warp }: mkDerivation { pname = "sensei"; - version = "0.4.0"; - sha256 = "18p3hrc0av30ri678rgzdarp5m3qpia0y1nc6rb8zzvs0cspmfvd"; + version = "0.5.0"; + sha256 = "011lck879q12npszqf2cjsxyjrcyfhrs77dh8kbififm53dfglf4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - ansi-terminal base base-compat bytestring directory filepath - fsnotify http-client http-types network process stm text time unix - wai warp + ansi-terminal base bytestring directory filepath fsnotify + http-client http-types network process stm text time unix wai warp ]; testHaskellDepends = [ - ansi-terminal base base-compat bytestring directory filepath - fsnotify hspec hspec-meta hspec-wai http-client http-types - interpolate mockery network process silently stm text time unix wai - warp + ansi-terminal base bytestring directory filepath fsnotify hspec + hspec-meta hspec-wai http-client http-types interpolate mockery + network process silently stm text time unix wai warp ]; + testToolDepends = [ hspec-discover ]; description = "Automatically run Hspec tests on file modifications"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -226834,8 +227579,8 @@ self: { aeson base bytestring containers process stm zeromq3-haskell ]; description = "Distributed sensor network for the raspberry pi"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -226857,8 +227602,8 @@ self: { process temporary text time unix unix-compat vector wreq ]; description = "A tool to send command execution results to Sensu"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -226872,8 +227617,8 @@ self: { base mecab random-shuffle text transformers ]; description = "Easily generating message of japanese natural language"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -226890,7 +227635,7 @@ self: { unordered-containers vector ]; description = "Parser for the SentiWordNet tab-separated file"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "sentry" = callPackage @@ -226910,8 +227655,8 @@ self: { ]; executableHaskellDepends = [ base directory filepath unix ]; description = "Process monitoring tool written and configured in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -226923,7 +227668,7 @@ self: { sha256 = "0pl7dcs9w4dzzajlfnkrjl5kgsx8zdzzl5hvikh9v9djsmw2290h"; doHaddock = false; description = "None"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "seonbi" = callPackage @@ -226959,8 +227704,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "SmartyPants for Korean language"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -226983,7 +227728,7 @@ self: { base directory doctest filepath parsec QuickCheck template-haskell ]; description = "A data type with elements separated by values"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "seqaid" = callPackage @@ -227007,8 +227752,8 @@ self: { base Cabal cpphs directory process regex-base regex-pcre temporary ]; description = "Dynamic strictness control, including space leak repair"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -227020,7 +227765,7 @@ self: { sha256 = "01a3fhymyp7279hym03zzz6qkh5h47nq5y1xglar0n46imjr98af"; libraryHaskellDepends = [ base bytestring vector ]; description = "Sequence Alignment"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "seqid" = callPackage @@ -227031,7 +227776,7 @@ self: { sha256 = "07xxpdrr3lqqnzcxbync46c0kz3d2i7k4day630a6x6zmzpyay0i"; libraryHaskellDepends = [ base mtl transformers ]; description = "Sequence ID production and consumption"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "seqid-streams" = callPackage @@ -227042,7 +227787,7 @@ self: { sha256 = "0dd0vxs216ri0hdkz49hzzrryil7hhqb55cc9z6ca8f337imanm8"; libraryHaskellDepends = [ base io-streams seqid ]; description = "Sequence ID IO-Streams"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "seqloc" = callPackage @@ -227062,8 +227807,8 @@ self: { unordered-containers vector ]; description = "Handle sequence locations for bioinformatics"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -227097,8 +227842,8 @@ self: { transformers transformers-base unordered-containers vector ]; description = "Read and write BED and GTF format genome annotations"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -227111,7 +227856,7 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers transformers ]; description = "A type class for sequences and various sequence data structures"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "sequence-formats" = callPackage @@ -227122,8 +227867,8 @@ self: { }: mkDerivation { pname = "sequence-formats"; - version = "1.5.1.4"; - sha256 = "0qcs8lvv8dww6w9iyca4snxrr3hcjd14kafz59gxmbhx9q8zl8mz"; + version = "1.5.2"; + sha256 = "0n09mw9z8bjqr8dc32l7swp25vgci7m2hb1w6masgv2cw8irh7as"; libraryHaskellDepends = [ attoparsec base bytestring containers errors exceptions foldl lens-family pipes pipes-attoparsec pipes-bytestring pipes-safe @@ -227134,7 +227879,7 @@ self: { tasty-hunit transformers vector ]; description = "A package with basic parsing utilities for several Bioinformatic data formats"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "sequenceTools" = callPackage @@ -227162,7 +227907,7 @@ self: { base bytestring hspec pipes sequence-formats vector ]; description = "A package with tools for processing DNA sequencing data"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "sequent-core" = callPackage @@ -227177,8 +227922,8 @@ self: { base bytestring containers ghc transformers ]; description = "Alternative Core language for GHC plugins"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -227190,7 +227935,7 @@ self: { sha256 = "0vd7nrkx59vsxrhpb46kgzbvz7v830wh5zx3vg9494wvski983y6"; libraryHaskellDepends = [ base bytestring ]; description = "Sequential numbers that allow arbitrarily inserting numbers - for containers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "sequor" = callPackage @@ -227213,8 +227958,8 @@ self: { text vector ]; description = "A sequence labeler based on Collins's sequence perceptron"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -227231,7 +227976,7 @@ self: { resourcet text ]; description = "Interact with Serf via Haskell"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "serial" = callPackage @@ -227261,7 +228006,7 @@ self: { system-fileio transformers ]; description = "Test your 'Aeson' 'Serialize' and 'Binary' instances for stability over time"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "serialise" = callPackage @@ -227293,7 +228038,7 @@ self: { pretty semigroups store tar text time vector zlib ]; description = "A binary serialisation library for Haskell values"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "serialise-uuid" = callPackage @@ -227312,7 +228057,7 @@ self: { uuid-types ]; description = "Encode and decode UUID values in CBOR using uuid-types, cborg and serialise"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "serialize-instances" = callPackage @@ -227329,8 +228074,8 @@ self: { base cereal hashable semigroups unordered-containers ]; description = "Instances for Serialize of cereal"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -227338,12 +228083,12 @@ self: { ({ mkDerivation, base, bytestring, HUnit, unix }: mkDerivation { pname = "serialport"; - version = "0.5.0"; - sha256 = "1w547rrfsa1cbjcdpqrlzwnnyrzd4lmbj52mnh98zz9aiv7rbqxv"; + version = "0.5.1"; + sha256 = "1ys3rjw1a3cghd2slnn43hvc3pdgwfy3rs19j1kjfshasr7d375m"; libraryHaskellDepends = [ base bytestring unix ]; testHaskellDepends = [ base bytestring HUnit ]; description = "Cross platform serial port library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "serokell-util" = callPackage @@ -227373,8 +228118,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "General-purpose functions by Serokell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -227393,8 +228138,8 @@ self: { ]; executableHaskellDepends = [ base singletons text ]; description = "Simple project template from stack"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -227408,8 +228153,8 @@ self: { base containers http-kinder singletons text ]; description = "Dependently typed API framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -227434,8 +228179,8 @@ self: { tasty-quickcheck text wai wai-extra ]; description = "Dependently typed API servers with Serv"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -227462,7 +228207,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "A family of combinators for defining webservices APIs"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "servant-JuicyPixels" = callPackage @@ -227482,8 +228227,8 @@ self: { base JuicyPixels servant servant-server wai warp ]; description = "Servant support for JuicyPixels"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -227509,8 +228254,8 @@ self: { silently string-conversions temporary text ]; description = "generic tests for aeson serialization in servant"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -227526,7 +228271,7 @@ self: { aeson base jose lens servant text unordered-containers ]; description = "Authentication combinators for servant"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "servant-auth-client" = callPackage @@ -227552,7 +228297,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "servant-client/servant-auth compatibility"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "servant-auth-cookie" = callPackage @@ -227582,8 +228327,8 @@ self: { base bytestring criterion cryptonite servant-server ]; description = "Authentication via encrypted cookies"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -227608,8 +228353,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "servant-docs/servant-auth compatibility"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -227645,8 +228390,8 @@ self: { time transformers wai wai-extra with-location ]; description = "Authentication via HMAC"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -227675,7 +228420,7 @@ self: { ]; testToolDepends = [ hspec-discover markdown-unlit ]; description = "servant-server/servant-auth compatibility"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "servant-auth-swagger" = callPackage @@ -227695,7 +228440,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "servant-swagger/servant-auth compatibility"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "servant-auth-token" = callPackage @@ -227714,8 +228459,8 @@ self: { time transformers uuid wai ]; description = "Servant based API and server for token based authorisation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -227737,8 +228482,8 @@ self: { transformers transformers-base uuid ]; description = "Acid-state backend for servant-auth-token server"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -227755,8 +228500,8 @@ self: { servant-swagger swagger2 text ]; description = "Servant based API for token based authorisation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -227778,8 +228523,8 @@ self: { transformers unliftio-core uuid vector ]; description = "Leveldb backend for servant-auth-token server"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -227799,8 +228544,8 @@ self: { servant-server text time transformers unliftio-core uuid ]; description = "Persistent backend for servant-auth-token server"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -227823,8 +228568,8 @@ self: { vector ]; description = "RocksDB backend for servant-auth-token server"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -227840,8 +228585,8 @@ self: { base mtl servant-server text time wai wordpress-auth ]; description = "Authenticate Routes Using Wordpress Cookies"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -227859,8 +228604,8 @@ self: { servant-server text warp ]; description = "Avro content type for Servant"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -227875,7 +228620,7 @@ self: { libraryHaskellDepends = [ base blaze-html http-media servant ]; testHaskellDepends = [ base blaze-html servant-server wai warp ]; description = "Blaze-html support for servant"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "servant-cassava" = callPackage @@ -227896,8 +228641,8 @@ self: { servant-server wai warp ]; description = "Servant CSV content-type for cassava"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -227922,8 +228667,8 @@ self: { tasty-hunit wai ]; description = "Checked exceptions for Servant APIs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -227945,8 +228690,8 @@ self: { ]; testHaskellDepends = [ base doctest Glob ]; description = "Checked exceptions for Servant APIs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -227974,8 +228719,8 @@ self: { random servant servant-client servant-server text vinyl warp ]; description = "Command line interface for Servant API clients"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -228006,7 +228751,7 @@ self: { ]; testToolDepends = [ hspec-discover markdown-unlit ]; description = "Automatic derivation of querying functions for servant"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "servant-client-core" = callPackage @@ -228029,7 +228774,7 @@ self: { testHaskellDepends = [ base base-compat deepseq hspec QuickCheck ]; testToolDepends = [ hspec-discover ]; description = "Core functionality and class for client function generation for servant APIs"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "servant-client-js" = callPackage @@ -228048,8 +228793,8 @@ self: { servant servant-client-core text transformers transformers-base ]; description = "A servant client for frontend JavaScript"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -228071,8 +228816,8 @@ self: { servant-server-namedargs warp ]; description = "Automatically derive API client functions with named and optional parameters"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -228093,7 +228838,7 @@ self: { resourcet servant servant-client servant-server wai warp ]; description = "Servant Stream support for conduit"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "servant-csharp" = callPackage @@ -228112,8 +228857,8 @@ self: { unordered-containers uuid uuid-types ]; description = "Generate servant client library for C#"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -228125,8 +228870,8 @@ self: { sha256 = "12nsdpcmv0xijvp89x3ksnf1mpdwbhwrn86c2y1cayvspvv1iilr"; libraryHaskellDepends = [ base servant ]; description = "Servant types for defining API with relational DBs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -228152,8 +228897,8 @@ self: { quickcheck-instances servant-db text time transformers-base ]; description = "Derive a postgres client to database API specified by servant-db"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -228175,8 +228920,8 @@ self: { wai warp ]; description = "Servant Dhall content-type"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -228205,8 +228950,8 @@ self: { tasty-golden tasty-hunit transformers ]; description = "generate API docs for your servant webservice"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -228229,8 +228974,8 @@ self: { unordered-containers ]; description = "Generate endpoints overview for Servant API"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -228254,8 +228999,8 @@ self: { base ede http-media servant-server text unordered-containers warp ]; description = "Combinators for rendering EDE templates in servant web applications"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -228282,8 +229027,8 @@ self: { aeson base ekg ekg-core process servant-server text wai warp ]; description = "Helpers for using ekg with servant"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -228306,8 +229051,8 @@ self: { aeson base Diff elm-bridge hspec HUnit servant servant-client text ]; description = "Automatically derive Elm functions to query servant webservices"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -228331,7 +229076,7 @@ self: { ]; testToolDepends = [ markdown-unlit ]; description = "Servant Errors wai-middlware"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "servant-examples" = callPackage @@ -228353,8 +229098,8 @@ self: { warp ]; description = "Example programs for servant"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -228369,7 +229114,7 @@ self: { aeson base exceptions http-types servant text ]; description = "Extensible exceptions for servant APIs"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "servant-exceptions-server" = callPackage @@ -228385,7 +229130,7 @@ self: { servant-exceptions servant-server text wai ]; description = "Extensible exceptions for servant API servers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "servant-fiat-content" = callPackage @@ -228398,8 +229143,8 @@ self: { base bytestring http-media servant text ]; description = "Fiat content types"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -228411,7 +229156,7 @@ self: { sha256 = "0j8dv8010yr63sl3ks0an64ry53ajc2xd47vpd6i1svhb9b6l79i"; libraryHaskellDepends = [ base servant ]; description = "Utilities for flattening servant API types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "servant-foreign" = callPackage @@ -228428,7 +229173,7 @@ self: { testHaskellDepends = [ base hspec servant ]; testToolDepends = [ hspec-discover ]; description = "Helpers for generating clients for servant APIs in any programming language"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "servant-generate" = callPackage @@ -228441,8 +229186,8 @@ self: { editedCabalFile = "11hmn45fsl78kq6lladgz29yjycmr7lxmkswc8f41zbcb4m8rzyk"; libraryHaskellDepends = [ base servant servant-server ]; description = "Utilities for generating mock server implementations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -228459,8 +229204,8 @@ self: { base network-uri servant servant-server text warp ]; description = "Specify Servant APIs with records"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -228484,8 +229229,8 @@ self: { executableHaskellDepends = [ base text transformers ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "Bindings to GitHub API using servant"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -228508,7 +229253,7 @@ self: { aeson base bytestring servant-server text transformers wai warp ]; description = "Servant combinators to facilitate writing GitHub webhooks"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "servant-haxl-client" = callPackage @@ -228535,8 +229280,8 @@ self: { servant servant-server text wai warp ]; description = "automatical derivation of querying functions for servant webservices"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -228563,8 +229308,8 @@ self: { executableToolDepends = [ markdown-unlit ]; testHaskellDepends = [ base ]; description = "Servant authentication with HMAC"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -228598,8 +229343,8 @@ self: { ]; testToolDepends = [ hspec-discover markdown-unlit ]; description = "Automatic derivation of querying functions for servant"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -228624,8 +229369,8 @@ self: { http2-client mtl servant servant-client-core text tls transformers ]; description = "Generate HTTP2 clients from Servant API descriptions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -228642,8 +229387,8 @@ self: { base data-default http-media iCalendar servant ]; description = "Servant support for iCalendar"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -228662,8 +229407,8 @@ self: { base hspec hspec-expectations language-ecmascript lens servant ]; description = "Automatically derive (jquery) javascript functions to query servant webservices"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -228687,8 +229432,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Automatically derive javascript functions to query servant webservices"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -228700,7 +229445,7 @@ self: { sha256 = "0qy2al8waycarh5973c43bdd9g4a9032waknjsbykhflwglvwmv5"; libraryHaskellDepends = [ aeson base servant ]; description = "JSON-RPC messages and endpoints"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "servant-jsonrpc-client" = callPackage @@ -228715,7 +229460,7 @@ self: { aeson base servant servant-client-core servant-jsonrpc ]; description = "Generate JSON-RPC servant clients"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "servant-jsonrpc-server" = callPackage @@ -228730,7 +229475,7 @@ self: { aeson base containers mtl servant servant-jsonrpc servant-server ]; description = "JSON-RPC servant servers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "servant-kotlin" = callPackage @@ -228755,8 +229500,8 @@ self: { 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; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -228771,7 +229516,7 @@ self: { libraryHaskellDepends = [ base http-media lucid servant text ]; testHaskellDepends = [ base lucid servant-server wai warp ]; description = "Servant support for lucid"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "servant-machines" = callPackage @@ -228789,7 +229534,7 @@ self: { servant-client servant-server wai warp ]; description = "Servant Stream support for machines"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "servant-match" = callPackage @@ -228805,7 +229550,7 @@ self: { ]; testHaskellDepends = [ base hspec network-uri servant text ]; description = "Standalone implementation of servant’s dispatching mechanism"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "servant-matrix-param" = callPackage @@ -228825,8 +229570,8 @@ self: { servant-server text transformers wai wai-extra warp ]; description = "Matrix parameter combinator for servant"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -228855,8 +229600,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Derive a mock server for free from your servant API types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -228889,8 +229634,8 @@ self: { tasty-wai text ]; description = "multipart/form-data (e.g file upload) support for servant"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -228909,7 +229654,7 @@ self: { base hspec hspec-wai http-types servant servant-server ]; description = "Add named endpoints to servant"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "servant-namedargs" = callPackage @@ -228921,8 +229666,8 @@ self: { libraryHaskellDepends = [ base named servant text ]; testHaskellDepends = [ base hspec named QuickCheck servant ]; description = "Combinators for servant providing named parameters"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -228944,8 +229689,8 @@ self: { warp ]; description = "Servant Nix content-type"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -228974,8 +229719,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Generate a Swagger/OpenAPI/OAS 3.0 specification for your servant API."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -228991,7 +229736,7 @@ self: { base bytestring http-types servant-foreign servant-server text wai ]; description = "Provide responses to OPTIONS requests for Servant applications"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "servant-pagination" = callPackage @@ -229009,8 +229754,8 @@ self: { ]; testHaskellDepends = [ base hspec QuickCheck servant-server text ]; description = "Type-safe pagination for Servant APIs"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -229028,8 +229773,8 @@ self: { servant-docs string-conversions text unordered-containers ]; description = "Use Pandoc to render servant API documentation"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -229051,7 +229796,7 @@ self: { wai warp ]; description = "Servant Stream support for pipes"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "servant-polysemy" = callPackage @@ -229076,8 +229821,8 @@ self: { servant-swagger servant-swagger-ui swagger2 text wai warp ]; description = "Utilities for using servant in a polysemy stack"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -229091,8 +229836,8 @@ self: { editedCabalFile = "15wcxjn22zmwj7dqrbg5kmca4niri6p4cs0gm8b3dnr1iv2l0jgq"; libraryHaskellDepends = [ base resource-pool servant time ]; description = "Utility functions for creating servant 'Context's with \"context/connection pooling\" support"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -229109,8 +229854,8 @@ self: { servant-response ]; description = "Useful functions and instances for using servant with a PostgreSQL context"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -229133,8 +229878,8 @@ self: { test-framework test-framework-hunit warp ]; description = "Servant Content-Type for proto-lens protobuf modules"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -229158,8 +229903,8 @@ self: { servant servant-foreign servant-subscriber text ]; description = "Generate PureScript accessor functions for you servant API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -229179,8 +229924,8 @@ self: { text time unordered-containers ]; description = "Bindings to the Pushbullet API using servant-client"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -229202,8 +229947,8 @@ self: { servant-foreign text ]; description = "Automatically derive python functions to query servant webservices"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -229232,8 +229977,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "QuickCheck entire APIs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -229245,7 +229990,7 @@ self: { sha256 = "05gv21y7vzw7gdbsk0nax47rnn4isjmx7hbbwilsv0cj7l8qm1bk"; libraryHaskellDepends = [ base servant ]; description = "Embed a raw 'Application' in a Servant API"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "servant-rawm-client" = callPackage @@ -229256,8 +230001,8 @@ self: { sha256 = "0ldjhmmfdh0jpfaz4sg1b9n5l23wza3w0m8bvvf80gvl7p6fk0fj"; libraryHaskellDepends = [ base servant-client-core servant-rawm ]; description = "The client implementation of servant-rawm"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -229273,8 +230018,8 @@ self: { base http-media http-types lens servant-docs servant-rawm ]; description = "Documentation generator for 'RawM' endpoints"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -229291,7 +230036,7 @@ self: { wai-app-static ]; description = "The server implementation of servant-rawm"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "servant-reason" = callPackage @@ -229311,8 +230056,8 @@ self: { process reason-export servant servant-foreign text wl-pprint-text ]; description = "Derive Reason types to interact with a Haskell backend"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -229335,8 +230080,8 @@ self: { transformers ]; description = "servant API generator for reflex apps"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -229350,7 +230095,7 @@ self: { editedCabalFile = "1lhxc5kjz4459v65h57imv3k9l9nrkgid1qqlbwb4987q7y83qay"; libraryHaskellDepends = [ aeson base http-types text ]; description = "Machinery to express how servant should turn results of database operations into proper JSON-encodable response types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "servant-router" = callPackage @@ -229369,8 +230114,8 @@ self: { base blaze-html servant servant-blaze servant-server warp ]; description = "Servant router for non-server applications"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -229385,7 +230130,7 @@ self: { libraryHaskellDepends = [ base casing servant-foreign text ]; testHaskellDepends = [ base doctest QuickCheck ]; description = "Generate a Ruby client from a Servant API with Net::HTTP"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "servant-scotty" = callPackage @@ -229403,8 +230148,8 @@ self: { transformers ]; description = "Generate a web service for servant 'Resource's using scotty and JSON"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -229427,29 +230172,29 @@ self: { base directory doctest filepath QuickCheck ]; description = "Generate Robots.txt and Sitemap.xml specification for your servant API."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; "servant-serf" = callPackage ({ mkDerivation, attoparsec, base, hpack, mtl, optparse-applicative - , parser-combinators, regex-base, regex-tdfa, text, tomland + , parser-combinators, regex-base, regex-tdfa, text }: mkDerivation { pname = "servant-serf"; - version = "0.0.3"; - sha256 = "10ky0hmz1484jz0grwmac9208vlv4k8jwzn2imbrn405p76iifdm"; + version = "0.1.0"; + sha256 = "08x4d595czal5j5dgd08bps4swsrh547nnmk4i006jjvbl0315nf"; isLibrary = true; isExecutable = true; executableHaskellDepends = [ attoparsec base hpack mtl optparse-applicative parser-combinators - regex-base regex-tdfa text tomland + regex-base regex-tdfa text ]; doHaddock = false; description = "Generates a servant API module"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -229485,7 +230230,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "A family of combinators for defining webservices APIs and serving them"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "servant-server-namedargs" = callPackage @@ -229502,8 +230247,8 @@ self: { servant-namedargs servant-server string-conversions text wai ]; description = "Automatically derive API server functions with named and optional parameters"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -229526,8 +230271,8 @@ self: { tasty-hunit tasty-quickcheck text ]; description = "Servant client for smsc.ru service for sending SMS to cell phones"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -229565,8 +230310,8 @@ self: { temporary text time transformers ]; description = "A family of combinators for defining webservices APIs and serving them"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -229589,7 +230334,7 @@ self: { aeson base http-media servant-server warp ]; description = "Content-Types for rendering Mustache in servant"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "servant-static-th" = callPackage @@ -229600,8 +230345,8 @@ self: { }: mkDerivation { pname = "servant-static-th"; - version = "0.2.4.0"; - sha256 = "1xmikym19kq912apmh6zcdjzbz23mhn580pvsy5ll35ylqziaflk"; + version = "1.0.0.0"; + sha256 = "1iky6bk92vzhsw31hfdhgclr4nq1kmic6w9mwd5fzjhbs5vcmm15"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -229615,7 +230360,7 @@ self: { tasty-hunit wai ]; description = "Embed a directory of static files in your Servant server"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "servant-streaming" = callPackage @@ -229629,8 +230374,8 @@ self: { libraryHaskellDepends = [ base http-types servant ]; testHaskellDepends = [ base hspec http-types QuickCheck servant ]; description = "Servant combinators for the 'streaming' package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -229656,8 +230401,8 @@ self: { servant-streaming servant-streaming-server streaming warp ]; description = "Client instances for the 'servant-streaming' package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -229675,8 +230420,8 @@ self: { base lens servant servant-docs servant-streaming ]; description = "Client instances for the 'servant-docs' package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -229703,8 +230448,8 @@ self: { warp ]; description = "Server instances for the 'servant-streaming' package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -229731,7 +230476,7 @@ self: { ]; executableHaskellDepends = [ base purescript-bridge ]; description = "When REST is not enough ..."; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "servant-swagger" = callPackage @@ -229759,7 +230504,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Generate a Swagger/OpenAPI/OAS 2.0 specification for your servant API."; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "servant-swagger-tags" = callPackage @@ -229775,8 +230520,8 @@ self: { servant-server servant-swagger swagger2 text ]; description = "Swagger Tags for Servant"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -229793,7 +230538,7 @@ self: { servant-swagger-ui-core swagger2 text ]; description = "Servant swagger ui"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "servant-swagger-ui-core" = callPackage @@ -229811,7 +230556,7 @@ self: { wai-app-static ]; description = "Servant swagger ui core components"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "servant-swagger-ui-jensoleg" = callPackage @@ -229829,7 +230574,7 @@ self: { servant-swagger-ui-core swagger2 text ]; description = "Servant swagger ui: Jens-Ole Graulund theme"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "servant-swagger-ui-redoc" = callPackage @@ -229847,7 +230592,7 @@ self: { servant-swagger-ui-core swagger2 text ]; description = "Servant swagger ui: ReDoc theme"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "servant-to-elm" = callPackage @@ -229869,8 +230614,8 @@ self: { servant-multipart text ]; description = "Automatically generate Elm clients for Servant APIs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -229901,7 +230646,7 @@ self: { QuickCheck tasty tasty-hunit tasty-quickcheck text time transformers ]; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "servant-waargonaut" = callPackage @@ -229925,8 +230670,8 @@ self: { wl-pprint-annotated ]; description = "Servant Integration for Waargonaut JSON Package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -229945,7 +230690,7 @@ self: { base bytestring servant servant-server transformers warp ]; description = "Servant support for delivering WebAssembly"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "servant-websockets" = callPackage @@ -229967,7 +230712,7 @@ self: { aeson base conduit servant-server text wai warp websockets ]; description = "Small library providing WebSocket endpoints for servant"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "servant-xml" = callPackage @@ -229982,7 +230727,7 @@ self: { base bytestring http-media servant xmlbf xmlbf-xeno ]; description = "Servant support for the XML Content-Type"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "servant-yaml" = callPackage @@ -230003,8 +230748,8 @@ self: { wai warp yaml ]; description = "Servant support for yaml"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -230016,8 +230761,8 @@ self: { sha256 = "1pga7l2akxqhkfq6gqaiiz6svvhzb83dbc5bw487kkrs3vriyyc3"; libraryHaskellDepends = [ base singletons ]; description = "Types and definitions of servant-zeppelin combinators"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -230041,8 +230786,8 @@ self: { warp ]; description = "Client library for servant-zeppelin combinators"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -230066,8 +230811,8 @@ self: { string-conversions warp wreq ]; description = "Server library for servant-zeppelin combinators"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -230089,8 +230834,8 @@ self: { servant-swagger servant-zeppelin swagger2 ]; description = "Swagger instances for servant-zeppelin combinators"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -230106,8 +230851,8 @@ self: { aeson base bytestring http-types mtl text void wai warp ]; description = "Auto-generate a server for your datatype"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -230135,7 +230880,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Deploying Haskell code onto AWS Lambda using Serverless"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "serversession" = callPackage @@ -230159,7 +230904,7 @@ self: { unordered-containers ]; description = "Secure, modular server-side sessions"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "serversession-backend-acid-state" = callPackage @@ -230179,8 +230924,8 @@ self: { unordered-containers ]; description = "Storage backend for serversession using acid-state"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -230207,8 +230952,8 @@ self: { time transformers unordered-containers ]; description = "Storage backend for serversession using persistent and an RDBMS"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -230230,8 +230975,8 @@ self: { transformers unordered-containers ]; description = "Storage backend for serversession using Redis"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -230249,7 +230994,7 @@ self: { time transformers unordered-containers ]; description = "Snap bindings for serversession"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "serversession-frontend-wai" = callPackage @@ -230266,7 +231011,7 @@ self: { time transformers unordered-containers vault wai wai-session ]; description = "wai-session bindings for serversession"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "serversession-frontend-yesod" = callPackage @@ -230284,8 +231029,8 @@ self: { yesod-core ]; description = "Yesod bindings for serversession"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -230303,8 +231048,8 @@ self: { ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Tools for building services"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -230320,7 +231065,7 @@ self: { aeson base bytestring generic-deriving text text-show ]; description = "JSON to Sql"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "servius" = callPackage @@ -230338,7 +231083,7 @@ self: { shakespeare text wai wai-app-static ]; description = "Warp web server with template rendering"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "ses-html" = callPackage @@ -230354,7 +231099,7 @@ self: { HsOpenSSL http-streams tagsoup time ]; description = "Send HTML formatted emails using Amazon's SES REST API with blaze"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ses-html-snaplet" = callPackage @@ -230370,8 +231115,8 @@ self: { transformers ]; description = "Snaplet for the ses-html package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -230387,7 +231132,7 @@ self: { ]; description = "Session Types for Haskell"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -230409,8 +231154,8 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base directory exceptions hspec ]; description = "Session types library"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -230433,8 +231178,8 @@ self: { base distributed-process hspec network-transport-tcp sessiontypes ]; description = "Session types distributed"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -230463,7 +231208,7 @@ self: { transformers utility-ht ]; description = "Solve exact set cover problems like Sudoku, 8 Queens, Soma Cube, Tetris Cube"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "set-extra" = callPackage @@ -230474,7 +231219,7 @@ self: { sha256 = "10kbvd09hp12rlfkc15xqiglrbxzi7gchb0aazqyg77ah66wjn10"; libraryHaskellDepends = [ base containers mtl syb ]; description = "Functions that could be added to Data.Set."; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "set-monad" = callPackage @@ -230485,7 +231230,7 @@ self: { sha256 = "0iv1mphhhqla4bbr2lhy6zj8bp963jlcxqkib2nnl7vyw1ya1cd1"; libraryHaskellDepends = [ base containers deepseq ]; description = "Set monad"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "set-of" = callPackage @@ -230496,8 +231241,8 @@ self: { sha256 = "0npsxff611frdb2a5xbyd4ipn3qb8ji6a1yygxid7pk7qsx0spj1"; libraryHaskellDepends = [ base containers ]; description = "Sets of fixed size, with typelits"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -230515,8 +231260,8 @@ self: { tasty-quickcheck ]; description = "Set of elements sorted by a different data type"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -230536,8 +231281,8 @@ self: { ]; executableToolDepends = [ alex happy ]; description = "Treating files as sets to perform rapid set manipulation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -230551,7 +231296,7 @@ self: { editedCabalFile = "0ny4g3kjys0hqg41mnwrsymy1bwhl8l169kis4y4fa58sb06m4f5"; libraryHaskellDepends = [ base unix ]; description = "A cross-platform library for setting environment variables"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "setgame" = callPackage @@ -230567,8 +231312,8 @@ self: { libraryHaskellDepends = [ base random vty ]; executableHaskellDepends = [ base ]; description = "A console interface to the game of Set"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -230582,7 +231327,7 @@ self: { editedCabalFile = "0l0hlxhjspm05hxd06972ilw4c3ni72mnzcyljg3a01i8pxi53cl"; libraryHaskellDepends = [ base ]; description = "Haskell bindings to setlocale"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "setoid" = callPackage @@ -230600,8 +231345,8 @@ self: { ]; testToolDepends = [ tasty-discover ]; description = "A Haskell implementation of setoid"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -230623,7 +231368,7 @@ self: { base containers doctest hlint hspec protolude ]; description = "Perform set operations on files"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "setops" = callPackage @@ -230634,7 +231379,7 @@ self: { sha256 = "1mja48p8g9prfk53218qbv83ks6rs63s0n6jad0jgrj1221afpvg"; libraryHaskellDepends = [ base containers ]; description = "Uniform names (and Unicode operators) for set operations on data structures"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "sets" = callPackage @@ -230666,7 +231411,7 @@ self: { witherable ]; description = "Ducktyped set interface for Haskell containers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "setters" = callPackage @@ -230679,8 +231424,8 @@ self: { editedCabalFile = "0rck3kizbzr5vffisnnhl3fsl4vw3n0s3mb7lcgggd4b40hp7zy4"; libraryHaskellDepends = [ base mtl template-haskell ]; description = "Small (TH) library to declare setters for typical `record' data type fields"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -230692,7 +231437,7 @@ self: { sha256 = "1hnbr2r99i2cgjl329zh7i1g059vq2id3d2drmx0gzmw6x9nvqs8"; libraryHaskellDepends = [ base text unordered-containers ]; description = "Runtime-editable program settings"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "sexp" = callPackage @@ -230716,8 +231461,8 @@ self: { test-framework-hunit test-framework-quickcheck2 ]; description = "S-Expression parsing/printing made fun and easy"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -230747,7 +231492,7 @@ self: { base bytestring criterion deepseq text ]; description = "Invertible grammar combinators for S-expressions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "sexp-show" = callPackage @@ -230762,7 +231507,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base pretty-show ]; description = "Produce a s-expression representation of Show values"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "sexpr" = callPackage @@ -230777,7 +231522,7 @@ self: { base base64-string binary bytestring pretty ]; description = "S-expression printer and parser"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "sexpr-parser" = callPackage @@ -230794,8 +231539,8 @@ self: { executableHaskellDepends = [ base bytestring megaparsec process ]; testHaskellDepends = [ base data-default hspec megaparsec ]; description = "Simple s-expression parser"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -230817,7 +231562,7 @@ self: { ]; description = "A flexible library for parsing and printing S-expression"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "sext" = callPackage @@ -230835,8 +231580,8 @@ self: { base bytestring tasty tasty-hunit template-haskell ]; description = "Lists, Texts, ByteStrings and Vectors with type-encoded length"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -230850,7 +231595,7 @@ self: { librarySystemDepends = [ libsndfile openal ]; description = "minimal bindings to the audio module of sfml"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) libsndfile; inherit (pkgs) openal;}; "sfmt" = callPackage @@ -230861,8 +231606,8 @@ self: { sha256 = "1jwzsk43kkvlmw551z46bhbvccf9yn1ncrhd27lm4pn93as2v1p6"; libraryHaskellDepends = [ base bytestring entropy primitive ]; description = "SIMD-oriented Fast Mersenne Twister(SFMT) binding"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -230883,8 +231628,8 @@ self: { ]; testHaskellDepends = [ base ]; description = "A command line tool to convert TrueType/OpenType fonts to WOFF format"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) zlib;}; @@ -230909,8 +231654,8 @@ self: { random-shuffle tasty tasty-hunit temporary vector ]; description = "Stochastic gradient descent library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -230927,8 +231672,8 @@ self: { time transformers ]; description = "SGF (Smart Game Format) parser"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -230943,7 +231688,7 @@ self: { executableHaskellDepends = [ base bio regex-compat ]; description = "Sgrep - grep Fasta files for sequences matching a regular expression"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -230970,8 +231715,8 @@ self: { transformers unix ]; description = "Record your shell session and print in the markdown format"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -230986,8 +231731,8 @@ self: { libraryHaskellDepends = [ base binary bytestring io-streams SHA ]; executableHaskellDepends = [ base io-streams SHA ]; description = "SHA hashes for io-streams"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -231004,8 +231749,8 @@ self: { base byteslice natural-arithmetic primitive small-bytearray-builder ]; description = "SHA-1 Hash"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -231019,8 +231764,8 @@ self: { editedCabalFile = "164nw1gg6yl3fb4pqbgxxphafw2120a8kryhqx0i09l8c1n49557"; libraryHaskellDepends = [ base mtl transformers ]; description = "A control structure used to combine heterogenous types with delayed effects"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -231043,8 +231788,8 @@ self: { system-filepath text ]; description = "An automated way to run doctests in files that are changing"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -231074,7 +231819,7 @@ self: { base binary bytestring containers cryptohash HUnit process ]; description = "A fast SOCKS5 proxy that help you get through firewalls"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "shady-gen" = callPackage @@ -231092,7 +231837,7 @@ self: { ]; description = "Functional GPU programming - DSEL & compiler"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "shady-graphics" = callPackage @@ -231110,7 +231855,7 @@ self: { ]; description = "Functional GPU programming - DSEL & compiler"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "shake" = callPackage @@ -231121,8 +231866,8 @@ self: { }: mkDerivation { pname = "shake"; - version = "0.19.2"; - sha256 = "0s34c40zvr0ny5n0p2g85rzkx3789r20627gykkpsn5cvnc7pj5s"; + version = "0.19.4"; + sha256 = "1vkkgncar07na4kn3i02b2zdyjdjxl10hrcz2l23c498yrrqibjv"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -231143,7 +231888,7 @@ self: { utf8-string ]; description = "Build system library, like Make, but more accurate dependencies"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "shake-ats" = callPackage @@ -231160,7 +231905,7 @@ self: { microlens shake shake-c shake-cabal shake-ext text ]; description = "Utilities for building ATS projects with shake"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "shake-bindist" = callPackage @@ -231175,8 +231920,8 @@ self: { archive-sig base bytestring bz2 lzlib shake zlib zstd ]; description = "Rules for binary distributions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -231188,7 +231933,7 @@ self: { sha256 = "1bhi4rfvhin16c4xhx50dxjhr2gfpngasv7fps9fhm6is372ln9v"; libraryHaskellDepends = [ base cdeps composition-prelude shake ]; description = "Library for building C code with shake"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "shake-cabal" = callPackage @@ -231204,7 +231949,7 @@ self: { hashable shake ]; description = "Shake library for use with cabal"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "shake-cabal-build" = callPackage @@ -231219,8 +231964,8 @@ self: { base Cabal directory filepath process ]; description = "Utility for building Shake build systems using Cabal sandboxes"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -231232,7 +231977,7 @@ self: { sha256 = "1n52fjay6xgx65ihin6zxx05q42mfkdqi9888hn8dnn70kf5j7cg"; libraryHaskellDepends = [ base directory shake ]; description = "Shake rules for CCJS"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "shake-dhall" = callPackage @@ -231248,8 +231993,8 @@ self: { ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Dhall dependencies"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -231261,7 +232006,7 @@ self: { sha256 = "057ph5ai8pswzymln8l6i2hdn1vgi3hwyji1z6s4bh71xnc0sn5r"; libraryHaskellDepends = [ base shake ]; description = "Elm builds in shake"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "shake-ext" = callPackage @@ -231272,7 +232017,7 @@ self: { sha256 = "12pfi6rc4y8rjndym0crzyjfmcqnnrh61hww1vrnl614hs00iw6h"; libraryHaskellDepends = [ base directory shake ]; description = "Helper functions for linting with shake"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "shake-extras" = callPackage @@ -231287,8 +232032,8 @@ self: { base bytestring cmdargs directory filepath shake ]; description = "Extra utilities for shake build systems"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -231304,7 +232049,7 @@ self: { base containers directory filepath futhark shake text ]; description = "Dependency tracking for Futhark"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "shake-google-closure-compiler" = callPackage @@ -231315,7 +232060,7 @@ self: { sha256 = "1z9znpcsnc6qizx0rnkww3pbxpk77pmrn6dvn8jqm2pppwbpjw0g"; libraryHaskellDepends = [ base directory shake ]; description = "Shake rules for the Google closure compiler"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "shake-language-c" = callPackage @@ -231333,7 +232078,7 @@ self: { testHaskellDepends = [ base directory doctest hspec shake ]; doCheck = false; description = "Utilities for cross-compiling with Shake"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "shake-literate" = callPackage @@ -231344,7 +232089,7 @@ self: { sha256 = "0wx3mh62b8kq20qw15zg35nl4l066i11mzgj0vxlvys5a6902ijn"; libraryHaskellDepends = [ base cpphs shake ]; description = "Rules for building literate programs in shake"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "shake-minify" = callPackage @@ -231357,8 +232102,8 @@ self: { base bytestring css-text hjsmin shake text ]; description = "Shake Minify Rules"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -231372,7 +232117,7 @@ self: { base directory filepath hasmin shake text ]; description = "Shake rules for CSS"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "shake-pack" = callPackage @@ -231383,8 +232128,8 @@ self: { sha256 = "13v9p6idndg3xy8fb63g037csgmj5kaxj0903kx5py050cj6rbaz"; libraryHaskellDepends = [ base bytestring bzlib shake tar ]; description = "Shake File Pack Rule"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -231396,8 +232141,8 @@ self: { sha256 = "0sjw0hcs6i9c8vfirrk90y5xd3cf0f9c0wa2p5pqimc5wfid9plk"; libraryHaskellDepends = [ base path path-io shake ]; description = "path alternatives to shake functions"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -231415,8 +232160,8 @@ self: { ]; executableHaskellDepends = [ base shake ]; description = "Shake build system on-disk caching"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -231428,7 +232173,7 @@ self: { sha256 = "09zinaphlmdshny3hiyibbqqkfflj2rkxh8zkpnnk5dvf2qb15p5"; libraryHaskellDepends = [ base extra path rio shake ]; description = "Re-export of Shake using well-typed paths and ReaderT"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "shake-plus-extended" = callPackage @@ -231447,7 +232192,7 @@ self: { path-binary-instance rio shake shake-plus within ]; description = "Experimental extensions to shake-plus"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "shakebook" = callPackage @@ -231492,8 +232237,8 @@ self: { zipper-extra ]; description = "Shake-based technical documentation generator; HTML & PDF"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -231522,8 +232267,8 @@ self: { test-framework-quickcheck2 ]; description = "simple and interactive command-line build tool"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -231538,7 +232283,7 @@ self: { base basic-prelude directory lifted-base shake ]; description = "Shake helpers"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "shakespeare" = callPackage @@ -231562,8 +232307,8 @@ self: { text time transformers ]; description = "A toolkit for making compile-time interpolated templates"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ psibi ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ psibi ]; }) {}; "shakespeare-babel" = callPackage @@ -231579,8 +232324,8 @@ self: { template-haskell ]; description = "compile es2015"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -231593,7 +232338,7 @@ self: { libraryHaskellDepends = [ base shakespeare ]; doHaddock = false; description = "Stick your haskell variables into css at compile time. (deprecated)"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "shakespeare-i18n" = callPackage @@ -231605,7 +232350,7 @@ self: { libraryHaskellDepends = [ base shakespeare ]; doHaddock = false; description = "A type-based approach to internationalization. (deprecated)"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "shakespeare-js" = callPackage @@ -231617,7 +232362,7 @@ self: { libraryHaskellDepends = [ base shakespeare ]; doHaddock = false; description = "Stick your haskell variables into javascript/coffeescript at compile time. (deprecated)"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "shakespeare-sass" = callPackage @@ -231632,8 +232377,8 @@ self: { base hsass shakespeare template-haskell yesod yesod-core ]; description = "SASS support for Shakespeare and Yesod"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -231646,7 +232391,7 @@ self: { libraryHaskellDepends = [ base shakespeare ]; doHaddock = false; description = "Interpolation with quasi-quotation: put variables strings (deprecated)"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "shana" = callPackage @@ -231658,7 +232403,7 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base directory regex-posix ]; description = "treat haskell functions as unix pipes"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "shannon-fano" = callPackage @@ -231675,7 +232420,7 @@ self: { base bytestring optparse-generic QuickCheck ]; description = "Shannon-fano compression algorithm in Haskell"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "shapefile" = callPackage @@ -231690,8 +232435,8 @@ self: { base binary bytestring data-binary-ieee754 dbf filepath rwlock ]; description = "Parser and related tools for ESRI shapefile format"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -231710,8 +232455,8 @@ self: { base containers proxy-kindness QuickCheck tagged template-haskell ]; description = "Generics using @(,)@ and @Either@, with algebraic operations and typed conversions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -231739,7 +232484,7 @@ self: { QuickCheck shapes-math transformers vector vector-th-unbox ]; description = "physics engine and other tools for 2D shapes"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "shapes-demo" = callPackage @@ -231758,7 +232503,7 @@ self: { sdl2 shapes StateVar text transformers vector ]; description = "demos for the 'shapes' package"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "shapes-math" = callPackage @@ -231781,7 +232526,7 @@ self: { base ghc-prim hspec linear QuickCheck template-haskell ]; description = "faster vector/matrix math using unboxed numbers and Template Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "sharc-timbre" = callPackage @@ -231792,7 +232537,7 @@ self: { sha256 = "1cwzks95jlpa4cd99mz5cz509h7j8k08w53xpvwny1bdb3p1cpsa"; libraryHaskellDepends = [ base ]; description = "Sandell Harmonic Archive. A collection of stable phases for all instruments in the orchestra."; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "shared-buffer" = callPackage @@ -231809,8 +232554,8 @@ self: { test-framework-quickcheck2 unix ]; description = "A circular buffer built on shared memory"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -231824,8 +232569,8 @@ self: { libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base Cabal hspec lens text ]; description = "a tiny library for using shared lens fields"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -231838,7 +232583,7 @@ self: { libraryHaskellDepends = [ base unix ]; testHaskellDepends = [ base bytestring unix ]; description = "POSIX shared memory"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "sharedio" = callPackage @@ -231849,7 +232594,7 @@ self: { sha256 = "08hmmb2nn2lpirdnpp928m6xadzkv8k90x1nycw2b58vp1rpk7zv"; libraryHaskellDepends = [ base ]; description = "Bundles shared calls to IO functions to perform them only once"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "she" = callPackage @@ -231865,8 +232610,8 @@ self: { libraryHaskellDepends = [ base filepath mtl ]; executableHaskellDepends = [ base filepath mtl ]; description = "A Haskell preprocessor adding miscellaneous features"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -231897,8 +232642,8 @@ self: { transformers wreq ]; description = "Test webhooks locally"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -231922,7 +232667,7 @@ self: { template-haskell ]; description = "Write shell scripts with Conduit"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "shell-escape" = callPackage @@ -231935,7 +232680,7 @@ self: { base binary bytestring containers vector ]; description = "Shell escaping library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "shell-monad" = callPackage @@ -231946,7 +232691,7 @@ self: { sha256 = "1mms4k2y7gxzilax0hqhgqppckx0mm5nj7fjzqhmn211rsc2s1qn"; libraryHaskellDepends = [ base containers text unix ]; description = "shell monad"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "shell-pipe" = callPackage @@ -231962,7 +232707,7 @@ self: { executableHaskellDepends = [ base ]; description = "Pipe streams through external shell commands"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -231974,7 +232719,7 @@ self: { sha256 = "1n15v0avvkxvczmyjc6g4z9axr5c61n8jlpa1cm4xr3qk7spm1mi"; libraryHaskellDepends = [ base ]; description = "Utility functions for writing command-line programs"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "shellish" = callPackage @@ -231990,8 +232735,8 @@ self: { unix-compat ]; description = "shell-/perl- like (systems) programming in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -232008,8 +232753,8 @@ self: { unix ]; description = "Simple interface for shell scripting in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -232026,8 +232771,8 @@ self: { tagsoup text utf8-string xml ]; description = "Extra functionality for shellmate"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -232045,7 +232790,7 @@ self: { executableToolDepends = [ markdown-unlit ]; testHaskellDepends = [ base doctest Glob ]; description = "Out of the shell solution for scripting in Haskell"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "shellout" = callPackage @@ -232059,7 +232804,7 @@ self: { libraryHaskellDepends = [ async base stm text typed-process ]; executableHaskellDepends = [ async base stm text typed-process ]; description = "A threaded manager for Haskell that can run and stream external process output/err/exits"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "shelltestrunner" = callPackage @@ -232091,7 +232836,7 @@ self: { libraryHaskellDepends = [ base megaparsec text ]; testHaskellDepends = [ base hspec ]; description = "Parse strings into words, like a shell would"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "shelly" = callPackage @@ -232120,7 +232865,7 @@ self: { transformers-base unix unix-compat ]; description = "shell-like (systems) programming in Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "shelly-extra" = callPackage @@ -232136,7 +232881,7 @@ self: { async base hspec HUnit mtl SafeSemaphore shelly text ]; description = "shelly features that require extra dependencies"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "shentong" = callPackage @@ -232154,7 +232899,7 @@ self: { unordered-containers vector ]; description = "A Haskell implementation of the Shen programming language"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "shh" = callPackage @@ -232184,8 +232929,8 @@ self: { ]; testToolDepends = [ markdown-unlit ]; description = "Simple shell scripting from Haskell"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ maralorn ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ maralorn ]; }) {}; "shh-extras" = callPackage @@ -232199,7 +232944,7 @@ self: { libraryHaskellDepends = [ base hostname shh time ]; testHaskellDepends = [ base tasty ]; description = "Utility functions for using shh"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "shift" = callPackage @@ -232217,7 +232962,7 @@ self: { filepath optparse-applicative ]; description = "A tool to quickly switch between directories"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "shikensu" = callPackage @@ -232237,7 +232982,7 @@ self: { tasty-hunit text unordered-containers ]; description = "Run a sequence of functions on in-memory representations of files"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "shimmer" = callPackage @@ -232257,8 +233002,8 @@ self: { base bytestring containers filepath haskeline text ]; description = "The Reflective Lambda Machine"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -232274,8 +233019,8 @@ self: { base ghcjs-dom ghcjs-prim keycode mtl time transformers ]; description = "Declarative graphics for the browser using GHCJS"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {ghcjs-prim = null;}; @@ -232288,8 +233033,8 @@ self: { isLibrary = false; isExecutable = true; description = "Examples for the shine package"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -232304,8 +233049,8 @@ self: { libraryHaskellDepends = [ base ghcjs-dom keycode shine varying ]; testHaskellDepends = [ base ghcjs-dom keycode shine varying ]; description = "FRP interface for shine using the varying package"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "shivers-cfg" = callPackage @@ -232320,8 +233065,8 @@ self: { base containers directory HPDF language-dot mtl pretty process ]; description = "Implementation of Shivers' Control-Flow Analysis"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -232333,8 +233078,8 @@ self: { sha256 = "0ywb8bfkdpqqv2spb92j9rzx4fv5k1c7b65wj0zwnn9rp7ckq59v"; libraryHaskellDepends = [ base curl ]; description = "A very basic SOAP package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -232355,8 +233100,8 @@ self: { vector ]; description = "A haskell API binding for shopify.com"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -232368,7 +233113,7 @@ self: { sha256 = "02gcr6glp1kjs4l7ds8487dbblr1pw8nyq34i3rg1hskz0b83l6z"; libraryHaskellDepends = [ base ]; description = "Short-circuit values and expressions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "shortcut" = callPackage @@ -232380,20 +233125,20 @@ self: { revision = "1"; editedCabalFile = "14yp03pynaw3wwj6fnnr6ns7f74h2x7m75wvg3dkxc0dv6snl9l7"; libraryHaskellDepends = [ base ]; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "shortcut-links" = callPackage ({ mkDerivation, base, doctest, text }: mkDerivation { pname = "shortcut-links"; - version = "0.5.1.0"; - sha256 = "0gi3w7hh261nc2bmcwvagbgdazllk50sxn4vpzdhc2wb046mcida"; + version = "0.5.1.1"; + sha256 = "0567igvyl43fa06h7dq2lww0ing00n24xgmd25vhgx6kvnawnb90"; libraryHaskellDepends = [ base text ]; testHaskellDepends = [ base doctest ]; description = "Link shortcuts for use in text markup"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -232405,8 +233150,8 @@ self: { sha256 = "1srqbc2kx1zn0xlzv94y7kqdrflmdck3jy6d2fl75zhf11wilxw3"; libraryHaskellDepends = [ base text ]; description = "Shorten a variety of string-like types adding ellipsis"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -232421,7 +233166,7 @@ self: { base deepseq hspec hspec-expectations HUnit ]; description = "A HUnit/hspec assertion library to verify that an expression does not typecheck"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "show" = callPackage @@ -232446,7 +233191,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Combinators to write Show instances"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "show-please" = callPackage @@ -232461,7 +233206,7 @@ self: { base mtl parsec template-haskell th-orphans time ]; description = "A wrapper type V with improved Show instances"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "show-prettyprint" = callPackage @@ -232481,8 +233226,8 @@ self: { base containers doctest prettyprinter trifecta ]; description = "Robust prettyprinter for output of auto-generated Show instances"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -232494,7 +233239,7 @@ self: { sha256 = "1sppi8vj1cg7gwz7vagc1cry22b814wlwbm6jjj1c4d5f4kmpyyv"; libraryHaskellDepends = [ base ]; description = "convert types into string values in haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "showdown" = callPackage @@ -232508,8 +233253,8 @@ self: { enableSeparateDataOutput = true; executableHaskellDepends = [ base glade gtk random ]; description = "A simple gtk based Russian Roulette game"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -232533,7 +233278,7 @@ self: { utf8-string vector ]; description = "Clean up the formatting of 'show' output"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "shpider" = callPackage @@ -232549,8 +233294,8 @@ self: { tagsoup-parsec time url web-encodings ]; description = "Web automation library in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -232564,7 +233309,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base mtl ]; description = "A Haskell pattern splitter with emacs attachments"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "shqq" = callPackage @@ -232579,7 +233324,7 @@ self: { base parsec posix-escape process template-haskell unix ]; description = "Embed shell commands with interpolated Haskell variables, and capture output"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "shuffle" = callPackage @@ -232600,8 +233345,8 @@ self: { ]; executableHaskellDepends = [ base ]; description = "Shuffle tool for UHC"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -232613,7 +233358,7 @@ self: { sha256 = "1imidmpjs1ps6j9hzizhknfgw6zwb8qb8zphfknjv9zgjmwn15x4"; libraryHaskellDepends = [ base ]; description = "Initial project template from stack"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "shunyalib" = callPackage @@ -232624,7 +233369,7 @@ self: { sha256 = "1yh6xcfhjwb02y731s0lh1y6q63cdfmbnvxv3djylkf1hwdkqhpa"; libraryHaskellDepends = [ base ]; description = "Initial project template from stack"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "shwifty" = callPackage @@ -232642,8 +233387,8 @@ self: { uuid-types vector ]; description = "Generate swift types from haskell types"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -232657,8 +233402,8 @@ self: { base bytestring hsI2C time transformers ]; description = "An interface to the Silicon Labs Si5351 clock chip"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -232684,8 +233429,8 @@ self: { hmatrix JuicyPixels random random-shuffle split vector ]; description = "Machine Learning algorithms"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -232697,7 +233442,7 @@ self: { sha256 = "19zjwzh3i8ql5xz9rvmbz7n2l3z7dcq683ikrpvqx3wxnc06058m"; libraryHaskellDepends = [ base ]; description = "Sieve is an implementation of the Sieve abstract data type"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }) {}; "sifflet" = callPackage @@ -232720,8 +233465,8 @@ self: { base Cabal cairo containers fgl HUnit parsec process ]; description = "Simple, visual, functional language for learning about recursion"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -232740,8 +233485,8 @@ self: { ]; librarySystemDepends = [ gdk_x11 gtk_x11 ]; description = "Library of modules shared by sifflet and its tests and its exporters"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {gdk_x11 = null; gtk_x11 = null;}; @@ -232761,7 +233506,7 @@ self: { tasty-smallcheck ]; description = "Rounding rationals to significant digits and decimal places"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "sigma-ij" = callPackage @@ -232782,8 +233527,8 @@ self: { base combinat optparse-applicative time ]; description = "Thom polynomials of second order Thom-Boardman singularities"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -232806,8 +233551,8 @@ self: { tasty-quickcheck tasty-th universe-base ]; description = "Arithmetic over signs and sets of signs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -232836,8 +233581,8 @@ self: { secp256k1-haskell text universum unordered-containers ]; description = "Deterministic serialisation and signatures with proto-lens support"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -232857,7 +233602,7 @@ self: { lens-family proto-lens proto-lens-protoc proto-lens-runtime text ]; description = "Deterministic serialisation and signatures with proto-lens support"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "signal" = callPackage @@ -232871,7 +233616,7 @@ self: { libraryHaskellDepends = [ base unix ]; executableHaskellDepends = [ base ]; description = "Multiplatform signal support for Haskell"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "signals" = callPackage @@ -232887,8 +233632,8 @@ self: { observable-sharing operational-alacarte ]; description = "Synchronous signal processing for DSLs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -232906,7 +233651,7 @@ self: { hexstring scientific text unordered-containers vector ]; description = "Hmac sha256 signature json and http payload"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "signed-multiset" = callPackage @@ -232917,8 +233662,8 @@ self: { sha256 = "0pxi6g095axf9x6hsiqf0ilsjlws4zvl0pjfjamjyyl1wj82h747"; libraryHaskellDepends = [ base containers ]; description = "Multisets with negative membership"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -232931,7 +233676,7 @@ self: { libraryHaskellDepends = [ base deepseq directory ]; testHaskellDepends = [ base deepseq directory nanospec temporary ]; description = "Prevent or capture writing to stdout and other handles"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "silkscreen" = callPackage @@ -232942,8 +233687,8 @@ self: { sha256 = "0gmp71cipwc0ymydckhvw9g8q3j4pm8cq2la2rbvm0rr9z7c2l40"; libraryHaskellDepends = [ base prettyprinter ]; description = "Prettyprinting transformers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -232961,8 +233706,8 @@ self: { ]; testHaskellDepends = [ base quantification savage text ]; description = "A generator for different kinds of data"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -232974,8 +233719,8 @@ self: { sha256 = "0rmp715k7k41h7nnfg3ik28pf602jvh5wb23yzbpz0j8vkfysn8m"; libraryHaskellDepends = [ base ghc-prim primitive vector ]; description = "simple interface to GHC's SIMD instructions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -232994,7 +233739,7 @@ self: { ]; description = "stochastic simulation engine"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -233029,7 +233774,7 @@ self: { unordered-containers vector wai wai-extra ]; description = "A minimalist web framework for the WAI server interface"; - license = stdenv.lib.licenses.lgpl3; + license = lib.licenses.lgpl3; }) {}; "simple-actors" = callPackage @@ -233043,8 +233788,8 @@ self: { base chan-split contravariant mtl transformers ]; description = "A library for more structured concurrent programming, based on the Actor Model"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -233061,7 +233806,7 @@ self: { base directory filepath hlint process regex-posix ]; description = "A simple library for affine and vector spaces"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "simple-atom" = callPackage @@ -233072,8 +233817,8 @@ self: { sha256 = "1kqkaay3r03plxvvyan3hdgj2rfynygnisi6hrsjwqgj4nw6va17"; libraryHaskellDepends = [ base containers deepseq ]; description = "Atom (or symbol) datatype for fast comparision and sorting"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -233086,8 +233831,8 @@ self: { libraryHaskellDepends = [ base bytestring network ]; librarySystemDepends = [ bluetooth ]; description = "Simple Bluetooth API for Windows and Linux (bluez)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {bluetooth = null;}; @@ -233110,8 +233855,8 @@ self: { test-framework-quickcheck2 tuple uniplate ]; description = "A simple C value type"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -233125,7 +233870,7 @@ self: { base bytestring Cabal directory filepath ]; description = "Cabal file wrapper library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "simple-cmd" = callPackage @@ -233138,7 +233883,7 @@ self: { base directory extra filepath process unix ]; description = "Simple String-based process commands"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "simple-cmd-args" = callPackage @@ -233149,7 +233894,7 @@ self: { sha256 = "18dikz7hy61wgrbpgnxmgfp1i485hkhgrdnqbkzl2mrmmjn8p1zd"; libraryHaskellDepends = [ base optparse-applicative ]; description = "Simple command args parsing and execution"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "simple-conduit" = callPackage @@ -233180,8 +233925,8 @@ self: { transformers-base vector void ]; description = "A simple streaming I/O library based on monadic folds"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -233199,8 +233944,8 @@ self: { ]; testHaskellDepends = [ base hspec ]; description = "Simple config file parser generator"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -233216,8 +233961,8 @@ self: { base blaze-html hashable language-css unordered-containers ]; description = "simple binding of css and html"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -233233,8 +233978,8 @@ self: { base conduit-combinators http-client http-conduit mtl transformers ]; description = "A simple wrapper of http-conduit for file download"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -233256,7 +234001,7 @@ self: { testHaskellDepends = [ base ]; benchmarkHaskellDepends = [ base criterion mtl transformers ]; description = "A simple effect system that integrates with MTL"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "simple-enumeration" = callPackage @@ -233268,7 +234013,7 @@ self: { libraryHaskellDepends = [ base integer-gmp ]; testHaskellDepends = [ base doctest ]; description = "Finite or countably infinite sequences of values"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "simple-eval" = callPackage @@ -233282,8 +234027,8 @@ self: { libraryHaskellDepends = [ base parsec text transformers ]; executableHaskellDepends = [ base text ]; description = "Evaluate a Text to an Integer: \"1 + 1\" -> 2"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -233295,8 +234040,8 @@ self: { sha256 = "14fh3z3vqkmfgvgxja431ivm3lk1ksgrxaqjzz25wdc493j640ka"; libraryHaskellDepends = [ base bindings-dc1394 CV ]; description = "Simplified interface for firewire cameras"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -233314,7 +234059,7 @@ self: { ]; description = "Forms that configure themselves based on type"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "simple-genetic-algorithm" = callPackage @@ -233328,8 +234073,8 @@ self: { libraryHaskellDepends = [ base parallel random ]; executableHaskellDepends = [ base deepseq parallel random ]; description = "Simple parallel genetic algorithm implementation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -233350,7 +234095,7 @@ self: { base deepseq MonadRandom parallel random transformers ]; description = "Simple parallel genetic algorithm implementation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "simple-get-opt" = callPackage @@ -233361,7 +234106,7 @@ self: { sha256 = "0xr5gi22ifq6nw0q0w1rf66djsns4gfv2l9yjvxhbxr4j8bqmwik"; libraryHaskellDepends = [ base ]; description = "A simple library for processing command-line options"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "simple-index" = callPackage @@ -233376,8 +234121,8 @@ self: { base containers hashable safecopy unordered-containers ]; description = "Allows simple indexation on any data type"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -233398,7 +234143,7 @@ self: { ]; testHaskellDepends = [ base hspec microlens-platform text ]; description = "Simple log for Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "simple-log-syslog" = callPackage @@ -233409,8 +234154,8 @@ self: { sha256 = "1619jsxgz5afmwhjcixg54i7dhh8jl29cmziifjrg60mm4rf2c34"; libraryHaskellDepends = [ base hsyslog simple-log text ]; description = "Syslog backend for simple-log"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -233422,7 +234167,7 @@ self: { sha256 = "16ap76da3pvigl9gwpzb6miy13z5ypgh318cnqfyij0l5hrg4qg4"; libraryHaskellDepends = [ base fast-logger monad-logger mtl text ]; description = "A very simple but efficient logging framework"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "simple-logging" = callPackage @@ -233444,8 +234189,8 @@ self: { simple-effects string-conv text time vector ]; description = "Logging effect to plug into the simple-effects framework"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -233459,7 +234204,7 @@ self: { testHaskellDepends = [ base tasty tasty-hunit ]; benchmarkHaskellDepends = [ base criterion ]; description = "A simple LTL checker"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "simple-money" = callPackage @@ -233470,8 +234215,8 @@ self: { sha256 = "0bhiqnk7nh2y4qk7zkbfygna7kcg0gwqy8a5m70dqxs3f34h3fwf"; libraryHaskellDepends = [ base containers ]; description = "Simple library to handle and interexchange money"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -233491,8 +234236,8 @@ self: { base containers deepseq parallel random split ]; description = "Simple parallel neural networks implementation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -233514,8 +234259,8 @@ self: { mtl parsec system-filepath text text-render unordered-containers ]; description = "Simple parsing/pretty printing for Nix expressions"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -233527,7 +234272,7 @@ self: { sha256 = "1njzw6zjarlpjrmbkxwivr9azj8v1298bsd1ai3ddlmylwyhn24r"; libraryHaskellDepends = [ base ]; description = "The Observer pattern"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "simple-pascal" = callPackage @@ -233544,8 +234289,8 @@ self: { base containers filepath mtl parsec simple-stacked-vm ]; description = "Simplified Pascal language to SSVM compiler"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -233564,8 +234309,8 @@ self: { transformers-base ]; description = "simple pipeline library like conduit"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -233583,7 +234328,7 @@ self: { resource-pool simple transformers ]; description = "Connector package for integrating postgresql-orm with the Simple web framework"; - license = stdenv.lib.licenses.lgpl3; + license = lib.licenses.lgpl3; }) {}; "simple-reflect" = callPackage @@ -233594,7 +234339,7 @@ self: { sha256 = "0ayvrx5cm8n6db21jiyjmk5h93pw7cz1707hih09hlhk9jh5x0h7"; libraryHaskellDepends = [ base ]; description = "Simple reflection of expressions containing variables"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "simple-rope" = callPackage @@ -233605,8 +234350,8 @@ self: { sha256 = "187ghgn8nivvn5m8nsn0vrjh8mr6h7n6r1p1119gr4h3m2hpmrpl"; libraryHaskellDepends = [ base bytestring QuickCheck ]; description = "Memory-efficient strings with concatenation and splitting"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -233624,7 +234369,7 @@ self: { process resourcet unix ]; description = "Cross platform library for the sendfile system call"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "simple-server" = callPackage @@ -233641,7 +234386,7 @@ self: { ]; description = "Simple Server interface"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -233659,7 +234404,7 @@ self: { cookie cryptohash http-types simple transformers wai wai-extra ]; description = "Cookie-based session management for the Simple web framework"; - license = stdenv.lib.licenses.lgpl3; + license = lib.licenses.lgpl3; }) {}; "simple-sessions" = callPackage @@ -233670,7 +234415,7 @@ self: { sha256 = "08abag1im9gp2jpndd12sv911ca2qwh6frrz6qr87mj11xfhbky5"; libraryHaskellDepends = [ base indexed synchronous-channels ]; description = "A simple implementation of session types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "simple-smt" = callPackage @@ -233681,7 +234426,7 @@ self: { sha256 = "0bwb3r2gqm81nmf0hc0mgj8vp2a48kmzx0h7h42lprp4d4irwmy2"; libraryHaskellDepends = [ base process ]; description = "A simple way to interact with an SMT solver process"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "simple-sql-parser" = callPackage @@ -233695,7 +234440,7 @@ self: { libraryHaskellDepends = [ base mtl parsec pretty ]; testHaskellDepends = [ base mtl parsec pretty tasty tasty-hunit ]; description = "A parser for SQL"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "simple-src-utils" = callPackage @@ -233710,7 +234455,7 @@ self: { executableHaskellDepends = [ base extra text ]; testHaskellDepends = [ base extra tasty tasty-hunit text ]; description = "source code editing utilities"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "simple-stacked-vm" = callPackage @@ -233727,8 +234472,8 @@ self: { array base binary-state containers filepath mtl parsec ]; description = "Simple stacked virtual machine: assembler, disassembler, bytecode interpreter"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -233740,8 +234485,8 @@ self: { sha256 = "0p7rd8y6rhwg0ap6cib7l32bglvfkvbzg938pdwpb2ss6cv8b9zs"; libraryHaskellDepends = [ base ]; description = "Simple tabular-text formatter"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -233757,8 +234502,8 @@ self: { base bytestring cereal containers filepath time ]; description = "Simple, pure, file-system-free reading of tar files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -233777,7 +234522,7 @@ self: { aeson attoparsec base hspec HUnit scientific vector ]; description = "A basic template language for the Simple web framework"; - license = stdenv.lib.licenses.lgpl3; + license = lib.licenses.lgpl3; }) {}; "simple-text-format" = callPackage @@ -233793,7 +234538,7 @@ self: { base hspec microlens-platform text unordered-containers ]; description = "Simple text based format strings with named identifiers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "simple-ui" = callPackage @@ -233810,8 +234555,8 @@ self: { transformers vector vty ]; description = "UI library for terminal"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -233823,8 +234568,8 @@ self: { sha256 = "1dzsr15lq32dqsbhb639vzlx2d6m2kx0qax75ik2z765r5h9f9sa"; libraryHaskellDepends = [ base first-class-families ]; description = "Simple arithmetic with SI units using type-checked dimensional analysis"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -233842,8 +234587,8 @@ self: { ]; benchmarkHaskellDepends = [ base criterion vector ]; description = "Three-dimensional vectors of doubles with basic operations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -233856,8 +234601,8 @@ self: { libraryHaskellDepends = [ base lens ]; testHaskellDepends = [ base hspec lens ]; description = "Zippers made slightly easier"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -233871,7 +234616,7 @@ self: { libraryHaskellDepends = [ base ]; description = "Provides a more flexible getArgs function with better error reporting"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -233888,8 +234633,8 @@ self: { base containers either generic-deriving hspec lens text ]; description = "Short description of your package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -233906,8 +234651,8 @@ self: { ]; testHaskellDepends = [ base bytestring hspec HUnit knob ]; description = "Simple IRC Library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -233919,8 +234664,8 @@ self: { sha256 = "1cmzln3lya1scz10c6p33aqwy7djivc1dm9qkpkbwp2c8adq02bw"; libraryHaskellDepends = [ base bytestring simpleirc ]; description = "Lenses for simpleirc types"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -233935,7 +234680,7 @@ self: { libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base ]; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "simplemesh" = callPackage @@ -233946,7 +234691,7 @@ self: { sha256 = "1cq8h96kr1qnxqma7if3pmxcw05nrirpnw703r4cba75xwgwlqcl"; libraryHaskellDepends = [ base linear ]; description = "Generators for primitive meshes"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "simplenote" = callPackage @@ -233962,8 +234707,8 @@ self: { utf8-string ]; description = "Haskell interface for the simplenote API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -233982,8 +234727,8 @@ self: { base ghc-paths haskell-src-exts process uniplate ]; description = "A simplified Haskell prelude for teaching"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -233997,8 +234742,8 @@ self: { editedCabalFile = "09dd2d70jhkw3svsf4680f9250w4c7s9396w6dac2l2ypxxiq0p6"; libraryHaskellDepends = [ array base directory network old-time ]; description = "Very simple SMTP Client"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -234011,7 +234756,7 @@ self: { libraryHaskellDepends = [ base bytestring mtl ]; librarySystemDepends = [ libssh2 ]; description = "Simple wrapper around libssh2"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) libssh2;}; "simplest-sqlite" = callPackage @@ -234027,8 +234772,8 @@ self: { ]; librarySystemDepends = [ sqlite ]; description = "Simplest SQLite3 binding"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) sqlite;}; @@ -234046,7 +234791,7 @@ self: { base directory filepath mtl process random regex-compat split time ]; description = "A simple markup language that translates to LaTeX"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "simplex-basic" = callPackage @@ -234067,7 +234812,7 @@ self: { transformers ]; description = "Very basic simplex implementation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "simplistic-generics" = callPackage @@ -234082,7 +234827,7 @@ self: { base containers deepseq kind-apply mtl template-haskell ]; description = "Generic programming without too many type classes"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "simseq" = callPackage @@ -234097,7 +234842,7 @@ self: { executableHaskellDepends = [ base bio bytestring random ]; description = "Simulate sequencing with different models for priming and errors"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -234109,7 +234854,7 @@ self: { sha256 = "0a8414006gdya8b4dw38251kim3x2i5g7m03ga479ialghralrc8"; libraryHaskellDepends = [ base containers ]; description = "Load data organized in a tree"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "since" = callPackage @@ -234120,7 +234865,7 @@ self: { sha256 = "1zy1vwna8a0421l3jvdm8mg36xwgj4xl3p2xkf678ahbzk0179vs"; libraryHaskellDepends = [ base time ]; description = "Get the number of seconds since the last invocation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "sindre" = callPackage @@ -234147,7 +234892,7 @@ self: { ]; executablePkgconfigDepends = [ libXft ]; description = "A programming language for simple GUIs"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs.xorg) libXft;}; "single-tuple" = callPackage @@ -234160,7 +234905,7 @@ self: { testHaskellDepends = [ base hspec OneTuple Only ]; testToolDepends = [ hspec-discover ]; description = "a class for single tuple implementations"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "singlethongs" = callPackage @@ -234172,7 +234917,7 @@ self: { libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base ]; description = "Like singletons, but much smaller"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "singleton-bool" = callPackage @@ -234185,7 +234930,7 @@ self: { editedCabalFile = "118j0h29nqg2acqbzif2ffqnanjbwnqmv2kch9z7xiwqkz6iq8an"; libraryHaskellDepends = [ base dec ]; description = "Type level booleans"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "singleton-dict" = callPackage @@ -234196,8 +234941,8 @@ self: { sha256 = "125mb6j4gf3qcgmvjf6zibnzl7sw8jcmrh60nig16ahk55cjczic"; libraryHaskellDepends = [ base singletons ]; description = "Typelevel balanced search trees via a singletonized Data.Map"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -234209,7 +234954,7 @@ self: { sha256 = "0qmkqfj8rch9qcczs05lm5l3sx29slmqw156g4hhr3d735xg4nk1"; libraryHaskellDepends = [ base singletons ]; description = "Unary natural numbers relying on the singletons infrastructure"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "singleton-typelits" = callPackage @@ -234220,8 +234965,8 @@ self: { sha256 = "08xn7qv9kwhj9i69bpzigd76581rpq2jz410gmvr29g5ag1d0k08"; libraryHaskellDepends = [ base ]; description = "Singletons and induction over GHC TypeLits"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -234247,24 +234992,24 @@ self: { turtle ]; description = "A framework for generating singleton types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "singletons-presburger" = callPackage - ({ mkDerivation, base, ghc, ghc-typelits-presburger, reflection - , singletons + ({ mkDerivation, base, ghc, ghc-typelits-presburger, mtl + , reflection, singletons }: mkDerivation { pname = "singletons-presburger"; - version = "0.3.0.1"; - sha256 = "1j7azll9cjg5gcvpw8aq1hia1njg4bm8llwms1v941gwi7gk481m"; + version = "0.5.0.0"; + sha256 = "0pc95rg9vbcgzw6bzsj41vbz3h85p4lhf1ry8ik6l8c2nz3ga6bb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base ghc ghc-typelits-presburger reflection singletons + base ghc ghc-typelits-presburger mtl reflection singletons ]; description = "Presburger Arithmetic Solver for GHC Type-level natural numbers with Singletons package"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "singnal" = callPackage @@ -234275,8 +235020,8 @@ self: { sha256 = "16f0grf63wgkaab64mmqhxwwk50pzzy354i3v23lzw7s5x0bk8sj"; libraryHaskellDepends = [ base ]; description = "Singnal"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.agpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -234298,7 +235043,7 @@ self: { ]; description = "Multivariate polynomial factorization via bindings to Singular-factory"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {singular-factory = null;}; @@ -234310,8 +235055,8 @@ self: { sha256 = "04ny9450h2mlw1j0gn6a1vvgwsk3gbhhzshqv2sbcg5pwkzkdrzp"; libraryHaskellDepends = [ base ]; description = "An alternative to lazy I/O that doesn't conflate execution with evaluation"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -234332,7 +235077,7 @@ self: { test-framework-quickcheck2 ]; description = "siphash: a fast short input PRF"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "siphon" = callPackage @@ -234358,8 +235103,8 @@ self: { test-framework-hunit test-framework-quickcheck2 text ]; description = "Encode and decode CSV files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -234384,8 +235129,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Siren Tools for Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -234402,8 +235147,8 @@ self: { remote SHA transformers ]; description = "Sirkel, a Chord DHT"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -234415,7 +235160,7 @@ self: { sha256 = "0njb20w6kazsqgw61ykvfx3syqywv9frs7ch9bf2sr0i1d3b61bd"; libraryHaskellDepends = [ base lens taggy taggy-lens text ]; description = "Sitemap parser"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "sitemap-gen" = callPackage @@ -234431,7 +235176,7 @@ self: { base bytestring HUnit raw-strings-qq tasty tasty-hunit time ]; description = "Generate XML Sitemaps & Sitemap Indexes"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "sitepipe" = callPackage @@ -234451,8 +235196,8 @@ self: { unordered-containers yaml ]; description = "A simple to understand static site generator"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -234472,7 +235217,7 @@ self: { ]; executableHaskellDepends = [ base ]; description = "Sixel library to show images in a terminal emulator"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "sixfiguregroup" = callPackage @@ -234488,8 +235233,8 @@ self: { base directory doctest filepath parsec QuickCheck template-haskell ]; description = "A six figure group of time"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -234502,7 +235247,7 @@ self: { libraryHaskellDepends = [ base bytestring containers lens mtl ]; testHaskellDepends = [ base bytestring containers lens mtl ]; description = "An eDSL for writing 65(C)02 bytecode"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "size-based" = callPackage @@ -234519,8 +235264,8 @@ self: { base dictionary-sharing template-haskell testing-type-modifiers ]; description = "Sized functors, for size-based enumerations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -234528,24 +235273,26 @@ self: { ({ mkDerivation, base, constraints, containers, deepseq , equational-reasoning, ghc-typelits-knownnat , ghc-typelits-presburger, hashable, hspec, inspection-testing - , lens, mono-traversable, singletons, subcategories - , template-haskell, th-lift, these, type-natural, vector + , lens, mono-traversable, subcategories, template-haskell, th-lift + , these, type-natural, vector }: mkDerivation { pname = "sized"; - version = "0.8.0.0"; - sha256 = "1jwarhc0xi4h5860whi6s9n36qijlh6j6rnxx71dnlsrinfdsn2m"; + version = "1.0.0.0"; + sha256 = "0f6ql0yk0qi2wkzifhhhfn5z3wzh10d57ak9wrb4dv8s6mx34yk7"; + revision = "3"; + editedCabalFile = "13v3dkfdnzg2y7pfkn2dnvczd9y40izlm30vcssn2a5b1v7vy3bz"; libraryHaskellDepends = [ base constraints containers deepseq equational-reasoning ghc-typelits-knownnat ghc-typelits-presburger hashable lens - mono-traversable singletons subcategories these type-natural vector + mono-traversable subcategories these type-natural vector ]; testHaskellDepends = [ base containers hspec inspection-testing mono-traversable - singletons subcategories template-haskell th-lift vector + subcategories template-haskell th-lift type-natural vector ]; description = "Sized sequence data-types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "sized-grid" = callPackage @@ -234569,8 +235316,8 @@ self: { ]; testToolDepends = [ markdown-unlit ]; description = "Multidimensional grids with sized specified at compile time"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -234589,8 +235336,8 @@ self: { array base base-compat containers singletons ]; description = "Sized types in Haskell using the GHC Nat kind"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -234607,8 +235354,8 @@ self: { singletons template-haskell type-natural ]; description = "Size-parameterized vector types and functions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -234628,8 +235375,8 @@ self: { system-fileio system-filepath text unix ]; description = "Recursively show space (size and i-nodes) used in subdirectories"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -234651,8 +235398,8 @@ self: { ]; executableToolDepends = [ alex happy ]; description = "Simple JavaScript Profiler"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -234671,7 +235418,7 @@ self: { base bytestring cereal crypto-api filepath hspec tagged ]; description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well."; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "skeletal-set" = callPackage @@ -234689,8 +235436,8 @@ self: { ]; testToolDepends = [ tasty-discover ]; description = "Skeletal set - a set with equivalence relation different from equality"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -234709,8 +235456,8 @@ self: { process time ]; description = "a tool to access the OSX keychain"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -234729,8 +235476,8 @@ self: { transformers transformers-compat ]; description = "Manage project skeletons"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -234746,8 +235493,8 @@ self: { base blaze-html bytestring containers http-types text wai ]; description = "An overly complex Haskell web framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -234766,8 +235513,8 @@ self: { wreq xml-conduit ]; description = "A MyAnimeList.net client."; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -234784,8 +235531,8 @@ self: { async base bytestring deque envy hspec network websockets ]; description = "A very quick-and-dirty WebSocket server"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -234799,7 +235546,7 @@ self: { testHaskellDepends = [ base tasty tasty-hunit ]; benchmarkHaskellDepends = [ base criterion ]; description = "An implementation of pure skip lists"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "skip-var" = callPackage @@ -234812,7 +235559,7 @@ self: { editedCabalFile = "0vl2y19l7xhlq08f91ggycj4imfdxvkj2fsaz8ifc0waxk3q7ja8"; libraryHaskellDepends = [ base ]; description = "Skip variables"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "skulk" = callPackage @@ -234824,8 +235571,8 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "Eclectic collection of utility functions"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -234848,8 +235595,8 @@ self: { base conduit-extra optparse-generic preamble shakers ]; description = "Skylark client"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -234872,7 +235619,7 @@ self: { pretty-show text ]; description = "syntax highlighting library"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }) {}; "skylighting-core" = callPackage @@ -234903,7 +235650,7 @@ self: { base containers criterion directory filepath text ]; description = "syntax highlighting library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "skylighting-extensions" = callPackage @@ -234918,7 +235665,7 @@ self: { base containers skylighting skylighting-modding text ]; description = "Customized Skylighting syntax highlighters"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "skylighting-lucid" = callPackage @@ -234931,8 +235678,8 @@ self: { base containers lucid skylighting-core text ]; description = "Lucid support for Skylighting"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -234944,7 +235691,7 @@ self: { sha256 = "11wmasn3hhva7jxmrjigbgvhrsnwvrx1ksbhjhdp46ii2jnyk0i3"; libraryHaskellDepends = [ base containers skylighting-core text ]; description = "Utilities for modifying Skylighting syntaxes"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "skype4hs" = callPackage @@ -234961,8 +235708,8 @@ self: { time transformers-base word8 X11 ]; description = "Skype Desktop API binding for Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -234982,8 +235729,8 @@ self: { haskell98 IfElse old-locale regex-pcre time utf8-string ]; description = "Export Skype chat logs to text files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {ghc-binary = null;}; @@ -235000,8 +235747,8 @@ self: { transformers ]; description = "Haskell API for interacting with Slack"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -235025,7 +235772,7 @@ self: { executableHaskellDepends = [ base lens mtl text ]; testHaskellDepends = [ base ]; description = "Bindings to the Slack RTM API"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "slack-notify-haskell" = callPackage @@ -235044,8 +235791,8 @@ self: { ]; executableHaskellDepends = [ base ]; description = "Slack notifier for Haskell project"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -235071,7 +235818,7 @@ self: { aeson base bytestring interpolate lens lens-aeson mtl network-uri text transformers wreq ]; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "slack-verify" = callPackage @@ -235089,7 +235836,7 @@ self: { base base16-bytestring bytestring cryptonite hspec ]; description = "Slack API Request Verification HMAC"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "slack-web" = callPackage @@ -235112,8 +235859,8 @@ self: { time ]; description = "Bindings for the Slack web API"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -235141,7 +235888,7 @@ self: { string-conversions unordered-containers ]; description = "A note taking CLI tool"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "slave-thread" = callPackage @@ -235161,8 +235908,8 @@ self: { tasty-hunit tasty-quickcheck ]; description = "A fundamental solution to ghost threads and silent exceptions"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -235177,7 +235924,7 @@ self: { libraryHaskellDepends = [ base time ]; executableHaskellDepends = [ base time ]; description = "zZzzZz"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }) {}; "slice-cpp-gen" = callPackage @@ -235195,7 +235942,7 @@ self: { language-slice MissingH ]; description = "Generate C++ skeletons from slice files"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "sliceofpy" = callPackage @@ -235219,8 +235966,8 @@ self: { template-haskell text ]; description = "Python-ish slicing traversals for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -235230,14 +235977,14 @@ self: { }: mkDerivation { pname = "slick"; - version = "1.0.1.1"; - sha256 = "1n1a7jpn37dzfmk9z51d6yhg2iaraqw55qnlap0d6zk1lnc3drib"; + version = "1.1.0.0"; + sha256 = "1a6zsp308ikqzdxy26phb04bk4hr8lmw1i73mwydg65yd42c8zjx"; libraryHaskellDepends = [ aeson base bytestring directory extra mustache pandoc shake text unordered-containers ]; description = "A quick & easy static site builder built with shake and pandoc"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "slidemews" = callPackage @@ -235256,7 +236003,7 @@ self: { ]; description = "ws convert markdown to reveal-js"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -235272,8 +236019,8 @@ self: { ]; testHaskellDepends = [ base hspec ]; description = "Functional reactive user interface programming"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -235294,8 +236041,8 @@ self: { tasty-hedgehog tasty-hunit text ]; description = "SLIP-0032: Extended serialization format for BIP-32 wallets"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -235308,7 +236055,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest Glob ]; description = "Sized list"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "sloane" = callPackage @@ -235329,8 +236076,8 @@ self: { optparse-applicative resourcet stringsearch text transformers ]; description = "A command line interface to Sloane's OEIS"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -235349,7 +236096,7 @@ self: { base Chart Chart-cairo colour data-default-class lens ]; description = "Visualize mathematical function's slope fields"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "slot-lambda" = callPackage @@ -235365,8 +236112,8 @@ self: { template-haskell vector ]; description = "Write lambdas without naming the parameters"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -235378,8 +236125,8 @@ self: { sha256 = "0x3iw1mqbl3q723kkxr6b0i1hxcfb4sink4kmg6xnpzd3hwaspq9"; libraryHaskellDepends = [ base mtl process ]; description = "Testing for minimal strictness"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -235392,7 +236139,7 @@ self: { libraryHaskellDepends = [ base primitive vector ]; testHaskellDepends = [ base hspec primitive vector ]; description = "Pure Haskell slotmap implementation over ST or IO"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "slug" = callPackage @@ -235413,11 +236160,26 @@ self: { base exceptions hspec http-api-data path-pieces QuickCheck text ]; description = "Type-safe slugs for Yesod ecosystem"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; + "slugify" = callPackage + ({ mkDerivation, base, hspec, hspec-discover, QuickCheck, text + , unicode-transforms + }: + mkDerivation { + pname = "slugify"; + version = "0.1.0.0"; + sha256 = "1bsb9jhd85zpa27wfv365axg9qx973wqi1nlnjds262i0ywdc45s"; + libraryHaskellDepends = [ base text unicode-transforms ]; + testHaskellDepends = [ base hspec QuickCheck text ]; + testToolDepends = [ hspec-discover ]; + description = "Convert text into slugs"; + license = lib.licenses.bsd3; + }) {}; + "slynx" = callPackage ({ mkDerivation, async, attoparsec, base, bytestring, containers , elynx-markov, elynx-seq, elynx-tools, elynx-tree, hmatrix @@ -235437,8 +236199,8 @@ self: { ]; executableHaskellDepends = [ base ]; description = "Handle molecular sequences"; - license = stdenv.lib.licenses.gpl3Plus; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -235451,8 +236213,8 @@ self: { libraryHaskellDepends = [ base bytebuild byteslice ]; doHaddock = false; description = "Serialize to bytes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -235464,8 +236226,8 @@ self: { sha256 = "16fgxsg8grxhqx6d4s3mm89qbkw2k72qvr4r701ih1i8gmf1ms1z"; libraryHaskellDepends = [ base bytestring deepseq hashable ]; description = "low-level unboxed arrays, with minimal features"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -235488,18 +236250,18 @@ self: { attoparsec base containers data-default parsec text ]; description = "Flatten camel case text in LaTeX files"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "smallcheck" = callPackage ({ mkDerivation, base, logict, mtl, pretty }: mkDerivation { pname = "smallcheck"; - version = "1.2.0"; - sha256 = "1y6rh1g7pi99jqq32xdv79yli9hmbfwjqg8ix1z2i2qkqqkr5iyn"; + version = "1.2.1"; + sha256 = "0sf87zjlrgjw7q6a0499g2ywx66zvpv6rg6953fjc18fnl8rs7z4"; libraryHaskellDepends = [ base logict mtl pretty ]; description = "A property-based testing library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "smallcheck-kind-generics" = callPackage @@ -235516,8 +236278,8 @@ self: { testHaskellDepends = [ base ]; benchmarkHaskellDepends = [ base gauge ]; description = "See README for more info"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -235529,8 +236291,8 @@ self: { sha256 = "1jyn1bsn78jsnf5lzscvqzbf68ljf82vclq0k9aba58r2dayxn47"; libraryHaskellDepends = [ base smallcheck smallcheck-series ]; description = "SmallCheck properties for common laws"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -235546,8 +236308,8 @@ self: { base lens smallcheck smallcheck-series transformers ]; description = "SmallCheck properties for lens"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -235567,7 +236329,7 @@ self: { base doctest Glob smallcheck tasty tasty-hunit tasty-smallcheck ]; description = "Extra SmallCheck series and utilities"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "smallpt-hs" = callPackage @@ -235580,8 +236342,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base vector ]; description = "A Haskell port of the smallpt path tracer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -235597,8 +236359,8 @@ self: { base bytestring deepseq hashable smallarray text utf8-string ]; description = "A Unicode text type, optimized for low memory overhead"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -235614,7 +236376,7 @@ self: { libraryHaskellDepends = [ base bytestring random text uuid ]; testHaskellDepends = [ base bytestring QuickCheck ]; description = "Utilities for the Smaoin semantic information model"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "smap" = callPackage @@ -235645,8 +236407,8 @@ self: { strict text transformers unordered-containers ]; description = "A command line tool for working with sets and maps"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -235660,8 +236422,8 @@ self: { base bytestring containers template-haskell ]; description = "group strings or bytestrings by words in common"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -235682,8 +236444,8 @@ self: { base containers generic-deriving ghc-prim mtl QuickCheck random ]; description = "A smarter QuickCheck"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -235695,8 +236457,8 @@ self: { sha256 = "1082siphwd4xx9akqip78kzpqi19i3l53h0s2vghhdm5lwplcvlv"; libraryHaskellDepends = [ base template-haskell ]; description = "A package exposing a helper function for generating smart constructors"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -235722,7 +236484,7 @@ self: { text ]; description = "Haskell Behavior Tree Library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "smartword" = callPackage @@ -235738,8 +236500,8 @@ self: { base haskell98 pretty unix utf8-string ]; description = "Web based flash card for Word Smart I and II vocabularies"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -235756,7 +236518,7 @@ self: { ]; testHaskellDepends = [ base ]; description = "Combinators for Maybe types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "smash-aeson" = callPackage @@ -235769,7 +236531,7 @@ self: { editedCabalFile = "1y0k6gz9qlr98f543607zkx6a97fnzh3zrbi2b59rlljp0rjvdw8"; libraryHaskellDepends = [ aeson base smash unordered-containers ]; description = "Aeson support for the smash library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "smash-lens" = callPackage @@ -235781,7 +236543,7 @@ self: { libraryHaskellDepends = [ base lens smash ]; testHaskellDepends = [ base ]; description = "Optics for the `smash` library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "smash-microlens" = callPackage @@ -235795,7 +236557,7 @@ self: { libraryHaskellDepends = [ base microlens smash ]; testHaskellDepends = [ base ]; description = "Optics for the `smash` library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "smash-optics" = callPackage @@ -235806,7 +236568,7 @@ self: { sha256 = "1jf60vx8hlmyjgap91fvwn0p0hnazpcimshhkz5lsys0ynd4pcwh"; libraryHaskellDepends = [ base optics-core smash ]; description = "Optics for the `smash` library using `optics-core`"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "smcdel" = callPackage @@ -235832,8 +236594,8 @@ self: { testHaskellDepends = [ base containers hspec QuickCheck ]; benchmarkHaskellDepends = [ base criterion time ]; description = "Symbolic Model Checking for Dynamic Epistemic Logic"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -235845,8 +236607,8 @@ self: { sha256 = "1d3kjyskwzc7p5bi6pv9yxfa6l6dqkkqc24dmmxl5wx7vmbfma25"; libraryHaskellDepends = [ base ]; description = "A library for Secure Multi-Execution in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -235865,8 +236627,8 @@ self: { base doctest exceptions free Glob hspec mtl process QuickCheck text transformers yaml ]; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -235878,8 +236640,8 @@ self: { sha256 = "0k1yy1bhgavsmm40zz1i6ihyfksb6fr06wxlbqyj1y0igmrrrlrw"; libraryHaskellDepends = [ base megaparsec text ]; testHaskellDepends = [ base hspec megaparsec QuickCheck text ]; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -235891,8 +236653,8 @@ self: { sha256 = "0ylhzs0lc7fxp54s74slffkr8rnasy4pak4snyi5jnvma0wiz55g"; libraryHaskellDepends = [ base bytesmith primitive ]; description = "Parse arrays of tokens"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -235916,8 +236678,8 @@ self: { smith-client text transformers transformers-bifunctors unix ]; description = "Command line tool for <https://smith.st/ Smith>."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -235941,8 +236703,8 @@ self: { transformers ]; description = "API client for <https://smith.st/ Smith>."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -235955,7 +236717,7 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base linear text vector ]; description = "Smooth curves via several interpolation modes"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "smsaero" = callPackage @@ -235971,8 +236733,8 @@ self: { servant-client servant-docs text time ]; description = "SMSAero API and HTTP client based on servant library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -235988,7 +236750,7 @@ self: { testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; benchmarkHaskellDepends = [ base criterion ]; description = "Interface to Satisfiability Modulo Theories solvers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "smt-lib" = callPackage @@ -235999,8 +236761,8 @@ self: { sha256 = "1phm50pabahrpxrzp25mfhpafzhp4hz8cxp6fp93rwh4cl7cckky"; libraryHaskellDepends = [ array base directory polyparse ]; description = "Parsing and printing SMT-LIB"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -236013,8 +236775,8 @@ self: { libraryHaskellDepends = [ base parsec text ]; testHaskellDepends = [ base HUnit parsec text ]; description = "A Haskell parser for SMT-LIB version 2.6"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -236026,7 +236788,7 @@ self: { sha256 = "0bws90179vl2ycvnsmi0zni1vg71bdlhkgg0qdvqmls2rjyh5q3j"; libraryHaskellDepends = [ base pretty ]; description = "A library for working with the SMTLIB format"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "smtlib2" = callPackage @@ -236042,8 +236804,8 @@ self: { template-haskell ]; description = "A type-safe interface to communicate with an SMT solver"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -236060,8 +236822,8 @@ self: { mtl smtlib2 smtlib2-pipe text ]; description = "Dump the communication with an SMT solver for debugging purposes"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -236083,8 +236845,8 @@ self: { base Cabal cabal-test-quickcheck smtlib2 smtlib2-quickcheck ]; description = "A type-safe interface to communicate with an SMT solver"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -236100,8 +236862,8 @@ self: { base containers dependent-map dependent-sum mtl QuickCheck smtlib2 ]; description = "Helper functions to create SMTLib expressions in QuickCheck"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -236113,8 +236875,8 @@ self: { sha256 = "12828gfip43pwjwnhd0smvkz1ar71gbp4lkv3njli6yp5dbcwfi5"; libraryHaskellDepends = [ base dependent-sum mtl smtlib2 time ]; description = "Get timing informations for SMT queries"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -236133,7 +236895,7 @@ self: { text ]; description = "Simple email sending via SMTP"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "smtp-mail-ng" = callPackage @@ -236153,8 +236915,8 @@ self: { x509-system ]; description = "An SMTP client EDSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -236169,7 +236931,7 @@ self: { executableHaskellDepends = [ base haskell98 network process ]; description = "Listen for SMTP traffic and send it to an MTA script"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "smtps-gmail" = callPackage @@ -236187,8 +236949,8 @@ self: { tls transformers ]; description = "Gmail SMTP Client"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -236211,8 +236973,8 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base directory filepath ]; description = "GHC Source Plugin that helps to manage imports"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -236223,8 +236985,8 @@ self: { }: mkDerivation { pname = "smuggler2"; - version = "0.3.6.1"; - sha256 = "1wr7qskz75dr0zzhg5gzpjci70rhlcwzlx3cavii7199kvm8axhd"; + version = "0.3.6.2"; + sha256 = "1lkz9dpwz0pgc134wcpnb00r6ql4l19bbl5zqszm4wsrw92npd56"; libraryHaskellDepends = [ base containers directory filepath ghc ghc-boot ghc-exactprint split syb @@ -236234,8 +236996,8 @@ self: { typed-process ]; description = "GHC Source Plugin that helps to minimise imports and generate explicit exports"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -236249,8 +237011,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base random split terminal-size ]; description = "A basic console snake game"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -236262,8 +237024,8 @@ self: { sha256 = "1iy3m20ldc98agdi7n71ik8k2f62ybfg719z79lcf8pzynbfsrbd"; libraryHaskellDepends = [ base GLUT OpenGL random ]; description = "Snake Game Using OpenGL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -236299,7 +237061,7 @@ self: { unordered-containers xmlhtml ]; description = "Top-level package for the Snap Web Framework"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "snap-accept" = callPackage @@ -236314,8 +237076,8 @@ self: { base bytestring case-insensitive http-media snap-core ]; description = "Accept header branching for the Snap web framework"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -236327,7 +237089,7 @@ self: { sha256 = "1v3izzvxadjplir47ipi087sj6fcmfj5ivlhbkpp9ld7vj8sv2hi"; doHaddock = false; description = "None"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "snap-auth-cli" = callPackage @@ -236347,8 +237109,8 @@ self: { utf8-string ]; description = "Command-line tool to manage Snap AuthManager database"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -236360,7 +237122,7 @@ self: { sha256 = "0hc8k0cviq7ayjymsfr435bnfw35pa4f80i7x4ypn2539fykavmk"; libraryHaskellDepends = [ base blaze-html snap-core ]; description = "blaze-html integration for Snap"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "snap-blaze-clay" = callPackage @@ -236371,8 +237133,8 @@ self: { sha256 = "05zi9rjd37xznjj8yhm5har12mfrclsrwd9fbcwh5ngccd7h7fiy"; libraryHaskellDepends = [ base blaze-html clay snap-core ]; description = "blaze-html-clay integration for Snap"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -236386,8 +237148,8 @@ self: { base configurator text unordered-containers ]; description = "Methods to manipulate Configurator objects for Snap & Snaplets"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -236422,7 +237184,7 @@ self: { vector zlib ]; description = "Snap: A Haskell Web Framework (core interfaces and types)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "snap-cors" = callPackage @@ -236434,7 +237196,7 @@ self: { libraryHaskellDepends = [ snap-core ]; doHaddock = false; description = "Add CORS headers to Snap applications"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "snap-elm" = callPackage @@ -236450,7 +237212,7 @@ self: { transformers ]; description = "Serve Elm files through the Snap web framework"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "snap-error-collector" = callPackage @@ -236466,8 +237228,8 @@ self: { transformers ]; description = "Collect errors in batches and dispatch them"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -236499,8 +237261,8 @@ self: { tasty-quickcheck ]; description = "A collection of useful helpers and utilities for Snap web applications"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -236516,7 +237278,7 @@ self: { attoparsec base bytestring containers snap-core ]; description = "Language handling for Snap"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "snap-loader-dynamic" = callPackage @@ -236532,7 +237294,7 @@ self: { time unix ]; description = "Snap dynamic loader"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "snap-loader-static" = callPackage @@ -236543,7 +237305,7 @@ self: { sha256 = "0598xvy2jk6xc4xhhjqy2v8f5s7k8x13v4wadw8r37h81jpbic00"; libraryHaskellDepends = [ base template-haskell ]; description = "Snap static loader"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "snap-predicates" = callPackage @@ -236569,7 +237331,7 @@ self: { ]; description = "Declarative routing for Snap"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "snap-routes" = callPackage @@ -236586,8 +237348,8 @@ self: { mime-types path-pieces random snap template-haskell text ]; description = "Typesafe URLs for Snap applications"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -236630,7 +237392,7 @@ self: { vector ]; description = "A web server for the Snap Framework"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "snap-stream" = callPackage @@ -236645,8 +237407,8 @@ self: { attoparsec base bytestring io-streams snap-core ]; description = "Streaming Snap handlers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -236668,7 +237430,7 @@ self: { hashable old-time template-haskell text ]; description = "Scaffolding CLI for the Snap Framework"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "snap-testing" = callPackage @@ -236691,8 +237453,8 @@ self: { transformers ]; description = "A library for BDD-style testing with the Snap Web Framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -236710,8 +237472,8 @@ self: { snap-core text xmlhtml ]; description = "Snap Framework utilities"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -236727,8 +237489,8 @@ self: { base bytestring heist mtl snap snap-core text web-routes xmlhtml ]; description = "Type safe URLs for Snap"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -236742,8 +237504,8 @@ self: { acid-state base mtl snap text transformers ]; description = "acid-state snaplet for Snap Framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -236768,8 +237530,8 @@ self: { transformers unordered-containers xmlhtml ]; description = "Generic action log snaplet for the Snap Framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -236787,8 +237549,8 @@ self: { resource-pool snap transformers ]; description = "Snap framework snaplet for the AMQP library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -236809,8 +237571,8 @@ self: { vector ]; description = "Provides an Acid-State backend for the Auth Snaplet"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -236828,8 +237590,8 @@ self: { snap snap-core ]; description = "CoffeeScript for Snap, auto-compilation and pre-compilation"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -236846,8 +237608,8 @@ self: { utf8-string ]; description = "A Snaplet for CSS minification"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -236871,8 +237633,8 @@ self: { transformers unordered-containers uri-bytestring xmlhtml ]; description = "Alternate authentication snaplet"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -236889,8 +237651,8 @@ self: { unordered-containers ]; description = "DEPRECATED! You should use standard Snap >= 0.9 \"environments\" functionality. It provided ability to easly read configuration based on given app environment given at command line, envs are defined in app configuration file"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -236910,8 +237672,8 @@ self: { snap-core transformers ]; description = "Fay integration for Snap with request- and pre-compilation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -236928,7 +237690,7 @@ self: { string-conversions transformers ]; description = "Serve javascript files compiled with GHCJS"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "snaplet-hasql" = callPackage @@ -236945,8 +237707,8 @@ self: { hasql-backend lens mtl snap text time ]; description = "A Hasql snaplet"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -236962,8 +237724,8 @@ self: { base haxl MonadCatchIO-transformers snap transformers ]; description = "Snaplet for Facebook's Haxl"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -236984,8 +237746,8 @@ self: { unordered-containers ]; description = "HDBC snaplet for Snap Framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -237002,8 +237764,8 @@ self: { base configurator hslogger mtl snap transformers ]; description = "Snap framework snaplet for the Logger API library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -237027,7 +237789,7 @@ self: { snap-loader-static text transformers xmlhtml ]; description = "snaplet-i18n"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "snaplet-influxdb" = callPackage @@ -237045,8 +237807,8 @@ self: { monad-control mtl network snap text transformers ]; description = "Snap framework snaplet for the InfluxDB library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -237063,7 +237825,7 @@ self: { ]; testHaskellDepends = [ base hspec-snap hspec2 lens snap text ]; description = "Lexical Style Sheets - Snap Web Framework adaptor"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "snaplet-mandrill" = callPackage @@ -237079,8 +237841,8 @@ self: { base configurator mandrill mtl network snap transformers ]; description = "Snap framework snaplet for the Mandrill API library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -237100,8 +237862,8 @@ self: { snap-core template-haskell text time ]; description = "Snap Framework MongoDB support as Snaplet"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -237116,8 +237878,8 @@ self: { base lens mongoDB mtl snap text transformers ]; description = "Minimalistic MongoDB Snaplet"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -237138,8 +237900,8 @@ self: { resource-pool-catchio snap text transformers unordered-containers ]; description = "mysql-simple snaplet for the Snap Framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -237165,8 +237927,8 @@ self: { test-framework-hunit text ]; description = "snaplet-oauth"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -237189,8 +237951,8 @@ self: { time transformers unordered-containers ]; description = "persistent snaplet for the Snap Framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -237215,8 +237977,8 @@ self: { transformers transformers-base unordered-containers ]; description = "postgresql-simple snaplet for the Snap Framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -237233,8 +237995,8 @@ self: { base configurator mtl postmark snap text transformers ]; description = "Postmark snaplet for the Snap Framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -237251,8 +238013,8 @@ self: { string-conv text transformers ]; description = "Automatic (re)compilation of purescript projects"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -237270,8 +238032,8 @@ self: { lens MonadCatchIO-transformers mtl snap text transformers ]; description = "A ReCAPTCHA verification snaplet with Heist integration and connection sharing"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -237291,8 +238053,8 @@ self: { network snap snap-core text time transformers unordered-containers ]; description = "Redis support for Snap Framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -237312,8 +238074,8 @@ self: { text utf8-string websockets websockets-snap ]; description = "CRUD for JSON data with Redis storage"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -237331,8 +238093,8 @@ self: { lens mtl snap snap-accept snap-core text utf8-string xmlhtml ]; description = "REST resources for the Snap web framework"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -237350,8 +238112,8 @@ self: { riak-protobuf snap snap-core time transformers ]; description = "A Snaplet for the Riak database"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -237369,8 +238131,8 @@ self: { snap-core transformers ]; description = "Sass integration for Snap with request- and pre-compilation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -237387,8 +238149,8 @@ self: { time unordered-containers ]; description = "Modularised session state for Snaplets, in a Snaplet"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -237405,8 +238167,8 @@ self: { sednaDBXML snap ]; description = "Snaplet for Sedna Bindings. Essentailly a rip of snaplet-hdbc."; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -237423,8 +238185,8 @@ self: { snap text transformers ]; description = "Snaplet for the ses-html package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -237455,8 +238217,8 @@ self: { text time transformers unordered-containers ]; description = "sqlite-simple snaplet for the Snap Framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -237476,8 +238238,8 @@ self: { snaplet-sqlite-simple sqlite-simple text time unordered-containers ]; description = "Snaplet for JWT authentication with snaplet-sqlite-simple"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -237496,8 +238258,8 @@ self: { text text-format transformers xmlhtml ]; description = "Stripe snaplet for the Snap Framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -237514,8 +238276,8 @@ self: { network snap snap-core ]; description = "Snaplet for Snap Framework enabling developers to administrative tasks akin to Rake tasks from Ruby On Rails framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -237533,8 +238295,8 @@ self: { PSQueue random regex-posix snap snap-core time ]; description = "Typed session snaplets and continuation-based programming for the Snap web framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -237561,8 +238323,8 @@ self: { unordered-containers xmlhtml ]; description = "A snaplet that communicates with wordpress over its api"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -237581,7 +238343,7 @@ self: { test-framework-quickcheck2 ]; description = "Bindings to the Google Snappy library for fast compression/decompression"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) snappy;}; "snappy-conduit" = callPackage @@ -237592,8 +238354,8 @@ self: { sha256 = "0k93v3dyv7818xy45l7i5wykfmnwyqkykxjh6xr937zh8a4qapfi"; libraryHaskellDepends = [ base bytestring conduit snappy ]; description = "Conduit bindings for Snappy (see snappy package)"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -237605,7 +238367,7 @@ self: { sha256 = "0nxmaj84y48zsagdx3nzc8c845yziwgvx27zafc59zajsfqgqkh6"; libraryHaskellDepends = [ array base binary bytestring snappy ]; description = "Snappy Framing Format in Haskell"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "snappy-iteratee" = callPackage @@ -237616,8 +238378,8 @@ self: { sha256 = "17jwsvw7ik2bjanmzw4h72mdjaz031b5a6hi7cjz4ba1yjkiqnmk"; libraryHaskellDepends = [ base bytestring iteratee snappy ]; description = "An enumeratee that uses Google's snappy compression library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -237632,7 +238394,7 @@ self: { base binary bytestring snappy snappy-framing ]; description = "Lazy bytestring compression and decompression"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "sndfile-enumerators" = callPackage @@ -237650,8 +238412,8 @@ self: { word24 ]; description = "Audio file reading/writing"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -237667,8 +238429,8 @@ self: { base classy-prelude containers lens linear mtl ncurses transformers ]; description = "Tiny, declarative wrapper around ncurses"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -237680,8 +238442,8 @@ self: { sha256 = "0yyway7rhx1x2p6mxfrs6xw22ylc780hsppbq2xkd4rpd1cdw54n"; libraryHaskellDepends = [ base haste-compiler ]; description = "A compositional web UI library, which draws to a Canvas element"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; }) {}; "snipcheck" = callPackage @@ -237692,8 +238454,8 @@ self: { sha256 = "1x9jjfznvzz9pa4n54q6xja0axifnlgbp9aw93hvcr4w8f94gfp0"; libraryHaskellDepends = [ base containers pandoc process text ]; description = "Markdown tester"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -237707,7 +238469,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base parsec ]; description = "Extracts labeled snippets of code to files"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "snm" = callPackage @@ -237728,8 +238490,8 @@ self: { base containers directory filepath HsSyck parsec safe spoonutil ]; description = "The Simple Nice-Looking Manual Generator"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -237748,8 +238510,8 @@ self: { network stm vector ]; description = "SNMP protocol library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -237772,8 +238534,8 @@ self: { optparse-applicative parsec random ]; description = "Strategic board game of medium complexity"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -237786,8 +238548,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base binary bytestring mps ]; description = "encode any binary instance to white space"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -237810,7 +238572,7 @@ self: { base criterion language-haskell-extract text ]; description = "Bindings to the Snowball library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "snowflake" = callPackage @@ -237823,7 +238585,7 @@ self: { editedCabalFile = "1y5v3nsin8iyxvh0abfhs7ma75p5zjvha0lp41801pdiikacfzha"; libraryHaskellDepends = [ base time ]; description = "A loose port of Twitter Snowflake to Haskell. Generates arbitrary precision, unique, time-sortable identifiers."; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "snowflake-core" = callPackage @@ -237835,8 +238597,8 @@ self: { libraryHaskellDepends = [ base time-exts ]; testHaskellDepends = [ base QuickCheck ]; description = "twitter's snowflake"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -237855,8 +238617,8 @@ self: { snowflake-core ]; description = "snowflake http server"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -237874,7 +238636,7 @@ self: { base bytestring containers gl-capture GLUT OpenGL OpenGLRaw random ]; description = "randomized fractal snowflakes demo"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "snowtify" = callPackage @@ -237890,8 +238652,8 @@ self: { base either safe safe-exceptions text turtle ]; description = "snowtify send your result of `stack build` (`stack test`) to notify-daemon :dog2:"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -237915,7 +238677,7 @@ self: { xml-conduit-writer ]; description = "SOAP client tools"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "soap-openssl" = callPackage @@ -237933,7 +238695,7 @@ self: { http-client-openssl soap text ]; description = "TLS-enabled SOAP transport (using openssl bindings)"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "soap-tls" = callPackage @@ -237952,7 +238714,7 @@ self: { http-client-tls soap text tls x509 x509-store x509-validation ]; description = "TLS-enabled SOAP transport (using tls package)"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "sock2stream" = callPackage @@ -237970,7 +238732,7 @@ self: { ]; description = "Tunnel a socket over a single datastream (stdin/stdout)"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "sockaddr" = callPackage @@ -237981,7 +238743,7 @@ self: { sha256 = "1h74k5pipv9314y1d2wgpwgvyxfp6pcnq5051fdqr1shqlkpwbs2"; libraryHaskellDepends = [ base byteorder bytestring network ]; description = "Printing SockAddr"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "socket" = callPackage @@ -237997,7 +238759,7 @@ self: { async base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck ]; description = "An extensible socket library"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "socket-activation" = callPackage @@ -238010,8 +238772,8 @@ self: { editedCabalFile = "0bvm8ik8fp0v5gjw6q4h767zgs1i4ydckdypvqa85sarc985hkmp"; libraryHaskellDepends = [ base network transformers unix ]; description = "systemd socket activation library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -238023,7 +238785,7 @@ self: { sha256 = "1wvrdgz0ybacbzg91vi8jiswr02lj7hz61cksmcfii2qsmzpfgb7"; libraryHaskellDepends = [ base socket ]; description = "Definitions for using ICMP with the `socket` library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "socket-io" = callPackage @@ -238038,8 +238800,8 @@ self: { aeson attoparsec base bytestring engine-io mtl stm text transformers unordered-containers vector ]; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -238053,8 +238815,8 @@ self: { librarySystemDepends = [ lksctp-tools ]; testHaskellDepends = [ base bytestring socket ]; description = "STCP socket extensions library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) lksctp-tools;}; @@ -238071,8 +238833,8 @@ self: { async base bytestring socket tasty tasty-hunit unix ]; description = "Unix domain sockets"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -238099,8 +238861,8 @@ self: { template-haskell text wai wai-websockets warp websockets ]; description = "simpe tool to serve piped data over http and websocket"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -238129,8 +238891,8 @@ self: { transformers-base unordered-containers vector wai warp ]; description = "Socket.IO server"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -238161,8 +238923,8 @@ self: { ]; doHaddock = false; description = "High-level network sockets"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -238188,8 +238950,8 @@ self: { aeson base bytestring either network text websockets ]; description = "A small websocket backend provider"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -238203,7 +238965,7 @@ self: { base basement bytestring cereal network ]; description = "Socks proxy (ver 5)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "sodium" = callPackage @@ -238214,8 +238976,8 @@ self: { sha256 = "00qs1calial08a185ma5hm17lmmzig0yjf3710d5ikq1bmrgcqga"; libraryHaskellDepends = [ base containers mtl ]; description = "Sodium Reactive Programming (FRP) System"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -238228,8 +238990,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base cairo gtk old-time stm ]; description = "GUI functions as used in the book \"The Haskell School of Expression\""; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -238242,8 +239004,8 @@ self: { libraryHaskellDepends = [ base ]; librarySystemDepends = [ softfloat ]; description = "Haskell bindings for SoftFloat"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {softfloat = null;}; @@ -238257,7 +239019,7 @@ self: { editedCabalFile = "0r4786crxih8z4dwi0grpga2kp8ivvnmwa0lhddmn16bfqwa16s9"; libraryHaskellDepends = [ base time ]; description = "Simple library for solar calculations"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "solga" = callPackage @@ -238280,8 +239042,8 @@ self: { wai wai-extra ]; description = "Simple typesafe web routing"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -238299,8 +239061,8 @@ self: { solga swagger2 text unordered-containers ]; description = "Swagger generation for Solga"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -238325,8 +239087,8 @@ self: { transformers uri-encode ]; description = "A minimal Solr client library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -238342,21 +239104,19 @@ self: { executableHaskellDepends = [ base containers filepath ]; testHaskellDepends = [ base containers QuickCheck ]; description = "Solving simple games"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "some" = callPackage ({ mkDerivation, base, deepseq }: mkDerivation { pname = "some"; - version = "1.0.1"; - sha256 = "13dpvxswjcsmic8h2vayp77qzl820gg4g29g5n2xcja8gnzjkkii"; - revision = "1"; - editedCabalFile = "0gpr24rf427l82d8gb3x97yj03vc2v8ky3b6m1gb4j3g4yvvmr96"; + version = "1.0.2"; + sha256 = "12mv5gzcvl4n5rz685r2nmmiykvnkvrvx7k4cvwscdjjgnqa9y6c"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base ]; description = "Existential type: Some"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "sonic-visualiser" = callPackage @@ -238377,7 +239137,7 @@ self: { ]; description = "Sonic Visualiser"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -238391,7 +239151,7 @@ self: { editedCabalFile = "1d4sagrlhmvai3f4hvb9rn8aqsjbvi00z0mzv1gds9nblshk83xd"; libraryHaskellDepends = [ base deepseq ]; description = "True Sums of Products"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "sophia" = callPackage @@ -238410,7 +239170,7 @@ self: { base binary bindings-sophia bytestring criterion directory ]; description = "Bindings to Sophia library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "sort" = callPackage @@ -238421,7 +239181,7 @@ self: { sha256 = "03bpyn0mimfyilfjs26b9c8sclbzsbardjhy6d822jybg548kqyf"; libraryHaskellDepends = [ base ]; description = "A Haskell sorting toolkit"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "sort-by-pinyin" = callPackage @@ -238437,7 +239197,7 @@ self: { air base bytestring containers here template-haskell text ]; description = "sort by pinyin"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "sorted" = callPackage @@ -238448,8 +239208,8 @@ self: { sha256 = "0rzcxhzc4s4sbdnysmjh1i8pd39jyx7a4hbhkarsp2qbx29s4h03"; libraryHaskellDepends = [ base ]; description = "Efficient, type-safe sorted sequences"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -238462,7 +239222,7 @@ self: { libraryHaskellDepends = [ base deepseq ]; benchmarkHaskellDepends = [ base criterion ]; description = "Type-enforced sorted lists and related functions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "sortee" = callPackage @@ -238474,7 +239234,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec HUnit QuickCheck ]; description = "Generate string for sort key"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "sorting" = callPackage @@ -238485,8 +239245,8 @@ self: { sha256 = "1i2vbmq7p7rja9rnhalyrspc2p5nc8yg6mfj9ia89j55vkc6225n"; libraryHaskellDepends = [ base ]; description = "Utils for sorting"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -238500,8 +239260,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base bytestring ]; description = "Sort lines per file size"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -238525,8 +239285,8 @@ self: { temporary text type-errors-pretty vector ]; description = "Souffle Datalog bindings for Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -238549,8 +239309,8 @@ self: { utility-ht ]; description = "Approximate a song from other pieces of sound"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -238564,8 +239324,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base containers parseargs WAVE ]; description = "Audio delay line"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -238579,8 +239339,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base split WAVE ]; description = "sound generator"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -238604,8 +239364,8 @@ self: { template-haskell time unix ]; description = "The server backend for the source code iPhone app"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -238625,7 +239385,7 @@ self: { text ]; description = "Source constraints GHC plugin"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "sourcemap" = callPackage @@ -238647,7 +239407,7 @@ self: { ]; benchmarkHaskellDepends = [ base bytestring criterion random ]; description = "Implementation of source maps as proposed by Google and Mozilla"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "sousit" = callPackage @@ -238666,8 +239426,8 @@ self: { base mtl QuickCheck test-framework test-framework-quickcheck2 ]; description = "Source/Sink/Transform: An alternative to lazy IO and iteratees"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -238705,7 +239465,7 @@ self: { ]; libraryPkgconfigDepends = [ sox ]; description = "Write, read, convert audio signals using libsox"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) sox;}; "soyuz" = callPackage @@ -238723,8 +239483,8 @@ self: { trifecta uniplate vector ]; description = "DCPU-16 architecture utilities for Notch's 0x10c game"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -238744,7 +239504,7 @@ self: { ]; testHaskellDepends = [ base ]; description = "Experimental library"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "spacecookie" = callPackage @@ -238767,7 +239527,7 @@ self: { socket systemd transformers unix ]; description = "Gopher Library and Server Daemon"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "spacefill" = callPackage @@ -238779,7 +239539,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Generators for space-filling curves"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "spacepart" = callPackage @@ -238790,8 +239550,8 @@ self: { sha256 = "118wch92ix54jp1hi4qw9mk46571lnak4df8ji83bs2vz3vax6jp"; libraryHaskellDepends = [ base vector-space ]; description = "Space partition data structures. Currently only a QuadTree."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -238810,7 +239570,7 @@ self: { ]; benchmarkHaskellDepends = [ base criterion ]; description = "Optimization over arbitrary search spaces"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "spake2" = callPackage @@ -238836,8 +239596,8 @@ self: { QuickCheck tasty tasty-hspec ]; description = "Implementation of the SPAKE2 Password-Authenticated Key Exchange algorithm"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -238855,8 +239615,8 @@ self: { base containers gloss lens linear MonadRandom mtl netwire ]; description = "A breakout clone written in netwire and gloss"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -238882,8 +239642,8 @@ self: { zip-archive ]; description = "Distributed Apache Spark applications in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -238901,7 +239661,7 @@ self: { ]; testHaskellDepends = [ base ]; description = "An SPARQL 1.1 Protocol client library."; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "sparrow" = callPackage @@ -238929,8 +239689,8 @@ self: { wai-transformers websockets websockets-simple wuss ]; description = "Unified streaming data-dependency framework for web apps"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -238942,8 +239702,8 @@ self: { sha256 = "1q1vpwrr96k41p9zj5x7mjd3817iq9a762q3jfqkwd0cb41iyka6"; libraryHaskellDepends = [ base containers ]; description = "A sparse set-based parsing library for Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -238971,8 +239731,8 @@ self: { ]; benchmarkHaskellDepends = [ array base criterion deepseq vector ]; description = "A playground of sparse linear algebra primitives using Morton ordering"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -238990,8 +239750,8 @@ self: { test-framework-quickcheck2 ]; description = "Effective linear algebra on sparse matrices"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -239014,7 +239774,7 @@ self: { mwc-random primitive QuickCheck scientific ]; description = "Numerical computing in native Haskell"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "sparse-tensor" = callPackage @@ -239036,7 +239796,7 @@ self: { base hmatrix QuickCheck tasty tasty-hunit tasty-quickcheck ]; description = "typesafe tensor algebra library"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "sparsebit" = callPackage @@ -239047,8 +239807,8 @@ self: { sha256 = "1a4gsnmr1y8b05iws2vrmjqbs5y9svfsz0jb3k19dddn1aszzm07"; libraryHaskellDepends = [ base haskell98 ]; description = "Sparse bitmaps for pattern match coverage"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -239060,8 +239820,8 @@ self: { sha256 = "19h9vy7arhi35rqafbq3nf9a50vnlw5mbfwvl6sp1j61w0yxai95"; libraryHaskellDepends = [ base containers ]; description = "A Logic Programming Library for Test-Data Generation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -239077,8 +239837,8 @@ self: { base containers data-default monadplus nats pointed semigroups ]; description = "Lightweight parsing library based on partial functions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -239091,8 +239851,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base dlist mps mtl ]; description = "brainless form validation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -239112,7 +239872,7 @@ self: { base doctest QuickCheck test-framework test-framework-quickcheck2 ]; description = "3d math including quaternions/euler angles/dcms and utility functions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "spatial-rotations" = callPackage @@ -239134,7 +239894,7 @@ self: { tasty-quickcheck vector-space ]; description = "Rotate about any suitable axis"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "spawn" = callPackage @@ -239145,7 +239905,7 @@ self: { sha256 = "0xkkl0w30rqif2jwdzjv239raly4yaf0116vkqcwh1i41jqn7ij8"; libraryHaskellDepends = [ base ]; description = "Tiny library for concurrent computations"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "spdx" = callPackage @@ -239164,7 +239924,7 @@ self: { base base-compat Cabal QuickCheck tasty-quickcheck ]; description = "SPDX license expression language, Extras"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "spdx-license" = callPackage @@ -239173,14 +239933,14 @@ self: { }: mkDerivation { pname = "spdx-license"; - version = "0.1.0"; - sha256 = "17ksd29w4qv4vpk6wcah4xr15sjx1fcz7mcwqb6r7kqqmw7jqp7y"; + version = "0.1.1"; + sha256 = "1zl21x5qmzpj7y7vcv8brwcf4b1rjb8yy4aih8v5igic6d1a8jyw"; libraryHaskellDepends = [ base containers megaparsec regex-tdfa string-interpolate text ]; testHaskellDepends = [ base directory hspec megaparsec text ]; description = "SPDX license templates"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "spe" = callPackage @@ -239192,7 +239952,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Combinatorial species lite"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "special-functors" = callPackage @@ -239203,8 +239963,8 @@ self: { sha256 = "0c68af104qxn9lhzshcy9s466q10n3ic7q4navqi53mmmmznivrd"; libraryHaskellDepends = [ base mtl ]; description = "Control.Applicative, Data.Foldable, Data.Traversable (compatibility package)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -239222,8 +239982,8 @@ self: { mwc-random path-pieces primitive safecopy text uuid ]; description = "Simple data types that help me here and there"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -239237,7 +239997,7 @@ self: { base bytestring ieee754 scientific text ]; description = "Typeclass providing special values"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "specialize-th" = callPackage @@ -239263,8 +240023,8 @@ self: { type-sub-th uniplate universe-th ]; description = "Create specialized types from polymorphic ones using TH"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -239283,8 +240043,8 @@ self: { template-haskell ]; description = "Computational combinatorial species"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -239302,8 +240062,8 @@ self: { sparse-linear-algebra statistics vector ]; description = "Library for spectral clustering"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -239319,7 +240079,7 @@ self: { testHaskellDepends = [ base express leancheck ]; benchmarkHaskellDepends = [ base express leancheck ]; description = "discovery of properties about Haskell functions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "speculation" = callPackage @@ -239330,8 +240090,8 @@ self: { sha256 = "0gsdxgi1bw33z7v23m2fq8ynqxz06swjv4ikl8mqmlp0hwd69gvk"; libraryHaskellDepends = [ base ghc-prim stm transformers ]; description = "A framework for safe, programmable, speculative parallelism"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -239344,8 +240104,8 @@ self: { libraryHaskellDepends = [ speculation ]; doHaddock = false; description = "Merged into 'speculation'. Use that instead."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -239376,8 +240136,8 @@ self: { text-format-heavy ]; description = "Speechmatics api client"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -239395,7 +240155,7 @@ self: { ]; testHaskellDepends = [ base containers ]; description = "Speedy slice sampling"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "spelling-suggest" = callPackage @@ -239416,8 +240176,8 @@ self: { base edit-distance parseargs phonetic-code sqlite ]; description = "Spelling suggestion tool with library and command-line interfaces"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -239429,7 +240189,7 @@ self: { sha256 = "1h014k4yi0aachbbni011a1jkzi31lrxhpi8h5q5f2vkgb18k1g4"; libraryHaskellDepends = [ base composition-prelude ]; description = "Geometry on a sphere"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "sphero" = callPackage @@ -239444,8 +240204,8 @@ self: { base bytestring cereal containers mtl simple-bluetooth ]; description = "Orbotix Sphero client library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -239462,8 +240222,8 @@ self: { xml ]; description = "Haskell bindings to the Sphinx full-text searching daemon"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -239477,8 +240237,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base sphinx ]; description = "Sphinx CLI and demo of Haskell Sphinx library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -239497,8 +240257,8 @@ self: { libraryHaskellDepends = [ base MissingH parsec split ]; executableHaskellDepends = [ base optparse-applicative ]; description = "Transform queries for sphinx input"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -239515,8 +240275,8 @@ self: { JuicyPixels-repa OpenGL ]; description = "An FRP-based game engine written in Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -239537,8 +240297,8 @@ self: { ]; executablePkgconfigDepends = [ libsoup ]; description = "Experimental web browser"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) libsoup;}; "spine" = callPackage @@ -239549,7 +240309,7 @@ self: { sha256 = "1sk2vkslcbmr4z87xc7q38ywbj118bcgqrkz9fqsp7jffxvy4bgv"; libraryHaskellDepends = [ base ]; description = "Simple implementation of the generic spine view"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "spir-v" = callPackage @@ -239560,8 +240320,8 @@ self: { sha256 = "1jnnc9pgy22iayln4ljgirr4ixspjn7iljyxz2pp7fxgvmvb3msr"; libraryHaskellDepends = [ base ]; description = "Some utilities for reading and writing SPIR-V files"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -239588,8 +240348,8 @@ self: { ]; testHaskellDepends = [ base doctest ]; description = "Spiros Boosalis's Custom Prelude"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -239601,8 +240361,8 @@ self: { sha256 = "1mq5n62lg2jbhzbl1py7yhnhdyxa0gn2xmihb9cm5r7p75p5wacl"; libraryHaskellDepends = [ base ]; description = "Generic splay-based sequence representation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -239620,8 +240380,8 @@ self: { test-framework-quickcheck2 ]; description = "Provides an annotated splay tree"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -239633,7 +240393,7 @@ self: { sha256 = "0lsfkm4vfipzbnqpf3yli6fwrv5a5mwbs149dfzhs7spa9kbxyl1"; libraryHaskellDepends = [ base network ]; description = "Cross-platform Socket to Socket Data Splicing"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "spline3" = callPackage @@ -239656,8 +240416,8 @@ self: { tasty tasty-hunit tasty-quickcheck vector ]; description = "A parallel implementation of the Sorokina/Zeilfelder spline scheme"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.agpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -239679,8 +240439,8 @@ self: { ]; benchmarkHaskellDepends = [ base criterion polynomial vector ]; description = "B-Splines, other splines, and NURBS"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -239692,7 +240452,7 @@ self: { sha256 = "0b7czphkra6q6a5xm30pjh5b4cdvz87fzb2pv17dpxai0mb3c0r6"; libraryHaskellDepends = [ base containers ghc hlint stm ]; description = "HLint as a GHC source plugin"; - license = stdenv.lib.licenses.isc; + license = lib.licenses.isc; }) {}; "split" = callPackage @@ -239704,7 +240464,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck ]; description = "Combinator library for splitting lists"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "split-channel" = callPackage @@ -239715,7 +240475,7 @@ self: { sha256 = "0w2sgj1f5ydfvhm80d3pbka9988jwl80n14bp5nisawpd2glxvak"; libraryHaskellDepends = [ base ]; description = "Control.Concurrent.Chan split into sending and receiving halves."; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "split-morphism" = callPackage @@ -239727,8 +240487,8 @@ self: { libraryHaskellDepends = [ base invariant lens ]; testHaskellDepends = [ base invariant lens QuickCheck ]; description = "Split Epimorphisms and Monomorphisms"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -239747,7 +240507,7 @@ self: { transformers utility-ht ]; description = "Split a big audio file into pieces at positions of silence"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "split-tchan" = callPackage @@ -239758,7 +240518,7 @@ self: { sha256 = "0qwcbvnm2vlr4bmn8r1q3ycamvgs0nfap4dkyzgp54f9rrl73x2p"; libraryHaskellDepends = [ base stm ]; description = "STM's TChan split into sending and receiving halves"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "splitmix" = callPackage @@ -239781,7 +240541,7 @@ self: { base clock containers criterion random tf-random ]; description = "Fast Splittable PRNG"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "splitter" = callPackage @@ -239796,8 +240556,8 @@ self: { base directory filepath parsec range ]; description = "Use numerical ranges to split out certain lines from a file"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -239817,7 +240577,7 @@ self: { strptime template-haskell time vcs-revision ]; description = "A tool for visualizing the lifecycle of many concurrent multi-staged processes"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "spool" = callPackage @@ -239828,7 +240588,7 @@ self: { sha256 = "1svkz3cxkyi6f3akakjfk1cvij85xy69v52d88gh97xgiawp5346"; libraryHaskellDepends = [ base bytestring vector ]; description = "Convert between ByteString and Vector.Storable without copying"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "spoon" = callPackage @@ -239841,7 +240601,7 @@ self: { editedCabalFile = "09s5jjcsg4g4qxchq9g2l4i9d5zh3rixpkbiysqcgl69kj8mwv74"; libraryHaskellDepends = [ base deepseq ]; description = "Catch errors thrown from pure computations"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "spoonutil" = callPackage @@ -239858,8 +240618,8 @@ self: { base directory extensible-exceptions filepath parsec ]; description = "Spoon's utilities. Simple testing and nice looking error reporting."; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -239871,7 +240631,7 @@ self: { sha256 = "1mkcb9qi9d3izf3nhn0bmiiwfhvak6ky71wq7qnrq3imsarrni6s"; libraryHaskellDepends = [ base deepseq ]; description = "Catch errors from pure computations in a Maybe/Either"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "spoty" = callPackage @@ -239887,8 +240647,8 @@ self: { unordered-containers wreq ]; description = "Spotify web API wrapper"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -239905,7 +240665,7 @@ self: { base explicit-exception transformers utility-ht ]; description = "Read and write spreadsheets from and to CSV files in a lazy way"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "sprinkles" = callPackage @@ -239948,8 +240708,8 @@ self: { tasty tasty-hunit tasty-quickcheck temporary wai-extra ]; description = "JSON API to HTML website wrapper"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -239961,8 +240721,8 @@ self: { sha256 = "1syv2l0z7c2s6bbi5103i4var40j8pavahiic813v8m9s6waa4fk"; libraryHaskellDepends = [ base lens mtl vector ]; description = "An implementation of the Spritz RC4-like stream cipher in Haskell"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -239987,8 +240747,8 @@ self: { SHA split text time tls unix utf8-string x509 yaml ]; description = "HTTP proxy for authenticating users via OAuth2"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -240014,8 +240774,8 @@ self: { warp ]; description = "Web interface to sproxy database"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -240041,8 +240801,8 @@ self: { wai wai-conduit warp warp-tls word8 yaml ]; description = "Secure HTTP proxy for authenticating users via OAuth2"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -240062,8 +240822,8 @@ self: { ]; benchmarkHaskellDepends = [ base criterion hmatrix random ]; description = "Simultaneous Perturbation Stochastic Approximation Optimization Algorithm"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -240089,8 +240849,8 @@ self: { test-framework-hunit test-framework-quickcheck2 time unix ]; description = "A compact file system watcher for Mac OS X, Linux and Windows"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -240107,8 +240867,8 @@ self: { transformers-base ]; description = "common middle-level sql client"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -240124,8 +240884,8 @@ self: { base data-default-class mysql mysql-simple sql-simple text ]; description = "mysql backend for sql-simple"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -240142,8 +240902,8 @@ self: { time ]; description = "conection pool for sql-simple"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -240159,8 +240919,8 @@ self: { base data-default-class postgresql-simple sql-simple text ]; description = "postgresql backend for sql-simple"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -240172,8 +240932,8 @@ self: { sha256 = "07ji17b4q9b8w9q9r8digb218qkjcrxfc24113p0f3pmgbwci3f1"; libraryHaskellDepends = [ base sql-simple sqlite-simple ]; description = "sqlite backend for sql-simple"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -240186,7 +240946,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck quickcheck-simple ]; description = "SQL keywords data constructors into OverloadedString"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "sqlcipher" = callPackage @@ -240204,8 +240964,8 @@ self: { librarySystemDepends = [ openssl ]; testHaskellDepends = [ base filepath hspec temporary ]; description = "Haskell binding to sqlcipher"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) openssl;}; @@ -240218,7 +240978,7 @@ self: { libraryHaskellDepends = [ base logging text transformers ]; librarySystemDepends = [ unixODBC ]; description = "Bindings for SQL/CLI (ODBC) C API"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) unixODBC;}; "sqlcli-odbc" = callPackage @@ -240229,7 +240989,7 @@ self: { sha256 = "1rfhdaa0wmvc78nbjhi93p9sv66xa6rjr79yyhlkqi1d335b8vb5"; libraryHaskellDepends = [ base logging sqlcli ]; description = "ODBC specific definitions to be used by SQL CLI clients"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "sqlite" = callPackage @@ -240246,8 +241006,8 @@ self: { librarySystemDepends = [ sqlite ]; testHaskellDepends = [ base ]; description = "Haskell binding to sqlite3"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) sqlite;}; @@ -240269,7 +241029,7 @@ self: { base base16-bytestring bytestring direct-sqlite HUnit text time ]; description = "Mid-Level SQLite client library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "sqlite-simple-errors" = callPackage @@ -240281,8 +241041,8 @@ self: { libraryHaskellDepends = [ base parsec sqlite-simple text ]; testHaskellDepends = [ base mtl sqlite-simple text ]; description = "Wrapper around errors from sqlite-simple"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -240299,8 +241059,8 @@ self: { typedquery utf8-string ]; description = "Typed extension to sqlite simple"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -240312,8 +241072,8 @@ self: { sha256 = "1r9y3p355rl57pnm84flx734zzjxnnc53fkcfdkykxi5wi5j05v0"; libraryHaskellDepends = [ base convertible HDBC template-haskell ]; description = "Class and instances for conversion to list of SqlValue"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -240335,8 +241095,8 @@ self: { ]; testHaskellDepends = [ base ]; description = "Initial project template from stack"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -240352,7 +241112,7 @@ self: { adjunctions base bifunctors comonad distributive profunctors ]; description = "The double category of Hask functors and profunctors"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "squeal-postgresql" = callPackage @@ -240392,8 +241152,8 @@ self: { with-utf8 ]; description = "Squeal PostgreSQL Library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -240411,7 +241171,7 @@ self: { text ]; description = "Use databases with the version 3 series of the SQLite C library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "squeeze" = callPackage @@ -240435,7 +241195,7 @@ self: { ]; description = "A file-packing application"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -240463,8 +241223,8 @@ self: { userid uuid uuid-orphans uuid-types zlib ]; description = "Module limbo"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -240484,7 +241244,7 @@ self: { ]; description = "Build and install Debian packages completely from source"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -240496,7 +241256,7 @@ self: { sha256 = "0vn0zqsk191ghh2993hls05hp7kvnskaafnfrrqhfbmpdg7dp7h6"; libraryHaskellDepends = [ base ]; description = "Data types for managing source code locations"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "srec" = callPackage @@ -240507,7 +241267,7 @@ self: { sha256 = "028sb4znvdqsygipcsf44j0xazk03pdfkirzrczmxcd11srh3h1k"; libraryHaskellDepends = [ base bytestring ]; description = "Parsing and processing s-records"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "sscan" = callPackage @@ -240525,8 +241285,8 @@ self: { temporary text time vty ]; description = "text UI for scanning with SANE"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -240544,8 +241304,8 @@ self: { MonadCatchIO-mtl mtl transformers utf8-string ]; description = "Simple SCGI Library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -240558,7 +241318,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "Formats Strings with subscript or superscript characters"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ssh" = callPackage @@ -240589,8 +241349,8 @@ self: { ]; doCheck = false; description = "A pure-Haskell SSH server library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -240611,7 +241371,7 @@ self: { test-framework-quickcheck2 text unix ]; description = "Read and interpret the SSH known-hosts file"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ssh-tunnel" = callPackage @@ -240628,8 +241388,8 @@ self: { base foldl http-client managed text transformers turtle uuid ]; description = "Proxy http-client via ssh tunnel"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -240650,8 +241410,8 @@ self: { base containers hspec keyword-args nagios-check parsec ]; description = "Check sshd configuration for adherence to best practices"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -240671,7 +241431,7 @@ self: { regex-compat stm unix ]; description = "Wrapper daemon to manage an ssh tunnel"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "sssp" = callPackage @@ -240699,8 +241459,8 @@ self: { wai-extra warp ]; description = "HTTP proxy for S3"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -240719,8 +241479,8 @@ self: { ]; executableHaskellDepends = [ cmdargs ]; description = "SSTables in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -240735,7 +241495,7 @@ self: { libraryHaskellDepends = [ base containers ]; executableHaskellDepends = [ base containers ]; description = "Comma-separated-value (CSV) read, show and write routines"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "st2" = callPackage @@ -240746,8 +241506,8 @@ self: { sha256 = "0i7v9yacwgf6aj67c4r2n8zcm07jrcff9nl52sx7ylsjs65ym2qz"; libraryHaskellDepends = [ base gdp ghc-prim primitive ]; description = "shared heap regions between local mutable state threads"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -240764,8 +241524,8 @@ self: { base criterion fingertree heaps mwc-random pqueue vector ]; description = "Purely functional stable heaps (fair priority queues)"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -240777,8 +241537,8 @@ self: { sha256 = "1sjidykbj5f692di93nml0frazvyw9kxyhjwbyyvrb9gwgc2ms3w"; libraryHaskellDepends = [ base containers ghc-prim ]; description = "Heterogeneous maps keyed by StableNames"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -240791,8 +241551,8 @@ self: { libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base ghc-prim ]; description = "algorithms around stable marriage"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -240806,8 +241566,8 @@ self: { editedCabalFile = "1wlz6cpbvf8mi4c78dwwbdxsk2wax3y7q27hy78h83gl0cbnfiij"; libraryHaskellDepends = [ base ghc-prim hashtables ]; description = "Memoization based on argument identity"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -240832,8 +241592,8 @@ self: { QuickCheck tasty tasty-quickcheck text ]; description = "Trees whose branches are resistant to change"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -240870,7 +241630,7 @@ self: { aeson base criterion deepseq megaparsec text ]; description = "Mustache templates for Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "stack" = callPackage @@ -240964,7 +241724,7 @@ self: { $exe --bash-completion-script $exe >$out/share/bash-completion/completions/stack ''; description = "The Haskell Tool Stack"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "stack-all" = callPackage @@ -240982,7 +241742,7 @@ self: { simple-cmd-args text ]; description = "CLI tool for building across Stackage major versions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "stack-bump" = callPackage @@ -241005,8 +241765,8 @@ self: { lens-aeson optparse-applicative process QuickCheck strict text yaml ]; description = "Dead simple version bumping for hpack packages"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -241024,7 +241784,7 @@ self: { base directory extra filemanip filepath simple-cmd simple-cmd-args ]; description = "Clean away old stack build artefacts"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "stack-fix" = callPackage @@ -241037,8 +241797,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base options text turtle ]; description = "Console program used to fix Stack build errors automatically"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.agpl3Only; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -241065,8 +241825,8 @@ self: { time ]; description = "Initial project template from stack"; - license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -241082,8 +241842,8 @@ self: { base monad-logger path stack time transformers ]; description = "Wrapper to use stack as a library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -241125,8 +241885,8 @@ self: { transformers yaml ]; description = "A program for extending Stack to add distributed capabilities"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -241145,8 +241905,8 @@ self: { ]; testHaskellDepends = [ base template-haskell ]; description = "Stack prisms"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -241166,8 +241926,8 @@ self: { directory filepath MissingH stm terminal-size time vty ]; description = "An equivalent to cabal run for stack"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -241195,8 +241955,8 @@ self: { lens lens-aeson MissingH process stm-containers text time wreq ]; description = "Initial project template from stack"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -241218,7 +241978,7 @@ self: { process text ]; description = "Create etags for Haskell projects based on Stack snapshots"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "stack-templatizer" = callPackage @@ -241231,7 +241991,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base bytestring directory filepath ]; description = "Generate a stack template from a folder"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "stack-type" = callPackage @@ -241242,8 +242002,8 @@ self: { sha256 = "13kc36p62kmni6lksr3j5mlndc1rmmgir9p0k7qcv5ph6rbrc47k"; libraryHaskellDepends = [ base transformers ]; description = "The basic stack type"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -241260,8 +242020,8 @@ self: { libraryHaskellDepends = [ base filepath process ]; executableHaskellDepends = [ base filepath process ]; description = "Call ghc within stack by calling ghc"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -241278,7 +242038,7 @@ self: { ]; testHaskellDepends = [ base doctest Glob ]; description = "Parse a stack.yaml file"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "stack2cabal" = callPackage @@ -241304,8 +242064,8 @@ self: { http-client-tls optparse-applicative process safe temporary text ]; description = "Convert stack projects to cabal.project + cabal.project.freeze"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -241332,8 +242092,8 @@ self: { ]; testHaskellDepends = [ base hspec ]; description = "Convert stack.yaml files into Nix build instructions."; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -241352,8 +242112,8 @@ self: { stackage-upload ]; description = "Dummy package forcing installation of other Stackage packages"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -241378,8 +242138,8 @@ self: { aeson base optparse-applicative stackage-cli text ]; description = "Calculate and print (in different formats) Stackage build plans"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -241400,8 +242160,8 @@ self: { optparse-applicative parsec process stackage-cli system-fileio text ]; description = "A CLI executable for cabal-based stackage commands"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -241423,8 +242183,8 @@ self: { ]; executableHaskellDepends = [ base text ]; description = "A CLI library for stackage commands"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -241469,8 +242229,8 @@ self: { http-client http-client-tls QuickCheck text yaml ]; description = "Tools for curating Stackage bundles"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -241492,7 +242252,7 @@ self: { ]; executableHaskellDepends = [ base ]; description = "Secure download of packages for cabal-install"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "stackage-metadata" = callPackage @@ -241519,8 +242279,8 @@ self: { stackage-install stackage-update tar text transformers yaml ]; description = "DEPRECATED Grab current metadata for all packages"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -241544,8 +242304,8 @@ self: { unordered-containers vector yaml ]; description = "Tool for querying Stackage"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -241566,8 +242326,8 @@ self: { directory filepath optparse-applicative process stackage-cli text ]; description = "Work with shared stackage sandboxes"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -241591,8 +242351,8 @@ self: { unordered-containers yaml ]; description = "An executable for downloading a Haskell setup"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -241618,8 +242378,8 @@ self: { optparse-applicative text ]; description = "Convert stack.yaml to cabal.project + cabal.project.freeze"; - license = stdenv.lib.licenses.gpl3Plus; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -241639,8 +242399,8 @@ self: { text time unordered-containers vector ]; description = "Shared data types between various Stackage packages"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -241655,7 +242415,7 @@ self: { libraryHaskellDepends = [ base directory filepath process ]; executableHaskellDepends = [ base ]; description = "Update your package index incrementally (requires git)"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "stackage-upload" = callPackage @@ -241677,8 +242437,8 @@ self: { base optparse-applicative stackage-cli ]; description = "A more secure version of cabal upload which uses HTTPS"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -241709,8 +242469,8 @@ self: { yaml ]; description = "Convert Stack files into Nix build instructions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -241734,7 +242494,7 @@ self: { recursion-schemes rosezipper safe text transformers utf8-string ]; description = "Program to fold GHC prof files into flamegraph input"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "stacked-dag" = callPackage @@ -241753,7 +242513,7 @@ self: { ]; testHaskellDepends = [ base containers doctest graphviz text ]; description = "Ascii DAG(Directed acyclic graph) for visualization of dataflow"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "staf" = callPackage @@ -241765,7 +242525,7 @@ self: { libraryHaskellDepends = [ base ]; description = "Numerical statistics for Foldable containers"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "stagen" = callPackage @@ -241788,7 +242548,7 @@ self: { ]; executableHaskellDepends = [ base ]; description = "Static site generator"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "stan" = callPackage @@ -241819,7 +242579,7 @@ self: { ]; doHaddock = false; description = "Haskell STatic ANalyser"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "standalone-derive-topdown" = callPackage @@ -241830,8 +242590,8 @@ self: { sha256 = "179pm3wixdqg7786l8ys2nwpx7anpnvsl63bj25cgs8082g587v0"; libraryHaskellDepends = [ base mtl template-haskell ]; description = "This package will derive class instance along the data type declaration tree. (Deprecated)"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -241849,8 +242609,8 @@ self: { base Cabal containers directory filepath optparse-applicative ]; description = "Generate standalone haddock documentation for a set of packages"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -241862,7 +242622,7 @@ self: { sha256 = "03lk46s8v3pgxgk4ddyf382rspqvkf61v9bffhym0pd4didnz9d5"; libraryHaskellDepends = [ base ]; description = "*-semirings"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "star-to-star" = callPackage @@ -241874,7 +242634,7 @@ self: { libraryHaskellDepends = [ base ]; description = "the * -> * types, operators, and covariant instances"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "star-to-star-contra" = callPackage @@ -241886,7 +242646,7 @@ self: { libraryHaskellDepends = [ base star-to-star ]; description = "contravariant instances for * -> * types and operators"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "starling" = callPackage @@ -241899,8 +242659,8 @@ self: { base binary bytestring failure transformers ]; description = "A memcached client"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -241921,7 +242681,7 @@ self: { ]; description = "Space simulation game"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "starter" = callPackage @@ -241932,7 +242692,7 @@ self: { sha256 = "14rxrs1gjsm26m7rk4rj9b2389zca0j24kjl7sfznqpxgk99qmpx"; libraryHaskellDepends = [ base fsnotify ]; description = "Develop applications without restarts"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "stash" = callPackage @@ -241947,8 +242707,8 @@ self: { aeson attoparsec base bytestring directory hashable text vector ]; description = "To be written"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -241961,7 +242721,7 @@ self: { libraryHaskellDepends = [ arrows base mtl ]; description = "Data.State"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -241978,8 +242738,8 @@ self: { ]; testHaskellDepends = [ base hspec transformers ]; description = "Monad transformers for holding bags of state"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -241993,7 +242753,7 @@ self: { libraryHaskellDepends = [ aeson base shakespeare text ]; testHaskellDepends = [ aeson base hspec QuickCheck text ]; description = "ISO 3166-2:US state codes and i18n names"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "state-plus" = callPackage @@ -242005,8 +242765,8 @@ self: { libraryHaskellDepends = [ base mtl ]; testHaskellDepends = [ base checkers mtl QuickCheck ]; description = "MonadPlus for StateT"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -242019,7 +242779,7 @@ self: { libraryHaskellDepends = [ base mtl template-haskell ]; description = "Better records for State monad states"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -242038,7 +242798,7 @@ self: { vector ]; description = "A faster variant of the RWS monad transformers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "statechart" = callPackage @@ -242051,7 +242811,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base polyparse ]; description = "Compiles Rhapsody statecharts to C"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "stateful-mtl" = callPackage @@ -242062,8 +242822,8 @@ self: { sha256 = "19645rqfqbcvngq8hj7bryl35lgx7p5k55vgsxa1a2hm2kq8vm5h"; libraryHaskellDepends = [ base MaybeT mtl ]; description = "Typeclass instances for monad transformer stacks with an ST thread at the bottom"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -242075,7 +242835,7 @@ self: { sha256 = "0hdpw6g255lj7jjvgqwhjdpzmka546vda5qjvry8gjj6nfm91lvx"; libraryHaskellDepends = [ base mtl stm ]; description = "Abstraction for things that work like IORef"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "statestack" = callPackage @@ -242088,8 +242848,8 @@ self: { base mtl transformers transformers-compat ]; description = "Simple State-like monad transformer with saveable and restorable state"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -242101,8 +242861,8 @@ self: { sha256 = "05clniwqk4i3zz22jzbjj2x9cgkxb2ks7mccjyp3gyy4zbm2xlmz"; libraryHaskellDepends = [ applicative base transformers ]; description = "The ST monad and STRefs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {applicative = null;}; @@ -242120,7 +242880,7 @@ self: { librarySystemDepends = [ libstatgrab ]; description = "Collect system level metrics and statistics"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) libstatgrab;}; "static" = callPackage @@ -242140,7 +242900,7 @@ self: { base doctest mtl tasty tasty-hunit transformers ]; description = "Type-safe and interoperable static values and closures"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; }) {}; "static-canvas" = callPackage @@ -242153,8 +242913,8 @@ self: { editedCabalFile = "1z3mi5z590xxmipd5fxylcmf39rrwvmwva2rkk6km1nxb5kfasl7"; libraryHaskellDepends = [ base double-conversion free mtl text ]; description = "DSL to generate HTML5 Canvas javascript"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -242171,8 +242931,8 @@ self: { template-haskell ]; description = "Serialisable static pointers to functions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -242184,7 +242944,7 @@ self: { sha256 = "0nkgx4s389027zi23wmbc6wqnmplvjvbrsbyzy7zn41mbwmzqz8l"; libraryHaskellDepends = [ array base containers hashable primes ]; description = "Immutable hash"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "static-resources" = callPackage @@ -242205,7 +242965,7 @@ self: { test-framework test-framework-hunit test-framework-quickcheck2 time ]; description = "JavaScript and Css files concat for http optimization. Now with LESS support."; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "static-tensor" = callPackage @@ -242228,8 +242988,8 @@ self: { base criterion deepseq linear mwc-random vector ]; description = "Tensors of statically known size"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -242251,8 +243011,8 @@ self: { ]; testToolDepends = [ markdown-unlit ]; description = "Lists, Texts, ByteStrings and Vectors of statically known length"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -242264,7 +243024,7 @@ self: { sha256 = "0b6y8yi0cfisi58pxxx1gnd1vab2i8f5wb3gzv1dfsxx5hl6jlwf"; libraryHaskellDepends = [ base MissingH ]; description = "Reusable static analysis interfaces and modules"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "statistics" = callPackage @@ -242290,7 +243050,7 @@ self: { tasty-hunit tasty-quickcheck vector vector-algorithms ]; description = "A library of statistical types, data, and functions"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }) {}; "statistics-dirichlet" = callPackage @@ -242305,8 +243065,8 @@ self: { base deepseq hmatrix-special nonlinear-optimization vector ]; description = "Functions for working with Dirichlet densities and mixtures on vectors"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -242318,8 +243078,8 @@ self: { sha256 = "17w7vz0jarbyf9y72bn9yg134q6ja5ymfyl1v9nx94glbhbybrlf"; libraryHaskellDepends = [ base vector ]; description = "An implementation of high performance, minimal statistics functions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -242335,8 +243095,8 @@ self: { base math-functions mwc-random primitive statistics ]; description = "Random variate generation from hypergeometric distributions"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -242352,7 +243112,32 @@ self: { base MonadRandom random random-shuffle safe statistics vector ]; description = "Linear regression between two samples, based on the 'statistics' package"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; + }) {}; + + "statistics-skinny" = callPackage + ({ mkDerivation, async, base, base-orphans, data-default-class + , deepseq, dense-linear-algebra, erf, ieee754, math-functions + , monad-par, mwc-random, primitive, QuickCheck, tasty + , tasty-expected-failure, tasty-hunit, tasty-quickcheck, vector + , vector-algorithms, vector-th-unbox + }: + mkDerivation { + pname = "statistics-skinny"; + version = "0.15.2.0"; + sha256 = "1rx65xyi7xlf5a0p1xvyi7rmba4x4xrb462lhybwr4c0xv1c2mbl"; + libraryHaskellDepends = [ + async base base-orphans data-default-class deepseq + dense-linear-algebra math-functions monad-par mwc-random primitive + vector vector-algorithms vector-th-unbox + ]; + testHaskellDepends = [ + base dense-linear-algebra erf ieee754 math-functions mwc-random + primitive QuickCheck tasty tasty-expected-failure tasty-hunit + tasty-quickcheck vector vector-algorithms + ]; + description = "A library of statistical types, data, and functions"; + license = lib.licenses.bsd2; }) {}; "stats" = callPackage @@ -242365,8 +243150,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base statistics text vector ]; description = "command line statistics"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -242382,8 +243167,8 @@ self: { base bytestring monad-control mtl network random ]; description = "StatsD API"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -242401,8 +243186,8 @@ self: { network network-uri old-time random time-units ]; description = "Statsd UDP client"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -242418,7 +243203,7 @@ self: { base bytestring monad-control network text transformers-base ]; description = "DataDog-flavored StatsD client"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "statsdi" = callPackage @@ -242441,8 +243226,8 @@ self: { base bytestring hspec network stm tasty tasty-hspec time ]; description = "A lovely [Dog]StatsD implementation"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -242466,7 +243251,7 @@ self: { base dbus dbus-hslogger hslogger optparse-applicative ]; description = "A wrapper over the StatusNotifierItem/libappindicator dbus specification"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "statvfs" = callPackage @@ -242477,8 +243262,8 @@ self: { sha256 = "16z9fddgvf5sl7zy7p74fng9lkdw5m9i5np3q4s2h8jdi43mwmg1"; libraryHaskellDepends = [ base ]; description = "Get unix filesystem statistics with statfs, statvfs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -242508,7 +243293,7 @@ self: { text unordered-containers ]; description = "What version is the package X in stackage lts-Y.ZZ?"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "stb-image" = callPackage @@ -242519,7 +243304,7 @@ self: { sha256 = "1mx6i5q56wy13fvpnypb2c6fk2z3i5xdfblkpazzc70p2dgxaf52"; libraryHaskellDepends = [ base bitmap bytestring ]; description = "A wrapper around Sean Barrett's JPEG/PNG decoder"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "stb-image-redux_0_2_1_2" = callPackage @@ -242531,8 +243316,8 @@ self: { libraryHaskellDepends = [ base vector ]; testHaskellDepends = [ base hspec vector ]; description = "Image loading and writing microlibrary"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -242545,8 +243330,8 @@ self: { libraryHaskellDepends = [ base vector ]; testHaskellDepends = [ base hspec vector ]; description = "Image loading and writing microlibrary"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -242558,7 +243343,7 @@ self: { sha256 = "1fk9qkra5f18wql76vakdq9796z0dbg1d4apv2zjj47rla43ii38"; libraryHaskellDepends = [ array base bytestring containers ]; description = "A wrapper around Sean Barrett's TrueType rasterizer library"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "stc-lang" = callPackage @@ -242591,8 +243376,8 @@ self: { test-framework-hunit time transformers ]; description = "A library for implicit, monadic dataflow parallelism"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -242604,7 +243389,7 @@ self: { sha256 = "0ldn5yxpj99yhhp5x7zlxjmd9qgqyjg68avr19k7argwcf3nr9y9"; doHaddock = false; description = "TBA"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "stdata" = callPackage @@ -242615,8 +243400,8 @@ self: { sha256 = "0ijir2knl4vc1cpzzmf32wcjfdc958li1wd7w5vdmgk4bx45kybf"; libraryHaskellDepends = [ base parsec syb template-haskell ]; description = "Structure Data Library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -242639,8 +243424,8 @@ self: { aeson base base64-bytestring binary bytestring split text ]; description = "Parse Structured Test Data Format (STDF)"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -242666,8 +243451,8 @@ self: { quickcheck-instances scientific word8 ]; description = "A simple and high performance IO toolkit for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) libuv;}; @@ -242681,8 +243466,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base directory parsec transformers ]; description = "List and launch steam games from the cli"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -242713,7 +243498,7 @@ self: { regex-tdfa semigroups stm streaming text yaml ]; description = "A file watcher and development tool"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "stego-uuid" = callPackage @@ -242726,8 +243511,8 @@ self: { libraryHaskellDepends = [ base bytestring cryptonite memory uuid ]; testHaskellDepends = [ base random uuid ]; description = "Generator and verifier for steganographic numbers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -242739,8 +243524,8 @@ self: { sha256 = "1pg6bk9p1agip8nqzvdpw1hjjf0nwq9fmr58750wda6il7nljx3m"; libraryHaskellDepends = [ base ]; description = "Haskell bindings to the Snowball stemming library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -242754,8 +243539,8 @@ self: { editedCabalFile = "0pvghdxgd56yjm33lrzk6343lklnfdw77g30vhbfddwwdx1ifx2v"; libraryHaskellDepends = [ base text ]; description = "Extract the stem of a German inflected word form"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -242774,7 +243559,7 @@ self: { ]; testHaskellDepends = [ base QuickCheck ]; description = "Staircase functions or piecewise constant functions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "stepwise" = callPackage @@ -242785,7 +243570,7 @@ self: { sha256 = "059k8g3wb4hkxk42vm83vv6kh3igrpf7fc97xvn3qai5rx3jmgqf"; libraryHaskellDepends = [ base containers mtl ]; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -242803,8 +243588,8 @@ self: { ]; benchmarkHaskellDepends = [ base criterion ]; description = "Positive rational numbers represented as paths in the Stern-Brocot tree"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -242833,8 +243618,8 @@ self: { tasty-rerun tasty-smallcheck template-haskell text ]; description = "Educational implementation of the STG (Spineless Tagless G-machine)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -242846,7 +243631,7 @@ self: { sha256 = "0iw1ia3sf4rwzbkcckbxzr288i6lbgv7vaaynyrkg2c17gjs492a"; libraryHaskellDepends = [ base ]; description = "get and set STICKYKEYS.SKF_HOTKEYACTIVE"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "stitch" = callPackage @@ -242863,7 +243648,7 @@ self: { testHaskellDepends = [ base Cabal hspec text ]; benchmarkHaskellDepends = [ base criterion ]; description = "lightweight CSS DSL"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "stm_2_5_0_0" = callPackage @@ -242876,8 +243661,8 @@ self: { editedCabalFile = "189fxk75h7n27kw7ndyn8nkxm3117qdh1dpag1mcs487kxghff62"; libraryHaskellDepends = [ array base ]; description = "Software Transactional Memory"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "stm-actor" = callPackage @@ -242893,7 +243678,7 @@ self: { ]; testHaskellDepends = [ base hspec mtl stm stm-queue ]; description = "A simplistic actor model based on STM"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "stm-channelize" = callPackage @@ -242904,7 +243689,7 @@ self: { sha256 = "1aj4zibq54ssbb7smkxjrjl24d9vccgjpl2b9261yqyg692cz9hm"; libraryHaskellDepends = [ base stm ]; description = "Transactional I/O for duplex streams"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "stm-chans" = callPackage @@ -242918,7 +243703,7 @@ self: { setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base stm ]; description = "Additional types of channels for STM"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "stm-chunked-queues" = callPackage @@ -242930,8 +243715,8 @@ self: { libraryHaskellDepends = [ async base stm ]; testHaskellDepends = [ async base HUnit stm tasty tasty-hunit ]; description = "Chunked Communication Queues"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -242957,7 +243742,7 @@ self: { test-framework-quickcheck2 transformers unliftio ]; description = "Introduces conduits to channels, and promotes using conduits concurrently"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "stm-containers" = callPackage @@ -242977,8 +243762,8 @@ self: { quickcheck-text rerebase ]; description = "Containers for STM"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -242991,7 +243776,7 @@ self: { libraryHaskellDepends = [ base stm ]; testHaskellDepends = [ base stm ]; description = "Updatable one-shot timer polled with STM"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "stm-extras" = callPackage @@ -243002,7 +243787,7 @@ self: { sha256 = "0pmpf1r8q1favrbgvrnggvs93vwvml79yfqbs4xjqnjsglahl8c8"; libraryHaskellDepends = [ base stm ]; description = "Extra STM functions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "stm-firehose" = callPackage @@ -243020,8 +243805,8 @@ self: { ]; testHaskellDepends = [ base hspec HUnit stm ]; description = "Conduits and STM operations for fire hoses"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -243048,8 +243833,8 @@ self: { rebase ]; description = "STM-specialised Hash Array Mapped Trie"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -243062,7 +243847,7 @@ self: { libraryHaskellDepends = [ base stm ]; testHaskellDepends = [ base hspec stm ]; description = "A library for constructing incremental computations"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "stm-io-hooks" = callPackage @@ -243073,7 +243858,7 @@ self: { sha256 = "021s1ck8b09z6khaky2g8ymxf37hznqrl9n4sakb8j57mhliayvc"; libraryHaskellDepends = [ array base mtl stm ]; description = "Launch your IO-actions from within the STM monad"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "stm-lifted" = callPackage @@ -243084,7 +243869,7 @@ self: { sha256 = "0zsah3s288cgb2h4gdjqvby1c3xp95nvgd561sdhigxcwlxk2658"; libraryHaskellDepends = [ base stm transformers ]; description = "Software Transactional Memory lifted to MonadIO"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "stm-linkedlist" = callPackage @@ -243095,7 +243880,7 @@ self: { sha256 = "1x65z38dx0qi55fmbarc1827wpl4j08m23nklq8854y7kqznf9kr"; libraryHaskellDepends = [ base stm ]; description = "Mutable, doubly linked lists for STM"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "stm-orelse-io" = callPackage @@ -243106,7 +243891,7 @@ self: { sha256 = "11v0xc5zlw641mf6r5k8lqhzxc4y9bsx3xivwmbkfniph0x7g5m4"; libraryHaskellDepends = [ base stm ]; description = "Choose between the return value of an STM operation and an IO action"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "stm-promise" = callPackage @@ -243118,8 +243903,8 @@ self: { libraryHaskellDepends = [ base mtl process stm unix ]; testHaskellDepends = [ base QuickCheck stm ]; description = "Simple STM Promises for IO computations and external processes"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -243136,7 +243921,7 @@ self: { async base criterion deepseq hspec stm time ]; description = "An implementation of a real-time concurrent queue"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "stm-queue-extras" = callPackage @@ -243147,7 +243932,7 @@ self: { sha256 = "1zb6i8dg11pshvb6rm5sqdsbq547h4ys6wlmh2ywcmks2ss7q100"; libraryHaskellDepends = [ base stm stm-chans ]; description = "Extra queue utilities for STM"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "stm-sbchan" = callPackage @@ -243158,7 +243943,7 @@ self: { sha256 = "0fz4vfbyr848b32vbdm3pjj9gwi7wj39l3vsqmdpjnbfwvkw0y0s"; libraryHaskellDepends = [ base stm stm-tlist ]; description = "Bounded channel for STM where item sizes can vary"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "stm-split" = callPackage @@ -243169,7 +243954,7 @@ self: { sha256 = "06c41p01x62p79bzwryjxr34l7cj65gl227fwwsvd9l6ihk8grp8"; libraryHaskellDepends = [ base stm ]; description = "TMVars, TVars and TChans with distinguished input and output side"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "stm-stats" = callPackage @@ -243182,8 +243967,8 @@ self: { base containers stm template-haskell time ]; description = "retry statistics for STM transactions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -243198,7 +243983,7 @@ self: { libraryHaskellDepends = [ base concurrent-supply ]; testHaskellDepends = [ async base QuickCheck random Unique ]; description = "STM wrapper around Control.Concurrent.Supply."; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "stm-tlist" = callPackage @@ -243209,7 +243994,7 @@ self: { sha256 = "0ssr8phmm9m93kcp045jr0rcn1dxzz202cgyw1vzjl2ch55bcsy6"; libraryHaskellDepends = [ base stm ]; description = "Mutable, singly-linked list in STM"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "stmcontrol" = callPackage @@ -243221,8 +244006,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base haskell98 mtl stm ]; description = "Control communication among retrying transactions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -243238,8 +244023,8 @@ self: { base Chart Chart-cairo containers mtl random ]; description = "Monadic composition of probabilistic functions and sampling"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -243257,8 +244042,8 @@ self: { ]; testHaskellDepends = [ base bytestring HUnit ]; description = "Library for the IEX Trading API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -243333,7 +244118,7 @@ self: { libraryHaskellDepends = [ base clock transformers ]; testHaskellDepends = [ base clock hspec ]; description = "A simple stopwatch utility"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "storable" = callPackage @@ -243344,8 +244129,8 @@ self: { sha256 = "10289mf3fskfpg0jwgzyhvg4arb0hcj3r94jngb3hlbidvf8k1jg"; libraryHaskellDepends = [ base mtl ]; description = "Storable type class for variable-sized data"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -243357,7 +244142,7 @@ self: { sha256 = "0fnwbfmd5vsaaqvf9182qdcjrzcfjd1zhdyvjwzifbwvn6r9kx4s"; libraryHaskellDepends = [ base base-orphans ]; description = "Storable instance for Complex"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "storable-endian" = callPackage @@ -243370,7 +244155,7 @@ self: { editedCabalFile = "12f8sscsvsarlwz3p6kk9vbvqsbyhs8lhafgn9h7c0z6pz1amrya"; libraryHaskellDepends = [ base byteorder ]; description = "Storable instances with endianness"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "storable-enum" = callPackage @@ -243381,7 +244166,7 @@ self: { sha256 = "01nllxm3fx9f1cxay80bwvmpawrwipk7d2c6xb1q5fr3iwnqqaa2"; libraryHaskellDepends = [ base prelude-compat ]; description = "Wrapper that makes any Enum type Storable"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "storable-record" = callPackage @@ -243396,7 +244181,7 @@ self: { base semigroups transformers utility-ht ]; description = "Elegant definition of Storable instances for records"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "storable-static-array" = callPackage @@ -243407,8 +244192,8 @@ self: { sha256 = "0akdh6v2cdq38jw8v69bn3m50g6wxanh0plikq4hj5mfrkg6xsxm"; libraryHaskellDepends = [ array base tagged vector ]; description = "Statically-sized array wrappers with Storable instances for FFI marshaling"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -243422,7 +244207,7 @@ self: { base base-orphans storable-record utility-ht ]; description = "Storable instance for pairs and triples"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "storablevector" = callPackage @@ -243445,7 +244230,7 @@ self: { base deepseq sample-frame unsafe utility-ht ]; description = "Fast, packed, strict storable arrays with a list interface like ByteString"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "storablevector-carray" = callPackage @@ -243456,7 +244241,7 @@ self: { sha256 = "1cqgfddaldxj2yig39fr2smm23nfz52dvh5grf4zr222djm7043i"; libraryHaskellDepends = [ base carray storablevector utility-ht ]; description = "Conversion between storablevector and carray"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "storablevector-streamfusion" = callPackage @@ -243471,8 +244256,8 @@ self: { base storablevector stream-fusion utility-ht ]; description = "Conversion between storablevector and stream-fusion lists with fusion"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -243521,7 +244306,7 @@ self: { unordered-containers vector vector-binary-instances void weigh ]; description = "Fast binary serialization"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "store-core" = callPackage @@ -243536,7 +244321,7 @@ self: { base bytestring ghc-prim primitive text transformers ]; description = "Fast and lightweight binary serialization"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "store-streaming" = callPackage @@ -243558,7 +244343,7 @@ self: { transformers void ]; description = "Streaming interfaces for `store`"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "stp" = callPackage @@ -243572,8 +244357,8 @@ self: { libraryHaskellDepends = [ base containers ]; executableHaskellDepends = [ base regex-compat ]; description = "Simple Theorem Prover"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -243590,8 +244375,8 @@ self: { utf8-string ]; description = "A type class to abstract between many different string types"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -243616,7 +244401,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "EDSL for AWS CloudFormation"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "stratum-tool" = callPackage @@ -243636,8 +244421,8 @@ self: { unordered-containers vector ]; description = "Client for Stratum protocol"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.agpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -243653,8 +244438,8 @@ self: { base stratux-http stratux-types stratux-websockets ]; description = "A library for stratux"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -243677,8 +244462,8 @@ self: { transformers ]; description = "A demonstration of the stratux library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -243694,8 +244479,8 @@ self: { aeson base HTTP network-uri stratux-types transformers utf8-string ]; description = "A library for using HTTP with stratux"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -243711,8 +244496,8 @@ self: { aeson base bytestring lens scientific text time ]; description = "A library for reading JSON output from stratux"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -243729,8 +244514,8 @@ self: { websockets ]; description = "A library for using websockets with stratux"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -243750,8 +244535,8 @@ self: { base bytestring criterion ghc-prim temporary vector ]; description = "Initial project template from stack"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -243765,8 +244550,8 @@ self: { editedCabalFile = "1jyb8mc99ag72y4bqxw997klrikhnxqrbacmx2ag5kmwsd1v1p12"; libraryHaskellDepends = [ base ]; description = "Faster Haskell lists using stream fusion"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -243780,8 +244565,8 @@ self: { isExecutable = true; libraryHaskellDepends = [ base logict ]; description = "Simple, Fair and Terminating Backtracking Monad"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -243793,8 +244578,8 @@ self: { sha256 = "0dg5hmv61jnpqby4v5g4wpsb7ynsm56fmb3xj2pixswnzqz31ian"; libraryHaskellDepends = [ base bytestring hidapi mtl split ]; description = "Control library for the Elgato Stream Deck"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -243813,8 +244598,8 @@ self: { random transformers utility-ht ]; description = "Programmatically edit MIDI event streams via ALSA"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -243830,7 +244615,7 @@ self: { base containers ghc-prim mmorph mtl transformers transformers-base ]; description = "an elementary streaming prelude and general stream type"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "streaming-attoparsec" = callPackage @@ -243849,7 +244634,7 @@ self: { tasty-hunit ]; description = "Attoparsec integration for the streaming ecosystem"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "streaming-base64" = callPackage @@ -243870,8 +244655,8 @@ self: { streaming-with tasty tasty-golden ]; description = "Streaming conversion from/to base64"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -243897,8 +244682,8 @@ self: { streaming streamly template-haskell transformers vector ]; description = "Benchmarks to compare streaming packages"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -243917,7 +244702,7 @@ self: { base binary bytestring hspec streaming streaming-bytestring ]; description = "Streaming interface to binary"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "streaming-bracketed" = callPackage @@ -243934,7 +244719,7 @@ self: { streaming-commons tasty tasty-hunit ]; description = "A resource management decorator for \"streaming\""; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "streaming-brotli" = callPackage @@ -243954,8 +244739,8 @@ self: { test-framework test-framework-hunit test-framework-quickcheck2 ]; description = "Streaming interface for Brotli (RFC7932) compression"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -243977,7 +244762,7 @@ self: { tasty-smallcheck transformers ]; description = "Fast, effectful byte streams"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "streaming-cassava" = callPackage @@ -243998,8 +244783,8 @@ self: { vector ]; description = "Cassava support for the streaming ecosystem"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -244022,7 +244807,7 @@ self: { ]; benchmarkHaskellDepends = [ base bytestring deepseq gauge text ]; description = "Common lower-level functions needed by various streaming data libraries"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "streaming-concurrency" = callPackage @@ -244046,8 +244831,8 @@ self: { testbench ]; description = "Concurrency support for the streaming ecosystem"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -244064,8 +244849,8 @@ self: { ]; testHaskellDepends = [ base conduit hspec streaming ]; description = "Bidirectional support between the streaming and conduit libraries"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -244082,8 +244867,8 @@ self: { streaming-attoparsec streaming-bytestring wai-extra ]; description = "Client-side consumption of a ServerEvent"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -244104,7 +244889,7 @@ self: { streaming tasty tasty-hunit tasty-quickcheck ]; description = "Translate pull-based stream folds into push-based iteratees"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "streaming-fft" = callPackage @@ -244119,8 +244904,8 @@ self: { base contiguous-fft ghc-prim prim-instances primitive streaming ]; description = "online streaming fft"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -244137,7 +244922,7 @@ self: { base containers tasty tasty-hunit tasty-quickcheck ]; benchmarkHaskellDepends = [ base criterion ]; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "streaming-lzma" = callPackage @@ -244157,8 +244942,8 @@ self: { test-framework test-framework-hunit test-framework-quickcheck2 ]; description = "Streaming interface for LZMA/XZ compression"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -244181,8 +244966,8 @@ self: { vector zlib ]; description = "A hand-written streaming byte parser for OpenStreetMap Protobuf data"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -244204,8 +244989,8 @@ self: { streaming-attoparsec streaming-bytestring tasty tasty-hunit ]; description = "Stream packets via libpcap"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -244226,8 +245011,8 @@ self: { vector ]; description = "Perfectly streaming PNG image decoding"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -244245,7 +245030,7 @@ self: { resourcet safe-exceptions streaming transformers ]; description = "Stream postgresql-query results using the streaming library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "streaming-process" = callPackage @@ -244269,8 +245054,8 @@ self: { streaming-bytestring ]; description = "Streaming support for running system process"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -244292,8 +245077,8 @@ self: { streaming-with transformers ]; description = "Sorting streams"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -244315,8 +245100,8 @@ self: { streaming-bytestring streaming-commons transformers ]; description = "http, attoparsec, pipes and other utilities for the streaming libraries"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -244332,8 +245117,8 @@ self: { base bytestring bytestring-builder http-types streaming wai ]; description = "Streaming Wai utilities"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ jb55 ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jb55 ]; }) {}; "streaming-with" = callPackage @@ -244350,8 +245135,8 @@ self: { base exceptions managed streaming-bytestring temporary transformers ]; description = "with/bracket-style idioms for use with streaming"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -244379,7 +245164,7 @@ self: { transformers ]; description = "Beautiful Streaming, Concurrent and Reactive Composition"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "streamly-archive" = callPackage @@ -244400,8 +245185,8 @@ self: { ]; testSystemDepends = [ archive ]; description = "Stream data from archives using the streamly library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {archive = null;}; @@ -244418,7 +245203,7 @@ self: { base binary bytestring hspec QuickCheck streamly ]; description = "Integration of streamly and binary"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "streamly-bytestring" = callPackage @@ -244440,7 +245225,7 @@ self: { base bytestring deepseq gauge random streamly ]; description = "Library for streamly and bytestring interoperation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "streamly-cassava" = callPackage @@ -244466,7 +245251,7 @@ self: { vector weigh ]; description = "CSV streaming support via cassava for the streamly ecosystem"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "streamly-fsnotify" = callPackage @@ -244481,7 +245266,7 @@ self: { base filepath fsnotify semirings streamly text time ]; description = "Folder watching as a Streamly stream"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "streamly-lmdb" = callPackage @@ -244500,8 +245285,8 @@ self: { ]; testSystemDepends = [ lmdb ]; description = "Stream data to or from LMDB databases using the streamly library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) lmdb;}; @@ -244523,7 +245308,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Posix related streaming APIs"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "streamproc" = callPackage @@ -244536,8 +245321,8 @@ self: { editedCabalFile = "19c51gks028x8mnywkx1nz0s6bwn2mxs5ddmaj2q8n9l5pvfkcgs"; libraryHaskellDepends = [ base ]; description = "Stream Processer Arrow"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -244553,7 +245338,7 @@ self: { adjunctions base comonad distributive semigroupoids semigroups ]; description = "Various Haskell 2010 stream comonads"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "strelka" = callPackage @@ -244574,8 +245359,8 @@ self: { transformers unordered-containers url-decoders uuid ]; description = "A simple, flexible and composable web-router"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -244592,7 +245377,7 @@ self: { unordered-containers ]; description = "Core components of \"strelka\""; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "strelka-wai" = callPackage @@ -244608,7 +245393,7 @@ self: { strelka-core text unordered-containers wai warp ]; description = "WAI compatibility layer for \"strelka\""; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "strict" = callPackage @@ -244624,7 +245409,7 @@ self: { transformers ]; description = "Strict data types and String IO"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "strict-base" = callPackage @@ -244637,7 +245422,7 @@ self: { editedCabalFile = "17zgiwiahgjvdamfcffx2dj88qlks4sgrmsqancz5vayp4yf9x1g"; libraryHaskellDepends = [ base ]; description = "Strict versions of base data types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "strict-base-types" = callPackage @@ -244652,8 +245437,8 @@ self: { aeson base quickcheck-instances strict strict-lens ]; description = "Strict variants of the types provided in base"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -244665,7 +245450,7 @@ self: { sha256 = "1h2nk5fn6gclzkwn5mbkb7gcqisms8y5m3kr64hd9lska3n39n82"; libraryHaskellDepends = [ base deepseq ]; description = "Strict concurrency abstractions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "strict-data" = callPackage @@ -244689,8 +245474,8 @@ self: { base containers deepseq doctest hashable HTF vector ]; description = "A collection of commonly used strict data structures"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -244702,8 +245487,8 @@ self: { sha256 = "0hx1zp99npwdp5w3q93xfidcw59lxskilmbqc80xi97d4w4h8jrb"; libraryHaskellDepends = [ base ghc syb ]; description = "Compiler plugin for making Haskell strict"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -244717,7 +245502,7 @@ self: { editedCabalFile = "0lvazdvzfaawrbj3pklc9p3q1ajfclzirpsiw84hhgn16pqy7fnz"; libraryHaskellDepends = [ base ]; description = "Strict Identity Monad, handy for writing fast code!"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "strict-io" = callPackage @@ -244728,7 +245513,7 @@ self: { sha256 = "1jcm1p1slbdxmbnmvqihvgf2czfaj4yks4hyqiv9ng95w9cfpagr"; libraryHaskellDepends = [ base deepseq extensible-exceptions ]; description = "A library wrapping standard IO modules to provide strict IO"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "strict-lens" = callPackage @@ -244739,7 +245524,7 @@ self: { sha256 = "0hwrbrjhgkh83474mci3ipg8nqims7b18w7i6xajz3xxq3cik5vn"; libraryHaskellDepends = [ base lens strict ]; description = "Lenses for types in strict package"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "strict-list" = callPackage @@ -244756,7 +245541,7 @@ self: { tasty-quickcheck ]; description = "Strict linked list"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "strict-optics" = callPackage @@ -244767,7 +245552,7 @@ self: { sha256 = "1x4p2fksljd9xfy4mxdz5pxcskxz2qg2ma28d6y4j2v4728r0x8a"; libraryHaskellDepends = [ base optics-core strict ]; description = "Optics for types in strict package"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "strict-tuple" = callPackage @@ -244779,7 +245564,7 @@ self: { libraryHaskellDepends = [ base bifunctors deepseq hashable ]; testHaskellDepends = [ base ]; description = "Strict tuples"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "strict-tuple-lens" = callPackage @@ -244792,8 +245577,8 @@ self: { editedCabalFile = "0875r7kva6ym17fdklh18vm4s04sd9pj0w55km8jv2kmbkmfja8k"; libraryHaskellDepends = [ base lens strict-tuple ]; description = "Optics for the `strict-tuple` library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -244810,7 +245595,7 @@ self: { unordered-containers vector ]; description = "A type level predicate ranging over strict types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "strict-writer" = callPackage @@ -244822,7 +245607,7 @@ self: { libraryHaskellDepends = [ base mtl ]; testHaskellDepends = [ base doctest ]; description = "A stricter writer, which uses StateT in order to avoid space leaks"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "strictify" = callPackage @@ -244837,7 +245622,7 @@ self: { base directory filepath process unix ]; description = "Find a local optimum of strictness annotations"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "strictly" = callPackage @@ -244848,8 +245633,8 @@ self: { sha256 = "1a3azrg9ksb4kmbckjqw3krxj0app6q19ighd6k3z7xpf682qx3c"; libraryHaskellDepends = [ base deepseq ]; description = "Combinators for strictifying functions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -244861,7 +245646,7 @@ self: { sha256 = "1l94p8c9j8a2dbpwj5q7d1m61gdhmi6vllz34g8d9qjfwpnx7z6z"; doHaddock = false; description = "None"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "string-class" = callPackage @@ -244872,7 +245657,7 @@ self: { sha256 = "1s0bj0wvwriw4516za6ar7w7zsz5mmnf1dba0ch239n27rb00nwf"; libraryHaskellDepends = [ base bytestring tagged text ]; description = "String class library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "string-combinators" = callPackage @@ -244883,7 +245668,7 @@ self: { sha256 = "07ky2z5f1l5mb7r3rvyraak0bzciq4krkg5lv8g0a5vxpnzlm4cl"; libraryHaskellDepends = [ base ]; description = "Polymorphic functions to build and combine stringlike values"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "string-conv" = callPackage @@ -244894,7 +245679,7 @@ self: { sha256 = "0fb04bm384rpiq7kd7v783z1sriqialvjyn0f6dg2si9dwza0ngj"; libraryHaskellDepends = [ base bytestring text ]; description = "Standardized conversion between string types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "string-conversions" = callPackage @@ -244911,7 +245696,7 @@ self: { utf8-string ]; description = "Simplifies dealing with different types for strings"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "string-convert" = callPackage @@ -244927,7 +245712,7 @@ self: { base bytestring tasty tasty-hunit text utf8-string ]; description = "Universal string conversions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "string-fromto" = callPackage @@ -244938,7 +245723,7 @@ self: { sha256 = "0vnf500vahgccbbg7zvxqjxllvyq3jxzf2difqwh46fp62jfqwmx"; libraryHaskellDepends = [ base bytestring memory text ]; description = "Conversions between common string types, as well as Base16/Base32/Base64"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "string-interpolate" = callPackage @@ -244968,7 +245753,7 @@ self: { neat-interpolation QuickCheck text ]; description = "Haskell string/text/bytestring interpolation that just works"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "string-isos" = callPackage @@ -244983,8 +245768,8 @@ self: { base bytestring mono-traversable safe text type-iso ]; description = "Tools for working with isomorphisms of strings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -244996,7 +245781,7 @@ self: { sha256 = "1b87532fhv2wn6pnzsaw20lzj5j399smlfn7lai0h0ph2axb2dbi"; libraryHaskellDepends = [ base bytestring text ]; description = "A package that aims to provide a uniform interface to string-like types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "string-qq" = callPackage @@ -245008,7 +245793,7 @@ self: { libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base HUnit text ]; description = "QuasiQuoter for non-interpolated strings, texts and bytestrings"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "string-quote" = callPackage @@ -245020,8 +245805,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base template-haskell ]; description = "QuasiQuoter for non-interpolated strings, texts and bytestrings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -245032,31 +245817,6 @@ self: { }: mkDerivation { pname = "string-random"; - version = "0.1.3.0"; - sha256 = "18yni8zm51x65i5h1c4sr9msd5fqa3fnh3zm0dck2wk364xz7dsy"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - attoparsec base containers random text transformers - ]; - executableHaskellDepends = [ base optparse-applicative text ]; - testHaskellDepends = [ - base bytestring pcre-heavy QuickCheck tasty tasty-hunit - tasty-quickcheck text - ]; - description = "A library for generating random string from a regular experession"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "string-random_0_1_4_0" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers - , optparse-applicative, pcre-heavy, QuickCheck, random, tasty - , tasty-hunit, tasty-quickcheck, text, transformers - }: - mkDerivation { - pname = "string-random"; version = "0.1.4.0"; sha256 = "09xv1jbhsz8hfxc6y54fj4pkhyxfbfh53i6kxy408zm3raa2nmii"; isLibrary = true; @@ -245070,8 +245830,8 @@ self: { tasty-quickcheck text ]; description = "A library for generating random string from a regular experession"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -245087,7 +245847,7 @@ self: { testHaskellDepends = [ base bytestring hspec QuickCheck ]; benchmarkHaskellDepends = [ base criterion ]; description = "longest common substring"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "string-transform" = callPackage @@ -245103,7 +245863,7 @@ self: { base bytestring tasty tasty-hunit tasty-smallcheck text utf8-string ]; description = "simple and easy haskell string transform wrapper"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "string-typelits" = callPackage @@ -245118,8 +245878,8 @@ self: { base template-haskell type-combinators type-combinators-quote ]; description = "Type-level Chars and Strings, with decidable equality"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -245131,7 +245891,7 @@ self: { sha256 = "10jsvbiqbmnbipv1566k5mqkpgfyrzbk8m7b18rqjb5m3qg9dbz7"; libraryHaskellDepends = [ base bytestring system-filepath text ]; description = "A Stringable type class, in the spirit of Foldable and Traversable"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "stringbuilder" = callPackage @@ -245143,7 +245903,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "A writer monad for multi-line string literals"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "stringlike" = callPackage @@ -245160,8 +245920,8 @@ self: { test-framework-quickcheck2 text ]; description = "Transformations to several string-like types"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -245179,7 +245939,7 @@ self: { text-icu ]; description = "Implements the \"StringPrep\" algorithm"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "strings" = callPackage @@ -245190,7 +245950,7 @@ self: { sha256 = "1xz9v3w5s13yhk7iy9dw6i8s2jc6c0b1ci96dwmcq9a1n3l3ng4v"; libraryHaskellDepends = [ base bytestring text ]; description = "Functions for working with strings, including Text, ByteString, etc"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "stringsearch" = callPackage @@ -245203,7 +245963,7 @@ self: { editedCabalFile = "0z5pz5dccapz9k39r2zmf056m0x2m2lj3jahhnw3mfxlmps07378"; libraryHaskellDepends = [ array base bytestring containers ]; description = "Fast searching, splitting and replacing of ByteStrings"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "stringtable-atom" = callPackage @@ -245214,8 +245974,8 @@ self: { sha256 = "1wp6w12bflrqcwi09y7s1crj72n4pbj8bkpwj2ia5gaqn5x56wjs"; libraryHaskellDepends = [ base binary bytestring containers syb ]; description = "Memoize Strings as Atoms for fast comparison and sorting, with maps and sets"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -245231,7 +245991,7 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Initial project template from stack"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "strip-ansi-escape" = callPackage @@ -245245,7 +246005,7 @@ self: { libraryHaskellDepends = [ attoparsec base text ]; testHaskellDepends = [ base hspec QuickCheck text ]; description = "Strip ANSI escape code from string"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "stripe" = callPackage @@ -245261,8 +246021,8 @@ self: { unordered-containers utf8-string ]; description = "A Haskell implementation of the Stripe API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -245274,7 +246034,7 @@ self: { sha256 = "0n4q3hsgqrqypmkkim8mcksdlljgldr908wqxlcz6k1wsv9klyc6"; libraryHaskellDepends = [ base bytestring text ]; description = "Types for the Stripe API"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "stripe-core" = callPackage @@ -245290,7 +246050,7 @@ self: { unordered-containers ]; description = "Stripe API for Haskell - Pure Core"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "stripe-haskell" = callPackage @@ -245301,7 +246061,7 @@ self: { sha256 = "02ydf9i632r2clhvf1f9v0yx7vmpmh37mch1jshazrw3my6sq1vl"; libraryHaskellDepends = [ base stripe-core stripe-http-client ]; description = "Stripe API for Haskell"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "stripe-hs" = callPackage @@ -245326,8 +246086,8 @@ self: { timespan vector ]; description = "Unofficial Stripe client"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -245347,7 +246107,7 @@ self: { base free hspec http-client stripe-core stripe-tests ]; description = "Stripe API for Haskell - http-client backend"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "stripe-http-streams" = callPackage @@ -245367,8 +246127,8 @@ self: { ]; doCheck = false; description = "Stripe API for Haskell - http-streams backend"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -245385,8 +246145,8 @@ self: { stripe-signature text unordered-containers ]; description = "Listen for Stripe webhook events with Scotty"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -245403,7 +246163,7 @@ self: { unordered-containers vector ]; description = "Unofficial Stripe servant types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "stripe-signature" = callPackage @@ -245420,7 +246180,7 @@ self: { ]; testHaskellDepends = [ base bytestring text ]; description = "Verification of Stripe webhook signatures"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "stripe-tests" = callPackage @@ -245437,7 +246197,7 @@ self: { text time transformers unordered-containers ]; description = "Tests for Stripe API bindings for Haskell"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "stripe-wreq" = callPackage @@ -245453,8 +246213,8 @@ self: { unordered-containers wreq ]; description = "Use the Stripe API via Wreq"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -245472,7 +246232,7 @@ self: { mtl scientific text time transformers unordered-containers vector ]; description = "Stripe-Library"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "strips" = callPackage @@ -245486,7 +246246,7 @@ self: { libraryHaskellDepends = [ base containers mtl ]; testHaskellDepends = [ base containers hspec mtl ]; description = "resolver using strips algorithm"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "strive" = callPackage @@ -245505,7 +246265,7 @@ self: { testHaskellDepends = [ base bytestring markdown-unlit time ]; testToolDepends = [ markdown-unlit ]; description = "A client for the Strava V3 API"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "strongswan-sql" = callPackage @@ -245536,8 +246296,8 @@ self: { network structured-cli text transformers ]; description = "Interface library for strongSwan SQL backend"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -245549,7 +246309,7 @@ self: { sha256 = "1f42yf49fqr2fyjfakscmmlnmw3w5rg7wyy6gjyrf0gcgsh0h9fd"; libraryHaskellDepends = [ base bytestring text time ]; description = "Efficient parsing of LocalTime using a binding to C's strptime, with some extra features (i.e. fractional seconds)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "structs" = callPackage @@ -245571,7 +246331,7 @@ self: { tasty-hunit tasty-quickcheck ]; description = "Strict GC'd imperative object-oriented programming with cheap pointers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "structural-induction" = callPackage @@ -245591,8 +246351,8 @@ self: { testing-feat ]; description = "Instantiate structural induction schemas for algebraic data types"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -245605,8 +246365,8 @@ self: { libraryHaskellDepends = [ base mtl template-haskell ]; testHaskellDepends = [ base HUnit mtl ]; description = "Initial project template from stack"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -245628,7 +246388,7 @@ self: { unordered-containers uuid-types vector ]; description = "Structure (hash) of your data types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "structured-cli" = callPackage @@ -245648,7 +246408,7 @@ self: { ]; executableHaskellDepends = [ base data-default mtl split ]; description = "Application library for building interactive console CLIs"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "structured-cli_2_7_0_1" = callPackage @@ -245666,8 +246426,8 @@ self: { ]; executableHaskellDepends = [ base data-default mtl split ]; description = "Application library for building interactive console CLIs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "structured-haskell-mode" = callPackage @@ -245687,8 +246447,8 @@ self: { base descriptive ghc-prim haskell-src-exts text ]; description = "Structured editing Emacs mode for Haskell"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ peti ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ peti ]; }) {}; "structured-mongoDB" = callPackage @@ -245707,7 +246467,7 @@ self: { ]; description = "Structured MongoDB interface"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -245738,8 +246498,8 @@ self: { unordered-containers vector ]; description = "\"Advanced\" Data Structures"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -245756,8 +246516,8 @@ self: { base tasty tasty-hunit tasty-quickcheck transformers ]; description = "A monad transformer version of the ST monad"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -245781,8 +246541,8 @@ self: { unbounded-delays ]; description = "RFC 5389: Session Traversal Utilities for NAT (STUN) client"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -245803,8 +246563,8 @@ self: { lambdacube-bullet lambdacube-engine mtl random vector ]; description = "A revival of the classic game Stunts (LambdaCube tech demo)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -245832,8 +246592,8 @@ self: { attoparsec base snipcheck tasty tasty-ant-xml tasty-hunit ]; description = "(Stutter Text|String)-Utterer"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -245860,8 +246620,8 @@ self: { testHaskellDepends = [ base base-compat bytestring hspec ]; doHaddock = false; description = "Format Cabal files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -245892,7 +246652,7 @@ self: { test-framework test-framework-hunit text ]; description = "Haskell code prettifier"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "stylist" = callPackage @@ -245904,6 +246664,8 @@ self: { pname = "stylist"; version = "2.4.0.0"; sha256 = "0nkz6jnfx7si473lz0b907lq6zjpw2apbcph61s2aw44j5zgdg96"; + revision = "1"; + editedCabalFile = "18amb2sbp4qh2lszc21vpvnyqsbsy7s9396ivkcw7dmg7hljvk9a"; libraryHaskellDepends = [ async base css-syntax hashable network-uri regex-tdfa text unordered-containers @@ -245913,8 +246675,8 @@ self: { regex-tdfa scientific text unordered-containers ]; description = "Apply CSS styles to a document tree"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -245927,7 +246689,7 @@ self: { libraryHaskellDepends = [ ansi-terminal base ]; description = "Ways to output stylized text on ANSI consoles"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -245967,8 +246729,8 @@ self: { svg-builder text transformers warp websockets ]; description = "An applicative functor that seamlessly talks to HTML inputs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -245986,8 +246748,8 @@ self: { tasty-quickcheck ]; description = "Get the total, put a single element"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -245999,7 +246761,7 @@ self: { sha256 = "17fzdwlmh8ykwqn9h9a60wpnvqbgbz0wk6cgcrglbj0i41jy28jv"; libraryHaskellDepends = [ base ]; description = "Some extension to the Foldable and Monoid classes"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "subG-instances" = callPackage @@ -246010,7 +246772,7 @@ self: { sha256 = "0nyhd0l0cd1q62ch9jbjyv33f9sdidpgkjbkb0hj4dagqyxpv0jy"; libraryHaskellDepends = [ base subG vector ]; description = "Additional instances for the InsertLeft class from subG package"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "subcategories" = callPackage @@ -246039,7 +246801,7 @@ self: { ]; testToolDepends = [ tasty-discover ]; description = "Subcategories induced by class constraints"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "subhask" = callPackage @@ -246065,8 +246827,8 @@ self: { ]; benchmarkHaskellDepends = [ base criterion MonadRandom ]; description = "Type safe interface for programming in subcategories of Hask"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -246088,8 +246850,8 @@ self: { base containers lens mtl parsec pretty template-haskell ]; description = "Toolchain of subleq computer"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -246111,8 +246873,8 @@ self: { base cmark hlint hspec template-haskell text ]; description = "Extract a part from CommonMark/Markdown docs"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -246124,7 +246886,7 @@ self: { sha256 = "199kslgxlhxv8zx3mj5pxgicjxyff7vzjhw13fwfxcf9pa9289nv"; libraryHaskellDepends = [ base split ]; description = "subnetting calculator"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "subsample" = callPackage @@ -246142,8 +246904,8 @@ self: { base bytestring cassava containers optparse-generic text vector ]; description = "Subsample data"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -246162,8 +246924,8 @@ self: { attoparsec base hspec NoTrace parsers QuickCheck text ]; description = "Match / replace substrings with a parser combinators"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -246175,7 +246937,7 @@ self: { sha256 = "1kkr6zbnv777gnv2lwq3pyxq3vv5r24f4avwv5g4dds3y8d8mv3q"; libraryHaskellDepends = [ attoparsec base containers text ]; description = "A parser for .srt and .sub files"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "subtitles" = callPackage @@ -246188,7 +246950,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base split ]; description = "Modify SRT subtitle files"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "subwordgraph" = callPackage @@ -246200,8 +246962,8 @@ self: { libraryHaskellDepends = [ base containers mtl ]; testHaskellDepends = [ base QuickCheck ]; description = "Subword graph implementation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -246214,7 +246976,7 @@ self: { libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers hspec ]; description = "Helps when going \"seed values\" -> alternatives and optional -> answers"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }) {}; "success" = callPackage @@ -246229,7 +246991,7 @@ self: { base monad-control mtl transformers transformers-base ]; description = "A version of Either specialised for encoding of success or failure"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "successors" = callPackage @@ -246240,8 +247002,8 @@ self: { sha256 = "1m5flnn2rswc3380dccnfnhmyjp1dqr23dljd0515jxawbgjkzmg"; libraryHaskellDepends = [ base ]; description = "An applicative functor to manage successors"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -246262,8 +247024,8 @@ self: { ]; benchmarkHaskellDepends = [ base criterion random ]; description = "Simple and moderately efficient suffix array implementation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -246278,8 +247040,8 @@ self: { libraryHaskellDepends = [ base vector ]; executableHaskellDepends = [ base HUnit ]; description = "n log n implementation of suffix array"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -246291,7 +247053,7 @@ self: { sha256 = "1ddk2hp27al9jzcgkrhv7v1i7knci4l22flkgb2r94h96z5nhfq6"; libraryHaskellDepends = [ base bytestring containers ]; description = "Efficient, lazy suffix tree implementation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "sugarhaskell" = callPackage @@ -246305,7 +247067,7 @@ self: { executableHaskellDepends = [ base process ]; description = "Library-based syntactic extensibility for Haskell"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -246317,8 +247079,8 @@ self: { sha256 = "1pvw7zgvfr0z2gjy224gd92ayh20j3v97rdlqmq6k6g4yabdpgci"; libraryHaskellDepends = [ base containers ]; description = "Abstract over the constraints on the parameters to type constructors"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -246331,7 +247093,7 @@ self: { libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base hspec template-haskell ]; description = "Library for reducing the boilerplate involved with sum types"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "summer" = callPackage @@ -246343,7 +247105,7 @@ self: { libraryHaskellDepends = [ base vector ]; testHaskellDepends = [ base ]; description = "An implementation of extensible products and sums"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "summoner" = callPackage @@ -246370,8 +247132,8 @@ self: { validation-selective ]; description = "Tool for scaffolding fully configured batteries-included production-level Haskell projects"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -246391,8 +247153,8 @@ self: { ]; executableHaskellDepends = [ base relude ]; description = "Tool for scaffolding fully configured batteries-included production-level Haskell projects using TUI"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -246410,8 +247172,8 @@ self: { base bytestring data-default lens serialport transformers vector ]; description = "A Haskell interface to SUMP-compatible logic analyzers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -246423,7 +247185,7 @@ self: { sha256 = "09xh3pbyarflfjk17bn2isgpmsq49d6gmq7z918kf4c32fc7x6yb"; libraryHaskellDepends = [ base bytestring text ]; description = "Bindings to the sundown markdown library"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "sunlight" = callPackage @@ -246439,8 +247201,8 @@ self: { tuple ]; description = "Test Cabalized package against multiple dependency versions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -246458,8 +247220,8 @@ self: { semigroups tagged template-haskell transformers vector-space ]; description = "Monadic Javascript Compiler"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -246481,8 +247243,8 @@ self: { sunroof-server ]; description = "Tests for Sunroof"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -246504,8 +247266,8 @@ self: { wai-middleware-static warp ]; description = "Monadic Javascript Compiler - Server Utilities"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -246535,8 +247297,8 @@ self: { process QuickCheck text transformers unix validity validity-path ]; description = "Configure your dotfile deployment with a DSL"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -246551,8 +247313,8 @@ self: { libraryHaskellDepends = [ base containers mtl ]; testHaskellDepends = [ base containers hspec ]; description = "Find \"superbubbles\", as described in https://arxiv.org/abs/1307.7925"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -246570,7 +247332,7 @@ self: { async base buffer-builder bytestring criterion ]; description = "Efficiently build a bytestring from smaller chunks"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "supercollider-ht" = callPackage @@ -246588,7 +247350,7 @@ self: { ]; description = "Haskell SuperCollider utilities"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -246612,7 +247374,7 @@ self: { ]; description = "Demonstrate how to control SuperCollider via ALSA-MIDI"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -246629,8 +247391,8 @@ self: { template-haskell type-eq ]; description = "Access an instance's constraints"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -246645,7 +247407,7 @@ self: { base Cabal containers directory filepath ]; description = "Additional documentation markup and Unicode support"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "superevent" = callPackage @@ -246670,8 +247432,8 @@ self: { transformers uuid vector ]; description = "A simple opinionated event store implementation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -246688,8 +247450,8 @@ self: { ]; testHaskellDepends = [ base containers ghc QuickCheck ]; description = "Plugin and base library to support supermonads in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -246710,8 +247472,8 @@ self: { ]; testHaskellDepends = [ aeson async base bytestring streamly text ]; description = "Apache Pulsar client for Haskell"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -246730,8 +247492,8 @@ self: { process time uniplate ]; description = "A Supercompiler"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -246751,7 +247513,7 @@ self: { aeson base bookkeeper criterion deepseq labels text ]; description = "Supercharged anonymous records"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "supervisor" = callPackage @@ -246764,8 +247526,8 @@ self: { base containers exceptions monadloc mtl ]; description = "Control an internal monad execution for trace generation, backtrakcking, testing and other purposes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -246775,16 +247537,14 @@ self: { }: mkDerivation { pname = "supervisors"; - version = "0.2.0.0"; - sha256 = "0q6r211sbb9dyrplr61xajbwcfvz7z93401mhqxhw3pz55vyrg8i"; - revision = "2"; - editedCabalFile = "0pnxmbw3wb0dcbhpl583ffd991iv3zy4xf6xi5z3qhn5qh8nrmz1"; + version = "0.2.1.0"; + sha256 = "146nrqi8bjdvarz8i689ympid5d9jbrcm0bdv0q8jxi9zvwb3gvq"; libraryHaskellDepends = [ async base containers safe-exceptions stm ]; testHaskellDepends = [ base hspec ]; description = "Monitor groups of threads with non-hierarchical lifetimes"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "supplemented" = callPackage @@ -246802,8 +247562,8 @@ self: { tasty-quickcheck tasty-smallcheck ]; description = "Early termination for monads"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -246815,8 +247575,8 @@ self: { sha256 = "1nhq7lfzsbh9ra1m1n7649q35ch6l1lgm110p1qbxgvv6w6xmz41"; libraryHaskellDepends = [ base lens mtl template-haskell ]; description = "An output coverage checker"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -246828,7 +247588,7 @@ self: { sha256 = "0wphk3dabba6rgd9lkxbsmq5vivvyy6b4jfxfndqb53yhdj5nkrg"; libraryHaskellDepends = [ base lifted-base transformers-base ]; description = "Simple package that allows for long thread suspensions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "sv" = callPackage @@ -246856,8 +247616,8 @@ self: { vector ]; description = "Encode and decode separated values (CSV, PSV, ...)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -246879,7 +247639,7 @@ self: { base bytestring cassava HUnit sv-core text validation vector ]; description = "Integration to use sv with cassava's parser"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "sv-core" = callPackage @@ -246906,7 +247666,7 @@ self: { tasty tasty-quickcheck text validation vector ]; description = "Encode and decode separated values (CSV, PSV, ...)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "sv-svfactor" = callPackage @@ -246923,8 +247683,8 @@ self: { base bytestring lens profunctors sv-core svfactor validation ]; description = "sv-core + svfactor"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -246950,8 +247710,8 @@ self: { tasty-hedgehog tasty-hunit text trifecta utf8-string vector ]; description = "Syntax-preserving CSV manipulation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -246969,8 +247729,8 @@ self: { base blaze-builder bytestring hashable text unordered-containers ]; description = "DSL for building SVG"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -246986,8 +247746,8 @@ self: { base blaze-builder bytestring hashable text unordered-containers ]; description = "DSL for building SVG"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -247005,7 +247765,7 @@ self: { scientific text transformers vector xml ]; description = "SVG file loader and serializer"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "svg2q" = callPackage @@ -247022,8 +247782,8 @@ self: { base haskell98 language-c pretty svgutils syb xml ]; description = "Code generation tool for Quartz code from a SVG"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -247040,8 +247800,8 @@ self: { libraryHaskellDepends = [ base cairo glib mtl text ]; libraryPkgconfigDepends = [ librsvg ]; description = "Binding to the libsvg-cairo library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) librsvg;}; @@ -247065,8 +247825,8 @@ self: { lens linear mtl pretty-simple process reanimate-svg safe text ]; description = "Optimise SVGs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -247081,8 +247841,8 @@ self: { libraryHaskellDepends = [ base xml ]; executableHaskellDepends = [ base filepath xml ]; description = "Helper functions for dealing with SVG files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -247094,7 +247854,7 @@ self: { sha256 = "19fr1lzp8j0hmqqy1hyx85gmkgxc2hy8cz5zv6jlvni0qqibiksz"; libraryHaskellDepends = [ array base ]; description = "A support vector machine written in Haskell"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "svm-light-utils" = callPackage @@ -247107,8 +247867,8 @@ self: { editedCabalFile = "0mrnfxg1h3mrbx192n8hl7m9i64n8cfrai2yksvhkgp6b8qxqnma"; libraryHaskellDepends = [ attoparsec base bytestring containers ]; description = "Parsers and formatters for the SVMlight input file format"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -247125,8 +247885,8 @@ self: { monad-par mwc-random vector ]; description = "Medium level, simplified, bindings to libsvm"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -247145,8 +247905,8 @@ self: { attoparsec base bytestring directory doctest filepath zlib ]; description = "Library for reading Subversion dump files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -247164,7 +247924,7 @@ self: { testHaskellDepends = [ aeson base bytestring tasty tasty-hunit ]; description = "Implementation of swagger data model"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "swagger-petstore" = callPackage @@ -247191,8 +247951,8 @@ self: { semigroups text time transformers unordered-containers vector ]; description = "Auto-generated openapi-petstore API Client"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -247222,8 +247982,8 @@ self: { optparse-applicative random swagger2 text ]; description = "Testing of Swagger APIs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -247258,7 +248018,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Swagger 2.0 data model"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "swapper" = callPackage @@ -247275,8 +248035,8 @@ self: { ]; librarySystemDepends = [ tokyocabinet ]; description = "Transparently swapping data from in-memory structures to disk"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) tokyocabinet;}; @@ -247296,8 +248056,8 @@ self: { random-shuffle readline system-fileio system-filepath text ]; description = "Clojure without alphanumerics"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -247320,8 +248080,8 @@ self: { testToolDepends = [ tasty-discover ]; benchmarkHaskellDepends = [ base criterion ]; description = "Shallow embedding implementation of non-linear pattern matching"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -247333,8 +248093,8 @@ self: { sha256 = "1jx5941kb97w4zpgz7m1r2x2lxllmi1i9a9nmwflinyj74xxg1rl"; libraryHaskellDepends = [ base mtl pretty ]; description = "A library for creating Shockwave Flash (SWF) files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -247350,8 +248110,8 @@ self: { array base containers ghc-prim mwc-random primitive vector ]; description = "Online sampler for Latent Dirichlet Allocation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -247377,7 +248137,7 @@ self: { test-framework test-framework-hunit text time ]; description = "A semantic web toolkit"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; }) {}; "swiss-ephemeris" = callPackage @@ -247391,8 +248151,8 @@ self: { testHaskellDepends = [ base directory hspec QuickCheck ]; testToolDepends = [ hspec-discover ]; description = "Haskell bindings for the Swiss Ephemeris C library"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -247416,8 +248176,8 @@ self: { wai-middleware-static warp warp-tls x509 ]; description = "A simple web server for serving directories"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -247431,19 +248191,19 @@ self: { base containers polyparse text xml-types ]; description = "A SXML-parser"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "syb" = callPackage - ({ mkDerivation, base, containers, HUnit, mtl }: + ({ mkDerivation, base, containers, mtl, tasty, tasty-hunit }: mkDerivation { pname = "syb"; - version = "0.7.1"; - sha256 = "0077vxzyi9ppbphi2ialac3p376k49qly1kskdgf57wdwix9qjp0"; + version = "0.7.2.1"; + sha256 = "15ld5929n3lzfb5sy9nnm77x2l6i2sgsxw47jdrqcrz6fxpwc1qq"; libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base containers HUnit mtl ]; + testHaskellDepends = [ base containers mtl tasty tasty-hunit ]; description = "Scrap Your Boilerplate"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "syb-extras" = callPackage @@ -247456,8 +248216,8 @@ self: { editedCabalFile = "1a0kb7an663vhhi4wd4hfc5235bampxcyl8g5ssajm6ggs7n7gm3"; libraryHaskellDepends = [ base eq prelude-extras ]; description = "Higher order versions of the Scrap Your Boilerplate classes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -247474,7 +248234,7 @@ self: { ]; testHaskellDepends = [ base HUnit ]; description = "Scrap Your Boilerplate With Class"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "syb-with-class-instances-text" = callPackage @@ -247485,8 +248245,8 @@ self: { sha256 = "0vnpqk89nxs0anx62mzasl9wrcscw18vwc284y067ryb086aj2hf"; libraryHaskellDepends = [ base syb-with-class text ]; description = "Scrap Your Boilerplate With Class Text instance"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -247513,7 +248273,7 @@ self: { testToolDepends = [ sydtest-discover ]; description = "An advanced modern testing framework for Haskell with good defaults and advanced testing features"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {sydtest-discover = null;}; "syfco" = callPackage @@ -247533,8 +248293,8 @@ self: { array base containers convertible directory mtl parsec transformers ]; description = "Synthesis Format Conversion Tool / Library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -247561,7 +248321,7 @@ self: { ]; description = "Lambda calculus visualization"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -247574,8 +248334,8 @@ self: { libraryHaskellDepends = [ base containers hashable vector ]; testHaskellDepends = [ base hashable QuickCheck ]; description = "Permutations, patterns, and statistics"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -247587,8 +248347,8 @@ self: { sha256 = "1ppq86fv5knfdcfn3pfiyg7v9k1aq47xp0b6yn8bwkfhcxxmbbhp"; libraryHaskellDepends = [ base diagrams-cairo diagrams-lib sym ]; description = "Plot permutations; an addition to the sym package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -247605,8 +248365,8 @@ self: { text transformers ]; description = "Library for Typed Tagless-Final Higher-Order Composable DSL"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -247628,8 +248388,8 @@ self: { tasty tasty-golden text time transformers treeseq ]; description = "Library for reading and writing Atom"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -247641,7 +248401,7 @@ self: { sha256 = "1yvlvsr38b1ydplpz1jldy816sngmic273iajcmhr73rlyzk5y3d"; libraryHaskellDepends = [ base ]; description = "Basic symantics for writing Embedded Domain-Specific Languages (EDSL)"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "symantic-cli" = callPackage @@ -247657,8 +248417,8 @@ self: { transformers ]; description = "Symantics for parsing and documenting a CLI"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -247675,7 +248435,7 @@ self: { base containers tasty tasty-hunit text transformers ]; description = "Document symantics"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "symantic-grammar" = callPackage @@ -247691,7 +248451,7 @@ self: { base megaparsec tasty tasty-hunit text transformers ]; description = "Library for symantic grammars"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "symantic-http" = callPackage @@ -247707,8 +248467,8 @@ self: { text transformers ]; description = "Symantic combinators for deriving clients or a server from an HTTP API"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -247727,8 +248487,8 @@ self: { symantic-http text time transformers word8 ]; description = "symantic-http applied to the derivation of HTTP clients"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -247755,8 +248515,8 @@ self: { time transformers wai wai-extra warp ]; description = "Demo for symantic-http and its companion libraries"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -247778,8 +248538,8 @@ self: { symantic-http text time transformers word8 ]; description = "Streaming support through pipes for symantic-http"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -247798,8 +248558,8 @@ self: { text time transformers wai warp word8 ]; description = "symantic-http applied to the derivation of HTTP servers"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -247827,8 +248587,8 @@ self: { transformers wai wai-extra warp ]; description = "Test symantic-http and its companion libraries"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -247851,8 +248611,8 @@ self: { tasty-hunit text transformers ]; description = "Symantics for common types"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -247876,8 +248636,8 @@ self: { transformers unix unordered-containers ]; description = "Parser combinators statically optimized and staged via typed meta-programming"; - license = stdenv.lib.licenses.gpl3Plus; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -247901,8 +248661,8 @@ self: { symantic-base tasty tasty-golden text transformers treeseq ]; description = "Library for reading, validating and writing XML"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -247934,8 +248694,8 @@ self: { websockets-simple-extra ]; description = "Data serialization, communication, and operation verification implementation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -247949,7 +248709,7 @@ self: { editedCabalFile = "0jdbaap11pkgb6m98v57k7qnx62pqxy7pa2i7293ywa4q305qgm1"; libraryHaskellDepends = [ base containers deepseq ]; description = "A 'Symbol' type for fast symbol comparison"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "symbolic-link" = callPackage @@ -247961,8 +248721,8 @@ self: { libraryHaskellDepends = [ base directory unix ]; testHaskellDepends = [ base tasty tasty-hunit unix ]; description = "Symlink functions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -247974,7 +248734,7 @@ self: { sha256 = "19hlvyq5s4lvqi8n4qwxy4fgi33y72n8h4lw5bbb35sbq9jlw69c"; libraryHaskellDepends = [ base ]; description = "Symbol manipulation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "symengine" = callPackage @@ -247989,8 +248749,8 @@ self: { testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; testSystemDepends = [ gmp gmpxx symengine ]; description = "SymEngine symbolic mathematics engine for Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) gmp; inherit (pkgs) gmpxx; inherit (pkgs) symengine;}; @@ -248009,8 +248769,8 @@ self: { testHaskellDepends = [ base ]; testSystemDepends = [ gmp gmpxx symengine ]; description = "SymEngine symbolic mathematics engine for Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) gmp; inherit (pkgs) gmpxx; inherit (pkgs) symengine;}; @@ -248024,7 +248784,7 @@ self: { libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base hspec HUnit ]; description = "Monoids for sameness and uniqueness"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "symmetry-operations-symbols" = callPackage @@ -248040,8 +248800,8 @@ self: { base doctest hspec matrix matrix-as-xyz parsec QuickCheck ]; description = "Derivation of symbols and coordinate triplets Library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -248057,7 +248817,7 @@ self: { ansi-terminal base monad-loops random ]; description = "Minimal implementation(s) of the classic electronic memory game"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "sync" = callPackage @@ -248068,8 +248828,8 @@ self: { sha256 = "10c2divizmjij5w7x2ky6dzhq6y6wr6qq1pwl7wlhgv663y9yalk"; libraryHaskellDepends = [ base stm ]; description = "A fast implementation of synchronous channels with a CML-like API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -248107,8 +248867,8 @@ self: { aeson base bytestring directory filepath process temporary time ]; description = "Fast incremental file transfer using Merkle-Hash-Trees"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -248120,7 +248880,7 @@ self: { sha256 = "0xzpjq3h3mqdi553v7p6xm3i74nvbhz5igjlhfh6snlmr7p1cdvb"; libraryHaskellDepends = [ base ]; description = "Synchronous communication channels"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "syncthing-hs" = callPackage @@ -248147,8 +248907,8 @@ self: { vector wreq ]; description = "Haskell bindings for the Syncthing REST API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -248173,7 +248933,7 @@ self: { ]; description = "Similar code analysis"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {Synt = null;}; @@ -248197,8 +248957,8 @@ self: { ]; benchmarkHaskellDepends = [ base criterion deepseq ]; description = "Generic representation and manipulation of abstract syntax"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -248210,7 +248970,7 @@ self: { sha256 = "1sqnmarmdm4mha28h8gbp3jddlig84v7zqn53a29047w3877g3gw"; libraryHaskellDepends = [ base ]; description = "Distfix expression parsing library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "syntax" = callPackage @@ -248227,8 +248987,8 @@ self: { base lens mono-traversable scientific semi-iso text vector ]; description = "Reversible parsing and pretty-printing"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -248244,8 +249004,8 @@ self: { attoparsec base bytestring scientific semi-iso syntax text vector ]; description = "Syntax instances for Attoparsec"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -248264,8 +249024,8 @@ self: { syntax-printer text ]; description = "Example application using syntax, a library for abstract syntax descriptions"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -248284,8 +249044,8 @@ self: { syntax-attoparsec syntax-printer text ]; description = "Example JSON parser/pretty-printer"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -248300,8 +249060,8 @@ self: { base pretty scientific semi-iso syntax text ]; description = "Syntax instance for pretty, the pretty printing library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -248318,8 +249078,8 @@ self: { text vector ]; description = "Text and ByteString printers for 'syntax'"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -248335,8 +249095,8 @@ self: { base haskell-src-exts hint mtl template-haskell uniplate ]; description = "Convert between different Haskell syntax trees"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -248352,8 +249112,8 @@ self: { base haskell-src-exts hint mtl template-haskell uniplate ]; description = "Convert between different Haskell syntax trees. Bairyn's fork."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -248372,8 +249132,8 @@ self: { ]; testHaskellDepends = [ aeson base cassava haskell-conll hspec ]; description = "Working with Google's SyntaxNet output files - CoNLL, Tree"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -248396,7 +249156,7 @@ self: { ]; description = "Audio signal processing coded in Haskell"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -248506,7 +249266,7 @@ self: { ]; description = "Audio signal processing with dynamic physical dimensions"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {UniqueLogicNP = null;}; @@ -248535,8 +249295,8 @@ self: { ]; doHaddock = false; description = "Efficient signal processing using runtime compilation"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -248576,7 +249336,7 @@ self: { libraryHaskellDepends = [ base process text ]; testHaskellDepends = [ base doctest ]; description = "Auth with smbclient command"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "sys-process" = callPackage @@ -248596,8 +249356,8 @@ self: { base directory doctest filepath QuickCheck template-haskell ]; description = "A replacement for System.Exit and System.Process."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -248610,7 +249370,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec hspec-expectations ]; description = "Haskell Interface for getting overall system statistics"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "system-argv0" = callPackage @@ -248621,7 +249381,7 @@ self: { sha256 = "1ijfry2r3cypp3zmws6dczk21m4n86fkxjld7yl19gjp46fxllbd"; libraryHaskellDepends = [ base bytestring system-filepath text ]; description = "Get argv[0] as a FilePath"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "system-canonicalpath" = callPackage @@ -248637,8 +249397,8 @@ self: { ]; testHaskellDepends = [ base basic-prelude chell system-filepath ]; description = "Abstract data type for canonical paths with some utilities"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -248657,8 +249417,8 @@ self: { base directory doctest filepath QuickCheck ]; description = "A replacement for System.Exit and System.Process"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -248670,7 +249430,7 @@ self: { sha256 = "1hig7m7arrj6hmgix8abkidy6wf1a4a4y72k81csq90kv5jhynxk"; libraryHaskellDepends = [ base ]; description = "Error reporting functions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "system-extra" = callPackage @@ -248684,8 +249444,8 @@ self: { libraryHaskellDepends = [ base bytestring directory process ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "A bunch of system utilities used by other projects"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -248705,7 +249465,7 @@ self: { transformers unix ]; description = "Consistent filesystem interaction across GHC versions (deprecated)"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "system-filepath" = callPackage @@ -248724,7 +249484,7 @@ self: { base bytestring chell chell-quickcheck QuickCheck text ]; description = "High-level, byte-based file and directory path manipulations (deprecated)"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "system-gpio" = callPackage @@ -248735,7 +249495,7 @@ self: { sha256 = "1i718k96xvsfl9rh1x4n5ra88838wd6rzmj3p70bfkxxrsvv1zi4"; libraryHaskellDepends = [ array base ghc-prim ]; description = "GPIO wrapper libary for Raspberry Pi"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "system-info" = callPackage @@ -248746,7 +249506,7 @@ self: { sha256 = "10a43hb20gb8vgggibsnd3xg3al1wm4phjpp1mf2hnkf4nwxilm4"; libraryHaskellDepends = [ base ]; description = "Get the name of the operating system"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "system-inotify" = callPackage @@ -248757,8 +249517,8 @@ self: { sha256 = "0ndw4vcvvf7p6nb5vn91mhbj4w9lmgm4cl0jzsks4mxs625bv4lg"; libraryHaskellDepends = [ base bytestring ]; description = "Binding to Linux's inotify interface"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -248781,8 +249541,8 @@ self: { transformers unix ]; description = "Lifted versions of System functions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -248799,8 +249559,8 @@ self: { ]; testHaskellDepends = [ base directory hedgehog pretty-show ]; description = "A library for accessing the /proc filesystem in Linux"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -248817,8 +249577,8 @@ self: { ]; testHaskellDepends = [ base hspec ]; description = "Get system locales"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -248830,7 +249590,7 @@ self: { sha256 = "1wkfz898d3607xnx779l1k1qc8i2k63ixg47542r45scwq8m0lsk"; libraryHaskellDepends = [ base bytestring unix ]; description = "A toy module to temporarily redirect a program's stdout"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "system-random-effect" = callPackage @@ -248856,8 +249616,8 @@ self: { base criterion deepseq extensible-effects vector ]; description = "Random number generation for extensible effects"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -248877,7 +249637,7 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base HUnit ]; description = "Runs system tests of applications"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "system-time-monotonic" = callPackage @@ -248888,7 +249648,7 @@ self: { sha256 = "0f5grhh6x2fbawmdk0gq1nsjz47iz8f8r2592d1l69fqddwdhc3v"; libraryHaskellDepends = [ base time ]; description = "Simple library for using the system's monotonic clock"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "system-util" = callPackage @@ -248909,8 +249669,8 @@ self: { semigroups system-lifted template-haskell transformers ]; description = "Various system utils lifted to EitherT"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {easy-data = null;}; @@ -248930,7 +249690,7 @@ self: { ]; librarySystemDepends = [ libossp_uuid ]; description = "Bindings to system UUID functions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) libossp_uuid;}; "systemd" = callPackage @@ -248944,7 +249704,7 @@ self: { ]; testHaskellDepends = [ base network unix ]; description = "Systemd facilities (Socket activation, Notify)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "systemstats" = callPackage @@ -248962,8 +249722,8 @@ self: { transformers ]; description = "An application that regularly logs system stats for later analysis"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -248975,7 +249735,7 @@ self: { sha256 = "1m5395937yyxsa1bmlfn1dxa1jr15yjhlz9s15bpwapshcd8119y"; libraryHaskellDepends = [ base syb ]; description = "Scrap Your Zippers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "t-regex" = callPackage @@ -248992,8 +249752,8 @@ self: { QuickCheck recursion-schemes template-haskell transformers ]; description = "Matchers and grammars using tree regular expressions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -249005,8 +249765,8 @@ self: { sha256 = "1pnikcyczwy7x4gf35pxkmr9p8b6smqb637r1h8rc9p2hjag2kak"; libraryHaskellDepends = [ base t3-game t3-server ]; description = "tic-tac-toe Rexports for client"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -249023,7 +249783,7 @@ self: { ]; testHaskellDepends = [ aeson base hspec ]; description = "tic-tac-toe core"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "t3-server" = callPackage @@ -249042,8 +249802,8 @@ self: { text time transformers unordered-containers vector wai ]; description = "tic-tac-toe server"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -249059,8 +249819,8 @@ self: { base containers ghc-prim mtl Takusen template-haskell time ]; description = "Transito Abierto: convenience library when using Takusen and Oracle"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -249075,7 +249835,7 @@ self: { libraryHaskellDepends = [ base safe text ]; description = "Table layout"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "table" = callPackage @@ -249090,8 +249850,8 @@ self: { base csv optparse-applicative process split ]; description = "Simple tool to generate tables from DSV input"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -249116,8 +249876,8 @@ self: { QuickCheck ]; description = "Format tabular data as grid or table"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -249129,8 +249889,8 @@ self: { sha256 = "1v5g4fbbspgm4smjxk499a0grh5xsr18688kmivql8knhxh1351k"; libraryHaskellDepends = [ base ]; description = "A table tennis game tracking engine"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -249148,8 +249908,8 @@ self: { base cgi containers html mtl parsec QuickCheck ]; description = "An interactive theorem prover based on semantic tableaux"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -249173,8 +249933,8 @@ self: { unordered-containers ]; description = "In-memory storage with multiple keys using lenses and traversals"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -249195,8 +249955,8 @@ self: { time transformers utf8-string xml ]; description = "Azure Table Storage REST API Wrapper"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -249215,7 +249975,7 @@ self: { ]; description = "Pretty-printing of CSV files"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "tabloid" = callPackage @@ -249233,8 +249993,8 @@ self: { regex-posix ]; description = "View the output of shell commands in a table"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -249249,8 +250009,8 @@ self: { libraryHaskellDepends = [ base filepath monadlist mtl tagged ]; executableHaskellDepends = [ base filepath monadlist mtl tagged ]; description = "Indents source files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -249262,7 +250022,7 @@ self: { sha256 = "0z936gh8n8i8qdkagyxwd9gqq13skd5fv013vdvwsibrxkm0czfb"; libraryHaskellDepends = [ base csv html mtl ]; description = "Two-dimensional data tables with rendering functions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "taffybar" = callPackage @@ -249306,7 +250066,7 @@ self: { ]; executablePkgconfigDepends = [ gtk3 ]; description = "A desktop bar similar to xmobar, but with more GUI"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) gtk3;}; "tag-bits" = callPackage @@ -249317,8 +250077,8 @@ self: { sha256 = "0crn1g3dh97s3b55z0pkvjm9h89kq99c2agk687vr0vij6r5di65"; libraryHaskellDepends = [ base ghc-prim ]; description = "Provides access to the dynamic pointer tagging bits used by GHC"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -249334,8 +250094,8 @@ self: { attoparsec base blaze-builder bytestring enumerator ]; description = "streamlined html tag parser"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -249374,7 +250134,7 @@ self: { base deepseq template-haskell transformers ]; description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tagged-binary" = callPackage @@ -249387,7 +250147,7 @@ self: { base base-compat binary bytestring pureMD5 ]; description = "Provides tools for serializing data tagged with type information"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "tagged-exception-core" = callPackage @@ -249400,8 +250160,8 @@ self: { base exceptions mmorph mtl transformers ]; description = "Reflect exceptions using phantom types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -249413,7 +250173,7 @@ self: { sha256 = "1n5jafvcck6mq14fb1wrgclkrkxz4vd1x09y028awz66makn5v1c"; libraryHaskellDepends = [ base mtl transformers ]; description = "Trivial monad transformer that allows identical monad stacks have different types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tagged-list" = callPackage @@ -249432,8 +250192,8 @@ self: { type-level-natural-number-operations ]; description = "Lists tagged with a type-level natural number representing their length"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -249447,8 +250207,8 @@ self: { base tagged template-haskell type-spine ]; description = "QuasiQuoter and Template Haskell splices for creating proxies at higher-kinds"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -249462,8 +250222,8 @@ self: { base time transformers unordered-containers ]; description = "Simple wrappers for timing IO actions (single-threaded)"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -249480,7 +250240,7 @@ self: { semigroupoids tagged ]; description = "Monad transformer carrying an extra phantom type tag"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tagging" = callPackage @@ -249491,7 +250251,7 @@ self: { sha256 = "012lcbp2c9a38s4l2i9jaiqcxaidk93v7gxcnf9lplixrnzczy93"; libraryHaskellDepends = [ base bytestring pcre-light ]; description = "Library for tagging data"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "taggy" = callPackage @@ -249519,7 +250279,7 @@ self: { attoparsec base criterion tagsoup text vector ]; description = "Efficient and simple HTML/XML parsing library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "taggy-lens" = callPackage @@ -249537,7 +250297,7 @@ self: { base doctest hspec lens taggy text unordered-containers ]; description = "Lenses for the taggy html/xml parser"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "taglib" = callPackage @@ -249566,8 +250326,8 @@ self: { ]; libraryPkgconfigDepends = [ taglib ]; description = "An FFI layer over TagLib's C bindings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) taglib;}; @@ -249583,7 +250343,7 @@ self: { base binary containers parsec text text-binary ]; description = "Positional tags and tagsets"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tagshare" = callPackage @@ -249594,7 +250354,7 @@ self: { sha256 = "1q3chp1rmwmxa8rxv7548wsvbqbng6grrnv1587p08385sp4ncfj"; libraryHaskellDepends = [ base containers mtl ]; description = "TagShare - explicit sharing with tags"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tagsoup" = callPackage @@ -249610,7 +250370,7 @@ self: { base bytestring deepseq directory process QuickCheck time ]; description = "Parsing and extracting information from (possibly malformed) HTML/XML documents"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tagsoup-ht" = callPackage @@ -249634,7 +250394,7 @@ self: { ]; description = "alternative parser for the tagsoup package"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -249651,8 +250411,8 @@ self: { base hspec megaparsec raw-strings-qq tagsoup ]; description = "A Tag token parser and Tag specific parsing combinators"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -249670,8 +250430,8 @@ self: { tagsoup tagsoup-selection transformers ]; description = "Tagsoup Navigate"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -249683,8 +250443,8 @@ self: { sha256 = "0h62kqls8nrq5wqxbzvxav4kfn1lxc6qm5vg8dhkvqdp5z6xnkzk"; libraryHaskellDepends = [ base parsec tagsoup ]; description = "Tokenizes Tag, so [ Tag ] can be used as parser input"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -249696,8 +250456,8 @@ self: { sha256 = "0wqw4g5bg8zrkdxfsr8gn0g4a6dvz83b3hyvhdwqf2q1v3i5jw9d"; libraryHaskellDepends = [ base containers parsec tagsoup ]; description = "Selecting subtrees from TagSoup's TagTrees using CSS selectors"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -249718,8 +250478,8 @@ self: { base bytestring tagsoup unicode-show utf8-string ]; description = "Black magic tagsoup"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -249740,7 +250500,7 @@ self: { base bytestring conduit hspec HUnit QuickCheck resourcet text ]; description = "streamlined html tag parser"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tai" = callPackage @@ -249757,8 +250517,8 @@ self: { base clock lens mtl parsers time trifecta wreq ]; description = "Support library to enable TAI usage on systems with time kept in UTC"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -249777,8 +250537,8 @@ self: { ]; testHaskellDepends = [ base doctest ]; description = "Tai64 Labels for Haskell"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -249802,7 +250562,7 @@ self: { streaming-eversion tasty tasty-hunit text ]; description = "Tail files in Unix, using hinotify"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "tak" = callPackage @@ -249822,7 +250582,7 @@ self: { random-shuffle safe ]; description = "A library encoding the rules of Tak, and a playtak.com client."; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }) {}; "tak-ai" = callPackage @@ -249839,7 +250599,7 @@ self: { base HUnit matrix parsec random-shuffle tak ]; description = "AI(s) for playing Tak on playtak.com"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }) {}; "takahashi" = callPackage @@ -249851,8 +250611,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base lens monad-skeleton mtl ]; description = "create slide for presentation"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -249867,8 +250627,8 @@ self: { libraryHaskellDepends = [ base mtl old-time time ]; librarySystemDepends = [ clntsh ]; description = "Database library with left-fold interface for Oracle"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {clntsh = null;}; @@ -249884,8 +250644,8 @@ self: { base containers mtl pretty transformers unbound ]; description = "An implementation of Typed Assembly Language (Morrisett, Walker, Crary, Glew)"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -249916,7 +250676,7 @@ self: { ]; description = "The Tamarin prover for security protocol analysis"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -249936,7 +250696,7 @@ self: { ]; description = "Term manipulation library for the tamarin prover"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -249959,7 +250719,7 @@ self: { ]; description = "Term manipulation library for the tamarin prover"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -249978,7 +250738,7 @@ self: { ]; description = "Utility library for the tamarin prover"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -249990,7 +250750,7 @@ self: { sha256 = "0im6m05lj6nfap6qqff9qmb8vvv4i3g17pcqdg6rqb2xx86dfnjj"; libraryHaskellDepends = [ base containers mtl safe text ]; description = "Blaze-style HTML templates as a Monad Transformer"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tangle" = callPackage @@ -250001,7 +250761,7 @@ self: { sha256 = "1ylv73v6ydf39zfks9762dsz27sxr7sbmmk7k628yqc9czj3nj60"; libraryHaskellDepends = [ base transformers ]; description = "HKD record builder"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tao" = callPackage @@ -250012,7 +250772,7 @@ self: { sha256 = "0iqsah4l87bd25cpk575hsq5qbx506gz1ajf6fyv6pmi0sb1w2hb"; libraryHaskellDepends = [ base ]; description = "Type-level assertion operators"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "tao-example" = callPackage @@ -250023,7 +250783,7 @@ self: { sha256 = "1ch09fgj46fy5h33rcqlbkm02v8cq246bpxswxfdj8p9g1dkkpk5"; libraryHaskellDepends = [ base tao ]; description = "Example usage of the tao package"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "tapioca" = callPackage @@ -250040,8 +250800,8 @@ self: { ]; testHaskellDepends = [ base hspec vector ]; description = "A tasty enhancement to cassava for easy csv exporting"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -250068,7 +250828,7 @@ self: { filepath time ]; description = "Reading, writing and manipulating \".tar\" archive files."; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tar-bytestring" = callPackage @@ -250097,7 +250857,7 @@ self: { hpath-filepath hpath-posix safe-exceptions these time unix word8 ]; description = "Reading, writing and manipulating \".tar\" archive files."; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tar-conduit" = callPackage @@ -250122,7 +250882,7 @@ self: { deepseq directory filepath hspec ]; description = "Extract and create tar files using conduit for streaming"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "tardis" = callPackage @@ -250135,7 +250895,7 @@ self: { editedCabalFile = "1wp6vp90g19hv8r2l83ava7qxf0933gb7ni2zgyfa66vlvxvhibv"; libraryHaskellDepends = [ base mmorph mtl ]; description = "Bidirectional state monad transformer"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "target" = callPackage @@ -250173,8 +250933,8 @@ self: { xml-conduit ]; description = "Generate test-suites from refinement types"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) z3;}; @@ -250197,7 +250957,7 @@ self: { text text-zipper vector vty ]; description = "Terminal Art"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "task" = callPackage @@ -250216,8 +250976,8 @@ self: { directory filepath old-locale random text time unix ]; description = "A command line tool for keeping track of tasks you worked on"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -250254,8 +251014,8 @@ self: { temporary text transformers vector ]; description = "Distributed processing of changing tasks"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -250285,8 +251045,8 @@ self: { ]; testToolDepends = [ tasty-discover ]; description = "A command-line kanban board/task manager"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -250305,7 +251065,7 @@ self: { async base containers fgl hspec stm transformers ]; description = "Manage pools of possibly interdependent tasks using STM and async"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "taskwarrior" = callPackage @@ -250329,8 +251089,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Types and aeson instances for taskwarrior tasks"; - license = stdenv.lib.licenses.agpl3Plus; - maintainers = with stdenv.lib.maintainers; [ maralorn ]; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ maralorn ]; }) {}; "tasty" = callPackage @@ -250347,25 +251107,25 @@ self: { stm tagged unbounded-delays unix wcwidth ]; description = "Modern and extensible testing framework"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; - "tasty_1_4_0_2" = callPackage + "tasty_1_4_0_3" = callPackage ({ mkDerivation, ansi-terminal, base, clock, containers, mtl , optparse-applicative, stm, tagged, unbounded-delays, unix , wcwidth }: mkDerivation { pname = "tasty"; - version = "1.4.0.2"; - sha256 = "143ybyjgqin1jzd597wxgr66rambhnk93gk7knjs2f8j23vrr7n0"; + version = "1.4.0.3"; + sha256 = "044kxp33qnsaxh8s1ja73149acf9xys36x4fs6lz6nyd8id3w497"; libraryHaskellDepends = [ ansi-terminal base clock containers mtl optparse-applicative stm tagged unbounded-delays unix wcwidth ]; description = "Modern and extensible testing framework"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "tasty-ant-xml" = callPackage @@ -250382,7 +251142,25 @@ self: { stm tagged tasty transformers xml ]; description = "Render tasty output to XML for Jenkins"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; + }) {}; + + "tasty-ant-xml_1_1_8" = callPackage + ({ mkDerivation, base, containers, directory, filepath + , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers + , xml + }: + mkDerivation { + pname = "tasty-ant-xml"; + version = "1.1.8"; + sha256 = "0h9mllhw9cd0rn34xhj8grwmbny7z7hpd8qmp9lfcdj0s4qx9vx8"; + libraryHaskellDepends = [ + base containers directory filepath generic-deriving ghc-prim mtl + stm tagged tasty transformers xml + ]; + description = "Render tasty output to XML for Jenkins"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "tasty-auto" = callPackage @@ -250402,8 +251180,8 @@ self: { tasty-quickcheck tasty-smallcheck ]; description = "Auto discovery for Tasty with support for ingredients and test tree generation"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -250429,8 +251207,8 @@ self: { tasty-hunit temporary text transformers ]; description = "BDD tests language and tasty provider"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -250442,7 +251220,7 @@ self: { sha256 = "0jzaqra7gsrvy33j1g6bnrwg7x5pyg5p50l5mgvpz71kd946725l"; libraryHaskellDepends = [ base dejafu random tagged tasty ]; description = "Deja Fu support for the Tasty test framework"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "tasty-discover" = callPackage @@ -250468,23 +251246,10 @@ self: { tasty-smallcheck ]; description = "Test discovery for the tasty framework"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "tasty-expected-failure" = callPackage - ({ mkDerivation, base, tagged, tasty }: - mkDerivation { - pname = "tasty-expected-failure"; - version = "0.11.1.2"; - sha256 = "175gdk1mkslcwjxajkbl4zmaigzf8h4svzd7va5qb519y0dxk28n"; - revision = "1"; - editedCabalFile = "1r367zar3gdad99nh53z7pr1qcw640pkcdv8zgl1b162ds3sv6zz"; - libraryHaskellDepends = [ base tagged tasty ]; - description = "Mark tasty tests as failure expected"; - license = stdenv.lib.licenses.mit; - }) {}; - - "tasty-expected-failure_0_12_2" = callPackage ({ mkDerivation, base, hedgehog, tagged, tasty, tasty-golden , tasty-hedgehog, tasty-hunit, unbounded-delays }: @@ -250497,8 +251262,7 @@ self: { base hedgehog tasty tasty-golden tasty-hedgehog tasty-hunit ]; description = "Mark tasty tests as failure expected"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; }) {}; "tasty-fail-fast" = callPackage @@ -250514,8 +251278,8 @@ self: { base directory tasty tasty-golden tasty-hunit tasty-tap ]; description = "Adds the ability to fail a tasty test suite on first test failure"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -250532,7 +251296,7 @@ self: { base tasty tasty-expected-failure tasty-hunit ]; description = "Simple focus mechanism for tasty"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tasty-golden" = callPackage @@ -250554,7 +251318,7 @@ self: { base directory filepath process tasty tasty-hunit temporary ]; description = "Golden tests support for tasty"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "tasty-golden_2_3_4" = callPackage @@ -250577,8 +251341,8 @@ self: { base directory filepath process tasty tasty-hunit temporary ]; description = "Golden tests support for tasty"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "tasty-groundhog-converters" = callPackage @@ -250596,8 +251360,8 @@ self: { tasty-hunit tasty-quickcheck ]; description = "Tasty Tests for groundhog converters"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -250607,16 +251371,14 @@ self: { }: mkDerivation { pname = "tasty-hedgehog"; - version = "1.0.0.2"; - sha256 = "1vsv3m6brhshpqm8qixz97m7h0nx67cj6ira4cngbk7mf5rqylv5"; - revision = "6"; - editedCabalFile = "12s7jgz14j32h62mgs4qbypqlpwjly1bk2hgrwqi9w3cjsskqk88"; + version = "1.0.1.0"; + sha256 = "0vkmhqfydyxbvjjbwvwn0q1f1a2dl9wmhz0s7020frpzwqcjwm5b"; libraryHaskellDepends = [ base hedgehog tagged tasty ]; testHaskellDepends = [ base hedgehog tasty tasty-expected-failure ]; description = "Integration for tasty and hedgehog"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tasty-hedgehog-coverage" = callPackage @@ -250638,8 +251400,8 @@ self: { base hedgehog tasty tasty-expected-failure ]; description = "Coverage tracking for Hedgehog Property-Based Testing via Tasty"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -250656,7 +251418,7 @@ self: { tasty-smallcheck ]; description = "Hspec support for the Tasty test framework"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tasty-html" = callPackage @@ -250666,15 +251428,15 @@ self: { }: mkDerivation { pname = "tasty-html"; - version = "0.4.1.2"; - sha256 = "1bffbp8qwyad85s9bl3ck3gxay3hphka527j09hn2sz1bfqzcihb"; + version = "0.4.1.4"; + sha256 = "1zf14am7rl0rdh3mschkbsg8h02cv7y8yglxpc9cs2wj14ymhyvv"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base blaze-html bytestring containers filepath generic-deriving mtl semigroups stm tagged tasty text transformers ]; description = "Render tasty output to HTML"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "tasty-hunit" = callPackage @@ -250685,7 +251447,7 @@ self: { sha256 = "0gz6zz3w7s44pymw33xcxnawryl27zk33766sab96nz2xh91kvxp"; libraryHaskellDepends = [ base call-stack tasty ]; description = "HUnit support for the Tasty test framework"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "tasty-hunit-adapter" = callPackage @@ -250696,7 +251458,7 @@ self: { sha256 = "06rywmn6gc1qyhf65iwm6i0ysg99ygr2ghk1alkklz4ycagidyvg"; libraryHaskellDepends = [ base HUnit tasty tasty-hunit ]; description = "Use existing HUnit tests with tasty"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tasty-hunit-compat" = callPackage @@ -250707,7 +251469,7 @@ self: { sha256 = "0kfxga9j1iy7f00gj3dsh45ywyi7qzdlrmp16gr4ir3b08rwhj2m"; libraryHaskellDepends = [ base HUnit tasty tasty-hunit ]; description = "Integration of `HUnit` with `tasty`"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "tasty-integrate" = callPackage @@ -250737,8 +251499,8 @@ self: { transformers ]; description = "automated integration of QuickCheck properties into tasty suites"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -250758,8 +251520,8 @@ self: { tasty-hunit unix ]; description = "Render tasty output to both console and XML for Jenkins"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -250775,7 +251537,7 @@ self: { base bytestring containers stm tagged tasty text ]; description = "JSON reporter for the tasty testing framework"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "tasty-kat" = callPackage @@ -250791,7 +251553,7 @@ self: { base bytestring mtl tasty tasty-hunit tasty-quickcheck ]; description = "Known Answer Tests (KAT) framework for tasty"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "tasty-laws" = callPackage @@ -250808,8 +251570,8 @@ self: { ]; testHaskellDepends = [ base smallcheck smallcheck-laws tasty ]; description = "Test common laws"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -250822,7 +251584,7 @@ self: { libraryHaskellDepends = [ base leancheck tasty ]; testHaskellDepends = [ base leancheck tasty ]; description = "LeanCheck support for the Tasty test framework"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tasty-lens" = callPackage @@ -250838,8 +251600,8 @@ self: { ]; testHaskellDepends = [ base lens tasty ]; description = "Tasty TestTrees for Lens validation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -250849,8 +251611,8 @@ self: { }: mkDerivation { pname = "tasty-lua"; - version = "0.2.3.1"; - sha256 = "1dw9wbwhyklc2lkpvhj12kdq7kyq6lv9w2586szx3yr5qbpwaggm"; + version = "0.2.3.2"; + sha256 = "0wa73ihkjcxi50lgpdzwwdx7s903lqi79hw7hxlvhbcvdly1cq53"; libraryHaskellDepends = [ base bytestring file-embed hslua tasty text ]; @@ -250858,7 +251620,7 @@ self: { base directory filepath hslua tasty tasty-hunit ]; description = "Write tests in Lua, integrate into tasty"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "tasty-mgolden" = callPackage @@ -250883,8 +251645,8 @@ self: { tasty-hunit text typed-process ]; description = "Golden testing provider for tasty with muti-line diff output"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -250899,7 +251661,7 @@ self: { base deepseq directory filepath process tasty ]; description = "Use tasty framework to test whether a program executes correctly"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tasty-quickcheck" = callPackage @@ -250915,7 +251677,7 @@ self: { ]; testHaskellDepends = [ base pcre-light tasty tasty-hunit ]; description = "QuickCheck support for the Tasty test framework"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "tasty-quickcheck-laws" = callPackage @@ -250930,7 +251692,7 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck tasty ]; description = "Pre-built tasty trees for checking lawful class properties using QuickCheck"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tasty-rerun" = callPackage @@ -250948,12 +251710,39 @@ self: { transformers ]; description = "Rerun only tests which failed in a previous test run"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tasty-silver" = callPackage ({ mkDerivation, ansi-terminal, async, base, bytestring, containers , deepseq, directory, filepath, mtl, optparse-applicative, process + , process-extras, regex-tdfa, semigroups, stm, tagged, tasty + , tasty-hunit, temporary, text, transformers + }: + mkDerivation { + pname = "tasty-silver"; + version = "3.1.15"; + sha256 = "07iiaw5q5jb6bxm5ys1s6bliw0qxsqp100awzxwkwfia03i1iz8z"; + revision = "1"; + editedCabalFile = "1pxwixy274w0z99zsx0aywcxcajnpgan3qri81mr1wb6afxrq8d6"; + libraryHaskellDepends = [ + ansi-terminal async base bytestring containers deepseq directory + filepath mtl optparse-applicative process process-extras regex-tdfa + semigroups stm tagged tasty temporary text + ]; + testHaskellDepends = [ + base directory filepath process tasty tasty-hunit temporary + transformers + ]; + description = "A fancy test runner, including support for golden tests"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + + "tasty-silver_3_2_1" = callPackage + ({ mkDerivation, ansi-terminal, async, base, bytestring, containers + , deepseq, directory, filepath, mtl, optparse-applicative, process , process-extras, regex-tdfa, stm, tagged, tasty, tasty-hunit , temporary, text, transformers }: @@ -250971,8 +251760,8 @@ self: { transformers ]; description = "A fancy test runner, including support for golden tests"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -250984,11 +251773,13 @@ self: { pname = "tasty-smallcheck"; version = "0.8.2"; sha256 = "0csgwn3vch0jnpqyyfnrfjq4z0dpl67imh5a7byll3hhlyidgjym"; + revision = "1"; + editedCabalFile = "0033ha2w9rzc1rxpzh1dkfdrn256i5lvb41pqbdh2i6kli0v5vmh"; libraryHaskellDepends = [ base optparse-applicative smallcheck tagged tasty ]; description = "SmallCheck support for the Tasty test framework"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "tasty-stats" = callPackage @@ -251003,11 +251794,33 @@ self: { base containers directory process stm tagged tasty time ]; description = "Collect statistics of your Tasty testsuite"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; + "tasty-sugar" = callPackage + ({ mkDerivation, base, directory, filemanip, filepath, hedgehog + , logict, optparse-applicative, pretty-show, prettyprinter + , raw-strings-qq, tagged, tasty, tasty-hedgehog, tasty-hunit + }: + mkDerivation { + pname = "tasty-sugar"; + version = "1.0.1.1"; + sha256 = "1mkph7g4ybvy4h4rblr60bnalj5jf1acfgdqcw0ggwmbhfbzbg68"; + libraryHaskellDepends = [ + base directory filemanip filepath logict optparse-applicative + prettyprinter tagged tasty + ]; + testHaskellDepends = [ + base filepath hedgehog logict pretty-show prettyprinter + raw-strings-qq tasty tasty-hedgehog tasty-hunit + ]; + doHaddock = false; + description = "Tests defined by Search Using Golden Answer References"; + license = lib.licenses.isc; + }) {}; + "tasty-tap" = callPackage ({ mkDerivation, base, containers, directory, stm, tasty , tasty-golden, tasty-hunit @@ -251021,7 +251834,7 @@ self: { base directory tasty tasty-golden tasty-hunit ]; description = "TAP (Test Anything Protocol) Version 13 formatter for tasty"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "tasty-test-reporter" = callPackage @@ -251039,7 +251852,7 @@ self: { ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Producing JUnit-style XML test reports"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tasty-test-vector" = callPackage @@ -251052,7 +251865,7 @@ self: { editedCabalFile = "131ldlbp4ji1m8wayl8h28ykcda29bsvifa3mw8513mnqnndgahc"; libraryHaskellDepends = [ base tasty ]; description = "Test vector support for tasty"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tasty-th" = callPackage @@ -251068,7 +251881,7 @@ self: { ]; testHaskellDepends = [ base tasty-hunit ]; description = "Automatic tasty test case discovery using TH"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tasty-tmux" = callPackage @@ -251084,7 +251897,7 @@ self: { typed-process ]; description = "Terminal user acceptance testing (UAT) via tmux"; - license = stdenv.lib.licenses.agpl3; + license = lib.licenses.agpl3; }) {}; "tasty-travis" = callPackage @@ -251098,7 +251911,7 @@ self: { libraryHaskellDepends = [ base tasty ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Fancy Travis CI output for tasty tests"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tasty-wai" = callPackage @@ -251109,12 +251922,14 @@ self: { pname = "tasty-wai"; version = "0.1.1.1"; sha256 = "1bnq2mbgv1ksn9sq33dq1q91pzndy7gn61mlnkybk89k0bsw5i7y"; + revision = "1"; + editedCabalFile = "033s0aap50r7y3sbxc1jf60lpv66nljwyypc8smyccgiv5l8khzr"; libraryHaskellDepends = [ base bytestring http-types HUnit tasty wai wai-extra ]; testHaskellDepends = [ base http-types tasty wai ]; description = "Test 'wai' endpoints via Test.Tasty"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tateti-tateti" = callPackage @@ -251129,8 +251944,8 @@ self: { array base lens-simple mtl ncurses random ]; description = "Meta tic-tac-toe ncurses game"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -251142,7 +251957,7 @@ self: { sha256 = "10vw3y3vimqpb22amhk7n0d0jni46j60iva1gqa28ky8lhqq8ssz"; libraryHaskellDepends = [ base ]; description = "Tau, the ratio between any circle's circumference and radius"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tax" = callPackage @@ -251155,7 +251970,7 @@ self: { base dollaridoos profunctors semigroups ]; description = "Types and combinators for taxes"; - license = stdenv.lib.licenses.agpl3; + license = lib.licenses.agpl3; }) {}; "tbox" = callPackage @@ -251173,7 +251988,7 @@ self: { ]; description = "Transactional variables and data structures with IO hooks"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -251189,8 +252004,8 @@ self: { aws base bytestring conduit http-conduit network TCache text ]; description = "tcache using Amazon Web Services as default persistence mechanism"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -251208,8 +252023,8 @@ self: { base bytestring tokyocabinet-haskell utf8-string ]; description = "TokyoCabinet CLI interface"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -251225,7 +252040,7 @@ self: { executableHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers HUnit ]; description = "Very simple config file reading"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tcod-haskell" = callPackage @@ -251243,8 +252058,8 @@ self: { ]; libraryPkgconfigDepends = [ libtcod ]; description = "Bindings to libtcod roguelike engine"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) libtcod;}; @@ -251256,7 +252071,7 @@ self: { sha256 = "05cnlbrdddbrdwlm8s7b76ydwrn49vaifdgaklfhv8rzz9dfpvbr"; libraryHaskellDepends = [ base containers ]; description = "Simple text configuration file parser library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tcp" = callPackage @@ -251267,8 +252082,8 @@ self: { sha256 = "1wqkfnkd2di9a6h0br33fd7jaf1yqpaf7kjnpjwp52l4xv04ajlv"; libraryHaskellDepends = [ base containers old-time ]; description = "A purely functional TCP implementation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -251291,7 +252106,7 @@ self: { test-framework-hunit ]; description = "One stop solution for tcp client and server with tls support"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tcp-streams-openssl" = callPackage @@ -251312,8 +252127,8 @@ self: { test-framework-hunit ]; description = "Tcp streams using openssl for tls support"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -251341,8 +252156,8 @@ self: { transformers ]; description = "Test framework wrapper"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -251364,7 +252179,7 @@ self: { vector vector-algorithms ]; description = "On-line accumulation of rank-based statistics"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tdigest-Chart" = callPackage @@ -251385,8 +252200,8 @@ self: { tdigest vector ]; description = "Chart generation from tdigest"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -251414,8 +252229,8 @@ self: { ]; testSystemDepends = [ tdlib ]; description = "complete binding to the Telegram Database Library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) tdlib;}; @@ -251444,8 +252259,8 @@ self: { template-haskell text ]; description = "Codegen for TDLib"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -251466,8 +252281,8 @@ self: { polysemy-plugin tdlib-gen text ]; description = "Types and Functions generated from tdlib api spec"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -251483,7 +252298,7 @@ self: { base bytestring template-haskell transformers xhtml ]; description = "TDoc is a typed document builder with support for (X)HTML"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tds" = callPackage @@ -251504,8 +252319,8 @@ self: { ]; executableHaskellDepends = [ base ]; description = "Pure Haskell TDS protocol implementation. Mainly for beam-mssql and beam-sybase"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -251518,7 +252333,7 @@ self: { libraryHaskellDepends = [ base containers fgl graphviz ]; description = "Graphical modeling tools for sequential teams"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -251540,7 +252355,7 @@ self: { base gauge rio typed-process unliftio ]; description = "Build safe and composable teardown sub-routines for resources"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "techlab" = callPackage @@ -251561,8 +252376,8 @@ self: { polysemy-plugin polysemy-vinyl polysemy-zoo ]; description = "Bleeding edge prelude"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -251594,7 +252409,7 @@ self: { ]; doHaddock = false; description = "Procedures and Sequences"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "teeth" = callPackage @@ -251605,8 +252420,8 @@ self: { sha256 = "0vkaf4prvyi8056mq7kmnn9h7l8z6in2272vzmr1fnchqi7xnn8c"; libraryHaskellDepends = [ base ]; description = "Dental data types"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -251622,7 +252437,7 @@ self: { base exceptions fallible prettyprinter prettyprinter-ansi-terminal ]; description = "Prettier error"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "telegram" = callPackage @@ -251637,8 +252452,8 @@ self: { aeson base bytestring data-default http-conduit url utf8-string ]; description = "Telegram API client"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -251666,8 +252481,8 @@ self: { servant-client servant-client-core text transformers utf8-string ]; description = "Telegram Bot API bindings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -251688,8 +252503,8 @@ self: { executableHaskellDepends = [ base text ]; testHaskellDepends = [ base ]; description = "Telegram Bot microframework for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -251721,8 +252536,8 @@ self: { unordered-containers ]; description = "Easy to use library for building Telegram bots"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -251747,8 +252562,8 @@ self: { servant-client-core servant-multipart telegram-types text time ]; description = "Servant bindings to the Telegram bot API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -251770,32 +252585,29 @@ self: { mime-types open-union servant servant-multipart text time ]; description = "Types used in Telegram bot API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; "telegraph" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, deriving-aeson - , exceptions, generic-data-surgery, http-client, http-client-tls - , http-conduit, monad-control, mtl, text, transformers-base + , generic-data-surgery, http-client, http-client-tls, http-conduit + , in-other-words, mtl, optics-th, text }: mkDerivation { pname = "telegraph"; - version = "0.1.0"; - sha256 = "0rl3di034ln127pp8gzdjxlgbas93jjzxikacvhpyzgcpskd78y9"; + version = "1.1.1"; + sha256 = "031p8qpz7gw86qy8iy5syp9g074ksfvkqv0rmv52hn2y1489hzng"; libraryHaskellDepends = [ - aeson base bytestring conduit deriving-aeson exceptions - generic-data-surgery http-client http-conduit monad-control mtl - text transformers-base + aeson base bytestring conduit deriving-aeson generic-data-surgery + http-client http-conduit in-other-words mtl optics-th text ]; testHaskellDepends = [ - aeson base bytestring conduit deriving-aeson exceptions - generic-data-surgery http-client http-client-tls http-conduit - monad-control mtl text transformers-base + base http-client http-client-tls in-other-words ]; description = "Binding to the telegraph API"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "teleport" = callPackage @@ -251815,8 +252627,8 @@ self: { ]; testHaskellDepends = [ base ]; description = "A tool to quickly switch between directories"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -251839,8 +252651,8 @@ self: { tasty-quickcheck vector ]; description = "Telnet client and other things"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -251860,8 +252672,8 @@ self: { regex-pcre split tagsoup text time transformers ]; description = "IRC tellbot"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -251883,7 +252695,7 @@ self: { ]; testHaskellDepends = [ base ]; description = "A dead-simple shell interpolation templating utility"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tempi" = callPackage @@ -251894,8 +252706,8 @@ self: { sha256 = "08hjgs32cx3vcm6sga4xc7ijcj3lbjlg133vkri06xfi0v3hjgnp"; libraryHaskellDepends = [ base time ]; description = "For representing musical tempi"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -251907,7 +252719,7 @@ self: { sha256 = "10mcnhi2rdflmv79z0359nn5sylifvk9ih38xnjqqby6n4hs7mcg"; libraryHaskellDepends = [ base mtl text ]; description = "Simple string substitution"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "template-default" = callPackage @@ -251918,8 +252730,8 @@ self: { sha256 = "1fxfyfnwlw9yslbz012rygw2j5iywplybmgbaawkfq4jda7yail4"; libraryHaskellDepends = [ base data-default template-haskell ]; description = "declaring Default instances just got even easier"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -251931,8 +252743,8 @@ self: { sha256 = "1nk1cv35szp80qkhbyh5gn6vn194zzl0wz186qrqdrdx3a9r9w4g"; libraryHaskellDepends = [ base ghc-boot-th ghc-prim pretty ]; description = "Support library for Template Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "template-haskell-compat-v0208" = callPackage @@ -251943,7 +252755,7 @@ self: { sha256 = "1s1ynp568i7y5v062kliia46c3cmaijslf2hlmdkkqfdvf8fmzp1"; libraryHaskellDepends = [ base template-haskell ]; description = "A backwards compatibility layer for Template Haskell newer than 2.8"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "template-haskell-optics" = callPackage @@ -251956,7 +252768,7 @@ self: { base containers optics-core template-haskell ]; description = "Optics for template-haskell types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "template-haskell-util" = callPackage @@ -251969,8 +252781,8 @@ self: { base GenericPretty ghc-prim template-haskell ]; description = "Some utilities for template Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -251991,8 +252803,8 @@ self: { base parsec QuickCheck test-framework test-framework-quickcheck2 ]; description = "Haskell's Simple Markup Language"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -252012,7 +252824,7 @@ self: { unordered-containers uri-encode ]; description = "Template Toolkit implementation for Haskell"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "template-yj" = callPackage @@ -252023,8 +252835,8 @@ self: { sha256 = "1vj856dcmnipzxkzs3y33sgkyldqirq8rz9mi6grllv6mqq6lgj2"; libraryHaskellDepends = [ base bytestring text ]; description = "Process template file"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -252038,8 +252850,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base mtl tagsoup uniplate ]; description = "Make template from website"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -252057,8 +252869,8 @@ self: { regex-compat regex-posix template-haskell time utf8-string ]; description = "A PostgreSQL access library with compile-time SQL type inference"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -252075,7 +252887,7 @@ self: { base hspec hspec-attoparsec HUnit QuickCheck text ]; description = "Simple string templater"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "tempo" = callPackage @@ -252096,7 +252908,7 @@ self: { executableHaskellDepends = [ base MissingH mtl time ]; testHaskellDepends = [ base ]; description = "Command-line tool to log time-tracking information into JIRA Tempo plugin"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tempodb" = callPackage @@ -252113,8 +252925,8 @@ self: { http-streams io-streams mtl old-locale text time ]; description = "A small Haskell wrapper around the TempoDB api"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -252132,8 +252944,8 @@ self: { temporal-music-notation temporal-music-notation-western ]; description = "library to make electronic music, brings together temporal-music-notation and csound-expression packages"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -252145,7 +252957,7 @@ self: { sha256 = "04qbbx32rs6mz5w3j7wj2hx744x858rv60hmpla3zpx2491r0qi9"; libraryHaskellDepends = [ base Boolean ]; description = "data types for temporal media"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "temporal-music-notation" = callPackage @@ -252158,7 +252970,7 @@ self: { base data-default temporal-media vector ]; description = "music notation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "temporal-music-notation-demo" = callPackage @@ -252173,7 +252985,7 @@ self: { base binary data-default HCodecs temporal-music-notation ]; description = "generates midi from score notation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "temporal-music-notation-western" = callPackage @@ -252184,7 +252996,7 @@ self: { sha256 = "012pv4l5r3ijnyid7b8h1lpifjs7cf3k4a13f6773r93qfgvxpkc"; libraryHaskellDepends = [ base temporal-music-notation ]; description = "western music notation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "temporary" = callPackage @@ -252202,7 +253014,7 @@ self: { base base-compat directory filepath tasty tasty-hunit unix ]; description = "Portable temporary file and directory support"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "temporary-rc" = callPackage @@ -252217,7 +253029,7 @@ self: { base directory exceptions filepath transformers unix ]; description = "Portable temporary file and directory support for Windows and Unix, based on code from Cabal"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "temporary-resourcet" = callPackage @@ -252235,7 +253047,7 @@ self: { base directory resourcet tasty tasty-hunit transformers ]; description = "Portable temporary files and directories with automatic deletion"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tempus" = callPackage @@ -252255,8 +253067,8 @@ self: { ]; executableToolDepends = [ happy ]; description = "Interpreter for the FRP language Tempus"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -252272,7 +253084,7 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Programmers' time tracker"; - license = stdenv.lib.licenses.agpl3; + license = lib.licenses.agpl3; }) {}; "tensor" = callPackage @@ -252284,8 +253096,8 @@ self: { libraryHaskellDepends = [ base ghc-prim random vector ]; testHaskellDepends = [ base QuickCheck random ]; description = "A completely type-safe library for linear algebra"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -252309,8 +253121,8 @@ self: { hint singletons text vector vector-sized ]; description = "Create valid deep neural network architectures"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -252339,8 +253151,8 @@ self: { test-framework-quickcheck2 ]; description = "TensorFlow bindings"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {libtensorflow = null;}; @@ -252361,8 +253173,8 @@ self: { base bytestring lens-family proto-lens tensorflow text ]; description = "Haskell wrappers for Core Tensorflow Ops"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -252391,8 +253203,8 @@ self: { test-framework-hunit text ]; description = "TensorBoard related functionality"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -252426,8 +253238,8 @@ self: { test-framework test-framework-hunit text transformers vector ]; description = "TensorFlow demo application for learning MNIST model"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {tensorflow-mnist-input-data = null;}; @@ -252445,8 +253257,8 @@ self: { optparse-applicative proto-lens semigroups tensorflow-proto text ]; description = "Code generation for TensorFlow operations"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -252476,8 +253288,8 @@ self: { base criterion deepseq tensorflow transformers vector ]; description = "Friendly layer around TensorFlow bindings"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -252495,7 +253307,7 @@ self: { ]; libraryToolDepends = [ protobuf ]; description = "TensorFlow protocol buffers"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {inherit (pkgs) protobuf;}; "tensorflow-records" = callPackage @@ -252511,7 +253323,7 @@ self: { base bytestring cereal test-framework test-framework-quickcheck2 ]; description = "Encoder and decoder for the TensorFlow \"TFRecords\" format"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "tensorflow-records-conduit" = callPackage @@ -252527,7 +253339,7 @@ self: { resourcet tensorflow-records ]; description = "Conduit wrappers for TensorFlow.Records."; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "tensorflow-test" = callPackage @@ -252538,7 +253350,7 @@ self: { sha256 = "1z2anh5ikjpsb1sjfn290bcf5rcxsmzb0gwdk9czdnlmx3fig0ip"; libraryHaskellDepends = [ base HUnit vector ]; description = "Some common functions for test suites"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "tensors" = callPackage @@ -252547,17 +253359,15 @@ self: { }: mkDerivation { pname = "tensors"; - version = "0.1.4"; - sha256 = "1wiq38px85ypnfpvbr3hcawrag457z0jvd4jr1bh7jf6qw6jqpfn"; - revision = "1"; - editedCabalFile = "0a96iw75ylygbjdlab5dj3dkkqamd2k1g2nfy6w7ly6j7rq6f84p"; + version = "0.1.5"; + sha256 = "181jiffwp3varv9xzb8if22lwwi1vhhgqf7hai373vn2yavk5wal"; libraryHaskellDepends = [ base deepseq vector ]; testHaskellDepends = [ base deepseq hspec QuickCheck reflection vector ]; benchmarkHaskellDepends = [ base criterion deepseq vector ]; description = "Tensor in Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "term-rewriting" = callPackage @@ -252574,8 +253384,8 @@ self: { ]; testHaskellDepends = [ base containers HUnit QuickCheck ]; description = "Term Rewriting Library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -252589,7 +253399,7 @@ self: { isExecutable = true; libraryHaskellDepends = [ base ]; description = "termbox bindings"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "termbox-banana" = callPackage @@ -252602,8 +253412,8 @@ self: { isExecutable = true; libraryHaskellDepends = [ base reactive-banana termbox ]; description = "reactive-banana + termbox"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -252619,8 +253429,8 @@ self: { libraryToolDepends = [ c2hs ]; executableHaskellDepends = [ base ]; description = "Bindings to the Termbox library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -252635,7 +253445,7 @@ self: { libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base cli ]; description = "Composable terminal colors"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "terminal" = callPackage @@ -252655,7 +253465,7 @@ self: { tasty-hunit tasty-quickcheck text transformers ]; description = "Portable terminal interaction library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "terminal-progress-bar" = callPackage @@ -252672,7 +253482,7 @@ self: { ]; benchmarkHaskellDepends = [ base criterion time ]; description = "A progress bar in the terminal"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "terminal-punch" = callPackage @@ -252690,7 +253500,7 @@ self: { ]; testHaskellDepends = [ base QuickCheck time ]; description = "Simple terminal-based time tracker"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "terminal-size" = callPackage @@ -252701,7 +253511,7 @@ self: { sha256 = "0n4nvj3dbj9gxfnprgish45asn9z4dipv9j98s8i7g2n8yb3xhmm"; libraryHaskellDepends = [ base ]; description = "Get terminal window height and width"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "terminal-text" = callPackage @@ -252716,8 +253526,8 @@ self: { ansi-terminal base container layered-state prologue text ]; description = "Text data type for styled terminal output, including all standard ANSI effects (bold, italic, blinking) and ANSI / 256 / truecolor colors support for Unix and Windows (whenever possible)"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -252729,8 +253539,8 @@ self: { sha256 = "1k32s5vzkxnsawj8vdscyfc96hk0s97zpj1mgw1hk93hwcrxn9wh"; libraryHaskellDepends = [ base containers contravariant ]; description = "Termination combinators for forcing non-terminating algorithms to terminate"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -252743,8 +253553,8 @@ self: { libraryHaskellDepends = [ base ]; librarySystemDepends = [ ncurses ]; description = "Haskell bindings to the terminfo library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) ncurses;}; "terminfo-hs" = callPackage @@ -252760,7 +253570,7 @@ self: { ]; testHaskellDepends = [ base directory errors filepath QuickCheck ]; description = "A pure-Haskell (no FFI) module for accessing terminfo databases"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "termonad" = callPackage @@ -252775,8 +253585,8 @@ self: { }: mkDerivation { pname = "termonad"; - version = "4.1.0.0"; - sha256 = "17b9fxs9dc2pb8v2fxnly968v3bcy8g756r60nibd04fisrd1pmk"; + version = "4.1.1.0"; + sha256 = "1v8w6wf5y3708pjya97zzq1w8vb3g8vqc46pbfy7rizg5jfbr2ba"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -252795,7 +253605,7 @@ self: { QuickCheck tasty tasty-hedgehog tasty-hspec ]; description = "Terminal emulator configurable in Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) gtk3; inherit (pkgs) pcre2; vte_291 = pkgs.vte;}; @@ -252814,8 +253624,8 @@ self: { time-units transformers unix vty ]; description = "Plot time series in your terminal using commands stdout"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -252833,8 +253643,8 @@ self: { test-framework-quickcheck2 ]; description = "a ternary library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -252848,7 +253658,7 @@ self: { librarySystemDepends = [ terralib4c translib ]; description = "A Haskell GIS Programming Environment"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {terralib4c = null; translib = null;}; @@ -252869,8 +253679,8 @@ self: { base containers mtl process syb transformers ]; description = "A semantic parser for lojban"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -252896,8 +253706,8 @@ self: { wreq ]; description = "Tesla API client"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -252919,8 +253729,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Test monadic side-effects"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -252945,7 +253755,7 @@ self: { time xml ]; description = "Framework for running and organising tests, with HUnit and QuickCheck support"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "test-framework-doctest" = callPackage @@ -252961,8 +253771,8 @@ self: { ]; testHaskellDepends = [ base test-framework ]; description = "Test.Framework wrapper for DocTest"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -252978,7 +253788,7 @@ self: { base bytestring filepath mtl process temporary test-framework ]; description = "Golden tests support for test-framework"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "test-framework-hunit" = callPackage @@ -252994,7 +253804,7 @@ self: { base extensible-exceptions HUnit test-framework ]; description = "HUnit support for the test-framework package"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "test-framework-leancheck" = callPackage @@ -253006,7 +253816,7 @@ self: { libraryHaskellDepends = [ base leancheck test-framework ]; testHaskellDepends = [ base leancheck test-framework ]; description = "LeanCheck support for test-framework"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "test-framework-program" = callPackage @@ -253017,7 +253827,7 @@ self: { sha256 = "10p6xxxbfx3yr71wdbvk7qhm3xkxq3a1dv4hgcirzynsdfk36s3z"; libraryHaskellDepends = [ base directory process test-framework ]; description = "Test framework support for running simple test programs"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "test-framework-quickcheck" = callPackage @@ -253032,8 +253842,8 @@ self: { base deepseq extensible-exceptions QuickCheck random test-framework ]; description = "QuickCheck support for the test-framework package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -253051,7 +253861,7 @@ self: { base extensible-exceptions QuickCheck random test-framework ]; description = "QuickCheck-2 support for the test-framework package"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "test-framework-sandbox" = callPackage @@ -253071,8 +253881,8 @@ self: { base HUnit test-framework test-sandbox test-sandbox-hunit ]; description = "test-sandbox support for the test-framework package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -253092,8 +253902,8 @@ self: { test-framework-smallcheck ]; description = "Functions for conveniently marking some of the tests in a suite as being skipped"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -253107,7 +253917,7 @@ self: { base smallcheck test-framework transformers ]; description = "Support for SmallCheck tests in test-framework"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "test-framework-testing-feat" = callPackage @@ -253119,8 +253929,8 @@ self: { libraryHaskellDepends = [ base test-framework testing-feat ]; testHaskellDepends = [ base test-framework testing-feat ]; description = "A test framework provider for testing-feat"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -253137,7 +253947,7 @@ self: { template-haskell test-framework ]; description = "Automagically generate the HUnit- and Quickcheck-bulk-code using Template Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "test-framework-th-prime" = callPackage @@ -253152,8 +253962,8 @@ self: { base cpphs haskell-src-exts template-haskell test-framework ]; description = "Template Haskell for test framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -253166,7 +253976,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Testable functions"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "test-invariant" = callPackage @@ -253181,7 +253991,7 @@ self: { testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; benchmarkHaskellDepends = [ base criterion QuickCheck ]; description = "Provide common invariants to be checked with QuickCheck"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "test-karya" = callPackage @@ -253205,8 +254015,8 @@ self: { text ]; description = "Testing framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -253226,7 +254036,7 @@ self: { ]; executableHaskellDepends = [ base simple-get-opt ]; description = "A library to make a quick test-runner script"; - license = stdenv.lib.licenses.isc; + license = lib.licenses.isc; }) {}; "test-monad-laws" = callPackage @@ -253246,7 +254056,7 @@ self: { base mtl QuickCheck quickcheck-higherorder tasty tasty-quickcheck ]; description = "Laws for mtl classes as QuickCheck properties"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "test-pkg" = callPackage @@ -253257,8 +254067,8 @@ self: { sha256 = "0fncybd3sxrbnrd4l1hri18rhfg9h0fm3k4305iwh4l65fbwg2n8"; libraryHaskellDepends = [ base ]; description = "Just tests Hackage"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -253286,8 +254096,8 @@ self: { template-haskell text transformers transformers-compat unix ]; description = "Sandbox for system tests"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -253319,8 +254129,8 @@ self: { shakespeare test-sandbox text unix ]; description = "Lightweight development enviroments using test-sandbox"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -253332,8 +254142,8 @@ self: { sha256 = "0v8nfgjn46q4z5ic5vlqm240dfkk0ci90n86bb3b7nk3hvka1zpk"; libraryHaskellDepends = [ base HUnit lifted-base test-sandbox ]; description = "HUnit convenience functions for use with test-sandbox"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -253349,8 +254159,8 @@ self: { base mtl QuickCheck random test-sandbox transformers ]; description = "QuickCheck convenience functions for use with test-sandbox"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -253364,8 +254174,8 @@ self: { testHaskellDepends = [ base hspec hspec-discover silently ]; testToolDepends = [ hspec-discover ]; description = "Catchy combinators for HUnit"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -253384,8 +254194,8 @@ self: { base executable-path mtl process QuickCheck ]; description = "Simple Perl inspired testing"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -253404,7 +254214,7 @@ self: { ]; description = "Write your tests in comments"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -253419,7 +254229,7 @@ self: { executableHaskellDepends = [ base ]; description = "Small test package"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "testbench" = callPackage @@ -253440,8 +254250,8 @@ self: { streaming-cassava streaming-with temporary transformers weigh ]; description = "Create tests and benchmarks together"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -253464,8 +254274,8 @@ self: { ]; testToolDepends = [ hspec-discover tasty-discover ]; description = "Docker containers for your integration tests"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -253481,8 +254291,8 @@ self: { base QuickCheck size-based testing-type-modifiers ]; description = "Functional Enumeration of Algebraic Types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -253494,7 +254304,7 @@ self: { sha256 = "1wh2n95n39ivv6kbqn42vbzrj8zagsmk6f2al2qj40bg5kgdl2q5"; libraryHaskellDepends = [ base ]; description = "Data type modifiers for property based testing"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "testloop" = callPackage @@ -253512,8 +254322,8 @@ self: { time unix ]; description = "Quick feedback loop for test suites"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -253531,7 +254341,7 @@ self: { ]; description = "Test Utililty Pack for HUnit and QuickCheck (unmaintained)"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -253546,8 +254356,8 @@ self: { enableSeparateDataOutput = true; executableHaskellDepends = [ base filepath gtk ]; description = "Display a monitor test pattern"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -253563,7 +254373,7 @@ self: { ]; description = "Easy unit test driver framework"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -253578,7 +254388,7 @@ self: { enableSeparateDataOutput = true; executableHaskellDepends = [ base GLUT random ]; description = "A 2-D clone of Tetris"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tex-join-bib" = callPackage @@ -253598,7 +254408,7 @@ self: { base optparse-generic system-filepath text ]; description = "Compile separate tex files with the same bibliography"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "tex2txt" = callPackage @@ -253612,8 +254422,8 @@ self: { libraryHaskellDepends = [ base containers deepseq parsec ]; executableHaskellDepends = [ base containers deepseq parsec ]; description = "LaTeX to plain-text conversion"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -253634,8 +254444,8 @@ self: { temporary unix ]; description = "View your latex output while editing"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -253658,7 +254468,7 @@ self: { utf8-string xml ]; description = "Conversion between formats used to represent mathematics"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }) {}; "texrunner" = callPackage @@ -253680,34 +254490,27 @@ self: { base bytestring HUnit lens test-framework test-framework-hunit ]; description = "Functions for running Tex from Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; - "text_1_2_4_0" = callPackage - ({ mkDerivation, array, base, binary, bytestring, deepseq - , directory, ghc-prim, HUnit, integer-gmp, QuickCheck - , quickcheck-unicode, random, template-haskell, test-framework - , test-framework-hunit, test-framework-quickcheck2 + "text_1_2_4_1" = callPackage + ({ mkDerivation, array, base, binary, bytestring, deepseq, ghc-prim + , integer-gmp, template-haskell }: mkDerivation { pname = "text"; - version = "1.2.4.0"; - sha256 = "0k739i0sjrbl029y5j8n5v1hqa68z00xazvrahjhyl69mp4s5qna"; + version = "1.2.4.1"; + sha256 = "0bnb4g5lpranra58zpwqh14hvwdh6zc4nz3hwppzrpdahi10s7hv"; libraryHaskellDepends = [ array base binary bytestring deepseq ghc-prim integer-gmp template-haskell ]; - testHaskellDepends = [ - array base binary bytestring deepseq directory ghc-prim HUnit - integer-gmp QuickCheck quickcheck-unicode random template-haskell - test-framework test-framework-hunit test-framework-quickcheck2 - ]; doCheck = false; description = "An efficient packed Unicode text type"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; }) {}; "text-all" = callPackage @@ -253721,8 +254524,8 @@ self: { base bytestring text text-format utf8-string ]; description = "Everything Data.Text related in one package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -253739,8 +254542,8 @@ self: { unordered-containers ]; description = "EDSL to create HTML documents with plots based on the C3.js library."; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -253748,23 +254551,11 @@ self: { ({ mkDerivation, base, text }: mkDerivation { pname = "text-ansi"; - version = "0.1.0.2"; - sha256 = "139whkn4yr72bxd4jq3zp0cccylynb8p2lgk5dkhrhddhcj5605g"; - libraryHaskellDepends = [ base text ]; - description = "Text styling for ANSI terminals"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "text-ansi_0_1_1" = callPackage - ({ mkDerivation, base, text }: - mkDerivation { - pname = "text-ansi"; version = "0.1.1"; sha256 = "1vcrsg7v8n6znh1pd9kbm20bc6dg3zijd3xjdjljadf15vfkd5f6"; libraryHaskellDepends = [ base text ]; description = "Text styling for ANSI terminals"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; }) {}; "text-binary" = callPackage @@ -253775,7 +254566,7 @@ self: { sha256 = "18gl10pwg3qwsk0za3c70j4n6a9129wwf1b7d3a461h816yv55xn"; libraryHaskellDepends = [ base binary text ]; description = "Binary instances for text types"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }) {}; "text-builder" = callPackage @@ -253796,7 +254587,7 @@ self: { ]; benchmarkHaskellDepends = [ criterion rerebase ]; description = "An efficient strict text builder"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "text-containers" = callPackage @@ -253818,8 +254609,8 @@ self: { tasty-quickcheck text text-short vector ]; description = "Memory-efficient string-indexed container types"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -253837,7 +254628,7 @@ self: { testHaskellDepends = [ base bytestring hspec text ]; testToolDepends = [ hspec-discover ]; description = "Safe conversions between textual types"; - license = stdenv.lib.licenses.isc; + license = lib.licenses.isc; }) {}; "text-cp437" = callPackage @@ -253853,7 +254644,7 @@ self: { base bytestring QuickCheck quickcheck-text text ]; description = "Conversion of Text to and from CP437"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "text-format" = callPackage @@ -253871,7 +254662,7 @@ self: { time transformers ]; description = "Text formatting"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "text-format-heavy" = callPackage @@ -253889,8 +254680,8 @@ self: { ]; testHaskellDepends = [ base hspec time ]; description = "Full-weight string formatting library, analog of Python's string.format"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -253902,7 +254693,7 @@ self: { sha256 = "0iqs3v03kirjczlp7jpqdqzrfvqsbm260g110abkbpbxws3szqhk"; libraryHaskellDepends = [ base MissingH ]; description = "Simple text formatting library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "text-generic-pretty" = callPackage @@ -253926,8 +254717,8 @@ self: { tasty-hunit tasty-quickcheck time unordered-containers ]; description = "A generic, derivable, haskell pretty printer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -253948,7 +254739,7 @@ self: { test-framework-quickcheck2 text ]; description = "Bindings to the ICU library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) icu;}; "text-icu-normalized" = callPackage @@ -253971,8 +254762,8 @@ self: { test-framework-quickcheck2 test-framework-th text text-icu ]; description = "Dealing with Strict Text in NFC normalization"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -253991,7 +254782,7 @@ self: { text-icu ]; description = "ICU transliteration"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) icu;}; "text-json-qq" = callPackage @@ -254007,7 +254798,7 @@ self: { ]; description = "Json Quasiquatation for Haskell"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "text-latin1" = callPackage @@ -254023,7 +254814,7 @@ self: { text ]; description = "Latin-1 (including ASCII) utility functions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "text-ldap" = callPackage @@ -254044,7 +254835,7 @@ self: { base bytestring QuickCheck quickcheck-simple random ]; description = "Parser and Printer for LDAP text data stream"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "text-lens" = callPackage @@ -254056,8 +254847,8 @@ self: { libraryHaskellDepends = [ base extra lens text ]; testHaskellDepends = [ base hspec lens ]; description = "Lenses for operating over text"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -254073,8 +254864,8 @@ self: { base containers parsers text text-loc transformers ]; description = "Monadic parsing combinator library with attention to locations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -254086,7 +254877,7 @@ self: { sha256 = "069v99jnlayl2srl09355i56wpry0f6mq4bfp8lj0sxcsm1bzpgw"; libraryHaskellDepends = [ base hashable ]; description = "Line-column locations within a text"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "text-locale-encoding" = callPackage @@ -254097,7 +254888,7 @@ self: { sha256 = "1ls41s45qwrmmac8k1gryvxbhhczqy2wanwanw48m7xnbv52p9fg"; libraryHaskellDepends = [ base bytestring bytestring-handle text ]; description = "Encode and decode Text to/from ByteString using TextEncoding"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "text-manipulate" = callPackage @@ -254111,7 +254902,7 @@ self: { benchmarkHaskellDepends = [ base criterion text ]; description = "Case conversion, word boundary manipulation, and textual subjugation"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "text-manipulate_0_3_0_0" = callPackage @@ -254124,8 +254915,8 @@ self: { testHaskellDepends = [ base tasty tasty-hunit text ]; benchmarkHaskellDepends = [ base criterion text ]; description = "Case conversion, word boundary manipulation, and textual subjugation"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; }) {}; "text-markup" = callPackage @@ -254142,8 +254933,8 @@ self: { base QuickCheck quickcheck-text tasty tasty-quickcheck text ]; description = "A data structure for mapping metadata to text subsequences"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -254161,7 +254952,7 @@ self: { testHaskellDepends = [ base hspec QuickCheck text ]; benchmarkHaskellDepends = [ base criterion deepseq text weigh ]; description = "Calculate various string metrics efficiently"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "text-normal" = callPackage @@ -254177,8 +254968,8 @@ self: { base hspec QuickCheck quickcheck-instances ]; description = "Unicode-normalized text"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -254197,8 +254988,8 @@ self: { test-framework-hunit test-framework-quickcheck2 text ]; description = "Library for converting between line/column and byte offset"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -254215,8 +255006,8 @@ self: { ]; testHaskellDepends = [ base doctest HTF text ]; description = "Utils for text"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -254231,8 +255022,8 @@ self: { libraryHaskellDepends = [ base regex-applicative ]; testHaskellDepends = [ base QuickCheck regex-applicative ]; description = "Handling positions in text and position-tagging it"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -254249,7 +255040,7 @@ self: { ]; testHaskellDepends = [ base QuickCheck quickcheck-simple ]; description = "Parser and Printer of PostgreSQL extended types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "text-printer" = callPackage @@ -254267,7 +255058,7 @@ self: { base QuickCheck test-framework test-framework-quickcheck2 ]; description = "Abstract interface for text builders/printers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "text-regex-replace" = callPackage @@ -254283,7 +255074,7 @@ self: { base hspec QuickCheck smallcheck text text-icu ]; description = "Easy replacement when using text-icu regexes"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "text-region" = callPackage @@ -254301,7 +255092,7 @@ self: { ]; testHaskellDepends = [ base base-unicode-symbols hspec lens text ]; description = "Marking text regions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "text-register-machine" = callPackage @@ -254312,8 +255103,8 @@ self: { sha256 = "0g0iihfin5vjfk69r7jjw4vs3l1k3f0kkg3bbc4xqm274vd72bph"; libraryHaskellDepends = [ base containers mtl vector ]; description = "A Haskell implementation of the 1# Text Register Machine"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -254325,7 +255116,7 @@ self: { sha256 = "1p78xsr25qxmfgsl73lzfn7j32ni897667k48448fkihdsg0a15g"; libraryHaskellDepends = [ base classy-prelude mtl parsec text ]; description = "A type class for rendering objects as text, pretty-printing, etc"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "text-replace" = callPackage @@ -254342,8 +255133,8 @@ self: { executableHaskellDepends = [ base optparse-applicative parsec ]; testHaskellDepends = [ base hedgehog neat-interpolation text ]; description = "Simple text replacements from a list of search/replace pairs"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -254366,7 +255157,7 @@ self: { text ]; description = "Memory-efficient representation of Unicode text strings"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "text-show" = callPackage @@ -254381,6 +255172,8 @@ self: { pname = "text-show"; version = "3.9"; sha256 = "1cj6w77lgh9cydg1jz3wfhll0bvzrmhgk37dgm7s33qbkpq9mf90"; + revision = "1"; + editedCabalFile = "1jwsp8g7c7wywxvhb7ns7xw0h7mbr33c3kyhba8ybw0rn43ynjki"; libraryHaskellDepends = [ array base base-compat-batteries bifunctors bytestring bytestring-builder containers generic-deriving ghc-boot-th ghc-prim @@ -254396,7 +255189,7 @@ self: { testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ base criterion deepseq ghc-prim text ]; description = "Efficient conversion of values into Text"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "text-show-instances" = callPackage @@ -254429,7 +255222,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Additional instances for text-show"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "text-stream-decode" = callPackage @@ -254445,7 +255238,7 @@ self: { testHaskellDepends = [ base bytestring deepseq hspec text ]; benchmarkHaskellDepends = [ base bytestring criterion text ]; description = "Streaming decoding functions for UTF encodings. (deprecated)"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "text-time" = callPackage @@ -254461,7 +255254,7 @@ self: { attoparsec base Cabal formatting hspec QuickCheck text time ]; description = "Library for Time parsing from Text into UTCTime"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "text-trie" = callPackage @@ -254478,8 +255271,8 @@ self: { silently smallcheck text ]; description = "An efficient finite map from Text to values, based on bytestring-trie"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -254497,7 +255290,7 @@ self: { tasty-quickcheck text ]; description = "UTF-7 encoding/decoding for Data.Text"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "text-utf8" = callPackage @@ -254521,8 +255314,8 @@ self: { test-framework-hunit test-framework-quickcheck2 ]; description = "An efficient packed UTF-8 backed Unicode text type"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -254535,8 +255328,8 @@ self: { libraryHaskellDepends = [ base text ]; testHaskellDepends = [ base HTF text ]; description = "Various text utilities"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -254554,7 +255347,7 @@ self: { ]; description = "Serialize Data to XML (strings)"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "text-xml-qq" = callPackage @@ -254565,8 +255358,8 @@ self: { sha256 = "0311in43n89bk1fg4y9qglvbbl47ygvcvr0f7zpr8bpaqbb1ard5"; libraryHaskellDepends = [ base parsec template-haskell xml ]; description = "Quasiquoter for xml. XML DSL in Haskell."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -254580,7 +255373,7 @@ self: { libraryHaskellDepends = [ base deepseq text vector ]; testHaskellDepends = [ base hspec QuickCheck text ]; description = "A text editor zipper library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "text-zipper-monad" = callPackage @@ -254592,8 +255385,8 @@ self: { libraryHaskellDepends = [ base mtl text-zipper ]; testHaskellDepends = [ base hspec text-zipper ]; description = "Monadic interface to the text-zipper package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -254610,8 +255403,8 @@ self: { base HUnit lens QuickCheck semigroups text ]; description = "Non-empty values of `Data.Text`."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -254623,7 +255416,7 @@ self: { sha256 = "04mhchvnk20r7ra2m568lvbzqzcwnh7vsyzj01r50cwylacgwwvd"; libraryHaskellDepends = [ array base ]; description = "Plot functions in text"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "textlocal" = callPackage @@ -254639,7 +255432,7 @@ self: { unix-time ]; description = "Haskell wrapper for textlocal SMS gateway"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "textmatetags" = callPackage @@ -254652,8 +255445,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base haskell98 process ]; description = "A simple Haskell program to provide tags for Haskell code completion in TextMate"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -254674,8 +255467,8 @@ self: { tasty tasty-hunit text transformers ]; description = "Unofficial Haskell SDK for Textocat API -- http://textocat.com"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -254687,7 +255480,7 @@ self: { sha256 = "15r3lrd6qrhhsll6qlbvgd5g545mj2s6banahwlibcimqqdw8s9h"; doHaddock = false; description = "None"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "textual" = callPackage @@ -254698,8 +255491,8 @@ self: { sha256 = "0facdj7h789pz7ll43wdkfn6zs6d4q1ns61wq64d2gixwi2fq06y"; libraryHaskellDepends = [ base bytestring text utf8-string ]; description = "Textual type class for data that represent text"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -254711,7 +255504,7 @@ self: { sha256 = "0445r2nns6009fmq0xbfpyv7jpzwv0snccjdg7hwj4xk4z0cwc1f"; libraryHaskellDepends = [ base primitive random time ]; description = "High-quality splittable pseudorandom number generator"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tfp" = callPackage @@ -254723,7 +255516,7 @@ self: { libraryHaskellDepends = [ base utility-ht ]; testHaskellDepends = [ base QuickCheck ]; description = "Type-level integers, booleans, lists using type families"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tfp-th" = callPackage @@ -254734,8 +255527,8 @@ self: { sha256 = "139dcwvik8yfpl3i71ddjml1xn126qrx1mbxa4mcwfm6q81fvkzm"; libraryHaskellDepends = [ base template-haskell tfp ]; description = "Template-Haskell code for tfp"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -254760,8 +255553,8 @@ self: { base hslogger mtl network QuickCheck transformers ]; description = "A library for building tftp servers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -254773,8 +255566,8 @@ self: { sha256 = "0lpc5z575y7cq03ww2knr5qdkfb36qnim5y1gkh552r9k3pfdjhf"; libraryHaskellDepends = [ base bytestring ]; description = "Reading and writing of tga image files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -254789,7 +255582,7 @@ self: { ]; testHaskellDepends = [ base containers template-haskell ]; description = "Nicer interface for reified information about data types"; - license = stdenv.lib.licenses.isc; + license = lib.licenses.isc; }) {}; "th-alpha" = callPackage @@ -254808,8 +255601,8 @@ self: { base derive tasty tasty-hunit tasty-quickcheck template-haskell ]; description = "Alpha equivalence for TH Exp"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -254821,7 +255614,7 @@ self: { sha256 = "0p5zpiqk8141a4n362m3kpd92sx0192gpv172ixdnfgabk07gn1z"; libraryHaskellDepends = [ base template-haskell ]; description = "Compatibility for bang-type template"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "th-build" = callPackage @@ -254832,8 +255625,8 @@ self: { sha256 = "0f16cgwkmqhkm5nxyic0f56swzm96yqmagmbh7vjd203mn9zv9z6"; libraryHaskellDepends = [ base template-haskell ]; description = "More convenient construction of TH ASTs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -254846,7 +255639,7 @@ self: { libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base hspec template-haskell ]; description = "Compile-time CAS(Computer Algebra System)"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "th-compat" = callPackage @@ -254863,7 +255656,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Backward- (and forward-)compatible Quote and Code types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "th-constraint-compat" = callPackage @@ -254874,7 +255667,7 @@ self: { sha256 = "1wx35f24gryal0h0gadq351gws82qvficcq23pyd1ajrxhgnv3zc"; libraryHaskellDepends = [ base containers template-haskell ]; description = "Compatibility for type constraint template"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "th-context" = callPackage @@ -254897,8 +255690,8 @@ self: { template-haskell text th-desugar th-orphans th-reify-many ]; description = "Test instance context"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -254910,7 +255703,7 @@ self: { sha256 = "03d5ddbxzfn60ysxxn17q7gzdlls8hvlsvhzai4mn0qfjpwi6ljx"; libraryHaskellDepends = [ base template-haskell ]; description = "Compatibility for data definition template of TH"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "th-desugar" = callPackage @@ -254932,7 +255725,7 @@ self: { th-orphans ]; description = "Functions to desugar Template Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "th-dict-discovery" = callPackage @@ -254943,8 +255736,8 @@ self: { sha256 = "1dmkj8is73mwngy1dw3ba34744whqj0jc243bjnkyrrwkbwn55ih"; libraryHaskellDepends = [ base constraints template-haskell ]; description = "Automatically discover available dictionaries at compile time"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -254958,7 +255751,7 @@ self: { testHaskellDepends = [ base markdown-unlit ]; testToolDepends = [ markdown-unlit ]; description = "Template Haskell splice that expands to an environment variable"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "th-expand-syns" = callPackage @@ -254970,7 +255763,7 @@ self: { libraryHaskellDepends = [ base containers syb template-haskell ]; testHaskellDepends = [ base template-haskell ]; description = "Expands type synonyms in Template Haskell ASTs"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "th-extras" = callPackage @@ -254981,7 +255774,7 @@ self: { sha256 = "1vgvqgfm2lvx6v5r2mglwyl63647c9n6b9a5ikqc93pjm98g9vwg"; libraryHaskellDepends = [ base syb template-haskell ]; description = "A grab bag of functions for use with Template Haskell"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "th-fold" = callPackage @@ -254992,8 +255785,8 @@ self: { sha256 = "10n1aw74xi5gzs1847dhiv6yjxcz99idw91hvf34zhhs8hp8zf2z"; libraryHaskellDepends = [ base template-haskell ]; description = "TH fold generator"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -255010,8 +255803,8 @@ self: { ]; testHaskellDepends = [ base tasty tasty-hunit text ]; description = "Template Haskell based support for format strings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -255023,7 +255816,7 @@ self: { sha256 = "09xxfgyy56284cd2fry8pshlpawva4yq1k6bhza5samn694yinkq"; libraryHaskellDepends = [ base template-haskell ]; description = "Simple inline IO action into compiled code using TH"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "th-instance-reification" = callPackage @@ -255043,8 +255836,8 @@ self: { tasty-quickcheck template-haskell ]; description = "Fixed versions of instances reification functions"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -255068,8 +255861,8 @@ self: { test-framework-quickcheck2 th-kinds th-lift ]; description = "A place to collect orphan instances for Template Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -255085,8 +255878,8 @@ self: { base containers mtl template-haskell th-orphans ]; description = "Automated kind inference in Template Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -255102,8 +255895,8 @@ self: { base containers mtl template-haskell th-orphans ]; description = "Automated kind inference in Template Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -255124,8 +255917,8 @@ self: { tasty-quickcheck template-haskell ]; description = "Template Haskell construction utilities"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -255141,7 +255934,7 @@ self: { ]; testHaskellDepends = [ base ghc-prim template-haskell ]; description = "Derive Template Haskell's Lift class for datatypes"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "th-lift-instances" = callPackage @@ -255160,7 +255953,7 @@ self: { base bytestring containers QuickCheck template-haskell text vector ]; description = "Lift instances for template-haskell for common data types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "th-nowq" = callPackage @@ -255173,7 +255966,7 @@ self: { testHaskellDepends = [ base markdown-unlit ]; testToolDepends = [ markdown-unlit ]; description = "Template Haskell splice that expands to current time"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "th-orphans" = callPackage @@ -255194,7 +255987,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Orphan instances for TH datatypes"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "th-pprint" = callPackage @@ -255205,8 +255998,8 @@ self: { sha256 = "1c6h6jw82a8bdb8kqxcam63vbrz04dl8m2ypcmfw5qm88b61zl1f"; libraryHaskellDepends = [ base lens pretty template-haskell ]; description = "Simplify and render Template Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -255227,7 +256020,7 @@ self: { base hspec HUnit QuickCheck template-haskell text ]; description = "Quasiquoters for printf"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "th-reify-compat" = callPackage @@ -255238,7 +256031,7 @@ self: { sha256 = "171m4fibjq4ml33xvbb0qdm625adknsdgz8flb4xhag075z2w6xg"; libraryHaskellDepends = [ base template-haskell ]; description = "Compatibility for the result type of TH reify"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "th-reify-many" = callPackage @@ -255254,7 +256047,7 @@ self: { ]; testHaskellDepends = [ base template-haskell ]; description = "Recurseively reify template haskell datatype info"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "th-sccs" = callPackage @@ -255265,8 +256058,8 @@ self: { sha256 = "0vrjqwdjv2922kqmh57ypbslbv1m829wag78addqsr4vjd9b3zl6"; libraryHaskellDepends = [ base containers template-haskell ]; description = "Binding group analysis in Template Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -255278,7 +256071,7 @@ self: { sha256 = "0jmajcnw832df503jbg2fmrmnskc43i07214vpc4fw359cgd7yn3"; libraryHaskellDepends = [ base template-haskell ]; description = "Compatibility shim for Bang and Strict in Template Haskell"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "th-tc" = callPackage @@ -255293,8 +256086,8 @@ self: { base containers lens mtl template-haskell th-orphans transformers ]; description = "Typechecking in Template Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -255316,7 +256109,7 @@ self: { th-orphans transformers ]; description = "Utility functions for testing Template Haskell code"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "th-to-exp" = callPackage @@ -255328,8 +256121,8 @@ self: { libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base hspec template-haskell ]; description = "Provides a way to persist data from compile-time to runtime"; - license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -255341,8 +256134,8 @@ self: { sha256 = "1hmhpcxg0hhqhb8qmqqi9x8jb4h8a6045k0q8162mm0vl47s4rz2"; libraryHaskellDepends = [ base containers mtl template-haskell ]; description = "Tracing Q monad computation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -255370,8 +256163,8 @@ self: { aeson base HUnit network-uri syb template-haskell th-lift ]; description = "Graph of the subtype relation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -255392,7 +256185,7 @@ self: { template-haskell text th-orphans vector ]; description = "Collection of useful functions for use with Template Haskell"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "thank-you-stars" = callPackage @@ -255414,8 +256207,8 @@ self: { base Cabal containers directory filepath hspec ]; description = "Give your dependencies stars on GitHub!"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -255431,8 +256224,8 @@ self: { base contravariant semigroups slave-thread unagi-chan ]; description = "Minimalistic actor library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -255459,7 +256252,7 @@ self: { tasty-hunit text time ]; description = "Haskell API bindings for http://themoviedb.org"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "themplate" = callPackage @@ -255480,7 +256273,7 @@ self: { optparse-applicative text transformers transformers-compat ]; description = "Project templating tool"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "thentos-cookie-session" = callPackage @@ -255506,7 +256299,7 @@ self: { ]; description = "All-in-one session handling for servant-based frontends"; license = "AGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -255518,8 +256311,8 @@ self: { sha256 = "05z0jppjbw70rlyh2qis27xp8vdx9fgn7i22ckxb0m2y75gffq61"; libraryHaskellDepends = [ base HTTP json utf8-string ]; description = "A common library for TheoremQuest, a theorem proving game"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -255533,8 +256326,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base HTTP network theoremquest ]; description = "A simple client for the TheoremQuest theorem proving game"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -255546,7 +256339,7 @@ self: { sha256 = "027m1gd7i6jf2ppfkld9qrv3xnxg276587pmx10z9phpdvswk66p"; libraryHaskellDepends = [ assoc base binary deepseq hashable ]; description = "An either-or-both data type"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "these-lens" = callPackage @@ -255557,7 +256350,7 @@ self: { sha256 = "1nwknm17x7vkx9936z7xa6hqw69pgig185if1dninrvyxvv59kps"; libraryHaskellDepends = [ base lens these ]; description = "Lenses for These"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "these-optics" = callPackage @@ -255568,7 +256361,7 @@ self: { sha256 = "1xwf2m03cbb2z40mdab70d042nmvcxpgdq94rmajbqqpb072yivq"; libraryHaskellDepends = [ base optics-core these ]; description = "Optics for These"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "these-skinny" = callPackage @@ -255581,7 +256374,7 @@ self: { editedCabalFile = "0q1izcz4kxrnl7sh0sxamxxq02mkxww88vr6v04pwj8alyhkd4z2"; libraryHaskellDepends = [ base deepseq ]; description = "A fork of the 'these' package without the dependency bloat"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "thespian" = callPackage @@ -255592,7 +256385,7 @@ self: { sha256 = "0z3cqjcf6xr0z7g3s1jszcs39w43sl0793gl0qm3dklbginqbcnn"; libraryHaskellDepends = [ base containers mtl ]; description = "Lightweight Erlang-style actors for Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "theta-functions" = callPackage @@ -255603,7 +256396,7 @@ self: { sha256 = "0m9k1b75ja5a6vq7jdqzsbqjc4fh1kzy29rzss08ph6700bm6z8f"; libraryHaskellDepends = [ base ]; description = "Theta-functions implemented as trigonometric series"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "thih" = callPackage @@ -255617,8 +256410,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base pretty ]; description = "Typing Haskell In Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -255637,8 +256430,8 @@ self: { base edit-distance parseargs phonetic-code sqlite ]; description = "Command-line spelling word suggestion tool"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -255649,8 +256442,8 @@ self: { }: mkDerivation { pname = "thock"; - version = "0.2.0.0"; - sha256 = "1wj3zldfqpa8xvk62qv13frhxmrjhrjismcb9iyblkrwlcxzfyns"; + version = "0.2.1.0"; + sha256 = "0s5xxmbxpr6g2j7797j8ix51405q7455s74x5dijfpi13phx7v94"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -255666,8 +256459,8 @@ self: { text-zipper time vector vty websockets ]; description = "A modern TUI typing game featuring online racing against friends"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -255686,8 +256479,8 @@ self: { template-haskell ]; description = "Datatype Manipulation with Template Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -255701,7 +256494,7 @@ self: { testHaskellDepends = [ base containers hspec stm ]; testToolDepends = [ hspec-discover ]; description = "Simple Haskell thread management in hierarchical manner"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "thread-local-storage" = callPackage @@ -255714,7 +256507,7 @@ self: { testHaskellDepends = [ atomic-primops base ]; benchmarkHaskellDepends = [ atomic-primops base criterion ]; description = "Several options for thread-local-storage (TLS) in Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "thread-supervisor" = callPackage @@ -255733,7 +256526,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "A simplified implementation of Erlang/OTP like supervisor over thread"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "threadPool" = callPackage @@ -255766,7 +256559,7 @@ self: { monad-control-aligned mtl stm tmapmvar ]; description = "Manage concurrently operating threads without having to spark them"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "threadmanager" = callPackage @@ -255777,8 +256570,8 @@ self: { sha256 = "17s26hlailbr8c9d3dv1pwiy81m3nzr3sw0v9y716rmhldf7k09f"; libraryHaskellDepends = [ base containers ]; description = "(deprecated in favor of 'threads') Simple thread management"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -255796,7 +256589,7 @@ self: { base concurrent-extra HUnit stm test-framework test-framework-hunit ]; description = "Fork threads and wait for their result"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "threads-extras" = callPackage @@ -255808,7 +256601,7 @@ self: { libraryHaskellDepends = [ base stm threads ]; testHaskellDepends = [ base ]; description = "Extends the threads package with a bounded thread group"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "threads-pool" = callPackage @@ -255819,7 +256612,7 @@ self: { sha256 = "1x1yafxaaf8r02cqipqnm9shj74kja1bqdp0d1cq5kdhcnh22xkz"; libraryHaskellDepends = [ base containers mtl stm ]; description = "A library to operate with pool of haskell's IO threads"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "threads-supervisor" = callPackage @@ -255842,7 +256635,7 @@ self: { tasty-quickcheck time transformers ]; description = "Simple, IO-based library for Erlang-style thread supervision"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "threadscope" = callPackage @@ -255852,8 +256645,8 @@ self: { }: mkDerivation { pname = "threadscope"; - version = "0.2.13"; - sha256 = "1y5d6mgrx3mv6vdivv4ih1hvgp3bjrz26mr922gim08ryfh1hm43"; + version = "0.2.14"; + sha256 = "0xcj8v6kyk8ss2sg6f32gx84vgx36hfaqb5p3sy3d4vkxan4xwcy"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -255863,7 +256656,7 @@ self: { text time unix ]; description = "A graphical tool for profiling parallel Haskell programs"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "threefish" = callPackage @@ -255879,7 +256672,7 @@ self: { tagged ]; description = "The Threefish block cipher and the Skein hash function for Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "threepenny-editors" = callPackage @@ -255897,8 +256690,8 @@ self: { semigroups text threepenny-gui ]; description = "Composable algebraic editors"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -255925,7 +256718,7 @@ self: { vector websockets websockets-snap ]; description = "GUI framework that uses the web browser as a display"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "threepenny-gui-contextmenu" = callPackage @@ -255939,8 +256732,8 @@ self: { libraryHaskellDepends = [ base threepenny-gui ]; executableHaskellDepends = [ base threepenny-gui ]; description = "Write simple nested context menus for threepenny-gui"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -255955,8 +256748,8 @@ self: { libraryHaskellDepends = [ base clay text threepenny-gui ]; executableHaskellDepends = [ base threepenny-gui ]; description = "Flexbox layouts for Threepenny-gui"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -255979,8 +256772,8 @@ self: { base bytestring hspec QuickCheck unordered-containers ]; description = "Haskell bindings for the Apache Thrift RPC system"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -255992,7 +256785,7 @@ self: { sha256 = "16alzsalzlvwg3cjfy8yysv8z72v7v1in1hbi5prz6gm1ws4rcly"; libraryHaskellDepends = [ base ]; description = "Type-threaded list"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "throttle" = callPackage @@ -256003,7 +256796,7 @@ self: { sha256 = "1yxmq7244a8bcw1jg00dqcpwzf8h1333c51k9d0v39flpkzp5qlc"; doHaddock = false; description = "None"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "throttle-io-stream" = callPackage @@ -256020,7 +256813,7 @@ self: { test-framework-hunit text ]; description = "Throttler between arbitrary IO producer and consumer functions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "throttled" = callPackage @@ -256031,7 +256824,7 @@ self: { sha256 = "0grzdhgpba5wjylr3ci4xp1cx6d26jhh0r018n4l3fzi1zivwagg"; libraryHaskellDepends = [ async base stm ]; description = "Concurrent processing of a Foldable, throttled by CPU count"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "throttled-io-loop" = callPackage @@ -256043,8 +256836,8 @@ self: { libraryHaskellDepends = [ base natural-numbers time ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "Loop over an action but throttle it to a certain rate"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -256058,7 +256851,7 @@ self: { editedCabalFile = "1fdy2wyczl2jncy9gg0asasb8bybcnif8aqnw9fq73sr1778kjpf"; libraryHaskellDepends = [ base bytestring case-insensitive text ]; description = "Convert textual types through Text without needing O(n^2) instances"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "throwable-exceptions" = callPackage @@ -256076,7 +256869,7 @@ self: { ]; testToolDepends = [ tasty-discover ]; description = "throwable-exceptions gives the easy way to throw exceptions"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "thumbnail" = callPackage @@ -256087,7 +256880,7 @@ self: { sha256 = "1ms7pzw4lrpkpv6sb0l7jvw5a0n5j7fc9wyi28bq7ik22d4sc8kd"; libraryHaskellDepends = [ base bytestring gd ]; description = "generate thumbnail image"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "thumbnail-plus" = callPackage @@ -256110,8 +256903,8 @@ self: { transformers ]; description = "Generate thumbnails easily and safely"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -256128,8 +256921,8 @@ self: { nonce resourcet text ]; description = "Image thumbnail creation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -256160,7 +256953,7 @@ self: { vector vector-space ]; description = "A faster time library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tianbar" = callPackage @@ -256197,8 +256990,8 @@ self: { vector xdg-basedir ]; description = "A desktop bar based on WebKit"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) gtk3; inherit (pkgs) webkitgtk;}; "tibetan-utils" = callPackage @@ -256216,7 +257009,7 @@ self: { base hspec hspec-megaparsec megaparsec text ]; description = "Parse and display tibetan numerals"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tic-tac-toe" = callPackage @@ -256230,8 +257023,8 @@ self: { enableSeparateDataOutput = true; executableHaskellDepends = [ base glade gtk haskell98 ]; description = "Useful if reading \"Why FP matters\" by John Hughes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -256248,7 +257041,7 @@ self: { libraryHaskellDepends = [ async base safe-exceptions ]; testHaskellDepends = [ async base deepseq doctest Glob hspec ]; description = "A concurrent utility inspired by Ticker in golang"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tickle" = callPackage @@ -256268,8 +257061,8 @@ self: { base checkers lens QuickCheck tasty tasty-hunit tasty-quickcheck ]; description = "A port of @Data.Binary@"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -256281,8 +257074,8 @@ self: { sha256 = "0xpfcabhlpnp883jb23sjcilan1cwwykvvlqvc6qzhda63fcyqp1"; libraryHaskellDepends = [ base tuples-homogenous-h98 vector ]; description = "3D Tic-Tac-Toe game"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -256303,7 +257096,30 @@ self: { testHaskellDepends = [ base containers deepseq microspec parsec ]; benchmarkHaskellDepends = [ base criterion weigh ]; description = "Pattern language for improvised music"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; + }) {}; + + "tidal_1_7" = callPackage + ({ mkDerivation, base, bifunctors, bytestring, clock, colour + , containers, criterion, deepseq, hosc, microspec, network, parsec + , primitive, random, text, transformers, vector, weigh + }: + mkDerivation { + pname = "tidal"; + version = "1.7"; + sha256 = "1kqk9ny1fvgzkmv0kiprbi7l5pwmwkz8f7zycyksqxb6wkrs3v1k"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bifunctors bytestring clock colour containers deepseq hosc + network parsec primitive random text transformers vector + ]; + testHaskellDepends = [ + base containers deepseq hosc microspec parsec + ]; + benchmarkHaskellDepends = [ base criterion weigh ]; + description = "Pattern language for improvised music"; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; }) {}; "tidal-midi" = callPackage @@ -256320,8 +257136,8 @@ self: { base containers PortMidi tidal time transformers ]; description = "MIDI support for tidal"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -256335,8 +257151,8 @@ self: { base bytestring containers serialport tidal ]; description = "Serial support for tidal"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -256357,8 +257173,8 @@ self: { ]; executableHaskellDepends = [ base ]; description = "Visual rendering for Tidal patterns and osc messages"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -256371,7 +257187,7 @@ self: { libraryHaskellDepends = [ base containers mtl recursion-schemes ]; description = "\"Ties the knot\" on a given set of structures that reference each other by keys"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -256383,8 +257199,8 @@ self: { sha256 = "13jazsgjs95hykshjsvjx05hdhj5jcl85sqhci4hmjhyivplxc58"; libraryHaskellDepends = [ base deepseq time ]; description = "Specify time intervals in different units (secs, mins, hours, etc.)"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -256401,8 +257217,8 @@ self: { array base containers uuagc uuagc-cabal uulib ]; description = "Tiger Compiler of Universiteit Utrecht"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -256414,7 +257230,7 @@ self: { sha256 = "069gwshl52cngbm563snyvjdgm39cgrlpq446mh45adjmbfd26c4"; libraryHaskellDepends = [ base ]; description = "Tightly binding infix function application"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "tightrope" = callPackage @@ -256430,8 +257246,8 @@ self: { wai-extra wreq ]; description = "Nice API for a Slackbot"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -256450,8 +257266,8 @@ self: { simple-pipe time ]; description = "Tiny and Incrementally-Growing HTTP library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -256464,7 +257280,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base HUnit ]; description = "Slippy map tile functionality"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tilings" = callPackage @@ -256475,7 +257291,7 @@ self: { sha256 = "03a9bc4zbfb3c0dd75rxj7h9pj3sc23l9a9gmabcww5nsx8kpjys"; libraryHaskellDepends = [ base ]; description = "substitution tilings"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "timberc" = callPackage @@ -256494,8 +257310,8 @@ self: { ]; executableToolDepends = [ happy ]; description = "The Timber Compiler"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -256514,8 +257330,8 @@ self: { ]; benchmarkHaskellDepends = [ base criterion deepseq ]; description = "A time library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "time-cache" = callPackage @@ -256530,7 +257346,7 @@ self: { auto-update base text time time-units transformers ]; description = "Cache current time and formatted time text"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "time-compat" = callPackage @@ -256547,7 +257363,7 @@ self: { tasty-quickcheck time ]; description = "Compatibility package for time"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "time-extras" = callPackage @@ -256558,8 +257374,8 @@ self: { sha256 = "1k9adm922l431gyk8figx5df1n2xk5awir2fpijnvvyphrwk5p3l"; libraryHaskellDepends = [ base time ]; description = "Data instances for the time package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -256581,8 +257397,8 @@ self: { old-locale QuickCheck random text time tz ]; description = "Yet another time library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -256606,8 +257422,8 @@ self: { QuickCheck tagged time ]; description = "Parse and format HTTP/1.1 Date and Time strings"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -256619,7 +257435,7 @@ self: { sha256 = "097yab0j9dpplq65a9x6liisdrakag6azmylis4yxv2zlg1f2wrl"; libraryHaskellDepends = [ base time-units ]; description = "Use a time unit class, but hold a concrete time type"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "time-io-access" = callPackage @@ -256630,8 +257446,8 @@ self: { sha256 = "0n05lw6zpcfr3lwy2qn7v0j3ym1la9x0mak8szaxc2nbkyc8drrb"; libraryHaskellDepends = [ base base-io-access time ]; description = "IO Access for time"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -256643,7 +257459,7 @@ self: { sha256 = "07nh97x1mx5hc48xqv3gk3cgls6xpb829h3bzsjx8rwqnzybijyq"; libraryHaskellDepends = [ base data-lens-light time ]; description = "Lens-based interface to Data.Time data structures"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "time-locale-compat" = callPackage @@ -256654,7 +257470,7 @@ self: { sha256 = "0b2hmj8wwrfkndwzgm11qr496ca2ahwdxcj3m0ii91bxvrk1bzq7"; libraryHaskellDepends = [ base old-locale time ]; description = "Compatibile module for time-format locale"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "time-locale-vietnamese" = callPackage @@ -256665,7 +257481,7 @@ self: { sha256 = "0xhbfdzrlhj3096w2dgk2ijpzs4kzym11sz3r0h8r19a3jrjs1ln"; libraryHaskellDepends = [ base time ]; description = "Vietnamese locale for date and time format"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "time-machine" = callPackage @@ -256677,8 +257493,8 @@ self: { libraryHaskellDepends = [ base mtl time tz ]; testHaskellDepends = [ base hspec HUnit mtl time tz ]; description = "A library to mock the current time"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -256690,7 +257506,7 @@ self: { sha256 = "1nzwj0fxz370ks6vr1sylcidx33rnqq45y3q9yv9n4dj43nid9lh"; libraryHaskellDepends = [ auto-update base ]; description = "Scalable timer"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "time-out" = callPackage @@ -256707,7 +257523,7 @@ self: { ]; testHaskellDepends = [ base time-units transformers ]; description = "Timers, timeouts, alarms, monadic wrappers"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "time-parsers" = callPackage @@ -256726,7 +257542,7 @@ self: { template-haskell text time ]; description = "Parsers for types in `time`"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "time-patterns" = callPackage @@ -256737,7 +257553,7 @@ self: { sha256 = "0qyg2y41c0bn296zyxfhjjjm0bxn4vmns242vl90j0b0siz69qr0"; libraryHaskellDepends = [ base intervals time ]; description = "Patterns for recurring events"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "time-qq" = callPackage @@ -256753,8 +257569,8 @@ self: { ]; testHaskellDepends = [ base hspec ]; description = "Quasi-quoter for UTCTime times"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -256771,8 +257587,8 @@ self: { base doctest doctest-discover template-haskell time ]; description = "Quasi-quoters for dates and times"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -256790,8 +257606,8 @@ self: { test-framework-hunit time ]; description = "Generate recurring dates"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -256806,8 +257622,8 @@ self: { libraryHaskellDepends = [ array base containers mtl ]; executableHaskellDepends = [ base ]; description = "Time series analysis"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -256821,8 +257637,8 @@ self: { testHaskellDepends = [ base Cabal hspec QuickCheck ]; doHaddock = false; description = "Library for Time Series processing"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -256834,7 +257650,7 @@ self: { sha256 = "16g0i6r6vj9w4lbn12jqrhgbbjjca8wbzq6546dz08aks1yrk0g1"; libraryHaskellDepends = [ base ]; description = "A basic library for defining units of time as types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "time-w3c" = callPackage @@ -256847,8 +257663,8 @@ self: { isExecutable = true; libraryHaskellDepends = [ base convertible parsec time ]; description = "Parse, format and convert W3C Date and Time"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -256886,8 +257702,8 @@ self: { time-units transformers ]; description = "Distributed systems execution emulation"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -256900,8 +257716,8 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base haskeline uu-parsinglib ]; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -256915,7 +257731,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base process time ]; description = "time each line of terminal output"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }) {}; "timeit" = callPackage @@ -256928,7 +257744,7 @@ self: { editedCabalFile = "0d4vjg48xyqjmydnjqjxica0zr30vgb91b3vv75cig686ikpjmq7"; libraryHaskellDepends = [ base ]; description = "Time monadic computations with an IO base"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "timelens" = callPackage @@ -256939,7 +257755,7 @@ self: { sha256 = "0r57fib5nzvrk8gsn26364l1a14zj9sg3kv2db4pjzy3dq0zmrpl"; libraryHaskellDepends = [ base lens time ]; description = "Lenses for the time package"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "timeless" = callPackage @@ -256952,7 +257768,7 @@ self: { ansi-terminal base linear time transformers ]; description = "An Arrow based Functional Reactive Programming library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "timeless-tutorials" = callPackage @@ -256966,7 +257782,7 @@ self: { libraryHaskellDepends = [ base timeless ]; executableHaskellDepends = [ base ]; description = "Initial project template from stack"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "timelike" = callPackage @@ -256977,7 +257793,7 @@ self: { sha256 = "0gxpagh4pp0wfraryxvij52gm7b42alsgg8l34xsf6p06cxh8h5d"; libraryHaskellDepends = [ base transformers ]; description = "Type classes for types representing time"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "timelike-clock" = callPackage @@ -256988,7 +257804,7 @@ self: { sha256 = "1bnwp4bzn58pmdcwnrarafvh8m28ahwsgl6lysrnyv7k2krb7qny"; libraryHaskellDepends = [ base clock timelike transformers ]; description = "Timelike interface for the clock library"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "timelike-time" = callPackage @@ -256999,7 +257815,7 @@ self: { sha256 = "07a853ggcbzggcm5sg943mgb7b2qy1dzmh2ghmix9iiyc5pm6jxy"; libraryHaskellDepends = [ base time timelike transformers ]; description = "Timelike interface for the time library"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "timemap" = callPackage @@ -257024,8 +257840,8 @@ self: { base containers criterion focus hashable list-t stm stm-containers time unordered-containers ]; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -257042,8 +257858,8 @@ self: { base exceptions mtl QuickCheck tasty tasty-quickcheck time ]; description = "Generalized sleep and timeout functions"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -257059,7 +257875,7 @@ self: { base ghc-prim lifted-base monad-control mtl transformers-base ]; description = "Updatable timeouts as a Monad transformer"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "timeout-with-results" = callPackage @@ -257071,7 +257887,7 @@ self: { libraryHaskellDepends = [ base deepseq mtl parallel ]; description = "Runs a time-limited computation alowing it to return intermediate results"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -257087,8 +257903,8 @@ self: { attoparsec base bytestring containers convertible mtl time ]; description = "Attoparsec parsers for various Date/Time formats"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -257109,7 +257925,7 @@ self: { time transformers vcs-revision ]; description = "A tool for visualizing time series from log files"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "timeprint" = callPackage @@ -257120,8 +257936,8 @@ self: { sha256 = "1anb14bih8728jsygx86fq077fs0gmy4gnkaa489zy5gh468a4bg"; libraryHaskellDepends = [ base datetime ]; description = "Prints timestamps after each line evaluated"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -257134,7 +257950,7 @@ self: { libraryHaskellDepends = [ atomic-primops base psqueues vector ]; testHaskellDepends = [ base ]; description = "A timer wheel"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "timerep" = callPackage @@ -257152,7 +257968,7 @@ self: { base QuickCheck tasty tasty-hunit tasty-quickcheck text time ]; description = "Parse and display time according to some RFCs (RFC3339, RFC2822, RFC822)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "timers" = callPackage @@ -257167,7 +257983,7 @@ self: { base lifted-base monad-control suspend transformers-base ]; description = "Simple package that implements timers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "timers-tick" = callPackage @@ -257179,7 +257995,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "tick based timers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "timers-updatable" = callPackage @@ -257190,7 +258006,7 @@ self: { sha256 = "1naw59xvbfhgz49qhvgzng4xjf4fzi59gl996pcp5l6s2sbpx4mw"; libraryHaskellDepends = [ base stm ]; description = "timers which are updatable in the remaining time"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "timeseries" = callPackage @@ -257209,8 +258025,8 @@ self: { text-time time vector ]; description = "Library for Time Series processing"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -257222,7 +258038,7 @@ self: { sha256 = "1gzrdwysyk3lj5pr53w63c8mk0i22rip4v2jp4h38f85lanzwb2b"; libraryHaskellDepends = [ base time ]; description = "Useful timespan datatype and functions"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "timestamp" = callPackage @@ -257237,7 +258053,7 @@ self: { base cereal foldl generic-random hashable QuickCheck time ]; description = "Space-efficient Unix timestamp and utilities"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "timestamp-subprocess-lines" = callPackage @@ -257254,7 +258070,7 @@ self: { base bytestring process split time transformers ]; description = "Run a command and timestamp its stdout/stderr lines"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "timestamper" = callPackage @@ -257267,7 +258083,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base old-locale time ]; description = "Read standard input and prepend each line with a timestamp"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "timeutils" = callPackage @@ -257282,8 +258098,8 @@ self: { executableHaskellDepends = [ base brick microlens time vty ]; testHaskellDepends = [ base hspec microlens time ]; description = "Time utilities"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -257303,8 +258119,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Haskell bindings for the zone-detect C library; plus tz-aware utils"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -257320,7 +258136,7 @@ self: { base binary bytestring extensible-exceptions time timezone-series ]; description = "A pure Haskell parser and renderer for binary Olson timezone files"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "timezone-olson-th" = callPackage @@ -257335,8 +258151,8 @@ self: { base template-haskell time timezone-olson timezone-series ]; description = "Load TimeZoneSeries from an Olson file at compile time"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -257348,7 +258164,7 @@ self: { sha256 = "1blwgnyzqn917rgqkl4dncv9whv3xmk0lav040qq0214vksmvlz5"; libraryHaskellDepends = [ base deepseq time ]; description = "Enhanced timezone handling for Data.Time"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "timezone-unix" = callPackage @@ -257368,8 +258184,8 @@ self: { base directory leapseconds tasty tasty-golden tasty-hunit time timezone-series ]; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -257381,7 +258197,7 @@ self: { sha256 = "078p6gzzb7f9g68lm3q5806azhrs6li35ras9jnb9gs2r6i0w83j"; libraryHaskellDepends = [ base time ]; description = "Convenient functions for getting times"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tini" = callPackage @@ -257393,8 +258209,8 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck ]; description = "Tiny INI file and configuration library with a minimal dependency footprint"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -257420,8 +258236,8 @@ self: { executableToolDepends = [ require ]; testHaskellDepends = [ base require ]; description = "A softer alternative to Haddock"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -257433,8 +258249,8 @@ self: { sha256 = "04bcz2ifkrw0f6razvzpycvzdbarv1ain800l4rapqyqzykgzxjw"; libraryHaskellDepends = [ async base time ]; description = "tiny no-brainer job scheduler"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -257450,8 +258266,8 @@ self: { attoparsec base bytestring hex serialport unix ]; description = "TinyMesh - communicating with auto-meshing sensor network"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -257476,8 +258292,8 @@ self: { vector ]; description = "A fast DOM parser for a subset of XML"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -257490,7 +258306,7 @@ self: { libraryHaskellDepends = [ base text ]; libraryToolDepends = [ c2hs ]; description = "Wrapper around the 'tiny file dialogs' C library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tinylog" = callPackage @@ -257507,7 +258323,7 @@ self: { ]; benchmarkHaskellDepends = [ base bytestring criterion ]; description = "Simplistic logging using fast-logger"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "tinytemplate" = callPackage @@ -257519,8 +258335,8 @@ self: { libraryHaskellDepends = [ base text ]; testHaskellDepends = [ base QuickCheck text ]; description = "A tiny text templating library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -257545,8 +258361,8 @@ self: { base optparse-applicative pretty pretty-show tip-lib ]; description = "Convert from Haskell to Tip"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -257570,8 +258386,8 @@ self: { base filepath optparse-applicative pretty ]; description = "tons of inductive problems - support library and tools"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -257588,7 +258404,7 @@ self: { ]; testHaskellDepends = [ aeson base hspec vector ]; description = "Navigating and editing JSON data"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "titan" = callPackage @@ -257616,8 +258432,8 @@ self: { keera-hails-reactivevalues mtl network network-bsd template-haskell ]; description = "Testing Infrastructure for Temporal AbstractioNs - GUI to debug temporal programs"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -257635,8 +258451,8 @@ self: { base IfElse network network-bsd stm transformers Yampa ]; description = "Testing Infrastructure for Temporal AbstractioNs - Interactive Yampa debugging layer"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -257648,8 +258464,8 @@ self: { sha256 = "0h7d4152nd8mx4slyjss4kf7n1xn99vc5hnk072apqfv301vpbx3"; libraryHaskellDepends = [ base Yampa ]; description = "Testing Infrastructure for Temporal AbstractioNs - Yampa record-and-replay layer"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -257665,8 +258481,8 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; description = "Convert English Words to Title Case"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ peti ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ peti ]; }) {}; "tkhs" = callPackage @@ -257684,8 +258500,8 @@ self: { ]; testHaskellDepends = [ HUnit test-framework test-framework-hunit ]; description = "Simple Presentation Utility"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -257712,8 +258528,8 @@ self: { web-routes yesod yesod-core yesod-form yesod-static ]; description = "A web-based visualizer for GHC Profiling Reports"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -257726,7 +258542,7 @@ self: { libraryHaskellDepends = [ base containers network-uri text ]; testHaskellDepends = [ base HUnit network-uri text ]; description = "This project separates subdomains, domains, and top-level-domains from URLs"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "tldr" = callPackage @@ -257747,7 +258563,7 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-golden ]; description = "Haskell tldr client"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tlex" = callPackage @@ -257756,8 +258572,8 @@ self: { }: mkDerivation { pname = "tlex"; - version = "0.1.0.0"; - sha256 = "1qcn9m3zj33scvydshaqlnag5cw49vr2p7dh6z1fssbn061ik4iv"; + version = "0.2.0.0"; + sha256 = "0ad2zxlwrkpz2lgqp9lyj4aaq0nicj8vxfys0hn63cv23arwr0cc"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base containers tlex-core ]; testHaskellDepends = [ @@ -257775,8 +258591,8 @@ self: { }: mkDerivation { pname = "tlex-core"; - version = "0.1.0.0"; - sha256 = "009xld55rrch7r1ld9s8l3syahqnfphazl211gsaahck9f9ii3bh"; + version = "0.2.1.0"; + sha256 = "1qjzxsz7rl1fmfp1yzc2cdxjwz9nwjrxz6d18023cz41v1jympzq"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ array base containers hashable transformers unordered-containers @@ -257797,8 +258613,8 @@ self: { }: mkDerivation { pname = "tlex-debug"; - version = "0.1.0.0"; - sha256 = "1jxflcmgkqh24ybhpbzhxvmqywh6197xzi24ma074zzfyzf07jgx"; + version = "0.2.0.0"; + sha256 = "0qj1wcdg9spf7vfwmpkqp5z74qzh9xkb4m6gv0v015krr8qvwc01"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base containers tlex tlex-core unordered-containers @@ -257818,8 +258634,8 @@ self: { }: mkDerivation { pname = "tlex-encoding"; - version = "0.1.0.0"; - sha256 = "1m5sp3paklybg94r2g5wyzgnqdzxs3a4gn7lknj1a3wdwhz9cc17"; + version = "0.2.0.0"; + sha256 = "0krisx0fh85dccgcw6y1b3b1q2brwqz75hqg6r7w39rn0w7b5xm7"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base charset containers tlex tlex-core ]; testHaskellDepends = [ @@ -257837,8 +258653,8 @@ self: { }: mkDerivation { pname = "tlex-th"; - version = "0.1.0.0"; - sha256 = "0iy6xnp9nm17jcjkgnlyc3pdiwlkgxzqhi4pgv4a29kmvvy5izcz"; + version = "0.2.0.1"; + sha256 = "19hlj81rxnki90imiz4zjklfl4ffbpkkd9iycq4wbj92i9vw4n8v"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ array base containers ghc-prim template-haskell tlex tlex-core @@ -257876,7 +258692,7 @@ self: { gauge hourglass QuickCheck tasty-quickcheck x509 x509-validation ]; description = "TLS/SSL protocol native implementation (Server and Client)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tls-debug" = callPackage @@ -257895,7 +258711,7 @@ self: { tls-session-manager x509 x509-store x509-system x509-validation ]; description = "Set of programs for TLS testing and debugging"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tls-extra" = callPackage @@ -257914,8 +258730,8 @@ self: { crypto-random cryptohash mtl network pem time tls vector ]; description = "TLS extra default values and helpers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -257931,7 +258747,7 @@ self: { auto-update base basement bytestring clock memory psqueues tls ]; description = "In-memory TLS session manager"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tlynx" = callPackage @@ -257953,8 +258769,8 @@ self: { ]; executableHaskellDepends = [ base ]; description = "Handle phylogenetic trees"; - license = stdenv.lib.licenses.gpl3Plus; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -257970,7 +258786,7 @@ self: { base containers hashable stm unordered-containers ]; description = "An insert-ordered multimap (indexed FIFO) which consumes values as you lookup"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tmapmvar" = callPackage @@ -257990,7 +258806,7 @@ self: { tasty tasty-quickcheck unordered-containers ]; description = "A single-entity stateful Map in STM, similar to tmapchan"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tmp-postgres" = callPackage @@ -258025,8 +258841,8 @@ self: { base criterion deepseq postgres-options postgresql-simple temporary ]; description = "Start and stop a temporary postgres"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -258042,7 +258858,7 @@ self: { base bytestring directory template text ]; description = "simple executable for templating"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "tn" = callPackage @@ -258064,8 +258880,8 @@ self: { base bytestring file-embed optparse-applicative optparse-helper ]; description = "A simple daily journal program"; - license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -258078,7 +258894,7 @@ self: { libraryHaskellDepends = [ attoparsec base bytestring utf8-string ]; description = "Library for encoding/decoding TNET strings for PGI"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "to" = callPackage @@ -258097,7 +258913,7 @@ self: { base containers gauge text unordered-containers ]; description = "Simple, safe, boring type conversions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "to-haskell" = callPackage @@ -258111,8 +258927,8 @@ self: { base containers haskell-src-exts transformers ]; description = "A type class and some utilities for generating Haskell code"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -258126,8 +258942,8 @@ self: { editedCabalFile = "1p5q59gswv86pk7hxpg1n81q4szhwx8rwfx5hsibdz9i9mgz2bbs"; libraryHaskellDepends = [ base ]; description = "Converting string-like types to Strings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -258139,8 +258955,8 @@ self: { sha256 = "1h5aq3shagzgh1j8sbslvi2rrkqv1djm595d522ci8hpj6h8vxl9"; libraryHaskellDepends = [ bytestring pretty text to-string-class ]; description = "Instances for the ToString class"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -258159,8 +258975,8 @@ self: { ]; executableHaskellDepends = [ base ]; description = "Twitter bot generator"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -258172,8 +258988,8 @@ self: { sha256 = "1gh2jdrxph0x9cc03kk8xxjyicivwcqfs9qv2nfr7mn570cmjrmw"; libraryHaskellDepends = [ base ]; description = "A todo bottom"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -258199,8 +259015,8 @@ self: { utf8-string ]; description = "Easy-to-use TODOs manager"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -258219,8 +259035,8 @@ self: { array base bytestring containers filepath hexpat hexpat-pickle ]; description = "Reading and writing Haskell data from and to XML"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -258239,7 +259055,7 @@ self: { ]; description = "Manage the toilet queue at the IMO"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -258254,7 +259070,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base time ]; description = "Rate limiter using lazy bucket algorithm"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "token-limiter" = callPackage @@ -258275,8 +259091,8 @@ self: { async base clock QuickCheck tasty tasty-hunit text ]; description = "Fast rate limiting using the token bucket algorithm (BSD)"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -258302,8 +259118,8 @@ self: { base bytestring conduit hashable hspec process streaming-commons text unordered-containers ]; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -258315,8 +259131,8 @@ self: { sha256 = "1fyf1ym91dbhiw7hybzhllc375v4pizl058qazfdyw6cymqm4rch"; libraryHaskellDepends = [ base containers text ]; description = "A regex lexer"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -258333,7 +259149,7 @@ self: { base bytestring criterion deepseq filepath split text ]; description = "Simple tokenizer for English text"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tokenizer-monad" = callPackage @@ -258344,7 +259160,7 @@ self: { sha256 = "0n8w923m8c803zcphims51q2xm6a0374zzh00d62mg92zbdsh9vn"; libraryHaskellDepends = [ base bytestring text ]; description = "An efficient and easy-to-use tokenizer monad"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "tokenizer-streaming" = callPackage @@ -258360,8 +259176,8 @@ self: { streaming-commons text tokenizer-monad ]; description = "A variant of tokenizer-monad that supports streaming"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -258386,8 +259202,8 @@ self: { ]; testHaskellDepends = [ base hspec ]; description = "TokTok C code style checker"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -258403,7 +259219,7 @@ self: { libraryHaskellDepends = [ base containers haskell98 ]; executableHaskellDepends = [ base bytestring gf iconv ]; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -258422,8 +259238,8 @@ self: { testHaskellDepends = [ base bytestring directory HUnit mtl ]; testSystemDepends = [ tokyocabinet ]; description = "Haskell binding of Tokyo Cabinet"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) tokyocabinet;}; @@ -258437,9 +259253,9 @@ self: { libraryHaskellDepends = [ base bytestring mtl ]; librarySystemDepends = [ tokyocabinet tokyotyrant ]; description = "FFI bindings to libtokyotyrant"; - license = stdenv.lib.licenses.bsd3; - platforms = [ "i686-linux" "x86_64-linux" ]; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ]; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) tokyocabinet; inherit (pkgs) tokyotyrant;}; @@ -258451,8 +259267,8 @@ self: { sha256 = "0xffc0xjkg1jqdq7s5x0y4gi13s9yhpcwb5zvrcbmv194bp65xx1"; libraryHaskellDepends = [ base OpenAL stm vector ]; description = "Easy to use library for audio programming"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -258469,8 +259285,8 @@ self: { libraryHaskellDepends = [ attoparsec base bytestring containers old-locale time ]; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -258485,7 +259301,7 @@ self: { libraryHaskellDepends = [ array base text time ]; libraryToolDepends = [ alex happy ]; description = "Parser for the TOML configuration language"; - license = stdenv.lib.licenses.isc; + license = lib.licenses.isc; }) {}; "tomland" = callPackage @@ -258516,7 +259332,7 @@ self: { unordered-containers ]; description = "Bidirectional TOML serialization"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "tomlcheck" = callPackage @@ -258533,7 +259349,7 @@ self: { base htoml-megaparsec megaparsec optparse-applicative text ]; description = "Command-line tool to check syntax of TOML files"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tonalude" = callPackage @@ -258545,7 +259361,7 @@ self: { libraryHaskellDepends = [ base bytestring rio unliftio ]; testHaskellDepends = [ base bytestring doctest Glob rio unliftio ]; description = "A standard library for Tonatona framework"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "tonaparser" = callPackage @@ -258559,7 +259375,7 @@ self: { libraryHaskellDepends = [ base envy rio say ]; testHaskellDepends = [ base doctest envy Glob rio say tonatona ]; description = "Scalable way to pass runtime configurations for tonatona"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "tonatona" = callPackage @@ -258571,7 +259387,7 @@ self: { libraryHaskellDepends = [ base rio tonaparser ]; testHaskellDepends = [ base doctest Glob rio tonaparser ]; description = "meta application framework"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "tonatona-google-server-api" = callPackage @@ -258593,8 +259409,8 @@ self: { tonatona ]; description = "tonatona plugin for google-server-api"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -258607,7 +259423,7 @@ self: { libraryHaskellDepends = [ base rio tonaparser tonatona ]; testHaskellDepends = [ base doctest Glob rio tonaparser tonatona ]; description = "tonatona plugin for logging"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "tonatona-persistent-postgresql" = callPackage @@ -258627,8 +259443,8 @@ self: { resource-pool rio tonaparser tonatona ]; description = "tonatona plugin for accessing PostgreSQL database"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -258649,8 +259465,8 @@ self: { resource-pool rio tonaparser tonatona ]; description = "tonatona plugin for accessing Sqlite database"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -258674,8 +259490,8 @@ self: { wai-extra warp ]; description = "tonatona plugin for servant"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -258720,8 +259536,8 @@ self: { vector ]; description = "Cluster single cells and analyze cell clade relationships"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -258757,8 +259573,8 @@ self: { text time wai warp yaml ]; description = "Manage the TODO entries in your code"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -258800,8 +259616,8 @@ self: { base directory doctest filemanip tasty tasty-hunit zm ]; description = "Top (typed oriented protocol) API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -258821,7 +259637,7 @@ self: { ]; description = "OpenGL Arcade Game"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -258837,7 +259653,7 @@ self: { base base-compat base-orphans containers vector ]; description = "Directed acyclic graphs"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "torch" = callPackage @@ -258848,8 +259664,8 @@ self: { sha256 = "1bai1vxd2vfxl9zn37dvrb05yh4knr5gw5syqpi6lxxd3lf0ngzc"; libraryHaskellDepends = [ base mtl parallel QuickCheck ]; description = "Simple unit test library (or framework)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -258865,7 +259681,7 @@ self: { base bencode binary bytestring containers filepath syb ]; description = "BitTorrent file parser and generater"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "torsor" = callPackage @@ -258876,7 +259692,7 @@ self: { sha256 = "173dn2n24xdlyymw5hqd6qd1r6h65bqrhpkcl49kccxr10xgb8vm"; libraryHaskellDepends = [ base ]; description = "Torsor Typeclass"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tostring" = callPackage @@ -258887,7 +259703,7 @@ self: { sha256 = "0c95a1vjnnn3bwdz8v5hv7q2sbzn23ban3hcwqmwhmzc9ba019zg"; libraryHaskellDepends = [ base case-insensitive text utf8-string ]; description = "The ToString class"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "total" = callPackage @@ -258898,7 +259714,7 @@ self: { sha256 = "0zr3b83pwjbarxsl9kva6va3cp9b4npfp77yp0nh9q1za00344vk"; libraryHaskellDepends = [ base void ]; description = "Exhaustive pattern matching using lenses, traversals, and prisms"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "total-alternative" = callPackage @@ -258909,7 +259725,7 @@ self: { sha256 = "1krm6jymnrr6iiys16rwar60avnaxpbn583szarnd4lqjhk0g5cq"; libraryHaskellDepends = [ base ]; description = "Alternative interface for total versions of partial function on the Prelude"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "total-map" = callPackage @@ -258920,8 +259736,8 @@ self: { sha256 = "015bj6g4hjp38fc8bm5z57w6akdgvyab6j2sc666x0qdxgrdwp88"; libraryHaskellDepends = [ base containers semiring-num ]; description = "Finitely represented total maps"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -258938,7 +259754,7 @@ self: { linear reflection semigroups vector ]; description = "Dense and sparse total maps"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "touched" = callPackage @@ -258952,8 +259768,8 @@ self: { libraryHaskellDepends = [ base directory process time ]; executableHaskellDepends = [ base cmdargs ]; description = "Library (and cli) to execute a procedure on file change"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -258971,7 +259787,7 @@ self: { tasty-quickcheck tasty-smallcheck ]; description = "A numeric tower"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "toxcore" = callPackage @@ -259000,8 +259816,8 @@ self: { saltine text ]; description = "A Tox protocol implementation in Haskell"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -259027,8 +259843,8 @@ self: { data-default-class hspec QuickCheck saltine ]; description = "Haskell bindings to the C reference implementation of Tox"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {toxcore = null;}; @@ -259048,8 +259864,8 @@ self: { silently time ]; description = "Client library for Toxiproxy: a TCP failure testing proxy"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -259106,8 +259922,8 @@ self: { array base criterion data-default-class vector ]; description = "Assorted decision procedures for SAT, SMT, Max-SAT, PB, MIP, etc"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -259144,8 +259960,8 @@ self: { pipes-safe process stm transformers trifecta ]; description = "simple, parallel job scheduling"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -259171,8 +259987,8 @@ self: { wai warp websockets wuss ]; description = "Applications for interacting with the Pushbullet API"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -259204,8 +260020,8 @@ self: { }: mkDerivation { pname = "tptp"; - version = "0.1.2.0"; - sha256 = "0ccffd1pskfybyysaa1ilbsbgw0vga4x0q0awmj2wy05gbbzfb1y"; + version = "0.1.3.0"; + sha256 = "1blz39ksyf6svcrr55v5mn537qa42aymmfj76154wla328ll6nr4"; libraryHaskellDepends = [ attoparsec base prettyprinter scientific text ]; @@ -259214,8 +260030,8 @@ self: { prettyprinter QuickCheck scientific text ]; description = "Parser and pretty printer for the TPTP language"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -259232,8 +260048,8 @@ self: { transformers-base ]; description = "A monad transformer for tracing provenience of errors"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -259245,8 +260061,8 @@ self: { sha256 = "1fiz1v9d4ck8na68cywha53vgbgdk6iqad1zv6pj3lq0pwvkx6aw"; libraryHaskellDepends = [ base containers mtl ]; description = "functions for logging the arguments and results of function calls"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -259258,8 +260074,8 @@ self: { sha256 = "0c5nsq9x59rmdkyvcrr1v94kjya48nhl9pnsad6xdmh77msf33xy"; libraryHaskellDepends = [ base ]; description = "Easy lightweight tracing of function arguments and results for ad hoc debugging"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -259271,8 +260087,8 @@ self: { sha256 = "1pniabsbybhjvlq4dmys8sxc1r8rhalsahdr3hbvif287h610hi9"; libraryHaskellDepends = [ base containers mtl pretty ]; description = "Simple evaluation trace"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -259285,7 +260101,7 @@ self: { libraryHaskellDepends = [ base mtl transformers ]; testHaskellDepends = [ base mtl transformers ]; description = "Tracing utilities for Functor/Applicative/Monad types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tracetree" = callPackage @@ -259302,8 +260118,8 @@ self: { base bifunctors containers json mtl transformers ]; description = "Visualize Haskell data structures as edge-labeled trees"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -259324,7 +260140,7 @@ self: { base containers hspec mtl stm text unliftio ]; description = "Distributed tracing"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tracing-control" = callPackage @@ -259347,7 +260163,7 @@ self: { text ]; description = "Distributed tracing"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tracked-files" = callPackage @@ -259362,8 +260178,8 @@ self: { executableHaskellDepends = [ base directory process text ]; testHaskellDepends = [ base directory hspec process ]; description = "Package to list all tracked and untracked existing files via Git"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -259376,7 +260192,7 @@ self: { libraryHaskellDepends = [ base containers glib ]; description = "Client library for Tracker metadata database, indexer and search tool"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -259395,8 +260211,8 @@ self: { text time vty ]; description = "A command-line tool for live monitoring"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -259418,8 +260234,8 @@ self: { base hedgehog mmorph postgresql-simple resource-pool text ]; description = "Tools for postgresql-simple"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -259431,8 +260247,8 @@ self: { sha256 = "03s31yfhnv9h1h51810vx8dsfs8r09bqigr9hs3kgb3107vyny77"; libraryHaskellDepends = [ base ]; description = "Convenience wrappers for non-intrusive debug tracing"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -259465,7 +260281,7 @@ self: { megaparsec mtl pretty-show tasty tasty-hedgehog tasty-hunit text time transformers unordered-containers ]; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) gmp; inherit (pkgs) mpfr;}; "traildb" = callPackage @@ -259488,8 +260304,8 @@ self: { base bytestring cereal criterion deepseq directory random ]; description = "TrailDB bindings for Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {Judy = null; traildb = null;}; @@ -259512,8 +260328,8 @@ self: { http-types regexpr text unordered-containers uri ]; description = "Tools and a library for working with Trajectory"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -259525,7 +260341,7 @@ self: { sha256 = "0hkwl1dygghym6w5qci53ylkhk298bzddfvahisr2gw5wibknrfs"; libraryHaskellDepends = [ base ]; description = "Monadic effect framework"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "trans-fx-data" = callPackage @@ -259536,7 +260352,7 @@ self: { sha256 = "0y4hnn1ixgsqd9x829cxyn0n2psxpjczxxaa99jv9wrfwfvssgid"; libraryHaskellDepends = [ base trans-fx-core ]; description = "Monadic effect framework"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "trans-fx-io" = callPackage @@ -259548,7 +260364,7 @@ self: { libraryHaskellDepends = [ base time trans-fx-core trans-fx-data ]; testHaskellDepends = [ base time trans-fx-core ]; description = "Monadic effect framework"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "transaction" = callPackage @@ -259564,7 +260380,7 @@ self: { base doctest Glob hspec mono-traversable QuickCheck ]; description = "Monadic representation of transactions"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "transactional-events" = callPackage @@ -259577,8 +260393,8 @@ self: { editedCabalFile = "10sdjrzyld7wpzw687vrs91vk98pf3zk1cv9hj11jqnbnlbfbqcs"; libraryHaskellDepends = [ base ListZipper MonadPrompt stm ]; description = "Transactional events, based on Concurrent ML semantics"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -259597,8 +260413,8 @@ self: { mtl process semigroups ]; description = "Text transformer and interpreter"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -259627,8 +260443,8 @@ self: { base bytestring cpu hspec QuickCheck sqlcli store time transformers ]; description = "ODBC database transfer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -259649,8 +260465,8 @@ self: { base containers criterion mtl multirec parsec QuickCheck ]; description = "Generic representation of tree transformations"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -259662,8 +260478,8 @@ self: { sha256 = "0v66j5k0xqk51pmca55wq192qyw2p43s2mgxlz4f95q2c1fpjs5n"; libraryHaskellDepends = [ base ]; description = "Concrete functor and monad transformers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "transformers-abort" = callPackage @@ -259679,7 +260495,7 @@ self: { transformers-base ]; description = "Error and short-circuit monad transformers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "transformers-base" = callPackage @@ -259694,7 +260510,7 @@ self: { base base-orphans stm transformers transformers-compat ]; description = "Lift computations from the bottom of a transformer stack"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "transformers-bifunctors" = callPackage @@ -259707,7 +260523,7 @@ self: { editedCabalFile = "1vjyk2ldwfi2pkvk79p37ii5xgg1399kxqhkq3l4wvag4j5p4afs"; libraryHaskellDepends = [ base mmorph transformers ]; description = "Bifunctors over monad transformers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "transformers-compat" = callPackage @@ -259718,7 +260534,7 @@ self: { sha256 = "1yd936az31g9995frc84g05rrb5b7w59ajssc5183lp6wm8h4bky"; libraryHaskellDepends = [ base ghc-prim transformers ]; description = "A small compatibility shim for the transformers library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "transformers-compose" = callPackage @@ -259729,8 +260545,8 @@ self: { sha256 = "0kvhl5s1js6i639hc6c4ib9jmgy4l1503ifs30a9ajrk97nagp6d"; libraryHaskellDepends = [ base transformers ]; description = "Arrow-like / category-like composition for transformers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -259742,7 +260558,7 @@ self: { sha256 = "0h0qbhk7b4wm3h06m26ga3i6rqw60fjs469iq6p3j6pdvq58bb5x"; libraryHaskellDepends = [ base transformers ]; description = "Control flow data type and monad transformer"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "transformers-convert" = callPackage @@ -259760,8 +260576,8 @@ self: { HUnit QuickCheck text transformers unix ]; description = "Sensible conversions between some of the monad transformers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -259780,8 +260596,8 @@ self: { base criterion effect-interpreters mtl pipes transformers ]; description = "An approach to managing composable effects, ala mtl/transformers/extensible-effects/Eff"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {effect-interpreters = null;}; @@ -259793,7 +260609,7 @@ self: { sha256 = "1hjkiz3dhk4dp8a4lgpyns4nd867lg7ydq4r4zf57w4i6ys7j4l7"; libraryHaskellDepends = [ base exceptions text transformers ]; description = "An Either monad transformer"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "transformers-except" = callPackage @@ -259804,7 +260620,7 @@ self: { sha256 = "1i89k4bml223f7m3pin73vrz51xb2j7q7rr39x9v587hmm40mvkm"; libraryHaskellDepends = [ base exceptions text transformers ]; description = "An Except monad transformer with"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "transformers-fix" = callPackage @@ -259817,7 +260633,7 @@ self: { editedCabalFile = "126gyjr8jp42md6nblx7c0kan97jgsakvsf2vzv2pj828ax1icrs"; libraryHaskellDepends = [ base transformers ]; description = "Monad transformer for evaluating to a fixpoint"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "transformers-free" = callPackage @@ -259830,7 +260646,7 @@ self: { editedCabalFile = "1zkizjg2pincjf9kj254153bsrivywk141wz9wlnl0i56wl9cy7i"; libraryHaskellDepends = [ base transformers ]; description = "Free monad transformers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "transformers-lift" = callPackage @@ -259843,8 +260659,8 @@ self: { base transformers writer-cps-transformers ]; description = "Ad-hoc type classes for lifting"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -259856,8 +260672,8 @@ self: { sha256 = "0m1vvdfi661mmxm5rghsfnwcjd2r0r7ryc3jk0nwlzs0kaw5xi1s"; libraryHaskellDepends = [ base transformers ]; description = "A unified interface for the run operation of monad transformers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -259869,7 +260685,7 @@ self: { sha256 = "09f9n3cxi3sjmd8yscvcyahvdsqa5db5bckj9ryaflswsdm0ximq"; libraryHaskellDepends = [ base mtl transformers ]; description = "Supply applicative, monad, applicative transformer and monad transformer"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "transient" = callPackage @@ -259889,7 +260705,7 @@ self: { transformers ]; description = "composing programs with multithreading, events and distributed computing"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "transient-universe" = callPackage @@ -259924,8 +260740,8 @@ self: { transformers transient vector websockets ]; description = "fully composable remote execution for the creation of distributed systems"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -259942,8 +260758,8 @@ self: { transient-universe x509-store x509-system ]; description = "transient with secure communications"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -259957,8 +260773,8 @@ self: { isExecutable = true; libraryHaskellDepends = [ base fingertree ]; description = "Integer sets with a constant time translate operation"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -259971,8 +260787,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base curl json network utf8-string ]; description = "Haskell binding to Google's AJAX Language API for Translation and Detection"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -259990,8 +260806,8 @@ self: { executableHaskellDepends = [ base text turtle ]; testHaskellDepends = [ base HUnit ]; description = "Translation cli tool"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -260010,8 +260826,8 @@ self: { ]; testHaskellDepends = [ base doctest ]; description = "Type Safe Web Routing"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -260028,8 +260844,8 @@ self: { http-media http-types text trasa ]; description = "Type safe http requests"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -260047,8 +260863,8 @@ self: { mtl path-pieces quantification text trasa trasa-server ]; description = "Extra functions for trasa"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -260067,8 +260883,8 @@ self: { unordered-containers ]; description = "generate forms using lucid, ditto and trasa"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -260085,8 +260901,8 @@ self: { reflex reflex-dom text trasa ]; description = "Reactive Type Safe Routing"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "trasa-server" = callPackage @@ -260102,8 +260918,8 @@ self: { mtl text trasa wai ]; description = "Type safe web server"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -260120,8 +260936,8 @@ self: { ]; testHaskellDepends = [ base trasa ]; description = "Template Haskell to generate trasa routes"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -260137,8 +260953,8 @@ self: { testHaskellDepends = [ base template-haskell util ]; benchmarkHaskellDepends = [ base gauge template-haskell util ]; description = "See README for more info"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -260153,7 +260969,7 @@ self: { libraryHaskellDepends = [ base template-haskell transformers ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Generic applicative traversals"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "travis" = callPackage @@ -260170,8 +260986,8 @@ self: { aeson base bytestring http-conduit transformers ]; description = "A simple client implementation using Travis CI API"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -260201,8 +261017,8 @@ self: { yaml ]; description = ".travis.yml preprocessor"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -260217,7 +261033,7 @@ self: { libraryHaskellDepends = [ base optparse-applicative process ]; executableHaskellDepends = [ base ]; description = "A better travis_wait"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "trawl" = callPackage @@ -260235,8 +261051,8 @@ self: { split ]; description = "A tool for finding haddocks"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -260251,8 +261067,8 @@ self: { enableSeparateDataOutput = true; executableHaskellDepends = [ base gtk process ]; description = "Tray Icon application to PowerOff / Reboot computer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -260267,8 +261083,8 @@ self: { libraryHaskellDepends = [ base deepseq mersenne-random-pure64 ]; testHaskellDepends = [ base doctest Glob hspec hspec-core ]; description = "Efficient implementation of the implicit treap data structure"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -260296,7 +261112,7 @@ self: { tagged tasty tasty-golden tasty-quickcheck trifecta ]; description = "Diffing of (expression) trees"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; }) {}; "tree-fun" = callPackage @@ -260307,7 +261123,7 @@ self: { sha256 = "07vgsps4kjld75ndnjjaigsk5vvg11vjp740pznhsw79k3qjbs9a"; libraryHaskellDepends = [ base containers mtl ]; description = "Library for functions pertaining to tree exploration and manipulation"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "tree-monad" = callPackage @@ -260318,7 +261134,7 @@ self: { sha256 = "0ny57rygkgwn8i733gz2zb12i5niq5q7lrqvzfwsnjd0b40yighf"; libraryHaskellDepends = [ base ]; description = "Non-Determinism Monad for Tree Search"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tree-render-text" = callPackage @@ -260329,8 +261145,8 @@ self: { sha256 = "04mmmj443aa8lkdj33dsk7zf985mnzfikzg10715vn5khrll0pgq"; libraryHaskellDepends = [ base boxes containers mtl ]; description = "Configurable text rendering of trees"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -260348,7 +261164,7 @@ self: { ]; testHaskellDepends = [ base hedgehog ]; description = "Unstable bindings for the tree-sitter parsing library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tree-sitter-go" = callPackage @@ -260360,7 +261176,7 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base tree-sitter ]; description = "Tree-sitter grammar/parser for Go"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tree-sitter-haskell" = callPackage @@ -260373,7 +261189,7 @@ self: { isExecutable = true; libraryHaskellDepends = [ base tree-sitter ]; description = "Tree-sitter grammar/parser for Haskell (with GHC extensions)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tree-sitter-java" = callPackage @@ -260385,7 +261201,7 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base tree-sitter ]; description = "Tree-sitter grammar/parser for Java"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tree-sitter-json" = callPackage @@ -260397,7 +261213,7 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base tree-sitter ]; description = "Tree-sitter grammar/parser for JSON"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tree-sitter-php" = callPackage @@ -260409,7 +261225,7 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base tree-sitter ]; description = "Tree-sitter grammar/parser for PHP"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tree-sitter-python" = callPackage @@ -260421,7 +261237,7 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base tree-sitter ]; description = "Tree-sitter grammar/parser for Python"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tree-sitter-ql" = callPackage @@ -260433,7 +261249,7 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base tree-sitter ]; description = "Tree-sitter grammar/parser for QL"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tree-sitter-ruby" = callPackage @@ -260445,7 +261261,7 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base tree-sitter ]; description = "Tree-sitter grammar/parser for Ruby"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tree-sitter-rust" = callPackage @@ -260457,7 +261273,7 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base tree-sitter ]; description = "Tree-sitter grammar/parser for Rust"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tree-sitter-tsx" = callPackage @@ -260469,7 +261285,7 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base tree-sitter ]; description = "Tree-sitter grammar/parser for TSX"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tree-sitter-typescript" = callPackage @@ -260481,7 +261297,7 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base tree-sitter ]; description = "Tree-sitter grammar/parser for TypeScript"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tree-traversals" = callPackage @@ -260493,8 +261309,8 @@ self: { libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers doctest mtl ]; description = "Functions and newtype wrappers for traversing Trees"; - license = stdenv.lib.licenses.cc0; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.cc0; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -260508,7 +261324,7 @@ self: { editedCabalFile = "0f4sls511c4axp92r07yk0b4h9wvlbk5345643q4gvy1adxwdyw5"; libraryHaskellDepends = [ base containers mtl ]; description = "Render trees as foldable HTML and Unicode art"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "treefold" = callPackage @@ -260523,7 +261339,7 @@ self: { testHaskellDepends = [ base doctest hedgehog ]; benchmarkHaskellDepends = [ base containers criterion random ]; description = "Provides folds which try to combine elements in a balanced way"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "treemap" = callPackage @@ -260543,8 +261359,8 @@ self: { tasty-hunit text transformers ]; description = "A tree of Data.Map."; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -260560,8 +261376,8 @@ self: { base Cabal containers filepath ghc html parsec regex-posix ]; description = "Generates HTML for Data.Tree as TreeMap"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -260581,8 +261397,8 @@ self: { ]; doHaddock = false; description = "Treemap related commands for producing foldable TreeMap HTML"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -260594,8 +261410,8 @@ self: { sha256 = "0an35kz6hq5m7wc16d08v1i05zr8fp4v2yrf6zay2lfas1ilh3i2"; libraryHaskellDepends = [ base haste-compiler sneathlane-haste ]; description = "Structure Editing Combinators"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; }) {}; "treeseq" = callPackage @@ -260606,7 +261422,7 @@ self: { sha256 = "105gj9s8gp4xc4i7ank8m6pjc80kywl7vn53qdxfrndaljv4kark"; libraryHaskellDepends = [ base containers ]; description = "Library for a multi-way tree (rose tree), using Seq (finger tree) for forests"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "treeviz" = callPackage @@ -260619,7 +261435,7 @@ self: { isExecutable = true; libraryHaskellDepends = [ base containers mtl QuickCheck random ]; description = "Visualization of computation decomposition trees"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "trek" = callPackage @@ -260630,7 +261446,7 @@ self: { sha256 = "02rvyq11591d83rxhmb3c9bi7ahsh7lpwf2a7am2fd3625l5rq55"; libraryHaskellDepends = [ base logict mtl ]; testHaskellDepends = [ base logict mtl ]; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "trek-app" = callPackage @@ -260663,8 +261479,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "A PostgreSQL Database Migrator"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -260688,8 +261504,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "A PostgreSQL Database Migrator"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -260701,7 +261517,7 @@ self: { sha256 = "038qn30g82c2wzalhbgb6cglclld8kfmi6m1q76mr9yl9s2h6mf1"; libraryHaskellDepends = [ base lens logict mtl trek ]; testHaskellDepends = [ base lens logict mtl trek ]; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tremulous-query" = callPackage @@ -260716,8 +261532,8 @@ self: { attoparsec base bytestring containers deepseq mtl network ]; description = "Library for polling Tremulous servers"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -260728,8 +261544,8 @@ self: { version = "0.2.2"; sha256 = "11jx2jf6vi7368ys39mz0ziy6xknbi0z87926n2y16am6k2h25k3"; description = "Deprecated"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -260746,7 +261562,7 @@ self: { base dlist doctest hedgehog hspec hspec-hedgehog splitmix ]; description = "Trial Data Structure"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "trial-optparse-applicative" = callPackage @@ -260757,7 +261573,7 @@ self: { sha256 = "1h8pfznf1dp9z3r2kl2ljgmxxkfp3va9yqba00fyvw85lna2aggn"; libraryHaskellDepends = [ base optparse-applicative trial ]; description = "Trial helper functions for optparse-applicative"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "trial-tomland" = callPackage @@ -260768,7 +261584,7 @@ self: { sha256 = "12klfq5ajn4bjrws633pfdc2zhpkwvwmrm7269xfh252fjwk1x23"; libraryHaskellDepends = [ base text tomland trial ]; description = "Trial helper functions for tomland"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "triangulation" = callPackage @@ -260783,8 +261599,8 @@ self: { array base collada-types haskell98 tuple vector vector-algorithms ]; description = "triangulation of polygons"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -260804,7 +261620,7 @@ self: { base containers criterion deepseq mwc-random vector ]; description = "Simple Map-based Trie"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tries" = callPackage @@ -260833,8 +261649,8 @@ self: { unordered-containers ]; description = "Various trie implementations in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -260850,8 +261666,8 @@ self: { pname = "trifecta"; version = "2.1"; sha256 = "0fr326lzf38m20h2g4189nsyml9w3128924zbd3cd93cgfqcc9bs"; - revision = "2"; - editedCabalFile = "17b0wxwgf52xdm597x0ybq1g2yrvfihl32jpd989xsm6n7s7y21a"; + revision = "3"; + editedCabalFile = "0ag08di787zqzz70nwhsfigsvqbmbg7bkq011znq145yg750jcwl"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ ansi-terminal array base blaze-builder blaze-html blaze-markup @@ -260862,7 +261678,7 @@ self: { ]; testHaskellDepends = [ base doctest parsers QuickCheck ]; description = "A modern parser combinator library with convenient diagnostics"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "trigger" = callPackage @@ -260883,8 +261699,8 @@ self: { executableHaskellDepends = [ base protolude ]; testHaskellDepends = [ base hspec protolude ]; description = "Trigger is a cross platform file system watcher for super fast build-and-restart workflows"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -260900,8 +261716,8 @@ self: { executableHaskellDepends = [ base directory optparse-applicative ]; testHaskellDepends = [ base hspec ]; description = "A command-line tool for trimming whitespace"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -260916,7 +261732,7 @@ self: { executableHaskellDepends = [ base bio bytestring simpleargs ]; description = "Search for, annotate and trim poly-A tail"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -260932,8 +261748,8 @@ self: { base bytestring cereal filepath leveldb-haskell ]; description = "A very simple triple store"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -260953,7 +261769,7 @@ self: { tasty-quickcheck ]; description = "TripleSec is a simple, triple-paranoid, symmetric encryption library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "trivia" = callPackage @@ -260964,8 +261780,8 @@ self: { sha256 = "03xmzjqwk6492jmmbq6066ymsxb0wk0pmyf0c5f018nfps0g3i78"; libraryHaskellDepends = [ base comonad distributive ]; description = "The trivial monad and comonad"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -260977,8 +261793,8 @@ self: { sha256 = "0y0iyll7ml5qz271cqa0dc3w2j3w1d8jjaxwaf2flcidigws69z5"; libraryHaskellDepends = [ base ]; description = "Constraints that any type, resp. no type fulfills"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -260990,8 +261806,8 @@ self: { sha256 = "1in9jjfzbqws4bk83082yra2gcb5b095948qyji63ckbz3igp0k2"; libraryHaskellDepends = [ base semiring-simple ]; description = "A library for tropical mathematics"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -261016,8 +261832,8 @@ self: { ]; benchmarkHaskellDepends = [ base criterion ]; description = "A Tropical Geometry package for Haskell"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -261032,8 +261848,8 @@ self: { libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base containers template-haskell time ]; description = "Template Haskell hack to violate module abstractions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -261047,8 +261863,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base containers parseargs WAVE ]; description = "Audio file compressor-limiter"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -261071,8 +261887,8 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base hastache tasty tasty-hunit ]; description = "Haskell template code generator"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -261084,7 +261900,7 @@ self: { sha256 = "0p8z1n7y6zfx7ff349fb8d8ld08hj70yz2s9sb3wf8riv0rywzp4"; libraryHaskellDepends = [ base ]; description = "Typeclass for truthfulness of values"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "tsession" = callPackage @@ -261097,8 +261913,8 @@ self: { editedCabalFile = "0msyf0rkd6aj8y632ippnrz554r6r5l7j45dnlnqlf1kls29kn5g"; libraryHaskellDepends = [ base containers mtl time transformers ]; description = "A Transaction Framework for Web Applications"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -261112,8 +261928,8 @@ self: { base happstack-server transformers tsession ]; description = "A Transaction Framework for Happstack"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -261126,7 +261942,7 @@ self: { libraryHaskellDepends = [ base containers stm ]; testHaskellDepends = [ async base stm ]; description = "Hides duplicating channels when broadcasting"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tskiplist" = callPackage @@ -261158,7 +261974,7 @@ self: { ]; description = "-"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "tslogger" = callPackage @@ -261172,7 +261988,7 @@ self: { async base bytestring containers random text ]; description = "Thread-safe logging, with additional interleaving fuzz-testing"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tsne" = callPackage @@ -261204,8 +262020,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base gloss stm vector ]; description = "Real time TSP tour visualization"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -261223,8 +262039,8 @@ self: { base Decimal parsec pretty process split time ]; description = "Parses U.S. federal Thrift Savings Plan PDF quarterly statements"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -261236,7 +262052,7 @@ self: { sha256 = "1vr1l4pm02pwr8238qd9j0drkildns8m79qyq0lbzll30gc12vhx"; libraryHaskellDepends = [ base ]; description = "BK-tree implementation"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "tsuntsun" = callPackage @@ -261256,8 +262072,8 @@ self: { typed-process ]; description = "Interacts with tesseract to ease reading of RAW Japanese manga"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -261272,7 +262088,7 @@ self: { libraryHaskellDepends = [ base HUnit split ]; executableHaskellDepends = [ base ]; description = "Convert tsv to csv"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tsvsql" = callPackage @@ -261290,8 +262106,8 @@ self: { string-qq text unordered-containers ]; description = "Template tsv into SQL"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -261320,8 +262136,8 @@ self: { text time transformers ]; description = "An API binding Web.Spock to Database.Beam"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -261344,8 +262160,8 @@ self: { ]; testHaskellDepends = [ base ]; description = "This is task management tool for yourself, that inspired by scrum"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -261362,7 +262178,7 @@ self: { base bytestring tasty tasty-hunit template-haskell text ]; description = "Textual Type Classes"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "ttl-hashtables" = callPackage @@ -261384,7 +262200,7 @@ self: { hspec mtl transformers ]; description = "Extends hashtables so that entries added can be expired after a TTL"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ttn" = callPackage @@ -261402,8 +262218,8 @@ self: { aeson base hspec hspec-expectations raw-strings-qq ]; description = "Things Tracker Network JSON Types"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ sorki ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ sorki ]; }) {}; "ttn-client" = callPackage @@ -261423,8 +262239,8 @@ self: { ]; executableHaskellDepends = [ base text time ttn ]; description = "TheThingsNetwork client"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -261452,7 +262268,7 @@ self: { unordered-containers vector ]; description = "Contention-free STM hash map"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "tttool" = callPackage @@ -261477,8 +262293,8 @@ self: { random split spool template-haskell text time vector yaml zlib ]; description = "Working with files for the Tiptoi® pen"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -261495,8 +262311,8 @@ self: { transformers ]; description = "Write stream processing computations with side effects in a series of tubes"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -261508,8 +262324,8 @@ self: { sha256 = "0q6g2wcjddb9r1l9fxpn2qcssw5gyfwsam15rc3q6xjqbwz7fm41"; libraryHaskellDepends = [ base bytestring unix ]; description = "Interface to TUN/TAP drivers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -261523,8 +262339,8 @@ self: { editedCabalFile = "15jav5fj1ggjczn2mh4yv5rmsfydwc17vzlah3j1z5mkyq1691i8"; libraryHaskellDepends = [ base ioctl ]; description = "A simple tun/tap library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -261539,8 +262355,8 @@ self: { libraryHaskellDepends = [ base cpphs ]; executableHaskellDepends = [ base haskell-src-exts parsec2 ]; description = "Homogeneous tuples"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -261552,7 +262368,7 @@ self: { sha256 = "094nx29aahyrvbcn7yca9zs2a5rxz1is7510w1q43rpvza7hdjrg"; libraryHaskellDepends = [ base OneTuple ]; description = "Various functions on tuples"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tuple-gen" = callPackage @@ -261563,8 +262379,8 @@ self: { sha256 = "0bgwsxq8wrh76hhbwadv0rag4c7dx3644zrh2aflnsych0rncvd7"; libraryHaskellDepends = [ base combinat ]; description = "Enum instances for tuples where the digits increase with the same speed"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -261576,7 +262392,7 @@ self: { sha256 = "034yzdwksydl9dxprv786lznwdfafa1nnzcsywjd40zv6las3gdm"; libraryHaskellDepends = [ base ]; description = "Generic operations on tuples"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "tuple-hlist" = callPackage @@ -261588,7 +262404,7 @@ self: { libraryHaskellDepends = [ base HList OneTuple ]; description = "Functions to convert between tuples and HLists"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "tuple-lenses" = callPackage @@ -261599,8 +262415,8 @@ self: { sha256 = "1qq1sla89410wr9pnkmj100izkraad1gr163815p3dvh7qi04c7w"; libraryHaskellDepends = [ base lens template-haskell ]; description = "Stock FieldN combos and generators"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -261614,8 +262430,8 @@ self: { editedCabalFile = "1npahk37am7x6n4lfdk6y1i1690drg39j63gzb2jx5ivzxhlcp43"; libraryHaskellDepends = [ base HList template-haskell ]; description = "Morph between tuples, or convert them from and to HLists"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -261627,8 +262443,8 @@ self: { sha256 = "09993bfndv2iljq6sspihysv22d2f8g0lar03p7ghiyp81m6j0ax"; libraryHaskellDepends = [ base type-combinators ]; description = "various operations on n-ary tuples via GHC.Generics"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -261641,7 +262457,7 @@ self: { libraryHaskellDepends = [ base generics-sop ]; testHaskellDepends = [ base generics-sop ]; description = "functions on n-ary tuples using generics-sop"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "tuple-th" = callPackage @@ -261652,7 +262468,7 @@ self: { sha256 = "1mrl4vvxmby7sf1paf7hklzidnr6wq55822i73smqyz0xpf3gsjn"; libraryHaskellDepends = [ base containers template-haskell ]; description = "Generate (non-recursive) utility functions for tuples of statically known size"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tupleinstances" = callPackage @@ -261663,8 +262479,8 @@ self: { sha256 = "0kcmcg1fxsslpzpg766r9hr8aysg0s5fyang2xc0aa77zi71qyi3"; libraryHaskellDepends = [ base template-haskell ]; description = "Functor, Applicative and Monad for n-ary tuples"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -261681,7 +262497,7 @@ self: { base primitive QuickCheck quickcheck-classes tasty tasty-quickcheck ]; description = "Small monomorphic tuples"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tuples-homogenous-h98" = callPackage @@ -261692,7 +262508,7 @@ self: { sha256 = "0fhz246wh6x0s0sjkmd3qcylsx2gfrmgmvgb7js2zjg91y7zqnh2"; libraryHaskellDepends = [ base ]; description = "Wrappers for n-ary tuples with Traversable and Applicative/Monad instances"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "turing" = callPackage @@ -261715,8 +262531,8 @@ self: { sha256 = "1anh6x4vdkys5b89ni18gsh3fl68v667qg5aw1867s4hwlvsii35"; libraryHaskellDepends = [ base ]; description = "A simple simulator for Turing machines"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -261730,8 +262546,8 @@ self: { isExecutable = true; executableHaskellDepends = [ ALUT base ]; description = "Plays music generated by Turing machines with 5 states and 2 symbols"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -261748,8 +262564,8 @@ self: { base containers hspec hspecVariant QuickCheck QuickCheckVariant ]; description = "An implementation of Turing Machine and Automaton"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -261765,7 +262581,7 @@ self: { executableHaskellDepends = [ base containers vector ]; testHaskellDepends = [ base HUnit ]; description = "Haskell port of Deniz Yuret's Turkish deasciifier"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "turn-loop" = callPackage @@ -261776,7 +262592,7 @@ self: { sha256 = "180yplkjf0c4n17a5ad2pakjwnh7830rldzmaqjj7gwcl3pg0lc6"; libraryHaskellDepends = [ base containers stm ]; description = "Manage multiple turned-based sessions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "turni" = callPackage @@ -261789,7 +262605,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base containers MonadRandom random ]; description = "shifts scheduling tool"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "turtle" = callPackage @@ -261812,7 +262628,7 @@ self: { testHaskellDepends = [ base doctest system-filepath temporary ]; benchmarkHaskellDepends = [ base criterion text ]; description = "Shell programming, Haskell-style"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "turtle_1_5_21" = callPackage @@ -261835,8 +262651,8 @@ self: { testHaskellDepends = [ base doctest system-filepath temporary ]; benchmarkHaskellDepends = [ base criterion text ]; description = "Shell programming, Haskell-style"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "turtle-options" = callPackage @@ -261852,8 +262668,8 @@ self: { executableHaskellDepends = [ base turtle ]; testHaskellDepends = [ base HUnit parsec ]; description = "Collection of command line options and parsers for these options"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -261867,7 +262683,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base bytestring ]; description = "Trailing Whitespace"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tweak" = callPackage @@ -261878,8 +262694,8 @@ self: { sha256 = "1l5y94gac9s55wgn6w610pqb63c8l20vmlpsnmgbzw1f9vbnzgiw"; libraryHaskellDepends = [ base containers lens stm transformers ]; description = "A library for incremental computing"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -261896,8 +262712,8 @@ self: { base containers jukebox pretty split twee-lib ]; description = "An equational theorem prover"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -261913,7 +262729,7 @@ self: { base containers dlist ghc-prim pretty primitive transformers vector ]; description = "An equational theorem prover"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tweet-hs" = callPackage @@ -261940,8 +262756,8 @@ self: { ]; benchmarkHaskellDepends = [ base bytestring criterion megaparsec ]; description = "Command-line tool for twitter"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -261953,7 +262769,7 @@ self: { sha256 = "1kmf907i6g6lfhw8g403b6701srrd298n4r53dvcqzy72c5qaixl"; libraryHaskellDepends = [ base gloss parsec time ]; description = "Lab Assignments Environment at Univeriteit Twente"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "twentefp-eventloop-graphics" = callPackage @@ -261970,8 +262786,8 @@ self: { base network text twentefp-number twentefp-websockets ]; description = "Used as Lab Assignments Environment at the University of Twente"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -261983,8 +262799,8 @@ self: { sha256 = "03aj2awy7prznv8m7048idvn0vs3rfrbcamr4zakjdpxyjknz054"; libraryHaskellDepends = [ base eventloop ]; description = "Tree type and show functions for lab assignment of University of Twente. Contains RoseTree and RedBlackTree"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -261996,8 +262812,8 @@ self: { sha256 = "0g0py8cb4z9i9pjhka2pyjm8vfai9x3k0vmlb06g157ish97qvir"; libraryHaskellDepends = [ base twentefp-eventloop-graphics ]; description = "Lab Assignments Environment at Univeriteit Twente"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -262009,7 +262825,7 @@ self: { sha256 = "1kh0a6h4syx98ygwidw6cc24ci91v1blshpfcczx96z850x1h6xf"; libraryHaskellDepends = [ base parsec ]; description = "Lab Assignments Environment at Univeriteit Twente"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "twentefp-rosetree" = callPackage @@ -262023,8 +262839,8 @@ self: { base twentefp-eventloop-graphics twentefp-number ]; description = "RoseTree type and show functions for lab assignment of University of Twente"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -262036,8 +262852,8 @@ self: { sha256 = "0mmj96xbqjzm4cylk39pib9jfwh6m350q1cwf6ij8pl0swab3b0g"; libraryHaskellDepends = [ base twentefp-eventloop-graphics ]; description = "Tree type and show functions for lab assignment of University of Twente. Contains RoseTree and ParseTree"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -262056,8 +262872,8 @@ self: { network random SHA text ]; description = "A fork of the popular websockets package. It is used for the practical assignments of the University of Twente. A sensible and clean way to write WebSocket-capable servers in Haskell."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -262087,8 +262903,8 @@ self: { base Cabal cabal-test-quickcheck HUnit-Plus QuickCheck split vector ]; description = "Rubik's cube solver"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -262114,8 +262930,8 @@ self: { ]; testHaskellDepends = [ base ]; description = "They Work For You API Client Library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -262146,8 +262962,8 @@ self: { ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "CLI twitter client"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -262169,7 +262985,7 @@ self: { ]; description = "Unix Command-Line Twitter and Identica Client"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -262182,7 +262998,7 @@ self: { libraryHaskellDepends = [ base containers haskell98 mtl ]; description = "STM library with safe irrevocable I/O and inconsistency repair"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -262209,8 +263025,8 @@ self: { ]; doCheck = false; description = "Twilio REST API library for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -262229,8 +263045,8 @@ self: { QuickCheck text time ]; description = "Twilio API interaction"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -262248,7 +263064,7 @@ self: { ]; testHaskellDepends = [ base doctest ]; description = "TwiML library for Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "twine" = callPackage @@ -262263,8 +263079,8 @@ self: { base bytestring containers convertible filepath mtl parsec ]; description = "very simple template language"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -262286,8 +263102,8 @@ self: { proto-lens-jsonpb proto-lens-runtime servant text wai ]; description = "Haskell twirp foundations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -262304,7 +263120,7 @@ self: { ]; description = "Simulator of twisty puzzles à la Rubik's Cube"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "twitch" = callPackage @@ -262324,7 +263140,7 @@ self: { optparse-applicative time transformers ]; description = "A high level file watcher DSL"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "twitter" = callPackage @@ -262341,8 +263157,8 @@ self: { base curl directory filepath json mtl old-locale readline time xml ]; description = "A Haskell-based CLI Twitter client"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -262356,8 +263172,8 @@ self: { }: mkDerivation { pname = "twitter-conduit"; - version = "0.5.0"; - sha256 = "1rh68ll9dv0axql5npvk547ykqbarak3frpwdflblfm3hrfnwfgf"; + version = "0.5.1"; + sha256 = "0xhkxgpcz6fzkc1w69542zk5y58irw33ljmg8bfl3xi722yazvgs"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson attoparsec authenticate-oauth base bytestring conduit @@ -262373,8 +263189,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Twitter API package with conduit interface and Streaming API support"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -262393,8 +263209,8 @@ self: { transformers ]; description = "Twitter API package with enumerator interface and Streaming API support"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -262416,8 +263232,8 @@ self: { base containers HUnit test-framework test-framework-hunit ]; description = "Client for fetching Twitter timeline via Oauth"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -262439,7 +263255,7 @@ self: { unordered-containers ]; description = "Twitter JSON parser and types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "twitter-types-lens" = callPackage @@ -262454,7 +263270,7 @@ self: { base lens template-haskell text time twitter-types ]; description = "Twitter JSON types (lens powered)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tx" = callPackage @@ -262469,8 +263285,8 @@ self: { base bytestring cereal safecopy stm transformers ]; description = "Persistent transactions on top of STM"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -262489,8 +263305,8 @@ self: { ]; testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; description = "Text"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -262508,7 +263324,7 @@ self: { base binary bytestring containers directory parsec regex-posix ]; description = "The SQL link in your *NIX chain"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "txt2rtf" = callPackage @@ -262532,8 +263348,8 @@ self: { sha256 = "08qpdyb1dbkif4zwrap6478fsf7lha6hk18wm0r4803avrr5w2bb"; libraryHaskellDepends = [ base ]; description = "Deprecated in favor of eros"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -262547,7 +263363,7 @@ self: { editedCabalFile = "0sxqrkqchr3zcks68wljp722f5sndxz1fw5a2qi599i984v91y0l"; libraryHaskellDepends = [ base ghc-prim ]; description = "Typed type representations and equality proofs"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "tyfam-witnesses" = callPackage @@ -262558,8 +263374,8 @@ self: { sha256 = "0gsx2syy58gq7n2yi4whslbnwg4dh34x8jy56h11k8z6n01inppc"; libraryHaskellDepends = [ base containers template-haskell ]; description = "Provide proof witnesses for closed type family evaluation"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -262578,8 +263394,8 @@ self: { base bytestring directory filepath ghc process ]; description = "Analyzes Haskell source files for easy reference"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -262592,7 +263408,7 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base ]; description = "Various type-aligned sequence data structures"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "type-assertions" = callPackage @@ -262604,8 +263420,8 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec test-fixture ]; description = "Runtime type assertions for testing"; - license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -262617,7 +263433,7 @@ self: { sha256 = "11kbnfbvclkdwirnnpdi4f20pibdar4l47anvnkaxxl330zi7yfh"; libraryHaskellDepends = [ base ]; description = "Type-level booleans via type-families"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "type-cache" = callPackage @@ -262632,8 +263448,8 @@ self: { base containers lens lens-utils template-haskell ]; description = "Utilities for caching type families results. Sometimes complex type families take long time to compile, so it is proficient to cache them and use the final result without the need of re-computation."; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -262650,8 +263466,8 @@ self: { type-spine ]; description = "Type-level serialization of type constructors"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -262665,8 +263481,8 @@ self: { editedCabalFile = "1m975zq2mxlzk5h4nzrkaxjx5w79p3ws3yli3m6cn3245pjygv5w"; libraryHaskellDepends = [ base ]; description = "A collection of data types for type-level programming"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -262682,8 +263498,8 @@ self: { base haskell-src-meta template-haskell type-combinators ]; description = "Quasiquoters for the 'type-combinators' package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -262695,8 +263511,8 @@ self: { sha256 = "00cwlfcka2d1wcp7159r3sk3gz852dmc71jvjfr8bn1rrr781n0q"; libraryHaskellDepends = [ base singletons type-combinators ]; description = "Interop between /type-combinators/ and /singletons/"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -262708,8 +263524,8 @@ self: { sha256 = "0rmqy3wcypyq09gnfz0xvkr2ly9gnpsjnil2n981ajfxsk2shi58"; libraryHaskellDepends = [ base template-haskell type-spine ]; description = "Arbitrary-base type-level digits"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -262724,8 +263540,8 @@ self: { libraryHaskellDepends = [ base ]; libraryToolDepends = [ cpphs ]; description = "Type equality evidence you can carry around"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -262735,11 +263551,11 @@ self: { pname = "type-equality"; version = "1"; sha256 = "1s4cl11rvvv7n95i3pq9lmmx08kwh4z7l3d1hbv4wi8il81baa27"; - revision = "1"; - editedCabalFile = "13lsff17dxz852f5bhjz8d1by704rzvwr67qqfc5dz5s7xc28qyk"; + revision = "2"; + editedCabalFile = "1a3irpv5kyg3rywhmcp5fwg5irrdbdr0hrlw7asdk113nakrba7j"; libraryHaskellDepends = [ base ]; description = "Data.Type.Equality compat package"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "type-equality-check" = callPackage @@ -262750,7 +263566,7 @@ self: { sha256 = "1r0g2xpkyj3765z07s559xy9vx4ipwnlk13sxrbcjds7wghfb8ci"; libraryHaskellDepends = [ base type-level ]; description = "Type equality check"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "type-errors" = callPackage @@ -262771,7 +263587,7 @@ self: { th-abstraction ]; description = "Tools for writing better type errors"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "type-errors-pretty" = callPackage @@ -262785,7 +263601,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest Glob ]; description = "Combinators for writing pretty type errors easily"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "type-fun" = callPackage @@ -262797,8 +263613,8 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Collection of widely reimplemented type families"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -262810,7 +263626,7 @@ self: { sha256 = "1ib1d5z9wxc63hq2gyxplpzs49k5rfafgz1r59bqsqh63yk4lly8"; libraryHaskellDepends = [ base kinds ]; description = "Emulation of type-level functions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "type-hint" = callPackage @@ -262821,7 +263637,7 @@ self: { sha256 = "1fcrma7m6y7i1y42rzhv7qch8xkk93lkh1767saw4hsb9fzwsq8i"; libraryHaskellDepends = [ base ]; description = "Guide type inference with proxy values"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "type-indexed-queues" = callPackage @@ -262843,8 +263659,8 @@ self: { base containers criterion pqueue random ]; description = "Queues with verified and unverified versions"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -262856,8 +263672,8 @@ self: { sha256 = "1lakw4mvkii32a570zain510n9x7b2ka2r3qj5rpil1j4bpc662w"; libraryHaskellDepends = [ base template-haskell ]; description = "Type Level 2s- and 16s- Complement Integers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -262870,8 +263686,8 @@ self: { libraryHaskellDepends = [ base containers mtl template-haskell ]; testHaskellDepends = [ base template-haskell ]; description = "Interpreter for Template Haskell types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -262888,7 +263704,7 @@ self: { vector-builder ]; description = "Typeclasses for injective relations and isomorphisms between types"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "type-level" = callPackage @@ -262899,7 +263715,7 @@ self: { sha256 = "03w9dkb2d8351y2ic2wxh1sr2dnwh9ph9qa5mak0iciqraxvqxlr"; libraryHaskellDepends = [ base syb template-haskell ]; description = "Type-level programming library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "type-level-bst" = callPackage @@ -262910,8 +263726,8 @@ self: { sha256 = "0c51p6dy84ddikj6jch5hljn1i37q38wbak3chbc3ds5r674y5hk"; libraryHaskellDepends = [ base ]; description = "type-level binary search trees in haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -262924,7 +263740,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Provides integers lifted to the type level"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "type-level-kv-list" = callPackage @@ -262936,7 +263752,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest Glob ]; description = "A module for hash map like object with type level keys"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "type-level-natural-number" = callPackage @@ -262947,7 +263763,7 @@ self: { sha256 = "17zgm5ys1z61kxxczz3bzi9m3c48py6pvyx3cqk3xlh1w7n58ryk"; libraryHaskellDepends = [ base ]; description = "Simple type level natural numbers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "type-level-natural-number-induction" = callPackage @@ -262960,8 +263776,8 @@ self: { base transformers type-level-natural-number ]; description = "High-level combinators for performing inductive operations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -262973,8 +263789,8 @@ self: { sha256 = "0vql5q5zhbhmwv0wqqb0xi4ayqdsz149rymhs730c583pq0h9r3w"; libraryHaskellDepends = [ base type-level-natural-number ]; description = "Basic operations on type-level natural numbers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -262987,7 +263803,7 @@ self: { libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base template-haskell ]; description = "Type level numbers implemented using type families"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "type-level-sets" = callPackage @@ -263000,7 +263816,7 @@ self: { editedCabalFile = "0cc0ws2plharq0gvindgmkp1fs82zd43zijkh7wf0ilfnr2l17z2"; libraryHaskellDepends = [ base ghc-prim ]; description = "Type-level sets and finite maps (with value-level counterparts)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "type-level-tf" = callPackage @@ -263011,7 +263827,7 @@ self: { sha256 = "07q69219yvf7rpfwilp70hvx2fzsxklvld7j3gayj17l9wp23g2m"; libraryHaskellDepends = [ base syb template-haskell ]; description = "Type-level programming library (type families)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "type-list" = callPackage @@ -263022,8 +263838,8 @@ self: { sha256 = "03395ivxda6mihjzn89rzvf0nkk0g16n207wvz4f61ky8r5mzfpz"; libraryHaskellDepends = [ base singletons ]; description = "Operations on type-level lists and tuples"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -263040,25 +263856,34 @@ self: { base HUnit test-framework test-framework-hunit ]; description = "Type-indexed maps"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "type-natural" = callPackage - ({ mkDerivation, base, constraints, equational-reasoning - , ghc-typelits-natnormalise, ghc-typelits-presburger, singletons - , singletons-presburger, template-haskell + ({ mkDerivation, base, constraints, equational-reasoning, ghc + , ghc-typelits-knownnat, ghc-typelits-natnormalise + , ghc-typelits-presburger, integer-logarithms, QuickCheck + , quickcheck-instances, tasty, tasty-discover + , tasty-expected-failure, tasty-hunit, tasty-quickcheck + , template-haskell }: mkDerivation { pname = "type-natural"; - version = "0.9.0.0"; - sha256 = "1jg8qqha60mxj7mrbi69jbcniayksyggi2s7fxy88ap4ay1hky3a"; + version = "1.0.0.0"; + sha256 = "04j37xqgd2690y0vlx6f24y7fa07vljkrlaq8x8azmka8lsmbdl0"; libraryHaskellDepends = [ - base constraints equational-reasoning ghc-typelits-natnormalise - ghc-typelits-presburger singletons singletons-presburger - template-haskell + base constraints equational-reasoning ghc ghc-typelits-knownnat + ghc-typelits-natnormalise ghc-typelits-presburger + integer-logarithms template-haskell + ]; + testHaskellDepends = [ + base equational-reasoning integer-logarithms QuickCheck + quickcheck-instances tasty tasty-discover tasty-expected-failure + tasty-hunit tasty-quickcheck template-haskell ]; + testToolDepends = [ tasty-discover ]; description = "Type-level natural and proofs of their properties"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "type-of-html" = callPackage @@ -263079,7 +263904,7 @@ self: { text weigh ]; description = "High performance type driven html generation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "type-of-html-static" = callPackage @@ -263091,8 +263916,8 @@ self: { libraryHaskellDepends = [ base template-haskell type-of-html ]; testHaskellDepends = [ base type-of-html ]; description = "Optimize static parts of type-of-html"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -263104,7 +263929,7 @@ self: { sha256 = "1cm3vfarjpwm885i5w5mjyg1ibg9bm5q34hbacpl3c9q9l1vwl4j"; libraryHaskellDepends = [ base ghc-prim ]; description = "Various type-level operators"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "type-ord" = callPackage @@ -263117,8 +263942,8 @@ self: { base template-haskell type-digits type-spine ]; description = "Type-level comparison operator"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -263134,8 +263959,8 @@ self: { base template-haskell type-cereal type-ord type-spine ]; description = "Generic type-level comparison of types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -263147,8 +263972,8 @@ self: { sha256 = "1ygg511j0av1g94mclrsf3p0qb2kc89jcz9nfr5fm073a2jlzlih"; libraryHaskellDepends = [ base ghc-prim ]; description = "Partial port of prelude to the type level. Requires GHC 7.6.1."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -263161,8 +263986,8 @@ self: { libraryHaskellDepends = [ base cmptype ]; testHaskellDepends = [ base cmptype ]; description = "Type-level sets"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -263178,8 +264003,8 @@ self: { base containers syb template-haskell transformers type-equality ]; description = "Sets and functions-as-relations in the type system"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -263192,7 +264017,7 @@ self: { libraryHaskellDepends = [ base pretty ]; testHaskellDepends = [ base ]; description = "Type Level Specification by Example"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "type-spine" = callPackage @@ -263203,8 +264028,8 @@ self: { sha256 = "0vy9ixmz1xm3dd0376s0h66q7qi64jqc5kqsqjpcg7akxidl03hi"; libraryHaskellDepends = [ base template-haskell ]; description = "A spine-view on types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -263231,8 +264056,8 @@ self: { unordered-containers vector ]; description = "Type structure analysis"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -263257,8 +264082,8 @@ self: { th-instances tuple uniplate ]; description = "Substitute types for other types with Template Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -263276,8 +264101,8 @@ self: { ]; testHaskellDepends = [ base doctest ]; description = "Tree representations of datatypes"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -263297,7 +264122,7 @@ self: { vector-space ]; description = "Type-level and typed unary natural numbers, inequality proofs, vectors"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "typeable-th" = callPackage @@ -263309,11 +264134,24 @@ self: { libraryHaskellDepends = [ base template-haskell transformers ]; testHaskellDepends = [ base ]; description = "Automatic deriving of TypeableN instances with Template Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; + "typecheck-plugin-nat-simple" = callPackage + ({ mkDerivation, base, containers, ghc }: + mkDerivation { + pname = "typecheck-plugin-nat-simple"; + version = "0.1.0.2"; + sha256 = "1hdp2n8n75lr1rjn99nwrqgzh3xay18lkjm8sjv36bwavvbw9p90"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base containers ghc ]; + testHaskellDepends = [ base containers ghc ]; + description = "Simple type check plugin which calculate addition, subtraction and less-or-equal-than"; + license = lib.licenses.bsd3; + }) {}; + "typed-admin" = callPackage ({ mkDerivation, base, blaze-markup, bytestring, data-default-class , exceptions, generic-lens, HDBC, HDBC-postgresql, HDBC-session @@ -263338,7 +264176,7 @@ self: { unordered-containers utf8-string wai wai-extra warp yaml ]; description = "Admin console framework"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "typed-digits" = callPackage @@ -263355,7 +264193,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Digits, indexed by their base at the type level"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "typed-duration" = callPackage @@ -263370,7 +264208,7 @@ self: { base lifted-base monad-control transformers-base ]; description = "Thread delay and timeout functions with typed arguments"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "typed-encoding" = callPackage @@ -263380,8 +264218,8 @@ self: { }: mkDerivation { pname = "typed-encoding"; - version = "0.5.2.1"; - sha256 = "1n71rxj42ssv7g4yqsycg5wg1afja2y1jxfb5khv323v581gf4wn"; + version = "0.5.2.2"; + sha256 = "17h6ig2phgdr5gq7pdswn50yjdqz7ci1nh4grwpz8m0qykkqj4v4"; libraryHaskellDepends = [ base base64-bytestring bytestring symbols text ]; @@ -263390,8 +264228,8 @@ self: { QuickCheck quickcheck-instances symbols text ]; description = "Type safe string transformations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -263411,8 +264249,8 @@ self: { quickcheck-instances typed-encoding ]; description = "Bridge between encoding and typed-encoding packages"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -263432,7 +264270,7 @@ self: { transformers unliftio-core ]; description = "Run external processes, with strong typing of streams"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "typed-spreadsheet" = callPackage @@ -263451,8 +264289,8 @@ self: { ]; executableHaskellDepends = [ base diagrams-lib text ]; description = "Typed and composable spreadsheets"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -263474,8 +264312,8 @@ self: { make-monofoldable-foldable mono-traversable vector ]; description = "A stream based replacement for lists"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -263492,7 +264330,7 @@ self: { text uuid validity validity-uuid ]; description = "Phantom-Typed version of UUID"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "typed-uuid_0_1_0_0" = callPackage @@ -263509,8 +264347,8 @@ self: { text uuid validity validity-uuid yamlparse-applicative ]; description = "Phantom-Typed version of UUID"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "typed-wire" = callPackage @@ -263534,8 +264372,8 @@ self: { aeson base bytestring directory filepath HTF process temporary text ]; description = "Language-independent type-safe communication"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -263551,7 +264389,7 @@ self: { aeson base base64-bytestring bytestring text time ]; description = "Haskell utility library required for code generated by typed-wire compiler"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "typedflow" = callPackage @@ -263565,8 +264403,8 @@ self: { base ghc-typelits-knownnat mtl pretty-compact ]; description = "Typed frontend to TensorFlow and higher-order deep learning"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -263583,8 +264421,8 @@ self: { transformers ]; description = "Parser for SQL augmented with types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -263596,8 +264434,8 @@ self: { sha256 = "11s10arrbri1f71jfpynhmwh53cgkrfxsrqch1f02j0aii7n0lpv"; libraryHaskellDepends = [ base binary bytestring mtl pureMD5 syb ]; description = "Create a unique hash value for a type"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -263614,8 +264452,8 @@ self: { primitive transformers ]; description = "Useful type level operations (type families and related operators)"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -263634,8 +264472,8 @@ self: { ]; testHaskellDepends = [ base ghc-prim vinyl ]; description = "Solve type equalities using custom type-level rewrite rules"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -263653,8 +264491,8 @@ self: { test-framework-hunit test-framework-quickcheck2 ]; description = "Tensors whose ranks and dimensions type-inferred and type-checked"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -263666,7 +264504,7 @@ self: { sha256 = "1a2ahf8imbk8zff2i7cfag2irax8qdd4r6vb00hil34i67p980ij"; libraryHaskellDepends = [ base symbols text ]; description = "Type-safe printf from parsing GHC TypeLits Symbol"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "typelits-witnesses" = callPackage @@ -263677,7 +264515,7 @@ self: { sha256 = "1khy5nacmsl7h4vg7driv4yb9m3zvkhbf8divyhd249i6bdmql70"; libraryHaskellDepends = [ base dependent-sum ]; description = "Existential witnesses, singletons, and classes for operations on GHC TypeLits"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "typenums" = callPackage @@ -263689,8 +264527,8 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "Type level numbers using existing Nat functionality"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -263704,7 +264542,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base process ]; description = "Small script for inferring types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "typeparams" = callPackage @@ -263720,8 +264558,8 @@ self: { template-haskell vector ]; description = "Lens-like interface for type level parameters; allows unboxed unboxed vectors and supercompilation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -263746,7 +264584,7 @@ self: { ]; doHaddock = false; description = "Efficient implementation of a dependent map with types as keys"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "types-compat" = callPackage @@ -263759,8 +264597,8 @@ self: { editedCabalFile = "0h8hlx3zb7s8dfh275ich99j4aa4gdj2f8yvzwpmzgylcvn1gfwg"; libraryHaskellDepends = [ base ]; description = "ghc-7.6/7.8 compatible GHC.TypeLits, Data.Typeable and Data.Proxy."; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -263772,7 +264610,7 @@ self: { sha256 = "1kg4pvrnf7vwvrcb998l9w08dpdy9hg7x2d9h5s3lqpnvvxfgcfj"; libraryHaskellDepends = [ base ]; description = "Enforce endianness with types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "typesafe-precure" = callPackage @@ -263791,8 +264629,8 @@ self: { ]; testHaskellDepends = [ base hspec ]; description = "Type-safe transformations and purifications of PreCures (Japanese Battle Heroine)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -263812,8 +264650,8 @@ self: { language-typescript parsec split syb utf8-string ]; description = "A documentation generator for TypeScript Definition files"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -263851,8 +264689,8 @@ self: { template-haskell vector ]; description = "Just let me draw nice text already"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -263868,7 +264706,7 @@ self: { base containers parallel polynomials-bernstein vector ]; description = "Drawings for printed text documents"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }) {}; "typson-beam" = callPackage @@ -263890,8 +264728,8 @@ self: { tasty-hedgehog tasty-hunit test-fixture typson-core ]; description = "Typson Beam Integration"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -263907,7 +264745,7 @@ self: { aeson base containers profunctors text unordered-containers vector ]; description = "Type-safe PostgreSQL JSON Querying"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "typson-esqueleto" = callPackage @@ -263931,8 +264769,8 @@ self: { text typson-core ]; description = "Typson Esqueleto Integration"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -263955,8 +264793,8 @@ self: { test-fixture text typson-core ]; description = "Typson Selda Integration"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -263977,8 +264815,8 @@ self: { test-framework test-framework-hunit text vector ]; description = "Type derived JSON parsing using Aeson"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -264006,7 +264844,7 @@ self: { ]; preConfigure = "export TZDIR=${pkgs.tzdata}/share/zoneinfo"; description = "Efficient time zone handling"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "tzdata" = callPackage @@ -264027,7 +264865,7 @@ self: { test-framework-th unix ]; description = "Time zone database (as files and as a module)"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "u2f" = callPackage @@ -264045,8 +264883,8 @@ self: { ]; testHaskellDepends = [ base bytestring either-unwrap hspec text ]; description = "Haskell Universal Two Factor helper toolbox library thing"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -264067,7 +264905,7 @@ self: { ]; description = "A simplistic dependently-typed language with parametricity"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "ua-parser" = callPackage @@ -264092,7 +264930,7 @@ self: { filepath pcre-light text yaml ]; description = "A library for parsing User-Agent strings, official Haskell port of ua-parser"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "uacpid" = callPackage @@ -264112,7 +264950,7 @@ self: { regex-compat time time-locale-compat unix ]; description = "Userspace Advanced Configuration and Power Interface event daemon"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "uber" = callPackage @@ -264124,8 +264962,8 @@ self: { libraryHaskellDepends = [ aeson base text webapi ]; testHaskellDepends = [ base hspec text ]; description = "Uber client for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -264137,8 +264975,8 @@ self: { sha256 = "12p948706scjiazlwv0x1afl3v8fhv4a3l8yqn1x4y9xnr4pfmc9"; libraryHaskellDepends = [ base lens tagged template-haskell ]; description = "Generate overloaded lenses from plain data declaration"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -264169,7 +265007,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "The Ucam-Webauth protocol, used by Raven"; license = "(BSD-3-Clause OR Apache-2.0)"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -264192,7 +265030,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "Types for the Ucam-Webauth protocol, as used by Raven"; license = "(BSD-3-Clause OR Apache-2.0)"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -264211,8 +265049,8 @@ self: { testHaskellDepends = [ base ]; benchmarkHaskellDepends = [ base gauge ]; description = "Unicode Character Database — Predicates on characters specified by Unicode"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -264225,8 +265063,8 @@ self: { libraryHaskellDepends = [ base ]; librarySystemDepends = [ icu ]; description = "String encoding conversion with ICU"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) icu;}; @@ -264248,7 +265086,7 @@ self: { utf8-string ]; description = "Small DBus implementation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "udbus-model" = callPackage @@ -264261,7 +265099,7 @@ self: { isExecutable = true; libraryHaskellDepends = [ base bytestring udbus xml ]; description = "Model API for udbus introspection and definitions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "udcode" = callPackage @@ -264272,7 +265110,7 @@ self: { sha256 = "1namnm91divk1x8ki7wfbd79f4nrym58r4ki9yamj2giv4nxda36"; libraryHaskellDepends = [ base containers mtl ]; description = "Does a set of code words form a uniquely decodable code?"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "udev" = callPackage @@ -264286,8 +265124,8 @@ self: { libraryHaskellDepends = [ base bytestring posix-paths unix ]; libraryPkgconfigDepends = [ systemd ]; description = "libudev bindings"; - license = stdenv.lib.licenses.bsd3; - platforms = [ "i686-linux" "x86_64-linux" ]; + license = lib.licenses.bsd3; + platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) systemd;}; "udp-conduit" = callPackage @@ -264302,8 +265140,8 @@ self: { base chunked-data conduit-combinators mono-traversable network ]; description = "Simple fire-and-forget conduit UDP wrappers"; - license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -264317,8 +265155,8 @@ self: { base bytestring network resourcet streaming ]; description = "Streaming to and from UDP socket"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -264330,7 +265168,7 @@ self: { sha256 = "0ixqg5d0ly1r18jbgaa89i6kjzgi6c5hanw1b1y8c5fbq14yz2gy"; libraryHaskellDepends = [ base containers ]; description = "A simple (but internally ugly) memoization function"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "uhc-light" = callPackage @@ -264357,8 +265195,8 @@ self: { transformers uhc-util utf8-string uulib vector ]; description = "Part of UHC packaged as cabal/hackage installable library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -264378,8 +265216,8 @@ self: { process time time-compat transformers uulib vector ]; description = "UHC utilities"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -264393,8 +265231,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base bytestring split ]; description = "hex dumper for UTF-8 text"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -264419,7 +265257,7 @@ self: { optparse-applicative ]; description = "Minimal HTTP client library optimized for benchmarking"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "ui-command" = callPackage @@ -264432,8 +265270,8 @@ self: { isExecutable = true; libraryHaskellDepends = [ base data-default mtl old-locale time ]; description = "A framework for friendly commandline programs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -264449,7 +265287,7 @@ self: { aeson base bytestring cereal dataenc text uuid ]; description = "Simple unique identifier datatype, serializable and encodable as base32"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "ukrainian-phonetics-basic" = callPackage @@ -264460,18 +265298,18 @@ self: { sha256 = "1sgch686yq6yqm6yz63v4hcprslfzn82an1ndxbgy0m7d7ipdavx"; libraryHaskellDepends = [ base bytestring mmsyn2 mmsyn5 vector ]; description = "A library to work with the basic Ukrainian phonetics and syllable segmentation"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "ukrainian-phonetics-basic-array" = callPackage ({ mkDerivation, base, bytestring, mmsyn2-array, mmsyn5 }: mkDerivation { pname = "ukrainian-phonetics-basic-array"; - version = "0.1.1.0"; - sha256 = "1v5nzcnyrkhz5r2igxdp07ac506p0nnmjiskxxil5rzhab9zf8kn"; + version = "0.1.2.0"; + sha256 = "1a1crwz47vrrqr3bydzhknacmv5yafrpc33417mmp68qqhccdc23"; libraryHaskellDepends = [ base bytestring mmsyn2-array mmsyn5 ]; description = "A library to work with the basic Ukrainian phonetics and syllable segmentation"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "ulid" = callPackage @@ -264495,7 +265333,7 @@ self: { base deepseq format-numbers text time ]; description = "Implementation of ULID - Universally Unique Lexicographically Sortable Identifier"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "una" = callPackage @@ -264512,7 +265350,7 @@ self: { base bytestring cmdargs directory filepath io-storage process ]; description = "Universal un-archiver utility"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "unagi-bloomfilter" = callPackage @@ -264529,8 +265367,8 @@ self: { atomic-primops base bytestring hashabler primitive ]; description = "A fast, cache-efficient, concurrent bloom filter"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -264548,7 +265386,7 @@ self: { ]; benchmarkHaskellDepends = [ async base criterion ]; description = "Fast concurrent queues with a Chan-like API, and more"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "unagi-streams" = callPackage @@ -264559,7 +265397,7 @@ self: { sha256 = "11vr8zxyksqb2np6f77d9ai6xrb7fpfjbgv191h3pppcanysm4w3"; libraryHaskellDepends = [ base io-streams unagi-chan ]; description = "Unagi Chan IO-Streams"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "unamb" = callPackage @@ -264574,7 +265412,7 @@ self: { isExecutable = true; libraryHaskellDepends = [ base ]; description = "Unambiguous choice"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "unamb-custom" = callPackage @@ -264585,8 +265423,8 @@ self: { sha256 = "0r694wi9xg8brgcwl2kyv5amp6v539l121s9bpmd5lhjdnrvqjwk"; libraryHaskellDepends = [ base containers mtl ]; description = "Functional concurrency with unamb using a custom scheduler"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -264610,7 +265448,7 @@ self: { ]; doHaddock = false; description = "Opinionated Haskell Interoperability"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "unbound" = callPackage @@ -264629,8 +265467,8 @@ self: { template-haskell transformers ]; description = "Generic support for programming with names and binders"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -264653,7 +265491,7 @@ self: { ]; benchmarkHaskellDepends = [ base criterion deepseq ]; description = "Support for programming with names and binders using GHC Generics"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "unbound-kind-generics" = callPackage @@ -264668,7 +265506,7 @@ self: { base kind-generics kind-generics-th unbound-generics ]; description = "Support for programming with names and binders using kind-generics"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "unbounded-delays" = callPackage @@ -264679,7 +265517,7 @@ self: { sha256 = "11b1vmlfv4pmmpl4kva58w7cf50xsj819cq3wzqgnbz3px9pxbar"; libraryHaskellDepends = [ base ]; description = "Unbounded thread delays and timeouts"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "unbounded-delays-units" = callPackage @@ -264690,8 +265528,8 @@ self: { sha256 = "02j4i2dms15vb87ar3m99hvpxrjdakljyql708zs716k1jdm7614"; libraryHaskellDepends = [ base unbounded-delays units units-defs ]; description = "Thread delays and timeouts using proper time units"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -264703,7 +265541,7 @@ self: { sha256 = "1xk9x1viprvswjp62xrg2mvm34b0qamflb1phpyfh9bspy8f1qqd"; libraryHaskellDepends = [ base ghc-prim ]; description = "All the standard sum types but strict and unboxed as possible"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "unboxed-containers" = callPackage @@ -264716,8 +265554,8 @@ self: { editedCabalFile = "16j16v36jabr9lpmjm52zbfz82m0ckd4p0f3z8123aawvzcvayji"; libraryHaskellDepends = [ base containers ]; description = "Self-optimizing unboxed sets using view patterns and data families"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -264730,7 +265568,7 @@ self: { libraryHaskellDepends = [ base ghc-prim primitive ]; testHaskellDepends = [ async base HUnit ]; description = "Fast unboxed references for ST and IO monad"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "unboxed-references" = callPackage @@ -264744,8 +265582,8 @@ self: { libraryHaskellDepends = [ base vector ]; executableHaskellDepends = [ base vector ]; description = "A library for reference cells backed by unboxed-vectors"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -264768,7 +265606,7 @@ self: { base deepseq mono-traversable primitive vector ]; description = "A newtype-friendly variant of unboxed vectors"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "unbreak" = callPackage @@ -264788,8 +265626,8 @@ self: { ]; executableHaskellDepends = [ base bytestring cmdargs ]; description = "Secure and resilient remote file storage utility"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.agpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -264804,7 +265642,7 @@ self: { libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base ]; description = "Customize uncaught exception handling"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "uncertain" = callPackage @@ -264820,7 +265658,7 @@ self: { transformers ]; description = "Manipulating numbers with inherent experimental/measurement uncertainty"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "unconstrained" = callPackage @@ -264832,7 +265670,7 @@ self: { revision = "1"; editedCabalFile = "13fj2jlh44774www49fwp7h7z6gr23scfbvg745rpywys49c0559"; description = "Null constraint"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "unescaping-print" = callPackage @@ -264845,8 +265683,8 @@ self: { editedCabalFile = "113p28z74lvsc7c6v93ilvbyp2fn5h1qsymksn3mi2ndxwq3vz3f"; libraryHaskellDepends = [ base ]; description = "Tiny package providing unescaping versions of show and print"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -264863,7 +265701,7 @@ self: { ]; description = "IO without any non-error, synchronous exceptions"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "unexceptionalio-trans" = callPackage @@ -264877,7 +265715,7 @@ self: { libraryHaskellDepends = [ base transformers unexceptionalio ]; description = "A wrapper around UnexceptionalIO using monad transformers"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "unfix-binders" = callPackage @@ -264888,8 +265726,8 @@ self: { sha256 = "0aw4ihkzwz220pgg84p47zp37i5dqn7cxqcqa2lfzi23y9sp5iss"; libraryHaskellDepends = [ base ]; description = "Unfixing and recursion schemes for data types with binders"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -264907,7 +265745,7 @@ self: { base containers ghc-prim one-liner QuickCheck random transformers ]; description = "Class of data structures that can be unfolded"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "unfoldable-restricted" = callPackage @@ -264923,7 +265761,7 @@ self: { unit-constraint unordered-containers ]; description = "An alternative to the Unfoldable typeclass"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ungadtagger" = callPackage @@ -264934,7 +265772,7 @@ self: { sha256 = "1hn30p9vpsvkph54grzwdrca5vh9grpa7d0w1zlvim1mnvqxmn4b"; libraryHaskellDepends = [ base ]; description = "Abstract GADTs from typelevel tags"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "uni-events" = callPackage @@ -264946,7 +265784,7 @@ self: { libraryHaskellDepends = [ base containers uni-util ]; description = "Event handling for the uniform workbench"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -264963,7 +265801,7 @@ self: { ]; description = "Graphs"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -264981,7 +265819,7 @@ self: { ]; description = "Graphical User Interface for Haskell Programs"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -264998,7 +265836,7 @@ self: { ]; description = "Posix utilities for the uniform workbench"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -265014,7 +265852,7 @@ self: { ]; description = "Reactors for the uniform workbench"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -265032,7 +265870,7 @@ self: { ]; description = "Graphs binding"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -265050,7 +265888,7 @@ self: { ]; description = "Utilities for the uniform workbench"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -265065,7 +265903,7 @@ self: { libraryHaskellDepends = [ base containers semigroups ]; testHaskellDepends = [ base containers utility-ht ]; description = "Construct and transform unicode characters"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "unicode-names" = callPackage @@ -265078,7 +265916,7 @@ self: { array base containers unicode-properties ]; description = "Unicode 3.2.0 character names"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "unicode-normalization" = callPackage @@ -265090,8 +265928,8 @@ self: { libraryHaskellDepends = [ base bytestring compact-string ]; librarySystemDepends = [ icu ]; description = "Unicode normalization using the ICU library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) icu;}; @@ -265103,8 +265941,8 @@ self: { sha256 = "05zakihlk06wckzgm43f3g26fjdn4gb3d1ypw4vcwqmipq2dbfsw"; libraryHaskellDepends = [ base ]; description = "Unicode notation for some definitions in Prelude"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -265116,7 +265954,7 @@ self: { sha256 = "06zrr2z9irbsxwf7fbnhp2sg36ykb2amfys2y78nzn0mw63xb3q1"; libraryHaskellDepends = [ array base containers ]; description = "Unicode 3.2.0 character properties"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "unicode-show" = callPackage @@ -265128,8 +265966,8 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "print and show in unicode"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -265141,8 +265979,8 @@ self: { sha256 = "0y1awqrf1x2in158linszma69zyz3zp14h3rmdx3vmbmif9fvbyv"; libraryHaskellDepends = [ base containers ]; description = "Unicode alternatives for common functions and operators"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -265165,7 +266003,7 @@ self: { base deepseq filepath gauge path path-io text ]; description = "Unicode normalization"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "unicode-tricks" = callPackage @@ -265180,8 +266018,8 @@ self: { testHaskellDepends = [ base hspec QuickCheck ]; testToolDepends = [ hspec-discover ]; description = "Functions to work with unicode blocks more convenient"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -265204,7 +266042,7 @@ self: { ]; testHaskellDepends = [ base text ]; description = "Make writing in unicode easy"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "unidecode" = callPackage @@ -265216,7 +266054,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "Haskell binding of Unidecode"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "unification-fd" = callPackage @@ -265227,7 +266065,7 @@ self: { sha256 = "15hrnmgr0pqq43fwgxc168r08xjgfhr2nchmz5blq46vwrh6gx2v"; libraryHaskellDepends = [ base containers logict mtl ]; description = "Simple generic unification algorithms"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "uniform-io" = callPackage @@ -265246,8 +266084,8 @@ self: { librarySystemDepends = [ openssl ]; testHaskellDepends = [ attoparsec base bytestring Cabal ]; description = "Uniform IO over files, network, anything"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) openssl;}; @@ -265264,7 +266102,7 @@ self: { adjunctions base deepseq distributive prelude-extras ]; description = "Uniform pairs with class instances"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "union" = callPackage @@ -265275,15 +266113,15 @@ self: { pname = "union"; version = "0.1.2"; sha256 = "1i4fvlwkw1wx64a6l8342aqfqsdq7fqa4p24g3i5gn5704lxrsb3"; - revision = "4"; - editedCabalFile = "09b6wqnmv4g2pnjzl5k90yp78jcif8pk40c0spdrbr2vr5766clj"; + revision = "5"; + editedCabalFile = "1qxwx43ba4ixq6g78y6gs4zqq4v2ka0qi79gpvny9qw577gwbbd3"; libraryHaskellDepends = [ base deepseq hashable profunctors tagged vinyl ]; benchmarkHaskellDepends = [ base criterion deepseq lens ]; description = "Extensible type-safe unions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -265297,7 +266135,7 @@ self: { editedCabalFile = "13cwjh03n82sgshbk4fdlvhc0pb3v979sdcdrpvnpjdqmvcprs92"; libraryHaskellDepends = [ base containers transformers ]; description = "Efficient union and equivalence testing of sets"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "union-find-array" = callPackage @@ -265308,7 +266146,7 @@ self: { sha256 = "1pxb1v2k04i8ds2n8zqra74gacry6dj5p87sxgkf4fazx4s316dk"; libraryHaskellDepends = [ array base mtl ]; description = "union find data structure"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "union-map" = callPackage @@ -265319,8 +266157,8 @@ self: { sha256 = "0q1qg0vg01ypjlb90xq8zl3zc53b3yn23vgpnzv92q7xmc46gb5l"; libraryHaskellDepends = [ base containers extensible ]; description = "Heterogeneous map by open unions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -265332,7 +266170,7 @@ self: { sha256 = "07jl3an9y4gbpmsq2gcbp3xwyvrnvkjcxcpq1702cc320c8zq542"; libraryHaskellDepends = [ base ]; description = "Helpers which allow safe partial pattern matching in lambdas"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "uniplate" = callPackage @@ -265349,7 +266187,7 @@ self: { base containers ghc-prim hashable syb unordered-containers ]; description = "Help writing simple, concise and fast generic operations"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "uniprot-kb" = callPackage @@ -265367,8 +266205,8 @@ self: { attoparsec base hspec neat-interpolation QuickCheck text ]; description = "UniProt-KB format parser"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -265384,7 +266222,7 @@ self: { base bytestring unordered-containers ]; description = "uniq-deep"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "unique" = callPackage @@ -265395,7 +266233,7 @@ self: { sha256 = "1dgln2dr64ma1isqskj1qnjslg9smmr7jssg8hmk68wp36i3rwkd"; libraryHaskellDepends = [ base hashable ]; description = "Fully concurrent unique identifiers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "unique-logic" = callPackage @@ -265413,7 +266251,7 @@ self: { base non-empty QuickCheck semigroups transformers utility-ht ]; description = "Solve simple simultaneous equations"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "unique-logic-tf" = callPackage @@ -265431,7 +266269,7 @@ self: { base non-empty QuickCheck semigroups transformers utility-ht ]; description = "Solve simple simultaneous equations"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "uniqueid" = callPackage @@ -265442,8 +266280,8 @@ self: { sha256 = "0s1jw29g5s9ll8hbfkyalhdjpsv54w1n63mz4jph36dbq68zb7g6"; libraryHaskellDepends = [ base ]; description = "Splittable Unique Identifier Supply"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -265460,8 +266298,8 @@ self: { base checkers containers doctest QuickCheck ]; benchmarkHaskellDepends = [ base criterion random ]; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -265473,7 +266311,7 @@ self: { sha256 = "1r5wnc9gdinxigqf9sb58k8rvbkbqmn71d2gxpg1xz3fgxs35cqq"; libraryHaskellDepends = [ base mmsyn6ukr vector ]; description = "Can be used to produce the 'uniquenessPeriods' function and related functionality"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "uniqueness-periods-general" = callPackage @@ -265484,7 +266322,7 @@ self: { sha256 = "117svylwp76rgygc1fa871qz0ghv5hsfj7lr63zy1r3zcakak45q"; libraryHaskellDepends = [ base vector ]; description = "Can be used to produce the similar to 'String.Ukrainian.UniquenessPeriods' functions."; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "uniqueness-periods-vector" = callPackage @@ -265495,7 +266333,7 @@ self: { sha256 = "0nl6rpxsmjw4zsw5x550wlifhrhy4pzkvjxhklb0183n9pl8nkkd"; libraryHaskellDepends = [ base vector ]; description = "Generalization of the uniqueness-periods and uniqueness-periods-general packages functionality"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "uniqueness-periods-vector-common" = callPackage @@ -265506,7 +266344,7 @@ self: { sha256 = "1h7xv3g7rpa2bj7mlydvfn9g14j911jrarpl7665h3rfb6fdq4zq"; libraryHaskellDepends = [ base vector ]; description = "Generalization of the dobutokO-poetry-general package functionality"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "uniqueness-periods-vector-examples" = callPackage @@ -265537,7 +266375,7 @@ self: { uniqueness-periods-vector-stats vector ]; description = "Usage examples for the uniqueness-periods-vector series of packages"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "uniqueness-periods-vector-filters" = callPackage @@ -265548,7 +266386,7 @@ self: { sha256 = "0hm4g7bqsi598z3wfjj9xy5rv3hfxwyk0vbkyqwvq99xr2pwr415"; libraryHaskellDepends = [ base mmsyn2 vector ]; description = "A library allows to change the structure of the 'RealFrac' function output"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "uniqueness-periods-vector-general" = callPackage @@ -265563,7 +266401,7 @@ self: { base print-info uniqueness-periods-vector-common vector ]; description = "Some kind of the optimization approach to data inner structure"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "uniqueness-periods-vector-properties" = callPackage @@ -265582,7 +266420,7 @@ self: { uniqueness-periods-vector-common vector ]; description = "Metrices for the maximum element for the uniqueness-periods-vector packages family"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "uniqueness-periods-vector-stats" = callPackage @@ -265593,7 +266431,7 @@ self: { sha256 = "1vw12a6q1h2in2llyy49n54s20sh8i4ry9vr2rwy8q0xfvfq9v25"; libraryHaskellDepends = [ base ghc-prim ]; description = "A very basic descriptive statistics"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "unit" = callPackage @@ -265605,7 +266443,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "Aliases for `()`"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "unit-constraint" = callPackage @@ -265616,7 +266454,7 @@ self: { sha256 = "0nayhjyprph6bg2hhrvd91nmrzz1bixlfib4cxsxpj8n014fhva4"; libraryHaskellDepends = [ base constraints ]; description = "Extremely simple typeclass"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "units" = callPackage @@ -265638,7 +266476,7 @@ self: { units-parser vector-space ]; description = "A domain-specific type system for dimensional analysis"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "units-attoparsec" = callPackage @@ -265653,8 +266491,8 @@ self: { attoparsec base template-haskell text units units-defs ]; description = "Attoparsec parsers for the units package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -265666,7 +266504,7 @@ self: { sha256 = "1g55hnhd9bgqp649jgmq41s5i5j0gfpn3iwqaxvmikwaasyr69ki"; libraryHaskellDepends = [ base template-haskell units ]; description = "Definitions for use with the units package"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "units-parser" = callPackage @@ -265683,7 +266521,7 @@ self: { template-haskell ]; description = "A parser for units of measure"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "unittyped" = callPackage @@ -265695,8 +266533,8 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "An extendable library for type-safe computations including units"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -265719,7 +266557,7 @@ self: { ansi-terminal ansi-wl-pprint base mtl optparse-applicative semigroups split text ]; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "unitym" = callPackage @@ -265730,7 +266568,7 @@ self: { sha256 = "16rvv72ya9dp5x0lr6n4kbslgqds87x3fbf9v5rsylx0dgig48js"; libraryHaskellDepends = [ base text transformers ]; description = "A monad type class shared between web services"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "unitym-servant" = callPackage @@ -265745,7 +266583,7 @@ self: { base mtl servant-server text transformers unitym ]; description = "Implementaation of unitym for Servant servers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "unitym-yesod" = callPackage @@ -265756,8 +266594,8 @@ self: { sha256 = "1qg0iqww3yq5kzy6x9fc3p64vcsa53ricagnknzwhhjirh9yy3yw"; libraryHaskellDepends = [ base unitym yesod ]; description = "Implementation of the unity monad for the Yesod framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -265777,7 +266615,7 @@ self: { testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; benchmarkHaskellDepends = [ base criterion ]; description = "Universal"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "universal-binary" = callPackage @@ -265789,8 +266627,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base binary bytestring ]; description = "Parser for OS X Universal Binary format"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -265800,15 +266638,15 @@ self: { }: mkDerivation { pname = "universe"; - version = "1.2"; - sha256 = "0l8g583pgbklxgv7fjb1bdhf1a09wmj8fc59siknqwlankln84qs"; + version = "1.2.1"; + sha256 = "1v9lgxkfly2570i8x66sjz8nk58a71y3jwlqdc3wi2jmh773y6hi"; libraryHaskellDepends = [ universe-base universe-instances-extended universe-reverse-instances universe-some ]; description = "A class for finite and recursively enumerable types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -265817,33 +266655,23 @@ self: { }: mkDerivation { pname = "universe-base"; - version = "1.1.1"; - sha256 = "1a6yyvrzkz7jnjz4lyp8aw0r5hci1nx8c06v3dicgfqs3frk1v8x"; - revision = "2"; - editedCabalFile = "0601hqv5h2274i11j1ai2yqb7zk2fkqkiqlpwnq5awbgdkwb10i8"; + version = "1.1.2"; + sha256 = "1jja1yqfqdnpc0982haccpqz9zb3p50ydyv89hcg9pjr3cr1is4r"; libraryHaskellDepends = [ base containers tagged transformers ]; testHaskellDepends = [ base containers QuickCheck ]; description = "A class for finite and recursively enumerable types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + license = lib.licenses.bsd3; }) {}; "universe-dependent-sum" = callPackage - ({ mkDerivation, base, dependent-sum, some, universe-base - , universe-some - }: + ({ mkDerivation, base, universe-some }: mkDerivation { pname = "universe-dependent-sum"; - version = "1.2.0.1"; - sha256 = "0002wc68z803jys90s7sdh5nzdx1dk2jl49d19sjylk1cf18n5fi"; - libraryHaskellDepends = [ - base dependent-sum some universe-base universe-some - ]; + version = "1.3"; + sha256 = "0fwqx4fzs9s09fwrf715simqb0vxnx3z7q35zbv9mkj1m6nbrsk5"; + libraryHaskellDepends = [ base universe-some ]; description = "Universe instances for types from dependent-sum"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + license = lib.licenses.bsd3; }) {}; "universe-instances-base" = callPackage @@ -265852,31 +266680,29 @@ self: { pname = "universe-instances-base"; version = "1.1"; sha256 = "17g4xf7zcxd9a2am0p401b0l87ynxwpm3c2lqc4vmw4sz071kccb"; - revision = "1"; - editedCabalFile = "0hjrjjl6v5q9f7cmxhrdxfdk1l86im0b8anxkpgrry7s8q998979"; + revision = "2"; + editedCabalFile = "03g5vpmmymfjx4p1l2v275vn2dknb7m91wmh01aw8f26224f7sjw"; libraryHaskellDepends = [ base universe-base ]; description = "Universe instances for types from the base package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; "universe-instances-extended" = callPackage ({ mkDerivation, adjunctions, base, comonad, containers - , contravariant, universe-base + , universe-base }: mkDerivation { pname = "universe-instances-extended"; - version = "1.1.1"; - sha256 = "1ppklq2rjcryld9d9kdzz55vfllfpxxgsvvkhpd1jrvhyj51yahh"; - revision = "1"; - editedCabalFile = "0g3qpvgw304yml1n9ly78qrsrrw53f6zpkciyk1xc0nmlm0dkwih"; + version = "1.1.2"; + sha256 = "1yg3cacr56kk0r8vnqxa9cm1awb727qkysnhc7rn4h9pfb10a7sn"; libraryHaskellDepends = [ - adjunctions base comonad containers contravariant universe-base + adjunctions base comonad containers universe-base ]; description = "Universe instances for types from selected extra packages"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -265886,12 +266712,12 @@ self: { pname = "universe-instances-trans"; version = "1.1"; sha256 = "0dp37rb61g5mqj4kfkgi6zxcjhrm9npz197sksqwg1skgjdgbbn6"; - revision = "1"; - editedCabalFile = "0pyqcg8mfw6gg7gxxd46xq3hnhcpd39g7jb9q1awcdipzq7xjrh2"; + revision = "2"; + editedCabalFile = "0fyhcfkriq4zcvqrr33x5ywxxmpyjjy0bz78pq2x38vpgqagiz4p"; libraryHaskellDepends = [ base universe-base ]; description = "Universe instances for types from the transformers and mtl packages"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -265899,14 +266725,12 @@ self: { ({ mkDerivation, base, containers, universe-base }: mkDerivation { pname = "universe-reverse-instances"; - version = "1.1"; - sha256 = "0pdmv146ap0dh38mxhjf11jx3fbr9im7mc0zxb3bsnwpfrv1kfqd"; - revision = "3"; - editedCabalFile = "1zkpcipbzhxricr94pkhn4cqmjcnsxx301kxarx798qr9il37qzw"; + version = "1.1.1"; + sha256 = "0wzvrnccj9hq1x55vy7a8xzppgf0zmbnlm3yz02qx3dglq97w4n4"; libraryHaskellDepends = [ base containers universe-base ]; description = "Instances of standard classes that are made possible by enumerations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -265916,19 +266740,15 @@ self: { }: mkDerivation { pname = "universe-some"; - version = "1.2"; - sha256 = "1c9pdk682xdzscq77c006x052c9jizpgja3xk0ym8n421h0k8zlh"; - revision = "2"; - editedCabalFile = "1m02p2lrk46a26s8ghvls3airdassdf6yy2i2arn4vm1ndzqywy2"; + version = "1.2.1"; + sha256 = "0pdvk5qi39d0wg8ac936c1fxs7v7qld2ggpqc9v7xc4pk3xq24bp"; libraryHaskellDepends = [ base some template-haskell th-abstraction transformers universe-base ]; testHaskellDepends = [ base some template-haskell universe-base ]; description = "Universe instances for Some from some"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + license = lib.licenses.bsd3; }) {}; "universe-th" = callPackage @@ -265950,8 +266770,8 @@ self: { test-framework-quickcheck2 th-instances tuple uniplate ]; description = "Construct a Dec's ancestor list"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -265963,34 +266783,8 @@ self: { }: mkDerivation { pname = "universum"; - version = "1.5.0"; - sha256 = "17rzi17k2wj3p6dzd0dggzgyhh0c2mma4znkci1hqcihwr6rrljk"; - 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 unordered-containers - ]; - description = "Custom prelude used in Serokell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "universum_1_7_1" = 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.7.1"; - sha256 = "0jsdzhy0h5d6znnrdgzr29b6qkriidck5s6yp52pci30rfv1d29z"; + version = "1.7.2"; + sha256 = "1ka7q5vr9xkf8z5mzpkp648mpf8az7b14lnhbvfakg3v5xy3f7gb"; libraryHaskellDepends = [ base bytestring containers deepseq ghc-prim hashable microlens microlens-mtl mtl safe-exceptions stm text transformers @@ -266003,8 +266797,7 @@ self: { base containers gauge text unordered-containers ]; description = "Custom prelude used in Serokell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; }) {}; "unix_2_7_2_2" = callPackage @@ -266013,12 +266806,12 @@ self: { pname = "unix"; version = "2.7.2.2"; sha256 = "1b6ygkasn5bvmdci8g3zjkahl34kfqhf5jrayibvnrcdnaqlxpcq"; - revision = "5"; - editedCabalFile = "1hfpipkxmkr0fgjz1i4mm0ah1s7bgb28yb8sjn32rafj4lzszn2m"; + revision = "6"; + editedCabalFile = "1wjy6cr4ls9gaisbq97knkw4rzk7aavcwvl4szx1vs7dbrfzrf6x"; libraryHaskellDepends = [ base bytestring time ]; description = "POSIX functionality"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "unix-bytestring" = callPackage @@ -266029,20 +266822,18 @@ self: { sha256 = "1340zxy9w8nmmhhwgg9rznvz8iyfhinpycdpkryqp60ilhyjgv53"; libraryHaskellDepends = [ base bytestring ]; description = "Unix/Posix-specific functions for ByteStrings"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "unix-compat" = callPackage ({ mkDerivation, base, unix }: mkDerivation { pname = "unix-compat"; - version = "0.5.2"; - sha256 = "1a8brv9fax76b1fymslzyghwa6ma8yijiyyhn12msl3i5x24x6k5"; - revision = "1"; - editedCabalFile = "1yx38asvjaxxlfs8lpbq0dwd84ynhgi7hw91rn32i1hsmz7yn22m"; + version = "0.5.3"; + sha256 = "1j75i3dj489rz60ij3nfza774mb7mw33amhdkm10dd0dxabvb4q8"; libraryHaskellDepends = [ base unix ]; description = "Portable POSIX-compatibility layer"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "unix-fcntl" = callPackage @@ -266055,8 +266846,8 @@ self: { isExecutable = true; libraryHaskellDepends = [ base foreign-var ]; description = "Comprehensive bindings to fcntl(2)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -266068,8 +266859,8 @@ self: { sha256 = "07ysmd9ks5lm2lg1dik75m509ryn5azw28j9hcisknf5bmrfy9li"; libraryHaskellDepends = [ base unix ]; description = "POSIX operations on Handles"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -266081,7 +266872,7 @@ self: { sha256 = "1qy28y1apm2dxp47v0ngxj4ww3iyq4lj0n0i4z9phyr1122fglig"; libraryHaskellDepends = [ base ]; description = "Support for writev, pwrite and pread"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "unix-memory" = callPackage @@ -266098,7 +266889,7 @@ self: { base mtl QuickCheck tasty tasty-hunit tasty-quickcheck unix ]; description = "Unix memory syscalls"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "unix-process-conduit" = callPackage @@ -266119,8 +266910,8 @@ self: { base bytestring conduit hspec transformers unix ]; description = "Run processes on Unix systems, with a conduit interface (deprecated)"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -266132,7 +266923,7 @@ self: { sha256 = "1n21cd6chih86g6kfl6b0x4k533ykzz93anhf6wga3033rvy09wj"; libraryHaskellDepends = [ base unix ]; description = "POSIX pseudo-terminal support"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "unix-time" = callPackage @@ -266149,7 +266940,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Unix time parser/formatter and utilities"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "unjson" = callPackage @@ -266174,7 +266965,7 @@ self: { unordered-containers vector ]; description = "Bidirectional JSON parsing and generation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "unlambda" = callPackage @@ -266199,8 +266990,8 @@ self: { sha256 = "06ygxv8c1435rn9yrg27l1zsihzh4argqn677g0qrigw6wcvn0gg"; libraryHaskellDepends = [ base ghc-prim semigroups ]; description = "GHC Haskell lists of non-thunks (things of kind TYPE 'UnliftedRep)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -266211,8 +267002,8 @@ self: { }: mkDerivation { pname = "unliftio"; - version = "0.2.13.1"; - sha256 = "08q00kqg934y9cpj18kcgzcw3a2wgs6kjvgldgvr2a3vndwn95m0"; + version = "0.2.14"; + sha256 = "0gwifnzfcpjhzch06vkx1jkl7jf6j844grd4frl7w513bipb7w0r"; libraryHaskellDepends = [ async base bytestring deepseq directory filepath process stm time transformers unix unliftio-core @@ -266226,7 +267017,7 @@ self: { time transformers unix unliftio-core ]; description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "unliftio-core" = callPackage @@ -266239,7 +267030,39 @@ self: { editedCabalFile = "16k5fxlm9xpbd0ca861nmhb1j2ahyid02m1vbg1vzb5ckbm48glv"; libraryHaskellDepends = [ base transformers ]; description = "The MonadUnliftIO typeclass for unlifting monads to IO"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; + }) {}; + + "unliftio-messagebox" = callPackage + ({ mkDerivation, atomic-primops, base, containers, criterion + , data-default, hashable, HUnit, mtl, QuickCheck, tasty, tasty-html + , tasty-hunit, tasty-quickcheck, text, unagi-chan, unliftio + }: + mkDerivation { + pname = "unliftio-messagebox"; + version = "1.0.2"; + sha256 = "0pl75f3wbcy31b4firqw0y2mdl3axjdwx0w1vckidprv8sncsrm7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + atomic-primops base containers data-default hashable mtl QuickCheck + text unagi-chan unliftio + ]; + executableHaskellDepends = [ + atomic-primops base containers data-default hashable mtl QuickCheck + text unagi-chan unliftio + ]; + testHaskellDepends = [ + atomic-primops base containers data-default hashable HUnit mtl + QuickCheck tasty tasty-html tasty-hunit tasty-quickcheck text + unagi-chan unliftio + ]; + benchmarkHaskellDepends = [ + atomic-primops base containers criterion data-default hashable mtl + QuickCheck text unagi-chan unliftio + ]; + description = "Fast and robust message queues for concurrent processes"; + license = lib.licenses.bsd2; }) {}; "unliftio-path" = callPackage @@ -266250,7 +267073,7 @@ self: { sha256 = "1ila58yyk2vfshaz6d5kp4vdcgjrlnwnqnrjm949qlcv36srvzg9"; libraryHaskellDepends = [ base exceptions path time unliftio ]; description = "UnliftIO using well-typed Paths"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "unliftio-pool" = callPackage @@ -266265,7 +267088,7 @@ self: { base resource-pool time transformers unliftio-core ]; description = "Data.Pool generalized to MonadUnliftIO."; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "unliftio-streams" = callPackage @@ -266279,8 +267102,8 @@ self: { base bytestring io-streams text unliftio-core ]; description = "Generalization of io-streams to MonadUnliftIO"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -266295,7 +267118,7 @@ self: { libraryHaskellDepends = [ base directory text ]; executableHaskellDepends = [ base directory text ]; description = "Tool to convert literate code between styles or to code"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "unm-hip" = callPackage @@ -266311,7 +267134,7 @@ self: { ]; description = "A Library for the manipulation of images"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -266325,7 +267148,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base storable-endian utility-ht ]; description = "Extract useful information from Amiga MED files"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "unordered-containers" = callPackage @@ -266347,7 +267170,7 @@ self: { random ]; description = "Efficient hashing-based container types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "unordered-containers-rematch" = callPackage @@ -266365,8 +267188,8 @@ self: { base hashable hspec HUnit rematch unordered-containers ]; description = "Rematch support for unordered containers"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -266382,8 +267205,8 @@ self: { base deepseq dlist hashable unordered-containers ]; description = "Graph library using unordered-containers"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -266400,8 +267223,8 @@ self: { base containers deepseq primitive QuickCheck tasty tasty-quickcheck ]; description = "A specialization of `HashMap Int v`"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -266417,8 +267240,8 @@ self: { base bytestring primitive template-haskell transformers vector ]; description = "Monad transformers that mirror worker-wrapper transformations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -266436,7 +267259,7 @@ self: { executableHaskellDepends = [ base ]; doHaddock = false; description = "Unpacked containers via backpack"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }) {}; "unpacked-either" = callPackage @@ -266448,8 +267271,8 @@ self: { libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base QuickCheck quickcheck-classes ]; description = "An unpacked either data type"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -266462,8 +267285,8 @@ self: { libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base QuickCheck quickcheck-classes ]; description = "An unpacked maybe data type"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -266478,8 +267301,8 @@ self: { libraryHaskellDepends = [ base primitive wide-word ]; testHaskellDepends = [ base QuickCheck quickcheck-classes ]; description = "maybes of numeric values with fewer indirections"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -266491,7 +267314,7 @@ self: { sha256 = "10mc9kjjqf82ddi586g5r6h065znhj9s0ih9w800yw4xl65ygayv"; libraryHaskellDepends = [ base bytestring text-short ]; description = "optional text that unpacks well"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "unpacked-these" = callPackage @@ -266507,8 +267330,8 @@ self: { ]; testHaskellDepends = [ base QuickCheck quickcheck-classes ]; description = "An unpacked these data type"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -266525,8 +267348,8 @@ self: { ]; testHaskellDepends = [ base QuickCheck quickcheck-classes ]; description = "An unpacked validation data type"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -266547,8 +267370,8 @@ self: { scientific text unordered-containers vector ]; description = "An attoparsec roundtrip"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -266560,8 +267383,8 @@ self: { sha256 = "0n05777fqqpbgnh9jab04ayw1j1as4wkkbrjixi1288fhi44m87p"; libraryHaskellDepends = [ base ghc ]; description = "Compiler plugin for loop unrolling"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -266574,7 +267397,7 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base ]; description = "Unified interface to unsafe functions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "unsafe-promises" = callPackage @@ -266585,7 +267408,7 @@ self: { sha256 = "1018c3q0aq6l0011az661dvlibiv6jvwdv4c40bi8pwapri66k70"; libraryHaskellDepends = [ base threads ]; description = "Create pure futures using lazy IO"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "unsafely" = callPackage @@ -266598,8 +267421,8 @@ self: { isExecutable = true; libraryHaskellDepends = [ base ]; description = "Flexible access control for unsafe operations and instances"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -266612,7 +267435,7 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base ]; description = "Like unsafeperformIO, but for the ST monad"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "unscramble" = callPackage @@ -266630,8 +267453,8 @@ self: { array base optparse-applicative stream-fusion unordered-containers ]; description = "Solve Boggle-like word games"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -266650,8 +267473,8 @@ self: { tasty tasty-hunit tasty-quickcheck tasty-smallcheck ]; description = "An extension removing the sequentiality from monads"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -266665,7 +267488,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base ]; description = "Utility construction of the graph depending unusable packages"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "unused" = callPackage @@ -266693,8 +267516,8 @@ self: { ]; testHaskellDepends = [ base containers hspec text ]; description = "A command line tool to identify unused code"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -266706,7 +267529,7 @@ self: { sha256 = "08q1zvc61gh2l8212xb2p4nvjx7p0qaw1q69085xzgg3hn5rwig2"; libraryHaskellDepends = [ base ]; description = "Unwrapping sums/products lifted to functors"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "uom-plugin" = callPackage @@ -266724,8 +267547,8 @@ self: { ]; testHaskellDepends = [ base hlint tasty tasty-hunit ]; description = "Units of measure as a GHC typechecker plugin"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -266743,8 +267566,8 @@ self: { base directory filepath lambda-options mtl split ]; description = "Command-line tool to generate paths for moving upward in a file system"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -266759,7 +267582,7 @@ self: { executableHaskellDepends = [ base ports-tools process ]; description = "Software management tool"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "update-monad" = callPackage @@ -266769,7 +267592,7 @@ self: { version = "0.1.0.0"; sha256 = "0l6gbfw0rmhkk2iq3wd2zzyld2nvjmbrlg7rqqv962cahs5mydns"; libraryHaskellDepends = [ base mtl ]; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "update-nix-fetchgit" = callPackage @@ -266799,8 +267622,8 @@ self: { ]; testToolDepends = [ tasty-discover ]; description = "A program to update fetchgit values in Nix expressions"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ sorki ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ sorki ]; }) {}; "update-repos" = callPackage @@ -266822,7 +267645,7 @@ self: { ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "Update all your git repositories with just one command"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "uploadcare" = callPackage @@ -266838,8 +267661,8 @@ self: { http-types old-locale time ]; description = "Haskell client for Uploadcare"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -266851,7 +267674,7 @@ self: { sha256 = "17hi7ibasy0lhvzhv52k0dynvhxlsmywliymyygwk1jv740z1bdz"; libraryHaskellDepends = [ base ]; description = "Upload test"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "upskirt" = callPackage @@ -266862,8 +267685,8 @@ self: { sha256 = "0528345xiq2xmi9fwzv0rvbjqfhcvyhkik8c453yr2nr03k0zs4c"; libraryHaskellDepends = [ base bytestring ]; description = "Binding to upskirt"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -266880,8 +267703,8 @@ self: { req req-conduit text uuid ]; description = "Talk to Urbit from Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -266898,8 +267721,8 @@ self: { req req-conduit text uuid ]; description = "Talk to Urbit from Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -266915,7 +267738,7 @@ self: { testHaskellDepends = [ base hspec hspec-core QuickCheck text ]; benchmarkHaskellDepends = [ base criterion deepseq ]; description = "Hoon-style atom manipulation and printing functions"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "ureader" = callPackage @@ -266938,8 +267761,8 @@ self: { tagsoup terminal-size text time xml ]; description = "Minimalistic CLI RSS reader"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -266960,8 +267783,8 @@ self: { mime-types mtl optparse-applicative process syb text ]; description = "Ur/Web static content generator"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -266973,8 +267796,8 @@ self: { sha256 = "0gfv54ys1h4ac3dhaypnpnm4w781857n2k8680jflnjbkqlandrr"; libraryHaskellDepends = [ base parsec safe utf8-string ]; description = "Library for working with URIs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -267003,7 +267826,7 @@ self: { network-uri ]; description = "Haskell URI parsing as ByteStrings"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "uri-bytestring-aeson" = callPackage @@ -267016,7 +267839,7 @@ self: { aeson base bytestring text uri-bytestring ]; description = "Aeson instances for URI Bytestring"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "uri-conduit" = callPackage @@ -267033,8 +267856,8 @@ self: { network system-fileio system-filepath text transformers ]; description = "Read and write URIs (deprecated)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -267051,7 +267874,7 @@ self: { base bytestring network-uri text utf8-string ]; description = "Unicode aware uri-encoding"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "uri-encoder" = callPackage @@ -267070,8 +267893,8 @@ self: { base bytestring criterion network-uri ]; description = "A uri encoder to make your strings less readable"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -267088,8 +267911,8 @@ self: { transformers ]; description = "Read and write URIs (deprecated)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -267108,8 +267931,8 @@ self: { uri-enumerator ]; description = "uri-enumerator backend for the file scheme (deprecated)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -267126,8 +267949,8 @@ self: { ]; testHaskellDepends = [ base data-default hspec lens ]; description = "A simple library for parsing and generating URIs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -267142,8 +267965,8 @@ self: { libraryHaskellDepends = [ base containers utf8-string ]; executableHaskellDepends = [ base ]; description = "URI template library for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -267167,8 +267990,8 @@ self: { ansi-wl-pprint base HUnit mtl template-haskell ]; description = "Parsing & Quasiquoting for RFC 6570 URI Templates"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -267180,7 +268003,7 @@ self: { sha256 = "0qag18wbrq9jjk1444mjigz1xl7xl03fz66b1lnya9qaihzpxwjs"; libraryHaskellDepends = [ base utf8-string ]; description = "A library for working with URLs"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "url-bytes" = callPackage @@ -267203,8 +268026,8 @@ self: { weigh ]; description = "Memory efficient url type and parser"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -267227,8 +268050,8 @@ self: { ]; benchmarkHaskellDepends = [ criterion http-types rerebase ]; description = "Decoders for URL-encoding (aka Percent-encoding)"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -267242,8 +268065,8 @@ self: { editedCabalFile = "1fbgzz9yhqc5lx15n551r190g2a6f1plf3clpar76fj3wqn6x4nr"; libraryHaskellDepends = [ base mtl syb ]; description = "Parse/format generic key/value URLs from record data types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -267261,8 +268084,8 @@ self: { base bytestring containers mtl network old-time ]; description = "Parallel link checker"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -267276,8 +268099,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base network ]; description = "Decode percent-encoded strings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -267289,8 +268112,8 @@ self: { sha256 = "1kg25w5pnmsnjwycnf0q6d65cqfw5d0xn9rwyn4ybhh3a8q2yaa8"; libraryHaskellDepends = [ base bytestring happstack-server mtl ]; description = "Simple, declarative, expressive URL routing -- on happstack"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -267306,8 +268129,8 @@ self: { libraryHaskellDepends = [ base mtl network network-uri split ]; testHaskellDepends = [ base network network-uri QuickCheck ]; description = "Generate or process x-www-urlencoded data"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -267327,8 +268150,8 @@ self: { split strict text transformers transformers-base vector ]; description = "Painfully simple URL deployment"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -267341,8 +268164,8 @@ self: { libraryHaskellDepends = [ base parsec ]; testHaskellDepends = [ base hspec ]; description = "Universal Resource Names"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -267359,8 +268182,8 @@ self: { template-haskell transformers ]; description = "A package for updatable discrete distributions"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -267378,8 +268201,8 @@ self: { base filepath mtl optparse-applicative parsec process syb ]; description = "XML parser-printer supporting Ur/Web syntax extensions"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -267391,7 +268214,7 @@ self: { sha256 = "16zlg48pa254bwn7kimd9mn78q0mlczhj683nhxbdd5l7yqrgkm6"; libraryHaskellDepends = [ base time ]; testHaskellDepends = [ base doctest doctest-discover hspec time ]; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "usb" = callPackage @@ -267406,8 +268229,8 @@ self: { base bindings-libusb bytestring containers ghc-prim text vector ]; description = "Communicate with USB devices"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -267424,8 +268247,8 @@ self: { transformers usb ]; description = "Iteratee enumerators for the usb package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -267439,8 +268262,8 @@ self: { editedCabalFile = "1p780v435frqi04gc8db1jj1ra9c98jpdwmy4p274azp0gi51q9z"; libraryHaskellDepends = [ attoparsec base bytestring usb ]; description = "Parser and request Library for USB HIDs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -267460,8 +268283,8 @@ self: { containers-unicode-symbols parsimony ]; description = "A database of USB identifiers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -267478,8 +268301,8 @@ self: { usb vector ]; description = "Iteratee enumerators for the usb package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -267496,8 +268319,8 @@ self: { regions text transformers usb ]; description = "Type-safe communication with USB devices"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -267512,7 +268335,7 @@ self: { libraryHaskellDepends = [ base random-fu text ]; executableHaskellDepends = [ base random-fu text ]; description = "A collection of user agents"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "userid" = callPackage @@ -267521,14 +268344,14 @@ self: { }: mkDerivation { pname = "userid"; - version = "0.1.3.5"; - sha256 = "0lk3a07sh7i5hh3b5d2734iw3qwz0q4dnf4b6j9br69vi35k64cw"; + version = "0.1.3.6"; + sha256 = "02alsm7h42hjymmr2xn2cf9ks6sph6arccirpndbndyvbgrds7nn"; libraryHaskellDepends = [ aeson base boomerang cereal safecopy web-routes web-routes-th ]; description = "The UserId type and useful instances for web development"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -267544,7 +268367,7 @@ self: { aeson base bcrypt path-pieces text time ]; description = "A library simplifying user management for web applications"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "users-mysql-haskell" = callPackage @@ -267563,8 +268386,8 @@ self: { time transformers users uuid ]; description = "A mysql-haskell backend for the users library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -267585,8 +268408,8 @@ self: { base hspec monad-logger persistent-sqlite temporary text users-test ]; description = "A persistent backend for the users package"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -267603,7 +268426,7 @@ self: { ]; testHaskellDepends = [ base hspec postgresql-simple users-test ]; description = "A PostgreSQL backend for the users package"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "users-test" = callPackage @@ -267614,7 +268437,7 @@ self: { sha256 = "0gmcbimbp8sj282c915m9bka4fj238xsf8szqmnv20n01kx4k1gn"; libraryHaskellDepends = [ base hspec text users ]; description = "Library to test backends for the users library"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "utc" = callPackage @@ -267634,7 +268457,7 @@ self: { test-framework test-framework-quickcheck2 text ]; description = "A pragmatic time and date library"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "utf" = callPackage @@ -267647,8 +268470,8 @@ self: { testHaskellDepends = [ base ]; benchmarkHaskellDepends = [ base gauge ]; description = "UTF-8"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -267667,7 +268490,7 @@ self: { base bytestring charsetdetect-ae hspec text text-short utf8-string ]; description = "A string conversion library that assumes utf8"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "utf8-env" = callPackage @@ -267678,7 +268501,7 @@ self: { sha256 = "0ls2ls2n12igm1day730sp1gfcwxvkkqd2xdp2lmyp2ldp0d72zp"; libraryHaskellDepends = [ base mtl utf8-string ]; description = "UTF-8 aware substitutes for functions in System.Environment"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "utf8-light" = callPackage @@ -267689,7 +268512,7 @@ self: { sha256 = "0rwyc5z331yfnm4hpx0sph6i1zvkd1z10vvglhnp0vc9wy644k0q"; libraryHaskellDepends = [ base bytestring ghc-prim ]; description = "Unicode"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "utf8-prelude" = callPackage @@ -267703,8 +268526,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base utf8-string ]; description = "Variants of Prelude and System.IO with UTF8 text I/O operations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -267717,7 +268540,7 @@ self: { libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base HUnit ]; description = "Support for reading and writing UTF8 Strings"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "utf8-validator" = callPackage @@ -267734,8 +268557,8 @@ self: { ]; benchmarkHaskellDepends = [ base criterion ]; description = "Constant-space UTF8 validator for ByteStrings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -267749,7 +268572,7 @@ self: { editedCabalFile = "16hbcmcq2674j37gl808n5i02kv0vn3nwq5l2a6v5lj0dn34nicb"; libraryHaskellDepends = [ base transformers ]; description = "Utilities"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "util-exception" = callPackage @@ -267762,8 +268585,8 @@ self: { editedCabalFile = "1h5s7qkdgfifw35dg7wzsr42q1dcficrjvw9b1qhff00m7avdam0"; libraryHaskellDepends = [ base basic control lifted-base-tf util ]; description = "Exceptional utilities"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -267777,8 +268600,8 @@ self: { testHaskellDepends = [ base logict ]; benchmarkHaskellDepends = [ base gauge logict ]; description = "See README for more info"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -267795,8 +268618,8 @@ self: { ]; testHaskellDepends = [ base containers HTF QuickCheck ]; description = "A collection of commonly used utils"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -267810,8 +268633,8 @@ self: { editedCabalFile = "0wlgp8cq7gg585x041djxprm6a3kih1dkx2fbpg6bwi850ihglir"; libraryHaskellDepends = [ base primitive ]; description = "Primitive memory-related utilities"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -267828,8 +268651,8 @@ self: { libraryHaskellDepends = [ base control primitive util ]; testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; description = "Utilities for stateful primitive types and types based on them"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -267848,8 +268671,8 @@ self: { ]; testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; description = "Utilities for universal types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -267862,7 +268685,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck ]; description = "Various small helper functions for Lists, Maybes, Tuples, Functions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "uu-cco" = callPackage @@ -267873,8 +268696,8 @@ self: { sha256 = "008ckslrc60959k6l6mvk8dixr6vmfmiir6qj8wakgixcyd6ar6d"; libraryHaskellDepends = [ ansi-terminal base ]; description = "Utilities for compiler construction: core functionality"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -267888,8 +268711,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base uu-cco uuagc uuagc-cabal ]; description = "Utilities for compiler construction: example programs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -267901,8 +268724,8 @@ self: { sha256 = "06ddh2fcvy0zbzzdgpcx8kvlssrcmxx4swgkl8iy7223llanx0px"; libraryHaskellDepends = [ base uu-cco uulib ]; description = "Utilities for compiler construction: Feedback wrapper around parser in uulib"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -267914,8 +268737,8 @@ self: { sha256 = "1sshnlqb0ydxgrhm0i1c3mpnixfsqwrf3gl59yz4rhiw5hy33z71"; libraryHaskellDepends = [ base ListLike uu-cco uu-parsinglib ]; description = "Utilities for compiler construction: Feedback wrapper around parser in uu-parsinglib"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -267929,7 +268752,7 @@ self: { editedCabalFile = "1wzc2aacqh1ndyk2dawzqbig7m0khdb05q9pzplhhfhfrbgn4pjr"; libraryHaskellDepends = [ base ]; description = "An interleaving combinator for use with applicative style implementations"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "uu-options" = callPackage @@ -267947,7 +268770,7 @@ self: { uu-parsinglib ]; description = "Parse command line options using uu-interleave and uu-parsinglib"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "uu-parsinglib" = callPackage @@ -267958,7 +268781,7 @@ self: { sha256 = "0v5vcxfix04hmwc7ajni4xrv0g099pr2j79bqx1n24s1cvimlpyj"; libraryHaskellDepends = [ base ListLike time uu-interleaved ]; description = "Fast, online, error-correcting, monadic, applicative, merging, permuting, interleaving, idiomatic parser combinators"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "uu-tc" = callPackage @@ -267971,7 +268794,7 @@ self: { editedCabalFile = "1jz4w3fnhaz631yrlxrxj1vfl0i0vby038v70hmwhsg10wz7w764"; libraryHaskellDepends = [ base ]; description = "Haskell 98 parser combinators for INFOB3TC at Utrecht University"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "uuagc" = callPackage @@ -267991,7 +268814,7 @@ self: { ]; executableHaskellDepends = [ base uuagc-cabal ]; description = "Attribute Grammar System of Universiteit Utrecht"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "uuagc-bootstrap" = callPackage @@ -268013,8 +268836,8 @@ self: { mtl uulib ]; description = "Attribute Grammar System of Universiteit Utrecht"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -268030,7 +268853,7 @@ self: { base Cabal containers directory filepath mtl process uulib ]; description = "Cabal plugin for UUAGC"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "uuagc-diagrams" = callPackage @@ -268041,8 +268864,8 @@ self: { sha256 = "0x4dhbzl5xvs3mrg7256hg673nbr4k6kjszyavjs61klcq58asm7"; libraryHaskellDepends = [ base diagrams-lib SVGFonts ]; description = "Utility for drawing attribute grammar pictures with the diagrams package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -268059,7 +268882,7 @@ self: { executableHaskellDepends = [ base process ]; description = "A debugger for the UUAG system"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "uuid" = callPackage @@ -268086,7 +268909,7 @@ self: { base criterion mersenne-random-pure64 random ]; description = "For creating, comparing, parsing and printing Universally Unique Identifiers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "uuid-aeson" = callPackage @@ -268099,8 +268922,8 @@ self: { editedCabalFile = "056ql7mx42rswj5zphazl1h5mmvd84v8xnlwyln2jx7l7rb5rrjz"; libraryHaskellDepends = [ aeson base text uuid ]; description = "Aeson types for UUID instances"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -268121,8 +268944,8 @@ self: { wide-word ]; description = "UUID parsing using byteverse packages"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -268141,8 +268964,8 @@ self: { exceptions uuid ]; description = "Reversable and secure encoding of object ids as uuids"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -268154,7 +268977,7 @@ self: { sha256 = "1gfm7bxmr2b5hn4x3dr231ra0b1nwp36x2808w3l43yglz8zwp74"; libraryHaskellDepends = [ base bytestring uuid ]; description = "Universally Unique Identifiers with little-endian-ish encoding tools"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "uuid-orphans" = callPackage @@ -268169,7 +268992,7 @@ self: { base safecopy text th-lift uuid-types web-routes ]; description = "Orphan instances for the UUID datatype"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "uuid-quasi" = callPackage @@ -268180,7 +269003,7 @@ self: { sha256 = "09ijnbj2znaqanaxghql3yy1fqb0nsjhrwi6kfzg4h8nrw1ir2pj"; libraryHaskellDepends = [ base template-haskell uuid ]; description = "Supplemental package for 'uuid' allowing quasiquotation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "uuid-types" = callPackage @@ -268204,7 +269027,7 @@ self: { base bytestring containers criterion deepseq random ]; description = "Type definitions for Universally Unique Identifiers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "uulib" = callPackage @@ -268215,7 +269038,7 @@ self: { sha256 = "10j40q1b1fkx0fv56cn0kkilbqhyh6xxya536xlbx365lnc1rk0i"; libraryHaskellDepends = [ base ghc-prim ]; description = "Haskell Utrecht Tools Library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "uusi" = callPackage @@ -268236,7 +269059,7 @@ self: { base Cabal HUnit microlens microlens-th text ]; description = "Tweak dependencies in .cabal files"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "uvector" = callPackage @@ -268249,8 +269072,8 @@ self: { editedCabalFile = "023may02r17xg5wqh0lplcjdfiwaprbqn9p6jgmqs935qf9zz2g2"; libraryHaskellDepends = [ base ghc-prim ]; description = "Fast unboxed arrays with a flexible interface"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -268262,8 +269085,8 @@ self: { sha256 = "0jzlirrar7grq3h02k22zxyvy1wmfrjw9lscnhpjqmsxjli1jh81"; libraryHaskellDepends = [ base uvector ]; description = "Efficient algorithms for uvector unboxed arrays"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -268275,8 +269098,8 @@ self: { sha256 = "0qmp5k4wg5ja2382cwarf8fwjval2a5wdwvz32f965hvwgc9cd43"; libraryHaskellDepends = [ base json MissingH mtl ]; description = "Cross-language extensible representation for algebraic data type instances"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -268288,7 +269111,7 @@ self: { sha256 = "0q6n18kqga839gkdgdwsfbnbpfm4hh1qjln17qnmfxm3ylh2l9la"; libraryHaskellDepends = [ base process ]; description = "Utility function for reading a source of loaded uzbl pages"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "v4l2" = callPackage @@ -268304,8 +269127,8 @@ self: { bindings-posix containers ioctl ]; description = "interface to Video For Linux Two (V4L2)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -268319,8 +269142,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base GLUT v4l2 ]; description = "video for linux two examples"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -268342,8 +269165,8 @@ self: { ]; testHaskellDepends = [ base process ]; description = "the cabal companion"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -268361,8 +269184,8 @@ self: { ]; testHaskellDepends = [ base Cabal containers ]; description = "Core algorithms and datatypes used by vabal"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -268374,8 +269197,8 @@ self: { sha256 = "157wjx2shzfh6dfl6h8x017cn9ji3ql1p0gpi79ginz4s81f2ny1"; libraryHaskellDepends = [ array base containers ghc-prim ]; description = "Graph representation of the GHC heap"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -268392,8 +269215,8 @@ self: { svgcairo vacuum ]; description = "Visualize live Haskell data structures using vacuum, graphviz and cairo"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -268405,8 +269228,8 @@ self: { sha256 = "093ba6n30a6gyifnk3bd50rkx8qldjqq9vsk92pnq152ibs36b2m"; libraryHaskellDepends = [ base filepath graphviz vacuum ]; description = "A library for transforming vacuum graphs into GraphViz output"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -268426,8 +269249,8 @@ self: { process stb-image ]; description = "Visualize live Haskell data structures using vacuum, graphviz and OpenGL"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -268439,8 +269262,8 @@ self: { sha256 = "0zpag42dr2763ddrwdy7744lqkd6207ljfw3bqm6db3a1128861z"; libraryHaskellDepends = [ base containers hubigraph vacuum ]; description = "Visualize Haskell data structures using vacuum and Ubigraph"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -268464,7 +269287,7 @@ self: { attoparsec base directory filepath process QuickCheck text ]; description = "Runs commands on remote machines using ssh"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "valid" = callPackage @@ -268475,7 +269298,7 @@ self: { sha256 = "1c029mb3szixs9rr5i7ri2nm0ya5gv5r6bv8hzsyw90ys5nbgcz5"; libraryHaskellDepends = [ base util ]; description = "Type isomorphic to `Either` with `Applicative` instance which combines errors"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "valid-names" = callPackage @@ -268486,8 +269309,8 @@ self: { sha256 = "14gpkb6pbkvmny17g2gpq6i6kq7ahmcnkgrcrwm72vda12wxsl78"; libraryHaskellDepends = [ base containers MonadRandom ]; description = "Valid operator/module characters"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -268499,7 +269322,7 @@ self: { sha256 = "19d02sblyxg73prlrmlcs4vclzxzg2pzlrp67f2kx94nsw0v3l4p"; doHaddock = false; description = "None"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "validate-input" = callPackage @@ -268518,8 +269341,8 @@ self: { ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "Input validation combinator library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -268539,7 +269362,7 @@ self: { template-haskell ]; description = "Compile-time checking for partial smart-constructors"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "validated-types" = callPackage @@ -268551,8 +269374,8 @@ self: { libraryHaskellDepends = [ base refined text ]; testHaskellDepends = [ base ]; description = "Type-level constraints on strings and other input"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -268571,7 +269394,7 @@ self: { ]; testHaskellDepends = [ base hedgehog HUnit lens semigroups ]; description = "A data-type like Either but with an accumulating Applicative"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "validation-selective" = callPackage @@ -268589,7 +269412,7 @@ self: { base doctest hedgehog hspec hspec-hedgehog selective text ]; description = "Lighweight pure data validation based on Applicative and Selective functors"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "validations" = callPackage @@ -268610,8 +269433,8 @@ self: { transformers ]; description = "A nice way to define field validations in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -268630,7 +269453,7 @@ self: { ]; testHaskellDepends = [ base doctest ]; description = "Straightforward validation monad"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "validators" = callPackage @@ -268642,7 +269465,7 @@ self: { libraryHaskellDepends = [ base containers text ]; testHaskellDepends = [ base containers doctest Glob hspec text ]; description = "Composable validations for your Haskell data types"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "validity" = callPackage @@ -268654,7 +269477,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "Validity typeclass"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "validity-aeson" = callPackage @@ -268671,7 +269494,7 @@ self: { ]; testHaskellDepends = [ aeson base hspec validity ]; description = "Validity instances for aeson"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "validity-bytestring" = callPackage @@ -268682,7 +269505,7 @@ self: { sha256 = "0ck7pn8c8srwdwpcx6x4ihixff07kigq8q9sjkc3zzyf54n93f3x"; libraryHaskellDepends = [ base bytestring validity ]; description = "Validity instances for bytestring"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "validity-containers" = callPackage @@ -268693,7 +269516,7 @@ self: { sha256 = "1qw5p60dr54d2wh49y6x33hbks4d74m8pr5zygblzk0y70warqld"; libraryHaskellDepends = [ base containers validity ]; description = "Validity instances for containers"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "validity-path" = callPackage @@ -268709,7 +269532,7 @@ self: { base filepath genvalidity-hspec hspec path validity ]; description = "Validity instances for Path"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "validity-primitive" = callPackage @@ -268720,7 +269543,7 @@ self: { sha256 = "0r9wy91qr2c8lf6llv9qyirb1vjkq4nb41zqph5ip9gjjj7fzk9y"; libraryHaskellDepends = [ base primitive validity ]; description = "Validity instances for primitive"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "validity-scientific" = callPackage @@ -268731,7 +269554,7 @@ self: { sha256 = "0vqqwlhamykz1vb5gc6krkcq3ixdmkld17c5vsxd0drnjcsllfkp"; libraryHaskellDepends = [ base scientific validity ]; description = "Validity instances for scientific"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "validity-text" = callPackage @@ -268742,7 +269565,7 @@ self: { sha256 = "1sdcivm7mbvi71zkm36g95wrb0y8fzhrnryp01m2wpmhffk1z5cf"; libraryHaskellDepends = [ base bytestring text validity ]; description = "Validity instances for text"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "validity-time" = callPackage @@ -268753,7 +269576,7 @@ self: { sha256 = "02lwa2w84m4mm2lpg5dhg5p0ndba5r152bjm4iy76y2qsfkva0ap"; libraryHaskellDepends = [ base time validity ]; description = "Validity instances for time"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "validity-unordered-containers" = callPackage @@ -268766,7 +269589,7 @@ self: { base hashable unordered-containers validity ]; description = "Validity instances for unordered-containers"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "validity-uuid" = callPackage @@ -268777,7 +269600,7 @@ self: { sha256 = "1m4z9q8m07ssrg6a4lj7501kjnbp9hazg3gyfwrbdbrw7p7jjd9l"; libraryHaskellDepends = [ base uuid validity ]; description = "Validity instances for uuid"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "validity-vector" = callPackage @@ -268788,7 +269611,7 @@ self: { sha256 = "0jbfd3h9k0b4ifaaqqar54r86hm1jiixyxrgs2ln7ni00b0ncv1y"; libraryHaskellDepends = [ base hashable validity vector ]; description = "Validity instances for vector"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "valor" = callPackage @@ -268800,7 +269623,7 @@ self: { libraryHaskellDepends = [ base transformers ]; testHaskellDepends = [ base hspec text transformers ]; description = "Simple general structured validation library"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "value-supply" = callPackage @@ -268811,8 +269634,8 @@ self: { sha256 = "0fd6rk46sgdbdmfdr9wy0f3qzwaymgd9hl9v735g2a4bqiqanmb5"; libraryHaskellDepends = [ base ]; description = "A library for generating values without having to thread state"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -268835,8 +269658,8 @@ self: { optparse-applicative process uniplate ]; description = "Analyze and visualize expression trees"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -268854,8 +269677,8 @@ self: { ]; benchmarkHaskellDepends = [ array base criterion deepseq ]; description = "Mutable variables and tuples"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -268867,7 +269690,7 @@ self: { sha256 = "12l536ca32dhvylp3kizq664lsfysmc5r0hqzs50aqrbx8db40ji"; libraryHaskellDepends = [ base stm ]; description = "The VarMonad typeclass, generalizing types of references"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "varan" = callPackage @@ -268886,7 +269709,7 @@ self: { ]; description = "Process mpileup output to identify significant differences"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -268903,8 +269726,8 @@ self: { type-level-natural-number ]; description = "variable-precision floating point"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -268917,8 +269740,8 @@ self: { libraryHaskellDepends = [ base mtl stm ]; testHaskellDepends = [ base hspec mtl QuickCheck stm ]; description = "Monads with variables, without deep magic"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -268933,8 +269756,8 @@ self: { base cereal containers deepseq semigroupoids ]; description = "nominal value with possible variations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -268959,7 +269782,7 @@ self: { base contravariant criterion time transformers ]; description = "FRP through value streams and monadic splines"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "vault" = callPackage @@ -268974,7 +269797,7 @@ self: { base containers hashable semigroups unordered-containers ]; description = "a persistent store for values of arbitrary types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "vault-tool" = callPackage @@ -268990,7 +269813,7 @@ self: { unordered-containers ]; description = "Client library for HashiCorp's Vault tool (via HTTP API)"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "vault-tool-server" = callPackage @@ -269009,8 +269832,8 @@ self: { aeson base tasty-hunit temporary vault-tool ]; description = "Utility library for spawning a HashiCorp Vault process"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -269027,8 +269850,8 @@ self: { unordered-containers vault-tool ]; description = "A monad transformer for vault-tool"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -269052,8 +269875,8 @@ self: { unordered-containers ]; description = "Common types and instances for Vaultaire"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -269070,8 +269893,8 @@ self: { lmdb random stm transformers ]; description = "semi-transparent persistence for Haskell using LMDB, STM"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -269087,8 +269910,8 @@ self: { array base bytestring bytestring-builder vcache ]; description = "patricia tries modeled above VCache"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -269103,7 +269926,7 @@ self: { ]; description = "A library for parsing/printing vCards from/to various formats"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -269118,8 +269941,8 @@ self: { libraryHaskellDepends = [ base extra shelly system-filepath ]; executableHaskellDepends = [ base shelly text ]; description = "Recursively check that a directory is under version control"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -269131,7 +269954,7 @@ self: { sha256 = "0x0smhllghzn0xjfk5cwxaf1vnd2yp3saxw92ylyws8a546mzhzm"; libraryHaskellDepends = [ base polyparse ]; description = "Reading and writing VCD files"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "vcf" = callPackage @@ -269147,8 +269970,8 @@ self: { attoparsec base bytestring hspec hspec-expectations ]; description = "A package to parse VCF files inspired in similar python libraries"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -269160,7 +269983,7 @@ self: { sha256 = "1lp1wf440n7kinmxz7la0gyfqfdlip6f0bn8pmwkxd1dqyrvg5cg"; libraryHaskellDepends = [ base process ]; description = "Facilities for accessing the version control revision of the current directory"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "vcs-web-hook-parse" = callPackage @@ -269171,7 +269994,7 @@ self: { sha256 = "02lm4czrjwbnfmhybqn80j8xravi37z1a319s23hgxdbxpw970nv"; libraryHaskellDepends = [ aeson base bytestring text ]; description = "Parse development platform web hook messages"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "vcsgui" = callPackage @@ -269195,7 +270018,7 @@ self: { ]; description = "GUI library for source code management systems"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -269220,7 +270043,7 @@ self: { ]; description = "Wrapper for source code management systems"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -269244,7 +270067,7 @@ self: { ]; benchmarkHaskellDepends = [ base criterion fin vector ]; description = "Vec: length-indexed (sized) list"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "vec-lens" = callPackage @@ -269257,7 +270080,7 @@ self: { editedCabalFile = "0grj1abb7gjbzw06672464r75wjnmra9d12yvlmdm1qyj9zya0ph"; libraryHaskellDepends = [ base fin lens vec ]; description = "Vec: length-indexed (sized) list: lens support"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "vec-optics" = callPackage @@ -269270,7 +270093,7 @@ self: { editedCabalFile = "10abn334qhbik8s8lx1r54vcbj3d2s091j2w98mq3cllksa8dmv0"; libraryHaskellDepends = [ base fin optics-core vec ]; description = "Vec: length-indexed (sized) list: optics support"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "vect" = callPackage @@ -269281,7 +270104,7 @@ self: { sha256 = "1049jh8rcxfnyckz5m5asdlyafqszlig96k387raldyfzbrf8f4d"; libraryHaskellDepends = [ base random ]; description = "A low-dimensional linear algebra library, tailored to computer graphics"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "vect-floating" = callPackage @@ -269292,8 +270115,8 @@ self: { sha256 = "1kxsjsiqqpi7k0xz597z7r2fd45s38plgk6jplzxagg0i3bm0q4g"; libraryHaskellDepends = [ base random ]; description = "A low-dimensional linear algebra library, operating on the Floating typeclass"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -269307,8 +270130,8 @@ self: { editedCabalFile = "05k20xd7rcf3hypbbw53bv8yl65sgpdawdfmskypk3mbl1w5fymg"; libraryHaskellDepends = [ accelerate base vect-floating ]; description = "Accelerate instances for vect-floating types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -269320,8 +270143,8 @@ self: { sha256 = "1qp98j6bgldjcs71pd7iqc5sjf1ixb1jj0l267hw532j4yf81dig"; libraryHaskellDepends = [ base OpenGL vect ]; description = "OpenGL support for the `vect' low-dimensional linear algebra library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -269340,7 +270163,26 @@ self: { tasty tasty-hunit tasty-quickcheck template-haskell transformers ]; description = "Efficient Arrays"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; + }) {}; + + "vector_0_12_2_0" = callPackage + ({ mkDerivation, base, base-orphans, deepseq, ghc-prim, HUnit + , primitive, QuickCheck, random, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, transformers + }: + mkDerivation { + pname = "vector"; + version = "0.12.2.0"; + sha256 = "0l3bs8zvw1da9gzqkmavj9vrcxv8hdv9zfw1yqzk6nbqr220paqp"; + libraryHaskellDepends = [ base deepseq ghc-prim primitive ]; + testHaskellDepends = [ + base base-orphans HUnit primitive QuickCheck random tasty + tasty-hunit tasty-quickcheck template-haskell transformers + ]; + description = "Efficient Arrays"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "vector-algorithms" = callPackage @@ -269357,7 +270199,7 @@ self: { ]; benchmarkHaskellDepends = [ base mwc-random vector ]; description = "Efficient algorithms for vector arrays"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "vector-binary" = callPackage @@ -269368,7 +270210,7 @@ self: { sha256 = "1qdjibh3ywfa0lvawdahnr9qhh2qy6899lm5inbzmksjpykgbazz"; libraryHaskellDepends = [ base binary vector ]; description = "Binary instances for vector types (deprecated)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "vector-binary-instances" = callPackage @@ -269387,7 +270229,7 @@ self: { base binary bytestring deepseq gauge vector ]; description = "Instances of Data.Binary for vector"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "vector-buffer" = callPackage @@ -269398,7 +270240,7 @@ self: { sha256 = "16zxc2d25qd15nankhc974ax7q3y72mg5a77v5jsfrw291brnnlv"; libraryHaskellDepends = [ base deepseq vector ]; description = "A buffer compatible with Data.Vector.*"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "vector-builder" = callPackage @@ -269416,7 +270258,7 @@ self: { tasty-hunit tasty-quickcheck ]; description = "Vector builder"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "vector-bytes-instances" = callPackage @@ -269428,7 +270270,7 @@ self: { libraryHaskellDepends = [ base bytes vector ]; testHaskellDepends = [ base bytes tasty tasty-quickcheck vector ]; description = "Serial (from the bytes package) for Vector (from the vector package)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "vector-bytestring" = callPackage @@ -269446,27 +270288,27 @@ self: { ]; testHaskellDepends = [ base directory QuickCheck random ]; description = "ByteStrings as type synonyms of Storable Vectors of Word8s"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; "vector-circular" = callPackage - ({ mkDerivation, base, deepseq, hedgehog, hedgehog-classes + ({ mkDerivation, base, deepseq, doctest, hedgehog, hedgehog-classes , nonempty-vector, primitive, semigroupoids, template-haskell , vector }: mkDerivation { pname = "vector-circular"; - version = "0.1.1"; - sha256 = "08ydvvhzgkci615dnh3r5avzvx0xzibh9l2lys93sbxa139j446c"; + version = "0.1.3"; + sha256 = "0xz2ih8x7a5731bbirhmkl7hyarzijnwgvj8zm9wxs1nky8yjyb7"; libraryHaskellDepends = [ base deepseq nonempty-vector primitive semigroupoids template-haskell vector ]; - testHaskellDepends = [ base hedgehog hedgehog-classes ]; + testHaskellDepends = [ base doctest hedgehog hedgehog-classes ]; description = "circular vectors"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "vector-clock" = callPackage @@ -269485,8 +270327,8 @@ self: { test-framework-hunit test-framework-quickcheck2 ]; description = "Vector clocks for versioning message flows"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -269505,8 +270347,8 @@ self: { test-framework-hunit test-framework-quickcheck2 vector ]; description = "Conduit utilities for vectors"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -269518,7 +270360,7 @@ self: { sha256 = "0z98f0fjn90x3azdbsnjpx61r9lna9hb67bjnmmhvil9a7hpd65x"; libraryHaskellDepends = [ base vector ]; description = "Some special functions to work with Vector (with zip)"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "vector-endian" = callPackage @@ -269532,8 +270374,8 @@ self: { ]; doHaddock = false; description = "Storable vectors with cpu-independent representation"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -269550,7 +270392,7 @@ self: { vector ]; description = "Utilities for the \"vector\" library"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "vector-fft" = callPackage @@ -269561,7 +270403,7 @@ self: { sha256 = "1aygafvsx3wybbp6hqg5ddkawl8m5m6s6dg5hbrlyibz2whrp1fs"; libraryHaskellDepends = [ base primitive vector ]; description = "Native FFT and IFFT for vector"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "vector-fftw" = callPackage @@ -269579,7 +270421,7 @@ self: { base QuickCheck test-framework test-framework-quickcheck2 vector ]; description = "A binding to the fftw library for one-dimensional vectors"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) fftw;}; "vector-functorlazy" = callPackage @@ -269593,8 +270435,8 @@ self: { base ghc-prim primitive vector vector-th-unbox ]; description = "vectors that perform the fmap operation in constant time"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -269606,8 +270448,8 @@ self: { sha256 = "14v0qj2r484pwbjhdymvdqjnsbqszl9wr71hv6wsvs2d8ja1bajl"; libraryHaskellDepends = [ base vector ]; description = "A type-safe library for vectors whose elements can be of any type, or any type satisfying some constraints"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -269623,7 +270465,7 @@ self: { base comonad hashable keys pointed semigroupoids semigroups vector ]; description = "Orphan Instances for 'Data.Vector'"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "vector-instances-collections" = callPackage @@ -269636,8 +270478,8 @@ self: { base collections-api template-haskell vector ]; description = "Instances of the Data.Collections classes for Data.Vector.*"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -269652,7 +270494,7 @@ self: { libraryHaskellDepends = [ base mmap primitive vector ]; testHaskellDepends = [ base QuickCheck temporary vector ]; description = "Memory map immutable and mutable vectors"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "vector-random" = callPackage @@ -269665,8 +270507,8 @@ self: { editedCabalFile = "0ys49lp4hqdm9hmfirfycksi31k03w7i6fralmqz6p9l4rc1lcyy"; libraryHaskellDepends = [ base mersenne-random-pure64 vector ]; description = "Generate vectors filled with high quality pseudorandom numbers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -269678,8 +270520,8 @@ self: { sha256 = "1k30n5qh16sdfxy77vp10bx52lb1ffmjn70vg87hx12j8wg9vbv6"; libraryHaskellDepends = [ base vector ]; description = "(deprecated) Read instances for 'Data.Vector'"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -269692,7 +270534,7 @@ self: { libraryHaskellDepends = [ base vector ]; testHaskellDepends = [ base tasty tasty-quickcheck vector ]; description = "Vectors with O(1) reverse"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "vector-shuffling" = callPackage @@ -269703,7 +270545,7 @@ self: { sha256 = "04kpp7529jd4avhprfxdy6nfikx3d3ans0knhz3lspms4iky068i"; libraryHaskellDepends = [ base random vector ]; description = "Algorithms for vector shuffling"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "vector-sized" = callPackage @@ -269720,7 +270562,7 @@ self: { finite-typelits hashable indexed-list-literals primitive vector ]; description = "Size tagged vectors"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "vector-space" = callPackage @@ -269731,7 +270573,7 @@ self: { sha256 = "17676s2f8i45dj5gk370nc8585aylah7m34nbf34al7r1492y2qc"; libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ]; description = "Vector & affine spaces, linear maps, and derivatives"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "vector-space-map" = callPackage @@ -269743,8 +270585,8 @@ self: { libraryHaskellDepends = [ base containers vector-space ]; testHaskellDepends = [ base doctest ]; description = "vector-space operations for finite maps using Data.Map"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -269762,8 +270604,8 @@ self: { test-framework-quickcheck2 test-framework-th vector-space ]; description = "Instances of vector-space classes for OpenGL types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -269777,8 +270619,8 @@ self: { editedCabalFile = "1284ds38z70696vsh695hx74nyslmgaqfv4lz0wadvmzcrw0hwb4"; libraryHaskellDepends = [ base vector-space ]; description = "A type for points, as distinct from vectors"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -269795,7 +270637,7 @@ self: { base QuickCheck split tasty tasty-quickcheck vector ]; description = "Combinator library for splitting vectors"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "vector-static" = callPackage @@ -269806,8 +270648,8 @@ self: { sha256 = "19spzrk64j2rgyi15dvs8gfbx3nc79ybssaxkv8dn9df4fwksv91"; libraryHaskellDepends = [ base primitive vector ]; description = "Statically checked sizes on Data.Vector"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -269819,7 +270661,7 @@ self: { sha256 = "04vaizcc78q94vpaly28iwhlwk6nwrsa6jmcq2afdl6yqp63njc6"; libraryHaskellDepends = [ base deepseq parallel vector ]; description = "A parallel evaluation strategy for boxed vectors"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "vector-text" = callPackage @@ -269834,8 +270676,8 @@ self: { base binary prologue text vector vector-binary-instances ]; description = "Text implementation based on unboxed char vector"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -269850,7 +270692,7 @@ self: { libraryHaskellDepends = [ base template-haskell vector ]; testHaskellDepends = [ base data-default vector ]; description = "Deriver for Data.Vector.Unboxed using Template Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "vectortiles" = callPackage @@ -269877,7 +270719,7 @@ self: { unordered-containers vector ]; description = "GIS Vector Tiles, as defined by Mapbox"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "vega-view" = callPackage @@ -269896,8 +270738,8 @@ self: { http-types scotty text unordered-containers ]; description = "Easily view Vega or Vega-Lite visualizations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -269924,8 +270766,8 @@ self: { QuickCheck utf8-light ]; description = "ASCII platform-adventure game"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -269937,8 +270779,8 @@ self: { sha256 = "0wai72bqb1vp4p7ml1yj2jdmkjglihai9vhmgj7ri6y2qgzkpwly"; libraryHaskellDepends = [ base regex-pcre ]; description = "Regular expressions made easy"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -269954,7 +270796,7 @@ self: { base binary deepseq dhall generic-lens serialise ]; description = "Simple enum that encodes application verbosity"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "verdict" = callPackage @@ -269971,8 +270813,8 @@ self: { executableHaskellDepends = [ base markdown-unlit text ]; testHaskellDepends = [ base hspec ]; description = "Validation framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -269993,8 +270835,8 @@ self: { aeson base containers hspec unordered-containers vector verdict ]; description = "JSON instances and JSON Schema for verdict"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -270010,8 +270852,8 @@ self: { base containers lens mtl sbv transformers union vinyl ]; description = "An intermediate language for Hoare logic style verification"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -270034,8 +270876,8 @@ self: { base hspec jwt QuickCheck text text-conversions time ]; description = "A new Haskeleton package"; - license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -270048,8 +270890,8 @@ self: { libraryHaskellDepends = [ array base ]; libraryToolDepends = [ alex happy ]; description = "Verilog preprocessor, parser, and AST"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -270086,8 +270928,8 @@ self: { ]; benchmarkHaskellDepends = [ base criterion lens ]; description = "Random verilog generation and simulator testing"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -270100,8 +270942,8 @@ self: { libraryHaskellDepends = [ aeson base bytestring semigroupoids ]; testHaskellDepends = [ aeson base bytestring hspec ]; description = "Type-safe data versioning"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -270122,8 +270964,8 @@ self: { versioning wai wai-extra ]; description = "Servant combinators for the versioning library"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -270134,8 +270976,8 @@ self: { }: mkDerivation { pname = "versions"; - version = "4.0.1"; - sha256 = "1s8bnxq3asq4wwgbsfvhkl6yih1sic9v8ylimcxwnvmdlh5ks58a"; + version = "4.0.2"; + sha256 = "1m7nyjqd0cyxnli5f7rbk1wrh6h7dk65i67k6xp787npf7hi6gdf"; libraryHaskellDepends = [ base deepseq hashable megaparsec parser-combinators text ]; @@ -270144,7 +270986,7 @@ self: { tasty-quickcheck text ]; description = "Types and parsers for software version numbers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "vflow-types" = callPackage @@ -270164,8 +271006,8 @@ self: { quickcheck-classes text ]; description = "types for ingesting vflow data with aeson"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -270186,7 +271028,7 @@ self: { base containers exceptions hspec QuickCheck template-haskell ]; description = "A Python str.format() like formatter"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "vformat-aeson" = callPackage @@ -270208,7 +271050,7 @@ self: { vformat ]; description = "Extend vformat to Aeson datatypes"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "vformat-time" = callPackage @@ -270222,7 +271064,7 @@ self: { libraryHaskellDepends = [ base time vformat ]; testHaskellDepends = [ base time vformat ]; description = "Extend vformat to time datatypes"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "vfr-waypoints" = callPackage @@ -270243,39 +271085,41 @@ self: { base fuzzy lens optparse-applicative ]; description = "VFR waypoints, as published in the AIP (ERSA)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; "vgrep" = callPackage - ({ mkDerivation, aeson, async, attoparsec, base, cabal-file-th - , containers, directory, doctest, fingertree, generic-deriving - , lens, lifted-base, mmorph, mtl, pipes, pipes-concurrency, process - , QuickCheck, stm, tasty, tasty-quickcheck, template-haskell, text - , transformers, unix, vty, yaml + ({ mkDerivation, aeson, async, attoparsec, base, containers + , directory, doctest, fingertree, generic-deriving, lifted-base + , microlens-mtl, microlens-platform, mmorph, mtl, pipes + , pipes-concurrency, process, QuickCheck, stm, tasty + , tasty-quickcheck, template-haskell, text, transformers, unix, vty + , yaml }: mkDerivation { pname = "vgrep"; - version = "0.2.2.0"; - sha256 = "11kcf59c1raqj4mwwjhr9435sqilgxgmryq1kimgra2j64ldyl3k"; + version = "0.2.3.0"; + sha256 = "1zzzmvhqcvgvni96b1zzqjwpmlncsjd08sqllrbp4d4a7j43b9g5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson async attoparsec base containers directory fingertree - generic-deriving lens lifted-base mmorph mtl pipes - pipes-concurrency process stm text transformers unix vty yaml + generic-deriving lifted-base microlens-mtl microlens-platform + mmorph mtl pipes pipes-concurrency process stm text transformers + unix vty yaml ]; executableHaskellDepends = [ - async base cabal-file-th containers directory lens mtl pipes - pipes-concurrency process template-haskell text vty + async base containers directory microlens-platform mtl pipes + pipes-concurrency process template-haskell text unix vty ]; testHaskellDepends = [ - base containers doctest lens QuickCheck tasty tasty-quickcheck text + base containers doctest QuickCheck tasty tasty-quickcheck text ]; description = "A pager for grep"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -270301,8 +271145,8 @@ self: { random test-framework test-framework-quickcheck2 text time ]; description = "Provides functions to inspect and manipulate virtual hard disk (VHD) files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -270314,8 +271158,8 @@ self: { sha256 = "1bi8n8m9an1hcj4c6i2ifqyadg32nq4viffi1kiihaw3j7dh552b"; libraryHaskellDepends = [ base mtl pretty regex-posix ]; description = "VHDL AST and pretty printer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -270331,8 +271175,8 @@ self: { testHaskellDepends = [ base containers doctest QuickCheck quickcheck-classes ]; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -270351,8 +271195,8 @@ self: { vector vector-algorithms vty ]; description = "Text-based interactive GHC .prof viewer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -270364,8 +271208,8 @@ self: { sha256 = "0kzwp58lki3jvx09n6w8rc97idhy947xqik72p2fqjyigkymv04h"; libraryHaskellDepends = [ base mtl ]; description = "Views allow you to run a State monad on part of a state"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -270406,8 +271250,8 @@ self: { yesod-core yesod-platform ]; description = "An extensible dead-man's switch system"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -270434,8 +271278,8 @@ self: { parsec process relude temporary text themoviedb time yaml ]; description = "Frontend for video metadata tagging tools"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -270465,8 +271309,8 @@ self: { transformers wcwidth ]; description = "An MPD client with vim-like key bindings"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) ncurses;}; @@ -270487,8 +271331,8 @@ self: { ]; testHaskellDepends = [ base ]; description = "Interpreter for microcomputer-era BASIC"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -270511,7 +271355,7 @@ self: { base criterion linear microlens mwc-random primitive tagged vector ]; description = "Extensible Records"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "vinyl-generics" = callPackage @@ -270528,7 +271372,7 @@ self: { text vinyl ]; description = "Convert plain records to vinyl (and vice versa), generically"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "vinyl-gl" = callPackage @@ -270549,7 +271393,7 @@ self: { vinyl ]; description = "Utilities for working with OpenGL's GLSL shading language and vinyl records"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "vinyl-json" = callPackage @@ -270565,8 +271409,8 @@ self: { ]; testHaskellDepends = [ base hlint ]; description = "Provide json instances automagically to vinyl types"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -270578,7 +271422,7 @@ self: { sha256 = "1vxw57c17lajq6qb2kcblymbg42y7ddh85kiik5kwmbxgfmqyrrv"; libraryHaskellDepends = [ base vinyl ]; description = "Loeb's theorem for extensible records"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "vinyl-named-sugar" = callPackage @@ -270589,8 +271433,8 @@ self: { sha256 = "19wbdavf5zb967r4qkw6ksd2yakp4cnlq1hffzzywssm50zakc3h"; libraryHaskellDepends = [ base vinyl ]; description = "Syntax sugar for vinyl records using overloaded labels"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -270605,8 +271449,8 @@ self: { base operational operational-extra vinyl-plus ]; description = "Initial project template from stack"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -270626,8 +271470,8 @@ self: { ]; testHaskellDepends = [ base doctest vinyl ]; description = "Vinyl records utilities"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -270639,8 +271483,8 @@ self: { sha256 = "0lcpg2mxmr41lqpn5ksc35c0w16s45z6qq9wjbm0cv8r047k9bq5"; libraryHaskellDepends = [ base contravariant transformers vinyl ]; description = "Utilities for vinyl"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -270659,8 +271503,8 @@ self: { text vector vinyl ]; description = "Vectors for vinyl vectors"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -270680,8 +271524,8 @@ self: { safe split ]; description = "Virtual Haskell Environment builder"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -270693,8 +271537,8 @@ self: { sha256 = "0a1abwjg2c41xxmmn7dalvk2lfh1h76waj327dxzjsg0lkkjvhx4"; libraryHaskellDepends = [ base containers ]; description = "Simple computation of visibility polygons"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -270716,8 +271560,8 @@ self: { xmms2-client xmms2-client-glib ]; description = "An XMMS2 client"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -270745,8 +271589,8 @@ self: { strict-concurrency svgcairo value-supply ]; description = "Visualize the graph-rewrite steps of a Haskell program"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -270765,8 +271609,8 @@ self: { process regexpr split uniplate ]; description = "Create a visual profile of a program's source code"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -270786,8 +271630,8 @@ self: { mtl optparse-applicative parsec template-haskell text ]; description = "Visualize CBN reduction"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -270799,8 +271643,8 @@ self: { sha256 = "0f7rwww8gcfg6q0xq6z8c3010gx0vxr0v6yf143qxqjx02f93d1p"; libraryHaskellDepends = [ base mtl profunctors ]; description = "Profunctor optics via the profunctor representation theorem"; - license = stdenv.lib.licenses.gpl3Plus; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -270822,7 +271666,7 @@ self: { ]; description = "Sound synthesis with SuperCollider"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -270836,7 +271680,7 @@ self: { testHaskellDepends = [ base bytestring cereal microspec time ]; description = "Open Sound Control encode/decode"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -270857,7 +271701,7 @@ self: { ]; description = "Implementation of SuperCollider server specifications"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -270875,8 +271719,8 @@ self: { resourcet text time xml-conduit xml-hamlet ]; description = "Amazon Route53 DNS service plugin for the aws package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -270891,7 +271735,7 @@ self: { libraryHaskellDepends = [ base bytestring process unix ]; executableHaskellDepends = [ base bytestring process unix ]; description = "Pseudo terminal interaction with subprocesses"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "vocabulary-kadma" = callPackage @@ -270904,7 +271748,7 @@ self: { editedCabalFile = "0p70z83k5cg9yl91afks3ipvzv61nf5i7v0yqz59x1vdmml7fis0"; libraryHaskellDepends = [ base smaoin ]; description = "Smaoin vocabulary definitions of the base framework"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "voicebase" = callPackage @@ -270928,8 +271772,8 @@ self: { ]; testHaskellDepends = [ aeson base hspec roundtrip-aeson ]; description = "Upload audio files to voicebase to get a transcription"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -270941,7 +271785,7 @@ self: { sha256 = "05vk3x1r9a2pqnzfji475m5gdih2im1h7rbi2sc67p1pvj6pbbsk"; libraryHaskellDepends = [ base ]; description = "A Haskell 98 logically uninhabited data type"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "vorbiscomment" = callPackage @@ -270955,7 +271799,7 @@ self: { base binary-strict bytestring mtl utf8-string ]; description = "Reading of Vorbis comments from Ogg Vorbis files"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "vowpal-utils" = callPackage @@ -270966,8 +271810,8 @@ self: { sha256 = "09z6nbsj4rqzhksk75glrsrmcs21p8x0jmcpqs6rc9iizz79db8g"; libraryHaskellDepends = [ base bytestring ]; description = "Vowpal Wabbit utilities"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -270979,8 +271823,8 @@ self: { sha256 = "117xvh6llh3aw8nxrvvqyjaflq35l69b7s4j1sc79p8r972mdwff"; libraryHaskellDepends = [ base bytestring process utf8-string ]; description = "Haskell bindings for libvoyeur"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -270997,8 +271841,8 @@ self: { libraryHaskellDepends = [ base primitive util vector ]; testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; description = "Priority queue based on vector"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -271015,7 +271859,7 @@ self: { executableHaskellDepends = [ base ]; executableSystemDepends = [ quat vrpn ]; description = "Bindings to VRPN"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {quat = null; inherit (pkgs) vrpn;}; "vt-utils" = callPackage @@ -271039,7 +271883,7 @@ self: { time transformers unordered-containers vector wai warp ]; description = "Vector and Text utilities"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "vte" = callPackage @@ -271056,8 +271900,8 @@ self: { libraryPkgconfigDepends = [ vte ]; libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the VTE library"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) vte;}; @@ -271075,8 +271919,8 @@ self: { libraryPkgconfigDepends = [ vte ]; libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the VTE library"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) vte;}; @@ -271112,7 +271956,7 @@ self: { utf8-string vector ]; description = "A simple terminal UI library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "vty-examples" = callPackage @@ -271132,8 +271976,8 @@ self: { utf8-string vector vty ]; description = "Examples programs using the vty library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -271147,8 +271991,8 @@ self: { isExecutable = true; libraryHaskellDepends = [ base vty ]; description = "A lib for displaying a menu and getting a selection using VTY"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -271170,8 +272014,8 @@ self: { ]; executableHaskellDepends = [ base QuickCheck random text vty ]; description = "An interactive terminal user interface library for Vty"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -271183,8 +272027,8 @@ self: { sha256 = "1c60bvhk1riilj7sl7x7nw4d9yg56f2k0ps1aivmjm0q4brhgnx7"; libraryHaskellDepends = [ base regex-base regex-pcre vty vty-ui ]; description = "Extra vty-ui functionality not included in the core library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -271192,12 +272036,12 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "vulkan"; - version = "3.8.3"; - sha256 = "0ml3zccwk86ryjgxhdc0qdvmjq1fmw4wrhblss4rdml9kww8y2ar"; + version = "3.9"; + sha256 = "00k23g4qszrhwbbc746y1z50mcnxw9b99rqfdqx6ncnzblc6b63z"; libraryHaskellDepends = [ base bytestring transformers vector ]; - librarySystemDepends = [ vulkan ]; + libraryPkgconfigDepends = [ vulkan ]; description = "Bindings to the Vulkan graphics API"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; platforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {vulkan = null;}; @@ -271209,8 +272053,8 @@ self: { sha256 = "1afnj053p3azm9wwdsr49w2s82k64lb0f12ak2g2v8vgidrjl7qk"; libraryHaskellDepends = [ base ]; description = "Low-level low-overhead vulkan api bindings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -271222,8 +272066,8 @@ self: { }: mkDerivation { pname = "vulkan-utils"; - version = "0.4"; - sha256 = "0r7byk8i59qnvkaqvkr5kdw9spwni6g6pyspgwzabhvky6n2mang"; + version = "0.4.1"; + sha256 = "1kd8v3l6c1szip8d7aw03s9vs5bnwbm66c98wbvmbmwc46rrkksh"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bytestring containers dependent-map dependent-sum extra @@ -271232,7 +272076,7 @@ self: { ]; testHaskellDepends = [ base doctest ]; description = "Utils for the vulkan package"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "waargonaut" = callPackage @@ -271249,8 +272093,8 @@ self: { }: mkDerivation { pname = "waargonaut"; - version = "0.8.0.1"; - sha256 = "1rfmj9c87ql6mfqspx58qpqx6k1pvvfvgngzbjfpdx62xknxflkf"; + version = "0.8.0.2"; + sha256 = "0w36jcgm1vq1212vd3mzwcfk6qwprz49afyshfjqcll6yq8vwp16"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ attoparsec base bifunctors bytestring containers contravariant @@ -271270,8 +272114,8 @@ self: { zippers ]; description = "JSON wrangling"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -271295,8 +272139,8 @@ self: { process select text udev unordered-containers vector X11 yaml ]; description = "Manage Wacom tablet settings profiles, including Intuos Pro ring modes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -271319,8 +272163,8 @@ self: { JuicyPixels ]; description = "DOOM WAD file utilities"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -271341,26 +272185,26 @@ self: { remote-monad scotty semigroups stm text wai-middleware-static ]; description = "A haskell binding of the Web Audio API ala blank-canvas"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; "wai" = callPackage ({ mkDerivation, base, bytestring, hspec, hspec-discover - , http-types, network, text, transformers, vault + , http-types, network, text, vault }: mkDerivation { pname = "wai"; - version = "3.2.2.1"; - sha256 = "058871axlq6r0gcqxbjw37w57df9xbv81dmz99b1zq59wf329xzy"; + version = "3.2.3"; + sha256 = "1y19h9v0cq1fl17ywcyyvd6419fhgyw2s0yk0ki8z60021adcx2m"; libraryHaskellDepends = [ - base bytestring http-types network text transformers vault + base bytestring http-types network text vault ]; testHaskellDepends = [ base bytestring hspec ]; testToolDepends = [ hspec-discover ]; description = "Web Application Interface"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "wai-accept-language" = callPackage @@ -271380,7 +272224,7 @@ self: { base file-embed wai wai-app-static warp ]; description = "Rewrite based on Accept-Language header"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "wai-app-file-cgi" = callPackage @@ -271407,7 +272251,7 @@ self: { hspec HTTP http-types unix wai warp ]; description = "File/CGI/Rev Proxy App of WAI"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "wai-app-static" = callPackage @@ -271442,7 +272286,7 @@ self: { unix-compat wai wai-extra zlib ]; description = "WAI application for static serving"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "wai-cli" = callPackage @@ -271462,8 +272306,8 @@ self: { warp-tls ]; description = "Command line runner for Wai apps (using Warp) with TLS, CGI, socket activation & graceful shutdown"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -271479,7 +272323,7 @@ self: { base bytestring conduit http-types transformers wai ]; description = "conduit wrappers for WAI"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "wai-control" = callPackage @@ -271495,7 +272339,7 @@ self: { websockets ]; description = "Run wai Applications in IO based monads"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "wai-cors" = callPackage @@ -271519,7 +272363,7 @@ self: { websockets ]; description = "CORS for WAI"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "wai-devel" = callPackage @@ -271547,8 +272391,8 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base hspec stm ]; description = "A web server for the development of WAI compliant web applications"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -271566,7 +272410,7 @@ self: { ]; description = "Helpers to bind digestive-functors onto wai requests"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "wai-dispatch" = callPackage @@ -271578,7 +272422,7 @@ self: { libraryHaskellDepends = [ base text wai yesod-routes ]; description = "Nice wrapper around yesod-routes for use with WAI"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "wai-enforce-https" = callPackage @@ -271599,7 +272443,7 @@ self: { base bytestring case-insensitive hspec http-types wai wai-extra ]; description = "Enforce HTTPS in Wai server app safely"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "wai-eventsource" = callPackage @@ -271611,29 +272455,29 @@ self: { libraryHaskellDepends = [ wai ]; doHaddock = false; description = "WAI support for server-sent events (deprecated)"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "wai-extra" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring , bytestring, call-stack, case-insensitive, containers, cookie - , data-default-class, deepseq, directory, fast-logger, hspec - , http-types, http2, HUnit, iproute, network, old-locale, resourcet - , streaming-commons, text, time, transformers, unix, unix-compat - , vault, void, wai, wai-logger, word8, zlib + , data-default-class, directory, fast-logger, hspec, http-types + , http2, HUnit, iproute, network, resourcet, streaming-commons + , text, time, transformers, unix, vault, wai, wai-logger, word8 + , zlib }: mkDerivation { pname = "wai-extra"; - version = "3.1.5"; - sha256 = "1xq4w3i3mazdcpb7d60sag6bqqp33sgx0hf808bbjjk6bf03qraw"; + version = "3.1.6"; + sha256 = "03bbhmy8dc2ivhgbsrc39wk5kb9ci4p98pb2qcq2w92imy710cj6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-terminal base base64-bytestring bytestring call-stack - case-insensitive containers cookie data-default-class deepseq - directory fast-logger http-types http2 HUnit iproute network - old-locale resourcet streaming-commons text time transformers unix - unix-compat vault void wai wai-logger word8 zlib + case-insensitive containers cookie data-default-class directory + fast-logger http-types http2 HUnit iproute network resourcet + streaming-commons text time transformers unix vault wai wai-logger + word8 ]; testHaskellDepends = [ aeson base bytestring case-insensitive cookie fast-logger hspec @@ -271641,7 +272485,7 @@ self: { zlib ]; description = "Provides some basic WAI handlers and middleware"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "wai-feature-flags" = callPackage @@ -271660,7 +272504,7 @@ self: { ]; executableHaskellDepends = [ base wai warp ]; description = "Feature flag support for WAI applications"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "wai-frontend-monadcgi" = callPackage @@ -271676,7 +272520,7 @@ self: { transformers wai ]; description = "Run CGI apps on WAI"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "wai-git-http" = callPackage @@ -271699,8 +272543,8 @@ self: { warp ]; description = "Git http-backend CGI App of WAI"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -271712,8 +272556,8 @@ self: { sha256 = "0a06yrakg9gwjjj4f9nr474j8i8xz642aj56m8vaq621i1kn7jaq"; libraryHaskellDepends = [ base http-types mtl resourcet unix wai ]; description = "Graceful shutdown for WAI applications"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -271734,8 +272578,8 @@ self: { ]; executableHaskellDepends = [ cmdargs ]; description = "WAI server that automatically reloads code after modification. (deprecated)"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -271748,8 +272592,8 @@ self: { libraryHaskellDepends = [ base bytestring wai wai-extra ]; librarySystemDepends = [ fcgi ]; description = "Wai handler to fastcgi"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) fcgi;}; @@ -271766,7 +272610,7 @@ self: { transformers wai warp ]; description = "Launch a web app in the default browser"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "wai-handler-scgi" = callPackage @@ -271777,8 +272621,8 @@ self: { sha256 = "0h7d78d641bjsnmxsnz4b7s9pw4x0y0xi8bld51y4nqnbjl8gvac"; libraryHaskellDepends = [ base bytestring wai wai-extra ]; description = "Wai handler to SCGI (deprecated)"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -271795,8 +272639,8 @@ self: { transformers wai ]; description = "Web Application Interface handler using snap-server. (deprecated)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -271809,8 +272653,8 @@ self: { libraryHaskellDepends = [ base wai warp ]; libraryPkgconfigDepends = [ QtWebKit ]; description = "Turn WAI applications into standalone GUIs using QtWebkit"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {QtWebKit = null;}; @@ -271827,7 +272671,7 @@ self: { ]; description = "Nice wrapper around hastache for use with WAI"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "wai-hmac-auth" = callPackage @@ -271849,8 +272693,8 @@ self: { wai-extra ]; description = "hmac authentication tools for WAI apps"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -271867,7 +272711,7 @@ self: { ]; testHaskellDepends = [ base doctest ]; description = "WAI utilities for HTTP/2"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "wai-lambda" = callPackage @@ -271892,7 +272736,7 @@ self: { wai ]; description = "Haskell Webapps on AWS Lambda"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "wai-lens" = callPackage @@ -271907,8 +272751,8 @@ self: { base bytestring http-types lens network text vault wai ]; description = "Lenses for WAI"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -271924,8 +272768,8 @@ self: { base bytestring conduit http-types text transformers wai wai-extra ]; description = "DEPCRECATED (use package \"simple\" instead) A minimalist web framework for WAI web applications"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -271942,7 +272786,7 @@ self: { time uuid wai ]; description = "A logging middleware for WAI applications"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "wai-logger" = callPackage @@ -271959,7 +272803,7 @@ self: { ]; testHaskellDepends = [ base doctest ]; description = "A logging system for WAI"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "wai-logger-buffered" = callPackage @@ -271982,8 +272826,8 @@ self: { base bytestring containers data-default time wai ]; description = "Buffer requets before logging them"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -272000,8 +272844,8 @@ self: { wai-logger ]; description = "A logging system for preforked WAI apps"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -272031,8 +272875,8 @@ self: { warp wreq ]; description = "Compiling and serving assets"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -272069,7 +272913,7 @@ self: { time uri-bytestring wai wai-extra warp ]; description = "Authentication middleware that secures WAI application"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "wai-middleware-brotli" = callPackage @@ -272095,8 +272939,8 @@ self: { tasty-hunit wai wai-extra ]; description = "WAI middleware for brotli compression"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "wai-middleware-cache" = callPackage @@ -272117,8 +272961,8 @@ self: { test-framework-hunit wai wai-test ]; description = "Caching middleware for WAI"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -272137,8 +272981,8 @@ self: { wai-middleware-cache ]; description = "Redis backend for wai-middleware-cache"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -272154,7 +272998,7 @@ self: { ]; testHaskellDepends = [ base ]; description = "WAI Middleware to cache things"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "wai-middleware-caching-lru" = callPackage @@ -272171,7 +273015,7 @@ self: { ]; testHaskellDepends = [ base ]; description = "Initial project template from stack"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "wai-middleware-caching-redis" = callPackage @@ -272188,7 +273032,7 @@ self: { ]; testHaskellDepends = [ base ]; description = "Cache Wai Middleware using Redis backend"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "wai-middleware-catch" = callPackage @@ -272201,8 +273045,8 @@ self: { base bytestring http-types lifted-base wai ]; description = "Wai error catching middleware"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -272222,7 +273066,7 @@ self: { base base-compat-batteries http-types tasty tasty-wai wai ]; description = "GNU Terry Pratchett - Add the X-Clacks-Overhead Header to Wai Responses"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "wai-middleware-consul" = callPackage @@ -272244,8 +273088,8 @@ self: { transformers void wai wai-conduit ]; description = "Wai Middleware for Consul"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -272278,8 +273122,8 @@ self: { wai-logger wai-transformers warp ]; description = "Route to different middlewares based on the incoming Accept header"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -272311,8 +273155,8 @@ self: { text transformers wai wai-app-static wai-extra warp ]; description = "Middleware and utilities for using Atlassian Crowd authentication"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -272339,8 +273183,8 @@ self: { random resourcet text vault wai wai-conduit warp warp-tls ]; description = "WAI middleware that delegates handling of requests"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -272358,8 +273202,8 @@ self: { http-types unix-compat unordered-containers wai ]; description = "WAI ETag middleware for static files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -272375,7 +273219,7 @@ self: { base bytestring http-types streaming-commons wai ]; description = "WAI middleware to unzip request bodies"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "wai-middleware-headers" = callPackage @@ -272386,8 +273230,8 @@ self: { sha256 = "10ap355j4dx42y7ycf1plpbg04wazv0q62mi3ibza8sb33hiiprh"; libraryHaskellDepends = [ base bytestring http-types wai ]; description = "cors and addHeaders for WAI"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -272410,7 +273254,7 @@ self: { regex-compat wai wai-extra ]; description = "HMAC Authentication Middleware for WAI"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "wai-middleware-hmac-client" = callPackage @@ -272430,8 +273274,8 @@ self: { word8 ]; description = "WAI HMAC Authentication Middleware Client"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -272450,7 +273294,7 @@ self: { aeson base binary bytestring http-types text wai ]; description = "Converts errors from plaintext to json"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "wai-middleware-metrics" = callPackage @@ -272472,7 +273316,7 @@ self: { wai-extra ]; description = "A WAI middleware to collect EKG request metrics"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "wai-middleware-preprocessor" = callPackage @@ -272490,8 +273334,8 @@ self: { base Cabal directory mtl split text wai wai-middleware-static warp ]; description = "WAI middleware for preprocessing static files"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -272509,7 +273353,7 @@ self: { ]; testHaskellDepends = [ base doctest prometheus-client ]; description = "WAI middlware for exposing http://prometheus.io metrics."; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "wai-middleware-rollbar" = callPackage @@ -272525,8 +273369,8 @@ self: { rollbar-hs text time uuid wai ]; description = "Middleware that communicates to Rollbar"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -272547,8 +273391,8 @@ self: { test-framework-hunit text wai wai-test ]; description = "Wai dispatch middleware"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -272570,7 +273414,7 @@ self: { time wai wai-extra ]; description = "WAI Slack request verification middleware"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "wai-middleware-static" = callPackage @@ -272584,6 +273428,8 @@ self: { pname = "wai-middleware-static"; version = "0.9.0"; sha256 = "161s2lk9529008219q6fgbmv0rkf74jmfj1cii8zxkgnhpvi22zs"; + revision = "1"; + editedCabalFile = "1lvinpyfyb5ryxn3g41mgg6w7l7nzyh7sylmms7nvdvaqzx7l3lv"; libraryHaskellDepends = [ base bytestring containers cryptonite directory expiring-cache-map filepath http-types memory mime-types old-locale semigroups text @@ -272595,7 +273441,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "WAI middleware that serves requests to static files"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "wai-middleware-static-caching" = callPackage @@ -272613,8 +273459,8 @@ self: { unix wai ]; description = "WAI middleware that serves requests to static files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -272633,7 +273479,7 @@ self: { wai-extra ]; description = "Serve embedded static files as a Wai middleware"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "wai-middleware-throttle" = callPackage @@ -272656,7 +273502,7 @@ self: { transformers wai wai-extra ]; description = "WAI Middleware for Request Throttling"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "wai-middleware-travisci" = callPackage @@ -272674,8 +273520,8 @@ self: { transformers vault wai ]; description = "WAI middleware for authenticating webhook payloads from Travis CI"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -272695,7 +273541,7 @@ self: { transformers-base unordered-containers wai wai-transformers ]; description = "Route Wai middlewares based on HTTP verbs"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "wai-predicates" = callPackage @@ -272718,7 +273564,7 @@ self: { ]; description = "WAI request predicates"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "wai-rate-limit" = callPackage @@ -272729,7 +273575,7 @@ self: { sha256 = "1z7npcf0smzyfjvkmpa6dw08sg3ywx4cc4kafgxk95dh8yqnmidw"; libraryHaskellDepends = [ base http-types wai ]; description = "Rate limiting as WAI middleware"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "wai-rate-limit-redis" = callPackage @@ -272746,8 +273592,8 @@ self: { wai wai-extra wai-rate-limit warp ]; description = "Redis backend for rate limiting as WAI middleware"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -272766,8 +273612,8 @@ self: { base bytestring criterion http-types text wai ]; description = "Declarative request parsing"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -272779,8 +273625,8 @@ self: { sha256 = "0qf64g11113gl45bfn12j2ikdjwrdxg9r8cicfs4pmh0dq5vj0va"; libraryHaskellDepends = [ base bytestring http-types wai ]; description = "Response interface for WAI"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -272803,7 +273649,7 @@ self: { unordered-containers wai ]; description = "WAI middleware for path-based request routing with captures"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "wai-router" = callPackage @@ -272814,8 +273660,8 @@ self: { sha256 = "1827mk64vyivdc12z4h230c4b993i6g8wl4sl0364jda586z58p7"; libraryHaskellDepends = [ base text wai ]; description = "Provides basic routing on URL paths for WAI"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -272840,8 +273686,8 @@ self: { aeson base hspec hspec-wai hspec-wai-json text wai ]; description = "Typesafe URLs for Wai applications"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -272868,8 +273714,8 @@ self: { base criterion http-types wai wai-predicates ]; description = "Declarative routing for WAI"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -272888,7 +273734,7 @@ self: { x509 x509-store xml-conduit ]; description = "SAML2 assertion validation as WAI middleware"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "wai-secure-cookies" = callPackage @@ -272911,8 +273757,8 @@ self: { base bytestring hspec hspec-expectations hspec-wai http-types wai wai-extra ]; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -272931,7 +273777,7 @@ self: { ]; description = "Flexible session middleware for WAI"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "wai-session-alt" = callPackage @@ -272947,8 +273793,8 @@ self: { wai-transformers ]; description = "An alternative session middleware for WAI"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -272966,7 +273812,7 @@ self: { ]; description = "Session store based on clientsession"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "wai-session-mysql" = callPackage @@ -272986,8 +273832,8 @@ self: { base bytestring data-default mysql-simple text wai-session ]; description = "MySQL backed Wai session store"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -273010,8 +273856,8 @@ self: { wai-session ]; description = "PostgreSQL backed Wai session store"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -273029,7 +273875,7 @@ self: { ]; description = "Session store based on Tokyo Cabinet"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "wai-slack-middleware" = callPackage @@ -273041,7 +273887,7 @@ self: { libraryHaskellDepends = [ aeson base http-client http-types wai ]; testHaskellDepends = [ base ]; description = "A Slack middleware for WAI"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "wai-static-cache" = callPackage @@ -273060,8 +273906,8 @@ self: { vector-algorithms wai ]; description = "A simple cache for serving static files in a WAI middleware"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.agpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -273078,7 +273924,7 @@ self: { wai-extra ]; description = "generate static html pages from a WAI application"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "wai-test" = callPackage @@ -273090,7 +273936,7 @@ self: { libraryHaskellDepends = [ wai ]; doHaddock = false; description = "Unit test framework (built on HUnit) for WAI applications. (deprecated)"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "wai-thrift" = callPackage @@ -273105,8 +273951,8 @@ self: { base blaze-builder bytestring http-types thrift wai ]; description = "Thrift transport layer for Wai"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -273122,8 +273968,8 @@ self: { base bytestring containers http-types time wai ]; description = "Wai middleware for request throttling"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -273140,7 +273986,7 @@ self: { base exceptions extractable-singleton monad-control-aligned transformers wai wai-websockets websockets ]; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "wai-util" = callPackage @@ -273158,7 +274004,7 @@ self: { ]; description = "Collection of utility functions for use with WAI"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "wai-websockets" = callPackage @@ -273181,7 +274027,7 @@ self: { transformers wai wai-app-static warp websockets ]; description = "Provide a bridge between WAI and the websockets package"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "wait-handle" = callPackage @@ -273192,7 +274038,7 @@ self: { sha256 = "09080zx6m4lqli85867ilck82gvgnz4vkq9nxx5f1v5fli1i0n7m"; libraryHaskellDepends = [ base ]; description = "Wait handles are MVars which can only be written to once, and from which values can never be removed"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "waitfree" = callPackage @@ -273203,8 +274049,8 @@ self: { sha256 = "09hlqli7zpcxfa8w7vh937gc3rxp7s8q8v1zs8ciwnmh6ca4i8rq"; libraryHaskellDepends = [ base containers ]; description = "A wrapping library for waitfree computation"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -273229,8 +274075,8 @@ self: { aeson base http-types tasty tasty-hunit wai wai-extra ]; description = "A very simple Wai router"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -273249,7 +274095,7 @@ self: { ]; testToolDepends = [ tasty-discover ]; description = "Functions to manipulate records"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "waldo" = callPackage @@ -273281,8 +274127,8 @@ self: { warp zlib-conduit ]; description = "A generator of comics based on some ascertainable data about the requester"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -273304,8 +274150,8 @@ self: { executableHaskellDepends = [ base JuicyPixels yaml ]; testHaskellDepends = [ base ]; description = "A library and executable for creating wallpaper, frieze, and rosette patterns"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -273334,7 +274180,7 @@ self: { pipes-zlib text time transformers ]; description = "A parser for the Web Archive (WARC) format"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "warp" = callPackage @@ -273367,7 +274213,7 @@ self: { http-types network time-manager unix unix-compat x509 ]; description = "A fast, light-weight web server for WAI applications"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "warp-dynamic" = callPackage @@ -273383,8 +274229,8 @@ self: { ]; executableHaskellDepends = [ base ]; description = "Dynamic configurable warp HTTP server"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -273402,7 +274248,7 @@ self: { http2-grpc-types unliftio-core wai warp warp-tls ]; description = "A minimal gRPC server on top of Warp"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "warp-static" = callPackage @@ -273422,8 +274268,8 @@ self: { wai-app-static wai-extra warp ]; description = "Static file server based on Warp and wai-app-static (deprecated)"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -273435,8 +274281,8 @@ self: { sha256 = "1gi9xkaa3wi5n2vhmlc7s4zm48l2fakwnd7bw007hzfqi17zz13x"; libraryHaskellDepends = [ base network systemd unix wai warp ]; description = "Socket activation and other systemd integration for the Warp web server (WAI)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -273453,7 +274299,7 @@ self: { streaming-commons tls tls-session-manager wai warp ]; description = "HTTP over TLS support for Warp via the TLS package"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "warp-tls-uid" = callPackage @@ -273473,7 +274319,7 @@ self: { warp warp-tls x509 ]; description = "set group and user id before running server"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "warped" = callPackage @@ -273490,8 +274336,8 @@ self: { monad-control preamble uuid wai wai-conduit wai-cors warp ]; description = "Warp and Wai Library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -273520,8 +274366,8 @@ self: { ]; testToolDepends = [ alex happy ]; description = "WebAssembly Language Toolkit and Interpreter"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -273535,8 +274381,8 @@ self: { editedCabalFile = "1hmjlva0pbvbbl3vcngqlqrisx32qzlc9pl96zh2rb6m25riisdg"; libraryHaskellDepends = [ base mtl time ]; description = "Simple control structure to re-try an action with exponential backoff"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -273553,8 +274399,8 @@ self: { system-filepath ]; description = "Opinionated filesystem watcher"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -273583,8 +274429,8 @@ self: { system-filepath tasty tasty-hunit tasty-quickcheck tasty-smallcheck ]; description = "File change watching utility"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -273598,7 +274444,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base directory filepath process ]; description = "Command-line tool for converting audio files and filling in ID3 tags"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "wave" = callPackage @@ -273620,7 +274466,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Work with WAVE and RF64 files"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "wavefront" = callPackage @@ -273635,8 +274481,8 @@ self: { attoparsec base dlist filepath mtl text transformers vector ]; description = "Wavefront OBJ loader"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -273655,8 +274501,8 @@ self: { ]; testHaskellDepends = [ base hspec linear ]; description = "Wavefront .obj file loader"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -273673,8 +274519,8 @@ self: { delimited-text ]; description = "Parse WaveSurfer files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -273695,8 +274541,8 @@ self: { base bytestring filepath pretty-show split vector ]; description = "Process WAVE files in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -273710,7 +274556,7 @@ self: { isExecutable = true; libraryHaskellDepends = [ base containers ]; description = "Native wcwidth"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "weak-bag" = callPackage @@ -273721,8 +274567,8 @@ self: { sha256 = "0jh5xv02wlifjqdvm2cr9mi3wjj4f14s1ap5pphin2rdzklhl3rc"; libraryHaskellDepends = [ base containers ]; description = "Mutable bag backed by weak pointers to each item"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -273739,8 +274585,8 @@ self: { utf8-string vector ]; description = "Weather API implemented in Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -273753,7 +274599,7 @@ self: { libraryHaskellDepends = [ base gtk webkit ]; description = "Web Browser In Haskell"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "web-css" = callPackage @@ -273764,8 +274610,8 @@ self: { sha256 = "1havyvd6f0xagynxpar2jsmx5x1izwl7wgxia0wbwbzaj0fzn2k2"; libraryHaskellDepends = [ base text ]; description = "Simple functions for CSS"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -273783,8 +274629,8 @@ self: { base bytestring directory failure old-locale text time ]; description = "Encapsulate multiple web encoding in a single package. (deprecated)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -273800,7 +274646,7 @@ self: { base happstack-server safe snap snap-core snap-server ]; description = "Wrappers for web frameworks to ease usage with the FP Complete environment"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "web-inv-route" = callPackage @@ -273820,7 +274666,7 @@ self: { ]; testHaskellDepends = [ base bytestring HUnit network-uri text ]; description = "Composable, reversible, efficient web routing using invertible invariants and bijections"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "web-mongrel2" = callPackage @@ -273838,8 +274684,8 @@ self: { zeromq-haskell ]; description = "Bindings for the Mongrel2 web server"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -273858,8 +274704,8 @@ self: { base directory filepath open-browser temporary text ]; description = "Library to present content to an user via their browser"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -273879,8 +274725,8 @@ self: { lens mtl Stream text vector wl-pprint-text ]; description = "Monoidally construct web pages"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -273896,7 +274742,7 @@ self: { base binary bytestring containers http-types mtl stm text ]; description = "dynamic plugin system for web applications"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "web-push" = callPackage @@ -273917,8 +274763,8 @@ self: { base base64-bytestring binary bytestring hspec ]; description = "Send messages using Web Push protocol"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -273948,8 +274794,8 @@ self: { base doctest lens lucid numhask tasty tasty-hspec text ]; description = "representations of a web page"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -273968,7 +274814,7 @@ self: { ]; testHaskellDepends = [ base hspec HUnit QuickCheck text ]; description = "portable, type-safe URL routing"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "web-routes-boomerang" = callPackage @@ -273981,7 +274827,7 @@ self: { base boomerang mtl parsec text web-routes ]; description = "Use boomerang for type-safe URL parsers/printers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "web-routes-generics" = callPackage @@ -273992,7 +274838,7 @@ self: { sha256 = "16nykkzjznl9zq2qgn87lpqxkz8yx83s7949lv4vzapp4hjv04yy"; libraryHaskellDepends = [ base parsec text web-routes ]; description = "portable, type-safe URL routing"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "web-routes-happstack" = callPackage @@ -274007,7 +274853,7 @@ self: { base bytestring happstack-server text web-routes ]; description = "Adds support for using web-routes with Happstack"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "web-routes-hsp" = callPackage @@ -274018,7 +274864,7 @@ self: { sha256 = "1arc22l7xk49fp80i1fkvj8xj71lqxrs2g5gnvjzwlkc0azzaz6a"; libraryHaskellDepends = [ base hsp text web-routes ]; description = "Adds XMLGenerator instance for RouteT monad"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "web-routes-mtl" = callPackage @@ -274029,7 +274875,7 @@ self: { sha256 = "1k35ch294p2pkf7mbip8wy9rin956y31sq68b4cdrj9sj9891rx5"; libraryHaskellDepends = [ base web-routes ]; description = "Extends web-routes with mtl-based MonadIO / MonadTrans RouteT instances"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "web-routes-quasi" = callPackage @@ -274042,8 +274888,8 @@ self: { isExecutable = true; libraryHaskellDepends = [ base path-pieces template-haskell text ]; description = "Define data types and parse/build functions for web-routes via a quasi-quoted DSL (deprecated)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -274055,8 +274901,8 @@ self: { sha256 = "0fysbzdal8sl8pk4sj7i9cma351r0m9lry5pi3ra7fn0czcajajy"; libraryHaskellDepends = [ base parsec regular text web-routes ]; description = "portable, type-safe URL routing"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -274073,7 +274919,7 @@ self: { ]; testHaskellDepends = [ base hspec HUnit QuickCheck web-routes ]; description = "Support for deriving PathInfo using Template Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "web-routes-transformers" = callPackage @@ -274084,8 +274930,8 @@ self: { sha256 = "0pm1v9wqlzi6cg92lajbwbnhsdm509371i8mvyvvj6qa5m58cdib"; libraryHaskellDepends = [ base transformers web-routes ]; description = "Extends web-routes with some transformers instances for RouteT"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -274101,7 +274947,7 @@ self: { base bytestring http-types text wai web-routes ]; description = "Library for maintaining correctness of URLs within an application"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "web-routing" = callPackage @@ -274120,8 +274966,8 @@ self: { testHaskellDepends = [ base doctest ]; benchmarkHaskellDepends = [ base criterion text ]; description = "simple routing library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -274161,8 +275007,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Web3 API for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -274189,8 +275035,8 @@ self: { http-types QuickCheck text time vector wai wai-extra warp ]; description = "WAI based library for web api"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -274213,8 +275059,8 @@ self: { base hspec http-types network text transformers wai ]; description = "Haskell web app framework based on WAI & Warp"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -274234,8 +275080,8 @@ self: { hashable memory serialise text x509 x509-validation ]; description = "Web Authentication API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -274260,7 +275106,7 @@ self: { unliftio-core unordered-containers wai ]; description = "A super-simple web server framework"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "webcloud" = callPackage @@ -274276,8 +275122,8 @@ self: { ]; executableHaskellDepends = [ base optparse-applicative ]; description = "Turn an optparse-applicative program into a CGI program!"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -274305,8 +275151,8 @@ self: { unordered-containers ]; description = "Webmachine inspired toolkit for building http applications and services"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -274322,8 +275168,8 @@ self: { base hvect mtl path-pieces reroute text unordered-containers ]; description = "A simple request dispatcher"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -274341,8 +275187,8 @@ self: { unordered-containers wai wai-lens webcrank webcrank-dispatch ]; description = "Build a WAI Application from Webcrank Resources"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -274366,7 +275212,7 @@ self: { transformers-base unordered-containers vector zip-archive ]; description = "a Haskell client for the Selenium WebDriver protocol"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "webdriver-angular" = callPackage @@ -274387,8 +275233,8 @@ self: { webdriver ]; description = "Webdriver actions to assist with testing a webpage which uses Angular.Js"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -274415,8 +275261,8 @@ self: { ]; testHaskellDepends = [ base parallel text ]; description = "a Haskell client for the Selenium WebDriver protocol (deprecated)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -274452,8 +275298,8 @@ self: { transformers unordered-containers vector wreq ]; description = "Bindings to the WebDriver API"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -274483,7 +275329,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "A Haskell bindings for Webex Teams API"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "webex-teams-conduit" = callPackage @@ -274509,7 +275355,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Conduit wrapper of Webex Teams List API"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "webex-teams-pipes" = callPackage @@ -274535,7 +275381,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Pipes wrapper of Webex Teams List API"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "webfinger-client" = callPackage @@ -274553,8 +275399,8 @@ self: { uri-bytestring ]; description = "WebFinger client library"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -274567,8 +275413,8 @@ self: { }: mkDerivation { pname = "webgear-server"; - version = "0.2.0"; - sha256 = "0fyyb4f4dab24as2dv5vbvacwcvp9bcrwyr483yiqn3fhm7975nr"; + version = "0.2.1"; + sha256 = "0qf3w2vk7m4ci8lyxk37iz19zbz08afihrn4sw2cqza9yaw51bjh"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring bytestring-conversion case-insensitive http-api-data http-types mtl network @@ -274581,7 +275427,7 @@ self: { template-haskell text unordered-containers wai ]; description = "Composable, type-safe library to build HTTP API servers"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "webidl" = callPackage @@ -274601,8 +275447,8 @@ self: { base bytestring HSFFIG LEXER parsec pretty utf8-env utf8-string ]; description = "Parser and Pretty Printer for the Web IDL Language"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {LEXER = null;}; @@ -274622,7 +275468,7 @@ self: { filepath hopfli optparse-applicative text vector xmlgen zlib ]; description = "webfont generator"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "webkit" = callPackage @@ -274641,8 +275487,8 @@ self: { libraryPkgconfigDepends = [ webkit ]; libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the Webkit library"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; }) {webkit = null;}; "webkit-javascriptcore" = callPackage @@ -274655,8 +275501,8 @@ self: { libraryHaskellDepends = [ base ]; libraryPkgconfigDepends = [ webkit ]; description = "JavaScriptCore FFI from webkitgtk"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {webkit = null;}; @@ -274670,7 +275516,7 @@ self: { libraryHaskellDepends = [ base ]; libraryPkgconfigDepends = [ webkitgtk ]; description = "JavaScriptCore FFI from webkitgtk"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) webkitgtk;}; "webkitgtk3" = callPackage @@ -274690,8 +275536,8 @@ self: { libraryPkgconfigDepends = [ webkitgtk24x-gtk3 ]; libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the Webkit library"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) webkitgtk24x-gtk3;}; "webkitgtk3-javascriptcore" = callPackage @@ -274705,8 +275551,8 @@ self: { libraryHaskellDepends = [ base ]; libraryPkgconfigDepends = [ webkitgtk24x-gtk3 ]; description = "JavaScriptCore FFI from webkitgtk"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) webkitgtk24x-gtk3;}; "webp" = callPackage @@ -274717,6 +275563,8 @@ self: { pname = "webp"; version = "0.1.0.0"; sha256 = "153icv3911drnjkii2b0csdq3ksavmxpz26zm9xcp24kfbsr6gvk"; + revision = "2"; + editedCabalFile = "0ycp16b2fb4x3h6rs4j2wywy7la1b7ri3419p8mnpf1ipmq6d1vk"; libraryHaskellDepends = [ base bytestring JuicyPixels vector ]; libraryPkgconfigDepends = [ libwebp ]; libraryToolDepends = [ c2hs ]; @@ -274724,7 +275572,7 @@ self: { base bytestring JuicyPixels tasty tasty-hunit ]; description = "JuicyPixels support for WebP format"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {inherit (pkgs) libwebp;}; "webpage" = callPackage @@ -274737,7 +275585,7 @@ self: { base blaze-html data-default lucid text ]; description = "Organized and simple web page scaffold for blaze and lucid"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "webrtc-vad" = callPackage @@ -274748,7 +275596,7 @@ self: { sha256 = "0lylc3axcamrmjaarx3aacbjc9d0rkhmdgq1g2pc5j0lsf8ndk49"; libraryHaskellDepends = [ base primitive vector ]; description = "Easy voice activity detection"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "webserver" = callPackage @@ -274765,8 +275613,8 @@ self: { old-locale parsec process stm time unix zlib ]; description = "HTTP server library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -274786,8 +275634,8 @@ self: { optparse-applicative optparse-simple pretty-show text wai warp ]; description = "Show programming language printed values in a web UI"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -274801,8 +275649,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base filepath gtk webkit ]; description = "Transforms URLs to PNGs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "websockets" = callPackage @@ -274836,7 +275684,7 @@ self: { ]; doCheck = false; description = "A sensible and clean way to write WebSocket-capable servers in Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "websockets-rpc" = callPackage @@ -274863,8 +275711,8 @@ self: { wai-transformers websockets websockets-simple ]; description = "Simple streaming RPC mechanism using WebSockets"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -274889,7 +275737,7 @@ self: { transformers wai-transformers websockets ]; description = "Composable websockets clients"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "websockets-simple-extra" = callPackage @@ -274899,7 +275747,7 @@ self: { version = "0.0.0"; sha256 = "1ckni1imxh4k1nxivvj9p1mffzvdmyjc20nas8b90dkkxblgnk1j"; libraryHaskellDepends = [ base mtl websockets-simple ]; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "websockets-snap" = callPackage @@ -274915,7 +275763,7 @@ self: { snap-server websockets ]; description = "Snap integration for the websockets library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "webwire" = callPackage @@ -274935,8 +275783,8 @@ self: { wai-extra ]; description = "Functional reactive web framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -274950,7 +275798,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base ]; description = "a wedding announcement"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }) {}; "wedged" = callPackage @@ -274969,7 +275817,7 @@ self: { ]; description = "Wedged postcard generator"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "weeder" = callPackage @@ -274993,7 +275841,7 @@ self: { optparse-applicative transformers ]; description = "Detect dead code"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "weekdaze" = callPackage @@ -275023,7 +275871,7 @@ self: { ]; description = "A school-timetable problem-solver"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -275039,7 +275887,7 @@ self: { ]; testHaskellDepends = [ base deepseq ]; description = "Measure allocations of a Haskell functions/values"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "weighted" = callPackage @@ -275050,8 +275898,8 @@ self: { sha256 = "1xizw6509rwj3l75haxl8sgdbd5mailj14d6qgy77r83g9qr6p8s"; libraryHaskellDepends = [ base mtl semiring-num transformers ]; description = "Writer monad which uses semiring constraint"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -275066,8 +275914,8 @@ self: { libraryHaskellDepends = [ array base ]; libraryToolDepends = [ happy ]; description = "Weighted Regular Expression Matcher"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -275079,7 +275927,7 @@ self: { sha256 = "1va2b10g3h2wfl9d7f27d55z5c93fvz41sb023l4c2ym1w9kw8zv"; libraryHaskellDepends = [ base ]; description = "A weighted nondeterministic search monad"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "welshy" = callPackage @@ -275098,8 +275946,8 @@ self: { resourcet text transformers unordered-containers wai warp ]; description = "Haskell web framework (because Scotty had trouble yodeling)"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -275117,7 +275965,7 @@ self: { base bytestring filemanip filepath optparse-applicative split ]; description = "Pretty-printing of codebases"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "werewolf" = callPackage @@ -275141,8 +275989,8 @@ self: { optparse-applicative random-shuffle text transformers ]; description = "A game engine for playing werewolf within an arbitrary chat client"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -275162,8 +276010,8 @@ self: { mtl optparse-applicative process text wai warp werewolf ]; description = "A chat interface for playing werewolf in Slack"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -275200,8 +276048,8 @@ self: { tasty-quickcheck text transformers versions ]; description = "Solver-agnostic symbolic values support for issuing queries"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -275213,8 +276061,8 @@ self: { sha256 = "1xxks0jxjwph7372jqnscm6z0b28zz3dvb49b2aw37jmnvwrfdcy"; libraryHaskellDepends = [ base bson mongoDB mtl text Wheb ]; description = "MongoDB plugin for Wheb"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -275226,8 +276074,8 @@ self: { sha256 = "025chjp41qbjr9m6c3pd9v510h4aac1rvbyrki3c7617sca8a45h"; libraryHaskellDepends = [ base bytestring hedis mtl text Wheb ]; description = "Redis connection for Wheb"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -275239,8 +276087,8 @@ self: { sha256 = "1wykpp325336kk7a1vnnjffankcw0kaw3jcfin53cp8hsx4bwfdp"; libraryHaskellDepends = [ base mtl StrappedTemplates text Wheb ]; description = "Strapped templates for Wheb"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -275252,7 +276100,7 @@ self: { sha256 = "1c1l79bdpqfg4n3p5gkc3x362m9k11hmyydr2y3j0xs4hhm3d5aa"; libraryHaskellDepends = [ base shelly template-haskell text ]; description = "Determine the full path to an executable"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "while-lang-parser" = callPackage @@ -275263,8 +276111,8 @@ self: { sha256 = "0dlq2rldak4lb0w8hcx7aigdj7b59crp1k130p36cha7zpqdixll"; libraryHaskellDepends = [ base indents parsec ]; description = "Parser for the While language"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -275283,8 +276131,8 @@ self: { base containers GLUT mtl OpenGL process random X11 ]; description = "A Haskell window manager"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -275296,8 +276144,8 @@ self: { sha256 = "0kbyv0q6z2d2plblafqcmwcfiyhdbijqnqg2w7qxr7dklka8245v"; libraryHaskellDepends = [ base parsec template-haskell ]; description = "Mustache templates with Template Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -275313,7 +276161,7 @@ self: { executableHaskellDepends = [ haskell98 random ]; description = "Whitespace, an esoteric programming language"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -275327,8 +276175,8 @@ self: { editedCabalFile = "07jpszzhzfygz920y09j4xrkw6pgwbpxqn79lavzz0w6jpd447y1"; libraryHaskellDepends = [ base network network-uri split ]; description = "WHOIS client library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -275345,7 +276193,7 @@ self: { base cairo colour directory hsnoise MonadRandom mtl random random-fu random-shuffle random-source relude temporary time ]; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "why3" = callPackage @@ -275363,8 +276211,8 @@ self: { ]; libraryToolDepends = [ alex happy ]; description = "Haskell support for the Why3 input format"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -275382,8 +276230,8 @@ self: { quickcheck-classes semirings ]; description = "Data types for large but fixed width signed and unsigned integers"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -275401,7 +276249,7 @@ self: { base criterion primitive random vector ]; description = "CG coefficients and Wigner symbols"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "wigner-ville-accelerate" = callPackage @@ -275413,8 +276261,8 @@ self: { libraryHaskellDepends = [ accelerate accelerate-fft base ]; testHaskellDepends = [ base wigner ]; description = "Wigner-ville transform using the Accelerate library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {wigner = null;}; @@ -275431,7 +276279,7 @@ self: { ]; testHaskellDepends = [ base bytestring filepath hspec time ]; description = "Scrape WikiCFP web site"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "wikipedia4epub" = callPackage @@ -275450,8 +276298,8 @@ self: { regex-base regex-posix tagsoup url xml zip-archive zlib ]; description = "Wikipedia EPUB E-Book construction from Firefox history"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -275470,7 +276318,7 @@ self: { base hspec microlens QuickCheck stm transformers ]; description = "Dynamic key binding framework"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "wild-bind-indicator" = callPackage @@ -275487,8 +276335,8 @@ self: { wild-bind ]; description = "Graphical indicator for WildBind"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -275505,8 +276353,8 @@ self: { ]; testHaskellDepends = [ base ]; description = "Task to install and export everything you need to use WildBind in X11"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -275526,7 +276374,7 @@ self: { async base hspec text time transformers wild-bind X11 ]; description = "X11-specific implementation for WildBind"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "wilton-ffi" = callPackage @@ -275537,7 +276385,7 @@ self: { sha256 = "1kpr1rg3nbvjvj29pa4b8ls52x0j6ixidnh6nm2jw3c2gplhmr5d"; libraryHaskellDepends = [ aeson base bytestring utf8-string ]; description = "Haskell modules support for Wilton JavaScript runtime"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "win-hp-path" = callPackage @@ -275551,7 +276399,7 @@ self: { libraryHaskellDepends = [ base split ]; executableHaskellDepends = [ base process split ]; description = "Work with multiple Haskell Platform versions on Windows"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "windns" = callPackage @@ -275565,8 +276413,8 @@ self: { libraryHaskellDepends = [ base bytestring deepseq ]; librarySystemDepends = [ dnsapi ]; description = "Domain Name Service (DNS) lookup via the <windns.h>/dnsapi.dll standard library"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {dnsapi = null;}; @@ -275584,8 +276432,8 @@ self: { base Crypto dataenc mtl network parsec pretty split time urlencoded ]; description = "Implements Windows Live Web Authentication and Delegated Authentication"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -275597,8 +276445,8 @@ self: { sha256 = "0xamx4yhyv264mka4ypp0r1xh3xv7ba31sis3lbhjycn4i07wlhd"; doHaddock = false; description = "Error handling for foreign calls to the Windows API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -275636,8 +276484,8 @@ self: { serialise store text vector ]; description = "A compact, well-typed seralisation format for Haskell values"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -275654,8 +276502,8 @@ self: { ]; librarySystemDepends = [ kernel32 ws2_32 ]; description = "I/O library for Windows"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {kernel32 = null; ws2_32 = null;}; @@ -275681,7 +276529,7 @@ self: { criterion io-streams transformers ]; description = "Fast binary io-streams adapter"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "wires" = callPackage @@ -275698,8 +276546,8 @@ self: { base deepseq mtl profunctors semigroupoids these ]; description = "Functional reactive programming library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -275716,8 +276564,8 @@ self: { base hspec mtl QuickCheck template-haskell transformers ]; description = "Wiring, promotion and demotion of types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -275732,7 +276580,7 @@ self: { libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base ]; description = "Access GPIO pins on Raspberry Pi via wiringPi library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "witch" = callPackage @@ -275748,7 +276596,7 @@ self: { base bytestring containers hspec QuickCheck text ]; description = "Convert values from one type into another"; - license = stdenv.lib.licenses.isc; + license = lib.licenses.isc; }) {}; "with-index" = callPackage @@ -275759,7 +276607,7 @@ self: { sha256 = "0dv81mp66l0j0dfa0mm9vqmdfxvhfg5py1gxqwh1jvpr8iks1q8q"; libraryHaskellDepends = [ base ]; description = "A tiny library for composing indexed traversals"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "with-location" = callPackage @@ -275771,7 +276619,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "Use ImplicitParams-based source locations in a backward compatible way"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "with-utf8" = callPackage @@ -275795,7 +276643,7 @@ self: { ]; testToolDepends = [ tasty-discover ]; description = "Get your IO right on the first try"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "withdependencies" = callPackage @@ -275811,25 +276659,30 @@ self: { ]; testHaskellDepends = [ base conduit hspec HUnit mtl ]; description = "Run computations that depend on one or more elements in a stream"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "witherable" = callPackage - ({ mkDerivation, base, base-orphans, containers, hashable, lens - , monoidal-containers, transformers, transformers-compat - , unordered-containers, vector, witherable-class + ({ mkDerivation, base, base-orphans, containers, hashable + , indexed-traversable, indexed-traversable-instances, QuickCheck + , quickcheck-instances, tasty, tasty-quickcheck, transformers + , unordered-containers, vector }: mkDerivation { pname = "witherable"; - version = "0.3.5"; - sha256 = "13r4g5fg3fgl3zall0daljivnk4gm1lm2s8qir1izwkmq25081wb"; + version = "0.4.1"; + sha256 = "1jj2dq0ddaa2v3hksnrv1z1ll19fa4npsqlp7fs4nn5g6833y58b"; libraryHaskellDepends = [ - base base-orphans containers hashable lens monoidal-containers - transformers transformers-compat unordered-containers vector - witherable-class + base base-orphans containers hashable indexed-traversable + indexed-traversable-instances transformers unordered-containers + vector + ]; + testHaskellDepends = [ + base containers hashable QuickCheck quickcheck-instances tasty + tasty-quickcheck transformers unordered-containers vector ]; description = "filterable traversable"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "witherable-class" = callPackage @@ -275845,7 +276698,19 @@ self: { unordered-containers vector ]; description = "Witherable = Traversable + Filterable"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; + }) {}; + + "witherable-class_0_0_1" = callPackage + ({ mkDerivation, base, witherable }: + mkDerivation { + pname = "witherable-class"; + version = "0.0.1"; + sha256 = "0995ixa9yzym7fsrgj77j0lyz7y5nnbkn0m2ndxdc401viyhkigd"; + libraryHaskellDepends = [ base witherable ]; + description = "Witherable = Traversable + Filterable"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "within" = callPackage @@ -275860,7 +276725,7 @@ self: { base comonad exceptions free hashable path path-like ]; description = "A value within another path"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "witness" = callPackage @@ -275875,7 +276740,7 @@ self: { base constraints countable semigroupoids transformers ]; description = "values that witness types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "witty" = callPackage @@ -275888,8 +276753,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base bytestring network unix ]; description = "A network server to show bottlenecks of GHC"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -275901,7 +276766,7 @@ self: { sha256 = "0bldcvd7zjask8myh1nwj59ml4q6wlinp2h7q6hdfjg8djf2mnca"; libraryHaskellDepends = [ base transformers ]; description = "the fantastical wizard monoid"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "wizards" = callPackage @@ -275918,7 +276783,7 @@ self: { base containers control-monad-free haskeline mtl transformers ]; description = "High level, generic library for interrogative user interfaces"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "wkt" = callPackage @@ -275936,8 +276801,8 @@ self: { base filepath lens linear tasty tasty-golden trifecta ]; description = "Parsec parsers and types for geographic data in well-known text (WKT) format"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -275961,8 +276826,8 @@ self: { scientific trifecta vector ]; description = "A parser of WKT, WKB and eWKB"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -275974,7 +276839,7 @@ self: { sha256 = "0kn7y8pdrv8f87zhd5mifcl8fy3b2zvnzmzwhdqhxxlyzwiq6z0c"; libraryHaskellDepends = [ base ]; description = "The Wadler/Leijen Pretty Printer"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "wl-pprint-annotated" = callPackage @@ -275990,7 +276855,7 @@ self: { base containers deepseq tasty tasty-hunit text ]; description = "Pretty printer with annotation support"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "wl-pprint-ansiterm" = callPackage @@ -276006,8 +276871,8 @@ self: { transformers wl-pprint-extras ]; description = "ANSI Terminal support with wl-pprint-extras"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -276023,7 +276888,7 @@ self: { base bytestring colorful-monoids text wl-pprint-annotated ]; description = "Wadler/Leijen pretty printer supporting colorful console output"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "wl-pprint-extras" = callPackage @@ -276042,8 +276907,8 @@ self: { base HUnit test-framework test-framework-hunit ]; description = "A free monad based on the Wadler/Leijen pretty printer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -276061,8 +276926,8 @@ self: { transformers wl-pprint-extras ]; description = "A color pretty printer with terminfo support"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -276074,7 +276939,7 @@ self: { sha256 = "030ckgzz14sv2c317g4j5g68hyq9xi40cmv0apwclw6sc6xgsvly"; libraryHaskellDepends = [ base base-compat text ]; description = "A Wadler/Leijen Pretty Printer for Text values"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "wlc-hs" = callPackage @@ -276092,8 +276957,8 @@ self: { librarySystemDepends = [ wlc ]; libraryToolDepends = [ c2hs ]; description = "Haskell bindings for the wlc library"; - license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; broken = true; }) {wlc = null;}; @@ -276129,8 +276994,8 @@ self: { safe system-fileio system-filepath text transformers ]; description = "A simple and highly performant HTTP file server"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -276142,8 +277007,8 @@ self: { sha256 = "0f0pa2vlp56j35llhzq1qqkwkfpm7r96av8jw22jngd0kcpc185b"; libraryHaskellDepends = [ base ]; description = "Convenient typeclass for defining arbitrary-index enums"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -276159,8 +277024,8 @@ self: { base binary bytestring filepath zlib ]; description = "Web Open Font Format (WOFF) unpacker"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -276175,8 +277040,8 @@ self: { libraryHaskellDepends = [ base bytestring network split ]; executableHaskellDepends = [ base ]; description = "Send a Wake on LAN Magic Packet"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -276199,8 +277064,8 @@ self: { ]; executableHaskellDepends = [ base optparse-generic ]; description = "Amazon Simple Workflow Service Wrapper"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -276213,7 +277078,7 @@ self: { libraryHaskellDepends = [ base vector ]; testHaskellDepends = [ base hspec vector ]; description = "Real time group editor without operational transform"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "word" = callPackage @@ -276231,8 +277096,8 @@ self: { ]; testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; description = "Words of arbitrary size"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -276247,7 +277112,7 @@ self: { libraryHaskellDepends = [ base binary containers ]; testHaskellDepends = [ base binary containers hspec QuickCheck ]; description = "Implementation of a finite trie over words"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }) {}; "word-vector" = callPackage @@ -276258,7 +277123,7 @@ self: { sha256 = "1fkbxrr7qh6dj9w7wihxjvb3d8kgcymz0zp8avnqpx5jsvwd5jdm"; libraryHaskellDepends = [ base bytestring ghc-prim vector ]; description = "Initial project template from stack"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "word-wrap" = callPackage @@ -276273,7 +277138,7 @@ self: { testHaskellDepends = [ base hspec ]; benchmarkHaskellDepends = [ base criterion text ]; description = "A library for word-wrapping"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "word24" = callPackage @@ -276290,7 +277155,7 @@ self: { ]; benchmarkHaskellDepends = [ base criterion deepseq ]; description = "24-bit word and int types for GHC"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "word2vec-model" = callPackage @@ -276317,8 +277182,8 @@ self: { unordered-containers vector ]; description = "Reading word2vec binary models"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -276332,7 +277197,7 @@ self: { testHaskellDepends = [ base hspec ]; benchmarkHaskellDepends = [ base bytestring criterion ]; description = "Word8 library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "wordchoice" = callPackage @@ -276358,8 +277223,8 @@ self: { testHaskellDepends = [ base ]; benchmarkHaskellDepends = [ base criterion pandoc text ]; description = "Get word counts and distributions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -276371,7 +277236,7 @@ self: { sha256 = "1jdcv5h41k5xckviyc0p0k0q68s371llcvmkdbg78vh4b3xw7cd5"; doHaddock = false; description = "None"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "wordexp" = callPackage @@ -276383,7 +277248,7 @@ self: { libraryHaskellDepends = [ array base semigroups ]; libraryToolDepends = [ c2hs ]; description = "wordexp(3) wrappers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "wordify" = callPackage @@ -276412,8 +277277,8 @@ self: { test-framework-hunit test-framework-quickcheck2 transformers unordered-containers ]; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -276432,8 +277297,8 @@ self: { base MonadRandom optparse-applicative text vector ]; description = "Command-line tool to get random words"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -276454,7 +277319,7 @@ self: { benchmarkHaskellDepends = [ base deepseq gauge OddWord weigh ]; doHaddock = false; description = "arbitrary bit size Words"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "wordpass" = callPackage @@ -276476,8 +277341,8 @@ self: { QuickCheck text unix-compat vector ]; description = "Dictionary-based password generator"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -276496,7 +277361,7 @@ self: { uri-encode ]; description = "Validate Wordpress Cookies & Nonces; Build Wordpress Hashes & Salts"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "words" = callPackage @@ -276508,7 +277373,7 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base directory text ]; description = "Cross-platform access to a list of words"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "wordsearch" = callPackage @@ -276522,8 +277387,8 @@ self: { libraryHaskellDepends = [ array base containers fclabels ]; executableHaskellDepends = [ base containers fclabels ]; description = "A word search solver library and executable"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -276542,7 +277407,7 @@ self: { process ]; description = "Compare two files as sets of N-tuples of words"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "work-time" = callPackage @@ -276556,8 +277421,8 @@ self: { libraryHaskellDepends = [ base containers megaparsec text ]; executableHaskellDepends = [ base text ]; description = "A library for parsing a chat-based work hour reporting scheme"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -276570,8 +277435,8 @@ self: { libraryHaskellDepends = [ base containers time ]; testHaskellDepends = [ base containers doctest hspec ]; description = "Workday calculations"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -276594,8 +277459,8 @@ self: { testHaskellDepends = [ base doctest hspec QuickCheck ]; benchmarkHaskellDepends = [ base criterion deepseq ]; description = "Utilities (e.g. Googling the clipboard contents) for the `workflow` pacakge"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -276615,8 +277480,8 @@ self: { ]; executableHaskellDepends = [ base ]; description = "a \"Desktop Workflow\" monad with Objective-C bindings"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -276639,8 +277504,8 @@ self: { testHaskellDepends = [ base doctest hspec QuickCheck ]; benchmarkHaskellDepends = [ base criterion deepseq ]; description = "manipulate `workflow-types:Workflow`'s"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -276659,8 +277524,8 @@ self: { ]; executableHaskellDepends = [ base ]; description = "Automate keyboard\\/mouse\\/clipboard\\/application interaction"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -276675,8 +277540,8 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base doctest hspec QuickCheck ]; description = "Automate keyboard/mouse/clipboard/application interaction"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -276693,7 +277558,7 @@ self: { base doctest Glob should-not-typecheck tasty tasty-hunit text ]; description = "Open Union and Open Product Types"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "worldturtle" = callPackage @@ -276704,7 +277569,7 @@ self: { sha256 = "0h5r74ba0wjhyp8yl3clxgq5yfdr51fdkfn2xz4ahizxycyrx14f"; libraryHaskellDepends = [ base containers gloss lens matrix mtl ]; description = "Turtle graphics"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "wp-archivebot" = callPackage @@ -276719,8 +277584,8 @@ self: { base feed HTTP network parallel tagsoup ]; description = "Subscribe to a wiki's RSS feed and archive external links"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -276732,7 +277597,7 @@ self: { sha256 = "03pmfwwx2ykjglzrc4k09q2lv8piq107j32dg0r1aadj2ysc9fzq"; libraryHaskellDepends = [ base ]; description = "Wrap a function's return value with another function"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "wraparound" = callPackage @@ -276743,7 +277608,7 @@ self: { sha256 = "161mz5bfmx13s9azh3dss64fw98vbaab8krysr9pbbp9dh79i1cf"; libraryHaskellDepends = [ base ]; description = "Convenient handling of points on a seamless 2-dimensional plane"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "wraxml" = callPackage @@ -276764,7 +277629,7 @@ self: { ]; description = "Lazy wrapper to HaXML, HXT, TagSoup via custom XML tree structure"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -276803,8 +277668,8 @@ self: { optparse-applicative transformers wreq ]; description = "An HTTP Performance Benchmarker"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -276837,8 +277702,8 @@ self: { resourcet scotty stm temporary text time transformers wai-cors ]; description = "A web interface for Wrecker, the HTTP Performance Benchmarker"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -276879,7 +277744,7 @@ self: { transformers unix-compat unordered-containers uuid vector ]; description = "An easy-to-use HTTP client library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "wreq-helper" = callPackage @@ -276894,7 +277759,7 @@ self: { aeson aeson-result base bytestring http-client lens text wreq ]; description = "Wreq response process"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "wreq-patchable" = callPackage @@ -276932,8 +277797,8 @@ self: { transformers unix-compat unordered-containers uuid vector ]; description = "An easy-to-use HTTP client library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -276971,8 +277836,8 @@ self: { transformers unix-compat uuid vector ]; description = "An easy-to-use HTTP client library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -276984,7 +277849,7 @@ self: { sha256 = "0dgjjybbc4nza1a0af2j8jxscyhlcwdspmvy8zsmcczzcdhx2b2h"; libraryHaskellDepends = [ base bytestring text utf8-string wreq ]; description = "Simple wrapper to use wreq without Strings"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "wright" = callPackage @@ -277001,8 +277866,8 @@ self: { assertions base bed-and-breakfast containers filepath lens ]; description = "Colour space transformations and metrics"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -277019,7 +277884,7 @@ self: { monad-control mtl stm stm-chans ]; description = "Buffer your writes, transparently"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "write-buffer-stm" = callPackage @@ -277030,7 +277895,7 @@ self: { sha256 = "0q03pnkw3343jmcs2f2mrx84g3wj3plcagnjdviphzsg7rrf3a4l"; libraryHaskellDepends = [ base stm stm-chans write-buffer-core ]; description = "A write buffer for STM channels and queues"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "writer-cps-exceptions" = callPackage @@ -277045,7 +277910,7 @@ self: { base exceptions transformers writer-cps-transformers ]; description = "Control.Monad.Catch instances for the stricter CPS WriterT and RWST"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "writer-cps-full" = callPackage @@ -277063,8 +277928,8 @@ self: { writer-cps-transformers ]; description = "WriteT and RWST monad transformers (Reexport with all dependencies)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -277081,8 +277946,8 @@ self: { writer-cps-transformers ]; description = "Lens instances for the stricter CPS WriterT and RWST"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -277098,8 +277963,8 @@ self: { base monads-tf transformers writer-cps-transformers ]; description = "MonadWriter orphan instances for writer-cps-transformers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -277113,8 +277978,8 @@ self: { editedCabalFile = "0dqpbpaidwa7ahk0n7pv397mv7ncr26p3vcrjh1xzl6vk26bdah5"; libraryHaskellDepends = [ base mmorph writer-cps-transformers ]; description = "MFunctor instance for CPS style WriterT and RWST"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -277129,7 +277994,7 @@ self: { base mtl transformers writer-cps-transformers ]; description = "MonadWriter orphan instances for writer-cps-transformers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "writer-cps-transformers" = callPackage @@ -277141,7 +278006,7 @@ self: { libraryHaskellDepends = [ base transformers ]; doHaddock = false; description = "WriteT and RWST monad transformers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "wryte" = callPackage @@ -277153,7 +278018,7 @@ self: { libraryHaskellDepends = [ base mtl text ]; testHaskellDepends = [ base ]; description = "Pretty output for source generators"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ws" = callPackage @@ -277177,8 +278042,8 @@ self: { websockets wuss ]; description = "A simple CLI utility for interacting with a websocket"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -277201,7 +278066,7 @@ self: { wai-websockets warp websockets ]; description = "Unagi chan based websocket client"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "wsdl" = callPackage @@ -277220,8 +278085,8 @@ self: { base bytestring file-embed hspec network-uri ]; description = "WSDL parsing in Haskell"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -277239,8 +278104,8 @@ self: { base bencode bytestring containers directory safe utf8-string ]; description = "A small tool to list, add and remove webseeds from a torrent file"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -277262,8 +278127,8 @@ self: { wai-app-static wai-websockets warp websockets ]; description = "Terminal emulator over websockets"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -277282,8 +278147,8 @@ self: { ]; executableHaskellDepends = [ base ]; description = "WSJT-X UDP protocol"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -277302,8 +278167,8 @@ self: { ]; testHaskellDepends = [ base bytestring envy hspec skews text ]; description = "A-little-higher-level WebSocket client"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -277332,8 +278197,8 @@ self: { network-conduit-tls streaming-commons text ]; description = "Initial project template from stack"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -277345,8 +278210,8 @@ self: { sha256 = "080y0ks5q6bv7dvla08x4cvcmzd13b5v1c5p5336k0vkg2c3fq79"; libraryHaskellDepends = [ base old-locale time transformers ]; description = "Wojcik Tool Kit"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -277362,8 +278227,8 @@ self: { base containers gtk lenses mtl old-locale parsec time wtk ]; description = "GTK tools within Wojcik Tool Kit"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -277379,8 +278244,8 @@ self: { base directory symbolic-link unix yaml ]; description = "Unimportant Unix adminstration tool"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -277396,8 +278261,8 @@ self: { base containers directory filepath vector-space wumpus-core ]; description = "Basic objects and system code built on Wumpus-Core"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -277411,8 +278276,8 @@ self: { editedCabalFile = "1jszf2hdipr9iry6pcdhhk42aglcq6m3zvg9rgmnickfdzd4k71h"; libraryHaskellDepends = [ base containers time vector-space ]; description = "Pure Haskell PostScript and SVG generation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -277428,8 +278293,8 @@ self: { base containers vector-space wumpus-basic wumpus-core ]; description = "High-level drawing objects built on Wumpus-Basic"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -277445,8 +278310,8 @@ self: { base vector-space wumpus-basic wumpus-core wumpus-drawing ]; description = "Microprints - \"greek-text\" pictures"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -277463,8 +278328,8 @@ self: { wumpus-drawing ]; description = "Drawing trees"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -277479,7 +278344,7 @@ self: { base bytestring connection network websockets ]; description = "Secure WebSocket (WSS) clients"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "wx" = callPackage @@ -277492,7 +278357,7 @@ self: { libraryHaskellDepends = [ base stm time wxcore ]; description = "wxHaskell"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "wxAsteroids" = callPackage @@ -277506,8 +278371,8 @@ self: { enableSeparateDataOutput = true; executableHaskellDepends = [ base directory random wx wxcore ]; description = "Try to avoid the asteroids with your space ship"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -277522,8 +278387,8 @@ self: { libraryHaskellDepends = [ base old-time wx wxcore Yampa ]; executableHaskellDepends = [ base wx wxcore Yampa ]; description = "An implementation of Fruit using wxHaskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -277535,8 +278400,8 @@ self: { sha256 = "0q90djdvma20ngnp45q0kkyv2p1jsmsc7p9rzv76sywzqilha852"; libraryHaskellDepends = [ base cubicbezier wx wxcore ]; description = "Simple zoomable canvas for wxHaskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -277561,7 +278426,7 @@ self: { postPatch = "sed -i -e '/ldconfig inst_lib_dir/d' Setup.hs"; description = "wxHaskell C++ wrapper"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; inherit (pkgs) wxGTK;}; @@ -277582,7 +278447,7 @@ self: { libraryPkgconfigDepends = [ wxGTK ]; description = "wxHaskell core"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) wxGTK;}; "wxdirect" = callPackage @@ -277599,8 +278464,8 @@ self: { base containers directory filepath parsec process strict time ]; description = "helper tool for building wxHaskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -277615,8 +278480,8 @@ self: { enableSeparateDataOutput = true; executableHaskellDepends = [ base wx wxcore ]; description = "An example of how to implement a basic notepad with wxHaskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -277632,8 +278497,8 @@ self: { base convertible Imlib wx yjsvg yjtools ]; description = "turtle like LOGO with wxHaskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -277655,7 +278520,7 @@ self: { semigroups terminal-size text transformers unix ]; description = "Console line fuzzy search"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }) {}; "wyvern" = callPackage @@ -277673,8 +278538,8 @@ self: { parsec process sgf split ]; description = "An autoresponder for Dragon Go Server"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -277691,8 +278556,8 @@ self: { type-level ]; description = "A embedded DSL for manipulating DSP languages in Haskell"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -277706,7 +278571,7 @@ self: { editedCabalFile = "1c561z9xvfcd7ddbiw3r0frhjvsrklachd38s66fzwjdgw1sl124"; libraryHaskellDepends = [ base utf8-string X11 ]; description = "A binding to the xim of X11 graphics library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "x11-xinput" = callPackage @@ -277719,7 +278584,7 @@ self: { librarySystemDepends = [ libXi ]; libraryToolDepends = [ c2hs ]; description = "Haskell FFI bindings for X11 XInput library (-lXi)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs.xorg) libXi;}; "x509" = callPackage @@ -277742,7 +278607,7 @@ self: { tasty-quickcheck ]; description = "X509 reader and writer"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "x509-store" = callPackage @@ -277762,7 +278627,7 @@ self: { ]; testHaskellDepends = [ base bytestring tasty tasty-hunit x509 ]; description = "X.509 collection accessing and storing methods"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "x509-system" = callPackage @@ -277778,7 +278643,7 @@ self: { x509-store ]; description = "Handle per-operating-system X.509 accessors and storage"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "x509-util" = callPackage @@ -277797,7 +278662,7 @@ self: { hourglass memory pem x509 x509-store x509-system x509-validation ]; description = "Utility for X509 certificate and chain"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "x509-validation" = callPackage @@ -277819,7 +278684,7 @@ self: { x509-store ]; description = "X.509 Certificate and CRL validation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "x86-64bit" = callPackage @@ -277835,7 +278700,7 @@ self: { base deepseq monads-tf QuickCheck tardis vector ]; description = "Runtime code generation for x86 64 bit machine code"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "xattr" = callPackage @@ -277853,8 +278718,8 @@ self: { test-framework-hunit unix ]; description = "Haskell extended file attributes interface"; - license = stdenv.lib.licenses.bsd3; - platforms = [ "i686-linux" "x86_64-linux" ]; + license = lib.licenses.bsd3; + platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) attr;}; "xbattbar" = callPackage @@ -277867,7 +278732,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base old-time select X11 ]; description = "Simple battery indicator"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "xcb-types" = callPackage @@ -277878,7 +278743,7 @@ self: { sha256 = "1168vg2f3qd5yiwg2fcps0ciqpwns6scyk89bd07ws3qh6kayqfr"; libraryHaskellDepends = [ base containers mtl pretty xml ]; description = "Parses XML files used by the XCB project"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "xcffib" = callPackage @@ -277907,7 +278772,7 @@ self: { ]; description = "A cffi-based python binding for X"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "xchat-plugin" = callPackage @@ -277924,8 +278789,8 @@ self: { base directory filepath process unix ]; description = "XChat"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -277941,8 +278806,8 @@ self: { base bytestring containers mtl network transformers ]; description = "Partial implementation of the XCP protocol with ethernet as transport layer"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -277968,8 +278833,8 @@ self: { text transformers transformers-base unix-compat ]; description = "A wget-like utility for retrieving files from XDCC bots on IRC"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -277981,7 +278846,7 @@ self: { sha256 = "0azlzaxp2dn4l1nr7shsxah2magk1szf6fx0mv75az00qsjw6qg4"; libraryHaskellDepends = [ base directory filepath ]; description = "A basic implementation of the XDG Base Directory specification"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "xdg-desktop-entry" = callPackage @@ -277997,7 +278862,7 @@ self: { transformers unix ]; description = "Parse files conforming to the xdg desktop entry spec"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "xdg-userdirs" = callPackage @@ -278011,7 +278876,7 @@ self: { base containers directory filepath xdg-basedir ]; description = "Basic implementation of XDG user directories specification"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "xdot" = callPackage @@ -278031,8 +278896,8 @@ self: { base cairo deepseq graphviz gtk3 text transformers ]; description = "Parse Graphviz xdot files and interactively view them using GTK and Cairo"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -278055,7 +278920,7 @@ self: { ghc-prim hexml hexpat time weigh xml ]; description = "A fast event-based XML parser in pure Haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "xenstore" = callPackage @@ -278068,8 +278933,8 @@ self: { isExecutable = true; libraryHaskellDepends = [ base bytestring cereal mtl network ]; description = "Xenstore client access"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -278090,8 +278955,8 @@ self: { libraryPkgconfigDepends = [ libxfconf ]; libraryToolDepends = [ gtk2hs-buildtools ]; description = "FFI bindings to xfconf"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {libxfconf = null;}; @@ -278104,8 +278969,8 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Extensible, type-safe formatting with scanf- and printf-like functions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -278121,7 +278986,7 @@ self: { executableHaskellDepends = [ base foundation ]; executableSystemDepends = [ xgboost ]; description = "XGBoost library for Haskell"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {inherit (pkgs) xgboost;}; "xhaskell-library" = callPackage @@ -278136,8 +279001,8 @@ self: { base bytestring containers ghc-prim mtl parsec regex-base ]; description = "Replaces/Enhances Text.Regex"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -278154,8 +279019,8 @@ self: { Xauth ]; description = "X Haskell Bindings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -278171,8 +279036,8 @@ self: { base hashable mtl transformers unordered-containers xhb ]; description = "Atom cache for XHB"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -278189,8 +279054,8 @@ self: { xhb-atom-cache ]; description = "EWMH utilities for XHB"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -278202,8 +279067,8 @@ self: { sha256 = "0939kwpinq6l4n3nyvd1gzyl7f83gymw0wzqndlgy1yc7q0nkj2w"; libraryHaskellDepends = [ base ]; description = "An XHTML combinator library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "xhtml-combinators" = callPackage @@ -278217,7 +279082,7 @@ self: { base containers random text transformers xml ]; description = "Fast and easy to use XHTML combinators"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "xilinx-lava" = callPackage @@ -278233,8 +279098,8 @@ self: { ]; executableHaskellDepends = [ base directory process ]; description = "The Lava system for Xilinx FPGA design with layout combinators"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -278250,7 +279115,7 @@ self: { libraryToolDepends = [ c2hs ]; description = "Bindings to xine-lib"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {libxine = null; xine = null;}; @@ -278274,8 +279139,8 @@ self: { aeson base bytestring containers HTF text time ]; description = "Wrapper for the XING API, v1"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -278291,7 +279156,7 @@ self: { base bytestring conduit conduit-extra transformers ]; description = "Conduit of keys pressed by xinput"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "xkbcommon" = callPackage @@ -278315,8 +279180,8 @@ self: { testHaskellDepends = [ base unix ]; benchmarkHaskellDepends = [ base random time vector ]; description = "Haskell bindings for libxkbcommon"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) libxkbcommon;}; @@ -278336,8 +279201,8 @@ self: { base bytestring directory filepath HTTP network tagsoup ]; description = "Downloads the most recent xkcd comic"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -278353,8 +279218,8 @@ self: { isExecutable = true; libraryHaskellDepends = [ base containers mtl xml ]; description = "A simple monadic language for parsing XML structures"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -278376,8 +279241,8 @@ self: { ]; testHaskellDepends = [ base hspec ]; description = "Parse Microsoft Excel xls files (BIFF/Excel 97-2004)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -278401,8 +279266,8 @@ self: { zip-archive ]; description = "Streaming Excel file generation and parsing"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -278431,8 +279296,8 @@ self: { ]; benchmarkHaskellDepends = [ base bytestring criterion ]; description = "Simple and incomplete Excel file parser/writer"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -278449,8 +279314,8 @@ self: { ]; testHaskellDepends = [ base ]; description = "Xlsx table cell value extraction utility"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -278469,8 +279334,8 @@ self: { transformers xlsx ]; description = "Simple and incomplete Excel file templater"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -278484,7 +279349,7 @@ self: { editedCabalFile = "15cxa19dp8nqvrrp0bmndkdas2jzg573x8ri75r6kiv8r4vkv8y7"; libraryHaskellDepends = [ base bytestring text ]; description = "A simple XML library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "xml-basic" = callPackage @@ -278500,7 +279365,7 @@ self: { utility-ht ]; description = "Basics for XML/HTML representation and processing"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "xml-catalog" = callPackage @@ -278516,35 +279381,11 @@ self: { xml-conduit ]; description = "Parse XML catalog files (deprecated)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; - "xml-conduit_1_8_0_1" = callPackage - ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup - , bytestring, conduit, conduit-extra, containers - , data-default-class, deepseq, doctest, hspec, HUnit, resourcet - , text, transformers, xml-types - }: - mkDerivation { - pname = "xml-conduit"; - version = "1.8.0.1"; - sha256 = "177gmyigxql1pn3ncz0r8annwv5cbxnihbgrrg1dhm4gmc9jy2wq"; - libraryHaskellDepends = [ - attoparsec base blaze-html blaze-markup bytestring conduit - conduit-extra containers data-default-class deepseq resourcet text - transformers xml-types - ]; - testHaskellDepends = [ - base blaze-markup bytestring conduit containers doctest hspec HUnit - resourcet text transformers xml-types - ]; - description = "Pure-Haskell utilities for dealing with XML with the conduit package"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "xml-conduit" = callPackage ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup , bytestring, conduit, conduit-extra, containers @@ -278565,7 +279406,7 @@ self: { resourcet text transformers xml-types ]; description = "Pure-Haskell utilities for dealing with XML with the conduit package"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "xml-conduit-decode" = callPackage @@ -278584,8 +279425,8 @@ self: { xml-types ]; description = "Historical cursors & decoding on top of xml-conduit"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -278610,7 +279451,7 @@ self: { ]; description = "Streaming XML parser based on conduits"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "xml-conduit-stylist" = callPackage @@ -278621,13 +279462,15 @@ self: { pname = "xml-conduit-stylist"; version = "2.3.0.0"; sha256 = "15iznb6xpas8044p03w3vll4vv7zwpcbbrh59ywwjr8m45659p4w"; + revision = "1"; + editedCabalFile = "0ydqjrk5q3zzgrwk9cqcjlk3vafzcnxjvb7p74ywm5wfnhmfvmyn"; libraryHaskellDepends = [ base containers css-syntax network-uri stylist text unordered-containers xml-conduit ]; description = "Bridge between xml-conduit/html-conduit and stylist"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -278644,7 +279487,7 @@ self: { ]; testHaskellDepends = [ base text ]; description = "Warm and fuzzy creation of XML documents"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "xml-enumerator" = callPackage @@ -278667,8 +279510,8 @@ self: { xml-types ]; description = "Pure-Haskell utilities for dealing with XML with the enumerator package. (deprecated)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -278686,8 +279529,8 @@ self: { base containers enumerator xml-enumerator xml-types ]; description = "Parser combinators for xml-enumerator and compatible XML parsers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -278695,12 +279538,12 @@ self: { ({ mkDerivation, base, mtl, transformers, xml }: mkDerivation { pname = "xml-extractors"; - version = "0.4.0.2"; - sha256 = "0ivzl1ikijrbz5mi75rxa340dxf7ilyzlxzka25si91jmjq0a9xa"; + version = "0.4.0.3"; + sha256 = "0g1f5yhzipwyny0yrsns03l024yphz8978w05xfk09f5vkrfxb0w"; libraryHaskellDepends = [ base mtl transformers xml ]; description = "Extension to the xml package to extract data from parsed xml"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -278721,7 +279564,7 @@ self: { text xml-conduit ]; description = "Hamlet-style quasiquoter for XML content"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "xml-helpers" = callPackage @@ -278732,7 +279575,7 @@ self: { sha256 = "0rrk0j7m8ws86hbjw0l4ryq4m9i8llhsag2sfisy5r1iv2zwa0lv"; libraryHaskellDepends = [ base xml ]; description = "Some useful helper functions for the xml library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "xml-html-conduit-lens" = callPackage @@ -278750,8 +279593,8 @@ self: { base doctest hspec hspec-expectations-lens lens xml-conduit ]; description = "Optics for xml-conduit and html-conduit"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -278774,7 +279617,7 @@ self: { base doctest Glob tasty tasty-hunit text xml-conduit ]; description = "Quasi-quoters for XML and HTML Documents"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "xml-indexed-cursor" = callPackage @@ -278793,7 +279636,7 @@ self: { xml-conduit ]; description = "Indexed XML cursors similar to 'Text.XML.Cursor' from xml-conduit"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "xml-isogen" = callPackage @@ -278816,7 +279659,7 @@ self: { xml-conduit-writer ]; description = "Generate XML-isomorphic types"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "xml-lens" = callPackage @@ -278825,31 +279668,13 @@ self: { }: mkDerivation { pname = "xml-lens"; - version = "0.2"; - sha256 = "1jvi8xcsvwzvh44karnsp9br6bfn59s5vhizwycg4fi7ljhm8fm3"; - revision = "1"; - editedCabalFile = "0agp2gpzzgrpy831cj47r8fi91r0s68a7bl8fqvbb1ya7jfadfll"; - libraryHaskellDepends = [ - base case-insensitive containers lens text xml-conduit - ]; - description = "Lenses, traversals, and prisms for xml-conduit"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "xml-lens_0_3" = callPackage - ({ mkDerivation, base, case-insensitive, containers, lens, text - , xml-conduit - }: - mkDerivation { - pname = "xml-lens"; version = "0.3"; sha256 = "1i3b22sz7fkh9vjlfpwzz6fg57br8xq6q7zz76f66h6hymc284dz"; libraryHaskellDepends = [ base case-insensitive containers lens text xml-conduit ]; description = "Lenses, traversals, and prisms for xml-conduit"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; }) {}; "xml-monad" = callPackage @@ -278863,11 +279688,25 @@ self: { base mtl transformers transformers-compose xml ]; description = "Monadic extensions to the xml package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; + "xml-optics" = callPackage + ({ mkDerivation, base, containers, optics-core, text, xml-conduit + }: + mkDerivation { + pname = "xml-optics"; + version = "0.1.0"; + sha256 = "01sa1hk87aw32wafxxnvnljazi78bnishpmk5k77p28jmhpa1gn8"; + libraryHaskellDepends = [ + base containers optics-core text xml-conduit + ]; + description = "Optics for xml-conduit"; + license = lib.licenses.bsd3; + }) {}; + "xml-parsec" = callPackage ({ mkDerivation, base, HaXml, parsec }: mkDerivation { @@ -278877,7 +279716,7 @@ self: { libraryHaskellDepends = [ base HaXml parsec ]; description = "Parsing XML with Parsec"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -278895,7 +279734,7 @@ self: { xml-types ]; description = "XML picklers based on xml-types, ported from hexpat-pickle"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "xml-pipe" = callPackage @@ -278906,8 +279745,8 @@ self: { sha256 = "0j5fjnf6r7cagcl1ni5idwj1k5q6vjp6c59ajwsx39iqx1kdmly4"; libraryHaskellDepends = [ base bytestring papillon simple-pipe ]; description = "XML parser which uses simple-pipe"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -278922,8 +279761,8 @@ self: { libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base cmdargs unix ]; description = "Pretty print XML"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -278944,8 +279783,8 @@ self: { x509 x509-store x509-validation xml-pipe xmpipe ]; description = "Push XML from/to client to/from server over XMPP or HTTP"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -278957,8 +279796,8 @@ self: { sha256 = "16wszpvz8cp8nx18rmgyjy6mqk9awd3yf9w0is5rw77r73w88nwq"; libraryHaskellDepends = [ base-prelude free text ]; description = "A parser-agnostic declarative API for querying XML-documents"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -278975,8 +279814,8 @@ self: { xml-types ]; description = "A binding for the \"xml-query\" and \"xml-conduit\" libraries"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -279000,8 +279839,8 @@ self: { tasty-smallcheck text xml-conduit xml-query xml-types ]; description = "An interpreter of \"xml-query\" queries for the \"xml-types\" documents"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -279023,7 +279862,7 @@ self: { ]; executableHaskellDepends = [ base ]; description = "Library and command line tool for converting XML files to json"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "xml-to-json-fast" = callPackage @@ -279037,7 +279876,7 @@ self: { libraryHaskellDepends = [ base tagsoup text ]; executableHaskellDepends = [ base directory process ]; description = "Fast, light converter of xml to json capable of handling huge xml files"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "xml-tydom-conduit" = callPackage @@ -279058,8 +279897,8 @@ self: { tasty-quickcheck text time xml-conduit ]; description = "Typed XML encoding for an xml-conduit backend"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -279071,8 +279910,8 @@ self: { sha256 = "09svwcfcqmxrczs7qb4haf68dnb8q47cm19f504cqfnr4brs093l"; libraryHaskellDepends = [ base containers mtl QuickCheck text ]; description = "Typed XML encoding (core library)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -279084,7 +279923,7 @@ self: { sha256 = "102cm0nvfmf9gn8hvn5z8qvmg931laczs33wwd5iyz9bc37f9mfs"; libraryHaskellDepends = [ base deepseq text ]; description = "Basic types for representing XML"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "xml2html" = callPackage @@ -279095,7 +279934,7 @@ self: { sha256 = "1kf4vjg4cfkd4vx8jpikbb0ib4pglmyf5vqrg3j0yllmycj22ska"; libraryHaskellDepends = [ base xml-conduit ]; description = "blaze-html instances for xml-conduit types (deprecated)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "xml2json" = callPackage @@ -279124,8 +279963,8 @@ self: { aeson base bytestring hspec resourcet text transformers ]; description = "translate xml to json"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -279145,7 +279984,7 @@ self: { ]; description = "Convert BLAST output in XML format to CSV or HTML"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -279167,7 +280006,7 @@ self: { tasty-quickcheck text transformers ]; description = "XML back and forth! Parser, renderer, ToXml, FromXml, fixpoints"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "xmlbf-xeno" = callPackage @@ -279187,7 +280026,7 @@ self: { tasty-quickcheck text unordered-containers xmlbf ]; description = "xeno backend support for the xmlbf library"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "xmlbf-xmlhtml" = callPackage @@ -279208,7 +280047,7 @@ self: { tasty-quickcheck text unordered-containers xmlbf ]; description = "xmlhtml backend support for the xmlbf library"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "xmlgen" = callPackage @@ -279231,7 +280070,7 @@ self: { ]; benchmarkHaskellDepends = [ base bytestring criterion text ]; description = "Fast XML generation library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "xmlhtml" = callPackage @@ -279255,7 +280094,7 @@ self: { unordered-containers ]; description = "XML parser and renderer with HTML 5 quirks mode"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "xmltv" = callPackage @@ -279277,8 +280116,8 @@ self: { wl-pprint-terminfo xdg-basedir xml ]; description = "Show tv channels in the terminal"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -279295,8 +280134,8 @@ self: { ]; libraryToolDepends = [ c2hs ]; description = "An XMMS2 client library"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -279309,8 +280148,8 @@ self: { libraryHaskellDepends = [ base haskell98 xmms2-client ]; libraryToolDepends = [ c2hs ]; description = "An XMMS2 client library — GLib integration"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -279355,8 +280194,8 @@ self: { ]; benchmarkHaskellDepends = [ base gauge mtl time ]; description = "A Minimalistic Text Based Status Bar"; - license = stdenv.lib.licenses.bsd3; - platforms = [ "i686-linux" "x86_64-linux" ]; + license = lib.licenses.bsd3; + platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs.xorg) libXpm; inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXrender; inherit (pkgs) wirelesstools;}; @@ -279384,8 +280223,8 @@ self: { install -D man/xmonad.hs ''${!outputDoc}/share/doc/$name/sample-xmonad.hs ''; description = "A tiling window manager"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ peti ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ peti ]; }) {}; "xmonad-bluetilebranch" = callPackage @@ -279404,8 +280243,8 @@ self: { process unix X11 ]; description = "A tiling window manager"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -279425,8 +280264,8 @@ self: { X11 X11-xft xmonad ]; description = "Third party extensions for xmonad"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ peti ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ peti ]; }) {}; "xmonad-contrib-bluetilebranch" = callPackage @@ -279444,8 +280283,8 @@ self: { xmonad-bluetilebranch ]; description = "Third party extensions for xmonad"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -279457,8 +280296,8 @@ self: { sha256 = "1xs9qwzq9x552jw9wxdaddk2w1m5kc060mqahhk2f2q3zs9nk2n9"; libraryHaskellDepends = [ base mtl xmonad xmonad-contrib ]; description = "Third party extensions for xmonad"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -279473,8 +280312,8 @@ self: { libraryHaskellDepends = [ base dbus utf8-string ]; executableHaskellDepends = [ base dbus utf8-string ]; testHaskellDepends = [ base dbus utf8-string ]; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -279491,7 +280330,7 @@ self: { xmonad xmonad-contrib ]; description = "XMonad config entry point wrapper"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "xmonad-eval" = callPackage @@ -279507,8 +280346,8 @@ self: { random unix X11 xmonad xmonad-contrib ]; description = "Module for evaluation Haskell expressions in the running xmonad instance"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -279518,8 +280357,8 @@ self: { }: mkDerivation { pname = "xmonad-extras"; - version = "0.15.2"; - sha256 = "1p20zc5k0s05ic2jjx01x0mx88y369dvq2ad43sfjbyf95msi7ls"; + version = "0.15.3"; + sha256 = "0nh8v057fjdr3lnx7mdbifw153z6nirx36zfsjz8lc6p45ik0qs9"; configureFlags = [ "-f-with_hlist" "-fwith_parsec" "-fwith_split" ]; @@ -279528,7 +280367,7 @@ self: { regex-posix X11 xmonad xmonad-contrib ]; description = "Third party extensions for xmonad with wacky dependencies"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "xmonad-screenshot" = callPackage @@ -279539,7 +280378,7 @@ self: { sha256 = "1m7bmdhc1nlwflli1ymnjlmysg9d54w0shpxq05xwmiycg4jbwr1"; libraryHaskellDepends = [ base gtk xmonad ]; description = "Workspaces screenshooting utility for XMonad"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "xmonad-spotify" = callPackage @@ -279550,7 +280389,7 @@ self: { sha256 = "0hps37yqn3grgg65wm3j41dh40fqi64ni12mgk0lfigw2fghfnvj"; libraryHaskellDepends = [ base containers dbus X11 ]; description = "Bind media keys to work with Spotify"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "xmonad-utils" = callPackage @@ -279563,7 +280402,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base ghc random unix X11 ]; description = "A small collection of X utilities"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "xmonad-vanessa" = callPackage @@ -279586,8 +280425,8 @@ self: { ]; testHaskellDepends = [ base hspec xmonad ]; description = "Custom xmonad, which builds with stack or cabal"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -279605,7 +280444,7 @@ self: { alsa-mixer base composition-prelude containers X11 ]; description = "XMonad volume controls"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "xmonad-wallpaper" = callPackage @@ -279618,7 +280457,7 @@ self: { editedCabalFile = "1vxgv702wgr0k0kzd602v8xv11q5dap4mfhqifnr928bwf9scp28"; libraryHaskellDepends = [ base magic mtl random unix xmonad ]; description = "xmonad wallpaper extension"; - license = stdenv.lib.licenses.lgpl3; + license = lib.licenses.lgpl3; }) {}; "xmonad-windownames" = callPackage @@ -279633,8 +280472,8 @@ self: { base containers utf8-string xmonad xmonad-contrib ]; description = "A library to automatically put named windows into the DynamicLog"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -279651,8 +280490,8 @@ self: { simple-pipe uuid xml-pipe ]; description = "XMPP implementation using simple-PIPE"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -279673,8 +280512,8 @@ self: { base bytestring criterion ghc-byteorder ]; description = "Efficient XOR masking"; - license = stdenv.lib.licenses.gpl2Plus; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -279704,8 +280543,8 @@ self: { base gauge random xorshift Xorshift128Plus ]; description = "Simple implementation of xorshift+ PRNG"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -279718,7 +280557,7 @@ self: { libraryHaskellDepends = [ base ]; librarySystemDepends = [ xosd ]; description = "A binding to the X on-screen display"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) xosd;}; "xournal-builder" = callPackage @@ -279735,8 +280574,8 @@ self: { xournal-types ]; description = "text builder for xournal file format"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -279758,8 +280597,8 @@ self: { ]; executableHaskellDepends = [ base cmdargs ]; description = "convert utility for xoj files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -279779,8 +280618,8 @@ self: { xml-types xournal-types zlib-conduit ]; description = "Xournal file parser"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -279798,8 +280637,8 @@ self: { TypeCompose xournal-types ]; description = "Xournal file renderer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -279817,8 +280656,8 @@ self: { base bytestring cereal containers lens strict TypeCompose ]; description = "Data types for programs for xournal file format"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -279835,7 +280674,7 @@ self: { base hxt hxt-xpath optparse-applicative text ]; description = "Command line tool to extract DSV data from HTML and XML with XPATH expressions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "xrefcheck" = callPackage @@ -279878,8 +280717,8 @@ self: { universum with-utf8 yaml ]; testToolDepends = [ hspec-discover ]; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -279898,7 +280737,7 @@ self: { ]; description = "Cluster EST sequences"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -279915,8 +280754,8 @@ self: { base directory doctest filepath QuickCheck quickcheck-instances ]; description = "XML Schema data structures"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -279928,7 +280767,7 @@ self: { sha256 = "0xljcmc8rsvkpchrdam3lpp4igq1gmym9v3drp15a9k8rfa8irmi"; libraryHaskellDepends = [ base HUnit QuickCheck uniplate vector ]; description = "cryptanalysis of Blizzard's broken SHA-1 implementation"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "xslt" = callPackage @@ -279940,8 +280779,8 @@ self: { libraryHaskellDepends = [ base libxml ]; librarySystemDepends = [ xslt ]; description = "Binding to libxslt"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {xslt = null;}; @@ -279962,7 +280801,7 @@ self: { text utf8-string ]; description = "sanitize untrusted HTML to prevent XSS attacks"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }) {}; "xtc" = callPackage @@ -279974,8 +280813,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base wx wxcore ]; description = "eXtended & Typed Controls for wxHaskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -279988,7 +280827,7 @@ self: { libraryHaskellDepends = [ base X11 ]; librarySystemDepends = [ libXtst ]; description = "Thin FFI bindings to X11 XTest library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs.xorg) libXtst;}; "xturtle" = callPackage @@ -280003,7 +280842,7 @@ self: { base convertible Imlib setlocale X11 X11-xft x11-xim yjsvg yjtools ]; description = "turtle like LOGO"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "xxhash" = callPackage @@ -280020,8 +280859,8 @@ self: { base bytestring criterion deepseq digest hashable murmur-hash ]; description = "A Haskell implementation of the xxHash algorithm"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -280040,7 +280879,7 @@ self: { xxhash ]; description = "Bindings to the C implementation the xxHash algorithm"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "y0l0bot" = callPackage @@ -280058,8 +280897,8 @@ self: { split text time ]; description = "#plaimi's all-encompassing bot"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.agpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -280075,7 +280914,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base word8 ]; description = "Yet Another Brainfuck Interpreter"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "yabi-muno" = callPackage @@ -280093,8 +280932,8 @@ self: { ]; executableHaskellDepends = [ base containers mtl parsec ]; description = "Yet Another Brainfuck Interpreter"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -280118,8 +280957,8 @@ self: { yesod-core yesod-form zlib ]; description = "Personal Hackage replacement for testing new packages"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -280141,8 +280980,8 @@ self: { servant servant-client ]; description = "Read quotes from Yahoo Finance API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -280158,8 +280997,8 @@ self: { attoparsec base cassava conduit lens mtl text vector wreq ]; description = "Streaming aproach to the yahoo finance api"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -280171,8 +281010,8 @@ self: { sha256 = "064qakx4khzz9ih9isw46c8pm8wpg662fwnis4d64nszy6y9yfck"; libraryHaskellDepends = [ base HTTP network xml ]; description = "Yahoo Web Search Services"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -280186,8 +281025,8 @@ self: { librarySystemDepends = [ yajl ]; libraryToolDepends = [ c2hs ]; description = "Bindings for YAJL, an event-based JSON implementation"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) yajl;}; @@ -280203,8 +281042,8 @@ self: { base bytestring enumerator json-types text transformers yajl ]; description = "Enumerator-based interface to YAJL, an event-based JSON implementation"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -280221,7 +281060,7 @@ self: { ]; testHaskellDepends = [ base bytestring hspec ]; description = "A strongly typed IRC library"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "yall" = callPackage @@ -280232,8 +281071,8 @@ self: { sha256 = "131x7hl309zpwl31k6mwqd4fdrhkcwxvn4dvlky9bh3prc8kdm2s"; libraryHaskellDepends = [ base categories transformers ]; description = "Lenses with a southern twang"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -280267,8 +281106,8 @@ self: { vector wai warp ]; description = "A wrapper of servant"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -280292,7 +281131,7 @@ self: { wai-logger yaml ]; description = "Yam App"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "yam-config" = callPackage @@ -280308,8 +281147,8 @@ self: { unordered-containers vault yaml ]; description = "Yam Configuation"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -280327,8 +281166,8 @@ self: { resourcet salak servant-server text unliftio-core yam ]; description = "Yam DataSource Middleware"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -280339,7 +281178,7 @@ self: { version = "0.2.0"; sha256 = "0c6frqjf3xhd5bksaz6rvd6qbqbj15y441476dgj2asm2yd64895"; libraryHaskellDepends = [ base cron yam-app ]; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "yam-logger" = callPackage @@ -280354,8 +281193,8 @@ self: { aeson base fast-logger monad-logger text vault yam-config ]; description = "Yam Logger"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -280372,8 +281211,8 @@ self: { servant-server text yam ]; description = "Yam Redis Middleware"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -280390,8 +281229,8 @@ self: { aeson base http-types lens servant servant-server servant-swagger servant-swagger-ui swagger2 text wai wai-extra warp yam-app yam-job ]; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -280412,8 +281251,8 @@ self: { yam-logger ]; description = "Yam transaction"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -280426,8 +281265,8 @@ self: { libraryHaskellDepends = [ base containers persistent-odbc yam-app ]; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -280442,7 +281281,7 @@ self: { libraryHaskellDepends = [ base containers persistent-postgresql unliftio-core yam-app ]; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "yam-web" = callPackage @@ -280471,8 +281310,8 @@ self: { vault wai wai-extra warp yam-config yam-logger yam-transaction ]; description = "Yam Web"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -280485,7 +281324,7 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers mtl ]; description = "Simple memoisation function"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "yaml" = callPackage @@ -280514,7 +281353,7 @@ self: { unordered-containers vector ]; description = "Support for parsing and rendering YAML documents"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "yaml-combinators" = callPackage @@ -280534,7 +281373,7 @@ self: { aeson base doctest tasty tasty-hunit text unordered-containers ]; description = "YAML parsing combinators for improved validation and error reporting"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "yaml-config" = callPackage @@ -280553,7 +281392,7 @@ self: { unordered-containers yaml ]; description = "Configuration management"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "yaml-light" = callPackage @@ -280564,7 +281403,7 @@ self: { sha256 = "05pxkqp91l275n48p1aqijzh34vvzi7cx2nls879b95fz2dr8lhk"; libraryHaskellDepends = [ base bytestring containers HsSyck ]; description = "A light-weight wrapper with utility functions around HsSyck"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "yaml-light-lens" = callPackage @@ -280580,7 +281419,7 @@ self: { ]; testHaskellDepends = [ base doctest ]; description = "Lens interface to yaml-light"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "yaml-pretty-extras" = callPackage @@ -280592,8 +281431,8 @@ self: { libraryHaskellDepends = [ base microlens-platform rio yaml ]; testHaskellDepends = [ base hspec microlens-platform rio ]; description = "Extra functionality for pretty printing Yaml documents"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -280612,8 +281451,8 @@ self: { vector wreq yaml ]; description = "Simple library for network (HTTP REST-like) YAML RPC"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -280630,8 +281469,8 @@ self: { yaml yaml-rpc ]; description = "Scotty server backend for yaml-rpc"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -280648,8 +281487,8 @@ self: { yaml yaml-rpc ]; description = "Snap server backend for yaml-rpc"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -280677,7 +281516,7 @@ self: { unordered-containers vector yaml ]; description = "Read multiple yaml-files and override fields recursively"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "yaml-unscrambler" = callPackage @@ -280703,8 +281542,8 @@ self: { tasty tasty-hunit tasty-quickcheck ]; description = "Flexible declarative YAML parsing toolkit"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -280741,7 +281580,7 @@ self: { ]; description = "Compares the keys from two yaml files"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "yamlparse-applicative" = callPackage @@ -280768,7 +281607,7 @@ self: { unordered-containers ]; description = "Declaritive configuration parsing with free docs"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "yampa-canvas" = callPackage @@ -280783,7 +281622,7 @@ self: { isExecutable = true; libraryHaskellDepends = [ base blank-canvas stm time Yampa ]; description = "blank-canvas frontend for Yampa"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "yampa-glfw" = callPackage @@ -280800,8 +281639,8 @@ self: { base GLFW-b newtype OpenGL vector-space Yampa ]; description = "Connects GLFW-b (GLFW 3+) with the Yampa FRP library"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -280815,8 +281654,8 @@ self: { isExecutable = true; libraryHaskellDepends = [ base gloss Yampa ]; description = "A GLOSS backend for Yampa"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -280834,8 +281673,8 @@ self: { base GLUT newtype OpenGL vector-space Yampa-core ]; description = "Connects Yampa and GLUT"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -280854,8 +281693,8 @@ self: { base data-memocombinators linear sdl2 StateVar text vector Yampa ]; description = "Yampa and SDL2 made easy"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -280874,8 +281713,8 @@ self: { base Cabal QuickCheck random tasty tasty-quickcheck Yampa ]; description = "Testing library for Yampa"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -280889,8 +281728,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base gloss random Yampa ]; description = "2048 game clone using Yampa/Gloss"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -280908,8 +281747,8 @@ self: { text transformers unordered-containers wreq ]; description = "Bindings to Yandex translate API"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -280923,8 +281762,8 @@ self: { editedCabalFile = "0p55j9q5idzw5bmpg0i4vkifaadzvf3fdhjd02bh2ym2y15g0csk"; libraryHaskellDepends = [ base mtl template-haskell ]; description = "Yet another option parser"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -280936,8 +281775,8 @@ self: { sha256 = "14lq549jhgnf51pgy1jv31ik8qx71yl7d53w8dpq1f9mlsn1g16i"; libraryHaskellDepends = [ base ]; description = "yet another prelude - a simplistic refactoring with algebraic classes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -280957,7 +281796,7 @@ self: { executableHaskellDepends = [ base regex-tdfa ]; testHaskellDepends = [ base ]; description = "Yet Another Parser Builder (YAPB)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "yarn-lock" = callPackage @@ -280978,8 +281817,8 @@ self: { tasty-th text ]; description = "Represent and parse yarn.lock files"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -281017,8 +281856,8 @@ self: { yarn-lock ]; description = "Convert yarn.lock files to nix expressions"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -281035,8 +281874,8 @@ self: { template-haskell ]; description = "Yet another array library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -281049,8 +281888,8 @@ self: { libraryHaskellDepends = [ base yarr ]; librarySystemDepends = [ libdevil ]; description = "Image IO for Yarr library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) libdevil;}; @@ -281070,7 +281909,7 @@ self: { attoparsec base hspec mtl unordered-containers vector ]; description = "Yet Another Template Engine"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "yavie" = callPackage @@ -281089,8 +281928,8 @@ self: { ]; executableHaskellDepends = [ base Cabal directory process ]; description = "yet another visual editor"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -281109,7 +281948,7 @@ self: { th-abstraction transformers ]; description = "Total recursion schemes"; - license = stdenv.lib.licenses.agpl3; + license = lib.licenses.agpl3; }) {}; "yaya-hedgehog" = callPackage @@ -281120,7 +281959,7 @@ self: { sha256 = "0aw932d2yr3w84ia44y46w4w96bc8gdag63h66rhx3v7gwmkwdwg"; libraryHaskellDepends = [ base deriving-compat hedgehog yaya ]; description = "Hedgehog testing support for the Yaya recursion scheme library"; - license = stdenv.lib.licenses.agpl3; + license = lib.licenses.agpl3; }) {}; "yaya-test" = callPackage @@ -281137,8 +281976,8 @@ self: { base deriving-compat hedgehog yaya yaya-hedgehog ]; description = "Test suites for `yaya`"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.agpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -281154,7 +281993,7 @@ self: { base bifunctors comonad either free lens yaya ]; description = "Non-total extensions to the Yaya recursion scheme library"; - license = stdenv.lib.licenses.agpl3; + license = lib.licenses.agpl3; }) {}; "yaya-unsafe-test" = callPackage @@ -281170,8 +282009,8 @@ self: { base hedgehog yaya yaya-hedgehog yaya-unsafe ]; description = "Test suites for `yaya-unsafe`"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.agpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -281186,8 +282025,8 @@ self: { base containers csv mtl uniplate yhccore ]; description = "Additional utilities to work with Yhc Core"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -281203,10 +282042,8 @@ self: { }: mkDerivation { pname = "yeamer"; - version = "0.1.0.5"; - sha256 = "0c8yrh43h9qhhdiz0dnrh00frfz0cymzzz9k723jnp03b8994srq"; - revision = "1"; - editedCabalFile = "0ivw54131s99kblah7n0flccb9h6qfiz55ifs2cwjwxxmrs9xi1n"; + version = "0.1.1.0"; + sha256 = "0i3ka3c4ci70kgrbmc7ynk587a4sihpqhyv6bjc1n9gwjbm9abxi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -281225,8 +282062,8 @@ self: { aeson base numbered-semigroups tasty tasty-hunit tasty-quickcheck ]; description = "Yesod-based server for interactive presentation slides"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -281245,7 +282082,7 @@ self: { xdg-basedir ]; description = "small dmenu wrapper"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "yeller" = callPackage @@ -281270,8 +282107,8 @@ self: { http-client-tls http-types network stm text unordered-containers ]; description = "A Yeller Client For Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -281293,7 +282130,7 @@ self: { ]; testHaskellDepends = [ base containers hspec QuickCheck ]; description = "Extended yes command to reproduce phrases in Yes! Precure 5"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "yeshql" = callPackage @@ -281304,8 +282141,8 @@ self: { sha256 = "07wbblsyc1f2kc47s2z4sg4s7qmgn44kvpvdvq9cf59g5nvm4wkd"; libraryHaskellDepends = [ base yeshql-core yeshql-hdbc ]; description = "YesQL-style SQL database abstraction (legacy compatibility wrapper)"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -281325,7 +282162,7 @@ self: { base containers stm tasty tasty-hunit tasty-quickcheck ]; description = "YesQL-style SQL database abstraction (core)"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "yeshql-hdbc" = callPackage @@ -281345,8 +282182,8 @@ self: { base containers HDBC stm tasty tasty-hunit tasty-quickcheck ]; description = "YesQL-style SQL database abstraction (HDBC backend)"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -281368,8 +282205,8 @@ self: { tasty-quickcheck ]; description = "YesQL-style SQL database abstraction (postgresql-simple backend)"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -281391,7 +282228,7 @@ self: { wai-logger warp yaml yesod-core yesod-form yesod-persistent ]; description = "Creation of type-safe, RESTful web applications"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "yesod-alerts" = callPackage @@ -281406,7 +282243,7 @@ self: { alerts base blaze-html blaze-markup safe text yesod-core ]; description = "Alert messages for the Yesod framework"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "yesod-angular" = callPackage @@ -281422,8 +282259,8 @@ self: { transformers yesod ]; description = "Angular JS integratoin"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -281443,8 +282280,8 @@ self: { shakespeare template-haskell text transformers yesod yesod-core ]; description = "Angular Helpers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -281467,8 +282304,8 @@ self: { yesod-core yesod-test ]; description = "Automatically generate article previews for a yesod site"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -281497,7 +282334,7 @@ self: { unordered-containers wai yesod-core yesod-form yesod-persistent ]; description = "Authentication for Yesod"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "yesod-auth-account" = callPackage @@ -281519,8 +282356,8 @@ self: { text xml-conduit yesod yesod-auth yesod-test ]; description = "An account authentication plugin for Yesod"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -281545,8 +282382,8 @@ self: { text xml-conduit yesod yesod-auth yesod-test ]; description = "An account authentication plugin for Yesod"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -281564,7 +282401,7 @@ self: { ]; testHaskellDepends = [ base hspec text yesod yesod-test ]; description = "Yesod Middleware for HTTP Basic Authentication"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "yesod-auth-bcrypt" = callPackage @@ -281580,8 +282417,8 @@ self: { yesod-persistent ]; description = "BCrypt salted and hashed passwords in a database as auth for yesod"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -281598,8 +282435,8 @@ self: { yesod-form yesod-persistent ]; description = "Authentication plugin for Yesod"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -281621,8 +282458,8 @@ self: { yesod-auth yesod-core ]; description = "Desk.com remote authentication support for Yesod apps."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -281640,7 +282477,7 @@ self: { text time transformers unliftio wai yesod-auth yesod-core yesod-fb ]; description = "Authentication backend for Yesod using Facebook"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "yesod-auth-hashdb" = callPackage @@ -281665,7 +282502,7 @@ self: { yesod-test ]; description = "Authentication plugin for Yesod"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "yesod-auth-hmac-keccak" = callPackage @@ -281683,8 +282520,8 @@ self: { text yesod-auth yesod-core yesod-form yesod-persistent yesod-static ]; description = "An account authentication plugin for yesod with encrypted token transfer"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -281702,8 +282539,8 @@ self: { yesod-auth yesod-core yesod-form ]; description = "Kerberos Authentication for Yesod"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -281720,8 +282557,8 @@ self: { yesod-auth yesod-core yesod-form ]; description = "LDAP Authentication for Yesod"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -281737,8 +282574,8 @@ self: { aeson base LDAP text yesod-auth yesod-core yesod-form ]; description = "Very simlple LDAP auth for yesod"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -281756,8 +282593,8 @@ self: { ]; testHaskellDepends = [ base ]; description = "Yesod LDAP authentication plugin"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -281769,8 +282606,8 @@ self: { }: mkDerivation { pname = "yesod-auth-lti13"; - version = "0.1.2.2"; - sha256 = "0r1hbnij2dyka1jgxrql9ymfcdc1y60x593a3dmnnw86qksbkb8r"; + version = "0.2.0.0"; + sha256 = "0g48g1ajzwp7k7q3vi1z4nvmmvcfiyziizfydnd3i26xf7nvzqnx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -281780,8 +282617,8 @@ self: { yesod-auth yesod-core ]; description = "A yesod-auth plugin for LTI 1.3"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -281798,8 +282635,8 @@ self: { yesod-core yesod-form ]; description = "A plugin for Yesod to provide email-only authentication"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -281816,7 +282653,7 @@ self: { yesod-core yesod-form ]; description = "OAuth Authentication for Yesod"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "yesod-auth-oauth2" = callPackage @@ -281838,8 +282675,32 @@ self: { ]; testHaskellDepends = [ base hspec uri-bytestring ]; description = "OAuth 2.0 authentication plugins"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + + "yesod-auth-oauth2_0_6_2_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, cryptonite, errors + , hoauth2, hspec, http-client, http-conduit, http-types, memory + , microlens, safe-exceptions, text, uri-bytestring, yesod-auth + , yesod-core + }: + mkDerivation { + pname = "yesod-auth-oauth2"; + version = "0.6.2.1"; + sha256 = "1kzz271y69l47wikfmfix5v9csh6xy7cv8b36gxzlwr6vil59bmy"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring cryptonite errors hoauth2 http-client + http-conduit http-types memory microlens safe-exceptions text + uri-bytestring yesod-auth yesod-core + ]; + testHaskellDepends = [ base hspec uri-bytestring ]; + description = "OAuth 2.0 authentication plugins"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -281855,8 +282716,8 @@ self: { base hamlet pam text yesod-auth yesod-core yesod-form ]; description = "Provides PAM authentication module"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -281873,8 +282734,8 @@ self: { yesod-form ]; description = "Authentication plugin for Yesod using smbclient"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -281893,8 +282754,8 @@ self: { yesod-auth yesod-core ]; description = "Zendesk remote authentication support for Yesod apps"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -281922,7 +282783,7 @@ self: { unliftio unordered-containers wai wai-extra warp warp-tls yaml zlib ]; description = "The yesod helper executable"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "yesod-bootstrap" = callPackage @@ -281938,8 +282799,8 @@ self: { transformers yesod-core yesod-elements ]; description = "Bootstrap widgets for yesod"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -281958,8 +282819,8 @@ self: { yesod-core yesod-elements ]; description = "Helper functions for using yesod with colonnade"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -281978,8 +282839,8 @@ self: { yesod-form yesod-markdown ]; description = "A generic comments interface for a Yesod application"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -282001,8 +282862,8 @@ self: { base blaze-html hspec hspec-expectations utf8-string ]; description = "PDF Content Type for Yesod"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -282021,8 +282882,8 @@ self: { yesod ]; description = "Continuations for Yesod"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -282060,7 +282921,7 @@ self: { base blaze-html bytestring gauge shakespeare text ]; description = "Creation of type-safe, RESTful web applications"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "yesod-crud" = callPackage @@ -282077,8 +282938,8 @@ self: { random safe stm uuid yesod-core yesod-form yesod-persistent ]; description = "Generic administrative CRUD operations as a Yesod subsite"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -282097,8 +282958,8 @@ self: { yesod-persistent ]; description = "Flexible CRUD subsite usable with Yesod and Persistent"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -282120,7 +282981,7 @@ self: { yesod-test ]; description = "Add CSP headers to Yesod apps"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "yesod-datatables" = callPackage @@ -282146,8 +283007,8 @@ self: { test-framework-quickcheck2 text transformers ]; description = "Yesod plugin for DataTables (jQuery grid plugin)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -282159,7 +283020,7 @@ self: { sha256 = "15nsknnxnfbkpg4pswxcpgfb2y0hz0xxj56jknd93hcm7aay36pk"; libraryHaskellDepends = [ base yesod-core ]; description = "Default config and main functions for your yesod application (deprecated)"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "yesod-dsl" = callPackage @@ -282185,8 +283046,8 @@ self: { shakespeare strict text ]; description = "DSL for generating Yesod subsite to manage an RDBMS;"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -282202,7 +283063,7 @@ self: { base blaze-html blaze-markup bytestring text yesod-core ]; description = "Non template haskell markup building function in the spirit of lucid"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "yesod-eventsource" = callPackage @@ -282217,7 +283078,7 @@ self: { base blaze-builder conduit transformers wai wai-extra yesod-core ]; description = "Server-sent events support for Yesod apps"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "yesod-examples" = callPackage @@ -282238,8 +283099,8 @@ self: { ]; executableSystemDepends = [ sqlite ]; description = "Example programs using the Yesod Web Framework. (deprecated)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) sqlite;}; @@ -282261,8 +283122,8 @@ self: { text ]; description = "Fast live-reloading for yesod applications"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -282282,8 +283143,8 @@ self: { transformers utf8-string yesod-core yesod-form yesod-static ]; description = "Utilities for using the Fay Haskell-to-JS compiler with Yesod"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -282300,7 +283161,7 @@ self: { memory text wai yesod-core ]; description = "Useful glue functions between the fb library and Yesod"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "yesod-filter" = callPackage @@ -282321,8 +283182,8 @@ self: { template-haskell text time yesod-persistent ]; description = "Automatic filter generator for Yesod"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -282345,7 +283206,7 @@ self: { ]; testHaskellDepends = [ base hspec text time ]; description = "Form handling support for Yesod Web Framework"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "yesod-form-bootstrap4" = callPackage @@ -282360,7 +283221,7 @@ self: { base blaze-html blaze-markup shakespeare text yesod-core yesod-form ]; description = "renderBootstrap4"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "yesod-form-bulma" = callPackage @@ -282383,7 +283244,7 @@ self: { base email-validate shakespeare text yesod-core yesod-form ]; description = "support Bulma form for Yesod"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "yesod-form-json" = callPackage @@ -282399,7 +283260,7 @@ self: { yesod-core yesod-form ]; description = "Extension for Yesod web framework to handle JSON requests as applicative forms"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "yesod-form-multi" = callPackage @@ -282415,7 +283276,7 @@ self: { yesod-core yesod-form ]; description = "Multi-input form handling for Yesod Web Framework"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "yesod-form-richtext" = callPackage @@ -282431,8 +283292,8 @@ self: { yesod-core yesod-form ]; description = "Various rich-text WYSIWYG editors for Yesod forms"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -282449,7 +283310,7 @@ self: { yesod-core ]; description = "Host content provided by a Git repo"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "yesod-gitrev" = callPackage @@ -282464,8 +283325,8 @@ self: { ]; testHaskellDepends = [ base yesod-core ]; description = "A subsite for displaying git information"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -282482,8 +283343,8 @@ self: { text time yesod yesod-form ]; description = "A collection of various small helpers useful in any yesod application"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -282502,8 +283363,8 @@ self: { yesod-form ]; description = "Code for using the ip package with yesod"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -282525,8 +283386,8 @@ self: { ]; testHaskellDepends = [ base ]; description = "Background jobs library for Yesod"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -282538,7 +283399,7 @@ self: { sha256 = "0d035k1ls5iq1c12yxknyc33qd22ayyhl69y62zmcw7arwx35sgw"; libraryHaskellDepends = [ base yesod-core ]; description = "Generate content for Yesod using the aeson package. (deprecated)"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "yesod-katip" = callPackage @@ -282555,7 +283416,7 @@ self: { monad-logger network text wai wai-extra yesod-core ytl ]; description = "Logging bridge between Yesod and Katip"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "yesod-links" = callPackage @@ -282566,8 +283427,8 @@ self: { sha256 = "0i1b4lgwv98pp7251fm3h4cdb1d868fqwm6175rk7zg699g2v61y"; libraryHaskellDepends = [ base text yesod-core ]; description = "A typeclass which simplifies creating link widgets throughout your site"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -282579,8 +283440,8 @@ self: { sha256 = "1ymmpi9g3pjl23ymdjwiv748lnq1hyjq24la2ffgwrm4b6f41xip"; libraryHaskellDepends = [ base lucid monads-tf text yesod-core ]; description = "Lucid support for Yesod"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -282600,8 +283461,8 @@ self: { persistent-template text time yesod yesod-core ]; description = "Yesod library for MangoPay API access"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -282620,8 +283481,8 @@ self: { ]; testHaskellDepends = [ base blaze-html hspec text ]; description = "Tools for using markdown in a yesod application"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -282638,8 +283499,8 @@ self: { JuicyPixels vector yesod ]; description = "Simple display of media types, served by yesod"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -282656,7 +283517,7 @@ self: { time xml-conduit yesod-core ]; description = "Helper functions and data types for producing News feeds"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "yesod-page-cursor" = callPackage @@ -282668,32 +283529,6 @@ self: { }: mkDerivation { pname = "yesod-page-cursor"; - version = "2.0.0.1"; - sha256 = "1fsq2shnn1izhw28f8dfyc8ssfxfjhzip0hh1cw80hpcg7q0pr73"; - libraryHaskellDepends = [ - aeson base bytestring containers http-link-header network-uri text - unliftio yesod-core - ]; - testHaskellDepends = [ - aeson base bytestring hspec hspec-expectations-lifted - http-link-header http-types lens lens-aeson monad-logger mtl - persistent persistent-sqlite persistent-template scientific text - time unliftio unliftio-core wai-extra yesod yesod-core yesod-test - ]; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "yesod-page-cursor_2_0_0_2" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, hspec - , hspec-expectations-lifted, http-link-header, http-types, lens - , lens-aeson, monad-logger, mtl, network-uri, persistent - , persistent-sqlite, persistent-template, scientific, text, time - , unliftio, unliftio-core, wai-extra, yesod, yesod-core, yesod-test - }: - mkDerivation { - pname = "yesod-page-cursor"; version = "2.0.0.2"; sha256 = "1wlwzxc2amnq1ma2lvclrc3dzhh8s6d8ffz6yk9rq88aijgvw35m"; libraryHaskellDepends = [ @@ -282706,8 +283541,8 @@ self: { persistent persistent-sqlite persistent-template scientific text time unliftio unliftio-core wai-extra yesod yesod-core yesod-test ]; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -282719,8 +283554,8 @@ self: { sha256 = "088m7prg774wdh8fp7zljxj65zj5krl4pggl63anv2wk7nlw27py"; libraryHaskellDepends = [ base template-haskell yesod ]; description = "Pagination for Yesod sites"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -282739,8 +283574,8 @@ self: { resourcet shakespeare utf8-string wai-test yesod yesod-test ]; description = "Pagination in Yesod"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -282764,7 +283599,7 @@ self: { yesod-test ]; description = "A pagination approach for yesod"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "yesod-paypal-rest" = callPackage @@ -282777,8 +283612,8 @@ self: { base paypal-rest-client time yesod-core ]; description = "Yesod plugin to use PayPal with the paypal-rest-client library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -282800,7 +283635,7 @@ self: { wai-extra yesod-core ]; description = "Some helpers for using Persistent from Yesod"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "yesod-platform" = callPackage @@ -282869,8 +283704,8 @@ self: { yesod-routes yesod-static yesod-test ]; description = "Meta package for Yesod (deprecated)"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -282891,8 +283726,8 @@ self: { aeson base shakespeare text transformers yesod yesod-form ]; description = "Yet another getMessage/setMessage using pnotify jquery plugins"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -282904,8 +283739,8 @@ self: { sha256 = "0v3xvhk5nxc2y3c21y6h7w6lg5vm1s2vzf9f02qw8gj928vsidzg"; libraryHaskellDepends = [ base fast-logger text yesod yesod-core ]; description = "Yesod in pure Haskell: no Template Haskell or QuasiQuotes (deprecated)"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -282925,8 +283760,8 @@ self: { system-filepath template-haskell text time transformers yesod-core ]; description = "PureScript integration for Yesod"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -282950,8 +283785,8 @@ self: { vector yaml yesod-core ]; description = "RAML style route definitions for Yesod"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -282974,8 +283809,8 @@ self: { yesod-raml-mock ]; description = "The raml helper executable"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -282992,8 +283827,8 @@ self: { yesod-markdown yesod-raml ]; description = "A html documentation generator library for RAML"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -283017,8 +283852,8 @@ self: { yesod-raml yesod-test ]; description = "A mock-handler generator library from RAML"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -283037,8 +283872,8 @@ self: { yesod-form ]; description = "Dead simple support for reCAPTCHA on Yesod applications"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -283054,7 +283889,7 @@ self: { aeson base classy-prelude http-conduit yesod-core yesod-form ]; description = "yesod recaptcha2"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "yesod-routes" = callPackage @@ -283075,8 +283910,8 @@ self: { text ]; description = "Efficient routing for Yesod. (deprecated)"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -283093,8 +283928,8 @@ self: { system-filepath text yesod-core ]; description = "Generate Flow routes for Yesod"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -283111,8 +283946,8 @@ self: { yesod-routes ]; description = "generate TypeScript routes for Yesod"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -283130,7 +283965,7 @@ self: { ]; description = "Tools for using reStructuredText (RST) in a yesod application"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -283147,8 +283982,8 @@ self: { text yesod-core ]; description = "Simple Helper Library for using Amazon's Simple Storage Service (S3) with Yesod"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -283165,8 +284000,8 @@ self: { yesod-core ]; description = "A simple quasiquoter to include sass code in yesod"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -283184,8 +284019,8 @@ self: { pool-conduit random text time wai yesod-core ]; description = "Redis-Powered Sessions for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -283202,7 +284037,7 @@ self: { xml-types yesod-core ]; description = "Generate XML sitemaps"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "yesod-static" = callPackage @@ -283235,7 +284070,7 @@ self: { yesod-test ]; description = "Static file serving subsite for Yesod Web Framework"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "yesod-static-angular" = callPackage @@ -283260,8 +284095,8 @@ self: { text yesod-core yesod-static yesod-test ]; description = "Yesod generators for embedding AngularJs code into yesod-static at compile time"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -283278,8 +284113,8 @@ self: { template-haskell yesod-static ]; testHaskellDepends = [ base yesod-static ]; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -283295,7 +284130,7 @@ self: { base bytestring containers contravariant semigroups text yesod-core ]; description = "HTML tables for Yesod"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "yesod-tableview" = callPackage @@ -283306,7 +284141,7 @@ self: { sha256 = "1qf7439c31a8xi0qs8fn2xdlrldi42n1k25lj6vn061lm8wg35yy"; libraryHaskellDepends = [ base hamlet persistent yesod ]; description = "Table view for Yesod applications"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "yesod-test" = callPackage @@ -283332,7 +284167,7 @@ self: { yesod-core yesod-form ]; description = "integration testing for WAI/Yesod Applications"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "yesod-test-json" = callPackage @@ -283349,8 +284184,8 @@ self: { transformers wai wai-test yesod-default ]; description = "Utility functions for testing JSON web services written in Yesod"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -283367,7 +284202,7 @@ self: { yesod-form yesod-persistent ]; description = "Yesod support for Text.Markdown."; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "yesod-tls" = callPackage @@ -283383,8 +284218,8 @@ self: { warp warp-tls yesod ]; description = "Provides main functions using warp-tls for yesod projects"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -283408,7 +284243,7 @@ self: { yesod-form yesod-test ]; description = "Transloadit support for Yesod"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "yesod-vend" = callPackage @@ -283429,8 +284264,8 @@ self: { resourcet text yesod yesod-form ]; description = "Simple CRUD classes for easy view creation for Yesod"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -283447,7 +284282,7 @@ self: { yesod-core ]; description = "WebSockets support for Yesod"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "yesod-websockets-extra" = callPackage @@ -283462,7 +284297,7 @@ self: { base enclosed-exceptions transformers websockets yesod-websockets ]; description = "Extension to yesod-websockets"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "yesod-worker" = callPackage @@ -283478,8 +284313,8 @@ self: { ]; testHaskellDepends = [ base ]; description = "Initial project template from stack"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -283510,7 +284345,7 @@ self: { text transformers transformers-base void ]; description = "Yet Another Logger"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "yggdrasil" = callPackage @@ -283526,8 +284361,8 @@ self: { ]; testHaskellDepends = [ base cryptonite hspec QuickCheck ]; description = "Executable specifications of composable cryptographic protocols"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.agpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -283539,8 +284374,8 @@ self: { sha256 = "18gjzlpxn0hp723ybjgq1zdbpl35iqphs7b8r5x9ddbkm435sw93"; libraryHaskellDepends = [ base containers mtl pretty uniplate ]; description = "Yhc's Internal Core language"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -283559,8 +284394,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Calculation of YH sequence system"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -283583,8 +284418,8 @@ self: { yi-mode-haskell yi-mode-javascript yi-rope ]; description = "Yi editor"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -283603,8 +284438,8 @@ self: { yi-rope ]; description = "Add-ons to Yi, the Haskell-Scriptable Editor"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -283635,8 +284470,8 @@ self: { ]; benchmarkHaskellDepends = [ base criterion deepseq yi-rope ]; description = "Yi editor core library"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -283653,8 +284488,8 @@ self: { transformers-base yi-core yi-rope ]; description = "Dynamic configuration support for Yi"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -283666,8 +284501,8 @@ self: { sha256 = "1kbds9s0r67bdvigjk0c58slbifnddp6ppv4jrgv6493pylp78qv"; libraryHaskellDepends = [ base containers split yi-language ]; description = "Simple mapping from colour names used in emacs to Color"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -283687,8 +284522,8 @@ self: { yi-language yi-rope ]; description = "Pango frontend for Yi editor"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -283706,8 +284541,8 @@ self: { stm text vty yi-core yi-language yi-rope ]; description = "Vty frontend for Yi editor"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -283726,8 +284561,8 @@ self: { yi-rope ]; description = "Fuzzy open plugin for yi"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -283755,8 +284590,8 @@ self: { text yi-core yi-language yi-rope ]; description = "Yi editor incremental reader"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -283772,8 +284607,8 @@ self: { base microlens-platform text yi-core yi-keymap-emacs yi-rope ]; description = "Cua keymap for Yi editor"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -283791,8 +284626,8 @@ self: { text transformers-base yi-core yi-language yi-misc-modes yi-rope ]; description = "Emacs keymap for Yi editor"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -283819,8 +284654,8 @@ self: { unordered-containers yi-core yi-language yi-rope ]; description = "Vim keymap for Yi editor"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -283848,8 +284683,8 @@ self: { unordered-containers ]; description = "Collection of language-related Yi libraries"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -283867,8 +284702,8 @@ self: { ]; libraryToolDepends = [ alex ]; description = "Yi editor miscellaneous modes"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -283886,8 +284721,8 @@ self: { ]; libraryToolDepends = [ alex ]; description = "Yi editor haskell mode"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -283906,8 +284741,8 @@ self: { ]; libraryToolDepends = [ alex ]; description = "Yi editor javascript mode"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -283919,8 +284754,8 @@ self: { sha256 = "1nghfyiy8jdz144nbw0c2cdy8n6xyjmk31g6z24jk8dij7iwb60l"; libraryHaskellDepends = [ base yi ]; description = "Monokai colour theme for the Yi text editor"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -283940,7 +284775,7 @@ self: { ]; benchmarkHaskellDepends = [ base criterion deepseq text ]; description = "A rope data structure used by Yi"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }) {}; "yi-snippet" = callPackage @@ -283960,8 +284795,8 @@ self: { base containers tasty-hunit tasty-th yi-rope ]; description = "Snippet support for yi"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -283973,8 +284808,8 @@ self: { sha256 = "17ifjm9vgrhv00bll5zj9siz08fng1626bff9q5sfbvzd7y6i9nc"; libraryHaskellDepends = [ base yi ]; description = "Solarized colour theme for the Yi text editor"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -283986,8 +284821,8 @@ self: { sha256 = "152ys2x416322c13nxmi25wpilq0ddd6hj36mr25jaacf1qszv6q"; libraryHaskellDepends = [ base yi ]; description = "Spolsky colour theme for the Yi text editor"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -284011,8 +284846,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base parsec process ]; description = "Haskell programming interface to Yices SMT solver"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -284026,8 +284861,8 @@ self: { base bindings-yices containers transformers ]; description = "Simple interface to the Yices SMT (SAT modulo theories) solver"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "yices-painless" = callPackage @@ -284043,8 +284878,8 @@ self: { ]; librarySystemDepends = [ gmp yices ]; description = "An embedded language for programming the Yices SMT solver"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) gmp; inherit (pkgs) yices;}; "yiyd" = callPackage @@ -284066,7 +284901,7 @@ self: { yaml ]; testToolDepends = [ hspec-discover ]; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "yjftp" = callPackage @@ -284086,7 +284921,7 @@ self: { executableHaskellDepends = [ hsConfigure ]; description = "CUI FTP client like 'ftp', 'ncftp'"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -284101,7 +284936,7 @@ self: { libraryHaskellDepends = [ base directory ftphs mtl process unix ]; description = "CUI FTP client like 'ftp', 'ncftp'"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -284113,7 +284948,7 @@ self: { sha256 = "0zif4sqrd7kv1546vcp1q78bb8k94mkiqxh7glix6gvv7gabfdzp"; libraryHaskellDepends = [ base HaXml ]; description = "make SVG string from Haskell data"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "yjtools" = callPackage @@ -284140,7 +284975,7 @@ self: { base containers parsec QuickCheck quickcheck-instances ]; description = "A Minimal JSON Parser & Printer for Haskell"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "yoctoparsec" = callPackage @@ -284149,12 +284984,12 @@ self: { pname = "yoctoparsec"; version = "0.1.0.0"; sha256 = "0p9kw60glcgrjfx04x3innn3rqnh12yrv4wh0a0fivcx8b9kj1yp"; - revision = "3"; - editedCabalFile = "1yvbslg8y6kvagdjnm0wbknlf1pigqlk8hiqpvmicmqgaiaaxlb7"; + revision = "4"; + editedCabalFile = "00icvzsb8l70w5dcy0kkxrg0hpq273r8zyy6cx6hscpzgck090jf"; libraryHaskellDepends = [ base free mtl ]; description = "A truly tiny monadic parsing library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -284166,8 +285001,8 @@ self: { sha256 = "0qkg8aykr8whjrkwfnsds3bjbrb51r83rd60mpdwcs12zyqlpi0d"; libraryHaskellDepends = [ base ]; description = "Parser combinators for young padawans"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -284181,7 +285016,7 @@ self: { isExecutable = true; libraryHaskellDepends = [ base bindings-DSL ieee754 ]; description = "Bindings to Facebook's Yoga layout library"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "yoko" = callPackage @@ -284200,8 +285035,8 @@ self: { type-functions type-ord type-ord-spine-cereal type-spine ]; description = "Generic Programming with Disbanded Data Types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -284213,8 +285048,8 @@ self: { sha256 = "1rpkxlfvk84zl965ik5bpplzcskd96wsnicp66ixnfs9bkqfj7qb"; libraryHaskellDepends = [ base containers haskell98 ]; description = "A library for digital circuit description"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -284229,7 +285064,7 @@ self: { enableSeparateDataOutput = true; executableHaskellDepends = [ base bytestring process utility-ht ]; description = "Upload video to YouTube via YouTube API"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "yql" = callPackage @@ -284255,8 +285090,8 @@ self: { base containers ecma262 exceptions hxt opendatatable ]; description = "A YQL engine to execute Open Data Tables"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -284280,7 +285115,7 @@ self: { ]; description = "Builds a static website from templates and data in YAML or CSV files"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -284295,7 +285130,7 @@ self: { base mtl pointed template-haskell yesod-core ]; description = "mtl-style transformations for Yesod sites"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "yu-auth" = callPackage @@ -284309,8 +285144,8 @@ self: { libraryHaskellDepends = [ base cryptonite memory yu-utils ]; testHaskellDepends = [ base MonadRandom random yu-utils ]; description = "Auth module for Yu"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -284323,8 +285158,8 @@ self: { libraryHaskellDepends = [ base yu-auth yu-utils ]; testHaskellDepends = [ base blaze-markup hspec yu-utils ]; description = "The core of Yu"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -284340,8 +285175,8 @@ self: { base cmdargs yaml yu-auth yu-core yu-utils ]; description = "The launcher for Yu"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -284359,8 +285194,8 @@ self: { base cmdargs directory echo filepath process yu-auth yu-utils ]; description = "Tool for Yu"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -284384,8 +285219,8 @@ self: { warp xml-hamlet yesod-core ]; description = "Utils for Yu"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -284398,7 +285233,7 @@ self: { libraryHaskellDepends = [ base ]; description = "Grids defined by layout hints and implemented on top of Yahoo grids"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "yuuko" = callPackage @@ -284421,8 +285256,8 @@ self: { haskell98 mtl network parsec ]; description = "A transcendental HTML parser gently wrapping the HXT library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -284435,8 +285270,8 @@ self: { libraryHaskellDepends = [ array base bytestring lattices mtl ]; testHaskellDepends = [ array base bytestring hspec mtl ]; description = "Row-major coordinates"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -284475,8 +285310,8 @@ self: { time transformers vector xml-conduit ]; description = "Utilities for reading and writing Alteryx .yxdb files"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -284494,7 +285329,7 @@ self: { librarySystemDepends = [ gomp z3 ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "Bindings for the Z3 Theorem Prover"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) gomp; inherit (pkgs) z3;}; "z3-encoding" = callPackage @@ -284506,8 +285341,8 @@ self: { libraryHaskellDepends = [ base containers mtl z3 ]; testHaskellDepends = [ base containers hspec z3 ]; description = "High-level assertion encoding to Z3 solver"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -284531,8 +285366,8 @@ self: { tasty-quickcheck text vector-sized ]; description = "Implementation of the z85 binary codec"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -284545,8 +285380,8 @@ self: { libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base tasty tasty-hspec ]; description = "Simple-minded abstract binding trees"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -284558,7 +285393,7 @@ self: { sha256 = "0nxz74svi7as52vr84jr58zmcykll8g5kcq795cxs4zf720ahqsz"; libraryHaskellDepends = [ base ]; description = "Z-algorithm implemented on haskell's built-in cons-cell-based lists"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "zampolit" = callPackage @@ -284576,8 +285411,8 @@ self: { parsec time ]; description = "A tool for checking how much work is done on group projects"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -284589,8 +285424,8 @@ self: { sha256 = "131lfik05gkr7mqnxf2ibbv5nxjy2x76r5mpvwgzj06nq4v9n527"; libraryHaskellDepends = [ base papillon ]; description = "lojban parser (zasni gerna)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -284604,8 +285439,8 @@ self: { libraryPkgconfigDepends = [ zbar ]; libraryToolDepends = [ c2hs ]; description = "zbar bindings in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) zbar;}; @@ -284619,7 +285454,7 @@ self: { array base containers mersenne-random-pure64 ]; description = "Zobrist keys for game state tracking"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "zenacy-html" = callPackage @@ -284652,7 +285487,7 @@ self: { raw-strings-qq text ]; description = "A standard compliant HTML parsing library"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "zenacy-unicode" = callPackage @@ -284668,7 +285503,7 @@ self: { base bytestring HUnit test-framework test-framework-hunit text ]; description = "Unicode utilities for Haskell"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "zenc" = callPackage @@ -284679,7 +285514,7 @@ self: { sha256 = "0p0h7vz14k9v8gsnpkb9ca61i1k67vvsjg0bzy0ag4m20k94zlb2"; libraryHaskellDepends = [ base ]; description = "GHC style name Z-encoding and Z-decoding"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "zendesk-api" = callPackage @@ -284700,8 +285535,8 @@ self: { transformers unordered-containers x509 x509-store x509-validation ]; description = "Zendesk API for Haskell programming language"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -284715,8 +285550,8 @@ self: { editedCabalFile = "0sj45k2v33x3312yz1bdbck2bcv5q64mh7v7xy35ghp72ynw1z8z"; libraryHaskellDepends = [ base ]; description = "@zenhack's personal custom prelude"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -284736,8 +285571,8 @@ self: { random text transformers ]; description = "An automated proof system for Haskell programs"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -284763,7 +285598,7 @@ self: { testHaskellDepends = [ base directory filepath ]; doHaddock = false; description = "Zeolite is a statically-typed, general-purpose programming language"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }) {}; "zephyr" = callPackage @@ -284795,8 +285630,8 @@ self: { ]; testToolDepends = [ purescript ]; description = "Zephyr, tree-shaking for the PureScript language"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -284808,7 +285643,7 @@ self: { sha256 = "1yb00wcgcyckzlf8kdxsdxpqra0r1sakwdph7pv9naa6q8zhhllw"; libraryHaskellDepends = [ base semigroups ]; description = "Semigroups with absorption"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "zerobin" = callPackage @@ -284829,8 +285664,8 @@ self: { base bytestring docopt raw-strings-qq ]; description = "Post to 0bin services"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -284849,8 +285684,8 @@ self: { test-framework-quickcheck2 ]; description = "Bindings to ZeroMQ 2.1.x"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) zeromq;}; @@ -284867,8 +285702,8 @@ self: { transformers zeromq3-haskell ]; description = "Conduit bindings for zeromq3-haskell"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -284891,8 +285726,8 @@ self: { MonadCatchIO-transformers QuickCheck transformers ]; description = "Bindings to ZeroMQ 3.x"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) zeromq;}; @@ -284919,8 +285754,8 @@ self: { test-framework-quickcheck2 ]; description = "Haskell implementation of the ZeroMQ clone pattern"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -284939,8 +285774,8 @@ self: { ]; testHaskellDepends = [ base ]; description = "Conduit wrapper around zeromq4-haskell"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -284962,7 +285797,7 @@ self: { async base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck ]; description = "Bindings to ZeroMQ 4.x"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {inherit (pkgs) zeromq;}; "zeromq4-patterns" = callPackage @@ -284985,8 +285820,8 @@ self: { test-framework-quickcheck2 ]; description = "Haskell implementation of several ZeroMQ patterns"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -285002,7 +285837,7 @@ self: { aeson base bytestring constraints hashable uuid zeromq4-haskell ]; description = "More constrained extensions to zeromq4-haskell"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "zeroth" = callPackage @@ -285025,8 +285860,8 @@ self: { monoid-record process syb template-haskell ]; description = "ZeroTH - remove unnecessary TH dependencies"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -285051,8 +285886,8 @@ self: { ]; testHaskellDepends = [ base ]; description = "Command-line utility for working with zettelkast files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -285076,8 +285911,8 @@ self: { genvalidity-path hspec path path-io QuickCheck stm ]; description = "zifter"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -285093,8 +285928,8 @@ self: { base directory filepath path path-io process safe zifter ]; description = "zifter-cabal"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -285106,8 +285941,8 @@ self: { sha256 = "1fsrair0c0a6j2jmghcxvbs3dr6j7gzh3yfimflva64nvwfx8vb8"; libraryHaskellDepends = [ base path process zifter ]; description = "zifter-git"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -285123,8 +285958,8 @@ self: { base filepath path path-io process safe zifter ]; description = "zifter-google-java-format"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -285140,8 +285975,8 @@ self: { base directory filepath path path-io process safe zifter ]; description = "zifter-hindent"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -285156,8 +285991,8 @@ self: { base filepath hlint path path-io safe zifter ]; description = "zifter-hlint"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -285177,8 +286012,8 @@ self: { zifter ]; description = "zifter-stack"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -285195,8 +286030,8 @@ self: { ]; testHaskellDepends = [ base bytestring mtl QuickCheck random ]; description = "XBee ZNet 2.5 (ZigBee) wireless modem communications"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -285217,7 +286052,7 @@ self: { conduit-extra hspec lzma ]; description = "Read and parse ZIM files"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; "zinza" = callPackage @@ -285239,7 +286074,7 @@ self: { tasty-golden tasty-hunit tasty-quickcheck ]; description = "Typed templates with jinja like syntax"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; }) {}; "zio" = callPackage @@ -285257,7 +286092,7 @@ self: { base mtl transformers unexceptionalio unexceptionalio-trans ]; description = "App-centric Monad-transformer based on Scala ZIO (UIO + ReaderT + ExceptT)"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }) {}; "zip" = callPackage @@ -285265,21 +286100,19 @@ self: { , cereal, conduit, conduit-extra, conduit-zstd, containers, digest , directory, dlist, exceptions, filepath, hspec, monad-control, mtl , QuickCheck, resourcet, temporary, text, time, transformers - , transformers-base + , transformers-base, unix }: mkDerivation { pname = "zip"; - version = "1.6.0"; - sha256 = "1k00g2952yf3iyq1p6pjn307zsxsc9j3iq6lih3rr8vysiijivcx"; - revision = "1"; - editedCabalFile = "1x8f4l08cfi3sawmhmd7q8krmh3nylgd32q0qx4i2zh2kpvj4ww9"; + version = "1.7.0"; + sha256 = "11vdxpyxnh7hbsrpk8g90fd9abbk27dxi9g0mhxc1lxc6syjkzgl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring bzlib-conduit case-insensitive cereal conduit conduit-extra conduit-zstd containers digest directory dlist exceptions filepath monad-control mtl resourcet text time - transformers transformers-base + transformers transformers-base unix ]; executableHaskellDepends = [ base filepath ]; testHaskellDepends = [ @@ -285287,7 +286120,7 @@ self: { filepath hspec QuickCheck temporary text time transformers ]; description = "Operations on zip archives"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "zip-archive" = callPackage @@ -285313,7 +286146,7 @@ self: { ]; testToolDepends = [ unzip which ]; description = "Library for creating and modifying zip archives"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) unzip; inherit (pkgs) which;}; "zip-conduit" = callPackage @@ -285342,8 +286175,8 @@ self: { temporary zip-archive ]; description = "Working with zip archives via conduits"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -285368,7 +286201,7 @@ self: { text time transformers ]; description = "ZIP archive streaming using conduits"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "zipedit" = callPackage @@ -285380,8 +286213,8 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base directory mtl process ]; description = "Create simple list editor interfaces"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -285397,8 +286230,8 @@ self: { base bytestring mersenne-random-pure64 mtl safe ]; description = "Zipkin-style request tracing monad"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -285410,8 +286243,8 @@ self: { sha256 = "1p8yn91snyv5p6bmll7d0gm0zbrhp99fl4kziq0vkbchlpcdjapf"; libraryHaskellDepends = [ base multirec ]; description = "Generic zipper for families of recursive datatypes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -285426,7 +286259,7 @@ self: { base comonad comonad-extras exceptions split ]; description = "Zipper utils that weren't in Control.Comonad.Store.Zipper"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "zippers" = callPackage @@ -285446,7 +286279,7 @@ self: { testHaskellDepends = [ base doctest ]; benchmarkHaskellDepends = [ base criterion lens ]; description = "Traversal based zippers"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "zippo" = callPackage @@ -285457,8 +286290,8 @@ self: { sha256 = "1ihdird5yryfb2ki9bwwchj8bxjcmmgjkp3hl605zzhi2lz3awx2"; libraryHaskellDepends = [ base mtl yall ]; description = "A simple lens-based, generic, heterogenous, type-checked zipper library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -285480,8 +286313,8 @@ self: { iso3166-country-codes servant-client ]; description = "A type-safe client for the Ziptastic API for doing forward and reverse geocoding"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -285501,8 +286334,8 @@ self: { aeson base base-compat here hspec iso3166-country-codes text tz ]; description = "Core Servant specification for the Ziptastic API for doing forward and reverse geocoding"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -285520,7 +286353,7 @@ self: { base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck ]; description = "Compression and decompression in the gzip and zlib formats"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {inherit (pkgs) zlib;}; "zlib-bindings" = callPackage @@ -285534,7 +286367,7 @@ self: { libraryHaskellDepends = [ base bytestring zlib ]; testHaskellDepends = [ base bytestring hspec QuickCheck zlib ]; description = "Low-level bindings to the zlib package"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "zlib-conduit" = callPackage @@ -285546,7 +286379,7 @@ self: { libraryHaskellDepends = [ base conduit ]; doHaddock = false; description = "Streaming compression/decompression via conduits. (deprecated)"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "zlib-enum" = callPackage @@ -285563,8 +286396,8 @@ self: { base bytestring enumerator transformers zlib-bindings ]; description = "Enumerator interface for zlib compression"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -285576,7 +286409,7 @@ self: { sha256 = "1sv6yx7p06zk653d3rmcj0lh2rzwzfi25v9sz9n8kq4r712n79g5"; libraryHaskellDepends = [ base bytestring profunctors zlib ]; description = "Lenses for zlib"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "zm" = callPackage @@ -285598,8 +286431,8 @@ self: { tasty tasty-hunit tasty-quickcheck text timeit ]; description = "Language independent, reproducible, absolute types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -285614,8 +286447,8 @@ self: { libraryHaskellDepends = [ base bytestring zeromq3-haskell ]; executableHaskellDepends = [ base bytestring ]; description = "Command-line tool for ZeroMQ"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -285627,7 +286460,7 @@ self: { sha256 = "127c36pdp7rq03amz6r3pji1crw0f7q5xp0baf782yq71fjgy4c5"; libraryHaskellDepends = [ base binary bytestring containers ]; description = "Read and write MIDI files"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "zmidi-score" = callPackage @@ -285644,8 +286477,8 @@ self: { directory filepath mtl parallel-io text zmidi-core ]; description = "Representing MIDI a simple score"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -285664,7 +286497,7 @@ self: { ]; description = "A socat-like tool for zeromq library"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }) {}; "zoneinfo" = callPackage @@ -285675,8 +286508,8 @@ self: { sha256 = "1n27j8ca79a1ijn7k7dp61kjz62i6zfzlns8n0kwgyvpx413ws8y"; libraryHaskellDepends = [ base time ]; description = "ZoneInfo library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -285695,8 +286528,8 @@ self: { base directory filepath ghc hint mtl ]; description = "A rake/thor-like task runner written in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -285728,8 +286561,8 @@ self: { test-framework-quickcheck2 transformers type-level unix ]; description = "A streamable, seekable, zoomable cache file format"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -285746,8 +286579,8 @@ self: { type-level zoom-cache ]; description = "Library for zoom-cache PCM audio codecs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -285767,8 +286600,8 @@ self: { mtl ui-command vector zoom-cache zoom-cache-pcm ]; description = "Tools for generating zoom-cache-pcm files"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.lgpl21; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -285780,8 +286613,8 @@ self: { sha256 = "0axkg2cp0gdlf82w0lfff740cd1d5zq4s9rqg0hg9v9vx7ahwg3l"; libraryHaskellDepends = [ base lens stm ]; description = "Zoom (~ Functor) and pairing (~ Applicative) for mutable references"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -285798,7 +286631,7 @@ self: { enableSeparateDataOutput = true; executableHaskellDepends = [ base monads-tf ]; description = "Zot language"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "zre" = callPackage @@ -285831,8 +286664,8 @@ self: { base bytestring QuickCheck quickcheck-instances uuid ]; description = "ZRE protocol implementation"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ sorki ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ sorki ]; }) {}; "zsdd" = callPackage @@ -285847,8 +286680,8 @@ self: { base containers hashable mtl unordered-containers ]; description = "Zero-Suppressed and Reduced Decision Diagrams"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -285862,8 +286695,8 @@ self: { isExecutable = true; executableHaskellDepends = [ base directory filepath mtl ]; description = "Ascii bars representing battery status"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -285884,7 +286717,7 @@ self: { base bytestring criterion ghc-prim zlib ]; description = "Haskell bindings to the Zstandard compression algorithm"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "zsyntax" = callPackage @@ -285898,8 +286731,8 @@ self: { ]; testHaskellDepends = [ base containers mtl multiset ]; description = "Automated theorem prover for the Zsyntax biochemical calculus"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -285920,7 +286753,7 @@ self: { unix unordered-containers ]; description = "Multi-file, colored, filtered log tailer"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "ztar" = callPackage @@ -285941,8 +286774,8 @@ self: { quickcheck-instances tasty tasty-quickcheck ]; description = "Creating and extracting arbitrary archives"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -285981,8 +286814,8 @@ self: { ]; testToolDepends = [ tasty-discover ]; description = "A lisp processor, An inline-lisp, in Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -285994,7 +286827,7 @@ self: { sha256 = "1382h7fib8vicjh7axdwp2i4zjm0ysgw0b1f5nkn38dqgwbfwlik"; libraryHaskellDepends = [ base ]; description = "Password strength estimation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }) {}; "zxcvbn-dvorak" = callPackage @@ -286012,8 +286845,8 @@ self: { unordered-containers zlib zxcvbn-hs ]; description = "Password strength estimation based on zxcvbn"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -286050,7 +286883,7 @@ self: { unordered-containers vector zlib ]; description = "Password strength estimation based on zxcvbn"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }) {}; "zydiskell" = callPackage @@ -286068,7 +286901,7 @@ self: { base bytestring containers fixed-vector storable-record ]; description = "Haskell language binding for the Zydis library, a x86/x86-64 disassembler"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }) {}; } diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix index 0f620d46ccc..cfa06b045de 100644 --- a/pkgs/development/haskell-modules/hoogle.nix +++ b/pkgs/development/haskell-modules/hoogle.nix @@ -38,8 +38,8 @@ let else "haddock-ghcjs"; ghcDocLibDir = if !isGhcjs - then ghc.doc + ''/share/doc/ghc*/html/libraries'' - else ghc + ''/doc/lib''; + then ghc.doc + "/share/doc/ghc*/html/libraries" + else ghc + "/doc/lib"; # On GHCJS, use a stripped down version of GHC's prologue.txt prologue = if !isGhcjs @@ -120,7 +120,7 @@ buildPackages.stdenv.mkDerivation { meta = { description = "A local Hoogle database"; platforms = ghc.meta.platforms; - hydraPlatforms = with stdenv.lib.platforms; none; - maintainers = with stdenv.lib.maintainers; [ ttuegel ]; + hydraPlatforms = with lib.platforms; none; + maintainers = with lib.maintainers; [ ttuegel ]; }; } diff --git a/pkgs/development/haskell-modules/initial-packages.nix b/pkgs/development/haskell-modules/initial-packages.nix index 6ab7da96911..3bbf9c037dd 100644 --- a/pkgs/development/haskell-modules/initial-packages.nix +++ b/pkgs/development/haskell-modules/initial-packages.nix @@ -1,2 +1,2 @@ -args@{ pkgs, stdenv, callPackage }: self: +args@{ pkgs, lib, callPackage }: self: (import ./hackage-packages.nix args self) diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index 964c179fb65..1537cd6466c 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -160,7 +160,7 @@ rec { addTestToolDepends = drv: xs: overrideCabal drv (drv: { testToolDepends = (drv.testToolDepends or []) ++ xs; }); addPkgconfigDepend = drv: x: addPkgconfigDepends drv [x]; - addPkgconfigDepends = drv: xs: overrideCabal drv (drv: { pkgconfigDepends = (drv.pkgconfigDepends or []) ++ xs; }); + addPkgconfigDepends = drv: xs: overrideCabal drv (drv: { pkg-configDepends = (drv.pkg-configDepends or []) ++ xs; }); addSetupDepend = drv: x: addSetupDepends drv [x]; addSetupDepends = drv: xs: overrideCabal drv (drv: { setupHaskellDepends = (drv.setupHaskellDepends or []) ++ xs; }); diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 4ae3f0b2427..2641892672a 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -11,9 +11,13 @@ , # package-set used for non-haskell dependencies (all of nixpkgs) pkgs -, # stdenv to use for building haskell packages +, # stdenv provides our build and host platforms stdenv +, # this module provides the list of known licenses and maintainers + lib + + # needed for overrideCabal & packageSourceOverrides , haskellLib , # hashes for downloading Hackage packages @@ -22,7 +26,7 @@ , # compiler to use ghc -, # A function that takes `{ pkgs, stdenv, callPackage }` as the first arg and +, # A function that takes `{ pkgs, lib, callPackage }` as the first arg and # `self` as second, and returns a set of haskell packages package-set @@ -37,7 +41,7 @@ self: let inherit (stdenv) buildPlatform hostPlatform; - inherit (stdenv.lib) fix' extends makeOverridable; + inherit (lib) fix' extends makeOverridable; inherit (haskellLib) overrideCabal; mkDerivationImpl = pkgs.callPackage ./generic-builder.nix { @@ -80,8 +84,8 @@ let # lost on `.override`) but determine the auto-args based on `drv` (the problem here # is that nix has no way to "passthrough" args while preserving the reflection # info that callPackage uses to determine the arguments). - drv = if stdenv.lib.isFunction fn then fn else import fn; - auto = builtins.intersectAttrs (stdenv.lib.functionArgs drv) scope; + drv = if lib.isFunction fn then fn else import fn; + auto = builtins.intersectAttrs (lib.functionArgs drv) scope; # this wraps the `drv` function to add a `overrideScope` function to the result. drvScope = allArgs: drv allArgs // { @@ -94,7 +98,7 @@ let # nothing. in callPackageWithScope newScope drv manualArgs; }; - in stdenv.lib.makeOverridable drvScope (auto // manualArgs); + in lib.makeOverridable drvScope (auto // manualArgs); mkScope = scope: let ps = pkgs.__splicedPackages; @@ -169,7 +173,7 @@ let }; }); -in package-set { inherit pkgs stdenv callPackage; } self // { +in package-set { inherit pkgs lib callPackage; } self // { inherit mkDerivation callPackage haskellSrc2nix hackage2nix buildHaskellPackages; @@ -323,6 +327,37 @@ in package-set { inherit pkgs stdenv callPackage; } self // { # packages. You should set this to true if you have benchmarks defined # in your local packages that you want to be able to run with cabal benchmark doBenchmark ? false + # An optional function that can modify the generic builder arguments + # for the fake package that shellFor uses to construct its environment. + # + # Example: + # let + # # elided... + # haskellPkgs = pkgs.haskell.packages.ghc884.override (hpArgs: { + # overrides = pkgs.lib.composeExtensions (hpArgs.overrides or (_: _: { })) ( + # _hfinal: hprev: { + # mkDerivation = args: hprev.mkDerivation ({ + # doCheck = false; + # doBenchmark = false; + # doHoogle = true; + # doHaddock = true; + # enableLibraryProfiling = false; + # enableExecutableProfiling = false; + # } // args); + # } + # ); + # }); + # in + # hpkgs.shellFor { + # packages = p: [ p.foo ]; + # genericBuilderArgsModifier = args: args // { doCheck = true; doBenchmark = true }; + # } + # + # This will disable tests and benchmarks for everything in "haskellPkgs" + # (which will invalidate the binary cache), and then re-enable them + # for the "shellFor" environment (ensuring that any test/benchmark + # dependencies for "foo" will be available within the nix-shell). + , genericBuilderArgsModifier ? (args: args) , ... } @ args: let @@ -439,7 +474,7 @@ in package-set { inherit pkgs stdenv callPackage; } self // { # This is a derivation created with `haskellPackages.mkDerivation`. # # pkgWithCombinedDeps :: HaskellDerivation - pkgWithCombinedDeps = self.mkDerivation genericBuilderArgs; + pkgWithCombinedDeps = self.mkDerivation (genericBuilderArgsModifier genericBuilderArgs); # The derivation returned from `envFunc` for `pkgWithCombinedDeps`. # @@ -453,7 +488,7 @@ in package-set { inherit pkgs stdenv callPackage; } self // { # pkgWithCombinedDepsDevDrv :: Derivation pkgWithCombinedDepsDevDrv = pkgWithCombinedDeps.envFunc { inherit withHoogle; }; - mkDerivationArgs = builtins.removeAttrs args [ "packages" "withHoogle" "doBenchmark" ]; + mkDerivationArgs = builtins.removeAttrs args [ "genericBuilderArgsModifier" "packages" "withHoogle" "doBenchmark" ]; in pkgWithCombinedDepsDevDrv.overrideAttrs (old: mkDerivationArgs // { nativeBuildInputs = old.nativeBuildInputs ++ mkDerivationArgs.nativeBuildInputs or []; diff --git a/pkgs/development/idris-modules/glfw.nix b/pkgs/development/idris-modules/glfw.nix index da23ae18331..c63cf8acb0f 100644 --- a/pkgs/development/idris-modules/glfw.nix +++ b/pkgs/development/idris-modules/glfw.nix @@ -10,7 +10,7 @@ build-idris-package { idrisDeps = [ effects ]; - nativeBuildInputs = [ pkgs.pkgconfig ]; + nativeBuildInputs = [ pkgs.pkg-config ]; extraBuildInputs = [ pkgs.glfw ]; postPatch = '' diff --git a/pkgs/development/idris-modules/sdl2.nix b/pkgs/development/idris-modules/sdl2.nix index 2e1cdaa9be3..943db9e87a0 100644 --- a/pkgs/development/idris-modules/sdl2.nix +++ b/pkgs/development/idris-modules/sdl2.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , effects , lib -, pkgconfig +, pkg-config , SDL2 , SDL2_gfx }: @@ -13,7 +13,7 @@ build-idris-package rec { idrisDeps = [ effects ]; extraBuildInputs = [ - pkgconfig + pkg-config SDL2 SDL2_gfx ]; diff --git a/pkgs/development/idris-modules/tfrandom.nix b/pkgs/development/idris-modules/tfrandom.nix index 5c631950312..8249259075c 100644 --- a/pkgs/development/idris-modules/tfrandom.nix +++ b/pkgs/development/idris-modules/tfrandom.nix @@ -1,8 +1,8 @@ -{ stdenv +{ lib , build-idris-package , fetchFromGitHub -, lib }: + build-idris-package { name = "tf-random"; version = "2020-01-15"; diff --git a/pkgs/development/idris-modules/tparsec.nix b/pkgs/development/idris-modules/tparsec.nix index 84f88e1598b..ce040bebe35 100644 --- a/pkgs/development/idris-modules/tparsec.nix +++ b/pkgs/development/idris-modules/tparsec.nix @@ -8,7 +8,7 @@ build-idris-package { version = "2020-02-11"; ipkgName = "TParsec"; - + idrisDeps = [ contrib ]; src = fetchFromGitHub { diff --git a/pkgs/development/idris-modules/with-packages.nix b/pkgs/development/idris-modules/with-packages.nix index 47136839d01..080cbe2778a 100644 --- a/pkgs/development/idris-modules/with-packages.nix +++ b/pkgs/development/idris-modules/with-packages.nix @@ -1,10 +1,10 @@ # Build a version of idris with a set of packages visible # packages: The packages visible to idris -{ stdenv, idris, symlinkJoin, makeWrapper }: packages: +{ lib, idris, symlinkJoin, makeWrapper }: packages: -let paths = stdenv.lib.closePropagation packages; +let paths = lib.closePropagation packages; in -stdenv.lib.appendToName "with-packages" (symlinkJoin { +lib.appendToName "with-packages" (symlinkJoin { inherit (idris) name; diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix index 83b54e442aa..c089916158b 100644 --- a/pkgs/development/interpreters/acl2/default.nix +++ b/pkgs/development/interpreters/acl2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchFromGitHub, writeShellScriptBin, substituteAll +{ lib, stdenv, callPackage, fetchFromGitHub, writeShellScriptBin, substituteAll , sbcl, bash, which, perl, nettools , openssl, glucose, minisat, abc-verifier, z3, python2 , certifyBooks ? true @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { buildInputs = [ # ACL2 itself only needs a Common Lisp compiler/interpreter: sbcl - ] ++ stdenv.lib.optionals certifyBooks [ + ] ++ lib.optionals certifyBooks [ # To build community books, we need Perl and a couple of utilities: which perl nettools # Some of the books require one or more of these external tools: @@ -55,7 +55,7 @@ in stdenv.mkDerivation rec { preConfigure = '' # When certifying books, ACL2 doesn't like $HOME not existing. export HOME=$(pwd)/fake-home - '' + stdenv.lib.optionalString certifyBooks '' + '' + lib.optionalString certifyBooks '' # Some books also care about $USER being nonempty. export USER=nobody ''; @@ -79,7 +79,7 @@ in stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin ln -s $out/share/${pname}/saved_acl2 $out/bin/${pname} - '' + stdenv.lib.optionalString certifyBooks '' + '' + lib.optionalString certifyBooks '' ln -s $out/share/${pname}/books/build/cert.pl $out/bin/${pname}-cert ln -s $out/share/${pname}/books/build/clean.pl $out/bin/${pname}-clean ''; @@ -100,7 +100,7 @@ in stdenv.mkDerivation rec { rm -rf $out/share/${pname}/books ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An interpreter and a prover for a Lisp dialect"; longDescription = '' ACL2 is a logic and programming language in which you can model computer diff --git a/pkgs/development/interpreters/acl2/libipasirglucose4/default.nix b/pkgs/development/interpreters/acl2/libipasirglucose4/default.nix index 5186cd69584..b9a61b88a30 100644 --- a/pkgs/development/interpreters/acl2/libipasirglucose4/default.nix +++ b/pkgs/development/interpreters/acl2/libipasirglucose4/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, unzip }: +{ lib, stdenv, fetchurl, zlib, unzip }: stdenv.mkDerivation rec { pname = "libipasirglucose4"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { install -D libipasirglucose4.so $out/lib/libipasirglucose4.so ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Shared library providing IPASIR interface to the Glucose SAT solver"; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/development/interpreters/alda/default.nix b/pkgs/development/interpreters/alda/default.nix index b82b0b978f9..19e90a00e6c 100644 --- a/pkgs/development/interpreters/alda/default.nix +++ b/pkgs/development/interpreters/alda/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre }: +{ lib, stdenv, fetchurl, jre }: stdenv.mkDerivation rec { pname = "alda"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sed -i -e '1 s!java!${jre}/bin/java!' $out/bin/alda ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A music programming language for musicians"; homepage = "https://alda.io"; license = licenses.epl10; diff --git a/pkgs/development/interpreters/angelscript/2.22.nix b/pkgs/development/interpreters/angelscript/2.22.nix index 0449572da02..922d964e8ab 100644 --- a/pkgs/development/interpreters/angelscript/2.22.nix +++ b/pkgs/development/interpreters/angelscript/2.22.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip}: +{lib, stdenv, fetchurl, unzip}: let s = # Generated upstream information rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation { preConfigure = '' cd angelscript/projects/gnuc sed -i makefile -e "s@LOCAL = .*@LOCAL = $out@" - export SHARED=1 + export SHARED=1 export VERSION="${s.version}" mkdir -p "$out/lib" "$out/bin" "$out/share" "$out/include" ''; @@ -35,9 +35,9 @@ stdenv.mkDerivation { meta = { inherit (s) version; description = "Light-weight scripting library"; - license = stdenv.lib.licenses.zlib ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.zlib ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; badPlatforms = [ "aarch64-linux" ]; downloadPage = "http://www.angelcode.com/angelscript/downloads.html"; homepage="http://www.angelcode.com/angelscript/"; diff --git a/pkgs/development/interpreters/angelscript/default.nix b/pkgs/development/interpreters/angelscript/default.nix index 0209bcaaafc..fb8c6b2844d 100644 --- a/pkgs/development/interpreters/angelscript/default.nix +++ b/pkgs/development/interpreters/angelscript/default.nix @@ -1,12 +1,12 @@ -{stdenv, fetchurl, unzip}: +{lib, stdenv, fetchurl, unzip}: let s = # Generated upstream information rec { baseName="angelscript"; - version = "2.34.0"; + version = "2.35.0"; name="${baseName}-${version}"; url="http://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip"; - sha256 = "1xxxpwln4v2yasa35y7552fsfd8fbg50gnbp4vxy0ajj2wvh9akg"; + sha256 = "sha256-AQ3UXiPnNNRvWJHXDiaGB6EsuasSUD3aQvhC2dt+iFc="; }; buildInputs = [ unzip @@ -29,9 +29,9 @@ stdenv.mkDerivation { meta = { inherit (s) version; description = "Light-weight scripting library"; - license = stdenv.lib.licenses.zlib ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.zlib ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; downloadPage = "http://www.angelcode.com/angelscript/downloads.html"; homepage="http://www.angelcode.com/angelscript/"; }; diff --git a/pkgs/development/interpreters/bats/default.nix b/pkgs/development/interpreters/bats/default.nix index bbc38e51542..aa3abc65534 100644 --- a/pkgs/development/interpreters/bats/default.nix +++ b/pkgs/development/interpreters/bats/default.nix @@ -1,29 +1,37 @@ -{ stdenv, fetchzip, coreutils, gnugrep }: +{ stdenv, lib, fetchzip, bash, makeWrapper, coreutils, gnugrep, doCheck ? true }: stdenv.mkDerivation rec { pname = "bats"; - version = "1.2.0"; + version = "1.2.1"; src = fetchzip { url = "https://github.com/bats-core/bats-core/archive/v${version}.tar.gz"; - sha256 = "0f59zh4d4pa1a7ybs5zl6h0csbqqv11lbnq0jl1dgwm1s6p49bsq"; + hash = "sha256-grB/rJaDU0fuw4Hm3/9nI2px8KZnSWqRjTJPd7Mmb7s="; }; + nativeBuildInputs = [ makeWrapper ]; + patchPhase = '' - patchShebangs ./install.sh + patchShebangs . + ''; - substituteInPlace ./libexec/bats-core/bats \ - --replace 'type -p greadlink readlink' 'type -p ${coreutils}/bin/readlink' - substituteInPlace ./libexec/bats-core/bats-format-tap-stream \ - --replace grep ${gnugrep}/bin/grep + installPhase = '' + ./install.sh $out + wrapProgram $out/bin/bats --suffix PATH : "${lib.makeBinPath [ bash coreutils gnugrep ]}" ''; - installPhase = "./install.sh $out"; + inherit doCheck; + checkPhase = '' + # test generates file with absolute shebang dynamically + substituteInPlace test/install.bats --replace \ + "/usr/bin/env bash" "${bash}/bin/bash" + bin/bats test + ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/bats-core/bats-core"; description = "Bash Automated Testing System"; - maintainers = [ maintainers.lnl7 ]; + maintainers = with maintainers; [ abathur ]; license = licenses.mit; platforms = platforms.unix; }; diff --git a/pkgs/development/interpreters/ceptre/default.nix b/pkgs/development/interpreters/ceptre/default.nix index de12185b96f..a9b8f54ab87 100644 --- a/pkgs/development/interpreters/ceptre/default.nix +++ b/pkgs/development/interpreters/ceptre/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, mlton }: +{ lib, stdenv, fetchgit, mlton }: stdenv.mkDerivation { name = "ceptre-2016-11-27"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { cp ceptre $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A linear logic programming language for modeling generative interactive systems"; homepage = "https://github.com/chrisamaphone/interactive-lp"; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/development/interpreters/chibi/default.nix b/pkgs/development/interpreters/chibi/default.nix index 7bf4c0fd52d..96c884ab602 100644 --- a/pkgs/development/interpreters/chibi/default.nix +++ b/pkgs/development/interpreters/chibi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, makeWrapper }: let version = "0.9.1"; name = "chibi-scheme-${version}"; @@ -9,9 +9,9 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/ashinn/chibi-scheme"; description = "Small Footprint Scheme for use as a C Extension Language"; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.DerGuteMoritz ]; + platforms = lib.platforms.all; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.DerGuteMoritz ]; }; src = fetchFromGitHub { diff --git a/pkgs/development/interpreters/cling/default.nix b/pkgs/development/interpreters/cling/default.nix index c22ad3f4cb0..8f80d2f4ee6 100644 --- a/pkgs/development/interpreters/cling/default.nix +++ b/pkgs/development/interpreters/cling/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , python , libffi , git @@ -50,7 +50,7 @@ let "-DCLING_INCLUDE_TESTS=ON" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "The Interactive C++ Interpreter"; homepage = "https://root.cern/cling/"; license = with licenses; [ lgpl21 ncsa ]; @@ -73,7 +73,7 @@ let flags = [ "-nostdinc" "-nostdinc++" - "-isystem" "${stdenv.lib.getDev stdenv.cc.libc}/include" + "-isystem" "${lib.getDev stdenv.cc.libc}/include" "-I" "${unwrapped}/include" "-I" "${unwrapped}/lib/clang/5.0.2/include" ]; diff --git a/pkgs/development/interpreters/clips/default.nix b/pkgs/development/interpreters/clips/default.nix index cf0710f36a1..d38fb8279f0 100644 --- a/pkgs/development/interpreters/clips/default.nix +++ b/pkgs/development/interpreters/clips/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { version = "6.30"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { installPhase = '' install -D -t $out/bin core/clips ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A Tool for Building Expert Systems"; homepage = "http://www.clipsrules.net/"; longDescription = '' diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix index 1b7ff2c8cba..566d16179b5 100644 --- a/pkgs/development/interpreters/clisp/default.nix +++ b/pkgs/development/interpreters/clisp/default.nix @@ -3,7 +3,7 @@ # - base (default): contains readline and i18n, regexp and syscalls modules # by default # - full: contains base plus modules in withModules -{ stdenv, fetchurl, libsigsegv, gettext, ncurses, readline, libX11 +{ lib, stdenv, fetchurl, libsigsegv, gettext, ncurses, readline, libX11 , libXau, libXt, pcre, zlib, libXpm, xorgproto, libXext , libffi , libffcall @@ -16,8 +16,8 @@ "pcre" "rawsock" ] - ++ stdenv.lib.optionals stdenv.isLinux [ "bindings/glibc" "zlib" "wildcard" ] - ++ stdenv.lib.optional x11Support "clx/new-clx" + ++ lib.optionals stdenv.isLinux [ "bindings/glibc" "zlib" "wildcard" ] + ++ lib.optional x11Support "clx/new-clx" }: assert x11Support -> (libX11 != null && libXau != null && libXt != null @@ -37,14 +37,14 @@ stdenv.mkDerivation rec { ffcallAvailable = stdenv.isLinux && (libffcall != null); buildInputs = [libsigsegv] - ++ stdenv.lib.optional (gettext != null) gettext - ++ stdenv.lib.optional (ncurses != null) ncurses - ++ stdenv.lib.optional (pcre != null) pcre - ++ stdenv.lib.optional (zlib != null) zlib - ++ stdenv.lib.optional (readline != null) readline - ++ stdenv.lib.optional (ffcallAvailable && (libffi != null)) libffi - ++ stdenv.lib.optional ffcallAvailable libffcall - ++ stdenv.lib.optionals x11Support [ + ++ lib.optional (gettext != null) gettext + ++ lib.optional (ncurses != null) ncurses + ++ lib.optional (pcre != null) pcre + ++ lib.optional (zlib != null) zlib + ++ lib.optional (readline != null) readline + ++ lib.optional (ffcallAvailable && (libffi != null)) libffi + ++ lib.optional ffcallAvailable libffcall + ++ lib.optionals x11Support [ libX11 libXau libXt libXpm xorgproto libXext ]; @@ -68,14 +68,14 @@ stdenv.mkDerivation rec { ''; configureFlags = [ "builddir" ] - ++ stdenv.lib.optional (!dllSupport) "--without-dynamic-modules" - ++ stdenv.lib.optional (readline != null) "--with-readline" + ++ lib.optional (!dllSupport) "--without-dynamic-modules" + ++ lib.optional (readline != null) "--with-readline" # --with-dynamic-ffi can only exist with --with-ffcall - foreign.d does not compile otherwise - ++ stdenv.lib.optional (ffcallAvailable && (libffi != null)) "--with-dynamic-ffi" - ++ stdenv.lib.optional ffcallAvailable "--with-ffcall" - ++ stdenv.lib.optional (!ffcallAvailable) "--without-ffcall" + ++ lib.optional (ffcallAvailable && (libffi != null)) "--with-dynamic-ffi" + ++ lib.optional ffcallAvailable "--with-ffcall" + ++ lib.optional (!ffcallAvailable) "--without-ffcall" ++ builtins.map (x: "--with-module=" + x) withModules - ++ stdenv.lib.optional threadSupport "--with-threads=POSIX_THREADS"; + ++ lib.optional threadSupport "--with-threads=POSIX_THREADS"; preBuild = '' sed -e '/avcall.h/a\#include "config.h"' -i src/foreign.d @@ -83,11 +83,11 @@ stdenv.mkDerivation rec { ''; postInstall = - stdenv.lib.optionalString (withModules != []) + lib.optionalString (withModules != []) (''./clisp-link add "$out"/lib/clisp*/base "$(dirname "$out"/lib/clisp*/base)"/full'' - + stdenv.lib.concatMapStrings (x: " " + x) withModules); + + lib.concatMapStrings (x: " " + x) withModules); - NIX_CFLAGS_COMPILE = "-O0 ${stdenv.lib.optionalString (!stdenv.is64bit) "-falign-functions=4"}"; + NIX_CFLAGS_COMPILE = "-O0 ${lib.optionalString (!stdenv.is64bit) "-falign-functions=4"}"; # TODO : make mod-check fails doCheck = false; @@ -95,10 +95,10 @@ stdenv.mkDerivation rec { meta = { description = "ANSI Common Lisp Implementation"; homepage = "http://clisp.cons.org"; - maintainers = with stdenv.lib.maintainers; [raskin tohl]; - platforms = stdenv.lib.platforms.unix; + maintainers = with lib.maintainers; [raskin tohl]; + platforms = lib.platforms.unix; # problems on Darwin: https://github.com/NixOS/nixpkgs/issues/20062 broken = stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/development/interpreters/clisp/hg.nix b/pkgs/development/interpreters/clisp/hg.nix index 6898f84669f..83a1870d182 100644 --- a/pkgs/development/interpreters/clisp/hg.nix +++ b/pkgs/development/interpreters/clisp/hg.nix @@ -3,7 +3,7 @@ # - base (default): contains readline and i18n, regexp and syscalls modules # by default # - full: contains base plus modules in withModules -{ stdenv, fetchhg, libsigsegv, gettext, ncurses, readline, libX11 +{ lib, stdenv, fetchhg, libsigsegv, gettext, ncurses, readline, libX11 , libXau, libXt, pcre, zlib, libXpm, xorgproto, libXext , libffi, libffcall, automake , coreutils @@ -15,8 +15,8 @@ "pcre" "rawsock" ] - ++ stdenv.lib.optionals stdenv.isLinux [ "bindings/glibc" "zlib" ] - ++ stdenv.lib.optional x11Support "clx/new-clx" + ++ lib.optionals stdenv.isLinux [ "bindings/glibc" "zlib" ] + ++ lib.optional x11Support "clx/new-clx" }: assert x11Support -> (libX11 != null && libXau != null && libXt != null @@ -38,14 +38,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ automake ]; # sometimes fails otherwise buildInputs = [libsigsegv] - ++ stdenv.lib.optional (gettext != null) gettext - ++ stdenv.lib.optional (ncurses != null) ncurses - ++ stdenv.lib.optional (pcre != null) pcre - ++ stdenv.lib.optional (zlib != null) zlib - ++ stdenv.lib.optional (readline != null) readline - ++ stdenv.lib.optional (ffcallAvailable && (libffi != null)) libffi - ++ stdenv.lib.optional ffcallAvailable libffcall - ++ stdenv.lib.optionals x11Support [ + ++ lib.optional (gettext != null) gettext + ++ lib.optional (ncurses != null) ncurses + ++ lib.optional (pcre != null) pcre + ++ lib.optional (zlib != null) zlib + ++ lib.optional (readline != null) readline + ++ lib.optional (ffcallAvailable && (libffi != null)) libffi + ++ lib.optional ffcallAvailable libffcall + ++ lib.optionals x11Support [ libX11 libXau libXt libXpm xorgproto libXext ]; @@ -63,14 +63,14 @@ stdenv.mkDerivation rec { ''; configureFlags = [ "builddir" ] - ++ stdenv.lib.optional (!dllSupport) "--without-dynamic-modules" - ++ stdenv.lib.optional (readline != null) "--with-readline" + ++ lib.optional (!dllSupport) "--without-dynamic-modules" + ++ lib.optional (readline != null) "--with-readline" # --with-dynamic-ffi can only exist with --with-ffcall - foreign.d does not compile otherwise - ++ stdenv.lib.optional (ffcallAvailable && (libffi != null)) "--with-dynamic-ffi" - ++ stdenv.lib.optional ffcallAvailable "--with-ffcall" - ++ stdenv.lib.optional (!ffcallAvailable) "--without-ffcall" + ++ lib.optional (ffcallAvailable && (libffi != null)) "--with-dynamic-ffi" + ++ lib.optional ffcallAvailable "--with-ffcall" + ++ lib.optional (!ffcallAvailable) "--without-ffcall" ++ builtins.map (x: " --with-module=" + x) withModules - ++ stdenv.lib.optional threadSupport "--with-threads=POSIX_THREADS"; + ++ lib.optional threadSupport "--with-threads=POSIX_THREADS"; preBuild = '' sed -e '/avcall.h/a\#include "config.h"' -i src/foreign.d @@ -79,11 +79,11 @@ stdenv.mkDerivation rec { ''; postInstall = - stdenv.lib.optionalString (withModules != []) + lib.optionalString (withModules != []) (''./clisp-link add "$out"/lib/clisp*/base "$(dirname "$out"/lib/clisp*/base)"/full'' - + stdenv.lib.concatMapStrings (x: " " + x) withModules); + + lib.concatMapStrings (x: " " + x) withModules); - NIX_CFLAGS_COMPILE = "-O0 ${stdenv.lib.optionalString (!stdenv.is64bit) "-falign-functions=4"}"; + NIX_CFLAGS_COMPILE = "-O0 ${lib.optionalString (!stdenv.is64bit) "-falign-functions=4"}"; # TODO : make mod-check fails doCheck = false; @@ -91,8 +91,8 @@ stdenv.mkDerivation rec { meta = { description = "ANSI Common Lisp Implementation"; homepage = "http://clisp.cons.org"; - maintainers = with stdenv.lib.maintainers; [raskin tohl]; + maintainers = with lib.maintainers; [raskin tohl]; # problems on Darwin: https://github.com/NixOS/nixpkgs/issues/20062 - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index a6beaf1a576..790f8d1ef81 100644 --- a/pkgs/development/interpreters/clojure/babashka.nix +++ b/pkgs/development/interpreters/clojure/babashka.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, graalvm11-ce, glibcLocales }: +{ lib, stdenv, fetchurl, graalvm11-ce, glibcLocales }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "babashka"; version = "0.2.3"; @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { native-image \ -jar ${src} \ -H:Name=bb \ + ${optionalString stdenv.isDarwin ''-H:-CheckToolchain''} \ -H:+ReportExceptionStackTraces \ -J-Dclojure.spec.skip-macros=true \ -J-Dclojure.compiler.direct-linking=true \ "-H:IncludeResources=BABASHKA_VERSION" \ "-H:IncludeResources=SCI_VERSION" \ -H:ReflectionConfigurationFiles=${reflectionJson} \ - --initialize-at-run-time=java.lang.Math\$RandomNumberGeneratorHolder \ --initialize-at-build-time \ -H:Log=registerResource: \ -H:EnableURLProtocols=http,https \ @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { cp bb $out/bin/bb ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A Clojure babushka for the grey areas of Bash"; longDescription = '' The main idea behind babashka is to leverage Clojure in places where you diff --git a/pkgs/development/interpreters/clojure/clooj.nix b/pkgs/development/interpreters/clojure/clooj.nix index d51fa76003b..57da5e862e9 100644 --- a/pkgs/development/interpreters/clojure/clooj.nix +++ b/pkgs/development/interpreters/clojure/clooj.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, makeWrapper }: +{ lib, stdenv, fetchurl, jre, makeWrapper }: let version = "0.4.4"; in @@ -25,6 +25,6 @@ stdenv.mkDerivation { meta = { description = "A lightweight IDE for Clojure"; homepage = "https://github.com/arthuredelstein/clooj"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }; } diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index 06e18c96ac3..ab542237859 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, installShellFiles, jdk, rlwrap, makeWrapper }: +{ lib, stdenv, fetchurl, installShellFiles, jdk, rlwrap, makeWrapper }: stdenv.mkDerivation rec { pname = "clojure"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # See https://github.com/clojure/brew-install/blob/1.10.1/src/main/resources/clojure/install/linux-install.sh installPhase = let - binPath = stdenv.lib.makeBinPath [ rlwrap jdk ]; + binPath = lib.makeBinPath [ rlwrap jdk ]; in '' clojure_lib_dir=$out @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { -Sverbose \ -Scp $out/libexec/clojure-tools-${version}.jar ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A Lisp dialect for the JVM"; homepage = "https://clojure.org/"; license = licenses.epl10; diff --git a/pkgs/development/interpreters/clojurescript/lumo/default.nix b/pkgs/development/interpreters/clojurescript/lumo/default.nix index 61fd94c09bf..a269d0b158e 100644 --- a/pkgs/development/interpreters/clojurescript/lumo/default.nix +++ b/pkgs/development/interpreters/clojurescript/lumo/default.nix @@ -280,8 +280,8 @@ stdenv.mkDerivation { making it the fastest Clojure REPL in existence. ''; homepage = "https://github.com/anmonteiro/lumo"; - license = stdenv.lib.licenses.epl10; - maintainers = [ stdenv.lib.maintainers.hlolli ]; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + license = lib.licenses.epl10; + maintainers = [ lib.maintainers.hlolli ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/development/interpreters/cyclone/default.nix b/pkgs/development/interpreters/cyclone/default.nix index 60a5fd9e65f..c0a11cf9f02 100644 --- a/pkgs/development/interpreters/cyclone/default.nix +++ b/pkgs/development/interpreters/cyclone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libck, darwin }: +{ lib, stdenv, fetchFromGitHub, libck, darwin }: let version = "0.21"; @@ -15,7 +15,7 @@ let enableParallelBuilding = true; - nativeBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.cctools ]; + nativeBuildInputs = lib.optionals stdenv.isDarwin [ darwin.cctools ]; buildInputs = [ libck ]; @@ -36,13 +36,13 @@ stdenv.mkDerivation { enableParallelBuilding = true; nativeBuildInputs = [ bootstrap ] - ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.cctools ]; + ++ lib.optionals stdenv.isDarwin [ darwin.cctools ]; buildInputs = [ libck ]; makeFlags = [ "PREFIX=${placeholder "out"}" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://justinethier.github.io/cyclone/"; description = "A brand-new compiler that allows practical application development using R7RS Scheme"; license = licenses.mit; diff --git a/pkgs/development/interpreters/dart/default.nix b/pkgs/development/interpreters/dart/default.nix index 99e6d966283..5fb180201b9 100644 --- a/pkgs/development/interpreters/dart/default.nix +++ b/pkgs/development/interpreters/dart/default.nix @@ -1,89 +1,42 @@ -{ stdenv, fetchurl, unzip, version ? "2.7.2" }: - -let - - sources = let - +{ stdenv +, lib +, fetchurl +, unzip +, version ? "2.10.5" +, sources ? + let base = "https://storage.googleapis.com/dart-archive/channels"; - stable_version = "stable"; - dev_version = "dev"; x86_64 = "x64"; i686 = "ia32"; aarch64 = "arm64"; + # Make sure that if the user overrides version parameter they're + # also need to override sources, to avoid mistakes + version = "2.10.5"; + in + { + "${version}-x86_64-darwin" = fetchurl { + url = "${base}/stable/release/${version}/sdk/dartsdk-macos-${x86_64}-release.zip"; + sha256 = "1vb2m25w6v901id9syan9q69fa60sxxd7qpyzq21fn5dpah0g99i"; + }; + "${version}-x86_64-linux" = fetchurl { + url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip"; + sha256 = "1mb6m3vxjya1dz47mdna23c2015n3bz8dvz8fwggq6k3zp0a4dsh"; + }; + "${version}-i686-linux" = fetchurl { + url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${i686}-release.zip"; + sha256 = "10g4qrwvmabrdg4i8y0wq9g7whqcpkdfp05yilflg70ybplrscf7"; + }; + "${version}-aarch64-linux" = fetchurl { + url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip"; + sha256 = "0js83wy496swcwia144fhxk872irb5nr6i8558hxabkdrpv1bky5"; + }; + } +}: - in { - "1.24.3-x86_64-darwin" = fetchurl { - url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-macos-${x86_64}-release.zip"; - sha256 = "1n4cq4jrms4j0yl54b3w14agcgy8dbipv5788jziwk8q06a8c69l"; - }; - "1.24.3-x86_64-linux" = fetchurl { - url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip"; - sha256 = "16sm02wbkj328ni0z1z4n4msi12lb8ijxzmbbfamvg766mycj8z3"; - }; - "1.24.3-i686-linux" = fetchurl { - url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${i686}-release.zip"; - sha256 = "0a559mfpb0zfd49zdcpld95h2g1lmcjwwsqf69hd9rw6j67qyyyn"; - }; - "1.24.3-aarch64-linux" = fetchurl { - url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip"; - sha256 = "1p5bn04gr91chcszgmw5ng8mlzgwsrdr2v7k7ppwr1slkx97fsrh"; - }; - "2.7.2-x86_64-darwin" = fetchurl { - url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-macos-${x86_64}-release.zip"; - sha256 = "111zl075qdk2zd4d4mmfkn30jmzsri9nq3nspnmc2l245gdq34jj"; - }; - "2.7.2-x86_64-linux" = fetchurl { - url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip"; - sha256 = "0vvsgda1smqdjn35yiq9pxx8f5haxb4hqnspcsfs6sn5c36k854v"; - }; - "2.7.2-i686-linux" = fetchurl { - url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${i686}-release.zip"; - sha256 = "0dj01d2wwrp3cc5x73vs6fzhs6db60gkbjlrw3w9j04wcx69i38m"; - }; - "2.7.2-aarch64-linux" = fetchurl { - url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip"; - sha256 = "1p66fkdh1kv0ypmadmg67c3y3li3aaf1lahqh2g6r6qrzbh5da2p"; - }; - "2.10.0-x86_64-darwin" = fetchurl { - url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-macos-${x86_64}-release.zip"; - sha256 = "1n4qgsax5wi7krgvvs0dy7fz39nlykiw8gr0gdacc85hgyhqg09j"; - }; - "2.10.0-x86_64-linux" = fetchurl { - url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip"; - sha256 = "0dncmsfbwcn3ygflhp83i6z4bvc02fbpaq1vzdzw8xdk3sbynchb"; - }; - "2.9.0-4.0.dev-x86_64-darwin" = fetchurl { - url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-macos-${x86_64}-release.zip"; - sha256 = "0gj91pbvqrxsvxaj742cllqha2z65867gggzq9hq5139vkkpfj9s"; - }; - "2.9.0-4.0.dev-x86_64-linux" = fetchurl { - url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip"; - sha256 = "16d9842fb3qbc0hy0zmimav9zndfkq96glgykj20xssc88qpjk2r"; - }; - "2.9.0-4.0.dev-i686-linux" = fetchurl { - url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-linux-${i686}-release.zip"; - sha256 = "105wgyxmi491c7qw0z3zhn4lv52h80ngyz4ch9dyj0sq8nndz2rc"; - }; - "2.9.0-4.0.dev-aarch64-linux" = fetchurl { - url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip"; - sha256 = "1x6mlmc4hccmx42k7srhma18faxpxvghjwqahna80508rdpljwgc"; - }; - "2.11.0-161.0.dev-x86_64-darwin" = fetchurl { - url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-macos-${x86_64}-release.zip"; - sha256 = "0mlwxp7jkkjafxkc4vqlgwl62y0hk1arhfrvc9hpm9dv98g3bdjj"; - }; - "2.11.0-161.0.dev-x86_64-linux" = fetchurl { - url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip"; - sha256 = "05difz4w2fyh2yq5p5pkrqk59jqljlxhc1i6lmy5kihh6z69r12i"; - }; - }; - -in - -with stdenv.lib; +assert version != null && version != ""; +assert sources != null && (builtins.isAttrs sources); stdenv.mkDerivation { - pname = "dart"; inherit version; @@ -100,13 +53,13 @@ stdenv.mkDerivation { find $out/bin -executable -type f -exec patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) {} \; ''; - libPath = makeLibraryPath [ stdenv.cc.cc ]; + libPath = lib.makeLibraryPath [ stdenv.cc.cc ]; dontStrip = true; - meta = { + meta = with lib; { homepage = "https://www.dartlang.org/"; - maintainers = with maintainers; [ grburst ]; + maintainers = with maintainers; [ grburst thiagokokada ]; description = "Scalable programming language, with robust libraries and runtimes, for building web, server, and mobile apps"; longDescription = '' Dart is a class-based, single inheritance, object-oriented language diff --git a/pkgs/development/interpreters/dhall/build-dhall-github-package.nix b/pkgs/development/interpreters/dhall/build-dhall-github-package.nix index 0978e47754b..53adc5a9b12 100644 --- a/pkgs/development/interpreters/dhall/build-dhall-github-package.nix +++ b/pkgs/development/interpreters/dhall/build-dhall-github-package.nix @@ -25,8 +25,10 @@ lib.makePackageOverridable }@args: let + versionedName = "${name}-${rev}"; + src = fetchFromGitHub ({ - name = "${name}-source"; + name = "${versionedName}-source"; inherit owner repo rev; } // removeAttrs args [ @@ -45,7 +47,9 @@ lib.makePackageOverridable in buildDhallPackage - ( { inherit name dependencies source; + ( { inherit dependencies source; + + name = versionedName; code = "${src}/${prefix}${file}"; } diff --git a/pkgs/development/interpreters/dhall/build-dhall-package.nix b/pkgs/development/interpreters/dhall/build-dhall-package.nix index 039c50f0693..9fc9a441215 100644 --- a/pkgs/development/interpreters/dhall/build-dhall-package.nix +++ b/pkgs/development/interpreters/dhall/build-dhall-package.nix @@ -85,6 +85,6 @@ in ${lib.optionalString (documentationRoot != null) '' mkdir -p $out/${dataDhall} - XDG_DATA_HOME=$out/${data} ${dhall-docs}/bin/dhall-docs --input '${documentationRoot}' --output-link $out/docs + XDG_DATA_HOME=$out/${data} ${dhall-docs}/bin/dhall-docs --input '${documentationRoot}' --package-name '${name}' --output-link $out/docs ''} '' diff --git a/pkgs/development/interpreters/duktape/default.nix b/pkgs/development/interpreters/duktape/default.nix index 8dbfee20641..f864f5bf6f9 100644 --- a/pkgs/development/interpreters/duktape/default.nix +++ b/pkgs/development/interpreters/duktape/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "duktape"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "An embeddable Javascript engine, with a focus on portability and compact footprint"; homepage = "https://duktape.org/"; downloadPage = "https://duktape.org/download.html"; diff --git a/pkgs/development/interpreters/eff/default.nix b/pkgs/development/interpreters/eff/default.nix index cfd3bbbda4c..8dba500c15b 100644 --- a/pkgs/development/interpreters/eff/default.nix +++ b/pkgs/development/interpreters/eff/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, which, ocamlPackages }: +{ lib, stdenv, fetchFromGitHub, which, ocamlPackages }: let version = "5.0"; in @@ -25,7 +25,7 @@ stdenv.mkDerivation { doCheck = true; checkTarget = "test"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.eff-lang.org"; description = "A functional programming language based on algebraic effects and their handlers"; longDescription = '' diff --git a/pkgs/development/interpreters/elixir/1.11.nix b/pkgs/development/interpreters/elixir/1.11.nix index 8f9d869abf3..4e50c737e39 100644 --- a/pkgs/development/interpreters/elixir/1.11.nix +++ b/pkgs/development/interpreters/elixir/1.11.nix @@ -3,7 +3,7 @@ # How to obtain `sha256`: # nix-prefetch-url --unpack https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz mkDerivation { - version = "1.11.2"; - sha256 = "0b4nfgxhmi4gwba9h9k103zrkpbxxvk0gmdl0ggrd5xlg6v288ky"; + version = "1.11.3"; + sha256 = "sha256-DqmKpMLxrXn23fsX/hrjDsYCmhD5jbVtvOX8EwKBakc="; minimumOTPVersion = "21"; } diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix index 8dddd5befd4..358fff039c6 100644 --- a/pkgs/development/interpreters/elixir/generic-builder.nix +++ b/pkgs/development/interpreters/elixir/generic-builder.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, fetchFromGitHub, erlang, makeWrapper, +{ pkgs, lib, stdenv, fetchFromGitHub, erlang, makeWrapper, coreutils, curl, bash, debugInfo ? false }: { baseName ? "elixir" @@ -10,7 +10,7 @@ } @ args: let - inherit (stdenv.lib) getVersion versionAtLeast optional; + inherit (lib) getVersion versionAtLeast optional; in assert versionAtLeast (getVersion erlang) minimumOTPVersion; @@ -46,7 +46,7 @@ in b=$(basename $f) if [ "$b" = mix ]; then continue; fi wrapProgram $f \ - --prefix PATH ":" "${stdenv.lib.makeBinPath [ erlang coreutils curl bash ]}" \ + --prefix PATH ":" "${lib.makeBinPath [ erlang coreutils curl bash ]}" \ --set CURL_CA_BUNDLE /etc/ssl/certs/ca-certificates.crt done @@ -55,7 +55,7 @@ in ''; pos = builtins.unsafeGetAttrPos "sha256" args; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://elixir-lang.org/"; description = "A functional, meta-programming aware language built on top of the Erlang VM"; diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index 91ea2fe57ab..4429dc1eaf3 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, fetchFromGitHub, makeWrapper, gawk, gnum4, gnused +{ pkgs, lib, stdenv, fetchFromGitHub, makeWrapper, gawk, gnum4, gnused , libxml2, libxslt, ncurses, openssl, perl, autoconf # TODO: use jdk https://github.com/NixOS/nixpkgs/pull/89731 , openjdk8 ? null # javacSupport @@ -41,7 +41,7 @@ assert odbcSupport -> unixODBC != null; assert javacSupport -> openjdk8 != null; let - inherit (stdenv.lib) optional optionals optionalAttrs optionalString; + inherit (lib) optional optionals optionalAttrs optionalString; wxPackages2 = if stdenv.isDarwin then [ wxmac ] else wxPackages; in stdenv.mkDerivation ({ @@ -106,12 +106,12 @@ in stdenv.mkDerivation ({ # Some erlang bin/ scripts run sed and awk postFixup = '' wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/" - wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnused gawk ]}" + wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${lib.makeBinPath [ gnused gawk ]}" ''; setupHook = ./setup-hook.sh; - meta = with stdenv.lib; ({ + meta = with lib; ({ homepage = "https://www.erlang.org/"; downloadPage = "https://www.erlang.org/download.html"; description = "Programming language used for massively scalable soft real-time systems"; diff --git a/pkgs/development/interpreters/evcxr/default.nix b/pkgs/development/interpreters/evcxr/default.nix index 59abf36f7ac..fa428b98335 100644 --- a/pkgs/development/interpreters/evcxr/default.nix +++ b/pkgs/development/interpreters/evcxr/default.nix @@ -1,4 +1,4 @@ -{ cargo, fetchFromGitHub, makeWrapper, pkgconfig, rustPlatform, stdenv, gcc, Security, cmake }: +{ cargo, fetchFromGitHub, makeWrapper, pkg-config, rustPlatform, lib, stdenv, gcc, Security, cmake }: rustPlatform.buildRustPackage rec { pname = "evcxr"; @@ -15,12 +15,12 @@ rustPlatform.buildRustPackage rec { RUST_SRC_PATH = "${rustPlatform.rustLibSrc}"; - nativeBuildInputs = [ pkgconfig makeWrapper cmake ]; - buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + nativeBuildInputs = [ pkg-config makeWrapper cmake ]; + buildInputs = lib.optional stdenv.isDarwin Security; postInstall = let wrap = exe: '' wrapProgram $out/bin/${exe} \ - --prefix PATH : ${stdenv.lib.makeBinPath [ cargo gcc ]} \ + --prefix PATH : ${lib.makeBinPath [ cargo gcc ]} \ --set-default RUST_SRC_PATH "$RUST_SRC_PATH" ''; in '' @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { rm $out/bin/testing_runtime ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An evaluation context for Rust"; homepage = "https://github.com/google/evcxr"; license = licenses.asl20; diff --git a/pkgs/development/interpreters/falcon/default.nix b/pkgs/development/interpreters/falcon/default.nix index 39d4918a70b..ecac643f1ea 100644 --- a/pkgs/development/interpreters/falcon/default.nix +++ b/pkgs/development/interpreters/falcon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, zlib, sqlite }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, pcre, zlib, sqlite }: stdenv.mkDerivation { pname = "falcon"; @@ -11,10 +11,10 @@ stdenv.mkDerivation { sha256 = "1x3gdcz1gqhi060ngqi0ghryf69v8bn50yrbzfad8bhblvhzzdlf"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake pcre zlib sqlite ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ pcre zlib sqlite ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Programming language with macros and syntax at once"; license = licenses.gpl2; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/development/interpreters/gauche/default.nix b/pkgs/development/interpreters/gauche/default.nix index 75a931c5562..86dc7d666d2 100644 --- a/pkgs/development/interpreters/gauche/default.nix +++ b/pkgs/development/interpreters/gauche/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, autoreconfHook, gaucheBootstrap, pkg-config, texinfo -, libiconv, gdbm, openssl, zlib, mbedtls, cacert }: +, libiconv, gdbm, openssl, zlib, mbedtls, cacert }: stdenv.mkDerivation rec { pname = "gauche"; @@ -45,5 +45,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ mnacamura ]; license = licenses.bsd3; platforms = platforms.unix; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/interpreters/gnu-apl/default.nix b/pkgs/development/interpreters/gnu-apl/default.nix index f01cfc2444b..9ae373ff7a8 100644 --- a/pkgs/development/interpreters/gnu-apl/default.nix +++ b/pkgs/development/interpreters/gnu-apl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, readline, gettext, ncurses }: +{ lib, stdenv, fetchurl, readline, gettext, ncurses }: stdenv.mkDerivation rec { pname = "gnu-apl"; @@ -12,14 +12,14 @@ stdenv.mkDerivation rec { buildInputs = [ readline gettext ncurses ]; # Needed with GCC 8 - NIX_CFLAGS_COMPILE = with stdenv.lib; toString ((optionals stdenv.cc.isGNU [ + NIX_CFLAGS_COMPILE = with lib; toString ((optionals stdenv.cc.isGNU [ "-Wno-error=int-in-bool-context" "-Wno-error=class-memaccess" "-Wno-error=restrict" "-Wno-error=format-truncation" ]) ++ optional stdenv.cc.isClang "-Wno-error=null-dereference"); - patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' + patchPhase = lib.optionalString stdenv.isDarwin '' substituteInPlace src/LApack.cc --replace "malloc.h" "malloc/malloc.h" ''; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { find $out/share/doc/support-files -name 'Makefile*' -delete ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Free interpreter for the APL programming language"; homepage = "https://www.gnu.org/software/apl/"; license = licenses.gpl3Plus; diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix index dd9cac84ddd..0e3a0a46afd 100644 --- a/pkgs/development/interpreters/groovy/default.nix +++ b/pkgs/development/interpreters/groovy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, which, makeWrapper, jdk }: +{ lib, stdenv, fetchurl, unzip, which, makeWrapper, jdk }: # at runtime, need jdk @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An agile dynamic language for the Java Platform"; homepage = "http://groovy-lang.org/"; license = licenses.asl20; diff --git a/pkgs/development/interpreters/gtk-server/default.nix b/pkgs/development/interpreters/gtk-server/default.nix index 4a8330f2749..3841785e8ac 100644 --- a/pkgs/development/interpreters/gtk-server/default.nix +++ b/pkgs/development/interpreters/gtk-server/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , glib , gtk3 , libffcall -, pkgconfig +, pkg-config , wrapGAppsHook }: @@ -19,12 +19,12 @@ stdenv.mkDerivation rec { cd src ''; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; buildInputs = [ libffcall glib gtk3 ]; configureOptions = [ "--with-gtk3" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "gtk-server for interpreted GUI programming"; homepage = "http://www.gtk-server.org/"; license = licenses.gpl2Plus; diff --git a/pkgs/development/interpreters/guile/1.8.nix b/pkgs/development/interpreters/guile/1.8.nix index 6057480476f..93eca9a73f1 100644 --- a/pkgs/development/interpreters/guile/1.8.nix +++ b/pkgs/development/interpreters/guile/1.8.nix @@ -1,5 +1,5 @@ -{ stdenv, pkgsBuildBuild, buildPackages -, fetchurl, makeWrapper, gawk, pkgconfig +{ lib, stdenv, pkgsBuildBuild, buildPackages +, fetchurl, makeWrapper, gawk, pkg-config , libtool, readline, gmp }: @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-error-on-warning" ] # Guile needs patching to preset results for the configure tests about # pthreads, which work only in native builds. - ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) + ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--with-threads=no"; depsBuildBuild = [ buildPackages.stdenv.cc ] - ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) + ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) pkgsBuildBuild.guile_1_8; - nativeBuildInputs = [ makeWrapper gawk pkgconfig ]; + nativeBuildInputs = [ makeWrapper gawk pkg-config ]; buildInputs = [ readline libtool ]; propagatedBuildInputs = [ @@ -67,9 +67,9 @@ stdenv.mkDerivation rec { meta = { description = "Embeddable Scheme implementation"; homepage = "https://www.gnu.org/software/guile/"; - license = stdenv.lib.licenses.lgpl2Plus; - maintainers = [ stdenv.lib.maintainers.ludo ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.lgpl2Plus; + maintainers = [ lib.maintainers.ludo ]; + platforms = lib.platforms.unix; longDescription = '' GNU Guile is an interpreter for the Scheme programming language, diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix index 5b26b38dbd4..b93ec556cd4 100644 --- a/pkgs/development/interpreters/guile/2.0.nix +++ b/pkgs/development/interpreters/guile/2.0.nix @@ -1,5 +1,5 @@ -{ stdenv, pkgsBuildBuild, buildPackages -, fetchpatch, fetchurl, makeWrapper, gawk, pkgconfig +{ lib, stdenv, pkgsBuildBuild, buildPackages +, fetchpatch, fetchurl, makeWrapper, gawk, pkg-config , libffi, libtool, readline, gmp, boehmgc, libunistring , coverageAnalysis ? null }: @@ -21,9 +21,9 @@ setOutputFlags = false; # $dev gets into the library otherwise depsBuildBuild = [ buildPackages.stdenv.cc ] - ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) + ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) pkgsBuildBuild.guile_2_0; - nativeBuildInputs = [ makeWrapper gawk pkgconfig ]; + nativeBuildInputs = [ makeWrapper gawk pkg-config ]; buildInputs = [ readline libtool libunistring libffi ]; propagatedBuildInputs = [ @@ -46,8 +46,8 @@ }) ./riscv.patch ] ++ - (stdenv.lib.optional (coverageAnalysis != null) ./gcov-file-name.patch) - ++ stdenv.lib.optionals stdenv.isDarwin [ + (lib.optional (coverageAnalysis != null) ./gcov-file-name.patch) + ++ lib.optionals stdenv.isDarwin [ (fetchpatch { url = "https://gitlab.gnome.org/GNOME/gtk-osx/raw/52898977f165777ad9ef169f7d4818f2d4c9b731/patches/guile-clocktime.patch"; sha256 = "12wvwdna9j8795x59ldryv9d84c1j3qdk2iskw09306idfsis207"; @@ -59,10 +59,10 @@ # "libgcc_s.so.1 must be installed for pthread_cancel to work". # don't have "libgcc_s.so.1" on darwin - LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin && !stdenv.hostPlatform.isMusl) "-lgcc_s"; + LDFLAGS = lib.optionalString (!stdenv.isDarwin && !stdenv.hostPlatform.isMusl) "-lgcc_s"; configureFlags = [ "--with-libreadline-prefix" ] - ++ stdenv.lib.optionals stdenv.isSunOS [ + ++ lib.optionals stdenv.isSunOS [ # Make sure the right <gmp.h> is found, and not the incompatible # /usr/include/mp.h from OpenSolaris. See # <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html> @@ -102,9 +102,9 @@ meta = { description = "Embeddable Scheme implementation"; homepage = "https://www.gnu.org/software/guile/"; - license = stdenv.lib.licenses.lgpl3Plus; - maintainers = with stdenv.lib.maintainers; [ ludo lovek323 ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.lgpl3Plus; + maintainers = with lib.maintainers; [ ludo lovek323 ]; + platforms = lib.platforms.all; longDescription = '' GNU Guile is an implementation of the Scheme programming language, with @@ -120,7 +120,7 @@ // -(stdenv.lib.optionalAttrs (!stdenv.isLinux) { +(lib.optionalAttrs (!stdenv.isLinux) { # Work around <https://bugs.gnu.org/14201>. SHELL = stdenv.shell; CONFIG_SHELL = stdenv.shell; diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index 52a3488d051..ed685682db6 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -1,5 +1,5 @@ -{ stdenv, pkgsBuildBuild, buildPackages -, fetchurl, makeWrapper, gawk, pkgconfig +{ lib, stdenv, pkgsBuildBuild, buildPackages +, fetchurl, makeWrapper, gawk, pkg-config , libffi, libtool, readline, gmp, boehmgc, libunistring , coverageAnalysis ? null , fetchpatch @@ -23,9 +23,9 @@ setOutputFlags = false; # $dev gets into the library otherwise depsBuildBuild = [ buildPackages.stdenv.cc ] - ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) + ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) pkgsBuildBuild.guile; - nativeBuildInputs = [ makeWrapper gawk pkgconfig ]; + nativeBuildInputs = [ makeWrapper gawk pkg-config ]; buildInputs = [ readline libtool libunistring libffi ]; propagatedBuildInputs = [ @@ -48,8 +48,8 @@ patches = [ ./eai_system.patch - ] ++ stdenv.lib.optional (coverageAnalysis != null) ./gcov-file-name.patch - ++ stdenv.lib.optional stdenv.isDarwin (fetchpatch { + ] ++ lib.optional (coverageAnalysis != null) ./gcov-file-name.patch + ++ lib.optional stdenv.isDarwin (fetchpatch { url = "https://gitlab.gnome.org/GNOME/gtk-osx/raw/52898977f165777ad9ef169f7d4818f2d4c9b731/patches/guile-clocktime.patch"; sha256 = "12wvwdna9j8795x59ldryv9d84c1j3qdk2iskw09306idfsis207"; }); @@ -58,10 +58,11 @@ # "libgcc_s.so.1 must be installed for pthread_cancel to work". # don't have "libgcc_s.so.1" on darwin - LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; + LDFLAGS = lib.optionalString + (!stdenv.isDarwin && !stdenv.hostPlatform.isStatic) "-lgcc_s"; configureFlags = [ "--with-libreadline-prefix=${readline.dev}" ] - ++ stdenv.lib.optionals stdenv.isSunOS [ + ++ lib.optionals stdenv.isSunOS [ # Make sure the right <gmp.h> is found, and not the incompatible # /usr/include/mp.h from OpenSolaris. See # <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html> @@ -100,9 +101,9 @@ meta = { description = "Embeddable Scheme implementation"; homepage = "https://www.gnu.org/software/guile/"; - license = stdenv.lib.licenses.lgpl3Plus; - maintainers = with stdenv.lib.maintainers; [ ludo lovek323 vrthra ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.lgpl3Plus; + maintainers = with lib.maintainers; [ ludo lovek323 vrthra ]; + platforms = lib.platforms.all; longDescription = '' GNU Guile is an implementation of the Scheme programming language, with diff --git a/pkgs/development/interpreters/hugs/default.nix b/pkgs/development/interpreters/hugs/default.nix index 35463b16157..6af489473c9 100644 --- a/pkgs/development/interpreters/hugs/default.nix +++ b/pkgs/development/interpreters/hugs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bison }: +{ lib, stdenv, fetchurl, bison }: stdenv.mkDerivation { @@ -39,7 +39,7 @@ stdenv.mkDerivation { "--enable-pthreads" # build Hugs using POSIX threads C library ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.haskell.org/hugs"; description = "Haskell interpreter"; maintainers = with maintainers; [ joachifm ]; diff --git a/pkgs/development/interpreters/hy/default.nix b/pkgs/development/interpreters/hy/default.nix index a8890b048fb..e39bf915cfc 100644 --- a/pkgs/development/interpreters/hy/default.nix +++ b/pkgs/development/interpreters/hy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages }: +{ lib, python3Packages }: python3Packages.buildPythonApplication rec { pname = "hy"; @@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec { $out/bin/hy --help > /dev/null ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A LISP dialect embedded in Python"; homepage = "http://hylang.org/"; license = licenses.mit; diff --git a/pkgs/development/interpreters/icon-lang/default.nix b/pkgs/development/interpreters/icon-lang/default.nix index 02992e71871..5481f7825c9 100644 --- a/pkgs/development/interpreters/icon-lang/default.nix +++ b/pkgs/development/interpreters/icon-lang/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , libX11 , libXt @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "1lj2f13pbaajcy4v3744bz46rghhw5sv4dwwfnzhsllbj5gnjsv2"; }; - buildInputs = stdenv.lib.optionals withGraphics [ libX11 libXt ]; + buildInputs = lib.optionals withGraphics [ libX11 libXt ]; configurePhase = let @@ -37,8 +37,8 @@ stdenv.mkDerivation rec { mv $out/doc $out/share/doc/icon ''; - meta = with stdenv.lib; { - description = ''A very high level general-purpose programming language''; + meta = with lib; { + description = "A very high level general-purpose programming language"; maintainers = with maintainers; [ vrthra yurrriq ]; platforms = with platforms; linux ++ darwin ++ freebsd ++ netbsd ++ openbsd ++ cygwin ++ illumos; license = licenses.publicDomain; diff --git a/pkgs/development/interpreters/io/default.nix b/pkgs/development/interpreters/io/default.nix index 42af3cc427b..d0a3b20e503 100644 --- a/pkgs/development/interpreters/io/default.nix +++ b/pkgs/development/interpreters/io/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, cmake, zlib, sqlite, gmp, libffi, cairo, +{ lib, stdenv, fetchFromGitHub, cmake, zlib, sqlite, gmp, libffi, cairo, ncurses, freetype, libGLU, libGL, libpng, libtiff, libjpeg, readline, libsndfile, libxml2, freeglut, libsamplerate, pcre, libevent, libedit, yajl, - python3, openssl, glfw, pkgconfig, libpthreadstubs, libXdmcp, libmemcached + python3, openssl, glfw, pkg-config, libpthreadstubs, libXdmcp, libmemcached }: stdenv.mkDerivation { @@ -21,7 +21,7 @@ stdenv.mkDerivation { zlib sqlite gmp libffi cairo ncurses freetype libGLU libGL libpng libtiff libjpeg readline libsndfile libxml2 freeglut libsamplerate pcre libevent libedit yajl - pkgconfig glfw openssl libpthreadstubs libXdmcp + pkg-config glfw openssl libpthreadstubs libXdmcp libmemcached python3 ]; @@ -37,7 +37,7 @@ stdenv.mkDerivation { # for gcc5; c11 inline semantics breaks the build NIX_CFLAGS_COMPILE = "-fgnu89-inline"; - meta = with stdenv.lib; { + meta = with lib; { description = "Io programming language"; homepage = "http://iolanguage.org/"; license = licenses.bsd3; diff --git a/pkgs/development/interpreters/j/default.nix b/pkgs/development/interpreters/j/default.nix index b7f8b63d54a..ab64505e091 100644 --- a/pkgs/development/interpreters/j/default.nix +++ b/pkgs/development/interpreters/j/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, readline, libedit, bc +{ lib, stdenv, fetchFromGitHub, readline, libedit, bc , avxSupport ? stdenv.hostPlatform.avxSupport }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { doCheck = true; # Causes build failure due to warning - hardeningDisable = stdenv.lib.optional stdenv.cc.isClang "strictoverflow"; + hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow"; buildPhase = '' export SOURCE_DIR=$(pwd) @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { cp -r $JLIB/bin "$out" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "J programming language, an ASCII-based APL successor"; maintainers = with maintainers; [ raskin synthetica ]; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/development/interpreters/janet/default.nix b/pkgs/development/interpreters/janet/default.nix index 113a582392f..8db532b4211 100644 --- a/pkgs/development/interpreters/janet/default.nix +++ b/pkgs/development/interpreters/janet/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, meson, ninja }: +{ lib, stdenv, fetchFromGitHub, meson, ninja }: stdenv.mkDerivation rec { pname = "janet"; - version = "1.12.2"; + version = "1.14.2"; src = fetchFromGitHub { owner = "janet-lang"; repo = pname; rev = "v${version}"; - sha256 = "0if514zdmbjvvrsa9x5yfvg2b14sz53yaka12g3yhwkq8ls3qk0c"; + sha256 = "sha256-8sIF+jvhRoKNfvPs/WjMZmysAeEjOKaiqi7bY0Bbcxw="; }; nativeBuildInputs = [ meson ninja ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Janet programming language"; homepage = "https://janet-lang.org/"; license = licenses.mit; diff --git a/pkgs/development/interpreters/jimtcl/default.nix b/pkgs/development/interpreters/jimtcl/default.nix index d803fe43fd7..78b9e40b647 100644 --- a/pkgs/development/interpreters/jimtcl/default.nix +++ b/pkgs/development/interpreters/jimtcl/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, sqlite, readline, asciidoc, SDL, SDL_gfx }: +{ lib, stdenv, fetchFromGitHub, sqlite, readline, asciidoc, SDL, SDL_gfx }: let - makeSDLFlags = map (p: "-I${stdenv.lib.getDev p}/include/SDL"); + makeSDLFlags = map (p: "-I${lib.getDev p}/include/SDL"); in stdenv.mkDerivation rec { pname = "jimtcl"; @@ -52,8 +52,8 @@ in stdenv.mkDerivation rec { meta = { description = "An open source small-footprint implementation of the Tcl programming language"; homepage = "http://jim.tcl.tk/"; - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ dbohdan vrthra ]; + license = lib.licenses.bsd2; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ dbohdan vrthra ]; }; } diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix index 2eb01b37644..004d2732f3a 100644 --- a/pkgs/development/interpreters/joker/default.nix +++ b/pkgs/development/interpreters/joker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "joker"; @@ -21,7 +21,7 @@ buildGoModule rec { subPackages = [ "." ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/candid82/joker"; description = "A small Clojure interpreter and linter written in Go"; license = licenses.epl10; diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index 9159f026e1f..f792471c061 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl, makeWrapper, jre }: +{ lib, stdenv, callPackage, fetchurl, makeWrapper, jre }: let # The version number here is whatever is reported by the RUBY_VERSION string @@ -50,7 +50,7 @@ jruby = stdenv.mkDerivation rec { libPath = "lib/${rubyEngine}/${rubyVersion.libDir}"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Ruby interpreter written in Java"; homepage = "http://jruby.org/"; license = with licenses; [ cpl10 gpl2 lgpl21 ]; diff --git a/pkgs/development/interpreters/jython/default.nix b/pkgs/development/interpreters/jython/default.nix index 35af365c1f7..61cc8f9cd0f 100644 --- a/pkgs/development/interpreters/jython/default.nix +++ b/pkgs/development/interpreters/jython/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, jre }: +{ lib, stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { pname = "jython"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Python interpreter written in Java"; homepage = "https://jython.org/"; - license = stdenv.lib.licenses.psfl; + license = lib.licenses.psfl; platforms = jre.meta.platforms; }; } diff --git a/pkgs/development/interpreters/kona/default.nix b/pkgs/development/interpreters/kona/default.nix index 041616cc1f6..15ce9321a8d 100644 --- a/pkgs/development/interpreters/kona/default.nix +++ b/pkgs/development/interpreters/kona/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "kona"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; preInstall = ''mkdir -p "$out/bin"''; - meta = with stdenv.lib; { + meta = with lib; { description = "An interpreter of K, APL-like programming language"; homepage = "https://github.com/kevinlawler/kona/"; maintainers = with maintainers; [ raskin ]; diff --git a/pkgs/development/interpreters/lfe/generic-builder.nix b/pkgs/development/interpreters/lfe/generic-builder.nix index ba42c2d59d5..895054fac46 100644 --- a/pkgs/development/interpreters/lfe/generic-builder.nix +++ b/pkgs/development/interpreters/lfe/generic-builder.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, erlang, makeWrapper, coreutils, bash, buildRebar3, buildHex }: +{ lib, fetchFromGitHub, erlang, makeWrapper, coreutils, bash, buildRebar3, buildHex }: { baseName ? "lfe" , version @@ -10,7 +10,7 @@ }: let - inherit (stdenv.lib) + inherit (lib) assertMsg makeBinPath optionalString getVersion versionAtLeast versionOlder versions; @@ -75,7 +75,7 @@ buildRebar3 { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "The best of Erlang and of Lisp; at the same time!"; longDescription = '' LFE, Lisp Flavoured Erlang, is a lisp syntax front-end to the Erlang diff --git a/pkgs/development/interpreters/lolcode/default.nix b/pkgs/development/interpreters/lolcode/default.nix index bd4b93b835f..65653701b80 100644 --- a/pkgs/development/interpreters/lolcode/default.nix +++ b/pkgs/development/interpreters/lolcode/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, doxygen, cmake, readline }: +{ lib, stdenv, fetchurl, pkg-config, doxygen, cmake, readline }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "lolcode"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1li7ikcrs7wqah7gqkirg0k61n6pm12w7pydin966x1sdn9na46b"; }; - nativeBuildInputs = [ pkgconfig cmake doxygen ]; + nativeBuildInputs = [ pkg-config cmake doxygen ]; buildInputs = [ readline ]; # Maybe it clashes with lci scientific logic software package... @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl3; maintainers = [ maintainers.AndersonTorres ]; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/interpreters/love/0.10.nix b/pkgs/development/interpreters/love/0.10.nix index dbe3f6fa2df..ed002d99fbb 100644 --- a/pkgs/development/interpreters/love/0.10.nix +++ b/pkgs/development/interpreters/love/0.10.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromBitbucket, pkgconfig, SDL2, libGLU, libGL, openal, luajit, +{ lib, stdenv, fetchFromBitbucket, pkg-config, SDL2, libGLU, libGL, openal, luajit, libdevil, freetype, physfs, libmodplug, mpg123, libvorbis, libogg, libtheora, which, autoconf, automake, libtool }: @@ -17,7 +17,7 @@ stdenv.mkDerivation { sha256 = "19yfmlcx6w8yi4ndm5lni8lrsvnn77bxw5py0dc293nzzlaqa9ym"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ SDL2 libGLU libGL openal luajit libdevil freetype physfs libmodplug mpg123 libvorbis libogg libtheora autoconf which libtool automake @@ -34,8 +34,8 @@ stdenv.mkDerivation { meta = { homepage = "http://love2d.org"; description = "A Lua-based 2D game engine/scripting language"; - license = stdenv.lib.licenses.zlib; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.raskin ]; + license = lib.licenses.zlib; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.raskin ]; }; } diff --git a/pkgs/development/interpreters/love/0.7.nix b/pkgs/development/interpreters/love/0.7.nix index 6f09c076441..6cba19bff0f 100644 --- a/pkgs/development/interpreters/love/0.7.nix +++ b/pkgs/development/interpreters/love/0.7.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , SDL, libGLU, libGL, openal, lua , libdevil, freetype, physfs , libmodplug, mpg123, libvorbis, libogg @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { # see discussion on arch linux user repository (https://aur.archlinux.org/packages/love07/?setlang=cs#comment-684696) patches = [ ./0.7-gl-prototypes.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ SDL libGLU libGL openal lua libdevil freetype physfs libmodplug mpg123 libvorbis libogg libmng @@ -48,9 +48,9 @@ stdenv.mkDerivation rec { meta = { homepage = "http://love2d.org"; description = "A Lua-based 2D game engine/scripting language"; - license = stdenv.lib.licenses.zlib; + license = lib.licenses.zlib; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.raskin ]; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.raskin ]; }; } diff --git a/pkgs/development/interpreters/love/0.8.nix b/pkgs/development/interpreters/love/0.8.nix index 3a6c385ee5f..8bad501170d 100644 --- a/pkgs/development/interpreters/love/0.8.nix +++ b/pkgs/development/interpreters/love/0.8.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , SDL, libGLU, libGL, openal, lua , libdevil, freetype, physfs , libmodplug, mpg123, libvorbis, libogg @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1k4fcsa8zzi04ja179bmj24hvqcbm3icfvrvrzyz2gw9qwfclrwi"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ SDL libGLU libGL openal lua libdevil freetype physfs libmodplug mpg123 libvorbis libogg @@ -47,9 +47,9 @@ stdenv.mkDerivation rec { meta = { homepage = "http://love2d.org"; description = "A Lua-based 2D game engine/scripting language"; - license = stdenv.lib.licenses.zlib; + license = lib.licenses.zlib; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.raskin ]; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.raskin ]; }; } diff --git a/pkgs/development/interpreters/love/0.9.nix b/pkgs/development/interpreters/love/0.9.nix index 79b83f0643f..b7e20498a39 100644 --- a/pkgs/development/interpreters/love/0.9.nix +++ b/pkgs/development/interpreters/love/0.9.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , SDL2, libGLU, libGL, openal, luajit , libdevil, freetype, physfs , libmodplug, mpg123, libvorbis, libogg @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1pikd0bzb44r4bf0jbgn78whz1yswpq1n5jc8nf87v42pm30kp84"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ SDL2 libGLU libGL openal luajit libdevil freetype physfs libmodplug mpg123 libvorbis libogg @@ -26,10 +26,10 @@ stdenv.mkDerivation rec { meta = { homepage = "http://love2d.org"; description = "A Lua-based 2D game engine/scripting language"; - license = stdenv.lib.licenses.zlib; + license = lib.licenses.zlib; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.raskin ]; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.raskin ]; broken = true; }; } diff --git a/pkgs/development/interpreters/love/11.1.nix b/pkgs/development/interpreters/love/11.1.nix index 2ef3a4ca05a..bf76547a07a 100644 --- a/pkgs/development/interpreters/love/11.1.nix +++ b/pkgs/development/interpreters/love/11.1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromBitbucket, pkgconfig, SDL2, libGLU, libGL, openal, luajit, +{ lib, stdenv, fetchFromBitbucket, pkg-config, SDL2, libGLU, libGL, openal, luajit, libdevil, freetype, physfs, libmodplug, mpg123, libvorbis, libogg, libtheora, which, autoconf, automake, libtool }: @@ -17,7 +17,7 @@ stdenv.mkDerivation { sha256 = "18gfp65ngb8k8g7hgbw2bhrwk2i7m56m21d39pk4484q9z8p4vm7"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ SDL2 libGLU libGL openal luajit libdevil freetype physfs libmodplug mpg123 libvorbis libogg libtheora autoconf which libtool automake @@ -34,8 +34,8 @@ stdenv.mkDerivation { meta = { homepage = "http://love2d.org"; description = "A Lua-based 2D game engine/scripting language"; - license = stdenv.lib.licenses.zlib; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.raskin ]; + license = lib.licenses.zlib; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.raskin ]; }; } diff --git a/pkgs/development/interpreters/lua-5/build-lua-package.nix b/pkgs/development/interpreters/lua-5/build-lua-package.nix index 98a98c0dd34..74f5b2b7b39 100644 --- a/pkgs/development/interpreters/lua-5/build-lua-package.nix +++ b/pkgs/development/interpreters/lua-5/build-lua-package.nix @@ -207,7 +207,7 @@ builtins.removeAttrs attrs ["disabled" "checkInputs" "externalDeps" "extraVariab postFixup = lib.optionalString (!dontWrapLuaPrograms) '' wrapLuaPrograms - '' + attrs.postFixup or ''''; + '' + attrs.postFixup or ""; installPhase = attrs.installPhase or '' runHook preInstall diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix index d78d5ba0c2d..3a52d58ffab 100644 --- a/pkgs/development/interpreters/lua-5/default.nix +++ b/pkgs/development/interpreters/lua-5/default.nix @@ -40,7 +40,7 @@ in rec { sed -e 's/ALL_T *= */& $(LUA_SO)/' -i src/Makefile ''; - postBuild = stdenv.lib.optionalString (!stdenv.isDarwin) '' + postBuild = lib.optionalString (!stdenv.isDarwin) '' ( cd src; make $makeFlags "''${makeFlagsArray[@]}" liblua.so ) ''; }; diff --git a/pkgs/development/interpreters/lua-5/filesystem.nix b/pkgs/development/interpreters/lua-5/filesystem.nix index a3e633bbab1..d4e68b5cb76 100644 --- a/pkgs/development/interpreters/lua-5/filesystem.nix +++ b/pkgs/development/interpreters/lua-5/filesystem.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/keplerproject/luafilesystem"; - hydraPlatforms = stdenv.lib.platforms.linux; + hydraPlatforms = lib.platforms.linux; maintainers = [ ]; }; } diff --git a/pkgs/development/interpreters/lua-5/interpreter.nix b/pkgs/development/interpreters/lua-5/interpreter.nix index 98e4684e092..35a074add09 100644 --- a/pkgs/development/interpreters/lua-5/interpreter.nix +++ b/pkgs/development/interpreters/lua-5/interpreter.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, readline +{ lib, stdenv, fetchurl, readline , compat ? false , callPackage , packageOverrides ? (self: super: {}) @@ -50,7 +50,7 @@ self = stdenv.mkDerivation rec { runHook preConfigure makeFlagsArray+=(CFLAGS="-DLUA_USE_LINUX -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" ) - makeFlagsArray+=(${stdenv.lib.optionalString stdenv.isDarwin "CC=\"$CC\""}${stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) " 'AR=${stdenv.hostPlatform.config}-ar rcu'"}) + makeFlagsArray+=(${lib.optionalString stdenv.isDarwin "CC=\"$CC\""}${lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) " 'AR=${stdenv.hostPlatform.config}-ar rcu'"}) installFlagsArray=( TO_BIN="lua luac" INSTALL_DATA='cp -d' \ TO_LIB="${if stdenv.isDarwin then "liblua.${version}.dylib" else "liblua.a liblua.so liblua.so.${luaversion} liblua.so.${version}"}" ) @@ -83,7 +83,9 @@ self = stdenv.mkDerivation rec { Libs: -L$out/lib -llua -lm Cflags: -I$out/include EOF + ln -s "$out/lib/pkgconfig/lua.pc" "$out/lib/pkgconfig/lua-${luaversion}.pc" ln -s "$out/lib/pkgconfig/lua.pc" "$out/lib/pkgconfig/lua${luaversion}.pc" + ln -s "$out/lib/pkgconfig/lua.pc" "$out/lib/pkgconfig/lua${lib.replaceStrings [ "." ] [ "" ] luaversion}.pc" ''; passthru = rec { @@ -107,8 +109,8 @@ self = stdenv.mkDerivation rec { management with incremental garbage collection, making it ideal for configuration, scripting, and rapid prototyping. ''; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.mit; + platforms = lib.platforms.unix; }; }; in self diff --git a/pkgs/development/interpreters/lua-5/sockets.nix b/pkgs/development/interpreters/lua-5/sockets.nix index 73fbbc3e66a..d16f068883a 100644 --- a/pkgs/development/interpreters/lua-5/sockets.nix +++ b/pkgs/development/interpreters/lua-5/sockets.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://w3.impa.br/~diego/software/luasocket/"; - hydraPlatforms = stdenv.lib.platforms.linux; + hydraPlatforms = lib.platforms.linux; maintainers = [ ]; }; } diff --git a/pkgs/development/interpreters/lua-5/wrapper.nix b/pkgs/development/interpreters/lua-5/wrapper.nix index 53ec2baeb5e..0459b67534d 100644 --- a/pkgs/development/interpreters/lua-5/wrapper.nix +++ b/pkgs/development/interpreters/lua-5/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, lua, buildEnv, makeWrapper +{ lib, stdenv, lua, buildEnv, makeWrapper , extraLibs ? [] , extraOutputsToInstall ? [] , postBuild ? "" @@ -28,7 +28,7 @@ let addToLuaPath "$out" # take every binary from lua packages and put them into the env - for path in ${stdenv.lib.concatStringsSep " " paths}; do + for path in ${lib.concatStringsSep " " paths}; do nix_debug "looking for binaries in path = $path" if [ -d "$path/bin" ]; then cd "$path/bin" @@ -37,7 +37,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 ';' "$LUA_PATH" --suffix LUA_CPATH ';' "$LUA_CPATH" ${stdenv.lib.concatStringsSep " " makeWrapperArgs} + makeWrapper "$path/bin/$prg" "$out/bin/$prg" --suffix LUA_PATH ';' "$LUA_PATH" --suffix LUA_CPATH ';' "$LUA_CPATH" ${lib.concatStringsSep " " makeWrapperArgs} fi fi done diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index e0e15ca3275..860642b0fd2 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildPackages +{ lib, stdenv, fetchFromGitHub, buildPackages , name ? "luajit-${version}" , isStable , sha256 @@ -26,7 +26,7 @@ assert enableValgrindSupport -> valgrind != null; let luaPackages = callPackage ../../lua-modules {lua=self; overrides=packageOverrides;}; - XCFLAGS = with stdenv.lib; + XCFLAGS = with lib; optional (!enableFFI) "-DLUAJIT_DISABLE_FFI" ++ optional (!enableJIT) "-DLUAJIT_DISABLE_JIT" ++ optional enable52Compat "-DLUAJIT_ENABLE_LUA52COMPAT" @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { configurePhase = false; - buildInputs = stdenv.lib.optional enableValgrindSupport valgrind; + buildInputs = lib.optional enableValgrindSupport valgrind; buildFlags = [ "amalg" # Build highly optimized version @@ -70,14 +70,14 @@ stdenv.mkDerivation rec { "CROSS=${stdenv.cc.targetPrefix}" # TODO: when pointer size differs, we would need e.g. -m32 "HOST_CC=${buildPackages.stdenv.cc}/bin/cc" - ] ++ stdenv.lib.optional enableJITDebugModule "INSTALL_LJLIBD=$(INSTALL_LMOD)"; + ] ++ lib.optional enableJITDebugModule "INSTALL_LJLIBD=$(INSTALL_LMOD)"; enableParallelBuilding = true; NIX_CFLAGS_COMPILE = XCFLAGS; postInstall = '' ( cd "$out/include"; ln -s luajit-*/* . ) ln -s "$out"/bin/luajit-* "$out"/bin/lua - '' + stdenv.lib.optionalString (!isStable) '' + '' + lib.optionalString (!isStable) '' ln -s "$out"/bin/luajit-* "$out"/bin/luajit ''; @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { interpreter = "${self}/bin/lua"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "High-performance JIT compiler for Lua 5.1"; homepage = "http://luajit.org"; license = licenses.mit; diff --git a/pkgs/development/interpreters/lush/default.nix b/pkgs/development/interpreters/lush/default.nix index a8db08e87a2..fe51d154956 100644 --- a/pkgs/development/interpreters/lush/default.nix +++ b/pkgs/development/interpreters/lush/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libX11, xorgproto, indent, readline, gsl, freeglut, libGLU, libGL, SDL +{lib, stdenv, fetchurl, libX11, xorgproto, indent, readline, gsl, freeglut, libGLU, libGL, SDL , blas, libbfd, intltool, gettext, zlib, libSM}: stdenv.mkDerivation rec { @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { meta = { description = "Lisp Universal SHell"; - license = stdenv.lib.licenses.gpl2Plus ; - maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus ; + maintainers = [ lib.maintainers.raskin ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix index e4e984fc4ac..6dcb697d763 100644 --- a/pkgs/development/interpreters/maude/default.nix +++ b/pkgs/development/interpreters/maude/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, unzip, makeWrapper, flex, bison, ncurses, buddy, tecla +{ lib, stdenv, fetchurl, unzip, makeWrapper, flex, bison, ncurses, buddy, tecla , libsigsegv, gmpxx, cln, yices }: let - version = "3.0"; + version = "3.1"; fullMaude = fetchurl { - url = "http://maude.cs.illinois.edu/w/images/0/04/Full-Maude-${version}.zip"; - sha256 = "0gf36wlkkl343vlxgryqdhxmgyn8z0cc2zayccd7ac3inmj1iayw"; + url = "http://maude.cs.illinois.edu/w/images/0/0a/Full-Maude-${version}.zip"; + sha256 = "8b13af02c6243116c2ef9592622ecaa06d05dbe1dd6b1e595551ff33855948f2"; }; in @@ -18,8 +18,8 @@ stdenv.mkDerivation { inherit version; src = fetchurl { - url = "http://maude.cs.illinois.edu/w/images/9/92/Maude-${version}.tar.gz"; - sha256 = "0vhn3lsck6ji9skrgm67hqrn3k4f6y442q73jbw65qqznm321k5a"; + url = "http://maude.cs.illinois.edu/w/images/d/d3/Maude-${version}.tar.gz"; + sha256 = "b112d7843f65217e3b5a9d40461698ef8dab7cbbe830af21216dfb924dc88a2f"; }; buildInputs = [ @@ -27,7 +27,7 @@ stdenv.mkDerivation { ]; hardeningDisable = [ "stackprotector" ] ++ - stdenv.lib.optionals stdenv.isi686 [ "pic" "fortify" ]; + lib.optionals stdenv.isi686 [ "pic" "fortify" ]; preConfigure = '' configureFlagsArray=( @@ -43,7 +43,7 @@ stdenv.mkDerivation { postInstall = '' for n in "$out/bin/"*; do wrapProgram "$n" --suffix MAUDE_LIB ':' "$out/share/maude"; done unzip ${fullMaude} - install -D -m 444 full-maude3.maude $out/share/maude/full-maude.maude + install -D -m 444 full-maude31.maude $out/share/maude/full-maude.maude ''; # bison -dv surface.yy -o surface.c @@ -54,7 +54,7 @@ stdenv.mkDerivation { meta = { homepage = "http://maude.cs.illinois.edu/"; description = "High-level specification language"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; longDescription = '' Maude is a high-performance reflective language and system @@ -66,7 +66,7 @@ stdenv.mkDerivation { rewriting logic computation. ''; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.peti ]; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.peti ]; }; } diff --git a/pkgs/development/interpreters/metamath/default.nix b/pkgs/development/interpreters/metamath/default.nix index cccb7434797..a2b94667a6e 100644 --- a/pkgs/development/interpreters/metamath/default.nix +++ b/pkgs/development/interpreters/metamath/default.nix @@ -1,19 +1,21 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: -stdenv.mkDerivation { +let + version = "0.196"; +in stdenv.mkDerivation { pname = "metamath"; - version = "0.193"; + inherit version; buildInputs = [ autoreconfHook ]; src = fetchFromGitHub { owner = "metamath"; repo = "metamath-exe"; - rev = "f973c81222ebe36580a24f0fa7bbb600990af7d6"; - sha256 = "1s9hyknfvhj86g3giayyf3dxzg23iij0rs7bdvj075v9qbyhqn9b"; + rev = "v${version}"; + sha256 = "sha256-/ofH5fq7lUxbbRBAczsLNG3UPsOMbCdcxkB3el5OPcU="; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Interpreter for the metamath proof language"; longDescription = '' The metamath program is an ASCII-based ANSI C program with a command-line @@ -23,7 +25,7 @@ stdenv.mkDerivation { ''; homepage = "http://us.metamath.org"; downloadPage = "http://us.metamath.org/#downloads"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = [ maintainers.taneb ]; platforms = platforms.all; }; diff --git a/pkgs/development/interpreters/micropython/default.nix b/pkgs/development/interpreters/micropython/default.nix index 8d5a0252944..0441e48685e 100644 --- a/pkgs/development/interpreters/micropython/default.nix +++ b/pkgs/development/interpreters/micropython/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, libffi, python3, readline }: +{ stdenv, lib, fetchFromGitHub, pkg-config, libffi, python3, readline }: stdenv.mkDerivation rec { pname = "micropython"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ pkgconfig python3 ]; + nativeBuildInputs = [ pkg-config python3 ]; buildInputs = [ libffi readline ]; diff --git a/pkgs/development/interpreters/mujs/default.nix b/pkgs/development/interpreters/mujs/default.nix index 692aed3e4ee..5e600a92fb7 100644 --- a/pkgs/development/interpreters/mujs/default.nix +++ b/pkgs/development/interpreters/mujs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, readline }: +{ lib, stdenv, fetchurl, readline }: stdenv.mkDerivation rec { pname = "mujs"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://mujs.com/"; description = "A lightweight, embeddable Javascript interpreter"; platforms = platforms.unix; diff --git a/pkgs/development/interpreters/nix-exec/default.nix b/pkgs/development/interpreters/nix-exec/default.nix index 0c976f2f0b0..c2a3fa2c774 100644 --- a/pkgs/development/interpreters/nix-exec/default.nix +++ b/pkgs/development/interpreters/nix-exec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, nix, git }: let +{ lib, stdenv, fetchurl, pkg-config, nix, git }: let version = "4.1.6"; in stdenv.mkDerivation { pname = "nix-exec"; @@ -9,7 +9,7 @@ in stdenv.mkDerivation { sha256 = "0slpsnzzzdkf5d9za7j4kr15jr4mn1k9klfsxibzy47b2bx1vkar"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ nix git ]; NIX_CFLAGS_COMPILE = "-std=c++1y"; @@ -17,7 +17,7 @@ in stdenv.mkDerivation { meta = { description = "Run programs defined in nix expressions"; homepage = "https://github.com/shlevy/nix-exec"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; platforms = nix.meta.platforms; broken = true; }; diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 67fca52dad5..6ad25d24eae 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -1,4 +1,5 @@ { stdenv +, lib # Note: either stdenv.mkDerivation or, for octaveFull, the qt-5 mkDerivation # with wrapQtAppsHook (comes from libsForQt5.callPackage) , mkDerivation @@ -14,7 +15,7 @@ , libX11 , graphicsmagick , pcre -, pkgconfig +, pkg-config , libGL , libGLU , fltk @@ -124,37 +125,37 @@ in mkDerivation rec { libwebp gl2ps ] - ++ stdenv.lib.optionals enableQt [ + ++ lib.optionals enableQt [ qtbase qtsvg qscintilla ] - ++ stdenv.lib.optionals (ghostscript != null) [ ghostscript ] - ++ stdenv.lib.optionals (hdf5 != null) [ hdf5 ] - ++ stdenv.lib.optionals (glpk != null) [ glpk ] - ++ stdenv.lib.optionals (suitesparse != null) [ suitesparse' ] - ++ stdenv.lib.optionals (enableJava) [ jdk ] - ++ stdenv.lib.optionals (sundials != null) [ sundials ] - ++ stdenv.lib.optionals (gnuplot != null) [ gnuplot ] - ++ stdenv.lib.optionals (python != null) [ python ] - ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libGL libGLU libX11 ] - ++ stdenv.lib.optionals stdenv.isDarwin [ + ++ lib.optionals (ghostscript != null) [ ghostscript ] + ++ lib.optionals (hdf5 != null) [ hdf5 ] + ++ lib.optionals (glpk != null) [ glpk ] + ++ lib.optionals (suitesparse != null) [ suitesparse' ] + ++ lib.optionals (enableJava) [ jdk ] + ++ lib.optionals (sundials != null) [ sundials ] + ++ lib.optionals (gnuplot != null) [ gnuplot ] + ++ lib.optionals (python != null) [ python ] + ++ lib.optionals (!stdenv.isDarwin) [ libGL libGLU libX11 ] + ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Accelerate darwin.apple_sdk.frameworks.Cocoa ] ; nativeBuildInputs = [ - pkgconfig + pkg-config gfortran # Listed here as well because it's outputs are split fftw fftwSinglePrec texinfo ] - ++ stdenv.lib.optionals (sundials != null) [ sundials ] - ++ stdenv.lib.optionals enableJIT [ llvm ] - ++ stdenv.lib.optionals enableQt [ + ++ lib.optionals (sundials != null) [ sundials ] + ++ lib.optionals enableJIT [ llvm ] + ++ lib.optionals enableQt [ qtscript qttools ] @@ -172,11 +173,11 @@ in mkDerivation rec { "--with-lapack=lapack" (if use64BitIdx then "--enable-64" else "--disable-64") ] - ++ stdenv.lib.optionals stdenv.isDarwin [ "--enable-link-all-dependencies" ] - ++ stdenv.lib.optionals enableReadline [ "--enable-readline" ] - ++ stdenv.lib.optionals stdenv.isDarwin [ "--with-x=no" ] - ++ stdenv.lib.optionals enableQt [ "--with-qt=5" ] - ++ stdenv.lib.optionals enableJIT [ "--enable-jit" ] + ++ lib.optionals stdenv.isDarwin [ "--enable-link-all-dependencies" ] + ++ lib.optionals enableReadline [ "--enable-readline" ] + ++ lib.optionals stdenv.isDarwin [ "--with-x=no" ] + ++ lib.optionals enableQt [ "--with-qt=5" ] + ++ lib.optionals enableJIT [ "--enable-jit" ] ; # Keep a copy of the octave tests detailed results in the output @@ -198,13 +199,13 @@ in mkDerivation rec { meta = { homepage = "https://www.gnu.org/software/octave/"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ raskin doronbehar ]; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ raskin doronbehar ]; description = "Scientific Pragramming Language"; # https://savannah.gnu.org/bugs/?func=detailitem&item_id=56425 is the best attempt to fix JIT broken = enableJIT; platforms = if overridePlatforms == null then - (with stdenv.lib; platforms.linux ++ platforms.darwin) + (lib.platforms.linux ++ lib.platforms.darwin) else overridePlatforms; }; } diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 6b7d1d4d99c..75fe1bac8cb 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -39,12 +39,6 @@ let (if (versionOlder version "5.31.1") then ./no-sys-dirs-5.29.patch else ./no-sys-dirs-5.31.patch) ] - ++ optional (versionOlder version "5.29.6") - # Fix parallel building: https://rt.perl.org/Public/Bug/Display.html?id=132360 - (fetchurl { - url = "https://rt.perl.org/Public/Ticket/Attachment/1502646/807252/0001-Fix-missing-build-dependency-for-pods.patch"; - sha256 = "1bb4mldfp8kq1scv480wm64n2jdsqa3ar46cjp1mjpby8h5dr2r0"; - }) ++ optional stdenv.isSunOS ./ld-shared.patch ++ optionals stdenv.isDarwin [ ./cpp-precomp.patch ./sw_vers.patch ] ++ optional crossCompiling ./MakeMaker-cross.patch; @@ -174,11 +168,11 @@ let priority = 6; # in `buildEnv' (including the one inside `perl.withPackages') the library files will have priority over files in `perl` }; } // optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec { - crossVersion = "b4447944a0aeff9590dc023d64f8ddf3de7669fb"; # Dec 22, 2020 + crossVersion = "4c55233ae95a6aef4d93291fe8ad12709b11e575"; # Jan 21, 2021 perl-cross-src = fetchurl { url = "https://github.com/arsv/perl-cross/archive/${crossVersion}.tar.gz"; - sha256 = "1cignplkb29kcvkfwshakyij71w8srlfqbnb9pla98vya6r82rnb"; + sha256 = "04bxn43ir7b4c2bb1z1l71l93hrysjv00h879nm70m99q6vxq2hc"; }; depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ]; @@ -214,7 +208,7 @@ in { perldevel = common { perl = pkgs.perldevel; buildPerl = buildPackages.perldevel; - version = "5.33.5"; - sha256 = "04iprc8qz6vpbgzqgwja5rc3csvmgq1rnnnl382l39hy69fsdqpr"; + version = "5.33.6"; + sha256 = "1fx6b2q7wzd0xwy7qkmkvd5bdm09d3zfnynrb6afl9ghd8ww56fv"; }; } diff --git a/pkgs/development/interpreters/perl/wrapper.nix b/pkgs/development/interpreters/perl/wrapper.nix index 2e3d394f851..da95b5a8964 100644 --- a/pkgs/development/interpreters/perl/wrapper.nix +++ b/pkgs/development/interpreters/perl/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, perl, buildEnv, makeWrapper +{ lib, perl, buildEnv, makeWrapper , extraLibs ? [] , extraOutputsToInstall ? [] , postBuild ? "" @@ -28,7 +28,7 @@ let mkdir -p "$out/bin" # take every binary from perl packages and put them into the env - for path in ${stdenv.lib.concatStringsSep " " paths}; do + for path in ${lib.concatStringsSep " " paths}; do if [ -d "$path/bin" ]; then cd "$path/bin" for prg in *; do diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index 82134e14406..191d589aa90 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -7,7 +7,7 @@ let generic = { callPackage, lib, stdenv, nixosTests, config, fetchurl, makeWrapper , symlinkJoin, writeText, autoconf, automake, bison, flex, libtool - , pkgconfig, re2c, apacheHttpd, libargon2, libxml2, pcre, pcre2 + , pkg-config, re2c, apacheHttpd, libargon2, libxml2, pcre, pcre2 , systemd, system-sendmail, valgrind, xcbuild , version @@ -149,7 +149,7 @@ let enableParallelBuilding = true; - nativeBuildInputs = [ autoconf automake bison flex libtool pkgconfig re2c ] + nativeBuildInputs = [ autoconf automake bison flex libtool pkg-config re2c ] ++ lib.optional stdenv.isDarwin xcbuild; buildInputs = @@ -269,7 +269,7 @@ let inherit ztsSupport; }; - meta = with stdenv.lib; { + meta = with lib; { description = "An HTML-embedded scripting language"; homepage = "https://www.php.net/"; license = licenses.php301; diff --git a/pkgs/development/interpreters/picoc/default.nix b/pkgs/development/interpreters/picoc/default.nix index f7343f6e4d6..2c674754935 100644 --- a/pkgs/development/interpreters/picoc/default.nix +++ b/pkgs/development/interpreters/picoc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, readline }: +{ lib, stdenv, fetchFromGitHub, readline }: stdenv.mkDerivation rec { pname = "picoc"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { install -m644 *.h $out/include ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Very small C interpreter for scripting"; longDescription = '' PicoC is a very small C interpreter for scripting. It was originally diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix index 1511698c921..341797fa3f4 100644 --- a/pkgs/development/interpreters/picolisp/default.nix +++ b/pkgs/development/interpreters/picolisp/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, jdk, w3m, openssl, makeWrapper }: -with stdenv.lib; +{ lib, stdenv, fetchurl, jdk, w3m, openssl, makeWrapper }: +with lib; stdenv.mkDerivation rec { pname = "picoLisp"; diff --git a/pkgs/development/interpreters/pixie/default.nix b/pkgs/development/interpreters/pixie/default.nix index 9b57e153aa0..ca55eceaedb 100644 --- a/pkgs/development/interpreters/pixie/default.nix +++ b/pkgs/development/interpreters/pixie/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, fetchurl, python2, makeWrapper, pkgconfig, gcc, +{ lib, stdenv, fetchgit, fetchurl, python2, makeWrapper, pkg-config, gcc, pypy, libffi, libedit, libuv, boost, zlib, variant ? "jit", buildWithPypy ? false }: @@ -23,16 +23,16 @@ let sha256 = "0ylbqvhbcp5m09l15i2q2h3a0vjd055x2r37cq71lkhgmmaxrwbq"; }; libs = [ libffi libedit libuv boost.dev boost.out zlib ]; - include-path = stdenv.lib.concatStringsSep ":" + include-path = lib.concatStringsSep ":" (map (p: "${p}/include") libs); - library-path = stdenv.lib.concatStringsSep ":" + library-path = lib.concatStringsSep ":" (map (p: "${p}/lib") libs); - bin-path = stdenv.lib.concatStringsSep ":" + bin-path = lib.concatStringsSep ":" (map (p: "${p}/bin") [ gcc ]); build = {flags, target}: stdenv.mkDerivation rec { pname = "pixie"; version = "0-r${commit-count}-${variant}"; - nativeBuildInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = libs; PYTHON = if buildWithPypy then "${pypy}/pypy-c/pypy-c" @@ -85,9 +85,9 @@ let meta = { description = "A clojure-like lisp, built with the pypy vm toolkit"; homepage = "https://github.com/pixie-lang/pixie"; - license = stdenv.lib.licenses.lgpl3; + license = lib.licenses.lgpl3; platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"]; - maintainers = with stdenv.lib.maintainers; [ bendlas ]; + maintainers = with lib.maintainers; [ bendlas ]; }; }; in build (builtins.getAttr variant variants) diff --git a/pkgs/development/interpreters/pixie/dust.nix b/pkgs/development/interpreters/pixie/dust.nix index 4a7f3423def..e6818cb03ed 100644 --- a/pkgs/development/interpreters/pixie/dust.nix +++ b/pkgs/development/interpreters/pixie/dust.nix @@ -1,4 +1,4 @@ -{ stdenv, pixie, fetchFromGitHub }: +{ lib, stdenv, pixie, fetchFromGitHub }: stdenv.mkDerivation rec { name = "dust-0-91"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Provides tooling around pixie, e.g. a nicer repl, running tests and fetching dependencies"; homepage = src.meta.homepage; - license = stdenv.lib.licenses.lgpl3; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + license = lib.licenses.lgpl3; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/development/interpreters/proglodyte-wasm/default.nix b/pkgs/development/interpreters/proglodyte-wasm/default.nix index 3569f66aed0..2d4acbd398e 100644 --- a/pkgs/development/interpreters/proglodyte-wasm/default.nix +++ b/pkgs/development/interpreters/proglodyte-wasm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, clang, python, v8, coreutils }: +{ lib, stdenv, fetchFromGitHub, cmake, clang, python, v8, coreutils }: let sexpr_wasm_prototype = stdenv.mkDerivation { @@ -51,7 +51,7 @@ stdenv.mkDerivation { make install ''; - meta = with stdenv.lib; { + meta = with lib; { description = "wasm runs WebAssembly from the command line"; maintainers = with maintainers; [ proglodyte ]; platforms = platforms.linux; diff --git a/pkgs/development/interpreters/pyrex/0.9.5.nix b/pkgs/development/interpreters/pyrex/0.9.5.nix index 40eb1daf49c..a9c71c6fcf7 100644 --- a/pkgs/development/interpreters/pyrex/0.9.5.nix +++ b/pkgs/development/interpreters/pyrex/0.9.5.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python2Packages }: +{ lib, fetchurl, python2Packages }: let version = "0.9.5.1.1"; in @@ -16,6 +16,6 @@ python2Packages.buildPythonPackage { meta = { homepage = "http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/"; description = "A language for writing Python extension modules"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }; } diff --git a/pkgs/development/interpreters/pyrex/0.9.6.nix b/pkgs/development/interpreters/pyrex/0.9.6.nix index e518edba1b3..12429c05fe6 100644 --- a/pkgs/development/interpreters/pyrex/0.9.6.nix +++ b/pkgs/development/interpreters/pyrex/0.9.6.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python2Packages }: +{ lib, fetchurl, python2Packages }: let version = "0.9.6.4"; in @@ -16,6 +16,6 @@ python2Packages.buildPythonPackage { meta = { homepage = "http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/"; description = "A language for writing Python extension modules"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }; } diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 4c0501aebcd..85af394e3f6 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch +{ lib, stdenv, fetchurl, fetchpatch , bzip2 , expat , libffi @@ -36,7 +36,7 @@ assert x11Support -> tcl != null && xlibsWrapper != null && libX11 != null; -with stdenv.lib; +with lib; let buildPackages = pkgsBuildHost; @@ -215,7 +215,7 @@ let }; # Python 2.7 needs this - crossCompileEnv = stdenv.lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) + crossCompileEnv = lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) { _PYTHON_HOST_PLATFORM = stdenv.hostPlatform.config; }; # Build the basic Python interpreter without modules that have @@ -227,7 +227,7 @@ in with passthru; stdenv.mkDerivation ({ inherit src patches buildInputs nativeBuildInputs preConfigure configureFlags; - LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; + LDFLAGS = lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; inherit (mkPaths buildInputs) C_INCLUDE_PATH LIBRARY_PATH; NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-msse2" @@ -298,9 +298,9 @@ in with passthru; stdenv.mkDerivation ({ hierarchical packages; exception-based error handling; and very high level dynamic data types. ''; - license = stdenv.lib.licenses.psfl; - platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ fridh ]; + license = lib.licenses.psfl; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ fridh ]; # Higher priority than Python 3.x so that `/bin/python` points to `/bin/python2` # in case both 2 and 3 are installed. priority = -100; diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 9100dfc82c4..7bc6084f61d 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch +{ lib, stdenv, fetchurl, fetchpatch , bzip2 , expat , libffi @@ -54,7 +54,7 @@ assert x11Support -> tcl != null assert bluezSupport -> bluez != null; -with stdenv.lib; +with lib; let buildPackages = pkgsBuildHost; @@ -125,9 +125,15 @@ let if parsed.cpu.significantByte.name == "littleEndian" then "arm" else "armeb" else if isx86_32 then "i386" else parsed.cpu.name; + pythonAbiName = + # python's build doesn't differentiate between musl and glibc in its + # abi detection, our wrapper should match. + if stdenv.hostPlatform.isMusl then + replaceStrings [ "musl" ] [ "gnu" ] parsed.abi.name + else parsed.abi.name; multiarch = if isDarwin then "darwin" - else "${multiarchCpu}-${parsed.kernel.name}-${parsed.abi.name}"; + else "${multiarchCpu}-${parsed.kernel.name}-${pythonAbiName}"; abiFlags = optionalString (isPy36 || isPy37) "m"; @@ -216,7 +222,7 @@ in with passthru; stdenv.mkDerivation { else ./3.7/fix-finding-headers-when-cross-compiling.patch ) - ] ++ optionals (isPy37) [ + ] ++ optionals (isPy36 || isPy37) [ # Backport a fix for ctypes.util.find_library. ./3.7/find_library.patch ]; @@ -363,14 +369,14 @@ in with passthru; stdenv.mkDerivation { find $out -type d -name __pycache__ -print0 | xargs -0 -I {} rm -rf "{}" ''; - preFixup = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + preFixup = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' # Ensure patch-shebangs uses shebangs of host interpreter. - export PATH=${stdenv.lib.makeBinPath [ "$out" bash ]}:$PATH + export PATH=${lib.makeBinPath [ "$out" bash ]}:$PATH ''; # Add CPython specific setup-hook that configures distutils.sysconfig to # always load sysconfigdata from host Python. - postFixup = stdenv.lib.optionalString (!stdenv.hostPlatform.isDarwin) '' + postFixup = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' cat << "EOF" >> "$out/nix-support/setup-hook" ${sysconfigdataHook} EOF @@ -379,8 +385,8 @@ in with passthru; stdenv.mkDerivation { # Enforce that we don't have references to the OpenSSL -dev package, which we # explicitly specify in our configure flags above. disallowedReferences = - stdenv.lib.optionals (openssl != null && !static) [ openssl.dev ] - ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + lib.optionals (openssl != null && !static) [ openssl.dev ] + ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # Ensure we don't have references to build-time packages. # These typically end up in shebangs. pythonForBuild buildPackages.bash diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index c1d78f6fa93..1133ad2009a 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -181,9 +181,9 @@ in { major = "3"; minor = "10"; patch = "0"; - suffix = "a3"; + suffix = "a4"; }; - sha256 = "sha256-sJjJdAdxOUfX7W7VioSGdxlgp2lyMOPZjg42MCd/JYY="; + sha256 = "sha256-McHBl7IZuOH96je/izkxur0Edirn+igVkQU/pbek73M="; inherit (darwin) configd; inherit passthruFun; }; diff --git a/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh b/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh index bfd2bfa7583..85811a37475 100644 --- a/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh +++ b/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh @@ -2,6 +2,7 @@ echo "Sourcing pytest-check-hook" declare -ar disabledTests +declare -ar disabledTestFiles function _concatSep { local result @@ -36,6 +37,13 @@ function pytestCheckPhase() { disabledTestsString=$(_pytestComputeDisabledTestsString "${disabledTests[@]}") args+=" -k \""$disabledTestsString"\"" fi + for file in ${disabledTestFiles[@]}; do + if [ ! -f "$file" ]; then + echo "Disabled test file \"$file\" does not exist. Aborting" + exit 1 + fi + args+=" --ignore=\"$file\"" + done args+=" ${pytestFlagsArray[@]}" eval "@pythonCheckInterpreter@ $args" diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 670c870f107..175454ea055 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -162,7 +162,7 @@ let postFixup = lib.optionalString (!dontWrapPythonPrograms) '' wrapPythonPrograms - '' + attrs.postFixup or ''''; + '' + attrs.postFixup or ""; # Python packages built through cross-compilation are always for the host platform. disallowedReferences = lib.optionals (python.stdenv.hostPlatform != python.stdenv.buildPlatform) [ python.pythonForBuild ]; diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix index 8feeb3c51bf..cfa1ac71891 100644 --- a/pkgs/development/interpreters/python/pypy/default.nix +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -1,5 +1,5 @@ -{ stdenv, substituteAll, fetchurl -, zlib ? null, zlibSupport ? true, bzip2, pkgconfig, libffi, libunwind, Security +{ lib, stdenv, substituteAll, fetchurl +, zlib ? null, zlibSupport ? true, bzip2, pkg-config, libffi, libunwind, Security , sqlite, openssl, ncurses, python, expat, tcl, tk, tix, xlibsWrapper, libX11 , self, gdbm, db, lzma , python-setup-hook @@ -14,12 +14,12 @@ , pythonVersion , sha256 , passthruFun -, pythonAttr ? "pypy${stdenv.lib.substring 0 1 pythonVersion}${stdenv.lib.substring 2 3 pythonVersion}" +, pythonAttr ? "pypy${lib.substring 0 1 pythonVersion}${lib.substring 2 3 pythonVersion}" }: assert zlibSupport -> zlib != null; -with stdenv.lib; +with lib; let isPy3k = substring 0 1 pythonVersion == "3"; @@ -49,7 +49,7 @@ in with passthru; stdenv.mkDerivation rec { inherit sha256; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ bzip2 openssl pythonForPypy libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 gdbm db ] ++ optionals isPy3k [ @@ -144,7 +144,7 @@ in with passthru; stdenv.mkDerivation rec { ln -s $out/${executable}-c/include $out/include/${libPrefix} ln -s $out/${executable}-c/lib-python/${if isPy3k then "3" else pythonVersion} $out/lib/${libPrefix} - ${stdenv.lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.isDarwin '' install_name_tool -change @rpath/libpypy${optionalString isPy3k "3"}-c.dylib $out/lib/libpypy${optionalString isPy3k "3"}-c.dylib $out/bin/${executable} ''} @@ -158,7 +158,7 @@ in with passthru; stdenv.mkDerivation rec { inherit passthru; enableParallelBuilding = true; # almost no parallelization without STM - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://pypy.org/"; description = "Fast, compliant alternative implementation of the Python language (${pythonVersion})"; license = licenses.mit; diff --git a/pkgs/development/interpreters/python/pypy/prebuilt.nix b/pkgs/development/interpreters/python/pypy/prebuilt.nix index 1522047a380..6fd0ee2e925 100644 --- a/pkgs/development/interpreters/python/pypy/prebuilt.nix +++ b/pkgs/development/interpreters/python/pypy/prebuilt.nix @@ -22,7 +22,7 @@ # This version of PyPy is primarily added to speed-up translation of # our PyPy source build when developing that expression. -with stdenv.lib; +with lib; let isPy3k = majorVersion == "3"; @@ -78,7 +78,7 @@ in with passthru; stdenv.mkDerivation { pushd $out find {lib,lib_pypy*} -name "*.so" -exec patchelf --remove-needed libncursesw.so.6 --replace-needed libtinfow.so.6 libncursesw.so.6 {} \; - find {lib,lib_pypy*} -name "*.so" -exec patchelf --set-rpath ${stdenv.lib.makeLibraryPath deps}:$out/lib {} \; + find {lib,lib_pypy*} -name "*.so" -exec patchelf --set-rpath ${lib.makeLibraryPath deps}:$out/lib {} \; echo "Removing bytecode" find . -name "__pycache__" -type d -depth -exec rm -rf {} \; @@ -115,7 +115,7 @@ in with passthru; stdenv.mkDerivation { inherit passthru; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://pypy.org/"; description = "Fast, compliant alternative implementation of the Python language (${pythonVersion})"; license = licenses.mit; diff --git a/pkgs/development/interpreters/python/tests.nix b/pkgs/development/interpreters/python/tests.nix index a291919b327..61fc497024b 100644 --- a/pkgs/development/interpreters/python/tests.nix +++ b/pkgs/development/interpreters/python/tests.nix @@ -93,4 +93,4 @@ let -in stdenv.lib.optionalAttrs (stdenv.hostPlatform == stdenv.buildPlatform ) (environmentTests // integrationTests) +in lib.optionalAttrs (stdenv.hostPlatform == stdenv.buildPlatform ) (environmentTests // integrationTests) diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix index dffad6b98f5..61ad4a8a6ad 100644 --- a/pkgs/development/interpreters/python/wrapper.nix +++ b/pkgs/development/interpreters/python/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, python, buildEnv, makeWrapper +{ lib, stdenv, python, buildEnv, makeWrapper , extraLibs ? [] , extraOutputsToInstall ? [] , postBuild ? "" @@ -30,14 +30,14 @@ let fi mkdir -p "$out/bin" - for path in ${stdenv.lib.concatStringsSep " " paths}; do + for path in ${lib.concatStringsSep " " paths}; do if [ -d "$path/bin" ]; then cd "$path/bin" for prg in *; do if [ -f "$prg" ]; then rm -f "$out/bin/$prg" if [ -x "$prg" ]; then - makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set NIX_PYTHONPREFIX "$out" --set NIX_PYTHONEXECUTABLE ${pythonExecutable} --set NIX_PYTHONPATH ${pythonPath} ${if permitUserSite then "" else ''--set PYTHONNOUSERSITE "true"''} ${stdenv.lib.concatStringsSep " " makeWrapperArgs} + makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set NIX_PYTHONPREFIX "$out" --set NIX_PYTHONEXECUTABLE ${pythonExecutable} --set NIX_PYTHONPATH ${pythonPath} ${if permitUserSite then "" else ''--set PYTHONNOUSERSITE "true"''} ${lib.concatStringsSep " " makeWrapperArgs} fi fi done diff --git a/pkgs/development/interpreters/qnial/default.nix b/pkgs/development/interpreters/qnial/default.nix index 1762edbbdb7..ba46989c94a 100644 --- a/pkgs/development/interpreters/qnial/default.nix +++ b/pkgs/development/interpreters/qnial/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, unzip, pkgconfig, makeWrapper, ncurses }: +{ lib, stdenv, fetchFromGitHub, unzip, pkg-config, makeWrapper, ncurses }: stdenv.mkDerivation { pname = "qnial"; @@ -26,15 +26,15 @@ stdenv.mkDerivation { buildInputs = [ unzip - pkgconfig + pkg-config ncurses ]; meta = { description = "An array language from Nial Systems"; homepage = "https://github.com/vrthra/qnial"; - license = stdenv.lib.licenses.artistic1; - maintainers = [ stdenv.lib.maintainers.vrthra ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.artistic1; + maintainers = [ lib.maintainers.vrthra ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/interpreters/quickjs/default.nix b/pkgs/development/interpreters/quickjs/default.nix index b1d03252d7e..23fe1dc7800 100644 --- a/pkgs/development/interpreters/quickjs/default.nix +++ b/pkgs/development/interpreters/quickjs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "quickjs"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "13hlx6qwrrxmlvvqcr3irxba6zmf05cf54l32vj50wc66s1qd41p"; }; - makeFlags = [ "prefix=${placeholder ''out''}" ]; + makeFlags = [ "prefix=${placeholder "out"}" ]; enableParallelBuilding = true; doInstallCheck = true; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { out=$(mktemp) && qjsbnc -flto "$temp" -o "$out" && "$out" | grep -q "Output from compiled program" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A small and embeddable Javascript engine"; homepage = "https://bellard.org/quickjs/"; maintainers = with maintainers; [ stesie ]; diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 2c51c691a8b..8d33962f914 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeFontsConf +{ lib, stdenv, fetchurl, makeFontsConf , cacert , cairo, coreutils, fontconfig, freefont_ttf , glib, gmp @@ -22,7 +22,7 @@ let fontDirectories = [ freefont_ttf ]; }; - libPath = stdenv.lib.makeLibraryPath [ + libPath = lib.makeLibraryPath [ cairo fontconfig glib @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { pname = "racket"; version = "7.9"; # always change at once with ./minimal.nix - src = (stdenv.lib.makeOverridable ({ name, sha256 }: + src = (lib.makeOverridable ({ name, sha256 }: fetchurl { url = "https://mirror.racket-lang.org/installers/${version}/${name}-src.tgz"; inherit sha256; @@ -60,15 +60,15 @@ stdenv.mkDerivation rec { FONTCONFIG_FILE = fontsConf; LD_LIBRARY_PATH = libPath; - NIX_LDFLAGS = stdenv.lib.concatStringsSep " " [ - (stdenv.lib.optionalString (stdenv.cc.isGNU && ! stdenv.isDarwin) "-lgcc_s") - (stdenv.lib.optionalString stdenv.isDarwin "-framework CoreFoundation") + NIX_LDFLAGS = lib.concatStringsSep " " [ + (lib.optionalString (stdenv.cc.isGNU && ! stdenv.isDarwin) "-lgcc_s") + (lib.optionalString stdenv.isDarwin "-framework CoreFoundation") ]; nativeBuildInputs = [ cacert wrapGAppsHook ]; buildInputs = [ fontconfig libffi libtool sqlite gsettings-desktop-schemas gtk3 ] - ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv CoreFoundation ]; + ++ lib.optionals stdenv.isDarwin [ libiconv CoreFoundation ]; preConfigure = '' unset AR @@ -83,15 +83,15 @@ stdenv.mkDerivation rec { shared = if stdenv.isDarwin then "dylib" else "shared"; configureFlags = [ "--enable-${shared}" "--enable-lt=${libtool}/bin/libtool" ] - ++ stdenv.lib.optional disableDocs [ "--disable-docs" ] - ++ stdenv.lib.optional stdenv.isDarwin [ "--enable-xonx" ]; + ++ lib.optional disableDocs [ "--disable-docs" ] + ++ lib.optional stdenv.isDarwin [ "--enable-xonx" ]; configureScript = "../configure"; enableParallelBuilding = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A programmable programming language"; longDescription = '' Racket is a full-spectrum programming language. It goes beyond diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix index c645fae0d84..99a812905d4 100644 --- a/pkgs/development/interpreters/rakudo/default.nix +++ b/pkgs/development/interpreters/rakudo/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { # Some tests fail on Darwin doCheck = !stdenv.isDarwin; - meta = with stdenv.lib; { + meta = with lib; { description = "Raku implementation on top of Moar virtual machine"; homepage = "https://www.rakudo.org"; license = licenses.artistic2; diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix index 54b487c2595..f833c153b96 100644 --- a/pkgs/development/interpreters/rakudo/moarvm.nix +++ b/pkgs/development/interpreters/rakudo/moarvm.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl +{ lib, stdenv, fetchurl, perl , CoreServices, ApplicationServices }: stdenv.mkDerivation rec { @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { sha256 = "18iys1bdb92asggrsz7sg1hh76j7kq63c3fgg33fnla18qf4z488"; }; - buildInputs = [ perl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ]; + buildInputs = [ perl ] ++ lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ]; doCheck = false; # MoarVM does not come with its own test suite configureScript = "${perl}/bin/perl ./Configure.pl"; - meta = with stdenv.lib; { + meta = with lib; { description = "VM with adaptive optimization and JIT compilation, built for Rakudo"; homepage = "https://www.moarvm.org/"; license = licenses.artistic2; diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/development/interpreters/rakudo/nqp.nix index 04b628bc9da..b4b41fa8804 100644 --- a/pkgs/development/interpreters/rakudo/nqp.nix +++ b/pkgs/development/interpreters/rakudo/nqp.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Not Quite Perl -- a lightweight Raku-like environment for virtual machines"; homepage = "https://github.com/perl6/nqp"; license = licenses.artistic2; diff --git a/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/development/interpreters/rakudo/zef.nix index b2cea4ad473..860ffc0aea0 100644 --- a/pkgs/development/interpreters/rakudo/zef.nix +++ b/pkgs/development/interpreters/rakudo/zef.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rakudo, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, rakudo, makeWrapper }: stdenv.mkDerivation rec { pname = "zef"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/zef --prefix RAKUDOLIB , "inst#$out" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Raku / Perl6 Module Management"; homepage = "https://github.com/ugexe/zef"; license = licenses.artistic2; diff --git a/pkgs/development/interpreters/rascal/default.nix b/pkgs/development/interpreters/rascal/default.nix index 8b802043fe3..cd2b74db052 100644 --- a/pkgs/development/interpreters/rascal/default.nix +++ b/pkgs/development/interpreters/rascal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, jdk }: +{ lib, stdenv, fetchurl, makeWrapper, jdk }: stdenv.mkDerivation rec { name = "rascal-0.6.2"; @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.rascal-mpl.org/"; description = "Command-line REPL for the Rascal metaprogramming language"; - license = stdenv.lib.licenses.epl10; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.epl10; + maintainers = [ lib.maintainers.eelco ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/interpreters/rebol/default.nix b/pkgs/development/interpreters/rebol/default.nix index b26af7f0b1b..39a4108e041 100644 --- a/pkgs/development/interpreters/rebol/default.nix +++ b/pkgs/development/interpreters/rebol/default.nix @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { cp r3 $out/bin ''; - meta = with stdenv.lib; { - description = ''Relative expression based object language, a language where code is data''; + meta = with lib; { + description = "Relative expression based object language, a language where code is data"; maintainers = with maintainers; [ vrthra ]; platforms = [ "x86_64-linux" ]; license = licenses.asl20; diff --git a/pkgs/development/interpreters/red/default.nix b/pkgs/development/interpreters/red/default.nix index 554dc81bffb..6689f7eb5c3 100644 --- a/pkgs/development/interpreters/red/default.nix +++ b/pkgs/development/interpreters/red/default.nix @@ -1,4 +1,4 @@ -{ stdenv, stdenv_32bit, pkgsi686Linux, fetchFromGitHub, fetchurl }: +{ lib, stdenv, stdenv_32bit, pkgsi686Linux, fetchFromGitHub, fetchurl }: stdenv.mkDerivation rec { pname = "red"; @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { ''; - meta = with stdenv.lib; { + meta = with lib; { description = '' New programming language strongly inspired by Rebol, but with a broader field of usage thanks to its native-code compiler, from system diff --git a/pkgs/development/interpreters/regina/default.nix b/pkgs/development/interpreters/regina/default.nix index ec19b0679f4..79258d2cc0f 100644 --- a/pkgs/development/interpreters/regina/default.nix +++ b/pkgs/development/interpreters/regina/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses }: +{ lib, stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { pname = "Regina-REXX"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { "--libdir=$(out)/lib" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "REXX interpreter"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index 41cf4c221c6..ae5227fb198 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python2Packages, pkgconfig, SDL2 +{ lib, stdenv, fetchurl, python2Packages, pkg-config, SDL2 , libpng, ffmpeg_3, freetype, glew, libGL, libGLU, fribidi, zlib , glib }: @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "renpy"; version = "7.3.5"; - meta = with stdenv.lib; { + meta = with lib; { description = "Ren'Py Visual Novel Engine"; homepage = "https://renpy.org/"; license = licenses.mit; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { substituteInPlace launcher/game/choose_directory.rpy --replace /usr/bin/python ${python.interpreter} ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ python cython wrapPython tkinter SDL2 libpng ffmpeg_3 freetype glew libGLU libGL fribidi zlib pygame_sdl2 glib @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { pythonPath = [ pygame_sdl2 tkinter ]; - RENPY_DEPS_INSTALL = stdenv.lib.concatStringsSep "::" (map (path: path) [ + RENPY_DEPS_INSTALL = lib.concatStringsSep "::" (map (path: path) [ SDL2 SDL2.dev libpng ffmpeg_3 ffmpeg_3.out freetype glew.dev glew.out libGLU libGL fribidi zlib ]); diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 87aa5aca1e1..2678188e8cf 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -159,7 +159,7 @@ let export GEM_HOME="$out/${passthru.gemPath}" ''; - installFlags = stdenv.lib.optional docSupport "install-doc"; + installFlags = lib.optional docSupport "install-doc"; # Bundler tries to create this directory postInstall = '' # Remove unnecessary groff reference from runtime closure, since it's big @@ -208,7 +208,7 @@ let disallowedRequisites = op (!jitSupport) stdenv.cc.cc; - meta = with stdenv.lib; { + meta = with lib; { description = "The Ruby language"; homepage = "http://www.ruby-lang.org/en/"; license = licenses.ruby; diff --git a/pkgs/development/interpreters/scheme48/default.nix b/pkgs/development/interpreters/scheme48/default.nix index 5a1e3f265b2..ca34d5055c5 100644 --- a/pkgs/development/interpreters/scheme48/default.nix +++ b/pkgs/development/interpreters/scheme48/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "scheme48-1.9.2"; @@ -6,8 +6,8 @@ stdenv.mkDerivation { meta = { homepage = "http://s48.org/"; description = "Scheme 48"; - platforms = with stdenv.lib.platforms; unix; - license = stdenv.lib.licenses.bsd3; + platforms = with lib.platforms; unix; + license = lib.licenses.bsd3; }; src = fetchurl { diff --git a/pkgs/development/interpreters/scsh/default.nix b/pkgs/development/interpreters/scsh/default.nix index bb4f418f502..6dcb8bd27c5 100644 --- a/pkgs/development/interpreters/scsh/default.nix +++ b/pkgs/development/interpreters/scsh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoreconfHook, scheme48 }: +{ lib, stdenv, fetchgit, autoreconfHook, scheme48 }: stdenv.mkDerivation { name = "scsh-0.7pre"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [ scheme48 ]; configureFlags = [ "--with-scheme48=${scheme48}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A Scheme shell"; homepage = "http://www.scsh.net/"; license = licenses.bsd3; diff --git a/pkgs/development/interpreters/self/default.nix b/pkgs/development/interpreters/self/default.nix index 0d5cc061f59..58cac6bbe9b 100644 --- a/pkgs/development/interpreters/self/default.nix +++ b/pkgs/development/interpreters/self/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libX11, libXext, makeWrapper, ncurses, cmake }: +{ lib, stdenv, fetchFromGitHub, libX11, libXext, makeWrapper, ncurses, cmake }: stdenv.mkDerivation rec { # The Self wrapper stores source in $XDG_DATA_HOME/self or ~/.local/share/self @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { --set SELF_ROOT "$out" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A prototype-based dynamic object-oriented programming language, environment, and virtual machine"; homepage = "https://selflanguage.org/"; license = licenses.bsd3; diff --git a/pkgs/development/interpreters/shen-sbcl/default.nix b/pkgs/development/interpreters/shen-sbcl/default.nix index 6d10669d20d..f93e0ae5d95 100644 --- a/pkgs/development/interpreters/shen-sbcl/default.nix +++ b/pkgs/development/interpreters/shen-sbcl/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , shen-sources , sbcl @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { mkdir -p $out install -m755 -D bin/sbcl/shen $out/bin/shen-sbcl ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://shenlanguage.org; description = "Port of Shen running on Steel Bank Common Lisp"; platforms = sbcl.meta.platforms; diff --git a/pkgs/development/interpreters/shen-sources/default.nix b/pkgs/development/interpreters/shen-sources/default.nix index f35631daa28..84839cf42de 100644 --- a/pkgs/development/interpreters/shen-sources/default.nix +++ b/pkgs/development/interpreters/shen-sources/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cp . $out -R ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://shenlanguage.org; description = "Source code for the Shen Language"; platforms = platforms.all; diff --git a/pkgs/development/interpreters/spidermonkey/1.8.5.nix b/pkgs/development/interpreters/spidermonkey/1.8.5.nix index 37efeba3f9b..4892e0b8abe 100644 --- a/pkgs/development/interpreters/spidermonkey/1.8.5.nix +++ b/pkgs/development/interpreters/spidermonkey/1.8.5.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, autoconf213, fetchurl, fetchpatch, pkgconfig, nspr, perl, python2, zip }: +{ stdenv, lib, autoconf213, fetchurl, fetchpatch, pkg-config, nspr, perl, python2, zip }: stdenv.mkDerivation { pname = "spidermonkey"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { propagatedBuildInputs = [ nspr ]; - nativeBuildInputs = [ pkgconfig ] ++ lib.optional stdenv.isAarch32 autoconf213; + nativeBuildInputs = [ pkg-config ] ++ lib.optional stdenv.isAarch32 autoconf213; buildInputs = [ perl python2 zip ]; postUnpack = "sourceRoot=\${sourceRoot}/js/src"; @@ -28,7 +28,7 @@ stdenv.mkDerivation { url = "https://sources.debian.org/data/main/m/mozjs/1.8.5-1.0.0+dfsg-6/debian/patches/fix-811665.patch"; sha256 = "1q8477xqxiy5d8376k5902l45gd0qkd4nxmhl8vr6rr1pxfcny99"; }) - ] ++ stdenv.lib.optionals stdenv.isAarch32 [ + ] ++ lib.optionals stdenv.isAarch32 [ # Explained below in configureFlags for ARM ./1.8.5-findvanilla.patch # Fix for hard float flags. @@ -49,7 +49,7 @@ stdenv.mkDerivation { # of polkit, which is what matters most, it does not override the allocator # so the failure of that test does not matter much. configureFlags = [ "--enable-threadsafe" "--with-system-nspr" ] ++ - stdenv.lib.optionals (stdenv.hostPlatform.system == "armv5tel-linux") [ + lib.optionals (stdenv.hostPlatform.system == "armv5tel-linux") [ "--with-cpu-arch=armv5t" "--disable-tracejit" ]; @@ -67,7 +67,7 @@ stdenv.mkDerivation { rm jit-test/tests/sunspider/check-date-format-tofte.js # https://bugzil.la/600522 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Mozilla's JavaScript engine written in C/C++"; homepage = "https://developer.mozilla.org/en/SpiderMonkey"; # TODO: MPL/GPL/LGPL tri-license. diff --git a/pkgs/development/interpreters/spidermonkey/38.nix b/pkgs/development/interpreters/spidermonkey/38.nix index 22ce5a0b387..482561a901e 100644 --- a/pkgs/development/interpreters/spidermonkey/38.nix +++ b/pkgs/development/interpreters/spidermonkey/38.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, pkgconfig, gnused_422, perl, python2, zip, libffi, readline, icu, zlib, buildPackages +{ lib, stdenv, fetchurl, pkg-config, gnused_422, perl, python2, zip, libffi, readline, icu, zlib, buildPackages , libobjc }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { version = "38.8.0"; @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ libffi readline icu zlib ] - ++ stdenv.lib.optional stdenv.isDarwin libobjc; - nativeBuildInputs = [ pkgconfig perl python2 zip gnused_422 ]; + ++ lib.optional stdenv.isDarwin libobjc; + nativeBuildInputs = [ pkg-config perl python2 zip gnused_422 ]; postUnpack = "sourceRoot=\${sourceRoot}/js/src"; @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Mozilla's JavaScript engine written in C/C++"; homepage = "https://developer.mozilla.org/en/SpiderMonkey"; # TODO: MPL/GPL/LGPL tri-license. diff --git a/pkgs/development/interpreters/spidermonkey/60.nix b/pkgs/development/interpreters/spidermonkey/60.nix index 42731421d81..d75e5e8b285 100644 --- a/pkgs/development/interpreters/spidermonkey/60.nix +++ b/pkgs/development/interpreters/spidermonkey/60.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, python2, zip, buildPackages +{ lib, stdenv, fetchurl, fetchpatch, autoconf213, pkg-config, perl, python2, zip, buildPackages , which, readline, zlib, icu }: -with stdenv.lib; +with lib; let version = "60.9.0"; @@ -18,7 +18,7 @@ in stdenv.mkDerivation { setOutputFlags = false; # Configure script only understands --includedir buildInputs = [ readline zlib icu ]; - nativeBuildInputs = [ autoconf213 pkgconfig perl which python2 zip ]; + nativeBuildInputs = [ autoconf213 pkg-config perl which python2 zip ]; patches = [ # Fixed in 62.0 @@ -73,7 +73,7 @@ in stdenv.mkDerivation { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Mozilla's JavaScript engine written in C/C++"; homepage = "https://developer.mozilla.org/en/SpiderMonkey"; license = licenses.gpl2; # TODO: MPL/GPL/LGPL tri-license. diff --git a/pkgs/development/interpreters/spidermonkey/68.nix b/pkgs/development/interpreters/spidermonkey/68.nix index 36d28f62e2e..0ac005b07de 100644 --- a/pkgs/development/interpreters/spidermonkey/68.nix +++ b/pkgs/development/interpreters/spidermonkey/68.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, python2, python3, zip, buildPackages +{ lib, stdenv, fetchurl, fetchpatch, autoconf213, pkg-config, perl, python2, python3, zip, buildPackages , which, readline, zlib, icu, cargo, rustc, llvmPackages }: -with stdenv.lib; +with lib; let python3Env = buildPackages.python3.withPackages (p: [p.six]); @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf213 - pkgconfig + pkg-config perl which python2 @@ -85,7 +85,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Mozilla's JavaScript engine written in C/C++"; homepage = "https://developer.mozilla.org/en/SpiderMonkey"; license = licenses.gpl2; # TODO: MPL/GPL/LGPL tri-license. diff --git a/pkgs/development/interpreters/spidermonkey/78.nix b/pkgs/development/interpreters/spidermonkey/78.nix index a3d7242f453..81ebcedf7bc 100644 --- a/pkgs/development/interpreters/spidermonkey/78.nix +++ b/pkgs/development/interpreters/spidermonkey/78.nix @@ -1,8 +1,8 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , autoconf213 -, pkgconfig +, pkg-config , perl , python3 , zip @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { cargo llvmPackages.llvm # for llvm-objdump perl - pkgconfig + pkg-config python3 rust-cbindgen rustc @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { # https://src.fedoraproject.org/rpms/mozjs38/c/761399aba092bcb1299bb4fccfd60f370ab4216e "--enable-optimize" "--enable-release" - ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # Spidermonkey seems to use different host/build terminology for cross # compilation here. "--host=${stdenv.buildPlatform.config}" @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Mozilla's JavaScript engine written in C/C++"; homepage = "https://developer.mozilla.org/en/SpiderMonkey"; license = licenses.gpl2; # TODO: MPL/GPL/LGPL tri-license. diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index 113eb54a00b..a1612680b25 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, cmake, pkgconfig, alsaLib +{ lib, stdenv, fetchurl, cmake, pkg-config, alsaLib , libjack2, libsndfile, fftw, curl, gcc , libXt, qtbase, qttools, qtwebengine , readline, qtwebsockets, useSCEL ? false, emacs }: -let optional = stdenv.lib.optional; +let optional = lib.optional; in stdenv.mkDerivation rec { @@ -24,14 +24,16 @@ stdenv.mkDerivation rec { "-DSC_EL=${if useSCEL then "ON" else "OFF"}" ]; - nativeBuildInputs = [ cmake pkgconfig qttools ]; + nativeBuildInputs = [ cmake pkg-config qttools ]; buildInputs = [ gcc libjack2 libsndfile fftw curl libXt qtbase qtwebengine qtwebsockets readline ] ++ optional (!stdenv.isDarwin) alsaLib ++ optional useSCEL emacs; - meta = with stdenv.lib; { + dontWrapQtApps = true; + + meta = with lib; { description = "Programming language for real time audio synthesis"; homepage = "https://supercollider.github.io"; maintainers = with maintainers; [ mrmebelman ]; diff --git a/pkgs/development/interpreters/tcl/generic.nix b/pkgs/development/interpreters/tcl/generic.nix index 9aaf8223837..e665e8cfb1e 100644 --- a/pkgs/development/interpreters/tcl/generic.nix +++ b/pkgs/development/interpreters/tcl/generic.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv # Version specific stuff , release, version, src @@ -27,7 +27,7 @@ stdenv.mkDerivation { # Don't install tzdata because NixOS already has a more up-to-date copy. "--with-tzdata=no" "tcl_cv_strtod_unbroken=ok" - ] ++ stdenv.lib.optional stdenv.is64bit "--enable-64bit"; + ] ++ lib.optional stdenv.is64bit "--enable-64bit"; enableParallelBuilding = true; @@ -39,7 +39,7 @@ stdenv.mkDerivation { ln -s $out/lib/libtcl${release}${dllExtension} $out/lib/libtcl${dllExtension} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "The Tcl scripting language"; homepage = "https://www.tcl.tk/"; license = licenses.tcltk; diff --git a/pkgs/development/interpreters/tclreadline/default.nix b/pkgs/development/interpreters/tclreadline/default.nix index bbd34f71d22..44d2745dac8 100644 --- a/pkgs/development/interpreters/tclreadline/default.nix +++ b/pkgs/development/interpreters/tclreadline/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , automake , autoconf @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { # The provided makefile leaves a wrong reference to /build/ in RPATH, # so we fix it after checking that everything is also present in $out - preFixup = stdenv.lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString stdenv.isLinux '' needed_libraries=$(ls .libs | grep '\.\(so\|la\)$') for lib in $needed_libraries; do if ! ls $out/lib | grep "$lib"; then @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "GNU readline for interactive tcl shells"; homepage = "https://github.com/flightaware/tclreadline"; license = licenses.bsd3; diff --git a/pkgs/development/interpreters/tinyscheme/default.nix b/pkgs/development/interpreters/tinyscheme/default.nix index b49a37a7285..8dd27b3f000 100644 --- a/pkgs/development/interpreters/tinyscheme/default.nix +++ b/pkgs/development/interpreters/tinyscheme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "tinyscheme"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { cp scheme $out/bin/tinyscheme ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Lightweight Scheme implementation"; longDescription = '' TinyScheme is a lightweight Scheme interpreter that implements as large a diff --git a/pkgs/development/interpreters/unicon-lang/default.nix b/pkgs/development/interpreters/unicon-lang/default.nix index 9bdd31f400a..ac0a944f210 100644 --- a/pkgs/development/interpreters/unicon-lang/default.nix +++ b/pkgs/development/interpreters/unicon-lang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, libX11, libXt, libnsl }: +{ lib, stdenv, fetchurl, unzip, libX11, libXt, libnsl }: stdenv.mkDerivation { pname = "unicon-lang"; @@ -33,8 +33,8 @@ stdenv.mkDerivation { cp -r bin $out/ ''; - meta = with stdenv.lib; { - description = ''A very high level, goal-directed, object-oriented, general purpose applications language''; + meta = with lib; { + description = "A very high level, goal-directed, object-oriented, general purpose applications language"; maintainers = with maintainers; [ vrthra ]; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/development/interpreters/wasmer/default.nix b/pkgs/development/interpreters/wasmer/default.nix index 7b390c54716..60ce4d89f19 100644 --- a/pkgs/development/interpreters/wasmer/default.nix +++ b/pkgs/development/interpreters/wasmer/default.nix @@ -22,6 +22,12 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ cmake pkg-config ]; + # Since wasmer 0.17 no backends are enabled by default. Backends are now detected + # using the [makefile](https://github.com/wasmerio/wasmer/blob/master/Makefile). + # Enabling cranelift as this used to be the old default. At least one backend is + # needed for the run subcommand to work. + cargoBuildFlags = [ "--features 'backend-cranelift'" ]; + LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; meta = with lib; { diff --git a/pkgs/development/java-modules/build-maven-package.nix b/pkgs/development/java-modules/build-maven-package.nix index a7196c6e031..432f972b0ff 100644 --- a/pkgs/development/java-modules/build-maven-package.nix +++ b/pkgs/development/java-modules/build-maven-package.nix @@ -1,11 +1,11 @@ -{ stdenv, maven, pkgs }: +{ lib, stdenv, maven, pkgs }: { mavenDeps, src, name, meta, m2Path, skipTests ? true, quiet ? true, ... }: with builtins; -with stdenv.lib; +with lib; let - mavenMinimal = import ./maven-minimal.nix { inherit pkgs stdenv; }; + mavenMinimal = import ./maven-minimal.nix { inherit lib pkgs ; }; in stdenv.mkDerivation rec { inherit mavenDeps src name meta m2Path; diff --git a/pkgs/development/java-modules/junit/default.nix b/pkgs/development/java-modules/junit/default.nix index dbbce6b6262..2cb9ab001c2 100644 --- a/pkgs/development/java-modules/junit/default.nix +++ b/pkgs/development/java-modules/junit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, mavenbuild, fetchMaven }: +{ lib, pkgs, mavenbuild, fetchMaven }: with pkgs.javaPackages; @@ -21,9 +21,9 @@ in rec { meta = { homepage = "https://junit.org/junit4/"; description = "Simple framework to write repeatable tests. It is an instance of the xUnit architecture for unit testing frameworks"; - license = stdenv.lib.licenses.epl10; - platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; + license = lib.licenses.epl10; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ nequissimus ]; }; }; diff --git a/pkgs/development/java-modules/maven-hello/default.nix b/pkgs/development/java-modules/maven-hello/default.nix index b4639d9ee1d..eac127b6dcc 100644 --- a/pkgs/development/java-modules/maven-hello/default.nix +++ b/pkgs/development/java-modules/maven-hello/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, mavenbuild }: +{ lib, pkgs, mavenbuild }: with pkgs.javaPackages; @@ -20,9 +20,9 @@ in rec { meta = { homepage = "https://github.com/NeQuissimus/maven-hello/"; description = "Maven Hello World"; - license = stdenv.lib.licenses.unlicense; - platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; + license = lib.licenses.unlicense; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ nequissimus ]; }; }; diff --git a/pkgs/development/java-modules/maven-minimal.nix b/pkgs/development/java-modules/maven-minimal.nix index 52edcd2104f..d966a75bb9d 100644 --- a/pkgs/development/java-modules/maven-minimal.nix +++ b/pkgs/development/java-modules/maven-minimal.nix @@ -1,6 +1,6 @@ -{ stdenv, pkgs }: +{ lib, pkgs }: -with stdenv.lib; +with lib; with pkgs.javaPackages; let diff --git a/pkgs/development/libraries/AntTweakBar/default.nix b/pkgs/development/libraries/AntTweakBar/default.nix index ab9440c3034..c26672c1dab 100644 --- a/pkgs/development/libraries/AntTweakBar/default.nix +++ b/pkgs/development/libraries/AntTweakBar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, xorg, libGLU, libGL }: +{ lib, stdenv, fetchurl, unzip, xorg, libGLU, libGL }: stdenv.mkDerivation { name = "AntTweakBar-1.16"; @@ -26,8 +26,8 @@ stdenv.mkDerivation { to interactively tweak parameters on-screen ''; homepage = "http://anttweakbar.sourceforge.net/"; - license = stdenv.lib.licenses.zlib; - maintainers = [ stdenv.lib.maintainers.razvan ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.zlib; + maintainers = [ lib.maintainers.razvan ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/CGAL/4.nix b/pkgs/development/libraries/CGAL/4.nix index ad900744f54..7028572174f 100644 --- a/pkgs/development/libraries/CGAL/4.nix +++ b/pkgs/development/libraries/CGAL/4.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, boost, gmp, mpfr }: +{ lib, stdenv, fetchFromGitHub, cmake, boost, gmp, mpfr }: stdenv.mkDerivation rec { version = "4.14.2"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Computational Geometry Algorithms Library"; homepage = "http://cgal.org"; license = with licenses; [ gpl3Plus lgpl3Plus]; diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix index ca350348986..7ff9ac43343 100644 --- a/pkgs/development/libraries/CGAL/default.nix +++ b/pkgs/development/libraries/CGAL/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , boost @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Computational Geometry Algorithms Library"; homepage = "http://cgal.org"; license = with licenses; [ gpl3Plus lgpl3Plus]; diff --git a/pkgs/development/libraries/CoinMP/default.nix b/pkgs/development/libraries/CoinMP/default.nix index 7adb6e6437e..d34b465f135 100644 --- a/pkgs/development/libraries/CoinMP/default.nix +++ b/pkgs/development/libraries/CoinMP/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "CoinMP"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://projects.coin-or.org/CoinMP/"; description = "COIN-OR lightweight API for COIN-OR libraries CLP, CBC, and CGL"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/LAStools/default.nix b/pkgs/development/libraries/LAStools/default.nix index c231361acb5..61a39aa8e76 100644 --- a/pkgs/development/libraries/LAStools/default.nix +++ b/pkgs/development/libraries/LAStools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "LAStools"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Software for rapid LiDAR processing"; homepage = http://lastools.org/; license = licenses.unfree; diff --git a/pkgs/development/libraries/LASzip/LASzip2.nix b/pkgs/development/libraries/LASzip/LASzip2.nix index 2eb30963128..b080153826a 100644 --- a/pkgs/development/libraries/LASzip/LASzip2.nix +++ b/pkgs/development/libraries/LASzip/LASzip2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake }: +{ lib, stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { version = "2.2.0"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Turn quickly bulky LAS files into compact LAZ files without information loss"; homepage = "https://laszip.org"; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/LASzip/default.nix b/pkgs/development/libraries/LASzip/default.nix index 0300aa37f0f..f170ea44c0e 100644 --- a/pkgs/development/libraries/LASzip/default.nix +++ b/pkgs/development/libraries/LASzip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { version = "3.4.3"; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { meta = { description = "Turn quickly bulky LAS files into compact LAZ files without information loss"; homepage = "https://laszip.org"; - license = stdenv.lib.licenses.lgpl2; - maintainers = [ stdenv.lib.maintainers.michelk ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.lgpl2; + maintainers = [ lib.maintainers.michelk ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/NSPlist/default.nix b/pkgs/development/libraries/NSPlist/default.nix index 9cf5e919548..1b8ae939eca 100644 --- a/pkgs/development/libraries/NSPlist/default.nix +++ b/pkgs/development/libraries/NSPlist/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation { name = "NSPlist-713decf"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { maintainers = with maintainers; [ matthewbauer ]; description = "Parses .plist files"; license = licenses.mit; diff --git a/pkgs/development/libraries/PlistCpp/default.nix b/pkgs/development/libraries/PlistCpp/default.nix index 3501fa8b435..f7c47805748 100644 --- a/pkgs/development/libraries/PlistCpp/default.nix +++ b/pkgs/development/libraries/PlistCpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, boost, NSPlist, pugixml }: +{ lib, stdenv, fetchFromGitHub, cmake, boost, NSPlist, pugixml }: stdenv.mkDerivation { name = "PlistCpp-11615d"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; buildInputs = [ boost NSPlist pugixml ]; - meta = with stdenv.lib; { + meta = with lib; { maintainers = with maintainers; [ matthewbauer ]; description = "CPP bindings for Plist"; license = licenses.mit; diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index 61609a90dd0..b51bc3f7cdd 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -1,5 +1,5 @@ -{ stdenv, config, fetchurl, fetchpatch, pkgconfig, audiofile, libcap, libiconv -, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms +{ lib, stdenv, config, fetchurl, fetchpatch, pkg-config, audiofile, libcap, libiconv +, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms , openglSupport ? libGLSupported, libGL, libGLU , alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsaLib , x11Support ? !stdenv.isCygwin && !stdenv.hostPlatform.isAndroid @@ -11,7 +11,7 @@ # NOTE: When editing this expression see if the same change applies to # SDL2 expression too -with stdenv.lib; +with lib; let extraPropagatedBuildInputs = [ ] @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; outputBin = "dev"; # sdl-config - nativeBuildInputs = [ pkgconfig ] + nativeBuildInputs = [ pkg-config ] ++ optional stdenv.isLinux libcap; propagatedBuildInputs = [ libiconv ] ++ extraPropagatedBuildInputs; @@ -124,7 +124,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A cross-platform multimedia library"; homepage = "http://www.libsdl.org/"; maintainers = with maintainers; [ lovek323 ]; diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index 31624bee2fb..92bd85b1e8c 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -1,5 +1,5 @@ -{ stdenv, config, fetchurl, pkgconfig -, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms +{ lib, stdenv, config, fetchurl, pkg-config +, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms , openglSupport ? libGLSupported, libGL , alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsaLib , x11Support ? !stdenv.isCygwin && !stdenv.hostPlatform.isAndroid @@ -21,15 +21,15 @@ # NOTE: When editing this expression see if the same change applies to # SDL expression too -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "SDL2"; - version = "2.0.12"; + version = "2.0.14"; src = fetchurl { url = "https://www.libsdl.org/release/${pname}-${version}.tar.gz"; - sha256 = "0qy8wbqvfkb5ps8kxgaaf2zzpkjqbsw712hlp74znbn0jpv6i4il"; + sha256 = "1g1jahknv5r4yhh1xq5sf0md20ybdw1zh1i15lry26sq39bmn8fq"; }; dontDisableStatic = withStatic; outputs = [ "out" "dev" ]; @@ -47,9 +47,9 @@ stdenv.mkDerivation rec { --replace 'WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`' 'WAYLAND_SCANNER=`pkg-config --variable=wayland_scanner wayland-scanner`' ''; - depsBuildBuild = [ pkgconfig ]; + depsBuildBuild = [ pkg-config ]; - nativeBuildInputs = [ pkgconfig ] ++ optionals waylandSupport [ wayland ]; + nativeBuildInputs = [ pkg-config ] ++ optionals waylandSupport [ wayland ]; propagatedBuildInputs = dlopenPropagatedBuildInputs; @@ -126,7 +126,7 @@ stdenv.mkDerivation rec { passthru = { inherit openglSupport; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A cross-platform multimedia library"; homepage = "http://www.libsdl.org/"; license = licenses.zlib; diff --git a/pkgs/development/libraries/SDL2/find-headers.patch b/pkgs/development/libraries/SDL2/find-headers.patch index 69dde41c7e2..a2e0c483703 100644 --- a/pkgs/development/libraries/SDL2/find-headers.patch +++ b/pkgs/development/libraries/SDL2/find-headers.patch @@ -1,6 +1,6 @@ -diff -ru3 SDL2-2.0.12/sdl2-config.cmake.in SDL2-2.0.12-new/sdl2-config.cmake.in ---- SDL2-2.0.12/sdl2-config.cmake.in 2020-03-11 02:36:18.000000000 +0100 -+++ SDL2-2.0.12-new/sdl2-config.cmake.in 2020-11-11 11:59:05.178703826 +0100 +diff -ru3 SDL2-2.0.14/sdl2-config.cmake.in SDL2-2.0.14-new/sdl2-config.cmake.in +--- SDL2-2.0.14/sdl2-config.cmake.in 2020-12-21 18:44:36.000000000 +0100 ++++ SDL2-2.0.14-new/sdl2-config.cmake.in 2021-01-16 23:53:40.721121792 +0100 @@ -6,7 +6,8 @@ set(SDL2_PREFIX "@prefix@") set(SDL2_EXEC_PREFIX "@prefix@") @@ -18,7 +18,7 @@ diff -ru3 SDL2-2.0.12/sdl2-config.cmake.in SDL2-2.0.12-new/sdl2-config.cmake.in - INTERFACE_INCLUDE_DIRECTORIES "@includedir@/SDL2" + INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIRS}" IMPORTED_LINK_INTERFACE_LANGUAGES "C" - IMPORTED_LOCATION "@libdir@/libSDL2.so" + IMPORTED_LOCATION "@libdir@/${CMAKE_SHARED_LIBRARY_PREFIX}SDL2${CMAKE_SHARED_LIBRARY_SUFFIX}" INTERFACE_LINK_LIBRARIES "${SDL2_EXTRA_LINK_FLAGS}") add_library(SDL2::SDL2-static STATIC IMPORTED) @@ -26,12 +26,11 @@ diff -ru3 SDL2-2.0.12/sdl2-config.cmake.in SDL2-2.0.12-new/sdl2-config.cmake.in - INTERFACE_INCLUDE_DIRECTORIES "@includedir@/SDL2" + INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIRS}" IMPORTED_LINK_INTERFACE_LANGUAGES "C" - IMPORTED_LOCATION "@libdir@/libSDL2.a" + IMPORTED_LOCATION "@libdir@/${CMAKE_STATIC_LIBRARY_PREFIX}SDL2${CMAKE_STATIC_LIBRARY_SUFFIX}" INTERFACE_LINK_LIBRARIES "${SDL2_EXTRA_LINK_FLAGS_STATIC}") -Només a SDL2-2.0.12-new/: sdl2-config.cmake.in.orig -diff -ru3 SDL2-2.0.12/sdl2-config.in SDL2-2.0.12-new/sdl2-config.in ---- SDL2-2.0.12/sdl2-config.in 2020-03-11 02:36:18.000000000 +0100 -+++ SDL2-2.0.12-new/sdl2-config.in 2020-11-11 11:56:26.432955479 +0100 +diff -ru3 SDL2-2.0.14/sdl2-config.in SDL2-2.0.14-new/sdl2-config.in +--- SDL2-2.0.14/sdl2-config.in 2020-12-21 18:44:36.000000000 +0100 ++++ SDL2-2.0.14-new/sdl2-config.in 2021-01-16 23:57:11.940353171 +0100 @@ -42,7 +42,11 @@ echo @SDL_VERSION@ ;; diff --git a/pkgs/development/libraries/SDL2_gfx/default.nix b/pkgs/development/libraries/SDL2_gfx/default.nix index 1ed56c6750f..2da2189b1a8 100644 --- a/pkgs/development/libraries/SDL2_gfx/default.nix +++ b/pkgs/development/libraries/SDL2_gfx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, darwin, fetchurl, SDL2 }: +{ lib, stdenv, darwin, fetchurl, SDL2 }: stdenv.mkDerivation rec { pname = "SDL2_gfx"; @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { }; buildInputs = [ SDL2 ] - ++ stdenv.lib.optional stdenv.isDarwin darwin.libobjc; + ++ lib.optional stdenv.isDarwin darwin.libobjc; configureFlags = [(if stdenv.isi686 || stdenv.isx86_64 then "--enable-mmx" else "--disable-mmx")] - ++ stdenv.lib.optional stdenv.isDarwin "--disable-sdltest"; + ++ lib.optional stdenv.isDarwin "--disable-sdltest"; - meta = with stdenv.lib; { + meta = with lib; { description = "SDL graphics drawing primitives and support functions"; longDescription = '' diff --git a/pkgs/development/libraries/SDL2_image/default.nix b/pkgs/development/libraries/SDL2_image/default.nix index 00de774ba6e..96f85ddb0ea 100644 --- a/pkgs/development/libraries/SDL2_image/default.nix +++ b/pkgs/development/libraries/SDL2_image/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL2, libpng, libjpeg, libtiff, libungif, libwebp, libXpm, zlib, Foundation }: +{ lib, stdenv, fetchurl, SDL2, libpng, libjpeg, libtiff, libungif, libwebp, libXpm, zlib, Foundation }: stdenv.mkDerivation rec { pname = "SDL2_image"; @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { }; buildInputs = [ SDL2 libpng libjpeg libtiff libungif libwebp libXpm zlib ] - ++ stdenv.lib.optional stdenv.isDarwin Foundation; + ++ lib.optional stdenv.isDarwin Foundation; - configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-sdltest"; + configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "SDL image library"; homepage = "http://www.libsdl.org/projects/SDL_image/"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/SDL2_mixer/default.nix b/pkgs/development/libraries/SDL2_mixer/default.nix index af0da7dc627..7e1d097ba5c 100644 --- a/pkgs/development/libraries/SDL2_mixer/default.nix +++ b/pkgs/development/libraries/SDL2_mixer/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , pkg-config , AudioToolbox @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.isDarwin [ AudioToolbox AudioUnit CoreServices @@ -51,12 +51,12 @@ stdenv.mkDerivation rec { "--disable-music-mp3-mpg123-shared" "--disable-music-opus-shared" "--disable-music-midi-fluidsynth-shared" - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ "--disable-sdltest" "--disable-smpegtest" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "SDL multi-channel audio mixer library"; platforms = platforms.unix; homepage = "https://www.libsdl.org/projects/SDL_mixer/"; diff --git a/pkgs/development/libraries/SDL2_net/default.nix b/pkgs/development/libraries/SDL2_net/default.nix index 0bec12cdb24..fe6cb9445a3 100644 --- a/pkgs/development/libraries/SDL2_net/default.nix +++ b/pkgs/development/libraries/SDL2_net/default.nix @@ -1,4 +1,4 @@ -{ stdenv, darwin, fetchurl, SDL2 }: +{ lib, stdenv, darwin, fetchurl, SDL2 }: stdenv.mkDerivation rec { pname = "SDL2_net"; @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { sha256 = "08cxc1bicmyk89kiks7izw1rlx5ng5n6xpy8fy0zxni3b9z8mkhm"; }; - buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.libobjc; + buildInputs = lib.optional stdenv.isDarwin darwin.libobjc; - configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-sdltest"; + configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; propagatedBuildInputs = [ SDL2 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "SDL multiplatform networking library"; homepage = "https://www.libsdl.org/projects/SDL_net"; license = licenses.zlib; diff --git a/pkgs/development/libraries/SDL2_ttf/default.nix b/pkgs/development/libraries/SDL2_ttf/default.nix index 571c953a81b..e23b3fb9215 100644 --- a/pkgs/development/libraries/SDL2_ttf/default.nix +++ b/pkgs/development/libraries/SDL2_ttf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, darwin, fetchurl, SDL2, freetype, libGL }: +{ lib, stdenv, darwin, fetchurl, SDL2, freetype, libGL }: stdenv.mkDerivation rec { pname = "SDL2_ttf"; @@ -9,12 +9,12 @@ stdenv.mkDerivation rec { sha256 = "0cyd48dipc0m399qy8s03lci8b0bpiy8xlkvrm2ia7wcv0dfpv59"; }; - configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-sdltest"; + configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; buildInputs = [ SDL2 freetype libGL ] - ++ stdenv.lib.optional stdenv.isDarwin darwin.libobjc; + ++ lib.optional stdenv.isDarwin darwin.libobjc; - meta = with stdenv.lib; { + meta = with lib; { description = "SDL TrueType library"; platforms = platforms.unix; license = licenses.zlib; diff --git a/pkgs/development/libraries/SDL_Pango/default.nix b/pkgs/development/libraries/SDL_Pango/default.nix index 9340b9f7091..83afeaf2d67 100644 --- a/pkgs/development/libraries/SDL_Pango/default.nix +++ b/pkgs/development/libraries/SDL_Pango/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchpatch, fetchurl, SDL, autoreconfHook, pango, pkgconfig }: +{ lib, stdenv, fetchpatch, fetchurl, SDL, autoreconfHook, pango, pkg-config }: stdenv.mkDerivation rec { pname = "SDL_Pango"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "197baw1dsg0p4pljs5k0fshbyki00r4l49m1drlpqw6ggawx6xbz"; }; - patches = [ + patches = [ (fetchpatch { url = "https://sources.debian.org/data/main/s/sdlpango/0.1.2-6/debian/patches/api_additions.patch"; sha256 = "00p5ry5gd3ixm257p9i2c4jg0qj8ipk8nf56l7c9fma8id3zxyld"; @@ -19,10 +19,10 @@ stdenv.mkDerivation rec { preConfigure = "autoreconf -i -f"; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ SDL pango ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Connects the Pango rendering engine to SDL"; license = licenses.lgpl21Plus; platforms = platforms.all; diff --git a/pkgs/development/libraries/SDL_gfx/default.nix b/pkgs/development/libraries/SDL_gfx/default.nix index 3696e485ad7..f5a3d863553 100644 --- a/pkgs/development/libraries/SDL_gfx/default.nix +++ b/pkgs/development/libraries/SDL_gfx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL }: +{ lib, stdenv, fetchurl, SDL }: stdenv.mkDerivation rec { pname = "SDL_gfx"; @@ -12,28 +12,28 @@ stdenv.mkDerivation rec { buildInputs = [ SDL ] ; configureFlags = [ "--disable-mmx" ] - ++ stdenv.lib.optional stdenv.isDarwin "--disable-sdltest"; + ++ lib.optional stdenv.isDarwin "--disable-sdltest"; - meta = with stdenv.lib; { + meta = with lib; { description = "SDL graphics drawing primitives and support functions"; - longDescription = - '' The SDL_gfx library evolved out of the SDL_gfxPrimitives code - which provided basic drawing routines such as lines, circles or - polygons and SDL_rotozoom which implemented a interpolating - rotozoomer for SDL surfaces. + longDescription = '' + The SDL_gfx library evolved out of the SDL_gfxPrimitives code + which provided basic drawing routines such as lines, circles or + polygons and SDL_rotozoom which implemented a interpolating + rotozoomer for SDL surfaces. - The current components of the SDL_gfx library are: + The current components of the SDL_gfx library are: - * Graphic Primitives (SDL_gfxPrimitves.h) - * Rotozoomer (SDL_rotozoom.h) - * Framerate control (SDL_framerate.h) - * MMX image filters (SDL_imageFilter.h) - * Custom Blit functions (SDL_gfxBlitFunc.h) + * Graphic Primitives (SDL_gfxPrimitves.h) + * Rotozoomer (SDL_rotozoom.h) + * Framerate control (SDL_framerate.h) + * MMX image filters (SDL_imageFilter.h) + * Custom Blit functions (SDL_gfxBlitFunc.h) - The library is backwards compatible to the above mentioned - code. Its is written in plain C and can be used in C++ code. - ''; + The library is backwards compatible to the above mentioned + code. Its is written in plain C and can be used in C++ code. + ''; homepage = "https://sourceforge.net/projects/sdlgfx/"; license = licenses.zlib; diff --git a/pkgs/development/libraries/SDL_gpu/default.nix b/pkgs/development/libraries/SDL_gpu/default.nix index f15009c2f5d..dc52e6afeea 100644 --- a/pkgs/development/libraries/SDL_gpu/default.nix +++ b/pkgs/development/libraries/SDL_gpu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, SDL2, libGLU }: +{ lib, stdenv, fetchFromGitHub, cmake, SDL2, libGLU }: stdenv.mkDerivation { pname = "SDL_gpu-unstable"; @@ -26,7 +26,7 @@ stdenv.mkDerivation { sed -ie '213s#''${OUTPUT_DIR}/lib#''${CMAKE_INSTALL_LIBDIR}#' src/CMakeLists.txt ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A library for high-performance, modern 2D graphics with SDL written in C"; homepage = "https://github.com/grimfang4/sdl-gpu"; license = licenses.mit; diff --git a/pkgs/development/libraries/SDL_image/default.nix b/pkgs/development/libraries/SDL_image/default.nix index 968fc3d38af..2e5841b3f48 100644 --- a/pkgs/development/libraries/SDL_image/default.nix +++ b/pkgs/development/libraries/SDL_image/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, SDL, libpng, libjpeg, libtiff, libungif, libXpm }: +{ lib, stdenv, fetchurl, fetchpatch, SDL, libpng, libjpeg, libtiff, libungif, libXpm }: stdenv.mkDerivation rec { pname = "SDL_image"; @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { "--disable-jpg-shared" "--disable-png-shared" "--disable-tif-shared" - ] ++ stdenv.lib.optional stdenv.isDarwin "--disable-sdltest"; + ] ++ lib.optional stdenv.isDarwin "--disable-sdltest"; buildInputs = [ SDL libpng libjpeg libtiff libungif libXpm ]; - meta = with stdenv.lib; { + meta = with lib; { description = "SDL image library"; homepage = "http://www.libsdl.org/projects/SDL_image/"; maintainers = with maintainers; [ lovek323 ]; diff --git a/pkgs/development/libraries/SDL_mixer/default.nix b/pkgs/development/libraries/SDL_mixer/default.nix index e52273052b5..291e9790e44 100644 --- a/pkgs/development/libraries/SDL_mixer/default.nix +++ b/pkgs/development/libraries/SDL_mixer/default.nix @@ -1,4 +1,8 @@ -{ stdenv, lib, fetchurl, SDL, libogg, libvorbis, smpeg, enableNativeMidi ? false, fluidsynth ? null }: +{ stdenv, lib, fetchurl +, SDL, libogg, libvorbis, smpeg, libmikmod +, fluidsynth +, enableNativeMidi ? false +}: stdenv.mkDerivation rec { pname = "SDL_mixer"; @@ -9,13 +13,13 @@ stdenv.mkDerivation rec { sha256 = "0alrhqgm40p4c92s26mimg9cm1y7rzr6m0p49687jxd9g6130i0n"; }; - buildInputs = [ SDL libogg libvorbis fluidsynth smpeg ]; + buildInputs = [ SDL libogg libvorbis fluidsynth smpeg libmikmod ]; - configureFlags = [ "--disable-music-ogg-shared" ] + configureFlags = [ "--disable-music-ogg-shared" "--disable-music-mod-shared" ] ++ lib.optional enableNativeMidi " --enable-music-native-midi-gpl" ++ lib.optionals stdenv.isDarwin [ "--disable-sdltest" "--disable-smpegtest" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "SDL multi-channel audio mixer library"; homepage = "http://www.libsdl.org/projects/SDL_mixer/"; maintainers = with maintainers; [ lovek323 ]; diff --git a/pkgs/development/libraries/SDL_net/default.nix b/pkgs/development/libraries/SDL_net/default.nix index a24020da015..f55332a0ee0 100644 --- a/pkgs/development/libraries/SDL_net/default.nix +++ b/pkgs/development/libraries/SDL_net/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL }: +{ lib, stdenv, fetchurl, SDL }: stdenv.mkDerivation rec { pname = "SDL_net"; @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { sha256 = "1d5c9xqlf4s1c01gzv6cxmg0r621pq9kfgxcg3197xw4p25pljjz"; }; - configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-sdltest"; + configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; propagatedBuildInputs = [ SDL ]; - meta = with stdenv.lib; { + meta = with lib; { description = "SDL networking library"; platforms = platforms.unix; license = licenses.zlib; diff --git a/pkgs/development/libraries/SDL_sixel/default.nix b/pkgs/development/libraries/SDL_sixel/default.nix index 8d37124d311..1bc4c8ba35c 100644 --- a/pkgs/development/libraries/SDL_sixel/default.nix +++ b/pkgs/development/libraries/SDL_sixel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, libsixel }: +{ lib, stdenv, fetchFromGitHub, pkg-config, libsixel }: stdenv.mkDerivation { pname = "SDL_sixel"; @@ -13,10 +13,10 @@ stdenv.mkDerivation { configureFlags = [ "--enable-video-sixel" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsixel ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A cross-platform multimedia library, that supports sixel graphics on consoles"; homepage = "https://github.com/saitoha/SDL1.2-SIXEL"; maintainers = with maintainers; [ vrthra ]; diff --git a/pkgs/development/libraries/SDL_stretch/default.nix b/pkgs/development/libraries/SDL_stretch/default.nix index 1f068c9e976..e6318b84859 100644 --- a/pkgs/development/libraries/SDL_stretch/default.nix +++ b/pkgs/development/libraries/SDL_stretch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL }: +{ lib, stdenv, fetchurl, SDL }: stdenv.mkDerivation rec { pname = "SDL_stretch"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ SDL ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Stretch Functions For SDL"; homepage = "http://sdl-stretch.sourceforge.net/"; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/SDL_ttf/default.nix b/pkgs/development/libraries/SDL_ttf/default.nix index cd6355c9ce2..5d353e3a6c0 100644 --- a/pkgs/development/libraries/SDL_ttf/default.nix +++ b/pkgs/development/libraries/SDL_ttf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, SDL, freetype }: +{ lib, stdenv, fetchurl, fetchpatch, SDL, freetype }: stdenv.mkDerivation rec { pname = "SDL_ttf"; @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { buildInputs = [ SDL freetype ]; - configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-sdltest"; + configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; - meta = with stdenv.lib; { + meta = with lib; { description = "SDL TrueType library"; license = licenses.zlib; platforms = platforms.all; diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/pkgs/development/libraries/Xaw3d/default.nix index d26a910638e..88501ca1ee6 100644 --- a/pkgs/development/libraries/Xaw3d/default.nix +++ b/pkgs/development/libraries/Xaw3d/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl -, imake, gccmakedep, bison, flex, pkgconfig +{ lib, stdenv, fetchurl +, imake, gccmakedep, bison, flex, pkg-config , xlibsWrapper, libXmu, libXpm, libXp }: stdenv.mkDerivation { @@ -9,13 +9,13 @@ stdenv.mkDerivation { sha256 = "0i653s8g25cc0mimkwid9366bqkbyhdyjhckx7bw77j20hzrkfid"; }; dontUseImakeConfigure = true; - nativeBuildInputs = [ pkgconfig bison flex imake gccmakedep ]; + nativeBuildInputs = [ pkg-config bison flex imake gccmakedep ]; buildInputs = [ libXpm libXp ]; propagatedBuildInputs = [ xlibsWrapper libXmu ]; - meta = with stdenv.lib; { + meta = with lib; { description = "3D widget set based on the Athena Widget set"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; license = licenses.mit; }; } diff --git a/pkgs/development/libraries/a52dec/default.nix b/pkgs/development/libraries/a52dec/default.nix index 7cbb3699401..faa819ec561 100644 --- a/pkgs/development/libraries/a52dec/default.nix +++ b/pkgs/development/libraries/a52dec/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { pname = "a52dec"; @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { # fails 1 out of 1 tests with "BAD GLOBAL SYMBOLS" on i686 # which can also be fixed with - # hardeningDisable = stdenv.lib.optional stdenv.isi686 "pic"; + # hardeningDisable = lib.optional stdenv.isi686 "pic"; # but it's better to disable tests than loose ASLR on i686 doCheck = !stdenv.isi686; - meta = with stdenv.lib; { + meta = with lib; { description = "ATSC A/52 stream decoder"; homepage = "https://liba52.sourceforge.net/"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/aalib/default.nix b/pkgs/development/libraries/aalib/default.nix index 94453264419..b007e71ce44 100644 --- a/pkgs/development/libraries/aalib/default.nix +++ b/pkgs/development/libraries/aalib/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ncurses, automake}: +{lib, stdenv, fetchurl, ncurses, automake}: stdenv.mkDerivation { name = "aalib-1.4rc5"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { outputs = [ "bin" "dev" "out" "man" "info" ]; setOutputFlags = false; # Doesn't support all the flags - patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin.patch ]; + patches = lib.optionals stdenv.isDarwin [ ./darwin.patch ]; # The fuloong2f is not supported by aalib still preConfigure = '' @@ -35,7 +35,7 @@ stdenv.mkDerivation { meta = { description = "ASCII art graphics library"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.lgpl2; + platforms = lib.platforms.unix; + license = lib.licenses.lgpl2; }; } diff --git a/pkgs/development/libraries/abseil-cpp/default.nix b/pkgs/development/libraries/abseil-cpp/default.nix index 45e73410d28..95d1b873edd 100644 --- a/pkgs/development/libraries/abseil-cpp/default.nix +++ b/pkgs/development/libraries/abseil-cpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "abseil-cpp"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An open-source collection of C++ code designed to augment the C++ standard library"; homepage = "https://abseil.io/"; license = licenses.asl20; diff --git a/pkgs/development/libraries/accounts-qt/default.nix b/pkgs/development/libraries/accounts-qt/default.nix index 4e2e33b852e..dcfe4a4ef27 100644 --- a/pkgs/development/libraries/accounts-qt/default.nix +++ b/pkgs/development/libraries/accounts-qt/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkgconfig, qmake }: +{ mkDerivation, lib, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkg-config, qmake }: mkDerivation rec { pname = "accounts-qt"; @@ -12,7 +12,7 @@ mkDerivation rec { }; propagatedBuildInputs = [ glib libaccounts-glib ]; - nativeBuildInputs = [ doxygen pkgconfig qmake ]; + nativeBuildInputs = [ doxygen pkg-config qmake ]; # Hack to avoid TMPDIR in RPATHs. preFixup = ''rm -rf "$(pwd)" ''; diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix index 6bd76c62b97..f87a0bbe68b 100644 --- a/pkgs/development/libraries/accountsservice/default.nix +++ b/pkgs/development/libraries/accountsservice/default.nix @@ -1,8 +1,8 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , substituteAll -, pkgconfig +, pkg-config , glib , shadow , gobject-introspection @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { gobject-introspection meson ninja - pkgconfig + pkg-config python3 ]; @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { }) ]; - meta = with stdenv.lib; { + meta = with lib; { description = "D-Bus interface for user account query and manipulation"; homepage = "https://www.freedesktop.org/wiki/Software/AccountsService"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix index 49c8e14a74f..85df0b43353 100644 --- a/pkgs/development/libraries/ace/default.nix +++ b/pkgs/development/libraries/ace/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libtool, perl }: +{ lib, stdenv, fetchurl, pkg-config, libtool, perl }: stdenv.mkDerivation rec { pname = "ace"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig libtool ]; + nativeBuildInputs = [ pkg-config libtool ]; buildInputs = [ perl ]; NIX_CFLAGS_COMPILE = [ @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { > include/makeinclude/platform_macros.GNU ''; - meta = with stdenv.lib; { + meta = with lib; { description = "ADAPTIVE Communication Environment"; homepage = "http://www.dre.vanderbilt.edu/~schmidt/ACE.html"; license = licenses.doc; diff --git a/pkgs/development/libraries/acl/default.nix b/pkgs/development/libraries/acl/default.nix index 6e863e4eeba..2161ad9e59c 100644 --- a/pkgs/development/libraries/acl/default.nix +++ b/pkgs/development/libraries/acl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gettext, attr }: +{ lib, stdenv, fetchurl, gettext, attr }: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { patchShebangs . ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://savannah.nongnu.org/projects/acl"; description = "Library and tools for manipulating access control lists"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/afflib/default.nix b/pkgs/development/libraries/afflib/default.nix index 030ff73f97f..b89683ac053 100644 --- a/pkgs/development/libraries/afflib/default.nix +++ b/pkgs/development/libraries/afflib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, zlib, curl, expat, fuse, openssl +{ lib, stdenv, fetchFromGitHub, zlib, curl, expat, fuse, openssl , autoreconfHook, python3 }: @@ -15,14 +15,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ zlib curl expat openssl python3 ] - ++ stdenv.lib.optionals stdenv.isLinux [ fuse ]; + ++ lib.optionals stdenv.isLinux [ fuse ]; meta = { homepage = "http://afflib.sourceforge.net/"; description = "Advanced forensic format library"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.bsdOriginal; - maintainers = [ stdenv.lib.maintainers.raskin ]; + platforms = lib.platforms.unix; + license = lib.licenses.bsdOriginal; + maintainers = [ lib.maintainers.raskin ]; inherit version; downloadPage = "https://github.com/sshock/AFFLIBv3/tags"; }; diff --git a/pkgs/development/libraries/aften/default.nix b/pkgs/development/libraries/aften/default.nix index a1d4c225909..1ae5ffb17ad 100644 --- a/pkgs/development/libraries/aften/default.nix +++ b/pkgs/development/libraries/aften/default.nix @@ -1,21 +1,21 @@ -{ stdenv, fetchurl, cmake }: +{ lib, stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { - pname = "aften"; - version = "0.0.8"; - src = fetchurl { - url = "mirror://sourceforge/aften/${pname}-${version}.tar.bz2"; - sha256 = "02hc5x9vkgng1v9bzvza9985ifrjd7fjr7nlpvazp4mv6dr89k47"; - }; + pname = "aften"; + version = "0.0.8"; + src = fetchurl { + url = "mirror://sourceforge/aften/${pname}-${version}.tar.bz2"; + sha256 = "02hc5x9vkgng1v9bzvza9985ifrjd7fjr7nlpvazp4mv6dr89k47"; + }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; - cmakeFlags = [ "-DSHARED=ON" ]; + cmakeFlags = [ "-DSHARED=ON" ]; - meta = { - description = "An audio encoder which generates compressed audio streams based on ATSC A/52 specification"; - homepage = "http://aften.sourceforge.net/"; - license = stdenv.lib.licenses.lgpl2; - platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; - }; + meta = { + description = "An audio encoder which generates compressed audio streams based on ATSC A/52 specification"; + homepage = "http://aften.sourceforge.net/"; + license = lib.licenses.lgpl2; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; + }; } diff --git a/pkgs/development/libraries/agda/agda-prelude/default.nix b/pkgs/development/libraries/agda/agda-prelude/default.nix index f13cc698236..21883acd195 100644 --- a/pkgs/development/libraries/agda/agda-prelude/default.nix +++ b/pkgs/development/libraries/agda/agda-prelude/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub }: +{ lib, mkDerivation, fetchFromGitHub }: mkDerivation rec { version = "compat-2.6.1"; @@ -18,11 +18,11 @@ mkDerivation rec { cd .. ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/UlfNorell/agda-prelude"; description = "Programming library for Agda"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.mit; + platforms = lib.platforms.unix; maintainers = with maintainers; [ mudri alexarice turion ]; }; } diff --git a/pkgs/development/libraries/agda/functional-linear-algebra/default.nix b/pkgs/development/libraries/agda/functional-linear-algebra/default.nix index dbcdaac532e..ce4deb5b519 100644 --- a/pkgs/development/libraries/agda/functional-linear-algebra/default.nix +++ b/pkgs/development/libraries/agda/functional-linear-algebra/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, stdenv, mkDerivation, standard-library }: +{ fetchFromGitHub, lib, mkDerivation, standard-library }: mkDerivation rec { version = "0.1"; @@ -13,7 +13,7 @@ mkDerivation rec { sha256 = "09ri3jmgp9jjwi1mzv4c3w6rvcmyx6spa2qxpwlcn0f4bmfva6wm"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/ryanorendorff/functional-linear-algebra"; description = '' Formalizing linear algebra in Agda by representing matrices as functions diff --git a/pkgs/development/libraries/agda/iowa-stdlib/default.nix b/pkgs/development/libraries/agda/iowa-stdlib/default.nix index 55cd6a742e5..1383cff9e55 100644 --- a/pkgs/development/libraries/agda/iowa-stdlib/default.nix +++ b/pkgs/development/libraries/agda/iowa-stdlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub }: +{ lib, mkDerivation, fetchFromGitHub }: mkDerivation (rec { version = "1.5.0"; @@ -22,10 +22,10 @@ mkDerivation (rec { meta = { homepage = "https://github.com/cedille/ial"; description = "Agda standard library developed at Iowa"; - license = stdenv.lib.licenses.free; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.free; + platforms = lib.platforms.unix; # broken since Agda 2.6.1 broken = true; - maintainers = with stdenv.lib.maintainers; [ alexarice turion ]; + maintainers = with lib.maintainers; [ alexarice turion ]; }; }) diff --git a/pkgs/development/libraries/agda/standard-library/default.nix b/pkgs/development/libraries/agda/standard-library/default.nix index e43e1bad3b6..c0b0287d897 100644 --- a/pkgs/development/libraries/agda/standard-library/default.nix +++ b/pkgs/development/libraries/agda/standard-library/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub, ghcWithPackages }: +{ lib, mkDerivation, fetchFromGitHub, ghcWithPackages }: mkDerivation rec { pname = "standard-library"; @@ -16,11 +16,11 @@ mkDerivation rec { runhaskell GenerateEverything.hs ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.portal.chalmers.se/agda/pmwiki.php?n=Libraries.StandardLibrary"; description = "A standard library for use with the Agda compiler"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.mit; + platforms = lib.platforms.unix; maintainers = with maintainers; [ jwiegley mudri alexarice turion ]; }; } diff --git a/pkgs/development/libraries/agg/default.nix b/pkgs/development/libraries/agg/default.nix index d65ff369064..89585d908da 100644 --- a/pkgs/development/libraries/agg/default.nix +++ b/pkgs/development/libraries/agg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig +{ lib, stdenv, fetchurl, autoconf, automake, libtool, pkg-config , freetype, SDL, libX11 }: stdenv.mkDerivation rec { @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { url = "http://www.antigrain.com/${name}.tar.gz"; sha256 = "07wii4i824vy9qsvjsgqxppgqmfdxq0xa87i5yk53fijriadq7mb"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoconf automake libtool freetype SDL libX11 ]; postPatch = '' @@ -40,8 +40,8 @@ stdenv.mkDerivation rec { of course, AGG can do much more than that. ''; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; homepage = "http://www.antigrain.com/"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix index db22f463df0..cdcf4b7b8a4 100644 --- a/pkgs/development/libraries/alembic/default.nix +++ b/pkgs/development/libraries/alembic/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, unzip, cmake, openexr, hdf5-threadsafe }: +{ lib, stdenv, fetchFromGitHub, unzip, cmake, openexr, hdf5-threadsafe }: stdenv.mkDerivation rec { @@ -34,7 +34,7 @@ stdenv.mkDerivation rec mv $out/include $dev/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An open framework for storing and sharing scene data"; homepage = "http://alembic.io/"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/alkimia/default.nix b/pkgs/development/libraries/alkimia/default.nix index d7d8c268928..18c40c5b5fb 100644 --- a/pkgs/development/libraries/alkimia/default.nix +++ b/pkgs/development/libraries/alkimia/default.nix @@ -5,11 +5,11 @@ mkDerivation rec { pname = "alkimia"; - version = "8.0.2"; + version = "8.0.4"; src = fetchurl { url = "mirror://kde/stable/alkimia/${version}/${pname}-${version}.tar.xz"; - sha256 = "0al5k9irmg9gsjc234qxjsqfzgzsavl18pspqk78mkp8zlv7fvv1"; + sha256 = "sha256-AASnBo3/CqLLb0f3DSHBKQc74R8u2yHxRRK8RHBIfR8="; }; nativeBuildInputs = [ extra-cmake-modules doxygen graphviz ]; diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index fd612170910..ca1446dd935 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchFromGitHub, fetchpatch, texinfo, libXext, xorgproto, libX11 +{ lib, stdenv, fetchFromGitHub, fetchpatch, texinfo, libXext, xorgproto, libX11 , libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis , libXxf86dga, libXxf86misc , libXxf86vm, openal, libGLU, libGL, libjpeg, flac , libXi, libXfixes, freetype, libopus, libtheora -, physfs, enet, pkgconfig, gtk2, pcre, libpulseaudio, libpthreadstubs +, physfs, enet, pkg-config, gtk2, pcre, libpulseaudio, libpthreadstubs , libXdmcp }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { libXxf86vm openal libGLU libGL libjpeg flac libXi libXfixes - enet libtheora freetype physfs libopus pkgconfig gtk2 pcre libXdmcp + enet libtheora freetype physfs libopus pkg-config gtk2 pcre libXdmcp libpulseaudio libpthreadstubs ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_SKIP_RPATH=ON" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A game programming library"; homepage = "https://liballeg.org/"; license = licenses.zlib; diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix index 99d75225036..9fefbe01ace 100644 --- a/pkgs/development/libraries/allegro/default.nix +++ b/pkgs/development/libraries/allegro/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, texinfo6_5, libXext, xorgproto, libX11 +{ lib, stdenv, fetchurl, texinfo6_5, libXext, xorgproto, libX11 , libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis , libXxf86dga, libXxf86misc , libXxf86vm, openal, libGLU, libGL }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_SKIP_RPATH=ON" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A game programming library"; homepage = "https://liballeg.org/"; license = licenses.free; # giftware diff --git a/pkgs/development/libraries/alure/default.nix b/pkgs/development/libraries/alure/default.nix index 1f4dafeb362..9ff83dcec40 100644 --- a/pkgs/development/libraries/alure/default.nix +++ b/pkgs/development/libraries/alure/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, openal }: +{ lib, stdenv, fetchurl, cmake, openal }: stdenv.mkDerivation rec { pname = "alure"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ openal ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A utility library to help manage common tasks with OpenAL applications"; homepage = "https://kcat.strangesoft.net/alure.html"; license = licenses.mit; diff --git a/pkgs/development/libraries/alure2/default.nix b/pkgs/development/libraries/alure2/default.nix index 6da95a77264..fa42c4fd53a 100644 --- a/pkgs/development/libraries/alure2/default.nix +++ b/pkgs/development/libraries/alure2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, openal, libvorbis, opusfile, libsndfile }: +{ lib, stdenv, fetchFromGitHub, cmake, openal, libvorbis, opusfile, libsndfile }: stdenv.mkDerivation rec { pname = "alure2"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ openal libvorbis opusfile libsndfile ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A utility library for OpenAL, providing a C++ API and managing common tasks that include file loading, caching, and streaming"; homepage = "https://github.com/kcat/alure"; license = licenses.zlib; diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix index f6859c94364..7141849a5e5 100644 --- a/pkgs/development/libraries/amdvlk/default.nix +++ b/pkgs/development/libraries/amdvlk/default.nix @@ -5,7 +5,7 @@ , ninja , patchelf , perl -, pkgconfig +, pkg-config , python3 , expat , libdrm @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { pname = "amdvlk"; - version = "2020.Q4.6"; + version = "2021.Q1.2"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "wminJxfku8Myag+SI7iLSvS+VzHlUd4c86BbpF/cr1w="; + sha256 = "+oAetAHJ530e3IFPJDQiQn5vbUKeI1z0oF3Gy6mRVGM="; }; buildInputs = [ @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { ninja patchelf perl - pkgconfig + pkg-config python3 ]; @@ -66,7 +66,7 @@ in stdenv.mkDerivation rec { cmakeDir = "../drivers/xgl"; # LTO is disabled in gcc for i686 as of #66528 - cmakeFlags = stdenv.lib.optionals stdenv.is32bit ["-DXGL_ENABLE_LTO=OFF"]; + cmakeFlags = lib.optionals stdenv.is32bit ["-DXGL_ENABLE_LTO=OFF"]; installPhase = '' install -Dm755 -t $out/lib icd/amdvlk${suffix}.so @@ -83,7 +83,7 @@ in stdenv.mkDerivation rec { # Keep the rpath, otherwise vulkaninfo and vkcube segfault dontPatchELF = true; - meta = with stdenv.lib; { + meta = with lib; { description = "AMD Open Source Driver For Vulkan"; homepage = "https://github.com/GPUOpen-Drivers/AMDVLK"; changelog = "https://github.com/GPUOpen-Drivers/AMDVLK/releases/tag/v-${version}"; diff --git a/pkgs/development/libraries/aml/default.nix b/pkgs/development/libraries/aml/default.nix index 8b4eccb9fff..899dafde76f 100644 --- a/pkgs/development/libraries/aml/default.nix +++ b/pkgs/development/libraries/aml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, pkg-config, ninja }: +{ lib, stdenv, fetchFromGitHub, meson, pkg-config, ninja }: stdenv.mkDerivation rec { pname = "aml"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson pkg-config ninja ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Another main loop"; inherit (src.meta) homepage; license = licenses.isc; diff --git a/pkgs/development/libraries/amrnb/default.nix b/pkgs/development/libraries/amrnb/default.nix index aaee86c62ef..b226c9e36d2 100644 --- a/pkgs/development/libraries/amrnb/default.nix +++ b/pkgs/development/libraries/amrnb/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip}: +{lib, stdenv, fetchurl, unzip}: stdenv.mkDerivation { name = "amrnb-11.0.0.0"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { configureFlags = [ "--cache-file=config.cache" "--with-downloader=true" ]; postConfigure = '' - cp $srcAmr 26104-b00.zip + cp $srcAmr 26104-b00.zip ''; meta = { @@ -26,6 +26,6 @@ stdenv.mkDerivation { # The wrapper code is free, but not the libraries from 3gpp. # It's a source code reference implementation with patents and licenses on # some countries, not redistributable. - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; }; } diff --git a/pkgs/development/libraries/amrwb/default.nix b/pkgs/development/libraries/amrwb/default.nix index e6581d54911..776065b28bc 100644 --- a/pkgs/development/libraries/amrwb/default.nix +++ b/pkgs/development/libraries/amrwb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { pname = "amrwb"; @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { # The wrapper code is free, but not the libraries from 3gpp. # It's a source code reference implementation with patents and licenses on # some countries, not redistributable. - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; }; } diff --git a/pkgs/development/libraries/amtk/default.nix b/pkgs/development/libraries/amtk/default.nix index e514b8b5c31..f144f847bcf 100644 --- a/pkgs/development/libraries/amtk/default.nix +++ b/pkgs/development/libraries/amtk/default.nix @@ -1,7 +1,7 @@ -{ stdenv +{ lib, stdenv , fetchurl , gtk3 -, pkgconfig +, pkg-config , gobject-introspection , gnome3 , dbus @@ -13,12 +13,12 @@ stdenv.mkDerivation rec { version = "5.2.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0y3hmmflw4i0y0yb9a8rlihbv3cbwnvdcf1n5jycwzpq9jxla1c2"; }; nativeBuildInputs = [ - pkgconfig + pkg-config dbus gobject-introspection ]; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { passthru.updateScript = gnome3.updateScript { packageName = pname; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Projects/Amtk"; description = "Actions, Menus and Toolbars Kit for GTK applications"; maintainers = [ maintainers.manveru ]; diff --git a/pkgs/development/libraries/apache-activemq/default.nix b/pkgs/development/libraries/apache-activemq/default.nix index 8490541546b..976387d49eb 100644 --- a/pkgs/development/libraries/apache-activemq/default.nix +++ b/pkgs/development/libraries/apache-activemq/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "apache-activemq"; @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://activemq.apache.org/"; description = "Messaging and Integration Patterns server written in Java"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix index 8e77f6aa34e..1cd9fb2c8b7 100644 --- a/pkgs/development/libraries/appstream-glib/default.nix +++ b/pkgs/development/libraries/appstream-glib/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , substituteAll , docbook_xml_dtd_42 @@ -19,7 +19,7 @@ , libxslt , meson , ninja -, pkgconfig +, pkg-config , pngquant }: stdenv.mkDerivation rec { @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "hughsie"; repo = "appstream-glib"; - rev = stdenv.lib.replaceStrings [ "." "-" ] [ "_" "_" ] name; + rev = lib.replaceStrings [ "." "-" ] [ "_" "_" ] name; sha256 = "12s7d3nqjs1fldnppbg2mkjg4280f3h8yzj3q1hiz3chh1w0vjbx"; }; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { libxslt meson ninja - pkgconfig + pkg-config ]; buildInputs = [ @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { moveToOutput "share/installed-tests" "$installedTests" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Objects and helper methods to read and write AppStream metadata"; homepage = "https://people.freedesktop.org/~hughsient/appstream-glib/"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix index 820e7383246..1e3c2bcd2eb 100644 --- a/pkgs/development/libraries/appstream/default.nix +++ b/pkgs/development/libraries/appstream/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, gettext +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, gettext , xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt , libstemmer, glib, xapian, libxml2, libyaml, gobject-introspection , pcre, itstool, gperf, vala, lmdb, libsoup @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - meson ninja pkgconfig gettext + meson ninja pkg-config gettext libxslt xmlto docbook_xsl docbook_xml_dtd_45 gobject-introspection itstool vala ]; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { "-Dvapi=true" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Software metadata handling library"; homepage = "https://www.freedesktop.org/wiki/Distributions/AppStream/"; longDescription = '' diff --git a/pkgs/development/libraries/appstream/qt.nix b/pkgs/development/libraries/appstream/qt.nix index c9fc96b3251..9ae1cce684a 100644 --- a/pkgs/development/libraries/appstream/qt.nix +++ b/pkgs/development/libraries/appstream/qt.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, appstream, qtbase, qttools }: +{ mkDerivation, appstream, qtbase, qttools }: # TODO: look into using the libraries from the regular appstream derivation as we keep duplicates here diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index ba12e2d0385..51e9271b7d7 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, apr, expat, gnused +{ lib, stdenv, fetchurl, makeWrapper, apr, expat, gnused , sslSupport ? true, openssl , bdbSupport ? true, db , ldapSupport ? !stdenv.isCygwin, openldap @@ -10,7 +10,7 @@ assert sslSupport -> openssl != null; assert bdbSupport -> db != null; assert ldapSupport -> openldap != null; -with stdenv.lib; +with lib; stdenv.mkDerivation rec { name = "apr-util-1.6.1"; @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { inherit sslSupport bdbSupport ldapSupport; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://apr.apache.org/"; description = "A companion library to APR, the Apache Portable Runtime"; maintainers = [ maintainers.eelco ]; diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix index ce33c0534fa..c7a1073d137 100644 --- a/pkgs/development/libraries/apr/default.nix +++ b/pkgs/development/libraries/apr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "apr-1.7.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1spp6r2a3xcl5yajm9safhzyilsdzgagc2dadif8x6z9nbq4iqg2"; }; - patches = stdenv.lib.optionals stdenv.isDarwin [ ./is-this-a-compiler-bug.patch ]; + patches = lib.optionals stdenv.isDarwin [ ./is-this-a-compiler-bug.patch ]; # This test needs the net postPatch = '' @@ -23,22 +23,22 @@ stdenv.mkDerivation rec { configureFlagsArray+=("--with-installbuilddir=$dev/share/build") ''; - configureFlags = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ + configureFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ "ac_cv_file__dev_zero=yes" "ac_cv_func_setpgrp_void=0" "apr_cv_process_shared_works=1" "apr_cv_tcp_nodelay_with_cork=1" - ] ++ stdenv.lib.optionals (stdenv.hostPlatform.system == "i686-cygwin") [ + ] ++ lib.optionals (stdenv.hostPlatform.system == "i686-cygwin") [ # Including the Windows headers breaks unistd.h. # Based on ftp://sourceware.org/pub/cygwin/release/libapr1/libapr1-1.3.8-2-src.tar.bz2 "ac_cv_header_windows_h=no" ]; - CPPFLAGS=stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-DAPR_IOVEC_DEFINED"; + CPPFLAGS=lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-DAPR_IOVEC_DEFINED"; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://apr.apache.org/"; description = "The Apache Portable Runtime library"; platforms = platforms.all; diff --git a/pkgs/development/libraries/aqbanking/default.nix b/pkgs/development/libraries/aqbanking/default.nix index 37bc175fede..1e11661b009 100644 --- a/pkgs/development/libraries/aqbanking/default.nix +++ b/pkgs/development/libraries/aqbanking/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, gmp, gwenhywfar, libtool, libxml2, libxslt -, pkgconfig, gettext, xmlsec, zlib +{ lib, stdenv, fetchurl, gmp, gwenhywfar, libtool, libxml2, libxslt +, pkg-config, gettext, xmlsec, zlib }: let @@ -25,9 +25,9 @@ in stdenv.mkDerivation rec { buildInputs = [ gmp gwenhywfar libtool libxml2 libxslt xmlsec zlib ]; - nativeBuildInputs = [ pkgconfig gettext ]; + nativeBuildInputs = [ pkg-config gettext ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An interface to banking tasks, file formats and country information"; homepage = "https://www.aquamaniac.de/"; hydraPlatforms = []; diff --git a/pkgs/development/libraries/aqbanking/gwenhywfar.nix b/pkgs/development/libraries/aqbanking/gwenhywfar.nix index 4c5192574d8..073ad3254a0 100644 --- a/pkgs/development/libraries/aqbanking/gwenhywfar.nix +++ b/pkgs/development/libraries/aqbanking/gwenhywfar.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gnutls, openssl, libgcrypt, libgpgerror, pkgconfig, gettext +{ lib, stdenv, fetchurl, gnutls, openssl, libgcrypt, libgpgerror, pkg-config, gettext , which # GUI support @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { isRelative = path: builtins.substring 0 1 path != "/"; mkSearchPath = path: '' p; g; s,\<PLUGINDIR\>,"${path}",g; - '' + stdenv.lib.optionalString (isRelative path) '' + '' + lib.optionalString (isRelative path) '' s/AddPath(\(.*\));/AddRelPath(\1, GWEN_PathManager_RelModeHome);/g ''; @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { sed -i -e '/GWEN_PathManager_DefinePath.*GWEN_PM_PLUGINDIR/,/^#endif/ { /^#if/,/^#endif/ { H; /^#endif/ { - ${stdenv.lib.concatMapStrings mkSearchPath pluginSearchPaths} + ${lib.concatMapStrings mkSearchPath pluginSearchPaths} } } }' src/gwenhywfar.c @@ -53,11 +53,13 @@ in stdenv.mkDerivation rec { configure ''; - nativeBuildInputs = [ pkgconfig gettext which ]; + nativeBuildInputs = [ pkg-config gettext which ]; buildInputs = [ gtk2 gtk3 qt5.qtbase gnutls openssl libgcrypt libgpgerror ]; - meta = with stdenv.lib; { + dontWrapQtApps = true; + + meta = with lib; { description = "OS abstraction functions used by aqbanking and related tools"; homepage = "http://www2.aquamaniac.de/sites/download/packages.php?package=01&showall=1"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/aqbanking/libchipcard.nix b/pkgs/development/libraries/aqbanking/libchipcard.nix index 0e01480a4bd..f483f232e37 100644 --- a/pkgs/development/libraries/aqbanking/libchipcard.nix +++ b/pkgs/development/libraries/aqbanking/libchipcard.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gwenhywfar, pcsclite, zlib }: +{ lib, stdenv, fetchurl, pkg-config, gwenhywfar, pcsclite, zlib }: let inherit ((import ./sources.nix).libchipcard) sha256 releaseId version; @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { inherit sha256; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gwenhywfar pcsclite zlib ]; @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { configureFlags = [ "--with-gwen-dir=${gwenhywfar}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for access to chipcards"; homepage = "https://www.aquamaniac.de/rdm/projects/libchipcard"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/aravis/default.nix b/pkgs/development/libraries/aravis/default.nix index 40a96553fbe..a915723e2ca 100644 --- a/pkgs/development/libraries/aravis/default.nix +++ b/pkgs/development/libraries/aravis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-doc, intltool +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gtk-doc, intltool , audit, glib, libusb1, libxml2 , wrapGAppsHook , gstreamer ? null @@ -19,11 +19,11 @@ let gstreamerAtLeastVersion1 = - stdenv.lib.all - (pkg: pkg != null && stdenv.lib.versionAtLeast (stdenv.lib.getVersion pkg) "1.0") + lib.all + (pkg: pkg != null && lib.versionAtLeast (lib.getVersion pkg) "1.0") [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]; in - assert enableGstPlugin -> stdenv.lib.all (pkg: pkg != null) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]; + assert enableGstPlugin -> lib.all (pkg: pkg != null) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]; assert enableViewer -> enableGstPlugin; assert enableViewer -> libnotify != null; assert enableViewer -> gnome3 != null; @@ -46,29 +46,29 @@ in nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config intltool gtk-doc - ] ++ stdenv.lib.optional enableViewer wrapGAppsHook; + ] ++ lib.optional enableViewer wrapGAppsHook; buildInputs = [ glib libxml2 ] - ++ stdenv.lib.optional enableUsb libusb1 - ++ stdenv.lib.optional enablePacketSocket audit - ++ stdenv.lib.optionals (enableViewer || enableGstPlugin) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ] - ++ stdenv.lib.optionals (enableViewer) [ libnotify gtk3 gnome3.adwaita-icon-theme ]; + ++ lib.optional enableUsb libusb1 + ++ lib.optional enablePacketSocket audit + ++ lib.optionals (enableViewer || enableGstPlugin) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ] + ++ lib.optionals (enableViewer) [ libnotify gtk3 gnome3.adwaita-icon-theme ]; - preAutoreconf = ''./autogen.sh''; + preAutoreconf = "./autogen.sh"; configureFlags = - stdenv.lib.optional enableUsb "--enable-usb" - ++ stdenv.lib.optional enablePacketSocket "--enable-packet-socket" - ++ stdenv.lib.optional enableViewer "--enable-viewer" - ++ stdenv.lib.optional enableGstPlugin + lib.optional enableUsb "--enable-usb" + ++ lib.optional enablePacketSocket "--enable-packet-socket" + ++ lib.optional enableViewer "--enable-viewer" + ++ lib.optional enableGstPlugin (if gstreamerAtLeastVersion1 then "--enable-gst-plugin" else "--enable-gst-0.10-plugin") - ++ stdenv.lib.optional enableCppTest "--enable-cpp-test" - ++ stdenv.lib.optional enableFastHeartbeat "--enable-fast-heartbeat" - ++ stdenv.lib.optional enableAsan "--enable-asan"; + ++ lib.optional enableCppTest "--enable-cpp-test" + ++ lib.optional enableFastHeartbeat "--enable-fast-heartbeat" + ++ lib.optional enableAsan "--enable-asan"; postPatch = '' ln -s ${gtk-doc}/share/gtk-doc/data/gtk-doc.make . @@ -82,9 +82,9 @@ in Implements the gigabit ethernet and USB3 protocols used by industrial cameras. ''; homepage = "https://aravisproject.github.io/docs/aravis-0.5"; - license = stdenv.lib.licenses.lgpl2; + license = lib.licenses.lgpl2; maintainers = []; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/arb/default.nix b/pkgs/development/libraries/arb/default.nix index a9fb5de0bd9..1c356b59d8a 100644 --- a/pkgs/development/libraries/arb/default.nix +++ b/pkgs/development/libraries/arb/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, mpir, gmp, mpfr, flint}: +{lib, stdenv, fetchFromGitHub, mpir, gmp, mpfr, flint}: stdenv.mkDerivation rec { pname = "arb"; version = "2.17.0"; @@ -16,12 +16,11 @@ stdenv.mkDerivation rec { "--with-flint=${flint}" ]; doCheck = true; - meta = with stdenv.lib; { - inherit version; - description = ''A library for arbitrary-precision interval arithmetic''; - homepage = "http://arblib.org/"; - license = stdenv.lib.licenses.lgpl21Plus; + meta = with lib; { + description = "A library for arbitrary-precision interval arithmetic"; + homepage = "https://arblib.org/"; + license = lib.licenses.lgpl21Plus; maintainers = teams.sage.members; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/argp-standalone/default.nix b/pkgs/development/libraries/argp-standalone/default.nix index f961c577aa7..33b253718a7 100644 --- a/pkgs/development/libraries/argp-standalone/default.nix +++ b/pkgs/development/libraries/argp-standalone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch }: +{ lib, stdenv, fetchurl, fetchpatch }: let patch-argp-fmtstream = fetchpatch { @@ -28,12 +28,12 @@ stdenv.mkDerivation { }; patches = - stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ patch-argp-fmtstream ] - ++ stdenv.lib.optionals stdenv.hostPlatform.isLinux [ patch-throw-in-funcdef patch-shared ]; + lib.optionals stdenv.hostPlatform.isDarwin [ patch-argp-fmtstream ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ patch-throw-in-funcdef patch-shared ]; - patchFlags = stdenv.lib.optional stdenv.hostPlatform.isDarwin "-p0"; + patchFlags = lib.optional stdenv.hostPlatform.isDarwin "-p0"; - preConfigure = stdenv.lib.optionalString stdenv.hostPlatform.isLinux "export CFLAGS='-fgnu89-inline'"; + preConfigure = lib.optionalString stdenv.hostPlatform.isLinux "export CFLAGS='-fgnu89-inline'"; postInstall = '' mkdir -p $out/lib $out/include @@ -47,7 +47,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.lysator.liu.se/~nisse/misc/"; description = "Standalone version of arguments parsing functions from GLIBC"; platforms = with platforms; darwin ++ linux; diff --git a/pkgs/development/libraries/argtable/default.nix b/pkgs/development/libraries/argtable/default.nix index bf953d87fe2..a16885ab254 100644 --- a/pkgs/development/libraries/argtable/default.nix +++ b/pkgs/development/libraries/argtable/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { patchShebangs tools/build ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://argtable.org"; description = "A single-file, ANSI C command-line parsing library"; longDescription = '' diff --git a/pkgs/development/libraries/arguments/default.nix b/pkgs/development/libraries/arguments/default.nix index cb0c65e97e3..85dafde83c2 100644 --- a/pkgs/development/libraries/arguments/default.nix +++ b/pkgs/development/libraries/arguments/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "arguments"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { doCheck = false; # internal_volume_io.h: No such file or directory - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/${owner}/${pname}"; description = "Library for argument handling for MINC programs"; maintainers = with maintainers; [ bcdarwin ]; diff --git a/pkgs/development/libraries/aribb25/default.nix b/pkgs/development/libraries/aribb25/default.nix index ceae8698545..3e171d75797 100644 --- a/pkgs/development/libraries/aribb25/default.nix +++ b/pkgs/development/libraries/aribb25/default.nix @@ -3,7 +3,7 @@ , fetchFromGitLab , fetchpatch , autoreconfHook -, pkgconfig +, pkg-config , pcsclite , PCSC , xcbuild @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config ] ++ lib.optional stdenv.isDarwin xcbuild; buildInputs = if stdenv.isDarwin then [ PCSC ] else [ pcsclite ]; @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { buildFlags = lib.optional stdenv.isDarwin "pcsclite_CFLAGS=-I${PCSC}/Library/Frameworks/PCSC.framework/Headers"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://code.videolan.org/videolan/aribb25"; description = "Sample implementation of the ARIB STD-B25 standard"; platforms = platforms.all; diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index 450182138a4..6696e5720e3 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, cmake, blas, lapack, superlu, hdf5 }: +{ lib, stdenv, fetchurl, cmake, blas, lapack, superlu, hdf5 }: stdenv.mkDerivation rec { pname = "armadillo"; - version = "10.1.2"; + version = "10.2.0"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "0pb3ypdaiiw0895x1zzzjvkrfp39bsl3s4f6zb5bzv4wbjv7kvwn"; + sha256 = "sha256-gvhNUmyNpyJAqwXLErPz8eZ00gzLOOAI5L9TNVsapoo="; }; nativeBuildInputs = [ cmake ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { patches = [ ./use-unix-config-on-OS-X.patch ]; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ linear algebra library"; homepage = "http://arma.sourceforge.net"; license = licenses.asl20; diff --git a/pkgs/development/libraries/arrayfire/default.nix b/pkgs/development/libraries/arrayfire/default.nix index 3e678c8544e..c636d672332 100644 --- a/pkgs/development/libraries/arrayfire/default.nix +++ b/pkgs/development/libraries/arrayfire/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig +{ lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkg-config , opencl-clhpp, ocl-icd, fftw, fftwFloat , blas, lapack, boost, mesa, libGLU, libGL , freeimage, python, clfft, clblas @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { "-DAF_BUILD_OPENCL=OFF" "-DAF_BUILD_EXAMPLES=OFF" "-DBUILD_TESTING=OFF" - ] ++ stdenv.lib.optional cudaSupport "-DCMAKE_LIBRARY_PATH=${cudatoolkit}/lib/stubs"; + ] ++ lib.optional cudaSupport "-DCMAKE_LIBRARY_PATH=${cudatoolkit}/lib/stubs"; patches = [ ./no-download.patch ]; @@ -32,13 +32,13 @@ stdenv.mkDerivation rec { cp -R --no-preserve=mode,ownership ${opencl-clhpp}/include/CL/cl2.hpp ./build/include/CL/cl2.hpp ''; - preBuild = stdenv.lib.optionalString cudaSupport '' + preBuild = lib.optionalString cudaSupport '' export CUDA_PATH="${cudatoolkit}" ''; nativeBuildInputs = [ cmake - pkgconfig + pkg-config python ]; @@ -48,11 +48,11 @@ stdenv.mkDerivation rec { libGLU libGL mesa freeimage boost.out boost.dev - ] ++ (stdenv.lib.optional stdenv.isLinux ocl-icd) - ++ (stdenv.lib.optional cudaSupport cudatoolkit) - ++ (stdenv.lib.optional buildDocs doxygen); + ] ++ (lib.optional stdenv.isLinux ocl-icd) + ++ (lib.optional cudaSupport cudatoolkit) + ++ (lib.optional buildDocs doxygen); - meta = with stdenv.lib; { + meta = with lib; { description = "A general-purpose library for parallel and massively-parallel computations"; longDescription = '' A general-purpose library that simplifies the process of developing software that targets parallel and massively-parallel architectures including CPUs, GPUs, and other hardware acceleration devices."; diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index a9e738f7e9a..8a9074ccb90 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, fetchFromGitHub, fetchpatch, fixDarwinDylibNames , autoconf, boost, brotli, cmake, flatbuffers, gflags, glog, gtest, lz4 -, perl, python3, rapidjson, snappy, thrift, utf8proc, which, zlib, zstd +, perl, python3, rapidjson, re2, snappy, thrift, utf8proc, which, zlib, zstd , enableShared ? !stdenv.hostPlatform.isStatic }: @@ -8,25 +8,25 @@ let arrow-testing = fetchFromGitHub { owner = "apache"; repo = "arrow-testing"; - rev = "860376d4e586a3ac34ec93089889da624ead6c2a"; - sha256 = "16k3lz4ji4y3qcjhr765q14jwwlac8iqscwndwd8ll3zr0vy69b0"; + rev = "d6c4deb22c4b4e9e3247a2f291046e3c671ad235"; + sha256 = "0cwhnqijam632zp07j98i8ym967wz6kd35fim1msv88x2rhqky1i"; }; parquet-testing = fetchFromGitHub { owner = "apache"; repo = "parquet-testing"; - rev = "d914f9d289488c7db1759d7a88a4a1b8f062c7dd"; - sha256 = "0xj3ynck2wv6l70xnmvs13bz1jycqjrl5k4lwhhwgag338048als"; + rev = "e31fe1a02c9e9f271e4bfb8002d403c52f1ef8eb"; + sha256 = "02f51dvx8w5mw0bx3hn70hkn55mn1m65kzdps1ifvga9hghpy0sh"; }; in stdenv.mkDerivation rec { pname = "arrow-cpp"; - version = "2.0.0"; + version = "3.0.0"; src = fetchurl { url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; - sha256 = "1ghzqw0rx4rxa2d7i76y3szisv0bd9cl7vzadbc41cvvhk6440xy"; + sha256 = "0yp2b02wrc3s50zd56fmpz4nhhbihp0zw329v4zizaipwlxwrhkk"; }; sourceRoot = "apache-arrow-${version}/cpp"; @@ -67,6 +67,7 @@ in stdenv.mkDerivation rec { gtest lz4 rapidjson + re2 snappy thrift utf8proc @@ -115,6 +116,15 @@ in stdenv.mkDerivation rec { if doInstallCheck then "${arrow-testing}/data" else null; PARQUET_TEST_DATA = if doInstallCheck then "${parquet-testing}/data" else null; + GTEST_FILTER = + if doInstallCheck then let + # Upstream Issue: https://issues.apache.org/jira/browse/ARROW-11398 + filteredTests = lib.optionals stdenv.hostPlatform.isAarch64 [ + "TestFilterKernelWithNumeric/3.CompareArrayAndFilterRandomNumeric" + "TestFilterKernelWithNumeric/7.CompareArrayAndFilterRandomNumeric" + "TestCompareKernel.PrimitiveRandomTests" + ]; + in "-${builtins.concatStringsSep ":" filteredTests}" else null; installCheckInputs = [ perl which ]; installCheckPhase = let diff --git a/pkgs/development/libraries/asio/generic.nix b/pkgs/development/libraries/asio/generic.nix index d83a48e61b8..8bcc12ae2b3 100644 --- a/pkgs/development/libraries/asio/generic.nix +++ b/pkgs/development/libraries/asio/generic.nix @@ -1,8 +1,8 @@ -{stdenv, fetchurl, boost, openssl +{lib, stdenv, fetchurl, boost, openssl , version, sha256, ... }: -with stdenv.lib; +with lib; stdenv.mkDerivation { pname = "asio"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { homepage = "http://asio.sourceforge.net/"; description = "Cross-platform C++ library for network and low-level I/O programming"; license = licenses.boost; - broken = stdenv.isDarwin && stdenv.lib.versionOlder version "1.16.1"; + broken = stdenv.isDarwin && lib.versionOlder version "1.16.1"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/aspell/default.nix b/pkgs/development/libraries/aspell/default.nix index 68faef7e786..01acced98f6 100644 --- a/pkgs/development/libraries/aspell/default.nix +++ b/pkgs/development/libraries/aspell/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, fetchzip, perl +{ lib, stdenv, fetchurl, fetchpatch, fetchzip, perl , searchNixProfiles ? true }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { sha256 = "1wi60ankalmh8ds7nplz434jd7j94gdvbahdwsr539rlad8pxdzr"; }; - patches = stdenv.lib.optional searchNixProfiles ./data-dirs-from-nix-profiles.patch; + patches = lib.optional searchNixProfiles ./data-dirs-from-nix-profiles.patch; postPatch = '' patch interfaces/cc/aspell.h < ${./clang.patch} @@ -51,8 +51,8 @@ stdenv.mkDerivation rec { meta = { description = "Spell checker for many languages"; homepage = "http://aspell.net/"; - license = stdenv.lib.licenses.lgpl2Plus; + license = lib.licenses.lgpl2Plus; maintainers = [ ]; - platforms = with stdenv.lib.platforms; all; + platforms = with lib.platforms; all; }; } diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix index d40f4b5aae4..3923416c4a3 100644 --- a/pkgs/development/libraries/aspell/dictionaries.nix +++ b/pkgs/development/libraries/aspell/dictionaries.nix @@ -49,7 +49,7 @@ let meta = { description = "Aspell dictionary for ${fullName}"; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; } // (args.meta or {}); } // removeAttrs args [ "meta" ]); diff --git a/pkgs/development/libraries/assimp/default.nix b/pkgs/development/libraries/assimp/default.nix index 9c5b75999f1..a2cd3a2a457 100644 --- a/pkgs/development/libraries/assimp/default.nix +++ b/pkgs/development/libraries/assimp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, boost, zlib }: +{ lib, stdenv, fetchFromGitHub, cmake, boost, zlib }: stdenv.mkDerivation rec { pname = "assimp"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ boost zlib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A library to import various 3D model formats"; homepage = "http://assimp.sourceforge.net/"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix index 04f8c266131..1e5a1d3fd64 100644 --- a/pkgs/development/libraries/at-spi2-atk/default.nix +++ b/pkgs/development/libraries/at-spi2-atk/default.nix @@ -1,9 +1,9 @@ -{ stdenv +{ lib, stdenv , fetchurl , meson , ninja -, pkgconfig +, pkg-config , at-spi2-core , atk @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { version = "2.38.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "z6AIpa+CKzauYofxgYLEDJHdaZxV+qOGBYge0XXKRk8="; }; - nativeBuildInputs = [ meson ninja pkgconfig ]; + nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ at-spi2-core atk dbus glib libxml2 ]; doCheck = false; # fails with "No test data file provided" @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "D-Bus bridge for Assistive Technology Service Provider Interface (AT-SPI) and Accessibility Toolkit (ATK)"; homepage = "https://gitlab.gnome.org/GNOME/at-spi2-atk"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index ba77020ec70..7e1181cf3bd 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -1,9 +1,9 @@ -{ stdenv +{ lib, stdenv , fetchurl , meson , ninja -, pkgconfig +, pkg-config , gobject-introspection , gsettings-desktop-schemas , makeWrapper @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { version = "2.38.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "hONsP+ZoYhM/X+Ipdyt2qiUm4Q3lAUo3ePL6Rs5VDaU="; }; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection makeWrapper ]; + nativeBuildInputs = [ meson ninja pkg-config gobject-introspection makeWrapper ]; buildInputs = [ libX11 libXtst libXi ]; # In atspi-2.pc dbus-1 glib-2.0 propagatedBuildInputs = [ dbus glib ]; @@ -51,11 +51,11 @@ stdenv.mkDerivation rec { postFixup = '' # Cannot use wrapGAppsHook'due to a dependency cycle wrapProgram $out/libexec/at-spi-bus-launcher \ - --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Assistive Technology Service Provider Interface protocol definitions and daemon for D-Bus"; homepage = "https://gitlab.gnome.org/GNOME/at-spi2-core"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix index aa132515b3e..53eb4459770 100644 --- a/pkgs/development/libraries/atk/default.nix +++ b/pkgs/development/libraries/atk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, gettext, pkgconfig, glib +{ lib, stdenv, fetchurl, meson, ninja, gettext, pkg-config, glib , fixDarwinDylibNames, gobject-introspection, gnome3 }: @@ -11,14 +11,14 @@ 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}/${lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "1217cmmykjgkkim0zr1lv5j13733m4w5vipmy4ivw0ll6rz28xpv"; }; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection glib ] - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ meson ninja pkg-config gettext gobject-introspection glib ] + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; propagatedBuildInputs = [ # Required by atk.pc @@ -52,10 +52,10 @@ stdenv.mkDerivation rec { homepage = "http://library.gnome.org/devel/atk/"; - license = stdenv.lib.licenses.lgpl2Plus; + license = lib.licenses.lgpl2Plus; - maintainers = with stdenv.lib.maintainers; [ raskin ]; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + maintainers = with lib.maintainers; [ raskin ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/development/libraries/atkmm/default.nix b/pkgs/development/libraries/atkmm/default.nix index cc45dc5a8d8..e9c63eb650f 100644 --- a/pkgs/development/libraries/atkmm/default.nix +++ b/pkgs/development/libraries/atkmm/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, atk, glibmm, pkgconfig, gnome3 }: +{ lib, stdenv, fetchurl, atk, glibmm, pkg-config, gnome3 }: stdenv.mkDerivation rec { pname = "atkmm"; version = "2.28.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0fnxrspxkhhbrjphqrpvl3zjm66n50s4cywrrrwkhbflgy8zqk2c"; }; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ atk glibmm ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; doCheck = true; @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { meta = { description = "C++ wrappers for ATK accessibility toolkit"; - license = stdenv.lib.licenses.lgpl21Plus; + license = lib.licenses.lgpl21Plus; homepage = "https://gtkmm.org"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/attr/default.nix b/pkgs/development/libraries/attr/default.nix index d69d475f737..b7c9287b68b 100644 --- a/pkgs/development/libraries/attr/default.nix +++ b/pkgs/development/libraries/attr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gettext }: +{ lib, stdenv, fetchurl, gettext }: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://savannah.nongnu.org/projects/attr/"; description = "Library and tools for manipulating extended attributes"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix index bd1d86520c0..7aa4859ef0e 100644 --- a/pkgs/development/libraries/aubio/default.nix +++ b/pkgs/development/libraries/aubio/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, alsaLib, fftw, libjack2, libsamplerate -, libsndfile, pkgconfig, python, wafHook +{ lib, stdenv, fetchurl, alsaLib, fftw, libjack2, libsamplerate +, libsndfile, pkg-config, python, wafHook }: stdenv.mkDerivation rec { @@ -10,10 +10,10 @@ stdenv.mkDerivation rec { sha256 = "1npks71ljc48w6858l9bq30kaf5nph8z0v61jkfb70xb9np850nl"; }; - nativeBuildInputs = [ pkgconfig python wafHook ]; + nativeBuildInputs = [ pkg-config python wafHook ]; buildInputs = [ alsaLib fftw libjack2 libsamplerate libsndfile ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for audio labelling"; homepage = "https://aubio.org/"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/audiality2/default.nix b/pkgs/development/libraries/audiality2/default.nix index a311c5f5479..e0ab0accdfd 100644 --- a/pkgs/development/libraries/audiality2/default.nix +++ b/pkgs/development/libraries/audiality2/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , pkg-config @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { jack2 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A realtime scripted modular audio engine for video games and musical applications"; homepage = "http://audiality.org"; license = licenses.zlib; diff --git a/pkgs/development/libraries/audio/jamomacore/default.nix b/pkgs/development/libraries/audio/jamomacore/default.nix deleted file mode 100644 index c08b25fea37..00000000000 --- a/pkgs/development/libraries/audio/jamomacore/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchFromGitHub, pkg-config, alsaLib, portaudio, portmidi, libsndfile, cmake, libxml2 }: - -stdenv.mkDerivation rec { - version = "1.0-beta.1"; - pname = "JamomaCore"; - - src = fetchFromGitHub { - owner = "jamoma"; - repo = "JamomaCore"; - rev = "v${version}"; - sha256 = "1hb9b6qc18rsvzvixgllknn756m6zwcn22c79rdibbyz1bhrcnln"; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ alsaLib portaudio portmidi libsndfile libxml2 ]; - - meta = { - description = "A C++ platform for building dynamic and reflexive systems with an emphasis on audio and media"; - homepage = "http://www.jamoma.org"; - license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.linux; - broken = true; # 2018-04-10 - }; -} diff --git a/pkgs/development/libraries/audio/libbass/default.nix b/pkgs/development/libraries/audio/libbass/default.nix index 593854bb280..2e10dbd8815 100644 --- a/pkgs/development/libraries/audio/libbass/default.nix +++ b/pkgs/development/libraries/audio/libbass/default.nix @@ -1,4 +1,4 @@ -{ stdenv, unzip, fetchurl }: +{ lib, stdenv, unzip, fetchurl }: # Upstream changes files in-place, to update: # 1. Check latest version at http://www.un4seen.com/ @@ -55,7 +55,7 @@ let install -m644 -t $out/include/ ${bass.h} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Shareware audio library"; homepage = "https://www.un4seen.com/"; license = licenses.unfreeRedistributable; @@ -63,4 +63,4 @@ let }; }; -in stdenv.lib.mapAttrs dropBass allBass +in lib.mapAttrs dropBass allBass diff --git a/pkgs/development/libraries/audio/libbs2b/default.nix b/pkgs/development/libraries/audio/libbs2b/default.nix index bc98dab4ab6..11135b14fd4 100644 --- a/pkgs/development/libraries/audio/libbs2b/default.nix +++ b/pkgs/development/libraries/audio/libbs2b/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libsndfile }: +{ lib, stdenv, fetchurl, pkg-config, libsndfile }: stdenv.mkDerivation rec { pname = "libbs2b"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0vz442kkjn2h0dlxppzi4m5zx8qfyrivq581n06xzvnyxi5rg6a7"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsndfile ]; hardeningDisable = [ "format" ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://bs2b.sourceforge.net/"; description = "Bauer stereophonic-to-binaural DSP library"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.mit; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/audio/libgme/default.nix b/pkgs/development/libraries/audio/libgme/default.nix index d70b6cfbde8..927bd00656e 100644 --- a/pkgs/development/libraries/audio/libgme/default.nix +++ b/pkgs/development/libraries/audio/libgme/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchFromBitbucket, cmake, removeReferencesTo }: +{ lib, stdenv, fetchFromBitbucket, cmake, removeReferencesTo }: let version = "0.6.3"; in stdenv.mkDerivation { pname = "libgme"; inherit version; - meta = with stdenv.lib; { + meta = with lib; { description = "A collection of video game music chip emulators"; homepage = "https://bitbucket.org/mpyne/game-music-emu/overview"; license = licenses.lgpl21; @@ -26,7 +26,7 @@ in stdenv.mkDerivation { # it doesn't. disallowedReferences = [ stdenv.cc.cc ]; - postFixup = stdenv.lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.isLinux '' remove-references-to -t ${stdenv.cc.cc} "$(readlink -f $out/lib/libgme.so)" ''; } diff --git a/pkgs/development/libraries/audio/libinstpatch/default.nix b/pkgs/development/libraries/audio/libinstpatch/default.nix index 3968794d2dc..29781446c8f 100644 --- a/pkgs/development/libraries/audio/libinstpatch/default.nix +++ b/pkgs/development/libraries/audio/libinstpatch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkg-config, glib, libsndfile }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, glib, libsndfile }: stdenv.mkDerivation rec { pname = "libinstpatch"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { "-DLIB_SUFFIX=" # Install in $out/lib. ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.swamiproject.org/"; description = "MIDI instrument patch files support library"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/audio/libmysofa/default.nix b/pkgs/development/libraries/audio/libmysofa/default.nix index c2b2725c19c..9c636e0205d 100644 --- a/pkgs/development/libraries/audio/libmysofa/default.nix +++ b/pkgs/development/libraries/audio/libmysofa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, zlib }: +{ lib, stdenv, fetchFromGitHub, cmake, zlib }: stdenv.mkDerivation rec { pname = "libmysofa"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_TESTS=OFF" "-DCODE_COVERAGE=OFF" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Reader for AES SOFA files to get better HRTFs"; homepage = "https://github.com/hoene/libmysofa"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/audio/libsmf/default.nix b/pkgs/development/libraries/audio/libsmf/default.nix index d521b7e76ab..0c173a6a99e 100644 --- a/pkgs/development/libraries/audio/libsmf/default.nix +++ b/pkgs/development/libraries/audio/libsmf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, glib, pkgconfig }: +{ lib, stdenv, fetchurl, autoreconfHook, glib, pkg-config }: stdenv.mkDerivation rec { version = "1.3"; @@ -8,10 +8,10 @@ stdenv.mkDerivation rec { sha256 = "1527pcc1vd0l5iks2yw8m0bymcrnih2md5465lwpzw0wgy4rky7n"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ glib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A C library for reading and writing Standard MIDI Files"; homepage = "https://github.com/stump/libsmf"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix index e8008058626..79f09f48464 100644 --- a/pkgs/development/libraries/audio/lilv/default.nix +++ b/pkgs/development/libraries/audio/lilv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lv2, pkgconfig, python3, serd, sord, sratom, wafHook }: +{ lib, stdenv, fetchurl, lv2, pkg-config, python3, serd, sord, sratom, wafHook }: stdenv.mkDerivation rec { pname = "lilv"; @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { patches = [ ./lilv-pkgconfig.patch ]; - nativeBuildInputs = [ pkgconfig python3 wafHook ]; + nativeBuildInputs = [ pkg-config python3 wafHook ]; buildInputs = [ serd sord sratom ]; propagatedBuildInputs = [ lv2 ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://drobilla.net/software/lilv"; description = "A C library to make the use of LV2 plugins"; license = licenses.mit; diff --git a/pkgs/development/libraries/audio/lv2/default.nix b/pkgs/development/libraries/audio/lv2/default.nix index dac98584646..45caf0b36c5 100644 --- a/pkgs/development/libraries/audio/lv2/default.nix +++ b/pkgs/development/libraries/audio/lv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk2, libsndfile, pkgconfig, python3, wafHook }: +{ lib, stdenv, fetchurl, gtk2, libsndfile, pkg-config, python3, wafHook }: stdenv.mkDerivation rec { pname = "lv2"; @@ -9,12 +9,12 @@ stdenv.mkDerivation rec { sha256 = "0gs7401xz23q9vajqr31aa2db8dvssgyh5zrvr4ipa6wig7yb8wh"; }; - nativeBuildInputs = [ pkgconfig wafHook ]; + nativeBuildInputs = [ pkg-config wafHook ]; buildInputs = [ gtk2 libsndfile python3 ]; - wafConfigureFlags = stdenv.lib.optionals stdenv.isDarwin [ "--lv2dir=${placeholder "out"}/lib/lv2" ]; + wafConfigureFlags = lib.optionals stdenv.isDarwin [ "--lv2dir=${placeholder "out"}/lib/lv2" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://lv2plug.in"; description = "A plugin standard for audio systems"; license = licenses.mit; diff --git a/pkgs/development/libraries/audio/lvtk/default.nix b/pkgs/development/libraries/audio/lvtk/default.nix index 6bc487e2616..cecae743da0 100644 --- a/pkgs/development/libraries/audio/lvtk/default.nix +++ b/pkgs/development/libraries/audio/lvtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, gtkmm2, lv2, pkgconfig, python, wafHook }: +{ lib, stdenv, fetchurl, boost, gtkmm2, lv2, pkg-config, python, wafHook }: stdenv.mkDerivation rec { pname = "lvtk"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "03nbj2cqcklqwh50zj2gwm07crh5iwqbpxbpzwbg5hvgl4k4rnjd"; }; - nativeBuildInputs = [ pkgconfig python wafHook ]; + nativeBuildInputs = [ pkg-config python wafHook ]; buildInputs = [ boost gtkmm2 lv2 ]; enableParallelBuilding = true; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { "--boost-libs=${boost.out}/lib" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A set C++ wrappers around the LV2 C API"; homepage = "https://lvtk.org/"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/audio/mbelib/default.nix b/pkgs/development/libraries/audio/mbelib/default.nix index 993bbcd09c1..f13f6d7063c 100644 --- a/pkgs/development/libraries/audio/mbelib/default.nix +++ b/pkgs/development/libraries/audio/mbelib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "mbelib"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD ''; - meta = with stdenv.lib; { + meta = with lib; { description = "P25 Phase 1 and ProVoice vocoder"; homepage = https://github.com/szechyjs/mbelib; license = licenses.isc; diff --git a/pkgs/development/libraries/audio/ntk/default.nix b/pkgs/development/libraries/audio/ntk/default.nix index f039e574d54..ecb0215a228 100644 --- a/pkgs/development/libraries/audio/ntk/default.nix +++ b/pkgs/development/libraries/audio/ntk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cairo, libjpeg, libXft, pkgconfig, python2, wafHook }: +{ lib, stdenv, fetchFromGitHub, cairo, libjpeg, libXft, pkg-config, python2, wafHook }: stdenv.mkDerivation rec { pname = "ntk"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0j38mhnfqy6swcrnc5zxcwlqi8b1pgklyghxk6qs1lf4japv2zc0"; }; - nativeBuildInputs = [ pkgconfig wafHook ]; + nativeBuildInputs = [ pkg-config wafHook ]; buildInputs = [ cairo libjpeg libXft python2 ]; @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { description = "Fork of FLTK 1.3.0 with additional functionality"; version = version; homepage = "http://non.tuxfamily.org/"; - license = stdenv.lib.licenses.lgpl21; - maintainers = with stdenv.lib.maintainers; [ magnetophon nico202 ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.lgpl21; + maintainers = with lib.maintainers; [ magnetophon nico202 ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/audio/qm-dsp/default.nix b/pkgs/development/libraries/audio/qm-dsp/default.nix index a93b031a4d1..3d8e15f97cd 100644 --- a/pkgs/development/libraries/audio/qm-dsp/default.nix +++ b/pkgs/development/libraries/audio/qm-dsp/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch , kissfft @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${kissfft}/include/kissfft"; - meta = with stdenv.lib; { + meta = with lib; { description = "A C++ library of functions for DSP and Music Informatics purposes"; homepage = "https://code.soundsoftware.ac.uk/projects/qm-dsp"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/audio/raul/default.nix b/pkgs/development/libraries/audio/raul/default.nix index 8acd6d3c666..a0089e31044 100644 --- a/pkgs/development/libraries/audio/raul/default.nix +++ b/pkgs/development/libraries/audio/raul/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, boost, gtk2, pkgconfig, python, wafHook }: +{ lib, stdenv, fetchgit, boost, gtk2, pkg-config, python, wafHook }: stdenv.mkDerivation rec { pname = "raul"; @@ -12,10 +12,10 @@ stdenv.mkDerivation rec { sha256 = "1z37jb6ghc13b8nv8a8hcg669gl8vh4ni9djvfgga9vcz8rmcg8l"; }; - nativeBuildInputs = [ pkgconfig wafHook ]; + nativeBuildInputs = [ pkg-config wafHook ]; buildInputs = [ boost gtk2 python ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A C++ utility library primarily aimed at audio/musical applications"; homepage = "http://drobilla.net/software/raul"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/audio/rtaudio/default.nix b/pkgs/development/libraries/audio/rtaudio/default.nix index 53efa598079..820ea1e49b9 100644 --- a/pkgs/development/libraries/audio/rtaudio/default.nix +++ b/pkgs/development/libraries/audio/rtaudio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, libjack2, alsaLib, pulseaudio, rtmidi }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, libjack2, alsaLib, pulseaudio, rtmidi }: stdenv.mkDerivation rec { version = "5.1.0"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ./configure ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A set of C++ classes that provide a cross platform API for realtime audio input/output"; homepage = "http://www.music.mcgill.ca/~gary/rtaudio/"; license = licenses.mit; diff --git a/pkgs/development/libraries/audio/rtmidi/default.nix b/pkgs/development/libraries/audio/rtmidi/default.nix index d30b1ce6c64..f6208bab6c6 100644 --- a/pkgs/development/libraries/audio/rtmidi/default.nix +++ b/pkgs/development/libraries/audio/rtmidi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, libjack2, alsaLib, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, libjack2, alsaLib, pkg-config }: stdenv.mkDerivation rec { version = "4.0.0"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoconf automake libtool libjack2 alsaLib ]; preConfigure = '' @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { meta = { description = "A set of C++ classes that provide a cross platform API for realtime MIDI input/output"; homepage = "http://www.music.mcgill.ca/~gary/rtmidi/"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.magnetophon ]; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/audio/sratom/default.nix b/pkgs/development/libraries/audio/sratom/default.nix index cec50290d09..464e79f6c2d 100644 --- a/pkgs/development/libraries/audio/sratom/default.nix +++ b/pkgs/development/libraries/audio/sratom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lv2, pkgconfig, python3, serd, sord, wafHook }: +{ lib, stdenv, fetchurl, lv2, pkg-config, python3, serd, sord, wafHook }: stdenv.mkDerivation rec { pname = "sratom"; @@ -9,10 +9,10 @@ stdenv.mkDerivation rec { sha256 = "0vh0biy3ngpzzgdml309c2mqz8xq9q0hlblczb4c6alhp0a8yv0l"; }; - nativeBuildInputs = [ pkgconfig wafHook python3 ]; + nativeBuildInputs = [ pkg-config wafHook python3 ]; buildInputs = [ lv2 serd sord ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://drobilla.net/software/sratom"; description = "A library for serialising LV2 atoms to/from RDF"; license = licenses.mit; diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix index c2496840b7d..56008ae8dd6 100644 --- a/pkgs/development/libraries/audio/suil/default.nix +++ b/pkgs/development/libraries/audio/suil/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, gtk2, lv2, pkgconfig, python, serd, sord, sratom +{ stdenv, lib, fetchurl, gtk2, lv2, pkg-config, python, serd, sord, sratom , wafHook , withQt4 ? true, qt4 ? null , withQt5 ? false, qt5 ? null }: @@ -17,12 +17,14 @@ stdenv.mkDerivation rec { sha256 = "0z4v01pjw4wh65x38w6icn28wdwxz13ayl8hvn4p1g9kmamp1z06"; }; - nativeBuildInputs = [ pkgconfig wafHook ]; + nativeBuildInputs = [ pkg-config wafHook ]; buildInputs = [ gtk2 lv2 python serd sord sratom ] ++ (lib.optionals withQt4 [ qt4 ]) ++ (lib.optionals withQt5 (with qt5; [ qtbase qttools ])); - meta = with stdenv.lib; { + dontWrapQtApps = true; + + meta = with lib; { homepage = "http://drobilla.net/software/suil"; description = "A lightweight C library for loading and wrapping LV2 plugin UIs"; license = licenses.mit; diff --git a/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix b/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix index 0e49a626512..4d033d99d29 100644 --- a/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix +++ b/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix @@ -1,7 +1,7 @@ # set VAMP_PATH ? # plugins availible on sourceforge and http://www.vamp-plugins.org/download.html (various licenses) -{ stdenv, fetchFromGitHub, pkgconfig, libsndfile }: +{ lib, stdenv, fetchFromGitHub, pkg-config, libsndfile }: stdenv.mkDerivation rec { pname = "vamp-plugin-sdk"; @@ -14,12 +14,12 @@ stdenv.mkDerivation rec { sha256 = "1lhmskcyk7qqfikmasiw7wjry74gc8g5q6a3j1iya84yd7ll0cz6"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsndfile ]; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Audio processing plugin system for plugins that extract descriptive information from audio data"; homepage = "https://vamp-plugins.org/"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix b/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix index c819f355e0b..45f5fcfe3a4 100644 --- a/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix +++ b/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl , alsaLib, }: +{ lib, stdenv, fetchurl , alsaLib, }: stdenv.mkDerivation rec { pname = "zita-alsa-pcmi"; @@ -57,8 +57,8 @@ stdenv.mkDerivation rec { description = "The successor of clalsadrv, provides easy access to ALSA PCM devices"; version = version; homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.magnetophon ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/audio/zita-convolver/default.nix b/pkgs/development/libraries/audio/zita-convolver/default.nix index 2b7d89b30a1..3b77bf549ca 100644 --- a/pkgs/development/libraries/audio/zita-convolver/default.nix +++ b/pkgs/development/libraries/audio/zita-convolver/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fftwFloat }: +{ lib, stdenv, fetchurl, fftwFloat }: stdenv.mkDerivation rec { pname = "zita-convolver"; @@ -22,15 +22,15 @@ stdenv.mkDerivation rec { postInstall = '' # create lib link for building apps - ln -s $out/lib/libzita-convolver.so.${version} $out/lib/libzita-convolver.so.${stdenv.lib.versions.major version} + ln -s $out/lib/libzita-convolver.so.${version} $out/lib/libzita-convolver.so.${lib.versions.major version} ''; meta = { description = "Convolution library by Fons Adriaensen"; version = version; homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.magnetophon ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/audio/zita-resampler/default.nix b/pkgs/development/libraries/audio/zita-resampler/default.nix index 2881e566218..88e81d733b3 100644 --- a/pkgs/development/libraries/audio/zita-resampler/default.nix +++ b/pkgs/development/libraries/audio/zita-resampler/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "zita-resampler"; @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { description = "Resample library by Fons Adriaensen"; version = version; homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.magnetophon ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix index 86531a6ad25..88b1840955d 100644 --- a/pkgs/development/libraries/audiofile/default.nix +++ b/pkgs/development/libraries/audiofile/default.nix @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { name = "audiofile-0.3.6"; buildInputs = - stdenv.lib.optionals stdenv.isLinux [ + lib.optionals stdenv.isLinux [ alsaLib - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ CoreServices AudioUnit ]; @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { }) ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for reading and writing audio files in various formats"; homepage = "http://www.68k.org/~michael/audiofile/"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix index a560cc39d16..dd54ba79db7 100644 --- a/pkgs/development/libraries/avahi/default.nix +++ b/pkgs/development/libraries/avahi/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, stdenv, pkgconfig, libdaemon, dbus, perlPackages +{ fetchurl, fetchpatch, lib, stdenv, pkg-config, libdaemon, dbus, perlPackages , expat, gettext, intltool, glib, libiconv, writeShellScriptBin, libevent , gtk3Support ? false, gtk3 ? null , qt4 ? null @@ -13,11 +13,11 @@ assert qt4Support -> qt4 != null; let # despite the configure script claiming it supports $PKG_CONFIG, it doesnt respect it - pkgconfig-helper = writeShellScriptBin "pkg-config" ''exec $PKG_CONFIG "$@"''; + pkg-config-helper = writeShellScriptBin "pkg-config" ''exec $PKG_CONFIG "$@"''; in stdenv.mkDerivation rec { - name = "avahi${stdenv.lib.optionalString withLibdnssdCompat "-compat"}-${version}"; + name = "avahi${lib.optionalString withLibdnssdCompat "-compat"}-${version}"; version = "0.8"; src = fetchurl { @@ -36,32 +36,32 @@ stdenv.mkDerivation rec { buildInputs = [ libdaemon dbus glib expat libiconv libevent ] ++ (with perlPackages; [ perl XMLParser ]) - ++ (stdenv.lib.optional gtk3Support gtk3) - ++ (stdenv.lib.optional qt4Support qt4) - ++ (stdenv.lib.optional qt5Support qt5); + ++ (lib.optional gtk3Support gtk3) + ++ (lib.optional qt4Support qt4) + ++ (lib.optional qt5Support qt5); propagatedBuildInputs = - stdenv.lib.optionals withPython (with python.pkgs; [ python pygobject3 dbus-python ]); + lib.optionals withPython (with python.pkgs; [ python pygobject3 dbus-python ]); - nativeBuildInputs = [ pkgconfig pkgconfig-helper gettext intltool glib ]; + nativeBuildInputs = [ pkg-config pkg-config-helper gettext intltool glib ]; configureFlags = [ "--disable-qt3" "--disable-gdbm" "--disable-mono" "--disable-gtk" "--with-dbus-sys=${placeholder "out"}/share/dbus-1/system.d" - (stdenv.lib.enableFeature gtk3Support "gtk3") + (lib.enableFeature gtk3Support "gtk3") "--${if qt4Support then "enable" else "disable"}-qt4" "--${if qt5Support then "enable" else "disable"}-qt5" - (stdenv.lib.enableFeature withPython "python") + (lib.enableFeature withPython "python") "--localstatedir=/var" "--with-distro=none" # A systemd unit is provided by the avahi-daemon NixOS module "--with-systemdsystemunitdir=no" ] - ++ stdenv.lib.optional withLibdnssdCompat "--enable-compat-libdns_sd" + ++ lib.optional withLibdnssdCompat "--enable-compat-libdns_sd" # autoipd won't build on darwin - ++ stdenv.lib.optional stdenv.isDarwin "--disable-autoipd"; + ++ lib.optional stdenv.isDarwin "--disable-autoipd"; NIX_CFLAGS_COMPILE = "-DAVAHI_SERVICE_DIR=\"/etc/avahi/services\""; - preBuild = stdenv.lib.optionalString stdenv.isDarwin '' + preBuild = lib.optionalString stdenv.isDarwin '' sed -i '20 i\ #define __APPLE_USE_RFC_2292' \ avahi-core/socket.c @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { postInstall = # Maintain compat for mdnsresponder and howl - stdenv.lib.optionalString withLibdnssdCompat '' + lib.optionalString withLibdnssdCompat '' ln -s avahi-compat-libdns_sd/dns_sd.h "$out/include/dns_sd.h" ''; /* # these don't exist (anymore?) @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { ln -s avahi-compat-howl.pc $out/lib/pkgconfig/howl.pc */ - meta = with stdenv.lib; { + meta = with lib; { description = "mDNS/DNS-SD implementation"; homepage = "http://avahi.org"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/avro-c++/default.nix b/pkgs/development/libraries/avro-c++/default.nix index 9ac609f1679..15e2516c1b6 100644 --- a/pkgs/development/libraries/avro-c++/default.nix +++ b/pkgs/development/libraries/avro-c++/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, boost, python2}: +{ lib, stdenv, fetchurl, cmake, boost, python2}: let version = "1.8.2"; in @@ -22,8 +22,8 @@ stdenv.mkDerivation { meta = { description = "A C++ library which implements parts of the Avro Specification"; homepage = "https://avro.apache.org/"; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ rasendubi ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ rasendubi ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/libraries/avro-c/default.nix b/pkgs/development/libraries/avro-c/default.nix index 99f8d7f8497..a5acd7c7898 100644 --- a/pkgs/development/libraries/avro-c/default.nix +++ b/pkgs/development/libraries/avro-c/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, fetchurl, pkgconfig, jansson, zlib }: +{ lib, stdenv, cmake, fetchurl, pkg-config, jansson, zlib }: let version = "1.9.1"; @@ -15,11 +15,11 @@ in stdenv.mkDerivation { patchShebangs . ''; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ jansson zlib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A C library which implements parts of the Avro Specification"; homepage = "https://avro.apache.org/"; license = licenses.asl20; diff --git a/pkgs/development/libraries/aws-c-common/default.nix b/pkgs/development/libraries/aws-c-common/default.nix index 5473867a6ad..23d7f9d8629 100644 --- a/pkgs/development/libraries/aws-c-common/default.nix +++ b/pkgs/development/libraries/aws-c-common/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-common"; - version = "0.4.63"; + version = "0.4.64"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "16bc6fn1gq3nqcrzgpi2kjphq7xkkr73aljakrg89ysm6hyzyim9"; + sha256 = "sha256-izEZMOPHj/9EL78b/t3M0Tki6eA8eRrpG7DO2tkpf1A="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/aws-c-io/default.nix b/pkgs/development/libraries/aws-c-io/default.nix index eda87ba2c53..e2074cc835a 100644 --- a/pkgs/development/libraries/aws-c-io/default.nix +++ b/pkgs/development/libraries/aws-c-io/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-io"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "0wagc1205r57llqd39wqjasq3bgc8h1mfdqk4r5lcrnn4jbpcill"; + sha256 = "sha256-dDvq5clOUaPR7lOCJ/1g0lrCzVOmzwCnqHrBZfBewO4="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index fc3f7896dbe..7b10fc463dd 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "aws-sdk-cpp"; - version = "1.8.113"; + version = "1.8.121"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-sdk-cpp"; rev = version; - sha256 = "0y784cjrxgrin3ck5f2lk0riyy9kv928kcb9y0gzka65imgma48c"; + sha256 = "sha256-uita3HPcerxH/bnSIL3ZNUp68QXtKJLYi0pcnV7OBkQ="; }; # FIXME: might be nice to put different APIs in different outputs @@ -38,7 +38,8 @@ stdenv.mkDerivation rec { ] ++ lib.optional (!customMemoryManagement) "-DCUSTOM_MEMORY_MANAGEMENT=0" ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "-DENABLE_TESTING=OFF" - "-DCURL_HAS_H2=0" + "-DCURL_HAS_H2=1" + "-DCURL_HAS_TLS_PROXY=1" ] ++ lib.optional (apis != ["*"]) "-DBUILD_ONLY=${lib.concatStringsSep ";" apis}"; @@ -53,7 +54,7 @@ stdenv.mkDerivation rec { postFixupHooks = [ # This bodge is necessary so that the file that the generated -config.cmake file # points to an existing directory. - ''mkdir -p $out/include'' + "mkdir -p $out/include" ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/libraries/ayatana-ido/default.nix b/pkgs/development/libraries/ayatana-ido/default.nix index 127fe1c9750..03b89411168 100644 --- a/pkgs/development/libraries/ayatana-ido/default.nix +++ b/pkgs/development/libraries/ayatana-ido/default.nix @@ -1,24 +1,24 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , pkg-config, autoreconfHook , gtk3, gobject-introspection, gtk-doc, vala }: stdenv.mkDerivation rec { pname = "ayatana-ido"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = pname; rev = version; - sha256 = "1mcw6gmacrzx4cyg4223dpwcmj3qf8l30mxsg43292lajzwsm2hz"; + sha256 = "sha256-nJ4F2faK0XZPj9GzUk3Ueap5h6rALFXISHqFQ30RuoU="; }; nativeBuildInputs = [ pkg-config autoreconfHook gtk-doc vala gobject-introspection ]; buildInputs = [ gtk3 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Ayatana Display Indicator Objects"; homepage = "https://github.com/AyatanaIndicators/ayatana-ido"; changelog = "https://github.com/AyatanaIndicators/ayatana-ido/blob/${version}/ChangeLog"; diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index 9bb6e9e1c5e..6e3a5abaaa6 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -1,8 +1,8 @@ -{ stdenv +{ lib, stdenv , fetchurl , meson , ninja -, pkgconfig +, pkg-config , gobject-introspection , lcms2 , vala @@ -10,19 +10,19 @@ stdenv.mkDerivation rec { pname = "babl"; - version = "0.1.82"; + version = "0.1.84"; outputs = [ "out" "dev" ]; src = fetchurl { - url = "https://download.gimp.org/pub/babl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1iddkwdfw1bmfl6n8y1d4kkm3rb15rzvrfri6a7cnx37mpa96bf6"; + url = "https://download.gimp.org/pub/babl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-5+OLhEH3f+udyCMctDSoYZCiHy82ksKBRX6Z016cNOo="; }; nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gobject-introspection vala ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { lcms2 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Image pixel format conversion library"; homepage = "https://gegl.org/babl/"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/libraries/bamf/default.nix b/pkgs/development/libraries/bamf/default.nix index d8041304856..95d54993e06 100644 --- a/pkgs/development/libraries/bamf/default.nix +++ b/pkgs/development/libraries/bamf/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , pantheon , autoconf , automake @@ -10,7 +10,7 @@ , libwnck3 , glib , vala -, pkgconfig +, pkg-config , libstartup_notification , gobject-introspection , gtk-doc @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { gobject-introspection gtk-doc libtool - pkgconfig + pkg-config vala which wrapGAppsHook @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { # glib-2.62 deprecations NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; - meta = with stdenv.lib; { + meta = with lib; { description = "Application matching framework"; longDescription = '' Removes the headache of applications matching diff --git a/pkgs/development/libraries/bashup-events/3.2.nix b/pkgs/development/libraries/bashup-events/3.2.nix new file mode 100644 index 00000000000..f7e88c38251 --- /dev/null +++ b/pkgs/development/libraries/bashup-events/3.2.nix @@ -0,0 +1,26 @@ +{ callPackage, fetchFromGitHub }: + +callPackage ./generic.nix { + variant = "3.2"; + version = "2019-07-27"; + branch = "master"; + src = fetchFromGitHub { + owner = "bashup"; + repo = "events"; + rev = "83744c21bf720afb8325343674c62ab46a8f3d94"; + hash = "sha256-0VDjd+1T1JBmSDGovWOOecUZmNztlwG32UcstfdigbI="; + }; + fake = { + # Note: __ev.encode is actually defined, but it happens in a + # quoted arg to eval, which resholve currently doesn't (and may + # never) parse into. See abathur/resholve/issues/2. + function = [ "__ev.encode" ]; + }; + keep = { + # allow vars in eval + eval = [ "e" "f" "q" "r" ]; + # allow vars executed as commands + "$f" = true; + "$n" = true; + }; +} diff --git a/pkgs/development/libraries/bashup-events/4.4.nix b/pkgs/development/libraries/bashup-events/4.4.nix new file mode 100644 index 00000000000..f880009ea71 --- /dev/null +++ b/pkgs/development/libraries/bashup-events/4.4.nix @@ -0,0 +1,20 @@ +{ callPackage, fetchFromGitHub }: + +callPackage ./generic.nix { + variant = "4.4"; + version = "2020-04-04"; + branch = "bash44"; + src = fetchFromGitHub { + owner = "bashup"; + repo = "events"; + rev = "e97654f5602fc4e31083b27afa18dcc89b3e8296"; + hash = "sha256-51OSIod3mEg3MKs4rrMgRcOimDGC+3UIr4Bl/cTRyGM="; + }; + keep = { + # allow vars in eval + eval = [ "e" "bashup_ev" "n" ]; + # allow vars executed as commands + "$f" = true; + "$n" = true; + }; +} diff --git a/pkgs/development/libraries/bashup-events/default.nix b/pkgs/development/libraries/bashup-events/default.nix new file mode 100644 index 00000000000..bcefdd0fcac --- /dev/null +++ b/pkgs/development/libraries/bashup-events/default.nix @@ -0,0 +1,6 @@ +{ callPackage }: + +{ + bashup-events32 = callPackage ./3.2.nix { }; + bashup-events44 = callPackage ./4.4.nix { }; +} diff --git a/pkgs/development/libraries/bashup-events/generic.nix b/pkgs/development/libraries/bashup-events/generic.nix new file mode 100644 index 00000000000..78ef4c2f336 --- /dev/null +++ b/pkgs/development/libraries/bashup-events/generic.nix @@ -0,0 +1,83 @@ +{ + # general + lib +, callPackage +, runCommand +, resholvePackage +, bash +, shellcheck +, doCheck ? true +, doInstallCheck ? true + # variant-specific +, variant +, version +, branch +, src +, fake ? false +, keep +}: +let + # extracting this so that it's trivial to test in other shells + installCheck = shell: + '' + echo "testing bashup.events in ${shell}" + ${shell} <<'EOF' + source $out/bin/bashup.events + neat(){ + echo $0: Hi from event \'test event\'. I can have both $1 and $2 arguments. + exit 0 + } + event on "test event" @2 neat curried + echo event registered + event emit "test event" runtime + exit 1 # fail if emitting event didn't exit clean + EOF + ''; + +in +resholvePackage rec { + # bashup.events doesn't version yet but it has two variants with + # differing features/performance characteristics: + # - branch master: a variant for bash 3.2+ + # - branch bash44: a variant for bash 4.4+ + pname = "bashup-events${variant}-unstable"; + # should be YYYY-MM-DD + inherit version; + inherit src; + + installPhase = '' + install -Dt $out/bin bashup.events + ''; + + inherit doCheck; + checkInputs = [ shellcheck bash ]; + + # check based on https://github.com/bashup/events/blob/master/.dkrc + checkPhase = '' + SHELLCHECK_OPTS='-e SC2016,SC2145' ${shellcheck}/bin/shellcheck ./bashup.events + ${bash}/bin/bash -n ./bashup.events + ${bash}/bin/bash ./bashup.events + ''; + + solutions = { + events = { + inputs = [ ]; + interpreter = "none"; + scripts = [ "bin/bashup.events" ]; + inherit keep; + } // lib.optionalAttrs (lib.isAttrs fake) { inherit fake; }; + }; + + inherit doInstallCheck; + installCheckInputs = [ bash ]; + installCheckPhase = installCheck "${bash}/bin/bash"; + + meta = with lib; { + inherit branch; + description = "An event listener/callback API for creating extensible bash programs"; + homepage = "https://github.com/bashup/events"; + license = licenses.cc0; + maintainers = with maintainers; [ abathur ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/bcg729/default.nix b/pkgs/development/libraries/bcg729/default.nix index f178c192de5..125512c3fed 100644 --- a/pkgs/development/libraries/bcg729/default.nix +++ b/pkgs/development/libraries/bcg729/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitLab , cmake }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Opensource implementation of both encoder and decoder of the ITU G729 Annex A/B speech codec"; homepage = "https://linphone.org/technical-corner/bcg729"; changelog = "https://gitlab.linphone.org/BC/public/bcg729/raw/${version}/NEWS"; diff --git a/pkgs/development/libraries/bctoolbox/default.nix b/pkgs/development/libraries/bctoolbox/default.nix index 655d3a5808a..dd72b7eb41d 100644 --- a/pkgs/development/libraries/bctoolbox/default.nix +++ b/pkgs/development/libraries/bctoolbox/default.nix @@ -2,7 +2,7 @@ , cmake , fetchFromGitLab , mbedtls -, stdenv +, lib, stdenv }: stdenv.mkDerivation rec { @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-truncation" ]; - meta = with stdenv.lib; { + meta = with lib; { inherit version; description = "Utilities library for Linphone"; homepage = "https://gitlab.linphone.org/BC/public/bctoolbox"; diff --git a/pkgs/development/libraries/beecrypt/default.nix b/pkgs/development/libraries/beecrypt/default.nix index 2433edbfe8f..6b86fca868f 100644 --- a/pkgs/development/libraries/beecrypt/default.nix +++ b/pkgs/development/libraries/beecrypt/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, m4}: +{lib, stdenv, fetchurl, m4}: stdenv.mkDerivation { name = "beecrypt-4.2.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { configureFlags = [ "--disable-optimized" "--enable-static" ]; meta = { - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.lgpl2; + platforms = lib.platforms.linux; + license = lib.licenses.lgpl2; }; } diff --git a/pkgs/development/libraries/beignet/default.nix b/pkgs/development/libraries/beignet/default.nix index 5273ef0c568..8e8e455e59a 100644 --- a/pkgs/development/libraries/beignet/default.nix +++ b/pkgs/development/libraries/beignet/default.nix @@ -1,7 +1,7 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , clang-unwrapped , llvm , libdrm @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config python3 ]; @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python3 - pkgconfig + pkg-config makeWrapper ]; @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { ''; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://cgit.freedesktop.org/beignet/"; description = "OpenCL Library for Intel Ivy Bridge and newer GPUs"; longDescription = '' diff --git a/pkgs/development/libraries/belcard/default.nix b/pkgs/development/libraries/belcard/default.nix index 35de9fb9347..03f6e96e187 100644 --- a/pkgs/development/libraries/belcard/default.nix +++ b/pkgs/development/libraries/belcard/default.nix @@ -2,12 +2,12 @@ , belr , cmake , fetchFromGitLab -, stdenv +, lib, stdenv }: stdenv.mkDerivation rec { pname = "belcard"; - version = "4.4.13"; + version = "4.4.24"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "16x2xp8d0a115132zhy1kpxkyj86ia7vrsnpjdg78fnbvmvysc8m"; + sha256 = "sha256-FTHtd93LOnRek9fqvI+KBkk/+53Bwy9GKCEo0NDtops="; }; buildInputs = [ bctoolbox belr ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { # Do not build static libraries cmakeFlags = [ "-DENABLE_STATIC=NO" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ library to manipulate VCard standard format"; homepage = "https://gitlab.linphone.org/BC/public/belcard"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/development/libraries/belle-sip/default.nix index 8a028b5e0a0..e08fc1ae3ee 100644 --- a/pkgs/development/libraries/belle-sip/default.nix +++ b/pkgs/development/libraries/belle-sip/default.nix @@ -4,7 +4,7 @@ , fetchFromGitLab , libantlr3c , mbedtls -, stdenv +, lib, stdenv , zlib }: @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libantlr3c mbedtls bctoolbox ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://linphone.org/technical-corner/belle-sip"; description = "Modern library implementing SIP (RFC 3261) transport, transaction and dialog layers"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/belr/default.nix b/pkgs/development/libraries/belr/default.nix index ab3df9bae7e..b38757525ab 100644 --- a/pkgs/development/libraries/belr/default.nix +++ b/pkgs/development/libraries/belr/default.nix @@ -1,7 +1,7 @@ { bctoolbox , cmake , fetchFromGitLab -, stdenv +, lib, stdenv }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { # Do not build static libraries cmakeFlags = [ "-DENABLE_STATIC=NO" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Belledonne Communications' language recognition library"; homepage = "https://gitlab.linphone.org/BC/public/belr"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/biblesync/default.nix b/pkgs/development/libraries/biblesync/default.nix index 27c6637d9fe..74a938cf2a5 100644 --- a/pkgs/development/libraries/biblesync/default.nix +++ b/pkgs/development/libraries/biblesync/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, libuuid }: +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, libuuid }: stdenv.mkDerivation rec { @@ -12,10 +12,10 @@ stdenv.mkDerivation rec { sha256 = "0prmd12jq2cjdhsph5v89y38j7hhd51dr3r1hivgkhczr3m5hf4s"; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ libuuid ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.crosswire.org/BibleSync"; description = "A multicast protocol to Bible software shared conavigation"; longDescription = '' @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { navigation, and handling of incoming packets. ''; license = licenses.publicDomain; - maintainers = [ maintainers.AndersonTorres ]; - platforms = stdenv.lib.platforms.linux; + maintainers = [ maintainers.AndersonTorres ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/bobcat/default.nix b/pkgs/development/libraries/bobcat/default.nix index 5473801f85d..06c7ac81dcd 100644 --- a/pkgs/development/libraries/bobcat/default.nix +++ b/pkgs/development/libraries/bobcat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, icmake +{ lib, stdenv, fetchFromGitLab, icmake , libmilter, libX11, openssl, readline , util-linux, yodl }: @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ./build install x ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Brokken's Own Base Classes And Templates"; homepage = "https://fbb-git.gitlab.io/bobcat/"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/boehm-gc/7.6.6.nix b/pkgs/development/libraries/boehm-gc/7.6.6.nix index 31997e58577..13f490af3e2 100644 --- a/pkgs/development/libraries/boehm-gc/7.6.6.nix +++ b/pkgs/development/libraries/boehm-gc/7.6.6.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, libatomic_ops +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, libatomic_ops , enableLargeConfig ? false # doc: https://github.com/ivmai/bdwgc/blob/v7.6.6/doc/README.macros#L179 }: @@ -15,12 +15,12 @@ stdenv.mkDerivation rec { }; buildInputs = [ libatomic_ops ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; outputs = [ "out" "dev" "doc" ]; separateDebugInfo = stdenv.isLinux; - preConfigure = stdenv.lib.optionalString (stdenv.hostPlatform.libc == "musl") '' + preConfigure = lib.optionalString (stdenv.hostPlatform.libc == "musl") '' export NIX_CFLAGS_COMPILE+=" -D_GNU_SOURCE -DUSE_MMAP -DHAVE_DL_ITERATE_PHDR" ''; @@ -69,6 +69,6 @@ stdenv.mkDerivation rec { license = "https://hboehm.info/gc/license.txt"; maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index 1af63a2e426..85ae01036ed 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; separateDebugInfo = stdenv.isLinux && stdenv.hostPlatform.libc != "musl"; - preConfigure = stdenv.lib.optionalString (stdenv.hostPlatform.libc == "musl") '' + preConfigure = lib.optionalString (stdenv.hostPlatform.libc == "musl") '' export NIX_CFLAGS_COMPILE+=" -D_GNU_SOURCE -DUSE_MMAP -DHAVE_DL_ITERATE_PHDR" ''; @@ -64,6 +64,6 @@ stdenv.mkDerivation rec { license = "https://hboehm.info/gc/license.txt"; maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/libraries/boolstuff/default.nix b/pkgs/development/libraries/boolstuff/default.nix index 9ec27d3e9eb..b3d754fb542 100644 --- a/pkgs/development/libraries/boolstuff/default.nix +++ b/pkgs/development/libraries/boolstuff/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig }: +{ lib, stdenv, fetchurl, pkg-config }: let baseurl = "https://perso.b2b2c.ca/~sarrazip/dev"; in @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { sha256 = "10qynbyw723gz2vrvn4xk2var172kvhlz3l3l80qbdsfb3d12wn0"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = { description = "Library for operations on boolean expression binary trees"; homepage = "${baseurl}/boolstuff.html"; license = "GPL"; - maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = stdenv.lib.platforms.linux; + maintainers = [ lib.maintainers.marcweber ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/boost-process/default.nix b/pkgs/development/libraries/boost-process/default.nix index 92e02c6ca08..97e87980952 100644 --- a/pkgs/development/libraries/boost-process/default.nix +++ b/pkgs/development/libraries/boost-process/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation { name = "boost-process-0.5"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { cp -r boost $out/include ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.highscore.de/boost/process0.5/"; description = "Library to manage system processes"; license = licenses.boost; diff --git a/pkgs/development/libraries/boost/1.59.nix b/pkgs/development/libraries/boost/1.59.nix index fb65e49c500..0f6e9a35b6e 100644 --- a/pkgs/development/libraries/boost/1.59.nix +++ b/pkgs/development/libraries/boost/1.59.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl, ... } @ args: +{ callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // { version = "1.59.0"; diff --git a/pkgs/development/libraries/boost/1.60.nix b/pkgs/development/libraries/boost/1.60.nix index 646f4652f77..4bc7a1cc732 100644 --- a/pkgs/development/libraries/boost/1.60.nix +++ b/pkgs/development/libraries/boost/1.60.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl, ... } @ args: +{ callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // { version = "1.60.0"; diff --git a/pkgs/development/libraries/boost/1.65.nix b/pkgs/development/libraries/boost/1.65.nix index 922c09ba7fe..764f38d5b74 100644 --- a/pkgs/development/libraries/boost/1.65.nix +++ b/pkgs/development/libraries/boost/1.65.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl, ... } @ args: +{ callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // { version = "1.65.1"; diff --git a/pkgs/development/libraries/boost/1.66.nix b/pkgs/development/libraries/boost/1.66.nix index 0a99717a799..af61aa51944 100644 --- a/pkgs/development/libraries/boost/1.66.nix +++ b/pkgs/development/libraries/boost/1.66.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl, ... } @ args: +{ callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // { version = "1.66.0"; diff --git a/pkgs/development/libraries/boost/1.67.nix b/pkgs/development/libraries/boost/1.67.nix index 31f545ab12b..29993ed02b8 100644 --- a/pkgs/development/libraries/boost/1.67.nix +++ b/pkgs/development/libraries/boost/1.67.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: +{ lib, stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: callPackage ./generic.nix (args // { version = "1.67.0"; @@ -9,7 +9,7 @@ callPackage ./generic.nix (args // { sha256 = "0x65nkwzv8fdacj8sw5njl3v63jj19dirrpklbwy6qpsncw7fc7h"; stripLen = 1; }) - ] ++ stdenv.lib.optionals stdenv.cc.isClang [ + ] ++ lib.optionals stdenv.cc.isClang [ # Fixes https://github.com/boostorg/atomic/issues/15 (fetchpatch { url = "https://github.com/boostorg/atomic/commit/6e14ca24dab50ad4c1fa8c27c7dd6f1cb791b534.patch"; diff --git a/pkgs/development/libraries/boost/1.68.nix b/pkgs/development/libraries/boost/1.68.nix index 4d98172c6d0..920dd9a300b 100644 --- a/pkgs/development/libraries/boost/1.68.nix +++ b/pkgs/development/libraries/boost/1.68.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: +{ callPackage, fetchurl, fetchpatch, ... } @ args: callPackage ./generic.nix (args // { version = "1.68.0"; diff --git a/pkgs/development/libraries/boost/1.69.nix b/pkgs/development/libraries/boost/1.69.nix index 95c4aa854a4..7292356ecd1 100644 --- a/pkgs/development/libraries/boost/1.69.nix +++ b/pkgs/development/libraries/boost/1.69.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: +{ callPackage, fetchurl, fetchpatch, ... } @ args: callPackage ./generic.nix (args // { version = "1.69.0"; diff --git a/pkgs/development/libraries/boost/1.70.nix b/pkgs/development/libraries/boost/1.70.nix index 45a8bdb9318..3b898cfc0ae 100644 --- a/pkgs/development/libraries/boost/1.70.nix +++ b/pkgs/development/libraries/boost/1.70.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: +{ callPackage, fetchurl, fetchpatch, ... } @ args: callPackage ./generic.nix (args // { version = "1.70.0"; diff --git a/pkgs/development/libraries/boost/1.71.nix b/pkgs/development/libraries/boost/1.71.nix index f66bd4cd6fb..bec741dd88a 100644 --- a/pkgs/development/libraries/boost/1.71.nix +++ b/pkgs/development/libraries/boost/1.71.nix @@ -1,11 +1,11 @@ -{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: +{ callPackage, fetchurl, fetchpatch, ... } @ args: callPackage ./generic.nix (args // rec { version = "1.71.0"; src = fetchurl { #url = "mirror://sourceforge/boost/boost_1_71_0.tar.bz2"; - urls = [ + urls = [ "mirror://sourceforge/boost/boost_1_71_0.tar.bz2" "https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2" ]; diff --git a/pkgs/development/libraries/boost/1.72.nix b/pkgs/development/libraries/boost/1.72.nix index 680afe8bcb8..97dad9b6c8a 100644 --- a/pkgs/development/libraries/boost/1.72.nix +++ b/pkgs/development/libraries/boost/1.72.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: +{ callPackage, fetchurl, fetchpatch, ... } @ args: callPackage ./generic.nix (args // rec { version = "1.72.0"; diff --git a/pkgs/development/libraries/boost/1.73.nix b/pkgs/development/libraries/boost/1.73.nix index 99a5486f197..289bea197c3 100644 --- a/pkgs/development/libraries/boost/1.73.nix +++ b/pkgs/development/libraries/boost/1.73.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: +{ callPackage, fetchurl, fetchpatch, ... } @ args: callPackage ./generic.nix (args // rec { version = "1.73.0"; diff --git a/pkgs/development/libraries/boost/1.74.nix b/pkgs/development/libraries/boost/1.74.nix index 35b4013dcb3..a181ed94c26 100644 --- a/pkgs/development/libraries/boost/1.74.nix +++ b/pkgs/development/libraries/boost/1.74.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: +{ callPackage, fetchurl, fetchpatch, ... } @ args: callPackage ./generic.nix (args // rec { version = "1.74.0"; diff --git a/pkgs/development/libraries/boost/1.75.nix b/pkgs/development/libraries/boost/1.75.nix index 9912032c777..ff1073bd026 100644 --- a/pkgs/development/libraries/boost/1.75.nix +++ b/pkgs/development/libraries/boost/1.75.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: +{ callPackage, fetchurl, fetchpatch, ... } @ args: callPackage ./generic.nix (args // rec { version = "1.75.0"; diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index ec3a28e2b1a..abff1268bfa 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, icu, expat, zlib, bzip2, python, fixDarwinDylibNames, libiconv +{ lib, stdenv, icu, expat, zlib, bzip2, python, fixDarwinDylibNames, libiconv , fetchpatch , which , buildPackages @@ -14,7 +14,8 @@ , enableNumpy ? false , taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic)) , patches ? [] -, mpi ? null +, useMpi ? false +, mpi , extraB2Args ? [] # Attributes inherit from specific versions @@ -30,9 +31,9 @@ assert enablePython -> stdenv.hostPlatform == stdenv.buildPlatform; assert enableNumpy -> enablePython; # Boost <1.69 can't be build with clang >8, because pth was removed -assert with stdenv.lib; ((toolset == "clang" && !(versionOlder stdenv.cc.version "8.0.0")) -> !(versionOlder version "1.69")); +assert with lib; ((toolset == "clang" && !(versionOlder stdenv.cc.version "8.0.0")) -> !(versionOlder version "1.69")); -with stdenv.lib; +with lib; let variant = concatStringsSep "," @@ -94,7 +95,7 @@ let ++ optional (variant == "release") "debug-symbols=off" ++ optional (toolset != null) "toolset=${toolset}" ++ optional (!enablePython) "--without-python" - ++ optional (mpi != null || stdenv.hostPlatform != stdenv.buildPlatform) "--user-config=user-config.jam" + ++ optional (useMpi || stdenv.hostPlatform != stdenv.buildPlatform) "--user-config=user-config.jam" ++ optionals (stdenv.hostPlatform.libc == "msvcrt") [ "threadapi=win32" ] ++ extraB2Args @@ -140,7 +141,7 @@ stdenv.mkDerivation { substituteInPlace tools/build/src/tools/clang-darwin.jam \ --replace '@rpath/$(<[1]:D=)' "$out/lib/\$(<[1]:D=)"; fi; - '' + optionalString (mpi != null) '' + '' + optionalString useMpi '' cat << EOF >> user-config.jam using mpi : ${mpi}/bin/mpiCC ; EOF @@ -150,7 +151,7 @@ stdenv.mkDerivation { EOF ''; - NIX_CFLAGS_LINK = stdenv.lib.optionalString stdenv.isDarwin + NIX_CFLAGS_LINK = lib.optionalString stdenv.isDarwin "-headerpad_max_install_names"; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/bootil/default.nix b/pkgs/development/libraries/bootil/default.nix index a1924f59a8d..f2136296204 100644 --- a/pkgs/development/libraries/bootil/default.nix +++ b/pkgs/development/libraries/bootil/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, premake4 }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, premake4 }: stdenv.mkDerivation { name = "bootil-unstable-2015-12-17"; @@ -7,9 +7,9 @@ stdenv.mkDerivation { description = "Garry Newman's personal utility library"; homepage = "https://github.com/garrynewman/bootil"; # License unsure - see https://github.com/garrynewman/bootil/issues/21 - license = stdenv.lib.licenses.free; - maintainers = [ stdenv.lib.maintainers.abigailbuccaneer ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.free; + maintainers = [ lib.maintainers.abigailbuccaneer ]; + platforms = lib.platforms.all; # Build uses `-msse` and `-mfpmath=sse` badPlatforms = [ "aarch64-linux" ]; }; diff --git a/pkgs/development/libraries/boringssl/default.nix b/pkgs/development/libraries/boringssl/default.nix index eb13321523d..7019d39b16c 100644 --- a/pkgs/development/libraries/boringssl/default.nix +++ b/pkgs/development/libraries/boringssl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, perl, go }: +{ lib, stdenv, fetchgit, cmake, perl, go }: # reference: https://boringssl.googlesource.com/boringssl/+/2661/BUILDING.md stdenv.mkDerivation { @@ -29,7 +29,7 @@ stdenv.mkDerivation { outputs = [ "out" "bin" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Free TLS/SSL implementation"; homepage = "https://boringssl.googlesource.com"; platforms = platforms.all; diff --git a/pkgs/development/libraries/botan/generic.nix b/pkgs/development/libraries/botan/generic.nix index f7d94f42469..0369f603b8e 100644 --- a/pkgs/development/libraries/botan/generic.nix +++ b/pkgs/development/libraries/botan/generic.nix @@ -1,10 +1,11 @@ -{ stdenv, fetchurl, python, bzip2, zlib, gmp, openssl, boost +{ lib, stdenv, fetchurl, python, bzip2, zlib, gmp, openssl, boost # Passed by version specific builders , baseVersion, revision, sha256 , sourceExtension ? "tar.xz" , extraConfigureFlags ? "" , postPatch ? null -, darwin +, CoreServices +, Security , ... }: @@ -23,7 +24,7 @@ stdenv.mkDerivation rec { inherit postPatch; buildInputs = [ python bzip2 zlib gmp openssl boost ] - ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + ++ lib.optionals stdenv.isDarwin [ CoreServices Security ]; configurePhase = '' python configure.py --prefix=$out --with-bzip2 --with-zlib ${if openssl != null then "--with-openssl" else ""} ${extraConfigureFlags}${if stdenv.cc.isClang then " --cc=clang" else "" } @@ -42,7 +43,7 @@ stdenv.mkDerivation rec { ln -s botan-*.pc botan.pc || true ''; - meta = with stdenv.lib; { + meta = with lib; { inherit version; description = "Cryptographic algorithms library"; maintainers = with maintainers; [ raskin ]; diff --git a/pkgs/development/libraries/box2d/default.nix b/pkgs/development/libraries/box2d/default.nix index e93d4b549a2..47a1c0917f0 100644 --- a/pkgs/development/libraries/box2d/default.nix +++ b/pkgs/development/libraries/box2d/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, cmake, libGLU, libGL, freeglut, libX11, xorgproto +{ lib, stdenv, fetchurl, unzip, cmake, libGLU, libGL, freeglut, libX11, xorgproto , libXi, pkg-config }: stdenv.mkDerivation rec { @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { --replace 'b2_maxPolygonVertices 8' 'b2_maxPolygonVertices 15' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "2D physics engine"; homepage = "https://box2d.org/"; maintainers = [ maintainers.raskin ]; diff --git a/pkgs/development/libraries/boxfort/default.nix b/pkgs/development/libraries/boxfort/default.nix index 9a4e2c23356..740e4321698 100644 --- a/pkgs/development/libraries/boxfort/default.nix +++ b/pkgs/development/libraries/boxfort/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, python37Packages }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, python37Packages }: stdenv.mkDerivation rec { version = "unstable-2019-10-09"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { outputs = [ "dev" "out" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Convenient & cross-platform sandboxing C library"; homepage = "https://github.com/Snaipe/BoxFort"; license = licenses.mit; diff --git a/pkgs/development/libraries/brigand/default.nix b/pkgs/development/libraries/brigand/default.nix index cc5564d4bb7..eb46ccc8cd7 100644 --- a/pkgs/development/libraries/brigand/default.nix +++ b/pkgs/development/libraries/brigand/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation { pname = "brigand"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Instant compile time C++ 11 metaprogramming library"; longDescription = '' Brigand is a light-weight, fully functional, instant-compile time C++ 11 meta-programming library. diff --git a/pkgs/development/libraries/buddy/default.nix b/pkgs/development/libraries/buddy/default.nix index d025b8c28ed..a333a69ffa1 100644 --- a/pkgs/development/libraries/buddy/default.nix +++ b/pkgs/development/libraries/buddy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bison }: +{ lib, stdenv, fetchurl, bison }: stdenv.mkDerivation rec { name = "buddy-2.4"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { description = "Binary decision diagram package"; license = "as-is"; - platforms = stdenv.lib.platforms.unix; # Once had cygwin problems - maintainers = [ stdenv.lib.maintainers.peti ]; + platforms = lib.platforms.unix; # Once had cygwin problems + maintainers = [ lib.maintainers.peti ]; }; } diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix index 07222f469d1..50bf56bfbd2 100644 --- a/pkgs/development/libraries/bullet/default.nix +++ b/pkgs/development/libraries/bullet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libGLU, libGL, freeglut +{ lib, stdenv, fetchFromGitHub, cmake, libGLU, libGL, freeglut , Cocoa, OpenGL }: @@ -14,12 +14,12 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = stdenv.lib.optionals stdenv.isLinux [ libGLU libGL freeglut ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa OpenGL ]; + buildInputs = lib.optionals stdenv.isLinux [ libGLU libGL freeglut ] + ++ lib.optionals stdenv.isDarwin [ Cocoa OpenGL ]; patches = [ ./gwen-narrowing.patch ]; - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.isDarwin '' sed -i 's/FIND_PACKAGE(OpenGL)//' CMakeLists.txt sed -i 's/FIND_LIBRARY(COCOA_LIBRARY Cocoa)//' CMakeLists.txt ''; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { "-DBUILD_SHARED_LIBS=ON" "-DBUILD_CPU_DEMOS=OFF" "-DINSTALL_EXTRA_LIBS=ON" - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ "-DOPENGL_FOUND=true" "-DOPENGL_LIBRARIES=${OpenGL}/Library/Frameworks/OpenGL.framework" "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks/OpenGL.framework" @@ -38,10 +38,10 @@ stdenv.mkDerivation rec { "-DBUILD_UNIT_TESTS=OFF" ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=argument-outside-range -Wno-error=c++11-narrowing"; - meta = with stdenv.lib; { + meta = with lib; { description = "A professional free 3D Game Multiphysics Library"; longDescription = '' Bullet 3D Game Multiphysics Library provides state of the art collision diff --git a/pkgs/development/libraries/bullet/roboschool-fork.nix b/pkgs/development/libraries/bullet/roboschool-fork.nix index 1387048070f..a3966eaa4a3 100644 --- a/pkgs/development/libraries/bullet/roboschool-fork.nix +++ b/pkgs/development/libraries/bullet/roboschool-fork.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libGLU, libGL, freeglut +{ lib, stdenv, fetchFromGitHub, cmake, libGLU, libGL, freeglut , Cocoa, OpenGL }: @@ -18,12 +18,12 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ cmake ]; - buildInputs = stdenv.lib.optionals stdenv.isLinux [ libGLU libGL freeglut ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa OpenGL ]; + buildInputs = lib.optionals stdenv.isLinux [ libGLU libGL freeglut ] + ++ lib.optionals stdenv.isDarwin [ Cocoa OpenGL ]; patches = [ ./gwen-narrowing.patch ]; - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.isDarwin '' sed -i 's/FIND_PACKAGE(OpenGL)//' CMakeLists.txt sed -i 's/FIND_LIBRARY(COCOA_LIBRARY Cocoa)//' CMakeLists.txt ''; @@ -32,7 +32,7 @@ stdenv.mkDerivation { "-DBUILD_SHARED_LIBS=ON" "-DBUILD_CPU_DEMOS=OFF" "-DINSTALL_EXTRA_LIBS=ON" - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ "-DOPENGL_FOUND=true" "-DOPENGL_LIBRARIES=${OpenGL}/Library/Frameworks/OpenGL.framework" "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks/OpenGL.framework" @@ -42,7 +42,7 @@ stdenv.mkDerivation { "-DBUILD_UNIT_TESTS=OFF" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A professional free 3D Game Multiphysics Library"; longDescription = '' Bullet 3D Game Multiphysics Library provides state of the art collision diff --git a/pkgs/development/libraries/bulletml/default.nix b/pkgs/development/libraries/bulletml/default.nix index f64090bd53a..3da05302ac9 100644 --- a/pkgs/development/libraries/bulletml/default.nix +++ b/pkgs/development/libraries/bulletml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchpatch, fetchurl, bison, perl }: +{ lib, stdenv, fetchpatch, fetchurl, bison, perl }: let version = "0.0.6"; @@ -58,7 +58,7 @@ in stdenv.mkDerivation { install -m 644 README.en "$out"/share/licenses/libbulletml ''; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ library to handle BulletML easily"; longDescription = '' BulletML is the Bullet Markup Language. BulletML can describe the barrage diff --git a/pkgs/development/libraries/bwidget/default.nix b/pkgs/development/libraries/bwidget/default.nix index ff9e6aa038f..f3f09497a66 100644 --- a/pkgs/development/libraries/bwidget/default.nix +++ b/pkgs/development/libraries/bwidget/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, tcl }: +{ lib, stdenv, fetchurl, tcl }: stdenv.mkDerivation rec { pname = "bwidget"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://sourceforge.net/projects/tcllib"; description = "High-level widget set for Tcl/Tk"; - license = stdenv.lib.licenses.tcltk; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.tcltk; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/bzrtp/default.nix b/pkgs/development/libraries/bzrtp/default.nix index 3eb99549246..0adcb327cc4 100644 --- a/pkgs/development/libraries/bzrtp/default.nix +++ b/pkgs/development/libraries/bzrtp/default.nix @@ -2,7 +2,7 @@ , cmake , fetchFromGitLab , sqlite -, stdenv +, lib, stdenv }: stdenv.mkDerivation rec { @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type"; - meta = with stdenv.lib; { + meta = with lib; { description = "An opensource implementation of ZRTP keys exchange protocol"; homepage = "https://gitlab.linphone.org/BC/public/bzrtp"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix index ac0dc43c67a..20bcf80d9e5 100644 --- a/pkgs/development/libraries/c-ares/default.nix +++ b/pkgs/development/libraries/c-ares/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, writeTextDir }: +{ lib, stdenv, fetchurl, writeTextDir }: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "0h7wjfnk2092glqcp9mqaax7xx0s13m501z1gi0gsjl2vvvd0gfp"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A C library for asynchronous DNS requests"; homepage = "https://c-ares.haxx.se"; license = licenses.mit; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { set_target_properties(c-ares::cares PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${self}/include" - ${stdenv.lib.optionalString stdenv.isLinux ''INTERFACE_LINK_LIBRARIES "nsl;rt"''} + ${lib.optionalString stdenv.isLinux ''INTERFACE_LINK_LIBRARIES "nsl;rt"''} ) set_property(TARGET c-ares::cares APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) set_target_properties(c-ares::cares PROPERTIES diff --git a/pkgs/development/libraries/c-blosc/default.nix b/pkgs/development/libraries/c-blosc/default.nix index 7dfcce8e9d8..a7420e300ed 100644 --- a/pkgs/development/libraries/c-blosc/default.nix +++ b/pkgs/development/libraries/c-blosc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "c-blosc"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A blocking, shuffling and loss-less compression library"; homepage = "https://www.blosc.org"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix index 74ca27f2e3c..fdc06df948d 100644 --- a/pkgs/development/libraries/caf/default.nix +++ b/pkgs/development/libraries/caf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, openssl }: +{ lib, stdenv, fetchFromGitHub, cmake, openssl }: stdenv.mkDerivation rec { pname = "actor-framework"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD/lib ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An open source implementation of the actor model in C++"; homepage = "http://actor-framework.org/"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 3a7c63165b7..839b7e9f40b 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -1,9 +1,9 @@ -{ config, stdenv, fetchurl, fetchpatch, pkgconfig, libiconv +{ config, lib, stdenv, fetchurl, fetchpatch, pkg-config, libiconv , libintl, expat, zlib, libpng, pixman, fontconfig, freetype , x11Support? !stdenv.isDarwin, libXext, libXrender , gobjectSupport ? true, glib , xcbSupport ? x11Support, libxcb, xcbutil # no longer experimental since 1.12 -, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms +, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms , glSupport ? x11Support && config.cairo.gl or (libGLSupported && stdenv.isLinux) , libGL ? null # libGLU libGL is no longer a big dependency , pdfSupport ? true @@ -14,13 +14,13 @@ assert glSupport -> x11Support && libGL != null; let version = "1.16.0"; - inherit (stdenv.lib) optional optionals; + inherit (lib) optional optionals; in stdenv.mkDerivation rec { pname = "cairo"; inherit version; src = fetchurl { - url = "https://cairographics.org/${if stdenv.lib.mod (builtins.fromJSON (stdenv.lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${pname}-${version}.tar.xz"; + url = "https://cairographics.org/${if lib.mod (builtins.fromJSON (lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${pname}-${version}.tar.xz"; sha256 = "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy"; }; @@ -44,7 +44,7 @@ in stdenv.mkDerivation rec { outputBin = "dev"; # very small nativeBuildInputs = [ - pkgconfig + pkg-config ]; buildInputs = [ @@ -78,7 +78,7 @@ in stdenv.mkDerivation rec { preConfigure = # On FreeBSD, `-ldl' doesn't exist. - stdenv.lib.optionalString stdenv.isFreeBSD + lib.optionalString stdenv.isFreeBSD '' for i in "util/"*"/Makefile.in" boilerplate/Makefile.in do cat "$i" | sed -es/-ldl//g > t @@ -98,9 +98,9 @@ in stdenv.mkDerivation rec { doCheck = false; # fails - postInstall = stdenv.lib.optionalString stdenv.isDarwin glib.flattenInclude; + postInstall = lib.optionalString stdenv.isDarwin glib.flattenInclude; - meta = with stdenv.lib; { + meta = with lib; { description = "A 2D graphics library with support for multiple output devices"; longDescription = '' diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix index 13550bf3fab..87b391d2ad0 100644 --- a/pkgs/development/libraries/cairomm/default.nix +++ b/pkgs/development/libraries/cairomm/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, darwin, cairo, fontconfig, freetype, libsigcxx }: +{ fetchurl, lib, stdenv, pkg-config, darwin, cairo, fontconfig, freetype, libsigcxx }: stdenv.mkDerivation rec { pname = "cairomm"; version = "1.12.2"; @@ -6,22 +6,22 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://www.cairographics.org/releases/${pname}-${version}.tar.gz"; # gnome doesn't have the latest version ATM; beware: same name but different hash - #url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + #url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "16fmigxsaz85c3lgcls7biwyz8zy8c8h3jndfm54cxxas3a7zi25"; }; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ cairo libsigcxx ]; buildInputs = [ fontconfig freetype ] - ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]); doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A 2D graphics library with support for multiple output devices"; longDescription = '' diff --git a/pkgs/development/libraries/capnproto/default.nix b/pkgs/development/libraries/capnproto/default.nix index ad2517f2589..da6aae64db5 100644 --- a/pkgs/development/libraries/capnproto/default.nix +++ b/pkgs/development/libraries/capnproto/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "capnproto"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "03f1862ljdshg7d0rg3j7jzgm3ip55kzd2y91q7p0racax3hxx6i"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://kentonv.github.io/capnproto"; description = "Cap'n Proto cerealization protocol"; longDescription = '' diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix index 5140205ebc8..cce14951c8b 100644 --- a/pkgs/development/libraries/capstone/default.nix +++ b/pkgs/development/libraries/capstone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig }: +{ lib, stdenv, fetchurl, pkg-config }: stdenv.mkDerivation rec { pname = "capstone"; @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { }; # replace faulty macos detection - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.isDarwin '' sed -i 's/^IS_APPLE := .*$/IS_APPLE := 1/' Makefile ''; - configurePhase = '' patchShebangs make.sh ''; + configurePhase = "patchShebangs make.sh "; buildPhase = "PREFIX=$out ./make.sh"; doCheck = true; @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { make check ''; - installPhase = (stdenv.lib.optionalString stdenv.isDarwin "HOMEBREW_CAPSTONE=1 ") + installPhase = (lib.optionalString stdenv.isDarwin "HOMEBREW_CAPSTONE=1 ") + "PREFIX=$out ./make.sh install"; - + nativeBuildInputs = [ - pkgconfig + pkg-config ]; enableParallelBuilding = true; @@ -36,8 +36,8 @@ stdenv.mkDerivation rec { meta = { description = "Advanced disassembly library"; homepage = "http://www.capstone-engine.org"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice ris ]; + license = lib.licenses.bsd3; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ thoughtpolice ris ]; }; } diff --git a/pkgs/development/libraries/catch/default.nix b/pkgs/development/libraries/catch/default.nix index 36d4960cdcc..2aa5c788dc3 100644 --- a/pkgs/development/libraries/catch/default.nix +++ b/pkgs/development/libraries/catch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "catch"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { doCheck = true; checkTarget = "test"; - meta = with stdenv.lib; { + meta = with lib; { description = "A multi-paradigm automated test framework for C++ and Objective-C (and, maybe, C)"; homepage = "http://catch-lib.net"; license = licenses.boost; diff --git a/pkgs/development/libraries/catch2/default.nix b/pkgs/development/libraries/catch2/default.nix index 4e41f39b49b..34d61a519ab 100644 --- a/pkgs/development/libraries/catch2/default.nix +++ b/pkgs/development/libraries/catch2/default.nix @@ -1,21 +1,21 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "catch2"; - version = "2.13.3"; + version = "2.13.4"; src = fetchFromGitHub { owner = "catchorg"; repo = "Catch2"; rev = "v${version}"; - sha256="0m7pwsam1nb93akgnf5fxi737pgbrbcj0y28bavhzcss7yrm4gys"; + sha256="sha256-8tR8MCFYK5XXtJQaIuZ59PJ3h3UYbfXKkaOfcBRt1Xo="; }; nativeBuildInputs = [ cmake ]; cmakeFlags = [ "-H.." ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A multi-paradigm automated test framework for C++ and Objective-C (and, maybe, C)"; homepage = "http://catch-lib.net"; license = licenses.boost; diff --git a/pkgs/development/libraries/ccrtp/default.nix b/pkgs/development/libraries/ccrtp/default.nix index dba16b19e3b..39792d4fd6a 100644 --- a/pkgs/development/libraries/ccrtp/default.nix +++ b/pkgs/development/libraries/ccrtp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, ucommon, openssl, libgcrypt }: +{ lib, stdenv, fetchurl, pkg-config, ucommon, openssl, libgcrypt }: stdenv.mkDerivation rec { name = "ccrtp-2.1.2"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "17ili8l7zqbbkzr1rcy4hlnazkf50mds41wg6n7bfdsx3c7cldgh"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ ucommon openssl libgcrypt ]; configureFlags = [ @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { meta = { description = "An implementation of the IETF real-time transport protocol (RTP)"; homepage = "https://www.gnu.org/software/ccrtp/"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ marcweber ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ marcweber ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/cctz/default.nix b/pkgs/development/libraries/cctz/default.nix index 848927776f9..aff977edd91 100644 --- a/pkgs/development/libraries/cctz/default.nix +++ b/pkgs/development/libraries/cctz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, darwin }: +{ lib, stdenv, fetchFromGitHub, darwin }: stdenv.mkDerivation rec { pname = "cctz"; @@ -13,17 +13,17 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Foundation; + buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Foundation; installTargets = [ "install_hdrs" "install_shared_lib" ]; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.isDarwin '' install_name_tool -id $out/lib/libcctz.so $out/lib/libcctz.so ''; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/google/cctz"; description = "C++ library for translating between absolute and civil times"; license = licenses.asl20; diff --git a/pkgs/development/libraries/cddlib/default.nix b/pkgs/development/libraries/cddlib/default.nix index cebe6fb2bf6..9ff54f8ebf9 100644 --- a/pkgs/development/libraries/cddlib/default.nix +++ b/pkgs/development/libraries/cddlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , gmp , autoreconfHook @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { # No actual checks yet (2018-05-05), but maybe one day. # Requested here: https://github.com/cddlib/cddlib/issues/25 doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { inherit version; - description = ''An implementation of the Double Description Method for generating all vertices of a convex polyhedron''; + description = "An implementation of the Double Description Method for generating all vertices of a convex polyhedron"; license = licenses.gpl2Plus; maintainers = teams.sage.members; platforms = platforms.unix; diff --git a/pkgs/development/libraries/cdk/default.nix b/pkgs/development/libraries/cdk/default.nix index 4613eefd3b9..1a4f617cf46 100644 --- a/pkgs/development/libraries/cdk/default.nix +++ b/pkgs/development/libraries/cdk/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, ncurses }: +{ lib, stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { pname = "cdk"; - version ="5.0-20200923"; + version ="5.0-20210109"; buildInputs = [ ncurses @@ -13,10 +13,10 @@ stdenv.mkDerivation rec { "ftp://ftp.invisible-island.net/cdk/cdk-${version}.tgz" "https://invisible-mirror.net/archives/cdk/cdk-${version}.tgz" ]; - sha256 = "1vdakz119a13d7p7w53hk56fdmbkhv6y9xvdapcfnbnbh3l5szq0"; + sha256 = "sha256-xBbJh793tPGycD18XkM7qUWMi+Uma/RUy/gBrYfnKTY="; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Curses development kit"; license = licenses.bsdOriginal ; maintainers = [ maintainers.raskin ]; diff --git a/pkgs/development/libraries/cdo/default.nix b/pkgs/development/libraries/cdo/default.nix index 10e145b34ea..a038b5885c2 100644 --- a/pkgs/development/libraries/cdo/default.nix +++ b/pkgs/development/libraries/cdo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, curl, hdf5, netcdf +{ lib, stdenv, fetchurl, curl, hdf5, netcdf , # build, install and link to a CDI library [default=no] enable_cdi_lib ? false , # build a completely statically linked CDO binary @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { # Configure phase configureFlags = [ "--with-netcdf=${netcdf}" "--with-hdf5=${hdf5}"] - ++ stdenv.lib.optional (enable_cdi_lib) "--enable-cdi-lib" - ++ stdenv.lib.optional (enable_all_static) "--enable-all-static" - ++ stdenv.lib.optional (enable_cxx) "--enable-cxx"; + ++ lib.optional (enable_cdi_lib) "--enable-cdi-lib" + ++ lib.optional (enable_all_static) "--enable-all-static" + ++ lib.optional (enable_cxx) "--enable-cxx"; - meta = with stdenv.lib; { + meta = with lib; { description = "Collection of command line Operators to manipulate and analyse Climate and NWP model Data"; longDescription = '' Supported data formats are GRIB 1/2, netCDF 3/4, SERVICE, EXTRA and IEG. diff --git a/pkgs/development/libraries/cegui/default.nix b/pkgs/development/libraries/cegui/default.nix index 7397bdceb76..ba3366198c2 100644 --- a/pkgs/development/libraries/cegui/default.nix +++ b/pkgs/development/libraries/cegui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, ogre, freetype, boost, expat }: +{ lib, stdenv, fetchurl, cmake, ogre, freetype, boost, expat }: stdenv.mkDerivation rec { pname = "cegui"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ ogre freetype boost expat ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://cegui.org.uk/"; description = "C++ Library for creating GUIs"; license = licenses.mit; diff --git a/pkgs/development/libraries/celt/generic.nix b/pkgs/development/libraries/celt/generic.nix index 6277c5cd931..d4fe5e83658 100644 --- a/pkgs/development/libraries/celt/generic.nix +++ b/pkgs/development/libraries/celt/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, version, src +{ lib, stdenv, version, src , liboggSupport ? true, libogg ? null # if disabled only the library will be built , prePatch ? "" , ... @@ -15,11 +15,11 @@ stdenv.mkDerivation { inherit prePatch; buildInputs = [] - ++ stdenv.lib.optional liboggSupport libogg; + ++ lib.optional liboggSupport libogg; doCheck = false; # fails - meta = with stdenv.lib; { + meta = with lib; { description = "Ultra-low delay audio codec"; homepage = "http://www.celt-codec.org/"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/cereal/default.nix b/pkgs/development/libraries/cereal/default.nix index e17b42ea5c1..d2321175f8b 100644 --- a/pkgs/development/libraries/cereal/default.nix +++ b/pkgs/development/libraries/cereal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "cereal"; version = "1.3.0"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { cmakeFlagsArray = [ "-DJUST_INSTALL_CEREAL=yes" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A header-only C++11 serialization library"; homepage = "https://uscilab.github.io/cereal/"; platforms = platforms.all; diff --git a/pkgs/development/libraries/ceres-solver/default.nix b/pkgs/development/libraries/ceres-solver/default.nix index 18f029c4585..14d0e38f3d9 100644 --- a/pkgs/development/libraries/ceres-solver/default.nix +++ b/pkgs/development/libraries/ceres-solver/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , eigen , fetchurl , cmake @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ eigen glog ] - ++ stdenv.lib.optional runTests gflags; + ++ lib.optional runTests gflags; # The Basel BUILD file conflicts with the cmake build directory on # case-insensitive filesystems, eg. darwin. @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { checkTarget = "test"; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ library for modeling and solving large, complicated optimization problems"; license = licenses.bsd3; homepage = "http://ceres-solver.org"; diff --git a/pkgs/development/libraries/cfitsio/default.nix b/pkgs/development/libraries/cfitsio/default.nix index 1b7dc58c0d6..28bb0761777 100644 --- a/pkgs/development/libraries/cfitsio/default.nix +++ b/pkgs/development/libraries/cfitsio/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv +{ fetchurl, lib, stdenv # Optional dependencies , bzip2 ? null }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { patches = [ ./darwin-rpath-universal.patch ]; - configureFlags = stdenv.lib.optional (bzip2 != null) "--with-bzip2=${bzip2.out}"; + configureFlags = lib.optional (bzip2 != null) "--with-bzip2=${bzip2.out}"; hardeningDisable = [ "format" ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { postPatch = '' sed -e '/^install:/s/libcfitsio.a //' -e 's@/bin/@@g' -i Makefile.in ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://heasarc.gsfc.nasa.gov/fitsio/"; description = "Library for reading and writing FITS data files"; longDescription = diff --git a/pkgs/development/libraries/cgui/default.nix b/pkgs/development/libraries/cgui/default.nix index d6c550a8da8..1bc85d1fcd8 100644 --- a/pkgs/development/libraries/cgui/default.nix +++ b/pkgs/development/libraries/cgui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, texinfo, allegro, perl, libX11 }: +{ lib, stdenv, fetchurl, texinfo, allegro, perl, libX11 }: stdenv.mkDerivation rec { pname = "cgui"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { makeFlags = [ "SYSTEM_DIR=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A multiplatform basic GUI library"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/check/default.nix b/pkgs/development/libraries/check/default.nix index be000e457c4..37bde1caf43 100644 --- a/pkgs/development/libraries/check/default.nix +++ b/pkgs/development/libraries/check/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv +{ fetchurl, lib, stdenv , CoreServices }: @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { # Test can randomly fail: https://hydra.nixos.org/build/7243912 doCheck = false; - buildInputs = stdenv.lib.optional stdenv.isDarwin CoreServices; + buildInputs = lib.optional stdenv.isDarwin CoreServices; - meta = with stdenv.lib; { + meta = with lib; { description = "Unit testing framework for C"; longDescription = diff --git a/pkgs/development/libraries/chipmunk/default.nix b/pkgs/development/libraries/chipmunk/default.nix index 7618476d62a..8290e60a485 100644 --- a/pkgs/development/libraries/chipmunk/default.nix +++ b/pkgs/development/libraries/chipmunk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, freeglut, libGLU, libGL, glfw2, glew, libX11, xorgproto +{ lib, stdenv, fetchurl, cmake, freeglut, libGLU, libGL, glfw2, glew, libX11, xorgproto , libXi, libXmu, fetchpatch, libXrandr }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { cp demo/chipmunk_demos $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A fast and lightweight 2D game physics library"; homepage = "http://chipmunk2d.net/"; license = licenses.mit; diff --git a/pkgs/development/libraries/chmlib/default.nix b/pkgs/development/libraries/chmlib/default.nix index 9b95fd26444..8971acc7edd 100644 --- a/pkgs/development/libraries/chmlib/default.nix +++ b/pkgs/development/libraries/chmlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { name = "chmlib-0.40a"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.jedrea.com/chmlib"; - license = stdenv.lib.licenses.lgpl2; + license = lib.licenses.lgpl2; description = "A library for dealing with Microsoft ITSS/CHM format files"; platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux"]; }; diff --git a/pkgs/development/libraries/chromaprint/default.nix b/pkgs/development/libraries/chromaprint/default.nix index 12f844aa595..599ef02eec0 100644 --- a/pkgs/development/libraries/chromaprint/default.nix +++ b/pkgs/development/libraries/chromaprint/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_EXAMPLES=ON" "-DBUILD_TOOLS=ON" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://acoustid.org/chromaprint"; description = "AcoustID audio fingerprinting library"; maintainers = with maintainers; [ ehmry ]; diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix index 61d3996a4f5..eb55178db0d 100644 --- a/pkgs/development/libraries/cimg/default.nix +++ b/pkgs/development/libraries/cimg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "cimg"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "doc" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A small, open source, C++ toolkit for image processing"; longDescription = '' CImg stands for Cool Image. It is easy to use, efficient and is intended diff --git a/pkgs/development/libraries/civetweb/default.nix b/pkgs/development/libraries/civetweb/default.nix index 4092a9c9c5b..8a3474a491f 100644 --- a/pkgs/development/libraries/civetweb/default.nix +++ b/pkgs/development/libraries/civetweb/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub }: @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { meta = { description = "Embedded C/C++ web server"; homepage = "https://github.com/civetweb/civetweb"; - license = [ stdenv.lib.licenses.mit ]; + license = [ lib.licenses.mit ]; }; } diff --git a/pkgs/development/libraries/cjson/default.nix b/pkgs/development/libraries/cjson/default.nix new file mode 100644 index 00000000000..b75b91508cb --- /dev/null +++ b/pkgs/development/libraries/cjson/default.nix @@ -0,0 +1,29 @@ +{ stdenv, lib, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "cjson"; + version = "1.7.14"; + + src = fetchFromGitHub { + owner = "DaveGamble"; + repo = "cJSON"; + rev = "v${version}"; + sha256 = "1a3i9ydl65dgwgmlg79n5q8qilmjkaakq56sam1w25zcrd8jy11q"; + }; + + nativeBuildInputs = [ cmake ]; + + # cJSON actually uses C99 standard, not C89 + # https://github.com/DaveGamble/cJSON/issues/275 + postPatch = '' + substituteInPlace CMakeLists.txt --replace -std=c89 -std=c99 + ''; + + meta = with lib; { + homepage = "https://github.com/DaveGamble/cJSON"; + description = "Ultralightweight JSON parser in ANSI C"; + license = licenses.mit; + maintainers = [ maintainers.matthiasbeyer ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/cl/default.nix b/pkgs/development/libraries/cl/default.nix index aad14bead66..a4b526ea25d 100644 --- a/pkgs/development/libraries/cl/default.nix +++ b/pkgs/development/libraries/cl/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, rebar, erlang, opencl-headers, ocl-icd }: +{lib, stdenv, fetchFromGitHub, rebar, erlang, opencl-headers, ocl-icd }: stdenv.mkDerivation rec { version = "1.2.4"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { cp -ruv c_src doc ebin include priv src $DIR ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/tonyrog/cl"; description = "OpenCL binding for Erlang"; license = licenses.mit; diff --git a/pkgs/development/libraries/classads/default.nix b/pkgs/development/libraries/classads/default.nix index f2377a59e7b..ba8961c8f6c 100644 --- a/pkgs/development/libraries/classads/default.nix +++ b/pkgs/development/libraries/classads/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pcre }: +{ lib, stdenv, fetchurl, pcre }: let version = "1.0.10"; in @@ -16,11 +16,11 @@ stdenv.mkDerivation { configureFlags = [ "--enable-namespace" "--enable-flexible-member" ]; - + meta = { homepage = "http://www.cs.wisc.edu/condor/classad/"; description = "The Classified Advertisements library provides a generic means for matching resources"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/clearsilver/default.nix b/pkgs/development/libraries/clearsilver/default.nix index 8b79619dff4..74d167144a9 100644 --- a/pkgs/development/libraries/clearsilver/default.nix +++ b/pkgs/development/libraries/clearsilver/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, python }: +{ lib, stdenv, fetchurl, fetchpatch, python }: stdenv.mkDerivation rec { name = "clearsilver-0.10.5"; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { }) ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast, powerful, and language-neutral HTML template system"; homepage = "http://www.clearsilver.net/"; license = licenses.free; diff --git a/pkgs/development/libraries/clfft/default.nix b/pkgs/development/libraries/clfft/default.nix index 5eb5b842ecf..91267208d2e 100644 --- a/pkgs/development/libraries/clfft/default.nix +++ b/pkgs/development/libraries/clfft/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, fftw, fftwFloat, boost166, opencl-clhpp, ocl-icd }: +{ lib, stdenv, fetchFromGitHub, cmake, fftw, fftwFloat, boost166, opencl-clhpp, ocl-icd }: let version = "2.12.2"; @@ -19,7 +19,7 @@ in stdenv.mkDerivation { buildInputs = [ fftw fftwFloat boost166 opencl-clhpp ocl-icd ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library containing FFT functions written in OpenCL"; longDescription = '' clFFT is a software library containing FFT functions written in OpenCL. diff --git a/pkgs/development/libraries/clipp/default.nix b/pkgs/development/libraries/clipp/default.nix index f7c8f90e868..12b393e597d 100644 --- a/pkgs/development/libraries/clipp/default.nix +++ b/pkgs/development/libraries/clipp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "clipp"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { --subst-var version ''; - meta = with stdenv.lib; { + meta = with 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; diff --git a/pkgs/development/libraries/clipper/default.nix b/pkgs/development/libraries/clipper/default.nix index ebb41fde423..9eb34f6b686 100644 --- a/pkgs/development/libraries/clipper/default.nix +++ b/pkgs/development/libraries/clipper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, ninja, unzip }: +{ lib, stdenv, fetchurl, cmake, ninja, unzip }: stdenv.mkDerivation rec { version = "6.4.2"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja unzip ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A polygon and line clipping and offsetting library (C++, C#, Delphi)"; longDescription = '' The Clipper library performs line & polygon clipping - intersection, union, difference & exclusive-or, diff --git a/pkgs/development/libraries/cln/default.nix b/pkgs/development/libraries/cln/default.nix index 669ce90287b..23bbd84a209 100644 --- a/pkgs/development/libraries/cln/default.nix +++ b/pkgs/development/libraries/cln/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gmp }: +{ lib, stdenv, fetchurl, gmp }: stdenv.mkDerivation rec { pname = "cln"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ gmp ]; - meta = with stdenv.lib; { + meta = with lib; { description = "C/C++ library for numbers, a part of GiNaC"; homepage = "https://www.ginac.de/CLN/"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/cloog-ppl/default.nix b/pkgs/development/libraries/cloog-ppl/default.nix index f7a0bd058e7..b2bd2adde43 100644 --- a/pkgs/development/libraries/cloog-ppl/default.nix +++ b/pkgs/development/libraries/cloog-ppl/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, ppl, autoreconfHook }: +{ fetchurl, lib, stdenv, ppl, autoreconfHook }: stdenv.mkDerivation rec { name = "cloog-ppl-0.15.11"; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { # CLooG-PPL is actually a port of GLooG from PolyLib to PPL. homepage = "http://www.cloog.org/"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; maintainers = [ ]; @@ -65,6 +65,6 @@ stdenv.mkDerivation rec { make[3]: *** [Box.lo] Error 1 */ - platforms = stdenv.lib.platforms.unix; # Once had cygwin problems + platforms = lib.platforms.unix; # Once had cygwin problems }; } diff --git a/pkgs/development/libraries/cloog/0.18.0.nix b/pkgs/development/libraries/cloog/0.18.0.nix index b0f69d42e8c..c952c1a563b 100644 --- a/pkgs/development/libraries/cloog/0.18.0.nix +++ b/pkgs/development/libraries/cloog/0.18.0.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, gmp, isl }: +{ fetchurl, lib, stdenv, gmp, isl }: stdenv.mkDerivation rec { name = "cloog-0.18.0"; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { homepage = "http://www.cloog.org/"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; /* Leads to an ICE on Cygwin: @@ -58,6 +58,6 @@ stdenv.mkDerivation rec { make[3]: *** [Box.lo] Error 1 */ - platforms = stdenv.lib.platforms.unix; # Once had cygwin problems + platforms = lib.platforms.unix; # Once had cygwin problems }; } diff --git a/pkgs/development/libraries/cloog/default.nix b/pkgs/development/libraries/cloog/default.nix index be506cdee17..54df2df9d4d 100644 --- a/pkgs/development/libraries/cloog/default.nix +++ b/pkgs/development/libraries/cloog/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, gmp, isl }: +{ fetchurl, lib, stdenv, gmp, isl }: stdenv.mkDerivation rec { name = "cloog-0.18.4"; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { homepage = "http://www.cloog.org/"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; /* Leads to an ICE on Cygwin: @@ -59,6 +59,6 @@ stdenv.mkDerivation rec { make[3]: *** [Box.lo] Error 1 */ - platforms = stdenv.lib.platforms.unix; # Once had cygwin problems + platforms = lib.platforms.unix; # Once had cygwin problems }; } diff --git a/pkgs/development/libraries/clucene-core/2.x.nix b/pkgs/development/libraries/clucene-core/2.x.nix index 3776f1eac21..9c1f3c21cd2 100644 --- a/pkgs/development/libraries/clucene-core/2.x.nix +++ b/pkgs/development/libraries/clucene-core/2.x.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cmake, boost, zlib}: +{lib, stdenv, fetchurl, cmake, boost, zlib}: stdenv.mkDerivation rec { name = "clucene-core-2.3.3.4"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { "-DBUILD_CONTRIBS=ON" "-DBUILD_CONTRIBS_LIB=ON" "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON" - ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "-D_CL_HAVE_GCC_ATOMIC_FUNCTIONS=0" "-D_CL_HAVE_NAMESPACES_EXITCODE=0" "-D_CL_HAVE_NO_SNPRINTF_BUG_EXITCODE=0" @@ -30,15 +30,15 @@ stdenv.mkDerivation rec { [ ./Fix-pkgconfig-file-by-adding-clucene-shared-library.patch ./Fixing_ZLIB_configuration_in_shared_CMakeLists.patch ./Install-contribs-lib.patch - ] ++ stdenv.lib.optionals stdenv.isDarwin [ ./fix-darwin.patch ]; + ] ++ lib.optionals stdenv.isDarwin [ ./fix-darwin.patch ]; # fails with "Unable to find executable: # /build/clucene-core-2.3.3.4/build/bin/cl_test" doCheck = false; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; - meta = with stdenv.lib; { + meta = with lib; { description = "Core library for full-featured text search engine"; longDescription = '' CLucene is a high-performance, scalable, cross platform, full-featured, diff --git a/pkgs/development/libraries/clucene-core/default.nix b/pkgs/development/libraries/clucene-core/default.nix index d71d01de9e2..20b0a3b547c 100644 --- a/pkgs/development/libraries/clucene-core/default.nix +++ b/pkgs/development/libraries/clucene-core/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { name = "clucene-core-0.9.21b"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { patches = [ ./gcc6.patch ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Core library for full-featured text search engine"; longDescription = '' CLucene is a high-performance, scalable, cross platform, full-featured, diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix index 1a9644991b6..166d4e12c25 100644 --- a/pkgs/development/libraries/clutter-gst/default.nix +++ b/pkgs/development/libraries/clutter-gst/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, clutter, gtk3, glib, cogl, gnome3, gdk-pixbuf }: +{ fetchurl, lib, stdenv, pkg-config, clutter, gtk3, glib, cogl, gnome3, gdk-pixbuf }: stdenv.mkDerivation rec { pname = "clutter-gst"; @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "17czmpl92dzi4h3rn5rishk015yi3jwiw29zv8qan94xcmnbssgy"; }; propagatedBuildInputs = [ clutter gtk3 glib cogl gdk-pixbuf ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; postBuild = "rm -rf $out/share/gtk-doc"; @@ -27,9 +27,9 @@ stdenv.mkDerivation rec { homepage = "http://www.clutter-project.org/"; - license = stdenv.lib.licenses.lgpl2Plus; + license = lib.licenses.lgpl2Plus; - maintainers = with stdenv.lib.maintainers; [ lethalman ]; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice + maintainers = with lib.maintainers; [ lethalman ]; + platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix index 973ae344dc9..0dfb8c7b9df 100644 --- a/pkgs/development/libraries/clutter-gtk/default.nix +++ b/pkgs/development/libraries/clutter-gtk/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, meson, ninja +{ fetchurl, lib, stdenv, pkg-config, meson, ninja , gobject-introspection, clutter, gtk3, gnome3 }: let @@ -10,14 +10,14 @@ 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}/${lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "01ibniy4ich0fgpam53q252idm7f4fn5xg5qvizcfww90gn9652j"; }; outputs = [ "out" "dev" ]; propagatedBuildInputs = [ clutter gtk3 ]; - nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection ]; + nativeBuildInputs = [ meson ninja pkg-config gobject-introspection ]; postBuild = "rm -rf $out/share/gtk-doc"; @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { meta = { description = "Clutter-GTK"; homepage = "http://www.clutter-project.org/"; - license = stdenv.lib.licenses.lgpl2Plus; - maintainers = with stdenv.lib.maintainers; [ lethalman ]; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice + license = lib.licenses.lgpl2Plus; + maintainers = with lib.maintainers; [ lethalman ]; + platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix index 8a70a872b9e..002db004dc1 100644 --- a/pkgs/development/libraries/clutter/default.nix +++ b/pkgs/development/libraries/clutter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libGLU, libGL, libX11, libXext, libXfixes +{ lib, stdenv, fetchurl, pkg-config, libGLU, libGL, libX11, libXext, libXfixes , libXdamage, libXcomposite, libXi, libxcb, cogl, pango, atk, json-glib , gobject-introspection, gtk3, gnome3, libinput, libgudev, libxkbcommon }: @@ -11,14 +11,14 @@ 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}/${lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "1rn4cd1an6a9dfda884aqpcwcgq8dgydpqvb19nmagw4b70zlj4b"; }; outputs = [ "out" "dev" ]; buildInputs = [ gtk3 ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ libX11 libGL libGLU libXext libXfixes libXdamage libXcomposite libXi cogl pango atk json-glib gobject-introspection libxcb libinput libgudev libxkbcommon @@ -52,10 +52,10 @@ stdenv.mkDerivation rec { specific needs. ''; - license = stdenv.lib.licenses.lgpl2Plus; + license = lib.licenses.lgpl2Plus; homepage = "http://www.clutter-project.org/"; - maintainers = with stdenv.lib.maintainers; [ lethalman ]; - platforms = stdenv.lib.platforms.mesaPlatforms; + maintainers = with lib.maintainers; [ lethalman ]; + platforms = lib.platforms.mesaPlatforms; }; } diff --git a/pkgs/development/libraries/cm256cc/default.nix b/pkgs/development/libraries/cm256cc/default.nix index eaddcb86f54..b40aea70b41 100644 --- a/pkgs/development/libraries/cm256cc/default.nix +++ b/pkgs/development/libraries/cm256cc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, boost } : +{ lib, stdenv, fetchFromGitHub, cmake, boost } : stdenv.mkDerivation rec { pname = "cm256cc"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ boost ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast GF(256) Cauchy MDS Block Erasure Codec in C++"; homepage = "https://github.com/f4exb/cm256cc"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/cmark-gfm/default.nix b/pkgs/development/libraries/cmark-gfm/default.nix index 52a02772268..8a9534365f4 100644 --- a/pkgs/development/libraries/cmark-gfm/default.nix +++ b/pkgs/development/libraries/cmark-gfm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "cmark-gfm"; version = "0.29.0.gfm.0"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { # tests load the library dynamically which for unknown reason failed doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "GitHub's fork of cmark, a CommonMark parsing and rendering library and program in C"; homepage = "https://github.com/github/cmark-gfm"; maintainers = with maintainers; [ cyplo ]; diff --git a/pkgs/development/libraries/cmark/default.nix b/pkgs/development/libraries/cmark/default.nix index b132e958f67..6061fd8f912 100644 --- a/pkgs/development/libraries/cmark/default.nix +++ b/pkgs/development/libraries/cmark/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { version = "0.29.0"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { export LD_LIBRARY_PATH=$(readlink -f ./src) ''; - meta = with stdenv.lib; { + meta = with lib; { description = "CommonMark parsing and rendering library and program in C"; homepage = "https://github.com/jgm/cmark"; maintainers = [ maintainers.michelk ]; diff --git a/pkgs/development/libraries/cminpack/default.nix b/pkgs/development/libraries/cminpack/default.nix index 3b2d748a836..39d4849f380 100644 --- a/pkgs/development/libraries/cminpack/default.nix +++ b/pkgs/development/libraries/cminpack/default.nix @@ -1,8 +1,8 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { name = "cminpack-1.3.6"; - + src = fetchurl { url = "http://devernay.free.fr/hacks/cminpack/${name}.tar.gz"; sha256 = "17yh695aim508x1kn9zf6g13jxwk3pi3404h5ix4g5lc60hzs1rw"; @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { meta = { homepage = "http://devernay.free.fr/hacks/cminpack/cminpack.html"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; description = "Software for solving nonlinear equations and nonlinear least squares problems"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/cmocka/default.nix b/pkgs/development/libraries/cmocka/default.nix index 18c1843623f..9bfbc410c00 100644 --- a/pkgs/development/libraries/cmocka/default.nix +++ b/pkgs/development/libraries/cmocka/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, cmake }: +{ fetchurl, lib, stdenv, cmake }: stdenv.mkDerivation rec { pname = "cmocka"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Lightweight library to simplify and generalize unit tests for C"; longDescription = diff --git a/pkgs/development/libraries/cmrt/default.nix b/pkgs/development/libraries/cmrt/default.nix index 512a289152a..43d73ba200c 100644 --- a/pkgs/development/libraries/cmrt/default.nix +++ b/pkgs/development/libraries/cmrt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, libdrm, libva }: +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libdrm, libva }: stdenv.mkDerivation rec { pname = "cmrt"; @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { sha256 = "1q7651nvvcqhph5rgfhklm71zqd0c405mrh3wx0cfzvil82yj8na"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libdrm libva ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://01.org/linuxmedia"; description = "Intel C for Media Runtime"; longDescription = "Media GPU kernel manager for Intel G45 & HD Graphics family"; diff --git a/pkgs/development/libraries/codec2/default.nix b/pkgs/development/libraries/codec2/default.nix index 4a648b1f32a..88b35f16c30 100644 --- a/pkgs/development/libraries/codec2/default.nix +++ b/pkgs/development/libraries/codec2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "codec2"; @@ -13,10 +13,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Speech codec designed for communications quality speech at low data rates"; homepage = "http://www.rowetel.com/blog/?page_id=452"; - license = licenses.lgpl21; + license = licenses.lgpl21Only; platforms = platforms.unix; maintainers = with maintainers; [ markuskowa ]; }; diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index f2a69e87d85..8fd15207287 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, libGL, glib, gdk-pixbuf, xorg, libintl +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, libGL, glib, gdk-pixbuf, xorg, libintl , pangoSupport ? true, pango, cairo, gobject-introspection, wayland, gnome3 , mesa, automake, autoconf , gstreamerSupport ? true, gst_all_1 }: @@ -10,7 +10,7 @@ in stdenv.mkDerivation rec { version = "1.22.8"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "0nfph4ai60ncdx7hy6hl1i1cmp761jgnyjfhagzi0iqq36qb41d8"; }; @@ -33,27 +33,27 @@ in stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig libintl automake autoconf ]; + nativeBuildInputs = [ pkg-config libintl automake autoconf ]; configureFlags = [ "--enable-introspection" "--enable-kms-egl-platform" "--enable-wayland-egl-platform" "--enable-wayland-egl-server" - ] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst" - ++ stdenv.lib.optionals (!stdenv.isDarwin) [ "--enable-gles1" "--enable-gles2" ]; + ] ++ lib.optional gstreamerSupport "--enable-cogl-gst" + ++ lib.optionals (!stdenv.isDarwin) [ "--enable-gles1" "--enable-gles2" ]; propagatedBuildInputs = with xorg; [ glib gdk-pixbuf gobject-introspection wayland mesa libGL libXrandr libXfixes libXcomposite libXdamage ] - ++ stdenv.lib.optionals gstreamerSupport [ gst_all_1.gstreamer + ++ lib.optionals gstreamerSupport [ gst_all_1.gstreamer gst_all_1.gst-plugins-base ]; - buildInputs = stdenv.lib.optionals pangoSupport [ pango cairo ]; + buildInputs = lib.optionals pangoSupport [ pango cairo ]; COGL_PANGO_DEP_CFLAGS - = stdenv.lib.optionalString (stdenv.isDarwin && pangoSupport) + = lib.optionalString (stdenv.isDarwin && pangoSupport) "-I${pango.dev}/include/pango-1.0 -I${cairo.dev}/include/cairo"; #doCheck = true; # all tests fail (no idea why) @@ -64,7 +64,7 @@ in stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A small open source library for using 3D graphics hardware for rendering"; maintainers = with maintainers; [ lovek323 ]; diff --git a/pkgs/development/libraries/coin3d/default.nix b/pkgs/development/libraries/coin3d/default.nix index c76aaa4c8e5..3fe78e6d02e 100644 --- a/pkgs/development/libraries/coin3d/default.nix +++ b/pkgs/development/libraries/coin3d/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, boost, cmake, libX11, libGL, libGLU }: +{ fetchFromGitHub, lib, stdenv, boost, cmake, libX11, libGL, libGLU }: stdenv.mkDerivation rec { pname = "coin"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ boost libX11 libGL libGLU ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/coin3d/coin"; license = licenses.bsd3; description = "High-level, retained-mode toolkit for effective 3D graphics development"; diff --git a/pkgs/development/libraries/comedilib/default.nix b/pkgs/development/libraries/comedilib/default.nix index 98811b97c87..fef22dea06a 100644 --- a/pkgs/development/libraries/comedilib/default.nix +++ b/pkgs/development/libraries/comedilib/default.nix @@ -1,4 +1,5 @@ { stdenv +, lib , fetchFromGitHub , autoreconfHook , flex @@ -18,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "Linux-Comedi"; repo = "comedilib"; - rev = "r${stdenv.lib.replaceStrings [ "." ] [ "_" ] version}"; + rev = "r${lib.replaceStrings [ "." ] [ "_" ] version}"; sha256 = "0kfs2dw62vjz8j7fgsxq6ky8r8kca726gyklbm6kljvgfh47lyfw"; }; @@ -45,7 +46,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" "doc" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "The Linux Control and Measurement Device Interface Library"; homepage = "https://github.com/Linux-Comedi/comedilib"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/concurrencykit/default.nix b/pkgs/development/libraries/concurrencykit/default.nix index a54bc754782..968c395d701 100644 --- a/pkgs/development/libraries/concurrencykit/default.nix +++ b/pkgs/development/libraries/concurrencykit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "concurrencykit"; @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { url = "http://concurrencykit.org/releases/ck-${version}.tar.gz"; sha256 = "1pv21p7sjwwmbs2xblpy1lqk53r2i212yrqyjlr5dr3rlv87vqnp"; }; - + #Deleting this line causes "Unknown option --disable-static" configurePhase = "./configure --prefix=$out"; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A library of safe, high-performance concurrent data structures"; homepage = "http://concurrencykit.org"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/cpp-hocon/default.nix b/pkgs/development/libraries/cpp-hocon/default.nix index e084343a94c..dfe7f777670 100644 --- a/pkgs/development/libraries/cpp-hocon/default.nix +++ b/pkgs/development/libraries/cpp-hocon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, boost, curl, leatherman }: +{ lib, stdenv, fetchFromGitHub, cmake, boost, curl, leatherman }: stdenv.mkDerivation rec { pname = "cpp-hocon"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost curl leatherman ]; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "A C++ port of the Typesafe Config library"; license = licenses.asl20; diff --git a/pkgs/development/libraries/cpp-ipfs-api/default.nix b/pkgs/development/libraries/cpp-ipfs-api/default.nix index 623ab59d3ee..839ddb9b76f 100644 --- a/pkgs/development/libraries/cpp-ipfs-api/default.nix +++ b/pkgs/development/libraries/cpp-ipfs-api/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, curl, cmake, nlohmann_json }: +{ lib, stdenv, fetchFromGitHub, curl, cmake, nlohmann_json }: stdenv.mkDerivation { pname = "cpp-ipfs-api"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { buildInputs = [ curl ]; propagatedBuildInputs = [ nlohmann_json ]; - meta = with stdenv.lib; { + meta = with lib; { description = "IPFS C++ API client library"; homepage = "https://github.com/vasild/cpp-ipfs-api"; license = licenses.mit; diff --git a/pkgs/development/libraries/cpp-netlib/default.nix b/pkgs/development/libraries/cpp-netlib/default.nix index e7079ac0386..6085a3c849c 100644 --- a/pkgs/development/libraries/cpp-netlib/default.nix +++ b/pkgs/development/libraries/cpp-netlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, boost, openssl }: +{ lib, stdenv, fetchFromGitHub, cmake, boost, openssl }: stdenv.mkDerivation rec { pname = "cpp-netlib"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { # Most tests make network GET requests to various websites doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Collection of open-source libraries for high level network programming"; homepage = "https://cpp-netlib.org"; license = licenses.boost; diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix index 08940b4800d..cec6feded13 100644 --- a/pkgs/development/libraries/cpp-utilities/default.nix +++ b/pkgs/development/libraries/cpp-utilities/default.nix @@ -1,4 +1,5 @@ { stdenv +, lib , fetchFromGitHub , fetchpatch , cmake @@ -7,13 +8,13 @@ stdenv.mkDerivation rec { pname = "cpp-utilities"; - version = "5.9.0"; + version = "5.10.0"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "0lcbvmighmc03qxcf03vqmn6188wx4dr3m9d5ldxm2v7mw5xbq82"; + sha256 = "sha256-ZqpgnxI6Py+Xrf+MK852j+kE2JGFz15kWAXOqy+bjVc="; }; nativeBuildInputs = [ cmake ]; @@ -22,7 +23,7 @@ stdenv.mkDerivation rec { checkFlagsArray = [ "LD_LIBRARY_PATH=$(PWD)" ]; doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/Martchus/cpp-utilities"; description = "Common C++ classes and routines used by @Martchus' applications featuring argument parser, IO and conversion utilities"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/cppcms/default.nix b/pkgs/development/libraries/cppcms/default.nix index 7673d257a3e..aceb2d61e38 100644 --- a/pkgs/development/libraries/cppcms/default.nix +++ b/pkgs/development/libraries/cppcms/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pcre, zlib, python, openssl }: +{ lib, stdenv, fetchurl, cmake, pcre, zlib, python, openssl }: stdenv.mkDerivation rec { pname = "cppcms"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { "--no-warn-unused-cli" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://cppcms.com"; description = "High Performance C++ Web Framework"; platforms = platforms.linux ; diff --git a/pkgs/development/libraries/cppdb/default.nix b/pkgs/development/libraries/cppdb/default.nix index 6ad27152b38..98c9c7ecac1 100644 --- a/pkgs/development/libraries/cppdb/default.nix +++ b/pkgs/development/libraries/cppdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, sqlite, libmysqlclient, postgresql, unixODBC }: +{ lib, stdenv, fetchurl, cmake, sqlite, libmysqlclient, postgresql, unixODBC }: stdenv.mkDerivation rec { pname = "cppdb"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "--no-warn-unused-cli" ]; NIX_CFLAGS_COMPILE = "-I${libmysqlclient}/include/mysql -L${libmysqlclient}/lib/mysql"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://cppcms.com/sql/cppdb/"; description = "C++ Connectivity library that supports MySQL, PostgreSQL, Sqlite3 databases and generic ODBC drivers"; platforms = platforms.linux ; diff --git a/pkgs/development/libraries/cpptest/default.nix b/pkgs/development/libraries/cpptest/default.nix index 5ed06b99f33..654ad955ae6 100644 --- a/pkgs/development/libraries/cpptest/default.nix +++ b/pkgs/development/libraries/cpptest/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "cpptest-2.0.0"; @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { sha256 = "0lpy3f2fjx1srh02myanlp6zfi497whlldcrnij39ghfhm0arcnm"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://cpptest.sourceforge.net/"; description = "Simple C++ unit testing framework"; maintainers = with maintainers; [ bosu ]; - license = stdenv.lib.licenses.lgpl3; + license = lib.licenses.lgpl3; platforms = with platforms; linux; }; } diff --git a/pkgs/development/libraries/cppunit/default.nix b/pkgs/development/libraries/cppunit/default.nix index bf65be71575..3cafa1c75d7 100644 --- a/pkgs/development/libraries/cppunit/default.nix +++ b/pkgs/development/libraries/cppunit/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { pname = "cppunit"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "19qpqzy66bq76wcyadmi3zahk5v1ll2kig1nvg96zx9padkcdic9"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://freedesktop.org/wiki/Software/cppunit/"; description = "C++ unit testing framework"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/cpputest/default.nix b/pkgs/development/libraries/cpputest/default.nix index d219a8e0bec..8e3fadc7f0d 100644 --- a/pkgs/development/libraries/cpputest/default.nix +++ b/pkgs/development/libraries/cpputest/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { version = "4.0"; @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://cpputest.github.io/"; description = "Unit testing and mocking framework for C/C++"; - platforms = stdenv.lib.platforms.linux ; - license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.juliendehos ]; + platforms = lib.platforms.linux ; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.juliendehos ]; }; } diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/development/libraries/cppzmq/default.nix index fdd98cb00bf..9237c3bd307 100644 --- a/pkgs/development/libraries/cppzmq/default.nix +++ b/pkgs/development/libraries/cppzmq/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, zeromq }: +{ lib, stdenv, fetchFromGitHub, cmake, zeromq }: stdenv.mkDerivation rec { pname = "cppzmq"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { "-DCPPZMQ_BUILD_TESTS=OFF" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/zeromq/cppzmq"; license = licenses.bsd2; description = "C++ binding for 0MQ"; diff --git a/pkgs/development/libraries/cracklib/default.nix b/pkgs/development/libraries/cracklib/default.nix index c10a69d72f9..13029f7739c 100644 --- a/pkgs/development/libraries/cracklib/default.nix +++ b/pkgs/development/libraries/cracklib/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) buildPackages.cracklib; buildInputs = [ zlib gettext ]; - postPatch = stdenv.lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + postPatch = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' chmod +x util/cracklib-format patchShebangs util diff --git a/pkgs/development/libraries/crc32c/default.nix b/pkgs/development/libraries/crc32c/default.nix index c10d218ea42..bc46e80db9b 100644 --- a/pkgs/development/libraries/crc32c/default.nix +++ b/pkgs/development/libraries/crc32c/default.nix @@ -16,10 +16,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ gflags ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isAarch64 "-march=armv8-a+crc"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isAarch64 "-march=armv8-a+crc"; cmakeFlags = lib.optionals (!staticOnly) [ "-DBUILD_SHARED_LIBS=1" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/google/crc32c"; description = "CRC32C implementation with support for CPU-specific acceleration instructions"; license = with licenses; [ bsd3 ]; diff --git a/pkgs/development/libraries/crcpp/default.nix b/pkgs/development/libraries/crcpp/default.nix index c26578804ba..9410b071500 100644 --- a/pkgs/development/libraries/crcpp/default.nix +++ b/pkgs/development/libraries/crcpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { cp inc/CRC.h $out/include ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/d-bahr/CRCpp"; description = "Easy to use and fast C++ CRC library"; platforms = platforms.all; diff --git a/pkgs/development/libraries/cre2/default.nix b/pkgs/development/libraries/cre2/default.nix index fa4f5d232aa..d85843a54f7 100644 --- a/pkgs/development/libraries/cre2/default.nix +++ b/pkgs/development/libraries/cre2/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, - libtool, pkgconfig, re2, texinfo }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, + libtool, pkg-config, re2, texinfo }: stdenv.mkDerivation rec { pname = "cre2"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook libtool - pkgconfig + pkg-config ]; buildInputs = [ re2 texinfo ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { "--enable-maintainer-mode" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://marcomaggi.github.io/docs/cre2.html"; description = "C Wrapper for RE2"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/criterion/default.nix b/pkgs/development/libraries/criterion/default.nix index bd42a9c866e..ba436fec0a2 100644 --- a/pkgs/development/libraries/criterion/default.nix +++ b/pkgs/development/libraries/criterion/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, boxfort, cmake, libcsptr, pkg-config, gettext +{ lib, stdenv, fetchFromGitHub, boxfort, cmake, libcsptr, pkg-config, gettext , dyncall , nanomsg, python37Packages }: stdenv.mkDerivation rec { @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { outputs = [ "dev" "out" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A cross-platform C and C++ unit testing framework for the 21th century"; homepage = "https://github.com/Snaipe/Criterion"; license = licenses.mit; diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/development/libraries/crypto++/default.nix index 3fe27748155..0402af92b3b 100644 --- a/pkgs/development/libraries/crypto++/default.nix +++ b/pkgs/development/libraries/crypto++/default.nix @@ -1,47 +1,53 @@ -{ stdenv, fetchFromGitHub, nasm, which }: +{ lib, stdenv, fetchFromGitHub, nasm, which +, enableStatic ? stdenv.hostPlatform.isStatic +, enableShared ? !enableStatic +}: -with stdenv.lib; stdenv.mkDerivation rec { pname = "crypto++"; - version = "8.2.0"; - underscoredVersion = strings.replaceStrings ["."] ["_"] version; + version = "8.4.0"; + underscoredVersion = lib.strings.replaceStrings ["."] ["_"] version; src = fetchFromGitHub { owner = "weidai11"; repo = "cryptopp"; rev = "CRYPTOPP_${underscoredVersion}"; - sha256 = "01zrrzjn14yhkb9fzzl57vmh7ig9a6n6fka45f8za0gf7jpcq3mj"; + sha256 = "1gwn8yh1mh41hkh6sgnhb9c3ygrdazd7645msl20i0zdvcp7f5w3"; }; + outputs = [ "out" "dev" ]; + postPatch = '' substituteInPlace GNUmakefile \ --replace "AR = libtool" "AR = ar" \ --replace "ARFLAGS = -static -o" "ARFLAGS = -cru" ''; - nativeBuildInputs = optionals stdenv.hostPlatform.isx86 [ nasm which ]; - - preBuild = optionalString stdenv.hostPlatform.isx86 "${stdenv.shell} rdrand-nasm.sh"; makeFlags = [ "PREFIX=${placeholder "out"}" ]; - buildFlags = [ "shared" "libcryptopp.pc" ]; + buildFlags = + lib.optional enableStatic "static" + ++ lib.optional enableShared "shared" + ++ [ "libcryptopp.pc" ]; enableParallelBuilding = true; doCheck = true; - preInstall = "rm libcryptopp.a"; # built for checks but we don't install static lib into the nix store + # built for checks but we don't install static lib into the nix store + preInstall = lib.optionalString (!enableStatic) "rm libcryptopp.a"; + installTargets = [ "install-lib" ]; installFlags = [ "LDCONF=true" ]; - postInstall = optionalString (!stdenv.hostPlatform.isDarwin) '' - ln -sr $out/lib/libcryptopp.so.${version} $out/lib/libcryptopp.so.${versions.majorMinor version} - ln -sr $out/lib/libcryptopp.so.${version} $out/lib/libcryptopp.so.${versions.major version} + postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' + ln -sr $out/lib/libcryptopp.so.${version} $out/lib/libcryptopp.so.${lib.versions.majorMinor version} + ln -sr $out/lib/libcryptopp.so.${version} $out/lib/libcryptopp.so.${lib.versions.major version} ''; meta = { description = "Crypto++, a free C++ class library of cryptographic schemes"; homepage = "https://cryptopp.com/"; changelog = "https://raw.githubusercontent.com/weidai11/cryptopp/CRYPTOPP_${underscoredVersion}/History.txt"; - license = with licenses; [ boost publicDomain ]; - platforms = platforms.all; - maintainers = with maintainers; [ c0bw3b ]; + license = with lib.licenses; [ boost publicDomain ]; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ c0bw3b ]; }; } diff --git a/pkgs/development/libraries/csfml/default.nix b/pkgs/development/libraries/csfml/default.nix index 61d1d53da63..78d8bce40a3 100644 --- a/pkgs/development/libraries/csfml/default.nix +++ b/pkgs/development/libraries/csfml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, sfml }: +{ lib, stdenv, fetchFromGitHub, cmake, sfml }: let version = "2.5"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { buildInputs = [ sfml ]; cmakeFlags = [ "-DCMAKE_MODULE_PATH=${sfml}/share/SFML/cmake/Modules/" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.sfml-dev.org/"; description = "Simple and fast multimedia library"; longDescription = '' diff --git a/pkgs/development/libraries/ctl/default.nix b/pkgs/development/libraries/ctl/default.nix index 71e30104476..be643e3a52c 100644 --- a/pkgs/development/libraries/ctl/default.nix +++ b/pkgs/development/libraries/ctl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig, ilmbase, libtiff, openexr }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, ilmbase, libtiff, openexr }: stdenv.mkDerivation rec { pname = "ctl"; @@ -19,10 +19,10 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libtiff ilmbase openexr ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Color Transformation Language"; homepage = "https://github.com/ampas/CTL"; license = "A.M.P.A.S"; # BSD-derivative, free but GPL incompatible diff --git a/pkgs/development/libraries/ctpl/default.nix b/pkgs/development/libraries/ctpl/default.nix index 077ac63748c..69380c2eeeb 100644 --- a/pkgs/development/libraries/ctpl/default.nix +++ b/pkgs/development/libraries/ctpl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib }: +{ lib, stdenv, fetchurl, pkg-config, glib }: stdenv.mkDerivation rec { pname = "ctpl"; @@ -9,10 +9,10 @@ stdenv.mkDerivation rec { sha256 = "1yr92xv9n6kgyixwg9ps4zb404ic5pgb171k4bi3mv9p6k8gv59s"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://ctpl.tuxfamily.org/"; description = "Template engine library written in C"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/ctpp2/default.nix b/pkgs/development/libraries/ctpp2/default.nix index 2e3f6a86d49..626606d0526 100644 --- a/pkgs/development/libraries/ctpp2/default.nix +++ b/pkgs/development/libraries/ctpp2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake }: +{ lib, stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { pname = "ctpp2"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails - meta = with stdenv.lib; { + meta = with lib; { description = "A high performance templating engine"; homepage = "http://ctpp.havoc.ru"; maintainers = [ maintainers.robbinch ]; diff --git a/pkgs/development/libraries/ctypes_sh/default.nix b/pkgs/development/libraries/ctypes_sh/default.nix index d82296c3e66..644c68e85d8 100644 --- a/pkgs/development/libraries/ctypes_sh/default.nix +++ b/pkgs/development/libraries/ctypes_sh/default.nix @@ -1,6 +1,6 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub -, autoreconfHook, pkgconfig +, autoreconfHook, pkg-config , zlib, libffi, elfutils, libdwarf }: @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { sha256 = "1wafyfhwd7nf7xdici0djpwgykizaz7jlarn0r1b4spnpjx1zbx4"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ zlib libffi elfutils libdwarf ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A foreign function interface for bash"; homepage = "https://github.com/taviso/ctypes.sh"; license = licenses.mit; diff --git a/pkgs/development/libraries/cudd/default.nix b/pkgs/development/libraries/cudd/default.nix index 6749d2e94c0..4e8cf59fbff 100644 --- a/pkgs/development/libraries/cudd/default.nix +++ b/pkgs/development/libraries/cudd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook }: +{ lib, stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { pname = "cudd"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://davidkebo.com/cudd"; description = "Binary Decision Diagram (BDD) library"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/curlcpp/default.nix b/pkgs/development/libraries/curlcpp/default.nix index 6efc28b4c05..9d4ae41f384 100644 --- a/pkgs/development/libraries/curlcpp/default.nix +++ b/pkgs/development/libraries/curlcpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, curl }: +{ lib, stdenv, fetchFromGitHub, cmake, curl }: stdenv.mkDerivation rec { pname = "curlcpp"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ curl ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://josephp91.github.io/curlcpp/"; description = "Object oriented C++ wrapper for CURL"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/curlpp/default.nix b/pkgs/development/libraries/curlpp/default.nix index 46f1eb33f75..0aee75751d9 100644 --- a/pkgs/development/libraries/curlpp/default.nix +++ b/pkgs/development/libraries/curlpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, curl }: +{ lib, stdenv, fetchFromGitHub, cmake, curl }: stdenv.mkDerivation rec { pname = "curlpp"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl ]; nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.curlpp.org/"; description = "C++ wrapper around libcURL"; license = licenses.mit; diff --git a/pkgs/development/libraries/cutee/default.nix b/pkgs/development/libraries/cutee/default.nix index 661dc7c816c..748d495063d 100644 --- a/pkgs/development/libraries/cutee/default.nix +++ b/pkgs/development/libraries/cutee/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "cutee"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cp cutee $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ Unit Testing Easy Environment"; homepage = "http://www.codesink.org/cutee_unit_testing.html"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/cutelyst/default.nix b/pkgs/development/libraries/cutelyst/default.nix index 1befa89c7d0..80ec1986f8c 100644 --- a/pkgs/development/libraries/cutelyst/default.nix +++ b/pkgs/development/libraries/cutelyst/default.nix @@ -1,19 +1,19 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, wrapQtAppsHook +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, wrapQtAppsHook , qtbase, libuuid, libcap, uwsgi, grantlee, pcre }: stdenv.mkDerivation rec { pname = "cutelyst"; - version = "2.13.0"; + version = "2.14.0"; src = fetchFromGitHub { owner = "cutelyst"; repo = "cutelyst"; rev = "v${version}"; - sha256 = "1xbw8ag3iwm69dhrsg54anrlzvvflj6pwsj42z6hrl0yckabn99z"; + sha256 = "sha256-RidUZqDnzRrgW/7LVF+BF01zNcf1cJ/kS7OF/t1Q65c="; }; - nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; buildInputs = [ qtbase libuuid libcap uwsgi grantlee pcre ]; cmakeFlags = [ diff --git a/pkgs/development/libraries/cwiid/default.nix b/pkgs/development/libraries/cwiid/default.nix index 353a5ba9061..31a5420e375 100644 --- a/pkgs/development/libraries/cwiid/default.nix +++ b/pkgs/development/libraries/cwiid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, bison, flex, bluez, pkgconfig, gtk2 }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, bison, flex, bluez, pkg-config, gtk2 }: stdenv.mkDerivation rec { name = "cwiid-${version}-git"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ bison flex bluez gtk2 ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; NIX_LDFLAGS = "-lbluetooth"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { sed -i -e "s/0.6.00/0.6.0/" $out/lib/pkgconfig/cwiid.pc ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Linux Nintendo Wiimote interface"; homepage = "http://cwiid.org"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/cxx-prettyprint/default.nix b/pkgs/development/libraries/cxx-prettyprint/default.nix index 34dc30abe61..f632fca714c 100644 --- a/pkgs/development/libraries/cxx-prettyprint/default.nix +++ b/pkgs/development/libraries/cxx-prettyprint/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "cxx-prettyprint-unstable"; @@ -17,10 +17,10 @@ stdenv.mkDerivation rec { cp prettyprint.hpp "$out/include" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Header only C++ library for pretty printing standard containers"; homepage = "https://github.com/louisdx/cxx-prettyprint"; - license = stdenv.lib.licenses.boost; + license = lib.licenses.boost; platforms = platforms.all; # This is a header-only library, no point in hydra building it: diff --git a/pkgs/development/libraries/cxxopts/default.nix b/pkgs/development/libraries/cxxopts/default.nix new file mode 100644 index 00000000000..ddbc845e3b4 --- /dev/null +++ b/pkgs/development/libraries/cxxopts/default.nix @@ -0,0 +1,27 @@ +{ cmake, fetchFromGitHub, icu, lib, pkg-config, stdenv, enableUnicodeHelp ? true }: + +stdenv.mkDerivation rec { + name = "cxxopts"; + version = "2.2.1"; + + src = fetchFromGitHub { + owner = "jarro2783"; + repo = name; + rev = "v${version}"; + sha256 = "0d3y747lsh1wkalc39nxd088rbypxigm991lk3j91zpn56whrpha"; + }; + + buildInputs = lib.optional enableUnicodeHelp [ icu.dev ]; + cmakeFlags = lib.optional enableUnicodeHelp [ "-DCXXOPTS_USE_UNICODE_HELP=TRUE" ]; + nativeBuildInputs = [ cmake ] ++ lib.optional enableUnicodeHelp [ pkg-config ]; + + doCheck = true; + + meta = with lib; { + homepage = "https://github.com/jarro2783/cxxopts"; + description = "Lightweight C++ GNU-style option parser library"; + license = licenses.mit; + maintainers = [ maintainers.spease ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/cxxtest/default.nix b/pkgs/development/libraries/cxxtest/default.nix index e1898044efa..3469cda3fc7 100644 --- a/pkgs/development/libraries/cxxtest/default.nix +++ b/pkgs/development/libraries/cxxtest/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonApplication, fetchFromGitHub }: +{ lib, buildPythonApplication, fetchFromGitHub }: buildPythonApplication rec { pname = "cxxtest"; @@ -26,7 +26,7 @@ buildPythonApplication rec { dontWrapPythonPrograms = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://cxxtest.com"; description = "Unit testing framework for C++"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/cxxtools/default.nix b/pkgs/development/libraries/cxxtools/default.nix index ca3c4871732..0d8d2498ae7 100644 --- a/pkgs/development/libraries/cxxtools/default.nix +++ b/pkgs/development/libraries/cxxtools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { version = "2.2.1"; @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.tntnet.org/cxxtools.html"; description = "Comprehensive C++ class library for Unix and Linux"; - platforms = stdenv.lib.platforms.linux ; - license = stdenv.lib.licenses.lgpl21; - maintainers = [ stdenv.lib.maintainers.juliendehos ]; + platforms = lib.platforms.linux ; + license = lib.licenses.lgpl21; + maintainers = [ lib.maintainers.juliendehos ]; }; } diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index 96778e8960b..b1a6401284a 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -2,7 +2,7 @@ , pam, fixDarwinDylibNames, autoreconfHook, enableLdap ? false , buildPackages, pruneLibtoolFiles, fetchpatch }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "cyrus-sasl"; version = "2.1.27"; diff --git a/pkgs/development/libraries/czmq/default.nix b/pkgs/development/libraries/czmq/default.nix index bdf4519f9bc..bb8ecafbb34 100644 --- a/pkgs/development/libraries/czmq/default.nix +++ b/pkgs/development/libraries/czmq/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchurl, zeromq }: +{ lib, stdenv, fetchurl, zeromq }: stdenv.mkDerivation rec { - version = "4.2.0"; + version = "4.2.1"; pname = "czmq"; src = fetchurl { url = "https://github.com/zeromq/czmq/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "1szciz62sk3fm4ga9qjpxz0n0lazvphm32km95bq92ncng12kayg"; + sha256 = "sha256-XXIKIEwqWGRdb3ZDrxXVY6cS2tmMnTLB7ZEzd9qmrDk="; }; # Needs to be propagated for the .pc file to work propagatedBuildInputs = [ zeromq ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://czmq.zeromq.org/"; description = "High-level C Binding for ZeroMQ"; license = licenses.mpl20; diff --git a/pkgs/development/libraries/dav1d/default.nix b/pkgs/development/libraries/dav1d/default.nix index 4be942d8b69..2b9357e3ef0 100644 --- a/pkgs/development/libraries/dav1d/default.nix +++ b/pkgs/development/libraries/dav1d/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitLab -, meson, ninja, nasm, pkgconfig +{ lib, stdenv, fetchFromGitLab +, meson, ninja, nasm, pkg-config , withTools ? false # "dav1d" binary , withExamples ? false, SDL2 # "dav1dplay" binary , useVulkan ? false, libplacebo, vulkan-loader, vulkan-headers @@ -19,17 +19,17 @@ stdenv.mkDerivation rec { sha256 = "1820fpmmq1vxjzjmza6ydk4fgxipb8gmcc5skybki64qn7410v7x"; }; - nativeBuildInputs = [ meson ninja nasm pkgconfig ]; + nativeBuildInputs = [ meson ninja nasm pkg-config ]; # TODO: doxygen (currently only HTML and not build by default). - buildInputs = stdenv.lib.optional withExamples SDL2 - ++ stdenv.lib.optionals useVulkan [ libplacebo vulkan-loader vulkan-headers ]; + buildInputs = lib.optional withExamples SDL2 + ++ lib.optionals useVulkan [ libplacebo vulkan-loader vulkan-headers ]; mesonFlags= [ - "-Denable_tools=${stdenv.lib.boolToString withTools}" - "-Denable_examples=${stdenv.lib.boolToString withExamples}" + "-Denable_tools=${lib.boolToString withTools}" + "-Denable_examples=${lib.boolToString withExamples}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A cross-platform AV1 decoder focused on speed and correctness"; longDescription = '' The goal of this project is to provide a decoder for most platforms, and diff --git a/pkgs/development/libraries/db/db-4.8.nix b/pkgs/development/libraries/db/db-4.8.nix index dc668a233b0..5cf9200a9ab 100644 --- a/pkgs/development/libraries/db/db-4.8.nix +++ b/pkgs/development/libraries/db/db-4.8.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ... } @ args: +{ lib, stdenv, fetchurl, ... } @ args: import ./generic.nix (args // { version = "4.8.30"; diff --git a/pkgs/development/libraries/db/db-5.3.nix b/pkgs/development/libraries/db/db-5.3.nix index 1223cb897e8..0bb5c4cd6a4 100644 --- a/pkgs/development/libraries/db/db-5.3.nix +++ b/pkgs/development/libraries/db/db-5.3.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ... } @ args: +{ lib, stdenv, fetchurl, ... } @ args: import ./generic.nix (args // { version = "5.3.28"; diff --git a/pkgs/development/libraries/db/db-6.0.nix b/pkgs/development/libraries/db/db-6.0.nix index 642054b5a01..49935dd2399 100644 --- a/pkgs/development/libraries/db/db-6.0.nix +++ b/pkgs/development/libraries/db/db-6.0.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, ... } @ args: +{ lib, stdenv, fetchurl, ... } @ args: import ./generic.nix (args // { version = "6.0.20"; sha256 = "00r2aaglq625y8r9xd5vw2y070plp88f1mb2gbq3kqsl7128lsl0"; - license = stdenv.lib.licenses.agpl3; + license = lib.licenses.agpl3; extraPatches = [ ./clang-6.0.patch ./CVE-2017-10140-cwd-db_config.patch ]; }) diff --git a/pkgs/development/libraries/db/db-6.2.nix b/pkgs/development/libraries/db/db-6.2.nix index dee07a9637e..b2c0fd7ac8f 100644 --- a/pkgs/development/libraries/db/db-6.2.nix +++ b/pkgs/development/libraries/db/db-6.2.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, ... } @ args: +{ lib, stdenv, fetchurl, ... } @ args: import ./generic.nix (args // { version = "6.2.23"; sha256 = "1isxx4jfmnh913jzhp8hhfngbk6dsg46f4kjpvvc56maj64jqqa7"; - license = stdenv.lib.licenses.agpl3; + license = lib.licenses.agpl3; extraPatches = [ ./clang-6.0.patch ./CVE-2017-10140-cwd-db_config.patch ]; }) diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix index f439113efb3..a564db369fb 100644 --- a/pkgs/development/libraries/db/generic.nix +++ b/pkgs/development/libraries/db/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , cxxSupport ? true , compat185 ? true , dbmSupport ? false @@ -6,7 +6,7 @@ # Options from inherited versions , version, sha256 , extraPatches ? [ ] -, license ? stdenv.lib.licenses.sleepycat +, license ? lib.licenses.sleepycat , drvArgs ? {} }: @@ -27,8 +27,8 @@ stdenv.mkDerivation (rec { (if cxxSupport then "--enable-cxx" else "--disable-cxx") (if compat185 then "--enable-compat185" else "--disable-compat185") ] - ++ stdenv.lib.optional dbmSupport "--enable-dbm" - ++ stdenv.lib.optional stdenv.isFreeBSD "--with-pic"; + ++ lib.optional dbmSupport "--enable-dbm" + ++ lib.optional stdenv.isFreeBSD "--with-pic"; preConfigure = '' cd build_unix @@ -47,7 +47,7 @@ stdenv.mkDerivation (rec { make examples_c examples_cxx ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/index.html"; description = "Berkeley DB"; license = license; diff --git a/pkgs/development/libraries/dbus-cplusplus/default.nix b/pkgs/development/libraries/dbus-cplusplus/default.nix index 1c9f7131172..731c038527c 100644 --- a/pkgs/development/libraries/dbus-cplusplus/default.nix +++ b/pkgs/development/libraries/dbus-cplusplus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dbus, glib, pkgconfig, expat }: +{ lib, stdenv, fetchurl, dbus, glib, pkg-config, expat }: stdenv.mkDerivation rec { pname = "dbus-cplusplus"; @@ -31,12 +31,12 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ dbus glib expat ]; configureFlags = [ "--disable-ecore" "--disable-tests" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://dbus-cplusplus.sourceforge.net"; description = "C++ API for D-BUS"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix index b0dd8e91960..f56a1eaac24 100644 --- a/pkgs/development/libraries/dbus-glib/default.nix +++ b/pkgs/development/libraries/dbus-glib/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, buildPackages -, pkgconfig, expat, gettext, libiconv, dbus, glib +{ lib, stdenv, fetchurl, buildPackages +, pkg-config, expat, gettext, libiconv, dbus, glib }: stdenv.mkDerivation rec { @@ -13,14 +13,14 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; - nativeBuildInputs = [ pkgconfig gettext glib ]; + nativeBuildInputs = [ pkg-config gettext glib ]; buildInputs = [ expat libiconv ]; propagatedBuildInputs = [ dbus glib ]; configureFlags = [ "--exec-prefix=${placeholder "dev"}" ] ++ - stdenv.lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) + lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "--with-dbus-binding-tool=${buildPackages.dbus-glib.dev}/bin/dbus-binding-tool"; doCheck = false; @@ -29,9 +29,9 @@ stdenv.mkDerivation rec { meta = { homepage = "https://dbus.freedesktop.org"; - license = with stdenv.lib.licenses; [ afl21 gpl2 ]; + license = with lib.licenses; [ afl21 gpl2 ]; description = "Obsolete glib bindings for D-Bus lightweight IPC mechanism"; maintainers = [ ]; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix b/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix index 22c0a9137ca..f47c91ca3ea 100644 --- a/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix +++ b/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mono, dbus-sharp-1_0 }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, mono, dbus-sharp-1_0 }: stdenv.mkDerivation rec { pname = "dbus-sharp-glib"; @@ -12,12 +12,12 @@ stdenv.mkDerivation rec { sha256 = "0z8ylzby8n5sar7aywc8rngd9ap5qqznadsscp5v34cacdfz1gxm"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ mono dbus-sharp-1_0 ]; dontStrip = true; - meta = with stdenv.lib; { + meta = with lib; { description = "D-Bus for .NET: GLib integration module"; platforms = platforms.linux; license = licenses.mit; diff --git a/pkgs/development/libraries/dbus-sharp-glib/default.nix b/pkgs/development/libraries/dbus-sharp-glib/default.nix index 496a109b58f..65cd8904366 100644 --- a/pkgs/development/libraries/dbus-sharp-glib/default.nix +++ b/pkgs/development/libraries/dbus-sharp-glib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, mono, dbus-sharp-2_0, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, pkg-config, mono, dbus-sharp-2_0, autoreconfHook }: stdenv.mkDerivation rec { pname = "dbus-sharp-glib"; @@ -12,12 +12,12 @@ stdenv.mkDerivation rec { sha256 = "0i39kfg731as6j0hlmasgj8dyw5xsak7rl2dlimi1naphhffwzm8"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ mono dbus-sharp-2_0 ]; dontStrip = true; - meta = with stdenv.lib; { + meta = with lib; { description = "D-Bus for .NET: GLib integration module"; platforms = platforms.linux; license = licenses.mit; diff --git a/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix b/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix index 084beae5972..eb1b20e29eb 100644 --- a/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix +++ b/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, pkgconfig, mono, autoreconfHook }: +{lib, stdenv, fetchFromGitHub, pkg-config, mono, autoreconfHook }: stdenv.mkDerivation rec { pname = "dbus-sharp"; @@ -12,12 +12,12 @@ stdenv.mkDerivation rec { sha256 = "13qlqx9wqahfpzzl59157cjxprqcx2bd40w5gb2bs3vdx058p562"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ mono ]; dontStrip = true; - meta = with stdenv.lib; { + meta = with lib; { description = "D-Bus for .NET"; platforms = platforms.linux; license = licenses.mit; diff --git a/pkgs/development/libraries/dbus-sharp/default.nix b/pkgs/development/libraries/dbus-sharp/default.nix index 0fd638dbf8e..c64d7bbef99 100644 --- a/pkgs/development/libraries/dbus-sharp/default.nix +++ b/pkgs/development/libraries/dbus-sharp/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, pkgconfig, mono4, autoreconfHook }: +{lib, stdenv, fetchFromGitHub, pkg-config, mono4, autoreconfHook }: stdenv.mkDerivation rec { pname = "dbus-sharp"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1g5lblrvkd0wnhfzp326by6n3a9mj2bj7a7646g0ziwgsxp5w6y7"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; # Use msbuild when https://github.com/NixOS/nixpkgs/pull/43680 is merged # See: https://github.com/NixOS/nixpkgs/pull/46060 @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { dontStrip = true; - meta = with stdenv.lib; { + meta = with lib; { description = "D-Bus for .NET"; platforms = platforms.linux; license = licenses.mit; diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 4480d197fa7..fd7df4d5ba3 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -1,7 +1,7 @@ { stdenv , lib , fetchurl -, pkgconfig +, pkg-config , expat , enableSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isMusl , systemd @@ -17,12 +17,6 @@ , xmlto }: -assert - x11Support -> - libX11 != null && libICE != null && libSM != null; - -assert enableSystemd -> systemd != null; - stdenv.mkDerivation rec { pname = "dbus"; version = "1.12.20"; @@ -57,7 +51,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "lib" "doc" "man" ]; nativeBuildInputs = [ - pkgconfig + pkg-config docbook_xml_dtd_44 docbook-xsl-nons xmlto @@ -79,7 +73,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-user-session" "--enable-xml-docs" - "--libexecdir=${placeholder ''out''}/libexec" + "--libexecdir=${placeholder "out"}/libexec" "--datadir=/etc" "--localstatedir=/var" "--runstatedir=/run" @@ -87,8 +81,8 @@ stdenv.mkDerivation rec { "--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" + "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system" + "--with-systemduserunitdir=${placeholder "out"}/etc/systemd/user" ] ++ lib.optional (!x11Support) "--without-x" ++ lib.optionals (!stdenv.isDarwin) [ "--enable-apparmor" "--enable-libaudit" ]; @@ -103,8 +97,8 @@ stdenv.mkDerivation rec { doCheck = true; installFlags = [ - "sysconfdir=${placeholder ''out''}/etc" - "datadir=${placeholder ''out''}/share" + "sysconfdir=${placeholder "out"}/etc" + "datadir=${placeholder "out"}/share" ]; # it's executed from $lib by absolute path @@ -118,7 +112,7 @@ stdenv.mkDerivation rec { daemon = dbus.out; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple interprocess messaging system"; homepage = "http://www.freedesktop.org/wiki/Software/dbus/"; license = licenses.gpl2Plus; # most is also under AFL-2.1 diff --git a/pkgs/development/libraries/dbxml/default.nix b/pkgs/development/libraries/dbxml/default.nix index a0005f1bf72..b4e74d03619 100644 --- a/pkgs/development/libraries/dbxml/default.nix +++ b/pkgs/development/libraries/dbxml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, db62, xercesc, xqilla }: +{ lib, stdenv, fetchurl, db62, xercesc, xqilla }: stdenv.mkDerivation rec { pname = "dbxml"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { cd dbxml ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.oracle.com/database/berkeley-db/xml.html"; description = "Embeddable XML database based on Berkeley DB"; license = licenses.agpl3; diff --git a/pkgs/development/libraries/dclib/default.nix b/pkgs/development/libraries/dclib/default.nix index a9929ea2add..b393b74f2b2 100644 --- a/pkgs/development/libraries/dclib/default.nix +++ b/pkgs/development/libraries/dclib/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libxml2, openssl, bzip2}: +{lib, stdenv, fetchurl, libxml2, openssl, bzip2}: stdenv.mkDerivation { name = "dclib-0.3.7"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { buildInputs = [libxml2 openssl bzip2]; - meta = with stdenv.lib; { + meta = with lib; { description = "Peer-to-Peer file sharing client"; homepage = "http://dcgui.berlios.de"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/dclxvi/default.nix b/pkgs/development/libraries/dclxvi/default.nix index 802befff14c..8d7dc5a0178 100644 --- a/pkgs/development/libraries/dclxvi/default.nix +++ b/pkgs/development/libraries/dclxvi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { name = "dclxvi-2013-01-27"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { patchPhase = '' substituteInPlace Makefile \ --replace "gcc" "cc" - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' substituteInPlace Makefile \ --replace "-soname=libdclxvipairing.so" "-install_name,libdclxvipairing.so" ''; @@ -26,7 +26,7 @@ stdenv.mkDerivation { find . -name \*.so -exec cp {} $out/lib \; ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/agl/dclxvi"; description = "Naehrig, Niederhagen and Schwabe's pairings code, massaged into a shared library"; platforms = platforms.x86_64; diff --git a/pkgs/development/libraries/dconf/default.nix b/pkgs/development/libraries/dconf/default.nix index 4b574a17f78..6834a605f1a 100644 --- a/pkgs/development/libraries/dconf/default.nix +++ b/pkgs/development/libraries/dconf/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , meson , ninja @@ -22,10 +22,10 @@ stdenv.mkDerivation rec { version = "0.38.0"; outputs = [ "out" "lib" "dev" ] - ++ stdenv.lib.optional (!isCross) "devdoc"; + ++ lib.optional (!isCross) "devdoc"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0n2gqkp6d61h7gnnp2xnxp6w5wcl7w9ay58krrf729qd6d0hzxj5"; }; @@ -38,19 +38,19 @@ stdenv.mkDerivation rec { glib docbook-xsl-nons docbook_xml_dtd_42 - ] ++ stdenv.lib.optional (!isCross) gtk-doc; + ] ++ lib.optional (!isCross) gtk-doc; buildInputs = [ glib bash-completion dbus - ] ++ stdenv.lib.optional (!isCross) vala; + ] ++ lib.optional (!isCross) vala; # Vala cross compilation is broken. For now, build dconf without vapi when cross-compiling. mesonFlags = [ "--sysconfdir=/etc" - "-Dgtk_doc=${stdenv.lib.boolToString (!isCross)}" # gtk-doc does do some gobject introspection, which doesn't yet cross-compile. - ] ++ stdenv.lib.optional isCross "-Dvapi=false"; + "-Dgtk_doc=${lib.boolToString (!isCross)}" # gtk-doc does do some gobject introspection, which doesn't yet cross-compile. + ] ++ lib.optional isCross "-Dvapi=false"; doCheck = !stdenv.isAarch32 && !stdenv.isAarch64 && !stdenv.isDarwin; @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Projects/dconf"; license = licenses.lgpl21Plus; platforms = platforms.unix; diff --git a/pkgs/development/libraries/dee/default.nix b/pkgs/development/libraries/dee/default.nix index 594cac5002f..3d46028ec43 100644 --- a/pkgs/development/libraries/dee/default.nix +++ b/pkgs/development/libraries/dee/default.nix @@ -1,7 +1,7 @@ -{ stdenv +{ lib, stdenv , fetchgit , fetchpatch -, pkgconfig +, pkg-config , glib , icu , gobject-introspection @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config vala autoreconfHook gobject-introspection @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A library that uses DBus to provide objects allowing you to create Model-View-Controller type programs across DBus"; homepage = "https://launchpad.net/dee"; license = licenses.lgpl3; diff --git a/pkgs/development/libraries/directfb/default.nix b/pkgs/development/libraries/directfb/default.nix index d333b786665..1b0b50d28f0 100644 --- a/pkgs/development/libraries/directfb/default.nix +++ b/pkgs/development/libraries/directfb/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, fetchpatch -, autoreconfHook, perl, pkgconfig, flux, zlib +, autoreconfHook, perl, pkg-config, flux, zlib , libjpeg, freetype, libpng, giflib , enableX11 ? true, xorg , enableSDL ? true, SDL }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ autoreconfHook perl pkgconfig flux ]; + nativeBuildInputs = [ autoreconfHook perl pkg-config flux ]; buildInputs = [ zlib libjpeg freetype giflib libpng ] ++ lib.optional enableSDL SDL diff --git a/pkgs/development/libraries/discord-rpc/default.nix b/pkgs/development/libraries/discord-rpc/default.nix index 3a8290a6597..213096f5abf 100644 --- a/pkgs/development/libraries/discord-rpc/default.nix +++ b/pkgs/development/libraries/discord-rpc/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , rapidjson @@ -23,14 +23,14 @@ stdenv.mkDerivation rec { buildInputs = [ rapidjson - ] ++ stdenv.lib.optional stdenv.isDarwin AppKit; + ] ++ lib.optional stdenv.isDarwin AppKit; cmakeFlags = [ "-DBUILD_SHARED_LIBS=true" - "-DBUILD_EXAMPLES=${stdenv.lib.boolToString buildExamples}" + "-DBUILD_EXAMPLES=${lib.boolToString buildExamples}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Official library to interface with the Discord client"; homepage = "https://github.com/discordapp/discord-rpc"; license = licenses.mit; diff --git a/pkgs/development/libraries/dleyna-connector-dbus/default.nix b/pkgs/development/libraries/dleyna-connector-dbus/default.nix index ff81ab72732..a24e0b8d014 100644 --- a/pkgs/development/libraries/dleyna-connector-dbus/default.nix +++ b/pkgs/development/libraries/dleyna-connector-dbus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoreconfHook, pkgconfig, fetchFromGitHub, dbus, dleyna-core, glib }: +{ lib, stdenv, autoreconfHook, pkg-config, fetchFromGitHub, dbus, dleyna-core, glib }: stdenv.mkDerivation rec { pname = "dleyna-connector-dbus"; @@ -11,10 +11,10 @@ stdenv.mkDerivation rec { sha256 = "0vziq5gwjm79yl2swch2mz6ias20nvfddf5cqgk9zbg25cb9m117"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ dbus dleyna-core glib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A D-Bus API for the dLeyna services"; homepage = "https://01.org/dleyna"; maintainers = [ maintainers.jtojnar ]; diff --git a/pkgs/development/libraries/dleyna-core/default.nix b/pkgs/development/libraries/dleyna-core/default.nix index 1f0a9bc7c59..4a4eecfdc0f 100644 --- a/pkgs/development/libraries/dleyna-core/default.nix +++ b/pkgs/development/libraries/dleyna-core/default.nix @@ -1,8 +1,8 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch , autoreconfHook -, pkgconfig +, pkg-config , gupnp }: @@ -32,14 +32,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config ]; propagatedBuildInputs = [ gupnp ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library of utility functions that are used by the higher level dLeyna"; homepage = "https://01.org/dleyna"; maintainers = [ maintainers.jtojnar ]; diff --git a/pkgs/development/libraries/dleyna-renderer/default.nix b/pkgs/development/libraries/dleyna-renderer/default.nix index 6b14bbc611a..768af6a671a 100644 --- a/pkgs/development/libraries/dleyna-renderer/default.nix +++ b/pkgs/development/libraries/dleyna-renderer/default.nix @@ -1,7 +1,7 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook -, pkgconfig +, pkg-config , dleyna-connector-dbus , dleyna-core , gssdp @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config makeWrapper ]; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { --set DLEYNA_CONNECTOR_PATH "$DLEYNA_CONNECTOR_PATH" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Library to discover and manipulate Digital Media Renderers"; homepage = "https://01.org/dleyna"; maintainers = [ maintainers.jtojnar ]; diff --git a/pkgs/development/libraries/dleyna-server/default.nix b/pkgs/development/libraries/dleyna-server/default.nix index 90c4df8e641..a0a414abf74 100644 --- a/pkgs/development/libraries/dleyna-server/default.nix +++ b/pkgs/development/libraries/dleyna-server/default.nix @@ -1,9 +1,9 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch , autoreconfHook , makeWrapper -, pkgconfig +, pkg-config , dleyna-core , dleyna-connector-dbus , gssdp @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config makeWrapper ]; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { --set DLEYNA_CONNECTOR_PATH "$DLEYNA_CONNECTOR_PATH" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Library to discover, browse and manipulate Digital Media Servers"; homepage = "https://01.org/dleyna"; maintainers = [ maintainers.jtojnar ]; diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index c4d441df5a9..fa7d70d5213 100644 --- a/pkgs/development/libraries/dlib/default.nix +++ b/pkgs/development/libraries/dlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, libpng, libjpeg +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, libpng, libjpeg , guiSupport ? false, libX11 # see http://dlib.net/compile.html @@ -25,10 +25,10 @@ stdenv.mkDerivation rec { "-DUSE_DLIB_USE_CUDA=${if cudaSupport then "1" else "0"}" "-DUSE_AVX_INSTRUCTIONS=${if avxSupport then "yes" else "no"}" ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libpng libjpeg ] ++ lib.optional guiSupport libX11; - meta = with stdenv.lib; { + meta = with lib; { description = "A general purpose cross-platform C++ machine learning library"; homepage = "http://www.dlib.net"; license = licenses.boost; diff --git a/pkgs/development/libraries/docopt_cpp/default.nix b/pkgs/development/libraries/docopt_cpp/default.nix index 36b791ccc98..f9456b8acac 100644 --- a/pkgs/development/libraries/docopt_cpp/default.nix +++ b/pkgs/development/libraries/docopt_cpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, python }: +{ lib, stdenv, fetchFromGitHub, cmake, python }: stdenv.mkDerivation rec { version = "0.6.3"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { checkPhase = "LD_LIBRARY_PATH=$(pwd) python ./run_tests"; - meta = with stdenv.lib; { + meta = with lib; { description = "C++11 port of docopt"; homepage = "https://github.com/docopt/docopt.cpp"; license = with licenses; [ mit boost ]; diff --git a/pkgs/development/libraries/doctest/default.nix b/pkgs/development/libraries/doctest/default.nix index 55f97a425eb..702015e5d38 100644 --- a/pkgs/development/libraries/doctest/default.nix +++ b/pkgs/development/libraries/doctest/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, installShellFiles, cmake }: +{ lib, stdenv, fetchFromGitHub, installShellFiles, cmake }: stdenv.mkDerivation rec { pname = "doctest"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/onqtam/doctest"; description = "The fastest feature-rich C++11/14/17/20 single-header testing framework"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/dotconf/default.nix b/pkgs/development/libraries/dotconf/default.nix index f6320a64374..39d71eee432 100644 --- a/pkgs/development/libraries/dotconf/default.nix +++ b/pkgs/development/libraries/dotconf/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, autoreconfHook }: +{ fetchFromGitHub, lib, stdenv, autoreconfHook }: stdenv.mkDerivation rec { name = "dotconf-" + version; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A configuration parser library"; maintainers = with maintainers; [ pSub ]; homepage = "https://github.com/williamh/dotconf"; diff --git a/pkgs/development/libraries/dotnetfx35/default.nix b/pkgs/development/libraries/dotnetfx35/default.nix index e1c59846aec..68569b516a9 100644 --- a/pkgs/development/libraries/dotnetfx35/default.nix +++ b/pkgs/development/libraries/dotnetfx35/default.nix @@ -12,12 +12,12 @@ in ln -s $src/MSBuild.exe $out/bin ''; }; - + assembly20Path = "/cygdrive/c/WINDOWS/Microsoft.NET/Framework/v2.0.50727"; - + wcfPath = "/cygdrive/c/WINDOWS/Microsoft.NET/Framework/v3.0/WINDOW~1"; - + referenceAssembly30Path = "/cygdrive/c/PROGRA~1/REFERE~1/Microsoft/Framework/v3.0"; - + referenceAssembly35Path = "/cygdrive/c/PROGRA~1/REFERE~1/Microsoft/Framework/v3.5"; } diff --git a/pkgs/development/libraries/dotnetfx40/default.nix b/pkgs/development/libraries/dotnetfx40/default.nix index 701464071d0..1ffc10cfc60 100644 --- a/pkgs/development/libraries/dotnetfx40/default.nix +++ b/pkgs/development/libraries/dotnetfx40/default.nix @@ -12,12 +12,12 @@ in ln -s $src/MSBuild.exe $out/bin ''; }; - + assembly20Path = "/cygdrive/c/WINDOWS/Microsoft.NET/Framework/v2.0.50727"; - + wcfPath = "/cygdrive/c/WINDOWS/Microsoft.NET/Framework/v3.0/WINDOW~1"; - + referenceAssembly30Path = "/cygdrive/c/PROGRA~1/REFERE~1/Microsoft/Framework/v3.0"; - + referenceAssembly35Path = "/cygdrive/c/PROGRA~1/REFERE~1/Microsoft/Framework/v3.5"; } diff --git a/pkgs/development/libraries/double-conversion/default.nix b/pkgs/development/libraries/double-conversion/default.nix index fd7a4e3f5f6..2bdcc3c8a99 100644 --- a/pkgs/development/libraries/double-conversion/default.nix +++ b/pkgs/development/libraries/double-conversion/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { rm BUILD ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Binary-decimal and decimal-binary routines for IEEE doubles"; homepage = "https://github.com/google/double-conversion"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/dqlite/default.nix b/pkgs/development/libraries/dqlite/default.nix index 49435ec6718..8f67259989b 100644 --- a/pkgs/development/libraries/dqlite/default.nix +++ b/pkgs/development/libraries/dqlite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, file, libco-canonical +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file, libco-canonical , libuv, raft-canonical, sqlite-replication }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0h7ypigj1b6xbspzc35y89jkp84v8rqiv9qgkyqlqylr7mcw952a"; }; - nativeBuildInputs = [ autoreconfHook file pkgconfig ]; + nativeBuildInputs = [ autoreconfHook file pkg-config ]; buildInputs = [ libco-canonical.dev libuv @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { outputs = [ "dev" "out" ]; - meta = with stdenv.lib; { + meta = with lib; { description = '' Expose a SQLite database over the network and replicate it across a cluster of peers diff --git a/pkgs/development/libraries/draco/default.nix b/pkgs/development/libraries/draco/default.nix index 8479f3c2f8e..41ffdd16f5a 100644 --- a/pkgs/development/libraries/draco/default.nix +++ b/pkgs/development/libraries/draco/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { "-DBUILD_UNITY_PLUGIN=1" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for compressing and decompressing 3D geometric meshes and point clouds"; homepage = "https://google.github.io/draco/"; license = licenses.asl20; diff --git a/pkgs/development/libraries/drumstick/default.nix b/pkgs/development/libraries/drumstick/default.nix index 25ecbf03dc1..21572e52e23 100644 --- a/pkgs/development/libraries/drumstick/default.nix +++ b/pkgs/development/libraries/drumstick/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , cmake, docbook_xml_dtd_45, docbook_xsl, doxygen, pkg-config, wrapQtAppsHook , alsaLib, fluidsynth, qtbase, qtsvg, libpulseaudio }: @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { alsaLib fluidsynth libpulseaudio qtbase qtsvg ]; - meta = with stdenv.lib; { + meta = with lib; { maintainers = with maintainers; [ solson ]; description = "MIDI libraries for Qt5/C++"; homepage = "http://drumstick.sourceforge.net/"; diff --git a/pkgs/development/libraries/dssi/default.nix b/pkgs/development/libraries/dssi/default.nix index 779e6b07762..9ce487b1b03 100644 --- a/pkgs/development/libraries/dssi/default.nix +++ b/pkgs/development/libraries/dssi/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, ladspaH, libjack2, liblo, alsaLib, qt4, libX11, libsndfile, libSM -, libsamplerate, libtool, autoconf, automake, xorgproto, libICE, pkgconfig +{ lib, stdenv, fetchurl, ladspaH, libjack2, liblo, alsaLib, qt4, libX11, libsndfile, libSM +, libsamplerate, libtool, autoconf, automake, xorgproto, libICE, pkg-config }: stdenv.mkDerivation rec { @@ -13,10 +13,10 @@ stdenv.mkDerivation rec { buildInputs = [ ladspaH libjack2 liblo alsaLib qt4 libX11 libsndfile libSM - libsamplerate libtool autoconf automake xorgproto libICE pkgconfig + libsamplerate libtool autoconf automake xorgproto libICE pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A plugin SDK for virtual instruments"; maintainers = with maintainers; [ diff --git a/pkgs/development/libraries/duckdb/default.nix b/pkgs/development/libraries/duckdb/default.nix index 1aedee5c3b6..60ccf5aeeb2 100644 --- a/pkgs/development/libraries/duckdb/default.nix +++ b/pkgs/development/libraries/duckdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/cwida/duckdb"; description = "Embeddable SQL OLAP Database Management System"; license = licenses.mit; diff --git a/pkgs/development/libraries/dxflib/default.nix b/pkgs/development/libraries/dxflib/default.nix index 1b63d8805fd..09f2ad3ccad 100644 --- a/pkgs/development/libraries/dxflib/default.nix +++ b/pkgs/development/libraries/dxflib/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , qmake }: @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ qmake ]; + dontWrapQtApps = true; preConfigure = '' sed -i 's/CONFIG += staticlib/CONFIG += shared/' dxflib.pro ''; @@ -21,7 +22,7 @@ stdenv.mkDerivation rec { cp -pr *.so* $out/lib install -d -m 0755 $out/include/dxflib cp -pr src/*.h $out/include/dxflib - # Generate pkgconfig file + # Generate pkg-config file install -d -m 0755 $out/lib/pkgconfig cat << 'EOF' > $out/lib/pkgconfig/dxflib.pc prefix=${placeholder "out"} @@ -37,8 +38,8 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - maintainers = with stdenv.lib.maintainers; [raskin]; - platforms = stdenv.lib.platforms.linux; - description = ''DXF file format library''; + maintainers = with lib.maintainers; [raskin]; + platforms = lib.platforms.linux; + description = "DXF file format library"; }; } diff --git a/pkgs/development/libraries/dyncall/default.nix b/pkgs/development/libraries/dyncall/default.nix index e792fe1e051..0e3fa3ac7dc 100644 --- a/pkgs/development/libraries/dyncall/default.nix +++ b/pkgs/development/libraries/dyncall/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { pname = "dyncall"; @@ -27,7 +27,7 @@ stdenv.mkDerivation { install -D -t $out/share/man/man3 ./*/*.3 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Highly dynamic multi-platform foreign function call interface library"; homepage = "https://www.dyncall.org"; license = licenses.isc; diff --git a/pkgs/development/libraries/easyloggingpp/default.nix b/pkgs/development/libraries/easyloggingpp/default.nix index 29fdd068959..ad582d93305 100644 --- a/pkgs/development/libraries/easyloggingpp/default.nix +++ b/pkgs/development/libraries/easyloggingpp/default.nix @@ -1,22 +1,22 @@ # To use this package with a CMake and pkg-config build: # pkg_check_modules(EASYLOGGINGPP REQUIRED easyloggingpp) # add_executable(main src/main.cpp ${EASYLOGGINGPP_PREFIX}/include/easylogging++.cc) -{ stdenv, fetchFromGitHub, cmake, gtest }: +{ lib, stdenv, fetchFromGitHub, cmake, gtest }: stdenv.mkDerivation rec { pname = "easyloggingpp"; - version = "9.96.7"; + version = "9.97.0"; src = fetchFromGitHub { owner = "muflihun"; repo = "easyloggingpp"; rev = "v${version}"; - sha256 = "0nhszn0yyjwpnv7swm4vqs3i7admgbnifi5dvq5h01fk5nc8yjqz"; + sha256 = "sha256-sFWmZMnucMuvpwDzuowni21KiD3bx0lH1Ts+yhusOYs="; }; nativeBuildInputs = [cmake]; buildInputs = [gtest]; cmakeFlags = [ "-Dtest=ON" ]; NIX_CFLAGS_COMPILE = "-std=c++11" + - stdenv.lib.optionalString stdenv.isLinux " -pthread"; + lib.optionalString stdenv.isLinux " -pthread"; postInstall = '' mkdir -p $out/include cp ../src/easylogging++.cc $out/include @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { meta = { description = "C++ logging library"; homepage = "https://muflihun.github.io/easyloggingpp/"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [acowley]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [acowley]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix index 867f0e59393..1050490a220 100644 --- a/pkgs/development/libraries/eccodes/default.nix +++ b/pkgs/development/libraries/eccodes/default.nix @@ -1,9 +1,9 @@ -{ fetchurl, stdenv +{ fetchurl, lib, stdenv , cmake, netcdf, openjpeg, libpng, gfortran , enablePython ? false, pythonPackages , enablePosixThreads ? false , enableOpenMPThreads ? false}: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "eccodes"; version = "2.12.5"; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { doCheck = true; # Only do tests that don't require downloading 120MB of testdata - checkPhase = stdenv.lib.optionalString (stdenv.isDarwin) '' + checkPhase = lib.optionalString (stdenv.isDarwin) '' substituteInPlace "tests/include.sh" --replace "set -ea" "set -ea; export DYLD_LIBRARY_PATH=$(pwd)/lib" '' + '' ctest -R "eccodes_t_(definitions|calendar|unit_tests|md5|uerra|grib_2nd_order_numValues|julian)" -VV diff --git a/pkgs/development/libraries/eclib/default.nix b/pkgs/development/libraries/eclib/default.nix index 9273fb7fd78..4709441a101 100644 --- a/pkgs/development/libraries/eclib/default.nix +++ b/pkgs/development/libraries/eclib/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook , pari @@ -29,16 +29,16 @@ stdenv.mkDerivation rec { pari ntl gmp - ] ++ stdenv.lib.optionals withFlint [ + ] ++ lib.optionals withFlint [ flint ]; nativeBuildInputs = [ autoreconfHook ]; doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { inherit version; - description = ''Elliptic curve tools''; + description = "Elliptic curve tools"; homepage = "https://github.com/JohnCremona/eclib"; license = licenses.gpl2Plus; maintainers = teams.sage.members; diff --git a/pkgs/development/libraries/editline/default.nix b/pkgs/development/libraries/editline/default.nix index 549ef7c56bd..82f65082b94 100644 --- a/pkgs/development/libraries/editline/default.nix +++ b/pkgs/development/libraries/editline/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, fetchpatch }: stdenv.mkDerivation rec { pname = "editline"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" "doc" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://troglobit.com/editline.html"; description = "A readline() replacement for UNIX without termcap (ncurses)"; license = licenses.bsdOriginal; diff --git a/pkgs/development/libraries/egl-wayland/default.nix b/pkgs/development/libraries/egl-wayland/default.nix index 1509db1b80d..be22e24044d 100644 --- a/pkgs/development/libraries/egl-wayland/default.nix +++ b/pkgs/development/libraries/egl-wayland/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchFromGitHub -, pkgconfig +, pkg-config , meson , ninja , libX11 @@ -58,7 +58,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/development/libraries/eigen/2.0.nix b/pkgs/development/libraries/eigen/2.0.nix index d1527571943..a2b1ba47e2d 100644 --- a/pkgs/development/libraries/eigen/2.0.nix +++ b/pkgs/development/libraries/eigen/2.0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, cmake }: +{ lib, stdenv, fetchFromGitLab, cmake }: stdenv.mkDerivation rec { pname = "eigen"; @@ -13,12 +13,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ template library for linear algebra: vectors, matrices, and related algorithms"; license = licenses.lgpl3Plus; homepage = "https://eigen.tuxfamily.org"; - maintainers = with stdenv.lib.maintainers; [ sander raskin ]; + maintainers = with lib.maintainers; [ sander raskin ]; branch = "2"; - platforms = with stdenv.lib.platforms; unix; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix index 3c6a5cc1ca6..079269521c7 100644 --- a/pkgs/development/libraries/eigen/default.nix +++ b/pkgs/development/libraries/eigen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, cmake }: +{ lib, stdenv, fetchFromGitLab, cmake }: stdenv.mkDerivation rec { pname = "eigen"; @@ -17,12 +17,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ template library for linear algebra: vectors, matrices, and related algorithms"; license = licenses.lgpl3Plus; homepage = "https://eigen.tuxfamily.org"; platforms = platforms.unix; - maintainers = with stdenv.lib.maintainers; [ sander raskin ]; + maintainers = with lib.maintainers; [ sander raskin ]; inherit version; }; } diff --git a/pkgs/development/libraries/elementary-cmake-modules/default.nix b/pkgs/development/libraries/elementary-cmake-modules/default.nix index 1fbe6f8893b..9f340545584 100644 --- a/pkgs/development/libraries/elementary-cmake-modules/default.nix +++ b/pkgs/development/libraries/elementary-cmake-modules/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig }: +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config }: stdenv.mkDerivation { pname = "elementary-cmake-modules"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { --replace ' ''${CMAKE_ROOT}/Modules' " $out/lib/cmake" ''; - propagatedBuildInputs = [ cmake pkgconfig ]; + propagatedBuildInputs = [ cmake pkg-config ]; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/libraries/elf-header/default.nix b/pkgs/development/libraries/elf-header/default.nix index c1764e83c30..72166bb38ce 100644 --- a/pkgs/development/libraries/elf-header/default.nix +++ b/pkgs/development/libraries/elf-header/default.nix @@ -35,9 +35,9 @@ stdenvNoCC.mkDerivation { outputsToInstall = [ "out" ]; description = "The datastructures of ELF according to the target platform's libc"; longDescription = '' - The Executable and Linkable Format (ELF, formerly named Extensible Linking - Format), is usually defined in a header like this. - ''; + The Executable and Linkable Format (ELF, formerly named Extensible Linking + Format), is usually defined in a header like this. + ''; platforms = lib.platforms.all; maintainers = [ lib.maintainers.ericson2314 ]; }; diff --git a/pkgs/development/libraries/embree/2.x.nix b/pkgs/development/libraries/embree/2.x.nix index 083dbbc7450..12d4e2a87cc 100644 --- a/pkgs/development/libraries/embree/2.x.nix +++ b/pkgs/development/libraries/embree/2.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkg-config, ispc, tbb, glfw, +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, ispc, tbb, glfw, openimageio, libjpeg, libpng, libpthreadstubs, libX11 }: @@ -17,7 +17,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ ispc tbb glfw openimageio libjpeg libpng libX11 libpthreadstubs ]; - meta = with stdenv.lib; { + meta = with lib; { description = "High performance ray tracing kernels from Intel"; homepage = "https://embree.github.io/"; maintainers = with maintainers; [ hodapp ]; diff --git a/pkgs/development/libraries/embree/default.nix b/pkgs/development/libraries/embree/default.nix index 650c1d4ce49..b5baab5972a 100644 --- a/pkgs/development/libraries/embree/default.nix +++ b/pkgs/development/libraries/embree/default.nix @@ -1,15 +1,15 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, ispc, tbb, glfw, +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, ispc, tbb, glfw, openimageio, libjpeg, libpng, libpthreadstubs, libX11, glib }: stdenv.mkDerivation rec { pname = "embree"; - version = "3.12.1"; + version = "3.12.2"; src = fetchFromGitHub { owner = "embree"; repo = "embree"; rev = "v${version}"; - sha256 = "0aznd16n7h8g3f6jcahzfp1dq4r7wayqvn03wsaskiq2dvsi4srd"; + sha256 = "sha256-aIZAkpAGvE332HxT4rR+rykww/ZLq2qKGLKiZTWyHCk="; }; postPatch = '' @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { ]; - nativeBuildInputs = [ ispc pkgconfig cmake ]; + nativeBuildInputs = [ ispc pkg-config cmake ]; buildInputs = [ tbb glfw openimageio libjpeg libpng libX11 libpthreadstubs ] ++ lib.optionals stdenv.isDarwin [ glib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "High performance ray tracing kernels from Intel"; homepage = "https://embree.github.io/"; maintainers = with maintainers; [ hodapp gebner ]; diff --git a/pkgs/development/libraries/enchant/1.x.nix b/pkgs/development/libraries/enchant/1.x.nix index 0b7b4c9c8b1..172d6747aa1 100644 --- a/pkgs/development/libraries/enchant/1.x.nix +++ b/pkgs/development/libraries/enchant/1.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, aspell, pkgconfig, glib, hunspell, hspell }: +{ lib, stdenv, fetchurl, aspell, pkg-config, glib, hunspell, hspell }: stdenv.mkDerivation rec { version = "1.6.1"; @@ -9,10 +9,10 @@ stdenv.mkDerivation rec { sha256 = "1xg3m7mniyqyff8qv46jbfwgchb6di6qxdjnd5sfir7jzv0dkw5y"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ aspell glib hunspell hspell ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Generic spell checking library"; homepage = "https://abiword.github.io/enchant"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/enchant/2.x.nix b/pkgs/development/libraries/enchant/2.x.nix index 02215a30418..93815308f9c 100644 --- a/pkgs/development/libraries/enchant/2.x.nix +++ b/pkgs/development/libraries/enchant/2.x.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , aspell , pkg-config @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "enchant"; - version = "2.2.13"; + version = "2.2.15"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "084aqsrkzz2c1ls47p759d9bsi26d0m6wq9901k37483g46zkfga"; + sha256 = "sha256-Ow8iFVeBFfKOKmqlSbNRKGADlDBL151vKLDTs9b0bAM="; }; nativeBuildInputs = [ @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { "--enable-relocatable" # needed for tests ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Generic spell checking library"; homepage = "https://abiword.github.io/enchant/"; license = licenses.lgpl21Plus; # with extra provision for non-free checkers diff --git a/pkgs/development/libraries/enet/default.nix b/pkgs/development/libraries/enet/default.nix index 61b8c1be4f2..ef252ad19f6 100644 --- a/pkgs/development/libraries/enet/default.nix +++ b/pkgs/development/libraries/enet/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { name = "enet-1.3.17"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://enet.bespin.org/"; description = "Simple and robust network communication layer on top of UDP"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/entt/default.nix b/pkgs/development/libraries/entt/default.nix index 35e12eb00c7..955dd2eeb36 100644 --- a/pkgs/development/libraries/entt/default.nix +++ b/pkgs/development/libraries/entt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "entt"; version = "3.5.2"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/skypjack/entt"; description = "A header-only, tiny and easy to use library for game programming and much more written in modern C++"; maintainers = with maintainers; [ twey ]; diff --git a/pkgs/development/libraries/epoxy/default.nix b/pkgs/development/libraries/epoxy/default.nix index 15e634fe4b5..7ae0e73953f 100644 --- a/pkgs/development/libraries/epoxy/default.nix +++ b/pkgs/development/libraries/epoxy/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, utilmacros, python3 +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, utilmacros, python3 , libGL, libX11 }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "epoxy"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig utilmacros python3 ]; + nativeBuildInputs = [ autoreconfHook pkg-config utilmacros python3 ]; buildInputs = [ libGL libX11 ]; preConfigure = optionalString stdenv.isDarwin '' diff --git a/pkgs/development/libraries/ethash/default.nix b/pkgs/development/libraries/ethash/default.nix index 05abb1f2aa5..0a10fa3c48c 100644 --- a/pkgs/development/libraries/ethash/default.nix +++ b/pkgs/development/libraries/ethash/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, cmake, gbenchmark, gtest }: +{ lib, stdenv, fetchFromGitHub, cmake, gbenchmark, gtest }: stdenv.mkDerivation rec { pname = "ethash"; - version = "0.5.2"; + version = "0.6.0"; src = fetchFromGitHub { owner = "chfast"; repo = "ethash"; rev = "v${version}"; - sha256 = "0shr3m33raxy9j2mpm3q9mdbchs3nhgfaywidyxgmwqaiw1xpyif"; + sha256 = "sha256-N30v9OZwTmDbltPPmeSa0uOGJhos1VzyS5zY9vVCWfA="; }; nativeBuildInputs = [ @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { #"-DCMAKE_PREFIX_PATH=${gtest.dev}/lib/cmake" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "PoW algorithm for Ethereum 1.0 based on Dagger-Hashimoto"; homepage = "https://github.com/ethereum/ethash"; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/development/libraries/eventlog/default.nix b/pkgs/development/libraries/eventlog/default.nix index d80fdb2213d..ca460aa71f6 100644 --- a/pkgs/development/libraries/eventlog/default.nix +++ b/pkgs/development/libraries/eventlog/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "eventlog-0.2.12"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { combination of description and tag/value pairs. ''; homepage = "https://www.balabit.com/support/community/products/"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.bsd3; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/exempi/default.nix b/pkgs/development/libraries/exempi/default.nix index 5638db71245..356959b429f 100644 --- a/pkgs/development/libraries/exempi/default.nix +++ b/pkgs/development/libraries/exempi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, expat, zlib, boost, libiconv, darwin }: +{ lib, stdenv, fetchurl, fetchpatch, expat, zlib, boost, libiconv, darwin }: stdenv.mkDerivation rec { pname = "exempi"; @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { ]; buildInputs = [ expat zlib boost ] - ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.CoreServices ]; + ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.CoreServices ]; doCheck = stdenv.isLinux; - meta = with stdenv.lib; { + meta = with lib; { description = "An implementation of XMP (Adobe's Extensible Metadata Platform)"; homepage = "https://libopenraw.freedesktop.org/wiki/Exempi/"; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index a845e8998e7..9d29afd6927 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch , zlib @@ -85,13 +85,13 @@ stdenv.mkDerivation rec { patchShebangs ../test/ mkdir ../test/tmp - ${stdenv.lib.optionalString (stdenv.isAarch64 || stdenv.isAarch32) '' + ${lib.optionalString (stdenv.isAarch64 || stdenv.isAarch32) '' # Fix tests on arm # https://github.com/Exiv2/exiv2/issues/933 rm -f ../tests/bugfixes/github/test_CVE_2018_12265.py ''} - ${stdenv.lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.isDarwin '' export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD/lib # Removing tests depending on charset conversion substituteInPlace ../test/Makefile --replace "conversions.sh" "" @@ -111,7 +111,7 @@ stdenv.mkDerivation rec { ) ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.exiv2.org/"; description = "A library and command-line utility to manage image metadata"; platforms = platforms.all; diff --git a/pkgs/development/libraries/exosip/default.nix b/pkgs/development/libraries/exosip/default.nix index 4968c38bfd3..f40dea19bb9 100644 --- a/pkgs/development/libraries/exosip/default.nix +++ b/pkgs/development/libraries/exosip/default.nix @@ -1,25 +1,18 @@ -{ stdenv, fetchurl, libosip, openssl, pkgconfig, fetchpatch }: +{ lib, stdenv, fetchurl, libosip, openssl, pkg-config }: stdenv.mkDerivation rec { pname = "libexosip2"; - version = "4.1.0"; + version = "5.2.0"; src = fetchurl { - url = "mirror://savannah/exosip/libeXosip2-${version}.tar.gz"; - sha256 = "17cna8kpc8nk1si419vgr6r42k2lda0rdk50vlxrw8rzg0xp2xrw"; + url = "mirror://savannah/exosip/${pname}-${version}.tar.gz"; + sha256 = "09bj7cm6mk8yr68y5a09a625x10ql6an3zi4pj6y1jbkhpgqibp3"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libosip openssl ]; - patches = [ - (fetchpatch { - url = "https://sources.debian.net/data/main/libe/libexosip2/4.1.0-2.1/debian/patches/openssl110.patch"; - sha256 = "01q2dax7pwh197mn18r22y38mrsky85mvs9vbkn9fpcilrdayal6"; - }) - ]; - - meta = with stdenv.lib; { + meta = with lib; { license = licenses.gpl2Plus; description = "Library that hides the complexity of using the SIP protocol"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix index 29d2c2b3acb..ba9fb2b177d 100644 --- a/pkgs/development/libraries/expat/default.nix +++ b/pkgs/development/libraries/expat/default.nix @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; # TODO: fix referrers outputBin = "dev"; - configureFlags = stdenv.lib.optional stdenv.isFreeBSD "--with-pic"; + configureFlags = lib.optional stdenv.isFreeBSD "--with-pic"; outputMan = "dev"; # tiny page for a dev tool @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { patchShebangs ./test-driver-wrapper.sh ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.libexpat.org/"; description = "A stream-oriented XML parser library written in C"; platforms = platforms.all; diff --git a/pkgs/development/libraries/faac/default.nix b/pkgs/development/libraries/faac/default.nix index b2c4d3741e1..dbc56572d53 100644 --- a/pkgs/development/libraries/faac/default.nix +++ b/pkgs/development/libraries/faac/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, autoreconfHook +{ lib, stdenv, fetchurl, autoreconfHook , mp4v2Support ? true, mp4v2 ? null , drmSupport ? false # Digital Radio Mondiale }: assert mp4v2Support -> (mp4v2 != null); -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "faac"; version = "1.30"; diff --git a/pkgs/development/libraries/faad2/default.nix b/pkgs/development/libraries/faad2/default.nix index 90b1a182e55..0afef1c9fd8 100644 --- a/pkgs/development/libraries/faad2/default.nix +++ b/pkgs/development/libraries/faad2/default.nix @@ -1,8 +1,8 @@ -{stdenv, fetchFromGitHub, autoreconfHook +{lib, stdenv, fetchFromGitHub, autoreconfHook , drmSupport ? false # Digital Radio Mondiale }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "faad2"; version = "2.10.0"; diff --git a/pkgs/development/libraries/farbfeld/default.nix b/pkgs/development/libraries/farbfeld/default.nix index a528ad6f7f6..9473d09ffc5 100644 --- a/pkgs/development/libraries/farbfeld/default.nix +++ b/pkgs/development/libraries/farbfeld/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, makeWrapper, file, libpng, libjpeg }: +{ lib, stdenv, fetchgit, makeWrapper, file, libpng, libjpeg }: stdenv.mkDerivation rec { pname = "farbfeld"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/2ff" --prefix PATH : "${file}/bin" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Suckless image format with conversion tools"; license = licenses.isc; platforms = platforms.linux; diff --git a/pkgs/development/libraries/farstream/default.nix b/pkgs/development/libraries/farstream/default.nix index 0ce0f56d710..b046b7aef73 100644 --- a/pkgs/development/libraries/farstream/default.nix +++ b/pkgs/development/libraries/farstream/default.nix @@ -1,8 +1,8 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , libnice -, pkgconfig +, pkg-config , autoreconfHook , gstreamer , gst-plugins-base @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config autoreconfHook gobject-introspection ]; @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { gst-libav ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.freedesktop.org/wiki/Software/Farstream"; description = "Audio/Video Communications Framework formely known as farsight"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/fast-cpp-csv-parser/default.nix b/pkgs/development/libraries/fast-cpp-csv-parser/default.nix new file mode 100644 index 00000000000..5a81e3f7274 --- /dev/null +++ b/pkgs/development/libraries/fast-cpp-csv-parser/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "fast-cpp-csv-parser"; + version = "2021-01-03"; + + src = fetchFromGitHub { + owner = "ben-strasser"; + repo = pname; + rev = "75600d0b77448e6c410893830df0aec1dbacf8e3"; + sha256 = "04kalwgsr8khqr1j5j13vzwaml268c5dvc9wfcwfs13wp3snqwf2"; + }; + + installPhase = '' + mkdir -p $out/lib/pkgconfig $out/include + cp -r *.h $out/include/ + substituteAll ${./fast-cpp-csv-parser.pc.in} $out/lib/pkgconfig/fast-cpp-csv-parser.pc + ''; + + meta = with lib; { + description = "A small, easy-to-use and fast header-only library for reading comma separated value (CSV) files"; + homepage = "https://github.com/ben-strasser/fast-cpp-csv-parser"; + license = licenses.bsd3; + maintainers = with maintainers; [ bhipple ]; + }; +} diff --git a/pkgs/development/libraries/fast-cpp-csv-parser/fast-cpp-csv-parser.pc.in b/pkgs/development/libraries/fast-cpp-csv-parser/fast-cpp-csv-parser.pc.in new file mode 100644 index 00000000000..4a8e57d20ff --- /dev/null +++ b/pkgs/development/libraries/fast-cpp-csv-parser/fast-cpp-csv-parser.pc.in @@ -0,0 +1,8 @@ +prefix=@out@ +includedir=${prefix}/include + +Name: fast-cpp-csv-parser +Description: Fast header-only library for reading CSV files +URL: https://github.com/ben-strasser/fast-cpp-csv-parser +Version: @version@ +Cflags: -isystem${includedir} diff --git a/pkgs/development/libraries/fastjson/default.nix b/pkgs/development/libraries/fastjson/default.nix index f1bd647b06d..9c7f4893cbe 100644 --- a/pkgs/development/libraries/fastjson/default.nix +++ b/pkgs/development/libraries/fastjson/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchFromGitHub, libtool, autoconf, automake }: +{ lib, stdenv, fetchFromGitHub, libtool, autoconf, automake }: stdenv.mkDerivation rec { - version = "0.99.8"; + version = "0.99.9"; pname = "fastjson"; src = fetchFromGitHub { repo = "libfastjson"; owner = "rsyslog"; rev = "v${version}"; - sha256 = "0qhs0g9slj3p0v2z4s3cnsx44msrlb4k78ljg7714qiziqbrbwyl"; + sha256 = "sha256-2LyBdJR0dV1CElcGfrlmNwX52lVtx9X/Z4h/1XFjOIs="; }; buildInputs = [ autoconf automake libtool ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sh autogen.sh ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A fast json library for C"; homepage = "https://github.com/rsyslog/libfastjson"; license = licenses.mit; diff --git a/pkgs/development/libraries/fastpbkdf2/default.nix b/pkgs/development/libraries/fastpbkdf2/default.nix index 59056a9b9a3..ac90001fc39 100644 --- a/pkgs/development/libraries/fastpbkdf2/default.nix +++ b/pkgs/development/libraries/fastpbkdf2/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, openssl }: +{ lib, stdenv, fetchFromGitHub, openssl }: stdenv.mkDerivation { name = "fastpbkdf2-1.0.0"; - + src = fetchFromGitHub { owner = "ctz"; repo = "fastpbkdf2"; rev = "v1.0.0"; sha256 = "09ax0h4ik3vhvp3s98lic93l3g9f4v1jkr5k6z4g1lvm7s3lrha2"; }; - + buildInputs = [ openssl ]; preBuild = '' @@ -22,7 +22,7 @@ stdenv.mkDerivation { cp fastpbkdf2.h $out/include/fastpbkdf2 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A fast PBKDF2-HMAC-{SHA1,SHA256,SHA512} implementation in C"; homepage = "https://github.com/ctz/fastpbkdf2"; license = licenses.cc0; diff --git a/pkgs/development/libraries/faudio/default.nix b/pkgs/development/libraries/faudio/default.nix index 02544d74782..c030f53df26 100644 --- a/pkgs/development/libraries/faudio/default.nix +++ b/pkgs/development/libraries/faudio/default.nix @@ -1,23 +1,23 @@ -{ stdenv, fetchFromGitHub, cmake, SDL2}: +{ lib, stdenv, fetchFromGitHub, cmake, SDL2}: #TODO: tests stdenv.mkDerivation rec { pname = "faudio"; - version = "20.12"; + version = "21.01"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; rev = version; - sha256 = "1iwfsfbd2ji7lkk5fh0wla287gph0sadlf0pz2j0vyddpkvr0xgx"; + sha256 = "sha256-D7nlwQnz2JPRB3JrrkyUcaaf4Ro/+Ap8sqq5Oz8naHw="; }; nativeBuildInputs = [cmake]; buildInputs = [ SDL2 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "XAudio reimplementation focusing to develop a fully accurate DirectX audio library"; homepage = "https://github.com/FNA-XNA/FAudio"; license = licenses.zlib; diff --git a/pkgs/development/libraries/fcft/default.nix b/pkgs/development/libraries/fcft/default.nix index 1ce09b63cbe..fd6f26c9789 100644 --- a/pkgs/development/libraries/fcft/default.nix +++ b/pkgs/development/libraries/fcft/default.nix @@ -1,21 +1,28 @@ { stdenv, lib, fetchgit, pkg-config, meson, ninja, scdoc -,freetype, fontconfig, harfbuzz, pixman, tllist, check }: +, freetype, fontconfig, pixman, tllist, check +, withHarfBuzz ? true +, harfbuzz +}: stdenv.mkDerivation rec { pname = "fcft"; - version = "2.3.1"; + version = "2.3.2"; src = fetchgit { url = "https://codeberg.org/dnkl/fcft.git"; rev = version; - sha256 = "sha256-FD3KfaQbSEA1XdmS6YxH+c5fSsra9Ro/KKslb7Brv7U="; + sha256 = "0k2i57rakm4g86f7hbhkby8af0vv7v63a70lk3m58mkycpy5q2rm"; }; nativeBuildInputs = [ pkg-config meson ninja scdoc ]; - buildInputs = [ freetype fontconfig pixman tllist harfbuzz ]; + buildInputs = [ freetype fontconfig pixman tllist ] + ++ lib.optional withHarfBuzz harfbuzz; checkInputs = [ check ]; - mesonFlags = [ "--buildtype=release" ]; + mesonFlags = [ + "--buildtype=release" + "-Dtext-shaping=${if withHarfBuzz then "enabled" else "disabled"}" + ]; doCheck = true; diff --git a/pkgs/development/libraries/fcgi/default.nix b/pkgs/development/libraries/fcgi/default.nix index bde1682e3fc..1ec666a920c 100644 --- a/pkgs/development/libraries/fcgi/default.nix +++ b/pkgs/development/libraries/fcgi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }: stdenv.mkDerivation rec { pname = "fcgi"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { postInstall = "ln -s . $out/include/fastcgi"; - meta = with stdenv.lib; { + meta = with lib; { description = "A language independent, scalable, open extension to CG"; homepage = "http://www.fastcgi.com/"; license = "FastCGI see LICENSE.TERMS"; diff --git a/pkgs/development/libraries/fcppt/default.nix b/pkgs/development/libraries/fcppt/default.nix index d76772500fb..380fdcce29f 100644 --- a/pkgs/development/libraries/fcppt/default.nix +++ b/pkgs/development/libraries/fcppt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, boost, catch2, metal }: +{ lib, stdenv, fetchFromGitHub, cmake, boost, catch2, metal }: stdenv.mkDerivation rec { pname = "fcppt"; version = "3.5.0"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=false" "-DENABLE_BOOST=true" "-DENABLE_EXAMPLES=true" "-DENABLE_CATCH=true" "-DENABLE_TEST=true" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Freundlich's C++ toolkit"; longDescription = '' Freundlich's C++ Toolkit (fcppt) is a collection of libraries focusing on diff --git a/pkgs/development/libraries/fdk-aac/default.nix b/pkgs/development/libraries/fdk-aac/default.nix index 53967381570..dc64a6edce0 100644 --- a/pkgs/development/libraries/fdk-aac/default.nix +++ b/pkgs/development/libraries/fdk-aac/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , exampleSupport ? false # Example encoding program }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "fdk-aac"; version = "2.0.1"; diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix index faa8ed3c70e..fd7d89a8831 100644 --- a/pkgs/development/libraries/fflas-ffpack/default.nix +++ b/pkgs/development/libraries/fflas-ffpack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, givaro, pkgconfig, blas, lapack +{ lib, stdenv, fetchFromGitHub, autoreconfHook, givaro, pkg-config, blas, lapack , gmpxx }: @@ -23,15 +23,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig - ] ++ stdenv.lib.optionals doCheck checkInputs; + pkg-config + ] ++ lib.optionals doCheck checkInputs; buildInputs = [ givaro blas lapack ]; configureFlags = [ "--with-blas-libs=-lcblas" "--with-lapack-libs=-llapacke" - ] ++ stdenv.lib.optionals stdenv.isx86_64 [ + ] ++ lib.optionals stdenv.isx86_64 [ # disable SIMD instructions (which are enabled *when available* by default) # for now we need to be careful to disable *all* relevant versions of an instruction set explicitly (https://github.com/linbox-team/fflas-ffpack/issues/284) "--${if stdenv.hostPlatform.sse3Support then "enable" else "disable"}-sse3" @@ -48,9 +48,9 @@ stdenv.mkDerivation rec { ]; doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { inherit version; - description = ''Finite Field Linear Algebra Subroutines''; + description = "Finite Field Linear Algebra Subroutines"; license = licenses.lgpl21Plus; maintainers = teams.sage.members; platforms = platforms.unix; diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index f428290e803..916ea2772e1 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -1,4 +1,4 @@ -{ stdenv, ffmpeg, addOpenGLRunpath, fetchurl, fetchpatch, pkgconfig, perl, texinfo, yasm +{ lib, stdenv, ffmpeg, addOpenGLRunpath, fetchurl, fetchpatch, pkg-config, perl, texinfo, yasm /* * Licensing options (yes some are listed twice, filters and such are not listed) */ @@ -184,7 +184,7 @@ let inherit (stdenv) isCygwin isDarwin isFreeBSD isLinux isAarch64; - inherit (stdenv.lib) optional optionals optionalString enableFeature; + inherit (lib) optional optionals optionalString enableFeature; in /* @@ -260,9 +260,9 @@ stdenv.mkDerivation rec { prePatch = '' patchShebangs . - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' sed -i 's/#ifndef __MAC_10_11/#if 1/' ./libavcodec/audiotoolboxdec.c - '' + stdenv.lib.optionalString (frei0r != null) '' + '' + lib.optionalString (frei0r != null) '' substituteInPlace libavfilter/vf_frei0r.c \ --replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1 substituteInPlace doc/filters.texi \ @@ -430,7 +430,7 @@ stdenv.mkDerivation rec { "--enable-cross-compile" ]; - nativeBuildInputs = [ addOpenGLRunpath perl pkgconfig texinfo yasm ]; + nativeBuildInputs = [ addOpenGLRunpath perl pkg-config texinfo yasm ]; buildInputs = [ bzip2 celt dav1d fontconfig freetype frei0r fribidi game-music-emu gnutls gsm @@ -467,7 +467,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A complete, cross-platform solution to record, convert and stream audio and video"; homepage = "https://www.ffmpeg.org/"; longDescription = '' diff --git a/pkgs/development/libraries/ffmpeg-sixel/default.nix b/pkgs/development/libraries/ffmpeg-sixel/default.nix index 049ef32b72f..daa03d0293a 100644 --- a/pkgs/development/libraries/ffmpeg-sixel/default.nix +++ b/pkgs/development/libraries/ffmpeg-sixel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, libsixel, yasm +{ lib, stdenv, fetchFromGitHub, pkg-config, libsixel, yasm }: stdenv.mkDerivation { @@ -13,7 +13,7 @@ stdenv.mkDerivation { sha256 = "00s2lggfdj2ibpngpyqqg7360p7yb69ys1ppg59yvv0m0mxk5x3k"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsixel yasm @@ -27,7 +27,7 @@ stdenv.mkDerivation { mv $out/bin/ffmpeg $out/bin/ffmpeg-sixel ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A complete, cross-platform solution to record, convert and stream audio and video, extended to support console graphics"; homepage = "http://www.ffmpeg.org/"; license = licenses.lgpl3; diff --git a/pkgs/development/libraries/ffmpeg/3.4.nix b/pkgs/development/libraries/ffmpeg/3.4.nix index 629fdba5673..be341d588c1 100644 --- a/pkgs/development/libraries/ffmpeg/3.4.nix +++ b/pkgs/development/libraries/ffmpeg/3.4.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchpatch +{ callPackage, fetchpatch # Darwin frameworks , Cocoa, CoreMedia , ... diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix index 7e3941d3f37..2cc409fc037 100644 --- a/pkgs/development/libraries/ffmpeg/4.nix +++ b/pkgs/development/libraries/ffmpeg/4.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchpatch +{ callPackage, fetchpatch # Darwin frameworks , Cocoa, CoreMedia, VideoToolbox , ... diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index d763fb51354..99a08470396 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, fetchurl, pkgconfig, addOpenGLRunpath, perl, texinfo, yasm +{ lib, stdenv, buildPackages, fetchurl, pkg-config, addOpenGLRunpath, 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, dav1d @@ -44,7 +44,7 @@ let inherit (stdenv) isDarwin isFreeBSD isLinux isAarch32; - inherit (stdenv.lib) optional optionals optionalString enableFeature filter; + inherit (lib) optional optionals optionalString enableFeature filter; cmpVer = builtins.compareVersions; reqMin = requiredVersion: (cmpVer requiredVersion branch != 1); @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { inherit sha256; }; - postPatch = ''patchShebangs .''; + postPatch = "patchShebangs ."; inherit patches; outputs = [ "bin" "dev" "out" "man" ] @@ -167,7 +167,7 @@ stdenv.mkDerivation rec { ] ++ optional stdenv.cc.isClang "--cc=clang"); depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ addOpenGLRunpath perl pkgconfig texinfo yasm ]; + nativeBuildInputs = [ addOpenGLRunpath perl pkg-config texinfo yasm ]; buildInputs = [ bzip2 fontconfig freetype gnutls libiconv lame libass libogg libssh libtheora @@ -211,7 +211,7 @@ stdenv.mkDerivation rec { inherit vaapiSupport vdpauSupport; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A complete, cross-platform solution to record, convert and stream audio and video"; homepage = "http://www.ffmpeg.org/"; longDescription = '' diff --git a/pkgs/development/libraries/ffmpegthumbnailer/default.nix b/pkgs/development/libraries/ffmpegthumbnailer/default.nix index 6c8e689840e..2e68dbb1d12 100644 --- a/pkgs/development/libraries/ffmpegthumbnailer/default.nix +++ b/pkgs/development/libraries/ffmpegthumbnailer/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, ffmpeg_3, cmake, libpng, pkg-config, libjpeg +{ fetchFromGitHub, lib, stdenv, ffmpeg_3, cmake, libpng, pkg-config, libjpeg }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ ffmpeg_3 libpng libjpeg ]; cmakeFlags = [ "-DENABLE_THUMBNAILER=ON" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/dirkvdb/ffmpegthumbnailer"; description = "A lightweight video thumbnailer"; longDescription = "FFmpegthumbnailer is a lightweight video diff --git a/pkgs/development/libraries/ffms/default.nix b/pkgs/development/libraries/ffms/default.nix index ebbced19eb8..7fa96cff7f8 100644 --- a/pkgs/development/libraries/ffms/default.nix +++ b/pkgs/development/libraries/ffms/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, zlib, ffmpeg_3, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, zlib, ffmpeg_3, pkg-config }: stdenv.mkDerivation rec { pname = "ffms"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-fPIC"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib ffmpeg_3 ]; # ffms includes a built-in vapoursynth plugin, see: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ln -s $out/lib/libffms2.so $out/lib/vapoursynth/libffms2.so ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/FFMS/ffms2/"; description = "Libav/ffmpeg based source library for easy frame accurate access"; license = licenses.mit; diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix index ba7e86747a7..9385903b3f5 100644 --- a/pkgs/development/libraries/fftw/default.nix +++ b/pkgs/development/libraries/fftw/default.nix @@ -6,7 +6,7 @@ assert stdenv.cc.isClang -> llvmPackages != null; assert elem precision [ "single" "double" "long-double" "quad-precision" ]; let - version = "3.3.8"; + version = "3.3.9"; withDoc = stdenv.cc.isGNU; in @@ -18,7 +18,7 @@ stdenv.mkDerivation { "http://fftw.org/fftw-${version}.tar.gz" "ftp://ftp.fftw.org/pub/fftw/fftw-${version}.tar.gz" ]; - sha256 = "00z3k8fq561wq2khssqg0kallk0504dzlx989x3vvicjdqpjc4v1"; + sha256 = "sha256-vyx85AsEroEa9xTetRJRDMLBe5q51t3PSf5Eh+6nrz0="; }; outputs = [ "out" "dev" "man" ] @@ -46,7 +46,7 @@ stdenv.mkDerivation { checkInputs = [ perl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Fastest Fourier Transform in the West library"; homepage = "http://www.fftw.org/"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/filter-audio/default.nix b/pkgs/development/libraries/filter-audio/default.nix index 3438bfee07b..a412f707047 100644 --- a/pkgs/development/libraries/filter-audio/default.nix +++ b/pkgs/development/libraries/filter-audio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "filter-audio"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Lightweight audio filtering library made from webrtc code"; license = licenses.bsd3; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/libraries/flann/default.nix b/pkgs/development/libraries/flann/default.nix index a61d11c2578..91339380424 100644 --- a/pkgs/development/libraries/flann/default.nix +++ b/pkgs/development/libraries/flann/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, unzip, cmake, python }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, unzip, cmake, python }: stdenv.mkDerivation { name = "flann-1.9.1"; @@ -22,9 +22,9 @@ stdenv.mkDerivation { meta = { homepage = "http://people.cs.ubc.ca/~mariusm/flann/"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; description = "Fast approximate nearest neighbor searches in high dimensional spaces"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/flatbuffers/default.nix b/pkgs/development/libraries/flatbuffers/default.nix index 0b96a91e45f..374203556a6 100644 --- a/pkgs/development/libraries/flatbuffers/default.nix +++ b/pkgs/development/libraries/flatbuffers/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }: stdenv.mkDerivation rec { pname = "flatbuffers"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }) ]; - preConfigure = stdenv.lib.optional stdenv.buildPlatform.isDarwin '' + preConfigure = lib.optional stdenv.buildPlatform.isDarwin '' rm BUILD ''; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { # doCheck = stdenv.hostPlatform == stdenv.buildPlatform; checkTarget = "test"; - meta = with stdenv.lib; { + meta = with lib; { description = "Memory Efficient Serialization Library"; longDescription = '' FlatBuffers is an efficient cross platform serialization library for diff --git a/pkgs/development/libraries/flatcc/default.nix b/pkgs/development/libraries/flatcc/default.nix index 6239dba2836..6b40814119c 100644 --- a/pkgs/development/libraries/flatcc/default.nix +++ b/pkgs/development/libraries/flatcc/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake }: @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { meta = { description = "FlatBuffers Compiler and Library in C for C "; homepage = "https://github.com/dvidelabs/flatcc"; - license = [ stdenv.lib.licenses.asl20 ]; + license = [ lib.licenses.asl20 ]; }; } diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index 6f8634c01ef..36c946e06f7 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -1,12 +1,8 @@ -{ stdenv +{ lib, stdenv , fetchurl -, fetchpatch -, autoconf -, automake -, libtool +, autoreconfHook , docbook_xml_dtd_412 -, docbook_xml_dtd_42 -, docbook_xml_dtd_43 +, docbook_xml_dtd_45 , docbook-xsl-nons , which , libxml2 @@ -49,7 +45,7 @@ , xorg , valgrind , glib-networking -, wrapGAppsHook +, wrapGAppsNoGuiHook , dconf , gsettings-desktop-schemas , librsvg @@ -57,14 +53,14 @@ stdenv.mkDerivation rec { pname = "flatpak"; - version = "1.8.2"; + version = "1.10.1"; # TODO: split out lib once we figure out what to do with triggerdir outputs = [ "out" "dev" "man" "doc" "devdoc" "installedTests" ]; src = fetchurl { url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "eSZiXffCKCpe4aizwxevU9QKZjsbxrGKLch0fiZQhbA="; + sha256 = "1dywvfpmszvp2wy5hvpzy8z6gz2gzmi9p302njp52p9vpx14ydf1"; }; patches = [ @@ -104,24 +100,15 @@ stdenv.mkDerivation rec { # But we want the GDK_PIXBUF_MODULE_FILE from the wrapper affect the icon validator. ./validate-icon-pixbuf.patch - - # Fix `flatpak/test-oci-registry@{user,system}.wrap.test` installed tests. - # https://github.com/flatpak/flatpak/pull/3762 - (fetchpatch { - url = "https://github.com/flatpak/flatpak/commit/c1447dadecd50f384b6d11dac18b014245267d00.patch"; - sha256 = "UAA/wGr8/aMbx5MV+8Ilro2kgKkx2QOn88lDUjCgeDA="; - }) ]; nativeBuildInputs = [ - autoconf - automake - libtool + autoreconfHook libxml2 - # TODO: replace with docbook_xml_dtd_45 https://github.com/flatpak/flatpak/pull/3760 + # Remove 4.1.2 again once the following is merged + # https://github.com/flatpak/flatpak/pull/4102 docbook_xml_dtd_412 - docbook_xml_dtd_42 - docbook_xml_dtd_43 + docbook_xml_dtd_45 docbook-xsl-nons which gobject-introspection @@ -132,7 +119,7 @@ stdenv.mkDerivation rec { xmlto appstream-glib yacc - wrapGAppsHook + wrapGAppsNoGuiHook ]; buildInputs = [ @@ -147,7 +134,7 @@ stdenv.mkDerivation rec { libseccomp libsoup lzma - # zstd # TODO: broken paths in .pc file + zstd polkit python3 systemd @@ -196,17 +183,7 @@ stdenv.mkDerivation rec { in '' patchShebangs buildutil patchShebangs tests - PATH=${stdenv.lib.makeBinPath [vsc-py]}:$PATH patchShebangs --build variant-schema-compiler/variant-schema-compiler - ''; - - preConfigure = '' - # TODO: remove the condition once autogen.sh is shipped in the tarball - # https://github.com/flatpak/flatpak/pull/3761 - if [[ -f autogen.sh ]]; then - NOCONFIGURE=1 ./autogen.sh - else - autoreconf --install --force --verbose - fi + PATH=${lib.makeBinPath [vsc-py]}:$PATH patchShebangs --build variant-schema-compiler/variant-schema-compiler ''; passthru = { @@ -215,10 +192,10 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Linux application sandboxing and distribution framework"; homepage = "https://flatpak.org/"; - license = licenses.lgpl21; + license = licenses.lgpl21Plus; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/flint/default.nix b/pkgs/development/libraries/flint/default.nix index 3c768fc472c..7bfa701db73 100644 --- a/pkgs/development/libraries/flint/default.nix +++ b/pkgs/development/libraries/flint/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , gmp @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { mpir mpfr ntl - ] ++ stdenv.lib.optionals withBlas [ + ] ++ lib.optionals withBlas [ openblas ]; propagatedBuildInputs = [ @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { "--with-mpir=${mpir}" "--with-mpfr=${mpfr}" "--with-ntl=${ntl}" - ] ++ stdenv.lib.optionals withBlas [ + ] ++ lib.optionals withBlas [ "--with-blas=${openblas}" ]; @@ -52,10 +52,10 @@ stdenv.mkDerivation rec { doCheck = true; meta = { inherit version; - description = ''Fast Library for Number Theory''; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; + description = "Fast Library for Number Theory"; + license = lib.licenses.gpl2Plus; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.unix; homepage = "http://www.flintlib.org/"; downloadPage = "http://www.flintlib.org/downloads.html"; updateWalker = true; diff --git a/pkgs/development/libraries/flite/default.nix b/pkgs/development/libraries/flite/default.nix index 1db8a9fbe2f..24927fe853b 100644 --- a/pkgs/development/libraries/flite/default.nix +++ b/pkgs/development/libraries/flite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, alsaLib }: +{ lib, stdenv, fetchFromGitHub, alsaLib }: stdenv.mkDerivation rec { pname = "flite"; @@ -11,15 +11,15 @@ stdenv.mkDerivation rec { sha256 = "1n0p81jzndzc1rzgm66kw9ls189ricy5v1ps11y0p2fk1p56kbjf"; }; - buildInputs = stdenv.lib.optionals stdenv.isLinux [ alsaLib ]; + buildInputs = lib.optionals stdenv.isLinux [ alsaLib ]; configureFlags = [ "--enable-shared" - ] ++ stdenv.lib.optionals stdenv.isLinux [ "--with-audio=alsa" ]; + ] ++ lib.optionals stdenv.isLinux [ "--with-audio=alsa" ]; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A small, fast run-time speech synthesis engine"; homepage = "http://www.festvox.org/flite/"; license = licenses.bsdOriginal; diff --git a/pkgs/development/libraries/fltk/1.4.nix b/pkgs/development/libraries/fltk/1.4.nix index c40a75edc09..2db0aea3ecf 100644 --- a/pkgs/development/libraries/fltk/1.4.nix +++ b/pkgs/development/libraries/fltk/1.4.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, xlibsWrapper, xorgproto, libXi +{ lib, stdenv, fetchurl, pkg-config, xlibsWrapper, xorgproto, libXi , freeglut, libGLU, libGL, libjpeg, zlib, libXft, libpng , libtiff, freetype, Cocoa, AGL, GLUT }: @@ -16,11 +16,11 @@ stdenv.mkDerivation { sha256 = "1v8wxvxcbk99i82x2v5fpqg5vj8n7g8a38g30ry7nzcjn5sf3r63"; }; - patches = stdenv.lib.optionals stdenv.isDarwin [ ./nsosv.patch ]; + patches = lib.optionals stdenv.isDarwin [ ./nsosv.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libGLU libGL libjpeg zlib libpng libXft ] - ++ stdenv.lib.optional stdenv.isDarwin [ AGL Cocoa GLUT ]; + ++ lib.optional stdenv.isDarwin [ AGL Cocoa GLUT ]; propagatedBuildInputs = [ xorgproto ] ++ (if stdenv.isDarwin @@ -39,7 +39,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A C++ cross-platform lightweight GUI library"; homepage = "https://www.fltk.org"; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix index ad4736533cf..5cbd993fc64 100644 --- a/pkgs/development/libraries/fltk/default.nix +++ b/pkgs/development/libraries/fltk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, xlibsWrapper, xorgproto, libXi +{ lib, stdenv, fetchurl, pkg-config, xlibsWrapper, xorgproto, libXi , freeglut, libGL, libGLU, libjpeg, zlib, libXft, libpng , libtiff, freetype, Cocoa, AGL, GLUT }: @@ -16,11 +16,11 @@ stdenv.mkDerivation { sha256 = "00jp24z1818k9n6nn6lx7qflqf2k13g4kxr0p8v1d37kanhb4ac7"; }; - patches = stdenv.lib.optionals stdenv.isDarwin [ ./nsosv.patch ]; + patches = lib.optionals stdenv.isDarwin [ ./nsosv.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libGLU libGL libjpeg zlib libpng libXft ] - ++ stdenv.lib.optional stdenv.isDarwin [ AGL Cocoa GLUT ]; + ++ lib.optional stdenv.isDarwin [ AGL Cocoa GLUT ]; propagatedBuildInputs = [ xorgproto ] ++ (if stdenv.isDarwin @@ -37,7 +37,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A C++ cross-platform lightweight GUI library"; homepage = "https://www.fltk.org"; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix index 2f490891433..0d2983b1f84 100644 --- a/pkgs/development/libraries/fmt/default.nix +++ b/pkgs/development/libraries/fmt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake , enableShared ? !stdenv.hostPlatform.isStatic }: @@ -28,7 +28,7 @@ let doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Small, safe and fast formatting library"; longDescription = '' fmt (formerly cppformat) is an open-source formatting library. It can be diff --git a/pkgs/development/libraries/folks/default.nix b/pkgs/development/libraries/folks/default.nix index 6181cb45e19..955b7e0d16f 100644 --- a/pkgs/development/libraries/folks/default.nix +++ b/pkgs/development/libraries/folks/default.nix @@ -1,6 +1,6 @@ { fetchurl -, stdenv -, pkgconfig +, lib, stdenv +, pkg-config , meson , ninja , glib @@ -38,13 +38,13 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1f9b52vmwnq7s51vj26w2618dn2ph5g12ibbkbyk6fvxcgd7iryn"; }; mesonFlags = [ "-Ddocs=true" - "-Dtelepathy_backend=${stdenv.lib.boolToString telepathySupport}" + "-Dtelepathy_backend=${lib.boolToString telepathySupport}" ]; nativeBuildInputs = [ @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { docbook_xml_dtd_43 meson ninja - pkgconfig + pkg-config python3 vala ]; @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { nspr nss readline - ] ++ stdenv.lib.optional telepathySupport telepathy-glib; + ] ++ lib.optional telepathySupport telepathy-glib; propagatedBuildInputs = [ glib @@ -105,7 +105,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A library that aggregates people from multiple sources to create metacontacts"; homepage = "https://wiki.gnome.org/Projects/Folks"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 62f73a36191..063678cbccc 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , boost @@ -19,13 +19,13 @@ stdenv.mkDerivation (rec { pname = "folly"; - version = "2020.09.28.00"; + version = "2021.01.25.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "1ry2nqfavcbz0jvsqw71105gbxm5hpmdi2k1w155m957jrv3n5vg"; + sha256 = "sha256-n2cpXdjPZYNjvSHBZFFn3JFwqYCFWc8qSKwet80LtJE="; }; nativeBuildInputs = [ @@ -52,7 +52,7 @@ stdenv.mkDerivation (rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An open-source C++ library developed and used at Facebook"; homepage = "https://github.com/facebook/folly"; license = licenses.asl20; @@ -60,6 +60,6 @@ stdenv.mkDerivation (rec { platforms = [ "x86_64-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ abbradar pierreis ]; }; -} // stdenv.lib.optionalAttrs stdenv.isDarwin { +} // lib.optionalAttrs stdenv.isDarwin { LDFLAGS = "-ljemalloc"; }) diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index e08149903a2..daedaefcf9c 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchpatch , substituteAll , fetchurl @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { "--with-cache-dir=/var/cache/fontconfig" # otherwise the fallback is in $out/ # just <1MB; this is what you get when loading config fails for some reason "--with-default-fonts=${dejavu_fonts.minimal}" - ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--with-arch=${stdenv.hostPlatform.parsed.cpu.name}" ]; @@ -112,7 +112,7 @@ stdenv.mkDerivation rec { rm -r $bin/share/man/man3 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A library for font customization and configuration"; homepage = "http://fontconfig.org/"; license = licenses.bsd2; # custom but very bsd-like diff --git a/pkgs/development/libraries/forge/default.nix b/pkgs/development/libraries/forge/default.nix index 83630aef9aa..ba85cea73d6 100644 --- a/pkgs/development/libraries/forge/default.nix +++ b/pkgs/development/libraries/forge/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config , arrayfire, expat, fontconfig, freeimage, freetype, boost , mesa, libGLU, libGL, glfw3, SDL2, cudatoolkit }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config ]; buildInputs = [ @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { arrayfire ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An OpenGL interop library that can be used with ArrayFire or any other application using CUDA or OpenCL compute backend"; longDescription = '' An OpenGL interop library that can be used with ArrayFire or any other application using CUDA or OpenCL compute backend. diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix index 5dacf53b259..408518ba79c 100644 --- a/pkgs/development/libraries/fox/default.nix +++ b/pkgs/development/libraries/fox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xlibsWrapper, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor, libXrandr, libXft +{ lib, stdenv, fetchurl, xlibsWrapper, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor, libXrandr, libXft , CoreServices ? null }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { patches = [ ./clang.patch ]; buildInputs = [ libpng xlibsWrapper libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft ] - ++ stdenv.lib.optional stdenv.isDarwin CoreServices; + ++ lib.optional stdenv.isDarwin CoreServices; doCheck = true; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ based class library for building Graphical User Interfaces"; longDescription = '' FOX stands for Free Objects for X. diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/pkgs/development/libraries/fox/fox-1.6.nix index 208780a450e..50f9e688cb9 100644 --- a/pkgs/development/libraries/fox/fox-1.6.nix +++ b/pkgs/development/libraries/fox/fox-1.6.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xlibsWrapper, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor +{ lib, stdenv, fetchurl, xlibsWrapper, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor , libXrandr, libGLU, libGL, libXft, libXfixes, xinput , CoreServices }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ xlibsWrapper libpng libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft libGLU libGL libXfixes xinput - ] ++ stdenv.lib.optional stdenv.isDarwin CoreServices; + ] ++ lib.optional stdenv.isDarwin CoreServices; doCheck = true; @@ -36,8 +36,8 @@ stdenv.mkDerivation rec { Current aims are to make FOX completely platform independent, and thus programs written against the FOX library will be only a compile away from running on a variety of platforms. ''; homepage = "http://fox-toolkit.org"; - license = stdenv.lib.licenses.lgpl3; + license = lib.licenses.lgpl3; maintainers = []; - platforms = stdenv.lib.platforms.mesaPlatforms; + platforms = lib.platforms.mesaPlatforms; }; } diff --git a/pkgs/development/libraries/fplll/20160331.nix b/pkgs/development/libraries/fplll/20160331.nix index aabbfd14a78..374aec5904d 100644 --- a/pkgs/development/libraries/fplll/20160331.nix +++ b/pkgs/development/libraries/fplll/20160331.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, autoreconfHook +{lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, autoreconfHook , gmp, mpfr }: stdenv.mkDerivation rec { @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { buildInputs = [gmp mpfr]; meta = { inherit version; - description = ''Lattice algorithms using floating-point arithmetic''; - license = stdenv.lib.licenses.lgpl21Plus; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + description = "Lattice algorithms using floating-point arithmetic"; + license = lib.licenses.lgpl21Plus; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/fplll/default.nix b/pkgs/development/libraries/fplll/default.nix index 82d56ea2af4..3a82b566a50 100644 --- a/pkgs/development/libraries/fplll/default.nix +++ b/pkgs/development/libraries/fplll/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch , gettext @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { mpfr ]; - meta = with stdenv.lib; { - description = ''Lattice algorithms using floating-point arithmetic''; + meta = with lib; { + description = "Lattice algorithms using floating-point arithmetic"; changelog = [ # Some release notes are added to the github tags, though they are not # always complete. diff --git a/pkgs/development/libraries/frame/default.nix b/pkgs/development/libraries/frame/default.nix index f266f07a631..e96aa9394da 100644 --- a/pkgs/development/libraries/frame/default.nix +++ b/pkgs/development/libraries/frame/default.nix @@ -1,5 +1,5 @@ { enableX11 ? true -, stdenv, fetchurl, pkgconfig, xorg }: +, lib, stdenv, fetchurl, pkg-config, xorg }: stdenv.mkDerivation rec { pname = "frame"; @@ -9,16 +9,16 @@ stdenv.mkDerivation rec { sha256 = "bc2a20cd3ac1e61fe0461bd3ee8cb250dbcc1fa511fad0686d267744e9c78f3a"; }; - buildInputs = [ - stdenv pkgconfig - ] ++ stdenv.lib.optionals enableX11 [xorg.xorgserver xorg.libX11 xorg.libXext xorg.libXi]; + buildInputs = [ + stdenv pkg-config + ] ++ lib.optionals enableX11 [xorg.xorgserver xorg.libX11 xorg.libXext xorg.libXi]; - configureFlags = stdenv.lib.optional enableX11 "--with-x11"; + configureFlags = lib.optional enableX11 "--with-x11"; meta = { homepage = "https://launchpad.net/frame"; description = "Handles the buildup and synchronization of a set of simultaneous touches"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/freealut/default.nix b/pkgs/development/libraries/freealut/default.nix index 2c9a893284b..3bb6eaddfa3 100644 --- a/pkgs/development/libraries/freealut/default.nix +++ b/pkgs/development/libraries/freealut/default.nix @@ -1,4 +1,4 @@ -{ stdenv, darwin, fetchurl, openal }: +{ lib, stdenv, darwin, fetchurl, openal }: stdenv.mkDerivation rec { name = "freealut-1.1.0"; @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { }; buildInputs = [ openal - ] ++ stdenv.lib.optional stdenv.isDarwin + ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.OpenAL ; meta = { homepage = "http://openal.org/"; description = "Free implementation of OpenAL's ALUT standard"; - license = stdenv.lib.licenses.lgpl2; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.lgpl2; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/development/libraries/freeglut/default.nix index bb61231d445..83e3eebdcc3 100644 --- a/pkgs/development/libraries/freeglut/default.nix +++ b/pkgs/development/libraries/freeglut/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libXi, libXrandr, libXxf86vm, libGL, libGLU, xlibsWrapper, cmake }: +{ lib, stdenv, fetchurl, libXi, libXrandr, libXxf86vm, libGL, libGLU, xlibsWrapper, cmake }: let version = "3.2.1"; in stdenv.mkDerivation { @@ -15,7 +15,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; buildInputs = [ libXi libXrandr libXxf86vm libGL libGLU xlibsWrapper ]; - cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [ + cmakeFlags = lib.optionals stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${libGL}/include" "-DOPENGL_gl_LIBRARY:FILEPATH=${libGL}/lib/libGL.dylib" "-DOPENGL_glu_LIBRARY:FILEPATH=${libGLU}/lib/libGLU.dylib" @@ -23,7 +23,7 @@ in stdenv.mkDerivation { "-DFREEGLUT_BUILD_STATIC:BOOL=OFF" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Create and manage windows containing OpenGL contexts"; longDescription = '' FreeGLUT is an open source alternative to the OpenGL Utility Toolkit diff --git a/pkgs/development/libraries/freenect/default.nix b/pkgs/development/libraries/freenect/default.nix index 9021e78a5b6..2cf02651473 100644 --- a/pkgs/development/libraries/freenect/default.nix +++ b/pkgs/development/libraries/freenect/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, libusb1, pkgconfig, freeglut, libGLU, libGL, libXi, libXmu +{ stdenv, lib, fetchFromGitHub, cmake, libusb1, pkg-config, freeglut, libGLU, libGL, libXi, libXmu , GLUT, Cocoa }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ libusb1 freeglut libGLU libGL libXi libXmu ] ++ lib.optionals stdenv.isDarwin [ GLUT Cocoa ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; meta = { description = "Drivers and libraries for the Xbox Kinect device on Windows, Linux, and macOS"; diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index 1dc9633d1a7..5166efea21f 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config , openssl , odbcSupport ? true, unixODBC ? null }: @@ -8,20 +8,20 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { pname = "freetds"; - version = "1.1.42"; + version = "1.2"; src = fetchurl { url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2"; - sha256 = "02phnk88zv4f8byx954784w8mh33knsslwvj266jfyrmxz6hxxxg"; + sha256 = "0nilqf3cssi6z8bxxpmc7zxsh7apgwmx8mm7nfc6c5d40z3nyjpk"; }; buildInputs = [ openssl - ] ++ stdenv.lib.optional odbcSupport unixODBC; + ] ++ lib.optional odbcSupport unixODBC; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Libraries to natively talk to Microsoft SQL Server and Sybase databases"; homepage = "https://www.freetds.org"; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index b87e64c2afb..7b5fff29a28 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , buildPackages -, pkgconfig, which, makeWrapper +, pkg-config, which, makeWrapper , zlib, bzip2, libpng, gnumake, glib , # FreeType supports LCD filtering (colloquially referred to as sub-pixel rendering). @@ -10,13 +10,13 @@ }: let - inherit (stdenv.lib) optional optionalString; + inherit (lib) optional optionalString; in stdenv.mkDerivation rec { pname = "freetype"; version = "2.10.4"; - meta = with stdenv.lib; { + meta = with lib; { description = "A font rendering engine"; longDescription = '' FreeType is a portable and efficient library for rendering fonts. It @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype # dependence on harfbuzz is looser than the reverse dependence - nativeBuildInputs = [ pkgconfig which makeWrapper ] + nativeBuildInputs = [ pkg-config which makeWrapper ] # FreeType requires GNU Make, which is not part of stdenv on FreeBSD. ++ optional (!stdenv.isLinux) gnumake; @@ -64,7 +64,7 @@ in stdenv.mkDerivation rec { postInstall = glib.flattenInclude + '' substituteInPlace $dev/bin/freetype-config \ - --replace ${buildPackages.pkgconfig} ${pkgconfig} + --replace ${buildPackages.pkg-config} ${pkg-config} wrapProgram "$dev/bin/freetype-config" \ --set PKG_CONFIG_PATH "$PKG_CONFIG_PATH:$dev/lib/pkgconfig" diff --git a/pkgs/development/libraries/frei0r/default.nix b/pkgs/development/libraries/frei0r/default.nix index 2dc7275559d..c4f99346296 100644 --- a/pkgs/development/libraries/frei0r/default.nix +++ b/pkgs/development/libraries/frei0r/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, cairo, opencv, pkgconfig }: +{ lib, stdenv, fetchurl, autoconf, cairo, opencv, pkg-config }: stdenv.mkDerivation rec { pname = "frei0r-plugins"; @@ -9,16 +9,16 @@ stdenv.mkDerivation rec { sha256 = "0pji26fpd0dqrx1akyhqi6729s394irl73dacnyxk58ijqq4dhp0"; }; - nativeBuildInputs = [ autoconf pkgconfig ]; + nativeBuildInputs = [ autoconf pkg-config ]; buildInputs = [ cairo opencv ]; - postInstall = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' for f in $out/lib/frei0r-1/*.so* ; do ln -s $f "''${f%.*}.dylib" done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://frei0r.dyne.org"; description = "Minimalist, cross-platform, shared video plugins"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/fribidi/default.nix b/pkgs/development/libraries/fribidi/default.nix index f10af240720..27f3b825d10 100644 --- a/pkgs/development/libraries/fribidi/default.nix +++ b/pkgs/development/libraries/fribidi/default.nix @@ -1,9 +1,9 @@ -{ stdenv +{ lib, stdenv , buildPackages , fetchurl , meson , ninja -, pkgconfig +, pkg-config , fixDarwinDylibNames , python3 }: @@ -24,15 +24,15 @@ stdenv.mkDerivation rec { patchShebangs test ''; - nativeBuildInputs = [ meson ninja pkgconfig ] - ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ meson ninja pkg-config ] + ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; depsBuildBuild = [ buildPackages.stdenv.cc ]; doCheck = true; checkInputs = [ python3 ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/fribidi/fribidi"; description = "GNU implementation of the Unicode Bidirectional Algorithm (bidi)"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/fstrcmp/default.nix b/pkgs/development/libraries/fstrcmp/default.nix index 46b579d4abd..c91e8517b07 100644 --- a/pkgs/development/libraries/fstrcmp/default.nix +++ b/pkgs/development/libraries/fstrcmp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, libtool, ghostscript, groff, autoreconfHook }: +{ lib, stdenv, fetchzip, libtool, ghostscript, groff, autoreconfHook }: stdenv.mkDerivation rec { pname = "fstrcmp"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Make fuzzy comparisons of strings and byte arrays"; longDescription = '' The fstrcmp project provides a library that is used to make fuzzy diff --git a/pkgs/development/libraries/fstrm/default.nix b/pkgs/development/libraries/fstrm/default.nix index 7b1adb3e3f0..46a7118cefe 100644 --- a/pkgs/development/libraries/fstrm/default.nix +++ b/pkgs/development/libraries/fstrm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libevent, openssl }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libevent, openssl }: stdenv.mkDerivation rec { pname = "fstrm"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "out" "dev" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libevent openssl ]; preBuild = '' @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Frame Streams implementation in C"; homepage = "https://github.com/farsightsec/fstrm"; license = licenses.asl20; diff --git a/pkgs/development/libraries/ftgl/default.nix b/pkgs/development/libraries/ftgl/default.nix index a0ce9db815b..c3fd6ffb940 100644 --- a/pkgs/development/libraries/ftgl/default.nix +++ b/pkgs/development/libraries/ftgl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, freetype, libGL, libGLU, OpenGL }: +{ lib, stdenv, fetchurl, freetype, libGL, libGLU, OpenGL }: let name = "ftgl-2.1.3-rc5"; @@ -18,14 +18,14 @@ stdenv.mkDerivation { [ libGL libGLU ]) ; - configureFlags = [ "--with-ft-prefix=${stdenv.lib.getDev freetype}" ]; + configureFlags = [ "--with-ft-prefix=${lib.getDev freetype}" ]; enableParallelBuilding = true; meta = { homepage = "https://sourceforge.net/apps/mediawiki/ftgl/"; description = "Font rendering library for OpenGL applications"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; longDescription = '' FTGL is a free cross-platform Open Source C++ library that uses @@ -34,7 +34,7 @@ stdenv.mkDerivation { and extruded polygon rendering modes. ''; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; maintainers = []; }; } diff --git a/pkgs/development/libraries/funambol/default.nix b/pkgs/development/libraries/funambol/default.nix index 064dbb39a2f..377aa45cf5e 100644 --- a/pkgs/development/libraries/funambol/default.nix +++ b/pkgs/development/libraries/funambol/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, curl, autoreconfHook, unzip }: +{ lib, stdenv, fetchurl, zlib, curl, autoreconfHook, unzip }: stdenv.mkDerivation { name = "funambol-client-cpp-9.0.0"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook unzip ]; - meta = with stdenv.lib; { + meta = with lib; { description = "SyncML client sdk by Funambol project"; homepage = "http://www.funambol.com"; license = licenses.agpl3; diff --git a/pkgs/development/libraries/g2o/default.nix b/pkgs/development/libraries/g2o/default.nix index 675d994cf0e..6e32db59de4 100644 --- a/pkgs/development/libraries/g2o/default.nix +++ b/pkgs/development/libraries/g2o/default.nix @@ -23,6 +23,8 @@ mkDerivation rec { # Silence noisy warning CXXFLAGS = "-Wno-deprecated-copy"; + dontWrapQtApps = true; + cmakeFlags = [ # Detection script is broken "-DQGLVIEWER_INCLUDE_DIR=${libqglviewer}/include/QGLViewer" diff --git a/pkgs/development/libraries/gaia/default.nix b/pkgs/development/libraries/gaia/default.nix index 46ed3626d2a..088354aecb2 100644 --- a/pkgs/development/libraries/gaia/default.nix +++ b/pkgs/development/libraries/gaia/default.nix @@ -4,7 +4,7 @@ , libyaml , swig , eigen -, pkgconfig +, pkg-config , python2 , wafHook , makeWrapper @@ -31,15 +31,14 @@ stdenv.mkDerivation rec { }; # Fix installation error when waf tries to put files in /etc/ - prePatch = '' - '' + lib.optionalString cyclopsSupport '' + prePatch = "" + lib.optionalString cyclopsSupport '' substituteInPlace src/wscript \ --replace "/etc/cyclops" "$out/etc/cyclops" \ --replace "/etc/init.d" "$out/etc/init.d" ''; nativeBuildInputs = [ - pkgconfig + pkg-config python2 # For wafHook swig wafHook @@ -72,8 +71,7 @@ stdenv.mkDerivation rec { ++ lib.optionals (cyclopsSupport) [ "--with-cyclops" ] ; - postFixup = '' - '' + postFixup = "" + lib.optionalString pythonSupport '' wrapPythonPrograms '' diff --git a/pkgs/development/libraries/galario/default.nix b/pkgs/development/libraries/galario/default.nix index 84594b8dbeb..888f26f2da7 100644 --- a/pkgs/development/libraries/galario/default.nix +++ b/pkgs/development/libraries/galario/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchzip , fetchFromGitHub , cmake @@ -30,17 +30,17 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ fftw fftwFloat ] - ++ stdenv.lib.optional enablePython pythonPackages.python - ++ stdenv.lib.optional stdenv.isDarwin llvmPackages.openmp + ++ lib.optional enablePython pythonPackages.python + ++ lib.optional stdenv.isDarwin llvmPackages.openmp ; - propagatedBuildInputs = stdenv.lib.optional enablePython [ + propagatedBuildInputs = lib.optional enablePython [ pythonPackages.numpy pythonPackages.cython pythonPackages.pytest ]; - checkInputs = stdenv.lib.optional enablePython [ pythonPackages.scipy pythonPackages.pytestcov ]; + checkInputs = lib.optional enablePython [ pythonPackages.scipy pythonPackages.pytestcov ]; preConfigure = '' mkdir -p build/external/src @@ -55,12 +55,12 @@ stdenv.mkDerivation rec { doCheck = true; - postInstall = stdenv.lib.optionalString (stdenv.isDarwin && enablePython) '' + postInstall = lib.optionalString (stdenv.isDarwin && enablePython) '' install_name_tool -change libgalario.dylib $out/lib/libgalario.dylib $out/lib/python*/site-packages/galario/double/libcommon.so install_name_tool -change libgalario_single.dylib $out/lib/libgalario_single.dylib $out/lib/python*/site-packages/galario/single/libcommon.so ''; - meta = with stdenv.lib; { + meta = with lib; { description = "GPU Accelerated Library for Analysing Radio Interferometer Observations"; longDescription = '' Galario is a library that exploits the computing power of modern diff --git a/pkgs/development/libraries/gamenetworkingsockets/default.nix b/pkgs/development/libraries/gamenetworkingsockets/default.nix index 5f2fdb8f749..0546bfb8e08 100644 --- a/pkgs/development/libraries/gamenetworkingsockets/default.nix +++ b/pkgs/development/libraries/gamenetworkingsockets/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, ninja, go, protobuf, openssl }: +{ lib, stdenv, fetchFromGitHub, cmake, ninja, go, protobuf, openssl }: stdenv.mkDerivation rec { pname = "GameNetworkingSockets"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ protobuf openssl ]; - meta = with stdenv.lib; { + meta = with lib; { # build failure is resolved on master, remove at next release broken = stdenv.isDarwin; description = "GameNetworkingSockets is a basic transport layer for games"; diff --git a/pkgs/development/libraries/gamin/default.nix b/pkgs/development/libraries/gamin/default.nix index 89096c88745..56de42d9dc5 100644 --- a/pkgs/development/libraries/gamin/default.nix +++ b/pkgs/development/libraries/gamin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, glib, autoreconfHook }: +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, glib, autoreconfHook }: let cross = stdenv.hostPlatform != stdenv.buildPlatform; @@ -10,7 +10,7 @@ in stdenv.mkDerivation (rec { sha256 = "18cr51y5qacvs2fc2p1bqv32rs8bzgs6l67zhasyl45yx055y218"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ glib ]; @@ -24,15 +24,15 @@ in stdenv.mkDerivation (rec { patches = [ ./deadlock.patch ] ++ map fetchurl (import ./debian-patches.nix) - ++ stdenv.lib.optional stdenv.cc.isClang ./returnval.patch - ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch { + ++ lib.optional stdenv.cc.isClang ./returnval.patch + ++ lib.optional stdenv.hostPlatform.isMusl (fetchpatch { name = "fix-pthread-mutex.patch"; url = "https://git.alpinelinux.org/aports/plain/main/gamin/fix-pthread-mutex.patch?h=3.4-stable&id=a1a836b089573752c1b0da7d144c0948b04e8ea8"; sha256 = "13igdbqsxb3sz0h417k6ifmq2n4siwqspj6slhc7fdl5wd1fxmdz"; - }) ++ stdenv.lib.optional (cross) ./abstract-socket-namespace.patch ; + }) ++ lib.optional (cross) ./abstract-socket-namespace.patch ; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://people.gnome.org/~veillard/gamin/"; description = "A file and directory monitoring system"; maintainers = with maintainers; [ lovek323 ]; @@ -41,7 +41,7 @@ in stdenv.mkDerivation (rec { }; } -// stdenv.lib.optionalAttrs stdenv.isDarwin { +// lib.optionalAttrs stdenv.isDarwin { preBuild = '' sed -i 's/,--version-script=.*$/\\/' libgamin/Makefile ''; diff --git a/pkgs/development/libraries/ganv/default.nix b/pkgs/development/libraries/ganv/default.nix index cf9b0486304..bf6c030589b 100644 --- a/pkgs/development/libraries/ganv/default.nix +++ b/pkgs/development/libraries/ganv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, graphviz, gtk2, gtkmm2, pkgconfig, python, wafHook }: +{ lib, stdenv, fetchgit, graphviz, gtk2, gtkmm2, pkg-config, python, wafHook }: stdenv.mkDerivation rec { pname = "ganv"; @@ -11,10 +11,10 @@ stdenv.mkDerivation rec { sha256 = "01znnalirbqxpz62fbw2c14c8xn117jc92xv6dhb3hln92k9x37f"; }; - nativeBuildInputs = [ pkgconfig wafHook ]; + nativeBuildInputs = [ pkg-config wafHook ]; buildInputs = [ graphviz gtk2 gtkmm2 python ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An interactive Gtk canvas widget for graph-based interfaces"; homepage = "http://drobilla.net"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/garmintools/default.nix b/pkgs/development/libraries/garmintools/default.nix index 97449d944ec..424e3751f40 100644 --- a/pkgs/development/libraries/garmintools/default.nix +++ b/pkgs/development/libraries/garmintools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libusb-compat-0_1 }: +{ lib, stdenv, fetchurl, libusb-compat-0_1 }: stdenv.mkDerivation { name = "garmintools-0.10"; src = fetchurl { @@ -9,8 +9,8 @@ stdenv.mkDerivation { meta = { description = "Provides the ability to communicate with the Garmin Forerunner 305 via the USB interface"; homepage = "https://code.google.com/archive/p/garmintools/"; # community clone at https://github.com/ianmartin/garmintools - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; maintainers = [ ]; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/gbenchmark/default.nix b/pkgs/development/libraries/gbenchmark/default.nix index ab6a379116d..c1f485e18d9 100644 --- a/pkgs/development/libraries/gbenchmark/default.nix +++ b/pkgs/development/libraries/gbenchmark/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, gtest }: +{ lib, stdenv, fetchFromGitHub, cmake, gtest }: stdenv.mkDerivation rec { pname = "gbenchmark"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A microbenchmark support library"; homepage = "https://github.com/google/benchmark"; license = licenses.asl20; diff --git a/pkgs/development/libraries/gcab/default.nix b/pkgs/development/libraries/gcab/default.nix index 0034f7ed633..0ad9f607dfe 100644 --- a/pkgs/development/libraries/gcab/default.nix +++ b/pkgs/development/libraries/gcab/default.nix @@ -1,11 +1,11 @@ -{ stdenv +{ lib, stdenv , fetchurl , gettext , gobject-introspection , gtk-doc , docbook_xsl , docbook_xml_dtd_43 -, pkgconfig +, pkg-config , meson , ninja , git @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "out" "dev" "devdoc" "installedTests" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "13q43iqld4l50yra45lhvkd376pn6qpk7rkx374zn8y9wsdzm9b7"; }; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meson ninja git - pkgconfig + pkg-config vala gettext gobject-introspection @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dinstalled_tests=true" - "-Dinstalled_test_prefix=${placeholder ''installedTests''}" + "-Dinstalled_test_prefix=${placeholder "installedTests"}" ]; doCheck = true; @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "GObject library to create cabinet files"; homepage = "https://gitlab.gnome.org/GNOME/gcab"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/gcc/libgcc/default.nix b/pkgs/development/libraries/gcc/libgcc/default.nix index f579da5f1d6..ab62fdf3fa2 100644 --- a/pkgs/development/libraries/gcc/libgcc/default.nix +++ b/pkgs/development/libraries/gcc/libgcc/default.nix @@ -1,4 +1,4 @@ -{ stdenvNoLibs, buildPackages +{ lib, stdenvNoLibs, buildPackages , gcc, glibc , libiberty }: @@ -128,7 +128,7 @@ stdenvNoLibs.mkDerivation rec { "--disable-vtable-verify" "--with-system-zlib" - ] ++ stdenvNoLibs.lib.optional (stdenvNoLibs.hostPlatform.libc == "glibc") + ] ++ lib.optional (stdenvNoLibs.hostPlatform.libc == "glibc") "--with-glibc-version=${glibc.version}"; configurePlatforms = [ "build" "host" ]; diff --git a/pkgs/development/libraries/gcc/libstdc++/5.nix b/pkgs/development/libraries/gcc/libstdc++/5.nix index 486a24defd1..b123f799cca 100644 --- a/pkgs/development/libraries/gcc/libstdc++/5.nix +++ b/pkgs/development/libraries/gcc/libstdc++/5.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, flex, bison, file }: +{ lib, stdenv, fetchurl, fetchpatch, flex, bison, file }: stdenv.mkDerivation rec { pname = "libstdc++5"; @@ -107,7 +107,7 @@ stdenv.mkDerivation rec { rm -rf $out/lib/!(libstdc++*) ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://gcc.gnu.org/"; license = licenses.lgpl3Plus; description = "GNU Compiler Collection, version ${version} -- C++ standard library"; diff --git a/pkgs/development/libraries/gcr/default.nix b/pkgs/development/libraries/gcr/default.nix index 212b087fbe2..92c0ec293cb 100644 --- a/pkgs/development/libraries/gcr/default.nix +++ b/pkgs/development/libraries/gcr/default.nix @@ -1,6 +1,6 @@ -{ stdenv +{ lib, stdenv , fetchurl -, pkgconfig +, pkg-config , meson , ninja , gettext @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gcr"; - version = "3.38.0"; + version = "3.38.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1q97pba4bzjndm1vlvicyv8mrl0n589qsw71dp8jrz2payvcfk56"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "F/yvnEqTpl+xxyuCZDuxAsEzRAhGh9WIbqZjE4aNnsk="; }; postPatch = '' @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; nativeBuildInputs = [ - pkgconfig + pkg-config meson python3 ninja @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { platforms = platforms.linux; maintainers = teams.gnome.members; description = "GNOME crypto services (daemon and tools)"; diff --git a/pkgs/development/libraries/gd/default.nix b/pkgs/development/libraries/gd/default.nix index 3b4533890a7..36a93095603 100644 --- a/pkgs/development/libraries/gd/default.nix +++ b/pkgs/development/libraries/gd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch +{ lib, stdenv, fetchurl, fetchpatch , autoconf , automake , pkg-config @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ]; # -pthread gets passed to clang, causing warnings - configureFlags = stdenv.lib.optional stdenv.isDarwin "--enable-werror=no"; + configureFlags = lib.optional stdenv.isDarwin "--enable-werror=no"; nativeBuildInputs = [ autoconf automake pkg-config ]; @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails 2 tests - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://libgd.github.io/"; description = "A dynamic image creation library"; license = licenses.free; # some custom license diff --git a/pkgs/development/libraries/gdal/2.4.0.nix b/pkgs/development/libraries/gdal/2.4.nix index d3505679e4d..5df29b38a26 100644 --- a/pkgs/development/libraries/gdal/2.4.0.nix +++ b/pkgs/development/libraries/gdal/2.4.nix @@ -1,35 +1,26 @@ -{ stdenv, fetchurl, fetchpatch, unzip, libjpeg, libtiff, zlib +{ lib, stdenv, fetchurl, unzip, libjpeg, libtiff, zlib , postgresql, libmysqlclient, libgeotiff, pythonPackages, proj, geos, openssl , libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat , libiconv, libxml2 , netcdfSupport ? true, netcdf, hdf5, curl }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "gdal"; - version = "2.4.0"; + version = "2.4.4"; src = fetchurl { url = "https://download.osgeo.org/gdal/${version}/${pname}-${version}.tar.xz"; - sha256 = "09qgy36z0jc9w05373m4n0vm4j54almdzql6z9p9zr9pdp61syf3"; + sha256 = "1n6w0m2603q9cldlz0wyscp75ci561dipc36jqbf3mjmylybv0x3"; }; - patches = [ - (fetchpatch { - name = "CVE-2019-17545.patch"; - url = "https://github.com/OSGeo/gdal/commit/8cd2d2eb6327cf782a74dae263ffa6f89f46c93d.patch"; - stripLen = 1; - sha256 = "06h88a659jcqf6ps1m91qy78s6s9krbkwnz28f5qh7032vlp6qpw"; - }) - ]; - buildInputs = [ unzip libjpeg libtiff libgeotiff libpng proj openssl sqlite libspatialite poppler hdf4 qhull giflib expat libxml2 proj ] ++ (with pythonPackages; [ python numpy wrapPython ]) - ++ stdenv.lib.optional stdenv.isDarwin libiconv - ++ stdenv.lib.optionals netcdfSupport [ netcdf hdf5 curl ]; + ++ lib.optional stdenv.isDarwin libiconv + ++ lib.optionals netcdfSupport [ netcdf hdf5 curl ]; configureFlags = [ "--with-expat=${expat.dev}" @@ -60,19 +51,6 @@ stdenv.mkDerivation rec { #ifdef swap\ #undef swap\ #endif' ogr/ogrsf_frmts/mysql/ogr_mysql.h - # poppler 0.73.0 support - patch -lp2 <${ - fetchpatch { - url = "https://github.com/OSGeo/gdal/commit/29f4dfbcac2de718043f862166cd639ab578b552.diff"; - sha256 = "1h2rsjjrgwqfgqzppmzv5jgjs1dbbg8pvfmay0j9y0618qp3r734"; - } - } || true - patch -p2 <${ - fetchpatch { - url = "https://github.com/OSGeo/gdal/commit/19967e682738977e11e1d0336e0178882c39cad2.diff"; - sha256 = "12yqd77226i6xvzgqmxiac5ghdinixh8k2crg1r2gnhc0xlc3arj"; - } - } ''; # - Unset CC and CXX as they confuse libtool. @@ -97,8 +75,8 @@ stdenv.mkDerivation rec { meta = { description = "Translator library for raster geospatial data formats"; homepage = "https://www.gdal.org/"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.marcweber ]; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 1295a100232..8c02919126b 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchFromGitHub, fetchpatch, unzip, libjpeg, libtiff, zlib, postgresql +{ lib, stdenv, fetchFromGitHub, fetchpatch, unzip, libjpeg, libtiff, zlib, postgresql , libmysqlclient, libgeotiff, pythonPackages, proj, geos, openssl, libpng , sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat, libiconv, libxml2 , autoreconfHook, netcdfSupport ? true, netcdf, hdf5, curl, pkg-config }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "gdal"; @@ -39,8 +39,8 @@ stdenv.mkDerivation rec { libxml2 postgresql ] ++ (with pythonPackages; [ python numpy wrapPython ]) - ++ stdenv.lib.optional stdenv.isDarwin libiconv - ++ stdenv.lib.optionals netcdfSupport [ netcdf hdf5 curl ]; + ++ lib.optional stdenv.isDarwin libiconv + ++ lib.optionals netcdfSupport [ netcdf hdf5 curl ]; configureFlags = [ "--with-expat=${expat.dev}" @@ -87,8 +87,8 @@ stdenv.mkDerivation rec { meta = { description = "Translator library for raster geospatial data formats"; homepage = "https://www.gdal.org/"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.marcweber ]; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/gdal/gdal-1_11.nix b/pkgs/development/libraries/gdal/gdal-1_11.nix index 3695407b8f2..92d17452c94 100644 --- a/pkgs/development/libraries/gdal/gdal-1_11.nix +++ b/pkgs/development/libraries/gdal/gdal-1_11.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, libjpeg, libtiff, zlib +{ lib, stdenv, fetchurl, unzip, libjpeg, libtiff, zlib , postgresql, mysql57, libgeotiff, python, pythonPackages, proj, geos, openssl , libpng }: @@ -59,8 +59,8 @@ stdenv.mkDerivation rec { meta = { description = "Translator library for raster geospatial data formats"; homepage = "https://www.gdal.org/"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.marcweber ]; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/gdata-sharp/default.nix b/pkgs/development/libraries/gdata-sharp/default.nix index 893fc4f8d27..21cb79ba815 100644 --- a/pkgs/development/libraries/gdata-sharp/default.nix +++ b/pkgs/development/libraries/gdata-sharp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, pkgconfig, mono, dotnetPackages }: +{ lib, stdenv, fetchsvn, pkg-config, mono, dotnetPackages }: let newtonsoft-json = dotnetPackages.NewtonsoftJson; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { sha256 = "0b0rvgg3xsbbg2fdrpz0ywsy9rcahlyfskndaagd3yzm83gi6bhk"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ mono newtonsoft-json ]; sourceRoot = "svn-r1217/clients/cs"; @@ -26,7 +26,7 @@ in stdenv.mkDerivation { makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://code.google.com/archive/p/google-gdata/"; description = "The Google Data APIs"; diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index b04828c92dd..75ce95e0e46 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, vtk_7, darwin +{ lib, stdenv, fetchurl, cmake, vtk_7, darwin , enablePython ? false, python ? null, swig ? null}: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { "-DGDCM_BUILD_SHARED_LIBS=ON" "-DGDCM_USE_VTK=ON" ] - ++ stdenv.lib.optional enablePython [ + ++ lib.optional enablePython [ "-DGDCM_WRAP_PYTHON:BOOL=ON" "-DGDCM_INSTALL_PYTHONMODULE_DIR=${placeholder "out"}/${python.sitePackages}" ]; @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ vtk_7 ] - ++ stdenv.lib.optional stdenv.isDarwin [ + ++ lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.ApplicationServices darwin.apple_sdk.frameworks.Cocoa - ] ++ stdenv.lib.optional enablePython [ swig python ]; + ] ++ lib.optional enablePython [ swig python ]; propagatedBuildInputs = [ ]; - meta = with stdenv.lib; { + meta = with lib; { description = "The grassroots cross-platform DICOM implementation"; longDescription = '' Grassroots DICOM (GDCM) is an implementation of the DICOM standard designed to be open source so that researchers may access clinical data directly. diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index ad92bf13c4c..2d8e60d06a7 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" "devdoc" "installedTests" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "05ggmzwvrxq9w4zcvmrnnd6qplsmb4n95lj4q607c7arzlf6mil3"; }; @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { gobject-introspection makeWrapper glib - ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; propagatedBuildInputs = [ glib @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { postInstall = # meson erroneously installs loaders with .dylib extension on Darwin. # Their @rpath has to be replaced before gdk-pixbuf-query-loaders looks at them. - stdenv.lib.optionalString stdenv.isDarwin '' + lib.optionalString stdenv.isDarwin '' for f in $out/${passthru.moduleDir}/*.dylib; do install_name_tool -change @rpath/libgdk_pixbuf-2.0.0.dylib $out/lib/libgdk_pixbuf-2.0.0.dylib $f mv $f ''${f%.dylib}.so @@ -88,13 +88,13 @@ stdenv.mkDerivation rec { + '' moveToOutput "bin" "$dev" moveToOutput "bin/gdk-pixbuf-thumbnailer" "$out" - '' + stdenv.lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + '' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' # We need to install 'loaders.cache' in lib/gdk-pixbuf-2.0/2.10.0/ $dev/bin/gdk-pixbuf-query-loaders --update-cache ''; # The fixDarwinDylibNames hook doesn't patch binaries. - preFixup = stdenv.lib.optionalString stdenv.isDarwin '' + preFixup = lib.optionalString stdenv.isDarwin '' for f in $out/bin/* $dev/bin/*; do install_name_tool -change @rpath/libgdk_pixbuf-2.0.0.dylib $out/lib/libgdk_pixbuf-2.0.0.dylib $f done @@ -124,7 +124,7 @@ stdenv.mkDerivation rec { moduleDir = "lib/gdk-pixbuf-2.0/2.10.0/loaders"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A library for image loading and manipulation"; homepage = "https://gitlab.gnome.org/GNOME/gdk-pixbuf"; maintainers = [ maintainers.eelco ] ++ teams.gnome.members; diff --git a/pkgs/development/libraries/gdk-pixbuf/xlib.nix b/pkgs/development/libraries/gdk-pixbuf/xlib.nix index edc5ce52563..bc4c14beb45 100644 --- a/pkgs/development/libraries/gdk-pixbuf/xlib.nix +++ b/pkgs/development/libraries/gdk-pixbuf/xlib.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitLab , meson , ninja @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { "-Dgtk_doc=true" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Deprecated API for integrating GdkPixbuf with Xlib data types"; homepage = "https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib"; maintainers = teams.gnome.members; diff --git a/pkgs/development/libraries/gdl/default.nix b/pkgs/development/libraries/gdl/default.nix index 338d0b6b91b..f924571deae 100644 --- a/pkgs/development/libraries/gdl/default.nix +++ b/pkgs/development/libraries/gdl/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, gtk3, gnome3, intltool }: +{ lib, stdenv, fetchurl, pkg-config, libxml2, gtk3, gnome3, intltool }: stdenv.mkDerivation rec { pname = "gdl"; version = "3.34.0"; src = fetchurl { - url = "mirror://gnome/sources/gdl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gdl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "00ldva6wg6s4wlxmisiqzyz8ihsprra7sninx2rlqk6frpq312w5"; }; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkg-config intltool ]; buildInputs = [ libxml2 gtk3 ]; passthru = { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Gnome docking library"; homepage = "https://developer.gnome.org/gdl/"; maintainers = teams.gnome.members; diff --git a/pkgs/development/libraries/gdome2/default.nix b/pkgs/development/libraries/gdome2/default.nix index e38cb7535b0..a7dd1f98013 100644 --- a/pkgs/development/libraries/gdome2/default.nix +++ b/pkgs/development/libraries/gdome2/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, glib, libxml2, gtk-doc}: +{lib, stdenv, fetchurl, pkg-config, glib, libxml2, gtk-doc}: let pname = "gdome2"; @@ -15,12 +15,12 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib libxml2 gtk-doc ]; propagatedBuildInputs = [glib libxml2]; patches = [ ./xml-document.patch ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://gdome2.cs.unibo.it/"; description = "DOM C library developed for the Gnome project"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/gecode/3.nix b/pkgs/development/libraries/gecode/3.nix index 545bdd12982..5c660a99ef8 100644 --- a/pkgs/development/libraries/gecode/3.nix +++ b/pkgs/development/libraries/gecode/3.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bash, perl }: +{ lib, stdenv, fetchurl, bash, perl }: stdenv.mkDerivation rec { pname = "gecode"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { preConfigure = "patchShebangs configure"; - meta = with stdenv.lib; { + meta = with lib; { license = licenses.mit; homepage = "https://www.gecode.org"; description = "Toolkit for developing constraint-based systems"; diff --git a/pkgs/development/libraries/gecode/default.nix b/pkgs/development/libraries/gecode/default.nix index 9d37199bff4..fc9835d85db 100644 --- a/pkgs/development/libraries/gecode/default.nix +++ b/pkgs/development/libraries/gecode/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, bison, flex, perl, gmp, mpfr, enableGist ? true, qtbase }: +{ lib, stdenv, fetchFromGitHub, bison, flex, perl, gmp, mpfr, enableGist ? true, qtbase }: stdenv.mkDerivation rec { pname = "gecode"; @@ -12,11 +12,12 @@ stdenv.mkDerivation rec { }; enableParallelBuilding = true; + dontWrapQtApps = true; nativeBuildInputs = [ bison flex ]; buildInputs = [ perl gmp mpfr ] - ++ stdenv.lib.optional enableGist qtbase; + ++ lib.optional enableGist qtbase; - meta = with stdenv.lib; { + meta = with lib; { license = licenses.mit; homepage = "https://www.gecode.org"; description = "Toolkit for developing constraint-based systems"; diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix index c25f9145ea5..af3c9d84ac7 100644 --- a/pkgs/development/libraries/gegl/4.0.nix +++ b/pkgs/development/libraries/gegl/4.0.nix @@ -1,7 +1,7 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch -, pkgconfig +, pkg-config , vala , gobject-introspection , gtk-doc @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { outputBin = "dev"; src = fetchurl { - url = "https://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://download.gimp.org/pub/gegl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "sha256-DzceLtK5IWL+/T3edD5kjKCKahsrBQBIZ/vdx+IR5CQ="; }; @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config gettext meson ninja @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { luajit openexr suitesparse - ] ++ stdenv.lib.optional stdenv.isDarwin OpenCL; + ] ++ lib.optional stdenv.isDarwin OpenCL; # for gegl-4.0.pc propagatedBuildInputs = [ @@ -118,7 +118,7 @@ stdenv.mkDerivation rec { # tests fail to connect to the com.apple.fonts daemon in sandboxed mode doCheck = !stdenv.isDarwin; - meta = with stdenv.lib; { + meta = with lib; { description = "Graph-based image processing framework"; homepage = "https://www.gegl.org"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix index a99ec05d771..bd67f3e6b7c 100644 --- a/pkgs/development/libraries/gegl/default.nix +++ b/pkgs/development/libraries/gegl/default.nix @@ -1,6 +1,6 @@ -{ stdenv +{ lib, stdenv , fetchurl -, pkgconfig +, pkg-config , babl , libpng , cairo @@ -33,13 +33,13 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-docs" ]; buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk2 bzip2 intltool libintl ] - ++ stdenv.lib.optional stdenv.isDarwin OpenGL; + ++ lib.optional stdenv.isDarwin OpenGL; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; doCheck = false; # fails 3 out of 19 tests - meta = with stdenv.lib; { + meta = with lib; { description = "Graph-based image processing framework"; homepage = "https://www.gegl.org"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/libraries/geis/default.nix b/pkgs/development/libraries/geis/default.nix index fd3924fec3e..1c1d4cfe507 100644 --- a/pkgs/development/libraries/geis/default.nix +++ b/pkgs/development/libraries/geis/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl -, pkgconfig +{ lib, stdenv, fetchurl +, pkg-config , python3Packages , wrapGAppsHook , atk @@ -18,7 +18,7 @@ , xorgserver }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "geis"; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { pythonPath = with python3Packages; [ pygobject3 ]; - nativeBuildInputs = [ pkgconfig wrapGAppsHook python3Packages.wrapPython]; + nativeBuildInputs = [ pkg-config wrapGAppsHook python3Packages.wrapPython]; buildInputs = [ atk dbus evemu frame gdk-pixbuf gobject-introspection grail gtk3 libX11 libXext libXi libXtst pango python3Packages.python xorgserver ]; diff --git a/pkgs/development/libraries/genann/default.nix b/pkgs/development/libraries/genann/default.nix index 6529d4f363d..f1d7373183a 100644 --- a/pkgs/development/libraries/genann/default.nix +++ b/pkgs/development/libraries/genann/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "genann"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { cp ./genann.{h,c} $out/include ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/codeplea/genann"; description = "Simple neural network library in ANSI C"; license = licenses.zlib; diff --git a/pkgs/development/libraries/gensio/default.nix b/pkgs/development/libraries/gensio/default.nix index a568078f991..3e4b68ec79c 100644 --- a/pkgs/development/libraries/gensio/default.nix +++ b/pkgs/development/libraries/gensio/default.nix @@ -1,6 +1,5 @@ { autoreconfHook , fetchFromGitHub -, fetchpatch , lib , nix-update-script , pkg-config @@ -9,23 +8,15 @@ stdenv.mkDerivation rec { pname = "gensio"; - version = "2.2.1"; + version = "2.2.3"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - sha256 = "083khzvyvcgi9j99hbaswglivm9s6dly6spjvisvyacavaybgwgb"; + sha256 = "sha256-jWKm64RvVkeA/Zvy8VIAXMykuqv2FEzsduN2zcPm4ME="; }; - patches = [ - # Fix compilation without openipmi, can be dropped for the next release. - (fetchpatch { - url = "https://github.com/cminyard/gensio/commit/12f6203e6f7aa42172177d7b0870777b605af8d9.patch"; - sha256 = "19dr4iacccc4il3asdxkag6cj2yc4bxd8p451syfxdm6289rwxic"; - }) - ]; - passthru = { updateScript = nix-update-script { attrPath = pname; diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix index 74d778c5c55..711f1a444b3 100644 --- a/pkgs/development/libraries/geoclue/default.nix +++ b/pkgs/development/libraries/geoclue/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchFromGitLab, intltool, meson, ninja, pkgconfig, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, json-glib, libsoup, libnotify, gdk-pixbuf +{ lib, stdenv, fetchFromGitLab, intltool, meson, ninja, pkg-config, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, json-glib, libsoup, libnotify, gdk-pixbuf , modemmanager, avahi, glib-networking, python3, wrapGAppsHook, gobject-introspection, vala , withDemoAgent ? false }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "geoclue"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; nativeBuildInputs = [ - pkgconfig intltool meson ninja wrapGAppsHook python3 vala gobject-introspection + pkg-config intltool meson ninja wrapGAppsHook python3 vala gobject-introspection # devdoc gtk-doc docbook_xsl docbook_xml_dtd_412 ]; @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { patchShebangs demo/install-file.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Geolocation framework and some data providers"; homepage = "https://gitlab.freedesktop.org/geoclue/geoclue/wikis/home"; maintainers = with maintainers; [ raskin ]; diff --git a/pkgs/development/libraries/geocode-glib/default.nix b/pkgs/development/libraries/geocode-glib/default.nix index ec9bf2e5cb9..f401c25aa39 100644 --- a/pkgs/development/libraries/geocode-glib/default.nix +++ b/pkgs/development/libraries/geocode-glib/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, meson, ninja, pkgconfig, gettext, gtk-doc, docbook_xsl, gobject-introspection, gnome3, libsoup, json-glib, glib }: +{ fetchurl, lib, stdenv, meson, ninja, pkg-config, gettext, gtk-doc, docbook_xsl, gobject-introspection, gnome3, libsoup, json-glib, glib }: stdenv.mkDerivation rec { pname = "geocode-glib"; @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" "installedTests" ]; src = fetchurl { - url = "mirror://gnome/sources/geocode-glib/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/geocode-glib/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1l8g0f13xgkrk335afr9w8k46mziwb2jnyhl07jccl5yl37q9zh1"; }; - nativeBuildInputs = [ meson ninja pkgconfig gettext gtk-doc docbook_xsl gobject-introspection ]; + nativeBuildInputs = [ meson ninja pkg-config gettext gtk-doc docbook_xsl gobject-introspection ]; buildInputs = [ glib libsoup json-glib ]; patches = [ @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A convenience library for the geocoding and reverse geocoding using Nominatim service"; license = licenses.lgpl2Plus; maintainers = teams.gnome.members; diff --git a/pkgs/development/libraries/geoip/default.nix b/pkgs/development/libraries/geoip/default.nix index d55983952b8..8747433047c 100644 --- a/pkgs/development/libraries/geoip/default.nix +++ b/pkgs/development/libraries/geoip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook +{ lib, stdenv, fetchFromGitHub, autoreconfHook , drvName ? "geoip" # in geoipDatabase, you can insert a package defining @@ -7,7 +7,7 @@ }: let - dataDir = if stdenv.lib.isDerivation geoipDatabase + dataDir = if lib.isDerivation geoipDatabase then "${toString geoipDatabase}/share/GeoIP" else geoipDatabase; in @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; # Cross compilation shenanigans - configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + configureFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "ac_cv_func_malloc_0_nonnull=yes" "ac_cv_func_realloc_0_nonnull=yes" ]; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { find . -name Makefile.in -exec sed -i -r 's#^pkgdatadir\s*=.+$#pkgdatadir = ${dataDir}#' {} \; ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An API for GeoIP/Geolocation databases"; maintainers = with maintainers; [ thoughtpolice raskin ]; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index 60fc4067c0c..f96707b549f 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, python }: +{ lib, stdenv, fetchurl, python }: stdenv.mkDerivation rec { - name = "geos-3.8.1"; + name = "geos-3.9.0"; src = fetchurl { url = "https://download.osgeo.org/geos/${name}.tar.bz2"; - sha256 = "1xqpmr10xi0n9sj47fbwc89qb0yr9imh4ybk0jsxpffy111syn22"; + sha256 = "sha256-vYCCzxL0XydjAZPHi9taPLqEe4HnKyAmg1bCpPwGUmk="; }; enableParallelBuilding = true; @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { buildInputs = [ python ]; # https://trac.osgeo.org/geos/ticket/993 - configureFlags = stdenv.lib.optional stdenv.isAarch32 "--disable-inline"; + configureFlags = lib.optional stdenv.isAarch32 "--disable-inline"; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ port of the Java Topology Suite (JTS)"; homepage = "https://trac.osgeo.org/geos"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/getdata/default.nix b/pkgs/development/libraries/getdata/default.nix index 28bbe61d53d..de76924844f 100644 --- a/pkgs/development/libraries/getdata/default.nix +++ b/pkgs/development/libraries/getdata/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libtool }: +{ lib, stdenv, fetchurl, libtool }: stdenv.mkDerivation rec { pname = "getdata"; version = "0.10.0"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { buildInputs = [ libtool ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Reference implementation of the Dirfile Standards"; license = licenses.lgpl21Plus; platforms = platforms.all; diff --git a/pkgs/development/libraries/getdns/default.nix b/pkgs/development/libraries/getdns/default.nix index c0268c161ae..edf0ac27ea9 100644 --- a/pkgs/development/libraries/getdns/default.nix +++ b/pkgs/development/libraries/getdns/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unbound, libidn2, openssl, doxygen, cmake }: +{ lib, stdenv, fetchurl, unbound, libidn2, openssl, doxygen, cmake }: stdenv.mkDerivation rec { pname = "getdns"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ unbound libidn2 openssl doxygen ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A modern asynchronous DNS API"; longDescription = '' getdns is an implementation of a modern asynchronous DNS API; the diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index 0dcc42dc526..3f8215d19fc 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-csharp" "--with-xz" - ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # On cross building, gettext supposes that the wchar.h from libc # does not fulfill gettext needs, so it tries to work with its # own wchar.h file, which does not cope well with the system's @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { xz.bin ]; # HACK, see #10874 (and 14664) - buildInputs = stdenv.lib.optional (!stdenv.isLinux && !stdenv.hostPlatform.isCygwin) libiconv; + buildInputs = lib.optional (!stdenv.isLinux && !stdenv.hostPlatform.isCygwin) libiconv; setupHooks = [ ../../../build-support/setup-hooks/role.bash @@ -89,6 +89,6 @@ stdenv.mkDerivation rec { }; } -// stdenv.lib.optionalAttrs stdenv.isDarwin { +// lib.optionalAttrs stdenv.isDarwin { makeFlags = [ "CFLAGS=-D_FORTIFY_SOURCE=0" ]; } diff --git a/pkgs/development/libraries/gexiv2/default.nix b/pkgs/development/libraries/gexiv2/default.nix index 9b72ca3524c..220b68fa18b 100644 --- a/pkgs/development/libraries/gexiv2/default.nix +++ b/pkgs/development/libraries/gexiv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, exiv2, glib, gnome3, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }: +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, exiv2, glib, gnome3, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }: stdenv.mkDerivation rec { pname = "gexiv2"; @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0xxxq8xdkgkn146my307jgws4qgxx477h0ybg1mqza1ycmczvsla"; }; - nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_43 ]; + nativeBuildInputs = [ meson ninja pkg-config gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_43 ]; buildInputs = [ glib ]; propagatedBuildInputs = [ exiv2 ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Projects/gexiv2"; description = "GObject wrapper around the Exiv2 photo metadata library"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/gf2x/default.nix b/pkgs/development/libraries/gf2x/default.nix index 14ea3021914..3440697989e 100644 --- a/pkgs/development/libraries/gf2x/default.nix +++ b/pkgs/development/libraries/gf2x/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = ''Routines for fast arithmetic in GF(2)[x]''; + description = "Routines for fast arithmetic in GF(2)[x]"; homepage = "http://gf2x.gforge.inria.fr"; license = licenses.gpl2Plus; maintainers = teams.sage.members; diff --git a/pkgs/development/libraries/gfbgraph/default.nix b/pkgs/development/libraries/gfbgraph/default.nix index 4718e6ac015..e3550b82a96 100644 --- a/pkgs/development/libraries/gfbgraph/default.nix +++ b/pkgs/development/libraries/gfbgraph/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, librest, gnome-online-accounts +{ lib, stdenv, fetchurl, pkg-config, glib, librest, gnome-online-accounts , gnome3, libsoup, json-glib, gobject-introspection , gtk-doc, pkgs, docbook-xsl-nons, autoconf, automake, libtool }: @@ -9,12 +9,12 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0yck7dwvjk16a52nafjpi0a39rxwmg0w833brj45acz76lgkjrb0"; }; nativeBuildInputs = [ - pkgconfig gobject-introspection gtk-doc + pkg-config gobject-introspection gtk-doc docbook-xsl-nons autoconf automake libtool ]; buildInputs = [ glib gnome-online-accounts ]; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Projects/GFBGraph"; description = "GLib/GObject wrapper for the Facebook Graph API"; maintainers = teams.gnome.members; diff --git a/pkgs/development/libraries/gflags/default.nix b/pkgs/development/libraries/gflags/default.nix index 51c13f97433..a690d8f2e15 100644 --- a/pkgs/development/libraries/gflags/default.nix +++ b/pkgs/development/libraries/gflags/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake +{ lib, stdenv, fetchFromGitHub, cmake , enableShared ? !stdenv.hostPlatform.isStatic }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A C++ library that implements commandline flags processing"; longDescription = '' The gflags package contains a C++ library that implements commandline flags processing. diff --git a/pkgs/development/libraries/ggz_base_libs/default.nix b/pkgs/development/libraries/ggz_base_libs/default.nix index 6003c5ea33e..025423ecd8a 100644 --- a/pkgs/development/libraries/ggz_base_libs/default.nix +++ b/pkgs/development/libraries/ggz_base_libs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, openssl, expat, libgcrypt }: +{ lib, stdenv, fetchurl, intltool, openssl, expat, libgcrypt }: stdenv.mkDerivation rec { version = "0.99.5"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { "--with-tls" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "GGZ Gaming zone libraries"; maintainers = with maintainers; [ diff --git a/pkgs/development/libraries/giblib/default.nix b/pkgs/development/libraries/giblib/default.nix index 2cb7a9dfe54..e66f7bfe2a8 100644 --- a/pkgs/development/libraries/giblib/default.nix +++ b/pkgs/development/libraries/giblib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xlibsWrapper, imlib2 }: +{ lib, stdenv, fetchurl, xlibsWrapper, imlib2 }: stdenv.mkDerivation rec { name = "giblib-1.2.4"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://linuxbrit.co.uk/giblib/"; description = "wrapper library for imlib2, and other stuff"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.mit; + platforms = lib.platforms.unix; + license = lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/giflib/4.1.nix b/pkgs/development/libraries/giflib/4.1.nix index 954e508152c..c0afe067c49 100644 --- a/pkgs/development/libraries/giflib/4.1.nix +++ b/pkgs/development/libraries/giflib/4.1.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation { name = "giflib-4.1.6"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A library for reading and writing gif images"; branch = "4.1"; license = licenses.mit; diff --git a/pkgs/development/libraries/giflib/default.nix b/pkgs/development/libraries/giflib/default.nix index e2ff96d366a..9eaf7b933d4 100644 --- a/pkgs/development/libraries/giflib/default.nix +++ b/pkgs/development/libraries/giflib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, xmlto, docbook_xml_dtd_412, docbook_xsl, libxml2, fixDarwinDylibNames }: +{ lib, stdenv, fetchurl, fetchpatch, xmlto, docbook_xml_dtd_412, docbook_xsl, libxml2, fixDarwinDylibNames }: stdenv.mkDerivation rec { name = "giflib-5.2.1"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { sha256 = "1gbrg03z1b6rlrvjyc6d41bc8j1bsr7rm8206gb1apscyii5bnii"; }; - patches = stdenv.lib.optional stdenv.hostPlatform.isDarwin + patches = lib.optional stdenv.hostPlatform.isDarwin (fetchpatch { # https://sourceforge.net/p/giflib/bugs/133/ name = "darwin-soname.patch"; @@ -21,15 +21,15 @@ stdenv.mkDerivation rec { --replace 'PREFIX = /usr/local' 'PREFIX = ${builtins.placeholder "out"}' ''; - nativeBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; + nativeBuildInputs = lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; buildInputs = [ xmlto docbook_xml_dtd_412 docbook_xsl libxml2 ]; meta = { description = "A library for reading and writing gif images"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ ]; + platforms = lib.platforms.unix; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; branch = "5.2"; }; } diff --git a/pkgs/development/libraries/giflib/libungif.nix b/pkgs/development/libraries/giflib/libungif.nix index 30cfa0db86a..d8c32d14fca 100644 --- a/pkgs/development/libraries/giflib/libungif.nix +++ b/pkgs/development/libraries/giflib/libungif.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation { name = "libungif-4.1.4"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library and utilities for processing GIFs"; platforms = platforms.unix; license = licenses.mit; diff --git a/pkgs/development/libraries/gio-sharp/default.nix b/pkgs/development/libraries/gio-sharp/default.nix index a19febbfd66..91fbb86bd66 100644 --- a/pkgs/development/libraries/gio-sharp/default.nix +++ b/pkgs/development/libraries/gio-sharp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, which, pkgconfig, mono, glib, gtk-sharp-2_0 }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, which, pkg-config, mono, glib, gtk-sharp-2_0 }: stdenv.mkDerivation rec { pname = "gio-sharp"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "13pc529pjabj7lq23dbndc26ssmg5wkhc7lfvwapm87j711m0zig"; }; - nativeBuildInputs = [ pkgconfig autoconf automake which ]; + nativeBuildInputs = [ pkg-config autoconf automake which ]; buildInputs = [ mono glib gtk-sharp-2_0 ]; dontStrip = true; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ./autogen-2.22.sh ''; - meta = with stdenv.lib; { + meta = with lib; { description = "GIO API bindings"; homepage = "https://github.com/mono/gio-sharp"; license = licenses.mit; diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix index edbb3d82241..a118a611785 100644 --- a/pkgs/development/libraries/git2/default.nix +++ b/pkgs/development/libraries/git2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkg-config, python3 +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, python3 , zlib, libssh2, openssl, pcre, http-parser , libiconv, Security }: @@ -23,16 +23,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python3 pkg-config ]; buildInputs = [ zlib libssh2 openssl pcre http-parser ] - ++ stdenv.lib.optional stdenv.isDarwin Security; + ++ lib.optional stdenv.isDarwin Security; - propagatedBuildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv; + propagatedBuildInputs = lib.optional (!stdenv.isLinux) libiconv; doCheck = false; # hangs. or very expensive? meta = { description = "The Git linkable library"; homepage = "https://libgit2.github.com/"; - license = stdenv.lib.licenses.gpl2; - platforms = with stdenv.lib.platforms; all; + license = lib.licenses.gpl2; + platforms = with lib.platforms; all; }; } diff --git a/pkgs/development/libraries/givaro/3.7.nix b/pkgs/development/libraries/givaro/3.7.nix index debddc6723f..dfd6b6b476b 100644 --- a/pkgs/development/libraries/givaro/3.7.nix +++ b/pkgs/development/libraries/givaro/3.7.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, automake, autoconf, libtool, autoreconfHook, gmpxx}: +{lib, stdenv, fetchurl, automake, autoconf, libtool, autoreconfHook, gmpxx}: stdenv.mkDerivation rec { pname = "givaro"; version = "3.7.2"; @@ -10,9 +10,9 @@ stdenv.mkDerivation rec { buildInputs = [autoconf automake libtool gmpxx]; meta = { inherit version; - description = ''A C++ library for arithmetic and algebraic computations''; - license = stdenv.lib.licenses.cecill-b; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + description = "A C++ library for arithmetic and algebraic computations"; + license = lib.licenses.cecill-b; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/givaro/3.nix b/pkgs/development/libraries/givaro/3.nix index efed0926bb3..9d216b9d8e5 100644 --- a/pkgs/development/libraries/givaro/3.nix +++ b/pkgs/development/libraries/givaro/3.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, automake, autoconf, libtool, autoreconfHook, gmpxx}: +{lib, stdenv, fetchurl, automake, autoconf, libtool, autoreconfHook, gmpxx}: stdenv.mkDerivation rec { pname = "givaro"; version = "3.8.0"; @@ -10,9 +10,9 @@ stdenv.mkDerivation rec { buildInputs = [autoconf automake libtool gmpxx]; meta = { inherit version; - description = ''A C++ library for arithmetic and algebraic computations''; - license = stdenv.lib.licenses.cecill-b; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + description = "A C++ library for arithmetic and algebraic computations"; + license = lib.licenses.cecill-b; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/givaro/default.nix b/pkgs/development/libraries/givaro/default.nix index 78b6b088270..f6d6ddab4d0 100644 --- a/pkgs/development/libraries/givaro/default.nix +++ b/pkgs/development/libraries/givaro/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, automake, autoconf, libtool, autoreconfHook, gmpxx }: +{ lib, stdenv, fetchFromGitHub, automake, autoconf, libtool, autoreconfHook, gmpxx }: stdenv.mkDerivation rec { pname = "givaro"; version = "4.1.1"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-optimization" - ] ++ stdenv.lib.optionals stdenv.isx86_64 [ + ] ++ lib.optionals stdenv.isx86_64 [ # disable SIMD instructions (which are enabled *when available* by default) "--${if stdenv.hostPlatform.sse3Support then "enable" else "disable"}-sse3" "--${if stdenv.hostPlatform.ssse3Support then "enable" else "disable"}-ssse3" @@ -37,9 +37,9 @@ stdenv.mkDerivation rec { meta = { inherit version; - description = ''A C++ library for arithmetic and algebraic computations''; - license = stdenv.lib.licenses.cecill-b; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; + description = "A C++ library for arithmetic and algebraic computations"; + license = lib.licenses.cecill-b; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix index 9437d76335d..52b53a15b41 100644 --- a/pkgs/development/libraries/gjs/default.nix +++ b/pkgs/development/libraries/gjs/default.nix @@ -1,9 +1,9 @@ { fetchurl , fetchpatch -, stdenv +, lib, stdenv , meson , ninja -, pkgconfig +, pkg-config , gnome3 , gtk3 , atk @@ -29,11 +29,11 @@ let ]; in stdenv.mkDerivation rec { pname = "gjs"; - version = "1.66.1"; + version = "1.66.2"; src = fetchurl { - url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0k1ld2bc4c3zbyjpfgx15v5n02iywdvm106rys5jqr7zbr2l0hld"; + url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "vX9fixcSd8wLue4XVLAkC2Lwana4sYyWjPRxs0qzTlk="; }; outputs = [ "out" "dev" "installedTests" ]; @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config makeWrapper which # for locale detection libxml2 # for xml-stripblanks @@ -105,7 +105,7 @@ in stdenv.mkDerivation rec { postFixup = '' wrapProgram "$installedTests/libexec/installed-tests/gjs/minijasmine" \ --prefix XDG_DATA_DIRS : "$installedTestsSchemaDatadir" \ - --prefix GI_TYPELIB_PATH : "${stdenv.lib.makeSearchPath "lib/girepository-1.0" testDeps}" + --prefix GI_TYPELIB_PATH : "${lib.makeSearchPath "lib/girepository-1.0" testDeps}" ''; checkPhase = '' @@ -127,7 +127,7 @@ in stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "JavaScript bindings for GNOME"; homepage = "https://gitlab.gnome.org/GNOME/gjs/blob/master/doc/Home.md"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/gl2ps/default.nix b/pkgs/development/libraries/gl2ps/default.nix index 172531f9dc7..0203e2fde93 100644 --- a/pkgs/development/libraries/gl2ps/default.nix +++ b/pkgs/development/libraries/gl2ps/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , cmake , zlib @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { freeglut ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://geuz.org/gl2ps"; description = "An OpenGL to PostScript printing library"; platforms = platforms.all; diff --git a/pkgs/development/libraries/glbinding/default.nix b/pkgs/development/libraries/glbinding/default.nix index 9b67b9695cc..1b36baa24e4 100644 --- a/pkgs/development/libraries/glbinding/default.nix +++ b/pkgs/development/libraries/glbinding/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libGLU, xlibsWrapper }: +{ lib, stdenv, fetchFromGitHub, cmake, libGLU, xlibsWrapper }: stdenv.mkDerivation rec { pname = "glbinding"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libGLU xlibsWrapper ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/cginternals/glbinding/"; description = "A C++ binding for the OpenGL API, generated using the gl.xml specification"; license = licenses.mit; diff --git a/pkgs/development/libraries/gle/default.nix b/pkgs/development/libraries/gle/default.nix index d656473ba80..b7a4f7f2fef 100644 --- a/pkgs/development/libraries/gle/default.nix +++ b/pkgs/development/libraries/gle/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, freeglut, libX11, libXt, libXmu, libXi, libXext, libGL, libGLU}: +{lib, stdenv, fetchurl, freeglut, libX11, libXt, libXmu, libXi, libXext, libGL, libGLU}: stdenv.mkDerivation { name = "gle-3.1.0"; buildInputs = [libGLU libGL freeglut libX11 libXt libXmu libXi libXext]; @@ -10,9 +10,9 @@ stdenv.mkDerivation { sha256 = "09zs1di4dsssl9k322nzildvf41jwipbzhik9p43yb1bcfsp92nw"; }; meta = { - description = ''Tubing and extrusion library''; - license = stdenv.lib.licenses.gpl2 ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + description = "Tubing and extrusion library"; + license = lib.licenses.gpl2 ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/glew/1.10.nix b/pkgs/development/libraries/glew/1.10.nix index 139b93c039e..29376cb2567 100644 --- a/pkgs/development/libraries/glew/1.10.nix +++ b/pkgs/development/libraries/glew/1.10.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, libGLU, xlibsWrapper, libXmu, libXi +{ lib, stdenv, fetchurl, libGLU, xlibsWrapper, libXmu, libXi , AGL, OpenGL }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { name = "glew-1.10.0"; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { "SYSTEM=${if stdenv.hostPlatform.isMinGW then "mingw" else stdenv.hostPlatform.parsed.kernel.name}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An OpenGL extension loading library for C(++)"; homepage = "http://glew.sourceforge.net/"; license = licenses.free; # different files under different licenses diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix index 3b067e6d0f3..660276530aa 100644 --- a/pkgs/development/libraries/glew/default.nix +++ b/pkgs/development/libraries/glew/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, libGLU, xlibsWrapper, libXmu, libXi +{ lib, stdenv, fetchurl, libGLU, xlibsWrapper, libXmu, libXi , OpenGL }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { name = "glew-2.2.0"; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "An OpenGL extension loading library for C(++)"; homepage = "http://glew.sourceforge.net/"; license = licenses.free; # different files under different licenses diff --git a/pkgs/development/libraries/glfw/2.x.nix b/pkgs/development/libraries/glfw/2.x.nix index e749ca733da..d05fa6e5f77 100644 --- a/pkgs/development/libraries/glfw/2.x.nix +++ b/pkgs/development/libraries/glfw/2.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libGLU, libGL, libX11, libXext }: +{ lib, stdenv, fetchurl, libGLU, libGL, libX11, libXext }: stdenv.mkDerivation rec { name = "glfw-2.7.9"; @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { make x11-dist-install PREFIX=$out mv $out/lib/libglfw.so $out/lib/libglfw.so.2 ln -s libglfw.so.2 $out/lib/libglfw.so - ''; - - meta = with stdenv.lib; { + ''; + + meta = with lib; { description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time"; homepage = "http://glfw.sourceforge.net/"; license = licenses.zlib; - maintainers = [ stdenv.lib.maintainers.marcweber ]; + maintainers = [ lib.maintainers.marcweber ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index 62c1c596d2c..8698b71567e 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { substituteInPlace src/glx_context.c --replace "libGL.so.1" "${lib.getLib libGL}/lib/libGL.so.1" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time"; homepage = "https://www.glfw.org/"; license = licenses.zlib; diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index fc85b50e07f..58589734166 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -1,10 +1,10 @@ -{ stdenv +{ lib, stdenv , fetchurl , substituteAll , meson , ninja , nixosTests -, pkgconfig +, pkg-config , glib , gettext , makeWrapper @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "installedTests" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "16807qwflbghp0c66jdx2gnaffvdp4bla35ppzp9dlgx6wjbxmy5"; }; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gettext makeWrapper python3 # for install_script @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Network-related giomodules for glib"; homepage = "https://gitlab.gnome.org/GNOME/glib-networking"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/glib-testing/default.nix b/pkgs/development/libraries/glib-testing/default.nix index 085dfc7344f..bdbced24a10 100644 --- a/pkgs/development/libraries/glib-testing/default.nix +++ b/pkgs/development/libraries/glib-testing/default.nix @@ -1,8 +1,8 @@ -{ stdenv +{ lib, stdenv , fetchFromGitLab , meson , ninja -, pkgconfig +, pkg-config , gtk-doc , docbook-xsl-nons , docbook_xml_dtd_43 @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gtk-doc docbook-xsl-nons docbook_xml_dtd_43 @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Test library providing test harnesses and mock classes complementing the classes provided by GLib"; homepage = "https://gitlab.gnome.org/pwithnall/libglib-testing"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 57f05d410fb..0e8ed605a2d 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, fetchurl, gettext, meson, ninja, pkgconfig, perl, python3 +{ config, lib, stdenv, fetchurl, gettext, meson, ninja, pkg-config, perl, python3 , libiconv, zlib, libffi, pcre, libelf, gnome3, libselinux, bash, gnum4, gtk-doc, docbook_xsl, docbook_xml_dtd_45 # use util-linuxMinimal to avoid circular dependency (util-linux, systemd, glib) , util-linuxMinimal ? null @@ -11,7 +11,7 @@ , darwin, fetchpatch }: -with stdenv.lib; +with lib; assert stdenv.isLinux -> util-linuxMinimal != null; @@ -29,7 +29,7 @@ assert stdenv.isLinux -> util-linuxMinimal != null; * Support org.freedesktop.Application, including D-Bus activation from desktop files */ let - # Some packages don't get "Cflags" from pkgconfig correctly + # Some packages don't get "Cflags" from pkg-config correctly # and then fail to build when directly including like <glib/...>. # This is intended to be run in postInstall of any package # which has $out/include/ containing just some disjunct directories. @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { version = "2.66.4"; src = fetchurl { - url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/glib/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "l9+GcOMvn9T3OSsJgOZh3WJQEgFdWDUNoeWOND9K+YQ="; }; @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { ]); nativeBuildInputs = [ - meson ninja pkgconfig perl python3 gettext gtk-doc docbook_xsl docbook_xml_dtd_45 + meson ninja pkg-config perl python3 gettext gtk-doc docbook_xsl docbook_xml_dtd_45 ]; propagatedBuildInputs = [ zlib libffi gettext libiconv ]; @@ -110,7 +110,7 @@ stdenv.mkDerivation rec { # Instead we just copy them over from the native output. "-Dgtk_doc=${boolToString (stdenv.hostPlatform == stdenv.buildPlatform)}" "-Dnls=enabled" - "-Ddevbindir=${placeholder ''dev''}/bin" + "-Ddevbindir=${placeholder "dev"}/bin" ]; NIX_CFLAGS_COMPILE = toString [ @@ -182,7 +182,7 @@ stdenv.mkDerivation rec { updateScript = gnome3.updateScript { packageName = "glib"; }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "C library of programming buildings blocks"; homepage = "https://www.gtk.org/"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/glibc/2.32-25.patch.gz b/pkgs/development/libraries/glibc/2.32-35.patch.gz index d26ba012df6..f77e490ebf5 100644 --- a/pkgs/development/libraries/glibc/2.32-25.patch.gz +++ b/pkgs/development/libraries/glibc/2.32-35.patch.gz Binary files differdiff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 6b17e463d76..54882ba6718 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -42,7 +42,7 @@ let version = "2.32"; - patchSuffix = "-25"; + patchSuffix = "-35"; sha256 = "0di848ibffrnwq7g2dvgqrnn4xqhj3h96csn69q4da51ymafl9qn"; in @@ -62,11 +62,11 @@ stdenv.mkDerivation ({ /* No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git and using git or something would complicate bootstrapping. Fortunately it's not too big. - $ git checkout release/2.32/master; git describe - glibc-2.32-25-g0d9793e82a - $ git show --reverse glibc-2.32.. | gzip -n -9 --rsyncable - > 2.32-25.patch.gz + $ git checkout origin/release/2.32/master; git describe + glibc-2.32-35-g082798622d + $ git show --reverse glibc-2.32.. | gzip -n -9 --rsyncable - > 2.32-35.patch.gz */ - ./2.32-25.patch.gz + ./2.32-35.patch.gz /* Allow NixOS and Nix to handle the locale-archive. */ ./nix-locale-archive.patch @@ -158,7 +158,7 @@ stdenv.mkDerivation ({ "--enable-kernel=3.2.0" # can't get below with glibc >= 2.26 ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ (lib.flip lib.withFeature "fp" - (stdenv.hostPlatform.platform.gcc.float or (stdenv.hostPlatform.parsed.abi.float or "hard") == "soft")) + (stdenv.hostPlatform.gcc.float or (stdenv.hostPlatform.parsed.abi.float or "hard") == "soft")) "--with-__thread" ] ++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform && stdenv.hostPlatform.isAarch32) [ "--host=arm-linux-gnueabi" diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index 150681ebda1..9043c8fd0d4 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage +{ lib, stdenv, callPackage , withLinuxHeaders ? true , profilingLibraries ? false , withGd ? false @@ -14,7 +14,7 @@ let in callPackage ./common.nix { inherit stdenv; } { - name = "glibc" + stdenv.lib.optionalString withGd "-gd"; + name = "glibc" + lib.optionalString withGd "-gd"; inherit withLinuxHeaders profilingLibraries withGd; @@ -46,15 +46,15 @@ callPackage ./common.nix { inherit stdenv; } { hardeningDisable = [ "stackprotector" "fortify" ] # XXX: Not actually musl-speciic but since only musl enables pie by default, # limit rebuilds by only disabling pie w/musl - ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "pie"; + ++ lib.optional stdenv.hostPlatform.isMusl "pie"; - NIX_CFLAGS_COMPILE = stdenv.lib.concatStringsSep " " + NIX_CFLAGS_COMPILE = lib.concatStringsSep " " (builtins.concatLists [ - (stdenv.lib.optionals withGd gdCflags) + (lib.optionals withGd gdCflags) # Fix -Werror build failure when building glibc with musl with GCC >= 8, see: # https://github.com/NixOS/nixpkgs/pull/68244#issuecomment-544307798 - (stdenv.lib.optional stdenv.hostPlatform.isMusl "-Wno-error=attribute-alias") - (stdenv.lib.optionals ((stdenv.hostPlatform != stdenv.buildPlatform) || stdenv.hostPlatform.isMusl) [ + (lib.optional stdenv.hostPlatform.isMusl "-Wno-error=attribute-alias") + (lib.optionals ((stdenv.hostPlatform != stdenv.buildPlatform) || stdenv.hostPlatform.isMusl) [ # Ignore "error: '__EI___errno_location' specifies less restrictive attributes than its target '__errno_location'" # New warning as of GCC 9 # Same for musl: https://github.com/NixOS/nixpkgs/issues/78805 @@ -81,14 +81,14 @@ callPackage ./common.nix { inherit stdenv; } { postInstall = (if stdenv.hostPlatform == stdenv.buildPlatform then '' echo SUPPORTED-LOCALES=C.UTF-8/UTF-8 > ../glibc-2*/localedata/SUPPORTED make -j''${NIX_BUILD_CORES:-1} -l''${NIX_BUILD_CORES:-1} localedata/install-locales - '' else stdenv.lib.optionalString stdenv.buildPlatform.isLinux '' + '' else lib.optionalString stdenv.buildPlatform.isLinux '' # This is based on http://www.linuxfromscratch.org/lfs/view/development/chapter06/glibc.html # Instead of using their patch to build a build-native localedef, # we simply use the one from buildPackages pushd ../glibc-2*/localedata export I18NPATH=$PWD GCONV_PATH=$PWD/../iconvdata mkdir -p $NIX_BUILD_TOP/${buildPackages.glibc}/lib/locale - ${stdenv.lib.getBin buildPackages.glibc}/bin/localedef \ + ${lib.getBin buildPackages.glibc}/bin/localedef \ --alias-file=../intl/locale.alias \ -i locales/C \ -f charmaps/UTF-8 \ @@ -122,7 +122,7 @@ callPackage ./common.nix { inherit stdenv; } { '' # For some reason these aren't stripped otherwise and retain reference # to bootstrap-tools; on cross-arm this stripping would break objects. - + stdenv.lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' for i in "$out"/lib/*.a; do [ "$i" = "$out/lib/libm.a" ] || $STRIP -S "$i" diff --git a/pkgs/development/libraries/glibc/locales.nix b/pkgs/development/libraries/glibc/locales.nix index 0dc19197415..238cebf6209 100644 --- a/pkgs/development/libraries/glibc/locales.nix +++ b/pkgs/development/libraries/glibc/locales.nix @@ -6,7 +6,7 @@ https://sourceware.org/git/?p=glibc.git;a=blob;f=localedata/SUPPORTED */ -{ stdenv, buildPackages, callPackage, writeText +{ lib, stdenv, buildPackages, callPackage, writeText , allLocales ? true, locales ? [ "en_US.UTF-8/UTF-8" ] }: @@ -31,9 +31,9 @@ callPackage ./common.nix { inherit stdenv; } { # Hack to allow building of the locales (needed since glibc-2.12) sed -i -e 's,^$(rtld-prefix) $(common-objpfx)locale/localedef,localedef --prefix='$TMPDIR',' ../glibc-2*/localedata/Makefile '' - + stdenv.lib.optionalString (!allLocales) '' + + lib.optionalString (!allLocales) '' # Check that all locales to be built are supported - echo -n '${stdenv.lib.concatMapStrings (s: s + " \\\n") locales}' \ + echo -n '${lib.concatMapStrings (s: s + " \\\n") locales}' \ | sort > locales-to-build.txt cat ../glibc-2*/localedata/SUPPORTED | grep ' \\' \ | sort > locales-supported.txt diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index 53e924b1325..19567a98721 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -1,23 +1,23 @@ -{ stdenv, fetchurl, pkgconfig, gnum4, glib, libsigcxx, gnome3, darwin }: +{ lib, stdenv, fetchurl, pkg-config, gnum4, glib, libsigcxx, gnome3, darwin }: stdenv.mkDerivation rec { pname = "glibmm"; version = "2.64.2"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1v6lp23fr2qh4zshcnm28sn29j3nzgsvcqj2nhmrnvamipjq4lm7"; }; outputs = [ "out" "dev" ]; nativeBuildInputs = [ - pkgconfig + pkg-config gnum4 glib # for glib-compile-schemas ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Cocoa ]); propagatedBuildInputs = [ glib libsigcxx ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ interface to the GLib library"; homepage = "https://gtkmm.org/"; diff --git a/pkgs/development/libraries/glm/default.nix b/pkgs/development/libraries/glm/default.nix index cb0ae47acde..f5652a61c1d 100644 --- a/pkgs/development/libraries/glm/default.nix +++ b/pkgs/development/libraries/glm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchzip, cmake }: +{ lib, stdenv, fetchurl, fetchzip, cmake }: stdenv.mkDerivation rec { version = "0.9.8.5"; @@ -27,14 +27,14 @@ stdenv.mkDerivation rec { cp ${gcc7PlatformPatch} glm/simd/platform.h ''; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-DGLM_COMPILER=0"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DGLM_COMPILER=0"; postInstall = '' mkdir -p $doc/share/doc/glm cp -rv $NIX_BUILD_TOP/$sourceRoot/doc/* $doc/share/doc/glm ''; - meta = with stdenv.lib; { + meta = with lib; { description = "OpenGL Mathematics library for C++"; longDescription = '' OpenGL Mathematics (GLM) is a header only C++ mathematics library for @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { homepage = "http://glm.g-truc.net/"; license = licenses.mit; platforms = platforms.unix; - maintainers = with stdenv.lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/libraries/globalarrays/default.nix b/pkgs/development/libraries/globalarrays/default.nix index 5f700f73515..1f70946cbce 100644 --- a/pkgs/development/libraries/globalarrays/default.nix +++ b/pkgs/development/libraries/globalarrays/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchpatch, fetchFromGitHub, autoreconfHook -, blas, gfortran, openssh, openmpi +{ lib, stdenv, fetchpatch, fetchFromGitHub, autoreconfHook +, blas, gfortran, openssh, mpi } : let @@ -17,7 +17,7 @@ in stdenv.mkDerivation { }; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ openmpi blas gfortran openssh ]; + buildInputs = [ mpi blas gfortran openssh ]; preConfigure = '' configureFlagsArray+=( "--enable-i8" \ @@ -30,7 +30,7 @@ in stdenv.mkDerivation { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Global Arrays Programming Models"; homepage = "http://hpc.pnl.gov/globalarrays/"; maintainers = [ maintainers.markuskowa ]; diff --git a/pkgs/development/libraries/globalplatform/default.nix b/pkgs/development/libraries/globalplatform/default.nix index 3ab157598a4..a8dfa430f59 100644 --- a/pkgs/development/libraries/globalplatform/default.nix +++ b/pkgs/development/libraries/globalplatform/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, zlib, openssl_1_0_2, pcsclite }: +{ lib, stdenv, fetchurl, pkg-config, zlib, openssl_1_0_2, pcsclite }: stdenv.mkDerivation rec { pname = "globalplatform"; @@ -9,10 +9,10 @@ stdenv.mkDerivation rec { sha256 = "191s9005xbc7i90bzjk4rlw15licd6m0rls9fxli8jyymz2021zy"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib openssl_1_0_2 pcsclite ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://sourceforge.net/p/globalplatform/wiki/Home/"; description = "Library for interacting with smart card devices"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix b/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix index 043be9e91b5..a3ea4305bea 100644 --- a/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix +++ b/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, globalplatform, openssl_1_0_2, pcsclite }: +{ lib, stdenv, fetchurl, pkg-config, globalplatform, openssl_1_0_2, pcsclite }: stdenv.mkDerivation rec { pname = "gppcscconnectionplugin"; @@ -9,10 +9,10 @@ stdenv.mkDerivation rec { sha256 = "0d3vcrh9z55rbal0dchmj661pqqrav9c400bx1c46grcl1q022ad"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ globalplatform openssl_1_0_2 pcsclite ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://sourceforge.net/p/globalplatform/wiki/Home/"; description = "GlobalPlatform pcsc connection plugin"; license = [ licenses.lgpl3 licenses.gpl3 ]; diff --git a/pkgs/development/libraries/glog/default.nix b/pkgs/development/libraries/glog/default.nix index aa846e41d55..4bb20ebfd93 100644 --- a/pkgs/development/libraries/glog/default.nix +++ b/pkgs/development/libraries/glog/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { checkInputs = [ perl ]; doCheck = false; # fails with "Mangled symbols (28 out of 380) found in demangle.dm" - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/google/glog"; license = licenses.bsd3; description = "Library for application-level logging"; diff --git a/pkgs/development/libraries/gloox/default.nix b/pkgs/development/libraries/gloox/default.nix index ef731b3c35a..b01d858cfb9 100644 --- a/pkgs/development/libraries/gloox/default.nix +++ b/pkgs/development/libraries/gloox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , zlibSupport ? true, zlib ? null , sslSupport ? true, openssl ? null , idnSupport ? true, libidn ? null @@ -8,7 +8,7 @@ assert zlibSupport -> zlib != null; assert sslSupport -> openssl != null; assert idnSupport -> libidn != null; -with stdenv.lib; +with lib; let version = "1.0.24"; diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/development/libraries/glpk/default.nix index d771f7df789..a46c84844e8 100644 --- a/pkgs/development/libraries/glpk/default.nix +++ b/pkgs/development/libraries/glpk/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , libmysqlclient @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { buildInputs = [ libmysqlclient - ] ++ stdenv.lib.optionals withGmp [ + ] ++ lib.optionals withGmp [ gmp ]; - configureFlags = stdenv.lib.optionals withGmp [ + configureFlags = lib.optionals withGmp [ "--with-gmp" ]; @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "The GNU Linear Programming Kit"; longDescription = diff --git a/pkgs/development/libraries/glui/default.nix b/pkgs/development/libraries/glui/default.nix index d84a9227c3b..511ec60db2f 100644 --- a/pkgs/development/libraries/glui/default.nix +++ b/pkgs/development/libraries/glui/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , freeglut , libGL @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { cp LICENSE.txt "$out/share/glui/doc" ''; - meta = with stdenv.lib; { - description = ''A user interface library using OpenGL''; + meta = with lib; { + description = "A user interface library using OpenGL"; license = licenses.zlib ; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/gmime/2.nix b/pkgs/development/libraries/gmime/2.nix index c902aac23a1..0e10d12ed1f 100644 --- a/pkgs/development/libraries/gmime/2.nix +++ b/pkgs/development/libraries/gmime/2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, zlib, gnupg, libgpgerror, gobject-introspection }: +{ lib, stdenv, fetchurl, pkg-config, glib, zlib, gnupg, libgpgerror, gobject-introspection }: stdenv.mkDerivation rec { version = "2.6.23"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig gobject-introspection ]; + nativeBuildInputs = [ pkg-config gobject-introspection ]; propagatedBuildInputs = [ glib zlib libgpgerror ]; configureFlags = [ "--enable-introspection=yes" ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/jstedfast/gmime/"; description = "A C/C++ library for creating, editing and parsing MIME messages and structures"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/gmime/3.nix b/pkgs/development/libraries/gmime/3.nix index f2ba29d461e..a8e39047256 100644 --- a/pkgs/development/libraries/gmime/3.nix +++ b/pkgs/development/libraries/gmime/3.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, zlib, gnupg, gpgme, libidn2, libunistring, gobject-introspection +{ lib, stdenv, fetchurl, pkg-config, glib, zlib, gnupg, gpgme, libidn2, libunistring, gobject-introspection , vala }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; buildInputs = [ vala gobject-introspection zlib gpgme libidn2 libunistring ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ glib ]; configureFlags = [ "--enable-introspection=yes" @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/jstedfast/gmime/"; description = "A C/C++ library for creating, editing and parsing MIME messages and structures"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/gmm/default.nix b/pkgs/development/libraries/gmm/default.nix index 278059465ec..3c145b3c1e3 100644 --- a/pkgs/development/libraries/gmm/default.nix +++ b/pkgs/development/libraries/gmm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "gmm"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0mhygfpsdyr0d4h3sn6g7nxn149yrlqv7r2h34yqkrpv1q4daqvi"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Generic C++ template library for sparse, dense and skyline matrices"; homepage = "http://getfem.org/gmm.html"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/gmp/4.3.2.nix b/pkgs/development/libraries/gmp/4.3.2.nix index 29310aa9f00..ce870581f5e 100644 --- a/pkgs/development/libraries/gmp/4.3.2.nix +++ b/pkgs/development/libraries/gmp/4.3.2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, m4, cxx ? true }: +{ lib, stdenv, fetchurl, m4, cxx ? true }: let self = stdenv.mkDerivation rec { name = "gmp-4.3.2"; @@ -28,8 +28,8 @@ let self = stdenv.mkDerivation rec { else ''echo "Darwin host is `./config.guess`."''; configureFlags = [ - (stdenv.lib.enableFeature cxx "cxx") - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + (lib.enableFeature cxx "cxx") + ] ++ lib.optionals stdenv.isDarwin [ "ac_cv_build=x86_64-apple-darwin13.4.0" "ac_cv_host=x86_64-apple-darwin13.4.0" ]; @@ -65,10 +65,10 @@ let self = stdenv.mkDerivation rec { ''; homepage = "https://gmplib.org/"; - license = stdenv.lib.licenses.lgpl3Plus; + license = lib.licenses.lgpl3Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; badPlatforms = [ "x86_64-darwin" ]; }; }; diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix index a514934e964..73061a3d2ef 100644 --- a/pkgs/development/libraries/gmp/5.1.x.nix +++ b/pkgs/development/libraries/gmp/5.1.x.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, m4 +{ lib, stdenv, fetchurl, m4 , cxx ? true , withStatic ? stdenv.hostPlatform.isStatic }: -let inherit (stdenv.lib) optional; in +let inherit (lib) optional; in let self = stdenv.mkDerivation rec { name = "gmp-5.1.3"; @@ -25,13 +25,13 @@ let self = stdenv.mkDerivation rec { configureFlags = [ "--with-pic" - (stdenv.lib.enableFeature cxx "cxx") + (lib.enableFeature cxx "cxx") # Build a "fat binary", with routines for several sub-architectures # (x86), except on Solaris where some tests crash with "Memory fault". # See <https://hydra.nixos.org/build/2760931>, for instance. # # no darwin because gmp uses ASM that clang doesn't like - (stdenv.lib.enableFeature (!stdenv.isSunOS && stdenv.hostPlatform.isx86) "fat") + (lib.enableFeature (!stdenv.isSunOS && stdenv.hostPlatform.isx86) "fat") # The config.guess in GMP tries to runtime-detect various # ARM optimization flags via /proc/cpuinfo (and is also # broken on multicore CPUs). Avoid this impurity. @@ -46,7 +46,7 @@ let self = stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://gmplib.org/"; description = "GNU multiple precision arithmetic library"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix index 522976d3ab2..bf03bf08779 100644 --- a/pkgs/development/libraries/gmp/6.x.nix +++ b/pkgs/development/libraries/gmp/6.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, m4 +{ lib, stdenv, fetchurl, m4 , cxx ? !stdenv.hostPlatform.useAndroidPrebuilt && !stdenv.hostPlatform.isWasm , buildPackages , withStatic ? stdenv.hostPlatform.isStatic @@ -9,7 +9,7 @@ # cgit) that are needed here should be included directly in Nixpkgs as # files. -let inherit (stdenv.lib) optional; in +let inherit (lib) optional; in let self = stdenv.mkDerivation rec { name = "gmp-6.2.1"; @@ -30,13 +30,13 @@ let self = stdenv.mkDerivation rec { configureFlags = [ "--with-pic" - (stdenv.lib.enableFeature cxx "cxx") + (lib.enableFeature cxx "cxx") # Build a "fat binary", with routines for several sub-architectures # (x86), except on Solaris where some tests crash with "Memory fault". # See <https://hydra.nixos.org/build/2760931>, for instance. # # no darwin because gmp uses ASM that clang doesn't like - (stdenv.lib.enableFeature (!stdenv.isSunOS && stdenv.hostPlatform.isx86) "fat") + (lib.enableFeature (!stdenv.isSunOS && stdenv.hostPlatform.isx86) "fat") # The config.guess in GMP tries to runtime-detect various # ARM optimization flags via /proc/cpuinfo (and is also # broken on multicore CPUs). Avoid this impurity. @@ -54,7 +54,7 @@ let self = stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://gmplib.org/"; description = "GNU multiple precision arithmetic library"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/gmtk/default.nix b/pkgs/development/libraries/gmtk/default.nix index f6516815bb9..6f2906a8234 100644 --- a/pkgs/development/libraries/gmtk/default.nix +++ b/pkgs/development/libraries/gmtk/default.nix @@ -1,4 +1,4 @@ -{stdenv, substituteAll, fetchFromGitHub, libtool, pkgconfig, intltool, glib, gtk3 +{lib, stdenv, substituteAll, fetchFromGitHub, libtool, pkg-config, intltool, glib, gtk3 , libpulseaudio, mplayer, gnome_mplayer }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1zb5m1y1gckal3140gvx31572a6xpccwfmdwa1w5lx2wdq1pwk1i"; }; - nativeBuildInputs = [ libtool pkgconfig intltool ]; + nativeBuildInputs = [ libtool pkg-config intltool ]; buildInputs = [ glib gtk3 libpulseaudio ]; patches = [ @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { }) ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Common functions for gnome-mplayer and gecko-mediaplayer"; homepage = "https://sites.google.com/site/kdekorte2/gnomemplayer"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/gnet/default.nix b/pkgs/development/libraries/gnet/default.nix index 749b021890a..8f35407f9dd 100644 --- a/pkgs/development/libraries/gnet/default.nix +++ b/pkgs/development/libraries/gnet/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, pkgconfig, autoconf, automake, glib, libtool }: +{lib, stdenv, fetchFromGitHub, pkg-config, autoconf, automake, glib, libtool }: stdenv.mkDerivation { name = "gnet-2.0.8"; @@ -9,12 +9,12 @@ stdenv.mkDerivation { sha256 = "1cy78kglzi235md964ikvm0rg801bx0yk9ya8zavndjnaarzqq87"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoconf automake glib libtool ]; preConfigure = "./autogen.sh"; - meta = with stdenv.lib; { + meta = with lib; { description = "A network library, written in C, object-oriented, and built upon GLib"; homepage = "https://developer.gnome.org/gnet/"; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/gnome-menus/default.nix b/pkgs/development/libraries/gnome-menus/default.nix index f8e25640f29..c8e77148c6d 100644 --- a/pkgs/development/libraries/gnome-menus/default.nix +++ b/pkgs/development/libraries/gnome-menus/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, pkgconfig, gettext, glib, gobject-introspection, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, gettext, glib, gobject-introspection, gnome3 }: stdenv.mkDerivation rec { pname = "gnome-menus"; version = "3.36.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "07xvaf8s0fiv0035nk8zpzymn5www76w2a1vflrgqmp9plw8yd6r"; }; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { "INTROSPECTION_TYPELIBDIR=${placeholder "out"}/lib/girepository-1.0" ]; - nativeBuildInputs = [ pkgconfig gettext ]; + nativeBuildInputs = [ pkg-config gettext ]; buildInputs = [ glib gobject-introspection ]; passthru = { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/gnome-menus"; description = "Library that implements freedesktops's Desktop Menu Specification in GNOME"; license = with licenses; [ gpl2 lgpl2 ]; diff --git a/pkgs/development/libraries/gnome-online-accounts/default.nix b/pkgs/development/libraries/gnome-online-accounts/default.nix index 342cfcbc4da..c5846b523cd 100644 --- a/pkgs/development/libraries/gnome-online-accounts/default.nix +++ b/pkgs/development/libraries/gnome-online-accounts/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitLab , pkg-config , vala @@ -95,7 +95,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Projects/GnomeOnlineAccounts"; description = "Single sign-on framework for GNOME"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/gnome-sharp/default.nix b/pkgs/development/libraries/gnome-sharp/default.nix index 5926f59cc37..4aa510f3606 100644 --- a/pkgs/development/libraries/gnome-sharp/default.nix +++ b/pkgs/development/libraries/gnome-sharp/default.nix @@ -1,7 +1,7 @@ { stdenv , lib , fetchFromGitHub -, pkgconfig +, pkg-config , gtk2 , mono , gtk-sharp-2_0 @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { sha256 = "15jsm6n0sih0nf3w8vmvik97q7l3imz4vkdzmp9k7bssiz4glj1z"; }; - nativeBuildInputs = [ pkgconfig autoconf automake libtool which ]; + nativeBuildInputs = [ pkg-config autoconf automake libtool which ]; buildInputs = [ gtk2 mono gtk-sharp-2_0 ] ++ (with gnome2; [ libart_lgpl gnome_vfs libgnome libgnomecanvas libgnomeui ]); @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { dontStrip = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.mono-project.com/docs/gui/gtksharp/"; description = "A .NET language binding for assorted GNOME libraries"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/gnome-video-effects/default.nix b/pkgs/development/libraries/gnome-video-effects/default.nix index dfbb2c3b1e6..a2206c19b1b 100644 --- a/pkgs/development/libraries/gnome-video-effects/default.nix +++ b/pkgs/development/libraries/gnome-video-effects/default.nix @@ -1,6 +1,6 @@ -{ stdenv +{ lib, stdenv , fetchurl -, pkgconfig +, pkg-config , meson , ninja , gettext @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { version = "0.5.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1j6h98whgkcxrh30bwvnxvyqxrxchgpdgqhl0j71xz7x72dqxijd"; }; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gettext ]; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A collection of GStreamer effects to be used in different GNOME Modules"; homepage = "https://wiki.gnome.org/Projects/GnomeVideoEffects"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/gnu-config/default.nix b/pkgs/development/libraries/gnu-config/default.nix index 5acab2a70e0..74b94e68f56 100644 --- a/pkgs/development/libraries/gnu-config/default.nix +++ b/pkgs/development/libraries/gnu-config/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: let rev = "e78c96e5288993aaea3ec44e5c6ee755c668da79"; @@ -22,7 +22,7 @@ in stdenv.mkDerivation { cp ${configSub} $out/config.sub ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Attempt to guess a canonical system name"; homepage = "https://savannah.gnu.org/projects/config"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix index 402c3585d53..ef8ef7648eb 100644 --- a/pkgs/development/libraries/gnu-efi/default.nix +++ b/pkgs/development/libraries/gnu-efi/default.nix @@ -1,6 +1,6 @@ -{ stdenv, buildPackages, fetchurl, fetchpatch, pciutils }: +{ lib, stdenv, buildPackages, fetchurl, fetchpatch, pciutils }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "gnu-efi"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { "CROSS_COMPILE=${stdenv.cc.targetPrefix}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "GNU EFI development toolchain"; homepage = "https://sourceforge.net/projects/gnu-efi/"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/gnutls-kdh/generic.nix b/pkgs/development/libraries/gnutls-kdh/generic.nix index c6d35b68236..245b0c1e638 100644 --- a/pkgs/development/libraries/gnutls-kdh/generic.nix +++ b/pkgs/development/libraries/gnutls-kdh/generic.nix @@ -1,4 +1,4 @@ -{ config, lib, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip +{ config, lib, stdenv, zlib, lzo, libtasn1, nettle, pkg-config, lzip , perl, gmp, autogen, libidn, p11-kit, unbound, libiconv , guileBindings ? config.gnutls.guile or false, guile , tpmSupport ? true, trousers, nettools, gperftools, gperf, gettext, automake @@ -62,12 +62,12 @@ stdenv.mkDerivation { ++ [ unbound ] ++ lib.optional guileBindings guile; - nativeBuildInputs = [ perl pkgconfig ] ++ nativeBuildInputs; + nativeBuildInputs = [ perl pkg-config ] ++ nativeBuildInputs; #inherit doCheck; doCheck = false; - # Fixup broken libtool and pkgconfig files + # Fixup broken libtool and pkg-config files preFixup = lib.optionalString (!stdenv.isDarwin) '' sed ${lib.optionalString tpmSupport "-e 's,-ltspi,-L${trousers}/lib -ltspi,'"} \ -e 's,-lz,-L${zlib.out}/lib -lz,' \ diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index ae3775002ec..57acec4860a 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -1,5 +1,5 @@ -{ config, lib, stdenv, fetchurl, zlib, lzo, libtasn1, nettle, pkgconfig, lzip -, perl, gmp, autoconf, autogen, automake, libidn, p11-kit, libiconv +{ config, lib, stdenv, fetchurl, zlib, lzo, libtasn1, nettle, pkg-config, lzip +, perl, gmp, autoconf, automake, libidn, p11-kit, libiconv , unbound, dns-root-data, gettext, cacert, util-linux , guileBindings ? config.gnutls.guile or false, guile , tpmSupport ? false, trousers, which, nettools, libunistring @@ -40,7 +40,7 @@ stdenv.mkDerivation { ++ lib.optional stdenv.hostPlatform.isAarch32 ./fix-gnulib-tests-arm.patch; # Skip some tests: - # - pkgconfig: building against the result won't work before installing (3.5.11) + # - pkg-config: building against the result won't work before installing (3.5.11) # - fastopen: no idea; it broke between 3.6.2 and 3.6.3 (3437fdde6 in particular) # - trust-store: default trust store path (/etc/ssl/...) is missing in sandbox (3.5.11) # - psk-file: no idea; it broke between 3.6.3 and 3.6.4 @@ -71,12 +71,12 @@ stdenv.mkDerivation { enableParallelBuilding = true; - buildInputs = [ lzo lzip libtasn1 libidn p11-kit zlib gmp autogen libunistring unbound gettext libiconv ] + buildInputs = [ lzo lzip libtasn1 libidn p11-kit zlib gmp libunistring unbound gettext libiconv ] ++ lib.optional (isDarwin && withSecurity) Security ++ lib.optional (tpmSupport && stdenv.isLinux) trousers ++ lib.optional guileBindings guile; - nativeBuildInputs = [ perl pkgconfig ] + nativeBuildInputs = [ perl pkg-config ] ++ lib.optionals (isDarwin && !withSecurity) [ autoconf automake ] ++ lib.optionals doCheck [ which nettools util-linux ]; @@ -87,7 +87,7 @@ stdenv.mkDerivation { # Error setting the x509 trust file: Error while reading file. checkInputs = [ cacert ]; - # Fixup broken libtool and pkgconfig files + # Fixup broken libtool and pkg-config files preFixup = lib.optionalString (!isDarwin) '' sed ${lib.optionalString tpmSupport "-e 's,-ltspi,-L${trousers}/lib -ltspi,'"} \ -e 's,-lz,-L${zlib.out}/lib -lz,' \ diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index 97b3ea9a8f1..ae65f5aed28 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , glib , flex @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { outputBin = "dev"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "078n0q7b6z682mf4irclrksm73cyixq295mqnqifl9plwmgaai6x"; }; @@ -46,12 +46,12 @@ stdenv.mkDerivation rec { src = ./absolute_shlib_path.patch; inherit nixStoreDir; }) - ] ++ stdenv.lib.optionals x11Support [ + ] ++ lib.optionals x11Support [ # Hardcode the cairo shared library path in the Cairo gir shipped with this package. # https://github.com/NixOS/nixpkgs/issues/34080 (substituteAll { src = ./absolute_gir_path.patch; - cairoLib = "${stdenv.lib.getLib cairo}/lib"; + cairoLib = "${lib.getLib cairo}/lib"; }) ]; @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { python3 ]; - checkInputs = stdenv.lib.optionals stdenv.isDarwin [ + checkInputs = lib.optionals stdenv.isDarwin [ cctools # for otool ]; @@ -117,7 +117,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A middleware layer between C libraries and language bindings"; homepage = "https://gi.readthedocs.io/"; maintainers = teams.gnome.members ++ (with maintainers; [ lovek323 ]); diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix index 46b40d00d78..d544dd7625d 100644 --- a/pkgs/development/libraries/goffice/default.nix +++ b/pkgs/development/libraries/goffice/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, intltool, glib, gtk3, lasem +{ fetchurl, lib, stdenv, pkg-config, intltool, glib, gtk3, lasem , libgsf, libxml2, libxslt, cairo, pango, librsvg, gnome3 }: stdenv.mkDerivation rec { @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1z6f3q8fxkd1ysqrwdxdi0844zqa00vjpf07gq8mh3kal8picfd4"; }; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkg-config intltool ]; propagatedBuildInputs = [ glib gtk3 libxml2 cairo pango libgsf lasem @@ -38,8 +38,8 @@ stdenv.mkDerivation rec { documents, undo/redo. ''; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/gom/default.nix b/pkgs/development/libraries/gom/default.nix index 753db22f4f9..4b5effefa57 100644 --- a/pkgs/development/libraries/gom/default.nix +++ b/pkgs/development/libraries/gom/default.nix @@ -1,8 +1,8 @@ -{ stdenv +{ lib, stdenv , fetchurl , meson , ninja -, pkgconfig +, pkg-config , glib , python3 , sqlite @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "py" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "17ca07hpg7dqxjn0jpqim3xqcmplk2a87wbwrrlq3dd3m8381l38"; }; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { gobject-introspection meson ninja - pkgconfig + pkg-config ]; buildInputs = [ @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A GObject to SQLite object mapper"; homepage = "https://wiki.gnome.org/Projects/Gom"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/goocanvas/2.x.nix b/pkgs/development/libraries/goocanvas/2.x.nix index a744cf314e2..c4df9f1f0fd 100644 --- a/pkgs/development/libraries/goocanvas/2.x.nix +++ b/pkgs/development/libraries/goocanvas/2.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, gtk-doc, gobject-introspection, python2, gtk3, cairo, glib }: +{ lib, stdenv, fetchurl, pkg-config, gettext, gtk-doc, gobject-introspection, python2, gtk3, cairo, glib }: let version = "2.0.4"; @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { sha256 = "141fm7mbqib0011zmkv3g8vxcjwa7hypmq71ahdyhnj2sjvy4a67"; }; - nativeBuildInputs = [ pkgconfig gettext gtk-doc python2 ]; + nativeBuildInputs = [ pkg-config gettext gtk-doc python2 ]; buildInputs = [ gtk3 cairo glib gobject-introspection ]; configureFlags = [ @@ -22,7 +22,7 @@ in stdenv.mkDerivation rec { PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "$(dev)/share/gir-1.0"; PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "$(out)/lib/girepository-1.0"; - meta = with stdenv.lib; { + meta = with lib; { description = "Canvas widget for GTK based on the the Cairo 2D library"; homepage = "https://wiki.gnome.org/Projects/GooCanvas"; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/goocanvas/default.nix b/pkgs/development/libraries/goocanvas/default.nix index 024ac363af1..c9fd5b26342 100644 --- a/pkgs/development/libraries/goocanvas/default.nix +++ b/pkgs/development/libraries/goocanvas/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, gtk2, cairo, glib, pkgconfig, gnome3 }: +{ lib, stdenv, fetchurl, gtk2, cairo, glib, pkg-config, gnome3 }: stdenv.mkDerivation rec { pname = "goocanvas"; version = "1.0.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "07kicpcacbqm3inp7zq32ldp95mxx4kfxpaazd0x5jk7hpw2w1qw"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 cairo glib ]; passthru = { @@ -19,10 +19,10 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { 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; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/goocanvasmm/default.nix b/pkgs/development/libraries/goocanvasmm/default.nix index d8a910d4799..632e434631c 100644 --- a/pkgs/development/libraries/goocanvasmm/default.nix +++ b/pkgs/development/libraries/goocanvasmm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, goocanvas2, gtkmm3, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, goocanvas2, gtkmm3, gnome3 }: stdenv.mkDerivation rec { pname = "goocanvasmm"; @@ -7,10 +7,10 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0vpdfrj59nwzwj8bk4s0h05iyql62pxjzsxh72g3vry07s3i3zw0"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ gtkmm3 goocanvas2 ]; enableParallelBuilding = true; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ bindings for GooCanvas"; homepage = "https://wiki.gnome.org/Projects/GooCanvas"; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/google-cloud-cpp/default.nix b/pkgs/development/libraries/google-cloud-cpp/default.nix index a3a549a6324..fdf42543281 100644 --- a/pkgs/development/libraries/google-cloud-cpp/default.nix +++ b/pkgs/development/libraries/google-cloud-cpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, clang-tools, grpc, curl, cmake, pkg-config, fetchFromGitHub, doxygen, protobuf, crc32c, c-ares, fetchurl, openssl, zlib }: +{ lib, stdenv, clang-tools, grpc, curl, cmake, pkg-config, fetchFromGitHub, doxygen, protobuf, crc32c, c-ares, fetchurl, openssl, zlib }: let googleapis = fetchFromGitHub { owner = "googleapis"; @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec { "-DBUILD_SHARED_LIBS:BOOL=ON" ]; - meta = with stdenv.lib; { + meta = with lib; { license = with licenses; [ asl20 ]; homepage = "https://github.com/googleapis/google-cloud-cpp"; description = "C++ Idiomatic Clients for Google Cloud Platform services"; diff --git a/pkgs/development/libraries/gperftools/default.nix b/pkgs/development/libraries/gperftools/default.nix index 91b2c2929a4..bdb4e67f85f 100644 --- a/pkgs/development/libraries/gperftools/default.nix +++ b/pkgs/development/libraries/gperftools/default.nix @@ -1,11 +1,20 @@ -{ stdenv, fetchurl, fetchpatch, autoreconfHook, libunwind }: +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, autoreconfHook +, libunwind +}: stdenv.mkDerivation rec { - name = "gperftools-2.8"; - - src = fetchurl { - url = "https://github.com/gperftools/gperftools/releases/download/${name}/${name}.tar.gz"; - sha256 = "0gjiplvday50x695pwjrysnvm5wfvg2b0gmqf6b4bdi8sv6yl394"; + pname = "gperftools"; + version = "2.8.1"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "${pname}-${version}"; + sha256 = "19bj2vlsbfwq7m826v2ccqg47kd7cb5vcz1yw2x0v5qzhaxbakk1"; }; patches = [ @@ -20,21 +29,19 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; # tcmalloc uses libunwind in a way that works correctly only on non-ARM linux - buildInputs = stdenv.lib.optional (stdenv.isLinux && !(stdenv.isAarch64 || stdenv.isAarch32)) libunwind; + buildInputs = lib.optional (stdenv.isLinux && !(stdenv.isAarch64 || stdenv.isAarch32)) libunwind; # Disable general dynamic TLS on AArch to support dlopen()'ing the library: # https://bugzilla.redhat.com/show_bug.cgi?id=1483558 - configureFlags = stdenv.lib.optional (stdenv.isAarch32 || stdenv.isAarch64) + configureFlags = lib.optional (stdenv.isAarch32 || stdenv.isAarch64) "--disable-general-dynamic-tls"; - prePatch = stdenv.lib.optionalString stdenv.isDarwin '' + prePatch = lib.optionalString stdenv.isDarwin '' substituteInPlace Makefile.am --replace stdc++ c++ - substituteInPlace Makefile.in --replace stdc++ c++ - substituteInPlace libtool --replace stdc++ c++ ''; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin - "-D_XOPEN_SOURCE -Wno-aligned-allocation-unavailable"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin + "-D_XOPEN_SOURCE"; # some packages want to link to the static tcmalloc_minimal # to drop the runtime dependency on gperftools @@ -42,7 +49,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/gperftools/gperftools"; description = "Fast, multi-threaded malloc() and nifty performance analysis tools"; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 489b6001342..326e5da0812 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, fetchpatch -, autoreconfHook, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan +{ lib, stdenv, fetchurl, fetchpatch +, autoreconfHook, libgpgerror, gnupg, pkg-config, glib, pth, libassuan , file, which, ncurses , texinfo , buildPackages @@ -8,7 +8,6 @@ }: let - inherit (stdenv) lib; inherit (stdenv.hostPlatform) system; in @@ -45,11 +44,13 @@ stdenv.mkDerivation rec { [ libgpgerror glib libassuan pth ] ++ lib.optional (qtbase != null) qtbase; - nativeBuildInputs = [ pkgconfig gnupg texinfo autoreconfHook ] + nativeBuildInputs = [ pkg-config gnupg texinfo autoreconfHook ] ++ lib.optionals pythonSupport [ python swig2 which ncurses ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; + dontWrapQtApps = true; + configureFlags = [ "--enable-fixed-path=${gnupg}/bin" "--with-libgpg-error-prefix=${libgpgerror.dev}" @@ -72,7 +73,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://gnupg.org/software/gpgme/index.html"; changelog = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=blob;f=NEWS;hb=refs/tags/gpgme-${version}"; description = "Library for making GnuPG easier to use"; diff --git a/pkgs/development/libraries/grail/default.nix b/pkgs/development/libraries/grail/default.nix index 6efc1fca39a..b11ec3a9f5c 100644 --- a/pkgs/development/libraries/grail/default.nix +++ b/pkgs/development/libraries/grail/default.nix @@ -1,5 +1,5 @@ { enableX11 ? true, - stdenv, fetchurl, pkgconfig, xorg, python3, frame }: + lib, stdenv, fetchurl, pkg-config, xorg, python3, frame }: stdenv.mkDerivation rec { pname = "grail"; @@ -10,16 +10,16 @@ stdenv.mkDerivation rec { sha256 = "1wwx5ibjdz5pyd0f5cd1n91y67r68dymxpm2lgd829041xjizvay"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ python3 frame ] - ++ stdenv.lib.optionals enableX11 [xorg.libX11 xorg.libXtst xorg.libXext xorg.libXi xorg.libXfixes]; + ++ lib.optionals enableX11 [xorg.libX11 xorg.libXtst xorg.libXext xorg.libXi xorg.libXfixes]; - configureFlags = stdenv.lib.optional enableX11 "--with-x11"; + configureFlags = lib.optional enableX11 "--with-x11"; meta = { homepage = "https://launchpad.net/canonical-multitouch/grail"; description = "Gesture Recognition And Instantiation Library"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/grantlee/default.nix b/pkgs/development/libraries/grantlee/default.nix index 627a345efad..869430538e8 100644 --- a/pkgs/development/libraries/grantlee/default.nix +++ b/pkgs/development/libraries/grantlee/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, cmake }: +{ lib, stdenv, fetchurl, qt4, cmake }: stdenv.mkDerivation rec { name = "grantlee-0.5.1"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { and the design of Django is reused in Grantlee.''; homepage = "http://gitorious.org/grantlee"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; inherit (qt4.meta) platforms; }; } diff --git a/pkgs/development/libraries/graphene-hardened-malloc/default.nix b/pkgs/development/libraries/graphene-hardened-malloc/default.nix index c60b0914492..726666ec06f 100644 --- a/pkgs/development/libraries/graphene-hardened-malloc/default.nix +++ b/pkgs/development/libraries/graphene-hardened-malloc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "graphene-hardened-malloc"; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { popd ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/GrapheneOS/hardened_malloc"; description = "Hardened allocator designed for modern systems"; longDescription = '' diff --git a/pkgs/development/libraries/graphene/default.nix b/pkgs/development/libraries/graphene/default.nix index ee147d82afd..57cad449765 100644 --- a/pkgs/development/libraries/graphene/default.nix +++ b/pkgs/development/libraries/graphene/default.nix @@ -1,7 +1,7 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script -, pkgconfig +, pkg-config , meson , ninja , python3 @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { gtk-doc meson ninja - pkgconfig + pkg-config gobject-introspection python3 ]; @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A thin layer of graphic data types"; homepage = "https://ebassi.github.com/graphene"; license = licenses.mit; diff --git a/pkgs/development/libraries/grib-api/default.nix b/pkgs/development/libraries/grib-api/default.nix index 0a057ba4aa1..182f05a8ca8 100644 --- a/pkgs/development/libraries/grib-api/default.nix +++ b/pkgs/development/libraries/grib-api/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, stdenv, +{ fetchurl, fetchpatch, lib, stdenv, cmake, netcdf, gfortran, libpng, openjpeg, enablePython ? false, pythonPackages }: @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { buildInputs = [ netcdf libpng openjpeg - ] ++ stdenv.lib.optionals enablePython [ + ] ++ lib.optionals enablePython [ pythonPackages.python ]; - propagatedBuildInputs = stdenv.lib.optionals enablePython [ + propagatedBuildInputs = lib.optionals enablePython [ pythonPackages.numpy ]; @@ -46,14 +46,14 @@ stdenv.mkDerivation rec { # Only do tests that don't require downloading 120MB of testdata # We fix the darwin checkPhase, which searches for libgrib_api.dylib # in /nix/store by setting DYLD_LIBRARY_PATH - checkPhase = stdenv.lib.optionalString (stdenv.isDarwin) '' + checkPhase = lib.optionalString (stdenv.isDarwin) '' substituteInPlace "tests/include.sh" --replace "set -ea" "set -ea; export DYLD_LIBRARY_PATH=$(pwd)/lib" '' + '' ctest -R "t_definitions|t_calendar|t_unit_tests" -VV ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://software.ecmwf.int/wiki/display/GRIB/Home"; license = licenses.asl20; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/development/libraries/grilo-plugins/default.nix b/pkgs/development/libraries/grilo-plugins/default.nix index 9073a501c09..b80e6256e46 100644 --- a/pkgs/development/libraries/grilo-plugins/default.nix +++ b/pkgs/development/libraries/grilo-plugins/default.nix @@ -1,9 +1,9 @@ -{ stdenv +{ lib, stdenv , fetchurl , substituteAll , meson , ninja -, pkgconfig +, pkg-config , gettext , gperf , sqlite @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { version = "0.3.12"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0xr59gzb8gw2bgj14mjllgn8y7srh373j0fp0v16ak8nd84dzdn6"; }; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { # * chromaprint (gst-plugins-bad) (substituteAll { src = ./chromaprint-gst-plugins.patch; - load_plugins = stdenv.lib.concatMapStrings (plugin: ''gst_registry_scan_path(gst_registry_get(), "${plugin}/lib/gstreamer-1.0");'') (with gst_all_1; [ + load_plugins = lib.concatMapStrings (plugin: ''gst_registry_scan_path(gst_registry_get(), "${plugin}/lib/gstreamer-1.0");'') (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-bad @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gettext itstool gperf # for lua-factory @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Projects/Grilo"; description = "A collection of plugins for the Grilo framework"; maintainers = teams.gnome.members; diff --git a/pkgs/development/libraries/grilo/default.nix b/pkgs/development/libraries/grilo/default.nix index 858e8d81fd4..fbab49273e8 100644 --- a/pkgs/development/libraries/grilo/default.nix +++ b/pkgs/development/libraries/grilo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, vala, glib, liboauth, gtk3 +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gettext, vala, glib, liboauth, gtk3 , gtk-doc, docbook_xsl, docbook_xml_dtd_43 , libxml2, gnome3, gobject-introspection, libsoup, totem-pl-parser }: @@ -12,7 +12,7 @@ in stdenv.mkDerivation rec { outputBin = "dev"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "0ywjvh7xw4ql1q4fvl0q5n06n08pga1g1nc9l7c3x5214gr3fj6i"; }; @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - meson ninja pkgconfig gettext gobject-introspection vala + meson ninja pkg-config gettext gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_43 ]; buildInputs = [ glib liboauth gtk3 libxml2 libsoup totem-pl-parser ]; @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Projects/Grilo"; description = "Framework that provides access to various sources of multimedia content, using a pluggable system"; maintainers = teams.gnome.members; diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 346d04390c3..92cf619ab5b 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, c-ares, pkg-config, openssl, protobuf +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, c-ares, pkg-config, openssl, protobuf , gflags, abseil-cpp, libnsl }: stdenv.mkDerivation rec { - version = "1.34.0"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too + version = "1.34.1"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too pname = "grpc"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - sha256 = "0kipk26kg2x06mrkhb74k8vk5cn4mr89kw1f9mb04n616wkxjyxy"; + sha256 = "0p6si9i0gg885ag2x87a7jyzhgd5lhx2bh2vjj2ra1jn6y3vg6qk"; fetchSubmodules = true; }; patches = [ @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags abseil-cpp ] - ++ stdenv.lib.optionals stdenv.isLinux [ libnsl ]; + ++ lib.optionals stdenv.isLinux [ libnsl ]; cmakeFlags = [ "-DgRPC_ZLIB_PROVIDER=package" @@ -45,11 +45,11 @@ stdenv.mkDerivation rec { export LD_LIBRARY_PATH=$(pwd)''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH ''; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=unknown-warning-option"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=unknown-warning-option"; enableParallelBuilds = true; - meta = with stdenv.lib; { + meta = with lib; { description = "The C based gRPC (C++, Python, Ruby, Objective-C, PHP, C#)"; license = licenses.asl20; maintainers = [ maintainers.lnl7 maintainers.marsam ]; diff --git a/pkgs/development/libraries/gsasl/default.nix b/pkgs/development/libraries/gsasl/default.nix index 4e22c38e9c8..9b6562b9891 100644 --- a/pkgs/development/libraries/gsasl/default.nix +++ b/pkgs/development/libraries/gsasl/default.nix @@ -1,11 +1,11 @@ -{ fetchurl, stdenv, libidn, kerberos }: +{ fetchurl, lib, stdenv, libidn, kerberos }: stdenv.mkDerivation rec { - name = "gsasl-1.8.0"; + name = "gsasl-1.10.0"; src = fetchurl { url = "mirror://gnu/gsasl/${name}.tar.gz"; - sha256 = "1rci64cxvcfr8xcjpqc4inpfq7aw4snnsbf5xz7d30nhvv8n40ii"; + sha256 = "sha256-hby9juYJWt54cCY6KOvLiDL1Qepzk5dUlJJgFcB1aNM="; }; buildInputs = [ libidn kerberos ]; @@ -28,9 +28,9 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.gnu.org/software/gsasl/"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ shlevy ]; - platforms = stdenv.lib.platforms.all; + maintainers = with lib.maintainers; [ shlevy ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix index 1032f15196c..318d07dfacc 100644 --- a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix +++ b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix @@ -1,6 +1,6 @@ -{ stdenv +{ lib, stdenv , fetchurl -, pkgconfig +, pkg-config , glib , gobject-introspection , meson @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { version = "3.38.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0rwcg9sd5rv7gjwapcd1jjk6l16w0p3j7wkicq1rdch4c0kch12p"; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { glib meson ninja - pkgconfig + pkg-config python3 ]; @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Collection of GSettings schemas for settings shared by various components of a desktop"; license = licenses.lgpl21Plus; maintainers = teams.gnome.members; diff --git a/pkgs/development/libraries/gsettings-qt/default.nix b/pkgs/development/libraries/gsettings-qt/default.nix index cbba9c5fcea..21b63875db6 100644 --- a/pkgs/development/libraries/gsettings-qt/default.nix +++ b/pkgs/development/libraries/gsettings-qt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, pkgconfig +{ lib, stdenv, fetchFromGitLab, pkg-config , qmake, qtbase, qtdeclarative, wrapQtAppsHook , glib, gobject-introspection , genericUpdater, common-updater-scripts @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config qmake gobject-introspection wrapQtAppsHook @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Library to access GSettings from Qt"; homepage = "https://gitlab.com/ubports/core/gsettings-qt"; license = licenses.lgpl3; diff --git a/pkgs/development/libraries/gsignond/default.nix b/pkgs/development/libraries/gsignond/default.nix index b0db776bd61..92123dbc3ea 100644 --- a/pkgs/development/libraries/gsignond/default.nix +++ b/pkgs/development/libraries/gsignond/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, glib, glib-networking +{ lib, stdenv, fetchFromGitLab, pkg-config, meson, ninja, glib, glib-networking , sqlite, gobject-introspection, vala, gtk-doc, libsecret, docbook_xsl , docbook_xml_dtd_43, docbook_xml_dtd_45, glibcLocales, makeWrapper , symlinkJoin, gsignondPlugins, plugins }: @@ -26,7 +26,7 @@ unwrapped = stdenv.mkDerivation rec { gtk-doc meson ninja - pkgconfig + pkg-config vala ]; @@ -50,7 +50,7 @@ unwrapped = stdenv.mkDerivation rec { ./plugin-load-env.patch ]; - meta = with stdenv.lib; { + meta = with lib; { description = "D-Bus service which performs user authentication on behalf of its clients"; homepage = "https://gitlab.com/accounts-sso/gsignond"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/gsignond/plugins/lastfm.nix b/pkgs/development/libraries/gsignond/plugins/lastfm.nix index b1a383ee591..a05069f205f 100644 --- a/pkgs/development/libraries/gsignond/plugins/lastfm.nix +++ b/pkgs/development/libraries/gsignond/plugins/lastfm.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, vala, glib, gsignond, json-glib, libsoup, gobject-introspection }: +{ lib, stdenv, fetchFromGitLab, pkg-config, meson, ninja, vala, glib, gsignond, json-glib, libsoup, gobject-introspection }: stdenv.mkDerivation { pname = "gsignond-plugin-lastfm"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { gobject-introspection meson ninja - pkgconfig + pkg-config vala ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation { PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins"; - meta = with stdenv.lib; { + meta = with lib; { description = "Plugin for the Accounts-SSO gSignOn daemon that handles Last.FM credentials"; homepage = "https://gitlab.com/accounts-sso/gsignond-plugin-lastfm"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/gsignond/plugins/mail.nix b/pkgs/development/libraries/gsignond/plugins/mail.nix index 4ac6e6a6f9f..8bce32f976a 100644 --- a/pkgs/development/libraries/gsignond/plugins/mail.nix +++ b/pkgs/development/libraries/gsignond/plugins/mail.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, vala, glib, gsignond, gobject-introspection }: +{ lib, stdenv, fetchFromGitLab, pkg-config, meson, ninja, vala, glib, gsignond, gobject-introspection }: stdenv.mkDerivation rec { pname = "gsignond-plugin-mail"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { gobject-introspection meson ninja - pkgconfig + pkg-config vala ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins"; - meta = with stdenv.lib; { + meta = with lib; { description = "Plugin for the Accounts-SSO gSignOn daemon that handles E-Mail credentials"; homepage = "https://gitlab.com/accounts-sso/gsignond-plugin-mail"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/gsignond/plugins/oauth.nix b/pkgs/development/libraries/gsignond/plugins/oauth.nix index b4b16a57af4..3bf3ab19464 100644 --- a/pkgs/development/libraries/gsignond/plugins/oauth.nix +++ b/pkgs/development/libraries/gsignond/plugins/oauth.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, glib, gsignond, check +{ lib, stdenv, fetchFromGitLab, pkg-config, meson, ninja, glib, gsignond, check , json-glib, libsoup, gnutls, gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45 , docbook_xsl, glibcLocales, gobject-introspection }: @@ -23,7 +23,7 @@ stdenv.mkDerivation { gtk-doc meson ninja - pkgconfig + pkg-config ]; buildInputs = [ @@ -38,7 +38,7 @@ stdenv.mkDerivation { PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins"; - meta = with stdenv.lib; { + meta = with lib; { description = "Plugin for the Accounts-SSO gSignOn daemon that handles the OAuth 1.0 and 2.0 authentication protocols"; homepage = "https://gitlab.com/accounts-sso/gsignond-plugin-oa"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/gsignond/plugins/sasl.nix b/pkgs/development/libraries/gsignond/plugins/sasl.nix index 1a1f34681ce..b73559f8a53 100644 --- a/pkgs/development/libraries/gsignond/plugins/sasl.nix +++ b/pkgs/development/libraries/gsignond/plugins/sasl.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, glib, gsignond, gsasl, check +{ lib, stdenv, fetchFromGitLab, pkg-config, meson, ninja, glib, gsignond, gsasl, check , gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45, docbook_xsl, glibcLocales, gobject-introspection }: stdenv.mkDerivation { @@ -22,7 +22,7 @@ stdenv.mkDerivation { gtk-doc meson ninja - pkgconfig + pkg-config ]; buildInputs = [ @@ -35,7 +35,7 @@ stdenv.mkDerivation { PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins"; - meta = with stdenv.lib; { + meta = with lib; { description = "Plugin for the Accounts-SSO gSignOn daemon that handles the SASL authentication protocol"; homepage = "https://gitlab.com/accounts-sso/gsignond-plugin-sasl"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix index 4a9208cff32..04c8bcbbbec 100644 --- a/pkgs/development/libraries/gsl/default.nix +++ b/pkgs/development/libraries/gsl/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv }: +{ fetchurl, lib, stdenv }: stdenv.mkDerivation rec { name = "gsl-2.6"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; # do not let -march=skylake to enable FMA (https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html) - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isx86_64 "-mno-fma"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isx86_64 "-mno-fma"; # https://lists.gnu.org/archive/html/bug-gsl/2015-11/msg00012.html doCheck = stdenv.hostPlatform.system != "i686-linux" && stdenv.hostPlatform.system != "aarch64-linux"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "The GNU Scientific Library, a large numerical library"; homepage = "https://www.gnu.org/software/gsl/"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; longDescription = '' The GNU Scientific Library (GSL) is a numerical library for C @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { fitting. There are over 1000 functions in total with an extensive test suite. ''; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/gsl/gsl-1_16.nix b/pkgs/development/libraries/gsl/gsl-1_16.nix index 9a31563c6cc..d2665187575 100644 --- a/pkgs/development/libraries/gsl/gsl-1_16.nix +++ b/pkgs/development/libraries/gsl/gsl-1_16.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, stdenv }: +{ fetchurl, fetchpatch, lib, stdenv }: stdenv.mkDerivation rec { name = "gsl-1.16"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; # do not let -march=skylake to enable FMA (https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html) - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isx86_64 "-mno-fma"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isx86_64 "-mno-fma"; patches = [ (fetchpatch { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "The GNU Scientific Library, a large numerical library"; homepage = "https://www.gnu.org/software/gsl/"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; longDescription = '' The GNU Scientific Library (GSL) is a numerical library for C @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { fitting. There are over 1000 functions in total with an extensive test suite. ''; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; # Failing "eigen" tests on aarch64. badPlatforms = [ "aarch64-linux" ]; }; diff --git a/pkgs/development/libraries/gsm/default.nix b/pkgs/development/libraries/gsm/default.nix index 7214aa6f6b9..13088dda0c9 100644 --- a/pkgs/development/libraries/gsm/default.nix +++ b/pkgs/development/libraries/gsm/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , # Compile statically (support for packages that look for the static object) staticSupport ? stdenv.hostPlatform.isStatic }: let inherit (stdenv) isDarwin; - inherit (stdenv.lib) optional optionalString; + inherit (lib) optional optionalString; in stdenv.mkDerivation rec { @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { parallelBuild = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Lossy speech compression codec"; homepage = "http://www.quut.com/gsm/"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/gsmlib/default.nix b/pkgs/development/libraries/gsmlib/default.nix index 88bec83e624..ec6646d98f5 100644 --- a/pkgs/development/libraries/gsmlib/default.nix +++ b/pkgs/development/libraries/gsmlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "gsmlib"; version = "unstable-2017-10-06"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "16v8aj914ac1ipf14a867ljib3gy7fhzd9ypxnsg9l0zi8mm3ml5"; }; nativeBuildInputs = [ autoreconfHook ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library to access GSM mobile phones through GSM modems"; homepage = "https://github.com/x-logLT/gsmlib"; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/gsoap/default.nix b/pkgs/development/libraries/gsoap/default.nix index 2614c50cca7..08b8146ac0a 100644 --- a/pkgs/development/libraries/gsoap/default.nix +++ b/pkgs/development/libraries/gsoap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, unzip, m4, bison, flex, openssl, zlib }: +{ lib, stdenv, fetchurl, autoreconfHook, unzip, m4, bison, flex, openssl, zlib }: let majorVersion = "2.8"; @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { --replace 'AM_INIT_AUTOMAKE([foreign])' 'AM_INIT_AUTOMAKE([foreign subdir-objects])' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "C/C++ toolkit for SOAP web services and XML-based applications"; homepage = "http://www.cs.fsu.edu/~engelen/soap.html"; # gsoap is dual/triple licensed (see homepage for details): diff --git a/pkgs/development/libraries/gsound/default.nix b/pkgs/development/libraries/gsound/default.nix index bae1b17e532..2a3e846d38d 100644 --- a/pkgs/development/libraries/gsound/default.nix +++ b/pkgs/development/libraries/gsound/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, pkgconfig, glib, vala, libcanberra, gobject-introspection, libtool, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, glib, vala, libcanberra, gobject-introspection, libtool, gnome3 }: stdenv.mkDerivation rec { pname = "gsound"; version = "1.0.2"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "bba8ff30eea815037e53bee727bbd5f0b6a2e74d452a7711b819a7c444e78e53"; }; - nativeBuildInputs = [ pkgconfig gobject-introspection libtool vala ]; + nativeBuildInputs = [ pkg-config gobject-introspection libtool vala ]; buildInputs = [ glib libcanberra ]; passthru = { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Projects/GSound"; description = "Small library for playing system sounds"; maintainers = teams.gnome.members; diff --git a/pkgs/development/libraries/gspell/default.nix b/pkgs/development/libraries/gspell/default.nix index 37e54c82595..890fcb98118 100644 --- a/pkgs/development/libraries/gspell/default.nix +++ b/pkgs/development/libraries/gspell/default.nix @@ -1,6 +1,6 @@ -{ stdenv +{ lib, stdenv , fetchurl -, pkgconfig +, pkg-config , libxml2 , glib , gtk3 @@ -19,12 +19,12 @@ stdenv.mkDerivation rec { outputBin = "dev"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1pdb4gbjrs8mk6r0ipw5vxyvzav1wvkjq46kiq53r3nyznfpdfyw"; }; nativeBuildInputs = [ - pkgconfig + pkg-config vala gobject-introspection libxml2 @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ - # required for pkgconfig + # required for pkg-config enchant2 ]; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A spell-checking library for GTK applications"; homepage = "https://wiki.gnome.org/Projects/gspell"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/gss/default.nix b/pkgs/development/libraries/gss/default.nix index 363e7ba7d10..ec4e54c339b 100644 --- a/pkgs/development/libraries/gss/default.nix +++ b/pkgs/development/libraries/gss/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , withShishi ? !stdenv.isDarwin, shishi ? null }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1syyvh3k659xf1hdv9pilnnhbbhs6vfapayp4xgdcc8mfgf9v4gz"; }; - buildInputs = stdenv.lib.optional withShishi shishi; + buildInputs = lib.optional withShishi shishi; configureFlags = [ "--${if withShishi != null then "enable" else "disable"}-kereberos5" @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { doCheck = true; # Fixup .la files - postInstall = stdenv.lib.optionalString withShishi '' + postInstall = lib.optionalString withShishi '' sed -i 's,\(-lshishi\),-L${shishi}/lib \1,' $out/lib/libgss.la ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.gnu.org/software/gss/"; description = "Generic Security Service"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix index 0a808b71a71..440caba2547 100644 --- a/pkgs/development/libraries/gssdp/default.nix +++ b/pkgs/development/libraries/gssdp/default.nix @@ -1,8 +1,8 @@ -{ stdenv +{ lib, stdenv , fetchurl , meson , ninja -, pkgconfig +, pkg-config , gobject-introspection , vala , gtk-doc @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { outputs = [ "out" "bin" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/gssdp/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gssdp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1s57i8a8wnnxnsfl27cq4503dkdlzbrhry5zpg23sfqfffvdqqx2"; }; nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gobject-introspection vala gtk-doc @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "GObject-based API for handling resource discovery and announcement over SSDP"; homepage = "http://www.gupnp.org/"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 49343e79c87..313a063cae8 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -1,11 +1,11 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , meson , ninja , gettext , config -, pkgconfig +, pkg-config , python3 , gst-plugins-base , orc @@ -86,7 +86,7 @@ assert faacSupport -> faac != null; let - inherit (stdenv.lib) optional optionals; + inherit (lib) optional optionals; in stdenv.mkDerivation rec { pname = "gst-plugins-bad"; version = "1.18.2"; @@ -105,7 +105,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config orc # for orcc python3 gettext @@ -293,7 +293,7 @@ in stdenv.mkDerivation rec { doCheck = false; # fails 20 out of 58 tests, expensive - meta = with stdenv.lib; { + meta = with lib; { description = "GStreamer Bad Plugins"; homepage = "https://gstreamer.freedesktop.org"; longDescription = '' diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 4728e49c516..bac59ac4c48 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchurl , lib -, pkgconfig +, pkg-config , meson , ninja , gettext @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config python3 gettext orc diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index 0d33d28196c..a5b4c0b827a 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -2,7 +2,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , gettext , gobject-introspection , bison @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gettext bison flex @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { "-Dexamples=disabled" # requires many dependencies and probably not useful for our users "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing ] ++ lib.optionals stdenv.isDarwin [ - # darwin.libunwind doesn't have pkgconfig definitions so meson doesn't detect it. + # darwin.libunwind doesn't have pkg-config definitions so meson doesn't detect it. "-Dlibunwind=disabled" "-Dlibdw=disabled" ]; diff --git a/pkgs/development/libraries/gstreamer/devtools/default.nix b/pkgs/development/libraries/gstreamer/devtools/default.nix index 6743a5ecd67..dc53a76bbca 100644 --- a/pkgs/development/libraries/gstreamer/devtools/default.nix +++ b/pkgs/development/libraries/gstreamer/devtools/default.nix @@ -1,8 +1,8 @@ -{ stdenv +{ lib, stdenv , fetchurl , meson , ninja -, pkgconfig +, pkg-config , gstreamer , gst-plugins-base , python3 @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gobject-introspection # documentation @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Integration testing infrastructure for the GStreamer framework"; homepage = "https://gstreamer.freedesktop.org"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index 75e065e6d2b..ebd5f83dd15 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -1,8 +1,8 @@ -{ stdenv +{ lib, stdenv , fetchurl , meson , ninja -, pkgconfig +, pkg-config , python3 , bash-completion , gst-plugins-base @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gettext gobject-introspection gst-devtools @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { scripts/extract-release-date-from-doap-file.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for creation of audio/video non-linear editors"; homepage = "https://gstreamer.freedesktop.org"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index d4c3b99c7ca..a032f5f5b5a 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -1,9 +1,9 @@ -{ stdenv +{ lib, stdenv , fetchurl , meson , nasm , ninja -, pkgconfig +, pkg-config , python3 , gst-plugins-base , orc @@ -47,7 +47,7 @@ assert gtkSupport -> gtk3 != null; assert raspiCameraSupport -> ((libraspberrypi != null) && stdenv.isLinux && stdenv.isAarch64); let - inherit (stdenv.lib) optionals; + inherit (lib) optionals; in stdenv.mkDerivation rec { pname = "gst-plugins-good"; @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config python3 meson ninja @@ -150,7 +150,7 @@ stdenv.mkDerivation rec { # fails 1 tests with "Unexpected critical/warning: g_object_set_is_valid_property: object class 'GstRtpStorage' has no property named ''" doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "GStreamer Good Plugins"; homepage = "https://gstreamer.freedesktop.org"; longDescription = '' diff --git a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix index 35c278da03b..2c683a84da4 100644 --- a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix +++ b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, pkgconfig, file, glibmm, gst_all_1, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, file, glibmm, gst_all_1, gnome3 }: stdenv.mkDerivation rec { pname = "gstreamermm"; version = "1.10.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0q4dx9sncqbwgpzma0zvj6zssc279yl80pn8irb95qypyyggwn5y"; }; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig file ]; + nativeBuildInputs = [ pkg-config file ]; propagatedBuildInputs = [ glibmm gst_all_1.gst-plugins-base ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ interface for GStreamer"; homepage = "https://gstreamer.freedesktop.org/bindings/cplusplus.html"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix index c75d439cd53..3175cff4aca 100644 --- a/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/pkgs/development/libraries/gstreamer/libav/default.nix @@ -3,7 +3,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , python3 , gst-plugins-base , gettext @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meson ninja gettext - pkgconfig + pkg-config python3 ]; diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix index 4167b172776..bcecd11ce2d 100644 --- a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix +++ b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix @@ -1,8 +1,8 @@ -{ stdenv +{ lib, stdenv , fetchurl , meson , ninja -, pkgconfig +, pkg-config , python3 , gettext , gobject-introspection @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ninja gettext gobject-introspection - pkgconfig + pkg-config python3 # documentation @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { scripts/extract-release-date-from-doap-file.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "GStreamer RTSP server"; homepage = "https://gstreamer.freedesktop.org"; longDescription = '' diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index 1cdc0a51930..8f35829ed38 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -2,7 +2,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , python3 , gst-plugins-base , orc @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meson ninja gettext - pkgconfig + pkg-config python3 ]; diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index 52a6cb27894..a90d21c28e8 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -1,8 +1,8 @@ -{ stdenv +{ lib, stdenv , fetchurl , meson , ninja -, pkgconfig +, pkg-config , gst-plugins-base , bzip2 , libva @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config bzip2 # documentation @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { scripts/extract-release-date-from-doap-file.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Set of VAAPI GStreamer Plug-ins"; homepage = "https://gstreamer.freedesktop.org"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/gtdialog/default.nix b/pkgs/development/libraries/gtdialog/default.nix index b848af6c318..0e467b29433 100644 --- a/pkgs/development/libraries/gtdialog/default.nix +++ b/pkgs/development/libraries/gtdialog/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cdk, unzip, gtk2, glib, ncurses, pkgconfig}: +{lib, stdenv, fetchurl, cdk, unzip, gtk2, glib, ncurses, pkg-config}: let s = # Generated upstream information rec { @@ -9,7 +9,7 @@ let url="https://foicica.com/gtdialog/download/gtdialog_1.4.zip"; sha256="1lhsaz56s8m838fi6vnfcd2r6djymvy3n2pbqhii88hraapq3rfk"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ cdk unzip gtk2 glib ncurses ]; @@ -23,10 +23,10 @@ stdenv.mkDerivation { makeFlags = ["PREFIX=$(out)"]; meta = { inherit (s) version; - description = ''Cross-platform helper for creating interactive dialogs''; - license = stdenv.lib.licenses.mit ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + description = "Cross-platform helper for creating interactive dialogs"; + license = lib.licenses.mit ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; homepage = "http://foicica.com/gtdialog"; downloadPage = "http://foicica.com/gtdialog/download"; }; diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/development/libraries/gtest/default.nix index 4e8ce95737d..d15ce77213c 100644 --- a/pkgs/development/libraries/gtest/default.nix +++ b/pkgs/development/libraries/gtest/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, ninja, fetchFromGitHub, fetchpatch }: +{ lib, stdenv, cmake, ninja, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { pname = "gtest"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Google's framework for writing C++ tests"; homepage = "https://github.com/google/googletest"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/gthree/default.nix b/pkgs/development/libraries/gthree/default.nix index 2da9847f3cb..990e151efe4 100644 --- a/pkgs/development/libraries/gthree/default.nix +++ b/pkgs/development/libraries/gthree/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch , ninja @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { "-Dexamples=false" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "GObject/GTK port of three.js"; homepage = "https://github.com/alexlarsson/gthree"; license = licenses.mit; diff --git a/pkgs/development/libraries/gtk-engine-bluecurve/default.nix b/pkgs/development/libraries/gtk-engine-bluecurve/default.nix index 99ca221f5ba..84920060c5e 100644 --- a/pkgs/development/libraries/gtk-engine-bluecurve/default.nix +++ b/pkgs/development/libraries/gtk-engine-bluecurve/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk2 }: +{ lib, stdenv, fetchurl, pkg-config, intltool, gtk2 }: stdenv.mkDerivation { name = "gtk-engine-bluecurve-1.0"; @@ -8,14 +8,14 @@ stdenv.mkDerivation { sha256 = "1nim3lhmbs5mw1hh76d9258c1p923854x2j6i30gmny812c7qjnm"; }; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkg-config intltool ]; buildInputs = [ gtk2 ]; meta = { description = "Original Bluecurve engine from Red Hat's artwork package"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.gnidorah ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.gnidorah ]; }; } diff --git a/pkgs/development/libraries/gtk-engine-murrine/default.nix b/pkgs/development/libraries/gtk-engine-murrine/default.nix index 9acb7b25a0d..8d40499fb62 100644 --- a/pkgs/development/libraries/gtk-engine-murrine/default.nix +++ b/pkgs/development/libraries/gtk-engine-murrine/default.nix @@ -1,21 +1,21 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk2 }: +{ lib, stdenv, fetchurl, pkg-config, intltool, gtk2 }: stdenv.mkDerivation rec { pname = "gtk-engine-murrine"; version = "0.98.2"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "129cs5bqw23i76h3nmc29c9mqkm9460iwc8vkl7hs4xr07h8mip9"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ intltool gtk2 ]; meta = { description = "A very flexible theme engine"; homepage = "https://gitlab.gnome.org/Archive/murrine"; - license = stdenv.lib.licenses.lgpl3; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.lgpl3; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/gtk-engines/default.nix b/pkgs/development/libraries/gtk-engines/default.nix index 2f56f6eb4c5..115547a72f7 100644 --- a/pkgs/development/libraries/gtk-engines/default.nix +++ b/pkgs/development/libraries/gtk-engines/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk2 }: +{ lib, stdenv, fetchurl, pkg-config, intltool, gtk2 }: stdenv.mkDerivation { name = "gtk-engines-2.20.2"; @@ -8,12 +8,12 @@ stdenv.mkDerivation { sha256 = "1db65pb0j0mijmswrvpgkdabilqd23x22d95hp5kwxvcramq1dhm"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ intltool gtk2 ]; meta = { description = "Theme engines for GTK 2"; - license = stdenv.lib.licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.lgpl21Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/gtk-layer-shell/default.nix b/pkgs/development/libraries/gtk-layer-shell/default.nix index 87f9698bec0..56693d24c7a 100644 --- a/pkgs/development/libraries/gtk-layer-shell/default.nix +++ b/pkgs/development/libraries/gtk-layer-shell/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , meson , ninja @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { pname = "gtk-layer-shell"; - version = "0.5.1"; + version = "0.5.2"; outputs = [ "out" "dev" "devdoc" ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { owner = "wmww"; repo = "gtk-layer-shell"; rev = "v${version}"; - sha256 = "1yfqfv3hn92cy9y5zgvz7qhq2ypill2z5857ki5snjimhjdz0cnw"; + sha256 = "sha256-516N45q5EZTq5eLCqH/T/VV/AxgBsQhJ+yZdLOEeDUk="; }; nativeBuildInputs = [ @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { "-Ddocs=true" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A library to create panels and other desktop components for Wayland using the Layer Shell protocol"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ eonpatapon ]; diff --git a/pkgs/development/libraries/gtk-mac-integration/default.nix b/pkgs/development/libraries/gtk-mac-integration/default.nix index 5cf62b319a6..f244a97edf2 100644 --- a/pkgs/development/libraries/gtk-mac-integration/default.nix +++ b/pkgs/development/libraries/gtk-mac-integration/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, autoreconfHook, pkgconfig, glib, gtk-doc, gtk, gobject-introspection }: +{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, glib, gtk-doc, gtk, gobject-introspection }: stdenv.mkDerivation rec { pname = "gtk-mac-integration"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1w0agv4r0daklv5d2f3l0c10krravjq8bj9hsdsrpka48dbnqmap"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig gtk-doc gobject-introspection ]; + nativeBuildInputs = [ autoreconfHook pkg-config gtk-doc gobject-introspection ]; buildInputs = [ glib ]; propagatedBuildInputs = [ gtk ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { gtkdocize ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Provides integration for GTK applications into the Mac desktop"; license = licenses.lgpl21; homepage = "https://wiki.gnome.org/Projects/GTK/OSX/Integration"; diff --git a/pkgs/development/libraries/gtk-sharp-beans/default.nix b/pkgs/development/libraries/gtk-sharp-beans/default.nix index 2b83a8ef52e..69ef71f1506 100644 --- a/pkgs/development/libraries/gtk-sharp-beans/default.nix +++ b/pkgs/development/libraries/gtk-sharp-beans/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, which, pkgconfig, mono, gtk-sharp-2_0, gio-sharp }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, which, pkg-config, mono, gtk-sharp-2_0, gio-sharp }: stdenv.mkDerivation rec { pname = "gtk-sharp-beans"; @@ -12,12 +12,12 @@ stdenv.mkDerivation rec { sha256 = "04sylwdllb6gazzs2m4jjfn14mil9l3cny2q0xf0zkhczzih6ah1"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook which ]; + nativeBuildInputs = [ pkg-config autoreconfHook which ]; buildInputs = [ mono gtk-sharp-2_0 gio-sharp ]; dontStrip = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Binds some API from GTK that isn't in GTK# 2.12.x"; platforms = platforms.linux; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/gtk-sharp/2.0.nix b/pkgs/development/libraries/gtk-sharp/2.0.nix index ed53105f758..1e7c8653065 100644 --- a/pkgs/development/libraries/gtk-sharp/2.0.nix +++ b/pkgs/development/libraries/gtk-sharp/2.0.nix @@ -1,7 +1,7 @@ { stdenv , lib , fetchFromGitHub -, pkgconfig +, pkg-config , mono , glib , pango @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { popd ''; - nativeBuildInputs = [ pkgconfig autoconf automake libtool which ]; + nativeBuildInputs = [ pkg-config autoconf automake libtool which ]; buildInputs = [ mono glib pango gtk2 GConf libglade libgnomecanvas @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { gtk = gtk2; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Graphical User Interface Toolkit for mono and .Net"; homepage = "https://www.mono-project.com/docs/gui/gtksharp"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/gtk-sharp/3.0.nix b/pkgs/development/libraries/gtk-sharp/3.0.nix index 49405c655e1..491656a0c68 100644 --- a/pkgs/development/libraries/gtk-sharp/3.0.nix +++ b/pkgs/development/libraries/gtk-sharp/3.0.nix @@ -1,7 +1,7 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch -, pkgconfig +, pkg-config , mono , glib , pango @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { builder = ./builder.sh; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "18n3l9zcldyvn4lwi8izd62307mkhz873039nl6awrv285qzah34"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ mono glib pango gtk3 GConf libglade libgnomecanvas libgtkhtml libgnomeui libgnomeprint libgnomeprintui gtkhtml libxml2 @@ -53,6 +53,6 @@ stdenv.mkDerivation rec { }; meta = { - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/gtk/2.x.nix b/pkgs/development/libraries/gtk/2.x.nix index be5f8521f9c..4304cb388d1 100644 --- a/pkgs/development/libraries/gtk/2.x.nix +++ b/pkgs/development/libraries/gtk/2.x.nix @@ -1,4 +1,4 @@ -{ config, stdenv, fetchurl, pkgconfig, gettext, glib, atk, pango, cairo, perl, xorg +{ config, lib, stdenv, fetchurl, pkg-config, gettext, glib, atk, pango, cairo, perl, xorg , gdk-pixbuf, xlibsWrapper, gobject-introspection , xineramaSupport ? stdenv.isLinux , cupsSupport ? config.gtk2.cups or stdenv.isLinux, cups ? null @@ -10,7 +10,7 @@ assert xineramaSupport -> xorg.libXinerama != null; assert cupsSupport -> cups != null; -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "gtk+"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ./hooks/drop-icon-theme-cache.sh ]; - nativeBuildInputs = setupHooks ++ [ perl pkgconfig gettext gobject-introspection ]; + nativeBuildInputs = setupHooks ++ [ perl pkg-config gettext gobject-introspection ]; patches = [ ./patches/2.0-immodules.cache.patch @@ -96,5 +96,6 @@ stdenv.mkDerivation rec { proprietary software with GTK without any license fees or royalties. ''; + changelog = "https://gitlab.gnome.org/GNOME/gtk/-/raw/${version}/NEWS"; }; } diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index 59685ca07cc..5180df63460 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -1,9 +1,9 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch -, pkgconfig +, pkg-config , gettext -, docbook_xsl +, docbook-xsl-nons , docbook_xml_dtd_43 , gtk-doc , meson @@ -48,13 +48,11 @@ assert cupsSupport -> cups != null; -with stdenv.lib; - stdenv.mkDerivation rec { pname = "gtk+3"; version = "3.24.24"; - outputs = [ "out" "dev" ] ++ optional withGtkDoc "devdoc"; + outputs = [ "out" "dev" ] ++ lib.optional withGtkDoc "devdoc"; outputBin = "dev"; setupHooks = [ @@ -63,18 +61,19 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz"; + url = "mirror://gnome/sources/gtk+/${lib.versions.majorMinor version}/gtk+-${version}.tar.xz"; sha256 = "12ipk1d376bai9v820qzhxba93kkh5abi6mhyqr4hwjvqmkl77fc"; }; patches = [ ./patches/3.0-immodules.cache.patch + (fetchpatch { name = "Xft-setting-fallback-compute-DPI-properly.patch"; url = "https://bug757142.bugzilla-attachments.gnome.org/attachment.cgi?id=344123"; sha256 = "0g6fhqcv8spfy3mfmxpyji93k8d4p4q4fz1v9a1c1cgcwkz41d7p"; }) - ] ++ optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ # X11 module requires <gio/gdesktopappinfo.h> which is not installed on Darwin # let’s drop that dependency in similar way to how other parts of the library do it # e.g. https://gitlab.gnome.org/GNOME/gtk/blob/3.24.4/gtk/gtk-launch.c#L31-33 @@ -82,47 +81,18 @@ stdenv.mkDerivation rec { ./patches/3.0-darwin-x11.patch ]; - separateDebugInfo = stdenv.isLinux; - - mesonFlags = [ - "-Dgtk_doc=${boolToString withGtkDoc}" - "-Dtests=false" - "-Dtracker3=${boolToString trackerSupport}" - "-Dbroadway_backend=${boolToString broadwaySupport}" - ]; - - # These are the defines that'd you'd get with --enable-debug=minimum (default). - # See: https://developer.gnome.org/gtk3/stable/gtk-building.html#extra-configuration-options - NIX_CFLAGS_COMPILE = "-DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS"; - - postPatch = '' - files=( - build-aux/meson/post-install.py - demos/gtk-demo/geninclude.py - gdk/broadway/gen-c-array.py - gdk/gen-gdk-gresources-xml.py - gtk/cursor/dnd-copy.png - gtk/gen-gtk-gresources-xml.py - gtk/gen-rc.py - gtk/gentypefuncs.py - ) - - chmod +x ''${files[@]} - patchShebangs ''${files[@]} - ''; - nativeBuildInputs = [ gettext gobject-introspection makeWrapper meson ninja - pkgconfig + pkg-config python3 sassc - ] ++ setupHooks ++ optionals withGtkDoc [ + ] ++ setupHooks ++ lib.optionals withGtkDoc [ docbook_xml_dtd_43 - docbook_xsl + docbook-xsl-nons gtk-doc # For xmllint libxml2 @@ -133,10 +103,12 @@ stdenv.mkDerivation rec { epoxy json-glib isocodes - ] - ++ optional stdenv.isDarwin AppKit - ++ optional trackerSupport tracker - ; + ] ++ lib.optionals stdenv.isDarwin [ + AppKit + ] ++ lib.optionals trackerSupport [ + tracker + ]; + #TODO: colord? propagatedBuildInputs = with xorg; [ at-spi2-atk @@ -155,17 +127,51 @@ stdenv.mkDerivation rec { libXrandr libXrender pango - ] - ++ optional stdenv.isDarwin Cocoa # explicitly propagated, always needed - ++ optionals waylandSupport [ mesa wayland wayland-protocols ] - ++ optional xineramaSupport libXinerama - ++ optional cupsSupport cups - ; - #TODO: colord? + ] ++ lib.optionals stdenv.isDarwin [ + # explicitly propagated, always needed + Cocoa + ] ++ lib.optionals waylandSupport [ + mesa + wayland + wayland-protocols + ] ++ lib.optionals xineramaSupport [ + libXinerama + ] ++ lib.optionals cupsSupport [ + cups + ]; + + mesonFlags = [ + "-Dgtk_doc=${lib.boolToString withGtkDoc}" + "-Dtests=false" + "-Dtracker3=${lib.boolToString trackerSupport}" + "-Dbroadway_backend=${lib.boolToString broadwaySupport}" + ]; doCheck = false; # needs X11 - postInstall = optionalString (!stdenv.isDarwin) '' + separateDebugInfo = stdenv.isLinux; + + # These are the defines that'd you'd get with --enable-debug=minimum (default). + # See: https://developer.gnome.org/gtk3/stable/gtk-building.html#extra-configuration-options + NIX_CFLAGS_COMPILE = "-DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS"; + + postPatch = '' + files=( + build-aux/meson/post-install.py + demos/gtk-demo/geninclude.py + gdk/broadway/gen-c-array.py + gdk/gen-gdk-gresources-xml.py + gtk/cursor/dnd-copy.png + gtk/gen-gtk-gresources-xml.py + gtk/gen-rc.py + gtk/gentypefuncs.py + ) + + chmod +x ''${files[@]} + patchShebangs ''${files[@]} + ''; + + postInstall = lib.optionalString (!stdenv.isDarwin) '' # The updater is needed for nixos env and it's tiny. moveToOutput bin/gtk-update-icon-cache "$out" # Launcher @@ -178,7 +184,7 @@ stdenv.mkDerivation rec { ''; # Wrap demos - postFixup = optionalString (!stdenv.isDarwin) '' + postFixup = lib.optionalString (!stdenv.isDarwin) '' demos=(gtk3-demo gtk3-demo-application gtk3-icon-browser gtk3-widget-factory) for program in ''${demos[@]}; do @@ -194,7 +200,7 @@ stdenv.mkDerivation rec { }; }; - meta = { + meta = with lib; { description = "A multi-platform toolkit for creating graphical user interfaces"; longDescription = '' GTK is a highly usable, feature rich toolkit for creating @@ -210,5 +216,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl2Plus; maintainers = with maintainers; [ raskin vcunat lethalman worldofpeace ]; platforms = platforms.all; + changelog = "https://gitlab.gnome.org/GNOME/gtk/-/raw/${version}/NEWS"; }; } diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix new file mode 100644 index 00000000000..59b0b080a52 --- /dev/null +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -0,0 +1,233 @@ +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, graphene +, docbook-xsl-nons +, docbook_xml_dtd_43 +, gtk-doc +, meson +, ninja +, python3 +, makeWrapper +, shared-mime-info +, isocodes +, glib +, cairo +, pango +, pandoc +, gdk-pixbuf +, gobject-introspection +, fribidi +, xorg +, epoxy +, json-glib +, libxkbcommon +, libxml2 +, librest +, libsoup +, ffmpeg +, gmp +, gnome3 +, gsettings-desktop-schemas +, gst_all_1 +, sassc +, trackerSupport ? stdenv.isLinux +, tracker +, x11Support ? stdenv.isLinux +, waylandSupport ? stdenv.isLinux +, mesa +, vulkan-loader +, vulkan-headers +, wayland +, wayland-protocols +, xineramaSupport ? stdenv.isLinux +, cupsSupport ? stdenv.isLinux +, withGtkDoc ? stdenv.isLinux +, cups ? null +, AppKit +, Cocoa +, broadwaySupport ? true +}: + +assert cupsSupport -> cups != null; + +stdenv.mkDerivation rec { + pname = "gtk4"; + version = "4.0.2"; + + outputs = [ "out" "dev" ] ++ lib.optional withGtkDoc "devdoc"; + outputBin = "dev"; + + setupHooks = [ + ./hooks/gtk4-clean-immodules-cache.sh + ./hooks/drop-icon-theme-cache.sh + ]; + + src = fetchurl { + url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz"; + sha256 = "115w3mzwm1xsi1q85qvwfm2yxpsjs2rcajgddzbnwhjicyn0frv2"; + }; + + nativeBuildInputs = [ + gettext + gobject-introspection + makeWrapper + meson + ninja + pkg-config + python3 + sassc + ] ++ setupHooks ++ lib.optionals withGtkDoc [ + pandoc + docbook_xml_dtd_43 + docbook-xsl-nons + gtk-doc + # For xmllint + libxml2 + ]; + + buildInputs = [ + libxkbcommon + epoxy + json-glib + isocodes + vulkan-headers + librest + libsoup + ffmpeg + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-bad + fribidi + ] ++ (with xorg; [ + libICE + libSM + libXcomposite + libXcursor + libXi + libXrandr + libXrender + ]) ++ lib.optionals stdenv.isDarwin [ + AppKit + ] ++ lib.optionals trackerSupport [ + tracker + ] ++ lib.optionals waylandSupport [ + mesa + wayland + wayland-protocols + ] ++ lib.optionals xineramaSupport [ + xorg.libXinerama + ] ++ lib.optionals cupsSupport [ + cups + ] ++ lib.optionals stdenv.isDarwin [ + Cocoa + ]; + #TODO: colord? + + propagatedBuildInputs = [ + # Required by pkg-config files. + cairo + gdk-pixbuf + glib + graphene + pango + vulkan-loader # TODO: Possibly not used on Darwin + + # Required for GSettings schemas at runtime. + # Will be picked up by wrapGAppsHook. + gsettings-desktop-schemas + ]; + + mesonFlags = [ + "-Dgtk_doc=${lib.boolToString withGtkDoc}" + "-Dtests=false" + "-Dtracker3=${lib.boolToString trackerSupport}" + "-Dbroadway_backend=${lib.boolToString broadwaySupport}" + ]; + + doCheck = false; # needs X11 + + separateDebugInfo = stdenv.isLinux; + + # These are the defines that'd you'd get with --enable-debug=minimum (default). + # See: https://developer.gnome.org/gtk3/stable/gtk-building.html#extra-configuration-options + NIX_CFLAGS_COMPILE = "-DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS"; + + postPatch = '' + files=( + build-aux/meson/post-install.py + demos/gtk-demo/geninclude.py + gdk/broadway/gen-c-array.py + gdk/gen-gdk-gresources-xml.py + gtk/gen-gtk-gresources-xml.py + gtk/gentypefuncs.py + docs/reference/gtk/gtk-markdown-to-docbook + ) + + chmod +x ''${files[@]} + patchShebangs ''${files[@]} + ''; + + postBuild = lib.optionalString withGtkDoc '' + # Meson not building `custom_target`s passed to `custom_files` argument of `gnome.gtkdoc` function + # as part of the `install` target. We have to build the docs manually first. + # https://github.com/mesonbuild/meson/issues/2831 + ninja g{t,d,s}k4-doc + ''; + + preInstall = '' + OLD_PATH="$PATH" + PATH="$PATH:$dev/bin" # so the install script finds gtk4-update-icon-cache + ''; + + postInstall = '' + PATH="$OLD_PATH" + '' + lib.optionalString (!stdenv.isDarwin) '' + # The updater is needed for nixos env and it's tiny. + moveToOutput bin/gtk4-update-icon-cache "$out" + # Launcher + moveToOutput bin/gtk-launch "$out" + + # TODO: patch glib directly + for f in $dev/bin/gtk4-encode-symbolic-svg; do + wrapProgram $f --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" + done + ''; + + # Wrap demos + postFixup = lib.optionalString (!stdenv.isDarwin) '' + demos=(gtk4-demo gtk4-demo-application gtk4-icon-browser gtk4-widget-factory) + + for program in ''${demos[@]}; do + wrapProgram $dev/bin/$program \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share/gsettings-schemas/${pname}-${version}" + done + ''; + + passthru = { + updateScript = gnome3.updateScript { + packageName = "gtk"; + attrPath = "gtk4"; + }; + }; + + meta = with lib; { + description = "A multi-platform toolkit for creating graphical user interfaces"; + longDescription = '' + 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, + but has bindings to many other popular programming languages + 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 + royalties. + ''; + homepage = "https://www.gtk.org/"; + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ raskin vcunat lethalman worldofpeace ]; + platforms = platforms.all; + changelog = "https://gitlab.gnome.org/GNOME/gtk/-/raw/${version}/NEWS"; + }; +} diff --git a/pkgs/development/libraries/gtk/hooks/gtk4-clean-immodules-cache.sh b/pkgs/development/libraries/gtk/hooks/gtk4-clean-immodules-cache.sh new file mode 100644 index 00000000000..49f7051aabb --- /dev/null +++ b/pkgs/development/libraries/gtk/hooks/gtk4-clean-immodules-cache.sh @@ -0,0 +1,11 @@ +# shellcheck shell=bash + +fixupOutputHooks+=(_gtk4CleanComments) + +# Clean comments that link to generator of the file +_gtk4CleanComments() { + local f="${prefix:?}/lib/gtk-4.0/4.0.0/immodules.cache" + if [ -f "$f" ]; then + sed 's|Created by .*bin/gtk-query-|Created by bin/gtk-query-|' -i "$f" + fi +} diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix index 5cef820db14..ccaceabd4e9 100644 --- a/pkgs/development/libraries/gtkd/default.nix +++ b/pkgs/development/libraries/gtkd/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchzip, fetchpatch, atk, cairo, dmd, gdk-pixbuf, gnome3, gst_all_1, librsvg -, glib, gtk3, gtksourceview4, libgda, libpeas, pango, pkgconfig, which, vte }: +{ lib, stdenv, fetchzip, fetchpatch, atk, cairo, dmd, gdk-pixbuf, gnome3, gst_all_1, librsvg +, glib, gtk3, gtksourceview4, libgda, libpeas, pango, pkg-config, which, vte }: let inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-bad; @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { stripRoot = false; }; - nativeBuildInputs = [ dmd pkgconfig which ]; + nativeBuildInputs = [ dmd pkg-config which ]; propagatedBuildInputs = [ atk cairo gdk-pixbuf glib gstreamer gst-plugins-base gtk3 gtksourceview4 libgda libpeas librsvg pango vte @@ -117,7 +117,7 @@ in stdenv.mkDerivation rec { makeFlags = [ "prefix=${placeholder "out"}" - "PKG_CONFIG=${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config" + "PKG_CONFIG=${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config" ]; # The .pc files does not declare an `includedir=`, so the multiple @@ -129,7 +129,7 @@ in stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "D binding and OO wrapper for GTK"; homepage = "https://gtkd.org"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/libraries/gtkdatabox/default.nix b/pkgs/development/libraries/gtkdatabox/default.nix index 54054270c3c..d7cca43841e 100644 --- a/pkgs/development/libraries/gtkdatabox/default.nix +++ b/pkgs/development/libraries/gtkdatabox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk2 }: +{ lib, stdenv, fetchurl, pkg-config, gtk2 }: stdenv.mkDerivation rec { name = "gtkdatabox-0.9.3.1"; @@ -8,15 +8,15 @@ stdenv.mkDerivation rec { sha256 = "1rdxnjgh6v3yjqgsfmamyzpfxckzchps4kqvvz88nifmd7ckhjfh"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ gtk2 ]; meta = { description = "GTK widget for displaying large amounts of numerical data"; - license = stdenv.lib.licenses.lgpl2; + license = lib.licenses.lgpl2; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/gtkimageview/default.nix b/pkgs/development/libraries/gtkimageview/default.nix index babcaa99334..438f7feab6c 100644 --- a/pkgs/development/libraries/gtkimageview/default.nix +++ b/pkgs/development/libraries/gtkimageview/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, gtk2 }: +{ fetchurl, lib, stdenv, pkg-config, gtk2 }: stdenv.mkDerivation rec { name = "gtkimageview-1.6.4"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1if3yh5z6nkv5wnkk0qyy9pkk03vn5rqbfk23q87kj39pqscgr37"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 ]; preConfigure = '' @@ -31,9 +31,9 @@ stdenv.mkDerivation rec { interpolation; GIF animation support. ''; - license = stdenv.lib.licenses.lgpl2Plus; + license = lib.licenses.lgpl2Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/gtkmathview/default.nix b/pkgs/development/libraries/gtkmathview/default.nix index 0c72f8501cc..b5399553f96 100644 --- a/pkgs/development/libraries/gtkmathview/default.nix +++ b/pkgs/development/libraries/gtkmathview/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, gtk2, t1lib, glib, libxml2, popt, gmetadom ? null }: +{lib, stdenv, fetchurl, pkg-config, gtk2, t1lib, glib, libxml2, popt, gmetadom ? null }: let pname = "gtkmathview"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { sha256 = "0hwcamf5fi35frg7q6kgisc9v0prqbhsplb2gl55cg3av9sh3hqx"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ t1lib glib gmetadom libxml2 popt]; propagatedBuildInputs = [gtk2 t1lib]; @@ -22,8 +22,8 @@ stdenv.mkDerivation { meta = { homepage = "http://helm.cs.unibo.it/mml-widget/"; description = "C++ rendering engine for MathML documents"; - license = stdenv.lib.licenses.lgpl3Plus; - maintainers = [ stdenv.lib.maintainers.roconnor ]; + license = lib.licenses.lgpl3Plus; + maintainers = [ lib.maintainers.roconnor ]; broken = true; }; } diff --git a/pkgs/development/libraries/gtkmm/2.x.nix b/pkgs/development/libraries/gtkmm/2.x.nix index 24262d263cb..521f4ca15f3 100644 --- a/pkgs/development/libraries/gtkmm/2.x.nix +++ b/pkgs/development/libraries/gtkmm/2.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, glibmm, cairomm, pangomm, atkmm }: +{ lib, stdenv, fetchurl, pkg-config, gtk2, glibmm, cairomm, pangomm, atkmm }: stdenv.mkDerivation rec { name = "gtkmm-${minVer}.5"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ glibmm gtk2 atkmm cairomm pangomm ]; @@ -34,9 +34,9 @@ stdenv.mkDerivation rec { homepage = "https://gtkmm.org/"; - license = stdenv.lib.licenses.lgpl2Plus; + license = lib.licenses.lgpl2Plus; - maintainers = with stdenv.lib.maintainers; [ raskin vcunat ]; - platforms = stdenv.lib.platforms.unix; + maintainers = with lib.maintainers; [ raskin vcunat ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix index 5794b2ddf46..4a31acd2ff6 100644 --- a/pkgs/development/libraries/gtkmm/3.x.nix +++ b/pkgs/development/libraries/gtkmm/3.x.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, glibmm, cairomm, pangomm, atkmm, epoxy, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, gtk3, glibmm, cairomm, pangomm, atkmm, epoxy, gnome3 }: stdenv.mkDerivation rec { pname = "gtkmm"; version = "3.24.2"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1hxdnhavjyvbcpxhd5z17l9fj4182028s66lc0s16qqqrldhjwbd"; }; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ epoxy ]; propagatedBuildInputs = [ glibmm gtk3 atkmm cairomm pangomm ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ interface to the GTK graphical user interface library"; longDescription = '' diff --git a/pkgs/development/libraries/gtksourceview/3.x.nix b/pkgs/development/libraries/gtksourceview/3.x.nix index d32a0eebf13..84a20154b13 100644 --- a/pkgs/development/libraries/gtksourceview/3.x.nix +++ b/pkgs/development/libraries/gtksourceview/3.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango, vala +{ lib, stdenv, fetchurl, pkg-config, atk, cairo, glib, gtk3, pango, vala , libxml2, perl, intltool, gettext, gobject-introspection, dbus, xvfb_run, shared-mime-info }: stdenv.mkDerivation rec { @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "3.24.11"; src = fetchurl { - url = "mirror://gnome/sources/gtksourceview/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gtksourceview/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1zbpj283b5ycz767hqz5kdq02wzsga65pp4fykvhg8xj6x50f6v9"; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig intltool perl gobject-introspection vala ]; + nativeBuildInputs = [ pkg-config intltool perl gobject-introspection vala ]; checkInputs = [ xvfb_run dbus ]; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { make check ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Projects/GtkSourceView"; platforms = with platforms; linux ++ darwin; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix index 2041e83fb0c..2d469c191e0 100644 --- a/pkgs/development/libraries/gtksourceview/4.x.nix +++ b/pkgs/development/libraries/gtksourceview/4.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango, fribidi, vala +{ lib, stdenv, fetchurl, pkg-config, atk, cairo, glib, gtk3, pango, fribidi, vala , libxml2, perl, gettext, gnome3, gobject-introspection, dbus, xvfb_run, shared-mime-info , meson, ninja }: @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "4.8.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "06jfbfbi73j9i3qsr7sxg3yl3643bn3aydbzx6xg3v8ca0hr3880"; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ meson ninja pkgconfig gettext perl gobject-introspection vala ]; + nativeBuildInputs = [ meson ninja pkg-config gettext perl gobject-introspection vala ]; checkInputs = [ xvfb_run dbus ]; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Projects/GtkSourceView"; platforms = with platforms; linux ++ darwin; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/gtksourceviewmm/4.x.nix b/pkgs/development/libraries/gtksourceviewmm/4.x.nix index 1607a581996..5e80f91abc1 100644 --- a/pkgs/development/libraries/gtksourceviewmm/4.x.nix +++ b/pkgs/development/libraries/gtksourceviewmm/4.x.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, pkgconfig, gtkmm3, glibmm, gtksourceview4, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, gtkmm3, glibmm, gtksourceview4, gnome3 }: stdenv.mkDerivation rec { pname = "gtksourceviewmm"; version = "3.91.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "088p2ch1b4fvzl9416nw3waj0pqgp31cd5zj4lx5hzzrq2afgapy"; }; @@ -16,10 +16,10 @@ stdenv.mkDerivation rec { }; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ glibmm gtkmm3 gtksourceview4 ]; - meta = with stdenv.lib; { + meta = with lib; { platforms = platforms.linux; homepage = "https://developer.gnome.org/gtksourceviewmm/"; description = "C++ wrapper for gtksourceview"; diff --git a/pkgs/development/libraries/gtksourceviewmm/default.nix b/pkgs/development/libraries/gtksourceviewmm/default.nix index 7bf510207ab..7ee6b656ead 100644 --- a/pkgs/development/libraries/gtksourceviewmm/default.nix +++ b/pkgs/development/libraries/gtksourceviewmm/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, pkgconfig, gtkmm3, glibmm, gtksourceview3, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, gtkmm3, glibmm, gtksourceview3, gnome3 }: stdenv.mkDerivation rec { pname = "gtksourceviewmm"; version = "3.21.3"; src = fetchurl { - url = "mirror://gnome/sources/gtksourceviewmm/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gtksourceviewmm/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1danc9mp5mnb65j01qxkwj92z8jf1gns41wbgp17qh7050f0pc6v"; }; @@ -16,10 +16,10 @@ stdenv.mkDerivation rec { }; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glibmm gtkmm3 gtksourceview3 ]; - meta = with stdenv.lib; { + meta = with lib; { platforms = platforms.linux; homepage = "https://developer.gnome.org/gtksourceviewmm/"; description = "C++ wrapper for gtksourceview"; diff --git a/pkgs/development/libraries/gtkspell/3.nix b/pkgs/development/libraries/gtkspell/3.nix index 707acfcd382..d3a1a178856 100644 --- a/pkgs/development/libraries/gtkspell/3.nix +++ b/pkgs/development/libraries/gtkspell/3.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gtk3, aspell, pkgconfig, enchant, isocodes, intltool, gobject-introspection, vala}: +{lib, stdenv, fetchurl, gtk3, aspell, pkg-config, enchant, isocodes, intltool, gobject-introspection, vala}: stdenv.mkDerivation rec { pname = "gtkspell"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0cjp6xdcnzh6kka42w9g0w2ihqjlq8yl8hjm9wsfnixk6qwgch5h"; }; - nativeBuildInputs = [ pkgconfig intltool gobject-introspection vala ]; + nativeBuildInputs = [ pkg-config intltool gobject-introspection vala ]; buildInputs = [ aspell gtk3 enchant isocodes ]; propagatedBuildInputs = [ enchant ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { "--enable-vala" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://gtkspell.sourceforge.net/"; description = "Word-processor-style highlighting GtkTextView widget"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/gtkspell/default.nix b/pkgs/development/libraries/gtkspell/default.nix index b6ee2c6825d..78d9956d30a 100644 --- a/pkgs/development/libraries/gtkspell/default.nix +++ b/pkgs/development/libraries/gtkspell/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gtk2, aspell, pkgconfig, enchant, intltool}: +{lib, stdenv, fetchurl, gtk2, aspell, pkg-config, enchant, intltool}: stdenv.mkDerivation { name = "gtkspell-2.0.16"; @@ -8,10 +8,10 @@ stdenv.mkDerivation { sha256 = "00hdv28bp72kg1mq2jdz1sdw2b8mb9iclsp7jdqwpck705bdriwg"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [aspell gtk2 enchant intltool]; - meta = with stdenv.lib; { + meta = with lib; { description = "Word-processor-style highlighting and replacement of misspelled words"; homepage = "http://gtkspell.sourceforge.net"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/gtkspellmm/default.nix b/pkgs/development/libraries/gtkspellmm/default.nix index b3bca9bd7b6..31380b5ab79 100644 --- a/pkgs/development/libraries/gtkspellmm/default.nix +++ b/pkgs/development/libraries/gtkspellmm/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl -, pkgconfig +{ lib, stdenv, fetchurl +, pkg-config , gtk3, glib, glibmm, gtkmm3, gtkspell3 }: @@ -17,12 +17,12 @@ stdenv.mkDerivation rec { gtkspell3 ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk3 glib glibmm gtkmm3 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ binding for the gtkspell library"; homepage = "http://gtkspell.sourceforge.net/"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/gts/default.nix b/pkgs/development/libraries/gts/default.nix index 48bdfc9b5e1..815dfb634c9 100644 --- a/pkgs/development/libraries/gts/default.nix +++ b/pkgs/development/libraries/gts/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, autoreconfHook, gettext, glib, buildPackages }: +{ fetchurl, lib, stdenv, pkg-config, autoreconfHook, gettext, glib, buildPackages }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config autoreconfHook glib # required to satisfy AM_PATH_GLIB_2_0 ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails with "permission denied" - preBuild = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + preBuild = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' pushd src make CC=${buildPackages.stdenv.cc}/bin/cc predicates_init mv predicates_init predicates_init_build @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://gts.sourceforge.net/"; - license = stdenv.lib.licenses.lgpl2Plus; + license = lib.licenses.lgpl2Plus; description = "GNU Triangulated Surface Library"; longDescription = '' @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { 3D surfaces meshed with interconnected triangles. ''; - maintainers = [ stdenv.lib.maintainers.viric ]; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + maintainers = [ lib.maintainers.viric ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/development/libraries/gumbo/default.nix b/pkgs/development/libraries/gumbo/default.nix index e8035d8b1cf..91053828b58 100644 --- a/pkgs/development/libraries/gumbo/default.nix +++ b/pkgs/development/libraries/gumbo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool }: stdenv.mkDerivation rec { pname = "gumbo"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; - meta = with stdenv.lib; { + meta = with lib; { description = "C99 HTML parsing algorithm"; homepage = "https://github.com/google/gumbo-parser"; maintainers = [ maintainers.nico202 ]; diff --git a/pkgs/development/libraries/gupnp-av/default.nix b/pkgs/development/libraries/gupnp-av/default.nix index 80fb9e3afff..9bf39d94aed 100644 --- a/pkgs/development/libraries/gupnp-av/default.nix +++ b/pkgs/development/libraries/gupnp-av/default.nix @@ -1,6 +1,6 @@ -{ stdenv +{ lib, stdenv , fetchurl -, pkgconfig +, pkg-config , gobject-introspection , vala , gtk-doc @@ -18,12 +18,12 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1p3grslwqm9bc8rmpn4l48d7v9s84nina4r9xbd932dbj8acz7b8"; }; nativeBuildInputs = [ - pkgconfig + pkg-config gobject-introspection vala gtk-doc @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://gupnp.org/"; description = "A collection of helpers for building AV (audio/video) applications using GUPnP"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/gupnp-dlna/default.nix b/pkgs/development/libraries/gupnp-dlna/default.nix index 8fc001de3d5..e11d86f82e1 100644 --- a/pkgs/development/libraries/gupnp-dlna/default.nix +++ b/pkgs/development/libraries/gupnp-dlna/default.nix @@ -1,6 +1,6 @@ -{ stdenv +{ lib, stdenv , fetchurl -, pkgconfig +, pkg-config , gobject-introspection , vala , gtk-doc @@ -18,12 +18,12 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0spzd2saax7w776p5laixdam6d7smyynr9qszhbmq7f14y13cghj"; }; nativeBuildInputs = [ - pkgconfig + pkg-config gobject-introspection vala gtk-doc @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Projects/GUPnP/"; description = "Library to ease DLNA-related bits for applications using GUPnP"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/gupnp-igd/default.nix b/pkgs/development/libraries/gupnp-igd/default.nix index a8ed1f7cadd..2dad33949f3 100644 --- a/pkgs/development/libraries/gupnp-igd/default.nix +++ b/pkgs/development/libraries/gupnp-igd/default.nix @@ -1,8 +1,8 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , autoreconfHook -, pkgconfig +, pkg-config , gettext , gobject-introspection , gtk-doc @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "081v1vhkbz3wayv49xfiskvrmvnpx93k25am2wnarg5cifiiljlb"; }; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config autoreconfHook gettext gobject-introspection @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Library to handle UPnP IGD port mapping"; homepage = "http://www.gupnp.org/"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix index 153eb681d63..fe3463eeff2 100644 --- a/pkgs/development/libraries/gupnp/default.nix +++ b/pkgs/development/libraries/gupnp/default.nix @@ -1,9 +1,9 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , meson , ninja -, pkgconfig +, pkg-config , gobject-introspection , vala , gtk-doc @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/gupnp/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0911lv1bivsyv9wwdxm0i1w4r89j0vyyqp200gsfdnzk6v1a4x7x"; }; @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gobject-introspection vala gtk-doc @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.gupnp.org/"; description = "An implementation of the UPnP specification"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/gusb/default.nix b/pkgs/development/libraries/gusb/default.nix index a2e15769145..c3ae6faecfd 100644 --- a/pkgs/development/libraries/gusb/default.nix +++ b/pkgs/development/libraries/gusb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gobject-introspection +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gettext, gobject-introspection , gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_44, python3 , glib, systemd, libusb1, vala, hwdata }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - meson ninja pkgconfig gettext pythonEnv + meson ninja pkg-config gettext pythonEnv gtk-doc docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_44 gobject-introspection vala ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { doCheck = false; # tests try to access USB - meta = with stdenv.lib; { + meta = with lib; { description = "GLib libusb wrapper"; homepage = "https://github.com/hughsie/libgusb"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index f79ffa579c8..2c9bac002fd 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -1,8 +1,8 @@ -{ stdenv +{ lib, stdenv , fetchurl , meson , ninja -, pkgconfig +, pkg-config , gettext , dbus , glib @@ -41,11 +41,11 @@ stdenv.mkDerivation rec { pname = "gvfs"; - version = "1.46.1"; + version = "1.46.2"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "00r56kp8dhdn1ypyap66klymlwlh646n4f1ri797w2x6p70sc7k2"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "2D+hYChmcMA+uJAkBgbYr6fqajqBjorRfu7Y2XZIe9c="; }; postPatch = '' @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { meson ninja python3 - pkgconfig + pkg-config gettext wrapGAppsHook libxml2 @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { openssh gsettings-desktop-schemas # TODO: a ligther version of libsoup to have FTP/HTTP support? - ] ++ stdenv.lib.optionals gnomeSupport [ + ] ++ lib.optionals gnomeSupport [ gnome3.libsoup gcr glib-networking # TLS support @@ -102,13 +102,13 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user" "-Dtmpfilesdir=no" - ] ++ stdenv.lib.optionals (!gnomeSupport) [ + ] ++ lib.optionals (!gnomeSupport) [ "-Dgcr=false" "-Dgoa=false" "-Dkeyring=false" "-Dhttp=false" "-Dgoogle=false" - ] ++ stdenv.lib.optionals (samba == null) [ + ] ++ lib.optionals (samba == null) [ # Xfce don't want samba "-Dsmb=false" ]; @@ -122,7 +122,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Virtual Filesystem support library" + optionalString gnomeSupport " (full GNOME support)"; license = licenses.lgpl2Plus; platforms = platforms.linux; diff --git a/pkgs/development/libraries/half/default.nix b/pkgs/development/libraries/half/default.nix index b0f4c3a0e9e..5232dfa5123 100644 --- a/pkgs/development/libraries/half/default.nix +++ b/pkgs/development/libraries/half/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: stdenv.mkDerivation rec { version = "2.1.0"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cp $src/{ChangeLog,LICENSE,README}.txt $out/share/doc/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ library for half precision floating point arithmetics"; platforms = platforms.all; license = licenses.mit; diff --git a/pkgs/development/libraries/hamlib/default.nix b/pkgs/development/libraries/hamlib/default.nix index 8ef8b55be52..98b49461005 100644 --- a/pkgs/development/libraries/hamlib/default.nix +++ b/pkgs/development/libraries/hamlib/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, perl, python2, swig, gd, libxml2, tcl, libusb-compat-0_1, pkgconfig, +{lib, stdenv, fetchurl, perl, python2, swig, gd, libxml2, tcl, libusb-compat-0_1, pkg-config, boost, libtool, perlPackages }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ perl perlPackages.ExtUtilsMakeMaker python2 swig gd libxml2 - tcl libusb-compat-0_1 pkgconfig boost libtool ]; + tcl libusb-compat-0_1 pkg-config boost libtool ]; configureFlags = [ "--with-perl-binding" "--with-python-binding" "--with-tcl-binding" "--with-rigmatrix" ]; @@ -26,9 +26,9 @@ stdenv.mkDerivation rec { which lets one control a radio transceiver or receiver, either from command line interface or in a text-oriented interactive interface. ''; - license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ]; + license = with lib.licenses; [ gpl2Plus lgpl2Plus ]; homepage = "http://hamlib.sourceforge.net"; - maintainers = with stdenv.lib.maintainers; [ relrod ]; - platforms = with stdenv.lib.platforms; unix; + maintainers = with lib.maintainers; [ relrod ]; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 6c5703f521d..b3615893b53 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, glib, freetype, cairo, libintl +{ lib, stdenv, fetchFromGitHub, pkg-config, glib, freetype, cairo, libintl , meson, ninja , gobject-introspection , icu, graphite2, harfbuzz # The icu variant uses and propagates the non-icu one. @@ -12,7 +12,7 @@ let version = "2.7.2"; - inherit (stdenv.lib) optional optionals optionalString; + inherit (lib) optional optionals optionalString; mesonFeatureFlag = opt: b: "-D${opt}=${if b then "enabled" else "disabled"}"; in @@ -30,7 +30,7 @@ stdenv.mkDerivation { postPatch = '' patchShebangs src/*.py patchShebangs test - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' # ApplicationServices.framework headers have cast-align warnings. substituteInPlace src/hb.hh \ --replace '#pragma GCC diagnostic error "-Wcast-align"' "" @@ -50,7 +50,7 @@ stdenv.mkDerivation { ninja gobject-introspection libintl - pkgconfig + pkg-config python3 gtk-doc docbook-xsl-nons @@ -58,7 +58,7 @@ stdenv.mkDerivation { ]; buildInputs = [ glib freetype cairo ] # recommended by upstream - ++ stdenv.lib.optionals withCoreText [ ApplicationServices CoreText ]; + ++ lib.optionals withCoreText [ ApplicationServices CoreText ]; propagatedBuildInputs = [] ++ optional withGraphite2 graphite2 @@ -77,7 +77,7 @@ stdenv.mkDerivation { ''} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An OpenType text shaping engine"; homepage = "https://harfbuzz.github.io/"; maintainers = [ maintainers.eelco ]; diff --git a/pkgs/development/libraries/hawknl/default.nix b/pkgs/development/libraries/hawknl/default.nix index e9d5d5d9731..0525fcd0eba 100644 --- a/pkgs/development/libraries/hawknl/default.nix +++ b/pkgs/development/libraries/hawknl/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip}: +{lib, stdenv, fetchurl, unzip}: stdenv.mkDerivation { name = "hawknl-1.68"; @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { homepage = "http://hawksoft.com/hawknl/"; description = "Free, open source, game oriented network API"; - license = stdenv.lib.licenses.lgpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.lgpl2Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/hdf5-blosc/blosc_filter.pc.in b/pkgs/development/libraries/hdf5-blosc/blosc_filter.pc.in new file mode 100644 index 00000000000..04e29515d9b --- /dev/null +++ b/pkgs/development/libraries/hdf5-blosc/blosc_filter.pc.in @@ -0,0 +1,13 @@ +prefix=@out@ +includedir=${prefix}/include +libdir=${prefix}/lib + +Name: blosc_filter +Description: Blosc Filter +URL: http://blosc.org/ +Version: @version@ +Requires: \ + blosc \ + hdf5 +Cflags: -isystem${includedir} +Libs: -L${libdir} -Wl,-rpath,${libdir} -lblosc_filter diff --git a/pkgs/development/libraries/hdf5-blosc/default.nix b/pkgs/development/libraries/hdf5-blosc/default.nix new file mode 100644 index 00000000000..985660ff907 --- /dev/null +++ b/pkgs/development/libraries/hdf5-blosc/default.nix @@ -0,0 +1,40 @@ +{ lib, stdenv, c-blosc, cmake, hdf5, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "hdf5-blosc"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "Blosc"; + repo = pname; + rev = "v${version}"; + sha256 = "1nj2bm1v6ymm3fmyvhbn6ih5fgdiapavlfghh1pvbmhw71cysyqs"; + }; + + patches = [ ./no-external-blosc.patch ]; + + outputs = [ "out" "dev" "plugin" ]; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ c-blosc hdf5 ]; + + preConfigure = '' + substituteInPlace CMakeLists.txt --replace 'set(BLOSC_INSTALL_DIR "''${CMAKE_CURRENT_BINARY_DIR}/blosc")' 'set(BLOSC_INSTALL_DIR "${c-blosc}")' + ''; + + cmakeFlags = [ + "-DPLUGIN_INSTALL_PATH=${placeholder "plugin"}/hdf5/lib/plugin" + ]; + + postInstall = '' + mkdir -p $out/lib/pkgconfig + substituteAll ${./blosc_filter.pc.in} $out/lib/pkgconfig/blosc_filter.pc + ''; + + meta = with lib; { + description = "Filter for HDF5 that uses the Blosc compressor"; + homepage = "https://github.com/Blosc/hdf5-blosc"; + license = licenses.mit; + maintainers = with maintainers; [ bhipple ]; + }; +} diff --git a/pkgs/development/libraries/hdf5-blosc/no-external-blosc.patch b/pkgs/development/libraries/hdf5-blosc/no-external-blosc.patch new file mode 100644 index 00000000000..8f2bd8579ed --- /dev/null +++ b/pkgs/development/libraries/hdf5-blosc/no-external-blosc.patch @@ -0,0 +1,26 @@ +--- a/CMakeLists.txt 2019-10-11 12:12:27.445417039 -0400 ++++ b/CMakeLists.txt 2019-10-11 12:27:26.630691742 -0400 +@@ -22,14 +22,6 @@ + message("BLOSC_CMAKE_ARGS='${BLOSC_CMAKE_ARGS}'") + message("GIT_EXECUTABLE='${GIT_EXECUTABLE}'") + +-ExternalProject_Add(project_blosc +- PREFIX ${BLOSC_PREFIX} +- GIT_REPOSITORY https://github.com/Blosc/c-blosc.git +- INSTALL_DIR ${BLOSC_INSTALL_DIR} +- CMAKE_ARGS ${BLOSC_CMAKE_ARGS} +-) +- +- + # sources + set(SOURCES src/blosc_filter.c) + set(PLUGIN_SOURCES src/blosc_filter.c src/blosc_plugin.c ) +@@ -53,7 +45,6 @@ + # add blosc libraries + add_library(blosc_shared SHARED IMPORTED) + set_property(TARGET blosc_shared PROPERTY IMPORTED_LOCATION ${BLOSC_INSTALL_DIR}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}blosc${CMAKE_SHARED_LIBRARY_SUFFIX}) +-add_dependencies(blosc_shared project_blosc) + include_directories(${BLOSC_INSTALL_DIR}/include) + + add_library(blosc_filter_shared SHARED ${SOURCES}) + diff --git a/pkgs/development/libraries/hidapi/default.nix b/pkgs/development/libraries/hidapi/default.nix index c42a3528223..6a3665809b4 100644 --- a/pkgs/development/libraries/hidapi/default.nix +++ b/pkgs/development/libraries/hidapi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, udev, libusb1 +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, udev, libusb1 , darwin }: stdenv.mkDerivation rec { @@ -12,16 +12,16 @@ stdenv.mkDerivation rec { sha256 = "1nr4z4b10vpbh3ss525r7spz4i43zim2ba5qzfl15dgdxshxxivb"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ ] - ++ stdenv.lib.optionals stdenv.isLinux [ libusb1 udev ]; + ++ lib.optionals stdenv.isLinux [ libusb1 udev ]; enableParallelBuilding = true; - propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ IOKit Cocoa ]); + propagatedBuildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ IOKit Cocoa ]); - meta = with stdenv.lib; { + meta = with lib; { description = "Library for communicating with USB and Bluetooth HID devices"; homepage = "https://github.com/libusb/hidapi"; maintainers = with maintainers; [ prusnak ]; diff --git a/pkgs/development/libraries/highfive/default.nix b/pkgs/development/libraries/highfive/default.nix index c514a44f851..a9db80468ee 100644 --- a/pkgs/development/libraries/highfive/default.nix +++ b/pkgs/development/libraries/highfive/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , boost @@ -36,9 +36,9 @@ stdenv.mkDerivation rec { "-DHIGHFIVE_UNIT_TESTS=OFF" "-DHIGHFIVE_USE_INSTALL_DEPS=ON" ] - ++ (stdenv.lib.optionals mpiSupport [ "-DHIGHFIVE_PARALLEL_HDF5=ON" ]); + ++ (lib.optionals mpiSupport [ "-DHIGHFIVE_PARALLEL_HDF5=ON" ]); - meta = with stdenv.lib; { + meta = with lib; { inherit version; description = "Header-only C++ HDF5 interface"; license = licenses.boost; diff --git a/pkgs/development/libraries/hiredis/default.nix b/pkgs/development/libraries/hiredis/default.nix index 2f7fe184845..d4998b51592 100644 --- a/pkgs/development/libraries/hiredis/default.nix +++ b/pkgs/development/libraries/hiredis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "hiredis"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { PREFIX = "\${out}"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/redis/hiredis"; description = "Minimalistic C client for Redis >= 1.2"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/hivex/default.nix b/pkgs/development/libraries/hivex/default.nix index ee22726414a..fb77e08ca6b 100644 --- a/pkgs/development/libraries/hivex/default.nix +++ b/pkgs/development/libraries/hivex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, autoreconfHook, makeWrapper +{ lib, stdenv, fetchurl, pkg-config, autoreconfHook, makeWrapper , perlPackages, libxml2, libiconv }: stdenv.mkDerivation rec { @@ -12,12 +12,12 @@ stdenv.mkDerivation rec { patches = [ ./hivex-syms.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoreconfHook makeWrapper libxml2 ] ++ (with perlPackages; [ perl IOStringy ]) - ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; + ++ lib.optionals stdenv.isDarwin [ libiconv ]; postInstall = '' wrapProgram $out/bin/hivexregedit \ @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { --prefix "PATH" : "$out/bin" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Windows registry hive extraction library"; license = licenses.lgpl2; homepage = "https://github.com/libguestfs/hivex"; diff --git a/pkgs/development/libraries/hotpatch/default.nix b/pkgs/development/libraries/hotpatch/default.nix index f8211b89d77..9857f9f281c 100644 --- a/pkgs/development/libraries/hotpatch/default.nix +++ b/pkgs/development/libraries/hotpatch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { name = "hotpatch-0.2"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { LD_LIBRARY_PATH=$(pwd)/src make test ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Hot patching executables on Linux using .so file injection"; homepage = src.meta.homepage; license = licenses.bsd3; diff --git a/pkgs/development/libraries/howard-hinnant-date/default.nix b/pkgs/development/libraries/howard-hinnant-date/default.nix index df6e4329388..2611203a389 100644 --- a/pkgs/development/libraries/howard-hinnant-date/default.nix +++ b/pkgs/development/libraries/howard-hinnant-date/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, curl, tzdata, fetchpatch, substituteAll }: +{ lib, stdenv, fetchFromGitHub, cmake, curl, tzdata, fetchpatch, substituteAll }: stdenv.mkDerivation rec { pname = "howard-hinnant-date-unstable"; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - meta = with stdenv.lib; { + meta = with lib; { license = licenses.mit; description = "A date and time library based on the C++11/14/17 <chrono> header"; homepage = "https://github.com/HowardHinnant/date"; diff --git a/pkgs/development/libraries/hpx/default.nix b/pkgs/development/libraries/hpx/default.nix index f83d0aff32e..329fa99fa1c 100644 --- a/pkgs/development/libraries/hpx/default.nix +++ b/pkgs/development/libraries/hpx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, boost, cmake, hwloc, gperftools, pkg-config, python }: +{ lib, stdenv, fetchFromGitHub, boost, cmake, hwloc, gperftools, pkg-config, python }: stdenv.mkDerivation rec { pname = "hpx"; @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { meta = { description = "C++ standard library for concurrency and parallelism"; homepage = "https://github.com/STEllAR-GROUP/hpx"; - license = stdenv.lib.licenses.boost; - platforms = [ "x86_64-linux" ]; # stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ bobakker ]; + license = lib.licenses.boost; + platforms = [ "x86_64-linux" ]; # lib.platforms.linux; + maintainers = with lib.maintainers; [ bobakker ]; }; } diff --git a/pkgs/development/libraries/hspell/default.nix b/pkgs/development/libraries/hspell/default.nix index 8501bf88b6d..2a65afad809 100644 --- a/pkgs/development/libraries/hspell/default.nix +++ b/pkgs/development/libraries/hspell/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, zlib }: +{ lib, stdenv, fetchurl, perl, zlib, buildPackages }: stdenv.mkDerivation rec { name = "${passthru.pname}-${passthru.version}"; @@ -15,10 +15,21 @@ stdenv.mkDerivation rec { sha256 = "08x7rigq5pa1pfpl30qp353hbdkpadr1zc49slpczhsn0sg36pd6"; }; - patchPhase = ''patchShebangs .''; - buildInputs = [ perl zlib ]; + patchPhase = "patchShebangs ."; + preBuild = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + make CC=${buildPackages.stdenv.cc}/bin/cc find_sizes + mv find_sizes find_sizes_build + make clean - meta = with stdenv.lib; { + substituteInPlace Makefile --replace "./find_sizes" "./find_sizes_build" + substituteInPlace Makefile --replace "ar cr" "${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar cr" + substituteInPlace Makefile --replace "ranlib" "${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib" + substituteInPlace Makefile --replace "STRIP=strip" "STRIP=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}strip" + ''; + nativeBuildInputs = [ perl zlib ]; +# buildInputs = [ zlib ]; + + meta = with lib; { description = "Hebrew spell checker"; homepage = "http://hspell.ivrix.org.il/"; platforms = platforms.all; diff --git a/pkgs/development/libraries/htmlcxx/default.nix b/pkgs/development/libraries/htmlcxx/default.nix index ed3171da90f..286834112f2 100644 --- a/pkgs/development/libraries/htmlcxx/default.nix +++ b/pkgs/development/libraries/htmlcxx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "htmlcxx"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { patches = [ ./ptrdiff.patch ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://htmlcxx.sourceforge.net/"; description = "A simple non-validating css1 and html parser for C++"; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/development/libraries/http-parser/default.nix index 203fcaa19ec..9d1d23ede8b 100644 --- a/pkgs/development/libraries/http-parser/default.nix +++ b/pkgs/development/libraries/http-parser/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: let version = "2.9.4"; @@ -20,7 +20,7 @@ in stdenv.mkDerivation { doCheck = true; checkTarget = "test"; - meta = with stdenv.lib; { + meta = with lib; { description = "An HTTP message parser written in C"; homepage = "https://github.com/nodejs/http-parser"; maintainers = with maintainers; [ matthewbauer ]; diff --git a/pkgs/development/libraries/hunspell/default.nix b/pkgs/development/libraries/hunspell/default.nix index 20acc49bb83..fe4fc1e6d33 100644 --- a/pkgs/development/libraries/hunspell/default.nix +++ b/pkgs/development/libraries/hunspell/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, ncurses, readline, autoreconfHook }: +{ lib, stdenv, fetchurl, fetchpatch, ncurses, readline, autoreconfHook }: stdenv.mkDerivation rec { version = "1.7.0"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://hunspell.sourceforge.net"; description = "Spell checker"; longDescription = '' @@ -58,6 +58,6 @@ stdenv.mkDerivation rec { ''; platforms = platforms.all; license = with licenses; [ gpl2 lgpl21 mpl11 ]; - maintainers = with stdenv.lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix index 2cdc30109d9..00d0933bdd7 100644 --- a/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/pkgs/development/libraries/hunspell/dictionaries.nix @@ -1,6 +1,6 @@ /* hunspell dictionaries */ -{ stdenv, fetchurl, fetchFromGitHub, unzip, coreutils, bash, which, zip, ispell, perl, hunspell }: +{ lib, stdenv, fetchurl, fetchFromGitHub, unzip, coreutils, bash, which, zip, ispell, perl, hunspell }: let @@ -37,7 +37,7 @@ let rev = "v${version}"; sha256 = "0n9ms092k7vg7xpd3ksadxydbrizkb7js7dfxr08nbnnb9fgy0i8"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Hunspell dictionary for ${shortDescription} from rla"; homepage = "https://github.com/sbosio/rla-es"; license = with licenses; [ gpl3 lgpl3 mpl11 ]; @@ -76,7 +76,7 @@ let url = "https://extensions.libreoffice.org/extensions/swedish-spelling-dictionary-den-stora-svenska-ordlistan/${version}/@@download/file/${_name}.oxt"; sha256 = "b982881cc75f5c4af1199535bd4735ee476bdc48edf63e3f05fb4f715654a7bc"; }; - meta = with stdenv.lib; { + meta = with lib; { longDescription = '' Svensk ordlista baserad på DSSO (den stora svenska ordlistan) och Göran Anderssons (goran@init.se) arbete med denna. Ordlistan hämtas från @@ -118,7 +118,7 @@ let url = "http://www.dicollecte.org/download/fr/hunspell-french-dictionaries-v${version}.zip"; sha256 = "0ca7084jm7zb1ikwzh1frvpb97jn27i7a5d48288h2qlfp068ik0"; }; - meta = with stdenv.lib; { + meta = with lib; { inherit longDescription; description = "Hunspell dictionary for ${shortDescription} from Dicollecte"; homepage = "https://www.dicollecte.org/home.php?prj=fr"; @@ -132,7 +132,7 @@ let unpackCmd = '' unzip $src ${dictFileName}.dic ${dictFileName}.aff ${readmeFile} ''; - postInstall = stdenv.lib.optionalString isDefault '' + postInstall = lib.optionalString isDefault '' for ext in aff dic; do ln -sv $out/share/hunspell/${dictFileName}.$ext $out/share/hunspell/fr_FR.$ext ln -sv $out/share/myspell/dicts/${dictFileName}.$ext $out/share/myspell/dicts/fr_FR.$ext @@ -148,7 +148,7 @@ let name = "hunspell-dict-${shortName}-wordlist-${version}"; srcReadmeFile = "README_" + srcFileName + ".txt"; readmeFile = "README_" + dictFileName + ".txt"; - meta = with stdenv.lib; { + meta = with lib; { description = "Hunspell dictionary for ${shortDescription} from Wordlist"; homepage = "http://wordlist.aspell.net/"; license = licenses.bsd3; @@ -175,7 +175,7 @@ let version = "2.4"; name = "hunspell-dict-${shortName}-linguistico-${version}"; readmeFile = dictFileName + "_README.txt"; - meta = with stdenv.lib; { + meta = with lib; { description = "Hunspell dictionary for ${shortDescription}"; homepage = "https://sourceforge.net/projects/linguistico/"; license = licenses.gpl3; @@ -217,7 +217,7 @@ let ln -sv "$out/share/hunspell/${dictFileName}.aff" "$out/share/myspell/dicts/" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://xuxen.eus/"; description = shortDescription; longDescription = longDescription; @@ -254,7 +254,7 @@ let ln -sv "$out/share/hunspell/${dictFileName}.aff" "$out/share/myspell/dicts/" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.j3e.de/ispell/igerman98/index_en.html"; description = shortDescription; license = with licenses; [ gpl2 gpl3 ]; @@ -283,7 +283,7 @@ let buildPhase = '' cp -a ${sourceRoot}/* . ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.documentfoundation.org/Development/Dictionaries"; description = "Hunspell dictionary for ${shortDescription} from LibreOffice"; license = license; @@ -651,7 +651,7 @@ in rec { shortName = "hu-hu"; dictFileName = "hu_HU"; shortDescription = "Hungarian (Hungary)"; - license = with stdenv.lib.licenses; [ mpl20 lgpl3 ]; + license = with lib.licenses; [ mpl20 lgpl3 ]; }; /* SWEDISH */ @@ -714,7 +714,7 @@ in rec { unzip $src ${dictFileName}/{${dictFileName}.dic,${dictFileName}.aff,${readmeFile}} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Hunspell dictionary for Ukrainian (Ukraine) from LibreOffice"; homepage = "https://extensions.libreoffice.org/extensions/ukrainian-spelling-dictionary-and-thesaurus/"; license = licenses.mpl20; @@ -730,7 +730,7 @@ in rec { shortName = "ru-ru"; dictFileName = "ru_RU"; shortDescription = "Russian (Russian)"; - license = with stdenv.lib.licenses; [ mpl20 lgpl3 ]; + license = with lib.licenses; [ mpl20 lgpl3 ]; }; /* CZECH */ @@ -741,7 +741,7 @@ in rec { dictFileName = "cs_CZ"; shortDescription = "Czech (Czechia)"; readmeFile = "README_cs.txt"; - license = with stdenv.lib.licenses; [ gpl2 ]; + license = with lib.licenses; [ gpl2 ]; }; /* SLOVAK */ @@ -752,7 +752,7 @@ in rec { dictFileName = "sk_SK"; shortDescription = "Slovak (Slovakia)"; readmeFile = "README_sk.txt"; - license = with stdenv.lib.licenses; [ gpl2 lgpl21 mpl11 ]; + license = with lib.licenses; [ gpl2 lgpl21 mpl11 ]; }; /* DANISH */ @@ -776,10 +776,10 @@ in rec { unzip $src ${dictFileName}.dic ${dictFileName}.aff ${readmeFile} -d ${dictFileName} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Hunspell dictionary for Danish (Denmark) from Stavekontrolden"; homepage = "https://github.com/jeppebundsgaard/stavekontrolden"; - license = with stdenv.lib.licenses; [ gpl2Only lgpl21Only mpl11 ]; + license = with lib.licenses; [ gpl2Only lgpl21Only mpl11 ]; maintainers = with maintainers; [ louisdk1 ]; }; }; diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index 561a4693c1d..6a939835cf5 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, pkgconfig, expat, ncurses, pciutils, numactl +{ lib, stdenv, fetchurl, pkg-config, expat, ncurses, pciutils, numactl , x11Support ? false, libX11 ? null, cairo ? null }: assert x11Support -> libX11 != null && cairo != null; -with stdenv.lib; +with lib; let version = "2.4.0"; @@ -25,11 +25,11 @@ in stdenv.mkDerivation { ]; # XXX: libX11 is not directly needed, but needed as a propagated dep of Cairo. - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; # Filter out `null' inputs. This allows users to `.override' the # derivation and set optional dependencies to `null'. - buildInputs = stdenv.lib.filter (x: x != null) + buildInputs = lib.filter (x: x != null) ([ expat ncurses ] ++ (optionals x11Support [ cairo libX11 ]) ++ (optionals stdenv.isLinux [ numactl ])); diff --git a/pkgs/development/libraries/hyena/default.nix b/pkgs/development/libraries/hyena/default.nix index 09b7751c828..177f6fe7909 100644 --- a/pkgs/development/libraries/hyena/default.nix +++ b/pkgs/development/libraries/hyena/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, pkgconfig, mono, gtk-sharp-2_0, monoDLLFixer }: +{ lib, stdenv, fetchurl, pkg-config, mono, gtk-sharp-2_0, monoDLLFixer }: stdenv.mkDerivation rec { pname = "hyena"; version = "0.5"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "eb7154a42b6529bb9746c39272719f3168d6363ed4bad305a916ed7d90bc8de9"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ mono gtk-sharp-2_0 ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { inherit monoDLLFixer; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Attic/Hyena"; description = "A C# library which contains a hodge-podge of random stuff"; longDescription = '' diff --git a/pkgs/development/libraries/hyperscan/default.nix b/pkgs/development/libraries/hyperscan/default.nix index 17246f0aa0a..f160afb99b7 100644 --- a/pkgs/development/libraries/hyperscan/default.nix +++ b/pkgs/development/libraries/hyperscan/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchFromGitHub, cmake, ragel, python3 +{ lib, stdenv, fetchFromGitHub, cmake, ragel, python3 , coreutils, gnused, util-linux , boost , withStatic ? false # build only shared libs by default, build static+shared if true }: -# NOTICE: pkgconfig, pcap and pcre intentionally omitted from build inputs -# pcap used only in examples, pkgconfig used only to check for pcre +# NOTICE: pkg-config, pcap and pcre intentionally omitted from build inputs +# pcap used only in examples, pkg-config used only to check for pcre # which is fixed 8.41 version requirement (nixpkgs have 8.42+, and # I not see any reason (for now) to backport 8.41. @@ -34,8 +34,8 @@ stdenv.mkDerivation rec { "-DFAT_RUNTIME=ON" "-DBUILD_AVX512=ON" ] - ++ stdenv.lib.optional (withStatic) "-DBUILD_STATIC_AND_SHARED=ON" - ++ stdenv.lib.optional (!withStatic) "-DBUILD_SHARED_LIBS=ON"; + ++ lib.optional (withStatic) "-DBUILD_STATIC_AND_SHARED=ON" + ++ lib.optional (!withStatic) "-DBUILD_SHARED_LIBS=ON"; postPatch = '' sed -i '/examples/d' CMakeLists.txt @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { --replace "includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@" "includedir=@CMAKE_INSTALL_INCLUDEDIR@" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "High-performance multiple regex matching library"; longDescription = '' Hyperscan is a high-performance multiple regex matching library. @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { Hyperscan uses hybrid automata techniques to allow simultaneous matching of large numbers (up to tens of thousands) of regular - expressions and for the matching of regular expressions across + expressions and for the matching of regular expressions across streams of data. Hyperscan is typically used in a DPI library stack. diff --git a/pkgs/development/libraries/hyphen/default.nix b/pkgs/development/libraries/hyphen/default.nix index 9251b2853f1..ed3980f7a90 100644 --- a/pkgs/development/libraries/hyphen/default.nix +++ b/pkgs/development/libraries/hyphen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, ... }: +{ lib, stdenv, fetchurl, perl, ... }: let version = "2.8.8"; @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { sha256 = "01ap9pr6zzzbp4ky0vy7i1983fwyqy27pl0ld55s30fdxka3ciih"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A text hyphenation library"; homepage = "https://sourceforge.net/projects/hunspell/files/Hyphen/"; platforms = platforms.all; diff --git a/pkgs/development/libraries/icu/base.nix b/pkgs/development/libraries/icu/base.nix index d8e9bd16ab8..47eea8ba1af 100644 --- a/pkgs/development/libraries/icu/base.nix +++ b/pkgs/development/libraries/icu/base.nix @@ -30,18 +30,18 @@ let # $(includedir) is different from $(prefix)/include due to multiple outputs sed -i -e 's|^\(CPPFLAGS = .*\) -I\$(prefix)/include|\1 -I$(includedir)|' config/Makefile.inc.in - '' + stdenv.lib.optionalString stdenv.isAarch32 '' + '' + lib.optionalString stdenv.isAarch32 '' # From https://archlinuxarm.org/packages/armv7h/icu/files/icudata-stdlibs.patch sed -e 's/LDFLAGSICUDT=-nodefaultlibs -nostdlib/LDFLAGSICUDT=/' -i config/mh-linux ''; configureFlags = [ "--disable-debug" ] - ++ stdenv.lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) "--enable-rpath" - ++ stdenv.lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "--with-cross-build=${nativeBuildRoot}"; + ++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) "--enable-rpath" + ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "--with-cross-build=${nativeBuildRoot}"; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Unicode and globalization support library"; homepage = "http://site.icu-project.org/"; maintainers = with maintainers; [ raskin ]; @@ -57,10 +57,10 @@ let # FIXME: This fixes dylib references in the dylibs themselves, but # not in the programs in $out/bin. - nativeBuildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; # remove dependency on bootstrap-tools in early stdenv build - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.isDarwin '' sed -i 's/INSTALL_CMD=.*install/INSTALL_CMD=install/' $out/lib/icu/${version}/pkgdata.inc '' + (let replacements = [ diff --git a/pkgs/development/libraries/id3lib/default.nix b/pkgs/development/libraries/id3lib/default.nix index 6889a9f573a..31fc4fd6ba3 100644 --- a/pkgs/development/libraries/id3lib/default.nix +++ b/pkgs/development/libraries/id3lib/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, zlib}: +{lib, stdenv, fetchurl, zlib}: stdenv.mkDerivation { name = "id3lib-3.8.3"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { doCheck = false; # fails to compile - meta = with stdenv.lib; { + meta = with lib; { description = "Library for reading, writing, and manipulating ID3v1 and ID3v2 tags"; homepage = "http://id3lib.sourceforge.net"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/idnkit/default.nix b/pkgs/development/libraries/idnkit/default.nix index da7b9f1f271..472a23a2b74 100644 --- a/pkgs/development/libraries/idnkit/default.nix +++ b/pkgs/development/libraries/idnkit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libiconv }: +{ lib, stdenv, fetchurl, libiconv }: stdenv.mkDerivation rec { pname = "idnkit"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ libiconv ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.nic.ad.jp/ja/idn/idnkit"; description = "Provides functionalities about i18n domain name processing"; license = "idnkit-2 license"; diff --git a/pkgs/development/libraries/igraph/default.nix b/pkgs/development/libraries/igraph/default.nix index 7d801521038..b98588eb410 100644 --- a/pkgs/development/libraries/igraph/default.nix +++ b/pkgs/development/libraries/igraph/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, - pkgconfig, autoreconfHook, + pkg-config, autoreconfHook, flex, yacc, zlib, libxml2 }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0cb0kp6mpmgz74kbymqw4xxads8ff7jh0n59dsm76xy6nn8hpqcz"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ flex yacc zlib libxml2 ]; # Normally, igraph wants us to call bootstrap.sh, which will call diff --git a/pkgs/development/libraries/ijs/default.nix b/pkgs/development/libraries/ijs/default.nix index 46ed422b540..b300731ce44 100644 --- a/pkgs/development/libraries/ijs/default.nix +++ b/pkgs/development/libraries/ijs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoreconfHook, ghostscript }: +{ lib, stdenv, autoreconfHook, ghostscript }: stdenv.mkDerivation { name = "ijs-${ghostscript.version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { configureFlags = [ "--enable-shared" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.openprinting.org/download/ijs/"; description = "Raster printer driver architecture"; diff --git a/pkgs/development/libraries/iksemel/default.nix b/pkgs/development/libraries/iksemel/default.nix index 7f7645edc91..6ba64dcaa58 100644 --- a/pkgs/development/libraries/iksemel/default.nix +++ b/pkgs/development/libraries/iksemel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoreconfHook, libtool, pkgconfig, gnutls, fetchFromGitHub, texinfo }: +{ lib, stdenv, autoreconfHook, libtool, pkg-config, gnutls, fetchFromGitHub, texinfo }: stdenv.mkDerivation rec { pname = "iksemel"; @@ -11,10 +11,10 @@ stdenv.mkDerivation rec { sha256 = "1xv302p344hnpxqcgs3z6wwxhrik39ckgfw5cjyrw0dkf316z9yh"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook libtool texinfo ]; + nativeBuildInputs = [ pkg-config autoreconfHook libtool texinfo ]; buildInputs = [ gnutls ]; - meta = with stdenv.lib; { + meta = with lib; { description = "XML parser for jabber"; homepage = "https://github.com/timothytylee/iksemel-1.4"; diff --git a/pkgs/development/libraries/ilbc/default.nix b/pkgs/development/libraries/ilbc/default.nix index 37885c767bd..39d7b7b61b0 100644 --- a/pkgs/development/libraries/ilbc/default.nix +++ b/pkgs/development/libraries/ilbc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gawk, cmake }: +{ lib, stdenv, fetchurl, gawk, cmake }: stdenv.mkDerivation rec { name = "ilbc-rfc3951"; @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { ''; meta = { - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/ilixi/default.nix b/pkgs/development/libraries/ilixi/default.nix index 6f789174ec0..b6f1c0ac78a 100644 --- a/pkgs/development/libraries/ilixi/default.nix +++ b/pkgs/development/libraries/ilixi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, directfb, libsigcxx, libxml2, fontconfig }: +{ lib, stdenv, fetchurl, pkg-config, directfb, libsigcxx, libxml2, fontconfig }: # TODO: optional deps: baresip, FusionDale, FusionSound, SaWMan, doxygen, # Reflex, Wnn, NLS @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1kmdmqf68jiv7y6as41bhbgdy70yy2i811a3l6kccbazlzpif34v"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ directfb libsigcxx libxml2 fontconfig ]; configureFlags = [ @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "--with-examples" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Lightweight C++ GUI toolkit for embedded Linux systems"; homepage = "https://github.com/ilixi/ilixi"; license = licenses.lgpl3; diff --git a/pkgs/development/libraries/ilmbase/default.nix b/pkgs/development/libraries/ilmbase/default.nix index 68bd677cf77..219d961f9f9 100644 --- a/pkgs/development/libraries/ilmbase/default.nix +++ b/pkgs/development/libraries/ilmbase/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "ilmbase"; - version = stdenv.lib.getVersion openexr; + version = lib.getVersion openexr; # the project no longer provides separate tarballs. We may even want to merge # the ilmbase package into openexr in the future. @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { cd IlmBase ''; - meta = with stdenv.lib; { + meta = with lib; { description = " A library for 2D/3D vectors and matrices and other mathematical objects, functions and data types for computer graphics"; homepage = "https://www.openexr.com/"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/iml/default.nix b/pkgs/development/libraries/iml/default.nix index cf1d9018fd5..09ae213eb5d 100644 --- a/pkgs/development/libraries/iml/default.nix +++ b/pkgs/development/libraries/iml/default.nix @@ -1,4 +1,4 @@ -{stdenv, autoreconfHook, fetchurl, gmp, blas}: +{lib, stdenv, autoreconfHook, fetchurl, gmp, blas}: stdenv.mkDerivation rec { pname = "iml"; version = "1.0.5"; @@ -20,10 +20,10 @@ stdenv.mkDerivation rec { ]; meta = { inherit version; - description = ''Algorithms for computing exact solutions to dense systems of linear equations over the integers''; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; + description = "Algorithms for computing exact solutions to dense systems of linear equations over the integers"; + license = lib.licenses.gpl2Plus; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.unix; homepage = "https://cs.uwaterloo.ca/~astorjoh/iml.html"; updateWalker = true; }; diff --git a/pkgs/development/libraries/imlib/default.nix b/pkgs/development/libraries/imlib/default.nix index b94af22c0a7..53612f8205f 100644 --- a/pkgs/development/libraries/imlib/default.nix +++ b/pkgs/development/libraries/imlib/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, fetchpatch, libX11, libXext, xorgproto, libjpeg, libungif, libtiff, libpng}: +{lib, stdenv, fetchurl, fetchpatch, libX11, libXext, xorgproto, libjpeg, libungif, libtiff, libpng}: stdenv.mkDerivation { name = "imlib-1.9.15"; @@ -23,7 +23,7 @@ stdenv.mkDerivation { buildInputs = [libjpeg libXext libX11 xorgproto libtiff libungif libpng]; - meta = with stdenv.lib; { + meta = with lib; { description = "An image loading and rendering library for X11"; platforms = platforms.unix; license = with licenses; [ gpl2 lgpl2 ]; diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index 458b3d29d52..23550bbc807 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -1,22 +1,22 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl # Image file formats , libjpeg, libtiff, giflib, libpng, libwebp # imlib2 can load images from ID3 tags. , libid3tag -, freetype , bzip2, pkgconfig +, freetype , bzip2, pkg-config , x11Support ? true, xlibsWrapper ? null }: let - inherit (stdenv.lib) optional; + inherit (lib) optional; in stdenv.mkDerivation rec { pname = "imlib2"; - version = "1.7.0"; + version = "1.7.1"; src = fetchurl { url = "mirror://sourceforge/enlightenment/${pname}-${version}.tar.bz2"; - sha256 = "0zdk4afdrrr1539f2q15zja19j4wwfmpswzws2ffgflcnhywlxhr"; + sha256 = "sha256-AzpqY53LyOA/Zf8F5XBo5zRtUO4vL/8wS7kJWhsrxAc="; }; buildInputs = [ @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { bzip2 freetype libid3tag ] ++ optional x11Support xlibsWrapper; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; enableParallelBuilding = true; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { moveToOutput bin/imlib2-config "$dev" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Image manipulation library"; longDescription = '' diff --git a/pkgs/development/libraries/impy/default.nix b/pkgs/development/libraries/impy/default.nix index c865b25c000..1f5d9070dd3 100644 --- a/pkgs/development/libraries/impy/default.nix +++ b/pkgs/development/libraries/impy/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , pkg-config @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { SDL2 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple library for loading/saving images and animations, written in C"; homepage = "https://github.com/bcampbell/impy"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/inchi/default.nix b/pkgs/development/libraries/inchi/default.nix index 86901100759..6acdf340c91 100644 --- a/pkgs/development/libraries/inchi/default.nix +++ b/pkgs/development/libraries/inchi/default.nix @@ -1,4 +1,4 @@ -{ pkgs, fetchurl, stdenv, unzip }: +{ pkgs, fetchurl, lib, stdenv, unzip }: stdenv.mkDerivation { pname = "inchi"; version = "1.05"; @@ -41,7 +41,7 @@ stdenv.mkDerivation { install -m 644 INCHI-1-DOC/*.pdf $doc/share ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.inchi-trust.org/"; description = "IUPAC International Chemical Identifier library"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/incrtcl/default.nix b/pkgs/development/libraries/incrtcl/default.nix index c08d5924b0c..67ae5623db1 100644 --- a/pkgs/development/libraries/incrtcl/default.nix +++ b/pkgs/development/libraries/incrtcl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, writeText, tcl }: +{ lib, stdenv, fetchurl, writeText, tcl }: stdenv.mkDerivation rec { pname = "incrtcl"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { rmdir $out/bin mv $out/lib/itcl${version}/* $out/lib ln -s libitcl${version}${stdenv.hostPlatform.extensions.sharedLibrary} \ - $out/lib/libitcl${stdenv.lib.versions.major version}${stdenv.hostPlatform.extensions.sharedLibrary} + $out/lib/libitcl${lib.versions.major version}${stdenv.hostPlatform.extensions.sharedLibrary} rmdir $out/lib/itcl${version} ''; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://incrtcl.sourceforge.net/"; description = "Object Oriented Enhancements for Tcl/Tk"; license = licenses.tcltk; diff --git a/pkgs/development/libraries/indicator-application/gtk2.nix b/pkgs/development/libraries/indicator-application/gtk2.nix index 6ac74988dff..f75ade98c6d 100644 --- a/pkgs/development/libraries/indicator-application/gtk2.nix +++ b/pkgs/development/libraries/indicator-application/gtk2.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, lib, file -, pkgconfig, autoconf +, pkg-config, autoconf , glib, dbus-glib, json-glib , gtk2, libindicator-gtk2, libdbusmenu-gtk2, libappindicator-gtk2 }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1xqsb6c1pwawabw854f7aybjrgyhc2r1316i9lyjspci51zk5m7v"; }; - nativeBuildInputs = [ pkgconfig autoconf ]; + nativeBuildInputs = [ pkg-config autoconf ]; buildInputs = [ glib dbus-glib json-glib diff --git a/pkgs/development/libraries/indicator-application/gtk3.nix b/pkgs/development/libraries/indicator-application/gtk3.nix index a523019e78c..8947e33e900 100644 --- a/pkgs/development/libraries/indicator-application/gtk3.nix +++ b/pkgs/development/libraries/indicator-application/gtk3.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchbzr -, pkgconfig, systemd, autoreconfHook +{ lib, stdenv, fetchbzr +, pkg-config, systemd, autoreconfHook , glib, dbus-glib, json-glib , gtk3, libindicator-gtk3, libdbusmenu-gtk3, libappindicator-gtk3 }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "1f0jdyqqb5g86zdpbcyn16x94yjigsfiv2kf73dvni5rp1vafbq1"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ glib dbus-glib json-glib systemd @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { rm -rf $out/share/upstart ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Indicator to take menus from applications and place them in the panel"; homepage = "https://launchpad.net/indicator-application"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/indilib/default.nix b/pkgs/development/libraries/indilib/default.nix index 1635827340e..035356ac861 100644 --- a/pkgs/development/libraries/indilib/default.nix +++ b/pkgs/development/libraries/indilib/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , cfitsio @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "indilib"; - version = "1.8.7"; + version = "1.8.8"; src = fetchFromGitHub { owner = "indilib"; repo = "indi"; rev = "v${version}"; - sha256 = "0cy9l1vpsnfilxslvmn88hhq8iw8cnx3xpbnl78c0dgjyfv5xmhz"; + sha256 = "sha256-WTRfV6f764tDGKnQVd1jeYN/qXa/VRTFK0mMalc+9aU="; }; patches = [ @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { fftw ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.indilib.org/"; description = "Implementation of the INDI protocol for POSIX operating systems"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/inih/default.nix b/pkgs/development/libraries/inih/default.nix index 62de607f7d4..11e49f7ddc4 100644 --- a/pkgs/development/libraries/inih/default.nix +++ b/pkgs/development/libraries/inih/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja }: +{ lib, stdenv, fetchFromGitHub, meson, ninja }: stdenv.mkDerivation rec { pname = "inih"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { "-Dwith_INIReader=true" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple .INI file parser in C, good for embedded systems"; homepage = "https://github.com/benhoyt/inih"; changelog = "https://github.com/benhoyt/inih/releases/tag/${version}"; diff --git a/pkgs/development/libraries/iniparser/default.nix b/pkgs/development/libraries/iniparser/default.nix index 51c6728e8b0..8c7fdfd04d6 100644 --- a/pkgs/development/libraries/iniparser/default.nix +++ b/pkgs/development/libraries/iniparser/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "iniparser"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { patches = ./no-usr.patch; - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace Makefile \ --replace -Wl,-soname= -Wl,-install_name, ''; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ln -s libiniparser.so.1 $out/lib/libiniparser.so ''; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Free standalone ini file parsing library"; license = licenses.mit; diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix index 30d572853cf..28138f103b9 100644 --- a/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/pkgs/development/libraries/intel-gmmlib/default.nix @@ -1,24 +1,30 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , cmake }: stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "20.3.3"; + version = "20.4.1"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "${pname}-${version}"; - sha256 = "1diq1gqpfv5bawvag6bzwnd3ilhacwmwx3bl67abjvbb0m3jw4lk"; + sha256 = "0qb0wpinfv8lg1pq1pxkl6v0kd8ax86m8zxzm6zjx91alsch1mi6"; }; nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/intel/gmmlib"; license = licenses.mit; description = "Intel Graphics Memory Management Library"; + longDescription = '' + The Intel(R) Graphics Memory Management Library provides device specific + and buffer management for the Intel(R) Graphics Compute Runtime for + OpenCL(TM) and the Intel(R) Media Driver for VAAPI. + ''; platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ primeos ]; }; } diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix index 6f2f543af06..6e62484ac68 100644 --- a/pkgs/development/libraries/intel-media-driver/default.nix +++ b/pkgs/development/libraries/intel-media-driver/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , cmake, pkg-config , libva, libpciaccess, intel-gmmlib , enableX11 ? true, libX11 @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "intel-media-driver"; - version = "20.4.5"; + version = "21.1.0"; src = fetchFromGitHub { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - sha256 = "149xkhhp8q06c1jzxjs24lnbfrlvf19m0hcwld593vv4arfpbpmf"; + sha256 = "17cgs52f42jdvfb6q3wpkxaz2b41z59jdribpgb9qmcvizsnglxc"; }; cmakeFlags = [ @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libva libpciaccess intel-gmmlib ] - ++ stdenv.lib.optional enableX11 libX11; + ++ lib.optional enableX11 libX11; - meta = with stdenv.lib; { + meta = with lib; { description = "Intel Media Driver for VAAPI — Broadwell+ iGPUs"; longDescription = '' The Intel Media Driver for VAAPI is a new VA-API (Video Acceleration API) @@ -41,8 +41,8 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ primeos jfrankenau ]; }; - postFixup = stdenv.lib.optionalString enableX11 '' - patchelf --set-rpath "$(patchelf --print-rpath $out/lib/dri/iHD_drv_video.so):${stdenv.lib.makeLibraryPath [ libX11 ]}" \ + postFixup = lib.optionalString enableX11 '' + patchelf --set-rpath "$(patchelf --print-rpath $out/lib/dri/iHD_drv_video.so):${lib.makeLibraryPath [ libX11 ]}" \ $out/lib/dri/iHD_drv_video.so ''; } diff --git a/pkgs/development/libraries/intel-media-sdk/default.nix b/pkgs/development/libraries/intel-media-sdk/default.nix index 71e6d3d700a..dd605aaae5c 100644 --- a/pkgs/development/libraries/intel-media-sdk/default.nix +++ b/pkgs/development/libraries/intel-media-sdk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, gtest, libdrm, libpciaccess, libva, libX11 +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, gtest, libdrm, libpciaccess, libva, libX11 , libXau, libXdmcp, libpthreadstubs }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0qnq43qjcmzkn6v2aymzi3kycndk9xw6m5f5g5sz5x53nz556bp0"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libdrm libva libpciaccess libX11 libXau libXdmcp libpthreadstubs ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Intel Media SDK"; license = licenses.mit; maintainers = with maintainers; [ midchildan ]; diff --git a/pkgs/development/libraries/ip2location-c/default.nix b/pkgs/development/libraries/ip2location-c/default.nix index 8387aa67161..23801d3436d 100644 --- a/pkgs/development/libraries/ip2location-c/default.nix +++ b/pkgs/development/libraries/ip2location-c/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook }: +{ lib, stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { pname = "ip2location-c"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # databases are available, downloading them for just 1 test seems excessive): doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Library to look up locations of host names and IP addresses"; longDescription = '' A C library to find the country, region, city,coordinates, diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix index 84e7fae6045..e283a290947 100644 --- a/pkgs/development/libraries/irrlicht/default.nix +++ b/pkgs/development/libraries/irrlicht/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, libGLU, libGL, unzip, libXrandr, libX11, libXxf86vm }: +{ lib, stdenv, fetchzip, libGLU, libGL, unzip, libXrandr, libX11, libXxf86vm }: let common = import ./common.nix { inherit fetchzip; }; @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://irrlicht.sourceforge.net/"; - license = stdenv.lib.licenses.zlib; + license = lib.licenses.zlib; description = "Open source high performance realtime 3D engine written in C++"; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/development/libraries/irrlicht/mac.nix b/pkgs/development/libraries/irrlicht/mac.nix index 5f8335efab2..b41486ce9dd 100644 --- a/pkgs/development/libraries/irrlicht/mac.nix +++ b/pkgs/development/libraries/irrlicht/mac.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, libGLU, libGL, unzip, fetchFromGitHub, cmake, Cocoa, OpenGL, IOKit }: +{ lib, stdenv, fetchzip, libGLU, libGL, unzip, fetchFromGitHub, cmake, Cocoa, OpenGL, IOKit }: let common = import ./common.nix { inherit fetchzip; }; @@ -9,16 +9,16 @@ stdenv.mkDerivation rec { version = common.version; src = fetchFromGitHub { - owner = "quiark"; - repo = "IrrlichtCMake"; - rev = "523a5e6ef84be67c3014f7b822b97acfced536ce"; - sha256 = "10ahnry2zl64wphs233gxhvs6c0345pyf5nwa29mc6yn49x7bidi"; + owner = "quiark"; + repo = "IrrlichtCMake"; + rev = "523a5e6ef84be67c3014f7b822b97acfced536ce"; + sha256 = "10ahnry2zl64wphs233gxhvs6c0345pyf5nwa29mc6yn49x7bidi"; }; postUnpack = '' cp -r ${common.src}/* $sourceRoot/ chmod -R 777 $sourceRoot - ''; + ''; patches = [ ./mac_device.patch ]; dontFixCmake = true; @@ -36,8 +36,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://irrlicht.sourceforge.net/"; - license = stdenv.lib.licenses.zlib; + license = lib.licenses.zlib; description = "Open source high performance realtime 3D engine written in C++"; - platforms = stdenv.lib.platforms.darwin; + platforms = lib.platforms.darwin; }; } diff --git a/pkgs/development/libraries/isl/0.11.1.nix b/pkgs/development/libraries/isl/0.11.1.nix index 1cac0d369fe..5beffd1f0d2 100644 --- a/pkgs/development/libraries/isl/0.11.1.nix +++ b/pkgs/development/libraries/isl/0.11.1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gmp }: +{ lib, stdenv, fetchurl, gmp }: stdenv.mkDerivation { name = "isl-0.11.1"; # CLooG 0.16.3 fails to build with ISL 0.08. @@ -15,8 +15,8 @@ stdenv.mkDerivation { meta = { homepage = "https://www.kotnet.org/~skimo/isl/"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; description = "A library for manipulating sets and relations of integer points bounded by linear constraints"; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/libraries/isl/0.14.1.nix b/pkgs/development/libraries/isl/0.14.1.nix index a97e05b0431..8936d6c5f3b 100644 --- a/pkgs/development/libraries/isl/0.14.1.nix +++ b/pkgs/development/libraries/isl/0.14.1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gmp }: +{ lib, stdenv, fetchurl, gmp }: stdenv.mkDerivation rec { name = "isl-0.14.1"; @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.kotnet.org/~skimo/isl/"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; description = "A library for manipulating sets and relations of integer points bounded by linear constraints"; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/libraries/isl/0.17.1.nix b/pkgs/development/libraries/isl/0.17.1.nix index 018f7085088..a823b69fa27 100644 --- a/pkgs/development/libraries/isl/0.17.1.nix +++ b/pkgs/development/libraries/isl/0.17.1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gmp }: +{ lib, stdenv, fetchurl, gmp }: stdenv.mkDerivation rec { name = "isl-0.17.1"; @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.kotnet.org/~skimo/isl/"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; description = "A library for manipulating sets and relations of integer points bounded by linear constraints"; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/libraries/isl/0.20.0.nix b/pkgs/development/libraries/isl/0.20.0.nix index 3775bdc71e0..c35588555a7 100644 --- a/pkgs/development/libraries/isl/0.20.0.nix +++ b/pkgs/development/libraries/isl/0.20.0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gmp }: +{ lib, stdenv, fetchurl, gmp }: stdenv.mkDerivation rec { name = "isl-0.20"; @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://isl.gforge.inria.fr/"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; description = "A library for manipulating sets and relations of integer points bounded by linear constraints"; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/libraries/iso-codes/default.nix b/pkgs/development/libraries/iso-codes/default.nix index 8ba9ea31b80..6d770430ce5 100644 --- a/pkgs/development/libraries/iso-codes/default.nix +++ b/pkgs/development/libraries/iso-codes/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gettext, python3}: +{lib, stdenv, fetchurl, gettext, python3}: stdenv.mkDerivation rec { pname = "iso-codes"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gettext python3 ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://salsa.debian.org/iso-codes-team/iso-codes"; description = "Various ISO codes packaged as XML files"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/itk/4.x.nix b/pkgs/development/libraries/itk/4.x.nix index 7a7176c88c1..54a3c33cd01 100644 --- a/pkgs/development/libraries/itk/4.x.nix +++ b/pkgs/development/libraries/itk/4.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libX11, libuuid, xz, vtk_7, Cocoa }: +{ lib, stdenv, fetchFromGitHub, cmake, libX11, libuuid, xz, vtk_7, Cocoa }: stdenv.mkDerivation rec { pname = "itk"; @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake xz ]; - buildInputs = [ libX11 libuuid vtk_7 ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ]; + buildInputs = [ libX11 libuuid vtk_7 ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; meta = { description = "Insight Segmentation and Registration Toolkit"; homepage = "https://www.itk.org/"; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/itk/default.nix b/pkgs/development/libraries/itk/default.nix index 598ad52de04..ac899ce26f1 100644 --- a/pkgs/development/libraries/itk/default.nix +++ b/pkgs/development/libraries/itk/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, cmake, makeWrapper -, pkgconfig, libX11, libuuid, xz, vtk_7, Cocoa }: +{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper +, pkg-config, libX11, libuuid, xz, vtk_7, Cocoa }: stdenv.mkDerivation rec { pname = "itk"; @@ -29,16 +29,16 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake xz makeWrapper ]; - buildInputs = [ libX11 libuuid vtk_7 ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ]; + buildInputs = [ libX11 libuuid vtk_7 ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; postInstall = '' - wrapProgram "$out/bin/h5c++" --prefix PATH ":" "${pkgconfig}/bin" + wrapProgram "$out/bin/h5c++" --prefix PATH ":" "${pkg-config}/bin" ''; meta = { description = "Insight Segmentation and Registration Toolkit"; homepage = "https://www.itk.org/"; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [viric]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [viric]; }; } diff --git a/pkgs/development/libraries/itktcl/default.nix b/pkgs/development/libraries/itktcl/default.nix index 3c70369eb91..570190a43c1 100644 --- a/pkgs/development/libraries/itktcl/default.nix +++ b/pkgs/development/libraries/itktcl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, tcl, tk, incrtcl }: +{ lib, stdenv, fetchurl, tcl, tk, incrtcl }: stdenv.mkDerivation rec { pname = "itk-tcl"; @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { rmdir $out/bin mv $out/lib/itk${version}/* $out/lib ln -s libitk${version}${stdenv.hostPlatform.extensions.sharedLibrary} \ - $out/lib/libitk${stdenv.lib.versions.major version}${stdenv.hostPlatform.extensions.sharedLibrary} + $out/lib/libitk${lib.versions.major version}${stdenv.hostPlatform.extensions.sharedLibrary} rmdir $out/lib/itk${version} ''; outputs = [ "out" "dev" "man" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://incrtcl.sourceforge.net/"; description = "Mega-widget toolkit for incr Tk"; license = licenses.tcltk; diff --git a/pkgs/development/libraries/jabcode/default.nix b/pkgs/development/libraries/jabcode/default.nix index c875e4a3943..36c4c8c61c5 100644 --- a/pkgs/development/libraries/jabcode/default.nix +++ b/pkgs/development/libraries/jabcode/default.nix @@ -3,7 +3,7 @@ , lib , subproject ? "library" # one of "library", "reader" or "writer" , zlib, libpng, libtiff -, jabcode +, jabcode }: let subdir = lib.getAttr subproject { diff --git a/pkgs/development/libraries/jama/default.nix b/pkgs/development/libraries/jama/default.nix index 5c7473be647..02dd4a5635b 100644 --- a/pkgs/development/libraries/jama/default.nix +++ b/pkgs/development/libraries/jama/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip, tnt}: +{lib, stdenv, fetchurl, unzip, tnt}: stdenv.mkDerivation rec { pname = "jama"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { cp *.h $out/include ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://math.nist.gov/tnt/"; description = "JAMA/C++ Linear Algebra Package: Java-like matrix C++ templates"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/jansson/default.nix b/pkgs/development/libraries/jansson/default.nix index 7ecf7579a30..85451511d7e 100644 --- a/pkgs/development/libraries/jansson/default.nix +++ b/pkgs/development/libraries/jansson/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { name = "jansson-2.13.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0ks7gbs0j8p4dmmi2sq129mxy5gfg0z6220i1jk020mi2zd7gwzl"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.digip.org/jansson/"; description = "C library for encoding, decoding and manipulating JSON data"; license = licenses.mit; diff --git a/pkgs/development/libraries/java/commons/bcel/default.nix b/pkgs/development/libraries/java/commons/bcel/default.nix index 4a2b030a3db..9d34aaf6c8e 100644 --- a/pkgs/development/libraries/java/commons/bcel/default.nix +++ b/pkgs/development/libraries/java/commons/bcel/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { version = "5.2"; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://commons.apache.org/proper/commons-bcel/"; description = "Gives users a convenient way to analyze, create, and manipulate (binary) Java class files"; - maintainers = with stdenv.lib.maintainers; [ copumpkin ]; - license = stdenv.lib.licenses.asl20; - platforms = with stdenv.lib.platforms; unix; + maintainers = with lib.maintainers; [ copumpkin ]; + license = lib.licenses.asl20; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/development/libraries/java/commons/bsf/default.nix b/pkgs/development/libraries/java/commons/bsf/default.nix index 46bd3c0fd15..629ab7ec131 100644 --- a/pkgs/development/libraries/java/commons/bsf/default.nix +++ b/pkgs/development/libraries/java/commons/bsf/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation { name = "commons-bsf-1.2"; @@ -16,8 +16,8 @@ stdenv.mkDerivation { meta = { description = "Interface to scripting languages, including JSR-223"; homepage = "http://commons.apache.org/proper/commons-bsf/"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/java/commons/compress/default.nix b/pkgs/development/libraries/java/commons/compress/default.nix index 5307c635834..79f63026e38 100644 --- a/pkgs/development/libraries/java/commons/compress/default.nix +++ b/pkgs/development/libraries/java/commons/compress/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { version = "1.20"; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://commons.apache.org/proper/commons-compress"; description = "Allows manipulation of ar, cpio, Unix dump, tar, zip, gzip, XZ, Pack200, bzip2, 7z, arj, lzma, snappy, DEFLATE and Z files"; - maintainers = with stdenv.lib.maintainers; [ copumpkin ]; - license = stdenv.lib.licenses.asl20; - platforms = with stdenv.lib.platforms; unix; + maintainers = with lib.maintainers; [ copumpkin ]; + license = lib.licenses.asl20; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/development/libraries/java/commons/fileupload/default.nix b/pkgs/development/libraries/java/commons/fileupload/default.nix index cd439b50397..868f2da4e53 100644 --- a/pkgs/development/libraries/java/commons/fileupload/default.nix +++ b/pkgs/development/libraries/java/commons/fileupload/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { version = "1.3.1"; @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://commons.apache.org/proper/commons-fileupload"; description = "Makes it easy to add robust, high-performance, file upload capability to your servlets and web applications"; - maintainers = with stdenv.lib.maintainers; [ copumpkin ]; - license = stdenv.lib.licenses.asl20; - platforms = with stdenv.lib.platforms; unix; + maintainers = with lib.maintainers; [ copumpkin ]; + license = lib.licenses.asl20; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/development/libraries/java/commons/io/default.nix b/pkgs/development/libraries/java/commons/io/default.nix index 10587a72ecd..0c5ac8f4dde 100644 --- a/pkgs/development/libraries/java/commons/io/default.nix +++ b/pkgs/development/libraries/java/commons/io/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { version = "2.8.0"; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://commons.apache.org/proper/commons-io"; description = "A library of utilities to assist with developing IO functionality"; - maintainers = with stdenv.lib.maintainers; [ copumpkin ]; - license = stdenv.lib.licenses.asl20; - platforms = with stdenv.lib.platforms; unix; + maintainers = with lib.maintainers; [ copumpkin ]; + license = lib.licenses.asl20; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/development/libraries/java/commons/lang/default.nix b/pkgs/development/libraries/java/commons/lang/default.nix index bd0f7c273e7..5009fe6cac7 100644 --- a/pkgs/development/libraries/java/commons/lang/default.nix +++ b/pkgs/development/libraries/java/commons/lang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { version = "3.11"; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://commons.apache.org/proper/commons-lang"; description = "Provides additional methods to manipulate standard Java library classes"; - maintainers = with stdenv.lib.maintainers; [ copumpkin ]; - license = stdenv.lib.licenses.asl20; - platforms = with stdenv.lib.platforms; unix; + maintainers = with lib.maintainers; [ copumpkin ]; + license = lib.licenses.asl20; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/development/libraries/java/commons/logging/default.nix b/pkgs/development/libraries/java/commons/logging/default.nix index 7c2192e4952..d63a214e2ad 100644 --- a/pkgs/development/libraries/java/commons/logging/default.nix +++ b/pkgs/development/libraries/java/commons/logging/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation { name = "commons-logging-1.2"; @@ -16,8 +16,8 @@ stdenv.mkDerivation { meta = { description = "Wrapper around a variety of logging API implementations"; homepage = "http://commons.apache.org/proper/commons-logging"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/java/commons/math/default.nix b/pkgs/development/libraries/java/commons/math/default.nix index 7c4fc5c632e..960f12fb8bf 100644 --- a/pkgs/development/libraries/java/commons/math/default.nix +++ b/pkgs/development/libraries/java/commons/math/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { version = "3.6.1"; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://commons.apache.org/proper/commons-math/"; description = "A library of lightweight, self-contained mathematics and statistics components"; - maintainers = with stdenv.lib.maintainers; [ copumpkin ]; - license = stdenv.lib.licenses.asl20; - platforms = with stdenv.lib.platforms; unix; + maintainers = with lib.maintainers; [ copumpkin ]; + license = lib.licenses.asl20; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/development/libraries/java/cup/default.nix b/pkgs/development/libraries/java/cup/default.nix index acf8cc9b83d..f7732ff637a 100644 --- a/pkgs/development/libraries/java/cup/default.nix +++ b/pkgs/development/libraries/java/cup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jdk, ant } : +{ lib, stdenv, fetchurl, jdk, ant } : stdenv.mkDerivation rec { pname = "java-cup"; @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www2.cs.tum.edu/projects/cup/"; description = "LALR parser generator for Java"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.romildo ]; + license = lib.licenses.mit; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.romildo ]; }; } diff --git a/pkgs/development/libraries/java/dbus-java/default.nix b/pkgs/development/libraries/java/dbus-java/default.nix index 0133138b478..9fbcf8b020c 100644 --- a/pkgs/development/libraries/java/dbus-java/default.nix +++ b/pkgs/development/libraries/java/dbus-java/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gettext, jdk8, libmatthew_java}: +{lib, stdenv, fetchurl, gettext, jdk8, libmatthew_java}: let jdk = jdk8; in stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; JAVA_HOME=jdk; JAVA="${jdk}/bin/java"; - PREFIX=''''${out}''; + PREFIX="\${out}"; JAVAUNIXLIBDIR="${libmatthew_java}/lib/jni"; JAVAUNIXJARDIR="${libmatthew_java}/share/java"; buildInputs = [ gettext jdk ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation { -e "s|install: install-bin install-man install-doc|install: install-bin|" Makefile ''; - meta = with stdenv.lib; { + meta = with lib; { platforms = platforms.linux; maintainers = [ maintainers.sander ]; license = licenses.afl21; diff --git a/pkgs/development/libraries/java/geoipjava/default.nix b/pkgs/development/libraries/java/geoipjava/default.nix index 6d4dfbfe61c..4d9902cbbe9 100644 --- a/pkgs/development/libraries/java/geoipjava/default.nix +++ b/pkgs/development/libraries/java/geoipjava/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, jdk, unzip}: +{lib, stdenv, fetchurl, jdk, unzip}: stdenv.mkDerivation { name = "GeoIPJava-1.2.5"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "1gb2d0qvvq7xankz7l7ymbr3qprwk9bifpy4hlgw0sq4i6a55ypd"; }; buildInputs = [ jdk unzip ]; - buildPhase = + buildPhase = '' cd source javac $(find . -name \*.java) @@ -20,8 +20,8 @@ stdenv.mkDerivation { ''; meta = { description = "GeoIP Java API"; - license = stdenv.lib.licenses.lgpl21Plus; - maintainers = [ stdenv.lib.maintainers.sander ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.lgpl21Plus; + maintainers = [ lib.maintainers.sander ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/java/gwt-dragdrop/default.nix b/pkgs/development/libraries/java/gwt-dragdrop/default.nix index 37d7cac0da2..34a0e8c530a 100644 --- a/pkgs/development/libraries/java/gwt-dragdrop/default.nix +++ b/pkgs/development/libraries/java/gwt-dragdrop/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation { name = "gwt-dnd-2.6.5"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "07zdlr8afs499asnw0dcjmw1cnjc646v91lflx5dv4qj374c97fw"; }; - meta = with stdenv.lib; { + meta = with lib; { platforms = platforms.unix; license = licenses.asl20; }; diff --git a/pkgs/development/libraries/java/gwt-widgets/default.nix b/pkgs/development/libraries/java/gwt-widgets/default.nix index a968ebc5fd8..692326a2189 100644 --- a/pkgs/development/libraries/java/gwt-widgets/default.nix +++ b/pkgs/development/libraries/java/gwt-widgets/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation { name = "gwt-widgets-0.2.0"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "09isj4j6842rj13nv8264irkjjhvmgihmi170ciabc98911bakxb"; }; - meta = with stdenv.lib; { + meta = with lib; { platforms = platforms.unix; license = with licenses; [ afl21 lgpl2 ]; }; diff --git a/pkgs/development/libraries/java/hsqldb/default.nix b/pkgs/development/libraries/java/hsqldb/default.nix index 88f32866b0d..32b00062239 100644 --- a/pkgs/development/libraries/java/hsqldb/default.nix +++ b/pkgs/development/libraries/java/hsqldb/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, unzip, makeWrapper, jre }: +{ lib, stdenv, fetchurl, unzip, makeWrapper, jre }: stdenv.mkDerivation rec { pname = "hsqldb"; version = "2.5.1"; - underscoreMajMin = stdenv.lib.strings.replaceChars ["."] ["_"] (stdenv.lib.versions.majorMinor version); + underscoreMajMin = lib.strings.replaceChars ["."] ["_"] (lib.versions.majorMinor version); src = fetchurl { url = "mirror://sourceforge/project/hsqldb/hsqldb/hsqldb_${underscoreMajMin}/hsqldb-${version}.zip"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://hsqldb.org"; description = "A relational, embedable database management system written in Java and a set of related tools"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/java/httpunit/default.nix b/pkgs/development/libraries/java/httpunit/default.nix index 34af97605d2..ad276fcdd63 100644 --- a/pkgs/development/libraries/java/httpunit/default.nix +++ b/pkgs/development/libraries/java/httpunit/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip} : +{lib, stdenv, fetchurl, unzip} : stdenv.mkDerivation { name = "httpunit-1.7"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { inherit unzip; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://httpunit.sourceforge.net"; platforms = platforms.unix; license = licenses.mit; diff --git a/pkgs/development/libraries/java/hydra-ant-logger/default.nix b/pkgs/development/libraries/java/hydra-ant-logger/default.nix index 54e85ec5589..19bc3524c59 100644 --- a/pkgs/development/libraries/java/hydra-ant-logger/default.nix +++ b/pkgs/development/libraries/java/hydra-ant-logger/default.nix @@ -1,4 +1,4 @@ -{ fetchgit, stdenv, ant, jdk }: +{ fetchgit, lib, stdenv, ant, jdk }: stdenv.mkDerivation { pname = "hydra-ant-logger"; @@ -20,6 +20,6 @@ stdenv.mkDerivation { ''; meta = { - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/java/jdom/default.nix b/pkgs/development/libraries/java/jdom/default.nix index 60558f72cfc..4bb90dd9887 100644 --- a/pkgs/development/libraries/java/jdom/default.nix +++ b/pkgs/development/libraries/java/jdom/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl} : +{lib, stdenv, fetchurl} : stdenv.mkDerivation { name = "jdom-1.0"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1igmxzcy0s25zcy9vmcw0kd13lh60r0b4qg8lnp1jic33f427pxf"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Java-based solution for accessing, manipulating, and outputting XML data from Java code"; homepage = "http://www.jdom.org"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/java/jflex/default.nix b/pkgs/development/libraries/java/jflex/default.nix index d0258d5896b..cf5b42a0ac2 100644 --- a/pkgs/development/libraries/java/jflex/default.nix +++ b/pkgs/development/libraries/java/jflex/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, jre} : +{lib, stdenv, fetchurl, jre} : stdenv.mkDerivation rec { name = "jflex-1.8.2"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.jflex.de/"; description = "Lexical analyzer generator for Java, written in Java"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.bsd3; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/java/junit/default.nix b/pkgs/development/libraries/java/junit/default.nix index c114ddeac27..5a107985177 100644 --- a/pkgs/development/libraries/java/junit/default.nix +++ b/pkgs/development/libraries/java/junit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, antBuild, fetchgit, perl }: +{ lib, antBuild, fetchgit, perl }: let version = "4.11"; @@ -22,7 +22,7 @@ in antBuild { meta = { homepage = "http://www.junit.org/"; description = "A framework for repeatable tests in Java"; - license = stdenv.lib.licenses.epl10; + license = lib.licenses.epl10; broken = true; }; } diff --git a/pkgs/development/libraries/java/junixsocket/default.nix b/pkgs/development/libraries/java/junixsocket/default.nix index cb88df276a5..7a7d6a933bc 100644 --- a/pkgs/development/libraries/java/junixsocket/default.nix +++ b/pkgs/development/libraries/java/junixsocket/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ant, jdk, junit }: +{ lib, stdenv, fetchurl, ant, jdk, junit }: stdenv.mkDerivation rec { name = "junixsocket-1.3"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { # Note that our OpenJDK on Darwin is currently 32-bit, so we have to build a 32-bit dylib. (if stdenv.is64bit then [ "-Dskip32=true" ] else [ "-Dskip64=true" ]) ++ [ "-Dgcc=cc" "-Dant.build.javac.source=1.6" ] - ++ stdenv.lib.optional stdenv.isDarwin "-DisMac=true"; + ++ lib.optional stdenv.isDarwin "-DisMac=true"; installPhase = '' @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { description = "A Java/JNI library for using Unix Domain Sockets from Java"; homepage = "https://github.com/kohlschutter/junixsocket"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + license = lib.licenses.asl20; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/development/libraries/java/libmatthew-java/default.nix b/pkgs/development/libraries/java/libmatthew-java/default.nix index 8b8123dff2b..a3cdaa37ed0 100644 --- a/pkgs/development/libraries/java/libmatthew-java/default.nix +++ b/pkgs/development/libraries/java/libmatthew-java/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, jdk}: +{lib, stdenv, fetchurl, jdk}: stdenv.mkDerivation { name = "libmatthew-java-0.8"; @@ -7,10 +7,10 @@ stdenv.mkDerivation { sha256 = "1yldkhsdzm0a41a0i881bin2jklhp85y3ah245jd6fz3npcx7l85"; }; JAVA_HOME=jdk; - PREFIX=''''${out}''; + PREFIX="\${out}"; buildInputs = [ jdk ]; - meta = with stdenv.lib; { + meta = with lib; { platforms = platforms.linux; maintainers = [ maintainers.sander ]; license = licenses.mit; diff --git a/pkgs/development/libraries/java/lombok/default.nix b/pkgs/development/libraries/java/lombok/default.nix index 6d09bead53e..ddf95ead249 100644 --- a/pkgs/development/libraries/java/lombok/default.nix +++ b/pkgs/development/libraries/java/lombok/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, jdk }: +{ lib, stdenv, fetchurl, makeWrapper, jdk }: stdenv.mkDerivation rec { name = "lombok-1.18.16"; @@ -23,9 +23,9 @@ stdenv.mkDerivation rec { meta = { description = "A library that can write a lot of boilerplate for your Java project"; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.mit; + platforms = lib.platforms.all; + license = lib.licenses.mit; homepage = "https://projectlombok.org/"; - maintainers = [ stdenv.lib.maintainers.CrystalGamma ]; + maintainers = [ lib.maintainers.CrystalGamma ]; }; } diff --git a/pkgs/development/libraries/java/lucene/default.nix b/pkgs/development/libraries/java/lucene/default.nix index c0eabe51657..417c7b96900 100644 --- a/pkgs/development/libraries/java/lucene/default.nix +++ b/pkgs/development/libraries/java/lucene/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl} : +{lib, stdenv, fetchurl} : stdenv.mkDerivation rec { pname = "lucene"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1mxaxg65f7v8n60irjwm24v7hcisbl0srmpvcy1l4scs6rjj1awh"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Java full-text search engine"; platforms = platforms.unix; license = licenses.asl20; diff --git a/pkgs/development/libraries/java/mockobjects/default.nix b/pkgs/development/libraries/java/mockobjects/default.nix index 817c861436f..e20d7e707e7 100644 --- a/pkgs/development/libraries/java/mockobjects/default.nix +++ b/pkgs/development/libraries/java/mockobjects/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl} : +{lib, stdenv, fetchurl} : stdenv.mkDerivation { name = "mockobjects-0.09"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "18rnyqfcyh0s3dwkkaszdd50ssyjx5fa1y3ii309ldqg693lfgnz"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Generic unit testing framework and methodology for testing any kind of code"; platforms = platforms.unix; license = licenses.asl20; diff --git a/pkgs/development/libraries/java/rhino/default.nix b/pkgs/development/libraries/java/rhino/default.nix index d3d10f61b70..d34787d8b1f 100644 --- a/pkgs/development/libraries/java/rhino/default.nix +++ b/pkgs/development/libraries/java/rhino/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, unzip, ant, javac, jvm }: +{ fetchurl, lib, stdenv, unzip, ant, javac, jvm }: let version = "1.7R2"; @@ -43,7 +43,7 @@ stdenv.mkDerivation { cp -v *.jar "$out/share/java" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An implementation of JavaScript written in Java"; longDescription = diff --git a/pkgs/development/libraries/java/saxon/default.nix b/pkgs/development/libraries/java/saxon/default.nix index ef403be60df..e6f2fcadbe7 100644 --- a/pkgs/development/libraries/java/saxon/default.nix +++ b/pkgs/development/libraries/java/saxon/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, unzip, jre }: +{ lib, stdenv, fetchurl, unzip, jre }: let common = { pname, version, src, description - , prog ? null, jar ? null, license ? stdenv.lib.licenses.mpl20 }: + , prog ? null, jar ? null, license ? lib.licenses.mpl20 }: stdenv.mkDerivation { name = "${pname}-${version}"; inherit pname version src; @@ -26,7 +26,7 @@ let chmod a+x $out/bin/${prog'} ''; - meta = with stdenv.lib; { + meta = with lib; { inherit description license; homepage = "http://saxon.sourceforge.net/"; maintainers = with maintainers; [ rvl ]; @@ -44,7 +44,7 @@ in { }; description = "XSLT 1.0 processor"; # http://saxon.sourceforge.net/saxon6.5.3/conditions.html - license = stdenv.lib.licenses.mpl10; + license = lib.licenses.mpl10; }; saxonb_8_8 = common { diff --git a/pkgs/development/libraries/java/smack/default.nix b/pkgs/development/libraries/java/smack/default.nix index c1d41e7743d..f831bfc8b93 100644 --- a/pkgs/development/libraries/java/smack/default.nix +++ b/pkgs/development/libraries/java/smack/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation { name = "smack-4.1.9"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { meta = { description = "A XMPP (Jabber) client library for instant messaging and presence"; homepage = "http://www.igniterealtime.org/projects/smack/"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.asl20; + platforms = lib.platforms.unix; + license = lib.licenses.asl20; }; } diff --git a/pkgs/development/libraries/java/swt/default.nix b/pkgs/development/libraries/java/swt/default.nix index b96c9171324..bf35490f9a8 100644 --- a/pkgs/development/libraries/java/swt/default.nix +++ b/pkgs/development/libraries/java/swt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, unzip, jdk, pkgconfig, gtk2 +{ stdenv, lib, fetchurl, unzip, jdk, pkg-config, gtk2 , libXt, libXtst, libXi, libGLU, libGL, webkitgtk, libsoup, xorg , pango, gdk-pixbuf, glib }: @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { sourceRoot = "."; - nativeBuildInputs = [ unzip pkgconfig ]; + nativeBuildInputs = [ unzip pkg-config ]; buildInputs = [ jdk gtk2 libXt libXtst libXi libGLU libGL webkitgtk libsoup ]; NIX_LFLAGS = toString (map (x: "-L${lib.getLib x}/lib") [ xorg.libX11 pango gdk-pixbuf glib ]) + @@ -63,7 +63,7 @@ in stdenv.mkDerivation rec { cd out && jar -c * > $out/jars/swt.jar ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.eclipse.org/swt/"; description = "An widget toolkit for Java to access the user-interface facilities of the operating systems on which it is implemented"; license = licenses.epl10; diff --git a/pkgs/development/libraries/jbig2dec/default.nix b/pkgs/development/libraries/jbig2dec/default.nix index 4004c9f387e..6f9d88d6366 100644 --- a/pkgs/development/libraries/jbig2dec/default.nix +++ b/pkgs/development/libraries/jbig2dec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3, autoreconfHook }: +{ lib, stdenv, fetchurl, python3, autoreconfHook }: stdenv.mkDerivation rec { pname = "jbig2dec"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.jbig2dec.com/"; description = "Decoder implementation of the JBIG2 image compression format"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/jbigkit/default.nix b/pkgs/development/libraries/jbigkit/default.nix index c21d51bc5a7..ab55e76f29a 100644 --- a/pkgs/development/libraries/jbigkit/default.nix +++ b/pkgs/development/libraries/jbigkit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "jbigkit-2.1"; @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { makeFlags = [ "CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" - "AR=${stdenv.lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar" - "RANLIB=${stdenv.lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib" + "AR=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar" + "RANLIB=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib" ]; postPatch = '' @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.cl.cam.ac.uk/~mgk25/jbigkit/"; description = "A software implementation of the JBIG1 data compression standard"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/jcal/default.nix b/pkgs/development/libraries/jcal/default.nix index a40de74037a..2b57bd4064b 100644 --- a/pkgs/development/libraries/jcal/default.nix +++ b/pkgs/development/libraries/jcal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook +{ lib, stdenv, fetchFromGitHub, autoreconfHook , readline }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { preAutoreconf = "cd sources/"; - meta = with stdenv.lib; { + meta = with lib; { description = "Jalali calendar is a small and portable free software library to manipulate date and time in Jalali calendar system"; homepage = "http://nongnu.org/jcal/"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/jemalloc/common.nix b/pkgs/development/libraries/jemalloc/common.nix index fc4f0f2fe6e..d5fe07b00f2 100644 --- a/pkgs/development/libraries/jemalloc/common.nix +++ b/pkgs/development/libraries/jemalloc/common.nix @@ -1,5 +1,5 @@ { version, sha256 }: -{ stdenv, fetchurl +{ lib, stdenv, fetchurl # By default, jemalloc puts a je_ prefix onto all its symbols on OSX, which # then stops downstream builds (mariadb in particular) from detecting it. This # option should remove the prefix and give us a working jemalloc. @@ -9,7 +9,7 @@ , disableInitExecTls ? false }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "jemalloc"; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://jemalloc.net"; description = "General purpose malloc(3) implementation"; longDescription = '' diff --git a/pkgs/development/libraries/jemalloc/jemalloc450.nix b/pkgs/development/libraries/jemalloc/jemalloc450.nix index d328ab8016a..85b4fb100f7 100644 --- a/pkgs/development/libraries/jemalloc/jemalloc450.nix +++ b/pkgs/development/libraries/jemalloc/jemalloc450.nix @@ -1,4 +1,4 @@ import ./common.nix { version = "4.5.0"; sha256 = "10373xhpc10pgmai9fkc1z0rs029qlcb3c0qfnvkbwdlcibdh2cl"; -} +} diff --git a/pkgs/development/libraries/jitterentropy/default.nix b/pkgs/development/libraries/jitterentropy/default.nix index 4cafa7434b1..11f6141872d 100644 --- a/pkgs/development/libraries/jitterentropy/default.nix +++ b/pkgs/development/libraries/jitterentropy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "jitterentropy"; version = "2.2.0"; @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { meta = { description = "Provides a noise source using the CPU execution timing jitter"; homepage = "https://github.com/smuellerDD/jitterentropy-library"; - license = with stdenv.lib.licenses; [ gpl2 bsd3 ]; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ johnazoidberg ]; + license = with lib.licenses; [ gpl2 bsd3 ]; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ johnazoidberg ]; }; } diff --git a/pkgs/development/libraries/jose/default.nix b/pkgs/development/libraries/jose/default.nix index 4c3095681ed..b15fead6269 100644 --- a/pkgs/development/libraries/jose/default.nix +++ b/pkgs/development/libraries/jose/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config , zlib, jansson, openssl }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "15ac8a656m66rd9qg4dj53smykwaagqv606h18w7fiqn0ykxl4vi"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ zlib jansson openssl ]; outputs = [ "out" "dev" "man" ]; diff --git a/pkgs/development/libraries/json-c/default.nix b/pkgs/development/libraries/json-c/default.nix index d72d5021434..5a77ea789af 100644 --- a/pkgs/development/libraries/json-c/default.nix +++ b/pkgs/development/libraries/json-c/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake }: +{ lib, stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { pname = "json-c"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A JSON implementation in C"; homepage = "https://github.com/json-c/json-c/wiki"; maintainers = with maintainers; [ lovek323 ]; diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix index f89d4bc4534..a820d947b7f 100644 --- a/pkgs/development/libraries/json-glib/default.nix +++ b/pkgs/development/libraries/json-glib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, meson, ninja, pkgconfig, gettext +{ lib, stdenv, fetchurl, glib, meson, ninja, pkg-config, gettext , gobject-introspection, fixDarwinDylibNames, gnome3 }: @@ -9,13 +9,13 @@ 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}/${lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "0ixwyis47v5bkx6h8a1iqlw3638cxcv57ivxv4gw2gaig51my33j"; }; propagatedBuildInputs = [ glib ]; - nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection glib ] - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ meson ninja pkg-config gettext gobject-introspection glib ] + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; outputs = [ "out" "dev" ]; @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A library providing (de)serialization support for the JavaScript Object Notation (JSON) format"; homepage = "https://wiki.gnome.org/Projects/JsonGlib"; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix index 73aaaec4e4c..71b0d7b9a92 100644 --- a/pkgs/development/libraries/jsoncpp/default.nix +++ b/pkgs/development/libraries/jsoncpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, python, validatePkgConfig, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, cmake, python, validatePkgConfig, fetchpatch }: stdenv.mkDerivation rec { pname = "jsoncpp"; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { "-DJSONCPP_WITH_CMAKE_PACKAGE=ON" ]; - meta = with stdenv.lib; { + meta = with lib; { inherit version; homepage = "https://github.com/open-source-parsers/jsoncpp"; description = "A C++ library for interacting with JSON"; diff --git a/pkgs/development/libraries/jsonrpc-glib/default.nix b/pkgs/development/libraries/jsonrpc-glib/default.nix index 61f357689c4..1ec9c3da41e 100644 --- a/pkgs/development/libraries/jsonrpc-glib/default.nix +++ b/pkgs/development/libraries/jsonrpc-glib/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, meson, ninja, glib, json-glib, pkgconfig, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43, gnome3 }: +{ lib, stdenv, fetchurl, meson, ninja, glib, json-glib, pkg-config, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43, gnome3 }: stdenv.mkDerivation rec { pname = "jsonrpc-glib"; version = "3.38.0"; outputs = [ "out" "dev" "devdoc" ]; - nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_43 ]; + nativeBuildInputs = [ meson ninja pkg-config gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_43 ]; buildInputs = [ glib json-glib ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "3F8ZFKkRUrcPqPyaEe3hMUirSvZE2yejZjI4jJJ6ioI="; }; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A library to communicate using the JSON-RPC 2.0 specification"; homepage = "https://gitlab.gnome.org/GNOME/jsonrpc-glib"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/judy/default.nix b/pkgs/development/libraries/judy/default.nix index ad422db3d48..037225b86e5 100644 --- a/pkgs/development/libraries/judy/default.nix +++ b/pkgs/development/libraries/judy/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation { name = "judy-1.0.5"; @@ -10,14 +10,14 @@ stdenv.mkDerivation { # gcc 4.8 optimisations break judy. # https://sourceforge.net/p/judy/mailman/message/31995144/ - preConfigure = stdenv.lib.optionalString stdenv.cc.isGNU '' + preConfigure = lib.optionalString stdenv.cc.isGNU '' configureFlagsArray+=("CFLAGS=-fno-strict-aliasing -fno-aggressive-loop-optimizations") ''; meta = { homepage = "http://judy.sourceforge.net/"; - license = stdenv.lib.licenses.lgpl21Plus; + license = lib.licenses.lgpl21Plus; description = "State-of-the-art C library that implements a sparse dynamic array"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/jxrlib/default.nix b/pkgs/development/libraries/jxrlib/default.nix index f0f5b9d7793..78cc48d8209 100644 --- a/pkgs/development/libraries/jxrlib/default.nix +++ b/pkgs/development/libraries/jxrlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python }: +{ lib, stdenv, fetchFromGitHub, python }: stdenv.mkDerivation rec { pname = "jxrlib"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0rk3hbh00nw0wgbfbqk1szrlfg3yq7w6ar16napww3nrlm9cj65w"; }; - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace Makefile \ --replace '-shared' '-dynamiclib -undefined dynamic_lookup' \ --replace '.so' '.dylib' @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { makeFlags = [ "DIR_INSTALL=$(out)" "SHARED=1" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Implementation of the JPEG XR image codec standard"; homepage = "https://jxrlib.codeplex.com"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix index 645d05afc2b..0aa400c644d 100644 --- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix +++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, cmake, pkgconfig }: +{ mkDerivation, lib, cmake, pkg-config }: mkDerivation { name = "extra-cmake-modules"; @@ -9,7 +9,7 @@ mkDerivation { outputs = [ "out" ]; # this package has no runtime components - propagatedBuildInputs = [ cmake pkgconfig ]; + propagatedBuildInputs = [ cmake pkg-config ]; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index 2eb9262d189..804749bbdb5 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, python2, perl, yacc, flex +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, python2, perl, yacc, flex , texinfo, perlPackages , openldap, libcap_ng, sqlite, openssl, db, libedit, pam , CoreFoundation, Security, SystemConfiguration }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "heimdal"; version = "7.7.0"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { patches = [ ./heimdal-make-missing-headers.patch ]; - nativeBuildInputs = [ autoreconfHook pkgconfig python2 perl yacc flex texinfo ] + nativeBuildInputs = [ autoreconfHook pkg-config python2 perl yacc flex texinfo ] ++ (with perlPackages; [ JSON ]); buildInputs = optionals (stdenv.isLinux) [ libcap_ng ] ++ [ db sqlite openssl libedit openldap pam] diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index 004d7d2227c..5ef9e496b94 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, perl, yacc, bootstrap_cmds +{ lib, stdenv, fetchurl, pkg-config, perl, yacc, bootstrap_cmds , openssl, openldap, libedit, keyutils # Extra Arguments @@ -16,7 +16,7 @@ let libOnly = type == "lib"; in -with stdenv.lib; +with lib; stdenv.mkDerivation rec { name = "${type}krb5-${version}"; majorVersion = "1.18"; # remove patches below with next upgrade @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { "ac_cv_printf_positional=yes" ]; - nativeBuildInputs = [ pkgconfig perl ] + nativeBuildInputs = [ pkg-config perl ] ++ optional (!libOnly) yacc # Provides the mig command used by the build scripts ++ optional stdenv.isDarwin bootstrap_cmds; diff --git a/pkgs/development/libraries/keybinder/default.nix b/pkgs/development/libraries/keybinder/default.nix index e3084b9733e..663abb15280 100644 --- a/pkgs/development/libraries/keybinder/default.nix +++ b/pkgs/development/libraries/keybinder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, gnome3 +{ lib, stdenv, fetchurl, autoconf, automake, libtool, pkg-config, gnome3 , gtk-doc, gtk2, python2Packages, lua, gobject-introspection }: @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { sha256 = "0kkplz5snycik5xknwq1s8rnmls3qsp32z09mdpmaacydcw7g3cf"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoconf automake libtool gnome3.gnome-common gtk-doc gtk2 python pygtk lua gobject-introspection @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { ./autogen.sh --prefix="$out" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for registering global key bindings"; longDescription = '' keybinder is a library for registering global keyboard shortcuts. diff --git a/pkgs/development/libraries/keybinder3/default.nix b/pkgs/development/libraries/keybinder3/default.nix index 1c8dbfdcd81..e291ec56bb2 100644 --- a/pkgs/development/libraries/keybinder3/default.nix +++ b/pkgs/development/libraries/keybinder3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, gnome3 +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, gnome3 , gtk-doc, gtk3, libX11, libXext, libXrender, gobject-introspection }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "196ibn86j54fywfwwgyh89i9wygm4vh7ls19fn20vrnm6ijlzh9r"; }; - nativeBuildInputs = [ autoconf automake libtool pkgconfig ]; + nativeBuildInputs = [ autoconf automake libtool pkg-config ]; buildInputs = [ gnome3.gnome-common gtk-doc gtk3 libX11 libXext libXrender gobject-introspection @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ./autogen.sh --prefix="$out" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for registering global key bindings"; homepage = "https://github.com/kupferlauncher/keybinder/"; license = licenses.mit; diff --git a/pkgs/development/libraries/keystone/default.nix b/pkgs/development/libraries/keystone/default.nix index 869d7ae1b02..70864bcf24a 100644 --- a/pkgs/development/libraries/keystone/default.nix +++ b/pkgs/development/libraries/keystone/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , pkg-config , cmake @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { python3 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Lightweight multi-platform, multi-architecture assembler framework"; homepage = "https://www.keystone-engine.org"; license = licenses.gpl2Only; diff --git a/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix b/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix index a42f1c0a513..f4688f34982 100644 --- a/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix +++ b/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, opencl-headers, cmake, withTracing ? false }: +{ lib, stdenv, fetchFromGitHub, opencl-headers, cmake, withTracing ? false }: stdenv.mkDerivation rec { name = "khronos-ocl-icd-loader-${version}"; @@ -11,12 +11,12 @@ stdenv.mkDerivation rec { sha256 = "0v2yi6d3g5qshzy6pjic09c5irwgds106yvr93q62f32psfblnmy"; }; - patches = stdenv.lib.lists.optional withTracing ./tracing.patch; + patches = lib.lists.optional withTracing ./tracing.patch; nativeBuildInputs = [ cmake ]; buildInputs = [ opencl-headers ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Offical Khronos OpenCL ICD Loader"; homepage = "https://github.com/KhronosGroup/OpenCL-ICD-Loader"; license = licenses.asl20; diff --git a/pkgs/development/libraries/kissfft/default.nix b/pkgs/development/libraries/kissfft/default.nix index 370f628ff7a..5395ac4ab9c 100644 --- a/pkgs/development/libraries/kissfft/default.nix +++ b/pkgs/development/libraries/kissfft/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch }: @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { "DATATYPE=double" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A mixed-radix Fast Fourier Transform based up on the KISS principle"; homepage = "https://github.com/mborgerding/kissfft"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/kmsxx/default.nix b/pkgs/development/libraries/kmsxx/default.nix index f00d7e59b74..65dce915f14 100644 --- a/pkgs/development/libraries/kmsxx/default.nix +++ b/pkgs/development/libraries/kmsxx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, libdrm +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libdrm , withPython ? false, python }: stdenv.mkDerivation { @@ -13,12 +13,12 @@ stdenv.mkDerivation { sha256 = "0xz4m9bk0naawxwpx5cy1j3cm6c8c9m5y551csk88y88x1g0z0xh"; }; - cmakeFlags = stdenv.lib.optional (!withPython) "-DKMSXX_ENABLE_PYTHON=OFF"; + cmakeFlags = lib.optional (!withPython) "-DKMSXX_ENABLE_PYTHON=OFF"; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libdrm python ]; - meta = with stdenv.lib; { + meta = with lib; { description = "C++11 library, utilities and python bindings for Linux kernel mode setting"; homepage = "https://github.com/tomba/kmsxx"; license = licenses.mpl20; diff --git a/pkgs/development/libraries/kpmcore/default.nix b/pkgs/development/libraries/kpmcore/default.nix index d2677f69f9f..315a38197a1 100644 --- a/pkgs/development/libraries/kpmcore/default.nix +++ b/pkgs/development/libraries/kpmcore/default.nix @@ -24,7 +24,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ extra-cmake-modules ]; - meta = with stdenv.lib; { + dontWrapQtApps = true; + + meta = with lib; { maintainers = with lib.maintainers; [ peterhoeg ]; # The build requires at least Qt 5.14: broken = lib.versionOlder qtbase.version "5.14"; diff --git a/pkgs/development/libraries/kyotocabinet/default.nix b/pkgs/development/libraries/kyotocabinet/default.nix index 9c360ce0531..4e8aa57d956 100644 --- a/pkgs/development/libraries/kyotocabinet/default.nix +++ b/pkgs/development/libraries/kyotocabinet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib }: +{ lib, stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { name = "kyotocabinet-1.2.76"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0g6js20x7vnpq4p8ghbw3mh9wpqksya9vwhzdx6dnlf354zjsal1"; }; - prePatch = stdenv.lib.optionalString stdenv.isDarwin '' + prePatch = lib.optionalString stdenv.isDarwin '' substituteInPlace kccommon.h \ --replace tr1/unordered_map unordered_map \ --replace tr1/unordered_set unordered_set \ @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://fallabs.com/kyotocabinet"; description = "A library of routines for managing a database"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/l-smash/default.nix b/pkgs/development/libraries/l-smash/default.nix index 34dab6bb3ff..b1b5fd01206 100644 --- a/pkgs/development/libraries/l-smash/default.nix +++ b/pkgs/development/libraries/l-smash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, which }: +{ lib, stdenv, fetchFromGitHub, which }: stdenv.mkDerivation rec { pname = "l-smash"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ which ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://l-smash.github.io/l-smash/"; description = "MP4 container utilities"; license = licenses.isc; diff --git a/pkgs/development/libraries/lame/default.nix b/pkgs/development/libraries/lame/default.nix index da3784100ab..8ed0962bece 100644 --- a/pkgs/development/libraries/lame/default.nix +++ b/pkgs/development/libraries/lame/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , nasmSupport ? true, nasm ? null # Assembly optimizations , cpmlSupport ? true # Compaq's fast math library #, efenceSupport ? false, libefence ? null # Use ElectricFence for malloc debugging @@ -20,7 +20,7 @@ let mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}"; in -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "lame"; version = "3.100"; diff --git a/pkgs/development/libraries/languagemachines/frog.nix b/pkgs/development/libraries/languagemachines/frog.nix index 4829d67de45..a44535fbf90 100644 --- a/pkgs/development/libraries/languagemachines/frog.nix +++ b/pkgs/development/libraries/languagemachines/frog.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl -, automake, autoconf, bzip2, libtar, libtool, pkgconfig, autoconf-archive +{ lib, stdenv, fetchurl +, automake, autoconf, bzip2, libtar, libtool, pkg-config, autoconf-archive , libxml2, icu , languageMachines }: @@ -13,7 +13,7 @@ stdenv.mkDerivation { version = release.version; src = fetchurl { inherit (release) url sha256; name = "frog-v${release.version}.tar.gz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ automake autoconf bzip2 libtar libtool autoconf-archive libxml2 icu languageMachines.ticcutils @@ -37,7 +37,7 @@ stdenv.mkDerivation { make check ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A Tagger-Lemmatizer-Morphological-Analyzer-Dependency-Parser for Dutch"; homepage = "https://languagemachines.github.io/frog"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/languagemachines/frogdata.nix b/pkgs/development/libraries/languagemachines/frogdata.nix index 196a697d8f6..7e890a8d09c 100644 --- a/pkgs/development/libraries/languagemachines/frogdata.nix +++ b/pkgs/development/libraries/languagemachines/frogdata.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl -, automake, autoconf, libtool, pkgconfig, autoconf-archive +{ lib, stdenv, fetchurl +, automake, autoconf, libtool, pkg-config, autoconf-archive }: let @@ -11,7 +11,7 @@ stdenv.mkDerivation { version = release.version; src = fetchurl { inherit (release) url sha256; name = "frogdata-${release.version}.tar.gz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ automake autoconf libtool autoconf-archive ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation { sh bootstrap.sh ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Data for Frog, a Tagger-Lemmatizer-Morphological-Analyzer-Dependency-Parser for Dutch"; homepage = "https://languagemachines.github.io/frog"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/languagemachines/libfolia.nix b/pkgs/development/libraries/languagemachines/libfolia.nix index 852615cbf3b..fc5e622bcf4 100644 --- a/pkgs/development/libraries/languagemachines/libfolia.nix +++ b/pkgs/development/libraries/languagemachines/libfolia.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl -, automake, autoconf, libtool, pkgconfig, autoconf-archive +{ lib, stdenv, fetchurl +, automake, autoconf, libtool, pkg-config, autoconf-archive , libxml2, icu, bzip2, libtar , languageMachines }: @@ -12,14 +12,14 @@ stdenv.mkDerivation { version = release.version; src = fetchurl { inherit (release) url sha256; name = "libfolia-${release.version}.tar.gz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ automake autoconf bzip2 libtool autoconf-archive libtar libxml2 icu languageMachines.ticcutils ]; preConfigure = "sh bootstrap.sh"; # compat with icu61+ https://github.com/unicode-org/icu/blob/release-64-2/icu4c/readme.html#L554 CXXFLAGS = [ "-DU_USING_ICU_NAMESPACE=1" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A C++ API for FoLiA documents; an XML-based linguistic annotation format."; homepage = "https://proycon.github.io/folia/"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/languagemachines/mbt.nix b/pkgs/development/libraries/languagemachines/mbt.nix index 9477abeef3f..efa9ada7d56 100644 --- a/pkgs/development/libraries/languagemachines/mbt.nix +++ b/pkgs/development/libraries/languagemachines/mbt.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl -, automake, autoconf, bzip2, libtar, libtool, pkgconfig, autoconf-archive +{ lib, stdenv, fetchurl +, automake, autoconf, bzip2, libtar, libtool, pkg-config, autoconf-archive , libxml2 , languageMachines }: @@ -13,7 +13,7 @@ stdenv.mkDerivation { version = release.version; src = fetchurl { inherit (release) url sha256; name = "mbt-${release.version}.tar.gz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ automake autoconf bzip2 libtar libtool autoconf-archive libxml2 languageMachines.ticcutils @@ -24,7 +24,7 @@ stdenv.mkDerivation { sh bootstrap.sh ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Memory Based Tagger"; homepage = "https://languagemachines.github.io/mbt/"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/languagemachines/ticcutils.nix b/pkgs/development/libraries/languagemachines/ticcutils.nix index 8676e08e417..c09f00b1160 100644 --- a/pkgs/development/libraries/languagemachines/ticcutils.nix +++ b/pkgs/development/libraries/languagemachines/ticcutils.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl -, automake, autoconf, libtool, pkgconfig, autoconf-archive +{ lib, stdenv, fetchurl +, automake, autoconf, libtool, pkg-config, autoconf-archive , libxml2, zlib, bzip2, libtar }: let @@ -11,7 +11,7 @@ stdenv.mkDerivation { version = release.version; src = fetchurl { inherit (release) url sha256; name = "ticcutils-${release.version}.tar.gz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ automake autoconf libtool autoconf-archive libxml2 # optional: zlib bzip2 libtar @@ -19,7 +19,7 @@ stdenv.mkDerivation { ]; preConfigure = "sh bootstrap.sh"; - meta = with stdenv.lib; { + meta = with lib; { description = "This module contains useful functions for general use in the TiCC software stack and beyond."; homepage = "https://github.com/LanguageMachines/ticcutils"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/languagemachines/timbl.nix b/pkgs/development/libraries/languagemachines/timbl.nix index b912ed97bd5..de22c41ec49 100644 --- a/pkgs/development/libraries/languagemachines/timbl.nix +++ b/pkgs/development/libraries/languagemachines/timbl.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl -, automake, autoconf, libtool, pkgconfig, autoconf-archive +{ lib, stdenv, fetchurl +, automake, autoconf, libtool, pkg-config, autoconf-archive , libxml2, bzip2, libtar , languageMachines }: @@ -13,14 +13,14 @@ stdenv.mkDerivation { version = release.version; src = fetchurl { inherit (release) url sha256; name = "timbl-${release.version}.tar.gz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ automake autoconf bzip2 libtar libtool autoconf-archive libxml2 languageMachines.ticcutils ]; preConfigure = "sh bootstrap.sh"; - meta = with stdenv.lib; { + meta = with lib; { description = "TiMBL implements several memory-based learning algorithms"; homepage = "https://github.com/LanguageMachines/timbl/"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/languagemachines/timblserver.nix b/pkgs/development/libraries/languagemachines/timblserver.nix index e0634103a7e..27812e8b3f0 100644 --- a/pkgs/development/libraries/languagemachines/timblserver.nix +++ b/pkgs/development/libraries/languagemachines/timblserver.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl -, automake, autoconf, bzip2, libtar, libtool, pkgconfig, autoconf-archive +{ lib, stdenv, fetchurl +, automake, autoconf, bzip2, libtar, libtool, pkg-config, autoconf-archive , libxml2 , languageMachines }: @@ -13,7 +13,7 @@ stdenv.mkDerivation { version = release.version; src = fetchurl { inherit (release) url sha256; name = "timblserver-${release.version}.tar.gz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ automake autoconf bzip2 libtar libtool autoconf-archive libxml2 languageMachines.ticcutils @@ -21,7 +21,7 @@ stdenv.mkDerivation { ]; preConfigure = "sh bootstrap.sh"; - meta = with stdenv.lib; { + meta = with lib; { description = "This server for TiMBL implements several memory-based learning algorithms"; homepage = "https://github.com/LanguageMachines/timblserver/"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/languagemachines/ucto.nix b/pkgs/development/libraries/languagemachines/ucto.nix index d60ff5fa246..d8c8d99552c 100644 --- a/pkgs/development/libraries/languagemachines/ucto.nix +++ b/pkgs/development/libraries/languagemachines/ucto.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl -, automake, autoconf, libtool, pkgconfig, autoconf-archive +{ lib, stdenv, fetchurl +, automake, autoconf, libtool, pkg-config, autoconf-archive , libxml2, icu, bzip2, libtar , languageMachines }: @@ -13,7 +13,7 @@ stdenv.mkDerivation { version = release.version; src = fetchurl { inherit (release) url sha256; name = "ucto-${release.version}.tar.gz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ automake autoconf bzip2 libtool autoconf-archive icu libtar libxml2 languageMachines.ticcutils @@ -32,7 +32,7 @@ stdenv.mkDerivation { done; ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A rule-based tokenizer for natural language"; homepage = "https://languagemachines.github.io/ucto/"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/languagemachines/uctodata.nix b/pkgs/development/libraries/languagemachines/uctodata.nix index 29eaf78b75a..cad63622724 100644 --- a/pkgs/development/libraries/languagemachines/uctodata.nix +++ b/pkgs/development/libraries/languagemachines/uctodata.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl -, automake, autoconf, libtool, pkgconfig, autoconf-archive +{ lib, stdenv, fetchurl +, automake, autoconf, libtool, pkg-config, autoconf-archive }: let @@ -11,11 +11,11 @@ stdenv.mkDerivation { version = release.version; src = fetchurl { inherit (release) url sha256; name = "uctodata-${release.version}.tar.gz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ automake autoconf libtool autoconf-archive ]; preConfigure = "sh bootstrap.sh"; - meta = with stdenv.lib; { + meta = with lib; { description = "A rule-based tokenizer for natural language"; homepage = "https://languagemachines.github.io/ucto/"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/lasem/default.nix b/pkgs/development/libraries/lasem/default.nix index b3742514ced..22f0436edca 100644 --- a/pkgs/development/libraries/lasem/default.nix +++ b/pkgs/development/libraries/lasem/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, intltool, gobject-introspection, glib, gdk-pixbuf +{ fetchurl, lib, stdenv, pkg-config, intltool, gobject-introspection, glib, gdk-pixbuf , libxml2, cairo, pango, gnome3 }: stdenv.mkDerivation rec { @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { outputs = [ "bin" "out" "dev" "man" "doc" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0fds3fsx84ylsfvf55zp65y8xqjj5n8gbhcsk02vqglivk7izw4v"; }; - nativeBuildInputs = [ pkgconfig intltool gobject-introspection ]; + nativeBuildInputs = [ pkg-config intltool gobject-introspection ]; propagatedBuildInputs = [ glib gdk-pixbuf libxml2 cairo pango @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { description = "SVG and MathML rendering library"; homepage = "https://wiki.gnome.org/Projects/Lasem"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/lasso/default.nix b/pkgs/development/libraries/lasso/default.nix index c79b4a51262..24efa689c58 100644 --- a/pkgs/development/libraries/lasso/default.nix +++ b/pkgs/development/libraries/lasso/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoconf, automake, autoreconfHook, fetchurl, glib, gobject-introspection, gtk-doc, libtool, libxml2, libxslt, openssl, pkgconfig, python27Packages, xmlsec, zlib }: +{ lib, stdenv, autoconf, automake, autoreconfHook, fetchurl, glib, gobject-introspection, gtk-doc, libtool, libxml2, libxslt, openssl, pkg-config, python27Packages, xmlsec, zlib }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ autoconf automake glib gobject-introspection gtk-doc libtool libxml2 libxslt openssl python27Packages.six xmlsec zlib ]; configurePhase = '' @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { --prefix=$out ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://lasso.entrouvert.org/"; description = "Liberty Alliance Single Sign-On library"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/lcms/default.nix b/pkgs/development/libraries/lcms/default.nix index 8fe2484faca..9a957a11924 100644 --- a/pkgs/development/libraries/lcms/default.nix +++ b/pkgs/development/libraries/lcms/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { pname = "lcms"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Color management engine"; homepage = "http://www.littlecms.com/"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.mit; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/lcms2/default.nix b/pkgs/development/libraries/lcms2/default.nix index 6e81dfc0718..129b5785198 100644 --- a/pkgs/development/libraries/lcms2/default.nix +++ b/pkgs/development/libraries/lcms2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libtiff, libjpeg, zlib }: +{ lib, stdenv, fetchurl, libtiff, libjpeg, zlib }: stdenv.mkDerivation rec { name = "lcms2-2.11"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { # See https://trac.macports.org/ticket/60656 LDFLAGS = if stdenv.hostPlatform.isDarwin then "-Wl,-w" else null; - meta = with stdenv.lib; { + meta = with lib; { description = "Color management engine"; homepage = "http://www.littlecms.com/"; license = licenses.mit; diff --git a/pkgs/development/libraries/ldacbt/default.nix b/pkgs/development/libraries/ldacbt/default.nix index 36a0c8e1316..36092507b8a 100644 --- a/pkgs/development/libraries/ldacbt/default.nix +++ b/pkgs/development/libraries/ldacbt/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "AOSP libldac dispatcher"; homepage = "https://github.com/EHfive/ldacBT"; license = licenses.asl20; diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix index 9810234eefa..ba035eed05b 100644 --- a/pkgs/development/libraries/ldb/default.nix +++ b/pkgs/development/libraries/ldb/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , python3 , pkg-config @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { stripDebugList = [ "bin" "lib" "modules" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A LDAP-like embedded database"; homepage = "https://ldb.samba.org/"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix index f64d263901b..5873e707e7c 100644 --- a/pkgs/development/libraries/ldns/default.nix +++ b/pkgs/development/libraries/ldns/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, perl, which, dns-root-data }: +{ lib, stdenv, fetchurl, openssl, perl, which, dns-root-data }: stdenv.mkDerivation rec { pname = "ldns"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { "--with-drill" "--disable-gost" "--with-examples" - ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "ac_cv_func_malloc_0_nonnull=yes" "ac_cv_func_realloc_0_nonnull=yes" ]; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { moveToOutput "bin/ldns-config" "$dev" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Library with the aim of simplifying DNS programming in C"; license = licenses.bsd3; homepage = "http://www.nlnetlabs.nl/projects/ldns/"; diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index 7f1c292c5f1..8a9c80a6175 100644 --- a/pkgs/development/libraries/leatherman/default.nix +++ b/pkgs/development/libraries/leatherman/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, boost, cmake, curl, ruby }: +{ lib, stdenv, fetchFromGitHub, boost, cmake, curl, ruby }: stdenv.mkDerivation rec { pname = "leatherman"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ boost curl ruby ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/puppetlabs/leatherman/"; description = "A collection of C++ and CMake utility libraries"; license = licenses.asl20; diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix index e9e8d3447b9..23675c9f9f8 100644 --- a/pkgs/development/libraries/lensfun/default.nix +++ b/pkgs/development/libraries/lensfun/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkg-config, glib, zlib, libpng, cmake }: +{ lib, stdenv, fetchFromGitHub, pkg-config, glib, zlib, libpng, cmake }: let version = "0.3.95"; @@ -35,10 +35,10 @@ stdenv.mkDerivation { cmakeFlags = [ "-DINSTALL_HELPER_SCRIPTS=OFF" ]; - meta = with stdenv.lib; { + meta = with lib; { platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ flokli ]; - license = stdenv.lib.licenses.lgpl3; + license = lib.licenses.lgpl3; description = "An opensource database of photographic lenses and their characteristics"; homepage = "https://lensfun.github.io"; }; diff --git a/pkgs/development/libraries/leptonica/default.nix b/pkgs/development/libraries/leptonica/default.nix index a0f0814fec5..11f1c7fd9c6 100644 --- a/pkgs/development/libraries/leptonica/default.nix +++ b/pkgs/development/libraries/leptonica/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, which, gnuplot +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, which, gnuplot , giflib, libjpeg, libpng, libtiff, libwebp, openjpeg, zlib }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "192bs676ind8627f0v3v8d1q7r4xwc7q0zvbdbxn1fgvmv14d77c"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ giflib libjpeg libpng libtiff libwebp openjpeg zlib ]; enableParallelBuilding = true; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Image processing and analysis library"; homepage = "http://www.leptonica.org/"; - license = stdenv.lib.licenses.bsd2; # http://www.leptonica.org/about-the-license.html - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.bsd2; # http://www.leptonica.org/about-the-license.html + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/lesstif/default.nix b/pkgs/development/libraries/lesstif/default.nix index 6e68a9128d0..d0ba4718655 100644 --- a/pkgs/development/libraries/lesstif/default.nix +++ b/pkgs/development/libraries/lesstif/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, xlibsWrapper, libXp, libXau}: +{lib, stdenv, fetchurl, xlibsWrapper, libXp, libXau}: stdenv.mkDerivation rec { name = "lesstif-0.95.2"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ./c-xpmpipethrough.patch ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An open source clone of the Motif widget set"; homepage = "http://lesstif.sourceforge.net"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/leveldb/default.nix b/pkgs/development/libraries/leveldb/default.nix index 14d426701ba..0a1dabef328 100644 --- a/pkgs/development/libraries/leveldb/default.nix +++ b/pkgs/development/libraries/leveldb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fixDarwinDylibNames, snappy }: +{ lib, stdenv, fetchFromGitHub, fixDarwinDylibNames, snappy }: stdenv.mkDerivation rec { pname = "leveldb"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ snappy ]; nativeBuildInputs = [] - ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; buildPhase = '' make all @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { cp out-static/leveldbutil $out/bin "; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/google/leveldb"; description = "Fast and lightweight key/value database library by Google"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/levmar/default.nix b/pkgs/development/libraries/levmar/default.nix index e8ef17081c9..c5d6877a844 100644 --- a/pkgs/development/libraries/levmar/default.nix +++ b/pkgs/development/libraries/levmar/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl }: - +{ lib, stdenv, fetchurl }: + stdenv.mkDerivation rec { name = "levmar-2.6"; @@ -19,10 +19,10 @@ stdenv.mkDerivation rec { cp liblevmar.a $out/lib ''; - meta = { + meta = { description = "ANSI C implementations of Levenberg-Marquardt, usable also from C++"; homepage = "https://www.ics.forth.gr/~lourakis/levmar/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/lib3ds/default.nix b/pkgs/development/libraries/lib3ds/default.nix index 406b61e4393..db0bd26f4d2 100644 --- a/pkgs/development/libraries/lib3ds/default.nix +++ b/pkgs/development/libraries/lib3ds/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, unzip }: - +{ lib, stdenv, fetchurl, unzip }: + stdenv.mkDerivation rec { name = "lib3ds-1.3.0"; @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { buildInputs = [ unzip ]; - meta = { + meta = { description = "Library for managing 3D-Studio Release 3 and 4 \".3DS\" files"; homepage = "http://lib3ds.sourceforge.net/"; license = "LGPL"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/lib3mf/default.nix b/pkgs/development/libraries/lib3mf/default.nix index 10732a14e48..fec910bd595 100644 --- a/pkgs/development/libraries/lib3mf/default.nix +++ b/pkgs/development/libraries/lib3mf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, ninja, libuuid, libossp_uuid, gtest }: +{ lib, stdenv, fetchFromGitHub, cmake, ninja, libuuid, libossp_uuid, gtest }: stdenv.mkDerivation rec { pname = "lib3mf"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { sed -i 's,=''${\(exec_\)\?prefix}/,=,' lib3MF.pc.in ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Reference implementation of the 3D Manufacturing Format file standard"; homepage = "https://3mf.io/"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/libAfterImage/default.nix b/pkgs/development/libraries/libAfterImage/default.nix index 8936603d18b..1c88459ba9b 100644 --- a/pkgs/development/libraries/libAfterImage/default.nix +++ b/pkgs/development/libraries/libAfterImage/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib }: +{ lib, stdenv, fetchurl, zlib }: stdenv.mkDerivation { pname = "libAfterImage"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { buildInputs = [ zlib ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.afterstep.org/afterimage/"; description = "A generic image manipulation library"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libHX/default.nix b/pkgs/development/libraries/libHX/default.nix index 59afede9cae..c059b9d412a 100644 --- a/pkgs/development/libraries/libHX/default.nix +++ b/pkgs/development/libraries/libHX/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake, libtool }: +{ lib, stdenv, fetchurl, autoconf, automake, libtool }: stdenv.mkDerivation rec { name = "libHX-3.22"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sh autogen.sh ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://libhx.sourceforge.net/"; longDescription = '' libHX is a C library (with some C++ bindings available) that provides data structures diff --git a/pkgs/development/libraries/libLAS/default.nix b/pkgs/development/libraries/libLAS/default.nix index 714708a6e0d..7d762fc8077 100644 --- a/pkgs/development/libraries/libLAS/default.nix +++ b/pkgs/development/libraries/libLAS/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, cmake, gdal, libgeotiff, libtiff, LASzip2, fixDarwinDylibNames }: +{ lib, stdenv, fetchurl, boost, cmake, gdal, libgeotiff, libtiff, LASzip2, fixDarwinDylibNames }: stdenv.mkDerivation rec { name = "libLAS-1.8.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0xjfxb3ydvr2258ji3spzyf81g9caap19ql2pk91wiivqsc4mnws"; }; - nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ boost gdal libgeotiff libtiff LASzip2 ]; cmakeFlags = [ @@ -20,15 +20,15 @@ stdenv.mkDerivation rec { "-DCMAKE_EXE_LINKER_FLAGS=-pthread" ]; - postFixup = stdenv.lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.isDarwin '' install_name_tool -change "@rpath/liblas.3.dylib" "$out/lib/liblas.3.dylib" $out/lib/liblas_c.dylib ''; meta = { description = "LAS 1.0/1.1/1.2 ASPRS LiDAR data translation toolset"; homepage = "https://liblas.org"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.michelk ]; + license = lib.licenses.bsd3; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.michelk ]; }; } diff --git a/pkgs/development/libraries/libaacs/default.nix b/pkgs/development/libraries/libaacs/default.nix index d6c90ee172b..c3934db5b3f 100644 --- a/pkgs/development/libraries/libaacs/default.nix +++ b/pkgs/development/libraries/libaacs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libgcrypt, libgpgerror, yacc, flex }: +{ lib, stdenv, fetchurl, libgcrypt, libgpgerror, yacc, flex }: # library that allows libbluray to play AACS protected bluray disks # libaacs does not infringe DRM's right or copyright. See the legal page of the website for more info. @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ yacc flex ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.videolan.org/developers/libaacs.html"; description = "Library to access AACS protected Blu-Ray disks"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libaal/default.nix b/pkgs/development/libraries/libaal/default.nix index fdfd855470d..e3c960681c5 100644 --- a/pkgs/development/libraries/libaal/default.nix +++ b/pkgs/development/libraries/libaal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { version = "1.0.6"; @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.namesys.com/"; description = "Support library for Reiser4"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/development/libraries/libabigail/default.nix b/pkgs/development/libraries/libabigail/default.nix index 54dbb349eb6..7543c6ddff7 100644 --- a/pkgs/development/libraries/libabigail/default.nix +++ b/pkgs/development/libraries/libabigail/default.nix @@ -1,9 +1,9 @@ -{ stdenv +{ lib, stdenv , fetchurl , autoreconfHook , elfutils , libxml2 -, pkgconfig +, pkg-config , strace , python3 }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config strace ]; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { patchShebangs tests/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "ABI Generic Analysis and Instrumentation Library"; homepage = "https://sourceware.org/libabigail/"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/libraries/libabw/default.nix b/pkgs/development/libraries/libabw/default.nix index 91107ad4cb0..f1c4f49adc6 100644 --- a/pkgs/development/libraries/libabw/default.nix +++ b/pkgs/development/libraries/libabw/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, doxygen, gperf, pkgconfig, librevenge, libxml2, perl }: +{ lib, stdenv, fetchurl, boost, doxygen, gperf, pkg-config, librevenge, libxml2, perl }: stdenv.mkDerivation rec { pname = "libabw"; @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { sed -i 's,^CPPFLAGS.*,\0 -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED,' src/lib/Makefile.in ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ boost doxygen gperf librevenge libxml2 perl ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.documentfoundation.org/DLP/Libraries/libabw"; description = "Library parsing abiword documents"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libaccounts-glib/default.nix b/pkgs/development/libraries/libaccounts-glib/default.nix index 07e0a3500a7..8dfc222f36a 100644 --- a/pkgs/development/libraries/libaccounts-glib/default.nix +++ b/pkgs/development/libraries/libaccounts-glib/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitLab, meson, ninja, glib, check, python3, vala, gtk-doc, glibcLocales -, libxml2, libxslt, pkgconfig, sqlite, docbook_xsl, docbook_xml_dtd_43, gobject-introspection }: +{ lib, stdenv, fetchFromGitLab, meson, ninja, glib, check, python3, vala, gtk-doc, glibcLocales +, libxml2, libxslt, pkg-config, sqlite, docbook_xsl, docbook_xml_dtd_43, gobject-introspection }: stdenv.mkDerivation rec { pname = "libaccounts-glib"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { gtk-doc meson ninja - pkgconfig + pkg-config vala ]; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { "-Dpy-overrides-dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for managing accounts which can be used from GLib applications"; platforms = platforms.linux; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libaec/default.nix b/pkgs/development/libraries/libaec/default.nix index bf6fd029de1..4c539860be7 100644 --- a/pkgs/development/libraries/libaec/default.nix +++ b/pkgs/development/libraries/libaec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab +{ lib, stdenv, fetchFromGitLab , cmake }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cmake ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://gitlab.dkrz.de/k202009/libaec"; description = "Adaptive Entropy Coding library"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/libagar/default.nix b/pkgs/development/libraries/libagar/default.nix index 616879a979c..7aeccdf583e 100644 --- a/pkgs/development/libraries/libagar/default.nix +++ b/pkgs/development/libraries/libagar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libtool, perl, bsdbuild, gettext, mandoc +{ lib, stdenv, fetchurl, pkg-config, libtool, perl, bsdbuild, gettext, mandoc , libpng, libjpeg, xlibsWrapper, libXinerama, freetype, SDL, libGLU, libGL , libsndfile, portaudio, libmysqlclient, fontconfig }: @@ -26,14 +26,14 @@ stdenv.mkDerivation { outputs = [ "out" "devdoc" ]; - nativeBuildInputs = [ pkgconfig libtool gettext ]; + nativeBuildInputs = [ pkg-config libtool gettext ]; buildInputs = [ bsdbuild perl xlibsWrapper libXinerama SDL libGL libmysqlclient mandoc freetype.dev libpng libjpeg.dev fontconfig portaudio libsndfile ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Cross-platform GUI toolkit"; homepage = "http://libagar.org/index.html"; license = with licenses; bsd3; diff --git a/pkgs/development/libraries/libagar/libagar_test.nix b/pkgs/development/libraries/libagar/libagar_test.nix index 4de113718d4..2b31da7aa53 100644 --- a/pkgs/development/libraries/libagar/libagar_test.nix +++ b/pkgs/development/libraries/libagar/libagar_test.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bsdbuild, libagar, perl, libjpeg, libpng, openssl }: +{ lib, stdenv, fetchurl, bsdbuild, libagar, perl, libjpeg, libpng, openssl }: let srcs = import ./srcs.nix { inherit fetchurl; }; in stdenv.mkDerivation { @@ -17,7 +17,7 @@ stdenv.mkDerivation { buildInputs = [ perl bsdbuild libagar libjpeg libpng openssl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Tests for libagar"; homepage = "http://libagar.org/index.html"; license = with licenses; bsd3; diff --git a/pkgs/development/libraries/libamqpcpp/default.nix b/pkgs/development/libraries/libamqpcpp/default.nix index eca7170bfff..67404f9e5cf 100644 --- a/pkgs/development/libraries/libamqpcpp/default.nix +++ b/pkgs/development/libraries/libamqpcpp/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, openssl }: +{ lib, stdenv, fetchFromGitHub, openssl }: stdenv.mkDerivation rec { pname = "libamqpcpp"; - version = "4.3.10"; + version = "4.3.11"; src = fetchFromGitHub { owner = "CopernicaMarketingSoftware"; repo = "AMQP-CPP"; rev = "v${version}"; - sha256 = "0yy6sq4rvv9c0f09vljnqx92zvr39bn1spl735hzn6253d7fm3a5"; + sha256 = "sha256-ZEvzZ++0f7Kf3iVbf3vQbyE8yd/dasU+dSxDDUu8Xug="; }; buildInputs = [ openssl ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for communicating with a RabbitMQ server"; homepage = "https://github.com/CopernicaMarketingSoftware/AMQP-CPP"; license = licenses.asl20; diff --git a/pkgs/development/libraries/libantlr3c/default.nix b/pkgs/development/libraries/libantlr3c/default.nix index 4c3d1d2a213..d51eac7bdb6 100644 --- a/pkgs/development/libraries/libantlr3c/default.nix +++ b/pkgs/development/libraries/libantlr3c/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation { name = "libantlr3c-3.4"; @@ -7,9 +7,9 @@ stdenv.mkDerivation { sha256 ="0lpbnb4dq4azmsvlhp6khq1gy42kyqyjv8gww74g5lm2y6blm4fa"; }; - configureFlags = stdenv.lib.optional stdenv.is64bit "--enable-64bit"; + configureFlags = lib.optional stdenv.is64bit "--enable-64bit"; - meta = with stdenv.lib; { + meta = with lib; { description = "C runtime libraries of ANTLR v3"; homepage = "https://www.antlr3.org/"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix index 3ecee2599f6..99d38f0cfc4 100644 --- a/pkgs/development/libraries/libao/default.nix +++ b/pkgs/development/libraries/libao/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig, libpulseaudio, alsaLib, libcap +{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkg-config, libpulseaudio, alsaLib, libcap , CoreAudio, CoreServices, AudioUnit , usePulseAudio }: @@ -26,9 +26,9 @@ stdenv.mkDerivation rec { lib.optionals stdenv.isLinux [ alsaLib libcap ] ++ lib.optionals stdenv.isDarwin [ CoreAudio CoreServices AudioUnit ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { longDescription = '' Libao is Xiph.org's cross-platform audio library that allows programs to output audio using a simple API on a wide variety of diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix index 2c67e6ac158..9706cda03f8 100644 --- a/pkgs/development/libraries/libaom/default.nix +++ b/pkgs/development/libraries/libaom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, yasm, perl, cmake, pkgconfig, python3 }: +{ lib, stdenv, fetchgit, yasm, perl, cmake, pkg-config, python3 }: stdenv.mkDerivation rec { pname = "libaom"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { patches = [ ./outputs.patch ]; nativeBuildInputs = [ - yasm perl cmake pkgconfig python3 + yasm perl cmake pkg-config python3 ]; preConfigure = '' @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "bin" "dev" "static" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Alliance for Open Media AV1 codec library"; longDescription = '' Libaom is the reference implementation of the AV1 codec from the Alliance diff --git a/pkgs/development/libraries/libaosd/default.nix b/pkgs/development/libraries/libaosd/default.nix index c33f3a873a6..a6b9d531abf 100644 --- a/pkgs/development/libraries/libaosd/default.nix +++ b/pkgs/development/libraries/libaosd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cairo, pango, +{ lib, stdenv, fetchFromGitHub, pkg-config, cairo, pango, libX11, libXcomposite, autoconf, automake }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1cn7k0n74p6jp25kxwcyblhmbdvgw3mikvj0m2jh4c6xccfrgb9a"; }; - nativeBuildInputs = [ autoconf automake pkgconfig ]; + nativeBuildInputs = [ autoconf automake pkg-config ]; buildInputs = [ cairo pango libX11 libXcomposite ]; enableParallelBuilding = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - meta = with stdenv.lib; { + meta = with lib; { longDescription = '' libaosd is an advanced on screen display library. diff --git a/pkgs/development/libraries/libappindicator/default.nix b/pkgs/development/libraries/libappindicator/default.nix index 7a7ad22756c..469235e2e6a 100644 --- a/pkgs/development/libraries/libappindicator/default.nix +++ b/pkgs/development/libraries/libappindicator/default.nix @@ -1,7 +1,7 @@ # TODO: Resolve the issues with the Mono bindings. { stdenv, fetchgit, lib -, pkgconfig, autoreconfHook +, pkg-config, autoreconfHook , glib, dbus-glib, gtkVersion ? "3" , gtk2 ? null, libindicator-gtk2 ? null, libdbusmenu-gtk2 ? null , gtk3 ? null, libindicator-gtk3 ? null, libdbusmenu-gtk3 ? null @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { sha256 = "0xjvbl4gn7ra2fs6gn2g9s787kzb5cg9hv79iqsz949rxh4iw32d"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook vala gobject-introspection gtk-doc ]; + nativeBuildInputs = [ pkg-config autoreconfHook vala gobject-introspection gtk-doc ]; propagatedBuildInputs = if gtkVersion == "2" diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index 787745a6bda..f53d1b1a12f 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -1,5 +1,5 @@ { - fetchFromGitHub, stdenv, pkgconfig, autoreconfHook, + fetchFromGitHub, lib, stdenv, pkg-config, autoreconfHook, acl, attr, bzip2, e2fsprogs, libxml2, lzo, openssl, sharutils, xz, zlib, zstd, # Optional but increases closure only negligibly. Also, while libxml2 @@ -12,28 +12,28 @@ assert xarSupport -> libxml2 != null; stdenv.mkDerivation rec { pname = "libarchive"; - version = "3.5.0"; + version = "3.5.1"; src = fetchFromGitHub { owner = "libarchive"; repo = "libarchive"; rev = "v${version}"; - sha256 = "0dj01ayyac3q5a62rqxyskr4fjiq6iappd85zn3rx64xny5fl07d"; + sha256 = "sha256-RFPhe4PCq8OLwa6c7ir+5u9jBsUxS5M/fcZYAG9W6R0="; }; outputs = [ "out" "lib" "dev" ]; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = - stdenv.lib.optional stdenv.hostPlatform.isUnix sharutils + lib.optional stdenv.hostPlatform.isUnix sharutils ++ [ zlib bzip2 openssl xz lzo zstd ] - ++ stdenv.lib.optionals stdenv.isLinux [ e2fsprogs attr acl ] - ++ stdenv.lib.optional xarSupport libxml2; + ++ lib.optionals stdenv.isLinux [ e2fsprogs attr acl ] + ++ lib.optional xarSupport libxml2; - # Without this, pkgconfig-based dependencies are unhappy - propagatedBuildInputs = stdenv.lib.optionals stdenv.isLinux [ attr acl ]; + # Without this, pkg-config-based dependencies are unhappy + propagatedBuildInputs = lib.optionals stdenv.isLinux [ attr acl ]; - configureFlags = stdenv.lib.optional (!xarSupport) "--without-xml2"; + configureFlags = lib.optional (!xarSupport) "--without-xml2"; preBuild = if stdenv.isCygwin then '' echo "#include <windows.h>" >> config.h @@ -58,8 +58,8 @@ stdenv.mkDerivation rec { ''; homepage = "http://libarchive.org"; changelog = "https://github.com/libarchive/libarchive/releases/tag/v${version}"; - license = stdenv.lib.licenses.bsd3; - platforms = with stdenv.lib.platforms; all; - maintainers = with stdenv.lib.maintainers; [ jcumming ]; + license = lib.licenses.bsd3; + platforms = with lib.platforms; all; + maintainers = with lib.maintainers; [ jcumming ]; }; } diff --git a/pkgs/development/libraries/libargon2/default.nix b/pkgs/development/libraries/libargon2/default.nix index f559c10456b..2003c8957ff 100644 --- a/pkgs/development/libraries/libargon2/default.nix +++ b/pkgs/development/libraries/libargon2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, fixDarwinDylibNames }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, fixDarwinDylibNames }: stdenv.mkDerivation rec { pname = "libargon2"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { "PKGCONFIG_REL=lib" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A key derivation function that was selected as the winner of the Password Hashing Competition in July 2015"; longDescription = '' A password-hashing function created by by Alex Biryukov, Daniel Dinu, and diff --git a/pkgs/development/libraries/libasr/default.nix b/pkgs/development/libraries/libasr/default.nix index 561e7e1017d..8d5b6d128dd 100644 --- a/pkgs/development/libraries/libasr/default.nix +++ b/pkgs/development/libraries/libasr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libevent, openssl }: +{ lib, stdenv, fetchurl, libevent, openssl }: stdenv.mkDerivation rec { pname = "libasr"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ libevent openssl ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/OpenSMTPD/libasr"; description = "Free, simple and portable asynchronous resolver library"; license = licenses.isc; diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix index 9d8cf7434c2..6a180cb62c1 100644 --- a/pkgs/development/libraries/libass/default.nix +++ b/pkgs/development/libraries/libass/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, yasm +{ lib, stdenv, fetchurl, pkg-config, yasm , freetype, fribidi, harfbuzz , encaSupport ? true, enca ? null # enca support , fontconfigSupport ? true, fontconfig ? null # fontconfig support @@ -14,7 +14,7 @@ let mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}"; in -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "libass"; version = "0.15.0"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { (mkFlag largeTilesSupport "large-tiles") ]; - nativeBuildInputs = [ pkgconfig yasm ]; + nativeBuildInputs = [ pkg-config yasm ]; buildInputs = [ freetype fribidi harfbuzz ] ++ optional encaSupport enca diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix index aa798668f8e..a531cdff5b9 100644 --- a/pkgs/development/libraries/libassuan/default.nix +++ b/pkgs/development/libraries/libassuan/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, gettext, npth, libgpgerror, buildPackages }: +{ fetchurl, lib, stdenv, gettext, npth, libgpgerror, buildPackages }: stdenv.mkDerivation rec { pname = "libassuan"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { sed -i 's,#include <gpg-error.h>,#include "${libgpgerror.dev}/include/gpg-error.h",g' $dev/include/assuan.h ''; - meta = with stdenv.lib; { + meta = with lib; { description = "IPC library used by GnuPG and related software"; longDescription = '' Libassuan is a small library implementing the so-called Assuan diff --git a/pkgs/development/libraries/libast/default.nix b/pkgs/development/libraries/libast/default.nix index dfe2dd76ef7..b48971bc431 100644 --- a/pkgs/development/libraries/libast/default.nix +++ b/pkgs/development/libraries/libast/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl -, pkgconfig }: +{ lib, stdenv, fetchurl +, pkg-config }: stdenv.mkDerivation rec { pname = "libast"; @@ -10,9 +10,9 @@ stdenv.mkDerivation rec { sha256 = "1w7bs46r4lykfd83kc3bg9i1rxzzlb4ydk23ikf8mx8avz05q1aj"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library of Assorted Spiffy Things"; homepage = "https://www.eterm.org"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/libasyncns/default.nix b/pkgs/development/libraries/libasyncns/default.nix index 9a91551c3a4..0dc26b68611 100644 --- a/pkgs/development/libraries/libasyncns/default.nix +++ b/pkgs/development/libraries/libasyncns/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "libasyncns-0.8"; @@ -8,12 +8,12 @@ stdenv.mkDerivation rec { sha256 = "0x5b6lcic4cd7q0bx00x93kvpyzl7n2abbgvqbrlzrfb8vknc6jg"; }; - configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + configureFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "ac_cv_func_malloc_0_nonnull=yes" "ac_cv_func_realloc_0_nonnull=yes" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://0pointer.de/lennart/projects/libasyncns/"; description = "A C library for Linux/Unix for executing name service queries asynchronously"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libatomic_ops/default.nix b/pkgs/development/libraries/libatomic_ops/default.nix index b576896876e..f9e850f91ff 100644 --- a/pkgs/development/libraries/libatomic_ops/default.nix +++ b/pkgs/development/libraries/libatomic_ops/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake, libtool }: +{ lib, stdenv, fetchurl, autoconf, automake, libtool }: stdenv.mkDerivation rec { pname = "libatomic_ops"; @@ -14,17 +14,17 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; - nativeBuildInputs = stdenv.lib.optionals stdenv.isCygwin [ autoconf automake libtool ]; + nativeBuildInputs = lib.optionals stdenv.isCygwin [ autoconf automake libtool ]; - preConfigure = stdenv.lib.optionalString stdenv.isCygwin '' + preConfigure = lib.optionalString stdenv.isCygwin '' sed -i -e "/libatomic_ops_gpl_la_SOURCES/a libatomic_ops_gpl_la_LIBADD = libatomic_ops.la" src/Makefile.am ./autogen.sh ''; meta = { - description = ''A library for semi-portable access to hardware-provided atomic memory update operations''; - license = stdenv.lib.licenses.gpl2Plus ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = with stdenv.lib.platforms; unix ++ windows; + description = "A library for semi-portable access to hardware-provided atomic memory update operations"; + license = lib.licenses.gpl2Plus ; + maintainers = [lib.maintainers.raskin]; + platforms = with lib.platforms; unix ++ windows; }; } diff --git a/pkgs/development/libraries/libaudclient/default.nix b/pkgs/development/libraries/libaudclient/default.nix index ad33c624b14..f90815f4ee9 100644 --- a/pkgs/development/libraries/libaudclient/default.nix +++ b/pkgs/development/libraries/libaudclient/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, dbus-glib }: +{ lib, stdenv, fetchurl, pkg-config, glib, dbus-glib }: stdenv.mkDerivation rec { name = "libaudclient-3.5-rc2"; @@ -9,10 +9,10 @@ stdenv.mkDerivation rec { sha256 = "0nhpgz0kg8r00z54q5i96pjk7s57krq3fvdypq496c7fmlv9kdap"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib dbus-glib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Legacy D-Bus client library for Audacious"; homepage = "https://audacious-media-player.org/"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index 15b6a275214..93d6e0d209c 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, yasm, bzip2, zlib, perl, bash +{ lib, stdenv, fetchurl, pkg-config, yasm, bzip2, zlib, perl, bash , mp3Support ? true, lame ? null , speexSupport ? true, speex ? null , theoraSupport ? true, libtheora ? null @@ -17,7 +17,7 @@ assert faacSupport -> enableUnfree; -let inherit (stdenv.lib) optional hasPrefix enableFeature; in +let inherit (lib) optional hasPrefix enableFeature; in /* ToDo: - more deps, inspiration: https://packages.ubuntu.com/raring/libav-tools @@ -43,6 +43,7 @@ let patches = [] ++ optional (vpxSupport && hasPrefix "0.8." version) ./vpxenc-0.8.17-libvpx-1.5.patch + ++ optional (vpxSupport && hasPrefix "12." version) ./vpx-12.3-libvpx-1.8.patch ; postPatch = '' @@ -52,7 +53,7 @@ let ''; configurePlatforms = []; - configureFlags = assert stdenv.lib.all (x: x!=null) buildInputs; [ + configureFlags = assert lib.all (x: x!=null) buildInputs; [ "--arch=${stdenv.hostPlatform.parsed.cpu.name}" "--target_os=${stdenv.hostPlatform.parsed.kernel.name}" #"--enable-postproc" # it's now a separate package in upstream @@ -81,7 +82,7 @@ let "--enable-cross-compile" ]; - nativeBuildInputs = [ pkgconfig perl ]; + nativeBuildInputs = [ pkg-config perl ]; buildInputs = [ lame yasm zlib bzip2 SDL bash ] ++ [ perl ] # for install-man target ++ optional mp3Support lame @@ -120,7 +121,7 @@ let passthru = { inherit vdpauSupport; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://libav.org/"; description = "A complete, cross-platform solution to record, convert and stream audio and video (fork of ffmpeg)"; license = with licenses; if enableUnfree then unfree #ToDo: redistributable or not? diff --git a/pkgs/development/libraries/libav/vpx-12.3-libvpx-1.8.patch b/pkgs/development/libraries/libav/vpx-12.3-libvpx-1.8.patch new file mode 100644 index 00000000000..8f8e5003284 --- /dev/null +++ b/pkgs/development/libraries/libav/vpx-12.3-libvpx-1.8.patch @@ -0,0 +1,46 @@ +--- libav/libavcodec/libvpx.c.orig 2018-02-12 21:25:59 UTC ++++ libav/libavcodec/libvpx.c +@@ -25,6 +25,7 @@ + enum AVPixelFormat ff_vpx_imgfmt_to_pixfmt(vpx_img_fmt_t img) + { + switch (img) { ++#if VPX_IMAGE_ABI_VERSION < 5 + case VPX_IMG_FMT_RGB24: return AV_PIX_FMT_RGB24; + case VPX_IMG_FMT_RGB565: return AV_PIX_FMT_RGB565BE; + case VPX_IMG_FMT_RGB555: return AV_PIX_FMT_RGB555BE; +@@ -36,10 +37,13 @@ enum AVPixelFormat ff_vpx_imgfmt_to_pixfmt(vpx_img_fmt + case VPX_IMG_FMT_ARGB_LE: return AV_PIX_FMT_BGRA; + case VPX_IMG_FMT_RGB565_LE: return AV_PIX_FMT_RGB565LE; + case VPX_IMG_FMT_RGB555_LE: return AV_PIX_FMT_RGB555LE; ++#endif + case VPX_IMG_FMT_I420: return AV_PIX_FMT_YUV420P; + case VPX_IMG_FMT_I422: return AV_PIX_FMT_YUV422P; + case VPX_IMG_FMT_I444: return AV_PIX_FMT_YUV444P; ++#if VPX_IMAGE_ABI_VERSION < 5 + case VPX_IMG_FMT_444A: return AV_PIX_FMT_YUVA444P; ++#endif + #if VPX_IMAGE_ABI_VERSION >= 3 + case VPX_IMG_FMT_I440: return AV_PIX_FMT_YUV440P; + case VPX_IMG_FMT_I42016: return AV_PIX_FMT_YUV420P16BE; +@@ -53,6 +57,7 @@ enum AVPixelFormat ff_vpx_imgfmt_to_pixfmt(vpx_img_fmt + vpx_img_fmt_t ff_vpx_pixfmt_to_imgfmt(enum AVPixelFormat pix) + { + switch (pix) { ++#if VPX_IMAGE_ABI_VERSION < 5 + case AV_PIX_FMT_RGB24: return VPX_IMG_FMT_RGB24; + case AV_PIX_FMT_RGB565BE: return VPX_IMG_FMT_RGB565; + case AV_PIX_FMT_RGB555BE: return VPX_IMG_FMT_RGB555; +@@ -64,10 +69,13 @@ vpx_img_fmt_t ff_vpx_pixfmt_to_imgfmt(enum AVPixelForm + case AV_PIX_FMT_BGRA: return VPX_IMG_FMT_ARGB_LE; + case AV_PIX_FMT_RGB565LE: return VPX_IMG_FMT_RGB565_LE; + case AV_PIX_FMT_RGB555LE: return VPX_IMG_FMT_RGB555_LE; ++#endif + case AV_PIX_FMT_YUV420P: return VPX_IMG_FMT_I420; + case AV_PIX_FMT_YUV422P: return VPX_IMG_FMT_I422; + case AV_PIX_FMT_YUV444P: return VPX_IMG_FMT_I444; ++#if VPX_IMAGE_ABI_VERSION < 5 + case AV_PIX_FMT_YUVA444P: return VPX_IMG_FMT_444A; ++#endif + #if VPX_IMAGE_ABI_VERSION >= 3 + case AV_PIX_FMT_YUV440P: return VPX_IMG_FMT_I440; + case AV_PIX_FMT_YUV420P16BE: return VPX_IMG_FMT_I42016; diff --git a/pkgs/development/libraries/libavc1394/default.nix b/pkgs/development/libraries/libavc1394/default.nix index 01f39052e93..d9c10415b67 100644 --- a/pkgs/development/libraries/libavc1394/default.nix +++ b/pkgs/development/libraries/libavc1394/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libraw1394 }: +{ lib, stdenv, fetchurl, pkg-config, libraw1394 }: stdenv.mkDerivation rec { name = "libavc1394-0.5.4"; @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { sha256 = "0lsv46jdqvdx5hx92v0z2cz3yh6212pz9gk0k3513sbaa04zzcbw"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ libraw1394 ]; - meta = { + meta = { description = "Programming interface for the 1394 Trade Association AV/C (Audio/Video Control) Digital Interface Command Set"; homepage = "https://sourceforge.net/projects/libavc1394/"; - license = stdenv.lib.licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.lgpl21Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libavif/default.nix b/pkgs/development/libraries/libavif/default.nix index 25422c8b7d9..8c33e6f1b6d 100644 --- a/pkgs/development/libraries/libavif/default.nix +++ b/pkgs/development/libraries/libavif/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , libaom , cmake @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { dav1d ]; - meta = with stdenv.lib; { + meta = with lib; { description = "C implementation of the AV1 Image File Format"; longDescription = '' Libavif aims to be a friendly, portable C implementation of the diff --git a/pkgs/development/libraries/libayatana-appindicator/default.nix b/pkgs/development/libraries/libayatana-appindicator/default.nix index 248c33f7e0e..ef9823130f4 100644 --- a/pkgs/development/libraries/libayatana-appindicator/default.nix +++ b/pkgs/development/libraries/libayatana-appindicator/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-gtk=${gtkVersion}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Ayatana Application Indicators Shared Library"; homepage = "https://github.com/AyatanaIndicators/libayatana-appindicator"; changelog = "https://github.com/AyatanaIndicators/libayatana-appindicator/blob/${version}/ChangeLog"; diff --git a/pkgs/development/libraries/libayatana-indicator/default.nix b/pkgs/development/libraries/libayatana-indicator/default.nix index dd9bc616944..c3c271c1719 100644 --- a/pkgs/development/libraries/libayatana-indicator/default.nix +++ b/pkgs/development/libraries/libayatana-indicator/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-gtk=${gtkVersion}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Ayatana Indicators Shared Library"; homepage = "https://github.com/AyatanaIndicators/libayatana-indicator"; changelog = "https://github.com/AyatanaIndicators/libayatana-indicator/blob/${version}/ChangeLog"; diff --git a/pkgs/development/libraries/libb2/default.nix b/pkgs/development/libraries/libb2/default.nix index dad5d40ea53..b142a0a4156 100644 --- a/pkgs/development/libraries/libb2/default.nix +++ b/pkgs/development/libraries/libb2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config }: stdenv.mkDerivation rec { pname = "libb2"; @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - configureFlags = stdenv.lib.optional stdenv.hostPlatform.isx86 "--enable-fat=yes"; + configureFlags = lib.optional stdenv.hostPlatform.isx86 "--enable-fat=yes"; nativeBuildInputs = [ autoconf automake libtool pkg-config ]; doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "The BLAKE2 family of cryptographic hash functions"; homepage = "https://blake2.net/"; platforms = platforms.all; diff --git a/pkgs/development/libraries/libb64/default.nix b/pkgs/development/libraries/libb64/default.nix index 3c9a9768427..f524e9321f9 100644 --- a/pkgs/development/libraries/libb64/default.nix +++ b/pkgs/development/libraries/libb64/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { pname = "libb64"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { inherit version; description = "ANSI C routines for fast base64 encoding/decoding"; - license = stdenv.lib.licenses.publicDomain; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.publicDomain; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libbacktrace/default.nix b/pkgs/development/libraries/libbacktrace/default.nix index ea7f4eb9fa8..93927807af8 100644 --- a/pkgs/development/libraries/libbacktrace/default.nix +++ b/pkgs/development/libraries/libbacktrace/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchFromGitHub +{ lib, stdenv, callPackage, fetchFromGitHub , enableStatic ? stdenv.hostPlatform.isStatic , enableShared ? !stdenv.hostPlatform.isStatic }: @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { "--enable-static=${yesno enableStatic}" "--enable-shared=${yesno enableShared}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A C library that may be linked into a C/C++ program to produce symbolic backtraces"; homepage = https://github.com/ianlancetaylor/libbacktrace; maintainers = with maintainers; [ twey ]; diff --git a/pkgs/development/libraries/libbap/default.nix b/pkgs/development/libraries/libbap/default.nix index 411c3ae740f..7c458bae19c 100644 --- a/pkgs/development/libraries/libbap/default.nix +++ b/pkgs/development/libraries/libbap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, bap, ocaml, findlib, ctypes, autoreconfHook, +{ lib, stdenv, fetchFromGitHub, bap, ocaml, findlib, ctypes, autoreconfHook, which }: stdenv.mkDerivation { @@ -20,7 +20,7 @@ stdenv.mkDerivation { mkdir -p $out/include ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/binaryanalysisplatform/bap-bindings"; description = "A C library for interacting with BAP"; maintainers = [ maintainers.maurer ]; diff --git a/pkgs/development/libraries/libbdplus/default.nix b/pkgs/development/libraries/libbdplus/default.nix index c9b7bfa3c0e..ca7b305122e 100644 --- a/pkgs/development/libraries/libbdplus/default.nix +++ b/pkgs/development/libraries/libbdplus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libgcrypt, libgpgerror, gettext }: +{ lib, stdenv, fetchurl, libgcrypt, libgpgerror, gettext }: # library that allows libbluray to play BDplus protected bluray disks # libaacs does not infringe DRM's right or copyright. See the legal page of the website for more info. @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.videolan.org/developers/libbdplus.html"; description = "Library to access BD+ protected Blu-Ray disks"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libbfd/default.nix b/pkgs/development/libraries/libbfd/default.nix index 75db780b7bb..499f04349b5 100644 --- a/pkgs/development/libraries/libbfd/default.nix +++ b/pkgs/development/libraries/libbfd/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchpatch, gnu-config, autoreconfHook, bison, binutils-unwrapped , libiberty, zlib }: @@ -43,7 +43,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A library for manipulating containers of machine code"; longDescription = '' BFD is a library which provides a single interface to read and write diff --git a/pkgs/development/libraries/libblockdev/default.nix b/pkgs/development/libraries/libblockdev/default.nix index 39646db87ec..11a65006422 100644 --- a/pkgs/development/libraries/libblockdev/default.nix +++ b/pkgs/development/libraries/libblockdev/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, substituteAll, autoreconfHook, pkgconfig, gtk-doc +{ lib, stdenv, fetchFromGitHub, substituteAll, autoreconfHook, pkg-config, gtk-doc , docbook_xml_dtd_43, python3, gobject-introspection, glib, udev, kmod, parted , cryptsetup, lvm2, dmraid, util-linux, libbytesize, libndctl, nss, volume_key , libxslt, docbook_xsl, gptfdisk, libyaml, autoconf-archive @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - autoreconfHook pkgconfig gtk-doc libxslt docbook_xsl docbook_xml_dtd_43 + autoreconfHook pkg-config gtk-doc libxslt docbook_xsl docbook_xml_dtd_43 python3 gobject-introspection autoconf-archive makeWrapper ]; @@ -40,10 +40,10 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/lvm-cache-stats --prefix PATH : \ - ${stdenv.lib.makeBinPath [ thin-provisioning-tools ]} + ${lib.makeBinPath [ thin-provisioning-tools ]} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A library for manipulating block devices"; homepage = "http://storaged.org/libblockdev/"; license = with licenses; [ lgpl2Plus gpl2Plus ]; # lgpl2Plus for the library, gpl2Plus for the utils diff --git a/pkgs/development/libraries/libblocksruntime/default.nix b/pkgs/development/libraries/libblocksruntime/default.nix index aff56994f49..6ba832fb3cd 100644 --- a/pkgs/development/libraries/libblocksruntime/default.nix +++ b/pkgs/development/libraries/libblocksruntime/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, clang }: +{ lib, stdenv, fetchFromGitHub, clang }: stdenv.mkDerivation { name = "blocksruntime-20140624"; @@ -25,7 +25,7 @@ stdenv.mkDerivation { installPhase = ''prefix="/" DESTDIR=$out ./installlib''; - meta = with stdenv.lib; { + meta = with lib; { description = "Installs the BlocksRuntime library from the compiler-rt"; homepage = "https://github.com/mackyle/blocksruntime"; license = licenses.mit; diff --git a/pkgs/development/libraries/libbluedevil/default.nix b/pkgs/development/libraries/libbluedevil/default.nix index bf72720019c..7cb4c9e2b32 100644 --- a/pkgs/development/libraries/libbluedevil/default.nix +++ b/pkgs/development/libraries/libbluedevil/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, qt4 }: +{ lib, stdenv, fetchurl, cmake, qt4 }: stdenv.mkDerivation rec { pname = "libbluedevil"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ qt4 ]; meta = { - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix index a00e2272d66..3f90bb878ad 100644 --- a/pkgs/development/libraries/libbluray/default.nix +++ b/pkgs/development/libraries/libbluray/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, fontconfig, autoreconfHook, DiskArbitration +{ lib, stdenv, fetchurl, pkg-config, fontconfig, autoreconfHook, DiskArbitration , withJava ? false, jdk ? null, ant ? null , withAACS ? false, libaacs ? null , withBDplus ? false, libbdplus ? null @@ -6,7 +6,7 @@ , withFonts ? true, freetype ? null }: -with stdenv.lib; +with lib; assert withJava -> jdk != null && ant != null; assert withAACS -> libaacs != null; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { patches = optional withJava ./BDJ-JARFILE-path.patch; - nativeBuildInputs = [ pkgconfig autoreconfHook ] + nativeBuildInputs = [ pkg-config autoreconfHook ] ++ optionals withJava [ ant ] ; @@ -50,13 +50,13 @@ stdenv.mkDerivation rec { ${optionalString withJava ''export JDK_HOME="${jdk.home}"''} ''; - configureFlags = with stdenv.lib; + configureFlags = with lib; optional (! withJava) "--disable-bdjava-jar" ++ optional (! withMetadata) "--without-libxml2" ++ optional (! withFonts) "--without-freetype" ; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.videolan.org/developers/libbluray.html"; description = "Library to access Blu-Ray disks for video playback"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix index 7aea38bdb58..778b61d8315 100644 --- a/pkgs/development/libraries/libbsd/default.nix +++ b/pkgs/development/libraries/libbsd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook }: +{ lib, stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { pname = "libbsd"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { patches = [ ./darwin.patch ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Common functions found on BSD systems"; homepage = "https://libbsd.freedesktop.org/"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libbson/default.nix b/pkgs/development/libraries/libbson/default.nix index 1d2043b20cd..e03d7c19484 100644 --- a/pkgs/development/libraries/libbson/default.nix +++ b/pkgs/development/libraries/libbson/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, perl, stdenv, cmake }: +{ fetchFromGitHub, perl, lib, stdenv, cmake }: stdenv.mkDerivation rec { pname = "libbson"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ perl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A C Library for parsing, editing, and creating BSON documents"; homepage = "https://github.com/mongodb/libbson"; license = licenses.asl20; diff --git a/pkgs/development/libraries/libburn/default.nix b/pkgs/development/libraries/libburn/default.nix index 42c680835f1..02e73b0c04c 100644 --- a/pkgs/development/libraries/libburn/default.nix +++ b/pkgs/development/libraries/libburn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "libburn"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1xrp9c2sppbds0agqzmdym7rvdwpjrq6v6q2c3718cwvbjmh66c8"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://libburnia-project.org/"; description = "A library by which preformatted data get onto optical media: CD, DVD, BD (Blu-Ray)"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/libbytesize/default.nix b/pkgs/development/libraries/libbytesize/default.nix index c93a59d462f..a84f010b9e6 100644 --- a/pkgs/development/libraries/libbytesize/default.nix +++ b/pkgs/development/libraries/libbytesize/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gettext +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gettext , gtk-doc, libxslt, docbook_xml_dtd_43, docbook_xsl , python3, pcre2, gmp, mpfr }: @@ -18,11 +18,11 @@ in stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig gettext gtk-doc libxslt docbook_xml_dtd_43 docbook_xsl python3 ]; + nativeBuildInputs = [ autoreconfHook pkg-config gettext gtk-doc libxslt docbook_xml_dtd_43 docbook_xsl python3 ]; buildInputs = [ pcre2 gmp mpfr ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A tiny library providing a C “class” for working with arbitrary big sizes in bytes"; homepage = src.meta.homepage; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/libcaca/default.nix b/pkgs/development/libraries/libcaca/default.nix index 84df50e117a..ca879a60c7a 100644 --- a/pkgs/development/libraries/libcaca/default.nix +++ b/pkgs/development/libraries/libcaca/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, zlib, pkgconfig, imlib2 +{ lib, stdenv, fetchurl, ncurses, zlib, pkg-config, imlib2 , x11Support ? !stdenv.isDarwin, libX11, libXext }: @@ -19,12 +19,12 @@ stdenv.mkDerivation rec { (if x11Support then "--enable-x11" else "--disable-x11") ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!x11Support) "-DX_DISPLAY_MISSING"; + NIX_CFLAGS_COMPILE = lib.optionalString (!x11Support) "-DX_DISPLAY_MISSING"; enableParallelBuilding = true; - propagatedBuildInputs = [ ncurses zlib pkgconfig (imlib2.override { inherit x11Support; }) ] - ++ stdenv.lib.optionals x11Support [ libX11 libXext ]; + propagatedBuildInputs = [ ncurses zlib pkg-config (imlib2.override { inherit x11Support; }) ] + ++ lib.optionals x11Support [ libX11 libXext ]; postInstall = '' mkdir -p $dev/bin @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://libcaca.zoy.org/"; description = "A graphics library that outputs text instead of pixels"; - license = stdenv.lib.licenses.wtfpl; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.wtfpl; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libcacard/default.nix b/pkgs/development/libraries/libcacard/default.nix index 474e51e8c46..c484a49b1a2 100644 --- a/pkgs/development/libraries/libcacard/default.nix +++ b/pkgs/development/libraries/libcacard/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, nss }: +{ lib, stdenv, fetchurl, pkg-config, glib, nss }: stdenv.mkDerivation rec { pname = "libcacard"; @@ -9,10 +9,10 @@ stdenv.mkDerivation rec { sha256 = "0vyvkk4b6xjwq1ccggql13c1x7g4y90clpkqw28257azgn2a1c8n"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib nss ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Smart card emulation library"; homepage = "https://gitlab.freedesktop.org/spice/libcacard"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix index 9dea5956d65..a2dfe1322f8 100644 --- a/pkgs/development/libraries/libcanberra/default.nix +++ b/pkgs/development/libraries/libcanberra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, libtool +{ stdenv, lib, fetchurl, fetchpatch, pkg-config, libtool , gtk ? null , libpulseaudio, gst_all_1, libvorbis, libcap , CoreServices @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0wps39h8rx2b00vyvkia5j40fkak3dpipp1kzilqla0cgvk73dn2"; }; - nativeBuildInputs = [ pkgconfig libtool ]; + nativeBuildInputs = [ pkg-config libtool ]; buildInputs = [ libpulseaudio libvorbis gtk ] ++ (with gst_all_1; [ gstreamer gst-plugins-base ]) @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { }) ]; - postPatch = (stdenv.lib.optional stdenv.isDarwin) '' + postPatch = (lib.optional stdenv.isDarwin) '' patch -p0 < ${fetchpatch { url = "https://raw.githubusercontent.com/macports/macports-ports/master/audio/libcanberra/files/patch-configure.diff"; sha256 = "1f7h7ifpqvbfhqygn1b7klvwi80zmpv3538vbmq7ql7bkf1q8h31"; @@ -60,9 +60,9 @@ stdenv.mkDerivation rec { homepage = "http://0pointer.de/lennart/projects/libcanberra/"; - license = stdenv.lib.licenses.lgpl2Plus; + license = lib.licenses.lgpl2Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libcangjie/default.nix b/pkgs/development/libraries/libcangjie/default.nix index b71b630675d..c6bbbcdb61a 100644 --- a/pkgs/development/libraries/libcangjie/default.nix +++ b/pkgs/development/libraries/libcangjie/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoconf, automake, libtool, m4, fetchurl, bash, pkgconfig, sqlite }: +{ lib, stdenv, autoconf, automake, libtool, m4, fetchurl, bash, pkg-config, sqlite }: stdenv.mkDerivation rec { pname = "libcangjie"; @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { sha256 = "0i5svvcx099fc9hh5dvr3gpb1041v6vn5fnylxy82zjy239114lg"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ automake autoconf libtool m4 sqlite ]; configureScript = "./autogen.sh"; - + preConfigure = '' find . -name '*.sh' -exec sed -e 's@#!/bin/bash@${bash}/bin/bash@' -i '{}' ';' ''; @@ -27,9 +27,9 @@ stdenv.mkDerivation rec { libcangjie is a library implementing the Cangjie input method. ''; homepage = "http://cangjians.github.io/projects/libcangjie/"; - license = stdenv.lib.licenses.lgpl3Plus; + license = lib.licenses.lgpl3Plus; - maintainers = [ stdenv.lib.maintainers.linquize ]; - platforms = stdenv.lib.platforms.all; + maintainers = [ lib.maintainers.linquize ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/libraries/libcbor/default.nix b/pkgs/development/libraries/libcbor/default.nix index ae5154eac03..349b715d852 100644 --- a/pkgs/development/libraries/libcbor/default.nix +++ b/pkgs/development/libraries/libcbor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, cmocka }: +{ lib, stdenv, fetchFromGitHub, cmake, cmocka }: stdenv.mkDerivation rec { pname = "libcbor"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" "-DBUILD_SHARED_LIBS=on" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "CBOR protocol implementation for C and others"; homepage = "https://github.com/PJK/libcbor"; license = licenses.mit; diff --git a/pkgs/development/libraries/libcdaudio/default.nix b/pkgs/development/libraries/libcdaudio/default.nix index abc5f84a0e3..e5f6324e261 100644 --- a/pkgs/development/libraries/libcdaudio/default.nix +++ b/pkgs/development/libraries/libcdaudio/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation { name = "libcdaudio-0.99.12p2"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { meta = { description = "A portable library for controlling audio CDs"; homepage = "http://libcdaudio.sourceforge.net"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.lgpl2; + platforms = lib.platforms.linux; + license = lib.licenses.lgpl2; }; } diff --git a/pkgs/development/libraries/libcddb/default.nix b/pkgs/development/libraries/libcddb/default.nix index 2b837ff1ce1..c1b28e22e10 100644 --- a/pkgs/development/libraries/libcddb/default.nix +++ b/pkgs/development/libraries/libcddb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libiconv }: +{ lib, stdenv, fetchurl, libiconv }: stdenv.mkDerivation rec { name = "libcddb-1.3.2"; @@ -8,16 +8,16 @@ stdenv.mkDerivation rec { sha256 = "0fr21a7vprdyy1bq6s99m0x420c9jm5fipsd63pqv8qyfkhhxkim"; }; - buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv; + buildInputs = lib.optional stdenv.isDarwin libiconv; - configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + configureFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "ac_cv_func_malloc_0_nonnull=yes" "ac_cv_func_realloc_0_nonnull=yes" ]; doCheck = false; # fails 3 of 5 tests with locale errors - meta = with stdenv.lib; { + meta = with lib; { description = "C library to access data on a CDDB server (freedb.org)"; homepage = "http://libcddb.sourceforge.net/"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/libcdio-paranoia/default.nix b/pkgs/development/libraries/libcdio-paranoia/default.nix index 8ad3231dc36..905d39dbd8e 100644 --- a/pkgs/development/libraries/libcdio-paranoia/default.nix +++ b/pkgs/development/libraries/libcdio-paranoia/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, libcdio, pkgconfig, +{ lib, stdenv, fetchFromGitHub, autoreconfHook, libcdio, pkg-config, libiconv, IOKit, DiskArbitration}: stdenv.mkDerivation { @@ -11,17 +11,17 @@ stdenv.mkDerivation { sha256 = "1wjgmmaca4baw7k5c3vdap9hnjc49ciagi5kvpvync3aqfmdvkha"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libcdio ] ++ - stdenv.lib.optionals stdenv.isDarwin [ libiconv IOKit DiskArbitration ]; + lib.optionals stdenv.isDarwin [ libiconv IOKit DiskArbitration ]; - propagatedBuildInputs = stdenv.lib.optional stdenv.isDarwin DiskArbitration; + propagatedBuildInputs = lib.optional stdenv.isDarwin DiskArbitration; - configureFlags = stdenv.lib.optionals stdenv.isDarwin [ + configureFlags = lib.optionals stdenv.isDarwin [ "--disable-ld-version-script" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "CD paranoia on top of libcdio"; longDescription = '' This is a port of xiph.org's cdda paranoia to use libcdio for CDROM diff --git a/pkgs/development/libraries/libcdio/default.nix b/pkgs/development/libraries/libcdio/default.nix index b0b7b55a19d..cfe796b14d0 100644 --- a/pkgs/development/libraries/libcdio/default.nix +++ b/pkgs/development/libraries/libcdio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libcddb, pkgconfig, ncurses, help2man, libiconv, Carbon, IOKit }: +{ lib, stdenv, fetchurl, libcddb, pkg-config, ncurses, help2man, libiconv, Carbon, IOKit }: stdenv.mkDerivation rec { name = "libcdio-2.1.0"; @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { patchShebangs . ''; - nativeBuildInputs = [ pkgconfig help2man ]; + nativeBuildInputs = [ pkg-config help2man ]; buildInputs = [ libcddb ncurses ] - ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Carbon IOKit ]; + ++ lib.optionals stdenv.isDarwin [ libiconv Carbon IOKit ]; doCheck = !stdenv.isDarwin; - meta = with stdenv.lib; { + meta = with lib; { description = "A library for OS-independent CD-ROM and CD image access"; longDescription = '' GNU libcdio is a library for OS-independent CD-ROM and diff --git a/pkgs/development/libraries/libcdr/default.nix b/pkgs/development/libraries/libcdr/default.nix index 72996e28996..087c928b79c 100644 --- a/pkgs/development/libraries/libcdr/default.nix +++ b/pkgs/development/libraries/libcdr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libwpg, libwpd, lcms, pkgconfig, librevenge, icu, boost, cppunit }: +{ lib, stdenv, fetchurl, libwpg, libwpd, lcms, pkg-config, librevenge, icu, boost, cppunit }: stdenv.mkDerivation rec { name = "libcdr-0.1.6"; @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { buildInputs = [ libwpg libwpd lcms librevenge icu boost cppunit ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; CXXFLAGS="--std=gnu++0x"; # For c++11 constants in lcms2.h meta = { description = "A library providing ability to interpret and import Corel Draw drawings into various applications"; homepage = "http://www.freedesktop.org/wiki/Software/libcdr"; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.mpl20; + platforms = lib.platforms.all; + license = lib.licenses.mpl20; }; } diff --git a/pkgs/development/libraries/libcec/default.nix b/pkgs/development/libraries/libcec/default.nix index 792d899333e..341754376aa 100644 --- a/pkgs/development/libraries/libcec/default.nix +++ b/pkgs/development/libraries/libcec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, udev, libcec_platform, libraspberrypi ? null }: +{ lib, stdenv, fetchurl, cmake, pkg-config, udev, libcec_platform, libraspberrypi ? null }: let version = "4.0.7"; in @@ -11,9 +11,9 @@ stdenv.mkDerivation { sha256 = "0nii8qh3qrn92g8x3canj4glb2bjn6gc1p3f6hfp59ckd4vjrndw"; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ udev libcec_platform ] ++ - stdenv.lib.optional (libraspberrypi != null) libraspberrypi; + lib.optional (libraspberrypi != null) libraspberrypi; cmakeFlags = [ "-DBUILD_SHARED_LIBS=1" ]; @@ -22,11 +22,11 @@ stdenv.mkDerivation { substituteInPlace include/cecloader.h --replace "libcec.so" "$out/lib/libcec.so" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Allows you (with the right hardware) to control your device with your TV remote control using existing HDMI cabling"; homepage = "http://libcec.pulse-eight.com"; repositories.git = "https://github.com/Pulse-Eight/libcec.git"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.titanous ]; }; diff --git a/pkgs/development/libraries/libcec/platform.nix b/pkgs/development/libraries/libcec/platform.nix index 2132cf7a065..15972272a18 100644 --- a/pkgs/development/libraries/libcec/platform.nix +++ b/pkgs/development/libraries/libcec/platform.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake }: +{ lib, stdenv, fetchurl, cmake }: let version = "2.1.0.1"; in @@ -13,11 +13,11 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Platform library for libcec and Kodi addons"; homepage = "https://github.com/Pulse-Eight/platform"; repositories.git = "https://github.com/Pulse-Eight/platform.git"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.titanous ]; }; diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix index 93aaebc110e..ec1a5ee3828 100644 --- a/pkgs/development/libraries/libcef/default.nix +++ b/pkgs/development/libraries/libcef/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, alsaLib, atk, cairo, cups, dbus, expat, fontconfig +{ lib, stdenv, fetchurl, cmake, alsaLib, atk, cairo, cups, dbus, expat, fontconfig , GConf, gdk-pixbuf, glib, gtk2, libX11, libxcb, libXcomposite, libXcursor , libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXScrnSaver , libXtst, nspr, nss, pango, libpulseaudio, systemd, at-spi2-atk, at-spi2-core @@ -6,7 +6,7 @@ let libPath = - stdenv.lib.makeLibraryPath [ + lib.makeLibraryPath [ alsaLib atk cairo cups dbus expat fontconfig GConf gdk-pixbuf glib gtk2 libX11 libxcb libXcomposite libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender libXScrnSaver libXtst nspr nss pango libpulseaudio @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { cp -r ../include $out/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple framework for embedding Chromium-based browsers in other applications"; homepage = "http://opensource.spotify.com/cefbuilds/index.html"; maintainers = with maintainers; [ puffnfresh ]; diff --git a/pkgs/development/libraries/libcello/default.nix b/pkgs/development/libraries/libcello/default.nix index 908c9cb15dd..100077bcc70 100644 --- a/pkgs/development/libraries/libcello/default.nix +++ b/pkgs/development/libraries/libcello/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "libcello"; @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://libcello.org/"; description = "Higher level programming in C"; - license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.MostAwesomeDude ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.MostAwesomeDude ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix index 6a74941a3a0..22a062acd6e 100644 --- a/pkgs/development/libraries/libchamplain/default.nix +++ b/pkgs/development/libraries/libchamplain/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, meson, ninja, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, pkgconfig, glib, gtk3, cairo, sqlite, gnome3 +{ fetchurl, lib, stdenv, meson, ninja, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, pkg-config, glib, gtk3, cairo, sqlite, gnome3 , clutter-gtk, libsoup, gobject-introspection /*, libmemphis */ }: stdenv.mkDerivation rec { @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { version = "0.12.20"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0rihpb0npqpihqcdz4w03rq6xl7jdckfqskvv9diq2hkrnzv8ch2"; }; outputs = [ "out" "dev" "devdoc" ]; - nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_412 ]; + nativeBuildInputs = [ meson ninja pkg-config gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_412 ]; buildInputs = [ sqlite libsoup ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Projects/libchamplain"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/libchardet/default.nix b/pkgs/development/libraries/libchardet/default.nix index 168217678c0..260c332f7ef 100644 --- a/pkgs/development/libraries/libchardet/default.nix +++ b/pkgs/development/libraries/libchardet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, perl }: +{ lib, stdenv, fetchFromGitHub, perl }: stdenv.mkDerivation rec { pname = "libchardet"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Mozilla's Universal Charset Detector C/C++ API"; homepage = "ftp://ftp.oops.org/pub/oops/libchardet/index.html"; license = licenses.mpl11; diff --git a/pkgs/development/libraries/libchewing/default.nix b/pkgs/development/libraries/libchewing/default.nix index cd2df385f48..1436d4bd59d 100644 --- a/pkgs/development/libraries/libchewing/default.nix +++ b/pkgs/development/libraries/libchewing/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, sqlite }: +{ lib, stdenv, fetchurl, sqlite }: stdenv.mkDerivation rec { pname = "libchewing"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ sqlite ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Intelligent Chinese phonetic input method"; homepage = "http://chewing.im/"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libchop/default.nix b/pkgs/development/libraries/libchop/default.nix index d2040b72311..f02ac04621f 100644 --- a/pkgs/development/libraries/libchop/default.nix +++ b/pkgs/development/libraries/libchop/default.nix @@ -1,6 +1,6 @@ -{ fetchurl, stdenv, zlib, bzip2, libgcrypt +{ fetchurl, lib, stdenv, zlib, bzip2, libgcrypt , gdbm, gperf, tdb, gnutls, db, libuuid -, lzo, pkgconfig, guile, rpcsvc-proto, libtirpc +, lzo, pkg-config, guile, rpcsvc-proto, libtirpc }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { patches = [ ./gets-undeclared.patch ./size_t.patch ./0001-Fix-RPC-compilation-when-using-libtirpc-rather-than-.patch ]; - nativeBuildInputs = [ pkgconfig gperf rpcsvc-proto ]; + nativeBuildInputs = [ pkg-config gperf rpcsvc-proto ]; NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; NIX_LDFLAGS = [ "-ltirpc" ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { sed -re 's%@GUILE@%&/guile%' -i */Makefile.* Makefile.* ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tools & library for data backup and distributed storage"; longDescription = diff --git a/pkgs/development/libraries/libcint/default.nix b/pkgs/development/libraries/libcint/default.nix index 8415b964bb9..bd8e8bd4aaf 100644 --- a/pkgs/development/libraries/libcint/default.nix +++ b/pkgs/development/libraries/libcint/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "libcint"; - version = "4.0.6"; + version = "4.0.7"; src = fetchFromGitHub { owner = "sunqm"; repo = "libcint"; rev = "v${version}"; - sha256 = "1bgzsyz1i0hvla5ax0lawp1kw25fkhzh9ddhq92mplizrj9y05c1"; + sha256 = "sha256-/S5LcaIIAXq9QiH8wGPSw8KpWC3afX9HqiHrWHmGQ6s="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libck/default.nix b/pkgs/development/libraries/libck/default.nix index c4f38e96f3d..accb6556011 100644 --- a/pkgs/development/libraries/libck/default.nix +++ b/pkgs/development/libraries/libck/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "ck"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { dontDisableStatic = true; - meta = with stdenv.lib; { + meta = with lib; { description = "High-performance concurrency research library"; longDescription = '' Concurrency primitives, safe memory reclamation mechanisms and non-blocking data structures for the research, design and implementation of high performance concurrent systems. diff --git a/pkgs/development/libraries/libclc/default.nix b/pkgs/development/libraries/libclc/default.nix index 0672e7942cb..a6334bf9998 100644 --- a/pkgs/development/libraries/libclc/default.nix +++ b/pkgs/development/libraries/libclc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python, llvmPackages }: +{ lib, stdenv, fetchFromGitHub, python, llvmPackages }: let llvm = llvmPackages.llvm; @@ -30,7 +30,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://libclc.llvm.org/"; description = "Implementation of the library requirements of the OpenCL C programming language"; license = licenses.mit; diff --git a/pkgs/development/libraries/libcli/default.nix b/pkgs/development/libraries/libcli/default.nix index 6cabe1343c4..ceb0338e5cc 100644 --- a/pkgs/development/libraries/libcli/default.nix +++ b/pkgs/development/libraries/libcli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl }: +{ lib, stdenv, fetchFromGitHub, fetchurl }: stdenv.mkDerivation rec { pname = "libcli"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Emulate a Cisco-style telnet command-line interface"; homepage = "http://sites.dparrish.com/libcli"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/libcloudproviders/default.nix b/pkgs/development/libraries/libcloudproviders/default.nix index 87c86ea2fbe..08601db0834 100644 --- a/pkgs/development/libraries/libcloudproviders/default.nix +++ b/pkgs/development/libraries/libcloudproviders/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gobject-introspection, vala, gtk-doc, docbook_xsl, glib }: +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gobject-introspection, vala, gtk-doc, docbook_xsl, glib }: # TODO: Add installed tests once https://gitlab.gnome.org/World/libcloudproviders/issues/4 is fixed @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { "-Denable-gtk-doc=true" ]; - nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala gtk-doc docbook_xsl ]; + nativeBuildInputs = [ meson ninja pkg-config gobject-introspection vala gtk-doc docbook_xsl ]; buildInputs = [ glib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "DBus API that allows cloud storage sync clients to expose their services"; homepage = "https://gitlab.gnome.org/World/libcloudproviders"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/libraries/libclthreads/default.nix b/pkgs/development/libraries/libclthreads/default.nix index 53cff9a19d3..e4548420a05 100644 --- a/pkgs/development/libraries/libclthreads/default.nix +++ b/pkgs/development/libraries/libclthreads/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "libclthreads"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ln $out/lib/libclthreads.so $out/lib/libclthreads.so.2 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Zita thread library"; homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libclxclient/default.nix b/pkgs/development/libraries/libclxclient/default.nix index b086dfc08f6..0d39a5e55b2 100644 --- a/pkgs/development/libraries/libclxclient/default.nix +++ b/pkgs/development/libraries/libclxclient/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libclthreads, libX11, libXft, xorg, pkgconfig }: +{ lib, stdenv, fetchurl, libclthreads, libX11, libXft, xorg, pkg-config }: stdenv.mkDerivation rec { pname = "libclxclient"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ libclthreads libX11 libXft xorg.xorgproto ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; NIX_CFLAGS_COMPILE = "-I${xorg.xorgproto}/include -I${libXft.dev}/include"; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ln $out/lib/libclxclient.so $out/lib/libclxclient.so.3 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Zita X11 library"; homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libcmis/default.nix b/pkgs/development/libraries/libcmis/default.nix index 8b1093ac21f..2898c9a1c83 100644 --- a/pkgs/development/libraries/libcmis/default.nix +++ b/pkgs/development/libraries/libcmis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, boost, libxml2, pkgconfig, docbook2x, curl, autoreconfHook, cppunit }: +{ lib, stdenv, fetchFromGitHub, boost, libxml2, pkg-config, docbook2x, curl, autoreconfHook, cppunit }: stdenv.mkDerivation rec { pname = "libcmis"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0s6prfh55hn11vrs72ph1gs01v0vngly81pvyjm5v1sgwymdxx57"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig docbook2x ]; + nativeBuildInputs = [ autoreconfHook pkg-config docbook2x ]; buildInputs = [ boost libxml2 curl cppunit ]; configureFlags = [ @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ client library for the CMIS interface"; homepage = "https://sourceforge.net/projects/libcmis/"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/libco-canonical/default.nix b/pkgs/development/libraries/libco-canonical/default.nix index 56974fcca7b..a01bbf7419c 100644 --- a/pkgs/development/libraries/libco-canonical/default.nix +++ b/pkgs/development/libraries/libco-canonical/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, pkg-config }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "libco-canonical"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0r5b1r0sxngx349s5a3zkkvfw5by9y492kr34b25gjspzvjchlxq"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; makeFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/development/libraries/libcollectdclient/default.nix b/pkgs/development/libraries/libcollectdclient/default.nix index f945434842e..0bf654ee963 100644 --- a/pkgs/development/libraries/libcollectdclient/default.nix +++ b/pkgs/development/libraries/libcollectdclient/default.nix @@ -1,5 +1,5 @@ -{ stdenv, collectd }: -with stdenv.lib; +{ lib, collectd }: +with lib; collectd.overrideAttrs (oldAttrs: { name = "libcollectdclient-${collectd.version}"; @@ -12,7 +12,7 @@ collectd.overrideAttrs (oldAttrs: { postInstall = "rm -rf $out/{bin,etc,sbin,share}"; - meta = with stdenv.lib; { + meta = with lib; { description = "C Library for collectd, a daemon which collects system performance statistics periodically"; homepage = "http://collectd.org"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/libcommuni/default.nix b/pkgs/development/libraries/libcommuni/default.nix index 3f91c8e579f..532c91a0eda 100644 --- a/pkgs/development/libraries/libcommuni/default.nix +++ b/pkgs/development/libraries/libcommuni/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , qtbase, qtdeclarative, qmake, which }: stdenv.mkDerivation rec { pname = "libcommuni"; - version = "3.5.0"; + version = "3.6.0"; src = fetchFromGitHub { owner = "communi"; repo = "libcommuni"; rev = "v${version}"; - sha256 = "15crqc7a4kwrfbxs121rpdysw0694hh7dr290gg7pm61akvnrqcm"; + sha256 = "sha256-ABvrMoOVSycbQ8iRDzi7zkFnuSgHMMBgm9cDUWlD4uc="; }; buildInputs = [ qtbase qtdeclarative ]; @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { dontUseQmakeConfigure = true; configureFlags = [ "-config" "release" ]; + dontWrapQtApps = true; + preConfigure = '' sed -i -e 's|/bin/pwd|pwd|g' configure ''; @@ -34,7 +36,7 @@ stdenv.mkDerivation rec { # Hack to avoid TMPDIR in RPATHs. preFixup = "rm -rf lib"; - meta = with stdenv.lib; { + meta = with lib; { description = "A cross-platform IRC framework written with Qt"; homepage = "https://communi.github.io"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libconfig/default.nix b/pkgs/development/libraries/libconfig/default.nix index 7d7f95d757c..ae5f1176463 100644 --- a/pkgs/development/libraries/libconfig/default.nix +++ b/pkgs/development/libraries/libconfig/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "libconfig"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.hyperrealm.com/libconfig"; description = "A simple library for processing structured configuration files"; license = licenses.lgpl3; diff --git a/pkgs/development/libraries/libconfuse/default.nix b/pkgs/development/libraries/libconfuse/default.nix index b7afe5ed03a..7545fe9617c 100644 --- a/pkgs/development/libraries/libconfuse/default.nix +++ b/pkgs/development/libraries/libconfuse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, flex }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, flex }: stdenv.mkDerivation rec { pname = "libconfuse"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { doInstallCheck = true; installCheckTarget = "check"; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Small configuration file parser library for C"; longDescription = '' diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix index 92b000bc4ef..9f75eafdf24 100644 --- a/pkgs/development/libraries/libcouchbase/default.nix +++ b/pkgs/development/libraries/libcouchbase/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, libevent, openssl}: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libevent, openssl}: stdenv.mkDerivation rec { pname = "libcouchbase"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DLCB_NO_MOCK=ON" ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libevent openssl ]; # Running tests in parallel does not work @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isDarwin; - meta = with stdenv.lib; { + meta = with lib; { description = "C client library for Couchbase"; homepage = "https://github.com/couchbase/libcouchbase"; license = licenses.asl20; diff --git a/pkgs/development/libraries/libcrafter/default.nix b/pkgs/development/libraries/libcrafter/default.nix index 20bcc9183ec..e7a6e6c9837 100644 --- a/pkgs/development/libraries/libcrafter/default.nix +++ b/pkgs/development/libraries/libcrafter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, autoconf, automake, libtool, libpcap }: +{ lib, stdenv, fetchzip, autoconf, automake, libtool, libpcap }: stdenv.mkDerivation rec { pname = "libcrafter"; @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/pellegre/libcrafter"; description = "High level C++ network packet sniffing and crafting library"; - license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.lethalman ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.lethalman ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libcredis/default.nix b/pkgs/development/libraries/libcredis/default.nix index 1368cd30adb..902f5a6ee26 100644 --- a/pkgs/development/libraries/libcredis/default.nix +++ b/pkgs/development/libraries/libcredis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "libcredis-0.2.3"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { cp -v *.h "$out/include/" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "C client library for Redis (key-value database)"; homepage = "https://code.google.com/archive/p/credis/"; license = licenses.bsd3; # from homepage diff --git a/pkgs/development/libraries/libcrossguid/default.nix b/pkgs/development/libraries/libcrossguid/default.nix index 8e2be72987c..c81dbb86f6a 100644 --- a/pkgs/development/libraries/libcrossguid/default.nix +++ b/pkgs/development/libraries/libcrossguid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libuuid }: +{ lib, stdenv, fetchFromGitHub, libuuid }: stdenv.mkDerivation rec { name = "lib" + pname + "-" + version; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { install -D -m644 guid.h "$out/include/guid.h" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Lightweight cross platform C++ GUID/UUID library"; license = licenses.mit; maintainers = with maintainers; [ edwtjo ]; diff --git a/pkgs/development/libraries/libcryptui/default.nix b/pkgs/development/libraries/libcryptui/default.nix index df1558a1e49..5fdd60abe11 100644 --- a/pkgs/development/libraries/libcryptui/default.nix +++ b/pkgs/development/libraries/libcryptui/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, intltool, glib, gnome3, gtk3, gnupg22, gpgme, dbus-glib, libgnome-keyring }: +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, intltool, glib, gnome3, gtk3, gnupg22, gpgme, dbus-glib, libgnome-keyring }: stdenv.mkDerivation rec { pname = "libcryptui"; version = "3.12.2"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0rh8wa5k2iwbwppyvij2jdxmnlfjbna7kbh2a5n7zw4nnjkx3ski"; }; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { ./fix-gnupg-2.2.patch # based on https://gitlab.gnome.org/GNOME/libcryptui/-/commit/b05e301d1b264a5d8f07cb96e5edc243d99bff79.patch ]; - nativeBuildInputs = [ pkgconfig intltool autoreconfHook ]; + nativeBuildInputs = [ pkg-config intltool autoreconfHook ]; buildInputs = [ glib gtk3 gnupg22 gpgme dbus-glib libgnome-keyring ]; propagatedBuildInputs = [ dbus-glib ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Interface components for OpenPGP"; homepage = "https://gitlab.gnome.org/GNOME/libcryptui"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/libcsptr/default.nix b/pkgs/development/libraries/libcsptr/default.nix index fcb5aa2bbfe..e30165054aa 100644 --- a/pkgs/development/libraries/libcsptr/default.nix +++ b/pkgs/development/libraries/libcsptr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "libcsptr"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Smart pointer constructs for the (GNU) C programming language"; homepage = "https://github.com/Snaipe/libcsptr"; license = licenses.mit; diff --git a/pkgs/development/libraries/libctb/default.nix b/pkgs/development/libraries/libctb/default.nix index 161c7c98c63..d52adac556d 100644 --- a/pkgs/development/libraries/libctb/default.nix +++ b/pkgs/development/libraries/libctb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "libctb"; version = "0.16"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Communications toolbox"; homepage = "https://iftools.com"; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/libctemplate/default.nix b/pkgs/development/libraries/libctemplate/default.nix index b571e816fc4..2aa36bfe991 100644 --- a/pkgs/development/libraries/libctemplate/default.nix +++ b/pkgs/development/libraries/libctemplate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3, autoconf, automake, libtool }: +{ lib, stdenv, fetchFromGitHub, python3, autoconf, automake, libtool }: stdenv.mkDerivation rec { pname = "ctemplate"; @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { embed application logic in this template language. ''; homepage = "https://github.com/OlafvdSpek/ctemplate"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }; } diff --git a/pkgs/development/libraries/libcue/default.nix b/pkgs/development/libraries/libcue/default.nix index 73a110c07f6..227dfd77f46 100644 --- a/pkgs/development/libraries/libcue/default.nix +++ b/pkgs/development/libraries/libcue/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, bison, flex }: +{ lib, stdenv, fetchFromGitHub, cmake, bison, flex }: stdenv.mkDerivation rec { pname = "libcue"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails all the tests (ctest) - meta = with stdenv.lib; { + meta = with lib; { description = "CUE Sheet Parser Library"; longDescription = '' libcue is intended to parse a so called cue sheet from a char string or diff --git a/pkgs/development/libraries/libcutl/default.nix b/pkgs/development/libraries/libcutl/default.nix index b13805aa37a..7a5c3984929 100644 --- a/pkgs/development/libraries/libcutl/default.nix +++ b/pkgs/development/libraries/libcutl/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, xercesc }: +{ lib, stdenv, fetchurl, xercesc }: stdenv.mkDerivation rec { pname = "libcutl"; version = "1.10.0"; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ utility library from Code Synthesis"; longDescription = '' libcutl is a C++ utility library. - It contains a collection of generic and independent components such as + It contains a collection of generic and independent components such as meta-programming tests, smart pointers, containers, compiler building blocks, etc. ''; homepage = "https://codesynthesis.com/projects/libcutl/"; diff --git a/pkgs/development/libraries/libdaemon/default.nix b/pkgs/development/libraries/libdaemon/default.nix index d906e119dca..eeb034ed067 100644 --- a/pkgs/development/libraries/libdaemon/default.nix +++ b/pkgs/development/libraries/libdaemon/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { name = "libdaemon-0.14"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { patches = [ ./fix-includes.patch ]; configureFlags = [ "--disable-lynx" ] - ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) + ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ # Can't run this test while cross-compiling "ac_cv_func_setpgrp_void=yes" ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Lightweight C library that eases the writing of UNIX daemons"; homepage = "http://0pointer.de/lennart/projects/libdaemon/"; - license = stdenv.lib.licenses.lgpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.lgpl2Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libdap/default.nix b/pkgs/development/libraries/libdap/default.nix index a643c25f0bf..8eacd9706a8 100644 --- a/pkgs/development/libraries/libdap/default.nix +++ b/pkgs/development/libraries/libdap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bison, libuuid, curl, libxml2, flex }: +{ lib, stdenv, fetchurl, bison, libuuid, curl, libxml2, flex }: stdenv.mkDerivation rec { version = "3.20.6"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0jn5bi8k2lq6mmrsw7r1r5aviyf8gb39b2iy20v4kpkj5napzk1m"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A C++ SDK which contains an implementation of DAP"; homepage = "https://www.opendap.org/software/libdap"; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/libdatrie/default.nix b/pkgs/development/libraries/libdatrie/default.nix index 168773662f6..f4e2df36d91 100644 --- a/pkgs/development/libraries/libdatrie/default.nix +++ b/pkgs/development/libraries/libdatrie/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper +{ lib, stdenv, fetchFromGitHub, makeWrapper , autoreconfHook, autoconf-archive , installShellFiles, libiconv }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { installShellFiles ]; - buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv; + buildInputs = lib.optional stdenv.isDarwin libiconv; preAutoreconf = let reports = "https://github.com/tlwg/libdatrie/issues"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { installManPage man/trietool.1 ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://linux.thai.net/~thep/datrie/datrie.html"; description = "This is an implementation of double-array structure for representing trie"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/libdazzle/default.nix b/pkgs/development/libraries/libdazzle/default.nix index 6c430682251..d6ecb6e9747 100644 --- a/pkgs/development/libraries/libdazzle/default.nix +++ b/pkgs/development/libraries/libdazzle/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ninja, meson, pkgconfig, vala, gobject-introspection, libxml2 +{ lib, stdenv, fetchurl, ninja, meson, pkg-config, vala, gobject-introspection, libxml2 , gtk-doc, docbook_xsl, docbook_xml_dtd_43, dbus, xvfb_run, glib, gtk3, gnome3 }: stdenv.mkDerivation rec { @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { outputBin = "dev"; src = fetchurl { - url = "mirror://gnome/sources/libdazzle/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/libdazzle/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "13v7s46cgw135ycx0byn7am4inn33slrhljq0v0wwfwl2y1g52p1"; }; - nativeBuildInputs = [ ninja meson pkgconfig vala gobject-introspection libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 dbus xvfb_run glib ]; + nativeBuildInputs = [ ninja meson pkg-config vala gobject-introspection libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 dbus xvfb_run glib ]; buildInputs = [ glib gtk3 ]; mesonFlags = [ @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A library to delight your users with fancy features"; longDescription = '' The libdazzle library is a companion library to GObject and GTK. It diff --git a/pkgs/development/libraries/libdbi-drivers/default.nix b/pkgs/development/libraries/libdbi-drivers/default.nix index 871c9f97167..6a86d4941bf 100644 --- a/pkgs/development/libraries/libdbi-drivers/default.nix +++ b/pkgs/development/libraries/libdbi-drivers/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, libdbi +{ lib, stdenv, fetchurl, libdbi , libmysqlclient ? null , sqlite ? null , postgresql ? null }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { name = "libdbi-drivers-0.9.0"; diff --git a/pkgs/development/libraries/libdbi/default.nix b/pkgs/development/libraries/libdbi/default.nix index 64c511503d0..48812f091be 100644 --- a/pkgs/development/libraries/libdbi/default.nix +++ b/pkgs/development/libraries/libdbi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "libdbi-0.9.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "00s5ra7hdlq25iv23nwf4h1v3kmbiyzx0v9bhggjiii4lpf6ryys"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://libdbi.sourceforge.net/"; description = "DB independent interface to DB"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libdbusmenu-qt/default.nix b/pkgs/development/libraries/libdbusmenu-qt/default.nix index 6b4be0db414..75d4f76b31f 100644 --- a/pkgs/development/libraries/libdbusmenu-qt/default.nix +++ b/pkgs/development/libraries/libdbusmenu-qt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, cmake }: +{ lib, stdenv, fetchurl, qt4, cmake }: let baseName = "libdbusmenu-qt"; @@ -20,7 +20,9 @@ stdenv.mkDerivation { cmakeFlags = [ "-DWITH_DOC=OFF" ]; - meta = with stdenv.lib; { + dontWrapQtApps = true; + + meta = with lib; { description = "Provides a Qt implementation of the DBusMenu spec"; inherit homepage; inherit (qt4.meta) platforms; diff --git a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix index d7eab296809..7219bcbdeb5 100644 --- a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix +++ b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, qtbase }: +{ lib, stdenv, fetchgit, cmake, qtbase }: stdenv.mkDerivation rec { pname = "libdbusmenu-qt"; @@ -15,7 +15,9 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DWITH_DOC=OFF" ]; - meta = with stdenv.lib; { + dontWrapQtApps = true; + + meta = with lib; { homepage = "https://launchpad.net/libdbusmenu-qt"; description = "Provides a Qt implementation of the DBusMenu spec"; maintainers = [ maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/libdbusmenu/default.nix b/pkgs/development/libraries/libdbusmenu/default.nix index 5e11864b1f1..8e9fe4de88a 100644 --- a/pkgs/development/libraries/libdbusmenu/default.nix +++ b/pkgs/development/libraries/libdbusmenu/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, lib, file -, pkgconfig, intltool +, pkg-config, intltool , glib, dbus-glib, json-glib , gobject-introspection, vala , gtkVersion ? null, gtk2 ? null, gtk3 ? null }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "12l7z8dhl917iy9h02sxmpclnhkdjryn08r8i4sr8l3lrlm4mk5r"; }; - nativeBuildInputs = [ vala pkgconfig intltool gobject-introspection ]; + nativeBuildInputs = [ vala pkg-config intltool gobject-introspection ]; buildInputs = [ glib dbus-glib json-glib diff --git a/pkgs/development/libraries/libdc1394/default.nix b/pkgs/development/libraries/libdc1394/default.nix index 8a688ef37c6..a666eb3a650 100644 --- a/pkgs/development/libraries/libdc1394/default.nix +++ b/pkgs/development/libraries/libdc1394/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libraw1394 +{ lib, stdenv, fetchurl, libraw1394 , libusb1, CoreServices }: stdenv.mkDerivation rec { @@ -11,10 +11,10 @@ stdenv.mkDerivation rec { }; buildInputs = [ libusb1 ] - ++ stdenv.lib.optional stdenv.isLinux libraw1394 - ++ stdenv.lib.optional stdenv.isDarwin CoreServices; + ++ lib.optional stdenv.isLinux libraw1394 + ++ lib.optional stdenv.isDarwin CoreServices; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://sourceforge.net/projects/libdc1394/"; description = "Capture and control API for IIDC compliant cameras"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/libde265/default.nix b/pkgs/development/libraries/libde265/default.nix index 6c2f3b8e107..bbbcdc3f054 100644 --- a/pkgs/development/libraries/libde265/default.nix +++ b/pkgs/development/libraries/libde265/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config }: stdenv.mkDerivation rec { version = "1.0.8"; @@ -11,16 +11,16 @@ stdenv.mkDerivation rec { sha256 = "1dzflqbk248lz5ws0ni5acmf32b3rmnq5gsfaz7691qqjxkl1zml"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; enableParallelBuilding = true; meta = { homepage = "https://github.com/strukturag/libde265"; description = "Open h.265 video codec implementation"; - license = stdenv.lib.licenses.lgpl3; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ gebner ]; + license = lib.licenses.lgpl3; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ gebner ]; }; } diff --git a/pkgs/development/libraries/libdevil/default.nix b/pkgs/development/libraries/libdevil/default.nix index 5d00d6b01ff..fa48c773dfc 100644 --- a/pkgs/development/libraries/libdevil/default.nix +++ b/pkgs/development/libraries/libdevil/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, libjpeg, libpng, libmng, lcms1, libtiff, openexr, libGL -, libX11, pkgconfig, OpenGL +{ lib, stdenv, fetchurl, libjpeg, libpng, libmng, lcms1, libtiff, openexr, libGL +, libX11, pkg-config, OpenGL }: stdenv.mkDerivation rec { @@ -15,15 +15,15 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; buildInputs = [ libjpeg libpng libmng lcms1 libtiff openexr libGL libX11 ] - ++ stdenv.lib.optionals stdenv.isDarwin [ OpenGL ]; - nativeBuildInputs = [ pkgconfig ]; + ++ lib.optionals stdenv.isDarwin [ OpenGL ]; + nativeBuildInputs = [ pkg-config ]; configureFlags = [ "--enable-ILU" "--enable-ILUT" ]; preConfigure = '' sed -i 's, -std=gnu99,,g' configure sed -i 's,malloc.h,stdlib.h,g' src-ILU/ilur/ilur.c - '' + stdenv.lib.optionalString stdenv.cc.isClang '' + '' + lib.optionalString stdenv.cc.isClang '' sed -i 's/libIL_la_CXXFLAGS = $(AM_CFLAGS)/libIL_la_CXXFLAGS =/g' lib/Makefile.in ''; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://openil.sourceforge.net/"; description = "An image library which can can load, save, convert, manipulate, filter and display a wide variety of image formats"; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/libdigidoc/default.nix b/pkgs/development/libraries/libdigidoc/default.nix index 5936853dcbc..7ee268e4e7d 100644 --- a/pkgs/development/libraries/libdigidoc/default.nix +++ b/pkgs/development/libraries/libdigidoc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, openssl, pcsclite, opensc, libxml2, Security }: +{ lib, stdenv, fetchurl, cmake, openssl, pcsclite, opensc, libxml2, Security }: stdenv.mkDerivation rec { @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ openssl pcsclite opensc libxml2 ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; + ++ lib.optionals stdenv.isDarwin [ Security ]; - cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [ "-DFRAMEWORK=OFF" ]; + cmakeFlags = lib.optionals stdenv.isDarwin [ "-DFRAMEWORK=OFF" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for creating DigiDoc signature files"; homepage = "https://github.com/open-eid/libdigidoc"; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/libdigidocpp/default.nix b/pkgs/development/libraries/libdigidocpp/default.nix index d966631dc27..f7170fa7f10 100644 --- a/pkgs/development/libraries/libdigidocpp/default.nix +++ b/pkgs/development/libraries/libdigidocpp/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, cmake, libdigidoc, minizip, pcsclite, opensc, openssl -, xercesc, xml-security-c, pkgconfig, xsd, zlib, xalanc, xxd }: +{ lib, stdenv, fetchurl, cmake, libdigidoc, minizip, pcsclite, opensc, openssl +, xercesc, xml-security-c, pkg-config, xsd, zlib, xalanc, xxd }: stdenv.mkDerivation rec { version = "3.14.4"; @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { sha256 = "1x72icq5lp5cfv6kyxqc3863wa164s0g41nbi6gldr8syprzdk1l"; }; - nativeBuildInputs = [ cmake pkgconfig xxd ]; + nativeBuildInputs = [ cmake pkg-config xxd ]; buildInputs = [ libdigidoc minizip pcsclite opensc openssl xercesc xml-security-c xsd zlib xalanc ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for creating DigiDoc signature files"; homepage = "http://www.id.ee/"; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/libdiscid/default.nix b/pkgs/development/libraries/libdiscid/default.nix index 698aac87b89..3021aced93f 100644 --- a/pkgs/development/libraries/libdiscid/default.nix +++ b/pkgs/development/libraries/libdiscid/default.nix @@ -1,21 +1,21 @@ -{ stdenv, fetchurl, cmake, pkgconfig, darwin }: +{ lib, stdenv, fetchurl, cmake, pkg-config, darwin }: stdenv.mkDerivation rec { pname = "libdiscid"; version = "0.6.2"; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.IOKit ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.IOKit ]; - src = fetchurl { url = "http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/${pname}-${version}.tar.gz"; sha256 = "1f9irlj3dpb5gyfdnb1m4skbjvx4d4hwiz2152f83m0d9jn47r7r"; }; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-framework CoreFoundation -framework IOKit"; + NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework CoreFoundation -framework IOKit"; - meta = with stdenv.lib; { + meta = with lib; { description = "A C library for creating MusicBrainz DiscIDs from audio CDs"; homepage = "http://musicbrainz.org/doc/libdiscid"; maintainers = with maintainers; [ ehmry ]; diff --git a/pkgs/development/libraries/libdivecomputer/default.nix b/pkgs/development/libraries/libdivecomputer/default.nix index 5f9417bd03c..0f65a5cee5c 100644 --- a/pkgs/development/libraries/libdivecomputer/default.nix +++ b/pkgs/development/libraries/libdivecomputer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "libdivecomputer"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.libdivecomputer.org"; description = "A cross-platform and open source library for communication with dive computers from various manufacturers"; maintainers = [ maintainers.mguentner ]; diff --git a/pkgs/development/libraries/libdivsufsort/default.nix b/pkgs/development/libraries/libdivsufsort/default.nix index 0d82db7cee4..0f332f8ac74 100644 --- a/pkgs/development/libraries/libdivsufsort/default.nix +++ b/pkgs/development/libraries/libdivsufsort/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation { name = "libdivsufsort-2.0.1"; @@ -10,8 +10,8 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/y-256/libdivsufsort"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; description = "Library to construct the suffix array and the BW transformed string"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libdmtx/default.nix b/pkgs/development/libraries/libdmtx/default.nix index 0bdf3fbe15a..994f010252f 100644 --- a/pkgs/development/libraries/libdmtx/default.nix +++ b/pkgs/development/libraries/libdmtx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig }: +{ lib, stdenv, fetchurl, pkg-config }: stdenv.mkDerivation rec { name = "libdmtx-0.7.4"; @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { sha256 = "0xnxx075ycy58n92yfda2z9zgd41h3d4ik5d9l197lzsqim5hb5n"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = { description = "An open source software for reading and writing Data Matrix barcodes"; homepage = "http://libdmtx.org"; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; maintainers = [ ]; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }; } diff --git a/pkgs/development/libraries/libdnet/default.nix b/pkgs/development/libraries/libdnet/default.nix index 176e0a22aba..43d9d2077fe 100644 --- a/pkgs/development/libraries/libdnet/default.nix +++ b/pkgs/development/libraries/libdnet/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, automake, autoconf, libtool}: +{lib, stdenv, fetchurl, automake, autoconf, libtool}: stdenv.mkDerivation { name = "libdnet-1.12"; @@ -22,8 +22,8 @@ stdenv.mkDerivation { meta = { description = "Provides a simplified, portable interface to several low-level networking routines"; homepage = "https://github.com/dugsong/libdnet"; - license = stdenv.lib.licenses.bsd3; - maintainers = [stdenv.lib.maintainers.marcweber]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.bsd3; + maintainers = [lib.maintainers.marcweber]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index b9825d9cfdf..e575624f815 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,19 +1,20 @@ -{ stdenv, lib, fetchurl, pkgconfig, meson, ninja, libpthreadstubs, libpciaccess -, withValgrind ? valgrind-light.meta.available, valgrind-light, fetchpatch +{ stdenv, lib, fetchurl, pkg-config, meson, ninja, docutils +, libpthreadstubs, libpciaccess +, withValgrind ? valgrind-light.meta.available, valgrind-light }: stdenv.mkDerivation rec { pname = "libdrm"; - version = "2.4.103"; + version = "2.4.104"; src = fetchurl { url = "https://dri.freedesktop.org/${pname}/${pname}-${version}.tar.xz"; - sha256 = "08h2nnf4w96b4ql7485mvjgbbsb8rwc0qa93fdm1cq34pbyszq1z"; + sha256 = "1jqvx9c23hgwhq109zqj6vg3ng40pcvh3r1k2fn1a424qasxhsnn"; }; outputs = [ "out" "dev" "bin" ]; - nativeBuildInputs = [ pkgconfig meson ninja ]; + nativeBuildInputs = [ pkg-config meson ninja docutils ]; buildInputs = [ libpthreadstubs libpciaccess ] ++ lib.optional withValgrind valgrind-light; @@ -34,12 +35,24 @@ stdenv.mkDerivation rec { "-Detnaviv=true" ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-Dintel=false"; - enableParallelBuilding = true; - - meta = { - homepage = "https://dri.freedesktop.org/libdrm/"; - description = "Library for accessing the kernel's Direct Rendering Manager"; - license = "bsd"; - platforms = lib.platforms.unix; + meta = with lib; { + homepage = "https://gitlab.freedesktop.org/mesa/drm"; + downloadPage = "https://dri.freedesktop.org/libdrm/"; + description = "Direct Rendering Manager library and headers"; + longDescription = '' + A userspace library for accessing the DRM (Direct Rendering Manager) on + Linux, BSD and other operating systems that support the ioctl interface. + The library provides wrapper functions for the ioctls to avoid exposing + the kernel interface directly, and for chipsets with drm memory manager, + support for tracking relocations and buffers. + New functionality in the kernel DRM drivers typically requires a new + libdrm, but a new libdrm will always work with an older kernel. + + libdrm is a low-level library, typically used by graphics drivers such as + the Mesa drivers, the X drivers, libva and similar projects. + ''; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ primeos ]; }; } diff --git a/pkgs/development/libraries/libdv/default.nix b/pkgs/development/libraries/libdv/default.nix index ed1e2cd74a3..ff3c7f6f863 100644 --- a/pkgs/development/libraries/libdv/default.nix +++ b/pkgs/development/libraries/libdv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, popt }: +{ lib, stdenv, fetchurl, popt }: stdenv.mkDerivation rec { name = "libdv-1.0.0"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { # This fixes an undefined symbol: _sched_setscheduler error on compile. # See the apple docs: http://cl.ly/2HeF bottom of the "Finding Imported Symbols" section - LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-undefined dynamic_lookup"; + LDFLAGS = lib.optionalString stdenv.isDarwin "-undefined dynamic_lookup"; configureFlags = [ "--disable-asm" @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ popt ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Software decoder for DV format video, as defined by the IEC 61834 and SMPTE 314M standards"; homepage = "https://sourceforge.net/projects/libdv/"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/libdvbpsi/default.nix b/pkgs/development/libraries/libdvbpsi/default.nix index 327aacb6f37..5d539a7a488 100644 --- a/pkgs/development/libraries/libdvbpsi/default.nix +++ b/pkgs/development/libraries/libdvbpsi/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { pname = "libdvbpsi"; @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { meta = { description = "A simple library designed for decoding and generation of MPEG TS and DVB PSI tables according to standards ISO/IEC 13818 and ITU-T H.222.0"; homepage = "http://www.videolan.org/developers/libdvbpsi.html"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.lgpl21; + platforms = lib.platforms.unix; + license = lib.licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/libdvdcss/default.nix b/pkgs/development/libraries/libdvdcss/default.nix index f097aad702a..278e3d60d90 100644 --- a/pkgs/development/libraries/libdvdcss/default.nix +++ b/pkgs/development/libraries/libdvdcss/default.nix @@ -1,17 +1,17 @@ -{stdenv, fetchurl, IOKit}: +{lib, stdenv, fetchurl, IOKit}: stdenv.mkDerivation rec { pname = "libdvdcss"; version = "1.4.2"; - buildInputs = stdenv.lib.optional stdenv.isDarwin IOKit; + buildInputs = lib.optional stdenv.isDarwin IOKit; src = fetchurl { url = "http://get.videolan.org/libdvdcss/${version}/${pname}-${version}.tar.bz2"; sha256 = "0x957zzpf4w2cp8zlk29prj8i2q6hay3lzdzsyz8y3cwxivyvhkq"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.videolan.org/developers/libdvdcss.html"; description = "A library for decrypting DVDs"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/libdvdnav/4.2.1.nix b/pkgs/development/libraries/libdvdnav/4.2.1.nix index c8ebf180b31..1f832de5bb3 100644 --- a/pkgs/development/libraries/libdvdnav/4.2.1.nix +++ b/pkgs/development/libraries/libdvdnav/4.2.1.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, libdvdread}: +{lib, stdenv, fetchurl, pkg-config, libdvdread}: stdenv.mkDerivation { name = "libdvdnav-4.2.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "7fca272ecc3241b6de41bbbf7ac9a303ba25cb9e0c82aa23901d3104887f2372"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [libdvdread]; configureScript = "./configure2"; # wtf? @@ -20,9 +20,9 @@ stdenv.mkDerivation { meta = { homepage = "http://dvdnav.mplayerhq.hu/"; description = "A library that implements DVD navigation features such as DVD menus"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.wmertens ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.wmertens ]; + platforms = lib.platforms.linux; }; passthru = { inherit libdvdread; }; diff --git a/pkgs/development/libraries/libdvdnav/default.nix b/pkgs/development/libraries/libdvdnav/default.nix index 2afc11c6009..3eb1032b2a7 100644 --- a/pkgs/development/libraries/libdvdnav/default.nix +++ b/pkgs/development/libraries/libdvdnav/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, libdvdread}: +{lib, stdenv, fetchurl, pkg-config, libdvdread}: stdenv.mkDerivation rec { pname = "libdvdnav"; @@ -9,15 +9,15 @@ stdenv.mkDerivation rec { sha256 = "0nzf1ir27s5vs1jrisdiw9ag2sc160k3gv7nplv9ypppm5gb35zn"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [libdvdread]; meta = { homepage = "http://dvdnav.mplayerhq.hu/"; description = "A library that implements DVD navigation features such as DVD menus"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.wmertens ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.wmertens ]; + platforms = lib.platforms.unix; }; passthru = { inherit libdvdread; }; diff --git a/pkgs/development/libraries/libdvdread/4.9.9.nix b/pkgs/development/libraries/libdvdread/4.9.9.nix index 33b04b0f7c0..7049e1dd993 100644 --- a/pkgs/development/libraries/libdvdread/4.9.9.nix +++ b/pkgs/development/libraries/libdvdread/4.9.9.nix @@ -1,8 +1,8 @@ -{stdenv, fetchurl, libdvdcss}: +{lib, stdenv, fetchurl, libdvdcss}: stdenv.mkDerivation { name = "libdvdread-4.9.9"; - + src = fetchurl { url = "http://dvdnav.mplayerhq.hu/releases/libdvdread-4.9.9.tar.xz"; sha256 = "d91275471ef69d488b05cf15c60e1cd65e17648bfc692b405787419f47ca424a"; @@ -19,8 +19,8 @@ stdenv.mkDerivation { meta = { homepage = "http://dvdnav.mplayerhq.hu/"; description = "A library for reading DVDs"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.wmertens ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.wmertens ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libdvdread/default.nix b/pkgs/development/libraries/libdvdread/default.nix index 997018a2970..32dfe4ee0fa 100644 --- a/pkgs/development/libraries/libdvdread/default.nix +++ b/pkgs/development/libraries/libdvdread/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libdvdcss}: +{lib, stdenv, fetchurl, libdvdcss}: stdenv.mkDerivation rec { pname = "libdvdread"; @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://dvdnav.mplayerhq.hu/"; description = "A library for reading DVDs"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.wmertens ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.wmertens ]; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix index ba4ebaec111..0d512b04201 100644 --- a/pkgs/development/libraries/libdwarf/default.nix +++ b/pkgs/development/libraries/libdwarf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libelf, zlib }: +{ lib, stdenv, fetchurl, libelf, zlib }: let version = "20181024"; @@ -11,8 +11,8 @@ let }; meta = { homepage = "https://www.prevanders.net/dwarf.html"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.lgpl21Plus; + platforms = lib.platforms.linux; + license = lib.licenses.lgpl21Plus; }; in rec { diff --git a/pkgs/development/libraries/libdwg/default.nix b/pkgs/development/libraries/libdwg/default.nix index 9b1aa3132e9..5a0347e5954 100644 --- a/pkgs/development/libraries/libdwg/default.nix +++ b/pkgs/development/libraries/libdwg/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, indent}: +{lib, stdenv, fetchurl, indent}: stdenv.mkDerivation { name = "libdwg-0.6"; @@ -18,8 +18,8 @@ stdenv.mkDerivation { meta = { description = "Library reading dwg files"; homepage = "http://libdwg.sourceforge.net/en/"; - license = stdenv.lib.licenses.gpl3; - maintainers = [stdenv.lib.maintainers.marcweber]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + maintainers = [lib.maintainers.marcweber]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libdynd/default.nix b/pkgs/development/libraries/libdynd/default.nix index 2450ac6a9ea..4f1fd3904d9 100644 --- a/pkgs/development/libraries/libdynd/default.nix +++ b/pkgs/development/libraries/libdynd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: let version = "0.7.2"; in stdenv.mkDerivation { @@ -31,7 +31,7 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; outputDoc = "dev"; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ dynamic ndarray library, with Python exposure"; homepage = "http://libdynd.org"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/libe-book/default.nix b/pkgs/development/libraries/libe-book/default.nix index 805b1869ac3..f467a01ea7a 100644 --- a/pkgs/development/libraries/libe-book/default.nix +++ b/pkgs/development/libraries/libe-book/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gperf, pkgconfig, librevenge, libxml2, boost, icu +{ lib, stdenv, fetchurl, gperf, pkg-config, librevenge, libxml2, boost, icu , cppunit, zlib, liblangtag }: @@ -13,7 +13,7 @@ let sha256="1yg1vws1wggzhjw672bpgh2x541g5i9wryf67g51m0r79zrqz3by"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gperf librevenge libxml2 boost icu cppunit zlib liblangtag ]; @@ -33,9 +33,9 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-Wno-error=unused-function"; meta = { inherit (s) version; - description = ''Library for import of reflowable e-book formats''; - license = stdenv.lib.licenses.lgpl21Plus ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; + description = "Library for import of reflowable e-book formats"; + license = lib.licenses.lgpl21Plus ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libe57format/default.nix b/pkgs/development/libraries/libe57format/default.nix index 137c73990f6..49b75906bdb 100644 --- a/pkgs/development/libraries/libe57format/default.nix +++ b/pkgs/development/libraries/libe57format/default.nix @@ -1,5 +1,5 @@ { - stdenv, + lib, stdenv, cmake, fetchFromGitHub, boost, @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { fi ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for reading & writing the E57 file format (fork of E57RefImpl)"; homepage = "https://github.com/asmaloney/libE57Format"; license = licenses.boost; diff --git a/pkgs/development/libraries/libeatmydata/default.nix b/pkgs/development/libraries/libeatmydata/default.nix index da7a186bea6..70fab2da568 100644 --- a/pkgs/development/libraries/libeatmydata/default.nix +++ b/pkgs/development/libraries/libeatmydata/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, strace, which }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, strace, which }: stdenv.mkDerivation rec { pname = "libeatmydata"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - ] ++ stdenv.lib.optionals doCheck [ strace which ]; + ] ++ lib.optionals doCheck [ strace which ]; # while we can *build* in parallel, the tests also run in parallel which does # not work with v105. Later versions (unreleased) have a fix for that. The @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Small LD_PRELOAD library to disable fsync and friends"; homepage = "https://www.flamingspork.com/projects/libeatmydata/"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/libeb/default.nix b/pkgs/development/libraries/libeb/default.nix index 2fdb1d071b6..fe0011f9c99 100644 --- a/pkgs/development/libraries/libeb/default.nix +++ b/pkgs/development/libraries/libeb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, zlib }: +{ lib, stdenv, fetchurl, perl, zlib }: stdenv.mkDerivation rec { pname = "libeb"; version = "4.4.3"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl ]; buildInputs = [ zlib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "C library for accessing Japanese CD-ROM books"; longDescription = '' The EB library is a library for accessing CD-ROM books, which are a diff --git a/pkgs/development/libraries/libebml/default.nix b/pkgs/development/libraries/libebml/default.nix index 29c4b4c3b09..5a8f1f00316 100644 --- a/pkgs/development/libraries/libebml/default.nix +++ b/pkgs/development/libraries/libebml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config }: stdenv.mkDerivation rec { pname = "libebml"; @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { sha256 = "052v4mjynndj9xgfl4lmlsnx9ai0pah0kjyr5fm34l7gj8vhc5s7"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=YES" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Extensible Binary Meta Language library"; homepage = "https://dl.matroska.org/downloads/libebml/"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libebur128/default.nix b/pkgs/development/libraries/libebur128/default.nix index e349af41bcb..ba4f84f8c80 100644 --- a/pkgs/development/libraries/libebur128/default.nix +++ b/pkgs/development/libraries/libebur128/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, speexdsp, pkg-config }: +{ lib, stdenv, fetchFromGitHub, cmake, speexdsp, pkg-config }: stdenv.mkDerivation rec { version = "1.2.4"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ speexdsp ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Implementation of the EBU R128 loudness standard"; homepage = "https://github.com/jiixyj/libebur128"; license = licenses.mit; diff --git a/pkgs/development/libraries/libechonest/default.nix b/pkgs/development/libraries/libechonest/default.nix index 957daf7dc41..29a0a63a03e 100644 --- a/pkgs/development/libraries/libechonest/default.nix +++ b/pkgs/development/libraries/libechonest/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, doxygen, qt4, qjson }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, doxygen, qt4, qjson }: stdenv.mkDerivation rec { pname = "libechonest"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { description = "A C++/Qt wrapper around the Echo Nest API"; homepage = "https://projects.kde.org/projects/playground/libs/libechonest"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix index 09bd41dbed0..92f3eeb7995 100644 --- a/pkgs/development/libraries/libedit/default.nix +++ b/pkgs/development/libraries/libedit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses }: +{ lib, stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { pname = "libedit"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { -e 's,-lncurses[a-z]*,-L${ncurses.out}/lib -lncursesw,g' ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.thrysoee.dk/editline/"; description = "A port of the NetBSD Editline library (libedit)"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libee/default.nix b/pkgs/development/libraries/libee/default.nix index 36d88f88786..7172df01e22 100644 --- a/pkgs/development/libraries/libee/default.nix +++ b/pkgs/development/libraries/libee/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libestr }: +{ lib, stdenv, fetchurl, pkg-config, libestr }: stdenv.mkDerivation { name = "libee-0.4.1"; @@ -7,13 +7,13 @@ stdenv.mkDerivation { sha256 = "09xhgzmsq0g3jsyj24vy67bhzk2fv971w5ixdkhfwgar70cw1nn0"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libestr]; meta = { homepage = "http://www.libee.org/"; description = "An Event Expression Library inspired by CEE"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.lgpl21Plus; + platforms = lib.platforms.unix; + license = lib.licenses.lgpl21Plus; }; } diff --git a/pkgs/development/libraries/libelf-freebsd/default.nix b/pkgs/development/libraries/libelf-freebsd/default.nix index 63507051207..c3a4986c832 100644 --- a/pkgs/development/libraries/libelf-freebsd/default.nix +++ b/pkgs/development/libraries/libelf-freebsd/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation (rec { src = fetchsvn { url = "svn://svn.code.sf.net/p/elftoolchain/code/trunk"; - rev = (stdenv.lib.strings.toInt version); + rev = (lib.strings.toInt version); name = "elftoolchain-${version}"; }; @@ -29,9 +29,9 @@ stdenv.mkDerivation (rec { homepage = "https://sourceforge.net/p/elftoolchain/wiki/Home/"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; - platforms = stdenv.lib.platforms.freebsd; + platforms = lib.platforms.freebsd; maintainers = [ ]; }; }) diff --git a/pkgs/development/libraries/libelf/default.nix b/pkgs/development/libraries/libelf/default.nix index 2b56f973b5d..2b8cd51ba5f 100644 --- a/pkgs/development/libraries/libelf/default.nix +++ b/pkgs/development/libraries/libelf/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl, autoreconfHook, gettext }: @@ -27,26 +27,26 @@ stdenv.mkDerivation rec { configureFlags = [] # Configure check for dynamic lib support is broken, see # http://lists.uclibc.org/pipermail/uclibc-cvs/2005-August/019383.html - ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "mr_cv_target_elf=yes" + ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "mr_cv_target_elf=yes" # Libelf's custom NLS macros fail to determine the catalog file extension # on Darwin, so disable NLS for now. - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin "--disable-nls"; + ++ lib.optional stdenv.hostPlatform.isDarwin "--disable-nls"; nativeBuildInputs = [ gettext ] # Need to regenerate configure script with newer version in order to pass # "mr_cv_target_elf=yes", but `autoreconfHook` brings in `makeWrapper` # which doesn't work with the bootstrapTools bash, so can only do this # for cross builds when `stdenv.shell` is a newer bash. - ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) autoreconfHook; + ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) autoreconfHook; meta = { description = "ELF object file access library"; homepage = "https://github.com/Distrotech/libelf"; - license = stdenv.lib.licenses.lgpl2Plus; + license = lib.licenses.lgpl2Plus; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/libelfin/default.nix b/pkgs/development/libraries/libelfin/default.nix index 8a8de854fc9..950639850db 100644 --- a/pkgs/development/libraries/libelfin/default.nix +++ b/pkgs/development/libraries/libelfin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3, substituteAll }: +{ lib, stdenv, fetchFromGitHub, python3, substituteAll }: stdenv.mkDerivation rec { pname = "libelfin"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/aclements/libelfin/"; license = licenses.mit; description = "C++11 ELF/DWARF parser"; diff --git a/pkgs/development/libraries/libepc/default.nix b/pkgs/development/libraries/libepc/default.nix index b8b28f49d1d..ee8dfb6e94f 100644 --- a/pkgs/development/libraries/libepc/default.nix +++ b/pkgs/development/libraries/libepc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk-doc, glib, avahi, gnutls, libuuid, libsoup, gtk3, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, intltool, gtk-doc, glib, avahi, gnutls, libuuid, libsoup, gtk3, gnome3 }: let avahiWithGtk = avahi.override { gtk3Support = true; }; @@ -9,12 +9,12 @@ in stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1s3svb2slqjsrqfv50c2ymnqcijcxb5gnx6bfibwh9l5ga290n91"; }; nativeBuildInputs = [ - pkgconfig + pkg-config intltool gtk-doc ]; @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Easy Publish and Consume Library"; homepage = "https://wiki.gnome.org/Projects/libepc"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/liberfa/default.nix b/pkgs/development/libraries/liberfa/default.nix index a1ca15536da..8ffd86cd316 100644 --- a/pkgs/development/libraries/liberfa/default.nix +++ b/pkgs/development/libraries/liberfa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "erfa"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-shared" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Essential Routines for Fundamental Astronomy"; homepage = "https://github.com/liberfa/erfa"; maintainers = with maintainers; [ mir06 ]; diff --git a/pkgs/development/libraries/liberio/default.nix b/pkgs/development/libraries/liberio/default.nix index b4023d5f36a..743455b836d 100644 --- a/pkgs/development/libraries/liberio/default.nix +++ b/pkgs/development/libraries/liberio/default.nix @@ -1,4 +1,5 @@ { stdenv +, lib , fetchFromGitHub , autoreconfHook , systemd @@ -27,7 +28,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Ettus Research DMA I/O Library"; homepage = "https://github.com/EttusResearch/liberio"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/libesmtp/default.nix b/pkgs/development/libraries/libesmtp/default.nix index e5a7f5609a3..542cff712c8 100644 --- a/pkgs/development/libraries/libesmtp/default.nix +++ b/pkgs/development/libraries/libesmtp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { pname = "libESMTP"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "02zbniyz7qys1jmx3ghx21kxmns1wc3hmv80gp7ag7yra9f1m9nh"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://brianstafford.info/libesmtp/index.html"; description = "A Library for Posting Electronic Mail"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libestr/default.nix b/pkgs/development/libraries/libestr/default.nix index add7ea00a98..8699e83d0fd 100644 --- a/pkgs/development/libraries/libestr/default.nix +++ b/pkgs/development/libraries/libestr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "libestr-0.1.11"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0910ifzcs8kpd3srrr4fvbacgh2zrc6yn7i4rwfj6jpzhlkjnqs6"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://libestr.adiscon.com/"; description = "Some essentials for string handling"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libetpan/default.nix b/pkgs/development/libraries/libetpan/default.nix index 9050320773a..b4b48dcb777 100644 --- a/pkgs/development/libraries/libetpan/default.nix +++ b/pkgs/development/libraries/libetpan/default.nix @@ -1,31 +1,29 @@ -{ stdenv, fetchFromGitHub -, autoconf -, automake -, libtool -, openssl +{ stdenv, lib, fetchFromGitHub +, autoconf, automake, libtool, openssl, pkg-config }: stdenv.mkDerivation rec { pname = "libetpan"; - version = "1.9.3"; + version = "1.9.4"; src = fetchFromGitHub { owner = "dinhviethoa"; repo = "libetpan"; rev = version; - sha256 = "19g4qskg71jv7sxfxsdkjmrxk9mk5kf9b6fhw06g6wvm3205n95f"; + sha256 = "0g7an003simfdn7ihg9yjv7hl2czsmjsndjrp39i7cad8icixscn"; }; - nativeBuildInputs = [ libtool autoconf automake ]; + nativeBuildInputs = [ autoconf automake libtool pkg-config ]; buildInputs = [ openssl ]; configureScript = "./autogen.sh"; - meta = with stdenv.lib; { - description = "An efficient, portable library for different kinds of mail access: IMAP, SMTP, POP, and NNTP"; + meta = with lib; { + description = "Mail Framework for the C Language"; homepage = "http://www.etpan.org/libetpan.html"; license = licenses.bsd3; + maintainers = with maintainers; [ oxzi ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libev/default.nix b/pkgs/development/libraries/libev/default.nix index 9f950ebb09c..750cb3974cf 100644 --- a/pkgs/development/libraries/libev/default.nix +++ b/pkgs/development/libraries/libev/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , # Note: -static hasn’t work on darwin static ? with stdenv.hostPlatform; isStatic && !isDarwin }: @@ -17,12 +17,12 @@ stdenv.mkDerivation rec { sha256 = "1sjs4324is7fp21an4aas2z4dwsvs6z4xwrmp72vwpq1s6wbfzjh"; }; - configureFlags = stdenv.lib.optional (static) "LDFLAGS=-static"; + configureFlags = lib.optional (static) "LDFLAGS=-static"; meta = { description = "A high-performance event loop/event model with lots of features"; - maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.bsd2; # or GPL2+ + maintainers = [ lib.maintainers.raskin ]; + platforms = lib.platforms.all; + license = lib.licenses.bsd2; # or GPL2+ }; } diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix index ba846ed07db..daae6984ab2 100644 --- a/pkgs/development/libraries/libevdev/default.nix +++ b/pkgs/development/libraries/libevdev/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, python3 }: +{ lib, stdenv, fetchurl, fetchpatch, python3 }: stdenv.mkDerivation rec { pname = "libevdev"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ python3 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Wrapper library for evdev devices"; homepage = "http://www.freedesktop.org/software/libevdev/doc/latest/index.html"; license = licenses.mit; diff --git a/pkgs/development/libraries/libevdevplus/default.nix b/pkgs/development/libraries/libevdevplus/default.nix index 0f2b3e05266..66c5f1b0696 100644 --- a/pkgs/development/libraries/libevdevplus/default.nix +++ b/pkgs/development/libraries/libevdevplus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config }: stdenv.mkDerivation rec { pname = "libevdevplus"; @@ -11,9 +11,9 @@ stdenv.mkDerivation rec { sha256 = "18z6pn4j7fhmwwh0q22ip5nn7sc1hfgwvkdzqhkja60i8cw2cvvj"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Easy-to-use event device library in C++"; license = licenses.mit; diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix index cbde3206717..b33e94114f6 100644 --- a/pkgs/development/libraries/libevent/default.nix +++ b/pkgs/development/libraries/libevent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, findutils, fixDarwinDylibNames +{ lib, stdenv, fetchurl, findutils, fixDarwinDylibNames , sslSupport? true, openssl }: @@ -16,25 +16,25 @@ stdenv.mkDerivation rec { # libevent_openssl is moved into its own output, so that openssl isn't present # in the default closure. outputs = [ "out" "dev" ] - ++ stdenv.lib.optional sslSupport "openssl" + ++ lib.optional sslSupport "openssl" ; outputBin = "dev"; propagatedBuildOutputs = [ "out" ] - ++ stdenv.lib.optional sslSupport "openssl" + ++ lib.optional sslSupport "openssl" ; nativeBuildInputs = [] - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames ; buildInputs = [] - ++ stdenv.lib.optional sslSupport openssl - ++ stdenv.lib.optional stdenv.isCygwin findutils + ++ lib.optional sslSupport openssl + ++ lib.optional stdenv.isCygwin findutils ; doCheck = false; # needs the net - postInstall = stdenv.lib.optionalString sslSupport '' + postInstall = lib.optionalString sslSupport '' moveToOutput "lib/libevent_openssl*" "$openssl" substituteInPlace "$dev/lib/pkgconfig/libevent_openssl.pc" \ --replace "$out" "$openssl" @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Event notification library"; longDescription = '' The libevent API provides a mechanism to execute a callback function diff --git a/pkgs/development/libraries/libewf/default.nix b/pkgs/development/libraries/libewf/default.nix index ff644599b8a..f38f09410ff 100644 --- a/pkgs/development/libraries/libewf/default.nix +++ b/pkgs/development/libraries/libewf/default.nix @@ -1,23 +1,23 @@ -{ fetchurl, stdenv, zlib, openssl, libuuid, pkgconfig }: +{ fetchurl, lib, stdenv, zlib, openssl, libuuid, pkg-config }: stdenv.mkDerivation rec { - version = "20201129"; + version = "20201210"; pname = "libewf"; src = fetchurl { url = "https://github.com/libyal/libewf/releases/download/${version}/libewf-experimental-${version}.tar.gz"; - sha256 = "168k1az9hm0lajh57zlbknsq5m8civ1rzp81zz4sd7v64xilzxdk"; + sha256 = "sha256-dI1We2bsBRDcyqd6HLC7eBE99dpzSkhHtNgt0ZE4aDc="; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib openssl libuuid ]; meta = { description = "Library for support of the Expert Witness Compression Format"; homepage = "https://sourceforge.net/projects/libewf/"; - license = stdenv.lib.licenses.lgpl3; - maintainers = [ stdenv.lib.maintainers.raskin ] ; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.lgpl3; + maintainers = [ lib.maintainers.raskin ] ; + platforms = lib.platforms.unix; inherit version; }; } diff --git a/pkgs/development/libraries/libexecinfo/default.nix b/pkgs/development/libraries/libexecinfo/default.nix index feee754590b..f3f89209707 100644 --- a/pkgs/development/libraries/libexecinfo/default.nix +++ b/pkgs/development/libraries/libexecinfo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch +{ lib, stdenv, fetchurl, fetchpatch , enableStatic ? true , enableShared ? !stdenv.hostPlatform.isStatic }: @@ -33,21 +33,21 @@ stdenv.mkDerivation rec { makeFlags = [ "CC:=$(CC)" "AR:=$(AR)" ]; buildFlags = - stdenv.lib.optional enableStatic "static" - ++ stdenv.lib.optional enableShared "dynamic"; + lib.optional enableStatic "static" + ++ lib.optional enableShared "dynamic"; patchFlags = [ "-p0" ]; installPhase = '' install -Dm644 execinfo.h stacktraverse.h -t $out/include - '' + stdenv.lib.optionalString enableShared '' + '' + lib.optionalString enableShared '' install -Dm755 libexecinfo.so.1 -t $out/lib ln -s $out/lib/libexecinfo.so{.1,} - '' + stdenv.lib.optionalString enableStatic '' + '' + lib.optionalString enableStatic '' install -Dm755 libexecinfo.a -t $out/lib ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Quick-n-dirty BSD licensed clone of the GNU libc backtrace facility"; license = licenses.bsd2; homepage = "https://www.freshports.org/devel/libexecinfo"; diff --git a/pkgs/development/libraries/libexif/default.nix b/pkgs/development/libraries/libexif/default.nix index a0f831e927e..20e69c4ad66 100644 --- a/pkgs/development/libraries/libexif/default.nix +++ b/pkgs/development/libraries/libexif/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, gettext }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, gettext }: stdenv.mkDerivation rec { pname = "libexif"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook gettext ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://libexif.github.io/"; description = "A library to read and manipulate EXIF data in digital photographs"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix index f7e9606bbe7..59916bfb33f 100644 --- a/pkgs/development/libraries/libextractor/default.nix +++ b/pkgs/development/libraries/libextractor/default.nix @@ -1,6 +1,6 @@ -{ fetchurl, stdenv, substituteAll +{ fetchurl, lib, stdenv, substituteAll , libtool, gettext, zlib, bzip2, flac, libvorbis -, exiv2, libgsf, rpm, pkgconfig, fetchpatch +, exiv2, libgsf, rpm, pkg-config, fetchpatch , gstreamerSupport ? true, gst_all_1 ? null # ^ Needed e.g. for proper id3 and FLAC support. # Set to `false` to decrease package closure size by about 87 MB (53%). @@ -41,12 +41,12 @@ stdenv.mkDerivation rec { sha256 = "01xhcjbzv6p53wz7y2ii76kb8m9iwvnm4ip9w4a0bpgaxqz4b9fw"; excludes = [ "ChangeLog" ]; }) - ] ++ stdenv.lib.optionals gstreamerSupport [ + ] ++ lib.optionals gstreamerSupport [ # Libraries cannot be wrapped so we need to hardcode the plug-in paths. (substituteAll { src = ./gst-hardcode-plugins.patch; - load_gst_plugins = stdenv.lib.concatMapStrings + load_gst_plugins = lib.concatMapStrings (plugin: ''gst_registry_scan_path(gst_registry_get(), "${plugin}/lib/gstreamer-1.0");'') (gstPlugins gst_all_1); }) @@ -61,11 +61,11 @@ stdenv.mkDerivation rec { buildInputs = [ libtool gettext zlib bzip2 flac libvorbis exiv2 libgsf rpm - pkgconfig - ] ++ stdenv.lib.optionals gstreamerSupport + pkg-config + ] ++ lib.optionals gstreamerSupport ([ gst_all_1.gstreamer ] ++ gstPlugins gst_all_1) - ++ stdenv.lib.optionals gtkSupport [ glib gtk3 ] - ++ stdenv.lib.optionals videoSupport [ ffmpeg_3 libmpeg2 ]; + ++ lib.optionals gtkSupport [ glib gtk3 ] + ++ lib.optionals videoSupport [ ffmpeg_3 libmpeg2 ]; configureFlags = [ "--disable-ltdl-install" @@ -105,9 +105,9 @@ stdenv.mkDerivation rec { additional MIME types are detected. ''; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libexttextcat/default.nix b/pkgs/development/libraries/libexttextcat/default.nix index 3adb606dd2d..8e5cc8685da 100644 --- a/pkgs/development/libraries/libexttextcat/default.nix +++ b/pkgs/development/libraries/libexttextcat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "libexttextcat-3.4.5"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1j6sjwkyhqvsgyw938bxxfwkzzi1mahk66g5342lv6j89jfvrz8k"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "An N-Gram-Based Text Categorization library primarily intended for language guessing"; homepage = "https://wiki.documentfoundation.org/Libexttextcat"; platforms = platforms.all; diff --git a/pkgs/development/libraries/libf2c/default.nix b/pkgs/development/libraries/libf2c/default.nix index 66b193d4ea8..85ff493ca04 100644 --- a/pkgs/development/libraries/libf2c/default.nix +++ b/pkgs/development/libraries/libf2c/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip}: +{lib, stdenv, fetchurl, unzip}: stdenv.mkDerivation rec { name = "libf2c-20160102"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "F2c converts Fortran 77 source code to C"; homepage = "http://www.netlib.org/f2c/"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.mit; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libfakekey/default.nix b/pkgs/development/libraries/libfakekey/default.nix index f95d150cc25..3e568759c1b 100644 --- a/pkgs/development/libraries/libfakekey/default.nix +++ b/pkgs/development/libraries/libfakekey/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, libXi, libXtst, pkgconfig, xorgproto }: +{ lib, stdenv, fetchurl, libX11, libXi, libXtst, pkg-config, xorgproto }: stdenv.mkDerivation rec { pname = "libfakekey"; @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { sha256 = "10msplyn535hmzbmbdnx4zc20hkaw6d81if5lzxs82k8sq2mkx9k"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXi libXtst xorgproto ]; NIX_LDFLAGS = "-lX11"; - meta = with stdenv.lib; { + meta = with lib; { description = "X virtual keyboard library"; homepage = "https://www.yoctoproject.org/tools-resources/projects/matchbox"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/libfaketime/default.nix b/pkgs/development/libraries/libfaketime/default.nix index 6c751e07b83..170bb116a8a 100644 --- a/pkgs/development/libraries/libfaketime/default.nix +++ b/pkgs/development/libraries/libfaketime/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl }: +{ lib, stdenv, fetchurl, perl }: stdenv.mkDerivation rec { pname = "libfaketime"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { patches = [ ./no-date-in-gzip-man-page.patch - ] ++ (stdenv.lib.optionals stdenv.cc.isClang [ + ] ++ (lib.optionals stdenv.cc.isClang [ # https://github.com/wolfcw/libfaketime/issues/277 ./0001-Remove-unsupported-clang-flags.patch ]); @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { PREFIX = placeholder "out"; LIBDIRNAME = "/lib"; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=cast-function-type -Wno-error=format-truncation"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=cast-function-type -Wno-error=format-truncation"; checkInputs = [ perl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Report faked system time to programs without having to change the system-wide time"; homepage = "https://github.com/wolfcw/libfaketime/"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/libff/default.nix b/pkgs/development/libraries/libff/default.nix index 874f45cae70..72d2406aa82 100644 --- a/pkgs/development/libraries/libff/default.nix +++ b/pkgs/development/libraries/libff/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, boost, gmp, openssl, pkg-config }: +{ lib, stdenv, fetchFromGitHub, cmake, boost, gmp, openssl, pkg-config }: stdenv.mkDerivation rec { pname = "libff"; @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { # CMake is hardcoded to always build static library which causes linker # failure for Haskell applications depending on haskellPackages.hevm on macOS. - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace libff/CMakeLists.txt --replace "STATIC" "SHARED" ''; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ boost gmp openssl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ library for Finite Fields and Elliptic Curves"; changelog = "https://github.com/scipr-lab/libff/blob/develop/CHANGELOG.md"; homepage = "https://github.com/scipr-lab/libff"; diff --git a/pkgs/development/libraries/libffcall/default.nix b/pkgs/development/libraries/libffcall/default.nix index 7fdc04d116e..8967ec49a09 100644 --- a/pkgs/development/libraries/libffcall/default.nix +++ b/pkgs/development/libraries/libffcall/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "libffcall"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { rm -rf $out/share ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Foreign function call library"; homepage = "https://www.gnu.org/software/libffcall/"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix index d7dad6d956d..29b76e34d65 100644 --- a/pkgs/development/libraries/libffi/default.nix +++ b/pkgs/development/libraries/libffi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch +{ lib, stdenv, fetchurl, fetchpatch , autoreconfHook }: @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; # Don't run the native `strip' when cross-compiling. - meta = with stdenv.lib; { + meta = with lib; { description = "A foreign function call interface library"; longDescription = '' The libffi library provides a portable, high level programming diff --git a/pkgs/development/libraries/libfido2/default.nix b/pkgs/development/libraries/libfido2/default.nix index 48b457b09de..f44ae4d01f2 100644 --- a/pkgs/development/libraries/libfido2/default.nix +++ b/pkgs/development/libraries/libfido2/default.nix @@ -1,8 +1,8 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , cmake -, pkgconfig +, pkg-config , hidapi , libcbor , openssl @@ -17,10 +17,10 @@ stdenv.mkDerivation rec { sha256 = "08iizxq3w8mpkwfrfpl59csffc20yz8x398bl3kf23rrr4izk42r"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ hidapi libcbor openssl ] - ++ stdenv.lib.optionals stdenv.isLinux [ udev ]; + ++ lib.optionals stdenv.isLinux [ udev ]; cmakeFlags = [ "-DUDEV_RULES_DIR=${placeholder "out"}/etc/udev/rules.d" @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { "-DCMAKE_INSTALL_LIBDIR=lib" ]; - meta = with stdenv.lib; { + meta = with lib; { description = '' Provides library functionality for FIDO 2.0, including communication with a device over USB. ''; diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix index e5b76b1435f..daacf325e97 100644 --- a/pkgs/development/libraries/libfilezilla/default.nix +++ b/pkgs/development/libraries/libfilezilla/default.nix @@ -1,31 +1,31 @@ -{ stdenv +{ lib, stdenv , fetchurl , autoreconfHook , gettext , gnutls , nettle -, pkgconfig +, pkg-config , libiconv , ApplicationServices }: stdenv.mkDerivation rec { pname = "libfilezilla"; - version = "0.25.0"; + version = "0.26.0"; src = fetchurl { url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "0akvki7n5rwmc52wss25i3h4nwl935flhjypf8dx3lvf4jszxxiv"; + sha256 = "sha256-F+0iZZPo5GbOPD+M5YOzbHnxYxierVTWMWE8w9pcgL0="; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ gettext gnutls nettle ] - ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ApplicationServices ]; + ++ lib.optionals stdenv.isDarwin [ libiconv ApplicationServices ]; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://lib.filezilla-project.org/"; description = "A modern C++ library, offering some basic functionality to build high-performing, platform-independent programs"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/libfishsound/default.nix b/pkgs/development/libraries/libfishsound/default.nix index 23d828033e3..72dc2986711 100644 --- a/pkgs/development/libraries/libfishsound/default.nix +++ b/pkgs/development/libraries/libfishsound/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libvorbis, speex, flac, pkgconfig }: +{ lib, stdenv, fetchurl, libvorbis, speex, flac, pkg-config }: stdenv.mkDerivation rec { name = "libfishsound-1.0.0"; @@ -10,9 +10,9 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libvorbis speex flac ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://xiph.org/fishsound/"; description = "A simple programming interface for decoding and encoding audio data using Xiph.org codecs (FLAC, Speex and Vorbis)"; longDescription = ''libfishsound by itself is designed to handle raw codec streams from a lower level layer such as UDP datagrams. When these codecs are used in files, they are commonly encapsulated in Ogg to produce Ogg FLAC, Speex and Ogg Vorbis files. diff --git a/pkgs/development/libraries/libfive/default.nix b/pkgs/development/libraries/libfive/default.nix index 2670f94fbc2..0f6ad84fe75 100644 --- a/pkgs/development/libraries/libfive/default.nix +++ b/pkgs/development/libraries/libfive/default.nix @@ -4,7 +4,7 @@ , fetchFromGitHub , cmake , ninja -, pkgconfig +, pkg-config , eigen , zlib , libpng @@ -23,7 +23,7 @@ mkDerivation { sha256 = "102zw2n3vzv84i323is4qrwwqqha8v1cniw54ss8f4bq6dmic0bg"; }; - nativeBuildInputs = [ wrapQtAppsHook cmake ninja pkgconfig ]; + nativeBuildInputs = [ wrapQtAppsHook cmake ninja pkg-config ]; buildInputs = [ eigen zlib libpng boost guile ]; # Link "Studio" binary to "libfive-studio" to be more obvious: diff --git a/pkgs/development/libraries/libfixposix/default.nix b/pkgs/development/libraries/libfixposix/default.nix index 4fdb22f8bd4..d8659b9e15f 100644 --- a/pkgs/development/libraries/libfixposix/default.nix +++ b/pkgs/development/libraries/libfixposix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config }: stdenv.mkDerivation rec { pname = "libfixposix"; @@ -11,9 +11,9 @@ stdenv.mkDerivation rec { sha256 = "1x4q6yspi5g2s98vq4qszw4z3zjgk9l5zs8471w4d4cs6l97w08j"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/sionescu/libfixposix"; description = "Thin wrapper over POSIX syscalls and some replacement functionality"; license = licenses.boost; diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/development/libraries/libfm/default.nix index 94476984de0..dc835924125 100644 --- a/pkgs/development/libraries/libfm/default.nix +++ b/pkgs/development/libraries/libfm/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, glib, intltool, menu-cache, pango, pkgconfig, vala +{ lib, stdenv, fetchurl, glib, intltool, menu-cache, pango, pkg-config, vala , extraOnly ? false , withGtk3 ? false, gtk2, gtk3 }: let gtk = if withGtk3 then gtk3 else gtk2; - inherit (stdenv.lib) optional; + inherit (lib) optional; in stdenv.mkDerivation rec { name = if extraOnly @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "1r6gl49xrykldwz8y4h2s7gjarxigg3bbkrj0gphxjj1vr5j9ccn"; }; - nativeBuildInputs = [ vala pkgconfig intltool ]; + nativeBuildInputs = [ vala pkg-config intltool ]; buildInputs = [ glib gtk pango ] ++ optional (!extraOnly) menu-cache; configureFlags = [ @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://blog.lxde.org/category/pcmanfm/"; license = licenses.lgpl21Plus; description = "A glib-based library for file management"; diff --git a/pkgs/development/libraries/libfprint/default.nix b/pkgs/development/libraries/libfprint/default.nix index 11051f70e44..f3f7313accb 100644 --- a/pkgs/development/libraries/libfprint/default.nix +++ b/pkgs/development/libraries/libfprint/default.nix @@ -1,6 +1,6 @@ -{ stdenv +{ lib, stdenv , fetchFromGitLab -, pkgconfig +, pkg-config , meson , ninja , gusb @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config meson ninja gtk-doc @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { "-Dudev_rules_dir=${placeholder "out"}/lib/udev/rules.d" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://fprint.freedesktop.org/"; description = "A library designed to make it easy to add support for consumer fingerprint readers"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libfpx/default.nix b/pkgs/development/libraries/libfpx/default.nix index 52c64ed8629..2576d426af5 100644 --- a/pkgs/development/libraries/libfpx/default.nix +++ b/pkgs/development/libraries/libfpx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch }: +{ lib, stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { name = "libfpx-1.3.1-7"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; # Darwin gets misdetected as Windows without this - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-D__unix"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-D__unix"; patches = [ (fetchpatch { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { substituteInPlace jpeg/ejpeg.h --replace "int No_JPEG_Header_Flag" "" '' else null; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.imagemagick.org"; description = "A library for manipulating FlashPIX images"; license = "Flashpix"; diff --git a/pkgs/development/libraries/libfreefare/default.nix b/pkgs/development/libraries/libfreefare/default.nix index 4af7d44a294..9fd8c1e6b61 100644 --- a/pkgs/development/libraries/libfreefare/default.nix +++ b/pkgs/development/libraries/libfreefare/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libnfc, openssl +{ lib, stdenv, fetchurl, pkg-config, libnfc, openssl , libobjc ? null }: stdenv.mkDerivation { @@ -10,10 +10,10 @@ stdenv.mkDerivation { sha256 = "0r5wfvwgf35lb1v65wavnwz2wlfyfdims6a9xpslf4lsm4a1v8xz"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libnfc openssl ] ++ stdenv.lib.optional stdenv.isDarwin libobjc; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libnfc openssl ] ++ lib.optional stdenv.isDarwin libobjc; - meta = with stdenv.lib; { + meta = with lib; { description = "The libfreefare project aims to provide a convenient API for MIFARE card manipulations"; license = licenses.lgpl3; homepage = "https://github.com/nfc-tools/libfreefare"; diff --git a/pkgs/development/libraries/libfsm/default.nix b/pkgs/development/libraries/libfsm/default.nix index e1c7f892aab..5e3c40da82c 100644 --- a/pkgs/development/libraries/libfsm/default.nix +++ b/pkgs/development/libraries/libfsm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , bmake }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - # fix up multi-output install. we also have to fix the pkgconfig libdir + # fix up multi-output install. we also have to fix the pkg-config libdir # file; it uses prefix=$out; libdir=${prefix}/lib, which is wrong in # our case; libdir should really be set to the $lib output. postInstall = '' @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "dev" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "DFA regular expression library & friends"; homepage = "https://github.com/katef/libfsm"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/libftdi/1.x.nix b/pkgs/development/libraries/libftdi/1.x.nix index 0e2e24d0f3b..ae599a97529 100644 --- a/pkgs/development/libraries/libftdi/1.x.nix +++ b/pkgs/development/libraries/libftdi/1.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, libusb1, libconfuse +{ lib, stdenv, fetchurl, cmake, pkg-config, libusb1, libconfuse , cppSupport ? true, boost ? null , pythonSupport ? true, python3 ? null, swig ? null , docSupport ? true, doxygen ? null @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { sha256 = "0x0vncf6i92slgrn0h7ghkskqbglbs534220qa84d0qg114zndpc"; }; - nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = with stdenv.lib; [ libconfuse ] + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = with lib; [ libconfuse ] ++ optionals cppSupport [ boost ] ++ optionals pythonSupport [ python3 swig ] ++ optionals docSupport [ doxygen ]; - preBuild = stdenv.lib.optionalString docSupport '' + preBuild = lib.optionalString docSupport '' make doc_i ''; @@ -32,12 +32,12 @@ stdenv.mkDerivation rec { mkdir -p "$out/etc/udev/rules.d/" cp ../packages/99-libftdi.rules "$out/etc/udev/rules.d/" cp -r doc/man "$out/share/" - '' + stdenv.lib.optionalString docSupport '' + '' + lib.optionalString docSupport '' mkdir -p "$out/share/libftdi/doc/" cp -r doc/html "$out/share/libftdi/doc/" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A library to talk to FTDI chips using libusb"; homepage = "https://www.intra2net.com/en/developer/libftdi/"; license = with licenses; [ lgpl2 gpl2 ]; diff --git a/pkgs/development/libraries/libftdi/default.nix b/pkgs/development/libraries/libftdi/default.nix index 88c848397de..0326b9c4f64 100644 --- a/pkgs/development/libraries/libftdi/default.nix +++ b/pkgs/development/libraries/libftdi/default.nix @@ -1,6 +1,6 @@ -{stdenv, fetchurl, libusb-compat-0_1}: +{lib, stdenv, fetchurl, libusb-compat-0_1}: -with stdenv; mkDerivation rec { +stdenv.mkDerivation rec { name = "libftdi-0.20"; src = fetchurl { @@ -14,7 +14,7 @@ with stdenv; mkDerivation rec { # Hack to avoid TMPDIR in RPATHs. preFixup = ''rm -rf "$(pwd)" ''; - configureFlags = lib.optional (!isDarwin) "--with-async-mode"; + configureFlags = lib.optional (!stdenv.isDarwin) "--with-async-mode"; # allow async mode. from ubuntu. see: # https://bazaar.launchpad.net/~ubuntu-branches/ubuntu/trusty/libftdi/trusty/view/head:/debian/patches/04_async_mode.diff diff --git a/pkgs/development/libraries/libfyaml/default.nix b/pkgs/development/libraries/libfyaml/default.nix index 5ce8cd6c6a1..69b7bdc7d1e 100644 --- a/pkgs/development/libraries/libfyaml/default.nix +++ b/pkgs/development/libraries/libfyaml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gnum4 }: +{ lib, stdenv, fetchurl, gnum4 }: stdenv.mkDerivation rec { pname = "libfyaml"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gnum4 ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/pantoniou/libfyaml"; description = "Fully feature complete YAML parser and emitter, supporting the latest YAML spec and passing the full YAML testsuite"; license = licenses.mit; diff --git a/pkgs/development/libraries/libgadu/default.nix b/pkgs/development/libraries/libgadu/default.nix index 4e9ce765b96..72bf067b2db 100644 --- a/pkgs/development/libraries/libgadu/default.nix +++ b/pkgs/development/libraries/libgadu/default.nix @@ -1,21 +1,25 @@ -{stdenv, fetchurl, zlib}: +{ lib, stdenv, fetchFromGitHub, zlib, protobufc, autoreconfHook }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { + pname = "libgadu"; + version = "1.12.2"; - name = "libgadu-1.11.2"; - - src = fetchurl { - url = "http://toxygen.net/libgadu/files/libgadu-1.11.2.tar.gz"; - sha256 = "0kifi9blhbimihqw4kaf6wyqhlx8fpp8nq4s6y280ar9p0il2n3z"; + src = fetchFromGitHub { + owner = "wojtekka"; + repo = pname; + rev = version; + sha256 = "1s16cripy5w9k12534qb012iwc5m9qcjyrywgsziyn3kl3i0aa8h"; }; propagatedBuildInputs = [ zlib ]; + buildInputs = [ protobufc ]; + nativeBuildInputs = [ autoreconfHook ]; meta = { description = "A library to deal with gadu-gadu protocol (most popular polish IM protocol)"; - homepage = "http://toxygen.net/libgadu/"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.lgpl21; + homepage = "https://libgadu.net/index.en.html"; + platforms = lib.platforms.linux; + license = lib.licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/libgaminggear/default.nix b/pkgs/development/libraries/libgaminggear/default.nix index b3d58c446cf..f059d6c73a2 100644 --- a/pkgs/development/libraries/libgaminggear/default.nix +++ b/pkgs/development/libraries/libgaminggear/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, gettext +{ lib, stdenv, fetchurl, cmake, pkg-config, gettext , gtk2, libcanberra, libnotify, pcre, sqlite, xorg , harfbuzz }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { outputs = [ "dev" "out" "bin" ]; - nativeBuildInputs = [ cmake pkgconfig gettext ]; + nativeBuildInputs = [ cmake pkg-config gettext ]; propagatedBuildInputs = [ gtk2 libcanberra libnotify pcre sqlite xorg.libXdmcp xorg.libpthreadstubs @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { description = "Provides functionality for gaming input devices"; homepage = "https://sourceforge.net/projects/libgaminggear/"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/libgcrypt/1.5.nix b/pkgs/development/libraries/libgcrypt/1.5.nix index 9de5cf2d2d1..b6968ff2d4e 100644 --- a/pkgs/development/libraries/libgcrypt/1.5.nix +++ b/pkgs/development/libraries/libgcrypt/1.5.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0ydy7bgra5jbq9mxl5x031nif3m6y3balc6ndw2ngj11wnsjc61h"; }; - patches = stdenv.lib.optionals stdenv.isDarwin [ + patches = lib.optionals stdenv.isDarwin [ (fetchpatch { name = "fix-x86_64-apple-darwin.patch"; sha256 = "138sfwl1avpy19320dbd63mskspc1khlc93j1f1zmylxx3w19csi"; @@ -26,17 +26,28 @@ stdenv.mkDerivation rec { # Also make sure includes are fixed for callers who don't use libgpgcrypt-config postInstall = '' sed -i 's,#include <gpg-error.h>,#include "${libgpgerror.dev}/include/gpg-error.h",g' $out/include/gcrypt.h - '' + stdenv.lib.optionalString enableCapabilities '' + '' + lib.optionalString enableCapabilities '' sed -i 's,\(-lcap\),-L${libcap.lib}/lib \1,' $out/lib/libgcrypt.la ''; doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.gnu.org/software/libgcrypt/"; description = "General-pupose cryptographic library"; license = licenses.lgpl2Plus; platforms = platforms.all; repositories.git = "git://git.gnupg.org/libgcrypt.git"; + knownVulnerabilities = [ + "CVE-2014-3591" + "CVE-2015-0837" + "CVE-2015-7511" + "CVE-2017-0379" + "CVE-2017-7526" + "CVE-2017-9526" + "CVE-2018-0495" + "CVE-2018-6829" + "CVE-2018-12437" + ]; }; } diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index cd529cb06ee..081b67b1663 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gettext, libgpgerror, enableCapabilities ? false, libcap +{ lib, stdenv, fetchurl, gettext, libgpgerror, enableCapabilities ? false, libcap , buildPackages }: @@ -6,11 +6,11 @@ assert enableCapabilities -> stdenv.isLinux; stdenv.mkDerivation rec { pname = "libgcrypt"; - version = "1.8.7"; + version = "1.9.1"; src = fetchurl { url = "mirror://gnupg/libgcrypt/${pname}-${version}.tar.bz2"; - sha256 = "0j27jxhjay78by940d64778nxwbysxynv5mq6iq1nmlrh810zdq3"; + sha256 = "1nb50bgzp83q6r5cz4v40y1mcbhpqwqyxlay87xp1lrbkf5pm9n5"; }; outputs = [ "out" "dev" "info" ]; @@ -19,16 +19,16 @@ stdenv.mkDerivation rec { # The CPU Jitter random number generator must not be compiled with # optimizations and the optimize -O0 pragma only works for gcc. # The build enables -O2 by default for everything else. - hardeningDisable = stdenv.lib.optional stdenv.cc.isClang "fortify"; + hardeningDisable = lib.optional stdenv.cc.isClang "fortify"; depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = [ libgpgerror ] - ++ stdenv.lib.optional stdenv.isDarwin gettext - ++ stdenv.lib.optional enableCapabilities libcap; + ++ lib.optional stdenv.isDarwin gettext + ++ lib.optional enableCapabilities libcap; configureFlags = [ "--with-libgpg-error-prefix=${libgpgerror.dev}" ] - ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-asm"; + ++ lib.optional stdenv.hostPlatform.isMusl "--disable-asm"; # Necessary to generate correct assembly when compiling for aarch32 on # aarch64 @@ -43,20 +43,20 @@ stdenv.mkDerivation rec { # Also make sure includes are fixed for callers who don't use libgpgcrypt-config postFixup = '' sed -i 's,#include <gpg-error.h>,#include "${libgpgerror.dev}/include/gpg-error.h",g' "$dev/include/gcrypt.h" - '' + stdenv.lib.optionalString enableCapabilities '' + '' + lib.optionalString enableCapabilities '' sed -i 's,\(-lcap\),-L${libcap.lib}/lib \1,' $out/lib/libgcrypt.la ''; # TODO: figure out why this is even necessary and why the missing dylib only crashes # random instead of every test - preCheck = stdenv.lib.optionalString stdenv.isDarwin '' + preCheck = lib.optionalString stdenv.isDarwin '' mkdir -p $out/lib cp src/.libs/libgcrypt.20.dylib $out/lib ''; doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.gnu.org/software/libgcrypt/"; description = "General-purpose cryptographic library"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/libgda/6.x.nix b/pkgs/development/libraries/libgda/6.x.nix new file mode 100644 index 00000000000..fc24fe41c4d --- /dev/null +++ b/pkgs/development/libraries/libgda/6.x.nix @@ -0,0 +1,92 @@ +{ lib +, stdenv +, fetchurl +, pkg-config +, intltool +, meson +, ninja +, itstool +, libxml2 +, python3 +, gtk3 +, json-glib +, isocodes +, openssl +, gnome3 +, gobject-introspection +, vala +, libgee +, sqlite +, gtk-doc +, yelp-tools +, mysqlSupport ? false +, libmysqlclient ? null +, postgresSupport ? false +, postgresql ? null +}: + +assert mysqlSupport -> libmysqlclient != null; +assert postgresSupport -> postgresql != null; + +stdenv.mkDerivation rec { + pname = "libgda"; + version = "6.0.0"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0w564z7krgjk19r39mi5qn4kggpdg9ggbyn9pb4aavb61r14npwr"; + }; + + nativeBuildInputs = [ + pkg-config + intltool + meson + ninja + itstool + libxml2 + python3 + gobject-introspection + vala + gtk-doc + yelp-tools + ]; + + buildInputs = [ + gtk3 + json-glib + isocodes + openssl + libgee + sqlite + ] ++ lib.optionals mysqlSupport [ + libmysqlclient + ] ++ lib.optionals postgresSupport [ + postgresql + ]; + + postPatch = '' + patchShebangs \ + providers/raw_spec.py \ + providers/mysql/gen_bin.py + ''; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "libgda6"; + }; + }; + + meta = with lib; { + description = "Database access library"; + homepage = "https://www.gnome-db.org/"; + license = with licenses; [ + # library + lgpl2Plus + # CLI tools + gpl2Plus + ]; + maintainers = teams.gnome.members; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libgda/default.nix b/pkgs/development/libraries/libgda/default.nix index 3f8e6f01b34..307cc14a6ef 100644 --- a/pkgs/development/libraries/libgda/default.nix +++ b/pkgs/development/libraries/libgda/default.nix @@ -1,7 +1,27 @@ -{ stdenv, fetchurl, pkg-config, intltool, itstool, libxml2, gtk3, openssl, gnome3, gobject-introspection, vala, libgee -, overrideCC, gcc6, fetchpatch, autoreconfHook, gtk-doc, autoconf-archive, yelp-tools -, mysqlSupport ? false, libmysqlclient ? null -, postgresSupport ? false, postgresql ? null +{ lib +, stdenv +, fetchurl +, pkg-config +, intltool +, itstool +, libxml2 +, gtk3 +, openssl +, gnome3 +, gobject-introspection +, vala +, libgee +, overrideCC +, gcc6 +, fetchpatch +, autoreconfHook +, gtk-doc +, autoconf-archive +, yelp-tools +, mysqlSupport ? false +, libmysqlclient ? null +, postgresSupport ? false +, postgresql ? null }: assert mysqlSupport -> libmysqlclient != null; @@ -12,7 +32,7 @@ assert postgresSupport -> postgresql != null; version = "5.2.10"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1j1l4dwjgw6w4d1v4bl5a4kwyj7bcih8mj700ywm7xakh1xxyv3g"; }; @@ -24,7 +44,30 @@ assert postgresSupport -> postgresql != null; }) ]; - configureFlags = with stdenv.lib; [ + nativeBuildInputs = [ + pkg-config + intltool + itstool + libxml2 + gobject-introspection + vala + autoreconfHook + gtk-doc + autoconf-archive + yelp-tools + ]; + + buildInputs = [ + gtk3 + openssl + libgee + ] ++ lib.optionals mysqlSupport [ + libmysqlclient + ] ++ lib.optionals postgresSupport [ + postgresql + ]; + + configureFlags = [ "--with-mysql=${if mysqlSupport then "yes" else "no"}" "--with-postgres=${if postgresSupport then "yes" else "no"}" @@ -40,22 +83,22 @@ assert postgresSupport -> postgresql != null; hardeningDisable = [ "format" ]; - nativeBuildInputs = [ pkg-config intltool itstool libxml2 gobject-introspection vala autoreconfHook gtk-doc autoconf-archive yelp-tools ]; - buildInputs = with stdenv.lib; [ gtk3 openssl libgee ] - ++ optional (mysqlSupport) libmysqlclient - ++ optional (postgresSupport) postgresql; - passthru = { updateScript = gnome3.updateScript { packageName = pname; }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Database access library"; homepage = "https://www.gnome-db.org/"; - license = [ licenses.lgpl2 licenses.gpl2 ]; + license = with licenses; [ + # library + lgpl2Plus + # CLI tools + gpl2Plus + ]; maintainers = teams.gnome.members; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libgdamm/default.nix b/pkgs/development/libraries/libgdamm/default.nix index be3e2e469ad..44a0e8bc212 100644 --- a/pkgs/development/libraries/libgdamm/default.nix +++ b/pkgs/development/libraries/libgdamm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glibmm, libgda, libxml2, gnome3 +{ lib, stdenv, fetchurl, pkg-config, glibmm, libgda, libxml2, gnome3 , mysqlSupport ? false , postgresSupport ? false }: @@ -13,11 +13,11 @@ in stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1fyh15b3f8hmwbswalxk1g4l04yvvybksn5nm7gznn5jl5q010p9"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glibmm libxml2 ]; propagatedBuildInputs = [ gda ]; @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ bindings for libgda"; homepage = "https://www.gnome-db.org/"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/libgdata/default.nix b/pkgs/development/libraries/libgdata/default.nix index 50eac405706..86e3f4274fc 100644 --- a/pkgs/development/libraries/libgdata/default.nix +++ b/pkgs/development/libraries/libgdata/default.nix @@ -1,6 +1,6 @@ -{ stdenv +{ lib, stdenv , fetchurl -, pkgconfig +, pkg-config , meson , ninja , nixosTests @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "installedTests" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0bj7ij6k3lxjn62jgh8vabr8vfjs48aylnnl3779warw5iwyzfga"; }; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { gobject-introspection meson ninja - pkgconfig + pkg-config vala ]; @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "GData API library"; homepage = "https://wiki.gnome.org/Projects/libgdata"; maintainers = with maintainers; [ raskin lethalman ] ++ teams.gnome.members; diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix index 70043d1132d..705205df396 100644 --- a/pkgs/development/libraries/libgdiplus/default.nix +++ b/pkgs/development/libraries/libgdiplus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, glib, cairo, Carbon, fontconfig +{ lib, stdenv, fetchFromGitHub, pkg-config, glib, cairo, Carbon, fontconfig , libtiff, giflib, libjpeg, libpng , libXrender, libexif, autoreconfHook, fetchpatch }: @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; - configureFlags = stdenv.lib.optional stdenv.cc.isClang "--host=${stdenv.hostPlatform.system}"; + configureFlags = lib.optional stdenv.cc.isClang "--host=${stdenv.hostPlatform.system}"; enableParallelBuilding = true; @@ -29,9 +29,9 @@ stdenv.mkDerivation rec { [ glib cairo fontconfig libtiff giflib libjpeg libpng libXrender libexif ] - ++ stdenv.lib.optional stdenv.isDarwin Carbon; + ++ lib.optional stdenv.isDarwin Carbon; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.isDarwin '' ln -s $out/lib/libgdiplus.0.dylib $out/lib/libgdiplus.so ''; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { make check -w ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Mono library that provides a GDI+-compatible API on non-Windows operating systems"; homepage = "https://www.mono-project.com/docs/gui/libgdiplus/"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libgee/default.nix b/pkgs/development/libraries/libgee/default.nix index c2d1c197fe9..407b99b5a57 100644 --- a/pkgs/development/libraries/libgee/default.nix +++ b/pkgs/development/libraries/libgee/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobject-introspection, gnome3 }: +{ lib, stdenv, fetchurl, autoconf, vala, pkg-config, glib, gobject-introspection, gnome3 }: stdenv.mkDerivation rec { pname = "libgee"; @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1pm525wm11dhwz24m8bpcln9547lmrigl6cxf3qsbg4cr3pyvdfh"; }; doCheck = true; - nativeBuildInputs = [ pkgconfig autoconf vala gobject-introspection ]; + nativeBuildInputs = [ pkg-config autoconf vala gobject-introspection ]; buildInputs = [ glib ]; PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "dev"}/share/gir-1.0"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Utility library providing GObject-based interfaces and classes for commonly used data structures"; homepage = "https://wiki.gnome.org/Projects/Libgee"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/libgeotiff/default.nix b/pkgs/development/libraries/libgeotiff/default.nix index 1b973fd5eee..eb35d5316c0 100644 --- a/pkgs/development/libraries/libgeotiff/default.nix +++ b/pkgs/development/libraries/libgeotiff/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libtiff, libjpeg, proj, zlib, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, libtiff, libjpeg, proj, zlib, autoreconfHook }: stdenv.mkDerivation rec { version = "1.5.1"; @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { meta = { description = "Library implementing attempt to create a tiff based interchange format for georeferenced raster imagery"; homepage = "https://github.com/OSGeo/libgeotiff"; - license = stdenv.lib.licenses.mit; - maintainers = [stdenv.lib.maintainers.marcweber]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = lib.licenses.mit; + maintainers = [lib.maintainers.marcweber]; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/libgepub/default.nix b/pkgs/development/libraries/libgepub/default.nix index cf62e0cabc9..e058c7ed5af 100644 --- a/pkgs/development/libraries/libgepub/default.nix +++ b/pkgs/development/libraries/libgepub/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, glib, gobject-introspection, gnome3 +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, glib, gobject-introspection, gnome3 , webkitgtk, libsoup, libxml2, libarchive }: stdenv.mkDerivation rec { @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { version = "0.6.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "16dkyywqdnfngmwsgbyga0kl9vcnzczxi3lmhm27pifrq5f3k2n7"; }; doCheck = true; - nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection ]; + nativeBuildInputs = [ meson ninja pkg-config gobject-introspection ]; buildInputs = [ glib webkitgtk libsoup libxml2 libarchive ]; passthru = { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "GObject based library for handling and rendering epub documents"; license = licenses.lgpl21Plus; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libgig/default.nix b/pkgs/development/libraries/libgig/default.nix index 84d44969a14..f78a51db5de 100644 --- a/pkgs/development/libraries/libgig/default.nix +++ b/pkgs/development/libraries/libgig/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake, libsndfile, libtool, pkgconfig, libuuid }: +{ lib, stdenv, fetchurl, autoconf, automake, libsndfile, libtool, pkg-config, libuuid }: stdenv.mkDerivation rec { pname = "libgig"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1zs5yy124bymfyapsnljr6rv2lnn5inwchm0xnwiw44b2d39l8hn"; }; - nativeBuildInputs = [ autoconf automake libtool pkgconfig ]; + nativeBuildInputs = [ autoconf automake libtool pkg-config ]; buildInputs = [ libsndfile libuuid ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.linuxsampler.org"; description = "Gigasampler file access library"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/libgit2-glib/default.nix b/pkgs/development/libraries/libgit2-glib/default.nix index 9a05a01bee6..fe36a9d663f 100644 --- a/pkgs/development/libraries/libgit2-glib/default.nix +++ b/pkgs/development/libraries/libgit2-glib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gnome3, meson, ninja, pkgconfig, vala, libssh2 +{ lib, stdenv, fetchurl, gnome3, meson, ninja, pkg-config, vala, libssh2 , gtk-doc, gobject-introspection, libgit2, glib, python3 }: stdenv.mkDerivation rec { @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "0.99.0.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1pmrcnsa7qdda73c3dxf47733mwprmj5ljpw3acxbj6r8k27anp0"; }; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - meson ninja pkgconfig vala gtk-doc gobject-introspection + meson ninja pkg-config vala gtk-doc gobject-introspection ]; propagatedBuildInputs = [ @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { python3.pkgs.pygobject3 # this should really be a propagated input of python output ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A glib wrapper library around the libgit2 git access library"; homepage = "https://wiki.gnome.org/Projects/Libgit2-glib"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libgksu/default.nix b/pkgs/development/libraries/libgksu/default.nix index 9ead3a97c04..cf8f5ab4878 100644 --- a/pkgs/development/libraries/libgksu/default.nix +++ b/pkgs/development/libraries/libgksu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, wrapGAppsHook, gtk2, gnome2, gnome3, +{ lib, stdenv, fetchurl, pkg-config, wrapGAppsHook, gtk2, gnome2, gnome3, libstartup_notification, libgtop, perlPackages, autoreconfHook, intltool, docbook_xsl, xauth }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig autoreconfHook intltool docbook_xsl wrapGAppsHook + pkg-config autoreconfHook intltool docbook_xsl wrapGAppsHook ]; buildInputs = [ @@ -79,8 +79,8 @@ stdenv.mkDerivation rec { programs in an X session. ''; homepage = "https://www.nongnu.org/gksu/"; - license = stdenv.lib.licenses.lgpl2; - maintainers = [ stdenv.lib.maintainers.romildo ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.lgpl2; + maintainers = [ lib.maintainers.romildo ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix index 3a4737d483b..88ba7dacc22 100644 --- a/pkgs/development/libraries/libglvnd/default.nix +++ b/pkgs/development/libraries/libglvnd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, python3, pkgconfig, libX11, libXext, xorgproto, addOpenGLRunpath }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, python3, pkg-config, libX11, libXext, xorgproto, addOpenGLRunpath }: stdenv.mkDerivation rec { pname = "libglvnd"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "10x7fgb114r4gikdg6flszl3kwzcb9y5qa7sj9936mk0zxhjaylz"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig python3 addOpenGLRunpath ]; + nativeBuildInputs = [ autoreconfHook pkg-config python3 addOpenGLRunpath ]; buildInputs = [ libX11 libXext xorgproto ]; postPatch = lib.optionalString stdenv.isDarwin '' @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ] ++ lib.optional stdenv.cc.isClang "-Wno-error"); # Indirectly: https://bugs.freedesktop.org/show_bug.cgi?id=35268 - configureFlags = stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-tls"; + configureFlags = lib.optional stdenv.hostPlatform.isMusl "--disable-tls"; outputs = [ "out" "dev" ]; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { passthru = { inherit (addOpenGLRunpath) driverLink; }; - meta = with stdenv.lib; { + meta = with lib; { description = "The GL Vendor-Neutral Dispatch library"; homepage = "https://github.com/NVIDIA/libglvnd"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/libgnome-keyring/default.nix b/pkgs/development/libraries/libgnome-keyring/default.nix index 33a6a075ae4..3f5a5961ba0 100644 --- a/pkgs/development/libraries/libgnome-keyring/default.nix +++ b/pkgs/development/libraries/libgnome-keyring/default.nix @@ -1,22 +1,22 @@ -{ stdenv, fetchurl, glib, dbus, libgcrypt, pkgconfig, intltool }: +{ lib, stdenv, fetchurl, glib, dbus, libgcrypt, pkg-config, intltool }: stdenv.mkDerivation rec { pname = "libgnome-keyring"; version = "2.32.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "030gka96kzqg1r19b4xrmac89hf1xj1kr5p461yvbzfxh46qqf2n"; }; outputs = [ "out" "dev" ]; propagatedBuildInputs = [ glib dbus libgcrypt ]; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkg-config intltool ]; meta = { inherit (glib.meta) platforms maintainers; homepage = "https://wiki.gnome.org/Projects/GnomeKeyring"; - license = with stdenv.lib.licenses; [ gpl2 lgpl2 ]; + license = with lib.licenses; [ gpl2 lgpl2 ]; }; } diff --git a/pkgs/development/libraries/libgnomekbd/default.nix b/pkgs/development/libraries/libgnomekbd/default.nix index c02fd503eb0..62228b8837a 100644 --- a/pkgs/development/libraries/libgnomekbd/default.nix +++ b/pkgs/development/libraries/libgnomekbd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, file, intltool, glib, gtk3, libxklavier, wrapGAppsHook, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, file, intltool, glib, gtk3, libxklavier, wrapGAppsHook, gnome3 }: stdenv.mkDerivation rec { pname = "libgnomekbd"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0y962ykn3rr9gylj0pwpww7bi20lmhvsw6qvxs5bisbn2mih5jpp"; }; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ file intltool - pkgconfig + pkg-config wrapGAppsHook ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { glib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Keyboard management library"; maintainers = teams.gnome.members; license = licenses.gpl2; diff --git a/pkgs/development/libraries/libgnurl/default.nix b/pkgs/development/libraries/libgnurl/default.nix index 5daeba2c06e..a7d91d0c81a 100644 --- a/pkgs/development/libraries/libgnurl/default.nix +++ b/pkgs/development/libraries/libgnurl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libtool, groff, perl, pkgconfig, python2, zlib, gnutls, +{ lib, stdenv, fetchurl, libtool, groff, perl, pkg-config, python2, zlib, gnutls, libidn2, libunistring, nghttp2 }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1y4laraq37kw8hc8jlzgcw7y37bfd0n71q0sy3d3z6yg7zh2prxi"; }; - nativeBuildInputs = [ libtool groff perl pkgconfig python2 ]; + nativeBuildInputs = [ libtool groff perl pkg-config python2 ]; buildInputs = [ gnutls zlib libidn2 libunistring nghttp2 ]; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { "--without-librtmp" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A fork of libcurl used by GNUnet"; homepage = "https://gnunet.org/en/gnurl.html"; maintainers = with maintainers; [ vrthra ]; diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index 972ca4c04a5..da53a9916d0 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -17,11 +17,11 @@ }; in stdenv.mkDerivation (rec { pname = "libgpg-error"; - version = "1.38"; + version = "1.41"; src = fetchurl { url = "mirror://gnupg/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "00px79xzyc5lj8aig7i4fhk29h1lkqp4840wjfgi9mv9m9sq566q"; + sha256 = "0hi7jbcs1l9kxzhiqcs2iivsb048642mwaimgqyh1hy3bas7ic34"; }; postPatch = '' @@ -65,8 +65,9 @@ in stdenv.mkDerivation (rec { doCheck = true; # not cross - meta = with stdenv.lib; { - homepage = "https://www.gnupg.org/related_software/libgpg-error/index.html"; + meta = with lib; { + homepage = "https://www.gnupg.org/software/libgpg-error/index.html"; + changelog = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=blob;f=NEWS;hb=refs/tags/libgpg-error-${version}"; description = "A small library that defines common error values for all GnuPG components"; longDescription = '' diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix index 89bca2ee75f..4dec3151a7c 100644 --- a/pkgs/development/libraries/libgphoto2/default.nix +++ b/pkgs/development/libraries/libgphoto2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gettext +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gettext , libusb1 , libtool , libexif @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config gettext libtool ]; @@ -49,8 +49,8 @@ stdenv.mkDerivation rec { from digital cameras. ''; # XXX: the homepage claims LGPL, but several src files are lgpl21Plus - license = stdenv.lib.licenses.lgpl21Plus; - platforms = with stdenv.lib.platforms; unix; - maintainers = with stdenv.lib.maintainers; [ jcumming ]; + license = lib.licenses.lgpl21Plus; + platforms = with lib.platforms; unix; + maintainers = with lib.maintainers; [ jcumming ]; }; } diff --git a/pkgs/development/libraries/libgpiod/default.nix b/pkgs/development/libraries/libgpiod/default.nix index a3178e54804..8f6d9fcab5e 100644 --- a/pkgs/development/libraries/libgpiod/default.nix +++ b/pkgs/development/libraries/libgpiod/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, autoconf-archive, pkgconfig, kmod +{ lib, stdenv, fetchurl, autoreconfHook, autoconf-archive, pkg-config, kmod , enable-tools ? true , enablePython ? false, python3, ncurses }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ kmod ] ++ lib.optionals enablePython [ python3 ncurses ]; nativeBuildInputs = [ autoconf-archive - pkgconfig + pkg-config autoreconfHook ]; diff --git a/pkgs/development/libraries/libgpod/default.nix b/pkgs/development/libraries/libgpod/default.nix index d23a5238295..49dcec3ee78 100644 --- a/pkgs/development/libraries/libgpod/default.nix +++ b/pkgs/development/libraries/libgpod/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { homepage = "https://gtkpod.sourceforge.net/"; description = "Library used by gtkpod to access the contents of an ipod"; license = "LGPL"; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; + platforms = lib.platforms.gnu ++ lib.platforms.linux; maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/libgringotts/default.nix b/pkgs/development/libraries/libgringotts/default.nix index 323f5af7097..16595a12eb5 100644 --- a/pkgs/development/libraries/libgringotts/default.nix +++ b/pkgs/development/libraries/libgringotts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, zlib, bzip2, libmcrypt, libmhash }: +{ lib, stdenv, fetchurl, pkg-config, zlib, bzip2, libmcrypt, libmhash }: stdenv.mkDerivation rec { pname = "libgringotts"; @@ -9,10 +9,10 @@ stdenv.mkDerivation rec { sha256 = "1ldz1lyl1aml5ci1mpnys8dg6n7khpcs4zpycak3spcpgdsnypm7"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib bzip2 libmcrypt libmhash ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A small library to encapsulate data in an encrypted structure"; homepage = "http://libgringotts.sourceforge.net/"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/libgroove/default.nix b/pkgs/development/libraries/libgroove/default.nix index 52cdf5e9027..963bf722b2a 100644 --- a/pkgs/development/libraries/libgroove/default.nix +++ b/pkgs/development/libraries/libgroove/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libav, SDL2, chromaprint, libebur128 }: +{ lib, stdenv, fetchFromGitHub, cmake, libav, SDL2, chromaprint, libebur128 }: stdenv.mkDerivation rec { version = "4.3.0"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libav SDL2 chromaprint libebur128 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Streaming audio processing library"; homepage = "https://github.com/andrewrk/libgroove"; license = licenses.mit; diff --git a/pkgs/development/libraries/libgrss/default.nix b/pkgs/development/libraries/libgrss/default.nix index fdad5369813..b8c7c7bc497 100644 --- a/pkgs/development/libraries/libgrss/default.nix +++ b/pkgs/development/libraries/libgrss/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, vala, gobject-introspection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, libxml2, libsoup, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, vala, gobject-introspection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, libxml2, libsoup, gnome3 }: let version = "0.7.0"; @@ -10,11 +10,11 @@ stdenv.mkDerivation { outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1nalslgyglvhpva3px06fj6lv5zgfg0qmj0sbxyyl5d963vc02b7"; }; - nativeBuildInputs = [ pkgconfig vala gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_412 ]; + nativeBuildInputs = [ pkg-config vala gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_412 ]; buildInputs = [ glib libxml2 libsoup ]; configureFlags = [ @@ -30,7 +30,7 @@ stdenv.mkDerivation { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Glib abstaction to handle feeds in RSS, Atom and other formats"; homepage = "https://wiki.gnome.org/Projects/Libgrss"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index 34cb1ef3381..77fa161b773 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, intltool, gettext, glib, libxml2, zlib, bzip2 +{ fetchurl, lib, stdenv, pkg-config, intltool, gettext, glib, libxml2, zlib, bzip2 , perl, gdk-pixbuf, libiconv, libintl, gnome3 }: stdenv.mkDerivation rec { @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { version = "1.14.47"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0kbpp9ksl7977xiga37sk1gdw1r039v6zviqznl7alvvg39yp26i"; }; - nativeBuildInputs = [ pkgconfig intltool libintl ]; + nativeBuildInputs = [ pkg-config intltool libintl ]; buildInputs = [ gettext bzip2 zlib ]; checkInputs = [ perl ]; @@ -28,12 +28,12 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "GNOME's Structured File Library"; homepage = "https://www.gnome.org/projects/libgsf"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ lovek323 ]; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; longDescription = '' Libgsf aims to provide an efficient extensible I/O abstraction for diff --git a/pkgs/development/libraries/libgssglue/default.nix b/pkgs/development/libraries/libgssglue/default.nix index d13c0940205..678af459a30 100644 --- a/pkgs/development/libraries/libgssglue/default.nix +++ b/pkgs/development/libraries/libgssglue/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kerberos }: +{ lib, stdenv, fetchurl, kerberos }: stdenv.mkDerivation rec { name = "libgssglue-0.4"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { EOF ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.citi.umich.edu/projects/nfsv4/linux/"; description = "Exports a gssapi interface which calls other random gssapi libraries"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libgtop/default.nix b/pkgs/development/libraries/libgtop/default.nix index 65f5e2750e5..af4fe04a0b4 100644 --- a/pkgs/development/libraries/libgtop/default.nix +++ b/pkgs/development/libraries/libgtop/default.nix @@ -1,7 +1,7 @@ -{ stdenv +{ lib, stdenv , fetchurl , glib -, pkgconfig +, pkg-config , perl , gettext , gobject-introspection @@ -14,12 +14,12 @@ stdenv.mkDerivation rec { version = "2.40.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1m6jbqk8maa52gxrf223442fr5bvvxgb7ham6v039i3r1i62gwvq"; }; nativeBuildInputs = [ - pkgconfig + pkg-config gtk-doc perl gettext @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A library that reads information about processes and the running system"; license = licenses.gpl2Plus; maintainers = teams.gnome.members; diff --git a/pkgs/development/libraries/libgudev/default.nix b/pkgs/development/libraries/libgudev/default.nix index c7c3064acb8..feeae05bf52 100644 --- a/pkgs/development/libraries/libgudev/default.nix +++ b/pkgs/development/libraries/libgudev/default.nix @@ -1,6 +1,6 @@ -{ stdenv +{ lib, stdenv , fetchurl -, pkgconfig +, pkg-config , udev , glib , gobject-introspection @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0drf39qhsdz35kwb18hnfj2ig4yfxhfks66m783zlhnvy2narbhv"; }; - nativeBuildInputs = [ pkgconfig gobject-introspection ]; + nativeBuildInputs = [ pkg-config gobject-introspection ]; buildInputs = [ udev glib ]; # There's a dependency cycle with umockdev and the tests fail to LD_PRELOAD anyway. @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A library that provides GObject bindings for libudev"; homepage = "https://wiki.gnome.org/Projects/libgudev"; maintainers = [ maintainers.eelco ] ++ teams.gnome.members; diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index d6e45deadcf..0f56f8c97f3 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, autoreconfHook, makeWrapper +{ lib, stdenv, fetchurl, pkg-config, autoreconfHook, makeWrapper , ncurses, cpio, gperf, cdrkit, flex, bison, qemu, pcre, augeas, libxml2 , acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex, db , gmp, readline, file, numactl, libapparmor, jansson @@ -7,7 +7,7 @@ , appliance ? null , javaSupport ? false, jdk ? null }: -assert appliance == null || stdenv.lib.isDerivation appliance; +assert appliance == null || lib.isDerivation appliance; assert javaSupport -> jdk != null; stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "ad6562c48c38e922a314cb45a90996843d81045595c4917f66b02a6c2dfe8058"; }; - nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig ]; + nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config ]; buildInputs = [ ncurses cpio gperf jansson cdrkit flex bison qemu pcre augeas libxml2 acl libcap libcap_ng libconfig @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { libtirpc ] ++ (with perlPackages; [ perl libintl_perl GetoptLong SysVirt ]) ++ (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml_libvirt gettext-stub ounit ]) - ++ stdenv.lib.optional javaSupport jdk; + ++ lib.optional javaSupport jdk; prePatch = '' # build-time scripts @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { patchShebangs . ''; configureFlags = [ "--disable-appliance" "--disable-daemon" "--with-distro=NixOS" ] - ++ stdenv.lib.optionals (!javaSupport) [ "--disable-java" "--without-java" ]; + ++ lib.optionals (!javaSupport) [ "--disable-java" "--without-java" ]; patches = [ ./libguestfs-syms.patch ]; NIX_CFLAGS_COMPILE="-I${libxml2.dev}/include/libxml2/"; installFlags = [ "REALLY_INSTALL=yes" ]; @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { done ''; - postFixup = stdenv.lib.optionalString (appliance != null) '' + postFixup = lib.optionalString (appliance != null) '' mkdir -p $out/{lib,lib64} ln -s ${appliance} $out/lib64/guestfs ln -s ${appliance} $out/lib/guestfs @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { runHook postInstallCheck ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tools for accessing and modifying virtual machine disk images"; license = with licenses; [ gpl2 lgpl21 ]; homepage = "https://libguestfs.org/"; diff --git a/pkgs/development/libraries/libgumath/default.nix b/pkgs/development/libraries/libgumath/default.nix index 55e89d87664..f82401f524f 100644 --- a/pkgs/development/libraries/libgumath/default.nix +++ b/pkgs/development/libraries/libgumath/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , libndtypes , libxnd @@ -25,7 +25,7 @@ stdenv.mkDerivation { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Library supporting function dispatch on general data containers. C base and Python wrapper"; homepage = "https://xnd.io/"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libgweather/default.nix b/pkgs/development/libraries/libgweather/default.nix index 5493343fc23..9351d3f707f 100644 --- a/pkgs/development/libraries/libgweather/default.nix +++ b/pkgs/development/libraries/libgweather/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, libxml2, glib, gtk3, gettext, libsoup +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, libxml2, glib, gtk3, gettext, libsoup , gtk-doc, docbook_xsl, docbook_xml_dtd_43, gobject-introspection, python3, tzdata, geocode-glib, vala, gnome3 }: stdenv.mkDerivation rec { @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0l74hc02rvzm4p530y539a67jwb080fqdaazdl8j0fr3xvq0j9yy"; }; - nativeBuildInputs = [ meson ninja pkgconfig gettext vala gtk-doc docbook_xsl docbook_xml_dtd_43 gobject-introspection python3 ]; + nativeBuildInputs = [ meson ninja pkg-config gettext vala gtk-doc docbook_xsl docbook_xml_dtd_43 gobject-introspection python3 ]; buildInputs = [ glib gtk3 libsoup libxml2 geocode-glib ]; postPatch = '' @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A library to access weather information from online services for numerous locations"; homepage = "https://wiki.gnome.org/Projects/LibGWeather"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/libgxps/default.nix b/pkgs/development/libraries/libgxps/default.nix index 095b5c8f61c..f7392ffb7dd 100644 --- a/pkgs/development/libraries/libgxps/default.nix +++ b/pkgs/development/libraries/libgxps/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, glib, gobject-introspection, cairo +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, glib, gobject-introspection, cairo , libarchive, freetype, libjpeg, libtiff, gnome3, lcms2 }: @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { version = "0.3.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "157s4c9gjjss6yd7qp7n4q6s72gz1k4ilsx4xjvp357azk49z4qs"; }; - nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection ]; + nativeBuildInputs = [ meson ninja pkg-config gobject-introspection ]; buildInputs = [ glib cairo freetype libjpeg libtiff lcms2 ]; propagatedBuildInputs = [ libarchive ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A GObject based library for handling and rendering XPS documents"; homepage = "https://wiki.gnome.org/Projects/libgxps"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/libhandy/0.x.nix b/pkgs/development/libraries/libhandy/0.x.nix index 9cf4f615dd2..ff2093255cf 100644 --- a/pkgs/development/libraries/libhandy/0.x.nix +++ b/pkgs/development/libraries/libhandy/0.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, meson, ninja, pkgconfig, gobject-introspection, vala +{ lib, stdenv, fetchFromGitLab, meson, ninja, pkg-config, gobject-introspection, vala , gtk-doc, docbook_xsl, docbook_xml_dtd_43 , gtk3, gnome3 , dbus, xvfb_run, libxml2 @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - meson ninja pkgconfig gobject-introspection vala libxml2 + meson ninja pkg-config gobject-introspection vala libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 ]; buildInputs = [ gnome3.gnome-desktop gtk3 libxml2 ]; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meson test --print-errorlogs ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A library full of GTK widgets for mobile phones"; homepage = "https://source.puri.sm/Librem5/libhandy"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index 7dce08b4cc2..5ab6dde09d7 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -1,8 +1,8 @@ -{ stdenv +{ lib, stdenv , fetchurl , meson , ninja -, pkgconfig +, pkg-config , gobject-introspection , vala , gtk-doc @@ -23,14 +23,14 @@ stdenv.mkDerivation rec { pname = "libhandy"; - version = "1.0.2"; + version = "1.0.3"; outputs = [ "out" "dev" "devdoc" "glade" ]; outputBin = "dev"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0b8wvjabv5mg8jbng8rsd5g84lk571nm0qpna20pwp0njh2qvmrs"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-VZuzrMLDYkiJF+ty7SW9wYH0riaslNF3Y0zF00yGf3o="; }; nativeBuildInputs = [ @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { libxml2 meson ninja - pkgconfig + pkg-config vala ]; @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { "-Dgtk_doc=true" ]; - # Uses define_variable in pkgconfig, but we still need it to use the glade output + # Uses define_variable in pkg-config, but we still need it to use the glade output PKG_CONFIG_GLADEUI_2_0_MODULEDIR = "${placeholder "glade"}/lib/glade/modules"; PKG_CONFIG_GLADEUI_2_0_CATALOGDIR = "${placeholder "glade"}/share/glade/catalogs"; @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { meson test --print-errorlogs ''; - meta = with stdenv.lib; { + meta = with lib; { changelog = "https://gitlab.gnome.org/GNOME/libhandy/-/tags/${version}"; description = "Building blocks for modern adaptive GNOME apps"; homepage = "https://gitlab.gnome.org/GNOME/libhandy"; diff --git a/pkgs/development/libraries/libhangul/default.nix b/pkgs/development/libraries/libhangul/default.nix index eb62337c502..eea513a137c 100644 --- a/pkgs/development/libraries/libhangul/default.nix +++ b/pkgs/development/libraries/libhangul/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "libhangul-0.1.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "0ni9b0v70wkm0116na7ghv03pgxsfpfszhgyj3hld3bxamfal1ar"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Core algorithm library for Korean input routines"; homepage = "https://github.com/choehwanjin/libhangul"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libharu/default.nix b/pkgs/development/libraries/libharu/default.nix index 634a991f49b..53c14027ff3 100644 --- a/pkgs/development/libraries/libharu/default.nix +++ b/pkgs/development/libraries/libharu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, cmake, zlib, libpng }: +{ lib, stdenv, fetchzip, cmake, zlib, libpng }: stdenv.mkDerivation { name = "libharu-2.3.0"; @@ -14,8 +14,8 @@ stdenv.mkDerivation { meta = { description = "Cross platform, open source library for generating PDF files"; homepage = "http://libharu.org/"; - license = stdenv.lib.licenses.zlib; - maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.zlib; + maintainers = [ lib.maintainers.marcweber ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libhdhomerun/default.nix b/pkgs/development/libraries/libhdhomerun/default.nix index 577457afdbf..ab0ad6fab23 100644 --- a/pkgs/development/libraries/libhdhomerun/default.nix +++ b/pkgs/development/libraries/libhdhomerun/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: # libhdhomerun requires UDP port 65001 to be open in order to detect and communicate with tuners. # If your firewall is enabled, make sure to have something like: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1v80jk056ii2iv2w7sq24i3prjrbhxql5vqhafs7vq54qmwvgbnb"; }; - patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' + patchPhase = lib.optionalString stdenv.isDarwin '' substituteInPlace Makefile --replace "gcc" "cc" substituteInPlace Makefile --replace "-arch i386" "" ''; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { cp *.h $out/include/hdhomerun ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Implements the libhdhomerun protocol for use with Silicondust HDHomeRun TV tuners"; homepage = "https://www.silicondust.com/support/linux"; license = licenses.lgpl21Only; diff --git a/pkgs/development/libraries/libheif/default.nix b/pkgs/development/libraries/libheif/default.nix index 4a5f6ab3bd8..b0872b9da1e 100644 --- a/pkgs/development/libraries/libheif/default.nix +++ b/pkgs/development/libraries/libheif/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libde265, x265, libpng, +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libde265, x265, libpng, libjpeg, libaom }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0hjs1i076jmy4ryj8y2zs293wx53kzg38y8i42cbcsqydvsdp6hz"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libde265 x265 libpng libjpeg libaom ]; # TODO: enable dav1d and rav1e codecs when libheif can find them via pkg-config @@ -23,9 +23,9 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.libheif.org/"; description = "ISO/IEC 23008-12:2017 HEIF image file format decoder and encoder"; - license = stdenv.lib.licenses.lgpl3; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ gebner ]; + license = lib.licenses.lgpl3; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ gebner ]; }; } diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/development/libraries/libhttpseverywhere/default.nix index 2de7e08fb02..f54929c5378 100644 --- a/pkgs/development/libraries/libhttpseverywhere/default.nix +++ b/pkgs/development/libraries/libhttpseverywhere/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, meson, ninja, makeFontsConf, vala, fetchpatch +{ lib, stdenv, fetchurl, pkg-config, meson, ninja, makeFontsConf, vala, fetchpatch , gnome3, glib, json-glib, libarchive, libsoup, gobject-introspection }: let @@ -8,11 +8,11 @@ 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}/${lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "1jmn6i4vsm89q1axlq4ajqkzqmlmjaml9xhw3h9jnal46db6y00w"; }; - nativeBuildInputs = [ vala gobject-introspection meson ninja pkgconfig ]; + nativeBuildInputs = [ vala gobject-introspection meson ninja pkg-config ]; buildInputs = [ glib gnome3.libgee json-glib libsoup libarchive ]; # Fixes build with vala >=0.42 @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Library to use HTTPSEverywhere in desktop applications"; homepage = "https://gitlab.gnome.org/GNOME/libhttpseverywhere"; license = licenses.lgpl3; diff --git a/pkgs/development/libraries/libiberty/default.nix b/pkgs/development/libraries/libiberty/default.nix index c7babb3038d..2040ef3bee0 100644 --- a/pkgs/development/libraries/libiberty/default.nix +++ b/pkgs/development/libraries/libiberty/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages +{ lib, stdenv, buildPackages , staticBuild ? stdenv.hostPlatform.isStatic }: @@ -15,13 +15,13 @@ stdenv.mkDerivation { postUnpack = "sourceRoot=\${sourceRoot}/libiberty"; configureFlags = [ "--enable-install-libiberty" ] - ++ stdenv.lib.optional (!staticBuild) "--enable-shared"; + ++ lib.optional (!staticBuild) "--enable-shared"; - postInstall = stdenv.lib.optionalString (!staticBuild) '' + postInstall = lib.optionalString (!staticBuild) '' cp pic/libiberty.a $out/lib*/libiberty.a ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://gcc.gnu.org/"; license = licenses.lgpl2; description = "Collection of subroutines used by various GNU programs"; diff --git a/pkgs/development/libraries/libibmad/default.nix b/pkgs/development/libraries/libibmad/default.nix index 8c46efa9710..b6df338f122 100644 --- a/pkgs/development/libraries/libibmad/default.nix +++ b/pkgs/development/libraries/libibmad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libibumad }: +{ lib, stdenv, fetchurl, libibumad }: stdenv.mkDerivation rec { name = "libibmad-1.3.13"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ libibumad ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.openfabrics.org/"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libibumad/default.nix b/pkgs/development/libraries/libibumad/default.nix index 4c37f8564b0..6de97ad77cd 100644 --- a/pkgs/development/libraries/libibumad/default.nix +++ b/pkgs/development/libraries/libibumad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "libibumad-1.3.10.2"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0bkygb3lbpaj6s4vsyixybrrkcnilbijv4ga5p1xdwyr3gip83sh"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.openfabrics.org/"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix index c03367da97b..7f5e739a99c 100644 --- a/pkgs/development/libraries/libical/default.nix +++ b/pkgs/development/libraries/libical/default.nix @@ -9,7 +9,7 @@ , libxml2 , ninja , perl -, pkgconfig +, pkg-config , libical , python3 , tzdata @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { cmake ninja perl - pkgconfig + pkg-config # Docs building fails: # https://github.com/NixOS/nixpkgs/pull/67204 # previously with https://github.com/NixOS/nixpkgs/pull/61657#issuecomment-495579489 @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { runHook postInstallCheck ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/libical/libical"; description = "An Open Source implementation of the iCalendar protocols"; license = licenses.mpl20; diff --git a/pkgs/development/libraries/libicns/default.nix b/pkgs/development/libraries/libicns/default.nix index 10d68ee3a4e..1df2a8abb82 100644 --- a/pkgs/development/libraries/libicns/default.nix +++ b/pkgs/development/libraries/libicns/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, autoreconfHook, libpng, openjpeg }: +{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, libpng, openjpeg }: stdenv.mkDerivation rec { pname = "libicns"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ libpng openjpeg ]; NIX_CFLAGS_COMPILE = [ "-I${openjpeg.dev}/include/${openjpeg.incDir}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for manipulation of the Mac OS icns resource format"; homepage = "https://icns.sourceforge.io"; license = with licenses; [ gpl2 lgpl2 lgpl21 ]; diff --git a/pkgs/development/libraries/libid3tag/default.nix b/pkgs/development/libraries/libid3tag/default.nix index 9847312a34a..8cedd1bcb41 100644 --- a/pkgs/development/libraries/libid3tag/default.nix +++ b/pkgs/development/libraries/libid3tag/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, zlib, gperf}: +{lib, stdenv, fetchurl, zlib, gperf}: stdenv.mkDerivation rec { pname = "libid3tag"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { --subst-var-by version "${version}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "ID3 tag manipulation library"; homepage = "http://mad.sourceforge.net/"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix index e936f3fd92a..afe5e550b33 100644 --- a/pkgs/development/libraries/libidn/default.nix +++ b/pkgs/development/libraries/libidn/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, libiconv }: +{ fetchurl, lib, stdenv, libiconv }: stdenv.mkDerivation rec { name = "libidn-1.36"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv; + buildInputs = lib.optional stdenv.isDarwin libiconv; doCheck = false; # fails @@ -40,8 +40,8 @@ stdenv.mkDerivation rec { ''; repositories.git = "git://git.savannah.gnu.org/libidn.git"; - license = stdenv.lib.licenses.lgpl2Plus; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.lgpl2Plus; + platforms = lib.platforms.all; maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/libidn2/default.nix b/pkgs/development/libraries/libidn2/default.nix index c5af2d16bb2..30a33426639 100644 --- a/pkgs/development/libraries/libidn2/default.nix +++ b/pkgs/development/libraries/libidn2/default.nix @@ -1,11 +1,11 @@ -{ fetchurl, stdenv, libiconv, libunistring, help2man, buildPackages }: +{ fetchurl, lib, stdenv, libiconv, libunistring, help2man, buildPackages }: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or # cgit) that are needed here should be included directly in Nixpkgs as # files. -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "libidn2"; @@ -38,8 +38,8 @@ stdenv.mkDerivation rec { ''; repositories.git = "https://gitlab.com/jas/libidn2"; - license = with stdenv.lib.licenses; [ lgpl3Plus gpl2Plus gpl3Plus ]; - platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ fpletz ]; + license = with lib.licenses; [ lgpl3Plus gpl2Plus gpl3Plus ]; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ fpletz ]; }; } diff --git a/pkgs/development/libraries/libiec61883/default.nix b/pkgs/development/libraries/libiec61883/default.nix index 77b2424bfee..911210202fe 100644 --- a/pkgs/development/libraries/libiec61883/default.nix +++ b/pkgs/development/libraries/libiec61883/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libraw1394 }: +{ lib, stdenv, fetchurl, pkg-config, libraw1394 }: stdenv.mkDerivation rec { version = "1.2.0"; @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { sha256 = "7c7879c6b9add3148baea697dfbfdcefffbc8ac74e8e6bcf46125ec1d21b373a"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ libraw1394 ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.linux1394.org"; license = licenses.lgpl21Plus; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libieee1284/default.nix b/pkgs/development/libraries/libieee1284/default.nix index b5708a83a7d..7c20d1b4947 100644 --- a/pkgs/development/libraries/libieee1284/default.nix +++ b/pkgs/development/libraries/libieee1284/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, xmlto, docbook_xml_dtd_412, docbook_xsl }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, xmlto, docbook_xml_dtd_412, docbook_xsl }: stdenv.mkDerivation rec { pname = "libieee1284"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ./bootstrap ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Parallel port communication library"; homepage = "http://cyberelk.net/tim/software/libieee1284/"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/libiio/default.nix b/pkgs/development/libraries/libiio/default.nix index 3c3ccf27884..043e27fb4b2 100644 --- a/pkgs/development/libraries/libiio/default.nix +++ b/pkgs/development/libraries/libiio/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { moveToOutput ${python.sitePackages} "$python" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "API for interfacing with the Linux Industrial I/O Subsystem"; homepage = "https://github.com/analogdevicesinc/libiio"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/libimagequant/default.nix b/pkgs/development/libraries/libimagequant/default.nix index 2bca09be45f..1c8502da492 100644 --- a/pkgs/development/libraries/libimagequant/default.nix +++ b/pkgs/development/libraries/libimagequant/default.nix @@ -1,21 +1,21 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "libimagequant"; - version = "2.13.1"; + version = "2.14.0"; src = fetchFromGitHub { owner = "ImageOptim"; repo = pname; rev = version; - sha256 = "1543h1i59k2hbj2g8shcl8fvhz2silipacynwjgw412r38hkr33j"; + sha256 = "sha256-XP/GeZC8TCgBPqtScY9eneZHFter1kdWf/yko0p2VYQ="; }; preConfigure = '' patchShebangs ./configure ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://pngquant.org/lib/"; description = "Image quantization library"; longDescription = "Small, portable C library for high-quality conversion of RGBA images to 8-bit indexed-color (palette) images."; diff --git a/pkgs/development/libraries/libime/default.nix b/pkgs/development/libraries/libime/default.nix index 476d2419ef3..f9fcdedf180 100644 --- a/pkgs/development/libraries/libime/default.nix +++ b/pkgs/development/libraries/libime/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchFromGitHub , cmake @@ -26,13 +26,13 @@ let in stdenv.mkDerivation rec { pname = "libime"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "fcitx"; repo = "libime"; rev = version; - sha256 = "hDfxuDIj9qx5d+UFwxDdP2PCboPnUV1n+VVoEIGsucM="; + sha256 = "sha256-Ykj4/3yKUqK0BRqW1E2zFYNgeUOXQ1DsotmKU6c8vEg="; fetchSubmodules = true; }; @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { fcitx5 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A library to support generic input method implementation"; homepage = "https://github.com/fcitx/libime"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/libimobiledevice/default.nix b/pkgs/development/libraries/libimobiledevice/default.nix index a9a2fb6b4c1..b805be1257b 100644 --- a/pkgs/development/libraries/libimobiledevice/default.nix +++ b/pkgs/development/libraries/libimobiledevice/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, automake, autoconf, libtool, pkgconfig, gnutls +{ lib, stdenv, fetchFromGitHub, automake, autoconf, libtool, pkg-config, gnutls , libgcrypt, libtasn1, glib, libplist, libusbmuxd }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { autoconf automake libtool - pkgconfig + pkg-config ]; propagatedBuildInputs = [ glib @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { "--without-cython" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/libimobiledevice/libimobiledevice"; description = "A software library that talks the protocols to support iPhone®, iPod Touch® and iPad® devices on Linux"; longDescription = '' diff --git a/pkgs/development/libraries/libindicator/default.nix b/pkgs/development/libraries/libindicator/default.nix index 8bb90180300..139672f6d80 100644 --- a/pkgs/development/libraries/libindicator/default.nix +++ b/pkgs/development/libraries/libindicator/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, lib, file -, pkgconfig +, pkg-config , gtkVersion ? "3", gtk2 ? null, gtk3 ? null }: with lib; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "b2d2e44c10313d5c9cd60db455d520f80b36dc39562df079a3f29495e8f9447f"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ (if gtkVersion == "2" then gtk2 else gtk3) ]; diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/development/libraries/libinfinity/default.nix index e018c1a9f5e..e68d27cacff 100644 --- a/pkgs/development/libraries/libinfinity/default.nix +++ b/pkgs/development/libraries/libinfinity/default.nix @@ -1,6 +1,6 @@ { gtkWidgets ? false # build GTK widgets for libinfinity , avahiSupport ? false # build support for Avahi in libinfinity -, stdenv, fetchurl, pkgconfig, glib, libxml2, gnutls, gsasl +, lib, stdenv, fetchurl, pkg-config, glib, libxml2, gnutls, gsasl , gobject-introspection , gtk3 ? null, gtk-doc, docbook_xsl, docbook_xml_dtd_412, avahi ? null, libdaemon, libidn, gss , libintl }: @@ -13,18 +13,18 @@ let self = stdenv.mkDerivation rec { pname = "libinfinity"; - version = "0.7.1"; + version = "0.7.2"; src = fetchurl { - url = "http://releases.0x539.de/libinfinity/${pname}-${version}.tar.gz"; - sha256 = "1jw2fhrcbpyz99bij07iyhy9ffyqdn87vl8cb1qz897y3f2f0vk2"; + url = "https://github.com/gobby/${pname}/releases/download/${version}/${pname}-${version}.tar.gz"; + sha256 = "17i3g61hxz9pzl3ryd1yr15142r25m06jfzjrpdy7ic1b8vjjw3f"; }; outputs = [ "bin" "out" "dev" "man" "devdoc" ]; - nativeBuildInputs = [ pkgconfig gtk-doc docbook_xsl docbook_xml_dtd_412 gobject-introspection ]; + nativeBuildInputs = [ pkg-config gtk-doc docbook_xsl docbook_xml_dtd_412 gobject-introspection ]; buildInputs = [ glib libxml2 gsasl libidn gss libintl libdaemon ] - ++ stdenv.lib.optional gtkWidgets gtk3 - ++ stdenv.lib.optional avahiSupport avahi; + ++ lib.optional gtkWidgets gtk3 + ++ lib.optional avahiSupport avahi; propagatedBuildInputs = [ gnutls ]; @@ -39,15 +39,15 @@ let ]; passthru = { - infinoted = "${self.bin}/bin/infinoted-${stdenv.lib.versions.majorMinor version}"; + infinoted = "${self.bin}/bin/infinoted-${lib.versions.majorMinor version}"; }; meta = { - homepage = "http://gobby.0x539.de/"; + homepage = "https://gobby.github.io/"; description = "An implementation of the Infinote protocol written in GObject-based C"; - license = stdenv.lib.licenses.lgpl2Plus; - maintainers = [ stdenv.lib.maintainers.phreedom ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = lib.licenses.lgpl2Plus; + maintainers = [ lib.maintainers.phreedom ]; + platforms = with lib.platforms; linux ++ darwin; }; }; in self diff --git a/pkgs/development/libraries/libinjection/default.nix b/pkgs/development/libraries/libinjection/default.nix index b3bdbb41588..f678136637a 100644 --- a/pkgs/development/libraries/libinjection/default.nix +++ b/pkgs/development/libraries/libinjection/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , python }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { # no binaries, so out = library, dev = headers outputs = [ "out" "dev" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "SQL / SQLI tokenizer parser analyzer"; homepage = "https://github.com/client9/libinjection"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libinklevel/default.nix b/pkgs/development/libraries/libinklevel/default.nix index 90f6936d458..c5dc7987ca6 100644 --- a/pkgs/development/libraries/libinklevel/default.nix +++ b/pkgs/development/libraries/libinklevel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, libusb1 }: +{ lib, stdenv, fetchurl, pkg-config, libusb1 }: stdenv.mkDerivation rec { pname = "libinklevel"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A library for checking the ink level of your printer"; longDescription = '' Libinklevel is a library for checking the ink level of your printer on a diff --git a/pkgs/development/libraries/libinotify-kqueue/default.nix b/pkgs/development/libraries/libinotify-kqueue/default.nix index 074d2954ef1..ff74060d3d4 100644 --- a/pkgs/development/libraries/libinotify-kqueue/default.nix +++ b/pkgs/development/libraries/libinotify-kqueue/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, autoreconfHook }: +{ lib, stdenv, fetchzip, autoreconfHook }: stdenv.mkDerivation rec { pname = "libinotify-kqueue"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { doCheck = true; checkFlags = [ "test" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Inotify shim for macOS and BSD"; homepage = "https://github.com/libinotify-kqueue/libinotify-kqueue"; license = licenses.mit; diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index dff2ca82955..8f1511de330 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja +{ lib, stdenv, fetchFromGitLab, pkg-config, meson, ninja , libevdev, mtdev, udev, libwacom , documentationSupport ? false, doxygen ? null, graphviz ? null # Documentation , eventGUISupport ? false, cairo ? null, glib ? null, gtk3 ? null # GUI event viewer support @@ -10,7 +10,7 @@ assert eventGUISupport -> cairo != null && glib != null && gtk3 != null; assert testsSupport -> check != null && valgrind != null && python3 != null; let - mkFlag = optSet: flag: "-D${flag}=${stdenv.lib.boolToString optSet}"; + mkFlag = optSet: flag: "-D${flag}=${lib.boolToString optSet}"; sphinx-build = if documentationSupport then python3.pkgs.sphinx.overrideAttrs (super: { @@ -24,7 +24,7 @@ let else null; in -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "libinput"; version = "1.16.4"; @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { "--libexecdir=${placeholder "bin"}/libexec" ]; - nativeBuildInputs = [ pkgconfig meson ninja ] + nativeBuildInputs = [ pkg-config meson ninja ] ++ optionals documentationSupport [ doxygen graphviz sphinx-build ]; buildInputs = [ diff --git a/pkgs/development/libraries/libiodbc/default.nix b/pkgs/development/libraries/libiodbc/default.nix index c80a9bb1f92..29d4c3432eb 100644 --- a/pkgs/development/libraries/libiodbc/default.nix +++ b/pkgs/development/libraries/libiodbc/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, fetchurl, pkgconfig, gtk2, Carbon +{ config, lib, stdenv, fetchurl, pkg-config, gtk2, Carbon , useGTK ? config.libiodbc.gtk or false }: stdenv.mkDerivation rec { @@ -9,16 +9,16 @@ stdenv.mkDerivation rec { sha256 = "0qpvklgr1lcn5g8xbz7fbc9rldqf9r8s6xybhqj20m4sglxgziai"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = stdenv.lib.optionals useGTK [ gtk2 ] - ++ stdenv.lib.optional stdenv.isDarwin Carbon; + nativeBuildInputs = [ pkg-config ]; + buildInputs = lib.optionals useGTK [ gtk2 ] + ++ lib.optional stdenv.isDarwin Carbon; preBuild = '' export NIX_LDFLAGS_BEFORE="-rpath $out/lib" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "iODBC driver manager"; homepage = "http://www.iodbc.org"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libipfix/default.nix b/pkgs/development/libraries/libipfix/default.nix index 69918b5d36c..173bfafc8cc 100644 --- a/pkgs/development/libraries/libipfix/default.nix +++ b/pkgs/development/libraries/libipfix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { pname = "libipfix"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { url = "mirror://sourceforge/libipfix/files/libipfix/libipfix_110209.tgz"; sha256 = "0h7v0sxjjdc41hl5vq2x0yhyn04bczl11bqm97825mivrvfymhn6"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://libipfix.sourceforge.net/"; description = "The libipfix C-library implements the IPFIX protocol defined by the IP Flow Information Export working group of the IETF"; license = licenses.lgpl3; diff --git a/pkgs/development/libraries/libipt/default.nix b/pkgs/development/libraries/libipt/default.nix index e585a2b090f..272c61c47a5 100644 --- a/pkgs/development/libraries/libipt/default.nix +++ b/pkgs/development/libraries/libipt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "libipt"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Intel Processor Trace decoder library"; homepage = "https://github.com/intel/libipt"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libiptcdata/default.nix b/pkgs/development/libraries/libiptcdata/default.nix index 01b23d9e2d2..140faab43b1 100644 --- a/pkgs/development/libraries/libiptcdata/default.nix +++ b/pkgs/development/libraries/libiptcdata/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { name = "libiptcdata-1.0.4"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = { description = "Library for reading and writing the IPTC metadata in images and other files"; homepage = "http://libiptcdata.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libircclient/default.nix b/pkgs/development/libraries/libircclient/default.nix index 4bef2de28c0..56a9f1b961c 100644 --- a/pkgs/development/libraries/libircclient/default.nix +++ b/pkgs/development/libraries/libircclient/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { version = "1.10"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { --replace "cp " "install " ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A small but extremely powerful library which implements the client IRC protocol"; homepage = "http://www.ulduzsoft.com/libircclient/"; license = licenses.lgpl3; diff --git a/pkgs/development/libraries/libirecovery/default.nix b/pkgs/development/libraries/libirecovery/default.nix index bc91593a960..6a2f926d79e 100644 --- a/pkgs/development/libraries/libirecovery/default.nix +++ b/pkgs/development/libraries/libirecovery/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, automake, autoconf, libtool, pkgconfig +{ lib, stdenv, fetchFromGitHub, automake, autoconf, libtool, pkg-config , libusb1 , readline }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { autoconf automake libtool - pkgconfig + pkg-config ]; buildInputs = [ @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ''--with-udevrule="OWNER=\"root\", GROUP=\"myusergroup\", MODE=\"0660\""'' ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/libimobiledevice/libirecovery"; description = "Library and utility to talk to iBoot/iBSS via USB on Mac OS X, Windows, and Linux"; longDescription = '' diff --git a/pkgs/development/libraries/libiscsi/default.nix b/pkgs/development/libraries/libiscsi/default.nix new file mode 100644 index 00000000000..adc721bc6d0 --- /dev/null +++ b/pkgs/development/libraries/libiscsi/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: + +stdenv.mkDerivation rec { + pname = "libiscsi"; + version = "1.19.0"; + + src = fetchFromGitHub { + owner = "sahlberg"; + repo = "libiscsi"; + rev = version; + sha256 = "0ajrkkg5awmi8m4b3mha7h07ylg18k252qprvk1sgq0qbyd66zy7"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + # This problem is gone on libiscsi master. + NIX_CFLAGS_COMPILE = if stdenv.hostPlatform.is32bit then "-Wno-error=sign-compare" else null; + + meta = with lib; { + description = "iscsi client library and utilities"; + homepage = "https://github.com/sahlberg/libiscsi"; + license = licenses.lgpl2; + platforms = platforms.unix; + maintainers = with maintainers; [ misuzu ]; + }; +} diff --git a/pkgs/development/libraries/libisds/default.nix b/pkgs/development/libraries/libisds/default.nix index 28a8d7d874b..268acb2f948 100644 --- a/pkgs/development/libraries/libisds/default.nix +++ b/pkgs/development/libraries/libisds/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , expat , gpgme @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ expat gpgme libgcrypt libxml2 libxslt curl docbook_xsl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Client library for accessing SOAP services of Czech government-provided Databox infomation system"; homepage = "http://xpisar.wz.cz/libisds/"; license = licenses.lgpl3; diff --git a/pkgs/development/libraries/libisoburn/default.nix b/pkgs/development/libraries/libisoburn/default.nix index 0b4984fc82a..1e2ae41f3f2 100644 --- a/pkgs/development/libraries/libisoburn/default.nix +++ b/pkgs/development/libraries/libisoburn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, acl, attr, zlib, libburn, libisofs }: +{ lib, stdenv, fetchurl, acl, attr, zlib, libburn, libisofs }: stdenv.mkDerivation rec { pname = "libisoburn"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ attr zlib libburn libisofs ]; propagatedBuildInputs = [ acl ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://libburnia-project.org/"; description = "Enables creation and expansion of ISO-9660 filesystems on CD/DVD/BD "; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/libisofs/default.nix b/pkgs/development/libraries/libisofs/default.nix index 0c01389f0b8..a291410941c 100644 --- a/pkgs/development/libraries/libisofs/default.nix +++ b/pkgs/development/libraries/libisofs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, acl, attr, zlib }: +{ lib, stdenv, fetchurl, acl, attr, zlib }: stdenv.mkDerivation rec { pname = "libisofs"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ attr zlib ]; propagatedBuildInputs = [ acl ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://libburnia-project.org/"; description = "A library to create an ISO-9660 filesystem with extensions like RockRidge or Joliet"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/libite/default.nix b/pkgs/development/libraries/libite/default.nix index 240636d518c..c57876e9c4f 100644 --- a/pkgs/development/libraries/libite/default.nix +++ b/pkgs/development/libraries/libite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libconfuse }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libconfuse }: stdenv.mkDerivation rec { pname = "libite"; @@ -11,10 +11,10 @@ stdenv.mkDerivation rec { sha256 = "0kad501mrvn0s0sw9pz5spjq7ymk117hnff249z6026gswrxv1mh"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libconfuse ]; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Lightweight library of frog DNA"; longDescription = '' diff --git a/pkgs/development/libraries/libivykis/default.nix b/pkgs/development/libraries/libivykis/default.nix index 1226d1c489e..9a1c728bd55 100644 --- a/pkgs/development/libraries/libivykis/default.nix +++ b/pkgs/development/libraries/libivykis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, file, protobufc }: +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, file, protobufc }: stdenv.mkDerivation rec { pname = "libivykis"; @@ -10,10 +10,10 @@ stdenv.mkDerivation rec { sha256 = "0abi0rc3wnncvr68hy6rmzp96x6napd7fs1mff20dr8lb0jyvy3f"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ file protobufc ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://libivykis.sourceforge.net/"; description = '' A thin wrapper over various OS'es implementation of I/O readiness diff --git a/pkgs/development/libraries/libixp-hg/default.nix b/pkgs/development/libraries/libixp-hg/default.nix index e971136b088..489f526248a 100644 --- a/pkgs/development/libraries/libixp-hg/default.nix +++ b/pkgs/development/libraries/libixp-hg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, txt2tags }: +{ lib, stdenv, fetchurl, unzip, txt2tags }: stdenv.mkDerivation rec { rev = "148"; @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { meta = { homepage = "http://repo.cat-v.org/libixp/"; # see also https://libs.suckless.org/deprecated/libixp description = "Portable, simple C-language 9P client and server libary"; - maintainers = with stdenv.lib.maintainers; [ kovirobi ]; - license = stdenv.lib.licenses.mit; + maintainers = with lib.maintainers; [ kovirobi ]; + license = lib.licenses.mit; inherit version; - platforms = with stdenv.lib.platforms; unix; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/development/libraries/libjcat/default.nix b/pkgs/development/libraries/libjcat/default.nix index 1eca110f8cb..974f1f6674f 100644 --- a/pkgs/development/libraries/libjcat/default.nix +++ b/pkgs/development/libraries/libjcat/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , docbook_xml_dtd_43 , docbook-xsl-nons @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "libjcat"; - version = "0.1.4"; + version = "0.1.5"; outputs = [ "bin" "out" "dev" "devdoc" "man" "installedTests" ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libjcat"; rev = version; - sha256 = "156sykcdzdfmd7va59qld4gyzhbf2yk1dfgifi494g6i99zyigfh"; + sha256 = "sha256-xf/hzTzhxKJDL5Way0Qbrs8pXCvAQ+ADtgJO2GbEvmc="; }; patches = [ @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for reading and writing Jcat files"; homepage = "https://github.com/hughsie/libjcat"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index 95b15fce7b0..2426dfebe8a 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, nasm +{ lib, stdenv, fetchFromGitHub, cmake, nasm , enableStatic ? stdenv.hostPlatform.isStatic , enableShared ? !stdenv.hostPlatform.isStatic }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # This is needed by freeimage patches = [ ./0001-Compile-transupp.c-as-part-of-the-library.patch ] - ++ stdenv.lib.optional (stdenv.hostPlatform.libc or null == "msvcrt") + ++ lib.optional (stdenv.hostPlatform.libc or null == "msvcrt") ./mingw-boolean.patch; outputs = [ "bin" "dev" "dev_private" "out" "man" "doc" ]; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { doInstallCheck = true; installCheckTarget = "test"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://libjpeg-turbo.org/"; description = "A faster (using SIMD) libjpeg implementation"; license = licenses.ijg; # and some parts under other BSD-style licenses diff --git a/pkgs/development/libraries/libjpeg/default.nix b/pkgs/development/libraries/libjpeg/default.nix index 05fbb7de701..65482e8e9c6 100644 --- a/pkgs/development/libraries/libjpeg/default.nix +++ b/pkgs/development/libraries/libjpeg/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl, static ? false }: +{ lib, stdenv, fetchurl, static ? false }: -with stdenv.lib; +with lib; stdenv.mkDerivation { name = "libjpeg-9d"; src = fetchurl { url = "http://www.ijg.org/files/jpegsrc.v9d.tar.gz"; - sha256 = "0clwys9lcqlxqgcw8s1gwfm5ix2zjlqpklmd3mbvqmj5ibj51jwr"; + sha256 = "1vkip9rz4hz8f31a2kl7wl7f772wg1z0fg1fbd1653wzwlxllhvc"; }; configureFlags = optional static "--enable-static --disable-shared"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.ijg.org/"; description = "A library that implements the JPEG image file format"; - license = stdenv.lib.licenses.free; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.free; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libjreen/default.nix b/pkgs/development/libraries/libjreen/default.nix index 2c14d270f26..5a70e4b01dd 100644 --- a/pkgs/development/libraries/libjreen/default.nix +++ b/pkgs/development/libraries/libjreen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, qt4, pkg-config, gsasl }: +{ lib, stdenv, fetchurl, cmake, qt4, pkg-config, gsasl }: stdenv.mkDerivation rec { pname = "libjreen"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "C++ Jabber library using Qt framework"; homepage = "https://qutim.org/jreen/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libjson-rpc-cpp/default.nix b/pkgs/development/libraries/libjson-rpc-cpp/default.nix index aa23b3f8eaf..e2dd30fc616 100644 --- a/pkgs/development/libraries/libjson-rpc-cpp/default.nix +++ b/pkgs/development/libraries/libjson-rpc-cpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch , pkg-config @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { preInstall = '' function fixRunPath { p=$(patchelf --print-rpath $1) - q="$p:${stdenv.lib.makeLibraryPath [ jsoncpp argtable libmicrohttpd curl ]}:$out/lib" + q="$p:${lib.makeLibraryPath [ jsoncpp argtable libmicrohttpd curl ]}:$out/lib" patchelf --set-rpath $q $1 } @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ framework for json-rpc (json remote procedure call)"; homepage = "https://github.com/cinemast/libjson-rpc-cpp"; license = licenses.mit; diff --git a/pkgs/development/libraries/libjson/default.nix b/pkgs/development/libraries/libjson/default.nix index 1d6fb1e7289..42d723b3b1b 100644 --- a/pkgs/development/libraries/libjson/default.nix +++ b/pkgs/development/libraries/libjson/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: let version = "7.6.1"; in stdenv.mkDerivation { @@ -13,7 +13,7 @@ in stdenv.mkDerivation { makeFlags = [ "prefix=$(out)" ]; preInstall = "mkdir -p $out/lib"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://libjson.sourceforge.net/"; description = "A JSON reader and writer"; longDescription = '' diff --git a/pkgs/development/libraries/libkate/default.nix b/pkgs/development/libraries/libkate/default.nix index a999f813fbb..2135cc37d91 100644 --- a/pkgs/development/libraries/libkate/default.nix +++ b/pkgs/development/libraries/libkate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libogg, libpng }: +{ lib, stdenv, fetchurl, libogg, libpng }: stdenv.mkDerivation rec { name = "libkate-0.4.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ libogg libpng ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A library for encoding and decoding Kate streams"; longDescription = '' This is libkate, the reference implementation of a codec for the Kate diff --git a/pkgs/development/libraries/libkeyfinder/default.nix b/pkgs/development/libraries/libkeyfinder/default.nix index b6aa19c442a..a38fa0dc6f6 100644 --- a/pkgs/development/libraries/libkeyfinder/default.nix +++ b/pkgs/development/libraries/libkeyfinder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fftw, qtbase, qmake }: +{ lib, stdenv, fetchFromGitHub, fftw, qtbase, qmake }: stdenv.mkDerivation rec { pname = "libkeyfinder"; @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ qmake ]; buildInputs = [ fftw qtbase ]; + dontWrapQtApps = true; + postPatch = '' substituteInPlace LibKeyFinder.pro \ --replace "/usr/local" "$out" \ @@ -29,7 +31,7 @@ stdenv.mkDerivation rec { cp -a lib*.so* $out/lib ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Musical key detection for digital audio (C++ library)"; homepage = "http://www.ibrahimshaath.co.uk/keyfinder/"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/libkml/default.nix b/pkgs/development/libraries/libkml/default.nix index 690d9b9801c..0e2ab21ee79 100644 --- a/pkgs/development/libraries/libkml/default.nix +++ b/pkgs/development/libraries/libkml/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , boost @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_TESTING=ON" # Darwin tests require rpath for libs in build dir - ] ++ stdenv.lib.optional stdenv.isDarwin [ + ] ++ lib.optional stdenv.isDarwin [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" ]; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Reference implementation of OGC KML 2.2"; homepage = "https://github.com/libkml/libkml"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libksba/default.nix b/pkgs/development/libraries/libksba/default.nix index 7e14c1b533b..e623aa0d111 100644 --- a/pkgs/development/libraries/libksba/default.nix +++ b/pkgs/development/libraries/libksba/default.nix @@ -1,4 +1,4 @@ -{ buildPackages, stdenv, fetchurl, gettext, libgpgerror }: +{ buildPackages, lib, stdenv, fetchurl, gettext, libgpgerror }: stdenv.mkDerivation rec { name = "libksba-1.5.0"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { rmdir --ignore-fail-on-non-empty $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.gnupg.org"; description = "CMS and X.509 access library"; platforms = platforms.all; diff --git a/pkgs/development/libraries/libksi/default.nix b/pkgs/development/libraries/libksi/default.nix index 2701cc51359..01512181171 100644 --- a/pkgs/development/libraries/libksi/default.nix +++ b/pkgs/development/libraries/libksi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, openssl, curl }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, openssl, curl }: stdenv.mkDerivation rec { pname = "libksi"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { "--with-cafile=/etc/ssl/certs/ca-certificates.crt" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/GuardTime/libksi"; description = "Keyless Signature Infrastructure API library"; license = licenses.asl20; diff --git a/pkgs/development/libraries/libktorrent/default.nix b/pkgs/development/libraries/libktorrent/default.nix index 9aea99f6a40..825fe87fe2f 100644 --- a/pkgs/development/libraries/libktorrent/default.nix +++ b/pkgs/development/libraries/libktorrent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, extra-cmake-modules +{ lib, stdenv, fetchurl, cmake, extra-cmake-modules , karchive, kcrash, ki18n, kio, solid , boost, gmp, qca-qt5, libgcrypt }: @@ -27,7 +27,9 @@ in stdenv.mkDerivation rec { inherit mainVersion; }; - meta = with stdenv.lib; { + dontWrapQtApps = true; + + meta = with lib; { description = "A BitTorrent library used by KTorrent"; homepage = "https://www.kde.org/applications/internet/ktorrent/"; maintainers = with maintainers; [ eelco ]; diff --git a/pkgs/development/libraries/liblangtag/default.nix b/pkgs/development/libraries/liblangtag/default.nix index b724789188c..5a7f2fe4b36 100644 --- a/pkgs/development/libraries/liblangtag/default.nix +++ b/pkgs/development/libraries/liblangtag/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, fetchFromBitbucket, autoreconfHook, gtk-doc, gettext -, pkgconfig, glib, libxml2, gobject-introspection, gnome-common, unzip +{ lib, stdenv, fetchurl, fetchFromBitbucket, autoreconfHook, gtk-doc, gettext +, pkg-config, glib, libxml2, gobject-introspection, gnome-common, unzip }: stdenv.mkDerivation rec { @@ -32,19 +32,19 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - ''--with-locale-alias=${stdenv.cc.libc}/share/locale/locale.alias'' + "--with-locale-alias=${stdenv.cc.libc}/share/locale/locale.alias" ]; buildInputs = [ gettext glib libxml2 gobject-introspection gnome-common unzip ]; - nativeBuildInputs = [ autoreconfHook gtk-doc gettext pkgconfig ]; + nativeBuildInputs = [ autoreconfHook gtk-doc gettext pkg-config ]; meta = { inherit version; description = "An interface library to access tags for identifying languages"; - license = stdenv.lib.licenses.mpl20; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mpl20; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; # There are links to a homepage that are broken by a BitBucket change homepage = "https://bitbucket.org/tagoh/liblangtag/overview"; }; diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix index 830e125685e..5183c47bc06 100644 --- a/pkgs/development/libraries/liblastfm/default.nix +++ b/pkgs/development/libraries/liblastfm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, which, cmake +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, which, cmake , fftwSinglePrec, libsamplerate, qtbase , darwin }: @@ -19,11 +19,13 @@ stdenv.mkDerivation rec { sha256 = "04r14prydxshjgfws3pjajjmp2msszhjjs1mjh8s66yg29vq620l"; })]; - nativeBuildInputs = [ pkgconfig which cmake ]; + nativeBuildInputs = [ pkg-config which cmake ]; buildInputs = [ fftwSinglePrec libsamplerate qtbase ] - ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration; + ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration; - meta = with stdenv.lib; { + dontWrapQtApps = true; + + meta = with lib; { homepage = "https://github.com/lastfm/liblastfm"; repositories.git = "git://github.com/lastfm/liblastfm.git"; description = "Official LastFM library"; diff --git a/pkgs/development/libraries/liblastfmSF/default.nix b/pkgs/development/libraries/liblastfmSF/default.nix index 46152e79276..fe3038c3249 100644 --- a/pkgs/development/libraries/liblastfmSF/default.nix +++ b/pkgs/development/libraries/liblastfmSF/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, pkgconfig, curl, openssl }: +{ lib, stdenv, fetchurl, pkg-config, curl, openssl }: stdenv.mkDerivation { name = "liblastfm-SF-0.5"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ curl openssl ]; @@ -15,6 +15,6 @@ stdenv.mkDerivation { meta = { homepage = "http://liblastfm.sourceforge.net"; description = "Unofficial C lastfm library"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }; } diff --git a/pkgs/development/libraries/liblaxjson/default.nix b/pkgs/development/libraries/liblaxjson/default.nix index ef50c106eae..9464714d5cc 100644 --- a/pkgs/development/libraries/liblaxjson/default.nix +++ b/pkgs/development/libraries/liblaxjson/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { version = "1.0.5"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for parsing JSON config files"; homepage = "https://github.com/andrewrk/liblaxjson"; license = licenses.mit; diff --git a/pkgs/development/libraries/liblcf/default.nix b/pkgs/development/libraries/liblcf/default.nix index 82ac1b3144e..2c7f0989282 100644 --- a/pkgs/development/libraries/liblcf/default.nix +++ b/pkgs/development/libraries/liblcf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, expat, icu }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, expat, icu }: stdenv.mkDerivation rec { pname = "liblcf"; @@ -11,10 +11,10 @@ stdenv.mkDerivation rec { sha256 = "0b0bz9ydpc98mxbg78bgf8kil85kxyqgkzxgsjq7awzmyw7f3c1c"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; propagatedBuildInputs = [ expat icu ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library to handle RPG Maker 2000/2003 and EasyRPG projects"; homepage = "https://github.com/EasyRPG/liblcf"; license = licenses.mit; diff --git a/pkgs/development/libraries/liblinear/default.nix b/pkgs/development/libraries/liblinear/default.nix index 67eb8748f16..3989cc59e4d 100644 --- a/pkgs/development/libraries/liblinear/default.nix +++ b/pkgs/development/libraries/liblinear/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fixDarwinDylibNames }: +{ lib, stdenv, fetchFromGitHub, fixDarwinDylibNames }: let soVersion = "4"; @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" ]; - nativeBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; + nativeBuildInputs = lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; buildFlags = [ "lib" "predict" "train" ]; @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { install -Dm444 -t $dev/include linear.h ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A library for large linear classification"; homepage = "https://www.csie.ntu.edu.tw/~cjlin/liblinear/"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/liblinphone/default.nix b/pkgs/development/libraries/liblinphone/default.nix index 7d7f035f77f..f56e6a9a5c7 100644 --- a/pkgs/development/libraries/liblinphone/default.nix +++ b/pkgs/development/libraries/liblinphone/default.nix @@ -34,13 +34,13 @@ , openldap , ortp , pango -, pkgconfig +, pkg-config , python , readline , soci , speex , sqlite -, stdenv +, lib, stdenv , udev , xercesc , xsd @@ -111,7 +111,7 @@ stdenv.mkDerivation rec { graphviz intltool makeWrapper - pkgconfig + pkg-config ]; # Some grammar files needed to be copied too from some dependencies. I suppose @@ -123,7 +123,7 @@ stdenv.mkDerivation rec { ln -s ${belcard}/share/belr/grammars/* $out/share/belr/grammars/ ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.linphone.org/technical-corner/liblinphone"; description = "Library for SIP calls and instant messaging"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/liblo/default.nix b/pkgs/development/libraries/liblo/default.nix index a25666dfcf2..5f5b23cdc3a 100644 --- a/pkgs/development/libraries/liblo/default.nix +++ b/pkgs/development/libraries/liblo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "liblo-0.31"; @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { meta = { description = "Lightweight library to handle the sending and receiving of messages according to the Open Sound Control (OSC) protocol"; homepage = "https://sourceforge.net/projects/liblo"; - license = stdenv.lib.licenses.gpl2; - maintainers = [stdenv.lib.maintainers.marcweber]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = lib.licenses.gpl2; + maintainers = [lib.maintainers.marcweber]; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/liblockfile/default.nix b/pkgs/development/libraries/liblockfile/default.nix index 6ed995572ef..003991c80dd 100644 --- a/pkgs/development/libraries/liblockfile/default.nix +++ b/pkgs/development/libraries/liblockfile/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { _name = "liblockfile"; - version = "1.16"; + version = "1.17"; name = "${_name}-${version}"; src = fetchurl { url = "mirror://debian/pool/main/libl/${_name}/${_name}_${version}.orig.tar.gz"; - sha256 = "0s8wj3y6mf1g47nvinkkm5avmqz0z6yxmdrnxpjwgz6krql3hvng"; + sha256 = "sha256-bpN/NlCvq0qsGY80i4mxykLtzrF/trsJGPZCFDzP0V4="; }; preConfigure = '' @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { meta = { description = "Shared library with NFS-safe locking functions"; homepage = "http://packages.debian.org/unstable/libs/liblockfile1"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; - platforms = stdenv.lib.platforms.all; + maintainers = [ lib.maintainers.bluescreen303 ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/libraries/liblogging/default.nix b/pkgs/development/libraries/liblogging/default.nix index b9b787f4182..4a28bf67741 100644 --- a/pkgs/development/libraries/liblogging/default.nix +++ b/pkgs/development/libraries/liblogging/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , systemd ? null }: @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "14xz00mq07qmcgprlj5b2r21ljgpa4sbwmpr6jm2wrf8wms6331k"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ systemd ]; configureFlags = [ @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { "--enable-man-pages" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.liblogging.org/"; description = "Lightweight signal-safe logging library"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/liblognorm/default.nix b/pkgs/development/libraries/liblognorm/default.nix index bef1048dde4..293f72d67b2 100644 --- a/pkgs/development/libraries/liblognorm/default.nix +++ b/pkgs/development/libraries/liblognorm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libestr, json_c, pcre, fastJson }: +{ lib, stdenv, fetchurl, pkg-config, libestr, json_c, pcre, fastJson }: stdenv.mkDerivation rec { name = "liblognorm-2.0.6"; @@ -8,12 +8,12 @@ stdenv.mkDerivation rec { sha256 = "1wpn15c617r7lfm1z9d5aggmmi339s6yn4pdz698j0r2bkl5gw6g"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libestr json_c pcre fastJson ]; configureFlags = [ "--enable-regexp" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.liblognorm.com/"; description = "Help to make sense out of syslog data, or, actually, any event data that is present in text form"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix index d29cbf6a719..1dec830566f 100644 --- a/pkgs/development/libraries/liblouis/default.nix +++ b/pkgs/development/libraries/liblouis/default.nix @@ -1,7 +1,7 @@ { fetchFromGitHub -, stdenv +, lib, stdenv , autoreconfHook -, pkgconfig +, pkg-config , gettext , python3 , texinfo @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config gettext python3 # Docs, man, info @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Open-source braille translator and back-translator"; homepage = "http://liblouis.org/"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/liblqr-1/default.nix b/pkgs/development/libraries/liblqr-1/default.nix index 5f37989c20b..b871dbdb19d 100644 --- a/pkgs/development/libraries/liblqr-1/default.nix +++ b/pkgs/development/libraries/liblqr-1/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib }: +{ lib, stdenv, fetchurl, pkg-config, glib }: stdenv.mkDerivation rec { name = "liblqr-1-0.4.2"; @@ -8,10 +8,10 @@ stdenv.mkDerivation rec { sha256 = "0dzikxzjz5zmy3vnydh90aqk23q0qm8ykx6plz6p4z90zlp84fhp"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ glib ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://liblqr.wikidot.com"; description = "Seam-carving C/C++ library called Liquid Rescaling"; platforms = platforms.all; diff --git a/pkgs/development/libraries/liblscp/default.nix b/pkgs/development/libraries/liblscp/default.nix index 101e11deaa5..dcb862f2cd4 100644 --- a/pkgs/development/libraries/liblscp/default.nix +++ b/pkgs/development/libraries/liblscp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig }: +{ lib, stdenv, fetchurl, autoconf, automake, libtool, pkg-config }: stdenv.mkDerivation rec { pname = "liblscp"; @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { sha256 = "1rl7ssdzj0z3658yvdijmb27n2lcwmplx4qxg5mwrm07pvs7i75k"; }; - nativeBuildInputs = [ autoconf automake libtool pkgconfig ]; + nativeBuildInputs = [ autoconf automake libtool pkg-config ]; preConfigure = "make -f Makefile.git"; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.linuxsampler.org"; description = "LinuxSampler Control Protocol (LSCP) wrapper library"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/libltc/default.nix b/pkgs/development/libraries/libltc/default.nix index 4513396d7ea..2391d281d46 100644 --- a/pkgs/development/libraries/libltc/default.nix +++ b/pkgs/development/libraries/libltc/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation { name = "libltc-1.3.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "173h9dgmain3nyrwk6q2d7yl4fnh4vacag4s2p01n5b7nyrkxrjh"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://x42.github.io/libltc/"; description = "POSIX-C Library for handling Linear/Logitudinal Time Code (LTC)"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/libraries/liblxi/default.nix b/pkgs/development/libraries/liblxi/default.nix new file mode 100644 index 00000000000..1ca4043a024 --- /dev/null +++ b/pkgs/development/libraries/liblxi/default.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, fetchFromGitHub +, pkg-config, autoreconfHook +, libtirpc, rpcsvc-proto, avahi, libxml2 +}: + +stdenv.mkDerivation rec { + pname = "liblxi"; + version = "1.13"; + + src = fetchFromGitHub { + owner = "lxi-tools"; + repo = "liblxi"; + rev = "v${version}"; + sha256 = "129m0k2wrlgs25qkskynljddqspasla1x8iq51vmg38nhnilpqf6"; + }; + + nativeBuildInputs = [ autoreconfHook pkg-config rpcsvc-proto ]; + + buildInputs = [ libtirpc avahi libxml2 ]; + + meta = with lib; { + description = "Library for communicating with LXI compatible instruments"; + longDescription = '' + liblxi is an open source software library which offers a simple + API for communicating with LXI compatible instruments. + The API allows applications to easily discover instruments + on networks and communicate SCPI commands. + ''; + homepage = "https://lxi-tools.github.io/"; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = [ maintainers.vq ]; + }; +} diff --git a/pkgs/development/libraries/libmad/default.nix b/pkgs/development/libraries/libmad/default.nix index 84800f309fb..dd792348686 100644 --- a/pkgs/development/libraries/libmad/default.nix +++ b/pkgs/development/libraries/libmad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, autoconf }: +{ lib, stdenv, fetchurl, fetchpatch, autoconf }: stdenv.mkDerivation rec { pname = "libmad"; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { # optimize.diff is taken from https://projects.archlinux.org/svntogit/packages.git/tree/trunk/optimize.diff?h=packages/libmad # It is included here in order to fix a build failure in Clang # But it may be useful to fix other, currently unknown problems as well - ++ stdenv.lib.optionals stdenv.cc.isClang [ + ++ lib.optionals stdenv.cc.isClang [ (fetchpatch { url = "https://github.com/KaOSx/main/raw/1270b8080f37fb6cca562829a521991800b0a497/libmad/optimize.diff"; sha256 = "0hcxzz9ql1fizyqbsgdchdwi7bvchfr72172j43hpyj53p0yabc6"; @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { preConfigure = "autoconf"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://sourceforge.net/projects/mad/"; description = "A high-quality, fixed-point MPEG audio decoder supporting MPEG-1 and MPEG-2"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/libmanette/default.nix b/pkgs/development/libraries/libmanette/default.nix index 0cb233ad271..76dd4eb20c1 100644 --- a/pkgs/development/libraries/libmanette/default.nix +++ b/pkgs/development/libraries/libmanette/default.nix @@ -1,8 +1,8 @@ -{ stdenv +{ lib, stdenv , fetchurl , ninja , meson -, pkgconfig +, pkg-config , vala , gobject-introspection , gtk-doc @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1b3bcdkk5xd5asq797cch9id8692grsjxrc1ss87vv11m1ck4rb3"; }; nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config vala gobject-introspection gtk-doc @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple GObject game controller library"; homepage = "https://gnome.pages.gitlab.gnome.org/libmanette/"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/libmatchbox/default.nix b/pkgs/development/libraries/libmatchbox/default.nix index 49769359ed3..50b66eccfb3 100644 --- a/pkgs/development/libraries/libmatchbox/default.nix +++ b/pkgs/development/libraries/libmatchbox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, libXext, libpng, libXft, libICE, pango, libjpeg}: +{ lib, stdenv, fetchurl, libX11, libXext, libpng, libXft, libICE, pango, libjpeg}: stdenv.mkDerivation rec { pname = "libmatchbox"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Library of the matchbox X window manager"; homepage = "http://matchbox-project.org/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libmatheval/default.nix b/pkgs/development/libraries/libmatheval/default.nix index a24b931c660..b0fe1c35ef3 100644 --- a/pkgs/development/libraries/libmatheval/default.nix +++ b/pkgs/development/libraries/libmatheval/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, pkgconfig, guile, autoconf, flex, fetchpatch }: +{ lib, stdenv, fetchurl, pkg-config, guile, autoconf, flex, fetchpatch }: stdenv.mkDerivation rec { version = "1.1.11"; pname = "libmatheval"; - nativeBuildInputs = [ pkgconfig autoconf flex ]; + nativeBuildInputs = [ pkg-config autoconf flex ]; buildInputs = [ guile ]; src = fetchurl { @@ -38,9 +38,9 @@ stdenv.mkDerivation rec { symbolic derivatives and output expressions to strings. ''; homepage = "https://www.gnu.org/software/libmatheval/"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.bzizou ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.bzizou ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libmatroska/default.nix b/pkgs/development/libraries/libmatroska/default.nix index 5d065636a92..1d3cf4032dd 100644 --- a/pkgs/development/libraries/libmatroska/default.nix +++ b/pkgs/development/libraries/libmatroska/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config , libebml }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0yhr9hhgljva1fx3b0r4s3wkkypdfgsysbl35a4g3krkbhaa9rsd"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libebml ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { "-DBUILD_SHARED_LIBS=YES" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A library to parse Matroska files"; homepage = "https://matroska.org/"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libmaxminddb/default.nix b/pkgs/development/libraries/libmaxminddb/default.nix index 94a4b9ec57c..078865198a4 100644 --- a/pkgs/development/libraries/libmaxminddb/default.nix +++ b/pkgs/development/libraries/libmaxminddb/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "libmaxminddb"; - version = "1.4.3"; + version = "1.5.0"; src = fetchurl { url = meta.homepage + "/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "0fd4a4sxiiwzbd5h74wl1ijnb7xybjyybb7q41vdq3w8nk3zdzd5"; + sha256 = "sha256-fFbnkf8qZVIV5+04ZLH/3X00o4g1d57+1WpC8Fa9WKo="; }; - meta = with stdenv.lib; { + meta = with lib; { description = "C library for working with MaxMind geolocation DB files"; homepage = "https://github.com/maxmind/libmaxminddb"; license = licenses.asl20; diff --git a/pkgs/development/libraries/libmbim/default.nix b/pkgs/development/libraries/libmbim/default.nix index fdf724c09fd..850c7aa1df0 100644 --- a/pkgs/development/libraries/libmbim/default.nix +++ b/pkgs/development/libraries/libmbim/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , pkg-config , gobject-introspection @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.freedesktop.org/wiki/Software/libmbim/"; description = "Library for talking to WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libmcrypt/default.nix b/pkgs/development/libraries/libmcrypt/default.nix index a29fca45a99..44c55cb4682 100644 --- a/pkgs/development/libraries/libmcrypt/default.nix +++ b/pkgs/development/libraries/libmcrypt/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, darwin, disablePosixThreads ? false }: +{ lib, stdenv, fetchurl, darwin, disablePosixThreads ? false }: -with stdenv.lib; +with lib; stdenv.mkDerivation { name = "libmcrypt-2.5.8"; - + src = fetchurl { url = "mirror://sourceforge/mcrypt/Libmcrypt/2.5.8/libmcrypt-2.5.8.tar.gz"; sha256 = "0gipgb939vy9m66d3k8il98rvvwczyaw2ixr8yn6icds9c3nrsz4"; diff --git a/pkgs/development/libraries/libmd/default.nix b/pkgs/development/libraries/libmd/default.nix index e3dd0b206f1..7093376aa7e 100644 --- a/pkgs/development/libraries/libmd/default.nix +++ b/pkgs/development/libraries/libmd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook }: +{ lib, stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { pname = "libmd"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.hadrons.org/software/${pname}/"; changelog = "https://archive.hadrons.org/software/libmd/libmd-${version}.announce"; # Git: https://git.hadrons.org/cgit/libmd.git diff --git a/pkgs/development/libraries/libmediaart/default.nix b/pkgs/development/libraries/libmediaart/default.nix index 38adebb2a48..28c8ae6db94 100644 --- a/pkgs/development/libraries/libmediaart/default.nix +++ b/pkgs/development/libraries/libmediaart/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gdk-pixbuf, gobject-introspection, gnome3, fetchpatch }: +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gdk-pixbuf, gobject-introspection, gnome3, fetchpatch }: stdenv.mkDerivation rec { pname = "libmediaart"; @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "a57be017257e4815389afe4f58fdacb6a50e74fd185452b23a652ee56b04813d"; }; - nativeBuildInputs = [ meson ninja pkgconfig vala gtk-doc docbook_xsl docbook_xml_dtd_412 gobject-introspection ]; + nativeBuildInputs = [ meson ninja pkg-config vala gtk-doc docbook_xsl docbook_xml_dtd_412 gobject-introspection ]; buildInputs = [ glib gdk-pixbuf ]; patches = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Library tasked with managing, extracting and handling media art caches"; maintainers = teams.gnome.members; license = licenses.gpl2; diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix index 31d64101e6b..d78ccbc50ab 100644 --- a/pkgs/development/libraries/libmediainfo/default.nix +++ b/pkgs/development/libraries/libmediainfo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }: +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libzen, zlib }: stdenv.mkDerivation rec { version = "20.09"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "15ni9pnch6688m72swwax109a7mg4a08yx75qknrx7qa6dbyhz6h"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libzen zlib ]; sourceRoot = "./MediaInfoLib/Project/GNU/Library/"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { install -vD -m 644 libmediainfo.pc "$out/lib/pkgconfig/libmediainfo.pc" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Shared library for mediainfo"; homepage = "https://mediaarea.net/"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/libmemcached/default.nix b/pkgs/development/libraries/libmemcached/default.nix index 8cbb76377fb..0ee0701d929 100644 --- a/pkgs/development/libraries/libmemcached/default.nix +++ b/pkgs/development/libraries/libmemcached/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, cyrus_sasl, libevent }: +{ lib, stdenv, fetchurl, fetchpatch, cyrus_sasl, libevent }: stdenv.mkDerivation { name = "libmemcached-1.0.18"; @@ -13,19 +13,19 @@ stdenv.mkDerivation { # https://bugs.launchpad.net/libmemcached/+bug/1281907 # Fix building on macOS (patch from Homebrew) # https://bugs.launchpad.net/libmemcached/+bug/1245562 - patches = stdenv.lib.optional stdenv.isLinux ./libmemcached-fix-linking-with-libpthread.patch - ++ stdenv.lib.optional stdenv.isDarwin (fetchpatch { + patches = lib.optional stdenv.isLinux ./libmemcached-fix-linking-with-libpthread.patch + ++ lib.optional stdenv.isDarwin (fetchpatch { url = "https://raw.githubusercontent.com/Homebrew/homebrew/bfd4a0a4626b61c2511fdf573bcbbc6bbe86340e/Library/Formula/libmemcached.rb"; sha256 = "1gjf3vd7hiyzxjvlg2zfc3y2j0lyr6nhbws4xb5dmin3csyp8qb8"; }) - ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./musl-fixes.patch; + ++ lib.optional stdenv.hostPlatform.isMusl ./musl-fixes.patch; buildInputs = [ libevent ]; propagatedBuildInputs = [ cyrus_sasl ]; NIX_CFLAGS_COMPILE = "-fpermissive"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://libmemcached.org"; description = "Open source C/C++ client library and tools for the memcached server"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libmesode/default.nix b/pkgs/development/libraries/libmesode/default.nix index 54ff0dccb90..128975246a8 100644 --- a/pkgs/development/libraries/libmesode/default.nix +++ b/pkgs/development/libraries/libmesode/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook , libtool @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Fork of libstrophe (https://github.com/strophe/libstrophe) for use with Profanity XMPP Client"; longDescription = '' Reasons for forking: diff --git a/pkgs/development/libraries/libmhash/default.nix b/pkgs/development/libraries/libmhash/default.nix index 2a61c571066..f569ce7fac7 100644 --- a/pkgs/development/libraries/libmhash/default.nix +++ b/pkgs/development/libraries/libmhash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "mhash"; @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { ''; homepage = "http://mhash.sourceforge.net"; license = "LGPL"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libmicrodns/default.nix b/pkgs/development/libraries/libmicrodns/default.nix index 69dd052dc03..c9dd899a2b0 100644 --- a/pkgs/development/libraries/libmicrodns/default.nix +++ b/pkgs/development/libraries/libmicrodns/default.nix @@ -1,8 +1,8 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , meson , ninja -, pkgconfig +, pkg-config }: stdenv.mkDerivation rec { @@ -19,10 +19,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Minimal mDNS resolver library, used by VLC"; homepage = "https://github.com/videolabs/libmicrodns"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libmicrohttpd/0.9.70.nix b/pkgs/development/libraries/libmicrohttpd/0.9.70.nix index 1cd04b0b277..c0321e327c5 100644 --- a/pkgs/development/libraries/libmicrohttpd/0.9.70.nix +++ b/pkgs/development/libraries/libmicrohttpd/0.9.70.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl }: +{ callPackage, fetchurl }: callPackage ./generic.nix ( rec { version = "0.9.70"; diff --git a/pkgs/development/libraries/libmicrohttpd/0.9.71.nix b/pkgs/development/libraries/libmicrohttpd/0.9.71.nix index 74bd6cce42c..7e60f8c7272 100644 --- a/pkgs/development/libraries/libmicrohttpd/0.9.71.nix +++ b/pkgs/development/libraries/libmicrohttpd/0.9.71.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl }: +{ callPackage, fetchurl }: callPackage ./generic.nix ( rec { version = "0.9.71"; diff --git a/pkgs/development/libraries/libmicrohttpd/0.9.72.nix b/pkgs/development/libraries/libmicrohttpd/0.9.72.nix index 8eeb94cdc29..4c695218184 100644 --- a/pkgs/development/libraries/libmicrohttpd/0.9.72.nix +++ b/pkgs/development/libraries/libmicrohttpd/0.9.72.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl }: +{ callPackage, fetchurl }: callPackage ./generic.nix ( rec { version = "0.9.72"; diff --git a/pkgs/development/libraries/libmicrohttpd/generic.nix b/pkgs/development/libraries/libmicrohttpd/generic.nix index 9b817f21b94..336b66ac832 100644 --- a/pkgs/development/libraries/libmicrohttpd/generic.nix +++ b/pkgs/development/libraries/libmicrohttpd/generic.nix @@ -1,11 +1,11 @@ -{ stdenv, libgcrypt, curl, gnutls, pkgconfig, libiconv, libintl, version, src }: +{ lib, stdenv, libgcrypt, curl, gnutls, pkg-config, libiconv, libintl, version, src }: stdenv.mkDerivation rec { pname = "libmicrohttpd"; inherit version src; outputs = [ "out" "dev" "devdoc" "info" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libgcrypt curl gnutls libiconv libintl ]; preCheck = '' @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # Disabled because the tests can time-out. doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Embeddable HTTP server library"; longDescription = '' diff --git a/pkgs/development/libraries/libmikmod/default.nix b/pkgs/development/libraries/libmikmod/default.nix index 59967bcba5a..a734a4b8009 100644 --- a/pkgs/development/libraries/libmikmod/default.nix +++ b/pkgs/development/libraries/libmikmod/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, texinfo, alsaLib, libpulseaudio, CoreAudio }: +{ lib, stdenv, fetchurl, texinfo, alsaLib, libpulseaudio, CoreAudio }: let - inherit (stdenv.lib) optional optionalString; + inherit (lib) optional optionalString; in stdenv.mkDerivation rec { name = "libmikmod-3.3.11.1"; @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { NIX_LDFLAGS = optionalString stdenv.isLinux "-lasound"; - meta = with stdenv.lib; { + meta = with lib; { description = "A library for playing tracker music module files"; homepage = "https://mikmod.shlomifish.org/"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/libmilter/default.nix b/pkgs/development/libraries/libmilter/default.nix index f937d818a55..9287b0a0dea 100644 --- a/pkgs/development/libraries/libmilter/default.nix +++ b/pkgs/development/libraries/libmilter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, m4 }: +{ lib, stdenv, fetchurl, m4 }: stdenv.mkDerivation rec { pname = "libmilter"; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ m4 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Sendmail Milter mail filtering API library"; platforms = platforms.unix; maintainers = with maintainers; [ fpletz ]; diff --git a/pkgs/development/libraries/libminc/default.nix b/pkgs/development/libraries/libminc/default.nix index ce39285e0d2..2440082cce9 100644 --- a/pkgs/development/libraries/libminc/default.nix +++ b/pkgs/development/libraries/libminc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, zlib, netcdf, nifticlib, hdf5 }: +{ lib, stdenv, fetchFromGitHub, cmake, zlib, netcdf, nifticlib, hdf5 }: stdenv.mkDerivation rec { pname = "libminc"; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { # ezminc_rw_test: can't find libminc_io.so.5.2.0 ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/BIC-MNI/libminc"; description = "Medical imaging library based on HDF5"; maintainers = with maintainers; [ bcdarwin ]; diff --git a/pkgs/development/libraries/libmkv/default.nix b/pkgs/development/libraries/libmkv/default.nix index 9a754eda592..584d76e1cf2 100644 --- a/pkgs/development/libraries/libmkv/default.nix +++ b/pkgs/development/libraries/libmkv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libtool, autoconf, automake }: +{ lib, stdenv, fetchFromGitHub, libtool, autoconf, automake }: stdenv.mkDerivation rec { pname = "libmkv"; @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { It is written in plain C, and intended to be very portable. ''; homepage = "https://github.com/saintdev/libmkv"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.wmertens ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.wmertens ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libmms/default.nix b/pkgs/development/libraries/libmms/default.nix index 3753101ebf9..83add1d42a5 100644 --- a/pkgs/development/libraries/libmms/default.nix +++ b/pkgs/development/libraries/libmms/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, pkgconfig }: +{ lib, stdenv, fetchurl, glib, pkg-config }: stdenv.mkDerivation rec { name = "libmms-0.6.4"; @@ -10,9 +10,9 @@ stdenv.mkDerivation rec { buildInputs = [ glib ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for downloading (streaming) media files using the mmst and mmsh protocols"; homepage = "http://libmms.sourceforge.net"; platforms = platforms.all; diff --git a/pkgs/development/libraries/libmng/default.nix b/pkgs/development/libraries/libmng/default.nix index e13bda56793..f1704a527b4 100644 --- a/pkgs/development/libraries/libmng/default.nix +++ b/pkgs/development/libraries/libmng/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, libpng, libjpeg, lcms2 }: +{ lib, stdenv, fetchurl, zlib, libpng, libjpeg, lcms2 }: stdenv.mkDerivation rec { name = "libmng-2.0.3"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ zlib libpng libjpeg lcms2 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Reference library for reading, displaying, writing and examining Multiple-Image Network Graphics"; homepage = "http://www.libmng.com"; license = licenses.zlib; diff --git a/pkgs/development/libraries/libmnl/default.nix b/pkgs/development/libraries/libmnl/default.nix index 3db6ab0da08..4e99258a3e8 100644 --- a/pkgs/development/libraries/libmnl/default.nix +++ b/pkgs/development/libraries/libmnl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "libmnl-1.0.4"; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { re-inventing the wheel. ''; homepage = "https://netfilter.org/projects/libmnl/index.html"; - license = stdenv.lib.licenses.lgpl21Plus; + license = lib.licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libmodbus/default.nix b/pkgs/development/libraries/libmodbus/default.nix index 14f80e9b2e5..b311c4f0418 100644 --- a/pkgs/development/libraries/libmodbus/default.nix +++ b/pkgs/development/libraries/libmodbus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "libmodbus-3.1.6"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { "ac_cv_func_realloc_0_nonnull=yes" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library to send/receive data according to the Modbus protocol"; homepage = "https://libmodbus.org/"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/libmodplug/default.nix b/pkgs/development/libraries/libmodplug/default.nix index 2d38a5021e5..790674f1649 100644 --- a/pkgs/development/libraries/libmodplug/default.nix +++ b/pkgs/development/libraries/libmodplug/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, file }: +{ lib, stdenv, fetchurl, file }: let version = "0.8.9.0"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation rec { --replace /usr/bin/file ${file}/bin/file ''; - meta = with stdenv.lib; { + meta = with lib; { description = "MOD playing library"; homepage = "http://modplug-xmms.sourceforge.net/"; license = licenses.publicDomain; diff --git a/pkgs/development/libraries/libmodule/default.nix b/pkgs/development/libraries/libmodule/default.nix index d608a08d2d9..d77d2bcbdcd 100644 --- a/pkgs/development/libraries/libmodule/default.nix +++ b/pkgs/development/libraries/libmodule/default.nix @@ -1,23 +1,23 @@ -{ stdenv, fetchFromGitHub -, cmake, pkgconfig }: +{ lib, stdenv, fetchFromGitHub +, cmake, pkg-config }: stdenv.mkDerivation rec { pname = "libmodule"; - version = "5.0.0"; + version = "5.0.1"; src = fetchFromGitHub { owner = "FedeDP"; repo = "libmodule"; rev = version; - sha256 = "1cf81sl33xmfn5g150iqcdrjn0lpjlgp53mganwi6x7jda2qk7r6"; + sha256 = "sha256-wkRiDWO9wUyxkAeqvm99u22Jq4xnQJx6zS7Sb+R8iMg="; }; nativeBuildInputs = [ cmake - pkgconfig + pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { description = "C simple and elegant implementation of an actor library"; homepage = "https://github.com/FedeDP/libmodule"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libmodulemd/default.nix b/pkgs/development/libraries/libmodulemd/default.nix index a0d32f5178a..8a8d9adf53d 100644 --- a/pkgs/development/libraries/libmodulemd/default.nix +++ b/pkgs/development/libraries/libmodulemd/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , substituteAll , fetchFromGitHub , fetchpatch @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { echo "$out ${python3.pkgs.pygobject3} ${python3.pkgs.six}" > "$py/nix-support/propagated-build-inputs" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "C Library for manipulating module metadata files"; homepage = "https://github.com/fedora-modularity/libmodulemd"; license = licenses.mit; diff --git a/pkgs/development/libraries/libmongo-client/default.nix b/pkgs/development/libraries/libmongo-client/default.nix index b3231d1af91..f81f6313338 100644 --- a/pkgs/development/libraries/libmongo-client/default.nix +++ b/pkgs/development/libraries/libmongo-client/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib }: stdenv.mkDerivation rec { name = "libmongo-client-0.1.8"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1cjx06i3gd9zkyvwm2ysjrf0hkhr7bjg3c27s7n0y31j10igfjp0"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ ]; propagatedBuildInputs = [ glib ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sed -i 's/Requires.private/Requires/g' src/libmongo-client.pc.in ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://algernon.github.io/libmongo-client/"; description = "An alternative C driver for MongoDB"; license = licenses.asl20; diff --git a/pkgs/development/libraries/libmowgli/default.nix b/pkgs/development/libraries/libmowgli/default.nix index ae3a9efef24..e227c09b2b6 100644 --- a/pkgs/development/libraries/libmowgli/default.nix +++ b/pkgs/development/libraries/libmowgli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "libmowgli"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0xx4vndmwz40pxa5gikl8z8cskpdl9a30i2i5fjncqzlp4pspymp"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A development framework for C providing high performance and highly flexible algorithms"; homepage = "https://github.com/atheme/libmowgli-2"; license = licenses.isc; diff --git a/pkgs/development/libraries/libmp3splt/default.nix b/pkgs/development/libraries/libmp3splt/default.nix index 237e3f94cfc..58da7560e13 100644 --- a/pkgs/development/libraries/libmp3splt/default.nix +++ b/pkgs/development/libraries/libmp3splt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libtool, libmad, libid3tag }: +{ lib, stdenv, fetchurl, libtool, libmad, libid3tag }: stdenv.mkDerivation rec { name = "libmp3splt-0.9.2"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-pcre" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://sourceforge.net/projects/mp3splt/"; description = "Utility to split mp3, ogg vorbis and FLAC files without decoding"; maintainers = with maintainers; [ bosu ]; diff --git a/pkgs/development/libraries/libmpack/default.nix b/pkgs/development/libraries/libmpack/default.nix index 736474d29a5..b62da40499c 100644 --- a/pkgs/development/libraries/libmpack/default.nix +++ b/pkgs/development/libraries/libmpack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libtool }: +{ lib, stdenv, fetchFromGitHub, libtool }: stdenv.mkDerivation rec { pname = "libmpack"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { makeFlags = [ "LIBTOOL=libtool" "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple implementation of msgpack in C"; homepage = "https://github.com/tarruda/libmpack/"; license = licenses.mit; diff --git a/pkgs/development/libraries/libmpc/default.nix b/pkgs/development/libraries/libmpc/default.nix index 79fa1743781..66e38fbfbc0 100644 --- a/pkgs/development/libraries/libmpc/default.nix +++ b/pkgs/development/libraries/libmpc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , gmp, mpfr }: @@ -33,9 +33,9 @@ stdenv.mkDerivation { ''; homepage = "http://mpc.multiprecision.org/"; - license = stdenv.lib.licenses.lgpl2Plus; + license = lib.licenses.lgpl2Plus; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/libmpcdec/default.nix b/pkgs/development/libraries/libmpcdec/default.nix index 3ee37e6ae9c..b42d9a3d1e4 100644 --- a/pkgs/development/libraries/libmpcdec/default.nix +++ b/pkgs/development/libraries/libmpcdec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "libmpcdec-1.2.6"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { meta = { description = "Musepack SV7 decoder library"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.bsd3; + platforms = lib.platforms.unix; + license = lib.licenses.bsd3; }; } diff --git a/pkgs/development/libraries/libmpeg2/default.nix b/pkgs/development/libraries/libmpeg2/default.nix index d6fb28c0e88..bf5f25ca43f 100644 --- a/pkgs/development/libraries/libmpeg2/default.nix +++ b/pkgs/development/libraries/libmpeg2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { version = "0.5.1"; @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { }; # Otherwise clang fails with 'duplicate symbol ___sputc' - buildFlags = stdenv.lib.optional stdenv.isDarwin "CFLAGS=-std=gnu89"; + buildFlags = lib.optional stdenv.isDarwin "CFLAGS=-std=gnu89"; meta = { homepage = "http://libmpeg2.sourceforge.net/"; description = "A free library for decoding mpeg-2 and mpeg-1 video streams"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ ]; - platforms = with stdenv.lib.platforms; unix; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ ]; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/development/libraries/libmrss/default.nix b/pkgs/development/libraries/libmrss/default.nix index aa70e4c4ddf..df3460970d1 100644 --- a/pkgs/development/libraries/libmrss/default.nix +++ b/pkgs/development/libraries/libmrss/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, curl, libnxml, pkgconfig}: +{lib, stdenv, fetchurl, curl, libnxml, pkg-config}: stdenv.mkDerivation { name = "libmrss-0.19.2"; @@ -8,15 +8,15 @@ stdenv.mkDerivation { sha256 = "02r1bgj8qlkn63xqfi5yq8y7wrilxcnkycaag8qskhg5ranic507"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ curl libnxml ]; meta = { homepage = "http://www.autistici.org/bakunin/libmrss/doc"; description = "C library for parsing, writing and creating RSS/ATOM files or streams"; - license = stdenv.lib.licenses.lgpl2; + license = lib.licenses.lgpl2; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.viric ]; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.viric ]; }; } diff --git a/pkgs/development/libraries/libmspack/default.nix b/pkgs/development/libraries/libmspack/default.nix index 70fdd7e913e..4ad60bcfb18 100644 --- a/pkgs/development/libraries/libmspack/default.nix +++ b/pkgs/development/libraries/libmspack/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { name = "libmspack-0.7.1alpha"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = { description = "A de/compression library for various Microsoft formats"; homepage = "https://www.cabextract.org.uk/libmspack"; - license = stdenv.lib.licenses.lgpl2; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.lgpl2; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/development/libraries/libmtp/default.nix index e9cfd0f9856..a49026c35dc 100644 --- a/pkgs/development/libraries/libmtp/default.nix +++ b/pkgs/development/libraries/libmtp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, gettext, libtool, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoconf, automake, gettext, libtool, pkg-config , libusb1 , libiconv }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { automake gettext libtool - pkgconfig + pkg-config ]; buildInputs = [ @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { # tried to install files to /lib/udev, hopefully OK configureFlags = [ "--with-udev=$$bin/lib/udev" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://libmtp.sourceforge.net"; description = "An implementation of Microsoft's Media Transfer Protocol"; longDescription = '' diff --git a/pkgs/development/libraries/libmusicbrainz/5.x.nix b/pkgs/development/libraries/libmusicbrainz/5.x.nix index 7c8cdd1df1a..3e7a2f1a0ba 100644 --- a/pkgs/development/libraries/libmusicbrainz/5.x.nix +++ b/pkgs/development/libraries/libmusicbrainz/5.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, neon, libdiscid, libxml2, pkg-config }: +{ lib, stdenv, fetchFromGitHub, cmake, neon, libdiscid, libxml2, pkg-config }: stdenv.mkDerivation rec { version = "5.1.0"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { dontUseCmakeBuildDir=true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://musicbrainz.org/doc/libmusicbrainz"; description = "MusicBrainz Client Library (5.x version)"; longDescription = '' diff --git a/pkgs/development/libraries/libmusicbrainz/default.nix b/pkgs/development/libraries/libmusicbrainz/default.nix index d5568cdb3d6..ab67d544a1d 100644 --- a/pkgs/development/libraries/libmusicbrainz/default.nix +++ b/pkgs/development/libraries/libmusicbrainz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, neon, libdiscid }: +{ lib, stdenv, fetchurl, cmake, neon, libdiscid }: stdenv.mkDerivation rec { name = "libmusicbrainz-3.0.3"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1i9qly13bwwmgj68vma766hgvsd1m75236haqsp9zgh5znlmkm3z"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://musicbrainz.org/doc/libmusicbrainz"; description = "MusicBrainz Client Library (3.x version)"; longDescription = '' diff --git a/pkgs/development/libraries/libmwaw/default.nix b/pkgs/development/libraries/libmwaw/default.nix index 2ab23015af3..17e20e3d399 100644 --- a/pkgs/development/libraries/libmwaw/default.nix +++ b/pkgs/development/libraries/libmwaw/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, boost, pkgconfig, cppunit, zlib, libwpg, libwpd, librevenge}: +{lib, stdenv, fetchurl, boost, pkg-config, cppunit, zlib, libwpg, libwpd, librevenge}: let s = # Generated upstream information rec { @@ -10,7 +10,7 @@ let sha256="074ipcq9w7jbd5x316dzclddgia2ydw098ph9d7p3d713pmkf5cf"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ boost cppunit zlib libwpg libwpd librevenge ]; @@ -23,9 +23,9 @@ stdenv.mkDerivation { }; meta = { inherit (s) version; - description = ''Import library for some old mac text documents''; - license = stdenv.lib.licenses.mpl20 ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; + description = "Import library for some old mac text documents"; + license = lib.licenses.mpl20 ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libmx/default.nix b/pkgs/development/libraries/libmx/default.nix index 623c872fa1a..f4256de6981 100644 --- a/pkgs/development/libraries/libmx/default.nix +++ b/pkgs/development/libraries/libmx/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl -, libtool, pkgconfig, automake, autoconf, intltool +{ lib, stdenv, fetchurl +, libtool, pkg-config, automake, autoconf, intltool , glib, gobject-introspection, gtk2, gtk-doc , clutter, clutter-gtk }: @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { configureScript = "sh autogen.sh"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ automake autoconf libtool intltool @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { sed -i 's/GLfloat/gfloat/g' mx/mx-texture-frame.c ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.clutter-project.org/"; description = "A Clutter-based toolkit"; longDescription = diff --git a/pkgs/development/libraries/libmypaint/default.nix b/pkgs/development/libraries/libmypaint/default.nix index 074e3842933..655480f75a2 100644 --- a/pkgs/development/libraries/libmypaint/default.nix +++ b/pkgs/development/libraries/libmypaint/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , autoconf , automake , fetchFromGitHub @@ -6,7 +6,7 @@ , intltool , json_c , libtool -, pkgconfig +, pkg-config , python3 }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { automake intltool libtool - pkgconfig + pkg-config python3 ]; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://mypaint.org/"; description = "Library for making brushstrokes which is used by MyPaint and other projects"; license = licenses.isc; diff --git a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix index 6c4874112b7..4c00d642588 100644 --- a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix +++ b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , cmake , boost @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://dev.mysql.com/downloads/connector/cpp/"; description = "C++ library for connecting to mysql servers"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libnabo/default.nix b/pkgs/development/libraries/libnabo/default.nix index 91843163176..af5e78c25d6 100644 --- a/pkgs/development/libraries/libnabo/default.nix +++ b/pkgs/development/libraries/libnabo/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, cmake, eigen, boost}: +{lib, stdenv, fetchFromGitHub, cmake, eigen, boost}: stdenv.mkDerivation rec { version = "1.0.7"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { doCheck = true; checkTarget = "test"; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "A fast K Nearest Neighbor library for low-dimensional spaces"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libnatpmp/default.nix b/pkgs/development/libraries/libnatpmp/default.nix index a2aae126359..dd902c0021d 100644 --- a/pkgs/development/libraries/libnatpmp/default.nix +++ b/pkgs/development/libraries/libnatpmp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "libnatpmp"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { makeFlags = [ "INSTALLPREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://miniupnp.free.fr/libnatpmp.html"; description = "NAT-PMP client"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libnats-c/default.nix b/pkgs/development/libraries/libnats-c/default.nix index 12f1038f8e1..3d1e2b7ac4a 100644 --- a/pkgs/development/libraries/libnats-c/default.nix +++ b/pkgs/development/libraries/libnats-c/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , cmake, protobuf, protobufc , libsodium, openssl }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { separateDebugInfo = true; outputs = [ "out" "dev" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "C API for the NATS messaging system"; homepage = "https://github.com/nats-io/nats.c"; license = licenses.asl20; diff --git a/pkgs/development/libraries/libnatspec/default.nix b/pkgs/development/libraries/libnatspec/default.nix index 8ac2859faed..17e43ec29d9 100644 --- a/pkgs/development/libraries/libnatspec/default.nix +++ b/pkgs/development/libraries/libnatspec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, popt, libiconv }: +{ lib, stdenv, fetchurl, autoreconfHook, popt, libiconv }: stdenv.mkDerivation (rec { name = "libnatspec-0.3.0"; @@ -12,12 +12,12 @@ stdenv.mkDerivation (rec { buildInputs = [ popt ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://natspec.sourceforge.net/"; description = "A library intended to smooth national specificities in using of programs"; platforms = platforms.unix; license = licenses.lgpl21; }; -} // stdenv.lib.optionalAttrs (!stdenv.isLinux) { +} // lib.optionalAttrs (!stdenv.isLinux) { propagatedBuildInputs = [ libiconv ]; }) diff --git a/pkgs/development/libraries/libndctl/default.nix b/pkgs/development/libraries/libndctl/default.nix index 6ca6c301831..b7e082f2b9b 100644 --- a/pkgs/development/libraries/libndctl/default.nix +++ b/pkgs/development/libraries/libndctl/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, autoreconfHook -, asciidoctor, pkgconfig, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt +{ lib, stdenv, fetchFromGitHub, autoreconfHook +, asciidoctor, pkg-config, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt , json_c, kmod, which, util-linux, udev, keyutils }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "man" "dev" ]; nativeBuildInputs = - [ autoreconfHook asciidoctor pkgconfig xmlto docbook_xml_dtd_45 docbook_xsl libxslt + [ autoreconfHook asciidoctor pkg-config xmlto docbook_xml_dtd_45 docbook_xsl libxslt which ]; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { echo "m4_define([GIT_VERSION], [${version}])" > version.m4; ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tools for managing the Linux Non-Volatile Memory Device sub-system"; homepage = "https://github.com/pmem/ndctl"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libndp/default.nix b/pkgs/development/libraries/libndp/default.nix index 2592b7184f8..fc68149c14c 100644 --- a/pkgs/development/libraries/libndp/default.nix +++ b/pkgs/development/libraries/libndp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "libndp-1.7"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1dlinhl39va00v55qygjc9ap77yqf7xvn4rwmvdr49xhzzxhlj1c"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://libndp.org/"; description = "Library for Neighbor Discovery Protocol"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libndtypes/default.nix b/pkgs/development/libraries/libndtypes/default.nix index d27c1ba376d..1f0709af6cf 100644 --- a/pkgs/development/libraries/libndtypes/default.nix +++ b/pkgs/development/libraries/libndtypes/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub }: @@ -19,7 +19,7 @@ stdenv.mkDerivation { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Dynamic types for data description and in-memory computations"; homepage = "https://xnd.io/"; license = licenses.bsdOriginal; diff --git a/pkgs/development/libraries/libnest2d/default.nix b/pkgs/development/libraries/libnest2d/default.nix index ee61ef8a723..567598500d6 100644 --- a/pkgs/development/libraries/libnest2d/default.nix +++ b/pkgs/development/libraries/libnest2d/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, clipper, nlopt, boost, python3 }: +{ lib, stdenv, fetchFromGitHub, cmake, clipper, nlopt, boost, python3 }: stdenv.mkDerivation rec { version = "2020-10-09-unstable"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { CLIPPER_PATH = "${clipper.out}"; cmakeFlags = [ "-DLIBNEST2D_HEADER_ONLY=OFF" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "2D irregular bin packaging and nesting library written in modern C++"; homepage = "https://github.com/Ultimaker/libnest2d"; diff --git a/pkgs/development/libraries/libnet/default.nix b/pkgs/development/libraries/libnet/default.nix index 7987fccc06f..cb3375708df 100644 --- a/pkgs/development/libraries/libnet/default.nix +++ b/pkgs/development/libraries/libnet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "libnet"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { patches = [ ./fix-includes.patch ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/sam-github/libnet"; description = "Portable framework for low-level network packet construction"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libnetfilter_acct/default.nix b/pkgs/development/libraries/libnetfilter_acct/default.nix index 268da3813e7..72766471d2f 100644 --- a/pkgs/development/libraries/libnetfilter_acct/default.nix +++ b/pkgs/development/libraries/libnetfilter_acct/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libmnl }: +{ lib, stdenv, fetchurl, pkg-config, libmnl }: stdenv.mkDerivation rec { version = "1.0.3"; @@ -9,10 +9,10 @@ stdenv.mkDerivation rec { sha256 = "06lsjndgfjsgfjr43px2n2wk3nr7whz6r405mks3887y7vpwwl22"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libmnl ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.netfilter.org/projects/libnetfilter_acct/"; description = "Userspace library providing interface to extended accounting infrastructure"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/libnetfilter_conntrack/default.nix b/pkgs/development/libraries/libnetfilter_conntrack/default.nix index 851357f6404..a2097bb17e2 100644 --- a/pkgs/development/libraries/libnetfilter_conntrack/default.nix +++ b/pkgs/development/libraries/libnetfilter_conntrack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libnfnetlink, libmnl }: +{ lib, stdenv, fetchurl, pkg-config, libnfnetlink, libmnl }: stdenv.mkDerivation rec { pname = "libnetfilter_conntrack"; @@ -11,9 +11,9 @@ stdenv.mkDerivation rec { buildInputs = [ libmnl ]; propagatedBuildInputs = [ libnfnetlink ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Userspace library providing an API to the in-kernel connection tracking state table"; longDescription = '' libnetfilter_conntrack is a userspace library providing a programming interface (API) to the diff --git a/pkgs/development/libraries/libnetfilter_cthelper/default.nix b/pkgs/development/libraries/libnetfilter_cthelper/default.nix index ca167198989..b8b05e57dad 100644 --- a/pkgs/development/libraries/libnetfilter_cthelper/default.nix +++ b/pkgs/development/libraries/libnetfilter_cthelper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libmnl }: +{ lib, stdenv, fetchurl, pkg-config, libmnl }: stdenv.mkDerivation rec { pname = "libnetfilter_cthelper"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "07618e71c4d9a6b6b3dc1986540486ee310a9838ba754926c7d14a17d8fccf3d"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libmnl ]; meta = { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { is used by conntrack-tools. ''; homepage = "http://www.netfilter.org/projects/libnetfilter_cthelper/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libnetfilter_cttimeout/default.nix b/pkgs/development/libraries/libnetfilter_cttimeout/default.nix index 64bcc08ffb9..a8d0c2680df 100644 --- a/pkgs/development/libraries/libnetfilter_cttimeout/default.nix +++ b/pkgs/development/libraries/libnetfilter_cttimeout/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libmnl }: +{ lib, stdenv, fetchurl, pkg-config, libmnl }: stdenv.mkDerivation rec { pname = "libnetfilter_cttimeout"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "aeab12754f557cba3ce2950a2029963d817490df7edb49880008b34d7ff8feba"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libmnl ]; meta = { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { be attached to traffic flows. This library is used by conntrack-tools. ''; homepage = "https://netfilter.org/projects/libnetfilter_cttimeout/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libnetfilter_log/default.nix b/pkgs/development/libraries/libnetfilter_log/default.nix index 18346814750..4ac20cf29cb 100644 --- a/pkgs/development/libraries/libnetfilter_log/default.nix +++ b/pkgs/development/libraries/libnetfilter_log/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libnfnetlink, libmnl }: +{ lib, stdenv, fetchurl, pkg-config, libnfnetlink, libmnl }: stdenv.mkDerivation rec { pname = "libnetfilter_log"; @@ -11,9 +11,9 @@ stdenv.mkDerivation rec { buildInputs = [ libmnl ]; propagatedBuildInputs = [ libnfnetlink ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Userspace library providing interface to packets that have been logged by the kernel packet filter"; longDescription = '' libnetfilter_log is a userspace library providing interface to packets diff --git a/pkgs/development/libraries/libnetfilter_queue/default.nix b/pkgs/development/libraries/libnetfilter_queue/default.nix index 7a079616627..7dafcd42223 100644 --- a/pkgs/development/libraries/libnetfilter_queue/default.nix +++ b/pkgs/development/libraries/libnetfilter_queue/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libmnl, libnfnetlink }: +{ lib, stdenv, fetchurl, pkg-config, libmnl, libnfnetlink }: stdenv.mkDerivation rec { version = "1.0.5"; @@ -9,10 +9,10 @@ stdenv.mkDerivation rec { sha256 = "1xdra6i4p8jkv943ygjw646qx8df27f7p5852kc06vjx608krzzr"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libmnl libnfnetlink ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.netfilter.org/projects/libnetfilter_queue/"; description = "Userspace API to packets queued by the kernel packet filter"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/libnfc/default.nix b/pkgs/development/libraries/libnfc/default.nix index ed7412d6611..b4daab97388 100644 --- a/pkgs/development/libraries/libnfc/default.nix +++ b/pkgs/development/libraries/libnfc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libusb-compat-0_1, readline }: +{ lib, stdenv, fetchurl, libusb-compat-0_1, readline }: stdenv.mkDerivation { pname = "libnfc"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildInputs = [ libusb-compat-0_1 readline ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Open source library libnfc for Near Field Communication"; license = licenses.gpl3; homepage = "https://github.com/nfc-tools/libnfc"; diff --git a/pkgs/development/libraries/libnfnetlink/default.nix b/pkgs/development/libraries/libnfnetlink/default.nix index ecce38ac23e..4c7b4a5cc2d 100644 --- a/pkgs/development/libraries/libnfnetlink/default.nix +++ b/pkgs/development/libraries/libnfnetlink/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "libnfnetlink-1.0.1"; @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { It is only used by other netfilter.org projects, like the aforementioned ones. ''; homepage = "http://www.netfilter.org/projects/libnfnetlink/index.html"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libnfs/default.nix b/pkgs/development/libraries/libnfs/default.nix index 03a4dbe02d5..4e12553b00b 100644 --- a/pkgs/development/libraries/libnfs/default.nix +++ b/pkgs/development/libraries/libnfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "libnfs"; @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=tautological-compare"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=tautological-compare"; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "NFS client library"; homepage = "https://github.com/sahlberg/libnfs"; license = with licenses; [ lgpl2 bsd2 gpl3 ]; diff --git a/pkgs/development/libraries/libnftnl/default.nix b/pkgs/development/libraries/libnftnl/default.nix index d2bb4f44e8d..44f0f8d62ec 100644 --- a/pkgs/development/libraries/libnftnl/default.nix +++ b/pkgs/development/libraries/libnftnl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libmnl }: +{ lib, stdenv, fetchurl, pkg-config, libmnl }: stdenv.mkDerivation rec { version = "1.1.9"; @@ -9,10 +9,10 @@ stdenv.mkDerivation rec { sha256 = "16jbp4fs5dz2yf4c3bl1sb48x9x9wi1chv39zwmfgya1k9pimcp9"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libmnl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A userspace library providing a low-level netlink API to the in-kernel nf_tables subsystem"; homepage = "http://netfilter.org/projects/libnftnl"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/libngspice/default.nix b/pkgs/development/libraries/libngspice/default.nix index 84bd9b33e79..72fbcd1ab08 100644 --- a/pkgs/development/libraries/libngspice/default.nix +++ b/pkgs/development/libraries/libngspice/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, bison, flex, fftw}: +{lib, stdenv, fetchurl, bison, flex, fftw}: # Note that this does not provide the ngspice command-line utility. For that see # the ngspice derivation. @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-ngshared" "--enable-xspice" "--enable-cider" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "The Next Generation Spice (Electronic Circuit Simulator)"; homepage = "http://ngspice.sourceforge.net"; license = with licenses; [ bsd3 gpl2Plus lgpl2Plus ]; # See https://sourceforge.net/p/ngspice/ngspice/ci/master/tree/COPYING diff --git a/pkgs/development/libraries/libnice/default.nix b/pkgs/development/libraries/libnice/default.nix index e7b01ca29cb..7c5043165f9 100644 --- a/pkgs/development/libraries/libnice/default.nix +++ b/pkgs/development/libraries/libnice/default.nix @@ -1,9 +1,9 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , meson , ninja -, pkgconfig +, pkg-config , python3 , gobject-introspection , gtk-doc @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config python3 gobject-introspection @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { # see https://github.com/NixOS/nixpkgs/pull/53293#issuecomment-453739295 doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "GLib ICE implementation"; longDescription = '' Libnice is an implementation of the IETF's Interactice Connectivity diff --git a/pkgs/development/libraries/libnih/default.nix b/pkgs/development/libraries/libnih/default.nix index 0c38a9c17d7..fbe01bf4062 100644 --- a/pkgs/development/libraries/libnih/default.nix +++ b/pkgs/development/libraries/libnih/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, dbus, expat }: +{ lib, stdenv, fetchurl, pkg-config, dbus, expat }: let version = "1.0.3"; in @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "01glc6y7z1g726zwpvp2zm79pyb37ki729jkh45akh35fpgp4xc9"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ dbus expat ]; doCheck = false; # fails 1 of 17 test @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "A small library for C application development"; homepage = "https://launchpad.net/libnih"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libnixxml/default.nix b/pkgs/development/libraries/libnixxml/default.nix index 5741d4cb5b8..abbffcf0f94 100644 --- a/pkgs/development/libraries/libnixxml/default.nix +++ b/pkgs/development/libraries/libnixxml/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, autoreconfHook, pkgconfig, libxml2, gd, glib, getopt, libxslt, nix }: +{ fetchFromGitHub, lib, stdenv, autoreconfHook, pkg-config, libxml2, gd, glib, getopt, libxslt, nix }: stdenv.mkDerivation { name = "libnixxml"; @@ -11,13 +11,13 @@ stdenv.mkDerivation { configureFlags = [ "--with-gd" "--with-glib" ]; CFLAGS = "-Wall"; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ pkgconfig libxml2 gd.dev glib getopt libxslt nix ]; + buildInputs = [ pkg-config libxml2 gd.dev glib getopt libxslt nix ]; doCheck = false; postPatch = '' ./bootstrap ''; - meta = with stdenv.lib; { + meta = with lib; { description = "XML-based Nix-friendly data integration library"; homepage = https://github.com/svanderburg/libnixxml; license = licenses.mit; diff --git a/pkgs/development/libraries/libnotify/default.nix b/pkgs/development/libraries/libnotify/default.nix index 34d8d800c38..29b37164228 100644 --- a/pkgs/development/libraries/libnotify/default.nix +++ b/pkgs/development/libraries/libnotify/default.nix @@ -1,8 +1,8 @@ -{ stdenv +{ lib, stdenv , fetchurl , meson , ninja -, pkgconfig +, pkg-config , libxslt , docbook-xsl-ns , glib @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0qa7cx6ra5hwqnxw95b9svgjg5q6ynm8y843iqjszxvds5z53h36"; }; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { gobject-introspection meson ninja - pkgconfig + pkg-config libxslt docbook-xsl-ns ]; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://developer.gnome.org/notification-spec/"; description = "A library that sends desktop notifications to a notification daemon"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libnova/default.nix b/pkgs/development/libraries/libnova/default.nix index 8cdbdbd747a..f6a8d01ab84 100644 --- a/pkgs/development/libraries/libnova/default.nix +++ b/pkgs/development/libraries/libnova/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoreconfHook }: +{ lib, stdenv, fetchgit, autoreconfHook }: stdenv.mkDerivation rec { pname = "libnova"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { autoreconfHook ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Celestial Mechanics, Astrometry and Astrodynamics Library"; homepage = "http://libnova.sf.net"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/libnsl/default.nix b/pkgs/development/libraries/libnsl/default.nix index 76aa3c99e33..ac4c6bf9ad3 100644 --- a/pkgs/development/libraries/libnsl/default.nix +++ b/pkgs/development/libraries/libnsl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, libtirpc, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, libtirpc, pkg-config }: stdenv.mkDerivation rec { pname = "libnsl"; @@ -11,10 +11,10 @@ stdenv.mkDerivation rec { sha256 = "1dayj5i4bh65gn7zkciacnwv2a0ghm6nn58d78rsi4zby4lyj5w5"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libtirpc ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Client interface library for NIS(YP) and NIS+"; homepage = "https://github.com/thkukuk/libnsl"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libnxml/default.nix b/pkgs/development/libraries/libnxml/default.nix index dc5e8dfc55e..84617001143 100644 --- a/pkgs/development/libraries/libnxml/default.nix +++ b/pkgs/development/libraries/libnxml/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, curl}: +{lib, stdenv, fetchurl, curl}: stdenv.mkDerivation { name = "libnxml-0.18.3"; @@ -13,9 +13,9 @@ stdenv.mkDerivation { meta = { homepage = "https://www.autistici.org/bakunin/libnxml/"; description = "C library for parsing, writing and creating XML 1.0 and 1.1 files or streams"; - license = stdenv.lib.licenses.lgpl2; + license = lib.licenses.lgpl2; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.viric ]; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.viric ]; }; } diff --git a/pkgs/development/libraries/liboauth/default.nix b/pkgs/development/libraries/liboauth/default.nix index c816bdc90e5..caab0a83fcf 100644 --- a/pkgs/development/libraries/liboauth/default.nix +++ b/pkgs/development/libraries/liboauth/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, nss, nspr, pkgconfig }: +{ fetchurl, lib, stdenv, nss, nspr, pkg-config }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ nss nspr ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { --replace "-lnss3" "-L${nss.out}/lib -lnss3" ''; - meta = with stdenv.lib; { + meta = with lib; { platforms = platforms.linux; description = "C library implementing the OAuth secure authentication protocol"; homepage = "http://liboauth.sourceforge.net/"; diff --git a/pkgs/development/libraries/libodfgen/default.nix b/pkgs/development/libraries/libodfgen/default.nix index 1723219e859..b891c320e86 100644 --- a/pkgs/development/libraries/libodfgen/default.nix +++ b/pkgs/development/libraries/libodfgen/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, boost, pkgconfig, cppunit, zlib, libwpg, libwpd, librevenge}: +{lib, stdenv, fetchurl, boost, pkg-config, cppunit, zlib, libwpg, libwpd, librevenge}: let s = # Generated upstream information rec { @@ -9,7 +9,7 @@ let url="mirror://sourceforge/project/libwpd/libodfgen/libodfgen-0.1.7/libodfgen-0.1.7.tar.xz"; sha256="0cdq48wlpp8m0qmndybv64r0m4vh0qsqx69cn6ms533cjlgljgij"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ boost cppunit zlib libwpg libwpd librevenge ]; @@ -22,9 +22,9 @@ stdenv.mkDerivation { }; meta = { inherit (s) version; - description = ''A base library for generating ODF documents''; - license = stdenv.lib.licenses.mpl20 ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; + description = "A base library for generating ODF documents"; + license = lib.licenses.mpl20 ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libofa/default.nix b/pkgs/development/libraries/libofa/default.nix index c2402338034..c78aa3f617e 100644 --- a/pkgs/development/libraries/libofa/default.nix +++ b/pkgs/development/libraries/libofa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, expat, curl, fftw }: +{ lib, stdenv, fetchurl, expat, curl, fftw }: let version = "0.9.3"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ expat curl fftw ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://code.google.com/archive/p/musicip-libofa/"; description = "Library Open Fingerprint Architecture"; longDescription = '' diff --git a/pkgs/development/libraries/libofx/default.nix b/pkgs/development/libraries/libofx/default.nix index 692bddeab7d..10197bd8db0 100644 --- a/pkgs/development/libraries/libofx/default.nix +++ b/pkgs/development/libraries/libofx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, opensp, pkgconfig, libxml2, curl +{ lib, stdenv, fetchFromGitHub, opensp, pkg-config, libxml2, curl , autoconf, automake, libtool, gengetopt, libiconv }: stdenv.mkDerivation rec { @@ -14,14 +14,14 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; configureFlags = [ "--with-opensp-includes=${opensp}/include/OpenSP" ]; - nativeBuildInputs = [ pkgconfig libtool autoconf automake gengetopt ]; - buildInputs = [ opensp libxml2 curl ] ++ stdenv.lib.optional stdenv.isDarwin libiconv; + nativeBuildInputs = [ pkg-config libtool autoconf automake gengetopt ]; + buildInputs = [ opensp libxml2 curl ] ++ lib.optional stdenv.isDarwin libiconv; - meta = { + meta = { description = "Opensource implementation of the Open Financial eXchange specification"; homepage = "http://libofx.sourceforge.net/"; license = "LGPL"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/libogg/default.nix b/pkgs/development/libraries/libogg/default.nix index 50950a15a87..83555ccab8c 100644 --- a/pkgs/development/libraries/libogg/default.nix +++ b/pkgs/development/libraries/libogg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch }: +{ lib, stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { name = "libogg-1.3.4"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; - patches = stdenv.lib.optionals stdenv.isDarwin [ + patches = lib.optionals stdenv.isDarwin [ # Fix unsigned typedefs on darwin. Remove with the next release https://github.com/xiph/ogg/pull/64 (fetchpatch { url = "https://github.com/xiph/ogg/commit/c8fca6b4a02d695b1ceea39b330d4406001c03ed.patch"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }) ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Media container library to manipulate Ogg files"; longDescription = '' Library to work with Ogg multimedia container format. diff --git a/pkgs/development/libraries/liboggz/default.nix b/pkgs/development/libraries/liboggz/default.nix index 07613f0564b..15856c0262c 100644 --- a/pkgs/development/libraries/liboggz/default.nix +++ b/pkgs/development/libraries/liboggz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libogg, pkgconfig }: +{ lib, stdenv, fetchurl, libogg, pkg-config }: stdenv.mkDerivation rec { name = "liboggz-1.1.1"; @@ -10,9 +10,9 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libogg ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://xiph.org/oggz/"; description = "A C library and tools for manipulating with Ogg files and streams"; longDescription = '' diff --git a/pkgs/development/libraries/liboil/default.nix b/pkgs/development/libraries/liboil/default.nix index 22adceccecf..8d929975815 100644 --- a/pkgs/development/libraries/liboil/default.nix +++ b/pkgs/development/libraries/liboil/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig }: +{lib, stdenv, fetchurl, pkg-config }: stdenv.mkDerivation rec { name = "liboil-0.3.17"; @@ -13,16 +13,16 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; # oil-bugreport - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; # fix "argb_paint_i386.c:53:Incorrect register `%rax' used with `l' suffix" # errors - configureFlags = stdenv.lib.optional stdenv.isDarwin "--build=x86_64"; + configureFlags = lib.optional stdenv.isDarwin "--build=x86_64"; # fixes a cast in inline asm: easier than patching - buildFlags = stdenv.lib.optional stdenv.isDarwin "CFLAGS=-fheinous-gnu-extensions"; + buildFlags = lib.optional stdenv.isDarwin "CFLAGS=-fheinous-gnu-extensions"; - meta = with stdenv.lib; { + meta = with lib; { description = "A library of simple functions that are optimized for various CPUs"; homepage = "https://liboil.freedesktop.org"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/libomxil-bellagio/default.nix b/pkgs/development/libraries/libomxil-bellagio/default.nix index 854c2732c12..5e3b0c6798a 100644 --- a/pkgs/development/libraries/libomxil-bellagio/default.nix +++ b/pkgs/development/libraries/libomxil-bellagio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "libomxil-bellagio"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; configureFlags = - stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "ac_cv_func_malloc_0_nonnull=yes" ]; + lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "ac_cv_func_malloc_0_nonnull=yes" ]; patches = [ ./fedora-fixes.patch ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { # developed anymore. Alternatively, gcc7Stdenv could be used. NIX_CFLAGS_COMPILE = "-Wno-error=array-bounds -Wno-error=stringop-overflow=8"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://sourceforge.net/projects/omxil/"; description = "An opensource implementation of the Khronos OpenMAX Integration Layer API to access multimedia components"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/liboop/default.nix b/pkgs/development/libraries/liboop/default.nix index 6438fd5eb32..5d849ebe1ca 100644 --- a/pkgs/development/libraries/liboop/default.nix +++ b/pkgs/development/libraries/liboop/default.nix @@ -1,8 +1,8 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation { name = "liboop-1.0"; - + src = fetchurl { url = "http://download.ofb.net/liboop/liboop.tar.gz"; sha256 = "34d83c6e0f09ee15cb2bc3131e219747c3b612bb57cf7d25318ab90da9a2d97c"; @@ -12,6 +12,6 @@ stdenv.mkDerivation { description = "Event loop library"; homepage = "http://liboop.ofb.net/"; license = "LGPL"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libopcodes/default.nix b/pkgs/development/libraries/libopcodes/default.nix index 8db034683dc..e448d225b99 100644 --- a/pkgs/development/libraries/libopcodes/default.nix +++ b/pkgs/development/libraries/libopcodes/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages +{ lib, stdenv, buildPackages , autoreconfHook, bison, binutils-unwrapped , libiberty, libbfd }: @@ -34,7 +34,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A library from binutils for manipulating machine code"; homepage = "https://www.gnu.org/software/binutils/"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/libopenaptx/default.nix b/pkgs/development/libraries/libopenaptx/default.nix index 5b02d70f683..9cc57d1a465 100644 --- a/pkgs/development/libraries/libopenaptx/default.nix +++ b/pkgs/development/libraries/libopenaptx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "libopenaptx"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Audio Processing Technology codec (aptX)"; license = licenses.lgpl21Plus; homepage = "https://github.com/pali/libopenaptx"; diff --git a/pkgs/development/libraries/liboping/default.nix b/pkgs/development/libraries/liboping/default.nix index 956538b7624..c309c70e3d3 100644 --- a/pkgs/development/libraries/liboping/default.nix +++ b/pkgs/development/libraries/liboping/default.nix @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses perl ]; - configureFlags = stdenv.lib.optional (perl == null) "--with-perl-bindings=no"; + configureFlags = lib.optional (perl == null) "--with-perl-bindings=no"; - meta = with stdenv.lib; { + meta = with lib; { description = "C library to generate ICMP echo requests (a.k.a. ping packets)"; longDescription = '' liboping is a C library to generate ICMP echo requests, better known as diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix index e8d3682b8b3..51179ecb9a0 100644 --- a/pkgs/development/libraries/libopus/default.nix +++ b/pkgs/development/libraries/libopus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , fixedPoint ? false, withCustomModes ? true }: let @@ -15,14 +15,14 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; - configureFlags = stdenv.lib.optional fixedPoint "--enable-fixed-point" - ++ stdenv.lib.optional withCustomModes "--enable-custom-modes"; + configureFlags = lib.optional fixedPoint "--enable-fixed-point" + ++ lib.optional withCustomModes "--enable-custom-modes"; doCheck = !stdenv.isi686; # test_unit_LPC_inv_pred_gain fails - meta = with stdenv.lib; { + meta = with lib; { description = "Open, royalty-free, highly versatile audio codec"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; homepage = "https://www.opus-codec.org/"; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libopusenc/default.nix b/pkgs/development/libraries/libopusenc/default.nix index 989dfc517f0..c2d77185e69 100644 --- a/pkgs/development/libraries/libopusenc/default.nix +++ b/pkgs/development/libraries/libopusenc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libopus }: +{ lib, stdenv, fetchurl, pkg-config, libopus }: let version = "0.2.1"; @@ -16,10 +16,10 @@ stdenv.mkDerivation { doCheck = true; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libopus ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for encoding .opus audio files and live streams"; license = licenses.bsd3; homepage = "https://www.opus-codec.org/"; diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix index 6e751253594..a6b17016719 100644 --- a/pkgs/development/libraries/libosinfo/default.nix +++ b/pkgs/development/libraries/libosinfo/default.nix @@ -1,7 +1,7 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch -, pkgconfig +, pkg-config , meson , ninja , gettext @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; nativeBuildInputs = [ - pkgconfig + pkg-config meson ninja vala @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "GObject based library API for managing information about operating systems, hypervisors and the (virtual) hardware devices they can support"; homepage = "https://libosinfo.org/"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/libosmium/default.nix b/pkgs/development/libraries/libosmium/default.nix index 10e6d61d156..c5b801f5d47 100644 --- a/pkgs/development/libraries/libosmium/default.nix +++ b/pkgs/development/libraries/libosmium/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, protozero, expat, zlib, bzip2, boost }: +{ lib, stdenv, fetchFromGitHub, cmake, protozero, expat, zlib, bzip2, boost }: stdenv.mkDerivation rec { pname = "libosmium"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast and flexible C++ library for working with OpenStreetMap data"; homepage = "https://osmcode.org/libosmium/"; license = licenses.boost; diff --git a/pkgs/development/libraries/libosmpbf/default.nix b/pkgs/development/libraries/libosmpbf/default.nix index d1f6ea5c2ea..1cbfe44ef4e 100644 --- a/pkgs/development/libraries/libosmpbf/default.nix +++ b/pkgs/development/libraries/libosmpbf/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, protobuf}: +{lib, stdenv, fetchurl, protobuf}: stdenv.mkDerivation { name = "libosmpbf-1.3.3"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/scrosby/OSM-binary"; description = "C library to read and write OpenStreetMap PBF files"; - license = stdenv.lib.licenses.lgpl3; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.lgpl3; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libossp-uuid/default.nix b/pkgs/development/libraries/libossp-uuid/default.nix index 15b6da0ac5b..824dac3a2f5 100644 --- a/pkgs/development/libraries/libossp-uuid/default.nix +++ b/pkgs/development/libraries/libossp-uuid/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: let version = "1.6.2"; in @@ -13,11 +13,11 @@ stdenv.mkDerivation { configureFlags = [ "ac_cv_va_copy=yes" - ] ++ stdenv.lib.optional stdenv.isFreeBSD "--with-pic"; + ] ++ lib.optional stdenv.isFreeBSD "--with-pic"; patches = [ ./shtool.patch ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.ossp.org/pkg/lib/uuid/"; description = "OSSP uuid ISO-C and C++ shared library"; longDescription = diff --git a/pkgs/development/libraries/libotr/default.nix b/pkgs/development/libraries/libotr/default.nix index 10619f9682b..7c2a2b9a6b9 100644 --- a/pkgs/development/libraries/libotr/default.nix +++ b/pkgs/development/libraries/libotr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libgcrypt, autoreconfHook }: +{ lib, stdenv, fetchurl, libgcrypt, autoreconfHook }: stdenv.mkDerivation rec { name = "libotr-4.1.1"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; propagatedBuildInputs = [ libgcrypt ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.cypherpunks.ca/otr/"; repositories.git = "git://git.code.sf.net/p/otr/libotr"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libow/default.nix b/pkgs/development/libraries/libow/default.nix index d7e83e7a9e3..e4a8d95f4b0 100644 --- a/pkgs/development/libraries/libow/default.nix +++ b/pkgs/development/libraries/libow/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, libtool }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, libtool }: stdenv.mkDerivation rec { version = "3.2p4"; @@ -11,9 +11,9 @@ stdenv.mkDerivation rec { sha256 = "0dln1ar7bxwhpi36sccmpwapy7iz4j097rbf02mgn42lw5vrcg3s"; }; - nativeBuildInputs = [ autoconf automake pkgconfig ]; + nativeBuildInputs = [ autoconf automake pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { description = "1-Wire File System full library"; homepage = "https://owfs.org/"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/libowfat/default.nix b/pkgs/development/libraries/libowfat/default.nix index 06871158609..14270a36ec5 100644 --- a/pkgs/development/libraries/libowfat/default.nix +++ b/pkgs/development/libraries/libowfat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "libowfat-0.32"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" ]; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A GPL reimplementation of libdjb"; homepage = "https://www.fefe.de/libowfat/"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/libp11/default.nix b/pkgs/development/libraries/libp11/default.nix index a1e6d05440c..eb577a7f5a1 100644 --- a/pkgs/development/libraries/libp11/default.nix +++ b/pkgs/development/libraries/libp11/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, libtool, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, libtool, pkg-config , openssl }: stdenv.mkDerivation rec { @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { "--with-enginesdir=${placeholder "out"}/lib/engines" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig libtool ]; + nativeBuildInputs = [ autoreconfHook pkg-config libtool ]; buildInputs = [ openssl ]; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Small layer on top of PKCS#11 API to make PKCS#11 implementations easier"; homepage = "https://github.com/OpenSC/libp11"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/libpam-wrapper/default.nix b/pkgs/development/libraries/libpam-wrapper/default.nix index f8359cded93..7d026eb5a09 100644 --- a/pkgs/development/libraries/libpam-wrapper/default.nix +++ b/pkgs/development/libraries/libpam-wrapper/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchgit , cmake , linux-pam @@ -18,12 +18,12 @@ stdenv.mkDerivation rec { sha256 = "00mqhsashx7njrvxz085d0b88nizhdy7m3x17ip5yhvwsl63km6p"; }; - nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional enablePython [ python ]; + nativeBuildInputs = [ cmake ] ++ lib.optional enablePython [ python ]; # We must use linux-pam, using openpam will result in broken fprintd. buildInputs = [ linux-pam ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Wrapper for testing PAM modules"; homepage = "https://cwrap.org/pam_wrapper.html"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/libpaper/default.nix b/pkgs/development/libraries/libpaper/default.nix index d7863e29d58..b9372ba1d40 100644 --- a/pkgs/development/libraries/libpaper/default.nix +++ b/pkgs/development/libraries/libpaper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook }: +{ lib, stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { version = "1.1.28"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "Library for handling paper characteristics"; homepage = "http://packages.debian.org/unstable/source/libpaper"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libpar2/default.nix b/pkgs/development/libraries/libpar2/default.nix index 9447b83af17..625e780d192 100644 --- a/pkgs/development/libraries/libpar2/default.nix +++ b/pkgs/development/libraries/libpar2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libsigcxx }: +{ lib, stdenv, fetchurl, pkg-config, libsigcxx }: let version = "0.4"; in @@ -11,17 +11,17 @@ stdenv.mkDerivation rec { sha256 = "1m4ncws1h03zq7zyqbaymvjzzbh1d3lc4wb1aksrdf0ync76yv9i"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsigcxx ]; patches = [ ./libpar2-0.4-external-verification.patch ]; - CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11"; + CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11"; meta = { homepage = "http://parchive.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; description = "A library for using Parchives (parity archive volume sets)"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix index 604fd3ee446..0b30bf6c2b0 100644 --- a/pkgs/development/libraries/libpcap/default.nix +++ b/pkgs/development/libraries/libpcap/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, flex, bison, bluez, pkgconfig, withBluez ? false }: +{ lib, stdenv, fetchurl, flex, bison, bluez, pkg-config, withBluez ? false }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "libpcap"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ flex bison ] - ++ optionals withBluez [ bluez.dev pkgconfig ]; + ++ optionals withBluez [ bluez.dev pkg-config ]; # We need to force the autodetection because detection doesn't # work in pure build environments. diff --git a/pkgs/development/libraries/libpeas/default.nix b/pkgs/development/libraries/libpeas/default.nix index 1d360b45052..a8ef9e2f9bb 100644 --- a/pkgs/development/libraries/libpeas/default.nix +++ b/pkgs/development/libraries/libpeas/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gnome3 +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gettext, gnome3 , glib, gtk3, gobject-introspection, python3, ncurses }: @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "05cb7drn6arc4gi02wgsvzibigi2riz5gnfnmlb0zmbfnj9ikna2"; }; - nativeBuildInputs = [ pkgconfig meson ninja gettext gobject-introspection ]; + nativeBuildInputs = [ pkg-config meson ninja gettext gobject-introspection ]; buildInputs = [ glib gtk3 ncurses python3 python3.pkgs.pygobject3 ]; propagatedBuildInputs = [ # Required by libpeas-1.0.pc @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A GObject-based plugins engine"; homepage = "https://wiki.gnome.org/Projects/Libpeas"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/libpfm/default.nix b/pkgs/development/libraries/libpfm/default.nix index 63b826258ae..20c4c0a1c6e 100644 --- a/pkgs/development/libraries/libpfm/default.nix +++ b/pkgs/development/libraries/libpfm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , enableShared ? !stdenv.hostPlatform.isStatic }: @@ -20,7 +20,7 @@ stdenv.mkDerivation (rec { NIX_CFLAGS_COMPILE = "-Wno-error"; - meta = with stdenv.lib; { + meta = with lib; { description = "Helper library to program the performance monitoring events"; longDescription = '' This package provides a library, called libpfm4 which is used to @@ -32,7 +32,7 @@ stdenv.mkDerivation (rec { maintainers = [ maintainers.pierron ]; platforms = platforms.linux; }; -} // stdenv.lib.optionalAttrs ( ! enableShared ) +} // lib.optionalAttrs ( ! enableShared ) { CONFIG_PFMLIB_SHARED = "n"; } diff --git a/pkgs/development/libraries/libpgf/default.nix b/pkgs/development/libraries/libpgf/default.nix index 7710c208199..682ff485d65 100644 --- a/pkgs/development/libraries/libpgf/default.nix +++ b/pkgs/development/libraries/libpgf/default.nix @@ -1,29 +1,25 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, dos2unix }: +{ lib, stdenv, fetchzip, autoreconfHook }: -with stdenv.lib; - -let - version = "6.14.12"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "libpgf"; - inherit version; + version = "7.21.2"; - src = fetchurl { - url = "mirror://sourceforge/libpgf/libpgf-src-${version}.tar.gz"; - sha256 = "1ssqjbh6l5jc04f67n47m9bqcigl46c6lgyabyi6cabnh1frk9dx"; + src = fetchzip { + url = "mirror://sourceforge/${pname}/${pname}/${version}/${pname}.zip"; + sha256 = "0l1j5b1d02jn27miggihlppx656i0pc70cn6x89j1rpj33zn0g9r"; }; - buildInputs = [ autoconf automake libtool dos2unix ]; - - preConfigure = "dos2unix configure.ac; sh autogen.sh"; + nativeBuildInputs = [ autoreconfHook ]; -# configureFlags = optional static "--enable-static --disable-shared"; + autoreconfPhase = '' + mv README.txt README + sh autogen.sh + ''; meta = { homepage = "https://www.libpgf.org/"; description = "Progressive Graphics Format"; - license = stdenv.lib.licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.lgpl21Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libphonenumber/default.nix b/pkgs/development/libraries/libphonenumber/default.nix index 918c663dfb4..2ff59e055f9 100644 --- a/pkgs/development/libraries/libphonenumber/default.nix +++ b/pkgs/development/libraries/libphonenumber/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, gmock, boost, pkgconfig, protobuf, icu }: +{ lib, stdenv, fetchFromGitHub, cmake, gmock, boost, pkg-config, protobuf, icu }: stdenv.mkDerivation rec { pname = "phonenumber"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake gmock - pkgconfig + pkg-config ]; buildInputs = [ @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { checkPhase = "./libphonenumber_test"; - meta = with stdenv.lib; { + meta = with lib; { description = "Google's i18n library for parsing and using phone numbers"; license = licenses.asl20; maintainers = with maintainers; [ illegalprime ]; diff --git a/pkgs/development/libraries/libpinyin/default.nix b/pkgs/development/libraries/libpinyin/default.nix index 63035f74ea0..2d802cf28d7 100644 --- a/pkgs/development/libraries/libpinyin/default.nix +++ b/pkgs/development/libraries/libpinyin/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, fetchFromGitHub +{ lib, stdenv, fetchurl, fetchFromGitHub , autoreconfHook , glib , db -, pkgconfig +, pkg-config }: let @@ -26,9 +26,9 @@ stdenv.mkDerivation rec { tar -xzf ${modelData} -C $sourceRoot/data ''; - nativeBuildInputs = [ autoreconfHook glib db pkgconfig ]; + nativeBuildInputs = [ autoreconfHook glib db pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for intelligent sentence-based Chinese pinyin input method"; homepage = "https://sourceforge.net/projects/libpinyin"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/libpipeline/default.nix b/pkgs/development/libraries/libpipeline/default.nix index be3ab953c0a..b5310c3cb8c 100644 --- a/pkgs/development/libraries/libpipeline/default.nix +++ b/pkgs/development/libraries/libpipeline/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "libpipeline-1.5.3"; @@ -8,9 +8,9 @@ stdenv.mkDerivation rec { sha256 = "1c5dl017xil2ssb6a5vg927bnsbc9vymfgi9ahvqbb8gypx0igsx"; }; - patches = stdenv.lib.optionals stdenv.isDarwin [ ./fix-on-osx.patch ]; + patches = lib.optionals stdenv.isDarwin [ ./fix-on-osx.patch ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://libpipeline.nongnu.org"; description = "C library for manipulating pipelines of subprocesses in a flexible and convenient way"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libplacebo/default.nix b/pkgs/development/libraries/libplacebo/default.nix index 956b34fd93d..94301b34fbc 100644 --- a/pkgs/development/libraries/libplacebo/default.nix +++ b/pkgs/development/libraries/libplacebo/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitLab , fetchpatch , meson @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { "-Dvulkan-registry=${vulkan-headers}/share/vulkan/registry/vk.xml" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Reusable library for GPU-accelerated video/image rendering primitives"; longDescription = '' Reusable library for GPU-accelerated image/view processing primitives and diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/development/libraries/libplist/default.nix index 1f311dda9f0..c8e9ddb82c5 100644 --- a/pkgs/development/libraries/libplist/default.nix +++ b/pkgs/development/libraries/libplist/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoreconfHook, fetchFromGitHub, pkgconfig, enablePython ? false, python, glib }: +{ lib, stdenv, autoreconfHook, fetchFromGitHub, pkg-config, enablePython ? false, python, glib }: stdenv.mkDerivation rec { pname = "libplist"; @@ -11,27 +11,27 @@ stdenv.mkDerivation rec { sha256 = "1vxhpjxniybqsg5wcygmdmr5dv7p2zb34dqnd3bi813rnnzsdjm6"; }; - outputs = ["bin" "dev" "out" ] ++ stdenv.lib.optional enablePython "py"; + outputs = ["bin" "dev" "out" ] ++ lib.optional enablePython "py"; nativeBuildInputs = [ - pkgconfig + pkg-config autoreconfHook - ] ++ stdenv.lib.optionals enablePython [ + ] ++ lib.optionals enablePython [ python python.pkgs.cython ]; - configureFlags = stdenv.lib.optionals (!enablePython) [ + configureFlags = lib.optionals (!enablePython) [ "--without-cython" ]; propagatedBuildInputs = [ glib ]; - postFixup = stdenv.lib.optionalString enablePython '' + postFixup = lib.optionalString enablePython '' moveToOutput "lib/${python.libPrefix}" "$py" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A library to handle Apple Property List format in binary or XML"; homepage = "https://github.com/libimobiledevice/libplist"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/libpng/12.nix b/pkgs/development/libraries/libpng/12.nix index 7199695ae74..bf3d5168d6c 100644 --- a/pkgs/development/libraries/libpng/12.nix +++ b/pkgs/development/libraries/libpng/12.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib }: +{ lib, stdenv, fetchurl, zlib }: assert stdenv.hostPlatform == stdenv.buildPlatform -> zlib != null; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { postInstall = ''mv "$out/bin" "$dev/bin"''; - meta = with stdenv.lib; { + meta = with lib; { description = "The official reference implementation for the PNG file format"; homepage = "http://www.libpng.org/pub/png/libpng.html"; license = licenses.libpng; diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index 489007bc417..aeb3fcba06f 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, apngSupport ? true }: +{ lib, stdenv, fetchurl, zlib, apngSupport ? true }: assert zlib != null; @@ -8,7 +8,7 @@ let url = "mirror://sourceforge/libpng-apng/libpng-${patchVersion}-apng.patch.gz"; sha256 = "1dh0250mw9b2hx7cdmnb2blk7ddl49n6vx8zz7jdmiwxy38v4fw2"; }; - whenPatched = stdenv.lib.optionalString apngSupport; + whenPatched = lib.optionalString apngSupport; in stdenv.mkDerivation rec { name = "libpng" + whenPatched "-apng" + "-${version}"; @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { passthru = { inherit zlib; }; - meta = with stdenv.lib; { + meta = with lib; { description = "The official reference implementation for the PNG file format" + whenPatched " with animation patch"; homepage = "http://www.libpng.org/pub/png/libpng.html"; license = licenses.libpng2; diff --git a/pkgs/development/libraries/libpointmatcher/default.nix b/pkgs/development/libraries/libpointmatcher/default.nix index 3a90f28e757..31fb5cb05ba 100644 --- a/pkgs/development/libraries/libpointmatcher/default.nix +++ b/pkgs/development/libraries/libpointmatcher/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, eigen, boost, libnabo }: +{ lib, stdenv, fetchFromGitHub, cmake, eigen, boost, libnabo }: stdenv.mkDerivation rec { pname = "libpointmatcher"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ./utest/utest --path ../examples/data/ ''; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "An \"Iterative Closest Point\" library for 2-D/3-D mapping in robotic"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libportal/default.nix b/pkgs/development/libraries/libportal/default.nix index 0f31115f50f..5eacdaa8f3c 100644 --- a/pkgs/development/libraries/libportal/default.nix +++ b/pkgs/development/libraries/libportal/default.nix @@ -1,9 +1,9 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch , meson , ninja -, pkgconfig +, pkg-config , gtk-doc , docbook-xsl-nons , docbook_xml_dtd_45 @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gtk-doc docbook-xsl-nons docbook_xml_dtd_45 @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { glib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Flatpak portal library"; homepage = "https://github.com/flatpak/libportal"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix index 7fcc8c58c1c..afd1a6365b4 100644 --- a/pkgs/development/libraries/libproxy/default.nix +++ b/pkgs/development/libraries/libproxy/default.nix @@ -1,6 +1,6 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub -, pkgconfig +, pkg-config , cmake , zlib , fetchpatch @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "py3" ]; nativeBuildInputs = [ - pkgconfig + pkg-config cmake makeWrapper ]; @@ -82,21 +82,21 @@ stdenv.mkDerivation rec { sha256 = "0pdy9sw49lxpaiwq073cisk0npir5bkch70nimdmpszxwp3fv1d8"; }) - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ (fetchpatch { url = "https://github.com/libproxy/libproxy/commit/44158f03f8522116758d335688ed840dfcb50ac8.patch"; sha256 = "0axfvb6j7gcys6fkwi9dkn006imhvm3kqr83gpwban8419n0q5v1"; }) ]; - postFixup = stdenv.lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.isLinux '' # config_gnome3 uses the helper to find GNOME proxy settings wrapProgram $out/libexec/pxgsettings --prefix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" ''; doCheck = false; # fails 1 out of 10 tests - meta = with stdenv.lib; { + meta = with lib; { platforms = platforms.linux ++ platforms.darwin; license = licenses.lgpl21; homepage = "http://libproxy.github.io/libproxy/"; diff --git a/pkgs/development/libraries/libpseudo/default.nix b/pkgs/development/libraries/libpseudo/default.nix index e08feaddc60..f0638150573 100644 --- a/pkgs/development/libraries/libpseudo/default.nix +++ b/pkgs/development/libraries/libpseudo/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, glib, ncurses}: +{lib, stdenv, fetchurl, pkg-config, glib, ncurses}: stdenv.mkDerivation rec { name = "libpseudo-1.2.0"; @@ -16,10 +16,10 @@ stdenv.mkDerivation rec { mkdir -p $out/lib ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib ncurses ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://libpseudo.sourceforge.net/"; description = "Simple, thread-safe messaging between threads"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index 67e87a5faab..e68219f6348 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , autoreconfHook , docbook_xsl @@ -8,7 +8,7 @@ , libidn2 , libunistring , libxslt -, pkgconfig +, pkg-config , python3 , valgrind , publicsuffix-list @@ -29,10 +29,10 @@ stdenv.mkDerivation rec { docbook_xml_dtd_43 gtk-doc lzip - pkgconfig + pkg-config python3 libxslt - ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.isDarwin) [ valgrind ]; @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { "--with-psl-distfile=${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat" "--with-psl-file=${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat" "--with-psl-testfile=${publicsuffix-list}/share/publicsuffix/test_psl.txt" - ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.isDarwin) [ "--enable-valgrind-tests" ]; @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "C library for the Publix Suffix List"; longDescription = '' libpsl is a C library for the Publix Suffix List (PSL). A "public suffix" diff --git a/pkgs/development/libraries/libpst/default.nix b/pkgs/development/libraries/libpst/default.nix index e69cc04d6f0..40f6b3b1aee 100644 --- a/pkgs/development/libraries/libpst/default.nix +++ b/pkgs/development/libraries/libpst/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, autoreconfHook, boost, libgsf, - pkgconfig, bzip2, xmlto, gettext, imagemagick, doxygen }: +{ lib, stdenv, fetchurl, autoreconfHook, boost, libgsf, + pkg-config, bzip2, xmlto, gettext, imagemagick, doxygen }: stdenv.mkDerivation rec { name = "libpst-0.6.75"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "11wrf47i3brlxg25wsfz17373q7m5fpjxn2lr41dj252ignqzaac"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ boost libgsf bzip2 xmlto gettext imagemagick doxygen @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.five-ten-sg.com/libpst/"; description = "A library to read PST (MS Outlook Personal Folders) files"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index b61bcd03027..80e6e6fe668 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, mpfr, libxml2, intltool, pkgconfig, doxygen, +{ lib, stdenv, fetchFromGitHub, mpfr, libxml2, intltool, pkg-config, doxygen, autoreconfHook, readline, libiconv, icu, curl, gnuplot, gettext }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; - nativeBuildInputs = [ intltool pkgconfig autoreconfHook doxygen ]; + nativeBuildInputs = [ intltool pkg-config autoreconfHook doxygen ]; buildInputs = [ curl gettext libiconv readline ]; configureFlags = ["--with-readline=${readline.dev}"]; propagatedBuildInputs = [ libxml2 mpfr icu ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { substituteInPlace libqalculate/Calculator-plot.cc \ --replace 'commandline = "gnuplot"' 'commandline = "${gnuplot}/bin/gnuplot"' \ --replace '"gnuplot - ' '"${gnuplot}/bin/gnuplot - ' - '' + stdenv.lib.optionalString stdenv.cc.isClang '' + '' + lib.optionalString stdenv.cc.isClang '' substituteInPlace src/qalc.cc \ --replace 'printf(_("aborted"))' 'printf("%s", _("aborted"))' ''; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { popd ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An advanced calculator library"; homepage = "http://qalculate.github.io"; maintainers = with maintainers; [ gebner ]; diff --git a/pkgs/development/libraries/libqb/default.nix b/pkgs/development/libraries/libqb/default.nix index 244dcf0999b..f5f255b111f 100644 --- a/pkgs/development/libraries/libqb/default.nix +++ b/pkgs/development/libraries/libqb/default.nix @@ -1,19 +1,24 @@ -{ stdenv, fetchurl, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libxml2 }: stdenv.mkDerivation rec { - name = "libqb-0.17.2"; + pname = "libqb"; + version = "2.0.2"; - src = fetchurl { - url = "https://fedorahosted.org/releases/q/u/quarterback/${name}.tar.xz"; - sha256 = "1zpl45p3n6dn1jgbsrrmccrmv2mvp8aqmnl0qxfjf7ymkrj9qhcs"; + src = fetchFromGitHub { + owner = "ClusterLabs"; + repo = pname; + rev = "v${version}"; + sha256 = "1gpfcz84igqncky09hdibxmzapzl37y8914avgq89rsizynj1wsm"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; - meta = with stdenv.lib; { + buildInputs = [ libxml2 ]; + + meta = with lib; { homepage = "https://github.com/clusterlabs/libqb"; description = "A library providing high performance logging, tracing, ipc, and poll"; - license = licenses.lgpl21; + license = licenses.lgpl21Plus; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libqglviewer/default.nix b/pkgs/development/libraries/libqglviewer/default.nix index 0d1da964adb..65d7a83a838 100644 --- a/pkgs/development/libraries/libqglviewer/default.nix +++ b/pkgs/development/libraries/libqglviewer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qmake, qtbase, libGLU, AGL }: +{ lib, stdenv, fetchurl, qmake, qtbase, libGLU, AGL }: stdenv.mkDerivation rec { pname = "libqglviewer"; @@ -11,13 +11,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ qmake ]; buildInputs = [ qtbase libGLU ] - ++ stdenv.lib.optional stdenv.isDarwin AGL; + ++ lib.optional stdenv.isDarwin AGL; + + dontWrapQtApps = true; postPatch = '' cd QGLViewer ''; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ library based on Qt that eases the creation of OpenGL 3D viewers"; homepage = "http://libqglviewer.com"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix index de38e5d3b6e..7bd3fa97029 100644 --- a/pkgs/development/libraries/libqmi/default.nix +++ b/pkgs/development/libraries/libqmi/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, pkg-config, gobject-introspection, glib, python3, libgudev, libmbim }: +{ lib, stdenv, fetchurl, pkg-config, gobject-introspection, glib, python3, libgudev, libmbim }: stdenv.mkDerivation rec { pname = "libqmi"; - version = "1.26.6"; + version = "1.26.8"; src = fetchurl { url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz"; - sha256 = "1fbwz6534q6n4bgabdx4svbgkf4mdyisjh3y51jjd94p22xn66d7"; + sha256 = "sha256-73bclasKBjIaG9Jeh1SJy6Esn2YRl0ygE1zwZ7sgyWA="; }; outputs = [ "out" "dev" "devdoc" ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.freedesktop.org/wiki/Software/libqmi/"; description = "Modem protocol helper library"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libquotient/default.nix b/pkgs/development/libraries/libquotient/default.nix index 84d7c51fd59..10b2451e7c8 100644 --- a/pkgs/development/libraries/libquotient/default.nix +++ b/pkgs/development/libraries/libquotient/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "libquotient"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "quotient-im"; repo = "libQuotient"; rev = version; - sha256 = "sha256-RYEcFClRdAippG0kspNi9QZIzZAuU4++9LOQTZcqpVc="; + sha256 = "sha256-bWqZiRv/mJzw+WY+7dLIzYBu8jhglBqgTjiXyQ1y6IQ="; }; buildInputs = [ qtbase qtmultimedia ]; diff --git a/pkgs/development/libraries/libr3/default.nix b/pkgs/development/libraries/libr3/default.nix index 0584203a581..34ac547f492 100644 --- a/pkgs/development/libraries/libr3/default.nix +++ b/pkgs/development/libraries/libr3/default.nix @@ -1,7 +1,7 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , pcre -, pkgconfig +, pkg-config , check , autoreconfHook }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "09cixbms817p6nb77wz3rxp0znnac8ybycvsrrzgwlbfn58a3zwl"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ check ]; propagatedBuildInputs = [ pcre ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "A high-performance path dispatching library"; homepage = "https://github.com/c9s/r3"; - license = [ stdenv.lib.licenses.mit ]; + license = [ lib.licenses.mit ]; }; } diff --git a/pkgs/development/libraries/libraspberrypi/default.nix b/pkgs/development/libraries/libraspberrypi/default.nix index 664b8d1a7e0..217a83bcebc 100644 --- a/pkgs/development/libraries/libraspberrypi/default.nix +++ b/pkgs/development/libraries/libraspberrypi/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch , cmake @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { "-DVMCS_INSTALL_PREFIX=${placeholder "out"}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Userland tools & libraries for interfacing with Raspberry Pi hardware"; homepage = "https://github.com/raspberrypi/userland"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix index f59f63c38ac..3ff7e725f3d 100644 --- a/pkgs/development/libraries/libraw/default.nix +++ b/pkgs/development/libraries/libraw/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, lcms2, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, lcms2, pkg-config }: stdenv.mkDerivation rec { pname = "libraw"; @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ lcms2 ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)"; homepage = "https://www.libraw.org/"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/libraw1394/default.nix b/pkgs/development/libraries/libraw1394/default.nix index a99e4d22077..7bf99e739f3 100644 --- a/pkgs/development/libraries/libraw1394/default.nix +++ b/pkgs/development/libraries/libraw1394/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "libraw1394-2.1.2"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0z5md84941ky5l7afayx2z6j0sk0mildxbjajq6niznd44ky7i6x"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Library providing direct access to the IEEE 1394 bus through the Linux 1394 subsystem's raw1394 user space interface"; homepage = "https://ieee1394.wiki.kernel.org/index.php/Libraries#libraw1394"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/librdf/raptor.nix b/pkgs/development/libraries/librdf/raptor.nix index ef194bb0b1e..8d1b1f2a0ea 100644 --- a/pkgs/development/libraries/librdf/raptor.nix +++ b/pkgs/development/libraries/librdf/raptor.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxml2, curl }: +{ lib, stdenv, fetchurl, libxml2, curl }: stdenv.mkDerivation rec { name = "raptor-1.4.21"; @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { meta = { description = "The RDF Parser Toolkit"; homepage = "http://librdf.org/raptor"; - license = with stdenv.lib.licenses; [ lgpl21 asl20 ]; - maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = stdenv.lib.platforms.linux; + license = with lib.licenses; [ lgpl21 asl20 ]; + maintainers = [ lib.maintainers.marcweber ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/librdf/raptor2.nix b/pkgs/development/libraries/librdf/raptor2.nix index 4645b5ea0d8..bb8aeefa102 100644 --- a/pkgs/development/libraries/librdf/raptor2.nix +++ b/pkgs/development/libraries/librdf/raptor2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxml2, libxslt }: +{ lib, stdenv, fetchurl, libxml2, libxslt }: stdenv.mkDerivation rec { pname = "raptor2"; @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { meta = { description = "The RDF Parser Toolkit"; homepage = "http://librdf.org/raptor"; - license = with stdenv.lib.licenses; [ lgpl21 asl20 ]; - maintainers = with stdenv.lib.maintainers; [ marcweber ]; - platforms = stdenv.lib.platforms.unix; + license = with lib.licenses; [ lgpl21 asl20 ]; + maintainers = with lib.maintainers; [ marcweber ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/librdf/rasqal.nix b/pkgs/development/libraries/librdf/rasqal.nix index d9b94a668c6..88acc372f7f 100644 --- a/pkgs/development/libraries/librdf/rasqal.nix +++ b/pkgs/development/libraries/librdf/rasqal.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, librdf_raptor2, gmp, pkgconfig, pcre, libxml2, perl }: +{ lib, stdenv, fetchurl, librdf_raptor2, gmp, pkg-config, pcre, libxml2, perl }: stdenv.mkDerivation rec { name = "rasqal-0.9.33"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0z6rrwn4jsagvarg8d5zf0j352kjgi33py39jqd29gbhcnncj939"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gmp pcre libxml2 ]; @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { meta = { description = "Library that handles Resource Description Framework (RDF)"; homepage = "http://librdf.org/rasqal"; - license = with stdenv.lib.licenses; [ lgpl21 asl20 ]; - maintainers = with stdenv.lib.maintainers; [ marcweber ]; - platforms = stdenv.lib.platforms.unix; + license = with lib.licenses; [ lgpl21 asl20 ]; + maintainers = with lib.maintainers; [ marcweber ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/librdf/redland.nix b/pkgs/development/libraries/librdf/redland.nix index a85500d2c6e..731d1cf1868 100644 --- a/pkgs/development/libraries/librdf/redland.nix +++ b/pkgs/development/libraries/librdf/redland.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, openssl, libxslt, perl +{ lib, stdenv, fetchurl, pkg-config, openssl, libxslt, perl , curl, pcre, libxml2, librdf_rasqal, gmp , libmysqlclient, withMysql ? false , postgresql, withPostgresql ? false @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { sha256 = "de1847f7b59021c16bdc72abb4d8e2d9187cd6124d69156f3326dd34ee043681"; }; - nativeBuildInputs = [ perl pkgconfig ]; + nativeBuildInputs = [ perl pkg-config ]; buildInputs = [ openssl libxslt curl pcre libxml2 gmp ] - ++ stdenv.lib.optional withMysql libmysqlclient - ++ stdenv.lib.optional withSqlite sqlite - ++ stdenv.lib.optional withPostgresql postgresql - ++ stdenv.lib.optional withBdb db; + ++ lib.optional withMysql libmysqlclient + ++ lib.optional withSqlite sqlite + ++ lib.optional withPostgresql postgresql + ++ lib.optional withBdb db; propagatedBuildInputs = [ librdf_rasqal ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-threads" ] - ++ stdenv.lib.optionals withBdb [ + ++ lib.optionals withBdb [ "--with-bdb-include=${db.dev}/include" "--with-bdb-lib=${db.out}/lib" ]; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails 1 out of 17 tests with a segmentation fault - meta = with stdenv.lib; { + meta = with lib; { description = "C libraries that provide support for the Resource Description Framework (RDF)"; homepage = "http://librdf.org/"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix index 6e1d0a8ce3c..e960fe8f4b2 100644 --- a/pkgs/development/libraries/libre/default.nix +++ b/pkgs/development/libraries/libre/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, zlib, openssl}: +{lib, stdenv, fetchurl, zlib, openssl}: stdenv.mkDerivation rec { version = "0.6.1"; pname = "libre"; @@ -8,15 +8,15 @@ stdenv.mkDerivation rec { }; buildInputs = [ zlib openssl ]; makeFlags = [ "USE_ZLIB=1" "USE_OPENSSL=1" "PREFIX=$(out)" ] - ++ stdenv.lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}" - ++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.lib.getDev stdenv.cc.libc}" + ++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}" + ++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${lib.getDev stdenv.cc.libc}" ; meta = { description = "A library for real-time communications with async IO support and a complete SIP stack"; homepage = "http://www.creytiv.com/re.html"; - platforms = with stdenv.lib.platforms; linux; - maintainers = with stdenv.lib.maintainers; [raskin]; - license = stdenv.lib.licenses.bsd3; + platforms = with lib.platforms; linux; + maintainers = with lib.maintainers; [raskin]; + license = lib.licenses.bsd3; inherit version; downloadPage = "http://www.creytiv.com/pub/"; updateWalker = true; diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix index 9a2ea6d033e..82761dc3d00 100644 --- a/pkgs/development/libraries/librealsense/default.nix +++ b/pkgs/development/libraries/librealsense/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { cp ../wrappers/python/pyrealsense2/__init__.py $out/${pythonPackages.python.sitePackages}/pyrealsense2 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A cross-platform library for Intel® RealSense™ depth cameras (D400 series and the SR300)"; homepage = "https://github.com/IntelRealSense/librealsense"; license = licenses.asl20; diff --git a/pkgs/development/libraries/libredwg/default.nix b/pkgs/development/libraries/libredwg/default.nix index 71667460e23..5fca199acb0 100644 --- a/pkgs/development/libraries/libredwg/default.nix +++ b/pkgs/development/libraries/libredwg/default.nix @@ -6,17 +6,17 @@ let in stdenv.mkDerivation rec { pname = "libredwg"; - version = "0.10.1.3707"; + version = "0.12"; src = fetchFromGitHub { owner = "LibreDWG"; repo = pname; rev = version; - sha256 = "009n96lx4ahf05ryvm09z0l9956vz94r8pliyb88j0jficl0pxkf"; + sha256 = "0ayhp3ym30hzp5f6dz7mmp9hpxf6a48nx3kq5crcmzycm5fllbn7"; fetchSubmodules = true; }; - nativeBuildInputs = [ autoreconfHook pkg-config texinfo ] + nativeBuildInputs = [ autoreconfHook pkg-config texinfo ] ++ lib.optional enablePython swig; buildInputs = [ pcre2 ] diff --git a/pkgs/development/libraries/librelp/default.nix b/pkgs/development/libraries/librelp/default.nix index 7d0eb7f67dd..8d950d66bd2 100644 --- a/pkgs/development/libraries/librelp/default.nix +++ b/pkgs/development/libraries/librelp/default.nix @@ -1,26 +1,26 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , autoreconfHook , gnutls , openssl -, pkgconfig +, pkg-config , zlib }: stdenv.mkDerivation rec { pname = "librelp"; - version = "1.6.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "rsyslog"; repo = "librelp"; rev = "v${version}"; - sha256 = "132i1b1m7c7hkbxsnpa7n07cbghxjxmcbb8zhgwziaxg4nzxsa6l"; + sha256 = "sha256-nE7YavjZj+nHcTNkcl/xVAaP+9XfHlTEsW18aPO/ABY="; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ gnutls zlib openssl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A reliable logging library"; homepage = "https://www.librelp.com/"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/librem/default.nix b/pkgs/development/libraries/librem/default.nix index 012ac2a46a7..349384b4674 100644 --- a/pkgs/development/libraries/librem/default.nix +++ b/pkgs/development/libraries/librem/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, zlib, openssl, libre}: +{lib, stdenv, fetchurl, zlib, openssl, libre}: stdenv.mkDerivation rec { version = "0.6.0"; pname = "librem"; @@ -10,17 +10,17 @@ stdenv.mkDerivation rec { makeFlags = [ "LIBRE_MK=${libre}/share/re/re.mk" "LIBRE_INC=${libre}/include/re" - ''PREFIX=$(out)'' + "PREFIX=$(out)" ] - ++ stdenv.lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.lib.getDev stdenv.cc.cc}" - ++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.lib.getDev stdenv.cc.libc}" + ++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${lib.getDev stdenv.cc.cc}" + ++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${lib.getDev stdenv.cc.libc}" ; meta = { description = " A library for real-time audio and video processing"; homepage = "http://www.creytiv.com/rem.html"; - platforms = with stdenv.lib.platforms; linux; - maintainers = with stdenv.lib.maintainers; [raskin]; - license = stdenv.lib.licenses.bsd3; + platforms = with lib.platforms; linux; + maintainers = with lib.maintainers; [raskin]; + license = lib.licenses.bsd3; downloadPage = "http://www.creytiv.com/pub/"; updateWalker = true; downloadURLRegexp = "/rem-.*[.]tar[.].*"; diff --git a/pkgs/development/libraries/librep/default.nix b/pkgs/development/libraries/librep/default.nix index bed92477a3f..74c45f00adc 100644 --- a/pkgs/development/libraries/librep/default.nix +++ b/pkgs/development/libraries/librep/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl -, pkgconfig, autoreconfHook +{ lib, stdenv, fetchurl +, pkg-config, autoreconfHook , readline, texinfo , gdbm, gmp, libffi }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "librep"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "1bmcjl1x1rdh514q9z3hzyjmjmwwwkziipjpjsl301bwmiwrd8a8"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ readline texinfo ]; propagatedBuildInputs = [ gdbm gmp libffi ]; diff --git a/pkgs/development/libraries/libresample/default.nix b/pkgs/development/libraries/libresample/default.nix index 80dd4e05b21..0756874b3e7 100644 --- a/pkgs/development/libraries/libresample/default.nix +++ b/pkgs/development/libraries/libresample/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cmake}: +{lib, stdenv, fetchurl, cmake}: let patch = fetchurl { @@ -20,9 +20,9 @@ stdenv.mkDerivation { meta = { description = "A real-time library for sampling rate conversion library"; - license = stdenv.lib.licenses.lgpl2Plus; + license = lib.licenses.lgpl2Plus; homepage = "https://ccrma.stanford.edu/~jos/resample/Free_Resampling_Software.html"; - maintainers = [ stdenv.lib.maintainers.sander ]; - platforms = stdenv.lib.platforms.unix; + maintainers = [ lib.maintainers.sander ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/librest/default.nix b/pkgs/development/libraries/librest/default.nix index e1d7b336273..7b1ff8235aa 100644 --- a/pkgs/development/libraries/librest/default.nix +++ b/pkgs/development/libraries/librest/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, pkgconfig, glib, libsoup, gobject-introspection, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, glib, libsoup, gobject-introspection, gnome3 }: stdenv.mkDerivation rec { pname = "rest"; version = "0.8.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0513aad38e5d3cedd4ae3c551634e3be1b9baaa79775e53b2dba9456f15b01c9"; }; - nativeBuildInputs = [ pkgconfig gobject-introspection ]; + nativeBuildInputs = [ pkg-config gobject-introspection ]; buildInputs = [ glib libsoup ]; configureFlags = [ "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt" ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Helper library for RESTful services"; homepage = "https://wiki.gnome.org/Projects/Librest"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/librevenge/default.nix b/pkgs/development/libraries/librevenge/default.nix index 2c6e792ae8c..1d7754bfcae 100644 --- a/pkgs/development/libraries/librevenge/default.nix +++ b/pkgs/development/libraries/librevenge/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, boost, pkgconfig, cppunit, zlib}: +{lib, stdenv, fetchurl, boost, pkg-config, cppunit, zlib}: let s = # Generated upstream information rec { @@ -9,7 +9,7 @@ let url="mirror://sourceforge/project/libwpd/librevenge/librevenge-0.0.4/librevenge-0.0.4.tar.xz"; sha256="1cj76cz4mqcy2mgv9l5xlc95bypyk8zbq0ls9cswqrs2y0lhfgwk"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ boost cppunit zlib ]; @@ -34,9 +34,9 @@ stdenv.mkDerivation { meta = { inherit (s) version; - description = ''A base library for writing document import filters''; - license = stdenv.lib.licenses.mpl20 ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; + description = "A base library for writing document import filters"; + license = lib.licenses.mpl20 ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/librevisa/default.nix b/pkgs/development/libraries/librevisa/default.nix index b49fb3f7ee7..892bbbbbfc0 100644 --- a/pkgs/development/libraries/librevisa/default.nix +++ b/pkgs/development/libraries/librevisa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libusb1 }: +{ lib, stdenv, fetchurl, pkg-config, libusb1 }: # TODO: add VXI development files, for VXI-11 (TCPIP) support @@ -10,10 +10,10 @@ stdenv.mkDerivation rec { sha256 = "0bjzq23s3xzw0l9qx4l8achrx5id8xdd6r52lvdl4a28dxzbcfhq"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Implementation of the VISA standard (for instrument control)"; longDescription = '' LibreVISA aims to be a compliant implementation of the VISA standard in a diff --git a/pkgs/development/libraries/librime/default.nix b/pkgs/development/libraries/librime/default.nix index 4de2f1f8d3f..b6db462f3c3 100644 --- a/pkgs/development/libraries/librime/default.nix +++ b/pkgs/development/libraries/librime/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, boost, glog, leveldb, marisa, opencc, +{ lib, stdenv, fetchFromGitHub, cmake, boost, glog, leveldb, marisa, opencc, libyamlcpp, gmock }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost glog leveldb marisa opencc libyamlcpp gmock ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://rime.im/"; description = "Rime Input Method Engine, the core library"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libroxml/default.nix b/pkgs/development/libraries/libroxml/default.nix index b72ffb5b7ec..de1877f2ab4 100644 --- a/pkgs/development/libraries/libroxml/default.nix +++ b/pkgs/development/libraries/libroxml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "libroxml-2.3.0"; @@ -6,7 +6,7 @@ stdenv.mkDerivation { url = "http://download.libroxml.net/pool/v2.x/libroxml-2.3.0.tar.gz"; sha256 = "0y0vc9n4rfbimjp28nx4kdfzz08j5xymh5xjy84l9fhfac5z5a0x"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.libroxml.net/"; description = "This library is minimum, easy-to-use, C implementation for xml file parsing"; license = licenses.lgpl3; diff --git a/pkgs/development/libraries/librseq/default.nix b/pkgs/development/libraries/librseq/default.nix index 4fd8bb7e33a..12b9b4109c7 100644 --- a/pkgs/development/libraries/librseq/default.nix +++ b/pkgs/development/libraries/librseq/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , autoreconfHook, linuxHeaders }: @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { rm -rf $out/share ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Userspace library for the Linux Restartable Sequence API"; homepage = "https://github.com/compudj/librseq"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index ecf518d04da..efdbf593463 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, glib, gdk-pixbuf, pango, cairo, libxml2 +{ lib, stdenv, fetchurl, pkg-config, glib, gdk-pixbuf, pango, cairo, libxml2 , bzip2, libintl, darwin, rustc, cargo, gnome3 , vala, gobject-introspection }: @@ -10,7 +10,7 @@ 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}/${lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "02csvx2nzygh8kyal2qiy3y6xb7d52vszxxr37dzav704a9pkncv"; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib gdk-pixbuf cairo ]; - nativeBuildInputs = [ pkgconfig rustc cargo vala gobject-introspection ] + nativeBuildInputs = [ pkg-config rustc cargo vala gobject-introspection ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]); @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { "--enable-vala" "--enable-installed-tests" "--enable-always-build-tests" - ] ++ stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic"; + ] ++ lib.optional stdenv.isDarwin "--disable-Bsymbolic"; makeFlags = [ "installed_test_metadir=$(installedTests)/share/installed-tests/RSVG" @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ]; NIX_CFLAGS_COMPILE - = stdenv.lib.optionalString stdenv.isDarwin "-I${cairo.dev}/include/cairo"; + = lib.optionalString stdenv.isDarwin "-I${cairo.dev}/include/cairo"; # It wants to add loaders and update the loaders.cache in gdk-pixbuf # Patching the Makefiles to it creates rsvg specific loaders and the @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A small library to render SVG images to Cairo surfaces"; homepage = "https://wiki.gnome.org/Projects/LibRsvg"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/librsync/0.9.nix b/pkgs/development/libraries/librsync/0.9.nix index 35ccdcdf078..74dca4e3085 100644 --- a/pkgs/development/libraries/librsync/0.9.nix +++ b/pkgs/development/libraries/librsync/0.9.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "librsync-0.9.7"; @@ -11,16 +11,16 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; configureFlags = [ - (stdenv.lib.enableFeature stdenv.isCygwin "static") - (stdenv.lib.enableFeature (!stdenv.isCygwin) "shared") + (lib.enableFeature stdenv.isCygwin "static") + (lib.enableFeature (!stdenv.isCygwin) "shared") ]; dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; meta = { homepage = "http://librsync.sourceforge.net/"; - license = stdenv.lib.licenses.lgpl2Plus; + license = lib.licenses.lgpl2Plus; description = "Implementation of the rsync remote-delta algorithm"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/librsync/default.nix b/pkgs/development/libraries/librsync/default.nix index 9499be80f03..9211d9d233f 100644 --- a/pkgs/development/libraries/librsync/default.nix +++ b/pkgs/development/libraries/librsync/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, perl, zlib, bzip2, popt }: +{ lib, stdenv, fetchFromGitHub, cmake, perl, zlib, bzip2, popt }: stdenv.mkDerivation rec { pname = "librsync"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://librsync.sourceforge.net/"; license = licenses.lgpl2Plus; description = "Implementation of the rsync remote-delta algorithm"; diff --git a/pkgs/development/libraries/librtprocess/default.nix b/pkgs/development/libraries/librtprocess/default.nix index adabbe11cb3..3e44bfd3d7d 100644 --- a/pkgs/development/libraries/librtprocess/default.nix +++ b/pkgs/development/libraries/librtprocess/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "librtprocess"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/CarVac/librtprocess"; description = "Highly optimized library for processing RAW images"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/libs3/default.nix b/pkgs/development/libraries/libs3/default.nix index 3012263cb41..5a2b8636774 100644 --- a/pkgs/development/libraries/libs3/default.nix +++ b/pkgs/development/libraries/libs3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, curl, libxml2 }: +{ lib, stdenv, fetchFromGitHub, curl, libxml2 }: stdenv.mkDerivation { name = "libs3-2018-12-03"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { makeFlags = [ "DESTDIR=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/bji/libs3"; description = "A library for interfacing with amazon s3"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/libraries/libsamplerate/default.nix b/pkgs/development/libraries/libsamplerate/default.nix index 92958f389f0..5cf872c3fc3 100644 --- a/pkgs/development/libraries/libsamplerate/default.nix +++ b/pkgs/development/libraries/libsamplerate/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, pkgconfig, libsndfile, ApplicationServices, Carbon, CoreServices }: +{ lib, stdenv, fetchurl, pkg-config, libsndfile, ApplicationServices, Carbon, CoreServices }: let - inherit (stdenv.lib) optionals optionalString; + inherit (lib) optionals optionalString; in stdenv.mkDerivation rec { name = "libsamplerate-0.1.9"; @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { sha256 = "1ha46i0nbibq0pl0pjwcqiyny4hj8lp1bnl4dpxm64zjw9lb2zha"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsndfile ] ++ optionals stdenv.isDarwin [ ApplicationServices CoreServices ]; @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { substituteInPlace examples/Makefile --replace "-fpascal-strings" "" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Sample Rate Converter for audio"; homepage = "http://www.mega-nerd.com/SRC/index.html"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix index cebfdfe3838..f4caa22b322 100644 --- a/pkgs/development/libraries/libsass/default.nix +++ b/pkgs/development/libraries/libsass/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "libsass"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A C/C++ implementation of a Sass compiler"; homepage = "https://github.com/sass/libsass"; license = licenses.mit; diff --git a/pkgs/development/libraries/libschrift/default.nix b/pkgs/development/libraries/libschrift/default.nix index a06f6c50d66..96b8c7ac2e5 100644 --- a/pkgs/development/libraries/libschrift/default.nix +++ b/pkgs/development/libraries/libschrift/default.nix @@ -1,16 +1,24 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { pname = "libschrift"; - version = "0.9.1"; + version = "0.10.0"; src = fetchFromGitHub { owner = "tomolt"; repo = pname; - rev = "c6d20460d6e602e8829d3a227fd7be4c4c3cda86"; - hash = "sha256-BuTmWaWFZ0DXujlbhbmK3Woit8fR9F4DWmKszHX6gOI="; + rev = "c207585486b3e78ec5506f55f5d56178f421a53c"; + sha256 = "13qrplsi2a53s84giwnzqmn0zbslyaagvjn89wsn9fd90m2v2bs1"; }; + # fix a compilation failure related to darwin integers, remove at next release + patches = [ + (fetchpatch { + url = "https://github.com/tomolt/libschrift/commit/1b1292f2cf4b582d66b2f6c87105997391f9fa08.patch"; + sha256 = "076l3n28famgi74nr5bz47yn192bm76p8c8558fm5zj5c21pcfsv"; + }) + ]; + postPatch = '' substituteInPlace config.mk \ --replace "PREFIX = /usr/local" "PREFIX = $out" @@ -18,7 +26,7 @@ stdenv.mkDerivation rec { makeFlags = [ "libschrift.a" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/tomolt/libschrift"; description = "A lightweight TrueType font rendering library"; license = licenses.isc; diff --git a/pkgs/development/libraries/libscrypt/default.nix b/pkgs/development/libraries/libscrypt/default.nix index 7eaa8f85578..1bd22b2f790 100644 --- a/pkgs/development/libraries/libscrypt/default.nix +++ b/pkgs/development/libraries/libscrypt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "libscrypt"; @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { sha256 = "1d76ys6cp7fi4ng1w3mz2l0p9dbr7ljbk33dcywyimzjz8bahdng"; }; - buildFlags = stdenv.lib.optional stdenv.isDarwin "LDFLAGS= CFLAGS_EXTRA="; + buildFlags = lib.optional stdenv.isDarwin "LDFLAGS= CFLAGS_EXTRA="; installFlags = [ "PREFIX=$(out)" ]; - installTargets = stdenv.lib.optional stdenv.isDarwin "install-osx"; + installTargets = lib.optional stdenv.isDarwin "install-osx"; doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Shared library that implements scrypt() functionality"; homepage = "https://lolware.net/2014/04/29/libscrypt.html"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/libsearpc/default.nix b/pkgs/development/libraries/libsearpc/default.nix index c9c105d1b18..1ac5cef7c5f 100644 --- a/pkgs/development/libraries/libsearpc/default.nix +++ b/pkgs/development/libraries/libsearpc/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, automake, autoconf, pkgconfig, libtool, python2Packages, glib, jansson}: +{lib, stdenv, fetchFromGitHub, automake, autoconf, pkg-config, libtool, python2Packages, glib, jansson}: stdenv.mkDerivation rec { version = "3.2.0"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { patches = [ ./libsearpc.pc.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ automake autoconf libtool python2Packages.python python2Packages.simplejson ]; propagatedBuildInputs = [ glib jansson ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/haiwen/libsearpc"; description = "A simple and easy-to-use C language RPC framework (including both server side & client side) based on GObject System"; license = licenses.lgpl3; diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix index a0414f5ba55..7ea7add23f3 100644 --- a/pkgs/development/libraries/libseccomp/default.nix +++ b/pkgs/development/libraries/libseccomp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, getopt, util-linux, gperf }: +{ lib, stdenv, fetchurl, getopt, util-linux, gperf }: stdenv.mkDerivation rec { pname = "libseccomp"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { tar -zcf $pythonsrc --mtime="@$SOURCE_DATE_EPOCH" --sort=name --transform s/tmp-pythonsrc/python-foundationdb/ ./tmp-pythonsrc/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "High level library for the Linux Kernel seccomp filter"; homepage = "https://github.com/seccomp/libseccomp"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix index d614ab01297..6c28b7d16c1 100644 --- a/pkgs/development/libraries/libsecret/default.nix +++ b/pkgs/development/libraries/libsecret/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, glib, pkgconfig, gettext, libxslt, python3 +{ lib, stdenv, fetchurl, fetchpatch, glib, pkg-config, gettext, libxslt, python3 , docbook_xsl, docbook_xml_dtd_42 , libgcrypt, gobject-introspection, vala , gtk-doc, gnome3, gjs, libintl, dbus, xvfb_run }: @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "0.20.4"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0a4xnfmraxchd9cq5ai66j12jv2vrgjmaaxz25kl031jvda4qnij"; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib ]; nativeBuildInputs = [ - pkgconfig gettext libxslt docbook_xsl docbook_xml_dtd_42 libintl + pkg-config gettext libxslt docbook_xsl docbook_xml_dtd_42 libintl gobject-introspection vala gtk-doc glib ]; buildInputs = [ libgcrypt ]; @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { meta = { description = "A library for storing and retrieving passwords and other secrets"; homepage = "https://wiki.gnome.org/Projects/Libsecret"; - license = stdenv.lib.licenses.lgpl21Plus; + license = lib.licenses.lgpl21Plus; inherit (glib.meta) platforms maintainers; }; } diff --git a/pkgs/development/libraries/libserialport/default.nix b/pkgs/development/libraries/libserialport/default.nix index c7f34362f39..0a2adc4126f 100644 --- a/pkgs/development/libraries/libserialport/default.nix +++ b/pkgs/development/libraries/libserialport/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, udev, darwin }: +{ lib, stdenv, fetchurl, pkg-config, udev, darwin }: stdenv.mkDerivation rec { name = "libserialport-0.1.1"; @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { sha256 = "17ajlwgvyyrap8z7f16zcs59pksvncwbmd3mzf98wj7zqgczjaja"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = stdenv.lib.optional stdenv.isLinux udev - ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.IOKit; + nativeBuildInputs = [ pkg-config ]; + buildInputs = lib.optional stdenv.isLinux udev + ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.IOKit; - meta = with stdenv.lib; { + meta = with lib; { description = "Cross-platform shared library for serial port access"; homepage = "https://sigrok.org/"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/libshout/default.nix b/pkgs/development/libraries/libshout/default.nix index 075855fada4..1e5cdb38948 100644 --- a/pkgs/development/libraries/libshout/default.nix +++ b/pkgs/development/libraries/libshout/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , libvorbis, libtheora, speex }: -# need pkgconfig so that libshout installs ${out}/lib/pkgconfig/shout.pc +# need pkg-config so that libshout installs ${out}/lib/pkgconfig/shout.pc stdenv.mkDerivation rec { - name = "libshout-2.4.4"; + name = "libshout-2.4.5"; src = fetchurl { url = "http://downloads.xiph.org/releases/libshout/${name}.tar.gz"; - sha256 = "1hz670a4pfpsb89b0mymy8nw4rx8x0vmh61gq6j1vbg70mfhrscc"; + sha256 = "sha256-2eVoZopnOZTr4/HrXyvuBuMjal25K40MSH4cD4hqaJA="; }; outputs = [ "out" "dev" "doc" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ libvorbis libtheora speex ]; meta = { @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { ''; homepage = "http://www.icecast.org"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ jcumming ]; - platforms = with stdenv.lib.platforms; unix; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ jcumming ]; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/development/libraries/libsidplayfp/default.nix b/pkgs/development/libraries/libsidplayfp/default.nix index 5845916239c..d5f8dd6e573 100644 --- a/pkgs/development/libraries/libsidplayfp/default.nix +++ b/pkgs/development/libraries/libsidplayfp/default.nix @@ -1,7 +1,7 @@ { stdenv , lib , fetchurl -, pkgconfig +, pkg-config , docSupport ? true , doxygen ? null , graphviz ? null @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { sha256 = "04vdrrkh5y9x9rrmj6gdp242ah70b4sslwqfby8wp2riis4hr9z0"; }; - nativeBuildInputs = [ pkgconfig ] + nativeBuildInputs = [ pkg-config ] ++ optionals docSupport [ doxygen graphviz ]; installTargets = [ "install" ] diff --git a/pkgs/development/libraries/libsieve/default.nix b/pkgs/development/libraries/libsieve/default.nix index e1c6f3efe52..8253d1df74f 100644 --- a/pkgs/development/libraries/libsieve/default.nix +++ b/pkgs/development/libraries/libsieve/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { version = "2.3.1"; pname = "libsieve"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1gllhl9hbmc86dq3k98d4kjs5bwk0p2rlk7ywqj3fjn7jw6mbhcj"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "An interpreter for RFC 3028 Sieve and various extensions"; homepage = "http://sodabrew.com/libsieve/"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libsigcxx/1.2.nix b/pkgs/development/libraries/libsigcxx/1.2.nix index 0fc19d20759..a417e0bcc1d 100644 --- a/pkgs/development/libraries/libsigcxx/1.2.nix +++ b/pkgs/development/libraries/libsigcxx/1.2.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, m4}: +{lib, stdenv, fetchurl, pkg-config, m4}: stdenv.mkDerivation rec { name = "libsigc++-1.2.7"; @@ -8,10 +8,10 @@ stdenv.mkDerivation rec { sha256 = "099224v5y0y1ggqrfc8vga8afr3nb93iicn7cj8xxgsrwa83s5nr"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ m4]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://libsigcplusplus.github.io/libsigcplusplus/"; description = "A typesafe callback system for standard C++"; branch = "1.2"; diff --git a/pkgs/development/libraries/libsigcxx/default.nix b/pkgs/development/libraries/libsigcxx/default.nix index 8f883626d82..eac383fae0d 100644 --- a/pkgs/development/libraries/libsigcxx/default.nix +++ b/pkgs/development/libraries/libsigcxx/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, pkgconfig, gnum4, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, gnum4, gnome3 }: stdenv.mkDerivation rec { pname = "libsigc++"; version = "2.10.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "00v08km4wwzbh6vjxb21388wb9dm6g2xh14rgwabnv4c2wk5z8n9"; }; - nativeBuildInputs = [ pkgconfig gnum4 ]; + nativeBuildInputs = [ pkg-config gnum4 ]; doCheck = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://libsigcplusplus.github.io/libsigcplusplus/"; description = "A typesafe callback system for standard C++"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libsignal-protocol-c/default.nix b/pkgs/development/libraries/libsignal-protocol-c/default.nix index 6278f6234f0..203d3613af8 100644 --- a/pkgs/development/libraries/libsignal-protocol-c/default.nix +++ b/pkgs/development/libraries/libsignal-protocol-c/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, openssl }: +{ lib, stdenv, fetchFromGitHub, cmake, openssl }: stdenv.mkDerivation rec { pname = "libsignal-protocol-c"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Signal Protocol C Library"; homepage = "https://github.com/signalapp/libsignal-protocol-c"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/libsignon-glib/default.nix b/pkgs/development/libraries/libsignon-glib/default.nix index 1f453dc291e..ae7a6775de5 100644 --- a/pkgs/development/libraries/libsignon-glib/default.nix +++ b/pkgs/development/libraries/libsignon-glib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, nix-update-script, pkgconfig, meson, ninja, vala, python3, gtk-doc, docbook_xsl, docbook_xml_dtd_43, docbook_xml_dtd_412, glib, check, gobject-introspection }: +{ lib, stdenv, fetchgit, nix-update-script, pkg-config, meson, ninja, vala, python3, gtk-doc, docbook_xsl, docbook_xml_dtd_43, docbook_xml_dtd_412, glib, check, gobject-introspection }: stdenv.mkDerivation rec { pname = "libsignon-glib"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { gtk-doc meson ninja - pkgconfig + pkg-config python3 vala ]; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A library for managing single signon credentials which can be used from GLib applications"; homepage = "https://gitlab.com/accounts-sso/libsignon-glib"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libsigsegv/default.nix b/pkgs/development/libraries/libsigsegv/default.nix index 30921ade4cf..20cb80b1ff8 100644 --- a/pkgs/development/libraries/libsigsegv/default.nix +++ b/pkgs/development/libraries/libsigsegv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , enableSigbusFix ? false # required by kernels < 3.18.6 }: @@ -28,9 +28,9 @@ stdenv.mkDerivation rec { more. ''; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libsixel/default.nix b/pkgs/development/libraries/libsixel/default.nix index 9e151931e65..0d5a54f9693 100644 --- a/pkgs/development/libraries/libsixel/default.nix +++ b/pkgs/development/libraries/libsixel/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub}: +{lib, stdenv, fetchFromGitHub}: stdenv.mkDerivation rec { version = "1.8.6"; pname = "libsixel"; @@ -16,11 +16,15 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "The SIXEL library for console graphics, and converter programs"; homepage = "http://saitoha.github.com/libsixel"; maintainers = with maintainers; [ vrthra ]; license = licenses.mit; platforms = with platforms; unix; + knownVulnerabilities = [ + "CVE-2020-11721" # https://github.com/saitoha/libsixel/issues/134 + "CVE-2020-19668" # https://github.com/saitoha/libsixel/issues/136 + ]; }; } diff --git a/pkgs/development/libraries/libskk/default.nix b/pkgs/development/libraries/libskk/default.nix index e5fd031b5ff..c4b36704cb9 100644 --- a/pkgs/development/libraries/libskk/default.nix +++ b/pkgs/development/libraries/libskk/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, - libtool, gettext, pkgconfig, +{ lib, stdenv, fetchFromGitHub, + libtool, gettext, pkg-config, vala, gnome-common, gobject-introspection, libgee, json-glib, skk-dicts, libxkbcommon }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ skk-dicts libxkbcommon ]; - nativeBuildInputs = [ vala gnome-common gobject-introspection libtool gettext pkgconfig ]; + nativeBuildInputs = [ vala gnome-common gobject-introspection libtool gettext pkg-config ]; propagatedBuildInputs = [ libgee json-glib ]; preConfigure = '' @@ -42,8 +42,8 @@ stdenv.mkDerivation rec { user dictionary, skkserv, and CDB format dictionary. ''; homepage = "https://github.com/ueno/libskk"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ yuriaisaka ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ yuriaisaka ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libslirp/default.nix b/pkgs/development/libraries/libslirp/default.nix index af6d26bc22b..8bd74d29243 100644 --- a/pkgs/development/libraries/libslirp/default.nix +++ b/pkgs/development/libraries/libslirp/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitLab , meson , ninja @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { echo ${version} > .tarball-version ''; - meta = with stdenv.lib; { + meta = with lib; { description = "General purpose TCP-IP emulator"; homepage = "https://gitlab.freedesktop.org/slirp/libslirp"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libsmartcols/default.nix b/pkgs/development/libraries/libsmartcols/default.nix index bb3de08cf72..3ef1f314899 100644 --- a/pkgs/development/libraries/libsmartcols/default.nix +++ b/pkgs/development/libraries/libsmartcols/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, python3 }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, python3, gtk-doc}: stdenv.mkDerivation rec { name = "libsmartcols"; version = "v2.36.1"; - nativeBuildInputs = [ autoreconfHook pkgconfig python3 ]; + nativeBuildInputs = [ autoreconfHook pkg-config python3 gtk-doc ]; src = fetchFromGitHub { owner = "karelzak"; @@ -24,9 +24,9 @@ stdenv.mkDerivation rec { meta = { description = "smart column output alignment library"; homepage = https://github.com/karelzak/util-linux/tree/master/libsmartcols; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - maintainers = with stdenv.lib.maintainers; [ rb2k ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + maintainers = with lib.maintainers; [ rb2k ]; }; } diff --git a/pkgs/development/libraries/libsmi/default.nix b/pkgs/development/libraries/libsmi/default.nix index 881af18d559..9b71a91efed 100644 --- a/pkgs/development/libraries/libsmi/default.nix +++ b/pkgs/development/libraries/libsmi/default.nix @@ -1,4 +1,4 @@ -{ stdenv , fetchurl }: +{ lib, stdenv , fetchurl }: stdenv.mkDerivation rec { pname = "libsmi"; @@ -9,10 +9,10 @@ stdenv.mkDerivation rec { sha256 = "1lslaxr2qcj6hf4naq5n5mparfhmswsgq4wa7zm2icqvvgdcq6pj"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A Library to Access SMI MIB Information"; homepage = "https://www.ibr.cs.tu-bs.de/projects/libsmi/index.html"; license = licenses.free; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/development/libraries/libsnark/default.nix b/pkgs/development/libraries/libsnark/default.nix index 6de498f6d29..c3e6d0e049e 100644 --- a/pkgs/development/libraries/libsnark/default.nix +++ b/pkgs/development/libraries/libsnark/default.nix @@ -1,11 +1,10 @@ -{ stdenv, fetchFromGitHub, cmake, pkg-config, openssl, boost, gmp, procps }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, openssl, boost, gmp, procps }: let rev = "9e6b19ff15bc19fba5da1707ba18e7f160e5ed07"; - inherit (stdenv) lib; in stdenv.mkDerivation rec { name = "libsnark-pre${version}"; - version = stdenv.lib.substring 0 8 rev; + version = lib.substring 0 8 rev; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ openssl boost gmp ] ++ lib.optional stdenv.hostPlatform.isLinux procps; @@ -20,10 +19,10 @@ in stdenv.mkDerivation rec { fetchSubmodules = true; }; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ library for zkSNARKs"; homepage = "https://github.com/scipr-lab/libsnark"; license = licenses.mit; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/development/libraries/libsndfile/default.nix b/pkgs/development/libraries/libsndfile/default.nix index 739bc7d7332..61e6d9cd765 100644 --- a/pkgs/development/libraries/libsndfile/default.nix +++ b/pkgs/development/libraries/libsndfile/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, autogen, flac, libogg, libopus, libvorbis, pkgconfig, python3 +{ lib, stdenv, fetchFromGitHub, autoreconfHook, autogen, flac, libogg, libopus, libvorbis, pkg-config, python3 , Carbon, AudioToolbox }: @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { sha256 = "1rh79y4s4m2wcm2kahmzs2kijpdpayif2gyca6m71f3k7jbhgcwa"; }; - nativeBuildInputs = [ autoreconfHook autogen pkgconfig python3 ]; + nativeBuildInputs = [ autoreconfHook autogen pkg-config python3 ]; buildInputs = [ flac libogg libopus libvorbis ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Carbon AudioToolbox ]; + ++ lib.optionals stdenv.isDarwin [ Carbon AudioToolbox ]; enableParallelBuilding = true; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { # need headers from the Carbon.framework in /System/Library/Frameworks to # compile this on darwin -- not sure how to handle - preConfigure = stdenv.lib.optionalString stdenv.isDarwin + preConfigure = lib.optionalString stdenv.isDarwin '' NIX_CFLAGS_COMPILE+=" -I$SDKROOT/System/Library/Frameworks/Carbon.framework/Versions/A/Headers" ''; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { # Needed on Darwin. NIX_CFLAGS_LINK = "-logg -lvorbis"; - meta = with stdenv.lib; { + meta = with lib; { description = "A C library for reading and writing files containing sampled sound"; homepage = "https://libsndfile.github.io/libsndfile/"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix index c6381e2a141..db2cd044592 100644 --- a/pkgs/development/libraries/libsodium/default.nix +++ b/pkgs/development/libraries/libsodium/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "libsodium-1.0.18"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A modern and easy-to-use crypto library"; homepage = "http://doc.libsodium.org/"; license = licenses.isc; diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix index d75d9cc0780..089fbe4b351 100644 --- a/pkgs/development/libraries/libsolv/default.nix +++ b/pkgs/development/libraries/libsolv/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }: +{ lib, stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }: stdenv.mkDerivation rec { - version = "0.7.16"; + version = "0.7.17"; pname = "libsolv"; src = fetchFromGitHub { owner = "openSUSE"; repo = "libsolv"; rev = version; - sha256 = "1arw7p83s5yq36pw94b76zfiqsh90fjjnayni54a5wgm0zvbkki8"; + sha256 = "sha256-LPOS+yDwNpyO9tkFoIy4SCQymytOGB26Pfyd/EFEYnc="; }; cmakeFlags = [ @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja ]; buildInputs = [ zlib expat rpm db ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A free package dependency solver"; homepage = "https://github.com/openSUSE/libsolv"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libsoundio/default.nix b/pkgs/development/libraries/libsoundio/default.nix index a4a81af532a..ac9f3b25654 100644 --- a/pkgs/development/libraries/libsoundio/default.nix +++ b/pkgs/development/libraries/libsoundio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, alsaLib, libjack2, libpulseaudio, AudioUnit }: +{ lib, stdenv, fetchFromGitHub, cmake, alsaLib, libjack2, libpulseaudio, AudioUnit }: stdenv.mkDerivation rec { version = "2.0.0"; @@ -14,12 +14,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libjack2 libpulseaudio ] - ++ stdenv.lib.optional stdenv.isLinux alsaLib - ++ stdenv.lib.optional stdenv.isDarwin AudioUnit; + ++ lib.optional stdenv.isLinux alsaLib + ++ lib.optional stdenv.isDarwin AudioUnit; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-Wno-strict-prototypes"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-strict-prototypes"; - meta = with stdenv.lib; { + meta = with lib; { description = "Cross platform audio input and output"; homepage = "http://libsound.io/"; license = licenses.mit; diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 88c6a359ba8..47fcdd41f8a 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, glib, libxml2, meson, ninja, pkgconfig, gnome3, libsysprof-capture +{ stdenv, lib, fetchurl, glib, libxml2, meson, ninja, pkg-config, gnome3, libsysprof-capture , gnomeSupport ? true, sqlite, glib-networking, gobject-introspection, vala , libpsl, python3, brotli }: @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "2.72.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "11skbyw2pw32178q3h8pi7xqa41b2x4k6q4k9f75zxmh8s23y30p"; }; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.isLinux [ libsysprof-capture ]; - nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala glib ]; + nativeBuildInputs = [ meson ninja pkg-config gobject-introspection vala glib ]; propagatedBuildInputs = [ glib libxml2 ]; NIX_CFLAGS_COMPILE = [ "-lpthread" ]; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { meta = { description = "HTTP client/server library for GNOME"; homepage = "https://wiki.gnome.org/Projects/libsoup"; - license = stdenv.lib.licenses.lgpl2Plus; + license = lib.licenses.lgpl2Plus; inherit (glib.meta) maintainers platforms; }; } diff --git a/pkgs/development/libraries/libspatialindex/default.nix b/pkgs/development/libraries/libspatialindex/default.nix index 4b5f7f4b3f1..4c778fbd690 100644 --- a/pkgs/development/libraries/libspatialindex/default.nix +++ b/pkgs/development/libraries/libspatialindex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: let version = "1.8.5"; in @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "Extensible spatial index library in C++"; homepage = "http://libspatialindex.github.io/"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.mit; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libspatialite/default.nix b/pkgs/development/libraries/libspatialite/default.nix index bdc4504ad5a..2e9dadf0bf5 100644 --- a/pkgs/development/libraries/libspatialite/default.nix +++ b/pkgs/development/libraries/libspatialite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, libxml2, sqlite, zlib, proj, geos, libiconv }: +{ stdenv, lib, fetchurl, pkg-config, libxml2, sqlite, zlib, proj, geos, libiconv }: with lib; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "16d4lpl7xrm9zy4gphy6nwanpjp8wn9g4wq2i2kh8abnlhq01448"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxml2 sqlite zlib proj geos libiconv ]; diff --git a/pkgs/development/libraries/libspectre/default.nix b/pkgs/development/libraries/libspectre/default.nix index 11400a6a3e2..465aa941f39 100644 --- a/pkgs/development/libraries/libspectre/default.nix +++ b/pkgs/development/libraries/libspectre/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, ghostscript, cairo }: +{ fetchurl, lib, stdenv, pkg-config, ghostscript, cairo }: stdenv.mkDerivation rec { name = "libspectre-0.2.7"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ # Need `libgs.so'. - pkgconfig ghostscript cairo /*for tests*/ + pkg-config ghostscript cairo /*for tests*/ ]; doCheck = true; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { handling and rendering Postscript documents. ''; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libspectrum/default.nix b/pkgs/development/libraries/libspectrum/default.nix index 24b9b9241c2..8922bedccdc 100644 --- a/pkgs/development/libraries/libspectrum/default.nix +++ b/pkgs/development/libraries/libspectrum/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perl, pkgconfig, audiofile, bzip2, glib, libgcrypt, zlib }: +{ lib, stdenv, fetchurl, perl, pkg-config, audiofile, bzip2, glib, libgcrypt, zlib }: stdenv.mkDerivation rec { name = "libspectrum-1.4.4"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1cc0jx617sym6qj1f9fm115q44cq5azsxplqq2cgrg0pmlmjpyzx"; }; - nativeBuildInputs = [ perl pkgconfig ]; + nativeBuildInputs = [ perl pkg-config ]; buildInputs = [ audiofile bzip2 glib libgcrypt zlib ]; diff --git a/pkgs/development/libraries/libspf2/default.nix b/pkgs/development/libraries/libspf2/default.nix index 42b39179b20..6a9cb8b647c 100644 --- a/pkgs/development/libraries/libspf2/default.nix +++ b/pkgs/development/libraries/libspf2/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, autoreconfHook }: +{ lib, stdenv, fetchurl, autoreconfHook }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "libspf2"; diff --git a/pkgs/development/libraries/libspiro/default.nix b/pkgs/development/libraries/libspiro/default.nix index a77e209119b..03bfe14d3be 100644 --- a/pkgs/development/libraries/libspiro/default.nix +++ b/pkgs/development/libraries/libspiro/default.nix @@ -1,4 +1,4 @@ -{stdenv, pkgconfig, autoreconfHook, fetchFromGitHub }: +{lib, stdenv, pkg-config, autoreconfHook, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "libspiro"; @@ -11,9 +11,9 @@ stdenv.mkDerivation rec { sha256 = "1b5bw5qxqlral96y1n5f3sh9yxm2yij3zkqjmlgd8r1k4j0d3nqw"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A library that simplifies the drawing of beautiful curves"; homepage = "https://github.com/fontforge/libspiro"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/libspotify/default.nix b/pkgs/development/libraries/libspotify/default.nix index 69cd24dfd6e..b39944d13dc 100644 --- a/pkgs/development/libraries/libspotify/default.nix +++ b/pkgs/development/libraries/libspotify/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libspotify, alsaLib, readline, pkgconfig, apiKey ? null, unzip, gnused }: +{ lib, stdenv, fetchurl, libspotify, alsaLib, readline, pkg-config, apiKey ? null, unzip, gnused }: let version = "12.1.51"; @@ -47,14 +47,14 @@ else stdenv.mkDerivation { # darwin-specific - buildInputs = stdenv.lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") unzip; + buildInputs = lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") unzip; # linux-specific - installFlags = stdenv.lib.optional isLinux + installFlags = lib.optional isLinux "prefix=$(out)"; - patchPhase = stdenv.lib.optionalString isLinux + patchPhase = lib.optionalString isLinux "${gnused}/bin/sed -i 's/ldconfig//' Makefile"; - postInstall = stdenv.lib.optionalString isLinux + postInstall = lib.optionalString isLinux "mv -v share $out"; passthru = { @@ -65,9 +65,9 @@ else stdenv.mkDerivation { pname = "libspotify-samples"; inherit version; src = libspotify.src; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libspotify readline ] - ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib; + ++ lib.optional (!stdenv.isDarwin) alsaLib; postUnpack = "sourceRoot=$sourceRoot/share/doc/libspotify/examples"; patchPhase = "cp ${apiKey} appkey.c"; installPhase = '' @@ -82,7 +82,7 @@ else stdenv.mkDerivation { inherit apiKey; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Spotify API library"; homepage = "https://developer.spotify.com/technologies/libspotify"; maintainers = with maintainers; [ lovek323 ]; diff --git a/pkgs/development/libraries/libsrs2/default.nix b/pkgs/development/libraries/libsrs2/default.nix index 0d186204f92..3da48f77254 100644 --- a/pkgs/development/libraries/libsrs2/default.nix +++ b/pkgs/development/libraries/libsrs2/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { description = "The next generation SRS library from the original designer of SRS"; license = with lib.licenses; [ gpl2 bsd3 ]; homepage = "https://www.libsrs2.org/"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix index c6accad9c3c..c613cfab777 100644 --- a/pkgs/development/libraries/libssh/default.nix +++ b/pkgs/development/libraries/libssh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, cmake, zlib, openssl, libsodium }: +{ lib, stdenv, fetchurl, pkg-config, cmake, zlib, openssl, libsodium }: stdenv.mkDerivation rec { pname = "libssh"; @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { buildInputs = [ zlib openssl libsodium ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { description = "SSH client library"; homepage = "https://libssh.org"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix index 8ce9c814df0..ed09e8ba562 100644 --- a/pkgs/development/libraries/libssh2/default.nix +++ b/pkgs/development/libraries/libssh2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, zlib, windows }: +{ lib, stdenv, fetchurl, openssl, zlib, windows }: stdenv.mkDerivation rec { pname = "libssh2"; @@ -12,14 +12,14 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; buildInputs = [ openssl zlib ] - ++ stdenv.lib.optional stdenv.hostPlatform.isMinGW windows.mingw_w64; + ++ lib.optional stdenv.hostPlatform.isMinGW windows.mingw_w64; patches = [ # Not able to use fetchpatch here: infinite recursion ./CVE-2019-17498.patch ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A client-side C library implementing the SSH2 protocol"; homepage = "https://www.libssh2.org"; platforms = platforms.all; diff --git a/pkgs/development/libraries/libstatgrab/default.nix b/pkgs/development/libraries/libstatgrab/default.nix index 70a632dd4a7..6d874fe2367 100644 --- a/pkgs/development/libraries/libstatgrab/default.nix +++ b/pkgs/development/libraries/libstatgrab/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , IOKit ? null }: stdenv.mkDerivation rec { @@ -9,9 +9,9 @@ stdenv.mkDerivation rec { sha256 = "15m1sl990l85ijf8pnc6hdfha6fqyiq74mijrzm3xz4zzxm91wav"; }; - buildInputs = [] ++ stdenv.lib.optional stdenv.isDarwin IOKit; + buildInputs = [] ++ lib.optional stdenv.isDarwin IOKit; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.i-scream.org/libstatgrab/"; description = "A library that provides cross platforms access to statistics about the running system"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/libstroke/default.nix b/pkgs/development/libraries/libstroke/default.nix index e97b96d71d0..76f5b6b4b8c 100644 --- a/pkgs/development/libraries/libstroke/default.nix +++ b/pkgs/development/libraries/libstroke/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, automake, autoconf, xlibsWrapper}: +{lib, stdenv, fetchurl, automake, autoconf, xlibsWrapper}: stdenv.mkDerivation { name = "libstroke-0.5.1"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { description = "A library for simple gesture recognition"; homepage = "https://web.archive.org/web/20161204100704/http://etla.net/libstroke/"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; longDescription = '' libstroke, last updated in 2001, still successfully provides a basic @@ -29,6 +29,6 @@ stdenv.mkDerivation { easy to work with, and notably used by FVWM. ''; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libstrophe/default.nix b/pkgs/development/libraries/libstrophe/default.nix index 0c7828c954f..ccc6fedd916 100644 --- a/pkgs/development/libraries/libstrophe/default.nix +++ b/pkgs/development/libraries/libstrophe/default.nix @@ -1,11 +1,10 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub -, pkg-config -, automake -, autoconf +, autoreconfHook , libtool , openssl , expat +, pkg-config , check }: @@ -17,19 +16,17 @@ stdenv.mkDerivation rec { owner = "strophe"; repo = pname; rev = version; - sha256 = "sha256-6byg7hE0DN/cbf9NHpK/2DhXZyuelYAp+SA7vVUgo4U="; + sha256 = "11d341avsfr0z4lq15cy5dkmff6qpy91wkgzdpfdy31l27pa1g79"; }; - nativeBuildInputs = [ automake autoconf pkg-config libtool check ]; - buildInputs = [ openssl expat ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ openssl expat libtool check ]; dontDisableStatic = true; - preConfigure = "mkdir m4 && sh bootstrap.sh"; - doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple, lightweight C library for writing XMPP clients"; longDescription = '' libstrophe is a lightweight XMPP client library written in C. It has @@ -37,8 +34,10 @@ stdenv.mkDerivation rec { runs well on both Linux, Unix, and Windows based platforms. ''; homepage = "https://strophe.im/libstrophe/"; - license = with licenses; [ gpl3 mit ]; + license = with licenses; [ gpl3Only mit ]; platforms = platforms.unix; + broken = stdenv.isDarwin; maintainers = with maintainers; [ devhell flosse ]; }; } + diff --git a/pkgs/development/libraries/libsurvive/default.nix b/pkgs/development/libraries/libsurvive/default.nix index 11a5cdcf4e9..08be9c1a35d 100644 --- a/pkgs/development/libraries/libsurvive/default.nix +++ b/pkgs/development/libraries/libsurvive/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , pkg-config @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { zlib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Open Source Lighthouse Tracking System"; homepage = "https://github.com/cntools/libsurvive"; license = licenses.mit; diff --git a/pkgs/development/libraries/libsvm/default.nix b/pkgs/development/libraries/libsvm/default.nix index 5dc4deb30be..6f4741ed4d0 100644 --- a/pkgs/development/libraries/libsvm/default.nix +++ b/pkgs/development/libraries/libsvm/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { pname = "libsvm"; @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { ln -s $out/include/svm.h $out/include/libsvm/svm.h ''; - postFixup = stdenv.lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.isDarwin '' install_name_tool -id libsvm.2.dylib $out/lib/libsvm.2.dylib; ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A library for support vector machines"; homepage = "https://www.csie.ntu.edu.tw/~cjlin/libsvm/"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libsystemtap/default.nix b/pkgs/development/libraries/libsystemtap/default.nix index b46a848a041..1ce7ef58c88 100644 --- a/pkgs/development/libraries/libsystemtap/default.nix +++ b/pkgs/development/libraries/libsystemtap/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchgit, gettext, python, elfutils}: +{lib, stdenv, fetchgit, gettext, python, elfutils}: stdenv.mkDerivation { pname = "libsystemtap"; @@ -20,11 +20,11 @@ stdenv.mkDerivation { cp -r includes/* $out/include/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Statically defined probes development files"; homepage = "https://sourceware.org/systemtap/"; license = licenses.bsd3; platforms = platforms.unix; - maintainers = [ stdenv.lib.maintainers.farlion ]; + maintainers = [ lib.maintainers.farlion ]; }; } diff --git a/pkgs/development/libraries/libtap/default.nix b/pkgs/development/libraries/libtap/default.nix index c1c506ef5e3..ce7cb6bfd1e 100644 --- a/pkgs/development/libraries/libtap/default.nix +++ b/pkgs/development/libraries/libtap/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, cmake, perl }: +{ lib, stdenv, fetchurl, pkg-config, cmake, perl }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "libtap"; @@ -11,10 +11,10 @@ stdenv.mkDerivation rec { sha256 = "1ga7rqmppa8ady665736cx443icscqlgflkqmxd4xbkzypmdj9bk"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ cmake perl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A library to implement a test protocol"; longDescription = '' libtap is a library to implement the Test Anything Protocol for diff --git a/pkgs/development/libraries/libtar/default.nix b/pkgs/development/libraries/libtar/default.nix index a31fde0d31d..3e5b4cd23e9 100644 --- a/pkgs/development/libraries/libtar/default.nix +++ b/pkgs/development/libraries/libtar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, fetchpatch, autoreconfHook }: +{ lib, stdenv, fetchgit, fetchpatch, autoreconfHook }: stdenv.mkDerivation rec { version = "1.2.20"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ ]; - meta = with stdenv.lib; { + meta = with lib; { description = "C library for manipulating POSIX tar files"; homepage = "https://repo.or.cz/libtar"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix index 90dde37a416..2239d7311f5 100644 --- a/pkgs/development/libraries/libtasn1/default.nix +++ b/pkgs/development/libraries/libtasn1/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, texinfo }: +{ lib, stdenv, fetchurl, perl, texinfo }: stdenv.mkDerivation rec { name = "libtasn1-4.16.0"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { else null; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.gnu.org/software/libtasn1/"; description = "An ASN.1 library"; longDescription = '' diff --git a/pkgs/development/libraries/libtcod/default.nix b/pkgs/development/libraries/libtcod/default.nix index 420a4c6ad20..3e77d0876be 100644 --- a/pkgs/development/libraries/libtcod/default.nix +++ b/pkgs/development/libraries/libtcod/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromBitbucket, cmake, SDL, libGLU, libGL, upx, zlib }: +{ lib, stdenv, fetchFromBitbucket, cmake, SDL, libGLU, libGL, upx, zlib }: stdenv.mkDerivation { @@ -27,8 +27,8 @@ stdenv.mkDerivation { meta = { description = "API for roguelike games"; homepage = "http://roguecentral.org/doryen/libtcod/"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.skeidel ]; + license = lib.licenses.bsd3; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.skeidel ]; }; } diff --git a/pkgs/development/libraries/libtelnet/default.nix b/pkgs/development/libraries/libtelnet/default.nix index df500cd7a41..eebaee394ee 100644 --- a/pkgs/development/libraries/libtelnet/default.nix +++ b/pkgs/development/libraries/libtelnet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, zlib }: +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, zlib }: stdenv.mkDerivation { pname = "libtelnet"; @@ -11,14 +11,14 @@ stdenv.mkDerivation { sha256 = "1lp6gdbndsp2w8mhy88c2jknxj2klvnggvq04ln7qjg8407ifpda"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ zlib ]; meta = { description = "Simple RFC-complient TELNET implementation as a C library"; homepage = "https://github.com/seanmiddleditch/libtelnet"; - license = stdenv.lib.licenses.publicDomain; - maintainers = [ stdenv.lib.maintainers.tomberek ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.publicDomain; + maintainers = [ lib.maintainers.tomberek ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libtermkey/default.nix b/pkgs/development/libraries/libtermkey/default.nix index bb2e1b05bce..9779ad6b9e5 100644 --- a/pkgs/development/libraries/libtermkey/default.nix +++ b/pkgs/development/libraries/libtermkey/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchzip, libtool, pkgconfig, ncurses, unibilium }: +{ stdenv, lib, fetchzip, libtool, pkg-config, ncurses, unibilium }: stdenv.mkDerivation rec { pname = "libtermkey"; @@ -11,9 +11,9 @@ stdenv.mkDerivation rec { }; makeFlags = [ "PREFIX=$(out)" ] - ++ stdenv.lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool"; + ++ lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool"; - nativeBuildInputs = [ libtool pkgconfig ]; + nativeBuildInputs = [ libtool pkg-config ]; buildInputs = [ ncurses unibilium ]; meta = with lib; { diff --git a/pkgs/development/libraries/libthai/default.nix b/pkgs/development/libraries/libthai/default.nix index 6179ad0f6bd..ad00906bb8c 100644 --- a/pkgs/development/libraries/libthai/default.nix +++ b/pkgs/development/libraries/libthai/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, installShellFiles, pkg-config, libdatrie }: +{ lib, stdenv, fetchurl, makeWrapper, installShellFiles, pkg-config, libdatrie }: stdenv.mkDerivation rec { pname = "libthai"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { installManPage man/man3/*.3 ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://linux.thai.net/projects/libthai/"; description = "Set of Thai language support routines"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/libtheora/default.nix b/pkgs/development/libraries/libtheora/default.nix index 656204fb0ce..1638150c263 100644 --- a/pkgs/development/libraries/libtheora/default.nix +++ b/pkgs/development/libraries/libtheora/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libogg, libvorbis, pkgconfig}: +{lib, stdenv, fetchurl, libogg, libvorbis, pkg-config}: stdenv.mkDerivation rec { name = "libtheora-1.1.1"; @@ -11,16 +11,16 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; outputDoc = "devdoc"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ libogg libvorbis ]; # GCC's -fforce-addr flag is not supported by clang # It's just an optimization, so it's safe to simply remove it - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace configure --replace "-fforce-addr" "" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.theora.org/"; description = "Library for Theora, a free and open video compression format"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libthreadar/default.nix b/pkgs/development/libraries/libthreadar/default.nix index 587ef2e208a..c67be246928 100644 --- a/pkgs/development/libraries/libthreadar/default.nix +++ b/pkgs/development/libraries/libthreadar/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { version = "1.3.1"; diff --git a/pkgs/development/libraries/libticables2/default.nix b/pkgs/development/libraries/libticables2/default.nix new file mode 100644 index 00000000000..f22d7b796e1 --- /dev/null +++ b/pkgs/development/libraries/libticables2/default.nix @@ -0,0 +1,64 @@ +{ stdenv +, lib +, fetchurl +, pkg-config +, autoreconfHook +, glib +, libusb1 +}: + +stdenv.mkDerivation rec { + pname = "libticables2"; + version = "1.3.5"; + src = fetchurl { + url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2"; + sha256 = "08j5di0cgix9vcpdv7b8xhxdjkk9zz7fqfnv3l4apk3jdr8vcvqc"; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + libusb1 + glib + ]; + + configureFlags = [ + "--enable-libusb10" + ]; + + postInstall = '' + mkdir -p $out/etc/udev/rules.d + cat > $out/etc/udev/rules.d/69-libsane.rules << EOF + ACTION!="add", GOTO="libticables_end" + + # serial device (assume TI calculator) + KERNEL=="ttyS[0-3]", ENV{ID_PDA}="1" + # parallel device (assume TI calculator) + SUBSYSTEM=="ppdev", ENV{ID_PDA}="1" + # SilverLink + SUBSYSTEM=="usb", ATTR{idVendor}=="0451", ATTR{idProduct}=="e001", ENV{ID_PDA}="1" + # TI-84+ DirectLink + SUBSYSTEM=="usb", ATTR{idVendor}=="0451", ATTR{idProduct}=="e003", ENV{ID_PDA}="1" + # TI-89 Titanium DirectLink + SUBSYSTEM=="usb", ATTR{idVendor}=="0451", ATTR{idProduct}=="e004", ENV{ID_PDA}="1" + # TI-84+ SE DirectLink + SUBSYSTEM=="usb", ATTR{idVendor}=="0451", ATTR{idProduct}=="e008", ENV{ID_PDA}="1" + # TI-Nspire DirectLink + SUBSYSTEM=="usb", ATTR{idVendor}=="0451", ATTR{idProduct}=="e012", ENV{ID_PDA}="1" + + LABEL="libticables_end" + EOF + ''; + + meta = with lib; { + changelog = "http://lpg.ticalc.org/prj_tilp/news.html"; + description = "This library is part of the TiLP framework"; + homepage = "http://lpg.ticalc.org/prj_tilp/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ siraben luc65r ]; + platforms = with platforms; linux ++ darwin; + }; +} diff --git a/pkgs/development/libraries/libticalcs2/default.nix b/pkgs/development/libraries/libticalcs2/default.nix new file mode 100644 index 00000000000..6eb013a7ffd --- /dev/null +++ b/pkgs/development/libraries/libticalcs2/default.nix @@ -0,0 +1,50 @@ +{ stdenv +, lib +, fetchurl +, pkg-config +, autoreconfHook +, glib +, libticonv +, libtifiles2 +, libticables2 +, lzma +, bzip2 +, acl +, libobjc +}: + +stdenv.mkDerivation rec { + pname = "libticalcs2"; + version = "1.1.9"; + src = fetchurl { + url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2"; + sha256 = "08c9wgrdnyqcs45mx1bjb8riqq81bzfkhgaijxzn96rhpj40fy3n"; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + glib + libticonv + libtifiles2 + libticables2 + lzma + bzip2 + ] ++ lib.optionals stdenv.isLinux [ + acl + ] ++ lib.optionals stdenv.isDarwin [ + libobjc + ]; + + meta = with lib; { + changelog = "http://lpg.ticalc.org/prj_tilp/news.html"; + description = "This library is part of the TiLP framework"; + homepage = "http://lpg.ticalc.org/prj_tilp/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ siraben luc65r ]; + platforms = with platforms; linux ++ darwin; + }; +} diff --git a/pkgs/development/libraries/libticonv/default.nix b/pkgs/development/libraries/libticonv/default.nix new file mode 100644 index 00000000000..0c075406dee --- /dev/null +++ b/pkgs/development/libraries/libticonv/default.nix @@ -0,0 +1,38 @@ +{ stdenv +, lib +, fetchurl +, pkg-config +, autoreconfHook +, glib +}: + +stdenv.mkDerivation rec { + pname = "libticonv"; + version = "1.1.5"; + src = fetchurl { + url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2"; + sha256 = "0y080v12bm81wgjm6fnw7q0yg7scphm8hhrls9njcszj7fkscv9i"; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + glib + ]; + + configureFlags = [ + "--enable-iconv" + ]; + + meta = with lib; { + changelog = "http://lpg.ticalc.org/prj_tilp/news.html"; + description = "This library is part of the TiLP framework"; + homepage = "http://lpg.ticalc.org/prj_tilp/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ siraben luc65r ]; + platforms = with platforms; linux ++ darwin; + }; +} diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 2f5ccc8c98f..2fad2988898 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -1,7 +1,7 @@ -{ stdenv +{ lib, stdenv , fetchurl -, pkgconfig +, pkg-config , cmake , zlib @@ -18,6 +18,10 @@ stdenv.mkDerivation rec { sha256 = "0d46bdvxdiv59lxnb0xz9ywm8arsr6xsapi5s6y6vnys2wjz6aax"; }; + cmakeFlags = if stdenv.isDarwin then [ + "-DCMAKE_SKIP_BUILD_RPATH=OFF" + ] else null; + # FreeImage needs this patch patches = [ ./headers.patch ]; @@ -29,7 +33,7 @@ stdenv.mkDerivation rec { moveToOutput include/tiffiop.h $dev_private ''; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; propagatedBuildInputs = [ zlib libjpeg xz ]; #TODO: opengl support (bogus configure detection) @@ -38,7 +42,7 @@ stdenv.mkDerivation rec { doInstallCheck = true; installCheckTarget = "test"; - meta = with stdenv.lib; { + meta = with lib; { description = "Library and utilities for working with the TIFF image file format"; homepage = "http://download.osgeo.org/libtiff"; license = licenses.libtiff; diff --git a/pkgs/development/libraries/libtifiles2/default.nix b/pkgs/development/libraries/libtifiles2/default.nix new file mode 100644 index 00000000000..874cbc87c87 --- /dev/null +++ b/pkgs/development/libraries/libtifiles2/default.nix @@ -0,0 +1,38 @@ +{ stdenv +, lib +, fetchurl +, pkg-config +, autoreconfHook +, glib +, libarchive +, libticonv +}: + +stdenv.mkDerivation rec { + pname = "libtifiles2"; + version = "1.1.7"; + src = fetchurl { + url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2"; + sha256 = "10n9mhlabmaw3ha5ckllxfy6fygs2pmlmj5v6w5v62bvx54kpils"; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + glib + libarchive + libticonv + ]; + + meta = with lib; { + changelog = "http://lpg.ticalc.org/prj_tilp/news.html"; + description = "This library is part of the TiLP framework"; + homepage = "http://lpg.ticalc.org/prj_tilp/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ siraben luc65r ]; + platforms = with platforms; linux ++ darwin; + }; +} diff --git a/pkgs/development/libraries/libtiger/default.nix b/pkgs/development/libraries/libtiger/default.nix index fbc726a4519..094ff565b3c 100644 --- a/pkgs/development/libraries/libtiger/default.nix +++ b/pkgs/development/libraries/libtiger/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, libkate, pango, cairo, pkgconfig, darwin }: +{ stdenv, lib, fetchurl, libkate, pango, cairo, pkg-config, darwin }: stdenv.mkDerivation rec { name = "libtiger-0.3.4"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0rj1bmr9kngrgbxrjbn4f4f9pww0wmf6viflinq7ava7zdav4hkk"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libkate pango cairo ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.ApplicationServices; diff --git a/pkgs/development/libraries/libtins/default.nix b/pkgs/development/libraries/libtins/default.nix index d70921e3354..7279dc9ddfa 100644 --- a/pkgs/development/libraries/libtins/default.nix +++ b/pkgs/development/libraries/libtins/default.nix @@ -1,4 +1,4 @@ -{ boost, cmake, fetchFromGitHub, gtest, libpcap, openssl, stdenv }: +{ boost, cmake, fetchFromGitHub, gtest, libpcap, openssl, lib, stdenv }: stdenv.mkDerivation rec { pname = "libtins"; @@ -36,12 +36,12 @@ stdenv.mkDerivation rec { ''; checkTarget = "tests test"; - meta = with stdenv.lib; { + meta = with lib; { description = "High-level, multiplatform C++ network packet sniffing and crafting library"; homepage = "https://libtins.github.io/"; changelog = "https://raw.githubusercontent.com/mfontanini/${pname}/v${version}/CHANGES.md"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; maintainers = with maintainers; [ fdns ]; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libtomcrypt/default.nix b/pkgs/development/libraries/libtomcrypt/default.nix index 4587701011d..7ed8fca3bab 100644 --- a/pkgs/development/libraries/libtomcrypt/default.nix +++ b/pkgs/development/libraries/libtomcrypt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, libtool }: +{ lib, stdenv, fetchurl, fetchpatch, libtool }: stdenv.mkDerivation rec { pname = "libtomcrypt"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.libtom.net/LibTomCrypt/"; description = "A fairly comprehensive, modular and portable cryptographic toolkit"; license = with licenses; [ publicDomain wtfpl ]; diff --git a/pkgs/development/libraries/libtommath/default.nix b/pkgs/development/libraries/libtommath/default.nix index 9a0a2def4b7..058ae524231 100644 --- a/pkgs/development/libraries/libtommath/default.nix +++ b/pkgs/development/libraries/libtommath/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libtool }: +{ lib, stdenv, fetchurl, libtool }: stdenv.mkDerivation rec { pname = "libtommath"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.libtom.net/LibTomMath/"; description = "A library for integer-based number-theoretic applications"; license = with licenses; [ publicDomain wtfpl ]; diff --git a/pkgs/development/libraries/libtorrent-rasterbar/1.1.nix b/pkgs/development/libraries/libtorrent-rasterbar/1.1.nix index b2c958795f3..a898dd8e24e 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/1.1.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/1.1.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, automake, autoconf +{ stdenv, lib, fetchFromGitHub, pkg-config, automake, autoconf , zlib, boost, openssl, libtool, python, libiconv, ncurses }: @@ -22,7 +22,7 @@ in stdenv.mkDerivation { }; enableParallelBuilding = true; - nativeBuildInputs = [ automake autoconf libtool pkgconfig ]; + nativeBuildInputs = [ automake autoconf libtool pkg-config ]; buildInputs = [ boostPython openssl zlib python libiconv ncurses ]; preConfigure = "./autotool.sh"; @@ -40,7 +40,7 @@ in stdenv.mkDerivation { "--with-boost-libdir=${boostPython.out}/lib" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://libtorrent.org/"; description = "A C++ BitTorrent implementation focusing on efficiency and scalability"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libtorrent-rasterbar/1.2.nix b/pkgs/development/libraries/libtorrent-rasterbar/1.2.nix index 9a165780b7e..fc97b629a52 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/1.2.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/1.2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkg-config, automake, autoconf +{ lib, stdenv, fetchFromGitHub, pkg-config, automake, autoconf , zlib, boost, openssl, libtool, python, libiconv, ncurses, SystemConfiguration }: @@ -25,7 +25,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ automake autoconf libtool pkg-config ]; buildInputs = [ boostPython openssl zlib python libiconv ncurses ] - ++ stdenv.lib.optionals stdenv.isDarwin [ SystemConfiguration ]; + ++ lib.optionals stdenv.isDarwin [ SystemConfiguration ]; preConfigure = "./autotool.sh"; @@ -43,7 +43,7 @@ in stdenv.mkDerivation { "--with-boost-libdir=${boostPython.out}/lib" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://libtorrent.org/"; description = "A C++ BitTorrent implementation focusing on efficiency and scalability"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index e9c59ed97e8..ad3a47f99ce 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake +{ lib, stdenv, fetchFromGitHub, cmake , zlib, boost, openssl, python, ncurses, SystemConfiguration }: @@ -23,7 +23,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; buildInputs = [ boostPython openssl zlib python ncurses ] - ++ stdenv.lib.optionals stdenv.isDarwin [ SystemConfiguration ]; + ++ lib.optionals stdenv.isDarwin [ SystemConfiguration ]; postInstall = '' moveToOutput "include" "$dev" @@ -36,7 +36,7 @@ in stdenv.mkDerivation { "-Dpython-bindings=on" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://libtorrent.org/"; description = "A C++ BitTorrent implementation focusing on efficiency and scalability"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index 42c35e68edd..4badf32fe8c 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, cmake, libsodium, ncurses, libopus, msgpack -, libvpx, check, libconfig, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, cmake, libsodium, ncurses, libopus, msgpack +, libvpx, check, libconfig, pkg-config }: let generic = { version, sha256 }: @@ -22,11 +22,11 @@ let buildInputs = [ libsodium msgpack ncurses libconfig - ] ++ stdenv.lib.optionals (!stdenv.isAarch32) [ + ] ++ lib.optionals (!stdenv.isAarch32) [ libopus libvpx ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; doCheck = false; # hangs, tries to access the net? checkInputs = [ check ]; @@ -37,7 +37,7 @@ let -e "s|^includedir=.*|includedir=$out/include|" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "P2P FOSS instant messaging application aimed to replace Skype"; homepage = "https://tox.chat"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/libtoxcore/new-api.nix b/pkgs/development/libraries/libtoxcore/new-api.nix index 6cd5f9122a4..77119e2830f 100644 --- a/pkgs/development/libraries/libtoxcore/new-api.nix +++ b/pkgs/development/libraries/libtoxcore/new-api.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, libsodium, ncurses, libopus -, libvpx, check, libconfig, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, libsodium, ncurses, libopus +, libvpx, check, libconfig, pkg-config }: stdenv.mkDerivation { name = "tox-core-new-20160727"; @@ -30,14 +30,14 @@ stdenv.mkDerivation { ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ autoreconfHook libsodium ncurses check libconfig - ] ++ stdenv.lib.optionals (!stdenv.isAarch32) [ + ] ++ lib.optionals (!stdenv.isAarch32) [ libopus ]; - propagatedBuildInputs = stdenv.lib.optionals (!stdenv.isAarch32) [ libvpx ]; + propagatedBuildInputs = lib.optionals (!stdenv.isAarch32) [ libvpx ]; # Some tests fail randomly due to timeout. This kind of problem is well known # by upstream: https://github.com/irungentoo/toxcore/issues/{950,1054} @@ -47,7 +47,7 @@ stdenv.mkDerivation { # NOTE: run the tests locally on your machine before upgrading this package! doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "P2P FOSS instant messaging application aimed to replace Skype with crypto"; license = licenses.gpl3Plus; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/libraries/libtsm/default.nix b/pkgs/development/libraries/libtsm/default.nix index 21108fa108e..d959306c971 100644 --- a/pkgs/development/libraries/libtsm/default.nix +++ b/pkgs/development/libraries/libtsm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libxkbcommon, pkgconfig, cmake }: +{ lib, stdenv, fetchFromGitHub, libxkbcommon, pkg-config, cmake }: stdenv.mkDerivation rec { pname = "libtsm"; @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { buildInputs = [ libxkbcommon ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Terminal-emulator State Machine"; homepage = "http://www.freedesktop.org/wiki/Software/kmscon/libtsm/"; license = licenses.mit; diff --git a/pkgs/development/libraries/libu2f-host/default.nix b/pkgs/development/libraries/libu2f-host/default.nix index a9c62673115..3be758c906f 100644 --- a/pkgs/development/libraries/libu2f-host/default.nix +++ b/pkgs/development/libraries/libu2f-host/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, json_c, hidapi }: +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, json_c, hidapi }: stdenv.mkDerivation rec { pname = "libu2f-host"; @@ -18,12 +18,12 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ json_c hidapi ]; doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://developers.yubico.com/libu2f-host"; description = "A C library and command-line tool that implements the host-side of the U2F protocol"; license = with licenses; [ gpl3Plus lgpl21Plus ]; diff --git a/pkgs/development/libraries/libu2f-server/default.nix b/pkgs/development/libraries/libu2f-server/default.nix index cd961cde1d2..7f596978cf0 100644 --- a/pkgs/development/libraries/libu2f-server/default.nix +++ b/pkgs/development/libraries/libu2f-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, json_c, openssl, check, file, help2man, which, gengetopt }: +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, json_c, openssl, check, file, help2man, which, gengetopt }: stdenv.mkDerivation rec { name = "libu2f-server-1.1.0"; @@ -16,10 +16,10 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ json_c openssl check file help2man which gengetopt ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://developers.yubico.com/libu2f-server/"; description = "A C library that implements the server-side of the U2F protocol"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/libubox/default.nix b/pkgs/development/libraries/libubox/default.nix index 2cd5bd8a341..f8dfa80a959 100644 --- a/pkgs/development/libraries/libubox/default.nix +++ b/pkgs/development/libraries/libubox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchgit, cmake, pkgconfig, json_c }: +{ stdenv, lib, fetchgit, cmake, pkg-config, json_c }: stdenv.mkDerivation { pname = "libubox"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { cmakeFlags = [ "-DBUILD_LUA=OFF" "-DBUILD_EXAMPLES=OFF" ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ json_c ]; meta = with lib; { diff --git a/pkgs/development/libraries/libuchardet/default.nix b/pkgs/development/libraries/libuchardet/default.nix index 43fa300f107..443791f2451 100644 --- a/pkgs/development/libraries/libuchardet/default.nix +++ b/pkgs/development/libraries/libuchardet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake }: +{ lib, stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { pname = "uchardet"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Mozilla's Universal Charset Detector C/C++ API"; homepage = "https://www.freedesktop.org/wiki/Software/uchardet/"; license = licenses.mpl11; diff --git a/pkgs/development/libraries/libucl/default.nix b/pkgs/development/libraries/libucl/default.nix index b9b33453a4c..e65d0d475ff 100644 --- a/pkgs/development/libraries/libucl/default.nix +++ b/pkgs/development/libraries/libucl/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , pkg-config , autoreconfHook @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook ]; - buildInputs = with stdenv.lib; + buildInputs = with lib; concatLists ( mapAttrsToList (feat: enabled: optionals enabled (featureDeps."${feat}" or []) @@ -45,10 +45,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - configureFlags = with stdenv.lib; + configureFlags = with lib; mapAttrsToList (feat: enabled: strings.enableFeature enabled feat) features; - meta = with stdenv.lib; { + meta = with lib; { description = "Universal configuration library parser"; homepage = "https://github.com/vstakhov/libucl"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/libuecc/default.nix b/pkgs/development/libraries/libuecc/default.nix index e5d21e2d8f7..1cc3ac8ebea 100644 --- a/pkgs/development/libraries/libuecc/default.nix +++ b/pkgs/development/libraries/libuecc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake }: +{ lib, stdenv, fetchgit, cmake }: stdenv.mkDerivation rec { version = "7"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Very small Elliptic Curve Cryptography library"; homepage = "https://git.universe-factory.net/libuecc"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/libui/default.nix b/pkgs/development/libraries/libui/default.nix index 5cb19f863cc..7002f75cc45 100644 --- a/pkgs/development/libraries/libui/default.nix +++ b/pkgs/development/libraries/libui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, gtk3, Cocoa }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, gtk3, Cocoa }: let shortName = "libui"; @@ -15,21 +15,21 @@ stdenv.mkDerivation { sha256 = "0bm6xvqk4drg2kw6d304x6mlfal7gh8mbl5a9f0509smmdzgdkwm"; }; - nativeBuildInputs = [ cmake pkgconfig ]; - propagatedBuildInputs = stdenv.lib.optional stdenv.isLinux gtk3 - ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ]; + nativeBuildInputs = [ cmake pkg-config ]; + propagatedBuildInputs = lib.optional stdenv.isLinux gtk3 + ++ lib.optionals stdenv.isDarwin [ Cocoa ]; - preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.isDarwin '' sed -i 's/set(CMAKE_OSX_DEPLOYMENT_TARGET "10.8")//' ./CMakeLists.txt ''; installPhase = '' mkdir -p $out/{include,lib} mkdir -p $out/lib/pkgconfig - '' + stdenv.lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.isLinux '' mv ./out/${shortName}.so.0 $out/lib/ ln -s $out/lib/${shortName}.so.0 $out/lib/${shortName}.so - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' mv ./out/${shortName}.A.dylib $out/lib/ ln -s $out/lib/${shortName}.A.dylib $out/lib/${shortName}.dylib '' + '' @@ -41,11 +41,11 @@ stdenv.mkDerivation { --subst-var-by out $out \ --subst-var-by version "${version}" ''; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.isDarwin '' install_name_tool -id $out/lib/${shortName}.A.dylib $out/lib/${shortName}.A.dylib ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/andlabs/libui"; description = "Simple and portable (but not inflexible) GUI library in C that uses the native GUI technologies of each platform it supports"; license = licenses.mit; diff --git a/pkgs/development/libraries/libuinputplus/default.nix b/pkgs/development/libraries/libuinputplus/default.nix index 700a4701fc8..9085b861078 100644 --- a/pkgs/development/libraries/libuinputplus/default.nix +++ b/pkgs/development/libraries/libuinputplus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config }: stdenv.mkDerivation rec { pname = "libuinputplus"; @@ -11,9 +11,9 @@ stdenv.mkDerivation rec { sha256 = "0jy5i7bmjad7hw1qcyjl4swqribp2027s9g3609zwj7lj8z5x0bg"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Easy-to-use uinput library in C++"; license = licenses.mit; diff --git a/pkgs/development/libraries/libunarr/default.nix b/pkgs/development/libraries/libunarr/default.nix index 6515a51f137..523ce82ce22 100644 --- a/pkgs/development/libraries/libunarr/default.nix +++ b/pkgs/development/libraries/libunarr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake }: +{ lib, stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { pname = "libunarr"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/selmf/unarr"; description = "A lightweight decompression library with support for rar, tar and zip archives"; license = licenses.lgpl3; diff --git a/pkgs/development/libraries/libunibreak/default.nix b/pkgs/development/libraries/libunibreak/default.nix index d30c84b52a2..9e6cec471d4 100644 --- a/pkgs/development/libraries/libunibreak/default.nix +++ b/pkgs/development/libraries/libunibreak/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "libunibreak"; version = "4.3"; src = let - rev_version = stdenv.lib.replaceStrings ["."] ["_"] version; + rev_version = lib.replaceStrings ["."] ["_"] version; in fetchFromGitHub { owner = "adah1972"; repo = pname; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/adah1972/libunibreak"; description = "Implementation of line breaking and word breaking algorithms as in the Unicode standard"; license = licenses.zlib; diff --git a/pkgs/development/libraries/libuninameslist/default.nix b/pkgs/development/libraries/libuninameslist/default.nix index afae04cb6b2..2e75c783681 100644 --- a/pkgs/development/libraries/libuninameslist/default.nix +++ b/pkgs/development/libraries/libuninameslist/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { autoreconfHook ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/fontforge/libuninameslist/"; description = "A Library of Unicode names and annotation data"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libunique/3.x.nix b/pkgs/development/libraries/libunique/3.x.nix index e960117125e..72027b85ed4 100644 --- a/pkgs/development/libraries/libunique/3.x.nix +++ b/pkgs/development/libraries/libunique/3.x.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , dbus, dbus-glib, gtk3, gobject-introspection , gtk-doc, docbook_xml_dtd_45, docbook_xsl , libxslt, libxml2 }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { majorVer = "3.0"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "0f70lkw66v9cj72q0iw1s2546r6bwwcd8idcm3621fg2fgh2rw58"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ dbus dbus-glib gtk3 gobject-introspection gtk-doc docbook_xml_dtd_45 docbook_xsl libxslt libxml2 ]; meta = { @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { description = "A library for writing single instance applications"; license = licenses.lgpl21; maintainers = [ maintainers.AndersonTorres ]; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libunique/default.nix b/pkgs/development/libraries/libunique/default.nix index 502fd27ebb6..27db05ee98a 100644 --- a/pkgs/development/libraries/libunique/default.nix +++ b/pkgs/development/libraries/libunique/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, pkgconfig, glib, gtk2, dbus-glib }: +{ lib, stdenv, fetchurl, pkg-config, glib, gtk2, dbus-glib }: stdenv.mkDerivation rec { pname = "libunique"; version = "1.1.6"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "1fsgvmncd9caw552lyfg8swmsd6bh4ijjsph69bwacwfxwf09j75"; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ./1.1.6-include-terminator.patch ] ++ [ ./gcc7-bug.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib gtk2 dbus-glib ]; # Don't make deprecated usages hard errors @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://wiki.gnome.org/Attic/LibUnique"; description = "A library for writing single instance applications"; - license = stdenv.lib.licenses.lgpl21; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = lib.licenses.lgpl21; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix index 5f300ef5199..f7a77832c18 100644 --- a/pkgs/development/libraries/libunistring/default.nix +++ b/pkgs/development/libraries/libunistring/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, libiconv }: +{ fetchurl, lib, stdenv, libiconv }: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "info" "doc" ]; - propagatedBuildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv; + propagatedBuildInputs = lib.optional (!stdenv.isLinux) libiconv; configureFlags = [ "--with-libiconv-prefix=${libiconv}" @@ -64,9 +64,9 @@ stdenv.mkDerivation rec { strings as internal in-memory representation. ''; - license = stdenv.lib.licenses.lgpl3Plus; + license = lib.licenses.lgpl3Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/libraries/libunity/default.nix b/pkgs/development/libraries/libunity/default.nix index 037e84069b4..f6fb9a13e4c 100644 --- a/pkgs/development/libraries/libunity/default.nix +++ b/pkgs/development/libraries/libunity/default.nix @@ -1,6 +1,6 @@ -{ stdenv +{ lib, stdenv , fetchgit -, pkgconfig +, pkg-config , glib , vala , dee @@ -28,7 +28,7 @@ stdenv.mkDerivation { autoreconfHook gobject-introspection intltool - pkgconfig + pkg-config python3 vala ]; @@ -56,7 +56,7 @@ stdenv.mkDerivation { "--with-pygi-overrides-dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A library for instrumenting and integrating with all aspects of the Unity shell"; homepage = "https://launchpad.net/libunity"; license = licenses.lgpl3; diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix index 7e481034f43..b2b5db2309c 100644 --- a/pkgs/development/libraries/libunwind/default.nix +++ b/pkgs/development/libraries/libunwind/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.nongnu.org/libunwind"; description = "A portable and efficient API to determine the call-chain of a program"; maintainers = with maintainers; [ orivej ]; diff --git a/pkgs/development/libraries/liburcu/default.nix b/pkgs/development/libraries/liburcu/default.nix index 6046bcf8eab..d108bf4e6df 100644 --- a/pkgs/development/libraries/liburcu/default.nix +++ b/pkgs/development/libraries/liburcu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl }: +{ lib, stdenv, fetchurl, perl }: stdenv.mkDerivation rec { version = "0.12.1"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { preCheck = "patchShebangs tests/unit"; doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Userspace RCU (read-copy-update) library"; homepage = "https://lttng.org/urcu"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/liburing/default.nix b/pkgs/development/libraries/liburing/default.nix index 938846ace54..6a94f37181d 100644 --- a/pkgs/development/libraries/liburing/default.nix +++ b/pkgs/development/libraries/liburing/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit +{ lib, stdenv, fetchgit , fetchpatch }: @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { '' ; - meta = with stdenv.lib; { + meta = with lib; { description = "Userspace library for the Linux io_uring API"; homepage = "https://git.kernel.dk/cgit/liburing/"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libusb-compat/0.1.nix b/pkgs/development/libraries/libusb-compat/0.1.nix index 2830ef28458..b23123f56ea 100644 --- a/pkgs/development/libraries/libusb-compat/0.1.nix +++ b/pkgs/development/libraries/libusb-compat/0.1.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , autoreconfHook , patchelf -, pkgconfig +, pkg-config , libusb1 }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; # get rid of propagating systemd closure outputBin = "dev"; - nativeBuildInputs = [ autoreconfHook patchelf pkgconfig ]; + nativeBuildInputs = [ autoreconfHook patchelf pkg-config ]; buildInputs = [ libusb1 ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { sha256 = "1nybccgjs14b3phhaycq2jx1gym4nf6sghvnv9qdfmlqxacx0jz5"; }; - patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ./fix-headers.patch; + patches = lib.optional stdenv.hostPlatform.isMusl ./fix-headers.patch; # without this, libusb-compat is unable to find libusb1 postFixup = '' @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { patchelf --set-rpath ${lib.makeLibraryPath buildInputs} {} \; ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://libusb.info/"; repositories.git = "https://github.com/libusb/libusb-compat-0.1"; description = "cross-platform user-mode USB device library"; diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index 10310e22da7..d69c8d670c4 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -1,16 +1,14 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook -, pkgconfig +, pkg-config , enableUdev ? stdenv.isLinux && !stdenv.hostPlatform.isMusl -, udev ? null +, udev , libobjc , IOKit , withStatic ? false }: -assert enableUdev -> udev != null; - stdenv.mkDerivation rec { pname = "libusb"; version = "1.0.24"; @@ -24,20 +22,20 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; propagatedBuildInputs = - stdenv.lib.optional enableUdev udev ++ - stdenv.lib.optionals stdenv.isDarwin [ libobjc IOKit ]; + lib.optional enableUdev udev ++ + lib.optionals stdenv.isDarwin [ libobjc IOKit ]; dontDisableStatic = withStatic; - configureFlags = stdenv.lib.optional (!enableUdev) "--disable-udev"; + configureFlags = lib.optional (!enableUdev) "--disable-udev"; - preFixup = stdenv.lib.optionalString enableUdev '' - sed 's,-ludev,-L${stdenv.lib.getLib udev}/lib -ludev,' -i $out/lib/libusb-1.0.la + preFixup = lib.optionalString enableUdev '' + sed 's,-ludev,-L${lib.getLib udev}/lib -ludev,' -i $out/lib/libusb-1.0.la ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://libusb.info/"; repositories.git = "https://github.com/libusb/libusb"; description = "cross-platform user-mode USB device library"; diff --git a/pkgs/development/libraries/libusbmuxd/default.nix b/pkgs/development/libraries/libusbmuxd/default.nix index e2e0a6d9d75..66198a6ec33 100644 --- a/pkgs/development/libraries/libusbmuxd/default.nix +++ b/pkgs/development/libraries/libusbmuxd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libplist }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libplist }: stdenv.mkDerivation rec { pname = "libusbmuxd"; @@ -11,10 +11,10 @@ stdenv.mkDerivation rec { sha256 = "139pzsnixkck6ly1q6p0diqr0hgd0mx0pr4xx1jamm3f3656kpf9"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libplist ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A client library to multiplex connections from and to iOS devices"; homepage = "https://github.com/libimobiledevice/libusbmuxd"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index fa661446b9a..a4447ed3378 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, ApplicationServices, CoreServices }: +{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkg-config, ApplicationServices, CoreServices }: stdenv.mkDerivation rec { version = "1.40.0"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { "threadpool_multiple_event_loops" # times out on slow machines "get_passwd" # passed on NixOS but failed on other Linuxes "tcp_writealot" "udp_multicast_join" "udp_multicast_join6" # times out sometimes - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ # Sometimes: timeout (no output), failed uv_listen. Someone # should report these failures to libuv team. There tests should # be much more robust. @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { "fs_event_watch_dir_recursive" "fs_event_watch_file" "fs_event_watch_file_current_dir" "fs_event_watch_file_exact_path" "process_priority" "udp_create_early_bad_bind" - ] ++ stdenv.lib.optionals stdenv.isAarch32 [ + ] ++ lib.optionals stdenv.isAarch32 [ # I observe this test failing with some regularity on ARMv7: # https://github.com/libuv/libuv/issues/1871 "shutdown_close_pipe" @@ -50,8 +50,8 @@ stdenv.mkDerivation rec { sed '/${tdRegexp}/d' -i test/test-list.h ''; - nativeBuildInputs = [ automake autoconf libtool pkgconfig ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices CoreServices ]; + nativeBuildInputs = [ automake autoconf libtool pkg-config ]; + buildInputs = lib.optionals stdenv.isDarwin [ ApplicationServices CoreServices ]; preConfigure = '' LIBTOOLIZE=libtoolize ./autogen.sh diff --git a/pkgs/development/libraries/libuvc/default.nix b/pkgs/development/libraries/libuvc/default.nix index e2956a99432..e7ff4bb7f28 100644 --- a/pkgs/development/libraries/libuvc/default.nix +++ b/pkgs/development/libraries/libuvc/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , pkg-config @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ libusb1 ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://ken.tossell.net/libuvc/"; description = "Cross-platform library for USB video devices"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libva/1.0.0.nix b/pkgs/development/libraries/libva/1.0.0.nix index 1debefed0ad..ade56ac16ee 100644 --- a/pkgs/development/libraries/libva/1.0.0.nix +++ b/pkgs/development/libraries/libva/1.0.0.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, libX11, pkgconfig, libXext, libdrm, libXfixes, wayland, libffi +{ stdenv, lib, fetchurl, libX11, pkg-config, libXext, libdrm, libXfixes, wayland, libffi , libGL, mesa , minimal ? false, libva1-minimal }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libdrm ] ++ lib.optionals (!minimal) [ libva1-minimal libX11 libXext libXfixes wayland libffi libGL ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { installFlags = [ "dummy_drv_video_ladir=$(out)/lib/dri" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.freedesktop.org/wiki/Software/vaapi"; license = licenses.mit; description = "VAAPI library: Video Acceleration API"; diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index f37780f5d6d..d78332bf5aa 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { "-Ddriverdir=${mesa.drivers.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An implementation for VA-API (Video Acceleration API)"; longDescription = '' VA-API is an open-source library and API specification, which provides diff --git a/pkgs/development/libraries/libva/utils.nix b/pkgs/development/libraries/libva/utils.nix index f860c328fe7..bcd24d51953 100644 --- a/pkgs/development/libraries/libva/utils.nix +++ b/pkgs/development/libraries/libva/utils.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkg-config +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config , libdrm, libva, libX11, libXext, libXfixes, wayland }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ libdrm libva libX11 libXext libXfixes wayland ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A collection of utilities and examples for VA-API"; longDescription = '' libva-utils is a collection of utilities and examples to exercise VA-API diff --git a/pkgs/development/libraries/libvdpau-va-gl/default.nix b/pkgs/development/libraries/libvdpau-va-gl/default.nix index 98176cd41f1..85ebef12fe1 100644 --- a/pkgs/development/libraries/libvdpau-va-gl/default.nix +++ b/pkgs/development/libraries/libvdpau-va-gl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, libX11, libpthreadstubs, libXau, libXdmcp +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libX11, libpthreadstubs, libXau, libXdmcp , libXext, libvdpau, glib, libva, ffmpeg_3, libGLU }: stdenv.mkDerivation rec { @@ -12,12 +12,12 @@ stdenv.mkDerivation rec { sha256 = "0asndybfv8xb0fx73sjjw5kydqrahqkm6n04lh589pbf18s5qlld"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libX11 libpthreadstubs libXau libXdmcp libXext libvdpau glib libva ffmpeg_3 libGLU ]; doCheck = false; # fails. needs DRI access - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/i-rinat/libvdpau-va-gl"; description = "VDPAU driver with OpenGL/VAAPI backend"; license = licenses.lgpl3; diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix index cbb312e0f0d..75dcd337c38 100644 --- a/pkgs/development/libraries/libvdpau/default.nix +++ b/pkgs/development/libraries/libvdpau/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, xorg, mesa, meson, ninja }: +{ lib, stdenv, fetchurl, pkg-config, xorg, mesa, meson, ninja }: stdenv.mkDerivation rec { pname = "libvdpau"; @@ -12,17 +12,17 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ meson ninja pkgconfig ]; + nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = with xorg; [ xorgproto libXext ]; propagatedBuildInputs = [ xorg.libX11 ]; - mesonFlags = stdenv.lib.optional stdenv.isLinux + mesonFlags = lib.optional stdenv.isLinux [ "-Dmoduledir=${mesa.drivers.driverLink}/lib/vdpau" ]; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lX11"; + NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lX11"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://people.freedesktop.org/~aplattner/vdpau/"; description = "Library to use the Video Decode and Presentation API for Unix (VDPAU)"; license = licenses.mit; # expat version diff --git a/pkgs/development/libraries/libversion/default.nix b/pkgs/development/libraries/libversion/default.nix index a26aa9b5694..98ad4ef7fee 100644 --- a/pkgs/development/libraries/libversion/default.nix +++ b/pkgs/development/libraries/libversion/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { doCheck = true; checkTarget = "test"; - meta = with stdenv.lib; { + meta = with lib; { description = "Advanced version string comparison library"; homepage = "https://github.com/repology/libversion"; license = with licenses; [ mit ]; diff --git a/pkgs/development/libraries/libviper/default.nix b/pkgs/development/libraries/libviper/default.nix index f9c695aedf7..e3b3674acc9 100644 --- a/pkgs/development/libraries/libviper/default.nix +++ b/pkgs/development/libraries/libviper/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, glib, ncurses, gpm}: +{lib, stdenv, fetchurl, pkg-config, glib, ncurses, gpm}: stdenv.mkDerivation rec { name = "libviper-1.4.6"; @@ -16,10 +16,10 @@ stdenv.mkDerivation rec { mkdir -p $out/lib ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib ncurses gpm]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://libviper.sourceforge.net/"; description = "Simple window creation and management facilities for the console"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix index bf8d0b373f0..a61094d17fe 100644 --- a/pkgs/development/libraries/libvirt-glib/default.nix +++ b/pkgs/development/libraries/libvirt-glib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gobject-introspection, intltool, vala +{ lib, stdenv, fetchurl, pkg-config, gobject-introspection, intltool, vala , libcap_ng, libvirt, libxml2 }: @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { sha256 = "1zpbv4ninc57c9rw4zmmkvvqn7154iv1qfr20kyxn8xplalqrzvz"; }; - nativeBuildInputs = [ pkgconfig intltool vala gobject-introspection ]; + nativeBuildInputs = [ pkg-config intltool vala gobject-introspection ]; buildInputs = [ libcap_ng libvirt libxml2 gobject-introspection ]; enableParallelBuilding = true; strictDeps = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for working with virtual machines"; longDescription = '' libvirt-glib wraps libvirt to provide a high-level object-oriented API better diff --git a/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch b/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch new file mode 100644 index 00000000000..86dd461ea07 --- /dev/null +++ b/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch @@ -0,0 +1,326 @@ +From a896b0be849455edb83a9305dfec9b41447ef3e4 Mon Sep 17 00:00:00 2001 +From: Euan Kemp <euank@euank.com> +Date: Thu, 14 Jan 2021 00:32:00 -0800 +Subject: [PATCH] meson: patch in an install prefix for building on nix + +Used in the nixpkgs version of libvirt so that we can install things in +the nix store, but read them from the root filesystem. +--- + meson.build | 9 +++++++++ + meson_options.txt | 2 ++ + src/libxl/meson.build | 6 +++--- + src/locking/meson.build | 8 ++++---- + src/lxc/meson.build | 6 +++--- + src/meson.build | 18 +++++++++--------- + src/network/meson.build | 12 ++++++------ + src/nwfilter/xml/meson.build | 2 +- + src/qemu/meson.build | 14 +++++++------- + src/remote/meson.build | 6 +++--- + src/security/apparmor/meson.build | 8 ++++---- + tools/meson.build | 4 ++-- + 12 files changed, 53 insertions(+), 42 deletions(-) + +diff --git a/meson.build b/meson.build +index b5164f6..33719f1 100644 +--- a/meson.build ++++ b/meson.build +@@ -39,6 +39,8 @@ if host_machine.system() == 'windows' + conf.set('WINVER', '0x0600') # Win Vista / Server 2008 + endif + ++# patched in for nix ++install_prefix = get_option('install_prefix') + + # set various paths + +@@ -57,6 +59,13 @@ else + sysconfdir = prefix / get_option('sysconfdir') + endif + ++# nix: don't prefix the localstatedir; some things need to write to it, so it ++# can't be in the nix store, and that's what the prefix is. ++# We'll prefix things ourselves where needed ++localstatedir = get_option('localstatedir') ++# Same for sysconfidr ++sysconfdir = get_option('sysconfdir') ++ + # if --prefix is /usr, don't use /usr/var for localstatedir or /usr/etc for + # sysconfdir as this makes a lot of things break in testing situations + if prefix == '/usr' +diff --git a/meson_options.txt b/meson_options.txt +index e5d79c2..081cd32 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -1,3 +1,5 @@ ++option('install_prefix', type: 'string', value: '', description: 'prefix for nix store installation') ++ + option('no_git', type: 'boolean', value: false, description: 'Disable git submodule update') + option('packager', type: 'string', value: '', description: 'Extra packager name') + option('packager_version', type: 'string', value: '', description: 'Extra packager version') +diff --git a/src/libxl/meson.build b/src/libxl/meson.build +index 3bb6cc5..78d7be0 100644 +--- a/src/libxl/meson.build ++++ b/src/libxl/meson.build +@@ -84,8 +84,8 @@ if conf.has('WITH_LIBXL') + } + + virt_install_dirs += [ +- localstatedir / 'lib' / 'libvirt' / 'libxl', +- runstatedir / 'libvirt' / 'libxl', +- localstatedir / 'log' / 'libvirt' / 'libxl', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'libxl', ++ install_prefix + runstatedir / 'libvirt' / 'libxl', ++ install_prefix + localstatedir / 'log' / 'libvirt' / 'libxl', + ] + endif +diff --git a/src/locking/meson.build b/src/locking/meson.build +index 8a28310..9da81cc 100644 +--- a/src/locking/meson.build ++++ b/src/locking/meson.build +@@ -243,14 +243,14 @@ if conf.has('WITH_LIBVIRTD') + } + + virt_install_dirs += [ +- localstatedir / 'lib' / 'libvirt' / 'lockd', +- localstatedir / 'lib' / 'libvirt' / 'lockd' / 'files', +- runstatedir / 'libvirt' / 'lockd', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'lockd', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'lockd' / 'files', ++ install_prefix + runstatedir / 'libvirt' / 'lockd', + ] + + if conf.has('WITH_SANLOCK') + virt_install_dirs += [ +- localstatedir / 'lib' / 'libvirt' / 'sanlock', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'sanlock', + ] + endif + endif +diff --git a/src/lxc/meson.build b/src/lxc/meson.build +index f8e2a88..96d6687 100644 +--- a/src/lxc/meson.build ++++ b/src/lxc/meson.build +@@ -182,8 +182,8 @@ if conf.has('WITH_LXC') + } + + virt_install_dirs += [ +- localstatedir / 'lib' / 'libvirt' / 'lxc', +- runstatedir / 'libvirt' / 'lxc', +- localstatedir / 'log' / 'libvirt' / 'lxc', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'lxc', ++ install_prefix + runstatedir / 'libvirt' / 'lxc', ++ install_prefix + localstatedir / 'log' / 'libvirt' / 'lxc', + ] + endif +diff --git a/src/meson.build b/src/meson.build +index 7c47821..d33d16a 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -669,7 +669,7 @@ endforeach + + virt_conf_files += 'libvirt.conf' + +-install_data(virt_conf_files, install_dir: confdir) ++install_data(virt_conf_files, install_dir: install_prefix + confdir) + install_data(virt_aug_files, install_dir: virt_aug_dir) + + # augeas_test_data: +@@ -729,7 +729,7 @@ foreach data : virt_daemon_confs + output: '@0@.conf'.format(data['name']), + configuration: daemon_conf, + install: true, +- install_dir: confdir, ++ install_dir: install_prefix + confdir, + ) + + if data.get('with_ip', false) +@@ -853,14 +853,14 @@ if conf.has('WITH_LIBVIRTD') + + install_data( + init_file, +- install_dir: sysconfdir / 'init.d', ++ install_dir: install_prefix + sysconfdir / 'init.d', + rename: [ init['name'] ], + ) + + if init.has_key('confd') + install_data( + init['confd'], +- install_dir: sysconfdir / 'conf.d', ++ install_dir: install_prefix + sysconfdir / 'conf.d', + rename: [ init['name'] ], + ) + endif +@@ -872,7 +872,7 @@ if init_script != 'none' + foreach sysconf : sysconf_files + install_data( + sysconf['file'], +- install_dir: sysconfdir / 'sysconfig', ++ install_dir: install_prefix + sysconfdir / 'sysconfig', + rename: [ sysconf['name'] ], + ) + endforeach +@@ -897,10 +897,10 @@ endif + # Install empty directories + + virt_install_dirs += [ +- localstatedir / 'cache' / 'libvirt', +- localstatedir / 'lib' / 'libvirt' / 'images', +- localstatedir / 'lib' / 'libvirt' / 'filesystems', +- localstatedir / 'lib' / 'libvirt' / 'boot', ++ install_prefix + localstatedir / 'cache' / 'libvirt', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'images', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'filesystems', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'boot', + ] + + meson.add_install_script( +diff --git a/src/network/meson.build b/src/network/meson.build +index 3ec598c..b02040b 100644 +--- a/src/network/meson.build ++++ b/src/network/meson.build +@@ -79,9 +79,9 @@ if conf.has('WITH_NETWORK') + } + + virt_install_dirs += [ +- localstatedir / 'lib' / 'libvirt' / 'network', +- localstatedir / 'lib' / 'libvirt' / 'dnsmasq', +- runstatedir / 'libvirt' / 'network', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'network', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'dnsmasq', ++ install_prefix + runstatedir / 'libvirt' / 'network', + ] + + configure_file( +@@ -89,12 +89,12 @@ if conf.has('WITH_NETWORK') + output: '@BASENAME@', + copy: true, + install: true, +- install_dir: confdir / 'qemu' / 'networks', ++ install_dir: install_prefix + confdir / 'qemu' / 'networks', + ) + + meson.add_install_script( + meson_python_prog.path(), python3_prog.path(), meson_install_symlink_prog.path(), +- confdir / 'qemu' / 'networks' / 'autostart', ++ install_prefix + confdir / 'qemu' / 'networks' / 'autostart', + '../default.xml', 'default.xml', + ) + +diff --git a/src/nwfilter/xml/meson.build b/src/nwfilter/xml/meson.build +index 0d96c54..66c92a1 100644 +--- a/src/nwfilter/xml/meson.build ++++ b/src/nwfilter/xml/meson.build +@@ -25,4 +25,4 @@ nwfilter_xml_files = [ + 'qemu-announce-self.xml', + ] + +-install_data(nwfilter_xml_files, install_dir: sysconfdir / 'libvirt' / 'nwfilter') ++install_data(nwfilter_xml_files, install_dir: install_prefix + sysconfdir / 'libvirt' / 'nwfilter') +diff --git a/src/qemu/meson.build b/src/qemu/meson.build +index 90640b0..8802cec 100644 +--- a/src/qemu/meson.build ++++ b/src/qemu/meson.build +@@ -171,12 +171,12 @@ if conf.has('WITH_QEMU') + } + + virt_install_dirs += [ +- localstatedir / 'lib' / 'libvirt' / 'qemu', +- runstatedir / 'libvirt' / 'qemu', +- localstatedir / 'cache' / 'libvirt' / 'qemu', +- localstatedir / 'log' / 'libvirt' / 'qemu', +- localstatedir / 'lib' / 'libvirt' / 'swtpm', +- runstatedir / 'libvirt' / 'qemu' / 'swtpm', +- localstatedir / 'log' / 'swtpm' / 'libvirt' / 'qemu', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu', ++ install_prefix + runstatedir / 'libvirt' / 'qemu', ++ install_prefix + localstatedir / 'cache' / 'libvirt' / 'qemu', ++ install_prefix + localstatedir / 'log' / 'libvirt' / 'qemu', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'swtpm', ++ install_prefix + runstatedir / 'libvirt' / 'qemu' / 'swtpm', ++ install_prefix + localstatedir / 'log' / 'swtpm' / 'libvirt' / 'qemu', + ] + endif +diff --git a/src/remote/meson.build b/src/remote/meson.build +index 9ad2f6a..429a15b 100644 +--- a/src/remote/meson.build ++++ b/src/remote/meson.build +@@ -245,7 +245,7 @@ if conf.has('WITH_REMOTE') + } + + virt_install_dirs += [ +- localstatedir / 'log' / 'libvirt', ++ install_prefix + localstatedir / 'log' / 'libvirt', + ] + + logrotate_conf = configuration_data() +@@ -259,7 +259,7 @@ if conf.has('WITH_REMOTE') + ) + install_data( + log_file, +- install_dir: sysconfdir / 'logrotate.d', ++ install_dir: install_prefix + sysconfdir / 'logrotate.d', + rename: [ name ], + ) + endforeach +@@ -309,7 +309,7 @@ endif + if conf.has('WITH_SASL') + install_data( + 'libvirtd.sasl', +- install_dir: sysconfdir / 'sasl2', ++ install_dir: install_prefix + sysconfdir / 'sasl2', + rename: [ 'libvirt.conf' ], + ) + endif +diff --git a/src/security/apparmor/meson.build b/src/security/apparmor/meson.build +index af43780..e2d6c81 100644 +--- a/src/security/apparmor/meson.build ++++ b/src/security/apparmor/meson.build +@@ -17,22 +17,22 @@ foreach name : apparmor_gen_profiles + output: name, + configuration: apparmor_gen_profiles_conf, + install: true, +- install_dir: apparmor_dir, ++ install_dir: install_prefix + apparmor_dir, + ) + endforeach + + install_data( + [ 'libvirt-qemu', 'libvirt-lxc' ], +- install_dir: apparmor_dir / 'abstractions', ++ install_dir: install_prefix + apparmor_dir / 'abstractions', + ) + + install_data( + [ 'TEMPLATE.qemu', 'TEMPLATE.lxc' ], +- install_dir: apparmor_dir / 'libvirt', ++ install_dir: install_prefix + apparmor_dir / 'libvirt', + ) + + install_data( + 'usr.lib.libvirt.virt-aa-helper.local', +- install_dir: apparmor_dir / 'local', ++ install_dir: install_prefix + apparmor_dir / 'local', + rename: 'usr.lib.libvirt.virt-aa-helper', + ) +diff --git a/tools/meson.build b/tools/meson.build +index b8c6802..dacd0ff 100644 +--- a/tools/meson.build ++++ b/tools/meson.build +@@ -115,7 +115,7 @@ if conf.has('WITH_LOGIN_SHELL') + install_rpath: libvirt_rpath, + ) + +- install_data('virt-login-shell.conf', install_dir: sysconfdir / 'libvirt') ++ install_data('virt-login-shell.conf', install_dir: install_prefix + sysconfdir / 'libvirt') + endif + + if host_machine.system() == 'windows' +@@ -274,7 +274,7 @@ configure_file( + if init_script == 'systemd' + install_data( + 'libvirt-guests.sysconf', +- install_dir: sysconfdir / 'sysconfig', ++ install_dir: install_prefix + sysconfdir / 'sysconfig', + rename: 'libvirt-guests', + ) diff --git a/pkgs/development/libraries/libvirt/5.9.0.nix b/pkgs/development/libraries/libvirt/5.9.0.nix index b880d364274..76466a1a9f5 100644 --- a/pkgs/development/libraries/libvirt/5.9.0.nix +++ b/pkgs/development/libraries/libvirt/5.9.0.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, fetchgit -, pkgconfig, makeWrapper, libtool, autoconf, automake, fetchpatch +{ lib, stdenv, fetchurl, fetchgit +, pkg-config, makeWrapper, libtool, autoconf, automake, fetchpatch , coreutils, libxml2, gnutls, perl, python2, attr , iproute, iptables, readline, lvm2, util-linux, systemd, libpciaccess, gettext , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor @@ -10,7 +10,7 @@ , enableCeph ? false, ceph }: -with stdenv.lib; +with lib; # if you update, also bump <nixpkgs/pkgs/development/python-modules/libvirt/default.nix> and SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix> let @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ makeWrapper pkgconfig rpcsvc-proto ]; + nativeBuildInputs = [ makeWrapper pkg-config rpcsvc-proto ]; buildInputs = [ libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl libxslt xhtml1 perlPackages.XMLXPath curl libpcap glib @@ -54,7 +54,7 @@ in stdenv.mkDerivation rec { preConfigure = '' ${ optionalString (!buildFromTarball) "./bootstrap --no-git --gnulib-srcdir=$(pwd)/.gnulib" } - PATH=${stdenv.lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute iptables ebtables lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH + PATH=${lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute iptables ebtables lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH # the path to qemu-kvm will be stored in VM's .xml and .save files # do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations substituteInPlace src/lxc/lxc_conf.c \ diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 224168888c0..100f79ae4e8 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -1,42 +1,58 @@ -{ stdenv, fetchurl, fetchgit -, pkgconfig, makeWrapper, autoreconfHook, fetchpatch +{ lib, stdenv, fetchurl, fetchgit +, makeWrapper, autoreconfHook, fetchpatch , coreutils, libxml2, gnutls, perl, python2, attr, glib, docutils -, iproute, iptables, readline, lvm2, util-linux, systemd, libpciaccess, gettext -, libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor +, iproute, readline, lvm2, util-linux, systemd, libpciaccess, gettext +, libtasn1, iptables, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages , curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode, dbus, libtirpc, rpcsvc-proto, darwin +, meson, ninja, audit, cmake, bash-completion, pkg-config , enableXen ? false, xen ? null , enableIscsi ? false, openiscsi , enableCeph ? false, ceph }: -with stdenv.lib; +with lib; # if you update, also bump <nixpkgs/pkgs/development/python-modules/libvirt/default.nix> and SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix> let buildFromTarball = stdenv.isDarwin; + # libvirt hardcodes the binary name 'ebtables', but in nixpkgs the ebtables + # binary we want to use is named 'ebtables-legacy'. + # Create a derivation to alias the binary name so that libvirt can find the right one, and use that below. + ebtables-compat = stdenv.mkDerivation { + pname = "ebtables-compat"; + version = ebtables.version; + src = null; + buildInputs = [ ebtables ]; + buildCommand = '' + mkdir -p $out/bin + ln -sf ${ebtables}/bin/ebtables-legacy $out/bin/ebtables + ''; + }; in stdenv.mkDerivation rec { pname = "libvirt"; - version = "6.6.0"; + version = "7.0.0"; src = if buildFromTarball then fetchurl { url = "https://libvirt.org/sources/${pname}-${version}.tar.xz"; - sha256 = "1y8y13zvh820f4b15287wb77wq7ra7kbfnpblzhm1dki5pfjvrcl"; + sha256 = "12fxkpy7j2qhfxypw9jg3bzdd9xx6vf6x96iy5kjihh89n236f6a"; } else fetchgit { url = "https://gitlab.com/libvirt/libvirt.git"; rev = "v${version}"; - sha256 = "09hsbm2qmx0jfmm418rf5lx374g85bwgg0kzlga62x5180jhsssn"; + sha256 = "0xg9d410008mny73r2cp5ipghqpk0gz9gy7j32vcfk691dq75b3c"; fetchSubmodules = true; }; + patches = [ + ./0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch + ]; + nativeBuildInputs = [ - makeWrapper pkgconfig docutils - ] ++ optionals (!buildFromTarball) [ - autoreconfHook + ninja meson cmake makeWrapper pkg-config docutils ] ++ optional (!stdenv.isDarwin) [ rpcsvc-proto ] ++ optionals stdenv.isDarwin [ @@ -44,10 +60,11 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ + bash-completion pkg-config libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl libxslt xhtml1 perlPackages.XMLXPath curl libpcap glib dbus ] ++ optionals stdenv.isLinux [ - libpciaccess lvm2 util-linux systemd libnl numad zfs + audit libpciaccess lvm2 util-linux systemd libnl numad zfs libapparmor libcap_ng numactl attr parted libtirpc ] ++ optionals (enableXen && stdenv.isLinux && stdenv.isx86_64) [ xen @@ -59,69 +76,64 @@ in stdenv.mkDerivation rec { libiconv gmp ]; - preConfigure = '' - PATH=${stdenv.lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute iptables ebtables lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH + preConfigure = let + overrides = { + QEMU_BRIDGE_HELPER = "/run/wrappers/bin/qemu-bridge-helper"; + QEMU_PR_HELPER = "/run/libvirt/nix-helpers/qemu-pr-helper"; + }; + patchBuilder = var: value: '' + sed -i meson.build -e "s|conf.set_quoted('${var}',.*|conf.set_quoted('${var}','${value}')|" + ''; + in '' + PATH=${lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute iptables ebtables-compat lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH # the path to qemu-kvm will be stored in VM's .xml and .save files # do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations substituteInPlace src/lxc/lxc_conf.c \ --replace 'lxc_path,' '"/run/libvirt/nix-emulators/libvirt_lxc",' patchShebangs . # fixes /usr/bin/python references - mkdir -p build && cd build - ''; + '' + + (lib.concatStringsSep "\n" (lib.mapAttrsToList patchBuilder overrides)); - configureScript = "../configure"; + mesonAutoFeatures = "auto"; - dontAddDisableDepTrack = true; - - configureFlags = [ - "--with-runstatedir=/run" # TODO: remove when autoconf 2.70 is released - "--localstatedir=/var" + mesonFlags = let + opt = option: enable: "-D${option}=${if enable then "enabled" else "disabled"}"; + in [ "--sysconfdir=/var/lib" - "--with-libpcap" - "--with-qemu" - "--with-vmware" - "--with-vbox" - "--with-test" - "--with-esx" - "--with-remote" - "--with-polkit" + "-Dinstall_prefix=${placeholder "out"}" + "-Dlocalstatedir=/var" + "-Drunstatedir=/run" + "-Dlibpcap=enabled" + "-Ddriver_qemu=enabled" + "-Ddriver_vmware=enabled" + "-Ddriver_vbox=enabled" + "-Ddriver_test=enabled" + "-Ddriver_esx=enabled" + "-Ddriver_remote=enabled" + "-Dpolkit=enabled" + (opt "storage_iscsi" enableIscsi) ] ++ optionals stdenv.isLinux [ - "QEMU_BRIDGE_HELPER=/run/wrappers/bin/qemu-bridge-helper" - "QEMU_PR_HELPER=/run/libvirt/nix-helpers/qemu-pr-helper" - "EBTABLES_PATH=${ebtables}/bin/ebtables-legacy" - "CFLAGS=-I${libtirpc.dev}/include/tirpc" - "--with-attr" - "--with-apparmor" - "--with-secdriver-apparmor" - "--with-numad" - "--with-macvtap" - "--with-virtualport" - "--with-storage-disk" - ] ++ optionals (stdenv.isLinux && zfs != null) [ - "--with-storage-zfs" - ] ++ optionals enableIscsi [ - "--with-storage-iscsi" - ] ++ optionals enableCeph [ - "--with-storage-rbd" + (opt "storage_zfs" (zfs != null)) + "-Dattr=enabled" + "-Dapparmor=enabled" + "-Dsecdriver_apparmor=enabled" + "-Dnumad=enabled" + "-Dstorage_disk=enabled" + (opt "storage_rbd" enableCeph) ] ++ optionals stdenv.isDarwin [ - "--with-init-script=none" - ]; - - installFlags = [ - "runstatedir=${placeholder "out"}/run" - "localstatedir=$(TMPDIR)/var" - "sysconfdir=$(out)/var/lib" + "-Dinit_script=none" ]; postInstall = let - binPath = [ iptables iproute pmutils numad numactl bridge-utils dmidecode dnsmasq ebtables ] ++ optionals enableIscsi [ openiscsi ]; + # Keep the legacy iptables binary for now for backwards compatibility (comment on #109332) + binPath = [ iptables ebtables-compat iproute pmutils numad numactl bridge-utils dmidecode dnsmasq ] ++ optionals enableIscsi [ openiscsi ]; in '' substituteInPlace $out/libexec/libvirt-guests.sh \ - --replace 'ON_BOOT=start' 'ON_BOOT=''${ON_BOOT:-start}' \ - --replace 'ON_SHUTDOWN=suspend' 'ON_SHUTDOWN=''${ON_SHUTDOWN:-suspend}' \ - --replace "$out/bin" '${gettext}/bin' \ - --replace 'lock/subsys' 'lock' \ - --replace 'gettext.sh' 'gettext.sh + --replace 'ON_BOOT="start"' 'ON_BOOT=''${ON_BOOT:-start}' \ + --replace 'ON_SHUTDOWN="suspend"' 'ON_SHUTDOWN=''${ON_SHUTDOWN:-suspend}' \ + --replace "$out/bin" '${gettext}/bin' \ + --replace 'lock/subsys' 'lock' \ + --replace 'gettext.sh' 'gettext.sh # Added in nixpkgs: gettext() { "${gettext}/bin/gettext" "$@"; } ' @@ -132,8 +144,6 @@ in stdenv.mkDerivation rec { --prefix PATH : /run/libvirt/nix-emulators:${makeBinPath binPath} ''; - enableParallelBuilding = true; - meta = { homepage = "https://libvirt.org/"; repositories.git = "git://libvirt.org/libvirt.git"; diff --git a/pkgs/development/libraries/libvisio/default.nix b/pkgs/development/libraries/libvisio/default.nix index b84ba92e2bf..42051fe66a6 100644 --- a/pkgs/development/libraries/libvisio/default.nix +++ b/pkgs/development/libraries/libvisio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, libwpd, libwpg, pkgconfig, zlib, gperf +{ lib, stdenv, fetchurl, boost, libwpd, libwpg, pkg-config, zlib, gperf , librevenge, libxml2, icu, perl, cppunit, doxygen }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0k7adcbbf27l7n453cca1m6s9yj6qvb5j6bsg2db09ybf3w8vbwg"; }; - nativeBuildInputs = [ pkgconfig cppunit doxygen ]; + nativeBuildInputs = [ pkg-config cppunit doxygen ]; buildInputs = [ boost libwpd libwpg zlib gperf librevenge libxml2 icu perl ]; configureFlags = [ @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A library providing ability to interpret and import visio diagrams into various applications"; homepage = "https://wiki.documentfoundation.org/DLP/Libraries/libvisio"; license = licenses.mpl20; diff --git a/pkgs/development/libraries/libvisual/default.nix b/pkgs/development/libraries/libvisual/default.nix index 8fe53acc245..7a996d3b807 100644 --- a/pkgs/development/libraries/libvisual/default.nix +++ b/pkgs/development/libraries/libvisual/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib }: +{ lib, stdenv, fetchurl, pkg-config, glib }: stdenv.mkDerivation rec { name = "libvisual-0.4.0"; @@ -8,12 +8,12 @@ stdenv.mkDerivation rec { sha256 = "1my1ipd5k1ixag96kwgf07bgxkjlicy9w22jfxb2kq95f6wgsk8b"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib ]; hardeningDisable = [ "format" ]; - configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + configureFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "ac_cv_func_malloc_0_nonnull=yes" "ac_cv_func_realloc_0_nonnull=yes" ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "An abstraction library for audio visualisations"; homepage = "https://sourceforge.net/projects/libvisual/"; - license = stdenv.lib.licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.lgpl21Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libvmaf/default.nix b/pkgs/development/libraries/libvmaf/default.nix index 293cb21bb5d..c4b945bed44 100644 --- a/pkgs/development/libraries/libvmaf/default.nix +++ b/pkgs/development/libraries/libvmaf/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, meson, ninja, nasm }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, nasm }: stdenv.mkDerivation rec { pname = "libvmaf"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "netflix"; repo = "vmaf"; rev = "v${version}"; - sha256 = "0gh4zwz975x9kvqdmzs45f96rk99apay57jc68rc8c2xm7gfis58"; + sha256 = "0dynk1pmsyf23vfxljaazqkr27vfrvhj3dyjzm06zxpzsn59aif3"; }; sourceRoot = "source/libvmaf"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/Netflix/vmaf"; description = "Perceptual video quality assessment based on multi-method fusion (VMAF)"; changelog = "https://github.com/Netflix/vmaf/blob/v${version}/CHANGELOG.md"; diff --git a/pkgs/development/libraries/libvmi/default.nix b/pkgs/development/libraries/libvmi/default.nix index 1603d32ba79..9d9e47407b6 100644 --- a/pkgs/development/libraries/libvmi/default.nix +++ b/pkgs/development/libraries/libvmi/default.nix @@ -1,16 +1,16 @@ -{ stdenv, +{ lib, stdenv, fetchFromGitHub, autoreconfHook, bison, flex, glib, - pkgconfig, + pkg-config, json_c, xen, libvirt, xenSupport ? true }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "libvmi"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ glib libvirt json_c ] ++ (optional xenSupport xen); - nativeBuildInputs = [ autoreconfHook bison flex pkgconfig ]; + nativeBuildInputs = [ autoreconfHook bison flex pkg-config ]; configureFlags = optional (!xenSupport) "--disable-xen"; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { patchelf --set-rpath "$oldrpath:${makeLibraryPath [ xen ]}" "$libvmi" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://libvmi.com/"; description = "A C library for virtual machine introspection"; longDescription = '' diff --git a/pkgs/development/libraries/libvncserver/default.nix b/pkgs/development/libraries/libvncserver/default.nix index c4e82b1c326..7c8d4a76fc9 100644 --- a/pkgs/development/libraries/libvncserver/default.nix +++ b/pkgs/development/libraries/libvncserver/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, fetchpatch, cmake +{ lib, stdenv, fetchzip, fetchpatch, cmake , libjpeg, openssl, zlib, libgcrypt, libpng , systemd }: @@ -21,14 +21,14 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; buildInputs = [ libjpeg openssl libgcrypt libpng - ] ++ stdenv.lib.optional stdenv.isLinux systemd; + ] ++ lib.optional stdenv.isLinux systemd; propagatedBuildInputs = [ zlib ]; meta = { inherit (s) version; description = "VNC server library"; homepage = "https://libvnc.github.io/"; - license = stdenv.lib.licenses.gpl2Plus ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix index 2a9f97cf67f..9fd3fc59ab3 100644 --- a/pkgs/development/libraries/libvorbis/default.nix +++ b/pkgs/development/libraries/libvorbis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libogg, pkgconfig }: +{ lib, stdenv, fetchurl, libogg, pkg-config }: stdenv.mkDerivation rec { name = "libvorbis-1.3.7"; @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ libogg ]; doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Vorbis audio compression reference implementation"; homepage = "https://xiph.org/vorbis/"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libvpx/1_8.nix b/pkgs/development/libraries/libvpx/1_8.nix index c82b7a674ac..f1a2bf377cc 100644 --- a/pkgs/development/libraries/libvpx/1_8.nix +++ b/pkgs/development/libraries/libvpx/1_8.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, perl, yasm +{ lib, stdenv, fetchFromGitHub, perl, yasm , vp8DecoderSupport ? true # VP8 decoder , vp8EncoderSupport ? true # VP8 encoder , vp9DecoderSupport ? true # VP9 decoder @@ -40,7 +40,7 @@ let inherit (stdenv) is64bit isMips isDarwin isCygwin; - inherit (stdenv.lib) enableFeature optional optionals; + inherit (lib) enableFeature optional optionals; in assert vp8DecoderSupport || vp8EncoderSupport || vp9DecoderSupport || vp9EncoderSupport; @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { # ./CVE-2019-9232.CVE-2019-9325.CVE-2019-9371.CVE-2019-9433.patch ]; - postPatch = ''patchShebangs .''; + postPatch = "patchShebangs ."; outputs = [ "bin" "dev" "out" ]; setOutputFlags = false; @@ -173,7 +173,7 @@ stdenv.mkDerivation rec { postInstall = ''moveToOutput bin "$bin" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "WebM VP8/VP9 codec SDK"; homepage = "https://www.webmproject.org/"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index 83e60466c14..5aa8cf70491 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, perl, yasm +{ lib, stdenv, fetchFromGitHub, perl, yasm , vp8DecoderSupport ? true # VP8 decoder , vp8EncoderSupport ? true # VP8 encoder , vp9DecoderSupport ? true # VP9 decoder @@ -40,7 +40,7 @@ let inherit (stdenv) is64bit isMips isDarwin isCygwin; - inherit (stdenv.lib) enableFeature optional optionals; + inherit (lib) enableFeature optional optionals; in assert vp8DecoderSupport || vp8EncoderSupport || vp9DecoderSupport || vp9EncoderSupport; @@ -169,7 +169,7 @@ stdenv.mkDerivation rec { postInstall = ''moveToOutput bin "$bin" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "WebM VP8/VP9 codec SDK"; homepage = "https://www.webmproject.org/"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libvterm-neovim/default.nix b/pkgs/development/libraries/libvterm-neovim/default.nix index ca50345f5b2..e4a05360183 100644 --- a/pkgs/development/libraries/libvterm-neovim/default.nix +++ b/pkgs/development/libraries/libvterm-neovim/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , perl , libtool @@ -20,11 +20,11 @@ stdenv.mkDerivation { nativeBuildInputs = [ libtool ]; makeFlags = [ "PREFIX=$(out)" ] - ++ stdenv.lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool"; + ++ lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool"; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "VT220/xterm/ECMA-48 terminal emulator library"; homepage = "http://www.leonerd.org.uk/code/libvterm/"; license = licenses.mit; diff --git a/pkgs/development/libraries/libvterm/default.nix b/pkgs/development/libraries/libvterm/default.nix index 40324ec4932..90914d4186e 100644 --- a/pkgs/development/libraries/libvterm/default.nix +++ b/pkgs/development/libraries/libvterm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, ncurses }: +{ lib, stdenv, fetchurl, pkg-config, glib, ncurses }: stdenv.mkDerivation rec { name = "libvterm-0.99.7"; @@ -17,10 +17,10 @@ stdenv.mkDerivation rec { mkdir -p $out/lib ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib ncurses ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://libvterm.sourceforge.net/"; description = "Terminal emulator library to mimic both vt100 and rxvt"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix index 6ae116356f8..f4418ec1bc4 100644 --- a/pkgs/development/libraries/libwacom/default.nix +++ b/pkgs/development/libraries/libwacom/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, meson, ninja, glib, pkgconfig, udev, libgudev, doxygen }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, glib, pkg-config, udev, libgudev, doxygen }: stdenv.mkDerivation rec { pname = "libwacom"; - version = "1.6"; + version = "1.7"; outputs = [ "out" "dev" ]; @@ -10,16 +10,16 @@ stdenv.mkDerivation rec { owner = "linuxwacom"; repo = "libwacom"; rev = "libwacom-${version}"; - sha256 = "10wphlk5v591mlvcyr6bjqp60zmhbpqg3lmsq9dza738v97ws8ci"; + sha256 = "sha256-kF4Q3ACiVlUbEjS2YqwHA42QknKMLqX9US31PmXtS/I="; }; - nativeBuildInputs = [ pkgconfig meson ninja doxygen ]; + nativeBuildInputs = [ pkg-config meson ninja doxygen ]; mesonFlags = [ "-Dtests=disabled" ]; buildInputs = [ glib udev libgudev ]; - meta = with stdenv.lib; { + meta = with lib; { platforms = platforms.linux; homepage = "https://linuxwacom.github.io/"; description = "Libraries, configuration, and diagnostic tools for Wacom tablets running under Linux"; diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix index 6d24ba7f2ed..4908dc4a9ce 100644 --- a/pkgs/development/libraries/libwebp/default.nix +++ b/pkgs/development/libraries/libwebp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, libtool +{ lib, stdenv, fetchFromGitHub, autoreconfHook, libtool , threadingSupport ? true # multi-threading , openglSupport ? false, freeglut ? null, libGL ? null, libGLU ? null # OpenGL (required for vwebp) , pngSupport ? true, libpng ? null # PNG image format @@ -24,7 +24,7 @@ let mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}"; in -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "libwebp"; version = "1.1.0"; diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix index c56781931f3..33c1cecfbc8 100644 --- a/pkgs/development/libraries/libwebsockets/default.nix +++ b/pkgs/development/libraries/libwebsockets/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, cmake, openssl, zlib, libuv }: +{ fetchFromGitHub, lib, stdenv, cmake, openssl, zlib, libuv }: let generic = { version, sha256 }: stdenv.mkDerivation rec { @@ -22,9 +22,9 @@ let "-DLWS_WITH_SOCKS5=ON" ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-error=unused-but-set-variable"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=unused-but-set-variable"; - meta = with stdenv.lib; { + meta = with lib; { description = "Light, portable C library for websockets"; longDescription = '' Libwebsockets is a lightweight pure C library built to @@ -32,7 +32,9 @@ let throughput in both directions. ''; homepage = "https://libwebsockets.org/"; - license = licenses.lgpl21; + # Relicensed from LGPLv2.1+ to MIT with 4.0. Licensing situation + # is tricky, see https://github.com/warmcat/libwebsockets/blob/main/LICENSE + license = with licenses; [ mit publicDomain bsd3 asl20 ]; platforms = platforms.all; }; }; @@ -50,7 +52,12 @@ rec { }; libwebsockets_4_0 = generic { - version = "4.0.1"; - sha256 = "1pf7km0w5q7dqlwcwqizdpfqgg10prfq8g2c093f5nghwsfv8mmf"; + version = "4.0.21"; + sha256 = "01k05x4711ngin598jr9dag4ml3m7hi6pkgr4dsb02ryh1kc6146"; + }; + + libwebsockets_4_1 = generic { + version = "4.1.6"; + sha256 = "0x56v4hsx92vm1zibfmnqb5g3v23kzciffn3fjlsc3sly2pknhsg"; }; } diff --git a/pkgs/development/libraries/libwhereami/default.nix b/pkgs/development/libraries/libwhereami/default.nix index 7dac3315285..d0dd593a03d 100644 --- a/pkgs/development/libraries/libwhereami/default.nix +++ b/pkgs/development/libraries/libwhereami/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, boost, curl, leatherman }: +{ lib, stdenv, fetchFromGitHub, cmake, boost, curl, leatherman }: stdenv.mkDerivation rec { pname = "libwhereami"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost curl leatherman ]; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Library to report hypervisor information from inside a VM"; license = licenses.asl20; diff --git a/pkgs/development/libraries/libwmf/default.nix b/pkgs/development/libraries/libwmf/default.nix index 5c684c7fd77..e955fee5720 100644 --- a/pkgs/development/libraries/libwmf/default.nix +++ b/pkgs/development/libraries/libwmf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig +{ lib, stdenv, fetchFromGitHub, pkg-config , freetype, glib, imagemagick, libjpeg, libpng, libxml2, zlib }: @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { sha256 = "0i2w5hg8mbgmgabxyd48qp1gx2mhk33hgr3jqvg72k0nhkd2jhf6"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib imagemagick libpng glib freetype libjpeg libxml2 ]; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "WMF library from wvWare"; homepage = "http://wvware.sourceforge.net/libwmf.html"; downloadPage = "https://github.com/caolanm/libwmf/releases"; diff --git a/pkgs/development/libraries/libwnck/3.x.nix b/pkgs/development/libraries/libwnck/3.x.nix index 78aa231bda3..3792b826f59 100644 --- a/pkgs/development/libraries/libwnck/3.x.nix +++ b/pkgs/development/libraries/libwnck/3.x.nix @@ -1,9 +1,9 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , meson , ninja -, pkgconfig +, pkg-config , gtk-doc , docbook_xsl , docbook_xml_dtd_412 @@ -27,14 +27,14 @@ stdenv.mkDerivation rec { outputBin = "dev"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0pwjdhca9lz2n1gf9b60xf0m6ipf9snp8rqf9csj4pgdnd882l5w"; }; nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gettext gobject-introspection gtk-doc @@ -62,11 +62,11 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; - attrPath = "${pname}${stdenv.lib.versions.major version}"; + attrPath = "${pname}${lib.versions.major version}"; }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Library to manage X windows and workspaces (via pagers, tasklists, etc.)"; license = licenses.lgpl21Plus; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libwnck/default.nix b/pkgs/development/libraries/libwnck/default.nix index 2872181a36d..c0019ee268a 100644 --- a/pkgs/development/libraries/libwnck/default.nix +++ b/pkgs/development/libraries/libwnck/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, intltool, xorg }: +{ lib, stdenv, fetchurl, pkg-config, gtk2, intltool, xorg }: stdenv.mkDerivation rec { pname = "libwnck"; version = "2.31.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "17isfjvrzgj5znld2a7zsk9vd39q9wnsysnw5jr8iz410z935xw3"; }; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 intltool xorg.libX11 xorg.libXres ]; # ?another optional: startup-notification @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "A library for creating task lists and pagers"; homepage = "https://gitlab.gnome.org/GNOME/libwnck"; - license = stdenv.lib.licenses.lgpl21; - maintainers = with stdenv.lib.maintainers; [ johnazoidberg ]; + license = lib.licenses.lgpl21; + maintainers = with lib.maintainers; [ johnazoidberg ]; }; } diff --git a/pkgs/development/libraries/libwpd/0.8.nix b/pkgs/development/libraries/libwpd/0.8.nix index f47208cda44..df21f264096 100644 --- a/pkgs/development/libraries/libwpd/0.8.nix +++ b/pkgs/development/libraries/libwpd/0.8.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, libgsf, libxml2, bzip2 }: +{ lib, stdenv, fetchurl, pkg-config, glib, libgsf, libxml2, bzip2 }: stdenv.mkDerivation rec { name = "libwpd-0.8.14"; @@ -12,9 +12,9 @@ stdenv.mkDerivation rec { buildInputs = [ glib libgsf libxml2 ]; - nativeBuildInputs = [ pkgconfig bzip2 ]; + nativeBuildInputs = [ pkg-config bzip2 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for importing WordPerfect documents"; homepage = "http://libwpd.sourceforge.net"; license = with licenses; [ lgpl21 mpl20 ]; diff --git a/pkgs/development/libraries/libwpd/default.nix b/pkgs/development/libraries/libwpd/default.nix index 3464c55805d..8afe549cb68 100644 --- a/pkgs/development/libraries/libwpd/default.nix +++ b/pkgs/development/libraries/libwpd/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchurl, zlib, pkgconfig, glib, libgsf, libxml2, librevenge }: +{ lib, stdenv, fetchurl, zlib, pkg-config, glib, libgsf, libxml2, librevenge }: stdenv.mkDerivation rec { name = "libwpd-0.10.0"; - + src = fetchurl { url = "mirror://sourceforge/libwpd/${name}.tar.xz"; sha256 = "0b6krzr6kxzm89g6bapn805kdayq70hn16n5b5wfs2lwrf0ag2wx"; }; - + buildInputs = [ glib libgsf libxml2 zlib librevenge ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A library for importing and exporting WordPerfect documents"; homepage = "http://libwpd.sourceforge.net/"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libwpe/default.nix b/pkgs/development/libraries/libwpe/default.nix new file mode 100644 index 00000000000..102d658000c --- /dev/null +++ b/pkgs/development/libraries/libwpe/default.nix @@ -0,0 +1,39 @@ +{ stdenv +, lib +, fetchurl +, meson +, pkg-config +, libxkbcommon +, libGL +, ninja +, libX11 }: + +stdenv.mkDerivation rec { + pname = "libwpe"; + version = "1.7.1"; + + src = fetchurl { + url = "https://wpewebkit.org/releases/${pname}-${version}.tar.xz"; + sha256 = "0h6kh8wy2b370y705pl2vp6vp18dkdsgdxh0243ji2v51kxbg157"; + }; + + nativeBuildInputs = [ + pkg-config + meson + ninja + ]; + + buildInputs = [ + libxkbcommon + libGL + libX11 + ]; + + meta = with lib; { + description = "General-purpose library for WPE WebKit"; + license = licenses.bsd2; + homepage = "https://wpewebkit.org"; + maintainers = with maintainers; [ matthewbauer ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libwpe/fdo.nix b/pkgs/development/libraries/libwpe/fdo.nix new file mode 100644 index 00000000000..6f9356a6ad8 --- /dev/null +++ b/pkgs/development/libraries/libwpe/fdo.nix @@ -0,0 +1,52 @@ +{ stdenv +, lib +, fetchurl +, meson +, pkg-config +, ninja +, wayland +, epoxy +, glib +, libwpe +, libxkbcommon +, libGL +, libX11 }: + +stdenv.mkDerivation rec { + pname = "wpebackend-fdo"; + version = "1.7.1"; + + src = fetchurl { + url = "https://wpewebkit.org/releases/${pname}-${version}.tar.xz"; + sha256 = "1xf6akagvpyh0nyxkfijrx5avp6ravnivy28dhk64dsfx9rhm64v"; + }; + + depsBuildBuild = [ + pkg-config + ]; + + nativeBuildInputs = [ + pkg-config + meson + ninja + wayland + ]; + + buildInputs = [ + wayland + epoxy + glib + libwpe + libxkbcommon + libGL + libX11 + ]; + + meta = with lib; { + description = "Freedesktop.org backend for WPE WebKit"; + license = licenses.bsd2; + homepage = "https://wpewebkit.org"; + maintainers = with maintainers; [ matthewbauer ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libwpg/default.nix b/pkgs/development/libraries/libwpg/default.nix index c844daf51f0..cf85d57a7f2 100644 --- a/pkgs/development/libraries/libwpg/default.nix +++ b/pkgs/development/libraries/libwpg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libwpd, zlib, librevenge }: +{ lib, stdenv, fetchurl, pkg-config, libwpd, zlib, librevenge }: stdenv.mkDerivation rec { name = "libwpg-0.3.3"; @@ -9,9 +9,9 @@ stdenv.mkDerivation rec { }; buildInputs = [ libwpd zlib librevenge ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://libwpg.sourceforge.net"; description = "C++ library to parse WPG"; license = with licenses; [ lgpl21 mpl20 ]; diff --git a/pkgs/development/libraries/libwps/default.nix b/pkgs/development/libraries/libwps/default.nix index 3d40d204bdc..7dd7153bae9 100644 --- a/pkgs/development/libraries/libwps/default.nix +++ b/pkgs/development/libraries/libwps/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, pkgconfig, librevenge, zlib }: +{ lib, stdenv, fetchurl, boost, pkg-config, librevenge, zlib }: stdenv.mkDerivation rec { pname = "libwps"; @@ -9,12 +9,12 @@ stdenv.mkDerivation rec { sha256 = "16c6vq6hhi5lcvgyb9dwarr3kz69l1g5fs39b2hwqhkwzx5igpcl"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ boost librevenge zlib ]; NIX_CFLAGS_COMPILE = "-Wno-error=implicit-fallthrough"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://libwps.sourceforge.net/"; description = "Microsoft Works document format import filter library"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libx86/default.nix b/pkgs/development/libraries/libx86/default.nix index 271823ace28..1abefa8f437 100644 --- a/pkgs/development/libraries/libx86/default.nix +++ b/pkgs/development/libraries/libx86/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "libx86"; @@ -13,14 +13,14 @@ stdenv.mkDerivation rec { # http://www.mail-archive.com/suspend-devel@lists.sourceforge.net/msg02355.html makeFlags = [ "DESTDIR=$(out)" - ] ++ stdenv.lib.optional (!stdenv.isi686) "BACKEND=x86emu"; + ] ++ lib.optional (!stdenv.isi686) "BACKEND=x86emu"; preBuild = '' sed -i lrmi.c -e 's@defined(__i386__)@(defined(__i386__) || defined(__x86_64__))@' sed -e s@/usr@@ -i Makefile ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Real-mode x86 code emulator"; maintainers = with maintainers; [ raskin ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/development/libraries/libx86/src-for-default.nix b/pkgs/development/libraries/libx86/src-for-default.nix index 30be467f9fd..a681d9e5890 100644 --- a/pkgs/development/libraries/libx86/src-for-default.nix +++ b/pkgs/development/libraries/libx86/src-for-default.nix @@ -4,6 +4,6 @@ rec { hash="0j6h6bc02c6qi0q7c1ncraz4d1hkm5936r35rfsp4x1jrc233wav"; url="http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-${version}.tar.gz"; advertisedUrl="http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-1.1.tar.gz"; - - + + } diff --git a/pkgs/development/libraries/libx86emu/default.nix b/pkgs/development/libraries/libx86emu/default.nix index 1b10ac5fdaa..8f9669561d6 100644 --- a/pkgs/development/libraries/libx86emu/default.nix +++ b/pkgs/development/libraries/libx86emu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, perl }: +{ lib, stdenv, fetchFromGitHub, perl }: stdenv.mkDerivation rec { pname = "libx86emu"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { installFlags = [ "DESTDIR=$(out)" "LIBDIR=/lib" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "x86 emulation library"; license = licenses.bsd2; homepage = "https://github.com/wfeldt/libx86emu"; diff --git a/pkgs/development/libraries/libxc/default.nix b/pkgs/development/libraries/libxc/default.nix index 3f687ad26c8..0a93babb459 100644 --- a/pkgs/development/libraries/libxc/default.nix +++ b/pkgs/development/libraries/libxc/default.nix @@ -1,32 +1,39 @@ -{ stdenv, fetchurl, gfortran, perl }: +{ lib, stdenv, fetchFromGitLab, cmake, gfortran, perl }: let - version = "4.3.4"; + version = "5.1.0"; in stdenv.mkDerivation { pname = "libxc"; inherit version; - src = fetchurl { - url = "http://www.tddft.org/programs/octopus/down.php?file=libxc/${version}/libxc-${version}.tar.gz"; - sha256 = "0dw356dfwn2bwjdfwwi4h0kimm69aql2f4yk9f2kk4q7qpfkgvm8"; + + src = fetchFromGitLab { + owner = "libxc"; + repo = "libxc"; + rev = version; + sha256 = "0qbxh0lfx4cab1fk1qfnx72g4yvs376zqrq74jn224vy32nam2x7"; }; buildInputs = [ gfortran ]; - nativeBuildInputs = [ perl ]; + nativeBuildInputs = [ perl cmake ]; preConfigure = '' patchShebangs ./ ''; - configureFlags = [ "--enable-shared" ]; + cmakeFlags = [ "-DENABLE_FORTRAN=ON" "-DBUILD_SHARED_LIBS=ON" ]; + + preCheck = '' + export LD_LIBRARY_PATH=$(pwd) + ''; doCheck = true; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Library of exchange-correlation functionals for density-functional theory"; - homepage = "https://octopus-code.org/wiki/Libxc"; - license = licenses.lgpl3; + homepage = "https://www.tddft.org/programs/Libxc/"; + license = licenses.mpl20; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ markuskowa ]; }; diff --git a/pkgs/development/libraries/libxcomp/default.nix b/pkgs/development/libraries/libxcomp/default.nix index 9ecfa0ffd1a..b66fe5c5a21 100644 --- a/pkgs/development/libraries/libxcomp/default.nix +++ b/pkgs/development/libraries/libxcomp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, libjpeg, libpng, libX11, zlib }: +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libjpeg, libpng, libX11, zlib }: stdenv.mkDerivation rec { pname = "libxcomp"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libjpeg libpng libX11 zlib ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; preAutoreconf = '' cd nxcomp/ @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "NX compression library"; homepage = "http://wiki.x2go.org/doku.php/wiki:libs:nx-libs"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/libxdg-basedir/default.nix b/pkgs/development/libraries/libxdg-basedir/default.nix index fdf62e38269..58a58f2726b 100644 --- a/pkgs/development/libraries/libxdg-basedir/default.nix +++ b/pkgs/development/libraries/libxdg-basedir/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, fetchpatch}: +{lib, stdenv, fetchurl, fetchpatch}: stdenv.mkDerivation rec { name = "libxdg-basedir-1.2.0"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }) ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/devnev/libxdg-basedir"; description = "Implementation of the XDG Base Directory specification"; license = licenses.mit; diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix index 87f85637775..70dd9cb7bbf 100644 --- a/pkgs/development/libraries/libxkbcommon/default.nix +++ b/pkgs/development/libraries/libxkbcommon/default.nix @@ -1,7 +1,9 @@ -{ stdenv, fetchurl, meson, ninja, pkg-config, yacc, doxygen +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, yacc, doxygen , xkeyboard_config, libxcb, libxml2 , python3 , libX11 +# To enable the "interactive-wayland" subcommand of xkbcli: +, withWaylandSupport ? false, wayland, wayland-protocols }: stdenv.mkDerivation rec { @@ -13,18 +15,23 @@ stdenv.mkDerivation rec { sha256 = "0lmwglj16anhpaq0h830xsl1ivknv75i4lir9bk88aq73s2jy852"; }; + patches = [ + ./fix-cross-compilation.patch + ]; + outputs = [ "out" "dev" "doc" ]; - nativeBuildInputs = [ meson ninja pkg-config yacc doxygen ]; - buildInputs = [ xkeyboard_config libxcb libxml2 ]; + nativeBuildInputs = [ meson ninja pkg-config yacc doxygen ] + ++ lib.optional withWaylandSupport wayland; + buildInputs = [ xkeyboard_config libxcb libxml2 ] + ++ lib.optionals withWaylandSupport [ wayland wayland-protocols ]; checkInputs = [ python3 ]; mesonFlags = [ "-Dxkb-config-root=${xkeyboard_config}/etc/X11/xkb" "-Dxkb-config-extra-path=/etc/xkb" # default=$sysconfdir/xkb ($out/etc) "-Dx-locale-root=${libX11.out}/share/X11/locale" - "-Denable-wayland=false" - "-Denable-xkbregistry=false" # Optional, separate library (TODO: Install into extra output) + "-Denable-wayland=${lib.boolToString withWaylandSupport}" ]; doCheck = true; @@ -32,7 +39,7 @@ stdenv.mkDerivation rec { patchShebangs ../test/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A library to handle keyboard descriptions"; longDescription = '' libxkbcommon is a keyboard keymap compiler and support library which @@ -43,7 +50,7 @@ stdenv.mkDerivation rec { homepage = "https://xkbcommon.org"; changelog = "https://github.com/xkbcommon/libxkbcommon/blob/xkbcommon-${version}/NEWS"; license = licenses.mit; - maintainers = with maintainers; [ ttuegel ]; + maintainers = with maintainers; [ primeos ttuegel ]; platforms = with platforms; unix; }; } diff --git a/pkgs/development/libraries/libxkbcommon/fix-cross-compilation.patch b/pkgs/development/libraries/libxkbcommon/fix-cross-compilation.patch new file mode 100644 index 00000000000..55730554a90 --- /dev/null +++ b/pkgs/development/libraries/libxkbcommon/fix-cross-compilation.patch @@ -0,0 +1,20 @@ +diff --git a/meson.build b/meson.build +index 47c436f..536c60b 100644 +--- a/meson.build ++++ b/meson.build +@@ -440,13 +440,12 @@ if build_tools + if get_option('enable-wayland') + wayland_client_dep = dependency('wayland-client', version: '>=1.2.0', required: false) + wayland_protocols_dep = dependency('wayland-protocols', version: '>=1.12', required: false) +- wayland_scanner_dep = dependency('wayland-scanner', required: false, native: true) +- if not wayland_client_dep.found() or not wayland_protocols_dep.found() or not wayland_scanner_dep.found() ++ if not wayland_client_dep.found() or not wayland_protocols_dep.found() + error('''The Wayland xkbcli programs require wayland-client >= 1.2.0, wayland-protocols >= 1.7 which were not found. + You can disable the Wayland xkbcli programs with -Denable-wayland=false.''') + endif + +- wayland_scanner = find_program(wayland_scanner_dep.get_pkgconfig_variable('wayland_scanner')) ++ wayland_scanner = find_program('wayland-scanner', native: true) + wayland_scanner_code_gen = generator( + wayland_scanner, + output: '@BASENAME@-protocol.c', diff --git a/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix b/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix index a73fb7cb870..cf5f6e320c0 100644 --- a/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix +++ b/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, yacc, flex, xkeyboard_config, libxcb, libX11 }: +{ lib, stdenv, fetchurl, pkg-config, yacc, flex, xkeyboard_config, libxcb, libX11 }: stdenv.mkDerivation rec { name = "libxkbcommon-0.7.2"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ yacc flex xkeyboard_config libxcb ]; configureFlags = [ @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { "--with-x-locale-root=${libX11.out}/share/X11/locale" ]; - preBuild = stdenv.lib.optionalString stdenv.isDarwin '' + preBuild = lib.optionalString stdenv.isDarwin '' sed -i 's/,--version-script=.*$//' Makefile ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A library to handle keyboard descriptions"; homepage = "https://xkbcommon.org"; license = licenses.mit; diff --git a/pkgs/development/libraries/libxklavier/default.nix b/pkgs/development/libraries/libxklavier/default.nix index febe7f7b38c..60b52152f67 100644 --- a/pkgs/development/libraries/libxklavier/default.nix +++ b/pkgs/development/libraries/libxklavier/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoreconfHook, pkgconfig, gtk-doc, xkeyboard_config, libxml2, xorg, docbook_xsl +{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, gtk-doc, xkeyboard_config, libxml2, xorg, docbook_xsl , glib, isocodes, gobject-introspection }: let @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { # TODO: enable xmodmap support, needs xmodmap DB propagatedBuildInputs = with xorg; [ libX11 libXi xkeyboard_config libxml2 libICE glib libxkbfile isocodes ]; - nativeBuildInputs = [ autoreconfHook pkgconfig gtk-doc docbook_xsl ]; + nativeBuildInputs = [ autoreconfHook pkg-config gtk-doc docbook_xsl ]; buildInputs = [ gobject-introspection ]; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { "--enable-gtk-doc" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library providing high-level API for X Keyboard Extension known as XKB"; homepage = "http://freedesktop.org/wiki/Software/LibXklavier"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/libxl/default.nix b/pkgs/development/libraries/libxl/default.nix index 6f11d4c461f..600e94d0a75 100644 --- a/pkgs/development/libraries/libxl/default.nix +++ b/pkgs/development/libraries/libxl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "libxl"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cp -rva lib64 $out/lib ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A library for parsing Excel files"; homepage = "https://www.libxl.com/"; license = licenses.unfree; diff --git a/pkgs/development/libraries/libxls/default.nix b/pkgs/development/libraries/libxls/default.nix index 00300899589..3e8034f8baa 100644 --- a/pkgs/development/libraries/libxls/default.nix +++ b/pkgs/development/libraries/libxls/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { pname = "libxls"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Extract Cell Data From Excel xls files"; homepage = "https://sourceforge.net/projects/libxls/"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/libxmi/default.nix b/pkgs/development/libraries/libxmi/default.nix index 89b96467155..037e7036f49 100644 --- a/pkgs/development/libraries/libxmi/default.nix +++ b/pkgs/development/libraries/libxmi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libtool }: +{ lib, stdenv, fetchurl, libtool }: stdenv.mkDerivation { name = "libxmi-1.2"; @@ -14,8 +14,8 @@ stdenv.mkDerivation { meta = { description = "Library for rasterizing 2-D vector graphics"; homepage = "https://www.gnu.org/software/libxmi/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 10ad110d24e..30a65e3a0a3 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { preInstall = lib.optionalString pythonSupport ''substituteInPlace python/libxml2mod.la --replace "${python}" "$py"''; installFlags = lib.optional pythonSupport - "pythondir=\"${placeholder ''py''}/lib/${python.libPrefix}/site-packages\""; + "pythondir=\"${placeholder "py"}/lib/${python.libPrefix}/site-packages\""; postFixup = '' moveToOutput bin/xml2-config "$dev" diff --git a/pkgs/development/libraries/libxmlb/default.nix b/pkgs/development/libraries/libxmlb/default.nix index 97e8d23c070..b958f018b60 100644 --- a/pkgs/development/libraries/libxmlb/default.nix +++ b/pkgs/development/libraries/libxmlb/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , docbook_xml_dtd_43 , docbook_xsl @@ -7,7 +7,7 @@ , gtk-doc , meson , ninja -, pkgconfig +, pkg-config , python3 , shared-mime-info , nixosTests @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { gtk-doc meson ninja - pkgconfig + pkg-config (python3.withPackages (pkgs: with pkgs; [ setuptools ])) shared-mime-info ]; @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A library to help create and query binary XML blobs"; homepage = "https://github.com/hughsie/libxmlb"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/libxmlxx/default.nix b/pkgs/development/libraries/libxmlxx/default.nix index c80808081ff..19282ddc822 100644 --- a/pkgs/development/libraries/libxmlxx/default.nix +++ b/pkgs/development/libraries/libxmlxx/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, glibmm, perl, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, libxml2, glibmm, perl, gnome3 }: stdenv.mkDerivation rec { pname = "libxml++"; version = "2.40.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1sb3akryklvh2v6m6dihdnbpf1lkx441v972q9hlz1sq6bfspm2a"; }; outputs = [ "out" "devdoc" ]; - nativeBuildInputs = [ pkgconfig perl ]; + nativeBuildInputs = [ pkg-config perl ]; propagatedBuildInputs = [ libxml2 glibmm ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://libxmlplusplus.sourceforge.net/"; description = "C++ wrapper for the libxml2 XML parser library"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/libxmlxx/v3.nix b/pkgs/development/libraries/libxmlxx/v3.nix index be5c019e31e..41c842220c7 100644 --- a/pkgs/development/libraries/libxmlxx/v3.nix +++ b/pkgs/development/libraries/libxmlxx/v3.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, glibmm, perl }: +{ lib, stdenv, fetchurl, pkg-config, libxml2, glibmm, perl }: stdenv.mkDerivation rec { pname = "libxml++"; version = "3.0.1"; src = fetchurl { - url = "mirror://gnome/sources/libxml++/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/libxml++/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "19kik79fmg61nv0by0a5f9wchrcfjwzvih4v2waw01hqflhqvp0r"; }; outputs = [ "out" "dev" "doc" "devdoc" ]; - nativeBuildInputs = [ pkgconfig perl ]; + nativeBuildInputs = [ pkg-config perl ]; buildInputs = [ glibmm ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { --replace 'docdir=''${datarootdir}' "docdir=$doc/share" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://libxmlplusplus.sourceforge.net/"; description = "C++ wrapper for the libxml2 XML parser library, version 3"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/libxmp/default.nix b/pkgs/development/libraries/libxmp/default.nix index ca4d7edbf32..0b953f95d7e 100644 --- a/pkgs/development/libraries/libxmp/default.nix +++ b/pkgs/development/libraries/libxmp/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "libxmp-4.4.1"; - meta = with stdenv.lib; { + meta = with lib; { description = "Extended module player library"; homepage = "http://xmp.sourceforge.net/"; longDescription = '' diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index cf91d7656bf..650e17d3179 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, libxml2, findXMLCatalogs, gettext, python, libgcrypt +{ lib, stdenv, fetchurl, fetchpatch, libxml2, findXMLCatalogs, gettext, python3, libgcrypt , cryptoSupport ? false , pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform }: @@ -12,12 +12,12 @@ stdenv.mkDerivation rec { sha256 = "0zrzz6kjdyavspzik6fbkpvfpbd25r2qg6py5nnjaabrsr3bvccq"; }; - outputs = [ "bin" "dev" "out" "man" "doc" ] ++ stdenv.lib.optional pythonSupport "py"; + outputs = [ "bin" "dev" "out" "man" "doc" ] ++ lib.optional pythonSupport "py"; buildInputs = [ libxml2.dev ] - ++ stdenv.lib.optional stdenv.isDarwin gettext - ++ stdenv.lib.optionals pythonSupport [ libxml2.py python ] - ++ stdenv.lib.optionals cryptoSupport [ libgcrypt ]; + ++ lib.optional stdenv.isDarwin gettext + ++ lib.optionals pythonSupport [ libxml2.py python3 ] + ++ lib.optionals cryptoSupport [ libgcrypt ]; propagatedBuildInputs = [ findXMLCatalogs ]; @@ -26,24 +26,24 @@ stdenv.mkDerivation rec { "--without-debug" "--without-mem-debug" "--without-debugger" - ] ++ stdenv.lib.optional pythonSupport "--with-python=${python}" - ++ stdenv.lib.optional (!cryptoSupport) "--without-crypto"; + ] ++ lib.optional pythonSupport "--with-python=${python3}" + ++ lib.optional (!cryptoSupport) "--without-crypto"; postFixup = '' moveToOutput bin/xslt-config "$dev" moveToOutput lib/xsltConf.sh "$dev" moveToOutput share/man/man1 "$bin" - '' + stdenv.lib.optionalString pythonSupport '' + '' + lib.optionalString pythonSupport '' mkdir -p $py/nix-support echo ${libxml2.py} >> $py/nix-support/propagated-build-inputs - moveToOutput ${python.libPrefix} "$py" + moveToOutput ${python3.libPrefix} "$py" ''; passthru = { inherit pythonSupport; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://xmlsoft.org/XSLT/"; description = "A C library and tools to do XSL transformations"; license = licenses.mit; diff --git a/pkgs/development/libraries/libxsmm/default.nix b/pkgs/development/libraries/libxsmm/default.nix index 5e4a56a6d4d..a2b4800ec4c 100644 --- a/pkgs/development/libraries/libxsmm/default.nix +++ b/pkgs/development/libraries/libxsmm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, coreutils, gfortran, gnused +{ lib, stdenv, fetchFromGitHub, coreutils, gfortran, gnused , python3, util-linux, which , enableStatic ? stdenv.hostPlatform.isStatic @@ -42,11 +42,11 @@ in stdenv.mkDerivation { patchShebangs . ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Library targeting Intel Architecture for specialized dense and sparse matrix operations, and deep learning primitives"; license = licenses.bsd3; homepage = "https://github.com/hfp/libxsmm"; platforms = platforms.linux; - maintainers = with stdenv.lib.maintainers; [ chessai ]; + maintainers = with lib.maintainers; [ chessai ]; }; } diff --git a/pkgs/development/libraries/libyaml-cpp/default.nix b/pkgs/development/libraries/libyaml-cpp/default.nix index cf880ef1e16..13141923202 100644 --- a/pkgs/development/libraries/libyaml-cpp/default.nix +++ b/pkgs/development/libraries/libyaml-cpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "libyaml-cpp"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DYAML_CPP_BUILD_TESTS=OFF" ]; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "A YAML parser and emitter for C++"; license = licenses.mit; diff --git a/pkgs/development/libraries/libyaml/default.nix b/pkgs/development/libraries/libyaml/default.nix index 37b8ebcc3ef..03e7e4715f8 100644 --- a/pkgs/development/libraries/libyaml/default.nix +++ b/pkgs/development/libraries/libyaml/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://pyyaml.org/"; description = "A YAML 1.1 parser and emitter written in C"; license = licenses.mit; diff --git a/pkgs/development/libraries/libykclient/default.nix b/pkgs/development/libraries/libykclient/default.nix index ea900477f35..6aacfc5ea2f 100644 --- a/pkgs/development/libraries/libykclient/default.nix +++ b/pkgs/development/libraries/libykclient/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, help2man, curl }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, help2man, curl }: stdenv.mkDerivation { pname = "libykclient"; @@ -10,10 +10,10 @@ stdenv.mkDerivation { sha256 = "01b19jgv2lypih6lhw9yjjsfl8q1ahl955vhr2ai8ccshh0050yj"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig help2man ]; + nativeBuildInputs = [ autoreconfHook pkg-config help2man ]; buildInputs = [ curl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Yubikey C client library"; homepage = "https://developers.yubico.com/yubico-c-client"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/libykneomgr/default.nix b/pkgs/development/libraries/libykneomgr/default.nix index cb4f3bec011..a7d35950f03 100644 --- a/pkgs/development/libraries/libykneomgr/default.nix +++ b/pkgs/development/libraries/libykneomgr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pcsclite, libzip, help2man }: +{ lib, stdenv, fetchurl, pkg-config, pcsclite, libzip, help2man }: stdenv.mkDerivation rec { name = "libykneomgr-0.1.8"; @@ -8,14 +8,14 @@ stdenv.mkDerivation rec { sha256 = "12gqblz400kr11m1fdr1vvwr85lgy5v55zy0cf782whpk8lyyj97"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pcsclite libzip help2man ]; configureFlags = [ "--with-backend=pcsc" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://developers.yubico.com/libykneomgr"; description = "A C library to interact with the CCID-part of the Yubikey NEO"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libyubikey/default.nix b/pkgs/development/libraries/libyubikey/default.nix index 75170d7ff8a..b3aa2b57bdf 100644 --- a/pkgs/development/libraries/libyubikey/default.nix +++ b/pkgs/development/libraries/libyubikey/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "libyubikey-1.13"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "009l3k2zyn06dbrlja2d4p2vfnzjhlcqxi88v02mlrnb17mx1v84"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://opensource.yubico.com/yubico-c/"; description = "C library for manipulating Yubico YubiKey One-Time Passwords (OTPs)"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/libzapojit/default.nix b/pkgs/development/libraries/libzapojit/default.nix index 4341b1e2041..d16f34039f1 100644 --- a/pkgs/development/libraries/libzapojit/default.nix +++ b/pkgs/development/libraries/libzapojit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, intltool, json-glib, librest, libsoup, gnome3, gnome-online-accounts, gobject-introspection }: +{ lib, stdenv, fetchurl, pkg-config, glib, intltool, json-glib, librest, libsoup, gnome3, gnome-online-accounts, gobject-introspection }: stdenv.mkDerivation rec { pname = "libzapojit"; @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0zn3s7ryjc3k1abj4k55dr2na844l451nrg9s6cvnnhh569zj99x"; }; - nativeBuildInputs = [ pkgconfig intltool gobject-introspection ]; + nativeBuildInputs = [ pkg-config intltool gobject-introspection ]; propagatedBuildInputs = [ glib json-glib librest libsoup gnome-online-accounts ]; # zapojit-0.0.pc passthru = { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "GObject wrapper for the SkyDrive and Hotmail REST APIs"; homepage = "https://wiki.gnome.org/Projects/Zapojit"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/libzdb/default.nix b/pkgs/development/libraries/libzdb/default.nix index 95f8e78cfb2..986f27e27c8 100644 --- a/pkgs/development/libraries/libzdb/default.nix +++ b/pkgs/development/libraries/libzdb/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, sqlite}: +{lib, stdenv, fetchurl, sqlite}: stdenv.mkDerivation rec { @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { homepage = "http://www.tildeslash.com/libzdb/"; description = "A small, easy to use Open Source Database Connection Pool Library"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/libzen/default.nix b/pkgs/development/libraries/libzen/default.nix index 80a570dd697..2d19ca4b22b 100644 --- a/pkgs/development/libraries/libzen/default.nix +++ b/pkgs/development/libraries/libzen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook }: +{ lib, stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { version = "0.4.38"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Shared library for libmediainfo and mediainfo"; homepage = "https://mediaarea.net/"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix index 79933d402f7..ddefa16c2c1 100644 --- a/pkgs/development/libraries/libzip/default.nix +++ b/pkgs/development/libraries/libzip/default.nix @@ -1,20 +1,27 @@ -{ stdenv, fetchurl, cmake, perl, zlib }: +{ lib, stdenv +, cmake +, fetchpatch +, fetchurl +, perl +, zlib +}: stdenv.mkDerivation rec { pname = "libzip"; - version = "1.6.1"; + version = "1.7.3"; src = fetchurl { url = "https://www.nih.at/libzip/${pname}-${version}.tar.gz"; - sha256 = "120xgf7cgjmz9d3yp10lks6lhkgxqb4skbmbiiwf46gx868qxsq6"; + sha256 = "1k5rihiz7m1ahhjzcbq759hb9crzqkgw78pkxga118y5a32pc8hf"; }; - # Fix pkgconfig file paths - postPatch = '' - sed -i CMakeLists.txt \ - -e 's#\\''${exec_prefix}/''${CMAKE_INSTALL_LIBDIR}#''${CMAKE_INSTALL_FULL_LIBDIR}#' \ - -e 's#\\''${prefix}/''${CMAKE_INSTALL_INCLUDEDIR}#''${CMAKE_INSTALL_FULL_INCLUDEDIR}#' - ''; + # Remove in next release + patches = [ + (fetchpatch { + url = "https://github.com/nih-at/libzip/commit/351201419d79b958783c0cfc7c370243165523ac.patch"; + sha256 = "0d93z98ki0yiaza93268cxkl35y1r7ll9f7l8sivx3nfxj2c1n8a"; + }) + ]; outputs = [ "out" "dev" ]; @@ -26,7 +33,7 @@ stdenv.mkDerivation rec { patchShebangs regress ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.nih.at/libzip"; description = "A C library for reading, creating and modifying zip archives"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libzmf/default.nix b/pkgs/development/libraries/libzmf/default.nix index d3cbc430efc..f71b6d0c0b9 100644 --- a/pkgs/development/libraries/libzmf/default.nix +++ b/pkgs/development/libraries/libzmf/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, boost, icu, libpng, librevenge, zlib, doxygen, pkgconfig, cppunit}: +{lib, stdenv, fetchurl, boost, icu, libpng, librevenge, zlib, doxygen, pkg-config, cppunit}: stdenv.mkDerivation rec { pname = "libzmf"; @@ -10,15 +10,15 @@ stdenv.mkDerivation rec { }; buildInputs = [ boost icu libpng librevenge zlib cppunit ]; - nativeBuildInputs = [ doxygen pkgconfig ]; + nativeBuildInputs = [ doxygen pkg-config ]; configureFlags = [ "--disable-werror" ]; meta = { inherit version; - description = ''A library that parses the file format of Zoner Callisto/Draw documents''; - license = stdenv.lib.licenses.mpl20; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; + description = "A library that parses the file format of Zoner Callisto/Draw documents"; + license = lib.licenses.mpl20; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.unix; homepage = "https://wiki.documentfoundation.org/DLP/Libraries/libzmf"; downloadPage = "http://dev-www.libreoffice.org/src/libzmf/"; updateWalker = true; diff --git a/pkgs/development/libraries/libzra/default.nix b/pkgs/development/libraries/libzra/default.nix index 6accf24ac28..3ebfc21095d 100644 --- a/pkgs/development/libraries/libzra/default.nix +++ b/pkgs/development/libraries/libzra/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/zraorg/ZRA"; description = "Library for ZStandard random access"; platforms = platforms.all; diff --git a/pkgs/development/libraries/lief/default.nix b/pkgs/development/libraries/lief/default.nix index 0854987436e..953eee3b8bd 100644 --- a/pkgs/development/libraries/lief/default.nix +++ b/pkgs/development/libraries/lief/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchzip }: +{ lib, fetchzip }: fetchzip { url = "https://github.com/lief-project/LIEF/releases/download/0.9.0/LIEF-0.9.0-Linux.tar.gz"; sha256 = "1c47hwd00bp4mqd4p5b6xjfl89c3wwk9ccyc3a2gk658250g2la6"; - meta = with stdenv.lib; { + meta = with lib; { description = "Library to Instrument Executable Formats"; homepage = "https://lief.quarkslab.com/"; license = [ licenses.asl20 ]; diff --git a/pkgs/development/libraries/lightning/default.nix b/pkgs/development/libraries/lightning/default.nix index 65d0a18cedd..5fdc06bce01 100644 --- a/pkgs/development/libraries/lightning/default.nix +++ b/pkgs/development/libraries/lightning/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, libopcodes }: +{ lib, stdenv, fetchurl, libopcodes }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "lightning"; @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { ''; maintainers = [ maintainers.AndersonTorres ]; license = licenses.lgpl3Plus; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix index 2e6b3644628..d47c7b50abe 100644 --- a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix +++ b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake +{ stdenv, lib, fetchFromGitHub, pkg-config, cmake , opentracing-cpp, protobuf, zlib , enableGrpc ? false, grpc ? null, openssl ? null, c-ares ? null }: @@ -9,17 +9,17 @@ assert enableGrpc -> c-ares != null; stdenv.mkDerivation rec { pname = "lightstep-tracer-cpp"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "lightstep"; repo = pname; rev = "v${version}"; - sha256 = "0d7z9isf0n8s63mvp3j75949w0yv7jsva29i62lq8yxbym688fxb"; + sha256 = "1xr11dm94qpbx3nxb7si7zy7hzg2akj01pyxkd8pzzbvmkmic16j"; }; nativeBuildInputs = [ - cmake pkgconfig + cmake pkg-config ]; buildInputs = [ diff --git a/pkgs/development/libraries/lime/default.nix b/pkgs/development/libraries/lime/default.nix index aa34ff2e927..3a16b5202c4 100644 --- a/pkgs/development/libraries/lime/default.nix +++ b/pkgs/development/libraries/lime/default.nix @@ -4,7 +4,7 @@ , fetchFromGitLab , soci , sqlite -, stdenv +, lib, stdenv }: stdenv.mkDerivation rec { @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { # Do not build static libraries cmakeFlags = [ "-DENABLE_STATIC=NO" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "End-to-end encryption library for instant messaging"; homepage = "http://www.linphone.org/technical-corner/lime"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/development/libraries/linbox/default.nix index 7bca0c295c4..8a21bd3bcde 100644 --- a/pkgs/development/libraries/linbox/default.nix +++ b/pkgs/development/libraries/linbox/default.nix @@ -1,8 +1,8 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook , givaro -, pkgconfig +, pkg-config , blas , lapack , fflas-ffpack @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config ]; buildInputs = [ @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-blas-libs=-lblas" "--disable-optimization" - ] ++ stdenv.lib.optionals stdenv.isx86_64 [ + ] ++ lib.optionals stdenv.isx86_64 [ # disable SIMD instructions (which are enabled *when available* by default) "--${if stdenv.hostPlatform.sse3Support then "enable" else "disable"}-sse3" "--${if stdenv.hostPlatform.ssse3Support then "enable" else "disable"}-ssse3" @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { "--${if stdenv.hostPlatform.avx2Support then "enable" else "disable"}-avx2" "--${if stdenv.hostPlatform.fmaSupport then "enable" else "disable"}-fma" "--${if stdenv.hostPlatform.fma4Support then "enable" else "disable"}-fma4" - ] ++ stdenv.lib.optionals withSage [ + ] ++ lib.optionals withSage [ "--enable-sage" ]; @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { inherit version; description = "C++ library for exact, high-performance linear algebra"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/linenoise-ng/default.nix b/pkgs/development/libraries/linenoise-ng/default.nix index 0a2dacb48db..d19d6748147 100644 --- a/pkgs/development/libraries/linenoise-ng/default.nix +++ b/pkgs/development/libraries/linenoise-ng/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "linenoise-ng"; @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/arangodb/linenoise-ng"; description = "A small, portable GNU readline replacement for Linux, Windows and MacOS which is capable of handling UTF-8 characters"; - maintainers = with stdenv.lib.maintainers; [ cstrahan ]; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.bsd3; + maintainers = with lib.maintainers; [ cstrahan ]; + platforms = lib.platforms.all; + license = lib.licenses.bsd3; }; } diff --git a/pkgs/development/libraries/linenoise/default.nix b/pkgs/development/libraries/linenoise/default.nix index 3de9f08bf97..d465b48a8f4 100644 --- a/pkgs/development/libraries/linenoise/default.nix +++ b/pkgs/development/libraries/linenoise/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { pname = "linenoise"; @@ -23,8 +23,8 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/antirez/linenoise"; description = "A minimal, zero-config, BSD licensed, readline replacement"; - maintainers = with stdenv.lib.maintainers; [ mpsyco ]; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.bsd2; + maintainers = with lib.maintainers; [ mpsyco ]; + platforms = lib.platforms.unix; + license = lib.licenses.bsd2; }; } diff --git a/pkgs/development/libraries/liquid-dsp/default.nix b/pkgs/development/libraries/liquid-dsp/default.nix index b882e233c07..746771f44fe 100644 --- a/pkgs/development/libraries/liquid-dsp/default.nix +++ b/pkgs/development/libraries/liquid-dsp/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, autoreconfHook }: +{lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation { pname = "liquid-dsp"; @@ -16,8 +16,8 @@ stdenv.mkDerivation { meta = { homepage = "https://liquidsdr.org/"; description = "Digital signal processing library for software-defined radios"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.mit; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/liquidfun/default.nix b/pkgs/development/libraries/liquidfun/default.nix index 21d3bc47663..29531a29996 100644 --- a/pkgs/development/libraries/liquidfun/default.nix +++ b/pkgs/development/libraries/liquidfun/default.nix @@ -1,4 +1,4 @@ -{ stdenv, requireFile, cmake, libGLU, libGL, libX11, libXi }: +{ lib, stdenv, requireFile, cmake, libGLU, libGL, libX11, libXi }: let sourceInfo = rec { @@ -36,13 +36,13 @@ stdenv.mkDerivation { meta = { description = "2D physics engine based on Box2D"; - maintainers = with stdenv.lib.maintainers; + maintainers = with lib.maintainers; [ qknight ]; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; hydraPlatforms = []; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; homepage = "https://google.github.io/liquidfun/"; }; } diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix index 97079be0962..6b7f0c102ee 100644 --- a/pkgs/development/libraries/lirc/default.nix +++ b/pkgs/development/libraries/lirc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, help2man, python3, +{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, pkg-config, help2man, python3, alsaLib, xlibsWrapper, libxslt, systemd, libusb-compat-0_1, libftdi1 }: stdenv.mkDerivation rec { @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { touch lib/lirc/input_map.inc ''; - nativeBuildInputs = [ autoreconfHook pkgconfig help2man + nativeBuildInputs = [ autoreconfHook pkg-config help2man (python3.withPackages (p: with p; [ pyyaml setuptools ])) ]; buildInputs = [ alsaLib xlibsWrapper libxslt systemd libusb-compat-0_1 libftdi1 ]; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { "localstatedir=$TMPDIR" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Allows to receive and send infrared signals"; homepage = "https://www.lirc.org/"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/live555/default.nix b/pkgs/development/libraries/live555/default.nix index 84907a42860..85302bc7c96 100644 --- a/pkgs/development/libraries/live555/default.nix +++ b/pkgs/development/libraries/live555/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sed \ -e 's/$(INCLUDES) -I. -O2 -DSOCKLEN_T/$(INCLUDES) -I. -O2 -I. -fPIC -DRTSPCLIENT_SYNCHRONOUS_INTERFACE=1 -DSOCKLEN_T/g' \ -i config.linux - '' + stdenv.lib.optionalString (stdenv ? glibc) '' + '' + lib.optionalString (stdenv ? glibc) '' substituteInPlace liveMedia/include/Locale.hh \ --replace '<xlocale.h>' '<locale.h>' ''; diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix index 64f6fccefa7..a59b460734d 100644 --- a/pkgs/development/libraries/lmdb/default.nix +++ b/pkgs/development/libraries/lmdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit }: +{ lib, stdenv, fetchgit }: stdenv.mkDerivation rec { pname = "lmdb"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { "CC=${stdenv.cc.targetPrefix}cc" "AR=${stdenv.cc.targetPrefix}ar" ] - ++ stdenv.lib.optional stdenv.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/liblmdb.so"; + ++ lib.optional stdenv.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/liblmdb.so"; doCheck = true; checkPhase = "make test"; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { EOF ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Lightning memory-mapped database"; longDescription = '' LMDB is an ultra-fast, ultra-compact key-value embedded data store diff --git a/pkgs/development/libraries/lmdbxx/default.nix b/pkgs/development/libraries/lmdbxx/default.nix index 95d8f45eec4..9b1d320678a 100644 --- a/pkgs/development/libraries/lmdbxx/default.nix +++ b/pkgs/development/libraries/lmdbxx/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , lmdb }: @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/drycpp/lmdbxx#readme"; description = "C++11 wrapper for the LMDB embedded B+ tree database library"; - license = stdenv.lib.licenses.unlicense; - maintainers = with stdenv.lib.maintainers; [ fgaz ]; + license = lib.licenses.unlicense; + maintainers = with lib.maintainers; [ fgaz ]; }; } diff --git a/pkgs/development/libraries/log4cplus/default.nix b/pkgs/development/libraries/log4cplus/default.nix index 097ff0c48c9..1e16ee96ae7 100644 --- a/pkgs/development/libraries/log4cplus/default.nix +++ b/pkgs/development/libraries/log4cplus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: let name = "log4cplus-2.0.5"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = { homepage = "http://log4cplus.sourceforge.net/"; description = "A port the log4j library from Java to C++"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/log4cpp/default.nix b/pkgs/development/libraries/log4cpp/default.nix index d2918c87f33..d4b703a2bda 100644 --- a/pkgs/development/libraries/log4cpp/default.nix +++ b/pkgs/development/libraries/log4cpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "log4cpp-1.1.3"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://log4cpp.sourceforge.net/"; description = "A logging framework for C++ patterned after Apache log4j"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/log4cxx/default.nix b/pkgs/development/libraries/log4cxx/default.nix index cec0ec9ab28..aaf7ea5ee9c 100644 --- a/pkgs/development/libraries/log4cxx/default.nix +++ b/pkgs/development/libraries/log4cxx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libtool, libxml2, cppunit, boost +{ lib, stdenv, fetchurl, libtool, libxml2, cppunit, boost , apr, aprutil, db, expat }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }' src/examples/cpp/console.cpp \ src/main/cpp/inputstreamreader.cpp \ src/main/cpp/socketoutputstream.cpp - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' sed -i 's/namespace std { class locale; }/#include <locale>/' src/main/include/log4cxx/helpers/simpledateformat.h sed -i 's/\(#include <cctype>\)/\1\n#include <cstdlib>/' src/main/cpp/stringhelper.cpp ''; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://logging.apache.org/log4cxx/index.html"; description = "A logging framework for C++ patterned after Apache log4j"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/log4shib/default.nix b/pkgs/development/libraries/log4shib/default.nix index 17046d17b78..0602b4c3b52 100644 --- a/pkgs/development/libraries/log4shib/default.nix +++ b/pkgs/development/libraries/log4shib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoreconfHook }: +{ lib, stdenv, fetchgit, autoreconfHook }: stdenv.mkDerivation { pname = "log4shib"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A forked version of log4cpp that has been created for the Shibboleth project"; maintainers = [ maintainers.jammerful ]; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/loki/default.nix b/pkgs/development/libraries/loki/default.nix index 9c7e36113d8..49b850eae65 100644 --- a/pkgs/development/libraries/loki/default.nix +++ b/pkgs/development/libraries/loki/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "loki"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A C++ library of designs, containing flexible implementations of common design patterns and idioms"; homepage = "http://loki-lib.sourceforge.net"; license = licenses.mit; diff --git a/pkgs/development/libraries/loudmouth/default.nix b/pkgs/development/libraries/loudmouth/default.nix index e00fc07480e..0245417bbf9 100644 --- a/pkgs/development/libraries/loudmouth/default.nix +++ b/pkgs/development/libraries/loudmouth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, libidn, glib, pkgconfig, zlib }: +{ lib, stdenv, fetchurl, openssl, libidn, glib, pkg-config, zlib }: stdenv.mkDerivation rec { version = "1.5.3"; @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ openssl libidn glib zlib ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A lightweight C library for the Jabber protocol"; platforms = platforms.linux; downloadPage = "http://mcabber.com/files/loudmouth/"; diff --git a/pkgs/development/libraries/lrdf/default.nix b/pkgs/development/libraries/lrdf/default.nix index 80c8702b0b9..51b2635b89e 100644 --- a/pkgs/development/libraries/lrdf/default.nix +++ b/pkgs/development/libraries/lrdf/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook +{ config, lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook , librdf_raptor2, ladspaH, openssl, zlib , doCheck ? config.doCheckByDefault or false, ladspaPlugins }: @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { sha256 = "00wzkfb8y0aqd519ypz067cq099dpc89w69zw8ln39vl6f9x2pd4"; }; - postPatch = stdenv.lib.optionalString doCheck '' + postPatch = lib.optionalString doCheck '' sed -i -e 's:usr/local:${ladspaPlugins}:' examples/{instances,remove}_test.c ''; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; propagatedBuildInputs = [ librdf_raptor2 ]; @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { meta = { description = "Lightweight RDF library with special support for LADSPA plugins"; homepage = "https://sourceforge.net/projects/lrdf/"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.marcweber ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/luabind/default.nix b/pkgs/development/libraries/luabind/default.nix index eded6b6527f..d7aed656fdb 100644 --- a/pkgs/development/libraries/luabind/default.nix +++ b/pkgs/development/libraries/luabind/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, boost-build, lua, boost}: +{lib, stdenv, fetchurl, boost-build, lua, boost}: stdenv.mkDerivation { name = "luabind-0.9.1"; @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/luabind/luabind"; description = "A library that helps you create bindings between C++ and Lua"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mit; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/lucene++/default.nix b/pkgs/development/libraries/lucene++/default.nix index 0dcd53a0772..2761329ea23 100644 --- a/pkgs/development/libraries/lucene++/default.nix +++ b/pkgs/development/libraries/lucene++/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, boost, gtest }: +{ lib, stdenv, fetchurl, cmake, boost, gtest }: stdenv.mkDerivation rec { pname = "lucene++"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "C++ port of the popular Java Lucene search engine"; homepage = "https://github.com/luceneplusplus/LucenePlusPlus"; - license = with stdenv.lib.licenses; [ asl20 lgpl3Plus ]; - platforms = stdenv.lib.platforms.linux; + license = with lib.licenses; [ asl20 lgpl3Plus ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/luksmeta/default.nix b/pkgs/development/libraries/luksmeta/default.nix index 9e01605d2df..afefcfed82c 100644 --- a/pkgs/development/libraries/luksmeta/default.nix +++ b/pkgs/development/libraries/luksmeta/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, asciidoc +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, asciidoc , cryptsetup }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "10nslwk7m1qwskd12c204ipa3cbad0q6fn0v084z2f7q6xxbkd2d"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig asciidoc ]; + nativeBuildInputs = [ autoreconfHook pkg-config asciidoc ]; buildInputs = [ cryptsetup ]; meta = { diff --git a/pkgs/development/libraries/lyra/default.nix b/pkgs/development/libraries/lyra/default.nix index 8d5d083d82b..9f5fd1d3a34 100644 --- a/pkgs/development/libraries/lyra/default.nix +++ b/pkgs/development/libraries/lyra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, installShellFiles, meson, ninja }: +{ lib, stdenv, fetchFromGitHub, installShellFiles, meson, ninja }: stdenv.mkDerivation rec { pname = "lyra"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { cp -R $src/include/* $out/include ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/bfgroup/Lyra"; description = "A simple to use, composable, command line parser for C++ 11 and beyond"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/lzo/default.nix b/pkgs/development/libraries/lzo/default.nix index 446f9146414..8ea933f0e3a 100644 --- a/pkgs/development/libraries/lzo/default.nix +++ b/pkgs/development/libraries/lzo/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { name = "lzo-2.10"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { doCheck = true; # not cross; - meta = with stdenv.lib; { + meta = with lib; { description = "Real-time data (de)compression library"; longDescription = '' LZO is a portable lossless data compression library written in ANSI C. diff --git a/pkgs/development/libraries/mac/default.nix b/pkgs/development/libraries/mac/default.nix index a896b9261d5..7445d283c6f 100644 --- a/pkgs/development/libraries/mac/default.nix +++ b/pkgs/development/libraries/mac/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, yasm }: +{ lib, stdenv, fetchurl, fetchpatch, yasm }: stdenv.mkDerivation rec { pname = "mac"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ yasm ]; - meta = with stdenv.lib; { + meta = with lib; { description = "APE codec and decompressor"; homepage = "http://www.deb-multimedia.org/dists/testing/main/binary-amd64/package/monkeys-audio.php"; license = licenses.unfreeRedistributable; diff --git a/pkgs/development/libraries/malcontent/default.nix b/pkgs/development/libraries/malcontent/default.nix index 49ffade8546..641f3b87c3f 100644 --- a/pkgs/development/libraries/malcontent/default.nix +++ b/pkgs/development/libraries/malcontent/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitLab , fetchpatch , meson @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { # We need to install Polkit & AccountsService data files in `out` # but `buildEnv` only uses `bin` when both `bin` and `out` are present. outputsToInstall = [ "bin" "out" "man" ]; diff --git a/pkgs/development/libraries/malcontent/ui.nix b/pkgs/development/libraries/malcontent/ui.nix index 54382cfc0d5..e306267154a 100644 --- a/pkgs/development/libraries/malcontent/ui.nix +++ b/pkgs/development/libraries/malcontent/ui.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , meson , ninja , pkg-config @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { "-Dui=enabled" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "UI components for parental controls library"; homepage = "https://gitlab.freedesktop.org/pwithnall/malcontent"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix index cf0539fe266..d4f11c1d126 100644 --- a/pkgs/development/libraries/mapnik/default.nix +++ b/pkgs/development/libraries/mapnik/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip +{ lib, stdenv, fetchzip , boost, cairo, freetype, gdal, harfbuzz, icu, libjpeg, libpng, libtiff , libwebp, libxml2, proj, python, sqlite, zlib @@ -8,12 +8,12 @@ stdenv.mkDerivation rec { pname = "mapnik"; - version = "3.0.23"; + version = "3.1.0"; src = fetchzip { # this one contains all git submodules and is cheaper than fetchgit url = "https://github.com/mapnik/mapnik/releases/download/v${version}/mapnik-v${version}.tar.bz2"; - sha256 = "1754m8y7fyk0dyf7cglhavsk66g5kdqhnmgicib1jkcgjbl69f15"; + sha256 = "sha256-qqPqN4vs3ZsqKgnx21yQhX8OzHca/0O+3mvQ/vnC5EY="; }; # a distinct dev output makes python-mapnik fail @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { "XML2_LIBS=${libxml2.out}/lib" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An open source toolkit for developing mapping applications"; homepage = "https://mapnik.org"; maintainers = with maintainers; [ hrdinka ]; diff --git a/pkgs/development/libraries/marisa/default.nix b/pkgs/development/libraries/marisa/default.nix index 99d82970fe0..4a3f8be0417 100644 --- a/pkgs/development/libraries/marisa/default.nix +++ b/pkgs/development/libraries/marisa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "marisa"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/s-yata/marisa-trie"; description = "Static and space-efficient trie data structure library"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/marl/default.nix b/pkgs/development/libraries/marl/default.nix index 2bf23962d53..4545264aad9 100644 --- a/pkgs/development/libraries/marl/default.nix +++ b/pkgs/development/libraries/marl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, fetchFromGitHub }: +{ lib, stdenv, cmake, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "marl"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # Turn on the flag to install after building the library. cmakeFlags = ["-DMARL_INSTALL=ON"]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/google/marl"; description = "A hybrid thread / fiber task scheduler written in C++ 11"; platforms = platforms.all; diff --git a/pkgs/development/libraries/martyr/default.nix b/pkgs/development/libraries/martyr/default.nix index 51fd6962e70..609033e22ea 100644 --- a/pkgs/development/libraries/martyr/default.nix +++ b/pkgs/development/libraries/martyr/default.nix @@ -1,12 +1,12 @@ -{stdenv, fetchurl, ant, jdk}: +{lib, stdenv, fetchurl, ant, jdk}: stdenv.mkDerivation rec { - pname = "martyr"; + pname = "martyr"; version = "0.3.9"; - src = fetchurl { - url = "mirror://sourceforge/martyr/${pname}-${version}.tar.gz"; - sha256 = "1ks8j413bcby345kmq1i7av8kwjvz5vxdn1zpv0p7ywxq54i4z59"; - }; + src = fetchurl { + url = "mirror://sourceforge/martyr/${pname}-${version}.tar.gz"; + sha256 = "1ks8j413bcby345kmq1i7av8kwjvz5vxdn1zpv0p7ywxq54i4z59"; + }; buildInputs = [ ant jdk ]; @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { meta = { description = "Java framework around the IRC protocol to allow application writers easy manipulation of the protocol and client state"; homepage = "http://martyr.sourceforge.net/"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/matio/default.nix b/pkgs/development/libraries/matio/default.nix index bc629dc2506..b6330f69e30 100644 --- a/pkgs/development/libraries/matio/default.nix +++ b/pkgs/development/libraries/matio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "matio-1.5.19"; src = fetchurl { @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { sha256 = "0vr8c1mz1k6mz0sgh6n3scl5c3a71iqmy5fnydrgq504icj4vym4"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A C library for reading and writing Matlab MAT files"; license = licenses.bsd2; platforms = platforms.all; diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix index f24232ac7ae..38a9b78b6d1 100644 --- a/pkgs/development/libraries/mbedtls/default.nix +++ b/pkgs/development/libraries/mbedtls/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake @@ -11,26 +11,25 @@ stdenv.mkDerivation rec { pname = "mbedtls"; - name = "mbedtls-${version}"; - version = "2.16.3"; # nixpkgs-update: no auto update + version = "2.16.9"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "ARMmbed"; repo = "mbedtls"; rev = "${pname}-${version}"; - sha256 = "1mzh92yyz93099a1gb2wvwc76jv12d1k1wg9k3dimbgczxgrkirc"; + sha256 = "0mz7n373b8d287crwi6kq2hb8ryyi228j38h25744lqai23qj5cf"; }; nativeBuildInputs = [ cmake ninja perl python ]; - postConfigure = stdenv.lib.optionals enableThreading '' + postConfigure = lib.optionals enableThreading '' perl scripts/config.pl set MBEDTLS_THREADING_C # Threading abstraction layer perl scripts/config.pl set MBEDTLS_THREADING_PTHREAD # POSIX thread wrapper layer for the threading layer. ''; cmakeFlags = [ "-DUSE_SHARED_MBEDTLS_LIBRARY=on" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://tls.mbed.org/"; description = "Portable cryptographic and TLS library, formerly known as PolarSSL"; license = licenses.asl20; diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix index b69e99de414..0fc74963299 100644 --- a/pkgs/development/libraries/mdds/default.nix +++ b/pkgs/development/libraries/mdds/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, llvmPackages }: +{ lib, stdenv, fetchurl, boost, llvmPackages }: stdenv.mkDerivation rec { pname = "mdds"; @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { cp "$out/share/pkgconfig/"* "$out/lib/pkgconfig" ''; - buildInputs = stdenv.lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]; + buildInputs = lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]; checkInputs = [ boost ]; - meta = with stdenv.lib; { + meta = with lib; { inherit version; homepage = "https://gitlab.com/mdds/mdds"; description = "A collection of multi-dimensional data structure and indexing algorithm"; diff --git a/pkgs/development/libraries/medfile/default.nix b/pkgs/development/libraries/medfile/default.nix index 4821b9865b2..a89cb43d261 100644 --- a/pkgs/development/libraries/medfile/default.nix +++ b/pkgs/development/libraries/medfile/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, hdf5 }: +{ lib, stdenv, fetchurl, cmake, hdf5 }: stdenv.mkDerivation rec { pname = "medfile"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { postInstall = "rm -r $out/bin/testc"; - meta = with stdenv.lib; { + meta = with lib; { description = "Library to read and write MED files"; homepage = "http://salome-platform.org/"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index 64ddba517df..3cda9ff3006 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -23,12 +23,12 @@ , libv4l , libvpx , ortp -, pkgconfig +, pkg-config , python , SDL , speex , srtp -, stdenv +, lib, stdenv }: stdenv.mkDerivation rec { @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { cmake doxygen intltool - pkgconfig + pkg-config python ]; @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { ]; NIX_LDFLAGS = "-lXext"; - meta = with stdenv.lib; { + meta = with lib; { description = "A powerful and lightweight streaming engine specialized for voice/video telephony applications"; homepage = "http://www.linphone.org/technical-corner/mediastreamer2"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/mediastreamer/msopenh264.nix b/pkgs/development/libraries/mediastreamer/msopenh264.nix index 45b3c83bfe2..08842889f86 100644 --- a/pkgs/development/libraries/mediastreamer/msopenh264.nix +++ b/pkgs/development/libraries/mediastreamer/msopenh264.nix @@ -4,8 +4,8 @@ , fetchpatch , mediastreamer , openh264 -, pkgconfig -, stdenv +, pkg-config +, lib, stdenv }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { sha256 = "140hs5lzpshzswvl39klcypankq3v2qck41696j22my7s4wsa0hr"; }; - nativeBuildInputs = [ autoreconfHook cmake pkgconfig ]; + nativeBuildInputs = [ autoreconfHook cmake pkg-config ]; buildInputs = [ mediastreamer openh264 ]; # Do not build static libraries @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { cp src/libmsopenh264.so $out/lib/mediastreamer/plugins/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "H.264 encoder/decoder plugin for mediastreamer2"; homepage = "https://www.linphone.org/technical-corner/mediastreamer2"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/menu-cache/default.nix b/pkgs/development/libraries/menu-cache/default.nix index d7b39c28a42..b2f06b9e627 100644 --- a/pkgs/development/libraries/menu-cache/default.nix +++ b/pkgs/development/libraries/menu-cache/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, pkgconfig, libfm-extra }: +{ lib, stdenv, fetchurl, glib, pkg-config, libfm-extra }: let name = "menu-cache-1.1.0"; in @@ -9,11 +9,11 @@ stdenv.mkDerivation { sha256 = "1iry4zlpppww8qai2cw4zid4081hh7fz8nzsp5lqyffbkm2yn0pd"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib libfm-extra ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library to read freedesktop.org menu files"; homepage = "https://blog.lxde.org/tag/menu-cache/"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/mesa-glu/default.nix b/pkgs/development/libraries/mesa-glu/default.nix index 9679ddb94e8..85950daea68 100644 --- a/pkgs/development/libraries/mesa-glu/default.nix +++ b/pkgs/development/libraries/mesa-glu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libGL, ApplicationServices }: +{ lib, stdenv, fetchurl, pkg-config, libGL, ApplicationServices }: stdenv.mkDerivation rec { pname = "glu"; @@ -9,17 +9,17 @@ stdenv.mkDerivation rec { sha256 = "1g2m634p73mixkzv1qz1d0flwm390ydi41bwmchiqvdssqnlqnpv"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ libGL ] - ++ stdenv.lib.optional stdenv.isDarwin ApplicationServices; + ++ lib.optional stdenv.isDarwin ApplicationServices; outputs = [ "out" "dev" ]; meta = { description = "OpenGL utility library"; homepage = "https://cgit.freedesktop.org/mesa/glu/"; - license = stdenv.lib.licenses.sgi-b-20; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.sgi-b-20; + platforms = lib.platforms.unix; broken = stdenv.hostPlatform.isAndroid; }; } diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 55264888e2a..36a0b52f357 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, fetchpatch, buildPackages -, pkgconfig, intltool, ninja, meson +, pkg-config, intltool, ninja, meson , file, flex, bison, expat, libdrm, xorg, wayland, wayland-protocols, openssl , llvmPackages, libffi, libomxil-bellagio, libva-minimal , libelf, libvdpau, python3Packages @@ -26,12 +26,12 @@ - libOSMesa is in $osmesa (~4 MB) */ -with stdenv.lib; +with lib; let # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule - version = "20.3.2"; + version = "20.3.4"; branch = versions.major version; in @@ -46,7 +46,7 @@ stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" ]; - sha256 = "0gakhsj5qgm4wran7nlnz7kzgg3aj0a8f4q4dfbznfnjhnv03q6c"; + sha256 = "1120kf280hg4h0a2505vxf6rdw8r2ydl3cg4iwkmpx0zxj3sj8fw"; }; prePatch = "patchShebangs ."; @@ -65,12 +65,6 @@ stdenv.mkDerivation { url = "https://gitlab.freedesktop.org/mesa/mesa/commit/aebbf819df6d1e.patch"; sha256 = "17248hyzg43d73c86p077m4lv1pkncaycr3l27hwv9k4ija9zl8q"; }) - # Fix for pre macOS SDK 10.13: - (fetchpatch { # util: Disable memstream for Apple builds - # MR: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8269 - url = "https://gitlab.freedesktop.org/mesa/mesa/-/commit/f4403f70fe5bf2ec41af5546122f0d78caffa984.patch"; - sha256 = "03j2aj255m7ms848nkb41vj3s3yb72zb5rz3w3fzp5l9wzzargw5"; - }) ]; postPatch = '' @@ -129,10 +123,10 @@ stdenv.mkDerivation { ++ lib.optionals stdenv.isLinux [ libomxil-bellagio libva-minimal ] ++ lib.optional withValgrind valgrind-light; - depsBuildBuild = [ pkgconfig ]; + depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ - pkgconfig meson ninja + pkg-config meson ninja intltool bison flex file python3Packages.python python3Packages.Mako ] ++ lib.optionals (elem "wayland" eglPlatforms) [ @@ -207,7 +201,7 @@ stdenv.mkDerivation { done ''; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-fno-common"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-fno-common"; passthru = { inherit libdrm; diff --git a/pkgs/development/libraries/metal/default.nix b/pkgs/development/libraries/metal/default.nix index 090fd46640e..18b1f116b87 100644 --- a/pkgs/development/libraries/metal/default.nix +++ b/pkgs/development/libraries/metal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "metal"; version = "2.1.1"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Single-header C++11 library designed to make you love template metaprogramming"; homepage = "https://github.com/brunocodutra/metal"; license = licenses.mit; diff --git a/pkgs/development/libraries/microsoft_gsl/default.nix b/pkgs/development/libraries/microsoft_gsl/default.nix index a0356497818..af1c1c91a94 100644 --- a/pkgs/development/libraries/microsoft_gsl/default.nix +++ b/pkgs/development/libraries/microsoft_gsl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, catch, cmake +{ lib, stdenv, fetchFromGitHub, catch, cmake }: let @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { mv ../include/ $out/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ Core Guideline support library"; longDescription = '' The Guideline Support Library (GSL) contains functions and types that are suggested for diff --git a/pkgs/development/libraries/mimalloc/default.nix b/pkgs/development/libraries/mimalloc/default.nix index fcc44062b51..2ac2087054f 100644 --- a/pkgs/development/libraries/mimalloc/default.nix +++ b/pkgs/development/libraries/mimalloc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, ninja +{ lib, stdenv, fetchFromGitHub, cmake, ninja , secureBuild ? false }: @@ -17,10 +17,10 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ninja ]; - cmakeFlags = stdenv.lib.optional secureBuild [ "-DMI_SECURE=ON" ]; + cmakeFlags = lib.optional secureBuild [ "-DMI_SECURE=ON" ]; postInstall = let - rel = stdenv.lib.versions.majorMinor version; + rel = lib.versions.majorMinor version; in '' # first, install headers, that's easy mkdir -p $dev @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Compact, fast, general-purpose memory allocator"; homepage = "https://github.com/microsoft/mimalloc"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/mimetic/default.nix b/pkgs/development/libraries/mimetic/default.nix index 0147a297305..1638caa0d1f 100644 --- a/pkgs/development/libraries/mimetic/default.nix +++ b/pkgs/development/libraries/mimetic/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cutee }: +{ lib, stdenv, fetchurl, cutee }: stdenv.mkDerivation rec { pname = "mimetic"; @@ -11,9 +11,9 @@ stdenv.mkDerivation rec { buildInputs = [ cutee ]; - patches = stdenv.lib.optional stdenv.isAarch64 ./narrowing.patch; + patches = lib.optional stdenv.isAarch64 ./narrowing.patch; - meta = with stdenv.lib; { + meta = with lib; { description = "MIME handling library"; homepage = "http://www.codesink.org/mimetic_mime_library.html"; license = licenses.mit; diff --git a/pkgs/development/libraries/miniball/default.nix b/pkgs/development/libraries/miniball/default.nix index d1804b9bf95..e48857861d6 100644 --- a/pkgs/development/libraries/miniball/default.nix +++ b/pkgs/development/libraries/miniball/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { pname = "miniball"; @@ -19,8 +19,8 @@ stdenv.mkDerivation { meta = { description = "Smallest Enclosing Balls of Points"; homepage = "https://www.inf.ethz.ch/personal/gaertner/miniball.html"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.erikryb ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.erikryb ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/minixml/default.nix b/pkgs/development/libraries/minixml/default.nix index 8938ab90fbc..93c03b31a8a 100644 --- a/pkgs/development/libraries/minixml/default.nix +++ b/pkgs/development/libraries/minixml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "mxml"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A small XML library"; homepage = "https://www.msweet.org/mxml/"; license = licenses.asl20; diff --git a/pkgs/development/libraries/minizip/default.nix b/pkgs/development/libraries/minizip/default.nix index 5ee1f38ca8b..bb62a9b3b2b 100644 --- a/pkgs/development/libraries/minizip/default.nix +++ b/pkgs/development/libraries/minizip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, zlib, autoreconfHook }: +{ lib, stdenv, zlib, autoreconfHook }: stdenv.mkDerivation { name = "minizip-${zlib.version}"; @@ -12,6 +12,6 @@ stdenv.mkDerivation { meta = { description = "Compression library implementing the deflate compression method found in gzip and PKZIP"; inherit (zlib.meta) license homepage; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/minizip2/default.nix b/pkgs/development/libraries/minizip2/default.nix index 6c6d8b3ef86..16bb2b8d44e 100644 --- a/pkgs/development/libraries/minizip2/default.nix +++ b/pkgs/development/libraries/minizip2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkg-config, zlib, bzip2, xz, zstd, openssl }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, zlib, bzip2, xz, zstd, openssl }: stdenv.mkDerivation rec { pname = "minizip"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib bzip2 xz zstd openssl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Compression library implementing the deflate compression method found in gzip and PKZIP"; homepage = "https://github.com/nmoinvaz/minizip"; license = licenses.zlib; diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 1f2915c5071..633a7325b09 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, makeWrapper +{ lib, stdenv, fetchFromGitHub, makeWrapper , SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate, libexif -, libvorbis, libxml2, movit, pkgconfig, sox, fftw, opencv4, SDL2 +, libvorbis, libxml2, movit, pkg-config, sox, fftw, opencv4, SDL2 , gtk2, genericUpdater, common-updater-scripts, libebur128 }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2 - makeWrapper movit pkgconfig sox libexif gtk2 fftw libebur128 + makeWrapper movit pkg-config sox libexif gtk2 fftw libebur128 opencv4 SDL2 ]; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { rev-prefix = "v"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Open source multimedia framework, designed for television broadcasting"; homepage = "https://www.mltframework.org"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix index f8ec278ea78..7434383e165 100644 --- a/pkgs/development/libraries/mlt/qt-5.nix +++ b/pkgs/development/libraries/mlt/qt-5.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib , fetchFromGitHub , SDL , ffmpeg @@ -9,7 +9,7 @@ , libvorbis , libxml2 , movit -, pkgconfig +, pkg-config , sox , qtbase , qtsvg @@ -23,7 +23,7 @@ , mkDerivation , which }: -let inherit (stdenv.lib) getDev; in +let inherit (lib) getDev; in mkDerivation rec { pname = "mlt"; version = "6.22.1"; @@ -45,7 +45,7 @@ mkDerivation rec { libvorbis libxml2 movit - pkgconfig + pkg-config qtbase qtsvg sox @@ -102,7 +102,7 @@ mkDerivation rec { rev-prefix = "v"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Open source multimedia framework, designed for television broadcasting"; homepage = "https://www.mltframework.org/"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/mm-common/default.nix b/pkgs/development/libraries/mm-common/default.nix index 3981e05ef06..a43d99503a3 100644 --- a/pkgs/development/libraries/mm-common/default.nix +++ b/pkgs/development/libraries/mm-common/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , gnome3 , meson @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { version = "1.0.2"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "07b4s5ckcz9q5gwx8vchim19mhfgl8wysqwi30pndks3m4zrzad2"; }; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Common build files of GLib/GTK C++ bindings"; longDescription = '' The mm-common module provides the build infrastructure and utilities diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix index d011419cea7..e9779cf0a05 100644 --- a/pkgs/development/libraries/mongoc/default.nix +++ b/pkgs/development/libraries/mongoc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, perl, pkgconfig, libbson +{ lib, stdenv, fetchzip, perl, pkg-config, libbson , openssl, which, zlib, snappy }: @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { sha256 = "1vnnk3pwbcmwva1010bl111kdcdx3yb2w7j7a78hhvrm1k9r1wp8"; }; - nativeBuildInputs = [ pkgconfig which perl ]; + nativeBuildInputs = [ pkg-config which perl ]; buildInputs = [ openssl zlib ]; propagatedBuildInputs = [ libbson snappy ]; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "The official C client library for MongoDB"; homepage = "https://github.com/mongodb/mongo-c-driver"; license = licenses.asl20; diff --git a/pkgs/development/libraries/mono-addins/default.nix b/pkgs/development/libraries/mono-addins/default.nix index d9c1636e59b..158b39a8186 100644 --- a/pkgs/development/libraries/mono-addins/default.nix +++ b/pkgs/development/libraries/mono-addins/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mono4, gtk-sharp-2_0 }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, mono4, gtk-sharp-2_0 }: stdenv.mkDerivation rec { pname = "mono-addins"; @@ -12,14 +12,14 @@ stdenv.mkDerivation rec { sha256 = "018g3bd8afjc39h22h2j5r6ldsdn08ynx7wg889gdvnxg3hrxgl2"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; # Use msbuild when https://github.com/NixOS/nixpkgs/pull/43680 is merged buildInputs = [ mono4 gtk-sharp-2_0 ]; dontStrip = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.mono-project.com/archived/monoaddins/"; description = "A generic framework for creating extensible applications"; longDescription = '' diff --git a/pkgs/development/libraries/motif/default.nix b/pkgs/development/libraries/motif/default.nix index f03ba81e868..0499aaec532 100644 --- a/pkgs/development/libraries/motif/default.nix +++ b/pkgs/development/libraries/motif/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libtool +{ lib, stdenv, fetchurl, pkg-config, libtool , xlibsWrapper, xbitmaps, libXrender, libXmu, libXt , expat, libjpeg, libpng, libiconv , flex @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { expat libjpeg libpng libiconv ]; - nativeBuildInputs = [ pkgconfig flex ]; + nativeBuildInputs = [ pkg-config flex ]; propagatedBuildInputs = [ libXp libXau ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { prePatch = '' rm lib/Xm/Xm.h - '' + stdenv.lib.optionalString (!demoSupport) '' + '' + lib.optionalString (!demoSupport) '' sed '/^SUBDIRS =,^$/s/\<demos\>//' -i Makefile.{am,in} ''; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ./Add-X.Org-to-bindings-file.patch ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://motif.ics.com"; description = "Unix standard widget-toolkit and window-manager"; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/development/libraries/movit/default.nix b/pkgs/development/libraries/movit/default.nix index 901d299728f..9c03a9f6c49 100644 --- a/pkgs/development/libraries/movit/default.nix +++ b/pkgs/development/libraries/movit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL2, eigen, epoxy, fftw, gtest, pkgconfig }: +{ lib, stdenv, fetchurl, SDL2, eigen, epoxy, fftw, gtest, pkg-config }: stdenv.mkDerivation rec { pname = "movit"; @@ -15,12 +15,12 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ eigen epoxy ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ SDL2 fftw gtest ]; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "High-performance, high-quality video filters for the GPU"; homepage = "https://movit.sesse.net"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/mp4v2/default.nix b/pkgs/development/libraries/mp4v2/default.nix index 3b8efadcfd1..7a6bbb55202 100644 --- a/pkgs/development/libraries/mp4v2/default.nix +++ b/pkgs/development/libraries/mp4v2/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/libmp4v2-c++11.patch?id=203f5a72bc97ffe089b424c47b07dd9eaea35713"; sha256 = "0sbn0il7lmk77yrjyb4f0a3z3h8gsmdkscvz5n9hmrrrhrwf672w"; }) - ] ++ stdenv.lib.optionals stdenv.cc.isClang [ + ] ++ lib.optionals stdenv.cc.isClang [ # unbreak build with Clang≥6 (C++14 by default). Based on https://reviews.freebsd.org/rP458678 ./fix-build-clang.patch ]; diff --git a/pkgs/development/libraries/mpfi/default.nix b/pkgs/development/libraries/mpfi/default.nix index 88617e9a740..399c5416d78 100644 --- a/pkgs/development/libraries/mpfi/default.nix +++ b/pkgs/development/libraries/mpfi/default.nix @@ -1,22 +1,22 @@ -{stdenv, fetchurl, mpfr}: +{lib, stdenv, fetchurl, mpfr}: stdenv.mkDerivation rec { pname = "mpfi"; - version = "1.5.3"; + version = "1.5.4"; file_nr = "37331"; src = fetchurl { # NOTE: the file_nr is whats important here. The actual package name (including the version) # is ignored. To find out the correct file_nr, go to https://gforge.inria.fr/projects/mpfi/ # and click on Download in the section "Latest File Releases". url = "https://gforge.inria.fr/frs/download.php/file/${file_nr}/mpfi-${version}.tar.bz2"; - sha256 = "0bqr8yibl7jbrp0bw7xk1lm7nis7rv26jsz6y8ycvih8n9bx90r3"; + sha256 = "sha256-I4PUV7IIxs088uZracTOR0d7Kg2zH77AzUseuqJHGS8="; }; buildInputs = [mpfr]; meta = { inherit version; - description = ''A multiple precision interval arithmetic library based on MPFR''; + description = "A multiple precision interval arithmetic library based on MPFR"; homepage = "https://gforge.inria.fr/projects/mpfi/"; - license = stdenv.lib.licenses.lgpl21Plus; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.lgpl21Plus; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix index 4a744b7483e..fc7eeeab942 100644 --- a/pkgs/development/libraries/mpfr/default.nix +++ b/pkgs/development/libraries/mpfr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gmp }: +{ lib, stdenv, fetchurl, gmp }: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ gmp ]; configureFlags = - stdenv.lib.optional stdenv.hostPlatform.isSunOS "--disable-thread-safe" ++ - stdenv.lib.optional stdenv.hostPlatform.is64bit "--with-pic"; + lib.optional stdenv.hostPlatform.isSunOS "--disable-thread-safe" ++ + lib.optional stdenv.hostPlatform.is64bit "--with-pic"; doCheck = true; # not cross; @@ -46,9 +46,9 @@ stdenv.mkDerivation rec { floating-point arithmetic (53-bit mantissa). ''; - license = stdenv.lib.licenses.lgpl2Plus; + license = lib.licenses.lgpl2Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/libraries/mpich/default.nix b/pkgs/development/libraries/mpich/default.nix index 0c1ea8be1c8..f7cdf7f97c0 100644 --- a/pkgs/development/libraries/mpich/default.nix +++ b/pkgs/development/libraries/mpich/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, gfortran +{ lib, stdenv, fetchurl, perl, gfortran , openssh, hwloc } : @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { sed -i 's:CXX="g++":CXX=${stdenv.cc}/bin/g++:' $out/bin/mpicxx sed -i 's:FC="gfortran":FC=${gfortran}/bin/gfortran:' $out/bin/mpifort '' - + stdenv.lib.optionalString (!stdenv.isDarwin) '' + + lib.optionalString (!stdenv.isDarwin) '' # /tmp/nix-build... ends up in the RPATH, fix it manually for entry in $out/bin/mpichversion $out/bin/mpivars; do echo "fix rpath: $entry" @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Implementation of the Message Passing Interface (MPI) standard"; longDescription = '' diff --git a/pkgs/development/libraries/mpir/default.nix b/pkgs/development/libraries/mpir/default.nix index 8da59530ea5..7f7df407e4e 100644 --- a/pkgs/development/libraries/mpir/default.nix +++ b/pkgs/development/libraries/mpir/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, m4, which, yasm }: +{ lib, stdenv, fetchurl, m4, which, yasm }: stdenv.mkDerivation rec { pname = "mpir"; @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { meta = { inherit version; - description = ''A highly optimised library for bignum arithmetic forked from GMP''; - license = stdenv.lib.licenses.lgpl3Plus; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; + description = "A highly optimised library for bignum arithmetic forked from GMP"; + license = lib.licenses.lgpl3Plus; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.unix; downloadPage = "http://mpir.org/downloads.html"; homepage = "http://mpir.org/"; updateWalker = true; diff --git a/pkgs/development/libraries/mps/default.nix b/pkgs/development/libraries/mps/default.nix index 8c1f3aea466..81b102d9bc3 100644 --- a/pkgs/development/libraries/mps/default.nix +++ b/pkgs/development/libraries/mps/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, sqlite }: +{ lib, stdenv, fetchurl, autoreconfHook, sqlite }: stdenv.mkDerivation rec { pname = "mps"; @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { meta = { description = "A flexible memory management and garbage collection library"; homepage = "https://www.ravenbrook.com/project/mps"; - license = stdenv.lib.licenses.sleepycat; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = lib.licenses.sleepycat; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.thoughtpolice ]; }; } diff --git a/pkgs/development/libraries/msgpack/generic.nix b/pkgs/development/libraries/msgpack/generic.nix index d7d79de8b2b..a784bc02636 100644 --- a/pkgs/development/libraries/msgpack/generic.nix +++ b/pkgs/development/libraries/msgpack/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake +{ lib, stdenv, cmake , version, src, patches ? [ ] , ... }: @@ -11,9 +11,9 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; - cmakeFlags = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-DMSGPACK_BUILD_EXAMPLES=OFF"; + cmakeFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-DMSGPACK_BUILD_EXAMPLES=OFF"; - meta = with stdenv.lib; { + meta = with lib; { description = "MessagePack implementation for C and C++"; homepage = "https://msgpack.org"; license = licenses.asl20; diff --git a/pkgs/development/libraries/msgpuck/default.nix b/pkgs/development/libraries/msgpuck/default.nix index 26066f1194f..53fb3bec908 100644 --- a/pkgs/development/libraries/msgpuck/default.nix +++ b/pkgs/development/libraries/msgpuck/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config }: stdenv.mkDerivation rec { pname = "msgpuck"; @@ -13,10 +13,10 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; - meta = with stdenv.lib; { - description = ''A simple and efficient MsgPack binary serialization library in a self-contained header file''; + meta = with lib; { + description = "A simple and efficient MsgPack binary serialization library in a self-contained header file"; homepage = "https://github.com/rtsisyk/msgpuck"; license = licenses.bsd2; platforms = platforms.linux; diff --git a/pkgs/development/libraries/msilbc/default.nix b/pkgs/development/libraries/msilbc/default.nix index 601e70427a1..cdcc0548abb 100644 --- a/pkgs/development/libraries/msilbc/default.nix +++ b/pkgs/development/libraries/msilbc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ilbc, mediastreamer, pkgconfig }: +{ lib, stdenv, fetchurl, ilbc, mediastreamer, pkg-config }: stdenv.mkDerivation rec { name = "msilbc-2.1.2"; @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = [ ilbc mediastreamer ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; configureFlags = [ "ILBC_LIBS=ilbc" "ILBC_CFLAGS=-I${ilbc}/include" "MEDIASTREAMER_LIBS=mediastreamer" "MEDIASTREAMER_CFLAGS=-I${mediastreamer}/include" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Mediastreamer plugin for the iLBC audio codec"; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/development/libraries/mtdev/default.nix b/pkgs/development/libraries/mtdev/default.nix index 5c04c6a6942..7873608e589 100644 --- a/pkgs/development/libraries/mtdev/default.nix +++ b/pkgs/development/libraries/mtdev/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "mtdev-1.1.6"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1q700h9dqcm3zl6c3gj0qxxjcx6ibw2c51wjijydhwdcm26v5mqm"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://bitmath.org/code/mtdev/"; description = "Multitouch Protocol Translation Library"; longDescription = '' diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix index 842d144005d..761026440f7 100644 --- a/pkgs/development/libraries/mtxclient/default.nix +++ b/pkgs/development/libraries/mtxclient/default.nix @@ -1,12 +1,10 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch , cmake -, pkgconfig +, pkg-config , boost17x , openssl -, zlib -, libsodium , olm , spdlog , nlohmann_json @@ -14,13 +12,13 @@ stdenv.mkDerivation rec { pname = "mtxclient"; - version = "0.3.1"; + version = "0.4.1"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "mtxclient"; rev = "v${version}"; - sha256 = "1dg4dq20g0ah62j5s3gpsxqq4ny7lxkxdxa9q6g54hdwkrb9ms7x"; + sha256 = "1044zil3izhb3whhfjah7w0kg5mr3hys32cjffky681d3mb3wi5n"; }; cmakeFlags = [ @@ -36,22 +34,20 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config ]; buildInputs = [ spdlog boost17x openssl - zlib - libsodium olm ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Client API library for Matrix, built on top of Boost.Asio"; homepage = "https://github.com/Nheko-Reborn/mtxclient"; license = licenses.mit; - maintainers = with maintainers; [ fpletz ]; + maintainers = with maintainers; [ fpletz pstn ]; platforms = platforms.all; # Should be fixable if a higher clang version is used, see: # https://github.com/NixOS/nixpkgs/pull/85922#issuecomment-619287177 diff --git a/pkgs/development/libraries/multipart-parser-c/default.nix b/pkgs/development/libraries/multipart-parser-c/default.nix index b2bdf5d0447..45b0abdee71 100644 --- a/pkgs/development/libraries/multipart-parser-c/default.nix +++ b/pkgs/development/libraries/multipart-parser-c/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { description = "Http multipart parser implemented in C "; homepage = "https://github.com/iafonov/multipart-parser-c"; - license = [ stdenv.lib.licenses.mit ]; + license = [ lib.licenses.mit ]; }; } diff --git a/pkgs/development/libraries/mumlib/default.nix b/pkgs/development/libraries/mumlib/default.nix index f936fc8b3df..02f0cd671f2 100644 --- a/pkgs/development/libraries/mumlib/default.nix +++ b/pkgs/development/libraries/mumlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config , boost, openssl, log4cpp, libopus, protobuf }: with lib; stdenv.mkDerivation { pname = "mumlib"; @@ -12,7 +12,7 @@ with lib; stdenv.mkDerivation { }; buildInputs = [ boost openssl libopus protobuf log4cpp ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; installPhase = '' install -Dm555 libmumlib.so $out/lib/libmumlib.so cp -a ../include $out diff --git a/pkgs/development/libraries/muparser/default.nix b/pkgs/development/libraries/muparser/default.nix index 8aac20e19d0..85c9f781cc6 100644 --- a/pkgs/development/libraries/muparser/default.nix +++ b/pkgs/development/libraries/muparser/default.nix @@ -1,9 +1,9 @@ -{stdenv, fetchurl, unzip, setfile}: +{lib, stdenv, fetchurl, unzip, setfile}: stdenv.mkDerivation rec { pname = "muparser"; version = "2.2.3"; - url-version = stdenv.lib.replaceChars ["."] ["_"] version; + url-version = lib.replaceChars ["."] ["_"] version; src = fetchurl { url = "mirror://sourceforge/muparser/muparser_v${url-version}.zip"; @@ -12,12 +12,12 @@ stdenv.mkDerivation rec { buildInputs = [ unzip - ] ++ stdenv.lib.optionals stdenv.isDarwin [setfile]; + ] ++ lib.optionals stdenv.isDarwin [setfile]; meta = { homepage = "http://muparser.sourceforge.net"; description = "An extensible high performance math expression parser library written in C++"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + license = lib.licenses.mit; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/development/libraries/muparserx/default.nix b/pkgs/development/libraries/muparserx/default.nix index d7de5ff00f3..ef6b254b8a3 100644 --- a/pkgs/development/libraries/muparserx/default.nix +++ b/pkgs/development/libraries/muparserx/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake }: @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { fi ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A C++ Library for Parsing Expressions with Strings, Complex Numbers, Vectors, Matrices and more"; homepage = "https://beltoforion.de/en/muparserx/"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/mutest/default.nix b/pkgs/development/libraries/mutest/default.nix index ae40ab9f895..9470b812586 100644 --- a/pkgs/development/libraries/mutest/default.nix +++ b/pkgs/development/libraries/mutest/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , meson , ninja @@ -24,7 +24,7 @@ stdenv.mkDerivation { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://ebassi.github.io/mutest/mutest.md.html"; description = "A BDD testing framework for C, inspired by Mocha"; license = licenses.mit; diff --git a/pkgs/development/libraries/mygui/default.nix b/pkgs/development/libraries/mygui/default.nix index 4b86868d2aa..4260e30561b 100644 --- a/pkgs/development/libraries/mygui/default.nix +++ b/pkgs/development/libraries/mygui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libX11, unzip, cmake, ois, freetype, libuuid, +{ lib, stdenv, fetchFromGitHub, libX11, unzip, cmake, ois, freetype, libuuid, boost, pkg-config, withOgre ? false, ogre ? null, libGL, libGLU ? null } : let @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { # Tools are disabled due to compilation failures. cmakeFlags = [ "-DMYGUI_BUILD_TOOLS=OFF" "-DMYGUI_BUILD_DEMOS=OFF" "-DMYGUI_RENDERSYSTEM=${renderSystem}" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://mygui.info/"; description = "Library for creating GUIs for games and 3D applications"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/libraries/mypaint-brushes/1.0.nix b/pkgs/development/libraries/mypaint-brushes/1.0.nix index 570588e22fb..73acfd9287f 100644 --- a/pkgs/development/libraries/mypaint-brushes/1.0.nix +++ b/pkgs/development/libraries/mypaint-brushes/1.0.nix @@ -1,8 +1,8 @@ -{ stdenv +{ lib, stdenv , autoconf , automake , fetchFromGitHub -, pkgconfig +, pkg-config }: stdenv.mkDerivation rec { @@ -19,12 +19,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake - pkgconfig + pkg-config ]; preConfigure = "./autogen.sh"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://mypaint.org/"; description = "Brushes used by MyPaint and other software using libmypaint"; license = licenses.cc0; diff --git a/pkgs/development/libraries/mypaint-brushes/default.nix b/pkgs/development/libraries/mypaint-brushes/default.nix index d2fb8ed143a..acdee52b85e 100644 --- a/pkgs/development/libraries/mypaint-brushes/default.nix +++ b/pkgs/development/libraries/mypaint-brushes/default.nix @@ -1,8 +1,8 @@ -{ stdenv +{ lib, stdenv , autoconf , automake , fetchFromGitHub -, pkgconfig +, pkg-config }: stdenv.mkDerivation rec { @@ -19,12 +19,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake - pkgconfig + pkg-config ]; preConfigure = "./autogen.sh"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://mypaint.org/"; description = "Brushes used by MyPaint and other software using libmypaint"; license = licenses.cc0; diff --git a/pkgs/development/libraries/mysocketw/default.nix b/pkgs/development/libraries/mysocketw/default.nix index 1e2e3982d55..3b5da68a59d 100644 --- a/pkgs/development/libraries/mysocketw/default.nix +++ b/pkgs/development/libraries/mysocketw/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl }: +{ lib, stdenv, fetchurl, openssl }: stdenv.mkDerivation { name = "mysocketw-031026"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildInputs = [ openssl ]; - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace src/Makefile \ --replace -Wl,-soname, -Wl,-install_name,$out/lib/ ''; @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "Cross platform (Linux/FreeBSD/Unix/Win32) streaming socket C++"; - license = stdenv.lib.licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.lgpl21Plus; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/libraries/mythes/default.nix b/pkgs/development/libraries/mythes/default.nix index 1cd8612c3bb..b678baf9881 100644 --- a/pkgs/development/libraries/mythes/default.nix +++ b/pkgs/development/libraries/mythes/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, hunspell, ncurses, pkgconfig, perl }: +{ lib, stdenv, fetchurl, hunspell, ncurses, pkg-config, perl }: stdenv.mkDerivation rec { name = "mythes-1.2.4"; @@ -9,12 +9,12 @@ stdenv.mkDerivation rec { }; buildInputs = [ hunspell ]; - nativeBuildInputs = [ ncurses pkgconfig perl ]; + nativeBuildInputs = [ ncurses pkg-config perl ]; meta = { homepage = "http://hunspell.sourceforge.net/"; description = "Thesaurus library from Hunspell project"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; inherit (hunspell.meta) platforms; }; } diff --git a/pkgs/development/libraries/nanoflann/default.nix b/pkgs/development/libraries/nanoflann/default.nix index 649ce91cbd8..0dbbd461dc2 100644 --- a/pkgs/development/libraries/nanoflann/default.nix +++ b/pkgs/development/libraries/nanoflann/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, cmake}: +{lib, stdenv, fetchFromGitHub, cmake}: stdenv.mkDerivation rec { version = "1.3.2"; @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/jlblancoc/nanoflann"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; description = "Header only C++ library for approximate nearest neighbor search"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/nanomsg/default.nix b/pkgs/development/libraries/nanomsg/default.nix index 5772581d5ec..49a93abd7fb 100644 --- a/pkgs/development/libraries/nanomsg/default.nix +++ b/pkgs/development/libraries/nanomsg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, fetchFromGitHub }: +{ lib, stdenv, cmake, fetchFromGitHub }: stdenv.mkDerivation rec { version = "1.1.5"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description= "Socket library that provides several common communication patterns"; homepage = "https://nanomsg.org/"; license = licenses.mit; diff --git a/pkgs/development/libraries/nco/default.nix b/pkgs/development/libraries/nco/default.nix index 5f6c85411b1..e8053ce2702 100644 --- a/pkgs/development/libraries/nco/default.nix +++ b/pkgs/development/libraries/nco/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchzip, netcdf, netcdfcxx4, gsl, udunits, antlr, which, curl, flex, coreutils }: +{ lib, stdenv, fetchzip, netcdf, netcdfcxx4, gsl, udunits, antlr, which, curl, flex, coreutils }: stdenv.mkDerivation rec { - version = "4.9.6"; + version = "4.9.7"; pname = "nco"; nativeBuildInputs = [ flex which ]; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/nco/nco/archive/${version}.tar.gz"; - sha256 = "0f8vf66700dcr48jqd371bbldc61xkrilby13xp8j5l9q4xal808"; + sha256 = "sha256-Q4okOoyodofAsMrSmAhFISeY05Be+i7OX4qy2annQq4="; }; prePatch = '' @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { description = "NetCDF Operator toolkit"; longDescription = "The NCO (netCDF Operator) toolkit manipulates and analyzes data stored in netCDF-accessible formats, including DAP, HDF4, and HDF5"; homepage = "http://nco.sourceforge.net/"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.bzizou ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.bzizou ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 17a924e6e74..742de6cf92e 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , abiVersion ? "6" , mouseSupport ? false @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ - pkgconfig + pkg-config ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ buildPackages.ncurses ]; diff --git a/pkgs/development/libraries/ndi/default.nix b/pkgs/development/libraries/ndi/default.nix index c0e1816c0e1..75d2a2db021 100644 --- a/pkgs/development/libraries/ndi/default.nix +++ b/pkgs/development/libraries/ndi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, requireFile, avahi }: +{ lib, stdenv, requireFile, avahi }: stdenv.mkDerivation rec { pname = "ndi"; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { # Stripping breaks ndi-record. dontStrip = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://ndi.tv/sdk/"; description = "NDI Software Developer Kit"; platforms = ["x86_64-linux"]; diff --git a/pkgs/development/libraries/ndn-cxx/default.nix b/pkgs/development/libraries/ndn-cxx/default.nix index 893f82a6d52..3fb3fc305a3 100644 --- a/pkgs/development/libraries/ndn-cxx/default.nix +++ b/pkgs/development/libraries/ndn-cxx/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , doxygen , pkg-config @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { "--boost-libs=${boost.out}/lib" ]; - meta = with stdenv.lib; { - homepage = "http://named-data.net/"; + meta = with lib; { + homepage = "https://named-data.net/"; description = "A Named Data Neworking (NDN) or Content Centric Networking (CCN) abstraction"; longDescription = '' ndn-cxx is a C++ library, implementing Named Data Networking (NDN) diff --git a/pkgs/development/libraries/ndpi/default.nix b/pkgs/development/libraries/ndpi/default.nix index 43da97c2edd..c3df23052e2 100644 --- a/pkgs/development/libraries/ndpi/default.nix +++ b/pkgs/development/libraries/ndpi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, which, autoconf, automake, libtool, libpcap +{ lib, stdenv, fetchFromGitHub, which, autoconf, automake, libtool, libpcap , pkg-config }: let version = "3.4"; in @@ -22,7 +22,7 @@ stdenv.mkDerivation { pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A library for deep-packet inspection"; longDescription = '' nDPI is a library for deep-packet inspection based on OpenDPI. diff --git a/pkgs/development/libraries/neardal/default.nix b/pkgs/development/libraries/neardal/default.nix index 6f0dbf032a9..5e02a9fd522 100644 --- a/pkgs/development/libraries/neardal/default.nix +++ b/pkgs/development/libraries/neardal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, glib, readline, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, glib, readline, makeWrapper }: stdenv.mkDerivation { name = "neardal-0.7-post-git-20150930"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "12qwg7qiw2wfpaxfg2fjkmj5lls0g33xp6w433g8bnkvwlq4s29g"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoconf automake libtool glib readline makeWrapper ]; preConfigure = '' @@ -21,7 +21,7 @@ stdenv.mkDerivation { configureFlags = [ "--disable-dependency-tracking" "--disable-traces" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "C APIs to exchange datas with the NFC daemon 'Neard'"; license = licenses.lgpl2; homepage = "https://01.org/linux-nfc"; diff --git a/pkgs/development/libraries/neatvnc/default.nix b/pkgs/development/libraries/neatvnc/default.nix index db7940536f1..980424b7fd4 100644 --- a/pkgs/development/libraries/neatvnc/default.nix +++ b/pkgs/development/libraries/neatvnc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, pkg-config, ninja +{ lib, stdenv, fetchFromGitHub, meson, pkg-config, ninja , pixman, gnutls, libdrm, libjpeg_turbo, zlib, aml }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson pkg-config ninja ]; buildInputs = [ pixman gnutls libdrm libjpeg_turbo zlib aml ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A VNC server library"; longDescription = '' This is a liberally licensed VNC server library that's intended to be diff --git a/pkgs/development/libraries/neon/0.29.nix b/pkgs/development/libraries/neon/0.29.nix index c60f5e60fb8..e0437fb7cea 100644 --- a/pkgs/development/libraries/neon/0.29.nix +++ b/pkgs/development/libraries/neon/0.29.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxml2, pkgconfig, perl +{ lib, stdenv, fetchurl, libxml2, pkg-config, perl , compressionSupport ? true, zlib ? null , sslSupport ? true, openssl ? null , static ? false @@ -10,7 +10,7 @@ assert sslSupport -> openssl != null; assert static || shared; let - inherit (stdenv.lib) optionals; + inherit (lib) optionals; in stdenv.mkDerivation rec { @@ -24,15 +24,15 @@ stdenv.mkDerivation rec { patches = optionals stdenv.isDarwin [ ./0.29.6-darwin-fix-configure.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [libxml2 openssl] - ++ stdenv.lib.optional compressionSupport zlib; + ++ lib.optional compressionSupport zlib; configureFlags = [ - (stdenv.lib.enableFeature shared "shared") - (stdenv.lib.enableFeature static "static") - (stdenv.lib.withFeature compressionSupport "zlib") - (stdenv.lib.withFeature sslSupport "ssl") + (lib.enableFeature shared "shared") + (lib.enableFeature static "static") + (lib.withFeature compressionSupport "zlib") + (lib.withFeature sslSupport "ssl") ]; passthru = {inherit compressionSupport sslSupport;}; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { checkInputs = [ perl ]; doCheck = false; # fails, needs the net - meta = with stdenv.lib; { + meta = with lib; { description = "An HTTP and WebDAV client library"; homepage = "http://www.webdav.org/neon/"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/neon/default.nix b/pkgs/development/libraries/neon/default.nix index e9ce6ee18b4..c0c62deb0ac 100644 --- a/pkgs/development/libraries/neon/default.nix +++ b/pkgs/development/libraries/neon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxml2, pkgconfig, perl +{ lib, stdenv, fetchurl, libxml2, pkg-config, perl , compressionSupport ? true, zlib ? null , sslSupport ? true, openssl ? null , static ? stdenv.hostPlatform.isStatic @@ -10,7 +10,7 @@ assert sslSupport -> openssl != null; assert static || shared; let - inherit (stdenv.lib) optionals; + inherit (lib) optionals; in stdenv.mkDerivation rec { @@ -24,15 +24,15 @@ stdenv.mkDerivation rec { patches = optionals stdenv.isDarwin [ ./0.29.6-darwin-fix-configure.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [libxml2 openssl] - ++ stdenv.lib.optional compressionSupport zlib; + ++ lib.optional compressionSupport zlib; configureFlags = [ - (stdenv.lib.enableFeature shared "shared") - (stdenv.lib.enableFeature static "static") - (stdenv.lib.withFeature compressionSupport "zlib") - (stdenv.lib.withFeature sslSupport "ssl") + (lib.enableFeature shared "shared") + (lib.enableFeature static "static") + (lib.withFeature compressionSupport "zlib") + (lib.withFeature sslSupport "ssl") ]; passthru = {inherit compressionSupport sslSupport;}; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { checkInputs = [ perl ]; doCheck = false; # fails, needs the net - meta = with stdenv.lib; { + meta = with lib; { description = "An HTTP and WebDAV client library"; homepage = "http://www.webdav.org/neon/"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/netcdf-cxx4/default.nix b/pkgs/development/libraries/netcdf-cxx4/default.nix index 526e02e8907..b594a672140 100644 --- a/pkgs/development/libraries/netcdf-cxx4/default.nix +++ b/pkgs/development/libraries/netcdf-cxx4/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, netcdf, hdf5, curl }: +{ lib, stdenv, fetchurl, netcdf, hdf5, curl }: stdenv.mkDerivation rec { pname = "netcdf-cxx4"; version = "4.3.0"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "C++ API to manipulate netcdf files"; homepage = "https://www.unidata.ucar.edu/software/netcdf/"; - license = stdenv.lib.licenses.free; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.free; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/netcdf-fortran/default.nix b/pkgs/development/libraries/netcdf-fortran/default.nix index ab10c686163..0cdeda23879 100644 --- a/pkgs/development/libraries/netcdf-fortran/default.nix +++ b/pkgs/development/libraries/netcdf-fortran/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, netcdf, hdf5, curl, gfortran }: +{ lib, stdenv, fetchurl, netcdf, hdf5, curl, gfortran }: stdenv.mkDerivation rec { pname = "netcdf-fortran"; version = "4.4.5"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ netcdf hdf5 curl gfortran ]; doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Fortran API to manipulate netcdf files"; homepage = "https://www.unidata.ucar.edu/software/netcdf/"; license = licenses.free; diff --git a/pkgs/development/libraries/netcdf/default.nix b/pkgs/development/libraries/netcdf/default.nix index fecc4100f5e..c345f66e872 100644 --- a/pkgs/development/libraries/netcdf/default.nix +++ b/pkgs/development/libraries/netcdf/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , hdf5 , m4 @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { "--enable-shared" "--disable-dap-remote-tests" ] - ++ (stdenv.lib.optionals mpiSupport [ "--enable-parallel-tests" "CC=${mpi}/bin/mpicc" ]); + ++ (lib.optionals mpiSupport [ "--enable-parallel-tests" "CC=${mpi}/bin/mpicc" ]); disallowedReferences = [ stdenv.cc ]; @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec { meta = { description = "Libraries for the Unidata network Common Data Format"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; homepage = "https://www.unidata.ucar.edu/software/netcdf/"; license = { url = "https://www.unidata.ucar.edu/software/netcdf/docs/copyright.html"; diff --git a/pkgs/development/libraries/nettle/generic.nix b/pkgs/development/libraries/nettle/generic.nix index 4c3c6d04ca8..735fe373533 100644 --- a/pkgs/development/libraries/nettle/generic.nix +++ b/pkgs/development/libraries/nettle/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, gmp, gnum4 +{ lib, stdenv, buildPackages, gmp, gnum4 # Version specific args , version, src @@ -22,10 +22,10 @@ stdenv.mkDerivation ({ enableParallelBuilding = true; - patches = stdenv.lib.optional (stdenv.hostPlatform.system == "i686-cygwin") + patches = lib.optional (stdenv.hostPlatform.system == "i686-cygwin") ./cygwin.patch; - meta = with stdenv.lib; { + meta = with lib; { description = "Cryptographic library"; longDescription = '' @@ -61,7 +61,7 @@ stdenv.mkDerivation ({ // -stdenv.lib.optionalAttrs stdenv.isSunOS { +lib.optionalAttrs stdenv.isSunOS { # Make sure the right <gmp.h> is found, and not the incompatible # /usr/include/mp.h from OpenSolaris. See # <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html> diff --git a/pkgs/development/libraries/networking-ts-cxx/default.nix b/pkgs/development/libraries/networking-ts-cxx/default.nix new file mode 100644 index 00000000000..7dc6d4b11fe --- /dev/null +++ b/pkgs/development/libraries/networking-ts-cxx/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "networking-ts-cxx"; + version = "2019-02-27"; + + # Used until https://github.com/chriskohlhoff/networking-ts-impl/issues/17 is + # resolved and we can generate in Nix. + src = fetchFromGitHub { + owner = "chriskohlhoff"; + repo = "networking-ts-impl"; + rev = "c97570e7ceef436581be3c138868a19ad96e025b"; + sha256 = "12b5lg989nn1b8v6x9fy3cxsf3hs5hr67bd1mfyh8pjikir7zv6j"; + }; + + installPhase = '' + mkdir -p $out/{include,lib/pkgconfig} + cp -r include $out/ + substituteAll ${./networking_ts.pc.in} $out/lib/pkgconfig/networking_ts.pc + ''; + + meta = with lib; { + description = "Experimental implementation of the C++ Networking Technical Specification"; + homepage = "https://github.com/chriskohlhoff/networking-ts-impl"; + license = licenses.boost; + maintainers = with maintainers; [ bhipple ]; + }; +} diff --git a/pkgs/development/libraries/networking-ts-cxx/networking_ts.pc.in b/pkgs/development/libraries/networking-ts-cxx/networking_ts.pc.in new file mode 100644 index 00000000000..d52f68f4c15 --- /dev/null +++ b/pkgs/development/libraries/networking-ts-cxx/networking_ts.pc.in @@ -0,0 +1,8 @@ +prefix=@out@ +includedir=${prefix}/include + +Name: networking_ts +Description: Experimental implementation of the C++ Networking Technical Specification +URL: https://github.com/chriskohlhoff/networking-ts-impl +Version: ${networking_ts_version} +Cflags: -isystem${includedir} diff --git a/pkgs/development/libraries/newt/default.nix b/pkgs/development/libraries/newt/default.nix index 41d9671b204..dc6b604bd8e 100644 --- a/pkgs/development/libraries/newt/default.nix +++ b/pkgs/development/libraries/newt/default.nix @@ -31,11 +31,11 @@ stdenv.mkDerivation rec { unset CPP ''; - makeFlags = stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + makeFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "CROSS_COMPILE=${stdenv.cc.targetPrefix}" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://fedorahosted.org/newt/"; description = "Library for color text mode, widget based user interfaces"; diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index 7bcdf8feb30..6464679b948 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config # Optional Dependencies , openssl ? null, zlib ? null @@ -23,7 +23,7 @@ assert enableGetAssets -> libxml2 != null; assert enableJemalloc -> jemalloc != null; assert enablePython -> python != null && cython != null && ncurses != null && setuptools != null; -let inherit (stdenv.lib) optional optionals optionalString; in +let inherit (lib) optional optionals optionalString; in stdenv.mkDerivation rec { pname = "nghttp2"; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "out" "dev" "lib" ] ++ optional enablePython "python"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ optional enableLibEv libev ++ [ zlib ] @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-spdylay=no" "--disable-examples" - (stdenv.lib.enableFeature enableApp "app") + (lib.enableFeature enableApp "app") ] ++ optional enableAsioLib "--enable-asio-lib --with-boost-libdir=${boost}/lib" ++ (if enablePython then [ "--with-cython=${cython}/bin/cython" @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { #doCheck = true; # requires CUnit ; currently failing at test_util_localtime_date in util_test.cc - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://nghttp2.org/"; description = "A C implementation of HTTP/2"; license = licenses.mit; diff --git a/pkgs/development/libraries/ngt/default.nix b/pkgs/development/libraries/ngt/default.nix index 7d766eb5d87..385f2d84f8a 100644 --- a/pkgs/development/libraries/ngt/default.nix +++ b/pkgs/development/libraries/ngt/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , llvmPackages @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { NIX_ENFORCE_NO_NATIVE = ! enableAVX; __AVX2__ = if enableAVX then 1 else 0; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/yahoojapan/NGT"; description = "Nearest Neighbor Search with Neighborhood Graph and Tree for High-dimensional Data"; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix index f7a608d5c0a..915e733473e 100644 --- a/pkgs/development/libraries/nix-plugins/default.nix +++ b/pkgs/development/libraries/nix-plugins/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, nix, cmake, pkgconfig, boost }: +{ lib, stdenv, fetchFromGitHub, nix, cmake, pkg-config, boost }: let version = "6.0.0"; in stdenv.mkDerivation { pname = "nix-plugins"; @@ -11,14 +11,14 @@ stdenv.mkDerivation { sha256 = "08kxdci0sijj1hfkn3dbr7nbpb9xck0xr3xa3a0j116n4kvwb6qv"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ nix boost ]; meta = { description = "Collection of miscellaneous plugins for the nix expression language"; homepage = "https://github.com/shlevy/nix-plugins"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.mit; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix index 34c0f6294af..74213534532 100644 --- a/pkgs/development/libraries/nlohmann_json/default.nix +++ b/pkgs/development/libraries/nlohmann_json/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { postInstall = "rm -rf $out/lib64"; - meta = with stdenv.lib; { + meta = with lib; { description = "Header only C++ library for the JSON file format"; homepage = "https://github.com/nlohmann/json"; license = licenses.mit; diff --git a/pkgs/development/libraries/nlopt/default.nix b/pkgs/development/libraries/nlopt/default.nix index 64eb6d79abd..36fcf908118 100644 --- a/pkgs/development/libraries/nlopt/default.nix +++ b/pkgs/development/libraries/nlopt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, octave ? null }: +{ lib, stdenv, fetchFromGitHub, cmake, octave ? null }: stdenv.mkDerivation rec { pname = "nlopt"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "--without-guile" "--without-python" "--without-matlab" - ] ++ stdenv.lib.optionals (octave != null) [ + ] ++ lib.optionals (octave != null) [ "--with-octave" "M_INSTALL_DIR=$(out)/${octave.sitePath}/m" "OCT_INSTALL_DIR=$(out)/${octave.sitePath}/oct" @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://nlopt.readthedocs.io/en/latest/"; description = "Free open-source library for nonlinear optimization"; - license = stdenv.lib.licenses.lgpl21Plus; - hydraPlatforms = stdenv.lib.platforms.linux; + license = lib.licenses.lgpl21Plus; + hydraPlatforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/notcurses/default.nix b/pkgs/development/libraries/notcurses/default.nix index 189e36c1b44..7b9bffb9bc9 100644 --- a/pkgs/development/libraries/notcurses/default.nix +++ b/pkgs/development/libraries/notcurses/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, pkgconfig, pandoc, libunistring, ncurses, ffmpeg, +{ stdenv, cmake, pkg-config, pandoc, libunistring, ncurses, ffmpeg, fetchFromGitHub, lib, multimediaSupport ? true }: @@ -11,7 +11,7 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ cmake pkgconfig pandoc ]; + nativeBuildInputs = [ cmake pkg-config pandoc ]; buildInputs = [ libunistring ncurses ] ++ lib.optional multimediaSupport ffmpeg; diff --git a/pkgs/development/libraries/notify-sharp/default.nix b/pkgs/development/libraries/notify-sharp/default.nix index 58d35767d1e..1cd69074911 100644 --- a/pkgs/development/libraries/notify-sharp/default.nix +++ b/pkgs/development/libraries/notify-sharp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, pkgconfig, autoreconfHook +{ lib, stdenv, fetchFromGitLab, pkg-config, autoreconfHook , mono, gtk-sharp-3_0, dbus-sharp-1_0, dbus-sharp-glib-1_0 }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig autoreconfHook + pkg-config autoreconfHook ]; buildInputs = [ @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { sed -i 's#^[ \t]*DOCDIR=.*$#DOCDIR=$out/lib/monodoc#' ./configure.ac ''; - meta = with stdenv.lib; { + meta = with lib; { description = "D-Bus for .NET"; platforms = platforms.linux; license = licenses.mit; diff --git a/pkgs/development/libraries/npapi-sdk/default.nix b/pkgs/development/libraries/npapi-sdk/default.nix index c3ef724501e..6611f99bdfc 100644 --- a/pkgs/development/libraries/npapi-sdk/default.nix +++ b/pkgs/development/libraries/npapi-sdk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "npapi-sdk"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0xxfcsjmmgbbyl9zwpzdshbx27grj5fnzjfmldmm9apws2yk9gq1"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A bundle of NPAPI headers by Mozilla"; homepage = "https://bitbucket.org/mgorny/npapi-sdk"; # see also https://github.com/mozilla/npapi-sdk diff --git a/pkgs/development/libraries/npth/default.nix b/pkgs/development/libraries/npth/default.nix index 51512a16057..a5ac9ce9912 100644 --- a/pkgs/development/libraries/npth/default.nix +++ b/pkgs/development/libraries/npth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "npth-1.6"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "The New GNU Portable Threads Library"; longDescription = '' This is a library to provide the GNU Pth API and thus a non-preemptive diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index e8893bc2040..17b8b9226d5 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , CoreServices ? null , buildPackages }: @@ -22,7 +22,7 @@ stdenv.mkDerivation { preConfigure = '' cd nspr - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' substituteInPlace configure --replace '@executable_path/' "$out/lib/" substituteInPlace configure.in --replace '@executable_path/' "$out/lib/" ''; @@ -32,18 +32,18 @@ stdenv.mkDerivation { configureFlags = [ "--enable-optimize" "--disable-debug" - ] ++ stdenv.lib.optional stdenv.is64bit "--enable-64bit"; + ] ++ lib.optional stdenv.is64bit "--enable-64bit"; postInstall = '' find $out -name "*.a" -delete moveToOutput share "$dev" # just aclocal ''; - buildInputs = [] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = [] ++ lib.optionals stdenv.isDarwin [ CoreServices ]; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.mozilla.org/projects/nspr/"; description = "Netscape Portable Runtime, a platform-neutral API for system-level and libc-like functions"; platforms = platforms.all; diff --git a/pkgs/development/libraries/nss/3.44.nix b/pkgs/development/libraries/nss/3.44.nix index 1c89dd79331..b08b8b3ed2a 100644 --- a/pkgs/development/libraries/nss/3.44.nix +++ b/pkgs/development/libraries/nss/3.44.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, nspr, perl, zlib, sqlite, fixDarwinDylibNames, buildPackages }: +{ lib, stdenv, fetchurl, nspr, perl, zlib, sqlite, fixDarwinDylibNames, buildPackages }: let nssPEM = fetchurl { @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ perl ] - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ zlib sqlite ]; @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { patchFlags = [ "-p0" ]; - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace nss/coreconf/Darwin.mk --replace '@executable_path/$(notdir $@)' "$out/lib/\$(notdir \$@)" ''; @@ -61,16 +61,16 @@ in stdenv.mkDerivation rec { "USE_SYSTEM_ZLIB=1" "NSS_USE_SYSTEM_SQLITE=1" "NATIVE_CC=${buildPackages.stdenv.cc}/bin/cc" - ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.isDarwin) [ # Pass in CPU even if we're not cross compiling, because otherwise it tries to guess with # uname, which can be wrong if e.g. we're compiling for aarch32 on aarch64 "OS_TEST=${cpu}" "CPU_ARCH=${cpu}" - ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ "CROSS_COMPILE=1" "NSS_DISABLE_GTESTS=1" # don't want to build tests when cross-compiling - ] ++ stdenv.lib.optional stdenv.is64bit "USE_64=1" - ++ stdenv.lib.optional stdenv.isDarwin "CCC=clang++"; + ] ++ lib.optional stdenv.is64bit "USE_64=1" + ++ lib.optional stdenv.isDarwin "CCC=clang++"; NIX_CFLAGS_COMPILE = "-Wno-error"; @@ -135,7 +135,7 @@ in stdenv.mkDerivation rec { rm -f "$out"/lib/*.a ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://developer.mozilla.org/en-US/docs/NSS"; description = "A set of libraries for development of security-enabled client and server applications"; license = licenses.mpl20; diff --git a/pkgs/development/libraries/nss/3.53.nix b/pkgs/development/libraries/nss/3.53.nix index dcd9ade629b..9f281743f6c 100644 --- a/pkgs/development/libraries/nss/3.53.nix +++ b/pkgs/development/libraries/nss/3.53.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, nspr, perl, zlib, sqlite, darwin, fixDarwinDylibNames, buildPackages, ninja +{ lib, stdenv, fetchurl, nspr, perl, zlib, sqlite, darwin, fixDarwinDylibNames, buildPackages, ninja , # allow FIPS mode. Note that this makes the output non-reproducible. # https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Tech_Notes/nss_tech_note6 enableFIPS ? false @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ perl ninja (buildPackages.python3.withPackages (ps: with ps; [ gyp ])) ] - ++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ darwin.cctools fixDarwinDylibNames ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.cctools fixDarwinDylibNames ]; buildInputs = [ zlib sqlite ]; @@ -57,7 +57,7 @@ in stdenv.mkDerivation rec { patchFlags = [ "-p0" ]; - postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace nss/coreconf/Darwin.mk --replace '@executable_path/$(notdir $@)' "$out/lib/\$(notdir \$@)" substituteInPlace nss/coreconf/config.gypi --replace "'DYLIB_INSTALL_NAME_BASE': '@executable_path'" "'DYLIB_INSTALL_NAME_BASE': '$out/lib'" ''; @@ -90,9 +90,9 @@ in stdenv.mkDerivation rec { -Dhost_arch=${host} \ -Duse_system_zlib=1 \ --enable-libpkix \ - ${stdenv.lib.optionalString enableFIPS "--enable-fips"} \ - ${stdenv.lib.optionalString stdenv.isDarwin "--clang"} \ - ${stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "--disable-tests"} + ${lib.optionalString enableFIPS "--enable-fips"} \ + ${lib.optionalString stdenv.isDarwin "--clang"} \ + ${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "--disable-tests"} runHook postBuild ''; @@ -137,7 +137,7 @@ in stdenv.mkDerivation rec { isCross = stdenv.hostPlatform != stdenv.buildPlatform; nss = if isCross then buildPackages.nss.tools else "$out"; in - (stdenv.lib.optionalString enableFIPS ('' + (lib.optionalString enableFIPS ('' for libname in freebl3 nssdbm3 softokn3 do '' + (if stdenv.isDarwin @@ -160,7 +160,7 @@ in stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://developer.mozilla.org/en-US/docs/NSS"; description = "A set of libraries for development of security-enabled client and server applications"; license = licenses.mpl20; diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 17dc93c9f1e..7b02e3497f0 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchurl, nspr, perl, zlib, sqlite, darwin, fixDarwinDylibNames, buildPackages, ninja +{ lib, stdenv, fetchurl, nspr, perl, zlib +, sqlite, ninja +, darwin, fixDarwinDylibNames, buildPackages +, useP11kit ? true, p11-kit , # allow FIPS mode. Note that this makes the output non-reproducible. # https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Tech_Notes/nss_tech_note6 enableFIPS ? false @@ -30,7 +33,7 @@ in stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ perl ninja (buildPackages.python3.withPackages (ps: with ps; [ gyp ])) ] - ++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ darwin.cctools fixDarwinDylibNames ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.cctools fixDarwinDylibNames ]; buildInputs = [ zlib sqlite ]; @@ -63,7 +66,7 @@ in stdenv.mkDerivation rec { patchFlags = [ "-p0" ]; - postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace nss/coreconf/Darwin.mk --replace '@executable_path/$(notdir $@)' "$out/lib/\$(notdir \$@)" substituteInPlace nss/coreconf/config.gypi --replace "'DYLIB_INSTALL_NAME_BASE': '@executable_path'" "'DYLIB_INSTALL_NAME_BASE': '$out/lib'" ''; @@ -96,9 +99,9 @@ in stdenv.mkDerivation rec { -Dhost_arch=${host} \ -Duse_system_zlib=1 \ --enable-libpkix \ - ${stdenv.lib.optionalString enableFIPS "--enable-fips"} \ - ${stdenv.lib.optionalString stdenv.isDarwin "--clang"} \ - ${stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "--disable-tests"} + ${lib.optionalString enableFIPS "--enable-fips"} \ + ${lib.optionalString stdenv.isDarwin "--clang"} \ + ${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "--disable-tests"} runHook postBuild ''; @@ -139,11 +142,16 @@ in stdenv.mkDerivation rec { chmod 0755 $out/bin/nss-config ''; + postInstall = lib.optionalString useP11kit '' + # Replace built-in trust with p11-kit connection + ln -sf ${p11-kit}/lib/pkcs11/p11-kit-trust.so $out/lib/libnssckbi.so + ''; + postFixup = let isCross = stdenv.hostPlatform != stdenv.buildPlatform; nss = if isCross then buildPackages.nss.tools else "$out"; in - (stdenv.lib.optionalString enableFIPS ('' + (lib.optionalString enableFIPS ('' for libname in freebl3 nssdbm3 softokn3 do '' + (if stdenv.isDarwin @@ -166,7 +174,7 @@ in stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://developer.mozilla.org/en-US/docs/NSS"; description = "A set of libraries for development of security-enabled client and server applications"; license = licenses.mpl20; diff --git a/pkgs/development/libraries/nss_wrapper/default.nix b/pkgs/development/libraries/nss_wrapper/default.nix index 2b9321c7a90..3cdeb93dc9b 100644 --- a/pkgs/development/libraries/nss_wrapper/default.nix +++ b/pkgs/development/libraries/nss_wrapper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkg-config }: +{ lib, stdenv, fetchurl, cmake, pkg-config }: stdenv.mkDerivation rec { name = "nss_wrapper-1.1.11"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A wrapper for the user, group and hosts NSS API"; homepage = "https://git.samba.org/?p=nss_wrapper.git;a=summary;"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/nsss/default.nix b/pkgs/development/libraries/nsss/default.nix index 3e3530215bf..4e71c4d65e6 100644 --- a/pkgs/development/libraries/nsss/default.nix +++ b/pkgs/development/libraries/nsss/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "nsss"; - version = "0.0.2.2"; - sha256 = "0am195wabv63n545ykqnch9gs8cs1g5zw35k2ddxb9dnamhxfi9k"; + version = "0.1.0.0"; + sha256 = "15rxbwf16wm1la079yr2xn4bccjgd7m8dh6r7bpr6s57cj93i2mq"; description = "An implementation of a subset of the pwd.h, group.h and shadow.h family of functions."; diff --git a/pkgs/development/libraries/ntbtls/default.nix b/pkgs/development/libraries/ntbtls/default.nix index 5ea43097b8c..b6dcfc782f3 100644 --- a/pkgs/development/libraries/ntbtls/default.nix +++ b/pkgs/development/libraries/ntbtls/default.nix @@ -1,20 +1,20 @@ -{ stdenv, fetchurl, gettext, libgpgerror, libgcrypt, libksba, zlib }: +{ lib, stdenv, fetchurl, gettext, libgpgerror, libgcrypt, libksba, zlib }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "ntbtls"; - version = "0.1.2"; + version = "0.2.0"; src = fetchurl { url = "mirror://gnupg/ntbtls/ntbtls-${version}.tar.bz2"; - sha256 = "1rywgdyj7prmwdi5r1rpglakqpnjskgln1mqksqm28qcwn2dnh42"; + sha256 = "sha256-ZJ/nSjEdE+Q7FrJuuqkWZd22MpJbc5AlkurD7TBRnhc="; }; outputs = [ "dev" "out" ]; buildInputs = [ libgcrypt libgpgerror libksba zlib ] - ++ stdenv.lib.optional stdenv.isDarwin gettext; + ++ lib.optional stdenv.isDarwin gettext; postInstall = '' moveToOutput "bin/ntbtls-config" $dev diff --git a/pkgs/development/libraries/ntdb/default.nix b/pkgs/development/libraries/ntdb/default.nix index d0a9a2e5b49..021436516c2 100644 --- a/pkgs/development/libraries/ntdb/default.nix +++ b/pkgs/development/libraries/ntdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , python2 , python3 @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { "--builtin-libraries=replace,ccan" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "The not-so trivial database"; homepage = "https://tdb.samba.org/"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/libraries/ntirpc/default.nix b/pkgs/development/libraries/ntirpc/default.nix index 48ef98dab49..e98cfac7858 100644 --- a/pkgs/development/libraries/ntirpc/default.nix +++ b/pkgs/development/libraries/ntirpc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake +{ lib, stdenv, fetchFromGitHub, cmake , krb5, liburcu , libtirpc, libnsl } : @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { cp ${libtirpc}/etc/netconfig $out/etc/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Transport-independent RPC (TI-RPC)"; homepage = "https://github.com/nfs-ganesha/ntirpc"; maintainers = [ maintainers.markuskowa ]; diff --git a/pkgs/development/libraries/ntrack/default.nix b/pkgs/development/libraries/ntrack/default.nix index 17a294adc4b..cb9f9ff575f 100644 --- a/pkgs/development/libraries/ntrack/default.nix +++ b/pkgs/development/libraries/ntrack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, pkgconfig, libnl, python }: +{ lib, stdenv, fetchurl, qt4, pkg-config, libnl, python }: let version = "016"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ libnl qt4 ]; - nativeBuildInputs = [ pkgconfig python ]; + nativeBuildInputs = [ pkg-config python ]; # error: ISO C does not support '__FUNCTION__' predefined identifier [-Werror=pedantic] NIX_CFLAGS_COMPILE = "-Wno-error"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { sed -e "s@/usr\(/lib/ntrack/modules/\)@$out&@" -i common/ntrack.c ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Network Connectivity Tracking library for Desktop Applications"; homepage = "https://launchpad.net/ntrack"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/nuraft/default.nix b/pkgs/development/libraries/nuraft/default.nix index 1554e167815..58e5e401359 100644 --- a/pkgs/development/libraries/nuraft/default.nix +++ b/pkgs/development/libraries/nuraft/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, boost172, asio, openssl, zlib }: +{ lib, stdenv, fetchFromGitHub, cmake, boost172, asio, openssl, zlib }: stdenv.mkDerivation rec { pname = "nuraft"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ boost172 asio openssl zlib ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/eBay/NuRaft"; description = "C++ implementation of Raft core logic as a replication library"; license = licenses.asl20; diff --git a/pkgs/development/libraries/nuspell/default.nix b/pkgs/development/libraries/nuspell/default.nix index bc6ceff8378..c16305018d7 100644 --- a/pkgs/development/libraries/nuspell/default.nix +++ b/pkgs/development/libraries/nuspell/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, icu, catch2, pandoc }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, icu, catch2, pandoc }: stdenv.mkDerivation rec { pname = "nuspell"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-sQ3Q2+FOf2bXCKcgd6XvEb+QZzzDccs/4+CpJbEd1PQ="; }; - nativeBuildInputs = [ cmake pkgconfig pandoc ]; + nativeBuildInputs = [ cmake pkg-config pandoc ]; buildInputs = [ icu ]; outputs = [ "out" "lib" "dev" "man" ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { rm -rf $out/share/doc ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Free and open source C++ spell checking library"; homepage = "https://nuspell.github.io/"; platforms = platforms.all; diff --git a/pkgs/development/libraries/nv-codec-headers/default.nix b/pkgs/development/libraries/nv-codec-headers/default.nix index 8d3c2179bff..9b8323e6c97 100644 --- a/pkgs/development/libraries/nv-codec-headers/default.nix +++ b/pkgs/development/libraries/nv-codec-headers/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit }: +{ lib, stdenv, fetchgit }: stdenv.mkDerivation rec { pname = "nv-codec-headers"; @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { meta = { description = "FFmpeg version of headers for NVENC"; homepage = "https://ffmpeg.org/"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.MP2E ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.MP2E ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/libraries/nvidia-optical-flow-sdk/default.nix b/pkgs/development/libraries/nvidia-optical-flow-sdk/default.nix index 667f3d94e05..f9c2547d424 100644 --- a/pkgs/development/libraries/nvidia-optical-flow-sdk/default.nix +++ b/pkgs/development/libraries/nvidia-optical-flow-sdk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { pname = "nvidia-optical-flow-sdk"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { cp -R * $out/include ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Nvidia optical flow headers for computing the relative motion of pixels between images"; homepage = "https://developer.nvidia.com/opticalflow-sdk"; license = licenses.bsd3; # applies to the header files only diff --git a/pkgs/development/libraries/nvidia-texture-tools/default.nix b/pkgs/development/libraries/nvidia-texture-tools/default.nix index 577f56e8c27..67624596720 100644 --- a/pkgs/development/libraries/nvidia-texture-tools/default.nix +++ b/pkgs/development/libraries/nvidia-texture-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, cmake, fetchpatch }: stdenv.mkDerivation rec { pname = "nvidia-texture-tools"; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { moveToOutput lib "$lib" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A set of cuda-enabled texture tools and compressors"; homepage = "https://github.com/castano/nvidia-texture-tools"; license = licenses.mit; diff --git a/pkgs/development/libraries/nvidia-video-sdk/default.nix b/pkgs/development/libraries/nvidia-video-sdk/default.nix index d08f7185588..3a63bad03dc 100644 --- a/pkgs/development/libraries/nvidia-video-sdk/default.nix +++ b/pkgs/development/libraries/nvidia-video-sdk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation { name = "nvidia-video-sdk-6.0.1"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { cp -R Samples/common/inc/* $out/include ''; - meta = with stdenv.lib; { + meta = with lib; { description = "The NVIDIA Video Codec SDK"; homepage = "https://developer.nvidia.com/nvidia-video-codec-sdk"; license = licenses.unfree; diff --git a/pkgs/development/libraries/oatpp/default.nix b/pkgs/development/libraries/oatpp/default.nix index 38c02170761..084f3c4a935 100644 --- a/pkgs/development/libraries/oatpp/default.nix +++ b/pkgs/development/libraries/oatpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { # Tests fail on darwin. See https://github.com/NixOS/nixpkgs/pull/105419#issuecomment-735826894 doCheck = !stdenv.isDarwin; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://oatpp.io/"; description = "Light and powerful C++ web framework for highly scalable and resource-efficient web applications"; license = licenses.asl20; diff --git a/pkgs/development/libraries/ocl-icd/default.nix b/pkgs/development/libraries/ocl-icd/default.nix index 30a8790b99a..b84aa6a146d 100644 --- a/pkgs/development/libraries/ocl-icd/default.nix +++ b/pkgs/development/libraries/ocl-icd/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ruby, opencl-headers, addOpenGLRunpath }: +{lib, stdenv, fetchurl, ruby, opencl-headers, addOpenGLRunpath }: stdenv.mkDerivation rec { pname = "ocl-icd"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sed -i 's,"/etc/OpenCL/vendors","${addOpenGLRunpath.driverLink}/etc/OpenCL/vendors",g' ocl_icd_loader.c ''; - meta = with stdenv.lib; { + meta = with lib; { description = "OpenCL ICD Loader for ${opencl-headers.name}"; homepage = "https://forge.imag.fr/projects/ocl-icd/"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/ode/default.nix b/pkgs/development/libraries/ode/default.nix index d6047d1b192..d9c82f79bb3 100644 --- a/pkgs/development/libraries/ode/default.nix +++ b/pkgs/development/libraries/ode/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "ode"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0l63ymlkgfp5cb0ggqwm386lxmc3al21nb7a07dd49f789d33ib5"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Open Dynamics Engine"; homepage = "https://sourceforge.net/projects/opende"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/odpic/default.nix b/pkgs/development/libraries/odpic/default.nix index 22d48c8c609..b79de9278d4 100644 --- a/pkgs/development/libraries/odpic/default.nix +++ b/pkgs/development/libraries/odpic/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, fixDarwinDylibNames, oracle-instantclient, libaio }: +{ lib, stdenv, fetchFromGitHub, fixDarwinDylibNames, oracle-instantclient, libaio }: let version = "4.1.0"; - libPath = stdenv.lib.makeLibraryPath [ oracle-instantclient.lib ]; + libPath = lib.makeLibraryPath [ oracle-instantclient.lib ]; in stdenv.mkDerivation { inherit version; @@ -16,24 +16,24 @@ in stdenv.mkDerivation { sha256 = "1zk08z74q7njbj329xfy8aszphj27rqlkhsyglai60wfzl6mcf4x"; }; - nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + nativeBuildInputs = lib.optional stdenv.isDarwin fixDarwinDylibNames; buildInputs = [ oracle-instantclient ] - ++ stdenv.lib.optionals stdenv.isLinux [ libaio ]; + ++ lib.optionals stdenv.isLinux [ libaio ]; dontPatchELF = true; makeFlags = [ "PREFIX=$(out)" "CC=cc" "LD=cc"]; postFixup = '' - ${stdenv.lib.optionalString (stdenv.isLinux) '' + ${lib.optionalString (stdenv.isLinux) '' patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $out/lib/libodpic${stdenv.hostPlatform.extensions.sharedLibrary})" $out/lib/libodpic${stdenv.hostPlatform.extensions.sharedLibrary} ''} - ${stdenv.lib.optionalString (stdenv.isDarwin) '' + ${lib.optionalString (stdenv.isDarwin) '' install_name_tool -add_rpath "${libPath}" $out/lib/libodpic${stdenv.hostPlatform.extensions.sharedLibrary} ''} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Oracle ODPI-C library"; homepage = "https://oracle.github.io/odpi/"; maintainers = with maintainers; [ mkazulak flokli ]; diff --git a/pkgs/development/libraries/ogdf/default.nix b/pkgs/development/libraries/ogdf/default.nix index bbef1d8b93d..bee64afd290 100644 --- a/pkgs/development/libraries/ogdf/default.nix +++ b/pkgs/development/libraries/ogdf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, doxygen }: +{ lib, stdenv, fetchFromGitHub, cmake, doxygen }: stdenv.mkDerivation rec { pname = "ogdf"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { #> 766 | sprintf(messageOut_,format_+2); hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Open Graph Drawing Framework/Open Graph algorithms and Data structure Framework"; homepage = "http://www.ogdf.net"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/ogre/1.10.x.nix b/pkgs/development/libraries/ogre/1.10.x.nix index 6bf239d061e..849db216b92 100644 --- a/pkgs/development/libraries/ogre/1.10.x.nix +++ b/pkgs/development/libraries/ogre/1.10.x.nix @@ -34,8 +34,8 @@ stdenv.mkDerivation { meta = { description = "A 3D engine"; homepage = "https://www.ogre3d.org/"; - maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.mit; + maintainers = [ lib.maintainers.raskin ]; + platforms = lib.platforms.linux; + license = lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/ogre/1.9.x.nix b/pkgs/development/libraries/ogre/1.9.x.nix index 8e0156d8452..30d1dd18554 100644 --- a/pkgs/development/libraries/ogre/1.9.x.nix +++ b/pkgs/development/libraries/ogre/1.9.x.nix @@ -38,8 +38,8 @@ stdenv.mkDerivation rec { meta = { description = "A 3D engine"; homepage = "https://www.ogre3d.org/"; - maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.mit; + maintainers = [ lib.maintainers.raskin ]; + platforms = lib.platforms.linux; + license = lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index 8eb6db729ed..ae65da3f418 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -37,8 +37,8 @@ stdenv.mkDerivation rec { meta = { description = "A 3D engine"; homepage = "https://www.ogre3d.org/"; - maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.mit; + maintainers = [ lib.maintainers.raskin ]; + platforms = lib.platforms.linux; + license = lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/ogrepaged/default.nix b/pkgs/development/libraries/ogrepaged/default.nix index 9a8c092406c..0aefedb5257 100644 --- a/pkgs/development/libraries/ogrepaged/default.nix +++ b/pkgs/development/libraries/ogrepaged/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, cmake, pkgconfig, ois, ogre, libX11, boost }: +{ lib, stdenv, fetchurl, fetchpatch, cmake, pkg-config, ois, ogre, libX11, boost }: stdenv.mkDerivation rec { pname = "ogre-paged"; @@ -27,14 +27,14 @@ stdenv.mkDerivation rec { ]; buildInputs = [ ois ogre libX11 boost ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; cmakeFlags = [ "-DPAGEDGEOMETRY_BUILD_SAMPLES=OFF" ]; meta = { description = "Paged Geometry for Ogre3D"; homepage = "https://github.com/RigsOfRods/ogre-paged"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mit; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/ois/default.nix b/pkgs/development/libraries/ois/default.nix index ee85e64966f..2edbc35aa89 100644 --- a/pkgs/development/libraries/ois/default.nix +++ b/pkgs/development/libraries/ois/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 ] ++ lib.optionals stdenv.isDarwin [ Cocoa IOKit Kernel ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Object-oriented C++ input system"; maintainers = [ maintainers.raskin ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/development/libraries/olm/default.nix index 9efe524b12d..4fbc34bcce6 100644 --- a/pkgs/development/libraries/olm/default.nix +++ b/pkgs/development/libraries/olm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake }: +{ lib, stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { pname = "olm"; @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { meta = { description = "Implements double cryptographic ratchet and Megolm ratchet"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; homepage = "https://gitlab.matrix.org/matrix-org/olm"; - platforms = with stdenv.lib.platforms; darwin ++ linux; + platforms = with lib.platforms; darwin ++ linux; }; } diff --git a/pkgs/development/libraries/oniguruma/default.nix b/pkgs/development/libraries/oniguruma/default.nix index 44420c85cf5..016207c1306 100644 --- a/pkgs/development/libraries/oniguruma/default.nix +++ b/pkgs/development/libraries/oniguruma/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "onig"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/kkos/oniguruma"; description = "Regular expressions library"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/opae/default.nix b/pkgs/development/libraries/opae/default.nix index e9d501f7928..cba7e7b285d 100644 --- a/pkgs/development/libraries/opae/default.nix +++ b/pkgs/development/libraries/opae/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake +{ lib, stdenv, fetchFromGitHub, cmake , libuuid, json_c , doxygen, perl, python2, python2Packages }: @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_ASE=1" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Open Programmable Acceleration Engine SDK"; homepage = "https://01.org/opae"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix index efc5a18f2b0..43c781cf52c 100644 --- a/pkgs/development/libraries/openal-soft/default.nix +++ b/pkgs/development/libraries/openal-soft/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchFromGitHub, cmake +{ lib, stdenv, fetchFromGitHub, cmake , alsaSupport ? !stdenv.isDarwin, alsaLib ? null , pulseSupport ? !stdenv.isDarwin, libpulseaudio ? null , CoreServices, AudioUnit, AudioToolbox }: -with stdenv.lib; +with lib; assert alsaSupport -> alsaLib != null; assert pulseSupport -> libpulseaudio != null; diff --git a/pkgs/development/libraries/openbabel/2.nix b/pkgs/development/libraries/openbabel/2.nix new file mode 100644 index 00000000000..11265c643f9 --- /dev/null +++ b/pkgs/development/libraries/openbabel/2.nix @@ -0,0 +1,31 @@ +{stdenv, lib, fetchurl, fetchpatch, cmake, zlib, libxml2, eigen, python, cairo, pcre, pkg-config }: + +stdenv.mkDerivation rec { + pname = "openbabel"; + version = "2.4.1"; + + src = fetchurl { + url = "https://github.com/openbabel/openbabel/archive/openbabel-${lib.replaceStrings ["."] ["-"] version}.tar.gz"; + sha256 = "0xm7y859ivq2cp0q08mwshfxm0jq31xkyr4x8s0j6l7khf57yk2r"; + }; + + patches = [ + # ARM / AArch64 fixes. + (fetchpatch { + url = "https://github.com/openbabel/openbabel/commit/ee11c98a655296550710db1207b294f00e168216.patch"; + sha256 = "0wjqjrkr4pfirzzicdvlyr591vppydk572ix28jd2sagnfnf566g"; + }) + ]; + + buildInputs = [ zlib libxml2 eigen python cairo pcre ]; + + nativeBuildInputs = [ cmake pkg-config ]; + + meta = with lib; { + description = "A toolbox designed to speak the many languages of chemical data"; + homepage = "http://openbabel.org"; + platforms = platforms.all; + maintainers = with maintainers; [ danielbarter ]; + license = licenses.gpl2Plus; + }; +} diff --git a/pkgs/development/libraries/openbabel/default.nix b/pkgs/development/libraries/openbabel/default.nix index d074db7d165..63784d94d8f 100644 --- a/pkgs/development/libraries/openbabel/default.nix +++ b/pkgs/development/libraries/openbabel/default.nix @@ -1,34 +1,45 @@ -{stdenv, fetchurl, fetchpatch, cmake, zlib, libxml2, eigen, python, cairo, pcre, pkgconfig }: +{stdenv, lib, fetchurl, cmake, zlib, libxml2, eigen, python, cairo, pcre, pkg-config, swig, rapidjson }: stdenv.mkDerivation rec { pname = "openbabel"; - version = "2.4.1"; + version = "3.1.1"; src = fetchurl { - url = "https://github.com/openbabel/openbabel/archive/openbabel-${stdenv.lib.replaceStrings ["."] ["-"] version}.tar.gz"; - sha256 = "0xm7y859ivq2cp0q08mwshfxm0jq31xkyr4x8s0j6l7khf57yk2r"; + url = "https://github.com/openbabel/openbabel/archive/openbabel-${lib.replaceStrings ["."] ["-"] version}.tar.gz"; + sha256 = "c97023ac6300d26176c97d4ef39957f06e68848d64f1a04b0b284ccff2744f02"; }; - patches = [ - # ARM / AArch64 fixes. - (fetchpatch { - url = "https://github.com/openbabel/openbabel/commit/ee11c98a655296550710db1207b294f00e168216.patch"; - sha256 = "0wjqjrkr4pfirzzicdvlyr591vppydk572ix28jd2sagnfnf566g"; - }) + + buildInputs = [ zlib libxml2 eigen python cairo pcre swig rapidjson ]; + + nativeBuildInputs = [ cmake pkg-config ]; + + pythonMajorMinor = "${python.sourceVersion.major}.${python.sourceVersion.minor}"; + + cmakeFlags = [ + "-DRUN_SWIG=ON" + "-DPYTHON_BINDINGS=ON" ]; - # TODO : perl & python bindings; - # TODO : wxGTK: I have no time to compile - # TODO : separate lib and apps - buildInputs = [ zlib libxml2 eigen python cairo pcre ]; - nativeBuildInputs = [ cmake pkgconfig ]; + postFixup = '' + cat <<EOF > $out/lib/python$pythonMajorMinor/site-packages/setup.py + from distutils.core import setup + + setup( + name = 'pyopenbabel', + version = '${version}', + packages = ['openbabel'], + package_data = {'openbabel' : ['_openbabel.so']} + ) + EOF + ''; - meta = { + meta = with lib; { description = "A toolbox designed to speak the many languages of chemical data"; homepage = "http://openbabel.org"; - platforms = stdenv.lib.platforms.all; - maintainers = [ ]; - license = stdenv.lib.licenses.gpl2Plus; + platforms = platforms.all; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ danielbarter ]; }; } diff --git a/pkgs/development/libraries/openbr/default.nix b/pkgs/development/libraries/openbr/default.nix index 3e2d0f6b6e8..8e56e250ac4 100644 --- a/pkgs/development/libraries/openbr/default.nix +++ b/pkgs/development/libraries/openbr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, opencv, qtbase, qtsvg }: +{ lib, stdenv, fetchFromGitHub, cmake, opencv, qtbase, qtsvg }: stdenv.mkDerivation { @@ -19,9 +19,9 @@ stdenv.mkDerivation { meta = { description = "Open Source Biometric Recognition"; homepage = "http://openbiometrics.org/"; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [flosse]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [flosse]; + platforms = with lib.platforms; linux; broken = true; }; } diff --git a/pkgs/development/libraries/opencascade-occt/default.nix b/pkgs/development/libraries/opencascade-occt/default.nix index ac2b8ba6d1e..59c1f0ef7db 100644 --- a/pkgs/development/libraries/opencascade-occt/default.nix +++ b/pkgs/development/libraries/opencascade-occt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, cmake, ninja, tcl, tk, +{ lib, stdenv, fetchurl, fetchpatch, cmake, ninja, tcl, tk, libGL, libGLU, libXext, libXmu, libXi, darwin }: stdenv.mkDerivation rec { @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja ]; buildInputs = [ tcl tk libGL libGLU libXext libXmu libXi ] - ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa; + ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa; - meta = with stdenv.lib; { + meta = with lib; { description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation"; homepage = "https://www.opencascade.org/"; license = licenses.lgpl21; # essentially... diff --git a/pkgs/development/libraries/opencascade/default.nix b/pkgs/development/libraries/opencascade/default.nix index c0b2366ab7f..5c262a3680c 100644 --- a/pkgs/development/libraries/opencascade/default.nix +++ b/pkgs/development/libraries/opencascade/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchFromGitHub, fetchpatch, libGL, libGLU, libXmu, cmake, ninja, - pkgconfig, fontconfig, freetype, expat, freeimage, vtk, gl2ps, tbb, +{ lib, stdenv, fetchFromGitHub, fetchpatch, libGL, libGLU, libXmu, cmake, ninja, + pkg-config, fontconfig, freetype, expat, freeimage, vtk, gl2ps, tbb, OpenCL, Cocoa }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "opencascade-oce"; version = "0.18.3"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "17wy8dcf44vqisishv1jjf3cmcxyygqq29y9c3wjdj983qi2hsig"; }; - nativeBuildInputs = [ cmake ninja pkgconfig ]; + nativeBuildInputs = [ cmake ninja pkg-config ]; buildInputs = [ libGL libGLU libXmu freetype fontconfig expat freeimage vtk gl2ps tbb diff --git a/pkgs/development/libraries/opencl-clang/default.nix b/pkgs/development/libraries/opencl-clang/default.nix index 8b7df317b2b..8bbde9796d9 100644 --- a/pkgs/development/libraries/opencl-clang/default.nix +++ b/pkgs/development/libraries/opencl-clang/default.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , fetchFromGitHub , fetchpatch , cmake @@ -15,10 +16,10 @@ let inherit spirv-llvm-translator; }; - inherit (stdenv.lib) getVersion; + inherit (lib) getVersion; addPatches = component: pkg: - with builtins; with stdenv.lib; + with builtins; with lib; let path = "${passthru.patchesOut}/${component}"; in pkg.overrideAttrs (super: { postPatch = (if super ? postPatch then super.postPatch + "\n" else "") + '' @@ -39,7 +40,7 @@ let patchesOut = stdenv.mkDerivation rec { pname = "opencl-clang-patches"; - inherit (lib) version src patches; + inherit (library) version src patches; installPhase = '' [ -d patches ] && cp -r patches/ $out || mkdir $out mkdir -p $out/clang $out/spirv @@ -50,7 +51,7 @@ let }; - lib = let + library = let inherit (llvmPkgs) llvm; inherit (if buildWithPatches then passthru else llvmPkgs) clang-unwrapped spirv-llvm-translator; in @@ -85,7 +86,7 @@ let "-DSPIRV_TRANSLATOR_DIR=${spirv-llvm-translator}" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/intel/opencl-clang/"; description = "A clang wrapper library with an OpenCL-oriented API and the ability to compile OpenCL C kernels to SPIR-V modules"; license = licenses.ncsa; @@ -94,4 +95,4 @@ let }; }; in - lib + library diff --git a/pkgs/development/libraries/opencl-clhpp/default.nix b/pkgs/development/libraries/opencl-clhpp/default.nix index 1486ea93175..ec40bc393d5 100644 --- a/pkgs/development/libraries/opencl-clhpp/default.nix +++ b/pkgs/development/libraries/opencl-clhpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, python, opencl-headers }: +{ lib, stdenv, fetchFromGitHub, cmake, python, opencl-headers }: stdenv.mkDerivation rec { pname = "opencl-clhpp"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { "-DBUILD_TESTS=OFF" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "OpenCL Host API C++ bindings"; homepage = "http://github.khronos.org/OpenCL-CLHPP/"; license = licenses.mit; diff --git a/pkgs/development/libraries/opencl-headers/default.nix b/pkgs/development/libraries/opencl-headers/default.nix index aaf6390d00a..1ef27bf5831 100644 --- a/pkgs/development/libraries/opencl-headers/default.nix +++ b/pkgs/development/libraries/opencl-headers/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { cp CL/* $out/include/CL ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Khronos OpenCL headers version ${version}"; homepage = "https://www.khronos.org/registry/cl/"; license = licenses.mit; diff --git a/pkgs/development/libraries/opencollada/default.nix b/pkgs/development/libraries/opencollada/default.nix index a9c26d00e3a..d0582217433 100644 --- a/pkgs/development/libraries/opencollada/default.nix +++ b/pkgs/development/libraries/opencollada/default.nix @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { meta = { description = "A library for handling the COLLADA file format"; homepage = "https://github.com/KhronosGroup/OpenCOLLADA/"; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.mit; + maintainers = [ lib.maintainers.eelco ]; + platforms = lib.platforms.unix; + license = lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix index a60051dbd5f..8908f486615 100644 --- a/pkgs/development/libraries/opencolorio/default.nix +++ b/pkgs/development/libraries/opencolorio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, boost, pkgconfig, lcms2, tinyxml, git }: +{ stdenv, lib, fetchFromGitHub, cmake, boost, pkg-config, lcms2, tinyxml, git }: with lib; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "out" "dev" ]; # TODO: Investigate whether git can be dropped: It's only used to apply patches - nativeBuildInputs = [ cmake pkgconfig git ]; + nativeBuildInputs = [ cmake pkg-config git ]; buildInputs = [ lcms2 tinyxml ] ++ optional stdenv.isDarwin boost; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { mkdir -p $bin/bin; mv $out/bin $bin/ ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://opencolorio.org"; description = "A color management framework for visual effects and animation"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/opencore-amr/default.nix b/pkgs/development/libraries/opencore-amr/default.nix index 4848ef864bf..d1348d96e3b 100644 --- a/pkgs/development/libraries/opencore-amr/default.nix +++ b/pkgs/development/libraries/opencore-amr/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: let version = "0.1.5"; -in +in stdenv.mkDerivation { pname = "opencore-amr"; inherit version; @@ -10,12 +10,12 @@ stdenv.mkDerivation { url = "https://vorboss.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${version}.tar.gz"; sha256 = "0hfk9khz3by0119h3jdwgdfd7jgkdbzxnmh1wssvylgnsnwnq01c"; }; - + meta = { homepage = "https://opencore-amr.sourceforge.io/"; - description = "Library of OpenCORE Framework implementation of Adaptive Multi Rate Narrowband and Wideband (AMR-NB and AMR-WB) speech codec. + description = "Library of OpenCORE Framework implementation of Adaptive Multi Rate Narrowband and Wideband (AMR-NB and AMR-WB) speech codec. Library of VisualOn implementation of Adaptive Multi Rate Wideband (AMR-WB)"; - license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.kiloreux ]; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.kiloreux ]; }; } diff --git a/pkgs/development/libraries/opencsg/default.nix b/pkgs/development/libraries/opencsg/default.nix index 00d489508ad..7625db9a595 100644 --- a/pkgs/development/libraries/opencsg/default.nix +++ b/pkgs/development/libraries/opencsg/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libGLU, libGL, freeglut, glew, libXmu, libXext, libX11 +{lib, stdenv, fetchurl, libGLU, libGL, freeglut, glew, libXmu, libXext, libX11 , qmake, GLUT, fixDarwinDylibNames }: stdenv.mkDerivation rec { @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ qmake ] - ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; buildInputs = [ glew ] - ++ stdenv.lib.optionals stdenv.isLinux [ libGLU libGL freeglut libXmu libXext libX11 ] - ++ stdenv.lib.optional stdenv.isDarwin GLUT; + ++ lib.optionals stdenv.isLinux [ libGLU libGL freeglut libXmu libXext libX11 ] + ++ lib.optional stdenv.isDarwin GLUT; doCheck = false; @@ -27,13 +27,15 @@ stdenv.mkDerivation rec { postInstall = '' install -D license.txt "$out/share/doc/opencsg/license.txt" - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' mkdir -p $out/Applications mv $out/bin/*.app $out/Applications rmdir $out/bin || true ''; - postFixup = stdenv.lib.optionalString stdenv.isDarwin '' + dontWrapQtApps = true; + + postFixup = lib.optionalString stdenv.isDarwin '' app=$out/Applications/opencsgexample.app/Contents/MacOS/opencsgexample install_name_tool -change \ $(otool -L $app | awk '/opencsg.+dylib/ { print $1 }') \ @@ -41,7 +43,7 @@ stdenv.mkDerivation rec { $app ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Constructive Solid Geometry library"; homepage = "http://www.opencsg.org/"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/openct/default.nix b/pkgs/development/libraries/openct/default.nix index 27a832daf47..92dec5ee233 100644 --- a/pkgs/development/libraries/openct/default.nix +++ b/pkgs/development/libraries/openct/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, pcsclite, libusb-compat-0_1 +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, pcsclite, libusb-compat-0_1 , doxygen, libxslt }: @@ -25,14 +25,14 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ pcsclite libusb-compat-0_1 doxygen libxslt ]; preInstall = '' mkdir -p $out/etc ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/OpenSC/openct/"; license = licenses.lgpl21; description = "Drivers for several smart card readers"; diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index a861591f85f..11872cd47cc 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchFromGitHub, fetchpatch -, cmake, pkgconfig, unzip, zlib, pcre, hdf5 +, cmake, pkg-config, unzip, zlib, pcre, hdf5 , glog, boost, gflags, protobuf , config @@ -206,7 +206,7 @@ stdenv.mkDerivation { propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy; - nativeBuildInputs = [ cmake pkgconfig unzip ]; + nativeBuildInputs = [ cmake pkg-config unzip ]; NIX_CFLAGS_COMPILE = lib.optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR"; @@ -269,7 +269,7 @@ stdenv.mkDerivation { passthru = lib.optionalAttrs enablePython { pythonPath = []; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Open Computer Vision Library with more than 500 algorithms"; homepage = "https://opencv.org/"; license = with licenses; if enableUnfree then unfree else bsd3; diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 0d225127dd8..c9ac76b6554 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl, fetchFromGitHub, fetchpatch -, cmake, pkgconfig, unzip, zlib, pcre, hdf5 +, cmake, pkg-config, unzip, zlib, pcre, hdf5 , glog, boost, gflags, protobuf , config @@ -216,7 +216,7 @@ stdenv.mkDerivation { propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy; - nativeBuildInputs = [ cmake pkgconfig unzip ]; + nativeBuildInputs = [ cmake pkg-config unzip ]; NIX_CFLAGS_COMPILE = lib.optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR"; @@ -278,7 +278,7 @@ stdenv.mkDerivation { passthru = lib.optionalAttrs enablePython { pythonPath = []; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Open Computer Vision Library with more than 500 algorithms"; homepage = "https://opencv.org/"; license = with licenses; if enableUnfree then unfree else bsd3; diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index 055377b09f5..2575f6bb45d 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, unzip +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, unzip , zlib , enablePython ? false, pythonPackages , enableGtk2 ? false, gtk2 @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy; - nativeBuildInputs = [ cmake pkgconfig unzip ]; + nativeBuildInputs = [ cmake pkg-config unzip ]; NIX_CFLAGS_COMPILE = lib.optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR"; @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "bindnow" "relro" ]; - # Fix pkgconfig file that gets broken with multiple outputs + # Fix pkg-config file that gets broken with multiple outputs postFixup = '' sed -i $dev/lib/pkgconfig/opencv.pc -e "s|includedir_old=.*|includedir_old=$dev/include/opencv|" sed -i $dev/lib/pkgconfig/opencv.pc -e "s|includedir_new=.*|includedir_new=$dev/include|" @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { passthru = lib.optionalAttrs enablePython { pythonPath = []; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Open Computer Vision Library with more than 500 algorithms"; homepage = "https://opencv.org/"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/opendbx/default.nix b/pkgs/development/libraries/opendbx/default.nix index 954e6cc6b66..a9eb209edda 100644 --- a/pkgs/development/libraries/opendbx/default.nix +++ b/pkgs/development/libraries/opendbx/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, readline, libmysqlclient, postgresql, sqlite }: +{ lib, stdenv, fetchurl, readline, libmysqlclient, postgresql, sqlite }: -let inherit (stdenv.lib) getDev; in +let inherit (lib) getDev; in stdenv.mkDerivation rec { name = "opendbx-1.4.6"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ readline libmysqlclient postgresql sqlite ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Extremely lightweight but extensible database access library written in C"; license = licenses.lgpl21; platforms = platforms.all; diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix index e160bfb7d36..7f4f186c923 100644 --- a/pkgs/development/libraries/opendht/default.nix +++ b/pkgs/development/libraries/opendht/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , cmake, pkg-config , asio, nettle, gnutls, msgpack, readline, libargon2 }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "dev" "man" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A C++11 Kademlia distributed hash table implementation"; homepage = "https://github.com/savoirfairelinux/opendht"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/opendkim/default.nix b/pkgs/development/libraries/opendkim/default.nix index 7cbd85055ef..b3d18748f74 100644 --- a/pkgs/development/libraries/opendkim/default.nix +++ b/pkgs/development/libraries/opendkim/default.nix @@ -1,13 +1,15 @@ -{ stdenv, fetchurl, pkgconfig, libbsd, openssl, libmilter +{ lib, stdenv, fetchFromGitHub, pkg-config, libbsd, openssl, libmilter , autoreconfHook, perl, makeWrapper }: stdenv.mkDerivation rec { pname = "opendkim"; - version = "2.10.3"; + version = "2.11.0-Beta2"; - src = fetchurl { - url = "mirror://sourceforge/opendkim/files/${pname}-${version}.tar.gz"; - sha256 = "06v8bqhh604sz9rh5bvw278issrwjgc4h1wx2pz9a84lpxbvm823"; + src = fetchFromGitHub { + owner = "trusteddomainproject"; + repo = "OpenDKIM"; + rev = "rel-opendkim-${lib.replaceChars ["."] ["-"] version}"; + sha256 = "0nx3in8sa6xna4vfacj8g60hfzk61jpj2ldag80xzxip9c3rd2pw"; }; configureFlags= [ @@ -16,18 +18,16 @@ stdenv.mkDerivation rec { "ac_cv_func_realloc_0_nonnull=yes" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ]; + nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper ]; buildInputs = [ libbsd openssl libmilter perl ]; - patches = [ ./openssl-1.1.patch ]; - postInstall = '' wrapProgram $out/sbin/opendkim-genkey \ --prefix PATH : ${openssl.bin}/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "C library for producing DKIM-aware applications and an open source milter for providing DKIM service"; homepage = "http://www.opendkim.org/"; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/opendkim/openssl-1.1.patch b/pkgs/development/libraries/opendkim/openssl-1.1.patch deleted file mode 100644 index c36559cf16c..00000000000 --- a/pkgs/development/libraries/opendkim/openssl-1.1.patch +++ /dev/null @@ -1,81 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -864,26 +864,28 @@ - AC_SEARCH_LIBS([ERR_peek_error], [crypto], , - AC_MSG_ERROR([libcrypto not found])) - -- AC_SEARCH_LIBS([SSL_library_init], [ssl], , -- [ -- if test x"$enable_shared" = x"yes" -- then -- AC_MSG_ERROR([Cannot build shared opendkim -- against static openssl libraries. -- Configure with --disable-shared -- to get this working or obtain a -- shared libssl library for -- opendkim to use.]) -- fi -- -- # avoid caching issue - last result of SSL_library_init -- # shouldn't be cached for this next check -- unset ac_cv_search_SSL_library_init -- LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl" -- AC_SEARCH_LIBS([SSL_library_init], [ssl], , -- AC_MSG_ERROR([libssl not found]), [-ldl]) -- ] -- ) -+ -+ AC_LINK_IFELSE( -+ [AC_LANG_PROGRAM([[#include <openssl/ssl.h>]], -+ [[SSL_library_init();]])], -+ [od_have_ossl="yes";], -+ [od_have_ossl="no";]) -+ if test x"$od_have_ossl" = x"no" -+ then -+ if test x"$enable_shared" = x"yes" -+ then -+ AC_MSG_ERROR([Cannot build shared opendkim -+ against static openssl libraries. -+ Configure with --disable-shared -+ to get this working or obtain a -+ shared libssl library for -+ opendkim to use.]) -+ fi -+ -+ LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl" -+ AC_SEARCH_LIBS([SSL_library_init], [ssl], , -+ AC_MSG_ERROR([libssl not found]), [-ldl]) -+ fi - - AC_CHECK_DECL([SHA256_DIGEST_LENGTH], - AC_DEFINE([HAVE_SHA256], 1, ---- a/opendkim/opendkim-crypto.c -+++ b/opendkim/opendkim-crypto.c -@@ -222,7 +222,11 @@ - { - assert(pthread_setspecific(id_key, ptr) == 0); - -+#if OPENSSL_VERSION_NUMBER >= 0x10100000 -+ OPENSSL_thread_stop(); -+#else - ERR_remove_state(0); -+#endif - - free(ptr); - -@@ -392,11 +396,15 @@ - { - if (crypto_init_done) - { -+#if OPENSSL_VERSION_NUMBER >= 0x10100000 -+ OPENSSL_thread_stop(); -+#else - CRYPTO_cleanup_all_ex_data(); - CONF_modules_free(); - EVP_cleanup(); - ERR_free_strings(); - ERR_remove_state(0); -+#endif - - if (nmutexes > 0) - { diff --git a/pkgs/development/libraries/opendmarc/default.nix b/pkgs/development/libraries/opendmarc/default.nix index 9b45cc244f2..0dedfa3a85e 100644 --- a/pkgs/development/libraries/opendmarc/default.nix +++ b/pkgs/development/libraries/opendmarc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, libmilter, perl, perlPackages, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, libmilter, perl, perlPackages, makeWrapper }: stdenv.mkDerivation rec { pname = "opendmarc"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A free open source software implementation of the DMARC specification"; homepage = "http://www.trusteddomain.org/opendmarc/"; license = with licenses; [ bsd3 sendmail ]; diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix index b33b284f45c..4e04de30d65 100644 --- a/pkgs/development/libraries/openexr/default.nix +++ b/pkgs/development/libraries/openexr/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; propagatedBuildInputs = [ ilmbase zlib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A high dynamic-range (HDR) image file format"; homepage = "https://www.openexr.com/"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/openexrid-unstable/default.nix b/pkgs/development/libraries/openexrid-unstable/default.nix index 92cd343cf6a..ce35aa1c655 100644 --- a/pkgs/development/libraries/openexrid-unstable/default.nix +++ b/pkgs/development/libraries/openexrid-unstable/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, unzip, re2, openfx, zlib, ilmbase, libGLU, libGL, openexr }: +{ lib, stdenv, fetchFromGitHub, unzip, re2, openfx, zlib, ilmbase, libGLU, libGL, openexr }: stdenv.mkDerivation { pname = "openexrid-unstable"; @@ -44,7 +44,7 @@ stdenv.mkDerivation { mv $out/lib $lib/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "OpenEXR files able to isolate any object of a CG image with a perfect antialiazing"; homepage = "https://github.com/MercenariesEngineering/openexrid"; maintainers = [ maintainers.guibou ]; diff --git a/pkgs/development/libraries/openfst/default.nix b/pkgs/development/libraries/openfst/default.nix index f652c5ee7b7..51e661eabb3 100644 --- a/pkgs/development/libraries/openfst/default.nix +++ b/pkgs/development/libraries/openfst/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook }: +{ lib, stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { pname = "openfst"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for working with finite-state transducers"; longDescription = '' Library for constructing, combining, optimizing, and searching weighted finite-state transducers (FSTs). diff --git a/pkgs/development/libraries/openfx/default.nix b/pkgs/development/libraries/openfx/default.nix index 4a7927bfcb2..0d8afe53df8 100644 --- a/pkgs/development/libraries/openfx/default.nix +++ b/pkgs/development/libraries/openfx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, unzip }: +{ lib, stdenv, fetchFromGitHub, unzip }: stdenv.mkDerivation { pname = "openfx"; @@ -27,7 +27,7 @@ stdenv.mkDerivation { cp -r include/* $dev/include/OpenFX/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Image processing plug-in standard"; homepage = "http://openeffects.org/"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/opengrm-ngram/default.nix b/pkgs/development/libraries/opengrm-ngram/default.nix index ab546c6d0d4..9b105808b8b 100644 --- a/pkgs/development/libraries/opengrm-ngram/default.nix +++ b/pkgs/development/libraries/opengrm-ngram/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoreconfHook, fetchurl, openfst }: +{ lib, stdenv, autoreconfHook, fetchurl, openfst }: stdenv.mkDerivation rec { pname = "opengrm-ngram"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Library to make and modify n-gram language models encoded as weighted finite-state transducers"; homepage = "http://www.openfst.org/twiki/bin/view/GRM/NGramLibrary"; license = licenses.asl20; diff --git a/pkgs/development/libraries/openh264/default.nix b/pkgs/development/libraries/openh264/default.nix index ee430f800dd..6e856b04ac4 100644 --- a/pkgs/development/libraries/openh264/default.nix +++ b/pkgs/development/libraries/openh264/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, nasm }: +{ lib, stdenv, fetchFromGitHub, nasm }: stdenv.mkDerivation rec { pname = "openh264"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A codec library which supports H.264 encoding and decoding"; homepage = "https://www.openh264.org"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/openhmd/default.nix b/pkgs/development/libraries/openhmd/default.nix index ab1b9b7b1dd..a692dcb5e4e 100644 --- a/pkgs/development/libraries/openhmd/default.nix +++ b/pkgs/development/libraries/openhmd/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , pkg-config @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [ hidapi - ] ++ stdenv.lib.optionals withExamples [ + ] ++ lib.optionals withExamples [ SDL2 glew libGL @@ -39,13 +39,13 @@ stdenv.mkDerivation rec { "-DOpenGL_GL_PREFERENCE=GLVND" ]; - postInstall = stdenv.lib.optionalString withExamples '' + postInstall = lib.optionalString withExamples '' mkdir -p $out/bin install -D examples/simple/simple $out/bin/openhmd-example-simple install -D examples/opengl/openglexample $out/bin/openhmd-example-opengl ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.openhmd.net"; # https does not work description = "Library API and drivers immersive technology"; longDescription = '' diff --git a/pkgs/development/libraries/openimagedenoise/default.nix b/pkgs/development/libraries/openimagedenoise/default.nix index 2ac74c6c240..03f9118ef7c 100644 --- a/pkgs/development/libraries/openimagedenoise/default.nix +++ b/pkgs/development/libraries/openimagedenoise/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, cmake, tbb, python, ispc }: +{ lib, stdenv, fetchzip, cmake, tbb, python, ispc }: stdenv.mkDerivation rec { pname = "openimagedenoise"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python ispc ]; buildInputs = [ tbb ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://openimagedenoise.github.io"; description = "High-Performance Denoising Library for Ray Tracing"; license = licenses.asl20; diff --git a/pkgs/development/libraries/openjpeg/1.x.nix b/pkgs/development/libraries/openjpeg/1.x.nix deleted file mode 100644 index beb151f0d2d..00000000000 --- a/pkgs/development/libraries/openjpeg/1.x.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic.nix (args // { - version = "1.5.2"; - branch = "1.5"; - revision = "version.1.5.2"; - sha256 = "1dvvpvb597i5z8srz2v4c5dsbxb966h125jx3m2z0r2gd2wvpfkp"; - testsSupport = false; -}) diff --git a/pkgs/development/libraries/openjpeg/2.x.nix b/pkgs/development/libraries/openjpeg/2.x.nix deleted file mode 100644 index edb9c9bf8c9..00000000000 --- a/pkgs/development/libraries/openjpeg/2.x.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ callPackage, fetchpatch, ... } @ args: - -callPackage ./generic.nix (args // rec { - version = "2.4.0"; - branch = "2.4"; - revision = "v${version}"; - sha256 = "143dvy5g6v6129lzvl0r8mrgva2fppkn0zl099qmi9yi9l9h7yyf"; - - extraFlags = [ - "-DOPENJPEG_INSTALL_INCLUDE_DIR=${placeholder "dev"}/include/openjpeg-${branch}" - "-DOPENJPEG_INSTALL_PACKAGE_DIR=${placeholder "dev"}/lib/openjpeg-${branch}" - ]; - - patches = [ - ./fix-cmake-config-includedir.patch - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/uclouvain/openjpeg/pull/1321.patch"; - sha256 = "1cjpr76nf9g65nqkfnxnjzi3bv7ifbxpc74kxxibh58pzjlp6al8"; - }) - ]; -}) diff --git a/pkgs/development/libraries/openjpeg/generic.nix b/pkgs/development/libraries/openjpeg/default.nix index f9da637cb6e..32bfa6f2458 100644 --- a/pkgs/development/libraries/openjpeg/generic.nix +++ b/pkgs/development/libraries/openjpeg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config , libpng, libtiff, lcms2, jpylyzer , mj2Support ? true # MJ2 executables , jpwlLibSupport ? true # JPWL library & executables @@ -10,8 +10,6 @@ , thirdPartySupport ? false # Third party libraries - OFF: only build when found, ON: always build , testsSupport ? true , jdk ? null -# Inherit generics -, branch, version, revision, sha256, patches ? [], extraFlags ? [], ... }: assert jpipServerSupport -> jpipLibSupport && curl != null && fcgi != null; @@ -19,22 +17,28 @@ assert jpipServerSupport -> jpipLibSupport && curl != null && fcgi != null; assert (openjpegJarSupport || jpipLibSupport) -> jdk != null; let - inherit (stdenv.lib) optional optionals; + inherit (lib) optional optionals; mkFlag = optSet: flag: "-D${flag}=${if optSet then "ON" else "OFF"}"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "openjpeg"; - inherit version; + version = "2.4.0"; # don't forget to change passthru.incDir src = fetchFromGitHub { owner = "uclouvain"; repo = "openjpeg"; - rev = revision; - inherit sha256; + rev = "v${version}"; + sha256 = "143dvy5g6v6129lzvl0r8mrgva2fppkn0zl099qmi9yi9l9h7yyf"; }; - inherit patches; + patches = [ + ./fix-cmake-config-includedir.patch + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/uclouvain/openjpeg/pull/1321.patch"; + sha256 = "1cjpr76nf9g65nqkfnxnjzi3bv7ifbxpc74kxxibh58pzjlp6al8"; + }) + ]; outputs = [ "out" "dev" ]; @@ -52,9 +56,11 @@ stdenv.mkDerivation { (mkFlag jp3dSupport "BUILD_JP3D") (mkFlag thirdPartySupport "BUILD_THIRDPARTY") (mkFlag testsSupport "BUILD_TESTING") - ] ++ extraFlags; + "-DOPENJPEG_INSTALL_INCLUDE_DIR=${placeholder "dev"}/include/${passthru.incDir}" + "-DOPENJPEG_INSTALL_PACKAGE_DIR=${placeholder "dev"}/lib/${passthru.incDir}" + ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ ] ++ optionals jpipServerSupport [ curl fcgi ] @@ -71,10 +77,10 @@ stdenv.mkDerivation { ''; passthru = { - incDir = "openjpeg-${branch}"; + incDir = "openjpeg-2.4"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Open-source JPEG 2000 codec written in C language"; homepage = "https://www.openjpeg.org/"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index fdf3298a6fa..a71b2a61910 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, openssl, cyrus_sasl, db, groff, libtool }: +{ lib, stdenv, fetchurl, openssl, cyrus_sasl, db, groff, libtool }: stdenv.mkDerivation rec { pname = "openldap"; - version = "2.4.56"; + version = "2.4.57"; src = fetchurl { url = "https://www.openldap.org/software/download/OpenLDAP/openldap-release/${pname}-${version}.tgz"; - sha256 = "1q0m26kbab96r73y0dll0c36411kvfillal0i75kngy9cc1hwli5"; + sha256 = "sha256-x7pH4ebstbQ289Qygd9Xq+/6mSYhQa7IImKLwiD2tFo="; }; # TODO: separate "out" and "bin" @@ -34,12 +34,12 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc" "--localstatedir=/var" "--enable-crypt" - ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--with-yielding_select=yes" "ac_cv_func_memcmp_working=yes" - ] ++ stdenv.lib.optional (openssl == null) "--without-tls" - ++ stdenv.lib.optional (cyrus_sasl == null) "--without-cyrus-sasl" - ++ stdenv.lib.optional stdenv.isFreeBSD "--with-pic"; + ] ++ lib.optional (openssl == null) "--without-tls" + ++ lib.optional (cyrus_sasl == null) "--without-cyrus-sasl" + ++ lib.optional stdenv.isFreeBSD "--with-pic"; postBuild = '' make $makeFlags CC=$CC -C contrib/slapd-modules/passwd/sha2 @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { chmod +x "$out"/lib/*.{so,dylib} ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.openldap.org/"; description = "An open source implementation of the Lightweight Directory Access Protocol"; license = licenses.openldap; diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index 95c2a9c3fcf..802685970ac 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, gfortran, perl, libnl +{ lib, stdenv, fetchurl, fetchpatch, gfortran, perl, libnl , rdma-core, zlib, numactl, libevent, hwloc, targetPackages, symlinkJoin , libpsm2, libfabric, pmix, ucx @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { pname = "openmpi"; inherit version; - src = with stdenv.lib.versions; fetchurl { + src = with lib.versions; fetchurl { url = "https://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${pname}-${version}.tar.bz2"; sha256 = "02f0r9d3xgs08svkmj8v7lzviyxqnkk4yd3z0wql550xnriki3y5"; }; @@ -97,7 +97,7 @@ in stdenv.mkDerivation rec { inherit cudaSupport cudatoolkit; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.open-mpi.org/"; description = "Open source MPI-3 implementation"; longDescription = "The Open MPI Project is an open source MPI-3 implementation that is developed and maintained by a consortium of academic, research, and industry partners. Open MPI is therefore able to combine the expertise, technologies, and resources from all across the High Performance Computing community in order to build the best MPI library available. Open MPI offers advantages for system and software vendors, application developers and computer science researchers."; diff --git a/pkgs/development/libraries/openpa/default.nix b/pkgs/development/libraries/openpa/default.nix index 46729f660b1..bc8efdc857e 100644 --- a/pkgs/development/libraries/openpa/default.nix +++ b/pkgs/development/libraries/openpa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, file }: +{ lib, stdenv, fetchurl, file }: stdenv.mkDerivation rec { pname = "openpa"; @@ -9,16 +9,16 @@ stdenv.mkDerivation rec { sha256 = "0flyi596hm6fv7xyw2iykx3s65p748s62bf15624xcnwpfrh8ncy"; }; - prePatch = ''substituteInPlace configure --replace /usr/bin/file ${file}/bin/file''; + prePatch = "substituteInPlace configure --replace /usr/bin/file ${file}/bin/file"; doCheck = true; meta = { description = "Atomic primitives for high performance, concurrent software"; homepage = "https://trac.mpich.org/projects/openpa"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ leenaars ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ leenaars ]; + platforms = with lib.platforms; linux; longDescription = '' OPA (or sometimes OpenPA or Open Portable Atomics) is an open source library intended to provide a consistent C API for performing diff --git a/pkgs/development/libraries/opensaml-cpp/default.nix b/pkgs/development/libraries/opensaml-cpp/default.nix index 0edf6dfa728..4f83f22856e 100644 --- a/pkgs/development/libraries/opensaml-cpp/default.nix +++ b/pkgs/development/libraries/opensaml-cpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoreconfHook, pkgconfig +{ lib, stdenv, fetchgit, autoreconfHook, pkg-config , boost, openssl, log4shib, xercesc, xml-security-c, xml-tooling-c, zlib }: @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { buildInputs = [ boost openssl log4shib xercesc xml-security-c xml-tooling-c zlib ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; configureFlags = [ "--with-xmltooling=${xml-tooling-c}" ]; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://shibboleth.net/products/opensaml-cpp.html"; description = "A low-level library written in C++ that provides support for producing and consuming SAML messages"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix index e2a52a93333..8eeff3de943 100644 --- a/pkgs/development/libraries/openscenegraph/default.nix +++ b/pkgs/development/libraries/openscenegraph/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, doxygen, +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, doxygen, libX11, libXinerama, libXrandr, libGLU, libGL, glib, ilmbase, libxml2, pcre, zlib, AGL, Carbon, Cocoa, Foundation, @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { sha256 = "0x8hdbzw0b71j91fzp9cwmy9a7ava8v8wwyj8nxijq942vdx1785"; }; - nativeBuildInputs = [ pkgconfig cmake doxygen ]; + nativeBuildInputs = [ pkg-config cmake doxygen ]; buildInputs = [ libX11 libXinerama libXrandr libGLU libGL @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { cmakeFlags = lib.optional (!withApps) "-DBUILD_OSG_APPLICATIONS=OFF" ++ lib.optional withExamples "-DBUILD_OSG_EXAMPLES=ON"; - meta = with stdenv.lib; { + meta = with lib; { description = "A 3D graphics toolkit"; homepage = "http://www.openscenegraph.org/"; maintainers = with maintainers; [ aanderse raskin ]; diff --git a/pkgs/development/libraries/openslp/CVE-2019-5544.patch b/pkgs/development/libraries/openslp/CVE-2019-5544.patch new file mode 100644 index 00000000000..2afc0aed330 --- /dev/null +++ b/pkgs/development/libraries/openslp/CVE-2019-5544.patch @@ -0,0 +1,165 @@ +diff -ur openslp-2.0.0.orig/common/slp_buffer.c openslp-2.0.0/common/slp_buffer.c +--- openslp-2.0.0.orig/common/slp_buffer.c 2012-12-10 15:31:53.000000000 -0800 ++++ openslp-2.0.0/common/slp_buffer.c 2019-11-26 21:54:20.000000000 -0800 +@@ -30,6 +30,13 @@ + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + *-------------------------------------------------------------------------*/ + ++/* Copyright (c) 2019 VMware, Inc. ++ * SPDX-License-Identifier: BSD-3-Clause ++ * This file is provided under the BSD-3-Clause license. ++ * See COPYING file for more details and other copyrights ++ * that may apply. ++ */ ++ + /** Functions for managing SLP message buffers. + * + * This file provides a higher level abstraction over malloc and free that +@@ -153,4 +160,20 @@ + xfree(buf); + } + ++/** Report remaining free buffer size in bytes. ++ * ++ * Check if buffer is allocated and if so return bytes left in a ++ * @c SLPBuffer object. ++ * ++ * @param[in] buf The SLPBuffer to be freed. ++ */ ++size_t ++RemainingBufferSpace(SLPBuffer buf) ++{ ++ if (buf->allocated == 0) { ++ return 0; ++ } ++ return buf->end - buf->curpos; ++} ++ + /*=========================================================================*/ +diff -ur openslp-2.0.0.orig/common/slp_buffer.h openslp-2.0.0/common/slp_buffer.h +--- openslp-2.0.0.orig/common/slp_buffer.h 2012-11-28 09:07:04.000000000 -0800 ++++ openslp-2.0.0/common/slp_buffer.h 2019-11-26 21:54:32.000000000 -0800 +@@ -30,6 +30,13 @@ + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + *-------------------------------------------------------------------------*/ + ++/* Copyright (c) 2019 VMware, Inc. ++ * SPDX-License-Identifier: BSD-3-Clause ++ * This file is provided under the BSD-3-Clause license. ++ * See COPYING file for more details and other copyrights ++ * that may apply. ++ */ ++ + /** Header file that defines SLP message buffer management routines. + * + * Includes structures, constants and functions that used to handle memory +@@ -78,6 +85,8 @@ + + SLPBuffer SLPBufferListAdd(SLPBuffer * list, SLPBuffer buf); + ++size_t RemainingBufferSpace(SLPBuffer buf); ++ + /*! @} */ + + #endif /* SLP_BUFFER_H_INCLUDED */ +diff -ur openslp-2.0.0.orig/slpd/slpd_process.c openslp-2.0.0/slpd/slpd_process.c +--- openslp-2.0.0.orig/slpd/slpd_process.c 2012-12-12 09:38:54.000000000 -0800 ++++ openslp-2.0.0/slpd/slpd_process.c 2019-11-26 21:55:10.000000000 -0800 +@@ -30,6 +30,13 @@ + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + *-------------------------------------------------------------------------*/ + ++/* Copyright (c) 2019 VMware, Inc. ++ * SPDX-License-Identifier: BSD-3-Clause ++ * This file is provided under the BSD-3-Clause license. ++ * See COPYING file for more details and other copyrights ++ * that may apply. ++ */ ++ + /** Processes incoming SLP messages. + * + * @file slpd_process.c +@@ -514,13 +521,27 @@ + { + for (i = 0; i < db->urlcount; i++) + { +- /* urlentry is the url from the db result */ + urlentry = db->urlarray[i]; ++ if (urlentry->opaque != NULL) { ++ const int64_t newsize = size + urlentry->opaquelen; ++ if (urlentry->opaquelen <= 0 || newsize > INT_MAX) ++ { ++ SLPDLog("Invalid opaquelen %d or sizeo of opaque url is too big, size=%d\n", ++ urlentry->opaquelen, size); ++ errorcode = SLP_ERROR_PARSE_ERROR; ++ goto FINISHED; ++ } ++ size += urlentry->opaquelen; ++ } ++ else ++ { ++ /* urlentry is the url from the db result */ ++ size += urlentry->urllen + 6; /* 1 byte for reserved */ ++ /* 2 bytes for lifetime */ ++ /* 2 bytes for urllen */ ++ /* 1 byte for authcount */ ++ } + +- size += urlentry->urllen + 6; /* 1 byte for reserved */ +- /* 2 bytes for lifetime */ +- /* 2 bytes for urllen */ +- /* 1 byte for authcount */ + #ifdef ENABLE_SLPv2_SECURITY + /* make room to include the authblock that was asked for */ + if (G_SlpdProperty.securityEnabled +@@ -594,7 +615,7 @@ + urlentry = db->urlarray[i]; + + #ifdef ENABLE_SLPv1 +- if (urlentry->opaque == 0) ++ if (urlentry->opaque == NULL) + { + /* url-entry reserved */ + *result->curpos++ = 0; +@@ -606,8 +627,18 @@ + PutUINT16(&result->curpos, urlentry->urllen); + + /* url-entry url */ +- memcpy(result->curpos, urlentry->url, urlentry->urllen); +- result->curpos += urlentry->urllen; ++ if (RemainingBufferSpace(result) >= urlentry->urllen) ++ { ++ memcpy(result->curpos, urlentry->url, urlentry->urllen); ++ result->curpos = result->curpos + urlentry->urllen; ++ } ++ else ++ { ++ SLPDLog("Url too big (ask: %d have %" PRId64 "), failing request\n", ++ urlentry->opaquelen, (int64_t) RemainingBufferSpace(result)); ++ errorcode = SLP_ERROR_PARSE_ERROR; ++ goto FINISHED; ++ } + + /* url-entry auths */ + *result->curpos++ = 0; +@@ -621,8 +652,18 @@ + + /* TRICKY: Fix up the lifetime. */ + TO_UINT16(urlentry->opaque + 1, urlentry->lifetime); +- memcpy(result->curpos, urlentry->opaque, urlentry->opaquelen); +- result->curpos += urlentry->opaquelen; ++ if (RemainingBufferSpace(result) >= urlentry->opaquelen) ++ { ++ memcpy(result->curpos, urlentry->opaque, urlentry->opaquelen); ++ result->curpos = result->curpos + urlentry->opaquelen; ++ } ++ else ++ { ++ SLPDLog("Opaque Url too big (ask: %d have %" PRId64 "), failing request\n", ++ urlentry->opaquelen, (int64_t) RemainingBufferSpace(result)); ++ errorcode = SLP_ERROR_PARSE_ERROR; ++ goto FINISHED; ++ } + } + } + } diff --git a/pkgs/development/libraries/openslp/default.nix b/pkgs/development/libraries/openslp/default.nix index 68cb40abf72..4fa03c5e7c1 100644 --- a/pkgs/development/libraries/openslp/default.nix +++ b/pkgs/development/libraries/openslp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch }: +{ lib, stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation { name = "openslp-2.0.0"; @@ -20,9 +20,10 @@ stdenv.mkDerivation { sha256 = "0zp61axx93b7nrbsyhn2x4dnw7n9y6g4rys21hyqxk4khrnc2yr9"; }) ./CVE-2016-4912.patch + ./CVE-2019-5544.patch ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.openslp.org/"; description = "An open-source implementation of the IETF Service Location Protocol"; maintainers = with maintainers; [ ttuegel ]; diff --git a/pkgs/development/libraries/openssl/chacha.nix b/pkgs/development/libraries/openssl/chacha.nix index b37142082d8..bae3e53f441 100644 --- a/pkgs/development/libraries/openssl/chacha.nix +++ b/pkgs/development/libraries/openssl/chacha.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, perl, zlib +{ lib, stdenv, fetchFromGitHub, perl, zlib , withCryptodev ? false, cryptodev }: -with stdenv.lib; +with lib; stdenv.mkDerivation { pname = "openssl-chacha"; version = "2016-08-22"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { setOutputFlags = false; nativeBuildInputs = [ perl zlib ]; - buildInputs = stdenv.lib.optional withCryptodev cryptodev; + buildInputs = lib.optional withCryptodev cryptodev; configureScript = "./config"; @@ -32,7 +32,7 @@ stdenv.mkDerivation { "enable-gost" "--libdir=lib" "--openssldir=etc/ssl" - ] ++ stdenv.lib.optionals withCryptodev [ + ] ++ lib.optionals withCryptodev [ "-DHAVE_CRYPTODEV" "-DUSE_CRYPTODEV_DIGESTS" ]; @@ -75,7 +75,7 @@ stdenv.mkDerivation { homepage = "https://www.openssl.org/"; description = "A cryptographic library that implements the SSL and TLS protocols"; platforms = [ "x86_64-linux" ]; - maintainers = [ stdenv.lib.maintainers.cstrahan ]; + maintainers = [ lib.maintainers.cstrahan ]; license = licenses.openssl; priority = 10; # resolves collision with ‘man-pages’ }; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 2570c7cdb25..ce4374be331 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPackages, perl, coreutils +{ lib, stdenv, fetchurl, buildPackages, perl, coreutils , withCryptodev ? false, cryptodev , enableSSL2 ? false , enableSSL3 ? false @@ -10,7 +10,7 @@ # cgit) that are needed here should be included directly in Nixpkgs as # files. -with stdenv.lib; +with lib; let common = { version, sha256, patches ? [], withDocs ? false, extraMeta ? {} }: @@ -46,7 +46,7 @@ let separateDebugInfo = !(stdenv.hostPlatform.useLLVM or false) && stdenv.cc.isGNU; nativeBuildInputs = [ perl ]; - buildInputs = stdenv.lib.optional withCryptodev cryptodev; + buildInputs = lib.optional withCryptodev cryptodev; # TODO(@Ericson2314): Improve with mass rebuild configurePlatforms = []; @@ -78,16 +78,16 @@ let "shared" # "shared" builds both shared and static libraries "--libdir=lib" "--openssldir=etc/ssl" - ] ++ stdenv.lib.optionals withCryptodev [ + ] ++ lib.optionals withCryptodev [ "-DHAVE_CRYPTODEV" "-DUSE_CRYPTODEV_DIGESTS" - ] ++ stdenv.lib.optional enableSSL2 "enable-ssl2" - ++ stdenv.lib.optional enableSSL3 "enable-ssl3" - ++ stdenv.lib.optional (versionAtLeast version "1.1.0" && stdenv.hostPlatform.isAarch64) "no-afalgeng" + ] ++ lib.optional enableSSL2 "enable-ssl2" + ++ lib.optional enableSSL3 "enable-ssl3" + ++ lib.optional (versionAtLeast version "1.1.0" && stdenv.hostPlatform.isAarch64) "no-afalgeng" # OpenSSL needs a specific `no-shared` configure flag. # See https://wiki.openssl.org/index.php/Compilation_and_Installation#Configure_Options # for a comprehensive list of configuration options. - ++ stdenv.lib.optional (versionAtLeast version "1.1.0" && static) "no-shared"; + ++ lib.optional (versionAtLeast version "1.1.0" && static) "no-shared"; makeFlags = [ "MANDIR=$(man)/share/man" @@ -101,7 +101,7 @@ let enableParallelBuilding = true; postInstall = - stdenv.lib.optionalString (!static) '' + lib.optionalString (!static) '' # If we're building dynamic libraries, then don't install static # libraries. if [ -n "$(echo $out/lib/*.so $out/lib/*.dylib $out/lib/*.dll)" ]; then @@ -111,7 +111,7 @@ let '' + '' mkdir -p $bin - '' + stdenv.lib.optionalString (!stdenv.hostPlatform.isWindows) + '' + lib.optionalString (!stdenv.hostPlatform.isWindows) '' substituteInPlace $out/bin/c_rehash --replace ${buildPackages.perl} ${perl} '' + @@ -127,7 +127,7 @@ let rmdir $out/etc/ssl/{certs,private} ''; - postFixup = stdenv.lib.optionalString (!stdenv.hostPlatform.isWindows) '' + postFixup = lib.optionalString (!stdenv.hostPlatform.isWindows) '' # Check to make sure the main output doesn't depend on perl if grep -r '${buildPackages.perl}' $out; then echo "Found an erroneous dependency on perl ^^^" >&2 @@ -135,7 +135,7 @@ let fi ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.openssl.org/"; description = "A cryptographic library that implements the SSL and TLS protocols"; license = licenses.openssl; diff --git a/pkgs/development/libraries/opentracing-cpp/default.nix b/pkgs/development/libraries/opentracing-cpp/default.nix index 76342abaa2d..9c99ee6027d 100644 --- a/pkgs/development/libraries/opentracing-cpp/default.nix +++ b/pkgs/development/libraries/opentracing-cpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "opentracing-cpp"; version = "1.5.1"; @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { meta = { description = "C++ implementation of the OpenTracing API"; homepage = "https://opentracing.io"; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ rob ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ rob ]; }; } diff --git a/pkgs/development/libraries/openvdb/default.nix b/pkgs/development/libraries/openvdb/default.nix index 38e50fb367e..5f3a03a3f5b 100644 --- a/pkgs/development/libraries/openvdb/default.nix +++ b/pkgs/development/libraries/openvdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, unzip, openexr, boost, jemalloc, c-blosc, ilmbase, tbb }: +{ lib, stdenv, fetchFromGitHub, unzip, openexr, boost, jemalloc, c-blosc, ilmbase, tbb }: stdenv.mkDerivation rec { @@ -40,7 +40,7 @@ stdenv.mkDerivation rec NIX_CFLAGS_COMPILE="-I${openexr.dev}/include/OpenEXR -I${ilmbase.dev}/include/OpenEXR/"; NIX_LDFLAGS="-lboost_iostreams"; - meta = with stdenv.lib; { + meta = with lib; { description = "An open framework for voxel"; homepage = "https://www.openvdb.org"; maintainers = [ maintainers.guibou ]; diff --git a/pkgs/development/libraries/openwsman/default.nix b/pkgs/development/libraries/openwsman/default.nix index a16b8356e61..05f1ef65a30 100644 --- a/pkgs/development/libraries/openwsman/default.nix +++ b/pkgs/development/libraries/openwsman/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config , curl, libxml2, pam, sblim-sfcc }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "19dj38jyzhhhvk863cikcwk5awzlq3337pxmsaqqm4wrcygrkfmx"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ curl libxml2 pam sblim-sfcc ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-more-warnings" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Openwsman server implementation and client API with bindings"; downloadPage = "https://github.com/Openwsman/openwsman/releases"; homepage = "https://openwsman.github.io"; diff --git a/pkgs/development/libraries/openxr-loader/default.nix b/pkgs/development/libraries/openxr-loader/default.nix index 415846dd2fa..2f901f0e412 100644 --- a/pkgs/development/libraries/openxr-loader/default.nix +++ b/pkgs/development/libraries/openxr-loader/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, python3, libX11, libXxf86vm, libXrandr, vulkan-headers, libGL }: +{ lib, stdenv, fetchFromGitHub, cmake, python3, libX11, libXxf86vm, libXrandr, vulkan-headers, libGL }: stdenv.mkDerivation rec { pname = "openxr-loader"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { mv "$out/lib/libXrApiLayer"* "$layers/lib" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Khronos OpenXR loader"; homepage = "https://www.khronos.org/openxr"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/openzwave/default.nix b/pkgs/development/libraries/openzwave/default.nix index dd7a367652d..0a617561a89 100644 --- a/pkgs/development/libraries/openzwave/default.nix +++ b/pkgs/development/libraries/openzwave/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub -, doxygen, fontconfig, graphviz-nox, libxml2, pkgconfig, which +{ lib, stdenv, fetchFromGitHub +, doxygen, fontconfig, graphviz-nox, libxml2, pkg-config, which , systemd }: let @@ -18,7 +18,7 @@ in stdenv.mkDerivation { sha256 = "04g8fb4f4ihakvvsmzcnncgfdd2ikmki7s22i9c6layzdwavbwf1"; }; - nativeBuildInputs = [ doxygen fontconfig graphviz-nox libxml2 pkgconfig which ]; + nativeBuildInputs = [ doxygen fontconfig graphviz-nox libxml2 pkg-config which ]; buildInputs = [ systemd ]; @@ -48,10 +48,10 @@ in stdenv.mkDerivation { --replace dir= dir=$out substituteInPlace $out/bin/ozw_config \ - --replace pcfile=${pkgconfig} pcfile=$out + --replace pcfile=${pkg-config} pcfile=$out ''; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ library to control Z-Wave Networks via a USB Z-Wave Controller"; homepage = "http://www.openzwave.net/"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix index aba9c75ad46..c6efc901e8a 100644 --- a/pkgs/development/libraries/oracle-instantclient/default.nix +++ b/pkgs/development/libraries/oracle-instantclient/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , autoPatchelfHook , fixDarwinDylibNames @@ -12,7 +12,7 @@ assert odbcSupport -> unixODBC != null; let - inherit (stdenv.lib) optional optionals optionalString; + inherit (lib) optional optionals optionalString; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; @@ -114,7 +114,7 @@ in stdenv.mkDerivation { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Oracle instant client libraries and sqlplus CLI"; longDescription = '' Oracle instant client provides access to Oracle databases (OCI, diff --git a/pkgs/development/libraries/orcania/default.nix b/pkgs/development/libraries/orcania/default.nix index 4a01de54a6d..5c9c2c8da7f 100644 --- a/pkgs/development/libraries/orcania/default.nix +++ b/pkgs/development/libraries/orcania/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, check, subunit }: +{ lib, stdenv, fetchFromGitHub, cmake, check, subunit }: stdenv.mkDerivation rec { pname = "orcania"; version = "2.1.1"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { export DYLD_FALLBACK_LIBRARY_PATH="$(pwd):$DYLD_FALLBACK_LIBRARY_PATH" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Potluck with different functions for different purposes that can be shared among C programs"; homepage = "https://github.com/babelouest/orcania"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/ortp/default.nix b/pkgs/development/libraries/ortp/default.nix index ecd15498432..196cac4bcaf 100644 --- a/pkgs/development/libraries/ortp/default.nix +++ b/pkgs/development/libraries/ortp/default.nix @@ -1,7 +1,7 @@ { bctoolbox , cmake , fetchFromGitLab -, stdenv +, lib, stdenv }: stdenv.mkDerivation rec { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ bctoolbox ]; nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A Real-Time Transport Protocol (RFC3550) stack"; homepage = "https://linphone.org/technical-corner/ortp"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/osip/default.nix b/pkgs/development/libraries/osip/default.nix index 8b2dce1d950..322ed30a847 100644 --- a/pkgs/development/libraries/osip/default.nix +++ b/pkgs/development/libraries/osip/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { version = "5.2.0"; src = fetchurl { @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "libosip2"; meta = { - license = stdenv.lib.licenses.lgpl21Plus; + license = lib.licenses.lgpl21Plus; homepage = "https://www.gnu.org/software/osip/"; description = "The GNU oSIP library, an implementation of the Session Initiation Protocol (SIP)"; - maintainers = with stdenv.lib.maintainers; [ raskin ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with lib.maintainers; [ raskin ]; + platforms = lib.platforms.linux; inherit version; }; } diff --git a/pkgs/development/libraries/osm-gps-map/default.nix b/pkgs/development/libraries/osm-gps-map/default.nix index e34a80e1d4a..17a3af68a80 100644 --- a/pkgs/development/libraries/osm-gps-map/default.nix +++ b/pkgs/development/libraries/osm-gps-map/default.nix @@ -1,4 +1,4 @@ -{ cairo, fetchzip, glib, gnome3, gtk3, gobject-introspection, pkgconfig, stdenv }: +{ cairo, fetchzip, glib, gnome3, gtk3, gobject-introspection, pkg-config, lib, stdenv }: stdenv.mkDerivation rec { pname = "osm-gps-map"; @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ cairo glib gobject-introspection gnome3.gnome-common gtk3 gnome3.libsoup ]; - meta = with stdenv.lib; { + meta = with lib; { description = "GTK widget for displaying OpenStreetMap tiles"; homepage = "https://nzjrs.github.io/osm-gps-map"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix index 31a7e7e9086..5e99c644ebe 100644 --- a/pkgs/development/libraries/p11-kit/default.nix +++ b/pkgs/development/libraries/p11-kit/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig, which +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, which , gettext, libffi, libiconv, libtasn1 }: stdenv.mkDerivation rec { pname = "p11-kit"; - version = "0.23.21"; + version = "0.23.22"; src = fetchFromGitHub { owner = "p11-glue"; repo = pname; rev = version; - sha256 = "1w24brn8j3vwfp07p2hldw2ci06pk1cx1dvjk8jjxkccp20fk958"; + sha256 = "sha256-erWqElJr0iESNUk9EZiJRmSMYhns8GxuFLNw7mIIIWs="; }; outputs = [ "out" "dev"]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { # at the same time, libtasn1 in buildInputs provides the libasn1 library # to link against for the target platform. # hence, libtasn1 is required in both native and build inputs. - nativeBuildInputs = [ autoreconfHook pkgconfig which libtasn1 ]; + nativeBuildInputs = [ autoreconfHook pkg-config which libtasn1 ]; buildInputs = [ gettext libffi libiconv libtasn1 ]; autoreconfPhase = '' @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { "exampledir=${placeholder "out"}/etc/pkcs11" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for loading and sharing PKCS#11 modules"; longDescription = '' Provides a way to load and enumerate PKCS#11 modules. diff --git a/pkgs/development/libraries/packr/default.nix b/pkgs/development/libraries/packr/default.nix index 017cb25a9d1..e3abc6e5d62 100644 --- a/pkgs/development/libraries/packr/default.nix +++ b/pkgs/development/libraries/packr/default.nix @@ -1,7 +1,7 @@ { buildGoModule , fetchFromGitHub , lib -, stdenv + , symlinkJoin }: @@ -22,7 +22,7 @@ let p2 = buildGoModule rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "The simple and easy way to embed static files into Go binaries"; homepage = "https://github.com/gobuffalo/packr"; license = licenses.mit; diff --git a/pkgs/development/libraries/pagmo2/default.nix b/pkgs/development/libraries/pagmo2/default.nix index 4723292199d..abef3d6cd1d 100644 --- a/pkgs/development/libraries/pagmo2/default.nix +++ b/pkgs/development/libraries/pagmo2/default.nix @@ -1,5 +1,5 @@ { fetchFromGitHub -, stdenv +, lib, stdenv , cmake , eigen , nlopt @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { # tests pass but take 30+ minutes doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://esa.github.io/pagmo2/"; description = "Scientific library for massively parallel optimization"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index b3dd2062ca0..68511003215 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, cairo, harfbuzz +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, cairo, harfbuzz , libintl, libthai, gobject-introspection, darwin, fribidi, gnome3 , gtk-doc, docbook_xsl, docbook_xml_dtd_43, makeFontsConf, freefont_ttf , meson, ninja, glib , x11Support? !stdenv.isDarwin, libXft }: -with stdenv.lib; +with lib; let pname = "pango"; @@ -14,7 +14,7 @@ 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}/${lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "0ry3j9n0lvdfmjwi2w7wa4gkalnip56kghqq6bh8hcf45xjvh3bk"; }; @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja glib # for glib-mkenum - pkgconfig gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_43 + pkg-config gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_43 ]; buildInputs = [ fribidi @@ -40,7 +40,7 @@ in stdenv.mkDerivation rec { mesonFlags = [ "-Dgtk_doc=${if stdenv.isDarwin then "false" else "true"}" - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ "-Dxft=disabled" # only works with x11 ]; @@ -59,7 +59,7 @@ in stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A library for laying out and rendering of text, with an emphasis on internationalization"; longDescription = '' diff --git a/pkgs/development/libraries/pangolin/default.nix b/pkgs/development/libraries/pangolin/default.nix index 5fbd9595766..0e5d705a1ce 100644 --- a/pkgs/development/libraries/pangolin/default.nix +++ b/pkgs/development/libraries/pangolin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, doxygen, libGL, glew +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, doxygen, libGL, glew , xorg , ffmpeg_3, python3 , libjpeg, libpng, libtiff, eigen , Carbon ? null, Cocoa ? null }: @@ -15,7 +15,7 @@ stdenv.mkDerivation { sha256 = "0pfbaarlsw7f7cmsppm7m13nz0k530wwwyczy2l9k448p3v7x9j0"; }; - nativeBuildInputs = [ cmake pkgconfig doxygen ]; + nativeBuildInputs = [ cmake pkg-config doxygen ]; buildInputs = [ libGL @@ -48,8 +48,8 @@ stdenv.mkDerivation { graphical data. ''; homepage = "https://github.com/stevenlovegrove/Pangolin"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.expipiplus1 ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.expipiplus1 ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/libraries/pangomm/default.nix b/pkgs/development/libraries/pangomm/default.nix index b0488435ded..0ff0d9a7d4e 100644 --- a/pkgs/development/libraries/pangomm/default.nix +++ b/pkgs/development/libraries/pangomm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pango, glibmm, cairomm, gnome3 +{ lib, stdenv, fetchurl, pkg-config, pango, glibmm, cairomm, gnome3 , ApplicationServices }: stdenv.mkDerivation rec { @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { version= "2.42.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "03zli5amizhv9bfklwfq7xyf0b5dagchx1lnz9f0v1rhk69h9gql"; }; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig ] ++ stdenv.lib.optional stdenv.isDarwin [ + nativeBuildInputs = [ pkg-config ] ++ lib.optional stdenv.isDarwin [ ApplicationServices ]; propagatedBuildInputs = [ pango glibmm cairomm ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ interface to the Pango text rendering library"; homepage = "https://www.pango.org/"; license = with licenses; [ lgpl2 lgpl21 ]; diff --git a/pkgs/development/libraries/pangoxsl/default.nix b/pkgs/development/libraries/pangoxsl/default.nix index 26d012e81e1..7d314a930f2 100644 --- a/pkgs/development/libraries/pangoxsl/default.nix +++ b/pkgs/development/libraries/pangoxsl/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, glib, pango}: +{lib, stdenv, fetchurl, pkg-config, glib, pango}: stdenv.mkDerivation { name = "pangoxsl-1.6.0.3"; @@ -7,13 +7,13 @@ stdenv.mkDerivation { sha256 = "1wcd553nf4nwkrfrh765cyzwj9bsg7zpkndg2hjs8mhwgx04lm8n"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib pango ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Implements several of the inline properties defined by XSL that are not currently implemented by Pango"; homepage = "https://sourceforge.net/projects/pangopdf"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/partio/default.nix b/pkgs/development/libraries/partio/default.nix index 2f7574d3637..0247d12715f 100644 --- a/pkgs/development/libraries/partio/default.nix +++ b/pkgs/development/libraries/partio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, unzip, cmake, freeglut, libGLU, libGL, zlib, swig, python, doxygen, xorg }: +{ lib, stdenv, fetchFromGitHub, unzip, cmake, freeglut, libGLU, libGL, zlib, swig, python, doxygen, xorg }: stdenv.mkDerivation { pname = "partio"; @@ -32,7 +32,7 @@ stdenv.mkDerivation { mv $dev/include/*.h $dev/include/partio ''; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ (with python bindings) library for easily reading/writing/manipulating common animation particle formats such as PDB, BGEO, PTC"; homepage = "https://www.disneyanimation.com/technology/partio.html"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/pc-ble-driver/default.nix b/pkgs/development/libraries/pc-ble-driver/default.nix index 7d7dbd53383..1777b0856f8 100644 --- a/pkgs/development/libraries/pc-ble-driver/default.nix +++ b/pkgs/development/libraries/pc-ble-driver/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, git, cmake, catch2, asio, udev, IOKit }: +{ lib, stdenv, fetchFromGitHub, git, cmake, catch2, asio, udev, IOKit }: stdenv.mkDerivation rec { pname = "pc-ble-driver"; @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ IOKit - ] ++ stdenv.lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ udev ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Desktop library for Bluetooth low energy development"; homepage = "https://github.com/NordicSemiconductor/pc-ble-driver"; license = licenses.unfreeRedistributable; diff --git a/pkgs/development/libraries/pcaudiolib/default.nix b/pkgs/development/libraries/pcaudiolib/default.nix index e9c5301aac5..ebdacdfc9bd 100644 --- a/pkgs/development/libraries/pcaudiolib/default.nix +++ b/pkgs/development/libraries/pcaudiolib/default.nix @@ -1,5 +1,5 @@ { config, stdenv, lib, fetchFromGitHub -, autoconf, automake, which, libtool, pkgconfig +, autoconf, automake, which, libtool, pkg-config , portaudio, alsaLib , pulseaudioSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0c55hlqqh0m7bcb3nlgv1s4a22s5bgczr1cakjh3767rjb10khi0"; }; - nativeBuildInputs = [ autoconf automake which libtool pkgconfig ]; + nativeBuildInputs = [ autoconf automake which libtool pkg-config ]; buildInputs = [ portaudio ] ++ lib.optionals stdenv.isLinux [ alsaLib ] @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; - meta = with stdenv.lib; { + meta = with lib; { description = "Provides a C API to different audio devices"; homepage = "https://github.com/espeak-ng/pcaudiolib"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/pcg-c/default.nix b/pkgs/development/libraries/pcg-c/default.nix index 593794c9c4d..9722210b9d1 100644 --- a/pkgs/development/libraries/pcg-c/default.nix +++ b/pkgs/development/libraries/pcg-c/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { version = "0.94"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "A family of better random number generators"; homepage = "https://www.pcg-random.org/"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; longDescription = '' PCG is a family of simple fast space-efficient statistically good algorithms for random number generation. Unlike many general-purpose RNGs, diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix index 06f5499b901..436e0f85e16 100644 --- a/pkgs/development/libraries/pcl/default.nix +++ b/pkgs/development/libraries/pcl/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, cmake -, qhull, flann, boost, vtk, eigen, pkgconfig, qtbase +{ lib, stdenv, fetchFromGitHub, cmake +, qhull, flann, boost, vtk, eigen, pkg-config, qtbase , libusb1, libpcap, libXt, libpng, Cocoa, AGL, OpenGL }: @@ -13,21 +13,21 @@ stdenv.mkDerivation rec { sha256 = "1cli2rxqsk6nxp36p5mgvvahjz8hm4fb68yi8cf9nw4ygbcvcwb1"; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ qhull flann boost eigen libusb1 libpcap libpng vtk qtbase libXt ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa AGL ]; + ++ lib.optionals stdenv.isDarwin [ Cocoa AGL ]; - cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [ + cmakeFlags = lib.optionals stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ]; meta = { homepage = "https://pointclouds.org/"; - broken = stdenv.lib.versionAtLeast qtbase.version "5.15"; + broken = lib.versionAtLeast qtbase.version "5.15"; description = "Open project for 2D/3D image and point cloud processing"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index 8f19034c924..8d9b9ec0259 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , pcre, windows ? null , variant ? null }: -with stdenv.lib; +with lib; assert elem variant [ null "cpp" "pcre16" "pcre32" ]; @@ -50,7 +50,7 @@ in stdenv.mkDerivation { meta = { homepage = "http://www.pcre.org/"; description = "A library for Perl Compatible Regular Expressions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; longDescription = '' The PCRE library is a set of functions that implement regular diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix index 8f06630882c..6bf6cff98bb 100644 --- a/pkgs/development/libraries/pcre2/default.nix +++ b/pkgs/development/libraries/pcre2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "pcre2"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-pcre2-16" "--enable-pcre2-32" - ] ++ stdenv.lib.optional (!stdenv.hostPlatform.isRiscV) "--enable-jit"; + ] ++ lib.optional (!stdenv.hostPlatform.isRiscV) "--enable-jit"; outputs = [ "bin" "dev" "out" "doc" "man" "devdoc" ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { moveToOutput bin/pcre2-config "$dev" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Perl Compatible Regular Expressions"; homepage = "http://www.pcre.org/"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/pdal/default.nix b/pkgs/development/libraries/pdal/default.nix index 4405d3812b7..42e05d5d7ff 100644 --- a/pkgs/development/libraries/pdal/default.nix +++ b/pkgs/development/libraries/pdal/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch , cmake @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { "-DBUILD_PLUGIN_RIVLIB=OFF" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "PDAL is Point Data Abstraction Library. GDAL for point cloud data"; homepage = "https://pdal.io"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/pdf2xml/default.nix b/pkgs/development/libraries/pdf2xml/default.nix index 855df954eb1..2dfd3546685 100644 --- a/pkgs/development/libraries/pdf2xml/default.nix +++ b/pkgs/development/libraries/pdf2xml/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libxpdf, libxml2}: +{lib, stdenv, fetchurl, libxpdf, libxml2}: stdenv.mkDerivation { name = "pdf2xml"; @@ -32,7 +32,7 @@ stdenv.mkDerivation { cp exe/* $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "PDF to XML converter"; platforms = platforms.unix; license = licenses.gpl2; diff --git a/pkgs/development/libraries/pe-parse/default.nix b/pkgs/development/libraries/pe-parse/default.nix new file mode 100644 index 00000000000..445188bd0d9 --- /dev/null +++ b/pkgs/development/libraries/pe-parse/default.nix @@ -0,0 +1,28 @@ +{ stdenv, lib, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "pe-parse"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "trailofbits"; + repo = "pe-parse"; + rev = "v${version}"; + sha256 = "1jvfjaiwddczjlx4xdhpbgwvvpycab7ix35lwp3wfy44hs6qpjqv"; + }; + + nativeBuildInputs = [ cmake ]; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/dump-pe ../test/assets/example.exe + ''; + + meta = with lib; { + description = "A principled, lightweight parser for Windows portable executable files"; + homepage = "https://github.com/trailofbits/pe-parse"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ arturcygan ]; + }; +} diff --git a/pkgs/development/libraries/phash/default.nix b/pkgs/development/libraries/phash/default.nix index 16d19f570d1..250089c30b1 100644 --- a/pkgs/development/libraries/phash/default.nix +++ b/pkgs/development/libraries/phash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cimg, imagemagick }: +{ lib, stdenv, fetchFromGitHub, pkg-config, cimg, imagemagick }: stdenv.mkDerivation rec { pname = "pHash"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { # at runtime propagatedBuildInputs = [ imagemagick ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; configureFlags = ["--enable-video-hash=no" "--enable-audio-hash=no"]; postInstall = '' @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { sha256 = "0y4gknfkns5sssfaj0snyx29752my20xmxajg6xggijx0myabbv0"; }; - meta = with stdenv.lib; { + meta = with lib; { inherit version; description = "Compute the perceptual hash of an image"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/phonetisaurus/default.nix b/pkgs/development/libraries/phonetisaurus/default.nix index 126a91fe290..9ba00833d62 100644 --- a/pkgs/development/libraries/phonetisaurus/default.nix +++ b/pkgs/development/libraries/phonetisaurus/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , openfst , pkg-config @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { pname = "phonetisaurus"; - version = "2020-07-31"; + version = "0.9.1"; src = fetchFromGitHub { owner = "AdolfVonKleist"; repo = pname; - rev = "2831870697de5b4fbcb56a6e1b975e0e1ea10deb"; + rev = version; sha256 = "1b18s5zz0l0fhqh9n9jnmgjz2hzprwzf6hx5a12zibmmam3qyriv"; }; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ python3 openfst ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Framework for Grapheme-to-phoneme models for speech recognition using the OpenFst framework"; inherit (src.meta) homepage; license = licenses.bsd3; diff --git a/pkgs/development/libraries/phonon/backends/gstreamer.nix b/pkgs/development/libraries/phonon/backends/gstreamer.nix index 5c0901596b0..3e21415b4c7 100644 --- a/pkgs/development/libraries/phonon/backends/gstreamer.nix +++ b/pkgs/development/libraries/phonon/backends/gstreamer.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, cmake, gst_all_1, phonon, pkgconfig +{ stdenv, lib, fetchurl, cmake, gst_all_1, phonon, pkg-config , extra-cmake-modules, qttools, qtbase, qtx11extras , debug ? false }: @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "phonon-backend-gstreamer"; version = "4.10.0"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://phonon.kde.org/"; description = "GStreamer backend for Phonon"; platforms = platforms.linux; @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { # on system paths being set. patches = [ ./gst-plugin-paths.patch ]; + dontWrapQtApps = true; + NIX_CFLAGS_COMPILE = let gstPluginPaths = lib.makeSearchPathOutput "lib" "/lib/gstreamer-1.0" @@ -38,7 +40,7 @@ stdenv.mkDerivation rec { gst-libav ]); in toString [ - # This flag should be picked up through pkgconfig, but it isn't. + # This flag should be picked up through pkg-config, but it isn't. "-I${gst_all_1.gstreamer.dev}/lib/gstreamer-1.0/include" ''-DGST_PLUGIN_PATH_1_0="${gstPluginPaths}"'' @@ -54,7 +56,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config extra-cmake-modules qttools ]; diff --git a/pkgs/development/libraries/phonon/backends/vlc.nix b/pkgs/development/libraries/phonon/backends/vlc.nix index d54ee6e5630..b874c2e1d01 100644 --- a/pkgs/development/libraries/phonon/backends/vlc.nix +++ b/pkgs/development/libraries/phonon/backends/vlc.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, cmake, phonon, pkgconfig, libvlc +{ stdenv, lib, fetchurl, cmake, phonon, pkg-config, libvlc , extra-cmake-modules, qttools, qtbase, qtx11extras , debug ? false }: @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "phonon-backend-vlc"; version = "0.11.1"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://phonon.kde.org/"; description = "GStreamer backend for Phonon"; platforms = platforms.linux; @@ -30,11 +30,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config qttools extra-cmake-modules ]; + dontWrapQtApps = true; + cmakeFlags = [ "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}" ]; diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index 85ba37a9d8a..877bf973194 100644 --- a/pkgs/development/libraries/phonon/default.nix +++ b/pkgs/development/libraries/phonon/default.nix @@ -4,7 +4,7 @@ , cmake , libGLU , libGL -, pkgconfig +, pkg-config , libpulseaudio , extra-cmake-modules , qtbase @@ -26,9 +26,9 @@ stdenv.mkDerivation rec { meta = { homepage = "https://community.kde.org/Phonon"; description = "Multimedia API for Qt"; - license = stdenv.lib.licenses.lgpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ ttuegel ]; + license = lib.licenses.lgpl2; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ ttuegel ]; }; src = fetchurl { @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config extra-cmake-modules ]; @@ -58,6 +58,8 @@ stdenv.mkDerivation rec { "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}" ]; + dontWrapQtApps = true; + preConfigure = '' cmakeFlags+=" -DPHONON_QT_MKSPECS_INSTALL_DIR=''${!outputDev}/mkspecs" cmakeFlags+=" -DPHONON_QT_IMPORTS_INSTALL_DIR=''${!outputBin}/$qtQmlPrefix" diff --git a/pkgs/development/libraries/physfs/default.nix b/pkgs/development/libraries/physfs/default.nix index 93c0702e3ef..3eb4077d985 100644 --- a/pkgs/development/libraries/physfs/default.nix +++ b/pkgs/development/libraries/physfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, doxygen, darwin +{ lib, stdenv, fetchurl, cmake, doxygen, darwin , zlib }: let @@ -15,7 +15,7 @@ let nativeBuildInputs = [ cmake doxygen ]; buildInputs = [ zlib ] - ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; + ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; patchPhase = '' sed s,-Werror,, -i CMakeLists.txt @@ -27,7 +27,7 @@ let ./test_physfs --version ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://icculus.org/physfs/"; description = "Library to provide abstract access to various archives"; license = licenses.free; diff --git a/pkgs/development/libraries/physics/apfel/default.nix b/pkgs/development/libraries/physics/apfel/default.nix index 7b201cf9b16..e3fd0a26a7f 100644 --- a/pkgs/development/libraries/physics/apfel/default.nix +++ b/pkgs/development/libraries/physics/apfel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gfortran, lhapdf, python2, zlib }: +{ lib, stdenv, fetchFromGitHub, gfortran, lhapdf, python2, zlib }: stdenv.mkDerivation rec { pname = "apfel"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A PDF Evolution Library"; license = licenses.gpl3; homepage = "https://apfel.mi.infn.it/"; diff --git a/pkgs/development/libraries/physics/apfelgrid/default.nix b/pkgs/development/libraries/physics/apfelgrid/default.nix index 5c63ce7c4b9..33ca0326727 100644 --- a/pkgs/development/libraries/physics/apfelgrid/default.nix +++ b/pkgs/development/libraries/physics/apfelgrid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, apfel, applgrid, lhapdf, root5 }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, apfel, applgrid, lhapdf, root5 }: stdenv.mkDerivation rec { pname = "apfelgrid"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Ultra-fast theory predictions for collider observables"; license = licenses.mit; homepage = "http://nhartland.github.io/APFELgrid/"; diff --git a/pkgs/development/libraries/physics/applgrid/default.nix b/pkgs/development/libraries/physics/applgrid/default.nix index 6b1bc71c660..65aa7b8b470 100644 --- a/pkgs/development/libraries/physics/applgrid/default.nix +++ b/pkgs/development/libraries/physics/applgrid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gfortran, hoppet, lhapdf, root5, zlib }: +{ lib, stdenv, fetchurl, gfortran, hoppet, lhapdf, root5, zlib }: stdenv.mkDerivation rec { pname = "applgrid"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "The APPLgrid project provides a fast and flexible way to reproduce the results of full NLO calculations with any input parton distribution set in only a few milliseconds rather than the weeks normally required to gain adequate statistics"; license = licenses.gpl3; homepage = "http://applgrid.hepforge.org"; diff --git a/pkgs/development/libraries/physics/cernlib/default.nix b/pkgs/development/libraries/physics/cernlib/default.nix index 3c2cd4c6914..84657d72679 100644 --- a/pkgs/development/libraries/physics/cernlib/default.nix +++ b/pkgs/development/libraries/physics/cernlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gfortran, gnumake, imake, makedepend, motif, xorg }: +{ lib, stdenv, fetchurl, gfortran, gnumake, imake, makedepend, motif, xorg }: stdenv.mkDerivation rec { version = "2006"; @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { description = "Legacy collection of libraries and modules for data analysis in high energy physics"; broken = stdenv.isDarwin; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; - maintainers = with stdenv.lib.maintainers; [ veprbl ]; - license = stdenv.lib.licenses.gpl2; + maintainers = with lib.maintainers; [ veprbl ]; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/development/libraries/physics/fastjet-contrib/default.nix b/pkgs/development/libraries/physics/fastjet-contrib/default.nix index 68e07e7b42d..a09f031e765 100644 --- a/pkgs/development/libraries/physics/fastjet-contrib/default.nix +++ b/pkgs/development/libraries/physics/fastjet-contrib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fastjet }: +{ lib, stdenv, fetchurl, fastjet }: stdenv.mkDerivation rec { pname = "fastjet-contrib"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { make fragile-shared-install ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Third party extensions for FastJet"; homepage = "http://fastjet.fr/"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/physics/fastjet/default.nix b/pkgs/development/libraries/physics/fastjet/default.nix index b854fa88cd6..35ce8dedca7 100644 --- a/pkgs/development/libraries/physics/fastjet/default.nix +++ b/pkgs/development/libraries/physics/fastjet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python2 }: +{ lib, stdenv, fetchurl, python2 }: stdenv.mkDerivation rec { pname = "fastjet"; @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { meta = { description = "A software package for jet finding in pp and e+e− collisions"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; homepage = "http://fastjet.fr/"; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ veprbl ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ veprbl ]; }; } diff --git a/pkgs/development/libraries/physics/fastnlo/default.nix b/pkgs/development/libraries/physics/fastnlo/default.nix index 22251e10a4f..916303f00ce 100644 --- a/pkgs/development/libraries/physics/fastnlo/default.nix +++ b/pkgs/development/libraries/physics/fastnlo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, fastjet, gfortran, lhapdf, python2, root, yoda, zlib }: +{ lib, stdenv, fetchurl, boost, fastjet, gfortran, lhapdf, python2, root, yoda, zlib }: stdenv.mkDerivation rec { pname = "fastnlo_toolkit"; @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { meta = { description = "A computer code to create and evaluate fast interpolation tables of pre-computed coefficients in perturbation theory for observables in hadron-induced processes"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; homepage = "http://fastnlo.hepforge.org"; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ veprbl ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ veprbl ]; }; } diff --git a/pkgs/development/libraries/physics/geant4/datasets.nix b/pkgs/development/libraries/physics/geant4/datasets.nix index 42014949c0b..5646f4e02ba 100644 --- a/pkgs/development/libraries/physics/geant4/datasets.nix +++ b/pkgs/development/libraries/physics/geant4/datasets.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, geant_version }: +{ lib, stdenv, fetchurl, geant_version }: let mkDataset = { name, version, sha256, envvar }: @@ -24,7 +24,7 @@ let inherit envvar; setupHook = ./datasets-hook.sh; - meta = with stdenv.lib; { + meta = with lib; { description = "Data files for the Geant4 toolkit"; homepage = "https://geant4.web.cern.ch/support/download"; license = licenses.g4sl; diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix index 0b48b291555..159c746fecd 100644 --- a/pkgs/development/libraries/physics/geant4/default.nix +++ b/pkgs/development/libraries/physics/geant4/default.nix @@ -9,7 +9,7 @@ , enableRaytracerX11 ? false # Standard build environment with cmake. -, stdenv, fetchurl, fetchpatch, cmake +, lib, stdenv, fetchurl, fetchpatch, cmake # Optional system packages, otherwise internal GEANT4 packages are used. , clhep ? null # not packaged currently @@ -80,9 +80,9 @@ stdenv.mkDerivation rec { "-DGEANT4_USE_SYSTEM_EXPAT=${if expat != null then "ON" else "OFF"}" "-DGEANT4_USE_SYSTEM_ZLIB=${if zlib != null then "ON" else "OFF"}" "-DGEANT4_BUILD_MULTITHREADED=${if enableMultiThreading then "ON" else "OFF"}" - ] ++ stdenv.lib.optionals (enableMultiThreading && enablePython) [ + ] ++ lib.optionals (enableMultiThreading && enablePython) [ "-DGEANT4_BUILD_TLS_MODEL=global-dynamic" - ] ++ stdenv.lib.optionals enableInventor [ + ] ++ lib.optionals enableInventor [ "-DINVENTOR_INCLUDE_DIR=${coin3d}/include" "-DINVENTOR_LIBRARY_RELEASE=${coin3d}/lib/libCoin.so" ]; @@ -90,13 +90,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libGLU xlibsWrapper libXmu ] - ++ stdenv.lib.optionals enableInventor [ libXpm coin3d soxt motif ] - ++ stdenv.lib.optionals enablePython [ boost_python python3 ]; + ++ lib.optionals enableInventor [ libXpm coin3d soxt motif ] + ++ lib.optionals enablePython [ boost_python python3 ]; propagatedBuildInputs = [ clhep expat zlib libGL ] - ++ stdenv.lib.optionals enableGDML [ xercesc ] - ++ stdenv.lib.optionals enableXM [ motif ] - ++ stdenv.lib.optionals enableQT [ qtbase ]; + ++ lib.optionals enableGDML [ xercesc ] + ++ lib.optionals enableXM [ motif ] + ++ lib.optionals enableQT [ qtbase ]; postFixup = '' # Don't try to export invalid environment variables. @@ -107,7 +107,7 @@ stdenv.mkDerivation rec { passthru = { data = import ./datasets.nix { - inherit stdenv fetchurl; + inherit lib stdenv fetchurl; geant_version = version; }; @@ -119,7 +119,7 @@ stdenv.mkDerivation rec { source $out/nix-support/setup-hook ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A toolkit for the simulation of the passage of particles through matter"; longDescription = '' Geant4 is a toolkit for the simulation of the passage of particles through matter. diff --git a/pkgs/development/libraries/physics/hepmc2/default.nix b/pkgs/development/libraries/physics/hepmc2/default.nix index b27d947ea5c..e2ab42c418a 100644 --- a/pkgs/development/libraries/physics/hepmc2/default.nix +++ b/pkgs/development/libraries/physics/hepmc2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake }: +{ lib, stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { pname = "hepmc"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { "-Dlength:STRING=MM" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "The HepMC package is an object oriented event record written in C++ for High Energy Physics Monte Carlo Generators"; license = licenses.lgpl21; homepage = "http://hepmc.web.cern.ch/hepmc/"; diff --git a/pkgs/development/libraries/physics/hepmc3/default.nix b/pkgs/development/libraries/physics/hepmc3/default.nix index 10b789f514f..d4b98d57e11 100644 --- a/pkgs/development/libraries/physics/hepmc3/default.nix +++ b/pkgs/development/libraries/physics/hepmc3/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, cmake, coreutils, python, root }: +{ lib, stdenv, fetchurl, cmake, coreutils, python, root }: let - pythonVersion = with stdenv.lib.versions; "${major python.version}${minor python.version}"; + pythonVersion = with lib.versions; "${major python.version}${minor python.version}"; withPython = python != null; # ensure that root is built with the same python interpreter, as it links against numpy root_py = if withPython then root.override { inherit python; } else root; @@ -9,20 +9,20 @@ in stdenv.mkDerivation rec { pname = "hepmc3"; - version = "3.2.2"; + version = "3.2.3"; src = fetchurl { url = "http://hepmc.web.cern.ch/hepmc/releases/HepMC3-${version}.tar.gz"; - sha256 = "0h9dbsbbf3y7iia27ms9cy4pfk2yyrkdnxcqsbvkhkl0izvv930f"; + sha256 = "sha256-jKrazCyWmIPNH5lLYieV/IhftLFdrYyK5kvL2/DL1H0="; }; nativeBuildInputs = [ cmake ]; buildInputs = [ root_py ] - ++ stdenv.lib.optional withPython python; + ++ lib.optional withPython python; cmakeFlags = [ "-DHEPMC3_ENABLE_PYTHON=${if withPython then "ON" else "OFF"}" - ] ++ stdenv.lib.optionals withPython [ + ] ++ lib.optionals withPython [ "-DHEPMC3_PYTHON_VERSIONS=${if python.isPy3k then "3.X" else "2.X"}" "-DHEPMC3_Python_SITEARCH${pythonVersion}=${placeholder "out"}/${python.sitePackages}" ]; @@ -35,11 +35,11 @@ stdenv.mkDerivation rec { doInstallCheck = withPython; # prevent nix from trying to dereference a null python - installCheckPhase = stdenv.lib.optionalString withPython '' + installCheckPhase = lib.optionalString withPython '' PYTHONPATH=${placeholder "out"}/${python.sitePackages} python -c 'import pyHepMC3' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "The HepMC package is an object oriented, C++ event record for High Energy Physics Monte Carlo generators and simulation"; license = licenses.gpl3; homepage = "http://hepmc.web.cern.ch/hepmc/"; diff --git a/pkgs/development/libraries/physics/herwig/default.nix b/pkgs/development/libraries/physics/herwig/default.nix index c1a803fd314..d3f6bcb7474 100644 --- a/pkgs/development/libraries/physics/herwig/default.nix +++ b/pkgs/development/libraries/physics/herwig/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, fastjet, gfortran, gsl, lhapdf, thepeg, zlib, autoconf, automake, libtool }: +{ lib, stdenv, fetchurl, boost, fastjet, gfortran, gsl, lhapdf, thepeg, zlib, autoconf, automake, libtool }: stdenv.mkDerivation rec { pname = "herwig"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A multi-purpose particle physics event generator"; homepage = "https://herwig.hepforge.org/"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/physics/hoppet/default.nix b/pkgs/development/libraries/physics/hoppet/default.nix index 6ac3b950be3..7ad5b9861a1 100644 --- a/pkgs/development/libraries/physics/hoppet/default.nix +++ b/pkgs/development/libraries/physics/hoppet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gfortran, perl }: +{ lib, stdenv, fetchurl, gfortran, perl }: stdenv.mkDerivation rec { pname = "hoppet"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { patchShebangs . ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Higher Order Perturbative Parton Evolution Toolkit"; license = licenses.gpl2; homepage = "https://hoppet.hepforge.org"; diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix index 7d412f86596..19e9f9d9ec8 100644 --- a/pkgs/development/libraries/physics/lhapdf/default.nix +++ b/pkgs/development/libraries/physics/lhapdf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python2, makeWrapper }: +{ lib, stdenv, fetchurl, python2, makeWrapper }: stdenv.mkDerivation rec { pname = "lhapdf"; @@ -15,18 +15,18 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; passthru = { - pdf_sets = import ./pdf_sets.nix { inherit stdenv fetchurl; }; + pdf_sets = import ./pdf_sets.nix { inherit lib stdenv fetchurl; }; }; postInstall = '' wrapProgram $out/bin/lhapdf --prefix PYTHONPATH : "$(toPythonPath "$out")" ''; - meta = { + meta = with lib; { description = "A general purpose interpolator, used for evaluating Parton Distribution Functions from discretised data files"; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2; homepage = "http://lhapdf.hepforge.org"; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ veprbl ]; + platforms = platforms.unix; + maintainers = with maintainers; [ veprbl ]; }; } diff --git a/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix b/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix index 2309e6671f8..7fb3e640c7d 100644 --- a/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix +++ b/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: let mkPdfSet = name: sha256: @@ -20,7 +20,7 @@ let setupHook = ./pdfset-hook.sh; }; in - stdenv.lib.mapAttrs mkPdfSet { + lib.mapAttrs mkPdfSet { "ABMP15_3_nnlo" = "028q5xixxjxhb8sr7l5v5mwh9mkszm5m59fgnpb69yxvv40a70v0"; "ABMP15_4_nnlo" = "11zjp4dxmgp69kdkmdwqkpsajvwjrbwylmwgs56mgjb0vgb8wk0i"; "ABMP15_5_nnlo" = "0z47g5fwh53gg5ws5bbip5q2m5mm7vl09q2w58g6ah9dk25r10ll"; diff --git a/pkgs/development/libraries/physics/mela/default.nix b/pkgs/development/libraries/physics/mela/default.nix index 1e31577026c..90cf5ac8b2d 100644 --- a/pkgs/development/libraries/physics/mela/default.nix +++ b/pkgs/development/libraries/physics/mela/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gfortran }: +{ lib, stdenv, fetchFromGitHub, gfortran }: stdenv.mkDerivation rec { pname = "mela"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "a Mellin Evolution LibrAry"; license = licenses.gpl3; homepage = "https://github.com/vbertone/MELA"; diff --git a/pkgs/development/libraries/physics/nlojet/default.nix b/pkgs/development/libraries/physics/nlojet/default.nix index 20df49d9ae7..f84c1bda32d 100644 --- a/pkgs/development/libraries/physics/nlojet/default.nix +++ b/pkgs/development/libraries/physics/nlojet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "nlojet++"; @@ -15,9 +15,9 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.desy.de/~znagy/Site/NLOJet++.html"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; description = "Implementation of calculation of the hadron jet cross sections"; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ veprbl ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ veprbl ]; }; } diff --git a/pkgs/development/libraries/physics/pythia/default.nix b/pkgs/development/libraries/physics/pythia/default.nix index 53b2889a25c..1bec3300f80 100644 --- a/pkgs/development/libraries/physics/pythia/default.nix +++ b/pkgs/development/libraries/physics/pythia/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, fastjet, hepmc, lhapdf, rsync, zlib }: +{ lib, stdenv, fetchurl, boost, fastjet, hepmc, lhapdf, rsync, zlib }: stdenv.mkDerivation rec { pname = "pythia"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-shared" "--with-lhapdf6=${lhapdf}" - ] ++ (if stdenv.lib.versions.major hepmc.version == "3" then [ + ] ++ (if lib.versions.major hepmc.version == "3" then [ "--with-hepmc3=${hepmc}" ] else [ "--with-hepmc2=${hepmc}" @@ -28,9 +28,9 @@ stdenv.mkDerivation rec { meta = { description = "A program for the generation of high-energy physics events"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; homepage = "http://home.thep.lu.se/~torbjorn/Pythia.html"; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ veprbl ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ veprbl ]; }; } diff --git a/pkgs/development/libraries/physics/qcdnum/default.nix b/pkgs/development/libraries/physics/qcdnum/default.nix index 1c17b318c9d..834e3fcbba8 100644 --- a/pkgs/development/libraries/physics/qcdnum/default.nix +++ b/pkgs/development/libraries/physics/qcdnum/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gfortran, zlib }: +{ lib, stdenv, fetchurl, gfortran, zlib }: stdenv.mkDerivation rec { pname = "QCDNUM"; @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { meta = { description = "A very fast QCD evolution program written in FORTRAN77"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; homepage = "https://www.nikhef.nl/~h24/qcdnum/index.html"; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ veprbl ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ veprbl ]; }; } diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix index f95328964bf..ce905bff17c 100644 --- a/pkgs/development/libraries/physics/rivet/default.nix +++ b/pkgs/development/libraries/physics/rivet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fastjet, fastjet-contrib, ghostscript, gsl, hepmc, imagemagick, less, python3, rsync, texlive, yoda, which, makeWrapper }: +{ lib, stdenv, fetchurl, fastjet, fastjet-contrib, ghostscript, gsl, hepmc, imagemagick, less, python3, rsync, texlive, yoda, which, makeWrapper }: stdenv.mkDerivation rec { pname = "rivet"; @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-fastjet=${fastjet}" "--with-yoda=${yoda}" - ] ++ (if stdenv.lib.versions.major hepmc.version == "3" then [ + ] ++ (if lib.versions.major hepmc.version == "3" then [ "--with-hepmc3=${hepmc}" ] else [ "--with-hepmc=${hepmc}" @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A framework for comparison of experimental measurements from high-energy particle colliders to theory predictions"; license = licenses.gpl3; homepage = "https://rivet.hepforge.org"; diff --git a/pkgs/development/libraries/physics/thepeg/default.nix b/pkgs/development/libraries/physics/thepeg/default.nix index 876aeec0fab..d5a272955f4 100644 --- a/pkgs/development/libraries/physics/thepeg/default.nix +++ b/pkgs/development/libraries/physics/thepeg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, fastjet, gsl, hepmc2, lhapdf, rivet, zlib }: +{ lib, stdenv, fetchurl, boost, fastjet, gsl, hepmc2, lhapdf, rivet, zlib }: stdenv.mkDerivation rec { pname = "thepeg"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Toolkit for High Energy Physics Event Generation"; homepage = "https://herwig.hepforge.org/"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix index 39bffb65237..bf53cfcb62c 100644 --- a/pkgs/development/libraries/physics/yoda/default.nix +++ b/pkgs/development/libraries/physics/yoda/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, root, makeWrapper, zlib, withRootSupport ? false }: +{ lib, stdenv, fetchurl, python, root, makeWrapper, zlib, withRootSupport ? false }: stdenv.mkDerivation rec { pname = "yoda"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = with python.pkgs; [ cython makeWrapper ]; buildInputs = [ python ] ++ (with python.pkgs; [ numpy matplotlib ]) - ++ stdenv.lib.optional withRootSupport root; + ++ lib.optional withRootSupport root; propagatedBuildInputs = [ zlib ]; enableParallelBuilding = true; @@ -35,10 +35,10 @@ stdenv.mkDerivation rec { meta = { description = "Provides small set of data analysis (specifically histogramming) classes"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; homepage = "https://yoda.hepforge.org"; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ veprbl ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ veprbl ]; # https://gitlab.com/hepcedar/yoda/-/issues/24 broken = withRootSupport; }; diff --git a/pkgs/development/libraries/pipewire/0.2.nix b/pkgs/development/libraries/pipewire/0.2.nix index eaedc2c0ac3..1e686b98004 100644 --- a/pkgs/development/libraries/pipewire/0.2.nix +++ b/pkgs/development/libraries/pipewire/0.2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, doxygen, graphviz, valgrind +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, doxygen, graphviz, valgrind , glib, dbus, gst_all_1, alsaLib, ffmpeg_4, libjack2, udev, libva, xorg , sbc, SDL2, makeFontsConf }: @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { outputs = [ "out" "lib" "dev" "doc" ]; nativeBuildInputs = [ - meson ninja pkgconfig doxygen graphviz valgrind + meson ninja pkg-config doxygen graphviz valgrind ]; buildInputs = [ glib dbus gst_all_1.gst-plugins-base gst_all_1.gstreamer @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Server and user space API to deal with multimedia pipelines"; homepage = "https://pipewire.org/"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index c9697ee1a42..fdd45b4bb0d 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -6,7 +6,7 @@ , meson , ninja , systemd -, pkgconfig +, pkg-config , doxygen , graphviz , valgrind @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { graphviz meson ninja - pkgconfig + pkg-config ]; buildInputs = [ @@ -136,7 +136,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Server and user space API to deal with multimedia pipelines"; homepage = "https://pipewire.org/"; license = licenses.mit; diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix index d7f5b34e5d7..a8cea463806 100644 --- a/pkgs/development/libraries/pixman/default.nix +++ b/pkgs/development/libraries/pixman/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libpng, glib /*just passthru*/ }: +{ lib, stdenv, fetchurl, pkg-config, libpng, glib /*just passthru*/ }: stdenv.mkDerivation rec { pname = "pixman"; @@ -9,17 +9,17 @@ stdenv.mkDerivation rec { sha256 = "0l0m48lnmdlmnaxn2021qi5cj366d9fzfjxkqgcj9bs14pxbgaw4"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libpng ]; - configureFlags = stdenv.lib.optional stdenv.isAarch32 "--disable-arm-iwmmxt"; + configureFlags = lib.optional stdenv.isAarch32 "--disable-arm-iwmmxt"; doCheck = true; postInstall = glib.flattenInclude; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://pixman.org"; description = "A low-level library for pixel manipulation"; license = licenses.mit; diff --git a/pkgs/development/libraries/pkcs11helper/default.nix b/pkgs/development/libraries/pkcs11helper/default.nix index cb8e05b6a76..4148ca4fc47 100644 --- a/pkgs/development/libraries/pkcs11helper/default.nix +++ b/pkgs/development/libraries/pkcs11helper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, openssl, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, pkg-config, openssl, autoreconfHook }: stdenv.mkDerivation rec { pname = "pkcs11-helper"; @@ -11,12 +11,12 @@ stdenv.mkDerivation rec { sha256 = "1idrqip59bqzcgddpnk2inin5n5yn4y0dmcyaggfpdishraiqgd5"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ openssl ]; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/OpenSC/pkcs11-helper"; license = with licenses; [ bsd3 gpl2 ]; description = "Library that simplifies the interaction with PKCS#11 providers"; diff --git a/pkgs/development/libraries/pkger/default.nix b/pkgs/development/libraries/pkger/default.nix index 8c8fd4f8fd6..f2e984c8c81 100644 --- a/pkgs/development/libraries/pkger/default.nix +++ b/pkgs/development/libraries/pkger/default.nix @@ -1,7 +1,7 @@ { buildGoModule , fetchFromGitHub , lib -, stdenv + }: buildGoModule rec { @@ -19,7 +19,7 @@ buildGoModule rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Embed static files in Go binaries (replacement for gobuffalo/packr) "; homepage = "https://github.com/markbates/pkger"; changelog = "https://github.com/markbates/pkger/releases/tag/v${version}"; diff --git a/pkgs/development/libraries/plib/default.nix b/pkgs/development/libraries/plib/default.nix index 2736de0630f..7a1c3971579 100644 --- a/pkgs/development/libraries/plib/default.nix +++ b/pkgs/development/libraries/plib/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, stdenv, libGLU, libGL, freeglut, SDL +{ fetchurl, fetchpatch, lib, stdenv, libGLU, libGL, freeglut, SDL , libXi, libSM, libXmu, libXext, libX11 }: stdenv.mkDerivation rec { @@ -42,9 +42,9 @@ stdenv.mkDerivation rec { GLUT, or FLTK instead of PLIB's 'PW' windowing library, you can. ''; - license = stdenv.lib.licenses.lgpl2Plus; + license = lib.licenses.lgpl2Plus; homepage = "http://plib.sourceforge.net/"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/plplot/default.nix b/pkgs/development/libraries/plplot/default.nix index e99ddc3dd08..05f12d0148b 100644 --- a/pkgs/development/libraries/plplot/default.nix +++ b/pkgs/development/libraries/plplot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake }: +{ lib, stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { pname = "plplot"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Cross-platform scientific graphics plotting library"; homepage = "https://plplot.org"; maintainers = with maintainers; [ bcdarwin ]; diff --git a/pkgs/development/libraries/pmdk/default.nix b/pkgs/development/libraries/pmdk/default.nix index fe3176f9f76..01392f232d9 100644 --- a/pkgs/development/libraries/pmdk/default.nix +++ b/pkgs/development/libraries/pmdk/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub -, autoconf, libndctl, pkgconfig +{ lib, stdenv, fetchFromGitHub +, autoconf, libndctl, pkg-config }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1833sq0f1msaqwn31dn1fp37a6d5zp995i9gkazanydmppi2qy0i"; }; - nativeBuildInputs = [ autoconf pkgconfig ]; + nativeBuildInputs = [ autoconf pkg-config ]; buildInputs = [ libndctl ]; enableParallelBuilding = true; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { mv $out/lib $lib/lib ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Persistent Memory Development Kit"; homepage = "https://github.com/pmem/pmdk"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/pmix/default.nix b/pkgs/development/libraries/pmix/default.nix index f68833bdac4..bb8debbce91 100644 --- a/pkgs/development/libraries/pmix/default.nix +++ b/pkgs/development/libraries/pmix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, perl, autoconf, automake +{ lib, stdenv, fetchFromGitHub, perl, autoconf, automake , libtool, flex, libevent, hwloc, munge, zlib, pandoc } : @@ -37,7 +37,7 @@ in stdenv.mkDerivation { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Process Management Interface for HPC environments"; homepage = "https://openpmix.github.io/"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/png++/default.nix b/pkgs/development/libraries/png++/default.nix index 7ae7406c989..dfd74e495e7 100644 --- a/pkgs/development/libraries/png++/default.nix +++ b/pkgs/development/libraries/png++/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libpng +{ lib, stdenv, fetchurl, libpng , docSupport ? true, doxygen ? null }: assert docSupport -> doxygen != null; @@ -21,21 +21,21 @@ stdenv.mkDerivation rec { postCheck = "cat test/test.log"; - buildInputs = stdenv.lib.optional docSupport doxygen; + buildInputs = lib.optional docSupport doxygen; propagatedBuildInputs = [ libpng ]; - preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.isDarwin '' substituteInPlace error.hpp --replace "#if (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE" "#if (__clang__ || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE" '' + '' sed "s|\(PNGPP := .\)|PREFIX := ''${out}\n\\1|" -i Makefile ''; - makeFlags = stdenv.lib.optional docSupport "docs"; + makeFlags = lib.optional docSupport "docs"; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.nongnu.org/pngpp/"; description = "C++ wrapper for libpng library"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/pocketsphinx/default.nix b/pkgs/development/libraries/pocketsphinx/default.nix index 0f9be199d95..18d5d0bcfa2 100644 --- a/pkgs/development/libraries/pocketsphinx/default.nix +++ b/pkgs/development/libraries/pocketsphinx/default.nix @@ -1,7 +1,7 @@ -{ stdenv +{ lib, stdenv , fetchurl , sphinxbase -, pkgconfig +, pkg-config , python27 # >= 2.6 , swig2 # 2.0 }: @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ sphinxbase ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ python27 swig2 ]; meta = { description = "Voice recognition library written in C"; homepage = "http://cmusphinx.sourceforge.net"; - license = stdenv.lib.licenses.free; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.free; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/poco/default.nix b/pkgs/development/libraries/poco/default.nix index c0f74630757..8f963bb366a 100644 --- a/pkgs/development/libraries/poco/default.nix +++ b/pkgs/development/libraries/poco/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, zlib, pcre, expat, sqlite, openssl, unixODBC, libmysqlclient }: +{ lib, stdenv, fetchurl, cmake, pkg-config, zlib, pcre, expat, sqlite, openssl, unixODBC, libmysqlclient }: stdenv.mkDerivation rec { pname = "poco"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1jilzh0h6ik5lr167nax7q6nrpzxl99p11pkl202ig06pgh32nbz"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ zlib pcre expat sqlite openssl unixODBC libmysqlclient ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "-DPOCO_UNBUNDLED=ON" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://pocoproject.org/"; description = "Cross-platform C++ libraries with a network/internet focus"; license = licenses.boost; diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix index 242645ebfdb..e50a2111b43 100644 --- a/pkgs/development/libraries/podofo/default.nix +++ b/pkgs/development/libraries/podofo/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, cmake, zlib, freetype, libjpeg, libtiff, fontconfig -, openssl, libpng, lua5, pkgconfig, libidn, expat, fetchpatch +{ lib, stdenv, fetchurl, cmake, zlib, freetype, libjpeg, libtiff, fontconfig +, openssl, libpng, lua5, pkg-config, libidn, expat, fetchpatch }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "lib" ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ zlib freetype libjpeg libtiff fontconfig openssl libpng libidn expat lua5 ]; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { moveToOutput lib "$lib" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://podofo.sourceforge.net"; description = "A library to work with the PDF file format"; platforms = platforms.all; diff --git a/pkgs/development/libraries/polkit-qt-1/qt-4.nix b/pkgs/development/libraries/polkit-qt-1/qt-4.nix index b13335561ac..0da6e15eb27 100644 --- a/pkgs/development/libraries/polkit-qt-1/qt-4.nix +++ b/pkgs/development/libraries/polkit-qt-1/qt-4.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, cmake, pkgconfig, polkit, automoc4, glib, qt4 }: +{ lib, stdenv, fetchurl, cmake, pkg-config, polkit, automoc4, glib, qt4 }: -with stdenv.lib; +with lib; stdenv.mkDerivation { name = "polkit-qt-1-qt4-0.112.0"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ cmake pkgconfig automoc4 ]; + nativeBuildInputs = [ cmake pkg-config automoc4 ]; propagatedBuildInputs = [ polkit glib qt4 ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A Qt wrapper around PolKit"; maintainers = [ maintainers.ttuegel ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/polkit-qt-1/qt-5.nix b/pkgs/development/libraries/polkit-qt-1/qt-5.nix index f6cbf7e972b..c4918d9d8e9 100644 --- a/pkgs/development/libraries/polkit-qt-1/qt-5.nix +++ b/pkgs/development/libraries/polkit-qt-1/qt-5.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, cmake, pkgconfig, polkit, glib, qtbase }: +{ lib, stdenv, fetchurl, cmake, pkg-config, polkit, glib, qtbase }: -with stdenv.lib; +with lib; stdenv.mkDerivation { name = "polkit-qt-1-qt5-0.112.0"; @@ -12,10 +12,12 @@ stdenv.mkDerivation { sha256 = "1ip78x20hjqvm08kxhp6gb8hf6k5n6sxyx6kk2yvvq53djzh7yv7"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; propagatedBuildInputs = [ polkit glib qtbase ]; + dontWrapQtApps = true; + postFixup = '' # Fix library location in CMake module sed -i "$dev/lib/cmake/PolkitQt5-1/PolkitQt5-1Config.cmake" \ @@ -24,7 +26,7 @@ stdenv.mkDerivation { meta = { description = "A Qt wrapper around PolKit"; - maintainers = with stdenv.lib.maintainers; [ ttuegel ]; - platforms = with stdenv.lib.platforms; linux; + maintainers = with lib.maintainers; [ ttuegel ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index 2ec49a2d3c0..7e8e95ef1ea 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, expat, pam, perl, fetchpatch +{ lib, stdenv, fetchurl, pkg-config, glib, expat, pam, perl, fetchpatch , intltool, spidermonkey_78, gobject-introspection, libxslt, docbook_xsl, dbus , docbook_xml_dtd_412, gtk-doc, coreutils , useSystemd ? (stdenv.isLinux && !stdenv.hostPlatform.isMusl), systemd, elogind @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { url = "https://gitlab.freedesktop.org/polkit/polkit/commit/5dd4e22efd05d55833c4634b56e473812b5acbf2.patch"; sha256 = "17lv7xj5ksa27iv4zpm4zwd4iy8zbwjj4ximslfq3sasiz9kxhlp"; }) - ] ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ + ] ++ lib.optionals stdenv.hostPlatform.isMusl [ # Make netgroup support optional (musl does not have it) # Upstream MR: https://gitlab.freedesktop.org/polkit/polkit/merge_requests/10 # We use the version of the patch that Alpine uses successfully. @@ -45,20 +45,20 @@ stdenv.mkDerivation rec { }) ]; - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.isDarwin '' sed -i -e "s/-Wl,--as-needed//" configure.ac ''; outputs = [ "bin" "dev" "out" ]; # small man pages in $bin nativeBuildInputs = - [ glib gtk-doc pkgconfig intltool perl ] + [ glib gtk-doc pkg-config intltool perl ] ++ [ libxslt docbook_xsl docbook_xml_dtd_412 ]; # man pages buildInputs = [ expat pam spidermonkey_78 ] # On Linux, fall back to elogind when systemd support is off. - ++ stdenv.lib.optional stdenv.isLinux (if useSystemd then systemd else elogind) - ++ stdenv.lib.optional withIntrospection gobject-introspection; + ++ lib.optional stdenv.isLinux (if useSystemd then systemd else elogind) + ++ lib.optional withIntrospection gobject-introspection; propagatedBuildInputs = [ glib # in .pc Requires @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { --replace /bin/true ${coreutils}/bin/true \ --replace /bin/false ${coreutils}/bin/false - '' + stdenv.lib.optionalString useSystemd /* bogus chroot detection */ '' + '' + lib.optionalString useSystemd /* bogus chroot detection */ '' sed '/libsystemd autoconfigured/s/.*/:/' -i configure ''; @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { "--with-polkitd-user=polkituser" #TODO? <nixos> config.ids.uids.polkituser "--with-os-type=NixOS" # not recognized but prevents impurities on non-NixOS (if withIntrospection then "--enable-introspection" else "--disable-introspection") - ] ++ stdenv.lib.optional (!doCheck) "--disable-test"; + ] ++ lib.optional (!doCheck) "--disable-test"; makeFlags = [ "INTROSPECTION_GIRDIR=${placeholder "out"}/share/gir-1.0" @@ -111,7 +111,7 @@ stdenv.mkDerivation rec { dbus-run-session --config-file=${./system_bus.conf} -- sh -c 'DBUS_SYSTEM_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS make check' ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.freedesktop.org/wiki/Software/polkit"; description = "A toolkit for defining and handling the policy that allows unprivileged processes to speak to privileged processes"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/poly2tri-c/default.nix b/pkgs/development/libraries/poly2tri-c/default.nix index a3e42b3ae4b..cdfd376add1 100644 --- a/pkgs/development/libraries/poly2tri-c/default.nix +++ b/pkgs/development/libraries/poly2tri-c/default.nix @@ -1,7 +1,7 @@ -{ stdenv -, fetchFromGitHub +{ lib, stdenv +, fetchFromGitLab , autoreconfHook -, pkgconfig +, pkg-config , glib }: @@ -11,16 +11,17 @@ stdenv.mkDerivation rec { outputs = [ "bin" "out" "dev" ]; - src = fetchFromGitHub { - owner = "Paul-Browne"; - repo = "poly2tri-c"; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "jtojnar"; + repo = pname; rev = "p2tc-${version}"; sha256 = "158vm3wqfxs22b74kqc4prlvjny38qqm3kz5wrgasmx0qciwh0g8"; }; nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config ]; buildInputs = [ @@ -32,11 +33,11 @@ stdenv.mkDerivation rec { "-Wno-error" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for generating, refining and rendering 2-Dimensional Constrained Delaunay Triangulations"; homepage = "https://code.google.com/archive/p/poly2tri-c/"; license = licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ jtojnar ]; + maintainers = with lib.maintainers; [ jtojnar ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/poppler/0.61.nix b/pkgs/development/libraries/poppler/0.61.nix index 0603f49fad4..9b89283972d 100644 --- a/pkgs/development/libraries/poppler/0.61.nix +++ b/pkgs/development/libraries/poppler/0.61.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, cmake, ninja, pkgconfig, libiconv, libintl +{ stdenv, lib, fetchurl, cmake, ninja, pkg-config, libiconv, libintl , zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg, fetchpatch , withData ? true, poppler_data , qt5Support ? false, qtbase ? null @@ -39,10 +39,10 @@ stdenv.mkDerivation rec { ++ optional qt5Support qtbase ++ optional introspectionSupport gobject-introspection; - nativeBuildInputs = [ cmake ninja pkgconfig ]; + nativeBuildInputs = [ cmake ninja pkg-config ]; # Not sure when and how to pass it. It seems an upstream bug anyway. - CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11"; + CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11"; cmakeFlags = [ (mkFlag true "XPDF_HEADERS") @@ -53,6 +53,8 @@ stdenv.mkDerivation rec { (mkFlag qt5Support "QT5") ]; + dontWrapQtApps = true; + meta = with lib; { homepage = "https://poppler.freedesktop.org/"; description = "A PDF rendering library"; diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index e7b9a26f19f..f3fae283e87 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch, cmake, ninja, pkgconfig, libiconv, libintl +{ stdenv, lib, fetchurl, fetchpatch, cmake, ninja, pkg-config, libiconv, libintl , zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg , withData ? true, poppler_data , qt5Support ? false, qtbase ? null @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { name = "poppler-${suffix}-${version}"; - version = "20.12.1"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! + version = "21.01.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! src = fetchurl { url = "${meta.homepage}/poppler-${version}.tar.xz"; - sha256 = "0dbv1y9i5ahg6namz6gw2d0njnmrigr4a80dbxvnqad4q232banh"; + sha256 = "sha256-AW3eNOX4aOqYoyypm2QzJaloIoFQCUK3ET9OyI0g4vM="; }; outputs = [ "out" "dev" ]; @@ -31,13 +31,15 @@ stdenv.mkDerivation rec { ++ optional utils nss ++ optional introspectionSupport gobject-introspection; - nativeBuildInputs = [ cmake ninja pkgconfig ]; + nativeBuildInputs = [ cmake ninja pkg-config ]; # Workaround #54606 - preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.isDarwin '' sed -i -e '1i cmake_policy(SET CMP0025 NEW)' CMakeLists.txt ''; + dontWrapQtApps = true; + cmakeFlags = [ (mkFlag true "UNSTABLE_API_ABI_HEADERS") # previously "XPDF_HEADERS" (mkFlag (!minimal) "GLIB") diff --git a/pkgs/development/libraries/popt/default.nix b/pkgs/development/libraries/popt/default.nix index b04a2242ab7..393ef2c2c33 100644 --- a/pkgs/development/libraries/popt/default.nix +++ b/pkgs/development/libraries/popt/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { pname = "popt"; @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { sha256 = "1j2c61nn2n351nhj4d25mnf3vpiddcykq005w2h6kw79dwlysa77"; }; - patches = stdenv.lib.optionals stdenv.isCygwin [ + patches = lib.optionals stdenv.isCygwin [ ./1.16-cygwin.patch ./1.16-vpath.patch ]; doCheck = false; # fails - meta = with stdenv.lib; { + meta = with lib; { description = "Command line option parsing library"; platforms = platforms.unix; license = licenses.mit; diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix index aa8afb7ac97..c7de116e879 100644 --- a/pkgs/development/libraries/portaudio/default.nix +++ b/pkgs/development/libraries/portaudio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, pkgconfig, libjack2 +{ lib, stdenv, fetchurl, alsaLib, pkg-config, libjack2 , AudioUnit, AudioToolbox, CoreAudio, CoreServices, Carbon }: stdenv.mkDerivation { @@ -9,17 +9,17 @@ stdenv.mkDerivation { sha256 = "04qmin6nj144b8qb9kkd9a52xfvm0qdgm8bg8jbl7s3frmyiv8pm"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libjack2 ] - ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib; + ++ lib.optional (!stdenv.isDarwin) alsaLib; configureFlags = [ "--disable-mac-universal" "--enable-cxx" ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=nullability-inferred-on-nested-type -Wno-error=nullability-completeness-on-arrays"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=nullability-inferred-on-nested-type -Wno-error=nullability-completeness-on-arrays"; - propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ AudioUnit AudioToolbox CoreAudio CoreServices Carbon ]; + propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AudioUnit AudioToolbox CoreAudio CoreServices Carbon ]; - patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' + patchPhase = lib.optionalString stdenv.isDarwin '' sed -i '50 i\ #include <CoreAudio/AudioHardware.h>\ #include <CoreAudio/AudioHardwareBase.h>\ @@ -30,14 +30,14 @@ stdenv.mkDerivation { # not sure why, but all the headers seem to be installed by the make install installPhase = '' make install - '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.isDarwin) '' # fixup .pc file to find alsa library sed -i "s|-lasound|-L${alsaLib.out}/lib -lasound|" "$out/lib/pkgconfig/"*.pc - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' cp include/pa_mac_core.h $out/include/pa_mac_core.h ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Portable cross-platform Audio API"; homepage = "http://www.portaudio.com/"; # Not exactly a bsd license, but alike diff --git a/pkgs/development/libraries/portmidi/default.nix b/pkgs/development/libraries/portmidi/default.nix index d96e15edd81..e9a868240bb 100644 --- a/pkgs/development/libraries/portmidi/default.nix +++ b/pkgs/development/libraries/portmidi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, cmake, /*jdk,*/ alsaLib }: +{ lib, stdenv, fetchurl, unzip, cmake, /*jdk,*/ alsaLib }: stdenv.mkDerivation rec { pname = "portmidi"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; # XXX: This is to deactivate Java support. - patches = stdenv.lib.singleton (fetchurl { + patches = 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"; @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://portmedia.sourceforge.net/portmidi/"; description = "Platform independent library for MIDI I/O"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mit; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/ppl/default.nix b/pkgs/development/libraries/ppl/default.nix index f1c93e0fa7c..a94cf9e38d0 100644 --- a/pkgs/development/libraries/ppl/default.nix +++ b/pkgs/development/libraries/ppl/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, stdenv, gmpxx, perl, gnum4 }: +{ fetchurl, fetchpatch, lib, stdenv, gmpxx, perl, gnum4 }: let version = "1.2"; in @@ -21,7 +21,7 @@ stdenv.mkDerivation { propagatedBuildInputs = [ gmpxx ]; configureFlags = [ "--disable-watchdog" ] ++ - stdenv.lib.optionals stdenv.isDarwin [ + lib.optionals stdenv.isDarwin [ "CPPFLAGS=-fexceptions" "--disable-ppl_lcdd" "--disable-ppl_lpsol" "--disable-ppl_pips" ]; @@ -53,9 +53,9 @@ stdenv.mkDerivation { homepage = "http://bugseng.com/products/ppl/"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/precice/default.nix b/pkgs/development/libraries/precice/default.nix index e9e67737d32..c3c75e2413f 100644 --- a/pkgs/development/libraries/precice/default.nix +++ b/pkgs/development/libraries/precice/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, cmake, gcc, boost, eigen, libxml2, openmpi, python3, petsc }: +{ lib, stdenv, fetchFromGitHub, cmake, gcc, boost, eigen, libxml2, mpi, python3, petsc }: stdenv.mkDerivation rec { pname = "precice"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "precice"; repo = pname; rev = "v${version}"; - sha256 = "180db4nlir2409wzdnsc1bkyrllnki8d551qbm1rg82zkz3vdmqg"; + sha256 = "sha256-AQc+p/twsfkzwpWeznGpLLSqINKSrWCwH+PdNIrdYA8="; }; cmakeFlags = [ @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin [ "-D_GNU_SOURCE" ]; nativeBuildInputs = [ cmake gcc ]; - buildInputs = [ boost eigen libxml2 openmpi python3 python3.pkgs.numpy ]; + buildInputs = [ boost eigen libxml2 mpi python3 python3.pkgs.numpy ]; meta = { description = "preCICE stands for Precise Code Interaction Coupling Environment"; diff --git a/pkgs/development/libraries/prison/default.nix b/pkgs/development/libraries/prison/default.nix index d40b4442e38..4275622c24f 100644 --- a/pkgs/development/libraries/prison/default.nix +++ b/pkgs/development/libraries/prison/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, qrencode, qt4, libdmtx }: +{ lib, stdenv, fetchurl, cmake, qrencode, qt4, libdmtx }: let v = "1.0"; in @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Qt4 library for QR-codes"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; inherit (qt4.meta) platforms; }; } diff --git a/pkgs/development/libraries/proj-datumgrid/default.nix b/pkgs/development/libraries/proj-datumgrid/default.nix index c7a25f62171..93e415f6269 100644 --- a/pkgs/development/libraries/proj-datumgrid/default.nix +++ b/pkgs/development/libraries/proj-datumgrid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { name = "proj-datumgrid"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { cp nad2bin $out/bin/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Repository for proj datum grids"; homepage = "https://proj4.org"; license = licenses.mit; diff --git a/pkgs/development/libraries/proj/5.2.nix b/pkgs/development/libraries/proj/5.2.nix index 7a97491d8ea..ee76c668716 100644 --- a/pkgs/development/libraries/proj/5.2.nix +++ b/pkgs/development/libraries/proj/5.2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "proj-5.2.0"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { doCheck = stdenv.is64bit; - meta = with stdenv.lib; { + meta = with lib; { description = "Cartographic Projections Library"; homepage = "https://proj4.org"; license = licenses.mit; diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix index 8618d62e834..22d6206fd85 100644 --- a/pkgs/development/libraries/proj/default.nix +++ b/pkgs/development/libraries/proj/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkg-config, sqlite, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, pkg-config, sqlite, autoreconfHook }: stdenv.mkDerivation rec { pname = "proj"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { doCheck = stdenv.is64bit; - meta = with stdenv.lib; { + meta = with lib; { description = "Cartographic Projections Library"; homepage = "https://proj4.org"; license = licenses.mit; diff --git a/pkgs/development/libraries/prometheus-client-c/default.nix b/pkgs/development/libraries/prometheus-client-c/default.nix index 57f4ef5956f..9b18b25c726 100644 --- a/pkgs/development/libraries/prometheus-client-c/default.nix +++ b/pkgs/development/libraries/prometheus-client-c/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch , cmake @@ -50,9 +50,9 @@ let meta = { homepage = "https://github.com/digitalocean/prometheus-client-c/"; inherit description; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.cfsmp3 ]; + platforms = lib.platforms.unix; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.cfsmp3 ]; }; }; in diff --git a/pkgs/development/libraries/prometheus-cpp/default.nix b/pkgs/development/libraries/prometheus-cpp/default.nix index 5377d2b96d0..173ee6d2e09 100644 --- a/pkgs/development/libraries/prometheus-cpp/default.nix +++ b/pkgs/development/libraries/prometheus-cpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , gbenchmark @@ -33,10 +33,15 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-ldl"; + postInstall = '' + mkdir -p $out/lib/pkgconfig + substituteAll ${./prometheus-cpp.pc.in} $out/lib/pkgconfig/prometheus-cpp.pc + ''; + meta = { description = "Prometheus Client Library for Modern C++"; homepage = "https://github.com/jupp0r/prometheus-cpp"; - license = [ stdenv.lib.licenses.mit ]; + license = [ lib.licenses.mit ]; }; } diff --git a/pkgs/development/libraries/prometheus-cpp/prometheus-cpp.pc.in b/pkgs/development/libraries/prometheus-cpp/prometheus-cpp.pc.in new file mode 100644 index 00000000000..c373f4153b5 --- /dev/null +++ b/pkgs/development/libraries/prometheus-cpp/prometheus-cpp.pc.in @@ -0,0 +1,10 @@ +prefix=@out@ +includedir=${prefix}/include +libdir=${prefix}/lib + +Name: prometheus-cpp +Description: Prometheus Client Library for Modern C++ +URL: https://github.com/jupp0r/prometheus-cpp +Version: @version@ +Cflags: -isystem${includedir} +Libs: -Wl,-rpath,${libdir} -L${libdir} -lprometheus-cpp-core -lprometheus-cpp-pull -lprometheus-cpp-push diff --git a/pkgs/development/libraries/properties-cpp/default.nix b/pkgs/development/libraries/properties-cpp/default.nix index 54fea18fd17..431e6348b3f 100644 --- a/pkgs/development/libraries/properties-cpp/default.nix +++ b/pkgs/development/libraries/properties-cpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , cmake , pkg-config @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtest doxygen graphviz lcov ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://launchpad.net/properties-cpp"; description = "A very simple convenience library for handling properties and signals in C++11"; license = licenses.lgpl3Only; diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix index 4166aac7246..f31a7868d5e 100644 --- a/pkgs/development/libraries/protobuf/generic-v3.nix +++ b/pkgs/development/libraries/protobuf/generic-v3.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook, zlib, gmock, buildPackages , version, sha256 @@ -25,7 +25,7 @@ mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation { chmod -R a+w gmock chmod -R a+w googletest ln -s ../googletest gmock/gtest - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' substituteInPlace src/google/protobuf/testing/googletest.cc \ --replace 'tmpnam(b)' '"'$TMPDIR'/foo"' ''; @@ -48,8 +48,8 @@ mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation { yet extensible format. Google uses Protocol Buffers for almost all of its internal RPC protocols and file formats. ''; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.bsd3; + platforms = lib.platforms.unix; homepage = "https://developers.google.com/protocol-buffers/"; }; diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix index 32d6f70d1eb..7d64df43626 100644 --- a/pkgs/development/libraries/protobuf/generic.nix +++ b/pkgs/development/libraries/protobuf/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, version, src +{ lib, stdenv, version, src , autoreconfHook, zlib, gtest , ... }: @@ -13,7 +13,7 @@ stdenv.mkDerivation { rm -rf gtest cp -r ${gtest.src}/googletest gtest chmod -R a+w gtest - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' substituteInPlace src/google/protobuf/testing/googletest.cc \ --replace 'tmpnam(b)' '"'$TMPDIR'/foo"' ''; @@ -54,7 +54,7 @@ stdenv.mkDerivation { ''; license = "mBSD"; homepage = "https://developers.google.com/protocol-buffers/"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; passthru.version = version; diff --git a/pkgs/development/libraries/protobufc/generic.nix b/pkgs/development/libraries/protobufc/generic.nix index 4b0d273ac44..b64d75076ba 100644 --- a/pkgs/development/libraries/protobufc/generic.nix +++ b/pkgs/development/libraries/protobufc/generic.nix @@ -1,5 +1,5 @@ -{ stdenv, src, version -, autoreconfHook, pkgconfig, protobuf, zlib +{ lib, stdenv, src, version +, autoreconfHook, pkg-config, protobuf, zlib , ... }: @@ -9,10 +9,10 @@ stdenv.mkDerivation { inherit src; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ protobuf zlib ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/protobuf-c/protobuf-c/"; description = "C bindings for Google's Protocol Buffers"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/prototypejs/default.nix b/pkgs/development/libraries/prototypejs/default.nix index 3753dfacac3..fd06b49604a 100644 --- a/pkgs/development/libraries/prototypejs/default.nix +++ b/pkgs/development/libraries/prototypejs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ... }: +{ lib, fetchurl, ... }: let version = "1.7.3.0"; in fetchurl { @@ -6,7 +6,7 @@ in fetchurl { url = "https://ajax.googleapis.com/ajax/libs/prototype/${version}/prototype.js"; sha256 = "0q43vvrsb22h4jvavs1gk3v4ps61yx9k85b5n6q9mxivhmxprg26"; - meta = with stdenv.lib; { + meta = with lib; { description = "A foundation for ambitious web user interfaces"; longDescription = '' Prototype takes the complexity out of client-side web diff --git a/pkgs/development/libraries/protozero/default.nix b/pkgs/development/libraries/protozero/default.nix index 1c8e7e99313..6bff5998b56 100644 --- a/pkgs/development/libraries/protozero/default.nix +++ b/pkgs/development/libraries/protozero/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "protozero"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Minimalistic protocol buffer decoder and encoder in C++"; homepage = "https://github.com/mapbox/protozero"; license = with licenses; [ bsd2 asl20 ]; diff --git a/pkgs/development/libraries/pslib/default.nix b/pkgs/development/libraries/pslib/default.nix index 08accd5d7df..ec2362009ff 100644 --- a/pkgs/development/libraries/pslib/default.nix +++ b/pkgs/development/libraries/pslib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, zlib, libpng, libjpeg, libungif, libtiff +{ lib, stdenv, fetchurl, cmake, pkg-config, zlib, libpng, libjpeg, libungif, libtiff }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0m191ckqj1kj2yvxiilqw26x4vrn7pnlc2vy636yphjxr02q8bk4"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ zlib libpng libjpeg libungif libtiff ]; doCheck = true; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { cp -r ../doc/. $doc/share/doc/${pname} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A C-library for generating multi page PostScript documents"; homepage = "http://pslib.sourceforge.net/"; changelog = diff --git a/pkgs/development/libraries/psol/generic.nix b/pkgs/development/libraries/psol/generic.nix index c61926fe13f..aa2522a5dad 100644 --- a/pkgs/development/libraries/psol/generic.nix +++ b/pkgs/development/libraries/psol/generic.nix @@ -1,4 +1,4 @@ -{ fetchzip, stdenv }: +{ fetchzip, lib }: { version, sha256 }: { inherit version; } // fetchzip { inherit sha256; @@ -8,9 +8,9 @@ meta = { description = "PageSpeed Optimization Libraries"; homepage = "https://developers.google.com/speed/pagespeed/psol"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; # WARNING: This only works with Linux because the pre-built PSOL binary is only supplied for Linux. # TODO: Build PSOL from source to support more platforms. - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/psqlodbc/default.nix b/pkgs/development/libraries/psqlodbc/default.nix index 43da67d3d9b..82ee5c3ae44 100644 --- a/pkgs/development/libraries/psqlodbc/default.nix +++ b/pkgs/development/libraries/psqlodbc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libiodbc, postgresql, openssl }: +{ lib, stdenv, fetchurl, libiodbc, postgresql, openssl }: stdenv.mkDerivation rec { name = "psqlodbc-09.01.0200"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-iodbc=${libiodbc}" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://odbc.postgresql.org/"; description = "ODBC driver for PostgreSQL"; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/pstreams/default.nix b/pkgs/development/libraries/pstreams/default.nix index e3cb9dd67a3..bb9b6bc9c84 100644 --- a/pkgs/development/libraries/pstreams/default.nix +++ b/pkgs/development/libraries/pstreams/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchgit }: @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "https://git.code.sf.net/p/pstreams/code"; - rev = let dot2Underscore = stdenv.lib.strings.stringAsChars (c: if c == "." then "_" else c); + rev = let dot2Underscore = lib.strings.stringAsChars (c: if c == "." then "_" else c); in "RELEASE_${dot2Underscore version}"; sha256 = "0r8aj0nh5mkf8cvnzl8bdy4nm7i74vs83axxfimcd74kjfn0irys"; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { # `make install` fails on case-insensitive file systems (e.g. APFS by # default) because this target exists - meta = with stdenv.lib; { + meta = with lib; { description = "POSIX Process Control in C++"; longDescription = '' PStreams allows you to run another program from your C++ application and diff --git a/pkgs/development/libraries/ptex/default.nix b/pkgs/development/libraries/ptex/default.nix index 09b3ce23e08..3f62d672ea9 100644 --- a/pkgs/development/libraries/ptex/default.nix +++ b/pkgs/development/libraries/ptex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, zlib, python, cmake, pkg-config }: +{ lib, stdenv, fetchFromGitHub, zlib, python, cmake, pkg-config }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec echo v${version} >version ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Per-Face Texture Mapping for Production Rendering"; homepage = "http://ptex.us/"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/pth/default.nix b/pkgs/development/libraries/pth/default.nix index c64d0b37686..240c903a8a7 100644 --- a/pkgs/development/libraries/pth/default.nix +++ b/pkgs/development/libraries/pth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "pth-2.0.7"; @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { sha256 = "0ckjqw5kz5m30srqi87idj7xhpw6bpki43mj07bazjm2qmh3cdbj"; }; - preConfigure = stdenv.lib.optionalString stdenv.isAarch32 '' + preConfigure = lib.optionalString stdenv.isAarch32 '' configureFlagsArray=("CFLAGS=-DJB_SP=8 -DJB_PC=9") - '' + stdenv.lib.optionalString (stdenv.hostPlatform.libc == "glibc") '' + '' + lib.optionalString (stdenv.hostPlatform.libc == "glibc") '' configureFlagsArray+=("ac_cv_check_sjlj=ssjlj") ''; - meta = with stdenv.lib; { + meta = with lib; { description = "The GNU Portable Threads library"; homepage = "https://www.gnu.org/software/pth"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/pupnp/default.nix b/pkgs/development/libraries/pupnp/default.nix index 4930b222d03..15000564637 100644 --- a/pkgs/development/libraries/pupnp/default.nix +++ b/pkgs/development/libraries/pupnp/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, autoreconfHook, pkg-config }: +{ fetchFromGitHub, lib, stdenv, autoreconfHook, pkg-config }: stdenv.mkDerivation rec { pname = "libupnp"; @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { license = "BSD-style"; homepage = "http://pupnp.sourceforge.net/"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/pxlib/default.nix b/pkgs/development/libraries/pxlib/default.nix index 2624c718d27..3acaf8bac15 100644 --- a/pkgs/development/libraries/pxlib/default.nix +++ b/pkgs/development/libraries/pxlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool }: +{ lib, stdenv, fetchurl, intltool }: stdenv.mkDerivation rec { pname = "pxlib"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ intltool ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library to read and write Paradox files"; homepage = "http://pxlib.sourceforge.net/"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/pyotherside/default.nix b/pkgs/development/libraries/pyotherside/default.nix index 047142c8a5d..da327ae13fa 100644 --- a/pkgs/development/libraries/pyotherside/default.nix +++ b/pkgs/development/libraries/pyotherside/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , python3, qmake, qtbase, qtquickcontrols, qtsvg, ncurses }: stdenv.mkDerivation rec { @@ -17,10 +17,12 @@ stdenv.mkDerivation rec { python3 qtbase qtquickcontrols qtsvg ncurses ]; + dontWrapQtApps = true; + patches = [ ./qml-path.patch ]; installTargets = [ "sub-src-install_subtargets" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Asynchronous Python 3 Bindings for Qt 5"; homepage = "https://thp.io/2011/pyotherside/"; license = licenses.isc; diff --git a/pkgs/development/libraries/python-qt/default.nix b/pkgs/development/libraries/python-qt/default.nix index 6f2550ca9ac..0fe0806b1eb 100644 --- a/pkgs/development/libraries/python-qt/default.nix +++ b/pkgs/development/libraries/python-qt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, qmake, +{ lib, stdenv, fetchurl, python, qmake, qtwebengine, qtxmlpatterns, qttools, unzip }: @@ -22,6 +22,8 @@ stdenv.mkDerivation rec { "PYTHON_PATH=${python}/bin" "PYTHON_LIB=${python}/lib"]; + dontWrapQtApps = true; + unpackCmd = "unzip $src"; installPhase = '' @@ -32,7 +34,7 @@ stdenv.mkDerivation rec { cp -r ./extensions $out/include/PythonQt ''; - meta = with stdenv.lib; { + meta = with lib; { description = "PythonQt is a dynamic Python binding for the Qt framework. It offers an easy way to embed the Python scripting language into your C++ Qt applications"; homepage = "http://pythonqt.sourceforge.net/"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/qca-qt5/default.nix b/pkgs/development/libraries/qca-qt5/default.nix index 06de3f7c569..e53404557fb 100644 --- a/pkgs/development/libraries/qca-qt5/default.nix +++ b/pkgs/development/libraries/qca-qt5/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, openssl, pkgconfig, qtbase }: +{ lib, stdenv, fetchurl, cmake, openssl, pkg-config, qtbase }: stdenv.mkDerivation rec { pname = "qca-qt5"; @@ -10,19 +10,21 @@ stdenv.mkDerivation rec { }; buildInputs = [ openssl qtbase ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; + + dontWrapQtApps = true; # Without this patch cmake fails with a "No known features for CXX compiler" # error on darwin - patches = stdenv.lib.optional stdenv.isDarwin ./move-project.patch ; + patches = lib.optional stdenv.isDarwin ./move-project.patch ; # tells CMake to use this CA bundle file if it is accessible - preConfigure = ''export QC_CERTSTORE_PATH=/etc/ssl/certs/ca-certificates.crt''; + preConfigure = "export QC_CERTSTORE_PATH=/etc/ssl/certs/ca-certificates.crt"; # tricks CMake into using this CA bundle file if it is not accessible (in a sandbox) cmakeFlags = [ "-Dqca_CERTSTORE=/etc/ssl/certs/ca-certificates.crt" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Qt 5 Cryptographic Architecture"; homepage = "http://delta.affinix.com/qca"; maintainers = with maintainers; [ ttuegel ]; diff --git a/pkgs/development/libraries/qca2/default.nix b/pkgs/development/libraries/qca2/default.nix index 6520d4a64a3..42dcf1a87d3 100644 --- a/pkgs/development/libraries/qca2/default.nix +++ b/pkgs/development/libraries/qca2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, cmake, pkgconfig, qt, darwin }: +{ lib, stdenv, fetchurl, openssl, cmake, pkg-config, qt, darwin }: stdenv.mkDerivation rec { pname = "qca"; @@ -9,9 +9,9 @@ stdenv.mkDerivation rec { sha256 = "00kv1vsrc8fp556hm8s6yw3240vx3l4067q6vfxrb3gdwgcd45np"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ openssl qt ] - ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; # tells CMake to use this CA bundle file if it is accessible preConfigure = '' @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { sed -i -e '1i cmake_policy(SET CMP0025 NEW)' CMakeLists.txt ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Qt Cryptographic Architecture"; license = "LGPL"; homepage = "http://delta.affinix.com/qca"; diff --git a/pkgs/development/libraries/qgnomeplatform/default.nix b/pkgs/development/libraries/qgnomeplatform/default.nix index 3ff642bbfb9..f739c1bc275 100644 --- a/pkgs/development/libraries/qgnomeplatform/default.nix +++ b/pkgs/development/libraries/qgnomeplatform/default.nix @@ -2,7 +2,7 @@ , lib , fetchFromGitHub , nix-update-script -, pkgconfig +, pkg-config , gtk3 , glib , qtbase @@ -33,7 +33,7 @@ mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config qmake ]; diff --git a/pkgs/development/libraries/qhull/default.nix b/pkgs/development/libraries/qhull/default.nix index 689a4877541..78e11135311 100644 --- a/pkgs/development/libraries/qhull/default.nix +++ b/pkgs/development/libraries/qhull/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation { name = "qhull-2016.1"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.qhull.org/"; description = "Compute the convex hull, Delaunay triangulation, Voronoi diagram and more"; license = licenses.qhull; diff --git a/pkgs/development/libraries/qimageblitz/default.nix b/pkgs/development/libraries/qimageblitz/default.nix index 899f1d1f00b..709a3fb1533 100644 --- a/pkgs/development/libraries/qimageblitz/default.nix +++ b/pkgs/development/libraries/qimageblitz/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cmake, qt4}: +{lib, stdenv, fetchurl, cmake, qt4}: let pn = "qimageblitz"; @@ -20,8 +20,8 @@ stdenv.mkDerivation { meta = { description = "Graphical effect and filter library for KDE4"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; homepage = "http://${pn}.sourceforge.net"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/qjson/default.nix b/pkgs/development/libraries/qjson/default.nix index ee1c36c3244..a6ee272a38b 100644 --- a/pkgs/development/libraries/qjson/default.nix +++ b/pkgs/development/libraries/qjson/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, qt4 }: +{ lib, stdenv, fetchFromGitHub, cmake, qt4 }: stdenv.mkDerivation rec { version = "0.9.0"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ qt4 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Lightweight data-interchange format"; homepage = "http://qjson.sourceforge.net/"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/qmlbox2d/default.nix b/pkgs/development/libraries/qmlbox2d/default.nix index 03247f9d695..f5257ad0e8e 100644 --- a/pkgs/development/libraries/qmlbox2d/default.nix +++ b/pkgs/development/libraries/qmlbox2d/default.nix @@ -1,4 +1,4 @@ -{stdenv, qtdeclarative, fetchFromGitHub, qmake }: +{lib, stdenv, qtdeclarative, fetchFromGitHub, qmake }: stdenv.mkDerivation { name = "qml-box2d-2018-04-06"; src = fetchFromGitHub { @@ -9,6 +9,7 @@ stdenv.mkDerivation { }; enableParallelBuilding = true; + dontWrapQtApps = true; nativeBuildInputs = [ qmake ]; buildInputs = [ qtdeclarative ]; @@ -21,7 +22,7 @@ stdenv.mkDerivation { installFlags = [ "INSTALL_ROOT=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A QML plugin for Box2D engine"; homepage = "https://github.com/qml-box2d/qml-box2d"; maintainers = [ maintainers.guibou ]; diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix index 53e83182c2b..7914af08df6 100644 --- a/pkgs/development/libraries/qmltermwidget/default.nix +++ b/pkgs/development/libraries/qmltermwidget/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qtbase, qtquick1, qmake, qtmultimedia, utmp, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, qtbase, qtquick1, qmake, qtmultimedia, utmp, fetchpatch }: stdenv.mkDerivation { version = "2018-11-24"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { }; buildInputs = [ qtbase qtquick1 qtmultimedia ] - ++ stdenv.lib.optional stdenv.isDarwin utmp; + ++ lib.optional stdenv.isDarwin utmp; nativeBuildInputs = [ qmake ]; patches = [ @@ -32,11 +32,13 @@ stdenv.mkDerivation { enableParallelBuilding = true; + dontWrapQtApps = true; + meta = { description = "A QML port of qtermwidget"; homepage = "https://github.com/Swordfish90/qmltermwidget"; - license = stdenv.lib.licenses.gpl2; - platforms = with stdenv.lib.platforms; linux ++ darwin; - maintainers = with stdenv.lib.maintainers; [ skeidel ]; + license = lib.licenses.gpl2; + platforms = with lib.platforms; linux ++ darwin; + maintainers = with lib.maintainers; [ skeidel ]; }; } diff --git a/pkgs/development/libraries/qoauth/default.nix b/pkgs/development/libraries/qoauth/default.nix index 41e4b80d9c3..2b0be6f0b3d 100644 --- a/pkgs/development/libraries/qoauth/default.nix +++ b/pkgs/development/libraries/qoauth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qtbase, qmake, qca-qt5 }: +{ lib, stdenv, fetchurl, qtbase, qmake, qca-qt5 }: stdenv.mkDerivation { name = "qoauth-2.0.0"; @@ -21,7 +21,9 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-I${qca-qt5}/include/Qca-qt5/QtCrypto"; NIX_LDFLAGS = "-lqca-qt5"; - meta = with stdenv.lib; { + dontWrapQtApps = true; + + meta = with lib; { description = "Qt library for OAuth authentication"; inherit (qtbase.meta) platforms; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix index a427bd5d051..aba9e77691a 100644 --- a/pkgs/development/libraries/qpdf/default.nix +++ b/pkgs/development/libraries/qpdf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libjpeg, zlib, perl }: +{ lib, stdenv, fetchFromGitHub, libjpeg, zlib, perl }: stdenv.mkDerivation rec { pname = "qpdf"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { doCheck = true; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://qpdf.sourceforge.net/"; description = "A C++ library and set of programs that inspect and manipulate the structure of PDF files"; license = licenses.asl20; # as of 7.0.0, people may stay at artistic2 diff --git a/pkgs/development/libraries/qrcodegen/default.nix b/pkgs/development/libraries/qrcodegen/default.nix index b5faaf90ef7..80ce9e1d0f8 100644 --- a/pkgs/development/libraries/qrcodegen/default.nix +++ b/pkgs/development/libraries/qrcodegen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "qrcodegen"; version = "1.6.0"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { cp qrcodegen.h $out/include/qrcodegen/ ''; - meta = with stdenv.lib; + meta = with lib; { description = "qrcode generator library in multiple languages"; diff --git a/pkgs/development/libraries/qrencode/default.nix b/pkgs/development/libraries/qrencode/default.nix index 2c60c4c10d0..c005b835a93 100644 --- a/pkgs/development/libraries/qrencode/default.nix +++ b/pkgs/development/libraries/qrencode/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, SDL2, libpng, libiconv }: +{ lib, stdenv, fetchurl, pkg-config, SDL2, libpng, libiconv }: stdenv.mkDerivation rec { pname = "qrencode"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-2kSO1PUqumvLDNSMrA3VG4aSvMxM0SdDFAL8pvgXHo4="; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ SDL2 libpng ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ SDL2 libpng ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; configureFlags = [ "--with-tests" @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { runHook postCheck ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://fukuchi.org/works/qrencode/"; description = "C library for encoding data in a QR Code symbol"; diff --git a/pkgs/development/libraries/qrupdate/default.nix b/pkgs/development/libraries/qrupdate/default.nix index b941021cb68..ad7e88d4647 100644 --- a/pkgs/development/libraries/qrupdate/default.nix +++ b/pkgs/development/libraries/qrupdate/default.nix @@ -1,4 +1,5 @@ { stdenv +, lib , fetchurl , gfortran , blas @@ -24,7 +25,7 @@ stdenv.mkDerivation rec { "LAPACK=-L${lapack}/lib -llapack" "BLAS=-L${blas}/lib -lblas" "PREFIX=${placeholder "out"}" - ${stdenv.lib.optionalString blas.isILP64 + ${lib.optionalString blas.isILP64 # If another application intends to use qrupdate compiled with blas with # 64 bit support, it should add this to it's FFLAGS as well. See (e.g): # https://savannah.gnu.org/bugs/?50339 @@ -39,13 +40,13 @@ stdenv.mkDerivation rec { buildFlags = [ "lib" "solib" ]; - installTargets = stdenv.lib.optionals stdenv.isDarwin [ "install-staticlib" "install-shlib" ]; + installTargets = lib.optionals stdenv.isDarwin [ "install-staticlib" "install-shlib" ]; buildInputs = [ gfortran ]; nativeBuildInputs = [ which ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for fast updating of qr and cholesky decompositions"; homepage = "https://sourceforge.net/projects/qrupdate/"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix index 19aebd715d6..314bdabdb55 100644 --- a/pkgs/development/libraries/qscintilla/default.nix +++ b/pkgs/development/libraries/qscintilla/default.nix @@ -35,6 +35,7 @@ in stdenv.mkDerivation rec { ''; enableParallelBuilding = true; + dontWrapQtApps = true; postPatch = '' substituteInPlace qscintilla.pro \ @@ -46,7 +47,7 @@ in stdenv.mkDerivation rec { --replace '$$[QT_INSTALL_DATA]' $out/share${lib.optionalString (! withQt5) "/qt"} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A Qt port of the Scintilla text editing library"; longDescription = '' QScintilla is a port to Qt of Neil Hodgson's Scintilla C++ editor diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index f5837717622..b2d818a2972 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/pkgs/development/libraries/qt-3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , xftSupport ? true, libXft ? null , xrenderSupport ? true, libXrender ? null , xrandrSupport ? true, libXrandr ? null @@ -6,8 +6,8 @@ , cursorSupport ? true, libXcursor ? null , threadSupport ? true , mysqlSupport ? false, libmysqlclient ? null -, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms -, openglSupport ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms +, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms +, openglSupport ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms , libGL ? null, libGLU ? null, libXmu ? null , xlibsWrapper, xorgproto, zlib, libjpeg, libpng, which }: @@ -37,7 +37,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; configureFlags = let - mk = cond: name: "-${stdenv.lib.optionalString (!cond) "no-"}${name}"; + mk = cond: name: "-${lib.optionalString (!cond) "no-"}${name}"; in [ "-v" "-system-zlib" "-system-libpng" "-system-libjpeg" @@ -49,21 +49,21 @@ stdenv.mkDerivation { (mk xineramaSupport "xinerama") (mk xrandrSupport "xrandr") (mk xftSupport "xft") - ] ++ stdenv.lib.optionals openglSupport [ + ] ++ lib.optionals openglSupport [ "-dlopen-opengl" "-L${libGL}/lib" "-I${libGLU}/include" "-L${libXmu.out}/lib" "-I${libXmu.dev}/include" - ] ++ stdenv.lib.optionals xrenderSupport [ + ] ++ lib.optionals xrenderSupport [ "-L${libXrender.out}/lib" "-I${libXrender.dev}/include" - ] ++ stdenv.lib.optionals xrandrSupport [ + ] ++ lib.optionals xrandrSupport [ "-L${libXrandr.out}/lib" "-I${libXrandr.dev}/include" - ] ++ stdenv.lib.optionals xineramaSupport [ + ] ++ lib.optionals xineramaSupport [ "-L${libXinerama.out}/lib" "-I${libXinerama.dev}/include" - ] ++ stdenv.lib.optionals cursorSupport [ + ] ++ lib.optionals cursorSupport [ "-L${libXcursor.out}/lib -I${libXcursor.dev}/include" - ] ++ stdenv.lib.optionals mysqlSupport [ + ] ++ lib.optionals mysqlSupport [ "-qt-sql-mysql" "-L${libmysqlclient}/lib/mysql" "-I${libmysqlclient}/include/mysql" - ] ++ stdenv.lib.optionals xftSupport [ + ] ++ lib.optionals xftSupport [ "-L${libXft.out}/lib" "-I${libXft.dev}/include" "-L${libXft.freetype.out}/lib" "-I${libXft.freetype.dev}/include" "-L${libXft.fontconfig.lib}/lib" "-I${libXft.fontconfig.dev}/include" @@ -85,7 +85,7 @@ stdenv.mkDerivation { passthru = {inherit mysqlSupport;}; - meta = with stdenv.lib; { + meta = with lib; { license = with licenses; [ gpl2 qpl ]; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 3deea882bb6..7dddd2bc67d 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -1,10 +1,10 @@ { stdenv, lib, fetchurl, fetchpatch, substituteAll , libXrender, libXinerama, libXcursor, libXv, libXext , libXfixes, libXrandr, libSM, freetype, fontconfig, zlib, libjpeg, libpng -, libmng, which, libGLU, openssl, dbus, cups, pkgconfig +, libmng, which, libGLU, openssl, dbus, cups, pkg-config , libtiff, glib, icu, libmysqlclient, postgresql, sqlite, perl, coreutils, libXi , alsaLib -, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms +, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms , flashplayerFix ? false, gdk-pixbuf , gtkStyle ? stdenv.hostPlatform == stdenv.buildPlatform, gtk2 , gnomeStyle ? false, libgnomeui, GConf, gnome_vfs @@ -199,7 +199,7 @@ stdenv.mkDerivation rec { ++ lib.optionals gtkStyle [ gtk2 gdk-pixbuf ] ++ lib.optionals stdenv.isDarwin [ ApplicationServices OpenGL Cocoa AGL libcxx libobjc ]; - nativeBuildInputs = [ perl pkgconfig which ]; + nativeBuildInputs = [ perl pkg-config which ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix index 87a88ddf9b0..b72d9070ce2 100644 --- a/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/pkgs/development/libraries/qt-5/5.12/default.nix @@ -16,7 +16,7 @@ top-level attribute to `top-level/all-packages.nix`. { newScope, - stdenv, fetchurl, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper, + lib, stdenv, fetchurl, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper, bison, cups ? null, harfbuzz, libGL, perl, gstreamer, gst-plugins-base, gtk3, dconf, llvmPackages_5, @@ -27,7 +27,7 @@ top-level attribute to `top-level/all-packages.nix`. debug ? false, }: -with stdenv.lib; +with lib; let @@ -89,15 +89,6 @@ let sha256 = "1gv733qfdn9746nbqqxzyjx4ijjqkkb7zb71nxax49nna5bri3am"; }) - # Fix build with bison-3.7: https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?id=1a53f599 - (fetchpatch { - name = "qtwebengine-bison-3.7-build.patch"; - url = "https://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch/?id=1a53f599"; - sha256 = "1nqpyn5fq37q7i9nasag6i14lnz0d7sld5ikqhlm8qwq9d7gbmjy"; - stripLen = 1; - extraPrefix = "src/3rdparty/"; - }) - ./qtwebengine-darwin-no-platform-check.patch ./qtwebengine-darwin-fix-failed-static-assertion.patch ]; @@ -119,12 +110,12 @@ let import ../qtModule.nix { inherit perl; - inherit (stdenv) lib; + inherit lib; # Use a variant of mkDerivation that does not include wrapQtApplications # to avoid cyclic dependencies between Qt modules. mkDerivation = import ../mkDerivation.nix - { inherit (stdenv) lib; inherit debug; wrapQtAppsHook = null; } + { inherit lib; inherit debug; wrapQtAppsHook = null; } stdenvActual.mkDerivation; } { inherit self srcs patches; }; @@ -136,7 +127,7 @@ let mkDerivationWith = import ../mkDerivation.nix - { inherit (stdenv) lib; inherit debug; inherit (self) wrapQtAppsHook; }; + { inherit lib; inherit debug; inherit (self) wrapQtAppsHook; }; mkDerivation = mkDerivationWith stdenvActual.mkDerivation; @@ -145,7 +136,7 @@ let patches = patches.qtbase; inherit bison cups harfbuzz libGL; withGtk3 = true; inherit dconf gtk3; - inherit developerBuild decryptSslTraffic; + inherit debug developerBuild decryptSslTraffic; }; qtcharts = callPackage ../modules/qtcharts.nix {}; @@ -197,6 +188,7 @@ let qmake = makeSetupHook { deps = [ self.qtbase.dev ]; substitutions = { + inherit debug; fix_qmake_libtool = ../hooks/fix-qmake-libtool.sh; }; } ../hooks/qmake-hook.sh; diff --git a/pkgs/development/libraries/qt-5/5.12/fetch.sh b/pkgs/development/libraries/qt-5/5.12/fetch.sh index e93c9acd3f0..6d2cf551dd5 100644 --- a/pkgs/development/libraries/qt-5/5.12/fetch.sh +++ b/pkgs/development/libraries/qt-5/5.12/fetch.sh @@ -1,2 +1,2 @@ -WGET_ARGS=( http://download.qt.io/official_releases/qt/5.12/5.12.9/submodules/ \ +WGET_ARGS=( http://download.qt.io/official_releases/qt/5.12/5.12.10/submodules/ \ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/qt-5/5.12/srcs.nix b/pkgs/development/libraries/qt-5/5.12/srcs.nix index f2ed6d13714..03f8973766a 100644 --- a/pkgs/development/libraries/qt-5/5.12/srcs.nix +++ b/pkgs/development/libraries/qt-5/5.12/srcs.nix @@ -4,323 +4,323 @@ { qt3d = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qt3d-everywhere-src-5.12.9.tar.xz"; - sha256 = "6fcde8c99bc5d09a5d2de99cab10c6f662d7db48139e6d5a3904fa0c580070ad"; - name = "qt3d-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qt3d-everywhere-src-5.12.10.tar.xz"; + sha256 = "1fnhdy0vwh1npq04pw3lzb15rsp0nx8wh57c8lvz9jn945xwc3vd"; + name = "qt3d-everywhere-src-5.12.10.tar.xz"; }; }; qtactiveqt = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtactiveqt-everywhere-src-5.12.9.tar.xz"; - sha256 = "e9df2dacfa4f93b42753066d14d3c504a30b259c177b366e32e6119f714f6527"; - name = "qtactiveqt-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtactiveqt-everywhere-src-5.12.10.tar.xz"; + sha256 = "0lf96ziba5g8izwcjzzaf4n2j336j6627rb3dzwvmsdkd9168zax"; + name = "qtactiveqt-everywhere-src-5.12.10.tar.xz"; }; }; qtandroidextras = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtandroidextras-everywhere-src-5.12.9.tar.xz"; - sha256 = "d6ab58d382feb1d79b7f28033eaa15ecab0c1f97c760fad50f20608189ab1a95"; - name = "qtandroidextras-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtandroidextras-everywhere-src-5.12.10.tar.xz"; + sha256 = "0blapv4jd80wcvzp96zxlrsyca7lwax17y6yij1d14a51353hrnc"; + name = "qtandroidextras-everywhere-src-5.12.10.tar.xz"; }; }; qtbase = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtbase-everywhere-src-5.12.9.tar.xz"; - sha256 = "331dafdd0f3e8623b51bd0da2266e7e7c53aa8e9dc28a8eb6f0b22609c5d337e"; - name = "qtbase-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtbase-everywhere-src-5.12.10.tar.xz"; + sha256 = "0h39r3irahdms4gidg5l4a1kr7kagc4bd0y02sapg3njwrsg3240"; + name = "qtbase-everywhere-src-5.12.10.tar.xz"; }; }; qtcanvas3d = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtcanvas3d-everywhere-src-5.12.9.tar.xz"; - sha256 = "351b105507b97e61eef17a5ce8a96fe090a523101e41c20ea373266203dd3ca0"; - name = "qtcanvas3d-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtcanvas3d-everywhere-src-5.12.10.tar.xz"; + sha256 = "0pbxw89m2s19yk2985c49msd7s1mapydka9b7nzg9phs9nrzvf1m"; + name = "qtcanvas3d-everywhere-src-5.12.10.tar.xz"; }; }; qtcharts = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtcharts-everywhere-src-5.12.9.tar.xz"; - sha256 = "9fc2a64a96b73746389c257684af557e70c5360bead53d61d059f968efdc5b04"; - name = "qtcharts-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtcharts-everywhere-src-5.12.10.tar.xz"; + sha256 = "0cndm8llvfl9jdzn34b886gxgxwsibb24amhblh96cadhhkpwadc"; + name = "qtcharts-everywhere-src-5.12.10.tar.xz"; }; }; qtconnectivity = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtconnectivity-everywhere-src-5.12.9.tar.xz"; - sha256 = "e5457ebc22059954bba6a08b03fd1e6f30e4c8f3146636065bf12c2e6044f41c"; - name = "qtconnectivity-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtconnectivity-everywhere-src-5.12.10.tar.xz"; + sha256 = "19l816zfpx87vwzj18mbib5x3mb9hy1msacpy8i9bagfw9p0i6c0"; + name = "qtconnectivity-everywhere-src-5.12.10.tar.xz"; }; }; qtdatavis3d = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtdatavis3d-everywhere-src-5.12.9.tar.xz"; - sha256 = "0cd4f7535bf26e4e59f89fac991fc8a400bd6193680578f31693235f185f4562"; - name = "qtdatavis3d-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtdatavis3d-everywhere-src-5.12.10.tar.xz"; + sha256 = "1ximhph17kkh40v2ksk51lq21mbjs2ajyf5l32ckhc7n7bmaryb6"; + name = "qtdatavis3d-everywhere-src-5.12.10.tar.xz"; }; }; qtdeclarative = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtdeclarative-everywhere-src-5.12.9.tar.xz"; - sha256 = "c11ae68aedcdea7e721ec22a95265ac91b5e128a5c12d3b61b5b732d3a02be80"; - name = "qtdeclarative-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtdeclarative-everywhere-src-5.12.10.tar.xz"; + sha256 = "05la1zlijcaargfh4ljnmxvvksdwzl409wl7w3m96kwm8s370mmf"; + name = "qtdeclarative-everywhere-src-5.12.10.tar.xz"; }; }; qtdoc = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtdoc-everywhere-src-5.12.9.tar.xz"; - sha256 = "a9d751af85a07bdfc2a30e8f1b08aa249547a8100801f286e77280a9c9ede624"; - name = "qtdoc-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtdoc-everywhere-src-5.12.10.tar.xz"; + sha256 = "0ljc29hnn8knncvq8hsk0rdcwrxbsk1ywlprknkvyb4pggp9rkp6"; + name = "qtdoc-everywhere-src-5.12.10.tar.xz"; }; }; qtgamepad = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtgamepad-everywhere-src-5.12.9.tar.xz"; - sha256 = "da3333af6b9dccd7dd3a25b01de65e317fe4b70b9d39eeb84e01c232063211fe"; - name = "qtgamepad-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtgamepad-everywhere-src-5.12.10.tar.xz"; + sha256 = "1bs50wghy3n8af656angkkkaac0swkq3mfllg3dkjg236ngzdhdh"; + name = "qtgamepad-everywhere-src-5.12.10.tar.xz"; }; }; qtgraphicaleffects = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtgraphicaleffects-everywhere-src-5.12.9.tar.xz"; - sha256 = "1eb4b913d5cb6d0b46a231288b9717f4785fbd212936e98a8b2a8c9024e3a8bf"; - name = "qtgraphicaleffects-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtgraphicaleffects-everywhere-src-5.12.10.tar.xz"; + sha256 = "0hnsb757ircqmid34d0cxbh0mi4qnil22k5ka9a1b8xy00ydkfky"; + name = "qtgraphicaleffects-everywhere-src-5.12.10.tar.xz"; }; }; qtimageformats = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtimageformats-everywhere-src-5.12.9.tar.xz"; - sha256 = "cd8193698f830cce30959564c191e7bb698877aca3a263c652b4a23907c72b6a"; - name = "qtimageformats-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtimageformats-everywhere-src-5.12.10.tar.xz"; + sha256 = "1bh38xp4v914ksg91p9pij1gsdzs3y7sn7diy3d7wn5i039syn0i"; + name = "qtimageformats-everywhere-src-5.12.10.tar.xz"; }; }; qtlocation = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtlocation-everywhere-src-5.12.9.tar.xz"; - sha256 = "be31870104af2910690850c4e28bab3ccb76f1aa8deef1e870bcbc6b276aa2c1"; - name = "qtlocation-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtlocation-everywhere-src-5.12.10.tar.xz"; + sha256 = "1czg0z69ilnxp1sqk0jawlnyp2gx87yb57g8dwjznqxxvaq744dc"; + name = "qtlocation-everywhere-src-5.12.10.tar.xz"; }; }; qtmacextras = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtmacextras-everywhere-src-5.12.9.tar.xz"; - sha256 = "5458f3e13c37eb8bff8588b29703fb33b61d5ea19989c56c99d36f221e269f35"; - name = "qtmacextras-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtmacextras-everywhere-src-5.12.10.tar.xz"; + sha256 = "0mh9p3f1f22pj4i8yxnn56amy53dapmcikza04ll4fvx5hy340v8"; + name = "qtmacextras-everywhere-src-5.12.10.tar.xz"; }; }; qtmultimedia = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtmultimedia-everywhere-src-5.12.9.tar.xz"; - sha256 = "59a2f2418cefe030094687dff0846fb8957abbc0e060501a4fee40cb4a52838c"; - name = "qtmultimedia-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtmultimedia-everywhere-src-5.12.10.tar.xz"; + sha256 = "0g50jzhwbrl5r0lmfz5ffpkp54mf0zfc8m884x51yn2bnngg366c"; + name = "qtmultimedia-everywhere-src-5.12.10.tar.xz"; }; }; qtnetworkauth = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtnetworkauth-everywhere-src-5.12.9.tar.xz"; - sha256 = "a0979689eda667e299fd9cf5a8859bd9c37eabc0a6d9738103a1143035baf0e4"; - name = "qtnetworkauth-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtnetworkauth-everywhere-src-5.12.10.tar.xz"; + sha256 = "12n3xqlskrk2mbcgz5p613sx219j6rmpq8yn7p97xdv7li61gzl2"; + name = "qtnetworkauth-everywhere-src-5.12.10.tar.xz"; }; }; qtpurchasing = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtpurchasing-everywhere-src-5.12.9.tar.xz"; - sha256 = "565587811b3cfd201907d3fcbf7120783de32a4d1d3c59a9efff3720cf0af3e5"; - name = "qtpurchasing-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtpurchasing-everywhere-src-5.12.10.tar.xz"; + sha256 = "1azdg03vxyk140i9z93x0zzlazbmd3qrqxgwk747jsd1ibns9ddy"; + name = "qtpurchasing-everywhere-src-5.12.10.tar.xz"; }; }; qtquickcontrols = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtquickcontrols-everywhere-src-5.12.9.tar.xz"; - sha256 = "d89084ebccf155f4c966d4a2a188e6e870c37535a7751740960f5c38088373f6"; - name = "qtquickcontrols-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtquickcontrols-everywhere-src-5.12.10.tar.xz"; + sha256 = "1cy9vjl9zf95frnydzljqwbx3is8p8w27kdgszvmb67p6xkpblk7"; + name = "qtquickcontrols-everywhere-src-5.12.10.tar.xz"; }; }; qtquickcontrols2 = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtquickcontrols2-everywhere-src-5.12.9.tar.xz"; - sha256 = "ea1c2864630c6ba2540228f81ec5b582619d5ce9e4cb98e91109b4181a65a31d"; - name = "qtquickcontrols2-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtquickcontrols2-everywhere-src-5.12.10.tar.xz"; + sha256 = "0541n8n012d0xwxrfznv1jwh28d35mdx6cl8jadsaxaspgwz4vb3"; + name = "qtquickcontrols2-everywhere-src-5.12.10.tar.xz"; }; }; qtremoteobjects = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtremoteobjects-everywhere-src-5.12.9.tar.xz"; - sha256 = "f87af7e9931280f2b44a529dc174cae14247e1b50f9dc9bde8966adb0406babd"; - name = "qtremoteobjects-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtremoteobjects-everywhere-src-5.12.10.tar.xz"; + sha256 = "147p0xdi22xz2d3501ig78bs97gbyz8ccyhn6dhbw2yalx33gma6"; + name = "qtremoteobjects-everywhere-src-5.12.10.tar.xz"; }; }; qtscript = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtscript-everywhere-src-5.12.9.tar.xz"; - sha256 = "8f2e12e37ff1e7629923cf3b9d446f85e005b2248386e33879ba3b790f1416df"; - name = "qtscript-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtscript-everywhere-src-5.12.10.tar.xz"; + sha256 = "1cfcfwq4shr6yphgwq2jnvgzjjqjrz10qnzr7dccksmfg3i0ad02"; + name = "qtscript-everywhere-src-5.12.10.tar.xz"; }; }; qtscxml = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtscxml-everywhere-src-5.12.9.tar.xz"; - sha256 = "d68d04d83366f11b10a101766baf5253e53ad76a683e0bc15e7dd403d475e61c"; - name = "qtscxml-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtscxml-everywhere-src-5.12.10.tar.xz"; + sha256 = "057zchhm1s5ly2a685y4105pgmzgqp1jkkf9w0ca8xd05z4clb4r"; + name = "qtscxml-everywhere-src-5.12.10.tar.xz"; }; }; qtsensors = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtsensors-everywhere-src-5.12.9.tar.xz"; - sha256 = "77054e2449bcac786cc8f07c0d65c503a22bc629af4844259ff0def27b9889e9"; - name = "qtsensors-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtsensors-everywhere-src-5.12.10.tar.xz"; + sha256 = "10f00njvc7kwjci0g4g3pibl9ra798iplvj2ymql3zppxqqdq25m"; + name = "qtsensors-everywhere-src-5.12.10.tar.xz"; }; }; qtserialbus = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtserialbus-everywhere-src-5.12.9.tar.xz"; - sha256 = "08b16363a47f9b41f87e3b7cf63eaed2435bb6b7e27775c9717ff863e56141ed"; - name = "qtserialbus-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtserialbus-everywhere-src-5.12.10.tar.xz"; + sha256 = "0zd0crs2nrsvncj070fl05g0nm3j5bf16g54c7m9603b6q7bryrx"; + name = "qtserialbus-everywhere-src-5.12.10.tar.xz"; }; }; qtserialport = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtserialport-everywhere-src-5.12.9.tar.xz"; - sha256 = "24a10b65b03fc598acd30f4a52b0b71218e9c03ec4bb31a4ca50aae1b52a986d"; - name = "qtserialport-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtserialport-everywhere-src-5.12.10.tar.xz"; + sha256 = "0anndf6pyssiygj0kk2j80vwil2z0765gccs87djhsni1xvk3n9r"; + name = "qtserialport-everywhere-src-5.12.10.tar.xz"; }; }; qtspeech = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtspeech-everywhere-src-5.12.9.tar.xz"; - sha256 = "2efdaf5f49d2fad4a6c4cde12dfee2ff2c66ab4298f22d6c203ecd6019186847"; - name = "qtspeech-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtspeech-everywhere-src-5.12.10.tar.xz"; + sha256 = "11fycm604r1xswb9dg1g568jxd68zd9m2dzfy4qda6sr4mdaj6jg"; + name = "qtspeech-everywhere-src-5.12.10.tar.xz"; }; }; qtsvg = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtsvg-everywhere-src-5.12.9.tar.xz"; - sha256 = "32ec251e411d31734b873dd82fd68b6a3142227fdf06fe6ad879f16997fb98d2"; - name = "qtsvg-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtsvg-everywhere-src-5.12.10.tar.xz"; + sha256 = "0jrkz8y225g93pznsvc1icanxxc5cfm23ic2y6rprqaqw77z9zxm"; + name = "qtsvg-everywhere-src-5.12.10.tar.xz"; }; }; qttools = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qttools-everywhere-src-5.12.9.tar.xz"; - sha256 = "002dc23410a9d1af6f1cfc696ee18fd3baeddbbfeb9758ddb04bbdb17b2fffdf"; - name = "qttools-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qttools-everywhere-src-5.12.10.tar.xz"; + sha256 = "0v339a1w3kqvfl8hcds032g8zafp8d4c1b2rzihpq6y4mbksdkxh"; + name = "qttools-everywhere-src-5.12.10.tar.xz"; }; }; qttranslations = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qttranslations-everywhere-src-5.12.9.tar.xz"; - sha256 = "50bd3a329e86f14af05ef0dbef94c7a6cd6c1f89ca4d008088a44ba76e6ecf40"; - name = "qttranslations-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qttranslations-everywhere-src-5.12.10.tar.xz"; + sha256 = "1pjkkkkjvs9harz70sir67yf3i528vyn1shmi09hlzlb23nmipp1"; + name = "qttranslations-everywhere-src-5.12.10.tar.xz"; }; }; qtvirtualkeyboard = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtvirtualkeyboard-everywhere-src-5.12.9.tar.xz"; - sha256 = "7598ee3312a2f4e72edf363c16c506740a8b91c5c06544da068a3c0d73f7f807"; - name = "qtvirtualkeyboard-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtvirtualkeyboard-everywhere-src-5.12.10.tar.xz"; + sha256 = "0afw3lj5cg3zj0hzxlhz5l7s1j2y491yxwylc4vchbqjpyvsadgg"; + name = "qtvirtualkeyboard-everywhere-src-5.12.10.tar.xz"; }; }; qtwayland = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtwayland-everywhere-src-5.12.9.tar.xz"; - sha256 = "6f416948a98586b9c13c46b36be5ac6bb96a1dde9f50123b5e6dcdd102e9d77e"; - name = "qtwayland-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtwayland-everywhere-src-5.12.10.tar.xz"; + sha256 = "1bs61xmc4l03w21wkrxx0llfg5bbnq5ij7w0bnfkx3rk0vncy0q6"; + name = "qtwayland-everywhere-src-5.12.10.tar.xz"; }; }; qtwebchannel = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtwebchannel-everywhere-src-5.12.9.tar.xz"; - sha256 = "d55a06a0929c86664496e1113e74425d56d175916acd8abbb95c371eb16b43eb"; - name = "qtwebchannel-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtwebchannel-everywhere-src-5.12.10.tar.xz"; + sha256 = "1jmprqgavqwknnnl6qp0psxz7bc69ivxhm7y4qci95vpx9k5yjg8"; + name = "qtwebchannel-everywhere-src-5.12.10.tar.xz"; }; }; qtwebengine = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtwebengine-everywhere-src-5.12.9.tar.xz"; - sha256 = "27a9a19e4deb5e7a0fabc13e38fe5a8818730c92f6a343b9084aa17977468e25"; - name = "qtwebengine-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtwebengine-everywhere-src-5.12.10.tar.xz"; + sha256 = "16zbyfc7qy9f20anfrdi25f6nf1j7zw8kps60mqb18nfjw411d50"; + name = "qtwebengine-everywhere-src-5.12.10.tar.xz"; }; }; qtwebglplugin = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtwebglplugin-everywhere-src-5.12.9.tar.xz"; - sha256 = "cb7ba4cb66900e5d4315809e2b5ad3e4e381d576a14f6224f8ea58373f997c42"; - name = "qtwebglplugin-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtwebglplugin-everywhere-src-5.12.10.tar.xz"; + sha256 = "0nhim67rl9dbshnarismnd54qzks8v14a08h8qi7x0dm9bj9ij7q"; + name = "qtwebglplugin-everywhere-src-5.12.10.tar.xz"; }; }; qtwebsockets = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtwebsockets-everywhere-src-5.12.9.tar.xz"; - sha256 = "08a92c36d52b4d93a539a950698bb2912ea36055015d421f874bf672637f21ef"; - name = "qtwebsockets-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtwebsockets-everywhere-src-5.12.10.tar.xz"; + sha256 = "0p74ds53d3a30i7pq85b9ql9i4z1p0yyanhmaizw2bv9225py4jr"; + name = "qtwebsockets-everywhere-src-5.12.10.tar.xz"; }; }; qtwebview = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtwebview-everywhere-src-5.12.9.tar.xz"; - sha256 = "3e0506411d101cc08232946bcacef2fb90884c27eb91eeb97a1a68ed3788a7b6"; - name = "qtwebview-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtwebview-everywhere-src-5.12.10.tar.xz"; + sha256 = "07pz7wfhyijfdlxnaqpn4hwgvpglma6dfmkcb8xw6hfhg30riaxd"; + name = "qtwebview-everywhere-src-5.12.10.tar.xz"; }; }; qtwinextras = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtwinextras-everywhere-src-5.12.9.tar.xz"; - sha256 = "7bab5053197148a5e1609cab12331e4a3f2e1a86bcbde137948330b288803754"; - name = "qtwinextras-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtwinextras-everywhere-src-5.12.10.tar.xz"; + sha256 = "1x5k0z0p94zppqsw2fz8ki9v5abf0crzva16wllznn89ylqjyn0j"; + name = "qtwinextras-everywhere-src-5.12.10.tar.xz"; }; }; qtx11extras = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtx11extras-everywhere-src-5.12.9.tar.xz"; - sha256 = "09432392641b56205cbcda6be89d0835bfecad64ad61713a414b951b740c9cec"; - name = "qtx11extras-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtx11extras-everywhere-src-5.12.10.tar.xz"; + sha256 = "0xk10iynkfs31vgpadrmw30k4s1hlnggxy2f3q988qyqd37dh5h8"; + name = "qtx11extras-everywhere-src-5.12.10.tar.xz"; }; }; qtxmlpatterns = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtxmlpatterns-everywhere-src-5.12.9.tar.xz"; - sha256 = "8d0e92fce6b4cbe7f1ecd1e90f6c7d71681b9b8870a577c0b18cadd93b8713b2"; - name = "qtxmlpatterns-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtxmlpatterns-everywhere-src-5.12.10.tar.xz"; + sha256 = "1qg09yxagz36sry03kv3swwfjc8lrik1asjk2lxlpzzcl2q95lbv"; + name = "qtxmlpatterns-everywhere-src-5.12.10.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/qt-5/5.14/default.nix b/pkgs/development/libraries/qt-5/5.14/default.nix index 926510293b5..3563a1991c1 100644 --- a/pkgs/development/libraries/qt-5/5.14/default.nix +++ b/pkgs/development/libraries/qt-5/5.14/default.nix @@ -16,7 +16,7 @@ top-level attribute to `top-level/all-packages.nix`. { newScope, - stdenv, fetchurl, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper, + lib, stdenv, fetchurl, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper, bison, cups ? null, harfbuzz, libGL, perl, gstreamer, gst-plugins-base, gtk3, dconf, llvmPackages_5, @@ -27,7 +27,7 @@ top-level attribute to `top-level/all-packages.nix`. debug ? false, }: -with stdenv.lib; +with lib; let @@ -123,12 +123,12 @@ let import ../qtModule.nix { inherit perl; - inherit (stdenv) lib; + inherit lib; # Use a variant of mkDerivation that does not include wrapQtApplications # to avoid cyclic dependencies between Qt modules. mkDerivation = import ../mkDerivation.nix - { inherit (stdenv) lib; inherit debug; wrapQtAppsHook = null; } + { inherit lib; inherit debug; wrapQtAppsHook = null; } stdenvActual.mkDerivation; } { inherit self srcs patches; }; @@ -140,7 +140,7 @@ let mkDerivationWith = import ../mkDerivation.nix - { inherit (stdenv) lib; inherit debug; inherit (self) wrapQtAppsHook; }; + { inherit lib; inherit debug; inherit (self) wrapQtAppsHook; }; mkDerivation = mkDerivationWith stdenvActual.mkDerivation; @@ -149,7 +149,7 @@ let patches = patches.qtbase; inherit bison cups harfbuzz libGL; withGtk3 = true; inherit dconf gtk3; - inherit developerBuild decryptSslTraffic; + inherit debug developerBuild decryptSslTraffic; }; qtcharts = callPackage ../modules/qtcharts.nix {}; @@ -199,6 +199,7 @@ let qmake = makeSetupHook { deps = [ self.qtbase.dev ]; substitutions = { + inherit debug; fix_qmake_libtool = ../hooks/fix-qmake-libtool.sh; }; } ../hooks/qmake-hook.sh; diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index 08fd3a9720c..e72335f1d24 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -16,7 +16,7 @@ top-level attribute to `top-level/all-packages.nix`. { newScope, - stdenv, fetchurl, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper, + lib, stdenv, fetchurl, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper, bison, cups ? null, harfbuzz, libGL, perl, gstreamer, gst-plugins-base, gtk3, dconf, llvmPackages_5, @@ -27,7 +27,7 @@ top-level attribute to `top-level/all-packages.nix`. debug ? false, }: -with stdenv.lib; +with lib; let @@ -84,7 +84,10 @@ let qtscript = [ ./qtscript.patch ]; qtserialport = [ ./qtserialport.patch ]; qtwebengine = [ ] - ++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch; + ++ optionals stdenv.isDarwin [ + ./qtwebengine-darwin-no-platform-check.patch + ./qtwebengine-mac-dont-set-dsymutil-path.patch + ]; qtwebkit = [ (fetchpatch { name = "qtwebkit-bison-3.7-build.patch"; @@ -103,12 +106,12 @@ let import ../qtModule.nix { inherit perl; - inherit (stdenv) lib; + inherit lib; # Use a variant of mkDerivation that does not include wrapQtApplications # to avoid cyclic dependencies between Qt modules. mkDerivation = import ../mkDerivation.nix - { inherit (stdenv) lib; inherit debug; wrapQtAppsHook = null; } + { inherit lib; inherit debug; wrapQtAppsHook = null; } stdenvActual.mkDerivation; } { inherit self srcs patches; }; @@ -120,7 +123,7 @@ let mkDerivationWith = import ../mkDerivation.nix - { inherit (stdenv) lib; inherit debug; inherit (self) wrapQtAppsHook; }; + { inherit lib; inherit debug; inherit (self) wrapQtAppsHook; }; mkDerivation = mkDerivationWith stdenvActual.mkDerivation; @@ -179,6 +182,7 @@ let qmake = makeSetupHook { deps = [ self.qtbase.dev ]; substitutions = { + inherit debug; fix_qmake_libtool = ../hooks/fix-qmake-libtool.sh; }; } ../hooks/qmake-hook.sh; diff --git a/pkgs/development/libraries/qt-5/5.15/qtwebengine-darwin-no-platform-check.patch b/pkgs/development/libraries/qt-5/5.15/qtwebengine-darwin-no-platform-check.patch index 546e753144d..44df0929925 100644 --- a/pkgs/development/libraries/qt-5/5.15/qtwebengine-darwin-no-platform-check.patch +++ b/pkgs/development/libraries/qt-5/5.15/qtwebengine-darwin-no-platform-check.patch @@ -1,27 +1,31 @@ -diff --git a/mkspecs/features/platform.prf b/mkspecs/features/platform.prf ---- a/mkspecs/features/platform.prf -+++ b/mkspecs/features/platform.prf -@@ -40,8 +40,6 @@ defineTest(isPlatformSupported) { - } else:osx { - # FIXME: Try to get it back down to 8.2 for building on OS X 10.11 - !isMinXcodeVersion(8, 3, 3) { -- skipBuild("Using Xcode version $$QMAKE_XCODE_VERSION, but at least version 8.3.3 is required to build Qt WebEngine.") -- return(false) +diff a/configure.pri b/configure.pri +--- a/configure.pri ++++ b/configure.pri +@@ -439,8 +439,6 @@ defineTest(qtwebengine_isWindowsPlatformSupported) { + + defineTest(qtwebengine_isMacOsPlatformSupported) { + !qtwebengine_isMinXcodeVersion(10, 0, 0) { +- qtwebengine_platformError("requires at least version 10.0.0, but using Xcode version $${QMAKE_XCODE_VERSION}.") +- return(false) } !clang|intel_icc { - skipBuild("Qt WebEngine on macOS requires Clang.") -@@ -54,8 +52,6 @@ defineTest(isPlatformSupported) { - return(false) + qtwebengine_platformError("requires Clang.") +@@ -449,12 +447,6 @@ defineTest(qtwebengine_isMacOsPlatformSupported) { + # We require macOS 10.13 (darwin version 17.0.0) or newer. + darwin_major_version = $$section(QMAKE_HOST.version, ., 0, 0) + lessThan(darwin_major_version, 17) { +- qtwebengine_platformError("requires macOS version 10.13 or newer.") +- return(false) +- } +- !qtwebengine_isMinOSXSDKVersion(10, 13): { +- qtwebengine_platformError("requires a macOS SDK version of 10.13 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.") +- return(false) } - !isMinOSXSDKVersion(10, 12): { -- skipBuild("Building Qt WebEngine requires a macOS SDK version of 10.12 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.") -- return(false) - } - } else { - skipBuild("Unknown platform. Qt WebEngine only supports Linux, Windows, and macOS.") -diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri ---- a/src/core/config/mac_osx.pri -+++ b/src/core/config/mac_osx.pri + return(true) + } +diff a/src/buildtools/config/mac_osx.pri b/src/buildtools/config/mac_osx.pri +--- a/src/buildtools/config/mac_osx.pri ++++ b/src/buildtools/config/mac_osx.pri @@ -5,8 +5,6 @@ load(functions) # otherwise query for it. QMAKE_MAC_SDK_VERSION = $$eval(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.SDKVersion) @@ -29,5 +33,5 @@ diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri - QMAKE_MAC_SDK_VERSION = $$system("/usr/bin/xcodebuild -sdk $${QMAKE_MAC_SDK} -version SDKVersion 2>/dev/null") - isEmpty(QMAKE_MAC_SDK_VERSION): error("Could not resolve SDK version for \'$${QMAKE_MAC_SDK}\'") } - - QMAKE_CLANG_DIR = "/usr" + + # chromium/build/mac/find_sdk.py expects the SDK version (mac_sdk_min) in Major.Minor format. diff --git a/pkgs/development/libraries/qt-5/5.15/qtwebengine-mac-dont-set-dsymutil-path.patch b/pkgs/development/libraries/qt-5/5.15/qtwebengine-mac-dont-set-dsymutil-path.patch new file mode 100644 index 00000000000..dcdf5f57ffd --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.15/qtwebengine-mac-dont-set-dsymutil-path.patch @@ -0,0 +1,12 @@ +diff a/src/3rdparty/chromium/build/toolchain/mac/BUILD.gn b/src/3rdparty/chromium/build/toolchain/mac/BUILD.gn +--- a/src/3rdparty/chromium/build/toolchain/mac/BUILD.gn ++++ b/src/3rdparty/chromium/build/toolchain/mac/BUILD.gn +@@ -184,8 +184,6 @@ template("mac_toolchain") { + # If dSYMs are enabled, this flag will be added to the link tools. + if (_enable_dsyms) { + dsym_switch = " -Wcrl,dsym,{{root_out_dir}} " +- dsym_switch += "-Wcrl,dsymutilpath," + +- "${prefix}dsymutil" + " " + + dsym_output_dir = + "{{root_out_dir}}/{{target_output_name}}{{output_extension}}.dSYM" diff --git a/pkgs/development/libraries/qt-5/hooks/qmake-hook.sh b/pkgs/development/libraries/qt-5/hooks/qmake-hook.sh index 7f6ddb76ad5..741225a5aa8 100644 --- a/pkgs/development/libraries/qt-5/hooks/qmake-hook.sh +++ b/pkgs/development/libraries/qt-5/hooks/qmake-hook.sh @@ -3,6 +3,9 @@ qmakeFlags=( ${qmakeFlags-} ) qmakePrePhase() { + qmakeFlags_orig=( "${qmakeFlags[@]}" ) + + # These flags must be added _before_ the flags specified in the derivation. qmakeFlags=( \ "PREFIX=$out" \ "NIX_OUTPUT_OUT=$out" \ @@ -11,8 +14,15 @@ qmakePrePhase() { "NIX_OUTPUT_DOC=${!outputDev}/${qtDocPrefix:?}" \ "NIX_OUTPUT_QML=${!outputBin}/${qtQmlPrefix:?}" \ "NIX_OUTPUT_PLUGIN=${!outputBin}/${qtPluginPrefix:?}" \ - "${qmakeFlags[@]}" \ ) + + if [ -n "@debug@" ]; then + qmakeFlags+=( "CONFIG+=debug" ) + else + qmakeFlags+=( "CONFIG+=release" ) + fi + + qmakeFlags+=( "${qmakeFlags_orig[@]}" ) } prePhases+=" qmakePrePhase" diff --git a/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh b/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh index 9f2a9f06f1a..1b57d676e1f 100644 --- a/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh +++ b/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh @@ -1,3 +1,14 @@ +if [[ -n "${__nix_qtbase-}" ]]; then + # Throw an error if a different version of Qt was already set up. + if [[ "$__nix_qtbase" != "@dev@" ]]; then + echo >&2 "Error: detected mismatched Qt dependencies:" + echo >&2 " @dev@" + echo >&2 " $__nix_qtbase" + exit 1 + fi +else # Only set up Qt once. +__nix_qtbase="@dev@" + qtPluginPrefix=@qtPluginPrefix@ qtQmlPrefix=@qtQmlPrefix@ qtDocPrefix=@qtDocPrefix@ @@ -5,6 +16,20 @@ qtDocPrefix=@qtDocPrefix@ . @fix_qt_builtin_paths@ . @fix_qt_module_paths@ +# Disable debug symbols if qtbase was built without debugging. +# This stops -dev paths from leaking into other outputs. +if [ -z "@debug@" ]; then + NIX_CFLAGS_COMPILE="${NIX_CFLAGS_COMPILE-}${NIX_CFLAGS_COMPILE:+ }-DQT_NO_DEBUG" +fi + +# Integration with CMake: +# Set the CMake build type corresponding to how qtbase was built. +if [ -n "@debug@" ]; then + cmakeBuildType="Debug" +else + cmakeBuildType="Release" +fi + providesQtRuntime() { [ -d "$1/$qtPluginPrefix" ] || [ -d "$1/$qtQmlPrefix" ] } @@ -19,7 +44,12 @@ export QMAKEPATH QMAKEMODULES= export QMAKEMODULES +declare -Ag qmakePathSeen=() qmakePathHook() { + # Skip this path if we have seen it before. + # MUST use 'if' because 'qmakePathSeen[$]' may be unset. + if [ -n "${qmakePathSeen[$1]-}" ]; then return; fi + qmakePathSeen[$1]=1 if [ -d "$1/mkspecs" ] then QMAKEMODULES="${QMAKEMODULES}${QMAKEMODULES:+:}/mkspecs" @@ -34,7 +64,12 @@ envBuildHostHooks+=(qmakePathHook) # package depending on the building package. (This is necessary in case # the building package does not provide runtime dependencies itself and so # would not be propagated to the user environment.) +declare -Ag qtEnvHostTargetSeen=() qtEnvHostTargetHook() { + # Skip this path if we have seen it before. + # MUST use 'if' because 'qmakePathSeen[$]' may be unset. + if [ -n "${qtEnvHostTargetSeen[$1]-}" ]; then return; fi + qtEnvHostTargetSeen[$1]=1 if providesQtRuntime "$1" && [ "z${!outputBin}" != "z${!outputDev}" ] then propagatedBuildInputs+=" $1" @@ -64,3 +99,14 @@ postPatchMkspecs() { if [ -z "${dontPatchMkspecs-}" ]; then postPhases="${postPhases-}${postPhases:+ }postPatchMkspecs" fi + +qtPreHook() { + # Check that wrapQtAppsHook is used, or it is explicitly disabled. + if [[ -z "$__nix_wrapQtAppsHook" && -z "$dontWrapQtApps" ]]; then + echo >&2 "Error: wrapQtAppsHook is not used, and dontWrapQtApps is not set." + exit 1 + fi +} +prePhases+=" qtPreHook" + +fi diff --git a/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh b/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh index 7356c8ee356..ce4d78fbb50 100644 --- a/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh +++ b/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh @@ -1,3 +1,6 @@ +if [[ -z "${__nix_wrapQtAppsHook-}" ]]; then +__nix_wrapQtAppsHook=1 # Don't run this hook more than once. + # Inherit arguments given in mkDerivation qtWrapperArgs=( ${qtWrapperArgs-} ) @@ -100,3 +103,5 @@ wrapQtAppsHook() { } fixupOutputHooks+=(wrapQtAppsHook) + +fi diff --git a/pkgs/development/libraries/qt-5/mkDerivation.nix b/pkgs/development/libraries/qt-5/mkDerivation.nix index 2c6333cb020..98f9a05fac7 100644 --- a/pkgs/development/libraries/qt-5/mkDerivation.nix +++ b/pkgs/development/libraries/qt-5/mkDerivation.nix @@ -9,21 +9,6 @@ args: let args_ = { - qmakeFlags = [ ("CONFIG+=" + (if debug then "debug" else "release")) ] - ++ (args.qmakeFlags or []); - - NIX_CFLAGS_COMPILE = toString ( - optional (!debug) "-DQT_NO_DEBUG" - ++ lib.toList (args.NIX_CFLAGS_COMPILE or [])); - - cmakeFlags = - (args.cmakeFlags or []) - ++ [ - ("-DCMAKE_BUILD_TYPE=" + (if debug then "Debug" else "Release")) - ]; - - enableParallelBuilding = args.enableParallelBuilding or true; - nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ wrapQtAppsHook ]; }; diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 5d6f91a7911..0d0bef342b0 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -2,7 +2,7 @@ stdenv, lib, src, patches, version, qtCompatVersion, - coreutils, bison, flex, gdb, gperf, lndir, perl, pkgconfig, python3, + coreutils, bison, flex, gdb, gperf, lndir, perl, pkg-config, python3, which, # darwin support darwin, libiconv, @@ -22,6 +22,7 @@ libGL, buildExamples ? false, buildTests ? false, + debug ? false, developerBuild ? false, decryptSslTraffic ? false }: @@ -33,12 +34,14 @@ let compareVersion = v: builtins.compareVersions version v; qmakeCacheName = if compareVersion "5.12.4" < 0 then ".qmake.cache" else ".qmake.stash"; + debugSymbols = debug || developerBuild; in stdenv.mkDerivation { name = "qtbase-${version}"; inherit qtCompatVersion src version; + debug = debugSymbols; propagatedBuildInputs = [ @@ -87,7 +90,7 @@ stdenv.mkDerivation { ++ lib.optional (postgresql != null) postgresql; nativeBuildInputs = - [ bison flex gperf lndir perl pkgconfig which ]; + [ bison flex gperf lndir perl pkg-config which ]; propagatedNativeBuildInputs = [ lndir ]; @@ -241,6 +244,7 @@ stdenv.mkDerivation { "-I" "${icu.dev}/include" "-pch" ] + ++ lib.optional debugSymbols "-debug" ++ lib.optionals (compareVersion "5.11.0" < 0) [ "-qml-debug" @@ -397,6 +401,8 @@ stdenv.mkDerivation { -e "/^host_bins=/ c host_bins=$dev/bin" ''; + dontStrip = debugSymbols; + setupHook = ../hooks/qtbase-setup-hook.sh; meta = with lib; { diff --git a/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix b/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix index 36a736d03dc..f6aeb23fb7b 100644 --- a/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix +++ b/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix @@ -1,8 +1,8 @@ -{ qtModule, stdenv, qtbase, qtdeclarative, bluez }: +{ qtModule, lib, stdenv, qtbase, qtdeclarative, bluez }: qtModule { name = "qtconnectivity"; qtInputs = [ qtbase qtdeclarative ]; - buildInputs = stdenv.lib.optional stdenv.isLinux bluez; + buildInputs = lib.optional stdenv.isLinux bluez; outputs = [ "out" "dev" "bin" ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qtgamepad.nix b/pkgs/development/libraries/qt-5/modules/qtgamepad.nix index 281f6e0b8ec..6bc023eb9bb 100644 --- a/pkgs/development/libraries/qt-5/modules/qtgamepad.nix +++ b/pkgs/development/libraries/qt-5/modules/qtgamepad.nix @@ -1,9 +1,9 @@ -{ qtModule, qtbase, qtdeclarative, pkgconfig }: +{ qtModule, qtbase, qtdeclarative, pkg-config }: qtModule { name = "qtgamepad"; qtInputs = [ qtbase qtdeclarative ]; buildInputs = [ ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; outputs = [ "out" "dev" "bin" ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qtlocation.nix b/pkgs/development/libraries/qt-5/modules/qtlocation.nix index a80785d8099..182b5f5bc33 100644 --- a/pkgs/development/libraries/qt-5/modules/qtlocation.nix +++ b/pkgs/development/libraries/qt-5/modules/qtlocation.nix @@ -1,10 +1,10 @@ -{ stdenv, qtModule, qtbase, qtmultimedia }: +{ lib, stdenv, qtModule, qtbase, qtmultimedia }: qtModule { name = "qtlocation"; qtInputs = [ qtbase qtmultimedia ]; outputs = [ "bin" "out" "dev" ]; - qmakeFlags = stdenv.lib.optional stdenv.isDarwin [ + qmakeFlags = lib.optional stdenv.isDarwin [ # boost uses std::auto_ptr which has been disabled in clang with libcxx # This flag re-enables this feature # https://libcxx.llvm.org/docs/UsingLibcxx.html#c-17-specific-configuration-macros diff --git a/pkgs/development/libraries/qt-5/modules/qtmacextras.nix b/pkgs/development/libraries/qt-5/modules/qtmacextras.nix index 11964caf17b..5e7ccf70204 100644 --- a/pkgs/development/libraries/qt-5/modules/qtmacextras.nix +++ b/pkgs/development/libraries/qt-5/modules/qtmacextras.nix @@ -1,9 +1,9 @@ -{ stdenv, qtModule, qtbase }: +{ lib, qtModule, qtbase }: qtModule { name = "qtmacextras"; qtInputs = [ qtbase ]; - meta = with stdenv.lib; { + meta = with lib; { maintainers = with maintainers; [ periklis ]; platforms = platforms.darwin; }; diff --git a/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix b/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix index 42ed23bb6dc..eb2c3bc7431 100644 --- a/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix +++ b/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix @@ -1,13 +1,13 @@ -{ qtModule, stdenv, qtbase, qtdeclarative, pkgconfig +{ qtModule, lib, stdenv, qtbase, qtdeclarative, pkg-config , alsaLib, gstreamer, gst-plugins-base, libpulseaudio, wayland }: -with stdenv.lib; +with lib; qtModule { name = "qtmultimedia"; qtInputs = [ qtbase qtdeclarative ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gstreamer gst-plugins-base libpulseaudio ] ++ optional (stdenv.isLinux) alsaLib ++ optional (versionAtLeast qtbase.version "5.14.0" && stdenv.isLinux) wayland; diff --git a/pkgs/development/libraries/qt-5/modules/qtwayland.nix b/pkgs/development/libraries/qt-5/modules/qtwayland.nix index c7a7704f283..5291ea9c9a7 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwayland.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwayland.nix @@ -1,9 +1,9 @@ -{ qtModule, qtbase, qtquickcontrols, wayland, pkgconfig }: +{ qtModule, qtbase, qtquickcontrols, wayland, pkg-config }: qtModule { name = "qtwayland"; qtInputs = [ qtbase qtquickcontrols ]; buildInputs = [ wayland ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; outputs = [ "out" "dev" "bin" ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index b98b711c0f5..7e5582cca48 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -1,7 +1,7 @@ { qtModule , qtdeclarative, qtquickcontrols, qtlocation, qtwebchannel -, bison, coreutils, flex, git, gperf, ninja, pkgconfig, python2, which +, bison, coreutils, flex, git, gperf, ninja, pkg-config, python2, which , xorg, libXcursor, libXScrnSaver, libXrandr, libXtst , fontconfig, freetype, harfbuzz, icu, dbus, libdrm @@ -16,15 +16,16 @@ , cups, darwin, openbsm, runCommand, xcbuild, writeScriptBin , ffmpeg_3 ? null , lib, stdenv, fetchpatch +, qtCompatVersion }: -with stdenv.lib; +with lib; qtModule { name = "qtwebengine"; qtInputs = [ qtdeclarative qtquickcontrols qtlocation qtwebchannel ]; nativeBuildInputs = [ - bison coreutils flex git gperf ninja pkgconfig python2 which gn + bison coreutils flex git gperf ninja pkg-config python2 which gn ] ++ optional stdenv.isDarwin xcbuild; doCheck = true; outputs = [ "bin" "dev" "out" ]; @@ -66,21 +67,31 @@ qtModule { sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc '' - + optionalString stdenv.isDarwin ('' + + optionalString stdenv.isDarwin ( + (if (lib.versionAtLeast qtCompatVersion "5.14") then '' + substituteInPlace src/buildtools/config/mac_osx.pri \ + --replace 'QMAKE_CLANG_DIR = "/usr"' 'QMAKE_CLANG_DIR = "${stdenv.cc}"' + '' else '' substituteInPlace src/core/config/mac_osx.pri \ --replace 'QMAKE_CLANG_DIR = "/usr"' 'QMAKE_CLANG_DIR = "${stdenv.cc}"' - '' + '') # Following is required to prevent a build error: # ninja: error: '/nix/store/z8z04p0ph48w22rqzx7ql67gy8cyvidi-SDKs/MacOSX10.12.sdk/usr/include/mach/exc.defs', needed by 'gen/third_party/crashpad/crashpad/util/mach/excUser.c', missing and no known rule to make it + '' substituteInPlace src/3rdparty/chromium/third_party/crashpad/crashpad/util/BUILD.gn \ --replace '$sysroot/usr' "${darwin.xnu}" '' - + '' # Apple has some secret stuff they don't share with OpenBSM + + (if (lib.versionAtLeast qtCompatVersion "5.14") then '' + substituteInPlace src/3rdparty/chromium/base/mac/mach_port_rendezvous.cc \ + --replace "audit_token_to_pid(request.trailer.msgh_audit)" "request.trailer.msgh_audit.val[5]" + substituteInPlace src/3rdparty/chromium/third_party/crashpad/crashpad/util/mach/mach_message.cc \ + --replace "audit_token_to_pid(audit_trailer->msgh_audit)" "audit_trailer->msgh_audit.val[5]" + '' else '' substituteInPlace src/3rdparty/chromium/base/mac/mach_port_broker.mm \ --replace "audit_token_to_pid(msg.trailer.msgh_audit)" "msg.trailer.msgh_audit.val[5]" - + '') + + '' substituteInPlace src/3rdparty/chromium/sandbox/mac/BUILD.gn \ --replace 'libs = [ "sandbox" ]' 'libs = [ "/usr/lib/libsandbox.1.dylib" ]' ''); @@ -88,7 +99,7 @@ qtModule { NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ # with gcc8, -Wclass-memaccess became part of -Wall and this exceeds the logging limit "-Wno-class-memaccess" - ] ++ lib.optionals (stdenv.hostPlatform.platform.gcc.arch or "" == "sandybridge") [ + ] ++ lib.optionals (stdenv.hostPlatform.gcc.arch or "" == "sandybridge") [ # it fails when compiled with -march=sandybridge https://github.com/NixOS/nixpkgs/pull/59148#discussion_r276696940 # TODO: investigate and fix properly "-march=westmere" diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index 3d9e72bb54f..ed41a4ac9bc 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -2,7 +2,7 @@ , qtbase, qtdeclarative, qtlocation, qtmultimedia, qtsensors, qtwebchannel , fontconfig, gtk2, libwebp, libxml2, libxslt , sqlite, systemd, glib, gst_all_1, cmake -, bison, flex, gdb, gperf, perl, pkgconfig, python2, ruby +, bison, flex, gdb, gperf, perl, pkg-config, python2, ruby , darwin , flashplayerFix ? false }: @@ -31,7 +31,7 @@ qtModule { ++ optionals (stdenv.isDarwin) (with darwin; with apple_sdk.frameworks; [ ICU OpenGL ]) ++ optional usingAnnulenWebkitFork hyphen; nativeBuildInputs = [ - bison flex gdb gperf perl pkgconfig python2 ruby + bison flex gdb gperf perl pkg-config python2 ruby ] ++ optional usingAnnulenWebkitFork cmake; cmakeFlags = optionals usingAnnulenWebkitFork ([ "-DPORT=Qt" ] @@ -43,7 +43,7 @@ qtModule { # QtWebKit overrides qmake's default_pre and default_post features, # so its custom qmake files must be found first at the front of QMAKEPATH. - preConfigure = stdenv.lib.optionalString (!usingAnnulenWebkitFork) '' + preConfigure = lib.optionalString (!usingAnnulenWebkitFork) '' QMAKEPATH="$PWD/Tools/qmake''${QMAKEPATH:+:}$QMAKEPATH" fixQtBuiltinPaths . '*.pr?' # Fix hydra's "Log limit exceeded" @@ -72,6 +72,6 @@ qtModule { preFixup = ''rm -rf "$(pwd)" && mkdir "$(pwd)" ''; meta = { - maintainers = with stdenv.lib.maintainers; [ abbradar periklis ]; + maintainers = with lib.maintainers; [ abbradar periklis ]; }; } diff --git a/pkgs/development/libraries/qt-5/modules/qtwebview.nix b/pkgs/development/libraries/qt-5/modules/qtwebview.nix index 906d750c5d3..4034dce49f5 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebview.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebview.nix @@ -1,6 +1,6 @@ -{ darwin, stdenv, qtModule, qtdeclarative, qtwebengine }: +{ darwin, lib, stdenv, qtModule, qtdeclarative, qtwebengine }: -with stdenv.lib; +with lib; qtModule { name = "qtwebview"; diff --git a/pkgs/development/libraries/qt-5/qtModule.nix b/pkgs/development/libraries/qt-5/qtModule.nix index 0481f000c6c..930ed9d67ba 100644 --- a/pkgs/development/libraries/qt-5/qtModule.nix +++ b/pkgs/development/libraries/qt-5/qtModule.nix @@ -34,6 +34,8 @@ mkDerivation (args // { fixQtBuiltinPaths . '*.pr?' ''; + dontWrapQtApps = args.dontWrapQtApps or true; + postFixup = '' if [ -d "''${!outputDev}/lib/pkgconfig" ]; then find "''${!outputDev}/lib/pkgconfig" -name '*.pc' | while read pc; do diff --git a/pkgs/development/libraries/qt-mobility/default.nix b/pkgs/development/libraries/qt-mobility/default.nix index ba44a217e3d..60c1d2754d7 100644 --- a/pkgs/development/libraries/qt-mobility/default.nix +++ b/pkgs/development/libraries/qt-mobility/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qt4, libX11, coreutils, bluez, perl }: +{ lib, stdenv, fetchFromGitHub, qt4, libX11, coreutils, bluez, perl }: # possible additional dependencies: pulseaudio udev networkmanager immerson qmf stdenv.mkDerivation rec { @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { buildInputs = [ qt4 libX11 bluez perl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Qt Mobility"; homepage = "http://qt.nokia.com/products/qt-addons/mobility"; maintainers = [ maintainers.qknight ]; diff --git a/pkgs/development/libraries/qtinstaller/default.nix b/pkgs/development/libraries/qtinstaller/default.nix index 3c4c192bd4b..ce69c855ac2 100644 --- a/pkgs/development/libraries/qtinstaller/default.nix +++ b/pkgs/development/libraries/qtinstaller/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { setOutputFlags = false; enableParallelBuilding = true; NIX_QT_SUBMODULE = true; + dontWrapQtApps = true; installPhase = '' mkdir -p $out/{bin,lib,share/qt-installer-framework} @@ -40,7 +41,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = ''Qt installer framework''; + description = "Qt installer framework"; inherit (qtbase.meta) platforms license homepage; }; } diff --git a/pkgs/development/libraries/qtkeychain/default.nix b/pkgs/development/libraries/qtkeychain/default.nix index ddfdc2f67d3..3da0587210d 100644 --- a/pkgs/development/libraries/qtkeychain/default.nix +++ b/pkgs/development/libraries/qtkeychain/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt4 ? null +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, qt4 ? null , withQt5 ? false, qtbase ? null, qttools ? null , darwin ? null , libsecret @@ -19,17 +19,19 @@ stdenv.mkDerivation rec { sha256 = "0h4wgngn2yl35hapbjs24amkjfbzsvnna4ixfhn87snjnq5lmjbc"; # v0.9.1 }; + dontWrapQtApps = true; + patches = (if withQt5 then [] else [ ./0001-Fixes-build-with-Qt4.patch ]) ++ (if stdenv.isDarwin then [ ./0002-Fix-install-name-Darwin.patch ] else []); cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ]; nativeBuildInputs = [ cmake ] - ++ stdenv.lib.optionals (!stdenv.isDarwin) [ pkgconfig ] # for finding libsecret + ++ lib.optionals (!stdenv.isDarwin) [ pkg-config ] # for finding libsecret ; - buildInputs = stdenv.lib.optionals (!stdenv.isDarwin) [ libsecret ] + buildInputs = lib.optionals (!stdenv.isDarwin) [ libsecret ] ++ (if withQt5 then [ qtbase qttools ] else [ qt4 ]) - ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation Security ]) ; @@ -37,7 +39,7 @@ stdenv.mkDerivation rec { meta = { description = "Platform-independent Qt API for storing passwords securely"; homepage = "https://github.com/frankosterfeld/qtkeychain"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.bsd3; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/qtpbfimageplugin/default.nix b/pkgs/development/libraries/qtpbfimageplugin/default.nix index ecff7f7f821..9dbc2491ad9 100644 --- a/pkgs/development/libraries/qtpbfimageplugin/default.nix +++ b/pkgs/development/libraries/qtpbfimageplugin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qmake, qtbase, protobuf }: +{ lib, stdenv, fetchFromGitHub, qmake, qtbase, protobuf }: stdenv.mkDerivation rec { pname = "qtpbfimageplugin"; @@ -14,17 +14,19 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ qmake ]; buildInputs = [ qtbase protobuf ]; + dontWrapQtApps = true; + postPatch = '' # Fix plugin dir substituteInPlace pbfplugin.pro \ --replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix" - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' # Fix darwin build substituteInPlace pbfplugin.pro \ --replace '$$PROTOBUF/lib/libprotobuf-lite.a' '${protobuf}/lib/libprotobuf-lite.dylib' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Qt image plugin for displaying Mapbox vector tiles"; longDescription = '' QtPBFImagePlugin is a Qt image plugin that enables applications capable of diff --git a/pkgs/development/libraries/qtscriptgenerator/default.nix b/pkgs/development/libraries/qtscriptgenerator/default.nix index a6cffd73c3f..0164f8884a2 100644 --- a/pkgs/development/libraries/qtscriptgenerator/default.nix +++ b/pkgs/development/libraries/qtscriptgenerator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4 }: +{ lib, stdenv, fetchurl, qt4 }: stdenv.mkDerivation { name = "qtscriptgenerator-0.1.0"; @@ -43,6 +43,6 @@ stdenv.mkDerivation { description = "QtScript bindings generator"; homepage = "https://code.qt.io/cgit/qt-labs/qtscriptgenerator.git/"; inherit (qt4.meta) platforms; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix index a5c96dc351b..7290b3830d0 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qmake4Hook , qt4, libX11, libXext }: +{ lib, stdenv, fetchFromGitHub, qmake4Hook , qt4, libX11, libXext }: stdenv.mkDerivation rec { pname = "qtstyleplugin-kvantum-qt4"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { mv $TMP/kvantum/${qt4}/lib $out ''; - meta = with stdenv.lib; { + meta = with lib; { description = "SVG-based Qt4 theme engine"; homepage = "https://github.com/tsujan/Kvantum"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix index 71ca8e720a4..c2fa32b6d05 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qmake, qtbase, qtsvg, qtx11extras, kwindowsystem +{ lib, stdenv, fetchFromGitHub, qmake, qtbase, qtsvg, qtx11extras, kwindowsystem , libX11, libXext, qttools, wrapQtAppsHook }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { --replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "SVG-based Qt5 theme engine plus a config tool and extra themes"; homepage = "https://github.com/tsujan/Kvantum"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/qtstyleplugins/default.nix b/pkgs/development/libraries/qtstyleplugins/default.nix index 1970dd183c1..4587bf46162 100644 --- a/pkgs/development/libraries/qtstyleplugins/default.nix +++ b/pkgs/development/libraries/qtstyleplugins/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub, qmake, pkgconfig, gtk2 }: +{ lib, mkDerivation, fetchFromGitHub, qmake, pkg-config, gtk2 }: mkDerivation { name = "qtstyleplugins-2017-03-11"; @@ -12,10 +12,10 @@ mkDerivation { patches = [ ./fix-build-against-Qt-5.15.patch ]; - nativeBuildInputs = [ pkgconfig qmake ]; + nativeBuildInputs = [ pkg-config qmake ]; buildInputs = [ gtk2 ]; - meta = with stdenv.lib; { + meta = with lib; { 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; diff --git a/pkgs/development/libraries/qtutilities/default.nix b/pkgs/development/libraries/qtutilities/default.nix index 916e381ab4d..f5398d92dfc 100644 --- a/pkgs/development/libraries/qtutilities/default.nix +++ b/pkgs/development/libraries/qtutilities/default.nix @@ -1,4 +1,12 @@ -{ stdenv, fetchFromGitHub, cpp-utilities, qttools, qtbase, cmake, pkgconfig }: +{ stdenv +, lib +, fetchFromGitHub +, cpp-utilities +, qttools +, qtbase +, cmake +, pkg-config +}: stdenv.mkDerivation rec { pname = "qtutilities"; @@ -14,7 +22,9 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase cpp-utilities ]; nativeBuildInputs = [ cmake qttools ]; - meta = with stdenv.lib; { + dontWrapQtApps = true; + + meta = with lib; { homepage = "https://github.com/Martchus/qtutilities"; description = "Common C++ classes and routines used by @Martchus' applications featuring argument parser, IO and conversion utilities"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/qtwebkit-plugins/default.nix b/pkgs/development/libraries/qtwebkit-plugins/default.nix index d1b921deac0..5bc30db059e 100644 --- a/pkgs/development/libraries/qtwebkit-plugins/default.nix +++ b/pkgs/development/libraries/qtwebkit-plugins/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qmake, qtwebkit, hunspell }: +{ lib, stdenv, fetchFromGitHub, qmake, qtwebkit, hunspell }: stdenv.mkDerivation { name = "qtwebkit-plugins-2017-01-25"; @@ -14,12 +14,14 @@ stdenv.mkDerivation { buildInputs = [ qtwebkit hunspell ]; + dontWrapQtApps = true; + postPatch = '' - sed -i "s,-lhunspell,-lhunspell-${stdenv.lib.versions.majorMinor hunspell.version}," src/spellcheck/spellcheck.pri + sed -i "s,-lhunspell,-lhunspell-${lib.versions.majorMinor hunspell.version}," src/spellcheck/spellcheck.pri sed -i "s,\$\$\[QT_INSTALL_PLUGINS\],$out/$qtPluginPrefix," src/src.pro ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Spell checking plugin using Hunspell and HTML5 Notifications plugin for QtWebKit"; homepage = "https://github.com/QupZilla/qtwebkit-plugins"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/quazip/default.nix b/pkgs/development/libraries/quazip/default.nix index c399298b8f8..a12d6cafe4a 100644 --- a/pkgs/development/libraries/quazip/default.nix +++ b/pkgs/development/libraries/quazip/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, zlib, qtbase, cmake, fixDarwinDylibNames }: +{ fetchFromGitHub, lib, stdenv, zlib, qtbase, cmake, fixDarwinDylibNames }: stdenv.mkDerivation rec { pname = "quazip"; @@ -13,9 +13,11 @@ stdenv.mkDerivation rec { buildInputs = [ zlib qtbase ]; nativeBuildInputs = [ cmake ] - ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; - meta = with stdenv.lib; { + dontWrapQtApps = true; + + meta = with lib; { description = "Provides access to ZIP archives from Qt programs"; license = licenses.lgpl21Plus; homepage = "https://stachenov.github.io/quazip/"; # Migrated from http://quazip.sourceforge.net/ diff --git a/pkgs/development/libraries/quesoglc/default.nix b/pkgs/development/libraries/quesoglc/default.nix index 6aebb7a6511..1a4fcca9d9b 100644 --- a/pkgs/development/libraries/quesoglc/default.nix +++ b/pkgs/development/libraries/quesoglc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libGLU, libGL, glew, freetype, fontconfig, fribidi, libX11 }: +{ lib, stdenv, fetchurl, libGLU, libGL, glew, freetype, fontconfig, fribidi, libX11 }: stdenv.mkDerivation rec { pname = "quesoglc"; version = "0.7.2"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libGLU libGL glew freetype fontconfig fribidi libX11 ]; # FIXME: Configure fails to use system glew. - meta = with stdenv.lib; { + meta = with lib; { description = "A free implementation of the OpenGL Character Renderer"; longDescription = '' QuesoGLC is a free (as in free speech) implementation of the OpenGL diff --git a/pkgs/development/libraries/quickder/default.nix b/pkgs/development/libraries/quickder/default.nix index e5346b42b9f..28933f96fa1 100644 --- a/pkgs/development/libraries/quickder/default.nix +++ b/pkgs/development/libraries/quickder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python2Packages, hexio +{ lib, stdenv, fetchFromGitHub, python2Packages, hexio , cmake, bash, arpa2cm, git, asn2quickder }: stdenv.mkDerivation rec { @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { export PREFIX=$out ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Quick (and Easy) DER, a Library for parsing ASN.1"; homepage = "https://github.com/vanrein/quick-der"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/quickfix/default.nix b/pkgs/development/libraries/quickfix/default.nix new file mode 100644 index 00000000000..6644b9885c2 --- /dev/null +++ b/pkgs/development/libraries/quickfix/default.nix @@ -0,0 +1,43 @@ +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoconf, automake, libtool }: + +stdenv.mkDerivation rec { + pname = "quickfix"; + version = "1.15.1"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "1fgpwgvyw992mbiawgza34427aakn5zrik3sjld0i924a9d17qwg"; + }; + + patches = [ + # Improved C++17 compatibility + (fetchpatch { + url = "https://github.com/quickfix/quickfix/commit/a46708090444826c5f46a5dbf2ba4b069b413c58.diff"; + sha256 = "1wlk4j0wmck0zm6a70g3nrnq8fz0id7wnyxn81f7w048061ldhyd"; + }) + ./disableUnitTests.patch + ]; + + # autoreconfHook does not work + nativeBuildInputs = [ autoconf automake libtool ]; + + enableParallelBuilding = true; + + preConfigure = '' + ./bootstrap + ''; + + # More hacking out of the unittests + preBuild = '' + substituteInPlace Makefile --replace 'UnitTest++' ' ' + ''; + + meta = with lib; { + description = "QuickFIX C++ Fix Engine Library"; + homepage = "http://www.quickfixengine.org"; + license = licenses.free; # similar to BSD 4-clause + maintainers = with maintainers; [ bhipple ]; + }; +} diff --git a/pkgs/development/libraries/quickfix/disableUnitTests.patch b/pkgs/development/libraries/quickfix/disableUnitTests.patch new file mode 100644 index 00000000000..41a2f698e55 --- /dev/null +++ b/pkgs/development/libraries/quickfix/disableUnitTests.patch @@ -0,0 +1,65 @@ +diff -u -r source-baseline-patchPhase/configure.ac source/configure.ac +--- source-baseline-patchPhase/configure.ac 1970-01-01 00:00:01.000000000 +0000 ++++ source/configure.ac 2021-01-12 22:49:28.948861699 +0000 +@@ -43,7 +43,7 @@ + + AC_CANONICAL_HOST + +-build_no_unit_test = no ++build_no_unit_test = yes + + # Detect the target system + case "${host_os}" in +@@ -344,8 +344,6 @@ + examples/Makefile + examples/executor/Makefile + examples/executor/C++/Makefile +- examples/ordermatch/Makefile +- examples/ordermatch/test/Makefile + examples/tradeclient/Makefile + examples/tradeclientgui/Makefile + examples/tradeclientgui/banzai/Makefile +diff -u -r source-baseline-patchPhase/examples/Makefile.am source/examples/Makefile.am +--- source-baseline-patchPhase/examples/Makefile.am 1970-01-01 00:00:01.000000000 +0000 ++++ source/examples/Makefile.am 2021-01-12 22:51:55.782568550 +0000 +@@ -1,3 +1,3 @@ +-SUBDIRS = executor ordermatch tradeclient tradeclientgui ++SUBDIRS = executor tradeclient tradeclientgui + +-EXTRA_DIST = examples.dsw configure configure.in bootstrap Makefile.am +\ No newline at end of file ++EXTRA_DIST = examples.dsw configure configure.in bootstrap Makefile.am +diff -u -r source-baseline-patchPhase/src/Makefile.am source/src/Makefile.am +--- source-baseline-patchPhase/src/Makefile.am 1970-01-01 00:00:01.000000000 +0000 ++++ source/src/Makefile.am 2021-01-12 22:53:02.593432380 +0000 +@@ -15,27 +15,23 @@ + if NO_UNIT_TEST + noinst_PROGRAMS = + else +-noinst_PROGRAMS = at ut pt ++noinst_PROGRAMS = at pt + endif + + at_SOURCES = at.cpp at_application.h +-ut_SOURCES = ut.cpp + pt_SOURCES = pt.cpp + + EXTRA_DIST = getopt.c getopt-repl.h + + at_LDADD = C++/libquickfix.la +-ut_LDADD = C++/test/libquickfixcpptest.la C++/libquickfix.la + pt_LDADD = C++/libquickfix.la + + INCLUDES =-IC++ -IC++/test -I../UnitTest++/src +-LDFLAGS =-L../UnitTest++ -lUnitTest++ ++ + + all-local: +- rm -f ../test/ut ../test/pt ../test/at ../test/ut_debug +- ln -s ../src/ut ../test/ut ++ rm -rf ../test/pt ../test/at ../test/ut_debug + ln -s ../src/pt ../test/pt + ln -s ../src/at ../test/at +- ln -s ../src/.libs/ut ../test/ut_debug + + clean-local: diff --git a/pkgs/development/libraries/qwt/6.nix b/pkgs/development/libraries/qwt/6.nix index 1a29bb90fbb..e5fad490f6e 100644 --- a/pkgs/development/libraries/qwt/6.nix +++ b/pkgs/development/libraries/qwt/6.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qtbase, qtsvg, qttools, qmake }: +{ lib, stdenv, fetchurl, qtbase, qtsvg, qttools, qmake }: stdenv.mkDerivation rec { name = "qwt-6.1.5"; @@ -17,11 +17,13 @@ stdenv.mkDerivation rec { qmakeFlags = [ "-after doc.path=$out/share/doc/${name}" ]; - meta = with stdenv.lib; { + dontWrapQtApps = true; + + meta = with lib; { description = "Qt widgets for technical applications"; homepage = "http://qwt.sourceforge.net/"; # LGPL 2.1 plus a few exceptions (more liberal) - license = stdenv.lib.licenses.qwt; + license = lib.licenses.qwt; platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; branch = "6"; diff --git a/pkgs/development/libraries/qwt/6_qt4.nix b/pkgs/development/libraries/qwt/6_qt4.nix index 4b7aa9cf7f9..61903af93fa 100644 --- a/pkgs/development/libraries/qwt/6_qt4.nix +++ b/pkgs/development/libraries/qwt/6_qt4.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, qmake4Hook, AGL }: +{ lib, stdenv, fetchurl, qt4, qmake4Hook, AGL }: stdenv.mkDerivation rec { name = "qwt-6.1.5"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ qt4 - ] ++ stdenv.lib.optionals stdenv.isDarwin [ AGL ]; + ] ++ lib.optionals stdenv.isDarwin [ AGL ]; nativeBuildInputs = [ qmake4Hook ]; @@ -22,18 +22,18 @@ stdenv.mkDerivation rec { # qwt.framework output includes a relative reference to itself, which breaks dependents preFixup = - stdenv.lib.optionalString stdenv.isDarwin '' + lib.optionalString stdenv.isDarwin '' echo "Attempting to repair qwt" install_name_tool -id "$out/lib/qwt.framework/Versions/6/qwt" "$out/lib/qwt.framework/Versions/6/qwt" ''; qmakeFlags = [ "-after doc.path=$out/share/doc/${name}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Qt widgets for technical applications"; homepage = "http://qwt.sourceforge.net/"; # LGPL 2.1 plus a few exceptions (more liberal) - license = stdenv.lib.licenses.qwt; + license = lib.licenses.qwt; platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.bjornfor ]; branch = "6"; diff --git a/pkgs/development/libraries/qwt/default.nix b/pkgs/development/libraries/qwt/default.nix index c206ffdd5db..e158fe34885 100644 --- a/pkgs/development/libraries/qwt/default.nix +++ b/pkgs/development/libraries/qwt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, qmake4Hook }: +{ lib, stdenv, fetchurl, qt4, qmake4Hook }: stdenv.mkDerivation rec { name = "qwt-5.2.3"; @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { qmakeFlags="$qmakeFlags INSTALLBASE=$out -after doc.path=$out/share/doc/${name}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Qt widgets for technical applications"; homepage = "http://qwt.sourceforge.net/"; # LGPL 2.1 plus a few exceptions (more liberal) - license = stdenv.lib.licenses.qwt; + license = lib.licenses.qwt; platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; }; diff --git a/pkgs/development/libraries/qxt/default.nix b/pkgs/development/libraries/qxt/default.nix index 3104aefb9ed..9d035ce9d89 100644 --- a/pkgs/development/libraries/qxt/default.nix +++ b/pkgs/development/libraries/qxt/default.nix @@ -1,9 +1,9 @@ -{ stdenv, which, coreutils, fetchzip, qt4 }: +{ lib, stdenv, which, coreutils, fetchzip, qt4 }: stdenv.mkDerivation rec { pname = "qxt"; version = "0.6.2"; - + src = fetchzip { url = "https://bitbucket.org/libqxt/libqxt/get/v${version}.tar.gz"; sha256 = "0zmqfn0h8cpky7wgaaxlfh0l89r9r0isi87587kaicyap7a6kxwz"; @@ -26,9 +26,9 @@ stdenv.mkDerivation rec { classes to add functionality not readily available in the Qt toolkit by Qt Development Frameworks, Nokia. ''; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ forkk ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ forkk ]; broken = true; }; } diff --git a/pkgs/development/libraries/rabbitmq-c/default.nix b/pkgs/development/libraries/rabbitmq-c/default.nix index 7cb29357c49..94a9adcae87 100644 --- a/pkgs/development/libraries/rabbitmq-c/default.nix +++ b/pkgs/development/libraries/rabbitmq-c/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, openssl, popt, xmlto }: +{ lib, stdenv, fetchFromGitHub, cmake, openssl, popt, xmlto }: stdenv.mkDerivation rec { pname = "rabbitmq-c"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ openssl popt xmlto ]; - meta = with stdenv.lib; { + meta = with lib; { description = "RabbitMQ C AMQP client library"; homepage = "https://github.com/alanxz/rabbitmq-c"; license = licenses.mit; diff --git a/pkgs/development/libraries/rabbitmq-java-client/default.nix b/pkgs/development/libraries/rabbitmq-java-client/default.nix index e84770ec0f5..b649b1d9c11 100644 --- a/pkgs/development/libraries/rabbitmq-java-client/default.nix +++ b/pkgs/development/libraries/rabbitmq-java-client/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, ant, jdk, jre, python, makeWrapper }: +{ fetchurl, lib, stdenv, ant, jdk, jre, python, makeWrapper }: stdenv.mkDerivation { name = "rabbitmq-java-client-3.3.4"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { --add-flags "-Djava.awt.headless=true -cp $out/share/java/\* com.rabbitmq.examples.PerfTest" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "RabbitMQ Java client library which allows Java code to interface to AMQP servers"; homepage = "https://www.rabbitmq.com/java-client.html"; license = with licenses; [ mpl11 gpl2 ]; diff --git a/pkgs/development/libraries/raft-canonical/default.nix b/pkgs/development/libraries/raft-canonical/default.nix index 68c4a95d0b6..69fa7f6eadc 100644 --- a/pkgs/development/libraries/raft-canonical/default.nix +++ b/pkgs/development/libraries/raft-canonical/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, file, libuv }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file, libuv }: stdenv.mkDerivation rec { pname = "raft-canonical"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0swn95cf11fqczllmxr0nj3ig532rw4n3w6g3ckdnqka8520xjyr"; }; - nativeBuildInputs = [ autoreconfHook file pkgconfig ]; + nativeBuildInputs = [ autoreconfHook file pkg-config ]; buildInputs = [ libuv ]; preConfigure = '' @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { outputs = [ "dev" "out" ]; - meta = with stdenv.lib; { + meta = with lib; { description = '' Fully asynchronous C implementation of the Raft consensus protocol ''; diff --git a/pkgs/development/libraries/randomx/default.nix b/pkgs/development/libraries/randomx/default.nix index 6de7ecdfef3..8e99ca1be35 100644 --- a/pkgs/development/libraries/randomx/default.nix +++ b/pkgs/development/libraries/randomx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "randomX"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "13h2cw8drq7xn3v8fbpxrlsl8zq3fs8gd2pc1pv28ahr9qqjz1gc"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Proof of work algorithm based on random code execution"; homepage = "https://github.com/tevador/RandomX"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/rang/default.nix b/pkgs/development/libraries/rang/default.nix index b3d300baca2..79ab52fc835 100644 --- a/pkgs/development/libraries/rang/default.nix +++ b/pkgs/development/libraries/rang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "rang"; version = "v3.1.0"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { "sha256" = "0v2pz0l2smagr3j4abjccshg4agaccfz79m5ayvrvqq5d4rlds0s"; }; nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A Minimal, Header only Modern c++ library for terminal goodies"; homepage = "https://agauniyal.github.io/rang/"; diff --git a/pkgs/development/libraries/range-v3/default.nix b/pkgs/development/libraries/range-v3/default.nix index 47c56aaa1e8..1e9df5be234 100644 --- a/pkgs/development/libraries/range-v3/default.nix +++ b/pkgs/development/libraries/range-v3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "range-v3"; @@ -19,12 +19,12 @@ stdenv.mkDerivation rec { # Building the tests currently fails on AArch64 due to internal compiler # errors (with GCC 9.2): - cmakeFlags = stdenv.lib.optional stdenv.isAarch64 "-DRANGE_V3_TESTS=OFF"; + cmakeFlags = lib.optional stdenv.isAarch64 "-DRANGE_V3_TESTS=OFF"; doCheck = !stdenv.isAarch64; checkTarget = "test"; - meta = with stdenv.lib; { + meta = with lib; { description = "Experimental range library for C++11/14/17"; homepage = "https://github.com/ericniebler/range-v3"; changelog = "https://github.com/ericniebler/range-v3/releases/tag/${version}"; diff --git a/pkgs/development/libraries/rapidcheck/default.nix b/pkgs/development/libraries/rapidcheck/default.nix index 492e1228978..4df98c3026e 100644 --- a/pkgs/development/libraries/rapidcheck/default.nix +++ b/pkgs/development/libraries/rapidcheck/default.nix @@ -1,14 +1,14 @@ -{ stdenv, cmake, fetchFromGitHub }: +{ lib, stdenv, cmake, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "rapidcheck"; - version = "unstable-2018-09-27"; + version = "unstable-2020-12-19"; src = fetchFromGitHub { owner = "emil-e"; repo = "rapidcheck"; - rev = "de54478fa35c0d9cea14ec0c5c9dfae906da524c"; - sha256 = "0n8l0mlq9xqmpkgcj5xicicd1my2cfwxg25zdy8347dqkl1ppgbs"; + rev = "b78f89288c7e086d06e2a1e10b605d8375517a8a"; + sha256 = "0fj11gbhkaxbsgix2im7vdfvr26l75b8djk462sfw8xrwrfkjbdz"; }; nativeBuildInputs = [ cmake ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { rm $out/extras/**/CMakeLists.txt ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A C++ framework for property based testing inspired by QuickCheck"; inherit (src.meta) homepage; maintainers = with maintainers; [ jb55 ]; diff --git a/pkgs/development/libraries/rapidjson/default.nix b/pkgs/development/libraries/rapidjson/default.nix index ea91c1507dc..52a0877e77f 100644 --- a/pkgs/development/libraries/rapidjson/default.nix +++ b/pkgs/development/libraries/rapidjson/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake }: +{ stdenv, lib, fetchFromGitHub, pkg-config, cmake }: stdenv.mkDerivation rec { pname = "rapidjson"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1jixgb8w97l9gdh3inihz7avz7i770gy2j2irvvlyrq3wi41f5ab"; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; preConfigure = '' substituteInPlace CMakeLists.txt --replace "-Werror" "" diff --git a/pkgs/development/libraries/rapidxml/default.nix b/pkgs/development/libraries/rapidxml/default.nix index ca072f2ca4b..e5ae16087cb 100644 --- a/pkgs/development/libraries/rapidxml/default.nix +++ b/pkgs/development/libraries/rapidxml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { pname = "rapidxml"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cp * $out/include/${pname} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast XML DOM-style parser in C++"; homepage = "http://rapidxml.sourceforge.net/"; license = licenses.boost; diff --git a/pkgs/development/libraries/rarian/default.nix b/pkgs/development/libraries/rarian/default.nix index 1e2d954fa94..522456cfa40 100644 --- a/pkgs/development/libraries/rarian/default.nix +++ b/pkgs/development/libraries/rarian/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, perlPackages, libxml2, libxslt, docbook_xml_dtd_42, gnome3}: +{lib, stdenv, fetchurl, pkg-config, perlPackages, libxml2, libxslt, docbook_xml_dtd_42, gnome3}: let pname = "rarian"; version = "0.8.1"; @@ -6,11 +6,11 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.gz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.gz"; sha256 = "aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxml2 libxslt ] ++ (with perlPackages; [ perl XMLParser ]); configureFlags = [ "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat" ]; @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Documentation metadata library based on the proposed Freedesktop.org spec"; homepage = "https://rarian.freedesktop.org/"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix index da595dfb3b6..a42941cbb68 100644 --- a/pkgs/development/libraries/rdkafka/default.nix +++ b/pkgs/development/libraries/rdkafka/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, zlib, perl, pkgconfig, python, openssl }: +{ lib, stdenv, fetchFromGitHub, zlib, perl, pkg-config, python, openssl }: stdenv.mkDerivation rec { pname = "rdkafka"; - version = "1.5.3"; + version = "1.6.0"; src = fetchFromGitHub { owner = "edenhill"; repo = "librdkafka"; rev = "v${version}"; - sha256 = "12cc7l5vpxyrm8ca0cpm8sdl54hb8dranal8sz55r9y8igz1q1wb"; + sha256 = "sha256-VCGR0Q8FcoDLr+CFTk/OLMI4zs87K/IdZS1ANmkeb4s="; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib perl python openssl ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "librdkafka - Apache Kafka C/C++ client library"; homepage = "https://github.com/edenhill/librdkafka"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/re2/default.nix b/pkgs/development/libraries/re2/default.nix index d36b24d6108..2d8d0059764 100644 --- a/pkgs/development/libraries/re2/default.nix +++ b/pkgs/development/libraries/re2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { pname = "re2"; @@ -17,17 +17,21 @@ stdenv.mkDerivation { substituteInPlace Makefile --replace "SED_INPLACE=sed -i '''" "SED_INPLACE=sed -i" ''; + buildFlags = lib.optionals stdenv.hostPlatform.isStatic [ "static" ]; + preCheck = "patchShebangs runtests"; doCheck = true; checkTarget = "test"; + installTargets = lib.optionals stdenv.hostPlatform.isStatic [ "static-install" ]; + doInstallCheck = true; installCheckTarget = "testinstall"; meta = { homepage = "https://github.com/google/re2"; description = "An efficient, principled regular expression library"; - license = stdenv.lib.licenses.bsd3; - platforms = with stdenv.lib.platforms; all; + license = lib.licenses.bsd3; + platforms = with lib.platforms; all; }; } diff --git a/pkgs/development/libraries/readline/5.x.nix b/pkgs/development/libraries/readline/5.x.nix index 5833ca714e4..b2eab66387f 100644 --- a/pkgs/development/libraries/readline/5.x.nix +++ b/pkgs/development/libraries/readline/5.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses }: +{ lib, stdenv, fetchurl, ncurses }: stdenv.mkDerivation { name = "readline-5.2"; @@ -10,9 +10,9 @@ stdenv.mkDerivation { propagatedBuildInputs = [ncurses]; - patches = stdenv.lib.optional stdenv.isDarwin ./shobj-darwin.patch; + patches = lib.optional stdenv.isDarwin ./shobj-darwin.patch; - meta = with stdenv.lib; { + meta = with lib; { branch = "5"; platforms = platforms.unix; license = licenses.gpl2; diff --git a/pkgs/development/libraries/readline/6.2.nix b/pkgs/development/libraries/readline/6.2.nix index 3f3ca01961d..98db664dd8f 100644 --- a/pkgs/development/libraries/readline/6.2.nix +++ b/pkgs/development/libraries/readline/6.2.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, ncurses +{ fetchurl, lib, stdenv, ncurses }: stdenv.mkDerivation (rec { @@ -47,11 +47,11 @@ stdenv.mkDerivation (rec { homepage = "https://savannah.gnu.org/projects/readline/"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; maintainers = [ ]; branch = "6.2"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/readline/6.3.nix b/pkgs/development/libraries/readline/6.3.nix index 2b0cf978d43..2f63c4a3043 100644 --- a/pkgs/development/libraries/readline/6.3.nix +++ b/pkgs/development/libraries/readline/6.3.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, ncurses }: +{ fetchurl, lib, stdenv, ncurses }: stdenv.mkDerivation { name = "readline-6.3p08"; @@ -14,14 +14,14 @@ stdenv.mkDerivation { patchFlags = [ "-p0" ]; - configureFlags = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) + configureFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) # This test requires running host code "bash_cv_wcwidth_broken=no"; patches = [ ./link-against-ncurses.patch ./no-arch_only-6.3.patch - ] ++ stdenv.lib.optional stdenv.hostPlatform.useAndroidPrebuilt ./android.patch + ] ++ lib.optional stdenv.hostPlatform.useAndroidPrebuilt ./android.patch ++ (let patch = nr: sha256: @@ -32,7 +32,7 @@ stdenv.mkDerivation { in import ./readline-6.3-patches.nix patch); - meta = with stdenv.lib; { + meta = with lib; { description = "Library for interactive line editing"; longDescription = '' diff --git a/pkgs/development/libraries/readline/7.0.nix b/pkgs/development/libraries/readline/7.0.nix index 248ef55cce8..25ef4b97a86 100644 --- a/pkgs/development/libraries/readline/7.0.nix +++ b/pkgs/development/libraries/readline/7.0.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, ncurses +{ fetchurl, lib, stdenv, ncurses }: stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ] ++ upstreamPatches; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for interactive line editing"; longDescription = '' diff --git a/pkgs/development/libraries/readline/8.0.nix b/pkgs/development/libraries/readline/8.0.nix index 6e1182647c2..9ea0277467e 100644 --- a/pkgs/development/libraries/readline/8.0.nix +++ b/pkgs/development/libraries/readline/8.0.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, ncurses +{ fetchurl, lib, stdenv, ncurses }: stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ] ++ upstreamPatches; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for interactive line editing"; longDescription = '' diff --git a/pkgs/development/libraries/readosm/default.nix b/pkgs/development/libraries/readosm/default.nix index 6aed49d65e3..760546fc471 100644 --- a/pkgs/development/libraries/readosm/default.nix +++ b/pkgs/development/libraries/readosm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, expat, zlib, geos, libspatialite }: +{ lib, stdenv, fetchurl, expat, zlib, geos, libspatialite }: stdenv.mkDerivation rec { name = "readosm-1.1.0a"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "An open source library to extract valid data from within an Open Street Map input file"; homepage = "https://www.gaia-gis.it/fossil/readosm"; - license = with stdenv.lib.licenses; [ mpl11 gpl2Plus lgpl21Plus ]; - platforms = stdenv.lib.platforms.linux; + license = with lib.licenses; [ mpl11 gpl2Plus lgpl21Plus ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/redkite/default.nix b/pkgs/development/libraries/redkite/default.nix index ce3ac37895e..bc82e95be71 100644 --- a/pkgs/development/libraries/redkite/default.nix +++ b/pkgs/development/libraries/redkite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, cairo }: +{ lib, stdenv, fetchFromGitHub, cmake, cairo }: stdenv.mkDerivation rec { pname = "redkite"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ cairo ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://gitlab.com/iurie-sw/redkite"; description = "A small GUI toolkit"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/relibc/default.nix b/pkgs/development/libraries/relibc/default.nix index cedffcaaef9..5f27f902fa9 100644 --- a/pkgs/development/libraries/relibc/default.nix +++ b/pkgs/development/libraries/relibc/default.nix @@ -1,7 +1,7 @@ -{ stdenvNoCC, buildPackages, makeRustPlatform }: +{ lib, stdenvNoCC, buildPackages, makeRustPlatform }: let - rpath = stdenvNoCC.lib.makeLibraryPath [ + rpath = lib.makeLibraryPath [ buildPackages.stdenv.cc.libc "$out" ]; @@ -30,7 +30,7 @@ let "{}" \; ''; - meta.platforms = with stdenvNoCC.lib; platforms.redox ++ platforms.linux; + meta.platforms = with lib; platforms.redox ++ platforms.linux; }; redoxRustPlatform = buildPackages.makeRustPlatform { @@ -68,7 +68,7 @@ redoxRustPlatform.buildRustPackage rec { cargoSha256 = "1fzz7ba3ga57x1cbdrcfrdwwjr70nh4skrpxp4j2gak2c3scj6rz"; - meta = with stdenvNoCC.lib; { + meta = with lib; { homepage = "https://gitlab.redox-os.org/redox-os/relibc"; description = "C Library in Rust for Redox and Linux"; license = licenses.mit; diff --git a/pkgs/development/libraries/rep-gtk/default.nix b/pkgs/development/libraries/rep-gtk/default.nix index 0f8caecf808..618c91421b6 100644 --- a/pkgs/development/libraries/rep-gtk/default.nix +++ b/pkgs/development/libraries/rep-gtk/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, autoreconfHook, librep, gtk2 }: +{ lib, stdenv, fetchurl, pkg-config, autoreconfHook, librep, gtk2 }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "rep-gtk"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0hgkkywm8zczir3lqr727bn7ybgg71x9cwj1av8fykkr8pdpard9"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ ]; propagatedBuildInputs = [ librep gtk2 ]; diff --git a/pkgs/development/libraries/resolv_wrapper/default.nix b/pkgs/development/libraries/resolv_wrapper/default.nix index 168b82eec16..5b73bc41475 100644 --- a/pkgs/development/libraries/resolv_wrapper/default.nix +++ b/pkgs/development/libraries/resolv_wrapper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig }: +{ lib, stdenv, fetchurl, cmake, pkg-config }: stdenv.mkDerivation rec { name = "resolv_wrapper-1.1.6"; @@ -8,9 +8,9 @@ stdenv.mkDerivation rec { sha256 = "13k76l4s0v032xyyaf19qw6p4qc81ybx1wynkz2pzjhiljazsdpa"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A wrapper for the user, group and hosts NSS API"; homepage = "https://git.samba.org/?p=uid_wrapper.git;a=summary;"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/rlog/default.nix b/pkgs/development/libraries/rlog/default.nix index cbc564fe230..88a96209993 100644 --- a/pkgs/development/libraries/rlog/default.nix +++ b/pkgs/development/libraries/rlog/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "rlog-1.4"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { meta = { homepage = "https://www.arg0.net/rlog"; description = "A C++ logging library used in encfs"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.lgpl3; + platforms = lib.platforms.linux; + license = lib.licenses.lgpl3; }; } diff --git a/pkgs/development/libraries/rlottie/default.nix b/pkgs/development/libraries/rlottie/default.nix index 3713bcf1df7..a8cd88cae50 100644 --- a/pkgs/development/libraries/rlottie/default.nix +++ b/pkgs/development/libraries/rlottie/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkg-config }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config }: stdenv.mkDerivation rec { pname = "rlottie"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/Samsung/rlottie"; description = "A platform independent standalone c++ library for rendering vector based animations and art in realtime"; license = licenses.unfree; # Mixed, see https://github.com/Samsung/rlottie/blob/master/COPYING diff --git a/pkgs/development/libraries/rnnoise-plugin/default.nix b/pkgs/development/libraries/rnnoise-plugin/default.nix index c359c753388..e68f74e2896 100644 --- a/pkgs/development/libraries/rnnoise-plugin/default.nix +++ b/pkgs/development/libraries/rnnoise-plugin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, SDL2, fetchFromGitHub, cmake }: +{ lib, stdenv, SDL2, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "rnnoise-plugin"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A real-time noise suppression plugin for voice based on Xiph's RNNoise"; homepage = "https://github.com/werman/noise-suppression-for-voice"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/robin-map/default.nix b/pkgs/development/libraries/robin-map/default.nix index 9c0774f925b..a0a068dc142 100644 --- a/pkgs/development/libraries/robin-map/default.nix +++ b/pkgs/development/libraries/robin-map/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/Tessil/robin-map"; description = "C++ implementation of a fast hash map and hash set using robin hood hashing"; license = licenses.mit; diff --git a/pkgs/development/libraries/rocclr/default.nix b/pkgs/development/libraries/rocclr/default.nix index 5e6ce5d6797..278fdecc1a6 100644 --- a/pkgs/development/libraries/rocclr/default.nix +++ b/pkgs/development/libraries/rocclr/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , rocm-cmake @@ -32,11 +32,8 @@ stdenv.mkDerivation rec { prePatch = '' substituteInPlace CMakeLists.txt \ - --replace 'set(ROCCLR_EXPORTS_FILE "''${CMAKE_CURRENT_BINARY_DIR}/amdrocclr_staticTargets.cmake")' \ - 'set(ROCCLR_EXPORTS_FILE "''${CMAKE_INSTALL_LIBDIR}/cmake/amdrocclr_staticTargets.cmake")' \ --replace 'set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ''${CMAKE_CURRENT_BINARY_DIR}/lib)' \ - 'set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ''${CMAKE_INSTALL_LIBDIR})' \ - --replace 'find_library( OpenCL REQUIRED' 'find_library( OpenCL' + 'set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ''${CMAKE_INSTALL_LIBDIR})' substituteInPlace device/comgrctx.cpp \ --replace "libamd_comgr.so" "${rocm-comgr}/lib/libamd_comgr.so" ''; @@ -54,7 +51,7 @@ stdenv.mkDerivation rec { --replace "/build/source/build" "$out" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Radeon Open Compute common language runtime"; homepage = "https://github.com/ROCm-Developer-Tools/ROCclr"; license = licenses.mit; diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index 12a731385ff..dea8fcc6759 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch , cmake @@ -15,22 +15,22 @@ stdenv.mkDerivation rec { pname = "rocksdb"; - version = "6.14.6"; + version = "6.15.4"; src = fetchFromGitHub { owner = "facebook"; repo = pname; rev = "v${version}"; - sha256 = "0cp0jgzwkwamykgnmsg0zvzakq58f1ihs7lslnn4nh4p9gm75rq5"; + sha256 = "06lddr6md4ypmywvi6qrrkw97c8ddz0flj43hzx32ia3iq2mw4w5"; }; nativeBuildInputs = [ cmake ninja ]; propagatedBuildInputs = [ bzip2 lz4 snappy zlib zstd ]; - buildInputs = stdenv.lib.optional enableJemalloc jemalloc; + buildInputs = lib.optional enableJemalloc jemalloc; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-error=deprecated-copy -Wno-error=pessimizing-move"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=deprecated-copy -Wno-error=pessimizing-move"; cmakeFlags = [ "-DPORTABLE=1" @@ -47,17 +47,17 @@ stdenv.mkDerivation rec { "-DWITH_GFLAGS=0" "-DUSE_RTTI=1" "-DROCKSDB_INSTALL_ON_WINDOWS=YES" # harmless elsewhere - (stdenv.lib.optional + (lib.optional (stdenv.hostPlatform.isx86 && stdenv.hostPlatform.isLinux) "-DFORCE_SSE42=1") - (stdenv.lib.optional enableLite "-DROCKSDB_LITE=1") + (lib.optional enableLite "-DROCKSDB_LITE=1") "-DFAIL_ON_WARNINGS=${if stdenv.hostPlatform.isMinGW then "NO" else "YES"}" - ] ++ stdenv.lib.optional (!enableShared) "-DROCKSDB_BUILD_SHARED=0"; + ] ++ lib.optional (!enableShared) "-DROCKSDB_BUILD_SHARED=0"; # otherwise "cc1: error: -Wformat-security ignored without -Wformat [-Werror=format-security]" - hardeningDisable = stdenv.lib.optional stdenv.hostPlatform.isWindows "format"; + hardeningDisable = lib.optional stdenv.hostPlatform.isWindows "format"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://rocksdb.org"; description = "A library that provides an embeddable, persistent key-value store for fast storage"; license = licenses.asl20; diff --git a/pkgs/development/libraries/rocm-comgr/default.nix b/pkgs/development/libraries/rocm-comgr/default.nix index f8254991013..96f7108e3fe 100644 --- a/pkgs/development/libraries/rocm-comgr/default.nix +++ b/pkgs/development/libraries/rocm-comgr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, clang, device-libs, lld, llvm }: +{ lib, stdenv, fetchFromGitHub, cmake, clang, device-libs, lld, llvm }: stdenv.mkDerivation rec { pname = "rocm-comgr"; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { -i CMakeLists.txt ''; - meta = with stdenv.lib; { + meta = with lib; { description = "APIs for compiling and inspecting AMDGPU code objects"; homepage = "https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/tree/amd-stg-open/lib/comgr"; license = licenses.ncsa; diff --git a/pkgs/development/libraries/rocm-device-libs/default.nix b/pkgs/development/libraries/rocm-device-libs/default.nix index 7c50e375228..965d92179b6 100644 --- a/pkgs/development/libraries/rocm-device-libs/default.nix +++ b/pkgs/development/libraries/rocm-device-libs/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , clang @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { "-DCLANG=${clang}/bin/clang" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Set of AMD-specific device-side language runtime libraries"; homepage = "https://github.com/RadeonOpenCompute/ROCm-Device-Libs"; license = licenses.ncsa; diff --git a/pkgs/development/libraries/rocm-opencl-icd/default.nix b/pkgs/development/libraries/rocm-opencl-icd/default.nix index 5f2188f6e7e..903c238f455 100644 --- a/pkgs/development/libraries/rocm-opencl-icd/default.nix +++ b/pkgs/development/libraries/rocm-opencl-icd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rocm-opencl-runtime }: +{ lib, stdenv, rocm-opencl-runtime }: stdenv.mkDerivation rec { pname = "rocm-opencl-icd"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { echo "${rocm-opencl-runtime}/lib/libamdocl64.so" > $out/etc/OpenCL/vendors/amdocl64.icd ''; - meta = with stdenv.lib; { + meta = with lib; { description = "OpenCL ICD definition for AMD GPUs using the ROCm stack"; license = licenses.mit; maintainers = with maintainers; [ danieldk ]; diff --git a/pkgs/development/libraries/rocm-opencl-runtime/default.nix b/pkgs/development/libraries/rocm-opencl-runtime/default.nix index ecd9e0f7e82..ab0957474ad 100644 --- a/pkgs/development/libraries/rocm-opencl-runtime/default.nix +++ b/pkgs/development/libraries/rocm-opencl-runtime/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , addOpenGLRunpath , cmake @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { echo 'add_dependencies(amdocl64 OpenCL)' >> amdocl/CMakeLists.txt ''; - meta = with stdenv.lib; { + meta = with lib; { description = "OpenCL runtime for AMD GPUs, part of the ROCm stack"; homepage = "https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"; license = with licenses; [ asl20 mit ]; diff --git a/pkgs/development/libraries/rocm-runtime/default.nix b/pkgs/development/libraries/rocm-runtime/default.nix index 15435e7914d..beb0c61e683 100644 --- a/pkgs/development/libraries/rocm-runtime/default.nix +++ b/pkgs/development/libraries/rocm-runtime/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , addOpenGLRunpath , clang-unwrapped @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { rm -rf $out/hsa ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Platform runtime for ROCm"; homepage = "https://github.com/RadeonOpenCompute/ROCR-Runtime"; license = with licenses; [ ncsa ]; diff --git a/pkgs/development/libraries/rocm-thunk/default.nix b/pkgs/development/libraries/rocm-thunk/default.nix index 535f686f23d..5863e1f0a57 100644 --- a/pkgs/development/libraries/rocm-thunk/default.nix +++ b/pkgs/development/libraries/rocm-thunk/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , pkg-config @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { cp -r $src/include $out ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Radeon open compute thunk interface"; homepage = "https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface"; license = with licenses; [ bsd2 mit ]; diff --git a/pkgs/development/libraries/rote/default.nix b/pkgs/development/libraries/rote/default.nix index 5ae66f676d6..e5fb0462683 100644 --- a/pkgs/development/libraries/rote/default.nix +++ b/pkgs/development/libraries/rote/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses }: +{ lib, stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { pname = "rote"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Our Own Terminal Emulation Library"; longDescription = '' ROTE is a simple C library for VT102 terminal emulation. It allows the diff --git a/pkgs/development/libraries/rttr/default.nix b/pkgs/development/libraries/rttr/default.nix index b4d9204c226..b0f4f2a567a 100644 --- a/pkgs/development/libraries/rttr/default.nix +++ b/pkgs/development/libraries/rttr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, ninja }: +{ lib, stdenv, fetchFromGitHub, cmake, ninja }: stdenv.mkDerivation rec { pname = "rttr"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { "-DBUILD_PACKAGE=OFF" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ Reflection Library"; homepage = "https://www.rttr.org"; license = licenses.mit; diff --git a/pkgs/development/libraries/rubberband/default.nix b/pkgs/development/libraries/rubberband/default.nix index ee9bcea5e52..7fc8fe98db2 100644 --- a/pkgs/development/libraries/rubberband/default.nix +++ b/pkgs/development/libraries/rubberband/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libsamplerate, libsndfile, fftw +{ lib, stdenv, fetchurl, pkg-config, libsamplerate, libsndfile, fftw , vamp-plugin-sdk, ladspaH }: stdenv.mkDerivation rec { @@ -10,10 +10,10 @@ stdenv.mkDerivation rec { sha256 = "4f5b9509364ea876b4052fc390c079a3ad4ab63a2683aad09662fb905c2dc026"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsamplerate libsndfile fftw vamp-plugin-sdk ladspaH ]; - meta = with stdenv.lib; { + meta = with lib; { description = "High quality software library for audio time-stretching and pitch-shifting"; homepage = "https://breakfastquay.com/rubberband/"; # commercial license available as well, see homepage. You'll get some more optimized routines diff --git a/pkgs/development/libraries/safefile/default.nix b/pkgs/development/libraries/safefile/default.nix index e4a3e586614..db18621d8e4 100644 --- a/pkgs/development/libraries/safefile/default.nix +++ b/pkgs/development/libraries/safefile/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, path, runtimeShell }: +{ lib, stdenv, fetchurl, path, runtimeShell }: stdenv.mkDerivation rec { pname = "safefile"; version = "1.0.5"; @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { meta = { inherit version; description = "File open routines to safely open a file when in the presence of an attack"; - license = stdenv.lib.licenses.asl20 ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.asl20 ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; homepage = "https://research.cs.wisc.edu/mist/safefile/"; updateWalker = true; }; diff --git a/pkgs/development/libraries/sbc/default.nix b/pkgs/development/libraries/sbc/default.nix index d3710043e6f..0ff6db17561 100644 --- a/pkgs/development/libraries/sbc/default.nix +++ b/pkgs/development/libraries/sbc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libsndfile }: +{ lib, stdenv, fetchurl, pkg-config, libsndfile }: stdenv.mkDerivation rec { name = "sbc-1.4"; @@ -8,10 +8,10 @@ stdenv.mkDerivation rec { sha256 = "1jal98pnrjkzxlkiqy0ykh4qmgnydz9bmsp1jn581p5kddpg92si"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsndfile ]; - meta = with stdenv.lib; { + meta = with lib; { description = "SubBand Codec Library"; homepage = "http://www.bluez.org/"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/sblim-sfcc/default.nix b/pkgs/development/libraries/sblim-sfcc/default.nix index 91baa8d03b8..c871f18e69b 100644 --- a/pkgs/development/libraries/sblim-sfcc/default.nix +++ b/pkgs/development/libraries/sblim-sfcc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, curl }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, curl }: stdenv.mkDerivation rec { pname = "sblim-sfcc"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Small Footprint CIM Client Library"; homepage = "https://sourceforge.net/projects/sblim/"; license = licenses.cpl10; diff --git a/pkgs/development/libraries/schroedinger/default.nix b/pkgs/development/libraries/schroedinger/default.nix index 712138b0edf..7706366dd6d 100644 --- a/pkgs/development/libraries/schroedinger/default.nix +++ b/pkgs/development/libraries/schroedinger/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, orc, pkgconfig, fetchpatch, autoreconfHook }: +{ lib, stdenv, fetchurl, orc, pkg-config, fetchpatch, autoreconfHook }: stdenv.mkDerivation { name = "schroedinger-1.0.11"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { outputs = [ "out" "dev" "devdoc" ]; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ orc ]; doCheck = (!stdenv.isDarwin); @@ -23,7 +23,7 @@ stdenv.mkDerivation { }) ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An implementation of the Dirac video codec in ANSI C"; homepage = "https://sourceforge.net/projects/schrodinger/"; maintainers = [ maintainers.spwhitt ]; diff --git a/pkgs/development/libraries/science/benchmark/papi/default.nix b/pkgs/development/libraries/science/benchmark/papi/default.nix index 00a6e50aa7f..c265f24c182 100644 --- a/pkgs/development/libraries/science/benchmark/papi/default.nix +++ b/pkgs/development/libraries/science/benchmark/papi/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl }: @@ -20,7 +20,7 @@ stdenv.mkDerivation { doCheck = true; checkTarget = "test"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://icl.utk.edu/papi/"; description = "PAPI provides the tool designer and application engineer with a consistent interface and methodology for use of the performance counter hardware found in most major microprocessors"; license = licenses.bsdOriginal; diff --git a/pkgs/development/libraries/science/biology/EBTKS/default.nix b/pkgs/development/libraries/science/biology/EBTKS/default.nix index c60fe31aaaf..b75ac06627f 100644 --- a/pkgs/development/libraries/science/biology/EBTKS/default.nix +++ b/pkgs/development/libraries/science/biology/EBTKS/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libminc }: +{ lib, stdenv, fetchFromGitHub, cmake, libminc }: stdenv.mkDerivation rec { pname = "EBTKS"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/BIC-MNI/${pname}"; description = "Library for working with MINC files"; maintainers = with maintainers; [ bcdarwin ]; diff --git a/pkgs/development/libraries/science/biology/bicgl/default.nix b/pkgs/development/libraries/science/biology/bicgl/default.nix index 4cc7dcada52..bc2de6e882f 100644 --- a/pkgs/development/libraries/science/biology/bicgl/default.nix +++ b/pkgs/development/libraries/science/biology/bicgl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libminc, bicpl, freeglut, mesa_glu }: +{ lib, stdenv, fetchFromGitHub, cmake, libminc, bicpl, freeglut, mesa_glu }: stdenv.mkDerivation rec { pname = "bicgl"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "-DBICPL_DIR=${bicpl}/lib" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/${owner}/${pname}"; description = "Brain Imaging Centre graphics library"; maintainers = with maintainers; [ bcdarwin ]; diff --git a/pkgs/development/libraries/science/biology/bicpl/default.nix b/pkgs/development/libraries/science/biology/bicpl/default.nix index 96199f0478e..0bdcbf5a828 100644 --- a/pkgs/development/libraries/science/biology/bicpl/default.nix +++ b/pkgs/development/libraries/science/biology/bicpl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libminc, netpbm }: +{ lib, stdenv, fetchFromGitHub, cmake, libminc, netpbm }: stdenv.mkDerivation rec { pname = "bicpl"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { doCheck = false; # internal_volume_io.h: No such file or directory - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/${owner}/${pname}"; description = "Brain Imaging Centre programming library"; maintainers = with maintainers; [ bcdarwin ]; diff --git a/pkgs/development/libraries/science/biology/bpp-core/default.nix b/pkgs/development/libraries/science/biology/bpp-core/default.nix index cfbe19d724b..d1eb096e08e 100644 --- a/pkgs/development/libraries/science/biology/bpp-core/default.nix +++ b/pkgs/development/libraries/science/biology/bpp-core/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "bpp-core"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isDarwin; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://biopp.univ-montp2.fr/wiki/index.php/Main_Page"; changelog = "https://github.com/BioPP/bpp-core/blob/master/ChangeLog"; description = "C++ bioinformatics libraries and tools"; diff --git a/pkgs/development/libraries/science/biology/bpp-seq/default.nix b/pkgs/development/libraries/science/biology/bpp-seq/default.nix index 79fd0fe6771..ef3f3d5756e 100644 --- a/pkgs/development/libraries/science/biology/bpp-seq/default.nix +++ b/pkgs/development/libraries/science/biology/bpp-seq/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isDarwin; - meta = bpp-core.meta // { + meta = bpp-core.meta // { changelog = "https://github.com/BioPP/bpp-seq/blob/master/ChangeLog"; }; } diff --git a/pkgs/development/libraries/science/biology/elastix/default.nix b/pkgs/development/libraries/science/biology/elastix/default.nix index e55a72fb9f8..55ee5ab4fb6 100644 --- a/pkgs/development/libraries/science/biology/elastix/default.nix +++ b/pkgs/development/libraries/science/biology/elastix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, itk, python3, Cocoa }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, itk, python3, Cocoa }: stdenv.mkDerivation rec { pname = "elastix"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake python3 ]; - buildInputs = [ itk ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ]; + buildInputs = [ itk ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; doCheck = !stdenv.isDarwin; # usual dynamic linker issues @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { export LD_LIBRARY_PATH=$(pwd)/bin "; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://elastix.isi.uu.nl/"; description = "Image registration toolkit based on ITK"; maintainers = with maintainers; [ bcdarwin ]; diff --git a/pkgs/development/libraries/science/biology/gifticlib/default.nix b/pkgs/development/libraries/science/biology/gifticlib/default.nix index dddf29fb019..306324129cb 100644 --- a/pkgs/development/libraries/science/biology/gifticlib/default.nix +++ b/pkgs/development/libraries/science/biology/gifticlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, expat, nifticlib, zlib }: +{ lib, stdenv, fetchFromGitHub, cmake, expat, nifticlib, zlib }: stdenv.mkDerivation rec { pname = "gifticlib"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { runHook postCheck ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.nitrc.org/projects/gifti"; description = "Medical imaging geometry format C API"; maintainers = with maintainers; [ bcdarwin ]; diff --git a/pkgs/development/libraries/science/biology/htslib/default.nix b/pkgs/development/libraries/science/biology/htslib/default.nix index 9da6595e7a4..cb3a543ad2a 100644 --- a/pkgs/development/libraries/science/biology/htslib/default.nix +++ b/pkgs/development/libraries/science/biology/htslib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, bzip2, lzma, curl, perl }: +{ lib, stdenv, fetchurl, zlib, bzip2, lzma, curl, perl }: stdenv.mkDerivation rec { pname = "htslib"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A C library for reading/writing high-throughput sequencing data"; license = licenses.mit; homepage = "http://www.htslib.org/"; diff --git a/pkgs/development/libraries/science/biology/mirtk/default.nix b/pkgs/development/libraries/science/biology/mirtk/default.nix index d010e84f712..0d23489696f 100644 --- a/pkgs/development/libraries/science/biology/mirtk/default.nix +++ b/pkgs/development/libraries/science/biology/mirtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, gtest, fetchFromGitHub, cmake, boost, eigen, python, vtk, zlib, tbb }: +{ lib, stdenv, gtest, fetchFromGitHub, cmake, boost, eigen, python, vtk, zlib, tbb }: stdenv.mkDerivation rec { version = "2.0.0"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake gtest ]; buildInputs = [ boost eigen python vtk zlib tbb ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/BioMedIA/MIRTK"; description = "Medical image registration library and tools"; maintainers = with maintainers; [ bcdarwin ]; diff --git a/pkgs/development/libraries/science/biology/nifticlib/default.nix b/pkgs/development/libraries/science/biology/nifticlib/default.nix index 572c31dd1e5..fee2ea8772b 100644 --- a/pkgs/development/libraries/science/biology/nifticlib/default.nix +++ b/pkgs/development/libraries/science/biology/nifticlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, zlib }: +{ lib, stdenv, fetchFromGitHub, cmake, zlib }: stdenv.mkDerivation rec { pname = "nifticlib"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://nifti-imaging.github.io"; description = "Medical imaging format C API"; maintainers = with maintainers; [ bcdarwin ]; diff --git a/pkgs/development/libraries/science/biology/oobicpl/default.nix b/pkgs/development/libraries/science/biology/oobicpl/default.nix index e5ecda0390b..626e6475ba1 100644 --- a/pkgs/development/libraries/science/biology/oobicpl/default.nix +++ b/pkgs/development/libraries/science/biology/oobicpl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libminc, bicpl, arguments, pcre-cpp }: +{ lib, stdenv, fetchFromGitHub, cmake, libminc, bicpl, arguments, pcre-cpp }: stdenv.mkDerivation rec { pname = "oobicpl"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "-DARGUMENTS_DIR=${arguments}/lib" "-DOOBICPL_BUILD_SHARED_LIBS=TRUE" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/${owner}/${pname}"; description = "Brain Imaging Centre object-oriented programming library (and tools)"; maintainers = with maintainers; [ bcdarwin ]; diff --git a/pkgs/development/libraries/science/math/QuadProgpp/default.nix b/pkgs/development/libraries/science/math/QuadProgpp/default.nix index b5fa5c8825e..254ce08dc60 100644 --- a/pkgs/development/libraries/science/math/QuadProgpp/default.nix +++ b/pkgs/development/libraries/science/math/QuadProgpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "QuadProgpp"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/liuq/QuadProgpp"; license = licenses.mit; description = '' diff --git a/pkgs/development/libraries/science/math/amd-blis/default.nix b/pkgs/development/libraries/science/math/amd-blis/default.nix index 9bddba0261f..42c84b3ed61 100644 --- a/pkgs/development/libraries/science/math/amd-blis/default.nix +++ b/pkgs/development/libraries/science/math/amd-blis/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , perl , python3 @@ -43,7 +43,7 @@ in stdenv.mkDerivation rec { configureFlags = [ "--enable-cblas" "--blas-int-size=${blasIntSize}" - ] ++ stdenv.lib.optionals withOpenMP [ "--enable-threading=openmp" ] + ] ++ lib.optionals withOpenMP [ "--enable-threading=openmp" ] ++ [ withArchitecture ]; postPatch = '' @@ -57,7 +57,7 @@ in stdenv.mkDerivation rec { ln -s $out/lib/libcblas.so.3 $out/lib/libcblas.so ''; - meta = with stdenv.lib; { + meta = with lib; { description = "BLAS-compatible library optimized for AMD CPUs"; homepage = "https://developer.amd.com/amd-aocl/blas-library/"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/science/math/amd-libflame/default.nix b/pkgs/development/libraries/science/math/amd-libflame/default.nix index 1e331bca695..ac35385f983 100644 --- a/pkgs/development/libraries/science/math/amd-libflame/default.nix +++ b/pkgs/development/libraries/science/math/amd-libflame/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { ln -s $out/lib/libflame.so.${version} $out/lib/liblapacke.so.3 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "LAPACK-compatible linear algebra library optimized for AMD CPUs"; homepage = "https://developer.amd.com/amd-aocl/blas-library/"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix index 0b927bb3eac..382f868a99a 100644 --- a/pkgs/development/libraries/science/math/arpack/default.nix +++ b/pkgs/development/libraries/science/math/arpack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake +{ lib, stdenv, fetchFromGitHub, cmake , gfortran, blas, lapack, eigen }: stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" - "-DINTERFACE64=${stdenv.lib.optionalString blas.isILP64 "1"}" + "-DINTERFACE64=${lib.optionalString blas.isILP64 "1"}" ]; preCheck = if stdenv.isDarwin then '' @@ -48,8 +48,8 @@ stdenv.mkDerivation rec { A collection of Fortran77 subroutines to solve large scale eigenvalue problems. ''; - license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.ttuegel ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.ttuegel ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/pkgs/development/libraries/science/math/blas/default.nix index c240a19cca6..332806c495c 100644 --- a/pkgs/development/libraries/science/math/blas/default.nix +++ b/pkgs/development/libraries/science/math/blas/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gfortran }: +{ lib, stdenv, fetchurl, gfortran }: stdenv.mkDerivation rec { pname = "blas"; @@ -38,13 +38,13 @@ stdenv.mkDerivation rec { installPhase = # FreeBSD's stdenv doesn't use Coreutils. let dashD = if stdenv.isFreeBSD then "" else "-D"; in - (stdenv.lib.optionalString stdenv.isFreeBSD "mkdir -p $out/lib ;") + (lib.optionalString stdenv.isFreeBSD "mkdir -p $out/lib ;") + '' install ${dashD} -m755 libblas.a "$out/lib/libblas.a" 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. + # Write pkg-config alias. # See also openblas/default.nix mkdir $out/lib/pkgconfig cat <<EOF > $out/lib/pkgconfig/blas.pc @@ -55,7 +55,7 @@ Libs: -L$out/lib -lblas EOF ''; - preFixup = stdenv.lib.optionalString stdenv.isDarwin '' + preFixup = lib.optionalString stdenv.isDarwin '' for fn in $(find $out/lib -name "*.so*"); do if [ -L "$fn" ]; then continue; fi install_name_tool -id "$fn" "$fn" @@ -64,8 +64,8 @@ EOF meta = { description = "Basic Linear Algebra Subprograms"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; homepage = "http://www.netlib.org/blas/"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/science/math/blis/default.nix b/pkgs/development/libraries/science/math/blis/default.nix index 3943c4dbbca..eb91e0a3d22 100644 --- a/pkgs/development/libraries/science/math/blis/default.nix +++ b/pkgs/development/libraries/science/math/blis/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , perl , python3 @@ -40,7 +40,7 @@ in stdenv.mkDerivation rec { configureFlags = [ "--enable-cblas" "--blas-int-size=${blasIntSize}" - ] ++ stdenv.lib.optionals withOpenMP [ "--enable-threading=openmp" ] + ] ++ lib.optionals withOpenMP [ "--enable-threading=openmp" ] ++ [ withArchitecture ]; postPatch = '' @@ -54,7 +54,7 @@ in stdenv.mkDerivation rec { ln -s $out/lib/libcblas.so.3 $out/lib/libcblas.so ''; - meta = with stdenv.lib; { + meta = with lib; { description = "BLAS-compatible linear algebra library"; homepage = "https://github.com/flame/blis"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/science/math/brial/default.nix b/pkgs/development/libraries/science/math/brial/default.nix index 175de67ad7e..870568c9ac9 100644 --- a/pkgs/development/libraries/science/math/brial/default.nix +++ b/pkgs/development/libraries/science/math/brial/default.nix @@ -1,7 +1,7 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook -, pkgconfig +, pkg-config , boost , m4ri , gd @@ -33,10 +33,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/BRiAl/BRiAl"; description = "Legacy version of PolyBoRi maintained by sagemath developers"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/science/math/caffe2/default.nix b/pkgs/development/libraries/science/math/caffe2/default.nix index 6b37abf9c69..fe9a8b67145 100644 --- a/pkgs/development/libraries/science/math/caffe2/default.nix +++ b/pkgs/development/libraries/science/math/caffe2/default.nix @@ -90,26 +90,26 @@ stdenv.mkDerivation rec { ./fix_compilation_on_gcc7.patch ] ++ lib.optional stdenv.cc.isClang [ ./update_clang_cvtsh_bugfix.patch ]; - cmakeFlags = [ ''-DBUILD_TEST=OFF'' - ''-DBUILD_PYTHON=ON'' - ''-DUSE_CUDA=${if useCuda then ''ON''else ''OFF''}'' - ''-DUSE_OPENMP=${if useOpenmp then ''ON''else ''OFF''}'' - ''-DUSE_OPENCV=${if useOpencv3 then ''ON''else ''OFF''}'' - ''-DUSE_MPI=${if useMpi then ''ON''else ''OFF''}'' - ''-DUSE_LEVELDB=${if useLeveldb then ''ON''else ''OFF''}'' - ''-DUSE_LMDB=${if useLmdb then ''ON''else ''OFF''}'' - ''-DUSE_ROCKSDB=${if useRocksdb then ''ON''else ''OFF''}'' - ''-DUSE_ZMQ=${if useZeromq then ''ON''else ''OFF''}'' - ''-DUSE_GLOO=OFF'' - ''-DUSE_NNPACK=OFF'' - ''-DUSE_NCCL=OFF'' - ''-DUSE_REDIS=OFF'' - ''-DUSE_FFMPEG=OFF'' + cmakeFlags = [ "-DBUILD_TEST=OFF" + "-DBUILD_PYTHON=ON" + ''-DUSE_CUDA=${if useCuda then "ON"else "OFF"}'' + ''-DUSE_OPENMP=${if useOpenmp then "ON"else "OFF"}'' + ''-DUSE_OPENCV=${if useOpencv3 then "ON"else "OFF"}'' + ''-DUSE_MPI=${if useMpi then "ON"else "OFF"}'' + ''-DUSE_LEVELDB=${if useLeveldb then "ON"else "OFF"}'' + ''-DUSE_LMDB=${if useLmdb then "ON"else "OFF"}'' + ''-DUSE_ROCKSDB=${if useRocksdb then "ON"else "OFF"}'' + ''-DUSE_ZMQ=${if useZeromq then "ON"else "OFF"}'' + "-DUSE_GLOO=OFF" + "-DUSE_NNPACK=OFF" + "-DUSE_NCCL=OFF" + "-DUSE_REDIS=OFF" + "-DUSE_FFMPEG=OFF" ] ++ lib.optional useCuda [ - ''-DCUDA_TOOLKIT_ROOT_DIR=${cudatoolkit}'' - ''-DCUDA_FAST_MATH=ON'' - ''-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/gcc'' + "-DCUDA_TOOLKIT_ROOT_DIR=${cudatoolkit}" + "-DCUDA_FAST_MATH=ON" + "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/gcc" ]; preConfigure = '' @@ -136,8 +136,8 @@ stdenv.mkDerivation rec { algorithms. You can bring your creations to scale using the power of GPUs in the cloud or to the masses on mobile with Caffe2's cross-platform libraries. ''; - platforms = with stdenv.lib.platforms; linux; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ yuriaisaka ]; + platforms = with lib.platforms; linux; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ yuriaisaka ]; }; } diff --git a/pkgs/development/libraries/science/math/cholmod-extra/default.nix b/pkgs/development/libraries/science/math/cholmod-extra/default.nix index c381f56277e..38d1b126ea4 100644 --- a/pkgs/development/libraries/science/math/cholmod-extra/default.nix +++ b/pkgs/development/libraries/science/math/cholmod-extra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gfortran, suitesparse, blas, lapack }: +{ lib, stdenv, fetchFromGitHub, gfortran, suitesparse, blas, lapack }: stdenv.mkDerivation rec { pname = "cholmod-extra"; version = "1.2.0"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/jluttine/cholmod-extra"; description = "A set of additional routines for SuiteSparse CHOLMOD Module"; license = with licenses; [ gpl2Plus ]; diff --git a/pkgs/development/libraries/science/math/clblas/default.nix b/pkgs/development/libraries/science/math/clblas/default.nix index a22cf914cf6..aca395001f9 100644 --- a/pkgs/development/libraries/science/math/clblas/default.nix +++ b/pkgs/development/libraries/science/math/clblas/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , gfortran @@ -41,19 +41,19 @@ stdenv.mkDerivation rec { blas python boost - ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.isDarwin) [ ocl-icd opencl-headers - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ Accelerate CoreGraphics CoreVideo ]; - propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ + propagatedBuildInputs = lib.optionals stdenv.isDarwin [ OpenCL ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/clMathLibraries/clBLAS"; description = "A software library containing BLAS functions written in OpenCL"; longDescription = '' diff --git a/pkgs/development/libraries/science/math/cliquer/default.nix b/pkgs/development/libraries/science/math/cliquer/default.nix index 7fe80c323f6..0d8bafffb44 100644 --- a/pkgs/development/libraries/science/math/cliquer/default.nix +++ b/pkgs/development/libraries/science/math/cliquer/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { autoreconfHook ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://users.aalto.fi/~pat/cliquer.html"; downloadPage = src.meta.homepage; # autocliquer description = "Routines for clique searching"; diff --git a/pkgs/development/libraries/science/math/clmagma/default.nix b/pkgs/development/libraries/science/math/clmagma/default.nix index 2e798a6b83e..60a3afb5077 100644 --- a/pkgs/development/libraries/science/math/clmagma/default.nix +++ b/pkgs/development/libraries/science/math/clmagma/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, gfortran, opencl-headers, clblas, ocl-icd, mkl, intel-ocl }: +{ lib, stdenv, fetchurl, gfortran, opencl-headers, clblas, ocl-icd, mkl, intel-ocl }: -with stdenv.lib; +with lib; let version = "1.3.0"; @@ -65,7 +65,7 @@ in stdenv.mkDerivation { cp ${incfile} make.inc ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Matrix Algebra on GPU and Multicore Architectures, OpenCL port"; license = licenses.bsd3; homepage = "http://icl.cs.utk.edu/magma/index.html"; diff --git a/pkgs/development/libraries/science/math/cudnn/generic.nix b/pkgs/development/libraries/science/math/cudnn/generic.nix index e727218c055..59c0b7f4498 100644 --- a/pkgs/development/libraries/science/math/cudnn/generic.nix +++ b/pkgs/development/libraries/science/math/cudnn/generic.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation { majorVersion = lib.versions.major version; }; - meta = with stdenv.lib; { + meta = with lib; { description = "NVIDIA CUDA Deep Neural Network library (cuDNN)"; homepage = "https://developer.nvidia.com/cudnn"; license = licenses.unfree; diff --git a/pkgs/development/libraries/science/math/ecos/default.nix b/pkgs/development/libraries/science/math/ecos/default.nix index 2ba69a34a4a..b60bd1fe76c 100644 --- a/pkgs/development/libraries/science/math/ecos/default.nix +++ b/pkgs/development/libraries/science/math/ecos/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "ecos"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { cp -r include $out/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A lightweight conic solver for second-order cone programming"; homepage = "https://www.embotech.com/ECOS"; downloadPage = "https://github.com/embotech/ecos/releases"; diff --git a/pkgs/development/libraries/science/math/fenics/default.nix b/pkgs/development/libraries/science/math/fenics/default.nix index 4e89aeebe2b..e80607ab955 100644 --- a/pkgs/development/libraries/science/math/fenics/default.nix +++ b/pkgs/development/libraries/science/math/fenics/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , boost @@ -50,8 +50,8 @@ let meta = { description = "Distributed just-in-time shared library building"; homepage = "https://fenicsproject.org/"; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.lgpl3; + platforms = lib.platforms.all; + license = lib.licenses.lgpl3; }; }; @@ -80,8 +80,8 @@ let meta = { description = "Automatic generation of finite element basis functions"; homepage = "https://fenicsproject.org/"; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.lgpl3; + platforms = lib.platforms.all; + license = lib.licenses.lgpl3; }; }; @@ -102,8 +102,8 @@ let meta = { description = "A domain-specific language for finite element variational forms"; homepage = "https://fenicsproject.org/"; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.lgpl3; + platforms = lib.platforms.all; + license = lib.licenses.lgpl3; }; }; @@ -139,8 +139,8 @@ let meta = { description = "A compiler for finite element variational forms"; homepage = "https://fenicsproject.org/"; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.lgpl3; + platforms = lib.platforms.all; + license = lib.licenses.lgpl3; }; }; dolfin = stdenv.mkDerivation { @@ -215,7 +215,7 @@ let meta = { description = "The FEniCS Problem Solving Environment in Python and C++"; homepage = "https://fenicsproject.org/"; - license = stdenv.lib.licenses.lgpl3; + license = lib.licenses.lgpl3; }; }; python-dolfin = pythonPackages.buildPythonPackage rec { @@ -233,8 +233,8 @@ let export CMAKE_PREFIX_PATH=${pybind11}/share/cmake/pybind11:$CMAKE_PREFIX_PATH substituteInPlace setup.py --replace "pybind11==2.2.4" "pybind11" substituteInPlace dolfin/jit/jit.py \ - --replace 'pkgconfig.exists("dolfin")' 'pkgconfig.exists("${dolfin}/lib/pkgconfig/dolfin.pc")' \ - --replace 'pkgconfig.parse("dolfin")' 'pkgconfig.parse("${dolfin}/lib/pkgconfig/dolfin.pc")' + --replace 'pkg-config.exists("dolfin")' 'pkg-config.exists("${dolfin}/lib/pkgconfig/dolfin.pc")' \ + --replace 'pkg-config.parse("dolfin")' 'pkg-config.parse("${dolfin}/lib/pkgconfig/dolfin.pc")' ''; buildInputs = [ dolfin @@ -254,8 +254,8 @@ let meta = { description = "Python bindings for the DOLFIN FEM compiler"; homepage = "https://fenicsproject.org/"; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.lgpl3; + platforms = lib.platforms.all; + license = lib.licenses.lgpl3; }; }; in python-dolfin diff --git a/pkgs/development/libraries/science/math/flintqs/default.nix b/pkgs/development/libraries/science/math/flintqs/default.nix index 32fb70978cf..c956eae4f71 100644 --- a/pkgs/development/libraries/science/math/flintqs/default.nix +++ b/pkgs/development/libraries/science/math/flintqs/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook , gmp @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/sagemath/FlintQS"; description = "Highly optimized multi-polynomial quadratic sieve for integer factorization"; license = with licenses; [ gpl2 ]; diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix index 97374fb0d47..d1d7a9b9f34 100644 --- a/pkgs/development/libraries/science/math/ipopt/default.nix +++ b/pkgs/development/libraries/science/math/ipopt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, blas, lapack, gfortran }: +{ lib, stdenv, fetchurl, unzip, blas, lapack, gfortran }: assert (!blas.isILP64) && (!lapack.isILP64); @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A software package for large-scale nonlinear optimization"; homepage = "https://projects.coin-or.org/Ipopt"; license = licenses.epl10; diff --git a/pkgs/development/libraries/science/math/itpp/default.nix b/pkgs/development/libraries/science/math/itpp/default.nix index 90e0a84e1e2..81303a3653e 100644 --- a/pkgs/development/libraries/science/math/itpp/default.nix +++ b/pkgs/development/libraries/science/math/itpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , cmake , gtest @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ./gtests/itpp_gtests ''; - meta = with stdenv.lib; { + meta = with lib; { description = "IT++ is a C++ library of mathematical, signal processing and communication classes and functions"; homepage = http://itpp.sourceforge.net/; license = licenses.gpl3; diff --git a/pkgs/development/libraries/science/math/lcalc/default.nix b/pkgs/development/libraries/science/math/lcalc/default.nix index 6f80e1fd23e..95034c3637a 100644 --- a/pkgs/development/libraries/science/math/lcalc/default.nix +++ b/pkgs/development/libraries/science/math/lcalc/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , pari @@ -68,13 +68,13 @@ stdenv.mkDerivation rec { url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/lcalc-c++11.patch?h=packages/lcalc&id=3607b97df5a8c231191115b0cb5c62426b339e71"; sha256 = "1ccrl61lv2vvx8ggldq54m5d0n1iy6mym7qz0i8nj6yj0dshnpk3"; }) - ] ++ stdenv.lib.optional stdenv.isDarwin + ] ++ lib.optional stdenv.isDarwin (fetchpatch { url = "https://git.sagemath.org/sage.git/plain/build/pkgs/lcalc/patches/clang.patch"; sha256 = "0bb7656z6cp6i4p2qj745cmq0lhh52v2akl9whi760dynfdxbl18"; }); - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace src/Makefile --replace g++ c++ ''; @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { "PARI_PREFIX=${pari}" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://oto.math.uwaterloo.ca/~mrubinst/L_function_public/L.html"; description = "A program for calculating with L-functions"; license = with licenses; [ gpl2 ]; diff --git a/pkgs/development/libraries/science/math/libbraiding/default.nix b/pkgs/development/libraries/science/math/libbraiding/default.nix index 36d4ad54c3d..cc5d3baf344 100644 --- a/pkgs/development/libraries/science/math/libbraiding/default.nix +++ b/pkgs/development/libraries/science/math/libbraiding/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { # no tests included for now (2018-08-05), but can't hurt to activate doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/miguelmarco/libbraiding/"; description = "C++ library for computations on braid groups"; longDescription = '' diff --git a/pkgs/development/libraries/science/math/libhomfly/default.nix b/pkgs/development/libraries/science/math/libhomfly/default.nix index 788f534cc77..b756109aa8f 100644 --- a/pkgs/development/libraries/science/math/libhomfly/default.nix +++ b/pkgs/development/libraries/science/math/libhomfly/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook , boehmgc @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/miguelmarco/libhomfly/"; description = "Library to compute the homfly polynomial of knots and links"; license = licenses.unlicense; diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index c44e995bfbb..c742cc60b27 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -1,5 +1,5 @@ { - stdenv, + lib, stdenv, fetchFromGitHub, gfortran, cmake, @@ -7,7 +7,7 @@ shared ? true }: let - inherit (stdenv.lib) optional; + inherit (lib) optional; version = "3.9.0"; in @@ -33,7 +33,7 @@ stdenv.mkDerivation { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { inherit version; description = "Linear Algebra PACKage"; homepage = "http://www.netlib.org/lapack/"; diff --git a/pkgs/development/libraries/science/math/liblbfgs/default.nix b/pkgs/development/libraries/science/math/liblbfgs/default.nix index 49108e5e330..20c5a2070a0 100644 --- a/pkgs/development/libraries/science/math/liblbfgs/default.nix +++ b/pkgs/development/libraries/science/math/liblbfgs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "liblbfgs-1.10"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { meta = { description = "Library of Limited-memory Broyden-Fletcher-Goldfarb-Shanno (L-BFGS)"; homepage = "http://www.chokkan.org/software/liblbfgs/"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.mit; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/science/math/libtorch/bin.nix b/pkgs/development/libraries/science/math/libtorch/bin.nix index fba8bcb9367..9631f3931ca 100644 --- a/pkgs/development/libraries/science/math/libtorch/bin.nix +++ b/pkgs/development/libraries/science/math/libtorch/bin.nix @@ -25,7 +25,7 @@ in stdenv.mkDerivation { nativeBuildInputs = if stdenv.isDarwin then [ fixDarwinDylibNames ] else [ addOpenGLRunpath patchelf ] - ++ stdenv.lib.optionals cudaSupport [ addOpenGLRunpath ]; + ++ lib.optionals cudaSupport [ addOpenGLRunpath ]; buildInputs = [ stdenv.cc.cc @@ -57,9 +57,9 @@ in stdenv.mkDerivation { postFixup = let libPaths = [ stdenv.cc.cc.lib ] - ++ stdenv.lib.optionals cudaSupport [ nvidia_x11 ]; - rpath = stdenv.lib.makeLibraryPath libPaths; - in stdenv.lib.optionalString stdenv.isLinux '' + ++ lib.optionals cudaSupport [ nvidia_x11 ]; + rpath = lib.makeLibraryPath libPaths; + in lib.optionalString stdenv.isLinux '' find $out/lib -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do echo "setting rpath for $lib..." patchelf --set-rpath "${rpath}:$out/lib" "$lib" @@ -67,7 +67,7 @@ in stdenv.mkDerivation { addOpenGLRunpath "$lib" ''} done - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' install_name_tool -change @rpath/libshm.dylib $out/lib/libshm.dylib $out/lib/libtorch_python.dylib install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libtorch_python.dylib install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libtorch_python.dylib @@ -110,7 +110,7 @@ in stdenv.mkDerivation { passthru.tests.cmake = callPackage ./test { }; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ API of the PyTorch machine learning framework"; homepage = "https://pytorch.org/"; license = licenses.unfree; # Includes CUDA and Intel MKL. diff --git a/pkgs/development/libraries/science/math/lrs/default.nix b/pkgs/development/libraries/science/math/lrs/default.nix index b0cfbca5aa3..f7f981e223b 100644 --- a/pkgs/development/libraries/science/math/lrs/default.nix +++ b/pkgs/development/libraries/science/math/lrs/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gmp}: +{lib, stdenv, fetchurl, gmp}: stdenv.mkDerivation rec { pname = "lrs"; @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { meta = { inherit version; description = "Implementation of the reverse search algorithm for vertex enumeration/convex hull problems"; - license = stdenv.lib.licenses.gpl2 ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2 ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; homepage = "http://cgm.cs.mcgill.ca/~avis/C/lrs.html"; }; } diff --git a/pkgs/development/libraries/science/math/m4ri/default.nix b/pkgs/development/libraries/science/math/m4ri/default.nix index f50c15abbdf..26e26e4ffdb 100644 --- a/pkgs/development/libraries/science/math/m4ri/default.nix +++ b/pkgs/development/libraries/science/math/m4ri/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromBitbucket , autoreconfHook }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { autoreconfHook ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://malb.bitbucket.io/m4ri/"; description = "Library to do fast arithmetic with dense matrices over F_2"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/science/math/m4rie/default.nix b/pkgs/development/libraries/science/math/m4rie/default.nix index 532285991a3..38a633e58c7 100644 --- a/pkgs/development/libraries/science/math/m4rie/default.nix +++ b/pkgs/development/libraries/science/math/m4rie/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromBitbucket , autoreconfHook , m4ri @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { autoreconfHook ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://malb.bitbucket.io/m4rie/"; description = "Library for matrix multiplication, reduction and inversion over GF(2^k) for 2 <= k <= 10"; longDescription = '' diff --git a/pkgs/development/libraries/science/math/magma/default.nix b/pkgs/development/libraries/science/math/magma/default.nix index b4ac119ce6c..b8e3999ffe8 100644 --- a/pkgs/development/libraries/science/math/magma/default.nix +++ b/pkgs/development/libraries/science/math/magma/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, cmake, gfortran, ninja, cudatoolkit, libpthreadstubs, lapack, blas }: +{ lib, stdenv, fetchurl, cmake, gfortran, ninja, cudatoolkit, libpthreadstubs, lapack, blas }: -with stdenv.lib; +with lib; let version = "2.5.4"; @@ -43,7 +43,7 @@ in stdenv.mkDerivation { > $out/lib/pkgconfig/magma.pc ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Matrix Algebra on GPU and Multicore Architectures"; license = licenses.bsd3; homepage = "http://icl.cs.utk.edu/magma/index.html"; diff --git a/pkgs/development/libraries/science/math/metis/default.nix b/pkgs/development/libraries/science/math/metis/default.nix index d5861d9db33..b06b432372a 100644 --- a/pkgs/development/libraries/science/math/metis/default.nix +++ b/pkgs/development/libraries/science/math/metis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, cmake }: +{ lib, stdenv, fetchurl, unzip, cmake }: stdenv.mkDerivation { name = "metis-5.1.0"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = { description = "Serial graph partitioning and fill-reducing matrix ordering"; homepage = "http://glaros.dtc.umn.edu/gkhome/metis/metis/overview"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.asl20; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/development/libraries/science/math/mkl/default.nix index b631def3bb2..34fea3162a9 100644 --- a/pkgs/development/libraries/science/math/mkl/default.nix +++ b/pkgs/development/libraries/science/math/mkl/default.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , callPackage , stdenvNoCC , fetchurl @@ -135,7 +136,7 @@ in stdenvNoCC.mkDerivation { ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libcblas${shlibExt} ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapack${shlibExt} ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapacke${shlibExt} - '' + stdenvNoCC.lib.optionalString stdenvNoCC.hostPlatform.isLinux '' + '' + lib.optionalString stdenvNoCC.hostPlatform.isLinux '' ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libblas${shlibExt}".3" ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libcblas${shlibExt}".3" ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapack${shlibExt}".3" @@ -145,7 +146,7 @@ in stdenvNoCC.mkDerivation { # fixDarwinDylibName fails for libmkl_cdft_core.dylib because the # larger updated load commands do not fit. Use install_name_tool # explicitly and ignore the error. - postFixup = stdenvNoCC.lib.optionalString stdenvNoCC.isDarwin '' + postFixup = lib.optionalString stdenvNoCC.isDarwin '' for f in $out/lib/*.dylib; do install_name_tool -id $out/lib/$(basename $f) $f || true done @@ -160,7 +161,7 @@ in stdenvNoCC.mkDerivation { passthru.tests.pkg-config = callPackage ./test { }; - meta = with stdenvNoCC.lib; { + meta = with lib; { description = "Intel Math Kernel Library"; longDescription = '' Intel Math Kernel Library (Intel MKL) optimizes code with minimal effort diff --git a/pkgs/development/libraries/science/math/mongoose/default.nix b/pkgs/development/libraries/science/math/mongoose/default.nix index 36c53b2994f..7dd52f3b663 100644 --- a/pkgs/development/libraries/science/math/mongoose/default.nix +++ b/pkgs/development/libraries/science/math/mongoose/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Graph Coarsening and Partitioning Library"; homepage = "https://github.com/ScottKolo/Mongoose"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/science/math/nccl/default.nix b/pkgs/development/libraries/science/math/nccl/default.nix index eb194c0e9e4..5036ad89079 100644 --- a/pkgs/development/libraries/science/math/nccl/default.nix +++ b/pkgs/development/libraries/science/math/nccl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, which, cudatoolkit, addOpenGLRunpath }: +{ lib, stdenv, fetchFromGitHub, which, cudatoolkit, addOpenGLRunpath }: stdenv.mkDerivation rec { name = "nccl-${version}-cuda-${cudatoolkit.majorVersion}"; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Multi-GPU and multi-node collective communication primitives for NVIDIA GPUs"; homepage = "https://developer.nvidia.com/nccl"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 0d83c5c3650..bd7b739bd77 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, perl, which +{ lib, stdenv, fetchFromGitHub, perl, which # Most packages depending on openblas expect integer width to match # pointer width, but some expect to use 32-bit integers always # (for compatibility with reference BLAS). @@ -19,7 +19,7 @@ , enableShared ? !stdenv.hostPlatform.isStatic }: -with stdenv.lib; +with lib; let blas64_ = blas64; in @@ -160,7 +160,7 @@ stdenv.mkDerivation rec { NO_BINARY_MODE = if stdenv.isx86_64 then toString (stdenv.hostPlatform != stdenv.buildPlatform) else stdenv.hostPlatform != stdenv.buildPlatform; - } // (stdenv.lib.optionalAttrs singleThreaded { + } // (lib.optionalAttrs singleThreaded { # As described on https://github.com/xianyi/OpenBLAS/wiki/Faq/4bded95e8dc8aadc70ce65267d1093ca7bdefc4c#multi-threaded USE_THREAD = false; USE_LOCKING = true; # available with openblas >= 0.3.7 @@ -188,14 +188,14 @@ EOF ln -s $out/lib/libopenblas${shlibExt} $out/lib/libcblas${shlibExt} ln -s $out/lib/libopenblas${shlibExt} $out/lib/liblapack${shlibExt} ln -s $out/lib/libopenblas${shlibExt} $out/lib/liblapacke${shlibExt} - '' + stdenv.lib.optionalString stdenv.hostPlatform.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' ln -s $out/lib/libopenblas${shlibExt} $out/lib/libblas${shlibExt}.3 ln -s $out/lib/libopenblas${shlibExt} $out/lib/libcblas${shlibExt}.3 ln -s $out/lib/libopenblas${shlibExt} $out/lib/liblapack${shlibExt}.3 ln -s $out/lib/libopenblas${shlibExt} $out/lib/liblapacke${shlibExt}.3 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Basic Linear Algebra Subprograms"; license = licenses.bsd3; homepage = "https://github.com/xianyi/OpenBLAS"; diff --git a/pkgs/development/libraries/science/math/openlibm/default.nix b/pkgs/development/libraries/science/math/openlibm/default.nix index 17197823d6e..2c4198d9679 100644 --- a/pkgs/development/libraries/science/math/openlibm/default.nix +++ b/pkgs/development/libraries/science/math/openlibm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "openlibm"; @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { meta = { description = "High quality system independent, portable, open source libm implementation"; homepage = "https://openlibm.org/"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.ttuegel ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ttuegel ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/libraries/science/math/openspecfun/default.nix b/pkgs/development/libraries/science/math/openspecfun/default.nix index 3689df60707..a341264d989 100644 --- a/pkgs/development/libraries/science/math/openspecfun/default.nix +++ b/pkgs/development/libraries/science/math/openspecfun/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gfortran }: +{ lib, stdenv, fetchurl, gfortran }: stdenv.mkDerivation { name = "openspecfun-0.5.3"; @@ -14,8 +14,8 @@ stdenv.mkDerivation { meta = { description = "A collection of special mathematical functions"; homepage = "https://github.com/JuliaLang/openspecfun"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.ttuegel ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ttuegel ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix index 0dc77c10c5e..53c117233d2 100644 --- a/pkgs/development/libraries/science/math/or-tools/default.nix +++ b/pkgs/development/libraries/science/math/or-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, abseil-cpp, gflags, which +{ lib, stdenv, fetchFromGitHub, cmake, abseil-cpp, gflags, which , lsb-release, glog, protobuf, cbc, zlib , ensureNewerSourcesForZipFilesHook, python, swig }: @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "python" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/google/or-tools"; license = licenses.asl20; description = '' diff --git a/pkgs/development/libraries/science/math/osi/default.nix b/pkgs/development/libraries/science/math/osi/default.nix index b6f367ff4fe..b61cd840606 100644 --- a/pkgs/development/libraries/science/math/osi/default.nix +++ b/pkgs/development/libraries/science/math/osi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, gfortran, pkgconfig +{ stdenv, lib, fetchurl, gfortran, pkg-config , blas, zlib, bzip2 , withGurobi ? false, gurobi , withCplex ? false, cplex }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { [ blas zlib bzip2 ] ++ lib.optional withGurobi gurobi ++ lib.optional withCplex cplex; - nativeBuildInputs = [ gfortran pkgconfig ]; + nativeBuildInputs = [ gfortran pkg-config ]; configureFlags = lib.optionals withGurobi [ "--with-gurobi-incdir=${gurobi}/include" "--with-gurobi-lib=-lgurobi${gurobi.libSuffix}" ] ++ lib.optionals withCplex [ "--with-cplex-incdir=${cplex}/cplex/include/ilcplex" "--with-cplex-lib=-lcplex${cplex.libSuffix}" ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { passthru = { inherit withGurobi withCplex; }; - meta = with stdenv.lib; { + meta = with lib; { description = "An abstract base class to a generic linear programming (LP) solver"; homepage = "https://github.com/coin-or/Osi"; license = licenses.epl10; diff --git a/pkgs/development/libraries/science/math/osqp/default.nix b/pkgs/development/libraries/science/math/osqp/default.nix index 9cd062d21f2..00f2726f60f 100644 --- a/pkgs/development/libraries/science/math/osqp/default.nix +++ b/pkgs/development/libraries/science/math/osqp/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A quadratic programming solver using operator splitting"; homepage = "https://osqp.org"; license = licenses.asl20; diff --git a/pkgs/development/libraries/science/math/parmetis/default.nix b/pkgs/development/libraries/science/math/parmetis/default.nix index 050e8f1b285..db70bf8dd7a 100644 --- a/pkgs/development/libraries/science/math/parmetis/default.nix +++ b/pkgs/development/libraries/science/math/parmetis/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , cmake , mpi @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { make config metis_path=$PWD/metis gklib_path=$PWD/metis/GKlib prefix=$out ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An MPI-based parallel library that implements a variety of algorithms for partitioning unstructured graphs, meshes, and for computing fill-reducing orderings of sparse matrices"; homepage = "http://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview"; platforms = platforms.all; diff --git a/pkgs/development/libraries/science/math/petsc/default.nix b/pkgs/development/libraries/science/math/petsc/default.nix index a1e9d1e3051..f06a028fe64 100644 --- a/pkgs/development/libraries/science/math/petsc/default.nix +++ b/pkgs/development/libraries/science/math/petsc/default.nix @@ -1,4 +1,4 @@ -{ stdenv , darwin , fetchurl , blas , gfortran , lapack , python }: +{ lib, stdenv , darwin , fetchurl , blas , gfortran , lapack , python }: stdenv.mkDerivation rec { pname = "petsc"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { prePatch = '' substituteInPlace configure \ --replace /bin/sh /usr/bin/python - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' substituteInPlace config/install.py \ --replace /usr/bin/install_name_tool ${darwin.cctools}/bin/install_name_tool ''; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ) ''; - meta = with stdenv.lib; { + meta = with lib; { description = '' Library of linear algebra algorithms for solving partial differential equations diff --git a/pkgs/development/libraries/science/math/planarity/default.nix b/pkgs/development/libraries/science/math/planarity/default.nix index b1d6a072e13..a257b84ca54 100644 --- a/pkgs/development/libraries/science/math/planarity/default.nix +++ b/pkgs/development/libraries/science/math/planarity/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch , autoreconfHook @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { }) ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/graph-algorithms/edge-addition-planarity-suite"; description = "A library for implementing graph algorithms"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/science/math/primesieve/default.nix b/pkgs/development/libraries/science/math/primesieve/default.nix index 46709ff218a..d99026bc565 100644 --- a/pkgs/development/libraries/science/math/primesieve/default.nix +++ b/pkgs/development/libraries/science/math/primesieve/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake }: +{ lib, stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { pname = "primesieve"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0g60br3p8di92jx3pr2bb51xh15gg57l7qvwzwn7xf7l585hgi7v"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast C/C++ prime number generator"; homepage = "https://primesieve.org/"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/science/math/rankwidth/default.nix b/pkgs/development/libraries/science/math/rankwidth/default.nix index 53f4313a206..38c9444d0d3 100644 --- a/pkgs/development/libraries/science/math/rankwidth/default.nix +++ b/pkgs/development/libraries/science/math/rankwidth/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { # check phase is empty for now (as of version 0.7) doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Calculates rank-width and rank-decompositions"; license = with licenses; [ gpl2Plus ]; maintainers = teams.sage.members; diff --git a/pkgs/development/libraries/science/math/rubiks/default.nix b/pkgs/development/libraries/science/math/rubiks/default.nix index 44f8150386e..b4b67088498 100644 --- a/pkgs/development/libraries/science/math/rubiks/default.nix +++ b/pkgs/development/libraries/science/math/rubiks/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , coreutils @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { }) ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.sagemath.org/spkg/rubiks"; description = "Several programs for working with Rubik's cubes"; # The individual websites are no longer available diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix index b4d339f6226..3b84a9d99cb 100644 --- a/pkgs/development/libraries/science/math/scalapack/default.nix +++ b/pkgs/development/libraries/science/math/scalapack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, openssh +{ lib, stdenv, fetchFromGitHub, cmake, openssh , gfortran, mpi, blas, lapack } : @@ -36,13 +36,16 @@ stdenv.mkDerivation rec { # make sure the test starts even if we have less than 4 cores export OMPI_MCA_rmaps_base_oversubscribe=1 + # Fix to make mpich run in a sandbox + export HYDRA_IFACE=lo + # Run single threaded export OMP_NUM_THREADS=1 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}`pwd`/lib ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.netlib.org/scalapack/"; description = "Library of high-performance linear algebra routines for parallel distributed memory machines"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/science/math/scs/default.nix b/pkgs/development/libraries/science/math/scs/default.nix index 3820f2b9527..96f543e430f 100644 --- a/pkgs/development/libraries/science/math/scs/default.nix +++ b/pkgs/development/libraries/science/math/scs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, blas, lapack, gfortran, fixDarwinDylibNames }: +{ lib, stdenv, fetchFromGitHub, blas, lapack, gfortran, fixDarwinDylibNames }: assert (!blas.isILP64) && (!lapack.isILP64); @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { --replace "gcc" "cc" ''; - nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + nativeBuildInputs = lib.optional stdenv.isDarwin fixDarwinDylibNames; buildInputs = [ blas lapack gfortran.cc.lib ]; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Splitting Conic Solver"; longDescription = '' Numerical optimization package for solving large-scale convex cone problems diff --git a/pkgs/development/libraries/science/math/spooles/default.nix b/pkgs/development/libraries/science/math/spooles/default.nix index c55a1b8002e..6f4ddb3f787 100644 --- a/pkgs/development/libraries/science/math/spooles/default.nix +++ b/pkgs/development/libraries/science/math/spooles/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gfortran, perl }: +{ lib, stdenv, fetchurl, gfortran, perl }: stdenv.mkDerivation rec { pname = "spooles"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ./spooles.patch ]; - postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace makefile --replace '-Wl,-soname' '-Wl,-install_name' ''; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.netlib.org/linalg/spooles/"; description = "Library for solving sparse real and complex linear systems of equations"; license = licenses.publicDomain; diff --git a/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix b/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix index 1c910a4f75b..7696b18e7ca 100644 --- a/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , gnum4 @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { gnum4 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Graph algorithms in the language of linear algebra"; homepage = "http://faculty.cse.tamu.edu/davis/GraphBLAS.html"; license = licenses.asl20; diff --git a/pkgs/development/libraries/science/math/suitesparse/4.2.nix b/pkgs/development/libraries/science/math/suitesparse/4.2.nix index b1c1202c578..b8ce3eca888 100644 --- a/pkgs/development/libraries/science/math/suitesparse/4.2.nix +++ b/pkgs/development/libraries/science/math/suitesparse/4.2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gfortran, blas, lapack }: +{ lib, stdenv, fetchurl, gfortran, blas, lapack }: let int_t = if blas.isILP64 then "int64_t" else "int32_t"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { "LAPACK=-llapack" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://faculty.cse.tamu.edu/davis/suitesparse.html"; description = "A suite of sparse matrix algorithms"; license = with licenses; [ bsd2 gpl2Plus lgpl21Plus ]; diff --git a/pkgs/development/libraries/science/math/suitesparse/4.4.nix b/pkgs/development/libraries/science/math/suitesparse/4.4.nix index 81a80c920b5..1ebac6ac445 100644 --- a/pkgs/development/libraries/science/math/suitesparse/4.4.nix +++ b/pkgs/development/libraries/science/math/suitesparse/4.4.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gfortran, blas, lapack +{ lib, stdenv, fetchurl, gfortran, blas, lapack , enableCuda ? false, cudatoolkit }: @@ -27,11 +27,11 @@ stdenv.mkDerivation { -e '/CHOLMOD_CONFIG/ s/$/-DNPARTITION -DLONGBLAS=${int_t}/' \ -e '/UMFPACK_CONFIG/ s/$/-DLONGBLAS=${int_t}/' '' - + stdenv.lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.isDarwin '' sed -i "SuiteSparse_config/SuiteSparse_config.mk" \ -e 's/^[[:space:]]*\(LIB = -lm\) -lrt/\1/' '' - + stdenv.lib.optionalString enableCuda '' + + lib.optionalString enableCuda '' sed -i "SuiteSparse_config/SuiteSparse_config.mk" \ -e 's|^[[:space:]]*\(CUDA_ROOT =\)|CUDA_ROOT = ${cudatoolkit}|' \ -e 's|^[[:space:]]*\(GPU_BLAS_PATH =\)|GPU_BLAS_PATH = $(CUDA_ROOT)|' \ @@ -55,7 +55,7 @@ stdenv.mkDerivation { "LAPACK=-llapack" ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin " -DNTIMER"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin " -DNTIMER"; postInstall = '' # Build and install shared library @@ -64,7 +64,7 @@ stdenv.mkDerivation { for i in "$out"/lib/lib*.a; do ar -x $i done - ${if enableCuda then cudatoolkit else stdenv.cc.outPath}/bin/${if enableCuda then "nvcc" else "cc"} *.o ${if stdenv.isDarwin then "-dynamiclib" else "--shared"} -o "$out/lib/libsuitesparse${SHLIB_EXT}" -lblas ${stdenv.lib.optionalString enableCuda "-lcublas"} + ${if enableCuda then cudatoolkit else stdenv.cc.outPath}/bin/${if enableCuda then "nvcc" else "cc"} *.o ${if stdenv.isDarwin then "-dynamiclib" else "--shared"} -o "$out/lib/libsuitesparse${SHLIB_EXT}" -lblas ${lib.optionalString enableCuda "-lcublas"} ) for i in umfpack cholmod amd camd colamd spqr; do ln -s libsuitesparse${SHLIB_EXT} "$out"/lib/lib$i${SHLIB_EXT} @@ -90,7 +90,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ gfortran ]; buildInputs = [ blas lapack ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://faculty.cse.tamu.edu/davis/suitesparse.html"; description = "A suite of sparse matrix algorithms"; license = with licenses; [ bsd2 gpl2Plus lgpl21Plus ]; diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix index 2e76050aa98..f0c82e7190f 100644 --- a/pkgs/development/libraries/science/math/suitesparse/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , gfortran , blas, lapack @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; # Use compatible indexing for lapack and blas used buildInputs = assert (blas.isILP64 == lapack.isILP64); [ @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { gfortran.cc.lib gmp mpfr - ] ++ stdenv.lib.optional enableCuda cudatoolkit; + ] ++ lib.optional enableCuda cudatoolkit; preConfigure = '' # Mongoose and GraphBLAS are packaged separately @@ -45,13 +45,13 @@ stdenv.mkDerivation rec { "INSTALL_INCLUDE=${placeholder "dev"}/include" "JOBS=$(NIX_BUILD_CORES)" "MY_METIS_LIB=-lmetis" - ] ++ stdenv.lib.optionals blas.isILP64 [ + ] ++ lib.optionals blas.isILP64 [ "CFLAGS=-DBLAS64" - ] ++ stdenv.lib.optionals enableCuda [ + ] ++ lib.optionals enableCuda [ "CUDA_PATH=${cudatoolkit}" "CUDART_LIB=${cudatoolkit.lib}/lib/libcudart.so" "CUBLAS_LIB=${cudatoolkit}/lib/libcublas.so" - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ # Unless these are set, the build will attempt to use `Accelerate` on darwin, see: # https://github.com/DrTimothyAldenDavis/SuiteSparse/blob/v5.8.1/SuiteSparse_config/SuiteSparse_config.mk#L368 "BLAS=-lblas" @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { "library" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://faculty.cse.tamu.edu/davis/suitesparse.html"; description = "A suite of sparse matrix algorithms"; license = with licenses; [ bsd2 gpl2Plus lgpl21Plus ]; diff --git a/pkgs/development/libraries/science/math/superlu/default.nix b/pkgs/development/libraries/science/math/superlu/default.nix index 892ccb4da11..26dd00d9606 100644 --- a/pkgs/development/libraries/science/math/superlu/default.nix +++ b/pkgs/development/libraries/science/math/superlu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, +{ lib, stdenv, fetchurl, cmake, gfortran, blas, lapack}: assert (!blas.isILP64) && (!lapack.isILP64); @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { homepage = "http://crd-legacy.lbl.gov/~xiaoye/SuperLU/"; license = "http://crd-legacy.lbl.gov/~xiaoye/SuperLU/License.txt"; description = "A library for the solution of large, sparse, nonsymmetric systems of linear equations"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/science/math/sympow/default.nix b/pkgs/development/libraries/science/math/sympow/default.nix index a83e2c83546..3c31ed8a361 100644 --- a/pkgs/development/libraries/science/math/sympow/default.nix +++ b/pkgs/development/libraries/science/math/sympow/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitLab , makeWrapper , which @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { "$out/bin/sympow" -sp 2p16 -curve "[1,2,3,4,5]" | grep '8.3705' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Compute special values of symmetric power elliptic curve L-functions"; license = { shortName = "sympow"; diff --git a/pkgs/development/libraries/science/math/tensorflow/bin.nix b/pkgs/development/libraries/science/math/tensorflow/bin.nix index dc0ca5da4cf..d42026c13cf 100644 --- a/pkgs/development/libraries/science/math/tensorflow/bin.nix +++ b/pkgs/development/libraries/science/math/tensorflow/bin.nix @@ -1,30 +1,25 @@ -{ stdenv +{ lib, stdenv , fetchurl , addOpenGLRunpath , cudaSupport ? false, symlinkJoin, cudatoolkit, cudnn, nvidia_x11 }: -with stdenv.lib; +with lib; let - unavailable = throw "libtensorflow is not available for this platform!"; + broken = !stdenv.isLinux && !stdenv.isDarwin; tfType = if cudaSupport then "gpu" else "cpu"; - system = - if stdenv.isLinux then "linux" - else if stdenv.isDarwin then "darwin" - else unavailable; + system = + if stdenv.isLinux then "linux" + else "darwin"; - platform = - if stdenv.isx86_64 then "x86_64" - else unavailable; + platform = "x86_64"; - rpath = makeLibraryPath ([stdenv.cc.libc stdenv.cc.cc.lib] ++ - optionals cudaSupport [ cudatoolkit.out cudatoolkit.lib cudnn nvidia_x11 ]); + rpath = makeLibraryPath ([stdenv.cc.libc stdenv.cc.cc.lib] + ++ optionals cudaSupport [ cudatoolkit.out cudatoolkit.lib cudnn nvidia_x11 ]); packages = import ./binary-hashes.nix; - packageName = "${tfType}-${system}-${platform}"; - url = packages.${packageName} or unavailable; patchLibs = if stdenv.isDarwin @@ -44,7 +39,7 @@ in stdenv.mkDerivation rec { pname = "libtensorflow"; inherit (packages) version; - src = fetchurl url; + src = fetchurl packages."${tfType}-${system}-${platform}"; nativeBuildInputs = optional cudaSupport addOpenGLRunpath; @@ -55,7 +50,7 @@ in stdenv.mkDerivation rec { chmod -R +w $out ${patchLibs} - # Write pkgconfig file. + # Write pkg-config file. mkdir $out/lib/pkgconfig cat > $out/lib/pkgconfig/tensorflow.pc << EOF Name: TensorFlow @@ -72,6 +67,5 @@ in stdenv.mkDerivation rec { homepage = "https://www.tensorflow.org/install/lang_c"; license = licenses.asl20; platforms = [ "x86_64-linux" "x86_64-darwin" ]; - maintainers = with maintainers; [ basvandijk ]; }; } diff --git a/pkgs/development/libraries/science/math/tensorflow/binary-hashes.nix b/pkgs/development/libraries/science/math/tensorflow/binary-hashes.nix index 76f0c5eea7f..b606e45477a 100644 --- a/pkgs/development/libraries/science/math/tensorflow/binary-hashes.nix +++ b/pkgs/development/libraries/science/math/tensorflow/binary-hashes.nix @@ -1,15 +1,15 @@ { -version = "1.14.0"; -cpu-linux-x86_64 = { - url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-linux-x86_64-1.14.0.tar.gz"; - sha256 = "04bi3ijq4sbb8c5vk964zlv0j9mrjnzzxd9q9knq3h273nc1a36k"; +version = "2.4.0"; +"cpu-linux-x86_64" = { + url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-linux-x86_64-2.4.0.tar.gz"; + sha256 = "022p5jjwmb8rhyyis3cpk2lw45apl2vz49m2rgxmd75h783x1gjk"; }; -gpu-linux-x86_64 = { - url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-gpu-linux-x86_64-1.14.0.tar.gz"; - sha256 = "1ffnpyj9jjgwxpjfiyjvq4dm3n6nwiksim5jld9zw7fdswh215x6"; +"gpu-linux-x86_64" = { + url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-gpu-linux-x86_64-2.4.0.tar.gz"; + sha256 = "1fclvbrn3fs8qmhmh3lzni7s7wl1w30a071b4gzh9ifnxdhip6lq"; }; -cpu-darwin-x86_64 = { - url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-darwin-x86_64-1.14.0.tar.gz"; - sha256 = "0zsd5ils1a17j6jzh0c7q1z56fw46gkzybbnms7h2rgg8al0rh92"; +"cpu-darwin-x86_64" = { + url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-darwin-x86_64-2.4.0.tar.gz"; + sha256 = "09x096nslg04c8sr7bd5v68a5gfinc0f1h36lbzn8bahs8b1agi3"; }; } diff --git a/pkgs/development/libraries/science/math/tensorflow/prefetcher.sh b/pkgs/development/libraries/science/math/tensorflow/prefetcher.sh index 515f25df4c1..d571d38f771 100755 --- a/pkgs/development/libraries/science/math/tensorflow/prefetcher.sh +++ b/pkgs/development/libraries/science/math/tensorflow/prefetcher.sh @@ -1,7 +1,9 @@ #!/usr/bin/env bash -version=1.14.0 -hashfile=binary-hashes.nix +# ./prefetcher.sh 2.4.0 binary-hashes.nix + +version="$1" +hashfile="$2" rm -f $hashfile echo "{" >> $hashfile echo "version = \"$version\";" >> $hashfile diff --git a/pkgs/development/libraries/science/networking/ns-3/default.nix b/pkgs/development/libraries/science/networking/ns-3/default.nix index b611a2baf8e..4a90f082dc0 100644 --- a/pkgs/development/libraries/science/networking/ns-3/default.nix +++ b/pkgs/development/libraries/science/networking/ns-3/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitLab +, fetchpatch , python , wafHook @@ -32,22 +33,22 @@ let pythonEnv = python.withPackages(ps: - stdenv.lib.optional withManual ps.sphinx - ++ stdenv.lib.optionals pythonSupport (with ps;[ pybindgen pygccxml ]) + lib.optional withManual ps.sphinx + ++ lib.optionals pythonSupport (with ps;[ pybindgen pygccxml ]) ); in stdenv.mkDerivation rec { pname = "ns-3"; - version = "32"; + version = "33"; src = fetchFromGitLab { owner = "nsnam"; repo = "ns-3-dev"; rev = "ns-3.${version}"; - sha256 = "158yjhsrmslj1q4zcq5p16hv9i82qnxx714l7idicncn0wzrfx7k"; + sha256 = "0ds8h0f2qcb0gc2a8bk38cbhdb122i4sbg589bjn59rblzw0hkq4"; }; - nativeBuildInputs = [ wafHook ]; + nativeBuildInputs = [ wafHook python ]; outputs = [ "out" ] ++ lib.optional pythonSupport "py"; @@ -60,11 +61,9 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs doc/ns3_html_theme/get_version.sh - # FIX/Remove when https://github.com/NixOS/nixpkgs/pull/69310 gets merged - sed -i 's/program.ns3_module_dependencies.copy()/program.ns3_module_dependencies[:]/g' wscript ''; - wafConfigureFlags = with stdenv.lib; [ + wafConfigureFlags = with lib; [ "--enable-modules=${concatStringsSep "," modules}" "--with-python=${pythonEnv.interpreter}" ] @@ -82,7 +81,7 @@ stdenv.mkDerivation rec { # to prevent fatal error: 'backward_warning.h' file not found CXXFLAGS = "-D_GLIBCXX_PERMIT_BACKWARD_HASH"; - postBuild = with stdenv.lib; let flags = concatStringsSep ";" ( + postBuild = with lib; let flags = concatStringsSep ";" ( optional enableDoxygen "./waf doxygen" ++ optional withManual "./waf sphinx" ); @@ -99,14 +98,22 @@ stdenv.mkDerivation rec { ${pythonEnv.interpreter} ./test.py --nowaf ''; + patches = [ + (fetchpatch { + name = "upstream-issue-336.patch"; + url = "https://gitlab.com/nsnam/ns-3-dev/-/commit/673004edae1112e6cb249b698aad856d728530fb.patch"; + sha256 = "0q96ividinbh9xlws014b2ir6gaavygnln5ca9m1db06m4vfwhng"; + }) + ]; + # strictoverflow prevents clang from discovering pyembed when bindings hardeningDisable = [ "fortify" "strictoverflow"]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.nsnam.org"; license = licenses.gpl3; description = "A discrete time event network simulator"; platforms = with platforms; unix; - maintainers = with maintainers; [ teto ]; + maintainers = with maintainers; [ teto rgrunbla ]; }; } diff --git a/pkgs/development/libraries/science/robotics/ispike/default.nix b/pkgs/development/libraries/science/robotics/ispike/default.nix index 70488426b01..b3eed2e326e 100644 --- a/pkgs/development/libraries/science/robotics/ispike/default.nix +++ b/pkgs/development/libraries/science/robotics/ispike/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, boost }: +{ lib, stdenv, fetchurl, cmake, boost }: stdenv.mkDerivation rec { pname = "ispike"; @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { meta = { description = "Spiking neural interface between iCub and a spiking neural simulator"; homepage = "https://sourceforge.net/projects/ispike/"; - license = stdenv.lib.licenses.lgpl3; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.nico202 ]; + license = lib.licenses.lgpl3; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.nico202 ]; }; } diff --git a/pkgs/development/libraries/scmccid/default.nix b/pkgs/development/libraries/scmccid/default.nix index 0d980d9d1a2..0fcb4884de5 100644 --- a/pkgs/development/libraries/scmccid/default.nix +++ b/pkgs/development/libraries/scmccid/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, patchelf, libusb-compat-0_1}: +{lib, stdenv, fetchurl, patchelf, libusb-compat-0_1}: assert stdenv ? cc && stdenv.cc.libc != null; @@ -33,8 +33,8 @@ stdenv.mkDerivation { meta = { homepage = "http://www.scmmicro.com/support/pc-security-support/downloads.html"; description = "PCSC drivers for linux, for the SCM SCR3310 v2.0 card and others"; - license = stdenv.lib.licenses.unfree; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/development/libraries/scriptaculous/default.nix b/pkgs/development/libraries/scriptaculous/default.nix index f4e5ae37892..e3c8ea00f44 100644 --- a/pkgs/development/libraries/scriptaculous/default.nix +++ b/pkgs/development/libraries/scriptaculous/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, unzip, ... }: stdenv.mkDerivation rec { +{ lib, stdenv, fetchurl, unzip, ... }: + +stdenv.mkDerivation rec { pname = "scriptaculous"; version = "1.9.0"; @@ -14,7 +16,7 @@ cp src/*.js $out ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A set of JavaScript libraries to enhance the user interface of web sites"; longDescription = '' script.aculo.us provides you with diff --git a/pkgs/development/libraries/seasocks/default.nix b/pkgs/development/libraries/seasocks/default.nix index 241046b09fe..8c5b4e87d9b 100644 --- a/pkgs/development/libraries/seasocks/default.nix +++ b/pkgs/development/libraries/seasocks/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, python, zlib }: +{ lib, stdenv, fetchFromGitHub, cmake, python, zlib }: stdenv.mkDerivation rec { pname = "seasocks"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ zlib python ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mattgodbolt/seasocks"; description = "Tiny embeddable C++ HTTP and WebSocket server"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/sentencepiece/default.nix b/pkgs/development/libraries/sentencepiece/default.nix index bc463aa4010..8ab0f8ef69a 100644 --- a/pkgs/development/libraries/sentencepiece/default.nix +++ b/pkgs/development/libraries/sentencepiece/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "sentencepiece"; - version = "0.1.94"; + version = "0.1.95"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "sha256:11cqw4hx33gw2jmrg11jyp7fj9pwzwjwzqcn24jfsbgh6n8gks5x"; + sha256 = "0mv7vgsvd7hjssidxy7fjfmwqy68vjcia8pajji11q2fkfp3cg67"; }; nativeBuildInputs = [ cmake ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/google/sentencepiece"; description = "Unsupervised text tokenizer for Neural Network-based text generation"; license = licenses.asl20; diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/development/libraries/serd/default.nix index 88fd1ea82d3..641a5120e8d 100644 --- a/pkgs/development/libraries/serd/default.nix +++ b/pkgs/development/libraries/serd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, python3, wafHook }: +{ lib, stdenv, fetchurl, pkg-config, python3, wafHook }: stdenv.mkDerivation rec { pname = "serd"; @@ -9,9 +9,9 @@ stdenv.mkDerivation rec { sha256 = "168rn3m32c59qbar120f83ibcnnd987ij9p053kybgl7cmm6358c"; }; - nativeBuildInputs = [ pkgconfig python3 wafHook ]; + nativeBuildInputs = [ pkg-config python3 wafHook ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://drobilla.net/software/serd"; description = "A lightweight C library for RDF syntax which supports reading and writing Turtle and NTriples"; license = licenses.mit; diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix index 92dde2111fc..dbdc9ce2871 100644 --- a/pkgs/development/libraries/serf/default.nix +++ b/pkgs/development/libraries/serf/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, apr, sconsPackages, openssl, aprutil, zlib, kerberos -, pkgconfig, libiconv }: +{ lib, stdenv, fetchurl, apr, sconsPackages, openssl, aprutil, zlib, kerberos +, pkg-config, libiconv }: stdenv.mkDerivation rec { name = "serf-1.3.9"; @@ -9,9 +9,9 @@ stdenv.mkDerivation rec { sha256 = "1k47gbgpp52049andr28y28nbwh9m36bbb0g8p0aka3pqlhjv72l"; }; - nativeBuildInputs = [ pkgconfig sconsPackages.scons_3_1_2 ]; + nativeBuildInputs = [ pkg-config sconsPackages.scons_3_1_2 ]; buildInputs = [ apr openssl aprutil zlib libiconv ] - ++ stdenv.lib.optional (!stdenv.isCygwin) kerberos; + ++ lib.optional (!stdenv.isCygwin) kerberos; patches = [ ./scons.patch ]; @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { sconsFlags+=" CC=$CC" sconsFlags+=" OPENSSL=${openssl}" sconsFlags+=" ZLIB=${zlib}" - '' + stdenv.lib.optionalString (!stdenv.isCygwin) '' + '' + lib.optionalString (!stdenv.isCygwin) '' sconsFlags+=" GSSAPI=${kerberos.dev}" ''; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "HTTP client library based on APR"; license = licenses.asl20; maintainers = with maintainers; [ orivej raskin ]; diff --git a/pkgs/development/libraries/serialdv/default.nix b/pkgs/development/libraries/serialdv/default.nix index 47d4e68f658..d1d9c6299b3 100644 --- a/pkgs/development/libraries/serialdv/default.nix +++ b/pkgs/development/libraries/serialdv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "serialdv"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ Minimal interface to encode and decode audio with AMBE3000 based devices in packet mode over a serial link"; homepage = "https://github.com/f4exb/serialdv"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/sfml/default.nix b/pkgs/development/libraries/sfml/default.nix index 7b5e1dcdb2b..c9a326afa7f 100644 --- a/pkgs/development/libraries/sfml/default.nix +++ b/pkgs/development/libraries/sfml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, cmake, libX11, freetype, libjpeg, openal, flac, libvorbis +{ lib, stdenv, fetchzip, cmake, libX11, freetype, libjpeg, openal, flac, libvorbis , glew, libXrandr, libXrender, udev, xcbutilimage , IOKit, Foundation, AppKit, OpenAL }: @@ -18,16 +18,16 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; buildInputs = [ freetype libjpeg openal flac libvorbis glew ] - ++ stdenv.lib.optional stdenv.isLinux udev - ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXrandr libXrender xcbutilimage ] - ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit Foundation AppKit OpenAL ]; + ++ lib.optional stdenv.isLinux udev + ++ lib.optionals (!stdenv.isDarwin) [ libX11 libXrandr libXrender xcbutilimage ] + ++ lib.optionals stdenv.isDarwin [ IOKit Foundation AppKit OpenAL ]; cmakeFlags = [ "-DSFML_INSTALL_PKGCONFIG_FILES=yes" "-DSFML_MISC_INSTALL_PREFIX=share/SFML" "-DSFML_BUILD_FRAMEWORKS=no" "-DSFML_USE_SYSTEM_DEPS=yes" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.sfml-dev.org/"; description = "Simple and fast multimedia library"; longDescription = '' diff --git a/pkgs/development/libraries/sfsexp/default.nix b/pkgs/development/libraries/sfsexp/default.nix index 40009a8b7c3..7c3fbb9f39e 100644 --- a/pkgs/development/libraries/sfsexp/default.nix +++ b/pkgs/development/libraries/sfsexp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "sfsexp"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "18gdwxjja0ip378hlzs8sp7q2g6hrmy7x10yf2wnxfmmylbpqn8k"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Small, fast s-expression library"; homepage = "http://sexpr.sourceforge.net/"; maintainers = with maintainers; [ jb55 ]; diff --git a/pkgs/development/libraries/shapelib/default.nix b/pkgs/development/libraries/shapelib/default.nix index 8fd4987ac70..abb27a132c2 100644 --- a/pkgs/development/libraries/shapelib/default.nix +++ b/pkgs/development/libraries/shapelib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "shapelib-1.5.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1qfsgb8b3yiqwvr6h9m81g6k9fjhfys70c22p7kzkbick20a9h0z"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "C Library for reading, writing and updating ESRI Shapefiles"; homepage = "http://shapelib.maptools.org/"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/shhmsg/default.nix b/pkgs/development/libraries/shhmsg/default.nix index 04b764afc94..0c736e4cb91 100644 --- a/pkgs/development/libraries/shhmsg/default.nix +++ b/pkgs/development/libraries/shhmsg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "shhmsg-1.4.2"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { installFlags = [ "INSTBASEDIR=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A library for displaying messages"; homepage = "https://shh.thathost.com/pub-unix/"; license = licenses.artistic1; diff --git a/pkgs/development/libraries/shhopt/default.nix b/pkgs/development/libraries/shhopt/default.nix index 45ec31ca4df..da1b820fcd5 100644 --- a/pkgs/development/libraries/shhopt/default.nix +++ b/pkgs/development/libraries/shhopt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "shhopt-1.1.7"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { installFlags = [ "INSTBASEDIR=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A library for parsing command line options"; homepage = "https://shh.thathost.com/pub-unix/"; license = licenses.artistic1; diff --git a/pkgs/development/libraries/shibboleth-sp/default.nix b/pkgs/development/libraries/shibboleth-sp/default.nix index 77b9714066d..f3b80c0b548 100644 --- a/pkgs/development/libraries/shibboleth-sp/default.nix +++ b/pkgs/development/libraries/shibboleth-sp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoreconfHook, boost, fcgi, openssl, opensaml-cpp, log4shib, pkgconfig, xercesc, xml-security-c, xml-tooling-c }: +{ lib, stdenv, fetchgit, autoreconfHook, boost, fcgi, openssl, opensaml-cpp, log4shib, pkg-config, xercesc, xml-security-c, xml-tooling-c }: stdenv.mkDerivation rec { pname = "shibboleth-sp"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1qb4dbz5gk10b9w1rf6f4vv7c2wb3a8bfzif6yiaq96ilqad7gdr"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ boost fcgi openssl opensaml-cpp log4shib xercesc xml-security-c xml-tooling-c ]; configureFlags = [ @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://shibboleth.net/products/service-provider.html"; description = "Enables SSO and Federation web applications written with any programming language or framework"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/silgraphite/default.nix b/pkgs/development/libraries/silgraphite/default.nix index 9d0aca0ab14..06cf7587616 100644 --- a/pkgs/development/libraries/silgraphite/default.nix +++ b/pkgs/development/libraries/silgraphite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, freetype, libXft, pango, fontconfig }: +{ stdenv, fetchurl, pkg-config, freetype, libXft, pango, fontconfig }: stdenv.mkDerivation rec { version = "2.3.1"; @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { sha256 = "9b07c6e91108b1fa87411af4a57e25522784cfea0deb79b34ced608444f2ed65"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ freetype libXft pango fontconfig]; NIX_CFLAGS_COMPILE = "-I${freetype.dev}/include/freetype2"; meta = { description = "An advanced font engine"; - maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = stdenv.lib.platforms.linux; + maintainers = [ lib.maintainers.raskin ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix index 564c32bf10d..166d0f2911d 100644 --- a/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/pkgs/development/libraries/silgraphite/graphite2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, freetype, cmake, python }: +{ lib, stdenv, fetchurl, pkg-config, freetype, cmake, python }: stdenv.mkDerivation rec { version = "1.3.14"; @@ -10,15 +10,15 @@ stdenv.mkDerivation rec { sha256 = "1790ajyhk0ax8xxamnrk176gc9gvhadzy78qia4rd8jzm89ir7gr"; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ freetype ]; - patches = stdenv.lib.optionals stdenv.isDarwin [ ./macosx.patch ]; + patches = lib.optionals stdenv.isDarwin [ ./macosx.patch ]; checkInputs = [ python ]; doCheck = false; # fails, probably missing something - meta = with stdenv.lib; { + meta = with lib; { description = "An advanced font engine"; maintainers = [ maintainers.raskin ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/simdjson/default.nix b/pkgs/development/libraries/simdjson/default.nix index 63ad97cbe2b..448270183a5 100644 --- a/pkgs/development/libraries/simdjson/default.nix +++ b/pkgs/development/libraries/simdjson/default.nix @@ -1,23 +1,23 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "simdjson"; - version = "0.7.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "simdjson"; repo = "simdjson"; rev = "v${version}"; - sha256 = "14gi2zq430nfjy424q6r57imc2gnz30nhx4r0wbajzp9qvna819w"; + sha256 = "1x5f8b5s67kf9sjx04rp81q0f3dlnqfngn3h0lrfnphipald5fji"; }; nativeBuildInputs = [ cmake ]; cmakeFlags = [ "-DSIMDJSON_JUST_LIBRARY=ON" - ]; + ] ++ lib.optional stdenv.hostPlatform.isStatic "-DSIMDJSON_BUILD_STATIC=ON"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://simdjson.org/"; description = "Parsing gigabytes of JSON per second"; license = licenses.asl20; diff --git a/pkgs/development/libraries/simgear/default.nix b/pkgs/development/libraries/simgear/default.nix index da25305fc42..2f1006404b7 100644 --- a/pkgs/development/libraries/simgear/default.nix +++ b/pkgs/development/libraries/simgear/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, plib, freeglut, xorgproto, libX11, libXext, libXi +{ lib, stdenv, fetchurl, plib, freeglut, xorgproto, libX11, libXext, libXi , libICE, libSM, libXt, libXmu, libGLU, libGL, boost, zlib, libjpeg, freealut , openscenegraph, openal, expat, cmake, apr , curl @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { libICE libSM libXt libXmu libGLU libGL boost zlib libjpeg freealut openscenegraph openal expat apr curl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Simulation construction toolkit"; homepage = "https://gitorious.org/fg/simgear"; maintainers = with maintainers; [ raskin ]; diff --git a/pkgs/development/libraries/simpleitk/default.nix b/pkgs/development/libraries/simpleitk/default.nix index e6b013aa137..2ae8b28b64f 100644 --- a/pkgs/development/libraries/simpleitk/default.nix +++ b/pkgs/development/libraries/simpleitk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, swig, lua, itk }: +{ lib, stdenv, fetchFromGitHub, cmake, swig, lua, itk }: stdenv.mkDerivation rec { pname = "simpleitk"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # 2.0.0: linker error building examples cmakeFlags = [ "-DBUILD_EXAMPLES=OFF" "-DBUILD_SHARED_LIBS=ON" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.simpleitk.org"; description = "Simplified interface to ITK"; maintainers = with maintainers; [ bcdarwin ]; diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix index a691107f9a1..1efac7fc5e4 100644 --- a/pkgs/development/libraries/skalibs/default.nix +++ b/pkgs/development/libraries/skalibs/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "skalibs"; - version = "2.9.3.0"; - sha256 = "0i1vg3bh0w3bpj7cv0kzs6q9v2dd8wa2by8h8j39fh1qkl20f6ph"; + version = "2.10.0.1"; + sha256 = "1chwjzlh13jbrldk77h3i4qjqv8hjpvvd3papcb8j46mvj7sxysg"; description = "A set of general-purpose C programming libraries"; diff --git a/pkgs/development/libraries/slang/default.nix b/pkgs/development/libraries/slang/default.nix index 010590b0fcd..a3db5ce0d3b 100644 --- a/pkgs/development/libraries/slang/default.nix +++ b/pkgs/development/libraries/slang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , libiconv , libpng , ncurses @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { pcre readline zlib - ] ++ stdenv.lib.optionals (stdenv.isDarwin) [ libiconv ]; + ] ++ lib.optionals (stdenv.isDarwin) [ libiconv ]; propagatedBuildInputs = [ ncurses ]; @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { sed '/^Libs:/s/$/ -lncurses/' -i "$dev"/lib/pkgconfig/slang.pc ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A small, embeddable multi-platform programming library"; longDescription = '' S-Lang is an interpreted language that was designed from the start to be diff --git a/pkgs/development/libraries/slib/default.nix b/pkgs/development/libraries/slib/default.nix index 401564342b5..47f633f5096 100644 --- a/pkgs/development/libraries/slib/default.nix +++ b/pkgs/development/libraries/slib/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, unzip, scheme, texinfo }: +{ fetchurl, lib, stdenv, unzip, scheme, texinfo }: stdenv.mkDerivation rec { name = "slib-3b5"; @@ -42,11 +42,11 @@ stdenv.mkDerivation rec { ''; # Public domain + permissive (non-copyleft) licensing of some files. - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; homepage = "http://people.csail.mit.edu/jaffer/SLIB"; maintainers = [ ]; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/smarty3-i18n/default.nix b/pkgs/development/libraries/smarty3-i18n/default.nix index d93a59efe6e..e617ba58e8b 100644 --- a/pkgs/development/libraries/smarty3-i18n/default.nix +++ b/pkgs/development/libraries/smarty3-i18n/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec { +{ lib, stdenv, fetchFromGitHub, ... }: + +stdenv.mkDerivation rec { pname = "smarty-i18n"; version = "1.0"; @@ -14,7 +16,7 @@ cp block.t.php $out ''; - meta = with stdenv.lib; { + meta = with lib; { description = "gettext for the smarty3 framework"; license = licenses.lgpl21; homepage = "https://github.com/kikimosha/smarty3-i18n"; diff --git a/pkgs/development/libraries/smarty3/default.nix b/pkgs/development/libraries/smarty3/default.nix index d5708cb6b1e..29f640dedfc 100644 --- a/pkgs/development/libraries/smarty3/default.nix +++ b/pkgs/development/libraries/smarty3/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec { +{ lib, stdenv, fetchFromGitHub, ... }: + +stdenv.mkDerivation rec { pname = "smarty3"; version = "3.1.36"; @@ -14,7 +16,7 @@ cp -r libs/* $out ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Smarty 3 template engine"; longDescription = '' Smarty is a template engine for PHP, facilitating the diff --git a/pkgs/development/libraries/smesh/default.nix b/pkgs/development/libraries/smesh/default.nix index 1b1f590109f..8494799333b 100644 --- a/pkgs/development/libraries/smesh/default.nix +++ b/pkgs/development/libraries/smesh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, ninja, opencascade +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, ninja, opencascade , Cocoa }: stdenv.mkDerivation rec { @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake ninja ]; - buildInputs = [ opencascade ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ]; + buildInputs = [ opencascade ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Extension to OCE providing advanced meshing features"; homepage = "https://github.com/tpaviot/smesh"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/smpeg/default.nix b/pkgs/development/libraries/smpeg/default.nix index 3a34bf54c3c..83b4b2193c0 100644 --- a/pkgs/development/libraries/smpeg/default.nix +++ b/pkgs/development/libraries/smpeg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, SDL, autoconf, automake, libtool, gtk2, m4, pkgconfig, libGLU, libGL, makeWrapper }: +{ lib, stdenv, fetchsvn, SDL, autoconf, automake, libtool, gtk2, m4, pkg-config, libGLU, libGL, makeWrapper }: stdenv.mkDerivation rec { name = "smpeg-svn${version}"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ SDL gtk2 libGLU libGL ]; - nativeBuildInputs = [ autoconf automake libtool m4 pkgconfig makeWrapper ]; + nativeBuildInputs = [ autoconf automake libtool m4 pkg-config makeWrapper ]; preConfigure = '' touch NEWS AUTHORS ChangeLog @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { $out/include/smpeg/*.h wrapProgram $out/bin/smpeg-config \ - --prefix PATH ":" "${pkgconfig}/bin" \ + --prefix PATH ":" "${pkg-config}/bin" \ --prefix PKG_CONFIG_PATH ":" "${SDL.dev}/lib/pkgconfig" ''; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://icculus.org/smpeg/"; description = "MPEG decoding library"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/smpeg2/default.nix b/pkgs/development/libraries/smpeg2/default.nix index 270e418174e..d57cc91f26e 100644 --- a/pkgs/development/libraries/smpeg2/default.nix +++ b/pkgs/development/libraries/smpeg2/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , autoconf , automake , darwin @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake makeWrapper pkg-config ]; buildInputs = [ SDL2 ] - ++ stdenv.lib.optional stdenv.isDarwin darwin.libobjc; + ++ lib.optional stdenv.isDarwin darwin.libobjc; preConfigure = '' sh autogen.sh @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://icculus.org/smpeg/"; description = "SDL2 MPEG Player Library"; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/snack/default.nix b/pkgs/development/libraries/snack/default.nix index 7aa7cf3d452..4948e481ff5 100644 --- a/pkgs/development/libraries/snack/default.nix +++ b/pkgs/development/libraries/snack/default.nix @@ -1,6 +1,6 @@ # alsaLib vorbis-tools python can be made optional -{ stdenv, fetchurl, python, tcl, tk, vorbis-tools, pkgconfig, xlibsWrapper }: +{ lib, stdenv, fetchurl, python, tcl, tk, vorbis-tools, pkg-config, xlibsWrapper }: stdenv.mkDerivation { name = "snack-2.2.10"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { postUnpack = ''sourceRoot="$sourceRoot/unix"''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ python tcl tk vorbis-tools xlibsWrapper ]; hardeningDisable = [ "format" ]; @@ -23,13 +23,13 @@ stdenv.mkDerivation { installPhase = '' mkdir -p $out - make install DESTDIR="$out" + make install DESTDIR="$out" ''; - meta = { + meta = { description = "The Snack Sound Toolkit (Tcl)"; homepage = "http://www.speech.kth.se/snack/"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; broken = true; }; } diff --git a/pkgs/development/libraries/snappy/default.nix b/pkgs/development/libraries/snappy/default.nix index 0880df7ef2f..ece425e85c4 100644 --- a/pkgs/development/libraries/snappy/default.nix +++ b/pkgs/development/libraries/snappy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake +{ lib, stdenv, fetchFromGitHub, cmake , static ? stdenv.hostPlatform.isStatic }: @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://google.github.io/snappy/"; license = licenses.bsd3; description = "Compression/decompression library for very high speeds"; diff --git a/pkgs/development/libraries/soci/default.nix b/pkgs/development/libraries/soci/default.nix index 1f9b77cc3c9..f561864a750 100644 --- a/pkgs/development/libraries/soci/default.nix +++ b/pkgs/development/libraries/soci/default.nix @@ -1,7 +1,7 @@ { cmake , fetchFromGitHub , sqlite -, stdenv +, lib, stdenv }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ sqlite ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Database access library for C++"; homepage = "http://soci.sourceforge.net/"; license = licenses.boost; diff --git a/pkgs/development/libraries/socket_wrapper/default.nix b/pkgs/development/libraries/socket_wrapper/default.nix index 188405365cd..e1ba9dbc1e6 100644 --- a/pkgs/development/libraries/socket_wrapper/default.nix +++ b/pkgs/development/libraries/socket_wrapper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig }: +{ lib, stdenv, fetchurl, cmake, pkg-config }: stdenv.mkDerivation rec { name = "socket_wrapper-1.2.5"; @@ -8,9 +8,9 @@ stdenv.mkDerivation rec { sha256 = "1wb3gq0rj5h92mhq6f1hb2qy4ypkxvn8y87ag88c7gc71nkpa1fx"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A library passing all socket communications through unix sockets"; homepage = "https://git.samba.org/?p=socket_wrapper.git;a=summary;"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/sofia-sip/default.nix b/pkgs/development/libraries/sofia-sip/default.nix index f8b1c102852..1395f3e60cf 100644 --- a/pkgs/development/libraries/sofia-sip/default.nix +++ b/pkgs/development/libraries/sofia-sip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, glib, openssl, pkgconfig, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, glib, openssl, pkg-config, autoreconfHook }: stdenv.mkDerivation rec { pname = "sofia-sip"; @@ -12,9 +12,9 @@ stdenv.mkDerivation rec { }; buildInputs = [ glib openssl ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Open-source SIP User-Agent library, compliant with the IETF RFC3261 specification"; homepage = "https://github.com/freeswitch/sofia-sip"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/sonic/default.nix b/pkgs/development/libraries/sonic/default.nix index fc45e220a51..38dcee84a92 100644 --- a/pkgs/development/libraries/sonic/default.nix +++ b/pkgs/development/libraries/sonic/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fftw, installShellFiles }: +{ lib, stdenv, fetchFromGitHub, fftw, installShellFiles }: stdenv.mkDerivation { pname = "sonic-unstable"; @@ -19,11 +19,11 @@ stdenv.mkDerivation { postInstall = '' installManPage sonic.1 - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' install_name_tool -id $out/lib/libsonic.so.0.3.0 $out/lib/libsonic.so.0.3.0 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple library to speed up or slow down speech"; homepage = "https://github.com/waywardgeek/sonic"; license = licenses.asl20; diff --git a/pkgs/development/libraries/soprano/default.nix b/pkgs/development/libraries/soprano/default.nix index 40ec30c6c85..c9debd36110 100644 --- a/pkgs/development/libraries/soprano/default.nix +++ b/pkgs/development/libraries/soprano/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, cmake, qt4, clucene_core, librdf_redland, libiodbc -, pkgconfig }: +{ lib, stdenv, fetchurl, cmake, qt4, clucene_core, librdf_redland, libiodbc +, pkg-config }: stdenv.mkDerivation rec { name = "soprano-2.9.4"; @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { # We disable the Java backend, since we do not need them and they make the closure size much bigger buildInputs = [ qt4 clucene_core librdf_redland libiodbc ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; meta = { homepage = "http://soprano.sourceforge.net/"; description = "An object-oriented C++/Qt4 framework for RDF data"; license = "LGPL"; - maintainers = with stdenv.lib.maintainers; [ sander ]; + maintainers = with lib.maintainers; [ sander ]; inherit (qt4.meta) platforms; }; } diff --git a/pkgs/development/libraries/soqt/default.nix b/pkgs/development/libraries/soqt/default.nix index 8d69c328eed..fe7901bddd5 100644 --- a/pkgs/development/libraries/soqt/default.nix +++ b/pkgs/development/libraries/soqt/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, coin3d, qtbase, cmake, pkgconfig }: +{ fetchFromGitHub, lib, stdenv, coin3d, qtbase, cmake, pkg-config }: stdenv.mkDerivation rec { pname = "soqt"; @@ -15,9 +15,11 @@ stdenv.mkDerivation rec { buildInputs = [ coin3d qtbase ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; - meta = with stdenv.lib; { + dontWrapQtApps = true; + + meta = with lib; { homepage = "https://github.com/coin3d/soqt"; license = licenses.bsd3; description = "Glue between Coin high-level 3D visualization library and Qt"; diff --git a/pkgs/development/libraries/sord/default.nix b/pkgs/development/libraries/sord/default.nix index eb91ec2986a..820c577908a 100644 --- a/pkgs/development/libraries/sord/default.nix +++ b/pkgs/development/libraries/sord/default.nix @@ -1,19 +1,23 @@ -{ stdenv, fetchurl, pkgconfig, python3, serd, pcre, wafHook }: +{ lib, stdenv, fetchFromGitHub, pkg-config, python3, serd, pcre, wafHook }: stdenv.mkDerivation rec { pname = "sord"; - version = "0.16.4"; + version = "unstable-2021-01-12"; - src = fetchurl { - url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; - sha256 = "1mwh4qvp9q4vgrgg5bz9sgjhxscncrylf2b06h0q55ddwzs9hndi"; + # Commit picked in mitigation of #109729 + src = fetchFromGitHub { + owner = "drobilla"; + repo = pname; + rev = "d2efdb2d026216449599350b55c2c85c0d3efb89"; + sha256 = "hHTwK+K6cj9MGO77a1IXiUZtEbXZ08cLGkYZ5eMOIVA="; + fetchSubmodules = true; }; - nativeBuildInputs = [ pkgconfig python3 wafHook ]; + nativeBuildInputs = [ pkg-config python3 wafHook ]; buildInputs = [ pcre ]; propagatedBuildInputs = [ serd ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://drobilla.net/software/sord"; description = "A lightweight C library for storing RDF data in memory"; license = licenses.mit; diff --git a/pkgs/development/libraries/soxt/default.nix b/pkgs/development/libraries/soxt/default.nix index fe0d93344c0..5ea23aae879 100644 --- a/pkgs/development/libraries/soxt/default.nix +++ b/pkgs/development/libraries/soxt/default.nix @@ -1,4 +1,4 @@ -{ fetchhg, stdenv, cmake, coin3d, motif, xlibsWrapper, libXmu, libGLU, libGL }: +{ fetchhg, lib, stdenv, cmake, coin3d, motif, xlibsWrapper, libXmu, libGLU, libGL }: stdenv.mkDerivation { pname = "soxt"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; buildInputs = [ coin3d motif xlibsWrapper libGLU libGL libXmu ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://bitbucket.org/Coin3D/coin/wiki/Home"; license = licenses.bsd3; description = "A GUI binding for using Open Inventor with Xt/Motif"; diff --git a/pkgs/development/libraries/spandsp/3.nix b/pkgs/development/libraries/spandsp/3.nix index ac587f0492b..b3522afdf86 100644 --- a/pkgs/development/libraries/spandsp/3.nix +++ b/pkgs/development/libraries/spandsp/3.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, audiofile, libtiff, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, audiofile, libtiff, autoreconfHook }: stdenv.mkDerivation rec { version = "3.0.0"; pname = "spandsp"; @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { meta = { description = "A portable and modular SIP User-Agent with audio and video support"; homepage = "https://github.com/freeswitch/spandsp"; - platforms = with stdenv.lib.platforms; linux; - maintainers = with stdenv.lib.maintainers; [ ajs124 ]; - license = stdenv.lib.licenses.gpl2; + platforms = with lib.platforms; linux; + maintainers = with lib.maintainers; [ ajs124 ]; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/development/libraries/spandsp/default.nix b/pkgs/development/libraries/spandsp/default.nix index 1f9834c08f4..85a3059f27b 100644 --- a/pkgs/development/libraries/spandsp/default.nix +++ b/pkgs/development/libraries/spandsp/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, audiofile, libtiff}: +{lib, stdenv, fetchurl, audiofile, libtiff}: stdenv.mkDerivation rec { version = "0.0.6"; pname = "spandsp"; @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { meta = { description = "A portable and modular SIP User-Agent with audio and video support"; homepage = "http://www.creytiv.com/baresip.html"; - platforms = with stdenv.lib.platforms; linux; - maintainers = with stdenv.lib.maintainers; [raskin]; - license = stdenv.lib.licenses.gpl2; + platforms = with lib.platforms; linux; + maintainers = with lib.maintainers; [raskin]; + license = lib.licenses.gpl2; downloadPage = "http://www.soft-switch.org/downloads/spandsp/"; inherit version; updateWalker = true; diff --git a/pkgs/development/libraries/sparsehash/default.nix b/pkgs/development/libraries/sparsehash/default.nix index 6007560a11f..41b765bcb07 100644 --- a/pkgs/development/libraries/sparsehash/default.nix +++ b/pkgs/development/libraries/sparsehash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { name = "sparsehash-2.0.4"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1pf1cjvcjdmb9cd6gcazz64x0cd2ndpwh6ql2hqpypjv725xwxy7"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/sparsehash/sparsehash"; description = "An extremely memory-efficient hash_map implementation"; platforms = platforms.all; diff --git a/pkgs/development/libraries/spatialite-tools/default.nix b/pkgs/development/libraries/spatialite-tools/default.nix index 939371e9209..ffded04510b 100644 --- a/pkgs/development/libraries/spatialite-tools/default.nix +++ b/pkgs/development/libraries/spatialite-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, sqlite, expat, zlib, proj, geos, libspatialite, readosm }: +{ lib, stdenv, fetchurl, pkg-config, sqlite, expat, zlib, proj, geos, libspatialite, readosm }: stdenv.mkDerivation rec { name = "spatialite-tools-4.1.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "14aqmhvab63ydbb82fglsbig7jw1wmci8jjvci07aavdhvh1pyrv"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ sqlite expat zlib proj geos libspatialite readosm ]; configureFlags = [ "--disable-freexl" ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "A complete sqlite3-compatible CLI front-end for libspatialite"; homepage = "https://www.gaia-gis.it/fossil/spatialite-tools"; - license = with stdenv.lib.licenses; [ mpl11 gpl2Plus lgpl21Plus ]; - platforms = stdenv.lib.platforms.linux; + license = with lib.licenses; [ mpl11 gpl2Plus lgpl21Plus ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/spdk/default.nix b/pkgs/development/libraries/spdk/default.nix index 1b5abe16f37..a0c875079c4 100644 --- a/pkgs/development/libraries/spdk/default.nix +++ b/pkgs/development/libraries/spdk/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchFromGitHub , fetchpatch @@ -57,7 +57,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Set of libraries for fast user-mode storage"; homepage = "https://spdk.io/"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/spdlog/default.nix b/pkgs/development/libraries/spdlog/default.nix index fbe7af1825e..7b6c98bebe8 100644 --- a/pkgs/development/libraries/spdlog/default.nix +++ b/pkgs/development/libraries/spdlog/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, fmt }: +{ lib, stdenv, fetchFromGitHub, cmake, fmt }: let generic = { version, sha256 }: @@ -14,17 +14,21 @@ let }; nativeBuildInputs = [ cmake ]; - buildInputs = [ fmt ]; + # spdlog <1.3 uses a bundled version of fmt + propagatedBuildInputs = lib.optional (lib.versionAtLeast version "1.3") fmt; cmakeFlags = [ - "-DSPDLOG_BUILD_SHARED=ON" + "-DSPDLOG_BUILD_SHARED=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" + "-DSPDLOG_BUILD_STATIC=${if stdenv.hostPlatform.isStatic then "ON" else "OFF"}" "-DSPDLOG_BUILD_EXAMPLE=OFF" "-DSPDLOG_BUILD_BENCH=OFF" "-DSPDLOG_BUILD_TESTS=ON" "-DSPDLOG_FMT_EXTERNAL=ON" ]; - outputs = [ "out" "doc" ]; + outputs = [ "out" "doc" ] + # spdlog <1.4 is header only, no need to split libraries and headers + ++ lib.optional (lib.versionAtLeast version "1.4") "dev"; postInstall = '' mkdir -p $out/share/doc/spdlog @@ -34,7 +38,7 @@ let doCheck = true; preCheck = "export LD_LIBRARY_PATH=$(pwd):$LD_LIBRARY_PATH"; - meta = with stdenv.lib; { + meta = with lib; { description = "Very fast, header only, C++ logging library"; homepage = "https://github.com/gabime/spdlog"; license = licenses.mit; diff --git a/pkgs/development/libraries/speech-tools/default.nix b/pkgs/development/libraries/speech-tools/default.nix index 771ad033ed9..c54b4a3721f 100644 --- a/pkgs/development/libraries/speech-tools/default.nix +++ b/pkgs/development/libraries/speech-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, ncurses }: +{ lib, stdenv, fetchurl, alsaLib, ncurses }: stdenv.mkDerivation rec { name = "speech_tools-${version}.0"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { checkTarget = "test"; - meta = with stdenv.lib; { + meta = with lib; { description = "Text-to-speech engine"; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/speechd/default.nix b/pkgs/development/libraries/speechd/default.nix index 483b8eeb206..e85b6d4cbf4 100644 --- a/pkgs/development/libraries/speechd/default.nix +++ b/pkgs/development/libraries/speechd/default.nix @@ -1,6 +1,6 @@ -{ stdenv +{ lib, stdenv , substituteAll -, pkgconfig +, pkg-config , fetchurl , python3Packages , gettext @@ -24,7 +24,7 @@ }: let - inherit (stdenv.lib) optional optionals; + inherit (lib) optional optionals; inherit (python3Packages) python pyxdg wrapPython; # speechd hard-codes espeak, even when built without support for it. @@ -54,7 +54,7 @@ in stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config autoreconfHook gettext libtool @@ -88,7 +88,7 @@ in stdenv.mkDerivation rec { configureFlags = [ # Audio method falls back from left to right. "--with-default-audio-method=\"libao,pulse,alsa,oss\"" - "--with-systemdsystemunitdir=${placeholder ''out''}/lib/systemd/system" + "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" ] ++ optional withPulse "--with-pulse" ++ optional withAlsa "--with-alsa" ++ optional withLibao "--with-libao" @@ -110,7 +110,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Common interface to speech synthesis"; homepage = "https://devel.freebsoft.org/speechd"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/speex/default.nix b/pkgs/development/libraries/speex/default.nix index f7c3fc50fd7..9633f435fb8 100644 --- a/pkgs/development/libraries/speex/default.nix +++ b/pkgs/development/libraries/speex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, fftw, speexdsp }: +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, fftw, speexdsp }: stdenv.mkDerivation rec { name = "speex-1.2.0"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ fftw speexdsp ]; # TODO: Remove this will help with immediate backward compatability @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { "--with-fft=gpl-fftw3" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.speex.org/"; description = "An Open Source/Free Software patent-free audio compression format designed for speech"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/speexdsp/default.nix b/pkgs/development/libraries/speexdsp/default.nix index 421b3ec08c4..f87d79ca6e4 100644 --- a/pkgs/development/libraries/speexdsp/default.nix +++ b/pkgs/development/libraries/speexdsp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, fftw }: +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, fftw }: stdenv.mkDerivation rec { name = "speexdsp-1.2.0"; @@ -13,14 +13,14 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ fftw ]; configureFlags = [ "--with-fft=gpl-fftw3" - ] ++ stdenv.lib.optional stdenv.isAarch64 "--disable-neon"; + ] ++ lib.optional stdenv.isAarch64 "--disable-neon"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.speex.org/"; description = "An Open Source/Free Software patent-free audio compression format designed for speech"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/spglib/default.nix b/pkgs/development/libraries/spglib/default.nix new file mode 100644 index 00000000000..12d696b65a8 --- /dev/null +++ b/pkgs/development/libraries/spglib/default.nix @@ -0,0 +1,26 @@ +{ stdenv, lib, fetchFromGitHub, cmake } : + +stdenv.mkDerivation rec { + pname = "spglib"; + version = "1.16.1"; + + src = fetchFromGitHub { + owner = "atztogo"; + repo = "spglib"; + rev = "v${version}"; + sha256 = "1sk59nnar9npka4mdcfh4154ja46i35y4gbq892kwqidzyfs80in"; + }; + + nativeBuildInputs = [ cmake ]; + + checkTarget = "check"; + doCheck = true; + + meta = with lib; { + description = "C library for finding and handling crystal symmetries"; + homepage = "https://atztogo.github.io/spglib/"; + license = licenses.bsd3; + maintainers = [ maintainers.markuskowa ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/sphinxbase/default.nix b/pkgs/development/libraries/sphinxbase/default.nix index 008fb608ca0..a7d59cd8bf6 100644 --- a/pkgs/development/libraries/sphinxbase/default.nix +++ b/pkgs/development/libraries/sphinxbase/default.nix @@ -1,7 +1,7 @@ -{ stdenv +{ lib, stdenv , fetchurl , bison -, pkgconfig +, pkg-config , python27 # >= 2.6 , swig2 # 2.0 , multipleOutputs ? false #Uses incomplete features of nix! @@ -15,18 +15,18 @@ stdenv.mkDerivation (rec { sha256 = "0vr4k8pv5a8nvq9yja7kl13b5lh0f9vha8fc8znqnm8bwmcxnazp"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ swig2 python27 bison ]; meta = { description = "Support Library for Pocketsphinx"; homepage = "http://cmusphinx.sourceforge.net"; - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ ]; + license = lib.licenses.bsd2; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ ]; }; -} // (stdenv.lib.optionalAttrs multipleOutputs { +} // (lib.optionalAttrs multipleOutputs { outputs = [ "out" "lib" "headers" ]; postInstall = '' diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index 22370cee448..3d76e67f67a 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , acl , cyrus_sasl @@ -23,7 +23,7 @@ , perl , phodav , pixman -, pkgconfig +, pkg-config , polkit , python3 , spice-protocol @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { meson ninja perl - pkgconfig + pkg-config python3 python3.pkgs.pyparsing python3.pkgs.six @@ -109,7 +109,7 @@ stdenv.mkDerivation rec { spice-protocol usbredir zlib - ] ++ stdenv.lib.optionals withPolkit [ polkit acl usbutils ] ; + ] ++ lib.optionals withPolkit [ polkit acl usbutils ] ; PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions"; @@ -118,7 +118,7 @@ stdenv.mkDerivation rec { "-Dpulse=disabled" # is deprecated upstream ]; - meta = with stdenv.lib; { + meta = with lib; { description = "GTK 3 SPICE widget"; longDescription = '' spice-gtk is a GTK 3 SPICE widget. It features glib-based diff --git a/pkgs/development/libraries/spice-protocol/default.nix b/pkgs/development/libraries/spice-protocol/default.nix index cae975b9a58..07b670a2718 100644 --- a/pkgs/development/libraries/spice-protocol/default.nix +++ b/pkgs/development/libraries/spice-protocol/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "spice-protocol"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ln -sv ../share/pkgconfig $out/lib/pkgconfig ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Protocol headers for the SPICE protocol"; homepage = "https://www.spice-space.org/"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix index 2e158b98b58..584b1e15a8e 100644 --- a/pkgs/development/libraries/spice/default.nix +++ b/pkgs/development/libraries/spice/default.nix @@ -1,8 +1,8 @@ -{ stdenv +{ lib, stdenv , fetchurl , meson , ninja -, pkgconfig +, pkg-config , pixman , alsaLib , openssl @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config spice-protocol python3 python3.pkgs.six @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { ln -s spice-server $out/include/spice ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Complete open source solution for interaction with virtualized desktop devices"; longDescription = '' The Spice project aims to provide a complete open source solution for interaction diff --git a/pkgs/development/libraries/spirv-headers/default.nix b/pkgs/development/libraries/spirv-headers/default.nix index 79b8e7c2dda..9d464f7300a 100644 --- a/pkgs/development/libraries/spirv-headers/default.nix +++ b/pkgs/development/libraries/spirv-headers/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "spirv-headers"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Machine-readable components of the Khronos SPIR-V Registry"; license = licenses.mit; diff --git a/pkgs/development/libraries/sqlcipher/default.nix b/pkgs/development/libraries/sqlcipher/default.nix index f40c80391a2..9097d5abe54 100644 --- a/pkgs/development/libraries/sqlcipher/default.nix +++ b/pkgs/development/libraries/sqlcipher/default.nix @@ -4,13 +4,13 @@ assert readline != null -> ncurses != null; stdenv.mkDerivation rec { pname = "sqlcipher"; - version = "4.4.0"; + version = "4.4.2"; src = fetchFromGitHub { owner = "sqlcipher"; repo = "sqlcipher"; rev = "v${version}"; - sha256 = "0mx0n5n3s39r25b31sdkrd4psxjqqgcv6rpm9d57w5rlk75g2fiv"; + sha256 = "0zhww6fpnfflnzp6091npz38ab6cpq75v3ghqvcj5kqg09vqm5na"; }; nativeBuildInputs = [ installShellFiles ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { installManPage sqlcipher.1 ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.zetetic.net/sqlcipher/"; description = "SQLite extension that provides 256 bit AES encryption of database files"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index f0bbc93a6f1..bf1b8b7aa3b 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -1,21 +1,23 @@ -{ stdenv, fetchurl, zlib, interactive ? false, readline ? null, ncurses ? null }: +{ lib, stdenv, fetchurl, zlib, interactive ? false, readline ? null, ncurses ? null +, python3Packages +}: assert interactive -> readline != null && ncurses != null; -with stdenv.lib; +with lib; let - archiveVersion = import ./archive-version.nix stdenv.lib; + archiveVersion = import ./archive-version.nix lib; in stdenv.mkDerivation rec { pname = "sqlite"; - version = "3.34.0"; + version = "3.34.1"; # NB! Make sure to update ./tools.nix src (in the same directory). src = fetchurl { - url = "https://sqlite.org/2020/sqlite-autoconf-${archiveVersion version}.tar.gz"; - sha256 = "1vlsvlp5nvhd5pdjpmdczfsv7mml2gsalykl6x3palbxwgxbfvdz"; + url = "https://sqlite.org/2021/sqlite-autoconf-${archiveVersion version}.tar.gz"; + sha256 = "129ynp0qbxrfj1ys9hdi0jk8svds0cwfzl31af7bicqp25cclfra"; }; outputs = [ "bin" "dev" "out" ]; @@ -73,6 +75,10 @@ stdenv.mkDerivation rec { doCheck = false; # fails to link against tcl + passthru.tests = { + inherit (python3Packages) sqlalchemy; + }; + meta = { description = "A self-contained, serverless, zero-configuration, transactional SQL database engine"; downloadPage = "https://sqlite.org/download.html"; diff --git a/pkgs/development/libraries/sqlite/sqlar.nix b/pkgs/development/libraries/sqlite/sqlar.nix index 78ac8ba6448..0828f2f4554 100644 --- a/pkgs/development/libraries/sqlite/sqlar.nix +++ b/pkgs/development/libraries/sqlite/sqlar.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fuse, zlib }: +{ lib, stdenv, fetchurl, fuse, zlib }: stdenv.mkDerivation { pname = "sqlar"; @@ -11,13 +11,13 @@ stdenv.mkDerivation { buildInputs = [ fuse zlib ]; - buildFlags = [ "sqlar" "sqlarfs" ]; + buildFlags = [ "sqlar" "sqlarfs" "CFLAGS=-Wno-error" ]; installPhase = '' install -D -t $out/bin sqlar sqlarfs ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://sqlite.org/sqlar"; description = "SQLite Archive utilities"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/sqlite/tools.nix b/pkgs/development/libraries/sqlite/tools.nix index 0eb913adb3b..b423e557a56 100644 --- a/pkgs/development/libraries/sqlite/tools.nix +++ b/pkgs/development/libraries/sqlite/tools.nix @@ -1,24 +1,24 @@ -{ stdenv, fetchurl, unzip, sqlite, tcl, Foundation }: +{ lib, stdenv, fetchurl, unzip, sqlite, tcl, Foundation }: let - archiveVersion = import ./archive-version.nix stdenv.lib; + archiveVersion = import ./archive-version.nix lib; mkTool = { pname, makeTarget, description, homepage }: stdenv.mkDerivation rec { inherit pname; - version = "3.34.0"; + version = "3.34.1"; src = assert version == sqlite.version; fetchurl { - url = "https://sqlite.org/2020/sqlite-src-${archiveVersion version}.zip"; - sha256 = "0giklai05shqalj1wwadi9hg5dx6vff8nrblqh9xxljnrq701hm5"; + url = "https://sqlite.org/2021/sqlite-src-${archiveVersion version}.zip"; + sha256 = "0giklai05shqalj1wwadi9hg5dx6vff8nrblqh9xxljnrq701h00"; }; nativeBuildInputs = [ unzip ]; - buildInputs = [ tcl ] ++ stdenv.lib.optional stdenv.isDarwin Foundation; + buildInputs = [ tcl ] ++ lib.optional stdenv.isDarwin Foundation; makeFlags = [ makeTarget ]; installPhase = "install -Dt $out/bin ${makeTarget}"; - meta = with stdenv.lib; { + meta = with lib; { inherit description homepage; downloadPage = http://sqlite.org/download.html; license = licenses.publicDomain; diff --git a/pkgs/development/libraries/srt/default.nix b/pkgs/development/libraries/srt/default.nix index 6947c674a91..c8d8fafbf35 100644 --- a/pkgs/development/libraries/srt/default.nix +++ b/pkgs/development/libraries/srt/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, cmake, openssl +{ lib, stdenv, fetchFromGitHub, cmake, openssl }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "srt"; version = "1.4.2"; diff --git a/pkgs/development/libraries/srtp/default.nix b/pkgs/development/libraries/srtp/default.nix index e8a3ca94434..0dbfef2c639 100644 --- a/pkgs/development/libraries/srtp/default.nix +++ b/pkgs/development/libraries/srtp/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, pkgconfig +{ lib, stdenv, fetchFromGitHub, pkg-config , openssl ? null, libpcap ? null }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "libsrtp"; version = "2.3.0"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; # libsrtp.pc references -lcrypto -lpcap without -L propagatedBuildInputs = [ openssl libpcap ]; diff --git a/pkgs/development/libraries/startup-notification/default.nix b/pkgs/development/libraries/startup-notification/default.nix index bf2522ca780..f334bb2f35a 100644 --- a/pkgs/development/libraries/startup-notification/default.nix +++ b/pkgs/development/libraries/startup-notification/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libX11, libxcb, pkgconfig, xcbutil}: +{lib, stdenv, fetchurl, libX11, libxcb, pkg-config, xcbutil}: let version = "0.12"; @@ -11,12 +11,12 @@ stdenv.mkDerivation { sha256 = "3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libxcb xcbutil ]; meta = { homepage = "http://www.freedesktop.org/software/startup-notification"; description = "Application startup notification and feedback library"; - license = stdenv.lib.licenses.lgpl2; + license = lib.licenses.lgpl2; }; } diff --git a/pkgs/development/libraries/stb/default.nix b/pkgs/development/libraries/stb/default.nix index 8e57222ded0..a3020e14d3e 100644 --- a/pkgs/development/libraries/stb/default.nix +++ b/pkgs/development/libraries/stb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { pname = "stb"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { cp *.h $out/include/stb/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Single-file public domain libraries for C/C++"; homepage = "https://github.com/nothings/stb"; license = licenses.publicDomain; diff --git a/pkgs/development/libraries/stellarsolver/default.nix b/pkgs/development/libraries/stellarsolver/default.nix index 69417299615..f55c72bd209 100644 --- a/pkgs/development/libraries/stellarsolver/default.nix +++ b/pkgs/development/libraries/stellarsolver/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub, cmake, +{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, cfitsio, gsl, wcslib, withTester ? false }: mkDerivation rec { @@ -20,7 +20,7 @@ mkDerivation rec { "-DBUILD_TESTER=${if withTester then "on" else "off"}" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/rlancaste/stellarsolver"; description = "Astrometric plate solving library"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/stfl/default.nix b/pkgs/development/libraries/stfl/default.nix index b0da3dbfa27..20676c16b9c 100644 --- a/pkgs/development/libraries/stfl/default.nix +++ b/pkgs/development/libraries/stfl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, libiconv }: +{ lib, stdenv, fetchurl, ncurses, libiconv }: stdenv.mkDerivation rec { name = "stfl-0.24"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildPhase = '' sed -i s/gcc/cc/g Makefile sed -i s%ncursesw/ncurses.h%ncurses.h% stfl_internals.h - '' + ( stdenv.lib.optionalString stdenv.isDarwin '' + '' + ( lib.optionalString stdenv.isDarwin '' sed -i s/-soname/-install_name/ Makefile '' ) + '' make @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.clifford.at/stfl/"; description = "A library which implements a curses-based widget set for text terminals"; - maintainers = with stdenv.lib.maintainers; [ lovek323 ]; - license = stdenv.lib.licenses.lgpl3; - platforms = stdenv.lib.platforms.unix; + maintainers = with lib.maintainers; [ lovek323 ]; + license = lib.licenses.lgpl3; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/stlport/default.nix b/pkgs/development/libraries/stlport/default.nix index 2d344ab293d..5af77d90053 100644 --- a/pkgs/development/libraries/stlport/default.nix +++ b/pkgs/development/libraries/stlport/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { name = "STLport-5.2.1"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "An implementation of the C++ Standard Library"; homepage = "https://sourceforge.net/projects/stlport/"; - license = stdenv.lib.licenses.free; # seems BSD-like + license = lib.licenses.free; # seems BSD-like broken = true; # probably glibc-2.20 -related issue }; } diff --git a/pkgs/development/libraries/stxxl/default.nix b/pkgs/development/libraries/stxxl/default.nix index fead2c8c1a5..eec4f722d41 100644 --- a/pkgs/development/libraries/stxxl/default.nix +++ b/pkgs/development/libraries/stxxl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake +{ lib, stdenv, fetchurl, cmake , parallel ? true }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { inherit parallel; }; - meta = with stdenv.lib; { + meta = with lib; { description = "An implementation of the C++ standard template library STL for external memory (out-of-core) computations"; homepage = "https://github.com/stxxl/stxxl"; license = licenses.boost; diff --git a/pkgs/development/libraries/subunit/default.nix b/pkgs/development/libraries/subunit/default.nix index bf3b6a9ffd1..cb824decc6c 100644 --- a/pkgs/development/libraries/subunit/default.nix +++ b/pkgs/development/libraries/subunit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, check, cppunit, perl, pythonPackages }: +{ lib, stdenv, fetchurl, pkg-config, check, cppunit, perl, pythonPackages }: # NOTE: for subunit python library see pkgs/top-level/python-packages.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { sha256 = "1h7i5ifcx20qkya24j11nbwa829klw7dvnlljdgivgvcx6b20y80"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ check cppunit perl pythonPackages.wrapPython ]; propagatedBuildInputs = with pythonPackages; [ testtools testscenarios ]; postFixup = "wrapPythonPrograms"; - meta = with stdenv.lib; { + meta = with lib; { description = "A streaming protocol for test results"; homepage = "https://launchpad.net/subunit"; license = licenses.asl20; diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix index a17b300d6be..f8db8f3c379 100644 --- a/pkgs/development/libraries/sundials/default.nix +++ b/pkgs/development/libraries/sundials/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , cmake , fetchurl , fetchpatch @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { buildInputs = [ python ] - ++ stdenv.lib.optionals (lapackSupport) + ++ lib.optionals (lapackSupport) # Check that the same index size is used for both libraries (assert (blas.isILP64 == lapack.isILP64); [ gfortran @@ -46,16 +46,16 @@ stdenv.mkDerivation rec { # KLU support is based on Suitesparse. # It is tested upstream according to the section 1.1.4 of # [INSTALL_GUIDE.pdf](https://raw.githubusercontent.com/LLNL/sundials/master/INSTALL_GUIDE.pdf) - ++ stdenv.lib.optionals (kluSupport) [ + ++ lib.optionals (kluSupport) [ suitesparse ]; cmakeFlags = [ "-DEXAMPLES_INSTALL_PATH=${placeholder "examples"}/share/examples" - ] ++ stdenv.lib.optionals (lapackSupport) [ + ] ++ lib.optionals (lapackSupport) [ "-DENABLE_LAPACK=ON" "-DLAPACK_LIBRARIES=${lapack}/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary}" - ] ++ stdenv.lib.optionals (kluSupport) [ + ] ++ lib.optionals (kluSupport) [ "-DENABLE_KLU=ON" "-DKLU_INCLUDE_DIR=${suitesparse.dev}/include" "-DKLU_LIBRARY_DIR=${suitesparse}/lib" @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { doCheck = true; checkTarget = "test"; - meta = with stdenv.lib; { + meta = with lib; { description = "Suite of nonlinear differential/algebraic equation solvers"; homepage = "https://computation.llnl.gov/projects/sundials"; platforms = platforms.all; diff --git a/pkgs/development/libraries/svrcore/default.nix b/pkgs/development/libraries/svrcore/default.nix index 628ab7e28ef..fbc17a5e7b2 100644 --- a/pkgs/development/libraries/svrcore/default.nix +++ b/pkgs/development/libraries/svrcore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, nss, nspr }: +{ lib, stdenv, fetchurl, pkg-config, nss, nspr }: stdenv.mkDerivation rec { pname = "svrcore"; @@ -9,10 +9,10 @@ stdenv.mkDerivation rec { sha256 = "0n3alg6bxml8952fb6h0bi0l29farvq21q6k20gy2ba90m3znwj7"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ nss nspr ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Secure PIN handling using NSS crypto"; license = licenses.mpl11; platforms = platforms.all; diff --git a/pkgs/development/libraries/swiften/default.nix b/pkgs/development/libraries/swiften/default.nix index 2fe20cc9e88..980d034682f 100644 --- a/pkgs/development/libraries/swiften/default.nix +++ b/pkgs/development/libraries/swiften/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python, fetchurl, openssl, boost, sconsPackages }: +{ lib, stdenv, python, fetchurl, openssl, boost, sconsPackages }: stdenv.mkDerivation rec { pname = "swiften"; version = "4.0.2"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "An XMPP library for C++, used by the Swift client"; homepage = "http://swift.im/swiften.html"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/swiftshader/default.nix b/pkgs/development/libraries/swiftshader/default.nix index 3631b8b4fe7..2c508a3735f 100644 --- a/pkgs/development/libraries/swiftshader/default.nix +++ b/pkgs/development/libraries/swiftshader/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, python3, cmake, jq, libX11, libXext, zlib }: +{ lib, stdenv, fetchgit, python3, cmake, jq, libX11, libXext, zlib }: stdenv.mkDerivation rec { pname = "swiftshader"; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A high-performance CPU-based implementation of the Vulkan, OpenGL ES, and Direct3D 9 graphics APIs"; homepage = "https://opensource.google/projects/swiftshader"; diff --git a/pkgs/development/libraries/sword/default.nix b/pkgs/development/libraries/sword/default.nix index 7349d7f81eb..35c1e6e15e2 100644 --- a/pkgs/development/libraries/sword/default.nix +++ b/pkgs/development/libraries/sword/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, icu, clucene_core, curl }: +{ lib, stdenv, fetchurl, pkg-config, icu, clucene_core, curl }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "14syphc47g6svkbg018nrsgq4z6hid1zydax243g8dx747vsi6nf"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ icu clucene_core curl ]; prePatch = '' @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { "-DU_USING_ICU_NAMESPACE=1" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A software framework that allows research manipulation of Biblical texts"; homepage = "http://www.crosswire.org/sword/"; longDescription = '' diff --git a/pkgs/development/libraries/sycl-info/default.nix b/pkgs/development/libraries/sycl-info/default.nix index f294c887b0c..9d86017e084 100644 --- a/pkgs/development/libraries/sycl-info/default.nix +++ b/pkgs/development/libraries/sycl-info/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , installShellFiles , cmake @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { "-DBUILD_TESTING=ON" "-DBUILD_DOCS=ON" "-DBUILD_SHARED_LIBS=ON" - "-DLYRA_INCLUDE_DIRS=${stdenv.lib.getDev lyra}/include" + "-DLYRA_INCLUDE_DIRS=${lib.getDev lyra}/include" ]; # Required for ronn to compile the manpage. RUBYOPT = "-KU -E utf-8:utf-8"; - meta = with stdenv.lib; + meta = with lib; { homepage = "https://github.com/codeplaysoftware/sycl-info"; description = "Tool to show information about available SYCL implementations"; diff --git a/pkgs/development/libraries/symengine/default.nix b/pkgs/development/libraries/symengine/default.nix index cc3abd80d6f..3a3f5c79763 100644 --- a/pkgs/development/libraries/symengine/default.nix +++ b/pkgs/development/libraries/symengine/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , gmp @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ctest ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A fast symbolic manipulation library"; homepage = "https://github.com/symengine/symengine"; platforms = platforms.unix ++ platforms.windows; diff --git a/pkgs/development/libraries/szip/default.nix b/pkgs/development/libraries/szip/default.nix index 2419cf55442..f6d0c619c77 100644 --- a/pkgs/development/libraries/szip/default.nix +++ b/pkgs/development/libraries/szip/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl }: - +{ lib, stdenv, fetchurl }: + stdenv.mkDerivation rec { pname = "szip"; version = "2.1.1"; @@ -11,6 +11,6 @@ stdenv.mkDerivation rec { meta = { description = "Compression library that can be used with the hdf5 library"; homepage = "https://www.hdfgroup.org/doc_resource/SZIP/"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; }; } diff --git a/pkgs/development/libraries/t1lib/default.nix b/pkgs/development/libraries/t1lib/default.nix index 7d42abc6ea1..495993a64ab 100644 --- a/pkgs/development/libraries/t1lib/default.nix +++ b/pkgs/development/libraries/t1lib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, libX11, libXaw }: +{ lib, stdenv, fetchurl, fetchpatch, libX11, libXaw }: let getPatch = { name, sha256 }: fetchpatch { @@ -28,9 +28,9 @@ stdenv.mkDerivation { buildInputs = [ libX11 libXaw ]; buildFlags = [ "without_doc" ]; - postInstall = stdenv.lib.optional (!stdenv.isDarwin) "chmod +x $out/lib/*.so.*"; # ?? + postInstall = lib.optional (!stdenv.isDarwin) "chmod +x $out/lib/*.so.*"; # ?? - meta = with stdenv.lib; { + meta = with lib; { description = "A type 1 font rasterizer library for UNIX/X11"; homepage = "http://www.t1lib.org/"; license = with licenses; [ gpl2 lgpl2 ]; diff --git a/pkgs/development/libraries/tachyon/default.nix b/pkgs/development/libraries/tachyon/default.nix index 20dc80b253d..f536442295e 100644 --- a/pkgs/development/libraries/tachyon/default.nix +++ b/pkgs/development/libraries/tachyon/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , Carbon ? null , libjpeg ? null @@ -18,19 +18,19 @@ stdenv.mkDerivation rec { url = "http://jedi.ks.uiuc.edu/~johns/tachyon/files/${version}/${pname}-${version}.tar.gz"; sha256 = "04m0bniszyg7ryknj8laj3rl5sspacw5nr45x59j2swcsxmdvn1v"; }; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.isDarwin [ Carbon - ] ++ stdenv.lib.optionals withJpegSupport [ + ] ++ lib.optionals withJpegSupport [ libjpeg - ] ++ stdenv.lib.optionals withPngSupport [ + ] ++ lib.optionals withPngSupport [ libpng ]; preBuild = '' cd unix - '' + stdenv.lib.optionalString withJpegSupport '' + '' + lib.optionalString withJpegSupport '' export USEJPEG=" -DUSEJPEG" export JPEGLIB=" -ljpeg" - '' + stdenv.lib.optionalString withPngSupport '' + '' + lib.optionalString withPngSupport '' export USEPNG=" -DUSEPNG" export PNGLIB=" -lpng -lz" ''; @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { ./make-archs.patch ] ++ # Ensure looks for nix-provided Carbon, not system frameworks - stdenv.lib.optional stdenv.isDarwin ./darwin.patch; + lib.optional stdenv.isDarwin ./darwin.patch; installPhase = '' cd ../compile/${arch} @@ -66,10 +66,10 @@ stdenv.mkDerivation rec { ''; meta = { inherit version; - description = ''A Parallel / Multiprocessor Ray Tracing System''; - license = stdenv.lib.licenses.bsd3; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = with stdenv.lib.platforms; linux ++ cygwin ++ darwin; + description = "A Parallel / Multiprocessor Ray Tracing System"; + license = lib.licenses.bsd3; + maintainers = [lib.maintainers.raskin]; + platforms = with lib.platforms; linux ++ cygwin ++ darwin; homepage = "http://jedi.ks.uiuc.edu/~johns/tachyon/"; }; } diff --git a/pkgs/development/libraries/taglib-extras/default.nix b/pkgs/development/libraries/taglib-extras/default.nix index b667e604740..44e107693c9 100644 --- a/pkgs/development/libraries/taglib-extras/default.nix +++ b/pkgs/development/libraries/taglib-extras/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cmake, taglib}: +{lib, stdenv, fetchurl, cmake, taglib}: stdenv.mkDerivation rec { name = "taglib-extras-1.0.1"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sed -i -e 's/STRLESS/VERSION_LESS/g' cmake/modules/FindTaglib.cmake ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Additional taglib plugins"; platforms = platforms.unix; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/taglib-sharp/default.nix b/pkgs/development/libraries/taglib-sharp/default.nix index 89d676cf3a3..78a4026455e 100644 --- a/pkgs/development/libraries/taglib-sharp/default.nix +++ b/pkgs/development/libraries/taglib-sharp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, which, pkgconfig, mono }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, which, pkg-config, mono }: stdenv.mkDerivation rec { pname = "taglib-sharp"; @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { sha256 = "12pk4z6ag8w7kj6vzplrlasq5lwddxrww1w1ya5ivxrfki15h5cp"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook which ]; + nativeBuildInputs = [ pkg-config autoreconfHook which ]; buildInputs = [ mono ]; dontStrip = true; configureFlags = [ "--disable-docs" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for reading and writing metadata in media files"; homepage = "https://github.com/mono/taglib-sharp"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/taglib/default.nix b/pkgs/development/libraries/taglib/default.nix index 28373605a6b..3fcfaa12339 100644 --- a/pkgs/development/libraries/taglib/default.nix +++ b/pkgs/development/libraries/taglib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, fetchpatch +{ lib, stdenv, fetchurl, cmake, fetchpatch , zlib }: @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://taglib.org/"; repositories.git = "git://github.com/taglib/taglib.git"; description = "A library for reading and editing audio file metadata"; diff --git a/pkgs/development/libraries/tagparser/default.nix b/pkgs/development/libraries/tagparser/default.nix new file mode 100644 index 00000000000..deeb7552069 --- /dev/null +++ b/pkgs/development/libraries/tagparser/default.nix @@ -0,0 +1,33 @@ +{ stdenv +, pkgs +, fetchFromGitHub +, cmake +, cpp-utilities +, zlib +}: + +stdenv.mkDerivation rec { + pname = "tagparser"; + version = "9.4.0"; + + src = fetchFromGitHub { + owner = "Martchus"; + repo = "tagparser"; + rev = "v${version}"; + sha256 = "097dq9di19d3mvnlrav3fm78gzjni5babswyv10xnrxfhnf14f6x"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + cpp-utilities zlib + ]; + + meta = with pkgs.lib; { + homepage = "https://github.com/Martchus/tagparser"; + description = "C++ library for reading and writing MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus, FLAC and Matroska tags"; + license = licenses.gpl2; + maintainers = [ maintainers.matthiasbeyer ]; + }; +} + diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index fa920d037a9..553c42da7c4 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , python3 , pkg-config @@ -43,7 +43,7 @@ stdenv.mkDerivation (rec { ]; # this must not be exported before the ConfigurePhase otherwise waf whines - preBuild = stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + preBuild = lib.optionalString stdenv.hostPlatform.isMusl '' export NIX_CFLAGS_LINK="-no-pie -shared"; ''; @@ -51,13 +51,13 @@ stdenv.mkDerivation (rec { ${stdenv.cc.targetPrefix}ar q $out/lib/libtalloc.a bin/default/talloc.c.[0-9]*.o ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Hierarchical pool based memory allocator with destructors"; homepage = "https://tdb.samba.org/"; license = licenses.gpl3; platforms = platforms.all; }; -} // stdenv.lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) { +} // lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) { # python-config from build Python gives incorrect values when cross-compiling. # If python-config is not found, the build falls back to using the sysconfig # module, which works correctly when cross-compiling. diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix index 264b34125a8..2047b0d5bc2 100644 --- a/pkgs/development/libraries/tbb/default.nix +++ b/pkgs/development/libraries/tbb/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, fixDarwinDylibNames, compiler ? if stdenv.cc.isClang then "clang" else null, stdver ? null }: +{ lib, stdenv, fetchFromGitHub, fixDarwinDylibNames, compiler ? if stdenv.cc.isClang then "clang" else null, stdver ? null }: -with stdenv.lib; stdenv.mkDerivation rec { +with lib; stdenv.mkDerivation rec { pname = "tbb"; version = "2019_U9"; @@ -16,7 +16,7 @@ with stdenv.lib; stdenv.mkDerivation rec { makeFlags = optional (compiler != null) "compiler=${compiler}" ++ optional (stdver != null) "stdver=${stdver}"; - patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ./glibc-struct-mallinfo.patch; + patches = lib.optional stdenv.hostPlatform.isMusl ./glibc-struct-mallinfo.patch; installPhase = '' runHook preInstall diff --git a/pkgs/development/libraries/tclap/default.nix b/pkgs/development/libraries/tclap/default.nix index 22fd7b11681..451f17a2cd7 100644 --- a/pkgs/development/libraries/tclap/default.nix +++ b/pkgs/development/libraries/tclap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "tclap-1.2.2"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0dsqvsgzam3mypj2ladn6v1yjq9zd47p3lg21jx6kz5azkkkn0gm"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://tclap.sourceforge.net/"; description = "Templatized C++ Command Line Parser Library"; platforms = platforms.all; diff --git a/pkgs/development/libraries/tcllib/default.nix b/pkgs/development/libraries/tcllib/default.nix index 2cb65b9c698..4cab15ca5c2 100644 --- a/pkgs/development/libraries/tcllib/default.nix +++ b/pkgs/development/libraries/tcllib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, tcl }: +{ lib, stdenv, fetchurl, tcl }: stdenv.mkDerivation rec { pname = "tcllib"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://sourceforge.net/projects/tcllib/"; description = "Tcl-only library of standard routines for Tcl"; - license = stdenv.lib.licenses.tcltk; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.tcltk; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/tcltls/default.nix b/pkgs/development/libraries/tcltls/default.nix index c26394f6cd5..e88358bbce0 100644 --- a/pkgs/development/libraries/tcltls/default.nix +++ b/pkgs/development/libraries/tcltls/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, tcl, openssl }: +{ lib, stdenv, fetchurl, tcl, openssl }: stdenv.mkDerivation rec { pname = "tcltls"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://tls.sourceforge.net/"; description = "An OpenSSL / RSA-bsafe Tcl extension"; - license = stdenv.lib.licenses.tcltk; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.tcltk; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/tclx/default.nix b/pkgs/development/libraries/tclx/default.nix index 5d4727a1831..85eae730575 100644 --- a/pkgs/development/libraries/tclx/default.nix +++ b/pkgs/development/libraries/tclx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, tcl }: +{ lib, stdenv, fetchurl, tcl }: stdenv.mkDerivation rec { name = "tclx-${version}.${patch}"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://tclx.sourceforge.net/"; description = "Tcl extensions"; - license = stdenv.lib.licenses.tcltk; - maintainers = with stdenv.lib.maintainers; [ kovirobi ]; + license = lib.licenses.tcltk; + maintainers = with lib.maintainers; [ kovirobi ]; }; } diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix index b8e6552bc7b..658bdb2f9d5 100644 --- a/pkgs/development/libraries/tdb/default.nix +++ b/pkgs/development/libraries/tdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , pkg-config , wafHook @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { "--builtin-libraries=replace" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "The trivial database"; longDescription = '' TDB is a Trivial Database. In concept, it is very much like GDBM, diff --git a/pkgs/development/libraries/tdlib/default.nix b/pkgs/development/libraries/tdlib/default.nix index 1a36a68a33b..895faa8847a 100644 --- a/pkgs/development/libraries/tdlib/default.nix +++ b/pkgs/development/libraries/tdlib/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, gperf, openssl, readline, zlib, cmake, stdenv }: +{ fetchFromGitHub, gperf, openssl, readline, zlib, cmake, lib, stdenv }: stdenv.mkDerivation rec { version = "1.7.0"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ gperf openssl readline zlib ]; nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Cross-platform library for building Telegram clients"; homepage = "https://core.telegram.org/tdlib/"; license = [ licenses.boost ]; diff --git a/pkgs/development/libraries/tecla/default.nix b/pkgs/development/libraries/tecla/default.nix index a47f39be10a..6d8a334ce3f 100644 --- a/pkgs/development/libraries/tecla/default.nix +++ b/pkgs/development/libraries/tecla/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "tecla-1.6.3"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { description = "Command-line editing library"; license = "as-is"; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.peti ]; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.peti ]; }; } diff --git a/pkgs/development/libraries/telepathy/farstream/default.nix b/pkgs/development/libraries/telepathy/farstream/default.nix index 455c761f6ee..2885f3cbb12 100644 --- a/pkgs/development/libraries/telepathy/farstream/default.nix +++ b/pkgs/development/libraries/telepathy/farstream/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, telepathy-glib, farstream, dbus-glib }: +{ lib, stdenv, fetchurl, pkg-config, telepathy-glib, farstream, dbus-glib }: stdenv.mkDerivation rec { name = "${pname}-0.6.2"; @@ -10,9 +10,9 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = [ dbus-glib telepathy-glib farstream ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { description = "GObject-based C library that uses Telepathy GLib, Farstream and GStreamer to handle the media streaming part of channels of type Call"; homepage = "https://telepathy.freedesktop.org/wiki/Components/Telepathy-Farstream/"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix index ee2f34776d6..8bb7522b197 100644 --- a/pkgs/development/libraries/telepathy/glib/default.nix +++ b/pkgs/development/libraries/telepathy/glib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dbus-glib, glib, python2, pkgconfig, libxslt +{ lib, stdenv, fetchurl, dbus-glib, glib, python2, pkg-config, libxslt , gobject-introspection, vala, glibcLocales }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { LC_ALL = "en_US.UTF-8"; propagatedBuildInputs = [ dbus-glib glib ]; - nativeBuildInputs = [ pkgconfig libxslt gobject-introspection vala ]; + nativeBuildInputs = [ pkg-config libxslt gobject-introspection vala ]; buildInputs = [ glibcLocales python2 ]; enableParallelBuilding = true; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { passthru.python = python2; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://telepathy.freedesktop.org"; platforms = platforms.unix; license = with licenses; [ bsd2 bsd3 lgpl21Plus ]; diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix index ff8ff83fb9a..f61811428ce 100644 --- a/pkgs/development/libraries/telepathy/qt/default.nix +++ b/pkgs/development/libraries/telepathy/qt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, qtbase, pkgconfig, python3Packages, dbus-glib, dbus +{ lib, stdenv, fetchurl, cmake, qtbase, pkg-config, python3Packages, dbus-glib, dbus , telepathy-farstream, telepathy-glib, fetchpatch }: let @@ -11,18 +11,20 @@ in stdenv.mkDerivation rec { sha256 = "bf8e2a09060addb80475a4938105b9b41d9e6837999b7a00e5351783857e18ad"; }; - nativeBuildInputs = [ cmake pkgconfig python ]; + nativeBuildInputs = [ cmake pkg-config python ]; propagatedBuildInputs = [ qtbase telepathy-farstream telepathy-glib ]; buildInputs = [ dbus-glib ]; checkInputs = [ dbus.daemon dbus-python ]; # No point in building tests if they are not run # On 0.9.7, they do not even build with QT4 - cmakeFlags = stdenv.lib.optional (!doCheck) "-DENABLE_TESTS=OFF"; + cmakeFlags = lib.optional (!doCheck) "-DENABLE_TESTS=OFF"; + + dontWrapQtApps = true; doCheck = false; # giving up for now - meta = with stdenv.lib; { + meta = with lib; { description = "Telepathy Qt bindings"; homepage = "https://telepathy.freedesktop.org/components/telepathy-qt/"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/template-glib/default.nix b/pkgs/development/libraries/template-glib/default.nix index 385b198a755..2c89e3f433a 100644 --- a/pkgs/development/libraries/template-glib/default.nix +++ b/pkgs/development/libraries/template-glib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, glib, gobject-introspection, flex, bison, vala, gettext, gnome3, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }: +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, glib, gobject-introspection, flex, bison, vala, gettext, gnome3, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }: let version = "3.34.0"; pname = "template-glib"; @@ -9,11 +9,11 @@ stdenv.mkDerivation { outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1z9xkin5fyfh071ma9y045jcw83hgx33dfbjraw6cxk0qdmfysr1"; }; - buildInputs = [ meson ninja pkgconfig gettext flex bison vala glib gtk-doc docbook_xsl docbook_xml_dtd_43 ]; + buildInputs = [ meson ninja pkg-config gettext flex bison vala glib gtk-doc docbook_xsl docbook_xml_dtd_43 ]; nativeBuildInputs = [ glib gobject-introspection ]; mesonFlags = [ @@ -26,7 +26,7 @@ stdenv.mkDerivation { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A library for template expansion which supports calling into GObject Introspection from templates"; homepage = "https://gitlab.gnome.org/GNOME/template-glib"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/tepl/default.nix b/pkgs/development/libraries/tepl/default.nix index 77cf9fd0247..d9d74081735 100644 --- a/pkgs/development/libraries/tepl/default.nix +++ b/pkgs/development/libraries/tepl/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , meson , ninja @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0x2s0ks575b57jdqnp9r9miz40pm705n2dlj2k8bfj1hyl22kgf6"; }; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { passthru.updateScript = gnome3.updateScript { packageName = pname; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Projects/Tepl"; description = "Text editor product line"; maintainers = teams.gnome.members ++ [ maintainers.manveru ]; diff --git a/pkgs/development/libraries/termbox/default.nix b/pkgs/development/libraries/termbox/default.nix index 22082f7198f..e809240bcd1 100644 --- a/pkgs/development/libraries/termbox/default.nix +++ b/pkgs/development/libraries/termbox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3, wafHook, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, python3, wafHook, fetchpatch }: stdenv.mkDerivation rec { pname = "termbox"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ python3 wafHook ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for writing text-based user interfaces"; license = licenses.mit; homepage = "https://github.com/nsf/termbox#readme"; diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/development/libraries/tevent/default.nix index 2d5fd0564ba..568751f48aa 100644 --- a/pkgs/development/libraries/tevent/default.nix +++ b/pkgs/development/libraries/tevent/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , python3 , pkg-config @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { "--builtin-libraries=replace" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An event system based on the talloc memory management library"; homepage = "https://tevent.samba.org/"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/libraries/theft/default.nix b/pkgs/development/libraries/theft/default.nix index 646cc60406a..3d39075dd26 100644 --- a/pkgs/development/libraries/theft/default.nix +++ b/pkgs/development/libraries/theft/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { version = "0.4.5"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { doCheck = true; checkTarget = "test"; - + installFlags = [ "PREFIX=$(out)" ]; # fix the libtheft.pc file to use the right installation @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { substituteInPlace $out/lib/pkgconfig/libtheft.pc \ --replace "/usr/local" "$out" ''; - - meta = with stdenv.lib; { + + meta = with lib; { description = "A C library for property-based testing"; homepage = "https://github.com/silentbicycle/theft/"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/thrift/0.10.nix b/pkgs/development/libraries/thrift/0.10.nix index d626673a227..a735e146214 100644 --- a/pkgs/development/libraries/thrift/0.10.nix +++ b/pkgs/development/libraries/thrift/0.10.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, zlib, libevent, openssl, python, pkgconfig, bison +{ lib, stdenv, fetchurl, boost, zlib, libevent, openssl, python, pkg-config, bison , flex, twisted }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # pythonFull.buildEnv.override { extraLibs = [ thrift ]; } pythonPath = []; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ boost zlib libevent openssl python bison flex twisted ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-tests=no" ]; doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for scalable cross-language services"; homepage = "http://thrift.apache.org/"; license = licenses.asl20; diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix index f5c8f64633b..669dff21147 100644 --- a/pkgs/development/libraries/thrift/default.nix +++ b/pkgs/development/libraries/thrift/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, boost, zlib, libevent, openssl, python, cmake, pkgconfig +{ lib, stdenv, fetchurl, fetchpatch, boost, zlib, libevent, openssl, python, cmake, pkg-config , bison, flex, twisted , static ? stdenv.hostPlatform.isStatic }: @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { # pythonFull.buildEnv.override { extraLibs = [ thrift ]; } pythonPath = []; - nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ boost zlib libevent openssl python bison flex ] - ++ stdenv.lib.optional (!static) twisted; + nativeBuildInputs = [ cmake pkg-config bison flex ]; + buildInputs = [ boost zlib libevent openssl ] + ++ lib.optionals (!static) [ python twisted ]; preConfigure = "export PY_PREFIX=$out"; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { # FIXME: Fails to link in static mode with undefined reference to # `boost::unit_test::unit_test_main(bool (*)(), int, char**)' "-DBUILD_TESTING:BOOL=${if static then "OFF" else "ON"}" - ] ++ stdenv.lib.optionals static [ + ] ++ lib.optionals static [ "-DWITH_STATIC_LIB:BOOL=ON" "-DOPENSSL_USE_STATIC_LIBS=ON" ]; @@ -44,13 +44,13 @@ stdenv.mkDerivation rec { checkPhase = '' runHook preCheck - ${stdenv.lib.optionalString stdenv.isDarwin "DY"}LD_LIBRARY_PATH=$PWD/lib ctest -E PythonTestSSLSocket + ${lib.optionalString stdenv.isDarwin "DY"}LD_LIBRARY_PATH=$PWD/lib ctest -E PythonTestSSLSocket runHook postCheck ''; enableParallelChecking = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for scalable cross-language services"; homepage = "http://thrift.apache.org/"; license = licenses.asl20; diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix index 3d163ef6ded..044c09a5bc4 100644 --- a/pkgs/development/libraries/ti-rpc/default.nix +++ b/pkgs/development/libraries/ti-rpc/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, autoreconfHook, libkrb5 }: +{ fetchurl, lib, stdenv, autoreconfHook, libkrb5 }: stdenv.mkDerivation rec { pname = "libtirpc"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://sourceforge.net/projects/libtirpc/"; description = "The transport-independent Sun RPC implementation (TI-RPC)"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/ticpp/default.nix b/pkgs/development/libraries/ticpp/default.nix index 37b093c8e2e..20de3d7f2b8 100644 --- a/pkgs/development/libraries/ticpp/default.nix +++ b/pkgs/development/libraries/ticpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake }: @@ -28,7 +28,7 @@ stdenv.mkDerivation { meta = { description = "Interface to TinyXML"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; homepage = "https://github.com/wxFormBuilder/ticpp"; }; diff --git a/pkgs/development/libraries/tidyp/default.nix b/pkgs/development/libraries/tidyp/default.nix index f75b8cb0151..5c0ad8463b4 100644 --- a/pkgs/development/libraries/tidyp/default.nix +++ b/pkgs/development/libraries/tidyp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "tidyp-1.04"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A program that can validate your HTML, as well as modify it to be more clean and standard"; homepage = "http://tidyp.com/"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/timezonemap/default.nix b/pkgs/development/libraries/timezonemap/default.nix index 131d66e45cc..372b0e74b06 100644 --- a/pkgs/development/libraries/timezonemap/default.nix +++ b/pkgs/development/libraries/timezonemap/default.nix @@ -1,7 +1,7 @@ -{ stdenv +{ lib, stdenv , autoreconfHook , fetchbzr -, pkgconfig +, pkg-config , gtk3 , glib , file @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config autoreconfHook gobject-introspection ]; @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { sed "s|/usr/share/libtimezonemap|$out/share/libtimezonemap|g" -i ./src/tz.h ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://launchpad.net/timezonemap"; description = "A GTK+3 Timezone Map Widget"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/tinycbor/default.nix b/pkgs/development/libraries/tinycbor/default.nix index 62f2a807185..d03e20cb7e2 100644 --- a/pkgs/development/libraries/tinycbor/default.nix +++ b/pkgs/development/libraries/tinycbor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "tinycbor"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Concise Binary Object Representation (CBOR) Library"; homepage = "https://github.com/intel/tinycbor"; license = licenses.mit; diff --git a/pkgs/development/libraries/tinyobjloader/default.nix b/pkgs/development/libraries/tinyobjloader/default.nix index 92eb5b3d8f4..c7939a6be25 100644 --- a/pkgs/development/libraries/tinyobjloader/default.nix +++ b/pkgs/development/libraries/tinyobjloader/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/tinyobjloader/tinyobjloader"; description = "Tiny but powerful single file wavefront obj loader"; license = licenses.mit; diff --git a/pkgs/development/libraries/tinyxml-2/default.nix b/pkgs/development/libraries/tinyxml-2/default.nix index 310b5a447c7..1e2eea7ac89 100644 --- a/pkgs/development/libraries/tinyxml-2/default.nix +++ b/pkgs/development/libraries/tinyxml-2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "tinyxml-2"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "A simple, small, efficient, C++ XML parser"; homepage = "http://www.grinninglizard.com/tinyxml2/index.html"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.zlib; + platforms = lib.platforms.unix; + license = lib.licenses.zlib; }; } diff --git a/pkgs/development/libraries/tinyxml/2.6.2.nix b/pkgs/development/libraries/tinyxml/2.6.2.nix index 9c909d5e14d..e8c5dd1dacd 100644 --- a/pkgs/development/libraries/tinyxml/2.6.2.nix +++ b/pkgs/development/libraries/tinyxml/2.6.2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: let version = "2.6.2"; @@ -13,7 +13,7 @@ in stdenv.mkDerivation { }; patches = [ - # add pkgconfig file + # add pkg-config file ./2.6.2-add-pkgconfig.patch # https://sourceforge.net/tracker/index.php?func=detail&aid=3031828&group_id=13559&atid=313559 @@ -28,7 +28,7 @@ in stdenv.mkDerivation { hardeningDisable = [ "format" ]; NIX_CFLAGS_COMPILE = - stdenv.lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.9"; + lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.9"; nativeBuildInputs = [ unzip ]; buildPhase = '' @@ -67,14 +67,14 @@ in stdenv.mkDerivation { cp -v tinyxml.pc $out/lib/pkgconfig/ cp -v docs/* $out/share/doc/tinyxml/ - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' install_name_tool -id $out/lib/libtinyxml.dylib $out/lib/libtinyxml.dylib ''; meta = { description = "Simple, small, C++ XML parser that can be easily integrating into other programs"; homepage = "http://www.grinninglizard.com/tinyxml/index.html"; - license = stdenv.lib.licenses.free; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.free; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/tix/default.nix b/pkgs/development/libraries/tix/default.nix index f0b460b6f3d..e0f91330efc 100644 --- a/pkgs/development/libraries/tix/default.nix +++ b/pkgs/development/libraries/tix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, tcl, tk, fetchpatch } : +{ lib, stdenv, fetchurl, tcl, tk, fetchpatch } : stdenv.mkDerivation { version = "8.4.3"; @@ -7,13 +7,13 @@ stdenv.mkDerivation { url = "mirror://sourceforge/tix/tix/8.4.3/Tix8.4.3-src.tar.gz"; sha256 = "1jq3dkyk9mqkj4cg7mdk5r0cclqsby9l2b7wrysi0zk5yw7h8bsn"; }; - patches = [ + patches = [ (fetchpatch { name = "tix-8.4.3-tcl8.5.patch"; url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-tcltk/tix/files/tix-8.4.3-tcl8.5.patch?id=56bd759df1d0c750a065b8c845e93d5dfa6b549d"; sha256 = "0wzqmcxxq0rqpnjgxz10spw92yhfygnlwv0h8pcx2ycnqiljz6vj"; }) - ] ++ stdenv.lib.optional (tcl.release == "8.6") + ] ++ lib.optional (tcl.release == "8.6") (fetchpatch { name = "tix-8.4.3-tcl8.6.patch"; url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-tcltk/tix/files/tix-8.4.3-tcl8.6.patch?id=56bd759df1d0c750a065b8c845e93d5dfa6b549d"; @@ -23,7 +23,7 @@ stdenv.mkDerivation { buildInputs = [ tcl tk ]; # the configure script expects to find the location of the sources of # tcl and tk in {tcl,tk}Config.sh - # In fact, it only needs some private headers. We copy them in + # In fact, it only needs some private headers. We copy them in # the private_headers folders and trick the configure script into believing # the sources are here. preConfigure = '' @@ -42,7 +42,7 @@ stdenv.mkDerivation { "--libdir=\${prefix}/lib" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A widget library for Tcl/Tk"; homepage = "http://tix.sourceforge.net/"; platforms = platforms.all; diff --git a/pkgs/development/libraries/tk/8.6.nix b/pkgs/development/libraries/tk/8.6.nix index c30f9a81947..fdffbeba2c9 100644 --- a/pkgs/development/libraries/tk/8.6.nix +++ b/pkgs/development/libraries/tk/8.6.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl, tcl, stdenv, ... } @ args: +{ callPackage, fetchurl, tcl, lib, stdenv, ... } @ args: callPackage ./generic.nix (args // { @@ -7,6 +7,6 @@ callPackage ./generic.nix (args // { sha256 = "1d7bfkxpacy33w5nahf73lkwxqpff44w1jplg7i2gmwgiaawvjwg"; }; - patches = [ ./different-prefix-with-tcl.patch ] ++ stdenv.lib.optionals stdenv.isDarwin [ ./Fix-bad-install_name-for-libtk8.6.dylib.patch ]; + patches = [ ./different-prefix-with-tcl.patch ] ++ lib.optionals stdenv.isDarwin [ ./Fix-bad-install_name-for-libtk8.6.dylib.patch ]; }) diff --git a/pkgs/development/libraries/tk/generic.nix b/pkgs/development/libraries/tk/generic.nix index 1cbf4026cb8..57dc3dac2d0 100644 --- a/pkgs/development/libraries/tk/generic.nix +++ b/pkgs/development/libraries/tk/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, src, pkgconfig, tcl, libXft, patches ? [] +{ stdenv, lib, src, pkg-config, tcl, libXft, patches ? [] , enableAqua ? stdenv.isDarwin, darwin , ... }: @@ -21,17 +21,17 @@ stdenv.mkDerivation { cp ../{unix,generic}/*.h $out/include ln -s $out/lib/libtk${tcl.release}${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libtk${stdenv.hostPlatform.extensions.sharedLibrary} '' - + stdenv.lib.optionalString (stdenv.isDarwin) '' + + lib.optionalString (stdenv.isDarwin) '' cp ../macosx/*.h $out/include ''; configureFlags = [ "--enable-threads" "--with-tcl=${tcl}/lib" - ] ++ stdenv.lib.optional stdenv.is64bit "--enable-64bit" - ++ stdenv.lib.optional enableAqua "--enable-aqua"; + ] ++ lib.optional stdenv.is64bit "--enable-64bit" + ++ lib.optional enableAqua "--enable-aqua"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = lib.optional enableAqua (with darwin.apple_sdk.frameworks; [ Cocoa ]); propagatedBuildInputs = [ tcl libXft ]; @@ -46,7 +46,7 @@ stdenv.mkDerivation { libdir = "lib/${libPrefix}"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A widget toolkit that provides a library of basic elements for building a GUI in many different programming languages"; homepage = "https://www.tcl.tk/"; license = licenses.tcltk; diff --git a/pkgs/development/libraries/tkrzw/default.nix b/pkgs/development/libraries/tkrzw/default.nix new file mode 100644 index 00000000000..17375125bd2 --- /dev/null +++ b/pkgs/development/libraries/tkrzw/default.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, fetchurl }: + +stdenv.mkDerivation rec { + pname = "tkrzw"; + version = "0.9.3"; + # TODO: defeat multi-output reference cycles + + src = fetchurl { + url = "https://dbmx.net/tkrzw/pkg/tkrzw-${version}.tar.gz"; + sha256 = "1ap93fsw7vhn329kvy8g20l8p4jdygfl8r8mrgsfcpa20a29fnwl"; + }; + + enableParallelBuilding = true; + + doCheck = false; # memory intensive + + meta = with lib; { + description = "A set of implementations of DBM"; + homepage = "https://dbmx.net/tkrzw/"; + maintainers = with maintainers; [ ehmry ]; + license = licenses.asl20; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/tl-expected/default.nix b/pkgs/development/libraries/tl-expected/default.nix index e91c42c884c..4915fd7e700 100644 --- a/pkgs/development/libraries/tl-expected/default.nix +++ b/pkgs/development/libraries/tl-expected/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "tl-expected-unstable"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "C++11/14/17 std::expected with functional-style extensions"; homepage = "https://tl.tartanllama.xyz/en/latest/api/expected.html"; license = licenses.cc0; diff --git a/pkgs/development/libraries/tnt/default.nix b/pkgs/development/libraries/tnt/default.nix index 7e8aa2983cf..932239a485f 100644 --- a/pkgs/development/libraries/tnt/default.nix +++ b/pkgs/development/libraries/tnt/default.nix @@ -1,9 +1,9 @@ -{stdenv, fetchurl, unzip}: +{lib, stdenv, fetchurl, unzip}: stdenv.mkDerivation { pname = "tnt"; version = "3.0.12"; - + src = fetchurl { url = "https://math.nist.gov/tnt/tnt_3_0_12.zip"; sha256 = "1bzkfdb598584qlc058n8wqq9vbz714gr5r57401rsa9qaxhk5j7"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { homepage = "https://math.nist.gov/tnt/"; description = "Template Numerical Toolkit: C++ headers for array and matrices"; - license = stdenv.lib.licenses.publicDomain; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.publicDomain; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/tntdb/default.nix b/pkgs/development/libraries/tntdb/default.nix index ff14c8c3305..a21a71b89bf 100644 --- a/pkgs/development/libraries/tntdb/default.nix +++ b/pkgs/development/libraries/tntdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cxxtools, postgresql, libmysqlclient, sqlite, zlib, openssl }: +{ lib, stdenv, fetchurl, cxxtools, postgresql, libmysqlclient, sqlite, zlib, openssl }: stdenv.mkDerivation rec { pname = "tntdb"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.tntnet.org/tntdb.html"; description = "C++ library which makes accessing SQL databases easy and robust"; platforms = platforms.linux ; diff --git a/pkgs/development/libraries/tntnet/default.nix b/pkgs/development/libraries/tntnet/default.nix index 332750d7694..a80b923e235 100644 --- a/pkgs/development/libraries/tntnet/default.nix +++ b/pkgs/development/libraries/tntnet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cxxtools, zlib, openssl, zip }: +{ lib, stdenv, fetchurl, cxxtools, zlib, openssl, zip }: stdenv.mkDerivation rec { pname = "tntnet"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.tntnet.org/tntnet.html"; description = "Web server which allows users to develop web applications using C++"; platforms = platforms.linux ; diff --git a/pkgs/development/libraries/tokyo-cabinet/default.nix b/pkgs/development/libraries/tokyo-cabinet/default.nix index b8969588b3c..22d3266b93a 100644 --- a/pkgs/development/libraries/tokyo-cabinet/default.nix +++ b/pkgs/development/libraries/tokyo-cabinet/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, zlib, bzip2 }: +{ fetchurl, lib, stdenv, zlib, bzip2 }: stdenv.mkDerivation rec { name = "tokyocabinet-1.4.48"; @@ -35,9 +35,9 @@ stdenv.mkDerivation rec { robustness, supports 64-bit architecture. ''; - license = stdenv.lib.licenses.lgpl2Plus; + license = lib.licenses.lgpl2Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/tokyo-tyrant/default.nix b/pkgs/development/libraries/tokyo-tyrant/default.nix index 5b58bf41672..6431e6a1a7a 100644 --- a/pkgs/development/libraries/tokyo-tyrant/default.nix +++ b/pkgs/development/libraries/tokyo-tyrant/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, tokyocabinet, pkgconfig }: +{ fetchurl, lib, stdenv, tokyocabinet, pkg-config }: stdenv.mkDerivation rec { name = "tokyotyrant-1.1.41"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "13xqcinhydqmh7231qlir6pymacjwcf98drybkhd9597kzxp1bs2"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ tokyocabinet ]; doCheck = false; # FIXME @@ -33,9 +33,9 @@ stdenv.mkDerivation rec { homepage = "https://fallabs.com/tokyotyrant/"; - license = stdenv.lib.licenses.lgpl21Plus; + license = lib.licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice + platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/totem-pl-parser/default.nix b/pkgs/development/libraries/totem-pl-parser/default.nix index 266538d43c2..c93ec8dccf9 100644 --- a/pkgs/development/libraries/totem-pl-parser/default.nix +++ b/pkgs/development/libraries/totem-pl-parser/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, libxml2, gobject-introspection, gnome3 }: +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gettext, libxml2, gobject-introspection, gnome3 }: stdenv.mkDerivation rec { pname = "totem-pl-parser"; version = "3.26.5"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "132jihnf51zs98yjkc6jxyqib4f3dawpjm17g4bj4j78y93dww2k"; }; @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { }; }; - nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection ]; + nativeBuildInputs = [ meson ninja pkg-config gettext gobject-introspection ]; buildInputs = [ libxml2 ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Videos"; description = "Simple GObject-based library to parse and save a host of playlist formats"; maintainers = teams.gnome.members; diff --git a/pkgs/development/libraries/tracker-miners/default.nix b/pkgs/development/libraries/tracker-miners/default.nix index 0670fdcdbd1..2ca5dd6bd93 100644 --- a/pkgs/development/libraries/tracker-miners/default.nix +++ b/pkgs/development/libraries/tracker-miners/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , substituteAll , asciidoc @@ -11,7 +11,7 @@ , tracker , meson , ninja -, pkgconfig +, pkg-config , vala , wrapGAppsHook , bzip2 @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { version = "3.0.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1kfi5d6pccqx28hbnja6k1mpwjd53k5zs704sg01rlzmbshz1zn6"; }; @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { libxslt meson ninja - pkgconfig + pkg-config vala wrapGAppsHook ]; @@ -128,7 +128,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Projects/Tracker"; description = "Desktop-neutral user information store, search tool and indexer"; maintainers = teams.gnome.members; diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix index e37db9f2533..38885048fcc 100644 --- a/pkgs/development/libraries/tracker/default.nix +++ b/pkgs/development/libraries/tracker/default.nix @@ -1,10 +1,10 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , gettext , meson , ninja -, pkgconfig +, pkg-config , asciidoc , gobject-introspection , python3 @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1rhcs75axga7p7hl37h6jzb2az89jddlcwc7ykrnb2khyhka78rr"; }; @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meson ninja vala - pkgconfig + pkg-config asciidoc gettext libxslt @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { docbook_xml_dtd_45 python3 # for data-generators systemd # used for checks to install systemd user service - dbus # used for checks and pkgconfig to install dbus service/s + dbus # used for checks and pkg-config to install dbus service/s ]; buildInputs = [ @@ -133,7 +133,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Projects/Tracker"; description = "Desktop-neutral user information store, search tool and indexer"; maintainers = teams.gnome.members; diff --git a/pkgs/development/libraries/tre/default.nix b/pkgs/development/libraries/tre/default.nix index 80806848846..e515dd1673f 100644 --- a/pkgs/development/libraries/tre/default.nix +++ b/pkgs/development/libraries/tre/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, fetchpatch}: +{lib, stdenv, fetchurl, fetchpatch}: stdenv.mkDerivation rec { name = "tre-0.8.0"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Lightweight and robust POSIX compliant regexp matching library"; homepage = "https://laurikari.net/tre/"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.bsd2; + platforms = lib.platforms.unix; + license = lib.licenses.bsd2; }; } diff --git a/pkgs/development/libraries/tremor/default.nix b/pkgs/development/libraries/tremor/default.nix index 722094f859c..16e1a78d396 100644 --- a/pkgs/development/libraries/tremor/default.nix +++ b/pkgs/development/libraries/tremor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, autoreconfHook, pkgconfig, libogg }: +{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, libogg }: stdenv.mkDerivation { name = "tremor-unstable-2018-03-16"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; propagatedBuildInputs = [ libogg ]; preConfigure = '' @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { homepage = "https://xiph.org/tremor/"; description = "Fixed-point version of the Ogg Vorbis decoder"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.bsd3; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/trompeloeil/default.nix b/pkgs/development/libraries/trompeloeil/default.nix index 929627f3e1b..800b3564011 100644 --- a/pkgs/development/libraries/trompeloeil/default.nix +++ b/pkgs/development/libraries/trompeloeil/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "trompeloeil"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Header only C++14 mocking framework"; homepage = "https://github.com/rollbear/trompeloeil"; license = licenses.boost; diff --git a/pkgs/development/libraries/tsocks/default.nix b/pkgs/development/libraries/tsocks/default.nix index f2018286a3e..728c6e71f7f 100644 --- a/pkgs/development/libraries/tsocks/default.nix +++ b/pkgs/development/libraries/tsocks/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "tsocks"; @@ -25,10 +25,10 @@ stdenv.mkDerivation rec { -e "/SAVE/d" Makefile ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Transparent SOCKS v4 proxying library"; homepage = "http://tsocks.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; maintainers = with maintainers; [ edwtjo phreedom ]; platforms = platforms.unix; broken = stdenv.hostPlatform.isDarwin; diff --git a/pkgs/development/libraries/tweeny/default.nix b/pkgs/development/libraries/tweeny/default.nix index f2de470288d..8340e47fbf9 100644 --- a/pkgs/development/libraries/tweeny/default.nix +++ b/pkgs/development/libraries/tweeny/default.nix @@ -1,4 +1,5 @@ { stdenv +, lib , fetchFromGitHub , cmake }: @@ -20,7 +21,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A modern C++ tweening library"; license = licenses.mit; homepage = "http://mobius3.github.io/tweeny"; diff --git a/pkgs/development/libraries/twolame/default.nix b/pkgs/development/libraries/twolame/default.nix index cb8ee14535d..3537dd3029b 100644 --- a/pkgs/development/libraries/twolame/default.nix +++ b/pkgs/development/libraries/twolame/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub -, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub +, autoreconfHook, pkg-config , libsndfile }: stdenv.mkDerivation { @@ -14,12 +14,12 @@ stdenv.mkDerivation { sha256 = "1rq3yc8ygzdqid9zk6pixmm4w9sk2vrlx217lhn5bjaglv7iyf7x"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libsndfile ]; doCheck = false; # fails with "../build-scripts/test-driver: line 107: -Mstrict: command not found" - meta = with stdenv.lib;{ + meta = with lib;{ description = "A MP2 encoder"; longDescription = '' TwoLAME is an optimised MPEG Audio Layer 2 (MP2) encoder based on diff --git a/pkgs/development/libraries/ubus/default.nix b/pkgs/development/libraries/ubus/default.nix index 1f7124411ac..db947d373a2 100644 --- a/pkgs/development/libraries/ubus/default.nix +++ b/pkgs/development/libraries/ubus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, fetchgit, libubox, libjson }: +{ lib, stdenv, cmake, fetchgit, libubox, libjson }: stdenv.mkDerivation { pname = "ubus"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [ libubox libjson ]; nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "OpenWrt system message/RPC bus"; homepage = "https://git.openwrt.org/?p=project/ubus.git;a=summary"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/uci/default.nix b/pkgs/development/libraries/uci/default.nix index aa2a88653bb..0a5af8b907b 100644 --- a/pkgs/development/libraries/uci/default.nix +++ b/pkgs/development/libraries/uci/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, fetchgit, pkgconfig, libubox }: +{ lib, stdenv, cmake, fetchgit, pkg-config, libubox }: stdenv.mkDerivation { pname = "uci"; @@ -13,9 +13,9 @@ stdenv.mkDerivation { hardeningDisable = [ "all" ]; cmakeFlags = [ "-D BUILD_LUA:BOOL=OFF" ]; buildInputs = [ libubox ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { description = "OpenWrt Unified Configuration Interface"; homepage = "https://git.openwrt.org/?p=project/uci.git;a=summary"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/ucl/default.nix b/pkgs/development/libraries/ucl/default.nix index f25a6313752..43f7ddf63af 100644 --- a/pkgs/development/libraries/ucl/default.nix +++ b/pkgs/development/libraries/ucl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "ucl-1.03"; @@ -8,12 +8,12 @@ stdenv.mkDerivation { }; # needed to successfully compile with gcc 6 - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-std=c90"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-std=c90"; meta = { homepage = "http://www.oberhumer.com/opensource/ucl/"; description = "Portable lossless data compression library"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/ucommon/default.nix b/pkgs/development/libraries/ucommon/default.nix index 1c20ce6d9c8..7cfd9f1edf5 100644 --- a/pkgs/development/libraries/ucommon/default.nix +++ b/pkgs/development/libraries/ucommon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , openssl ? null, zlib ? null, gnutls ? null }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "6ac9f76c2af010f97e916e4bae1cece341dc64ca28e3881ff4ddc3bc334060d7"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; # disable flaky networking test postPatch = '' @@ -33,9 +33,9 @@ stdenv.mkDerivation rec { meta = { description = "C++ library to facilitate using C++ design patterns"; homepage = "https://www.gnu.org/software/commoncpp/"; - license = stdenv.lib.licenses.lgpl3Plus; + license = lib.licenses.lgpl3Plus; - maintainers = with stdenv.lib.maintainers; [ ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with lib.maintainers; [ ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/ucx/default.nix b/pkgs/development/libraries/ucx/default.nix index a4120b7ba43..fae81276878 100644 --- a/pkgs/development/libraries/ucx/default.nix +++ b/pkgs/development/libraries/ucx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, doxygen +{ lib, stdenv, fetchFromGitHub, autoreconfHook, doxygen , numactl, rdma-core, libbfd, libiberty, perl, zlib }: @@ -29,7 +29,7 @@ in stdenv.mkDerivation { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Unified Communication X library"; homepage = "http://www.openucx.org"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/udns/default.nix b/pkgs/development/libraries/udns/default.nix index 41fb6e7abff..fc0b4a42b55 100644 --- a/pkgs/development/libraries/udns/default.nix +++ b/pkgs/development/libraries/udns/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: # this expression is mostly based on debian's packaging # https://tracker.debian.org/media/packages/u/udns/rules-0.4-1 @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { # keep man3 outputDevdoc = "out"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.corpit.ru/mjt/udns.html"; description = "Async-capable DNS stub resolver library"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/udunits/default.nix b/pkgs/development/libraries/udunits/default.nix index 65e88f8fd8c..deed5b64d2c 100644 --- a/pkgs/development/libraries/udunits/default.nix +++ b/pkgs/development/libraries/udunits/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, +{ lib, stdenv, fetchFromGitHub, autoreconfHook, texinfo, bison, flex, expat, file }: stdenv.mkDerivation rec { pname = "udunits"; version = "2.2.27.6"; - + src = fetchFromGitHub { owner = "Unidata"; repo = "UDUNITS-2"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook texinfo bison flex file ]; buildInputs = [ expat ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.unidata.ucar.edu/software/udunits/"; description = "A C-based package for the programatic handling of units of physical quantities"; license = licenses.bsdOriginal; diff --git a/pkgs/development/libraries/uhttpmock/default.nix b/pkgs/development/libraries/uhttpmock/default.nix index 085741a66f8..5420eb204e3 100644 --- a/pkgs/development/libraries/uhttpmock/default.nix +++ b/pkgs/development/libraries/uhttpmock/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitLab, autoconf, gtk-doc, automake, libtool, pkgconfig, glib, libsoup, gobject-introspection }: +{ stdenv, lib, fetchFromGitLab, autoconf, gtk-doc, automake, libtool, pkg-config, glib, libsoup, gobject-introspection }: stdenv.mkDerivation rec { version="0.5.0"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0kkf670abkq5ikm3mqls475lydfsd9by1kv5im4k757xrl1br1d4"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoconf gtk-doc automake libtool glib libsoup gobject-introspection ]; preConfigure = "./autogen.sh"; diff --git a/pkgs/development/libraries/uid_wrapper/default.nix b/pkgs/development/libraries/uid_wrapper/default.nix index e78e72bf9b8..ec7626a7e8b 100644 --- a/pkgs/development/libraries/uid_wrapper/default.nix +++ b/pkgs/development/libraries/uid_wrapper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig }: +{ lib, stdenv, fetchurl, cmake, pkg-config }: stdenv.mkDerivation rec { name = "uid_wrapper-1.2.8"; @@ -8,9 +8,9 @@ stdenv.mkDerivation rec { sha256 = "0swm9d8l69dw7nbrw6xh7rdy7cfrqflw3hxshicsrhd9v03iwvqf"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A wrapper for the user, group and hosts NSS API"; homepage = "https://git.samba.org/?p=uid_wrapper.git;a=summary;"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix index 5050650635f..d27adb2a061 100644 --- a/pkgs/development/libraries/umockdev/default.nix +++ b/pkgs/development/libraries/umockdev/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , docbook_xsl , fetchurl , glib @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { mv docs/reference $doc/share/doc/umockdev/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Mock hardware devices for creating unit tests"; license = licenses.lgpl2; maintainers = with maintainers; [ flokli ]; diff --git a/pkgs/development/libraries/unibilium/default.nix b/pkgs/development/libraries/unibilium/default.nix index dca24c7f9ea..f5fd4f82bae 100644 --- a/pkgs/development/libraries/unibilium/default.nix +++ b/pkgs/development/libraries/unibilium/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, libtool, pkgconfig, perl, ncurses }: +{ stdenv, lib, fetchFromGitHub, libtool, pkg-config, perl, ncurses }: stdenv.mkDerivation rec { pname = "unibilium-unstable"; @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { }; makeFlags = [ "PREFIX=$(out)" ] - ++ stdenv.lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool"; + ++ lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool"; - nativeBuildInputs = [ pkgconfig perl ]; + nativeBuildInputs = [ pkg-config perl ]; buildInputs = [ libtool ncurses ]; meta = with lib; { diff --git a/pkgs/development/libraries/unicap/default.nix b/pkgs/development/libraries/unicap/default.nix index 87ca28fee98..17e91f7e236 100644 --- a/pkgs/development/libraries/unicap/default.nix +++ b/pkgs/development/libraries/unicap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libusb-compat-0_1, libraw1394, dcraw, intltool, perl, v4l-utils }: +{ lib, stdenv, fetchurl, libusb-compat-0_1, libraw1394, dcraw, intltool, perl, v4l-utils }: stdenv.mkDerivation rec { pname = "libunicap"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { sed -e 's@/etc/udev@'"$out"'/&@' -i data/Makefile.* ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Universal video capture API"; homepage = "http://www.unicap-imaging.org/"; maintainers = [ maintainers.raskin ]; diff --git a/pkgs/development/libraries/unicorn/default.nix b/pkgs/development/libraries/unicorn/default.nix index cea35519ad8..7f768d9631b 100644 --- a/pkgs/development/libraries/unicorn/default.nix +++ b/pkgs/development/libraries/unicorn/default.nix @@ -1,6 +1,6 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub -, pkgconfig +, pkg-config , cmake }: @@ -15,9 +15,9 @@ stdenv.mkDerivation rec { sha256 = "0jgnyaq6ykpbg5hrwc0p3pargmr9hpzqfsj6ymp4k07pxnqal76j"; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Lightweight multi-platform CPU emulator library"; homepage = "http://www.unicorn-engine.org"; license = licenses.gpl2Only; diff --git a/pkgs/development/libraries/unittest-cpp/default.nix b/pkgs/development/libraries/unittest-cpp/default.nix index 17b64d99971..d185d32c816 100644 --- a/pkgs/development/libraries/unittest-cpp/default.nix +++ b/pkgs/development/libraries/unittest-cpp/default.nix @@ -1,6 +1,6 @@ -{stdenv, fetchFromGitHub, cmake}: +{lib, stdenv, fetchFromGitHub, cmake}: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "unittest-cpp"; @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { description = "Lightweight unit testing framework for C++"; license = licenses.mit; maintainers = []; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/unixODBC/default.nix b/pkgs/development/libraries/unixODBC/default.nix index a4fcac2a358..8b2558c0850 100644 --- a/pkgs/development/libraries/unixODBC/default.nix +++ b/pkgs/development/libraries/unixODBC/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "unixODBC"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-gui" "--sysconfdir=/etc" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "ODBC driver manager for Unix"; homepage = "http://www.unixodbc.org/"; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index 04aa7e6c685..faf74bcab47 100644 --- a/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -19,7 +19,7 @@ driver = "lib/psqlodbcw.so"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Official PostgreSQL ODBC Driver"; homepage = "https://odbc.postgresql.org/"; license = licenses.lgpl2; @@ -60,7 +60,7 @@ driver = if stdenv.isDarwin then "lib/libmaodbc.dylib" else "lib/libmaodbc.so"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "MariaDB ODBC database driver"; homepage = "https://downloads.mariadb.org/connector-odbc/"; license = licenses.gpl2; @@ -88,7 +88,7 @@ driver = "lib/libmyodbc3-3.51.12.so"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "MariaDB ODBC database driver"; homepage = "https://dev.mysql.com/downloads/connector/odbc/"; license = licenses.gpl2; @@ -123,7 +123,7 @@ driver = "lib/libsqlite3odbc.so"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "ODBC driver for SQLite"; homepage = "http://www.ch-werner.de/sqliteodbc"; license = licenses.bsd2; @@ -137,12 +137,12 @@ version = "${versionMajor}.${versionMinor}.${versionAdditional}-1"; versionMajor = "17"; - versionMinor = "5"; + versionMinor = "7"; versionAdditional = "1.1"; src = fetchurl { - url = "https://packages.microsoft.com/debian/9/prod/pool/main/m/msodbcsql17/msodbcsql${versionMajor}_${version}_amd64.deb"; - sha256 = "0ysrl01z5ca72qw8n8kwwcl432cgiyw4pibfwg5nifx0kd7i7z4z"; + url = "https://packages.microsoft.com/debian/10/prod/pool/main/m/msodbcsql17/msodbcsql${versionMajor}_${version}_amd64.deb"; + sha256 = "0vwirnp56jibm3qf0kmi4jnz1w7xfhnsfr8imr0c9hg6av4sk3a6"; }; nativeBuildInputs = [ dpkg patchelf ]; @@ -166,7 +166,7 @@ driver = "lib/libmsodbcsql-${versionMajor}.${versionMinor}.so.${versionAdditional}"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "ODBC Driver 17 for SQL Server"; homepage = "https://docs.microsoft.com/en-us/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server?view=sql-server-2017"; license = licenses.unfree; diff --git a/pkgs/development/libraries/unqlite/default.nix b/pkgs/development/libraries/unqlite/default.nix index 9d0ab386856..c0e405c8849 100644 --- a/pkgs/development/libraries/unqlite/default.nix +++ b/pkgs/development/libraries/unqlite/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://unqlite.org/"; description = "Self-contained, serverless, zero-conf, transactional NoSQL DB library"; longDescription = '' diff --git a/pkgs/development/libraries/uri/default.nix b/pkgs/development/libraries/uri/default.nix index c96629072f9..48a80aacdf5 100644 --- a/pkgs/development/libraries/uri/default.nix +++ b/pkgs/development/libraries/uri/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, doxygen }: +{ lib, stdenv, fetchFromGitHub, cmake, doxygen }: stdenv.mkDerivation rec { name = "uri-${version}"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "C++ URI library"; homepage = "https://cpp-netlib.org"; - license = stdenv.lib.licenses.boost; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.boost; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/libraries/uriparser/default.nix b/pkgs/development/libraries/uriparser/default.nix index a12f040bf49..ad171998480 100644 --- a/pkgs/development/libraries/uriparser/default.nix +++ b/pkgs/development/libraries/uriparser/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { checkInputs = [ gtest ]; doCheck = stdenv.targetPlatform.system == stdenv.hostPlatform.system; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://uriparser.github.io/"; description = "Strictly RFC 3986 compliant URI parsing library"; longDescription = '' diff --git a/pkgs/development/libraries/usbredir/default.nix b/pkgs/development/libraries/usbredir/default.nix index 2ac7c823e22..0313b8c81ef 100644 --- a/pkgs/development/libraries/usbredir/default.nix +++ b/pkgs/development/libraries/usbredir/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libusb1 }: +{ lib, stdenv, fetchurl, pkg-config, libusb1 }: stdenv.mkDerivation rec { pname = "usbredir"; @@ -11,12 +11,12 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ libusb1 ]; outputs = [ "out" "dev" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "USB traffic redirection protocol"; homepage = "https://www.spice-space.org/usbredir.html"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/ustr/default.nix b/pkgs/development/libraries/ustr/default.nix index b6bb02d56e4..2b04d8c0c5b 100644 --- a/pkgs/development/libraries/ustr/default.nix +++ b/pkgs/development/libraries/ustr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "ustr"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { find $out/lib -name \*debug\* -delete ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.and.org/ustr/"; description = "Micro String API for C language"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/utf8cpp/default.nix b/pkgs/development/libraries/utf8cpp/default.nix index ef02ca2c313..e627b97849a 100644 --- a/pkgs/development/libraries/utf8cpp/default.nix +++ b/pkgs/development/libraries/utf8cpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "utf8cpp"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/nemtrif/utfcpp"; description = "UTF-8 with C++ in a Portable Way"; license = licenses.free; diff --git a/pkgs/development/libraries/utf8proc/default.nix b/pkgs/development/libraries/utf8proc/default.nix index ea455e2c92c..b78999e96a7 100644 --- a/pkgs/development/libraries/utf8proc/default.nix +++ b/pkgs/development/libraries/utf8proc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "utf8proc"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A clean C library for processing UTF-8 Unicode data"; homepage = "https://juliastrings.github.io/utf8proc/"; license = licenses.mit; diff --git a/pkgs/development/libraries/uthash/default.nix b/pkgs/development/libraries/uthash/default.nix index d2c5b6ab11d..7ddae062f76 100644 --- a/pkgs/development/libraries/uthash/default.nix +++ b/pkgs/development/libraries/uthash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl }: +{ lib, stdenv, fetchurl, perl }: let version = "2.1.0"; @@ -23,7 +23,7 @@ stdenv.mkDerivation { cp ./src/* "$out/include/" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A hash table for C structures"; homepage = "http://troydhanson.github.io/uthash"; license = licenses.bsd2; # it's one-clause, actually, as it's source-only diff --git a/pkgs/development/libraries/uthenticode/default.nix b/pkgs/development/libraries/uthenticode/default.nix new file mode 100644 index 00000000000..9957eccd426 --- /dev/null +++ b/pkgs/development/libraries/uthenticode/default.nix @@ -0,0 +1,37 @@ +{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, gtest, openssl, pe-parse }: + +stdenv.mkDerivation rec { + pname = "uthenticode"; + version = "1.0.4"; + + src = fetchFromGitHub { + owner = "trailofbits"; + repo = "uthenticode"; + rev = "v${version}"; + sha256 = "16j91cki63zk4d7wzwvq8al98l8hmvcdil3vfp44ink4q4bfswkx"; + }; + + patches = [ + # adds USE_SYSTEM_GTEST cmake flag, the patch won't be necessary in next versions + (fetchpatch { + url = "https://github.com/trailofbits/uthenticode/commit/7a4c5499c8e5ea7bfae1c620e1f96c112866b1dd.patch"; + sha256 = "17637j5zwp71jmi803mv1z04arld3k3kmrm8nvrkpg08q5kizh28"; + }) + ]; + + cmakeFlags = [ "-DBUILD_TESTS=1" "-DUSE_SYSTEM_GTEST=1" ]; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ pe-parse openssl gtest ]; + + doCheck = true; + checkPhase = "test/uthenticode_test"; + + meta = with lib; { + description = "A small cross-platform library for verifying Authenticode digital signatures."; + homepage = "https://github.com/trailofbits/uthenticode"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ arturcygan ]; + }; +} diff --git a/pkgs/development/libraries/utmps/default.nix b/pkgs/development/libraries/utmps/default.nix index 16b4cd563b2..107c23dcb59 100644 --- a/pkgs/development/libraries/utmps/default.nix +++ b/pkgs/development/libraries/utmps/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "utmps"; - version = "0.0.3.2"; - sha256 = "0zri5pqnva48bm8za4ic5mx0ymv70y4ga16bjh4i5pscs40sj5dh"; + version = "0.1.0.0"; + sha256 = "09p0k2sgxr7jlsbrn66fzvzf9zxvpjp85y79xk10hxjglypszyml"; description = "A secure utmpx and wtmp implementation"; diff --git a/pkgs/development/libraries/v8/5_x.nix b/pkgs/development/libraries/v8/5_x.nix index 050abe9e81b..441a5559b52 100644 --- a/pkgs/development/libraries/v8/5_x.nix +++ b/pkgs/development/libraries/v8/5_x.nix @@ -151,11 +151,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ which ]; buildInputs = [ readline python icu ] - ++ stdenv.lib.optional stdenv.isDarwin xcbuild - ++ stdenv.lib.optional stdenv.isLinux patchelf; + ++ lib.optional stdenv.isDarwin xcbuild + ++ lib.optional stdenv.isLinux patchelf; NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow -Wno-error=unused-function -Wno-error=attributes" - + stdenv.lib.optionalString stdenv.cc.isClang " -Wno-error=unused-lambda-capture"; + + lib.optionalString stdenv.cc.isClang " -Wno-error=unused-lambda-capture"; buildFlags = [ "LINK=c++" diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index e6696626cb5..c79073f04e4 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchgit, fetchFromGitHub -, gn, ninja, python, glib, pkgconfig, icu +, gn, ninja, python, glib, pkg-config, icu , xcbuild, darwin , fetchpatch }: @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { chmod u+w -R . ''; - postPatch = stdenv.lib.optionalString stdenv.isAarch64 '' + postPatch = lib.optionalString stdenv.isAarch64 '' substituteInPlace build/toolchain/linux/BUILD.gn \ --replace 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""' ''; @@ -95,14 +95,14 @@ stdenv.mkDerivation rec { # ''custom_toolchain="//build/toolchain/linux/unbundle:default"'' ''host_toolchain="//build/toolchain/linux/unbundle:default"'' ''v8_snapshot_toolchain="//build/toolchain/linux/unbundle:default"'' - ] ++ stdenv.lib.optional stdenv.cc.isClang ''clang_base_path="${stdenv.cc}"''; + ] ++ lib.optional stdenv.cc.isClang ''clang_base_path="${stdenv.cc}"''; # with gcc8, -Wclass-memaccess became part of -Wall and causes logging limit # to be exceeded - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-class-memaccess"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-class-memaccess"; - nativeBuildInputs = [ gn ninja pkgconfig python ] - ++ stdenv.lib.optionals stdenv.isDarwin [ xcbuild darwin.DarwinTools ]; + nativeBuildInputs = [ gn ninja pkg-config python ] + ++ lib.optionals stdenv.isDarwin [ xcbuild darwin.DarwinTools ]; buildInputs = [ glib icu ]; ninjaFlags = [ ":d8" "v8_monolith" ]; diff --git a/pkgs/development/libraries/v8/plv8_6_x.nix b/pkgs/development/libraries/v8/plv8_6_x.nix index 782d324c8be..71e14a82c3e 100644 --- a/pkgs/development/libraries/v8/plv8_6_x.nix +++ b/pkgs/development/libraries/v8/plv8_6_x.nix @@ -4,7 +4,7 @@ # 2019-08-29, nixpkgs does not have v8 6.x, and v8_5 is bumped to 5.4.232, which # is a bit outdated. plv8 3.x is planned to support v8 7.x -{ stdenv, lib, fetchgit, fetchFromGitHub, gn, ninja, python, glib, pkgconfig +{ stdenv, lib, fetchgit, fetchFromGitHub, gn, ninja, python, glib, pkg-config , doCheck ? false , snapshot ? true }: @@ -158,7 +158,7 @@ stdenv.mkDerivation rec { use_custom_libcxx_for_host=false ''; - nativeBuildInputs = [ gn ninja pkgconfig ]; + nativeBuildInputs = [ gn ninja pkg-config ]; buildInputs = [ python glib ]; buildPhase = '' diff --git a/pkgs/development/libraries/vaapi-intel-hybrid/default.nix b/pkgs/development/libraries/vaapi-intel-hybrid/default.nix index 6462bfd5e62..00e9a2042b7 100644 --- a/pkgs/development/libraries/vaapi-intel-hybrid/default.nix +++ b/pkgs/development/libraries/vaapi-intel-hybrid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, cmrt, libdrm, libva, libX11, libGL, wayland }: +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, cmrt, libdrm, libva, libX11, libGL, wayland }: stdenv.mkDerivation rec { pname = "intel-hybrid-driver"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ cmrt libdrm libva libX11 libGL wayland ]; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { sed -i -e "s,LIBVA_DRIVERS_PATH=.*,LIBVA_DRIVERS_PATH=$out/lib/dri," configure ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://01.org/linuxmedia"; description = "Intel driver for the VAAPI library with partial HW acceleration"; license = licenses.mit; diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix index 81edb9caea0..f21a947a533 100644 --- a/pkgs/development/libraries/vaapi-intel/default.nix +++ b/pkgs/development/libraries/vaapi-intel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, gnum4, pkg-config, python3 +{ lib, stdenv, fetchFromGitHub, autoreconfHook, gnum4, pkg-config, python3 , intel-gpu-tools, libdrm, libva, libX11, libGL, wayland, libXext , enableHybridCodec ? false, vaapi-intel-hybrid }: @@ -17,23 +17,23 @@ stdenv.mkDerivation rec { # Set the correct install path: LIBVA_DRIVERS_PATH = "${placeholder "out"}/lib/dri"; - postInstall = stdenv.lib.optionalString enableHybridCodec '' + postInstall = lib.optionalString enableHybridCodec '' ln -s ${vaapi-intel-hybrid}/lib/dri/* $out/lib/dri/ ''; configureFlags = [ "--enable-x11" "--enable-wayland" - ] ++ stdenv.lib.optional enableHybridCodec "--enable-hybrid-codec"; + ] ++ lib.optional enableHybridCodec "--enable-hybrid-codec"; nativeBuildInputs = [ autoreconfHook gnum4 pkg-config python3 ]; buildInputs = [ intel-gpu-tools libdrm libva libX11 libXext libGL wayland ] - ++ stdenv.lib.optional enableHybridCodec vaapi-intel-hybrid; + ++ lib.optional enableHybridCodec vaapi-intel-hybrid; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://01.org/linuxmedia"; license = licenses.mit; description = "VA-API user mode driver for Intel GEN Graphics family"; diff --git a/pkgs/development/libraries/vaapi-vdpau/default.nix b/pkgs/development/libraries/vaapi-vdpau/default.nix index 94f96b867d5..fd38eba7397 100644 --- a/pkgs/development/libraries/vaapi-vdpau/default.nix +++ b/pkgs/development/libraries/vaapi-vdpau/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, libvdpau, libGLU, libGL, libva, pkgconfig }: +{ lib, stdenv, fetchurl, fetchpatch, libvdpau, libGLU, libGL, libva, pkg-config }: stdenv.mkDerivation rec { pname = "libva-vdpau-driver"; @@ -24,14 +24,14 @@ stdenv.mkDerivation rec { sha256 = "1m4is6lk580mppsx2mvdv1xifj6gvx724si4qynsm9qrdfdc9fby"; }) ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libvdpau libGLU libGL libva ]; postPatch = '' sed -i -e "s,LIBVA_DRIVERS_PATH=.*,LIBVA_DRIVERS_PATH=$out/lib/dri," configure ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://cgit.freedesktop.org/vaapi/vdpau-driver"; license = licenses.gpl2Plus; description = "VDPAU driver for the VAAPI library"; diff --git a/pkgs/development/libraries/vapoursynth-mvtools/default.nix b/pkgs/development/libraries/vapoursynth-mvtools/default.nix index 1030aefc1a5..76ce9a36c71 100644 --- a/pkgs/development/libraries/vapoursynth-mvtools/default.nix +++ b/pkgs/development/libraries/vapoursynth-mvtools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, vapoursynth, nasm, fftwFloat }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0lngkvxnzn82rz558nvl96rvclrck07ja1pny7wcfixp9b68ppkn"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoreconfHook nasm vapoursynth fftwFloat @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--libdir=$(out)/lib/vapoursynth" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A set of filters for motion estimation and compensation"; homepage = "https://github.com/dubhater/vapoursynth-mvtools"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix index 87f35fbf60c..93f8d3c5ae5 100644 --- a/pkgs/development/libraries/vapoursynth/default.nix +++ b/pkgs/development/libraries/vapoursynth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, makeWrapper +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, makeWrapper , zimg, libass, python3, libiconv , ApplicationServices , ocrSupport ? false, tesseract ? null @@ -8,20 +8,20 @@ assert ocrSupport -> tesseract != null; assert imwriSupport -> imagemagick7 != null; -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "vapoursynth"; - version = "R49"; + version = "R52"; src = fetchFromGitHub { owner = "vapoursynth"; repo = "vapoursynth"; rev = version; - sha256 = "1d298mlb24nlc2x7pixfbkd0qbpv4c706c32idsgpi96z1spkhvl"; + sha256 = "1krfdzc2x2vxv4nq9kiv1c09hgj525qn120ah91fw2ikq8ldvmx4"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook makeWrapper ]; + nativeBuildInputs = [ pkg-config autoreconfHook makeWrapper ]; buildInputs = [ zimg libass (python3.withPackages (ps: with ps; [ sphinx cython ])) @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { --prefix PYTHONPATH : $out/${python3.sitePackages} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A video processing framework with the future in mind"; homepage = "http://www.vapoursynth.com/"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/vapoursynth/editor.nix b/pkgs/development/libraries/vapoursynth/editor.nix index 196c700af17..f9ebed19752 100644 --- a/pkgs/development/libraries/vapoursynth/editor.nix +++ b/pkgs/development/libraries/vapoursynth/editor.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromBitbucket +{ lib, mkDerivation, fetchFromBitbucket , python3, vapoursynth , qmake, qtbase, qtwebsockets }: @@ -10,7 +10,7 @@ mkDerivation rec { src = fetchFromBitbucket { owner = "mystery_keeper"; repo = pname; - rev = stdenv.lib.toLower version; + rev = lib.toLower version; sha256 = "1zlaynkkvizf128ln50yvzz3b764f5a0yryp6993s9fkwa7djb6n"; }; @@ -33,7 +33,7 @@ mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Cross-platform editor for VapourSynth scripts"; homepage = "https://bitbucket.org/mystery_keeper/vapoursynth-editor"; license = licenses.mit; diff --git a/pkgs/development/libraries/vc/0.7.nix b/pkgs/development/libraries/vc/0.7.nix index 119254107e9..dd5b03f2dc5 100644 --- a/pkgs/development/libraries/vc/0.7.nix +++ b/pkgs/development/libraries/vc/0.7.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "Vc"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sed -i '/AutodetectHostArchitecture()/d' print_target_architecture.cmake ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for multiprecision complex arithmetic with exact rounding"; homepage = "https://github.com/VcDevel/Vc"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/vc/default.nix b/pkgs/development/libraries/vc/default.nix index d3673e783cd..40347940ff0 100644 --- a/pkgs/development/libraries/vc/default.nix +++ b/pkgs/development/libraries/vc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "Vc"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sed -i '/AutodetectHostArchitecture()/d' print_target_architecture.cmake ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for multiprecision complex arithmetic with exact rounding"; homepage = "https://github.com/VcDevel/Vc"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/vcdimager/default.nix b/pkgs/development/libraries/vcdimager/default.nix index c7f375c2078..0235912ce53 100644 --- a/pkgs/development/libraries/vcdimager/default.nix +++ b/pkgs/development/libraries/vcdimager/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, libcdio, libxml2, popt +{ stdenv, lib, fetchurl, pkg-config, libcdio, libxml2, popt , libiconv, darwin }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0ypnb1vp49nmzp5571ynlz6n1gh90f23w3z4x95hb7c2p7pmylb7"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxml2 popt libiconv ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ IOKit DiskArbitration ]); diff --git a/pkgs/development/libraries/vcg/default.nix b/pkgs/development/libraries/vcg/default.nix index a8a24750744..380f533fe6f 100644 --- a/pkgs/development/libraries/vcg/default.nix +++ b/pkgs/development/libraries/vcg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, eigen }: +{ lib, stdenv, fetchFromGitHub, eigen }: stdenv.mkDerivation rec { pname = "vcg"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { find $out -name \*.h -exec sed -i 's,<eigenlib/,<eigen3/,g' {} \; ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://vcg.isti.cnr.it/vcglib/install.html"; description = "C++ library for manipulation, processing and displaying with OpenGL of triangle and tetrahedral meshes"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/vid-stab/default.nix b/pkgs/development/libraries/vid-stab/default.nix index 2921719e755..d224c2f3be5 100644 --- a/pkgs/development/libraries/vid-stab/default.nix +++ b/pkgs/development/libraries/vid-stab/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, openmp }: +{ lib, stdenv, fetchFromGitHub, cmake, openmp }: stdenv.mkDerivation rec { pname = "vid.stab"; @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = stdenv.lib.optionals stdenv.cc.isClang [ openmp ]; + buildInputs = lib.optionals stdenv.cc.isClang [ openmp ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Video stabilization library"; homepage = "http://public.hronopik.de/vid.stab/"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix index 7bff0981e76..56402172d9f 100644 --- a/pkgs/development/libraries/vigra/default.nix +++ b/pkgs/development/libraries/vigra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, cmake, fftw, fftwSinglePrec, hdf5, ilmbase +{ lib, stdenv, fetchurl, boost, cmake, fftw, fftwSinglePrec, hdf5, ilmbase , libjpeg, libpng, libtiff, openexr, python2Packages }: let @@ -9,7 +9,7 @@ in stdenv.mkDerivation rec { version = "1.11.1"; src = fetchurl { - url = "https://github.com/ukoethe/vigra/archive/Version-${stdenv.lib.replaceChars ["."] ["-"] version}.tar.gz"; + url = "https://github.com/ukoethe/vigra/archive/Version-${lib.replaceChars ["."] ["-"] version}.tar.gz"; sha256 = "03i5wfscv83jb8vnwwhfmm8yfiniwkvk13myzhr1kbwbs9884wdj"; }; @@ -28,13 +28,13 @@ in stdenv.mkDerivation rec { preConfigure = "cmakeFlags+=\" -DVIGRANUMPY_INSTALL_DIR=$out/lib/${python.libPrefix}/site-packages\""; cmakeFlags = [ "-DWITH_OPENEXR=1" ] - ++ stdenv.lib.optionals (stdenv.hostPlatform.system == "x86_64-linux") + ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-linux") [ "-DCMAKE_CXX_FLAGS=-fPIC" "-DCMAKE_C_FLAGS=-fPIC" ]; # fails with "./test_watersheds3d: error while loading shared libraries: libvigraimpex.so.11: cannot open shared object file: No such file or directory" doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Novel computer vision C++ library with customizable algorithms and data structures"; homepage = "https://hci.iwr.uni-heidelberg.de/vigra"; license = licenses.mit; diff --git a/pkgs/development/libraries/virglrenderer/default.nix b/pkgs/development/libraries/virglrenderer/default.nix index 8951ed4b002..38688d90246 100644 --- a/pkgs/development/libraries/virglrenderer/default.nix +++ b/pkgs/development/libraries/virglrenderer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, meson, ninja, pkgconfig, python3 +{ lib, stdenv, fetchurl, cmake, meson, ninja, pkg-config, python3 , libGLU, epoxy, libX11, libdrm, mesa }: @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { buildInputs = [ libGLU epoxy libX11 libdrm mesa ]; - nativeBuildInputs = [ cmake meson ninja pkgconfig python3 ]; + nativeBuildInputs = [ cmake meson ninja pkg-config python3 ]; dontUseCmakeConfigure = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A virtual 3D GPU library that allows a qemu guest to use the host GPU for accelerated 3D rendering"; homepage = "https://virgil3d.github.io/"; license = licenses.mit; diff --git a/pkgs/development/libraries/vmime/default.nix b/pkgs/development/libraries/vmime/default.nix index e0c58096cfa..3f33df66339 100644 --- a/pkgs/development/libraries/vmime/default.nix +++ b/pkgs/development/libraries/vmime/default.nix @@ -1,5 +1,5 @@ -{stdenv, fetchFromGitHub -, gsasl, gnutls, pkgconfig, cmake, zlib, libtasn1, libgcrypt, gtk3 +{lib, stdenv, fetchFromGitHub +, gsasl, gnutls, pkg-config, cmake, zlib, libtasn1, libgcrypt, gtk3 # this will not work on non-nixos systems , sendmailPath ? "/run/wrappers/bin/sendmail" }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ gsasl gnutls zlib libtasn1 libgcrypt gtk3 ]; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; cmakeFlags = [ "-DVMIME_SENDMAIL_PATH=${sendmailPath}" @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.vmime.org/"; description = "Free mail library for C++"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/development/libraries/vmmlib/default.nix b/pkgs/development/libraries/vmmlib/default.nix index 6d1dc7d4786..4aa525feb19 100644 --- a/pkgs/development/libraries/vmmlib/default.nix +++ b/pkgs/development/libraries/vmmlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, lapack +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, boost, lapack , Accelerate, CoreGraphics, CoreVideo }: @@ -17,15 +17,15 @@ stdenv.mkDerivation rec { ./disable-cpack.patch #disable the need of cpack/rpm ]; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ boost lapack ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Accelerate CoreGraphics CoreVideo ]; + ++ lib.optionals stdenv.isDarwin [ Accelerate CoreGraphics CoreVideo ]; doCheck = !stdenv.isDarwin; checkTarget = "test"; - meta = with stdenv.lib; { + meta = with lib; { description = "A vector and matrix math library implemented using C++ templates"; longDescription = ''vmmlib is a vector and matrix math library implemented diff --git a/pkgs/development/libraries/vo-amrwbenc/default.nix b/pkgs/development/libraries/vo-amrwbenc/default.nix index 9f35bf4ad84..dccbd1349d2 100644 --- a/pkgs/development/libraries/vo-amrwbenc/default.nix +++ b/pkgs/development/libraries/vo-amrwbenc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook }: +{ lib, stdenv, fetchurl, autoreconfHook }: let version = "0.1.3"; @@ -15,8 +15,8 @@ stdenv.mkDerivation { meta = { homepage = "https://sourceforge.net/projects/opencore-amr/"; description = "VisualOn Adaptive Multi Rate Wideband (AMR-WB) encoder"; - license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.Esteth ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.Esteth ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/volume-key/default.nix b/pkgs/development/libraries/volume-key/default.nix index 084b42c9a2d..567a5e3e251 100644 --- a/pkgs/development/libraries/volume-key/default.nix +++ b/pkgs/development/libraries/volume-key/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoreconfHook, pkgconfig, gettext, python3 +{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, gettext, python3 , ncurses, swig, glib, util-linux, cryptsetup, nss, gpgme , autoconf, automake, libtool , buildPackages @@ -18,7 +18,7 @@ in stdenv.mkDerivation { outputs = [ "out" "man" "dev" "py" ]; - nativeBuildInputs = [ autoconf automake libtool pkgconfig gettext swig ]; + nativeBuildInputs = [ autoconf automake libtool pkg-config gettext swig ]; buildInputs = [ autoreconfHook glib cryptsetup nss util-linux gpgme ncurses ]; @@ -38,7 +38,7 @@ in stdenv.mkDerivation { doCheck = false; # fails 1 out of 1 tests, needs `certutil` - meta = with stdenv.lib; { + meta = with lib; { description = "A library for manipulating storage volume encryption keys and storing them separately from volumes to handle forgotten passphrases, and the associated command-line tool"; homepage = "https://pagure.io/volume_key/"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/vrb/default.nix b/pkgs/development/libraries/vrb/default.nix index a85e27d42b7..1ebc37cdf2f 100644 --- a/pkgs/development/libraries/vrb/default.nix +++ b/pkgs/development/libraries/vrb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "vrb"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { cp -p vrb/man/man3/*.3 $out/share/man/man3/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A virtual ring buffer library written in C"; license = licenses.lgpl21; homepage = "http://vrb.sourceforge.net/"; diff --git a/pkgs/development/libraries/vrpn/default.nix b/pkgs/development/libraries/vrpn/default.nix index 85d6fba459d..f9eed6b2f74 100644 --- a/pkgs/development/libraries/vrpn/default.nix +++ b/pkgs/development/libraries/vrpn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, unzip, cmake, libGLU, libGL }: +{ lib, stdenv, fetchFromGitHub, unzip, cmake, libGLU, libGL }: stdenv.mkDerivation rec { name = "${pname}-${date}"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { doCheck = false; # FIXME: test failure checkTarget = "test"; - meta = with stdenv.lib; { + meta = with lib; { description = "Virtual Reality Peripheral Network"; longDescription = '' The Virtual-Reality Peripheral Network (VRPN) is a set of classes diff --git a/pkgs/development/libraries/vsqlite/default.nix b/pkgs/development/libraries/vsqlite/default.nix index a4c9cb556b9..6981de6aa07 100644 --- a/pkgs/development/libraries/vsqlite/default.nix +++ b/pkgs/development/libraries/vsqlite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, sqlite }: +{ lib, stdenv, fetchurl, boost, sqlite }: stdenv.mkDerivation rec { pname = "vsqlite"; @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { buildInputs = [ boost sqlite ]; - prePatch = stdenv.lib.optionalString stdenv.isDarwin '' + prePatch = lib.optionalString stdenv.isDarwin '' substituteInPlace Makefile.in \ --replace '-Wl,--as-needed' "" \ --replace '-Wl,-soname -Wl,libvsqlitepp.so.3' \ "-Wl,-install_name,$out/lib/libvsqlitepp.3.dylib" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://vsqlite.virtuosic-bytes.com/"; description = "C++ wrapper library for sqlite"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/vte/2.90.nix b/pkgs/development/libraries/vte/2.90.nix index 59d0acada13..4a9e4d8a66c 100644 --- a/pkgs/development/libraries/vte/2.90.nix +++ b/pkgs/development/libraries/vte/2.90.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, glib, gtk3, ncurses, gobject-introspection }: +{ lib, stdenv, fetchurl, intltool, pkg-config, glib, gtk3, ncurses, gobject-introspection }: stdenv.mkDerivation rec { versionMajor = "0.36"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "54e5b07be3c0f7b158302f54ee79d4de1cb002f4259b6642b79b1e0e314a959c"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gobject-introspection intltool glib gtk3 ncurses ]; configureFlags = [ "--enable-introspection" ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { substituteInPlace $out/lib/libvte2_90.la --replace "-lncurses" "-L${ncurses.out}/lib -lncurses" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.gnome.org/"; description = "A library implementing a terminal emulator widget for GTK"; longDescription = '' diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index 014b2615d5b..9f2722a9ae8 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -3,7 +3,7 @@ , fetchurl , fetchpatch , gettext -, pkgconfig +, pkg-config , meson , ninja , gnome3 @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "139had0zcggzrxx9rjy0a67mahzm474amafh168y11421iyfhsf3"; }; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { libxml2 meson ninja - pkgconfig + pkg-config vala ]; @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { patchShebangs src/box_drawing_generate.sh ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.gnome.org/"; description = "A library implementing a terminal emulator widget for GTK"; longDescription = '' diff --git a/pkgs/development/libraries/vtk/7.x.nix b/pkgs/development/libraries/vtk/7.x.nix index 55f950e0ac9..860f1763945 100644 --- a/pkgs/development/libraries/vtk/7.x.nix +++ b/pkgs/development/libraries/vtk/7.x.nix @@ -5,5 +5,10 @@ import ./generic.nix { patchesToFetch = [{ url = "https://gitlab.kitware.com/vtk/vtk/-/commit/706f1b397df09a27ab8981ab9464547028d0c322.diff"; sha256 = "1q3pi5h40g05pzpbqp75xlgzvbfvyw8raza51svmi7d8dlslqybx"; - }]; + } + { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sci-libs/vtk/files/vtk-8.2.0-gcc-10.patch?id=c4256f68d3589570443075eccbbafacf661f785f"; + sha256 = "sha256:0bpwrdfmi15grsg4jy7bzj2z6511a0c160cmw5lsi65aabyh7cl5"; + } + ]; } diff --git a/pkgs/development/libraries/vtk/8.x.nix b/pkgs/development/libraries/vtk/8.x.nix index 1563991f47f..ad84ec163cf 100644 --- a/pkgs/development/libraries/vtk/8.x.nix +++ b/pkgs/development/libraries/vtk/8.x.nix @@ -5,5 +5,14 @@ import ./generic.nix { patchesToFetch = [{ url = "https://gitlab.kitware.com/vtk/vtk/-/commit/257b9d7b18d5f3db3fe099dc18f230e23f7dfbab.diff"; sha256 = "0qdahp4f4gcaznr28j06d5fyxiis774ys0p335aazf7h51zb8rzy"; - }]; + } + { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sci-libs/vtk/files/vtk-8.2.0-gcc-10.patch?id=c4256f68d3589570443075eccbbafacf661f785f"; + sha256 = "sha256:0bpwrdfmi15grsg4jy7bzj2z6511a0c160cmw5lsi65aabyh7cl5"; + } + { + url = "https://gitlab.kitware.com/vtk/vtk/-/merge_requests/6943.diff"; + sha256 = "sha256:1nzdw3f6bsri04y528zj2klqkb9p8s4lnl9g5zvm119m1cmyhn04"; + } + ]; } diff --git a/pkgs/development/libraries/vtk/generic.nix b/pkgs/development/libraries/vtk/generic.nix index 273bff8852e..85eaa1ae80e 100644 --- a/pkgs/development/libraries/vtk/generic.nix +++ b/pkgs/development/libraries/vtk/generic.nix @@ -57,6 +57,8 @@ in stdenv.mkDerivation rec { export LD_LIBRARY_PATH="$(pwd)/lib"; ''; + dontWrapQtApps = true; + # Shared libraries don't work, because of rpath troubles with the current # nixpkgs cmake approach. It wants to call a binary at build time, just # built and requiring one of the shared objects. diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix index 154ed9deb49..f065b83bcc8 100644 --- a/pkgs/development/libraries/vulkan-headers/default.nix +++ b/pkgs/development/libraries/vulkan-headers/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "vulkan-headers"; version = "1.2.162.0"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "057c49w1138l02v9gqsk1z8wdz0iilp96jblnldycwm9jc1a1ipq"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Vulkan Header files and API registry"; homepage = "https://www.lunarg.com"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 67ff1be075d..b3882a91942 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, pkgconfig +{ lib, stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, pkg-config , xlibsWrapper, libxcb, libXrandr, libXext, wayland, addOpenGLRunpath }: stdenv.mkDerivation rec { @@ -12,23 +12,27 @@ stdenv.mkDerivation rec { sha256 = "0w9i2pliw4ccmjyfzff4i2f3hxwsfd54jg7ahv2v634qmx59bsbi"; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ python3 xlibsWrapper libxcb libXrandr libXext wayland ]; - preConfigure = '' - substituteInPlace loader/vulkan.pc.in \ - --replace 'includedir=''${prefix}/include' 'includedir=${vulkan-headers}/include' \ - --replace 'libdir=''${exec_prefix}/@CMAKE_INSTALL_LIBDIR@' 'libdir=@CMAKE_INSTALL_LIBDIR@' - ''; - cmakeFlags = [ "-DSYSCONFDIR=${addOpenGLRunpath.driverLink}/share" "-DVULKAN_HEADERS_INSTALL_DIR=${vulkan-headers}" + "-DCMAKE_INSTALL_INCLUDEDIR=${vulkan-headers}/include" ]; outputs = [ "out" "dev" ]; - meta = with stdenv.lib; { + doInstallCheck = true; + + installCheckPhase = '' + grep -q "${vulkan-headers}/include" $dev/lib/pkgconfig/vulkan.pc || { + echo vulkan-headers include directory not found in pkg-config file + exit 1 + } + ''; + + meta = with lib; { description = "LunarG Vulkan loader"; homepage = "https://www.lunarg.com"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/vxl/default.nix b/pkgs/development/libraries/vxl/default.nix index b6543b2e6cf..6858cd93ab3 100644 --- a/pkgs/development/libraries/vxl/default.nix +++ b/pkgs/development/libraries/vxl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, unzip, cmake, libtiff, expat, zlib, libpng, libjpeg }: +{ lib, stdenv, fetchFromGitHub, unzip, cmake, libtiff, expat, zlib, libpng, libjpeg }: stdenv.mkDerivation { name = "vxl-1.17.0-nix1"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { # BUILD_BRL fails to find open() "-DBUILD_BRL=OFF" "-DBUILD_CONTRIB=OFF" - ] ++ stdenv.lib.optionals (stdenv.hostPlatform.system == "x86_64-linux") [ + ] ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-linux") [ "-DCMAKE_CXX_FLAGS=-fPIC" "-DCMAKE_C_FLAGS=-fPIC" ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation { description = "C++ Libraries for Computer Vision Research and Implementation"; homepage = "http://vxl.sourceforge.net/"; license = "VXL License"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/development/libraries/waffle/default.nix b/pkgs/development/libraries/waffle/default.nix index 0f1e36b3579..dd783036f23 100644 --- a/pkgs/development/libraries/waffle/default.nix +++ b/pkgs/development/libraries/waffle/default.nix @@ -32,14 +32,14 @@ stdenv.mkDerivation rec { buildInputs = [ libGL - ] ++ stdenv.lib.optionals (with stdenv.hostPlatform; isUnix && !isDarwin) [ + ] ++ lib.optionals (with stdenv.hostPlatform; isUnix && !isDarwin) [ libglvnd - ] ++ stdenv.lib.optionals x11Support [ + ] ++ lib.optionals x11Support [ libX11 libxcb - ] ++ stdenv.lib.optionals waylandSupport [ + ] ++ lib.optionals waylandSupport [ wayland - ] ++ stdenv.lib.optionals useGbm [ + ] ++ lib.optionals useGbm [ mesa libudev ]; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/wflinfo \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libGL libglvnd ]} + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL libglvnd ]} ''; meta = with lib; { diff --git a/pkgs/development/libraries/wasilibc/default.nix b/pkgs/development/libraries/wasilibc/default.nix index bca025d622a..f8142f046b7 100644 --- a/pkgs/development/libraries/wasilibc/default.nix +++ b/pkgs/development/libraries/wasilibc/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { ln -s $out/share/wasm32-wasi/undefined-symbols.txt $out/lib/wasi.imports ''; - meta = with stdenv.lib; { + meta = with lib; { description = "WASI libc implementation for WebAssembly"; homepage = "https://wasi.dev"; platforms = platforms.wasi; diff --git a/pkgs/development/libraries/wavpack/default.nix b/pkgs/development/libraries/wavpack/default.nix index 78794430860..e3527ac32a4 100644 --- a/pkgs/development/libraries/wavpack/default.nix +++ b/pkgs/development/libraries/wavpack/default.nix @@ -1,21 +1,25 @@ -{ stdenv, fetchurl, libiconv }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, libiconv }: stdenv.mkDerivation rec { pname = "wavpack"; - version = "5.3.0"; + version = "5.4.0"; enableParallelBuilding = true; - buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = lib.optional stdenv.isDarwin libiconv; - src = fetchurl { - url = "http://www.wavpack.com/${pname}-${version}.tar.bz2"; - sha256 = "00baiag7rlkzc6545dqdp4p5sr7xc3n97n7qdkgx58c544x0pw5n"; + src = fetchFromGitHub { + owner = "dbry"; + repo = "WavPack"; + rev = version; + sha256 = "1b6szk2vmnqnv5w7h8yc1iazjlidlraq1lwjbmc3fi0snbn6qj44"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Hybrid audio compression format"; - homepage = "http://www.wavpack.com/"; + homepage = "https://www.wavpack.com/"; + changelog = "https://github.com/dbry/WavPack/releases/tag/${version}"; license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ codyopel ]; diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index 2b18bc31a45..fb7d1972c02 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -3,7 +3,7 @@ , fetchurl , fetchpatch , meson -, pkgconfig +, pkg-config , substituteAll , ninja , libffi @@ -28,19 +28,14 @@ let in stdenv.mkDerivation rec { pname = "wayland"; - version = "1.18.0"; + version = "1.19.0"; src = fetchurl { url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz"; - sha256 = "0k995rn96xkplrapz5k648j651wc43kq817xk1x8280h16gsfxa6"; + sha256 = "05bd2vphyx8qwa1mhsj1zdaiv4m4v94wrlssrn0lad8d601dkk5s"; }; patches = [ - # Fix documentation to be reproducible. - (fetchpatch { - url = "https://gitlab.freedesktop.org/wayland/wayland/-/commit/e53e0edf0f892670f3e8c5dd527b3bb22335d32d.patch"; - sha256 = "15sbhi86m9k72lsj56p7zr20ph2b0y4svl639snsbafn2ir1zdb2"; - }) (substituteAll { src = ./0001-add-placeholder-for-nm.patch; nm = "${stdenv.cc.targetPrefix}nm"; @@ -57,12 +52,12 @@ stdenv.mkDerivation rec { ''; depsBuildBuild = [ - pkgconfig + pkg-config ]; nativeBuildInputs = [ meson - pkgconfig + pkg-config ninja ] ++ lib.optionals isCross [ wayland # For wayland-scanner during the build diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix index 66d5d50c9d8..23258aff3e9 100644 --- a/pkgs/development/libraries/wayland/protocols.nix +++ b/pkgs/development/libraries/wayland/protocols.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , wayland }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1rsdgvkkvxs3cjhpl6agvbkm53vm7k8rg127j9y2vn33m2hvg0lp"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ wayland ]; diff --git a/pkgs/development/libraries/waylandpp/default.nix b/pkgs/development/libraries/waylandpp/default.nix index 5fc466cec20..0aa77b771e4 100644 --- a/pkgs/development/libraries/waylandpp/default.nix +++ b/pkgs/development/libraries/waylandpp/default.nix @@ -1,7 +1,7 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , pugixml , wayland , libGL @@ -13,7 +13,7 @@ assert docSupport -> doxygen != null; -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "waylandpp"; version = "0.2.8"; @@ -25,18 +25,18 @@ stdenv.mkDerivation rec { sha256 = "1kxiqab48p0n97pwg8c2zx56wqq32m3rcq7qd2pjj33ipcanb3qq"; }; - cmakeFlags = [ - "-DCMAKE_INSTALL_DATADIR=${placeholder "dev"}" - ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + cmakeFlags = [ + "-DCMAKE_INSTALL_DATADIR=${placeholder "dev"}" + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "-DWAYLAND_SCANNERPP=${buildPackages.waylandpp}/bin/wayland-scanner++" ]; - nativeBuildInputs = [ cmake pkgconfig ] ++ optional docSupport doxygen; + nativeBuildInputs = [ cmake pkg-config ] ++ optional docSupport doxygen; buildInputs = [ pugixml wayland libGL libffi ]; outputs = [ "bin" "dev" "lib" "out" ] ++ optionals docSupport [ "doc" "devman" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Wayland C++ binding"; homepage = "https://github.com/NilsBrause/waylandpp/"; license = with licenses; [ bsd2 hpnd ]; diff --git a/pkgs/development/libraries/wcslib/default.nix b/pkgs/development/libraries/wcslib/default.nix index 2b3414df1a4..c12118a99de 100644 --- a/pkgs/development/libraries/wcslib/default.nix +++ b/pkgs/development/libraries/wcslib/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, flex }: +{ fetchurl, lib, stdenv, flex }: stdenv.mkDerivation rec { version = "7.3.1"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { systems. This is the standard library for this purpose in astronomy.''; - license = stdenv.lib.licenses.lgpl3Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.lgpl3Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index ed97e1c8a85..9bf91da6cd9 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , perl , python3 @@ -7,7 +7,7 @@ , gperf , cmake , ninja -, pkgconfig +, pkg-config , gettext , gobject-introspection , libnotify @@ -55,7 +55,7 @@ assert enableGeoLocation -> geoclue2 != null; -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "webkitgtk"; @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { ./libglvnd-headers.patch ]; - preConfigure = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' # Ignore gettext in cmake_prefix_path so that find_program doesn't # pick up the wrong gettext. TODO: Find a better solution for # this, maybe make cmake not look up executables in @@ -94,11 +94,11 @@ stdenv.mkDerivation rec { gperf ninja perl - pkgconfig + pkg-config python3 ruby glib # for gdbus-codegen - ] ++ stdenv.lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ wayland # for wayland-scanner ]; diff --git a/pkgs/development/libraries/webrtc-audio-processing/default.nix b/pkgs/development/libraries/webrtc-audio-processing/default.nix index 91d93352da1..efd2ce3b1fc 100644 --- a/pkgs/development/libraries/webrtc-audio-processing/default.nix +++ b/pkgs/development/libraries/webrtc-audio-processing/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, darwin }: +{ lib, stdenv, fetchurl, darwin }: stdenv.mkDerivation rec { name = "webrtc-audio-processing-0.3.1"; @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { sha256 = "1gsx7k77blfy171b6g3m0k0s0072v6jcawhmx1kjs9w5zlwdkzd0"; }; - buildInputs = stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]); + buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]); - patchPhase = stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + patchPhase = lib.optionalString stdenv.hostPlatform.isMusl '' substituteInPlace webrtc/base/checks.cc --replace 'defined(__UCLIBC__)' 1 ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing"; description = "A more Linux packaging friendly copy of the AudioProcessing module from the WebRTC project"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/websocket++/default.nix b/pkgs/development/libraries/websocket++/default.nix index d04cadb483b..5c9271f2a85 100644 --- a/pkgs/development/libraries/websocket++/default.nix +++ b/pkgs/development/libraries/websocket++/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "websocket++"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.zaphoyd.com/websocketpp/"; description = "C++/Boost Asio based websocket client/server library"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/wildmidi/default.nix b/pkgs/development/libraries/wildmidi/default.nix index ea63a73fc92..880823a8473 100644 --- a/pkgs/development/libraries/wildmidi/default.nix +++ b/pkgs/development/libraries/wildmidi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, alsaLib, freepats }: +{ lib, stdenv, fetchurl, cmake, alsaLib, freepats }: stdenv.mkDerivation rec { name = "wildmidi-0.4.3"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { echo "source ${freepats}/freepats.cfg" >> "$out"/etc/wildmidi.cfg ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Software MIDI player and library"; longDescription = '' WildMIDI is a simple software midi player which has a core softsynth diff --git a/pkgs/development/libraries/wiredtiger/default.nix b/pkgs/development/libraries/wiredtiger/default.nix index 9a7cee6623e..469da2523d9 100644 --- a/pkgs/development/libraries/wiredtiger/default.nix +++ b/pkgs/development/libraries/wiredtiger/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchFromGitHub, automake, autoconf, libtool +{ lib, stdenv, fetchFromGitHub, automake, autoconf, libtool # Optional Dependencies , lz4 ? null, snappy ? null, zlib ? null, bzip2 ? null, db ? null , gperftools ? null, leveldb ? null }: -with stdenv.lib; +with lib; let mkFlag = trueStr: falseStr: cond: name: val: "--" + (if cond then trueStr else falseStr) @@ -14,7 +14,7 @@ let mkEnable = mkFlag "enable-" "disable-"; mkWith = mkFlag "with-" "without-"; - shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null; + shouldUsePkg = pkg: if pkg != null && lib.any (lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null; optLz4 = shouldUsePkg lz4; optSnappy = shouldUsePkg snappy; diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 13132c8cc1c..a21179e2025 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland , libGL, wayland-protocols, libinput, libxkbcommon, pixman , xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa , libpng, ffmpeg @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A modular Wayland compositor library"; longDescription = '' Pluggable, composable, unopinionated modules for building a Wayland diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index 30fc90ec8c0..c0c0218a318 100644 --- a/pkgs/development/libraries/wolfssl/default.nix +++ b/pkgs/development/libraries/wolfssl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "wolfssl"; @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { mkdir -p "$out" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A small, fast, portable implementation of TLS/SSL for embedded devices"; homepage = "https://www.wolfssl.com/"; platforms = platforms.all; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; maintainers = with maintainers; [ mcmtroffaes ]; }; } diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix index de98a11d68e..8887c4410f4 100644 --- a/pkgs/development/libraries/wt/default.nix +++ b/pkgs/development/libraries/wt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, boost, pkg-config, doxygen, qt48Full, libharu +{ lib, stdenv, fetchFromGitHub, cmake, boost, pkg-config, doxygen, qt48Full, libharu , pango, fcgi, firebird, libmysqlclient, postgresql, graphicsmagick, glew, openssl , pcre, harfbuzz }: @@ -28,16 +28,16 @@ let "-DWT_CPP_11_MODE=-std=c++11" "--no-warn-unused-cli" ] - ++ stdenv.lib.optionals (graphicsmagick != null) [ + ++ lib.optionals (graphicsmagick != null) [ "-DWT_WRASTERIMAGE_IMPLEMENTATION=GraphicsMagick" "-DGM_PREFIX=${graphicsmagick}" ] - ++ stdenv.lib.optional (harfbuzz != null) + ++ lib.optional (harfbuzz != null) "-DHARFBUZZ_INCLUDE_DIR=${harfbuzz.dev}/include" - ++ stdenv.lib.optional (libmysqlclient != null) + ++ lib.optional (libmysqlclient != null) "-DMYSQL_PREFIX=${libmysqlclient}"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.webtoolkit.eu/wt"; description = "C++ library for developing web applications"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/wtk/default.nix b/pkgs/development/libraries/wtk/default.nix index d66a628dac7..9ddc95a9ccc 100644 --- a/pkgs/development/libraries/wtk/default.nix +++ b/pkgs/development/libraries/wtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, requireFile, unzip, xorg }: +{ lib, stdenv, requireFile, unzip, xorg }: assert stdenv.hostPlatform.system == "i686-linux"; @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://java.sun.com/products/sjwtoolkit/download.html"; description = "Sun Java Wireless Toolkit 2.5.2_01 for CLDC"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; }; } diff --git a/pkgs/development/libraries/wxSVG/default.nix b/pkgs/development/libraries/wxSVG/default.nix index 9fa64be4d53..5e7f7b71fbe 100644 --- a/pkgs/development/libraries/wxSVG/default.nix +++ b/pkgs/development/libraries/wxSVG/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl -, pkgconfig, wxGTK +{ lib, stdenv, fetchurl +, pkg-config, wxGTK , ffmpeg_3, libexif , cairo, pango }: @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { sha256 = "0agmmwg0zlsw1idygvqjpj1nk41akzlbdha0hsdk1k8ckz6niq8d"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ wxGTK ffmpeg_3 libexif ]; buildInputs = [ cairo pango ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A SVG manipulation library built with wxWidgets"; longDescription = '' wxSVG is C++ library to create, manipulate and render diff --git a/pkgs/development/libraries/wxsqlite3/default.nix b/pkgs/development/libraries/wxsqlite3/default.nix index db5e91b74d6..8acd4e99636 100644 --- a/pkgs/development/libraries/wxsqlite3/default.nix +++ b/pkgs/development/libraries/wxsqlite3/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook , wxGTK @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ wxGTK sqlite ] - ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa darwin.stubs.setfile darwin.stubs.rez darwin.stubs.derez ]; + ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa darwin.stubs.setfile darwin.stubs.rez darwin.stubs.derez ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://utelle.github.io/wxsqlite3/"; description = "A C++ wrapper around the public domain SQLite 3.x for wxWidgets"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/wxsqliteplus/default.nix b/pkgs/development/libraries/wxsqliteplus/default.nix index 18ecea4cbe1..7cf5484bef7 100644 --- a/pkgs/development/libraries/wxsqliteplus/default.nix +++ b/pkgs/development/libraries/wxsqliteplus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, wxGTK, wxsqlite3, sqlite }: +{ lib, stdenv, fetchFromGitHub, wxGTK, wxsqlite3, sqlite }: stdenv.mkDerivation rec { pname = "wxsqliteplus"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { install -D wxsqliteplus $out/bin/wxsqliteplus ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/guanlisheng/wxsqliteplus"; description = "A simple SQLite database browser built with wxWidgets"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/wxwidgets/2.8/default.nix b/pkgs/development/libraries/wxwidgets/2.8/default.nix index deb7d19c0de..8029477708d 100644 --- a/pkgs/development/libraries/wxwidgets/2.8/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.8/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xorgproto +{ lib, stdenv, fetchurl, pkg-config, gtk2, libXinerama, libSM, libXxf86vm, xorgproto , libX11, cairo -, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms -, withMesa ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms +, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms +, withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms , libGLU ? null, libGL ? null , compat24 ? false, compat26 ? true, unicode ? true, }: assert withMesa -> libGLU != null && libGL != null; -with stdenv.lib; +with lib; stdenv.mkDerivation rec { version = "2.8.12.1"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2 libXinerama libSM libXxf86vm xorgproto libX11 cairo ] ++ optional withMesa libGLU; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/wxwidgets/2.9/default.nix b/pkgs/development/libraries/wxwidgets/2.9/default.nix index 5db7cfc26ba..77e0e20eaf5 100644 --- a/pkgs/development/libraries/wxwidgets/2.9/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.9/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xorgproto +{ lib, stdenv, fetchurl, pkg-config, gtk2, libXinerama, libSM, libXxf86vm, xorgproto , setfile -, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms -, withMesa ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms +, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms +, withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms , libGLU ? null, libGL ? null , compat24 ? false, compat26 ? true, unicode ? true , Carbon ? null, Cocoa ? null, Kernel ? null, QuickTime ? null, AGL ? null @@ -9,7 +9,7 @@ assert withMesa -> libGLU != null && libGL != null; -with stdenv.lib; +with lib; let version = "2.9.4"; @@ -36,7 +36,7 @@ stdenv.mkDerivation { ++ optional withMesa libGLU ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QuickTime ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = optional stdenv.isDarwin AGL; diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix index df90342a972..a1c2820a5fd 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, fetchurl, pkgconfig +{ lib, stdenv, fetchFromGitHub, fetchurl, pkg-config , libXinerama, libSM, libXxf86vm , gtk2, gtk3 , xorgproto, gst_all_1, setfile -, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms +, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms , withMesa ? libGLSupported , libGLU ? null, libGL ? null , compat24 ? false, compat26 ? true, unicode ? true @@ -11,7 +11,7 @@ , AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null }: -with stdenv.lib; +with lib; assert withMesa -> libGLU != null && libGL != null; assert withWebKit -> webkitgtk != null; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ++ optional withWebKit webkitgtk ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = optional stdenv.isDarwin AGL; diff --git a/pkgs/development/libraries/wxwidgets/3.0/mac.nix b/pkgs/development/libraries/wxwidgets/3.0/mac.nix index 1b4c6702451..22e81840991 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/mac.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/mac.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchzip, expat, libiconv, libjpeg, libpng, libtiff, zlib +{ lib, stdenv, fetchzip, expat, libiconv, libjpeg, libpng, libtiff, zlib # darwin only attributes , derez, rez, setfile -, AGL, Cocoa, Kernel +, AGL, Cocoa, Kernel, WebKit }: stdenv.mkDerivation rec { - version = "3.0.4"; + version = "3.0.5.1"; pname = "wxmac"; src = fetchzip { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ expat libiconv libjpeg libpng libtiff zlib derez rez setfile - AGL Cocoa Kernel + AGL Cocoa Kernel WebKit ]; postPatch = '' @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { platforms = platforms.darwin; license = licenses.wxWindows; maintainers = [ maintainers.lnl7 ]; diff --git a/pkgs/development/libraries/wxwidgets/3.1/default.nix b/pkgs/development/libraries/wxwidgets/3.1/default.nix index 8b0e6811eff..cab0197c939 100644 --- a/pkgs/development/libraries/wxwidgets/3.1/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.1/default.nix @@ -1,7 +1,7 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchurl -, pkgconfig +, pkg-config , libXinerama , libSM , libXxf86vm @@ -12,7 +12,7 @@ , xorgproto , gst_all_1 , setfile -, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms +, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms , withMesa ? libGLSupported , libGLU ? null , libGL ? null @@ -29,7 +29,7 @@ , QTKit ? null }: -with stdenv.lib; +with lib; assert withMesa -> libGLU != null && libGL != null; assert withWebKit -> webkitgtk != null; @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { ++ optional withWebKit webkitgtk ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = optional stdenv.isDarwin AGL; diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix index 49797b5dd75..93d0b42a889 100644 --- a/pkgs/development/libraries/x264/default.nix +++ b/pkgs/development/libraries/x264/default.nix @@ -29,12 +29,12 @@ stdenv.mkDerivation rec { ''; configureFlags = [ "--enable-shared" ] - ++ stdenv.lib.optional (!stdenv.isi686) "--enable-pic" - ++ stdenv.lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "--cross-prefix=${stdenv.cc.targetPrefix}"; + ++ lib.optional (!stdenv.isi686) "--enable-pic" + ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "--cross-prefix=${stdenv.cc.targetPrefix}"; nativeBuildInputs = lib.optional (stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isi686) nasm; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for encoding H264/AVC video streams"; homepage = "http://www.videolan.org/developers/x264.html"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix index 8c5cf32545c..495bbc4aaab 100644 --- a/pkgs/development/libraries/x265/default.nix +++ b/pkgs/development/libraries/x265/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromBitbucket, cmake, nasm, numactl +{ lib, stdenv, fetchFromBitbucket, cmake, nasm, numactl , numaSupport ? stdenv.hostPlatform.isLinux && (stdenv.hostPlatform.isx86 || stdenv.hostPlatform.isAarch64) # Enabled by default on NUMA platforms , debugSupport ? false # Run-time sanity checks (debugging) , werrorSupport ? false # Warnings as errors @@ -21,7 +21,7 @@ let (mkFlag custatsSupport "DETAILED_CU_STATS") (mkFlag unittestsSupport "ENABLE_TESTS") (mkFlag werrorSupport "WARNINGS_AS_ERRORS") - ] ++ stdenv.lib.optionals stdenv.hostPlatform.isPower [ + ] ++ lib.optionals stdenv.hostPlatform.isPower [ "-DENABLE_ALTIVEC=OFF" ]; @@ -56,7 +56,7 @@ let cd source ''; - nativeBuildInputs = [cmake nasm] ++ stdenv.lib.optional numaSupport numactl; + nativeBuildInputs = [cmake nasm] ++ lib.optional numaSupport numactl; }; libx265-10 = buildLib false; @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { "-DENABLE_SHARED=ON" "-DHIGH_BIT_DEPTH=OFF" "-DENABLE_HDR10_PLUS=OFF" - ] ++ stdenv.lib.optionals (is64bit && !(stdenv.isAarch64 && stdenv.isLinux)) [ + ] ++ lib.optionals (is64bit && !(stdenv.isAarch64 && stdenv.isLinux)) [ "-DEXTRA_LIB=${libx265-10}/lib/libx265.a;${libx265-12}/lib/libx265.a" "-DLINKED_10BIT=ON" "-DLINKED_12BIT=ON" @@ -92,9 +92,9 @@ stdenv.mkDerivation rec { rm $out/lib/*.a ''; - nativeBuildInputs = [ cmake nasm ] ++ stdenv.lib.optional numaSupport numactl; + nativeBuildInputs = [ cmake nasm ] ++ lib.optional numaSupport numactl; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for encoding h.265/HEVC video streams"; homepage = "http://x265.org"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/xalanc/default.nix b/pkgs/development/libraries/xalanc/default.nix index 30ab7f4496d..b757b737f97 100644 --- a/pkgs/development/libraries/xalanc/default.nix +++ b/pkgs/development/libraries/xalanc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xercesc, getopt }: +{ lib, stdenv, fetchurl, xercesc, getopt }: let platform = if stdenv.isLinux then "linux" else @@ -25,8 +25,8 @@ in stdenv.mkDerivation rec { meta = { homepage = "http://xalan.apache.org/"; description = "A XSLT processor for transforming XML documents"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - maintainers = [ stdenv.lib.maintainers.jagajaga ]; + license = lib.licenses.asl20; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + maintainers = [ lib.maintainers.jagajaga ]; }; } diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index 195aea5c2f1..cfca33a62d2 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook +{ lib, stdenv, fetchurl, autoreconfHook , libuuid, zlib }: let @@ -20,16 +20,16 @@ let doCheck = true; AUTOMATED_TESTING = true; # https://trac.xapian.org/changeset/8be35f5e1/git - patches = stdenv.lib.optionals stdenv.isDarwin [ ./skip-flaky-darwin-test.patch ]; + patches = lib.optionals stdenv.isDarwin [ ./skip-flaky-darwin-test.patch ]; # the configure script thinks that Darwin has ___exp10 # but it’s not available on my systems (or hydra apparently) - postConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + postConfigure = lib.optionalString stdenv.isDarwin '' substituteInPlace config.h \ --replace "#define HAVE___EXP10 1" "#undef HAVE___EXP10" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Search engine library"; homepage = "https://xapian.org/"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/xapian/tools/omega/default.nix b/pkgs/development/libraries/xapian/tools/omega/default.nix index a496e3886d8..79e5786f048 100644 --- a/pkgs/development/libraries/xapian/tools/omega/default.nix +++ b/pkgs/development/libraries/xapian/tools/omega/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, xapian, perl, pcre, zlib, libmagic }: +{ lib, stdenv, fetchurl, pkg-config, xapian, perl, pcre, zlib, libmagic }: stdenv.mkDerivation rec { pname = "xapian-omega"; @@ -10,9 +10,9 @@ stdenv.mkDerivation rec { }; buildInputs = [ xapian perl pcre zlib libmagic ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Indexer and CGI search front-end built on Xapian library"; homepage = "https://xapian.org/"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/xavs/default.nix b/pkgs/development/libraries/xavs/default.nix index 18b10376315..11d73a9decb 100644 --- a/pkgs/development/libraries/xavs/default.nix +++ b/pkgs/development/libraries/xavs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn }: +{ lib, stdenv, fetchsvn }: stdenv.mkDerivation rec { pname = "xavs"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { patchShebangs tools/patcheck patchShebangs tools/regression-test.pl patchShebangs tools/xavs-format - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' substituteInPlace config.guess --replace 'uname -p' 'uname -m' substituteInPlace configure \ --replace '-O4' '-O3' \ @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { "--disable-asm" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "AVS encoder and decoder"; homepage = "http://xavs.sourceforge.net/"; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/xbase/default.nix b/pkgs/development/libraries/xbase/default.nix index ae7ceb18c0a..db36c2a34c1 100644 --- a/pkgs/development/libraries/xbase/default.nix +++ b/pkgs/development/libraries/xbase/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "xbase-3.1.2"; @@ -25,7 +25,7 @@ stdenv.mkDerivation { }) ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://linux.techass.com/projects/xdb/"; description = "C++ class library formerly known as XDB"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/xcb-imdkit/default.nix b/pkgs/development/libraries/xcb-imdkit/default.nix index 72ce94d98f1..a3bcc822b36 100644 --- a/pkgs/development/libraries/xcb-imdkit/default.nix +++ b/pkgs/development/libraries/xcb-imdkit/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , extra-cmake-modules @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "xcb-imdkit"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "fcitx"; repo = "xcb-imdkit"; rev = version; - sha256 = "dvax+Wj8+tHdiL6txcuugrOlRnxdIW25DYO4iNAYK8M="; + sha256 = "sha256-ISaVsMtDsyfhbhsAwDSWkQ7ZcpNtvC7M9NFQsWA5ju8="; }; nativeBuildInputs = [ @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { xcbutilkeysyms ]; - meta = with stdenv.lib; { + meta = with lib; { description = "input method development support for xcb"; homepage = "https://github.com/fcitx/xcb-imdkit"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix index 5457487edcc..f296f59d408 100644 --- a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix +++ b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoconf, automake, libtool, pkgconfig +{ lib, stdenv, fetchgit, autoconf, automake, libtool, pkg-config , xorg, gnum4, libxcb, gperf }: stdenv.mkDerivation { @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "127zfmihd8nqlj8jjaja06xb84xdgl263w0av1xnprx05mkbkcyc"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "XCB cursor library (libxcursor port)"; homepage = "https://cgit.freedesktop.org/xcb/util-cursor"; license = licenses.mit; @@ -28,7 +28,7 @@ stdenv.mkDerivation { gperf libtool libxcb - pkgconfig + pkg-config xorg.utilmacros xorg.xcbutilimage xorg.xcbutilrenderutil diff --git a/pkgs/development/libraries/xdg-dbus-proxy/default.nix b/pkgs/development/libraries/xdg-dbus-proxy/default.nix index 38d7d447e28..21d6b6fa73e 100644 --- a/pkgs/development/libraries/xdg-dbus-proxy/default.nix +++ b/pkgs/development/libraries/xdg-dbus-proxy/default.nix @@ -1,6 +1,6 @@ -{ stdenv +{ lib, stdenv , fetchurl -, pkgconfig +, pkg-config , libxslt , docbook_xsl , docbook_xml_dtd_43 @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config libxslt docbook_xsl docbook_xml_dtd_43 @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { # dbus[2345]: Failed to start message bus: Failed to open "/etc/dbus-1/session.conf": No such file or directory doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "DBus proxy for Flatpak and others"; homepage = "https://github.com/flatpak/xdg-dbus-proxy"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix index b7e58948553..be96001c46f 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook , pkg-config @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { gnome3.gnome-settings-daemon # schemas needed for settings api (fonts, etc) ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Desktop integration portals for sandboxed apps"; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix b/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix index c6faa4fc017..151c74f0b70 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub -, meson, ninja, pkgconfig, wayland-protocols +{ lib, stdenv, fetchFromGitHub +, meson, ninja, pkg-config, wayland-protocols , pipewire, wayland, elogind, systemd, libdrm }: stdenv.mkDerivation rec { @@ -13,10 +13,10 @@ stdenv.mkDerivation rec { sha256 = "12k92h9dmn1fyn8nzxk69cyv0gnb7g9gj7a66mw5dcl5zqnl07nc"; }; - nativeBuildInputs = [ meson ninja pkgconfig wayland-protocols ]; + nativeBuildInputs = [ meson ninja pkg-config wayland-protocols ]; buildInputs = [ pipewire wayland elogind systemd libdrm ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/emersion/xdg-desktop-portal-wlr"; description = "xdg-desktop-portal backend for wlroots"; maintainers = with maintainers; [ minijackson ]; diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix index 83b4dda0c6e..cab35852831 100644 --- a/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -1,9 +1,9 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nixosTests , substituteAll , autoreconfHook -, pkgconfig +, pkg-config , libxml2 , glib , pipewire @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config libxml2 wrapGAppsHook ]; @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Desktop integration portals for sandboxed apps"; license = licenses.lgpl21; maintainers = with maintainers; [ jtojnar ]; diff --git a/pkgs/development/libraries/xed/default.nix b/pkgs/development/libraries/xed/default.nix index 1d6dcdc67ad..395b399d8fe 100644 --- a/pkgs/development/libraries/xed/default.nix +++ b/pkgs/development/libraries/xed/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages }: +{ lib, stdenv, fetchFromGitHub, python3Packages }: let # mbuild is a custom build system used only to build xed @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { dontInstall = true; # already installed during buildPhase - meta = with stdenv.lib; { + meta = with lib; { description = "Intel X86 Encoder Decoder (Intel XED)"; homepage = "https://intelxed.github.io/"; license = licenses.apsl20; diff --git a/pkgs/development/libraries/xercesc/default.nix b/pkgs/development/libraries/xercesc/default.nix index 8c7b1232014..f5109a1ebd6 100644 --- a/pkgs/development/libraries/xercesc/default.nix +++ b/pkgs/development/libraries/xercesc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "xerces-c"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://xerces.apache.org/xerces-c/"; description = "Validating XML parser written in a portable subset of C++"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + license = lib.licenses.asl20; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix index b9a2820a928..973e7dc028e 100644 --- a/pkgs/development/libraries/xgboost/default.nix +++ b/pkgs/development/libraries/xgboost/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { install -Dm755 ../xgboost $out/bin/xgboost ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Scalable, Portable and Distributed Gradient Boosting (GBDT, GBRT or GBM) Library"; homepage = "https://github.com/dmlc/xgboost"; license = licenses.asl20; diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix index 4322278e2fd..cbdc1a2dcf0 100644 --- a/pkgs/development/libraries/xine-lib/default.nix +++ b/pkgs/development/libraries/xine-lib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, xorg, alsaLib, libGLU, libGL, aalib +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, xorg, alsaLib, libGLU, libGL, aalib , libvorbis, libtheora, speex, zlib, perl, ffmpeg_3 , flac, libcaca, libpulseaudio, libmng, libcdio, libv4l, vcdimager , libmpcdec @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "13clir4qxl2zvsvvjd9yv3yrdhsnvcn5s7ambbbn5dzy9604xcrj"; }; - nativeBuildInputs = [ pkgconfig perl ]; + nativeBuildInputs = [ pkg-config perl ]; buildInputs = [ xorg.libX11 xorg.libXv xorg.libXinerama xorg.libxcb xorg.libXext @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.xine-project.org/"; description = "A high-performance, portable and reusable multimedia playback engine"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/xlibs-wrapper/default.nix b/pkgs/development/libraries/xlibs-wrapper/default.nix index 049c54d792b..735cc278deb 100644 --- a/pkgs/development/libraries/xlibs-wrapper/default.nix +++ b/pkgs/development/libraries/xlibs-wrapper/default.nix @@ -1,4 +1,4 @@ -{stdenv, packages}: +{lib, stdenv, packages}: stdenv.mkDerivation { name = "xlibs-wrapper"; @@ -16,6 +16,6 @@ stdenv.mkDerivation { buildClientLibs = true; meta = { - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/xlslib/default.nix b/pkgs/development/libraries/xlslib/default.nix index ee3942c360b..77a11b53110 100644 --- a/pkgs/development/libraries/xlslib/default.nix +++ b/pkgs/development/libraries/xlslib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, unzip }: +{ lib, stdenv, fetchurl, autoreconfHook, unzip }: stdenv.mkDerivation rec { pname = "xlslib"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "C++/C library to construct Excel .xls files in code"; homepage = "https://sourceforge.net/projects/xlslib/"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/xml-security-c/default.nix b/pkgs/development/libraries/xml-security-c/default.nix index 3a784a2e38b..7548a45e5d4 100644 --- a/pkgs/development/libraries/xml-security-c/default.nix +++ b/pkgs/development/libraries/xml-security-c/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xalanc, xercesc, openssl, pkgconfig }: +{ lib, stdenv, fetchurl, xalanc, xercesc, openssl, pkg-config }: stdenv.mkDerivation rec { pname = "xml-security-c"; @@ -15,14 +15,14 @@ stdenv.mkDerivation rec { "--with-xalan" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xalanc xercesc openssl ]; meta = { homepage = "http://santuario.apache.org/"; description = "C++ Implementation of W3C security standards for XML"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.jagajaga ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.jagajaga ]; }; } diff --git a/pkgs/development/libraries/xml-tooling-c/default.nix b/pkgs/development/libraries/xml-tooling-c/default.nix index d5e1eb08fa4..9cf3ddb9219 100644 --- a/pkgs/development/libraries/xml-tooling-c/default.nix +++ b/pkgs/development/libraries/xml-tooling-c/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoreconfHook, pkgconfig +{ lib, stdenv, fetchgit, autoreconfHook, pkg-config , boost, curl, openssl, log4shib, xercesc, xml-security-c }: @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { }; buildInputs = [ boost curl openssl log4shib xercesc xml-security-c ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A low-level library that provides a high level interface to XML processing for OpenSAML 2"; platforms = platforms.unix; license = licenses.asl20; diff --git a/pkgs/development/libraries/xmlrpc-c/default.nix b/pkgs/development/libraries/xmlrpc-c/default.nix index 41cdbf0b4f1..7b6907a0162 100644 --- a/pkgs/development/libraries/xmlrpc-c/default.nix +++ b/pkgs/development/libraries/xmlrpc-c/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, curl, libxml2 }: +{ lib, stdenv, fetchurl, curl, libxml2 }: stdenv.mkDerivation rec { name = "xmlrpc-c-1.51.06"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A lightweight RPC library based on XML and HTTP"; homepage = "http://xmlrpc-c.sourceforge.net/"; # <xmlrpc-c>/doc/COPYING also lists "Expat license", diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index 6d310443e70..8bf98760950 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxml2, gnutls, libxslt, pkgconfig, libgcrypt, libtool +{ stdenv, fetchurl, libxml2, gnutls, libxslt, pkg-config, libgcrypt, libtool # nss_3_53 is used instead of the latest due to a number of issues: # https://github.com/lsh123/xmlsec/issues?q=is%3Aissue+is%3Aopen+nss , openssl, nss_3_53, lib, runCommandCC, writeText }: @@ -18,14 +18,14 @@ stdenv.mkDerivation { patches = [ ./lt_dladdsearchdir.patch - ] ++ stdenv.lib.optionals stdenv.isDarwin [ ./remove_bsd_base64_decode_flag.patch ]; + ] ++ lib.optionals stdenv.isDarwin [ ./remove_bsd_base64_decode_flag.patch ]; postPatch = '' substituteAllInPlace src/dl.c ''; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxml2 gnutls libxslt libgcrypt libtool openssl nss_3_53 ]; @@ -52,7 +52,7 @@ stdenv.mkDerivation { passthru.tests.libxmlsec1-crypto = runCommandCC "libxmlsec1-crypto-test" { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ self libxml2 libxslt libtool ]; } '' $CC $(pkg-config --cflags --libs xmlsec1) -o crypto-test ${writeText "crypto-test.c" '' @@ -76,8 +76,8 @@ stdenv.mkDerivation { homepage = "http://www.aleksey.com/xmlsec"; downloadPage = "https://www.aleksey.com/xmlsec/download.html"; description = "XML Security Library in C based on libxml2"; - license = stdenv.lib.licenses.mit; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = lib.licenses.mit; + platforms = with lib.platforms; linux ++ darwin; updateWalker = true; }; } diff --git a/pkgs/development/libraries/xsd/default.nix b/pkgs/development/libraries/xsd/default.nix index 3388666f46b..2d614ee0e73 100644 --- a/pkgs/development/libraries/xsd/default.nix +++ b/pkgs/development/libraries/xsd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xercesc }: +{ lib, stdenv, fetchurl, xercesc }: let in @@ -32,8 +32,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.codesynthesis.com/products/xsd"; description = "An open-source, cross-platform W3C XML Schema to C++ data binding compiler"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.jagajaga ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.jagajaga ]; }; } diff --git a/pkgs/development/libraries/xvidcore/default.nix b/pkgs/development/libraries/xvidcore/default.nix index ab68693ea5e..dbc3d837a45 100644 --- a/pkgs/development/libraries/xvidcore/default.nix +++ b/pkgs/development/libraries/xvidcore/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, yasm, autoconf, automake, libtool }: +{ lib, stdenv, fetchurl, yasm, autoconf, automake, libtool }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "xvidcore"; version = "1.3.5"; diff --git a/pkgs/development/libraries/xxHash/default.nix b/pkgs/development/libraries/xxHash/default.nix index a5e6bfb11a6..fbeadc2b353 100644 --- a/pkgs/development/libraries/xxHash/default.nix +++ b/pkgs/development/libraries/xxHash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "xxHash"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { # Upstream Makefile does not anticipate that user may not want to # build .so library. - postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isStatic '' + postPatch = lib.optionalString stdenv.hostPlatform.isStatic '' sed -i 's/lib: libxxhash.a libxxhash/lib: libxxhash.a/' Makefile sed -i '/LIBXXH) $(DESTDIR/ d' Makefile ''; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(dev)" "EXEC_PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Extremely fast hash algorithm"; longDescription = '' xxHash is an Extremely fast Hash algorithm, running at RAM speed limits. diff --git a/pkgs/development/libraries/xylib/default.nix b/pkgs/development/libraries/xylib/default.nix index 2b4cb1d56da..f7d7eed7e70 100644 --- a/pkgs/development/libraries/xylib/default.nix +++ b/pkgs/development/libraries/xylib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, zlib, bzip2, wxGTK30 }: +{ lib, stdenv, fetchurl, boost, zlib, bzip2, wxGTK30 }: stdenv.mkDerivation rec { pname = "xylib"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost zlib bzip2 wxGTK30 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Portable library for reading files that contain x-y data from powder diffraction, spectroscopy and other experimental methods"; license = licenses.lgpl21; homepage = "http://xylib.sourceforge.net/"; diff --git a/pkgs/development/libraries/yajl/default.nix b/pkgs/development/libraries/yajl/default.nix index 62fe652724f..df47168c79b 100644 --- a/pkgs/development/libraries/yajl/default.nix +++ b/pkgs/development/libraries/yajl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake }: +{ lib, stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { name = "yajl-2.1.0"; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { C, and a small validating JSON generator. ''; homepage = "http://lloyd.github.com/yajl/"; - license = stdenv.lib.licenses.isc; - platforms = with stdenv.lib.platforms; linux ++ darwin; - maintainers = with stdenv.lib.maintainers; [ maggesi ]; + license = lib.licenses.isc; + platforms = with lib.platforms; linux ++ darwin; + maintainers = with lib.maintainers; [ maggesi ]; }; } diff --git a/pkgs/development/libraries/yojimbo/default.nix b/pkgs/development/libraries/yojimbo/default.nix index 9e6cc37e661..b72820c77a6 100644 --- a/pkgs/development/libraries/yojimbo/default.nix +++ b/pkgs/development/libraries/yojimbo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, premake5, doxygen, libsodium, mbedtls }: +{ lib, stdenv, fetchFromGitHub, premake5, doxygen, libsodium, mbedtls }: stdenv.mkDerivation { pname = "yojimbo"; @@ -28,7 +28,7 @@ stdenv.mkDerivation { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A network library for client/server games with dedicated servers"; longDescription = '' yojimbo is a network library for client/server games with dedicated servers. diff --git a/pkgs/development/libraries/yubico-pam/default.nix b/pkgs/development/libraries/yubico-pam/default.nix index 60d3defcb1f..1289b03618c 100644 --- a/pkgs/development/libraries/yubico-pam/default.nix +++ b/pkgs/development/libraries/yubico-pam/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config , asciidoc, libxslt, docbook_xsl , pam, yubikey-personalization, libyubikey, libykclient }: @@ -12,10 +12,10 @@ stdenv.mkDerivation rec { sha256 = "10dq8dqi3jldllj6p8r9hldx9sank9n82c44w8akxrs1vli6nj3m"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig asciidoc libxslt docbook_xsl ]; + nativeBuildInputs = [ autoreconfHook pkg-config asciidoc libxslt docbook_xsl ]; buildInputs = [ pam yubikey-personalization libyubikey libykclient ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Yubico PAM module"; homepage = "https://developers.yubico.com/yubico-pam"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/zchunk/default.nix b/pkgs/development/libraries/zchunk/default.nix index a0cb85ed71a..a0d1378aa70 100644 --- a/pkgs/development/libraries/zchunk/default.nix +++ b/pkgs/development/libraries/zchunk/default.nix @@ -1,7 +1,7 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch -, pkgconfig +, pkg-config , meson , ninja , zstd @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config ]; buildInputs = [ zstd curl - ] ++ stdenv.lib.optional stdenv.isDarwin argp-standalone; + ] ++ lib.optional stdenv.isDarwin argp-standalone; # Darwin needs a patch for argp-standalone usage and differing endian.h location on macOS # https://github.com/zchunk/zchunk/pull/35 @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { }) ]; - meta = with stdenv.lib; { + meta = with lib; { description = "File format designed for highly efficient deltas while maintaining good compression"; homepage = "https://github.com/zchunk/zchunk"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix index 95f09f59504..039ecc610f4 100644 --- a/pkgs/development/libraries/zeitgeist/default.nix +++ b/pkgs/development/libraries/zeitgeist/default.nix @@ -1,7 +1,7 @@ -{ stdenv +{ lib, stdenv , fetchFromGitLab , fetchpatch -, pkgconfig +, pkg-config , glib , sqlite , gobject-introspection @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { pname = "zeitgeist"; version = "1.0.2"; - outputs = [ "out" "lib" "dev" "man" ] ++ stdenv.lib.optional pythonSupport "py"; + outputs = [ "out" "lib" "dev" "man" ] ++ lib.optional pythonSupport "py"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { autoconf automake libtool - pkgconfig + pkg-config gettext gobject-introspection vala @@ -75,11 +75,11 @@ stdenv.mkDerivation rec { NOCONFIGURE=1 ./autogen.sh ''; - postFixup = stdenv.lib.optionalString pythonSupport '' + postFixup = lib.optionalString pythonSupport '' moveToOutput lib/${python3.libPrefix} "$py" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A service which logs the users’s activities and events"; homepage = "https://zeitgeist.freedesktop.org/"; maintainers = with maintainers; [ lethalman worldofpeace ]; diff --git a/pkgs/development/libraries/zeroc-ice/3.6.nix b/pkgs/development/libraries/zeroc-ice/3.6.nix index 7f6c7323fff..896973e32eb 100644 --- a/pkgs/development/libraries/zeroc-ice/3.6.nix +++ b/pkgs/development/libraries/zeroc-ice/3.6.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { rm -rf $out/share/slice ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.zeroc.com/ice.html"; description = "The internet communications engine"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/zeroc-ice/default.nix b/pkgs/development/libraries/zeroc-ice/default.nix index 2fb36c0aea5..ef16e381bcf 100644 --- a/pkgs/development/libraries/zeroc-ice/default.nix +++ b/pkgs/development/libraries/zeroc-ice/default.nix @@ -63,7 +63,7 @@ in stdenv.mkDerivation rec { mv $out/share/ice $dev/share ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.zeroc.com/ice.html"; description = "The internet communications engine"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix index 7be5a74c3a4..a3c35d123b6 100644 --- a/pkgs/development/libraries/zeromq/4.x.nix +++ b/pkgs/development/libraries/zeromq/4.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, asciidoc, pkg-config, libsodium +{ lib, stdenv, fetchFromGitHub, cmake, asciidoc, pkg-config, libsodium , enableDrafts ? false }: stdenv.mkDerivation rec { @@ -17,9 +17,9 @@ stdenv.mkDerivation rec { doCheck = false; # fails all the tests (ctest) - cmakeFlags = stdenv.lib.optional enableDrafts "-DENABLE_DRAFTS=ON"; + cmakeFlags = lib.optional enableDrafts "-DENABLE_DRAFTS=ON"; - meta = with stdenv.lib; { + meta = with lib; { branch = "4"; homepage = "http://www.zeromq.org"; description = "The Intelligent Transport Layer"; diff --git a/pkgs/development/libraries/zimg/default.nix b/pkgs/development/libraries/zimg/default.nix index afb13a03cbb..56ced97653e 100644 --- a/pkgs/development/libraries/zimg/default.nix +++ b/pkgs/development/libraries/zimg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "zimg"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Scaling, colorspace conversion and dithering library"; homepage = "https://github.com/sekrit-twc/zimg"; license = licenses.wtfpl; diff --git a/pkgs/development/libraries/zimlib/default.nix b/pkgs/development/libraries/zimlib/default.nix index 7f5168080fa..6dc998cd0e2 100644 --- a/pkgs/development/libraries/zimlib/default.nix +++ b/pkgs/development/libraries/zimlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lzma }: +{ lib, stdenv, fetchurl, lzma }: stdenv.mkDerivation rec { pname = "zimlib"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for reading and writing ZIM files"; homepage = "https://www.openzim.org/wiki/Zimlib"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index b780fcda393..da8aac5229b 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , shared ? !stdenv.hostPlatform.isStatic , static ? true @@ -33,9 +33,9 @@ stdenv.mkDerivation (rec { sha256 = "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1"; }; - patches = stdenv.lib.optional stdenv.hostPlatform.isCygwin ./disable-cygwin-widechar.patch; + patches = lib.optional stdenv.hostPlatform.isCygwin ./disable-cygwin-widechar.patch; - postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace configure \ --replace '/usr/bin/libtool' 'ar' \ --replace 'AR="libtool"' 'AR="ar"' \ @@ -43,7 +43,7 @@ stdenv.mkDerivation (rec { ''; outputs = [ "out" "dev" ] - ++ stdenv.lib.optional splitStaticOutput "static"; + ++ lib.optional splitStaticOutput "static"; setOutputFlags = false; outputDoc = "dev"; # single tiny man3 page @@ -60,8 +60,8 @@ stdenv.mkDerivation (rec { # Of these, we choose `--shared`, only because that's # what we did in the past and we can avoid mass rebuilds this way. # As a result, we pass `--static` only when we want just static. - configureFlags = stdenv.lib.optional (static && !shared) "--static" - ++ stdenv.lib.optional shared "--shared"; + configureFlags = lib.optional (static && !shared) "--static" + ++ lib.optional shared "--shared"; # Note we don't need to set `dontDisableStatic`, because static-disabling # works by grepping for `enable-static` in the `./configure` script @@ -71,33 +71,33 @@ stdenv.mkDerivation (rec { # here (in case zlib ever switches to autoconf in the future), # but we don't do it simply to avoid mass rebuilds. - postInstall = stdenv.lib.optionalString splitStaticOutput '' + postInstall = lib.optionalString splitStaticOutput '' moveToOutput lib/libz.a "$static" '' # jww (2015-01-06): Sometimes this library install as a .so, even on # Darwin; others time it installs as a .dylib. I haven't yet figured out # what causes this difference. - + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' for file in $out/lib/*.so* $out/lib/*.dylib* ; do ${stdenv.cc.bintools.targetPrefix}install_name_tool -id "$file" $file done '' # Non-typical naming confuses libtool which then refuses to use zlib's DLL # in some cases, e.g. when compiling libpng. - + stdenv.lib.optionalString (stdenv.hostPlatform.libc == "msvcrt") '' + + lib.optionalString (stdenv.hostPlatform.libc == "msvcrt") '' ln -s zlib1.dll $out/bin/libz.dll ''; # As zlib takes part in the stdenv building, we don't want references # to the bootstrap-tools libgcc (as uses to happen on arm/mips) - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!stdenv.hostPlatform.isDarwin) "-static-libgcc"; + NIX_CFLAGS_COMPILE = lib.optionalString (!stdenv.hostPlatform.isDarwin) "-static-libgcc"; # We don't strip on static cross-compilation because of reports that native # stripping corrupted the target library; see commit 12e960f5 for the report. dontStrip = stdenv.hostPlatform != stdenv.buildPlatform && static; configurePlatforms = []; - installFlags = stdenv.lib.optionals (stdenv.hostPlatform.libc == "msvcrt") [ + installFlags = lib.optionals (stdenv.hostPlatform.libc == "msvcrt") [ "BINARY_PATH=$(out)/bin" "INCLUDE_PATH=$(dev)/include" "LIBRARY_PATH=$(out)/lib" @@ -108,9 +108,9 @@ stdenv.mkDerivation (rec { makeFlags = [ "PREFIX=${stdenv.cc.targetPrefix}" - ] ++ stdenv.lib.optionals (stdenv.hostPlatform.libc == "msvcrt") [ + ] ++ lib.optionals (stdenv.hostPlatform.libc == "msvcrt") [ "-f" "win32/Makefile.gcc" - ] ++ stdenv.lib.optionals shared [ + ] ++ lib.optionals shared [ # Note that as of writing (zlib 1.2.11), this flag only has an effect # for Windows as it is specific to `win32/Makefile.gcc`. "SHARED_MODE=1" @@ -120,16 +120,16 @@ stdenv.mkDerivation (rec { inherit version; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://zlib.net"; description = "Lossless data-compression library"; license = licenses.zlib; platforms = platforms.all; }; -} // stdenv.lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) { +} // lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) { preConfigure = '' export CHOST=${stdenv.hostPlatform.config} ''; -} // stdenv.lib.optionalAttrs (stdenv.hostPlatform.libc == "msvcrt") { +} // lib.optionalAttrs (stdenv.hostPlatform.libc == "msvcrt") { dontConfigure = true; }) diff --git a/pkgs/development/libraries/zlog/default.nix b/pkgs/development/libraries/zlog/default.nix index f0ca99b7667..b115cf7b675 100644 --- a/pkgs/development/libraries/zlog/default.nix +++ b/pkgs/development/libraries/zlog/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { version = "1.2.15"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" ]; - meta = with stdenv.lib; { + meta = with lib; { description= "Reliable, high-performance, thread safe, flexible, clear-model, pure C logging library"; homepage = "https://hardysimpson.github.io/zlog/"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/zmqpp/default.nix b/pkgs/development/libraries/zmqpp/default.nix index 98211e6e3eb..733573b3e23 100644 --- a/pkgs/development/libraries/zmqpp/default.nix +++ b/pkgs/development/libraries/zmqpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, zeromq }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, zeromq }: stdenv.mkDerivation rec { pname = "zmqpp"; @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; propagatedBuildInputs = [ zeromq ]; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "C++ wrapper for czmq. Aims to be minimal, simple and consistent"; license = licenses.lgpl3; diff --git a/pkgs/development/libraries/zookeeper_mt/default.nix b/pkgs/development/libraries/zookeeper_mt/default.nix index ea786d770eb..978321f96e7 100644 --- a/pkgs/development/libraries/zookeeper_mt/default.nix +++ b/pkgs/development/libraries/zookeeper_mt/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , autoreconfHook , jre @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "zookeeper_mt"; - version = stdenv.lib.getVersion zookeeper; + version = lib.getVersion zookeeper; src = fetchurl { url = "mirror://apache/zookeeper/${zookeeper.pname}-${version}/apache-${zookeeper.pname}-${version}.tar.gz"; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { "--without-cppunit" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://zookeeper.apache.org"; description = "Apache Zookeeper"; license = licenses.asl20; diff --git a/pkgs/development/libraries/zxcvbn-c/default.nix b/pkgs/development/libraries/zxcvbn-c/default.nix index 7a524e72318..e74bb9ddc32 100644 --- a/pkgs/development/libraries/zxcvbn-c/default.nix +++ b/pkgs/development/libraries/zxcvbn-c/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "zxcvbn-c"; version = "2.4"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { install -D -t $out/lib libzxcvbn.so* ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/tsyrogit/zxcvbn-c"; description = "A C/C++ implementation of the zxcvbn password strength estimation"; license = licenses.mit; diff --git a/pkgs/development/libraries/zydis/default.nix b/pkgs/development/libraries/zydis/default.nix new file mode 100644 index 00000000000..dd3f4b91631 --- /dev/null +++ b/pkgs/development/libraries/zydis/default.nix @@ -0,0 +1,23 @@ +{ lib, stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "zydis"; + version = "3.1.0"; + + src = fetchFromGitHub { + owner = "zyantific"; + repo = "zydis"; + rev = "bfee99f49274a0eec3ffea16ede3a5bda9cda88f"; + sha256 = "0x2lpc33ynd0zzirdxp2lycvg3545wh1ssgy4qlv81471iwwzv6b"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "Fast and lightweight x86/x86-64 disassembler library"; + license = licenses.mit; + maintainers = [ maintainers.jbcrail ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/zziplib/default.nix b/pkgs/development/libraries/zziplib/default.nix index 228dfdcf77a..8cfec83af54 100644 --- a/pkgs/development/libraries/zziplib/default.nix +++ b/pkgs/development/libraries/zziplib/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , perl , pkg-config , fetchFromGitHub @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { doCheck = false; checkTarget = "check"; - meta = with stdenv.lib; { + meta = with lib; { description = "Library to extract data from files archived in a zip file"; longDescription = '' diff --git a/pkgs/development/lisp-modules/asdf/2.26.nix b/pkgs/development/lisp-modules/asdf/2.26.nix index 2afdf05546f..e2f655a5b6e 100644 --- a/pkgs/development/lisp-modules/asdf/2.26.nix +++ b/pkgs/development/lisp-modules/asdf/2.26.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, texinfo, texLive, perl}: +{lib, stdenv, fetchurl, texinfo, texLive, perl}: let s = # Generated upstream information rec { @@ -31,11 +31,11 @@ stdenv.mkDerivation { cp -r doc/* "$out"/share/doc/asdf/ ln -s "$out"/lib/common-lisp/{asdf/uiop,uiop} ''; - meta = { + meta = with lib; { inherit (s) version; - description = ''Standard software-system definition library for Common Lisp''; - license = stdenv.lib.licenses.mit ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + description = "Standard software-system definition library for Common Lisp"; + license = licenses.mit; + maintainers = [maintainers.raskin]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/lisp-modules/asdf/3.1.nix b/pkgs/development/lisp-modules/asdf/3.1.nix index 445295830b2..7e697d3a637 100644 --- a/pkgs/development/lisp-modules/asdf/3.1.nix +++ b/pkgs/development/lisp-modules/asdf/3.1.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, texinfo, texLive, perl}: +{lib, stdenv, fetchurl, texinfo, texLive, perl}: let s = # Generated upstream information rec { @@ -30,11 +30,11 @@ stdenv.mkDerivation { cp -r doc/* "$out"/share/doc/asdf/ ln -s "$out"/lib/common-lisp/{asdf/uiop,uiop} ''; - meta = { + meta = with lib; { inherit (s) version; - description = ''Standard software-system definition library for Common Lisp''; - license = stdenv.lib.licenses.mit ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; + description = "Standard software-system definition library for Common Lisp"; + license = licenses.mit ; + maintainers = [maintainers.raskin]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/lisp-modules/asdf/default.nix b/pkgs/development/lisp-modules/asdf/default.nix index 2b1b846d319..eecea3f98b6 100644 --- a/pkgs/development/lisp-modules/asdf/default.nix +++ b/pkgs/development/lisp-modules/asdf/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, texinfo, texLive, perl}: +{lib, stdenv, fetchurl, texinfo, texLive, perl}: let s = # Generated upstream information rec { @@ -31,11 +31,11 @@ stdenv.mkDerivation { cp -r doc/* "$out"/share/doc/asdf/ ln -s "$out"/lib/common-lisp/{asdf/uiop,uiop} ''; - meta = { + meta = with lib; { inherit (s) version; - description = ''Standard software-system definition library for Common Lisp''; - license = stdenv.lib.licenses.mit ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; + description = "Standard software-system definition library for Common Lisp"; + license = licenses.mit ; + maintainers = [maintainers.raskin]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/lisp-modules/clwrapper/default.nix b/pkgs/development/lisp-modules/clwrapper/default.nix index 3cb8219e687..69872eb41af 100644 --- a/pkgs/development/lisp-modules/clwrapper/default.nix +++ b/pkgs/development/lisp-modules/clwrapper/default.nix @@ -1,4 +1,4 @@ -{stdenv, asdf, which, bash, lisp ? null}: +{lib, stdenv, asdf, which, bash, lisp ? null}: stdenv.mkDerivation { name = "cl-wrapper-script"; @@ -51,7 +51,7 @@ stdenv.mkDerivation { }; meta = { - description = ''Script used to wrap Common Lisp implementations''; - maintainers = [stdenv.lib.maintainers.raskin]; + description = "Script used to wrap Common Lisp implementations"; + maintainers = [lib.maintainers.raskin]; }; } diff --git a/pkgs/development/lisp-modules/define-package.nix b/pkgs/development/lisp-modules/define-package.nix index 96ceb76f6f2..ca969ab2327 100644 --- a/pkgs/development/lisp-modules/define-package.nix +++ b/pkgs/development/lisp-modules/define-package.nix @@ -1,4 +1,4 @@ -args @ {stdenv, clwrapper, baseName, packageName ? baseName +args @ {lib, stdenv, clwrapper, baseName, packageName ? baseName , parasites ? [] , buildSystems ? ([packageName] ++ parasites) , version ? "latest" @@ -89,7 +89,7 @@ basePackage = { env -i \ NIX_LISP="$NIX_LISP" \ NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(progn - ${stdenv.lib.concatMapStrings (system: '' + ${lib.concatMapStrings (system: '' (asdf:compile-system :${system}) (asdf:load-system :${system}) (asdf:operate (quote asdf::compile-bundle-op) :${system}) diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix index f8338e48e19..831edcaee27 100644 --- a/pkgs/development/lisp-modules/lisp-packages.nix +++ b/pkgs/development/lisp-modules/lisp-packages.nix @@ -1,6 +1,6 @@ -{stdenv, clwrapper, pkgs, sbcl, coreutils, nix, asdf}: +{lib, stdenv, clwrapper, pkgs, sbcl, coreutils, nix, asdf}: let lispPackages = rec { - inherit pkgs clwrapper stdenv; + inherit lib pkgs clwrapper stdenv; nixLib = pkgs.lib; callPackage = nixLib.callPackageWith lispPackages; @@ -27,7 +27,7 @@ let lispPackages = rec { url = "https://beta.quicklisp.org/dist/quicklisp/2020-10-16/distinfo.txt"; sha256 = "sha256:090xjcnyqcv8az9n1a7m0f6vzz2nwcncy95ha7ixb7fnd2rj1n65"; }; - buildPhase = '' true; ''; + buildPhase = "true; "; postInstall = '' substituteAll ${./quicklisp.sh} "$out"/bin/quicklisp chmod a+x "$out"/bin/quicklisp @@ -80,19 +80,19 @@ let lispPackages = rec { clx-truetype = buildLispPackage rec { baseName = "clx-truetype"; - version = ''20160825-git''; + version = "20160825-git"; buildSystems = [ "clx-truetype" ]; parasites = [ "clx-truetype-test" ]; - description = ''clx-truetype is pure common lisp solution for antialiased TrueType font rendering using CLX and XRender extension.''; + description = "clx-truetype is pure common lisp solution for antialiased TrueType font rendering using CLX and XRender extension."; deps = with pkgs.lispPackages; [ alexandria bordeaux-threads cl-aa cl-fad cl-paths cl-paths-ttf cl-store cl-vectors clx trivial-features zpb-ttf ]; src = pkgs.fetchurl { - url = ''http://beta.quicklisp.org/archive/clx-truetype/2016-08-25/clx-truetype-20160825-git.tgz''; - sha256 = ''0ndy067rg9w6636gxwlpnw7f3ck9nrnjb03444pprik9r3c9in67''; + url = "http://beta.quicklisp.org/archive/clx-truetype/2016-08-25/clx-truetype-20160825-git.tgz"; + sha256 = "0ndy067rg9w6636gxwlpnw7f3ck9nrnjb03444pprik9r3c9in67"; }; packageName = "clx-truetype"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd-ext-code-blocks.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd-ext-code-blocks.nix index 6c08e0e1c95..70de895a586 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd-ext-code-blocks.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd-ext-code-blocks.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''_3bmd-ext-code-blocks''; - version = ''3bmd-20200925-git''; + baseName = "_3bmd-ext-code-blocks"; + version = "3bmd-20200925-git"; - description = ''extension to 3bmd implementing github style ``` delimited code blocks, with support for syntax highlighting using colorize, pygments, or chroma''; + description = "extension to 3bmd implementing github style ``` delimited code blocks, with support for syntax highlighting using colorize, pygments, or chroma"; deps = [ args."_3bmd" args."alexandria" args."colorize" args."esrap" args."html-encode" args."split-sequence" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/3bmd/2020-09-25/3bmd-20200925-git.tgz''; - sha256 = ''0sk4b0xma4vv6ssiskbz7h5bw8v8glm34mbv3llqywb50b9ks4fw''; + url = "http://beta.quicklisp.org/archive/3bmd/2020-09-25/3bmd-20200925-git.tgz"; + sha256 = "0sk4b0xma4vv6ssiskbz7h5bw8v8glm34mbv3llqywb50b9ks4fw"; }; packageName = "3bmd-ext-code-blocks"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix index dd1959893fd..b49b183b24c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''_3bmd''; - version = ''20200925-git''; + baseName = "_3bmd"; + version = "20200925-git"; - description = ''markdown processor in CL using esrap parser.''; + description = "markdown processor in CL using esrap parser."; deps = [ args."alexandria" args."esrap" args."split-sequence" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/3bmd/2020-09-25/3bmd-20200925-git.tgz''; - sha256 = ''0sk4b0xma4vv6ssiskbz7h5bw8v8glm34mbv3llqywb50b9ks4fw''; + url = "http://beta.quicklisp.org/archive/3bmd/2020-09-25/3bmd-20200925-git.tgz"; + sha256 = "0sk4b0xma4vv6ssiskbz7h5bw8v8glm34mbv3llqywb50b9ks4fw"; }; packageName = "3bmd"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/access.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/access.nix index deb0c7f89cb..d4f68526f18 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/access.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/access.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { - baseName = ''access''; - version = ''20151218-git''; + baseName = "access"; + version = "20151218-git"; parasites = [ "access-test" ]; @@ -11,8 +11,8 @@ rec { deps = [ args."alexandria" args."anaphora" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."flexi-streams" args."iterate" args."lisp-unit2" args."named-readtables" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/access/2015-12-18/access-20151218-git.tgz''; - sha256 = ''0f4257cxd1rpp46wm2qbnk0ynlc3dli9ib4qbn45hglh8zy7snfl''; + url = "http://beta.quicklisp.org/archive/access/2015-12-18/access-20151218-git.tgz"; + sha256 = "0f4257cxd1rpp46wm2qbnk0ynlc3dli9ib4qbn45hglh8zy7snfl"; }; packageName = "access"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/acclimation.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/acclimation.nix index f93506505a1..69d28a65c14 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/acclimation.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/acclimation.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''acclimation''; - version = ''20200925-git''; + baseName = "acclimation"; + version = "20200925-git"; - description = ''Library supporting internationalization''; + description = "Library supporting internationalization"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/acclimation/2020-09-25/acclimation-20200925-git.tgz''; - sha256 = ''11vw1h5zxicj5qxb1smiyjxafw8xk0isnzcf5g0lqis3y9ssqxbw''; + url = "http://beta.quicklisp.org/archive/acclimation/2020-09-25/acclimation-20200925-git.tgz"; + sha256 = "11vw1h5zxicj5qxb1smiyjxafw8xk0isnzcf5g0lqis3y9ssqxbw"; }; packageName = "acclimation"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix index 7f257bc4baf..f1eaf587426 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''alexandria''; - version = ''20200925-git''; + baseName = "alexandria"; + version = "20200925-git"; - description = ''Alexandria is a collection of portable public domain utilities.''; + description = "Alexandria is a collection of portable public domain utilities."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/alexandria/2020-09-25/alexandria-20200925-git.tgz''; - sha256 = ''1cpvnzfs807ah07hrk8kplim6ryzqs4r35ym03cpky5xdl8c89fl''; + url = "http://beta.quicklisp.org/archive/alexandria/2020-09-25/alexandria-20200925-git.tgz"; + sha256 = "1cpvnzfs807ah07hrk8kplim6ryzqs4r35ym03cpky5xdl8c89fl"; }; packageName = "alexandria"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix index 9af6ed36980..1d5e3a5997a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''anaphora''; - version = ''20191007-git''; + baseName = "anaphora"; + version = "20191007-git"; parasites = [ "anaphora/test" ]; - description = ''The Anaphoric Macro Package from Hell''; + description = "The Anaphoric Macro Package from Hell"; deps = [ args."rt" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/anaphora/2019-10-07/anaphora-20191007-git.tgz''; - sha256 = ''0iwfddh3cycjr9vhjnr1ldd5xc3qwqhrp41904s1dvysf99277kv''; + url = "http://beta.quicklisp.org/archive/anaphora/2019-10-07/anaphora-20191007-git.tgz"; + sha256 = "0iwfddh3cycjr9vhjnr1ldd5xc3qwqhrp41904s1dvysf99277kv"; }; packageName = "anaphora"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/arnesi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/arnesi.nix index 97ae196c0f5..5ac59f713e9 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/arnesi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/arnesi.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''arnesi''; - version = ''20170403-git''; + baseName = "arnesi"; + version = "20170403-git"; parasites = [ "arnesi/cl-ppcre-extras" "arnesi/slime-extras" ]; - description = ''A bag-of-tools utilities library used to aid in implementing the bese.it toolkit''; + description = "A bag-of-tools utilities library used to aid in implementing the bese.it toolkit"; deps = [ args."alexandria" args."cl-ppcre" args."closer-mop" args."collectors" args."iterate" args."swank" args."symbol-munger" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/arnesi/2017-04-03/arnesi-20170403-git.tgz''; - sha256 = ''01kirjpgv5pgbcdxjrnw3ld4jw7wrqm3rgqnxwac4gxaphr2s6q4''; + url = "http://beta.quicklisp.org/archive/arnesi/2017-04-03/arnesi-20170403-git.tgz"; + sha256 = "01kirjpgv5pgbcdxjrnw3ld4jw7wrqm3rgqnxwac4gxaphr2s6q4"; }; packageName = "arnesi"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix index efa5dc6e769..07aca0eb9df 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''array-utils''; - version = ''20190710-git''; + baseName = "array-utils"; + version = "20190710-git"; - description = ''A few utilities for working with arrays.''; + description = "A few utilities for working with arrays."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/array-utils/2019-07-10/array-utils-20190710-git.tgz''; - sha256 = ''1fzsg3lqa79yrkad6fx924vai7i6m92i2rq8lyq37wrbwkhm7grh''; + url = "http://beta.quicklisp.org/archive/array-utils/2019-07-10/array-utils-20190710-git.tgz"; + sha256 = "1fzsg3lqa79yrkad6fx924vai7i6m92i2rq8lyq37wrbwkhm7grh"; }; packageName = "array-utils"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-package-system.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-package-system.nix index 1a56676f036..b0fa6289936 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-package-system.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-package-system.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''asdf-package-system''; - version = ''20150608-git''; + baseName = "asdf-package-system"; + version = "20150608-git"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/asdf-package-system/2015-06-08/asdf-package-system-20150608-git.tgz''; - sha256 = ''17lfwfc15hcag8a2jsaxkx42wmz2mwkvxf6vb2h9cim7dwsnyy29''; + url = "http://beta.quicklisp.org/archive/asdf-package-system/2015-06-08/asdf-package-system-20150608-git.tgz"; + sha256 = "17lfwfc15hcag8a2jsaxkx42wmz2mwkvxf6vb2h9cim7dwsnyy29"; }; packageName = "asdf-package-system"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix index 65df45d95a5..7133bf25770 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''asdf-system-connections''; - version = ''20170124-git''; + baseName = "asdf-system-connections"; + version = "20170124-git"; - description = ''Allows for ASDF system to be connected so that auto-loading may occur.''; + description = "Allows for ASDF system to be connected so that auto-loading may occur."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/asdf-system-connections/2017-01-24/asdf-system-connections-20170124-git.tgz''; - sha256 = ''0h8237bq3niw6glcsps77n1ykcmc5bjkcrbjyxjgkmcb1c5kwwpq''; + url = "http://beta.quicklisp.org/archive/asdf-system-connections/2017-01-24/asdf-system-connections-20170124-git.tgz"; + sha256 = "0h8237bq3niw6glcsps77n1ykcmc5bjkcrbjyxjgkmcb1c5kwwpq"; }; packageName = "asdf-system-connections"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix index 5a362fc1f03..1c99fc6944e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''babel''; - version = ''20200925-git''; + baseName = "babel"; + version = "20200925-git"; - description = ''Babel, a charset conversion library.''; + description = "Babel, a charset conversion library."; deps = [ args."alexandria" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/babel/2020-09-25/babel-20200925-git.tgz''; - sha256 = ''1hpjm2whw7zla9igzj50y3nibii0mfg2a6y6nslaf5vpkni88jfi''; + url = "http://beta.quicklisp.org/archive/babel/2020-09-25/babel-20200925-git.tgz"; + sha256 = "1hpjm2whw7zla9igzj50y3nibii0mfg2a6y6nslaf5vpkni88jfi"; }; packageName = "babel"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix index a660882f36b..15100222894 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''blackbird''; - version = ''20160531-git''; + baseName = "blackbird"; + version = "20160531-git"; - description = ''A promise implementation for Common Lisp.''; + description = "A promise implementation for Common Lisp."; deps = [ args."vom" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/blackbird/2016-05-31/blackbird-20160531-git.tgz''; - sha256 = ''0l053fb5fdz1q6dyfgys6nmbairc3aig4wjl5abpf8b1paf7gzq9''; + url = "http://beta.quicklisp.org/archive/blackbird/2016-05-31/blackbird-20160531-git.tgz"; + sha256 = "0l053fb5fdz1q6dyfgys6nmbairc3aig4wjl5abpf8b1paf7gzq9"; }; packageName = "blackbird"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix index cef514715e0..b8c225174a8 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''bordeaux-threads''; - version = ''v0.8.8''; + baseName = "bordeaux-threads"; + version = "v0.8.8"; parasites = [ "bordeaux-threads/test" ]; - description = ''Bordeaux Threads makes writing portable multi-threaded apps simple.''; + description = "Bordeaux Threads makes writing portable multi-threaded apps simple."; deps = [ args."alexandria" args."fiveam" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/bordeaux-threads/2020-06-10/bordeaux-threads-v0.8.8.tgz''; - sha256 = ''1ppb7lvr796k1j4hi0jnp717v9zxy6vq4f5cyzgn7svg1ic6l0pp''; + url = "http://beta.quicklisp.org/archive/bordeaux-threads/2020-06-10/bordeaux-threads-v0.8.8.tgz"; + sha256 = "1ppb7lvr796k1j4hi0jnp717v9zxy6vq4f5cyzgn7svg1ic6l0pp"; }; packageName = "bordeaux-threads"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix index 5d7f3f2dd10..18d22d1cf32 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''buildnode-xhtml''; - version = ''buildnode-20170403-git''; + baseName = "buildnode-xhtml"; + version = "buildnode-20170403-git"; - description = ''Tool for building up an xml dom of an excel spreadsheet nicely.''; + description = "Tool for building up an xml dom of an excel spreadsheet nicely."; deps = [ args."alexandria" args."babel" args."buildnode" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."flexi-streams" args."iterate" args."named-readtables" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz''; - sha256 = ''1gb3zsp4g31iscvvhvb99z0i7lfn1g3493q6sgpr46fmn2vdwwb6''; + url = "http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz"; + sha256 = "1gb3zsp4g31iscvvhvb99z0i7lfn1g3493q6sgpr46fmn2vdwwb6"; }; packageName = "buildnode-xhtml"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix index 0a2e56a9c9b..b3a281ed3a0 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''buildnode''; - version = ''20170403-git''; + baseName = "buildnode"; + version = "20170403-git"; parasites = [ "buildnode-test" ]; - description = ''Tool for building up an xml dom nicely.''; + description = "Tool for building up an xml dom nicely."; deps = [ args."alexandria" args."babel" args."buildnode-xhtml" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."flexi-streams" args."iterate" args."lisp-unit2" args."named-readtables" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz''; - sha256 = ''1gb3zsp4g31iscvvhvb99z0i7lfn1g3493q6sgpr46fmn2vdwwb6''; + url = "http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz"; + sha256 = "1gb3zsp4g31iscvvhvb99z0i7lfn1g3493q6sgpr46fmn2vdwwb6"; }; packageName = "buildnode"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix index c90021bbeec..3b44cbbb971 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''caveman''; - version = ''20200325-git''; + baseName = "caveman"; + version = "20200325-git"; - description = ''Web Application Framework for Common Lisp''; + description = "Web Application Framework for Common Lisp"; deps = [ args."alexandria" args."anaphora" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."circular-streams" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-colors2" args."cl-cookie" args."cl-emb" args."cl-fad" args."cl-ppcre" args."cl-project" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."clack-test" args."clack-v1-compat" args."dexador" args."dissect" args."do-urlencode" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."map-set" args."marshal" args."md5" args."myway" args."named-readtables" args."proc-parse" args."prove" args."quri" args."rfc2388" args."rove" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."usocket" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/caveman/2020-03-25/caveman-20200325-git.tgz''; - sha256 = ''0s134lamlyll4ad0380rj0hkiy9gakly7cb6sjr1yg2yd6ydz1py''; + url = "http://beta.quicklisp.org/archive/caveman/2020-03-25/caveman-20200325-git.tgz"; + sha256 = "0s134lamlyll4ad0380rj0hkiy9gakly7cb6sjr1yg2yd6ydz1py"; }; packageName = "caveman"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix index e4d6546e901..97328db2543 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cffi-grovel''; - version = ''cffi_0.23.0''; + baseName = "cffi-grovel"; + version = "cffi_0.23.0"; - description = ''The CFFI Groveller''; + description = "The CFFI Groveller"; deps = [ args."alexandria" args."babel" args."cffi" args."cffi-toolchain" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz''; - sha256 = ''1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck''; + url = "http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz"; + sha256 = "1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck"; }; packageName = "cffi-grovel"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix index ad5ecb7acc8..51fe6a00f1f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cffi-toolchain''; - version = ''cffi_0.23.0''; + baseName = "cffi-toolchain"; + version = "cffi_0.23.0"; - description = ''The CFFI toolchain''; + description = "The CFFI toolchain"; deps = [ args."alexandria" args."babel" args."cffi" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz''; - sha256 = ''1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck''; + url = "http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz"; + sha256 = "1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck"; }; packageName = "cffi-toolchain"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix index e234301f1fe..a56fbf6b265 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''cffi''; - version = ''cffi_0.23.0''; + baseName = "cffi"; + version = "cffi_0.23.0"; parasites = [ "cffi/c2ffi" "cffi/c2ffi-generator" ]; - description = ''The Common Foreign Function Interface''; + description = "The Common Foreign Function Interface"; deps = [ args."alexandria" args."babel" args."cl-json" args."cl-ppcre" args."trivial-features" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz''; - sha256 = ''1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck''; + url = "http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz"; + sha256 = "1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck"; }; packageName = "cffi"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chanl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chanl.nix index b0dea4fbd22..3b9e089b313 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chanl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chanl.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''chanl''; - version = ''20201016-git''; + baseName = "chanl"; + version = "20201016-git"; parasites = [ "chanl/examples" "chanl/tests" ]; - description = ''Communicating Sequential Process support for Common Lisp''; + description = "Communicating Sequential Process support for Common Lisp"; deps = [ args."alexandria" args."bordeaux-threads" args."fiveam" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/chanl/2020-10-16/chanl-20201016-git.tgz''; - sha256 = ''13kmk6q20kkwy8z3fy0sv57076xf5nls3qx31yp47vaxhn9p11a1''; + url = "http://beta.quicklisp.org/archive/chanl/2020-10-16/chanl-20201016-git.tgz"; + sha256 = "13kmk6q20kkwy8z3fy0sv57076xf5nls3qx31yp47vaxhn9p11a1"; }; packageName = "chanl"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix index c30c68e53c8..3c05684de53 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''chipz''; - version = ''20190202-git''; + baseName = "chipz"; + version = "20190202-git"; - description = ''A library for decompressing deflate, zlib, and gzip data''; + description = "A library for decompressing deflate, zlib, and gzip data"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/chipz/2019-02-02/chipz-20190202-git.tgz''; - sha256 = ''1vk8nml2kvkpwydcnm49gz2j9flvl8676kbvci5qa7qm286dhn5a''; + url = "http://beta.quicklisp.org/archive/chipz/2019-02-02/chipz-20190202-git.tgz"; + sha256 = "1vk8nml2kvkpwydcnm49gz2j9flvl8676kbvci5qa7qm286dhn5a"; }; packageName = "chipz"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix index 644daa8af92..e08a2efe96e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''chunga''; - version = ''20200427-git''; + baseName = "chunga"; + version = "20200427-git"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/chunga/2020-04-27/chunga-20200427-git.tgz''; - sha256 = ''0p6dlnan6raincd682brcjbklyvmkfkhz0yzp2bkfw67s9615bkk''; + url = "http://beta.quicklisp.org/archive/chunga/2020-04-27/chunga-20200427-git.tgz"; + sha256 = "0p6dlnan6raincd682brcjbklyvmkfkhz0yzp2bkfw67s9615bkk"; }; packageName = "chunga"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix index 2e387d29833..f0b211d27d2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''circular-streams''; - version = ''20161204-git''; + baseName = "circular-streams"; + version = "20161204-git"; - description = ''Circularly readable streams for Common Lisp''; + description = "Circularly readable streams for Common Lisp"; deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/circular-streams/2016-12-04/circular-streams-20161204-git.tgz''; - sha256 = ''1i29b9sciqs5x59hlkdj2r4siyqgrwj5hb4lnc80jgfqvzbq4128''; + url = "http://beta.quicklisp.org/archive/circular-streams/2016-12-04/circular-streams-20161204-git.tgz"; + sha256 = "1i29b9sciqs5x59hlkdj2r4siyqgrwj5hb4lnc80jgfqvzbq4128"; }; packageName = "circular-streams"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix index 531d429df24..8f1448e436b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-aa''; - version = ''cl-vectors-20180228-git''; + baseName = "cl-aa"; + version = "cl-vectors-20180228-git"; - description = ''cl-aa: polygon rasterizer''; + description = "cl-aa: polygon rasterizer"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz''; - sha256 = ''0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly''; + url = "http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz"; + sha256 = "0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly"; }; packageName = "cl-aa"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix index 5f93167a114..c85c60a0f1d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-annot''; - version = ''20150608-git''; + baseName = "cl-annot"; + version = "20150608-git"; - description = ''Python-like Annotation Syntax for Common Lisp''; + description = "Python-like Annotation Syntax for Common Lisp"; deps = [ args."alexandria" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-annot/2015-06-08/cl-annot-20150608-git.tgz''; - sha256 = ''0ixsp20rk498phv3iivipn3qbw7a7x260x63hc6kpv2s746lpdg3''; + url = "http://beta.quicklisp.org/archive/cl-annot/2015-06-08/cl-annot-20150608-git.tgz"; + sha256 = "0ixsp20rk498phv3iivipn3qbw7a7x260x63hc6kpv2s746lpdg3"; }; packageName = "cl-annot"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix index a413743eb8d..2ae0f7d36de 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-anonfun''; - version = ''20111203-git''; + baseName = "cl-anonfun"; + version = "20111203-git"; - description = ''Anonymous function helpers for Common Lisp''; + description = "Anonymous function helpers for Common Lisp"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-anonfun/2011-12-03/cl-anonfun-20111203-git.tgz''; - sha256 = ''16r3v3yba41smkqpz0qvzabkxashl39klfb6vxhzbly696x87p1m''; + url = "http://beta.quicklisp.org/archive/cl-anonfun/2011-12-03/cl-anonfun-20111203-git.tgz"; + sha256 = "16r3v3yba41smkqpz0qvzabkxashl39klfb6vxhzbly696x87p1m"; }; packageName = "cl-anonfun"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix index 33f696f3616..dd6eeba98af 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-ansi-text''; - version = ''20200218-git''; + baseName = "cl-ansi-text"; + version = "20200218-git"; - description = ''ANSI control string characters, focused on color''; + description = "ANSI control string characters, focused on color"; deps = [ args."alexandria" args."cl-colors2" args."cl-ppcre" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-ansi-text/2020-02-18/cl-ansi-text-20200218-git.tgz''; - sha256 = ''1yn657rka3pcg3p5g9czbpk0f0rv81dbq1gknid1b24zg7krks5r''; + url = "http://beta.quicklisp.org/archive/cl-ansi-text/2020-02-18/cl-ansi-text-20200218-git.tgz"; + sha256 = "1yn657rka3pcg3p5g9czbpk0f0rv81dbq1gknid1b24zg7krks5r"; }; packageName = "cl-ansi-text"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix index 83d32317b5b..5a5a8b362fc 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-async-repl''; - version = ''cl-async-20200610-git''; + baseName = "cl-async-repl"; + version = "cl-async-20200610-git"; - description = ''REPL integration for CL-ASYNC.''; + description = "REPL integration for CL-ASYNC."; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-async" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-async/2020-06-10/cl-async-20200610-git.tgz''; - sha256 = ''10fyd36i5zlnxh69y1l7098b3h94l4hqwl0zhv0nshcs4sa7l37h''; + url = "http://beta.quicklisp.org/archive/cl-async/2020-06-10/cl-async-20200610-git.tgz"; + sha256 = "10fyd36i5zlnxh69y1l7098b3h94l4hqwl0zhv0nshcs4sa7l37h"; }; packageName = "cl-async-repl"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix index 606a4ffc213..93de96b5ea6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-async-ssl''; - version = ''cl-async-20200610-git''; + baseName = "cl-async-ssl"; + version = "cl-async-20200610-git"; - description = ''SSL Wrapper around cl-async socket implementation.''; + description = "SSL Wrapper around cl-async socket implementation."; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-async" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-async/2020-06-10/cl-async-20200610-git.tgz''; - sha256 = ''10fyd36i5zlnxh69y1l7098b3h94l4hqwl0zhv0nshcs4sa7l37h''; + url = "http://beta.quicklisp.org/archive/cl-async/2020-06-10/cl-async-20200610-git.tgz"; + sha256 = "10fyd36i5zlnxh69y1l7098b3h94l4hqwl0zhv0nshcs4sa7l37h"; }; packageName = "cl-async-ssl"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix index f2ad6b509d0..ce188aeee1a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-async''; - version = ''20200610-git''; + baseName = "cl-async"; + version = "20200610-git"; parasites = [ "cl-async-base" "cl-async-util" ]; - description = ''Asynchronous operations for Common Lisp.''; + description = "Asynchronous operations for Common Lisp."; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."uiop" args."vom" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-async/2020-06-10/cl-async-20200610-git.tgz''; - sha256 = ''10fyd36i5zlnxh69y1l7098b3h94l4hqwl0zhv0nshcs4sa7l37h''; + url = "http://beta.quicklisp.org/archive/cl-async/2020-06-10/cl-async-20200610-git.tgz"; + sha256 = "10fyd36i5zlnxh69y1l7098b3h94l4hqwl0zhv0nshcs4sa7l37h"; }; packageName = "cl-async"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix index 15843d1c2fe..37a0fa0c32f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-base64''; - version = ''20201016-git''; + baseName = "cl-base64"; + version = "20201016-git"; parasites = [ "cl-base64/test" ]; - description = ''Base64 encoding and decoding with URI support.''; + description = "Base64 encoding and decoding with URI support."; deps = [ args."kmrcl" args."ptester" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-base64/2020-10-16/cl-base64-20201016-git.tgz''; - sha256 = ''1wd2sgvfrivrbzlhs1vgj762jqz7sk171ssli6gl1kfwbnphzx9z''; + url = "http://beta.quicklisp.org/archive/cl-base64/2020-10-16/cl-base64-20201016-git.tgz"; + sha256 = "1wd2sgvfrivrbzlhs1vgj762jqz7sk171ssli6gl1kfwbnphzx9z"; }; packageName = "cl-base64"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-cairo.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-cairo.nix index d240e3e842d..be751aa0e12 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-cairo.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-cairo.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-cffi-gtk-cairo''; - version = ''cl-cffi-gtk-20201016-git''; + baseName = "cl-cffi-gtk-cairo"; + version = "cl-cffi-gtk-20201016-git"; - description = ''A Lisp binding to Cairo''; + description = "A Lisp binding to Cairo"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk-glib" args."iterate" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz''; - sha256 = ''1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55''; + url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz"; + sha256 = "1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55"; }; packageName = "cl-cffi-gtk-cairo"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gdk-pixbuf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gdk-pixbuf.nix index 0c2d3abc282..a331c048fdb 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gdk-pixbuf.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gdk-pixbuf.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-cffi-gtk-gdk-pixbuf''; - version = ''cl-cffi-gtk-20201016-git''; + baseName = "cl-cffi-gtk-gdk-pixbuf"; + version = "cl-cffi-gtk-20201016-git"; - description = ''A Lisp binding to GDK Pixbuf 2''; + description = "A Lisp binding to GDK Pixbuf 2"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk-glib" args."cl-cffi-gtk-gobject" args."closer-mop" args."iterate" args."trivial-features" args."trivial-garbage" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz''; - sha256 = ''1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55''; + url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz"; + sha256 = "1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55"; }; packageName = "cl-cffi-gtk-gdk-pixbuf"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gdk.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gdk.nix index 748cc9a0d6c..02140a47a33 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gdk.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gdk.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-cffi-gtk-gdk''; - version = ''cl-cffi-gtk-20201016-git''; + baseName = "cl-cffi-gtk-gdk"; + version = "cl-cffi-gtk-20201016-git"; - description = ''A Lisp binding to GDK 3''; + description = "A Lisp binding to GDK 3"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk-cairo" args."cl-cffi-gtk-gdk-pixbuf" args."cl-cffi-gtk-gio" args."cl-cffi-gtk-glib" args."cl-cffi-gtk-gobject" args."cl-cffi-gtk-pango" args."closer-mop" args."iterate" args."trivial-features" args."trivial-garbage" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz''; - sha256 = ''1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55''; + url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz"; + sha256 = "1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55"; }; packageName = "cl-cffi-gtk-gdk"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gio.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gio.nix index af53a594587..920fc4edecc 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gio.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gio.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-cffi-gtk-gio''; - version = ''cl-cffi-gtk-20201016-git''; + baseName = "cl-cffi-gtk-gio"; + version = "cl-cffi-gtk-20201016-git"; - description = ''A Lisp binding to GIO 2''; + description = "A Lisp binding to GIO 2"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk-glib" args."cl-cffi-gtk-gobject" args."closer-mop" args."iterate" args."trivial-features" args."trivial-garbage" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz''; - sha256 = ''1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55''; + url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz"; + sha256 = "1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55"; }; packageName = "cl-cffi-gtk-gio"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-glib.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-glib.nix index 4ad75bf507a..429dfb7889b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-glib.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-glib.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-cffi-gtk-glib''; - version = ''cl-cffi-gtk-20201016-git''; + baseName = "cl-cffi-gtk-glib"; + version = "cl-cffi-gtk-20201016-git"; - description = ''A Lisp binding to GLib 2''; + description = "A Lisp binding to GLib 2"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."iterate" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz''; - sha256 = ''1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55''; + url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz"; + sha256 = "1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55"; }; packageName = "cl-cffi-gtk-glib"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gobject.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gobject.nix index c2e2deef003..d2f7f2e164f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gobject.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gobject.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-cffi-gtk-gobject''; - version = ''cl-cffi-gtk-20201016-git''; + baseName = "cl-cffi-gtk-gobject"; + version = "cl-cffi-gtk-20201016-git"; - description = ''A Lisp binding GObject 2''; + description = "A Lisp binding GObject 2"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk-glib" args."closer-mop" args."iterate" args."trivial-features" args."trivial-garbage" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz''; - sha256 = ''1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55''; + url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz"; + sha256 = "1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55"; }; packageName = "cl-cffi-gtk-gobject"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-pango.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-pango.nix index 896528cf166..72b3ad647c7 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-pango.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-pango.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-cffi-gtk-pango''; - version = ''cl-cffi-gtk-20201016-git''; + baseName = "cl-cffi-gtk-pango"; + version = "cl-cffi-gtk-20201016-git"; - description = ''A Lisp binding to Pango''; + description = "A Lisp binding to Pango"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk-cairo" args."cl-cffi-gtk-glib" args."cl-cffi-gtk-gobject" args."closer-mop" args."iterate" args."trivial-features" args."trivial-garbage" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz''; - sha256 = ''1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55''; + url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz"; + sha256 = "1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55"; }; packageName = "cl-cffi-gtk-pango"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk.nix index 7055aec5121..98256cc740d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-cffi-gtk''; - version = ''20201016-git''; + baseName = "cl-cffi-gtk"; + version = "20201016-git"; - description = ''A Lisp binding to GTK 3''; + description = "A Lisp binding to GTK 3"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk-cairo" args."cl-cffi-gtk-gdk" args."cl-cffi-gtk-gdk-pixbuf" args."cl-cffi-gtk-gio" args."cl-cffi-gtk-glib" args."cl-cffi-gtk-gobject" args."cl-cffi-gtk-pango" args."closer-mop" args."iterate" args."trivial-features" args."trivial-garbage" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz''; - sha256 = ''1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55''; + url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz"; + sha256 = "1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55"; }; packageName = "cl-cffi-gtk"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-change-case.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-change-case.nix index 158158fefad..ce74ce967e2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-change-case.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-change-case.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-change-case''; - version = ''20191007-git''; + baseName = "cl-change-case"; + version = "20191007-git"; - description = ''Convert strings between camelCase, param-case, PascalCase and more''; + description = "Convert strings between camelCase, param-case, PascalCase and more"; deps = [ args."cl-ppcre" args."cl-ppcre-unicode" args."cl-unicode" args."flexi-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-change-case/2019-10-07/cl-change-case-20191007-git.tgz''; - sha256 = ''097n7bzlsryqh6gbwn3nzi9qdw4jhck4vn3qw41zpc496xfgz9y1''; + url = "http://beta.quicklisp.org/archive/cl-change-case/2019-10-07/cl-change-case-20191007-git.tgz"; + sha256 = "097n7bzlsryqh6gbwn3nzi9qdw4jhck4vn3qw41zpc496xfgz9y1"; }; packageName = "cl-change-case"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix index 36641b73b75..cbc4deba6b5 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-cli''; - version = ''20151218-git''; + baseName = "cl-cli"; + version = "20151218-git"; - description = ''Command line parser''; + description = "Command line parser"; deps = [ args."split-sequence" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-cli/2015-12-18/cl-cli-20151218-git.tgz''; - sha256 = ''0d097wjprljghkai1yacvjqmjm1mwpa46yxbacjnwps8pqwh18ay''; + url = "http://beta.quicklisp.org/archive/cl-cli/2015-12-18/cl-cli-20151218-git.tgz"; + sha256 = "0d097wjprljghkai1yacvjqmjm1mwpa46yxbacjnwps8pqwh18ay"; }; packageName = "cl-cli"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix index 0d0337a65ce..8882b1473c2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-colors''; - version = ''20180328-git''; + baseName = "cl-colors"; + version = "20180328-git"; parasites = [ "cl-colors-tests" ]; - description = ''Simple color library for Common Lisp''; + description = "Simple color library for Common Lisp"; deps = [ args."alexandria" args."anaphora" args."let-plus" args."lift" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-colors/2018-03-28/cl-colors-20180328-git.tgz''; - sha256 = ''0anrb3zsi03dixfsjz92y06w93kpn0d0c5142fhx72f5kafwvc4a''; + url = "http://beta.quicklisp.org/archive/cl-colors/2018-03-28/cl-colors-20180328-git.tgz"; + sha256 = "0anrb3zsi03dixfsjz92y06w93kpn0d0c5142fhx72f5kafwvc4a"; }; packageName = "cl-colors"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors2.nix index 519f43ff324..3432660cffd 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors2.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors2.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-colors2''; - version = ''20200218-git''; + baseName = "cl-colors2"; + version = "20200218-git"; parasites = [ "cl-colors2/tests" ]; - description = ''Simple color library for Common Lisp''; + description = "Simple color library for Common Lisp"; deps = [ args."alexandria" args."cl-ppcre" args."clunit2" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-colors2/2020-02-18/cl-colors2-20200218-git.tgz''; - sha256 = ''0rpf8j232qv254zhkvkz3ja20al1kswvcqhvvv0r2ag6dks56j29''; + url = "http://beta.quicklisp.org/archive/cl-colors2/2020-02-18/cl-colors2-20200218-git.tgz"; + sha256 = "0rpf8j232qv254zhkvkz3ja20al1kswvcqhvvv0r2ag6dks56j29"; }; packageName = "cl-colors2"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix index bd0483b4524..c8dc5ca9a99 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-containers''; - version = ''20200427-git''; + baseName = "cl-containers"; + version = "20200427-git"; parasites = [ "cl-containers/with-moptilities" "cl-containers/with-utilities" ]; - description = ''A generic container library for Common Lisp''; + description = "A generic container library for Common Lisp"; deps = [ args."asdf-system-connections" args."metatilities-base" args."moptilities" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-containers/2020-04-27/cl-containers-20200427-git.tgz''; - sha256 = ''0llaymnlss0dhwyqgr2s38w1hjb2as1x1nn57qcvdphnm7qs50fy''; + url = "http://beta.quicklisp.org/archive/cl-containers/2020-04-27/cl-containers-20200427-git.tgz"; + sha256 = "0llaymnlss0dhwyqgr2s38w1hjb2as1x1nn57qcvdphnm7qs50fy"; }; packageName = "cl-containers"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix index ddc3611d50d..f35d40fb41c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-cookie''; - version = ''20191007-git''; + baseName = "cl-cookie"; + version = "20191007-git"; - description = ''HTTP cookie manager''; + description = "HTTP cookie manager"; deps = [ args."alexandria" args."babel" args."cl-ppcre" args."cl-utilities" args."local-time" args."proc-parse" args."quri" args."split-sequence" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-cookie/2019-10-07/cl-cookie-20191007-git.tgz''; - sha256 = ''1xcb69n3qfp37nwj0mj2whf3yj5xfsgh9sdw6c64gxqkiiq9nfhh''; + url = "http://beta.quicklisp.org/archive/cl-cookie/2019-10-07/cl-cookie-20191007-git.tgz"; + sha256 = "1xcb69n3qfp37nwj0mj2whf3yj5xfsgh9sdw6c64gxqkiiq9nfhh"; }; packageName = "cl-cookie"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-css.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-css.nix index ba295b6e43a..0d0b2aa1dcf 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-css.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-css.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-css''; - version = ''20140914-git''; + baseName = "cl-css"; + version = "20140914-git"; - description = ''Simple inline CSS generator''; + description = "Simple inline CSS generator"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-css/2014-09-14/cl-css-20140914-git.tgz''; - sha256 = ''16zjm10qqyv5v0ysvicbiscplrwlfr0assbf01gp73j1m108rn7n''; + url = "http://beta.quicklisp.org/archive/cl-css/2014-09-14/cl-css-20140914-git.tgz"; + sha256 = "16zjm10qqyv5v0ysvicbiscplrwlfr0assbf01gp73j1m108rn7n"; }; packageName = "cl-css"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix index 051ffabfc56..c9badad400e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-csv''; - version = ''20201016-git''; + baseName = "cl-csv"; + version = "20201016-git"; parasites = [ "cl-csv/speed-test" "cl-csv/test" ]; - description = ''Facilities for reading and writing CSV format files''; + description = "Facilities for reading and writing CSV format files"; deps = [ args."alexandria" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."flexi-streams" args."iterate" args."lisp-unit2" args."named-readtables" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-csv/2020-10-16/cl-csv-20201016-git.tgz''; - sha256 = ''1w12ads26v5sgcmy6rjm6ys9lml7l6rz86w776s2an2maci9kzmf''; + url = "http://beta.quicklisp.org/archive/cl-csv/2020-10-16/cl-csv-20201016-git.tgz"; + sha256 = "1w12ads26v5sgcmy6rjm6ys9lml7l6rz86w776s2an2maci9kzmf"; }; packageName = "cl-csv"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix index c5d0f114e10..8dc68dc36fa 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-dbi''; - version = ''20200610-git''; + baseName = "cl-dbi"; + version = "20200610-git"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."alexandria" args."bordeaux-threads" args."closer-mop" args."dbi" args."split-sequence" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz''; - sha256 = ''1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas''; + url = "http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz"; + sha256 = "1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas"; }; packageName = "cl-dbi"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dot.nix index 53cf2214ed2..a01f8be3536 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dot.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dot.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-dot''; - version = ''20200925-git''; + baseName = "cl-dot"; + version = "20200925-git"; - description = ''Generate Dot Output from Arbitrary Lisp Data''; + description = "Generate Dot Output from Arbitrary Lisp Data"; deps = [ args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dot/2020-09-25/cl-dot-20200925-git.tgz''; - sha256 = ''01vx4yzasmgswrlyagjr2cz76g906jsijdwikdf8wvxyyq77gkla''; + url = "http://beta.quicklisp.org/archive/cl-dot/2020-09-25/cl-dot-20200925-git.tgz"; + sha256 = "01vx4yzasmgswrlyagjr2cz76g906jsijdwikdf8wvxyyq77gkla"; }; packageName = "cl-dot"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix index 1510495a4cb..b78dd2339b1 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-emb''; - version = ''20190521-git''; + baseName = "cl-emb"; + version = "20190521-git"; - description = ''A templating system for Common Lisp''; + description = "A templating system for Common Lisp"; deps = [ args."cl-ppcre" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-emb/2019-05-21/cl-emb-20190521-git.tgz''; - sha256 = ''1d6bi2mx1kw7an3maxjp4ldrhkwfdb58va9whxblz2xjlbykdv8d''; + url = "http://beta.quicklisp.org/archive/cl-emb/2019-05-21/cl-emb-20190521-git.tgz"; + sha256 = "1d6bi2mx1kw7an3maxjp4ldrhkwfdb58va9whxblz2xjlbykdv8d"; }; packageName = "cl-emb"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix index 12d7a7ae273..28cf369206c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-fad''; - version = ''20200610-git''; + baseName = "cl-fad"; + version = "20200610-git"; parasites = [ "cl-fad-test" ]; - description = ''Portable pathname library''; + description = "Portable pathname library"; deps = [ args."alexandria" args."bordeaux-threads" args."cl-ppcre" args."unit-test" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-fad/2020-06-10/cl-fad-20200610-git.tgz''; - sha256 = ''08d0q2jpjz4djz20w8m86rfkili8g0vdbkkmvn8c88qmvcr79k5x''; + url = "http://beta.quicklisp.org/archive/cl-fad/2020-06-10/cl-fad-20200610-git.tgz"; + sha256 = "08d0q2jpjz4djz20w8m86rfkili8g0vdbkkmvn8c88qmvcr79k5x"; }; packageName = "cl-fad"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix index 6a40d0fa8c9..bf3c36d62b1 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-fuse-meta-fs''; - version = ''20190710-git''; + baseName = "cl-fuse-meta-fs"; + version = "20190710-git"; - description = ''CFFI bindings to FUSE (Filesystem in user space)''; + description = "CFFI bindings to FUSE (Filesystem in user space)"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-fuse" args."cl-utilities" args."iterate" args."pcall" args."pcall-queue" args."trivial-backtrace" args."trivial-features" args."trivial-utf-8" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-fuse-meta-fs/2019-07-10/cl-fuse-meta-fs-20190710-git.tgz''; - sha256 = ''1c2nyxj7q8njxydn4xiagvnb21zhb1l07q7nhfw0qs2qk6dkasq7''; + url = "http://beta.quicklisp.org/archive/cl-fuse-meta-fs/2019-07-10/cl-fuse-meta-fs-20190710-git.tgz"; + sha256 = "1c2nyxj7q8njxydn4xiagvnb21zhb1l07q7nhfw0qs2qk6dkasq7"; }; packageName = "cl-fuse-meta-fs"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix index b0a549096b2..a2384c0ffaa 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-fuse''; - version = ''20200925-git''; + baseName = "cl-fuse"; + version = "20200925-git"; - description = ''CFFI bindings to FUSE (Filesystem in user space)''; + description = "CFFI bindings to FUSE (Filesystem in user space)"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-utilities" args."iterate" args."trivial-backtrace" args."trivial-features" args."trivial-utf-8" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-fuse/2020-09-25/cl-fuse-20200925-git.tgz''; - sha256 = ''1c5cn0l0md77asw804qssylcbbphw81mfpbijydd0s25q6xga7dp''; + url = "http://beta.quicklisp.org/archive/cl-fuse/2020-09-25/cl-fuse-20200925-git.tgz"; + sha256 = "1c5cn0l0md77asw804qssylcbbphw81mfpbijydd0s25q6xga7dp"; }; packageName = "cl-fuse"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-hooks.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-hooks.nix index 72eafacb190..f7b78782791 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-hooks.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-hooks.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-hooks''; - version = ''architecture.hooks-20181210-git''; + baseName = "cl-hooks"; + version = "architecture.hooks-20181210-git"; parasites = [ "cl-hooks/test" ]; @@ -11,8 +11,8 @@ mechanism (as known, e.g., from GNU Emacs).''; deps = [ args."alexandria" args."anaphora" args."closer-mop" args."fiveam" args."let-plus" args."trivial-garbage" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/architecture.hooks/2018-12-10/architecture.hooks-20181210-git.tgz''; - sha256 = ''04l8rjmgsd7i580rpm1wndz1jcvfqrmwllnkh3h7als3azi3q2ns''; + url = "http://beta.quicklisp.org/archive/architecture.hooks/2018-12-10/architecture.hooks-20181210-git.tgz"; + sha256 = "04l8rjmgsd7i580rpm1wndz1jcvfqrmwllnkh3h7als3azi3q2ns"; }; packageName = "cl-hooks"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix index 6cd859c2cad..60cb467f9a0 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-html-parse''; - version = ''20200925-git''; + baseName = "cl-html-parse"; + version = "20200925-git"; - description = ''HTML Parser''; + description = "HTML Parser"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-html-parse/2020-09-25/cl-html-parse-20200925-git.tgz''; - sha256 = ''14pfd4gwjb8ywr79dqrcznw6h8a1il3g5b6cm5x9aiyr49zdv15f''; + url = "http://beta.quicklisp.org/archive/cl-html-parse/2020-09-25/cl-html-parse-20200925-git.tgz"; + sha256 = "14pfd4gwjb8ywr79dqrcznw6h8a1il3g5b6cm5x9aiyr49zdv15f"; }; packageName = "cl-html-parse"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix index dde2cc31dd0..64a87763810 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-html5-parser''; - version = ''20190521-git''; + baseName = "cl-html5-parser"; + version = "20190521-git"; - description = ''A HTML5 parser for Common Lisp''; + description = "A HTML5 parser for Common Lisp"; deps = [ args."cl-ppcre" args."flexi-streams" args."string-case" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-html5-parser/2019-05-21/cl-html5-parser-20190521-git.tgz''; - sha256 = ''055jz0yqgjncvy2dxvnwg4iwdvmfsvkch46v58nymz5gi8gaaz7p''; + url = "http://beta.quicklisp.org/archive/cl-html5-parser/2019-05-21/cl-html5-parser-20190521-git.tgz"; + sha256 = "055jz0yqgjncvy2dxvnwg4iwdvmfsvkch46v58nymz5gi8gaaz7p"; }; packageName = "cl-html5-parser"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix index 50ad66faa23..8719adf631c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-interpol''; - version = ''20200715-git''; + baseName = "cl-interpol"; + version = "20200715-git"; parasites = [ "cl-interpol-test" ]; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."cl-ppcre" args."cl-unicode" args."flexi-streams" args."named-readtables" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-interpol/2020-07-15/cl-interpol-20200715-git.tgz''; - sha256 = ''0qbmpgnlg9y6ykwahmw1q8b058krmcq47w3gx75xz920im46wvmw''; + url = "http://beta.quicklisp.org/archive/cl-interpol/2020-07-15/cl-interpol-20200715-git.tgz"; + sha256 = "0qbmpgnlg9y6ykwahmw1q8b058krmcq47w3gx75xz920im46wvmw"; }; packageName = "cl-interpol"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix index 713aff0ea40..1f9fdc420fe 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-jpeg''; - version = ''20170630-git''; + baseName = "cl-jpeg"; + version = "20170630-git"; - description = ''A self-contained baseline JPEG codec implementation''; + description = "A self-contained baseline JPEG codec implementation"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-jpeg/2017-06-30/cl-jpeg-20170630-git.tgz''; - sha256 = ''1wwzn2valhh5ka7qkmab59pb1ijagcj296553fp8z03migl0sil0''; + url = "http://beta.quicklisp.org/archive/cl-jpeg/2017-06-30/cl-jpeg-20170630-git.tgz"; + sha256 = "1wwzn2valhh5ka7qkmab59pb1ijagcj296553fp8z03migl0sil0"; }; packageName = "cl-jpeg"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix index d8bc535f355..00f8b90e485 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-json''; - version = ''20141217-git''; + baseName = "cl-json"; + version = "20141217-git"; parasites = [ "cl-json.test" ]; - description = ''JSON in Lisp. JSON (JavaScript Object Notation) is a lightweight data-interchange format.''; + description = "JSON in Lisp. JSON (JavaScript Object Notation) is a lightweight data-interchange format."; deps = [ args."fiveam" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-json/2014-12-17/cl-json-20141217-git.tgz''; - sha256 = ''00cfppyi6njsbpv1x03jcv4zwplg0q1138174l3wjkvi3gsql17g''; + url = "http://beta.quicklisp.org/archive/cl-json/2014-12-17/cl-json-20141217-git.tgz"; + sha256 = "00cfppyi6njsbpv1x03jcv4zwplg0q1138174l3wjkvi3gsql17g"; }; packageName = "cl-json"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix index dfabda0428f..3162edc3862 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-l10n-cldr''; - version = ''20120909-darcs''; + baseName = "cl-l10n-cldr"; + version = "20120909-darcs"; - description = ''The necessary CLDR files for cl-l10n packaged in a QuickLisp friendly way.''; + description = "The necessary CLDR files for cl-l10n packaged in a QuickLisp friendly way."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-l10n-cldr/2012-09-09/cl-l10n-cldr-20120909-darcs.tgz''; - sha256 = ''03l81bx8izvzwzw0qah34l4k47l4gmhr917phhhl81qp55x7zbiv''; + url = "http://beta.quicklisp.org/archive/cl-l10n-cldr/2012-09-09/cl-l10n-cldr-20120909-darcs.tgz"; + sha256 = "03l81bx8izvzwzw0qah34l4k47l4gmhr917phhhl81qp55x7zbiv"; }; packageName = "cl-l10n-cldr"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix index f37e653bc56..61c37acb829 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-l10n''; - version = ''20161204-darcs''; + baseName = "cl-l10n"; + version = "20161204-darcs"; parasites = [ "cl-l10n/test" ]; - description = ''Portable CL Locale Support''; + description = "Portable CL Locale Support"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cl-fad" args."cl-l10n-cldr" args."cl-ppcre" args."closer-mop" args."closure-common" args."cxml" args."flexi-streams" args."hu_dot_dwim_dot_stefil" args."iterate" args."local-time" args."metabang-bind" args."parse-number" args."puri" args."trivial-features" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-l10n/2016-12-04/cl-l10n-20161204-darcs.tgz''; - sha256 = ''1r8jgwks21az78c5kdxgw5llk9ml423vjkv1f93qg1vx3zma6vzl''; + url = "http://beta.quicklisp.org/archive/cl-l10n/2016-12-04/cl-l10n-20161204-darcs.tgz"; + sha256 = "1r8jgwks21az78c5kdxgw5llk9ml423vjkv1f93qg1vx3zma6vzl"; }; packageName = "cl-l10n"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix index ad4780cebe0..7c3f1b7c069 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-libuv''; - version = ''20200610-git''; + baseName = "cl-libuv"; + version = "20200610-git"; - description = ''Low-level libuv bindings for Common Lisp.''; + description = "Low-level libuv bindings for Common Lisp."; deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-libuv/2020-06-10/cl-libuv-20200610-git.tgz''; - sha256 = ''1ywk1z1ibyk3z0irg5azjrjk3x08ixv30fx4qa0p500fmbfhha19''; + url = "http://beta.quicklisp.org/archive/cl-libuv/2020-06-10/cl-libuv-20200610-git.tgz"; + sha256 = "1ywk1z1ibyk3z0irg5azjrjk3x08ixv30fx4qa0p500fmbfhha19"; }; packageName = "cl-libuv"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-locale.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-locale.nix index f0d727a633f..656cb704634 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-locale.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-locale.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-locale''; - version = ''20151031-git''; + baseName = "cl-locale"; + version = "20151031-git"; - description = ''Simple i18n library for Common Lisp''; + description = "Simple i18n library for Common Lisp"; deps = [ args."alexandria" args."anaphora" args."arnesi" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."collectors" args."iterate" args."named-readtables" args."symbol-munger" args."trivial-types" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-locale/2015-10-31/cl-locale-20151031-git.tgz''; - sha256 = ''14j4xazrx2v5cj4q4irfwra0ksvl2l0s7073fimpwc0xqjfsnjpg''; + url = "http://beta.quicklisp.org/archive/cl-locale/2015-10-31/cl-locale-20151031-git.tgz"; + sha256 = "14j4xazrx2v5cj4q4irfwra0ksvl2l0s7073fimpwc0xqjfsnjpg"; }; packageName = "cl-locale"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix index b1916c27bfd..56853f0dfcd 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-markup''; - version = ''20131003-git''; + baseName = "cl-markup"; + version = "20131003-git"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-markup/2013-10-03/cl-markup-20131003-git.tgz''; - sha256 = ''1ik3a5k6axq941zbf6zyig553i5gnypbcxdq9l7bfxp8w18vbj0r''; + url = "http://beta.quicklisp.org/archive/cl-markup/2013-10-03/cl-markup-20131003-git.tgz"; + sha256 = "1ik3a5k6axq941zbf6zyig553i5gnypbcxdq9l7bfxp8w18vbj0r"; }; packageName = "cl-markup"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix index 97b714d8b64..c2ede1ee6ec 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-mysql''; - version = ''20200610-git''; + baseName = "cl-mysql"; + version = "20200610-git"; - description = ''Common Lisp MySQL library bindings''; + description = "Common Lisp MySQL library bindings"; deps = [ args."alexandria" args."babel" args."cffi" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-mysql/2020-06-10/cl-mysql-20200610-git.tgz''; - sha256 = ''0fzyqzz01zn9fy8v766lib3dghg9yq5wawa0hcmxslms7knzxz7w''; + url = "http://beta.quicklisp.org/archive/cl-mysql/2020-06-10/cl-mysql-20200610-git.tgz"; + sha256 = "0fzyqzz01zn9fy8v766lib3dghg9yq5wawa0hcmxslms7knzxz7w"; }; packageName = "cl-mysql"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix index cfca59e3b50..249a54ed0fb 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-paths-ttf''; - version = ''cl-vectors-20180228-git''; + baseName = "cl-paths-ttf"; + version = "cl-vectors-20180228-git"; - description = ''cl-paths-ttf: vectorial paths manipulation''; + description = "cl-paths-ttf: vectorial paths manipulation"; deps = [ args."cl-paths" args."zpb-ttf" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz''; - sha256 = ''0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly''; + url = "http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz"; + sha256 = "0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly"; }; packageName = "cl-paths-ttf"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix index e8034b11c23..9f7fc95a919 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-paths''; - version = ''cl-vectors-20180228-git''; + baseName = "cl-paths"; + version = "cl-vectors-20180228-git"; - description = ''cl-paths: vectorial paths manipulation''; + description = "cl-paths: vectorial paths manipulation"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz''; - sha256 = ''0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly''; + url = "http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz"; + sha256 = "0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly"; }; packageName = "cl-paths"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix index 16bf7d3a638..35deef0c2a3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-pdf''; - version = ''20191007-git''; + baseName = "cl-pdf"; + version = "20191007-git"; - description = ''Common Lisp PDF Generation Library''; + description = "Common Lisp PDF Generation Library"; deps = [ args."iterate" args."uiop" args."zpb-ttf" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-pdf/2019-10-07/cl-pdf-20191007-git.tgz''; - sha256 = ''0l0hnxysy7dc4wj50nfwn8x7v188vaxvsvk8kl92zb92lfzgw7cd''; + url = "http://beta.quicklisp.org/archive/cl-pdf/2019-10-07/cl-pdf-20191007-git.tgz"; + sha256 = "0l0hnxysy7dc4wj50nfwn8x7v188vaxvsvk8kl92zb92lfzgw7cd"; }; packageName = "cl-pdf"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix index 85212e61328..f26326f307e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-postgres''; - version = ''postmodern-20201016-git''; + baseName = "cl-postgres"; + version = "postmodern-20201016-git"; parasites = [ "cl-postgres/simple-date-tests" "cl-postgres/tests" ]; - description = ''Low-level client library for PostgreSQL''; + description = "Low-level client library for PostgreSQL"; deps = [ args."alexandria" args."bordeaux-threads" args."cl-base64" args."cl-ppcre" args."fiveam" args."ironclad" args."md5" args."simple-date" args."simple-date_slash_postgres-glue" args."split-sequence" args."uax-15" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/postmodern/2020-10-16/postmodern-20201016-git.tgz''; - sha256 = ''1svaiksbqcaq8sh7q6sj9kzazdfl360zqr2nzhwbgy4xnaj4vf3n''; + url = "http://beta.quicklisp.org/archive/postmodern/2020-10-16/postmodern-20201016-git.tgz"; + sha256 = "1svaiksbqcaq8sh7q6sj9kzazdfl360zqr2nzhwbgy4xnaj4vf3n"; }; packageName = "cl-postgres"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix index 3856d777c56..f681b384b54 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-ppcre-template''; - version = ''cl-unification-20200925-git''; + baseName = "cl-ppcre-template"; + version = "cl-unification-20200925-git"; description = ''A system used to conditionally load the CL-PPCRE Template. @@ -12,8 +12,8 @@ REGULAR-EXPRESSION-TEMPLATE.''; deps = [ args."cl-ppcre" args."cl-unification" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-unification/2020-09-25/cl-unification-20200925-git.tgz''; - sha256 = ''05i1bmbabfgym9v28cbl37yr0r1m4a4k4a844z6wlq6qf45vzais''; + url = "http://beta.quicklisp.org/archive/cl-unification/2020-09-25/cl-unification-20200925-git.tgz"; + sha256 = "05i1bmbabfgym9v28cbl37yr0r1m4a4k4a844z6wlq6qf45vzais"; }; packageName = "cl-ppcre-template"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix index 27887f12497..8002137e77b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-ppcre-unicode''; - version = ''cl-ppcre-20190521-git''; + baseName = "cl-ppcre-unicode"; + version = "cl-ppcre-20190521-git"; parasites = [ "cl-ppcre-unicode-test" ]; - description = ''Perl-compatible regular expression library (Unicode)''; + description = "Perl-compatible regular expression library (Unicode)"; deps = [ args."cl-ppcre" args."cl-ppcre-test" args."cl-unicode" args."flexi-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-ppcre/2019-05-21/cl-ppcre-20190521-git.tgz''; - sha256 = ''0p6jcvf9afnsg80a1zqsp7fyz0lf1fxzbin7rs9bl4i6jvm0hjqx''; + url = "http://beta.quicklisp.org/archive/cl-ppcre/2019-05-21/cl-ppcre-20190521-git.tgz"; + sha256 = "0p6jcvf9afnsg80a1zqsp7fyz0lf1fxzbin7rs9bl4i6jvm0hjqx"; }; packageName = "cl-ppcre-unicode"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix index 8bb8fb2478d..3d038b19dce 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-ppcre''; - version = ''20190521-git''; + baseName = "cl-ppcre"; + version = "20190521-git"; parasites = [ "cl-ppcre-test" ]; - description = ''Perl-compatible regular expression library''; + description = "Perl-compatible regular expression library"; deps = [ args."flexi-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-ppcre/2019-05-21/cl-ppcre-20190521-git.tgz''; - sha256 = ''0p6jcvf9afnsg80a1zqsp7fyz0lf1fxzbin7rs9bl4i6jvm0hjqx''; + url = "http://beta.quicklisp.org/archive/cl-ppcre/2019-05-21/cl-ppcre-20190521-git.tgz"; + sha256 = "0p6jcvf9afnsg80a1zqsp7fyz0lf1fxzbin7rs9bl4i6jvm0hjqx"; }; packageName = "cl-ppcre"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-prevalence.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-prevalence.nix index ddfc92b2cb3..3fa35243c2f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-prevalence.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-prevalence.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-prevalence''; - version = ''20200715-git''; + baseName = "cl-prevalence"; + version = "20200715-git"; - description = ''Common Lisp Prevalence Package''; + description = "Common Lisp Prevalence Package"; deps = [ args."alexandria" args."bordeaux-threads" args."s-sysdeps" args."s-xml" args."split-sequence" args."usocket" args."usocket-server" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-prevalence/2020-07-15/cl-prevalence-20200715-git.tgz''; - sha256 = ''1m2wrqnly9i35kjk2wydwywjmwkbh3a3f4ds7wl63q8kpn8g0ibd''; + url = "http://beta.quicklisp.org/archive/cl-prevalence/2020-07-15/cl-prevalence-20200715-git.tgz"; + sha256 = "1m2wrqnly9i35kjk2wydwywjmwkbh3a3f4ds7wl63q8kpn8g0ibd"; }; packageName = "cl-prevalence"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix index e88b9efe366..55edc3cf121 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-project''; - version = ''20200715-git''; + baseName = "cl-project"; + version = "20200715-git"; - description = ''Generate a skeleton for modern project''; + description = "Generate a skeleton for modern project"; deps = [ args."alexandria" args."anaphora" args."cl-ansi-text" args."cl-colors" args."cl-colors2" args."cl-emb" args."cl-ppcre" args."let-plus" args."local-time" args."prove" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-project/2020-07-15/cl-project-20200715-git.tgz''; - sha256 = ''044rx97wc839a8q2wv271s07bnsasl6x5fx4gr5pvy34jbrhp306''; + url = "http://beta.quicklisp.org/archive/cl-project/2020-07-15/cl-project-20200715-git.tgz"; + sha256 = "044rx97wc839a8q2wv271s07bnsasl6x5fx4gr5pvy34jbrhp306"; }; packageName = "cl-project"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix index 7339fcdffeb..fdbb48c3754 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-protobufs''; - version = ''20200325-git''; + baseName = "cl-protobufs"; + version = "20200325-git"; - description = ''Protobufs for Common Lisp''; + description = "Protobufs for Common Lisp"; deps = [ args."alexandria" args."babel" args."closer-mop" args."trivial-features" args."trivial-garbage" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-protobufs/2020-03-25/cl-protobufs-20200325-git.tgz''; - sha256 = ''1sgvp038bvd3mq2f0xh4wawf8h21jmw449yjyahidh1zfqdibpin''; + url = "http://beta.quicklisp.org/archive/cl-protobufs/2020-03-25/cl-protobufs-20200325-git.tgz"; + sha256 = "1sgvp038bvd3mq2f0xh4wawf8h21jmw449yjyahidh1zfqdibpin"; }; packageName = "cl-protobufs"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-qprint.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-qprint.nix index 1ccf6af5cba..72f7d85bc2c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-qprint.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-qprint.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-qprint''; - version = ''20150804-git''; + baseName = "cl-qprint"; + version = "20150804-git"; - description = ''Encode and decode quoted-printable encoded strings.''; + description = "Encode and decode quoted-printable encoded strings."; deps = [ args."flexi-streams" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-qprint/2015-08-04/cl-qprint-20150804-git.tgz''; - sha256 = ''042nq9airkc4yaqzpmly5iszmkbwfn38wsgi9k361ldf1y54lq28''; + url = "http://beta.quicklisp.org/archive/cl-qprint/2015-08-04/cl-qprint-20150804-git.tgz"; + sha256 = "042nq9airkc4yaqzpmly5iszmkbwfn38wsgi9k361ldf1y54lq28"; }; packageName = "cl-qprint"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix index 916af5b2972..a4ada8ee9e5 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-reexport''; - version = ''20150709-git''; + baseName = "cl-reexport"; + version = "20150709-git"; - description = ''Reexport external symbols in other packages.''; + description = "Reexport external symbols in other packages."; deps = [ args."alexandria" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-reexport/2015-07-09/cl-reexport-20150709-git.tgz''; - sha256 = ''1y6qlyps7g0wl4rbmzvw6s1kjdwwmh33layyjclsjp9j5nm8mdmi''; + url = "http://beta.quicklisp.org/archive/cl-reexport/2015-07-09/cl-reexport-20150709-git.tgz"; + sha256 = "1y6qlyps7g0wl4rbmzvw6s1kjdwwmh33layyjclsjp9j5nm8mdmi"; }; packageName = "cl-reexport"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-slice.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-slice.nix index 2c4fd03f94d..464cddbd5f7 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-slice.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-slice.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-slice''; - version = ''20171130-git''; + baseName = "cl-slice"; + version = "20171130-git"; parasites = [ "cl-slice-tests" ]; - description = ''DSL for array slices in Common Lisp.''; + description = "DSL for array slices in Common Lisp."; deps = [ args."alexandria" args."anaphora" args."clunit" args."let-plus" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-slice/2017-11-30/cl-slice-20171130-git.tgz''; - sha256 = ''0nay95qsnck40kdxjgjdii5rcgrdhf880pg9ajmbxilgw84xb2zn''; + url = "http://beta.quicklisp.org/archive/cl-slice/2017-11-30/cl-slice-20171130-git.tgz"; + sha256 = "0nay95qsnck40kdxjgjdii5rcgrdhf880pg9ajmbxilgw84xb2zn"; }; packageName = "cl-slice"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix index accb8a014c8..58957c7826a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-smtp''; - version = ''20191130-git''; + baseName = "cl-smtp"; + version = "20191130-git"; - description = ''Common Lisp smtp client.''; + description = "Common Lisp smtp client."; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl_plus_ssl" args."cl-base64" args."flexi-streams" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-smtp/2019-11-30/cl-smtp-20191130-git.tgz''; - sha256 = ''04x1xq1qlsnhl4wdi82l8ds6rl9rzxk72bjf2ja10jay1p6ljvdq''; + url = "http://beta.quicklisp.org/archive/cl-smtp/2019-11-30/cl-smtp-20191130-git.tgz"; + sha256 = "04x1xq1qlsnhl4wdi82l8ds6rl9rzxk72bjf2ja10jay1p6ljvdq"; }; packageName = "cl-smtp"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix index d97bd34f275..f7571c4bfcc 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-store''; - version = ''20200925-git''; + baseName = "cl-store"; + version = "20200925-git"; parasites = [ "cl-store-tests" ]; - description = ''Serialization package''; + description = "Serialization package"; deps = [ args."rt" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-store/2020-09-25/cl-store-20200925-git.tgz''; - sha256 = ''0vqlrci1634jgfg6c1dzwvx58qjjwbcbwdbpm7xxw2s823xl9jf3''; + url = "http://beta.quicklisp.org/archive/cl-store/2020-09-25/cl-store-20200925-git.tgz"; + sha256 = "0vqlrci1634jgfg6c1dzwvx58qjjwbcbwdbpm7xxw2s823xl9jf3"; }; packageName = "cl-store"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix index add200b09a1..6cedd33973d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-syntax-annot''; - version = ''cl-syntax-20150407-git''; + baseName = "cl-syntax-annot"; + version = "cl-syntax-20150407-git"; - description = ''CL-Syntax Reader Syntax for cl-annot''; + description = "CL-Syntax Reader Syntax for cl-annot"; deps = [ args."alexandria" args."cl-annot" args."cl-syntax" args."named-readtables" args."trivial-types" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz''; - sha256 = ''1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n''; + url = "http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz"; + sha256 = "1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n"; }; packageName = "cl-syntax-annot"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix index c19a47df6c2..c862b137b02 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-syntax-anonfun''; - version = ''cl-syntax-20150407-git''; + baseName = "cl-syntax-anonfun"; + version = "cl-syntax-20150407-git"; - description = ''CL-Syntax Reader Syntax for cl-anonfun''; + description = "CL-Syntax Reader Syntax for cl-anonfun"; deps = [ args."cl-anonfun" args."cl-syntax" args."named-readtables" args."trivial-types" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz''; - sha256 = ''1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n''; + url = "http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz"; + sha256 = "1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n"; }; packageName = "cl-syntax-anonfun"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix index cded8dc2d06..ed1158f0998 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-syntax-markup''; - version = ''cl-syntax-20150407-git''; + baseName = "cl-syntax-markup"; + version = "cl-syntax-20150407-git"; - description = ''CL-Syntax Reader Syntax for CL-Markup''; + description = "CL-Syntax Reader Syntax for CL-Markup"; deps = [ args."cl-markup" args."cl-syntax" args."named-readtables" args."trivial-types" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz''; - sha256 = ''1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n''; + url = "http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz"; + sha256 = "1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n"; }; packageName = "cl-syntax-markup"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix index 353c8210885..195071e88ce 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-syntax''; - version = ''20150407-git''; + baseName = "cl-syntax"; + version = "20150407-git"; - description = ''Reader Syntax Coventions for Common Lisp and SLIME''; + description = "Reader Syntax Coventions for Common Lisp and SLIME"; deps = [ args."named-readtables" args."trivial-types" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz''; - sha256 = ''1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n''; + url = "http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz"; + sha256 = "1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n"; }; packageName = "cl-syntax"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix index 419994fb248..8b5bff40c60 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-test-more''; - version = ''prove-20200218-git''; + baseName = "cl-test-more"; + version = "prove-20200218-git"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."alexandria" args."anaphora" args."cl-ansi-text" args."cl-colors" args."cl-colors2" args."cl-ppcre" args."let-plus" args."prove" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz''; - sha256 = ''1sv3zyam9sdmyis5lyv0khvw82q7bcpsycpj9b3bsv9isb4j30zn''; + url = "http://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz"; + sha256 = "1sv3zyam9sdmyis5lyv0khvw82q7bcpsycpj9b3bsv9isb4j30zn"; }; packageName = "cl-test-more"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix index 358666877a6..2e43b2c37ec 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-typesetting''; - version = ''20170830-git''; + baseName = "cl-typesetting"; + version = "20170830-git"; - description = ''Common Lisp Typesetting system''; + description = "Common Lisp Typesetting system"; deps = [ args."cl-pdf" args."iterate" args."zpb-ttf" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-typesetting/2017-08-30/cl-typesetting-20170830-git.tgz''; - sha256 = ''1mkdr02qikzij3jiyrqy0dldzy8wsnvgcpznfha6x8p2xap586z3''; + url = "http://beta.quicklisp.org/archive/cl-typesetting/2017-08-30/cl-typesetting-20170830-git.tgz"; + sha256 = "1mkdr02qikzij3jiyrqy0dldzy8wsnvgcpznfha6x8p2xap586z3"; }; packageName = "cl-typesetting"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix index 7849acb57c0..f7ad7a8592c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-unicode''; - version = ''20190521-git''; + baseName = "cl-unicode"; + version = "20190521-git"; parasites = [ "cl-unicode/base" "cl-unicode/build" "cl-unicode/test" ]; - description = ''Portable Unicode Library''; + description = "Portable Unicode Library"; deps = [ args."cl-ppcre" args."flexi-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-unicode/2019-05-21/cl-unicode-20190521-git.tgz''; - sha256 = ''0p20yrqbn3fwsnrxvh2cv0m86mh3mz9vj15m7siw1kjkbzq0vngc''; + url = "http://beta.quicklisp.org/archive/cl-unicode/2019-05-21/cl-unicode-20190521-git.tgz"; + sha256 = "0p20yrqbn3fwsnrxvh2cv0m86mh3mz9vj15m7siw1kjkbzq0vngc"; }; packageName = "cl-unicode"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix index 38903abe98b..d4328b7319e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-unification''; - version = ''20200925-git''; + baseName = "cl-unification"; + version = "20200925-git"; description = ''The CL-UNIFICATION system. @@ -10,8 +10,8 @@ The system contains the definitions for the 'unification' machinery.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-unification/2020-09-25/cl-unification-20200925-git.tgz''; - sha256 = ''05i1bmbabfgym9v28cbl37yr0r1m4a4k4a844z6wlq6qf45vzais''; + url = "http://beta.quicklisp.org/archive/cl-unification/2020-09-25/cl-unification-20200925-git.tgz"; + sha256 = "05i1bmbabfgym9v28cbl37yr0r1m4a4k4a844z6wlq6qf45vzais"; }; packageName = "cl-unification"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix index ba8be7927f0..1304b11990a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-utilities''; - version = ''1.2.4''; + baseName = "cl-utilities"; + version = "1.2.4"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-utilities/2010-10-06/cl-utilities-1.2.4.tgz''; - sha256 = ''1z2ippnv2wgyxpz15zpif7j7sp1r20fkjhm4n6am2fyp6a3k3a87''; + url = "http://beta.quicklisp.org/archive/cl-utilities/2010-10-06/cl-utilities-1.2.4.tgz"; + sha256 = "1z2ippnv2wgyxpz15zpif7j7sp1r20fkjhm4n6am2fyp6a3k3a87"; }; packageName = "cl-utilities"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix index f44bd0f22e0..14cee317612 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-vectors''; - version = ''20180228-git''; + baseName = "cl-vectors"; + version = "20180228-git"; - description = ''cl-paths: vectorial paths manipulation''; + description = "cl-paths: vectorial paths manipulation"; deps = [ args."cl-aa" args."cl-paths" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz''; - sha256 = ''0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly''; + url = "http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz"; + sha256 = "0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly"; }; packageName = "cl-vectors"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-webkit2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-webkit2.nix index 01a2732a7ec..9c547943317 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-webkit2.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-webkit2.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-webkit2''; - version = ''cl-webkit-20201016-git''; + baseName = "cl-webkit2"; + version = "cl-webkit-20201016-git"; - description = ''An FFI binding to WebKit2GTK+''; + description = "An FFI binding to WebKit2GTK+"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk" args."cl-cffi-gtk-cairo" args."cl-cffi-gtk-gdk" args."cl-cffi-gtk-gdk-pixbuf" args."cl-cffi-gtk-gio" args."cl-cffi-gtk-glib" args."cl-cffi-gtk-gobject" args."cl-cffi-gtk-pango" args."closer-mop" args."iterate" args."trivial-features" args."trivial-garbage" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-webkit/2020-10-16/cl-webkit-20201016-git.tgz''; - sha256 = ''15xykhjz3j7ad3m853x1hriv3mz6zsgaqdnlc3wk664ka0f7k0vh''; + url = "http://beta.quicklisp.org/archive/cl-webkit/2020-10-16/cl-webkit-20201016-git.tgz"; + sha256 = "15xykhjz3j7ad3m853x1hriv3mz6zsgaqdnlc3wk664ka0f7k0vh"; }; packageName = "cl-webkit2"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix index 3be45384d41..4b4f4314251 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-who''; - version = ''20190710-git''; + baseName = "cl-who"; + version = "20190710-git"; parasites = [ "cl-who-test" ]; - description = ''(X)HTML generation macros''; + description = "(X)HTML generation macros"; deps = [ args."flexi-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-who/2019-07-10/cl-who-20190710-git.tgz''; - sha256 = ''0pbigwn38xikdwvjy9696z9f00dwg565y3wh6ja51q681y8zh9ir''; + url = "http://beta.quicklisp.org/archive/cl-who/2019-07-10/cl-who-20190710-git.tgz"; + sha256 = "0pbigwn38xikdwvjy9696z9f00dwg565y3wh6ja51q681y8zh9ir"; }; packageName = "cl-who"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-xmlspam.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-xmlspam.nix index 223c50f4716..86c9f0c594a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-xmlspam.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-xmlspam.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-xmlspam''; - version = ''20101006-http''; + baseName = "cl-xmlspam"; + version = "20101006-http"; - description = ''Streaming pattern matching for XML''; + description = "Streaming pattern matching for XML"; deps = [ args."alexandria" args."babel" args."cl-ppcre" args."closure-common" args."cxml" args."puri" args."trivial-features" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-xmlspam/2010-10-06/cl-xmlspam-20101006-http.tgz''; - sha256 = ''1mx1a6ab4irncrx5pamh7zng35m4c5wh0pw68avaz7fbz81s953h''; + url = "http://beta.quicklisp.org/archive/cl-xmlspam/2010-10-06/cl-xmlspam-20101006-http.tgz"; + sha256 = "1mx1a6ab4irncrx5pamh7zng35m4c5wh0pw68avaz7fbz81s953h"; }; packageName = "cl-xmlspam"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix index 5a1ae8550aa..1826e79f5a9 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl_plus_ssl''; - version = ''cl+ssl-20200610-git''; + baseName = "cl_plus_ssl"; + version = "cl+ssl-20200610-git"; - description = ''Common Lisp interface to OpenSSL.''; + description = "Common Lisp interface to OpenSSL."; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."flexi-streams" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl+ssl/2020-06-10/cl+ssl-20200610-git.tgz''; - sha256 = ''1kijg8vlwcxraknp4gadf3n5zjchkgg8axr94v3kas9rb717r6ql''; + url = "http://beta.quicklisp.org/archive/cl+ssl/2020-06-10/cl+ssl-20200610-git.tgz"; + sha256 = "1kijg8vlwcxraknp4gadf3n5zjchkgg8axr94v3kas9rb717r6ql"; }; packageName = "cl+ssl"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix index 5a831da39b8..75a30decba4 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''clack-handler-hunchentoot''; - version = ''clack-20191007-git''; + baseName = "clack-handler-hunchentoot"; + version = "clack-20191007-git"; - description = ''Clack handler for Hunchentoot.''; + description = "Clack handler for Hunchentoot."; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-fad" args."cl-ppcre" args."clack-socket" args."flexi-streams" args."hunchentoot" args."md5" args."rfc2388" args."split-sequence" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz''; - sha256 = ''004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w''; + url = "http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz"; + sha256 = "004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w"; }; packageName = "clack-handler-hunchentoot"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix index a9294b293cc..5b39ac9e5a3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''clack-socket''; - version = ''clack-20191007-git''; + baseName = "clack-socket"; + version = "clack-20191007-git"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz''; - sha256 = ''004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w''; + url = "http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz"; + sha256 = "004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w"; }; packageName = "clack-socket"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix index 64e6a694628..b990af44397 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''clack-test''; - version = ''clack-20191007-git''; + baseName = "clack-test"; + version = "clack-20191007-git"; - description = ''Testing Clack Applications.''; + description = "Testing Clack Applications."; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-annot" args."cl-base64" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."dexador" args."dissect" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."local-time" args."md5" args."named-readtables" args."proc-parse" args."quri" args."rfc2388" args."rove" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."usocket" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz''; - sha256 = ''004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w''; + url = "http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz"; + sha256 = "004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w"; }; packageName = "clack-test"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix index d52c21e7c00..5c0a5864314 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''clack-v1-compat''; - version = ''clack-20191007-git''; + baseName = "clack-v1-compat"; + version = "clack-20191007-git"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."circular-streams" args."cl_plus_ssl" args."cl-annot" args."cl-base64" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."clack-test" args."dexador" args."dissect" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."local-time" args."marshal" args."md5" args."named-readtables" args."proc-parse" args."quri" args."rfc2388" args."rove" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."uiop" args."usocket" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz''; - sha256 = ''004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w''; + url = "http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz"; + sha256 = "004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w"; }; packageName = "clack-v1-compat"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix index 1453232cb66..878b037cb3e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''clack''; - version = ''20191007-git''; + baseName = "clack"; + version = "20191007-git"; - description = ''Web application environment for Common Lisp''; + description = "Web application environment for Common Lisp"; deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz''; - sha256 = ''004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w''; + url = "http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz"; + sha256 = "004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w"; }; packageName = "clack"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clfswm.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clfswm.nix new file mode 100644 index 00000000000..b7073858601 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clfswm.nix @@ -0,0 +1,25 @@ +args @ { fetchurl, ... }: +rec { + baseName = "clfswm"; + version = "20161204-git"; + + description = "CLFSWM: Fullscreen Window Manager"; + + deps = [ args."clx" ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/clfswm/2016-12-04/clfswm-20161204-git.tgz"; + sha256 = "1jgz127721dgcv3qm1knc335gy04vzh9gl0hshp256rxi82cpp73"; + }; + + packageName = "clfswm"; + + asdFilesToKeep = ["clfswm.asd"]; + overrides = x: x; +} +/* (SYSTEM clfswm DESCRIPTION CLFSWM: Fullscreen Window Manager SHA256 + 1jgz127721dgcv3qm1knc335gy04vzh9gl0hshp256rxi82cpp73 URL + http://beta.quicklisp.org/archive/clfswm/2016-12-04/clfswm-20161204-git.tgz + MD5 dc976785ef899837ab0fc50a4ed6b740 NAME clfswm FILENAME clfswm DEPS + ((NAME clx FILENAME clx)) DEPENDENCIES (clx) VERSION 20161204-git SIBLINGS + NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix index a942542e336..5c7f91ac88c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''closer-mop''; - version = ''20201016-git''; + baseName = "closer-mop"; + version = "20201016-git"; - description = ''Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations.''; + description = "Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/closer-mop/2020-10-16/closer-mop-20201016-git.tgz''; - sha256 = ''1fccvxzrrfdiwjx9cdia7idp8xym1y86bf7zcyxvmpkdcvgdsdcd''; + url = "http://beta.quicklisp.org/archive/closer-mop/2020-10-16/closer-mop-20201016-git.tgz"; + sha256 = "1fccvxzrrfdiwjx9cdia7idp8xym1y86bf7zcyxvmpkdcvgdsdcd"; }; packageName = "closer-mop"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix index c1b36b6b653..86e19bc347f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''closure-common''; - version = ''20181018-git''; + baseName = "closure-common"; + version = "20181018-git"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."alexandria" args."babel" args."trivial-features" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/closure-common/2018-10-18/closure-common-20181018-git.tgz''; - sha256 = ''18bp7jnxma9hscp09fa723ws9nnynjil935rp8dy9hp6ypghpxpn''; + url = "http://beta.quicklisp.org/archive/closure-common/2018-10-18/closure-common-20181018-git.tgz"; + sha256 = "18bp7jnxma9hscp09fa723ws9nnynjil935rp8dy9hp6ypghpxpn"; }; packageName = "closure-common"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix index 7d9d8730f29..d1d07573809 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''closure-html''; - version = ''20180711-git''; + baseName = "closure-html"; + version = "20180711-git"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."alexandria" args."babel" args."closure-common" args."flexi-streams" args."trivial-features" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/closure-html/2018-07-11/closure-html-20180711-git.tgz''; - sha256 = ''0ljcrz1wix77h1ywp0bixm3pb5ncmr1vdiwh8m1qzkygwpfjr8aq''; + url = "http://beta.quicklisp.org/archive/closure-html/2018-07-11/closure-html-20180711-git.tgz"; + sha256 = "0ljcrz1wix77h1ywp0bixm3pb5ncmr1vdiwh8m1qzkygwpfjr8aq"; }; packageName = "closure-html"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql-socket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql-socket.nix index cbe9caf93ce..a01522b032f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql-socket.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql-socket.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''clsql-postgresql-socket''; - version = ''clsql-20201016-git''; + baseName = "clsql-postgresql-socket"; + version = "clsql-20201016-git"; - description = ''Common Lisp SQL PostgreSQL Socket Driver''; + description = "Common Lisp SQL PostgreSQL Socket Driver"; deps = [ args."clsql" args."md5" args."uffi" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clsql/2020-10-16/clsql-20201016-git.tgz''; - sha256 = ''0wzjxcm7df4fipvj5qsqlllai92hkzd4cvlaghvaikcah9r63hv8''; + url = "http://beta.quicklisp.org/archive/clsql/2020-10-16/clsql-20201016-git.tgz"; + sha256 = "0wzjxcm7df4fipvj5qsqlllai92hkzd4cvlaghvaikcah9r63hv8"; }; packageName = "clsql-postgresql-socket"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql.nix index 9e449d55553..1c5ee972844 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''clsql-postgresql''; - version = ''clsql-20201016-git''; + baseName = "clsql-postgresql"; + version = "clsql-20201016-git"; - description = ''Common Lisp PostgreSQL API Driver''; + description = "Common Lisp PostgreSQL API Driver"; deps = [ args."clsql" args."clsql-uffi" args."uffi" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clsql/2020-10-16/clsql-20201016-git.tgz''; - sha256 = ''0wzjxcm7df4fipvj5qsqlllai92hkzd4cvlaghvaikcah9r63hv8''; + url = "http://beta.quicklisp.org/archive/clsql/2020-10-16/clsql-20201016-git.tgz"; + sha256 = "0wzjxcm7df4fipvj5qsqlllai92hkzd4cvlaghvaikcah9r63hv8"; }; packageName = "clsql-postgresql"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix index 1756cea10bb..500eddc5c50 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''clsql-sqlite3''; - version = ''clsql-20201016-git''; + baseName = "clsql-sqlite3"; + version = "clsql-20201016-git"; - description = ''Common Lisp Sqlite3 Driver''; + description = "Common Lisp Sqlite3 Driver"; deps = [ args."clsql" args."clsql-uffi" args."uffi" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clsql/2020-10-16/clsql-20201016-git.tgz''; - sha256 = ''0wzjxcm7df4fipvj5qsqlllai92hkzd4cvlaghvaikcah9r63hv8''; + url = "http://beta.quicklisp.org/archive/clsql/2020-10-16/clsql-20201016-git.tgz"; + sha256 = "0wzjxcm7df4fipvj5qsqlllai92hkzd4cvlaghvaikcah9r63hv8"; }; packageName = "clsql-sqlite3"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-uffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-uffi.nix index 41399891206..898df293193 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-uffi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-uffi.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''clsql-uffi''; - version = ''clsql-20201016-git''; + baseName = "clsql-uffi"; + version = "clsql-20201016-git"; - description = ''Common UFFI Helper functions for Common Lisp SQL Interface Library''; + description = "Common UFFI Helper functions for Common Lisp SQL Interface Library"; deps = [ args."clsql" args."uffi" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clsql/2020-10-16/clsql-20201016-git.tgz''; - sha256 = ''0wzjxcm7df4fipvj5qsqlllai92hkzd4cvlaghvaikcah9r63hv8''; + url = "http://beta.quicklisp.org/archive/clsql/2020-10-16/clsql-20201016-git.tgz"; + sha256 = "0wzjxcm7df4fipvj5qsqlllai92hkzd4cvlaghvaikcah9r63hv8"; }; packageName = "clsql-uffi"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix index 6a202f7efa2..3ec38263224 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''clsql''; - version = ''20201016-git''; + baseName = "clsql"; + version = "20201016-git"; - description = ''Common Lisp SQL Interface library''; + description = "Common Lisp SQL Interface library"; deps = [ args."uffi" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clsql/2020-10-16/clsql-20201016-git.tgz''; - sha256 = ''0wzjxcm7df4fipvj5qsqlllai92hkzd4cvlaghvaikcah9r63hv8''; + url = "http://beta.quicklisp.org/archive/clsql/2020-10-16/clsql-20201016-git.tgz"; + sha256 = "0wzjxcm7df4fipvj5qsqlllai92hkzd4cvlaghvaikcah9r63hv8"; }; packageName = "clsql"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix index aa89d5e45cc..19a1e5ebb16 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''clss''; - version = ''20191130-git''; + baseName = "clss"; + version = "20191130-git"; - description = ''A DOM tree searching engine based on CSS selectors.''; + description = "A DOM tree searching engine based on CSS selectors."; deps = [ args."array-utils" args."documentation-utils" args."plump" args."trivial-indent" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clss/2019-11-30/clss-20191130-git.tgz''; - sha256 = ''0cbjzsc90fpa8zqv5s0ri7ncbv6f8azgbbfsxswqfphbibkcpcka''; + url = "http://beta.quicklisp.org/archive/clss/2019-11-30/clss-20191130-git.tgz"; + sha256 = "0cbjzsc90fpa8zqv5s0ri7ncbv6f8azgbbfsxswqfphbibkcpcka"; }; packageName = "clss"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump-2-3-tree.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump-2-3-tree.nix index 10ab18a8caf..bc9a8beb66a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump-2-3-tree.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump-2-3-tree.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''clump-2-3-tree''; - version = ''clump-20160825-git''; + baseName = "clump-2-3-tree"; + version = "clump-20160825-git"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."acclimation" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz''; - sha256 = ''1mngxmwklpi52inihkp4akzdi7y32609spfi70yamwgzc1wijbrl''; + url = "http://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz"; + sha256 = "1mngxmwklpi52inihkp4akzdi7y32609spfi70yamwgzc1wijbrl"; }; packageName = "clump-2-3-tree"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump-binary-tree.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump-binary-tree.nix index ad284471540..96543b9ba80 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump-binary-tree.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump-binary-tree.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''clump-binary-tree''; - version = ''clump-20160825-git''; + baseName = "clump-binary-tree"; + version = "clump-20160825-git"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."acclimation" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz''; - sha256 = ''1mngxmwklpi52inihkp4akzdi7y32609spfi70yamwgzc1wijbrl''; + url = "http://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz"; + sha256 = "1mngxmwklpi52inihkp4akzdi7y32609spfi70yamwgzc1wijbrl"; }; packageName = "clump-binary-tree"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump.nix index 476cacb6f32..8c6c9e02200 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''clump''; - version = ''20160825-git''; + baseName = "clump"; + version = "20160825-git"; - description = ''Library for operations on different kinds of trees''; + description = "Library for operations on different kinds of trees"; deps = [ args."acclimation" args."clump-2-3-tree" args."clump-binary-tree" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz''; - sha256 = ''1mngxmwklpi52inihkp4akzdi7y32609spfi70yamwgzc1wijbrl''; + url = "http://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz"; + sha256 = "1mngxmwklpi52inihkp4akzdi7y32609spfi70yamwgzc1wijbrl"; }; packageName = "clump"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clunit.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clunit.nix index 7ab00c03446..7ef0b4a52dd 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clunit.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clunit.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''clunit''; - version = ''20171019-git''; + baseName = "clunit"; + version = "20171019-git"; - description = ''CLUnit is a Common Lisp unit testing framework.''; + description = "CLUnit is a Common Lisp unit testing framework."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clunit/2017-10-19/clunit-20171019-git.tgz''; - sha256 = ''1rapyh0fbjnksj8j3y6imzya1kw80882w18j0fv9iq1hlp718zs5''; + url = "http://beta.quicklisp.org/archive/clunit/2017-10-19/clunit-20171019-git.tgz"; + sha256 = "1rapyh0fbjnksj8j3y6imzya1kw80882w18j0fv9iq1hlp718zs5"; }; packageName = "clunit"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clunit2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clunit2.nix index 6a143073b5c..c62d20e6e2b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clunit2.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clunit2.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''clunit2''; - version = ''20201016-git''; + baseName = "clunit2"; + version = "20201016-git"; - description = ''CLUnit is a Common Lisp unit testing framework.''; + description = "CLUnit is a Common Lisp unit testing framework."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clunit2/2020-10-16/clunit2-20201016-git.tgz''; - sha256 = ''1mj3c125drq9a3pxrh0r8q3gqgq68yk7qi0zbqh4mkpavl1aspdp''; + url = "http://beta.quicklisp.org/archive/clunit2/2020-10-16/clunit2-20201016-git.tgz"; + sha256 = "1mj3c125drq9a3pxrh0r8q3gqgq68yk7qi0zbqh4mkpavl1aspdp"; }; packageName = "clunit2"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix index 856d5411557..9592921de1d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''clx''; - version = ''20200715-git''; + baseName = "clx"; + version = "20200715-git"; parasites = [ "clx/test" ]; - description = ''An implementation of the X Window System protocol in Lisp.''; + description = "An implementation of the X Window System protocol in Lisp."; deps = [ args."fiasco" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clx/2020-07-15/clx-20200715-git.tgz''; - sha256 = ''1fvx6m3imvkkd0z5a3jmm2v6mkrndwsidhykrs229rqx343zg8ra''; + url = "http://beta.quicklisp.org/archive/clx/2020-07-15/clx-20200715-git.tgz"; + sha256 = "1fvx6m3imvkkd0z5a3jmm2v6mkrndwsidhykrs229rqx343zg8ra"; }; packageName = "clx"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix index 7375b8dd709..20b0435fafa 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { - baseName = ''collectors''; - version = ''20161204-git''; + baseName = "collectors"; + version = "20161204-git"; parasites = [ "collectors-test" ]; @@ -11,8 +11,8 @@ rec { deps = [ args."alexandria" args."closer-mop" args."iterate" args."lisp-unit2" args."symbol-munger" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/collectors/2016-12-04/collectors-20161204-git.tgz''; - sha256 = ''0cf2y2yxraqs9v54gbj8hhp7s522gz8qfwwc5hvlhl2s7540b2zf''; + url = "http://beta.quicklisp.org/archive/collectors/2016-12-04/collectors-20161204-git.tgz"; + sha256 = "0cf2y2yxraqs9v54gbj8hhp7s522gz8qfwwc5hvlhl2s7540b2zf"; }; packageName = "collectors"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/colorize.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/colorize.nix index 9084d6a309b..2abbb956551 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/colorize.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/colorize.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''colorize''; - version = ''20180228-git''; + baseName = "colorize"; + version = "20180228-git"; - description = ''A Syntax highlighting library''; + description = "A Syntax highlighting library"; deps = [ args."alexandria" args."html-encode" args."split-sequence" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/colorize/2018-02-28/colorize-20180228-git.tgz''; - sha256 = ''1g0xbryavsf17zy9iy0sbqsb4lyva04h93sbaj3iwv12w50fwz2h''; + url = "http://beta.quicklisp.org/archive/colorize/2018-02-28/colorize-20180228-git.tgz"; + sha256 = "1g0xbryavsf17zy9iy0sbqsb4lyva04h93sbaj3iwv12w50fwz2h"; }; packageName = "colorize"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix index ed4e48cd83b..1beb758a79f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''command-line-arguments''; - version = ''20200325-git''; + baseName = "command-line-arguments"; + version = "20200325-git"; - description = ''small library to deal with command-line arguments''; + description = "small library to deal with command-line arguments"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/command-line-arguments/2020-03-25/command-line-arguments-20200325-git.tgz''; - sha256 = ''0ny0c0aw3mfjpmf31pnd9zfnylqh8ji2yi636w1f352c13z2w5sz''; + url = "http://beta.quicklisp.org/archive/command-line-arguments/2020-03-25/command-line-arguments-20200325-git.tgz"; + sha256 = "0ny0c0aw3mfjpmf31pnd9zfnylqh8ji2yi636w1f352c13z2w5sz"; }; packageName = "command-line-arguments"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix index 38ea5aa106c..41ac2a90aae 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''css-lite''; - version = ''20120407-git''; + baseName = "css-lite"; + version = "20120407-git"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/css-lite/2012-04-07/css-lite-20120407-git.tgz''; - sha256 = ''1gf1qqaxhly6ixh9ykqhg9b52s8p5wlwi46vp2k29qy7gmx4f1qg''; + url = "http://beta.quicklisp.org/archive/css-lite/2012-04-07/css-lite-20120407-git.tgz"; + sha256 = "1gf1qqaxhly6ixh9ykqhg9b52s8p5wlwi46vp2k29qy7gmx4f1qg"; }; packageName = "css-lite"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix index 98c565648dc..5fc683cdc95 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''css-selectors-simple-tree''; - version = ''css-selectors-20160628-git''; + baseName = "css-selectors-simple-tree"; + version = "css-selectors-20160628-git"; - description = ''An implementation of css selectors that interacts with cl-html5-parser's simple-tree''; + description = "An implementation of css selectors that interacts with cl-html5-parser's simple-tree"; deps = [ args."alexandria" args."babel" args."buildnode" args."cl-html5-parser" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."css-selectors" args."cxml" args."flexi-streams" args."iterate" args."named-readtables" args."puri" args."split-sequence" args."string-case" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."yacc" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz''; - sha256 = ''0y9q719w5cv4g7in731q5p98n7pznb05vr7i7wi92mmpah2g1w4b''; + url = "http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz"; + sha256 = "0y9q719w5cv4g7in731q5p98n7pznb05vr7i7wi92mmpah2g1w4b"; }; packageName = "css-selectors-simple-tree"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix index fcdb69f3c35..9d03244efa1 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''css-selectors-stp''; - version = ''css-selectors-20160628-git''; + baseName = "css-selectors-stp"; + version = "css-selectors-20160628-git"; - description = ''An implementation of css selectors that interacts with cxml-stp''; + description = "An implementation of css selectors that interacts with cxml-stp"; deps = [ args."alexandria" args."babel" args."buildnode" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."css-selectors" args."cxml" args."cxml-stp" args."flexi-streams" args."iterate" args."named-readtables" args."parse-number" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."xpath" args."yacc" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz''; - sha256 = ''0y9q719w5cv4g7in731q5p98n7pznb05vr7i7wi92mmpah2g1w4b''; + url = "http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz"; + sha256 = "0y9q719w5cv4g7in731q5p98n7pznb05vr7i7wi92mmpah2g1w4b"; }; packageName = "css-selectors-stp"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix index aa523d6f838..b18d3a03b63 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''css-selectors''; - version = ''20160628-git''; + baseName = "css-selectors"; + version = "20160628-git"; parasites = [ "css-selectors-test" ]; - description = ''An implementation of css selectors''; + description = "An implementation of css selectors"; deps = [ args."alexandria" args."babel" args."buildnode" args."buildnode-xhtml" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."flexi-streams" args."iterate" args."lisp-unit2" args."named-readtables" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."yacc" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz''; - sha256 = ''0y9q719w5cv4g7in731q5p98n7pznb05vr7i7wi92mmpah2g1w4b''; + url = "http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz"; + sha256 = "0y9q719w5cv4g7in731q5p98n7pznb05vr7i7wi92mmpah2g1w4b"; }; packageName = "css-selectors"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix index 2816b451087..4491687d612 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''cxml-stp''; - version = ''20200325-git''; + baseName = "cxml-stp"; + version = "20200325-git"; parasites = [ "cxml-stp/test" ]; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."alexandria" args."babel" args."cl-ppcre" args."closure-common" args."cxml" args."cxml_slash_test" args."parse-number" args."puri" args."rt" args."trivial-features" args."trivial-gray-streams" args."xpath" args."xpath_slash_test" args."yacc" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cxml-stp/2020-03-25/cxml-stp-20200325-git.tgz''; - sha256 = ''1y26bksmysvxifqx4lslpbsdvmcqkf7di36a3yyqnjgrb5r0jv1n''; + url = "http://beta.quicklisp.org/archive/cxml-stp/2020-03-25/cxml-stp-20200325-git.tgz"; + sha256 = "1y26bksmysvxifqx4lslpbsdvmcqkf7di36a3yyqnjgrb5r0jv1n"; }; packageName = "cxml-stp"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix index 8f5e05048c6..cd7ac83f2e5 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''cxml''; - version = ''20200610-git''; + baseName = "cxml"; + version = "20200610-git"; parasites = [ "cxml/dom" "cxml/klacks" "cxml/test" "cxml/xml" ]; - description = ''Closure XML - a Common Lisp XML parser''; + description = "Closure XML - a Common Lisp XML parser"; deps = [ args."alexandria" args."babel" args."closure-common" args."puri" args."trivial-features" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cxml/2020-06-10/cxml-20200610-git.tgz''; - sha256 = ''0545rh4mfxqx2yn9b48s0hzd5w80kars7hpykbg0lgf7ys5218mq''; + url = "http://beta.quicklisp.org/archive/cxml/2020-06-10/cxml-20200610-git.tgz"; + sha256 = "0545rh4mfxqx2yn9b48s0hzd5w80kars7hpykbg0lgf7ys5218mq"; }; packageName = "cxml"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix index 9dcea72f391..1b84a8c038e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''dbd-mysql''; - version = ''cl-dbi-20200610-git''; + baseName = "dbd-mysql"; + version = "cl-dbi-20200610-git"; - description = ''Database driver for MySQL.''; + description = "Database driver for MySQL."; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-mysql" args."closer-mop" args."dbi" args."split-sequence" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz''; - sha256 = ''1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas''; + url = "http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz"; + sha256 = "1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas"; }; packageName = "dbd-mysql"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix index 5a7b261f724..7590319fbc2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''dbd-postgres''; - version = ''cl-dbi-20200610-git''; + baseName = "dbd-postgres"; + version = "cl-dbi-20200610-git"; - description = ''Database driver for PostgreSQL.''; + description = "Database driver for PostgreSQL."; deps = [ args."alexandria" args."bordeaux-threads" args."cl-base64" args."cl-postgres" args."cl-ppcre" args."closer-mop" args."dbi" args."ironclad" args."md5" args."split-sequence" args."trivial-garbage" args."uax-15" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz''; - sha256 = ''1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas''; + url = "http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz"; + sha256 = "1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas"; }; packageName = "dbd-postgres"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix index 5566e807549..b2a26415917 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''dbd-sqlite3''; - version = ''cl-dbi-20200610-git''; + baseName = "dbd-sqlite3"; + version = "cl-dbi-20200610-git"; - description = ''Database driver for SQLite3.''; + description = "Database driver for SQLite3."; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."closer-mop" args."dbi" args."iterate" args."split-sequence" args."sqlite" args."trivial-features" args."trivial-garbage" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz''; - sha256 = ''1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas''; + url = "http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz"; + sha256 = "1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas"; }; packageName = "dbd-sqlite3"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi-test.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi-test.nix index 889afc1231d..f24003e87cf 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi-test.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi-test.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''dbi-test''; - version = ''cl-dbi-20200610-git''; + baseName = "dbi-test"; + version = "cl-dbi-20200610-git"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."alexandria" args."bordeaux-threads" args."closer-mop" args."dbi" args."dissect" args."rove" args."split-sequence" args."trivial-gray-streams" args."trivial-types" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz''; - sha256 = ''1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas''; + url = "http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz"; + sha256 = "1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas"; }; packageName = "dbi-test"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix index 75fab11cf44..b4f9fc45de0 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''dbi''; - version = ''cl-20200610-git''; + baseName = "dbi"; + version = "cl-20200610-git"; parasites = [ "dbi/test" ]; - description = ''Database independent interface for Common Lisp''; + description = "Database independent interface for Common Lisp"; deps = [ args."alexandria" args."bordeaux-threads" args."cl-mysql" args."cl-postgres" args."closer-mop" args."dbd-mysql" args."dbd-postgres" args."dbd-sqlite3" args."dbi-test" args."rove" args."split-sequence" args."sqlite" args."trivial-garbage" args."trivial-types" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz''; - sha256 = ''1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas''; + url = "http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz"; + sha256 = "1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas"; }; packageName = "dbi"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbus.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbus.nix index 1ea512d0ab7..b5ebe86a190 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbus.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbus.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''dbus''; - version = ''20200610-git''; + baseName = "dbus"; + version = "20200610-git"; - description = ''A D-BUS client library for Common Lisp''; + description = "A D-BUS client library for Common Lisp"; deps = [ args."alexandria" args."asdf-package-system" args."babel" args."cl-xmlspam" args."flexi-streams" args."ieee-floats" args."iolib" args."ironclad" args."trivial-garbage" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/dbus/2020-06-10/dbus-20200610-git.tgz''; - sha256 = ''1njwjf1z9xngsfmlddmbcan49vcjqvvxfkhbi62xcxwbn9rgqn79''; + url = "http://beta.quicklisp.org/archive/dbus/2020-06-10/dbus-20200610-git.tgz"; + sha256 = "1njwjf1z9xngsfmlddmbcan49vcjqvvxfkhbi62xcxwbn9rgqn79"; }; packageName = "dbus"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix index 1fb2381ffc2..d5af479b22c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''dexador''; - version = ''20200427-git''; + baseName = "dexador"; + version = "20200427-git"; - description = ''Yet another HTTP client for Common Lisp''; + description = "Yet another HTTP client for Common Lisp"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-cookie" args."cl-ppcre" args."cl-reexport" args."cl-utilities" args."fast-http" args."fast-io" args."flexi-streams" args."local-time" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."usocket" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/dexador/2020-04-27/dexador-20200427-git.tgz''; - sha256 = ''0qy8x47ni270dzwscy86nkwfzn491w2jqwyg57dm6w8lkjzwpgld''; + url = "http://beta.quicklisp.org/archive/dexador/2020-04-27/dexador-20200427-git.tgz"; + sha256 = "0qy8x47ni270dzwscy86nkwfzn491w2jqwyg57dm6w8lkjzwpgld"; }; packageName = "dexador"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dissect.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dissect.nix index 2df2c14c129..54f55a4d3ef 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dissect.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dissect.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''dissect''; - version = ''20200427-git''; + baseName = "dissect"; + version = "20200427-git"; - description = ''A lib for introspecting the call stack and active restarts.''; + description = "A lib for introspecting the call stack and active restarts."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/dissect/2020-04-27/dissect-20200427-git.tgz''; - sha256 = ''1d7sri20jma9r105lxv0sx2q60kb8zp7bf023kain3rnyqr74v8a''; + url = "http://beta.quicklisp.org/archive/dissect/2020-04-27/dissect-20200427-git.tgz"; + sha256 = "1d7sri20jma9r105lxv0sx2q60kb8zp7bf023kain3rnyqr74v8a"; }; packageName = "dissect"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/djula.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/djula.nix index 1b919e63a5f..7010a186bfc 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/djula.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/djula.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''djula''; - version = ''20201016-git''; + baseName = "djula"; + version = "20201016-git"; - description = ''An implementation of Django templates for Common Lisp.''; + description = "An implementation of Django templates for Common Lisp."; deps = [ args."access" args."alexandria" args."anaphora" args."arnesi" args."babel" args."cl-annot" args."cl-interpol" args."cl-locale" args."cl-ppcre" args."cl-slice" args."cl-syntax" args."cl-syntax-annot" args."cl-unicode" args."closer-mop" args."collectors" args."flexi-streams" args."gettext" args."iterate" args."let-plus" args."local-time" args."named-readtables" args."parser-combinators" args."split-sequence" args."symbol-munger" args."trivial-backtrace" args."trivial-features" args."trivial-gray-streams" args."trivial-types" args."yacc" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/djula/2020-10-16/djula-20201016-git.tgz''; - sha256 = ''09j9wmvs3vgx291p11dclrpwx0dqknazzadikg2320nv7a29zgiy''; + url = "http://beta.quicklisp.org/archive/djula/2020-10-16/djula-20201016-git.tgz"; + sha256 = "09j9wmvs3vgx291p11dclrpwx0dqknazzadikg2320nv7a29zgiy"; }; packageName = "djula"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix index 3dbacdf0f81..09a27df91e0 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''do-urlencode''; - version = ''20181018-git''; + baseName = "do-urlencode"; + version = "20181018-git"; - description = ''Percent Encoding (aka URL Encoding) library''; + description = "Percent Encoding (aka URL Encoding) library"; deps = [ args."alexandria" args."babel" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/do-urlencode/2018-10-18/do-urlencode-20181018-git.tgz''; - sha256 = ''1cajd219s515y65kp562c6xczqaq0p4lyp13iv00z6i44rijmfp2''; + url = "http://beta.quicklisp.org/archive/do-urlencode/2018-10-18/do-urlencode-20181018-git.tgz"; + sha256 = "1cajd219s515y65kp562c6xczqaq0p4lyp13iv00z6i44rijmfp2"; }; packageName = "do-urlencode"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix index 7c25ed9a037..27e05af70be 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''documentation-utils''; - version = ''20190710-git''; + baseName = "documentation-utils"; + version = "20190710-git"; - description = ''A few simple tools to help you with documenting your library.''; + description = "A few simple tools to help you with documenting your library."; deps = [ args."trivial-indent" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/documentation-utils/2019-07-10/documentation-utils-20190710-git.tgz''; - sha256 = ''1n3z8sw75k2jjpsg6ch5g9s4v56y96dbs4338ajrfdsk3pk4wgj3''; + url = "http://beta.quicklisp.org/archive/documentation-utils/2019-07-10/documentation-utils-20190710-git.tgz"; + sha256 = "1n3z8sw75k2jjpsg6ch5g9s4v56y96dbs4338ajrfdsk3pk4wgj3"; }; packageName = "documentation-utils"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix index e880d94f433..7ba2b4f9a37 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''drakma''; - version = ''v2.0.7''; + baseName = "drakma"; + version = "v2.0.7"; - description = ''Full-featured http/https client based on usocket''; + description = "Full-featured http/https client based on usocket"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-ppcre" args."flexi-streams" args."puri" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/drakma/2019-11-30/drakma-v2.0.7.tgz''; - sha256 = ''1r0sh0nsx7fq24yybazjw8n7grk1b85l52x523axwchnnaj58kzw''; + url = "http://beta.quicklisp.org/archive/drakma/2019-11-30/drakma-v2.0.7.tgz"; + sha256 = "1r0sh0nsx7fq24yybazjw8n7grk1b85l52x523axwchnnaj58kzw"; }; packageName = "drakma"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/enchant.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/enchant.nix index a5e44cefa4b..f0bdf6d0376 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/enchant.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/enchant.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''enchant''; - version = ''cl-20190521-git''; + baseName = "enchant"; + version = "cl-20190521-git"; - description = ''Programming interface for Enchant spell-checker library''; + description = "Programming interface for Enchant spell-checker library"; deps = [ args."alexandria" args."babel" args."cffi" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-enchant/2019-05-21/cl-enchant-20190521-git.tgz''; - sha256 = ''16ag48fr74m536an8fak5z0lfjdb265gv1ajai1lqg0vq2l5mr14''; + url = "http://beta.quicklisp.org/archive/cl-enchant/2019-05-21/cl-enchant-20190521-git.tgz"; + sha256 = "16ag48fr74m536an8fak5z0lfjdb265gv1ajai1lqg0vq2l5mr14"; }; packageName = "enchant"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix index d8258ea57df..367e268f344 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''esrap-peg''; - version = ''20191007-git''; + baseName = "esrap-peg"; + version = "20191007-git"; - description = ''A wrapper around Esrap to allow generating Esrap grammars from PEG definitions''; + description = "A wrapper around Esrap to allow generating Esrap grammars from PEG definitions"; deps = [ args."alexandria" args."cl-unification" args."esrap" args."iterate" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/esrap-peg/2019-10-07/esrap-peg-20191007-git.tgz''; - sha256 = ''0285ngcm73rpzmr0ydy6frps2b4q6n4jymjv3ncwsh81x5blfvis''; + url = "http://beta.quicklisp.org/archive/esrap-peg/2019-10-07/esrap-peg-20191007-git.tgz"; + sha256 = "0285ngcm73rpzmr0ydy6frps2b4q6n4jymjv3ncwsh81x5blfvis"; }; packageName = "esrap-peg"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix index 946c71a2f5b..7eca78ca53e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''esrap''; - version = ''20200325-git''; + baseName = "esrap"; + version = "20200325-git"; parasites = [ "esrap/tests" ]; - description = ''A Packrat / Parsing Grammar / TDPL parser for Common Lisp.''; + description = "A Packrat / Parsing Grammar / TDPL parser for Common Lisp."; deps = [ args."alexandria" args."fiveam" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/esrap/2020-03-25/esrap-20200325-git.tgz''; - sha256 = ''1pwgjsm19nxx8d4iwbn3x7g08r6qyq1vmp9m83m87r53597b3a68''; + url = "http://beta.quicklisp.org/archive/esrap/2020-03-25/esrap-20200325-git.tgz"; + sha256 = "1pwgjsm19nxx8d4iwbn3x7g08r6qyq1vmp9m83m87r53597b3a68"; }; packageName = "esrap"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix index 4fd75234253..f0936fe5c4b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''external-program''; - version = ''20190307-git''; + baseName = "external-program"; + version = "20190307-git"; parasites = [ "external-program-test" ]; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."fiveam" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/external-program/2019-03-07/external-program-20190307-git.tgz''; - sha256 = ''1nl3mngh7vp2l9mfbdhni4nc164zznafnl74p1kv9j07n5fcpnyz''; + url = "http://beta.quicklisp.org/archive/external-program/2019-03-07/external-program-20190307-git.tgz"; + sha256 = "1nl3mngh7vp2l9mfbdhni4nc164zznafnl74p1kv9j07n5fcpnyz"; }; packageName = "external-program"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-csv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-csv.nix index 67d75b89dbd..8c088a149f7 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-csv.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-csv.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''fare-csv''; - version = ''20171227-git''; + baseName = "fare-csv"; + version = "20171227-git"; - description = ''Robust CSV parser and printer''; + description = "Robust CSV parser and printer"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fare-csv/2017-12-27/fare-csv-20171227-git.tgz''; - sha256 = ''1hkzg05kq2c4xihsfx4wk1k6mmjq2fw40id8vy0315rpa47a5i7x''; + url = "http://beta.quicklisp.org/archive/fare-csv/2017-12-27/fare-csv-20171227-git.tgz"; + sha256 = "1hkzg05kq2c4xihsfx4wk1k6mmjq2fw40id8vy0315rpa47a5i7x"; }; packageName = "fare-csv"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-mop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-mop.nix index a5cec39c15f..929f0f820bd 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-mop.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-mop.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''fare-mop''; - version = ''20151218-git''; + baseName = "fare-mop"; + version = "20151218-git"; - description = ''Utilities using the MOP; notably make informative pretty-printing trivial''; + description = "Utilities using the MOP; notably make informative pretty-printing trivial"; deps = [ args."closer-mop" args."fare-utils" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fare-mop/2015-12-18/fare-mop-20151218-git.tgz''; - sha256 = ''0bvrwqvacy114xsblrk2w28qk6b484a3p0w14mzl264b3wjrdna9''; + url = "http://beta.quicklisp.org/archive/fare-mop/2015-12-18/fare-mop-20151218-git.tgz"; + sha256 = "0bvrwqvacy114xsblrk2w28qk6b484a3p0w14mzl264b3wjrdna9"; }; packageName = "fare-mop"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-extras.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-extras.nix index ff03567a1a6..1b9be4dea1a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-extras.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-extras.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''fare-quasiquote-extras''; - version = ''fare-quasiquote-20200925-git''; + baseName = "fare-quasiquote-extras"; + version = "fare-quasiquote-20200925-git"; - description = ''fare-quasiquote plus extras''; + description = "fare-quasiquote plus extras"; deps = [ args."alexandria" args."closer-mop" args."fare-quasiquote" args."fare-quasiquote-optima" args."fare-quasiquote-readtable" args."fare-utils" args."lisp-namespace" args."named-readtables" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_quasiquote" args."trivia_dot_trivial" args."trivial-cltl2" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz''; - sha256 = ''0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b''; + url = "http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz"; + sha256 = "0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b"; }; packageName = "fare-quasiquote-extras"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-optima.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-optima.nix index 2f1ef3e5b12..2f1c97bbb6b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-optima.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-optima.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''fare-quasiquote-optima''; - version = ''fare-quasiquote-20200925-git''; + baseName = "fare-quasiquote-optima"; + version = "fare-quasiquote-20200925-git"; - description = ''fare-quasiquote extension for optima''; + description = "fare-quasiquote extension for optima"; deps = [ args."alexandria" args."closer-mop" args."fare-quasiquote" args."fare-quasiquote-readtable" args."fare-utils" args."lisp-namespace" args."named-readtables" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_quasiquote" args."trivia_dot_trivial" args."trivial-cltl2" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz''; - sha256 = ''0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b''; + url = "http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz"; + sha256 = "0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b"; }; packageName = "fare-quasiquote-optima"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-readtable.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-readtable.nix index 7d332085e20..47c7c3851bd 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-readtable.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-readtable.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''fare-quasiquote-readtable''; - version = ''fare-quasiquote-20200925-git''; + baseName = "fare-quasiquote-readtable"; + version = "fare-quasiquote-20200925-git"; - description = ''Using fare-quasiquote with named-readtable''; + description = "Using fare-quasiquote with named-readtable"; deps = [ args."fare-quasiquote" args."fare-utils" args."named-readtables" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz''; - sha256 = ''0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b''; + url = "http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz"; + sha256 = "0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b"; }; packageName = "fare-quasiquote-readtable"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote.nix index d5b282e289a..3560c48fee3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''fare-quasiquote''; - version = ''20200925-git''; + baseName = "fare-quasiquote"; + version = "20200925-git"; - description = ''Portable, matchable implementation of quasiquote''; + description = "Portable, matchable implementation of quasiquote"; deps = [ args."fare-utils" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz''; - sha256 = ''0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b''; + url = "http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz"; + sha256 = "0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b"; }; packageName = "fare-quasiquote"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-utils.nix index d7af897eafb..b4e77dad912 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-utils.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-utils.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''fare-utils''; - version = ''20170124-git''; + baseName = "fare-utils"; + version = "20170124-git"; - description = ''Basic functions and macros, interfaces, pure and stateful datastructures''; + description = "Basic functions and macros, interfaces, pure and stateful datastructures"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fare-utils/2017-01-24/fare-utils-20170124-git.tgz''; - sha256 = ''0jhb018ccn3spkgjywgd0524m5qacn8x15fdiban4zz3amj9dapq''; + url = "http://beta.quicklisp.org/archive/fare-utils/2017-01-24/fare-utils-20170124-git.tgz"; + sha256 = "0jhb018ccn3spkgjywgd0524m5qacn8x15fdiban4zz3amj9dapq"; }; packageName = "fare-utils"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix index cea5d251d72..345b94124d9 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''fast-http''; - version = ''20191007-git''; + baseName = "fast-http"; + version = "20191007-git"; - description = ''A fast HTTP protocol parser in Common Lisp''; + description = "A fast HTTP protocol parser in Common Lisp"; deps = [ args."alexandria" args."babel" args."cl-utilities" args."flexi-streams" args."proc-parse" args."smart-buffer" args."trivial-features" args."trivial-gray-streams" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fast-http/2019-10-07/fast-http-20191007-git.tgz''; - sha256 = ''00qnl56cfss2blm4pp03dwv84bmkyd0kbarhahclxbn8f7pgwf32''; + url = "http://beta.quicklisp.org/archive/fast-http/2019-10-07/fast-http-20191007-git.tgz"; + sha256 = "00qnl56cfss2blm4pp03dwv84bmkyd0kbarhahclxbn8f7pgwf32"; }; packageName = "fast-http"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix index 9d7999b750c..22ccfd78de9 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''fast-io''; - version = ''20200925-git''; + baseName = "fast-io"; + version = "20200925-git"; - description = ''Alternative I/O mechanism to a stream or vector''; + description = "Alternative I/O mechanism to a stream or vector"; deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."static-vectors" args."trivial-features" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fast-io/2020-09-25/fast-io-20200925-git.tgz''; - sha256 = ''1rgyr6y20fp3jqnx5snpjf9lngzalip2a28l04ssypwagmhaa975''; + url = "http://beta.quicklisp.org/archive/fast-io/2020-09-25/fast-io-20200925-git.tgz"; + sha256 = "1rgyr6y20fp3jqnx5snpjf9lngzalip2a28l04ssypwagmhaa975"; }; packageName = "fast-io"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix index 68e5e00085c..ab8118deac5 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''fiasco''; - version = ''20200610-git''; + baseName = "fiasco"; + version = "20200610-git"; parasites = [ "fiasco-self-tests" ]; - description = ''A Common Lisp test framework that treasures your failures, logical continuation of Stefil.''; + description = "A Common Lisp test framework that treasures your failures, logical continuation of Stefil."; deps = [ args."alexandria" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fiasco/2020-06-10/fiasco-20200610-git.tgz''; - sha256 = ''1wb0ibw6ka9fbsb40zjipn7vh3jbzyfsvcc9gq19nqhbqa8gy9r4''; + url = "http://beta.quicklisp.org/archive/fiasco/2020-06-10/fiasco-20200610-git.tgz"; + sha256 = "1wb0ibw6ka9fbsb40zjipn7vh3jbzyfsvcc9gq19nqhbqa8gy9r4"; }; packageName = "fiasco"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix index 45af1934223..d02f9de5b0b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''fiveam''; - version = ''20200925-git''; + baseName = "fiveam"; + version = "20200925-git"; parasites = [ "fiveam/test" ]; - description = ''A simple regression testing framework''; + description = "A simple regression testing framework"; deps = [ args."alexandria" args."net_dot_didierverna_dot_asdf-flv" args."trivial-backtrace" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fiveam/2020-09-25/fiveam-20200925-git.tgz''; - sha256 = ''0j9dzjs4prlx33f5idbcic4amx2mcgnjcyrpc3dd4b7lrw426l0d''; + url = "http://beta.quicklisp.org/archive/fiveam/2020-09-25/fiveam-20200925-git.tgz"; + sha256 = "0j9dzjs4prlx33f5idbcic4amx2mcgnjcyrpc3dd4b7lrw426l0d"; }; packageName = "fiveam"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix index a1828981c07..328c91cd2bd 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''flexi-streams''; - version = ''20200925-git''; + baseName = "flexi-streams"; + version = "20200925-git"; parasites = [ "flexi-streams-test" ]; - description = ''Flexible bivalent streams for Common Lisp''; + description = "Flexible bivalent streams for Common Lisp"; deps = [ args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/flexi-streams/2020-09-25/flexi-streams-20200925-git.tgz''; - sha256 = ''1hmsryfkjnk4gdv803s3hpp71fpdybfl1jb5hgngxpd5lsrq0gb2''; + url = "http://beta.quicklisp.org/archive/flexi-streams/2020-09-25/flexi-streams-20200925-git.tgz"; + sha256 = "1hmsryfkjnk4gdv803s3hpp71fpdybfl1jb5hgngxpd5lsrq0gb2"; }; packageName = "flexi-streams"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix index 90ce8b83dde..56de0edc9c9 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''form-fiddle''; - version = ''20190710-git''; + baseName = "form-fiddle"; + version = "20190710-git"; - description = ''A collection of utilities to destructure lambda forms.''; + description = "A collection of utilities to destructure lambda forms."; deps = [ args."documentation-utils" args."trivial-indent" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/form-fiddle/2019-07-10/form-fiddle-20190710-git.tgz''; - sha256 = ''12zmqm2vls043kaka7jp6pnsvkxlyv6x183yjyrs8jk461qfydwl''; + url = "http://beta.quicklisp.org/archive/form-fiddle/2019-07-10/form-fiddle-20190710-git.tgz"; + sha256 = "12zmqm2vls043kaka7jp6pnsvkxlyv6x183yjyrs8jk461qfydwl"; }; packageName = "form-fiddle"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix index 12e168e44f6..20f41296a8e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { - baseName = ''fset''; - version = ''20200925-git''; + baseName = "fset"; + version = "20200925-git"; parasites = [ "fset/test" ]; @@ -12,8 +12,8 @@ See: http://www.ergy.com/FSet.html deps = [ args."misc-extensions" args."mt19937" args."named-readtables" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fset/2020-09-25/fset-20200925-git.tgz''; - sha256 = ''19fr6ds1a493b0kbsligpn7i771r1yfshbbkdp0hxs4l792l05wv''; + url = "http://beta.quicklisp.org/archive/fset/2020-09-25/fset-20200925-git.tgz"; + sha256 = "19fr6ds1a493b0kbsligpn7i771r1yfshbbkdp0hxs4l792l05wv"; }; packageName = "fset"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/gettext.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/gettext.nix index ffc517973d5..0a9d812d5fc 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/gettext.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/gettext.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''gettext''; - version = ''20171130-git''; + baseName = "gettext"; + version = "20171130-git"; - description = ''An pure Common Lisp implementation of gettext runtime. gettext is an internationalization and localization (i18n) system commonly used for writing multilingual programs on Unix-like computer operating systems.''; + description = "An pure Common Lisp implementation of gettext runtime. gettext is an internationalization and localization (i18n) system commonly used for writing multilingual programs on Unix-like computer operating systems."; deps = [ args."flexi-streams" args."split-sequence" args."trivial-gray-streams" args."yacc" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/gettext/2017-11-30/gettext-20171130-git.tgz''; - sha256 = ''0nb8i66sb5qmpnk6rk2adlr87m322bra0xpirp63872mybd3y6yd''; + url = "http://beta.quicklisp.org/archive/gettext/2017-11-30/gettext-20171130-git.tgz"; + sha256 = "0nb8i66sb5qmpnk6rk2adlr87m322bra0xpirp63872mybd3y6yd"; }; packageName = "gettext"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/global-vars.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/global-vars.nix index 42cdca06d90..a4d135188fe 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/global-vars.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/global-vars.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''global-vars''; - version = ''20141106-git''; + baseName = "global-vars"; + version = "20141106-git"; - description = ''Define efficient global variables.''; + description = "Define efficient global variables."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/global-vars/2014-11-06/global-vars-20141106-git.tgz''; - sha256 = ''0bjgmsifs9vrq409rfrsgrhlxwklvls1dpvh2d706i0incxq957j''; + url = "http://beta.quicklisp.org/archive/global-vars/2014-11-06/global-vars-20141106-git.tgz"; + sha256 = "0bjgmsifs9vrq409rfrsgrhlxwklvls1dpvh2d706i0incxq957j"; }; packageName = "global-vars"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/html-encode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/html-encode.nix index 9f4672644fa..646bcff4720 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/html-encode.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/html-encode.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''html-encode''; - version = ''1.2''; + baseName = "html-encode"; + version = "1.2"; - description = ''A library for encoding text in various web-savvy encodings.''; + description = "A library for encoding text in various web-savvy encodings."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/html-encode/2010-10-06/html-encode-1.2.tgz''; - sha256 = ''06mf8wn95yf5swhmzk4vp0xr4ylfl33dgfknkabbkd8n6jns8gcf''; + url = "http://beta.quicklisp.org/archive/html-encode/2010-10-06/html-encode-1.2.tgz"; + sha256 = "06mf8wn95yf5swhmzk4vp0xr4ylfl33dgfknkabbkd8n6jns8gcf"; }; packageName = "html-encode"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix index 4242d959046..09ba474e5a6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''http-body''; - version = ''20190813-git''; + baseName = "http-body"; + version = "20190813-git"; - description = ''HTTP POST data parser for Common Lisp''; + description = "HTTP POST data parser for Common Lisp"; deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-annot" args."cl-ppcre" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."fast-http" args."fast-io" args."flexi-streams" args."jonathan" args."named-readtables" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."trivial-types" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/http-body/2019-08-13/http-body-20190813-git.tgz''; - sha256 = ''1mc4xinqnvjr7cdyaywdb5lv9k34pal7lhp6f9a660r1rbxybvy8''; + url = "http://beta.quicklisp.org/archive/http-body/2019-08-13/http-body-20190813-git.tgz"; + sha256 = "1mc4xinqnvjr7cdyaywdb5lv9k34pal7lhp6f9a660r1rbxybvy8"; }; packageName = "http-body"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix index 074e2ac9671..ed8b80752d2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''hu_dot_dwim_dot_asdf''; - version = ''20200925-darcs''; + baseName = "hu_dot_dwim_dot_asdf"; + version = "20200925-darcs"; - description = ''Various ASDF extensions such as attached test and documentation system, explicit development support, etc.''; + description = "Various ASDF extensions such as attached test and documentation system, explicit development support, etc."; deps = [ args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/hu.dwim.asdf/2020-09-25/hu.dwim.asdf-20200925-darcs.tgz''; - sha256 = ''1812gk65x8yy8s817zhzga52zvdlagws4sw6a8f6zk7yaaa6br8h''; + url = "http://beta.quicklisp.org/archive/hu.dwim.asdf/2020-09-25/hu.dwim.asdf-20200925-darcs.tgz"; + sha256 = "1812gk65x8yy8s817zhzga52zvdlagws4sw6a8f6zk7yaaa6br8h"; }; packageName = "hu.dwim.asdf"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_defclass-star.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_defclass-star.nix index a554ef8d680..13f4d11fb56 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_defclass-star.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_defclass-star.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''hu_dot_dwim_dot_defclass-star''; - version = ''20150709-darcs''; + baseName = "hu_dot_dwim_dot_defclass-star"; + version = "20150709-darcs"; - description = ''Simplify class like definitions with defclass* and friends.''; + description = "Simplify class like definitions with defclass* and friends."; deps = [ args."hu_dot_dwim_dot_asdf" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/hu.dwim.defclass-star/2015-07-09/hu.dwim.defclass-star-20150709-darcs.tgz''; - sha256 = ''032982lyp0hm0ssxlyh572whi2hr4j1nqkyqlllaj373v0dbs3vs''; + url = "http://beta.quicklisp.org/archive/hu.dwim.defclass-star/2015-07-09/hu.dwim.defclass-star-20150709-darcs.tgz"; + sha256 = "032982lyp0hm0ssxlyh572whi2hr4j1nqkyqlllaj373v0dbs3vs"; }; packageName = "hu.dwim.defclass-star"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix index d49a382a3a3..af6529582a4 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''hu_dot_dwim_dot_stefil''; - version = ''20200218-darcs''; + baseName = "hu_dot_dwim_dot_stefil"; + version = "20200218-darcs"; parasites = [ "hu.dwim.stefil/test" ]; - description = ''A Simple Test Framework In Lisp.''; + description = "A Simple Test Framework In Lisp."; deps = [ args."alexandria" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/hu.dwim.stefil/2020-02-18/hu.dwim.stefil-20200218-darcs.tgz''; - sha256 = ''16p25pq9fhk0dny6r43yl9z24g6qm6dag9zf2cila9v9jh3r76qf''; + url = "http://beta.quicklisp.org/archive/hu.dwim.stefil/2020-02-18/hu.dwim.stefil-20200218-darcs.tgz"; + sha256 = "16p25pq9fhk0dny6r43yl9z24g6qm6dag9zf2cila9v9jh3r76qf"; }; packageName = "hu.dwim.stefil"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix index d874120e7d8..883d7554900 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { - baseName = ''hunchentoot''; - version = ''v1.3.0''; + baseName = "hunchentoot"; + version = "v1.3.0"; parasites = [ "hunchentoot-test" ]; @@ -13,8 +13,8 @@ rec { deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-fad" args."cl-ppcre" args."cl-who" args."drakma" args."flexi-streams" args."md5" args."rfc2388" args."split-sequence" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/hunchentoot/2020-06-10/hunchentoot-v1.3.0.tgz''; - sha256 = ''08znpi5lq2dhgv6mhvabk3w4ggrg31dbv4k6gmshr18xd2lq43i8''; + url = "http://beta.quicklisp.org/archive/hunchentoot/2020-06-10/hunchentoot-v1.3.0.tgz"; + sha256 = "08znpi5lq2dhgv6mhvabk3w4ggrg31dbv4k6gmshr18xd2lq43i8"; }; packageName = "hunchentoot"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix index 1b948bcf325..8c3ffe879c4 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''idna''; - version = ''20120107-git''; + baseName = "idna"; + version = "20120107-git"; - description = ''IDNA (international domain names) string encoding and decoding routines''; + description = "IDNA (international domain names) string encoding and decoding routines"; deps = [ args."split-sequence" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/idna/2012-01-07/idna-20120107-git.tgz''; - sha256 = ''0q9hja9v5q7z89p0bzm2whchn05hymn3255fr5zj3fkja8akma5c''; + url = "http://beta.quicklisp.org/archive/idna/2012-01-07/idna-20120107-git.tgz"; + sha256 = "0q9hja9v5q7z89p0bzm2whchn05hymn3255fr5zj3fkja8akma5c"; }; packageName = "idna"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix index 4211dfbc919..2544cd99dff 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''ieee-floats''; - version = ''20170830-git''; + baseName = "ieee-floats"; + version = "20170830-git"; parasites = [ "ieee-floats-tests" ]; - description = ''Convert floating point values to IEEE 754 binary representation''; + description = "Convert floating point values to IEEE 754 binary representation"; deps = [ args."fiveam" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/ieee-floats/2017-08-30/ieee-floats-20170830-git.tgz''; - sha256 = ''15c4q4w3cda82vqlpvdfrnah6ms6vxbjf4a0chd10daw72rwayqk''; + url = "http://beta.quicklisp.org/archive/ieee-floats/2017-08-30/ieee-floats-20170830-git.tgz"; + sha256 = "15c4q4w3cda82vqlpvdfrnah6ms6vxbjf4a0chd10daw72rwayqk"; }; packageName = "ieee-floats"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/inferior-shell.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/inferior-shell.nix index 2072945f264..5aa30e92cdc 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/inferior-shell.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/inferior-shell.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''inferior-shell''; - version = ''20200925-git''; + baseName = "inferior-shell"; + version = "20200925-git"; parasites = [ "inferior-shell/test" ]; - description = ''spawn local or remote processes and shell pipes''; + description = "spawn local or remote processes and shell pipes"; deps = [ args."alexandria" args."closer-mop" args."fare-mop" args."fare-quasiquote" args."fare-quasiquote-extras" args."fare-quasiquote-optima" args."fare-quasiquote-readtable" args."fare-utils" args."hu_dot_dwim_dot_stefil" args."introspect-environment" args."iterate" args."lisp-namespace" args."named-readtables" args."trivia" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_quasiquote" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/inferior-shell/2020-09-25/inferior-shell-20200925-git.tgz''; - sha256 = ''1hykybcmdpcjk0irl4f1lmqc4aawpp1zfvh27qp6mldsibra7l80''; + url = "http://beta.quicklisp.org/archive/inferior-shell/2020-09-25/inferior-shell-20200925-git.tgz"; + sha256 = "1hykybcmdpcjk0irl4f1lmqc4aawpp1zfvh27qp6mldsibra7l80"; }; packageName = "inferior-shell"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/introspect-environment.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/introspect-environment.nix index 68024ad2a5a..4590e55ffd6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/introspect-environment.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/introspect-environment.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''introspect-environment''; - version = ''20200715-git''; + baseName = "introspect-environment"; + version = "20200715-git"; - description = ''Small interface to portable but nonstandard introspection of CL environments.''; + description = "Small interface to portable but nonstandard introspection of CL environments."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/introspect-environment/2020-07-15/introspect-environment-20200715-git.tgz''; - sha256 = ''1m2vqpbrvjb0mkmi2n5rg3j0dr68hyv23lbw6s474hylx02nw5ns''; + url = "http://beta.quicklisp.org/archive/introspect-environment/2020-07-15/introspect-environment-20200715-git.tgz"; + sha256 = "1m2vqpbrvjb0mkmi2n5rg3j0dr68hyv23lbw6s474hylx02nw5ns"; }; packageName = "introspect-environment"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix index c4ae44cd676..8d547d93b59 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''iolib''; - version = ''v0.8.3''; + baseName = "iolib"; + version = "v0.8.3"; parasites = [ "iolib/multiplex" "iolib/os" "iolib/pathnames" "iolib/sockets" "iolib/streams" "iolib/syscalls" "iolib/trivial-sockets" "iolib/zstreams" ]; - description = ''I/O library.''; + description = "I/O library."; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."idna" args."iolib_dot_asdf" args."iolib_dot_base" args."iolib_dot_common-lisp" args."iolib_dot_conf" args."iolib_dot_grovel" args."split-sequence" args."swap-bytes" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz''; - sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c''; + url = "http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz"; + sha256 = "12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c"; }; packageName = "iolib"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix index 195b52c08c4..b4136a5dc86 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''iolib_dot_asdf''; - version = ''iolib-v0.8.3''; + baseName = "iolib_dot_asdf"; + version = "iolib-v0.8.3"; - description = ''A few ASDF component classes.''; + description = "A few ASDF component classes."; deps = [ args."alexandria" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz''; - sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c''; + url = "http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz"; + sha256 = "12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c"; }; packageName = "iolib.asdf"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix index aa650edde02..97763556c1a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''iolib_dot_base''; - version = ''iolib-v0.8.3''; + baseName = "iolib_dot_base"; + version = "iolib-v0.8.3"; - description = ''Base IOlib package, used instead of CL.''; + description = "Base IOlib package, used instead of CL."; deps = [ args."alexandria" args."iolib_dot_asdf" args."iolib_dot_common-lisp" args."iolib_dot_conf" args."split-sequence" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz''; - sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c''; + url = "http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz"; + sha256 = "12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c"; }; packageName = "iolib.base"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix index c0ec72d4869..2482a76453b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''iolib_dot_common-lisp''; - version = ''iolib-v0.8.3''; + baseName = "iolib_dot_common-lisp"; + version = "iolib-v0.8.3"; - description = ''Slightly modified Common Lisp.''; + description = "Slightly modified Common Lisp."; deps = [ args."alexandria" args."iolib_dot_asdf" args."iolib_dot_conf" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz''; - sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c''; + url = "http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz"; + sha256 = "12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c"; }; packageName = "iolib.common-lisp"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix index 4ba0cfa1ce2..d9d055fab06 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''iolib_dot_conf''; - version = ''iolib-v0.8.3''; + baseName = "iolib_dot_conf"; + version = "iolib-v0.8.3"; - description = ''Compile-time configuration for IOLib.''; + description = "Compile-time configuration for IOLib."; deps = [ args."alexandria" args."iolib_dot_asdf" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz''; - sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c''; + url = "http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz"; + sha256 = "12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c"; }; packageName = "iolib.conf"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix index 7a1a12243fe..5e7df7a5c76 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''iolib_dot_grovel''; - version = ''iolib-v0.8.3''; + baseName = "iolib_dot_grovel"; + version = "iolib-v0.8.3"; - description = ''The CFFI Groveller''; + description = "The CFFI Groveller"; deps = [ args."alexandria" args."babel" args."cffi" args."iolib_dot_asdf" args."iolib_dot_base" args."iolib_dot_common-lisp" args."iolib_dot_conf" args."split-sequence" args."trivial-features" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz''; - sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c''; + url = "http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz"; + sha256 = "12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c"; }; packageName = "iolib.grovel"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix index 84298e81820..48e7595f3e0 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''ironclad''; - version = ''v0.51''; + baseName = "ironclad"; + version = "v0.51"; parasites = [ "ironclad/tests" ]; - description = ''A cryptographic toolkit written in pure Common Lisp''; + description = "A cryptographic toolkit written in pure Common Lisp"; deps = [ args."alexandria" args."bordeaux-threads" args."rt" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/ironclad/2020-09-25/ironclad-v0.51.tgz''; - sha256 = ''0zfazyvg91fxr9gm195qwwf1y5qdci7i1cwzpv0fggxhylpkswrn''; + url = "http://beta.quicklisp.org/archive/ironclad/2020-09-25/ironclad-v0.51.tgz"; + sha256 = "0zfazyvg91fxr9gm195qwwf1y5qdci7i1cwzpv0fggxhylpkswrn"; }; packageName = "ironclad"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix index e3e1fa689a0..d82d371ca0c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''iterate''; - version = ''20200610-git''; + baseName = "iterate"; + version = "20200610-git"; parasites = [ "iterate/tests" ]; - description = ''Jonathan Amsterdam's iterator/gatherer/accumulator facility''; + description = "Jonathan Amsterdam's iterator/gatherer/accumulator facility"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/iterate/2020-06-10/iterate-20200610-git.tgz''; - sha256 = ''0xz3v321b8zgjsgak432frs0gmpr2n24sf5gq97qnqvwqfn4infb''; + url = "http://beta.quicklisp.org/archive/iterate/2020-06-10/iterate-20200610-git.tgz"; + sha256 = "0xz3v321b8zgjsgak432frs0gmpr2n24sf5gq97qnqvwqfn4infb"; }; packageName = "iterate"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix index a29a02c5e61..547a909c067 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''jonathan''; - version = ''20200925-git''; + baseName = "jonathan"; + version = "20200925-git"; - description = ''High performance JSON encoder and decoder. Currently support: SBCL, CCL.''; + description = "High performance JSON encoder and decoder. Currently support: SBCL, CCL."; deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-annot" args."cl-ppcre" args."cl-syntax" args."cl-syntax-annot" args."fast-io" args."named-readtables" args."proc-parse" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."trivial-types" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/jonathan/2020-09-25/jonathan-20200925-git.tgz''; - sha256 = ''1y5v3g351nsy7px0frdr2asmcy0lyfbj73ic1f5yf4q65hrgvryx''; + url = "http://beta.quicklisp.org/archive/jonathan/2020-09-25/jonathan-20200925-git.tgz"; + sha256 = "1y5v3g351nsy7px0frdr2asmcy0lyfbj73ic1f5yf4q65hrgvryx"; }; packageName = "jonathan"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix index 49bc7d4cab5..d785fbd2257 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''kmrcl''; - version = ''20201016-git''; + baseName = "kmrcl"; + version = "20201016-git"; parasites = [ "kmrcl/test" ]; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."rt" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/kmrcl/2020-10-16/kmrcl-20201016-git.tgz''; - sha256 = ''0i0k61385hrzbg15qs1wprz6sis7mx2abxv1hqcc2f53rqm9b2hf''; + url = "http://beta.quicklisp.org/archive/kmrcl/2020-10-16/kmrcl-20201016-git.tgz"; + sha256 = "0i0k61385hrzbg15qs1wprz6sis7mx2abxv1hqcc2f53rqm9b2hf"; }; packageName = "kmrcl"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix index 0260d37f0bb..2af6575754a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''lack-component''; - version = ''lack-20201016-git''; + baseName = "lack-component"; + version = "lack-20201016-git"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lack/2020-10-16/lack-20201016-git.tgz''; - sha256 = ''124c3k8116m5gc0rp4vvkqcvz35lglrbwdq4i929hbq65xyx5gan''; + url = "http://beta.quicklisp.org/archive/lack/2020-10-16/lack-20201016-git.tgz"; + sha256 = "124c3k8116m5gc0rp4vvkqcvz35lglrbwdq4i929hbq65xyx5gan"; }; packageName = "lack-component"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix index 610950054fa..edadaa07c14 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''lack-middleware-backtrace''; - version = ''lack-20201016-git''; + baseName = "lack-middleware-backtrace"; + version = "lack-20201016-git"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lack/2020-10-16/lack-20201016-git.tgz''; - sha256 = ''124c3k8116m5gc0rp4vvkqcvz35lglrbwdq4i929hbq65xyx5gan''; + url = "http://beta.quicklisp.org/archive/lack/2020-10-16/lack-20201016-git.tgz"; + sha256 = "124c3k8116m5gc0rp4vvkqcvz35lglrbwdq4i929hbq65xyx5gan"; }; packageName = "lack-middleware-backtrace"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix index 1af4ec3f430..ad8bdc84b59 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''lack-util''; - version = ''lack-20201016-git''; + baseName = "lack-util"; + version = "lack-20201016-git"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lack/2020-10-16/lack-20201016-git.tgz''; - sha256 = ''124c3k8116m5gc0rp4vvkqcvz35lglrbwdq4i929hbq65xyx5gan''; + url = "http://beta.quicklisp.org/archive/lack/2020-10-16/lack-20201016-git.tgz"; + sha256 = "124c3k8116m5gc0rp4vvkqcvz35lglrbwdq4i929hbq65xyx5gan"; }; packageName = "lack-util"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix index a85fab15c42..06f596509a6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''lack''; - version = ''20201016-git''; + baseName = "lack"; + version = "20201016-git"; - description = ''A minimal Clack''; + description = "A minimal Clack"; deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."lack-component" args."lack-util" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lack/2020-10-16/lack-20201016-git.tgz''; - sha256 = ''124c3k8116m5gc0rp4vvkqcvz35lglrbwdq4i929hbq65xyx5gan''; + url = "http://beta.quicklisp.org/archive/lack/2020-10-16/lack-20201016-git.tgz"; + sha256 = "124c3k8116m5gc0rp4vvkqcvz35lglrbwdq4i929hbq65xyx5gan"; }; packageName = "lack"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix index 9d130c2b053..791c7f0a2d2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''let-plus''; - version = ''20191130-git''; + baseName = "let-plus"; + version = "20191130-git"; parasites = [ "let-plus/tests" ]; - description = ''Destructuring extension of LET*.''; + description = "Destructuring extension of LET*."; deps = [ args."alexandria" args."anaphora" args."lift" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/let-plus/2019-11-30/let-plus-20191130-git.tgz''; - sha256 = ''0zj0fgb7lvczgpz4jq8q851p77kma7ikn7hd2jk2c37iv4nmz29p''; + url = "http://beta.quicklisp.org/archive/let-plus/2019-11-30/let-plus-20191130-git.tgz"; + sha256 = "0zj0fgb7lvczgpz4jq8q851p77kma7ikn7hd2jk2c37iv4nmz29p"; }; packageName = "let-plus"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix index 9dd6baad1bd..e4bbb44a468 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''lev''; - version = ''20150505-git''; + baseName = "lev"; + version = "20150505-git"; - description = ''libev bindings for Common Lisp''; + description = "libev bindings for Common Lisp"; deps = [ args."alexandria" args."babel" args."cffi" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lev/2015-05-05/lev-20150505-git.tgz''; - sha256 = ''0lkkzb221ks4f0qjgh6pr5lyvb4884a87p96ir4m36x411pyk5xl''; + url = "http://beta.quicklisp.org/archive/lev/2015-05-05/lev-20150505-git.tgz"; + sha256 = "0lkkzb221ks4f0qjgh6pr5lyvb4884a87p96ir4m36x411pyk5xl"; }; packageName = "lev"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-client.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-client.nix index 10977c16f83..448f41e5b51 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-client.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-client.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''lfarm-client''; - version = ''lfarm-20150608-git''; + baseName = "lfarm-client"; + version = "lfarm-20150608-git"; - description = ''Client component of lfarm, a library for distributing work across machines.''; + description = "Client component of lfarm, a library for distributing work across machines."; deps = [ args."alexandria" args."bordeaux-threads" args."cl-store" args."flexi-streams" args."lfarm-common" args."lparallel" args."split-sequence" args."trivial-gray-streams" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz''; - sha256 = ''1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66''; + url = "http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz"; + sha256 = "1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66"; }; packageName = "lfarm-client"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-common.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-common.nix index 4a5fe87982a..fc92bbe89b4 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-common.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-common.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { - baseName = ''lfarm-common''; - version = ''lfarm-20150608-git''; + baseName = "lfarm-common"; + version = "lfarm-20150608-git"; description = ''(private) Common components of lfarm, a library for distributing work across machines.''; @@ -9,8 +9,8 @@ work across machines.''; deps = [ args."alexandria" args."bordeaux-threads" args."cl-store" args."flexi-streams" args."split-sequence" args."trivial-gray-streams" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz''; - sha256 = ''1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66''; + url = "http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz"; + sha256 = "1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66"; }; packageName = "lfarm-common"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-server.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-server.nix index 354d6c31507..5cc5cc1e9da 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-server.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-server.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''lfarm-server''; - version = ''lfarm-20150608-git''; + baseName = "lfarm-server"; + version = "lfarm-20150608-git"; - description = ''Server component of lfarm, a library for distributing work across machines.''; + description = "Server component of lfarm, a library for distributing work across machines."; deps = [ args."alexandria" args."bordeaux-threads" args."cl-store" args."flexi-streams" args."lfarm-common" args."split-sequence" args."trivial-gray-streams" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz''; - sha256 = ''1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66''; + url = "http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz"; + sha256 = "1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66"; }; packageName = "lfarm-server"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-ssl.nix index 348c71fe966..0ba638611c1 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-ssl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-ssl.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''lfarm-ssl''; - version = ''lfarm-20150608-git''; + baseName = "lfarm-ssl"; + version = "lfarm-20150608-git"; - description = ''SSL support for lfarm''; + description = "SSL support for lfarm"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl_plus_ssl" args."cl-store" args."flexi-streams" args."lfarm-common" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz''; - sha256 = ''1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66''; + url = "http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz"; + sha256 = "1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66"; }; packageName = "lfarm-ssl"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix index 1edb65596a6..c0e4f0caee3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''lift''; - version = ''20190521-git''; + baseName = "lift"; + version = "20190521-git"; - description = ''LIsp Framework for Testing''; + description = "LIsp Framework for Testing"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lift/2019-05-21/lift-20190521-git.tgz''; - sha256 = ''0cinilin9bxzsj3mzd4488zx2irvyl5qpbykv0xbyfz2mjh94ac9''; + url = "http://beta.quicklisp.org/archive/lift/2019-05-21/lift-20190521-git.tgz"; + sha256 = "0cinilin9bxzsj3mzd4488zx2irvyl5qpbykv0xbyfz2mjh94ac9"; }; packageName = "lift"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix index 7f88beb974b..80b0431799b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''lisp-namespace''; - version = ''20171130-git''; + baseName = "lisp-namespace"; + version = "20171130-git"; - description = ''Provides LISP-N --- extensible namespaces in Common Lisp.''; + description = "Provides LISP-N --- extensible namespaces in Common Lisp."; deps = [ args."alexandria" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lisp-namespace/2017-11-30/lisp-namespace-20171130-git.tgz''; - sha256 = ''0vxk06c5434kcjv9p414yk23gs4rkibfq695is9y7wglck31fz2j''; + url = "http://beta.quicklisp.org/archive/lisp-namespace/2017-11-30/lisp-namespace-20171130-git.tgz"; + sha256 = "0vxk06c5434kcjv9p414yk23gs4rkibfq695is9y7wglck31fz2j"; }; packageName = "lisp-namespace"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix index 8d21f88cbf8..12d82701e08 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''lisp-unit2''; - version = ''20180131-git''; + baseName = "lisp-unit2"; + version = "20180131-git"; parasites = [ "lisp-unit2-test" ]; - description = ''Common Lisp library that supports unit testing.''; + description = "Common Lisp library that supports unit testing."; deps = [ args."alexandria" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."flexi-streams" args."iterate" args."named-readtables" args."symbol-munger" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lisp-unit2/2018-01-31/lisp-unit2-20180131-git.tgz''; - sha256 = ''04kwrg605mqzf3ghshgbygvvryk5kipl6gyc5kdaxafjxvhxaak7''; + url = "http://beta.quicklisp.org/archive/lisp-unit2/2018-01-31/lisp-unit2-20180131-git.tgz"; + sha256 = "04kwrg605mqzf3ghshgbygvvryk5kipl6gyc5kdaxafjxvhxaak7"; }; packageName = "lisp-unit2"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix index c7d2f061f4b..9bf7ea7fa14 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''local-time''; - version = ''20200925-git''; + baseName = "local-time"; + version = "20200925-git"; parasites = [ "local-time/test" ]; - description = ''A library for manipulating dates and times, based on a paper by Erik Naggum''; + description = "A library for manipulating dates and times, based on a paper by Erik Naggum"; deps = [ args."stefil" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/local-time/2020-09-25/local-time-20200925-git.tgz''; - sha256 = ''0rr2bs93vhj7ngplw85572jfx8250fr2iki8y9spxmfz1sldm12f''; + url = "http://beta.quicklisp.org/archive/local-time/2020-09-25/local-time-20200925-git.tgz"; + sha256 = "0rr2bs93vhj7ngplw85572jfx8250fr2iki8y9spxmfz1sldm12f"; }; packageName = "local-time"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/log4cl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/log4cl.nix index 222178b1556..e4b4795fe0b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/log4cl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/log4cl.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''log4cl''; - version = ''20200925-git''; + baseName = "log4cl"; + version = "20200925-git"; parasites = [ "log4cl/syslog" "log4cl/test" ]; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."alexandria" args."bordeaux-threads" args."stefil" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/log4cl/2020-09-25/log4cl-20200925-git.tgz''; - sha256 = ''1z98ly71hsbd46i0dqqv2s3cm9y8bi0pl3yg8a168vz629c6mdrf''; + url = "http://beta.quicklisp.org/archive/log4cl/2020-09-25/log4cl-20200925-git.tgz"; + sha256 = "1z98ly71hsbd46i0dqqv2s3cm9y8bi0pl3yg8a168vz629c6mdrf"; }; packageName = "log4cl"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix index 1a6f217a2f9..73b42c3fc9a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''lparallel''; - version = ''20160825-git''; + baseName = "lparallel"; + version = "20160825-git"; - description = ''Parallelism for Common Lisp''; + description = "Parallelism for Common Lisp"; deps = [ args."alexandria" args."bordeaux-threads" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lparallel/2016-08-25/lparallel-20160825-git.tgz''; - sha256 = ''0wwwwszbj6m0b2rsp8mpn4m6y7xk448bw8fb7gy0ggmsdfgchfr1''; + url = "http://beta.quicklisp.org/archive/lparallel/2016-08-25/lparallel-20160825-git.tgz"; + sha256 = "0wwwwszbj6m0b2rsp8mpn4m6y7xk448bw8fb7gy0ggmsdfgchfr1"; }; packageName = "lparallel"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix index cf27f8ceaa3..e287b7519a6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''lquery''; - version = ''20200715-git''; + baseName = "lquery"; + version = "20200715-git"; - description = ''A library to allow jQuery-like HTML/DOM manipulation.''; + description = "A library to allow jQuery-like HTML/DOM manipulation."; deps = [ args."array-utils" args."clss" args."documentation-utils" args."form-fiddle" args."plump" args."trivial-indent" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lquery/2020-07-15/lquery-20200715-git.tgz''; - sha256 = ''1akj9yzz71733yfbqq9jig0zkx8brphzh35d8zzic0469idd3rcd''; + url = "http://beta.quicklisp.org/archive/lquery/2020-07-15/lquery-20200715-git.tgz"; + sha256 = "1akj9yzz71733yfbqq9jig0zkx8brphzh35d8zzic0469idd3rcd"; }; packageName = "lquery"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix index 8187c99f94a..fd6213f3076 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''map-set''; - version = ''20190307-hg''; + baseName = "map-set"; + version = "20190307-hg"; - description = ''Set-like data structure.''; + description = "Set-like data structure."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/map-set/2019-03-07/map-set-20190307-hg.tgz''; - sha256 = ''1x7yh4gzdvypr1q45qgmjln5pjlh82bfpk6sqyrihrldmwwnbzg9''; + url = "http://beta.quicklisp.org/archive/map-set/2019-03-07/map-set-20190307-hg.tgz"; + sha256 = "1x7yh4gzdvypr1q45qgmjln5pjlh82bfpk6sqyrihrldmwwnbzg9"; }; packageName = "map-set"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix index 414dee98b71..94b8e64bfb4 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''marshal''; - version = ''cl-20201016-git''; + baseName = "marshal"; + version = "cl-20201016-git"; - description = ''marshal: Simple (de)serialization of Lisp datastructures.''; + description = "marshal: Simple (de)serialization of Lisp datastructures."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-marshal/2020-10-16/cl-marshal-20201016-git.tgz''; - sha256 = ''03j52yhgpc2myypgy07213l20rznxvf6m3sfbzy2wyapcmv7nxnz''; + url = "http://beta.quicklisp.org/archive/cl-marshal/2020-10-16/cl-marshal-20201016-git.tgz"; + sha256 = "03j52yhgpc2myypgy07213l20rznxvf6m3sfbzy2wyapcmv7nxnz"; }; packageName = "marshal"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix index 953dd0a58a4..845c235d49d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''md5''; - version = ''20180228-git''; + baseName = "md5"; + version = "20180228-git"; - description = ''The MD5 Message-Digest Algorithm RFC 1321''; + description = "The MD5 Message-Digest Algorithm RFC 1321"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/md5/2018-02-28/md5-20180228-git.tgz''; - sha256 = ''1261ix6bmkjyx8bkpj6ksa0kgyrhngm31as77dyy3vfg6dvrsnd4''; + url = "http://beta.quicklisp.org/archive/md5/2018-02-28/md5-20180228-git.tgz"; + sha256 = "1261ix6bmkjyx8bkpj6ksa0kgyrhngm31as77dyy3vfg6dvrsnd4"; }; packageName = "md5"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix index 6e0339bf9f9..993f3639203 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''metabang-bind''; - version = ''20200218-git''; + baseName = "metabang-bind"; + version = "20200218-git"; - description = ''Bind is a macro that generalizes multiple-value-bind, let, let*, destructuring-bind, structure and slot accessors, and a whole lot more.''; + description = "Bind is a macro that generalizes multiple-value-bind, let, let*, destructuring-bind, structure and slot accessors, and a whole lot more."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/metabang-bind/2020-02-18/metabang-bind-20200218-git.tgz''; - sha256 = ''0mfjzfsv8v6i9ahwldfzznl29i42cmh5srmpgq64ar1vp6bdn1hq''; + url = "http://beta.quicklisp.org/archive/metabang-bind/2020-02-18/metabang-bind-20200218-git.tgz"; + sha256 = "0mfjzfsv8v6i9ahwldfzznl29i42cmh5srmpgq64ar1vp6bdn1hq"; }; packageName = "metabang-bind"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix index 1cac2408837..bf553ddf370 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''metatilities-base''; - version = ''20191227-git''; + baseName = "metatilities-base"; + version = "20191227-git"; - description = ''These are metabang.com's Common Lisp basic utilities.''; + description = "These are metabang.com's Common Lisp basic utilities."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/metatilities-base/2019-12-27/metatilities-base-20191227-git.tgz''; - sha256 = ''1mal51p7mknya2ljcwl3wdjvnirw5vvzic6qcnci7qhmfrb1awil''; + url = "http://beta.quicklisp.org/archive/metatilities-base/2019-12-27/metatilities-base-20191227-git.tgz"; + sha256 = "1mal51p7mknya2ljcwl3wdjvnirw5vvzic6qcnci7qhmfrb1awil"; }; packageName = "metatilities-base"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mgl-pax.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mgl-pax.nix index 0271bf98cf7..33cc8bc90bf 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mgl-pax.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mgl-pax.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { - baseName = ''mgl-pax''; - version = ''20201016-git''; + baseName = "mgl-pax"; + version = "20201016-git"; parasites = [ "mgl-pax/test" ]; @@ -11,8 +11,8 @@ rec { deps = [ args."_3bmd" args."_3bmd-ext-code-blocks" args."alexandria" args."babel" args."bordeaux-threads" args."cl-fad" args."colorize" args."esrap" args."html-encode" args."ironclad" args."named-readtables" args."pythonic-string-reader" args."split-sequence" args."swank" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/mgl-pax/2020-10-16/mgl-pax-20201016-git.tgz''; - sha256 = ''0n48fw4a21sqy491bfi9fygrjl9psrryw00iha40dxy2ww86s6li''; + url = "http://beta.quicklisp.org/archive/mgl-pax/2020-10-16/mgl-pax-20201016-git.tgz"; + sha256 = "0n48fw4a21sqy491bfi9fygrjl9psrryw00iha40dxy2ww86s6li"; }; packageName = "mgl-pax"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix index 16609db5c22..163f85182e5 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''misc-extensions''; - version = ''20150608-git''; + baseName = "misc-extensions"; + version = "20150608-git"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/misc-extensions/2015-06-08/misc-extensions-20150608-git.tgz''; - sha256 = ''0pkvi1l5djwpvm0p8m0bcdjm61gxvzy0vgn415gngdixvbbchdqj''; + url = "http://beta.quicklisp.org/archive/misc-extensions/2015-06-08/misc-extensions-20150608-git.tgz"; + sha256 = "0pkvi1l5djwpvm0p8m0bcdjm61gxvzy0vgn415gngdixvbbchdqj"; }; packageName = "misc-extensions"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mk-string-metrics.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mk-string-metrics.nix index dc63474679a..3bd71c00d94 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mk-string-metrics.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mk-string-metrics.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''mk-string-metrics''; - version = ''20180131-git''; + baseName = "mk-string-metrics"; + version = "20180131-git"; - description = ''efficient implementations of various string metric algorithms''; + description = "efficient implementations of various string metric algorithms"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/mk-string-metrics/2018-01-31/mk-string-metrics-20180131-git.tgz''; - sha256 = ''10xb9n6568nh019nq3phijbc7l6hkv69yllfiqvc1zzsprxpkwc4''; + url = "http://beta.quicklisp.org/archive/mk-string-metrics/2018-01-31/mk-string-metrics-20180131-git.tgz"; + sha256 = "10xb9n6568nh019nq3phijbc7l6hkv69yllfiqvc1zzsprxpkwc4"; }; packageName = "mk-string-metrics"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/moptilities.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/moptilities.nix index 1f2dd20ee4b..458acc6e94e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/moptilities.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/moptilities.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''moptilities''; - version = ''20170403-git''; + baseName = "moptilities"; + version = "20170403-git"; - description = ''Common Lisp MOP utilities''; + description = "Common Lisp MOP utilities"; deps = [ args."closer-mop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/moptilities/2017-04-03/moptilities-20170403-git.tgz''; - sha256 = ''0az01wx60ll3nybqlp21f5bps3fnpqhvvfg6d9x84969wdj7q4q8''; + url = "http://beta.quicklisp.org/archive/moptilities/2017-04-03/moptilities-20170403-git.tgz"; + sha256 = "0az01wx60ll3nybqlp21f5bps3fnpqhvvfg6d9x84969wdj7q4q8"; }; packageName = "moptilities"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/more-conditions.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/more-conditions.nix index 9a014c41603..40460f6d71c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/more-conditions.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/more-conditions.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { - baseName = ''more-conditions''; - version = ''20180831-git''; + baseName = "more-conditions"; + version = "20180831-git"; parasites = [ "more-conditions/test" ]; @@ -11,8 +11,8 @@ rec { deps = [ args."alexandria" args."closer-mop" args."fiveam" args."let-plus" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/more-conditions/2018-08-31/more-conditions-20180831-git.tgz''; - sha256 = ''0wa989kv3sl977g9szxkx52fdnww6aj2a9i77363f90iq02vj97x''; + url = "http://beta.quicklisp.org/archive/more-conditions/2018-08-31/more-conditions-20180831-git.tgz"; + sha256 = "0wa989kv3sl977g9szxkx52fdnww6aj2a9i77363f90iq02vj97x"; }; packageName = "more-conditions"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix index a8cfc070bf9..a5628dddeca 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''mt19937''; - version = ''1.1.1''; + baseName = "mt19937"; + version = "1.1.1"; - description = ''Portable MT19937 Mersenne Twister random number generator''; + description = "Portable MT19937 Mersenne Twister random number generator"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/mt19937/2011-02-19/mt19937-1.1.1.tgz''; - sha256 = ''1iw636b0iw5ygkv02y8i41lh7xj0acglv0hg5agryn0zzi2nf1xv''; + url = "http://beta.quicklisp.org/archive/mt19937/2011-02-19/mt19937-1.1.1.tgz"; + sha256 = "1iw636b0iw5ygkv02y8i41lh7xj0acglv0hg5agryn0zzi2nf1xv"; }; packageName = "mt19937"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix index 415b508713c..cb35cd2c4ef 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''myway''; - version = ''20200325-git''; + baseName = "myway"; + version = "20200325-git"; - description = ''Sinatra-compatible routing library.''; + description = "Sinatra-compatible routing library."; deps = [ args."alexandria" args."babel" args."cl-ppcre" args."cl-utilities" args."map-set" args."quri" args."split-sequence" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/myway/2020-03-25/myway-20200325-git.tgz''; - sha256 = ''07r0mq9n0gmm7n20mkpsnmjvcr4gj9nckpnh1c2mddrb3sag8n15''; + url = "http://beta.quicklisp.org/archive/myway/2020-03-25/myway-20200325-git.tgz"; + sha256 = "07r0mq9n0gmm7n20mkpsnmjvcr4gj9nckpnh1c2mddrb3sag8n15"; }; packageName = "myway"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix index 3504443d453..9479bf85d01 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { - baseName = ''named-readtables''; - version = ''20200925-git''; + baseName = "named-readtables"; + version = "20200925-git"; parasites = [ "named-readtables/test" ]; @@ -11,8 +11,8 @@ rec { deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/named-readtables/2020-09-25/named-readtables-20200925-git.tgz''; - sha256 = ''0klbvv2syv8a8agacxdjrmmhibvhgfbxxwv6k4hx0ifk6n5iazxl''; + url = "http://beta.quicklisp.org/archive/named-readtables/2020-09-25/named-readtables-20200925-git.tgz"; + sha256 = "0klbvv2syv8a8agacxdjrmmhibvhgfbxxwv6k4hx0ifk6n5iazxl"; }; packageName = "named-readtables"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/net-telent-date.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/net-telent-date.nix index a9c49279563..0bb4d755d62 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/net-telent-date.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/net-telent-date.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''net-telent-date''; - version = ''net-telent-date_0.42''; + baseName = "net-telent-date"; + version = "net-telent-date_0.42"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/net-telent-date/2010-10-06/net-telent-date_0.42.tgz''; - sha256 = ''06vdlddwi6kx999n1093chwgw0ksbys4j4w9i9zqvw768wxp4li1''; + url = "http://beta.quicklisp.org/archive/net-telent-date/2010-10-06/net-telent-date_0.42.tgz"; + sha256 = "06vdlddwi6kx999n1093chwgw0ksbys4j4w9i9zqvw768wxp4li1"; }; packageName = "net-telent-date"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix index 4e7c84566a0..039277bcc0e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''net_dot_didierverna_dot_asdf-flv''; - version = ''asdf-flv-version-2.1''; + baseName = "net_dot_didierverna_dot_asdf-flv"; + version = "asdf-flv-version-2.1"; - description = ''ASDF extension to provide support for file-local variables.''; + description = "ASDF extension to provide support for file-local variables."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/asdf-flv/2016-04-21/asdf-flv-version-2.1.tgz''; - sha256 = ''12k0d4xyv6s9vy6gq18p8c9bm334jsfjly22lhg680kx2zr7y0lc''; + url = "http://beta.quicklisp.org/archive/asdf-flv/2016-04-21/asdf-flv-version-2.1.tgz"; + sha256 = "12k0d4xyv6s9vy6gq18p8c9bm334jsfjly22lhg680kx2zr7y0lc"; }; packageName = "net.didierverna.asdf-flv"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix index 75ea9b55220..f6fbd1e1b63 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''nibbles''; - version = ''20200925-git''; + baseName = "nibbles"; + version = "20200925-git"; parasites = [ "nibbles/tests" ]; - description = ''A library for accessing octet-addressed blocks of data in big- and little-endian orders''; + description = "A library for accessing octet-addressed blocks of data in big- and little-endian orders"; deps = [ args."rt" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/nibbles/2020-09-25/nibbles-20200925-git.tgz''; - sha256 = ''14k9hg8kmzwcb9b5aiwqhimc0zmcs3xp8q29sck8zklf8ziqaqb4''; + url = "http://beta.quicklisp.org/archive/nibbles/2020-09-25/nibbles-20200925-git.tgz"; + sha256 = "14k9hg8kmzwcb9b5aiwqhimc0zmcs3xp8q29sck8zklf8ziqaqb4"; }; packageName = "nibbles"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix index 07b86f58fe7..487fd2c50aa 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''optima''; - version = ''20150709-git''; + baseName = "optima"; + version = "20150709-git"; - description = ''Optimized Pattern Matching Library''; + description = "Optimized Pattern Matching Library"; deps = [ args."alexandria" args."closer-mop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/optima/2015-07-09/optima-20150709-git.tgz''; - sha256 = ''0vqyqrnx2d8qwa2jlg9l2wn6vrykraj8a1ysz0gxxxnwpqc29hdc''; + url = "http://beta.quicklisp.org/archive/optima/2015-07-09/optima-20150709-git.tgz"; + sha256 = "0vqyqrnx2d8qwa2jlg9l2wn6vrykraj8a1ysz0gxxxnwpqc29hdc"; }; packageName = "optima"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/osicat.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/osicat.nix index cb05bef0a1c..bc7f59d5fb7 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/osicat.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/osicat.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''osicat''; - version = ''20200925-git''; + baseName = "osicat"; + version = "20200925-git"; parasites = [ "osicat/tests" ]; - description = ''A lightweight operating system interface''; + description = "A lightweight operating system interface"; deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."rt" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/osicat/2020-09-25/osicat-20200925-git.tgz''; - sha256 = ''191ncd5arfx6i9cw3iny4a473wsrr3dpv2lwb9jr02p6qpmqwysk''; + url = "http://beta.quicklisp.org/archive/osicat/2020-09-25/osicat-20200925-git.tgz"; + sha256 = "191ncd5arfx6i9cw3iny4a473wsrr3dpv2lwb9jr02p6qpmqwysk"; }; packageName = "osicat"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix index bf6216dcadd..952b9cbdf0d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''parenscript''; - version = ''Parenscript-2.7.1''; + baseName = "parenscript"; + version = "Parenscript-2.7.1"; - description = ''Lisp to JavaScript transpiler''; + description = "Lisp to JavaScript transpiler"; deps = [ args."anaphora" args."cl-ppcre" args."named-readtables" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/parenscript/2018-12-10/Parenscript-2.7.1.tgz''; - sha256 = ''1vbldjzj9py8vqyk0f3rb795cjai0h7p858dflm4l8p0kp4mll6f''; + url = "http://beta.quicklisp.org/archive/parenscript/2018-12-10/Parenscript-2.7.1.tgz"; + sha256 = "1vbldjzj9py8vqyk0f3rb795cjai0h7p858dflm4l8p0kp4mll6f"; }; packageName = "parenscript"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-declarations-1_dot_0.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-declarations-1_dot_0.nix index ea153987c0b..3e59fcfa5f2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-declarations-1_dot_0.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-declarations-1_dot_0.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''parse-declarations-1_dot_0''; - version = ''parse-declarations-20101006-darcs''; + baseName = "parse-declarations-1_dot_0"; + version = "parse-declarations-20101006-darcs"; - description = ''Library to parse and rebuild declarations.''; + description = "Library to parse and rebuild declarations."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/parse-declarations/2010-10-06/parse-declarations-20101006-darcs.tgz''; - sha256 = ''0r85b0jfacd28kr65kw9c13dx4i6id1dpmby68zjy63mqbnyawrd''; + url = "http://beta.quicklisp.org/archive/parse-declarations/2010-10-06/parse-declarations-20101006-darcs.tgz"; + sha256 = "0r85b0jfacd28kr65kw9c13dx4i6id1dpmby68zjy63mqbnyawrd"; }; packageName = "parse-declarations-1.0"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix index e636df0805e..a4b9488a34a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''parse-number''; - version = ''v1.7''; + baseName = "parse-number"; + version = "v1.7"; parasites = [ "parse-number/tests" ]; - description = ''Number parsing library''; + description = "Number parsing library"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/parse-number/2018-02-28/parse-number-v1.7.tgz''; - sha256 = ''11ji8856ipmqki5i4cw1zgx8hahfi8x1raz1xb20c4rmgad6nsha''; + url = "http://beta.quicklisp.org/archive/parse-number/2018-02-28/parse-number-v1.7.tgz"; + sha256 = "11ji8856ipmqki5i4cw1zgx8hahfi8x1raz1xb20c4rmgad6nsha"; }; packageName = "parse-number"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parser-combinators.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parser-combinators.nix index 5105ec99235..391f04bd767 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parser-combinators.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parser-combinators.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''parser-combinators''; - version = ''cl-20131111-git''; + baseName = "parser-combinators"; + version = "cl-20131111-git"; - description = ''An implementation of parser combinators for Common Lisp''; + description = "An implementation of parser combinators for Common Lisp"; deps = [ args."alexandria" args."iterate" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-parser-combinators/2013-11-11/cl-parser-combinators-20131111-git.tgz''; - sha256 = ''0wg1a7favbwqcxyqcy2zxi4l11qsp4ar9fvddmx960grf2d72lds''; + url = "http://beta.quicklisp.org/archive/cl-parser-combinators/2013-11-11/cl-parser-combinators-20131111-git.tgz"; + sha256 = "0wg1a7favbwqcxyqcy2zxi4l11qsp4ar9fvddmx960grf2d72lds"; }; packageName = "parser-combinators"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parser_dot_common-rules.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parser_dot_common-rules.nix index ee6532261c0..d438d4b157b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parser_dot_common-rules.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parser_dot_common-rules.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''parser_dot_common-rules''; - version = ''20200715-git''; + baseName = "parser_dot_common-rules"; + version = "20200715-git"; parasites = [ "parser.common-rules/test" ]; - description = ''Provides common parsing rules that are useful in many grammars.''; + description = "Provides common parsing rules that are useful in many grammars."; deps = [ args."alexandria" args."anaphora" args."esrap" args."fiveam" args."let-plus" args."split-sequence" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/parser.common-rules/2020-07-15/parser.common-rules-20200715-git.tgz''; - sha256 = ''17nw0shhb8079b26ldwpfxggkzs6ysfqm4s4nr1rfhba9mkvxdxy''; + url = "http://beta.quicklisp.org/archive/parser.common-rules/2020-07-15/parser.common-rules-20200715-git.tgz"; + sha256 = "17nw0shhb8079b26ldwpfxggkzs6ysfqm4s4nr1rfhba9mkvxdxy"; }; packageName = "parser.common-rules"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix index fe9ccae2886..a60f3f377b5 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''pcall-queue''; - version = ''pcall-0.3''; + baseName = "pcall-queue"; + version = "pcall-0.3"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."alexandria" args."bordeaux-threads" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz''; - sha256 = ''02idx1wnv9770fl2nh179sb8njw801g70b5mf8jqhqm2gwsb731y''; + url = "http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz"; + sha256 = "02idx1wnv9770fl2nh179sb8njw801g70b5mf8jqhqm2gwsb731y"; }; packageName = "pcall-queue"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix index 99e9517e50e..6b3ef96ca1c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''pcall''; - version = ''0.3''; + baseName = "pcall"; + version = "0.3"; parasites = [ "pcall-tests" ]; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."alexandria" args."bordeaux-threads" args."fiveam" args."pcall-queue" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz''; - sha256 = ''02idx1wnv9770fl2nh179sb8njw801g70b5mf8jqhqm2gwsb731y''; + url = "http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz"; + sha256 = "02idx1wnv9770fl2nh179sb8njw801g70b5mf8jqhqm2gwsb731y"; }; packageName = "pcall"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix index 5490b882c81..a82c9c54c63 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''plump''; - version = ''20200427-git''; + baseName = "plump"; + version = "20200427-git"; - description = ''An XML / XHTML / HTML parser that aims to be as lenient as possible.''; + description = "An XML / XHTML / HTML parser that aims to be as lenient as possible."; deps = [ args."array-utils" args."documentation-utils" args."trivial-indent" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/plump/2020-04-27/plump-20200427-git.tgz''; - sha256 = ''0l5bi503djjkhrih94h5jbihlm60h267qm2ycq9m9fldp4fjrjic''; + url = "http://beta.quicklisp.org/archive/plump/2020-04-27/plump-20200427-git.tgz"; + sha256 = "0l5bi503djjkhrih94h5jbihlm60h267qm2ycq9m9fldp4fjrjic"; }; packageName = "plump"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix index 7dc27566bca..32345ee367a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''postmodern''; - version = ''20201016-git''; + baseName = "postmodern"; + version = "20201016-git"; parasites = [ "postmodern/tests" ]; - description = ''PostgreSQL programming API''; + description = "PostgreSQL programming API"; deps = [ args."alexandria" args."bordeaux-threads" args."cl-base64" args."cl-postgres" args."cl-postgres_slash_tests" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."fiveam" args."flexi-streams" args."global-vars" args."ironclad" args."md5" args."s-sql" args."s-sql_slash_tests" args."simple-date" args."simple-date_slash_postgres-glue" args."split-sequence" args."uax-15" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/postmodern/2020-10-16/postmodern-20201016-git.tgz''; - sha256 = ''1svaiksbqcaq8sh7q6sj9kzazdfl360zqr2nzhwbgy4xnaj4vf3n''; + url = "http://beta.quicklisp.org/archive/postmodern/2020-10-16/postmodern-20201016-git.tgz"; + sha256 = "1svaiksbqcaq8sh7q6sj9kzazdfl360zqr2nzhwbgy4xnaj4vf3n"; }; packageName = "postmodern"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix index d9146cede10..8cb24f674fd 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''proc-parse''; - version = ''20190813-git''; + baseName = "proc-parse"; + version = "20190813-git"; - description = ''Procedural vector parser''; + description = "Procedural vector parser"; deps = [ args."alexandria" args."babel" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/proc-parse/2019-08-13/proc-parse-20190813-git.tgz''; - sha256 = ''126l7mqxjcgw2limddgrdq63cdhwkhaxabxl9l0bjadf92nczg0j''; + url = "http://beta.quicklisp.org/archive/proc-parse/2019-08-13/proc-parse-20190813-git.tgz"; + sha256 = "126l7mqxjcgw2limddgrdq63cdhwkhaxabxl9l0bjadf92nczg0j"; }; packageName = "proc-parse"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove-asdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove-asdf.nix index 21babe8f015..379fbbbe9ac 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove-asdf.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove-asdf.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''prove-asdf''; - version = ''prove-20200218-git''; + baseName = "prove-asdf"; + version = "prove-20200218-git"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz''; - sha256 = ''1sv3zyam9sdmyis5lyv0khvw82q7bcpsycpj9b3bsv9isb4j30zn''; + url = "http://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz"; + sha256 = "1sv3zyam9sdmyis5lyv0khvw82q7bcpsycpj9b3bsv9isb4j30zn"; }; packageName = "prove-asdf"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix index c3aa1dcaafe..9bb12d3e3c0 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''prove''; - version = ''20200218-git''; + baseName = "prove"; + version = "20200218-git"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."alexandria" args."anaphora" args."cl-ansi-text" args."cl-colors" args."cl-colors2" args."cl-ppcre" args."let-plus" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz''; - sha256 = ''1sv3zyam9sdmyis5lyv0khvw82q7bcpsycpj9b3bsv9isb4j30zn''; + url = "http://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz"; + sha256 = "1sv3zyam9sdmyis5lyv0khvw82q7bcpsycpj9b3bsv9isb4j30zn"; }; packageName = "prove"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix index ffa2e595c26..fef37625dd0 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''ptester''; - version = ''20160929-git''; + baseName = "ptester"; + version = "20160929-git"; - description = ''Portable test harness package''; + description = "Portable test harness package"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/ptester/2016-09-29/ptester-20160929-git.tgz''; - sha256 = ''04rlq1zljhxc65pm31bah3sq3as24l0sdivz440s79qlnnyh13hz''; + url = "http://beta.quicklisp.org/archive/ptester/2016-09-29/ptester-20160929-git.tgz"; + sha256 = "04rlq1zljhxc65pm31bah3sq3as24l0sdivz440s79qlnnyh13hz"; }; packageName = "ptester"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix index e45802c194d..b349fccd6d3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''puri''; - version = ''20201016-git''; + baseName = "puri"; + version = "20201016-git"; parasites = [ "puri/test" ]; - description = ''Portable Universal Resource Indentifier Library''; + description = "Portable Universal Resource Indentifier Library"; deps = [ args."ptester" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/puri/2020-10-16/puri-20201016-git.tgz''; - sha256 = ''16h7gip6d0564s9yba3jg0rjzndmysv531hcrngvi3j3sandjfzx''; + url = "http://beta.quicklisp.org/archive/puri/2020-10-16/puri-20201016-git.tgz"; + sha256 = "16h7gip6d0564s9yba3jg0rjzndmysv531hcrngvi3j3sandjfzx"; }; packageName = "puri"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pythonic-string-reader.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pythonic-string-reader.nix index ae810d34790..ff6cdb460e7 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pythonic-string-reader.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pythonic-string-reader.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { - baseName = ''pythonic-string-reader''; - version = ''20180711-git''; + baseName = "pythonic-string-reader"; + version = "20180711-git"; description = ''A simple and unintrusive read table modification that allows for simple string literal definition that doesn't require escaping characters.''; @@ -9,8 +9,8 @@ simple string literal definition that doesn't require escaping characters.''; deps = [ args."named-readtables" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/pythonic-string-reader/2018-07-11/pythonic-string-reader-20180711-git.tgz''; - sha256 = ''0gr6sbkmfwca9r0xa5vczjm4s9psbrqy5hvijkp5g42b0b7x5myx''; + url = "http://beta.quicklisp.org/archive/pythonic-string-reader/2018-07-11/pythonic-string-reader-20180711-git.tgz"; + sha256 = "0gr6sbkmfwca9r0xa5vczjm4s9psbrqy5hvijkp5g42b0b7x5myx"; }; packageName = "pythonic-string-reader"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix index 06957e45f81..1cac12f8600 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''query-fs''; - version = ''20200610-git''; + baseName = "query-fs"; + version = "20200610-git"; - description = ''High-level virtual FS using CL-Fuse-Meta-FS to represent results of queries''; + description = "High-level virtual FS using CL-Fuse-Meta-FS to represent results of queries"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-fuse" args."cl-fuse-meta-fs" args."cl-ppcre" args."cl-utilities" args."command-line-arguments" args."iterate" args."pcall" args."pcall-queue" args."trivial-backtrace" args."trivial-features" args."trivial-utf-8" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/query-fs/2020-06-10/query-fs-20200610-git.tgz''; - sha256 = ''1kcq2xs5dqwbhapknrynanwqn3c9h4cpi7hf362il2p6v6y4r413''; + url = "http://beta.quicklisp.org/archive/query-fs/2020-06-10/query-fs-20200610-git.tgz"; + sha256 = "1kcq2xs5dqwbhapknrynanwqn3c9h4cpi7hf362il2p6v6y4r413"; }; packageName = "query-fs"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix index 1972f6b8d4a..a38d024ea88 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''quri''; - version = ''20200610-git''; + baseName = "quri"; + version = "20200610-git"; - description = ''Yet another URI library for Common Lisp''; + description = "Yet another URI library for Common Lisp"; deps = [ args."alexandria" args."babel" args."cl-utilities" args."split-sequence" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/quri/2020-06-10/quri-20200610-git.tgz''; - sha256 = ''1qv8x1m6m70jczvydfq9ws5zw3jw6y74s607vfrqaf0ck5rrwsk6''; + url = "http://beta.quicklisp.org/archive/quri/2020-06-10/quri-20200610-git.tgz"; + sha256 = "1qv8x1m6m70jczvydfq9ws5zw3jw6y74s607vfrqaf0ck5rrwsk6"; }; packageName = "quri"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix index 25d535176a6..bc94b7fe3de 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''rfc2388''; - version = ''20180831-git''; + baseName = "rfc2388"; + version = "20180831-git"; - description = ''Implementation of RFC 2388''; + description = "Implementation of RFC 2388"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/rfc2388/2018-08-31/rfc2388-20180831-git.tgz''; - sha256 = ''1r7vvrlq2wl213bm2aknkf34ynpl8y4nbkfir79srrdsl1337z33''; + url = "http://beta.quicklisp.org/archive/rfc2388/2018-08-31/rfc2388-20180831-git.tgz"; + sha256 = "1r7vvrlq2wl213bm2aknkf34ynpl8y4nbkfir79srrdsl1337z33"; }; packageName = "rfc2388"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rove.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rove.nix index b3fc3b0cd2d..91e94b2cc73 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rove.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rove.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''rove''; - version = ''20200325-git''; + baseName = "rove"; + version = "20200325-git"; - description = ''Yet another testing framework intended to be a successor of Prove''; + description = "Yet another testing framework intended to be a successor of Prove"; deps = [ args."bordeaux-threads" args."dissect" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/rove/2020-03-25/rove-20200325-git.tgz''; - sha256 = ''0zn8d3408rgy2nibia5hdfbf80ix1fgssywx01izx7z99l5x50z5''; + url = "http://beta.quicklisp.org/archive/rove/2020-03-25/rove-20200325-git.tgz"; + sha256 = "0zn8d3408rgy2nibia5hdfbf80ix1fgssywx01izx7z99l5x50z5"; }; packageName = "rove"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix index d5be4be7daf..7a53315daf6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''rt''; - version = ''20101006-git''; + baseName = "rt"; + version = "20101006-git"; - description = ''MIT Regression Tester''; + description = "MIT Regression Tester"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/rt/2010-10-06/rt-20101006-git.tgz''; - sha256 = ''1jncar0xwkqk8yrc2dln389ivvgzs7ijdhhs3zpfyi5d21f0qa1v''; + url = "http://beta.quicklisp.org/archive/rt/2010-10-06/rt-20101006-git.tgz"; + sha256 = "1jncar0xwkqk8yrc2dln389ivvgzs7ijdhhs3zpfyi5d21f0qa1v"; }; packageName = "rt"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix index 1f896dc4158..d4397b82217 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''s-sql''; - version = ''postmodern-20201016-git''; + baseName = "s-sql"; + version = "postmodern-20201016-git"; parasites = [ "s-sql/tests" ]; - description = ''Lispy DSL for SQL''; + description = "Lispy DSL for SQL"; deps = [ args."alexandria" args."bordeaux-threads" args."cl-base64" args."cl-postgres" args."cl-postgres_slash_tests" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."fiveam" args."global-vars" args."ironclad" args."md5" args."postmodern" args."split-sequence" args."uax-15" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/postmodern/2020-10-16/postmodern-20201016-git.tgz''; - sha256 = ''1svaiksbqcaq8sh7q6sj9kzazdfl360zqr2nzhwbgy4xnaj4vf3n''; + url = "http://beta.quicklisp.org/archive/postmodern/2020-10-16/postmodern-20201016-git.tgz"; + sha256 = "1svaiksbqcaq8sh7q6sj9kzazdfl360zqr2nzhwbgy4xnaj4vf3n"; }; packageName = "s-sql"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sysdeps.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sysdeps.nix index b35f44067d3..3d9e001dde4 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sysdeps.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sysdeps.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''s-sysdeps''; - version = ''20200427-git''; + baseName = "s-sysdeps"; + version = "20200427-git"; - description = ''An abstraction layer over platform dependent functionality''; + description = "An abstraction layer over platform dependent functionality"; deps = [ args."alexandria" args."bordeaux-threads" args."split-sequence" args."usocket" args."usocket-server" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/s-sysdeps/2020-04-27/s-sysdeps-20200427-git.tgz''; - sha256 = ''04dhi0mibqz4i1jly9i6lrd9lf93i25k2f0hba1sqis3x6sm38zy''; + url = "http://beta.quicklisp.org/archive/s-sysdeps/2020-04-27/s-sysdeps-20200427-git.tgz"; + sha256 = "04dhi0mibqz4i1jly9i6lrd9lf93i25k2f0hba1sqis3x6sm38zy"; }; packageName = "s-sysdeps"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-xml.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-xml.nix index ec12dde5223..08bd208a89f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-xml.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-xml.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''s-xml''; - version = ''20150608-git''; + baseName = "s-xml"; + version = "20150608-git"; parasites = [ "s-xml.examples" "s-xml.test" ]; - description = ''Simple Common Lisp XML Parser''; + description = "Simple Common Lisp XML Parser"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/s-xml/2015-06-08/s-xml-20150608-git.tgz''; - sha256 = ''0cy36wqzasqma4maw9djq1vdwsp5hxq8svlbnhbv9sq9zzys5viq''; + url = "http://beta.quicklisp.org/archive/s-xml/2015-06-08/s-xml-20150608-git.tgz"; + sha256 = "0cy36wqzasqma4maw9djq1vdwsp5hxq8svlbnhbv9sq9zzys5viq"; }; packageName = "s-xml"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix index 9056cfbdcca..f5f294cfdbb 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { - baseName = ''salza2''; - version = ''2.0.9''; + baseName = "salza2"; + version = "2.0.9"; description = ''Create compressed data in the ZLIB, DEFLATE, or GZIP data formats''; @@ -9,8 +9,8 @@ rec { deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/salza2/2013-07-20/salza2-2.0.9.tgz''; - sha256 = ''1m0hksgvq3njd9xa2nxlm161vgzw77djxmisq08v9pz2bz16v8va''; + url = "http://beta.quicklisp.org/archive/salza2/2013-07-20/salza2-2.0.9.tgz"; + sha256 = "1m0hksgvq3njd9xa2nxlm161vgzw77djxmisq08v9pz2bz16v8va"; }; packageName = "salza2"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/serapeum.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/serapeum.nix index 85d85463c3d..143a8fad1df 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/serapeum.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/serapeum.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''serapeum''; - version = ''20201016-git''; + baseName = "serapeum"; + version = "20201016-git"; - description = ''Utilities beyond Alexandria.''; + description = "Utilities beyond Alexandria."; deps = [ args."alexandria" args."bordeaux-threads" args."closer-mop" args."fare-quasiquote" args."fare-quasiquote-extras" args."fare-quasiquote-optima" args."fare-quasiquote-readtable" args."fare-utils" args."global-vars" args."introspect-environment" args."iterate" args."lisp-namespace" args."named-readtables" args."parse-declarations-1_dot_0" args."parse-number" args."split-sequence" args."string-case" args."trivia" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_quasiquote" args."trivia_dot_trivial" args."trivial-cltl2" args."trivial-file-size" args."trivial-garbage" args."trivial-macroexpand-all" args."type-i" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/serapeum/2020-10-16/serapeum-20201016-git.tgz''; - sha256 = ''0rbxa0r75jxkhisyjwjh7zn7m1450k58sc9g68bgkj0fsjvr44sq''; + url = "http://beta.quicklisp.org/archive/serapeum/2020-10-16/serapeum-20201016-git.tgz"; + sha256 = "0rbxa0r75jxkhisyjwjh7zn7m1450k58sc9g68bgkj0fsjvr44sq"; }; packageName = "serapeum"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date-time.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date-time.nix index 1f2759cf388..31f818a8e69 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date-time.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date-time.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''simple-date-time''; - version = ''20160421-git''; + baseName = "simple-date-time"; + version = "20160421-git"; - description = ''date and time library for common lisp''; + description = "date and time library for common lisp"; deps = [ args."cl-ppcre" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/simple-date-time/2016-04-21/simple-date-time-20160421-git.tgz''; - sha256 = ''1db9n7pspxkqkzz12829a1lp7v4ghrnlb7g3wh04yz6m224d3i4h''; + url = "http://beta.quicklisp.org/archive/simple-date-time/2016-04-21/simple-date-time-20160421-git.tgz"; + sha256 = "1db9n7pspxkqkzz12829a1lp7v4ghrnlb7g3wh04yz6m224d3i4h"; }; packageName = "simple-date-time"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix index 55671ce1336..c4bae5608ae 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''simple-date''; - version = ''postmodern-20201016-git''; + baseName = "simple-date"; + version = "postmodern-20201016-git"; parasites = [ "simple-date/tests" ]; - description = ''Simple date library that can be used with postmodern''; + description = "Simple date library that can be used with postmodern"; deps = [ args."fiveam" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/postmodern/2020-10-16/postmodern-20201016-git.tgz''; - sha256 = ''1svaiksbqcaq8sh7q6sj9kzazdfl360zqr2nzhwbgy4xnaj4vf3n''; + url = "http://beta.quicklisp.org/archive/postmodern/2020-10-16/postmodern-20201016-git.tgz"; + sha256 = "1svaiksbqcaq8sh7q6sj9kzazdfl360zqr2nzhwbgy4xnaj4vf3n"; }; packageName = "simple-date"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-tasks.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-tasks.nix index 55d35ba8c0f..596e509608a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-tasks.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-tasks.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''simple-tasks''; - version = ''20190710-git''; + baseName = "simple-tasks"; + version = "20190710-git"; - description = ''A very simple task scheduling framework.''; + description = "A very simple task scheduling framework."; deps = [ args."alexandria" args."array-utils" args."bordeaux-threads" args."dissect" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/simple-tasks/2019-07-10/simple-tasks-20190710-git.tgz''; - sha256 = ''12y5phnbj9s2fsrz1ab6xj857zf1fv8kjk7jj2mdjs6k2d8gk8v3''; + url = "http://beta.quicklisp.org/archive/simple-tasks/2019-07-10/simple-tasks-20190710-git.tgz"; + sha256 = "12y5phnbj9s2fsrz1ab6xj857zf1fv8kjk7jj2mdjs6k2d8gk8v3"; }; packageName = "simple-tasks"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix index 63adab55741..18d669225a3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''smart-buffer''; - version = ''20160628-git''; + baseName = "smart-buffer"; + version = "20160628-git"; - description = ''Smart octets buffer''; + description = "Smart octets buffer"; deps = [ args."flexi-streams" args."trivial-gray-streams" args."uiop" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/smart-buffer/2016-06-28/smart-buffer-20160628-git.tgz''; - sha256 = ''1wp50snkc8739n91xlnfnq1dzz3kfp0awgp92m7xbpcw3hbaib1s''; + url = "http://beta.quicklisp.org/archive/smart-buffer/2016-06-28/smart-buffer-20160628-git.tgz"; + sha256 = "1wp50snkc8739n91xlnfnq1dzz3kfp0awgp92m7xbpcw3hbaib1s"; }; packageName = "smart-buffer"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix index a22076facd3..3971d410441 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { - baseName = ''split-sequence''; - version = ''v2.0.0''; + baseName = "split-sequence"; + version = "v2.0.0"; parasites = [ "split-sequence/tests" ]; @@ -11,8 +11,8 @@ rec { deps = [ args."fiveam" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/split-sequence/2019-05-21/split-sequence-v2.0.0.tgz''; - sha256 = ''09cmmswzl1kahvlzgqv8lqm9qcnz5iqg8f26fw3mm9rb3dcp7aba''; + url = "http://beta.quicklisp.org/archive/split-sequence/2019-05-21/split-sequence-v2.0.0.tgz"; + sha256 = "09cmmswzl1kahvlzgqv8lqm9qcnz5iqg8f26fw3mm9rb3dcp7aba"; }; packageName = "split-sequence"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix index ac04ba80a0d..145156be45d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''sqlite''; - version = ''cl-20190813-git''; + baseName = "sqlite"; + version = "cl-20190813-git"; - description = ''CL-SQLITE package is an interface to the SQLite embedded relational database engine.''; + description = "CL-SQLITE package is an interface to the SQLite embedded relational database engine."; deps = [ args."alexandria" args."babel" args."cffi" args."iterate" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-sqlite/2019-08-13/cl-sqlite-20190813-git.tgz''; - sha256 = ''07zla2h7i7ggmzsyj33f12vpxvcbbvq6x022c2dy13flx8a83rmk''; + url = "http://beta.quicklisp.org/archive/cl-sqlite/2019-08-13/cl-sqlite-20190813-git.tgz"; + sha256 = "07zla2h7i7ggmzsyj33f12vpxvcbbvq6x022c2dy13flx8a83rmk"; }; packageName = "sqlite"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix index 7a84f077711..cf1f1655a36 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''static-vectors''; - version = ''v1.8.6''; + baseName = "static-vectors"; + version = "v1.8.6"; parasites = [ "static-vectors/test" ]; - description = ''Create vectors allocated in static memory.''; + description = "Create vectors allocated in static memory."; deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."fiveam" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/static-vectors/2020-06-10/static-vectors-v1.8.6.tgz''; - sha256 = ''0s549cxd8a8ix6jl4dfxj2nh01nl9f4hgnlmb88w7iixanxn58mc''; + url = "http://beta.quicklisp.org/archive/static-vectors/2020-06-10/static-vectors-v1.8.6.tgz"; + sha256 = "0s549cxd8a8ix6jl4dfxj2nh01nl9f4hgnlmb88w7iixanxn58mc"; }; packageName = "static-vectors"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix index df63a5c9836..a4a688e1243 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''stefil''; - version = ''20181210-git''; + baseName = "stefil"; + version = "20181210-git"; parasites = [ "stefil-test" ]; - description = ''Stefil - Simple Test Framework In Lisp''; + description = "Stefil - Simple Test Framework In Lisp"; deps = [ args."alexandria" args."iterate" args."metabang-bind" args."swank" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/stefil/2018-12-10/stefil-20181210-git.tgz''; - sha256 = ''10dr8yjrjc2pyx55knds5llh9k716khlvbkmpxh0vn8rdmxmz96g''; + url = "http://beta.quicklisp.org/archive/stefil/2018-12-10/stefil-20181210-git.tgz"; + sha256 = "10dr8yjrjc2pyx55knds5llh9k716khlvbkmpxh0vn8rdmxmz96g"; }; packageName = "stefil"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/str.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/str.nix index 1109c9da04c..5fff3b8c568 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/str.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/str.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''str''; - version = ''cl-20200925-git''; + baseName = "str"; + version = "cl-20200925-git"; - description = ''Modern, consistent and terse Common Lisp string manipulation library.''; + description = "Modern, consistent and terse Common Lisp string manipulation library."; deps = [ args."cl-change-case" args."cl-ppcre" args."cl-ppcre-unicode" args."cl-unicode" args."flexi-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-str/2020-09-25/cl-str-20200925-git.tgz''; - sha256 = ''06k81x80vjw7qd8gca6lnm5k5ws40c6kl99s7m4z72v7jxwa9ykn''; + url = "http://beta.quicklisp.org/archive/cl-str/2020-09-25/cl-str-20200925-git.tgz"; + sha256 = "06k81x80vjw7qd8gca6lnm5k5ws40c6kl99s7m4z72v7jxwa9ykn"; }; packageName = "str"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix index 17a56c09b7e..616d3aa88b6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''string-case''; - version = ''20180711-git''; + baseName = "string-case"; + version = "20180711-git"; - description = ''string-case is a macro that generates specialised decision trees to dispatch on string equality''; + description = "string-case is a macro that generates specialised decision trees to dispatch on string equality"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/string-case/2018-07-11/string-case-20180711-git.tgz''; - sha256 = ''1n36ign4bv0idw14zyayn6i0n3iaff9yw92kpjh3qmdcq3asv90z''; + url = "http://beta.quicklisp.org/archive/string-case/2018-07-11/string-case-20180711-git.tgz"; + sha256 = "1n36ign4bv0idw14zyayn6i0n3iaff9yw92kpjh3qmdcq3asv90z"; }; packageName = "string-case"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix index 2ad15d1bd13..fe13a7d8c17 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''stumpwm''; - version = ''20201016-git''; + baseName = "stumpwm"; + version = "20201016-git"; - description = ''A tiling, keyboard driven window manager''; + description = "A tiling, keyboard driven window manager"; deps = [ args."alexandria" args."cl-ppcre" args."clx" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/stumpwm/2020-10-16/stumpwm-20201016-git.tgz''; - sha256 = ''06lc1d9y83x0ckqd9pls7a1dyriz650mpv1rigncr02qsj3aqpp2''; + url = "http://beta.quicklisp.org/archive/stumpwm/2020-10-16/stumpwm-20201016-git.tgz"; + sha256 = "06lc1d9y83x0ckqd9pls7a1dyriz650mpv1rigncr02qsj3aqpp2"; }; packageName = "stumpwm"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix index 69deb9044c3..e2f1ba6bd26 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''swank''; - version = ''slime-v2.26''; + baseName = "swank"; + version = "slime-v2.26"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/slime/2020-09-25/slime-v2.26.tgz''; - sha256 = ''0zba4vm73g9zamhqkqcb0prm51kf4clixm2rjz89mq180qa7rrqc''; + url = "http://beta.quicklisp.org/archive/slime/2020-09-25/slime-v2.26.tgz"; + sha256 = "0zba4vm73g9zamhqkqcb0prm51kf4clixm2rjz89mq180qa7rrqc"; }; packageName = "swank"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix index de11d48c934..7c19a271354 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''swap-bytes''; - version = ''v1.2''; + baseName = "swap-bytes"; + version = "v1.2"; parasites = [ "swap-bytes/test" ]; - description = ''Optimized byte-swapping primitives.''; + description = "Optimized byte-swapping primitives."; deps = [ args."fiveam" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/swap-bytes/2019-11-30/swap-bytes-v1.2.tgz''; - sha256 = ''05g37m4cpsszh16jz7kiscd6m6l66ms73f3s6s94i56c49jfxdy8''; + url = "http://beta.quicklisp.org/archive/swap-bytes/2019-11-30/swap-bytes-v1.2.tgz"; + sha256 = "05g37m4cpsszh16jz7kiscd6m6l66ms73f3s6s94i56c49jfxdy8"; }; packageName = "swap-bytes"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/symbol-munger.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/symbol-munger.nix index 4bae3cc1cee..30a4a0bcbb0 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/symbol-munger.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/symbol-munger.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { - baseName = ''symbol-munger''; - version = ''20150407-git''; + baseName = "symbol-munger"; + version = "20150407-git"; description = ''Functions to convert between the spacing and capitalization conventions of various environments''; @@ -9,8 +9,8 @@ rec { deps = [ args."alexandria" args."iterate" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/symbol-munger/2015-04-07/symbol-munger-20150407-git.tgz''; - sha256 = ''0dccli8557kvyy2rngh646rmavf96p7xqn5bry65d7c1f61lyqv6''; + url = "http://beta.quicklisp.org/archive/symbol-munger/2015-04-07/symbol-munger-20150407-git.tgz"; + sha256 = "0dccli8557kvyy2rngh646rmavf96p7xqn5bry65d7c1f61lyqv6"; }; packageName = "symbol-munger"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia.nix index 141937219cd..bd318dcad1f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''trivia''; - version = ''20200925-git''; + baseName = "trivia"; + version = "20200925-git"; - description = ''NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase''; + description = "NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase"; deps = [ args."alexandria" args."closer-mop" args."introspect-environment" args."iterate" args."lisp-namespace" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz''; - sha256 = ''192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z''; + url = "http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz"; + sha256 = "192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z"; }; packageName = "trivia"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_balland2006.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_balland2006.nix index 6b5e161a214..3f66d67eac3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_balland2006.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_balland2006.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''trivia_dot_balland2006''; - version = ''trivia-20200925-git''; + baseName = "trivia_dot_balland2006"; + version = "trivia-20200925-git"; - description = ''Optimizer for Trivia based on (Balland 2006)''; + description = "Optimizer for Trivia based on (Balland 2006)"; deps = [ args."alexandria" args."closer-mop" args."introspect-environment" args."iterate" args."lisp-namespace" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz''; - sha256 = ''192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z''; + url = "http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz"; + sha256 = "192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z"; }; packageName = "trivia.balland2006"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level0.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level0.nix index 1c883c07ab0..d6885e3f500 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level0.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level0.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''trivia_dot_level0''; - version = ''trivia-20200925-git''; + baseName = "trivia_dot_level0"; + version = "trivia-20200925-git"; - description = ''Bootstrapping Pattern Matching Library for implementing Trivia''; + description = "Bootstrapping Pattern Matching Library for implementing Trivia"; deps = [ args."alexandria" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz''; - sha256 = ''192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z''; + url = "http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz"; + sha256 = "192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z"; }; packageName = "trivia.level0"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level1.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level1.nix index 1e9394d6447..d208c06e8b2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level1.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level1.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''trivia_dot_level1''; - version = ''trivia-20200925-git''; + baseName = "trivia_dot_level1"; + version = "trivia-20200925-git"; - description = ''Core patterns of Trivia''; + description = "Core patterns of Trivia"; deps = [ args."alexandria" args."trivia_dot_level0" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz''; - sha256 = ''192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z''; + url = "http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz"; + sha256 = "192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z"; }; packageName = "trivia.level1"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level2.nix index 75ee2bd8ee7..c6ce58bceb7 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level2.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level2.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''trivia_dot_level2''; - version = ''trivia-20200925-git''; + baseName = "trivia_dot_level2"; + version = "trivia-20200925-git"; - description = ''NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase''; + description = "NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase"; deps = [ args."alexandria" args."closer-mop" args."lisp-namespace" args."trivia_dot_level0" args."trivia_dot_level1" args."trivial-cltl2" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz''; - sha256 = ''192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z''; + url = "http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz"; + sha256 = "192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z"; }; packageName = "trivia.level2"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_quasiquote.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_quasiquote.nix index 07ad7a56c2e..1dd17765257 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_quasiquote.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_quasiquote.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''trivia_dot_quasiquote''; - version = ''trivia-20200925-git''; + baseName = "trivia_dot_quasiquote"; + version = "trivia-20200925-git"; - description = ''fare-quasiquote extension for trivia''; + description = "fare-quasiquote extension for trivia"; deps = [ args."alexandria" args."closer-mop" args."fare-quasiquote" args."fare-quasiquote-readtable" args."fare-utils" args."lisp-namespace" args."named-readtables" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz''; - sha256 = ''192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z''; + url = "http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz"; + sha256 = "192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z"; }; packageName = "trivia.quasiquote"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_trivial.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_trivial.nix index e2b8add6dfc..ef84229d7a0 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_trivial.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_trivial.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { - baseName = ''trivia_dot_trivial''; - version = ''trivia-20200925-git''; + baseName = "trivia_dot_trivial"; + version = "trivia-20200925-git"; description = ''Base level system of Trivia with a trivial optimizer. Systems that intend to enhance Trivia should depend on this package, not the TRIVIA system, @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."closer-mop" args."lisp-namespace" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivial-cltl2" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz''; - sha256 = ''192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z''; + url = "http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz"; + sha256 = "192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z"; }; packageName = "trivia.trivial"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix index 2d2bc4110dc..f095ecc223b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''trivial-backtrace''; - version = ''20200610-git''; + baseName = "trivial-backtrace"; + version = "20200610-git"; - description = ''trivial-backtrace''; + description = "trivial-backtrace"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-backtrace/2020-06-10/trivial-backtrace-20200610-git.tgz''; - sha256 = ''0slz2chal6vpiqx9zmjh4cnihhw794rq3267s7kz7livpiv52rks''; + url = "http://beta.quicklisp.org/archive/trivial-backtrace/2020-06-10/trivial-backtrace-20200610-git.tgz"; + sha256 = "0slz2chal6vpiqx9zmjh4cnihhw794rq3267s7kz7livpiv52rks"; }; packageName = "trivial-backtrace"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-clipboard.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-clipboard.nix index 3e21ceab87d..c72e79dac51 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-clipboard.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-clipboard.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''trivial-clipboard''; - version = ''20200925-git''; + baseName = "trivial-clipboard"; + version = "20200925-git"; - description = ''trivial-clipboard let access system clipboard.''; + description = "trivial-clipboard let access system clipboard."; deps = [ args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-clipboard/2020-09-25/trivial-clipboard-20200925-git.tgz''; - sha256 = ''1aksag9nfklkg0bshd7dxfip4dj9gl3x0cbisgd2c143k2csb1yc''; + url = "http://beta.quicklisp.org/archive/trivial-clipboard/2020-09-25/trivial-clipboard-20200925-git.tgz"; + sha256 = "1aksag9nfklkg0bshd7dxfip4dj9gl3x0cbisgd2c143k2csb1yc"; }; packageName = "trivial-clipboard"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-cltl2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-cltl2.nix index 278ad5b0ac4..a73c24e9f5e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-cltl2.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-cltl2.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''trivial-cltl2''; - version = ''20200325-git''; + baseName = "trivial-cltl2"; + version = "20200325-git"; - description = ''Compatibility package exporting CLtL2 functionality''; + description = "Compatibility package exporting CLtL2 functionality"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-cltl2/2020-03-25/trivial-cltl2-20200325-git.tgz''; - sha256 = ''0hahi36v47alsvamg62d0cgay8l0razcgxl089ifj6sqy7s8iwys''; + url = "http://beta.quicklisp.org/archive/trivial-cltl2/2020-03-25/trivial-cltl2-20200325-git.tgz"; + sha256 = "0hahi36v47alsvamg62d0cgay8l0razcgxl089ifj6sqy7s8iwys"; }; packageName = "trivial-cltl2"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix index 53669a4675b..5988055841c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''trivial-features''; - version = ''20200715-git''; + baseName = "trivial-features"; + version = "20200715-git"; - description = ''Ensures consistent *FEATURES* across multiple CLs.''; + description = "Ensures consistent *FEATURES* across multiple CLs."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-features/2020-07-15/trivial-features-20200715-git.tgz''; - sha256 = ''0h0xxkp7vciq5yj6a1b5k76h7mzqgb5f9v25nssijgp738nmkni2''; + url = "http://beta.quicklisp.org/archive/trivial-features/2020-07-15/trivial-features-20200715-git.tgz"; + sha256 = "0h0xxkp7vciq5yj6a1b5k76h7mzqgb5f9v25nssijgp738nmkni2"; }; packageName = "trivial-features"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-file-size.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-file-size.nix index 892e1d49d50..a06eda6ff18 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-file-size.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-file-size.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''trivial-file-size''; - version = ''20200427-git''; + baseName = "trivial-file-size"; + version = "20200427-git"; parasites = [ "trivial-file-size/tests" ]; - description = ''Stat a file's size.''; + description = "Stat a file's size."; deps = [ args."fiveam" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-file-size/2020-04-27/trivial-file-size-20200427-git.tgz''; - sha256 = ''1vspkgygrldbjb4gdm1fsn04j50rwil41x0fvvm4fxm84rwrscsa''; + url = "http://beta.quicklisp.org/archive/trivial-file-size/2020-04-27/trivial-file-size-20200427-git.tgz"; + sha256 = "1vspkgygrldbjb4gdm1fsn04j50rwil41x0fvvm4fxm84rwrscsa"; }; packageName = "trivial-file-size"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix index ce1f75522aa..7804dc8b9ab 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''trivial-garbage''; - version = ''20200925-git''; + baseName = "trivial-garbage"; + version = "20200925-git"; parasites = [ "trivial-garbage/tests" ]; - description = ''Portable finalizers, weak hash-tables and weak pointers.''; + description = "Portable finalizers, weak hash-tables and weak pointers."; deps = [ args."rt" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-garbage/2020-09-25/trivial-garbage-20200925-git.tgz''; - sha256 = ''00iw2iw6qzji9b2gwy798l54jdk185sxh1k7m2qd9srs8s730k83''; + url = "http://beta.quicklisp.org/archive/trivial-garbage/2020-09-25/trivial-garbage-20200925-git.tgz"; + sha256 = "00iw2iw6qzji9b2gwy798l54jdk185sxh1k7m2qd9srs8s730k83"; }; packageName = "trivial-garbage"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix index acefb692184..2b763b0480d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''trivial-gray-streams''; - version = ''20200925-git''; + baseName = "trivial-gray-streams"; + version = "20200925-git"; - description = ''Compatibility layer for Gray Streams (see http://www.cliki.net/Gray%20streams).''; + description = "Compatibility layer for Gray Streams (see http://www.cliki.net/Gray%20streams)."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-gray-streams/2020-09-25/trivial-gray-streams-20200925-git.tgz''; - sha256 = ''1mg31fwjixd04lfqbpzjan3cny1i478xm1a9l3p0i9m4dv4g2k2b''; + url = "http://beta.quicklisp.org/archive/trivial-gray-streams/2020-09-25/trivial-gray-streams-20200925-git.tgz"; + sha256 = "1mg31fwjixd04lfqbpzjan3cny1i478xm1a9l3p0i9m4dv4g2k2b"; }; packageName = "trivial-gray-streams"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix index de16d810824..42e09023af3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''trivial-indent''; - version = ''20191007-git''; + baseName = "trivial-indent"; + version = "20191007-git"; - description = ''A very simple library to allow indentation hints for SWANK.''; + description = "A very simple library to allow indentation hints for SWANK."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-indent/2019-10-07/trivial-indent-20191007-git.tgz''; - sha256 = ''0v5isxg6lfbgcpmndb3c515d7bswhwqgjm97li85w39krnw1bfmv''; + url = "http://beta.quicklisp.org/archive/trivial-indent/2019-10-07/trivial-indent-20191007-git.tgz"; + sha256 = "0v5isxg6lfbgcpmndb3c515d7bswhwqgjm97li85w39krnw1bfmv"; }; packageName = "trivial-indent"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-macroexpand-all.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-macroexpand-all.nix index 473a41063e7..b4164949203 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-macroexpand-all.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-macroexpand-all.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''trivial-macroexpand-all''; - version = ''20171023-git''; + baseName = "trivial-macroexpand-all"; + version = "20171023-git"; - description = ''Call each implementation's macroexpand-all equivalent''; + description = "Call each implementation's macroexpand-all equivalent"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-macroexpand-all/2017-10-23/trivial-macroexpand-all-20171023-git.tgz''; - sha256 = ''0h5h9zn32pn26x7ll9h08g0csr2f5hvk1wgbr7kdhx5zbrszd7zm''; + url = "http://beta.quicklisp.org/archive/trivial-macroexpand-all/2017-10-23/trivial-macroexpand-all-20171023-git.tgz"; + sha256 = "0h5h9zn32pn26x7ll9h08g0csr2f5hvk1wgbr7kdhx5zbrszd7zm"; }; packageName = "trivial-macroexpand-all"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-main-thread.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-main-thread.nix index dc0de9da624..de53bf5bd05 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-main-thread.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-main-thread.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''trivial-main-thread''; - version = ''20190710-git''; + baseName = "trivial-main-thread"; + version = "20190710-git"; - description = ''Compatibility library to run things in the main thread.''; + description = "Compatibility library to run things in the main thread."; deps = [ args."alexandria" args."array-utils" args."bordeaux-threads" args."dissect" args."simple-tasks" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-main-thread/2019-07-10/trivial-main-thread-20190710-git.tgz''; - sha256 = ''1zj12rc29rrff5grmi7sjxfzdv78khbb4sg43hy2cb33hykpvg2h''; + url = "http://beta.quicklisp.org/archive/trivial-main-thread/2019-07-10/trivial-main-thread-20190710-git.tgz"; + sha256 = "1zj12rc29rrff5grmi7sjxfzdv78khbb4sg43hy2cb33hykpvg2h"; }; packageName = "trivial-main-thread"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix index 2e2888444e5..36c6e31cc8d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''trivial-mimes''; - version = ''20200715-git''; + baseName = "trivial-mimes"; + version = "20200715-git"; - description = ''Tiny library to detect mime types in files.''; + description = "Tiny library to detect mime types in files."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-mimes/2020-07-15/trivial-mimes-20200715-git.tgz''; - sha256 = ''10mk1v5ad0m3bg5pl7lqhh827jvg5jb896807vmi8wznwk7zaif1''; + url = "http://beta.quicklisp.org/archive/trivial-mimes/2020-07-15/trivial-mimes-20200715-git.tgz"; + sha256 = "10mk1v5ad0m3bg5pl7lqhh827jvg5jb896807vmi8wznwk7zaif1"; }; packageName = "trivial-mimes"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-package-local-nicknames.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-package-local-nicknames.nix index 9cd37f80723..78dcc5163b4 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-package-local-nicknames.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-package-local-nicknames.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''trivial-package-local-nicknames''; - version = ''20200610-git''; + baseName = "trivial-package-local-nicknames"; + version = "20200610-git"; - description = ''Portability library for package-local nicknames''; + description = "Portability library for package-local nicknames"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-package-local-nicknames/2020-06-10/trivial-package-local-nicknames-20200610-git.tgz''; - sha256 = ''1wabkcwz0v144rb2w3rvxlcj264indfnvlyigk1wds7nq0c8lwk5''; + url = "http://beta.quicklisp.org/archive/trivial-package-local-nicknames/2020-06-10/trivial-package-local-nicknames-20200610-git.tgz"; + sha256 = "1wabkcwz0v144rb2w3rvxlcj264indfnvlyigk1wds7nq0c8lwk5"; }; packageName = "trivial-package-local-nicknames"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix index 8cc04c2c64a..83785140dbd 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''trivial-types''; - version = ''20120407-git''; + baseName = "trivial-types"; + version = "20120407-git"; - description = ''Trivial type definitions''; + description = "Trivial type definitions"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-types/2012-04-07/trivial-types-20120407-git.tgz''; - sha256 = ''0y3lfbbvi2qp2cwswzmk1awzqrsrrcfkcm1qn744bgm1fiqhxbxx''; + url = "http://beta.quicklisp.org/archive/trivial-types/2012-04-07/trivial-types-20120407-git.tgz"; + sha256 = "0y3lfbbvi2qp2cwswzmk1awzqrsrrcfkcm1qn744bgm1fiqhxbxx"; }; packageName = "trivial-types"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix index e01eac48a2d..c38ca16d2ff 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''trivial-utf-8''; - version = ''20200925-git''; + baseName = "trivial-utf-8"; + version = "20200925-git"; parasites = [ "trivial-utf-8/doc" "trivial-utf-8/tests" ]; - description = ''A small library for doing UTF-8-based input and output.''; + description = "A small library for doing UTF-8-based input and output."; deps = [ args."mgl-pax" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-utf-8/2020-09-25/trivial-utf-8-20200925-git.tgz''; - sha256 = ''06v9jif4f5xyl5jd7ldg69ds7cypf72xl7nda5q55fssmgcydi1b''; + url = "http://beta.quicklisp.org/archive/trivial-utf-8/2020-09-25/trivial-utf-8-20200925-git.tgz"; + sha256 = "06v9jif4f5xyl5jd7ldg69ds7cypf72xl7nda5q55fssmgcydi1b"; }; packageName = "trivial-utf-8"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/type-i.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/type-i.nix index e76be59540b..bc08f1683de 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/type-i.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/type-i.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''type-i''; - version = ''20191227-git''; + baseName = "type-i"; + version = "20191227-git"; - description = ''Type Inference Utility on Fundamentally 1-arg Predicates''; + description = "Type Inference Utility on Fundamentally 1-arg Predicates"; deps = [ args."alexandria" args."closer-mop" args."introspect-environment" args."lisp-namespace" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/type-i/2019-12-27/type-i-20191227-git.tgz''; - sha256 = ''0f8q6klqjgz1kdyhisfkk07izvgs04jchlv2kl3srjxfr5dj5jl5''; + url = "http://beta.quicklisp.org/archive/type-i/2019-12-27/type-i-20191227-git.tgz"; + sha256 = "0f8q6klqjgz1kdyhisfkk07izvgs04jchlv2kl3srjxfr5dj5jl5"; }; packageName = "type-i"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uax-15.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uax-15.nix index a2980a9d40e..35754246347 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uax-15.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uax-15.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''uax-15''; - version = ''20200325-git''; + baseName = "uax-15"; + version = "20200325-git"; parasites = [ "uax-15/tests" ]; - description = ''Common lisp implementation of Unicode normalization functions :nfc, :nfd, :nfkc and :nfkd (Uax-15)''; + description = "Common lisp implementation of Unicode normalization functions :nfc, :nfd, :nfkc and :nfkd (Uax-15)"; deps = [ args."cl-ppcre" args."fiveam" args."split-sequence" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/uax-15/2020-03-25/uax-15-20200325-git.tgz''; - sha256 = ''0nld8a95fy0nfni8g663786cz5q3x63bxymx0jlaknb6lfibb6pc''; + url = "http://beta.quicklisp.org/archive/uax-15/2020-03-25/uax-15-20200325-git.tgz"; + sha256 = "0nld8a95fy0nfni8g663786cz5q3x63bxymx0jlaknb6lfibb6pc"; }; packageName = "uax-15"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix index 1986f7c88f7..2c36113658a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''uffi''; - version = ''20180228-git''; + baseName = "uffi"; + version = "20180228-git"; - description = ''Universal Foreign Function Library for Common Lisp''; + description = "Universal Foreign Function Library for Common Lisp"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/uffi/2018-02-28/uffi-20180228-git.tgz''; - sha256 = ''1kknzwxsbg2ydy2w0n88y2bq37lqqwg02ffsmz57gqbxvlk26479''; + url = "http://beta.quicklisp.org/archive/uffi/2018-02-28/uffi-20180228-git.tgz"; + sha256 = "1kknzwxsbg2ydy2w0n88y2bq37lqqwg02ffsmz57gqbxvlk26479"; }; packageName = "uffi"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix index ab96b032257..b5a77d6ea34 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''uiop''; - version = ''3.3.4''; + baseName = "uiop"; + version = "3.3.4"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/uiop/2020-02-18/uiop-3.3.4.tgz''; - sha256 = ''0n0fp55ivwi6gzhaywdkngnk2snpp9nn3mz5rq3pnrwldi9q7aav''; + url = "http://beta.quicklisp.org/archive/uiop/2020-02-18/uiop-3.3.4.tgz"; + sha256 = "0n0fp55ivwi6gzhaywdkngnk2snpp9nn3mz5rq3pnrwldi9q7aav"; }; packageName = "uiop"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix index 6c456496732..8f54a89416e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''unit-test''; - version = ''20120520-git''; + baseName = "unit-test"; + version = "20120520-git"; - description = ''unit-testing framework for common lisp''; + description = "unit-testing framework for common lisp"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/unit-test/2012-05-20/unit-test-20120520-git.tgz''; - sha256 = ''1bwbx9d2z9qll46ksfh7bgd0dgh4is2dyfhkladq53qycvjywv9l''; + url = "http://beta.quicklisp.org/archive/unit-test/2012-05-20/unit-test-20120520-git.tgz"; + sha256 = "1bwbx9d2z9qll46ksfh7bgd0dgh4is2dyfhkladq53qycvjywv9l"; }; packageName = "unit-test"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-options.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-options.nix index 7243d5a17ed..250ef24f9ad 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-options.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-options.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''unix-options''; - version = ''20151031-git''; + baseName = "unix-options"; + version = "20151031-git"; - description = ''Easy to use command line option parser''; + description = "Easy to use command line option parser"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/unix-options/2015-10-31/unix-options-20151031-git.tgz''; - sha256 = ''0c9vbvvyx5qwvns87624gzxjcbdkbkcwssg29cxjfv3ci3qwqcd5''; + url = "http://beta.quicklisp.org/archive/unix-options/2015-10-31/unix-options-20151031-git.tgz"; + sha256 = "0c9vbvvyx5qwvns87624gzxjcbdkbkcwssg29cxjfv3ci3qwqcd5"; }; packageName = "unix-options"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-opts.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-opts.nix index 8475b8e4ffd..b7af624f7a5 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-opts.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-opts.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''unix-opts''; - version = ''20200925-git''; + baseName = "unix-opts"; + version = "20200925-git"; parasites = [ "unix-opts/tests" ]; - description = ''minimalistic parser of command line arguments''; + description = "minimalistic parser of command line arguments"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/unix-opts/2020-09-25/unix-opts-20200925-git.tgz''; - sha256 = ''0y7bg825l8my7kpk4iwx0n8wn7rgy7bir60kb0s55g3x0nx5vx35''; + url = "http://beta.quicklisp.org/archive/unix-opts/2020-09-25/unix-opts-20200925-git.tgz"; + sha256 = "0y7bg825l8my7kpk4iwx0n8wn7rgy7bir60kb0s55g3x0nx5vx35"; }; packageName = "unix-opts"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket-server.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket-server.nix index 04a09a8ab40..977ee934c90 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket-server.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket-server.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''usocket-server''; - version = ''usocket-0.8.3''; + baseName = "usocket-server"; + version = "usocket-0.8.3"; - description = ''Universal socket library for Common Lisp (server side)''; + description = "Universal socket library for Common Lisp (server side)"; deps = [ args."alexandria" args."bordeaux-threads" args."split-sequence" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/usocket/2019-12-27/usocket-0.8.3.tgz''; - sha256 = ''19gl72r9jqms8slzn7i7bww2cqng9mhiqqhhccadlrx2xv6d3lm7''; + url = "http://beta.quicklisp.org/archive/usocket/2019-12-27/usocket-0.8.3.tgz"; + sha256 = "19gl72r9jqms8slzn7i7bww2cqng9mhiqqhhccadlrx2xv6d3lm7"; }; packageName = "usocket-server"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix index 6b75384ea10..4dbf781f968 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''usocket''; - version = ''0.8.3''; + baseName = "usocket"; + version = "0.8.3"; - description = ''Universal socket library for Common Lisp''; + description = "Universal socket library for Common Lisp"; deps = [ args."split-sequence" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/usocket/2019-12-27/usocket-0.8.3.tgz''; - sha256 = ''19gl72r9jqms8slzn7i7bww2cqng9mhiqqhhccadlrx2xv6d3lm7''; + url = "http://beta.quicklisp.org/archive/usocket/2019-12-27/usocket-0.8.3.tgz"; + sha256 = "19gl72r9jqms8slzn7i7bww2cqng9mhiqqhhccadlrx2xv6d3lm7"; }; packageName = "usocket"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-items.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-items.nix index b672d0c2ec5..5b992620ecd 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-items.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-items.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''utilities_dot_print-items''; - version = ''20190813-git''; + baseName = "utilities_dot_print-items"; + version = "20190813-git"; parasites = [ "utilities.print-items/test" ]; - description = ''A protocol for flexible and composable printing.''; + description = "A protocol for flexible and composable printing."; deps = [ args."alexandria" args."fiveam" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/utilities.print-items/2019-08-13/utilities.print-items-20190813-git.tgz''; - sha256 = ''12l4kzz621qfcg8p5qzyxp4n4hh9wdlpiziykwb4c80g32rdwkc2''; + url = "http://beta.quicklisp.org/archive/utilities.print-items/2019-08-13/utilities.print-items-20190813-git.tgz"; + sha256 = "12l4kzz621qfcg8p5qzyxp4n4hh9wdlpiziykwb4c80g32rdwkc2"; }; packageName = "utilities.print-items"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-tree.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-tree.nix index 80ff6d9ff76..2f2345fe0be 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-tree.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-tree.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''utilities_dot_print-tree''; - version = ''20200325-git''; + baseName = "utilities_dot_print-tree"; + version = "20200325-git"; parasites = [ "utilities.print-tree/test" ]; - description = ''This system provides simple facilities for printing tree structures.''; + description = "This system provides simple facilities for printing tree structures."; deps = [ args."alexandria" args."fiveam" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/utilities.print-tree/2020-03-25/utilities.print-tree-20200325-git.tgz''; - sha256 = ''1nam8g2ppzkzpkwwhmil9y68is43ljpvc7hd64zxp4zsaqab5dww''; + url = "http://beta.quicklisp.org/archive/utilities.print-tree/2020-03-25/utilities.print-tree-20200325-git.tgz"; + sha256 = "1nam8g2ppzkzpkwwhmil9y68is43ljpvc7hd64zxp4zsaqab5dww"; }; packageName = "utilities.print-tree"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix index 43ae799961d..a64d913d1d9 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''uuid''; - version = ''20200715-git''; + baseName = "uuid"; + version = "20200715-git"; - description = ''UUID Generation''; + description = "UUID Generation"; deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."trivial-utf-8" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/uuid/2020-07-15/uuid-20200715-git.tgz''; - sha256 = ''1ymir6hgax1vbbcgyprnwbsx224ih03a55v10l35xridwyzhzrx0''; + url = "http://beta.quicklisp.org/archive/uuid/2020-07-15/uuid-20200715-git.tgz"; + sha256 = "1ymir6hgax1vbbcgyprnwbsx224ih03a55v10l35xridwyzhzrx0"; }; packageName = "uuid"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix index 6a4751f799e..401466e8a59 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''vom''; - version = ''20160825-git''; + baseName = "vom"; + version = "20160825-git"; - description = ''A tiny logging utility.''; + description = "A tiny logging utility."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/vom/2016-08-25/vom-20160825-git.tgz''; - sha256 = ''0mvln0xx8qnrsmaj7c0f2ilgahvf078qvhqag7qs3j26xmamjm93''; + url = "http://beta.quicklisp.org/archive/vom/2016-08-25/vom-20160825-git.tgz"; + sha256 = "0mvln0xx8qnrsmaj7c0f2ilgahvf078qvhqag7qs3j26xmamjm93"; }; packageName = "vom"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix index 78c2e30d7ee..e4ddb59c398 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''woo''; - version = ''20200427-git''; + baseName = "woo"; + version = "20200427-git"; - description = ''An asynchronous HTTP server written in Common Lisp''; + description = "An asynchronous HTTP server written in Common Lisp"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-utilities" args."clack-socket" args."fast-http" args."fast-io" args."flexi-streams" args."lev" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."swap-bytes" args."trivial-features" args."trivial-gray-streams" args."trivial-utf-8" args."vom" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/woo/2020-04-27/woo-20200427-git.tgz''; - sha256 = ''1mmgwgf9n74zab96x1n4faij30l2vk19xy74fcp0xnpj4lrp7v29''; + url = "http://beta.quicklisp.org/archive/woo/2020-04-27/woo-20200427-git.tgz"; + sha256 = "1mmgwgf9n74zab96x1n4faij30l2vk19xy74fcp0xnpj4lrp7v29"; }; packageName = "woo"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix index 257ed57df4e..b28c751fdd4 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''wookie''; - version = ''20191130-git''; + baseName = "wookie"; + version = "20191130-git"; - description = ''An evented webserver for Common Lisp.''; + description = "An evented webserver for Common Lisp."; deps = [ args."alexandria" args."babel" args."blackbird" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chunga" args."cl-async" args."cl-async-base" args."cl-async-ssl" args."cl-async-util" args."cl-fad" args."cl-libuv" args."cl-ppcre" args."cl-utilities" args."do-urlencode" args."fast-http" args."fast-io" args."flexi-streams" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/wookie/2019-11-30/wookie-20191130-git.tgz''; - sha256 = ''13f9fi7yv28lag79z03jrnm7aih2x5zwvh4hw9cadw75956975d2''; + url = "http://beta.quicklisp.org/archive/wookie/2019-11-30/wookie-20191130-git.tgz"; + sha256 = "13f9fi7yv28lag79z03jrnm7aih2x5zwvh4hw9cadw75956975d2"; }; packageName = "wookie"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix index 5a1b9039425..5130b81c91a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''xembed''; - version = ''clx-20191130-git''; + baseName = "xembed"; + version = "clx-20191130-git"; - description = ''An implementation of the XEMBED protocol that integrates with CLX.''; + description = "An implementation of the XEMBED protocol that integrates with CLX."; deps = [ args."clx" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clx-xembed/2019-11-30/clx-xembed-20191130-git.tgz''; - sha256 = ''1ik5gxzhn9j7827jg6g8rk2wa5jby11n2db24y6wrf0ldnbpj7jd''; + url = "http://beta.quicklisp.org/archive/clx-xembed/2019-11-30/clx-xembed-20191130-git.tgz"; + sha256 = "1ik5gxzhn9j7827jg6g8rk2wa5jby11n2db24y6wrf0ldnbpj7jd"; }; packageName = "xembed"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xkeyboard.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xkeyboard.nix index 4bfc0678f0f..f46bff1f58f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xkeyboard.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xkeyboard.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''xkeyboard''; - version = ''clx-20120811-git''; + baseName = "xkeyboard"; + version = "clx-20120811-git"; parasites = [ "xkeyboard-test" ]; - description = ''XKeyboard is X11 extension for clx of the same name.''; + description = "XKeyboard is X11 extension for clx of the same name."; deps = [ args."clx" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clx-xkeyboard/2012-08-11/clx-xkeyboard-20120811-git.tgz''; - sha256 = ''11q70drx3xn7rvk528qlnzpnxd6hg6801kc54ys3jz1l7074458n''; + url = "http://beta.quicklisp.org/archive/clx-xkeyboard/2012-08-11/clx-xkeyboard-20120811-git.tgz"; + sha256 = "11q70drx3xn7rvk528qlnzpnxd6hg6801kc54ys3jz1l7074458n"; }; packageName = "xkeyboard"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xml_dot_location.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xml_dot_location.nix index 35854cd6b96..730b1287ba2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xml_dot_location.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xml_dot_location.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { - baseName = ''xml_dot_location''; - version = ''20200325-git''; + baseName = "xml_dot_location"; + version = "20200325-git"; parasites = [ "xml.location/test" ]; @@ -11,8 +11,8 @@ rec { deps = [ args."alexandria" args."anaphora" args."babel" args."cl-ppcre" args."closer-mop" args."closure-common" args."cxml" args."cxml-stp" args."iterate" args."let-plus" args."lift" args."more-conditions" args."parse-number" args."puri" args."split-sequence" args."trivial-features" args."trivial-gray-streams" args."xpath" args."yacc" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/xml.location/2020-03-25/xml.location-20200325-git.tgz''; - sha256 = ''0wfccj1p1al0w9pc5rhxpsvm3wb2lr5fc4cfjyg751pwsasjikwx''; + url = "http://beta.quicklisp.org/archive/xml.location/2020-03-25/xml.location-20200325-git.tgz"; + sha256 = "0wfccj1p1al0w9pc5rhxpsvm3wb2lr5fc4cfjyg751pwsasjikwx"; }; packageName = "xml.location"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix index c02e6e24818..e1da47fe37a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''xmls''; - version = ''3.0.2''; + baseName = "xmls"; + version = "3.0.2"; parasites = [ "xmls/test" "xmls/unit-test" ]; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."fiveam" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/xmls/2018-04-30/xmls-3.0.2.tgz''; - sha256 = ''1r7mvw62zjcg45j3hm8jlbiisad2b415pghn6qcmhl03dmgp7kgi''; + url = "http://beta.quicklisp.org/archive/xmls/2018-04-30/xmls-3.0.2.tgz"; + sha256 = "1r7mvw62zjcg45j3hm8jlbiisad2b415pghn6qcmhl03dmgp7kgi"; }; packageName = "xmls"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix index 3e14a5ba9f0..1f062549a0a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''xpath''; - version = ''plexippus-20190521-git''; + baseName = "xpath"; + version = "plexippus-20190521-git"; parasites = [ "xpath/test" ]; - description = ''An implementation of the XML Path Language (XPath) Version 1.0''; + description = "An implementation of the XML Path Language (XPath) Version 1.0"; deps = [ args."alexandria" args."babel" args."cl-ppcre" args."closure-common" args."cxml" args."parse-number" args."puri" args."trivial-features" args."trivial-gray-streams" args."yacc" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/plexippus-xpath/2019-05-21/plexippus-xpath-20190521-git.tgz''; - sha256 = ''15357w1rlmahld4rh8avix7m40mwiiv7n2vlyc57ldw2k1m0n7xa''; + url = "http://beta.quicklisp.org/archive/plexippus-xpath/2019-05-21/plexippus-xpath-20190521-git.tgz"; + sha256 = "15357w1rlmahld4rh8avix7m40mwiiv7n2vlyc57ldw2k1m0n7xa"; }; packageName = "xpath"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix index b9ab71744c3..7d0c52d28a7 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''xsubseq''; - version = ''20170830-git''; + baseName = "xsubseq"; + version = "20170830-git"; description = ''Efficient way to manage "subseq"s in Common Lisp''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/xsubseq/2017-08-30/xsubseq-20170830-git.tgz''; - sha256 = ''1am63wkha97hyvkqf4ydx3q07mqpa0chkx65znr7kmqi83a8waml''; + url = "http://beta.quicklisp.org/archive/xsubseq/2017-08-30/xsubseq-20170830-git.tgz"; + sha256 = "1am63wkha97hyvkqf4ydx3q07mqpa0chkx65znr7kmqi83a8waml"; }; packageName = "xsubseq"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix index c7031f4aa3f..5ec84290c4d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''yacc''; - version = ''cl-20101006-darcs''; + baseName = "yacc"; + version = "cl-20101006-darcs"; - description = ''A LALR(1) parser generator for Common Lisp''; + description = "A LALR(1) parser generator for Common Lisp"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-yacc/2010-10-06/cl-yacc-20101006-darcs.tgz''; - sha256 = ''0cymvl0arp4yahqcnhxggs1z2g42bf6z4ix75ba7wbsi52zirjp7''; + url = "http://beta.quicklisp.org/archive/cl-yacc/2010-10-06/cl-yacc-20101006-darcs.tgz"; + sha256 = "0cymvl0arp4yahqcnhxggs1z2g42bf6z4ix75ba7wbsi52zirjp7"; }; packageName = "yacc"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix index 9f6ac0a84ca..727bb74e57b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''yason''; - version = ''v0.7.8''; + baseName = "yason"; + version = "v0.7.8"; - description = ''JSON parser/encoder''; + description = "JSON parser/encoder"; deps = [ args."alexandria" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/yason/2019-12-27/yason-v0.7.8.tgz''; - sha256 = ''11d51i2iw4nxsparwbh3s6w9zyms3wi0z0fprwz1d3sqlf03j6f1''; + url = "http://beta.quicklisp.org/archive/yason/2019-12-27/yason-v0.7.8.tgz"; + sha256 = "11d51i2iw4nxsparwbh3s6w9zyms3wi0z0fprwz1d3sqlf03j6f1"; }; packageName = "yason"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix index 74e5d7e97e9..bed825c24b2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''zpb-ttf''; - version = ''1.0.3''; + baseName = "zpb-ttf"; + version = "1.0.3"; - description = ''Access TrueType font metrics and outlines from Common Lisp''; + description = "Access TrueType font metrics and outlines from Common Lisp"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/zpb-ttf/2013-07-20/zpb-ttf-1.0.3.tgz''; - sha256 = ''1irv0d0pcbwi2wx6hhjjyxzw12lnw8pvyg6ljsljh8xmhppbg5j6''; + url = "http://beta.quicklisp.org/archive/zpb-ttf/2013-07-20/zpb-ttf-1.0.3.tgz"; + sha256 = "1irv0d0pcbwi2wx6hhjjyxzw12lnw8pvyg6ljsljh8xmhppbg5j6"; }; packageName = "zpb-ttf"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix index 96d5867a3b3..412fd4b8dee 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix @@ -81,7 +81,7 @@ in postInstall = ((x.overrides y).postInstall or "") + '' export NIX_LISP_ASDF_PATHS="$NIX_LISP_ASDF_PATHS $out/lib/common-lisp/query-fs" - export HOME=$PWD + export HOME=$PWD export NIX_LISP_PRELAUNCH_HOOK="nix_lisp_build_system query-fs \ '(function query-fs:run-fs-with-cmdline-args)' '$linkedSystems'" "$out/bin/query-fs-lisp-launcher.sh" @@ -231,4 +231,14 @@ $out/lib/common-lisp/query-fs" cl-cffi-gtk-gdk = addNativeLibs [pkgs.gtk3]; cl-cffi-gtk-gtk3 = addNativeLibs [pkgs.gtk3]; cl-webkit2 = addNativeLibs [pkgs.webkitgtk]; + clfswm = x: { + overrides = y: (x.overrides y) // { + postInstall = '' + export NIX_LISP_PRELAUNCH_HOOK="nix_lisp_build_system clfswm '(function clfswm:main)'" + "$out/bin/clfswm-lisp-launcher.sh" + + cp "$out/lib/common-lisp/clfswm/clfswm" "$out/bin" + ''; + }; + }; } diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt index 52d626888a3..383510df777 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt @@ -82,6 +82,7 @@ cl-utilities cl-vectors cl-webkit2 cl-who +clfswm clx collectors command-line-arguments diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix index 11244ec84a6..df6d908ba9d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix @@ -1,6 +1,6 @@ -{stdenv, fetchurl, pkgs, clwrapper}: +{lib, stdenv, fetchurl, pkgs, clwrapper}: let quicklisp-to-nix-packages = rec { - inherit stdenv fetchurl clwrapper pkgs quicklisp-to-nix-packages; + inherit lib stdenv fetchurl clwrapper pkgs quicklisp-to-nix-packages; callPackage = pkgs.lib.callPackageWith quicklisp-to-nix-packages; buildLispPackage = callPackage ./define-package.nix; @@ -2848,6 +2848,13 @@ let quicklisp-to-nix-packages = rec { "fiasco" = quicklisp-to-nix-packages."fiasco"; })); + "clfswm" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."clfswm" or (x: {})) + (import ./quicklisp-to-nix-output/clfswm.nix { + inherit fetchurl; + "clx" = quicklisp-to-nix-packages."clx"; + })); "cl-who" = buildLispPackage ((f: x: (x // (f x))) diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index fddb028b80a..85f39228584 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -5,7 +5,7 @@ nixpkgs$ maintainers/scripts/update-luarocks-packages pkgs/development/lua-modul These packages are manually refined in lua-overrides.nix */ -{ self, lib, stdenv, fetchurl, fetchgit, pkgs, ... } @ args: +{ self, lib, fetchurl, fetchgit, pkgs, ... } @ args: self: super: with self; { diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 8e77c190247..eec969f99ca 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -108,7 +108,7 @@ with super; lgi = super.lgi.override({ nativeBuildInputs = [ - pkgs.pkgconfig + pkgs.pkg-config ]; buildInputs = [ pkgs.glib diff --git a/pkgs/development/misc/avr8-burn-omat/default.nix b/pkgs/development/misc/avr8-burn-omat/default.nix index 1f504ac280e..0a9d666f8b7 100644 --- a/pkgs/development/misc/avr8-burn-omat/default.nix +++ b/pkgs/development/misc/avr8-burn-omat/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = with lib; { description = "GUI tool for avrdude"; homepage = "http://avr8-burn-o-mat.aaabbb.de/avr8_burn_o_mat_avrdude_gui_en.html"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; platforms = platforms.all; }; } diff --git a/pkgs/development/misc/breakpad/default.nix b/pkgs/development/misc/breakpad/default.nix new file mode 100644 index 00000000000..7fb2b329667 --- /dev/null +++ b/pkgs/development/misc/breakpad/default.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchgit }: +let + lss = fetchgit { + url = "https://chromium.googlesource.com/linux-syscall-support"; + rev = "d9ad2969b369a9f1c455fef92d04c7628f7f9eb8"; + sha256 = "952dv+ZE1ge/WF5RyHmEqht+AofoRHKAeFmGasVF9BA="; + }; +in stdenv.mkDerivation { + pname = "breakpad"; + + version = "unstable-3b3469e"; + + src = fetchgit { + url = "https://chromium.googlesource.com/breakpad/breakpad"; + rev = "3b3469e9ed0de3d02e4450b9b95014a4266cf2ff"; + sha256 = "bRGOBrGPK+Zxp+KK+E5MFkYlDUNVhVeInVSwq+eCAF0="; + }; + + postUnpack = '' + ln -s ${lss} $sourceRoot/src/third_party/lss + ''; + + meta = with lib; { + description = "An open-source multi-platform crash reporting system"; + homepage = "https://chromium.googlesource.com/breakpad"; + license = licenses.bsd3; + maintainers = with maintainers; [ berberman ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/misc/google-clasp/default.nix b/pkgs/development/misc/google-clasp/default.nix index 1e138aaa8f7..12598e9fd86 100644 --- a/pkgs/development/misc/google-clasp/default.nix +++ b/pkgs/development/misc/google-clasp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs }: +{ lib, stdenv, pkgs }: let version = "2.2.1"; in @@ -12,8 +12,8 @@ in meta = { description = "Command Line tool for Google Apps Script Projects"; homepage = "https://developers.google.com/apps-script/guides/clasp"; - license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.michojel ]; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.michojel ]; priority = 100; }; } diff --git a/pkgs/development/misc/google-clasp/google-clasp.nix b/pkgs/development/misc/google-clasp/google-clasp.nix index be260edb643..e21d6a0308b 100644 --- a/pkgs/development/misc/google-clasp/google-clasp.nix +++ b/pkgs/development/misc/google-clasp/google-clasp.nix @@ -6,7 +6,7 @@ let nodeEnv = import ../../node-packages/node-env.nix { - inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile; + inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile; inherit nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; @@ -14,4 +14,4 @@ in import ./node-packages.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} \ No newline at end of file +} diff --git a/pkgs/development/misc/google-clasp/node-packages.nix b/pkgs/development/misc/google-clasp/node-packages.nix index c73c122e572..a58f58e05c6 100644 --- a/pkgs/development/misc/google-clasp/node-packages.nix +++ b/pkgs/development/misc/google-clasp/node-packages.nix @@ -2102,4 +2102,4 @@ in bypassCache = true; reconstructLock = true; }; -} \ No newline at end of file +} diff --git a/pkgs/development/misc/haskell/hasura/ci-info/default.nix b/pkgs/development/misc/haskell/hasura/ci-info/default.nix index 53c85a2e5ba..2770e74a698 100644 --- a/pkgs/development/misc/haskell/hasura/ci-info/default.nix +++ b/pkgs/development/misc/haskell/hasura/ci-info/default.nix @@ -1,5 +1,5 @@ { mkDerivation, aeson, aeson-casing, base, fetchgit, hashable -, hpack, stdenv, template-haskell, text, th-lift-instances +, hpack, lib, template-haskell, text, th-lift-instances , unordered-containers }: mkDerivation { @@ -18,5 +18,5 @@ mkDerivation { libraryToolDepends = [ hpack ]; prePatch = "hpack"; homepage = "https://github.com/hasura/ci-info-hs#readme"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; } diff --git a/pkgs/development/misc/haskell/hasura/graphql-engine/default.nix b/pkgs/development/misc/haskell/hasura/graphql-engine/default.nix index 055459514e4..9e7d448e4c1 100644 --- a/pkgs/development/misc/haskell/hasura/graphql-engine/default.nix +++ b/pkgs/development/misc/haskell/hasura/graphql-engine/default.nix @@ -13,7 +13,7 @@ , optparse-applicative, pem, pg-client, postgresql-binary , postgresql-libpq, process, profunctors, psqueues, QuickCheck , regex-tdfa, safe, scientific, semver, shakespeare, split -, Spock-core, stdenv, stm, stm-containers, template-haskell, text +, Spock-core, lib, stm, stm-containers, template-haskell, text , text-builder, text-conversions, th-lift-instances, these, time , transformers, transformers-base, unix, unordered-containers , uri-encode, uuid, vector, wai, wai-websockets, warp, websockets @@ -68,8 +68,8 @@ mkDerivation { doCheck = false; homepage = "https://www.hasura.io"; description = "GraphQL API over Postgres"; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ offline ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ offline ]; hydraPlatforms = []; broken = true; } diff --git a/pkgs/development/misc/haskell/hasura/graphql-parser/default.nix b/pkgs/development/misc/haskell/hasura/graphql-parser/default.nix index 991b5384d5c..dbd3edf0064 100644 --- a/pkgs/development/misc/haskell/hasura/graphql-parser/default.nix +++ b/pkgs/development/misc/haskell/hasura/graphql-parser/default.nix @@ -1,6 +1,6 @@ { mkDerivation, aeson, attoparsec, base, bytestring, containers , criterion, fetchgit, filepath, hedgehog, hpack, prettyprinter -, protolude, regex-tdfa, scientific, stdenv, template-haskell, text +, protolude, regex-tdfa, scientific, lib, template-haskell, text , text-builder, th-lift-instances, unordered-containers, vector }: mkDerivation { @@ -32,5 +32,5 @@ mkDerivation { doCheck = false; prePatch = "hpack"; homepage = "https://github.com/hasura/graphql-parser-hs#readme"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; } diff --git a/pkgs/development/misc/haskell/hasura/pg-client/default.nix b/pkgs/development/misc/haskell/hasura/pg-client/default.nix index 725e5e7f640..bccb3f6eda3 100644 --- a/pkgs/development/misc/haskell/hasura/pg-client/default.nix +++ b/pkgs/development/misc/haskell/hasura/pg-client/default.nix @@ -2,7 +2,7 @@ , criterion, fetchgit, file-embed, hashable, hashtables, hasql , hasql-pool, hasql-transaction, monad-control, mtl , postgresql-binary, postgresql-libpq, resource-pool, retry -, scientific, stdenv, template-haskell, text, text-builder, th-lift +, scientific, lib, template-haskell, text, text-builder, th-lift , th-lift-instances, time, transformers-base, uuid, vector }: mkDerivation { @@ -26,5 +26,5 @@ mkDerivation { hasql-transaction mtl postgresql-libpq text text-builder ]; homepage = "https://github.com/hasura/platform"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; } diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/development/misc/loc/default.nix index 33de722baa2..fb518279d00 100644 --- a/pkgs/development/misc/loc/default.nix +++ b/pkgs/development/misc/loc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: with rustPlatform; @@ -18,8 +18,8 @@ buildRustPackage rec { meta = with lib; { homepage = "https://github.com/cgag/loc"; description = "Count lines of code quickly"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/misc/msp430/gcc-support.nix b/pkgs/development/misc/msp430/gcc-support.nix index e9ed959c2fd..fa143173c70 100644 --- a/pkgs/development/misc/msp430/gcc-support.nix +++ b/pkgs/development/misc/msp430/gcc-support.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: let mspgccVersion = "6_1_1_0"; @@ -19,7 +19,7 @@ in stdenvNoCC.mkDerivation rec { touch $out/lib/lib ''; - meta = with stdenvNoCC.lib; { + meta = with lib; { description = '' Development headers and linker scripts for TI MSP430 microcontrollers ''; diff --git a/pkgs/development/misc/msp430/mspdebug.nix b/pkgs/development/misc/msp430/mspdebug.nix index f8616ff0bc4..122b3cec4b7 100644 --- a/pkgs/development/misc/msp430/mspdebug.nix +++ b/pkgs/development/misc/msp430/mspdebug.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { }; enableParallelBuilding = true; - nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin pkg-config - ++ stdenv.lib.optional (enableMspds && stdenv.isLinux) autoPatchelfHook; + nativeBuildInputs = lib.optional stdenv.isDarwin pkg-config + ++ lib.optional (enableMspds && stdenv.isLinux) autoPatchelfHook; buildInputs = [ libusb-compat-0_1 ] - ++ stdenv.lib.optional stdenv.isDarwin hidapi - ++ stdenv.lib.optional enableReadline readline; + ++ lib.optional stdenv.isDarwin hidapi + ++ lib.optional enableReadline readline; - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.isDarwin '' # TODO: remove once a new 0.26+ release is made substituteInPlace drivers/tilib_api.c --replace .so ${stdenv.hostPlatform.extensions.sharedLibrary} @@ -40,8 +40,8 @@ stdenv.mkDerivation rec { ''; # TODO: wrap with MSPDEBUG_TILIB_PATH env var instead of these rpath fixups in 0.26+ - runtimeDependencies = stdenv.lib.optional enableMspds mspds; - postFixup = stdenv.lib.optionalString (enableMspds && stdenv.isDarwin) '' + runtimeDependencies = lib.optional enableMspds mspds; + postFixup = lib.optionalString (enableMspds && stdenv.isDarwin) '' # autoPatchelfHook only works on linux so... for dep in $runtimeDependencies; do install_name_tool -add_rpath $dep/lib $out/bin/$pname @@ -50,8 +50,8 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" "INSTALL=install" ]; makeFlags = [ "UNAME_S=$(unameS)" ] ++ - stdenv.lib.optional (!enableReadline) "WITHOUT_READLINE=1"; - unameS = stdenv.lib.optionalString stdenv.isDarwin "Darwin"; + lib.optional (!enableReadline) "WITHOUT_READLINE=1"; + unameS = lib.optionalString stdenv.isDarwin "Darwin"; meta = with lib; { description = "A free programmer, debugger, and gdb proxy for MSP430 MCUs"; diff --git a/pkgs/development/misc/resholve/README.md b/pkgs/development/misc/resholve/README.md index ddba7fc1493..6b99aebb597 100644 --- a/pkgs/development/misc/resholve/README.md +++ b/pkgs/development/misc/resholve/README.md @@ -6,9 +6,28 @@ until then I'll outline how to use the `resholvePackage` function. > Fair warning: resholve does *not* aspire to resolving all valid Shell > scripts. It depends on the OSH/Oil parser, which aims to support most (but -> not all) Bash, and aims to be a ~90% sort of solution. +> not all) Bash. resholve aims to be a ~90% sort of solution. -Let's start with a simple example from one of my own projects: +## API Concepts + +The main difference between `resholvePackage` and other builder functions +is the `solutions` attrset, which describes which scripts to resolve and how. +Each "solution" (k=v pair) in this attrset describes one resholve invocation. + +> NOTE: For most shell packages, one invocation will probably be enough: +> - Packages with a single script will only need one solution. +> - Packages with multiple scripts can still use one solution if the scripts +> don't require conflicting directives. +> - Packages with scripts that require conflicting directives can use multiple +> solutions to resolve the scripts separately, but produce a single package. + +## Basic Example + +Here's a simple example from one of my own projects, with annotations: +<!-- +TODO: ideally this will use a nixpkgs example; but we don't have any IN yet +and the first package PR (bashup-events) is too complex for this context. +--> ```nix { stdenv, lib, resholvePackage, fetchFromGitHub, bashup-events44, bashInteractive_5, doCheck ? true, shellcheck }: @@ -22,10 +41,20 @@ resholvePackage rec { }; solutions = { + # Give each solution a short name. This is what you'd use to + # override its settings, and it shows in (some) error messages. profile = { - # the only *required* arguments + # the only *required* arguments are the 3 below + + # Specify 1 or more $out-relative script paths. Unlike many + # builders, resholvePackage modifies the output files during + # fixup (to correctly resolve in-package sourcing). scripts = [ "bin/shellswain.bash" ]; + + # "none" for no shebang, "${bash}/bin/bash" for bash, etc. interpreter = "none"; + + # packages resholve should resolve executables from inputs = [ bashup-events44 ]; }; }; @@ -39,100 +68,91 @@ resholvePackage rec { } ``` -I'll focus on the `solutions` attribute, since this is the only part -that differs from other derivations. - -Each "solution" (k=v pair) -describes one resholve invocation. For most shell packages, one -invocation will probably be enough. resholve will make you be very -explicit about your script's dependencies, and it may also need your -help sorting out some references or problems that it can't safely -handle on its own. - -If you have more than one script, and your scripts need conflicting -directives, you can specify more than one solution to resolve the -scripts separately, but still produce a single package. - -Let's take a closer look: - -```nix - solutions = { - # each solution has a short name; this is what you'd use to - # override the settings of this solution, and it may also show up - # in (some) error messages. - profile = { - # specify one or more $out-relative script paths (unlike many - # builders, resholve will modify the output files during fixup - # to correctly resolve scripts that source within the package) - scripts = [ "bin/shellswain.bash" ]; - # "none" for no shebang, "${bash}/bin/bash" for bash, etc. - interpreter = "none"; - # packages resholve should resolve executables from - inputs = [ bashup-events44 ]; - }; - }; -``` - -resholve has a (growing) number of options for handling more complex -scripts. I won't cover these in excruciating detail here. You can find -more information about these in `man resholve` via `nixpkgs.resholve`. - -Instead, we'll look at the general form of the solutions attrset: - -```nix -solutions = { - shortname = { - # required - # $out-relative paths to try resolving - scripts = [ "bin/shunit2" ]; - # packages to resolve executables from - inputs = [ coreutils gnused gnugrep findutils ]; - # path for shebang, or 'none' to omit shebang - interpreter = "${bash}/bin/bash"; - - # optional - fake = { fake directives }; - fix = { fix directives }; - keep = { keep directives }; - # file to inject before first code-line of script - prologue = file; - # file to inject after last code-line of script - epilogue = file; - # extra command-line flags passed to resholve; generally this API - # should align with what resholve supports, but flags may help if - # you need to override the version of resholve. - flags = [ ]; - }; -}; -``` - -The main way you'll adjust how resholve handles your scripts are the -fake, fix, and keep directives. The manpage covers their purpose and -how to format them on the command-line, so I'll focus on how you'll -need to translate them into Nix types. +## Options + +`resholvePackage` maps Nix types/idioms into the flags and environment variables +that the `resholve` CLI expects. Here's an overview: + +| Option | Type | Containing | +| ------------- | ------- | ----------------------------------------------------- | +| scripts | list | $out-relative string paths to resolve | +| inputs | list | packages to resolve executables from | +| interpreter | string | 'none' or abspath for shebang | +| prologue | file | text to insert before the first code-line | +| epilogue | file | text to isnert after the last code-line | +| flags | list | strings to pass as flags | +| fake | attrset | [directives](#controlling-resolution-with-directives) | +| fix | attrset | [directives](#controlling-resolution-with-directives) | +| keep | attrset | [directives](#controlling-resolution-with-directives) | + +## Controlling resolution with directives + +In order to resolve a script, resholve will make you disambiguate how it should +handle any potential problems it encounters with directives. There are currently +3 types: +1. `fake` directives tell resholve to pretend it knows about an identifier + such as a function, builtin, external command, etc. if there's a good reason + it doesn't already know about it. Common examples: + - builtins for a non-bash shell + - loadable builtins + - platform-specific external commands in cross-platform conditionals +2. `fix` directives give resholve permission to fix something that it can't + safely fix automatically. Common examples: + - resolving commands in aliases (this is appropriate for standalone scripts + that use aliases non-interactively--but it would prevent profile/rc + scripts from using the latest current-system symlinks.) + - resolve commands in a variable definition + - resolve an absolute command path from inputs as if it were a bare reference +3. `keep` directives tell resholve not to raise an error (i.e., ignore) + something it would usually object to. Common examples: + - variables used as/within the first word of a command + - pre-existing absolute or user-relative (~) command paths + - dynamic (variable) arguments to commands known to accept/run other commands + +> NOTE: resholve has a (growing) number of directives detailed in `man resholve` +> via `nixpkgs.resholve`. + +Each of these 3 types is represented by its own attrset, where you can think +of the key as a scope. The value should be: +- `true` for any directives that the resholve CLI accepts as a single word +- a list of strings for all other options +<!-- +TODO: these should be fully-documented here, but I'm already maintaining +more copies of their specification/behavior than I like, and continuing to +add more at this early date will only ensure that I spend more time updating +docs and less time filling in feature gaps. + +Full documentation may be greatly accellerated if someone can help me sort out +single-sourcing. See: https://github.com/abathur/resholve/issues/19 +--> + +This will hopefully make more sense when you see it. Here are CLI examples +from the manpage, and the Nix equivalents: ```nix # --fake 'f:setUp;tearDown builtin:setopt source:/etc/bashrc' fake = { - function = [ "setUp" "tearDown" ]; - builtin = [ "setopt" ]; - source = [ "/etc/bashrc" ]; + # fake accepts the initial of valid identifier types as a CLI convienience. + # Use full names in the Nix API. + function = [ "setUp" "tearDown" ]; + builtin = [ "setopt" ]; + source = [ "/etc/bashrc" ]; }; # --fix 'aliases xargs:ls $GIT:gix' fix = { - # all single-word directives use `true` as value - aliases = true; - xargs = [ "ls" ]; - "$GIT" = [ "gix" ]; + # all single-word directives use `true` as value + aliases = true; + xargs = [ "ls" ]; + "$GIT" = [ "gix" ]; }; # --keep 'which:git;ls .:$HOME $LS:exa /etc/bashrc ~/.bashrc' keep = { - which = [ "git" "ls" ]; - "." = [ "$HOME" ]; - "$LS" = [ "exa" ]; - "/etc/bashrc" = true; - "~/.bashrc" = true; + which = [ "git" "ls" ]; + "." = [ "$HOME" ]; + "$LS" = [ "exa" ]; + "/etc/bashrc" = true; + "~/.bashrc" = true; }; ``` diff --git a/pkgs/development/misc/resholve/deps.nix b/pkgs/development/misc/resholve/deps.nix index 9be283e4933..86bcba57075 100644 --- a/pkgs/development/misc/resholve/deps.nix +++ b/pkgs/development/misc/resholve/deps.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , python27Packages , fetchFromGitHub , makeWrapper @@ -106,12 +106,12 @@ rec { _NIX_SHELL_LIBCMARK = "${cmark}/lib/libcmark${stdenv.hostPlatform.extensions.sharedLibrary}"; # See earlier note on glibcLocales - LOCALE_ARCHIVE = stdenv.lib.optionalString (stdenv.buildPlatform.libc == "glibc") "${glibcLocales}/lib/locale/locale-archive"; + LOCALE_ARCHIVE = lib.optionalString (stdenv.buildPlatform.libc == "glibc") "${glibcLocales}/lib/locale/locale-archive"; meta = { description = "A new unix shell"; homepage = "https://www.oilshell.org/"; - license = with stdenv.lib.licenses; [ + license = with lib.licenses; [ psfl # Includes a portion of the python interpreter and standard library asl20 # Licence for Oil itself ]; diff --git a/pkgs/development/misc/resholve/resholve.nix b/pkgs/development/misc/resholve/resholve.nix index 06561e05dd9..e8b4ed2cfb2 100644 --- a/pkgs/development/misc/resholve/resholve.nix +++ b/pkgs/development/misc/resholve/resholve.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , callPackage , python27Packages , installShellFiles @@ -11,12 +11,12 @@ , doCheck ? true }: let - version = "0.4.0"; + version = "0.4.2"; rSrc = fetchFromGitHub { owner = "abathur"; repo = "resholve"; rev = "v${version}"; - hash = "sha256-wfxcX3wMZqoi5bWjXYRa21UDDJmTDfE+21p4mL2IJog="; + hash = "sha256-ArUQjqh4LRvFLzHiTIcae0q/VFxFF/X9eOFeRnYmTO0="; }; deps = callPackage ./deps.nix { /* @@ -55,7 +55,7 @@ python27Packages.buildPythonApplication { inherit doCheck; checkInputs = [ bats ]; - RESHOLVE_PATH = "${stdenv.lib.makeBinPath [ file findutils gettext ]}"; + RESHOLVE_PATH = "${lib.makeBinPath [ file findutils gettext ]}"; checkPhase = '' # explicit interpreter for test suite @@ -64,6 +64,12 @@ python27Packages.buildPythonApplication { ./test.sh ''; + # Do not propagate Python; may be obsoleted by nixos/nixpkgs#102613 + # for context on why, see abathur/resholve#20 + postFixup = '' + rm $out/nix-support/propagated-build-inputs + ''; + meta = with lib; { description = "Resolve external shell-script dependencies"; homepage = "https://github.com/abathur/resholve"; diff --git a/pkgs/development/misc/yelp-tools/default.nix b/pkgs/development/misc/yelp-tools/default.nix index 9e2d406303c..bf348d68041 100644 --- a/pkgs/development/misc/yelp-tools/default.nix +++ b/pkgs/development/misc/yelp-tools/default.nix @@ -1,30 +1,46 @@ -{ lib, stdenv, fetchurl, libxml2, libxslt, itstool, gnome3, pkgconfig }: +{ lib +, stdenv +, fetchurl +, libxml2 +, libxslt +, itstool +, gnome3 +, pkg-config +}: stdenv.mkDerivation rec { pname = "yelp-tools"; version = "3.38.0"; src = fetchurl { - url = "mirror://gnome/sources/yelp-tools/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/yelp-tools/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1c045c794sm83rrjan67jmsk20qacrw1m814p4nw85w5xsry8z30"; }; + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + libxml2 + libxslt + itstool + gnome3.yelp-xsl + ]; + + doCheck = true; + passthru = { updateScript = gnome3.updateScript { packageName = pname; }; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libxml2 libxslt itstool gnome3.yelp-xsl ]; - - doCheck = true; - meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Yelp/Tools"; description = "Small programs that help you create, edit, manage, and publish your Mallard or DocBook documentation"; - maintainers = with maintainers; [ domenkozar ]; - license = licenses.gpl2; - platforms = platforms.linux; + maintainers = teams.gnome.members ++ (with maintainers; [ domenkozar ]); + license = licenses.gpl2Plus; + platforms = platforms.unix; }; } diff --git a/pkgs/development/mobile/abootimg/default.nix b/pkgs/development/mobile/abootimg/default.nix index d2e43d10608..bec022f08c7 100644 --- a/pkgs/development/mobile/abootimg/default.nix +++ b/pkgs/development/mobile/abootimg/default.nix @@ -28,10 +28,10 @@ stdenv.mkDerivation { install -D -m444 ./debian/abootimg.1 $out/share/man/man1/abootimg.1; install -D -m 755 abootimg-pack-initrd $out/bin - wrapProgram $out/bin/abootimg-pack-initrd --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils cpio findutils gzip ]} + wrapProgram $out/bin/abootimg-pack-initrd --prefix PATH : ${lib.makeBinPath [ coreutils cpio findutils gzip ]} install -D -m 755 abootimg-unpack-initrd $out/bin - wrapProgram $out/bin/abootimg-unpack-initrd --prefix PATH : ${stdenv.lib.makeBinPath [ cpio gzip ]} + wrapProgram $out/bin/abootimg-unpack-initrd --prefix PATH : ${lib.makeBinPath [ cpio gzip ]} ''; meta = with lib; { diff --git a/pkgs/development/mobile/adb-sync/default.nix b/pkgs/development/mobile/adb-sync/default.nix index fc37eefc212..c88ac5dbca5 100644 --- a/pkgs/development/mobile/adb-sync/default.nix +++ b/pkgs/development/mobile/adb-sync/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { dontBuild = true; installPhase = let - dependencies = stdenv.lib.makeBinPath [ platform-tools socat go-mtpfs adbfs-rootless ]; + dependencies = lib.makeBinPath [ platform-tools socat go-mtpfs adbfs-rootless ]; in '' runHook preInstall diff --git a/pkgs/development/mobile/adbfs-rootless/default.nix b/pkgs/development/mobile/adbfs-rootless/default.nix index f562adb1dd0..85bf2fb4490 100644 --- a/pkgs/development/mobile/adbfs-rootless/default.nix +++ b/pkgs/development/mobile/adbfs-rootless/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, fuse, adb }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, fuse, adb }: stdenv.mkDerivation rec { pname = "adbfs-rootless"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ fuse ]; postPatch = '' diff --git a/pkgs/development/mobile/androidenv/deploy-androidpackage.nix b/pkgs/development/mobile/androidenv/deploy-androidpackage.nix index 4f9db98c006..f23558ebc5c 100644 --- a/pkgs/development/mobile/androidenv/deploy-androidpackage.nix +++ b/pkgs/development/mobile/androidenv/deploy-androidpackage.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation ({ packageBaseDir=$out/libexec/android-sdk/${package.path} mkdir -p $packageBaseDir cd $packageBaseDir - cp -av $sourceRoot/* . + cp -a $sourceRoot/* . ${patchInstructions} ''; diff --git a/pkgs/development/mobile/androidenv/emulator.nix b/pkgs/development/mobile/androidenv/emulator.nix index 5840598d1c3..e08078ea672 100644 --- a/pkgs/development/mobile/androidenv/emulator.nix +++ b/pkgs/development/mobile/androidenv/emulator.nix @@ -38,7 +38,7 @@ deployAndroidPackage { # Wrap emulator so that it can load required libraries at runtime wrapProgram $out/libexec/android-sdk/emulator/emulator \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ pkgs.dbus pkgs.systemd ]} \ diff --git a/pkgs/development/mobile/cocoapods/gemset-beta.nix b/pkgs/development/mobile/cocoapods/gemset-beta.nix index 9067f2cec43..195f0901a19 100644 --- a/pkgs/development/mobile/cocoapods/gemset-beta.nix +++ b/pkgs/development/mobile/cocoapods/gemset-beta.nix @@ -371,4 +371,4 @@ }; version = "1.19.0"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/mobile/cocoapods/gemset.nix b/pkgs/development/mobile/cocoapods/gemset.nix index 3641186186e..732d2a2cdd8 100644 --- a/pkgs/development/mobile/cocoapods/gemset.nix +++ b/pkgs/development/mobile/cocoapods/gemset.nix @@ -349,4 +349,4 @@ }; version = "1.19.0"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/mobile/flashtool/default.nix b/pkgs/development/mobile/flashtool/default.nix index 84c42c895ce..e00ff3acce0 100644 --- a/pkgs/development/mobile/flashtool/default.nix +++ b/pkgs/development/mobile/flashtool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, requireFile, p7zip, jre, libusb1, platform-tools, gtk2, glib, libXtst }: +{ stdenv, lib, requireFile, p7zip, jre, libusb1, platform-tools, gtk2, glib, libXtst }: # TODO: # @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { sed -i \ -e 's|$(uname -m)|i686|' \ -e 's|export JAVA_HOME=.*|export JAVA_HOME=${jre}|' \ - -e 's|export LD_LIBRARY_PATH=.*|export LD_LIBRARY_PATH=${stdenv.lib.makeLibraryPath [ libXtst glib gtk2 ]}:./x10flasher_lib/linux/lib32|' \ + -e 's|export LD_LIBRARY_PATH=.*|export LD_LIBRARY_PATH=${lib.makeLibraryPath [ libXtst glib gtk2 ]}:./x10flasher_lib/linux/lib32|' \ FlashTool FlashToolConsole ''; @@ -51,12 +51,12 @@ stdenv.mkDerivation rec { mv * $out/ ''; - meta = { + meta = with lib; { homepage = "http://www.flashtool.net/"; description = "S1 flashing software for Sony phones from X10 to Xperia Z Ultra"; - license = stdenv.lib.licenses.unfreeRedistributableFirmware; + license = licenses.unfreeRedistributableFirmware; platforms = [ "i686-linux" ]; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = platforms.none; broken = true; }; } diff --git a/pkgs/development/mobile/genymotion/default.nix b/pkgs/development/mobile/genymotion/default.nix index 72a376d39a8..5602f598e9d 100644 --- a/pkgs/development/mobile/genymotion/default.nix +++ b/pkgs/development/mobile/genymotion/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, makeWrapper, which, zlib, libGL, glib, xorg, libxkbcommon -, xdg_utils +{ stdenv, lib, fetchurl, makeWrapper, which, zlib, libGL, glib, xorg, libxkbcommon +, xdg-utils # For glewinfo , libXmu, libXi, libXext }: @@ -7,7 +7,7 @@ let packages = [ stdenv.cc.cc zlib glib xorg.libX11 libxkbcommon libXmu libXi libXext libGL ]; - libPath = stdenv.lib.makeLibraryPath packages; + libPath = lib.makeLibraryPath packages; in stdenv.mkDerivation rec { pname = "genymotion"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "0lvfdlpmmsyq2i9gs4mf6a8fxkfimdr4rhyihqnfhjij3fzxz4lk"; }; - buildInputs = [ makeWrapper which xdg_utils ]; + buildInputs = [ makeWrapper which xdg-utils ]; unpackPhase = '' mkdir -p phony-home $out/share/applications @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { rm $out/libexec/genymotion/libxkbcommon* ''; - meta = { + meta = with lib; { description = "Fast and easy Android emulation"; longDescription = '' Genymotion is a relatively fast Android emulator which comes with @@ -74,8 +74,8 @@ stdenv.mkDerivation rec { suitable for application testing. ''; homepage = "https://www.genymotion.com/"; - license = stdenv.lib.licenses.unfree; + license = licenses.unfree; platforms = ["x86_64-linux"]; - maintainers = [ stdenv.lib.maintainers.puffnfresh ]; + maintainers = [ maintainers.puffnfresh ]; }; } diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index a7e158bd3bb..82a264e702d 100644 --- a/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/pkgs/development/mobile/titaniumenv/build-app.nix @@ -1,4 +1,4 @@ -{stdenv, composeAndroidPackages, composeXcodeWrapper, titaniumsdk, titanium, alloy, jdk, python, nodejs, which, file}: +{stdenv, lib, composeAndroidPackages, composeXcodeWrapper, titaniumsdk, titanium, alloy, jdk, python, nodejs, which, file}: { name, src, preBuild ? "", target, tiVersion ? null , release ? false, androidKeyStore ? null, androidKeyAlias ? null, androidKeyStorePassword ? null , iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosVersion ? "12.1", iosBuildStore ? false @@ -34,14 +34,14 @@ let extraArgs = removeAttrs args [ "name" "preRebuild" "androidsdkArgs" "xcodewrapperArgs" ]; in stdenv.mkDerivation ({ - name = stdenv.lib.replaceChars [" "] [""] name; + name = lib.replaceChars [" "] [""] name; buildInputs = [ nodejs titanium alloy python which file jdk ]; buildPhase = '' ${preBuild} - ${stdenv.lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.isDarwin '' # Hack that provides a writable alloy package on macOS. Without it the build fails because of a file permission error. alloy=$(dirname $(type -p alloy))/.. cp -rv $alloy/* alloy @@ -51,7 +51,7 @@ stdenv.mkDerivation ({ export HOME=${if target == "iphone" then "/Users/$(whoami)" else "$TMPDIR"} - ${stdenv.lib.optionalString (tiVersion != null) '' + ${lib.optionalString (tiVersion != null) '' # Replace titanium version by the provided one sed -i -e "s|<sdk-version>[0-9a-zA-Z\.]*</sdk-version>|<sdk-version>${tiVersion}</sdk-version>|" tiapp.xml ''} @@ -76,7 +76,7 @@ stdenv.mkDerivation ({ export GRADLE_USER_HOME=$TMPDIR/gradle ${if release then '' - ${stdenv.lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.isDarwin '' # Signing the app does not work with OpenJDK on macOS, use host SDK instead export JAVA_HOME="$(/usr/libexec/java_home -v 1.8)" ''} @@ -171,7 +171,7 @@ stdenv.mkDerivation ({ mkdir -p $out/nix-support echo "file binary-dist \"$(echo $out/*.ipa)\"" > $out/nix-support/hydra-build-products - ${stdenv.lib.optionalString enableWirelessDistribution '' + ${lib.optionalString enableWirelessDistribution '' appname="$(basename $out/*.ipa .ipa)" bundleId=$(grep '<id>[a-zA-Z0-9.]*</id>' tiapp.xml | sed -e 's|<id>||' -e 's|</id>||' -e 's/ //g') version=$(grep '<version>[a-zA-Z0-9.]*</version>' tiapp.xml | sed -e 's|<version>||' -e 's|</version>||' -e 's/ //g') @@ -184,5 +184,5 @@ stdenv.mkDerivation ({ else throw "Target: ${target} is not supported!"} ''; - failureHook = stdenv.lib.optionalString (release && target == "iphone") deleteKeychain; + failureHook = lib.optionalString (release && target == "iphone") deleteKeychain; } // extraArgs) diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix index 44ec91d7e59..151502a5d16 100644 --- a/pkgs/development/mobile/titaniumenv/default.nix +++ b/pkgs/development/mobile/titaniumenv/default.nix @@ -8,11 +8,11 @@ rec { else throw "Titanium version not supported: "+tiVersion; in import titaniumSdkFile { - inherit (pkgs) stdenv fetchurl unzip makeWrapper; + inherit (pkgs) stdenv lib fetchurl unzip makeWrapper; }; buildApp = import ./build-app.nix { - inherit (pkgs) stdenv python which file jdk nodejs; + inherit (pkgs) stdenv lib python which file jdk nodejs; inherit (pkgs.nodePackages) alloy titanium; inherit (androidenv) composeAndroidPackages; inherit (xcodeenv) composeXcodeWrapper; diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix index 2af53a63b58..0742247893c 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip, makeWrapper}: +{stdenv, lib, fetchurl, unzip, makeWrapper}: let # Gradle is a build system that bootstraps itself. This is what it actually @@ -87,7 +87,7 @@ stdenv.mkDerivation { # Patch maven central repository with our own local directory. This prevents the builder from downloading Maven artifacts sed -i -e 's|mavenCentral()|maven { url "${fakeMavenRepo}" }|' android/templates/build/proguard.gradle - ${stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") '' + ${lib.optionalString (stdenv.system == "x86_64-darwin") '' # Patch the strip frameworks script in the iPhone build template to not let # it skip the strip phase. This is caused by an assumption on the file # permissions in which Nix deviates from the standard. diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix index b995a566f52..965a385ac56 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip, makeWrapper}: +{stdenv, lib, fetchurl, unzip, makeWrapper}: let # Gradle is a build system that bootstraps itself. This is what it actually @@ -87,7 +87,7 @@ stdenv.mkDerivation { # Patch maven central repository with our own local directory. This prevents the builder from downloading Maven artifacts sed -i -e 's|mavenCentral()|maven { url "${fakeMavenRepo}" }|' android/templates/build/proguard.gradle - ${stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") '' + ${lib.optionalString (stdenv.system == "x86_64-darwin") '' # Patch the strip frameworks script in the iPhone build template to not let # it skip the strip phase. This is caused by an assumption on the file # permissions in which Nix deviates from the standard. diff --git a/pkgs/development/mobile/webos/novacom.nix b/pkgs/development/mobile/webos/novacom.nix index 08f25a53bf6..eca29dd2fab 100644 --- a/pkgs/development/mobile/webos/novacom.nix +++ b/pkgs/development/mobile/webos/novacom.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, webos, cmake, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, webos, cmake, pkg-config }: stdenv.mkDerivation rec { pname = "novacom"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "12s6g7l20kakyjlhqpli496miv2kfsdp17lcwhdrzdxvxl6hnf4n"; }; - nativeBuildInputs = [ cmake pkgconfig webos.cmake-modules ]; + nativeBuildInputs = [ cmake pkg-config webos.cmake-modules ]; postInstall = '' install -Dm755 -t $out/bin ../scripts/novaterm diff --git a/pkgs/development/mobile/webos/novacomd.nix b/pkgs/development/mobile/webos/novacomd.nix index c39f36b93f6..dc330ce6d4e 100644 --- a/pkgs/development/mobile/webos/novacomd.nix +++ b/pkgs/development/mobile/webos/novacomd.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, -webos, cmake, pkgconfig, +webos, cmake, pkg-config, libusb-compat-0_1 }: stdenv.mkDerivation rec { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ cmake pkgconfig webos.cmake-modules ]; + nativeBuildInputs = [ cmake pkg-config webos.cmake-modules ]; buildInputs = [ libusb-compat-0_1 ]; diff --git a/pkgs/development/mobile/xcodeenv/build-app.nix b/pkgs/development/mobile/xcodeenv/build-app.nix index fa108c8e470..ae8416c8d76 100644 --- a/pkgs/development/mobile/xcodeenv/build-app.nix +++ b/pkgs/development/mobile/xcodeenv/build-app.nix @@ -1,4 +1,4 @@ -{stdenv, composeXcodeWrapper}: +{stdenv, lib, composeXcodeWrapper}: { name , src , sdkVersion ? "13.1" @@ -53,13 +53,13 @@ let extraArgs = removeAttrs args ([ "name" "scheme" "xcodeFlags" "release" "certificateFile" "certificatePassword" "provisioningProfile" "signMethod" "generateIPA" "generateXCArchive" "enableWirelessDistribution" "installURL" "bundleId" "version" ] ++ builtins.attrNames xcodewrapperFormalArgs); in stdenv.mkDerivation ({ - name = stdenv.lib.replaceChars [" "] [""] name; # iOS app names can contain spaces, but in the Nix store this is not allowed + name = lib.replaceChars [" "] [""] name; # iOS app names can contain spaces, but in the Nix store this is not allowed buildPhase = '' # Be sure that the Xcode wrapper has priority over everything else. # When using buildInputs this does not seem to be the case. export PATH=${xcodewrapper}/bin:$PATH - - ${stdenv.lib.optionalString release '' + + ${lib.optionalString release '' export HOME=/Users/$(whoami) keychainName="$(basename $out)" @@ -69,7 +69,7 @@ stdenv.mkDerivation ({ security unlock-keychain -p "" $keychainName # Import the certificate into the keychain - security import ${certificateFile} -k $keychainName -P "${certificatePassword}" -A + security import ${certificateFile} -k $keychainName -P "${certificatePassword}" -A # Grant the codesign utility permissions to read from the keychain security set-key-partition-list -S apple-tool:,apple: -s -k "" $keychainName @@ -91,10 +91,10 @@ stdenv.mkDerivation ({ # Do the building export LD=/usr/bin/clang # To avoid problem with -isysroot parameter that is unrecognized by the stock ld. Comparison with an impure build shows that it uses clang instead. Ugly, but it works - xcodebuild -target ${_target} -configuration ${_configuration} ${stdenv.lib.optionalString (scheme != null) "-scheme ${scheme}"} -sdk ${_sdk} TARGETED_DEVICE_FAMILY="1, 2" ONLY_ACTIVE_ARCH=NO CONFIGURATION_TEMP_DIR=$TMPDIR CONFIGURATION_BUILD_DIR=$out ${if generateIPA || generateXCArchive then "-archivePath \"${name}.xcarchive\" archive" else ""} ${if release then '' PROVISIONING_PROFILE=$PROVISIONING_PROFILE OTHER_CODE_SIGN_FLAGS="--keychain $HOME/Library/Keychains/$keychainName-db"'' else ""} ${xcodeFlags} + xcodebuild -target ${_target} -configuration ${_configuration} ${lib.optionalString (scheme != null) "-scheme ${scheme}"} -sdk ${_sdk} TARGETED_DEVICE_FAMILY="1, 2" ONLY_ACTIVE_ARCH=NO CONFIGURATION_TEMP_DIR=$TMPDIR CONFIGURATION_BUILD_DIR=$out ${if generateIPA || generateXCArchive then "-archivePath \"${name}.xcarchive\" archive" else ""} ${if release then '' PROVISIONING_PROFILE=$PROVISIONING_PROFILE OTHER_CODE_SIGN_FLAGS="--keychain $HOME/Library/Keychains/$keychainName-db"'' else ""} ${xcodeFlags} - ${stdenv.lib.optionalString release '' - ${stdenv.lib.optionalString generateIPA '' + ${lib.optionalString release '' + ${lib.optionalString generateIPA '' # Create export plist file cat > "${name}.plist" <<EOF <?xml version="1.0" encoding="UTF-8"?> @@ -112,7 +112,7 @@ stdenv.mkDerivation ({ <string>manual</string> <key>method</key> <string>${signMethod}</string> - ${stdenv.lib.optionalString (signMethod == "enterprise" || signMethod == "ad-hoc") '' + ${lib.optionalString (signMethod == "enterprise" || signMethod == "ad-hoc") '' <key>compileBitcode</key> <false/> ''} @@ -127,14 +127,14 @@ stdenv.mkDerivation ({ mkdir -p $out/nix-support echo "file binary-dist \"$(echo $out/*.ipa)\"" > $out/nix-support/hydra-build-products - ${stdenv.lib.optionalString enableWirelessDistribution '' + ${lib.optionalString enableWirelessDistribution '' # Add another hacky build product that enables wireless adhoc installations appname="$(basename "$(echo $out/*.ipa)" .ipa)" sed -e "s|@INSTALL_URL@|${installURL}?bundleId=${bundleId}\&version=${appVersion}\&title=$appname|" ${./install.html.template} > $out/''${appname}.html echo "doc install \"$out/''${appname}.html\"" >> $out/nix-support/hydra-build-products ''} ''} - ${stdenv.lib.optionalString generateXCArchive '' + ${lib.optionalString generateXCArchive '' mkdir -p $out mv "${name}.xcarchive" $out ''} @@ -144,7 +144,7 @@ stdenv.mkDerivation ({ ''} ''; - failureHook = stdenv.lib.optionalString release deleteKeychain; + failureHook = lib.optionalString release deleteKeychain; installPhase = "true"; } // extraArgs) diff --git a/pkgs/development/mobile/xcodeenv/default.nix b/pkgs/development/mobile/xcodeenv/default.nix index 47686e6d69e..90642ca7d9a 100644 --- a/pkgs/development/mobile/xcodeenv/default.nix +++ b/pkgs/development/mobile/xcodeenv/default.nix @@ -1,4 +1,4 @@ -{stdenv}: +{ stdenv, lib }: rec { composeXcodeWrapper = import ./compose-xcodewrapper.nix { @@ -6,10 +6,10 @@ rec { }; buildApp = import ./build-app.nix { - inherit stdenv composeXcodeWrapper; + inherit stdenv lib composeXcodeWrapper; }; simulateApp = import ./simulate-app.nix { - inherit stdenv composeXcodeWrapper; + inherit stdenv lib composeXcodeWrapper; }; } diff --git a/pkgs/development/mobile/xcodeenv/simulate-app.nix b/pkgs/development/mobile/xcodeenv/simulate-app.nix index 1a55f8366a3..ea0502eb981 100644 --- a/pkgs/development/mobile/xcodeenv/simulate-app.nix +++ b/pkgs/development/mobile/xcodeenv/simulate-app.nix @@ -1,4 +1,4 @@ -{stdenv, composeXcodeWrapper}: +{stdenv, lib, composeXcodeWrapper}: {name, app ? null, bundleId ? null, ...}@args: assert app != null -> bundleId != null; @@ -9,7 +9,7 @@ let xcodewrapper = composeXcodeWrapper xcodewrapperArgs; in stdenv.mkDerivation { - name = stdenv.lib.replaceChars [" "] [""] name; + name = lib.replaceChars [" "] [""] name; buildCommand = '' mkdir -p $out/bin cat > $out/bin/run-test-simulator << "EOF" @@ -30,7 +30,7 @@ stdenv.mkDerivation { # Open the simulator instance open -a "$(readlink "${xcodewrapper}/bin/Simulator")" --args -CurrentDeviceUDID $udid - ${stdenv.lib.optionalString (app != null) '' + ${lib.optionalString (app != null) '' # Copy the app and restore the write permissions appTmpDir=$(mktemp -d -t appTmpDir) cp -r "$(echo ${app}/*.app)" "$appTmpDir" diff --git a/pkgs/development/node-packages/composition.nix b/pkgs/development/node-packages/composition.nix index 027a981ea57..0769168a78f 100644 --- a/pkgs/development/node-packages/composition.nix +++ b/pkgs/development/node-packages/composition.nix @@ -6,7 +6,7 @@ let nodeEnv = import ./node-env.nix { - inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile; + inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile; inherit nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index 36ba75df33f..0cc648f58ff 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -17,7 +17,7 @@ let buildInputs = [ pkgs.makeWrapper ]; postInstall = '' for prog in bower2nix fetch-bower; do - wrapProgram "$out/bin/$prog" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.git pkgs.nix ]} + wrapProgram "$out/bin/$prog" --prefix PATH : ${pkgs.lib.makeBinPath [ pkgs.git pkgs.nix ]} done ''; }; @@ -91,7 +91,7 @@ let makam = super.makam.override { buildInputs = [ pkgs.nodejs pkgs.makeWrapper ]; postFixup = '' - wrapProgram "$out/bin/makam" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.nodejs ]} + wrapProgram "$out/bin/makam" --prefix PATH : ${pkgs.lib.makeBinPath [ pkgs.nodejs ]} ${ if stdenv.isLinux then "patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 \"$out/lib/node_modules/makam/makam-bin-linux64\"" @@ -138,7 +138,7 @@ let node2nix = super.node2nix.override { buildInputs = [ pkgs.makeWrapper ]; postInstall = '' - wrapProgram "$out/bin/node2nix" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.nix ]} + wrapProgram "$out/bin/node2nix" --prefix PATH : ${pkgs.lib.makeBinPath [ pkgs.nix ]} ''; }; @@ -168,7 +168,7 @@ let ''; postInstall = let - pnpmLibPath = stdenv.lib.makeBinPath [ + pnpmLibPath = pkgs.lib.makeBinPath [ nodejs.passthru.python nodejs ]; @@ -185,7 +185,7 @@ let nativeBuildInputs = [ pkgs.makeWrapper ]; postInstall = '' - wrapProgram "$out/bin/pulp" --suffix PATH : ${stdenv.lib.makeBinPath [ + wrapProgram "$out/bin/pulp" --suffix PATH : ${pkgs.lib.makeBinPath [ pkgs.purescript ]} ''; @@ -220,12 +220,12 @@ let nativeBuildInputs = [ pkgs.makeWrapper ]; postInstall = '' wrapProgram "$out/bin/typescript-language-server" \ - --prefix PATH : ${stdenv.lib.makeBinPath [ self.typescript ]} + --prefix PATH : ${pkgs.lib.makeBinPath [ self.typescript ]} ''; }; vega-cli = super.vega-cli.override { - nativeBuildInputs = [ pkgs.pkgconfig ]; + nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = with pkgs; [ super.node-pre-gyp pixman @@ -273,5 +273,13 @@ let echo /var/lib/thelounge > $out/lib/node_modules/thelounge/.thelounge_home ''; }; + + yaml-language-server = super.yaml-language-server.override { + nativeBuildInputs = [ pkgs.makeWrapper ]; + postInstall = '' + wrapProgram "$out/bin/yaml-language-server" \ + --prefix NODE_PATH : ${self.prettier}/lib/node_modules + ''; + }; }; in self diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix index 04e3ee097fa..9af216ad1df 100644 --- a/pkgs/development/node-packages/node-env.nix +++ b/pkgs/development/node-packages/node-env.nix @@ -1,6 +1,6 @@ # This file originates from node2nix -{stdenv, nodejs, python2, util-linux, libtool, runCommand, writeTextFile}: +{lib, stdenv, nodejs, python2, util-linux, libtool, runCommand, writeTextFile}: let python = if nodejs ? python then nodejs.python else python2; @@ -38,8 +38,8 @@ let }; includeDependencies = {dependencies}: - stdenv.lib.optionalString (dependencies != []) - (stdenv.lib.concatMapStrings (dependency: + lib.optionalString (dependencies != []) + (lib.concatMapStrings (dependency: '' # Bundle the dependencies of the package mkdir -p node_modules @@ -100,7 +100,7 @@ let cd "$DIR/${packageName}" ${includeDependencies { inherit dependencies; }} cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} ''; pinpointDependencies = {dependencies, production}: @@ -161,12 +161,12 @@ let '' node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"} - ${stdenv.lib.optionalString (dependencies != []) + ${lib.optionalString (dependencies != []) '' if [ -d node_modules ] then cd node_modules - ${stdenv.lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} + ${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} cd .. fi ''} @@ -183,7 +183,7 @@ let cd "${packageName}" ${pinpointDependencies { inherit dependencies production; }} cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} fi ''; @@ -344,8 +344,8 @@ let cd "${packageName}" runHook preRebuild - ${stdenv.lib.optionalString bypassCache '' - ${stdenv.lib.optionalString reconstructLock '' + ${lib.optionalString bypassCache '' + ${lib.optionalString reconstructLock '' if [ -f package-lock.json ] then echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!" @@ -361,14 +361,14 @@ let node ${addIntegrityFieldsScript} ''} - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild if [ "''${dontNpmInstall-}" != "1" ] then # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. rm -f npm-shrinkwrap.json - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} install fi ''; @@ -388,16 +388,17 @@ let , dontStrip ? true , unpackPhase ? "true" , buildPhase ? "true" + , meta ? {} , ... }@args: let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ]; + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ]; in stdenv.mkDerivation ({ name = "node_${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] - ++ stdenv.lib.optional (stdenv.isLinux) util-linux - ++ stdenv.lib.optional (stdenv.isDarwin) libtool + ++ lib.optional (stdenv.isLinux) util-linux + ++ lib.optional (stdenv.isDarwin) libtool ++ buildInputs; inherit nodejs; @@ -443,6 +444,11 @@ let # Run post install hook, if provided runHook postInstall ''; + + meta = { + # default to Node.js' platforms + platforms = nodejs.meta.platforms; + } // meta; } // extraArgs); # Builds a development shell @@ -470,8 +476,8 @@ let name = "node-dependencies-${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] - ++ stdenv.lib.optional (stdenv.isLinux) util-linux - ++ stdenv.lib.optional (stdenv.isDarwin) libtool + ++ lib.optional (stdenv.isLinux) util-linux + ++ lib.optional (stdenv.isDarwin) libtool ++ buildInputs; inherit dontStrip; # Stripping may fail a build for some package deployments @@ -491,7 +497,7 @@ let # Create fake package.json to make the npm commands work properly cp ${src}/package.json . chmod 644 package.json - ${stdenv.lib.optionalString bypassCache '' + ${lib.optionalString bypassCache '' if [ -f ${src}/package-lock.json ] then cp ${src}/package-lock.json . @@ -500,13 +506,13 @@ let # Go to the parent folder to make sure that all packages are pinpointed cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} # Expose the executables that were installed cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} mv ${packageName} lib ln -s $out/lib/node_modules/.bin $out/bin @@ -516,7 +522,7 @@ let stdenv.mkDerivation { name = "node-shell-${name}-${version}"; - buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) util-linux ++ buildInputs; + buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) util-linux ++ buildInputs; buildCommand = '' mkdir -p $out/bin cat > $out/bin/shell <<EOF @@ -529,14 +535,14 @@ let # Provide the dependencies in a development shell through the NODE_PATH environment variable inherit nodeDependencies; - shellHook = stdenv.lib.optionalString (dependencies != []) '' + shellHook = lib.optionalString (dependencies != []) '' export NODE_PATH=${nodeDependencies}/lib/node_modules export PATH="${nodeDependencies}/bin:$PATH" ''; }; in { - buildNodeSourceDist = stdenv.lib.makeOverridable buildNodeSourceDist; - buildNodePackage = stdenv.lib.makeOverridable buildNodePackage; - buildNodeShell = stdenv.lib.makeOverridable buildNodeShell; + buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist; + buildNodePackage = lib.makeOverridable buildNodePackage; + buildNodeShell = lib.makeOverridable buildNodeShell; } diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 96165097316..555f0cd1dfd 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -96,6 +96,7 @@ , "graphql-cli" , "grunt-cli" , "makam" +, "meshcommander" , "gqlint" , "gtop" , "gulp" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 38fc84d5523..177cef6c59f 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -22,13 +22,13 @@ let sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ=="; }; }; - "@angular-devkit/architect-0.1100.5" = { + "@angular-devkit/architect-0.1101.1" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1100.5"; + version = "0.1101.1"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1100.5.tgz"; - sha512 = "yOYfucNouc1doTbcGbCNMXGMSc36+j97XpdNoeGyzFQ7GwezLAro0a9gxc5PdOxndfelkND7J1JuOjxdW5O17A=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1101.1.tgz"; + sha512 = "oyzDIzI5owzYmgwGQLBbKOkTDc49dPosI2BiBf0oWtKH2L2sQ6jiad1k/Oq4/k7TYEN8neb/eZ1dpsHmZdYqaw=="; }; }; "@angular-devkit/core-11.0.3" = { @@ -40,13 +40,22 @@ let sha512 = "gJRiBj0gWDR2VtIvLvwwc/GM2MZvg1xw69ZbBJ1VuUgDqPBHdC8q3UMW3B82wdhxK+RBYa7ZOJxtIVggaHkm9g=="; }; }; - "@angular-devkit/core-11.0.5" = { + "@angular-devkit/core-11.1.0" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "11.0.5"; + version = "11.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-11.1.0.tgz"; + sha512 = "O2oIcqpQKGvYJH88d/NCgLYZGc9laA1eo2d1s0FH1Udu4c2L+bAsviQqtTKNmzyaqODHrlkt+eKx7uakdwWtnQ=="; + }; + }; + "@angular-devkit/core-11.1.1" = { + name = "_at_angular-devkit_slash_core"; + packageName = "@angular-devkit/core"; + version = "11.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-11.0.5.tgz"; - sha512 = "hwV8fjF8JNPJkiVWw8MNzeIfDo01aD/OAOlC4L5rQnVHn+i2EiU3brSDmFqyeHPPV3h/QjuBkS3tkN7gSnVWaQ=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-11.1.1.tgz"; + sha512 = "eQTRmcuVCgGE7mR3qyabjlvXlQCMDI+gDCkcAlzn161pJY9Yxmw0Q1rXN2sZlUdfZuc9sSg0m2MaQQFBSGp+XA=="; }; }; "@angular-devkit/schematics-11.0.3" = { @@ -58,13 +67,22 @@ let sha512 = "VZnqgnnfyzyMluIDvGp+ZlDU2P9BnjrhacBOdqBS/jNQ7oxyE0AWrUApGXcejOJ13Z7pEf31E64P3bImcjwP+A=="; }; }; - "@angular-devkit/schematics-11.0.5" = { + "@angular-devkit/schematics-11.1.0" = { + name = "_at_angular-devkit_slash_schematics"; + packageName = "@angular-devkit/schematics"; + version = "11.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.1.0.tgz"; + sha512 = "6qfR5w1jyk8MC+5Tfimz+Czsq3WlsVoB57dpxSZfhGGsv1Vxc8Q41y5f3BrAyEqHYjcH7NtaoLQoJjtra5KaAg=="; + }; + }; + "@angular-devkit/schematics-11.1.1" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "11.0.5"; + version = "11.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.0.5.tgz"; - sha512 = "0NKGC8Nf/4vvDpWKB7bwxIazvNnNHnZBX6XlyBXNl+fW8tpTef3PNMJMSErTz9LFnuv61vsKbc36u/Ek2YChWg=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.1.1.tgz"; + sha512 = "XYbC0cGPChdXg0LD9EA08W24Rv5GPxGNGJNRQhUwlcU9L/szhOw9NEhr/l/DLijAxKv0J2eM5CuzKI1O/3tZYg=="; }; }; "@angular-devkit/schematics-cli-0.1100.3" = { @@ -184,13 +202,13 @@ let sha512 = "eorTmZW7zc6ZHgGLt3Vrq7mzPuobPeJnyfli50/m/DIQ91slkqjPKUYGcq4paPEz6IWoa7LT2ZwtwA5KzMyTPg=="; }; }; - "@apidevtools/json-schema-ref-parser-9.0.6" = { + "@apidevtools/json-schema-ref-parser-9.0.7" = { name = "_at_apidevtools_slash_json-schema-ref-parser"; packageName = "@apidevtools/json-schema-ref-parser"; - version = "9.0.6"; + version = "9.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-9.0.6.tgz"; - sha512 = "M3YgsLjI0lZxvrpeGVk9Ap032W6TPQkH6pRAZz81Ac3WUNF79VQooAFnp8umjvVzUmD93NkogxEwbSce7qMsUg=="; + url = "https://registry.npmjs.org/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-9.0.7.tgz"; + sha512 = "QdwOGF1+eeyFh+17v2Tz626WX0nucd1iKOm6JUTUvCZdbolblCOOQCxGrQPY0f7jEhn36PiAWqZnsC2r5vmUWg=="; }; }; "@apollo/federation-0.20.7" = { @@ -337,15 +355,6 @@ let sha512 = "kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w=="; }; }; - "@babel/generator-7.12.10" = { - name = "_at_babel_slash_generator"; - packageName = "@babel/generator"; - version = "7.12.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.10.tgz"; - sha512 = "6mCdfhWgmqLdtTkhXjnIz0LcdVCd26wS2JXRtj2XY0u5klDsXBREA/pG5NVOuVnF2LUrBGNFtQkIqqTbblg0ww=="; - }; - }; "@babel/generator-7.12.11" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; @@ -1363,22 +1372,22 @@ let sha512 = "GcIY79elgB+azP74j8vqkiXz8xLFfIzbQJdlwOPisgbKT00tviJQuEghOXSMVxJ00HoYJbGswr4kcllUc4xCcg=="; }; }; - "@bugsnag/browser-7.5.4" = { + "@bugsnag/browser-7.6.0" = { name = "_at_bugsnag_slash_browser"; packageName = "@bugsnag/browser"; - version = "7.5.4"; + version = "7.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/browser/-/browser-7.5.4.tgz"; - sha512 = "WyhDWeE2MXQTo9uJjpCOxqTWDlVgX/yKE/VZ0nVm4em2AxUmjAPM8jk9YOTYCKQfQFnIpgf62DjVlsszikUIBw=="; + url = "https://registry.npmjs.org/@bugsnag/browser/-/browser-7.6.0.tgz"; + sha512 = "8sth20TM8BVfebkqxqJQOCM2P2L4foOgFH2QA3ruG0iknDKZDhE7XcoWgmUP9zVSNJqkCyiIzcBOuiwZW8JaSQ=="; }; }; - "@bugsnag/core-7.5.4" = { + "@bugsnag/core-7.6.0" = { name = "_at_bugsnag_slash_core"; packageName = "@bugsnag/core"; - version = "7.5.4"; + version = "7.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/core/-/core-7.5.4.tgz"; - sha512 = "QOvtWzM0XJTk5QCpiDFTva6FJXCKuKQHJu7sjrZwYA/7fblypl+ClP7inz9At5ijkKGm2pLyvZ9vvT2rq9TXuw=="; + url = "https://registry.npmjs.org/@bugsnag/core/-/core-7.6.0.tgz"; + sha512 = "hBYAZJw4ScqoyM1jA1x/m2e4iS2EqYEs0I2hdzBCZFv2ls17ILmU58eRSyVdUfyzbv0J7Hi6DwwBGC4Yb6ROZA=="; }; }; "@bugsnag/cuid-3.0.0" = { @@ -1390,22 +1399,22 @@ let sha512 = "LOt8aaBI+KvOQGneBtpuCz3YqzyEAehd1f3nC5yr9TIYW1+IzYKa2xWS4EiMz5pPOnRPHkyyS5t/wmSmN51Gjg=="; }; }; - "@bugsnag/js-7.5.4" = { + "@bugsnag/js-7.6.0" = { name = "_at_bugsnag_slash_js"; packageName = "@bugsnag/js"; - version = "7.5.4"; + version = "7.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/js/-/js-7.5.4.tgz"; - sha512 = "V1+482YPndAD0c0ju7Ik1dXunyKAssZWUIqOMs7Ff3PtZb1107sJ4Hw1E7ZusQvvI/IjA6FO3ZJkmzjIJjQ+UA=="; + url = "https://registry.npmjs.org/@bugsnag/js/-/js-7.6.0.tgz"; + sha512 = "EcI3sTpyOs94/OOjwI7fOg1iZ800o3kkOAipAnULRoP62j1vmErH2l/2xubny7g0JTOL59iZEkt+5O5MhbQJ2A=="; }; }; - "@bugsnag/node-7.5.4" = { + "@bugsnag/node-7.6.0" = { name = "_at_bugsnag_slash_node"; packageName = "@bugsnag/node"; - version = "7.5.4"; + version = "7.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/node/-/node-7.5.4.tgz"; - sha512 = "lfHEU2wsBO/hhHjsY6kqD/Ga6A3bzROeZEuE7/cT0xzDUvBnUsrw75/xZ5EyY3Xpyfe/Gw9t336semIqz46+cw=="; + url = "https://registry.npmjs.org/@bugsnag/node/-/node-7.6.0.tgz"; + sha512 = "n3BVb04bq4z16nOM4gbWoXsi6k8R9bryWS/NAYi/jQg6tgyBkNYzmK0ojf3fYJ7uAgCjUJNMX6S9UHSJy/MMcQ=="; }; }; "@bugsnag/safe-json-stringify-6.0.0" = { @@ -1633,6 +1642,15 @@ let sha512 = "EfB5OHNYp1F4px/LI/FEnGylop7nOqkQ1LRzCM0KccA2U8tvV8w01KBv37LbO7nW4H+YhKyo2LcJhRwjjV17QQ=="; }; }; + "@eslint/eslintrc-0.3.0" = { + name = "_at_eslint_slash_eslintrc"; + packageName = "@eslint/eslintrc"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.3.0.tgz"; + sha512 = "1JTKgrOKAHVivSvOYw+sJOunkBjUOvjqWk1DPja7ZFhIS2mX/4EgTT8M7eTK9jrKhL/FvXXEbQwIs3pg1xp3dg=="; + }; + }; "@evocateur/libnpmaccess-3.1.2" = { name = "_at_evocateur_slash_libnpmaccess"; packageName = "@evocateur/libnpmaccess"; @@ -1678,6 +1696,15 @@ let sha512 = "GoXw0U2Qaa33m3eUcxuHnHpNvHjNlLo0gtV091XBpaRINaB4X6FGCG5XKxSFNFiPpugUDqNruHzaqpTdDm4AOg=="; }; }; + "@expo/apple-utils-0.0.0-alpha.17" = { + name = "_at_expo_slash_apple-utils"; + packageName = "@expo/apple-utils"; + version = "0.0.0-alpha.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@expo/apple-utils/-/apple-utils-0.0.0-alpha.17.tgz"; + sha512 = "ecpC6e3xTtMVVKWpp231L8vptoSPqwtKSmfJ8sXfMlQRtWbq8Bu1pCHR/pdAx9X4IYzygjrTa9IDAPpbGuSaMg=="; + }; + }; "@expo/babel-preset-cli-0.2.18" = { name = "_at_expo_slash_babel-preset-cli"; packageName = "@expo/babel-preset-cli"; @@ -1696,22 +1723,22 @@ let sha512 = "Ydf4LidRB/EBI+YrB+cVLqIseiRfjUI/AeHBgjGMtq3GroraDu81OV7zqophRgupngoL3iS3JUMDMnxO7g39qA=="; }; }; - "@expo/config-3.3.22" = { + "@expo/config-3.3.26" = { name = "_at_expo_slash_config"; packageName = "@expo/config"; - version = "3.3.22"; + version = "3.3.26"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config/-/config-3.3.22.tgz"; - sha512 = "BzahndK+Uxsvzui1+9QiJXptjVPgbSCQ3saNVF4N3Wrxjyr0WXHNp3Gz3VAGkoHhoBlxZheslmiNoMwjG25xjw=="; + url = "https://registry.npmjs.org/@expo/config/-/config-3.3.26.tgz"; + sha512 = "krtvZ7P7BMbSbqPP5OFERrzxDGGA2qcFGmL/QpPX11P9wSSRXVqRar1OMwjuKaeQ36wdS21AiMmmvLNeFcbjww=="; }; }; - "@expo/config-plugins-1.0.13" = { + "@expo/config-plugins-1.0.17" = { name = "_at_expo_slash_config-plugins"; packageName = "@expo/config-plugins"; - version = "1.0.13"; + version = "1.0.17"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-1.0.13.tgz"; - sha512 = "/Wt1uZJlwMSi20GlKX4FOijX8wYMj7zVVp091M9hXeIc7btq84nkhhtdwa60qnM0RACHWqv25uVTQochjNQrfw=="; + url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-1.0.17.tgz"; + sha512 = "q1Szz+2UyB6wB4FL2Wfd3tn9Ho7DAPs1Y+He583WY9CDx/hNhODZo+Ox7yPhcM+spP/itHxnXh+GFcmRX4M6Ag=="; }; }; "@expo/config-types-40.0.0-beta.2" = { @@ -1723,184 +1750,58 @@ let sha512 = "t9pHCQMXOP4nwd7LGXuHkLlFy0JdfknRSCAeVF4Kw2/y+5OBbR9hW9ZVnetpBf0kORrekgiI7K/qDaa3hh5+Qg=="; }; }; - "@expo/configure-splash-screen-0.3.2" = { + "@expo/configure-splash-screen-0.3.3" = { name = "_at_expo_slash_configure-splash-screen"; packageName = "@expo/configure-splash-screen"; - version = "0.3.2"; + version = "0.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/configure-splash-screen/-/configure-splash-screen-0.3.2.tgz"; - sha512 = "+KvcPWv/EpAi9ng7KWsRCHUgN8qYcbpvrY8Pc3AtfPVHBhWuy7FhTdT0HUqjhOvqvwPF2Ygr//DHl8WBVg2ICA=="; + url = "https://registry.npmjs.org/@expo/configure-splash-screen/-/configure-splash-screen-0.3.3.tgz"; + sha512 = "fWy6Z52Mj2a7yjdvpIJkP9G3kfkoXE79aHvTDwgggIE0KLhwnPF27v+KS0wJUf7b4JM6w0zKOlUZjQhn0kSNyA=="; }; }; - "@expo/dev-server-0.1.48" = { + "@expo/dev-server-0.1.52" = { name = "_at_expo_slash_dev-server"; packageName = "@expo/dev-server"; - version = "0.1.48"; + version = "0.1.52"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.48.tgz"; - sha512 = "aiuoVLfF+NzFBU6WvLRbVjYDhoLky22q0hiTQ5by3996drF0XUj752lUI8ckN5+8qX4Aaij++wkPMaLiHQ1vNw=="; + url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.52.tgz"; + sha512 = "c9/8P9S9fLJGgY4bSMl2z8nSsKVKR818G29EpWqQsD/Fk+UzTil4NeIwR7rcqOWOKXRYFXVzHCq0Nl4diwaMRw=="; }; }; - "@expo/dev-tools-0.13.74" = { + "@expo/dev-tools-0.13.79" = { name = "_at_expo_slash_dev-tools"; packageName = "@expo/dev-tools"; - version = "0.13.74"; + version = "0.13.79"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.74.tgz"; - sha512 = "at58TNplT3FT1UWEYzpCMwtP4mzBDT81ApIlyudsd4k+uX74wSf+4v5WPUbgu1UCZBUuo/40ddhS3rgUozu4eQ=="; + url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.79.tgz"; + sha512 = "7Rg64svMdEJCI1nUlC1nVuRImKBQ9jsP5NPY36o88Aer7F0XAhR4IXKFU8EnzNzC7Acc+Pd+3tXvU/miadFQig=="; }; }; - "@expo/eas-build-job-0.1.2" = { - name = "_at_expo_slash_eas-build-job"; - packageName = "@expo/eas-build-job"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@expo/eas-build-job/-/eas-build-job-0.1.2.tgz"; - sha512 = "hBYVWlEWi8Iu+jWmbzKy2bMsYoWvRwY7MZ+SdKpNvAl+sMpp8rwvxRyRs7cRTa6DuiQ2sdOxqemnw9MJ6S5cRA=="; - }; - }; - "@expo/image-utils-0.3.9" = { + "@expo/image-utils-0.3.10" = { name = "_at_expo_slash_image-utils"; packageName = "@expo/image-utils"; - version = "0.3.9"; + version = "0.3.10"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/image-utils/-/image-utils-0.3.9.tgz"; - sha512 = "VarvpeNXtvPexmJSEllDF1RRHrjznsgf2Y0bZ2IehmOZwxdqz/YssGxY2ztMx5pn3utuhc9Enx140BHDBOp8UQ=="; + url = "https://registry.npmjs.org/@expo/image-utils/-/image-utils-0.3.10.tgz"; + sha512 = "EebukeUnzyk4ts1E1vMQSb0p8otYqWKsZNDZEoqHtERhxMSO7WhQLqa7/z2kB/YMHRJjrhaa3Aa2X5zjYot1kA=="; }; }; - "@expo/json-file-8.2.25" = { + "@expo/json-file-8.2.26" = { name = "_at_expo_slash_json-file"; packageName = "@expo/json-file"; - version = "8.2.25"; + version = "8.2.26"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/json-file/-/json-file-8.2.25.tgz"; - sha512 = "KFX6grWVzttaDskq/NK8ByqFPgpDZGFnyeZVeecGoKx5kU61zuR7/xQM04OvN6BNXq3jTUst1TyS8fXEfJuscA=="; + url = "https://registry.npmjs.org/@expo/json-file/-/json-file-8.2.26.tgz"; + sha512 = "9ahw1ztHtRhXE8/kTiOpXTXJ/Uq2lF8UlIIcJjoE5DCFA0epL8tnDiu6RDzXMhjhH1ytiojt2sYC4+lV29JPAA=="; }; }; - "@expo/metro-config-0.1.48" = { + "@expo/metro-config-0.1.52" = { name = "_at_expo_slash_metro-config"; packageName = "@expo/metro-config"; - version = "0.1.48"; - src = fetchurl { - url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.48.tgz"; - sha512 = "U2VkpNoecfCgju5Cfk9RyulrCwqWiGPCV1RSZPhP/yb6pSUyuQfYaxH5ULmrsYztp8hSfV0mqaVq5LPyhzczkw=="; - }; - }; - "@expo/ngrok-2.4.3" = { - name = "_at_expo_slash_ngrok"; - packageName = "@expo/ngrok"; - version = "2.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@expo/ngrok/-/ngrok-2.4.3.tgz"; - sha512 = "JOct+0BMTOTkTb2RreQc6uzhwCjX8Z/EYRo3EcbHMr5/3Zk+0YuujaM4Z84GeZcWz2sBMhnJj0LeJnhEkmd95Q=="; - }; - }; - "@expo/ngrok-bin-2.2.8-beta.3" = { - name = "_at_expo_slash_ngrok-bin"; - packageName = "@expo/ngrok-bin"; - version = "2.2.8-beta.3"; + version = "0.1.52"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/ngrok-bin/-/ngrok-bin-2.2.8-beta.3.tgz"; - sha512 = "VzL67ybSvSYhFJxwBm19VMEHAcgg6bDhE9p8HKDOXL2tdHIzqYtqAYxOyhv2mS263WYqdomtoAChSOb449of+g=="; - }; - }; - "@expo/ngrok-bin-darwin-ia32-2.2.8" = { - name = "_at_expo_slash_ngrok-bin-darwin-ia32"; - packageName = "@expo/ngrok-bin-darwin-ia32"; - version = "2.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@expo/ngrok-bin-darwin-ia32/-/ngrok-bin-darwin-ia32-2.2.8.tgz"; - sha512 = "Mgept4WvXobcNQbxV0f8Nqrukl4HsAM4ExfFOC5BJ1PinlZisb1lQYp+PGu/3DuOYAinAspbL/3m77JkhT5Oow=="; - }; - }; - "@expo/ngrok-bin-darwin-x64-2.2.8" = { - name = "_at_expo_slash_ngrok-bin-darwin-x64"; - packageName = "@expo/ngrok-bin-darwin-x64"; - version = "2.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@expo/ngrok-bin-darwin-x64/-/ngrok-bin-darwin-x64-2.2.8.tgz"; - sha512 = "hEVxBAKTT9G+jCy+2NOjgFrPrrzmdxljLhz3cQIb4izjooQXGCbTFvnEntB0odgsf6Dpa2jWNNt18H6t2nneOQ=="; - }; - }; - "@expo/ngrok-bin-freebsd-ia32-2.2.8" = { - name = "_at_expo_slash_ngrok-bin-freebsd-ia32"; - packageName = "@expo/ngrok-bin-freebsd-ia32"; - version = "2.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@expo/ngrok-bin-freebsd-ia32/-/ngrok-bin-freebsd-ia32-2.2.8.tgz"; - sha512 = "yGdq06wUxreCPxXnhqlL3GzvLtArJ6eDOQinv4SiDK+ftQPY4TloEMQr/rwohvtx63O+bT9jAtgJW44jlfIQ2Q=="; - }; - }; - "@expo/ngrok-bin-freebsd-x64-2.2.8" = { - name = "_at_expo_slash_ngrok-bin-freebsd-x64"; - packageName = "@expo/ngrok-bin-freebsd-x64"; - version = "2.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@expo/ngrok-bin-freebsd-x64/-/ngrok-bin-freebsd-x64-2.2.8.tgz"; - sha512 = "1uSZRastddaUIrK/2B5MANhV7LDKJ8/4cSQxn+E2+U296VKkU6n1ZfZ207a7hA1ctQeBcvwkRx9biFxDa99How=="; - }; - }; - "@expo/ngrok-bin-linux-arm-2.2.8" = { - name = "_at_expo_slash_ngrok-bin-linux-arm"; - packageName = "@expo/ngrok-bin-linux-arm"; - version = "2.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@expo/ngrok-bin-linux-arm/-/ngrok-bin-linux-arm-2.2.8.tgz"; - sha512 = "qruRsoEuFvaVsSSlhNtHR8uWgF7aA6jdRtCuVKO4pMW32lTZfGS+U/y6hB0YBxXv4xhEn8o1x/15oLU7cNUxEA=="; - }; - }; - "@expo/ngrok-bin-linux-arm64-2.2.8" = { - name = "_at_expo_slash_ngrok-bin-linux-arm64"; - packageName = "@expo/ngrok-bin-linux-arm64"; - version = "2.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@expo/ngrok-bin-linux-arm64/-/ngrok-bin-linux-arm64-2.2.8.tgz"; - sha512 = "9iXr88LlzBCp7+NwfPDsSg2sIy5GfWFXrhU8+vGLnFvZ5MO6ZoRmXbw2VRPFm7ekMa0Losddny4aiLDJkr9hXw=="; - }; - }; - "@expo/ngrok-bin-linux-ia32-2.2.8" = { - name = "_at_expo_slash_ngrok-bin-linux-ia32"; - packageName = "@expo/ngrok-bin-linux-ia32"; - version = "2.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@expo/ngrok-bin-linux-ia32/-/ngrok-bin-linux-ia32-2.2.8.tgz"; - sha512 = "Cm3BH4nv55A6KF+XjrK8oLe1Ktn4WrUabd6TcErQRM6/2454A+vh1r6CEKWOVWy4bg7ceTbjgHhCdj9WMv8WTg=="; - }; - }; - "@expo/ngrok-bin-linux-x64-2.2.8" = { - name = "_at_expo_slash_ngrok-bin-linux-x64"; - packageName = "@expo/ngrok-bin-linux-x64"; - version = "2.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@expo/ngrok-bin-linux-x64/-/ngrok-bin-linux-x64-2.2.8.tgz"; - sha512 = "jNhnnfMR/yAgUV1LnAheq/WWB/Tkdgm5sxZhN0fjN00CeiYTVyNuCsii2tdjXJCGrxdpb6RzvOxjLGstIT0mUQ=="; - }; - }; - "@expo/ngrok-bin-sunos-x64-2.2.8" = { - name = "_at_expo_slash_ngrok-bin-sunos-x64"; - packageName = "@expo/ngrok-bin-sunos-x64"; - version = "2.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@expo/ngrok-bin-sunos-x64/-/ngrok-bin-sunos-x64-2.2.8.tgz"; - sha512 = "Ogcn/6jNN2PMMaZ1PJu7JBiZz92Yowa119cclI2E2RKyIqQaOYol2g72oHzm8SQ49KfzEJMGDmQA4Xh29cKmrQ=="; - }; - }; - "@expo/ngrok-bin-win32-ia32-2.2.8-beta.1" = { - name = "_at_expo_slash_ngrok-bin-win32-ia32"; - packageName = "@expo/ngrok-bin-win32-ia32"; - version = "2.2.8-beta.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@expo/ngrok-bin-win32-ia32/-/ngrok-bin-win32-ia32-2.2.8-beta.1.tgz"; - sha512 = "Pva9ZNjUieD2/RVav7LYGAXZ1O6MVXlvOnJmHSmjP4rhreek7/Ez7b5HsCEN3YLjZIcPHH8SV8Duix1NO2zB5A=="; - }; - }; - "@expo/ngrok-bin-win32-x64-2.2.8-beta.1" = { - name = "_at_expo_slash_ngrok-bin-win32-x64"; - packageName = "@expo/ngrok-bin-win32-x64"; - version = "2.2.8-beta.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@expo/ngrok-bin-win32-x64/-/ngrok-bin-win32-x64-2.2.8-beta.1.tgz"; - sha512 = "tVn0jkRC7cbDL502FU7iVI4jbaEKcbTER7pYo2xdUZgM02n4u0AS+FFuzUN+irDiRYZQIFdmDIhxDGl+SHkzbA=="; + url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.52.tgz"; + sha512 = "ODxn3/h/6A1qvvKOlmSOUuM2l0hWn02W5idBnCpN8feY3DLGdPh+IFDmpnkT5yFBJ0Fx7qlrgphN4O7+9SF9Bg=="; }; }; "@expo/osascript-2.0.24" = { @@ -1912,13 +1813,13 @@ let sha512 = "oqar3vmvxkVx1OBG7hTjTbCaVVUX2o+aEMLxZWLUiubL0ly1qxgQKEt5p3g3pzkxTft+b1oMf8bT7jMi6iOv+Q=="; }; }; - "@expo/package-manager-0.0.34" = { + "@expo/package-manager-0.0.36" = { name = "_at_expo_slash_package-manager"; packageName = "@expo/package-manager"; - version = "0.0.34"; + version = "0.0.36"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/package-manager/-/package-manager-0.0.34.tgz"; - sha512 = "/zxESSNAjeBI7BlrFlmmLbEDNblJhR0fd9rZGPOwNlRoeojCJ0yh+nTUWXQtBgolffQMYq0LkTTjTDszqs4M+g=="; + url = "https://registry.npmjs.org/@expo/package-manager/-/package-manager-0.0.36.tgz"; + sha512 = "GsdGrtdtuXlEvq+fs6FF+knlgX0l3GII5H4e00Zd6JOz9u1+c+BmfnQNBW59KYvsJ6akmS8dCqUl0Bgt3Bj3Hg=="; }; }; "@expo/plist-0.0.11" = { @@ -1939,13 +1840,13 @@ let sha512 = "qECzzXX5oJot3m2Gu9pfRDz50USdBieQVwYAzeAtQRUTD3PVeTK1tlRUoDcrK8PSruDLuVYdKkLebX4w/o55VA=="; }; }; - "@expo/schemer-1.3.23" = { + "@expo/schemer-1.3.24" = { name = "_at_expo_slash_schemer"; packageName = "@expo/schemer"; - version = "1.3.23"; + version = "1.3.24"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/schemer/-/schemer-1.3.23.tgz"; - sha512 = "ORDxT7mCTtiJZj1R44L5R8HvSMfTJk31qBAb57yx7WXY2crUrwZGwmZryUjGs0Z3BlrbwbsWTvF7CvVa6zy+Sg=="; + url = "https://registry.npmjs.org/@expo/schemer/-/schemer-1.3.24.tgz"; + sha512 = "0Ctzcnf/JhNF4OVOn1BKHKkZCoVA4mxzpTO9yCK/+Kbls9wMFUns1TGl10BYytozLC7AGSx8c4vg+Xn/ESVZNg=="; }; }; "@expo/simple-spinner-1.0.2" = { @@ -1966,40 +1867,22 @@ let sha512 = "LB7jWkqrHo+5fJHNrLAFdimuSXQ2MQ4lA7SQW5bf/HbsXuV2VrT/jN/M8f/KoWt0uJMGN4k/j7Opx4AvOOxSew=="; }; }; - "@expo/traveling-fastlane-darwin-1.15.1" = { - name = "_at_expo_slash_traveling-fastlane-darwin"; - packageName = "@expo/traveling-fastlane-darwin"; - version = "1.15.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@expo/traveling-fastlane-darwin/-/traveling-fastlane-darwin-1.15.1.tgz"; - sha512 = "7sjG83+o9BT4MVPNq2UVqy1Oyg3n47FpEIDxc0M9CQvbC1WgYsAKloOJ85g5GRXZAjqzPOPUZF+lBhGbOwmQvg=="; - }; - }; - "@expo/traveling-fastlane-linux-1.15.1" = { - name = "_at_expo_slash_traveling-fastlane-linux"; - packageName = "@expo/traveling-fastlane-linux"; - version = "1.15.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@expo/traveling-fastlane-linux/-/traveling-fastlane-linux-1.15.1.tgz"; - sha512 = "YaFAYYOOxImYNx9s6X3tY6fC1y6rka0KXstrs2zrS+vHyyBD8IOhNtIUvybHScM3jUL+qukgKElAb+7gzlF6Eg=="; - }; - }; - "@expo/webpack-config-0.12.52" = { + "@expo/webpack-config-0.12.56" = { name = "_at_expo_slash_webpack-config"; packageName = "@expo/webpack-config"; - version = "0.12.52"; + version = "0.12.56"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.12.52.tgz"; - sha512 = "OOxIMaKa2O4JPDZpNMc+G40Z5MoOoRwvfU+331+ydqGzPDAev8/PtalnQbJTuqjVaU99QzVlrn1BfLWwJ/3fig=="; + url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.12.56.tgz"; + sha512 = "sp2anAJFm7pe5foF+UTrTpsryaEqg141qWkBqS5uJmROFWeM0SRhnW/axtRGvuZQnt4927RZ9a2FkDv+tXQEaA=="; }; }; - "@expo/xdl-59.0.14" = { + "@expo/xdl-59.0.19" = { name = "_at_expo_slash_xdl"; packageName = "@expo/xdl"; - version = "59.0.14"; + version = "59.0.19"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/xdl/-/xdl-59.0.14.tgz"; - sha512 = "h2czzd9nBhiafVp1JFPcP/VYqefKpNb8Om7oY6twm7GCFkX+tlZ8zYtkVfgE9WlOhtAOu8b56eKfjAOdUsqlGQ=="; + url = "https://registry.npmjs.org/@expo/xdl/-/xdl-59.0.19.tgz"; + sha512 = "QfmDX1ujVjJmtQo9iz8Q32LsEFnLWyi9VEAOxOGhhW2pMshXfO+R2Twc8dyU1jgF/AL+LoUm4tIGsnoFewlhJQ=="; }; }; "@fast-csv/format-4.3.5" = { @@ -2047,22 +1930,22 @@ let sha512 = "t3yIbbPKJubb22vQ/FIWwS9vFAzaPYzFxKWPHVWLtxs/P+5yL+LD3B16DRtYreWAdl9CZvEbos58ChLZ0KHwSQ=="; }; }; - "@fluentui/react-7.155.3" = { + "@fluentui/react-7.157.0" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "7.155.3"; + version = "7.157.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-7.155.3.tgz"; - sha512 = "bVK9qMUqjWQ68UPkQGHCMnCKeH8uSlCLF2QgR9ESMV/g0sHUvRqCO1Yuj9JyO4NDanqfX62NDgJzimHKj1/MQg=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-7.157.0.tgz"; + sha512 = "dpD+wmZIGFcxBkc4VxSbJikOkaEIPYq5XspEKIb6xdo6Us99zi4d4VH5omOF74xBxPVwPCDZG/bN07at7iuteQ=="; }; }; - "@fluentui/react-focus-7.17.0" = { + "@fluentui/react-focus-7.17.1" = { name = "_at_fluentui_slash_react-focus"; packageName = "@fluentui/react-focus"; - version = "7.17.0"; + version = "7.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.17.0.tgz"; - sha512 = "xr5LExRnLW9CNyWDkcMmvOAgOXru/GBTIKcVqNahgRf7CIyHraY0m/0gFblwNtPYQOS9ltM3c+fbyYvCXBZvEw=="; + url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.17.1.tgz"; + sha512 = "Nulq2pE4pX6Pf+tGZl8uLp8VfqUzx3elC5v7QvYSBdjnZK8ykitdsa+Sd3PKYWW2EMlzVRSptlzbuJ6JyEDQKQ=="; }; }; "@fluentui/react-window-provider-1.0.1" = { @@ -2074,13 +1957,13 @@ let sha512 = "5hvruDyF0uE8+6YN6Y+d2sEzexBadxUNxUjDcDreTPsmtHPwF5FPBYLhoD7T84L5U4YNvKxKh25tYJm6E0GE2w=="; }; }; - "@fluentui/theme-1.7.0" = { + "@fluentui/theme-1.7.1" = { name = "_at_fluentui_slash_theme"; packageName = "@fluentui/theme"; - version = "1.7.0"; + version = "1.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/theme/-/theme-1.7.0.tgz"; - sha512 = "pzqDZC2bVD6/S45Bnve4wmrXi4cN7XiCr+OhzvgmoQfDkm5vyXsa82/cVtif/zy1OFU96S9zOTtt3e+QQuGUUg=="; + url = "https://registry.npmjs.org/@fluentui/theme/-/theme-1.7.1.tgz"; + sha512 = "cwx8gJ0O9d+Z8g6Lq7BgDgH8XPfSloUSy0GN3fWHJGrDCBPcnmz6/GKbbvxw9PZ2t1iNcAzJEJNT6NyuOOobPA=="; }; }; "@google-cloud/paginator-3.0.5" = { @@ -2119,13 +2002,13 @@ let sha512 = "d4VSA86eL/AFTe5xtyZX+ePUjE8dIFu2T8zmdeNBSa5/kNgXPCx/o/wbFNHAGLJdGnk1vddRuMESD9HbOC8irw=="; }; }; - "@google-cloud/pubsub-2.7.0" = { + "@google-cloud/pubsub-2.8.0" = { name = "_at_google-cloud_slash_pubsub"; packageName = "@google-cloud/pubsub"; - version = "2.7.0"; + version = "2.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-2.7.0.tgz"; - sha512 = "wc/XOo5Ibo3GWmuaLu80EBIhXSdu2vf99HUqBbdsSSkmRNIka2HqoIhLlOFnnncQn0lZnGL7wtKGIDLoH9LiBg=="; + url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-2.8.0.tgz"; + sha512 = "AoSKAbpHCoLq6jO9vMX+K6hJhkayafan24Rs2RKHU8Y0qF6IGSm1+ly0OG12TgziHWg818/6dljWWKgwDcp8KA=="; }; }; "@graphql-cli/common-4.1.0" = { @@ -2155,31 +2038,31 @@ let sha512 = "+ywPfK6N2Ddna6oOa5Qb1Mv7EA8LOwRNOAPP9dL37FEhksJM9pYqPSceUcqMqg7S9b0+Cgr78s408rgvurV3/Q=="; }; }; - "@graphql-tools/delegate-7.0.8" = { + "@graphql-tools/delegate-7.0.9" = { name = "_at_graphql-tools_slash_delegate"; packageName = "@graphql-tools/delegate"; - version = "7.0.8"; + version = "7.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-7.0.8.tgz"; - sha512 = "pS1wci7ZxzdCITRrMI66UA+6/E0Z1Yczd3QxJBDb4Kp0nTGy1xy7enGa0+i55EmCvKvuwyx+tzXzwA1fNGRJzg=="; + url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-7.0.9.tgz"; + sha512 = "nlelOb354cyweV+SpTXkoGZHKgJ1PwPkHWq/0RXM5LllQsR3OrSQKKWMrd1g9dyawEZbadCF3fDJJWSQ4HOg2g=="; }; }; - "@graphql-tools/graphql-file-loader-6.2.6" = { + "@graphql-tools/graphql-file-loader-6.2.7" = { name = "_at_graphql-tools_slash_graphql-file-loader"; packageName = "@graphql-tools/graphql-file-loader"; - version = "6.2.6"; + version = "6.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-6.2.6.tgz"; - sha512 = "L+RdYl5C6+X0zdOTUotY0K5zwqvSGpqI/qcZpVvCDenoAcVTyaNLmnd/ViErwedhCaGqAAV0wI1nPtyKFPlMUg=="; + url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-6.2.7.tgz"; + sha512 = "5k2SNz0W87tDcymhEMZMkd6/vs6QawDyjQXWtqkuLTBF3vxjxPD1I4dwHoxgWPIjjANhXybvulD7E+St/7s9TQ=="; }; }; - "@graphql-tools/import-6.2.5" = { + "@graphql-tools/import-6.2.6" = { name = "_at_graphql-tools_slash_import"; packageName = "@graphql-tools/import"; - version = "6.2.5"; + version = "6.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.2.5.tgz"; - sha512 = "ZGXT5tDod7m+LO38fc+o0JzR1LstL0RF35HKEWoUdxRIVaaeYH9VMuan9Gn+9M9RDME3RnzEa9aGzf9ATj8bTA=="; + url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.2.6.tgz"; + sha512 = "/0H/bDjNK1MnKonk8fMbB7wIYU6QLCwbQOHtSHbFJ4j2qki5CqfAxpF+fGX6KovDtkdigcgRMvSKKi14oiuHPA=="; }; }; "@graphql-tools/json-file-loader-6.2.6" = { @@ -2200,13 +2083,13 @@ let sha512 = "FlQC50VELwRxoWUbJMMMs5gG0Dl8BaQYMrXUHTsxwqR7UmksUYnysC21rdousvs6jVZ7pf4unZfZFtBjz+8Edg=="; }; }; - "@graphql-tools/merge-6.2.6" = { + "@graphql-tools/merge-6.2.7" = { name = "_at_graphql-tools_slash_merge"; packageName = "@graphql-tools/merge"; - version = "6.2.6"; + version = "6.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.2.6.tgz"; - sha512 = "G6x0QlIzFHoJ3dyF9a4gxmBtaEYJ+EoAAGqXHsE/drRr58K1jscQdfKZdF1wZWZgxkgakHqgt1+oFMeQg/O6ug=="; + url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.2.7.tgz"; + sha512 = "9acgDkkYeAHpuqhOa3E63NZPCX/iWo819Q320sCCMkydF1xgx0qCRYz/V03xPdpQETKRqBG2i2N2csneeEYYig=="; }; }; "@graphql-tools/schema-7.1.2" = { @@ -2218,13 +2101,13 @@ let sha512 = "GabNT51ErVHE2riDH4EQdRusUsI+nMElT8LdFHyuP53v8gwtleAj+LePQ9jif4NYUe/JQVqO8V28vPcHrA7gfQ=="; }; }; - "@graphql-tools/url-loader-6.7.1" = { + "@graphql-tools/url-loader-6.8.0" = { name = "_at_graphql-tools_slash_url-loader"; packageName = "@graphql-tools/url-loader"; - version = "6.7.1"; + version = "6.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-6.7.1.tgz"; - sha512 = "7NJ1G5diJAuWYZszQf0mNwPipVMOjIIMteNkutdExBq4CgN0V1xa3/iC25CUrI7sZiq+D367zZNONmKf+3bA2Q=="; + url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-6.8.0.tgz"; + sha512 = "x4f93UnH7kNr9iHFpJHL6kYWogRFlxMEnXybHS9xNCFd08+ftMO22bUb8esnFsyNrtMMlkLtshDSyNb3LbIMQg=="; }; }; "@graphql-tools/utils-6.2.4" = { @@ -2236,13 +2119,13 @@ let sha512 = "ybgZ9EIJE3JMOtTrTd2VcIpTXtDrn2q6eiYkeYMKRVh3K41+LZa6YnR2zKERTXqTWqhobROwLt4BZbw2O3Aeeg=="; }; }; - "@graphql-tools/utils-7.2.3" = { + "@graphql-tools/utils-7.2.4" = { name = "_at_graphql-tools_slash_utils"; packageName = "@graphql-tools/utils"; - version = "7.2.3"; + version = "7.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-7.2.3.tgz"; - sha512 = "9MvSKeo+8DM72706FvrUP8figQjRzSwBswWrXviyWyt3wSkk6MU2cURQKfMpc0I6nswZvkDSqYoQQ/6mazoXxA=="; + url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-7.2.4.tgz"; + sha512 = "EDSb98dTWX8FngvayWejip1DutOl0wGtNbXC7a3CZf5fiJS7bGHQ/8cSlMhe9XaHwpLJCbAk/Ijnp/dYbXk33w=="; }; }; "@graphql-tools/wrap-7.0.5" = { @@ -2254,31 +2137,22 @@ let sha512 = "KCWBXsDfvG46GNUawRltJL4j9BMGoOG7oo3WEyCQP+SByWXiTe5cBF45SLDVQgdjljGNZhZ4Lq/7avIkF7/zDQ=="; }; }; - "@grpc/grpc-js-1.1.8" = { + "@grpc/grpc-js-1.2.5" = { name = "_at_grpc_slash_grpc-js"; packageName = "@grpc/grpc-js"; - version = "1.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.1.8.tgz"; - sha512 = "64hg5rmEm6F/NvlWERhHmmgxbWU8nD2TMWE+9TvG7/WcOrFT3fzg/Uu631pXRFwmJ4aWO/kp9vVSlr8FUjBDLA=="; - }; - }; - "@grpc/proto-loader-0.5.5" = { - name = "_at_grpc_slash_proto-loader"; - packageName = "@grpc/proto-loader"; - version = "0.5.5"; + version = "1.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.5.5.tgz"; - sha512 = "WwN9jVNdHRQoOBo9FDH7qU+mgfjPc8GygPYms3M+y3fbQLfnCe/Kv/E01t7JRgnrsOHH8euvSbed3mIalXhwqQ=="; + url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.2.5.tgz"; + sha512 = "CBCNwedw8McnEBq9jvoiJikws16WN0OiHFejQPovY71XkFWSiIqgvydYiDwpvIYDJmhPQ7qZNzW9BPndhXbx1Q=="; }; }; - "@grpc/proto-loader-0.6.0-pre9" = { + "@grpc/proto-loader-0.5.6" = { name = "_at_grpc_slash_proto-loader"; packageName = "@grpc/proto-loader"; - version = "0.6.0-pre9"; + version = "0.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.6.0-pre9.tgz"; - sha512 = "oM+LjpEjNzW5pNJjt4/hq1HYayNeQT+eGrOPABJnYHv7TyNPDNzkQ76rDYZF86X5swJOa4EujEMzQ9iiTdPgww=="; + url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.5.6.tgz"; + sha512 = "DT14xgw3PSzPxwS13auTEwxhMMOoz33DPUKNtmYK/QYbBSpLXJy78FGGs5yVoxVobEqPm4iW9MOIoz0A3bLTRQ=="; }; }; "@gulp-sourcemaps/identity-map-1.0.2" = { @@ -2839,58 +2713,58 @@ let sha512 = "EjPkDQOzV/oZfbolEUgFT6SE++PtCccVBvjuACkttyCfl0P2jnpR49SwstyVLc2u8AwBAZEHHAw9lPYaMjtbXQ=="; }; }; - "@joplin/fork-htmlparser2-4.1.14" = { + "@joplin/fork-htmlparser2-4.1.21" = { name = "_at_joplin_slash_fork-htmlparser2"; packageName = "@joplin/fork-htmlparser2"; - version = "4.1.14"; + version = "4.1.21"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/fork-htmlparser2/-/fork-htmlparser2-4.1.14.tgz"; - sha512 = "uE5StVO3A6XcQLd5CxRU+XU7ecAKX8lmTFnHlnhBkgn8V8CHsHIUfZy1uw+fZ4gnC0kenq6uiZavhDPBAkibKA=="; + url = "https://registry.npmjs.org/@joplin/fork-htmlparser2/-/fork-htmlparser2-4.1.21.tgz"; + sha512 = "1+3/llkmSFF62wCj+UPeHDO8QevQjEm8uGSq7SltHVARZgWuvE3s4U/sKOoWCuqs5u34QHC3DcJ2ZlJRTwgYdg=="; }; }; - "@joplin/fork-sax-1.2.18" = { + "@joplin/fork-sax-1.2.25" = { name = "_at_joplin_slash_fork-sax"; packageName = "@joplin/fork-sax"; - version = "1.2.18"; + version = "1.2.25"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/fork-sax/-/fork-sax-1.2.18.tgz"; - sha512 = "tlsBwoayPjEVjAsylCosflTtF4EgGrSP4b/2r5Ci640846YDPdg0nqKuOUs82Xmptc3QQcnjzRKW8+7Up9+lfQ=="; + url = "https://registry.npmjs.org/@joplin/fork-sax/-/fork-sax-1.2.25.tgz"; + sha512 = "m5ZdP1JX0GmTaNz3zhUxjiGdtaDtPVqpY2+h3e5mh2WLwZJmT9TCKp7upB1+L+fOLgjI6em7xYHpvIL/dml+5Q=="; }; }; - "@joplin/lib-1.0.15" = { + "@joplin/lib-1.0.18" = { name = "_at_joplin_slash_lib"; packageName = "@joplin/lib"; - version = "1.0.15"; + version = "1.0.18"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/lib/-/lib-1.0.15.tgz"; - sha512 = "wOA+fxi93b9qfuRV7Ynhc+uUmW2XDVMugHWzqDdiOPd394mYQSX21/Eqvxhd049SsHiqmsMo2scz7rNtFLMnuA=="; + url = "https://registry.npmjs.org/@joplin/lib/-/lib-1.0.18.tgz"; + sha512 = "r0Z+bolszlPUsanaQIUk/tog3jHw0rGtUxXTHDMtycFWkWYVpjlT3bvxiYrV5MwLjyn/xnfUCIdHeUi/Lz3LPQ=="; }; }; - "@joplin/renderer-1.0.23" = { + "@joplin/renderer-1.0.26" = { name = "_at_joplin_slash_renderer"; packageName = "@joplin/renderer"; - version = "1.0.23"; + version = "1.0.26"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/renderer/-/renderer-1.0.23.tgz"; - sha512 = "1gddYqDLxeyR96m1/9WQ7Ri2tbaIOEW+JmbZKst9HDsgj8LiNwtBha+y35KqRAS6pWimbcXh0RZDkA4DmQ2VOw=="; + url = "https://registry.npmjs.org/@joplin/renderer/-/renderer-1.0.26.tgz"; + sha512 = "RDRYjuPCn1ltematEZQhgvZbIGBQ+2F3jgAdXpqByg71pmxrMZyOLLbNVYJyKK4w2Ecvmbpwuo0h9RbMb/56Ow=="; }; }; - "@joplin/turndown-4.0.36" = { + "@joplin/turndown-4.0.43" = { name = "_at_joplin_slash_turndown"; packageName = "@joplin/turndown"; - version = "4.0.36"; + version = "4.0.43"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/turndown/-/turndown-4.0.36.tgz"; - sha512 = "lks0n5HTAsg0O71L9kLoTaASAU4NILG3SyDcX/10K1g2wpoUadmXQmznaa3WqY4RgN0gzRKaZV51d7JtO9ZwXQ=="; + url = "https://registry.npmjs.org/@joplin/turndown/-/turndown-4.0.43.tgz"; + sha512 = "ZDGADbHVRPqeNrxvLTQ9JjmuChu40AyUPOA4N8zC8NcNzZQl5ZtKxZinMOOCGm8TXNNm7S987MYtnHszogCwtg=="; }; }; - "@joplin/turndown-plugin-gfm-1.0.18" = { + "@joplin/turndown-plugin-gfm-1.0.25" = { name = "_at_joplin_slash_turndown-plugin-gfm"; packageName = "@joplin/turndown-plugin-gfm"; - version = "1.0.18"; + version = "1.0.25"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/turndown-plugin-gfm/-/turndown-plugin-gfm-1.0.18.tgz"; - sha512 = "6uUXRU5PILzKAUP50t9FOyMrpGgfpw2ugrZ8hAfV+PhNZsjSgsc+cSBBdjn/HIEgNCr9m7TlHSzscxrHg496Iw=="; + url = "https://registry.npmjs.org/@joplin/turndown-plugin-gfm/-/turndown-plugin-gfm-1.0.25.tgz"; + sha512 = "ycWQ9a88tPH04sNfgZGsU5SuXWlOfEjVv2MLkF2D86ROyNIh7hxQe5sYvQTybhdUT2BkhLcRMm/qdp5Y/Cn67A=="; }; }; "@jsdevtools/ono-7.1.3" = { @@ -2902,13 +2776,13 @@ let sha512 = "4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg=="; }; }; - "@jsii/spec-1.16.0" = { + "@jsii/spec-1.17.1" = { name = "_at_jsii_slash_spec"; packageName = "@jsii/spec"; - version = "1.16.0"; + version = "1.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.16.0.tgz"; - sha512 = "DH3rDGa781UmRtg/ykFyxrfhjaz1SRz2BblNXDxwArhl0aUiN5HOdzi9icX8CFwdB9+ZxTtXuxap3BwvLa5xnA=="; + url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.17.1.tgz"; + sha512 = "9/bdS7MpIVwSgHfaZiYnpE56T2YNE2WAJbhZzQTsYZCYkB8icsP+hVCIWzeyGZmHR9KggaCETbmNlLG0v2QdSw=="; }; }; "@kwsites/file-exists-1.1.1" = { @@ -3496,22 +3370,22 @@ let sha512 = "/NdX1Ql8hKNM0vHFJnEr/bcw6BG0ULHD3HhInpniZw5ixpl+n/QIRfMEEmLCn7acedbM1zGdZvU5ZMbn9kcF5Q=="; }; }; - "@microsoft/load-themed-styles-1.10.141" = { + "@microsoft/load-themed-styles-1.10.146" = { name = "_at_microsoft_slash_load-themed-styles"; packageName = "@microsoft/load-themed-styles"; - version = "1.10.141"; + version = "1.10.146"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.141.tgz"; - sha512 = "IWqbTWhxpp10X2nZI14oqbPtzrRLvXtyX7sV/QDfVBtQQivLilZFynr/X69SAZtbSp/wi7WI8gKl2/6TuTNN1A=="; + url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.146.tgz"; + sha512 = "qQZ4J58J2VMe/XRpr2YRDusQB9uRBJ1SjJB76x7uH94t9hqxjVVxn2qL99Bl+ERbfrACZ9peGn2uamt4ponqZQ=="; }; }; - "@mozilla/readability-0.3.0" = { + "@mozilla/readability-0.4.1" = { name = "_at_mozilla_slash_readability"; packageName = "@mozilla/readability"; - version = "0.3.0"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@mozilla/readability/-/readability-0.3.0.tgz"; - sha512 = "q8f1CAZsRKK1j+O0BmikGIlKSK03RpT4woT0PCQwhw0nH0z4+rG026AkxoPcjT7Dsgh1ifGscW8tOpvjoyOjvw=="; + url = "https://registry.npmjs.org/@mozilla/readability/-/readability-0.4.1.tgz"; + sha512 = "yar/f0w0fRUVM895s6yd5Z2oIxjG/6c3ROB/uQboSOBaDlri/nqI4aKtdqrldWciTLcdpjB2Z6MiVF2Bl9b8LA=="; }; }; "@mrmlnc/readdir-enhanced-2.2.1" = { @@ -3532,13 +3406,13 @@ let sha512 = "Vwhc3ObxmDZmA5hY8mfsau2rJ4vGPvzbj20QSZ2/E1GDPF61QVyjLfNHak9xmel6pW4heRt3v1fHa6np9Ehfeg=="; }; }; - "@nestjs/schematics-7.2.6" = { + "@nestjs/schematics-7.2.7" = { name = "_at_nestjs_slash_schematics"; packageName = "@nestjs/schematics"; - version = "7.2.6"; + version = "7.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/@nestjs/schematics/-/schematics-7.2.6.tgz"; - sha512 = "4geGO9pjYG4Sc4Qi+pkUVIbaxPEeySHi/z17po8nP9uaPPo8AUKP9rXjNL+mhMrXqFlB/hhN6xBBYtMyL5pB2Q=="; + url = "https://registry.npmjs.org/@nestjs/schematics/-/schematics-7.2.7.tgz"; + sha512 = "71XqMPf7s2P1Q6PVMDLbSLphVWgGDK2CgURVYyreuIWXVSoi9pcPIeO5k0Qb5n5jELlKwdrf66g05U2I6TIxzg=="; }; }; "@netflix/nerror-1.1.3" = { @@ -3550,13 +3424,13 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-8.0.1" = { + "@netlify/build-8.3.1" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "8.0.1"; + version = "8.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-8.0.1.tgz"; - sha512 = "DOBUR4x0GEmi4hD8LagJfPCtxnaAtjRTJgZdTx9lFngC2OHY+xIwGZ3Ilct1b3vbAcl0SzHA+HZ4xrG2V/EWdw=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-8.3.1.tgz"; + sha512 = "E5vKBVk2x0ql5VKtGOpoWNsAzYUbVteK0VW+ZR69ANZPmCZjveeSJ/1bDVR+pme3yzGMTokX4eHS60ym5fvUjw=="; }; }; "@netlify/cache-utils-1.0.6" = { @@ -3568,31 +3442,31 @@ let sha512 = "Pz/TzLZhMUACT+X7Un6jZCXgEUwLPVNbx69DQtEOMZ6hNBE1b1ErTHFbSaHA0KfDn/yqCII5vS274DERvNuRwg=="; }; }; - "@netlify/config-0.11.11" = { + "@netlify/config-3.0.4" = { name = "_at_netlify_slash_config"; packageName = "@netlify/config"; - version = "0.11.11"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/config/-/config-0.11.11.tgz"; - sha512 = "Z7yzbx5qCX2I5RLlNyo0MMQ6GKJc8o5Nej9yspCavjqgYlUS7VJfbeE67WNxC26FXwDUqq00zJ0MrCS0Un1YOw=="; + url = "https://registry.npmjs.org/@netlify/config/-/config-3.0.4.tgz"; + sha512 = "BDENk7IOyLwADTebFhHrXNhn2H5tgTxkBJR/FPzzfWbq28YLrsKauFMmZbCUivoP594/gIKZT6cGlPm5tVjxbg=="; }; }; - "@netlify/config-2.4.3" = { - name = "_at_netlify_slash_config"; - packageName = "@netlify/config"; - version = "2.4.3"; + "@netlify/framework-info-2.1.1" = { + name = "_at_netlify_slash_framework-info"; + packageName = "@netlify/framework-info"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/config/-/config-2.4.3.tgz"; - sha512 = "Uz7Oo3tJP2VTgNgsJtRlwAhO5jTozkpNMCKALb814ssJKx7nE/4QvNxJPCQNBDXY9BSeXVIPfy0vMfshxatL+g=="; + url = "https://registry.npmjs.org/@netlify/framework-info/-/framework-info-2.1.1.tgz"; + sha512 = "JblagtBYtOwuxZy94jXPNc3p+QOuyx+kZurfduswYbT8VWPlyuiL4AQFKaIJvdZS6O9G8uKEiFGsKFhRTx6vAA=="; }; }; - "@netlify/functions-utils-1.3.4" = { + "@netlify/functions-utils-1.3.7" = { name = "_at_netlify_slash_functions-utils"; packageName = "@netlify/functions-utils"; - version = "1.3.4"; + version = "1.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.3.4.tgz"; - sha512 = "AkVd03D6K7Uwli+t5xTMm5c1jn1HRFY3YgslLV91huHI++3CjOsGpsnDfhoN2kj1aN8OLqliTOvs4PQHC2dKpw=="; + url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.3.7.tgz"; + sha512 = "jqEPVGAOrf9JvUdFvPhSoBqTuWpL7l4XjejETqQpbHwXl1G711RC1vtgvVc8wYdFOBZNPfNEagtxmRwwbW8a/w=="; }; }; "@netlify/git-utils-1.0.6" = { @@ -3604,31 +3478,22 @@ let sha512 = "JpuvzCTf9QXVEgVA4mSshH6fi9Dtg0Pqe5d19yaN2f1H9DNnWro3kJUaoR68Hfo0rBls6kYwWJuNZ/csb03VuQ=="; }; }; - "@netlify/open-api-0.18.1" = { + "@netlify/open-api-1.3.0" = { name = "_at_netlify_slash_open-api"; packageName = "@netlify/open-api"; - version = "0.18.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@netlify/open-api/-/open-api-0.18.1.tgz"; - sha512 = "kkRCzA71HugJxmPOcWv2B4ArHhSMKjs2ArGBr10ndocVLdAHwCYoJm0X4Xt8IYaOcGD9Lm4fbLjpXDLDRGDzPw=="; - }; - }; - "@netlify/open-api-1.0.0" = { - name = "_at_netlify_slash_open-api"; - packageName = "@netlify/open-api"; - version = "1.0.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/open-api/-/open-api-1.0.0.tgz"; - sha512 = "LAicAlsAZXybGtKzaOTmIYelSe82vgZlc17IeNUQxab2IlUCH7VhTKCx9EyJEgiXhLvmYoOjuYE1Ee9ZsnrybA=="; + url = "https://registry.npmjs.org/@netlify/open-api/-/open-api-1.3.0.tgz"; + sha512 = "GcCPXIWI8VDBsLN4nPvb6sKS9tbi4lrHLhex90hT27nwTDeu4HgGE93YilcsgZ1LLODJNxC5LdfTNLtvEHMKVg=="; }; }; - "@netlify/plugin-edge-handlers-1.10.0" = { + "@netlify/plugin-edge-handlers-1.11.2" = { name = "_at_netlify_slash_plugin-edge-handlers"; packageName = "@netlify/plugin-edge-handlers"; - version = "1.10.0"; + version = "1.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/plugin-edge-handlers/-/plugin-edge-handlers-1.10.0.tgz"; - sha512 = "ZgabL4Q+DfB5lqq36QYvGIhLifoiVz5oDfqLp1w7hRsJYwUhUPqeJx/0zph17ZaJB4CvHRadFOeyJeDSkzrERg=="; + url = "https://registry.npmjs.org/@netlify/plugin-edge-handlers/-/plugin-edge-handlers-1.11.2.tgz"; + sha512 = "mHCg3X3aU59DHtg7fsXvNA2CN9gwaX7aRtrHV/NWbHUPUuHzETTTd1Ig/u2zVo4ehi7KZKcqXr1jzQEoO6aJYA=="; }; }; "@netlify/plugins-list-2.2.0" = { @@ -3649,112 +3514,103 @@ let sha512 = "Ovgkw9b7HSLsdhTBA+LNq3KY83gU9DP0xHbwDlg07zLpY3RtRN2IBy11w+nRPjQwfNT33OmuTvayH6amJDku5Q=="; }; }; - "@netlify/traffic-mesh-agent-0.27.0" = { + "@netlify/traffic-mesh-agent-0.27.10" = { name = "_at_netlify_slash_traffic-mesh-agent"; packageName = "@netlify/traffic-mesh-agent"; - version = "0.27.0"; + version = "0.27.10"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent/-/traffic-mesh-agent-0.27.0.tgz"; - sha512 = "a+jXM75Ir9PavNTzDRkZWQT7jHc02wWF8mRYXWbvku+VLqmmkA61RyhAgSeo5dMWSdMofSRkoifnW7leyv7Obw=="; + url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent/-/traffic-mesh-agent-0.27.10.tgz"; + sha512 = "HZXEdIXzg8CpysYRDVXkBpmjOj/C8Zb8Q/qkkt9x+npJ56HeX6sXAE4vK4SMCRLkkbQ2VyYTaDKg++GefeB2Gg=="; }; }; - "@netlify/traffic-mesh-agent-darwin-x64-0.27.0" = { + "@netlify/traffic-mesh-agent-darwin-x64-0.27.10" = { name = "_at_netlify_slash_traffic-mesh-agent-darwin-x64"; packageName = "@netlify/traffic-mesh-agent-darwin-x64"; - version = "0.27.0"; + version = "0.27.10"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-darwin-x64/-/traffic-mesh-agent-darwin-x64-0.27.0.tgz"; - sha512 = "a0EDNrdLBjxp+GYj/WQSifuQZorFQkY6spO4wuOl3mQV3tKTkBmu09+FsfitYpgZHDMoPzfhvURJrUtJIHTgqQ=="; + url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-darwin-x64/-/traffic-mesh-agent-darwin-x64-0.27.10.tgz"; + sha512 = "j2blCh3TKNV35VPF9Zf/LM3v6pH/gz/Y7uu/78RLbgNvCW0vGN7b1GgFnXQKwrvbL6tRGumJS2P5PWUfEsKOBA=="; }; }; - "@netlify/traffic-mesh-agent-linux-x64-0.27.0" = { + "@netlify/traffic-mesh-agent-linux-x64-0.27.10" = { name = "_at_netlify_slash_traffic-mesh-agent-linux-x64"; packageName = "@netlify/traffic-mesh-agent-linux-x64"; - version = "0.27.0"; + version = "0.27.10"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-linux-x64/-/traffic-mesh-agent-linux-x64-0.27.0.tgz"; - sha512 = "m7p/0eTXKILxCpTqQOmBkYdIjYKwSC2KZbPpDJ4sYfnMIF3qa9uMp8qrK9At/oGPckeiTq4Id775veldhwt2lw=="; + url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-linux-x64/-/traffic-mesh-agent-linux-x64-0.27.10.tgz"; + sha512 = "JdeGT356TtqbxY6IjsS+wik68V0iNGdRsGV4cYOx/aAfclAyZ9DL29A4nzobyq5J+s5binrbKpix26/WKi+sqA=="; }; }; - "@netlify/traffic-mesh-agent-win32-x64-0.27.0" = { + "@netlify/traffic-mesh-agent-win32-x64-0.27.10" = { name = "_at_netlify_slash_traffic-mesh-agent-win32-x64"; packageName = "@netlify/traffic-mesh-agent-win32-x64"; - version = "0.27.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-win32-x64/-/traffic-mesh-agent-win32-x64-0.27.0.tgz"; - sha512 = "u6Beazs0KWRcEx9q2n417Sj7+WGrDTtDGmmKPTE6WexFt6uY1oiq3AR+ohCtu1lIIsmAfAYd8O5dSOnyAT8dFg=="; - }; - }; - "@netlify/zip-it-and-ship-it-1.7.0" = { - name = "_at_netlify_slash_zip-it-and-ship-it"; - packageName = "@netlify/zip-it-and-ship-it"; - version = "1.7.0"; + version = "0.27.10"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-1.7.0.tgz"; - sha512 = "7Fatc5OoRZ7V2tusx1CBWIdk9hXrr0JWoW547wsmopCkCl5O4TaLxw12CgfW6EQsjaufSnuQddzvnx5y1b5gGQ=="; + url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-win32-x64/-/traffic-mesh-agent-win32-x64-0.27.10.tgz"; + sha512 = "ea6S9ik5X0TlA2e+jXk5D7lfvArPZjyQoIBEo7G1Tjw/vUU5Fx6KLfXv1iy7eJy+ENTLoyidscAjJ2wXlHI47g=="; }; }; - "@netlify/zip-it-and-ship-it-2.0.0" = { + "@netlify/zip-it-and-ship-it-2.1.1" = { name = "_at_netlify_slash_zip-it-and-ship-it"; packageName = "@netlify/zip-it-and-ship-it"; - version = "2.0.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-2.0.0.tgz"; - sha512 = "DQQldFTRmEPHpvvKxAKLNk/RqVIfzZGsBcbmruy3zupPG2W+pGHnQUSMNXrUZmMkqekDh0nCHf8MfG0EakRqGg=="; + url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-2.1.1.tgz"; + sha512 = "xG77kkrW4OtEcUrleQ5gcGmD8QZm0dOGbWZXtyL+gyoHuMxqLndcl0XymVlha9X9R00ecimSWxnf6SpdZ6UBXw=="; }; }; - "@node-red/editor-api-1.2.6" = { + "@node-red/editor-api-1.2.7" = { name = "_at_node-red_slash_editor-api"; packageName = "@node-red/editor-api"; - version = "1.2.6"; + version = "1.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.2.6.tgz"; - sha512 = "RM243A8AgpoHEc8cu8STCYsJVx790clVxvRUCaLfbAyb+dKn+9b0TOKWsmLUW4fhrMqwwVlFOMulVHPhg0HhGg=="; + url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.2.7.tgz"; + sha512 = "DY1rnKjX8ewkVwwCa6T+kjUHjCP+YMms8rPXFYZAi/r148jS7pKC21OgYe4FrJhM5EGREVJClG5Td6QAORR1vw=="; }; }; - "@node-red/editor-client-1.2.6" = { + "@node-red/editor-client-1.2.7" = { name = "_at_node-red_slash_editor-client"; packageName = "@node-red/editor-client"; - version = "1.2.6"; + version = "1.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.2.6.tgz"; - sha512 = "2hMnMVcqhR77mHqHzVj3hNJGZ8VcaO+lhggNYhORJXEqYCeAULj92hMCeoA4pjHDqGBn2F+gldli1WOs1/JgJg=="; + url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.2.7.tgz"; + sha512 = "56NMyLL4iCuSaAYhWnsR3TTQidygoETRaG0GAYuU1iZgh+UZxvnLvIGa4gxgvMdtMgM0t4kS6tyMHhIIbX5Kvw=="; }; }; - "@node-red/nodes-1.2.6" = { + "@node-red/nodes-1.2.7" = { name = "_at_node-red_slash_nodes"; packageName = "@node-red/nodes"; - version = "1.2.6"; + version = "1.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.2.6.tgz"; - sha512 = "1LlECIzKKBHUOsWGLw31FT1mWL2mSecr9gBh2FqwnP7gNejebYjwP2zuHKOYs9sPRm3550zOJ5mlutXiiFKwYg=="; + url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.2.7.tgz"; + sha512 = "GRUbM7HVPssjxbybMUkjEONi46eGabFYrY2OFZmzFF9L1ywTL9qMeEWsnHdV0Yibkr9Iq0VE4Ss/XZy+cCABAw=="; }; }; - "@node-red/registry-1.2.6" = { + "@node-red/registry-1.2.7" = { name = "_at_node-red_slash_registry"; packageName = "@node-red/registry"; - version = "1.2.6"; + version = "1.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.2.6.tgz"; - sha512 = "+zwHxnMr9Adve627dtw2jl/KSjTY+a5JrwJN10TSKMxVLwYeBLm/ugRTA9tkGiCjr2w9pgsnMUZRFFLfdyRZCQ=="; + url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.2.7.tgz"; + sha512 = "FC14n/pEPiftsWGHQpLW9/4vstvtFpiczj/7CHp5p1Xmn2quSUzKBFOGtFr1FhglTJ3Nn59OOXL+59HMRF3Vcw=="; }; }; - "@node-red/runtime-1.2.6" = { + "@node-red/runtime-1.2.7" = { name = "_at_node-red_slash_runtime"; packageName = "@node-red/runtime"; - version = "1.2.6"; + version = "1.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.2.6.tgz"; - sha512 = "zfQGK4Hqssv5TV8S5WLZ77BHYmyylarZvEScVQpivhJHg6HeZL+MffqqtPIyTM1ulklPZvO6fPmq/f5T/CgAgw=="; + url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.2.7.tgz"; + sha512 = "0QpolGMBL8ZMXKgzQRp9JFXYuoLaZZ4xkwFehMKH3KubDAYHHTl4tfTdY71hRxe8NbTZW9G9Gftt+e1vj0RGvg=="; }; }; - "@node-red/util-1.2.6" = { + "@node-red/util-1.2.7" = { name = "_at_node-red_slash_util"; packageName = "@node-red/util"; - version = "1.2.6"; + version = "1.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/util/-/util-1.2.6.tgz"; - sha512 = "CYUCS8iqcaZFBf0vwtVPqqNXX0XY0ajFW69smtDItbxslyZL3A0qRMiTTv0qMPA1uvOCEw4wQRSIQV7j/nd0yw=="; + url = "https://registry.npmjs.org/@node-red/util/-/util-1.2.7.tgz"; + sha512 = "+mftTJ1AtjqbO/5LjggXd36fcomKjlOy/IunjQULaMGO4MIIqPxZ/QUYTuSi2Z/rgHPMHRuwguwWnoca4GkBnw=="; }; }; "@nodelib/fs.scandir-2.1.4" = { @@ -3820,13 +3676,13 @@ let sha512 = "aKIwguaaqb6ViwSOFytniGvLPb9SMCUm39TgM3SfUo7n0TxUMbwoXfpwyvQ4blm10lzbAwTsvjr7QZ85LvTi4A=="; }; }; - "@npmcli/move-file-1.0.1" = { + "@npmcli/move-file-1.1.0" = { name = "_at_npmcli_slash_move-file"; packageName = "@npmcli/move-file"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.0.1.tgz"; - sha512 = "Uv6h1sT+0DrblvIrolFtbvM1FgWm+/sy4B3pvLp67Zys+thcukzS5ekn7HsZFGpWP4Q3fYJCljbWQE/XivMRLw=="; + url = "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.0.tgz"; + sha512 = "Iv2iq0JuyYjKeFkSR4LPaCdDZwlGK9X2cP/01nJcp3yMJ1FjNd9vpiEYvLUgzBxKPg2SFmaOhizoQsPc0LWeOQ=="; }; }; "@npmcli/node-gyp-1.0.1" = { @@ -3919,13 +3775,13 @@ let sha512 = "Afchpdd8FNfx9GaU/1D9IzyfiXvjfGybgzQ6G4GTFvPO0/hLdkXX3YyYq+SnxE6/bCrhg4pleiB+GuJACmmkEA=="; }; }; - "@oclif/plugin-autocomplete-0.2.1" = { + "@oclif/plugin-autocomplete-0.3.0" = { name = "_at_oclif_slash_plugin-autocomplete"; packageName = "@oclif/plugin-autocomplete"; - version = "0.2.1"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/plugin-autocomplete/-/plugin-autocomplete-0.2.1.tgz"; - sha512 = "EOcoh1x3auFg1a7NNVTT+hJ1PPih7Kg1it7WtG8oBgYKe+YD/bvHnX2QlXqi9S7H0XsQQMUb8hxbLP+XwQY/8Q=="; + url = "https://registry.npmjs.org/@oclif/plugin-autocomplete/-/plugin-autocomplete-0.3.0.tgz"; + sha512 = "gCuIUCswvoU1BxDDvHSUGxW8rFagiacle8jHqE49+WnuniXD/N8NmJvnzmlNyc8qLE192CnKK+qYyAF+vaFQBg=="; }; }; "@oclif/plugin-help-1.2.11" = { @@ -3964,15 +3820,6 @@ let sha512 = "G440PCuMi/OT8b71aWkR+kCWikngGtyRjOR24sPMDbpUFV4+B3r51fz1fcqeUiiEOYqUpr0Uy/sneUe1O/NfBg=="; }; }; - "@oclif/plugin-plugins-1.9.4" = { - name = "_at_oclif_slash_plugin-plugins"; - packageName = "@oclif/plugin-plugins"; - version = "1.9.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@oclif/plugin-plugins/-/plugin-plugins-1.9.4.tgz"; - sha512 = "C5hEbX4zzTjzbym2RJUE4wxz2aL2ocb826HDs3suscsjMPA3mRHyu8/rWJW1Cgc2MeoIybNdrfyPU/zmpWkaWw=="; - }; - }; "@oclif/plugin-plugins-1.9.5" = { name = "_at_oclif_slash_plugin-plugins"; packageName = "@oclif/plugin-plugins"; @@ -4000,31 +3847,31 @@ let sha512 = "60CHpq+eqnTxLZQ4PGHYNwUX572hgpMHGPtTWMjdTMsAvlm69lZV/4ly6O3sAYkomo4NggGcomrDpBe34rxUqw=="; }; }; - "@octokit/auth-token-2.4.4" = { + "@octokit/auth-token-2.4.5" = { name = "_at_octokit_slash_auth-token"; packageName = "@octokit/auth-token"; - version = "2.4.4"; + version = "2.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.4.4.tgz"; - sha512 = "LNfGu3Ro9uFAYh10MUZVaT7X2CnNm2C8IDQmabx+3DygYIQjs9FwzFAHN/0t6mu5HEPhxcb1XOuxdpY82vCg2Q=="; + url = "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.4.5.tgz"; + sha512 = "BpGYsPgJt05M7/L/5FoE1PiAbdxXFZkX/3kDYcsvd1v6UhlnE5e96dTDr0ezX/EFwciQxf3cNV0loipsURU+WA=="; }; }; - "@octokit/endpoint-6.0.10" = { + "@octokit/endpoint-6.0.11" = { name = "_at_octokit_slash_endpoint"; packageName = "@octokit/endpoint"; - version = "6.0.10"; + version = "6.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.10.tgz"; - sha512 = "9+Xef8nT7OKZglfkOMm7IL6VwxXUQyR7DUSU0LH/F7VNqs8vyd7es5pTfz9E7DwUIx7R3pGscxu1EBhYljyu7Q=="; + url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.11.tgz"; + sha512 = "fUIPpx+pZyoLW4GCs3yMnlj2LfoXTWDUVPTC4V3MUEKZm48W+XYpeWSZCv+vYF1ZABUm2CqnDVf1sFtIYrj7KQ=="; }; }; - "@octokit/openapi-types-2.0.1" = { + "@octokit/openapi-types-3.3.0" = { name = "_at_octokit_slash_openapi-types"; packageName = "@octokit/openapi-types"; - version = "2.0.1"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-2.0.1.tgz"; - sha512 = "9AuC04PUnZrjoLiw3uPtwGh9FE4Q3rTqs51oNlQ0rkwgE8ftYsOC+lsrQyvCvWm85smBbSc0FNRKKumvGyb44Q=="; + url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-3.3.0.tgz"; + sha512 = "s3dd32gagPmKaSLNJ9aPNok7U+tl69YLESf6DgQz5Ml/iipPZtif3GLvWpNXoA6qspFm1LFUZX+C3SqWX/Y/TQ=="; }; }; "@octokit/plugin-enterprise-rest-6.0.1" = { @@ -4045,13 +3892,13 @@ let sha512 = "jbsSoi5Q1pj63sC16XIUboklNw+8tL9VOnJsWycWYR78TKss5PVpIPb1TUUcMQ+bBh7cY579cVAWmf5qG+dw+Q=="; }; }; - "@octokit/plugin-request-log-1.0.2" = { + "@octokit/plugin-request-log-1.0.3" = { name = "_at_octokit_slash_plugin-request-log"; packageName = "@octokit/plugin-request-log"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.2.tgz"; - sha512 = "oTJSNAmBqyDR41uSMunLQKMX0jmEXbwD1fpz8FG27lScV3RhtGfBa1/BBLym+PxcC16IBlF7KH9vP1BUYxA+Eg=="; + url = "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.3.tgz"; + sha512 = "4RFU4li238jMJAzLgAwkBAw+4Loile5haQMQr+uhFq27BmyJXcXSKvoQKqh0agsZEiUlW6iSv3FAgvmGkur7OQ=="; }; }; "@octokit/plugin-rest-endpoint-methods-2.4.0" = { @@ -4063,13 +3910,13 @@ let sha512 = "EZi/AWhtkdfAYi01obpX0DF7U6b1VRr30QNQ5xSFPITMdLSfhcBqjamE3F+sKcxPbD7eZuMHu3Qkk2V+JGxBDQ=="; }; }; - "@octokit/request-5.4.12" = { + "@octokit/request-5.4.13" = { name = "_at_octokit_slash_request"; packageName = "@octokit/request"; - version = "5.4.12"; + version = "5.4.13"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/request/-/request-5.4.12.tgz"; - sha512 = "MvWYdxengUWTGFpfpefBBpVmmEYfkwMoxonIB3sUGp5rhdgwjXL1ejo6JbgzG/QD9B/NYt/9cJX1pxXeSIUCkg=="; + url = "https://registry.npmjs.org/@octokit/request/-/request-5.4.13.tgz"; + sha512 = "WcNRH5XPPtg7i1g9Da5U9dvZ6YbTffw9BN2rVezYiE7couoSyaRsw0e+Tl8uk1fArHE7Dn14U7YqUDy59WaqEw=="; }; }; "@octokit/request-error-1.2.1" = { @@ -4081,13 +3928,13 @@ let sha512 = "+6yDyk1EES6WK+l3viRDElw96MvwfJxCt45GvmjDUKWjYIb3PJZQkq3i46TwGwoPD4h8NmTrENmtyA1FwbmhRA=="; }; }; - "@octokit/request-error-2.0.4" = { + "@octokit/request-error-2.0.5" = { name = "_at_octokit_slash_request-error"; packageName = "@octokit/request-error"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.0.4.tgz"; - sha512 = "LjkSiTbsxIErBiRh5wSZvpZqT4t0/c9+4dOe0PII+6jXR+oj/h66s7E4a/MghV7iT8W9ffoQ5Skoxzs96+gBPA=="; + url = "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.0.5.tgz"; + sha512 = "T/2wcCFyM7SkXzNoyVNWjyVlUwBvW3igM3Btr/eKYiPmucXTtkxt2RBsf6gn3LTzaLSLTQtNmvg+dGsOxQrjZg=="; }; }; "@octokit/rest-16.43.2" = { @@ -4108,13 +3955,13 @@ let sha512 = "O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q=="; }; }; - "@octokit/types-6.1.2" = { + "@octokit/types-6.6.0" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; - version = "6.1.2"; + version = "6.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-6.1.2.tgz"; - sha512 = "LPCpcLbcky7fWfHCTuc7tMiSHFpFlrThJqVdaHgowBTMS0ijlZFfonQC/C1PrZOjD4xRCYgBqH9yttEATGE/nw=="; + url = "https://registry.npmjs.org/@octokit/types/-/types-6.6.0.tgz"; + sha512 = "nmFoU3HCbw1AmnZU/eto2VvzV06+N7oAqXwMmAHGlNDF+KFykksh/VlAl85xc1P5T7Mw8fKYvXNaImNHCCH/rg=="; }; }; "@opencensus/core-0.0.8" = { @@ -4144,58 +3991,58 @@ let sha512 = "PffXX2AL8Sh0VHQ52jJC4u3T0H6wDK6N/4bg7xh4ngMYOIi13aR1kzVvX1sVDBgfGwDOkMbl4c54Xm3tlPx/+A=="; }; }; - "@opentelemetry/api-0.11.0" = { + "@opentelemetry/api-0.12.0" = { name = "_at_opentelemetry_slash_api"; packageName = "@opentelemetry/api"; - version = "0.11.0"; + version = "0.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/api/-/api-0.11.0.tgz"; - sha512 = "K+1ADLMxduhsXoZ0GRfi9Pw162FvzBQLDQlHru1lg86rpIU+4XqdJkSGo6y3Kg+GmOWq1HNHOA/ydw/rzHQkRg=="; + url = "https://registry.npmjs.org/@opentelemetry/api/-/api-0.12.0.tgz"; + sha512 = "Dn4vU5GlaBrIWzLpsM6xbJwKHdlpwBQ4Bd+cL9ofJP3hKT8jBXpBpribmyaqAzrajzzl2Yt8uTa9rFVLfjDAvw=="; }; }; - "@opentelemetry/context-base-0.11.0" = { + "@opentelemetry/context-base-0.12.0" = { name = "_at_opentelemetry_slash_context-base"; packageName = "@opentelemetry/context-base"; - version = "0.11.0"; + version = "0.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/context-base/-/context-base-0.11.0.tgz"; - sha512 = "ESRk+572bftles7CVlugAj5Azrz61VO0MO0TS2pE9MLVL/zGmWuUBQryART6/nsrFqo+v9HPt37GPNcECTZR1w=="; + url = "https://registry.npmjs.org/@opentelemetry/context-base/-/context-base-0.12.0.tgz"; + sha512 = "UXwSsXo3F3yZ1dIBOG9ID8v2r9e+bqLWoizCtTb8rXtwF+N5TM7hzzvQz72o3nBU+zrI/D5e+OqAYK8ZgDd3DA=="; }; }; - "@opentelemetry/core-0.11.0" = { + "@opentelemetry/core-0.12.0" = { name = "_at_opentelemetry_slash_core"; packageName = "@opentelemetry/core"; - version = "0.11.0"; + version = "0.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/core/-/core-0.11.0.tgz"; - sha512 = "ZEKjBXeDGBqzouz0uJmrbEKNExEsQOhsZ3tJDCLcz5dUNoVw642oIn2LYWdQK2YdIfZbEmltiF65/csGsaBtFA=="; + url = "https://registry.npmjs.org/@opentelemetry/core/-/core-0.12.0.tgz"; + sha512 = "oLZIkmTNWTJXzo1eA4dGu/S7wOVtylsgnEsCmhSJGhrJVDXm1eW/aGuNs3DVBeuxp0ZvQLAul3/PThsC3YrnzA=="; }; }; - "@opentelemetry/resources-0.11.0" = { + "@opentelemetry/resources-0.12.0" = { name = "_at_opentelemetry_slash_resources"; packageName = "@opentelemetry/resources"; - version = "0.11.0"; + version = "0.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/resources/-/resources-0.11.0.tgz"; - sha512 = "o7DwV1TcezqBtS5YW2AWBcn01nVpPptIbTr966PLlVBcS//w8LkjeOShiSZxQ0lmV4b2en0FiSouSDoXk/5qIQ=="; + url = "https://registry.npmjs.org/@opentelemetry/resources/-/resources-0.12.0.tgz"; + sha512 = "8cYvIKB68cyupc7D6SWzkLtt13mbjgxMahL4JKCM6hWPyiGSJlPFEAey4XFXI5LLpPZRYTPHLVoLqI/xwCFZZA=="; }; }; - "@opentelemetry/semantic-conventions-0.11.0" = { + "@opentelemetry/semantic-conventions-0.12.0" = { name = "_at_opentelemetry_slash_semantic-conventions"; packageName = "@opentelemetry/semantic-conventions"; - version = "0.11.0"; + version = "0.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-0.11.0.tgz"; - sha512 = "xsthnI/J+Cx0YVDGgUzvrH0ZTtfNtl866M454NarYwDrc0JvC24sYw+XS5PJyk2KDzAHtb0vlrumUc1OAut/Fw=="; + url = "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-0.12.0.tgz"; + sha512 = "BuCcDW0uLNYYTns0/LwXkJ8lp8aDm7kpS+WunEmPAPRSCe6ciOYRvzn5reqJfX93rf+6A3U2SgrBnCTH+0qoQQ=="; }; }; - "@opentelemetry/tracing-0.11.0" = { + "@opentelemetry/tracing-0.12.0" = { name = "_at_opentelemetry_slash_tracing"; packageName = "@opentelemetry/tracing"; - version = "0.11.0"; + version = "0.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/tracing/-/tracing-0.11.0.tgz"; - sha512 = "QweFmxzl32BcyzwdWCNjVXZT1WeENNS/RWETq/ohqu+fAsTcMyGcr6cOq/yDdFmtBy+bm5WVVdeByEjNS+c4/w=="; + url = "https://registry.npmjs.org/@opentelemetry/tracing/-/tracing-0.12.0.tgz"; + sha512 = "2TUGhTGkhgnxTciHCNAILPSeyXageJewRqfP9wOrx65sKd/jgvNYoY8nYf4EVWVMirDOxKDsmYgUkjdQrwb2dg=="; }; }; "@ot-builder/bin-composite-types-0.10.37" = { @@ -4576,13 +4423,13 @@ let sha512 = "CY/a6Nw72vrlp/FPx38l4jfEHp4gNEbo8i+WlSJ2cnWO6VE6CKmnC1zb4yQLvdP8f3EuzzoOBZVq6aGN20M82Q=="; }; }; - "@pm2/js-api-0.6.1" = { + "@pm2/js-api-0.6.7" = { name = "_at_pm2_slash_js-api"; packageName = "@pm2/js-api"; - version = "0.6.1"; + version = "0.6.7"; src = fetchurl { - url = "https://registry.npmjs.org/@pm2/js-api/-/js-api-0.6.1.tgz"; - sha512 = "LImZWHEzcpIrLZ7kt4z3Gllkoz+CChHk2waDretOWeinSItyTMrNpzcXcZd2QikP/57qPolLfHGFipHJmOKkwQ=="; + url = "https://registry.npmjs.org/@pm2/js-api/-/js-api-0.6.7.tgz"; + sha512 = "jiJUhbdsK+5C4zhPZNnyA3wRI01dEc6a2GhcQ9qI38DyIk+S+C8iC3fGjcjUbt/viLYKPjlAaE+hcT2/JMQPXw=="; }; }; "@pm2/pm2-version-check-1.0.3" = { @@ -4711,15 +4558,6 @@ let sha512 = "UFnkg5RTq3s2X15fSkrWY9+5BKOFjihNSnJjTV2H5PtTUFbd55qnxxPw8CxSfK0bXb1IrSvCESprk2LEpqr5cg=="; }; }; - "@react-native-community/cli-platform-android-4.13.0" = { - name = "_at_react-native-community_slash_cli-platform-android"; - packageName = "@react-native-community/cli-platform-android"; - version = "4.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@react-native-community/cli-platform-android/-/cli-platform-android-4.13.0.tgz"; - sha512 = "3i8sX8GklEytUZwPnojuoFbCjIRzMugCdzDIdZ9UNmi/OhD4/8mLGO0dgXfT4sMWjZwu3qjy45sFfk2zOAgHbA=="; - }; - }; "@react-native-community/cli-platform-ios-4.13.0" = { name = "_at_react-native-community_slash_cli-platform-ios"; packageName = "@react-native-community/cli-platform-ios"; @@ -4765,15 +4603,6 @@ let sha512 = "MjmH7GvFT4TW8xFdIeFS3wqIX646y5tACdxkTO+khbHvS3ZcVJL6vkAHLw2wqPmkhwCfWHoNsp15VYNwW6JEJA=="; }; }; - "@rollup/plugin-commonjs-15.1.0" = { - name = "_at_rollup_slash_plugin-commonjs"; - packageName = "@rollup/plugin-commonjs"; - version = "15.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-15.1.0.tgz"; - sha512 = "xCQqz4z/o0h2syQ7d9LskIMvBSH4PX5PjYdpSSvgS+pQik3WahkQVNWg3D8XJeYjZoVWnIUQYDghuEMRGrmQYQ=="; - }; - }; "@rollup/plugin-commonjs-17.0.0" = { name = "_at_rollup_slash_plugin-commonjs"; packageName = "@rollup/plugin-commonjs"; @@ -4801,22 +4630,13 @@ let sha512 = "yfLbTdNS6amI/2OpmbiBoW12vngr5NW2jCJVZSBEz+H5KfUJZ2M7sDjk0U6GOOdCWFVScShte29o9NezJ53TPw=="; }; }; - "@rollup/plugin-node-resolve-11.0.1" = { + "@rollup/plugin-node-resolve-11.1.0" = { name = "_at_rollup_slash_plugin-node-resolve"; packageName = "@rollup/plugin-node-resolve"; - version = "11.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-11.0.1.tgz"; - sha512 = "ltlsj/4Bhwwhb+Nb5xCz/6vieuEj2/BAkkqVIKmZwC7pIdl8srmgmglE4S0jFlZa32K4qvdQ6NHdmpRKD/LwoQ=="; - }; - }; - "@rollup/plugin-node-resolve-9.0.0" = { - name = "_at_rollup_slash_plugin-node-resolve"; - packageName = "@rollup/plugin-node-resolve"; - version = "9.0.0"; + version = "11.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-9.0.0.tgz"; - sha512 = "gPz+utFHLRrd41WMP13Jq5mqqzHL3OXrfj3/MkSyB6UBIcuNt9j60GCbarzMzdf1VHFpOxfQh/ez7wyadLMqkg=="; + url = "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-11.1.0.tgz"; + sha512 = "ouBBppRdWJKCllDXGzJ7ZIkYbaq+5TmyP0smt1vdJCFfoZhLi31vhpmjLhyo8lreHf4RoeSNllaWrvSqHpHRog=="; }; }; "@rollup/pluginutils-3.1.0" = { @@ -4846,13 +4666,13 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@schematics/angular-11.0.5" = { + "@schematics/angular-11.1.1" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "11.0.5"; + version = "11.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-11.0.5.tgz"; - sha512 = "7p2wweoJYhim8YUy3ih1SrPGqRsa6+aEFbYgo9v4zt7b3tOva8SvkbC2alayK74fclzQ7umqa6xAwvWhy8ORvg=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-11.1.1.tgz"; + sha512 = "K4G+PwCIGYE6aw28ZcqAhw+qI6I8d8qtE3D1Vd4MPVuguDWpNEaB0Y+TIYWzukh5bmOqdl9m/fkw6eZeOglUuQ=="; }; }; "@schematics/schematics-0.1100.3" = { @@ -4864,13 +4684,13 @@ let sha512 = "tzjKnjD90FQ4LgRN9ALT2qCqgJYZrAKoy1embFJRuGKA8vv1hTG4JonVDqQEUoNwTc9r/Ok2Z1eenAI9TSUd1A=="; }; }; - "@schematics/update-0.1100.5" = { + "@schematics/update-0.1101.1" = { name = "_at_schematics_slash_update"; packageName = "@schematics/update"; - version = "0.1100.5"; + version = "0.1101.1"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/update/-/update-0.1100.5.tgz"; - sha512 = "BYtKKuiWsrlc4FMW3bRyl4tm6lWNMTi8oql/mtkSgH7V5eMmaLDJtM+zDl+qyC/KHPxbHTfoHDapfv1tITSWjA=="; + url = "https://registry.npmjs.org/@schematics/update/-/update-0.1101.1.tgz"; + sha512 = "BmGxxAH05ey8rc0gQpMJ7hAJyr7bM172MStpIws+MLugxZ6a6jH8vI1+MpnrqE0TK1PIPx6vclCMgf3RbQEzIw=="; }; }; "@segment/loosely-validate-event-2.0.0" = { @@ -4900,13 +4720,13 @@ let sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; }; }; - "@serverless/components-3.4.3" = { + "@serverless/components-3.5.1" = { name = "_at_serverless_slash_components"; packageName = "@serverless/components"; - version = "3.4.3"; + version = "3.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/components/-/components-3.4.3.tgz"; - sha512 = "buKvUPDeS54bUG9c56bmX5WcL3hBCHASKamHpUGmSa1ArSem8BE76LzPjiNcreOJGSFf9VGMgpsW1d1WKy2fAA=="; + url = "https://registry.npmjs.org/@serverless/components/-/components-3.5.1.tgz"; + sha512 = "GRXdO4e2gWwVQ+RNdbffaym92cIcUHzYfIK3mxWv2zIL/4rKXz5YaptRj6hd3EST12/iBsEOktomtuCfG1i9RA=="; }; }; "@serverless/core-1.1.2" = { @@ -4918,13 +4738,13 @@ let sha512 = "PY7gH+7aQ+MltcUD7SRDuQODJ9Sav9HhFJsgOiyf8IVo7XVD6FxZIsSnpMI6paSkptOB7n+0Jz03gNlEkKetQQ=="; }; }; - "@serverless/enterprise-plugin-4.4.1" = { + "@serverless/enterprise-plugin-4.4.2" = { name = "_at_serverless_slash_enterprise-plugin"; packageName = "@serverless/enterprise-plugin"; - version = "4.4.1"; + version = "4.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-4.4.1.tgz"; - sha512 = "MTjpIwpCA1gmldGuEozHNKIlce8BXMilvH2K0nm5vJ45PAUwK1bL9moaLwDadaTEw9B1jKbboa5/wpzJwwFdxA=="; + url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-4.4.2.tgz"; + sha512 = "w5xD8R8tFK6B7QiLvWI5jqVHTtH1LdTyGp5eRcjkdJBa10/D2IZFpJimMAGsBxk9U1JGKO4j0miVnRHIW8ppeg=="; }; }; "@serverless/event-mocks-1.1.1" = { @@ -4936,22 +4756,22 @@ let sha512 = "YAV5V/y+XIOfd+HEVeXfPWZb8C6QLruFk9tBivoX2roQLWVq145s4uxf8D0QioCueuRzkukHUS4JIj+KVoS34A=="; }; }; - "@serverless/platform-client-3.1.4" = { + "@serverless/platform-client-3.9.1" = { name = "_at_serverless_slash_platform-client"; packageName = "@serverless/platform-client"; - version = "3.1.4"; + version = "3.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-3.1.4.tgz"; - sha512 = "oc65L9Dl1Xe+T5qv/fkmjYREtPzrQMdje0fC5ntvsfR3luxvSfQIinHYKbt30Qpyy2sJCBPG4IPEip7b3y0WwA=="; + url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-3.9.1.tgz"; + sha512 = "Sn2sQldciCWdIpiJ6MEmCQLQk/wFD0pqK9XBuqKk/9RfcFwjsFMJVX9W4q2cybZxZ0MIkQVOfNXCoB5OM6riSQ=="; }; }; - "@serverless/platform-client-china-2.0.9" = { + "@serverless/platform-client-china-2.1.3" = { name = "_at_serverless_slash_platform-client-china"; packageName = "@serverless/platform-client-china"; - version = "2.0.9"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-2.0.9.tgz"; - sha512 = "qec3a5lVaMH0nccgjVgvcEF8M+M95BXZbbYDGypVHEieJQxrKqj057+VVKsiHBeHYXzr4B3v6pIyQHst40vpIw=="; + url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-2.1.3.tgz"; + sha512 = "JZpwKZh4sOsKbYsRyp5UvkwWgcqgrzz/URqnjPXaw8WyaAL6ulSH5RE2vre7uyZ/jpA4XM13nT86KXmuo6gkUg=="; }; }; "@serverless/platform-sdk-2.3.2" = { @@ -4990,13 +4810,22 @@ let sha512 = "0TqmLwH9r2GAewvz9mhZ+TSyQBoE9ANuB4nNhn6lJvVUgzlzji3aqeFbAuDt+Z60ZkaIDNipU/J5Vf2Lo/QTQQ=="; }; }; - "@serverless/utils-china-1.0.12" = { + "@serverless/utils-3.0.0" = { + name = "_at_serverless_slash_utils"; + packageName = "@serverless/utils"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@serverless/utils/-/utils-3.0.0.tgz"; + sha512 = "vY4oSLyANF+eMs24H+NGSrKxR5V/2n5l/PBL+J42uUfbcxjSHKx3bIzeKXSsaPkfvMHB6zD7tlkmgoCmkqPLUA=="; + }; + }; + "@serverless/utils-china-1.0.14" = { name = "_at_serverless_slash_utils-china"; packageName = "@serverless/utils-china"; - version = "1.0.12"; + version = "1.0.14"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-1.0.12.tgz"; - sha512 = "PuVap97QTf3Fi5+ez3ZUewGPFHTpf3dwZ+c6YWEoaf+1u7cgXzYFuWx8Ypi+4ghbL93/bf+blqdm+7CQi+CMRg=="; + url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-1.0.14.tgz"; + sha512 = "7ku9ePjb+bneFV1Akmz0t8pU8hhHfPJsBjG/Kf6IjyGAQrEjN/PcY2QUDm0emdCNyCsuido1wp0DWMGiwuhC8Q=="; }; }; "@sindresorhus/is-0.14.0" = { @@ -5062,6 +4891,15 @@ let sha512 = "QSdIQ5keUFAZ3KLbfbsntW39ox0Ym8183RqTwBq/ZEFoN3NQAtGV+qWaNdzKpIDHgj9J2CQ2iNDRVU11Zyr7MQ=="; }; }; + "@skorfmann/terraform-cloud-1.7.1" = { + name = "_at_skorfmann_slash_terraform-cloud"; + packageName = "@skorfmann/terraform-cloud"; + version = "1.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@skorfmann/terraform-cloud/-/terraform-cloud-1.7.1.tgz"; + sha512 = "uwcalR9R5/9M+UcOeKR+XgCyIlipl5dxiAryuWT8D4erW6sPnTE/B97G6F3VzzrZfcaPmljX5NVG8Dkl79ki6A=="; + }; + }; "@slack/client-3.16.0" = { name = "_at_slack_slash_client"; packageName = "@slack/client"; @@ -5125,6 +4963,15 @@ let sha512 = "+xwiU1zw+Z1V6RaIL7oWUqZo8jDIpoKfzvv8xGiq0hYxsiP9tGSUNuFXwQzAFEP60kJyD2a/nptdRPjsKD0jPw=="; }; }; + "@snyk/dep-graph-1.23.0" = { + name = "_at_snyk_slash_dep-graph"; + packageName = "@snyk/dep-graph"; + version = "1.23.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.23.0.tgz"; + sha512 = "qR0ENrbcNWHYmSRZCxjrlFy2T7i+rJjL6Rnd2e+NByJgn8zBmX6Qf5FjqNbZAI0AYjOlzXMZjGrbAbe4QkWV+w=="; + }; + }; "@snyk/docker-registry-v2-client-1.13.9" = { name = "_at_snyk_slash_docker-registry-v2-client"; packageName = "@snyk/docker-registry-v2-client"; @@ -5152,13 +4999,13 @@ let sha512 = "uO1b6UtT6QGz7F5ZgNdOSyMXBvykUhOcuHBRc//xUnBWsyJwdlAFp/d646zIeaBCe87Fcn5hXuWUGjj+N8rBzA=="; }; }; - "@snyk/java-call-graph-builder-1.18.0" = { + "@snyk/java-call-graph-builder-1.19.0" = { name = "_at_snyk_slash_java-call-graph-builder"; packageName = "@snyk/java-call-graph-builder"; - version = "1.18.0"; + version = "1.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.18.0.tgz"; - sha512 = "6Mt+Rs2N4HdHICCjxWRwtGXUrSktCsSGnn7HlL6wi+4JXjPWa+rDCzaF6furqRR3aphZAclgved0haFwwmqBxQ=="; + url = "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.19.0.tgz"; + sha512 = "in26UkFVEWvGyHmSmVUebvgyubANJB7rfrkE3PKjHDA80NwSLZDSNWOOC2lF2B+4ob4STWjQdMbv+bMqXl5Yew=="; }; }; "@snyk/rpm-parser-2.2.1" = { @@ -5323,130 +5170,139 @@ let sha512 = "AmyMQndtxMsM59eDeA0gGiw8T2LzNvDhx/xl+ygFXXrsw+yb/mit73ndHkiHKcRA1EpNHTyD1PN9ATxghzplfg=="; }; }; - "@textlint/ast-node-types-4.3.5" = { + "@textlint/ast-node-types-4.4.1" = { name = "_at_textlint_slash_ast-node-types"; packageName = "@textlint/ast-node-types"; - version = "4.3.5"; + version = "4.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-4.3.5.tgz"; - sha512 = "syl8VE34DQDTV7+IADP1jYtGsxTC9MmCKLmpJX90G6nNv9CzgAZIukd7WMiJFZpFgcDAlibEaCKlJRxjfEmmPA=="; + url = "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-4.4.1.tgz"; + sha512 = "2QBwlqi2SU83vTHibfdTxGiLdIqR0btNyMGfVl0bwA6FI85HnSYoGFLrdCnq2V0nxpbhuvwzcm2Ja81w0VkMGA=="; }; }; - "@textlint/ast-tester-2.2.5" = { + "@textlint/ast-tester-2.3.1" = { name = "_at_textlint_slash_ast-tester"; packageName = "@textlint/ast-tester"; - version = "2.2.5"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-tester/-/ast-tester-2.2.5.tgz"; - sha512 = "kKolF3xDI0G1sjM2HJE1EZAf407026b/wHC0FAdo9/FAipUTtAATKDnvjYeN++W1b5TxtIWRF5SbHppK7eRXGQ=="; + url = "https://registry.npmjs.org/@textlint/ast-tester/-/ast-tester-2.3.1.tgz"; + sha512 = "L9M2VNTYJ5sVdkPs9jH7s01Gg900Nuk7m9zQmCz9WFa3YyzJFEd7GCSmAvLMgX31jw5bbvvmj7DngymlP+PahQ=="; }; }; - "@textlint/ast-traverse-2.2.6" = { + "@textlint/ast-traverse-2.3.1" = { name = "_at_textlint_slash_ast-traverse"; packageName = "@textlint/ast-traverse"; - version = "2.2.6"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-2.2.6.tgz"; - sha512 = "cpBF4UsbQ95oFU8gaGrkYar1H75ORvfRWN78dXneyinJFG1KBajXN9lLYhXhg+Z1Rn/9Ifw+SCjLZKnFmnwM0g=="; + url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-2.3.1.tgz"; + sha512 = "uOFKqm3M9by55Zl2ryZ7jOSiLdLhDmVgX0IG/MJfGKY1a/MSyt5qwy9cvZNcob6hNCPeRMW8boAH2uRJOwRcoQ=="; }; }; - "@textlint/feature-flag-3.2.5" = { + "@textlint/feature-flag-3.3.1" = { name = "_at_textlint_slash_feature-flag"; packageName = "@textlint/feature-flag"; - version = "3.2.5"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/feature-flag/-/feature-flag-3.2.5.tgz"; - sha512 = "OePponYtxPGjNf6GBqioRaOr1m8LJZQLCj49LgoGZnolm9hmKq3QP1jEKGbzxsHCADL7YHoKZ6zxKGkicmsxPA=="; + url = "https://registry.npmjs.org/@textlint/feature-flag/-/feature-flag-3.3.1.tgz"; + sha512 = "0a1UopFf30UrmEDKFNATXlotMqwbLGjJa1GTuljL/AKn2Adz7rPawclW4pHf/b//K7Da5GOtuzbIfVAZSFQRxA=="; }; }; - "@textlint/fixer-formatter-3.2.6" = { + "@textlint/fixer-formatter-3.3.1" = { name = "_at_textlint_slash_fixer-formatter"; packageName = "@textlint/fixer-formatter"; - version = "3.2.6"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-3.2.6.tgz"; - sha512 = "xVVEHcpUeBBFI7Ug4y/tGTRLf6XX9lsg/iLvk6cjWJhxnFsVOkSFJRrZFetIJnAKnhQmCAv/i+ybgnTHhas7pw=="; + url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-3.3.1.tgz"; + sha512 = "ZPK66J61lv8UMdqJeG4YUPfKPlCom/jiv8kZkz5ELnLA587HLOlEIYLaNjKop0viW5z3Fz9cZd5glIHrPymiqQ=="; }; }; - "@textlint/kernel-3.3.7" = { + "@textlint/kernel-3.4.1" = { name = "_at_textlint_slash_kernel"; packageName = "@textlint/kernel"; - version = "3.3.7"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-3.3.7.tgz"; - sha512 = "zLk78gCwiQIl0ElkzT8DVMOLJ5PCDWZnuRaYk7YkwmGpjJSoJcGSCqiRGhmmc4d7CCZ+AcoM0DQUSyrFzJjyMA=="; + url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-3.4.1.tgz"; + sha512 = "8ZpiLy5KgmIMjda7RNgbNzoHpDnF51OC0rmMBTUl5xFMrpOcmnKZ6qcnmP7hlyR1MQJxQVzG0PvWnLHFUZL53w=="; }; }; - "@textlint/linter-formatter-3.2.6" = { + "@textlint/linter-formatter-3.3.1" = { name = "_at_textlint_slash_linter-formatter"; packageName = "@textlint/linter-formatter"; - version = "3.2.6"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-3.2.6.tgz"; - sha512 = "39R2PAKRDqq8p6jQj3u9ERUzrrhK33BnHK622oegaXzPeaBLjN2brBXsxnBpNJFPUW2L9BDmJcBd92E/ajLTGg=="; + url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-3.3.1.tgz"; + sha512 = "tBtOSfpZWr3AwIJ1vbBSD+fwB4JSEtCQIE+AgfFqO8eDMOssjxKgVtIPX9dwh3/+6vlc6KozBJjIfXoxLuaWlg=="; }; }; - "@textlint/markdown-to-ast-6.2.6" = { + "@textlint/markdown-to-ast-6.3.1" = { name = "_at_textlint_slash_markdown-to-ast"; packageName = "@textlint/markdown-to-ast"; - version = "6.2.6"; + version = "6.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-6.2.6.tgz"; - sha512 = "TjZTMGYla9Nznegy0r23EEzNMfWva0oksj+48aqMlbQ+UvBA5vdEC0VzCO3l0Z137RgEJ+glInbvEilo2zcjZg=="; + url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-6.3.1.tgz"; + sha512 = "piqeTN6dzMr7ljlo7GbRBILMcZ8zW2H9raN48qH+HYhfrGZfEOmL5HAMMeF8h0sDz9CzTvZixEwGWLMdlwsb+A=="; }; }; - "@textlint/module-interop-1.1.5" = { + "@textlint/module-interop-1.2.1" = { name = "_at_textlint_slash_module-interop"; packageName = "@textlint/module-interop"; - version = "1.1.5"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/module-interop/-/module-interop-1.2.1.tgz"; + sha512 = "ZvxTTvEm7nmkRctWKREfvNvnVtRxRbdUms8cqkiYbP2K0fRIMacrWpL8z8cdkkdNZbaYciaUnyE3be7UD4J8EA=="; + }; + }; + "@textlint/source-code-fixer-3.4.1" = { + name = "_at_textlint_slash_source-code-fixer"; + packageName = "@textlint/source-code-fixer"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/module-interop/-/module-interop-1.1.5.tgz"; - sha512 = "YXz4qV6thEuwNfamHFhRsebZM7FWe1x3fD7XAqPxE8J+HLQea3Y0i52hU/rTQvt85omYq+37g3YtqjX60mYjog=="; + url = "https://registry.npmjs.org/@textlint/source-code-fixer/-/source-code-fixer-3.4.1.tgz"; + sha512 = "FqL+xdjIU2hswS4Cmhf/bL7SWTpXkKoK/wb8Lmo9sNmEE481fc5Ey/s8JgxAaOHRpwOcmErGd16c3gXcG6Y2ow=="; }; }; - "@textlint/text-to-ast-3.2.5" = { + "@textlint/text-to-ast-3.3.1" = { name = "_at_textlint_slash_text-to-ast"; packageName = "@textlint/text-to-ast"; - version = "3.2.5"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/text-to-ast/-/text-to-ast-3.2.5.tgz"; - sha512 = "1B43L9tVr2b6Qm37KsdI8dbutL8b5AN95PFGzPpxaJbShz8TjVUFQ5bxPrnKGc7wV5MFpazf+/UVjZx6JtUbMA=="; + url = "https://registry.npmjs.org/@textlint/text-to-ast/-/text-to-ast-3.3.1.tgz"; + sha512 = "aN1IY3u98Wig2PTF/eEJdb7XfCH5VEwZagGdG1vajx6sdc7Sc3265UVv9uEB/ypJDteYnURRICfTd6NCGwkVGA=="; }; }; - "@textlint/textlint-plugin-markdown-5.2.7" = { + "@textlint/textlint-plugin-markdown-5.3.1" = { name = "_at_textlint_slash_textlint-plugin-markdown"; packageName = "@textlint/textlint-plugin-markdown"; - version = "5.2.7"; + version = "5.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-5.2.7.tgz"; - sha512 = "GKx79nbsLwvDdyv98wnX2BSF83MKTM5j09OFJp2+wi2qrWO3U0+7YMILfdHDqyPfUk+osuy65BAFeq5jlXPomQ=="; + url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-5.3.1.tgz"; + sha512 = "IhQVGW9YqylkuZ4AjOfLFtOWHPXtLMhWTVfvIFzMQ2TIpquIaybws8KiFN2yZzLBNNduF+PFvm+H2NRhR0w/lQ=="; }; }; - "@textlint/textlint-plugin-text-4.2.7" = { + "@textlint/textlint-plugin-text-4.3.1" = { name = "_at_textlint_slash_textlint-plugin-text"; packageName = "@textlint/textlint-plugin-text"; - version = "4.2.7"; + version = "4.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-4.2.7.tgz"; - sha512 = "uMoASP8kIJrMqMJCXePvKSh0tOEuiQS9vFjH+kq2kS8/+Po6Wwgma9IdJsLWuSI8H4ufcvbozREuY+DceQAp/w=="; + url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-4.3.1.tgz"; + sha512 = "IqtO6TWOfVaw8sXMdVVwsvEYuqYk13ApKXBVjjJoLux0g+6G1rCEhFSZtopkrpC1Srr/OZCfb4nk8/zx+5M6Ng=="; }; }; - "@textlint/types-1.4.6" = { + "@textlint/types-1.5.1" = { name = "_at_textlint_slash_types"; packageName = "@textlint/types"; - version = "1.4.6"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/types/-/types-1.4.6.tgz"; - sha512 = "hoKPvIzNf+vI0goRk90HfsVUbXkAp4BfpvRxh51TGqVG27dlYrQJZkYheuUNUAwyj0Id09qzVwXno/xQPMYPcg=="; + url = "https://registry.npmjs.org/@textlint/types/-/types-1.5.1.tgz"; + sha512 = "YgPmxEeFUXuCjWOFx4p0afxFCHJbTf9Muw/6SJDLd/txQ6YrStst3Kvw+6QGefdJe44/UdiUYtI8sYa5T1ejaQ=="; }; }; - "@textlint/utils-1.1.5" = { + "@textlint/utils-1.2.1" = { name = "_at_textlint_slash_utils"; packageName = "@textlint/utils"; - version = "1.1.5"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/utils/-/utils-1.1.5.tgz"; - sha512 = "wv1m6yyaQpt1QrGKIUYwMoL5LLhDhXk05+pXg3i0+8PC8X95jNin10fSkxRMyXOsEqB6481GR3XgQ8Ia7DO1tg=="; + url = "https://registry.npmjs.org/@textlint/utils/-/utils-1.2.1.tgz"; + sha512 = "X/rLpqskTLWDPO5cvQO5CcA7zNnDimeBokwehiDwTg6aP9LYqFeOw5mKZ5lb4purY9zN9tLRxJGLle4Py1QobQ=="; }; }; "@tokenizer/token-0.1.1" = { @@ -5485,6 +5341,15 @@ let sha512 = "/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA=="; }; }; + "@types/archiver-5.1.0" = { + name = "_at_types_slash_archiver"; + packageName = "@types/archiver"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/archiver/-/archiver-5.1.0.tgz"; + sha512 = "baFOhanb/hxmcOd1Uey2TfFg43kTSmM6py1Eo7Rjbv/ivcl7PXLhY0QgXGf50Hx/eskGCFqPfhs/7IZLb15C5g=="; + }; + }; "@types/babel-types-7.0.9" = { name = "_at_types_slash_babel-types"; packageName = "@types/babel-types"; @@ -5728,13 +5593,13 @@ let sha512 = "kM2g9Fdk/du24fKuuQhA/LBleFR4Z4JP2MVKpLxQQSzofF1uJ06D+c05zfLDAkkDO55aEeNwJih0gHrE/Ci20A=="; }; }; - "@types/engine.io-3.1.4" = { + "@types/engine.io-3.1.5" = { name = "_at_types_slash_engine.io"; packageName = "@types/engine.io"; - version = "3.1.4"; + version = "3.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/engine.io/-/engine.io-3.1.4.tgz"; - sha512 = "98rXVukLD6/ozrQ2O80NAlWDGA4INg+tqsEReWJldqyi2fulC9V7Use/n28SWgROXKm6003ycWV4gZHoF8GA6w=="; + url = "https://registry.npmjs.org/@types/engine.io/-/engine.io-3.1.5.tgz"; + sha512 = "DLVpLEGTEZGBXOYoYoagHSxXkDHONc0fZouF2ayw7Q18aRu1Afwci+1CFKvPpouCUOVWP+dmCaAWpQjswe7kpg=="; }; }; "@types/eslint-7.2.6" = { @@ -5782,6 +5647,15 @@ let sha512 = "jnqIUKDUqJbDIUxm0Uj7bnlMnRm1T/eZ9N+AVMqhPgzrba2GhGG5o/jCTwmdPK709nEZsGoMzXEDUjcXHa3W0g=="; }; }; + "@types/estree-0.0.46" = { + name = "_at_types_slash_estree"; + packageName = "@types/estree"; + version = "0.0.46"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/estree/-/estree-0.0.46.tgz"; + sha512 = "laIjwTQaD+5DukBZaygQ79K1Z0jb1bPEMRrkXSLjtCcZm+abyp5YbrqpSLzD42FwWW6gK/aS4NYpJ804nG2brg=="; + }; + }; "@types/events-3.0.0" = { name = "_at_types_slash_events"; packageName = "@types/events"; @@ -5818,6 +5692,15 @@ let sha512 = "YYlVaCni5dnHc+bLZfY908IG1+x5xuibKZMGv8srKkvtul3wUuanYvpIj9GXXoWkQbaAdR+kgX46IETKUALWNQ=="; }; }; + "@types/express-serve-static-core-4.17.18" = { + name = "_at_types_slash_express-serve-static-core"; + packageName = "@types/express-serve-static-core"; + version = "4.17.18"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.18.tgz"; + sha512 = "m4JTwx5RUBNZvky/JJ8swEJPKFd8si08pPF2PfizYjGZOKr/svUWPcoUmLow6MmPzhasphB7gSTINY67xn3JNA=="; + }; + }; "@types/fancy-log-1.3.0" = { name = "_at_types_slash_fancy-log"; packageName = "@types/fancy-log"; @@ -5971,13 +5854,13 @@ let sha512 = "2aoSC4UUbHDj2uCsCxcG/vRMXey/m17bC7UwitVm5hn22nI8O8Y9iDpA76Orc+DWkQ4zZrOKEshCqR/jSuXAHA=="; }; }; - "@types/http-proxy-1.17.4" = { + "@types/http-proxy-1.17.5" = { name = "_at_types_slash_http-proxy"; packageName = "@types/http-proxy"; - version = "1.17.4"; + version = "1.17.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.4.tgz"; - sha512 = "IrSHl2u6AWXduUaDLqYpt45tLVCtYv7o4Z0s1KghBCDgIIS9oW5K1H8mZG/A2CfeLdEa7rTd1ACOiHBc1EMT2Q=="; + url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.5.tgz"; + sha512 = "GNkDE7bTv6Sf8JbV2GksknKOsk7OznNYHSdrtvPJXO0qJ9odZig6IZKUi5RFGi6d1bf6dgIAe4uXi3DBc7069Q=="; }; }; "@types/inquirer-6.5.0" = { @@ -6034,6 +5917,15 @@ let sha512 = "JCcp6J0GV66Y4ZMDAQCXot4xprYB+Zfd3meK9+INSJeVZwJmHAW30BBEEkPzXswMXuiyReUGOP3GxrADc9wPww=="; }; }; + "@types/js-yaml-3.12.6" = { + name = "_at_types_slash_js-yaml"; + packageName = "@types/js-yaml"; + version = "3.12.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-3.12.6.tgz"; + sha512 = "cK4XqrLvP17X6c0C8n4iTbT59EixqyXL3Fk8/Rsk4dF3oX4dg70gYUXrXVUUHpnsGMPNlTQMqf+TVmNPX6FmSQ=="; + }; + }; "@types/jscodeshift-0.7.2" = { name = "_at_types_slash_jscodeshift"; packageName = "@types/jscodeshift"; @@ -6043,13 +5935,13 @@ let sha512 = "k4ih8ayQ65e26vhCxeMTKtZ808DzC0RFQ4unBvPEy9bcFhS4aPm3oXgWWZNmZ4u+H2WzHQDCNrRC5iNX+afiZw=="; }; }; - "@types/json-schema-7.0.6" = { + "@types/json-schema-7.0.7" = { name = "_at_types_slash_json-schema"; packageName = "@types/json-schema"; - version = "7.0.6"; + version = "7.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.6.tgz"; - sha512 = "3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw=="; + url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.7.tgz"; + sha512 = "cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA=="; }; }; "@types/json5-0.0.29" = { @@ -6115,13 +6007,13 @@ let sha512 = "EP6O3Jkr7bXvZZSZYlsgt5DIjiGr0dXP1/jVEwVLTFgg0d+3lWVQkRavYVQszV7dYUwvg0B8R0MBDpcmXg7XIA=="; }; }; - "@types/lodash-4.14.167" = { + "@types/lodash-4.14.168" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.167"; + version = "4.14.168"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.167.tgz"; - sha512 = "w7tQPjARrvdeBkX/Rwg95S592JwxqOjmms3zWQ0XZgSyxSLdzWaYH3vErBhdVS/lRBX7F8aBYcYJYTr5TMGOzw=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.168.tgz"; + sha512 = "oVfRvqHV/V6D1yifJbVRU3TMp8OT6o6BG+U9MkwuJ3U8/CsDHvalRpsxBqivn71ztOFZBTfJMvETbqHiaNSj7Q=="; }; }; "@types/long-4.0.1" = { @@ -6151,13 +6043,13 @@ let sha512 = "SXPBMnFVQg1s00dlMCc/jCdvPqdE4mXaMMCeRlxLDmTAEoegHT53xKtkDnzDTOcmMHUfcjyf36/YYZ6SxRdnsw=="; }; }; - "@types/mime-2.0.3" = { + "@types/mime-1.3.2" = { name = "_at_types_slash_mime"; packageName = "@types/mime"; - version = "2.0.3"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mime/-/mime-2.0.3.tgz"; - sha512 = "Jus9s4CDbqwocc5pOAnh8ShfrnMcPHuJYzVcSUU7lrh8Ni5HuIqX3oilL86p3dlTrk0LzHRCgA/GQ7uNCw6l2Q=="; + url = "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz"; + sha512 = "YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="; }; }; "@types/minimatch-3.0.3" = { @@ -6259,13 +6151,13 @@ let sha512 = "fh+pAqt4xRzPfqA6eh3Z2y6fyZavRIumvjhaCL753+TVkGKGhpPeyrJG2JftD0T9q4GF00KjefsQ+PQNDdWQaQ=="; }; }; - "@types/node-10.17.50" = { + "@types/node-10.17.51" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.17.50"; + version = "10.17.51"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.17.50.tgz"; - sha512 = "vwX+/ija9xKc/z9VqMCdbf4WYcMTGsI0I/L/6shIF3qXURxZOhPQlPRHtjTpiNhAwn0paMJzlOQqw6mAGEQnTA=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.17.51.tgz"; + sha512 = "KANw+MkL626tq90l++hGelbl67irOJzGhUJk6a1Bt8QHOeh9tztJx+L0AqttraWKinmZn7Qi5lJZJzx45Gq0dg=="; }; }; "@types/node-12.12.70" = { @@ -6277,22 +6169,22 @@ let sha512 = "i5y7HTbvhonZQE+GnUM2rz1Bi8QkzxdQmEv1LKOv4nWyaQk/gdeiTApuQR3PDJHX7WomAbpx2wlWSEpxXGZ/UQ=="; }; }; - "@types/node-12.19.12" = { + "@types/node-12.19.15" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "12.19.12"; + version = "12.19.15"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-12.19.12.tgz"; - sha512 = "UwfL2uIU9arX/+/PRcIkT08/iBadGN2z6ExOROA2Dh5mAuWTBj6iJbQX4nekiV5H8cTrEG569LeX+HRco9Cbxw=="; + url = "https://registry.npmjs.org/@types/node/-/node-12.19.15.tgz"; + sha512 = "lowukE3GUI+VSYSu6VcBXl14d61Rp5hA1D+61r16qnwC0lYNSqdxcvRh0pswejorHfS+HgwBasM8jLXz0/aOsw=="; }; }; - "@types/node-13.13.39" = { + "@types/node-13.13.40" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "13.13.39"; + version = "13.13.40"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-13.13.39.tgz"; - sha512 = "wct+WgRTTkBm2R3vbrFOqyZM5w0g+D8KnhstG9463CJBVC3UVZHMToge7iMBR1vDl/I+NWFHUeK9X+JcF0rWKw=="; + url = "https://registry.npmjs.org/@types/node/-/node-13.13.40.tgz"; + sha512 = "eKaRo87lu1yAXrzEJl0zcJxfUMDT5/mZalFyOkT44rnQps41eS2pfWzbaulSPpQLFNy29bFqn+Y5lOTL8ATlEQ=="; }; }; "@types/node-14.11.1" = { @@ -6304,13 +6196,13 @@ let sha512 = "oTQgnd0hblfLsJ6BvJzzSL+Inogp3lq9fGgqRkMB/ziKMgEUaFl801OncOzUmalfzt14N0oPHMK47ipl+wbTIw=="; }; }; - "@types/node-14.14.20" = { + "@types/node-14.14.22" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.14.20"; + version = "14.14.22"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.14.20.tgz"; - sha512 = "Y93R97Ouif9JEOWPIUyU+eyIdyRqQR0I8Ez1dzku4hDx34NWh4HbtIc3WNzwB1Y9ULvNGeu5B8h8bVL5cAk4/A=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.14.22.tgz"; + sha512 = "g+f/qj/cNcqKkc3tFqlXOYjrmZA+jNBiDzbP3kH+B+otKFqAdPgVTGP1IeKRdMml/aE69as5S4FqtxAbl+LaMw=="; }; }; "@types/node-6.14.13" = { @@ -6349,6 +6241,15 @@ let sha512 = "o2WVNf5UhWRkxlf6eq+jMZDu7kjgpgJfl4xVNlvryc95O/6F2ld8ztKX+qu+Rjyet93WAWm5LjeX9H5FGkODvw=="; }; }; + "@types/node-fetch-2.5.8" = { + name = "_at_types_slash_node-fetch"; + packageName = "@types/node-fetch"; + version = "2.5.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.8.tgz"; + sha512 = "fbjI6ja0N5ZA8TV53RUqzsKNkl9fv8Oj3T7zxW7FGv1GSH7gwJaNF8dzCjrqKaxKeUpTz4yT1DaJFq/omNpGfw=="; + }; + }; "@types/normalize-package-data-2.4.0" = { name = "_at_types_slash_normalize-package-data"; packageName = "@types/normalize-package-data"; @@ -6385,13 +6286,13 @@ let sha512 = "wqTKZmqkqXd1YiVRBT2poRrMIojwEi2bKTAAjUX6nEbzr98jc3cfR/7o7ZtubhH5xT7YJ6LRdRr1GZOgs8OUjg=="; }; }; - "@types/pg-types-1.11.5" = { + "@types/pg-types-2.2.0" = { name = "_at_types_slash_pg-types"; packageName = "@types/pg-types"; - version = "1.11.5"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/pg-types/-/pg-types-1.11.5.tgz"; - sha512 = "L8ogeT6vDzT1vxlW3KITTCt+BVXXVkLXfZ/XNm6UqbcJgxf+KPO7yjWx7dQQE8RW07KopL10x2gNMs41+IkMGQ=="; + url = "https://registry.npmjs.org/@types/pg-types/-/pg-types-2.2.0.tgz"; + sha512 = "a+fLdul8OczRvPWPf8eTb6wPhxzyWQwRGhNN0ugtOtk6yFOG53i2LwXaA0d2D6bsJlWxi6eCuGZLGoCcdOlWZA=="; }; }; "@types/q-1.5.4" = { @@ -6502,13 +6403,13 @@ let sha512 = "41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ=="; }; }; - "@types/serve-static-1.13.8" = { + "@types/serve-static-1.13.9" = { name = "_at_types_slash_serve-static"; packageName = "@types/serve-static"; - version = "1.13.8"; + version = "1.13.9"; src = fetchurl { - url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.8.tgz"; - sha512 = "MoJhSQreaVoL+/hurAZzIm8wafFR6ajiTM1m4A0kv6AGeVBl4r4pOV8bGFrjjq1sGxDTnCoF8i22o0/aE5XCyA=="; + url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.9.tgz"; + sha512 = "ZFqF6qa48XsPdjXV5Gsz0Zqmux2PerNd3a/ktL45mHpa19cuMi/cL8tcxdAx497yRh+QtYPuofjT9oWw9P7nkA=="; }; }; "@types/sizzle-2.3.2" = { @@ -6556,6 +6457,15 @@ let sha512 = "OBsK0KIGUICExQ/ZvnPY4cKx5Kz4NcrVyGTIvOL5y4ajXu7r++RfBajfpGfGDmDVCKcoCDX1dO84/oeyeITnxA=="; }; }; + "@types/stream-buffers-3.0.3" = { + name = "_at_types_slash_stream-buffers"; + packageName = "@types/stream-buffers"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/stream-buffers/-/stream-buffers-3.0.3.tgz"; + sha512 = "NeFeX7YfFZDYsCfbuaOmFQ0OjSmHreKBpp7MQ4alWQBHeh2USLsj7qyMyn9t82kjqIX516CR/5SRHnARduRtbQ=="; + }; + }; "@types/superagent-3.8.2" = { name = "_at_types_slash_superagent"; packageName = "@types/superagent"; @@ -6682,6 +6592,15 @@ let sha512 = "cr6kZ+4m9lp86ytQc1jPOJXgINQyz3kLLunZ57jznW+WIAL0JqZbGubQk4GlD42MuQL5JGOABrxdpqqWeovlVQ=="; }; }; + "@types/webpack-4.41.26" = { + name = "_at_types_slash_webpack"; + packageName = "@types/webpack"; + version = "4.41.26"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.26.tgz"; + sha512 = "7ZyTfxjCRwexh+EJFwRUM+CDB2XvgHl4vfuqf1ZKrgGvcS5BrNvPQqJh3tsZ0P6h6Aa1qClVHaJZszLPzpqHeA=="; + }; + }; "@types/webpack-sources-2.1.0" = { name = "_at_types_slash_webpack-sources"; packageName = "@types/webpack-sources"; @@ -6763,13 +6682,13 @@ let sha512 = "HrCIVMLjE1MOozVoD86622S7aunluLb2PJdPfb3nYiEtohm8mIB/vyv0Fd37AdeMFrTUQXEunw78YloMA3Qilg=="; }; }; - "@typescript-eslint/eslint-plugin-4.12.0" = { + "@typescript-eslint/eslint-plugin-4.14.1" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "4.12.0"; + version = "4.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.12.0.tgz"; - sha512 = "wHKj6q8s70sO5i39H2g1gtpCXCvjVszzj6FFygneNFyIAxRvNSVz9GML7XpqrB9t7hNutXw+MHnLN/Ih6uyB8Q=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.14.1.tgz"; + sha512 = "5JriGbYhtqMS1kRcZTQxndz1lKMwwEXKbwZbkUZNnp6MJX0+OVXnG0kOlBZP4LUAxEyzu3cs+EXd/97MJXsGfw=="; }; }; "@typescript-eslint/experimental-utils-3.10.1" = { @@ -6781,13 +6700,13 @@ let sha512 = "DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw=="; }; }; - "@typescript-eslint/experimental-utils-4.12.0" = { + "@typescript-eslint/experimental-utils-4.14.1" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "4.12.0"; + version = "4.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.12.0.tgz"; - sha512 = "MpXZXUAvHt99c9ScXijx7i061o5HEjXltO+sbYfZAAHxv3XankQkPaNi5myy0Yh0Tyea3Hdq1pi7Vsh0GJb0fA=="; + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.14.1.tgz"; + sha512 = "2CuHWOJwvpw0LofbyG5gvYjEyoJeSvVH2PnfUQSn0KQr4v8Dql2pr43ohmx4fdPQ/eVoTSFjTi/bsGEXl/zUUQ=="; }; }; "@typescript-eslint/parser-3.10.1" = { @@ -6799,22 +6718,22 @@ let sha512 = "Ug1RcWcrJP02hmtaXVS3axPPTTPnZjupqhgj+NnZ6BCkwSImWk/283347+x9wN+lqOdK9Eo3vsyiyDHgsmiEJw=="; }; }; - "@typescript-eslint/parser-4.12.0" = { + "@typescript-eslint/parser-4.14.1" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "4.12.0"; + version = "4.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.12.0.tgz"; - sha512 = "9XxVADAo9vlfjfoxnjboBTxYOiNY93/QuvcPgsiKvHxW6tOZx1W4TvkIQ2jB3k5M0pbFP5FlXihLK49TjZXhuQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.14.1.tgz"; + sha512 = "mL3+gU18g9JPsHZuKMZ8Z0Ss9YP1S5xYZ7n68Z98GnPq02pYNQuRXL85b9GYhl6jpdvUc45Km7hAl71vybjUmw=="; }; }; - "@typescript-eslint/scope-manager-4.12.0" = { + "@typescript-eslint/scope-manager-4.14.1" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "4.12.0"; + version = "4.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.12.0.tgz"; - sha512 = "QVf9oCSVLte/8jvOsxmgBdOaoe2J0wtEmBr13Yz0rkBNkl5D8bfnf6G4Vhox9qqMIoG7QQoVwd2eG9DM/ge4Qg=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.14.1.tgz"; + sha512 = "F4bjJcSqXqHnC9JGUlnqSa3fC2YH5zTtmACS1Hk+WX/nFB0guuynVK5ev35D4XZbdKjulXBAQMyRr216kmxghw=="; }; }; "@typescript-eslint/types-3.10.1" = { @@ -6826,13 +6745,13 @@ let sha512 = "+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ=="; }; }; - "@typescript-eslint/types-4.12.0" = { + "@typescript-eslint/types-4.14.1" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "4.12.0"; + version = "4.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.12.0.tgz"; - sha512 = "N2RhGeheVLGtyy+CxRmxdsniB7sMSCfsnbh8K/+RUIXYYq3Ub5+sukRCjVE80QerrUBvuEvs4fDhz5AW/pcL6g=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.14.1.tgz"; + sha512 = "SkhzHdI/AllAgQSxXM89XwS1Tkic7csPdndUuTKabEwRcEfR8uQ/iPA3Dgio1rqsV3jtqZhY0QQni8rLswJM2w=="; }; }; "@typescript-eslint/typescript-estree-2.34.0" = { @@ -6853,13 +6772,13 @@ let sha512 = "QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w=="; }; }; - "@typescript-eslint/typescript-estree-4.12.0" = { + "@typescript-eslint/typescript-estree-4.14.1" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "4.12.0"; + version = "4.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.12.0.tgz"; - sha512 = "gZkFcmmp/CnzqD2RKMich2/FjBTsYopjiwJCroxqHZIY11IIoN0l5lKqcgoAPKHt33H2mAkSfvzj8i44Jm7F4w=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.14.1.tgz"; + sha512 = "M8+7MbzKC1PvJIA8kR2sSBnex8bsR5auatLCnVlNTJczmJgqRn8M+sAlQfkEq7M4IY3WmaNJ+LJjPVRrREVSHQ=="; }; }; "@typescript-eslint/visitor-keys-3.10.1" = { @@ -6871,31 +6790,31 @@ let sha512 = "9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ=="; }; }; - "@typescript-eslint/visitor-keys-4.12.0" = { + "@typescript-eslint/visitor-keys-4.14.1" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "4.12.0"; + version = "4.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.12.0.tgz"; - sha512 = "hVpsLARbDh4B9TKYz5cLbcdMIOAoBYgFPCSP9FFS/liSF+b33gVNq8JHY3QGhHNVz85hObvL7BEYLlgx553WCw=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.14.1.tgz"; + sha512 = "TAblbDXOI7bd0C/9PE1G+AFo7R5uc+ty1ArDoxmrC1ah61Hn6shURKy7gLdRb1qKJmjHkqu5Oq+e4Kt0jwf1IA=="; }; }; - "@uifabric/foundation-7.9.20" = { + "@uifabric/foundation-7.9.21" = { name = "_at_uifabric_slash_foundation"; packageName = "@uifabric/foundation"; - version = "7.9.20"; + version = "7.9.21"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/foundation/-/foundation-7.9.20.tgz"; - sha512 = "AcOClWfs+rNK0XyPLKTK2Nqeom7zOESOfL3Tbwl5VuDlSrlGW9yNywuuo6gJSOyXCJQO5dJFVdGExmB0EM4vkw=="; + url = "https://registry.npmjs.org/@uifabric/foundation/-/foundation-7.9.21.tgz"; + sha512 = "z58pcC0hJr6S0iYLxNFoqfrfLIMxbSxFHRirk5LDT2HXbiVIYbJwbK4O0InS+sz3chdx8GGSdIUz7muXeT/D+A=="; }; }; - "@uifabric/icons-7.5.17" = { + "@uifabric/icons-7.5.18" = { name = "_at_uifabric_slash_icons"; packageName = "@uifabric/icons"; - version = "7.5.17"; + version = "7.5.18"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/icons/-/icons-7.5.17.tgz"; - sha512 = "2S1kse0gtseTuV2r59iWukLxxoOJ6GgP2Yhxt9oxzaP9QubpYdxCUepvJmfPQQvvy4GELdykDUWQ6/hbzliJyw=="; + url = "https://registry.npmjs.org/@uifabric/icons/-/icons-7.5.18.tgz"; + sha512 = "gLPEccWlTER9NiXcOHZ+dSJ3tgLAQ4mTf3hTlKV7e7dKBTl95jzcemG5S2NJQ7xWPTH3+5K1Bpd+nqZo9EJw3w=="; }; }; "@uifabric/merge-styles-7.19.1" = { @@ -6925,13 +6844,13 @@ let sha512 = "9E+YKtnH2kyMKnK9XZZsqyM8OCxEJIIfxtaThTlQpYOzrWAGJxQADFbZ7+Usi0U2xHnWNPFROjq+B9ocEzhqMA=="; }; }; - "@uifabric/styling-7.16.18" = { + "@uifabric/styling-7.16.19" = { name = "_at_uifabric_slash_styling"; packageName = "@uifabric/styling"; - version = "7.16.18"; + version = "7.16.19"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/styling/-/styling-7.16.18.tgz"; - sha512 = "jINFRMWfSIOZ4H29YNBHtwZU4f8JFprnyBX2E0Wq9rjqRzgcmdYbN2yn88gym6aC3houSDcYM0rdfG4ETjRQSA=="; + url = "https://registry.npmjs.org/@uifabric/styling/-/styling-7.16.19.tgz"; + sha512 = "T5fjUCx0LbzUC8Myw15YCaBjdGbSrihWSiPHtLVW77k59yWAW947XnH73QngE8xU7kyKPH3AhQrUEBMB2NjHag=="; }; }; "@uifabric/utilities-7.33.2" = { @@ -6979,40 +6898,40 @@ let sha1 = "c585c0bdb94210198945c6597e4fe23d6e63e084"; }; }; - "@vue/cli-shared-utils-4.5.9" = { + "@vue/cli-shared-utils-4.5.11" = { name = "_at_vue_slash_cli-shared-utils"; packageName = "@vue/cli-shared-utils"; - version = "4.5.9"; + version = "4.5.11"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.5.9.tgz"; - sha512 = "anvsrv+rkQC+hgxaT2nQQxnSWSsIzyysZ36LO7qPjXvDRBvcvKLAAviFlUkYbZ+ntbV8puzJ3zw+gUhQw4SEVA=="; + url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.5.11.tgz"; + sha512 = "+aaQ+ThQG3+WMexfSWNl0y6f43edqVqRNbguE53F3TIH81I7saS5S750ayqXhZs2r6STJJyqorQnKtAWfHo29A=="; }; }; - "@vue/cli-ui-4.5.9" = { + "@vue/cli-ui-4.5.11" = { name = "_at_vue_slash_cli-ui"; packageName = "@vue/cli-ui"; - version = "4.5.9"; + version = "4.5.11"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-4.5.9.tgz"; - sha512 = "JXQk29CLp7eBdO6uCr2s60xBoKjXPzr9ckpCicFMIWFLQOR0+DqWQpS1DIqETbgOmTYQj1LX+v1rkLeA74Lo2A=="; + url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-4.5.11.tgz"; + sha512 = "hT9cukom8WkV+U3GL0yOFDvWXqG35vy5ddSLideUOK2Ylht0AW7P9DDfUls/cDCpQ172LfPnvKRO/8zADqSElg=="; }; }; - "@vue/cli-ui-addon-webpack-4.5.9" = { + "@vue/cli-ui-addon-webpack-4.5.11" = { name = "_at_vue_slash_cli-ui-addon-webpack"; packageName = "@vue/cli-ui-addon-webpack"; - version = "4.5.9"; + version = "4.5.11"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-4.5.9.tgz"; - sha512 = "fh79OvbqvZ2YQ7JI7DnDKeS3W72HoEMVS8m969g/kjrqkFM+Rt2cL81LBx3IgX5l/rZP999kof569vYsOyjVnA=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-4.5.11.tgz"; + sha512 = "k7Iv8ZfoiFtbHNDlntIUee1fCbS5PkQT9ZuI+tMV7eP7fbQXPSRDefsEOb0lAnrZ953tli+AF+hh2XhP6ihZig=="; }; }; - "@vue/cli-ui-addon-widgets-4.5.9" = { + "@vue/cli-ui-addon-widgets-4.5.11" = { name = "_at_vue_slash_cli-ui-addon-widgets"; packageName = "@vue/cli-ui-addon-widgets"; - version = "4.5.9"; + version = "4.5.11"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-4.5.9.tgz"; - sha512 = "mFdUlfDGxoyreCQWO/SX4DvM/6epn37AimVGzLJLpSPJdWUerCnvxwzB6zL83SiYC6O6++cWEdzgz7EtKViFlA=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-4.5.11.tgz"; + sha512 = "uUZIfWWfvFMAtfyzaJDtwRqN2vNzc2nnALEJliv2ccVRZHS8mwB/aLoaX0hL3h+RBJ8WV2PDiXmRFcESyDfKjA=="; }; }; "@vue/compiler-core-3.0.5" = { @@ -7087,6 +7006,15 @@ let sha512 = "gYsNoGkWejBxNO6SNRjOh/xKeZ0H0V+TFzaPzODfBjkAIb0aQgBuixC1brandC/CDJy1wYPwSoYrXpvul7m6yw=="; }; }; + "@webassemblyjs/ast-1.11.0" = { + name = "_at_webassemblyjs_slash_ast"; + packageName = "@webassemblyjs/ast"; + version = "1.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.0.tgz"; + sha512 = "kX2W49LWsbthrmIRMbQZuQDhGtjyqXfEmmHyEi4XWnSZtPmxY0+3anPIzsnRb45VH/J55zlOfWvZuY47aJZTJg=="; + }; + }; "@webassemblyjs/ast-1.8.1" = { name = "_at_webassemblyjs_slash_ast"; packageName = "@webassemblyjs/ast"; @@ -7105,13 +7033,13 @@ let sha512 = "C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA=="; }; }; - "@webassemblyjs/ast-1.9.1" = { - name = "_at_webassemblyjs_slash_ast"; - packageName = "@webassemblyjs/ast"; - version = "1.9.1"; + "@webassemblyjs/floating-point-hex-parser-1.11.0" = { + name = "_at_webassemblyjs_slash_floating-point-hex-parser"; + packageName = "@webassemblyjs/floating-point-hex-parser"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.1.tgz"; - sha512 = "uMu1nCWn2Wxyy126LlGqRVlhdTOsO/bsBRI4dNq3+6SiSuRKRQX6ejjKgh82LoGAPSq72lDUiQ4FWVaf0PecYw=="; + url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.0.tgz"; + sha512 = "Q/aVYs/VnPDVYvsCBL/gSgwmfjeCb4LW8+TMrO3cSzJImgv8lxxEPM2JA5jMrivE7LSz3V+PFqtMbls3m1exDA=="; }; }; "@webassemblyjs/floating-point-hex-parser-1.8.1" = { @@ -7132,13 +7060,13 @@ let sha512 = "TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA=="; }; }; - "@webassemblyjs/floating-point-hex-parser-1.9.1" = { - name = "_at_webassemblyjs_slash_floating-point-hex-parser"; - packageName = "@webassemblyjs/floating-point-hex-parser"; - version = "1.9.1"; + "@webassemblyjs/helper-api-error-1.11.0" = { + name = "_at_webassemblyjs_slash_helper-api-error"; + packageName = "@webassemblyjs/helper-api-error"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.1.tgz"; - sha512 = "5VEKu024RySmLKTTBl9q1eO/2K5jk9ZS+2HXDBLA9s9p5IjkaXxWiDb/+b7wSQp6FRdLaH1IVGIfOex58Na2pg=="; + url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.0.tgz"; + sha512 = "baT/va95eXiXb2QflSx95QGT5ClzWpGaa8L7JnJbgzoYeaA27FCvuBXU758l+KXWRndEmUXjP0Q5fibhavIn8w=="; }; }; "@webassemblyjs/helper-api-error-1.8.1" = { @@ -7159,13 +7087,13 @@ let sha512 = "NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw=="; }; }; - "@webassemblyjs/helper-api-error-1.9.1" = { - name = "_at_webassemblyjs_slash_helper-api-error"; - packageName = "@webassemblyjs/helper-api-error"; - version = "1.9.1"; + "@webassemblyjs/helper-buffer-1.11.0" = { + name = "_at_webassemblyjs_slash_helper-buffer"; + packageName = "@webassemblyjs/helper-buffer"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.1.tgz"; - sha512 = "y1lGmfm38djrScwpeL37rRR9f1D6sM8RhMpvM7CYLzOlHVboouZokXK/G88BpzW0NQBSvCCOnW5BFhten4FPfA=="; + url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.0.tgz"; + sha512 = "u9HPBEl4DS+vA8qLQdEQ6N/eJQ7gT7aNvMIo8AAWvAl/xMrcOSiI2M0MAnMCy3jIFke7bEee/JwdX1nUpCtdyA=="; }; }; "@webassemblyjs/helper-buffer-1.8.1" = { @@ -7186,13 +7114,13 @@ let sha512 = "qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA=="; }; }; - "@webassemblyjs/helper-buffer-1.9.1" = { - name = "_at_webassemblyjs_slash_helper-buffer"; - packageName = "@webassemblyjs/helper-buffer"; - version = "1.9.1"; + "@webassemblyjs/helper-code-frame-1.11.0" = { + name = "_at_webassemblyjs_slash_helper-code-frame"; + packageName = "@webassemblyjs/helper-code-frame"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.1.tgz"; - sha512 = "uS6VSgieHbk/m4GSkMU5cqe/5TekdCzQso4revCIEQ3vpGZgqSSExi4jWpTWwDpAHOIAb1Jfrs0gUB9AA4n71w=="; + url = "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.11.0.tgz"; + sha512 = "crKJ80NppRzmKB9863Xq5ufVT6he+V4A2PoBfeblFGeeCb6zig34mW97tNBzGLcuOfSsq4ncmI4QOtqQBg047g=="; }; }; "@webassemblyjs/helper-code-frame-1.8.1" = { @@ -7213,31 +7141,31 @@ let sha512 = "ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA=="; }; }; - "@webassemblyjs/helper-code-frame-1.9.1" = { - name = "_at_webassemblyjs_slash_helper-code-frame"; - packageName = "@webassemblyjs/helper-code-frame"; - version = "1.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.1.tgz"; - sha512 = "ZQ2ZT6Evk4DPIfD+92AraGYaFIqGm4U20e7FpXwl7WUo2Pn1mZ1v8VGH8i+Y++IQpxPbQo/UyG0Khs7eInskzA=="; - }; - }; - "@webassemblyjs/helper-compiler-1.9.1" = { + "@webassemblyjs/helper-compiler-1.11.0" = { name = "_at_webassemblyjs_slash_helper-compiler"; packageName = "@webassemblyjs/helper-compiler"; - version = "1.9.1"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-compiler/-/helper-compiler-1.9.1.tgz"; - sha512 = "Qad79JaN6Qgv+lWd3sLqt206o6WRne5AynNPuLQlTlvDh8P/QsqVzf6RAJnjn9snJczXxkdN3BhWg9jSgb1sUw=="; + url = "https://registry.npmjs.org/@webassemblyjs/helper-compiler/-/helper-compiler-1.11.0.tgz"; + sha512 = "XEKiHYE951mCW3kjXXK3sHdJI+IOD8k/Vfzk55FeFRJbKxucXZEJ+H1dcDp9MK0wXLtaMSVU5RFXf7chrCjdAg=="; }; }; - "@webassemblyjs/helper-flatten-ast-1.9.1" = { + "@webassemblyjs/helper-flatten-ast-1.11.0" = { name = "_at_webassemblyjs_slash_helper-flatten-ast"; packageName = "@webassemblyjs/helper-flatten-ast"; - version = "1.9.1"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-flatten-ast/-/helper-flatten-ast-1.9.1.tgz"; - sha512 = "wb7ZvGAzfMdgPYAR5zQwu9R/M+kmJDYXKPCJ9vCMfUn3qMoa69Tn5J+Y9u+HzX7nt3TgPvJFcVZKWxCMIhuP7w=="; + url = "https://registry.npmjs.org/@webassemblyjs/helper-flatten-ast/-/helper-flatten-ast-1.11.0.tgz"; + sha512 = "T5zOuVT4mOXuDu2elXT/0P+2hhsIj/SgUUIxGTmpak6j3XruH0hYOOcnT9ES+qQ4vN3eq63ivGnLaMmjMPcExA=="; + }; + }; + "@webassemblyjs/helper-fsm-1.11.0" = { + name = "_at_webassemblyjs_slash_helper-fsm"; + packageName = "@webassemblyjs/helper-fsm"; + version = "1.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.11.0.tgz"; + sha512 = "H0vRFj05zA2J1SVi+VdNbMwi7m0yZQhLqq7vkjYk44ilLzk0zEXaBNofKH5rQcchQUP2gdqoxLLHA9EcUdW9nw=="; }; }; "@webassemblyjs/helper-fsm-1.8.1" = { @@ -7258,15 +7186,6 @@ let sha512 = "OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw=="; }; }; - "@webassemblyjs/helper-fsm-1.9.1" = { - name = "_at_webassemblyjs_slash_helper-fsm"; - packageName = "@webassemblyjs/helper-fsm"; - version = "1.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.1.tgz"; - sha512 = "J32HGpveEqqcKFS0YbgicB0zAlpfIxJa5MjxDxhu3i5ltPcVfY5EPvKQ1suRguFPehxiUs+/hfkwPEXom/l0lw=="; - }; - }; "@webassemblyjs/helper-module-context-1.8.1" = { name = "_at_webassemblyjs_slash_helper-module-context"; packageName = "@webassemblyjs/helper-module-context"; @@ -7285,13 +7204,22 @@ let sha512 = "MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g=="; }; }; - "@webassemblyjs/helper-module-context-1.9.1" = { - name = "_at_webassemblyjs_slash_helper-module-context"; - packageName = "@webassemblyjs/helper-module-context"; - version = "1.9.1"; + "@webassemblyjs/helper-numbers-1.11.0" = { + name = "_at_webassemblyjs_slash_helper-numbers"; + packageName = "@webassemblyjs/helper-numbers"; + version = "1.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.0.tgz"; + sha512 = "DhRQKelIj01s5IgdsOJMKLppI+4zpmcMQ3XboFPLwCpSNH6Hqo1ritgHgD0nqHeSYqofA6aBN/NmXuGjM1jEfQ=="; + }; + }; + "@webassemblyjs/helper-wasm-bytecode-1.11.0" = { + name = "_at_webassemblyjs_slash_helper-wasm-bytecode"; + packageName = "@webassemblyjs/helper-wasm-bytecode"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.1.tgz"; - sha512 = "IEH2cMmEQKt7fqelLWB5e/cMdZXf2rST1JIrzWmf4XBt3QTxGdnnLvV4DYoN8pJjOx0VYXsWg+yF16MmJtolZg=="; + url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.0.tgz"; + sha512 = "MbmhvxXExm542tWREgSFnOVo07fDpsBJg3sIl6fSp9xuu75eGz5lz31q7wTLffwL3Za7XNRCMZy210+tnsUSEA=="; }; }; "@webassemblyjs/helper-wasm-bytecode-1.8.1" = { @@ -7312,13 +7240,13 @@ let sha512 = "R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw=="; }; }; - "@webassemblyjs/helper-wasm-bytecode-1.9.1" = { - name = "_at_webassemblyjs_slash_helper-wasm-bytecode"; - packageName = "@webassemblyjs/helper-wasm-bytecode"; - version = "1.9.1"; + "@webassemblyjs/helper-wasm-section-1.11.0" = { + name = "_at_webassemblyjs_slash_helper-wasm-section"; + packageName = "@webassemblyjs/helper-wasm-section"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.1.tgz"; - sha512 = "i2rGTBqFUcSXxyjt2K4vm/3kkHwyzG6o427iCjcIKjOqpWH8SEem+xe82jUk1iydJO250/CvE5o7hzNAMZf0dQ=="; + url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.0.tgz"; + sha512 = "3Eb88hcbfY/FCukrg6i3EH8H2UsD7x8Vy47iVJrP967A9JGqgBVL9aH71SETPx1JrGsOUVLo0c7vMCN22ytJew=="; }; }; "@webassemblyjs/helper-wasm-section-1.8.1" = { @@ -7339,13 +7267,13 @@ let sha512 = "XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw=="; }; }; - "@webassemblyjs/helper-wasm-section-1.9.1" = { - name = "_at_webassemblyjs_slash_helper-wasm-section"; - packageName = "@webassemblyjs/helper-wasm-section"; - version = "1.9.1"; + "@webassemblyjs/ieee754-1.11.0" = { + name = "_at_webassemblyjs_slash_ieee754"; + packageName = "@webassemblyjs/ieee754"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.1.tgz"; - sha512 = "FetqzjtXZr2d57IECK+aId3D0IcGweeM0CbAnJHkYJkcRTHP+YcMb7Wmc0j21h5UWBpwYGb9dSkK/93SRCTrGg=="; + url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.0.tgz"; + sha512 = "KXzOqpcYQwAfeQ6WbF6HXo+0udBNmw0iXDmEK5sFlmQdmND+tr773Ti8/5T/M6Tl/413ArSJErATd8In3B+WBA=="; }; }; "@webassemblyjs/ieee754-1.8.1" = { @@ -7366,13 +7294,13 @@ let sha512 = "dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg=="; }; }; - "@webassemblyjs/ieee754-1.9.1" = { - name = "_at_webassemblyjs_slash_ieee754"; - packageName = "@webassemblyjs/ieee754"; - version = "1.9.1"; + "@webassemblyjs/leb128-1.11.0" = { + name = "_at_webassemblyjs_slash_leb128"; + packageName = "@webassemblyjs/leb128"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.9.1.tgz"; - sha512 = "EvTG9M78zP1MmkBpUjGQHZc26DzPGZSLIPxYHCjQsBMo60Qy2W34qf8z0exRDtxBbRIoiKa5dFyWer/7r1aaSQ=="; + url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.0.tgz"; + sha512 = "aqbsHa1mSQAbeeNcl38un6qVY++hh8OpCOzxhixSYgbRfNWcxJNJQwe2rezK9XEcssJbbWIkblaJRwGMS9zp+g=="; }; }; "@webassemblyjs/leb128-1.8.1" = { @@ -7393,13 +7321,13 @@ let sha512 = "ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw=="; }; }; - "@webassemblyjs/leb128-1.9.1" = { - name = "_at_webassemblyjs_slash_leb128"; - packageName = "@webassemblyjs/leb128"; - version = "1.9.1"; + "@webassemblyjs/utf8-1.11.0" = { + name = "_at_webassemblyjs_slash_utf8"; + packageName = "@webassemblyjs/utf8"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.9.1.tgz"; - sha512 = "Oc04ub0vFfLnF+2/+ki3AE+anmW4sv9uNBqb+79fgTaPv6xJsOT0dhphNfL3FrME84CbX/D1T9XT8tjFo0IIiw=="; + url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.0.tgz"; + sha512 = "A/lclGxH6SpSLSyFowMzO/+aDEPU4hvEiooCMXQPcQFPPJaYcPQNKGOCLUySJsYJ4trbpr+Fs08n4jelkVTGVw=="; }; }; "@webassemblyjs/utf8-1.8.1" = { @@ -7420,22 +7348,22 @@ let sha512 = "GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w=="; }; }; - "@webassemblyjs/utf8-1.9.1" = { - name = "_at_webassemblyjs_slash_utf8"; - packageName = "@webassemblyjs/utf8"; - version = "1.9.1"; + "@webassemblyjs/validation-1.11.0" = { + name = "_at_webassemblyjs_slash_validation"; + packageName = "@webassemblyjs/validation"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.9.1.tgz"; - sha512 = "llkYtppagjCodFjo0alWOUhAkfOiQPQDIc5oA6C9sFAXz7vC9QhZf/f8ijQIX+A9ToM3c9Pq85X0EX7nx9gVhg=="; + url = "https://registry.npmjs.org/@webassemblyjs/validation/-/validation-1.11.0.tgz"; + sha512 = "0doaNEdjsurs3hUahxqoo3AJKvz+QnsIlkDnmd6nNmlFge3ixCrA7B8Xm6vmNoBPWWZgQ0VhvHV8Qs4768q1pw=="; }; }; - "@webassemblyjs/validation-1.9.1" = { - name = "_at_webassemblyjs_slash_validation"; - packageName = "@webassemblyjs/validation"; - version = "1.9.1"; + "@webassemblyjs/wasm-edit-1.11.0" = { + name = "_at_webassemblyjs_slash_wasm-edit"; + packageName = "@webassemblyjs/wasm-edit"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/validation/-/validation-1.9.1.tgz"; - sha512 = "a/Vh1fKuvuqff0KqA9TYATTyk/FihoVcc5vp4qhXHfKjS4J9BIW548gh5YZ81ZB39yg5TKiApRy8zMRa82Ij/A=="; + url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.0.tgz"; + sha512 = "JHQ0damXy0G6J9ucyKVXO2j08JVJ2ntkdJlq1UTiUrIgfGMmA7Ik5VdC/L8hBK46kVJgujkBIoMtT8yVr+yVOQ=="; }; }; "@webassemblyjs/wasm-edit-1.9.0" = { @@ -7447,13 +7375,13 @@ let sha512 = "FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw=="; }; }; - "@webassemblyjs/wasm-edit-1.9.1" = { - name = "_at_webassemblyjs_slash_wasm-edit"; - packageName = "@webassemblyjs/wasm-edit"; - version = "1.9.1"; + "@webassemblyjs/wasm-gen-1.11.0" = { + name = "_at_webassemblyjs_slash_wasm-gen"; + packageName = "@webassemblyjs/wasm-gen"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.1.tgz"; - sha512 = "S2IaD6+x9B2Xi8BCT0eGsrXXd8UxAh2LVJpg1ZMtHXnrDcsTtIX2bDjHi40Hio6Lc62dWHmKdvksI+MClCYbbw=="; + url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.0.tgz"; + sha512 = "BEUv1aj0WptCZ9kIS30th5ILASUnAPEvE3tVMTrItnZRT9tXCLW2LEXT8ezLw59rqPP9klh9LPmpU+WmRQmCPQ=="; }; }; "@webassemblyjs/wasm-gen-1.8.1" = { @@ -7474,13 +7402,13 @@ let sha512 = "cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA=="; }; }; - "@webassemblyjs/wasm-gen-1.9.1" = { - name = "_at_webassemblyjs_slash_wasm-gen"; - packageName = "@webassemblyjs/wasm-gen"; - version = "1.9.1"; + "@webassemblyjs/wasm-opt-1.11.0" = { + name = "_at_webassemblyjs_slash_wasm-opt"; + packageName = "@webassemblyjs/wasm-opt"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.1.tgz"; - sha512 = "bqWI0S4lBQsEN5FTZ35vYzfKUJvtjNnBobB1agCALH30xNk1LToZ7Z8eiaR/Z5iVECTlBndoRQV3F6mbEqE/fg=="; + url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.0.tgz"; + sha512 = "tHUSP5F4ywyh3hZ0+fDQuWxKx3mJiPeFufg+9gwTpYp324mPCQgnuVKwzLTZVqj0duRDovnPaZqDwoyhIO8kYg=="; }; }; "@webassemblyjs/wasm-opt-1.9.0" = { @@ -7492,13 +7420,13 @@ let sha512 = "Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A=="; }; }; - "@webassemblyjs/wasm-opt-1.9.1" = { - name = "_at_webassemblyjs_slash_wasm-opt"; - packageName = "@webassemblyjs/wasm-opt"; - version = "1.9.1"; + "@webassemblyjs/wasm-parser-1.11.0" = { + name = "_at_webassemblyjs_slash_wasm-parser"; + packageName = "@webassemblyjs/wasm-parser"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.1.tgz"; - sha512 = "gSf7I7YWVXZ5c6XqTEqkZjVs8K1kc1k57vsB6KBQscSagDNbAdxt6MwuJoMjsE1yWY1tsuL+pga268A6u+Fdkg=="; + url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.0.tgz"; + sha512 = "6L285Sgu9gphrcpDXINvm0M9BskznnzJTE7gYkjDbxET28shDqp27wpruyx3C2S/dvEwiigBwLA1cz7lNUi0kw=="; }; }; "@webassemblyjs/wasm-parser-1.8.1" = { @@ -7519,13 +7447,13 @@ let sha512 = "9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA=="; }; }; - "@webassemblyjs/wasm-parser-1.9.1" = { - name = "_at_webassemblyjs_slash_wasm-parser"; - packageName = "@webassemblyjs/wasm-parser"; - version = "1.9.1"; + "@webassemblyjs/wast-parser-1.11.0" = { + name = "_at_webassemblyjs_slash_wast-parser"; + packageName = "@webassemblyjs/wast-parser"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.1.tgz"; - sha512 = "ImM4N2T1MEIond0MyE3rXvStVxEmivQrDKf/ggfh5pP6EHu3lL/YTAoSrR7shrbKNPpeKpGesW1LIK/L4kqduw=="; + url = "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.11.0.tgz"; + sha512 = "HKFbg+HvjITWuOOWehS2EUdNZ4fsfWislwDTrxuUL6FpzrjtsASd2c4hmqNSW6c7sv5iBx1puUWwNtVqLXxFqw=="; }; }; "@webassemblyjs/wast-parser-1.8.1" = { @@ -7546,13 +7474,13 @@ let sha512 = "qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw=="; }; }; - "@webassemblyjs/wast-parser-1.9.1" = { - name = "_at_webassemblyjs_slash_wast-parser"; - packageName = "@webassemblyjs/wast-parser"; - version = "1.9.1"; + "@webassemblyjs/wast-printer-1.11.0" = { + name = "_at_webassemblyjs_slash_wast-printer"; + packageName = "@webassemblyjs/wast-printer"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.9.1.tgz"; - sha512 = "2xVxejXSvj3ls/o2TR/zI6p28qsGupjHhnHL6URULQRcXmryn3w7G83jQMcT7PHqUfyle65fZtWLukfdLdE7qw=="; + url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.0.tgz"; + sha512 = "Fg5OX46pRdTgB7rKIUojkh9vXaVN6sGYCnEiJN1GYkb0RPwShZXp6KTDqmoMdQPKhcroOXh3fEzmkWmCYaKYhQ=="; }; }; "@webassemblyjs/wast-printer-1.8.1" = { @@ -7573,13 +7501,13 @@ let sha512 = "2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA=="; }; }; - "@webassemblyjs/wast-printer-1.9.1" = { - name = "_at_webassemblyjs_slash_wast-printer"; - packageName = "@webassemblyjs/wast-printer"; - version = "1.9.1"; + "@webpack-cli/configtest-1.0.0" = { + name = "_at_webpack-cli_slash_configtest"; + packageName = "@webpack-cli/configtest"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.9.1.tgz"; - sha512 = "tDV8V15wm7mmbAH6XvQRU1X+oPGmeOzYsd6h7hlRLz6QpV4Ec/KKxM8OpLtFmQPLCreGxTp+HuxtH4pRIZyL9w=="; + url = "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.0.0.tgz"; + sha512 = "Un0SdBoN1h4ACnIO7EiCjWuyhNI0Jl96JC+63q6xi4HDUYRZn8Auluea9D+v9NWKc5J4sICVEltdBaVjLX39xw=="; }; }; "@webpack-cli/info-1.2.1" = { @@ -7591,13 +7519,13 @@ let sha512 = "fLnDML5HZ5AEKzHul8xLAksoKN2cibu6MgonkUj8R9V7bbeVRkd1XbGEGWrAUNYHbX1jcqCsDEpBviE5StPMzQ=="; }; }; - "@webpack-cli/serve-1.2.1" = { + "@webpack-cli/serve-1.2.2" = { name = "_at_webpack-cli_slash_serve"; packageName = "@webpack-cli/serve"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.2.1.tgz"; - sha512 = "Zj1z6AyS+vqV6Hfi7ngCjFGdHV5EwZNIHo6QfFTNe9PyW+zBU1zJ9BiOW1pmUEq950RC4+Dym6flyA/61/vhyw=="; + url = "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.2.2.tgz"; + sha512 = "03GkWxcgFfm8+WIwcsqJb9agrSDNDDoxaNnexPnCCexP5SCE4IgFd9lNpSy+K2nFqVMpgTFw6SwbmVAVTndVew=="; }; }; "@wry/context-0.4.4" = { @@ -7780,15 +7708,6 @@ let sha1 = "c22822f87e1c939f579887504d9c109c4173829d"; }; }; - "abstract-leveldown-0.12.4" = { - name = "abstract-leveldown"; - packageName = "abstract-leveldown"; - version = "0.12.4"; - src = fetchurl { - url = "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-0.12.4.tgz"; - sha1 = "29e18e632e60e4e221d5810247852a63d7b2e410"; - }; - }; "abstract-leveldown-6.0.3" = { name = "abstract-leveldown"; packageName = "abstract-leveldown"; @@ -7906,13 +7825,13 @@ let sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="; }; }; - "acorn-8.0.4" = { + "acorn-8.0.5" = { name = "acorn"; packageName = "acorn"; - version = "8.0.4"; + version = "8.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-8.0.4.tgz"; - sha512 = "XNP0PqF1XD19ZlLKvB7cMmnZswW4C/03pRHgirB30uSJTaS3A3V1/P4sS3HPvFmjoriPCJQs+JDSbm4bL1TxGQ=="; + url = "https://registry.npmjs.org/acorn/-/acorn-8.0.5.tgz"; + sha512 = "v+DieK/HJkJOpFBETDJioequtc3PfxsWMaxIdIwujtF7FEV/MAyDQLlm6/zPvr7Mix07mLh6ccVwIsloceodlg=="; }; }; "acorn-globals-1.0.9" = { @@ -8086,6 +8005,15 @@ let sha512 = "TFi4HBKSGfIKsK5YCkKaaFG2m4PEDyViZmEwof3MTIgzimHLto6muaHVpbrljdIvIrFZzEq/p4nafOeLcYegrg=="; }; }; + "adm-zip-0.5.2" = { + name = "adm-zip"; + packageName = "adm-zip"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.2.tgz"; + sha512 = "lUI3ZSNsfQXNYNzGjt68MdxzCs0eW29lgL74y/Y2h4nARgHmH3poFWuK3LonvFbNHFt4dTb2X/QQ4c1ZUWWsJw=="; + }; + }; "adverb-where-0.0.9" = { name = "adverb-where"; packageName = "adverb-where"; @@ -8518,15 +8446,6 @@ let sha512 = "JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA=="; }; }; - "ansi-fragments-0.2.1" = { - name = "ansi-fragments"; - packageName = "ansi-fragments"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-fragments/-/ansi-fragments-0.2.1.tgz"; - sha512 = "DykbNHxuXQwUDRv5ibc2b0x7uw7wmwOGLBUd5RmaQ5z8Lhx19vwvKV+FAsM5rEA6dEcHxX+/Ad5s9eF2k2bB+w=="; - }; - }; "ansi-gray-0.1.1" = { name = "ansi-gray"; packageName = "ansi-gray"; @@ -8662,13 +8581,13 @@ let sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="; }; }; - "ansi-styles-5.0.0" = { + "ansi-styles-5.1.0" = { name = "ansi-styles"; packageName = "ansi-styles"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.0.0.tgz"; - sha512 = "6564t0m0fuQMnockqBv7wJxo9T5C2V9JpYXyNScfRDPVLusOQQhkpMGrFC17QbiolraQ1sMXX+Y5nJpjqozL4g=="; + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.1.0.tgz"; + sha512 = "osxifZo3ar56+e8tdYreU6p8FZGciBHo5O0JoDAxMUqZuyNUb+yHEwYtJZ+Z32R459jEgtwVf1u8D7qYwU0l6w=="; }; }; "ansi-term-0.0.2" = { @@ -8797,13 +8716,13 @@ let sha512 = "sbLEIMQrkV7RkIruqTPXxeCMkAAycv4yzTkBzRgOR1BrR5UB7qZtupqxkersTJSf0HZ3sbaNRrNV80TnnM7cUw=="; }; }; - "apollo-2.32.0" = { + "apollo-2.32.1" = { name = "apollo"; packageName = "apollo"; - version = "2.32.0"; + version = "2.32.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo/-/apollo-2.32.0.tgz"; - sha512 = "6Wmt9OUYUET3JSQvAS6qgNP+vomf3P5zANARXDhqJ59c0/hAsXhdAvGaFFba+JhRRvyIVBOmaOpB880aNZeadg=="; + url = "https://registry.npmjs.org/apollo/-/apollo-2.32.1.tgz"; + sha512 = "aSjGnxxm+ZZ6uYTuGrBqtQ4e3boG408K16CbB5Zm/QHCRNHpPUz7r9VRDfAJWMFE1mBdWi+r0dyY+7FUkKeRrw=="; }; }; "apollo-cache-1.3.5" = { @@ -8815,13 +8734,13 @@ let sha512 = "1XoDy8kJnyWY/i/+gLTEbYLnoiVtS8y7ikBr/IfmML4Qb+CM7dEEbIUOjnY716WqmZ/UpXIxTfJsY7rMcqiCXA=="; }; }; - "apollo-cache-control-0.11.5" = { + "apollo-cache-control-0.11.6" = { name = "apollo-cache-control"; packageName = "apollo-cache-control"; - version = "0.11.5"; + version = "0.11.6"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.11.5.tgz"; - sha512 = "jvarfQhwDRazpOsmkt5Pd7qGFrtbL70zMbUZGqDhJSYpfqI672f7bXXc7O3vtpbD3qnS3XTBvK2kspX/Bdo0IA=="; + url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.11.6.tgz"; + sha512 = "YZ+uuIG+fPy+mkpBS2qKF0v1qlzZ3PW6xZVaDukeK3ed3iAs4L/2YnkTqau3OmoF/VPzX2FmSkocX/OVd59YSw=="; }; }; "apollo-cache-inmemory-1.6.6" = { @@ -8842,58 +8761,58 @@ let sha512 = "jiPlMTN6/5CjZpJOkGeUV0mb4zxx33uXWdj/xQCfAMkuNAC3HN7CvYDyMHHEzmcQ5GV12LszWoQ/VlxET24CtA=="; }; }; - "apollo-codegen-core-0.39.0" = { + "apollo-codegen-core-0.39.1" = { name = "apollo-codegen-core"; packageName = "apollo-codegen-core"; - version = "0.39.0"; + version = "0.39.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-core/-/apollo-codegen-core-0.39.0.tgz"; - sha512 = "b+RD8jerDMih2vf73hodOQAx4UODy1l053/Mdr4uIBlDbaF6OA4Q8TbTbH4k7tDzyAoL2pjH5v8AtlU8viIKwg=="; + url = "https://registry.npmjs.org/apollo-codegen-core/-/apollo-codegen-core-0.39.1.tgz"; + sha512 = "8Sb9CN+lYR2BMeg7p3A4wjsQW7oxDTnKbueUHV/fmZU+hg2GNLXqVTdyWE2UWDEOyDTNpQMyysGEUZZBsOmBrw=="; }; }; - "apollo-codegen-flow-0.37.0" = { + "apollo-codegen-flow-0.37.1" = { name = "apollo-codegen-flow"; packageName = "apollo-codegen-flow"; - version = "0.37.0"; + version = "0.37.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-flow/-/apollo-codegen-flow-0.37.0.tgz"; - sha512 = "VWB++9ObUQx+Y1JPdgrkdkjPichsgXhYfz5w5HSKvare7SlkxEZFOzSXi9/bUAC3gry3B/38do1srDHtXZ366g=="; + url = "https://registry.npmjs.org/apollo-codegen-flow/-/apollo-codegen-flow-0.37.1.tgz"; + sha512 = "XhGUzlBxi3IHCBbIsnfk0c41mz30Ky1SPSYtJzrMdtMAdUAfMEGBLXzlLqgp1iAbUegQ10zbp2kgzLG0hkeYhg=="; }; }; - "apollo-codegen-scala-0.38.0" = { + "apollo-codegen-scala-0.38.1" = { name = "apollo-codegen-scala"; packageName = "apollo-codegen-scala"; - version = "0.38.0"; + version = "0.38.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-scala/-/apollo-codegen-scala-0.38.0.tgz"; - sha512 = "oQAV65ZGaFGeNpxVVnZLh2kyBKfA6QzSeyosDp0HKxeXOGQ84dHJg1zGiN0oWXELBM2MqPtwWSGFYgnk3CNeHg=="; + url = "https://registry.npmjs.org/apollo-codegen-scala/-/apollo-codegen-scala-0.38.1.tgz"; + sha512 = "WvIX6Gm7KHnh6FJzq/XVRyHMNwwbQEnMfRXpR9zFtaUuzZHfg9RNawtsUGMSQCnNw1sm5YLGIJvNFUp1hUEqGA=="; }; }; - "apollo-codegen-swift-0.39.0" = { + "apollo-codegen-swift-0.39.1" = { name = "apollo-codegen-swift"; packageName = "apollo-codegen-swift"; - version = "0.39.0"; + version = "0.39.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-swift/-/apollo-codegen-swift-0.39.0.tgz"; - sha512 = "fFaR8g62jjYS6QFW354ONcMHJNesy5EtCvYKsR9Sb1eBoLTx/6NkeMiGO28PIIk7bEw7FKMrzQE2UVNSeZbMxQ=="; + url = "https://registry.npmjs.org/apollo-codegen-swift/-/apollo-codegen-swift-0.39.1.tgz"; + sha512 = "dKqDd2w2YAOkyDbDkJ5etXLdn8foNnm55r5rsIssIxCdtdR5qsusrPHQvywVjHw8ZHBy4o229dVoSzmrIUygKg=="; }; }; - "apollo-codegen-typescript-0.39.0" = { + "apollo-codegen-typescript-0.39.1" = { name = "apollo-codegen-typescript"; packageName = "apollo-codegen-typescript"; - version = "0.39.0"; + version = "0.39.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-typescript/-/apollo-codegen-typescript-0.39.0.tgz"; - sha512 = "/clemyhTd+s+b4HoMa72zjWir4QrDqjcN4tnSpQYXSsOFO4e4kWlxSj0zrtyYkcx/Gqod9UrPSSsx2CZHyB37A=="; + url = "https://registry.npmjs.org/apollo-codegen-typescript/-/apollo-codegen-typescript-0.39.1.tgz"; + sha512 = "cSnMrAqyK2AMZRxTsBrZZhemfv87AU0OS1/aM45WQRyQurkEjf8GmWMfp2IRkJo9m+jgdo74X5ct3KZOXbYMXg=="; }; }; - "apollo-datasource-0.7.2" = { + "apollo-datasource-0.7.3" = { name = "apollo-datasource"; packageName = "apollo-datasource"; - version = "0.7.2"; + version = "0.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.7.2.tgz"; - sha512 = "ibnW+s4BMp4K2AgzLEtvzkjg7dJgCaw9M5b5N0YKNmeRZRnl/I/qBTQae648FsRKgMwTbRQIvBhQ0URUFAqFOw=="; + url = "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.7.3.tgz"; + sha512 = "PE0ucdZYjHjUyXrFWRwT02yLcx2DACsZ0jm1Mp/0m/I9nZu/fEkvJxfsryXB6JndpmQO77gQHixf/xGCN976kA=="; }; }; "apollo-env-0.6.5" = { @@ -9013,22 +8932,22 @@ let sha512 = "WJTJxLM+MRHNUxt1RTl4zD0HrLdH44F2mDzMweBj1yHL0kSt8I1WwoiF/wiGVSpnG48LZrBegCaOJeuVbJTbtw=="; }; }; - "apollo-server-caching-0.5.2" = { + "apollo-server-caching-0.5.3" = { name = "apollo-server-caching"; packageName = "apollo-server-caching"; - version = "0.5.2"; + version = "0.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-caching/-/apollo-server-caching-0.5.2.tgz"; - sha512 = "HUcP3TlgRsuGgeTOn8QMbkdx0hLPXyEJehZIPrcof0ATz7j7aTPA4at7gaiFHCo8gk07DaWYGB3PFgjboXRcWQ=="; + url = "https://registry.npmjs.org/apollo-server-caching/-/apollo-server-caching-0.5.3.tgz"; + sha512 = "iMi3087iphDAI0U2iSBE9qtx9kQoMMEWr6w+LwXruBD95ek9DWyj7OeC2U/ngLjRsXM43DoBDXlu7R+uMjahrQ=="; }; }; - "apollo-server-core-2.19.1" = { + "apollo-server-core-2.19.2" = { name = "apollo-server-core"; packageName = "apollo-server-core"; - version = "2.19.1"; + version = "2.19.2"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.19.1.tgz"; - sha512 = "5EVmcY8Ij7Ywwu+Ze4VaUhZBcxl8t5ztcSatJrKMd4HYlEHyaNGBV2itfpyqAthxfdMbGKqlpeCHmTGSqDcNpA=="; + url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.19.2.tgz"; + sha512 = "liLgLhTIGWZtdQbxuxo3/Yv8j+faKQcI60kOL+uwfByGhoKLZEQp5nqi2IdMK6JXt1VuyKwKu7lTzj02a9S3jA=="; }; }; "apollo-server-env-2.4.5" = { @@ -9040,6 +8959,15 @@ let sha512 = "nfNhmGPzbq3xCEWT8eRpoHXIPNcNy3QcEoBlzVMjeglrBGryLG2LXwBSPnVmTRRrzUYugX0ULBtgE3rBFNoUgA=="; }; }; + "apollo-server-env-3.0.0" = { + name = "apollo-server-env"; + packageName = "apollo-server-env"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-3.0.0.tgz"; + sha512 = "tPSN+VttnPsoQAl/SBVUpGbLA97MXG990XIwq6YUnJyAixrrsjW1xYG7RlaOqetxm80y5mBZKLrRDiiSsW/vog=="; + }; + }; "apollo-server-errors-2.4.2" = { name = "apollo-server-errors"; packageName = "apollo-server-errors"; @@ -9049,40 +8977,40 @@ let sha512 = "FeGxW3Batn6sUtX3OVVUm7o56EgjxDlmgpTLNyWcLb0j6P8mw9oLNyAm3B+deHA4KNdNHO5BmHS2g1SJYjqPCQ=="; }; }; - "apollo-server-express-2.19.1" = { + "apollo-server-express-2.19.2" = { name = "apollo-server-express"; packageName = "apollo-server-express"; - version = "2.19.1"; + version = "2.19.2"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.19.1.tgz"; - sha512 = "PJQmPtV3JD7RiV6cP7JcqAwVdUq6hWUtvDIoCOxPoeUWYf79nEF4WiYsPXVF0+meLLWKlL1fuSwEEt1CEHEG5w=="; + url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.19.2.tgz"; + sha512 = "1v2H6BgDkS4QzRbJ9djn2o0yv5m/filbpiupxAsCG9f+sAoSlY3eYSj84Sbex2r5+4itAvT9y84WI7d9RBYs/Q=="; }; }; - "apollo-server-plugin-base-0.10.3" = { + "apollo-server-plugin-base-0.10.4" = { name = "apollo-server-plugin-base"; packageName = "apollo-server-plugin-base"; - version = "0.10.3"; + version = "0.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.10.3.tgz"; - sha512 = "NCLOsk9Jsd8oLvefkQvROdMDQvnHnzbzz3MPCqEYjCOEv0YBM8T77D0wCwbcViDS2M5p0W6un2ub9s/vU71f7Q=="; + url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.10.4.tgz"; + sha512 = "HRhbyHgHFTLP0ImubQObYhSgpmVH4Rk1BinnceZmwudIVLKrqayIVOELdyext/QnSmmzg5W7vF3NLGBcVGMqDg=="; }; }; - "apollo-server-types-0.6.2" = { + "apollo-server-types-0.6.3" = { name = "apollo-server-types"; packageName = "apollo-server-types"; - version = "0.6.2"; + version = "0.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.6.2.tgz"; - sha512 = "LgSKgAStiDzpUSLYwJoAmy0W8nkxx/ExMmgEPgEYVi6dKPkUmtu561J970PhGdYH+D79ke3g87D+plkUkgfnlQ=="; + url = "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.6.3.tgz"; + sha512 = "aVR7SlSGGY41E1f11YYz5bvwA89uGmkVUtzMiklDhZ7IgRJhysT5Dflt5IuwDxp+NdQkIhVCErUXakopocFLAg=="; }; }; - "apollo-tracing-0.12.1" = { + "apollo-tracing-0.12.2" = { name = "apollo-tracing"; packageName = "apollo-tracing"; - version = "0.12.1"; + version = "0.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.12.1.tgz"; - sha512 = "qdkUjW+pOaidGOSITypeYE288y28HkPmGNpUtyQSOeTxgqXHtQX3TDWiOJ2SmrLH08xdSwfvz9o5KrTq4PdISg=="; + url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.12.2.tgz"; + sha512 = "SYN4o0C0wR1fyS3+P0FthyvsQVHFopdmN3IU64IaspR/RZScPxZ3Ae8uu++fTvkQflAkglnFM0aX6DkZERBp6w=="; }; }; "apollo-upload-client-11.0.0" = { @@ -9229,13 +9157,13 @@ let sha512 = "Tq3yV/T4wxBsD2Wign8W9VQKhaUxzzRmjEiSoOK0SLqPgDP/N1TKdYyBeIEu56T4I9iO4fKTTR0mN9NWkBA0sg=="; }; }; - "archiver-5.1.0" = { + "archiver-5.2.0" = { name = "archiver"; packageName = "archiver"; - version = "5.1.0"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/archiver/-/archiver-5.1.0.tgz"; - sha512 = "iKuQUP1nuKzBC2PFlGet5twENzCfyODmvkxwDV0cEFXavwcLrIW5ssTuHi9dyTPvpWr6Faweo2eQaQiLIwyXTA=="; + url = "https://registry.npmjs.org/archiver/-/archiver-5.2.0.tgz"; + sha512 = "QEAKlgQuAtUxKeZB9w5/ggKXh21bZS+dzzuQ0RPBC20qtDCbTyzqmisoeJP46MP39fg4B4IcyvR+yeyEBdblsQ=="; }; }; "archiver-utils-2.1.0" = { @@ -10174,13 +10102,13 @@ let sha512 = "zVWTmAnxxHaeB2B1te84oecI8zTDJ/8G49aVBblRX6be0oq6pAybNcUSxwfgVOmOjSCvN4aYZAqwtyNI8e1YGw=="; }; }; - "async-mutex-0.2.4" = { + "async-mutex-0.2.6" = { name = "async-mutex"; packageName = "async-mutex"; - version = "0.2.4"; + version = "0.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/async-mutex/-/async-mutex-0.2.4.tgz"; - sha512 = "fcQKOXUKMQc57JlmjBCHtkKNrfGpHyR7vu18RfuLfeTAf4hK9PgOadPR5cDrBQ682zasrLUhJFe7EKAHJOduDg=="; + url = "https://registry.npmjs.org/async-mutex/-/async-mutex-0.2.6.tgz"; + sha512 = "Hs4R+4SPgamu6rSGW8C7cV9gaWUKEHykfzCCvIRuaVv636Ju10ZdeUbvb4TBEW0INuq2DHZqXbK4Nd3yG4RaRw=="; }; }; "async-retry-1.3.1" = { @@ -10399,13 +10327,13 @@ let sha512 = "+KBkqH7t/XE91Fqn8eyJeNIWsnhSWL8bSUqFD7TfE3FN07MTlC0nprGYp+2WfcYNz5i8Bus1vY2DHNVhtTImnw=="; }; }; - "aws-sdk-2.821.0" = { + "aws-sdk-2.831.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.821.0"; + version = "2.831.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.821.0.tgz"; - sha512 = "UtUlURMzmns1Wq8uAdJcyKsm/nW7iRYgTQEONQIpud0xwtjpPPR1pBFB0RSNZuYnZxcWboo807+jxq+LjaBEKA=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.831.0.tgz"; + sha512 = "lrOjbGFpjk2xpESyUx2PGsTZgptCy5xycZazPeakNbFO19cOoxjHx3xyxOHsMCYb3pQwns35UvChQT60B4u6cw=="; }; }; "aws-sign2-0.6.0" = { @@ -10444,15 +10372,6 @@ let sha1 = "2d8e3e5d0bdbd7327f91bc814f5c57660f81824d"; }; }; - "axios-0.18.1" = { - name = "axios"; - packageName = "axios"; - version = "0.18.1"; - src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-0.18.1.tgz"; - sha512 = "0BfJq4NSfQXd+SkFdrvFbG7addhYSBA2mQwISr46pD6E5iqkWg02RAs8vyTT/j0RTnoYmeXauBuSv1qKwR179g=="; - }; - }; "axios-0.19.0" = { name = "axios"; packageName = "axios"; @@ -10471,6 +10390,15 @@ let sha512 = "fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA=="; }; }; + "axios-0.21.1" = { + name = "axios"; + packageName = "axios"; + version = "0.21.1"; + src = fetchurl { + url = "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz"; + sha512 = "dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA=="; + }; + }; "axios-retry-3.1.9" = { name = "axios-retry"; packageName = "axios-retry"; @@ -11155,15 +11083,6 @@ let sha1 = "1101e9544f4a76b1bc3b26d452ca96d7a35e7978"; }; }; - "base64-js-1.3.1" = { - name = "base64-js"; - packageName = "base64-js"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz"; - sha512 = "mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="; - }; - }; "base64-js-1.5.1" = { name = "base64-js"; packageName = "base64-js"; @@ -11317,13 +11236,13 @@ let sha1 = "9ab5627b93e60621ff7cdac5da9733027df1d0cb"; }; }; - "bcrypto-5.3.0" = { + "bcrypto-5.4.0" = { name = "bcrypto"; packageName = "bcrypto"; - version = "5.3.0"; + version = "5.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/bcrypto/-/bcrypto-5.3.0.tgz"; - sha512 = "SP48cpoc4BkEPNOErdsZ1VjbtdXY/C0f5wAywWniLne/Fd/5oOBqLbC6ZavngLvk4oik76g4I7PO5KduJoqECQ=="; + url = "https://registry.npmjs.org/bcrypto/-/bcrypto-5.4.0.tgz"; + sha512 = "KDX2CR29o6ZoqpQndcCxFZAtYA1jDMnXU3jmCfzP44g++Cu7AHHtZN/JbrN/MXAg9SLvtQ8XISG+eVD9zH1+Jg=="; }; }; "bcurl-0.1.9" = { @@ -11587,13 +11506,13 @@ let sha512 = "Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw=="; }; }; - "binary-extensions-2.1.0" = { + "binary-extensions-2.2.0" = { name = "binary-extensions"; packageName = "binary-extensions"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz"; - sha512 = "1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ=="; + url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz"; + sha512 = "jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA=="; }; }; "binary-search-1.3.6" = { @@ -11803,15 +11722,6 @@ let sha512 = "5LhLQeGxdVFumJTbveJS16Rc+Vzh/nbC6o80UMj6ZRvSkiVkk+4L782OMYI0VG1JTfUxiRFP4f+CZBFyuclLBg=="; }; }; - "bl-0.8.2" = { - name = "bl"; - packageName = "bl"; - version = "0.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-0.8.2.tgz"; - sha1 = "c9b6bca08d1bc2ea00fc8afb4f1a5fd1e1c66e4e"; - }; - }; "bl-1.2.3" = { name = "bl"; packageName = "bl"; @@ -11884,13 +11794,13 @@ let sha1 = "f962d687ec2c369570ae71af843256e6d0ca1129"; }; }; - "blessed-contrib-4.8.20" = { + "blessed-contrib-4.8.21" = { name = "blessed-contrib"; packageName = "blessed-contrib"; - version = "4.8.20"; + version = "4.8.21"; src = fetchurl { - url = "https://registry.npmjs.org/blessed-contrib/-/blessed-contrib-4.8.20.tgz"; - sha512 = "jLLXR9pjjm/T2jY0Q8OCCpuDquWiMULkPyT8YNaiLUR0j1MchTQK/Q7SiuD63jn9ekn9BrohwP1Kom/FylmeHQ=="; + url = "https://registry.npmjs.org/blessed-contrib/-/blessed-contrib-4.8.21.tgz"; + sha512 = "zdQMO3UyfhdG0S+Zqn7YexI6BHlnO26qxBKc9jzgyZdIoq7nELiGM/V89CvrTPblZGQr3eMUqCy7pxlKm3vCYA=="; }; }; "blgr-0.1.8" = { @@ -12073,13 +11983,13 @@ let sha1 = "e16661697452d436bf9886238cc791b08d66a61a"; }; }; - "bns-0.13.0" = { + "bns-0.14.0" = { name = "bns"; packageName = "bns"; - version = "0.13.0"; + version = "0.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/bns/-/bns-0.13.0.tgz"; - sha512 = "2aRg/m7+fvXsf+CpR30f0iXTgAFdf2UdhreZNhxbgMpVTo83rnlGhb6QuMznGIiqDxj6akDnONVg50M8wADoIw=="; + url = "https://registry.npmjs.org/bns/-/bns-0.14.0.tgz"; + sha512 = "lqxDpj9gX7OtihwAzMhlMk0w38ObZu+aRSF9fzG/wUfF6RfocFSFDGHA+KVbLNXudiTStzhWVGc8cJmcL4IHYw=="; }; }; "body-0.1.0" = { @@ -12190,13 +12100,13 @@ let sha1 = "4d67dc2602c0cc16dd9bce7ebf87e948290f5812"; }; }; - "bower-1.8.8" = { + "bower-1.8.12" = { name = "bower"; packageName = "bower"; - version = "1.8.8"; + version = "1.8.12"; src = fetchurl { - url = "https://registry.npmjs.org/bower/-/bower-1.8.8.tgz"; - sha512 = "1SrJnXnkP9soITHptSO+ahx3QKp3cVzn8poI6ujqc5SeOkg5iqM1pK9H+DSc2OQ8SnO0jC/NG4Ur/UIwy7574A=="; + url = "https://registry.npmjs.org/bower/-/bower-1.8.12.tgz"; + sha512 = "u1xy9SrwwoPlgjuHNjhV+YUPVdqyBj2ALBxuzeIUKXaPI2i2xypGgxqXkuHcITGdi5yBj5JuXgyMvgiWiS1S3Q=="; }; }; "bower-endpoint-parser-0.2.1" = { @@ -12262,6 +12172,15 @@ let sha512 = "eB4uT9RGzg2odpER62bBwSLvUeGC+WbRjjyyFhGsKnc8wp/m0+hQsMUvUe3H2V0D5vw0nBdO1hCJoZo5mKeuIQ=="; }; }; + "boxen-5.0.0" = { + name = "boxen"; + packageName = "boxen"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/boxen/-/boxen-5.0.0.tgz"; + sha512 = "5bvsqw+hhgUi3oYGK0Vf4WpIkyemp60WBInn7+WNfoISzAqk/HX4L7WNROq38E6UR/y3YADpv6pEm4BfkeEAdA=="; + }; + }; "bplist-creator-0.0.6" = { name = "bplist-creator"; packageName = "bplist-creator"; @@ -12478,15 +12397,6 @@ let sha512 = "BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A=="; }; }; - "browserify-fs-1.0.0" = { - name = "browserify-fs"; - packageName = "browserify-fs"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/browserify-fs/-/browserify-fs-1.0.0.tgz"; - sha1 = "f075aa8a729d4d1716d066620e386fcc1311a96f"; - }; - }; "browserify-incremental-3.1.1" = { name = "browserify-incremental"; packageName = "browserify-incremental"; @@ -12559,13 +12469,13 @@ let sha512 = "HI4lPveGKUR0x2StIz+2FXfDk9SfVMrxn6PLh1JeGUwcuoDkdKZebWiyLRJ68iIPDpMI4JLVDf7S7XzslgWOhw=="; }; }; - "browserslist-4.16.0" = { + "browserslist-4.16.1" = { name = "browserslist"; packageName = "browserslist"; - version = "4.16.0"; + version = "4.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.16.0.tgz"; - sha512 = "/j6k8R0p3nxOC6kx5JGAxsnhc9ixaWJfYc+TNTzxg6+ARaESAvQGV7h0uNOB4t+pLQJZWzcrMxXOxjgsCj3dqQ=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.16.1.tgz"; + sha512 = "UXhDrwqsNcpTYJBTZsbGATDxZbiVDsx6UjpmRUmtnP10pr8wAYr5LgFoEFw9ixriQH2mv/NX2SfGzE/o8GndLA=="; }; }; "brq-0.1.8" = { @@ -13045,6 +12955,15 @@ let sha512 = "LlahJUxXzZLuw/hetUQJmRgZ1LF6+cr5TPpRj6jf327AsiIq2jhYEH4oqUUkVKTor+9w2BT3oxVwhzE5lw9tcg=="; }; }; + "bunyan-1.8.15" = { + name = "bunyan"; + packageName = "bunyan"; + version = "1.8.15"; + src = fetchurl { + url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.15.tgz"; + sha512 = "0tECWShh6wUysgucJcBAoYegf3JJoZWibxdqhTm7OHPeT42qdjkZ29QCMcKwbgU1kiH+auSIasNRXMLWXafXig=="; + }; + }; "bunyan-syslog-udp-0.2.0" = { name = "bunyan-syslog-udp"; packageName = "bunyan-syslog-udp"; @@ -13279,13 +13198,13 @@ let sha512 = "A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw=="; }; }; - "call-bind-1.0.0" = { + "call-bind-1.0.2" = { name = "call-bind"; packageName = "call-bind"; - version = "1.0.0"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.0.tgz"; - sha512 = "AEXsYIyyDY3MCzbwdhzG3Jx1R0J2wetQyUynn6dYHAO+bg8l1k7jwZtRv4ryryFs7EP+NDlikJlVe59jr0cM2w=="; + url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz"; + sha512 = "7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA=="; }; }; "call-me-maybe-1.0.1" = { @@ -13513,13 +13432,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001173" = { + "caniuse-lite-1.0.30001180" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001173"; + version = "1.0.30001180"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001173.tgz"; - sha512 = "R3aqmjrICdGCTAnSXtNyvWYMK3YtV5jwudbq0T7nN9k4kmE4CBuwPqyJ+KBzepSTh0huivV2gLbSMEzTTmfeYw=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001180.tgz"; + sha512 = "n8JVqXuZMVSPKiPiypjFtDTXc4jWIdjxull0f92WLo7e1MSi3uJ3NvveakSh/aCl1QKFAvIz3vIj0v+0K+FrXw=="; }; }; "canvas-2.6.1" = { @@ -13639,22 +13558,22 @@ let sha512 = "vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg=="; }; }; - "cdk8s-1.0.0-beta.5" = { + "cdk8s-1.0.0-beta.6" = { name = "cdk8s"; packageName = "cdk8s"; - version = "1.0.0-beta.5"; + version = "1.0.0-beta.6"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.0.0-beta.5.tgz"; - sha512 = "E4l89rGnMI+OCdVojw0vV9xjkNgk9qMswkWc10hZLwwozhnx3ITMVgyjlRiZnCBIKMnKYY8ZhyMgEGgSVpR5fw=="; + url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.0.0-beta.6.tgz"; + sha512 = "L/J8c7/wSEY2POx5j9SnxxgEJ7V7mFYS3F9pGj2idUfj4GCHbMLCGXQ8bAPzaiWOFSEDVMOPBOangLEia+5RBw=="; }; }; - "cdktf-0.0.19" = { + "cdktf-0.1.0" = { name = "cdktf"; packageName = "cdktf"; - version = "0.0.19"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/cdktf/-/cdktf-0.0.19.tgz"; - sha512 = "fBOl+yqMdMNRGNvLwAxOpE38PxHJG5Tdi/3J/Ag+KJwaDEXa/v5+ogwPxNtZ0dUdvZq2ovti9zbhdIPr59BvYQ=="; + url = "https://registry.npmjs.org/cdktf/-/cdktf-0.1.0.tgz"; + sha512 = "6PKMz7dkou3qrHD+rnj7fa8U+XujkRUVHsWcVaH7faCxBCIGSxUz0TFb8KeY//o0MHg285Agt1NTCgFIpJ7Clg=="; }; }; "center-align-0.1.3" = { @@ -14080,6 +13999,15 @@ let sha512 = "DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ=="; }; }; + "chokidar-3.5.1" = { + name = "chokidar"; + packageName = "chokidar"; + version = "3.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz"; + sha512 = "9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw=="; + }; + }; "chownr-0.0.2" = { name = "chownr"; packageName = "chownr"; @@ -14773,15 +14701,6 @@ let sha1 = "b8d19188b3243e390f302410bd0cb1622db82649"; }; }; - "clone-0.1.19" = { - name = "clone"; - packageName = "clone"; - version = "0.1.19"; - src = fetchurl { - url = "https://registry.npmjs.org/clone/-/clone-0.1.19.tgz"; - sha1 = "613fb68639b26a494ac53253e15b1a6bd88ada85"; - }; - }; "clone-0.1.5" = { name = "clone"; packageName = "clone"; @@ -15070,13 +14989,13 @@ let sha512 = "3WQV/Fpa77nvzjUlc+0u53uIroJyyMB2Qwl++aXpAiDIsrsiAQq4uCURwdRBRX+eLkOTIAmT0L4qna3T7+2pUg=="; }; }; - "codemaker-1.16.0" = { + "codemaker-1.17.1" = { name = "codemaker"; packageName = "codemaker"; - version = "1.16.0"; + version = "1.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/codemaker/-/codemaker-1.16.0.tgz"; - sha512 = "kC53r6ACRGYcSAKeOcbcUhWZYWynIuBIQ50oLOYUygShjrqF0NO303eSvOzT0Qxaz2TQWI2deUwJBMm3s8HoZg=="; + url = "https://registry.npmjs.org/codemaker/-/codemaker-1.17.1.tgz"; + sha512 = "V0oeZjQ0nZgpFErZPn66sVCHwrDvivS+M0xR1gesBNGDpE4ROja6IJXbPVVg/N3S4kYHAXcYuWHdfiEQE2PfwA=="; }; }; "codepage-1.4.0" = { @@ -15592,6 +15511,15 @@ let sha512 = "U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA=="; }; }; + "commander-7.0.0" = { + name = "commander"; + packageName = "commander"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-7.0.0.tgz"; + sha512 = "ovx/7NkTrnPuIV8sqk/GjUIIM1+iUQeqA3ye2VNpq9sVoiZsooObWlQy+OPWGI17GDaEoybuAGJm6U8yC077BA=="; + }; + }; "commandpost-1.4.0" = { name = "commandpost"; packageName = "commandpost"; @@ -16096,13 +16024,13 @@ let sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; }; }; - "constructs-3.2.94" = { + "constructs-3.2.117" = { name = "constructs"; packageName = "constructs"; - version = "3.2.94"; + version = "3.2.117"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-3.2.94.tgz"; - sha512 = "yK4FKT+hONiC0ebCM0Ln3xuLPF4WPyZSQ8Sl/ZOTTFUI+/csBBxGy7TkY2ZVTbOi7MCHUatZgW2ANsYRaaxoOQ=="; + url = "https://registry.npmjs.org/constructs/-/constructs-3.2.117.tgz"; + sha512 = "zYDlALAHWdopUzMGr3aZPlPR8f+OEYr1+QZCkLqi/eyUjbOmlPQ6xwrlDoOaJNgpMf727T9Yo+hokCjIRsZweQ=="; }; }; "consume-http-header-1.0.0" = { @@ -16583,22 +16511,22 @@ let sha512 = "vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA=="; }; }; - "core-js-3.8.2" = { + "core-js-3.8.3" = { name = "core-js"; packageName = "core-js"; - version = "3.8.2"; + version = "3.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.8.2.tgz"; - sha512 = "FfApuSRgrR6G5s58casCBd9M2k+4ikuu4wbW6pJyYU7bd9zvFc9qf7vr5xmrZOhT9nn+8uwlH1oRR9jTnFoA3A=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.8.3.tgz"; + sha512 = "KPYXeVZYemC2TkNEkX/01I+7yd+nX3KddKwZ1Ww7SKWdI2wQprSgLmrTddT8nw92AjEklTsPBoSdQBhbI1bQ6Q=="; }; }; - "core-js-compat-3.8.2" = { + "core-js-compat-3.8.3" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.8.2"; + version = "3.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.8.2.tgz"; - sha512 = "LO8uL9lOIyRRrQmZxHZFl1RV+ZbcsAkFWTktn5SmH40WgLtSNYN4m4W2v9ONT147PxBY/XrRhrWq8TlvObyUjQ=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.8.3.tgz"; + sha512 = "1sCb0wBXnBIL16pfFG1Gkvei6UzvKyTNYpiC41yrdjEv0UoJoq9E/abTMzyYJ6JpTkAj15dLjbqifIzEBDVvog=="; }; }; "core-util-is-1.0.2" = { @@ -16817,13 +16745,13 @@ let sha512 = "MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg=="; }; }; - "create-torrent-4.4.2" = { + "create-torrent-4.4.3" = { name = "create-torrent"; packageName = "create-torrent"; - version = "4.4.2"; + version = "4.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/create-torrent/-/create-torrent-4.4.2.tgz"; - sha512 = "FRxgYty6AF00xrYKMtpQ14ZJlst+i7mmUhcN4do7TTjktEntqAzfriaOIV6xk27t9GLTtraFnaTxsGgnyFA2eA=="; + url = "https://registry.npmjs.org/create-torrent/-/create-torrent-4.4.3.tgz"; + sha512 = "balXwhJEpD8F0rt1vNKJuxhYPWOHo82LVm50wRzUFVzZ8APciwtZntzIzDEX6dNnD4NoLL0AeYgosF7e+FVQBA=="; }; }; "cron-1.7.2" = { @@ -17546,13 +17474,13 @@ let sha512 = "KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw=="; }; }; - "d3-array-2.9.1" = { + "d3-array-2.11.0" = { name = "d3-array"; packageName = "d3-array"; - version = "2.9.1"; + version = "2.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/d3-array/-/d3-array-2.9.1.tgz"; - sha512 = "Ob7RdOtkqsjx1NWyQHMFLtCSk6/aKTxDdC4ZIolX+O+mDD2RzrsYgAyc0WGAlfYFVELLSilS7w8BtE3PKM8bHg=="; + url = "https://registry.npmjs.org/d3-array/-/d3-array-2.11.0.tgz"; + sha512 = "26clcwmHQEdsLv34oNKq5Ia9tQ26Y/4HqS3dQzF42QBUqymZJ+9PORcN1G52bt37NsL2ABoX4lvyYZc+A9Y0zw=="; }; }; "d3-axis-1.0.12" = { @@ -18275,13 +18203,13 @@ let sha512 = "jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q=="; }; }; - "dayjs-1.10.1" = { + "dayjs-1.10.4" = { name = "dayjs"; packageName = "dayjs"; - version = "1.10.1"; + version = "1.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/dayjs/-/dayjs-1.10.1.tgz"; - sha512 = "2xg7JrHQeLBQFkvTumLoy62x1siyeocc98QwjtURgvRqOPYmAkMUdmSjrOA+MlmL6QMQn5MUhDf6rNZNuPc1LQ=="; + url = "https://registry.npmjs.org/dayjs/-/dayjs-1.10.4.tgz"; + sha512 = "RI/Hh4kqRc1UKLOAf/T5zdMMX5DQIlDxwUe3wSyMMnEbGunnpENCdbUgM+dW7kXidZqCttBrmw7BhN4TMddkCw=="; }; }; "dayjs-1.8.36" = { @@ -18896,15 +18824,6 @@ let sha512 = "8eluCl/Blx4YOGwMapBvXRKxHXhA8ejDXYzEaK8+/gtcm8hRMhSLmXSqDmNUKNc/C8HNSmuyyp/hflhqDAvK2A=="; }; }; - "deferred-leveldown-0.2.0" = { - name = "deferred-leveldown"; - packageName = "deferred-leveldown"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-0.2.0.tgz"; - sha1 = "2cef1f111e1c57870d8bbb8af2650e587cd2f5b4"; - }; - }; "deferred-leveldown-5.3.0" = { name = "deferred-leveldown"; packageName = "deferred-leveldown"; @@ -19076,15 +18995,6 @@ let sha1 = "3a36287f5034e699e7577901052c2e6c94251631"; }; }; - "denque-1.4.1" = { - name = "denque"; - packageName = "denque"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/denque/-/denque-1.4.1.tgz"; - sha512 = "OfzPuSZKGcgr96rf1oODnfjqBFmr1DVoc/TrItj3Ohe0Ah1C5WX5Baquw/9U9KovnQ88EqmJbD66rKYUQYN1tQ=="; - }; - }; "denque-1.5.0" = { name = "denque"; packageName = "denque"; @@ -19778,22 +19688,22 @@ let sha512 = "qKftHMVoMliYBaYLkgttm+NXhRISVNkIMfAL4ecmXjiWRElfdfY+xNgITiehG0LpUEDbFUa/UDCByYq/2UZIpQ=="; }; }; - "dockerfile-language-service-0.1.1" = { + "dockerfile-language-service-0.2.0" = { name = "dockerfile-language-service"; packageName = "dockerfile-language-service"; - version = "0.1.1"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-language-service/-/dockerfile-language-service-0.1.1.tgz"; - sha512 = "Lw4QlxJoy9F1559wxX+0xe5iSNK95Fbzx/YhdmAzfwgbPvdPzvFouIuuMyMPj/Q5JyFH1QAr7VeagOe24w0cqg=="; + url = "https://registry.npmjs.org/dockerfile-language-service/-/dockerfile-language-service-0.2.0.tgz"; + sha512 = "Y1JYIDF8F78kNDwyoQoeAPzptJRubIaMJ5q4mATmeDViGVV+mY4m6BjHqw5XtlkHEftljgqMNDvbUORUDIzTHg=="; }; }; - "dockerfile-utils-0.1.1" = { + "dockerfile-utils-0.2.0" = { name = "dockerfile-utils"; packageName = "dockerfile-utils"; - version = "0.1.1"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-utils/-/dockerfile-utils-0.1.1.tgz"; - sha512 = "ddAA8PCAcT4pBQ1AFRnPjetJ31/7BqNKLHQkZebNE0hBAiOr8SzrnIWvJUcBDHrVbASCVl1Ye37hbaTsUmYHsw=="; + url = "https://registry.npmjs.org/dockerfile-utils/-/dockerfile-utils-0.2.0.tgz"; + sha512 = "B8tEGwLd3w0dWALshXS0gkAwDYdqFKAKm9zIyp/nCFkx8+BOhbz5CiAFlVU+WRvv6kd6AP/YtYVOzSL54MJlmQ=="; }; }; "doctrine-2.1.0" = { @@ -20498,13 +20408,13 @@ let sha512 = "dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w=="; }; }; - "electron-to-chromium-1.3.634" = { + "electron-to-chromium-1.3.645" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.634"; + version = "1.3.645"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.634.tgz"; - sha512 = "QPrWNYeE/A0xRvl/QP3E0nkaEvYUvH3gM04ZWYtIa6QlSpEetRlRI1xvQ7hiMIySHHEV+mwDSX8Kj4YZY6ZQAw=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.645.tgz"; + sha512 = "T7mYop3aDpRHIQaUYcmzmh6j9MAe560n6ukqjJMbVC6bVTau7dSpvB18bcsBPPtOSe10cKxhJFtlbEzLa0LL1g=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -20842,6 +20752,15 @@ let sha512 = "rf7HAVZpcRrcKEKddgIzYUnwg0g5HE1RvJaTLwkcfJmce4g+po8aMuE6vxzp6JwlK8FEq/vi0KWN6tA585DjaA=="; }; }; + "engine.io-4.1.0" = { + name = "engine.io"; + packageName = "engine.io"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io/-/engine.io-4.1.0.tgz"; + sha512 = "vW7EAtn0HDQ4MtT5QbmCHF17TaYLONv2/JwdYsq9USPRZVM4zG7WB3k0Nc321z8EuSOlhGokrYlYx4176QhD0A=="; + }; + }; "engine.io-client-1.3.1" = { name = "engine.io-client"; packageName = "engine.io-client"; @@ -20905,22 +20824,22 @@ let sha1 = "a115c32504b6302e85a76269d7a57ccdd962e359"; }; }; - "enhanced-resolve-4.3.0" = { + "enhanced-resolve-4.5.0" = { name = "enhanced-resolve"; packageName = "enhanced-resolve"; - version = "4.3.0"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz"; - sha512 = "3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ=="; + url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz"; + sha512 = "Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg=="; }; }; - "enhanced-resolve-5.4.1" = { + "enhanced-resolve-5.7.0" = { name = "enhanced-resolve"; packageName = "enhanced-resolve"; - version = "5.4.1"; + version = "5.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.4.1.tgz"; - sha512 = "4GbyIMzYktTFoRSmkbgZ1LU+RXwf4AQ8Z+rSuuh1dC8plp0PPeaWvx6+G4hh4KnUJ48VoxKbNyA1QQQIUpXjYA=="; + url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.7.0.tgz"; + sha512 = "6njwt/NsZFUKhM6j9U8hzVyD4E4r0x7NQzhTCbcWOJ0IQjNSAoalWmb0AE51Wn+fwan5qVESWi7t2ToBxs9vrw=="; }; }; "enquirer-2.3.6" = { @@ -20986,6 +20905,15 @@ let sha512 = "hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w=="; }; }; + "entities-2.2.0" = { + name = "entities"; + packageName = "entities"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz"; + sha512 = "p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="; + }; + }; "entity-decode-2.0.2" = { name = "entity-decode"; packageName = "entity-decode"; @@ -21166,22 +21094,31 @@ let sha512 = "VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g=="; }; }; - "es-abstract-1.18.0-next.1" = { + "es-abstract-1.18.0-next.2" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.18.0-next.1"; + version = "1.18.0-next.2"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz"; - sha512 = "I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.2.tgz"; + sha512 = "Ih4ZMFHEtZupnUh6497zEL4y2+w8+1ljnCyaTa+adcoafI1GOvMwFlDjBLfWR7y9VLfrjRJe9ocuHY1PSR9jjw=="; }; }; - "es-get-iterator-1.1.1" = { + "es-get-iterator-1.1.2" = { name = "es-get-iterator"; packageName = "es-get-iterator"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.1.tgz"; - sha512 = "qorBw8Y7B15DVLaJWy6WdEV/ZkieBcu6QCq/xzWzGOKJqgG1j754vXRfZ3NY7HSShneqU43mPB4OkQBTkvHhFw=="; + url = "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.2.tgz"; + sha512 = "+DTO8GYwbMCwbywjimwZMHp8AuYXOS2JZFWoi2AlPOS3ebnII9w/NLpNZtA7A0YLaVDw+O7KFCeoIV7OPvM7hQ=="; + }; + }; + "es-module-lexer-0.3.26" = { + name = "es-module-lexer"; + packageName = "es-module-lexer"; + version = "0.3.26"; + src = fetchurl { + url = "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.3.26.tgz"; + sha512 = "Va0Q/xqtrss45hWzP8CZJwzGSZJjDM5/MJRE3IXXnUCcVLElR9BRaE9F62BopysASyc4nM3uwhSW7FFB9nlWAA=="; }; }; "es-to-primitive-1.2.1" = { @@ -21526,13 +21463,13 @@ let sha512 = "5YubdnPXrlrYAFCKybPuHIAH++PINe1pmKNc5wQRB9HSbqIK1ywAnntE3Wwua4giKu0bjligf1gLF6qxMGOYRA=="; }; }; - "eslint-7.17.0" = { + "eslint-7.18.0" = { name = "eslint"; packageName = "eslint"; - version = "7.17.0"; + version = "7.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.17.0.tgz"; - sha512 = "zJk08MiBgwuGoxes5sSQhOtibZ75pz0J35XTRlZOk9xMffhpA9BTbQZxoXZzOl5zMbleShbGwtw+1kGferfFwQ=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.18.0.tgz"; + sha512 = "fbgTiE8BfUJZuBeq2Yi7J3RB3WGUQ9PNuNbmgi6jt9Iv8qrkxfy19Ds3OpL1Pm7zg3BtTVhvcUZbIRQ0wmSjAQ=="; }; }; "eslint-plugin-no-unsanitized-3.1.4" = { @@ -21562,13 +21499,13 @@ let sha512 = "Nhc+oVAHm0uz/PkJAWscwIT4ijTrK5fqNqz9QB1D35SbbuMG1uB6Yr5AJpvPSWg+WOw7nYNswerYh0kOk64gqQ=="; }; }; - "eslint-plugin-vue-7.4.1" = { + "eslint-plugin-vue-7.5.0" = { name = "eslint-plugin-vue"; packageName = "eslint-plugin-vue"; - version = "7.4.1"; + version = "7.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.4.1.tgz"; - sha512 = "W/xPNHYIkGJphLUM2UIYYGKbRw3BcDoMIPY9lu1TTa2YLiZoxurddfnmOP+UOVywxb5vi438ejzwvKdZqydtIw=="; + url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.5.0.tgz"; + sha512 = "QnMMTcyV8PLxBz7QQNAwISSEs6LYk2LJvGlxalXvpCtfKnqo7qcY0aZTIxPe8QOnHd7WCwiMZLOJzg6A03T0Gw=="; }; }; "eslint-scope-3.7.3" = { @@ -22399,13 +22336,13 @@ let sha1 = "a793d3ac0cad4c6ab571e9968fbbab6cb2532929"; }; }; - "expo-pwa-0.0.58" = { + "expo-pwa-0.0.62" = { name = "expo-pwa"; packageName = "expo-pwa"; - version = "0.0.58"; + version = "0.0.62"; src = fetchurl { - url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.58.tgz"; - sha512 = "dbPKRQyr5vtpa8/fmBoRzNs1SYkTWosXvcJJhIfGVGvb8ZMPduruydczM+lavBjZmufdlOL4e8CWNXcr4NRz9g=="; + url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.62.tgz"; + sha512 = "pEhMcGp1Z89R6P+Pio+ivoplqDTaL37k7QL2yW0GE0EaRHWNgNynX5CIxGREvW3nSn23nVsGo7IL+QW2LwAMAg=="; }; }; "express-2.5.11" = { @@ -22498,13 +22435,13 @@ let sha512 = "64YwTWpxgVGnwoLi4zvKaQ5RWIV0dkxVE4GGkBF7D89RI0/I6gTRUDL25Il4AK3cUqyLtxnX2X5BZ2YRvRx5uQ=="; }; }; - "express-openapi-7.2.0" = { + "express-openapi-7.2.3" = { name = "express-openapi"; packageName = "express-openapi"; - version = "7.2.0"; + version = "7.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/express-openapi/-/express-openapi-7.2.0.tgz"; - sha512 = "Zlz1qA5DA5vRj8UrWFNH5cA1js5g0VB5yRIR1cuxPGAclsU8q7Y6Dvx/BhQ10/OGYd8qwFk4mFvDYahSEQe7gw=="; + url = "https://registry.npmjs.org/express-openapi/-/express-openapi-7.2.3.tgz"; + sha512 = "j79aEXtTKJ6yp5XM+YPGn14GOaODGovDbvuCJzrG0KbaIB2v0liq9ezpvufqsb5ixXZ3jsu+B2FuJJOvUUjW2Q=="; }; }; "express-session-1.17.1" = { @@ -22534,6 +22471,15 @@ let sha1 = "f5fc2f9fa9e9a8578634f10e86ba5a4346b96f4f"; }; }; + "express-ws-2.0.0" = { + name = "express-ws"; + packageName = "express-ws"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/express-ws/-/express-ws-2.0.0.tgz"; + sha1 = "96d13fa41c8de8fa5dcbfa2dacace6f594272888"; + }; + }; "ext-1.4.0" = { name = "ext"; packageName = "ext"; @@ -22885,13 +22831,13 @@ let sha512 = "g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw=="; }; }; - "fast-glob-3.2.4" = { + "fast-glob-3.2.5" = { name = "fast-glob"; packageName = "fast-glob"; - version = "3.2.4"; + version = "3.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.4.tgz"; - sha512 = "kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ=="; + url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz"; + sha512 = "2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg=="; }; }; "fast-json-parse-1.0.3" = { @@ -23786,13 +23732,13 @@ let sha512 = "r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA=="; }; }; - "flatted-3.1.0" = { + "flatted-3.1.1" = { name = "flatted"; packageName = "flatted"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/flatted/-/flatted-3.1.0.tgz"; - sha512 = "tW+UkmtNg/jv9CSofAKvgVcO7c2URjhTdW1ZTkcAritblu8tajiYy7YisnIflEwtKssCtOxpnBRoCB7iap0/TA=="; + url = "https://registry.npmjs.org/flatted/-/flatted-3.1.1.tgz"; + sha512 = "zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA=="; }; }; "flatten-0.0.1" = { @@ -23822,13 +23768,13 @@ let sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg=="; }; }; - "flow-parser-0.141.0" = { + "flow-parser-0.143.1" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.141.0"; + version = "0.143.1"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.141.0.tgz"; - sha512 = "WKdBiR9sDfkgEyPGhIgldUrVM08D57CgHLgd0FOXbhcVYXNfw+eHSApQ8SdcdQQoqrOvhlcVRB8lsn9bD5GQOw=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.143.1.tgz"; + sha512 = "DWmnt0P1tieuQErYeWmxCNIkzm5Fqd5sMH685v/jCtu8CAvdLEwKi45jqYhij178k+NAy+FNe2jDvQNs7WLBIA=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -23930,13 +23876,13 @@ let sha512 = "uPTT5I26ePMc6Xhjebu1aiaHAd7P3EqyE9SZB6B9ZIvXtMXhFYNk7iO1yzh1ZXp3aYzdYmrI9k8mSz9urZ9gNQ=="; }; }; - "flumeview-reduce-1.3.17" = { + "flumeview-reduce-1.4.0" = { name = "flumeview-reduce"; packageName = "flumeview-reduce"; - version = "1.3.17"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/flumeview-reduce/-/flumeview-reduce-1.3.17.tgz"; - sha512 = "Li09TntlRpN51GtFKllIh5nDdBcyDazvi5a/yvbdUCS9xAFb8OA6H6uu32W9gG+4GyvfUi9AsOyN8RQ8OcREQA=="; + url = "https://registry.npmjs.org/flumeview-reduce/-/flumeview-reduce-1.4.0.tgz"; + sha512 = "ShCMtY5YZl3icnUAWTfwzRXSGN1AUo4Isj1wTRLpMMNgM9p1T0gc6N+r1ajampf1GO19SkqrgZHdPPOaEitvhg=="; }; }; "flush-write-stream-1.1.1" = { @@ -23993,13 +23939,13 @@ let sha512 = "VjAQdSLsl6AkpZNyrQJfO7BXLo4chnStqb055bumZMbRUPpVuPN3a4ktsnRCmrFZjtMlYLkyXiR5rAs4WOpC4Q=="; }; }; - "follow-redirects-1.13.1" = { + "follow-redirects-1.13.2" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.13.1"; + version = "1.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.1.tgz"; - sha512 = "SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg=="; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.2.tgz"; + sha512 = "6mPTgLxYm3r6Bkkg0vNM0HTjfGrOEtsfbhagQvbxDEsEkpNhw582upBaoRZylzen6krEmxXJgt9Ju6HiI4O7BA=="; }; }; "follow-redirects-1.5.10" = { @@ -24506,6 +24452,15 @@ let sha512 = "h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ=="; }; }; + "fs-extra-9.1.0" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "9.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz"; + sha512 = "hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ=="; + }; + }; "fs-minipass-1.2.7" = { name = "fs-minipass"; packageName = "fs-minipass"; @@ -24713,13 +24668,13 @@ let sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; }; }; - "fuse.js-6.4.5" = { + "fuse.js-6.4.6" = { name = "fuse.js"; packageName = "fuse.js"; - version = "6.4.5"; + version = "6.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/fuse.js/-/fuse.js-6.4.5.tgz"; - sha512 = "AIHjOhexWVqs/jWqun6jTUfdXB3Bm1uShoirHvTZImD2kHEQZ1zOmoDEqIPs8N1LnnwXJeG0T+r9ilEeJzlaoA=="; + url = "https://registry.npmjs.org/fuse.js/-/fuse.js-6.4.6.tgz"; + sha512 = "/gYxR/0VpXmWSfZOIPS3rWwU8SHgsRTwWuXhyb2O6s7aRuVtHtxCkR33bNYu3wyLyNx/Wpv0vU7FZy8Vj53VNw=="; }; }; "fuzzy-0.1.3" = { @@ -24749,15 +24704,6 @@ let sha1 = "979e22f9451b4b38f051f7937c919dbacc692958"; }; }; - "fwd-stream-1.0.4" = { - name = "fwd-stream"; - packageName = "fwd-stream"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/fwd-stream/-/fwd-stream-1.0.4.tgz"; - sha1 = "ed281cabed46feecf921ee32dc4c50b372ac7cfa"; - }; - }; "fx-runner-1.0.13" = { name = "fx-runner"; packageName = "fx-runner"; @@ -24893,13 +24839,13 @@ let sha512 = "3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="; }; }; - "geoip-country-4.0.49" = { + "geoip-country-4.0.53" = { name = "geoip-country"; packageName = "geoip-country"; - version = "4.0.49"; + version = "4.0.53"; src = fetchurl { - url = "https://registry.npmjs.org/geoip-country/-/geoip-country-4.0.49.tgz"; - sha512 = "oeiRP6aiDBplorW2tl0Rm2k6iNlqrLI9Smn9lk4yBUSsMOqeUHqI7gXBKP59iMZqWq2emclX1IfJL665FX7btQ=="; + url = "https://registry.npmjs.org/geoip-country/-/geoip-country-4.0.53.tgz"; + sha512 = "nfSIkLmt432isig80keqzkWo0N87CE1Ezv+T0SIFx6z7DNSRenKQn+v4EHts3RguJ0x/hg9skTOjaTLeqGyrfw=="; }; }; "get-amd-module-type-3.0.0" = { @@ -24956,13 +24902,13 @@ let sha1 = "ead774abee72e20409433a066366023dd6887a41"; }; }; - "get-intrinsic-1.0.2" = { + "get-intrinsic-1.1.0" = { name = "get-intrinsic"; packageName = "get-intrinsic"; - version = "1.0.2"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.2.tgz"; - sha512 = "aeX0vrFm21ILl3+JpFFRNe9aUvp6VFZb2/CTbgLb8j75kOhvoNYjt9d8KA/tJG4gSo8nzEDedRl0h7vDmBYRVg=="; + url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.0.tgz"; + sha512 = "M11rgtQp5GZMZzDL7jLTNxbDfurpzuau5uqRWDPvlHjfvg3TdScAZo96GLvhMjImrmR8uAt0FS2RLoMrfWGKlg=="; }; }; "get-own-enumerable-property-symbols-3.0.2" = { @@ -25343,22 +25289,22 @@ let sha512 = "kbuvus1dWQB2sSW4cbfTeGpCMd8ge9jx9RKnhXhuJ7tnvT+NIrTVfYZxjtflZddQYcmdOTlkAcjmx7bor+15AQ=="; }; }; - "git-url-parse-11.4.0" = { + "git-url-parse-11.4.3" = { name = "git-url-parse"; packageName = "git-url-parse"; - version = "11.4.0"; + version = "11.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/git-url-parse/-/git-url-parse-11.4.0.tgz"; - sha512 = "KlIa5jvMYLjXMQXkqpFzobsyD/V2K5DRHl5OAf+6oDFPlPLxrGDVQlIdI63c4/Kt6kai4kALENSALlzTGST3GQ=="; + url = "https://registry.npmjs.org/git-url-parse/-/git-url-parse-11.4.3.tgz"; + sha512 = "LZTTk0nqJnKN48YRtOpR8H5SEfp1oM2tls90NuZmBxN95PnCvmuXGzqQ4QmVirBgKx2KPYfPGteX3/raWjKenQ=="; }; }; - "git-url-parse-11.4.3" = { + "git-url-parse-11.4.4" = { name = "git-url-parse"; packageName = "git-url-parse"; - version = "11.4.3"; + version = "11.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/git-url-parse/-/git-url-parse-11.4.3.tgz"; - sha512 = "LZTTk0nqJnKN48YRtOpR8H5SEfp1oM2tls90NuZmBxN95PnCvmuXGzqQ4QmVirBgKx2KPYfPGteX3/raWjKenQ=="; + url = "https://registry.npmjs.org/git-url-parse/-/git-url-parse-11.4.4.tgz"; + sha512 = "Y4o9o7vQngQDIU9IjyCmRJBin5iYjI5u9ZITnddRZpD7dcCFQj2sL2XuMNbLRE4b4B/4ENPsp2Q8P44fjAZ0Pw=="; }; }; "gitconfiglocal-1.0.0" = { @@ -25776,6 +25722,15 @@ let sha512 = "iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ=="; }; }; + "globby-11.0.2" = { + name = "globby"; + packageName = "globby"; + version = "11.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/globby/-/globby-11.0.2.tgz"; + sha512 = "2ZThXDvvV8fYFRVIxnrMQBipZQDr7MxKAmQK1vujaj9/7eF0efG7BPUKJ7jP7G5SLF37xKDXvO4S/KKLj/Z0og=="; + }; + }; "globby-4.1.0" = { name = "globby"; packageName = "globby"; @@ -25884,13 +25839,13 @@ let sha1 = "d53b30cdf9313dffb7dc9a0d477096aa6d145c50"; }; }; - "google-auth-library-6.1.3" = { + "google-auth-library-6.1.6" = { name = "google-auth-library"; packageName = "google-auth-library"; - version = "6.1.3"; + version = "6.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-6.1.3.tgz"; - sha512 = "m9mwvY3GWbr7ZYEbl61isWmk+fvTmOt0YNUfPOUY2VH8K5pZlAIWJjxEi0PqR3OjMretyiQLI6GURMrPSwHQ2g=="; + url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-6.1.6.tgz"; + sha512 = "Q+ZjUEvLQj/lrVHF/IQwRo6p3s8Nc44Zk/DALsN+ac3T4HY/g/3rrufkgtl+nZ1TW7DNAw5cTChdVp4apUXVgQ=="; }; }; "google-closure-compiler-js-20170910.0.1" = { @@ -25902,13 +25857,13 @@ let sha512 = "Vric7QFWxzHFxITZ10bmlG1H/5rhODb7hJuWyKWMD8GflpQzRmbMVqkFp3fKvN+U9tPwZItGVhkiOR+84PX3ew=="; }; }; - "google-gax-2.9.2" = { + "google-gax-2.10.0" = { name = "google-gax"; packageName = "google-gax"; - version = "2.9.2"; + version = "2.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/google-gax/-/google-gax-2.9.2.tgz"; - sha512 = "Pve4osEzNKpBZqFXMfGKBbKCtgnHpUe5IQMh5Ou+Xtg8nLcba94L3gF0xgM5phMdGRRqJn0SMjcuEVmOYu7EBg=="; + url = "https://registry.npmjs.org/google-gax/-/google-gax-2.10.0.tgz"; + sha512 = "K+1JK5ofNl5k30LsI8UQb/DeLMEbhL/SWirCx0L9pnMcApSfAjRAO7yajXT5X1vicxDBnNSwKs+cu4elxpYraw=="; }; }; "google-p12-pem-3.0.3" = { @@ -25920,13 +25875,13 @@ let sha512 = "wS0ek4ZtFx/ACKYF3JhyGe5kzH7pgiQ7J5otlumqR9psmWMYc+U9cErKlCYVYHoUaidXHdZ2xbo34kB+S+24hA=="; }; }; - "goosig-0.9.0" = { + "goosig-0.10.0" = { name = "goosig"; packageName = "goosig"; - version = "0.9.0"; + version = "0.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/goosig/-/goosig-0.9.0.tgz"; - sha512 = "RaCpYN0eStJQszrudhwf42hd8j/Nod6iRiUU81cnHjI0f3s4vhmVkvpPE7QktF/EUA9tkoG2hrYYr9NJXvgefg=="; + url = "https://registry.npmjs.org/goosig/-/goosig-0.10.0.tgz"; + sha512 = "+BVVLfxmawAmGVjjJpXzu5LNcFIOfgXgP7kWEyc3qu/xn9RMqbPbNfYDdHBZKfZkDMIO7Q4vD790iNYQAXhoFA=="; }; }; "gossip-query-2.0.2" = { @@ -26145,13 +26100,13 @@ let sha512 = "GTCJtzJmkFLWRfFJuoo9RWWa/FfamUHgiFosxi/X1Ani4AVWbeyBenZTNX6dM+7WSbbFfTo/25eh0LLkwHMw2w=="; }; }; - "graphql-15.4.0" = { + "graphql-15.5.0" = { name = "graphql"; packageName = "graphql"; - version = "15.4.0"; + version = "15.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/graphql/-/graphql-15.4.0.tgz"; - sha512 = "EB3zgGchcabbsU9cFe1j+yxdzKQKAbGUWRb13DsrsMN1yyfmmIq+2+L5MqVWcDCE4V89R5AyUOi7sMOGxdsYtA=="; + url = "https://registry.npmjs.org/graphql/-/graphql-15.5.0.tgz"; + sha512 = "OmaM7y0kaK31NKG31q4YbD2beNYa6jBBKtMFT6gLYJljHLJr42IqJ8KX08u3Li/0ifzTU5HjmoOOrwa5BRLeDA=="; }; }; "graphql-anywhere-4.2.7" = { @@ -26172,13 +26127,13 @@ let sha512 = "MBY0wEjvcgJtZUyoqpPvOE1e5qPI0hJaa1gKTqjonSFiCsNHX2lykNjpOPcodmAgH1V06ELxhGnm9kcVzqvi/g=="; }; }; - "graphql-extensions-0.12.7" = { + "graphql-extensions-0.12.8" = { name = "graphql-extensions"; packageName = "graphql-extensions"; - version = "0.12.7"; + version = "0.12.8"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.12.7.tgz"; - sha512 = "yc9qOmEmWVZNkux9m0eCiHdtYSwNZRHkFhgfKfDn4u/gpsJolft1iyMUADnG/eytiRW0CGZFBpZjHkJhpginuQ=="; + url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.12.8.tgz"; + sha512 = "xjsSaB6yKt9jarFNNdivl2VOx52WySYhxPgf8Y16g6GKZyAzBoIFiwyGw5PJDlOSUa6cpmzn6o7z8fVMbSAbkg=="; }; }; "graphql-subscriptions-1.1.0" = { @@ -26244,13 +26199,13 @@ let sha512 = "U2OiDI5VxYmzRKw0Z2dmfk0zkqMRaecH9Smh1U277gVgVe9Qn+18xqf4skwr4YJszGIh7iQDZ57+5ygOK9sM/Q=="; }; }; - "graphql-ws-3.1.0" = { + "graphql-ws-4.1.0" = { name = "graphql-ws"; packageName = "graphql-ws"; - version = "3.1.0"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-ws/-/graphql-ws-3.1.0.tgz"; - sha512 = "zbex3FSiFz0iRgfkzDNWpOY/sYWoX+iZ5XUhakaDwOh99HSuk8rPt5suuxdXUVzEg5TGQ9rwzNaz/+mTPtS0yg=="; + url = "https://registry.npmjs.org/graphql-ws/-/graphql-ws-4.1.0.tgz"; + sha512 = "DxJP1y2YzCqVLy7DrQN0iuR2l48vMOBWukX2d/J9aN2o5x9un5psIIq/2UFRh91UGARmfvPH86y1p4qbC1dITg=="; }; }; "gray-matter-2.1.1" = { @@ -26316,13 +26271,13 @@ let sha512 = "cHwsLqoighpu7TuYj5RonnEuxGVFnztcUqTqp5rXFGYL4OuPFofwC4Ycg7n9fYwvK6F5WbYgeVOwph9Crs2fsQ=="; }; }; - "gtoken-5.1.0" = { + "gtoken-5.2.1" = { name = "gtoken"; packageName = "gtoken"; - version = "5.1.0"; + version = "5.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/gtoken/-/gtoken-5.1.0.tgz"; - sha512 = "4d8N6Lk8TEAHl9vVoRVMh9BNOKWVgl2DdNtr3428O75r3QFrF/a5MMu851VmK0AA8+iSvbwRv69k5XnMLURGhg=="; + url = "https://registry.npmjs.org/gtoken/-/gtoken-5.2.1.tgz"; + sha512 = "OY0BfPKe3QnMsY9MzTHTSKn+Vl2l1CcLe6BwDEQj00mbbkl5nyQ/7EUREstg4fQNZ8iYE7br4JJ7TdKeDOPWmw=="; }; }; "gulp-4.0.2" = { @@ -28009,15 +27964,6 @@ let sha512 = "snvtAQRforYUI+C2+45L2LBJy/0/uQUffxv8/uwiS98fSUoXHVrFPClgzWZWxT0drwkLHJRm9inZcYzTR42GLA=="; }; }; - "idb-wrapper-1.7.2" = { - name = "idb-wrapper"; - packageName = "idb-wrapper"; - version = "1.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/idb-wrapper/-/idb-wrapper-1.7.2.tgz"; - sha512 = "zfNREywMuf0NzDo9mVsL0yegjsirJxHpKHvWcyRozIqQy89g0a3U+oBPOCN4cc0oCiOuYgZHimzaW/R46G1Mpg=="; - }; - }; "idx-2.4.0" = { name = "idx"; packageName = "idx"; @@ -28207,15 +28153,6 @@ let sha1 = "d81355c15612d386c61f9ddd3922d4304822a546"; }; }; - "import-fresh-3.2.1" = { - name = "import-fresh"; - packageName = "import-fresh"; - version = "3.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz"; - sha512 = "6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ=="; - }; - }; "import-fresh-3.3.0" = { name = "import-fresh"; packageName = "import-fresh"; @@ -28450,15 +28387,6 @@ let sha1 = "4e808c2ce144c6c1788918e034d6797bc6cf6281"; }; }; - "ini-1.3.6" = { - name = "ini"; - packageName = "ini"; - version = "1.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/ini/-/ini-1.3.6.tgz"; - sha512 = "IZUoxEjNjubzrmvzZU4lKP7OnYmX72XRl3sqkfJhBKweKi5rnGi5+IUdlj/H1M+Ip5JQ1WzaDMOBRY90Ajc5jg=="; - }; - }; "ini-1.3.7" = { name = "ini"; packageName = "ini"; @@ -28819,13 +28747,22 @@ let sha512 = "S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg=="; }; }; - "internal-slot-1.0.2" = { + "internal-slot-1.0.3" = { name = "internal-slot"; packageName = "internal-slot"; - version = "1.0.2"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz"; + sha512 = "O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA=="; + }; + }; + "internmap-1.0.0" = { + name = "internmap"; + packageName = "internmap"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.2.tgz"; - sha512 = "2cQNfwhAfJIkU4KZPkDI+Gj5yNNnbqi40W9Gge6dfnk4TocEVm00B3bdiL+JINrbGJil2TeHvM4rETGzk/f/0g=="; + url = "https://registry.npmjs.org/internmap/-/internmap-1.0.0.tgz"; + sha512 = "SdoDWwNOTE2n4JWUsLn4KXZGuZPjPF9yyOGc8bnfWnBQh7BD/l80rzSznKc/r4Y0aQ7z3RTk9X+tV4tHBpu+dA=="; }; }; "interpret-1.1.0" = { @@ -28963,13 +28900,13 @@ let sha1 = "fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"; }; }; - "ip-regex-4.2.0" = { + "ip-regex-4.3.0" = { name = "ip-regex"; packageName = "ip-regex"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/ip-regex/-/ip-regex-4.2.0.tgz"; - sha512 = "n5cDDeTWWRwK1EBoWwRti+8nP4NbytBBY0pldmnIkq6Z55KNFmWofh4rl9dPZpj+U/nVq7gweR3ylrvMt4YZ5A=="; + url = "https://registry.npmjs.org/ip-regex/-/ip-regex-4.3.0.tgz"; + sha512 = "B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q=="; }; }; "ip-set-1.0.2" = { @@ -29053,15 +28990,6 @@ let sha1 = "2ca9b033651111855412f16be5d77c62a458a766"; }; }; - "is-0.2.7" = { - name = "is"; - packageName = "is"; - version = "0.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/is/-/is-0.2.7.tgz"; - sha1 = "3b34a2c48f359972f35042849193ae7264b63562"; - }; - }; "is-3.3.0" = { name = "is"; packageName = "is"; @@ -29827,15 +29755,6 @@ let sha512 = "drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w=="; }; }; - "is-object-0.1.2" = { - name = "is-object"; - packageName = "is-object"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-object/-/is-object-0.1.2.tgz"; - sha1 = "00efbc08816c33cfc4ac8251d132e10dc65098d7"; - }; - }; "is-object-1.0.2" = { name = "is-object"; packageName = "is-object"; @@ -30493,15 +30412,6 @@ let sha512 = "ORrEy+SNVqUhrCaal4hA4fBzhggQQ+BaLntyPOdoEiwlKZW9BZiJXjg3RMiruE4tPEI3pyVPpySHQF/dKWperg=="; }; }; - "isbuffer-0.0.0" = { - name = "isbuffer"; - packageName = "isbuffer"; - version = "0.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isbuffer/-/isbuffer-0.0.0.tgz"; - sha1 = "38c146d9df528b8bf9b0701c3d43cf12df3fc39b"; - }; - }; "isemail-3.2.0" = { name = "isemail"; packageName = "isemail"; @@ -30853,15 +30763,6 @@ let sha512 = "KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ=="; }; }; - "jetifier-1.6.6" = { - name = "jetifier"; - packageName = "jetifier"; - version = "1.6.6"; - src = fetchurl { - url = "https://registry.npmjs.org/jetifier/-/jetifier-1.6.6.tgz"; - sha512 = "JNAkmPeB/GS2tCRqUzRPsTOHpGDah7xP18vGJfIjZC+W2sxEHbxgJxetIjIqhjQ3yYbYNEELkM/spKLtwoOSUQ=="; - }; - }; "jetpack-id-1.0.0" = { name = "jetpack-id"; packageName = "jetpack-id"; @@ -30952,13 +30853,13 @@ let sha512 = "Apz3AqpJhToFlo70mwnlbVyqhJRagzhNKKp84ZMeTqe/Ay9oIno8unm7eFepdlR8m8wz/9JXJQxUjK/3Ku/cpg=="; }; }; - "jpeg-js-0.4.2" = { + "jpeg-js-0.4.3" = { name = "jpeg-js"; packageName = "jpeg-js"; - version = "0.4.2"; + version = "0.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.4.2.tgz"; - sha512 = "+az2gi/hvex7eLTMTlbRLOhH6P6WFdk2ITI8HJsaH2VqYO0I594zXSYEP+tf4FW+8Cy68ScDXoAsQdyQanv3sw=="; + url = "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.4.3.tgz"; + sha512 = "ru1HWKek8octvUHFHvE5ZzQ1yAsJmIvRdGWvSoKV52XKyuyYA437QWDttXT8eZXDSbuMpHlLzPDZUPd6idIz+Q=="; }; }; "jpeg-turbo-0.4.0" = { @@ -30988,13 +30889,13 @@ let sha1 = "bcb4045c8dd0539c134bc1488cdd3e768a7a9e51"; }; }; - "jquery.terminal-2.20.1" = { + "jquery.terminal-2.20.2" = { name = "jquery.terminal"; packageName = "jquery.terminal"; - version = "2.20.1"; + version = "2.20.2"; src = fetchurl { - url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.20.1.tgz"; - sha512 = "XDXH/psm0BquAmQEwomn1g9lYBGS/P6laRgWC/gADi6eJjEBWeyuiP9F5nzoEVhEa2VDnEYbvfm/MBA5DcrvdA=="; + url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.20.2.tgz"; + sha512 = "f3heC+hG2NE9tuJmGI3g5fR/KoD1/G31rJlXjVYPU2oBqbPQXRiiYvW78mm4aK9+IClYhMoqXiKxdzWIxjAxxA=="; }; }; "js-base64-2.6.4" = { @@ -31006,13 +30907,13 @@ let sha512 = "pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ=="; }; }; - "js-beautify-1.13.0" = { + "js-beautify-1.13.5" = { name = "js-beautify"; packageName = "js-beautify"; - version = "1.13.0"; + version = "1.13.5"; src = fetchurl { - url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.13.0.tgz"; - sha512 = "/Tbp1OVzZjbwzwJQFIlYLm9eWQ+3aYbBXLSaqb1mEJzhcQAfrqMMQYtjb6io+U6KpD0ID4F+Id3/xcjH3l/sqA=="; + url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.13.5.tgz"; + sha512 = "MsXlH6Z/BiRYSkSRW3clNDqDjSpiSNOiG8xYVUBXt4k0LnGvDhlTGOlHX1VFtAdoLmtwjxMG5qiWKy/g+Ipv5w=="; }; }; "js-message-1.0.7" = { @@ -31249,49 +31150,49 @@ let sha512 = "OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="; }; }; - "jsii-1.16.0" = { + "jsii-1.17.1" = { name = "jsii"; packageName = "jsii"; - version = "1.16.0"; + version = "1.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsii/-/jsii-1.16.0.tgz"; - sha512 = "8cgroyD6LOlFUlXUMAmjtUhzgyF3oQpVVpIdDzqcn2dNgs7iDnZN/Wo27MfZj8usbIBLLK3DYv7DSf+0/H0yWA=="; + url = "https://registry.npmjs.org/jsii/-/jsii-1.17.1.tgz"; + sha512 = "Hx2oJjD7mXWD73A8yRkNzE9QDkfn+oDNUAwQgeMV5xteBvrzKFwiToucMTrPPVL/KO2mEXvWP2Or7MY03DFu7w=="; }; }; - "jsii-pacmak-1.16.0" = { + "jsii-pacmak-1.17.1" = { name = "jsii-pacmak"; packageName = "jsii-pacmak"; - version = "1.16.0"; + version = "1.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.16.0.tgz"; - sha512 = "fjNiW8CliOO/GTzbhdA3kJGBvG1PDh2suQKfsUdh2sD0HSRmQPSpVydSmK0pfav7PD6OOfXsWvWI6WlKzNY0pg=="; + url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.17.1.tgz"; + sha512 = "9vxNObAkAqzRaU5qcFzJmi6gYQ6fllOqgGjqaEWdWlcMFx2XzgSOtALrksi/YRLwuZtPCZrUnSEV5SeralSkUg=="; }; }; - "jsii-reflect-1.16.0" = { + "jsii-reflect-1.17.1" = { name = "jsii-reflect"; packageName = "jsii-reflect"; - version = "1.16.0"; + version = "1.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.16.0.tgz"; - sha512 = "1zxZwni5S9WUQrNJJA+fVVkd1s54u6fdxjuiHpkZUvxkcPUnsuurL8KWImMEvbdz5ykGHEmnjMOOiyRh/XEc2Q=="; + url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.17.1.tgz"; + sha512 = "u3Pn/iCZriV6fD77Ettc975XIcGTIz0fjGeStwGIVyb9pcoQiF+WXdg8H9iRr17Rx+m6DTvbRukrszPDX6nMSA=="; }; }; - "jsii-rosetta-1.16.0" = { + "jsii-rosetta-1.17.1" = { name = "jsii-rosetta"; packageName = "jsii-rosetta"; - version = "1.16.0"; + version = "1.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.16.0.tgz"; - sha512 = "1FFGV+JmwyljCNjc9bkW40MIQXvPgNxq+V3zx8/0+FM51S/0O5EvTa/413LX8fzB8sWH0G42NqFa+8k3k9s2hw=="; + url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.17.1.tgz"; + sha512 = "Nws1f4FE0qNTJLWoP6Q/jwWYcR2uHB0pQ5AsyR5oVwrJiXjZ06vUD9oJu7GuXb9BxKVf5gJVc6Hh478SwOwF6A=="; }; }; - "jsii-srcmak-0.1.180" = { + "jsii-srcmak-0.1.210" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.180"; + version = "0.1.210"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.180.tgz"; - sha512 = "U9CmoEM6A7ZhIT66N8r9flPKUsNnkCu5iWkzH9k6sdNwbiEC5KT4MdJUfJ42L1AbX1BXwhmQtFyj7QvKdGI44g=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.210.tgz"; + sha512 = "p9G4DcJIjJXo1LSLFe/lISXB9ijwfSMd/CUWtTWsUo2muVEsaKl8IE7YAiTDiKiP3OTswvzHmqa5DZ1pobLkzg=="; }; }; "json-bigint-0.2.3" = { @@ -31573,13 +31474,13 @@ let sha512 = "W9Lq347r8tA1DfMvAGn9QNcgYm4Wm7Yc+k8e6vezpMnRT+NHbtlxgNBXRVjXe9YM6eTn6+p/MKOlV/aABJcSnQ=="; }; }; - "json2jsii-0.1.172" = { + "json2jsii-0.1.188" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.1.172"; + version = "0.1.188"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.172.tgz"; - sha512 = "X78nchCnnN0M3x6byBMhR9X5fz5BETDxFmAE149WUpMn0Dh6Dg3c7H9FbQkRV1MVaqC0sLJHGIeO++hfgYpa7w=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.188.tgz"; + sha512 = "XeUcBQl0rngTFmiSIx0XNW+g0QgAJcqwsUYzvGcDPPSvPngIGmJ/X6d0UH/nDmSVyEilYyKnVP7iYh3y9by9fA=="; }; }; "json3-3.2.6" = { @@ -32204,13 +32105,13 @@ let sha512 = "zdGa2TOpSZPq5mU6iowDARnMBZgtCqJ11dJROFi6tg6kTn4nuUdU09lFyLFSaHrWqpIJ+EBq4E8/Dc0Vx5vLdA=="; }; }; - "khroma-1.1.1" = { + "khroma-1.2.0" = { name = "khroma"; packageName = "khroma"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/khroma/-/khroma-1.1.1.tgz"; - sha512 = "p7SYAiFisFFmLHHCqYBNwmfTrVIlWjUq+Pw81lDvnpaXOj2sR/xszTG4873AeaEO1kYQ50Z1c9CIrtQa6bdNdA=="; + url = "https://registry.npmjs.org/khroma/-/khroma-1.2.0.tgz"; + sha512 = "DlKk5y243dujy8fOH02aRnnewLfiHJV0s8aXaVrCohgBf3s7fEAn6gc6LLQ21agODlFZS8ufrn+juu70uCA9Tw=="; }; }; "killable-1.0.1" = { @@ -32627,15 +32528,6 @@ let sha512 = "psRSqJZCsC/irNhfHzrVZbmPYXDcEYhA5TVNwr+V92jF44rbf86hqGp8fiT702FyiArScYIlPSBTDUASCVNSpw=="; }; }; - "level-blobs-0.1.7" = { - name = "level-blobs"; - packageName = "level-blobs"; - version = "0.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/level-blobs/-/level-blobs-0.1.7.tgz"; - sha1 = "9ab9b97bb99f1edbf9f78a3433e21ed56386bdaf"; - }; - }; "level-codec-6.2.0" = { name = "level-codec"; packageName = "level-codec"; @@ -32672,42 +32564,6 @@ let sha512 = "UVprBJXite4gPS+3VznfgDSU8PTRuVX0NXwoWW50KLxd2yw4Y1t2JUR5In1itQnudZqRMT9DlAM3Q//9NCjCFw=="; }; }; - "level-filesystem-1.2.0" = { - name = "level-filesystem"; - packageName = "level-filesystem"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/level-filesystem/-/level-filesystem-1.2.0.tgz"; - sha1 = "a00aca9919c4a4dfafdca6a8108d225aadff63b3"; - }; - }; - "level-fix-range-1.0.2" = { - name = "level-fix-range"; - packageName = "level-fix-range"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/level-fix-range/-/level-fix-range-1.0.2.tgz"; - sha1 = "bf15b915ae36d8470c821e883ddf79cd16420828"; - }; - }; - "level-fix-range-2.0.0" = { - name = "level-fix-range"; - packageName = "level-fix-range"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/level-fix-range/-/level-fix-range-2.0.0.tgz"; - sha1 = "c417d62159442151a19d9a2367868f1724c2d548"; - }; - }; - "level-hooks-4.5.0" = { - name = "level-hooks"; - packageName = "level-hooks"; - version = "4.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/level-hooks/-/level-hooks-4.5.0.tgz"; - sha1 = "1b9ae61922930f3305d1a61fc4d83c8102c0dd93"; - }; - }; "level-iterator-stream-4.0.2" = { name = "level-iterator-stream"; packageName = "level-iterator-stream"; @@ -32717,15 +32573,6 @@ let sha512 = "ZSthfEqzGSOMWoUGhTXdX9jv26d32XJuHz/5YnuHZzH6wldfWMOVwI9TBtKcya4BKTyTt3XVA0A3cF3q5CY30Q=="; }; }; - "level-js-2.2.4" = { - name = "level-js"; - packageName = "level-js"; - version = "2.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/level-js/-/level-js-2.2.4.tgz"; - sha1 = "bc055f4180635d4489b561c9486fa370e8c11697"; - }; - }; "level-js-4.0.2" = { name = "level-js"; packageName = "level-js"; @@ -32753,15 +32600,6 @@ let sha512 = "HMwMaQPlTC1IlcwT3+swhqf/NUO+ZhXVz6TY1zZIIZlIR0YSn8GtAAWmIvKjNY16ZkEg/JcpAuQskxsXqC0yOQ=="; }; }; - "level-peek-1.0.6" = { - name = "level-peek"; - packageName = "level-peek"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/level-peek/-/level-peek-1.0.6.tgz"; - sha1 = "bec51c72a82ee464d336434c7c876c3fcbcce77f"; - }; - }; "level-post-1.0.7" = { name = "level-post"; packageName = "level-post"; @@ -32771,15 +32609,6 @@ let sha512 = "PWYqG4Q00asOrLhX7BejSajByB4EmG2GaKHfj3h5UmmZ2duciXLPGYWIjBzLECFWUGOZWlm5B20h/n3Gs3HKew=="; }; }; - "level-sublevel-5.2.3" = { - name = "level-sublevel"; - packageName = "level-sublevel"; - version = "5.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/level-sublevel/-/level-sublevel-5.2.3.tgz"; - sha1 = "744c12c72d2e72be78dde3b9b5cd84d62191413a"; - }; - }; "level-supports-1.0.1" = { name = "level-supports"; packageName = "level-supports"; @@ -32798,15 +32627,6 @@ let sha512 = "iB8O/7Db9lPaITU1aA2txU/cBEXAt4vWwKQRrrWuS6XDgbP4QZGj9BL2aNbwb002atoQ/lIotJkfyzz+ygQnUQ=="; }; }; - "levelup-0.18.6" = { - name = "levelup"; - packageName = "levelup"; - version = "0.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/levelup/-/levelup-0.18.6.tgz"; - sha1 = "e6a01cb089616c8ecc0291c2a9bd3f0c44e3e5eb"; - }; - }; "levelup-4.4.0" = { name = "levelup"; packageName = "levelup"; @@ -33140,13 +32960,13 @@ let sha512 = "Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw=="; }; }; - "loader-runner-4.1.0" = { + "loader-runner-4.2.0" = { name = "loader-runner"; packageName = "loader-runner"; - version = "4.1.0"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/loader-runner/-/loader-runner-4.1.0.tgz"; - sha512 = "oR4lB4WvwFoC70ocraKhn5nkKSs23t57h9udUgw8o0iH8hMXeEoRuUgfcvgUwAJ1ZpRqBvcou4N2SMvM1DwMrA=="; + url = "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz"; + sha512 = "92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw=="; }; }; "loader-utils-1.4.0" = { @@ -33221,15 +33041,6 @@ let sha512 = "iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw=="; }; }; - "lock-0.1.4" = { - name = "lock"; - packageName = "lock"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/lock/-/lock-0.1.4.tgz"; - sha1 = "fec7deaef17e7c3a0a55e1da042803e25d91745d"; - }; - }; "locks-0.2.2" = { name = "locks"; packageName = "locks"; @@ -33284,15 +33095,6 @@ let sha1 = "d22c9ac660288f3843e16ba7d2b5d06cca27d777"; }; }; - "lodash-4.17.15" = { - name = "lodash"; - packageName = "lodash"; - version = "4.17.15"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz"; - sha512 = "8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="; - }; - }; "lodash-4.17.20" = { name = "lodash"; packageName = "lodash"; @@ -34598,15 +34400,6 @@ let sha512 = "Mc8jNuSFImQUIateBFwdOQcmC6Q5maU0VVvdC2R6XMb66/VnT+7WS4D/0EeNMZu1YODmJe5NIn2XftCzEocUgw=="; }; }; - "logfmt-1.3.2" = { - name = "logfmt"; - packageName = "logfmt"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/logfmt/-/logfmt-1.3.2.tgz"; - sha512 = "U0lelcaGWEfEITZQXs8y5HrJp2xa0BJ+KDfkkLJRmuKbQIEVGNv145FbaNekY4ZYHJSBBx8NLJitaPtRqLEkxQ=="; - }; - }; "logform-2.2.0" = { name = "logform"; packageName = "logform"; @@ -34616,15 +34409,6 @@ let sha512 = "N0qPlqfypFx7UHNn4B3lzS/b0uLqt2hmuoa+PpuXNYgozdJYAyauF5Ky0BWVjrxDlMWiT3qN4zPq3vVAfZy7Yg=="; }; }; - "logkitty-0.7.1" = { - name = "logkitty"; - packageName = "logkitty"; - version = "0.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/logkitty/-/logkitty-0.7.1.tgz"; - sha512 = "/3ER20CTTbahrCrpYfPn7Xavv9diBROZpoXGVZDWMw4b/X4uuUwAC0ki85tgsdMRONURyIJbcOvS94QsUBYPbQ=="; - }; - }; "loglevel-1.7.1" = { name = "loglevel"; packageName = "loglevel"; @@ -35147,13 +34931,13 @@ let sha512 = "07JHC0r1ykIoruKO8ifMXu+xEU8qOXDFETylktdug6vJDACnP+HKevOu3PXyNPzFyTSlz8vrBYlBO1JZRe8Cag=="; }; }; - "make-fetch-happen-8.0.12" = { + "make-fetch-happen-8.0.13" = { name = "make-fetch-happen"; packageName = "make-fetch-happen"; - version = "8.0.12"; + version = "8.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-8.0.12.tgz"; - sha512 = "cBD7yM72ltWEV+xlLlbimnh5qHwr+thAb/cZLiaZhicVVPVN63BikBvL5OR68+8+z2fvBOgck628vGJ2ulgF6g=="; + url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-8.0.13.tgz"; + sha512 = "rQ5NijwwdU8tIaBrpTtSVrNCcAJfyDRcKBC76vOQlyJX588/88+TE+UpjWl4BgG7gCkp29wER7xcRqkeg+x64Q=="; }; }; "make-iterator-1.0.1" = { @@ -35543,13 +35327,13 @@ let sha512 = "EGwzEeCcLniFX51DhTpmTom+dSA/MG/OBUDjnWtHbEnjAH180VzUeAw+oE4+Zv+CoYBWyRlYOTR0N8SO9R1PVw=="; }; }; - "marked-1.2.7" = { + "marked-1.2.8" = { name = "marked"; packageName = "marked"; - version = "1.2.7"; + version = "1.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/marked/-/marked-1.2.7.tgz"; - sha512 = "No11hFYcXr/zkBvL6qFmAp1z6BKY3zqLMHny/JN/ey+al7qwCM2+CMBL9BOgqMxZU36fz4cCWfn2poWIf7QRXA=="; + url = "https://registry.npmjs.org/marked/-/marked-1.2.8.tgz"; + sha512 = "lzmFjGnzWHkmbk85q/ILZjFoHHJIQGF+SxGEfIdGk/XhiTPhqGs37gbru6Kkd48diJnEyYwnG67nru0Z2gQtuQ=="; }; }; "marked-terminal-3.3.0" = { @@ -35957,6 +35741,15 @@ let sha512 = "Ci6bIfq/UgcxPTYa8dQQ5FY3BzKkT894bwXWXxC/zqs0XgMO2cT20CGkOqda7gZNkmK5VP4x89IGZ6K7hfbn3Q=="; }; }; + "mem-8.0.0" = { + name = "mem"; + packageName = "mem"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mem/-/mem-8.0.0.tgz"; + sha512 = "qrcJOe6uD+EW8Wrci1Vdiua/15Xw3n/QnaNXE7varnB6InxSk7nu3/i5jfy3S6kWxr8WYJ6R1o0afMUtvorTsA=="; + }; + }; "mem-fs-1.2.0" = { name = "mem-fs"; packageName = "mem-fs"; @@ -36011,13 +35804,13 @@ let sha1 = "9d7028a6f266deb733510bb7dbba5f51878c561e"; }; }; - "memoizee-0.4.14" = { + "memoizee-0.4.15" = { name = "memoizee"; packageName = "memoizee"; - version = "0.4.14"; + version = "0.4.15"; src = fetchurl { - url = "https://registry.npmjs.org/memoizee/-/memoizee-0.4.14.tgz"; - sha512 = "/SWFvWegAIYAO4NQMpcX+gcra0yEZu4OntmUdrBaWrJncxOqAziGFlHxc7yjKVK2uu3lpPW27P27wkR82wA8mg=="; + url = "https://registry.npmjs.org/memoizee/-/memoizee-0.4.15.tgz"; + sha512 = "UBWmJpLZd5STPm7PMUlOw/TSy972M+z8gcyQ5veOnSDRREz/0bmpyTfKt3/51DhEBqCZQn1udM/5flcSPYhkdQ=="; }; }; "memory-cache-0.2.0" = { @@ -36155,13 +35948,22 @@ let sha512 = "GWHvA5QOcS412WCo8vwKDlTelGLsCGBVevQB5Kva961rmNfun0PCbv5+xta2kUMFJyR8/oWnn7ddeKdosbAPbA=="; }; }; - "meow-8.1.0" = { + "meow-8.1.2" = { name = "meow"; packageName = "meow"; - version = "8.1.0"; + version = "8.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/meow/-/meow-8.1.0.tgz"; - sha512 = "fNWkgM1UVMey2kf24yLiccxLihc5W+6zVus3/N0b+VfnJgxV99E9u04X6NAiKdg6ED7DAQBX5sy36NM0QJZkWA=="; + url = "https://registry.npmjs.org/meow/-/meow-8.1.2.tgz"; + sha512 = "r85E3NdZ+mpYk1C6RjPFEMSE+s1iZMuHtsHAqY0DT3jZczl0diWUZ8g6oU7h0M9cD2EL+PzaYghhCLzR0ZNn5Q=="; + }; + }; + "meow-9.0.0" = { + name = "meow"; + packageName = "meow"; + version = "9.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz"; + sha512 = "+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ=="; }; }; "merge-1.2.1" = { @@ -36236,13 +36038,13 @@ let sha1 = "f8a064760d37e7978ad5f9f6d3c119a494f57081"; }; }; - "mermaid-8.8.4" = { + "mermaid-8.9.0" = { name = "mermaid"; packageName = "mermaid"; - version = "8.8.4"; + version = "8.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/mermaid/-/mermaid-8.8.4.tgz"; - sha512 = "YPn35uEAIrOcsDPjCiKNXXBdO1Aoazsv2zTZjG4+oXa7+tTVUb5sI81NqaTYa47RnoH9Vl4waLlEEJfB8KM9VA=="; + url = "https://registry.npmjs.org/mermaid/-/mermaid-8.9.0.tgz"; + sha512 = "J582tyE1vkdNu4BGgfwXnFo4Mu6jpuc4uK96mIenavaak9kr4T5gaMmYCo/7edwq/vTBkx/soZ5LcJo5WXZ1BQ=="; }; }; "mersenne-0.0.4" = { @@ -36515,22 +36317,22 @@ let sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; }; }; - "mime-2.4.6" = { + "mime-2.4.7" = { name = "mime"; packageName = "mime"; - version = "2.4.6"; + version = "2.4.7"; src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz"; - sha512 = "RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA=="; + url = "https://registry.npmjs.org/mime/-/mime-2.4.7.tgz"; + sha512 = "dhNd1uA2u397uQk3Nv5LM4lm93WYDUXFn3Fu291FJerns4jyTudqhIWe4W04YLy7Uk1tm1Ore04NpjRvQp/NPA=="; }; }; - "mime-2.4.7" = { + "mime-2.5.0" = { name = "mime"; packageName = "mime"; - version = "2.4.7"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-2.4.7.tgz"; - sha512 = "dhNd1uA2u397uQk3Nv5LM4lm93WYDUXFn3Fu291FJerns4jyTudqhIWe4W04YLy7Uk1tm1Ore04NpjRvQp/NPA=="; + url = "https://registry.npmjs.org/mime/-/mime-2.5.0.tgz"; + sha512 = "ft3WayFSFUVBuJj7BMLKAQcSlItKtfjsKDDsii3rqFDAZ7t11zRe8ASw/GlmivGwVUYtwkQrxiGGpL6gFvB0ag=="; }; }; "mime-db-1.33.0" = { @@ -36839,13 +36641,13 @@ let sha512 = "6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA=="; }; }; - "minipass-fetch-1.3.2" = { + "minipass-fetch-1.3.3" = { name = "minipass-fetch"; packageName = "minipass-fetch"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.3.2.tgz"; - sha512 = "/i4fX1ss+Dtwyk++OsAI6SEV+eE1dvI6W+0hORdjfruQ7VD5uYTetJIHcEMjWiEiszWjn2aAtP1CB/Q4KfeoYA=="; + url = "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.3.3.tgz"; + sha512 = "akCrLDWfbdAWkMLBxJEeWTdNsjML+dt5YgOI4gJ53vuO0vrmYQkUPxa6j6V65s9CcePIr2SSWqjT2EcrNseryQ=="; }; }; "minipass-flush-1.0.5" = { @@ -37046,31 +36848,31 @@ let sha1 = "ebb3a977e7af1c683ae6fda12b545a6ba6c5853d"; }; }; - "mobx-6.0.4" = { + "mobx-6.0.5" = { name = "mobx"; packageName = "mobx"; - version = "6.0.4"; + version = "6.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/mobx/-/mobx-6.0.4.tgz"; - sha512 = "wT2QJT9tW19VSHo9x7RPKU3z/I2Ps6wUS8Kb1OO+kzmg7UY3n4AkcaYG6jq95Lp1R9ohjC/NGYuT2PtuvBjhFg=="; + url = "https://registry.npmjs.org/mobx/-/mobx-6.0.5.tgz"; + sha512 = "Q3/GiSj/QyazDn1n44PjdiMlokCE6gVs85BnFR0xCJmkF2d34k/ZnWAEG7wGbnJYEi+0f5CdvzDquBiKeo56bA=="; }; }; - "mobx-react-7.0.5" = { + "mobx-react-7.0.6" = { name = "mobx-react"; packageName = "mobx-react"; - version = "7.0.5"; + version = "7.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/mobx-react/-/mobx-react-7.0.5.tgz"; - sha512 = "WmHl3Ni30ujVcOOnllmGmyccsbfFCKtAwpkIwncwxhgLcvXcE0Wa9lGJIhoqQdTJzGr0AJqGzMVAdwNc3Fj2DQ=="; + url = "https://registry.npmjs.org/mobx-react/-/mobx-react-7.0.6.tgz"; + sha512 = "EBNfDXnXNd0KmxtykioybOrJVX0Rc446aPZ69gDxguJnHPl/pPE032PhZ83EGWSZO3KiYsC251Ax3JlPqUwWBw=="; }; }; - "mobx-react-lite-3.1.6" = { + "mobx-react-lite-3.1.7" = { name = "mobx-react-lite"; packageName = "mobx-react-lite"; - version = "3.1.6"; + version = "3.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/mobx-react-lite/-/mobx-react-lite-3.1.6.tgz"; - sha512 = "MM3x9BLt5nC7iE/ILA5n2+hfrplEKYbFjqROEuGkzBdZP/KD+Z44+2gseczRrTG0xFuiPWfEzgT68+6/zqOiEw=="; + url = "https://registry.npmjs.org/mobx-react-lite/-/mobx-react-lite-3.1.7.tgz"; + sha512 = "G6kgur98RrEpoi563ERzxlSwn606xY6Ay4BOtfYXl/QaHZYXbhbCe3YJGROPU2ao4f2bfhnt8iZW3YnBW2BqXQ=="; }; }; "mocha-2.5.3" = { @@ -37613,15 +37415,6 @@ let sha512 = "KpMNwdQsYz3O/SBS1qJ/o3sqUJ5wSb8gb0pul8CO0S56b9Y2ALm8zCfsjPXsqGFfoNBkDwZuZIAjhsZI03gYVQ=="; }; }; - "mustache-4.0.1" = { - name = "mustache"; - packageName = "mustache"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mustache/-/mustache-4.0.1.tgz"; - sha512 = "yL5VE97+OXn4+Er3THSmTdCFCtx5hHWzrolvH+JObZnUYwuaG7XV+Ch4fR2cIrcYI0tFHxS7iyFYl14bW8y2sA=="; - }; - }; "mustache-4.1.0" = { name = "mustache"; packageName = "mustache"; @@ -37964,15 +37757,6 @@ let sha1 = "20a318c30cb45f71fe7adfbf7b21c99c1472ef11"; }; }; - "native-request-1.0.8" = { - name = "native-request"; - packageName = "native-request"; - version = "1.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/native-request/-/native-request-1.0.8.tgz"; - sha512 = "vU2JojJVelUGp6jRcLwToPoWGxSx23z/0iX+I77J3Ht17rf2INGjrhOoQnjVo60nQd8wVsgzKkPfRXBiVdD2ag=="; - }; - }; "native-url-0.2.6" = { name = "native-url"; packageName = "native-url"; @@ -38189,13 +37973,13 @@ let sha512 = "o/qITSDR0JCyCKEQ1/1bnUXMmznxabbwi/Y4WwJElf+evwJNFNwIDMCCt5IigFVxgeGBJESLohGtIS9gEzo1fA=="; }; }; - "needle-2.5.2" = { + "needle-2.6.0" = { name = "needle"; packageName = "needle"; - version = "2.5.2"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/needle/-/needle-2.5.2.tgz"; - sha512 = "LbRIwS9BfkPvNwNHlsA41Q29kL2L/6VaOJ0qisM5lLWsTV3nP15abO5ITL6L81zqFhzjRKDAYjpcBcwM0AVvLQ=="; + url = "https://registry.npmjs.org/needle/-/needle-2.6.0.tgz"; + sha512 = "KKYdza4heMsEfSWD7VPUIz3zX2XDwOyX2d+geb4vrERZMT5RMU6ujjaD+I5Yr54uZxQ2w6XRTAhHBbSCyovZBg=="; }; }; "negotiator-0.3.0" = { @@ -38262,6 +38046,15 @@ let sha1 = "19f619591519f096769a5ba9a86e6eeec823c3cf"; }; }; + "nested-error-stacks-2.0.1" = { + name = "nested-error-stacks"; + packageName = "nested-error-stacks"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-2.0.1.tgz"; + sha512 = "SrQrok4CATudVzBS7coSz26QRSmlK9TzzoFbeKfcPBUFPjcQM9Rqvr/DlJkOrwI/0KcgvMub1n1g5Jt9EgRn4A=="; + }; + }; "nested-error-stacks-2.1.0" = { name = "nested-error-stacks"; packageName = "nested-error-stacks"; @@ -38271,22 +38064,13 @@ let sha512 = "AO81vsIO1k1sM4Zrd6Hu7regmJN1NSiAja10gc4bX3F0wd+9rQmcuHQaHVQCYIEC8iFXnE+mavh23GOt7wBgug=="; }; }; - "netlify-4.9.0" = { + "netlify-6.1.3" = { name = "netlify"; packageName = "netlify"; - version = "4.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/netlify/-/netlify-4.9.0.tgz"; - sha512 = "x+VqJ+yop05OUpeaT4fhz/NAvJQFjtNhW1s+/i6oP/EZS6/+B0u+qCANF8uP9u3UJcmWvlJmrRoDhj62Xvtwug=="; - }; - }; - "netlify-6.0.9" = { - name = "netlify"; - packageName = "netlify"; - version = "6.0.9"; + version = "6.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/netlify/-/netlify-6.0.9.tgz"; - sha512 = "izoELW+kE5ClHX85f5EExRo42H3hXESwSr69EJdCuDQlTP3JR09xQgZcWL5t7FNdkfBj7Kdhf62tk02TN4+YzA=="; + url = "https://registry.npmjs.org/netlify/-/netlify-6.1.3.tgz"; + sha512 = "VltyAYcfdmDymAZ5+N2y7HZzTrNpBpmRJ5NctFWbKuV+kW/Zogf3Cm2cRhzFl9xeJ6UYN7vTfw0dYddNt3QMIA=="; }; }; "netlify-plugin-deploy-preview-commenting-0.0.1-alpha.16" = { @@ -38298,13 +38082,13 @@ let sha512 = "5Rvi17CKgPpZTazEV2wkSj4IbS2zJpoKuytaYCyvemV/CMVeZUUPRwNPWm7+NjxObqJHgzUyi2FmWql8HfWhGA=="; }; }; - "netlify-redirect-parser-2.5.0" = { + "netlify-redirect-parser-3.0.2" = { name = "netlify-redirect-parser"; packageName = "netlify-redirect-parser"; - version = "2.5.0"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-redirect-parser/-/netlify-redirect-parser-2.5.0.tgz"; - sha512 = "pF8BiOr3Pa4kQLLiOu53I0d30EIUDM0DYqYvCQmKD96cMX2qLh/QsxT0Zh18IrL5a0IWQ236/o76lTe0yEEw6w=="; + url = "https://registry.npmjs.org/netlify-redirect-parser/-/netlify-redirect-parser-3.0.2.tgz"; + sha512 = "ZpYwJh/aTBAYuS9dLTVTfDu1rf/+qJ3hsjiawW7A2NmIErN9qb9k08s5I6AUwPQlG4U50MtUnUwpHyMobcbkzA=="; }; }; "netlify-redirector-0.2.1" = { @@ -38812,31 +38596,22 @@ let sha1 = "8d9dbe28964a4ac5712e9131642107c71e90ec40"; }; }; - "node-notifier-6.0.0" = { - name = "node-notifier"; - packageName = "node-notifier"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-notifier/-/node-notifier-6.0.0.tgz"; - sha512 = "SVfQ/wMw+DesunOm5cKqr6yDcvUTDl/yc97ybGHMrteNEY6oekXpNpS3lZwgLlwz0FLgHoiW28ZpmBHUDg37cw=="; - }; - }; - "node-notifier-8.0.0" = { + "node-notifier-8.0.1" = { name = "node-notifier"; packageName = "node-notifier"; - version = "8.0.0"; + version = "8.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.0.tgz"; - sha512 = "46z7DUmcjoYdaWyXouuFNNfUo6eFa94t23c53c+lG/9Cvauk4a98rAUp9672X5dxGdQmLpPzTxzu8f/OeEPaFA=="; + url = "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.1.tgz"; + sha512 = "BvEXF+UmsnAfYfoapKM9nGxnP+Wn7P91YfXmrKnfcYCx6VBeoN5Ez5Ogck6I8Bi5k4RlpqRYaw75pAwzX9OphA=="; }; }; - "node-notifier-8.0.1" = { + "node-notifier-9.0.0" = { name = "node-notifier"; packageName = "node-notifier"; - version = "8.0.1"; + version = "9.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.1.tgz"; - sha512 = "BvEXF+UmsnAfYfoapKM9nGxnP+Wn7P91YfXmrKnfcYCx6VBeoN5Ez5Ogck6I8Bi5k4RlpqRYaw75pAwzX9OphA=="; + url = "https://registry.npmjs.org/node-notifier/-/node-notifier-9.0.0.tgz"; + sha512 = "SkwNwGnMMlSPrcoeH4CSo9XyWe72acAHEJGDdPdB+CyBVHsIYaTQ4U/1wk3URsyzC75xZLg2vzU2YaALlqDF1Q=="; }; }; "node-persist-2.1.0" = { @@ -38911,13 +38686,13 @@ let sha1 = "dbbd4af12134e2e635c245ef93ffcf6f60673a5d"; }; }; - "node-red-admin-0.2.6" = { + "node-red-admin-0.2.7" = { name = "node-red-admin"; packageName = "node-red-admin"; - version = "0.2.6"; + version = "0.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-admin/-/node-red-admin-0.2.6.tgz"; - sha512 = "s3TlPwl9VbhsCTg9w2nUCdyBwqyRGqnaohy9iPJPmHPnvT+YudVt9VCoJVol5lPlWbDC9QlBQMyHQDdXIxoLkw=="; + url = "https://registry.npmjs.org/node-red-admin/-/node-red-admin-0.2.7.tgz"; + sha512 = "bsFbC7KFfGY37+SuYfmM9Er00cM92anqp6xCj8x7Y+4qZHOXnLi9XDFoWtvvsC1uQyaMqas1ALCfqcOxLlWngw=="; }; }; "node-red-node-rbe-0.2.9" = { @@ -38938,13 +38713,13 @@ let sha512 = "j1g/VtSCI2tBrBnCD+u8iSo9tH0nvn70k1O1SxkHk3+qx7tHUyOKQc7wNc4rUs9J1PkGngUC3qEDd5cL7Z/klg=="; }; }; - "node-releases-1.1.69" = { + "node-releases-1.1.70" = { name = "node-releases"; packageName = "node-releases"; - version = "1.1.69"; + version = "1.1.70"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.69.tgz"; - sha512 = "DGIjo79VDEyAnRlfSqYTsy+yoHd2IOjJiKUozD2MV2D85Vso6Bug56mb9tT/fY5Urt0iqk01H7x+llAruDR2zA=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.70.tgz"; + sha512 = "Slf2s69+2/uAD79pVVQo8uSiC34+g8GWY8UH2Qtqv34ZfhYrxpYpfzs9Js9d6O0mbDmALuxaTlplnBTnSELcrw=="; }; }; "node-source-walk-4.2.0" = { @@ -39253,13 +39028,13 @@ let sha1 = "df7c3ed5a277c3f9d4b5d819b05311d10a200ae6"; }; }; - "npm-api-1.0.0" = { + "npm-api-1.0.1" = { name = "npm-api"; packageName = "npm-api"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-api/-/npm-api-1.0.0.tgz"; - sha512 = "gtJhIhGq07g9H5sIAB9TZzTySW8MYtcYqg+e+J+5q1GmDsDLLVfyvVBL1VklzjtRsElph11GUtLBS191RDOJxQ=="; + url = "https://registry.npmjs.org/npm-api/-/npm-api-1.0.1.tgz"; + sha512 = "4sITrrzEbPcr0aNV28QyOmgn6C9yKiF8k92jn4buYAK8wmA5xo1qL3II5/gT1r7wxbXBflSduZ2K3FbtOrtGkA=="; }; }; "npm-bundled-1.1.1" = { @@ -39424,15 +39199,6 @@ let sha512 = "Qs6P6nnopig+Y8gbzpeN/dkt+n7IyVd8f45NTMotGk6Qo7GfBmzwYx6jRLoOOgKiMnaQfYxsuyQlD8Mc3guBhg=="; }; }; - "npm-registry-fetch-4.0.7" = { - name = "npm-registry-fetch"; - packageName = "npm-registry-fetch"; - version = "4.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.7.tgz"; - sha512 = "cny9v0+Mq6Tjz+e0erFAB+RYJ/AVGzkjnISiobqP8OWj9c9FLoZZu8/SPSKJWE17F1tk4018wfjV+ZbIbqC7fQ=="; - }; - }; "npm-registry-fetch-8.1.5" = { name = "npm-registry-fetch"; packageName = "npm-registry-fetch"; @@ -39631,13 +39397,13 @@ let sha512 = "e5G6bbq3Nrfxm+SDPR5AiZ6n2smVUmhLA1OgI2/Bl8e2ywfWsKw/yuqrwiXXiNHb1wdM/GyPMX6QjCGJODlaaA=="; }; }; - "oas-resolver-2.5.3" = { + "oas-resolver-2.5.4" = { name = "oas-resolver"; packageName = "oas-resolver"; - version = "2.5.3"; + version = "2.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/oas-resolver/-/oas-resolver-2.5.3.tgz"; - sha512 = "y4gP5tabqP3YcNVHNAEJAlcqZ40Y9lxemzmXvt54evbrvuGiK5dEhuE33Rf+191TOwzlxMoIgbwMYeuOM7BwjA=="; + url = "https://registry.npmjs.org/oas-resolver/-/oas-resolver-2.5.4.tgz"; + sha512 = "1vIj5Wkjmi+kZj5sFamt95LkuXoalmoKUohtaUQoCQZjLfPFaY8uZ7nw6IZaWuE6eLON2b6xrXhxD4hiTdYl0g=="; }; }; "oas-schema-walker-1.1.5" = { @@ -39658,13 +39424,13 @@ let sha512 = "bIt8erTyclF7bkaySTtQ9sppqyVc+mAlPi7vPzCLVHJsL9nrivQjc/jHLX/o+eGbxHd6a6YBwuY/Vxa6wGsiuw=="; }; }; - "oas-validator-5.0.4" = { + "oas-validator-5.0.5" = { name = "oas-validator"; packageName = "oas-validator"; - version = "5.0.4"; + version = "5.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/oas-validator/-/oas-validator-5.0.4.tgz"; - sha512 = "/v+5BbPXl7JuKf1bYhEGIfbJZR7zBf5QJNM2RAe1e0bsABsp35nAfeptZq0hb+9RMecGSFxmzhuvlOT0/KioiQ=="; + url = "https://registry.npmjs.org/oas-validator/-/oas-validator-5.0.5.tgz"; + sha512 = "d10yy6xlhRTh6np44k2U0gm5M66pioYTllH8J1ZTj+WSY3cpTvU+Dt51iWOT85HJqyGHo0RZKXF3u/NGQWDFgg=="; }; }; "oauth-0.9.15" = { @@ -39830,15 +39596,6 @@ let sha512 = "1ZvAZ4wlF7IyPVOcE1Omikt7UpaFlOQq0HlSti+ZvDH3UiD2brwGMwDbyV43jao2bKJ+4+WdPJHSd7kgzKYVqg=="; }; }; - "object-keys-0.2.0" = { - name = "object-keys"; - packageName = "object-keys"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/object-keys/-/object-keys-0.2.0.tgz"; - sha1 = "cddec02998b091be42bf1035ae32e49f1cb6ea67"; - }; - }; "object-keys-0.4.0" = { name = "object-keys"; packageName = "object-keys"; @@ -40037,22 +39794,13 @@ let sha1 = "cb236106341536f0dac4815e06708221cad7fb5e"; }; }; - "obz-1.0.2" = { + "obz-1.0.3" = { name = "obz"; packageName = "obz"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/obz/-/obz-1.0.2.tgz"; - sha512 = "c+EtVwT2IpXz5we2mR40aPLJ1s0eNOsxYeaYbaHhmsY6kWKo3IRkpwpBU5ck0aHfqfKUUEiKabC6rzsrG/hSHw=="; - }; - }; - "octal-1.0.0" = { - name = "octal"; - packageName = "octal"; - version = "1.0.0"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/octal/-/octal-1.0.0.tgz"; - sha1 = "63e7162a68efbeb9e213588d58e989d1e5c4530b"; + url = "https://registry.npmjs.org/obz/-/obz-1.0.3.tgz"; + sha512 = "rH3U4eLHsV+OgkOS29ULiC9JLspwMCyCIH/+BglLPXDxQs13IK8AGD+nVmkGXqGN5JefZu85YhfIi05CsOKWPw=="; }; }; "octokit-pagination-methods-1.1.0" = { @@ -40064,13 +39812,13 @@ let sha512 = "fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ=="; }; }; - "office-ui-fabric-react-7.155.3" = { + "office-ui-fabric-react-7.157.0" = { name = "office-ui-fabric-react"; packageName = "office-ui-fabric-react"; - version = "7.155.3"; + version = "7.157.0"; src = fetchurl { - url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.155.3.tgz"; - sha512 = "MOGOEviHa5P580rANl9+vS4QTDt6SeyVlfhGLqZpSgA7VZ4JDCIU/mFyNbl5KG39wfg5JiKic+Lz8rXUrExQfw=="; + url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.157.0.tgz"; + sha512 = "nS0RfhQKho2S2hiUxHcgM47AZUK1EzbjkdWkofNHQk8q0PwJkQPTUjTbSuxhQNLzXHiaQJz930ZYUvRCZvlL1w=="; }; }; "omggif-1.0.10" = { @@ -40244,13 +39992,13 @@ let sha512 = "jQ31cORBFE6td25deYeD80wxKBMj+zBmHTrVxnc6CKhx8gho6ipmWM5zj/oeoqioZ99yqBls9Z/9Nss7J26G2g=="; }; }; - "oo-ascii-tree-1.16.0" = { + "oo-ascii-tree-1.17.1" = { name = "oo-ascii-tree"; packageName = "oo-ascii-tree"; - version = "1.16.0"; + version = "1.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.16.0.tgz"; - sha512 = "xIuc4hP3NKOhPaPJN1zkTXiGNpNe4vOaS0CUwyCuVv1kBzBhliZ71siaGXpHIL45CBmX6qGAjEiHt7ZS1nQWaA=="; + url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.17.1.tgz"; + sha512 = "+59dySSbsBOpRmrdBV6w4lkoxELA6reGNEsD/+HfRw8F+pQhGv5cROX0Y6jAXd1yWbUXY+AbbKVTq1ws/rfv+A=="; }; }; "opal-runtime-1.0.11" = { @@ -40307,6 +40055,15 @@ let sha512 = "mgLwQIx2F/ye9SmbrUkurZCnkoXyXyu9EbHtJZrICjVAJfyMArdHp3KkixGdZx1ZHFPNIwl0DDM1dFFqXbTLZw=="; }; }; + "open-7.3.1" = { + name = "open"; + packageName = "open"; + version = "7.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/open/-/open-7.3.1.tgz"; + sha512 = "f2wt9DCBKKjlFbjzGb8MOAW8LH8F0mrs1zc7KTjAJ9PZNQbfenzWbNP1VZJvw6ICMG9r14Ah6yfwPn7T7i646A=="; + }; + }; "openapi-default-setter-2.1.0" = { name = "openapi-default-setter"; packageName = "openapi-default-setter"; @@ -40316,13 +40073,13 @@ let sha512 = "2ZNlX1B/J9Q/bsM/vZKh8alC0Pn04KtDGbMN30qLRu3GkaOJH3dDMKxqJzCpYj8BOAa8G3BEsQq6kqWzkEsM7A=="; }; }; - "openapi-default-setter-7.0.1" = { + "openapi-default-setter-7.2.3" = { name = "openapi-default-setter"; packageName = "openapi-default-setter"; - version = "7.0.1"; + version = "7.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-default-setter/-/openapi-default-setter-7.0.1.tgz"; - sha512 = "O9jhaZPEEJzI1HSG3Yw5rOIC0EpZ9PjRJgtksXKuSMyEoxUDnl7zQ27LuFRR1ykSMVhMt8vHMrQBQIwLW8S0yQ=="; + url = "https://registry.npmjs.org/openapi-default-setter/-/openapi-default-setter-7.2.3.tgz"; + sha512 = "wRqgsLfZB3LXx8l3RfKo8icdDPDucnrRD2EkygTMiUv5W1/OdZJmo1ChgD6FjQUZH/7U67IxEjnXPEWfnu+dRw=="; }; }; "openapi-framework-0.26.0" = { @@ -40334,13 +40091,13 @@ let sha512 = "TbgwwOnlatb+xSYh/XALQjrVO3dirVNXuONR6CLQHVI/i1e+nq/ubW8I5i6rlGpnFLZNZKXZ0gF7RMvjLBk8ow=="; }; }; - "openapi-framework-7.2.0" = { + "openapi-framework-7.2.3" = { name = "openapi-framework"; packageName = "openapi-framework"; - version = "7.2.0"; + version = "7.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-framework/-/openapi-framework-7.2.0.tgz"; - sha512 = "rC4U+SIBVxoTujSIrk84PMquBwkNJfhYC7KTTDUUc7yfIyMVKRat5TOuMDyc49Ovsv+7bdkx1stf7d0N9LbtLg=="; + url = "https://registry.npmjs.org/openapi-framework/-/openapi-framework-7.2.3.tgz"; + sha512 = "3UwZFIxcJzMpYQAiwynaWGGWW/OcIdYz+gr5bO0TDOxnZjaZNo5ejru/6T9Gb7zrv15THihc3EdASvB36L0rXg=="; }; }; "openapi-jsonschema-parameters-1.2.0" = { @@ -40352,13 +40109,13 @@ let sha512 = "i2vBBFiRbOwYSvt5OG9hayJ7WUe/nl9Y151Ki1QtHb8M0zdYs2wkDhywVJnapq4/gPlrD1vmSVsYDrAjcBRJTQ=="; }; }; - "openapi-jsonschema-parameters-7.0.2" = { + "openapi-jsonschema-parameters-7.2.3" = { name = "openapi-jsonschema-parameters"; packageName = "openapi-jsonschema-parameters"; - version = "7.0.2"; + version = "7.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-jsonschema-parameters/-/openapi-jsonschema-parameters-7.0.2.tgz"; - sha512 = "hCC8wsWu9qU/pWCUClAYmUyXRhAeXSZUCRV7NVlj/8+3fWrtTBwk8GKI2dRa5Up0yZ3pstGi3Ewzzuixbmh8sw=="; + url = "https://registry.npmjs.org/openapi-jsonschema-parameters/-/openapi-jsonschema-parameters-7.2.3.tgz"; + sha512 = "hnhuSbyB0gwA2KrDmMve0A+XC3rqhiQwlvOpZ+kGDz9nWqgLgFJA582LpA4V1W+nI3WruS0nEkAvfG8EHKD+qQ=="; }; }; "openapi-request-coercer-2.4.0" = { @@ -40370,13 +40127,13 @@ let sha512 = "UFRzW7C7Q31FUOFHEMYNeSuEmETH7KGlsMgMJanv0RxXkACyzKpKANPfM3oiMubQENPya3Ie9ZIq5HLvZEy/eQ=="; }; }; - "openapi-request-coercer-7.1.0" = { + "openapi-request-coercer-7.2.3" = { name = "openapi-request-coercer"; packageName = "openapi-request-coercer"; - version = "7.1.0"; + version = "7.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-request-coercer/-/openapi-request-coercer-7.1.0.tgz"; - sha512 = "6nvSgvOvLYMkUBu3NbHQU6Lcol1WxDr0DsOe3oYHb2tZhokrNEuOF20QYPV+CGZYyEzc0f+Hdas774n5B0euLg=="; + url = "https://registry.npmjs.org/openapi-request-coercer/-/openapi-request-coercer-7.2.3.tgz"; + sha512 = "w+CcKjQ/UWgtA5lgrCh7t/D2FGaKyQRXgMk8aWuT/y2a/pvdZbXdmdABWdafXB6iVlBr9CKXYHJUDlBcoKH2yQ=="; }; }; "openapi-request-validator-4.2.0" = { @@ -40388,13 +40145,13 @@ let sha512 = "ukdX4T8heEI2GudiqDkk8hwfZhZP7zAz8zwngTyHtI0ZRUuU76+Zix8LVfrvSTZ2RpsPClKmYU2kDU4YZqdRHg=="; }; }; - "openapi-request-validator-7.2.0" = { + "openapi-request-validator-7.2.3" = { name = "openapi-request-validator"; packageName = "openapi-request-validator"; - version = "7.2.0"; + version = "7.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-request-validator/-/openapi-request-validator-7.2.0.tgz"; - sha512 = "LgXvKco6XR5SKr8QBaM6v0++QXY5MP2yvvKv0Ckutef3css9MAyIcokDsBj6DYYzNnjmFxPx4ntuY7CZTC2ZFA=="; + url = "https://registry.npmjs.org/openapi-request-validator/-/openapi-request-validator-7.2.3.tgz"; + sha512 = "bZWIOIc7eDnPzgk159Wzur1U9hLoFTgok3coWA8J/XlNnTgnWGH+dxc8eCAdPlOLJh2AsiSu/fEGKzWJRxzCAw=="; }; }; "openapi-response-validator-4.0.0" = { @@ -40406,13 +40163,13 @@ let sha512 = "bIG8bpHT/vE+Dtz4aVyfQnweXtUdvxvJf5/D6Uu98UGf3T42Ez940ctwnlmDCQxTPqdu0yLFbMoiNf/A3jYCIg=="; }; }; - "openapi-response-validator-7.0.1" = { + "openapi-response-validator-7.2.3" = { name = "openapi-response-validator"; packageName = "openapi-response-validator"; - version = "7.0.1"; + version = "7.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-response-validator/-/openapi-response-validator-7.0.1.tgz"; - sha512 = "Fxr9YdQ6s7/SIvvM888iWnc1GUn/fFxTaMFqHkUv0/eNCYoBfOwAKj9aptaRfL+BJXlsVdXWCJd3GWkwn8sIJA=="; + url = "https://registry.npmjs.org/openapi-response-validator/-/openapi-response-validator-7.2.3.tgz"; + sha512 = "j9OvLWO/6sWiR4fwdbzPbZuuj02abk+kt8Zd2aXS4mS8K7/sl7QiJGI/VmQpvq9CTlNG67eEKyqgmBzI1ovu/g=="; }; }; "openapi-sampler-1.0.0-beta.18" = { @@ -40433,13 +40190,13 @@ let sha512 = "KKpeNEvAmpy6B2JCfyrM4yWjL6vggDCVbBoR8Yfkj0Jltc6PCW+dBbcg+1yrTCuDv80qBQJ6w0ejA71DlOFegA=="; }; }; - "openapi-schema-validator-7.0.1" = { + "openapi-schema-validator-7.2.3" = { name = "openapi-schema-validator"; packageName = "openapi-schema-validator"; - version = "7.0.1"; + version = "7.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-schema-validator/-/openapi-schema-validator-7.0.1.tgz"; - sha512 = "P/dmF14xWbyaFVcoS1Fs2tUP4AhJO+eEnZV+jbApeo3569/Z2fiki6Mb6Rs7cfi0ewNnV4L4HiYH+HPZaKWnjQ=="; + url = "https://registry.npmjs.org/openapi-schema-validator/-/openapi-schema-validator-7.2.3.tgz"; + sha512 = "XT8NM5e/zBBa/cydTS1IeYkCPzJp9oixvt9Y1lEx+2gsCTOooNxw9x/KEivtWMSokne7X1aR+VtsYHQtNNOSyA=="; }; }; "openapi-security-handler-2.0.4" = { @@ -40451,13 +40208,13 @@ let sha512 = "blz/UftEqYQLAByuEVITePUI9hV5Rd91CEK8yrsKDUaf3zk6cmIMafJ2qvagHqjXRRtL7fOqvsSKIeFrai+HfQ=="; }; }; - "openapi-security-handler-7.0.1" = { + "openapi-security-handler-7.2.3" = { name = "openapi-security-handler"; packageName = "openapi-security-handler"; - version = "7.0.1"; + version = "7.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-security-handler/-/openapi-security-handler-7.0.1.tgz"; - sha512 = "fiRJE2Z5F0tY9QBssBX9g8Txtr0oj1BOU0nOZ6QHHXQdCYxebszGgcXD63uy0UJQwzwVOMs/AlCnKNVS/yMSEg=="; + url = "https://registry.npmjs.org/openapi-security-handler/-/openapi-security-handler-7.2.3.tgz"; + sha512 = "6wC2MXUv/FOy6uK6kkvPx1Pmh4WI3rpj7fsA1jwKCIPMwVcaJQA7/4Cfw3VWMNF0mVz7Nlxt9/aiziXHSOfiLg=="; }; }; "openapi-to-graphql-2.2.5" = { @@ -40496,6 +40253,15 @@ let sha512 = "6pi4/Fw+JIW1HHda2Ij7LRJ5QJ8f6YzaXnsRA6m44BJz8nLq/j5gVFzPBKJo+uOFhAeHqZC/3uzhTpYPga3Q/A=="; }; }; + "openapi-types-7.2.3" = { + name = "openapi-types"; + packageName = "openapi-types"; + version = "7.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/openapi-types/-/openapi-types-7.2.3.tgz"; + sha512 = "olbaNxz12R27+mTyJ/ZAFEfUruauHH27AkeQHDHRq5AF0LdNkK1SSV7EourXQDK+4aX7dv2HtyirAGK06WMAsA=="; + }; + }; "openapi3-ts-1.4.0" = { name = "openapi3-ts"; packageName = "openapi3-ts"; @@ -40766,6 +40532,15 @@ let sha512 = "+wG2v8TUU8EgzPHun1k/n45pXquQ9fHnbXVetl9rRgO6kjZszGGbraF3XPTIdgeA+s1lbRjSEftAnyT0w8ZMvQ=="; }; }; + "ora-5.3.0" = { + name = "ora"; + packageName = "ora"; + version = "5.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ora/-/ora-5.3.0.tgz"; + sha512 = "zAKMgGXUim0Jyd6CXK9lraBnD3H5yPGBPPOkC23a2BG6hsm4Zu6OQSjQuEtV0BHDf4aKHcUFvJiGRrFuW3MG8g=="; + }; + }; "ordered-read-streams-1.0.1" = { name = "ordered-read-streams"; packageName = "ordered-read-streams"; @@ -41468,22 +41243,22 @@ let sha512 = "JcMmHiK6h6rcncj2HLayiyJZg28iJXJafXcmEGw2NjKH3WE8ZgSwyMZs7+f+aliPD57PDhB31IEgUtLXp0YZxA=="; }; }; - "pacote-11.1.13" = { + "pacote-11.1.14" = { name = "pacote"; packageName = "pacote"; - version = "11.1.13"; + version = "11.1.14"; src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-11.1.13.tgz"; - sha512 = "oJ7Bg7p3izrIMhZPHCCHmMHQl+xb+pKBXL5ZYeM2oCZrw6sBRSx7f8l7F+95V2qA0BP3c1cNaaBmUNkbo6Hn9w=="; + url = "https://registry.npmjs.org/pacote/-/pacote-11.1.14.tgz"; + sha512 = "6c5OhQelaJFDfiw/Zd8MfGCvvFHurSdeGzufZMPvRFImdbNOYFciOINf3DtUNUaU3h98eCb749UyHDsgvL19+A=="; }; }; - "pacote-9.5.12" = { + "pacote-11.2.3" = { name = "pacote"; packageName = "pacote"; - version = "9.5.12"; + version = "11.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-9.5.12.tgz"; - sha512 = "BUIj/4kKbwWg4RtnBncXPJd15piFSVNpTzY0rysSr3VnMowTYgkGKcaHrbReepAkjTr8lH2CVWRi58Spg2CicQ=="; + url = "https://registry.npmjs.org/pacote/-/pacote-11.2.3.tgz"; + sha512 = "Jphxyk1EjGyLzNwa+MkbcQUQeTIqlKcIoPq0t9ekR9ZxsTGjzhRjz/cOoL9PTVkqAW1FH7qBoVbYL4FqQGNNJg=="; }; }; "pad-0.0.5" = { @@ -41504,13 +41279,13 @@ let sha1 = "ad1f22ce1bf0fdc0d6ddd908af17f351a404b8ac"; }; }; - "paged-request-2.0.1" = { + "paged-request-2.0.2" = { name = "paged-request"; packageName = "paged-request"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/paged-request/-/paged-request-2.0.1.tgz"; - sha512 = "C0bB/PFk9rQskD1YEiz7uuchzqKDQGgdsEHN1ahify0UUWzgmMK4NDG9fhlQg2waogmNFwEvEeHfMRvJySpdVw=="; + url = "https://registry.npmjs.org/paged-request/-/paged-request-2.0.2.tgz"; + sha512 = "NWrGqneZImDdcMU/7vMcAOo1bIi5h/pmpJqe7/jdsy85BA/s5MSaU/KlpxwW/IVPmIwBcq2uKPrBWWhEWhtxag=="; }; }; "pako-0.2.9" = { @@ -41765,13 +41540,13 @@ let sha512 = "ztoZ4/DYeXQq4E21v169sC8qWINGpcosGv9XhTDvg9/hWvx/zrFkc9BiWxR58OJLHGk28j5BL0SDLeV2WmFZlQ=="; }; }; - "parse-json-5.1.0" = { + "parse-json-5.2.0" = { name = "parse-json"; packageName = "parse-json"; - version = "5.1.0"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/parse-json/-/parse-json-5.1.0.tgz"; - sha512 = "+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ=="; + url = "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz"; + sha512 = "ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg=="; }; }; "parse-latin-4.3.0" = { @@ -41819,13 +41594,13 @@ let sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6"; }; }; - "parse-path-4.0.2" = { + "parse-path-4.0.3" = { name = "parse-path"; packageName = "parse-path"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/parse-path/-/parse-path-4.0.2.tgz"; - sha512 = "HSqVz6iuXSiL8C1ku5Gl1Z5cwDd9Wo0q8CoffdAghP6bz8pJa1tcMC+m4N+z6VAS8QdksnIGq1TB6EgR4vPR6w=="; + url = "https://registry.npmjs.org/parse-path/-/parse-path-4.0.3.tgz"; + sha512 = "9Cepbp2asKnWTJ9x2kpw6Fe8y9JDbqwahGCTvklzd/cEq5C5JC59x2Xb0Kx+x0QZ8bvNquGO8/BWP0cwBHzSAA=="; }; }; "parse-png-2.1.0" = { @@ -41882,13 +41657,13 @@ let sha512 = "to8zT7+o6bVTyP35r2QgG1svuFGMFO1mE6ri1oWHgL9tlgnOtfjmfHmA3mOuP9HTIU/8OiZw0NG5zbyqVLxhvA=="; }; }; - "parse-torrent-9.1.0" = { + "parse-torrent-9.1.1" = { name = "parse-torrent"; packageName = "parse-torrent"; - version = "9.1.0"; + version = "9.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-9.1.0.tgz"; - sha512 = "TVht2kv44bTHEd55KgmfEHyDh5djIBZMhaD6uFWnxLhJWUXy8lrIOsjPSs4Tfzs9PTGIgGM0k+UG6CFphHgOZQ=="; + url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-9.1.1.tgz"; + sha512 = "QQePPIN0cX6bEjwAT6x2o5fUgOsz2SwXlZqzz2uvt12+uiCrgU4WYAsy3wEthQWLZQpn1utMbSbHCRDvjAnhMA=="; }; }; "parse-torrent-file-2.1.4" = { @@ -42413,13 +42188,13 @@ let sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="; }; }; - "pathval-1.1.0" = { + "pathval-1.1.1" = { name = "pathval"; packageName = "pathval"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz"; - sha1 = "b942e6d4bde653005ef6b71361def8727d0645e0"; + url = "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz"; + sha512 = "Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ=="; }; }; "patrisika-0.22.2" = { @@ -42467,13 +42242,13 @@ let sha512 = "4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg=="; }; }; - "peek-readable-3.1.1" = { + "peek-readable-3.1.3" = { name = "peek-readable"; packageName = "peek-readable"; - version = "3.1.1"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/peek-readable/-/peek-readable-3.1.1.tgz"; - sha512 = "QHJag0oYYPVkx6rVPEgCLEUMo6VRYbV3GUrqy00lxXJBEIw9LhPCP5MQI6mEfahJO9KYUP8W8qD8kC0V9RyZFQ=="; + url = "https://registry.npmjs.org/peek-readable/-/peek-readable-3.1.3.tgz"; + sha512 = "mpAcysyRJxmICBcBa5IXH7SZPvWkcghm6Fk8RekoS3v+BpbSzlZzuWbMx+GXrlUwESi9qHar4nVEZNMKylIHvg=="; }; }; "peek-stream-1.1.3" = { @@ -44583,13 +44358,13 @@ let sha512 = "WudaR0eTsDx33O3EJE16PjBRZWcX8GqCEeERw1W3hZJgH/F2a46g7jty6UGty6NeJ4CKQy8ds2CJPMiyeqaTvw=="; }; }; - "proxy-agent-4.0.0" = { + "proxy-agent-4.0.1" = { name = "proxy-agent"; packageName = "proxy-agent"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/proxy-agent/-/proxy-agent-4.0.0.tgz"; - sha512 = "8P0Y2SkwvKjiGU1IkEfYuTteioMIDFxPL4/j49zzt5Mz3pG1KO+mIrDG1qH0PQUHTTczjwGcYl+EzfXiFj5vUQ=="; + url = "https://registry.npmjs.org/proxy-agent/-/proxy-agent-4.0.1.tgz"; + sha512 = "ODnQnW2jc/FUVwHHuaZEfN5otg/fMbvMxz9nMSUQfJ9JU7q2SZvSULSsjLloVgJOiv9yhc8GlNMKc4GkFmcVEA=="; }; }; "proxy-from-env-1.1.0" = { @@ -44610,15 +44385,6 @@ let sha1 = "a3fdf1befb730f951965872ac2f6074c61477a56"; }; }; - "prr-0.0.0" = { - name = "prr"; - packageName = "prr"; - version = "0.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz"; - sha1 = "1a84b85908325501411853d0081ee3fa86e2926a"; - }; - }; "prr-1.0.1" = { name = "prr"; packageName = "prr"; @@ -45609,13 +45375,13 @@ let sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="; }; }; - "qs-6.9.4" = { + "qs-6.9.6" = { name = "qs"; packageName = "qs"; - version = "6.9.4"; + version = "6.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.9.4.tgz"; - sha512 = "A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ=="; + url = "https://registry.npmjs.org/qs/-/qs-6.9.6.tgz"; + sha512 = "TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ=="; }; }; "query-string-1.0.1" = { @@ -45834,13 +45600,13 @@ let sha512 = "WAcBP5iLhg1pbjZA40WyMenjK7c5gJUY6Pi5HJ3fLJCeVFNSZv3juf20yFMKxBdvcX5GKbX/HZSfFzlLBdGTdQ=="; }; }; - "random-access-memory-3.1.1" = { + "random-access-memory-3.1.2" = { name = "random-access-memory"; packageName = "random-access-memory"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/random-access-memory/-/random-access-memory-3.1.1.tgz"; - sha512 = "Qy1MliJDozZ1A6Hx3UbEnm8PPCfkiG/8CArbnhrxXMx1YRJPWipgPTB9qyhn4Z7WlLvCEqPb6Bd98OayyVuwrA=="; + url = "https://registry.npmjs.org/random-access-memory/-/random-access-memory-3.1.2.tgz"; + sha512 = "wIfh4OZ9T+FRNf6rbXLvEb4FfSxyZpvGnC5kC7Xi39SyPkRYfeJyR9Xwa13iLbNyoNKNIkTFUE4g9lXFb1ZflA=="; }; }; "random-access-storage-1.4.1" = { @@ -46032,6 +45798,15 @@ let sha512 = "bwfUSB37TWkHfP+PPjb/x8BUjChFmmBK44JMfVnU7paisWqZl/o5k7ttCH+EQLnrbn2Aq8Fo1LAsyUiz+WF4CQ=="; }; }; + "rc-config-loader-4.0.0" = { + name = "rc-config-loader"; + packageName = "rc-config-loader"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/rc-config-loader/-/rc-config-loader-4.0.0.tgz"; + sha512 = "//LRTblJEcqbmmro1GCmZ39qZXD+JqzuD8Y5/IZU3Dhp3A1Yr0Xn68ks8MQ6qKfKvYCWDveUmRDKDA40c+sCXw=="; + }; + }; "re-emitter-1.1.4" = { name = "re-emitter"; packageName = "re-emitter"; @@ -46689,13 +46464,13 @@ let sha512 = "pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A=="; }; }; - "reftools-1.1.7" = { + "reftools-1.1.8" = { name = "reftools"; packageName = "reftools"; - version = "1.1.7"; + version = "1.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/reftools/-/reftools-1.1.7.tgz"; - sha512 = "I+KZFkQvZjMZqVWxRezTC/kQ2kLhGRZ7C+4ARbgmb5WJbvFUlbrZ/6qlz6mb+cGcPNYib+xqL8kZlxCsSZ7Hew=="; + url = "https://registry.npmjs.org/reftools/-/reftools-1.1.8.tgz"; + sha512 = "Yvz9NH8uFHzD/AXX82Li1GdAP6FzDBxEZw+njerNBBQv/XHihqsWAjNfXtaq4QD2l4TEZVnp4UbktdYSegAM3g=="; }; }; "regenerate-1.4.2" = { @@ -46770,13 +46545,13 @@ let sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A=="; }; }; - "regexp.prototype.flags-1.3.0" = { + "regexp.prototype.flags-1.3.1" = { name = "regexp.prototype.flags"; packageName = "regexp.prototype.flags"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz"; - sha512 = "2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ=="; + url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz"; + sha512 = "JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA=="; }; }; "regexpp-1.1.0" = { @@ -46869,13 +46644,13 @@ let sha512 = "OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A=="; }; }; - "regjsparser-0.6.4" = { + "regjsparser-0.6.6" = { name = "regjsparser"; packageName = "regjsparser"; - version = "0.6.4"; + version = "0.6.6"; src = fetchurl { - url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz"; - sha512 = "64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw=="; + url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.6.tgz"; + sha512 = "jjyuCp+IEMIm3N1H1LLTJW1EISEJV9+5oHdEyrt43Pg9cDSb6rrLZei2cVWpl0xTjmmlpec/lEQGYgM7xfpGCQ=="; }; }; "rehype-parse-7.0.1" = { @@ -47454,6 +47229,15 @@ let sha1 = "4e0d56d6c9662fd31e43011c4b95aa49955421d3"; }; }; + "requireg-0.2.2" = { + name = "requireg"; + packageName = "requireg"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/requireg/-/requireg-0.2.2.tgz"; + sha512 = "nYzyjnFcPNGR3lx9lwPPPnuQxv6JWEZd2Ci0u9opN7N5zUEPIhY/GbL3vMGOr2UXwEg9WwSyV9X9Y/kLFgPsOg=="; + }; + }; "requirejs-2.3.6" = { name = "requirejs"; packageName = "requirejs"; @@ -47499,22 +47283,22 @@ let sha512 = "ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w=="; }; }; - "resolve-1.18.1" = { + "resolve-1.19.0" = { name = "resolve"; packageName = "resolve"; - version = "1.18.1"; + version = "1.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.18.1.tgz"; - sha512 = "lDfCPaMKfOJXjy0dPayzPdF1phampNWr3qFCjAu+rw/qbQmr5jWH5xN2hwh9QKfw9E5v4hwV7A+jrCmL8yjjqA=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz"; + sha512 = "rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg=="; }; }; - "resolve-1.19.0" = { + "resolve-1.7.1" = { name = "resolve"; packageName = "resolve"; - version = "1.19.0"; + version = "1.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz"; - sha512 = "rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.7.1.tgz"; + sha512 = "c7rwLofp8g1U+h1KNyHL/jicrKg1Ek4q+Lr33AL65uZTinUZHe30D5HlyN5V9NW0JX1D5dXQ4jqW5l7Sy/kGfw=="; }; }; "resolve-2.0.0-next.2" = { @@ -47859,13 +47643,13 @@ let sha1 = "eeeb88342fadbe8027c0f36ada921a13e6f96206"; }; }; - "rfdc-1.1.4" = { + "rfdc-1.2.0" = { name = "rfdc"; packageName = "rfdc"; - version = "1.1.4"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/rfdc/-/rfdc-1.1.4.tgz"; - sha512 = "5C9HXdzK8EAqN7JDif30jqsBzavB7wLpaubisuQIGHWf2gUXSpzy6ArX/+Da8RjFpagWsCn+pIgxTMAmKw9Zug=="; + url = "https://registry.npmjs.org/rfdc/-/rfdc-1.2.0.tgz"; + sha512 = "ijLyszTMmUrXvjSooucVQwimGUk84eRcmCuLV8Xghe3UO85mjUtRAHRyoMM6XtyqbECaXuBWx18La3523sXINA=="; }; }; "rgb-regex-1.0.1" = { @@ -48012,13 +47796,13 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.36.0" = { + "rollup-2.38.0" = { name = "rollup"; packageName = "rollup"; - version = "2.36.0"; + version = "2.38.0"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.36.0.tgz"; - sha512 = "L38QyQK77bkJy9nPyeydnHFK6xMofqumh4scTV2d4RG4EFq6pGdxnn67dVHFUDJ9J0PSEQx8zn1FiVS5TydsKg=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.38.0.tgz"; + sha512 = "ay9zDiNitZK/LNE/EM2+v5CZ7drkB2xyDljvb1fQJCGnq43ZWRkhxN145oV8GmoW1YNi4sA/1Jdkr2LfawJoXw=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -48048,13 +47832,22 @@ let sha512 = "jlXbjZSQg8EIeAAvepNwhJj++qJWNJw1Cl0YnOqKtP5Djx+fFGkp3WRh+W0ASCaFG5w1jhmzDxgu3SJuVxPF4Q=="; }; }; - "rollup-plugin-node-builtins-2.1.2" = { - name = "rollup-plugin-node-builtins"; - packageName = "rollup-plugin-node-builtins"; - version = "2.1.2"; + "rollup-plugin-inject-3.0.2" = { + name = "rollup-plugin-inject"; + packageName = "rollup-plugin-inject"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/rollup-plugin-node-builtins/-/rollup-plugin-node-builtins-2.1.2.tgz"; - sha1 = "24a1fed4a43257b6b64371d8abc6ce1ab14597e9"; + url = "https://registry.npmjs.org/rollup-plugin-inject/-/rollup-plugin-inject-3.0.2.tgz"; + sha512 = "ptg9PQwzs3orn4jkgXJ74bfs5vYz1NCZlSQMBUA0wKcGp5i5pA1AO3fOUEte8enhGUC+iapTCzEWw2jEFFUO/w=="; + }; + }; + "rollup-plugin-node-polyfills-0.2.1" = { + name = "rollup-plugin-node-polyfills"; + packageName = "rollup-plugin-node-polyfills"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/rollup-plugin-node-polyfills/-/rollup-plugin-node-polyfills-0.2.1.tgz"; + sha512 = "4kCrKPTJ6sK4/gLL/U5QzVT8cxJcofO0OU74tnB19F40cmuAKSzH5/siithxlofFEjwvw1YAhPmbvGNA6jEroA=="; }; }; "rollup-plugin-node-resolve-5.2.0" = { @@ -48480,13 +48273,13 @@ let sha512 = "y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg=="; }; }; - "sass-1.32.0" = { + "sass-1.32.5" = { name = "sass"; packageName = "sass"; - version = "1.32.0"; + version = "1.32.5"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.32.0.tgz"; - sha512 = "fhyqEbMIycQA4blrz/C0pYhv2o4x2y6FYYAH0CshBw3DXh5D5wyERgxw0ptdau1orc/GhNrhF7DFN2etyOCEng=="; + url = "https://registry.npmjs.org/sass/-/sass-1.32.5.tgz"; + sha512 = "kU1yJ5zUAmPxr7f3q0YXTAd1oZjSR1g3tYyv+xu0HZSl5JiNOaE987eiz7wCUvbm4I9fGWGU2TgApTtcP4GMNQ=="; }; }; "sax-0.5.8" = { @@ -48813,15 +48606,6 @@ let sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; }; }; - "semver-6.1.1" = { - name = "semver"; - packageName = "semver"; - version = "6.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-6.1.1.tgz"; - sha512 = "rWYq2e5iYW+fFe/oPPtYJxYgjBm8sC4rmoGdUOgBB7VnwKt6HrL793l2voH1UlsyYZpJ4g0wfjnTEO1s1NP2eQ=="; - }; - }; "semver-6.3.0" = { name = "semver"; packageName = "semver"; @@ -48840,15 +48624,6 @@ let sha512 = "+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A=="; }; }; - "semver-7.1.3" = { - name = "semver"; - packageName = "semver"; - version = "7.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.1.3.tgz"; - sha512 = "ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA=="; - }; - }; "semver-7.2.3" = { name = "semver"; packageName = "semver"; @@ -50046,13 +49821,13 @@ let sha512 = "7REUy5U6h2wCPIg9060V5bh24gichRHfuqWC22xrp/n+dVolQXvG5RN/PqdJiPsCj7Y9voyWLbYai+Tmk3o82Q=="; }; }; - "snyk-gradle-plugin-3.11.0" = { + "snyk-gradle-plugin-3.12.0" = { name = "snyk-gradle-plugin"; packageName = "snyk-gradle-plugin"; - version = "3.11.0"; + version = "3.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.11.0.tgz"; - sha512 = "OXf1A+kcif+vslm/nsel3bDYWsGwum2PsZLETM28nG4JOgqBLYLWvCHPgH9r2aa0MKTq0nBpimvFkzDm/+2qQQ=="; + url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.12.0.tgz"; + sha512 = "WAmViagNolXsqPO/xmArlnpmisw6j/4xN6FLJ/gl9cDSSrgTh013sZlynkZj0G1v4enkelIMuqfVKXzinthm/Q=="; }; }; "snyk-module-1.9.1" = { @@ -50082,13 +49857,13 @@ let sha512 = "HHuOYEAACpUpkFgU8HT57mmxmonaJ4O3YADoSkVhnhkmJ+AowqZyJOau703dYHNrq2DvQ7qYw81H7yyxS1Nfjw=="; }; }; - "snyk-mvn-plugin-2.25.0" = { + "snyk-mvn-plugin-2.25.1" = { name = "snyk-mvn-plugin"; packageName = "snyk-mvn-plugin"; - version = "2.25.0"; + version = "2.25.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.25.0.tgz"; - sha512 = "2NDWrMWi9K32i9CdWUy2Pce8D9myR0dxPDJJpamVt/DD3fDxH4ia701i2HdDgOjMq8PI6yIgI+vRaAW3X2GrbA=="; + url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.25.1.tgz"; + sha512 = "buhFh7iDxIxTiQy1D+bLm2aYlqHqMoQxaeLTtMw939rU4TqIrvFiTDYZo0kq8PfvCWU5yvxLHlbR5V4goObv7w=="; }; }; "snyk-nodejs-lockfile-parser-1.30.1" = { @@ -50127,13 +49902,13 @@ let sha512 = "IQcdsQBqqXVRY5DatlI7ASy4flbhtU2V7cr4P2rK9rkFnVHO6LHcitwKXVZa9ocdOmpZDzk7U6iwHJkVFcR6OA=="; }; }; - "snyk-poetry-lockfile-parser-1.1.1" = { + "snyk-poetry-lockfile-parser-1.1.2" = { name = "snyk-poetry-lockfile-parser"; packageName = "snyk-poetry-lockfile-parser"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-poetry-lockfile-parser/-/snyk-poetry-lockfile-parser-1.1.1.tgz"; - sha512 = "G3LX27V2KUsKObwVN4vDDjrYr5BERad9pXHAf+SST5+vZsdPUUZjd1ZUIrHgCv7IQhwq+7mZrtqedY5x7+LIGA=="; + url = "https://registry.npmjs.org/snyk-poetry-lockfile-parser/-/snyk-poetry-lockfile-parser-1.1.2.tgz"; + sha512 = "qaLNhVw/og6LXRmSuPiXcwre07ybJWh8RASF3aumk5R0cmxCU3YLmJ7pfi/N+PMpwiHCfSZFOMIGIL9jXcX9zQ=="; }; }; "snyk-policy-1.14.1" = { @@ -50145,13 +49920,13 @@ let sha512 = "C5vSkoBYxPnaqb218sm4m6N5s1BhIXlldpIX5xRNnZ0QkDwVj3dy/PfgwxRgVQh7QFGa1ajbvKmsGmm4RRsN8g=="; }; }; - "snyk-python-plugin-1.19.1" = { + "snyk-python-plugin-1.19.2" = { name = "snyk-python-plugin"; packageName = "snyk-python-plugin"; - version = "1.19.1"; + version = "1.19.2"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.19.1.tgz"; - sha512 = "JoOUHnA76L3pekCblSuE9jQ9CuA5jt+GqXpsLQbEIZ0FQQTBa+0F7vfolg3Q7+s1it4ZdtgSbSWrlxCngIJt8g=="; + url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.19.2.tgz"; + sha512 = "n5Z7WiMTNtrBaDE9blnYVoX5fyXeMVhDNrQ/q21lHRAvDKDCY9tNNfduUjOVG6HbIH89mW8lLUdBNAMu/hpl+Q=="; }; }; "snyk-resolve-1.0.1" = { @@ -50217,13 +49992,13 @@ let sha512 = "2A892lrj0GcgR/9Qk81EaY2gYhCBxurV0PfmmESO6p27QPrUK1J3zdns+5QPqvUYK2q657nSj0guoIil9+7eFg=="; }; }; - "socket.io-2.4.0" = { + "socket.io-2.4.1" = { name = "socket.io"; packageName = "socket.io"; - version = "2.4.0"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-2.4.0.tgz"; - sha512 = "9UPJ1UTvKayuQfVv2IQ3k7tCQC/fboDyIK62i99dAQIyHKaBsNdTpwHLgKJ6guRWxRtC9H+138UwpaGuQO9uWQ=="; + url = "https://registry.npmjs.org/socket.io/-/socket.io-2.4.1.tgz"; + sha512 = "Si18v0mMXGAqLqCVpTxBa8MGqriHGQh8ccEOhmsmNS3thNCGBwO8WGrwMibANsWtQQ5NStdZwHqZR3naJVFc3w=="; }; }; "socket.io-3.0.5" = { @@ -50235,6 +50010,15 @@ let sha512 = "5yWQ43P/4IttmPCGKDQ3CVocBiJWGpibyhYJxgUhf69EHMzmK8XW0DkmHIoYdLmZaVZJyiEkUqpeC7rSCIqekw=="; }; }; + "socket.io-3.1.0" = { + name = "socket.io"; + packageName = "socket.io"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io/-/socket.io-3.1.0.tgz"; + sha512 = "Aqg2dlRh6xSJvRYK31ksG65q4kmBOqU4g+1ukhPcoT6wNGYoIwSYPlCPuRwOO9pgLUajojGFztl6+V2opmKcww=="; + }; + }; "socket.io-adapter-0.2.0" = { name = "socket.io-adapter"; packageName = "socket.io-adapter"; @@ -50262,6 +50046,15 @@ let sha512 = "2wo4EXgxOGSFueqvHAdnmi5JLZzWqMArjuP4nqC26AtLh5PoCPsaRbRdah2xhcwTAMooZfjYiNVNkkmmSMaxOQ=="; }; }; + "socket.io-adapter-2.1.0" = { + name = "socket.io-adapter"; + packageName = "socket.io-adapter"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.1.0.tgz"; + sha512 = "+vDov/aTsLjViYTwS9fPy5pEtTkrbEKsw2M+oVSoFGw6OD1IpvlV1VPhUzNbofCQ8oyMbdYJqDtGdmHQK6TdPg=="; + }; + }; "socket.io-client-1.0.6" = { name = "socket.io-client"; packageName = "socket.io-client"; @@ -50307,13 +50100,13 @@ let sha1 = "2609601f59e6a7fab436a53be3d333fbbfcbd30a"; }; }; - "socket.io-parser-3.3.1" = { + "socket.io-parser-3.3.2" = { name = "socket.io-parser"; packageName = "socket.io-parser"; - version = "3.3.1"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.1.tgz"; - sha512 = "1QLvVAe8dTz+mKmZ07Swxt+LAo4Y1ff50rlyoEx00TQmDFVQYPfcqGvIDJLGaBdhdNCecXtyKpD+EgKGcmmbuQ=="; + url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.2.tgz"; + sha512 = "FJvDBuOALxdCI9qwRrO/Rfp9yfndRtc1jSgVgV8FDraihmSP/MLGD5PEuJrNfjALvcQ+vMDM/33AWOYP/JSjDg=="; }; }; "socket.io-parser-3.4.1" = { @@ -50325,13 +50118,13 @@ let sha512 = "11hMgzL+WCLWf1uFtHSNvliI++tcRUWdoeYuwIl+Axvwy9z2gQM+7nJyN3STj1tLj5JyIUH8/gpDGxzAlDdi0A=="; }; }; - "socket.io-parser-4.0.3" = { + "socket.io-parser-4.0.4" = { name = "socket.io-parser"; packageName = "socket.io-parser"; - version = "4.0.3"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.3.tgz"; - sha512 = "m4ybFiP4UYVORRt7jcdqf8UWx+ywVdAqqsJyruXxAdD3Sv6MDemijWij34mOWdMJ55bEdIb9jACBhxUgNK6sxw=="; + url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.4.tgz"; + sha512 = "t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g=="; }; }; "sockjs-0.3.20" = { @@ -50820,13 +50613,13 @@ let sha512 = "U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ=="; }; }; - "spdx-license-list-6.3.0" = { + "spdx-license-list-6.4.0" = { name = "spdx-license-list"; packageName = "spdx-license-list"; - version = "6.3.0"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-list/-/spdx-license-list-6.3.0.tgz"; - sha512 = "Qz8ru5VVK5T4cFOBrshIzggzrQ15fVBcpjpZLCVz2j9KNnpslGbw8w1r06v2vi6YP6bnUSY5CXsFCfUypLZ2GA=="; + url = "https://registry.npmjs.org/spdx-license-list/-/spdx-license-list-6.4.0.tgz"; + sha512 = "4BxgJ1IZxTJuX1YxMGu2cRYK46Bk9zJNTK2/R0wNZR0cm+6SVl26/uG7FQmQtxoJQX1uZ0EpTi2L7zvMLboaBA=="; }; }; "spdy-1.32.5" = { @@ -51081,6 +50874,15 @@ let sha512 = "rjvqHFUaSGnzxDy2AHCwhHy6Zp6MNJzCPGYju4kD8yi6bze4d1/zMTg6C7JI49b7/EM7jKMTvyfN/4ylBKdwfw=="; }; }; + "sqlite3-5.0.1" = { + name = "sqlite3"; + packageName = "sqlite3"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sqlite3/-/sqlite3-5.0.1.tgz"; + sha512 = "kh2lTIcYNfmVcvhVJihsYuPj9U0xzBbh6bmqILO2hkryWSC9RRhzYmkIDtJkJ+d8Kg4wZRJ0T1reyHUEspICfg=="; + }; + }; "sqlstring-2.3.1" = { name = "sqlstring"; packageName = "sqlstring"; @@ -51828,6 +51630,15 @@ let sha1 = "91d5f5130d1cef96dcfa7f726945188741d09ee4"; }; }; + "stream-buffers-3.0.2" = { + name = "stream-buffers"; + packageName = "stream-buffers"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-buffers/-/stream-buffers-3.0.2.tgz"; + sha512 = "DQi1h8VEBA/lURbSwFtEHnSTb9s2/pwLEaFuNhXwy1Dx3Sa0lOuYT2yNUr4/j2fs8oCAMANtrZ5OrPZtyVs3MQ=="; + }; + }; "stream-chain-2.2.4" = { name = "stream-chain"; packageName = "stream-chain"; @@ -52125,13 +51936,13 @@ let sha1 = "e8aafc0ac1855b4666929ed7dd1275df5d6c811b"; }; }; - "string-kit-0.11.8" = { + "string-kit-0.11.10" = { name = "string-kit"; packageName = "string-kit"; - version = "0.11.8"; + version = "0.11.10"; src = fetchurl { - url = "https://registry.npmjs.org/string-kit/-/string-kit-0.11.8.tgz"; - sha512 = "lJyXXoptFpgOXL9cWZXtf45jxdbP5qYtaGZsmtFm4CZy9q6wwzvRzQcJiFeLx8I/0RpzBao9WCOGpbyfW2CMWA=="; + url = "https://registry.npmjs.org/string-kit/-/string-kit-0.11.10.tgz"; + sha512 = "ATVmIpMrqxPFNiNQTnmEeXzt3743O6DubJWh2MiAQV1ifKd4PcCjBcybCdb0ENnPO1T6asORK9nOpygn1BATag=="; }; }; "string-length-1.0.1" = { @@ -52170,15 +51981,6 @@ let sha1 = "3aaad855b3e9735c5e412dfe72198ccf99c7f48e"; }; }; - "string-range-1.2.2" = { - name = "string-range"; - packageName = "string-range"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/string-range/-/string-range-1.2.2.tgz"; - sha1 = "a893ed347e72299bc83befbbf2a692a8d239d5dd"; - }; - }; "string-similarity-2.0.0" = { name = "string-similarity"; packageName = "string-similarity"; @@ -52683,13 +52485,13 @@ let sha1 = "0fdedc68e91addcfcb2e6be9c262581a6e8c28aa"; }; }; - "strtok3-6.0.6" = { + "strtok3-6.0.8" = { name = "strtok3"; packageName = "strtok3"; - version = "6.0.6"; + version = "6.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/strtok3/-/strtok3-6.0.6.tgz"; - sha512 = "fVxvAEKDwHFfbQO1yKxKBPfkWZyBr0Zf20UQ/mblbkAQe5h0Xdd2jDb3Mh7yRZd7LSItJ9JWgQWelpEmVoBe2g=="; + url = "https://registry.npmjs.org/strtok3/-/strtok3-6.0.8.tgz"; + sha512 = "QLgv+oiXwXgCgp2PdPPa+Jpp4D9imK9e/0BsyfeFMr6QL6wMVqoVn9+OXQ9I7MZbmUzN6lmitTJ09uwS2OmGcw=="; }; }; "structured-source-3.0.2" = { @@ -52737,13 +52539,13 @@ let sha512 = "7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g=="; }; }; - "stylelint-13.8.0" = { + "stylelint-13.9.0" = { name = "stylelint"; packageName = "stylelint"; - version = "13.8.0"; + version = "13.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/stylelint/-/stylelint-13.8.0.tgz"; - sha512 = "iHH3dv3UI23SLDrH4zMQDjLT9/dDIz/IpoFeuNxZmEx86KtfpjDOscxLTFioQyv+2vQjPlRZnK0UoJtfxLICXQ=="; + url = "https://registry.npmjs.org/stylelint/-/stylelint-13.9.0.tgz"; + sha512 = "VVWH2oixOAxpWL1vH+V42ReCzBjW2AeqskSAbi8+3OjV1Xg3VZkmTcAqBZfRRvJeF4BvYuDLXebW3tIHxgZDEg=="; }; }; "stylelint-8.4.0" = { @@ -53142,13 +52944,13 @@ let sha512 = "xk5CMbwoQVI53rTq9o/iMojAqXP5NT4/+TMeTP4uXWDIH18pB9AXgO5Olqt0RXuf3jH032DA4DS4qzem6XdXAw=="; }; }; - "swagger-ui-dist-3.38.0" = { + "swagger-ui-dist-3.40.0" = { name = "swagger-ui-dist"; packageName = "swagger-ui-dist"; - version = "3.38.0"; + version = "3.40.0"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.38.0.tgz"; - sha512 = "sselV8VY6f1BBauY9Sdmwz0jVaWTnGuHQWei7BaTpiUrLcoEUdmmK5bKefLXiwq+dx//es2S8mOvUS+tcXDsKg=="; + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.40.0.tgz"; + sha512 = "R0eaS61/cOE6wiFOY7AtmoTBV5lZqmyosuE14G9nAudp5MNsNfCTdI9MWJLs8iF28HXdtH8EACiFFtUbQomHog=="; }; }; "swagger2openapi-6.2.3" = { @@ -53160,13 +52962,13 @@ let sha512 = "cUUktzLpK69UwpMbcTzjMw2ns9RZChfxh56AHv6+hTx3StPOX2foZjPgds3HlJcINbxosYYBn/D3cG8nwcCWwQ=="; }; }; - "swagger2openapi-7.0.4" = { + "swagger2openapi-7.0.5" = { name = "swagger2openapi"; packageName = "swagger2openapi"; - version = "7.0.4"; + version = "7.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/swagger2openapi/-/swagger2openapi-7.0.4.tgz"; - sha512 = "MGzJU44XSXHKxvtx/NbBnP3z5s1KzN5xhqIBERoZEKfRiZ56lNUo5TGOv0dJ8n7JGeheCeU0CydfvbSOh+DaXg=="; + url = "https://registry.npmjs.org/swagger2openapi/-/swagger2openapi-7.0.5.tgz"; + sha512 = "Hzxse+VTX0u8xBgYJ665EjO6BfvW2PN9Yv+yIjBDm6ga9jl83+4CEdCCpznH+ILr5MS8bIIXB+XcQUM3u25w4g=="; }; }; "sway-1.0.0" = { @@ -53268,13 +53070,13 @@ let sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; - "systeminformation-4.34.2" = { + "systeminformation-4.34.9" = { name = "systeminformation"; packageName = "systeminformation"; - version = "4.34.2"; + version = "4.34.9"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.34.2.tgz"; - sha512 = "1LynQMla38gIjzyupKBnBLIo4B0TQf3vdhs2bjKPtN02EymuSWpoAM1KX/6+gtFLVmn91MfllE3wSVGQcVTHDw=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.34.9.tgz"; + sha512 = "jvc4DlJeXazsen2riPDR97GSaHNCmoL+mgfB8IXxmpNpNd7kv5MfkuihXEmF1/prBFtqzUA2lxnt1qp4maOMQA=="; }; }; "table-3.8.3" = { @@ -53377,13 +53179,13 @@ let sha1 = "7cbcb64b5a141b6a2efc2c5d2c67b4e150b2a268"; }; }; - "tail-2.1.1" = { + "tail-2.2.0" = { name = "tail"; packageName = "tail"; - version = "2.1.1"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/tail/-/tail-2.1.1.tgz"; - sha512 = "TBGFzKYD5Af/ts7DBypAQNmPQlt5Uq0bqcf4eRwnfvQcLnSTqruA8h3ps7CKIEPcwX7z9YnP3B6bBHLWYN7+ag=="; + url = "https://registry.npmjs.org/tail/-/tail-2.2.0.tgz"; + sha512 = "QqUMtWlnzArTvGyjVnAE5fAiXEm2Psvk/BlE7vWx2/dIEWMsAhcNPz7iW6WTiSM8h1fjtCkRMsaWBS1j6rpGBg=="; }; }; "taketalk-1.0.0" = { @@ -53485,6 +53287,15 @@ let sha512 = "0b4HOimQHj9nXNEAA7zWwMM91Zhhba3pspja6sQbgTpynOJf+bkjBnfybNYzbpLbnwXnbyB4LOREvlyXLkCHSg=="; }; }; + "tar-6.1.0" = { + name = "tar"; + packageName = "tar"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tar/-/tar-6.1.0.tgz"; + sha512 = "DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA=="; + }; + }; "tar-fs-1.16.3" = { name = "tar-fs"; packageName = "tar-fs"; @@ -53728,13 +53539,13 @@ let sha512 = "wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg=="; }; }; - "terminal-kit-1.44.3" = { + "terminal-kit-1.45.9" = { name = "terminal-kit"; packageName = "terminal-kit"; - version = "1.44.3"; + version = "1.45.9"; src = fetchurl { - url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.44.3.tgz"; - sha512 = "G7V7l2pqJqa5llfn/ORDgKlUMGG27n1nxuxwWmZ4/1hCURz+yldKrknirIeu/kyK5M3UdtgPJ0wGAAXw+0aVfw=="; + url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.45.9.tgz"; + sha512 = "uf648u2bfWz3lX9iBVgdTebIMVc78OE0cgEGuuNQWWKU8soaf+R09fYQWTpMRiz59nKxn78s8wZptGmt/hAyfQ=="; }; }; "terminal-link-2.1.1" = { @@ -53800,13 +53611,13 @@ let sha512 = "3qAQpykRTD5DReLu5/cwpsg7EZFzP3Q0Hp2XUWJUw2mpq2jfgOKTZr8IZKKnNieRVVo1UauROTdhbQJZveGKtQ=="; }; }; - "terser-webpack-plugin-5.0.3" = { + "terser-webpack-plugin-5.1.1" = { name = "terser-webpack-plugin"; packageName = "terser-webpack-plugin"; - version = "5.0.3"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.0.3.tgz"; - sha512 = "zFdGk8Lh9ZJGPxxPE6jwysOlATWB8GMW8HcfGULWA/nPal+3VdATflQvSBSLQJRCmYZnfFJl6vkRTiwJGNgPiQ=="; + url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.1.1.tgz"; + sha512 = "5XNNXZiR8YO6X6KhSGXfY0QrGrCRlSwAEjIIrlRQR4W8nP69TaJUlh3bkuac6zzgspiGPfKEHcY295MMVExl5Q=="; }; }; "test-exclude-6.0.0" = { @@ -54592,13 +54403,13 @@ let sha1 = "ceeefc717a76c4316f126d0b9dbaa55d7e7df01a"; }; }; - "token-types-2.0.0" = { + "token-types-2.1.1" = { name = "token-types"; packageName = "token-types"; - version = "2.0.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/token-types/-/token-types-2.0.0.tgz"; - sha512 = "WWvu8sGK8/ZmGusekZJJ5NM6rRVTTDO7/bahz4NGiSDb/XsmdYBn6a1N/bymUHuWYTWeuLUg98wUzvE4jPdCZw=="; + url = "https://registry.npmjs.org/token-types/-/token-types-2.1.1.tgz"; + sha512 = "wnQcqlreS6VjthyHO3Y/kpK/emflxDBNhlNUPfh7wE39KnuDdOituXomIbyI79vBtF0Ninpkh72mcuRHo+RG3Q=="; }; }; "toml-2.3.6" = { @@ -55150,6 +54961,15 @@ let sha512 = "uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ=="; }; }; + "tslib-2.1.0" = { + name = "tslib"; + packageName = "tslib"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz"; + sha512 = "hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A=="; + }; + }; "tslint-5.20.1" = { name = "tslint"; packageName = "tslint"; @@ -55186,13 +55006,13 @@ let sha512 = "g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA=="; }; }; - "tsutils-3.18.0" = { + "tsutils-3.20.0" = { name = "tsutils"; packageName = "tsutils"; - version = "3.18.0"; + version = "3.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/tsutils/-/tsutils-3.18.0.tgz"; - sha512 = "D9Tu8nE3E7D1Bsf/V29oMHceMf+gnVO+pDguk/A5YRo1cLpkiQ48ZnbbS57pvvHeY+OIeNQx1vf4ASPlEtRpcA=="; + url = "https://registry.npmjs.org/tsutils/-/tsutils-3.20.0.tgz"; + sha512 = "RYbuQuvkhuqVeXweWT3tJLKOEJ/UUw9GjNEZGWdrLLlM+611o1gwLHBpxoFJKKl25fLprp2eVthtKs5JOrNeXg=="; }; }; "ttf2woff-2.0.2" = { @@ -55303,6 +55123,15 @@ let sha512 = "pqZ6WrHFGnxXC9q2xJ3Qa7EoLAwrojgFRajWZjxTKwbz9vnNnyi8lLjiD5h86UTPOcMlEyHjm6NMhjEDdlc25A=="; }; }; + "turndown-7.0.0" = { + name = "turndown"; + packageName = "turndown"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/turndown/-/turndown-7.0.0.tgz"; + sha512 = "G1FfxfR0mUNMeGjszLYl3kxtopC4O9DRRiMlMDDVHvU1jaBkGFg4qxIyjIk2aiKLHyDyZvZyu4qBO2guuYBy3Q=="; + }; + }; "tv4-1.3.0" = { name = "tv4"; packageName = "tv4"; @@ -55564,15 +55393,6 @@ let sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; }; }; - "typedarray-to-buffer-1.0.4" = { - name = "typedarray-to-buffer"; - packageName = "typedarray-to-buffer"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-1.0.4.tgz"; - sha1 = "9bb8ba0e841fb3f4cf1fe7c245e9f3fa8a5fe99c"; - }; - }; "typedarray-to-buffer-3.1.5" = { name = "typedarray-to-buffer"; packageName = "typedarray-to-buffer"; @@ -55699,13 +55519,13 @@ let sha1 = "5c080e5d661cbbe38259d2e70a3c7253e873881d"; }; }; - "typo-geom-0.11.0" = { + "typo-geom-0.11.1" = { name = "typo-geom"; packageName = "typo-geom"; - version = "0.11.0"; + version = "0.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/typo-geom/-/typo-geom-0.11.0.tgz"; - sha512 = "0f7MjfJdUOYCLfUpVegTIukkWd1nkvN6CX6oXF8hcx9Hu04qhQfTC+gOffH8bhSjsSiLhIy7aRuzgIAj4UdyyQ=="; + url = "https://registry.npmjs.org/typo-geom/-/typo-geom-0.11.1.tgz"; + sha512 = "DqAx/eGYLJprgRHEV2cMQBzRJo2N9UdBJ2eN54OeZ9chHbq+9U059lLY2DUxeGMff5rtTyG966CuL9aO4csxbQ=="; }; }; "ua-parser-js-0.7.21" = { @@ -55717,13 +55537,13 @@ let sha512 = "+O8/qh/Qj8CgC6eYBVBykMrNtp5Gebn4dlGD/kKXVkJNDwyrAwSIqwz8CDf+tsAIWVycKcku6gIXJ0qwx/ZXaQ=="; }; }; - "ua-parser-js-0.7.22" = { + "ua-parser-js-0.7.23" = { name = "ua-parser-js"; packageName = "ua-parser-js"; - version = "0.7.22"; + version = "0.7.23"; src = fetchurl { - url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.22.tgz"; - sha512 = "YUxzMjJ5T71w6a8WWVcMGM6YWOTX27rCoIQgLXiWaxqXSx9D7DNjiGWn1aJIRSQ5qr0xuhra77bSIh6voR/46Q=="; + url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.23.tgz"; + sha512 = "m4hvMLxgGHXG3O3fQVAyyAQpZzDOvwnhOTjYz5Xmr7r/+LpkNy3vJXdVRWgd1TkAb7NGROZuSy96CrlNVjA7KA=="; }; }; "uc.micro-1.0.6" = { @@ -55744,22 +55564,22 @@ let sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd"; }; }; - "uglify-js-3.11.6" = { + "uglify-js-3.12.4" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.11.6"; + version = "3.12.4"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.11.6.tgz"; - sha512 = "oASI1FOJ7BBFkSCNDZ446EgkSuHkOZBuqRFrwXIKWCoXw8ZXQETooTQjkAcBS03Acab7ubCKsXnwuV2svy061g=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.4.tgz"; + sha512 = "L5i5jg/SHkEqzN18gQMTWsZk3KelRsfD1wUVNqtq0kzqWQqcJjyL8yc1o8hJgRrWqrAl2mUFbhfznEIoi7zi2A=="; }; }; - "uglify-js-3.12.4" = { + "uglify-js-3.12.5" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.12.4"; + version = "3.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.4.tgz"; - sha512 = "L5i5jg/SHkEqzN18gQMTWsZk3KelRsfD1wUVNqtq0kzqWQqcJjyL8yc1o8hJgRrWqrAl2mUFbhfznEIoi7zi2A=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.5.tgz"; + sha512 = "SgpgScL4T7Hj/w/GexjnBHi3Ien9WS1Rpfg5y91WXMj9SY997ZCQU76mH4TpLwwfmMvoOU8wiaRkIf6NaH3mtg=="; }; }; "uglify-js-3.4.10" = { @@ -56842,13 +56662,13 @@ let sha1 = "f90b858507f81dea4dcfbb3c4c3dbfa2b557faaa"; }; }; - "uri-js-4.4.0" = { + "uri-js-4.4.1" = { name = "uri-js"; packageName = "uri-js"; - version = "4.4.0"; + version = "4.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz"; - sha512 = "B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g=="; + url = "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz"; + sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="; }; }; "urijs-1.19.5" = { @@ -56869,13 +56689,13 @@ let sha1 = "da937f7a62e21fec1fd18d49b35c2935067a6c72"; }; }; - "urkel-0.6.3" = { + "urkel-0.7.0" = { name = "urkel"; packageName = "urkel"; - version = "0.6.3"; + version = "0.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/urkel/-/urkel-0.6.3.tgz"; - sha512 = "aY/u3cpCRRwa3XjUGG8DcLcQJSNmQ0+qXDeT0igDytKhrK+yiusZ7mYdPRzmtbQ2CPozHhwsmVxCVBkPBp9jDQ=="; + url = "https://registry.npmjs.org/urkel/-/urkel-0.7.0.tgz"; + sha512 = "7Z3Gor4DkKKi0Ehp6H9xehWXqyL12+PA4JM41dcVc1LWks4zI4PGWv6DWgxaLCC+otpEuGdq3Vh5ayD/Mvzfbg=="; }; }; "url-0.10.3" = { @@ -57212,6 +57032,15 @@ let sha512 = "g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA=="; }; }; + "util.promisify-1.1.1" = { + name = "util.promisify"; + packageName = "util.promisify"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/util.promisify/-/util.promisify-1.1.1.tgz"; + sha512 = "/s3UsZUrIfa6xDhr7zZhnE9SLQ5RIXyYfiVnMMyMDzOc8WhWN4Nbh36H842OyurKbCDAesZOJaVyvmSl6fhGQw=="; + }; + }; "utila-0.4.0" = { name = "utila"; packageName = "utila"; @@ -57329,15 +57158,6 @@ let sha512 = "fX6Z5o4m6XsXBdli9g7DtWgAx+osMsRRZFKma1mIUsLCz6vRvv+pz5VNbyu9UEDzpMWulZfvpgb/cmDXVulYFQ=="; }; }; - "uuid-8.3.1" = { - name = "uuid"; - packageName = "uuid"; - version = "8.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-8.3.1.tgz"; - sha512 = "FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg=="; - }; - }; "uuid-8.3.2" = { name = "uuid"; packageName = "uuid"; @@ -57599,13 +57419,13 @@ let sha1 = "cfde751860a15822db3b132bc59b116a4adaf01b"; }; }; - "vega-5.17.3" = { + "vega-5.19.1" = { name = "vega"; packageName = "vega"; - version = "5.17.3"; + version = "5.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/vega/-/vega-5.17.3.tgz"; - sha512 = "c8N2pNg9MMmC6shNpoxVw3aVp2XPFOgmWNX5BEOAdCaGHRnSgzNy44+gYdGRaIe6+ljTzZg99Mf+OLO50IP42A=="; + url = "https://registry.npmjs.org/vega/-/vega-5.19.1.tgz"; + sha512 = "UE6/c9q9kzuz4HULFuU9HscBASoZa+zcXqGKdbQP545Nwmhd078QpcH+wZsq9lYfiTxmFtzLK/a0OH0zhkghvA=="; }; }; "vega-canvas-1.2.6" = { @@ -57689,13 +57509,13 @@ let sha512 = "oTAeub3KWm6nKhXoYCx1q9G3K43R6/pDMXvqDlTSUtjoY7b/Gixm8iLcir5S9bPjvH40n4AcbZsPmNfL/Up77A=="; }; }; - "vega-functions-5.10.0" = { + "vega-functions-5.12.0" = { name = "vega-functions"; packageName = "vega-functions"; - version = "5.10.0"; + version = "5.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/vega-functions/-/vega-functions-5.10.0.tgz"; - sha512 = "1l28OxUwOj8FEvRU62Oz2hiTuDECrvx1DPU1qLebBKhlgaKbcCk3XyHrn1kUzhMKpXq+SFv5VPxchZP47ASSvQ=="; + url = "https://registry.npmjs.org/vega-functions/-/vega-functions-5.12.0.tgz"; + sha512 = "3hljmGs+gR7TbO/yYuvAP9P5laKISf1GKk4yRHLNdM61fWgKm8pI3f6LY2Hvq9cHQFTiJ3/5/Bx2p1SX5R4quQ=="; }; }; "vega-geo-4.3.8" = { @@ -57734,13 +57554,13 @@ let sha512 = "e5enQECdau7rJob0NFB5pGumh3RaaSWWm90+boxMy3ay2b4Ki/3XIvo+C4F1Lx04qSxvQF7tO2LJcklRm6nqRA=="; }; }; - "vega-parser-6.1.2" = { + "vega-parser-6.1.3" = { name = "vega-parser"; packageName = "vega-parser"; - version = "6.1.2"; + version = "6.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/vega-parser/-/vega-parser-6.1.2.tgz"; - sha512 = "aGyZrNzPrBruEb/WhemKDuDjQsIkMDGIgnSJci0b+9ZVxjyAzMl7UfGbiYorPiJlnIercjUJbMoFD6fCIf4gqQ=="; + url = "https://registry.npmjs.org/vega-parser/-/vega-parser-6.1.3.tgz"; + sha512 = "8oiVhhW26GQ4GZBvolId8FVFvhn3s1KGgPlD7Z+4P2wkV+xe5Nqu0TEJ20F/cn3b88fd0Vj48X3BH3dlSeKNFg=="; }; }; "vega-projection-1.4.5" = { @@ -57779,22 +57599,22 @@ let sha512 = "yE0to0prA9E5PBJ/XP77TO0BMkzyUVyt7TH5PAwj+CZT7PMsMO6ozihelRhoIiVcP0Ae/ByCEQBUQkzN5zJ0ZA=="; }; }; - "vega-scenegraph-4.9.2" = { + "vega-scenegraph-4.9.3" = { name = "vega-scenegraph"; packageName = "vega-scenegraph"; - version = "4.9.2"; + version = "4.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/vega-scenegraph/-/vega-scenegraph-4.9.2.tgz"; - sha512 = "epm1CxcB8AucXQlSDeFnmzy0FCj+HV2k9R6ch2lfLRln5lPLEfgJWgFcFhVf5jyheY0FSeHH52Q5zQn1vYI1Ow=="; + url = "https://registry.npmjs.org/vega-scenegraph/-/vega-scenegraph-4.9.3.tgz"; + sha512 = "lBvqLbXqrqRCTGJmSgzZC/tLR/o+TXfakbdhDzNdpgTavTaQ65S/67Gpj5hPpi77DvsfZUIY9lCEeO37aJhy0Q=="; }; }; - "vega-selections-5.1.5" = { + "vega-selections-5.3.0" = { name = "vega-selections"; packageName = "vega-selections"; - version = "5.1.5"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/vega-selections/-/vega-selections-5.1.5.tgz"; - sha512 = "oRSsfkqYqA5xfEJqDpgnSDd+w0k6p6SGYisMD6rGXMxuPl0x0Uy6RvDr4nbEtB+dpWdoWEvgrsZVS6axyDNWvQ=="; + url = "https://registry.npmjs.org/vega-selections/-/vega-selections-5.3.0.tgz"; + sha512 = "vC4NPsuN+IffruFXfH0L3i2A51RgG4PqpLv85TvrEAIYnSkyKDE4bf+wVraR3aPdnLLkc3+tYuMi6le5FmThIA=="; }; }; "vega-statistics-1.7.9" = { @@ -58229,13 +58049,13 @@ let sha1 = "c066afb582bb1cb4128d60ea92392e94d5e9dbec"; }; }; - "vsce-1.83.0" = { + "vsce-1.84.0" = { name = "vsce"; packageName = "vsce"; - version = "1.83.0"; + version = "1.84.0"; src = fetchurl { - url = "https://registry.npmjs.org/vsce/-/vsce-1.83.0.tgz"; - sha512 = "gyF/xtCOFcKO+EvC0FQu5jPECHz2XKMWcw62gqwJJ22lVvlj58t49sWe1IGl9S5NpxCek+QMm6V9i/cDwGWs/Q=="; + url = "https://registry.npmjs.org/vsce/-/vsce-1.84.0.tgz"; + sha512 = "mRJDTMC/1GO7byz6dleY28CZo97cM1p0nU3EEMT5bGMpi5Yga3dKdgTvmwgSQF5BYWozNSNSqN1zih5SYzMZjA=="; }; }; "vscode-css-languageservice-3.0.13" = { @@ -58634,13 +58454,13 @@ let sha512 = "u0Lw+IYlgbEJFF6/qAqG2d1jQmJl0eyAGJHoAJqr2HT4M2BNuQYSEiSE75f52pXHSJm8AlTjnLLbBFPrdz2hpA=="; }; }; - "vscode-test-1.4.1" = { + "vscode-test-1.5.0" = { name = "vscode-test"; packageName = "vscode-test"; - version = "1.4.1"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-test/-/vscode-test-1.4.1.tgz"; - sha512 = "Ls7+JyC06cUCuomlTYk4aNJI00Rri09hgtkNl3zfQ1bj6meXglpSPpuzJ/RPNetlUHFMm4eGs0Xr/H5pFPVwfQ=="; + url = "https://registry.npmjs.org/vscode-test/-/vscode-test-1.5.0.tgz"; + sha512 = "svwE/mhBBqrB77C1U7pkUKfUmxnkzg0dLGi1vEmitsleu88oNsqZEhG3ANZrL/Ia4m0CW0oYEKRw2EojpFxLlQ=="; }; }; "vscode-textbuffer-1.0.0" = { @@ -58769,13 +58589,13 @@ let sha512 = "8FdXi0gieEwh1IprIBafpiJWcApwrU+l2FEj8c1HtHFdNXMd0+2jUSjBVmcQYohf/E72irwAXEXLga6TQcB3FA=="; }; }; - "vue-eslint-parser-7.3.0" = { + "vue-eslint-parser-7.4.1" = { name = "vue-eslint-parser"; packageName = "vue-eslint-parser"; - version = "7.3.0"; + version = "7.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.3.0.tgz"; - sha512 = "n5PJKZbyspD0+8LnaZgpEvNCrjQx1DyDHw8JdWwoxhhC+yRip4TAvSDpXGf9SWX6b0umeB5aR61gwUo6NVvFxw=="; + url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.4.1.tgz"; + sha512 = "AFvhdxpFvliYq1xt/biNBslTHE/zbEvSnr1qfHA/KxRIpErmEDrQZlQnvEexednRHmLfDNOMuDYwZL5xkLzIXQ=="; }; }; "vue-onsenui-helper-json-1.0.2" = { @@ -58868,15 +58688,6 @@ let sha1 = "340a717bde765726fa0aa07d721e0147a551df0c"; }; }; - "watchpack-1.7.4" = { - name = "watchpack"; - packageName = "watchpack"; - version = "1.7.4"; - src = fetchurl { - url = "https://registry.npmjs.org/watchpack/-/watchpack-1.7.4.tgz"; - sha512 = "aWAgTW4MoSJzZPAicljkO1hsi1oKj/RRq/OJQh2PKI2UKL04c2Bs+MBOB+BBABHTXJpf9mCwHN7ANCvYsvY2sg=="; - }; - }; "watchpack-1.7.5" = { name = "watchpack"; packageName = "watchpack"; @@ -58967,13 +58778,13 @@ let sha512 = "n1CfuJcJ+dynIx/fmavB6haPx37N3GZvY5HIGIselymDiSwNRC+8pAxOzoB4eVwUBJnbP3+aA8vWttrAZbgs7A=="; }; }; - "webassemblyjs-1.9.1" = { + "webassemblyjs-1.11.0" = { name = "webassemblyjs"; packageName = "webassemblyjs"; - version = "1.9.1"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/webassemblyjs/-/webassemblyjs-1.9.1.tgz"; - sha512 = "x0YxqLnuk8PjeZf5NOkmdQ4FwIRa7NlX3WIRhbpzSaGCih6la55TaATY4BpS81lMyjZvpdfKAQlLVzvd5G57fg=="; + url = "https://registry.npmjs.org/webassemblyjs/-/webassemblyjs-1.11.0.tgz"; + sha512 = "zAwCqHShTm/OBhYzqXlumetrI5yAkMFbFjnv8qba4WtP+KZIchkAml6zPDZWnxQQH2rs9TTbcbXrMVQplleJQA=="; }; }; "webidl-conversions-2.0.1" = { @@ -59030,6 +58841,15 @@ let sha512 = "6KJVGlCxYdISyurpQ0IPTklv+DULv05rs2hseIXer6D7KrUicRDLFb4IUM1S6LUAKypPM/nSiVSuv8jHu1m3/Q=="; }; }; + "webpack-4.46.0" = { + name = "webpack"; + packageName = "webpack"; + version = "4.46.0"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack/-/webpack-4.46.0.tgz"; + sha512 = "6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q=="; + }; + }; "webpack-5.9.0" = { name = "webpack"; packageName = "webpack"; @@ -59102,13 +58922,13 @@ let sha512 = "9S6YyKKKh/Oz/eryM1RyLVDVmy3NSPV0JXMRhZ18fJsq+AwGxUY34X54VNwkzYcEmEkDwNxuEOboCZEebJXBAQ=="; }; }; - "webpack-merge-4.2.2" = { + "webpack-merge-5.7.3" = { name = "webpack-merge"; packageName = "webpack-merge"; - version = "4.2.2"; + version = "5.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz"; - sha512 = "TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g=="; + url = "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.7.3.tgz"; + sha512 = "6/JUQv0ELQ1igjGDzHkXbVDRxkfA57Zw7PfiupdLFJYrgFqY5ZP8xxbpp2lU3EPwYx89ht5Z/aDkD40hFCm5AA=="; }; }; "webpack-node-externals-2.5.2" = { @@ -59183,13 +59003,13 @@ let sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="; }; }; - "webtorrent-0.112.0" = { + "webtorrent-0.112.2" = { name = "webtorrent"; packageName = "webtorrent"; - version = "0.112.0"; + version = "0.112.2"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.112.0.tgz"; - sha512 = "3Fe4tzeXhZKI0KXGGkr9gyzlx7eKjfU9Se2VJhdE1AcpHppxApuechaWu/KS24amUv4j+xPXE7f3Lc4wF+7QSQ=="; + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.112.2.tgz"; + sha512 = "yaSBGIoDNKHTEpNbV+VZHqvlbDA3StD2ww9QgQ142bg9fFRT+w0TnvEKXlB4FLAir0vk4MfEhgRe+lG9wq/CRg=="; }; }; "well-known-symbols-2.0.0" = { @@ -59426,13 +59246,22 @@ let sha512 = "nSiLDIIMAmnulDIRcophSU4oOLW1AGnQKNim+SI5MtzE5gwlD+VJNTkBbSYq8Nov8WjD9jWobaKxo+5yeiC1vA=="; }; }; - "wikipeg-2.0.3" = { + "wikipeg-2.0.5" = { name = "wikipeg"; packageName = "wikipeg"; - version = "2.0.3"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/wikipeg/-/wikipeg-2.0.3.tgz"; - sha512 = "VMVqiZRIFqb5rQYhRqvzPy5yFwJyCkjEdNAsSnq6ZxYH+7EN7/U+R3LrIx1Lf16pq+DZuWY3wrkq6YFhU8c0lg=="; + url = "https://registry.npmjs.org/wikipeg/-/wikipeg-2.0.5.tgz"; + sha512 = "FMNznSW4Qjexmgqz23YLtXoS6+GKPnbkEsI14xdRxsWv8jQWJ94ffQZ4PpUSsZm7/XAjqrjFiUnbvOOxBhJY4g=="; + }; + }; + "wildcard-2.0.0" = { + name = "wildcard"; + packageName = "wildcard"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz"; + sha512 = "JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw=="; }; }; "win-detect-browsers-1.0.2" = { @@ -60056,24 +59885,6 @@ let sha512 = "C34cIU4+DB2vMyAbmEKossWq2ZQDr6QEyuuCzWrM9zfw1sGc0mYiJ0UnG9zzNykt49C2Fi34hvr2vssFQRS6EA=="; }; }; - "ws-7.3.1" = { - name = "ws"; - packageName = "ws"; - version = "7.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz"; - sha512 = "D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA=="; - }; - }; - "ws-7.4.1" = { - name = "ws"; - packageName = "ws"; - version = "7.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.4.1.tgz"; - sha512 = "pTsP8UAfhy3sk1lSk/O/s4tjD0CRwvMnzvwr4OKGX7ZvqZtUyx4KIJB5JWbkykPoc55tixMGgTNoh3k4FkNGFQ=="; - }; - }; "ws-7.4.2" = { name = "ws"; packageName = "ws"; @@ -60389,15 +60200,6 @@ let sha512 = "HgS+X6zAztGa9zIK3Y3LXuJes33Lz9x+YyTxgrkIdabu2vqcGOWwdfCpf1hWLRrd553wd4QCDf6BBO6FfdsRiQ=="; }; }; - "xmldoc-1.1.2" = { - name = "xmldoc"; - packageName = "xmldoc"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/xmldoc/-/xmldoc-1.1.2.tgz"; - sha512 = "ruPC/fyPNck2BD1dpz0AZZyrEwMOrWTO5lDdIXS91rs3wtm4j+T8Rp2o+zoOYkkAxJTZRPOSnOGei1egoRmKMQ=="; - }; - }; "xmldom-0.1.19" = { name = "xmldom"; packageName = "xmldom"; @@ -60552,15 +60354,6 @@ let sha512 = "1bLb+kKKtKPbgTK6i/BaoAn03g47PpFstlbe1BA+y3pNS/LfvcaghS5BFf9+EE1J+KwSQsEpfJvFN5GqFtiNmw=="; }; }; - "xtend-2.0.6" = { - name = "xtend"; - packageName = "xtend"; - version = "2.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/xtend/-/xtend-2.0.6.tgz"; - sha1 = "5ea657a6dba447069c2e59c58a1138cb0c5e6cee"; - }; - }; "xtend-2.1.2" = { name = "xtend"; packageName = "xtend"; @@ -60570,24 +60363,6 @@ let sha1 = "6efecc2a4dad8e6962c4901b337ce7ba87b5d28b"; }; }; - "xtend-2.2.0" = { - name = "xtend"; - packageName = "xtend"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/xtend/-/xtend-2.2.0.tgz"; - sha1 = "eef6b1f198c1c8deafad8b1765a04dad4a01c5a9"; - }; - }; - "xtend-3.0.0" = { - name = "xtend"; - packageName = "xtend"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz"; - sha1 = "5cce7407baf642cba7becda568111c493f59665a"; - }; - }; "xtend-4.0.2" = { name = "xtend"; packageName = "xtend"; @@ -60696,13 +60471,13 @@ let sha512 = "26QP9JhfcrroDTeMv2OsY4eoI+NKb6tZwy1Uz0MBWi1uGmOw0/6aR9Oa3guOsC96U27GAqT6glRFMjCGqLro7A=="; }; }; - "yaml-language-server-parser-0.1.1" = { + "yaml-language-server-parser-0.1.2" = { name = "yaml-language-server-parser"; packageName = "yaml-language-server-parser"; - version = "0.1.1"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/yaml-language-server-parser/-/yaml-language-server-parser-0.1.1.tgz"; - sha512 = "2PememGb1SrPqXAxXTpBD39rwYZap6CJVSvkfULNv9uwV3VHp1TfkgpsylBb+mpuuivH0JZ52lChXPvNa6yVxw=="; + url = "https://registry.npmjs.org/yaml-language-server-parser/-/yaml-language-server-parser-0.1.2.tgz"; + sha512 = "GQ2eRE5GcKBK8XVKBIcMyOfC8WMZmEs6gogtVc6knLKE6pG+e5L/lOMfBxZzAt2lqye5itMggQ9+6stXAVhMsw=="; }; }; "yaml-language-server-parser-0.1.3-fa8245c.0" = { @@ -60858,6 +60633,16 @@ let sha512 = "huO4Fr1f9PmiJJdll5kwoS2e4GqzGSsMT3PPMpOwoVkOK8ckqAewMTZyA6LXVQWflleb/Z8oPBEvNsMft0XE+g=="; }; }; + "yargs-git://github.com/gardenappl/yargs" = { + name = "yargs"; + packageName = "yargs"; + version = "17.0.0-candidate.0"; + src = fetchgit { + url = "git://github.com/gardenappl/yargs"; + rev = "544529c59269e8d1e494f4a081d6f3cfc6a99035"; + sha256 = "22c042f035f98c840f0dc1390fe22947dda8aadf6c40f154529947d21b2b2bf3"; + }; + }; "yargs-parser-10.1.0" = { name = "yargs-parser"; packageName = "yargs-parser"; @@ -61215,70 +61000,85 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "11.0.5"; + version = "11.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-11.0.5.tgz"; - sha512 = "k4j/2z7qkuigJ1shH0McW1wW63clhrbrg98FK4/KWhU/sce5AgVjuHDQFycAclTwHesf7Vs6Gzt7zGlqUmeKIg=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-11.1.1.tgz"; + sha512 = "2nRx9KYzLVCtJA4pgDmxubHOp54O/74BYt3WGHAA7QcnSATEL7jF5a9SMoEAJ2sUtKUVVS+2dKbmYKwW6oL3Bw=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1100.5" - sources."@angular-devkit/core-11.0.5" - sources."@angular-devkit/schematics-11.0.5" - sources."@schematics/angular-11.0.5" - sources."@schematics/update-0.1100.5" + sources."@angular-devkit/architect-0.1101.1" + sources."@angular-devkit/core-11.1.1" + sources."@angular-devkit/schematics-11.1.1" + sources."@npmcli/ci-detect-1.3.0" + sources."@npmcli/git-2.0.4" + sources."@npmcli/installed-package-contents-1.0.5" + (sources."@npmcli/move-file-1.1.0" // { + dependencies = [ + sources."rimraf-2.7.1" + ]; + }) + sources."@npmcli/node-gyp-1.0.1" + sources."@npmcli/promise-spawn-1.3.2" + sources."@npmcli/run-script-1.8.1" + sources."@schematics/angular-11.1.1" + sources."@schematics/update-0.1101.1" + sources."@tootallnate/once-1.1.2" sources."@yarnpkg/lockfile-1.1.0" - sources."JSONStream-1.3.5" - sources."agent-base-4.3.0" - sources."agentkeepalive-3.5.2" + sources."abbrev-1.1.1" + sources."agent-base-6.0.2" + sources."agentkeepalive-4.1.3" + sources."aggregate-error-3.1.0" sources."ajv-6.12.6" sources."ansi-colors-4.1.1" sources."ansi-escapes-4.3.1" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."aproba-1.2.0" + (sources."are-we-there-yet-1.1.5" // { + dependencies = [ + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" + ]; + }) + sources."asap-2.0.6" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" sources."balanced-match-1.0.0" + sources."base64-js-1.5.1" sources."bcrypt-pbkdf-1.0.2" - sources."bluebird-3.7.2" + sources."bl-4.0.3" sources."brace-expansion-1.1.11" - sources."buffer-from-1.1.1" + sources."buffer-5.7.1" sources."builtins-1.0.3" - (sources."cacache-12.0.4" // { - dependencies = [ - sources."lru-cache-5.1.1" - sources."rimraf-2.7.1" - sources."yallist-3.1.1" - ]; - }) + sources."cacache-15.0.5" sources."caseless-0.12.0" sources."chalk-4.1.0" sources."chardet-0.7.0" - sources."chownr-1.1.4" + sources."chownr-2.0.0" + sources."clean-stack-2.2.0" sources."cli-cursor-3.1.0" sources."cli-spinners-2.5.0" sources."cli-width-3.0.0" sources."clone-1.0.4" + sources."code-point-at-1.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."combined-stream-1.0.8" sources."concat-map-0.0.1" - sources."concat-stream-1.6.2" - (sources."copy-concurrently-1.0.5" // { - dependencies = [ - sources."rimraf-2.7.1" - ]; - }) + sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" - sources."cyclist-1.0.1" sources."dashdash-1.14.1" - sources."debug-4.2.0" + sources."debug-4.3.1" + sources."debuglog-1.0.1" sources."defaults-1.0.3" sources."delayed-stream-1.0.0" - sources."duplexify-3.7.1" + sources."delegates-1.0.0" + sources."depd-1.1.2" + sources."dezalgo-1.0.3" sources."ecc-jsbn-0.1.2" sources."emoji-regex-8.0.0" (sources."encoding-0.1.13" // { @@ -61286,28 +61086,28 @@ in sources."iconv-lite-0.6.2" ]; }) - sources."end-of-stream-1.4.4" + sources."env-paths-2.2.0" sources."err-code-1.1.2" - sources."es6-promise-4.2.8" - sources."es6-promisify-5.0.0" sources."escape-string-regexp-1.0.5" sources."extend-3.0.2" sources."external-editor-3.1.0" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" - sources."figgy-pudding-3.5.2" sources."figures-3.2.0" - sources."flush-write-stream-1.1.1" sources."forever-agent-0.6.1" sources."form-data-2.3.3" - sources."from2-2.3.0" - sources."fs-minipass-1.2.7" - sources."fs-write-stream-atomic-1.0.10" + sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."genfun-5.0.0" - sources."get-stream-4.1.0" + (sources."gauge-2.7.4" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."is-fullwidth-code-point-1.0.0" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + ]; + }) sources."getpass-0.1.7" sources."glob-7.1.6" sources."graceful-fs-4.2.4" @@ -61315,202 +61115,136 @@ in sources."har-validator-5.1.5" sources."has-1.0.3" sources."has-flag-4.0.0" + sources."has-unicode-2.0.1" sources."hosted-git-info-3.0.7" - sources."http-cache-semantics-3.8.1" - (sources."http-proxy-agent-2.1.0" // { - dependencies = [ - sources."debug-3.1.0" - sources."ms-2.0.0" - ]; - }) + sources."http-cache-semantics-4.1.0" + sources."http-proxy-agent-4.0.1" sources."http-signature-1.2.0" - (sources."https-proxy-agent-2.2.4" // { - dependencies = [ - sources."debug-3.2.7" - ]; - }) + sources."https-proxy-agent-5.0.0" sources."humanize-ms-1.2.1" sources."iconv-lite-0.4.24" - sources."iferr-0.1.5" + sources."ieee754-1.2.1" sources."ignore-walk-3.0.3" sources."imurmurhash-0.1.4" + sources."indent-string-4.0.0" sources."infer-owner-1.0.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.6" + sources."ini-2.0.0" sources."inquirer-7.3.3" sources."ip-1.1.5" sources."is-core-module-2.2.0" sources."is-docker-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-interactive-1.0.0" + sources."is-lambda-1.0.1" sources."is-typedarray-1.0.0" sources."is-wsl-2.2.0" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isstream-0.1.2" sources."jsbn-0.1.1" - sources."json-parse-better-errors-1.0.2" + sources."json-parse-even-better-errors-2.3.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" - sources."jsonc-parser-2.3.1" + sources."jsonc-parser-3.0.0" sources."jsonparse-1.3.1" sources."jsprim-1.4.1" sources."lodash-4.17.20" sources."log-symbols-4.0.0" sources."lru-cache-6.0.0" sources."magic-string-0.25.7" - (sources."make-fetch-happen-5.0.2" // { - dependencies = [ - sources."lru-cache-5.1.1" - sources."yallist-3.1.1" - ]; - }) + sources."make-fetch-happen-8.0.13" sources."mime-db-1.45.0" sources."mime-types-2.1.28" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" - sources."minimist-1.2.5" - (sources."minipass-2.9.0" // { - dependencies = [ - sources."yallist-3.1.1" - ]; - }) - sources."minizlib-1.3.3" - sources."mississippi-3.0.0" - sources."mkdirp-0.5.5" - (sources."move-concurrently-1.0.1" // { - dependencies = [ - sources."rimraf-2.7.1" - ]; - }) + sources."minipass-3.1.3" + sources."minipass-collect-1.0.2" + sources."minipass-fetch-1.3.3" + sources."minipass-flush-1.0.5" + sources."minipass-json-stream-1.0.1" + sources."minipass-pipeline-1.2.4" + sources."minipass-sized-1.0.3" + sources."minizlib-2.1.2" + sources."mkdirp-1.0.4" sources."ms-2.1.2" sources."mute-stream-0.0.8" - sources."node-fetch-npm-2.0.4" - (sources."normalize-package-data-2.5.0" // { - dependencies = [ - sources."hosted-git-info-2.8.8" - sources."semver-5.7.1" - ]; - }) + sources."node-gyp-7.1.2" + sources."nopt-5.0.0" sources."npm-bundled-1.1.1" sources."npm-install-checks-4.0.0" sources."npm-normalize-package-bin-1.0.1" sources."npm-package-arg-8.1.0" - sources."npm-packlist-1.4.8" + sources."npm-packlist-2.1.4" sources."npm-pick-manifest-6.1.0" - (sources."npm-registry-fetch-4.0.7" // { - dependencies = [ - sources."hosted-git-info-2.8.8" - sources."lru-cache-5.1.1" - sources."npm-package-arg-6.1.1" - sources."semver-5.7.1" - sources."yallist-3.1.1" - ]; - }) + sources."npm-registry-fetch-9.0.0" + sources."npmlog-4.1.2" + sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" + sources."object-assign-4.1.1" sources."once-1.4.0" sources."onetime-5.1.2" - sources."open-7.3.0" - sources."ora-5.1.0" - sources."os-homedir-1.0.2" + sources."open-7.3.1" + sources."ora-5.2.0" sources."os-tmpdir-1.0.2" - sources."osenv-0.1.5" - (sources."pacote-9.5.12" // { - dependencies = [ - sources."hosted-git-info-2.8.8" - sources."lru-cache-5.1.1" - sources."npm-package-arg-6.1.1" - sources."npm-pick-manifest-3.0.2" - sources."rimraf-2.7.1" - sources."semver-5.7.1" - sources."yallist-3.1.1" - ]; - }) - sources."parallel-transform-1.2.0" + sources."p-map-4.0.0" + sources."pacote-11.1.14" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.6" sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" sources."promise-inflight-1.0.1" sources."promise-retry-1.1.1" - sources."protoduck-5.0.1" sources."psl-1.8.0" - sources."pump-3.0.0" - (sources."pumpify-1.5.1" // { - dependencies = [ - sources."pump-2.0.1" - ]; - }) + sources."puka-1.0.1" sources."punycode-2.1.1" sources."qs-6.5.2" - (sources."readable-stream-2.3.7" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) + sources."read-package-json-fast-1.2.1" + sources."readable-stream-3.6.0" + sources."readdir-scoped-modules-1.1.0" (sources."request-2.88.2" // { dependencies = [ sources."uuid-3.4.0" ]; }) - sources."resolve-1.18.1" + sources."resolve-1.19.0" sources."restore-cursor-3.1.0" sources."retry-0.10.1" sources."rimraf-3.0.2" sources."run-async-2.4.1" - sources."run-queue-1.0.3" sources."rxjs-6.6.3" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."semver-7.3.2" + sources."semver-7.3.4" (sources."semver-intersect-1.4.0" // { dependencies = [ sources."semver-5.7.1" ]; }) + sources."set-blocking-2.0.0" sources."signal-exit-3.0.3" sources."smart-buffer-4.1.0" - sources."socks-2.3.3" - (sources."socks-proxy-agent-4.0.2" // { - dependencies = [ - sources."agent-base-4.2.1" - ]; - }) + sources."socks-2.5.1" + sources."socks-proxy-agent-5.0.0" sources."source-map-0.7.3" sources."sourcemap-codec-1.4.8" - sources."spdx-correct-3.1.1" - sources."spdx-exceptions-2.3.0" - sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.7" sources."sshpk-1.16.1" - sources."ssri-6.0.1" - sources."stream-each-1.2.3" - sources."stream-shift-1.0.1" + sources."ssri-8.0.0" sources."string-width-4.2.0" - (sources."string_decoder-1.1.1" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) + sources."string_decoder-1.3.0" sources."strip-ansi-6.0.0" sources."supports-color-7.2.0" - sources."symbol-observable-2.0.3" - (sources."tar-4.4.13" // { - dependencies = [ - sources."yallist-3.1.1" - ]; - }) + sources."symbol-observable-3.0.0" + sources."tar-6.1.0" sources."through-2.3.8" - sources."through2-2.0.5" sources."tmp-0.0.33" sources."tough-cookie-2.5.0" sources."tslib-1.14.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-fest-0.11.0" - sources."typedarray-0.0.6" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" (sources."universal-analytics-0.4.23" // { @@ -61518,17 +61252,22 @@ in sources."uuid-3.4.0" ]; }) - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" - sources."uuid-8.3.1" - sources."validate-npm-package-license-3.0.4" + sources."uuid-8.3.2" sources."validate-npm-package-name-3.0.0" sources."verror-1.10.0" sources."wcwidth-1.0.1" - sources."which-1.3.1" + sources."which-2.0.2" + (sources."wide-align-1.1.3" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."is-fullwidth-code-point-2.0.0" + sources."string-width-2.1.1" + sources."strip-ansi-4.0.0" + ]; + }) sources."wrappy-1.0.2" - sources."xtend-4.0.2" - sources."y18n-4.0.1" sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; @@ -61627,7 +61366,7 @@ in sources."pump-3.0.0" ]; }) - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" sources."clean-git-ref-2.0.1" @@ -61693,7 +61432,7 @@ in }) sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.0" (sources."get-stream-4.1.0" // { dependencies = [ sources."pump-3.0.0" @@ -61857,7 +61596,7 @@ in ]; }) sources."to-utf8-0.0.1" - sources."uglify-js-3.12.4" + sources."uglify-js-3.12.5" sources."unc-path-regex-0.1.2" sources."unique-stream-2.3.1" sources."universalify-0.1.2" @@ -62035,7 +61774,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."uuid-3.4.0" sources."verror-1.10.0" sources."w3c-hr-time-1.0.2" @@ -62084,10 +61823,12 @@ in sources."supports-color-5.5.0" ]; }) - (sources."@nestjs/schematics-7.2.6" // { + (sources."@nestjs/schematics-7.2.7" // { dependencies = [ - sources."@angular-devkit/core-11.0.5" - sources."@angular-devkit/schematics-11.0.5" + sources."@angular-devkit/core-11.1.0" + sources."@angular-devkit/schematics-11.1.0" + sources."chalk-4.1.0" + sources."ora-5.2.0" ]; }) sources."@schematics/schematics-0.1100.3" @@ -62095,9 +61836,9 @@ in sources."@types/eslint-7.2.6" sources."@types/eslint-scope-3.7.0" sources."@types/estree-0.0.45" - sources."@types/json-schema-7.0.6" + sources."@types/json-schema-7.0.7" sources."@types/json5-0.0.29" - sources."@types/node-14.14.20" + sources."@types/node-14.14.22" sources."@types/parse-json-4.0.0" sources."@types/source-list-map-0.1.2" sources."@types/tapable-1.0.6" @@ -62132,23 +61873,26 @@ in sources."@webassemblyjs/wast-printer-1.9.0" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-8.0.4" + sources."acorn-8.0.5" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" sources."ansi-colors-4.1.1" sources."ansi-escapes-4.3.1" - sources."ansi-regex-3.0.0" + sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."anymatch-3.1.1" sources."at-least-node-1.0.0" sources."balanced-match-1.0.0" - sources."binary-extensions-2.1.0" + sources."base64-js-1.5.1" + sources."binary-extensions-2.2.0" + sources."bl-4.0.3" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.16.0" + sources."browserslist-4.16.1" + sources."buffer-5.7.1" sources."buffer-from-1.1.1" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001173" + sources."caniuse-lite-1.0.30001180" sources."chalk-3.0.0" sources."chardet-0.7.0" sources."chokidar-3.4.3" @@ -62169,10 +61913,10 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.634" + sources."electron-to-chromium-1.3.645" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" - sources."enhanced-resolve-4.3.0" + sources."enhanced-resolve-4.5.0" sources."errno-0.1.8" sources."error-ex-1.3.2" sources."escalade-3.1.1" @@ -62197,7 +61941,7 @@ in sources."chalk-4.1.0" ]; }) - sources."fs-extra-9.0.1" + sources."fs-extra-9.1.0" sources."fs-monkey-1.0.1" sources."fs.realpath-1.0.0" sources."fsevents-2.1.3" @@ -62211,16 +61955,15 @@ in sources."has-flag-4.0.0" sources."human-signals-1.1.1" sources."iconv-lite-0.4.24" + sources."ieee754-1.2.1" sources."import-fresh-3.3.0" sources."inflight-1.0.6" sources."inherits-2.0.4" (sources."inquirer-7.3.3" // { dependencies = [ - sources."ansi-regex-5.0.0" sources."chalk-4.1.0" sources."is-fullwidth-code-point-3.0.0" sources."string-width-4.2.0" - sources."strip-ansi-6.0.0" ]; }) sources."interpret-1.4.0" @@ -62241,13 +61984,9 @@ in sources."json-parse-even-better-errors-2.3.1" sources."json-schema-traverse-0.4.1" sources."json5-1.0.1" - (sources."jsonfile-6.1.0" // { - dependencies = [ - sources."universalify-2.0.0" - ]; - }) + sources."jsonfile-6.1.0" sources."lines-and-columns-1.1.6" - sources."loader-runner-4.1.0" + sources."loader-runner-4.2.0" sources."locate-path-5.0.0" sources."lodash-4.17.20" sources."lodash.toarray-4.4.0" @@ -62260,7 +61999,13 @@ in sources."macos-release-2.4.1" sources."magic-string-0.25.7" sources."memfs-3.2.0" - sources."memory-fs-0.5.0" + (sources."memory-fs-0.5.0" // { + dependencies = [ + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" + ]; + }) sources."merge-stream-2.0.0" sources."mime-db-1.45.0" sources."mime-types-2.1.28" @@ -62270,7 +62015,7 @@ in sources."mute-stream-0.0.8" sources."neo-async-2.6.2" sources."node-emoji-1.10.0" - sources."node-releases-1.1.69" + sources."node-releases-1.1.70" sources."normalize-path-3.0.0" sources."npm-run-path-4.0.1" sources."object-assign-4.1.1" @@ -62278,9 +62023,7 @@ in sources."onetime-5.1.2" (sources."ora-5.1.0" // { dependencies = [ - sources."ansi-regex-5.0.0" sources."chalk-4.1.0" - sources."strip-ansi-6.0.0" ]; }) sources."os-name-4.0.0" @@ -62289,7 +62032,7 @@ in sources."p-locate-4.1.0" sources."p-try-2.2.0" sources."parent-module-1.0.1" - sources."parse-json-5.1.0" + sources."parse-json-5.2.0" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" @@ -62303,7 +62046,7 @@ in sources."pump-3.0.0" sources."punycode-2.1.1" sources."randombytes-2.1.0" - sources."readable-stream-2.3.7" + sources."readable-stream-3.6.0" sources."readdirp-3.5.0" sources."rechoir-0.6.2" sources."resolve-1.19.0" @@ -62312,7 +62055,7 @@ in sources."rimraf-3.0.2" sources."run-async-2.4.1" sources."rxjs-6.6.3" - sources."safe-buffer-5.1.2" + sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."schema-utils-2.7.0" sources."semver-7.3.4" @@ -62329,9 +62072,14 @@ in ]; }) sources."sourcemap-codec-1.4.8" - sources."string-width-2.1.1" - sources."string_decoder-1.1.1" - sources."strip-ansi-4.0.0" + (sources."string-width-2.1.1" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."strip-ansi-4.0.0" + ]; + }) + sources."string_decoder-1.3.0" + sources."strip-ansi-6.0.0" sources."strip-bom-3.0.0" sources."strip-final-newline-2.0.0" sources."supports-color-7.2.0" @@ -62342,7 +62090,7 @@ in sources."commander-2.20.3" ]; }) - (sources."terser-webpack-plugin-5.0.3" // { + (sources."terser-webpack-plugin-5.1.1" // { dependencies = [ sources."p-limit-3.1.0" sources."schema-utils-3.0.0" @@ -62367,14 +62115,14 @@ in sources."tslib-1.14.1" sources."type-fest-0.11.0" sources."typescript-4.0.5" - sources."universalify-1.0.0" - sources."uri-js-4.4.0" + sources."universalify-2.0.0" + sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."watchpack-2.1.0" sources."wcwidth-1.0.1" (sources."webpack-5.9.0" // { dependencies = [ - sources."enhanced-resolve-5.4.1" + sources."enhanced-resolve-5.7.0" sources."schema-utils-3.0.0" sources."tapable-2.2.0" ]; @@ -62405,17 +62153,21 @@ in "@vue/cli" = nodeEnv.buildNodePackage { name = "_at_vue_slash_cli"; packageName = "@vue/cli"; - version = "4.5.9"; + version = "4.5.11"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli/-/cli-4.5.9.tgz"; - sha512 = "R6fRau8+fqKI+94LrruKtJDaMQGVsJCNzrdefTJ+bn+ljtCS6j9H+XuU8zLa9+X0HBkX4VoBT7XjfwUAo1IIPA=="; + url = "https://registry.npmjs.org/@vue/cli/-/cli-4.5.11.tgz"; + sha512 = "w6B1+Fb0AHwAd8eE1q4/KrJph/kXo/cqQ0Lf5MnXCYt7SXdDPBGTdyFAumMaSPQESXgmdWgEo8EhnVEBNpXDIw=="; }; dependencies = [ sources."@akryum/winattr-3.0.0" - sources."@apollo/federation-0.20.7" + (sources."@apollo/federation-0.20.7" // { + dependencies = [ + sources."apollo-server-env-2.4.5" + ]; + }) (sources."@apollo/protobufjs-1.0.5" // { dependencies = [ - sources."@types/node-10.17.50" + sources."@types/node-10.17.51" ]; }) sources."@apollographql/apollo-tools-0.4.8" @@ -62432,7 +62184,7 @@ in sources."semver-5.7.1" ]; }) - (sources."@babel/generator-7.12.10" // { + (sources."@babel/generator-7.12.11" // { dependencies = [ sources."@babel/types-7.12.12" ]; @@ -62612,7 +62364,6 @@ in }) (sources."@babel/traverse-7.12.12" // { dependencies = [ - sources."@babel/generator-7.12.11" sources."@babel/types-7.12.12" ]; }) @@ -62646,14 +62397,13 @@ in sources."@oclif/plugin-help-3.2.1" sources."lru-cache-6.0.0" sources."semver-7.3.4" - sources."yallist-4.0.0" ]; }) (sources."@oclif/config-1.17.0" // { dependencies = [ - sources."globby-11.0.1" + sources."globby-11.0.2" sources."is-wsl-2.2.0" - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) (sources."@oclif/errors-1.3.4" // { @@ -62669,15 +62419,17 @@ in }) sources."@oclif/linewrap-1.0.0" sources."@oclif/parser-3.8.5" - (sources."@oclif/plugin-autocomplete-0.2.1" // { + (sources."@oclif/plugin-autocomplete-0.3.0" // { dependencies = [ - sources."fs-extra-9.0.1" - (sources."jsonfile-6.1.0" // { - dependencies = [ - sources."universalify-2.0.0" - ]; - }) - sources."universalify-1.0.0" + sources."ansi-styles-4.3.0" + sources."chalk-4.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."fs-extra-9.1.0" + sources."has-flag-4.0.0" + sources."jsonfile-6.1.0" + sources."supports-color-7.2.0" + sources."universalify-2.0.0" ]; }) (sources."@oclif/plugin-help-2.2.3" // { @@ -62703,15 +62455,22 @@ in sources."strip-ansi-5.2.0" ]; }) - (sources."@oclif/plugin-plugins-1.9.4" // { + (sources."@oclif/plugin-plugins-1.9.5" // { dependencies = [ - sources."fs-extra-8.1.0" + sources."ansi-styles-4.3.0" + sources."chalk-4.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."fs-extra-9.1.0" + sources."has-flag-4.0.0" + sources."jsonfile-6.1.0" sources."lru-cache-6.0.0" sources."npm-run-path-4.0.1" sources."path-key-3.1.1" sources."semver-7.3.4" - sources."tslib-2.0.3" - sources."yallist-4.0.0" + sources."supports-color-7.2.0" + sources."tslib-2.1.0" + sources."universalify-2.0.0" ]; }) (sources."@oclif/plugin-warn-if-update-available-1.7.0" // { @@ -62745,7 +62504,7 @@ in sources."@types/glob-7.1.3" (sources."@types/graphql-upload-8.0.4" // { dependencies = [ - sources."graphql-15.4.0" + sources."graphql-15.5.0" ]; }) sources."@types/http-assert-1.5.1" @@ -62762,9 +62521,9 @@ in sources."@types/koa-2.11.6" sources."@types/koa-compose-3.2.5" sources."@types/long-4.0.1" - sources."@types/mime-2.0.3" + sources."@types/mime-1.3.2" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.20" + sources."@types/node-14.14.22" (sources."@types/node-fetch-2.5.7" // { dependencies = [ sources."form-data-3.0.0" @@ -62773,18 +62532,18 @@ in sources."@types/normalize-package-data-2.4.0" sources."@types/qs-6.9.5" sources."@types/range-parser-1.2.3" - sources."@types/serve-static-1.13.8" + sources."@types/serve-static-1.13.9" sources."@types/through-0.0.30" sources."@types/ws-7.4.0" sources."@types/zen-observable-0.8.2" - sources."@vue/cli-shared-utils-4.5.9" - (sources."@vue/cli-ui-4.5.9" // { + sources."@vue/cli-shared-utils-4.5.11" + (sources."@vue/cli-ui-4.5.11" // { dependencies = [ sources."clone-2.1.2" ]; }) - sources."@vue/cli-ui-addon-webpack-4.5.9" - sources."@vue/cli-ui-addon-widgets-4.5.9" + sources."@vue/cli-ui-addon-webpack-4.5.11" + sources."@vue/cli-ui-addon-widgets-4.5.11" (sources."@vue/compiler-core-3.0.5" // { dependencies = [ sources."@babel/types-7.12.12" @@ -62846,28 +62605,28 @@ in sources."to-regex-range-2.1.1" ]; }) - (sources."apollo-2.32.0" // { + (sources."apollo-2.32.1" // { dependencies = [ sources."mkdirp-1.0.4" sources."strip-ansi-5.2.0" ]; }) sources."apollo-cache-1.3.5" - sources."apollo-cache-control-0.11.5" + sources."apollo-cache-control-0.11.6" sources."apollo-cache-inmemory-1.6.6" sources."apollo-client-2.6.10" - (sources."apollo-codegen-core-0.39.0" // { + (sources."apollo-codegen-core-0.39.1" // { dependencies = [ sources."recast-0.20.4" sources."source-map-0.6.1" - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) - sources."apollo-codegen-flow-0.37.0" - sources."apollo-codegen-scala-0.38.0" - sources."apollo-codegen-swift-0.39.0" - sources."apollo-codegen-typescript-0.39.0" - sources."apollo-datasource-0.7.2" + sources."apollo-codegen-flow-0.37.1" + sources."apollo-codegen-scala-0.38.1" + sources."apollo-codegen-swift-0.39.1" + sources."apollo-codegen-typescript-0.39.1" + sources."apollo-datasource-0.7.3" sources."apollo-env-0.6.5" sources."apollo-graphql-0.6.0" sources."apollo-language-server-1.25.0" @@ -62880,18 +62639,23 @@ in sources."apollo-link-state-0.4.2" sources."apollo-link-ws-1.0.20" sources."apollo-reporting-protobuf-0.6.2" - sources."apollo-server-caching-0.5.2" - (sources."apollo-server-core-2.19.1" // { + (sources."apollo-server-caching-0.5.3" // { + dependencies = [ + sources."lru-cache-6.0.0" + ]; + }) + (sources."apollo-server-core-2.19.2" // { dependencies = [ + sources."lru-cache-6.0.0" sources."uuid-8.3.2" ]; }) - sources."apollo-server-env-2.4.5" + sources."apollo-server-env-3.0.0" sources."apollo-server-errors-2.4.2" - sources."apollo-server-express-2.19.1" - sources."apollo-server-plugin-base-0.10.3" - sources."apollo-server-types-0.6.2" - sources."apollo-tracing-0.12.1" + sources."apollo-server-express-2.19.2" + sources."apollo-server-plugin-base-0.10.4" + sources."apollo-server-types-0.6.3" + sources."apollo-tracing-0.12.2" sources."apollo-upload-client-11.0.0" sources."apollo-utilities-1.3.4" (sources."archive-type-4.0.0" // { @@ -62918,7 +62682,7 @@ in sources."assign-symbols-1.0.0" (sources."ast-types-0.14.2" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) sources."astral-regex-1.0.0" @@ -62982,7 +62746,7 @@ in }) sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.16.0" + sources."browserslist-4.16.1" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -63000,24 +62764,26 @@ in sources."lowercase-keys-1.0.0" sources."normalize-url-2.0.1" sources."prepend-http-2.0.0" + sources."query-string-5.1.1" sources."sort-keys-2.0.0" + sources."strict-uri-encode-1.1.0" ]; }) - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."call-me-maybe-1.0.1" sources."caller-callsite-2.0.0" sources."caller-path-2.0.0" sources."callsites-2.0.0" (sources."camel-case-4.1.2" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) sources."camelcase-4.1.0" - sources."caniuse-lite-1.0.30001173" + sources."caniuse-lite-1.0.30001180" (sources."capital-case-1.0.4" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) sources."capture-stack-trace-1.0.1" @@ -63027,7 +62793,7 @@ in sources."chalk-2.4.2" (sources."change-case-4.1.2" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) sources."chardet-0.7.0" @@ -63093,9 +62859,8 @@ in sources."semver-7.3.4" sources."supports-color-7.2.0" sources."supports-hyperlinks-2.1.0" - sources."tslib-2.0.3" + sources."tslib-2.1.0" sources."type-fest-0.11.0" - sources."yallist-4.0.0" ]; }) sources."cli-width-3.0.0" @@ -63128,7 +62893,7 @@ in sources."consolidate-0.16.0" (sources."constant-case-3.0.4" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) (sources."content-disposition-0.5.3" // { @@ -63145,8 +62910,8 @@ in sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" - sources."core-js-3.8.2" - (sources."core-js-compat-3.8.2" // { + sources."core-js-3.8.3" + (sources."core-js-compat-3.8.3" // { dependencies = [ sources."semver-7.0.0" ]; @@ -63222,7 +62987,7 @@ in sources."dir-glob-3.0.1" (sources."dot-case-3.0.4" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) sources."dot-prop-4.2.1" @@ -63242,17 +63007,17 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.634" + sources."electron-to-chromium-1.3.645" sources."elegant-spinner-1.0.1" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" - sources."entities-2.1.0" + sources."entities-2.2.0" sources."env-ci-3.2.2" sources."envinfo-7.7.3" sources."error-ex-1.3.2" - sources."es-abstract-1.17.7" + sources."es-abstract-1.18.0-next.2" sources."es-to-primitive-1.2.1" sources."es6-error-4.1.1" sources."escalade-3.1.1" @@ -63309,7 +63074,7 @@ in sources."extract-stack-1.0.0" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.4" + sources."fast-glob-3.2.5" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fastq-1.10.0" @@ -63334,7 +63099,8 @@ in }) sources."find-up-3.0.0" sources."fkill-6.2.0" - sources."flow-parser-0.141.0" + sources."flow-parser-0.143.1" + sources."for-each-0.3.3" sources."for-in-1.0.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" @@ -63356,21 +63122,26 @@ in sources."generic-names-2.0.1" sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.0" sources."get-proxy-2.1.0" sources."get-stream-4.1.0" sources."get-value-2.0.6" sources."getpass-0.1.7" sources."git-clone-0.1.0" sources."git-config-path-1.0.1" - sources."git-parse-1.0.4" + (sources."git-parse-1.0.4" // { + dependencies = [ + sources."es-abstract-1.17.7" + sources."util.promisify-1.0.1" + ]; + }) (sources."git-rev-sync-2.1.0" // { dependencies = [ sources."graceful-fs-4.1.15" ]; }) sources."git-up-4.0.2" - sources."git-url-parse-11.4.0" + sources."git-url-parse-11.4.3" sources."glob-7.1.5" sources."glob-parent-5.1.1" sources."glob-to-regexp-0.3.0" @@ -63378,7 +63149,6 @@ in dependencies = [ sources."lru-cache-6.0.0" sources."semver-7.3.4" - sources."yallist-4.0.0" ]; }) sources."global-dirs-0.1.1" @@ -63432,7 +63202,7 @@ in sources."ts-invariant-0.3.3" ]; }) - sources."graphql-extensions-0.12.7" + sources."graphql-extensions-0.12.8" sources."graphql-subscriptions-1.1.0" sources."graphql-tag-2.11.0" sources."graphql-tools-4.0.8" @@ -63466,7 +63236,7 @@ in sources."hash.js-1.1.7" (sources."header-case-2.0.4" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) sources."homedir-polyfill-1.0.3" @@ -63665,7 +63435,7 @@ in sources."lowdb-1.0.0" (sources."lower-case-2.0.2" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) sources."lowercase-keys-1.0.1" @@ -63733,19 +63503,23 @@ in sources."nice-try-1.0.5" (sources."no-case-3.0.4" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) sources."node-dir-0.1.17" sources."node-fetch-2.6.1" sources."node-ipc-9.1.3" sources."node-modules-regexp-1.0.0" - (sources."node-notifier-6.0.0" // { + (sources."node-notifier-9.0.0" // { dependencies = [ sources."is-wsl-2.2.0" + sources."lru-cache-6.0.0" + sources."semver-7.3.4" + sources."uuid-8.3.2" + sources."which-2.0.2" ]; }) - sources."node-releases-1.1.69" + sources."node-releases-1.1.70" (sources."nodemon-1.19.4" // { dependencies = [ sources."debug-3.2.7" @@ -63785,11 +63559,7 @@ in sources."object-treeify-1.1.31" sources."object-visit-1.0.1" sources."object.assign-4.1.2" - (sources."object.getownpropertydescriptors-2.1.1" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) + sources."object.getownpropertydescriptors-2.1.1" sources."object.pick-1.3.0" sources."on-finished-2.3.0" sources."once-1.4.0" @@ -63818,25 +63588,29 @@ in }) (sources."param-case-3.0.4" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) sources."parse-git-config-2.0.3" - sources."parse-json-5.1.0" + sources."parse-json-5.2.0" sources."parse-passwd-1.0.0" - sources."parse-path-4.0.2" + (sources."parse-path-4.0.3" // { + dependencies = [ + sources."qs-6.9.6" + ]; + }) sources."parse-url-5.0.2" sources."parseurl-1.3.3" (sources."pascal-case-3.1.2" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) sources."pascalcase-0.1.1" sources."password-prompt-1.1.2" (sources."path-case-3.0.4" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) sources."path-dirname-1.0.2" @@ -63856,6 +63630,7 @@ in sources."execa-0.9.0" sources."get-stream-3.0.0" sources."lru-cache-4.1.5" + sources."yallist-2.1.2" ]; }) sources."pify-3.0.0" @@ -63898,7 +63673,7 @@ in sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.5.2" - sources."query-string-5.1.1" + sources."query-string-6.13.8" sources."range-parser-1.2.1" (sources."raw-body-2.4.0" // { dependencies = [ @@ -63956,7 +63731,7 @@ in sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" sources."regjsgen-0.5.2" - (sources."regjsparser-0.6.4" // { + (sources."regjsparser-0.6.6" // { dependencies = [ sources."jsesc-0.5.0" ]; @@ -64009,7 +63784,7 @@ in }) (sources."sentence-case-3.0.4" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) (sources."serialize-error-7.0.1" // { @@ -64033,7 +63808,7 @@ in sources."slice-ansi-0.0.4" (sources."snake-case-3.0.4" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) (sources."snapdragon-0.8.2" // { @@ -64079,6 +63854,7 @@ in sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.7" + sources."split-on-first-1.1.0" (sources."split-string-3.1.0" // { dependencies = [ sources."extend-shallow-3.0.2" @@ -64108,7 +63884,7 @@ in sources."statuses-1.5.0" sources."steno-0.4.4" sources."streamsearch-0.1.2" - sources."strict-uri-encode-1.1.0" + sources."strict-uri-encode-2.0.0" sources."string-hash-1.1.3" sources."string-width-4.2.0" sources."string.prototype.trimend-1.0.3" @@ -64183,6 +63959,7 @@ in sources."execa-0.7.0" sources."get-stream-3.0.0" sources."lru-cache-4.1.5" + sources."yallist-2.1.2" ]; }) sources."through-2.3.8" @@ -64257,21 +64034,21 @@ in }) (sources."upper-case-2.0.2" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) (sources."upper-case-first-2.0.2" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."urix-0.1.0" sources."url-parse-lax-1.0.0" sources."url-to-options-1.0.1" sources."use-3.1.1" sources."util-deprecate-1.0.2" - sources."util.promisify-1.0.1" + sources."util.promisify-1.1.1" sources."utils-merge-1.0.1" sources."uuid-3.4.0" sources."validate-npm-package-license-3.0.4" @@ -64329,7 +64106,7 @@ in sources."xss-1.0.8" sources."xtend-4.0.2" sources."y18n-4.0.1" - sources."yallist-2.1.2" + sources."yallist-4.0.0" (sources."yaml-front-matter-3.4.1" // { dependencies = [ sources."commander-1.0.0" @@ -64367,31 +64144,31 @@ in "@webassemblyjs/cli" = nodeEnv.buildNodePackage { name = "_at_webassemblyjs_slash_cli"; packageName = "@webassemblyjs/cli"; - version = "1.9.1"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/cli/-/cli-1.9.1.tgz"; - sha512 = "OMu4uSrLdv1bJRrV+zbl6DszJiYaSUwfeigoGMkZvVHzh686pmzka9Bbz85es9Az/dnantDDIokEPSx1FQYm4A=="; + url = "https://registry.npmjs.org/@webassemblyjs/cli/-/cli-1.11.0.tgz"; + sha512 = "mQjMqOSOCu1lsA7cVvCKkK/IBED+qUtjrSuFhLBSEusHu5IqhzWFWnappMRpA424lNDMScsxry5jhbM+c9wyEg=="; }; dependencies = [ - sources."@webassemblyjs/ast-1.9.1" - sources."@webassemblyjs/floating-point-hex-parser-1.9.1" - sources."@webassemblyjs/helper-api-error-1.9.1" - sources."@webassemblyjs/helper-code-frame-1.9.1" - sources."@webassemblyjs/helper-compiler-1.9.1" - sources."@webassemblyjs/helper-flatten-ast-1.9.1" - sources."@webassemblyjs/helper-fsm-1.9.1" - sources."@webassemblyjs/helper-module-context-1.9.1" - sources."@webassemblyjs/helper-wasm-bytecode-1.9.1" - sources."@webassemblyjs/ieee754-1.9.1" - sources."@webassemblyjs/leb128-1.9.1" - sources."@webassemblyjs/utf8-1.9.1" - sources."@webassemblyjs/validation-1.9.1" - sources."@webassemblyjs/wasm-parser-1.9.1" - sources."@webassemblyjs/wast-parser-1.9.1" - sources."@webassemblyjs/wast-printer-1.9.1" + sources."@webassemblyjs/ast-1.11.0" + sources."@webassemblyjs/floating-point-hex-parser-1.11.0" + sources."@webassemblyjs/helper-api-error-1.11.0" + sources."@webassemblyjs/helper-code-frame-1.11.0" + sources."@webassemblyjs/helper-compiler-1.11.0" + sources."@webassemblyjs/helper-flatten-ast-1.11.0" + sources."@webassemblyjs/helper-fsm-1.11.0" + sources."@webassemblyjs/helper-numbers-1.11.0" + sources."@webassemblyjs/helper-wasm-bytecode-1.11.0" + sources."@webassemblyjs/ieee754-1.11.0" + sources."@webassemblyjs/leb128-1.11.0" + sources."@webassemblyjs/utf8-1.11.0" + sources."@webassemblyjs/validation-1.11.0" + sources."@webassemblyjs/wasm-parser-1.11.0" + sources."@webassemblyjs/wast-parser-1.11.0" + sources."@webassemblyjs/wast-printer-1.11.0" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."webassemblyjs-1.9.1" + sources."webassemblyjs-1.11.0" ]; buildInputs = globalBuildInputs; meta = { @@ -64406,31 +64183,31 @@ in "@webassemblyjs/repl" = nodeEnv.buildNodePackage { name = "_at_webassemblyjs_slash_repl"; packageName = "@webassemblyjs/repl"; - version = "1.9.1"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/repl/-/repl-1.9.1.tgz"; - sha512 = "190S+kS/qWfwt/c/QSpRmZpZV57WEL4Cbz2KZu+z5HAg+e53LXxC4XfpxHdsw+1Lo8Z4QB7nI+5xIr2mH+2ZjQ=="; + url = "https://registry.npmjs.org/@webassemblyjs/repl/-/repl-1.11.0.tgz"; + sha512 = "U+f6IHDVPOdj1C22AMb8+xEq5OpEhXKcTl+YyMEqRtUdAt6CVkoeHdaPVv4iDfBaxR15nds8DRq+gHjCncrA3Q=="; }; dependencies = [ - sources."@webassemblyjs/ast-1.9.1" - sources."@webassemblyjs/floating-point-hex-parser-1.9.1" - sources."@webassemblyjs/helper-api-error-1.9.1" - sources."@webassemblyjs/helper-code-frame-1.9.1" - sources."@webassemblyjs/helper-compiler-1.9.1" - sources."@webassemblyjs/helper-flatten-ast-1.9.1" - sources."@webassemblyjs/helper-fsm-1.9.1" - sources."@webassemblyjs/helper-module-context-1.9.1" - sources."@webassemblyjs/helper-wasm-bytecode-1.9.1" - sources."@webassemblyjs/ieee754-1.9.1" - sources."@webassemblyjs/leb128-1.9.1" - sources."@webassemblyjs/utf8-1.9.1" - sources."@webassemblyjs/validation-1.9.1" - sources."@webassemblyjs/wasm-parser-1.9.1" - sources."@webassemblyjs/wast-parser-1.9.1" - sources."@webassemblyjs/wast-printer-1.9.1" + sources."@webassemblyjs/ast-1.11.0" + sources."@webassemblyjs/floating-point-hex-parser-1.11.0" + sources."@webassemblyjs/helper-api-error-1.11.0" + sources."@webassemblyjs/helper-code-frame-1.11.0" + sources."@webassemblyjs/helper-compiler-1.11.0" + sources."@webassemblyjs/helper-flatten-ast-1.11.0" + sources."@webassemblyjs/helper-fsm-1.11.0" + sources."@webassemblyjs/helper-numbers-1.11.0" + sources."@webassemblyjs/helper-wasm-bytecode-1.11.0" + sources."@webassemblyjs/ieee754-1.11.0" + sources."@webassemblyjs/leb128-1.11.0" + sources."@webassemblyjs/utf8-1.11.0" + sources."@webassemblyjs/validation-1.11.0" + sources."@webassemblyjs/wasm-parser-1.11.0" + sources."@webassemblyjs/wast-parser-1.11.0" + sources."@webassemblyjs/wast-printer-1.11.0" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."webassemblyjs-1.9.1" + sources."webassemblyjs-1.11.0" ]; buildInputs = globalBuildInputs; meta = { @@ -64482,10 +64259,10 @@ in "@webassemblyjs/wasm-text-gen" = nodeEnv.buildNodePackage { name = "_at_webassemblyjs_slash_wasm-text-gen"; packageName = "@webassemblyjs/wasm-text-gen"; - version = "1.9.1"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-text-gen/-/wasm-text-gen-1.9.1.tgz"; - sha512 = "RzgRzhCQJ/DBak+Yoy2bo4W6dUdqiswX8PN7qXsIZpNLYMcOOkcaq2o5gkiT/Y2HM3Rt08GxnBBlanXTrryTKQ=="; + url = "https://registry.npmjs.org/@webassemblyjs/wasm-text-gen/-/wasm-text-gen-1.11.0.tgz"; + sha512 = "Q1OfB3hpa4TtM6x5a2gJmZncpQYx0hFt4ohdgv4Ms67kcAVwL29QQ2NDbNqfKr15IzlNAhLGueCzxG6dMjdnbQ=="; }; dependencies = [ sources."@babel/code-frame-7.12.11" @@ -64495,19 +64272,15 @@ in sources."@babel/parser-7.12.11" sources."@babel/template-7.12.7" sources."@babel/types-7.12.12" - sources."@webassemblyjs/ast-1.9.1" - sources."@webassemblyjs/floating-point-hex-parser-1.9.1" - sources."@webassemblyjs/helper-api-error-1.9.1" - sources."@webassemblyjs/helper-code-frame-1.9.1" - sources."@webassemblyjs/helper-fsm-1.9.1" - sources."@webassemblyjs/helper-module-context-1.9.1" - sources."@webassemblyjs/helper-wasm-bytecode-1.9.1" - sources."@webassemblyjs/ieee754-1.9.1" - sources."@webassemblyjs/leb128-1.9.1" - sources."@webassemblyjs/utf8-1.9.1" - sources."@webassemblyjs/wasm-parser-1.9.1" - sources."@webassemblyjs/wast-parser-1.9.1" - sources."@webassemblyjs/wast-printer-1.9.1" + sources."@webassemblyjs/ast-1.11.0" + sources."@webassemblyjs/floating-point-hex-parser-1.11.0" + sources."@webassemblyjs/helper-api-error-1.11.0" + sources."@webassemblyjs/helper-numbers-1.11.0" + sources."@webassemblyjs/helper-wasm-bytecode-1.11.0" + sources."@webassemblyjs/ieee754-1.11.0" + sources."@webassemblyjs/leb128-1.11.0" + sources."@webassemblyjs/utf8-1.11.0" + sources."@webassemblyjs/wasm-parser-1.11.0" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."ansi-styles-3.2.1" @@ -64537,21 +64310,21 @@ in "@webassemblyjs/wast-refmt" = nodeEnv.buildNodePackage { name = "_at_webassemblyjs_slash_wast-refmt"; packageName = "@webassemblyjs/wast-refmt"; - version = "1.9.1"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wast-refmt/-/wast-refmt-1.9.1.tgz"; - sha512 = "+JfTZZV25LhdJspgw5xznFr/2QiFnHrKvb8CXmEV/s3PNFRpNDUlRPw0ZUZk2cwooZdiWNpC+WKfRPQb8tMx8w=="; + url = "https://registry.npmjs.org/@webassemblyjs/wast-refmt/-/wast-refmt-1.11.0.tgz"; + sha512 = "UVjojl3i1wzn2odausLskcFh7VaZqbp5HJ5od9pdsLvUZ06cSUo35yJ9Yetoc+yNj/IfdfisJtOcTQmILQ+RqQ=="; }; dependencies = [ - sources."@webassemblyjs/ast-1.9.1" - sources."@webassemblyjs/floating-point-hex-parser-1.9.1" - sources."@webassemblyjs/helper-api-error-1.9.1" - sources."@webassemblyjs/helper-code-frame-1.9.1" - sources."@webassemblyjs/helper-fsm-1.9.1" - sources."@webassemblyjs/helper-module-context-1.9.1" - sources."@webassemblyjs/helper-wasm-bytecode-1.9.1" - sources."@webassemblyjs/wast-parser-1.9.1" - sources."@webassemblyjs/wast-printer-1.9.1" + sources."@webassemblyjs/ast-1.11.0" + sources."@webassemblyjs/floating-point-hex-parser-1.11.0" + sources."@webassemblyjs/helper-api-error-1.11.0" + sources."@webassemblyjs/helper-code-frame-1.11.0" + sources."@webassemblyjs/helper-fsm-1.11.0" + sources."@webassemblyjs/helper-numbers-1.11.0" + sources."@webassemblyjs/helper-wasm-bytecode-1.11.0" + sources."@webassemblyjs/wast-parser-1.11.0" + sources."@webassemblyjs/wast-printer-1.11.0" sources."@xtuc/long-4.2.2" ]; buildInputs = globalBuildInputs; @@ -64706,7 +64479,7 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.20" + sources."@types/node-14.14.22" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -64841,7 +64614,7 @@ in sources."turndown-4.0.2" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."urijs-1.19.5" sources."uuid-3.4.0" sources."verror-1.10.0" @@ -64874,15 +64647,15 @@ in bower = nodeEnv.buildNodePackage { name = "bower"; packageName = "bower"; - version = "1.8.8"; + version = "1.8.12"; src = fetchurl { - url = "https://registry.npmjs.org/bower/-/bower-1.8.8.tgz"; - sha512 = "1SrJnXnkP9soITHptSO+ahx3QKp3cVzn8poI6ujqc5SeOkg5iqM1pK9H+DSc2OQ8SnO0jC/NG4Ur/UIwy7574A=="; + url = "https://registry.npmjs.org/bower/-/bower-1.8.12.tgz"; + sha512 = "u1xy9SrwwoPlgjuHNjhV+YUPVdqyBj2ALBxuzeIUKXaPI2i2xypGgxqXkuHcITGdi5yBj5JuXgyMvgiWiS1S3Q=="; }; buildInputs = globalBuildInputs; meta = { description = "The browser package manager"; - homepage = http://bower.io/; + homepage = https://bower.io/; license = "MIT"; }; production = true; @@ -64901,7 +64674,7 @@ in sources."argparse-1.0.4" sources."array-find-index-1.0.2" sources."balanced-match-1.0.0" - sources."bower-1.8.8" + sources."bower-1.8.12" sources."bower-endpoint-parser-0.2.1" sources."bower-json-0.6.0" sources."bower-logger-0.2.1" @@ -65070,7 +64843,7 @@ in sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" sources."cached-path-relative-1.0.2" - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."cipher-base-1.0.4" sources."combine-source-map-0.8.0" sources."concat-map-0.0.1" @@ -65105,7 +64878,7 @@ in sources."bn.js-4.11.9" ]; }) - sources."es-abstract-1.18.0-next.1" + sources."es-abstract-1.18.0-next.2" sources."es-to-primitive-1.2.1" sources."events-3.2.0" sources."evp_bytestokey-1.0.3" @@ -65114,7 +64887,7 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."get-assigned-identifiers-1.2.0" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.0" sources."glob-7.1.6" sources."has-1.0.3" sources."has-symbols-1.0.1" @@ -65249,10 +65022,10 @@ in btc-rpc-explorer = nodeEnv.buildNodePackage { name = "btc-rpc-explorer"; packageName = "btc-rpc-explorer"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/btc-rpc-explorer/-/btc-rpc-explorer-2.1.0.tgz"; - sha512 = "dB+CI/FcZWmQPD5P1uMGnnCi6a/skTTFHWnPRYq5lfYPc9k6Cjz/nTIrZXhIHBcdxiwEiY10QX3UqYLQgF58dA=="; + url = "https://registry.npmjs.org/btc-rpc-explorer/-/btc-rpc-explorer-2.2.0.tgz"; + sha512 = "xaexMnw1gI6WYyEDMlIg2epSPuh0CcKfAqdHf8J7VATDYgQNcLaXCzM4TKTmkBjiA5f0rXypX5rVw0d8p+p1Vw=="; }; dependencies = [ sources."@types/babel-types-7.0.9" @@ -65318,7 +65091,7 @@ in sources."buffer-alloc-unsafe-1.1.0" sources."buffer-fill-1.0.0" sources."buffer-from-1.1.1" - sources."bunyan-1.8.14" + sources."bunyan-1.8.15" sources."bytes-3.1.0" sources."camelcase-4.1.0" sources."camelcase-keys-4.2.0" @@ -65670,7 +65443,7 @@ in sources."uglify-to-browserify-1.0.2" sources."uid-safe-2.1.5" sources."unpipe-1.0.0" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-3.4.0" @@ -65725,7 +65498,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-13.13.39" + sources."@types/node-13.13.40" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" sources."ajv-6.12.6" @@ -65787,7 +65560,7 @@ in sources."co-3.1.0" sources."codepage-1.4.0" sources."combined-stream-1.0.8" - sources."commander-6.2.1" + sources."commander-7.0.0" sources."compact2string-1.4.1" sources."concat-map-0.0.1" (sources."concat-stream-2.0.0" // { @@ -66089,7 +65862,7 @@ in sources."ultron-1.1.1" sources."underscore-1.6.0" sources."uniq-1.0.1" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."utfx-1.0.1" sources."util-deprecate-1.0.2" sources."utp-0.0.7" @@ -66130,35 +65903,35 @@ in cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "1.0.0-beta.5"; + version = "1.0.0-beta.6"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.0-beta.5.tgz"; - sha512 = "5jVubGjmRXlrXPDJIl2g2oWApFmN7V2EzonMWDd67TlaOwwS8Ypy4ej3VvwviXyZ7IO9zET4pDNFSInBQE+aJw=="; + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.0-beta.6.tgz"; + sha512 = "x6sJTGaSPoyQbcKbxkKxmgdGXLpyO+qbgt6GgN9guIk28dgkoqZG9CcfmwjAs+OXoY4ZiyNKvNO4w9ljW/+XOQ=="; }; dependencies = [ - sources."@jsii/spec-1.16.0" - sources."@types/node-10.17.50" + sources."@jsii/spec-1.17.1" + sources."@types/node-10.17.51" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."array-filter-1.0.0" sources."at-least-node-1.0.0" sources."available-typed-arrays-1.0.2" - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."camelcase-6.2.0" sources."case-1.6.3" - sources."cdk8s-1.0.0-beta.5" + sources."cdk8s-1.0.0-beta.6" sources."cliui-7.0.4" sources."clone-2.1.2" - (sources."codemaker-1.16.0" // { + (sources."codemaker-1.17.1" // { dependencies = [ - sources."fs-extra-9.0.1" + sources."fs-extra-9.1.0" ]; }) sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."colors-1.4.0" sources."commonmark-0.29.3" - sources."constructs-3.2.94" + sources."constructs-3.2.117" sources."date-format-3.0.0" sources."debug-4.3.2" sources."decamelize-4.0.0" @@ -66169,8 +65942,8 @@ in sources."dot-case-3.0.4" sources."emoji-regex-8.0.0" sources."entities-2.0.3" - sources."es-abstract-1.17.7" - sources."es-get-iterator-1.1.1" + sources."es-abstract-1.18.0-next.2" + sources."es-get-iterator-1.1.2" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."escape-string-regexp-4.0.0" @@ -66185,7 +65958,7 @@ in }) sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.0" sources."graceful-fs-4.2.4" sources."has-1.0.3" sources."has-symbols-1.0.1" @@ -66202,50 +65975,42 @@ in sources."is-set-2.0.2" sources."is-string-1.0.5" sources."is-symbol-1.0.3" - (sources."is-typed-array-1.1.4" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) + sources."is-typed-array-1.1.4" sources."is-weakmap-2.0.1" sources."is-weakset-2.0.1" sources."isarray-2.0.5" - (sources."jsii-1.16.0" // { + (sources."jsii-1.17.1" // { dependencies = [ - sources."fs-extra-9.0.1" + sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-pacmak-1.16.0" // { + (sources."jsii-pacmak-1.17.1" // { dependencies = [ - sources."fs-extra-9.0.1" + sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-reflect-1.16.0" // { + (sources."jsii-reflect-1.17.1" // { dependencies = [ - sources."fs-extra-9.0.1" + sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-rosetta-1.16.0" // { + (sources."jsii-rosetta-1.17.1" // { dependencies = [ - sources."fs-extra-9.0.1" + sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.180" // { + (sources."jsii-srcmak-0.1.210" // { dependencies = [ - sources."fs-extra-9.0.1" + sources."fs-extra-9.1.0" ]; }) sources."json-schema-0.2.5" - sources."json2jsii-0.1.172" - (sources."jsonfile-6.1.0" // { - dependencies = [ - sources."universalify-2.0.0" - ]; - }) + sources."json2jsii-0.1.188" + sources."jsonfile-6.1.0" sources."jsonschema-1.4.0" sources."locate-path-5.0.0" sources."log4js-6.3.0" @@ -66260,15 +66025,15 @@ in sources."object-is-1.1.4" sources."object-keys-1.1.1" sources."object.assign-4.1.2" - sources."oo-ascii-tree-1.16.0" + sources."oo-ascii-tree-1.17.1" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" sources."path-exists-4.0.0" - sources."regexp.prototype.flags-1.3.0" + sources."regexp.prototype.flags-1.3.1" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."rfdc-1.1.4" + sources."rfdc-1.2.0" sources."semver-7.3.4" (sources."semver-intersect-1.4.0" // { dependencies = [ @@ -66279,7 +66044,7 @@ in sources."side-channel-1.0.4" sources."snake-case-3.0.4" sources."sort-json-2.0.0" - sources."spdx-license-list-6.3.0" + sources."spdx-license-list-6.4.0" sources."sscaff-1.2.0" (sources."streamroller-2.2.4" // { dependencies = [ @@ -66291,17 +66056,13 @@ in sources."string.prototype.trimend-1.0.3" sources."string.prototype.trimstart-1.0.3" sources."strip-ansi-6.0.0" - sources."tslib-2.0.3" + sources."tslib-2.1.0" sources."typescript-3.9.7" - sources."universalify-1.0.0" + sources."universalify-2.0.0" sources."which-boxed-primitive-1.0.2" sources."which-collection-1.0.1" sources."which-module-2.0.0" - (sources."which-typed-array-1.1.4" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) + sources."which-typed-array-1.1.4" sources."wrap-ansi-7.0.0" sources."xmlbuilder-15.1.1" sources."xmldom-0.4.0" @@ -66333,32 +66094,52 @@ in cdktf-cli = nodeEnv.buildNodePackage { name = "cdktf-cli"; packageName = "cdktf-cli"; - version = "0.0.19"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.0.19.tgz"; - sha512 = "JH2DyIQyhpI8lwO4HANha/HiVV2MXVG63iK+PZbEZKJDEr3fVB0WSKvzrp66CarceLiuNy7Z5cIR+81Q6eMx+w=="; + url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.1.0.tgz"; + sha512 = "tlkYo1SbitrwfqcTK0S5ZsGasRaJtN5tRP3VxgIszJZggav7mpRGABjTkqY23GzG8UXIaUTvH4uBGshx+iqcOA=="; }; dependencies = [ - sources."@jsii/spec-1.16.0" - sources."@types/node-14.14.20" + sources."@jsii/spec-1.17.1" + sources."@skorfmann/terraform-cloud-1.7.1" + sources."@types/archiver-5.1.0" + sources."@types/glob-7.1.3" + sources."@types/minimatch-3.0.3" + sources."@types/node-14.14.22" sources."@types/readline-sync-1.4.3" + sources."@types/stream-buffers-3.0.3" sources."@types/uuid-8.3.0" sources."@types/yoga-layout-1.9.2" sources."ansi-escapes-4.3.1" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" + sources."archiver-5.2.0" + (sources."archiver-utils-2.1.0" // { + dependencies = [ + sources."readable-stream-2.3.7" + ]; + }) sources."array-filter-1.0.0" sources."array-includes-3.1.2" sources."array.prototype.flatmap-1.2.4" sources."arrify-2.0.1" sources."astral-regex-2.0.0" + sources."async-3.2.0" sources."at-least-node-1.0.0" sources."auto-bind-4.0.0" sources."available-typed-arrays-1.0.2" - sources."call-bind-1.0.0" + sources."axios-0.21.1" + sources."balanced-match-1.0.0" + sources."base64-js-1.5.1" + sources."bl-4.0.3" + sources."brace-expansion-1.1.11" + sources."buffer-5.7.1" + sources."buffer-crc32-0.2.13" + sources."call-bind-1.0.2" sources."camelcase-5.3.1" + sources."camelcase-keys-6.2.2" sources."case-1.6.3" - sources."cdktf-0.0.19" + sources."cdktf-0.1.0" sources."chalk-4.1.0" sources."ci-info-2.0.0" sources."cli-cursor-3.1.0" @@ -66375,35 +66156,57 @@ in sources."color-name-1.1.4" sources."colors-1.4.0" sources."commonmark-0.29.3" - sources."constructs-3.2.94" + sources."compress-commons-4.0.2" + sources."concat-map-0.0.1" + sources."constructs-3.2.117" + sources."core-util-is-1.0.2" + sources."crc-32-1.2.0" + sources."crc32-stream-4.0.1" sources."date-format-3.0.0" sources."debug-4.3.2" sources."decamelize-1.2.0" - sources."deep-equal-2.0.5" + (sources."deep-equal-2.0.5" // { + dependencies = [ + sources."isarray-2.0.5" + ]; + }) sources."define-properties-1.1.3" sources."detect-indent-5.0.0" sources."detect-newline-2.1.0" sources."doctrine-2.1.0" sources."emoji-regex-8.0.0" + sources."end-of-stream-1.4.4" sources."entities-2.0.3" - sources."es-abstract-1.18.0-next.1" - sources."es-get-iterator-1.1.1" + sources."es-abstract-1.18.0-next.2" + (sources."es-get-iterator-1.1.2" // { + dependencies = [ + sources."isarray-2.0.5" + ]; + }) sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."escape-string-regexp-4.0.0" sources."eslint-plugin-react-7.22.0" sources."esutils-2.0.3" + sources."exit-on-epipe-1.0.1" sources."find-up-4.1.0" sources."flatted-2.0.2" + sources."follow-redirects-1.13.2" sources."foreach-2.0.5" + sources."fs-constants-1.0.0" sources."fs-extra-8.1.0" + sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.0" + sources."glob-7.1.6" sources."graceful-fs-4.2.4" sources."has-1.0.3" sources."has-flag-4.0.0" sources."has-symbols-1.0.1" + sources."ieee754-1.2.1" + sources."inflight-1.0.6" + sources."inherits-2.0.4" (sources."ink-2.7.1" // { dependencies = [ sources."chalk-3.0.0" @@ -66416,11 +66219,7 @@ in sources."chalk-3.0.0" ]; }) - (sources."internal-slot-1.0.2" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) + sources."internal-slot-1.0.3" sources."is-arguments-1.1.0" sources."is-bigint-1.0.1" sources."is-boolean-object-1.1.0" @@ -66441,75 +66240,65 @@ in sources."is-weakmap-2.0.1" sources."is-weakset-2.0.1" sources."is-wsl-2.2.0" - sources."isarray-2.0.5" + sources."isarray-1.0.0" sources."js-tokens-4.0.0" - (sources."jsii-1.16.0" // { + (sources."jsii-1.17.1" // { dependencies = [ - sources."fs-extra-9.0.1" - (sources."jsonfile-6.1.0" // { - dependencies = [ - sources."universalify-2.0.0" - ]; - }) - sources."universalify-1.0.0" + sources."fs-extra-9.1.0" + sources."jsonfile-6.1.0" + sources."universalify-2.0.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-pacmak-1.16.0" // { + (sources."jsii-pacmak-1.17.1" // { dependencies = [ sources."camelcase-6.2.0" - sources."codemaker-1.16.0" + sources."codemaker-1.17.1" sources."decamelize-4.0.0" - sources."fs-extra-9.0.1" - (sources."jsonfile-6.1.0" // { - dependencies = [ - sources."universalify-2.0.0" - ]; - }) - sources."universalify-1.0.0" + sources."fs-extra-9.1.0" + sources."jsonfile-6.1.0" + sources."universalify-2.0.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-reflect-1.16.0" // { + (sources."jsii-reflect-1.17.1" // { dependencies = [ - sources."fs-extra-9.0.1" - (sources."jsonfile-6.1.0" // { - dependencies = [ - sources."universalify-2.0.0" - ]; - }) - sources."universalify-1.0.0" + sources."fs-extra-9.1.0" + sources."jsonfile-6.1.0" + sources."universalify-2.0.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-rosetta-1.16.0" // { + (sources."jsii-rosetta-1.17.1" // { dependencies = [ - sources."fs-extra-9.0.1" - (sources."jsonfile-6.1.0" // { - dependencies = [ - sources."universalify-2.0.0" - ]; - }) - sources."universalify-1.0.0" + sources."fs-extra-9.1.0" + sources."jsonfile-6.1.0" + sources."universalify-2.0.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.180" // { + (sources."jsii-srcmak-0.1.210" // { dependencies = [ - sources."fs-extra-9.0.1" - (sources."jsonfile-6.1.0" // { - dependencies = [ - sources."universalify-2.0.0" - ]; - }) - sources."universalify-1.0.0" + sources."fs-extra-9.1.0" + sources."jsonfile-6.1.0" + sources."universalify-2.0.0" ]; }) sources."jsonfile-4.0.0" sources."jsonschema-1.4.0" sources."jsx-ast-utils-3.2.0" + (sources."lazystream-1.0.0" // { + dependencies = [ + sources."readable-stream-2.3.7" + ]; + }) sources."locate-path-5.0.0" + sources."lodash.defaults-4.2.0" + sources."lodash.difference-4.5.0" + sources."lodash.flatten-4.4.0" + sources."lodash.isplainobject-4.0.6" sources."lodash.throttle-4.1.1" + sources."lodash.union-4.6.0" (sources."log-update-3.4.0" // { dependencies = [ sources."ansi-escapes-3.2.0" @@ -66531,11 +66320,14 @@ in sources."log4js-6.3.0" sources."loose-envify-1.4.0" sources."lru-cache-6.0.0" + sources."map-obj-4.1.0" sources."mdurl-1.0.1" sources."mimic-fn-2.1.0" + sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."ms-2.1.2" sources."ncp-2.0.0" + sources."normalize-path-3.0.0" sources."object-assign-4.1.1" sources."object-inspect-1.9.0" sources."object-is-1.1.4" @@ -66544,29 +66336,33 @@ in sources."object.entries-1.1.3" sources."object.fromentries-2.0.3" sources."object.values-1.1.2" + sources."once-1.4.0" sources."onetime-5.1.2" - sources."oo-ascii-tree-1.16.0" - sources."open-7.3.0" + sources."oo-ascii-tree-1.17.1" + sources."open-7.3.1" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" sources."path-exists-4.0.0" + sources."path-is-absolute-1.0.1" sources."path-parse-1.0.6" + sources."printj-1.1.2" + sources."process-nextick-args-2.0.1" sources."prop-types-15.7.2" + sources."quick-lru-4.0.1" sources."react-16.14.0" sources."react-is-16.13.1" sources."react-reconciler-0.24.0" + sources."readable-stream-3.6.0" + sources."readdir-glob-1.1.1" sources."readline-sync-1.4.10" - (sources."regexp.prototype.flags-1.3.0" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) + sources."regexp.prototype.flags-1.3.1" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" sources."resolve-1.19.0" sources."restore-cursor-3.1.0" - sources."rfdc-1.1.4" + sources."rfdc-1.2.0" + sources."safe-buffer-5.1.2" sources."scheduler-0.18.0" sources."semver-7.3.4" (sources."semver-intersect-1.4.0" // { @@ -66579,8 +66375,9 @@ in sources."signal-exit-3.0.3" sources."slice-ansi-3.0.0" sources."sort-json-2.0.0" - sources."spdx-license-list-6.3.0" + sources."spdx-license-list-6.4.0" sources."sscaff-1.2.0" + sources."stream-buffers-3.0.2" (sources."streamroller-2.2.4" // { dependencies = [ sources."date-format-2.1.0" @@ -66598,11 +66395,14 @@ in sources."string.prototype.repeat-0.2.0" sources."string.prototype.trimend-1.0.3" sources."string.prototype.trimstart-1.0.3" + sources."string_decoder-1.1.1" sources."strip-ansi-6.0.0" sources."supports-color-7.2.0" + sources."tar-stream-2.2.0" sources."type-fest-0.11.0" sources."typescript-3.9.7" sources."universalify-0.1.2" + sources."util-deprecate-1.0.2" sources."uuid-8.3.2" sources."which-boxed-primitive-1.0.2" sources."which-collection-1.0.1" @@ -66610,6 +66410,7 @@ in sources."which-typed-array-1.1.4" sources."widest-line-3.1.0" sources."wrap-ansi-6.2.0" + sources."wrappy-1.0.2" sources."xmlbuilder-15.1.1" sources."xmldom-0.4.0" sources."y18n-5.0.5" @@ -66624,6 +66425,7 @@ in sources."yargs-parser-20.2.4" sources."yn-3.1.1" sources."yoga-layout-prebuilt-1.10.0" + sources."zip-stream-4.0.4" ]; buildInputs = globalBuildInputs; meta = { @@ -66773,10 +66575,10 @@ in coc-diagnostic = nodeEnv.buildNodePackage { name = "coc-diagnostic"; packageName = "coc-diagnostic"; - version = "0.14.0"; + version = "0.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.14.0.tgz"; - sha512 = "ccxtSRTqVIuIQrtS5SI0uevO2WC7cSA9dNtiZ/PveDKyxhqyQlfRs9n0bdOJdXteYt6BKUIiqFV8Q48Z71y89A=="; + url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.18.0.tgz"; + sha512 = "6ghwTYVdJ/XMcoLb690DPcxVM3t2bCDKTFPqMfkamBhKRJNFJDSjxQiP3Njn5f7g4rYvIuBQdZ8wteB4dr/4HA=="; }; buildInputs = globalBuildInputs; meta = { @@ -66814,10 +66616,10 @@ in coc-eslint = nodeEnv.buildNodePackage { name = "coc-eslint"; packageName = "coc-eslint"; - version = "1.4.1"; + version = "1.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/coc-eslint/-/coc-eslint-1.4.1.tgz"; - sha512 = "dqzn4vqmEqIlzwpFxG6AnhXUwDSTMLsg2d4RDwHDhh1yioukSFR+turQxsq9fssuWeV208y54kb/AzmOIji9jA=="; + url = "https://registry.npmjs.org/coc-eslint/-/coc-eslint-1.4.5.tgz"; + sha512 = "+xt0bn1nG348Q2tERiL44a/20a+NeDJLtwh7Gnn5VjOQ64OYUGrbAbQphskdVZyLE5qRDTvyiLArN+IxDsmpQQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -66832,10 +66634,10 @@ in coc-git = nodeEnv.buildNodePackage { name = "coc-git"; packageName = "coc-git"; - version = "2.0.5"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-git/-/coc-git-2.0.5.tgz"; - sha512 = "MwoSWGr8mco+/Bth/4zr0kNRuG9rXYgyAEI1mGOuRsMqy2G9LEr4azSP68V2EuIPzYVcYx6ZZk2o5e8b/ux0/w=="; + url = "https://registry.npmjs.org/coc-git/-/coc-git-2.2.0.tgz"; + sha512 = "afm5SjyvQl21+4oGotX8mxjiwEBw8veRJun+sZQ5S4ZXMH6tQBZexE0Nyydcaoa5U0P1TBlI7Ywt+e/IZZxleA=="; }; buildInputs = globalBuildInputs; meta = { @@ -66850,15 +66652,15 @@ in coc-go = nodeEnv.buildNodePackage { name = "coc-go"; packageName = "coc-go"; - version = "0.13.2"; + version = "0.13.3"; src = fetchurl { - url = "https://registry.npmjs.org/coc-go/-/coc-go-0.13.2.tgz"; - sha512 = "E//SHaQlzmh4nBUJsA6oSZWBVFkEWJ/kjL19jIBbIrY8KWCjxfCm6H8+WDNMUULHS2HQNlUEQzVHS/ftE10iGg=="; + url = "https://registry.npmjs.org/coc-go/-/coc-go-0.13.3.tgz"; + sha512 = "JxAJD3z10ziO8CxgTUlguZp8uy1r6fo0pP+L4GeXKv+q12BHIxWXoAZdd158vAP/YCh0Yw4zBrij57Fg4wtVdg=="; }; dependencies = [ sources."isexe-2.0.0" sources."node-fetch-2.6.1" - sources."tslib-2.0.3" + sources."tslib-2.1.0" sources."vscode-languageserver-textdocument-1.0.1" sources."vscode-uri-3.0.2" sources."which-2.0.2" @@ -66892,10 +66694,10 @@ in coc-html = nodeEnv.buildNodePackage { name = "coc-html"; packageName = "coc-html"; - version = "1.3.2"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-html/-/coc-html-1.3.2.tgz"; - sha512 = "8upyERwR/7zZNDkATpKy1aIyflzwfsgercRsHm1OG/ECRG2FpUWYkHywHBDbWAdHsipbd2WoO0nr3Ct22JV4oA=="; + url = "https://registry.npmjs.org/coc-html/-/coc-html-1.4.1.tgz"; + sha512 = "7SHQYzpRKPrpaLcTm1UUk1zu9VvFEJKFqxwDIuqv/CL0cBTtEvlsfpVh9DOaMHlZPu8U8Lgyf04bHV/sFS1zJw=="; }; dependencies = [ sources."typescript-4.1.3" @@ -66966,10 +66768,10 @@ in coc-json = nodeEnv.buildNodePackage { name = "coc-json"; packageName = "coc-json"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/coc-json/-/coc-json-1.3.2.tgz"; - sha512 = "4wSADhO6oE2lxyYJw1cZqz6eYTrJWI4wHLETSTwhkkpZrPCNJA7mSmuB6oowxt7kJRmDVAIZP2mFyLTXU0jU6w=="; + url = "https://registry.npmjs.org/coc-json/-/coc-json-1.3.3.tgz"; + sha512 = "yMayIIMn/+JaSxHbAG2384sr1/1jvhDCuvRWXeWI+yLLVNCQ7pizGW8EeLC2bSkd01PORRWT4LBn7mNMs6dPRw=="; }; buildInputs = globalBuildInputs; meta = { @@ -66983,10 +66785,10 @@ in coc-lists = nodeEnv.buildNodePackage { name = "coc-lists"; packageName = "coc-lists"; - version = "1.3.16"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-lists/-/coc-lists-1.3.16.tgz"; - sha512 = "6m/LCFHcnFdbJoFnrkzj8OhBvcFl491eYG0247Gti/u2iQCVj2X8RRxdxcGbDh4tR5OEPZdQPcd6YMDbtphPSg=="; + url = "https://registry.npmjs.org/coc-lists/-/coc-lists-1.4.0.tgz"; + sha512 = "AKmM8/+BjncinB4MrS/e8hJ7MzvXL5GtAvusGZb3zsAj4tNO77oWiVzE8V09QEWAsorgHVgNv/OXr4EPJMZvpg=="; }; buildInputs = globalBuildInputs; meta = { @@ -67001,10 +66803,10 @@ in coc-markdownlint = nodeEnv.buildNodePackage { name = "coc-markdownlint"; packageName = "coc-markdownlint"; - version = "1.9.0"; + version = "1.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-markdownlint/-/coc-markdownlint-1.9.0.tgz"; - sha512 = "cTIR4IXs6CC06iDwylxzS0Sq4HhiWofTBqgedtbAckkaoJYOZdM+uMKKdkSO2nt93bHtE4MsEoQ91sxHgKqNfg=="; + url = "https://registry.npmjs.org/coc-markdownlint/-/coc-markdownlint-1.10.1.tgz"; + sha512 = "nYuGmxppC3+16kN7128HxrzDWAPGrC5KdP4XQQHoKeOAApLTphF9rH/gfWjUale+Roq8YDe0rEJBLc3DUdIebg=="; }; buildInputs = globalBuildInputs; meta = { @@ -67019,10 +66821,10 @@ in coc-metals = nodeEnv.buildNodePackage { name = "coc-metals"; packageName = "coc-metals"; - version = "0.9.9"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-metals/-/coc-metals-0.9.9.tgz"; - sha512 = "VCjIm+ytVrgqzAXMpweh3D8SfQg9oF0BVXSFeUIgsm3xU9BuZd1jU+CxtNNAIihxcJ1LUX1JGn1Sydu541hwzA=="; + url = "https://registry.npmjs.org/coc-metals/-/coc-metals-1.0.1.tgz"; + sha512 = "1chc5qluoxF39fNKSoLNrPWrWsBQc+zHkXmleOka2HLYDQHmqgYqWZiPgJ03IqOoR3uJcS8sgdrCLyVdqWBwrg=="; }; dependencies = [ sources."@chemzqm/neovim-5.2.13" @@ -67040,7 +66842,7 @@ in sources."buffer-indexof-polyfill-1.0.2" sources."buffers-0.1.1" sources."bytes-3.1.0" - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."chainsaw-0.1.0" sources."chownr-2.0.0" sources."clipboardy-2.3.0" @@ -67068,7 +66870,7 @@ in sources."fast-diff-1.2.0" sources."fb-watchman-2.0.1" sources."flatted-2.0.2" - sources."follow-redirects-1.13.1" + sources."follow-redirects-1.13.2" sources."fp-ts-2.9.3" sources."fs-extra-8.1.0" sources."fs-minipass-2.1.0" @@ -67080,7 +66882,7 @@ in ]; }) sources."function-bind-1.1.1" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.0" sources."get-stream-4.1.0" sources."glob-7.1.6" sources."graceful-fs-4.2.4" @@ -67148,7 +66950,7 @@ in sources."rc-1.2.8" sources."readable-stream-2.3.7" sources."rfc-3986-1.0.1" - sources."rfdc-1.1.4" + sources."rfdc-1.2.0" sources."rimraf-3.0.2" sources."safe-buffer-5.1.2" sources."semver-7.3.4" @@ -67167,9 +66969,9 @@ in sources."string_decoder-1.1.1" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" - sources."tar-6.0.5" + sources."tar-6.1.0" sources."traverse-0.3.9" - sources."tslib-2.0.3" + sources."tslib-2.1.0" sources."universalify-0.1.2" sources."unzipper-0.10.11" sources."util-deprecate-1.0.2" @@ -67199,10 +67001,10 @@ in coc-pairs = nodeEnv.buildNodePackage { name = "coc-pairs"; packageName = "coc-pairs"; - version = "1.2.21"; + version = "1.2.22"; src = fetchurl { - url = "https://registry.npmjs.org/coc-pairs/-/coc-pairs-1.2.21.tgz"; - sha512 = "QTrzPCgk+zNVSnDjCbm3cvzb6c6rIwYMowrGhVb4XGnc8ooMXDBSfMoPYUtVgEJ+Qcu3++93OWr+m2VOHwHxag=="; + url = "https://registry.npmjs.org/coc-pairs/-/coc-pairs-1.2.22.tgz"; + sha512 = "AskNxINhyImxvFhlt0tvFJUS/Z4sUehgKPdy1jxVa+vu4CU903cNR6Dot4phrRRfgSCH3NT8SrYBhg4YvsxlkA=="; }; buildInputs = globalBuildInputs; meta = { @@ -67229,7 +67031,7 @@ in sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@types/eslint-visitor-keys-1.0.0" - sources."@types/json-schema-7.0.6" + sources."@types/json-schema-7.0.7" sources."@typescript-eslint/experimental-utils-3.10.1" sources."@typescript-eslint/parser-3.10.1" sources."@typescript-eslint/types-3.10.1" @@ -67297,7 +67099,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001173" + sources."caniuse-lite-1.0.30001180" sources."capture-stack-trace-1.0.1" sources."ccount-1.1.0" sources."chalk-2.4.2" @@ -67354,7 +67156,7 @@ in ]; }) sources."copy-descriptor-0.1.1" - sources."core-js-3.8.2" + sources."core-js-3.8.3" sources."cosmiconfig-3.1.0" sources."create-error-class-3.0.2" (sources."cross-spawn-6.0.5" // { @@ -67386,7 +67188,7 @@ in (sources."dom-serializer-0.2.2" // { dependencies = [ sources."domelementtype-2.1.0" - sources."entities-2.1.0" + sources."entities-2.2.0" ]; }) sources."domelementtype-1.3.1" @@ -67394,7 +67196,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.634" + sources."electron-to-chromium-1.3.645" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-1.1.2" @@ -68083,7 +67885,7 @@ in sources."tsutils-2.29.0" ]; }) - sources."tsutils-3.18.0" + sources."tsutils-3.20.0" sources."type-check-0.3.2" sources."type-fest-0.8.1" sources."typescript-3.9.7" @@ -68111,7 +67913,7 @@ in }) sources."unzip-response-2.0.1" sources."update-notifier-2.5.0" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."urix-0.1.0" sources."url-parse-lax-1.0.0" sources."use-3.1.1" @@ -68235,10 +68037,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.26.0"; + version = "0.30.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.26.0.tgz"; - sha512 = "Wn0m/IImB9BryAUhH5WTSqrkWh2tamuMVyMzxUmH1EW71TJKOavfV2DAmSNYSkGCD/H9icUbMIiSwyMI9JVYOw=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.30.0.tgz"; + sha512 = "oK/xqvv/dAkUwWm1m5zRz+VGFqdufK2PHnesT9mro41kJmw2wqKdUK+wxVJpVuxUx4MAjtiNVc9F98CG8DtpAw=="; }; buildInputs = globalBuildInputs; meta = { @@ -68271,10 +68073,10 @@ in coc-snippets = nodeEnv.buildNodePackage { name = "coc-snippets"; packageName = "coc-snippets"; - version = "2.3.1"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.3.1.tgz"; - sha512 = "n11bVCYeDA0s1wYNAYsQdAHVv4C/k8QkvadSkzRWrNCP29fivGALp+wEYl8rtsqs0aeKY3FtPsI812581g6NPg=="; + url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.4.0.tgz"; + sha512 = "XjL23iRnKCxeh/qG6FN1SJQQRHLunlxs6UlJua35A42tjztC6ZZYwuE4W9W8oU53iqGrSYrIrkT1+WFznBr/0g=="; }; buildInputs = globalBuildInputs; meta = { @@ -68288,10 +68090,10 @@ in coc-solargraph = nodeEnv.buildNodePackage { name = "coc-solargraph"; packageName = "coc-solargraph"; - version = "1.1.8"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-solargraph/-/coc-solargraph-1.1.8.tgz"; - sha512 = "j0/S9ycyP4cdFhTu3FGaY4t0ZSn1K5EFWi6A90nppQYPwrzSGo3tn5XDO44vaWsYhEUlQfQrXVwtFScKCdc1vg=="; + url = "https://registry.npmjs.org/coc-solargraph/-/coc-solargraph-1.2.0.tgz"; + sha512 = "0bvily8jnfmBx/WjNgZ/1TNVSV2BBSsaAflc4bhwtw1mN7XLAiXLpeK3Eps6qwOYMtTRngJFKxNXKoAM2bCY/A=="; }; buildInputs = globalBuildInputs; meta = { @@ -68355,11 +68157,11 @@ in sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.16.0" + sources."browserslist-4.16.1" sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001173" + sources."caniuse-lite-1.0.30001180" (sources."chalk-4.1.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -68391,13 +68193,13 @@ in (sources."dom-serializer-0.2.2" // { dependencies = [ sources."domelementtype-2.1.0" - sources."entities-2.1.0" + sources."entities-2.2.0" ]; }) sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.634" + sources."electron-to-chromium-1.3.645" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -68407,14 +68209,14 @@ in sources."extend-3.0.2" sources."fast-deep-equal-3.1.3" sources."fast-diff-1.2.0" - sources."fast-glob-3.2.4" + sources."fast-glob-3.2.5" sources."fastest-levenshtein-1.0.12" sources."fastq-1.10.0" sources."file-entry-cache-6.0.0" sources."fill-range-7.0.1" sources."find-up-4.1.0" sources."flat-cache-3.0.4" - sources."flatted-3.1.0" + sources."flatted-3.1.1" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.2" @@ -68424,7 +68226,7 @@ in sources."global-modules-2.0.0" sources."global-prefix-3.0.0" sources."globals-11.12.0" - sources."globby-11.0.1" + sources."globby-11.0.2" sources."globjoin-0.1.4" sources."gonzales-pe-4.3.0" sources."hard-rejection-2.1.0" @@ -68479,7 +68281,7 @@ in sources."mdast-util-from-markdown-0.8.4" sources."mdast-util-to-markdown-0.6.2" sources."mdast-util-to-string-2.0.0" - sources."meow-8.1.0" + sources."meow-9.0.0" sources."merge2-1.4.1" sources."micromark-2.11.2" sources."micromatch-4.0.2" @@ -68492,7 +68294,7 @@ in ]; }) sources."ms-2.1.2" - sources."node-releases-1.1.69" + sources."node-releases-1.1.70" (sources."normalize-package-data-3.0.0" // { dependencies = [ sources."semver-7.3.4" @@ -68507,7 +68309,7 @@ in sources."p-try-2.2.0" sources."parent-module-1.0.1" sources."parse-entities-2.0.0" - sources."parse-json-5.1.0" + sources."parse-json-5.2.0" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" @@ -68587,7 +68389,7 @@ in sources."strip-ansi-6.0.0" sources."strip-indent-3.0.0" sources."style-search-0.1.0" - sources."stylelint-13.8.0" + sources."stylelint-13.9.0" sources."sugarss-2.0.0" sources."supports-color-5.5.0" sources."svg-tags-1.0.0" @@ -68603,7 +68405,7 @@ in sources."unist-util-find-all-after-3.0.2" sources."unist-util-is-4.0.4" sources."unist-util-stringify-position-2.0.3" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.2.0" sources."validate-npm-package-license-3.0.4" @@ -68639,10 +68441,10 @@ in coc-tabnine = nodeEnv.buildNodePackage { name = "coc-tabnine"; packageName = "coc-tabnine"; - version = "1.2.3"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/coc-tabnine/-/coc-tabnine-1.2.3.tgz"; - sha512 = "1FVW4hj7eK8PAUS0fzeme/23iBBP9Q3nfoMVzpBGchJiziL2qOhXaFrU0QgliIhiRSMmLnagTx/lWuI8BuO96g=="; + url = "https://registry.npmjs.org/coc-tabnine/-/coc-tabnine-1.3.3.tgz"; + sha512 = "6CYtXKaEduGHLjiBdYRcWvl7gzvW92iGTxW7M3KVfn/tRFO+VF+3FuSX7Fg53ol4/USyNOTgXz3uyBjfsZOBXA=="; }; buildInputs = globalBuildInputs; meta = { @@ -68750,10 +68552,10 @@ in coc-tsserver = nodeEnv.buildNodePackage { name = "coc-tsserver"; packageName = "coc-tsserver"; - version = "1.6.6"; + version = "1.6.7"; src = fetchurl { - url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.6.6.tgz"; - sha512 = "Rij5moc30YSnhYkiSwilLYorbRkmYPn9uN5b4EMXrNo0wWGReFYRRCxq72BoDEIwbTE3MsuVb67irdMukJ95eA=="; + url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.6.7.tgz"; + sha512 = "NVBl6AEbEax6GQdBlBy/SelJ5TXCkrnLN/dDqgDWwhIPX6UBFhFTFCLcqcHbfMjLM/MDvP/t85w+OYBGe2gXxg=="; }; dependencies = [ sources."typescript-4.1.3" @@ -68784,7 +68586,7 @@ in sources."chalk-2.4.2" ]; }) - sources."@eslint/eslintrc-0.2.2" + sources."@eslint/eslintrc-0.3.0" sources."acorn-7.4.1" sources."acorn-jsx-5.3.1" sources."ajv-6.12.6" @@ -68818,8 +68620,8 @@ in sources."emoji-regex-8.0.0" sources."enquirer-2.3.6" sources."escape-string-regexp-1.0.5" - sources."eslint-7.17.0" - sources."eslint-plugin-vue-7.4.1" + sources."eslint-7.18.0" + sources."eslint-plugin-vue-7.5.0" sources."eslint-scope-5.1.1" (sources."eslint-utils-2.1.0" // { dependencies = [ @@ -68850,7 +68652,7 @@ in sources."fast-levenshtein-2.0.6" sources."file-entry-cache-6.0.0" sources."flat-cache-3.0.4" - sources."flatted-3.1.0" + sources."flatted-3.1.1" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" @@ -68929,10 +68731,10 @@ in sources."type-check-0.4.0" sources."type-fest-0.8.1" sources."typescript-4.1.3" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."v8-compile-cache-2.2.0" sources."vls-0.5.10" - (sources."vue-eslint-parser-7.3.0" // { + (sources."vue-eslint-parser-7.4.1" // { dependencies = [ sources."eslint-visitor-keys-1.3.0" sources."espree-6.2.1" @@ -69173,7 +68975,7 @@ in sources."fast-safe-stringify-2.0.7" sources."fecha-4.2.0" sources."fn.name-1.1.0" - sources."follow-redirects-1.13.1" + sources."follow-redirects-1.13.2" sources."http-proxy-1.18.1" sources."inherits-2.0.4" sources."is-arrayish-0.3.2" @@ -69371,7 +69173,7 @@ in }) sources."extsprintf-1.4.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.4" + sources."fast-glob-3.2.5" sources."fast-json-parse-1.0.3" sources."fast-json-stable-stringify-2.1.0" sources."fastq-1.10.0" @@ -69383,7 +69185,7 @@ in sources."form-data-2.3.3" sources."forwarded-0.1.2" sources."fresh-0.5.2" - sources."fs-extra-9.0.1" + sources."fs-extra-9.1.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."get-stream-5.2.0" @@ -69391,7 +69193,7 @@ in sources."glob-7.1.6" sources."glob-parent-5.1.1" sources."global-dirs-2.1.0" - sources."globby-11.0.1" + sources."globby-11.0.2" (sources."got-9.6.0" // { dependencies = [ sources."get-stream-4.1.0" @@ -69474,11 +69276,7 @@ in sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" - (sources."jsonfile-6.1.0" // { - dependencies = [ - sources."universalify-2.0.0" - ]; - }) + sources."jsonfile-6.1.0" (sources."jsprim-1.4.1" // { dependencies = [ sources."extsprintf-1.3.0" @@ -69533,7 +69331,7 @@ in sources."on-headers-1.0.2" sources."once-1.4.0" sources."onetime-5.1.2" - sources."open-7.3.0" + sources."open-7.3.1" sources."os-homedir-1.0.2" sources."os-name-3.1.0" sources."os-tmpdir-1.0.2" @@ -69649,7 +69447,7 @@ in sources."strip-final-newline-2.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" - sources."systeminformation-4.34.2" + sources."systeminformation-4.34.9" sources."term-size-2.2.1" sources."through-2.3.8" sources."tmp-0.2.1" @@ -69665,10 +69463,10 @@ in sources."typedarray-to-buffer-3.1.5" sources."underscore-1.12.0" sources."unique-string-2.0.0" - sources."universalify-1.0.0" + sources."universalify-2.0.0" sources."unpipe-1.0.0" sources."update-notifier-4.1.3" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."url-parse-lax-3.0.0" sources."utils-merge-1.0.1" sources."uuid-3.4.0" @@ -69736,7 +69534,7 @@ in sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.1" - sources."@types/node-14.14.20" + sources."@types/node-14.14.22" sources."@types/normalize-package-data-2.4.0" sources."aggregate-error-3.1.0" sources."ansi-styles-3.2.1" @@ -69958,7 +69756,7 @@ in sources."p-map-3.0.0" sources."p-timeout-3.2.0" sources."p-try-2.2.0" - sources."parse-json-5.1.0" + sources."parse-json-5.2.0" sources."pascalcase-0.1.1" sources."path-dirname-1.0.2" sources."path-exists-4.0.0" @@ -70107,7 +69905,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.2" - sources."@types/node-14.14.20" + sources."@types/node-14.14.22" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -70197,7 +69995,7 @@ in sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" sources."pseudomap-1.0.2" - sources."qs-6.9.4" + sources."qs-6.9.6" sources."quicktask-1.1.0" sources."raf-3.3.2" sources."readable-stream-2.3.7" @@ -70734,7 +70532,7 @@ in sources."menu-string-1.3.0" sources."merkle-tree-stream-3.0.3" sources."micromatch-3.1.10" - sources."mime-2.4.7" + sources."mime-2.5.0" sources."mime-db-1.45.0" sources."mime-types-2.1.28" sources."mimic-response-2.1.0" @@ -70819,7 +70617,7 @@ in sources."punycode-2.1.1" sources."qs-6.5.2" sources."random-access-file-2.1.4" - sources."random-access-memory-3.1.1" + sources."random-access-memory-3.1.2" sources."random-access-storage-1.4.1" sources."randombytes-2.1.0" sources."range-parser-1.2.1" @@ -71001,7 +70799,7 @@ in sources."untildify-3.0.3" sources."unzip-response-2.0.1" sources."update-notifier-2.5.0" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."urix-0.1.0" sources."url-parse-lax-1.0.0" sources."use-3.1.1" @@ -71067,10 +70865,10 @@ in diagnostic-languageserver = nodeEnv.buildNodePackage { name = "diagnostic-languageserver"; packageName = "diagnostic-languageserver"; - version = "1.8.0"; + version = "1.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/diagnostic-languageserver/-/diagnostic-languageserver-1.8.0.tgz"; - sha512 = "UnQGWIszi+uXkZ/pYUDLKuftSOSIvc/ZBSp/W6OF/Qyr2SsEaSD6TuaIo7TiH1MGQX1b2EW9P1WlE+16Ft4MiA=="; + url = "https://registry.npmjs.org/diagnostic-languageserver/-/diagnostic-languageserver-1.8.1.tgz"; + sha512 = "W8lFslQXZ6HEjy9Ba7jLYDzqJZFkWVINWZjNDUZslozm2ZLMH7QWNIa74DKZXLA972ZgY8iJ0WIMxn0Y4+1POw=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.4" @@ -71087,14 +70885,14 @@ in sources."crypto-random-string-2.0.0" sources."del-6.0.0" sources."dir-glob-3.0.1" - sources."fast-glob-3.2.4" + sources."fast-glob-3.2.5" sources."fastq-1.10.0" sources."fill-range-7.0.1" sources."find-up-4.1.0" sources."fs.realpath-1.0.0" sources."glob-7.1.6" sources."glob-parent-5.1.1" - sources."globby-11.0.1" + sources."globby-11.0.2" sources."graceful-fs-4.2.4" sources."ignore-5.1.8" sources."indent-string-4.0.0" @@ -71152,15 +70950,15 @@ in dockerfile-language-server-nodejs = nodeEnv.buildNodePackage { name = "dockerfile-language-server-nodejs"; packageName = "dockerfile-language-server-nodejs"; - version = "0.2.0"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-language-server-nodejs/-/dockerfile-language-server-nodejs-0.2.0.tgz"; - sha512 = "D6qT5w2y73pF02c+caAPYn/IG7T/231u8WD/qfyt3MBtnRe8x7ZIQK9+VAxFYvCtqbGuN7MiPVoRctkth/jcuA=="; + url = "https://registry.npmjs.org/dockerfile-language-server-nodejs/-/dockerfile-language-server-nodejs-0.3.0.tgz"; + sha512 = "nW0l6S6YZlSGrGu6PBHoLmhwqwxgNTSis1hvjaxpnS3Ohalf/e87HC/pkjg3c+AixytqlXPR7nixzVPDJTkNZQ=="; }; dependencies = [ sources."dockerfile-ast-0.1.0" - sources."dockerfile-language-service-0.1.1" - sources."dockerfile-utils-0.1.1" + sources."dockerfile-language-service-0.2.0" + sources."dockerfile-utils-0.2.0" sources."vscode-jsonrpc-6.0.0" sources."vscode-languageserver-7.0.0" sources."vscode-languageserver-protocol-3.16.0" @@ -71179,15 +70977,15 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "6.62.1"; + version = "6.65.3"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.62.1.tgz"; - sha512 = "LM6NwMLF0W/ZCcSEqXUufGiDzGpXpF7uPQjLo5zx0PS/tLQkrkA2sNeNcE6p7dVcX1u9hYRuJisl9PP7hQvsAg=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.65.3.tgz"; + sha512 = "GNai5B3ipW7ekXxj0WeFN7IsqY8+hXogeL5WWDn4F5z7DlB8idXmX/0RWv/2tS5Hnh4R9BzW1cJ5s2n85bhsSw=="; }; dependencies = [ sources."@fast-csv/format-4.3.5" sources."@fast-csv/parse-4.3.6" - sources."@types/node-14.14.20" + sources."@types/node-14.14.22" sources."JSONStream-1.3.5" sources."ajv-6.12.6" sources."asn1-0.2.4" @@ -71299,7 +71097,7 @@ in }) sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - (sources."uri-js-4.4.0" // { + (sources."uri-js-4.4.1" // { dependencies = [ sources."punycode-2.1.1" ]; @@ -71382,7 +71180,7 @@ in sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimist-1.2.1" - sources."@types/node-14.14.20" + sources."@types/node-14.14.22" sources."@types/normalize-package-data-2.4.0" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -71562,7 +71360,7 @@ in sources."p-limit-2.3.0" sources."p-locate-3.0.0" sources."p-try-2.2.0" - sources."parse-json-5.1.0" + sources."parse-json-5.2.0" sources."patch-console-1.0.0" sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" @@ -71647,7 +71445,7 @@ in sources."trim-newlines-3.0.0" sources."type-fest-0.12.0" sources."unicode-emoji-modifier-base-1.0.0" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."validate-npm-package-license-3.0.4" sources."which-1.3.1" sources."widest-line-3.1.0" @@ -71709,10 +71507,10 @@ in sources."@fluentui/date-time-utilities-7.9.0" sources."@fluentui/dom-utilities-1.1.1" sources."@fluentui/keyboard-key-0.2.12" - sources."@fluentui/react-7.155.3" - sources."@fluentui/react-focus-7.17.0" + sources."@fluentui/react-7.157.0" + sources."@fluentui/react-focus-7.17.1" sources."@fluentui/react-window-provider-1.0.1" - sources."@fluentui/theme-1.7.0" + sources."@fluentui/theme-1.7.1" (sources."@gulp-sourcemaps/identity-map-1.0.2" // { dependencies = [ sources."normalize-path-2.1.1" @@ -71723,11 +71521,11 @@ in sources."normalize-path-2.1.1" ]; }) - sources."@microsoft/load-themed-styles-1.10.141" + sources."@microsoft/load-themed-styles-1.10.146" sources."@nodelib/fs.scandir-2.1.4" sources."@nodelib/fs.stat-2.0.4" sources."@nodelib/fs.walk-1.2.6" - sources."@npmcli/move-file-1.0.1" + sources."@npmcli/move-file-1.1.0" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/basic-auth-1.1.3" @@ -71735,17 +71533,17 @@ in sources."@types/caseless-0.12.2" sources."@types/chart.js-2.9.24" sources."@types/connect-3.4.34" - sources."@types/engine.io-3.1.4" + sources."@types/engine.io-3.1.5" sources."@types/express-4.17.8" - sources."@types/express-serve-static-core-4.17.17" + sources."@types/express-serve-static-core-4.17.18" sources."@types/fancy-log-1.3.0" sources."@types/glob-7.1.3" sources."@types/hls.js-0.13.1" sources."@types/js-yaml-3.12.5" - sources."@types/json-schema-7.0.6" + sources."@types/json-schema-7.0.7" sources."@types/lodash-4.14.161" sources."@types/material-design-lite-1.1.16" - sources."@types/mime-2.0.3" + sources."@types/mime-1.3.2" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" sources."@types/mithril-2.0.3" @@ -71754,7 +71552,7 @@ in sources."@types/mysql-2.15.15" sources."@types/node-14.11.1" sources."@types/pg-7.14.5" - sources."@types/pg-types-1.11.5" + sources."@types/pg-types-2.2.0" sources."@types/qs-6.9.5" sources."@types/range-parser-1.2.3" (sources."@types/request-2.48.5" // { @@ -71762,18 +71560,18 @@ in sources."form-data-2.5.1" ]; }) - sources."@types/serve-static-1.13.8" + sources."@types/serve-static-1.13.9" sources."@types/socket.io-2.1.11" sources."@types/socket.io-client-1.4.33" sources."@types/sqlite3-3.1.6" sources."@types/tough-cookie-4.0.0" sources."@types/url-join-4.0.0" - sources."@uifabric/foundation-7.9.20" - sources."@uifabric/icons-7.5.17" + sources."@uifabric/foundation-7.9.21" + sources."@uifabric/icons-7.5.18" sources."@uifabric/merge-styles-7.19.1" sources."@uifabric/react-hooks-7.13.9" sources."@uifabric/set-version-7.0.23" - sources."@uifabric/styling-7.16.18" + sources."@uifabric/styling-7.16.19" sources."@uifabric/utilities-7.33.2" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" @@ -71961,7 +71759,7 @@ in sources."minizlib-2.1.2" sources."p-map-4.0.0" sources."rimraf-3.0.2" - sources."tar-6.0.5" + sources."tar-6.1.0" ]; }) sources."cache-base-1.0.1" @@ -71971,7 +71769,7 @@ in sources."lowercase-keys-2.0.0" ]; }) - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."callsite-1.0.0" sources."camelcase-3.0.0" sources."caseless-0.12.0" @@ -72181,7 +71979,7 @@ in ]; }) sources."engine.io-parser-2.2.1" - sources."enhanced-resolve-4.3.0" + sources."enhanced-resolve-4.5.0" sources."errno-0.1.8" sources."error-ex-1.3.2" sources."es5-ext-0.10.53" @@ -72247,7 +72045,7 @@ in sources."extsprintf-1.3.0" sources."fancy-log-1.3.3" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.4" + sources."fast-glob-3.2.5" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-1.1.4" sources."fastq-1.10.0" @@ -72319,7 +72117,7 @@ in ]; }) sources."get-caller-file-1.0.3" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.0" sources."get-stream-4.1.0" sources."get-value-2.0.6" sources."getpass-0.1.7" @@ -72552,7 +72350,11 @@ in sources."material-design-lite-1.3.0" sources."md5.js-1.3.5" sources."media-typer-0.3.0" - sources."memoizee-0.4.14" + (sources."memoizee-0.4.15" // { + dependencies = [ + sources."next-tick-1.1.0" + ]; + }) (sources."memory-fs-0.5.0" // { dependencies = [ sources."isarray-1.0.0" @@ -72662,7 +72464,7 @@ in }) sources."nan-2.14.2" sources."nanomatch-1.2.13" - (sources."needle-2.5.2" // { + (sources."needle-2.6.0" // { dependencies = [ sources."debug-3.2.7" sources."ms-2.1.3" @@ -72737,19 +72539,51 @@ in sources."object.map-1.0.1" sources."object.pick-1.3.0" sources."object.reduce-1.0.1" - sources."office-ui-fabric-react-7.155.3" + sources."office-ui-fabric-react-7.157.0" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" sources."onetime-2.0.1" - sources."openapi-default-setter-7.0.1" - sources."openapi-framework-7.2.0" - sources."openapi-jsonschema-parameters-7.0.2" - sources."openapi-request-coercer-7.1.0" - sources."openapi-request-validator-7.2.0" - sources."openapi-response-validator-7.0.1" - sources."openapi-schema-validator-7.0.1" - sources."openapi-security-handler-7.0.1" + (sources."openapi-default-setter-7.2.3" // { + dependencies = [ + sources."openapi-types-7.2.3" + ]; + }) + (sources."openapi-framework-7.2.3" // { + dependencies = [ + sources."openapi-types-7.2.3" + ]; + }) + (sources."openapi-jsonschema-parameters-7.2.3" // { + dependencies = [ + sources."openapi-types-7.2.3" + ]; + }) + (sources."openapi-request-coercer-7.2.3" // { + dependencies = [ + sources."openapi-types-7.2.3" + ]; + }) + (sources."openapi-request-validator-7.2.3" // { + dependencies = [ + sources."openapi-types-7.2.3" + ]; + }) + (sources."openapi-response-validator-7.2.3" // { + dependencies = [ + sources."openapi-types-7.2.3" + ]; + }) + (sources."openapi-schema-validator-7.2.3" // { + dependencies = [ + sources."openapi-types-7.2.3" + ]; + }) + (sources."openapi-security-handler-7.2.3" // { + dependencies = [ + sources."openapi-types-7.2.3" + ]; + }) sources."openapi-types-7.0.1" (sources."opencollective-1.0.3" // { dependencies = [ @@ -72921,7 +72755,7 @@ in sources."restore-cursor-2.0.0" sources."ret-0.1.15" sources."reusify-1.0.4" - sources."rfdc-1.1.4" + sources."rfdc-1.2.0" sources."rimraf-2.7.1" sources."ripemd160-2.0.2" sources."run-async-2.4.1" @@ -72931,7 +72765,7 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - sources."sass-1.32.0" + sources."sass-1.32.5" sources."sax-1.2.4" sources."scheduler-0.19.1" sources."schema-utils-2.7.1" @@ -72998,7 +72832,7 @@ in sources."debug-4.1.1" sources."isarray-2.0.1" sources."ms-2.1.3" - (sources."socket.io-parser-3.3.1" // { + (sources."socket.io-parser-3.3.2" // { dependencies = [ sources."component-emitter-1.3.0" sources."debug-3.1.0" @@ -73099,7 +72933,7 @@ in sources."sver-compat-1.5.0" sources."swagger-schema-official-2.0.0-bab6bed" sources."swagger-ui-dist-3.34.0" - sources."tail-2.1.1" + sources."tail-2.2.0" sources."tapable-1.1.3" (sources."tar-4.4.13" // { dependencies = [ @@ -73188,7 +73022,7 @@ in ]; }) sources."upath-1.2.0" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."urix-0.1.0" (sources."url-0.11.0" // { dependencies = [ @@ -73230,9 +73064,9 @@ in (sources."watchpack-1.7.5" // { dependencies = [ sources."anymatch-3.1.1" - sources."binary-extensions-2.1.0" - sources."chokidar-3.4.3" - sources."fsevents-2.1.3" + sources."binary-extensions-2.2.0" + sources."chokidar-3.5.1" + sources."fsevents-2.3.1" sources."is-binary-path-2.1.0" sources."readdirp-3.5.0" ]; @@ -73338,10 +73172,10 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "7.17.0"; + version = "7.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.17.0.tgz"; - sha512 = "zJk08MiBgwuGoxes5sSQhOtibZ75pz0J35XTRlZOk9xMffhpA9BTbQZxoXZzOl5zMbleShbGwtw+1kGferfFwQ=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.18.0.tgz"; + sha512 = "fbgTiE8BfUJZuBeq2Yi7J3RB3WGUQ9PNuNbmgi6jt9Iv8qrkxfy19Ds3OpL1Pm7zg3BtTVhvcUZbIRQ0wmSjAQ=="; }; dependencies = [ sources."@babel/code-frame-7.12.11" @@ -73351,7 +73185,7 @@ in sources."chalk-2.4.2" ]; }) - sources."@eslint/eslintrc-0.2.2" + sources."@eslint/eslintrc-0.3.0" sources."acorn-7.4.1" sources."acorn-jsx-5.3.1" sources."ajv-6.12.6" @@ -73412,7 +73246,7 @@ in sources."fast-levenshtein-2.0.6" sources."file-entry-cache-6.0.0" sources."flat-cache-3.0.4" - sources."flatted-3.1.0" + sources."flatted-3.1.1" sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.6" @@ -73474,7 +73308,7 @@ in sources."text-table-0.2.0" sources."type-check-0.4.0" sources."type-fest-0.8.1" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."v8-compile-cache-2.2.0" sources."which-2.0.2" sources."word-wrap-1.2.3" @@ -73507,7 +73341,7 @@ in sources."chalk-2.4.2" ]; }) - sources."@eslint/eslintrc-0.2.2" + sources."@eslint/eslintrc-0.3.0" sources."acorn-7.4.1" sources."acorn-jsx-5.3.1" sources."ajv-6.12.6" @@ -73539,7 +73373,7 @@ in sources."emoji-regex-8.0.0" sources."enquirer-2.3.6" sources."escape-string-regexp-1.0.5" - sources."eslint-7.17.0" + sources."eslint-7.18.0" sources."eslint-scope-5.1.1" (sources."eslint-utils-2.1.0" // { dependencies = [ @@ -73570,7 +73404,7 @@ in sources."fast-levenshtein-2.0.6" sources."file-entry-cache-6.0.0" sources."flat-cache-3.0.4" - sources."flatted-3.1.0" + sources."flatted-3.1.1" sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.6" @@ -73633,7 +73467,7 @@ in sources."text-table-0.2.0" sources."type-check-0.4.0" sources."type-fest-0.8.1" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."v8-compile-cache-2.2.0" sources."which-2.0.2" sources."word-wrap-1.2.3" @@ -73673,37 +73507,37 @@ in expo-cli = nodeEnv.buildNodePackage { name = "expo-cli"; packageName = "expo-cli"; - version = "4.0.17"; + version = "4.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/expo-cli/-/expo-cli-4.0.17.tgz"; - sha512 = "JF8HBs5dUd14zh9cI+u/OEKyRJqJZ2wOPvHlsX2Ohgxw80Wk/BGtTtZzlWY8/PQ+Lm56RWx7RMFPYestsBmpBg=="; + url = "https://registry.npmjs.org/expo-cli/-/expo-cli-4.1.3.tgz"; + sha512 = "aONXPUydisTU++pMXn8HkF3hJVz1RvrGXp/J4U45GPlZ3AXQddoBjNrG/GfA4ViVgVPPc6S8N64YHnawucbS8w=="; }; dependencies = [ sources."@babel/code-frame-7.12.11" sources."@babel/compat-data-7.12.7" - sources."@babel/core-7.9.0" + (sources."@babel/core-7.9.0" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) sources."@babel/generator-7.12.11" sources."@babel/helper-annotate-as-pure-7.12.10" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" - sources."@babel/helper-compilation-targets-7.12.5" - sources."@babel/helper-create-class-features-plugin-7.12.1" - sources."@babel/helper-create-regexp-features-plugin-7.12.7" - (sources."@babel/helper-define-map-7.10.5" // { + (sources."@babel/helper-compilation-targets-7.12.5" // { dependencies = [ - sources."lodash-4.17.20" + sources."semver-5.7.1" ]; }) + sources."@babel/helper-create-class-features-plugin-7.12.1" + sources."@babel/helper-create-regexp-features-plugin-7.12.7" + sources."@babel/helper-define-map-7.10.5" sources."@babel/helper-explode-assignable-expression-7.12.1" sources."@babel/helper-function-name-7.12.11" sources."@babel/helper-get-function-arity-7.12.10" sources."@babel/helper-hoist-variables-7.10.4" sources."@babel/helper-member-expression-to-functions-7.12.7" sources."@babel/helper-module-imports-7.12.5" - (sources."@babel/helper-module-transforms-7.12.1" // { - dependencies = [ - sources."lodash-4.17.20" - ]; - }) + sources."@babel/helper-module-transforms-7.12.1" sources."@babel/helper-optimise-call-expression-7.12.10" sources."@babel/helper-plugin-utils-7.10.4" sources."@babel/helper-remap-async-to-generator-7.12.1" @@ -73794,29 +73628,22 @@ in sources."@babel/plugin-transform-typescript-7.12.1" sources."@babel/plugin-transform-unicode-escapes-7.12.1" sources."@babel/plugin-transform-unicode-regex-7.12.1" - sources."@babel/preset-env-7.12.11" + (sources."@babel/preset-env-7.12.11" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) sources."@babel/preset-modules-0.1.4" sources."@babel/preset-typescript-7.12.7" sources."@babel/runtime-7.12.5" sources."@babel/template-7.12.7" - (sources."@babel/traverse-7.12.12" // { - dependencies = [ - sources."lodash-4.17.20" - ]; - }) - (sources."@babel/types-7.12.12" // { - dependencies = [ - sources."lodash-4.17.20" - ]; - }) + sources."@babel/traverse-7.12.12" + sources."@babel/types-7.12.12" + sources."@expo/apple-utils-0.0.0-alpha.17" sources."@expo/babel-preset-cli-0.2.18" sources."@expo/bunyan-4.0.0" - (sources."@expo/config-3.3.22" // { - dependencies = [ - sources."semver-7.3.4" - ]; - }) - (sources."@expo/config-plugins-1.0.13" // { + sources."@expo/config-3.3.26" + (sources."@expo/config-plugins-1.0.17" // { dependencies = [ sources."slash-3.0.0" sources."uuid-3.4.0" @@ -73824,13 +73651,13 @@ in ]; }) sources."@expo/config-types-40.0.0-beta.2" - (sources."@expo/configure-splash-screen-0.3.2" // { + (sources."@expo/configure-splash-screen-0.3.3" // { dependencies = [ sources."commander-5.1.0" sources."pngjs-5.0.0" ]; }) - (sources."@expo/dev-server-0.1.48" // { + (sources."@expo/dev-server-0.1.52" // { dependencies = [ sources."body-parser-1.19.0" sources."bytes-3.1.0" @@ -73847,42 +73674,22 @@ in sources."type-fest-0.12.0" ]; }) - sources."@expo/dev-tools-0.13.74" - sources."@expo/eas-build-job-0.1.2" - (sources."@expo/image-utils-0.3.9" // { + sources."@expo/dev-tools-0.13.79" + (sources."@expo/image-utils-0.3.10" // { dependencies = [ - sources."semver-6.1.1" sources."tempy-0.3.0" ]; }) - (sources."@expo/json-file-8.2.25" // { + (sources."@expo/json-file-8.2.26" // { dependencies = [ sources."@babel/code-frame-7.10.4" sources."json5-1.0.1" ]; }) - sources."@expo/metro-config-0.1.48" - (sources."@expo/ngrok-2.4.3" // { - dependencies = [ - sources."uuid-3.4.0" - ]; - }) - sources."@expo/ngrok-bin-2.2.8-beta.3" - sources."@expo/ngrok-bin-darwin-ia32-2.2.8" - sources."@expo/ngrok-bin-darwin-x64-2.2.8" - sources."@expo/ngrok-bin-freebsd-ia32-2.2.8" - sources."@expo/ngrok-bin-freebsd-x64-2.2.8" - sources."@expo/ngrok-bin-linux-arm-2.2.8" - sources."@expo/ngrok-bin-linux-arm64-2.2.8" - sources."@expo/ngrok-bin-linux-ia32-2.2.8" - sources."@expo/ngrok-bin-linux-x64-2.2.8" - sources."@expo/ngrok-bin-sunos-x64-2.2.8" - sources."@expo/ngrok-bin-win32-ia32-2.2.8-beta.1" - sources."@expo/ngrok-bin-win32-x64-2.2.8-beta.1" + sources."@expo/metro-config-0.1.52" sources."@expo/osascript-2.0.24" - (sources."@expo/package-manager-0.0.34" // { + (sources."@expo/package-manager-0.0.36" // { dependencies = [ - sources."ansi-regex-5.0.0" sources."npm-package-arg-7.0.0" sources."rimraf-3.0.2" sources."semver-5.7.1" @@ -73894,28 +73701,22 @@ in ]; }) sources."@expo/results-1.0.0" - (sources."@expo/schemer-1.3.23" // { + (sources."@expo/schemer-1.3.24" // { dependencies = [ - sources."ajv-5.5.2" - sources."fast-deep-equal-1.1.0" - sources."get-stream-3.0.0" sources."got-6.7.1" - sources."json-schema-traverse-0.3.1" sources."probe-image-size-3.2.0" ]; }) sources."@expo/simple-spinner-1.0.2" sources."@expo/spawn-async-1.5.0" - sources."@expo/traveling-fastlane-darwin-1.15.1" - sources."@expo/traveling-fastlane-linux-1.15.1" - (sources."@expo/webpack-config-0.12.52" // { + (sources."@expo/webpack-config-0.12.56" // { dependencies = [ sources."@babel/runtime-7.9.0" sources."is-wsl-2.2.0" sources."react-refresh-0.8.3" ]; }) - (sources."@expo/xdl-59.0.14" // { + (sources."@expo/xdl-59.0.19" // { dependencies = [ sources."chownr-1.1.4" (sources."fs-minipass-1.2.7" // { @@ -73931,22 +73732,11 @@ in ]; }) sources."mkdirp-1.0.4" - (sources."npm-package-arg-8.1.0" // { - dependencies = [ - sources."lru-cache-6.0.0" - sources."semver-7.3.4" - sources."yallist-4.0.0" - ]; - }) + sources."npm-package-arg-8.1.0" (sources."pacote-11.1.0" // { dependencies = [ sources."minipass-3.1.3" - (sources."semver-7.3.4" // { - dependencies = [ - sources."lru-cache-6.0.0" - ]; - }) - (sources."tar-6.0.5" // { + (sources."tar-6.1.0" // { dependencies = [ sources."chownr-2.0.0" ]; @@ -74021,14 +73811,14 @@ in (sources."@npmcli/git-2.0.4" // { dependencies = [ sources."mkdirp-1.0.4" - sources."semver-7.3.4" sources."which-2.0.2" ]; }) sources."@npmcli/installed-package-contents-1.0.5" - (sources."@npmcli/move-file-1.0.1" // { + (sources."@npmcli/move-file-1.1.0" // { dependencies = [ sources."mkdirp-1.0.4" + sources."rimraf-2.7.1" ]; }) sources."@npmcli/node-gyp-1.0.1" @@ -74036,18 +73826,6 @@ in sources."@npmcli/run-script-1.8.1" sources."@pmmmwh/react-refresh-webpack-plugin-0.3.3" sources."@react-native-community/cli-debugger-ui-4.13.1" - (sources."@react-native-community/cli-platform-android-4.13.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-3.0.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."fs-extra-8.1.0" - sources."has-flag-4.0.0" - sources."slash-3.0.0" - sources."supports-color-7.2.0" - ]; - }) (sources."@react-native-community/cli-platform-ios-4.13.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -74092,9 +73870,9 @@ in sources."@types/istanbul-lib-coverage-2.0.3" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" - sources."@types/json-schema-7.0.6" + sources."@types/json-schema-7.0.7" sources."@types/keyv-3.1.1" - sources."@types/lodash-4.14.167" + sources."@types/lodash-4.14.168" sources."@types/minimatch-3.0.3" sources."@types/mkdirp-0.5.2" sources."@types/node-9.6.61" @@ -74111,7 +73889,7 @@ in sources."source-map-0.6.1" ]; }) - (sources."@types/webpack-4.41.25" // { + (sources."@types/webpack-4.41.26" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -74151,7 +73929,7 @@ in sources."agent-base-6.0.2" sources."agentkeepalive-4.1.3" sources."aggregate-error-3.1.0" - sources."ajv-6.12.6" + sources."ajv-5.5.2" sources."ajv-errors-1.0.1" sources."ajv-keywords-3.5.2" sources."alphanum-sort-1.0.2" @@ -74163,7 +73941,9 @@ in }) (sources."ansi-align-3.0.0" // { dependencies = [ + sources."ansi-regex-4.1.0" sources."emoji-regex-7.0.3" + sources."is-fullwidth-code-point-2.0.0" sources."string-width-3.1.0" sources."strip-ansi-5.2.0" ]; @@ -74174,13 +73954,8 @@ in sources."type-fest-0.11.0" ]; }) - (sources."ansi-fragments-0.2.1" // { - dependencies = [ - sources."strip-ansi-5.2.0" - ]; - }) sources."ansi-html-0.0.7" - sources."ansi-regex-4.1.0" + sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."any-base-1.1.0" sources."any-promise-1.3.0" @@ -74217,8 +73992,7 @@ in }) sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" - sources."astral-regex-1.0.0" - sources."async-0.9.2" + sources."async-1.5.2" sources."async-each-1.0.3" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" @@ -74268,7 +74042,7 @@ in sources."bcrypt-pbkdf-1.0.2" sources."big-integer-1.6.48" sources."big.js-5.2.2" - sources."binary-extensions-2.1.0" + sources."binary-extensions-2.2.0" sources."bindings-1.5.0" sources."bluebird-3.7.2" sources."bmp-js-0.1.0" @@ -74308,7 +74082,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.16.0" + sources."browserslist-4.16.1" sources."buffer-5.7.1" sources."buffer-equal-0.0.1" sources."buffer-from-1.1.1" @@ -74334,7 +74108,7 @@ in sources."normalize-url-4.5.0" ]; }) - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."caller-callsite-2.0.0" sources."caller-path-2.0.0" sources."callsite-1.0.0" @@ -74342,12 +74116,12 @@ in (sources."camel-case-4.1.2" // { dependencies = [ sources."pascal-case-3.1.2" - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001173" + sources."caniuse-lite-1.0.30001180" sources."capture-stack-trace-1.0.1" sources."caseless-0.12.0" (sources."chalk-4.1.0" // { @@ -74360,7 +74134,7 @@ in ]; }) sources."charenc-0.0.2" - sources."chokidar-3.4.3" + sources."chokidar-3.5.1" sources."chownr-2.0.0" sources."chrome-trace-event-1.0.2" sources."ci-info-1.6.0" @@ -74393,12 +74167,14 @@ in sources."cli-cursor-2.1.0" sources."cli-spinners-2.5.0" sources."cli-table3-0.6.0" - (sources."cliui-6.0.0" // { + (sources."cliui-5.0.0" // { dependencies = [ - sources."ansi-styles-4.3.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."wrap-ansi-6.2.0" + sources."ansi-regex-4.1.0" + sources."emoji-regex-7.0.3" + sources."is-fullwidth-code-point-2.0.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + sources."wrap-ansi-5.1.0" ]; }) sources."clone-2.1.2" @@ -74417,7 +74193,7 @@ in sources."color-string-1.5.4" sources."colorette-1.2.1" sources."colors-1.4.0" - sources."combined-stream-1.0.8" + sources."combined-stream-1.0.6" sources."command-exists-1.2.9" sources."commander-2.17.1" sources."common-tags-1.8.0" @@ -74462,7 +74238,7 @@ in sources."array-union-2.1.0" sources."find-cache-dir-3.3.1" sources."find-up-4.1.0" - sources."globby-11.0.1" + sources."globby-11.0.2" sources."loader-utils-2.0.0" sources."locate-path-5.0.0" sources."make-dir-3.1.0" @@ -74476,8 +74252,8 @@ in sources."slash-3.0.0" ]; }) - sources."core-js-3.8.2" - (sources."core-js-compat-3.8.2" // { + sources."core-js-3.8.3" + (sources."core-js-compat-3.8.3" // { dependencies = [ sources."semver-7.0.0" ]; @@ -74492,7 +74268,11 @@ in sources."create-error-class-3.0.2" sources."create-hash-1.2.0" sources."create-hmac-1.1.7" - sources."cross-spawn-6.0.5" + (sources."cross-spawn-6.0.5" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) sources."crypt-0.0.2" sources."crypto-browserify-3.12.0" sources."crypto-random-string-1.0.0" @@ -74539,7 +74319,6 @@ in sources."dag-map-1.0.2" sources."dashdash-1.14.1" sources."dateformat-3.0.3" - sources."dayjs-1.10.1" sources."debug-4.3.2" sources."debuglog-1.0.1" sources."decache-4.4.0" @@ -74608,6 +74387,7 @@ in sources."domain-browser-1.2.0" sources."domelementtype-2.1.0" sources."domhandler-3.3.0" + sources."domino-2.1.6" (sources."domutils-2.4.4" // { dependencies = [ sources."domhandler-4.0.0" @@ -74615,7 +74395,7 @@ in }) (sources."dot-case-3.0.4" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) sources."dot-prop-5.3.0" @@ -74624,7 +74404,7 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.634" + sources."electron-to-chromium-1.3.645" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -74639,12 +74419,12 @@ in ]; }) sources."end-of-stream-1.4.4" - (sources."enhanced-resolve-4.3.0" // { + (sources."enhanced-resolve-4.5.0" // { dependencies = [ sources."memory-fs-0.5.0" ]; }) - sources."entities-2.1.0" + sources."entities-2.2.0" sources."env-editor-0.4.1" sources."env-paths-2.2.0" sources."envinfo-7.5.0" @@ -74658,8 +74438,8 @@ in }) sources."error-stack-parser-2.0.6" sources."errorhandler-1.5.1" - sources."es-abstract-1.17.7" - sources."es-get-iterator-1.1.1" + sources."es-abstract-1.18.0-next.2" + sources."es-get-iterator-1.1.2" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."escape-html-1.0.3" @@ -74679,7 +74459,11 @@ in sources."eventsource-1.0.7" sources."evp_bytestokey-1.0.3" sources."exec-async-2.2.0" - sources."execa-1.0.0" + (sources."execa-1.0.0" // { + dependencies = [ + sources."get-stream-4.1.0" + ]; + }) sources."exif-parser-0.1.12" (sources."expand-brackets-2.1.4" // { dependencies = [ @@ -74701,7 +74485,7 @@ in sources."ms-2.0.0" ]; }) - (sources."expo-pwa-0.0.58" // { + (sources."expo-pwa-0.0.62" // { dependencies = [ sources."commander-2.20.0" ]; @@ -74725,8 +74509,8 @@ in ]; }) sources."extsprintf-1.3.0" - sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.4" + sources."fast-deep-equal-1.1.0" + sources."fast-glob-3.2.5" sources."fast-json-stable-stringify-2.1.0" sources."fastq-1.10.0" sources."faye-websocket-0.10.0" @@ -74751,7 +74535,7 @@ in sources."find-up-5.0.0" sources."find-yarn-workspace-root-2.0.0" sources."flush-write-stream-1.1.1" - sources."follow-redirects-1.13.1" + sources."follow-redirects-1.13.2" sources."for-in-1.0.2" sources."foreach-2.0.5" sources."forever-agent-0.6.1" @@ -74768,11 +74552,7 @@ in sources."to-regex-range-2.1.1" ]; }) - (sources."form-data-2.3.2" // { - dependencies = [ - sources."combined-stream-1.0.6" - ]; - }) + sources."form-data-2.3.2" sources."forwarded-0.1.2" sources."fragment-cache-0.2.1" sources."freeport-async-2.0.0" @@ -74795,7 +74575,7 @@ in }) sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" - sources."fsevents-2.1.3" + sources."fsevents-2.3.1" sources."function-bind-1.1.1" (sources."gauge-2.7.4" // { dependencies = [ @@ -74807,10 +74587,10 @@ in }) sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.0" sources."get-own-enumerable-property-symbols-3.0.2" sources."get-port-3.2.0" - sources."get-stream-4.1.0" + sources."get-stream-3.0.0" sources."get-value-2.0.6" sources."getenv-0.7.0" sources."getpass-0.1.7" @@ -74852,7 +74632,13 @@ in sources."gzip-size-5.1.1" sources."handle-thing-2.0.1" sources."har-schema-2.0.0" - sources."har-validator-5.1.5" + (sources."har-validator-5.1.5" // { + dependencies = [ + sources."ajv-6.12.6" + sources."fast-deep-equal-3.1.3" + sources."json-schema-traverse-0.4.1" + ]; + }) sources."has-1.0.3" sources."has-flag-3.0.0" sources."has-symbols-1.0.1" @@ -74868,11 +74654,7 @@ in sources."kind-of-4.0.0" ]; }) - (sources."hasbin-1.2.3" // { - dependencies = [ - sources."async-1.5.2" - ]; - }) + sources."hasbin-1.2.3" (sources."hash-base-3.1.0" // { dependencies = [ sources."readable-stream-3.6.0" @@ -74976,7 +74758,7 @@ in sources."is-docker-2.1.1" sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-2.0.0" + sources."is-fullwidth-code-point-3.0.0" sources."is-function-1.0.2" sources."is-glob-4.0.1" (sources."is-invalid-path-0.1.0" // { @@ -74998,6 +74780,7 @@ in sources."is-port-reachable-2.0.1" (sources."is-reachable-4.0.0" // { dependencies = [ + sources."get-stream-4.1.0" sources."got-9.6.0" sources."p-timeout-3.2.0" sources."prepend-http-3.0.1" @@ -75019,11 +74802,7 @@ in sources."is-string-1.0.5" sources."is-svg-3.0.0" sources."is-symbol-1.0.3" - (sources."is-typed-array-1.1.4" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) + sources."is-typed-array-1.1.4" sources."is-typedarray-1.0.0" sources."is-valid-path-0.1.1" sources."is-weakmap-2.0.1" @@ -75042,11 +74821,10 @@ in sources."supports-color-7.2.0" ]; }) - sources."jetifier-1.6.6" sources."jimp-0.12.1" sources."joi-11.4.0" sources."join-component-1.1.0" - sources."jpeg-js-0.4.2" + sources."jpeg-js-0.4.3" sources."js-tokens-4.0.0" sources."js-yaml-3.14.1" sources."jsbn-0.1.1" @@ -75060,7 +74838,7 @@ in sources."md5-2.2.1" ]; }) - sources."json-schema-traverse-0.4.1" + sources."json-schema-traverse-0.3.1" sources."json-stable-stringify-1.0.1" sources."json-stringify-safe-5.0.1" sources."json3-3.3.3" @@ -75089,8 +74867,7 @@ in ]; }) sources."locate-path-6.0.0" - sources."lock-0.1.4" - sources."lodash-4.17.15" + sources."lodash-4.17.20" sources."lodash._reinterpolate-3.0.0" sources."lodash.assign-4.2.0" sources."lodash.debounce-4.0.8" @@ -75105,17 +74882,11 @@ in sources."chalk-2.4.2" ]; }) - (sources."logfmt-1.3.2" // { - dependencies = [ - sources."split-0.2.10" - ]; - }) - sources."logkitty-0.7.1" sources."loglevel-1.7.1" sources."loose-envify-1.4.0" (sources."lower-case-2.0.2" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) sources."lowercase-keys-1.0.1" @@ -75125,7 +74896,7 @@ in sources."semver-5.7.1" ]; }) - (sources."make-fetch-happen-8.0.12" // { + (sources."make-fetch-happen-8.0.13" // { dependencies = [ sources."minipass-3.1.3" ]; @@ -75156,7 +74927,7 @@ in sources."bn.js-4.11.9" ]; }) - sources."mime-2.4.7" + sources."mime-2.5.0" sources."mime-db-1.45.0" sources."mime-types-2.1.28" sources."mimic-fn-1.2.0" @@ -75164,6 +74935,9 @@ in sources."min-document-2.19.0" (sources."mini-css-extract-plugin-0.5.0" // { dependencies = [ + sources."ajv-6.12.6" + sources."fast-deep-equal-3.1.3" + sources."json-schema-traverse-0.4.1" sources."schema-utils-1.0.0" ]; }) @@ -75181,7 +74955,7 @@ in sources."minipass-3.1.3" ]; }) - (sources."minipass-fetch-1.3.2" // { + (sources."minipass-fetch-1.3.3" // { dependencies = [ sources."minipass-3.1.3" ]; @@ -75234,11 +75008,12 @@ in sources."ncp-2.0.0" sources."negotiator-0.6.2" sources."neo-async-2.6.2" + sources."nested-error-stacks-2.0.1" sources."next-tick-1.1.0" sources."nice-try-1.0.5" (sources."no-case-3.0.4" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) sources."node-fetch-2.6.1" @@ -75246,7 +75021,6 @@ in (sources."node-gyp-7.1.2" // { dependencies = [ sources."rimraf-3.0.2" - sources."semver-7.3.4" sources."which-2.0.2" ]; }) @@ -75258,34 +75032,29 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-1.1.69" + sources."node-releases-1.1.70" sources."nopt-5.0.0" sources."normalize-path-3.0.0" sources."normalize-url-3.3.0" sources."npm-bundled-1.1.1" - (sources."npm-install-checks-4.0.0" // { - dependencies = [ - sources."semver-7.3.4" - ]; - }) + sources."npm-install-checks-4.0.0" sources."npm-normalize-package-bin-1.0.1" (sources."npm-package-arg-6.1.0" // { dependencies = [ sources."hosted-git-info-2.8.8" + sources."semver-5.7.1" ]; }) sources."npm-packlist-2.1.4" (sources."npm-pick-manifest-6.1.0" // { dependencies = [ sources."npm-package-arg-8.1.0" - sources."semver-7.3.4" ]; }) (sources."npm-registry-fetch-8.1.5" // { dependencies = [ sources."minipass-3.1.3" sources."npm-package-arg-8.1.0" - sources."semver-7.3.4" ]; }) sources."npm-run-path-2.0.2" @@ -75313,22 +75082,10 @@ in sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.assign-4.1.2" - (sources."object.entries-1.1.3" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) - (sources."object.getownpropertydescriptors-2.1.1" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) + sources."object.entries-1.1.3" + sources."object.getownpropertydescriptors-2.1.1" sources."object.pick-1.3.0" - (sources."object.values-1.1.2" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) + sources."object.values-1.1.2" sources."obuf-1.1.2" sources."omggif-1.0.10" sources."on-finished-2.3.0" @@ -75341,6 +75098,7 @@ in sources."options-0.0.6" (sources."ora-3.4.0" // { dependencies = [ + sources."ansi-regex-4.1.0" sources."chalk-2.4.2" sources."strip-ansi-5.2.0" ]; @@ -75370,6 +75128,7 @@ in sources."p-try-2.2.0" (sources."package-json-6.4.0" // { dependencies = [ + sources."get-stream-4.1.0" sources."got-9.6.0" sources."prepend-http-2.0.0" sources."registry-auth-token-3.4.0" @@ -75378,21 +75137,20 @@ in sources."url-parse-lax-3.0.0" ]; }) - (sources."pacote-11.1.13" // { + (sources."pacote-11.2.3" // { dependencies = [ sources."minipass-3.1.3" sources."mkdirp-1.0.4" sources."npm-package-arg-8.1.0" sources."npm-registry-fetch-9.0.0" sources."rimraf-3.0.2" - sources."semver-7.3.4" ]; }) sources."pako-1.0.11" sources."parallel-transform-1.2.0" (sources."param-case-3.0.4" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) sources."parse-asn1-5.1.6" @@ -75585,14 +75343,9 @@ in sources."postcss-value-parser-4.1.0" sources."prepend-http-1.0.4" sources."pretty-bytes-5.5.0" - (sources."pretty-error-2.1.2" // { - dependencies = [ - sources."lodash-4.17.20" - ]; - }) + sources."pretty-error-2.1.2" (sources."pretty-format-25.5.0" // { dependencies = [ - sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -75664,7 +75417,7 @@ in sources."is-wsl-2.2.0" sources."loader-utils-2.0.0" sources."locate-path-5.0.0" - sources."open-7.3.0" + sources."open-7.3.1" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."path-key-3.1.1" @@ -75694,12 +75447,12 @@ in sources."regenerator-runtime-0.13.7" sources."regenerator-transform-0.14.5" sources."regex-not-1.0.2" - sources."regexp.prototype.flags-1.3.0" + sources."regexp.prototype.flags-1.3.1" sources."regexpu-core-4.7.1" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" sources."regjsgen-0.5.2" - (sources."regjsparser-0.6.4" // { + (sources."regjsparser-0.6.6" // { dependencies = [ sources."jsesc-0.5.0" ]; @@ -75713,7 +75466,7 @@ in (sources."dom-serializer-0.2.2" // { dependencies = [ sources."domelementtype-2.1.0" - sources."entities-2.1.0" + sources."entities-2.2.0" ]; }) sources."domelementtype-1.3.1" @@ -75721,7 +75474,6 @@ in sources."domutils-1.7.0" sources."entities-1.1.2" sources."htmlparser2-3.10.1" - sources."lodash-4.17.20" sources."readable-stream-3.6.0" sources."strip-ansi-3.0.1" ]; @@ -75737,6 +75489,11 @@ in sources."require-directory-2.1.1" sources."require-from-string-2.0.2" sources."require-main-filename-2.0.0" + (sources."requireg-0.2.2" // { + dependencies = [ + sources."resolve-1.7.1" + ]; + }) sources."requires-port-1.0.0" sources."resolve-1.19.0" sources."resolve-alpn-1.0.0" @@ -75768,14 +75525,20 @@ in sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" sources."sax-1.2.4" - sources."schema-utils-2.7.1" + (sources."schema-utils-2.7.1" // { + dependencies = [ + sources."ajv-6.12.6" + sources."fast-deep-equal-3.1.3" + sources."json-schema-traverse-0.4.1" + ]; + }) sources."select-hose-2.0.0" (sources."selfsigned-1.10.8" // { dependencies = [ sources."node-forge-0.10.0" ]; }) - sources."semver-5.5.0" + sources."semver-7.3.2" (sources."send-0.16.2" // { dependencies = [ sources."debug-2.6.9" @@ -75814,7 +75577,6 @@ in sources."simple-swizzle-0.2.2" sources."sisteransi-1.0.5" sources."slash-1.0.0" - sources."slice-ansi-2.1.0" (sources."slugid-1.1.0" // { dependencies = [ sources."uuid-2.0.3" @@ -75918,11 +75680,7 @@ in ]; }) sources."stream-shift-1.0.1" - (sources."string-width-4.2.0" // { - dependencies = [ - sources."is-fullwidth-code-point-3.0.0" - ]; - }) + sources."string-width-4.2.0" sources."string.prototype.trimend-1.0.3" sources."string.prototype.trimstart-1.0.3" sources."string_decoder-1.1.1" @@ -75931,11 +75689,7 @@ in sources."is-obj-1.0.1" ]; }) - (sources."strip-ansi-6.0.0" // { - dependencies = [ - sources."ansi-regex-5.0.0" - ]; - }) + sources."strip-ansi-6.0.0" sources."strip-comments-1.0.2" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" @@ -75965,7 +75719,7 @@ in }) sources."symbol-observable-1.2.0" sources."tapable-1.1.3" - (sources."tar-6.0.5" // { + (sources."tar-6.1.0" // { dependencies = [ sources."minipass-3.1.3" sources."mkdirp-1.0.4" @@ -75977,7 +75731,7 @@ in sources."array-union-2.1.0" sources."crypto-random-string-2.0.0" sources."del-6.0.0" - sources."globby-11.0.1" + sources."globby-11.0.2" sources."is-path-inside-3.0.2" sources."is-stream-2.0.0" sources."p-map-4.0.0" @@ -76045,6 +75799,7 @@ in sources."tslib-1.14.1" sources."tty-browserify-0.0.0" sources."tunnel-agent-0.6.0" + sources."turndown-7.0.0" sources."tweetnacl-0.14.5" sources."type-fest-0.3.1" sources."type-is-1.6.18" @@ -76080,7 +75835,7 @@ in sources."update-check-1.5.3" sources."upper-case-1.1.3" sources."upper-case-first-1.1.2" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."urix-0.1.0" (sources."url-0.11.0" // { dependencies = [ @@ -76090,6 +75845,9 @@ in sources."url-join-4.0.0" (sources."url-loader-4.1.1" // { dependencies = [ + sources."ajv-6.12.6" + sources."fast-deep-equal-3.1.3" + sources."json-schema-traverse-0.4.1" sources."loader-utils-2.0.0" sources."schema-utils-3.0.0" ]; @@ -76141,6 +75899,7 @@ in sources."wcwidth-1.0.1" (sources."webpack-4.43.0" // { dependencies = [ + sources."ajv-6.12.6" (sources."braces-2.3.2" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -76148,6 +75907,7 @@ in }) sources."cacache-12.0.4" sources."chownr-1.1.4" + sources."fast-deep-equal-3.1.3" (sources."fill-range-4.0.0" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -76158,6 +75918,7 @@ in sources."kind-of-3.2.2" ]; }) + sources."json-schema-traverse-0.4.1" sources."lru-cache-5.1.1" sources."micromatch-3.1.10" sources."rimraf-2.7.1" @@ -76173,6 +75934,7 @@ in sources."webpack-dev-middleware-3.7.3" (sources."webpack-dev-server-3.11.0" // { dependencies = [ + sources."ajv-6.12.6" sources."ansi-regex-2.1.1" sources."anymatch-2.0.0" sources."binary-extensions-1.13.1" @@ -76184,28 +75946,21 @@ in sources."braces-2.3.2" sources."bytes-3.1.0" sources."chokidar-2.1.8" - (sources."cliui-5.0.0" // { - dependencies = [ - sources."ansi-regex-4.1.0" - sources."strip-ansi-5.2.0" - ]; - }) sources."content-disposition-0.5.3" sources."cookie-0.4.0" - sources."emoji-regex-7.0.3" (sources."express-4.17.1" // { dependencies = [ sources."debug-2.6.9" ]; }) sources."extend-shallow-2.0.1" + sources."fast-deep-equal-3.1.3" sources."fill-range-4.0.0" (sources."finalhandler-1.1.2" // { dependencies = [ sources."debug-2.6.9" ]; }) - sources."find-up-3.0.0" sources."fsevents-1.2.13" sources."glob-parent-3.1.0" sources."http-errors-1.7.2" @@ -76215,16 +75970,13 @@ in sources."is-binary-path-1.0.1" sources."is-glob-3.1.0" sources."is-number-3.0.0" + sources."json-schema-traverse-0.4.1" sources."kind-of-3.2.2" - sources."locate-path-3.0.0" sources."micromatch-3.1.10" sources."mime-1.6.0" sources."ms-2.0.0" sources."normalize-path-2.1.1" - sources."p-limit-2.3.0" - sources."p-locate-3.0.0" sources."p-retry-3.0.1" - sources."path-exists-3.0.0" sources."qs-6.7.0" sources."raw-body-2.4.0" sources."readdirp-2.2.1" @@ -76243,24 +75995,10 @@ in sources."serve-static-1.14.1" sources."setprototypeof-1.1.1" sources."statuses-1.5.0" - (sources."string-width-3.1.0" // { - dependencies = [ - sources."ansi-regex-4.1.0" - sources."strip-ansi-5.2.0" - ]; - }) sources."strip-ansi-3.0.1" sources."supports-color-6.1.0" sources."to-regex-range-2.1.1" - (sources."wrap-ansi-5.1.0" // { - dependencies = [ - sources."ansi-regex-4.1.0" - sources."strip-ansi-5.2.0" - ]; - }) sources."ws-6.2.1" - sources."yargs-13.3.2" - sources."yargs-parser-13.1.2" ]; }) (sources."webpack-log-2.0.0" // { @@ -76293,14 +76031,11 @@ in sources."which-boxed-primitive-1.0.2" sources."which-collection-1.0.1" sources."which-module-2.0.0" - (sources."which-typed-array-1.1.4" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) + sources."which-typed-array-1.1.4" (sources."wide-align-1.1.3" // { dependencies = [ sources."ansi-regex-3.0.0" + sources."is-fullwidth-code-point-2.0.0" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" ]; @@ -76331,6 +76066,9 @@ in sources."worker-farm-1.7.0" (sources."worker-loader-2.0.0" // { dependencies = [ + sources."ajv-6.12.6" + sources."fast-deep-equal-3.1.3" + sources."json-schema-traverse-0.4.1" sources."schema-utils-0.4.7" ]; }) @@ -76359,20 +76097,25 @@ in ]; }) sources."xmlbuilder-9.0.7" - sources."xmldoc-1.1.2" sources."xmldom-0.1.31" sources."xtend-4.0.2" sources."y18n-4.0.1" sources."yallist-4.0.0" - (sources."yargs-15.4.1" // { + (sources."yargs-13.3.2" // { dependencies = [ - sources."find-up-4.1.0" - sources."locate-path-5.0.0" + sources."ansi-regex-4.1.0" + sources."emoji-regex-7.0.3" + sources."find-up-3.0.0" + sources."is-fullwidth-code-point-2.0.0" + sources."locate-path-3.0.0" sources."p-limit-2.3.0" - sources."p-locate-4.1.0" + sources."p-locate-3.0.0" + sources."path-exists-3.0.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" ]; }) - sources."yargs-parser-18.1.3" + sources."yargs-parser-13.1.2" sources."yocto-queue-0.1.0" sources."zen-observable-0.8.15" sources."zen-observable-ts-0.8.21" @@ -76553,7 +76296,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."typedarray-0.0.6" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."validate-npm-package-license-3.0.4" @@ -76609,8 +76352,8 @@ in }) (sources."@oclif/config-1.17.0" // { dependencies = [ - sources."globby-11.0.1" - sources."tslib-2.0.3" + sources."globby-11.0.2" + sources."tslib-2.1.0" ]; }) sources."@oclif/errors-1.3.4" @@ -76787,7 +76530,7 @@ in sources."extract-stack-1.0.0" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.4" + sources."fast-glob-3.2.5" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fastq-1.10.0" @@ -77107,7 +76850,7 @@ in sources."has-values-0.1.4" ]; }) - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."urix-0.1.0" sources."url-parse-1.4.7" sources."url-parse-lax-3.0.0" @@ -77136,38 +76879,37 @@ in firebase-tools = nodeEnv.buildNodePackage { name = "firebase-tools"; packageName = "firebase-tools"; - version = "9.1.0"; + version = "9.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-9.1.0.tgz"; - sha512 = "hTfxL2meJSl5WuwAS6bEJ5nay7tu3MNYb4ZL2KmPL7yLM3IeT+Qd2z1evHhW1VvbDXKR6RTwlBxzdWPs4l75kA=="; + url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-9.2.2.tgz"; + sha512 = "AFjf7S9NjEM+u8ZByJEKASxRG1g+LLg/A0CrzA3V91P92MN+8cyrCigEs7mCdtFknLaShrCgzROyo/OEwd4xdA=="; }; dependencies = [ - sources."@apidevtools/json-schema-ref-parser-9.0.6" + sources."@apidevtools/json-schema-ref-parser-9.0.7" sources."@dabh/diagnostics-2.0.2" sources."@google-cloud/paginator-3.0.5" sources."@google-cloud/precise-date-2.0.3" sources."@google-cloud/projectify-2.0.1" sources."@google-cloud/promisify-2.0.3" - sources."@google-cloud/pubsub-2.7.0" - (sources."@grpc/grpc-js-1.1.8" // { + sources."@google-cloud/pubsub-2.8.0" + (sources."@grpc/grpc-js-1.2.5" // { dependencies = [ - sources."@grpc/proto-loader-0.6.0-pre9" - sources."@types/node-12.19.12" + sources."@types/node-12.19.15" sources."semver-6.3.0" ]; }) - sources."@grpc/proto-loader-0.5.5" + sources."@grpc/proto-loader-0.5.6" sources."@jsdevtools/ono-7.1.3" - sources."@opentelemetry/api-0.11.0" - sources."@opentelemetry/context-base-0.11.0" - (sources."@opentelemetry/core-0.11.0" // { + sources."@opentelemetry/api-0.12.0" + sources."@opentelemetry/context-base-0.12.0" + (sources."@opentelemetry/core-0.12.0" // { dependencies = [ sources."semver-7.3.4" ]; }) - sources."@opentelemetry/resources-0.11.0" - sources."@opentelemetry/semantic-conventions-0.11.0" - sources."@opentelemetry/tracing-0.11.0" + sources."@opentelemetry/resources-0.12.0" + sources."@opentelemetry/semantic-conventions-0.12.0" + sources."@opentelemetry/tracing-0.12.0" sources."@protobufjs/aspromise-1.1.2" sources."@protobufjs/base64-1.1.2" sources."@protobufjs/codegen-2.0.4" @@ -77180,9 +76922,10 @@ in sources."@protobufjs/utf8-1.1.0" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" + sources."@tootallnate/once-1.1.2" sources."@types/duplexify-3.6.0" sources."@types/long-4.0.1" - sources."@types/node-14.14.20" + sources."@types/node-14.14.22" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" @@ -77199,8 +76942,8 @@ in ]; }) sources."ansi-escapes-3.2.0" - sources."ansi-regex-5.0.0" - sources."ansi-styles-4.3.0" + sources."ansi-regex-2.1.1" + sources."ansi-styles-3.2.1" sources."ansicolors-0.3.2" sources."anymatch-3.1.1" sources."aproba-1.2.0" @@ -77225,6 +76968,7 @@ in sources."as-array-2.0.0" sources."asn1-0.2.4" sources."assert-plus-1.0.0" + sources."ast-types-0.13.4" sources."async-2.6.3" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" @@ -77241,7 +76985,7 @@ in sources."big-integer-1.6.48" sources."bignumber.js-9.0.1" sources."binary-0.3.0" - sources."binary-extensions-2.1.0" + sources."binary-extensions-2.2.0" sources."bl-4.0.3" sources."blakejs-1.1.0" sources."bluebird-3.4.7" @@ -77253,7 +76997,10 @@ in }) (sources."boxen-4.2.0" // { dependencies = [ + sources."ansi-styles-4.3.0" sources."chalk-3.0.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."has-flag-4.0.0" sources."supports-color-7.2.0" ]; @@ -77277,40 +77024,24 @@ in sources."cardinal-2.1.1" sources."caseless-0.12.0" sources."chainsaw-0.1.0" - (sources."chalk-2.4.2" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - ]; - }) + sources."chalk-2.4.2" sources."chardet-0.7.0" - sources."chokidar-3.4.3" + sources."chokidar-3.5.1" sources."chownr-2.0.0" sources."ci-info-2.0.0" sources."cjson-0.3.3" sources."cli-boxes-2.2.1" - (sources."cli-color-1.4.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) + sources."cli-color-1.4.0" sources."cli-cursor-2.1.0" sources."cli-spinners-2.5.0" sources."cli-table-0.3.4" sources."cli-width-2.2.1" - sources."cliui-6.0.0" sources."clone-1.0.4" sources."clone-response-1.0.2" sources."code-point-at-1.1.0" - (sources."color-3.0.0" // { - dependencies = [ - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - ]; - }) - sources."color-convert-2.0.1" - sources."color-name-1.1.4" + sources."color-3.0.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" sources."color-string-1.5.4" sources."colors-1.4.0" sources."colorspace-1.1.2" @@ -77370,14 +77101,15 @@ in sources."csv-streamify-3.0.4" sources."d-1.0.1" sources."dashdash-1.14.1" + sources."data-uri-to-buffer-3.0.1" sources."debug-4.3.2" - sources."decamelize-1.2.0" sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" sources."deep-freeze-0.0.1" sources."deep-is-0.1.3" sources."defaults-1.0.3" sources."defer-to-connect-1.1.3" + sources."degenerator-2.2.0" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."depd-1.1.2" @@ -77408,7 +77140,10 @@ in sources."escape-goat-2.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" + sources."escodegen-1.14.3" sources."esprima-4.0.1" + sources."estraverse-4.3.0" + sources."esutils-2.0.3" sources."etag-1.8.1" sources."event-emitter-0.3.5" sources."event-target-shim-5.0.1" @@ -77437,6 +77172,7 @@ in sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" + sources."fast-levenshtein-2.0.6" sources."fast-safe-stringify-2.0.7" sources."fast-text-encoding-1.0.3" (sources."fast-url-parser-1.1.3" // { @@ -77446,6 +77182,7 @@ in }) sources."fecha-4.2.0" sources."figures-2.0.0" + sources."file-uri-to-path-2.0.0" sources."filesize-3.6.1" sources."fill-range-7.0.1" (sources."finalhandler-1.1.2" // { @@ -77454,7 +77191,6 @@ in sources."ms-2.0.0" ]; }) - sources."find-up-4.1.0" (sources."flat-arguments-1.0.2" // { dependencies = [ (sources."as-array-1.0.0" // { @@ -77479,15 +77215,21 @@ in }) sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" - sources."fsevents-2.1.3" + sources."fsevents-2.3.1" (sources."fstream-1.0.12" // { dependencies = [ sources."rimraf-2.7.1" ]; }) + (sources."ftp-0.3.10" // { + dependencies = [ + sources."isarray-0.0.1" + sources."readable-stream-1.1.14" + sources."string_decoder-0.10.31" + ]; + }) (sources."gauge-2.7.4" // { dependencies = [ - sources."ansi-regex-2.1.1" sources."is-fullwidth-code-point-1.0.0" sources."string-width-1.0.2" sources."strip-ansi-3.0.1" @@ -77495,31 +77237,28 @@ in }) sources."gaxios-4.1.0" sources."gcp-metadata-4.2.1" - sources."get-caller-file-2.0.5" sources."get-stream-4.1.0" + (sources."get-uri-3.0.2" // { + dependencies = [ + sources."fs-extra-8.1.0" + sources."jsonfile-4.0.0" + ]; + }) sources."getpass-0.1.7" sources."glob-7.1.6" sources."glob-parent-5.1.1" sources."glob-slash-1.0.0" sources."glob-slasher-1.0.1" sources."global-dirs-2.1.0" - sources."google-auth-library-6.1.3" - sources."google-gax-2.9.2" + sources."google-auth-library-6.1.6" + sources."google-gax-2.10.0" sources."google-p12-pem-3.0.3" sources."got-9.6.0" sources."graceful-fs-4.2.4" - (sources."gtoken-5.1.0" // { - dependencies = [ - sources."mime-2.4.7" - ]; - }) + sources."gtoken-5.2.1" sources."har-schema-2.0.0" sources."har-validator-5.1.5" - (sources."has-ansi-2.0.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) + sources."has-ansi-2.0.0" sources."has-flag-3.0.0" sources."has-unicode-2.0.1" sources."has-yarn-2.1.0" @@ -77530,6 +77269,7 @@ in sources."inherits-2.0.3" ]; }) + sources."http-proxy-agent-4.0.1" sources."http-signature-1.2.0" sources."https-proxy-agent-5.0.0" sources."iconv-lite-0.4.24" @@ -77556,7 +77296,8 @@ in ]; }) sources."install-artifact-from-github-1.2.0" - sources."ip-regex-4.2.0" + sources."ip-1.1.5" + sources."ip-regex-4.3.0" sources."ipaddr.js-1.9.1" sources."is-arrayish-0.3.2" sources."is-binary-path-2.1.0" @@ -77614,8 +77355,8 @@ in ]; }) sources."leven-3.1.0" + sources."levn-0.3.0" sources."listenercount-1.0.1" - sources."locate-path-5.0.0" sources."lodash-4.17.20" sources."lodash._isnative-2.4.1" sources."lodash._objecttypes-2.4.1" @@ -77652,7 +77393,11 @@ in sources."marked-0.7.0" sources."marked-terminal-3.3.0" sources."media-typer-0.3.0" - sources."memoizee-0.4.14" + (sources."memoizee-0.4.15" // { + dependencies = [ + sources."next-tick-1.1.0" + ]; + }) sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" @@ -77681,6 +77426,7 @@ in ]; }) sources."negotiator-0.6.2" + sources."netmask-1.0.6" sources."next-tick-1.0.0" sources."nice-try-1.0.5" sources."node-emoji-1.10.0" @@ -77690,7 +77436,7 @@ in dependencies = [ sources."mkdirp-1.0.4" sources."semver-7.3.4" - sources."tar-6.0.5" + sources."tar-6.1.0" sources."which-2.0.2" ]; }) @@ -77708,6 +77454,7 @@ in sources."onetime-2.0.1" sources."open-6.4.0" sources."openapi3-ts-1.4.0" + sources."optionator-0.8.3" (sources."ora-3.4.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -77717,16 +77464,14 @@ in sources."os-tmpdir-1.0.2" sources."p-cancelable-1.1.0" sources."p-defer-3.0.0" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."p-try-2.2.0" + sources."pac-proxy-agent-4.1.0" + sources."pac-resolver-4.1.0" (sources."package-json-6.5.0" // { dependencies = [ sources."semver-6.3.0" ]; }) sources."parseurl-1.3.3" - sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" sources."path-to-regexp-0.1.7" @@ -77738,16 +77483,24 @@ in sources."debug-3.2.7" ]; }) + sources."prelude-ls-1.1.2" sources."prepend-http-2.0.0" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" sources."promise-breaker-5.0.0" (sources."protobufjs-6.10.2" // { dependencies = [ - sources."@types/node-13.13.39" + sources."@types/node-13.13.40" ]; }) sources."proxy-addr-2.0.6" + (sources."proxy-agent-4.0.1" // { + dependencies = [ + sources."lru-cache-5.1.1" + sources."yallist-3.1.1" + ]; + }) + sources."proxy-from-env-1.1.0" sources."psl-1.8.0" sources."pump-3.0.0" sources."punycode-2.1.1" @@ -77767,8 +77520,6 @@ in sources."qs-6.5.2" ]; }) - sources."require-directory-2.1.1" - sources."require-main-filename-2.0.0" sources."responselike-1.0.2" sources."restore-cursor-2.0.0" sources."retry-request-4.1.3" @@ -77814,6 +77565,10 @@ in sources."shebang-regex-1.0.0" sources."signal-exit-3.0.3" sources."simple-swizzle-0.2.2" + sources."smart-buffer-4.1.0" + sources."socks-2.5.1" + sources."socks-proxy-agent-5.0.0" + sources."source-map-0.6.1" sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" sources."stack-trace-0.0.10" @@ -77821,17 +77576,19 @@ in sources."stream-shift-1.0.1" (sources."string-length-1.0.1" // { dependencies = [ - sources."ansi-regex-2.1.1" sources."strip-ansi-3.0.1" ]; }) sources."string-width-4.2.0" sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.0" + (sources."strip-ansi-6.0.0" // { + dependencies = [ + sources."ansi-regex-5.0.0" + ]; + }) sources."strip-json-comments-2.0.1" (sources."superstatic-7.1.0" // { dependencies = [ - sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" sources."chalk-1.1.3" sources."fs-extra-8.1.0" @@ -77882,7 +77639,7 @@ in sources."toxic-1.0.1" sources."traverse-0.3.9" sources."triple-beam-1.3.0" - sources."tslib-2.0.3" + sources."tslib-2.1.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" (sources."tweetsodium-0.0.5" // { @@ -77891,6 +77648,7 @@ in ]; }) sources."type-1.2.0" + sources."type-check-0.3.2" sources."type-fest-0.8.1" sources."type-is-1.6.18" sources."typedarray-to-buffer-3.1.5" @@ -77907,12 +77665,15 @@ in }) (sources."update-notifier-4.1.3" // { dependencies = [ + sources."ansi-styles-4.3.0" sources."chalk-3.0.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."has-flag-4.0.0" sources."supports-color-7.2.0" ]; }) - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."url-join-0.0.1" sources."url-parse-lax-3.0.0" sources."util-deprecate-1.0.2" @@ -77923,7 +77684,6 @@ in sources."verror-1.10.0" sources."wcwidth-1.0.1" sources."which-1.3.1" - sources."which-module-2.0.0" (sources."wide-align-1.1.3" // { dependencies = [ sources."ansi-regex-3.0.0" @@ -77945,18 +77705,16 @@ in sources."string_decoder-1.1.1" ]; }) - sources."wrap-ansi-6.2.0" + sources."word-wrap-1.2.3" sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" sources."ws-7.4.2" sources."xdg-basedir-4.0.0" sources."xmlbuilder-9.0.7" sources."xmldom-0.1.31" + sources."xregexp-2.0.0" sources."xtend-4.0.2" - sources."y18n-4.0.1" sources."yallist-4.0.0" - sources."yargs-15.4.1" - sources."yargs-parser-18.1.3" sources."zip-stream-2.1.3" ]; buildInputs = globalBuildInputs; @@ -78099,7 +77857,7 @@ in sources."lodash-4.17.20" sources."lru-cache-6.0.0" sources."map-obj-4.1.0" - (sources."meow-8.1.0" // { + (sources."meow-8.1.2" // { dependencies = [ sources."type-fest-0.18.1" ]; @@ -78123,7 +77881,7 @@ in sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" - sources."parse-json-5.1.0" + sources."parse-json-5.2.0" sources."path-exists-4.0.0" sources."path-key-3.1.1" sources."path-parse-1.0.6" @@ -78214,7 +77972,7 @@ in sources."concat-map-0.0.1" sources."fd-slicer-1.1.0" sources."fs.realpath-1.0.0" - sources."geoip-country-4.0.49" + sources."geoip-country-4.0.53" sources."glob-7.1.6" sources."iconv-lite-0.5.2" sources."inflight-1.0.6" @@ -78296,7 +78054,7 @@ in ]; }) sources."cache-base-1.0.1" - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."caller-0.0.1" sources."camelcase-2.1.1" sources."chokidar-2.1.8" @@ -78341,8 +78099,6 @@ in sources."defined-0.0.0" sources."director-1.2.7" sources."duplexer-0.1.2" - sources."es-abstract-1.17.7" - sources."es-to-primitive-1.2.1" sources."event-stream-3.3.4" sources."eventemitter2-6.4.3" (sources."expand-brackets-2.1.4" // { @@ -78388,7 +78144,7 @@ in sources."fs.realpath-1.0.0" sources."fsevents-1.2.13" sources."function-bind-1.1.1" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.0" sources."get-value-2.0.6" sources."glob-7.1.6" (sources."glob-parent-3.1.0" // { @@ -78414,7 +78170,6 @@ in sources."is-arguments-1.1.0" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-callable-1.2.2" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" @@ -78429,7 +78184,6 @@ in }) sources."is-plain-object-2.0.4" sources."is-regex-1.1.1" - sources."is-symbol-1.0.3" sources."is-windows-1.0.2" sources."isarray-1.0.0" sources."isobject-3.0.1" @@ -78477,11 +78231,9 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.9.0" sources."object-is-1.1.4" sources."object-keys-1.1.1" sources."object-visit-1.0.1" - sources."object.assign-4.1.2" sources."object.pick-1.3.0" sources."once-1.4.0" sources."optimist-0.6.0" @@ -78505,7 +78257,7 @@ in sources."readable-stream-2.3.7" sources."readdirp-2.2.1" sources."regex-not-1.0.2" - sources."regexp.prototype.flags-1.3.0" + sources."regexp.prototype.flags-1.3.1" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" @@ -78578,8 +78330,6 @@ in }) sources."stream-combiner-0.0.4" sources."string-width-1.0.2" - sources."string.prototype.trimend-1.0.3" - sources."string.prototype.trimstart-1.0.3" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-json-comments-0.1.3" @@ -79036,7 +78786,7 @@ in sources."figures-3.2.0" sources."find-up-3.0.0" sources."function-bind-1.1.1" - sources."fuse.js-6.4.5" + sources."fuse.js-6.4.6" sources."get-stream-6.0.0" sources."global-dirs-2.1.0" (sources."got-9.6.0" // { @@ -79099,7 +78849,7 @@ in ]; }) sources."map-obj-4.1.0" - (sources."meow-8.1.0" // { + (sources."meow-8.1.2" // { dependencies = [ sources."type-fest-0.18.1" ]; @@ -79121,7 +78871,7 @@ in sources."mimic-fn-2.1.0" ]; }) - sources."ora-5.2.0" + sources."ora-5.3.0" sources."os-tmpdir-1.0.2" sources."p-cancelable-1.1.0" sources."p-limit-2.3.0" @@ -79132,7 +78882,7 @@ in sources."semver-6.3.0" ]; }) - sources."parse-json-5.1.0" + sources."parse-json-5.2.0" sources."path-exists-4.0.0" sources."path-key-3.1.1" sources."path-parse-1.0.6" @@ -79200,7 +78950,7 @@ in sources."typedarray-to-buffer-3.1.5" sources."unique-string-2.0.0" sources."update-notifier-5.0.1" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."url-parse-lax-3.0.0" sources."util-deprecate-1.0.2" sources."validate-npm-package-license-3.0.4" @@ -79250,39 +79000,59 @@ in sources."@graphql-cli/init-4.1.0" (sources."@graphql-tools/batch-execute-7.0.0" // { dependencies = [ - sources."@graphql-tools/utils-7.2.3" + (sources."@graphql-tools/utils-7.2.4" // { + dependencies = [ + sources."tslib-2.1.0" + ]; + }) + ]; + }) + (sources."@graphql-tools/delegate-7.0.9" // { + dependencies = [ + sources."@graphql-tools/utils-7.2.4" + sources."tslib-2.1.0" ]; }) - (sources."@graphql-tools/delegate-7.0.8" // { + (sources."@graphql-tools/graphql-file-loader-6.2.7" // { dependencies = [ - sources."@graphql-tools/utils-7.2.3" + sources."@graphql-tools/utils-7.2.4" + sources."tslib-2.1.0" ]; }) - (sources."@graphql-tools/graphql-file-loader-6.2.6" // { + (sources."@graphql-tools/import-6.2.6" // { dependencies = [ - sources."@graphql-tools/utils-7.2.3" + sources."tslib-2.1.0" ]; }) - sources."@graphql-tools/import-6.2.5" (sources."@graphql-tools/json-file-loader-6.2.6" // { dependencies = [ - sources."@graphql-tools/utils-7.2.3" + (sources."@graphql-tools/utils-7.2.4" // { + dependencies = [ + sources."tslib-2.1.0" + ]; + }) ]; }) sources."@graphql-tools/load-6.2.4" - (sources."@graphql-tools/merge-6.2.6" // { + (sources."@graphql-tools/merge-6.2.7" // { dependencies = [ - sources."@graphql-tools/utils-7.2.3" + sources."@graphql-tools/utils-7.2.4" + sources."tslib-2.1.0" ]; }) (sources."@graphql-tools/schema-7.1.2" // { dependencies = [ - sources."@graphql-tools/utils-7.2.3" + (sources."@graphql-tools/utils-7.2.4" // { + dependencies = [ + sources."tslib-2.1.0" + ]; + }) ]; }) - (sources."@graphql-tools/url-loader-6.7.1" // { + (sources."@graphql-tools/url-loader-6.8.0" // { dependencies = [ - sources."@graphql-tools/utils-7.2.3" + sources."@graphql-tools/utils-7.2.4" + sources."tslib-2.1.0" ]; }) (sources."@graphql-tools/utils-6.2.4" // { @@ -79296,7 +79066,11 @@ in }) (sources."@graphql-tools/wrap-7.0.5" // { dependencies = [ - sources."@graphql-tools/utils-7.2.3" + (sources."@graphql-tools/utils-7.2.4" // { + dependencies = [ + sources."tslib-2.1.0" + ]; + }) ]; }) sources."@kwsites/file-exists-1.1.1" @@ -79306,7 +79080,7 @@ in sources."@nodelib/fs.walk-1.2.6" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-14.14.20" + sources."@types/node-14.14.22" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.1" sources."aggregate-error-3.1.0" @@ -79341,12 +79115,12 @@ in sources."lowercase-keys-2.0.0" ]; }) - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."call-me-maybe-1.0.1" sources."callsites-3.1.0" (sources."camel-case-4.1.2" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) sources."caseless-0.12.0" @@ -79402,8 +79176,8 @@ in sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" - sources."es-abstract-1.17.7" - sources."es-get-iterator-1.1.1" + sources."es-abstract-1.18.0-next.2" + sources."es-get-iterator-1.1.2" sources."es-to-primitive-1.2.1" sources."es6-promise-3.3.1" sources."escalade-3.1.1" @@ -79420,7 +79194,7 @@ in sources."extract-files-9.0.0" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.4" + sources."fast-glob-3.2.5" sources."fast-json-stable-stringify-2.1.0" sources."fast-safe-stringify-2.0.7" sources."fastq-1.10.0" @@ -79439,7 +79213,7 @@ in sources."fullname-4.0.1" sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.0" sources."get-stream-4.1.0" sources."getpass-0.1.7" sources."glob-7.1.6" @@ -79460,7 +79234,7 @@ in sources."graphql-subscriptions-1.1.0" sources."graphql-type-json-0.3.2" sources."graphql-upload-11.0.0" - sources."graphql-ws-3.1.0" + sources."graphql-ws-4.1.0" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-1.0.3" @@ -79514,11 +79288,7 @@ in sources."is-stream-1.1.0" sources."is-string-1.0.5" sources."is-symbol-1.0.3" - (sources."is-typed-array-1.1.4" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) + sources."is-typed-array-1.1.4" sources."is-typedarray-1.0.0" sources."is-weakmap-2.0.1" sources."is-weakset-2.0.1" @@ -79563,7 +79333,7 @@ in }) (sources."lower-case-2.0.2" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) sources."lowercase-keys-1.0.1" @@ -79589,7 +79359,7 @@ in sources."nice-try-1.0.5" (sources."no-case-3.0.4" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) sources."node-emoji-1.10.0" @@ -79601,13 +79371,13 @@ in sources."npm-run-path-2.0.2" sources."oas-kit-common-1.0.8" sources."oas-linter-3.2.1" - (sources."oas-resolver-2.5.3" // { + (sources."oas-resolver-2.5.4" // { dependencies = [ sources."yargs-16.2.0" ]; }) sources."oas-schema-walker-1.1.5" - sources."oas-validator-5.0.4" + sources."oas-validator-5.0.5" sources."oauth-sign-0.9.0" sources."object-inspect-1.9.0" sources."object-is-1.1.4" @@ -79646,10 +79416,10 @@ in }) sources."parent-module-1.0.1" sources."parse-github-url-1.0.2" - sources."parse-json-5.1.0" + sources."parse-json-5.2.0" (sources."pascal-case-3.1.2" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) sources."passwd-user-3.0.0" @@ -79666,8 +79436,8 @@ in sources."qs-6.5.2" sources."querystringify-2.2.0" sources."rc-1.2.8" - sources."reftools-1.1.7" - sources."regexp.prototype.flags-1.3.0" + sources."reftools-1.1.8" + sources."regexp.prototype.flags-1.3.1" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" sources."remove-trailing-separator-1.1.0" @@ -79720,7 +79490,7 @@ in sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" - (sources."swagger2openapi-7.0.4" // { + (sources."swagger2openapi-7.0.5" // { dependencies = [ sources."yargs-16.2.0" ]; @@ -79739,7 +79509,7 @@ in sources."type-fest-0.3.1" sources."universalify-1.0.0" sources."unixify-1.0.0" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."url-parse-1.4.7" sources."url-parse-lax-3.0.0" sources."uuid-3.4.0" @@ -79749,11 +79519,7 @@ in sources."which-1.3.1" sources."which-boxed-primitive-1.0.2" sources."which-collection-1.0.1" - (sources."which-typed-array-1.1.4" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) + sources."which-typed-array-1.1.4" (sources."wrap-ansi-7.0.0" // { dependencies = [ sources."ansi-regex-5.0.0" @@ -79761,7 +79527,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.4.1" + sources."ws-7.4.2" sources."y18n-5.0.5" sources."yallist-4.0.0" sources."yaml-1.10.0" @@ -80050,10 +79816,10 @@ in makam = nodeEnv.buildNodePackage { name = "makam"; packageName = "makam"; - version = "0.7.37"; + version = "0.7.38"; src = fetchurl { - url = "https://registry.npmjs.org/makam/-/makam-0.7.37.tgz"; - sha512 = "6DGx7FnmgAf+dYXrptwmgC6WDR0+emgM1jMscY/3yitXP3IYq0BvFE2UKq66P16nkHcQHmENK6xTt8M3Z+rdBw=="; + url = "https://registry.npmjs.org/makam/-/makam-0.7.38.tgz"; + sha512 = "xRlCK3zKbEvQqDUH8C6dW6O+LdV6QDoxzbe2LSghO+ZrZq+iRbnXJvvNFvFRkGFW7fqciGvGq1P1dX5Rkul12w=="; }; buildInputs = globalBuildInputs; meta = { @@ -80065,6 +79831,84 @@ in bypassCache = true; reconstructLock = true; }; + meshcommander = nodeEnv.buildNodePackage { + name = "meshcommander"; + packageName = "meshcommander"; + version = "0.9.0-d"; + src = fetchurl { + url = "https://registry.npmjs.org/meshcommander/-/meshcommander-0.9.0-d.tgz"; + sha512 = "sA4XtYUB8PZXozUr5G+OLnGyWOXm60nIH7EQUMYQAPHJQuhi52nMHKi6XYOQtByGR+hpeLK0vmi/dKQCj/7oFg=="; + }; + dependencies = [ + sources."accepts-1.3.7" + sources."array-flatten-1.1.1" + sources."body-parser-1.19.0" + sources."bytes-3.1.0" + sources."content-disposition-0.5.3" + sources."content-type-1.0.4" + sources."cookie-0.4.0" + sources."cookie-signature-1.0.6" + sources."debug-2.6.9" + sources."depd-1.1.2" + sources."destroy-1.0.4" + sources."ee-first-1.1.1" + sources."encodeurl-1.0.2" + sources."escape-html-1.0.3" + sources."etag-1.8.1" + sources."express-4.17.1" + sources."express-ws-2.0.0" + sources."finalhandler-1.1.2" + sources."forwarded-0.1.2" + sources."fresh-0.5.2" + sources."http-errors-1.7.2" + sources."iconv-lite-0.4.24" + sources."inherits-2.0.3" + sources."ipaddr.js-1.9.1" + sources."media-typer-0.3.0" + sources."merge-descriptors-1.0.1" + sources."methods-1.1.2" + sources."mime-1.6.0" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" + sources."minimist-1.2.5" + sources."ms-2.0.0" + sources."negotiator-0.6.2" + sources."on-finished-2.3.0" + sources."options-0.0.6" + sources."parseurl-1.3.3" + sources."path-to-regexp-0.1.7" + sources."proxy-addr-2.0.6" + sources."qs-6.7.0" + sources."range-parser-1.2.1" + sources."raw-body-2.4.0" + sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" + (sources."send-0.17.1" // { + dependencies = [ + sources."ms-2.1.1" + ]; + }) + sources."serve-static-1.14.1" + sources."setprototypeof-1.1.1" + sources."statuses-1.5.0" + sources."toidentifier-1.0.0" + sources."type-is-1.6.18" + sources."ultron-1.0.2" + sources."unpipe-1.0.0" + sources."utils-merge-1.0.1" + sources."vary-1.1.2" + sources."ws-1.1.5" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "MeshCommander web server"; + homepage = http://meshcommander.com/; + license = "Apache-2.0"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; gqlint = nodeEnv.buildNodePackage { name = "gqlint"; packageName = "gqlint"; @@ -80125,7 +79969,7 @@ in sources."ansi-term-0.0.2" sources."ansicolors-0.3.2" sources."blessed-0.1.81" - sources."blessed-contrib-4.8.20" + sources."blessed-contrib-4.8.21" sources."bresenham-0.0.3" sources."buffers-0.1.1" sources."cardinal-2.1.1" @@ -80197,7 +80041,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."systeminformation-4.34.2" + sources."systeminformation-4.34.9" sources."term-canvas-0.0.5" sources."type-fest-0.11.0" sources."wordwrap-0.0.3" @@ -80281,7 +80125,7 @@ in sources."buffer-equal-1.0.0" sources."buffer-from-1.1.1" sources."cache-base-1.0.1" - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."camelcase-3.0.0" sources."chokidar-2.1.8" (sources."class-utils-0.3.6" // { @@ -80395,7 +80239,7 @@ in sources."fsevents-1.2.13" sources."function-bind-1.1.1" sources."get-caller-file-1.0.3" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.0" sources."get-value-2.0.6" sources."glob-7.1.6" (sources."glob-parent-3.1.0" // { @@ -80719,7 +80563,7 @@ in }) sources."buffer-from-1.1.1" sources."cache-base-1.0.1" - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."camelcase-3.0.0" (sources."class-utils-0.3.6" // { dependencies = [ @@ -80795,7 +80639,7 @@ in sources."fragment-cache-0.2.1" sources."function-bind-1.1.1" sources."get-caller-file-1.0.3" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.0" sources."get-value-2.0.6" sources."global-modules-1.0.0" sources."global-prefix-1.0.2" @@ -81074,7 +80918,7 @@ in sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.6.1" - sources."uglify-js-3.12.4" + sources."uglify-js-3.12.5" sources."upper-case-1.1.3" ]; buildInputs = globalBuildInputs; @@ -81165,7 +81009,7 @@ in sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."uuid-3.4.0" sources."verror-1.10.0" sources."wrappy-1.0.2" @@ -81197,7 +81041,7 @@ in sources."debug-3.2.7" sources."ecstatic-3.3.2" sources."eventemitter3-4.0.7" - sources."follow-redirects-1.13.1" + sources."follow-redirects-1.13.2" sources."he-1.2.0" sources."http-proxy-1.18.1" sources."lodash-4.17.20" @@ -81207,7 +81051,7 @@ in sources."ms-2.1.3" sources."opener-1.5.2" sources."portfinder-1.0.28" - sources."qs-6.9.4" + sources."qs-6.9.6" sources."requires-port-1.0.0" sources."secure-compare-3.0.1" sources."union-0.5.0" @@ -81226,14 +81070,14 @@ in hsd = nodeEnv.buildNodePackage { name = "hsd"; packageName = "hsd"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/hsd/-/hsd-2.2.0.tgz"; - sha512 = "9U6ylEa3WPEb5AHb/TuwYDOJaXmR6mfKky8uJml3Y0xUAvO/yg/b4GfBXnMQ2wPQME5fG5Vkx0OLK7MyidtmAw=="; + url = "https://registry.npmjs.org/hsd/-/hsd-2.3.0.tgz"; + sha512 = "tgGO2ortI4HjQrMqmzrp+W3RSadfPdgZWWubNemxnugdiu4gGHCIv2FF3zHZbVd02UVBW+HRKDwqwltvGG+tbQ=="; }; dependencies = [ sources."bcfg-0.1.6" - sources."bcrypto-5.3.0" + sources."bcrypto-5.4.0" sources."bcurl-0.1.9" sources."bdb-1.3.0" sources."bdns-0.1.5" @@ -81246,7 +81090,7 @@ in sources."blru-0.1.6" sources."blst-0.1.5" sources."bmutex-0.1.6" - sources."bns-0.13.0" + sources."bns-0.14.0" sources."brq-0.1.8" sources."bs32-0.1.6" sources."bsert-0.0.10" @@ -81259,13 +81103,13 @@ in sources."bupnp-0.2.6" sources."bval-0.1.6" sources."bweb-0.1.10" - sources."goosig-0.9.0" + sources."goosig-0.10.0" sources."hs-client-0.0.9" sources."loady-0.0.5" sources."mrmr-0.1.10" sources."n64-0.2.10" sources."unbound-0.4.3" - sources."urkel-0.6.3" + sources."urkel-0.7.0" ]; buildInputs = globalBuildInputs; meta = { @@ -81280,18 +81124,18 @@ in hs-airdrop = nodeEnv.buildNodePackage { name = "hs-airdrop"; packageName = "hs-airdrop"; - version = "0.9.0"; + version = "0.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/hs-airdrop/-/hs-airdrop-0.9.0.tgz"; - sha512 = "eqN7mbITsdiBFdRlFHd91Vgudu5rajvIfPhZ8juWLFBZhxhuXzu1POMy4uHK+02jxNjX+upMMRyDxo4xS/ZudQ=="; + url = "https://registry.npmjs.org/hs-airdrop/-/hs-airdrop-0.10.0.tgz"; + sha512 = "z3H9va3XyqvEG7K6ldUhX47n3TNMtzB9oA/z04SCVwJFk9s6WPbI6Tqkuv4U9obkXtMlwTjVWd5pDO+HZYpzWA=="; }; dependencies = [ - sources."bcrypto-5.3.0" + sources."bcrypto-5.4.0" sources."bfile-0.2.2" sources."brq-0.1.8" sources."bsert-0.0.10" sources."bufio-1.0.7" - sources."goosig-0.9.0" + sources."goosig-0.10.0" sources."loady-0.0.5" ]; buildInputs = globalBuildInputs; @@ -81670,7 +81514,7 @@ in sources."uglify-js-2.8.29" sources."uglify-to-browserify-1.0.2" sources."update-notifier-0.5.0" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."verror-1.10.0" @@ -81685,7 +81529,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Utility to inline images, CSS and JavaScript for a web page - useful for mobile sites"; - homepage = http://github.com/remy/inliner; + homepage = https://github.com/remy/inliner; license = "MIT"; }; production = true; @@ -81704,7 +81548,7 @@ in sources."async-0.2.10" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" - sources."bunyan-1.8.14" + sources."bunyan-1.8.15" sources."colors-0.6.2" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" @@ -81820,7 +81664,7 @@ in sources."is-wsl-2.2.0" sources."isexe-2.0.0" sources."jquery-3.5.1" - sources."jquery.terminal-2.20.1" + sources."jquery.terminal-2.20.2" sources."jsonfile-2.4.0" sources."keyboardevent-key-polyfill-1.1.0" sources."line-reader-0.4.0" @@ -81884,7 +81728,7 @@ in sources."ansi-styles-3.2.1" (sources."ast-types-0.13.4" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) sources."astral-regex-2.0.0" @@ -82022,7 +81866,7 @@ in sources."lru-cache-5.1.1" sources."macos-release-2.4.1" sources."methods-1.1.2" - sources."mime-2.4.7" + sources."mime-2.5.0" sources."mime-db-1.45.0" sources."mime-types-2.1.28" sources."mimic-fn-1.2.0" @@ -82042,7 +81886,7 @@ in }) sources."once-1.4.0" sources."onetime-2.0.1" - sources."open-7.3.0" + sources."open-7.3.1" sources."optionator-0.8.3" sources."os-name-3.1.0" sources."os-tmpdir-1.0.2" @@ -82053,10 +81897,10 @@ in sources."path-key-3.1.1" sources."prelude-ls-1.1.2" sources."process-nextick-args-2.0.1" - sources."proxy-agent-4.0.0" + sources."proxy-agent-4.0.1" sources."proxy-from-env-1.1.0" sources."pump-3.0.0" - sources."qs-6.9.4" + sources."qs-6.9.6" sources."raw-body-2.4.1" sources."readable-stream-3.6.0" sources."restore-cursor-2.0.0" @@ -82316,7 +82160,7 @@ in sources."find-up-1.1.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" - sources."fs-extra-9.0.1" + sources."fs-extra-9.1.0" sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" @@ -82350,11 +82194,7 @@ in sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" - (sources."jsonfile-6.1.0" // { - dependencies = [ - sources."universalify-2.0.0" - ]; - }) + sources."jsonfile-6.1.0" sources."jsprim-1.4.1" sources."lcid-1.0.0" sources."levn-0.3.0" @@ -82496,16 +82336,16 @@ in sources."tough-cookie-2.5.0" sources."traverse-0.3.9" sources."ts-process-promises-1.0.2" - sources."tslib-2.0.3" + sources."tslib-2.1.0" sources."ttf2woff-2.0.2" sources."ttf2woff2-3.0.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" - sources."typo-geom-0.11.0" + sources."typo-geom-0.11.1" sources."unicoderegexp-0.4.1" - sources."universalify-1.0.0" - sources."uri-js-4.4.0" + sources."universalify-2.0.0" + sources."uri-js-4.4.1" sources."urix-0.1.0" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" @@ -82639,7 +82479,7 @@ in sources."once-1.4.0" sources."opentracing-0.14.5" sources."path-is-absolute-1.0.1" - sources."pathval-1.1.0" + sources."pathval-1.1.1" sources."process-0.10.1" sources."rxjs-5.5.12" sources."semaphore-async-await-1.5.1" @@ -82679,26 +82519,26 @@ in joplin = nodeEnv.buildNodePackage { name = "joplin"; packageName = "joplin"; - version = "1.5.1"; + version = "1.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/joplin/-/joplin-1.5.1.tgz"; - sha512 = "V90a+QTDf5SSW8Il0BcWtdqdtDZYd/YFltqRzXGBRwO2nFggeUAuXcQxs5ZxEhQF3Jzvx3yGfrYioZR7B30D2A=="; + url = "https://registry.npmjs.org/joplin/-/joplin-1.6.4.tgz"; + sha512 = "jfiqk9aqN3mAZ+TIGqubTKGTBB5Q8KRmeXS2qr/2N80KFJHCqdCFhsyI/E2hfdd3CA4Gu5Ls9WTxXA3MW/XjwA=="; }; dependencies = [ sources."@braintree/sanitize-url-3.1.0" sources."@cronvel/get-pixels-3.4.0" - sources."@joplin/fork-htmlparser2-4.1.14" - sources."@joplin/fork-sax-1.2.18" - sources."@joplin/lib-1.0.15" - (sources."@joplin/renderer-1.0.23" // { + sources."@joplin/fork-htmlparser2-4.1.21" + sources."@joplin/fork-sax-1.2.25" + sources."@joplin/lib-1.0.18" + (sources."@joplin/renderer-1.0.26" // { dependencies = [ sources."fs-extra-8.1.0" sources."jsonfile-4.0.0" sources."uslug-git+https://github.com/laurent22/uslug.git#emoji-support" ]; }) - sources."@joplin/turndown-4.0.36" - sources."@joplin/turndown-plugin-gfm-1.0.18" + sources."@joplin/turndown-4.0.43" + sources."@joplin/turndown-plugin-gfm-1.0.25" sources."abab-2.0.5" sources."abbrev-1.1.1" sources."acorn-7.4.1" @@ -82738,7 +82578,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.821.0" // { + (sources."aws-sdk-2.831.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -82753,7 +82593,7 @@ in sources."base64-js-1.5.1" sources."base64-stream-1.0.0" sources."bcrypt-pbkdf-1.0.2" - sources."binary-extensions-2.1.0" + sources."binary-extensions-2.2.0" (sources."bl-4.0.3" // { dependencies = [ sources."buffer-5.7.1" @@ -82772,7 +82612,7 @@ in sources."caseless-0.12.0" sources."chalk-4.1.0" sources."charenc-0.0.2" - sources."chokidar-3.4.3" + sources."chokidar-3.5.1" sources."chownr-1.1.4" sources."chroma-js-2.1.0" sources."clean-css-4.2.3" @@ -82879,7 +82719,7 @@ in ]; }) sources."end-of-stream-1.4.4" - sources."entities-2.1.0" + sources."entities-2.2.0" sources."entity-decode-2.0.2" sources."es6-promise-pool-2.5.0" sources."escape-string-regexp-1.0.5" @@ -82899,7 +82739,7 @@ in sources."file-uri-to-path-1.0.0" sources."fill-range-7.0.1" sources."find-up-2.1.0" - sources."follow-redirects-1.13.1" + sources."follow-redirects-1.13.2" sources."font-awesome-filetypes-2.1.0" sources."for-each-property-0.0.4" sources."for-each-property-deep-0.0.3" @@ -82914,7 +82754,7 @@ in }) sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" - sources."fsevents-2.1.3" + sources."fsevents-2.3.1" sources."fstream-1.0.12" (sources."gauge-2.7.4" // { dependencies = [ @@ -82945,7 +82785,7 @@ in (sources."dom-serializer-0.2.2" // { dependencies = [ sources."domelementtype-2.1.0" - sources."entities-2.1.0" + sources."entities-2.2.0" ]; }) sources."domelementtype-1.3.1" @@ -83023,7 +82863,7 @@ in sources."isobject-2.1.0" sources."isstream-0.1.2" sources."jmespath-0.15.0" - sources."jpeg-js-0.4.2" + sources."jpeg-js-0.4.3" sources."js-tokens-4.0.0" sources."jsbn-0.1.1" sources."jsdom-15.2.1" @@ -83037,12 +82877,8 @@ in sources."commander-2.20.3" ]; }) - (sources."keytar-7.3.0" // { - dependencies = [ - sources."node-addon-api-3.1.0" - ]; - }) - sources."khroma-1.1.1" + sources."keytar-7.3.0" + sources."khroma-1.2.0" sources."klaw-1.3.1" sources."lazyness-1.2.0" sources."levenshtein-1.0.5" @@ -83090,7 +82926,7 @@ in sources."md5-2.3.0" sources."md5-file-4.0.0" sources."mdurl-1.0.1" - sources."mermaid-8.8.4" + sources."mermaid-8.9.0" sources."mime-db-1.45.0" sources."mime-types-2.1.28" sources."mimic-response-2.1.0" @@ -83100,7 +82936,7 @@ in sources."debug-4.3.2" sources."html-minifier-4.0.0" sources."ms-2.1.2" - sources."uglify-js-3.12.4" + sources."uglify-js-3.12.5" ]; }) sources."minimatch-3.0.4" @@ -83122,7 +82958,7 @@ in sources."napi-build-utils-1.0.2" sources."ndarray-1.0.19" sources."ndarray-pack-1.2.1" - sources."needle-2.5.2" + sources."needle-2.6.0" sources."nextgen-events-1.3.4" sources."no-case-2.3.2" (sources."node-abi-2.19.3" // { @@ -83130,7 +82966,7 @@ in sources."semver-5.7.1" ]; }) - sources."node-addon-api-2.0.0" + sources."node-addon-api-3.1.0" sources."node-bitmap-0.0.1" sources."node-emoji-1.10.0" sources."node-fetch-1.7.3" @@ -83172,7 +83008,7 @@ in }) sources."omggif-1.0.10" sources."once-1.4.0" - sources."open-7.3.0" + sources."open-7.3.1" sources."optionator-0.8.3" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" @@ -83251,7 +83087,6 @@ in sources."color-3.1.3" sources."decompress-response-6.0.0" sources."mimic-response-3.1.0" - sources."node-addon-api-3.1.0" sources."simple-get-4.0.0" ]; }) @@ -83273,12 +83108,12 @@ in sources."source-map-url-0.4.0" sources."split-skip-0.0.2" sources."sprintf-js-1.1.2" - sources."sqlite3-5.0.0" + sources."sqlite3-5.0.1" sources."sshpk-1.16.1" sources."statuses-1.5.0" sources."stealthy-require-1.1.1" sources."strict-uri-encode-1.1.0" - sources."string-kit-0.11.8" + sources."string-kit-0.11.10" sources."string-padding-1.0.2" sources."string-to-stream-1.1.1" (sources."string-width-1.0.2" // { @@ -83324,7 +83159,7 @@ in sources."q-0.9.7" ]; }) - sources."terminal-kit-1.44.3" + sources."terminal-kit-1.45.9" (sources."terser-4.8.0" // { dependencies = [ sources."commander-2.20.3" @@ -83366,7 +83201,7 @@ in sources."unorm-1.6.0" sources."unpack-string-0.0.2" sources."upper-case-1.1.3" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."urix-0.1.0" (sources."url-0.10.3" // { dependencies = [ @@ -83418,10 +83253,10 @@ in js-beautify = nodeEnv.buildNodePackage { name = "js-beautify"; packageName = "js-beautify"; - version = "1.13.0"; + version = "1.13.5"; src = fetchurl { - url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.13.0.tgz"; - sha512 = "/Tbp1OVzZjbwzwJQFIlYLm9eWQ+3aYbBXLSaqb1mEJzhcQAfrqMMQYtjb6io+U6KpD0ID4F+Id3/xcjH3l/sqA=="; + url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.13.5.tgz"; + sha512 = "MsXlH6Z/BiRYSkSRW3clNDqDjSpiSNOiG8xYVUBXt4k0LnGvDhlTGOlHX1VFtAdoLmtwjxMG5qiWKy/g+Ipv5w=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -83542,7 +83377,7 @@ in (sources."dom-serializer-0.2.2" // { dependencies = [ sources."domelementtype-2.1.0" - sources."entities-2.1.0" + sources."entities-2.2.0" ]; }) sources."domelementtype-1.3.1" @@ -83569,7 +83404,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Static analysis tool for JavaScript"; - homepage = http://jshint.com/; + homepage = https://jshint.com/; license = "MIT"; }; production = true; @@ -83654,14 +83489,14 @@ in sources."path-loader-1.0.10" sources."process-nextick-args-2.0.1" sources."punycode-2.1.1" - sources."qs-6.9.4" + sources."qs-6.9.6" sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" sources."slash-3.0.0" sources."sprintf-js-1.0.3" sources."string_decoder-1.1.1" sources."superagent-3.8.3" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" ]; buildInputs = globalBuildInputs; @@ -83947,85 +83782,74 @@ in karma = nodeEnv.buildNodePackage { name = "karma"; packageName = "karma"; - version = "5.2.3"; + version = "6.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/karma/-/karma-5.2.3.tgz"; - sha512 = "tHdyFADhVVPBorIKCX8A37iLHxc6RBRphkSoQ+MLKdAtFn1k97tD8WUGi1KlEtDZKL3hui0qhsY9HXUfSNDYPQ=="; + url = "https://registry.npmjs.org/karma/-/karma-6.0.2.tgz"; + sha512 = "GBm8vPkQvjJL1ye//iH6yk9ROHOW+1TaFzRvbc6TbbCOFszbEG66dyDMoFjMMTAHy0ERNqRrMHap/LEHWeijNA=="; }; dependencies = [ + sources."@types/component-emitter-1.2.10" + sources."@types/cookie-0.4.0" + sources."@types/cors-2.8.9" + sources."@types/node-14.14.22" sources."accepts-1.3.7" - sources."after-0.8.2" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."anymatch-3.1.1" - sources."arraybuffer.slice-0.0.7" - sources."backo2-1.0.2" sources."balanced-match-1.0.0" sources."base64-arraybuffer-0.1.4" sources."base64id-2.0.0" - sources."binary-extensions-2.1.0" - sources."blob-0.0.5" + sources."binary-extensions-2.2.0" sources."body-parser-1.19.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."bytes-3.1.0" - sources."camelcase-5.3.1" - sources."chokidar-3.4.3" - sources."cliui-6.0.0" + sources."chokidar-3.5.1" + sources."cliui-7.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."colors-1.4.0" - sources."component-bind-1.0.0" sources."component-emitter-1.3.0" - sources."component-inherit-0.0.3" sources."concat-map-0.0.1" sources."connect-3.7.0" sources."content-type-1.0.4" sources."cookie-0.4.1" + sources."cors-2.8.5" sources."custom-event-1.0.1" sources."date-format-3.0.0" sources."debug-2.6.9" - sources."decamelize-1.2.0" sources."depd-1.1.2" sources."di-0.0.1" sources."dom-serialize-2.2.1" sources."ee-first-1.1.1" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" - (sources."engine.io-3.5.0" // { + (sources."engine.io-4.1.0" // { dependencies = [ - sources."debug-4.1.1" - sources."ms-2.1.3" - ]; - }) - (sources."engine.io-client-3.5.0" // { - dependencies = [ - sources."debug-3.1.0" + sources."debug-4.3.2" + sources."ms-2.1.2" ]; }) - sources."engine.io-parser-2.2.1" + sources."engine.io-parser-4.0.2" sources."ent-2.2.0" + sources."escalade-3.1.1" sources."escape-html-1.0.3" sources."eventemitter3-4.0.7" sources."extend-3.0.2" sources."fill-range-7.0.1" sources."finalhandler-1.1.2" - sources."find-up-4.1.0" sources."flatted-2.0.2" - sources."follow-redirects-1.13.1" + sources."follow-redirects-1.13.2" sources."fs-extra-8.1.0" sources."fs.realpath-1.0.0" - sources."fsevents-2.1.3" + sources."fsevents-2.3.1" sources."get-caller-file-2.0.5" sources."glob-7.1.6" sources."glob-parent-5.1.1" sources."graceful-fs-4.2.4" - sources."has-binary2-1.0.3" - sources."has-cors-1.1.0" sources."http-errors-1.7.2" sources."http-proxy-1.18.1" sources."iconv-lite-0.4.24" - sources."indexof-0.0.1" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."is-binary-path-2.1.0" @@ -84033,10 +83857,8 @@ in sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" sources."is-number-7.0.0" - sources."isarray-2.0.1" sources."isbinaryfile-4.0.6" sources."jsonfile-4.0.0" - sources."locate-path-5.0.0" sources."lodash-4.17.20" (sources."log4js-6.3.0" // { dependencies = [ @@ -84045,22 +83867,17 @@ in ]; }) sources."media-typer-0.3.0" - sources."mime-2.4.7" + sources."mime-2.5.0" sources."mime-db-1.45.0" sources."mime-types-2.1.28" sources."minimatch-3.0.4" sources."ms-2.0.0" sources."negotiator-0.6.2" sources."normalize-path-3.0.0" + sources."object-assign-4.1.1" sources."on-finished-2.3.0" sources."once-1.4.0" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."p-try-2.2.0" - sources."parseqs-0.0.6" - sources."parseuri-0.0.6" sources."parseurl-1.3.3" - sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."picomatch-2.2.2" sources."qjobs-1.2.0" @@ -84069,31 +83886,22 @@ in sources."raw-body-2.4.0" sources."readdirp-3.5.0" sources."require-directory-2.1.1" - sources."require-main-filename-2.0.0" sources."requires-port-1.0.0" - sources."rfdc-1.1.4" + sources."rfdc-1.2.0" sources."rimraf-3.0.2" sources."safer-buffer-2.1.2" - sources."set-blocking-2.0.0" sources."setprototypeof-1.1.1" - (sources."socket.io-2.4.0" // { - dependencies = [ - sources."debug-4.1.1" - sources."ms-2.1.3" - ]; - }) - sources."socket.io-adapter-1.1.2" - (sources."socket.io-client-2.4.0" // { + (sources."socket.io-3.1.0" // { dependencies = [ - sources."debug-3.1.0" - sources."socket.io-parser-3.3.1" + sources."debug-4.3.2" + sources."ms-2.1.2" ]; }) - (sources."socket.io-parser-3.4.1" // { + sources."socket.io-adapter-2.1.0" + (sources."socket.io-parser-4.0.4" // { dependencies = [ - sources."component-emitter-1.2.1" - sources."debug-4.1.1" - sources."ms-2.1.3" + sources."debug-4.3.2" + sources."ms-2.1.2" ]; }) sources."source-map-0.6.1" @@ -84108,24 +83916,21 @@ in sources."string-width-4.2.0" sources."strip-ansi-6.0.0" sources."tmp-0.2.1" - sources."to-array-0.1.4" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" sources."type-is-1.6.18" - sources."ua-parser-js-0.7.22" + sources."ua-parser-js-0.7.23" sources."universalify-0.1.2" sources."unpipe-1.0.0" sources."utils-merge-1.0.1" + sources."vary-1.1.2" sources."void-elements-2.0.1" - sources."which-module-2.0.0" - sources."wrap-ansi-6.2.0" + sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" sources."ws-7.4.2" - sources."xmlhttprequest-ssl-1.5.5" - sources."y18n-4.0.1" - sources."yargs-15.4.1" - sources."yargs-parser-18.1.3" - sources."yeast-0.1.2" + sources."y18n-5.0.5" + sources."yargs-16.2.0" + sources."yargs-parser-20.2.4" ]; buildInputs = globalBuildInputs; meta = { @@ -84150,7 +83955,7 @@ in sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."buffer-equal-1.0.0" - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."clone-2.1.2" sources."clone-buffer-1.0.0" sources."clone-stats-1.0.0" @@ -84166,7 +83971,7 @@ in sources."fs-mkdirp-stream-1.0.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.0" sources."glob-7.1.6" sources."glob-parent-3.1.0" sources."glob-stream-6.1.0" @@ -84436,7 +84241,7 @@ in sources."tweetnacl-0.14.5" sources."type-check-0.3.2" sources."underscore-1.9.1" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" (sources."utile-0.3.0" // { dependencies = [ sources."async-0.9.2" @@ -84597,29 +84402,29 @@ in sources."@lerna/write-log-file-3.13.0" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" - sources."@octokit/auth-token-2.4.4" - (sources."@octokit/endpoint-6.0.10" // { + sources."@octokit/auth-token-2.4.5" + (sources."@octokit/endpoint-6.0.11" // { dependencies = [ sources."is-plain-object-5.0.0" sources."universal-user-agent-6.0.0" ]; }) - sources."@octokit/openapi-types-2.0.1" + sources."@octokit/openapi-types-3.3.0" sources."@octokit/plugin-enterprise-rest-6.0.1" (sources."@octokit/plugin-paginate-rest-1.1.2" // { dependencies = [ sources."@octokit/types-2.16.2" ]; }) - sources."@octokit/plugin-request-log-1.0.2" + sources."@octokit/plugin-request-log-1.0.3" (sources."@octokit/plugin-rest-endpoint-methods-2.4.0" // { dependencies = [ sources."@octokit/types-2.16.2" ]; }) - (sources."@octokit/request-5.4.12" // { + (sources."@octokit/request-5.4.13" // { dependencies = [ - sources."@octokit/request-error-2.0.4" + sources."@octokit/request-error-2.0.5" sources."is-plain-object-5.0.0" sources."universal-user-agent-6.0.0" ]; @@ -84630,11 +84435,11 @@ in ]; }) sources."@octokit/rest-16.43.2" - sources."@octokit/types-6.1.2" + sources."@octokit/types-6.6.0" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.1" - sources."@types/node-14.14.20" + sources."@types/node-14.14.22" sources."@types/normalize-package-data-2.4.0" sources."@zkochan/cmd-shim-3.1.0" sources."JSONStream-1.3.5" @@ -84690,7 +84495,7 @@ in sources."byte-size-5.0.1" sources."cacache-12.0.4" sources."cache-base-1.0.1" - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."call-me-maybe-1.0.1" sources."caller-callsite-2.0.0" sources."caller-path-2.0.0" @@ -84831,7 +84636,7 @@ in sources."envinfo-7.7.3" sources."err-code-1.1.2" sources."error-ex-1.3.2" - sources."es-abstract-1.18.0-next.1" + sources."es-abstract-1.18.0-next.2" sources."es-to-primitive-1.2.1" sources."es6-promise-4.2.8" sources."es6-promisify-5.0.0" @@ -84915,7 +84720,7 @@ in }) sources."genfun-5.0.0" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.0" (sources."get-pkg-repo-1.4.0" // { dependencies = [ sources."camelcase-2.1.1" @@ -84976,7 +84781,7 @@ in ]; }) sources."git-up-4.0.2" - sources."git-url-parse-11.4.3" + sources."git-url-parse-11.4.4" sources."gitconfiglocal-1.0.0" sources."glob-7.1.6" sources."glob-parent-5.1.1" @@ -85112,7 +84917,7 @@ in sources."map-cache-0.2.2" sources."map-obj-4.1.0" sources."map-visit-1.0.0" - (sources."meow-8.1.0" // { + (sources."meow-8.1.2" // { dependencies = [ sources."find-up-4.1.0" sources."hosted-git-info-3.0.7" @@ -85120,7 +84925,7 @@ in sources."lru-cache-6.0.0" sources."normalize-package-data-3.0.0" sources."p-locate-4.1.0" - sources."parse-json-5.1.0" + sources."parse-json-5.2.0" sources."path-exists-4.0.0" (sources."read-pkg-5.2.0" // { dependencies = [ @@ -85241,7 +85046,11 @@ in sources."parallel-transform-1.2.0" sources."parse-github-repo-url-1.4.1" sources."parse-json-4.0.0" - sources."parse-path-4.0.2" + (sources."parse-path-4.0.3" // { + dependencies = [ + sources."qs-6.9.6" + ]; + }) sources."parse-url-5.0.2" sources."pascalcase-0.1.1" sources."path-dirname-1.0.2" @@ -85273,6 +85082,7 @@ in sources."punycode-2.1.1" sources."q-1.5.1" sources."qs-6.5.2" + sources."query-string-6.13.8" sources."quick-lru-4.0.1" sources."read-1.0.7" sources."read-cmd-shim-1.0.5" @@ -85383,6 +85193,7 @@ in sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.7" sources."split-1.0.1" + sources."split-on-first-1.1.0" sources."split-string-3.1.0" sources."split2-2.2.0" sources."sprintf-js-1.0.3" @@ -85407,6 +85218,7 @@ in }) sources."stream-each-1.2.3" sources."stream-shift-1.0.1" + sources."strict-uri-encode-2.0.0" (sources."string-width-2.1.1" // { dependencies = [ sources."ansi-regex-3.0.0" @@ -85451,7 +85263,7 @@ in sources."tweetnacl-0.14.5" sources."type-fest-0.3.1" sources."typedarray-0.0.6" - sources."uglify-js-3.12.4" + sources."uglify-js-3.12.5" sources."uid-number-0.0.6" sources."umask-1.1.0" sources."union-value-1.0.1" @@ -85470,7 +85282,7 @@ in ]; }) sources."upath-1.2.0" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."urix-0.1.0" sources."use-3.1.1" sources."util-deprecate-1.0.2" @@ -85533,23 +85345,28 @@ in less = nodeEnv.buildNodePackage { name = "less"; packageName = "less"; - version = "4.0.0"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/less/-/less-4.0.0.tgz"; - sha512 = "av1eEa2D0xZfF7fjLJS/Dld7zAYSLU7EOEJvuOELeaNI3i6L/81AdjbK5/pytaRkBwi7ZEa0433IDvMLskKCOw=="; + url = "https://registry.npmjs.org/less/-/less-4.1.0.tgz"; + sha512 = "w1Ag/f34g7LwtQ/sMVSGWIyZx+gG9ZOAEtyxeX1fG75is6BMyC2lD5kG+1RueX7PkAvlQBm2Lf2aN2j0JbVr2A=="; }; dependencies = [ sources."copy-anything-2.0.1" + sources."debug-3.2.7" sources."errno-0.1.8" sources."graceful-fs-4.2.4" + sources."iconv-lite-0.4.24" sources."image-size-0.5.5" sources."is-what-3.12.0" sources."make-dir-2.1.0" sources."mime-1.6.0" - sources."native-request-1.0.8" + sources."ms-2.1.3" + sources."needle-2.6.0" sources."parse-node-version-1.0.1" sources."pify-4.0.1" sources."prr-1.0.1" + sources."safer-buffer-2.1.2" + sources."sax-1.2.4" sources."semver-5.7.1" sources."source-map-0.6.1" sources."tslib-1.14.1" @@ -86320,7 +86137,7 @@ in ]; }) sources."snapdragon-util-3.0.1" - (sources."socket.io-2.4.0" // { + (sources."socket.io-2.4.1" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.3" @@ -86331,7 +86148,7 @@ in dependencies = [ sources."debug-3.1.0" sources."isarray-2.0.1" - sources."socket.io-parser-3.3.1" + sources."socket.io-parser-3.3.2" ]; }) (sources."socket.io-parser-3.4.1" // { @@ -86394,7 +86211,7 @@ in sources."isobject-3.0.1" ]; }) - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."urix-0.1.0" sources."use-3.1.1" sources."util-deprecate-1.0.2" @@ -86538,13 +86355,13 @@ in sources."@types/babel__generator-7.6.2" sources."@types/babel__template-7.4.0" sources."@types/babel__traverse-7.11.0" - sources."@types/estree-0.0.45" + sources."@types/estree-0.0.46" sources."@types/graceful-fs-4.1.4" sources."@types/istanbul-lib-coverage-2.0.3" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" - sources."@types/json-schema-7.0.6" - sources."@types/node-14.14.20" + sources."@types/json-schema-7.0.7" + sources."@types/node-14.14.22" sources."@types/normalize-package-data-2.4.0" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.12" @@ -86663,7 +86480,7 @@ in sources."base64-js-1.5.1" sources."bcrypt-pbkdf-1.0.2" sources."big.js-5.2.2" - sources."binary-extensions-2.1.0" + sources."binary-extensions-2.2.0" sources."bindings-1.5.0" (sources."bl-4.0.3" // { dependencies = [ @@ -86698,7 +86515,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.16.0" + sources."browserslist-4.16.1" sources."bser-2.1.1" sources."buffer-5.2.1" sources."buffer-from-1.1.1" @@ -86712,9 +86529,9 @@ in }) sources."cache-base-1.0.1" sources."cached-path-relative-1.0.2" - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001173" + sources."caniuse-lite-1.0.30001180" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -86726,11 +86543,10 @@ in sources."supports-color-7.2.0" ]; }) - (sources."chokidar-3.4.3" // { + (sources."chokidar-3.5.1" // { dependencies = [ sources."braces-3.0.2" sources."fill-range-7.0.1" - sources."fsevents-2.1.3" sources."is-number-7.0.0" sources."to-regex-range-5.0.1" ]; @@ -86787,7 +86603,7 @@ in }) sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.8.2" // { + (sources."core-js-compat-3.8.3" // { dependencies = [ sources."semver-7.0.0" ]; @@ -86838,7 +86654,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.634" + sources."electron-to-chromium-1.3.645" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -86847,7 +86663,7 @@ in sources."emoji-regex-7.0.3" sources."emojis-list-3.0.0" sources."end-of-stream-1.4.4" - (sources."enhanced-resolve-4.3.0" // { + (sources."enhanced-resolve-4.5.0" // { dependencies = [ sources."memory-fs-0.5.0" ]; @@ -86938,7 +86754,7 @@ in sources."gensync-1.0.0-beta.2" sources."get-assigned-identifiers-1.2.0" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.0" sources."get-package-type-0.1.0" sources."get-stream-4.1.0" sources."get-value-2.0.6" @@ -87148,7 +86964,7 @@ in ]; }) sources."node-modules-regexp-1.0.0" - sources."node-releases-1.1.69" + sources."node-releases-1.1.70" sources."normalize-package-data-2.5.0" sources."normalize-path-3.0.0" sources."npm-run-path-2.0.2" @@ -87182,7 +86998,7 @@ in sources."paredit.js-0.3.6" sources."parents-1.0.1" sources."parse-asn1-5.1.6" - sources."parse-json-5.1.0" + sources."parse-json-5.2.0" sources."parse-passwd-1.0.0" sources."pascalcase-0.1.1" sources."path-browserify-0.0.1" @@ -87243,7 +87059,7 @@ in sources."regex-not-1.0.2" sources."regexpu-core-4.7.1" sources."regjsgen-0.5.2" - (sources."regjsparser-0.6.4" // { + (sources."regjsparser-0.6.6" // { dependencies = [ sources."jsesc-0.5.0" ]; @@ -87462,7 +87278,7 @@ in ]; }) sources."upath-1.2.0" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."urix-0.1.0" (sources."url-0.11.0" // { dependencies = [ @@ -87498,7 +87314,7 @@ in sources."readdirp-2.2.1" ]; }) - (sources."webpack-4.44.2" // { + (sources."webpack-4.46.0" // { dependencies = [ sources."acorn-6.4.2" sources."micromatch-3.1.10" @@ -87596,10 +87412,10 @@ in markdown-link-check = nodeEnv.buildNodePackage { name = "markdown-link-check"; packageName = "markdown-link-check"; - version = "3.8.5"; + version = "3.8.6"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-link-check/-/markdown-link-check-3.8.5.tgz"; - sha512 = "raCr1YMrIqCUFrBTp90UHDsar/79TPgzlVHA7gSi1DnhM2/BC1lm49V+PGzBd1ZpIYwkmzQ6TYm0AfK7A82/Dw=="; + url = "https://registry.npmjs.org/markdown-link-check/-/markdown-link-check-3.8.6.tgz"; + sha512 = "GWzd54hNol2Zwf6fFEhUYqi9wbib1BMdcphvGCZqhinaAKhiILDaQkX7sn2u9GMoItmZ1jQK0f8wULOK/M+M4w=="; }; dependencies = [ sources."ajv-6.12.6" @@ -87645,7 +87461,7 @@ in sources."link-check-4.5.4" sources."lodash-4.17.20" sources."markdown-link-extractor-1.2.6" - sources."marked-1.2.7" + sources."marked-1.2.8" sources."mime-db-1.45.0" sources."mime-types-2.1.28" sources."ms-2.1.3" @@ -87663,7 +87479,7 @@ in sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."uuid-3.4.0" sources."verror-1.10.0" ]; @@ -87949,7 +87765,7 @@ in sources."type-1.2.0" sources."type-check-0.3.2" sources."typedarray-0.0.6" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."user-home-2.0.0" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" @@ -88030,14 +87846,14 @@ in "@mermaid-js/mermaid-cli" = nodeEnv.buildNodePackage { name = "_at_mermaid-js_slash_mermaid-cli"; packageName = "@mermaid-js/mermaid-cli"; - version = "8.8.4-1"; + version = "8.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-8.8.4-1.tgz"; - sha512 = "4rg3vEBnNMx7cVM4y/pRa6WAbKSoFvPZc4GGUkar4it/pH3PpktOq/wr99mOOu8L/uQEJHpRxed+eRpK75Rn/w=="; + url = "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-8.9.0.tgz"; + sha512 = "DF3nwcCi2ihM3OXIcCn4cNKUxSSU9UeyVuH9bNpgtymjpwAFU45jJXCK9RHtNhLtdjuXz+tcE/sYop3tnBGSuw=="; }; dependencies = [ sources."@braintree/sanitize-url-3.1.0" - sources."@types/node-14.14.20" + sources."@types/node-14.14.22" sources."@types/yauzl-2.9.1" sources."agent-base-5.1.1" sources."ansi-styles-4.3.0" @@ -88119,11 +87935,11 @@ in sources."ieee754-1.2.1" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."khroma-1.1.1" + sources."khroma-1.2.0" sources."locate-path-5.0.0" sources."lodash-4.17.20" sources."lower-case-1.1.4" - sources."mermaid-8.8.4" + sources."mermaid-8.9.0" sources."minify-4.1.3" sources."minimatch-3.0.4" sources."mkdirp-classic-0.5.3" @@ -88165,7 +87981,7 @@ in sources."through-2.3.8" sources."try-catch-2.0.1" sources."try-to-catch-1.1.1" - sources."uglify-js-3.12.4" + sources."uglify-js-3.12.5" sources."unbzip2-stream-1.4.3" sources."upper-case-1.1.3" sources."util-deprecate-1.0.2" @@ -88186,28 +88002,28 @@ in mirakurun = nodeEnv.buildNodePackage { name = "mirakurun"; packageName = "mirakurun"; - version = "3.4.1"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/mirakurun/-/mirakurun-3.4.1.tgz"; - sha512 = "ymTdhda+4t6njz8xY8ySZS4nDEDEb+zXhmn1JzzxlribUqELcKZ6FwC8JF8HhHg3tcKeFAwVLzL6kHcaqL+okQ=="; + url = "https://registry.npmjs.org/mirakurun/-/mirakurun-3.5.0.tgz"; + sha512 = "j2ukrvANZQUreLl2grOQxPl0pbRSoJthYLqujdphZdwJyDwYjPqGOs+KrWwY26QbfqG2Toy06qFnYTaGx9txIg=="; }; dependencies = [ sources."@fluentui/date-time-utilities-7.9.0" sources."@fluentui/dom-utilities-1.1.1" sources."@fluentui/keyboard-key-0.2.12" - sources."@fluentui/react-7.155.3" - sources."@fluentui/react-focus-7.17.0" + sources."@fluentui/react-7.157.0" + sources."@fluentui/react-focus-7.17.1" sources."@fluentui/react-window-provider-1.0.1" - sources."@fluentui/theme-1.7.0" - sources."@microsoft/load-themed-styles-1.10.141" + sources."@fluentui/theme-1.7.1" + sources."@microsoft/load-themed-styles-1.10.146" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@uifabric/foundation-7.9.20" - sources."@uifabric/icons-7.5.17" + sources."@uifabric/foundation-7.9.21" + sources."@uifabric/icons-7.5.18" sources."@uifabric/merge-styles-7.19.1" sources."@uifabric/react-hooks-7.13.9" sources."@uifabric/set-version-7.0.23" - sources."@uifabric/styling-7.16.18" + sources."@uifabric/styling-7.16.19" sources."@uifabric/utilities-7.33.2" sources."accepts-1.3.7" sources."ajv-6.12.6" @@ -88275,7 +88091,7 @@ in sources."eventemitter3-4.0.7" sources."express-4.17.1" sources."express-normalize-query-params-middleware-0.5.1" - sources."express-openapi-7.2.0" + sources."express-openapi-7.2.3" sources."external-editor-2.2.0" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" @@ -88335,20 +88151,20 @@ in sources."node-fetch-1.6.3" sources."normalize-url-4.5.0" sources."object-assign-4.1.1" - sources."office-ui-fabric-react-7.155.3" + sources."office-ui-fabric-react-7.157.0" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" sources."onetime-2.0.1" - sources."openapi-default-setter-7.0.1" - sources."openapi-framework-7.2.0" - sources."openapi-jsonschema-parameters-7.0.2" - sources."openapi-request-coercer-7.1.0" - sources."openapi-request-validator-7.2.0" - sources."openapi-response-validator-7.0.1" - sources."openapi-schema-validator-7.0.1" - sources."openapi-security-handler-7.0.1" - sources."openapi-types-7.0.1" + sources."openapi-default-setter-7.2.3" + sources."openapi-framework-7.2.3" + sources."openapi-jsonschema-parameters-7.2.3" + sources."openapi-request-coercer-7.2.3" + sources."openapi-request-validator-7.2.3" + sources."openapi-response-validator-7.2.3" + sources."openapi-schema-validator-7.2.3" + sources."openapi-security-handler-7.2.3" + sources."openapi-types-7.2.3" (sources."opencollective-1.0.3" // { dependencies = [ sources."minimist-1.2.0" @@ -88426,8 +88242,8 @@ in sources."strip-json-comments-2.0.1" sources."supports-color-2.0.0" sources."swagger-schema-official-2.0.0-bab6bed" - sources."swagger-ui-dist-3.38.0" - sources."tail-2.1.1" + sources."swagger-ui-dist-3.40.0" + sources."tail-2.2.0" sources."through-2.3.8" sources."tmp-0.0.33" sources."to-readable-stream-1.0.0" @@ -88436,7 +88252,7 @@ in sources."tslib-1.14.1" sources."type-is-1.6.18" sources."unpipe-1.0.0" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."url-parse-lax-3.0.0" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" @@ -88471,7 +88287,7 @@ in sources."anymatch-3.1.1" sources."argparse-1.0.10" sources."balanced-match-1.0.0" - sources."binary-extensions-2.1.0" + sources."binary-extensions-2.2.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."browser-stdout-1.3.1" @@ -88629,14 +88445,14 @@ in sources."path-loader-1.0.10" sources."process-nextick-args-2.0.1" sources."punycode-2.1.1" - sources."qs-6.9.4" + sources."qs-6.9.6" sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" sources."slash-3.0.0" sources."sprintf-js-1.0.3" sources."string_decoder-1.1.1" sources."superagent-3.8.3" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" ]; buildInputs = globalBuildInputs; @@ -88717,10 +88533,10 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "2.70.0"; + version = "3.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-2.70.0.tgz"; - sha512 = "VET5LUeZP2TX+xBXYQdiKkVyQfeW+HkeL7pRE2fGOi14fLE3BYSjjdmnCHDX83hgYniHIxKJBH/52zkyQ+m+2Q=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-3.4.3.tgz"; + sha512 = "UYeJwlANY5L4mV+SQy4bpFTvwCfiptMTqg4Udf1Ua5LgsV5jTl4IMxK1dVZ9iSMoj2lcKRhPuoNFaI+hTlKVJw=="; }; dependencies = [ sources."@babel/code-frame-7.12.11" @@ -88828,55 +88644,85 @@ in sources."@babel/template-7.12.7" sources."@babel/traverse-7.12.12" sources."@babel/types-7.12.12" - sources."@bugsnag/browser-7.5.4" - sources."@bugsnag/core-7.5.4" + sources."@bugsnag/browser-7.6.0" + sources."@bugsnag/core-7.6.0" sources."@bugsnag/cuid-3.0.0" - sources."@bugsnag/js-7.5.4" - sources."@bugsnag/node-7.5.4" + sources."@bugsnag/js-7.6.0" + sources."@bugsnag/node-7.6.0" sources."@bugsnag/safe-json-stringify-6.0.0" sources."@dabh/diagnostics-2.0.2" sources."@jest/types-24.9.0" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-8.0.1" // { + (sources."@netlify/build-8.3.1" // { dependencies = [ - sources."@netlify/zip-it-and-ship-it-2.0.0" sources."ansi-styles-4.3.0" sources."chalk-3.0.0" + sources."execa-3.4.0" + sources."locate-path-5.0.0" sources."resolve-2.0.0-next.2" ]; }) - sources."@netlify/cache-utils-1.0.6" - (sources."@netlify/config-2.4.3" // { + (sources."@netlify/cache-utils-1.0.6" // { + dependencies = [ + sources."locate-path-5.0.0" + ]; + }) + (sources."@netlify/config-3.0.4" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-3.0.0" + sources."execa-3.4.0" ]; }) - (sources."@netlify/functions-utils-1.3.4" // { + (sources."@netlify/framework-info-2.1.1" // { dependencies = [ - sources."@netlify/zip-it-and-ship-it-2.0.0" - sources."resolve-2.0.0-next.2" + sources."locate-path-5.0.0" ]; }) + sources."@netlify/functions-utils-1.3.7" (sources."@netlify/git-utils-1.0.6" // { dependencies = [ sources."braces-3.0.2" + sources."execa-3.4.0" + sources."fill-range-7.0.1" + sources."is-number-7.0.0" + sources."micromatch-4.0.2" + sources."to-regex-range-5.0.1" + ]; + }) + sources."@netlify/open-api-1.3.0" + (sources."@netlify/plugin-edge-handlers-1.11.2" // { + dependencies = [ + sources."@nodelib/fs.stat-2.0.4" + sources."array-union-2.1.0" + sources."braces-3.0.2" + sources."del-6.0.0" + sources."dir-glob-3.0.1" + sources."fast-glob-3.2.5" sources."fill-range-7.0.1" + sources."glob-parent-5.1.1" + sources."globby-11.0.2" + sources."ignore-5.1.8" sources."is-number-7.0.0" sources."micromatch-4.0.2" + sources."p-map-4.0.0" + sources."slash-3.0.0" sources."to-regex-range-5.0.1" ]; }) - sources."@netlify/open-api-1.0.0" - sources."@netlify/plugin-edge-handlers-1.10.0" sources."@netlify/plugins-list-2.2.0" - sources."@netlify/run-utils-1.0.5" - sources."@netlify/traffic-mesh-agent-0.27.0" - sources."@netlify/traffic-mesh-agent-darwin-x64-0.27.0" - sources."@netlify/traffic-mesh-agent-linux-x64-0.27.0" - sources."@netlify/traffic-mesh-agent-win32-x64-0.27.0" - (sources."@netlify/zip-it-and-ship-it-1.7.0" // { + (sources."@netlify/run-utils-1.0.5" // { + dependencies = [ + sources."execa-3.4.0" + ]; + }) + sources."@netlify/traffic-mesh-agent-0.27.10" + sources."@netlify/traffic-mesh-agent-darwin-x64-0.27.10" + sources."@netlify/traffic-mesh-agent-linux-x64-0.27.10" + sources."@netlify/traffic-mesh-agent-win32-x64-0.27.10" + (sources."@netlify/zip-it-and-ship-it-2.1.1" // { dependencies = [ + sources."locate-path-5.0.0" sources."resolve-2.0.0-next.2" ]; }) @@ -88900,13 +88746,9 @@ in }) sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."has-flag-4.0.0" + sources."has-flag-3.0.0" sources."strip-ansi-5.2.0" - (sources."supports-color-5.5.0" // { - dependencies = [ - sources."has-flag-3.0.0" - ]; - }) + sources."supports-color-5.5.0" ]; }) (sources."@oclif/command-1.8.0" // { @@ -88928,22 +88770,23 @@ in sources."array-union-2.1.0" sources."braces-3.0.2" sources."dir-glob-3.0.1" - sources."fast-glob-3.2.4" + sources."fast-glob-3.2.5" sources."fill-range-7.0.1" sources."glob-parent-5.1.1" - sources."globby-11.0.1" + sources."globby-11.0.2" sources."ignore-5.1.8" sources."is-number-7.0.0" sources."micromatch-4.0.2" sources."slash-3.0.0" sources."to-regex-range-5.0.1" - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) (sources."@oclif/errors-1.3.4" // { dependencies = [ sources."ansi-styles-4.3.0" sources."clean-stack-3.0.1" + sources."escape-string-regexp-4.0.0" sources."wrap-ansi-7.0.0" ]; }) @@ -88980,6 +88823,7 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."fs-extra-7.0.1" + sources."has-flag-3.0.0" sources."indent-string-3.2.0" sources."is-wsl-1.1.0" sources."semver-5.7.1" @@ -88991,41 +88835,35 @@ in dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.0" - sources."fs-extra-9.0.1" - (sources."jsonfile-6.1.0" // { - dependencies = [ - sources."universalify-2.0.0" - ]; - }) - sources."npm-run-path-4.0.1" - sources."path-key-3.1.1" - sources."tslib-2.0.3" - sources."universalify-1.0.0" + sources."fs-extra-9.1.0" + sources."jsonfile-6.1.0" + sources."tslib-2.1.0" + sources."universalify-2.0.0" ]; }) sources."@oclif/screen-1.0.4" - sources."@octokit/auth-token-2.4.4" - (sources."@octokit/endpoint-6.0.10" // { + sources."@octokit/auth-token-2.4.5" + (sources."@octokit/endpoint-6.0.11" // { dependencies = [ sources."is-plain-object-5.0.0" sources."universal-user-agent-6.0.0" ]; }) - sources."@octokit/openapi-types-2.0.1" + sources."@octokit/openapi-types-3.3.0" (sources."@octokit/plugin-paginate-rest-1.1.2" // { dependencies = [ sources."@octokit/types-2.16.2" ]; }) - sources."@octokit/plugin-request-log-1.0.2" + sources."@octokit/plugin-request-log-1.0.3" (sources."@octokit/plugin-rest-endpoint-methods-2.4.0" // { dependencies = [ sources."@octokit/types-2.16.2" ]; }) - (sources."@octokit/request-5.4.12" // { + (sources."@octokit/request-5.4.13" // { dependencies = [ - sources."@octokit/request-error-2.0.4" + sources."@octokit/request-error-2.0.5" sources."is-plain-object-5.0.0" sources."universal-user-agent-6.0.0" ]; @@ -89036,19 +88874,23 @@ in ]; }) sources."@octokit/rest-16.43.2" - sources."@octokit/types-6.1.2" + sources."@octokit/types-6.6.0" sources."@rollup/plugin-babel-5.2.2" - (sources."@rollup/plugin-commonjs-15.1.0" // { + (sources."@rollup/plugin-commonjs-17.0.0" // { dependencies = [ sources."estree-walker-2.0.2" ]; }) sources."@rollup/plugin-inject-4.0.2" sources."@rollup/plugin-json-4.1.0" - sources."@rollup/plugin-node-resolve-9.0.0" + sources."@rollup/plugin-node-resolve-11.1.0" sources."@rollup/pluginutils-3.1.0" sources."@sindresorhus/is-0.14.0" - sources."@sindresorhus/slugify-1.1.0" + (sources."@sindresorhus/slugify-1.1.0" // { + dependencies = [ + sources."escape-string-regexp-4.0.0" + ]; + }) (sources."@sindresorhus/transliterate-0.1.1" // { dependencies = [ sources."escape-string-regexp-2.0.0" @@ -89061,14 +88903,14 @@ in sources."@types/glob-7.1.3" sources."@types/got-8.3.5" sources."@types/hast-2.3.1" - sources."@types/http-proxy-1.17.4" + sources."@types/http-proxy-1.17.5" sources."@types/istanbul-lib-coverage-2.0.3" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/minimatch-3.0.3" sources."@types/mkdirp-0.5.2" - sources."@types/node-14.14.20" - sources."@types/node-fetch-2.5.7" + sources."@types/node-14.14.22" + sources."@types/node-fetch-2.5.8" sources."@types/normalize-package-data-2.4.0" sources."@types/parse5-5.0.3" sources."@types/resolve-1.17.1" @@ -89078,14 +88920,10 @@ in sources."@types/yargs-parser-20.2.0" sources."@typescript-eslint/typescript-estree-2.34.0" sources."@ungap/from-entries-0.2.1" - (sources."abstract-leveldown-0.12.4" // { - dependencies = [ - sources."xtend-3.0.0" - ]; - }) sources."accepts-1.3.7" sources."agent-base-6.0.2" sources."aggregate-error-3.1.0" + sources."ajv-7.0.3" (sources."ansi-align-3.0.0" // { dependencies = [ sources."emoji-regex-7.0.3" @@ -89096,7 +88934,7 @@ in }) sources."ansi-escapes-3.2.0" sources."ansi-regex-4.1.0" - sources."ansi-styles-5.0.0" + sources."ansi-styles-5.1.0" sources."ansicolors-0.3.2" sources."anymatch-3.1.1" (sources."archive-type-4.0.0" // { @@ -89122,11 +88960,6 @@ in sources."array-unique-0.3.2" sources."arrify-2.0.1" sources."ascii-table-0.0.9" - (sources."asn1.js-5.4.1" // { - dependencies = [ - sources."bn.js-4.11.9" - ]; - }) sources."assign-symbols-1.0.0" sources."ast-module-types-2.7.1" sources."async-3.2.0" @@ -89134,7 +88967,7 @@ in sources."at-least-node-1.0.0" sources."atob-2.1.2" sources."atob-lite-2.0.0" - (sources."aws-sdk-2.821.0" // { + (sources."aws-sdk-2.831.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -89152,9 +88985,8 @@ in }) sources."base64-js-1.5.1" sources."before-after-hook-2.1.0" - sources."binary-extensions-2.1.0" + sources."binary-extensions-2.2.0" sources."bl-4.0.3" - sources."bn.js-5.1.3" (sources."body-parser-1.19.0" // { dependencies = [ sources."debug-2.6.9" @@ -89173,14 +89005,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."brorand-1.1.0" - sources."browserify-aes-1.2.0" - sources."browserify-cipher-1.0.1" - sources."browserify-des-1.0.2" - sources."browserify-fs-1.0.0" - sources."browserify-rsa-4.1.0" - sources."browserify-sign-4.2.1" - sources."browserslist-4.16.0" + sources."browserslist-4.16.1" sources."btoa-lite-1.0.0" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" @@ -89189,7 +89014,6 @@ in sources."buffer-es6-4.9.3" sources."buffer-fill-1.0.0" sources."buffer-from-1.1.1" - sources."buffer-xor-1.0.3" sources."builtin-modules-3.2.0" sources."builtins-1.0.3" sources."byline-5.0.0" @@ -89201,10 +89025,10 @@ in ]; }) sources."cachedir-2.3.0" - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."call-me-maybe-1.0.1" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001173" + sources."caniuse-lite-1.0.30001180" sources."cardinal-2.1.1" sources."caw-2.0.1" sources."ccount-1.1.0" @@ -89213,24 +89037,24 @@ in sources."ansi-styles-3.2.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."escape-string-regexp-1.0.5" + sources."has-flag-3.0.0" sources."supports-color-5.5.0" ]; }) sources."character-entities-html4-1.1.4" sources."character-entities-legacy-1.1.4" sources."chardet-0.7.0" - (sources."chokidar-3.4.3" // { + (sources."chokidar-3.5.1" // { dependencies = [ sources."braces-3.0.2" sources."fill-range-7.0.1" + sources."fsevents-2.3.1" sources."glob-parent-5.1.1" sources."is-number-7.0.0" sources."to-regex-range-5.0.1" ]; }) sources."ci-info-2.0.0" - sources."cipher-base-1.0.4" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" @@ -89261,17 +89085,17 @@ in sources."argparse-1.0.10" sources."chalk-4.1.0" sources."clean-stack-3.0.1" + sources."escape-string-regexp-4.0.0" sources."extract-stack-2.0.0" - sources."has-flag-4.0.0" sources."js-yaml-3.14.1" sources."supports-hyperlinks-2.1.0" - sources."tslib-2.0.3" + sources."tslib-2.1.0" sources."type-fest-0.11.0" ]; }) sources."cli-width-2.2.1" sources."cliui-6.0.0" - sources."clone-0.1.19" + sources."clone-1.0.4" sources."clone-response-1.0.2" sources."collection-visit-1.0.0" (sources."color-3.0.0" // { @@ -89299,12 +89123,6 @@ in ]; }) sources."concat-map-0.0.1" - (sources."concat-stream-1.6.2" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - ]; - }) (sources."concordance-4.0.0" // { dependencies = [ sources."semver-5.7.1" @@ -89334,7 +89152,7 @@ in sources."safe-buffer-5.1.2" ]; }) - (sources."core-js-compat-3.8.2" // { + (sources."core-js-compat-3.8.3" // { dependencies = [ sources."semver-7.0.0" ]; @@ -89348,20 +89166,7 @@ in }) sources."crc-3.8.0" sources."crc32-stream-3.0.1" - (sources."create-ecdh-4.0.4" // { - dependencies = [ - sources."bn.js-4.11.9" - ]; - }) - sources."create-hash-1.2.0" - sources."create-hmac-1.1.7" - (sources."cross-spawn-6.0.5" // { - dependencies = [ - sources."semver-5.7.1" - sources."which-1.3.1" - ]; - }) - sources."crypto-browserify-3.12.0" + sources."cross-spawn-7.0.3" sources."crypto-random-string-2.0.0" sources."cyclist-1.0.1" sources."date-time-2.1.0" @@ -89387,6 +89192,7 @@ in dependencies = [ sources."bl-1.2.3" sources."file-type-5.2.0" + sources."is-stream-1.1.0" sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" sources."tar-stream-1.6.2" @@ -89395,11 +89201,13 @@ in (sources."decompress-tarbz2-4.1.1" // { dependencies = [ sources."file-type-6.2.0" + sources."is-stream-1.1.0" ]; }) (sources."decompress-targz-4.1.1" // { dependencies = [ sources."file-type-5.2.0" + sources."is-stream-1.1.0" ]; }) (sources."decompress-unzip-4.0.1" // { @@ -89412,13 +89220,8 @@ in sources."deep-extend-0.6.0" sources."deep-is-0.1.3" sources."deepmerge-4.2.2" - (sources."defaults-1.0.3" // { - dependencies = [ - sources."clone-1.0.4" - ]; - }) + sources."defaults-1.0.3" sources."defer-to-connect-1.1.3" - sources."deferred-leveldown-0.2.0" sources."define-properties-1.1.3" sources."define-property-2.0.2" (sources."del-5.1.0" // { @@ -89429,7 +89232,6 @@ in sources."delayed-stream-1.0.0" sources."depd-1.1.2" sources."deprecation-2.3.1" - sources."des.js-1.0.1" sources."destroy-1.0.4" sources."detective-amd-3.0.1" sources."detective-cjs-3.1.1" @@ -89440,11 +89242,6 @@ in sources."detective-scss-2.0.1" sources."detective-stylus-1.0.0" sources."detective-typescript-5.8.0" - (sources."diffie-hellman-5.0.3" // { - dependencies = [ - sources."bn.js-4.11.9" - ]; - }) (sources."dir-glob-2.2.2" // { dependencies = [ sources."path-type-3.0.0" @@ -89467,6 +89264,7 @@ in sources."normalize-url-2.0.1" sources."p-cancelable-0.4.1" sources."p-event-2.3.1" + sources."p-finally-1.0.0" sources."p-timeout-2.0.1" sources."pify-3.0.0" sources."sort-keys-2.0.0" @@ -89474,25 +89272,20 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.634" + sources."electron-to-chromium-1.3.645" sources."elf-cam-0.1.1" - (sources."elliptic-6.5.3" // { - dependencies = [ - sources."bn.js-4.11.9" - ]; - }) sources."emoji-regex-8.0.0" sources."enabled-2.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" + sources."env-paths-2.2.0" sources."envinfo-7.7.3" - sources."errno-0.1.8" sources."error-ex-1.3.2" sources."error-stack-parser-2.0.6" sources."escalade-3.1.1" sources."escape-goat-2.1.1" sources."escape-html-1.0.3" - sources."escape-string-regexp-4.0.0" + sources."escape-string-regexp-1.0.5" (sources."escodegen-1.14.3" // { dependencies = [ sources."source-map-0.6.1" @@ -89506,16 +89299,10 @@ in sources."etag-1.8.1" sources."eventemitter3-4.0.7" sources."events-1.1.1" - sources."evp_bytestokey-1.0.3" - (sources."execa-3.4.0" // { + (sources."execa-5.0.0" // { dependencies = [ - sources."cross-spawn-7.0.3" - sources."is-stream-2.0.0" - sources."npm-run-path-4.0.1" - sources."p-finally-2.0.1" - sources."path-key-3.1.1" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" + sources."get-stream-6.0.0" + sources."human-signals-2.1.0" ]; }) (sources."expand-brackets-2.1.4" // { @@ -89565,6 +89352,7 @@ in ]; }) sources."extract-stack-1.0.0" + sources."fast-deep-equal-3.1.3" sources."fast-diff-1.2.0" sources."fast-equals-1.6.3" sources."fast-glob-2.2.7" @@ -89574,11 +89362,7 @@ in sources."fastq-1.10.0" sources."fd-slicer-1.1.0" sources."fecha-4.2.0" - (sources."figures-3.2.0" // { - dependencies = [ - sources."escape-string-regexp-1.0.5" - ]; - }) + sources."figures-3.2.0" sources."file-size-0.0.5" sources."file-type-8.1.0" sources."filename-reserved-regex-2.0.0" @@ -89594,14 +89378,17 @@ in sources."debug-2.6.9" ]; }) - sources."find-up-4.1.0" + (sources."find-up-4.1.0" // { + dependencies = [ + sources."locate-path-5.0.0" + ]; + }) sources."flatten-1.0.3" sources."flush-write-stream-2.0.0" sources."fn.name-1.1.0" sources."folder-walker-3.2.0" - sources."follow-redirects-1.13.1" + sources."follow-redirects-1.13.2" sources."for-in-1.0.2" - sources."foreach-2.0.5" sources."form-data-3.0.0" sources."forwarded-0.1.2" sources."fragment-cache-0.2.1" @@ -89619,17 +89406,10 @@ in sources."fsevents-2.1.3" sources."function-bind-1.1.1" sources."fuzzy-0.1.3" - (sources."fwd-stream-1.0.4" // { - dependencies = [ - sources."isarray-0.0.1" - sources."readable-stream-1.0.34" - sources."string_decoder-0.10.31" - ]; - }) sources."gensync-1.0.0-beta.2" sources."get-amd-module-type-3.0.0" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.0" sources."get-port-5.1.1" sources."get-proxy-2.1.0" sources."get-stream-5.2.0" @@ -89661,7 +89441,7 @@ in sources."array-union-2.1.0" sources."braces-3.0.2" sources."dir-glob-3.0.1" - sources."fast-glob-3.2.4" + sources."fast-glob-3.2.5" sources."fill-range-7.0.1" sources."glob-parent-5.1.1" sources."ignore-5.1.8" @@ -89685,7 +89465,7 @@ in sources."ansi-regex-0.2.1" ]; }) - sources."has-flag-3.0.0" + sources."has-flag-4.0.0" (sources."has-glob-1.0.0" // { dependencies = [ sources."is-glob-3.1.0" @@ -89701,26 +89481,18 @@ in ]; }) sources."has-yarn-2.1.0" - sources."hash-base-3.1.0" - sources."hash.js-1.1.7" - (sources."hasha-5.2.2" // { - dependencies = [ - sources."is-stream-2.0.0" - ]; - }) + sources."hasha-5.2.2" sources."hast-util-from-parse5-6.0.1" sources."hast-util-is-element-1.1.0" sources."hast-util-parse-selector-2.2.5" sources."hast-util-to-html-7.1.2" sources."hast-util-whitespace-1.0.4" sources."hastscript-6.0.0" - sources."hmac-drbg-1.0.1" sources."hosted-git-info-2.8.8" sources."html-void-elements-1.0.5" sources."http-cache-semantics-4.1.0" (sources."http-call-5.3.0" // { dependencies = [ - sources."is-stream-2.0.0" sources."parse-json-4.0.0" ]; }) @@ -89743,21 +89515,18 @@ in sources."human-signals-1.1.1" sources."hyperlinker-1.0.0" sources."iconv-lite-0.4.24" - sources."idb-wrapper-1.7.2" sources."ieee754-1.2.1" sources."ignore-4.0.6" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" sources."indexes-of-1.0.1" - sources."indexof-0.0.1" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" (sources."inquirer-6.5.2" // { dependencies = [ sources."ansi-regex-3.0.0" - sources."escape-string-regexp-1.0.5" sources."figures-2.0.0" sources."is-fullwidth-code-point-2.0.0" (sources."string-width-2.1.1" // { @@ -89782,7 +89551,6 @@ in }) sources."into-stream-3.1.0" sources."ipaddr.js-1.9.1" - sources."is-0.2.7" sources."is-accessor-descriptor-1.0.0" sources."is-arrayish-0.2.1" sources."is-binary-path-2.1.0" @@ -89807,29 +89575,24 @@ in ]; }) sources."is-obj-2.0.0" - sources."is-object-0.1.2" + sources."is-object-1.0.2" sources."is-path-cwd-2.2.0" sources."is-path-inside-3.0.2" sources."is-plain-obj-2.1.0" sources."is-plain-object-2.0.4" sources."is-reference-1.2.1" sources."is-retry-allowed-1.2.0" - sources."is-stream-1.1.0" + sources."is-stream-2.0.0" sources."is-typedarray-1.0.0" sources."is-url-1.2.4" sources."is-windows-1.0.2" sources."is-wsl-2.2.0" sources."is-yarn-global-0.3.0" sources."isarray-1.0.0" - sources."isbuffer-0.0.0" sources."iserror-0.0.2" sources."isexe-2.0.0" sources."isobject-3.0.1" - (sources."isurl-1.0.0" // { - dependencies = [ - sources."is-object-1.0.2" - ]; - }) + sources."isurl-1.0.0" sources."jest-get-type-24.9.0" sources."jest-validate-24.9.0" sources."jest-worker-26.6.2" @@ -89841,11 +89604,16 @@ in sources."json-buffer-3.0.0" sources."json-parse-better-errors-1.0.2" sources."json-parse-even-better-errors-2.3.1" + sources."json-schema-traverse-1.0.0" sources."json5-2.1.3" sources."jsonfile-4.0.0" sources."junk-3.1.0" sources."jwt-decode-3.1.2" - sources."keep-func-props-3.0.1" + (sources."keep-func-props-3.0.1" // { + dependencies = [ + sources."mimic-fn-3.1.0" + ]; + }) sources."keyv-3.1.0" sources."kind-of-6.0.3" sources."kuler-2.0.0" @@ -89861,48 +89629,6 @@ in sources."safe-buffer-5.1.2" ]; }) - (sources."level-blobs-0.1.7" // { - dependencies = [ - sources."isarray-0.0.1" - sources."readable-stream-1.1.14" - sources."string_decoder-0.10.31" - ]; - }) - (sources."level-filesystem-1.2.0" // { - dependencies = [ - sources."xtend-2.2.0" - ]; - }) - sources."level-fix-range-2.0.0" - sources."level-hooks-4.5.0" - (sources."level-js-2.2.4" // { - dependencies = [ - sources."object-keys-0.4.0" - sources."xtend-2.1.2" - ]; - }) - (sources."level-peek-1.0.6" // { - dependencies = [ - sources."level-fix-range-1.0.2" - ]; - }) - (sources."level-sublevel-5.2.3" // { - dependencies = [ - sources."object-keys-0.2.0" - sources."xtend-2.0.6" - ]; - }) - (sources."levelup-0.18.6" // { - dependencies = [ - sources."bl-0.8.2" - sources."isarray-0.0.1" - sources."prr-0.0.0" - sources."readable-stream-1.0.34" - sources."semver-2.3.2" - sources."string_decoder-0.10.31" - sources."xtend-3.0.0" - ]; - }) sources."leven-3.1.0" sources."levn-0.3.0" sources."lines-and-columns-1.1.6" @@ -89912,7 +89638,12 @@ in sources."type-fest-0.3.1" ]; }) - sources."locate-path-5.0.0" + (sources."locate-path-6.0.0" // { + dependencies = [ + sources."p-limit-3.1.0" + sources."p-locate-5.0.0" + ]; + }) sources."lodash-4.17.20" sources."lodash._reinterpolate-3.0.0" sources."lodash.camelcase-4.3.0" @@ -89947,7 +89678,6 @@ in }) sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" - sources."ltgt-2.2.1" sources."macos-release-2.4.1" sources."magic-string-0.25.7" (sources."make-dir-3.1.0" // { @@ -89966,7 +89696,6 @@ in }) sources."md5-hex-2.0.0" sources."md5-o-matic-0.1.1" - sources."md5.js-1.3.5" sources."media-typer-0.3.0" sources."memoize-one-5.1.1" sources."merge-descriptors-1.0.1" @@ -89976,18 +89705,11 @@ in sources."micro-api-client-3.3.0" sources."micro-memoize-2.1.2" sources."micromatch-3.1.10" - (sources."miller-rabin-4.0.1" // { - dependencies = [ - sources."bn.js-4.11.9" - ]; - }) sources."mime-1.6.0" sources."mime-db-1.45.0" sources."mime-types-2.1.28" - sources."mimic-fn-3.1.0" + sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" - sources."minimalistic-assert-1.0.1" - sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" (sources."mixin-deep-1.3.2" // { @@ -90021,30 +89743,17 @@ in sources."natural-orderby-2.0.3" sources."negotiator-0.6.2" sources."nested-error-stacks-2.1.0" - (sources."netlify-6.0.9" // { + (sources."netlify-6.1.3" // { dependencies = [ - sources."@netlify/zip-it-and-ship-it-2.0.0" - sources."qs-6.9.4" - sources."resolve-2.0.0-next.2" + sources."qs-6.9.6" ]; }) sources."netlify-plugin-deploy-preview-commenting-0.0.1-alpha.16" - (sources."netlify-redirect-parser-2.5.0" // { - dependencies = [ - sources."@netlify/config-0.11.11" - sources."@netlify/open-api-0.18.1" - sources."ansi-styles-4.3.0" - sources."argparse-1.0.10" - sources."chalk-3.0.0" - sources."js-yaml-3.14.1" - sources."netlify-4.9.0" - sources."qs-6.9.4" - ]; - }) + sources."netlify-redirect-parser-3.0.2" sources."netlify-redirector-0.2.1" sources."nice-try-1.0.5" sources."node-fetch-2.6.1" - sources."node-releases-1.1.69" + sources."node-releases-1.1.70" sources."node-source-walk-4.2.0" sources."noop2-2.0.0" (sources."normalize-package-data-2.5.0" // { @@ -90059,7 +89768,7 @@ in sources."pify-3.0.0" ]; }) - sources."npm-run-path-2.0.2" + sources."npm-run-path-4.0.1" sources."object-assign-4.1.1" (sources."object-copy-0.1.0" // { dependencies = [ @@ -90079,19 +89788,14 @@ in sources."object-visit-1.0.1" sources."object.assign-4.1.2" sources."object.pick-1.3.0" - sources."octal-1.0.0" sources."octokit-pagination-methods-1.1.0" sources."omit.js-2.0.2" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" sources."one-time-1.0.0" - (sources."onetime-5.1.2" // { - dependencies = [ - sources."mimic-fn-2.1.0" - ]; - }) - sources."open-7.3.0" + sources."onetime-5.1.2" + sources."open-7.3.1" (sources."opn-5.5.0" // { dependencies = [ sources."is-wsl-1.1.0" @@ -90121,13 +89825,17 @@ in sources."p-map-2.1.0" ]; }) - sources."p-finally-1.0.0" + sources."p-finally-2.0.1" sources."p-is-promise-1.1.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-map-3.0.0" sources."p-reduce-2.1.0" - sources."p-timeout-3.2.0" + (sources."p-timeout-3.2.0" // { + dependencies = [ + sources."p-finally-1.0.0" + ]; + }) sources."p-try-2.2.0" sources."p-wait-for-3.2.0" (sources."package-json-6.5.0" // { @@ -90141,24 +89849,31 @@ in sources."safe-buffer-5.1.2" ]; }) - sources."parse-asn1-5.1.6" sources."parse-github-repo-url-1.4.1" sources."parse-github-url-1.0.2" sources."parse-gitignore-1.0.1" - sources."parse-json-5.1.0" + sources."parse-json-5.2.0" sources."parse-ms-2.1.0" sources."parse5-6.0.1" sources."parseurl-1.3.3" sources."pascalcase-0.1.1" - sources."password-prompt-1.1.2" + (sources."password-prompt-1.1.2" // { + dependencies = [ + sources."cross-spawn-6.0.5" + sources."path-key-2.0.1" + sources."semver-5.7.1" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."which-1.3.1" + ]; + }) sources."path-dirname-1.0.2" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" - sources."path-key-2.0.1" + sources."path-key-3.1.1" sources."path-parse-1.0.6" sources."path-to-regexp-0.1.7" sources."path-type-4.0.0" - sources."pbkdf2-3.1.1" sources."pend-1.2.0" sources."picomatch-2.2.2" sources."pify-4.0.1" @@ -90168,6 +89883,7 @@ in sources."posix-character-classes-0.1.1" (sources."postcss-7.0.35" // { dependencies = [ + sources."has-flag-3.0.0" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; @@ -90191,14 +89907,8 @@ in sources."property-information-5.6.0" sources."proto-list-1.2.4" sources."proxy-addr-2.0.6" - sources."prr-1.0.1" - (sources."public-encrypt-4.0.3" // { - dependencies = [ - sources."bn.js-4.11.9" - ]; - }) sources."pump-3.0.0" - sources."punycode-1.3.2" + sources."punycode-2.1.1" sources."pupa-2.1.1" sources."qs-6.7.0" sources."query-string-5.1.1" @@ -90206,7 +89916,6 @@ in sources."random-bytes-1.0.0" sources."random-item-3.1.0" sources."randombytes-2.1.0" - sources."randomfill-1.0.4" sources."range-parser-1.2.1" (sources."raw-body-2.4.1" // { dependencies = [ @@ -90233,7 +89942,7 @@ in sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" sources."regjsgen-0.5.2" - (sources."regjsparser-0.6.4" // { + (sources."regjsparser-0.6.6" // { dependencies = [ sources."jsesc-0.5.0" ]; @@ -90244,6 +89953,7 @@ in sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" sources."require-directory-2.1.1" + sources."require-from-string-2.0.2" sources."require-main-filename-2.0.0" sources."require-package-name-2.0.1" sources."requires-port-1.0.0" @@ -90259,10 +89969,19 @@ in sources."ret-0.1.15" sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."ripemd160-2.0.2" - sources."rollup-2.36.0" - sources."rollup-plugin-node-builtins-2.1.2" + sources."rollup-2.38.0" + (sources."rollup-plugin-inject-3.0.2" // { + dependencies = [ + sources."estree-walker-0.6.1" + ]; + }) + sources."rollup-plugin-node-polyfills-0.2.1" sources."rollup-plugin-terser-7.0.2" + (sources."rollup-pluginutils-2.8.2" // { + dependencies = [ + sources."estree-walker-0.6.1" + ]; + }) sources."run-async-2.4.1" sources."run-parallel-1.1.10" sources."rxjs-6.6.3" @@ -90298,9 +90017,8 @@ in ]; }) sources."setprototypeof-1.1.1" - sources."sha.js-2.4.11" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" sources."signal-exit-3.0.3" (sources."simple-swizzle-0.2.2" // { dependencies = [ @@ -90385,7 +90103,6 @@ in sources."ansi-regex-0.2.1" sources."ansi-styles-1.1.0" sources."chalk-0.5.1" - sources."escape-string-regexp-1.0.5" sources."strip-ansi-0.3.0" sources."supports-color-0.2.0" ]; @@ -90393,7 +90110,6 @@ in sources."statsd-client-0.4.5" sources."statuses-1.5.0" sources."strict-uri-encode-1.1.0" - sources."string-range-1.2.2" sources."string-width-4.2.0" (sources."string_decoder-1.1.1" // { dependencies = [ @@ -90412,16 +90128,8 @@ in sources."strip-eof-1.0.0" sources."strip-final-newline-2.0.0" sources."strip-json-comments-2.0.1" - (sources."strip-outer-1.0.1" // { - dependencies = [ - sources."escape-string-regexp-1.0.5" - ]; - }) - (sources."supports-color-7.2.0" // { - dependencies = [ - sources."has-flag-4.0.0" - ]; - }) + sources."strip-outer-1.0.1" + sources."supports-color-7.2.0" (sources."supports-hyperlinks-1.0.1" // { dependencies = [ sources."has-flag-2.0.0" @@ -90475,21 +90183,16 @@ in sources."toml-3.0.0" sources."tomlify-j0.4-3.0.0" sources."treeify-1.1.0" - (sources."trim-repeated-1.0.0" // { - dependencies = [ - sources."escape-string-regexp-1.0.5" - ]; - }) + sources."trim-repeated-1.0.0" sources."triple-beam-1.3.0" sources."trough-1.0.5" sources."tslib-1.14.1" - sources."tsutils-3.18.0" + sources."tsutils-3.20.0" sources."tunnel-agent-0.6.0" sources."type-check-0.3.2" sources."type-fest-0.8.1" sources."type-is-1.6.18" - sources."typedarray-0.0.6" - sources."typedarray-to-buffer-1.0.4" + sources."typedarray-to-buffer-3.1.5" sources."typescript-3.9.7" sources."uid-safe-2.1.5" sources."unbzip2-stream-1.4.3" @@ -90533,8 +90236,13 @@ in sources."chalk-3.0.0" ]; }) + sources."uri-js-4.4.1" sources."urix-0.1.0" - sources."url-0.10.3" + (sources."url-0.10.3" // { + dependencies = [ + sources."punycode-1.3.2" + ]; + }) sources."url-parse-lax-3.0.0" sources."url-to-options-1.0.1" sources."use-3.1.1" @@ -90564,15 +90272,20 @@ in sources."widest-line-3.1.0" (sources."windows-release-3.3.3" // { dependencies = [ + sources."cross-spawn-6.0.5" sources."execa-1.0.0" sources."get-stream-4.1.0" + sources."is-stream-1.1.0" + sources."npm-run-path-2.0.2" + sources."p-finally-1.0.0" + sources."path-key-2.0.1" + sources."semver-5.7.1" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."which-1.3.1" ]; }) - (sources."winston-3.3.3" // { - dependencies = [ - sources."is-stream-2.0.0" - ]; - }) + sources."winston-3.3.3" (sources."winston-transport-4.4.0" // { dependencies = [ sources."readable-stream-2.3.7" @@ -90586,11 +90299,7 @@ in ]; }) sources."wrappy-1.0.2" - (sources."write-file-atomic-3.0.3" // { - dependencies = [ - sources."typedarray-to-buffer-3.1.5" - ]; - }) + sources."write-file-atomic-3.0.3" sources."xdg-basedir-4.0.0" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" @@ -90601,6 +90310,7 @@ in sources."yargs-parser-18.1.3" sources."yarn-1.22.10" sources."yauzl-2.10.0" + sources."yocto-queue-0.1.0" sources."zip-stream-3.0.1" ]; buildInputs = globalBuildInputs; @@ -90728,11 +90438,11 @@ in sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" - sources."tar-6.0.5" + sources."tar-6.1.0" sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."verror-1.10.0" @@ -91109,7 +90819,7 @@ in sources."minizlib-1.3.3" sources."mkdirp-0.5.5" sources."ms-2.1.3" - sources."needle-2.5.2" + sources."needle-2.6.0" sources."nopt-4.0.3" sources."npm-bundled-1.1.1" sources."npm-normalize-package-bin-1.0.1" @@ -91155,16 +90865,16 @@ in node-red = nodeEnv.buildNodePackage { name = "node-red"; packageName = "node-red"; - version = "1.2.6"; + version = "1.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/node-red/-/node-red-1.2.6.tgz"; - sha512 = "Sy6ZNRFxN4KwT/eGFBt9L6aMXK0XGRwBNlhoFMPObSujLJVMUKHxirHAMst5CvUYigijFXM6ILRC6p/XqYHZRg=="; + url = "https://registry.npmjs.org/node-red/-/node-red-1.2.7.tgz"; + sha512 = "4ZE+Kh60pXQD/o7prg5Rdl6mlubP1wDZnKdV6TumKBdiqmDwkav5T125ZHYcs/zWMoXe/AUqHS4JDkIsg0OEIA=="; }; dependencies = [ sources."@babel/runtime-7.12.5" - sources."@node-red/editor-api-1.2.6" - sources."@node-red/editor-client-1.2.6" - (sources."@node-red/nodes-1.2.6" // { + sources."@node-red/editor-api-1.2.7" + sources."@node-red/editor-client-1.2.7" + (sources."@node-red/nodes-1.2.7" // { dependencies = [ sources."cookie-0.4.1" sources."http-errors-1.7.3" @@ -91178,9 +90888,9 @@ in }) ]; }) - sources."@node-red/registry-1.2.6" - sources."@node-red/runtime-1.2.6" - sources."@node-red/util-1.2.6" + sources."@node-red/registry-1.2.7" + sources."@node-red/runtime-1.2.7" + sources."@node-red/util-1.2.7" sources."abbrev-1.1.1" sources."accepts-1.3.7" (sources."agent-base-6.0.2" // { @@ -91208,11 +90918,11 @@ in sources."assert-plus-1.0.0" sources."async-0.1.22" sources."async-limiter-1.0.1" - sources."async-mutex-0.2.4" + sources."async-mutex-0.2.6" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" - sources."axios-0.19.2" + sources."axios-0.21.1" sources."balanced-match-1.0.0" sources."base64-js-1.5.1" (sources."basic-auth-2.0.1" // { @@ -91291,7 +91001,7 @@ in sources."deep-extend-0.6.0" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" - sources."denque-1.4.1" + sources."denque-1.5.0" sources."depd-1.1.2" sources."destroy-1.0.4" sources."detect-libc-1.0.3" @@ -91333,11 +91043,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."finalhandler-1.1.2" - (sources."follow-redirects-1.5.10" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) + sources."follow-redirects-1.13.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."forwarded-0.1.2" @@ -91439,7 +91145,7 @@ in }) sources."merge-descriptors-1.0.1" sources."methods-1.1.2" - sources."mime-2.4.6" + sources."mime-2.4.7" sources."mime-db-1.45.0" sources."mime-types-2.1.28" sources."minimatch-3.0.4" @@ -91475,10 +91181,10 @@ in }) sources."ms-2.0.0" sources."multer-1.4.2" - sources."mustache-4.0.1" + sources."mustache-4.1.0" sources."mute-stream-0.0.8" sources."nan-2.14.0" - (sources."needle-2.5.2" // { + (sources."needle-2.6.0" // { dependencies = [ sources."debug-3.2.7" sources."ms-2.1.3" @@ -91497,7 +91203,7 @@ in sources."yallist-3.1.1" ]; }) - (sources."node-red-admin-0.2.6" // { + (sources."node-red-admin-0.2.7" // { dependencies = [ sources."bcrypt-3.0.8" ]; @@ -91596,7 +91302,7 @@ in sources."strip-ansi-6.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-5.5.0" - sources."tail-2.1.1" + sources."tail-2.2.0" (sources."tar-6.0.5" // { dependencies = [ sources."mkdirp-1.0.4" @@ -91619,19 +91325,19 @@ in sources."punycode-1.4.1" ]; }) - sources."tslib-2.0.3" + sources."tslib-2.1.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."uglify-js-3.11.6" + sources."uglify-js-3.12.4" sources."uid-safe-2.1.5" sources."uid2-0.0.3" sources."unc-path-regex-0.1.2" sources."unique-stream-2.3.1" sources."universalify-0.1.2" sources."unpipe-1.0.0" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-3.4.0" @@ -91656,7 +91362,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Low-code programming for event-driven applications"; - homepage = http://nodered.org/; + homepage = https://nodered.org/; license = "Apache-2.0"; }; production = true; @@ -91666,10 +91372,10 @@ in node2nix = nodeEnv.buildNodePackage { name = "node2nix"; packageName = "node2nix"; - version = "1.8.0"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/node2nix/-/node2nix-1.8.0.tgz"; - sha512 = "v5QBcH6KxWVVRftbXdpGPIo3s0nPRcTJ56vLLbnmk0f1+32efqpI5t+fYekRys5yJPKFlXDRJCo6o8qnw581gQ=="; + url = "https://registry.npmjs.org/node2nix/-/node2nix-1.9.0.tgz"; + sha512 = "CZLF+Pu2g/eYhrIAznhKIg0i3McCXQuwd1meNb+ruiRTrNE2p5oc0RNQUKD3ZAId+JQdHKhFc+19G+wmS8g46w=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -91683,7 +91389,7 @@ in sources."aws-sign2-0.7.0" sources."aws4-1.11.0" sources."balanced-match-1.0.0" - sources."base64-js-1.3.1" + sources."base64-js-1.5.1" sources."bcrypt-pbkdf-1.0.2" sources."brace-expansion-1.1.11" sources."buffer-from-1.1.1" @@ -91747,6 +91453,7 @@ in sources."json-stringify-safe-5.0.1" sources."jsonfile-1.0.1" sources."jsprim-1.4.1" + sources."lru-cache-6.0.0" sources."mime-db-1.45.0" sources."mime-types-2.1.28" sources."minimatch-3.0.4" @@ -91806,7 +91513,7 @@ in sources."rimraf-2.6.3" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."semver-7.1.3" + sources."semver-7.3.4" sources."set-blocking-2.0.0" sources."signal-exit-3.0.3" sources."slasp-0.0.4" @@ -91824,7 +91531,7 @@ in ]; }) sources."strip-ansi-3.0.1" - (sources."tar-6.0.5" // { + (sources."tar-6.1.0" // { dependencies = [ sources."mkdirp-1.0.4" ]; @@ -91835,7 +91542,7 @@ in sources."tweetnacl-0.14.5" sources."typedarray-0.0.6" sources."uid-number-0.0.5" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."validate-npm-package-license-3.0.4" @@ -91859,10 +91566,10 @@ in nodemon = nodeEnv.buildNodePackage { name = "nodemon"; packageName = "nodemon"; - version = "2.0.6"; + version = "2.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/nodemon/-/nodemon-2.0.6.tgz"; - sha512 = "4I3YDSKXg6ltYpcnZeHompqac4E6JeAMpGm8tJnB9Y3T0ehasLa4139dJOcCrB93HHrUMsCrKtoAlXTqT5n4AQ=="; + url = "https://registry.npmjs.org/nodemon/-/nodemon-2.0.7.tgz"; + sha512 = "XHzK69Awgnec9UzHr1kc8EomQh4sjTQ8oRf8TsGrSmHDx9/UmiGG9E/mM3BuTfNeFwdNBvrqQq/RHL0xIeyFOA=="; }; dependencies = [ sources."@sindresorhus/is-0.14.0" @@ -91877,7 +91584,7 @@ in sources."ansi-styles-4.3.0" sources."anymatch-3.1.1" sources."balanced-match-1.0.0" - sources."binary-extensions-2.1.0" + sources."binary-extensions-2.2.0" sources."boxen-4.2.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" @@ -91894,7 +91601,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."chokidar-3.4.3" + sources."chokidar-3.5.1" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" sources."clone-response-1.0.2" @@ -91913,7 +91620,7 @@ in sources."end-of-stream-1.4.4" sources."escape-goat-2.1.1" sources."fill-range-7.0.1" - sources."fsevents-2.1.3" + sources."fsevents-2.3.1" sources."get-stream-4.1.0" sources."glob-parent-5.1.1" sources."global-dirs-2.1.0" @@ -92012,7 +91719,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Simple monitor script for use during development of a node.js app."; - homepage = http://nodemon.io/; + homepage = https://nodemon.io/; license = "MIT"; }; production = true; @@ -92055,7 +91762,7 @@ in sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimist-1.2.1" - sources."@types/node-14.14.20" + sources."@types/node-14.14.22" sources."@types/normalize-package-data-2.4.0" sources."@types/parse-json-4.0.0" sources."@types/responselike-1.0.0" @@ -92149,7 +91856,7 @@ in sources."escape-string-regexp-4.0.0" sources."execa-5.0.0" sources."external-editor-3.1.0" - sources."fast-glob-3.2.4" + sources."fast-glob-3.2.5" sources."fastq-1.10.0" (sources."figures-3.2.0" // { dependencies = [ @@ -92165,7 +91872,7 @@ in sources."glob-7.1.6" sources."glob-parent-5.1.1" sources."global-dirs-2.1.0" - sources."globby-11.0.1" + sources."globby-11.0.2" (sources."got-10.7.0" // { dependencies = [ sources."get-stream-5.2.0" @@ -92331,7 +92038,7 @@ in sources."mimic-fn-3.1.0" ]; }) - (sources."meow-8.1.0" // { + (sources."meow-8.1.2" // { dependencies = [ sources."type-fest-0.18.1" ]; @@ -92367,7 +92074,7 @@ in sources."mimic-fn-2.1.0" ]; }) - sources."open-7.3.0" + sources."open-7.3.1" sources."org-regex-1.0.0" sources."os-tmpdir-1.0.2" (sources."ow-0.21.0" // { @@ -92419,7 +92126,7 @@ in ]; }) sources."parent-module-1.0.1" - sources."parse-json-5.1.0" + sources."parse-json-5.2.0" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" @@ -92546,10 +92253,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "6.14.10"; + version = "6.14.11"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-6.14.10.tgz"; - sha512 = "FT23Qy/JMA+qxEYReMOr1MY7642fKn8Onn+72LASPi872Owvmw0svm+/DXTHOC3yO9CheEO+EslyXEpdBdRtIA=="; + url = "https://registry.npmjs.org/npm/-/npm-6.14.11.tgz"; + sha512 = "1Zh7LjuIoEhIyjkBflSSGzfjuPQwDlghNloppjruOH5bmj9midT9qcNT0tRUZRR04shU9ekrxNy9+UTBrqeBpQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -92564,16 +92271,23 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "10.2.5"; + version = "11.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-10.2.5.tgz"; - sha512 = "R0BN+MqE6T12k0iGivF0WKfn3tuaeQuCai0haVvmsr7GcoPXU+yrlHxl9aFlO2XZ6z4m+pCd107YnbJDcRAf8Q=="; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-11.1.1.tgz"; + sha512 = "0K2csepXxqXd3sh05qxU9BcW/pvFBatlM6E4UKKVFe6XlGjQXo4TfI5vRT4uZLG0v2Zj/bWUouQiZvEg5iAFHA=="; }; dependencies = [ + sources."@nodelib/fs.scandir-2.1.4" + sources."@nodelib/fs.stat-2.0.4" + sources."@nodelib/fs.walk-1.2.6" sources."@npmcli/ci-detect-1.3.0" sources."@npmcli/git-2.0.4" sources."@npmcli/installed-package-contents-1.0.5" - sources."@npmcli/move-file-1.0.1" + (sources."@npmcli/move-file-1.1.0" // { + dependencies = [ + sources."rimraf-2.7.1" + ]; + }) sources."@npmcli/node-gyp-1.0.1" sources."@npmcli/promise-spawn-1.3.2" sources."@npmcli/run-script-1.8.1" @@ -92598,7 +92312,8 @@ in sources."ansi-styles-4.3.0" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" - sources."argparse-1.0.10" + sources."argparse-2.0.1" + sources."array-union-2.1.0" sources."asap-2.0.6" sources."asn1-0.2.4" sources."assert-plus-1.0.0" @@ -92613,6 +92328,7 @@ in ]; }) sources."brace-expansion-1.1.11" + sources."braces-3.0.2" sources."builtins-1.0.3" sources."cacache-15.0.5" (sources."cacheable-request-6.1.0" // { @@ -92660,6 +92376,7 @@ in sources."delegates-1.0.0" sources."depd-1.1.2" sources."dezalgo-1.0.3" + sources."dir-glob-3.0.1" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.2" @@ -92670,12 +92387,14 @@ in sources."err-code-1.1.2" sources."escape-goat-2.1.1" sources."escape-string-regexp-1.0.5" - sources."esprima-4.0.1" sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" + sources."fast-glob-3.2.5" sources."fast-json-stable-stringify-2.1.0" + sources."fastq-1.10.0" sources."figgy-pudding-3.5.2" + sources."fill-range-7.0.1" sources."find-up-5.0.0" sources."forever-agent-0.6.1" sources."form-data-2.3.3" @@ -92694,11 +92413,13 @@ in sources."get-stream-4.1.0" sources."getpass-0.1.7" sources."glob-7.1.6" + sources."glob-parent-5.1.1" (sources."global-dirs-2.1.0" // { dependencies = [ sources."ini-1.3.7" ]; }) + sources."globby-11.0.2" sources."got-9.6.0" sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" @@ -92713,6 +92434,7 @@ in sources."https-proxy-agent-5.0.0" sources."humanize-ms-1.2.1" sources."iconv-lite-0.6.2" + sources."ignore-5.1.8" sources."ignore-walk-3.0.3" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" @@ -92723,10 +92445,13 @@ in sources."ini-1.3.8" sources."ip-1.1.5" sources."is-ci-2.0.0" + sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" + sources."is-glob-4.0.1" sources."is-installed-globally-0.3.2" sources."is-lambda-1.0.1" sources."is-npm-5.0.0" + sources."is-number-7.0.0" sources."is-obj-2.0.0" sources."is-path-inside-3.0.2" sources."is-typedarray-1.0.0" @@ -92735,7 +92460,7 @@ in sources."isexe-2.0.0" sources."isstream-0.1.2" sources."jju-1.4.0" - sources."js-yaml-3.14.1" + sources."js-yaml-4.0.0" sources."jsbn-0.1.1" sources."json-buffer-3.0.0" sources."json-parse-even-better-errors-2.3.1" @@ -92768,15 +92493,20 @@ in sources."semver-6.3.0" ]; }) - sources."make-fetch-happen-8.0.12" + sources."make-fetch-happen-8.0.13" + sources."map-age-cleaner-0.1.3" + sources."mem-8.0.0" + sources."merge2-1.4.1" + sources."micromatch-4.0.2" sources."mime-db-1.45.0" sources."mime-types-2.1.28" + sources."mimic-fn-3.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."minipass-3.1.3" sources."minipass-collect-1.0.2" - sources."minipass-fetch-1.3.2" + sources."minipass-fetch-1.3.3" sources."minipass-flush-1.0.5" sources."minipass-json-stream-1.0.1" sources."minipass-pipeline-1.2.4" @@ -92800,6 +92530,7 @@ in sources."object-assign-4.1.1" sources."once-1.4.0" sources."p-cancelable-1.1.0" + sources."p-defer-1.0.0" sources."p-limit-3.1.0" sources."p-locate-5.0.0" sources."p-map-4.0.0" @@ -92809,11 +92540,13 @@ in sources."semver-6.3.0" ]; }) - sources."pacote-11.1.13" + sources."pacote-11.2.3" sources."parse-github-url-1.0.2" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" + sources."path-type-4.0.0" sources."performance-now-2.1.0" + sources."picomatch-2.2.2" sources."prepend-http-2.0.0" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" @@ -92827,7 +92560,7 @@ in sources."pupa-2.1.1" sources."qs-6.5.2" sources."rc-1.2.8" - sources."rc-config-loader-3.0.0" + sources."rc-config-loader-4.0.0" sources."read-package-json-fast-1.2.1" sources."readable-stream-2.3.7" sources."readdir-scoped-modules-1.1.0" @@ -92838,7 +92571,9 @@ in sources."require-from-string-2.0.2" sources."responselike-1.0.2" sources."retry-0.10.1" + sources."reusify-1.0.4" sources."rimraf-3.0.2" + sources."run-parallel-1.1.10" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."semver-7.3.4" @@ -92851,11 +92586,11 @@ in sources."set-blocking-2.0.0" sources."signal-exit-3.0.3" sources."sisteransi-1.0.5" + sources."slash-3.0.0" sources."smart-buffer-4.1.0" sources."socks-2.5.1" sources."socks-proxy-agent-5.0.0" sources."spawn-please-1.0.0" - sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" sources."ssri-8.0.0" sources."string-width-4.2.0" @@ -92863,9 +92598,10 @@ in sources."strip-ansi-6.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" - sources."tar-6.0.5" + sources."tar-6.1.0" sources."term-size-2.2.1" sources."to-readable-stream-1.0.0" + sources."to-regex-range-5.0.1" sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" @@ -92875,7 +92611,7 @@ in sources."unique-slug-2.0.2" sources."unique-string-2.0.0" sources."update-notifier-5.0.1" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."url-parse-lax-3.0.0" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" @@ -93063,7 +92799,7 @@ in sources."tweetnacl-0.14.5" sources."underscore-1.4.4" sources."underscore.string-2.3.3" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."verror-1.10.0" @@ -93334,7 +93070,7 @@ in sources."pako-1.0.11" ]; }) - sources."browserslist-4.16.0" + sources."browserslist-4.16.1" (sources."buffer-4.9.2" // { dependencies = [ sources."isarray-1.0.0" @@ -93345,13 +93081,13 @@ in sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" sources."cache-base-1.0.1" - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."call-me-maybe-1.0.1" sources."caller-callsite-2.0.0" sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001173" + sources."caniuse-lite-1.0.30001180" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -93378,7 +93114,7 @@ in sources."convert-source-map-1.7.0" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.8.2" // { + (sources."core-js-compat-3.8.3" // { dependencies = [ sources."semver-7.0.0" ]; @@ -93472,7 +93208,7 @@ in (sources."dom-serializer-0.2.2" // { dependencies = [ sources."domelementtype-2.1.0" - sources."entities-2.1.0" + sources."entities-2.2.0" ]; }) sources."domain-browser-1.2.0" @@ -93486,7 +93222,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.634" + sources."electron-to-chromium-1.3.645" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -93496,7 +93232,7 @@ in sources."entities-1.1.2" sources."envinfo-7.7.3" sources."error-ex-1.3.2" - (sources."es-abstract-1.18.0-next.1" // { + (sources."es-abstract-1.18.0-next.2" // { dependencies = [ sources."object-inspect-1.9.0" ]; @@ -93545,7 +93281,7 @@ in sources."fsevents-1.2.13" sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.2" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.0" sources."get-port-3.2.0" sources."get-value-2.0.6" sources."getpass-0.1.7" @@ -93741,7 +93477,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-1.1.69" + sources."node-releases-1.1.70" sources."normalize-path-3.0.0" sources."normalize-url-3.3.0" sources."nth-check-1.0.2" @@ -93891,7 +93627,7 @@ in }) sources."regexpu-core-4.7.1" sources."regjsgen-0.5.2" - (sources."regjsparser-0.6.4" // { + (sources."regjsparser-0.6.6" // { dependencies = [ sources."jsesc-0.5.0" ]; @@ -94045,7 +93781,7 @@ in ]; }) sources."upath-1.2.0" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."urix-0.1.0" (sources."url-0.11.0" // { dependencies = [ @@ -94136,11 +93872,11 @@ in ]; }) sources."brace-expansion-1.1.11" - sources."bunyan-1.8.14" + sources."bunyan-1.8.15" sources."bunyan-syslog-udp-0.2.0" sources."busboy-0.3.1" sources."bytes-3.0.0" - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."camelcase-5.3.1" sources."caseless-0.12.0" sources."clarinet-0.11.0" @@ -94203,7 +93939,7 @@ in sources."gelf-stream-1.1.1" sources."gelfling-0.3.1" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.0" sources."getpass-0.1.7" sources."glob-7.1.6" sources."graceful-fs-4.2.4" @@ -94347,10 +94083,10 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" - sources."uglify-js-3.12.4" + sources."uglify-js-3.12.5" sources."unix-dgram-2.0.4" sources."unpipe-1.0.0" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-3.4.0" @@ -94358,7 +94094,7 @@ in sources."verror-1.10.0" sources."which-module-2.0.0" sources."wikimedia-langconv-0.1.0" - sources."wikipeg-2.0.3" + sources."wikipeg-2.0.5" sources."wordwrap-1.0.0" sources."worker-farm-1.7.0" sources."wrap-ansi-5.1.0" @@ -94702,7 +94438,7 @@ in sources."buffer-fill-1.0.0" sources."buffer-from-1.1.1" sources."buffer-indexof-1.1.1" - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" sources."chalk-1.1.3" @@ -94735,8 +94471,6 @@ in sources."dns-txt-2.0.2" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" - sources."es-abstract-1.17.7" - sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" sources."external-editor-2.2.0" sources."fifo-0.1.4" @@ -94751,7 +94485,7 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."get-browser-rtc-1.1.0" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.0" sources."get-stdin-4.0.1" sources."glob-7.1.6" sources."graceful-fs-4.2.4" @@ -94786,13 +94520,11 @@ in sources."ipaddr.js-2.0.0" sources."is-arguments-1.1.0" sources."is-arrayish-0.2.1" - sources."is-callable-1.2.2" sources."is-core-module-2.2.0" sources."is-date-object-1.0.2" sources."is-finite-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."is-regex-1.1.1" - sources."is-symbol-1.0.3" sources."is-utf8-0.2.1" sources."isarray-1.0.0" sources."k-bucket-0.6.0" @@ -94810,7 +94542,7 @@ in sources."magnet-uri-5.4.0" sources."map-obj-1.0.1" sources."meow-3.7.0" - sources."mime-2.4.7" + sources."mime-2.5.0" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -94827,10 +94559,8 @@ in sources."number-is-nan-1.0.1" sources."numeral-2.0.6" sources."object-assign-4.1.1" - sources."object-inspect-1.9.0" sources."object-is-1.1.4" sources."object-keys-1.1.1" - sources."object.assign-4.1.2" sources."once-1.4.0" sources."onetime-2.0.1" sources."open-0.0.5" @@ -94882,7 +94612,7 @@ in sources."read-pkg-up-1.0.1" sources."readable-stream-2.3.7" sources."redent-1.0.0" - sources."regexp.prototype.flags-1.3.0" + sources."regexp.prototype.flags-1.3.1" sources."repeating-2.0.1" sources."resolve-1.19.0" sources."restore-cursor-2.0.0" @@ -94916,8 +94646,6 @@ in sources."speedometer-0.1.4" sources."stream-buffers-2.2.0" sources."string-width-1.0.2" - sources."string.prototype.trimend-1.0.3" - sources."string.prototype.trimstart-1.0.3" (sources."string2compact-1.3.0" // { dependencies = [ sources."ipaddr.js-1.9.1" @@ -95264,7 +94992,7 @@ in sources."ws-2.3.1" ]; }) - (sources."socket.io-2.4.0" // { + (sources."socket.io-2.4.1" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.3" @@ -95275,7 +95003,7 @@ in dependencies = [ sources."debug-3.1.0" sources."isarray-2.0.1" - sources."socket.io-parser-3.3.1" + sources."socket.io-parser-3.3.2" ]; }) (sources."socket.io-parser-3.4.1" // { @@ -95313,7 +95041,7 @@ in sources."ultron-1.1.1" sources."uniq-1.0.1" sources."unpipe-1.0.0" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."utp-0.0.7" @@ -95389,10 +95117,9 @@ in sources."tslib-1.9.3" ]; }) - (sources."@pm2/js-api-0.6.1" // { + (sources."@pm2/js-api-0.6.7" // { dependencies = [ sources."async-2.6.3" - sources."debug-3.2.7" sources."eventemitter2-6.4.3" ]; }) @@ -95416,9 +95143,9 @@ in sources."semver-5.7.1" ]; }) - sources."axios-0.19.2" + sources."axios-0.21.1" sources."balanced-match-1.0.0" - sources."binary-extensions-2.1.0" + sources."binary-extensions-2.2.0" sources."blessed-0.1.81" sources."brace-expansion-1.1.11" sources."braces-3.0.2" @@ -95426,7 +95153,7 @@ in sources."bytes-3.1.0" sources."chalk-3.0.0" sources."charm-0.1.2" - sources."chokidar-3.4.3" + sources."chokidar-3.5.1" sources."cli-tableau-2.0.1" sources."co-4.6.0" sources."color-convert-2.0.1" @@ -95466,14 +95193,9 @@ in sources."fclone-1.0.11" sources."file-uri-to-path-1.0.0" sources."fill-range-7.0.1" - (sources."follow-redirects-1.5.10" // { - dependencies = [ - sources."debug-3.1.0" - sources."ms-2.0.0" - ]; - }) + sources."follow-redirects-1.13.2" sources."fs.realpath-1.0.0" - sources."fsevents-2.1.3" + sources."fsevents-2.3.1" (sources."ftp-0.3.10" // { dependencies = [ sources."readable-stream-1.1.14" @@ -95599,11 +95321,11 @@ in sources."statuses-1.5.0" sources."string_decoder-0.10.31" sources."supports-color-7.2.0" - sources."systeminformation-4.34.2" + sources."systeminformation-4.34.9" sources."thunkify-2.1.2" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" - sources."tslib-2.0.3" + sources."tslib-2.1.0" sources."tv4-1.3.0" sources."type-check-0.3.2" sources."unpipe-1.0.0" @@ -95624,7 +95346,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Production process manager for Node.JS applications with a built-in load balancer."; - homepage = http://pm2.keymetrics.io/; + homepage = https://pm2.keymetrics.io/; license = "AGPL-3.0"; }; production = true; @@ -95634,10 +95356,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "5.14.3"; + version = "5.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-5.14.3.tgz"; - sha512 = "PFjHFWCsHgaNCpOwOAgN6H71PA8td8PnwSE1ArXz//OyfdfIwws1s23XLmokhHcnE3JsBSiIR3NOW8JZ5QcxlQ=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-5.16.0.tgz"; + sha512 = "f7bNVvYGK24eiZ5gYX4wKOSohg6kIybEhrprHqUtFsP3TfttGSLqid1OTzLvVzwVp58QBj9ifOVwRQ+RiSmE0A=="; }; buildInputs = globalBuildInputs; meta = { @@ -95707,11 +95429,11 @@ in sources."anymatch-3.1.1" sources."array-union-2.1.0" sources."at-least-node-1.0.0" - sources."binary-extensions-2.1.0" + sources."binary-extensions-2.2.0" sources."braces-3.0.2" sources."callsites-3.1.0" sources."chalk-4.1.0" - sources."chokidar-3.4.3" + sources."chokidar-3.5.1" sources."cliui-7.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -95723,15 +95445,15 @@ in sources."error-ex-1.3.2" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" - sources."fast-glob-3.2.4" + sources."fast-glob-3.2.5" sources."fastq-1.10.0" sources."fill-range-7.0.1" - sources."fs-extra-9.0.1" - sources."fsevents-2.1.3" + sources."fs-extra-9.1.0" + sources."fsevents-2.3.1" sources."get-caller-file-2.0.5" sources."get-stdin-8.0.0" sources."glob-parent-5.1.1" - sources."globby-11.0.1" + sources."globby-11.0.2" sources."graceful-fs-4.2.4" sources."has-flag-4.0.0" sources."ignore-5.1.8" @@ -95750,11 +95472,7 @@ in sources."is-number-7.0.0" sources."js-tokens-4.0.0" sources."json-parse-even-better-errors-2.3.1" - (sources."jsonfile-6.1.0" // { - dependencies = [ - sources."universalify-2.0.0" - ]; - }) + sources."jsonfile-6.1.0" sources."lines-and-columns-1.1.6" sources."lodash.difference-4.5.0" sources."lodash.forown-4.4.0" @@ -95765,7 +95483,7 @@ in sources."micromatch-4.0.2" sources."normalize-path-3.0.0" sources."parent-module-1.0.1" - sources."parse-json-5.1.0" + sources."parse-json-5.2.0" sources."path-type-4.0.0" sources."picomatch-2.2.2" sources."pify-2.3.0" @@ -95783,7 +95501,7 @@ in sources."strip-ansi-6.0.0" sources."supports-color-7.2.0" sources."to-regex-range-5.0.1" - sources."universalify-1.0.0" + sources."universalify-2.0.0" sources."wrap-ansi-7.0.0" sources."y18n-5.0.5" sources."yaml-1.10.0" @@ -96153,10 +95871,10 @@ in purescript-psa = nodeEnv.buildNodePackage { name = "purescript-psa"; packageName = "purescript-psa"; - version = "0.8.0"; + version = "0.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/purescript-psa/-/purescript-psa-0.8.0.tgz"; - sha512 = "N76JjHcBbJMf4/rs8dnCniFi7TL9iBbV0BycXuwEtSYnmiaogng0tFmnliqubQyZ5FpDU9ET8Bq1NjH3Hmx5PA=="; + url = "https://registry.npmjs.org/purescript-psa/-/purescript-psa-0.8.2.tgz"; + sha512 = "4Olf0aQQrNCfcDLXQI3gJgINEQ+3U+4QPLmQ2LHX2L/YOXSwM7fOGIUs/wMm/FQnwERUyQmHKQTJKB4LIjE2fg=="; }; buildInputs = globalBuildInputs; meta = { @@ -96189,10 +95907,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.99"; + version = "1.1.105"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.99.tgz"; - sha512 = "DAfK8uVLGF1nuBeFvEXhvApCecuHEpe8ncjnFW/WsBBIQ5JOsjjpwlUDvTutNjkoH9QCTqvg72g6ip9PdWFL/w=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.105.tgz"; + sha512 = "X0V7v/Ub3X0sP76kjfLlQI5e/yLNcx4eh70+p+WSXz/ahChNWQEr3flb3ReRmuUVOt9FCYcrt8Fpw5oICGoIug=="; }; buildInputs = globalBuildInputs; meta = { @@ -96441,22 +96159,22 @@ in sources."available-typed-arrays-1.0.2" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."chalk-1.1.3" sources."colors-0.6.2" sources."concat-map-0.0.1" sources."cycle-1.0.3" sources."deep-equal-2.0.5" sources."define-properties-1.1.3" - sources."es-abstract-1.17.7" - sources."es-get-iterator-1.1.1" + sources."es-abstract-1.18.0-next.2" + sources."es-get-iterator-1.1.2" sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" sources."eyes-0.1.8" sources."foreach-2.0.5" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.0" sources."glob-7.1.6" sources."has-1.0.3" sources."has-ansi-2.0.0" @@ -96476,11 +96194,7 @@ in sources."is-set-2.0.2" sources."is-string-1.0.5" sources."is-symbol-1.0.3" - (sources."is-typed-array-1.1.4" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) + sources."is-typed-array-1.1.4" sources."is-weakmap-2.0.1" sources."is-weakset-2.0.1" sources."isarray-2.0.5" @@ -96499,7 +96213,7 @@ in sources."pkginfo-0.4.1" sources."prompt-0.2.14" sources."read-1.0.7" - sources."regexp.prototype.flags-1.3.0" + sources."regexp.prototype.flags-1.3.1" sources."revalidator-0.1.8" sources."rimraf-2.7.1" sources."semver-5.7.1" @@ -96512,11 +96226,7 @@ in sources."utile-0.2.1" sources."which-boxed-primitive-1.0.2" sources."which-collection-1.0.1" - (sources."which-typed-array-1.1.4" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) + sources."which-typed-array-1.1.4" (sources."winston-0.8.3" // { dependencies = [ sources."pkginfo-0.3.1" @@ -96591,18 +96301,20 @@ in readability-cli = nodeEnv.buildNodePackage { name = "readability-cli"; packageName = "readability-cli"; - version = "1.2.1"; + version = "2.0.0-pre.3"; src = fetchurl { - url = "https://registry.npmjs.org/readability-cli/-/readability-cli-1.2.1.tgz"; - sha512 = "oS0m68Y02lcMnrCYh3loRj3o8pGjhBAk8petnaJuvvE6eif3bjj60mTByFhZTlYRWNLuQaq/Yqe8Wk0yFI2wdQ=="; + url = "https://registry.npmjs.org/readability-cli/-/readability-cli-2.0.0-pre.3.tgz"; + sha512 = "5mM386/n+egp7fs8L+xrC+pz0XJSCgF1I3McfzmTiIL7V/m+eJIIfStvqko4JzGD1x3StgPZoNJ8xIyXQFyWDA=="; }; dependencies = [ - sources."@mozilla/readability-0.3.0" + sources."@mozilla/readability-0.4.1" sources."abab-2.0.5" sources."acorn-7.4.1" sources."acorn-globals-6.0.0" sources."acorn-walk-7.2.0" sources."ajv-6.12.6" + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.3.0" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" @@ -96611,6 +96323,9 @@ in sources."bcrypt-pbkdf-1.0.2" sources."browser-process-hrtime-1.0.0" sources."caseless-0.12.0" + sources."cliui-7.0.4" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."combined-stream-1.0.8" sources."core-util-is-1.0.2" sources."cssom-0.4.4" @@ -96629,7 +96344,10 @@ in sources."webidl-conversions-5.0.0" ]; }) + sources."dompurify-2.2.6" sources."ecc-jsbn-0.1.2" + sources."emoji-regex-8.0.0" + sources."escalade-3.1.1" sources."escodegen-1.14.3" sources."esprima-4.0.1" sources."estraverse-4.3.0" @@ -96641,6 +96359,7 @@ in sources."fast-levenshtein-2.0.6" sources."forever-agent-0.6.1" sources."form-data-2.3.3" + sources."get-caller-file-2.0.5" sources."getpass-0.1.7" sources."har-schema-2.0.0" sources."har-validator-5.1.5" @@ -96648,6 +96367,7 @@ in sources."http-signature-1.2.0" sources."iconv-lite-0.4.24" sources."ip-regex-2.1.0" + sources."is-fullwidth-code-point-3.0.0" sources."is-potential-custom-element-name-1.0.0" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" @@ -96662,7 +96382,6 @@ in sources."lodash.sortby-4.7.0" sources."mime-db-1.45.0" sources."mime-types-2.1.28" - sources."minimist-1.2.5" sources."nwsapi-2.2.0" sources."oauth-sign-0.9.0" sources."optionator-0.8.3" @@ -96683,19 +96402,22 @@ in sources."tough-cookie-2.5.0" ]; }) + sources."require-directory-2.1.1" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."saxes-5.0.1" sources."source-map-0.6.1" sources."sshpk-1.16.1" sources."stealthy-require-1.1.1" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" sources."symbol-tree-3.2.4" sources."tough-cookie-3.0.1" sources."tr46-2.0.2" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."uuid-3.4.0" sources."verror-1.10.0" sources."w3c-hr-time-1.0.2" @@ -96705,9 +96427,13 @@ in sources."whatwg-mimetype-2.3.0" sources."whatwg-url-8.4.0" sources."word-wrap-1.2.3" + sources."wrap-ansi-7.0.0" sources."ws-7.4.2" sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" + sources."y18n-5.0.5" + sources."yargs-git://github.com/gardenappl/yargs" + sources."yargs-parser-20.2.4" ]; buildInputs = globalBuildInputs; meta = { @@ -96752,7 +96478,7 @@ in sources."@emotion/unitless-0.7.5" sources."@exodus/schemasafe-1.0.0-rc.3" sources."@redocly/react-dropdown-aria-2.0.11" - sources."@types/node-13.13.39" + sources."@types/node-13.13.40" sources."ajv-5.5.2" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" @@ -96772,7 +96498,7 @@ in sources."babel-plugin-syntax-jsx-6.18.0" sources."base64-js-1.5.1" sources."better-ajv-errors-0.6.7" - sources."binary-extensions-2.1.0" + sources."binary-extensions-2.2.0" sources."bn.js-5.1.3" sources."braces-3.0.2" sources."brorand-1.1.0" @@ -96798,7 +96524,7 @@ in sources."camelcase-5.3.1" sources."camelize-1.0.0" sources."chalk-2.4.2" - sources."chokidar-3.4.3" + sources."chokidar-3.5.1" sources."cipher-base-1.0.4" sources."classnames-2.2.6" sources."clipboard-2.0.6" @@ -96810,7 +96536,7 @@ in sources."color-name-1.1.3" sources."console-browserify-1.2.0" sources."constants-browserify-1.0.0" - sources."core-js-3.8.2" + sources."core-js-3.8.3" sources."core-util-is-1.0.2" (sources."create-ecdh-4.0.4" // { dependencies = [ @@ -96854,7 +96580,7 @@ in sources."find-up-4.1.0" sources."foreach-2.0.5" sources."format-util-1.0.5" - sources."fsevents-2.1.3" + sources."fsevents-2.3.1" sources."get-caller-file-2.0.5" sources."glob-parent-5.1.1" sources."globals-11.12.0" @@ -96911,9 +96637,9 @@ in sources."minimalistic-crypto-utils-1.0.1" sources."minimist-1.2.5" sources."mkdirp-1.0.4" - sources."mobx-6.0.4" - sources."mobx-react-7.0.5" - sources."mobx-react-lite-3.1.6" + sources."mobx-6.0.5" + sources."mobx-react-7.0.6" + sources."mobx-react-lite-3.1.7" sources."ms-2.1.2" sources."neo-async-2.6.2" sources."node-fetch-h2-2.3.0" @@ -96922,7 +96648,7 @@ in sources."normalize-path-3.0.0" sources."oas-kit-common-1.0.8" sources."oas-linter-3.2.1" - (sources."oas-resolver-2.5.3" // { + (sources."oas-resolver-2.5.4" // { dependencies = [ sources."yargs-16.2.0" ]; @@ -96973,7 +96699,7 @@ in }) sources."readdirp-3.5.0" sources."redoc-2.0.0-rc.48" - sources."reftools-1.1.7" + sources."reftools-1.1.8" sources."regenerator-runtime-0.13.7" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" @@ -97009,9 +96735,9 @@ in sources."to-arraybuffer-1.0.1" sources."to-fast-properties-2.0.0" sources."to-regex-range-5.0.1" - sources."tslib-2.0.3" + sources."tslib-2.1.0" sources."tty-browserify-0.0.0" - sources."uglify-js-3.12.4" + sources."uglify-js-3.12.5" (sources."url-0.11.0" // { dependencies = [ sources."punycode-1.3.2" @@ -97081,10 +96807,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.36.0"; + version = "2.38.0"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.36.0.tgz"; - sha512 = "L38QyQK77bkJy9nPyeydnHFK6xMofqumh4scTV2d4RG4EFq6pGdxnn67dVHFUDJ9J0PSEQx8zn1FiVS5TydsKg=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.38.0.tgz"; + sha512 = "ay9zDiNitZK/LNE/EM2+v5CZ7drkB2xyDljvb1fQJCGnq43ZWRkhxN145oV8GmoW1YNi4sA/1Jdkr2LfawJoXw=="; }; dependencies = [ sources."fsevents-2.1.3" @@ -97112,7 +96838,7 @@ in sources."chalk-2.4.2" ]; }) - (sources."@eslint/eslintrc-0.2.2" // { + (sources."@eslint/eslintrc-0.3.0" // { dependencies = [ sources."ignore-4.0.6" ]; @@ -97121,32 +96847,33 @@ in sources."@nodelib/fs.stat-2.0.4" sources."@nodelib/fs.walk-1.2.6" sources."@rollup/plugin-commonjs-17.0.0" - sources."@rollup/plugin-node-resolve-11.0.1" + sources."@rollup/plugin-node-resolve-11.1.0" (sources."@rollup/pluginutils-3.1.0" // { dependencies = [ sources."estree-walker-1.0.1" ]; }) + sources."@tootallnate/once-1.1.2" sources."@types/estree-0.0.39" sources."@types/glob-7.1.3" - sources."@types/json-schema-7.0.6" + sources."@types/json-schema-7.0.7" sources."@types/minimatch-3.0.3" sources."@types/mocha-8.2.0" sources."@types/node-12.12.70" - sources."@types/node-fetch-2.5.7" + sources."@types/node-fetch-2.5.8" sources."@types/resolve-1.17.1" sources."@types/vscode-1.52.0" - sources."@typescript-eslint/eslint-plugin-4.12.0" - sources."@typescript-eslint/experimental-utils-4.12.0" - sources."@typescript-eslint/parser-4.12.0" - sources."@typescript-eslint/scope-manager-4.12.0" - sources."@typescript-eslint/types-4.12.0" - sources."@typescript-eslint/typescript-estree-4.12.0" - sources."@typescript-eslint/visitor-keys-4.12.0" + sources."@typescript-eslint/eslint-plugin-4.14.1" + sources."@typescript-eslint/experimental-utils-4.14.1" + sources."@typescript-eslint/parser-4.14.1" + sources."@typescript-eslint/scope-manager-4.14.1" + sources."@typescript-eslint/types-4.14.1" + sources."@typescript-eslint/typescript-estree-4.14.1" + sources."@typescript-eslint/visitor-keys-4.14.1" sources."@ungap/promise-all-settled-1.1.2" sources."acorn-7.4.1" sources."acorn-jsx-5.3.1" - sources."agent-base-4.3.0" + sources."agent-base-6.0.2" sources."ajv-6.12.6" sources."ansi-colors-4.1.1" sources."ansi-regex-5.0.0" @@ -97158,15 +96885,21 @@ in sources."asynckit-0.4.0" sources."azure-devops-node-api-7.2.0" sources."balanced-match-1.0.0" - sources."binary-extensions-2.1.0" + sources."big-integer-1.6.48" + sources."binary-0.3.0" + sources."binary-extensions-2.2.0" + sources."bluebird-3.4.7" sources."boolbase-1.0.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."browser-stdout-1.3.1" sources."buffer-crc32-0.2.13" + sources."buffer-indexof-polyfill-1.0.2" + sources."buffers-0.1.1" sources."builtin-modules-3.2.0" sources."callsites-3.1.0" sources."camelcase-5.3.1" + sources."chainsaw-0.1.0" (sources."chalk-4.1.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -97195,6 +96928,7 @@ in sources."commandpost-1.4.0" sources."commondir-1.0.1" sources."concat-map-0.0.1" + sources."core-util-is-1.0.2" sources."cross-spawn-7.0.3" sources."css-select-3.1.2" sources."css-what-4.0.0" @@ -97211,6 +96945,7 @@ in sources."domelementtype-2.1.0" sources."domhandler-4.0.0" sources."domutils-2.4.4" + sources."duplexer2-0.1.4" (sources."editorconfig-0.15.3" // { dependencies = [ sources."lru-cache-4.1.5" @@ -97221,10 +96956,8 @@ in sources."emoji-regex-8.0.0" sources."enquirer-2.3.6" sources."entities-2.1.0" - sources."es6-promise-4.2.8" - sources."es6-promisify-5.0.0" sources."escape-string-regexp-1.0.5" - (sources."eslint-7.17.0" // { + (sources."eslint-7.18.0" // { dependencies = [ sources."ignore-4.0.6" ]; @@ -97256,7 +96989,7 @@ in sources."estree-walker-2.0.2" sources."esutils-2.0.3" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.4" + sources."fast-glob-3.2.5" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fastq-1.10.0" @@ -97266,33 +96999,30 @@ in sources."find-up-5.0.0" sources."flat-5.0.2" sources."flat-cache-3.0.4" - sources."flatted-3.1.0" + sources."flatted-3.1.1" sources."form-data-3.0.0" sources."fs.realpath-1.0.0" sources."fsevents-2.1.3" + (sources."fstream-1.0.12" // { + dependencies = [ + sources."rimraf-2.7.1" + ]; + }) sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" sources."get-caller-file-2.0.5" sources."glob-7.1.6" sources."glob-parent-5.1.1" sources."globals-12.4.0" - sources."globby-11.0.1" + sources."globby-11.0.2" + sources."graceful-fs-4.2.4" sources."growl-1.10.5" sources."has-1.0.3" sources."has-flag-3.0.0" sources."he-1.2.0" sources."htmlparser2-6.0.0" - (sources."http-proxy-agent-2.1.0" // { - dependencies = [ - sources."debug-3.1.0" - sources."ms-2.0.0" - ]; - }) - (sources."https-proxy-agent-2.2.4" // { - dependencies = [ - sources."debug-3.2.7" - ]; - }) + sources."http-proxy-agent-4.0.1" + sources."https-proxy-agent-5.0.0" sources."ignore-5.1.8" sources."import-fresh-3.3.0" sources."imurmurhash-0.1.4" @@ -97307,6 +97037,7 @@ in sources."is-number-7.0.0" sources."is-plain-obj-2.1.0" sources."is-reference-1.2.1" + sources."isarray-1.0.0" sources."isexe-2.0.0" sources."js-tokens-4.0.0" sources."js-yaml-3.14.1" @@ -97315,6 +97046,7 @@ in sources."leven-3.1.0" sources."levn-0.4.1" sources."linkify-it-2.2.0" + sources."listenercount-1.0.1" sources."locate-path-6.0.0" sources."lodash-4.17.20" sources."log-symbols-4.0.0" @@ -97332,6 +97064,8 @@ in sources."mime-db-1.45.0" sources."mime-types-2.1.28" sources."minimatch-3.0.4" + sources."minimist-1.2.5" + sources."mkdirp-0.5.5" (sources."mocha-8.2.1" // { dependencies = [ sources."debug-4.2.0" @@ -97373,11 +97107,17 @@ in sources."pend-1.2.0" sources."picomatch-2.2.2" sources."prelude-ls-1.2.1" + sources."process-nextick-args-2.0.1" sources."progress-2.0.3" sources."pseudomap-1.0.2" sources."punycode-2.1.1" sources."randombytes-2.1.0" sources."read-1.0.7" + (sources."readable-stream-2.3.7" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."readdirp-3.5.0" sources."regexpp-3.1.0" sources."require-directory-2.1.1" @@ -97387,12 +97127,13 @@ in sources."resolve-from-4.0.0" sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."rollup-2.36.0" + sources."rollup-2.38.0" sources."run-parallel-1.1.10" sources."safe-buffer-5.2.1" sources."semver-7.3.4" sources."serialize-javascript-5.0.1" sources."set-blocking-2.0.0" + sources."setimmediate-1.0.5" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."sigmund-1.0.1" @@ -97407,6 +97148,11 @@ in sources."sourcemap-codec-1.4.8" sources."sprintf-js-1.0.3" sources."string-width-4.2.0" + (sources."string_decoder-1.1.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."strip-ansi-6.0.0" sources."strip-json-comments-3.1.1" sources."supports-color-5.5.0" @@ -97419,8 +97165,9 @@ in sources."text-table-0.2.0" sources."tmp-0.0.29" sources."to-regex-range-5.0.1" - sources."tslib-2.0.3" - (sources."tsutils-3.18.0" // { + sources."traverse-0.3.9" + sources."tslib-2.1.0" + (sources."tsutils-3.20.0" // { dependencies = [ sources."tslib-1.14.1" ]; @@ -97433,10 +97180,12 @@ in sources."typescript-formatter-7.2.2" sources."uc.micro-1.0.6" sources."underscore-1.8.3" - sources."uri-js-4.4.0" + sources."unzipper-0.10.11" + sources."uri-js-4.4.1" sources."url-join-1.1.0" + sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.2.0" - (sources."vsce-1.83.0" // { + (sources."vsce-1.84.0" // { dependencies = [ sources."chalk-2.4.2" sources."commander-6.2.1" @@ -97447,11 +97196,7 @@ in sources."vscode-languageclient-7.0.0" sources."vscode-languageserver-protocol-3.16.0" sources."vscode-languageserver-types-3.16.0" - (sources."vscode-test-1.4.1" // { - dependencies = [ - sources."rimraf-2.7.1" - ]; - }) + sources."vscode-test-1.5.0" sources."which-2.0.2" sources."which-module-2.0.0" (sources."wide-align-1.1.3" // { @@ -97626,7 +97371,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."uid2-0.0.3" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."util-0.4.9" sources."uuid-3.4.0" sources."verror-1.10.0" @@ -97643,18 +97388,18 @@ in sass = nodeEnv.buildNodePackage { name = "sass"; packageName = "sass"; - version = "1.32.0"; + version = "1.32.5"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.32.0.tgz"; - sha512 = "fhyqEbMIycQA4blrz/C0pYhv2o4x2y6FYYAH0CshBw3DXh5D5wyERgxw0ptdau1orc/GhNrhF7DFN2etyOCEng=="; + url = "https://registry.npmjs.org/sass/-/sass-1.32.5.tgz"; + sha512 = "kU1yJ5zUAmPxr7f3q0YXTAd1oZjSR1g3tYyv+xu0HZSl5JiNOaE987eiz7wCUvbm4I9fGWGU2TgApTtcP4GMNQ=="; }; dependencies = [ sources."anymatch-3.1.1" - sources."binary-extensions-2.1.0" + sources."binary-extensions-2.2.0" sources."braces-3.0.2" - sources."chokidar-3.4.3" + sources."chokidar-3.5.1" sources."fill-range-7.0.1" - sources."fsevents-2.1.3" + sources."fsevents-2.3.1" sources."glob-parent-5.1.1" sources."is-binary-path-2.1.0" sources."is-extglob-2.1.1" @@ -97787,7 +97532,7 @@ in sources."supports-color-5.5.0" sources."term-size-1.2.0" sources."update-check-1.5.2" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."vary-1.1.2" sources."which-1.3.1" sources."widest-line-2.0.1" @@ -97806,10 +97551,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "2.17.0"; + version = "2.21.1"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-2.17.0.tgz"; - sha512 = "OVlrvBESW0aQB3G/SrZQ3WFmALhHRU9qUJ/LLoyFlpddAY4hr0APOixWehiHvf4aI7Vuo04lP9zffttjhviOPA=="; + url = "https://registry.npmjs.org/serverless/-/serverless-2.21.1.tgz"; + sha512 = "nL1iWlOoa91eWfcN8nO7PyIfZC5gibSxtB4V+ipVxIywxlVK19hNetkWus5vI7+399FN3fcCEZEbH89/+GiY6w=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -97841,23 +97586,49 @@ in ]; }) sources."@serverless/component-metrics-1.0.8" - (sources."@serverless/components-3.4.3" // { + (sources."@serverless/components-3.5.1" // { dependencies = [ + (sources."@serverless/utils-2.2.0" // { + dependencies = [ + sources."js-yaml-4.0.0" + ]; + }) sources."ansi-regex-5.0.0" + sources."argparse-2.0.1" + (sources."js-yaml-3.14.1" // { + dependencies = [ + sources."argparse-1.0.10" + ]; + }) sources."ramda-0.27.1" sources."strip-ansi-6.0.0" + sources."write-file-atomic-3.0.3" ]; }) (sources."@serverless/core-1.1.2" // { dependencies = [ sources."fs-extra-7.0.1" + sources."js-yaml-3.14.1" sources."semver-6.3.0" ]; }) - sources."@serverless/enterprise-plugin-4.4.1" + (sources."@serverless/enterprise-plugin-4.4.2" // { + dependencies = [ + sources."js-yaml-3.14.1" + ]; + }) sources."@serverless/event-mocks-1.1.1" - sources."@serverless/platform-client-3.1.4" - sources."@serverless/platform-client-china-2.0.9" + (sources."@serverless/platform-client-3.9.1" // { + dependencies = [ + sources."js-yaml-3.14.1" + ]; + }) + (sources."@serverless/platform-client-china-2.1.3" // { + dependencies = [ + sources."adm-zip-0.5.2" + sources."js-yaml-3.14.1" + ]; + }) (sources."@serverless/platform-sdk-2.3.2" // { dependencies = [ sources."chalk-2.4.2" @@ -97871,14 +97642,12 @@ in ]; }) sources."@serverless/template-1.1.4" - (sources."@serverless/utils-2.2.0" // { + (sources."@serverless/utils-3.0.0" // { dependencies = [ - sources."argparse-2.0.1" - sources."js-yaml-4.0.0" sources."write-file-atomic-3.0.3" ]; }) - sources."@serverless/utils-china-1.0.12" + sources."@serverless/utils-china-1.0.14" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@tencent-sdk/capi-1.1.8" @@ -97886,9 +97655,9 @@ in sources."@types/caseless-0.12.2" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/lodash-4.14.167" + sources."@types/lodash-4.14.168" sources."@types/long-4.0.1" - sources."@types/node-14.14.20" + sources."@types/node-14.14.22" sources."@types/request-2.48.5" sources."@types/request-promise-native-1.0.17" sources."@types/responselike-1.0.0" @@ -97915,7 +97684,7 @@ in sources."file-type-4.4.0" ]; }) - (sources."archiver-5.1.0" // { + (sources."archiver-5.2.0" // { dependencies = [ sources."async-3.2.0" sources."bl-4.0.3" @@ -97945,7 +97714,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.821.0" // { + (sources."aws-sdk-2.831.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -97954,14 +97723,14 @@ in }) sources."aws-sign2-0.7.0" sources."aws4-1.11.0" - sources."axios-0.19.2" + sources."axios-0.21.1" sources."backo2-1.0.2" sources."balanced-match-1.0.0" sources."base64-arraybuffer-0.1.4" sources."base64-js-1.5.1" sources."bcrypt-pbkdf-1.0.2" sources."binary-0.3.0" - sources."binary-extensions-2.1.0" + sources."binary-extensions-2.2.0" sources."bindings-1.5.0" (sources."bl-2.2.1" // { dependencies = [ @@ -97979,19 +97748,13 @@ in }) sources."blob-0.0.5" sources."bluebird-3.7.2" - (sources."boxen-4.2.0" // { + (sources."boxen-5.0.0" // { dependencies = [ sources."ansi-regex-5.0.0" - sources."ansi-styles-4.3.0" - sources."chalk-3.0.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" sources."is-fullwidth-code-point-3.0.0" sources."string-width-4.2.0" sources."strip-ansi-6.0.0" - sources."supports-color-7.2.0" - sources."type-fest-0.8.1" + sources."type-fest-0.20.2" ]; }) sources."brace-expansion-1.1.11" @@ -98013,7 +97776,7 @@ in ]; }) sources."cachedir-2.3.0" - sources."camelcase-5.3.1" + sources."camelcase-6.2.0" sources."caseless-0.12.0" (sources."chainsaw-0.1.0" // { dependencies = [ @@ -98031,7 +97794,7 @@ in }) sources."chardet-0.7.0" sources."child-process-ext-2.1.1" - sources."chokidar-3.4.3" + sources."chokidar-3.5.1" sources."chownr-1.1.4" sources."cli-boxes-2.2.1" (sources."cli-color-2.0.0" // { @@ -98078,8 +97841,8 @@ in ]; }) sources."dashdash-1.14.1" - sources."dayjs-1.10.1" - sources."debug-3.1.0" + sources."dayjs-1.10.4" + sources."debug-2.6.9" sources."decode-uri-component-0.2.0" sources."decompress-4.2.1" sources."decompress-response-3.3.0" @@ -98141,7 +97904,11 @@ in sources."emoji-regex-8.0.0" sources."enabled-1.0.2" sources."end-of-stream-1.4.4" - sources."engine.io-client-3.5.0" + (sources."engine.io-client-3.5.0" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) sources."engine.io-parser-2.2.1" sources."env-variable-0.0.6" sources."es5-ext-0.10.53" @@ -98169,7 +97936,7 @@ in sources."external-editor-3.1.0" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.4" + sources."fast-glob-3.2.5" sources."fast-json-stable-stringify-2.1.0" sources."fast-safe-stringify-2.0.7" sources."fastest-levenshtein-1.0.12" @@ -98185,7 +97952,7 @@ in sources."fill-range-7.0.1" sources."find-requires-1.0.0" sources."flat-5.0.2" - sources."follow-redirects-1.5.10" + sources."follow-redirects-1.13.2" sources."forever-agent-0.6.1" sources."form-data-2.5.1" sources."formidable-1.2.2" @@ -98197,20 +97964,16 @@ in ]; }) sources."fs-constants-1.0.0" - (sources."fs-extra-9.0.1" // { + (sources."fs-extra-9.1.0" // { dependencies = [ - (sources."jsonfile-6.1.0" // { - dependencies = [ - sources."universalify-2.0.0" - ]; - }) - sources."universalify-1.0.0" + sources."jsonfile-6.1.0" + sources."universalify-2.0.0" ]; }) sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."fs2-0.3.9" - sources."fsevents-2.1.3" + sources."fsevents-2.3.1" (sources."gauge-2.7.4" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -98223,7 +97986,7 @@ in sources."github-from-package-0.0.0" sources."glob-7.1.6" sources."glob-parent-5.1.1" - sources."globby-11.0.1" + sources."globby-11.0.2" (sources."got-11.8.1" // { dependencies = [ sources."@sindresorhus/is-4.0.0" @@ -98304,13 +98067,18 @@ in sources."isstream-0.1.2" sources."isurl-1.0.0" sources."jmespath-0.15.0" - sources."js-yaml-3.14.1" + (sources."js-yaml-4.0.0" // { + dependencies = [ + sources."argparse-2.0.1" + ]; + }) sources."jsbn-0.1.1" sources."json-buffer-3.0.0" sources."json-cycle-1.3.0" (sources."json-refs-3.0.15" // { dependencies = [ sources."commander-4.1.1" + sources."js-yaml-3.14.1" ]; }) sources."json-schema-0.2.3" @@ -98328,7 +98096,6 @@ in sources."jwt-decode-2.2.0" (sources."kafka-node-5.0.0" // { dependencies = [ - sources."debug-2.6.9" sources."uuid-3.4.0" ]; }) @@ -98367,7 +98134,11 @@ in sources."pify-3.0.0" ]; }) - sources."memoizee-0.4.14" + (sources."memoizee-0.4.15" // { + dependencies = [ + sources."next-tick-1.1.0" + ]; + }) sources."merge2-1.4.1" sources."methods-1.1.2" sources."micromatch-4.0.2" @@ -98410,7 +98181,7 @@ in sources."once-1.4.0" sources."one-time-0.0.4" sources."onetime-5.1.2" - sources."open-7.3.0" + sources."open-7.3.1" (sources."opn-5.5.0" // { dependencies = [ sources."is-wsl-1.1.0" @@ -98456,7 +98227,7 @@ in sources."promise-queue-2.2.5" (sources."protobufjs-6.10.2" // { dependencies = [ - sources."@types/node-13.13.39" + sources."@types/node-13.13.40" sources."long-4.0.0" ]; }) @@ -98492,6 +98263,7 @@ in sources."reusify-1.0.4" sources."run-async-2.4.1" sources."run-parallel-1.1.10" + sources."run-parallel-limit-1.0.6" sources."rxjs-6.6.3" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" @@ -98515,9 +98287,14 @@ in sources."simple-swizzle-0.2.2" sources."slash-3.0.0" sources."snappy-6.3.5" - sources."socket.io-client-2.4.0" - (sources."socket.io-parser-3.3.1" // { + (sources."socket.io-client-2.4.0" // { dependencies = [ + sources."debug-3.1.0" + ]; + }) + (sources."socket.io-parser-3.3.2" // { + dependencies = [ + sources."debug-3.1.0" sources."isarray-2.0.1" ]; }) @@ -98547,6 +98324,8 @@ in sources."strip-outer-1.0.1" (sources."superagent-3.8.3" // { dependencies = [ + sources."debug-3.2.7" + sources."ms-2.1.3" sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" @@ -98574,7 +98353,7 @@ in sources."untildify-3.0.3" ]; }) - (sources."tar-6.0.5" // { + (sources."tar-6.1.0" // { dependencies = [ sources."chownr-2.0.0" sources."mkdirp-1.0.4" @@ -98593,7 +98372,6 @@ in sources."string_decoder-1.1.1" ]; }) - sources."term-size-2.2.1" sources."text-hex-1.0.0" sources."throat-5.0.0" sources."through-2.3.8" @@ -98617,7 +98395,7 @@ in sources."unbzip2-stream-1.4.3" sources."universalify-0.1.2" sources."untildify-4.0.0" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" (sources."url-0.10.3" // { dependencies = [ sources."punycode-1.3.2" @@ -98648,6 +98426,17 @@ in sources."string_decoder-1.1.1" ]; }) + (sources."wrap-ansi-7.0.0" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" + ]; + }) sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" sources."ws-7.4.2" @@ -98883,7 +98672,7 @@ in sources."tweetnacl-0.14.5" sources."type-is-1.6.18" sources."unpipe-1.0.0" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."utf8-2.0.0" sources."utils-merge-1.0.1" sources."uuid-3.4.0" @@ -99312,10 +99101,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.437.3"; + version = "1.439.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.437.3.tgz"; - sha512 = "DFcYz8Q8LT/XNCNxaeEoGahazvkEhWS//JWJTfr6W1d5jMnORQauPxxj4RR3WGjKewSDl2eElwK1jhi5RNOP9g=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.439.1.tgz"; + sha512 = "aWZixzm6HDaK/e/nDvyAX+IeBeQ6IFjQx559ExU+mKWQuGgmBHJryuODTFq1ymQCI7TzQvzM5GCrrEL48JIWkw=="; }; dependencies = [ sources."@sindresorhus/is-2.1.1" @@ -99329,7 +99118,7 @@ in sources."@snyk/dep-graph-1.21.0" sources."@snyk/docker-registry-v2-client-1.13.9" sources."@snyk/gemfile-1.2.0" - (sources."@snyk/java-call-graph-builder-1.18.0" // { + (sources."@snyk/java-call-graph-builder-1.19.0" // { dependencies = [ sources."rimraf-3.0.2" sources."tmp-0.2.1" @@ -99338,7 +99127,7 @@ in sources."@snyk/rpm-parser-2.2.1" (sources."@snyk/snyk-cocoapods-plugin-2.5.1" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) (sources."@snyk/snyk-docker-pull-3.2.3" // { @@ -99352,9 +99141,9 @@ in sources."@types/graphlib-2.1.7" sources."@types/hosted-git-info-2.7.0" sources."@types/http-cache-semantics-4.0.0" - sources."@types/js-yaml-3.12.5" + sources."@types/js-yaml-3.12.6" sources."@types/keyv-3.1.1" - sources."@types/node-14.14.20" + sources."@types/node-14.14.22" sources."@types/responselike-1.0.0" sources."@types/semver-5.5.0" sources."@yarnpkg/lockfile-1.1.0" @@ -99377,7 +99166,7 @@ in sources."asn1-0.2.4" (sources."ast-types-0.14.2" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) sources."async-3.2.0" @@ -99616,7 +99405,7 @@ in sources."object-hash-2.1.1" sources."once-1.4.0" sources."onetime-5.1.2" - sources."open-7.3.0" + sources."open-7.3.1" sources."optionator-0.8.3" sources."os-name-3.1.0" sources."os-tmpdir-1.0.2" @@ -99656,6 +99445,7 @@ in sources."process-nextick-args-2.0.1" sources."progress-2.0.3" sources."promise-7.3.1" + sources."promise-queue-2.2.5" sources."proxy-agent-3.1.1" sources."proxy-from-env-1.1.0" sources."pseudomap-1.0.2" @@ -99703,7 +99493,7 @@ in sources."color-name-1.1.4" sources."has-flag-4.0.0" sources."supports-color-7.2.0" - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) (sources."snyk-docker-plugin-4.13.1" // { @@ -99720,7 +99510,7 @@ in sources."tmp-0.2.1" ]; }) - (sources."snyk-gradle-plugin-3.11.0" // { + (sources."snyk-gradle-plugin-3.12.0" // { dependencies = [ (sources."@snyk/cli-interface-2.9.1" // { dependencies = [ @@ -99736,11 +99526,11 @@ in sources."rimraf-3.0.2" sources."supports-color-7.2.0" sources."tmp-0.2.1" - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) sources."snyk-module-3.1.0" - (sources."snyk-mvn-plugin-2.25.0" // { + (sources."snyk-mvn-plugin-2.25.1" // { dependencies = [ sources."@snyk/cli-interface-2.9.1" (sources."@snyk/dep-graph-1.19.4" // { @@ -99779,9 +99569,14 @@ in sources."tslib-1.11.1" ]; }) - (sources."snyk-poetry-lockfile-parser-1.1.1" // { + (sources."snyk-poetry-lockfile-parser-1.1.2" // { dependencies = [ - sources."tslib-2.0.3" + (sources."@snyk/dep-graph-1.23.0" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) + sources."tslib-2.1.0" ]; }) (sources."snyk-policy-1.14.1" // { @@ -99795,7 +99590,7 @@ in }) ]; }) - sources."snyk-python-plugin-1.19.1" + sources."snyk-python-plugin-1.19.2" (sources."snyk-resolve-1.0.1" // { dependencies = [ sources."debug-3.2.7" @@ -99934,16 +99729,16 @@ in "socket.io" = nodeEnv.buildNodePackage { name = "socket.io"; packageName = "socket.io"; - version = "3.0.5"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-3.0.5.tgz"; - sha512 = "5yWQ43P/4IttmPCGKDQ3CVocBiJWGpibyhYJxgUhf69EHMzmK8XW0DkmHIoYdLmZaVZJyiEkUqpeC7rSCIqekw=="; + url = "https://registry.npmjs.org/socket.io/-/socket.io-3.1.0.tgz"; + sha512 = "Aqg2dlRh6xSJvRYK31ksG65q4kmBOqU4g+1ukhPcoT6wNGYoIwSYPlCPuRwOO9pgLUajojGFztl6+V2opmKcww=="; }; dependencies = [ sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.0" sources."@types/cors-2.8.9" - sources."@types/node-14.14.20" + sources."@types/node-14.14.22" sources."accepts-1.3.7" sources."base64-arraybuffer-0.1.4" sources."base64id-2.0.0" @@ -99951,15 +99746,15 @@ in sources."cookie-0.4.1" sources."cors-2.8.5" sources."debug-4.3.2" - sources."engine.io-4.0.6" + sources."engine.io-4.1.0" sources."engine.io-parser-4.0.2" sources."mime-db-1.45.0" sources."mime-types-2.1.28" sources."ms-2.1.2" sources."negotiator-0.6.2" sources."object-assign-4.1.1" - sources."socket.io-adapter-2.0.3" - sources."socket.io-parser-4.0.3" + sources."socket.io-adapter-2.1.0" + sources."socket.io-parser-4.0.4" sources."vary-1.1.2" sources."ws-7.4.2" ]; @@ -100205,7 +100000,7 @@ in sources."isobject-3.0.1" ]; }) - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."camelcase-2.1.1" sources."ccount-1.1.0" sources."chalk-1.1.3" @@ -100293,8 +100088,12 @@ in }) sources."epidemic-broadcast-trees-7.0.0" sources."errno-0.1.8" - sources."es-abstract-1.17.7" - (sources."es-get-iterator-1.1.1" // { + (sources."es-abstract-1.18.0-next.2" // { + dependencies = [ + sources."object-inspect-1.9.0" + ]; + }) + (sources."es-get-iterator-1.1.2" // { dependencies = [ sources."isarray-2.0.5" ]; @@ -100342,7 +100141,7 @@ in sources."mkdirp-1.0.4" ]; }) - (sources."flumeview-reduce-1.3.17" // { + (sources."flumeview-reduce-1.4.0" // { dependencies = [ (sources."atomic-file-2.1.1" // { dependencies = [ @@ -100360,7 +100159,7 @@ in sources."fs.realpath-1.0.0" sources."fsevents-1.2.13" sources."function-bind-1.1.1" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.0" sources."get-value-2.0.6" sources."glob-6.0.4" sources."glob-base-0.3.0" @@ -100449,11 +100248,7 @@ in sources."is-set-2.0.2" sources."is-string-1.0.5" sources."is-symbol-1.0.3" - (sources."is-typed-array-1.1.4" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) + sources."is-typed-array-1.1.4" sources."is-typedarray-1.0.0" sources."is-valid-domain-0.0.17" sources."is-weakmap-2.0.1" @@ -100561,7 +100356,7 @@ in }) ]; }) - sources."object-inspect-1.9.0" + sources."object-inspect-1.7.0" sources."object-is-1.1.4" sources."object-keys-1.1.1" (sources."object-visit-1.0.1" // { @@ -100579,7 +100374,7 @@ in sources."observ-0.2.0" sources."observ-debounce-1.1.1" sources."obv-0.0.1" - sources."obz-1.0.2" + sources."obz-1.0.3" sources."on-change-network-0.0.2" sources."on-wakeup-1.0.1" sources."once-1.4.0" @@ -100728,7 +100523,7 @@ in }) sources."regex-cache-0.4.4" sources."regex-not-1.0.2" - sources."regexp.prototype.flags-1.3.0" + sources."regexp.prototype.flags-1.3.1" sources."relative-url-1.0.2" (sources."remark-3.2.3" // { dependencies = [ @@ -100768,7 +100563,11 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."shellsubstitute-1.2.0" - sources."side-channel-1.0.4" + (sources."side-channel-1.0.4" // { + dependencies = [ + sources."object-inspect-1.9.0" + ]; + }) sources."smart-buffer-4.1.0" (sources."snapdragon-0.8.2" // { dependencies = [ @@ -100873,11 +100672,7 @@ in ]; }) sources."string-width-1.0.2" - (sources."string.prototype.trim-1.2.3" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) + sources."string.prototype.trim-1.2.3" sources."string.prototype.trimend-1.0.3" sources."string.prototype.trimstart-1.0.3" sources."string_decoder-1.1.1" @@ -100889,7 +100684,6 @@ in dependencies = [ sources."glob-7.1.6" sources."is-regex-1.0.5" - sources."object-inspect-1.7.0" ]; }) sources."text-table-0.2.0" @@ -100946,11 +100740,7 @@ in sources."which-1.3.1" sources."which-boxed-primitive-1.0.2" sources."which-collection-1.0.1" - (sources."which-typed-array-1.1.4" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) + sources."which-typed-array-1.1.4" sources."word-wrap-1.2.3" sources."wrap-fn-0.1.5" sources."wrappy-1.0.2" @@ -101054,7 +100844,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.821.0" // { + (sources."aws-sdk-2.831.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -101094,7 +100884,7 @@ in sources."buffer-from-1.1.1" sources."bufferutil-1.3.0" sources."bufferview-1.0.1" - sources."bunyan-1.8.14" + sources."bunyan-1.8.15" sources."busboy-0.2.14" sources."bytebuffer-3.5.5" sources."bytes-3.1.0" @@ -101237,7 +101027,7 @@ in sources."fd-slicer-1.1.0" sources."finalhandler-1.1.2" sources."find-up-3.0.0" - sources."follow-redirects-1.13.1" + sources."follow-redirects-1.13.2" sources."forever-agent-0.6.1" sources."form-data-2.1.4" sources."formidable-1.2.2" @@ -101580,7 +101370,7 @@ in sources."signal-exit-3.0.3" sources."slash-1.0.0" sources."sntp-1.0.9" - (sources."socket.io-2.4.0" // { + (sources."socket.io-2.4.1" // { dependencies = [ sources."debug-4.1.1" ]; @@ -101591,7 +101381,7 @@ in sources."debug-3.1.0" sources."isarray-2.0.1" sources."ms-2.0.0" - sources."socket.io-parser-3.3.1" + sources."socket.io-parser-3.3.2" ]; }) (sources."socket.io-parser-3.4.1" // { @@ -101642,7 +101432,7 @@ in dependencies = [ sources."debug-3.2.7" sources."form-data-2.5.1" - sources."qs-6.9.4" + sources."qs-6.9.6" sources."readable-stream-2.3.7" sources."string_decoder-1.1.1" ]; @@ -101655,7 +101445,7 @@ in sources."esprima-4.0.1" sources."js-yaml-3.14.1" sources."lodash-3.10.1" - sources."qs-6.9.4" + sources."qs-6.9.6" ]; }) sources."swagger-schema-official-2.0.0-bab6bed" @@ -101705,7 +101495,7 @@ in sources."uid2-0.0.3" sources."ultron-1.0.2" sources."unpipe-1.0.0" - (sources."uri-js-4.4.0" // { + (sources."uri-js-4.4.1" // { dependencies = [ sources."punycode-2.1.1" ]; @@ -101820,10 +101610,10 @@ in stylelint = nodeEnv.buildNodePackage { name = "stylelint"; packageName = "stylelint"; - version = "13.8.0"; + version = "13.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/stylelint/-/stylelint-13.8.0.tgz"; - sha512 = "iHH3dv3UI23SLDrH4zMQDjLT9/dDIz/IpoFeuNxZmEx86KtfpjDOscxLTFioQyv+2vQjPlRZnK0UoJtfxLICXQ=="; + url = "https://registry.npmjs.org/stylelint/-/stylelint-13.9.0.tgz"; + sha512 = "VVWH2oixOAxpWL1vH+V42ReCzBjW2AeqskSAbi8+3OjV1Xg3VZkmTcAqBZfRRvJeF4BvYuDLXebW3tIHxgZDEg=="; }; dependencies = [ sources."@babel/code-frame-7.12.11" @@ -101870,11 +101660,11 @@ in sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.16.0" + sources."browserslist-4.16.1" sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001173" + sources."caniuse-lite-1.0.30001180" (sources."chalk-4.1.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -101906,13 +101696,13 @@ in (sources."dom-serializer-0.2.2" // { dependencies = [ sources."domelementtype-2.1.0" - sources."entities-2.1.0" + sources."entities-2.2.0" ]; }) sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.634" + sources."electron-to-chromium-1.3.645" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -101921,14 +101711,14 @@ in sources."execall-2.0.0" sources."extend-3.0.2" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.4" + sources."fast-glob-3.2.5" sources."fastest-levenshtein-1.0.12" sources."fastq-1.10.0" sources."file-entry-cache-6.0.0" sources."fill-range-7.0.1" sources."find-up-4.1.0" sources."flat-cache-3.0.4" - sources."flatted-3.1.0" + sources."flatted-3.1.1" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.2" @@ -101938,7 +101728,7 @@ in sources."global-modules-2.0.0" sources."global-prefix-3.0.0" sources."globals-11.12.0" - sources."globby-11.0.1" + sources."globby-11.0.2" sources."globjoin-0.1.4" sources."gonzales-pe-4.3.0" sources."hard-rejection-2.1.0" @@ -101993,7 +101783,7 @@ in sources."mdast-util-from-markdown-0.8.4" sources."mdast-util-to-markdown-0.6.2" sources."mdast-util-to-string-2.0.0" - sources."meow-8.1.0" + sources."meow-9.0.0" sources."merge2-1.4.1" sources."micromark-2.11.2" sources."micromatch-4.0.2" @@ -102006,7 +101796,7 @@ in ]; }) sources."ms-2.1.2" - sources."node-releases-1.1.69" + sources."node-releases-1.1.70" (sources."normalize-package-data-3.0.0" // { dependencies = [ sources."semver-7.3.4" @@ -102021,7 +101811,7 @@ in sources."p-try-2.2.0" sources."parent-module-1.0.1" sources."parse-entities-2.0.0" - sources."parse-json-5.1.0" + sources."parse-json-5.2.0" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.6" @@ -102115,7 +101905,7 @@ in sources."unist-util-find-all-after-3.0.2" sources."unist-util-is-4.0.4" sources."unist-util-stringify-position-2.0.3" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.2.0" sources."validate-npm-package-license-3.0.4" @@ -102152,7 +101942,7 @@ in sources."ansi-styles-3.2.1" sources."argparse-1.0.10" sources."boolbase-1.0.0" - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."chalk-2.4.2" sources."coa-2.0.2" sources."color-convert-1.9.3" @@ -102175,13 +101965,13 @@ in }) sources."domelementtype-1.3.1" sources."domutils-1.7.0" - sources."entities-2.1.0" - sources."es-abstract-1.18.0-next.1" + sources."entities-2.2.0" + sources."es-abstract-1.18.0-next.2" sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."function-bind-1.1.1" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.0" sources."has-1.0.3" sources."has-flag-3.0.0" sources."has-symbols-1.0.1" @@ -102620,7 +102410,7 @@ in dependencies = [ sources."debug-3.2.7" sources."ms-2.1.3" - sources."qs-6.9.4" + sources."qs-6.9.6" sources."superagent-3.8.3" ]; }) @@ -102797,7 +102587,7 @@ in sources."truncate-utf8-bytes-1.0.2" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."uglify-js-3.12.4" + sources."uglify-js-3.12.5" sources."undefsafe-2.0.3" (sources."union-value-1.0.1" // { dependencies = [ @@ -102917,7 +102707,7 @@ in sources."jsprim-1.4.1" sources."locate-path-3.0.0" sources."long-4.0.0" - sources."mime-2.4.7" + sources."mime-2.5.0" sources."mime-db-1.45.0" sources."mime-types-2.1.28" sources."minimist-1.2.5" @@ -102958,7 +102748,7 @@ in sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-1.0.3" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."uuid-3.4.0" sources."verror-1.10.0" sources."which-module-2.0.0" @@ -103029,28 +102819,29 @@ in textlint = nodeEnv.buildNodePackage { name = "textlint"; packageName = "textlint"; - version = "11.7.7"; + version = "11.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/textlint/-/textlint-11.7.7.tgz"; - sha512 = "YSF2xLyvX5odEb142kqU2x0oUmL6yj4+mDolKb+ul5y7/HKEUgjq2G4GwkEtIOij1B52mbvS+MApI4Fx5VhhMA=="; + url = "https://registry.npmjs.org/textlint/-/textlint-11.8.1.tgz"; + sha512 = "FlXzJrR008O/H/ynCTVQnsaW2kX2I1zb/rIxkn0HIAoNxU/A4au+P4QJkeDg7FRE6h8qdlZjrXHx79MfSTWzDw=="; }; dependencies = [ sources."@azu/format-text-1.0.1" sources."@azu/style-format-1.0.0" - sources."@textlint/ast-node-types-4.3.5" - sources."@textlint/ast-tester-2.2.5" - sources."@textlint/ast-traverse-2.2.6" - sources."@textlint/feature-flag-3.2.5" - sources."@textlint/fixer-formatter-3.2.6" - sources."@textlint/kernel-3.3.7" - sources."@textlint/linter-formatter-3.2.6" - sources."@textlint/markdown-to-ast-6.2.6" - sources."@textlint/module-interop-1.1.5" - sources."@textlint/text-to-ast-3.2.5" - sources."@textlint/textlint-plugin-markdown-5.2.7" - sources."@textlint/textlint-plugin-text-4.2.7" - sources."@textlint/types-1.4.6" - sources."@textlint/utils-1.1.5" + sources."@textlint/ast-node-types-4.4.1" + sources."@textlint/ast-tester-2.3.1" + sources."@textlint/ast-traverse-2.3.1" + sources."@textlint/feature-flag-3.3.1" + sources."@textlint/fixer-formatter-3.3.1" + sources."@textlint/kernel-3.4.1" + sources."@textlint/linter-formatter-3.3.1" + sources."@textlint/markdown-to-ast-6.3.1" + sources."@textlint/module-interop-1.2.1" + sources."@textlint/source-code-fixer-3.4.1" + sources."@textlint/text-to-ast-3.3.1" + sources."@textlint/textlint-plugin-markdown-5.3.1" + sources."@textlint/textlint-plugin-text-4.3.1" + sources."@textlint/types-1.5.1" + sources."@textlint/utils-1.2.1" sources."ajv-4.11.8" sources."ajv-keywords-1.5.1" sources."ansi-regex-2.1.1" @@ -103061,7 +102852,7 @@ in sources."boundary-1.0.1" sources."brace-expansion-1.1.11" sources."buffer-from-1.1.1" - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" (sources."chalk-1.1.3" // { dependencies = [ sources."strip-ansi-3.0.1" @@ -103084,8 +102875,6 @@ in sources."define-properties-1.1.3" sources."diff-4.0.2" sources."error-ex-1.3.2" - sources."es-abstract-1.17.7" - sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."extend-3.0.2" @@ -103098,7 +102887,7 @@ in sources."format-0.2.2" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.0" sources."get-stdin-5.0.1" sources."glob-7.1.6" sources."graceful-fs-4.2.4" @@ -103113,7 +102902,6 @@ in sources."is-arguments-1.1.0" sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-callable-1.2.2" sources."is-core-module-2.2.0" sources."is-date-object-1.0.2" sources."is-decimal-1.0.4" @@ -103122,7 +102910,6 @@ in sources."is-hexadecimal-1.0.4" sources."is-plain-obj-1.1.0" sources."is-regex-1.1.1" - sources."is-symbol-1.0.3" sources."is-utf8-0.2.1" sources."is-whitespace-character-1.0.4" sources."is-word-character-1.0.4" @@ -103146,10 +102933,8 @@ in sources."ms-2.1.2" sources."normalize-package-data-2.5.0" sources."number-is-nan-1.0.1" - sources."object-inspect-1.9.0" sources."object-is-1.1.4" sources."object-keys-1.1.1" - sources."object.assign-4.1.2" sources."once-1.4.0" sources."optionator-0.9.1" sources."p-limit-1.3.0" @@ -103181,7 +102966,7 @@ in ]; }) sources."readable-stream-2.3.7" - sources."regexp.prototype.flags-1.3.0" + sources."regexp.prototype.flags-1.3.1" sources."remark-frontmatter-1.3.3" sources."remark-parse-5.0.0" sources."repeat-string-1.6.1" @@ -103203,8 +102988,6 @@ in sources."strip-ansi-3.0.1" ]; }) - sources."string.prototype.trimend-1.0.3" - sources."string.prototype.trimstart-1.0.3" sources."string_decoder-1.1.1" (sources."strip-ansi-6.0.0" // { dependencies = [ @@ -103269,7 +103052,7 @@ in sha1 = "9139c65b8da891c983b368a50a286338cd76777a"; }; dependencies = [ - sources."@textlint/ast-node-types-4.3.5" + sources."@textlint/ast-node-types-4.4.1" sources."txt-to-ast-3.0.3" ]; buildInputs = globalBuildInputs; @@ -103291,25 +103074,15 @@ in sha1 = "8d49dd02b3a7a88d7e6b32817f9e202c5c6596b9"; }; dependencies = [ - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."define-properties-1.1.3" - sources."es-abstract-1.17.7" - sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.0" sources."has-1.0.3" sources."has-symbols-1.0.1" - sources."is-callable-1.2.2" - sources."is-date-object-1.0.2" - sources."is-regex-1.1.1" - sources."is-symbol-1.0.3" sources."match-index-1.0.3" - sources."object-inspect-1.9.0" sources."object-keys-1.1.1" - sources."object.assign-4.1.2" - sources."regexp.prototype.flags-1.3.0" - sources."string.prototype.trimend-1.0.3" - sources."string.prototype.trimstart-1.0.3" + sources."regexp.prototype.flags-1.3.1" ]; buildInputs = globalBuildInputs; meta = { @@ -103335,8 +103108,8 @@ in sources."@babel/highlight-7.10.4" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@textlint/ast-node-types-4.3.5" - sources."@textlint/types-1.4.6" + sources."@textlint/ast-node-types-4.4.1" + sources."@textlint/types-1.5.1" sources."@types/hast-2.3.1" sources."@types/minimist-1.2.1" sources."@types/normalize-package-data-2.4.0" @@ -103553,7 +103326,7 @@ in }) sources."parse-english-4.2.0" sources."parse-entities-2.0.0" - sources."parse-json-5.1.0" + sources."parse-json-5.2.0" sources."parse-latin-4.3.0" sources."parse5-6.0.1" sources."path-exists-4.0.0" @@ -103866,17 +103639,17 @@ in sha512 = "HydBbkWjnMn4KrnlpnusY1BGjIG+64UySxRCvRphUAIiuJL2nbkdrIIiOjwfQhllKUa7Sf33bs6RAcbEWjZVfg=="; }; dependencies = [ - sources."@textlint/ast-node-types-4.3.5" - sources."@textlint/types-1.4.6" + sources."@textlint/ast-node-types-4.4.1" + sources."@textlint/types-1.5.1" sources."boundary-1.0.1" sources."buffer-from-1.1.1" - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."concat-stream-2.0.0" sources."define-properties-1.1.3" - sources."es-abstract-1.18.0-next.1" + sources."es-abstract-1.18.0-next.2" sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.0" sources."has-1.0.3" sources."has-symbols-1.0.1" sources."inherits-2.0.4" @@ -103924,7 +103697,7 @@ in }; dependencies = [ sources."array.prototype.find-2.1.1" - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."check-ends-with-period-1.0.1" sources."define-properties-1.1.3" sources."emoji-regex-6.5.1" @@ -103932,7 +103705,7 @@ in sources."es-abstract-1.17.7" sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.0" sources."has-1.0.3" sources."has-symbols-1.0.1" sources."is-callable-1.2.2" @@ -103958,14 +103731,14 @@ in textlint-rule-stop-words = nodeEnv.buildNodePackage { name = "textlint-rule-stop-words"; packageName = "textlint-rule-stop-words"; - version = "2.0.8"; + version = "2.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/textlint-rule-stop-words/-/textlint-rule-stop-words-2.0.8.tgz"; - sha512 = "D945uyFkeMo6KJhMJaFTEHudP+Jkl00rLOQKRibV1zl933muR6NXqz+uXAvitPAEWH20kwQA40E0Cd1t8nJQ1w=="; + url = "https://registry.npmjs.org/textlint-rule-stop-words/-/textlint-rule-stop-words-2.0.9.tgz"; + sha512 = "UW7nWrqBUHfz/sRLTFo40BNjwXOiXSHg00TJuYY4GVDQtsWRLyAsOnXSBqClP4i6wl7ejMBeYmB5mfllYAYMgA=="; }; dependencies = [ - sources."@textlint/ast-node-types-4.3.5" - sources."@textlint/types-1.4.6" + sources."@textlint/ast-node-types-4.4.1" + sources."@textlint/types-1.5.1" sources."boundary-1.0.1" sources."lodash-4.17.20" sources."split-lines-2.0.0" @@ -103988,14 +103761,14 @@ in textlint-rule-terminology = nodeEnv.buildNodePackage { name = "textlint-rule-terminology"; packageName = "textlint-rule-terminology"; - version = "2.1.4"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/textlint-rule-terminology/-/textlint-rule-terminology-2.1.4.tgz"; - sha512 = "kLw4qL8RwY2lCNqgKveHc5sjCDlS5Tdw2TXWOrHvSvQxqaVOwsv3+51oMIQLGfJzQrhFSMlSlw5MvfaOerBvPQ=="; + url = "https://registry.npmjs.org/textlint-rule-terminology/-/textlint-rule-terminology-2.1.5.tgz"; + sha512 = "VW+ea4ByLPddSUqoFkVVJF8zWnO8kqKwvC681wGFAjI4CYz9WhjEQH1ikhoEHXnd5AFXNArcjyoa8hoihrXy0w=="; }; dependencies = [ - sources."@textlint/ast-node-types-4.3.5" - sources."@textlint/types-1.4.6" + sources."@textlint/ast-node-types-4.4.1" + sources."@textlint/types-1.5.1" sources."boundary-1.0.1" sources."lodash-4.17.20" sources."strip-json-comments-3.1.1" @@ -104025,12 +103798,12 @@ in }; dependencies = [ sources."array-includes-3.1.2" - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."define-properties-1.1.3" - sources."es-abstract-1.18.0-next.1" + sources."es-abstract-1.18.0-next.2" sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.0" sources."has-1.0.3" sources."has-symbols-1.0.1" sources."is-callable-1.2.2" @@ -104065,15 +103838,15 @@ in sha1 = "3c79b04091319d4e8be5fb442c596bf500e8493e"; }; dependencies = [ - sources."@textlint/ast-node-types-4.3.5" - sources."@textlint/types-1.4.6" + sources."@textlint/ast-node-types-4.4.1" + sources."@textlint/types-1.5.1" sources."adverb-where-0.0.9" sources."boundary-1.0.1" - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."define-properties-1.1.3" sources."e-prime-0.10.4" sources."function-bind-1.1.1" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.0" sources."has-1.0.3" sources."has-symbols-1.0.1" sources."no-cliches-0.1.1" @@ -104115,7 +103888,7 @@ in sources."@types/debug-4.1.5" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/node-14.14.20" + sources."@types/node-14.14.22" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -104191,7 +103964,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.8.2" + sources."core-js-3.8.3" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -104346,7 +104119,7 @@ in sources."mkdirp-0.5.5" sources."ms-2.0.0" sources."mute-stream-0.0.8" - (sources."needle-2.5.2" // { + (sources."needle-2.6.0" // { dependencies = [ sources."debug-3.2.7" sources."ms-2.1.3" @@ -104414,7 +104187,7 @@ in sources."parseurl-1.3.3" sources."path-is-absolute-1.0.1" sources."path-to-regexp-0.1.7" - sources."peek-readable-3.1.1" + sources."peek-readable-3.1.3" sources."performance-now-2.1.0" sources."pify-4.0.1" sources."precond-0.2.3" @@ -104470,7 +104243,7 @@ in sources."base64-arraybuffer-0.1.5" sources."debug-4.1.1" sources."ms-2.1.3" - (sources."socket.io-parser-3.3.1" // { + (sources."socket.io-parser-3.3.2" // { dependencies = [ sources."component-emitter-1.3.0" sources."debug-3.1.0" @@ -104499,14 +104272,14 @@ in sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" sources."strip-outer-1.0.1" - sources."strtok3-6.0.6" + sources."strtok3-6.0.8" sources."supports-color-7.2.0" sources."tar-4.4.13" sources."tlds-1.208.0" sources."to-array-0.1.4" sources."to-readable-stream-1.0.0" sources."toidentifier-1.0.0" - sources."token-types-2.0.0" + sources."token-types-2.1.1" sources."tough-cookie-2.5.0" sources."trim-repeated-1.0.0" sources."tunnel-agent-0.6.0" @@ -104516,7 +104289,7 @@ in sources."ua-parser-js-0.7.21" sources."uc.micro-1.0.6" sources."unpipe-1.0.0" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."url-parse-lax-3.0.0" sources."urlsafe-base64-1.0.0" sources."util-deprecate-1.0.2" @@ -104684,7 +104457,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."universalify-1.0.0" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."uuid-8.3.2" sources."verror-1.10.0" (sources."winston-2.4.5" // { @@ -104711,10 +104484,10 @@ in triton = nodeEnv.buildNodePackage { name = "triton"; packageName = "triton"; - version = "7.12.0"; + version = "7.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/triton/-/triton-7.12.0.tgz"; - sha512 = "ArYQDI90SwshcxQBE8ogpY1UHMwm5aiZ4GtqzGZG+wn9F5jHUbkDwNXfbVIGQZrFcg/vDtzhscUzI7UIphjJMA=="; + url = "https://registry.npmjs.org/triton/-/triton-7.12.2.tgz"; + sha512 = "xzGDHq2Jt6THs+/Kz1XiTEaco67KmeBzUFqCROPIaMS4BL8UNXoY0cU2ZyH1/4Brrzn70muAOgl7PYDokNb4Pw=="; }; dependencies = [ sources."asn1-0.2.4" @@ -104999,10 +104772,10 @@ in typescript-language-server = nodeEnv.buildNodePackage { name = "typescript-language-server"; packageName = "typescript-language-server"; - version = "0.4.0"; + version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-0.4.0.tgz"; - sha512 = "K8jNOmDFn+QfrCh8ujby2pGDs5rpjYZQn+zvQnf42rxG4IHbfw5CHoMvbGkWPK/J5Gw8/l5K3i03kVZC2IBElg=="; + url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-0.5.1.tgz"; + sha512 = "60Kguhwk/R1BB4pEIb6B9C7Ix7JzLzYnsODlmorYMPjMeEV0rCBqTR6FGAj4wVw/eHrHcpwLENmmURKUd8aybA=="; }; dependencies = [ sources."command-exists-1.2.6" @@ -105026,6 +104799,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Language Server Protocol (LSP) implementation for TypeScript using tsserver"; + homepage = "https://github.com/theia-ide/typescript-language-server#readme"; license = "Apache-2.0"; }; production = true; @@ -105035,10 +104809,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.12.4"; + version = "3.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.4.tgz"; - sha512 = "L5i5jg/SHkEqzN18gQMTWsZk3KelRsfD1wUVNqtq0kzqWQqcJjyL8yc1o8hJgRrWqrAl2mUFbhfznEIoi7zi2A=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.5.tgz"; + sha512 = "SgpgScL4T7Hj/w/GexjnBHi3Ien9WS1Rpfg5y91WXMj9SY997ZCQU76mH4TpLwwfmMvoOU8wiaRkIf6NaH3mtg=="; }; buildInputs = globalBuildInputs; meta = { @@ -105084,7 +104858,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.0" sources."@types/cors-2.8.9" - sources."@types/node-14.14.20" + sources."@types/node-14.14.22" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."ansi-regex-5.0.0" @@ -105240,7 +105014,7 @@ in sources."on-headers-1.0.2" sources."once-1.4.0" sources."one-time-1.0.0" - sources."open-7.3.0" + sources."open-7.3.1" sources."p-cancelable-1.1.0" (sources."package-json-6.5.0" // { dependencies = [ @@ -105296,7 +105070,7 @@ in ]; }) sources."socket.io-adapter-2.0.3" - (sources."socket.io-parser-4.0.3" // { + (sources."socket.io-parser-4.0.4" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -105357,10 +105131,10 @@ in vega-cli = nodeEnv.buildNodePackage { name = "vega-cli"; packageName = "vega-cli"; - version = "5.17.3"; + version = "5.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/vega-cli/-/vega-cli-5.17.3.tgz"; - sha512 = "gxLAxIxFmq+36eB0ETCo4F29+/gWFfGftLxpCs8/fVKW9ILfJnEBd3M+7qdQKRHhVbImqsPetaKzwtIYH7/EPw=="; + url = "https://registry.npmjs.org/vega-cli/-/vega-cli-5.19.1.tgz"; + sha512 = "zUyyUYl2GgpAqdaQ3f/riNdaued3030hiJAjreX7/3XBiJ64vmF1l42x3KD8rq24ff9xLFwe0qyfnQOk4nK+fg=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -105387,7 +105161,7 @@ in sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" - sources."d3-array-2.9.1" + sources."d3-array-2.11.0" sources."d3-color-2.0.0" sources."d3-delaunay-5.3.0" sources."d3-dispatch-2.0.0" @@ -105426,6 +105200,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" + sources."internmap-1.0.0" sources."is-core-module-2.2.0" sources."is-fullwidth-code-point-1.0.0" sources."isarray-1.0.0" @@ -105437,7 +105212,7 @@ in sources."mkdirp-0.5.5" sources."ms-2.1.3" sources."nan-2.14.2" - sources."needle-2.5.2" + sources."needle-2.6.0" sources."node-fetch-2.6.1" sources."node-pre-gyp-0.11.0" sources."nopt-4.0.3" @@ -105475,7 +105250,7 @@ in sources."tar-4.4.13" sources."topojson-client-3.1.0" sources."util-deprecate-1.0.2" - sources."vega-5.17.3" + sources."vega-5.19.1" sources."vega-canvas-1.2.6" sources."vega-crossfilter-4.0.5" sources."vega-dataflow-5.7.3" @@ -105484,18 +105259,18 @@ in sources."vega-expression-4.0.1" sources."vega-force-4.0.7" sources."vega-format-1.0.4" - sources."vega-functions-5.10.0" + sources."vega-functions-5.12.0" sources."vega-geo-4.3.8" sources."vega-hierarchy-4.0.9" sources."vega-label-1.0.0" sources."vega-loader-4.4.0" - sources."vega-parser-6.1.2" + sources."vega-parser-6.1.3" sources."vega-projection-1.4.5" sources."vega-regression-1.0.9" sources."vega-runtime-6.1.3" sources."vega-scale-7.1.1" - sources."vega-scenegraph-4.9.2" - sources."vega-selections-5.1.5" + sources."vega-scenegraph-4.9.3" + sources."vega-selections-5.3.0" sources."vega-statistics-1.7.9" sources."vega-time-2.0.4" sources."vega-transforms-4.9.3" @@ -105828,7 +105603,7 @@ in }) sources."base64-js-1.5.1" sources."big.js-5.2.2" - sources."binary-extensions-2.1.0" + sources."binary-extensions-2.2.0" sources."bindings-1.5.0" sources."bluebird-3.7.2" sources."bn.js-5.1.3" @@ -105864,7 +105639,7 @@ in ]; }) sources."cache-base-1.0.1" - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."camelcase-5.3.1" (sources."chalk-2.4.2" // { dependencies = [ @@ -105967,10 +105742,10 @@ in sources."emoji-regex-7.0.3" sources."emojis-list-3.0.0" sources."end-of-stream-1.4.4" - sources."enhanced-resolve-4.3.0" + sources."enhanced-resolve-4.5.0" sources."entities-2.1.0" sources."errno-0.1.8" - (sources."es-abstract-1.18.0-next.1" // { + (sources."es-abstract-1.18.0-next.2" // { dependencies = [ sources."object.assign-4.1.2" ]; @@ -106062,7 +105837,7 @@ in sources."fsevents-2.1.3" sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.0" sources."get-value-2.0.6" sources."glob-7.1.3" sources."glob-parent-5.1.1" @@ -106457,7 +106232,7 @@ in ]; }) sources."upath-1.2.0" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."urix-0.1.0" (sources."url-0.11.0" // { dependencies = [ @@ -106474,12 +106249,13 @@ in sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.2.0" sources."vm-browserify-1.1.2" - sources."vsce-1.83.0" + sources."vsce-1.84.0" sources."vscode-debugadapter-testsupport-1.43.0" sources."vscode-debugprotocol-1.43.0" (sources."watchpack-1.7.5" // { dependencies = [ - sources."chokidar-3.4.3" + sources."chokidar-3.5.1" + sources."fsevents-2.3.1" sources."readdirp-3.5.0" ]; }) @@ -106507,7 +106283,7 @@ in sources."to-regex-range-2.1.1" ]; }) - (sources."webpack-4.44.2" // { + (sources."webpack-4.46.0" // { dependencies = [ (sources."braces-2.3.2" // { dependencies = [ @@ -106826,12 +106602,12 @@ in sources."tslib-1.14.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uglify-js-3.12.4" + sources."uglify-js-3.12.5" sources."uid-0.0.2" sources."unbzip2-stream-1.4.3" sources."unyield-0.0.1" sources."unzip-response-2.0.1" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."url-parse-lax-1.0.0" sources."url-to-options-1.0.1" sources."user-home-2.0.0" @@ -106885,7 +106661,7 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-14.14.20" + sources."@types/node-14.14.22" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -106937,7 +106713,7 @@ in sources."define-property-1.0.0" ]; }) - sources."binary-extensions-2.1.0" + sources."binary-extensions-2.2.0" sources."bootstrap-vue-helper-json-1.1.1" (sources."boxen-3.2.0" // { dependencies = [ @@ -107085,7 +106861,7 @@ in sources."eslint-scope-5.1.1" sources."espree-6.2.1" sources."ms-2.1.2" - sources."vue-eslint-parser-7.3.0" + sources."vue-eslint-parser-7.4.1" ]; }) sources."eslint-scope-4.0.3" @@ -107268,7 +107044,7 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-3.0.1" - (sources."js-beautify-1.13.0" // { + (sources."js-beautify-1.13.5" // { dependencies = [ sources."mkdirp-1.0.4" ]; @@ -107710,7 +107486,7 @@ in }) sources."untildify-2.1.0" sources."update-notifier-3.0.1" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."urix-0.1.0" sources."url-parse-lax-3.0.0" sources."use-3.1.1" @@ -107796,10 +107572,10 @@ in web-ext = nodeEnv.buildNodePackage { name = "web-ext"; packageName = "web-ext"; - version = "5.4.1"; + version = "5.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/web-ext/-/web-ext-5.4.1.tgz"; - sha512 = "AnTjSFtvidZfmVYzvceM/XixsigiWU3l66UzcxgXxXhOoEQU5ZHlXFGVJdHEYfkI5SnEyDG+WlhsdTUHNLOXJw=="; + url = "https://registry.npmjs.org/web-ext/-/web-ext-5.5.0.tgz"; + sha512 = "f+NHiYwbTS0X6eSLkBDWoCYkkIJweVazGf4MD8S+kRX/5z40WsYsnRdVWG+p34Z6rCyNvlHHrnO2S1W8WWg7Tw=="; }; dependencies = [ sources."@babel/code-frame-7.12.11" @@ -107831,7 +107607,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.20" + sources."@types/node-14.14.22" sources."@types/yauzl-2.9.1" sources."JSONSelect-0.2.1" sources."acorn-7.4.1" @@ -107902,7 +107678,7 @@ in }) sources."base64-js-1.5.1" sources."bcrypt-pbkdf-1.0.2" - sources."binary-extensions-2.1.0" + sources."binary-extensions-2.2.0" sources."bindings-1.5.0" sources."bl-4.0.3" sources."bluebird-2.9.34" @@ -107926,15 +107702,15 @@ in sources."lowercase-keys-2.0.0" ]; }) - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."callsites-3.1.0" sources."camelcase-6.0.0" sources."caseless-0.12.0" sources."chalk-4.1.0" sources."cheerio-1.0.0-rc.3" - (sources."chokidar-3.4.3" // { + (sources."chokidar-3.5.1" // { dependencies = [ - sources."fsevents-2.1.3" + sources."fsevents-2.3.1" ]; }) (sources."chrome-launcher-0.13.4" // { @@ -108036,8 +107812,6 @@ in sources."enquirer-2.3.6" sources."entities-1.1.2" sources."error-ex-1.3.2" - sources."es-abstract-1.17.7" - sources."es-to-primitive-1.2.1" sources."es6-error-4.1.1" sources."es6-promise-2.3.0" sources."es6-promisify-6.1.1" @@ -108165,7 +107939,7 @@ in ]; }) sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.0" sources."get-stream-5.2.0" sources."get-value-2.0.6" sources."getpass-0.1.7" @@ -108208,7 +107982,7 @@ in sources."human-signals-1.1.1" sources."ieee754-1.2.1" sources."ignore-4.0.6" - sources."import-fresh-3.2.1" + sources."import-fresh-3.3.0" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" @@ -108221,7 +107995,6 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-2.1.0" sources."is-buffer-1.1.6" - sources."is-callable-1.2.2" sources."is-ci-2.0.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" @@ -108241,7 +108014,6 @@ in sources."is-regex-1.1.1" sources."is-relative-0.1.3" sources."is-stream-2.0.0" - sources."is-symbol-1.0.3" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" sources."is-windows-1.0.2" @@ -108368,7 +108140,7 @@ in sources."neo-async-2.6.2" sources."next-tick-1.1.0" sources."node-forge-0.10.0" - (sources."node-notifier-8.0.0" // { + (sources."node-notifier-8.0.1" // { dependencies = [ sources."uuid-8.3.2" ]; @@ -108392,11 +108164,9 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.9.0" sources."object-is-1.1.4" sources."object-keys-1.1.1" sources."object-visit-1.0.1" - sources."object.assign-4.1.2" sources."object.pick-1.3.0" sources."once-1.4.0" sources."onetime-5.1.2" @@ -108453,7 +108223,7 @@ in sources."readdirp-3.5.0" sources."regenerator-runtime-0.13.7" sources."regex-not-1.0.2" - sources."regexp.prototype.flags-1.3.0" + sources."regexp.prototype.flags-1.3.1" sources."regexpp-3.1.0" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" @@ -108579,8 +108349,6 @@ in sources."strip-ansi-6.0.0" ]; }) - sources."string.prototype.trimend-1.0.3" - sources."string.prototype.trimstart-1.0.3" sources."string_decoder-1.3.0" sources."strip-ansi-3.0.1" sources."strip-bom-4.0.0" @@ -108643,7 +108411,7 @@ in }) sources."upath-2.0.1" sources."update-notifier-5.0.0" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."urix-0.1.0" sources."url-parse-lax-3.0.0" sources."use-3.1.1" @@ -108652,7 +108420,7 @@ in sources."v8-compile-cache-2.2.0" sources."verror-1.10.0" sources."vfile-location-3.2.0" - sources."watchpack-1.7.4" + sources."watchpack-1.7.5" (sources."watchpack-chokidar2-2.0.1" // { dependencies = [ sources."anymatch-2.0.0" @@ -108698,7 +108466,7 @@ in ]; }) sources."write-file-atomic-3.0.3" - sources."ws-7.3.1" + sources."ws-7.4.2" sources."xdg-basedir-4.0.0" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" @@ -108737,48 +108505,46 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "5.11.1"; + version = "5.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.11.1.tgz"; - sha512 = "tNUIdAmYJv+nupRs/U/gqmADm6fgrf5xE+rSlSsf2PgsGO7j2WG7ccU6AWNlOJlHFl+HnmXlBmHIkiLf+XA9mQ=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.18.0.tgz"; + sha512 = "RmiP/iy6ROvVe/S+u0TrvL/oOmvP+2+Bs8MWjvBwwY/j82Q51XJyDJ75m0QAGntL1Wx6B//Xc0+4VPP/hlNHmw=="; }; dependencies = [ sources."@types/eslint-7.2.6" sources."@types/eslint-scope-3.7.0" - sources."@types/estree-0.0.45" - sources."@types/json-schema-7.0.6" - sources."@types/node-14.14.20" - sources."@webassemblyjs/ast-1.9.1" - sources."@webassemblyjs/floating-point-hex-parser-1.9.1" - sources."@webassemblyjs/helper-api-error-1.9.1" - sources."@webassemblyjs/helper-buffer-1.9.1" - sources."@webassemblyjs/helper-code-frame-1.9.1" - sources."@webassemblyjs/helper-fsm-1.9.1" - sources."@webassemblyjs/helper-module-context-1.9.1" - sources."@webassemblyjs/helper-wasm-bytecode-1.9.1" - sources."@webassemblyjs/helper-wasm-section-1.9.1" - sources."@webassemblyjs/ieee754-1.9.1" - sources."@webassemblyjs/leb128-1.9.1" - sources."@webassemblyjs/utf8-1.9.1" - sources."@webassemblyjs/wasm-edit-1.9.1" - sources."@webassemblyjs/wasm-gen-1.9.1" - sources."@webassemblyjs/wasm-opt-1.9.1" - sources."@webassemblyjs/wasm-parser-1.9.1" - sources."@webassemblyjs/wast-parser-1.9.1" - sources."@webassemblyjs/wast-printer-1.9.1" + sources."@types/estree-0.0.46" + sources."@types/json-schema-7.0.7" + sources."@types/node-14.14.22" + sources."@webassemblyjs/ast-1.11.0" + sources."@webassemblyjs/floating-point-hex-parser-1.11.0" + sources."@webassemblyjs/helper-api-error-1.11.0" + sources."@webassemblyjs/helper-buffer-1.11.0" + sources."@webassemblyjs/helper-numbers-1.11.0" + sources."@webassemblyjs/helper-wasm-bytecode-1.11.0" + sources."@webassemblyjs/helper-wasm-section-1.11.0" + sources."@webassemblyjs/ieee754-1.11.0" + sources."@webassemblyjs/leb128-1.11.0" + sources."@webassemblyjs/utf8-1.11.0" + sources."@webassemblyjs/wasm-edit-1.11.0" + sources."@webassemblyjs/wasm-gen-1.11.0" + sources."@webassemblyjs/wasm-opt-1.11.0" + sources."@webassemblyjs/wasm-parser-1.11.0" + sources."@webassemblyjs/wast-printer-1.11.0" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-8.0.4" + sources."acorn-8.0.5" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" - sources."browserslist-4.16.0" + sources."browserslist-4.16.1" sources."buffer-from-1.1.1" - sources."caniuse-lite-1.0.30001173" + sources."caniuse-lite-1.0.30001180" sources."chrome-trace-event-1.0.2" sources."colorette-1.2.1" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.634" - sources."enhanced-resolve-5.4.1" + sources."electron-to-chromium-1.3.645" + sources."enhanced-resolve-5.7.0" + sources."es-module-lexer-0.3.26" sources."escalade-3.1.1" sources."eslint-scope-5.1.1" (sources."esrecurse-4.3.0" // { @@ -108797,13 +108563,13 @@ in sources."jest-worker-26.6.2" sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-0.4.1" - sources."loader-runner-4.1.0" + sources."loader-runner-4.2.0" sources."locate-path-6.0.0" sources."merge-stream-2.0.0" sources."mime-db-1.45.0" sources."mime-types-2.1.28" sources."neo-async-2.6.2" - sources."node-releases-1.1.69" + sources."node-releases-1.1.70" sources."p-limit-3.1.0" sources."p-locate-5.0.0" sources."path-exists-4.0.0" @@ -108823,9 +108589,9 @@ in sources."source-map-0.7.3" ]; }) - sources."terser-webpack-plugin-5.0.3" + sources."terser-webpack-plugin-5.1.1" sources."tslib-1.14.1" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."watchpack-2.1.0" sources."webpack-sources-2.2.0" sources."yocto-queue-0.1.0" @@ -108843,16 +108609,18 @@ in webpack-cli = nodeEnv.buildNodePackage { name = "webpack-cli"; packageName = "webpack-cli"; - version = "4.3.1"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.3.1.tgz"; - sha512 = "/F4+9QNZM/qKzzL9/06Am8NXIkGV+/NqQ62Dx7DSqudxxpAgBqYn6V7+zp+0Y7JuWksKUbczRY3wMTd+7Uj6OA=="; + url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.4.0.tgz"; + sha512 = "/Qh07CXfXEkMu5S8wEpjuaw2Zj/CC0hf/qbTDp6N8N7JjdGuaOjZ7kttz+zhuJO/J5m7alQEhNk9lsc4rC6xgQ=="; }; dependencies = [ sources."@discoveryjs/json-ext-0.5.2" + sources."@webpack-cli/configtest-1.0.0" sources."@webpack-cli/info-1.2.1" - sources."@webpack-cli/serve-1.2.1" + sources."@webpack-cli/serve-1.2.2" sources."ansi-colors-4.1.1" + sources."clone-deep-4.0.1" sources."colorette-1.2.1" sources."commander-6.2.1" sources."cross-spawn-7.0.3" @@ -108868,10 +108636,12 @@ in sources."import-local-3.0.2" sources."interpret-2.2.0" sources."is-core-module-2.2.0" + sources."is-plain-object-2.0.4" sources."is-stream-2.0.0" sources."isexe-2.0.0" + sources."isobject-3.0.1" + sources."kind-of-6.0.3" sources."locate-path-5.0.0" - sources."lodash-4.17.20" sources."merge-stream-2.0.0" sources."mimic-fn-2.1.0" sources."npm-run-path-4.0.1" @@ -108887,13 +108657,15 @@ in sources."resolve-1.19.0" sources."resolve-cwd-3.0.0" sources."resolve-from-5.0.0" + sources."shallow-clone-3.0.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-3.0.3" sources."strip-final-newline-2.0.0" sources."v8-compile-cache-2.2.0" - sources."webpack-merge-4.2.2" + sources."webpack-merge-5.7.3" sources."which-2.0.2" + sources."wildcard-2.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -108908,15 +108680,15 @@ in webpack-dev-server = nodeEnv.buildNodePackage { name = "webpack-dev-server"; packageName = "webpack-dev-server"; - version = "3.11.1"; + version = "3.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.1.tgz"; - sha512 = "u4R3mRzZkbxQVa+MBWi2uVpB5W59H3ekZAJsQlKUTdl7Elcah2EhygTPLmeFXybQkf9i2+L0kn7ik9SnXa6ihQ=="; + url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.2.tgz"; + sha512 = "A80BkuHRQfCiNtGBS1EMf2ChTUs0x+B3wGDFmOeT4rmJOHhHTCH2naNxIHhmkr0/UillP4U3yeIyv1pNp+QDLQ=="; }; dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.20" + sources."@types/node-14.14.22" sources."accepts-1.3.7" sources."ajv-6.12.6" sources."ajv-errors-1.0.1" @@ -108968,7 +108740,7 @@ in sources."buffer-indexof-1.1.1" sources."bytes-3.0.0" sources."cache-base-1.0.1" - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."camelcase-5.3.1" sources."chokidar-2.1.8" (sources."class-utils-0.3.6" // { @@ -109045,8 +108817,6 @@ in sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" sources."errno-0.1.8" - sources."es-abstract-1.17.7" - sources."es-to-primitive-1.2.1" sources."escape-html-1.0.3" sources."etag-1.8.1" sources."eventemitter3-4.0.7" @@ -109103,7 +108873,7 @@ in ]; }) sources."find-up-3.0.0" - sources."follow-redirects-1.13.1" + sources."follow-redirects-1.13.2" sources."for-in-1.0.2" sources."forwarded-0.1.2" sources."fragment-cache-0.2.1" @@ -109112,7 +108882,7 @@ in sources."fsevents-1.2.13" sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.0" sources."get-stream-4.1.0" sources."get-value-2.0.6" sources."glob-7.1.6" @@ -109161,7 +108931,6 @@ in sources."is-arguments-1.1.0" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-callable-1.2.2" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" @@ -109180,7 +108949,6 @@ in sources."is-plain-object-2.0.4" sources."is-regex-1.1.1" sources."is-stream-1.1.0" - sources."is-symbol-1.0.3" sources."is-windows-1.0.2" sources."is-wsl-1.1.0" sources."isarray-1.0.0" @@ -109232,11 +109000,9 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.9.0" sources."object-is-1.1.4" sources."object-keys-1.1.1" sources."object-visit-1.0.1" - sources."object.assign-4.1.2" sources."object.pick-1.3.0" sources."obuf-1.1.2" sources."on-finished-2.3.0" @@ -109290,7 +109056,7 @@ in }) sources."readdirp-2.2.1" sources."regex-not-1.0.2" - sources."regexp.prototype.flags-1.3.0" + sources."regexp.prototype.flags-1.3.1" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" @@ -109411,8 +109177,6 @@ in sources."strip-ansi-5.2.0" ]; }) - sources."string.prototype.trimend-1.0.3" - sources."string.prototype.trimstart-1.0.3" (sources."string_decoder-1.1.1" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -109448,7 +109212,7 @@ in ]; }) sources."upath-1.2.0" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."urix-0.1.0" (sources."url-0.11.0" // { dependencies = [ @@ -109464,7 +109228,7 @@ in sources."wbuf-1.7.3" (sources."webpack-dev-middleware-3.7.3" // { dependencies = [ - sources."mime-2.4.7" + sources."mime-2.5.0" ]; }) sources."webpack-log-2.0.0" @@ -109506,7 +109270,7 @@ in sources."@nodelib/fs.scandir-2.1.4" sources."@nodelib/fs.stat-2.0.4" sources."@nodelib/fs.walk-1.2.6" - sources."@types/json-schema-7.0.6" + sources."@types/json-schema-7.0.7" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" sources."array-union-2.1.0" @@ -109515,12 +109279,12 @@ in sources."dir-glob-3.0.1" sources."emojis-list-3.0.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.4" + sources."fast-glob-3.2.5" sources."fast-json-stable-stringify-2.1.0" sources."fastq-1.10.0" sources."fill-range-7.0.1" sources."glob-parent-5.1.1" - sources."globby-11.0.1" + sources."globby-11.0.2" sources."ignore-5.1.8" sources."is-extglob-2.1.1" sources."is-glob-4.0.1" @@ -109544,7 +109308,7 @@ in sources."serialize-javascript-5.0.1" sources."slash-3.0.0" sources."to-regex-range-5.0.1" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; @@ -109577,7 +109341,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-13.13.39" + sources."@types/node-13.13.40" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.3.0" sources."balanced-match-1.0.0" @@ -109655,7 +109419,7 @@ in ]; }) sources."core-util-is-1.0.2" - sources."create-torrent-4.4.2" + sources."create-torrent-4.4.3" sources."debug-2.6.9" sources."decompress-response-3.3.0" (sources."dlnacasts-0.1.0" // { @@ -109718,7 +109482,7 @@ in sources."mdns-js-packet-0.2.0" sources."mediasource-2.4.0" sources."memory-chunk-store-1.3.0" - sources."mime-2.4.7" + sources."mime-2.5.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -109742,7 +109506,7 @@ in sources."nodebmc-0.0.7" sources."on-finished-2.3.0" sources."once-1.4.0" - sources."open-7.3.0" + sources."open-7.3.1" sources."package-json-versionify-1.0.4" (sources."parse-torrent-7.1.3" // { dependencies = [ @@ -109845,7 +109609,7 @@ in sources."utp-native-2.2.2" sources."videostream-3.2.2" sources."vlc-command-1.2.0" - (sources."webtorrent-0.112.0" // { + (sources."webtorrent-0.112.2" // { dependencies = [ sources."debug-4.3.2" sources."decompress-response-6.0.0" @@ -109853,7 +109617,7 @@ in sources."magnet-uri-6.1.0" sources."mimic-response-3.1.0" sources."ms-2.1.2" - sources."parse-torrent-9.1.0" + sources."parse-torrent-9.1.1" sources."simple-get-4.0.0" ]; }) @@ -109922,10 +109686,10 @@ in yaml-language-server = nodeEnv.buildNodePackage { name = "yaml-language-server"; packageName = "yaml-language-server"; - version = "0.13.0"; + version = "0.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.13.0.tgz"; - sha512 = "5FHW7dUAyIjEM3mRzIplE0pZut2K30cA+K7coaOxFxi82LTk/oiVLS4/AQFnOtGicSyoi4YOiRqpMZ04vgtuew=="; + url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.14.0.tgz"; + sha512 = "aMNzS7YoMrgG0QdCMonlrFS/fPiag4zVs9cJ7RB0ZzwiALB2446UFXwy6SaTmKfJq353rjGJ+d7j1HHKSX/IqA=="; }; dependencies = [ sources."agent-base-4.3.0" @@ -109963,7 +109727,7 @@ in sources."vscode-languageserver-types-3.16.0" sources."vscode-nls-4.1.2" sources."vscode-uri-2.1.2" - sources."yaml-language-server-parser-0.1.1" + sources."yaml-language-server-parser-0.1.2" ]; buildInputs = globalBuildInputs; meta = { @@ -110010,7 +109774,7 @@ in sources."@sindresorhus/is-0.7.0" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.20" + sources."@types/node-14.14.22" sources."@types/normalize-package-data-2.4.0" sources."JSONStream-1.3.5" sources."aggregate-error-3.1.0" @@ -110039,11 +109803,7 @@ in sources."atob-2.1.2" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" - (sources."axios-0.18.1" // { - dependencies = [ - sources."is-buffer-2.0.5" - ]; - }) + sources."axios-0.21.1" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -110136,7 +109896,7 @@ in sources."config-chain-1.1.12" sources."configstore-3.1.5" sources."copy-descriptor-0.1.1" - sources."core-js-3.8.2" + sources."core-js-3.8.3" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" sources."cross-spawn-6.0.5" @@ -110238,11 +109998,7 @@ in sources."find-up-2.1.0" sources."find-versions-2.0.0" sources."first-chunk-stream-2.0.0" - (sources."follow-redirects-1.5.10" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) + sources."follow-redirects-1.13.2" sources."for-in-1.0.2" sources."foreachasync-3.0.0" sources."forever-agent-0.6.1" @@ -110477,9 +110233,10 @@ in sources."mute-stream-0.0.7" sources."nanomatch-1.2.13" sources."nice-try-1.0.5" + sources."node-fetch-2.6.1" sources."normalize-package-data-2.5.0" sources."normalize-url-2.0.1" - sources."npm-api-1.0.0" + sources."npm-api-1.0.1" sources."npm-conf-1.1.3" (sources."npm-keyword-5.0.0" // { dependencies = [ @@ -110535,7 +110292,7 @@ in sources."p-try-1.0.0" sources."package-json-5.0.0" sources."pad-component-0.0.1" - sources."paged-request-2.0.1" + sources."paged-request-2.0.2" sources."parse-help-1.0.0" sources."parse-json-2.2.0" sources."pascalcase-0.1.1" @@ -110815,7 +110572,7 @@ in sources."untildify-3.0.3" sources."unzip-response-2.0.1" sources."update-notifier-2.5.0" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."urix-0.1.0" sources."url-parse-lax-3.0.0" sources."url-to-options-1.0.1" @@ -110932,7 +110689,7 @@ in sources."p-limit-2.3.0" sources."p-locate-3.0.0" sources."p-try-2.2.0" - sources."parse-json-5.1.0" + sources."parse-json-5.2.0" (sources."path-type-3.0.0" // { dependencies = [ sources."pify-3.0.0" @@ -110962,11 +110719,11 @@ in buildInputs = globalBuildInputs; meta = { description = "CLI tool for running Yeoman generators"; - homepage = http://yeoman.io/; + homepage = https://yeoman.io/; license = "BSD-2-Clause"; }; production = true; bypassCache = true; reconstructLock = true; }; -} \ No newline at end of file +} diff --git a/pkgs/development/ocaml-modules/awa/default.nix b/pkgs/development/ocaml-modules/awa/default.nix new file mode 100644 index 00000000000..49d614cda88 --- /dev/null +++ b/pkgs/development/ocaml-modules/awa/default.nix @@ -0,0 +1,38 @@ +{ lib, buildDunePackage, fetchurl +, ppx_sexp_conv, ppx_cstruct +, mirage-crypto, mirage-crypto-rng, mirage-crypto-pk +, x509, cstruct, cstruct-unix, cstruct-sexp, sexplib +, rresult, mtime, logs, fmt, cmdliner, base64, hacl_x25519 +, zarith +}: + +buildDunePackage rec { + pname = "awa"; + version = "0.0.1"; + + minimumOCamlVersion = "4.07"; + useDune2 = true; + + src = fetchurl { + url = "https://github.com/mirage/awa-ssh/releases/download/v${version}/awa-v${version}.tbz"; + sha256 = "c1d604645517b191184a5800f5c48a6a9a3e5a2fce4a0e2ecfeee74586301400"; + }; + + nativeBuildInputs = [ ppx_sexp_conv ppx_cstruct ]; + + propagatedBuildInputs = [ + mirage-crypto mirage-crypto-rng mirage-crypto-pk x509 + cstruct cstruct-sexp sexplib rresult mtime + logs base64 hacl_x25519 zarith + ]; + + doCheck = true; + checkInputs = [ cstruct-unix cmdliner fmt ]; + + meta = with lib; { + description = "SSH implementation in OCaml"; + license = licenses.isc; + homepage = "https://github.com/mirage/awa-ssh"; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/development/ocaml-modules/awa/lwt.nix b/pkgs/development/ocaml-modules/awa/lwt.nix new file mode 100644 index 00000000000..00be799ddff --- /dev/null +++ b/pkgs/development/ocaml-modules/awa/lwt.nix @@ -0,0 +1,15 @@ +{ buildDunePackage, awa +, cstruct, mtime, lwt, cstruct-unix, mirage-crypto-rng +}: + +buildDunePackage { + pname = "awa-lwt"; + + inherit (awa) version src useDune2; + + propagatedBuildInputs = [ + awa cstruct mtime lwt cstruct-unix mirage-crypto-rng + ]; + + inherit (awa) meta; +} diff --git a/pkgs/development/ocaml-modules/awa/mirage.nix b/pkgs/development/ocaml-modules/awa/mirage.nix new file mode 100644 index 00000000000..4f9b425f8a0 --- /dev/null +++ b/pkgs/development/ocaml-modules/awa/mirage.nix @@ -0,0 +1,15 @@ +{ buildDunePackage, awa +, cstruct, mtime, lwt, mirage-flow, mirage-clock, logs +}: + +buildDunePackage { + pname = "awa-mirage"; + + inherit (awa) version src useDune2; + + propagatedBuildInputs = [ + awa cstruct mtime lwt mirage-flow mirage-clock logs + ]; + + inherit (awa) meta; +} diff --git a/pkgs/development/ocaml-modules/bheap/default.nix b/pkgs/development/ocaml-modules/bheap/default.nix new file mode 100644 index 00000000000..49e5c336d90 --- /dev/null +++ b/pkgs/development/ocaml-modules/bheap/default.nix @@ -0,0 +1,25 @@ +{ lib, buildDunePackage, fetchurl, stdlib-shims }: + +buildDunePackage rec { + pname = "bheap"; + version = "2.0.0"; + + src = fetchurl { + url = "https://github.com/backtracking/${pname}/releases/download/${version}/${pname}-${version}.tbz"; + sha256 = "0dpnpla20lgiicrxl2432m2fcr6y68msw3pnjxqb11xw6yrdfhsz"; + }; + + useDune2 = true; + + doCheck = true; + checkInputs = [ + stdlib-shims + ]; + + meta = with lib; { + description = "OCaml binary heap implementation by Jean-Christophe Filliatre"; + license = licenses.lgpl21Only; + maintainers = [ maintainers.sternenseemann ]; + homepage = "https://github.com/backtracking/bheap"; + }; +} diff --git a/pkgs/development/ocaml-modules/bos/default.nix b/pkgs/development/ocaml-modules/bos/default.nix index 84cee3d97ce..62438526d70 100644 --- a/pkgs/development/ocaml-modules/bos/default.nix +++ b/pkgs/development/ocaml-modules/bos/default.nix @@ -3,24 +3,24 @@ }: stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-bos-${version}"; - version = "0.2.0"; - src = fetchurl { - url = "https://erratique.ch/software/bos/releases/bos-${version}.tbz"; - sha256 = "1s10iqx8rgnxr5n93lf4blwirjf8nlm272yg5sipr7lsr35v49wc"; - }; + name = "ocaml${ocaml.version}-bos-${version}"; + version = "0.2.0"; + src = fetchurl { + url = "https://erratique.ch/software/bos/releases/bos-${version}.tbz"; + sha256 = "1s10iqx8rgnxr5n93lf4blwirjf8nlm272yg5sipr7lsr35v49wc"; + }; - nativeBuildInputs = [ ocaml findlib ocamlbuild ]; - buildInputs = [ findlib topkg ]; - propagatedBuildInputs = [ astring fmt fpath logs rresult ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; + buildInputs = [ findlib topkg ]; + propagatedBuildInputs = [ astring fmt fpath logs rresult ]; - inherit (topkg) buildPhase installPhase; + inherit (topkg) buildPhase installPhase; - meta = { - description = "Basic OS interaction for OCaml"; - homepage = "https://erratique.ch/software/bos"; - license = lib.licenses.isc; - maintainers = [ lib.maintainers.vbgl ]; - inherit (ocaml.meta) platforms; - }; + meta = { + description = "Basic OS interaction for OCaml"; + homepage = "https://erratique.ch/software/bos"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + inherit (ocaml.meta) platforms; + }; } diff --git a/pkgs/development/ocaml-modules/cairo2/default.nix b/pkgs/development/ocaml-modules/cairo2/default.nix index bf129c7bc44..93de77fb322 100644 --- a/pkgs/development/ocaml-modules/cairo2/default.nix +++ b/pkgs/development/ocaml-modules/cairo2/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, buildDunePackage, ocaml -, pkgconfig, cairo +, pkg-config, cairo }: buildDunePackage rec { @@ -11,7 +11,7 @@ buildDunePackage rec { sha256 = "1ik4qf4b9443sliq2z7x9acd40rmzvyzjh3bh98wvjklxbb84a9i"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ cairo ]; doCheck = !(stdenv.isDarwin diff --git a/pkgs/development/ocaml-modules/camomile/default.nix b/pkgs/development/ocaml-modules/camomile/default.nix index 2b246d0f3ea..6bae728cafa 100644 --- a/pkgs/development/ocaml-modules/camomile/default.nix +++ b/pkgs/development/ocaml-modules/camomile/default.nix @@ -2,23 +2,23 @@ buildDunePackage rec { pname = "camomile"; - version = "1.0.2"; + version = "1.0.2"; - src = fetchFromGitHub { - owner = "yoriyuki"; - repo = pname; - rev = version; - sha256 = "00i910qjv6bpk0nkafp5fg97isqas0bwjf7m6rz11rsxilpalzad"; - }; + src = fetchFromGitHub { + owner = "yoriyuki"; + repo = pname; + rev = version; + sha256 = "00i910qjv6bpk0nkafp5fg97isqas0bwjf7m6rz11rsxilpalzad"; + }; - buildInputs = [ cppo ]; + buildInputs = [ cppo ]; - configurePhase = "ocaml configure.ml --share $out/share/camomile"; + configurePhase = "ocaml configure.ml --share $out/share/camomile"; - meta = { - inherit (src.meta) homepage; - maintainers = [ lib.maintainers.vbgl ]; - license = lib.licenses.lgpl21; - description = "A Unicode library for OCaml"; - }; + meta = { + inherit (src.meta) homepage; + maintainers = [ lib.maintainers.vbgl ]; + license = lib.licenses.lgpl21; + description = "A Unicode library for OCaml"; + }; } diff --git a/pkgs/development/ocaml-modules/caqti/async.nix b/pkgs/development/ocaml-modules/caqti/async.nix new file mode 100644 index 00000000000..0e0da6a94bb --- /dev/null +++ b/pkgs/development/ocaml-modules/caqti/async.nix @@ -0,0 +1,11 @@ +{ lib, buildDunePackage, async_kernel, async_unix, caqti, core_kernel }: + +buildDunePackage { + pname = "caqti-async"; + useDune2 = true; + inherit (caqti) version src; + + propagatedBuildInputs = [ async_kernel async_unix caqti core_kernel ]; + + meta = caqti.meta // { description = "Async support for Caqti"; }; +} diff --git a/pkgs/development/ocaml-modules/caqti/default.nix b/pkgs/development/ocaml-modules/caqti/default.nix new file mode 100644 index 00000000000..6df0af597c2 --- /dev/null +++ b/pkgs/development/ocaml-modules/caqti/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchFromGitHub, buildDunePackage, cppo, logs, ptime, uri }: + +buildDunePackage rec { + pname = "caqti"; + version = "1.3.0"; + useDune2 = true; + + minimumOCamlVersion = "4.04"; + + src = fetchFromGitHub { + owner = "paurkedal"; + repo = "ocaml-${pname}"; + rev = "v${version}"; + sha256 = "1ksjchfjnh059wvd95my1sv9b0ild0dfaiynbf2xsaz7zg1y4xmw"; + }; + + buildInputs = [ cppo ]; + propagatedBuildInputs = [ logs ptime uri ]; + + meta = { + description = "Unified interface to relational database libraries"; + license = "LGPL-3.0-or-later WITH OCaml-LGPL-linking-exception"; + maintainers = with lib.maintainers; [ bcc32 ]; + homepage = "https://github.com/paurkedal/ocaml-caqti"; + }; +} diff --git a/pkgs/development/ocaml-modules/caqti/driver-mariadb.nix b/pkgs/development/ocaml-modules/caqti/driver-mariadb.nix new file mode 100644 index 00000000000..5f4f681540e --- /dev/null +++ b/pkgs/development/ocaml-modules/caqti/driver-mariadb.nix @@ -0,0 +1,13 @@ +{ lib, buildDunePackage, caqti, mariadb }: + +buildDunePackage { + pname = "caqti-driver-mariadb"; + useDune2 = true; + inherit (caqti) version src; + + propagatedBuildInputs = [ caqti mariadb ]; + + meta = caqti.meta // { + description = "MariaDB driver for Caqti using C bindings"; + }; +} diff --git a/pkgs/development/ocaml-modules/caqti/driver-postgresql.nix b/pkgs/development/ocaml-modules/caqti/driver-postgresql.nix new file mode 100644 index 00000000000..a1b427a5edf --- /dev/null +++ b/pkgs/development/ocaml-modules/caqti/driver-postgresql.nix @@ -0,0 +1,13 @@ +{ lib, buildDunePackage, caqti, postgresql }: + +buildDunePackage { + pname = "caqti-driver-postgresql"; + useDune2 = true; + inherit (caqti) version src; + + propagatedBuildInputs = [ caqti postgresql ]; + + meta = caqti.meta // { + description = "PostgreSQL driver for Caqti based on C bindings"; + }; +} diff --git a/pkgs/development/ocaml-modules/caqti/driver-sqlite3.nix b/pkgs/development/ocaml-modules/caqti/driver-sqlite3.nix new file mode 100644 index 00000000000..5282ba5ef50 --- /dev/null +++ b/pkgs/development/ocaml-modules/caqti/driver-sqlite3.nix @@ -0,0 +1,13 @@ +{ lib, buildDunePackage, caqti, ocaml_sqlite3 }: + +buildDunePackage { + pname = "caqti-driver-sqlite3"; + useDune2 = true; + inherit (caqti) version src; + + propagatedBuildInputs = [ caqti ocaml_sqlite3 ]; + + meta = caqti.meta // { + description = "Sqlite3 driver for Caqti using C bindings"; + }; +} diff --git a/pkgs/development/ocaml-modules/caqti/dynload.nix b/pkgs/development/ocaml-modules/caqti/dynload.nix new file mode 100644 index 00000000000..6ed86683728 --- /dev/null +++ b/pkgs/development/ocaml-modules/caqti/dynload.nix @@ -0,0 +1,13 @@ +{ lib, buildDunePackage, caqti }: + +buildDunePackage { + pname = "caqti-dynload"; + useDune2 = true; + inherit (caqti) version src; + + propagatedBuildInputs = [ caqti ]; + + meta = caqti.meta // { + description = "Dynamic linking of Caqti drivers using findlib.dynload"; + }; +} diff --git a/pkgs/development/ocaml-modules/caqti/lwt.nix b/pkgs/development/ocaml-modules/caqti/lwt.nix new file mode 100644 index 00000000000..f02fa377f80 --- /dev/null +++ b/pkgs/development/ocaml-modules/caqti/lwt.nix @@ -0,0 +1,11 @@ +{ lib, buildDunePackage, caqti, logs, lwt }: + +buildDunePackage { + pname = "caqti-lwt"; + useDune2 = true; + inherit (caqti) version src; + + propagatedBuildInputs = [ caqti logs lwt ]; + + meta = caqti.meta // { description = "Lwt support for Caqti"; }; +} diff --git a/pkgs/development/ocaml-modules/caqti/type-calendar.nix b/pkgs/development/ocaml-modules/caqti/type-calendar.nix new file mode 100644 index 00000000000..d2050e2cf47 --- /dev/null +++ b/pkgs/development/ocaml-modules/caqti/type-calendar.nix @@ -0,0 +1,14 @@ +{ lib, buildDunePackage, calendar, caqti }: + +buildDunePackage { + pname = "caqti-type-calendar"; + version = "1.2.0"; + useDune2 = true; + inherit (caqti) src; + + propagatedBuildInputs = [ calendar caqti ]; + + meta = caqti.meta // { + description = "Date and time field types using the calendar library"; + }; +} diff --git a/pkgs/development/ocaml-modules/charInfo_width/default.nix b/pkgs/development/ocaml-modules/charInfo_width/default.nix index 7a78573412f..5b9814cea69 100644 --- a/pkgs/development/ocaml-modules/charInfo_width/default.nix +++ b/pkgs/development/ocaml-modules/charInfo_width/default.nix @@ -3,6 +3,7 @@ buildDunePackage rec { pname = "charInfo_width"; version = "1.1.0"; + useDune2 = true; src = fetchzip { url = "https://bitbucket.org/zandoye/charinfo_width/get/${version}.tar.bz2"; sha256 = "19mnq9a1yr16srqs8n6hddahr4f9d2gbpmld62pvlw1ps7nfrp9w"; diff --git a/pkgs/development/ocaml-modules/cohttp/async.nix b/pkgs/development/ocaml-modules/cohttp/async.nix index 974c3aa2f9c..21e22533f1b 100644 --- a/pkgs/development/ocaml-modules/cohttp/async.nix +++ b/pkgs/development/ocaml-modules/cohttp/async.nix @@ -2,21 +2,21 @@ , logs, magic-mime }: if !lib.versionAtLeast cohttp.version "0.99" then - cohttp + cohttp else if !lib.versionAtLeast async.version "0.13" then - throw "cohttp-async needs async-0.13 (hence OCaml >= 4.08)" + throw "cohttp-async needs async-0.13 (hence OCaml >= 4.08)" else - buildDunePackage { - pname = "cohttp-async"; - useDune2 = true; - inherit (cohttp) version src; + buildDunePackage { + pname = "cohttp-async"; + useDune2 = true; + inherit (cohttp) version src; - buildInputs = [ ppx_sexp_conv ]; + buildInputs = [ ppx_sexp_conv ]; - propagatedBuildInputs = [ async cohttp conduit-async logs magic-mime uri ]; + propagatedBuildInputs = [ async cohttp conduit-async logs magic-mime uri ]; - meta = cohttp.meta // { - description = "CoHTTP implementation for the Async concurrency library"; - }; - } + meta = cohttp.meta // { + description = "CoHTTP implementation for the Async concurrency library"; + }; + } diff --git a/pkgs/development/ocaml-modules/cohttp/default.nix b/pkgs/development/ocaml-modules/cohttp/default.nix index 3fed7c55d45..e664d17f215 100644 --- a/pkgs/development/ocaml-modules/cohttp/default.nix +++ b/pkgs/development/ocaml-modules/cohttp/default.nix @@ -4,26 +4,26 @@ }: buildDunePackage rec { - pname = "cohttp"; - version = "2.5.4"; + pname = "cohttp"; + version = "2.5.4"; - useDune2 = true; + useDune2 = true; - minimumOCamlVersion = "4.04.1"; + minimumOCamlVersion = "4.04.1"; - src = fetchurl { - url = "https://github.com/mirage/ocaml-cohttp/releases/download/v${version}/cohttp-v${version}.tbz"; - sha256 = "1q04spmki5zis5p5m1vs77i3k7ijm134j62g61071vblwx25z17a"; - }; + src = fetchurl { + url = "https://github.com/mirage/ocaml-cohttp/releases/download/v${version}/cohttp-v${version}.tbz"; + sha256 = "1q04spmki5zis5p5m1vs77i3k7ijm134j62g61071vblwx25z17a"; + }; - buildInputs = [ jsonm ppx_fields_conv ppx_sexp_conv ]; + buildInputs = [ jsonm ppx_fields_conv ppx_sexp_conv ]; - propagatedBuildInputs = [ base64 fieldslib re stringext uri-sexp stdlib-shims ]; + propagatedBuildInputs = [ base64 fieldslib re stringext uri-sexp stdlib-shims ]; - meta = { - description = "HTTP(S) library for Lwt, Async and Mirage"; - license = lib.licenses.isc; - maintainers = [ lib.maintainers.vbgl ]; - homepage = "https://github.com/mirage/ocaml-cohttp"; - }; + meta = { + description = "HTTP(S) library for Lwt, Async and Mirage"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + homepage = "https://github.com/mirage/ocaml-cohttp"; + }; } diff --git a/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix b/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix index 455a76ce94d..845df2a3f54 100644 --- a/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix +++ b/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix @@ -8,12 +8,12 @@ then cohttp-lwt else buildDunePackage { - pname = "cohttp-lwt-unix"; - inherit (cohttp-lwt) version src meta; + pname = "cohttp-lwt-unix"; + inherit (cohttp-lwt) version src meta; - useDune2 = true; + useDune2 = true; - buildInputs = [ cmdliner ppx_sexp_conv ]; + buildInputs = [ cmdliner ppx_sexp_conv ]; - propagatedBuildInputs = [ cohttp-lwt conduit-lwt-unix fmt magic-mime ]; + propagatedBuildInputs = [ cohttp-lwt conduit-lwt-unix fmt magic-mime ]; } diff --git a/pkgs/development/ocaml-modules/cohttp/lwt.nix b/pkgs/development/ocaml-modules/cohttp/lwt.nix index 04f81e8e8df..36831d94613 100644 --- a/pkgs/development/ocaml-modules/cohttp/lwt.nix +++ b/pkgs/development/ocaml-modules/cohttp/lwt.nix @@ -7,10 +7,10 @@ then throw "cohttp-lwt is not available for ppx_sexp_conv version ${ppx_sexp_con else buildDunePackage { - pname = "cohttp-lwt"; - inherit (cohttp) version src useDune2 meta; + pname = "cohttp-lwt"; + inherit (cohttp) version src useDune2 meta; - buildInputs = [ uri ppx_sexp_conv ]; + buildInputs = [ uri ppx_sexp_conv ]; - propagatedBuildInputs = [ cohttp ocaml_lwt logs ]; + propagatedBuildInputs = [ cohttp ocaml_lwt logs ]; } diff --git a/pkgs/development/ocaml-modules/cohttp/mirage.nix b/pkgs/development/ocaml-modules/cohttp/mirage.nix new file mode 100644 index 00000000000..e7b172349cb --- /dev/null +++ b/pkgs/development/ocaml-modules/cohttp/mirage.nix @@ -0,0 +1,20 @@ +{ buildDunePackage, cohttp, cohttp-lwt +, mirage-flow, mirage-channel, mirage-kv +, conduit, conduit-mirage, lwt +, astring, magic-mime +}: + +buildDunePackage { + pname = "cohttp-mirage"; + + inherit (cohttp) version src minimumOCamlVersion useDune2; + + propagatedBuildInputs = [ + mirage-flow mirage-channel conduit conduit-mirage mirage-kv + lwt cohttp cohttp-lwt astring magic-mime + ]; + + meta = cohttp.meta // { + description = "CoHTTP implementation for the MirageOS unikernel"; + }; +} diff --git a/pkgs/development/ocaml-modules/conduit/async.nix b/pkgs/development/ocaml-modules/conduit/async.nix index e289b5d711d..c15ad0520fb 100644 --- a/pkgs/development/ocaml-modules/conduit/async.nix +++ b/pkgs/development/ocaml-modules/conduit/async.nix @@ -5,15 +5,15 @@ then conduit else buildDunePackage { - pname = "conduit-async"; - useDune2 = true; - inherit (conduit) version src; + pname = "conduit-async"; + useDune2 = true; + inherit (conduit) version src; - buildInputs = [ ppx_sexp_conv ]; + buildInputs = [ ppx_sexp_conv ]; - propagatedBuildInputs = [ async async_ssl conduit ]; + propagatedBuildInputs = [ async async_ssl conduit ]; - meta = conduit.meta // { - description = "A network connection establishment library for Async"; - }; + meta = conduit.meta // { + description = "A network connection establishment library for Async"; + }; } diff --git a/pkgs/development/ocaml-modules/conduit/lwt-unix.nix b/pkgs/development/ocaml-modules/conduit/lwt-unix.nix index 9f871a8ea9c..ab6449b50a1 100644 --- a/pkgs/development/ocaml-modules/conduit/lwt-unix.nix +++ b/pkgs/development/ocaml-modules/conduit/lwt-unix.nix @@ -4,17 +4,17 @@ }: buildDunePackage { - pname = "conduit-lwt-unix"; - inherit (conduit-lwt) version src minimumOCamlVersion; + pname = "conduit-lwt-unix"; + inherit (conduit-lwt) version src minimumOCamlVersion; - useDune2 = true; + useDune2 = true; - buildInputs = [ ppx_sexp_conv ]; + buildInputs = [ ppx_sexp_conv ]; - propagatedBuildInputs = - [ conduit-lwt ocaml_lwt uri ipaddr ipaddr-sexp tls lwt_ssl ]; + propagatedBuildInputs = + [ conduit-lwt ocaml_lwt uri ipaddr ipaddr-sexp tls lwt_ssl ]; - meta = conduit-lwt.meta // { - description = "A network connection establishment library for Lwt_unix"; - }; + meta = conduit-lwt.meta // { + description = "A network connection establishment library for Lwt_unix"; + }; } diff --git a/pkgs/development/ocaml-modules/conduit/lwt.nix b/pkgs/development/ocaml-modules/conduit/lwt.nix index 512aa60bb66..2f18027a67b 100644 --- a/pkgs/development/ocaml-modules/conduit/lwt.nix +++ b/pkgs/development/ocaml-modules/conduit/lwt.nix @@ -1,14 +1,14 @@ { buildDunePackage, ppx_sexp_conv, conduit, ocaml_lwt, sexplib }: buildDunePackage { - pname = "conduit-lwt"; - inherit (conduit) version src useDune2 minimumOCamlVersion; + pname = "conduit-lwt"; + inherit (conduit) version src useDune2 minimumOCamlVersion; - buildInputs = [ ppx_sexp_conv ]; + buildInputs = [ ppx_sexp_conv ]; - propagatedBuildInputs = [ conduit ocaml_lwt sexplib ]; + propagatedBuildInputs = [ conduit ocaml_lwt sexplib ]; - meta = conduit.meta // { - description = "A network connection establishment library for Lwt"; - }; + meta = conduit.meta // { + description = "A network connection establishment library for Lwt"; + }; } diff --git a/pkgs/development/ocaml-modules/conduit/mirage.nix b/pkgs/development/ocaml-modules/conduit/mirage.nix new file mode 100644 index 00000000000..6100908f785 --- /dev/null +++ b/pkgs/development/ocaml-modules/conduit/mirage.nix @@ -0,0 +1,24 @@ +{ buildDunePackage, conduit-lwt +, ppx_sexp_conv, sexplib, cstruct, mirage-stack, mirage-flow +, mirage-flow-combinators, mirage-random, mirage-time, mirage-clock +, dns-client, vchan, xenstore, tls, tls-mirage, ipaddr, ipaddr-sexp +}: + +buildDunePackage { + pname = "conduit-mirage"; + + inherit (conduit-lwt) version src minimumOCamlVersion useDune2; + + nativeBuildInputs = [ ppx_sexp_conv ]; + + propagatedBuildInputs = [ + sexplib cstruct mirage-stack mirage-clock mirage-flow + mirage-flow-combinators mirage-random mirage-time + dns-client conduit-lwt vchan xenstore tls tls-mirage + ipaddr ipaddr-sexp + ]; + + meta = conduit-lwt.meta // { + description = "A network connection establishment library for MirageOS"; + }; +} diff --git a/pkgs/development/ocaml-modules/cstruct/default.nix b/pkgs/development/ocaml-modules/cstruct/default.nix index acd5d83e4f1..8b0c4ee9ebb 100644 --- a/pkgs/development/ocaml-modules/cstruct/default.nix +++ b/pkgs/development/ocaml-modules/cstruct/default.nix @@ -1,8 +1,8 @@ -{ lib, fetchurl, buildDunePackage, bigarray-compat }: +{ lib, fetchurl, buildDunePackage, bigarray-compat, alcotest, ocaml }: buildDunePackage rec { pname = "cstruct"; - version = "5.0.0"; + version = "6.0.0"; useDune2 = true; @@ -10,11 +10,15 @@ buildDunePackage rec { src = fetchurl { url = "https://github.com/mirage/ocaml-cstruct/releases/download/v${version}/cstruct-v${version}.tbz"; - sha256 = "1z403q2nkgz5x07j0ypy6q0mk2yxgqbp1jlqkngbajna7124x2pb"; + sha256 = "0xi6cj85z033fqrqdkwac6gg07629vzdhx03c3lhiwwc4lpnv8bq"; }; propagatedBuildInputs = [ bigarray-compat ]; + # alcotest isn't available for OCaml < 4.05 due to fmt + doCheck = lib.versionAtLeast ocaml.version "4.05"; + checkInputs = [ alcotest ]; + meta = { description = "Access C-like structures directly from OCaml"; license = lib.licenses.isc; diff --git a/pkgs/development/ocaml-modules/cstruct/lwt.nix b/pkgs/development/ocaml-modules/cstruct/lwt.nix index f340bfcda25..df8941d1260 100644 --- a/pkgs/development/ocaml-modules/cstruct/lwt.nix +++ b/pkgs/development/ocaml-modules/cstruct/lwt.nix @@ -5,10 +5,10 @@ then cstruct else buildDunePackage { - pname = "cstruct-lwt"; - inherit (cstruct) version src useDune2 meta; + pname = "cstruct-lwt"; + inherit (cstruct) version src useDune2 meta; - minimumOCamlVersion = "4.02"; + minimumOCamlVersion = "4.03"; - propagatedBuildInputs = [ cstruct lwt ]; + propagatedBuildInputs = [ cstruct lwt ]; } diff --git a/pkgs/development/ocaml-modules/cstruct/ppx.nix b/pkgs/development/ocaml-modules/cstruct/ppx.nix index feb8feac6b6..aa003295e90 100644 --- a/pkgs/development/ocaml-modules/cstruct/ppx.nix +++ b/pkgs/development/ocaml-modules/cstruct/ppx.nix @@ -1,14 +1,32 @@ -{ lib, buildDunePackage, cstruct, sexplib, ppx_tools_versioned, ppxlib }: +{ lib, buildDunePackage, cstruct, sexplib, ppxlib, stdlib-shims +, ounit, cppo, ppx_sexp_conv, cstruct-unix, cstruct-sexp +, fetchpatch +}: if !lib.versionAtLeast (cstruct.version or "1") "3" then cstruct else buildDunePackage { - pname = "ppx_cstruct"; - inherit (cstruct) version src useDune2 meta; + pname = "ppx_cstruct"; + inherit (cstruct) version src useDune2 meta; - minimumOCamlVersion = "4.03"; + minimumOCamlVersion = "4.07"; - propagatedBuildInputs = [ cstruct ppx_tools_versioned ppxlib sexplib ]; + # prevent ANSI escape sequences from messing up the test cases + # https://github.com/mirage/ocaml-cstruct/issues/283 + patches = [ + (fetchpatch { + url = "https://github.com/mirage/ocaml-cstruct/pull/285/commits/60dfed98b4c34455bf339ac60e2ed5ef05feb48f.patch"; + sha256 = "1x9i62nrlfy9l44vb0a7qjfrg2wyki4c8nmmqnzwpcbkgxi3q6n5"; + }) + ]; + + propagatedBuildInputs = [ cstruct ppxlib sexplib stdlib-shims ]; + + # disable until ppx_sexp_conv uses ppxlib 0.20.0 (or >= 0.16.0) + # since the propagation of the older ppxlib breaks the ppx_cstruct + # build. + doCheck = false; + checkInputs = [ ounit cppo ppx_sexp_conv cstruct-sexp cstruct-unix ]; } diff --git a/pkgs/development/ocaml-modules/cstruct/sexp.nix b/pkgs/development/ocaml-modules/cstruct/sexp.nix index 04bb10d6f75..b04810e4803 100644 --- a/pkgs/development/ocaml-modules/cstruct/sexp.nix +++ b/pkgs/development/ocaml-modules/cstruct/sexp.nix @@ -5,12 +5,14 @@ then cstruct else buildDunePackage rec { - pname = "cstruct-sexp"; - inherit (cstruct) version src useDune2 meta; + pname = "cstruct-sexp"; + inherit (cstruct) version src useDune2 meta; - doCheck = lib.versionAtLeast ocaml.version "4.03"; - checkInputs = lib.optional doCheck alcotest; + minimumOCamlVersion = "4.03"; - propagatedBuildInputs = [ cstruct sexplib ]; -} + # alcotest is only available on OCaml >= 4.05 due to fmt + doCheck = lib.versionAtLeast ocaml.version "4.05"; + checkInputs = [ alcotest ]; + propagatedBuildInputs = [ cstruct sexplib ]; +} diff --git a/pkgs/development/ocaml-modules/cstruct/unix.nix b/pkgs/development/ocaml-modules/cstruct/unix.nix index b7e0df0185c..1ea27bb04de 100644 --- a/pkgs/development/ocaml-modules/cstruct/unix.nix +++ b/pkgs/development/ocaml-modules/cstruct/unix.nix @@ -5,10 +5,10 @@ then cstruct else buildDunePackage { - pname = "cstruct-unix"; - inherit (cstruct) version src useDune2 meta; + pname = "cstruct-unix"; + inherit (cstruct) version src useDune2 meta; - minimumOCamlVersion = "4.06"; + minimumOCamlVersion = "4.06"; - propagatedBuildInputs = [ cstruct ]; + propagatedBuildInputs = [ cstruct ]; } diff --git a/pkgs/development/ocaml-modules/csv/default.nix b/pkgs/development/ocaml-modules/csv/default.nix index 8cf2918989e..59562453175 100644 --- a/pkgs/development/ocaml-modules/csv/default.nix +++ b/pkgs/development/ocaml-modules/csv/default.nix @@ -2,19 +2,19 @@ buildDunePackage rec { pname = "csv"; - version = "2.4"; + version = "2.4"; - useDune2 = true; + useDune2 = true; - src = fetchurl { - url = "https://github.com/Chris00/ocaml-${pname}/releases/download/${version}/csv-${version}.tbz"; - sha256 = "13m9n8mdss6jfbiw7d5bybxn4n85vmg4zw7dc968qrgjfy0w9zhk"; - }; + src = fetchurl { + url = "https://github.com/Chris00/ocaml-${pname}/releases/download/${version}/csv-${version}.tbz"; + sha256 = "13m9n8mdss6jfbiw7d5bybxn4n85vmg4zw7dc968qrgjfy0w9zhk"; + }; - meta = { - description = "A pure OCaml library to read and write CSV files"; - license = lib.licenses.lgpl21; - maintainers = [ lib.maintainers.vbgl ]; - homepage = "https://github.com/Chris00/ocaml-csv"; - }; + meta = { + description = "A pure OCaml library to read and write CSV files"; + license = lib.licenses.lgpl21; + maintainers = [ lib.maintainers.vbgl ]; + homepage = "https://github.com/Chris00/ocaml-csv"; + }; } diff --git a/pkgs/development/ocaml-modules/ctypes/default.nix b/pkgs/development/ocaml-modules/ctypes/default.nix index 92a4ff9535c..9cb3a3d4cb8 100644 --- a/pkgs/development/ocaml-modules/ctypes/default.nix +++ b/pkgs/development/ocaml-modules/ctypes/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, ocaml, findlib, libffi, pkgconfig, ncurses, integers }: +{ lib, stdenv, fetchzip, ocaml, findlib, libffi, pkg-config, ncurses, integers }: if !lib.versionAtLeast ocaml.version "4.02" then throw "ctypes is not available for OCaml ${ocaml.version}" @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "16brmdnz7wi2z25qqhd5s5blyq4app6jbv6g9pa4vyg6h0nzbcys"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ocaml findlib ncurses ]; propagatedBuildInputs = [ integers libffi ]; diff --git a/pkgs/development/ocaml-modules/curly/default.nix b/pkgs/development/ocaml-modules/curly/default.nix index 491b2844ef1..1c48b509c41 100644 --- a/pkgs/development/ocaml-modules/curly/default.nix +++ b/pkgs/development/ocaml-modules/curly/default.nix @@ -26,5 +26,12 @@ buildDunePackage rec { substituteInPlace src/curly.ml \ --replace "exe=\"curl\"" "exe=\"${curl}/bin/curl\"" ''; + + meta = with lib; { + description = "Curly is a brain dead wrapper around the curl command line utility"; + homepage = "https://github.com/rgrinberg/curly"; + license = licenses.isc; + maintainers = [ maintainers.sternenseemann ]; + }; } diff --git a/pkgs/development/ocaml-modules/decompress/default.nix b/pkgs/development/ocaml-modules/decompress/default.nix index a3bf3456ed0..067fac33d45 100644 --- a/pkgs/development/ocaml-modules/decompress/default.nix +++ b/pkgs/development/ocaml-modules/decompress/default.nix @@ -4,25 +4,25 @@ }: buildDunePackage rec { - version = "0.9.0"; - pname = "decompress"; + version = "0.9.0"; + pname = "decompress"; - useDune2 = true; + useDune2 = true; - src = fetchurl { - url = "https://github.com/mirage/decompress/releases/download/v${version}/decompress-v${version}.tbz"; - sha256 = "0fryhcvv96vfca51c7kqdn3n3canqsbbvfbi75ya6lca4lmpipbh"; - }; + src = fetchurl { + url = "https://github.com/mirage/decompress/releases/download/v${version}/decompress-v${version}.tbz"; + sha256 = "0fryhcvv96vfca51c7kqdn3n3canqsbbvfbi75ya6lca4lmpipbh"; + }; - buildInputs = [ cmdliner ]; - propagatedBuildInputs = [ checkseum ]; - checkInputs = lib.optionals doCheck [ alcotest bos camlzip mmap re ]; - doCheck = true; + buildInputs = [ cmdliner ]; + propagatedBuildInputs = [ checkseum ]; + checkInputs = lib.optionals doCheck [ alcotest bos camlzip mmap re ]; + doCheck = true; - meta = { - description = "Pure OCaml implementation of Zlib"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.vbgl ]; - homepage = "https://github.com/mirage/decompress"; - }; + meta = { + description = "Pure OCaml implementation of Zlib"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; + homepage = "https://github.com/mirage/decompress"; + }; } diff --git a/pkgs/development/ocaml-modules/dns/default.nix b/pkgs/development/ocaml-modules/dns/default.nix index 21d9d02da4b..4f0b95da6cb 100644 --- a/pkgs/development/ocaml-modules/dns/default.nix +++ b/pkgs/development/ocaml-modules/dns/default.nix @@ -4,14 +4,14 @@ buildDunePackage rec { pname = "dns"; - version = "4.6.2"; + version = "4.6.3"; useDune2 = true; minimumOCamlVersion = "4.07"; src = fetchurl { url = "https://github.com/mirage/ocaml-dns/releases/download/v${version}/dns-v${version}.tbz"; - sha256 = "0prypr5c589vay4alri78g0sarh06z35did26wn3s3di17d5761q"; + sha256 = "0g7xw43jm5hv0w9lsnhhi0w3243mxl615cdsvz29yh39fcqvqsdy"; }; propagatedBuildInputs = [ rresult astring fmt logs ptime domain-name gmap cstruct ipaddr lru duration metrics ]; diff --git a/pkgs/development/ocaml-modules/dolmen/default.nix b/pkgs/development/ocaml-modules/dolmen/default.nix index d4a47abcafa..a1a73bfe218 100644 --- a/pkgs/development/ocaml-modules/dolmen/default.nix +++ b/pkgs/development/ocaml-modules/dolmen/default.nix @@ -1,27 +1,27 @@ { stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, menhir }: stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-dolmen-${version}"; - version = "0.2"; - src = fetchFromGitHub { - owner = "Gbury"; - repo = "dolmen"; - rev = "v${version}"; - sha256 = "1b9mf8p6mic0n76acx8x82hhgm2n40sdv0jri95im65l52223saf"; - }; + name = "ocaml${ocaml.version}-dolmen-${version}"; + version = "0.2"; + src = fetchFromGitHub { + owner = "Gbury"; + repo = "dolmen"; + rev = "v${version}"; + sha256 = "1b9mf8p6mic0n76acx8x82hhgm2n40sdv0jri95im65l52223saf"; + }; - buildInputs = [ ocaml findlib ocamlbuild ]; - propagatedBuildInputs = [ menhir ]; + buildInputs = [ ocaml findlib ocamlbuild ]; + propagatedBuildInputs = [ menhir ]; - makeFlags = [ "-C" "src" ]; + makeFlags = [ "-C" "src" ]; - createFindlibDestdir = true; + createFindlibDestdir = true; - meta = { - description = "An OCaml library providing clean and flexible parsers for input languages"; - license = lib.licenses.bsd2; - maintainers = [ lib.maintainers.vbgl ]; - inherit (src.meta) homepage; - inherit (ocaml.meta) platforms; - }; + meta = { + description = "An OCaml library providing clean and flexible parsers for input languages"; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.vbgl ]; + inherit (src.meta) homepage; + inherit (ocaml.meta) platforms; + }; } diff --git a/pkgs/development/ocaml-modules/either/default.nix b/pkgs/development/ocaml-modules/either/default.nix new file mode 100644 index 00000000000..71d16c9674c --- /dev/null +++ b/pkgs/development/ocaml-modules/either/default.nix @@ -0,0 +1,20 @@ +{ lib, buildDunePackage, fetchurl }: + +buildDunePackage rec { + pname = "either"; + version = "1.0.0"; + + src = fetchurl { + url = "https://github.com/mirage/either/releases/download/${version}/either-${version}.tbz"; + sha256 = "bf674de3312dee7b7215f07df1e8a96eb3d679164b8a918cdd95b8d97e505884"; + }; + + useDune2 = true; + + meta = with lib; { + description = "Compatibility Either module"; + license = licenses.mit; + homepage = "https://github.com/mirage/either"; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/development/ocaml-modules/elpi/default.nix b/pkgs/development/ocaml-modules/elpi/default.nix index 6f0d355fed5..e2d2a2c5dc9 100644 --- a/pkgs/development/ocaml-modules/elpi/default.nix +++ b/pkgs/development/ocaml-modules/elpi/default.nix @@ -4,7 +4,7 @@ }: with lib; let fetched = import ../../../build-support/coq/meta-fetch/default.nix - {inherit stdenv fetchzip; } ({ + {inherit lib stdenv fetchzip; } ({ release."1.12.0".sha256 = "1agisdnaq9wrw3r73xz14yrq3wx742i6j8i5icjagqk0ypmly2is"; release."1.11.4".sha256 = "1m0jk9swcs3jcrw5yyw5343v8mgax238cjb03s8gc4wipw1fn9f5"; releaseRev = v: "v${v}"; @@ -17,9 +17,9 @@ buildDunePackage rec { minimumOCamlVersion = "4.04"; - buildInputs = [ perl ncurses ppxlib ]; + buildInputs = [ perl ncurses ]; - propagatedBuildInputs = [ camlp5 ppx_deriving re ]; + propagatedBuildInputs = [ camlp5 ppxlib ppx_deriving re ]; meta = { description = "Embeddable λProlog Interpreter"; diff --git a/pkgs/development/ocaml-modules/emile/default.nix b/pkgs/development/ocaml-modules/emile/default.nix new file mode 100644 index 00000000000..d296e3de967 --- /dev/null +++ b/pkgs/development/ocaml-modules/emile/default.nix @@ -0,0 +1,39 @@ +{ lib, buildDunePackage, fetchurl, ocaml +, angstrom, ipaddr, base64, pecu, uutf +, alcotest, cmdliner +}: + +buildDunePackage rec { + pname = "emile"; + version = "1.1"; + + useDune2 = true; + + src = fetchurl { + url = "https://github.com/dinosaure/emile/releases/download/v${version}/emile-v${version}.tbz"; + sha256 = "0r1141makr0b900aby1gn0fccjv1qcqgyxib3bzq8fxmjqwjan8p"; + }; + + buildInputs = [ cmdliner ]; + + propagatedBuildInputs = [ + angstrom + ipaddr + base64 + pecu + uutf + ]; + + # technically emile is available for ocaml >= 4.03, but alcotest + # and angstrom (fmt) are only available for >= 4.05. Disabling + # tests for < 4.05 at least improves the error message + doCheck = lib.versionAtLeast ocaml.version "4.05"; + checkInputs = [ alcotest ]; + + meta = with lib; { + description = "Parser of email address according RFC822"; + license = licenses.mit; + homepage = "https://github.com/dinosaure/emile"; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/development/ocaml-modules/expat/default.nix b/pkgs/development/ocaml-modules/expat/default.nix index 9675fa88151..1812473e78b 100644 --- a/pkgs/development/ocaml-modules/expat/default.nix +++ b/pkgs/development/ocaml-modules/expat/default.nix @@ -1,32 +1,32 @@ { stdenv, lib, fetchFromGitHub, expat, ocaml, findlib, ounit }: stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-expat-${version}"; - version = "1.1.0"; + name = "ocaml${ocaml.version}-expat-${version}"; + version = "1.1.0"; - src = fetchFromGitHub { - owner = "whitequark"; - repo = "ocaml-expat"; - rev = "v${version}"; - sha256 = "07wm9663z744ya6z2lhiz5hbmc76kkipg04j9vw9dqpd1y1f2x3q"; - }; + src = fetchFromGitHub { + owner = "whitequark"; + repo = "ocaml-expat"; + rev = "v${version}"; + sha256 = "07wm9663z744ya6z2lhiz5hbmc76kkipg04j9vw9dqpd1y1f2x3q"; + }; - prePatch = '' - substituteInPlace Makefile --replace "gcc" "\$(CC)" - ''; + prePatch = '' + substituteInPlace Makefile --replace "gcc" "\$(CC)" + ''; - buildInputs = [ ocaml findlib expat ounit ]; + buildInputs = [ ocaml findlib expat ounit ]; - doCheck = !lib.versionAtLeast ocaml.version "4.06"; - checkTarget = "testall"; + doCheck = !lib.versionAtLeast ocaml.version "4.06"; + checkTarget = "testall"; - createFindlibDestdir = true; + createFindlibDestdir = true; - meta = { - description = "OCaml wrapper for the Expat XML parsing library"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.vbgl ]; - inherit (src.meta) homepage; - inherit (ocaml.meta) platforms; - }; + meta = { + description = "OCaml wrapper for the Expat XML parsing library"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; + inherit (src.meta) homepage; + inherit (ocaml.meta) platforms; + }; } diff --git a/pkgs/development/ocaml-modules/faillib/default.nix b/pkgs/development/ocaml-modules/faillib/default.nix index d045bd5a37a..63040fadda5 100644 --- a/pkgs/development/ocaml-modules/faillib/default.nix +++ b/pkgs/development/ocaml-modules/faillib/default.nix @@ -11,7 +11,7 @@ buildOcaml rec { src = fetchurl { url = "https://github.com/janestreet/faillib/archive/${version}.tar.gz"; - sha256 = "12dvaxkmgf7yzzvbadcyk1n17llgh6p8qr33867d21npaljy7l9v"; + sha256 = "12dvaxkmgf7yzzvbadcyk1n17llgh6p8qr33867d21npaljy7l9v"; }; propagatedBuildInputs = [ camlp4 herelib ]; diff --git a/pkgs/development/ocaml-modules/fontconfig/default.nix b/pkgs/development/ocaml-modules/fontconfig/default.nix index 8f804988129..55e8e941895 100644 --- a/pkgs/development/ocaml-modules/fontconfig/default.nix +++ b/pkgs/development/ocaml-modules/fontconfig/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, fontconfig, ocaml }: +{ stdenv, lib, fetchFromGitHub, pkg-config, fontconfig, ocaml }: stdenv.mkDerivation { name = "ocaml-fontconfig-20131103"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1fw6bzydmnyh2g4x35mcbg0hypnxqhynivk4nakcsx7prr8zr3yh"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ocaml fontconfig ]; makeFlags = [ "OCAML_STDLIB_DIR=$(out)/lib/ocaml/${lib.getVersion ocaml}/site-lib/" diff --git a/pkgs/development/ocaml-modules/git-http/default.nix b/pkgs/development/ocaml-modules/git-http/default.nix index 3b127c65006..54bd5c2da23 100644 --- a/pkgs/development/ocaml-modules/git-http/default.nix +++ b/pkgs/development/ocaml-modules/git-http/default.nix @@ -1,15 +1,15 @@ { buildDunePackage, git, cohttp, cohttp-lwt }: buildDunePackage { - pname = "git-http"; - inherit (git) version src minimumOCamlVersion; + pname = "git-http"; + inherit (git) version src minimumOCamlVersion; - useDune2 = true; + useDune2 = true; - propagatedBuildInputs = [ git cohttp cohttp-lwt ]; + propagatedBuildInputs = [ git cohttp cohttp-lwt ]; - meta = { - description = "Client implementation of the “Smart” HTTP Git protocol in pure OCaml"; - inherit (git.meta) homepage license maintainers; - }; + meta = { + description = "Client implementation of the “Smart” HTTP Git protocol in pure OCaml"; + inherit (git.meta) homepage license maintainers; + }; } diff --git a/pkgs/development/ocaml-modules/git-unix/default.nix b/pkgs/development/ocaml-modules/git-unix/default.nix index 0633b8af8f0..6ee6ef21c15 100644 --- a/pkgs/development/ocaml-modules/git-unix/default.nix +++ b/pkgs/development/ocaml-modules/git-unix/default.nix @@ -4,17 +4,17 @@ }: buildDunePackage { - pname = "git-unix"; - inherit (git-http) version src minimumOCamlVersion; + pname = "git-unix"; + inherit (git-http) version src minimumOCamlVersion; - useDune2 = true; + useDune2 = true; - propagatedBuildInputs = [ mmap cmdliner git-http cohttp cohttp-lwt-unix mtime ]; - checkInputs = [ alcotest mirage-crypto-rng tls io-page git-binary ]; - doCheck = !stdenv.isAarch64; + propagatedBuildInputs = [ mmap cmdliner git-http cohttp cohttp-lwt-unix mtime ]; + checkInputs = [ alcotest mirage-crypto-rng tls io-page git-binary ]; + doCheck = !stdenv.isAarch64; - meta = { - description = "Unix backend for the Git protocol(s)"; - inherit (git-http.meta) homepage license maintainers; - }; + meta = { + description = "Unix backend for the Git protocol(s)"; + inherit (git-http.meta) homepage license maintainers; + }; } diff --git a/pkgs/development/ocaml-modules/git/default.nix b/pkgs/development/ocaml-modules/git/default.nix index ba2372090d8..f5cb452f1a9 100644 --- a/pkgs/development/ocaml-modules/git/default.nix +++ b/pkgs/development/ocaml-modules/git/default.nix @@ -6,28 +6,28 @@ }: buildDunePackage rec { - pname = "git"; - version = "2.1.3"; + pname = "git"; + version = "2.1.3"; - minimumOCamlVersion = "4.07"; - useDune2 = true; + minimumOCamlVersion = "4.07"; + useDune2 = true; - src = fetchurl { - url = "https://github.com/mirage/ocaml-git/releases/download/${version}/git-${version}.tbz"; - sha256 = "1ppllv65vrkfrmx46aiq5879isffcjmg92z9rv2kh92a83h4lqax"; - }; + src = fetchurl { + url = "https://github.com/mirage/ocaml-git/releases/download/${version}/git-${version}.tbz"; + sha256 = "1ppllv65vrkfrmx46aiq5879isffcjmg92z9rv2kh92a83h4lqax"; + }; - propagatedBuildInputs = [ - angstrom astring checkseum cstruct decompress digestif encore duff fmt fpath - hex ke logs lru ocaml_lwt ocamlgraph ocplib-endian uri rresult stdlib-shims - ]; - checkInputs = [ alcotest mtime mirage-crypto-rng tls git-binary ]; - doCheck = !stdenv.isAarch64; + propagatedBuildInputs = [ + angstrom astring checkseum cstruct decompress digestif encore duff fmt fpath + hex ke logs lru ocaml_lwt ocamlgraph ocplib-endian uri rresult stdlib-shims + ]; + checkInputs = [ alcotest mtime mirage-crypto-rng tls git-binary ]; + doCheck = !stdenv.isAarch64; - meta = { - description = "Git format and protocol in pure OCaml"; - license = lib.licenses.isc; - maintainers = [ lib.maintainers.vbgl ]; - homepage = "https://github.com/mirage/ocaml-git"; - }; + meta = { + description = "Git format and protocol in pure OCaml"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + homepage = "https://github.com/mirage/ocaml-git"; + }; } diff --git a/pkgs/development/ocaml-modules/gmetadom/default.nix b/pkgs/development/ocaml-modules/gmetadom/default.nix index 145cc384529..29df5ce8f4e 100644 --- a/pkgs/development/ocaml-modules/gmetadom/default.nix +++ b/pkgs/development/ocaml-modules/gmetadom/default.nix @@ -1,4 +1,4 @@ -{stdenv, lib, fetchurl, ocaml, findlib, gdome2, libxslt, pkgconfig}: +{stdenv, lib, fetchurl, ocaml, findlib, gdome2, libxslt, pkg-config}: let pname = "gmetadom"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ocaml findlib gdome2 libxslt]; propagatedBuildInputs = [gdome2]; diff --git a/pkgs/development/ocaml-modules/hmap/default.nix b/pkgs/development/ocaml-modules/hmap/default.nix index 563d39909c8..67622a8ef6a 100644 --- a/pkgs/development/ocaml-modules/hmap/default.nix +++ b/pkgs/development/ocaml-modules/hmap/default.nix @@ -13,7 +13,7 @@ in assert lib.versionOlder minimumSupportedOcamlVersion ocaml.version; stdenv.mkDerivation rec { - pname = "hmap"; + pname = "hmap"; version = "0.8.1"; name = "ocaml${ocaml.version}-${pname}-${version}"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { sha256 = "10xyjy4ab87z7jnghy0wnla9wrmazgyhdwhr4hdmxxdn28dxn03a"; }; - buildInputs = [ ocaml ocamlbuild findlib topkg ]; + buildInputs = [ ocaml ocamlbuild findlib topkg ]; inherit (topkg) installPhase; @@ -33,9 +33,9 @@ stdenv.mkDerivation rec { checkPhase = "${topkg.run} test"; meta = { - description = "Heterogeneous value maps for OCaml"; + description = "Heterogeneous value maps for OCaml"; homepage = "https://erratique.ch/software/hmap"; - license = lib.licenses.isc; - maintainers = [ lib.maintainers.pmahoney ]; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.pmahoney ]; }; } diff --git a/pkgs/development/ocaml-modules/hxd/default.nix b/pkgs/development/ocaml-modules/hxd/default.nix new file mode 100644 index 00000000000..1d677ac1a2e --- /dev/null +++ b/pkgs/development/ocaml-modules/hxd/default.nix @@ -0,0 +1,41 @@ +{ lib, buildDunePackage, fetchurl +, dune-configurator, cmdliner, angstrom +, rresult, stdlib-shims, fmt, fpath +}: + +buildDunePackage rec { + pname = "hxd"; + version = "0.2.0"; + + useDune2 = true; + + minimumOCamlVersion = "4.06"; + + src = fetchurl { + url = "https://github.com/dinosaure/hxd/releases/download/v${version}/hxd-v${version}.tbz"; + sha256 = "1lyfrq058cc9x0c0hzsf3hv3ys0h8mxkwin9lldidlnj10izqf1l"; + }; + + nativeBuildInputs = [ + dune-configurator + ]; + + buildInputs = [ + cmdliner + angstrom + rresult + fmt + fpath + ]; + + propagatedBuildInputs = [ + stdlib-shims + ]; + + meta = with lib; { + description = "Hexdump in OCaml"; + homepage = "https://github.com/dinosaure/hxd"; + license = licenses.mit; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/development/ocaml-modules/inifiles/default.nix b/pkgs/development/ocaml-modules/inifiles/default.nix index c141c73506d..ad9bd3e2dc7 100644 --- a/pkgs/development/ocaml-modules/inifiles/default.nix +++ b/pkgs/development/ocaml-modules/inifiles/default.nix @@ -1,28 +1,28 @@ { stdenv, lib, fetchurl, fetchpatch, ocaml, findlib, ocaml_pcre }: stdenv.mkDerivation { - name = "ocaml${ocaml.version}-inifiles-1.2"; + name = "ocaml${ocaml.version}-inifiles-1.2"; - src = fetchurl { - url = "http://archive.ubuntu.com/ubuntu/pool/universe/o/ocaml-inifiles/ocaml-inifiles_1.2.orig.tar.gz"; - sha256 = "0jhzgiypmh6hwsv1zpiq77fi0cvcmwbiy5x0yg7mz6p3dh1dmkns"; - }; + src = fetchurl { + url = "http://archive.ubuntu.com/ubuntu/pool/universe/o/ocaml-inifiles/ocaml-inifiles_1.2.orig.tar.gz"; + sha256 = "0jhzgiypmh6hwsv1zpiq77fi0cvcmwbiy5x0yg7mz6p3dh1dmkns"; + }; - patches = [ (fetchpatch { - url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/ocaml-inifiles/ocaml-inifiles.1.2/files/ocaml-inifiles.diff"; - sha256 = "037kk3172s187w8vwsykdxlpklxzc7m7np57sapk499d8adzdgwn"; - })]; + patches = [ (fetchpatch { + url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/ocaml-inifiles/ocaml-inifiles.1.2/files/ocaml-inifiles.diff"; + sha256 = "037kk3172s187w8vwsykdxlpklxzc7m7np57sapk499d8adzdgwn"; + })]; - buildInputs = [ ocaml findlib ]; - propagatedBuildInputs = [ ocaml_pcre ]; + buildInputs = [ ocaml findlib ]; + propagatedBuildInputs = [ ocaml_pcre ]; - buildFlags = [ "all" "opt" ]; + buildFlags = [ "all" "opt" ]; - createFindlibDestdir = true; + createFindlibDestdir = true; - meta = { - description = "A small OCaml library to read and write .ini files"; - license = lib.licenses.lgpl21Plus; - inherit (ocaml.meta) platforms; - }; + meta = { + description = "A small OCaml library to read and write .ini files"; + license = lib.licenses.lgpl21Plus; + inherit (ocaml.meta) platforms; + }; } diff --git a/pkgs/development/ocaml-modules/inotify/default.nix b/pkgs/development/ocaml-modules/inotify/default.nix index d43d5d9cf8e..8910b720a84 100644 --- a/pkgs/development/ocaml-modules/inotify/default.nix +++ b/pkgs/development/ocaml-modules/inotify/default.nix @@ -4,41 +4,41 @@ }: stdenv.mkDerivation rec { - version = "2.3"; - name = "ocaml${ocaml.version}-inotify-${version}"; - - src = fetchFromGitHub { - owner = "whitequark"; - repo = "ocaml-inotify"; - rev = "v${version}"; - sha256 = "1s6vmqpx19hxzsi30jvp3h7p56rqnxfhfddpcls4nz8sqca1cz5y"; - }; - - patches = [ (fetchpatch { - url = "https://github.com/whitequark/ocaml-inotify/commit/716c8002cc1652f58eb0c400ae92e04003cba8c9.patch"; - sha256 = "04lfxrrsmk2mc704kaln8jqx93jc4bkxhijmfy2d4cmk1cim7r6k"; - }) ]; - - buildInputs = [ ocaml findlib ocamlbuild ocaml_lwt ]; - checkInputs = [ ounit fileutils ]; - - configureFlags = [ "--enable-lwt" - (lib.optionalString doCheck "--enable-tests") ]; - - postConfigure = lib.optionalString doCheck '' - echo '<lib_test/test_inotify_lwt.*>: pkg_threads' | tee -a _tags - ''; - - doCheck = true; - checkTarget = "test"; - - createFindlibDestdir = true; - - meta = { - description = "Bindings for Linux’s filesystem monitoring interface, inotify"; - license = lib.licenses.lgpl21; - maintainers = [ lib.maintainers.vbgl ]; - inherit (src.meta) homepage; - platforms = lib.platforms.linux; - }; + version = "2.3"; + name = "ocaml${ocaml.version}-inotify-${version}"; + + src = fetchFromGitHub { + owner = "whitequark"; + repo = "ocaml-inotify"; + rev = "v${version}"; + sha256 = "1s6vmqpx19hxzsi30jvp3h7p56rqnxfhfddpcls4nz8sqca1cz5y"; + }; + + patches = [ (fetchpatch { + url = "https://github.com/whitequark/ocaml-inotify/commit/716c8002cc1652f58eb0c400ae92e04003cba8c9.patch"; + sha256 = "04lfxrrsmk2mc704kaln8jqx93jc4bkxhijmfy2d4cmk1cim7r6k"; + }) ]; + + buildInputs = [ ocaml findlib ocamlbuild ocaml_lwt ]; + checkInputs = [ ounit fileutils ]; + + configureFlags = [ "--enable-lwt" + (lib.optionalString doCheck "--enable-tests") ]; + + postConfigure = lib.optionalString doCheck '' + echo '<lib_test/test_inotify_lwt.*>: pkg_threads' | tee -a _tags + ''; + + doCheck = true; + checkTarget = "test"; + + createFindlibDestdir = true; + + meta = { + description = "Bindings for Linux’s filesystem monitoring interface, inotify"; + license = lib.licenses.lgpl21; + maintainers = [ lib.maintainers.vbgl ]; + inherit (src.meta) homepage; + platforms = lib.platforms.linux; + }; } diff --git a/pkgs/development/ocaml-modules/integers/default.nix b/pkgs/development/ocaml-modules/integers/default.nix index ca14c3ca873..ad6f1f9f813 100644 --- a/pkgs/development/ocaml-modules/integers/default.nix +++ b/pkgs/development/ocaml-modules/integers/default.nix @@ -1,18 +1,18 @@ { lib, fetchzip, buildDunePackage }: buildDunePackage rec { - pname = "integers"; - version = "0.4.0"; + pname = "integers"; + version = "0.4.0"; - src = fetchzip { - url = "https://github.com/ocamllabs/ocaml-integers/archive/${version}.tar.gz"; - sha256 = "0yp3ab0ph7mp5741g7333x4nx8djjvxzpnv3zvsndyzcycspn9dd"; - }; + src = fetchzip { + url = "https://github.com/ocamllabs/ocaml-integers/archive/${version}.tar.gz"; + sha256 = "0yp3ab0ph7mp5741g7333x4nx8djjvxzpnv3zvsndyzcycspn9dd"; + }; - meta = { - description = "Various signed and unsigned integer types for OCaml"; - license = lib.licenses.mit; - homepage = "https://github.com/ocamllabs/ocaml-integers"; - maintainers = [ lib.maintainers.vbgl ]; - }; + meta = { + description = "Various signed and unsigned integer types for OCaml"; + license = lib.licenses.mit; + homepage = "https://github.com/ocamllabs/ocaml-integers"; + maintainers = [ lib.maintainers.vbgl ]; + }; } diff --git a/pkgs/development/ocaml-modules/janestreet/variantslib.nix b/pkgs/development/ocaml-modules/janestreet/variantslib.nix index 3fd7877d2bb..053ab412f88 100644 --- a/pkgs/development/ocaml-modules/janestreet/variantslib.nix +++ b/pkgs/development/ocaml-modules/janestreet/variantslib.nix @@ -1,4 +1,4 @@ -{lib, stdenv, buildOcamlJane, type_conv}: +{lib, buildOcamlJane, type_conv}: buildOcamlJane { name = "variantslib"; diff --git a/pkgs/development/ocaml-modules/jingoo/default.nix b/pkgs/development/ocaml-modules/jingoo/default.nix index ec25e8e7f41..cc2c65009ff 100644 --- a/pkgs/development/ocaml-modules/jingoo/default.nix +++ b/pkgs/development/ocaml-modules/jingoo/default.nix @@ -1,5 +1,5 @@ { lib, buildDunePackage, fetchFromGitHub -, menhir, ppx_deriving, re, uutf, uucp, ounit2 }: +, menhir, ppxlib, ppx_deriving, re, uutf, uucp, ounit2 }: buildDunePackage rec { pname = "jingoo"; @@ -17,7 +17,7 @@ buildDunePackage rec { }; buildInputs = [ menhir ]; - propagatedBuildInputs = [ ppx_deriving re uutf uucp ]; + propagatedBuildInputs = [ ppxlib ppx_deriving re uutf uucp ]; checkInputs = [ ounit2 ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/jwto/default.nix b/pkgs/development/ocaml-modules/jwto/default.nix index 1c7622f2805..3950c13d3fc 100644 --- a/pkgs/development/ocaml-modules/jwto/default.nix +++ b/pkgs/development/ocaml-modules/jwto/default.nix @@ -1,4 +1,5 @@ { lib, buildDunePackage, fetchFromGitHub, alcotest, cryptokit, fmt, yojson +, ppxlib , base64, re, ppx_deriving }: buildDunePackage rec { @@ -16,6 +17,8 @@ buildDunePackage rec { sha256 = "1p799zk8j9c0002xzi2x7ndj1bzqf14744ampcqndrjnsi7mq71s"; }; + buildInputs = [ ppxlib ]; + propagatedBuildInputs = [ cryptokit fmt yojson base64 re ppx_deriving ]; diff --git a/pkgs/development/ocaml-modules/kafka/default.nix b/pkgs/development/ocaml-modules/kafka/default.nix index d1ebe95be89..66055dca66e 100644 --- a/pkgs/development/ocaml-modules/kafka/default.nix +++ b/pkgs/development/ocaml-modules/kafka/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildDunePackage, base, cmdliner, ocaml_lwt, +{ lib, fetchFromGitHub, buildDunePackage, base, cmdliner, ocaml_lwt, rdkafka, zlib }: buildDunePackage rec { diff --git a/pkgs/development/ocaml-modules/lablgl/default.nix b/pkgs/development/ocaml-modules/lablgl/default.nix index a7b145c2d4e..3d57c4e40ed 100644 --- a/pkgs/development/ocaml-modules/lablgl/default.nix +++ b/pkgs/development/ocaml-modules/lablgl/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; version = "1.05"; - src = fetchurl { + src = fetchurl { url = "http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/dist/lablgl-${version}.tar.gz"; sha256 = "0qabydd219i4ak7hxgc67496qnnscpnydya2m4ijn3cpbgih7zyq"; }; diff --git a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix index 02fd7004a56..232621ad83b 100644 --- a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix +++ b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, ocaml, findlib, pkgconfig, gtk2, libgnomecanvas, libglade, gtksourceview, camlp4 }: +{ stdenv, lib, fetchurl, ocaml, findlib, pkg-config, gtk2, libgnomecanvas, libglade, gtksourceview, camlp4 }: if lib.versionAtLeast ocaml.version "4.04" then throw "lablgtk-2.14 is not available for OCaml ${ocaml.version}" else @@ -16,7 +16,7 @@ stdenv.mkDerivation (rec { sha256 = "1fnh0amm7lwgyjdhmlqgsp62gwlar1140425yc1j6inwmgnsp0a9"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ocaml findlib gtk2 libgnomecanvas libglade gtksourceview camlp4 ]; configureFlags = [ "--with-libdir=$(out)/lib/ocaml/${ocaml.version}/site-lib" ]; diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix index 2aa031f419c..09487ac9dad 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, ocaml, findlib, pkgconfig, gtk2, libgnomecanvas, libglade, gtksourceview }: +{ lib, stdenv, fetchurl, fetchFromGitHub, ocaml, findlib, pkg-config, gtk2, libgnomecanvas, libglade, gtksourceview }: let param = let check = lib.versionAtLeast ocaml.version; in @@ -23,7 +23,7 @@ stdenv.mkDerivation { pname = "lablgtk"; inherit (param) version src; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ocaml findlib gtk2 libgnomecanvas libglade gtksourceview ]; configureFlags = [ "--with-libdir=$(out)/lib/ocaml/${ocaml.version}/site-lib" ]; diff --git a/pkgs/development/ocaml-modules/lablgtk3/default.nix b/pkgs/development/ocaml-modules/lablgtk3/default.nix index 767e087a7f0..1f6b0ad76b9 100644 --- a/pkgs/development/ocaml-modules/lablgtk3/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk3/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, pkgconfig, buildDunePackage, gtk3, cairo2 }: +{ lib, fetchurl, pkg-config, buildDunePackage, gtk3, cairo2 }: buildDunePackage rec { version = "3.1.1"; @@ -11,7 +11,7 @@ buildDunePackage rec { sha256 = "1ygc1yh99gh44h958yffw1vxdlfpn799d4x1s36c2jfbi8f0dir2"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ gtk3 cairo2 ]; meta = { diff --git a/pkgs/development/ocaml-modules/lens/default.nix b/pkgs/development/ocaml-modules/lens/default.nix index c26b3dbe737..8910a873812 100644 --- a/pkgs/development/ocaml-modules/lens/default.nix +++ b/pkgs/development/ocaml-modules/lens/default.nix @@ -1,21 +1,22 @@ -{ lib, ocaml, fetchzip, ppx_deriving, ppxfind, buildDunePackage }: - -if lib.versionAtLeast ocaml.version "4.10" -then throw "lens is not available for OCaml ${ocaml.version}" -else +{ lib, fetchzip, ppx_deriving, ppxfind, buildDunePackage, ounit }: buildDunePackage rec { pname = "lens"; - version = "1.2.3"; + version = "1.2.4"; + + useDune2 = true; src = fetchzip { url = "https://github.com/pdonadeo/ocaml-lens/archive/v${version}.tar.gz"; - sha256 = "09k2vhzysx91syjhgv6w1shc9mgzi0l4bhwpx1g5pi4r4ghjp07y"; + sha256 = "18mv7n5rcix3545mc2qa2f9xngks4g4kqj2g878qj7r3cy96kklv"; }; - minimumOCamlVersion = "4.04.1"; + minimumOCamlVersion = "4.10"; buildInputs = [ ppx_deriving ppxfind ]; + doCheck = true; + checkInputs = [ ounit ]; + meta = with lib; { homepage = "https://github.com/pdonadeo/ocaml-lens"; description = "Functional lenses"; @@ -23,5 +24,6 @@ buildDunePackage rec { maintainers = with maintainers; [ kazcw ]; + broken = true; # Not compatible with ppx_deriving ≥ 5.0 }; } diff --git a/pkgs/development/ocaml-modules/lua-ml/default.nix b/pkgs/development/ocaml-modules/lua-ml/default.nix index ae16b285654..8a4f58ccbbd 100644 --- a/pkgs/development/ocaml-modules/lua-ml/default.nix +++ b/pkgs/development/ocaml-modules/lua-ml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, dune }: +{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, opaline }: if !lib.versionAtLeast ocaml.version "4.07" then throw "lua-ml is not available for OCaml ${ocaml.version}" @@ -16,11 +16,14 @@ stdenv.mkDerivation rec { sha256 = "04lv98nxmzanvyn4c0k6k0ax29f5xfdl8qzpf5hwadslq213a044"; }; + nativeBuildInputs = [ opaline ]; buildInputs = [ ocaml findlib ocamlbuild ]; buildFlags = [ "lib" ]; - inherit (dune) installPhase; + installPhase = '' + opaline -prefix $out -libdir $OCAMLFIND_DESTDIR + ''; meta = { description = "An embeddable Lua 2.5 interpreter implemented in OCaml"; diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index 759f0deedf1..83146ef9104 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchzip, pkgconfig, ncurses, libev, buildDunePackage, ocaml +{ lib, fetchzip, pkg-config, ncurses, libev, buildDunePackage, ocaml , cppo, ocaml-migrate-parsetree, ocplib-endian, result , mmap, seq }: @@ -14,7 +14,7 @@ buildDunePackage rec { sha256 = "15hgy3220m2b8imipa514n7l65m1h5lc6l1hanqwwvs7ghh2aqp2"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ cppo ocaml-migrate-parsetree ] ++ optional (!versionAtLeast ocaml.version "4.07") ncurses; propagatedBuildInputs = [ libev mmap ocplib-endian seq result ]; diff --git a/pkgs/development/ocaml-modules/lwt_react/default.nix b/pkgs/development/ocaml-modules/lwt_react/default.nix index 4d82db043e8..5513935133e 100644 --- a/pkgs/development/ocaml-modules/lwt_react/default.nix +++ b/pkgs/development/ocaml-modules/lwt_react/default.nix @@ -1,22 +1,22 @@ { stdenv, fetchzip, ocaml, findlib, ocamlbuild, lwt, react }: stdenv.mkDerivation rec { - version = "1.0.1"; - name = "ocaml${ocaml.version}-lwt_react-${version}"; - src = fetchzip { - url = "https://github.com/ocsigen/lwt/releases/download/3.0.0/lwt_react-1.0.1.tar.gz"; - sha256 = "1bbz7brvdskf4angzn3q2s2s6qdnx7x8m8syayysh23gwv4c7v31"; - }; + version = "1.0.1"; + name = "ocaml${ocaml.version}-lwt_react-${version}"; + src = fetchzip { + url = "https://github.com/ocsigen/lwt/releases/download/3.0.0/lwt_react-1.0.1.tar.gz"; + sha256 = "1bbz7brvdskf4angzn3q2s2s6qdnx7x8m8syayysh23gwv4c7v31"; + }; - buildInputs = [ ocaml findlib ocamlbuild ]; + buildInputs = [ ocaml findlib ocamlbuild ]; - propagatedBuildInputs = [ lwt react ]; + propagatedBuildInputs = [ lwt react ]; - createFindlibDestdir = true; + createFindlibDestdir = true; - meta = { - description = "Helpers for using React with Lwt"; - inherit (lwt.meta) homepage license maintainers; + meta = { + description = "Helpers for using React with Lwt"; + inherit (lwt.meta) homepage license maintainers; inherit (ocaml.meta) platforms; - }; + }; } diff --git a/pkgs/development/ocaml-modules/magick/default.nix b/pkgs/development/ocaml-modules/magick/default.nix index 4fcf267e9c0..016c059573b 100644 --- a/pkgs/development/ocaml-modules/magick/default.nix +++ b/pkgs/development/ocaml-modules/magick/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, which, pkgconfig, ocaml, findlib, imagemagick }: +{ stdenv, lib, fetchurl, which, pkg-config, ocaml, findlib, imagemagick }: if lib.versionAtLeast ocaml.version "4.06" then throw "magick is not available for OCaml ${ocaml.version}" @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0gn9l2qdr8gby2x8c2mb59x1kipb2plr45rbq6ymcxyi0wmzfh3q"; }; - nativeBuildInputs = [ which pkgconfig ]; + nativeBuildInputs = [ which pkg-config ]; buildInputs = [ ocaml findlib imagemagick ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/mariadb/default.nix b/pkgs/development/ocaml-modules/mariadb/default.nix new file mode 100644 index 00000000000..ed3e5999b41 --- /dev/null +++ b/pkgs/development/ocaml-modules/mariadb/default.nix @@ -0,0 +1,26 @@ +{ stdenv, lib, fetchFromGitHub, buildOasisPackage +, ctypes, mariadb, libmysqlclient }: + +buildOasisPackage rec { + pname = "mariadb"; + version = "1.1.4"; + + minimumOCamlVersion = "4.07.0"; + + src = fetchFromGitHub { + owner = "andrenth"; + repo = "ocaml-mariadb"; + rev = version; + sha256 = "1rxqvxr6sv4x2hsi05qm9jz0asaq969m71db4ckl672rcql1kwbr"; + }; + + buildInputs = [ mariadb libmysqlclient ]; + propagatedBuildInputs = [ ctypes ]; + + meta = { + description = "OCaml bindings for MariaDB"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bcc32 ]; + homepage = "https://github.com/andrenth/ocaml-mariadb"; + }; +} diff --git a/pkgs/development/ocaml-modules/mdx/default.nix b/pkgs/development/ocaml-modules/mdx/default.nix index f384704a1c4..4418c50568c 100644 --- a/pkgs/development/ocaml-modules/mdx/default.nix +++ b/pkgs/development/ocaml-modules/mdx/default.nix @@ -4,12 +4,12 @@ buildDunePackage rec { pname = "mdx"; - version = "1.7.0"; + version = "1.8.0"; useDune2 = true; src = fetchurl { url = "https://github.com/realworldocaml/mdx/releases/download/${version}/mdx-${version}.tbz"; - sha256 = "0vpc30sngl3vpychrfvjwyi93mk311x3f2azlkxasgcj69fq03i7"; + sha256 = "1p2ip73da271as0x1gfbajik3mf1bkc8l54276vgacn1ja3saj52"; }; nativeBuildInputs = [ cppo ]; diff --git a/pkgs/development/ocaml-modules/mimic/default.nix b/pkgs/development/ocaml-modules/mimic/default.nix new file mode 100644 index 00000000000..01b2c813f2f --- /dev/null +++ b/pkgs/development/ocaml-modules/mimic/default.nix @@ -0,0 +1,47 @@ +{ lib, buildDunePackage, fetchurl +, fmt, mirage-flow, result, rresult, cstruct, logs, ke +, alcotest, alcotest-lwt, bigstringaf, bigarray-compat +}: + +buildDunePackage rec { + pname = "mimic"; + version = "0.0.1"; + + minimumOCamlVersion = "4.08"; + useDune2 = true; + + src = fetchurl { + url = "https://github.com/mirage/ocaml-git/releases/download/${pname}-v${version}/${pname}-${pname}-v${version}.tbz"; + sha256 = "0j4l99sgm5mdmv67vakkz2pw45l6i89bpza88xqkgmskfk50c5pk"; + }; + + # don't install changelogs for other packages + postPatch = '' + rm -f CHANGES.md CHANGES.carton.md + ''; + + propagatedBuildInputs = [ + fmt + mirage-flow + result + rresult + cstruct + logs + ]; + + doCheck = true; + checkInputs = [ + alcotest + alcotest-lwt + bigstringaf + bigarray-compat + ke + ]; + + meta = with lib; { + description = "A simple protocol dispatcher"; + license = licenses.isc; + homepage = "https://github.com/mirage/ocaml-git"; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/development/ocaml-modules/mirage-crypto/default.nix b/pkgs/development/ocaml-modules/mirage-crypto/default.nix index c2ede31dd3f..ab48e01950e 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/default.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/default.nix @@ -4,11 +4,11 @@ buildDunePackage rec { minimumOCamlVersion = "4.08"; pname = "mirage-crypto"; - version = "0.8.8"; + version = "0.8.10"; src = fetchurl { url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-v${version}.tbz"; - sha256 = "19czylfyakckfzzcbqgv9ygl243wix7ak8zkbdcb9hcl2k2shswb"; + sha256 = "8a5976fe7837491d2fbd1917b77524776f70ae590e9f55cf757cc8951b5481fc"; }; useDune2 = true; diff --git a/pkgs/development/ocaml-modules/mirage-nat/default.nix b/pkgs/development/ocaml-modules/mirage-nat/default.nix index 5edf8a347ad..b04c0bb4a7c 100644 --- a/pkgs/development/ocaml-modules/mirage-nat/default.nix +++ b/pkgs/development/ocaml-modules/mirage-nat/default.nix @@ -2,7 +2,7 @@ , ipaddr, cstruct, lwt, rresult, logs, lru , tcpip, ethernet, stdlib-shims , alcotest, mirage-clock-unix -, ppx_deriving +, ppxlib, ppx_deriving }: buildDunePackage rec { @@ -19,8 +19,8 @@ buildDunePackage rec { sha256 = "0cy95j184hi8fm1h6z6x1brjfrmbq3zjy2mqz99m8ys9vwkb63ma"; }; - nativeBuildInputs = [ - ppx_deriving + buildInputs = [ + ppxlib ]; propagatedBuildInputs = [ @@ -33,6 +33,7 @@ buildDunePackage rec { tcpip ethernet stdlib-shims + ppx_deriving ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/mlgmp/default.nix b/pkgs/development/ocaml-modules/mlgmp/default.nix index d2aeb1a37b8..ffd78150689 100644 --- a/pkgs/development/ocaml-modules/mlgmp/default.nix +++ b/pkgs/development/ocaml-modules/mlgmp/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "3ce1a53fa452ff5a9ba618864d3bc46ef32190b57202d1e996ca7df837ad4f24"; }; - makeFlags = [ + makeFlags = [ "DESTDIR=$(out)/lib/ocaml/${ocaml.version}/site-lib/gmp" ]; diff --git a/pkgs/development/ocaml-modules/mysql/default.nix b/pkgs/development/ocaml-modules/mysql/default.nix index 29720ce1148..6ccdfa9cf81 100644 --- a/pkgs/development/ocaml-modules/mysql/default.nix +++ b/pkgs/development/ocaml-modules/mysql/default.nix @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { sha256 = "06mb2bq7v37wn0lza61917zqgb4bsg1xxb73myjyn88p6khl6yl2"; }; - configureFlags = [ - "--prefix=$out" + configureFlags = [ + "--prefix=$out" "--libdir=$out/lib/ocaml/${ocaml.version}/site-lib/mysql" ]; diff --git a/pkgs/development/ocaml-modules/nocrypto/default.nix b/pkgs/development/ocaml-modules/nocrypto/default.nix index ae52ed478e0..055e6db3a64 100644 --- a/pkgs/development/ocaml-modules/nocrypto/default.nix +++ b/pkgs/development/ocaml-modules/nocrypto/default.nix @@ -15,6 +15,10 @@ let ''; in +if !versionAtLeast ocaml.version "4.08" +then throw "nocrypto is not available for OCaml ${ocaml.version}" +else + stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-nocrypto-${version}"; version = "0.5.4"; diff --git a/pkgs/development/ocaml-modules/nonstd/default.nix b/pkgs/development/ocaml-modules/nonstd/default.nix index 150edb3174c..a584f7bc9ed 100644 --- a/pkgs/development/ocaml-modules/nonstd/default.nix +++ b/pkgs/development/ocaml-modules/nonstd/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromBitbucket, buildDunePackage }: +{ lib, fetchzip, buildDunePackage }: buildDunePackage rec { pname = "nonstd"; @@ -6,10 +6,8 @@ buildDunePackage rec { minimumOCamlVersion = "4.02"; - src = fetchFromBitbucket { - owner = "smondet"; - repo = pname; - rev = "${pname}.${version}"; + src = fetchzip { + url = "https://bitbucket.org/smondet/${pname}/get/${pname}.${version}.tar.gz"; sha256 = "0ccjwcriwm8fv29ij1cnbc9win054kb6pfga3ygzdbjpjb778j46"; }; diff --git a/pkgs/development/ocaml-modules/num/default.nix b/pkgs/development/ocaml-modules/num/default.nix index b553677fad4..e2c7b439c69 100644 --- a/pkgs/development/ocaml-modules/num/default.nix +++ b/pkgs/development/ocaml-modules/num/default.nix @@ -1,31 +1,31 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, ocaml, findlib, withStatic ? false }: stdenv.mkDerivation rec { - version = "1.1"; - name = "ocaml${ocaml.version}-num-${version}"; - src = fetchFromGitHub { - owner = "ocaml"; - repo = "num"; - rev = "v${version}"; - sha256 = "0a4mhxgs5hi81d227aygjx35696314swas0vzy3ig809jb7zq4h0"; - }; + version = "1.1"; + name = "ocaml${ocaml.version}-num-${version}"; + src = fetchFromGitHub { + owner = "ocaml"; + repo = "num"; + rev = "v${version}"; + sha256 = "0a4mhxgs5hi81d227aygjx35696314swas0vzy3ig809jb7zq4h0"; + }; - patches = [ (fetchpatch { - url = "https://github.com/ocaml/num/commit/6d4c6d476c061298e6385e8a0864f083194b9307.patch"; - sha256 = "18zlvb5n327q8y3c52js5dvyy29ssld1l53jqng8m9w1k24ypi0b"; - }) - ] ++ lib.optional withStatic ./enable-static.patch; + patches = [ (fetchpatch { + url = "https://github.com/ocaml/num/commit/6d4c6d476c061298e6385e8a0864f083194b9307.patch"; + sha256 = "18zlvb5n327q8y3c52js5dvyy29ssld1l53jqng8m9w1k24ypi0b"; + }) + ] ++ lib.optional withStatic ./enable-static.patch; - nativeBuildInputs = [ ocaml findlib ]; + nativeBuildInputs = [ ocaml findlib ]; buildInputs = [ ocaml findlib ]; - createFindlibDestdir = true; + createFindlibDestdir = true; - meta = { - description = "Legacy Num library for arbitrary-precision integer and rational arithmetic"; - license = lib.licenses.lgpl21; - inherit (ocaml.meta) platforms; - inherit (src.meta) homepage; - }; + meta = { + description = "Legacy Num library for arbitrary-precision integer and rational arithmetic"; + license = lib.licenses.lgpl21; + inherit (ocaml.meta) platforms; + inherit (src.meta) homepage; + }; } diff --git a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix index 1411d32d40c..49c8fe5470b 100644 --- a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix @@ -1,4 +1,4 @@ -{stdenv, lib, fetchurl, automake, ocaml, autoconf, gnum4, pkgconfig, freetype, lablgtk, unzip, cairo, findlib, gdk-pixbuf, gtk2, pango }: +{stdenv, lib, fetchurl, automake, ocaml, autoconf, gnum4, pkg-config, freetype, lablgtk, unzip, cairo, findlib, gdk-pixbuf, gtk2, pango }: let pname = "ocaml-cairo"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { patches = [ ./META.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ocaml automake gnum4 autoconf unzip findlib freetype lablgtk cairo gdk-pixbuf gtk2 pango ]; diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix index 110f51cc079..1da80a2202d 100644 --- a/pkgs/development/ocaml-modules/ocamlnet/default.nix +++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, ncurses, ocaml, findlib, ocaml_pcre, camlzip +{ stdenv, lib, fetchurl, pkg-config, ncurses, ocaml, findlib, ocaml_pcre, camlzip , gnutls, nettle }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "1x703mjqsv9nvffnkj5i36ij2s5zfvxxll2z1qj6a7p428b2yfnm"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses ocaml findlib ocaml_pcre camlzip gnutls nettle ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/ocamlsdl/default.nix b/pkgs/development/ocaml-modules/ocamlsdl/default.nix index 4103b48a979..7c782b5268f 100644 --- a/pkgs/development/ocaml-modules/ocamlsdl/default.nix +++ b/pkgs/development/ocaml-modules/ocamlsdl/default.nix @@ -1,4 +1,4 @@ -{stdenv, lib, fetchurl, ocaml, pkgconfig, findlib, SDL, SDL_image, SDL_mixer, SDL_ttf, SDL_gfx, lablgl }: +{stdenv, lib, fetchurl, ocaml, pkg-config, findlib, SDL, SDL_image, SDL_mixer, SDL_ttf, SDL_gfx, lablgl }: let pname = "ocamlsdl"; @@ -12,15 +12,15 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; version = "0.9.1"; - src = fetchurl { + src = fetchurl { url = "mirror://sourceforge/project/ocamlsdl/OCamlSDL/ocamlsdl-0.9.1/ocamlsdl-0.9.1.tar.gz"; sha256 = "abfb295b263dc11e97fffdd88ea1a28b46df8cc2b196777093e4fe7f509e4f8f"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ocaml findlib SDL SDL_image SDL_mixer SDL_ttf SDL_gfx lablgl]; - propagatedBuildInputs = [ SDL SDL_image SDL_mixer SDL_ttf SDL_gfx pkgconfig ]; + propagatedBuildInputs = [ SDL SDL_image SDL_mixer SDL_ttf SDL_gfx pkg-config ]; createFindlibDestdir = true; meta = { diff --git a/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix b/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix index ae06978dacd..be217812834 100644 --- a/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix +++ b/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix @@ -5,26 +5,26 @@ then throw "ocp-ocamlres is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-ocp-ocamlres-${version}"; - version = "0.4"; - src = fetchFromGitHub { - owner = "OCamlPro"; - repo = "ocp-ocamlres"; - rev = "v${version}"; - sha256 = "0smfwrj8qhzknhzawygxi0vgl2af4vyi652fkma59rzjpvscqrnn"; - }; + name = "ocaml${ocaml.version}-ocp-ocamlres-${version}"; + version = "0.4"; + src = fetchFromGitHub { + owner = "OCamlPro"; + repo = "ocp-ocamlres"; + rev = "v${version}"; + sha256 = "0smfwrj8qhzknhzawygxi0vgl2af4vyi652fkma59rzjpvscqrnn"; + }; - buildInputs = [ ocaml findlib astring pprint ]; - createFindlibDestdir = true; + buildInputs = [ ocaml findlib astring pprint ]; + createFindlibDestdir = true; - installFlags = [ "BINDIR=$(out)/bin" ]; - preInstall = "mkdir -p $out/bin"; + installFlags = [ "BINDIR=$(out)/bin" ]; + preInstall = "mkdir -p $out/bin"; - meta = { - description = "A simple tool and library to embed files and directories inside OCaml executables"; - license = lib.licenses.lgpl3Plus; - homepage = "https://www.typerex.org/ocp-ocamlres.html"; - maintainers = [ lib.maintainers.vbgl ]; - inherit (ocaml.meta) platforms; - }; + meta = { + description = "A simple tool and library to embed files and directories inside OCaml executables"; + license = lib.licenses.lgpl3Plus; + homepage = "https://www.typerex.org/ocp-ocamlres.html"; + maintainers = [ lib.maintainers.vbgl ]; + inherit (ocaml.meta) platforms; + }; } diff --git a/pkgs/development/ocaml-modules/ocplib-json-typed/default.nix b/pkgs/development/ocaml-modules/ocplib-json-typed/default.nix index 6a3de6292d8..75554d25bf2 100644 --- a/pkgs/development/ocaml-modules/ocplib-json-typed/default.nix +++ b/pkgs/development/ocaml-modules/ocplib-json-typed/default.nix @@ -1,22 +1,22 @@ { lib, buildDunePackage, fetchFromGitHub, uri }: buildDunePackage rec { - pname = "ocplib-json-typed"; - version = "0.7.1"; - useDune2 = true; - src = fetchFromGitHub { - owner = "OCamlPro"; - repo = "ocplib-json-typed"; - rev = "v${version}"; - sha256 = "1gv0vqqy9lh7isaqg54b3lam2sh7nfjjazi6x7zn6bh5f77g1p5q"; - }; + pname = "ocplib-json-typed"; + version = "0.7.1"; + useDune2 = true; + src = fetchFromGitHub { + owner = "OCamlPro"; + repo = "ocplib-json-typed"; + rev = "v${version}"; + sha256 = "1gv0vqqy9lh7isaqg54b3lam2sh7nfjjazi6x7zn6bh5f77g1p5q"; + }; - propagatedBuildInputs = [ uri ]; + propagatedBuildInputs = [ uri ]; - meta = { - description = "A collection of type-aware JSON utilities for OCaml"; - license = lib.licenses.lgpl21; - maintainers = [ lib.maintainers.vbgl ]; - inherit (src.meta) homepage; - }; + meta = { + description = "A collection of type-aware JSON utilities for OCaml"; + license = lib.licenses.lgpl21; + maintainers = [ lib.maintainers.vbgl ]; + inherit (src.meta) homepage; + }; } diff --git a/pkgs/development/ocaml-modules/octavius/default.nix b/pkgs/development/ocaml-modules/octavius/default.nix index 01161214a4f..c71c8f35f4b 100644 --- a/pkgs/development/ocaml-modules/octavius/default.nix +++ b/pkgs/development/ocaml-modules/octavius/default.nix @@ -4,21 +4,21 @@ if !lib.versionAtLeast ocaml.version "4.03" then throw "octavius is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation { - name = "ocaml${ocaml.version}-octavius-0.2.0"; - src = fetchurl { - url = "https://github.com/ocaml-doc/octavius/releases/download/v0.2.0/octavius-0.2.0.tbz"; - sha256 = "02milzzlr4xk5aymg2fjz27f528d5pyscqvld3q0dm41zcpkz5ml"; - }; + name = "ocaml${ocaml.version}-octavius-0.2.0"; + src = fetchurl { + url = "https://github.com/ocaml-doc/octavius/releases/download/v0.2.0/octavius-0.2.0.tbz"; + sha256 = "02milzzlr4xk5aymg2fjz27f528d5pyscqvld3q0dm41zcpkz5ml"; + }; - buildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ ocaml findlib ocamlbuild topkg ]; - inherit (topkg) buildPhase installPhase; + inherit (topkg) buildPhase installPhase; - meta = { - description = "Ocamldoc comment syntax parser"; - homepage = "https://github.com/ocaml-doc/octavius"; - license = lib.licenses.isc; - maintainers = [ lib.maintainers.vbgl ]; - inherit (ocaml.meta) platforms; - }; + meta = { + description = "Ocamldoc comment syntax parser"; + homepage = "https://github.com/ocaml-doc/octavius"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + inherit (ocaml.meta) platforms; + }; } diff --git a/pkgs/development/ocaml-modules/ocurl/default.nix b/pkgs/development/ocaml-modules/ocurl/default.nix index d5ef3948408..83668b30cec 100644 --- a/pkgs/development/ocaml-modules/ocurl/default.nix +++ b/pkgs/development/ocaml-modules/ocurl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, pkgconfig, ocaml, findlib, fetchurl, curl, ncurses }: +{ stdenv, lib, pkg-config, ocaml, findlib, fetchurl, curl, ncurses, lwt }: if lib.versionOlder ocaml.version "4.02" then throw "ocurl is not available for OCaml ${ocaml.version}" @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0n621cxb9012pj280c7821qqsdhypj8qy9qgrah79dkh6a8h2py6"; }; - buildInputs = [ pkgconfig ocaml findlib ncurses ]; - propagatedBuildInputs = [ curl ]; + buildInputs = [ pkg-config ocaml findlib ncurses ]; + propagatedBuildInputs = [ curl lwt ]; createFindlibDestdir = true; meta = { description = "OCaml bindings to libcurl"; diff --git a/pkgs/development/ocaml-modules/opam-file-format/default.nix b/pkgs/development/ocaml-modules/opam-file-format/default.nix index ee9961d1533..dd16a369881 100644 --- a/pkgs/development/ocaml-modules/opam-file-format/default.nix +++ b/pkgs/development/ocaml-modules/opam-file-format/default.nix @@ -1,27 +1,22 @@ -{ stdenv, lib, fetchFromGitHub, ocaml, findlib }: +{ lib, buildDunePackage, fetchFromGitHub }: -stdenv.mkDerivation rec { - version = "2.0.0"; - name = "ocaml${ocaml.version}-opam-file-format-${version}"; +buildDunePackage rec { + version = "2.1.2"; + pname = "opam-file-format"; + + useDune2 = true; src = fetchFromGitHub { owner = "ocaml"; - repo = "opam-file-format"; + repo = pname; rev = version; - sha256 = "0fqb99asnair0043hhc8r158d6krv5nzvymd0xwycr5y72yrp0hv"; + sha256 = "19xppn2s3yjid8jc1wh8gdf5mgmlpzby2cf2slmnbyrgln3vj6i2"; }; - buildInputs = [ ocaml findlib ]; - - installFlags = [ "LIBDIR=$(OCAMLFIND_DESTDIR)" ]; - - patches = [ ./optional-static.patch ]; - meta = { description = "Parser and printer for the opam file syntax"; license = lib.licenses.lgpl21; maintainers = [ lib.maintainers.vbgl ]; inherit (src.meta) homepage; - inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/opam-file-format/optional-static.patch b/pkgs/development/ocaml-modules/opam-file-format/optional-static.patch deleted file mode 100644 index 5501fdd0c6c..00000000000 --- a/pkgs/development/ocaml-modules/opam-file-format/optional-static.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -u a/Makefile b/Makefile ---- a/Makefile -+++ b/Makefile -@@ -1,1 +1,5 @@ --TARGETS = opam-file-format.cma opam-file-format.cmxa opam-file-format.cmxs -+TARGETS = opam-file-format.cma opam-file-format.cmxa -+ -+ifeq "$(NATDYNLINK)" "true" -+TARGETS = $(TARGETS) opam-file-format.cmxs -+endif - -all: $(TARGETS) - diff --git a/pkgs/development/ocaml-modules/opium/default.nix b/pkgs/development/ocaml-modules/opium/default.nix index 2681cc609d0..5db3d1b4a24 100644 --- a/pkgs/development/ocaml-modules/opium/default.nix +++ b/pkgs/development/ocaml-modules/opium/default.nix @@ -14,19 +14,19 @@ }: buildDunePackage { - pname = "opium"; - inherit (opium_kernel) version src meta minimumOCamlVersion; + pname = "opium"; + inherit (opium_kernel) version src meta minimumOCamlVersion; useDune2 = true; doCheck = true; - buildInputs = [ + buildInputs = [ ppx_sexp_conv ppx_fields_conv alcotest ]; - propagatedBuildInputs = [ + propagatedBuildInputs = [ opium_kernel cmdliner cohttp-lwt-unix magic-mime logs stringext ]; } diff --git a/pkgs/development/ocaml-modules/optcomp/default.nix b/pkgs/development/ocaml-modules/optcomp/default.nix index 343fb28b6ad..b78d070962e 100644 --- a/pkgs/development/ocaml-modules/optcomp/default.nix +++ b/pkgs/development/ocaml-modules/optcomp/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { sha256 = "1n095lk94jq1rwi0l24g2wbgms7249wdd31n0ji895dr6755s93y"; }) ; - + createFindlibDestdir = true; buildInputs = [ ocaml findlib ocamlbuild camlp4 ]; diff --git a/pkgs/development/ocaml-modules/optint/default.nix b/pkgs/development/ocaml-modules/optint/default.nix index 508bbfba605..18e4bd1ae86 100644 --- a/pkgs/development/ocaml-modules/optint/default.nix +++ b/pkgs/development/ocaml-modules/optint/default.nix @@ -2,11 +2,11 @@ buildDunePackage rec { minimumOCamlVersion = "4.03"; - version = "0.0.3"; + version = "0.0.4"; pname = "optint"; src = fetchurl { url = "https://github.com/mirage/optint/releases/download/v${version}/optint-v${version}.tbz"; - sha256 = "0c7r3s6lal9xkixngkj25nqncj4s33ka40bjdi7fz7mly08djycj"; + sha256 = "1a7gabxqmfvii8qnxq1clx43md2h9glskxhac8y8r0rhzblx3s1a"; }; meta = { diff --git a/pkgs/development/ocaml-modules/parany/default.nix b/pkgs/development/ocaml-modules/parany/default.nix index 34e14959e32..afe9e7d39b5 100644 --- a/pkgs/development/ocaml-modules/parany/default.nix +++ b/pkgs/development/ocaml-modules/parany/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildDunePackage, fetchFromGitHub, ocamlnet, cpu }: +{ lib, buildDunePackage, fetchFromGitHub, ocamlnet, cpu }: buildDunePackage rec { pname = "parany"; diff --git a/pkgs/development/ocaml-modules/pecu/default.nix b/pkgs/development/ocaml-modules/pecu/default.nix new file mode 100644 index 00000000000..0059bbdec3c --- /dev/null +++ b/pkgs/development/ocaml-modules/pecu/default.nix @@ -0,0 +1,26 @@ +{ lib, buildDunePackage, ocaml, fetchurl, fmt, alcotest }: + +buildDunePackage rec { + pname = "pecu"; + version = "0.5"; + + useDune2 = true; + + minimumOCamlVersion = "4.03"; + + src = fetchurl { + url = "https://github.com/mirage/pecu/releases/download/v0.5/pecu-v0.5.tbz"; + sha256 = "713753cd6ba3f4609a26d94576484e83ffef7de5f2208a2993576a1b22f0e0e7"; + }; + + # fmt availability + doCheck = lib.versionAtLeast ocaml.version "4.05"; + checkInputs = [ fmt alcotest ]; + + meta = with lib; { + description = "Encoder/Decoder of Quoted-Printable (RFC2045 & RFC2047)"; + license = licenses.mit; + homepage = "https://github.com/mirage/pecu"; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/development/ocaml-modules/pgocaml/default.nix b/pkgs/development/ocaml-modules/pgocaml/default.nix index d0dcb5b489f..f67d614af3a 100644 --- a/pkgs/development/ocaml-modules/pgocaml/default.nix +++ b/pkgs/development/ocaml-modules/pgocaml/default.nix @@ -12,7 +12,7 @@ buildDunePackage rec { sha256 = "1rdypc83nap9j2ml9r6n1pzgf79gk1yffwyi6fmcrl7zmy01cg0n"; }; - minimumOCamlVersion = "4.07"; + minimumOCamlVersion = "4.08"; useDune2 = true; propagatedBuildInputs = [ calendar csv hex ppx_deriving ppx_sexp_conv re rresult sexplib ]; diff --git a/pkgs/development/ocaml-modules/phylogenetics/default.nix b/pkgs/development/ocaml-modules/phylogenetics/default.nix index d3d6097b446..b284f7ef5eb 100644 --- a/pkgs/development/ocaml-modules/phylogenetics/default.nix +++ b/pkgs/development/ocaml-modules/phylogenetics/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildDunePackage, fetchFromGitHub, ppx_deriving +{ lib, buildDunePackage, fetchFromGitHub, ppx_deriving , alcotest, angstrom-unix, biocaml, gnuplot, gsl, lacaml, menhir, owl, printbox }: buildDunePackage rec { diff --git a/pkgs/development/ocaml-modules/piqi/default.nix b/pkgs/development/ocaml-modules/piqi/default.nix index bbd7746d366..d7bc4b55b45 100644 --- a/pkgs/development/ocaml-modules/piqi/default.nix +++ b/pkgs/development/ocaml-modules/piqi/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "0.6.15"; pname = "piqi"; name = "ocaml${ocaml.version}-${pname}-${version}"; - + src = fetchFromGitHub { owner = "alavrik"; repo = pname; diff --git a/pkgs/development/ocaml-modules/postgresql/default.nix b/pkgs/development/ocaml-modules/postgresql/default.nix new file mode 100644 index 00000000000..82875dbd8b3 --- /dev/null +++ b/pkgs/development/ocaml-modules/postgresql/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchFromGitHub, buildDunePackage, postgresql }: + +buildDunePackage rec { + pname = "postgresql"; + version = "4.6.3"; + + minimumOCamlVersion = "4.08"; + + src = fetchFromGitHub { + owner = "mmottl"; + repo = "postgresql-ocaml"; + rev = version; + sha256 = "0fd96qqwkwjhv6pawk4wivwncszkif0sq05f0g5gd28jzwrsvpqr"; + }; + + buildInputs = [ postgresql ]; + + meta = { + description = "Bindings to the PostgreSQL library"; + license = lib.licenses.lgpl21Plus; + maintainers = with lib.maintainers; [ bcc32 ]; + homepage = "https://mmottl.github.io/postgresql-ocaml"; + }; +} diff --git a/pkgs/development/ocaml-modules/ppx_derivers/default.nix b/pkgs/development/ocaml-modules/ppx_derivers/default.nix index a10a6172605..3d4675ed90b 100644 --- a/pkgs/development/ocaml-modules/ppx_derivers/default.nix +++ b/pkgs/development/ocaml-modules/ppx_derivers/default.nix @@ -1,22 +1,22 @@ { lib, fetchFromGitHub, buildDunePackage }: buildDunePackage rec { - pname = "ppx_derivers"; - version = "1.2.1"; + pname = "ppx_derivers"; + version = "1.2.1"; minimumOCamlVersion = "4.02"; - src = fetchFromGitHub { - owner = "diml"; - repo = pname; - rev = version; - sha256 = "0yqvqw58hbx1a61wcpbnl9j30n495k23qmyy2xwczqs63mn2nkpn"; - }; + src = fetchFromGitHub { + owner = "diml"; + repo = pname; + rev = version; + sha256 = "0yqvqw58hbx1a61wcpbnl9j30n495k23qmyy2xwczqs63mn2nkpn"; + }; - meta = { - description = "Shared [@@deriving] plugin registry"; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.vbgl ]; - inherit (src.meta) homepage; - }; + meta = { + description = "Shared [@@deriving] plugin registry"; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.vbgl ]; + inherit (src.meta) homepage; + }; } diff --git a/pkgs/development/ocaml-modules/ppx_deriving/default.nix b/pkgs/development/ocaml-modules/ppx_deriving/default.nix index 37a3a55229d..910e5390096 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving/default.nix @@ -1,20 +1,34 @@ -{ lib, fetchzip, buildDunePackage -, cppo, ppxfind, ppx_tools, ppx_derivers, result, ounit, ocaml-migrate-parsetree +{ lib, fetchurl, buildDunePackage +, cppo, ppxlib, ppx_derivers, result, ounit, ocaml-migrate-parsetree }: +let params = + if lib.versionAtLeast ppxlib.version "0.15" + then { + version = "5.1"; + sha256 = "1i64fd7qrfzbam5hfbl01r0sx4iihsahcwqj13smmrjlnwi3nkxh"; + } else { + version = "5.0"; + sha256 = "0fkzrn4pdyvf1kl0nwvhqidq01pnq3ql8zk1jd56hb0cxaw851w3"; + } +; in + buildDunePackage rec { pname = "ppx_deriving"; - version = "4.5"; + inherit (params) version; + + useDune2 = true; - src = fetchzip { - url = "https://github.com/ocaml-ppx/ppx_deriving/archive/v${version}.tar.gz"; - sha256 = "1v2xldag54n0xk69vv3j4nln9bzkkpq3rildq118sydzsc9v239z"; + src = fetchurl { + url = "https://github.com/ocaml-ppx/ppx_deriving/releases/download/v${version}/ppx_deriving-v${version}.tbz"; + inherit (params) sha256; }; - buildInputs = [ ppxfind cppo ounit ]; - propagatedBuildInputs = [ ocaml-migrate-parsetree ppx_derivers ppx_tools result ]; + buildInputs = [ ppxlib cppo ]; + propagatedBuildInputs = [ ocaml-migrate-parsetree ppx_derivers result ]; doCheck = true; + checkInputs = [ ounit ]; meta = with lib; { description = "deriving is a library simplifying type-driven code generation on OCaml >=4.02."; diff --git a/pkgs/development/ocaml-modules/ppx_deriving_protobuf/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_protobuf/default.nix index f85e32d72c7..7828f2172ab 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving_protobuf/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving_protobuf/default.nix @@ -23,5 +23,6 @@ buildDunePackage rec { description = "A Protocol Buffers codec generator for OCaml"; license = licenses.mit; maintainers = [ maintainers.vyorkin ]; + broken = true; }; } diff --git a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix index 9af2c6edb32..bef60b3f381 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix @@ -1,25 +1,26 @@ -{ lib, buildDunePackage, fetchFromGitHub, ppxfind, ounit +{ lib, buildDunePackage, fetchFromGitHub, ppxlib, ounit , ppx_deriving, yojson }: buildDunePackage rec { pname = "ppx_deriving_yojson"; - version = "3.5.3"; + version = "3.6.1"; - minimumOCamlVersion = "4.04"; + useDune2 = true; + + minimumOCamlVersion = "4.07"; src = fetchFromGitHub { owner = "ocaml-ppx"; repo = "ppx_deriving_yojson"; rev = "v${version}"; - sha256 = "030638gp39mr4hkilrjhd98q4s8gjqxifm6fy6bwqrg74hmrl2y5"; + sha256 = "1icz5h6p3pfj7my5gi7wxpflrb8c902dqa17f9w424njilnpyrbk"; }; - buildInputs = [ ppxfind ounit ]; - - propagatedBuildInputs = [ ppx_deriving yojson ]; + propagatedBuildInputs = [ ppxlib ppx_deriving yojson ]; doCheck = true; + checkInputs = [ ounit ]; meta = { description = "A Yojson codec generator for OCaml >= 4.04"; diff --git a/pkgs/development/ocaml-modules/ppx_tools/default.nix b/pkgs/development/ocaml-modules/ppx_tools/default.nix index 94d7eb714dd..8097c9145e4 100644 --- a/pkgs/development/ocaml-modules/ppx_tools/default.nix +++ b/pkgs/development/ocaml-modules/ppx_tools/default.nix @@ -1,9 +1,11 @@ -{ lib, stdenv, fetchFromGitHub, buildDunePackage, ocaml, findlib }: +{ lib, stdenv, fetchFromGitHub, buildDunePackage, ocaml, findlib, cppo }: let param = - let v6_2 = { - version = "6.2"; - sha256 = "0qf4fwnn4hhk52kjw9frv21v23azqnn4mjvwf1hs0nxf7q4kacb5"; + let v6_3 = { + version = "6.3"; + sha256 = "1skf4njvkifwx0qlsrc0jn891gvvcp5ryd6kkpx56hck7nnxv8x6"; + useDune2 = true; + buildInputs = [cppo]; }; in { "4.02" = { @@ -25,10 +27,11 @@ let param = "4.07" = { version = "5.1+4.06.0"; sha256 = "1ww4cspdpgjjsgiv71s0im5yjkr3544x96wsq1vpdacq7dr7zwiw"; }; - "4.08" = v6_2; - "4.09" = v6_2; - "4.10" = v6_2; - "4.11" = v6_2; + "4.08" = v6_3; + "4.09" = v6_3; + "4.10" = v6_3; + "4.11" = v6_3; + "4.12" = v6_3; }.${ocaml.meta.branch}; in @@ -50,7 +53,7 @@ if lib.versionAtLeast param.version "6.0" then buildDunePackage { inherit pname src meta; - inherit (param) version; + inherit (param) version useDune2 buildInputs; } else stdenv.mkDerivation { diff --git a/pkgs/development/ocaml-modules/ppxfind/default.nix b/pkgs/development/ocaml-modules/ppxfind/default.nix index 1008dfe62a9..4e135c1b115 100644 --- a/pkgs/development/ocaml-modules/ppxfind/default.nix +++ b/pkgs/development/ocaml-modules/ppxfind/default.nix @@ -1,27 +1,27 @@ { stdenv, lib, buildDunePackage, fetchurl, ocaml, ocaml-migrate-parsetree }: buildDunePackage (rec { - pname = "ppxfind"; - version = "1.4"; - src = fetchurl { - url = "https://github.com/diml/ppxfind/releases/download/${version}/ppxfind-${version}.tbz"; - sha256 = "0wa9vcrc26kirc2cqqs6kmarbi8gqy3dgdfiv9y7nzsgy1liqacq"; - }; + pname = "ppxfind"; + version = "1.4"; + src = fetchurl { + url = "https://github.com/diml/ppxfind/releases/download/${version}/ppxfind-${version}.tbz"; + sha256 = "0wa9vcrc26kirc2cqqs6kmarbi8gqy3dgdfiv9y7nzsgy1liqacq"; + }; - minimumOCamlVersion = "4.03"; - useDune2 = true; + minimumOCamlVersion = "4.03"; + useDune2 = true; - buildInputs = [ ocaml-migrate-parsetree ]; + buildInputs = [ ocaml-migrate-parsetree ]; # Don't run the native `strip' when cross-compiling. dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; - meta = { - homepage = "https://github.com/diml/ppxfind"; - description = "ocamlfind ppx tool"; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.vbgl ]; - }; + meta = { + homepage = "https://github.com/diml/ppxfind"; + description = "ocamlfind ppx tool"; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.vbgl ]; + }; } // ( if lib.versions.majorMinor ocaml.version == "4.04" then { dontStrip = true; diff --git a/pkgs/development/ocaml-modules/ppxlib/default.nix b/pkgs/development/ocaml-modules/ppxlib/default.nix index d5b09b1ddc2..03085a13cdf 100644 --- a/pkgs/development/ocaml-modules/ppxlib/default.nix +++ b/pkgs/development/ocaml-modules/ppxlib/default.nix @@ -1,21 +1,29 @@ { lib, fetchFromGitHub, buildDunePackage, ocaml , version ? if lib.versionAtLeast ocaml.version "4.07" then "0.15.0" else "0.13.0" , ocaml-compiler-libs, ocaml-migrate-parsetree, ppx_derivers, stdio -, stdlib-shims +, stdlib-shims, ocaml-migrate-parsetree-2-1 }: let param = { "0.8.1" = { sha256 = "0vm0jajmg8135scbg0x60ivyy5gzv4abwnl7zls2mrw23ac6kml6"; max_version = "4.10"; + useDune2 = false; + useOMP2 = false; }; "0.13.0" = { sha256 = "0c54g22pm6lhfh3f7s5wbah8y48lr5lj3cqsbvgi99bly1b5vqvl"; + useDune2 = false; + useOMP2 = false; }; "0.15.0" = { sha256 = "1p037kqj5858xrhh0dps6vbf4fnijla6z9fjz5zigvnqp4i2xkrn"; min_version = "4.07"; - useDune2 = true; + useOMP2 = false; + }; + "0.18.0" = { + sha256 = "1ciy6va2gjrpjs02kha83pzh0x1gkmfsfsdgabbs1v14a8qgfibm"; + min_version = "4.07"; }; }."${version}"; in @@ -28,7 +36,7 @@ buildDunePackage rec { pname = "ppxlib"; inherit version; - useDune2 = param.useDune2 or false; + useDune2 = param.useDune2 or true; src = fetchFromGitHub { owner = "ocaml-ppx"; @@ -38,7 +46,12 @@ buildDunePackage rec { }; propagatedBuildInputs = [ - ocaml-compiler-libs ocaml-migrate-parsetree ppx_derivers stdio + ocaml-compiler-libs + (if param.useOMP2 or true + then ocaml-migrate-parsetree-2-1 + else ocaml-migrate-parsetree) + ppx_derivers + stdio stdlib-shims ]; diff --git a/pkgs/development/ocaml-modules/progress/default.nix b/pkgs/development/ocaml-modules/progress/default.nix new file mode 100644 index 00000000000..a3c0a5add3d --- /dev/null +++ b/pkgs/development/ocaml-modules/progress/default.nix @@ -0,0 +1,28 @@ +{ lib, buildDunePackage, fetchurl +, mtime, terminal_size, alcotest, astring, fmt +}: + +buildDunePackage rec { + pname = "progress"; + version = "0.1.1"; + + minimumOCamlVersion = "4.08"; + useDune2 = true; + + src = fetchurl { + url = "https://github.com/CraigFe/progress/releases/download/${version}/progress-${version}.tbz"; + sha256 = "90c6bec19d014a4c6b0b67006f08bdfcf36981d2176769bebe0ccd75d6785a32"; + }; + + propagatedBuildInputs = [ mtime terminal_size ]; + + doCheck = true; + checkInputs = [ alcotest astring fmt ]; + + meta = with lib; { + description = "Progress bar library for OCaml"; + homepage = "https://github.com/CraigFe/progress"; + license = licenses.mit; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/development/ocaml-modules/ptime/default.nix b/pkgs/development/ocaml-modules/ptime/default.nix index 50ad5ea94eb..d99ec7ed320 100644 --- a/pkgs/development/ocaml-modules/ptime/default.nix +++ b/pkgs/development/ocaml-modules/ptime/default.nix @@ -1,4 +1,6 @@ -{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, result, js_of_ocaml }: +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, result, js_of_ocaml +, jsooSupport ? true +}: stdenv.mkDerivation rec { version = "0.8.5"; @@ -10,11 +12,12 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ ocaml findlib ocamlbuild ]; - buildInputs = [ findlib topkg js_of_ocaml ]; + buildInputs = [ findlib topkg ] + ++ lib.optional jsooSupport js_of_ocaml; propagatedBuildInputs = [ result ]; - buildPhase = "${topkg.run} build --with-js_of_ocaml true"; + buildPhase = "${topkg.run} build --with-js_of_ocaml ${lib.boolToString jsooSupport}"; inherit (topkg) installPhase; diff --git a/pkgs/development/ocaml-modules/repr/default.nix b/pkgs/development/ocaml-modules/repr/default.nix new file mode 100644 index 00000000000..de6877ddd68 --- /dev/null +++ b/pkgs/development/ocaml-modules/repr/default.nix @@ -0,0 +1,30 @@ +{ lib, buildDunePackage, fetchurl, fmt, uutf, jsonm, base64, either }: + +buildDunePackage rec { + pname = "repr"; + version = "0.2.1"; + + minimumOCamlVersion = "4.08"; + + src = fetchurl { + url = "https://github.com/mirage/${pname}/releases/download/${version}/${pname}-fuzz-${version}.tbz"; + sha256 = "1cbzbawbn71mmpw8y84s1p2pbhc055w1znz64jvr00c7fdr9p8hc"; + }; + + useDune2 = true; + + propagatedBuildInputs = [ + fmt + uutf + jsonm + base64 + either + ]; + + meta = with lib; { + description = "Dynamic type representations. Provides no stability guarantee"; + homepage = "https://github.com/mirage/repr"; + license = licenses.isc; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/development/ocaml-modules/repr/ppx.nix b/pkgs/development/ocaml-modules/repr/ppx.nix new file mode 100644 index 00000000000..a1112ef9ac7 --- /dev/null +++ b/pkgs/development/ocaml-modules/repr/ppx.nix @@ -0,0 +1,23 @@ +{ buildDunePackage, repr, ppxlib, ppx_deriving, alcotest, hex }: + +buildDunePackage { + pname = "ppx_repr"; + + inherit (repr) src version useDune2; + + propagatedBuildInputs = [ + repr + ppxlib + ppx_deriving + ]; + + doCheck = true; + checkInputs = [ + alcotest + hex + ]; + + meta = repr.meta // { + description = "PPX deriver for type representations"; + }; +} diff --git a/pkgs/development/ocaml-modules/rope/default.nix b/pkgs/development/ocaml-modules/rope/default.nix index 84e042bf7d2..481342e98c7 100644 --- a/pkgs/development/ocaml-modules/rope/default.nix +++ b/pkgs/development/ocaml-modules/rope/default.nix @@ -9,7 +9,9 @@ let param = buildInputs = [ dune ]; extra = { buildPhase = "dune build -p rope"; - inherit (dune) installPhase; + installPhase = '' + dune install --prefix $out --libdir $OCAMLFIND_DESTDIR rope + ''; }; } else { version = "0.5"; diff --git a/pkgs/development/ocaml-modules/rresult/default.nix b/pkgs/development/ocaml-modules/rresult/default.nix index 2573c95c628..04631cc3b4b 100644 --- a/pkgs/development/ocaml-modules/rresult/default.nix +++ b/pkgs/development/ocaml-modules/rresult/default.nix @@ -1,24 +1,24 @@ { stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, result }: stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-rresult-${version}"; - version = "0.6.0"; - src = fetchurl { - url = "https://erratique.ch/software/rresult/releases/rresult-${version}.tbz"; - sha256 = "1k69a3gvrk7f2cshwjzvk7818f0bwxhacgd14wxy6d4gmrggci86"; - }; + name = "ocaml${ocaml.version}-rresult-${version}"; + version = "0.6.0"; + src = fetchurl { + url = "https://erratique.ch/software/rresult/releases/rresult-${version}.tbz"; + sha256 = "1k69a3gvrk7f2cshwjzvk7818f0bwxhacgd14wxy6d4gmrggci86"; + }; - buildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ ocaml findlib ocamlbuild topkg ]; propagatedBuildInputs = [ result ]; - - inherit (topkg) buildPhase installPhase; - meta = { - license = lib.licenses.isc; - homepage = "https://erratique.ch/software/rresult"; - description = "Result value combinators for OCaml"; - maintainers = [ lib.maintainers.vbgl ]; - inherit (ocaml.meta) platforms; - }; + inherit (topkg) buildPhase installPhase; + + meta = { + license = lib.licenses.isc; + homepage = "https://erratique.ch/software/rresult"; + description = "Result value combinators for OCaml"; + maintainers = [ lib.maintainers.vbgl ]; + inherit (ocaml.meta) platforms; + }; } diff --git a/pkgs/development/ocaml-modules/semaphore-compat/default.nix b/pkgs/development/ocaml-modules/semaphore-compat/default.nix new file mode 100644 index 00000000000..a686ef42e70 --- /dev/null +++ b/pkgs/development/ocaml-modules/semaphore-compat/default.nix @@ -0,0 +1,20 @@ +{ lib, buildDunePackage, fetchurl }: + +buildDunePackage rec { + pname = "semaphore-compat"; + version = "1.0.1"; + + src = fetchurl { + url = "https://github.com/mirage/semaphore-compat/releases/download/${version}/semaphore-compat-${version}.tbz"; + sha256 = "139c5rxdp4dg1jcwyyxvhxr8213l1xdl2ab0mc288rfcppsiyxrb"; + }; + + useDune2 = true; + + meta = with lib; { + description = "Compatibility Semaphore module"; + homepage = "https://github.com/mirage/semaphore-compat"; + license = licenses.lgpl21Only; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/development/ocaml-modules/sqlite3/default.nix b/pkgs/development/ocaml-modules/sqlite3/default.nix index 660282ad131..1b8f9d629e3 100644 --- a/pkgs/development/ocaml-modules/sqlite3/default.nix +++ b/pkgs/development/ocaml-modules/sqlite3/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, sqlite, pkgconfig, buildDunePackage }: +{ lib, fetchurl, sqlite, pkg-config, buildDunePackage }: buildDunePackage rec { pname = "sqlite3"; @@ -10,7 +10,7 @@ buildDunePackage rec { sha256 = "0sba74n0jvzxibrclhbpqscil36yfw7i9jj9q562yhza6rax9p82"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ sqlite ]; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/terminal_size/default.nix b/pkgs/development/ocaml-modules/terminal_size/default.nix new file mode 100644 index 00000000000..9036fc55bef --- /dev/null +++ b/pkgs/development/ocaml-modules/terminal_size/default.nix @@ -0,0 +1,23 @@ +{ lib, buildDunePackage, fetchurl, alcotest }: + +buildDunePackage rec { + pname = "terminal_size"; + version = "0.1.4"; + + useDune2 = true; + + src = fetchurl { + url = "https://github.com/cryptosense/terminal_size/releases/download/v${version}/terminal_size-v${version}.tbz"; + sha256 = "fdca1fee7d872c4a8e5ab003d9915b6782b272e2a3661ca877f2d78dd25371a7"; + }; + + checkInputs = [ alcotest ]; + doCheck = true; + + meta = with lib; { + description = "Get the dimensions of the terminal"; + homepage = "https://github.com/cryptosense/terminal_size"; + license = licenses.bsd2; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/development/ocaml-modules/tls/mirage.nix b/pkgs/development/ocaml-modules/tls/mirage.nix new file mode 100644 index 00000000000..ad81c03c35d --- /dev/null +++ b/pkgs/development/ocaml-modules/tls/mirage.nix @@ -0,0 +1,29 @@ +{ buildDunePackage, tls +, x509, lwt, fmt, mirage-flow, mirage-kv, mirage-clock, ptime +, mirage-crypto, mirage-crypto-pk, hacl_x25519, fiat-p256 +}: + +buildDunePackage { + pname = "tls-mirage"; + + inherit (tls) version src useDune2 minimumOCamlVersion; + + propagatedBuildInputs = [ + tls + x509 + lwt + fmt + mirage-flow + mirage-kv + mirage-clock + ptime + mirage-crypto + mirage-crypto-pk + hacl_x25519 + fiat-p256 + ]; + + meta = tls.meta // { + description = "Transport Layer Security purely in OCaml, MirageOS layer"; + }; +} diff --git a/pkgs/development/ocaml-modules/toml/default.nix b/pkgs/development/ocaml-modules/toml/default.nix index 0e25d9bc6b6..6980a148e10 100644 --- a/pkgs/development/ocaml-modules/toml/default.nix +++ b/pkgs/development/ocaml-modules/toml/default.nix @@ -4,12 +4,15 @@ buildDunePackage rec { pname = "toml"; - version = "5.0.0"; + version = "6.0.0"; + + useDune2 = true; + src = fetchFromGitHub { owner = "ocaml-toml"; repo = "to.ml"; - rev = "v${version}"; - sha256 = "1505kwcwklcfaxw8wckajm8kc6yrlikmxyhi8f8cpvhlw9ys90nj"; + rev = version; + sha256 = "08ywzqckllvwawl1wpgg7qzvx6jhq7d6vysa0d5hj7qdwq213ggm"; }; buildInputs = [ menhir ]; diff --git a/pkgs/development/ocaml-modules/torch/default.nix b/pkgs/development/ocaml-modules/torch/default.nix index ebb5b9b9c25..d90a80c5648 100644 --- a/pkgs/development/ocaml-modules/torch/default.nix +++ b/pkgs/development/ocaml-modules/torch/default.nix @@ -46,7 +46,7 @@ buildDunePackage rec { stdio ]; - preBuild = ''export LIBTORCH=${pytorch.dev}/''; + preBuild = "export LIBTORCH=${pytorch.dev}/"; doCheck = !stdenv.isAarch64; checkPhase = "dune runtest"; diff --git a/pkgs/development/ocaml-modules/tsdl/default.nix b/pkgs/development/ocaml-modules/tsdl/default.nix index 81ba44647e3..7c09e8cd9d7 100644 --- a/pkgs/development/ocaml-modules/tsdl/default.nix +++ b/pkgs/development/ocaml-modules/tsdl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, ctypes, result, SDL2, pkgconfig, ocb-stubblr }: +{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, ctypes, result, SDL2, pkg-config, ocb-stubblr }: if !lib.versionAtLeast ocaml.version "4.03" then throw "tsdl is not available for OCaml ${ocaml.version}" @@ -18,7 +18,7 @@ stdenv.mkDerivation { sha256 = "1zwv0ixkigh1gzk5n49rwvz2f2m62jdkkqg40j7dclg4gri7691f"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ocaml findlib ocamlbuild topkg ]; propagatedBuildInputs = [ SDL2 ctypes ]; diff --git a/pkgs/development/ocaml-modules/vchan/default.nix b/pkgs/development/ocaml-modules/vchan/default.nix new file mode 100644 index 00000000000..54bf4e65004 --- /dev/null +++ b/pkgs/development/ocaml-modules/vchan/default.nix @@ -0,0 +1,47 @@ +{ lib, buildDunePackage, fetchurl +, ppx_cstruct, ppx_sexp_conv, ounit, io-page-unix +, lwt, cstruct, io-page, mirage-flow, xenstore, xenstore_transport +, sexplib, cmdliner +}: + +buildDunePackage rec { + pname = "vchan"; + version = "6.0.0"; + + useDune2 = true; + minimumOCamlVersion = "4.08"; + + src = fetchurl { + url = "https://github.com/mirage/ocaml-vchan/releases/download/v${version}/vchan-v${version}.tbz"; + sha256 = "7a6cc89ff8ba7144d6cef3f36722f40deedb3cefff0f7be1b2f3b7b2a2b41747"; + }; + + nativeBuildInputs = [ + ppx_cstruct + ]; + + propagatedBuildInputs = [ + ppx_sexp_conv + lwt + cstruct + io-page + mirage-flow + xenstore + xenstore_transport + sexplib + ]; + + doCheck = true; + checkInputs = [ + cmdliner + io-page-unix + ounit + ]; + + meta = with lib; { + description = "Xen Vchan implementation"; + homepage = "https://github.com/mirage/ocaml-vchan"; + license = licenses.isc; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/development/ocaml-modules/visitors/default.nix b/pkgs/development/ocaml-modules/visitors/default.nix index c8d9436461a..bda50bdb78e 100644 --- a/pkgs/development/ocaml-modules/visitors/default.nix +++ b/pkgs/development/ocaml-modules/visitors/default.nix @@ -1,24 +1,22 @@ -{ lib, buildDunePackage, fetchFromGitLab, ppx_tools, ppx_deriving, result, cppo }: +{ lib, buildDunePackage, fetchFromGitLab, ppxlib, ppx_deriving, result }: buildDunePackage rec { pname = "visitors"; - version = "20200210"; + version = "20210127"; useDune2 = true; - minimumOCamlVersion = "4.02.3"; + minimumOCamlVersion = "4.07"; src = fetchFromGitLab { owner = "fpottier"; repo = pname; rev = version; domain = "gitlab.inria.fr"; - sha256 = "12i099h1hc1walabiwqbinnpgcxkc1wn72913v7v6vvyif21rb5a"; + sha256 = "0b73h7d4yv04a0b5x2i222jknbcgf9vvxzfjxzy2jwanxz9d873z"; }; - buildInputs = [ cppo ]; - - propagatedBuildInputs = [ ppx_tools ppx_deriving result ]; + propagatedBuildInputs = [ ppxlib ppx_deriving result ]; meta = with lib; { homepage = "https://gitlab.inria.fr/fpottier/visitors"; diff --git a/pkgs/development/ocaml-modules/webbrowser/default.nix b/pkgs/development/ocaml-modules/webbrowser/default.nix index 896b6e49ac0..ebc5472ce53 100644 --- a/pkgs/development/ocaml-modules/webbrowser/default.nix +++ b/pkgs/development/ocaml-modules/webbrowser/default.nix @@ -3,24 +3,24 @@ }: stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-webbrowser-${version}"; - version = "0.6.1"; - src = fetchurl { - url = "https://erratique.ch/software/webbrowser/releases/webbrowser-${version}.tbz"; - sha256 = "137a948bx7b71zfv4za3hhznrn5lzbbrgzjy0das83zms508isx3"; - }; + name = "ocaml${ocaml.version}-webbrowser-${version}"; + version = "0.6.1"; + src = fetchurl { + url = "https://erratique.ch/software/webbrowser/releases/webbrowser-${version}.tbz"; + sha256 = "137a948bx7b71zfv4za3hhznrn5lzbbrgzjy0das83zms508isx3"; + }; - nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; - buildInputs = []; - propagatedBuildInputs = [ astring bos cmdliner rresult ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = []; + propagatedBuildInputs = [ astring bos cmdliner rresult ]; - inherit (topkg) buildPhase installPhase; + inherit (topkg) buildPhase installPhase; - meta = { - description = "Open and reload URIs in browsers from OCaml"; - homepage = "https://erratique.ch/software/webbrowser"; - license = lib.licenses.isc; - maintainers = [ lib.maintainers.vbgl ]; - inherit (ocaml.meta) platforms; - }; + meta = { + description = "Open and reload URIs in browsers from OCaml"; + homepage = "https://erratique.ch/software/webbrowser"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + inherit (ocaml.meta) platforms; + }; } diff --git a/pkgs/development/ocaml-modules/wodan/default.nix b/pkgs/development/ocaml-modules/wodan/default.nix new file mode 100644 index 00000000000..64ca29f2030 --- /dev/null +++ b/pkgs/development/ocaml-modules/wodan/default.nix @@ -0,0 +1,40 @@ +{ lib, buildDunePackage, fetchFromGitHub, lwt_ppx, ppx_cstruct, optint +, checkseum, diet, bitv, nocrypto, logs, lru, io-page, mirage-block }: + +buildDunePackage rec { + pname = "wodan"; + version = "unstable-2020-11-20"; + + useDune2 = true; + + src = fetchFromGitHub { + owner = "mirage"; + repo = pname; + rev = "cc08fe25888051c207f1009bcd2d39f8c514484f"; + sha256 = "0186vlhnl8wcz2hmpn327n9a0bibnypmjy3w4nxq3yyglh6vj1im"; + fetchSubmodules = true; + }; + + minimumOCamlVersion = "4.08"; + + propagatedBuildInputs = [ + lwt_ppx + ppx_cstruct + optint + checkseum + diet + bitv + nocrypto + logs + lru + io-page + mirage-block + ]; + + meta = with lib; { + inherit (src.meta) homepage; + description = "A flash-friendly, safe and flexible filesystem library"; + license = licenses.isc; + maintainers = with maintainers; [ ehmry ]; + }; +} diff --git a/pkgs/development/ocaml-modules/wodan/irmin.nix b/pkgs/development/ocaml-modules/wodan/irmin.nix new file mode 100644 index 00000000000..a42259af9e6 --- /dev/null +++ b/pkgs/development/ocaml-modules/wodan/irmin.nix @@ -0,0 +1,20 @@ +{ lib, buildDunePackage, io-page-unix, irmin-chunk, irmin-git, irmin-unix +, mirage-block-ramdisk, mirage-block-unix, wodan }: + +buildDunePackage rec { + pname = "wodan-irmin"; + inherit (wodan) version src useDune2; + + propagatedBuildInputs = [ + io-page-unix + irmin-chunk + irmin-git + irmin-unix + mirage-block-ramdisk + mirage-block-unix + wodan + ]; + + meta = wodan.meta // { description = "Wodan as an Irmin store"; }; + +} diff --git a/pkgs/development/ocaml-modules/wodan/unix.nix b/pkgs/development/ocaml-modules/wodan/unix.nix new file mode 100644 index 00000000000..64a18b6b83d --- /dev/null +++ b/pkgs/development/ocaml-modules/wodan/unix.nix @@ -0,0 +1,27 @@ +{ lib, buildDunePackage, base64, benchmark, csv, cmdliner, wodan, afl-persistent +, io-page-unix, mirage-block-ramdisk, mirage-block-unix }: + +buildDunePackage rec { + outputs = [ "bin" "out" ]; + pname = "wodan-unix"; + inherit (wodan) version src useDune2; + + propagatedBuildInputs = [ + afl-persistent + base64 + benchmark + cmdliner + csv + io-page-unix + mirage-block-ramdisk + mirage-block-unix + wodan + ]; + + postInstall = '' + moveToOutput bin "''${!outputBin}" + ''; + + meta = wodan.meta // { description = "Wodan clients with Unix integration"; }; + +} diff --git a/pkgs/development/ocaml-modules/wtf8/default.nix b/pkgs/development/ocaml-modules/wtf8/default.nix index b46386b1666..828df66b41d 100644 --- a/pkgs/development/ocaml-modules/wtf8/default.nix +++ b/pkgs/development/ocaml-modules/wtf8/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, buildDunePackage }: +{ lib, fetchurl, buildDunePackage }: buildDunePackage rec { pname = "wtf8"; diff --git a/pkgs/development/ocaml-modules/x509/default.nix b/pkgs/development/ocaml-modules/x509/default.nix index 289a3891c78..23efd4bb9fc 100644 --- a/pkgs/development/ocaml-modules/x509/default.nix +++ b/pkgs/development/ocaml-modules/x509/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildDunePackage +{ lib, fetchurl, buildDunePackage, fetchpatch , alcotest, cstruct-unix , asn1-combinators, domain-name, fmt, gmap, rresult, mirage-crypto, mirage-crypto-pk , logs, base64 @@ -15,6 +15,14 @@ buildDunePackage rec { sha256 = "1b4lcphmlyjhdgqi0brakgjp3diwmrj1y9hx87svi5xklw3zik22"; }; + patches = [ + # fix tests for mirage-crypto >= 0.8.9, can be removed at next release + (fetchpatch { + url = "https://github.com/mirleft/ocaml-x509/commit/ba1fdd4432950293e663416a0c454c8c04a71c0f.patch"; + sha256 = "1rbjf7408772ns3ypk2hyw9v17iy1kcx84plr1rqc56iwk9zzxmr"; + }) + ]; + useDune2 = true; buildInputs = [ alcotest cstruct-unix ]; diff --git a/pkgs/development/ocaml-modules/xenstore-tool/default.nix b/pkgs/development/ocaml-modules/xenstore-tool/default.nix new file mode 100644 index 00000000000..34f32e4f117 --- /dev/null +++ b/pkgs/development/ocaml-modules/xenstore-tool/default.nix @@ -0,0 +1,13 @@ +{ buildDunePackage, xenstore_transport, xenstore, lwt }: + +buildDunePackage { + pname = "xenstore-tool"; + + inherit (xenstore_transport) src version useDune2 minimumOCamlVersion; + + buildInputs = [ xenstore_transport xenstore lwt ]; + + meta = xenstore_transport.meta // { + description = "Command line tool for interfacing with xenstore"; + }; +} diff --git a/pkgs/development/ocaml-modules/xenstore/default.nix b/pkgs/development/ocaml-modules/xenstore/default.nix new file mode 100644 index 00000000000..189920290e3 --- /dev/null +++ b/pkgs/development/ocaml-modules/xenstore/default.nix @@ -0,0 +1,30 @@ +{ lib, buildDunePackage, fetchurl +, cstruct, ppx_cstruct, lwt, ounit, stdlib-shims +}: + +buildDunePackage rec { + pname = "xenstore"; + version = "2.1.1"; + + minimumOCamlVersion = "4.04"; + + useDune2 = true; + + src = fetchurl { + url = "https://github.com/mirage/ocaml-xenstore/releases/download/${version}/xenstore-${version}.tbz"; + sha256 = "283814ea21adc345c4d59cfcb17b2f7c1185004ecaecc3871557c961874c84f5"; + }; + + nativeBuildInputs = [ ppx_cstruct ]; + propagatedBuildInputs = [ stdlib-shims cstruct lwt ]; + + doCheck = true; + checkInputs = [ ounit ]; + + meta = with lib; { + description = "Xenstore protocol in pure OCaml"; + license = licenses.lgpl21Only; + maintainers = [ maintainers.sternenseemann ]; + homepage = "https://github.com/mirage/ocaml-xenstore"; + }; +} diff --git a/pkgs/development/ocaml-modules/xenstore_transport/default.nix b/pkgs/development/ocaml-modules/xenstore_transport/default.nix new file mode 100644 index 00000000000..f0bb908e5db --- /dev/null +++ b/pkgs/development/ocaml-modules/xenstore_transport/default.nix @@ -0,0 +1,27 @@ +{ lib, buildDunePackage, fetchFromGitHub, xenstore, lwt }: + +buildDunePackage rec { + pname = "xenstore_transport"; + version = "1.3.0"; + + minimumOCamlVersion = "4.04"; + useDune2 = true; + + src = fetchFromGitHub { + owner = "xapi-project"; + repo = "ocaml-xenstore-clients"; + rev = "v${version}"; + sha256 = "1kxxd9i4qiq98r7sgvl59iq2ni7y6drnv48qj580q5cyiyyc85q3"; + }; + + propagatedBuildInputs = [ xenstore lwt ]; + + # requires a mounted xenfs and xen server + doCheck = false; + + meta = with lib; { + description = "Low-level libraries for connecting to a xenstore service on a xen host"; + license = licenses.lgpl21Only; + homepage = "http://github.com/xapi-project/ocaml-xenstore-clients"; + }; +} diff --git a/pkgs/development/ocaml-modules/xml-light/default.nix b/pkgs/development/ocaml-modules/xml-light/default.nix index 0ca48ebee28..a6db0dc7870 100644 --- a/pkgs/development/ocaml-modules/xml-light/default.nix +++ b/pkgs/development/ocaml-modules/xml-light/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { make all make opt ''; - + installPhase = '' make install_ocamlfind mkdir -p $out/share diff --git a/pkgs/development/ocaml-modules/yojson/default.nix b/pkgs/development/ocaml-modules/yojson/default.nix index 61d931a66cc..c9bf285b7bd 100644 --- a/pkgs/development/ocaml-modules/yojson/default.nix +++ b/pkgs/development/ocaml-modules/yojson/default.nix @@ -7,7 +7,11 @@ let url = "https://github.com/ocaml-community/yojson/releases/download/${version}/yojson-${version}.tbz"; sha256 = "08llz96if8bcgnaishf18si76cv11zbkni0aldb54k3cn7ipiqvd"; nativeBuildInputs = [ dune ]; - extra = { inherit (dune) installPhase; }; + extra = { + installPhase = '' + dune install --prefix $out --libdir $OCAMLFIND_DESTDIR ${pname} + ''; + }; } else rec { version = "1.2.3"; url = "https://github.com/ocaml-community/yojson/archive/v${version}.tar.gz"; diff --git a/pkgs/development/ocaml-modules/zarith/default.nix b/pkgs/development/ocaml-modules/zarith/default.nix index d937c95a972..bddf2a2448f 100644 --- a/pkgs/development/ocaml-modules/zarith/default.nix +++ b/pkgs/development/ocaml-modules/zarith/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl -, ocaml, findlib, pkgconfig, perl +, ocaml, findlib, pkg-config, perl , gmp }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { inherit (source) version; src = fetchurl { inherit (source) url sha256; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ocaml findlib perl ]; propagatedBuildInputs = [ gmp ]; diff --git a/pkgs/development/ocaml-modules/zed/default.nix b/pkgs/development/ocaml-modules/zed/default.nix index 96342915862..a7889523bcc 100644 --- a/pkgs/development/ocaml-modules/zed/default.nix +++ b/pkgs/development/ocaml-modules/zed/default.nix @@ -1,36 +1,19 @@ -{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild, camomile, react, dune, charInfo_width }: +{ lib, buildDunePackage, fetchFromGitHub, camomile, react, charInfo_width }: -let param = - if lib.versionAtLeast ocaml.version "4.02" then - { - version = "3.1.0"; - sha256 = "04vr1a94imsghm98iigc35rhifsz0rh3qz2qm0wam2wvp6vmrx0p"; - buildInputs = [ dune ]; - propagatedBuildInputs = [ charInfo_width ]; - extra = { - buildPhase = "dune build -p zed"; - inherit (dune) installPhase; }; - } else { - version = "1.4"; - sha256 = "0d8qfy0qiydrrqi8qc9rcwgjigql6vx9gl4zp62jfz1lmjgb2a3w"; - buildInputs = [ ocamlbuild ]; - propagatedBuildInputs = [ camomile ]; - extra = { createFindlibDestdir = true; }; - } -; in +buildDunePackage rec { + pname = "zed"; + version = "3.1.0"; -stdenv.mkDerivation (rec { - inherit (param) version; - name = "ocaml-zed-${version}"; + useDune2 = true; - src = fetchzip { - url = "https://github.com/diml/zed/archive/${version}.tar.gz"; - inherit (param) sha256; + src = fetchFromGitHub { + owner = "ocaml-community"; + repo = pname; + rev = version; + sha256 = "04vr1a94imsghm98iigc35rhifsz0rh3qz2qm0wam2wvp6vmrx0p"; }; - buildInputs = [ ocaml findlib ] ++ param.buildInputs; - - propagatedBuildInputs = [ react ] ++ param.propagatedBuildInputs; + propagatedBuildInputs = [ charInfo_width react ]; meta = { description = "Abstract engine for text edition in OCaml"; @@ -41,11 +24,10 @@ stdenv.mkDerivation (rec { To support efficient text edition capabilities, Zed provides macro recording and cursor management facilities. ''; - homepage = "https://github.com/diml/zed"; + inherit (src.meta) homepage; license = lib.licenses.bsd3; - platforms = ocaml.meta.platforms or []; maintainers = [ lib.maintainers.gal_bolle ]; }; -} // param.extra) +} diff --git a/pkgs/development/perl-modules/MNI/default.nix b/pkgs/development/perl-modules/MNI/default.nix index c0fc8f28108..2ef7b90842e 100644 --- a/pkgs/development/perl-modules/MNI/default.nix +++ b/pkgs/development/perl-modules/MNI/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, buildPerlPackage, lib, stdenv }: +{ fetchFromGitHub, buildPerlPackage, lib }: buildPerlPackage { pname = "MNI-Perllib"; diff --git a/pkgs/development/perl-modules/Percona-Toolkit/default.nix b/pkgs/development/perl-modules/Percona-Toolkit/default.nix index 85a11aaed46..5efac53f837 100644 --- a/pkgs/development/perl-modules/Percona-Toolkit/default.nix +++ b/pkgs/development/perl-modules/Percona-Toolkit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPerlPackage, shortenPerlShebang +{ lib, fetchFromGitHub, buildPerlPackage, shortenPerlShebang , DBDmysql, DBI, IOSocketSSL, TermReadKey }: @@ -24,7 +24,7 @@ buildPerlPackage rec { ''; meta = with lib; { - description = ''Collection of advanced command-line tools to perform a variety of MySQL and system tasks.''; + description = "Collection of advanced command-line tools to perform a variety of MySQL and system tasks."; homepage = "https://www.percona.com/software/database-tools/percona-toolkit"; license = with licenses; [ gpl2 ]; maintainers = with maintainers; [ izorkin ]; diff --git a/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix b/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix index ccc59980dd1..17ec8ab48b5 100644 --- a/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix +++ b/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildPerlPackage, shortenPerlShebang, LWP, LWPProtocolHttps, DataDump, JSON }: +{ stdenv, lib, fetchFromGitHub, buildPerlPackage, shortenPerlShebang, LWP, LWPProtocolHttps, DataDump, JSON }: buildPerlPackage rec { pname = "WWW-YoutubeViewer"; @@ -11,21 +11,21 @@ buildPerlPackage rec { sha256 = "16p0sa91h0zpqdpqmy348g6b9qj5f6qrbzrljn157vk00cg6mx18"; }; - nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; propagatedBuildInputs = [ LWP LWPProtocolHttps DataDump JSON ]; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.isDarwin '' shortenPerlShebang $out/bin/youtube-viewer ''; - meta = { + meta = with lib; { description = "A lightweight application for searching and streaming videos from YouTube"; homepage = "https://github.com/trizen/youtube-viewer"; - maintainers = with stdenv.lib.maintainers; [ woffs ]; - license = with stdenv.lib.licenses; [ artistic2 ]; + maintainers = with maintainers; [ woffs ]; + license = with licenses; [ artistic2 ]; }; } diff --git a/pkgs/development/perl-modules/maatkit/default.nix b/pkgs/development/perl-modules/maatkit/default.nix index e0a1a45cd44..d6945083f63 100644 --- a/pkgs/development/perl-modules/maatkit/default.nix +++ b/pkgs/development/perl-modules/maatkit/default.nix @@ -1,4 +1,4 @@ -{buildPerlPackage, stdenv, fetchurl, DBDmysql}: +{buildPerlPackage, lib, fetchurl, DBDmysql}: buildPerlPackage { pname = "maatkit"; @@ -27,7 +27,7 @@ buildPerlPackage { done '' ; - meta = { + meta = with lib; { description = "Database toolkit"; longDescription = '' You can use Maatkit to prove replication is working correctly, fix @@ -37,7 +37,7 @@ buildPerlPackage { In addition to MySQL, there is support for PostgreSQL, Memcached, and a growing variety of other databases and technologies. ''; - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; homepage = "http://www.maatkit.org/"; }; } diff --git a/pkgs/development/perl-modules/strip-nondeterminism/default.nix b/pkgs/development/perl-modules/strip-nondeterminism/default.nix index 80e81cad74d..20463ed2425 100644 --- a/pkgs/development/perl-modules/strip-nondeterminism/default.nix +++ b/pkgs/development/perl-modules/strip-nondeterminism/default.nix @@ -17,7 +17,7 @@ buildPerlPackage rec { # stray test failure doCheck = false; - nativeBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ shortenPerlShebang ]; + nativeBuildInputs = lib.optionals stdenv.isDarwin [ shortenPerlShebang ]; buildInputs = [ ArchiveZip ArchiveCpio file ]; perlPostHook = '' @@ -26,7 +26,7 @@ buildPerlPackage rec { rm $out/share/man/man1/dh_strip_nondeterminism.1.gz ''; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.isDarwin '' shortenPerlShebang $out/bin/strip-nondeterminism ''; diff --git a/pkgs/development/pharo/vm/build-vm-legacy.nix b/pkgs/development/pharo/vm/build-vm-legacy.nix index d85dab861e7..bd5d1e91602 100644 --- a/pkgs/development/pharo/vm/build-vm-legacy.nix +++ b/pkgs/development/pharo/vm/build-vm-legacy.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { inherit name src; - pharo-share = import ./share.nix { inherit stdenv fetchurl unzip; }; + pharo-share = import ./share.nix { inherit lib stdenv fetchurl unzip; }; hardeningDisable = [ "format" "pic" ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = [ bash glibc openssl libGLU libGL freetype xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share ]; - LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath + LD_LIBRARY_PATH = lib.makeLibraryPath [ cairo libGLU libGL freetype openssl libuuid alsaLib xorg.libICE xorg.libSM ]; @@ -89,9 +89,9 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = [ maintainers.lukego ]; # Pharo VM sources are packaged separately for darwin (OS X) - platforms = stdenv.lib.filter - (system: with stdenv.lib.systems.elaborate { inherit system; }; + platforms = lib.filter + (system: with lib.systems.elaborate { inherit system; }; isUnix && !isDarwin) - stdenv.lib.platforms.mesaPlatforms; + lib.platforms.mesaPlatforms; }; } diff --git a/pkgs/development/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix index 28525ac475e..5427e36746c 100644 --- a/pkgs/development/pharo/vm/build-vm.nix +++ b/pkgs/development/pharo/vm/build-vm.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { else throw "Unsupported platform: only Linux/Darwin x86/x64 are supported."; # Shared data (for the sources file) - pharo-share = import ./share.nix { inherit stdenv fetchurl unzip; }; + pharo-share = import ./share.nix { inherit lib stdenv fetchurl unzip; }; # Note: -fPIC causes the VM to segfault. hardeningDisable = [ "format" "pic" @@ -138,7 +138,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/bin" # Note: include ELF rpath in LD_LIBRARY_PATH for finding libc. - libs=$out:$(patchelf --print-rpath "$out/pharo"):${stdenv.lib.makeLibraryPath libs} + libs=$out:$(patchelf --print-rpath "$out/pharo"):${lib.makeLibraryPath libs} # Create the script cat > "$out/bin/${cmd}" <<EOF diff --git a/pkgs/development/pharo/vm/share.nix b/pkgs/development/pharo/vm/share.nix index 2c8c376b7c1..720f2e39a7d 100644 --- a/pkgs/development/pharo/vm/share.nix +++ b/pkgs/development/pharo/vm/share.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { version = "1.0"; @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { meta = { description = "Shared files for Pharo"; homepage = "https://pharo.org"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; maintainers = [ ]; }; } diff --git a/pkgs/development/pharo/wrapper/default.nix b/pkgs/development/pharo/wrapper/default.nix index b9b147bf418..1f089295072 100644 --- a/pkgs/development/pharo/wrapper/default.nix +++ b/pkgs/development/pharo/wrapper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, file, makeDesktopItem, cog32, spur32, spur64 ? "none" }: +{ lib, stdenv, file, makeDesktopItem, cog32, spur32, spur64 ? "none" }: stdenv.mkDerivation rec { name = "pharo"; @@ -50,13 +50,13 @@ stdenv.mkDerivation rec { ''; homepage = "http://pharo.org"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.lukego ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.lukego ]; # Pharo VM sources are packaged separately for darwin (OS X) - platforms = stdenv.lib.filter - (system: with stdenv.lib.systems.elaborate { inherit system; }; + platforms = lib.filter + (system: with lib.systems.elaborate { inherit system; }; isUnix && !isDarwin) - stdenv.lib.platforms.mesaPlatforms; + lib.platforms.mesaPlatforms; }; } diff --git a/pkgs/development/php-packages/composer/2.0.nix b/pkgs/development/php-packages/composer/2.0.nix index 4ff982bf8d2..5b0234fa7a1 100644 --- a/pkgs/development/php-packages/composer/2.0.nix +++ b/pkgs/development/php-packages/composer/2.0.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, pkgs, lib, php }: let pname = "composer"; - version = "2.0.8"; + version = "2.0.9"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "0f0msrqrszhwj7ki9y5wrlwglwanmdcc132l7kz0wvj45gaz0890"; + sha256 = "sha256-JPqlvIB+OZ8y6aIaM/u1sGht+ciFDvq+LAR8LM+5+cw="; }; dontUnpack = true; diff --git a/pkgs/development/php-packages/event/default.nix b/pkgs/development/php-packages/event/default.nix index 781b5abbc38..940150ac986 100644 --- a/pkgs/development/php-packages/event/default.nix +++ b/pkgs/development/php-packages/event/default.nix @@ -18,7 +18,7 @@ buildPecl { ':' ''; - nativeBuildInputs = [ pkgs.pkgconfig ]; + nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = with pkgs; [ openssl libevent ]; internalDeps = [ php.extensions.sockets ]; diff --git a/pkgs/development/php-packages/igbinary/default.nix b/pkgs/development/php-packages/igbinary/default.nix index 442311a5281..7a321cc90b4 100644 --- a/pkgs/development/php-packages/igbinary/default.nix +++ b/pkgs/development/php-packages/igbinary/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "igbinary"; - version = "3.1.6"; - sha256 = "1spx6581ly2r8pn9b632bi8429sy762v04ramrlnf7469pf8ggxr"; + version = "3.2.1"; + sha256 = "sha256-YBYgz/07PlWWIAmcBWm4xCR/Ap7BitwCBr8m+ONXU9s="; configureFlags = [ "--enable-igbinary" ]; makeFlags = [ "phpincludedir=$(dev)/include" ]; diff --git a/pkgs/development/php-packages/imagick/default.nix b/pkgs/development/php-packages/imagick/default.nix index 8f9eed0c1c3..f697b44affd 100644 --- a/pkgs/development/php-packages/imagick/default.nix +++ b/pkgs/development/php-packages/imagick/default.nix @@ -20,7 +20,7 @@ buildPecl { ]; configureFlags = [ "--with-imagick=${pkgs.imagemagick7.dev}" ]; - nativeBuildInputs = [ pkgs.pkgconfig ]; + nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = [ pcre' ]; meta.maintainers = lib.teams.php.members; diff --git a/pkgs/development/php-packages/maxminddb/default.nix b/pkgs/development/php-packages/maxminddb/default.nix index 9244bcbc109..2533a6ef06d 100644 --- a/pkgs/development/php-packages/maxminddb/default.nix +++ b/pkgs/development/php-packages/maxminddb/default.nix @@ -1,7 +1,7 @@ { buildPecl, lib, pkgs }: let pname = "maxminddb"; - version = "1.8.0"; + version = "1.9.0"; in buildPecl { inherit pname version; @@ -10,7 +10,7 @@ buildPecl { owner = "maxmind"; repo = "MaxMind-DB-Reader-php"; rev = "v${version}"; - sha256 = "0cpd8d1xnkxsrf28z25xzgkkf3wc13ia99v8f7hbl7csvnggs7nn"; + sha256 = "sha256-sNG2FhnxzbHA4Lmzj97al1WFwSU70Mr1R2i5ygF1L6Y="; }; buildInputs = [ pkgs.libmaxminddb ]; diff --git a/pkgs/development/php-packages/memcached/default.nix b/pkgs/development/php-packages/memcached/default.nix index b2d9333f294..3eb1da463b9 100644 --- a/pkgs/development/php-packages/memcached/default.nix +++ b/pkgs/development/php-packages/memcached/default.nix @@ -23,7 +23,7 @@ buildPecl { "--with-libmemcached-dir=${pkgs.libmemcached}" ]; - nativeBuildInputs = [ pkgs.pkgconfig ]; + nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = with pkgs; [ cyrus_sasl zlib ]; meta.maintainers = lib.teams.php.members; diff --git a/pkgs/development/php-packages/mongodb/default.nix b/pkgs/development/php-packages/mongodb/default.nix index 2ebdaa2f577..18bb515d15e 100644 --- a/pkgs/development/php-packages/mongodb/default.nix +++ b/pkgs/development/php-packages/mongodb/default.nix @@ -6,7 +6,7 @@ buildPecl { version = "1.9.0"; sha256 = "16mbw3p80qxsj86nmjbfch8wv6jaq8wbz4rlpmixvhj9nwbp37hs"; - nativeBuildInputs = [ pkgs.pkgconfig ]; + nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = with pkgs; [ cyrus_sasl icu64 diff --git a/pkgs/development/php-packages/pdo_sqlsrv/default.nix b/pkgs/development/php-packages/pdo_sqlsrv/default.nix index 46da3024809..ae015944443 100644 --- a/pkgs/development/php-packages/pdo_sqlsrv/default.nix +++ b/pkgs/development/php-packages/pdo_sqlsrv/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "pdo_sqlsrv"; - version = "5.8.1"; - sha256 = "06ba4x34fgs092qq9w62y2afsm1nyasqiprirk4951ax9v5vcir0"; + version = "5.9.0"; + sha256 = "0n4cnkldvyp1lrpj18ky2ii2dcaa51dsmh8cspixm7w76dxl3khg"; internalDeps = [ php.extensions.pdo ]; diff --git a/pkgs/development/php-packages/php-cs-fixer/default.nix b/pkgs/development/php-packages/php-cs-fixer/default.nix index 76465a77fd4..c855b975e54 100644 --- a/pkgs/development/php-packages/php-cs-fixer/default.nix +++ b/pkgs/development/php-packages/php-cs-fixer/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, pkgs, lib, php }: let pname = "php-cs-fixer"; - version = "2.17.0"; + version = "2.18.2"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar"; - sha256 = "163wz5y5ik7g1p7n0v3ckyawqjhg8d18cwx8a5c6fr1fkwb4mb12"; + sha256 = "sha256-451be1O/y92ib5hZNVbf8iCkD+e9DoK47Z7IkMnwuo0="; }; phases = [ "installPhase" ]; diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix index 6bd3fb00c4e..74b44c21d04 100644 --- a/pkgs/development/php-packages/phpstan/default.nix +++ b/pkgs/development/php-packages/phpstan/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, pkgs, lib, php }: let pname = "phpstan"; - version = "0.12.59"; + version = "0.12.70"; in mkDerivation { inherit pname version; src = pkgs.fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "0lp25d9b7w8lk4ffrd17mjw93i234qnfpwz42k8lww1lrk5abnfa"; + sha256 = "sha256-bQvLGrDUh66lipmML1VwrdNKkI6NezBckdlOqnDe7Qk="; }; phases = [ "installPhase" ]; diff --git a/pkgs/development/php-packages/protobuf/default.nix b/pkgs/development/php-packages/protobuf/default.nix index 10b04589737..e2ef068120d 100644 --- a/pkgs/development/php-packages/protobuf/default.nix +++ b/pkgs/development/php-packages/protobuf/default.nix @@ -1,4 +1,4 @@ -{ buildPecl, lib, pcre' }: +{ buildPecl, lib, pcre', fetchpatch }: buildPecl { pname = "protobuf"; @@ -8,6 +8,23 @@ buildPecl { buildInputs = [ pcre' ]; + patches = [ + # TODO: remove with next update + (fetchpatch { + url = "https://github.com/protocolbuffers/protobuf/commit/823f351448f7c432bed40b89ee3309e0a94c1855.patch"; + sha256 = "sha256-ozHtO8s9zvmh/+wBEge3Yn3n0pbpR3dAojJcuAg/G3s="; + stripLen = 4; + includes = [ + "array.c" + "def.c" + "map.c" + "message.c" + "protobuf.h" + "wkt.inc" + ]; + }) + ]; + meta = with lib; { description = '' Google's language-neutral, platform-neutral, extensible mechanism for serializing structured data. diff --git a/pkgs/development/php-packages/psalm/default.nix b/pkgs/development/php-packages/psalm/default.nix index 473b035d23a..1de01d1d09d 100644 --- a/pkgs/development/php-packages/psalm/default.nix +++ b/pkgs/development/php-packages/psalm/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, pkgs, lib, php }: let pname = "psalm"; - version = "4.3.1"; + version = "4.4.1"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/vimeo/psalm/releases/download/${version}/psalm.phar"; - sha256 = "1hv9r5m1mdywm7qi9rs9054jp77cpip3jyw048iq3l7s0vpslkc5"; + sha256 = "sha256-4hqgAPflzNmeQQaxQATpWYBB5Pz7jKu8Vlw3BiMyhtw="; }; phases = [ "installPhase" ]; diff --git a/pkgs/development/php-packages/rdkafka/default.nix b/pkgs/development/php-packages/rdkafka/default.nix index 64a2b8028c0..e5bdc2a2298 100644 --- a/pkgs/development/php-packages/rdkafka/default.nix +++ b/pkgs/development/php-packages/rdkafka/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "rdkafka"; - version = "4.1.1"; - sha256 = "0s6cqd71z5jpqb98myk4askmbqphzzslf0d4vqlg2rig9q6fyv7x"; + version = "5.0.0"; + sha256 = "sha256-Qy+6rkPczhdxFbDhcuzmUTLMPUXYZ0HaheDBhkh4FXs="; buildInputs = [ pkgs.rdkafka pcre' ]; diff --git a/pkgs/development/php-packages/sqlsrv/default.nix b/pkgs/development/php-packages/sqlsrv/default.nix index 341152277ca..939be27671b 100644 --- a/pkgs/development/php-packages/sqlsrv/default.nix +++ b/pkgs/development/php-packages/sqlsrv/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "sqlsrv"; - version = "5.8.1"; - sha256 = "0c9a6ghch2537vi0274vx0mn6nb1xg2qv7nprnf3xdfqi5ww1i9r"; + version = "5.9.0"; + sha256 = "1css440b4qrbblmcswd5wdr2v1rjxlj2iicbmvjq9fg81028w40a"; buildInputs = [ pkgs.unixODBC diff --git a/pkgs/development/php-packages/xdebug/default.nix b/pkgs/development/php-packages/xdebug/default.nix index b4052250aab..780bb8c9086 100644 --- a/pkgs/development/php-packages/xdebug/default.nix +++ b/pkgs/development/php-packages/xdebug/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "xdebug"; - version = "3.0.1"; - sha256 = "1da983crnk7ci3hfvqrb4gn9w364zzyi147wl4yly9d2adqk358b"; + version = "3.0.2"; + sha256 = "05sfgkw55ym7mg0b54l9x3i9598kf2bkp4z3sdl1hd31q3g4cv89"; doCheck = true; checkTarget = "test"; diff --git a/pkgs/development/php-packages/yaml/default.nix b/pkgs/development/php-packages/yaml/default.nix index 6ad3b778f82..40e5a859f9e 100644 --- a/pkgs/development/php-packages/yaml/default.nix +++ b/pkgs/development/php-packages/yaml/default.nix @@ -3,12 +3,12 @@ buildPecl { pname = "yaml"; - version = "2.2.0"; - sha256 = "1d65cf5vnr7brhxmy1pi2axjiyvdhmpcnq0qlx5spwlgkv6hnyml"; + version = "2.2.1"; + sha256 = "sha256-4XrQTnUuJf0Jm93S350m3+8YPI0AxBebydei4cl9eBk="; configureFlags = [ "--with-yaml=${pkgs.libyaml}" ]; - nativeBuildInputs = [ pkgs.pkgconfig ]; + nativeBuildInputs = [ pkgs.pkg-config ]; meta.maintainers = lib.teams.php.members; } diff --git a/pkgs/development/pure-modules/audio/default.nix b/pkgs/development/pure-modules/audio/default.nix index e99c87ec706..34d405d6a39 100644 --- a/pkgs/development/pure-modules/audio/default.nix +++ b/pkgs/development/pure-modules/audio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, portaudio, fftw, libsndfile, libsamplerate }: +{ lib, stdenv, fetchurl, pkg-config, pure, portaudio, fftw, libsndfile, libsamplerate }: stdenv.mkDerivation rec { baseName = "audio"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "c1f2a5da73983efb5a54f86d57ba93713ebed20ff0c72de9b3467f10f2904ee0"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure portaudio fftw libsndfile libsamplerate ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { meta = { description = "A digital audio interface for the Pure programming language"; homepage = "http://puredocs.bitbucket.org/pure-audio.html"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ asppsa ]; + license = lib.licenses.bsd3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ asppsa ]; }; } diff --git a/pkgs/development/pure-modules/avahi/default.nix b/pkgs/development/pure-modules/avahi/default.nix index 4745593cb7f..7b8cc1b00ac 100644 --- a/pkgs/development/pure-modules/avahi/default.nix +++ b/pkgs/development/pure-modules/avahi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, avahi }: +{ lib, stdenv, fetchurl, pkg-config, pure, avahi }: stdenv.mkDerivation rec { baseName = "avahi"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "5fac8a6e3a54e45648ceb207ee0061b22eac8c4e668b8d53f13eb338b09c9160"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure avahi ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { meta = { description = "A digital audio interface for the Pure programming language"; homepage = "http://puredocs.bitbucket.org/pure-avahi.html"; - license = stdenv.lib.licenses.lgpl3Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ asppsa ]; + license = lib.licenses.lgpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ asppsa ]; }; } diff --git a/pkgs/development/pure-modules/csv/default.nix b/pkgs/development/pure-modules/csv/default.nix index 501271df8c0..f51739f0339 100644 --- a/pkgs/development/pure-modules/csv/default.nix +++ b/pkgs/development/pure-modules/csv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure }: +{ lib, stdenv, fetchurl, pkg-config, pure }: stdenv.mkDerivation rec { baseName = "csv"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "fe7c4edebe8208c54d5792a9eefaeb28c4a58b9094d161a6dda8126f0823ab3c"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { meta = { description = "Comma Separated Value Interface for the Pure Programming Language"; homepage = "http://puredocs.bitbucket.org/pure-csv.html"; - license = stdenv.lib.licenses.free; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ asppsa ]; + license = lib.licenses.free; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ asppsa ]; }; } diff --git a/pkgs/development/pure-modules/doc/default.nix b/pkgs/development/pure-modules/doc/default.nix index c009b23f4ee..aa678cb21a4 100644 --- a/pkgs/development/pure-modules/doc/default.nix +++ b/pkgs/development/pure-modules/doc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure }: +{ lib, stdenv, fetchurl, pkg-config, pure }: stdenv.mkDerivation rec { baseName = "doc"; @@ -10,15 +10,15 @@ stdenv.mkDerivation rec { sha256 = "cfa880573941f37868269bcc443a09fecd2a141a78556383d2213f6c9f45ddd9"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pure ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; meta = { description = "A simple utility for literate programming and documenting source code written in the Pure programming language"; homepage = "http://puredocs.bitbucket.org/pure-doc.html"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ asppsa ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ asppsa ]; }; } diff --git a/pkgs/development/pure-modules/fastcgi/default.nix b/pkgs/development/pure-modules/fastcgi/default.nix index 622ea140f66..04ea1dde589 100644 --- a/pkgs/development/pure-modules/fastcgi/default.nix +++ b/pkgs/development/pure-modules/fastcgi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, fcgi }: +{ lib, stdenv, fetchurl, pkg-config, pure, fcgi }: stdenv.mkDerivation rec { baseName = "fastcgi"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "aa5789cc1e17521c01f349ee82ce2a00500e025b3f8494f89a7ebe165b5aabc7"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure fcgi ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { meta = { description = "Lets you write FastCGI scripts with Pure, to be run by web servers like Apache"; homepage = "http://puredocs.bitbucket.org/pure-fastcgi.html"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ asppsa ]; + license = lib.licenses.bsd3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ asppsa ]; }; } diff --git a/pkgs/development/pure-modules/faust/default.nix b/pkgs/development/pure-modules/faust/default.nix index 1f5b443fe38..4a3b12ea7fa 100644 --- a/pkgs/development/pure-modules/faust/default.nix +++ b/pkgs/development/pure-modules/faust/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, faust, libtool }: +{ lib, stdenv, fetchurl, pkg-config, pure, faust, libtool }: stdenv.mkDerivation rec { baseName = "faust"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "51278a3b0807c4770163dc2ce423507dcf0ffec9cd1c1fbc08426d07294f6ae0"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure faust libtool ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { meta = { description = "Lets you load and run Faust-generated signal processing modules in Pure"; homepage = "http://puredocs.bitbucket.org/pure-faust.html"; - license = stdenv.lib.licenses.lgpl3Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ asppsa ]; + license = lib.licenses.lgpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ asppsa ]; }; } diff --git a/pkgs/development/pure-modules/ffi/default.nix b/pkgs/development/pure-modules/ffi/default.nix index 8518c2cb01f..3b076a4f38c 100644 --- a/pkgs/development/pure-modules/ffi/default.nix +++ b/pkgs/development/pure-modules/ffi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, libffi }: +{ lib, stdenv, fetchurl, pkg-config, pure, libffi }: stdenv.mkDerivation rec { baseName = "ffi"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0331f48efaae40af21b23cf286fd7eac0ea0a249d08fd97bf23246929c0ea71a"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure libffi ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { meta = { description = "Provides an interface to libffi which enables you to call C functions from Pure and vice versa"; homepage = "http://puredocs.bitbucket.org/pure-ffi.html"; - license = stdenv.lib.licenses.lgpl3Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ asppsa ]; + license = lib.licenses.lgpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ asppsa ]; }; } diff --git a/pkgs/development/pure-modules/gen/default.nix b/pkgs/development/pure-modules/gen/default.nix index 9956c142daf..278c782da32 100644 --- a/pkgs/development/pure-modules/gen/default.nix +++ b/pkgs/development/pure-modules/gen/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, - pkgconfig, pure, haskellPackages }: +{ lib, stdenv, fetchurl, + pkg-config, pure, haskellPackages }: stdenv.mkDerivation rec { baseName = "gen"; @@ -12,16 +12,16 @@ stdenv.mkDerivation rec { }; hsEnv = haskellPackages.ghcWithPackages (hsPkgs : [hsPkgs.language-c]); - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ hsEnv pure ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; meta = { description = "Pure interface generator"; homepage = "http://puredocs.bitbucket.org/pure-gen.html"; - license = stdenv.lib.licenses.free; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.free; + platforms = lib.platforms.linux; hydraPlatforms = []; - maintainers = with stdenv.lib.maintainers; [ asppsa ]; + maintainers = with lib.maintainers; [ asppsa ]; }; } diff --git a/pkgs/development/pure-modules/gl/default.nix b/pkgs/development/pure-modules/gl/default.nix index 77173870bca..952d583bfd8 100644 --- a/pkgs/development/pure-modules/gl/default.nix +++ b/pkgs/development/pure-modules/gl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, freeglut, libGLU, libGL, xlibsWrapper }: +{ lib, stdenv, fetchurl, pkg-config, pure, freeglut, libGLU, libGL, xlibsWrapper }: stdenv.mkDerivation rec { baseName = "gl"; @@ -10,19 +10,19 @@ stdenv.mkDerivation rec { sha256 = "edd594222f89ae372067eda6679a37488986b9739b5b79b4a25ac48255d31bba"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure freeglut libGLU libGL xlibsWrapper ]; makeFlags = [ - "libdir=${placeholder ''out''}/lib" - "prefix=${placeholder ''out''}/" + "libdir=${placeholder "out"}/lib" + "prefix=${placeholder "out"}/" ]; setupHook = ../generic-setup-hook.sh; meta = { description = "Fairly complete Pure bindings for the OpenGL graphics library, which allow you to do 2D and 3D graphics programming with Pure"; homepage = "http://puredocs.bitbucket.org/pure-gl.html"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ asppsa ]; + license = lib.licenses.bsd3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ asppsa ]; }; } diff --git a/pkgs/development/pure-modules/glpk/default.nix b/pkgs/development/pure-modules/glpk/default.nix index a70dbbd047a..7b8c46ef47f 100644 --- a/pkgs/development/pure-modules/glpk/default.nix +++ b/pkgs/development/pure-modules/glpk/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, - pkgconfig, pure, glpk, gmp, libtool, libmysqlclient, libiodbc }: + pkg-config, pure, glpk, gmp, libtool, libmysqlclient, libiodbc }: stdenv.mkDerivation rec { baseName = "glpk"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { "--with-gmp=yes" ]; }); - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure glpkWithExtras ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; @@ -34,8 +34,8 @@ stdenv.mkDerivation rec { meta = { description = "GLPK interface for the Pure Programming Language"; homepage = "http://puredocs.bitbucket.org/pure-glpk.html"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ asppsa ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ asppsa ]; }; } diff --git a/pkgs/development/pure-modules/gplot/default.nix b/pkgs/development/pure-modules/gplot/default.nix index 998c8f1972a..ddae95c43f0 100644 --- a/pkgs/development/pure-modules/gplot/default.nix +++ b/pkgs/development/pure-modules/gplot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, gnuplot }: +{ lib, stdenv, fetchurl, pkg-config, pure, gnuplot }: stdenv.mkDerivation rec { baseName = "gplot"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "841ded98e4d1cdfaf78f95481e5995d0440bfda2d5df533d6741a6e7058a882c"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure gnuplot ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { meta = { description = "A pure binding to gnuplot"; homepage = "http://puredocs.bitbucket.org/pure-gplot.html"; - license = stdenv.lib.licenses.lgpl3Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ asppsa ]; + license = lib.licenses.lgpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ asppsa ]; }; } diff --git a/pkgs/development/pure-modules/gsl/default.nix b/pkgs/development/pure-modules/gsl/default.nix index 6c6a381f285..204aeb6bb74 100644 --- a/pkgs/development/pure-modules/gsl/default.nix +++ b/pkgs/development/pure-modules/gsl/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, pure, pkgconfig, gsl }: +{ lib, stdenv, fetchurl, pure, pkg-config, gsl }: stdenv.mkDerivation rec { baseName = "gsl"; version = "0.12"; name = "pure-${baseName}-${version}"; - + src = fetchurl { url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; sha256 = "06bdd873d5417d90ca35093056a060b77365123ed24c3ac583cd3922d4c78a75"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure gsl ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { meta = { description = "GNU Scientific Library interface for Pure"; homepage = "http://puredocs.bitbucket.org/pure-gsl.html"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ asppsa ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ asppsa ]; }; } diff --git a/pkgs/development/pure-modules/gtk/default.nix b/pkgs/development/pure-modules/gtk/default.nix index ff619226a81..8cc3781e825 100644 --- a/pkgs/development/pure-modules/gtk/default.nix +++ b/pkgs/development/pure-modules/gtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, pure-ffi, gtk2 }: +{ lib, stdenv, fetchurl, pkg-config, pure, pure-ffi, gtk2 }: stdenv.mkDerivation rec { baseName = "gtk"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "e659ff1bc5809ce35b810f8ac3fb7e8cadaaef13996537d8632e2f86ed76d203"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure pure-ffi gtk2 ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { meta = { 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; - maintainers = with stdenv.lib.maintainers; [ asppsa ]; + license = lib.licenses.lgpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ asppsa ]; }; } diff --git a/pkgs/development/pure-modules/liblo/default.nix b/pkgs/development/pure-modules/liblo/default.nix index a633ad7c1d7..40502bbc140 100644 --- a/pkgs/development/pure-modules/liblo/default.nix +++ b/pkgs/development/pure-modules/liblo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, liblo }: +{ lib, stdenv, fetchurl, pkg-config, pure, liblo }: stdenv.mkDerivation rec { baseName = "liblo"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "c2ba4d6f94489acf8a8fac73982ae03d5ad4113146eb1f7d6558a956c57cb8ee"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure liblo ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { meta = { description = "A quick and dirty Pure wrapper for the liblo library, which implements Berkeley’s Open Sound Control (OSC) protocol"; homepage = "http://puredocs.bitbucket.org/pure-liblo.html"; - license = stdenv.lib.licenses.lgpl3Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ asppsa ]; + license = lib.licenses.lgpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ asppsa ]; }; } diff --git a/pkgs/development/pure-modules/lilv/default.nix b/pkgs/development/pure-modules/lilv/default.nix index 85a504c9082..577170118bb 100644 --- a/pkgs/development/pure-modules/lilv/default.nix +++ b/pkgs/development/pure-modules/lilv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, lilv, lv2, serd, sord, sratom }: +{ lib, stdenv, fetchurl, pkg-config, pure, lilv, lv2, serd, sord, sratom }: stdenv.mkDerivation rec { baseName = "lilv"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "af20982fe43e8dce62d50bf7a78e461ab36c308325b123cddbababf0d3beaf9f"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure lilv lv2 serd sord sratom ]; makeFlags = [ "CFLAGS=-I${lilv}/include/lilv-0" "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { meta = { description = "A Pure module for David Robillard’s Lilv, a library for LV2 plugin host writers"; homepage = "http://puredocs.bitbucket.org/pure-lilv.html"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ asppsa ]; + license = lib.licenses.bsd3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ asppsa ]; }; } diff --git a/pkgs/development/pure-modules/lv2/default.nix b/pkgs/development/pure-modules/lv2/default.nix index 6e8f38cf2a9..800c3968431 100644 --- a/pkgs/development/pure-modules/lv2/default.nix +++ b/pkgs/development/pure-modules/lv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, lv2 }: +{ lib, stdenv, fetchurl, pkg-config, pure, lv2 }: stdenv.mkDerivation rec { baseName = "lv2"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "721cacd831781d8309e7ecabb0ee7c01da17e75c5642a5627cf158bfb36093e1"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure lv2 ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { meta = { description = "A generic LV2 plugin wrapper for Pure which can be linked with batch-compiled Pure scripts to obtain LV2 plugin modules"; homepage = "http://puredocs.bitbucket.org/pure-lv2.html"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ asppsa ]; + license = lib.licenses.bsd3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ asppsa ]; }; } diff --git a/pkgs/development/pure-modules/midi/default.nix b/pkgs/development/pure-modules/midi/default.nix index 3e2a3993fc1..bbca0b08089 100644 --- a/pkgs/development/pure-modules/midi/default.nix +++ b/pkgs/development/pure-modules/midi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, portmidi }: +{ lib, stdenv, fetchurl, pkg-config, pure, portmidi }: stdenv.mkDerivation rec { baseName = "midi"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "817ae9fa5f443a8c478a6770f36091e3cf99f3515c74e00d09ca958dead1e7eb"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure portmidi ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { meta = { description = "A MIDI interface for the Pure programming language"; homepage = "http://puredocs.bitbucket.org/pure-midi.html"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ asppsa ]; + license = lib.licenses.bsd3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ asppsa ]; }; } diff --git a/pkgs/development/pure-modules/mpfr/default.nix b/pkgs/development/pure-modules/mpfr/default.nix index 13c9eee1bd9..8afb74027d7 100644 --- a/pkgs/development/pure-modules/mpfr/default.nix +++ b/pkgs/development/pure-modules/mpfr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure }: +{ lib, stdenv, fetchurl, pkg-config, pure }: stdenv.mkDerivation rec { baseName = "mpfr"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "39d2255c2c0c2d60ce727be178b5e5a06f7c92eb365976c49c4a34b1edc576e7"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { meta = { description = "This module makes the MPFR multiprecision floats available in Pure"; homepage = "http://puredocs.bitbucket.org/pure-mpfr.html"; - license = stdenv.lib.licenses.lgpl3Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ asppsa ]; + license = lib.licenses.lgpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ asppsa ]; }; } diff --git a/pkgs/development/pure-modules/octave/default.nix b/pkgs/development/pure-modules/octave/default.nix index d064eeb0d41..591555f39c8 100644 --- a/pkgs/development/pure-modules/octave/default.nix +++ b/pkgs/development/pure-modules/octave/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, octave }: +{ lib, stdenv, fetchurl, pkg-config, pure, octave }: stdenv.mkDerivation rec { baseName = "octave"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0l1mvmi3rpabzjcrk6p04rdn922mvdm9x67zby3dha5iiccc47q0"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure octave ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; @@ -18,10 +18,10 @@ stdenv.mkDerivation rec { meta = { description = "An Octave module for the Pure programming language"; homepage = "http://puredocs.bitbucket.org/pure-octave.html"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; # This is set to none for now because it does not work with the # current stable version of Octave. - platforms = stdenv.lib.platforms.none; - maintainers = with stdenv.lib.maintainers; [ asppsa ]; + platforms = lib.platforms.none; + maintainers = with lib.maintainers; [ asppsa ]; }; } diff --git a/pkgs/development/pure-modules/odbc/default.nix b/pkgs/development/pure-modules/odbc/default.nix index e95e1c3d1c1..272c88a697c 100644 --- a/pkgs/development/pure-modules/odbc/default.nix +++ b/pkgs/development/pure-modules/odbc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, libiodbc }: +{ lib, stdenv, fetchurl, pkg-config, pure, libiodbc }: stdenv.mkDerivation rec { baseName = "odbc"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1907e9ebca11cc68762cf7046084b31e9e2bf056df85c40ccbcbe9f02221ff8d"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure libiodbc ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { meta = { description = "A simple ODBC interface for the Pure programming language"; homepage = "http://puredocs.bitbucket.org/pure-odbc.html"; - license = stdenv.lib.licenses.lgpl3Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ asppsa ]; + license = lib.licenses.lgpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ asppsa ]; }; } diff --git a/pkgs/development/pure-modules/pandoc/default.nix b/pkgs/development/pure-modules/pandoc/default.nix index fc615690df1..bbf22e9c6fb 100644 --- a/pkgs/development/pure-modules/pandoc/default.nix +++ b/pkgs/development/pure-modules/pandoc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, pandoc, gawk, getopt }: +{ lib, stdenv, fetchurl, pkg-config, pure, pandoc, gawk, getopt }: stdenv.mkDerivation rec { baseName = "pandoc"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0f23a17549048ca3a8f4936ea9e931feb05997390b486850936b746996350cda"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pure ]; propagatedBuildInputs = [ pandoc gawk getopt ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { meta = { description = "Converts Sphinx-formatted Pure documentation files to Markdown and other formats using Pandoc"; homepage = "http://puredocs.bitbucket.org/pure-pandoc.html"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ asppsa ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ asppsa ]; }; } diff --git a/pkgs/development/pure-modules/rational/default.nix b/pkgs/development/pure-modules/rational/default.nix index be230141a4a..99cefc9682a 100644 --- a/pkgs/development/pure-modules/rational/default.nix +++ b/pkgs/development/pure-modules/rational/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure }: +{ lib, stdenv, fetchurl, pkg-config, pure }: stdenv.mkDerivation rec { baseName = "rational"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "62cb4079a0dadd232a859e577e97e50e9718ccfcc5983c4d9c4c32cac7a9bafa"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { meta = { description = "A collection of utility functions for rational numbers, and a module for doing interval arithmetic in Pure"; homepage = "http://puredocs.bitbucket.org/pure-rational.html"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ asppsa ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ asppsa ]; }; } diff --git a/pkgs/development/pure-modules/readline/default.nix b/pkgs/development/pure-modules/readline/default.nix index 24f64d94470..f3015e27535 100644 --- a/pkgs/development/pure-modules/readline/default.nix +++ b/pkgs/development/pure-modules/readline/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, readline }: +{ lib, stdenv, fetchurl, pkg-config, pure, readline }: stdenv.mkDerivation rec { baseName = "readline"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "db8e6663b1c085466c09662fe86d952b6f4ffdafeecffe805c681ab91c910886"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure readline ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { meta = { description = "A trivial wrapper around GNU readline, which gives Pure scripts access to the most important facilities of the readline interface"; homepage = "http://puredocs.bitbucket.org/pure-readline.html"; - license = stdenv.lib.licenses.free; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ asppsa ]; + license = lib.licenses.free; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ asppsa ]; }; } diff --git a/pkgs/development/pure-modules/sockets/default.nix b/pkgs/development/pure-modules/sockets/default.nix index e80d66f3ab8..5e1a01bc624 100644 --- a/pkgs/development/pure-modules/sockets/default.nix +++ b/pkgs/development/pure-modules/sockets/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure }: +{ lib, stdenv, fetchurl, pkg-config, pure }: stdenv.mkDerivation rec { baseName = "sockets"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "4f2769618ae5818cf6005bb08bcf02fe359a2e31998d12dc0c72f0494e9c0420"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { meta = { description = "A Pure interface to the Berkeley socket functions"; homepage = "http://puredocs.bitbucket.org/pure-sockets.html"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ asppsa ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ asppsa ]; }; } diff --git a/pkgs/development/pure-modules/sql3/default.nix b/pkgs/development/pure-modules/sql3/default.nix index c658ee0c556..009b367c691 100644 --- a/pkgs/development/pure-modules/sql3/default.nix +++ b/pkgs/development/pure-modules/sql3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, sqlite }: +{ lib, stdenv, fetchurl, pkg-config, pure, sqlite }: stdenv.mkDerivation rec { baseName = "sql3"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "b9f79dd443c8ffc5cede51e2af617f24726f5c0409aab4948c9847e6adb53c37"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure sqlite ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { meta = { description = "A SQLite module for the Pure programming language"; homepage = "http://puredocs.bitbucket.org/pure-sql3.html"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ asppsa ]; + license = lib.licenses.bsd3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ asppsa ]; }; } diff --git a/pkgs/development/pure-modules/stldict/default.nix b/pkgs/development/pure-modules/stldict/default.nix index ae28055a2f9..46b711d9fa6 100644 --- a/pkgs/development/pure-modules/stldict/default.nix +++ b/pkgs/development/pure-modules/stldict/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure }: +{ lib, stdenv, fetchurl, pkg-config, pure }: stdenv.mkDerivation rec { baseName = "stldict"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { done ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { meta = { description = "A Pure interface to the C++ dictionary containers map and unordered_map"; homepage = "http://puredocs.bitbucket.org/pure-stldict.html"; - license = stdenv.lib.licenses.lgpl3Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ asppsa ]; + license = lib.licenses.lgpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ asppsa ]; }; } diff --git a/pkgs/development/pure-modules/stllib/default.nix b/pkgs/development/pure-modules/stllib/default.nix index 9d35794b190..009543ee71c 100644 --- a/pkgs/development/pure-modules/stllib/default.nix +++ b/pkgs/development/pure-modules/stllib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure }: +{ lib, stdenv, fetchurl, pkg-config, pure }: stdenv.mkDerivation rec { baseName = "stllib"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { done ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { meta = { description = "An “umbrella” package that contains a pair of Pure addons, pure-stlvec and pure-stlmap"; homepage = "http://puredocs.bitbucket.org/pure-stllib.html"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ asppsa ]; + license = lib.licenses.bsd3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ asppsa ]; }; } diff --git a/pkgs/development/pure-modules/tk/default.nix b/pkgs/development/pure-modules/tk/default.nix index 496da2a20ea..4a2c86783c1 100644 --- a/pkgs/development/pure-modules/tk/default.nix +++ b/pkgs/development/pure-modules/tk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, tcl, tk, xlibsWrapper }: +{ lib, stdenv, fetchurl, pkg-config, pure, tcl, tk, xlibsWrapper }: stdenv.mkDerivation rec { baseName = "tk"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "3b6e97e2d723d5a05bf25f4ac62068ac17a1fd81db03e1986366097bf071a516"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure tcl tk xlibsWrapper ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { meta = { description = "A basic interface between Pure and Tcl/Tk"; homepage = "http://puredocs.bitbucket.org/pure-tk.html"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ asppsa ]; + license = lib.licenses.bsd3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ asppsa ]; }; } diff --git a/pkgs/development/pure-modules/xml/default.nix b/pkgs/development/pure-modules/xml/default.nix index ac4f1f0e6b0..e9d35c4d1fb 100644 --- a/pkgs/development/pure-modules/xml/default.nix +++ b/pkgs/development/pure-modules/xml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, libxml2, libxslt }: +{ lib, stdenv, fetchurl, pkg-config, pure, libxml2, libxslt }: stdenv.mkDerivation rec { baseName = "xml"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "e862dec060917a285bc3befc90f4eb70b6cc33136fb524ad3aa173714a35b0f7"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure libxml2 libxslt ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { meta = { description = "A simplified interface to the Gnome libxml2 and libxslt libraries for Pure"; homepage = "http://puredocs.bitbucket.org/pure-xml.html"; - license = stdenv.lib.licenses.lgpl3Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ asppsa ]; + license = lib.licenses.lgpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ asppsa ]; }; } diff --git a/pkgs/development/python-modules/APScheduler/default.nix b/pkgs/development/python-modules/APScheduler/default.nix index 21b8d509646..d1ac191489a 100644 --- a/pkgs/development/python-modules/APScheduler/default.nix +++ b/pkgs/development/python-modules/APScheduler/default.nix @@ -20,11 +20,11 @@ buildPythonPackage rec { pname = "APScheduler"; - version = "3.6.3"; + version = "3.7.0"; src = fetchPypi { inherit pname version; - sha256 = "3bb5229eed6fbbdafc13ce962712ae66e175aa214c69bed35a06bffcf0c5e244"; + sha256 = "1cab7f2521e107d07127b042155b632b7a1cd5e02c34be5a28ff62f77c900c6a"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index 84f54fd7af6..64f5bb3ab65 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/Cython/default.nix @@ -16,12 +16,12 @@ let ++ [ "reimport_from_subinterpreter" ] # cython's testsuite is not working very well with libc++ # We are however optimistic about things outside of testsuite still working - ++ stdenv.lib.optionals (stdenv.cc.isClang or false) [ "cpdef_extern_func" "libcpp_algo" ] + ++ lib.optionals (stdenv.cc.isClang or false) [ "cpdef_extern_func" "libcpp_algo" ] # Some tests in the test suite isn't working on aarch64. Disable them for # now until upstream finds a workaround. # Upstream issue here: https://github.com/cython/cython/issues/2308 - ++ stdenv.lib.optionals stdenv.isAarch64 [ "numpy_memoryview" ] - ++ stdenv.lib.optionals stdenv.isi686 [ "future_division" "overflow_check_longlong" ] + ++ lib.optionals stdenv.isAarch64 [ "numpy_memoryview" ] + ++ lib.optionals stdenv.isi686 [ "future_division" "overflow_check_longlong" ] ; in buildPythonPackage rec { @@ -55,7 +55,7 @@ in buildPythonPackage rec { export HOME="$NIX_BUILD_TOP" ${python.interpreter} runtests.py -j$NIX_BUILD_CORES \ --no-code-style \ - ${stdenv.lib.optionalString (builtins.length excludedTests != 0) + ${lib.optionalString (builtins.length excludedTests != 0) ''--exclude="(${builtins.concatStringsSep "|" excludedTests})"''} ''; diff --git a/pkgs/development/python-modules/FormEncode/default.nix b/pkgs/development/python-modules/FormEncode/default.nix index 2b06fcdce7d..74884f36f03 100644 --- a/pkgs/development/python-modules/FormEncode/default.nix +++ b/pkgs/development/python-modules/FormEncode/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, dnspython, pycountry, nose, setuptools_scm, six, isPy27 }: +{ lib, buildPythonPackage, fetchPypi, dnspython, pycountry, nose, setuptools_scm, six, isPy27 }: buildPythonPackage rec { pname = "FormEncode"; diff --git a/pkgs/development/python-modules/GitPython/default.nix b/pkgs/development/python-modules/GitPython/default.nix index 2edb8c51e3a..dad4a3de383 100644 --- a/pkgs/development/python-modules/GitPython/default.nix +++ b/pkgs/development/python-modules/GitPython/default.nix @@ -1,13 +1,21 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27, substituteAll, git, gitdb, mock, nose, ddt }: +{ lib +, buildPythonPackage +, fetchPypi +, isPy27 +, substituteAll +, git +, gitdb +, ddt +}: buildPythonPackage rec { - version = "3.1.11"; pname = "GitPython"; + version = "3.1.12"; disabled = isPy27; # no longer supported src = fetchPypi { inherit pname version; - sha256 = "befa4d101f91bad1b632df4308ec64555db684c360bd7d2130b4807d49ce86b8"; + sha256 = "sha256-Qtvv2NniV2xJbtAFnzED3O9xJbnOFvnV+cg0rtRKHaw="; }; patches = [ @@ -17,16 +25,16 @@ buildPythonPackage rec { }) ]; - checkInputs = [ nose ] ++ lib.optional isPy27 mock; propagatedBuildInputs = [ gitdb ddt ]; # Tests require a git repo doCheck = false; + pythonImportsCheck = [ "git" ]; - meta = { + meta = with lib; { description = "Python Git Library"; - maintainers = [ ]; homepage = "https://github.com/gitpython-developers/GitPython"; - license = lib.licenses.bsd3; + license = licenses.bsd3; + maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/HTSeq/default.nix b/pkgs/development/python-modules/HTSeq/default.nix index 178b6a7b85c..486f8a4556f 100644 --- a/pkgs/development/python-modules/HTSeq/default.nix +++ b/pkgs/development/python-modules/HTSeq/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, cython, numpy, pysam, matplotlib, python, isPy27, isPy3k }: +{ lib, buildPythonPackage, fetchFromGitHub, cython, numpy, pysam, matplotlib, python, isPy27, isPy3k }: buildPythonPackage rec { version = "0.12.4"; pname = "HTSeq"; @@ -13,9 +13,9 @@ buildPythonPackage rec { nativeBuildInputs = [ cython ]; propagatedBuildInputs = [ numpy pysam matplotlib ]; - checkPhase = stdenv.lib.optionalString isPy27 '' + checkPhase = lib.optionalString isPy27 '' ${python.interpreter} python2/test/test_general.py - '' + stdenv.lib.optionalString isPy3k '' + '' + lib.optionalString isPy3k '' ${python.interpreter} python3/test/test_general.py ''; diff --git a/pkgs/development/python-modules/IPy/default.nix b/pkgs/development/python-modules/IPy/default.nix index f142c245922..05587ef0740 100644 --- a/pkgs/development/python-modules/IPy/default.nix +++ b/pkgs/development/python-modules/IPy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, nose }: +{ lib, buildPythonPackage, fetchPypi, nose }: buildPythonPackage rec { pname = "IPy"; diff --git a/pkgs/development/python-modules/JPype1/default.nix b/pkgs/development/python-modules/JPype1/default.nix index 1a58562ab06..d7c199f7146 100644 --- a/pkgs/development/python-modules/JPype1/default.nix +++ b/pkgs/development/python-modules/JPype1/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "JPype1"; - version = "1.2.0"; + version = "1.2.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "62ca03e7f7963ba4ac1065ee48ff661f752b3db3c23549ed8933ab40196a3157"; + sha256 = "f210646127d24be73cfc6d807e2cda1c6b2ab39b7a293008e8b46367af6f2204"; }; propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ diff --git a/pkgs/development/python-modules/MechanicalSoup/default.nix b/pkgs/development/python-modules/MechanicalSoup/default.nix index 07330ebbca9..e4ce48158f6 100644 --- a/pkgs/development/python-modules/MechanicalSoup/default.nix +++ b/pkgs/development/python-modules/MechanicalSoup/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "MechanicalSoup"; - version = "0.12.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1g976rk79apz6rc338zq3ml2yps8hb88nyw3a698d0brm4khd9ir"; + sha256 = "37d3b15c1957917d3ae171561e77f4dd4c08c35eb4500b8781f6e7e1bb6c4d07"; }; checkInputs = [ pytest pytestrunner requests-mock pytestcov ]; diff --git a/pkgs/development/python-modules/PyLD/default.nix b/pkgs/development/python-modules/PyLD/default.nix index 247b7f0332f..5a4741a730a 100644 --- a/pkgs/development/python-modules/PyLD/default.nix +++ b/pkgs/development/python-modules/PyLD/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python, requests, gnugrep }: +{ lib, buildPythonPackage, fetchFromGitHub, python, requests, gnugrep }: let diff --git a/pkgs/development/python-modules/ROPGadget/default.nix b/pkgs/development/python-modules/ROPGadget/default.nix index 19280bf03c2..8c34e75139f 100644 --- a/pkgs/development/python-modules/ROPGadget/default.nix +++ b/pkgs/development/python-modules/ROPGadget/default.nix @@ -1,13 +1,13 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , capstone}: buildPythonPackage rec { pname = "ROPGadget"; - version = "6.3"; + version = "6.5"; src = fetchPypi { inherit pname version; - sha256 = "0v34w88if3p4vn46aby24msfnxj6znmkf4848n4d24jnykxcsqk9"; + sha256 = "4c0e56f2ba0aef13b2c8ca286aad663525b92020b11bacd16791f5236247905c"; }; propagatedBuildInputs = [ capstone ]; diff --git a/pkgs/development/python-modules/Theano/default.nix b/pkgs/development/python-modules/Theano/default.nix index c2dd7460b13..e279100e9cc 100644 --- a/pkgs/development/python-modules/Theano/default.nix +++ b/pkgs/development/python-modules/Theano/default.nix @@ -40,8 +40,8 @@ let if stdenv.cc.isClang then "clang++" else throw "Unknown C++ compiler"; cxx_compiler = wrapped cxx_compiler_name "\\$HOME/.theano" - ( stdenv.lib.optional cudaSupport libgpuarray_ - ++ stdenv.lib.optional cudnnSupport cudnn ); + ( lib.optional cudaSupport libgpuarray_ + ++ lib.optional cudnnSupport cudnn ); libgpuarray_ = libgpuarray.override { inherit cudaSupport cudatoolkit; }; @@ -60,10 +60,10 @@ in buildPythonPackage rec { substituteInPlace theano/configdefaults.py \ --replace 'StrParam(param, is_valid=warn_cxx)' 'StrParam('\'''${cxx_compiler}'\''', is_valid=warn_cxx)' \ --replace 'rc == 0 and config.cxx != ""' 'config.cxx != ""' - '' + stdenv.lib.optionalString cudaSupport '' + '' + lib.optionalString cudaSupport '' substituteInPlace theano/configdefaults.py \ --replace 'StrParam(get_cuda_root)' 'StrParam('\'''${cudatoolkit}'\''')' - '' + stdenv.lib.optionalString cudnnSupport '' + '' + lib.optionalString cudnnSupport '' substituteInPlace theano/configdefaults.py \ --replace 'StrParam(default_dnn_base_path)' 'StrParam('\'''${cudnn}'\''')' ''; diff --git a/pkgs/development/python-modules/Wand/default.nix b/pkgs/development/python-modules/Wand/default.nix index d7ad28c0133..e180f0cea33 100644 --- a/pkgs/development/python-modules/Wand/default.nix +++ b/pkgs/development/python-modules/Wand/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , imagemagick7Big diff --git a/pkgs/development/python-modules/WazeRouteCalculator/default.nix b/pkgs/development/python-modules/WazeRouteCalculator/default.nix index 28515e6f602..6da500413f0 100644 --- a/pkgs/development/python-modules/WazeRouteCalculator/default.nix +++ b/pkgs/development/python-modules/WazeRouteCalculator/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , requests }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/aadict/default.nix b/pkgs/development/python-modules/aadict/default.nix index cf6976fa6c1..de3ec6fa7f0 100644 --- a/pkgs/development/python-modules/aadict/default.nix +++ b/pkgs/development/python-modules/aadict/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/pkgs/development/python-modules/aafigure/default.nix b/pkgs/development/python-modules/aafigure/default.nix index 5350443eeaa..0b9f1457178 100644 --- a/pkgs/development/python-modules/aafigure/default.nix +++ b/pkgs/development/python-modules/aafigure/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pillow }: +{ lib, buildPythonPackage, fetchPypi, pillow }: buildPythonPackage rec { pname = "aafigure"; diff --git a/pkgs/development/python-modules/acebinf/default.nix b/pkgs/development/python-modules/acebinf/default.nix index f8134aaf5b3..7889e007d83 100644 --- a/pkgs/development/python-modules/acebinf/default.nix +++ b/pkgs/development/python-modules/acebinf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pyvcf diff --git a/pkgs/development/python-modules/acme-tiny/default.nix b/pkgs/development/python-modules/acme-tiny/default.nix index 75408244e66..c979104914d 100644 --- a/pkgs/development/python-modules/acme-tiny/default.nix +++ b/pkgs/development/python-modules/acme-tiny/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools_scm, fusepy, fuse +{ lib, buildPythonPackage, fetchPypi, setuptools_scm, fusepy, fuse , openssl }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/actdiag/default.nix b/pkgs/development/python-modules/actdiag/default.nix index ca47018f56f..92917f6ea95 100644 --- a/pkgs/development/python-modules/actdiag/default.nix +++ b/pkgs/development/python-modules/actdiag/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , nose, docutils, blockdiag, reportlab }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix new file mode 100644 index 00000000000..e62e24d4ab4 --- /dev/null +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "Adafruit-PlatformDetect"; + version = "2.28.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "aa272605fd8a2ddcc6e5dd8151d628f76a9468c97ba7e4e315d6bc78b9bfb8f8"; + }; + + nativeBuildInputs = [ setuptools-scm ]; + + # Project has not published tests yet + doCheck = false; + pythonImportsCheck = [ "adafruit_platformdetect" ]; + + meta = with lib; { + description = "Platform detection for use by Adafruit libraries"; + homepage = "https://github.com/adafruit/Adafruit_Python_PlatformDetect"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/adafruit-pureio/default.nix b/pkgs/development/python-modules/adafruit-pureio/default.nix new file mode 100644 index 00000000000..36bafb0f7a0 --- /dev/null +++ b/pkgs/development/python-modules/adafruit-pureio/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "Adafruit-PureIO"; + version = "1.1.8"; + + src = fetchPypi { + pname = "Adafruit_PureIO"; + inherit version; + sha256 = "1mfa6sfz7qwgajz3lqw0s69ivvwbwvblwkjzbrwdrxjbma4jaw66"; + }; + + nativeBuildInputs = [ setuptools-scm ]; + + # Physical SMBus is not present + doCheck = false; + pythonImportsCheck = [ "Adafruit_PureIO" ]; + + meta = with lib; { + description = "Python interface to Linux IO including I2C and SPI"; + homepage = "https://github.com/adafruit/Adafruit_Python_PureIO"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/adal/default.nix b/pkgs/development/python-modules/adal/default.nix index f7e973c8f69..55dc21240ec 100644 --- a/pkgs/development/python-modules/adal/default.nix +++ b/pkgs/development/python-modules/adal/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , requests, pyjwt, dateutil }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/adext/default.nix b/pkgs/development/python-modules/adext/default.nix new file mode 100644 index 00000000000..f3818c93188 --- /dev/null +++ b/pkgs/development/python-modules/adext/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, alarmdecoder +}: + +buildPythonPackage rec { + pname = "adext"; + version = "0.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "184qxw6i5ixnhgkjnby4zwn4jg90mxb8xy9vbg80x5w331p4z50f"; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "alarmdecoder==1.13.2" "alarmdecoder>=1.13.2" + ''; + + propagatedBuildInputs = [ alarmdecoder ]; + + # Tests are not published yet + doCheck = false; + pythonImportsCheck = [ "adext" ]; + + meta = with lib; { + description = "Python extension for AlarmDecoder"; + homepage = "https://github.com/ajschmidt8/adext"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/aenum/default.nix b/pkgs/development/python-modules/aenum/default.nix index 32b26a5e035..4f30eefbf90 100644 --- a/pkgs/development/python-modules/aenum/default.nix +++ b/pkgs/development/python-modules/aenum/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, python, isPy3k, glibcLocales }: +{ lib, fetchPypi, buildPythonPackage, python, isPy3k, glibcLocales }: buildPythonPackage rec { pname = "aenum"; @@ -22,10 +22,10 @@ buildPythonPackage rec { runHook postCheck ''; - meta = { + meta = with lib; { description = "Advanced Enumerations (compatible with Python's stdlib Enum), NamedTuples, and NamedConstants"; - maintainers = with stdenv.lib.maintainers; [ vrthra ]; - license = with stdenv.lib.licenses; [ bsd3 ]; + maintainers = with maintainers; [ vrthra ]; + license = licenses.bsd3; homepage = "https://github.com/ethanfurman/aenum"; }; } diff --git a/pkgs/development/python-modules/agate-dbf/default.nix b/pkgs/development/python-modules/agate-dbf/default.nix index 099fb1701cb..0299a94ebb0 100644 --- a/pkgs/development/python-modules/agate-dbf/default.nix +++ b/pkgs/development/python-modules/agate-dbf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, agate, dbf, dbfread }: +{ lib, fetchPypi, buildPythonPackage, agate, dbf, dbfread }: buildPythonPackage rec { pname = "agate-dbf"; diff --git a/pkgs/development/python-modules/agate-sql/default.nix b/pkgs/development/python-modules/agate-sql/default.nix index 566951ea71d..29bbfa81ed2 100644 --- a/pkgs/development/python-modules/agate-sql/default.nix +++ b/pkgs/development/python-modules/agate-sql/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, agate, sqlalchemy, crate }: +{ lib, fetchPypi, buildPythonPackage, agate, sqlalchemy, crate }: buildPythonPackage rec { pname = "agate-sql"; diff --git a/pkgs/development/python-modules/agent-py/default.nix b/pkgs/development/python-modules/agent-py/default.nix new file mode 100644 index 00000000000..2a9e358cf04 --- /dev/null +++ b/pkgs/development/python-modules/agent-py/default.nix @@ -0,0 +1,26 @@ +{ aiohttp, buildPythonPackage, fetchPypi, isPy3k, lib, python, requests }: + +buildPythonPackage rec { + pname = "agent-py"; + version = "0.0.23"; + + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "1hx88m8b8kfb2gm6hii5ldjv7hlvqf99cz0w2vj0d0grrxcbn5cz"; + }; + + propagatedBuildInputs = [ requests aiohttp ]; + + checkPhase = '' + ${python.interpreter} tests/test_agent.py + ''; + + meta = with lib; { + description = "A python wrapper around the Agent REST API."; + homepage = "https://github.com/ispysoftware/agent-py"; + license = licenses.asl20; + maintainers = with maintainers; [ jamiemagee ]; + }; +} diff --git a/pkgs/development/python-modules/aiobotocore/default.nix b/pkgs/development/python-modules/aiobotocore/default.nix index 30821986539..2e7c9c2401c 100644 --- a/pkgs/development/python-modules/aiobotocore/default.nix +++ b/pkgs/development/python-modules/aiobotocore/default.nix @@ -1,5 +1,5 @@ { lib -, stdenv + , buildPythonPackage , fetchPypi , pythonOlder diff --git a/pkgs/development/python-modules/aiocoap/default.nix b/pkgs/development/python-modules/aiocoap/default.nix new file mode 100644 index 00000000000..dd74a21bf9b --- /dev/null +++ b/pkgs/development/python-modules/aiocoap/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, python +}: + +buildPythonPackage rec { + pname = "aiocoap"; + version = "0.4b3"; + + src = fetchFromGitHub { + owner = "chrysn"; + repo = pname; + rev = version; + sha256 = "1zjg475xgvi19rqg7jmfgy5nfabq50aph0231p9jba211ps7cmxw"; + }; + + checkPhase = '' + ${python.interpreter} -m aiocoap.cli.defaults + ${python.interpreter} -m unittest discover -v + ''; + + pythonImportsCheck = [ "aiocoap" ]; + + meta = with lib; { + description = "Python CoAP library"; + homepage = "https://aiocoap.readthedocs.io/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/aiodns/default.nix b/pkgs/development/python-modules/aiodns/default.nix index e1130331365..1adc6f81524 100644 --- a/pkgs/development/python-modules/aiodns/default.nix +++ b/pkgs/development/python-modules/aiodns/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder +{ lib, buildPythonPackage, fetchPypi, pythonOlder , isPy27, isPyPy, python, pycares, typing, trollius }: buildPythonPackage rec { @@ -10,9 +10,9 @@ buildPythonPackage rec { sha256 = "815fdef4607474295d68da46978a54481dd1e7be153c7d60f9e72773cd38d77d"; }; - propagatedBuildInputs = with stdenv.lib; [ pycares ] - ++ optional (pythonOlder "3.7") typing - ++ optional (isPy27 || isPyPy) trollius; + propagatedBuildInputs = [ pycares ] + ++ lib.optional (pythonOlder "3.7") typing + ++ lib.optional (isPy27 || isPyPy) trollius; checkPhase = '' ${python.interpreter} tests.py diff --git a/pkgs/development/python-modules/aioeafm/default.nix b/pkgs/development/python-modules/aioeafm/default.nix new file mode 100644 index 00000000000..be91e0e9557 --- /dev/null +++ b/pkgs/development/python-modules/aioeafm/default.nix @@ -0,0 +1,44 @@ +{ lib +, aiohttp +, async-timeout +, buildPythonPackage +, fetchFromGitHub +, poetry +, pytest-aiohttp +, pytest-asyncio +, pytest-cov +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "aioeafm"; + version = "1.0.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "Jc2k"; + repo = pname; + rev = version; + sha256 = "048cxn3fw2hynp27zlizq7k8ps67qq9sib1ddgirnxy5zc87vgkc"; + }; + + nativeBuildInputs = [ poetry ]; + + propagatedBuildInputs = [ aiohttp ]; + + checkInputs = [ + pytest-aiohttp + pytest-asyncio + pytest-cov + pytestCheckHook + ]; + + pythonImportsCheck = [ "aioeafm" ]; + + meta = with lib; { + description = "Python client for access the Real Time flood monitoring API"; + homepage = "https://github.com/Jc2k/aioeafm"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 6a128eb5239..03f1ed91cfd 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -1,16 +1,14 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, attrs, protobuf, zeroconf }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, attrs, protobuf, zeroconf }: buildPythonPackage rec { pname = "aioesphomeapi"; - version = "2.6.3"; + version = "2.6.4"; disabled = !isPy3k; - src = fetchFromGitHub { - owner = "esphome"; - repo = pname; - rev = "v${version}"; - sha256 = "1lbjxqdx63fc7qxx7xwq4b9dafmdafj7p1ggs48hyhbqfwkrv9p7"; + src = fetchPypi { + inherit pname version; + sha256 = "d8def7a909c0471479e1d8b0965de6bb7644b8de315d6e578f9d848b8a6812d0"; }; propagatedBuildInputs = [ attrs protobuf zeroconf ]; diff --git a/pkgs/development/python-modules/aioeventlet/default.nix b/pkgs/development/python-modules/aioeventlet/default.nix index 4bdd2b1327c..0d6796706cb 100644 --- a/pkgs/development/python-modules/aioeventlet/default.nix +++ b/pkgs/development/python-modules/aioeventlet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , eventlet diff --git a/pkgs/development/python-modules/aioflo/default.nix b/pkgs/development/python-modules/aioflo/default.nix new file mode 100644 index 00000000000..60288178def --- /dev/null +++ b/pkgs/development/python-modules/aioflo/default.nix @@ -0,0 +1,45 @@ +{ lib +, aiohttp +, aresponses +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytest-aiohttp +, pytest-asyncio +, pytest-cov +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "aioflo"; + version = "0.4.2"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "bachya"; + repo = pname; + rev = version; + sha256 = "1ppsinmjph6snj7s4hg28p3qa67kpkadc98ikjjg6w65vcm3dlaz"; + }; + + nativeBuildInputs = [ poetry-core ]; + + propagatedBuildInputs = [ aiohttp ]; + + checkInputs = [ + aresponses + pytest-aiohttp + pytest-asyncio + pytest-cov + pytestCheckHook + ]; + + pythonImportsCheck = [ "aioflo" ]; + + meta = with lib; { + description = "Python library for Flo by Moen Smart Water Detectors"; + homepage = "https://github.com/bachya/aioflo"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/aioh2/default.nix b/pkgs/development/python-modules/aioh2/default.nix index 6af4c4230b0..1ae997c60e8 100644 --- a/pkgs/development/python-modules/aioh2/default.nix +++ b/pkgs/development/python-modules/aioh2/default.nix @@ -19,5 +19,6 @@ buildPythonPackage rec { description = "HTTP/2 implementation with hyper-h2 on Python 3 asyncio"; license = licenses.bsd3; maintainers = [ maintainers.qyliss ]; + broken = true; # requires h2<4 }; } diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix new file mode 100644 index 00000000000..5a51f66b16a --- /dev/null +++ b/pkgs/development/python-modules/aiohomekit/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, cryptography +, fetchFromGitHub +, poetry +, pytest-aiohttp +, pytestCheckHook +, pythonAtLeast +, zeroconf +}: + +buildPythonPackage rec { + pname = "aiohomekit"; + version = "0.2.60"; + format = "pyproject"; + disabled = pythonAtLeast "3.9"; + + src = fetchFromGitHub { + owner = "Jc2k"; + repo = pname; + rev = version; + sha256 = "03llk5i22hq163x568kz0qar5h0sda8f8cxbmgya6z2dcxv0a83p"; + }; + + nativeBuildInputs = [ poetry ]; + + propagatedBuildInputs = [ + cryptography + zeroconf + ]; + + checkInputs = [ + pytest-aiohttp + pytestCheckHook + ]; + + # Some test requires network access + disabledTests = [ + "test_remove_pairing" + "test_pair" + "test_add_and_remove_pairings" + ]; + + pythonImportsCheck = [ "aiohomekit" ]; + + meta = with lib; { + description = "Python module that implements the HomeKit protocol"; + longDescription = '' + This Python library implements the HomeKit protocol for controlling + Homekit accessories. + ''; + homepage = "https://github.com/Jc2k/aiohomekit"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/aiohttp-remotes/default.nix b/pkgs/development/python-modules/aiohttp-remotes/default.nix index 861dbb9bf07..8a8f7c4b313 100644 --- a/pkgs/development/python-modules/aiohttp-remotes/default.nix +++ b/pkgs/development/python-modules/aiohttp-remotes/default.nix @@ -4,20 +4,13 @@ buildPythonPackage rec { pname = "aiohttp_remotes"; - version = "0.1.2"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "43c3f7e1c5ba27f29fb4dbde5d43b900b5b5fc7e37bf7e35e6eaedabaec4a3fc"; + sha256 = "1vv2ancxsaxlls9sinigjnrqyx95n7cphq37m8nwifkhvs0idv6a"; }; - patches = [ - (fetchpatch { - url = "https://github.com/aio-libs/aiohttp-remotes/commit/188772abcea038c31dae7d607e487eeed44391bc.patch"; - sha256 = "0pb1y4jb8ar1szhnjiyj2sdmdk6z9h6c3wrxw59nv9kr3if5igvs"; - }) - ]; - propagatedBuildInputs = [ aiohttp ]; checkInputs = [ pytest pytestcov pytest-aiohttp ]; diff --git a/pkgs/development/python-modules/aioitertools/default.nix b/pkgs/development/python-modules/aioitertools/default.nix index 1c5ce1e2fae..91d83e93cbd 100644 --- a/pkgs/development/python-modules/aioitertools/default.nix +++ b/pkgs/development/python-modules/aioitertools/default.nix @@ -1,5 +1,5 @@ { lib -, stdenv + , buildPythonPackage , fetchPypi , pythonOlder diff --git a/pkgs/development/python-modules/aiokef/default.nix b/pkgs/development/python-modules/aiokef/default.nix new file mode 100644 index 00000000000..c153ff37d8c --- /dev/null +++ b/pkgs/development/python-modules/aiokef/default.nix @@ -0,0 +1,44 @@ +{ lib +, async-timeout +, buildPythonPackage +, fetchFromGitHub +, pytest-cov +, pytestCheckHook +, pytest-mypy +, pythonOlder +, tenacity +}: + +buildPythonPackage rec { + pname = "aiokef"; + version = "0.2.17"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "basnijholt"; + repo = pname; + rev = "v${version}"; + sha256 = "0ms0dwrpj80w55svcppbnp7vyl5ipnjfp1c436k5c7pph4q5pxk9"; + }; + + propagatedBuildInputs = [ + async-timeout + tenacity + ]; + + checkInputs = [ + pytest-cov + pytest-mypy + pytestCheckHook + ]; + + pytestFlagsArray = [ "tests" ]; + pythonImportsCheck = [ "aiokef" ]; + + meta = with lib; { + description = "Python API for KEF speakers"; + homepage = "https://github.com/basnijholt/aiokef"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/aiolifx/default.nix b/pkgs/development/python-modules/aiolifx/default.nix index 7b33b1c508f..748ed242ae9 100644 --- a/pkgs/development/python-modules/aiolifx/default.nix +++ b/pkgs/development/python-modules/aiolifx/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "aiolifx"; - version = "0.6.8"; + version = "0.6.9"; src = fetchPypi { inherit pname version; - sha256 = "9f9055bc2a9a72c5eab17e0ce5522edecd6de07e21cf347bf0cffabdabe5570e"; + sha256 = "0c28e9c058ee504a07eec11cb333bc6496d233da100dcab9c33549e9eb4985c0"; }; # tests are not implemented diff --git a/pkgs/development/python-modules/aioredis/default.nix b/pkgs/development/python-modules/aioredis/default.nix index 2e59168157b..fe48ba0e1e1 100644 --- a/pkgs/development/python-modules/aioredis/default.nix +++ b/pkgs/development/python-modules/aioredis/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , pkgs, async-timeout, hiredis, isPyPy, isPy27 }: @@ -15,7 +15,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ async-timeout - ] ++ stdenv.lib.optional (!isPyPy) hiredis; + ] ++ lib.optional (!isPyPy) hiredis; # Wants to run redis-server, hardcoded FHS paths, too much trouble. doCheck = false; diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix new file mode 100644 index 00000000000..f53877e03a3 --- /dev/null +++ b/pkgs/development/python-modules/aioshelly/default.nix @@ -0,0 +1,35 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, netifaces +}: + +buildPythonPackage rec { + pname = "aioshelly"; + version = "0.5.4"; + + src = fetchFromGitHub { + owner = "home-assistant-libs"; + repo = pname; + rev = version; + sha256 = "sha256-EjzWx3wcmTfB3OmN0OB37K6wYKVO3HzGEIf+uihas8k="; + }; + + propagatedBuildInputs = [ + aiohttp + netifaces + ]; + + # Project has no test + doCheck = false; + pythonImportsCheck = [ "aioshelly" ]; + + meta = with lib; { + description = "Python library to control Shelly"; + homepage = "https://github.com/home-assistant-libs/aioshelly"; + changelog = "https://github.com/home-assistant-libs/aioshelly/releases/tag/${version}"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/aioswitcher/default.nix b/pkgs/development/python-modules/aioswitcher/default.nix new file mode 100644 index 00000000000..115da7dfca4 --- /dev/null +++ b/pkgs/development/python-modules/aioswitcher/default.nix @@ -0,0 +1,45 @@ +{ lib +, aiohttp +, asynctest +, buildPythonPackage +, fetchFromGitHub +, poetry +, pytest-aiohttp +, pytest-asyncio +, pytest-sugar +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "aioswitcher"; + version = "1.2.2"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "TomerFi"; + repo = pname; + rev = version; + sha256 = "0wvca1jbyj4bwrpkpklbxnkvdp9zs7mrvg5b9vkx2hpyr81vyxam"; + }; + + nativeBuildInputs = [ poetry ]; + + propagatedBuildInputs = [ aiohttp ]; + + checkInputs = [ + asynctest + pytest-aiohttp + pytest-asyncio + pytest-sugar + pytestCheckHook + ]; + + pythonImportsCheck = [ "aioswitcher" ]; + + meta = with lib; { + description = "Python module to interact with Switcher water heater"; + homepage = "https://github.com/TomerFi/aioswitcher"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/aiowinreg/default.nix b/pkgs/development/python-modules/aiowinreg/default.nix index c6375b21efe..3b02916d229 100644 --- a/pkgs/development/python-modules/aiowinreg/default.nix +++ b/pkgs/development/python-modules/aiowinreg/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "aiowinreg"; - version = "0.0.3"; + version = "0.0.4"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0gxhx9m45yyr1rmgs7f1jchkgxk2zipk9g3s5ix90d267in8hsn9"; + sha256 = "956278a90ef6958f9e2392891b2a305273f695b15b14489cd2097197d6cbe155"; }; # Project doesn't have tests diff --git a/pkgs/development/python-modules/aiozeroconf/default.nix b/pkgs/development/python-modules/aiozeroconf/default.nix index d73ae2b35df..fe3943c25b1 100644 --- a/pkgs/development/python-modules/aiozeroconf/default.nix +++ b/pkgs/development/python-modules/aiozeroconf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , netifaces diff --git a/pkgs/development/python-modules/ajpy/default.nix b/pkgs/development/python-modules/ajpy/default.nix index 0dd135e139f..926b5ed7efe 100644 --- a/pkgs/development/python-modules/ajpy/default.nix +++ b/pkgs/development/python-modules/ajpy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "ajpy"; diff --git a/pkgs/development/python-modules/alabaster/default.nix b/pkgs/development/python-modules/alabaster/default.nix index b4cc69e555b..72eda332f95 100644 --- a/pkgs/development/python-modules/alabaster/default.nix +++ b/pkgs/development/python-modules/alabaster/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , pygments }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/alarmdecoder/default.nix b/pkgs/development/python-modules/alarmdecoder/default.nix index b563a80447f..10438d54081 100644 --- a/pkgs/development/python-modules/alarmdecoder/default.nix +++ b/pkgs/development/python-modules/alarmdecoder/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pyserial, pyftdi, pyusb +{ lib, buildPythonPackage, fetchFromGitHub, pyserial, pyftdi, pyusb , pyopenssl, nose, isPy3k, pythonOlder, mock }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index 142c6d1c416..5a4ef5e0bc6 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , pytest, pytestcov, mock, coverage, setuptools , Mako, sqlalchemy, python-editor, dateutil }: diff --git a/pkgs/development/python-modules/alerta-server/default.nix b/pkgs/development/python-modules/alerta-server/default.nix index ce1e702a7ba..82783dd16bb 100644 --- a/pkgs/development/python-modules/alerta-server/default.nix +++ b/pkgs/development/python-modules/alerta-server/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder +{ lib, buildPythonPackage, fetchPypi, pythonOlder , bcrypt, blinker, flask, flask-compress, flask-cors, mohawk, psycopg2, pyjwt, pymongo, python-dateutil, pytz, pyyaml, requests, requests-hawk, sentry-sdk }: buildPythonPackage rec { pname = "alerta-server"; - version = "8.1.0"; + version = "8.3.3"; src = fetchPypi { inherit pname version; - sha256 = "32a97eee95aea5527f6efa844c18b727fe4a6d61356ea3c0769a29a163ddcb7e"; + sha256 = "a2713a31c6e326c774a3ee0328f424f944b951935ff1b893a4a66598d61c5a97"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/alerta/default.nix b/pkgs/development/python-modules/alerta/default.nix index 19dd17ee3f0..e69503777d4 100644 --- a/pkgs/development/python-modules/alerta/default.nix +++ b/pkgs/development/python-modules/alerta/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , six, click, requests, requests-hawk, pytz, tabulate, pythonOlder }: diff --git a/pkgs/development/python-modules/alot/default.nix b/pkgs/development/python-modules/alot/default.nix index 21c6aaff2fb..1f4617ce9c0 100644 --- a/pkgs/development/python-modules/alot/default.nix +++ b/pkgs/development/python-modules/alot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, python, fetchFromGitHub, fetchpatch, isPy3k +{ lib, buildPythonPackage, python, fetchFromGitHub, fetchpatch, isPy3k , notmuch, urwid, urwidtrees, twisted, python_magic, configobj, mock, file, gpgme , service-identity , gnupg ? null, sphinx, awk ? null, procps ? null, future ? null diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix index 018ac7ddf50..37c1efd9c1b 100644 --- a/pkgs/development/python-modules/altair/default.nix +++ b/pkgs/development/python-modules/altair/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27 +{ lib, buildPythonPackage, fetchPypi, isPy27 , entrypoints , glibcLocales , ipython @@ -33,7 +33,7 @@ buildPythonPackage rec { pandas six toolz - ] ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ]; + ] ++ lib.optionals (pythonOlder "3.5") [ typing ]; checkInputs = [ glibcLocales diff --git a/pkgs/development/python-modules/amazon_kclpy/default.nix b/pkgs/development/python-modules/amazon_kclpy/default.nix index ed266c0db78..44dc739f1ca 100644 --- a/pkgs/development/python-modules/amazon_kclpy/default.nix +++ b/pkgs/development/python-modules/amazon_kclpy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python, mock, boto, pytest }: +{ lib, buildPythonPackage, fetchFromGitHub, python, mock, boto, pytest }: buildPythonPackage rec { pname = "amazon_kclpy"; diff --git a/pkgs/development/python-modules/amcrest/default.nix b/pkgs/development/python-modules/amcrest/default.nix new file mode 100644 index 00000000000..772b8fbaa04 --- /dev/null +++ b/pkgs/development/python-modules/amcrest/default.nix @@ -0,0 +1,43 @@ +{ lib +, argcomplete +, buildPythonPackage +, fetchFromGitHub +, mock +, pytestCheckHook +, requests +, responses +, urllib3 +}: + +buildPythonPackage rec { + pname = "amcrest"; + version = "1.7.2"; + + src = fetchFromGitHub { + owner = "tchellomello"; + repo = "python-amcrest"; + rev = version; + sha256 = "06gbrshf6vqvq3k813d1w37k2kmps0g6msa4lp2f9xvzw3iczshy"; + }; + + propagatedBuildInputs = [ + argcomplete + requests + urllib3 + ]; + + checkInputs = [ + mock + pytestCheckHook + responses + ]; + + pythonImportsCheck = [ "amcrest" ]; + + meta = with lib; { + description = "Python module for Amcrest and Dahua Cameras"; + homepage = "https://github.com/tchellomello/python-amcrest"; + license = with licenses; [ gpl2Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/amply/default.nix b/pkgs/development/python-modules/amply/default.nix index 32bcbb4589a..0589caf1e6a 100644 --- a/pkgs/development/python-modules/amply/default.nix +++ b/pkgs/development/python-modules/amply/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchPypi , buildPythonPackage , setuptools_scm diff --git a/pkgs/development/python-modules/amqp/default.nix b/pkgs/development/python-modules/amqp/default.nix index 75a4f8d6e12..6e6d95ba8f9 100644 --- a/pkgs/development/python-modules/amqp/default.nix +++ b/pkgs/development/python-modules/amqp/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, case, vine }: +{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, case, vine }: buildPythonPackage rec { pname = "amqp"; - version = "5.0.2"; + version = "5.0.5"; src = fetchPypi { inherit pname version; - sha256 = "fcd5b3baeeb7fc19b3486ff6d10543099d40ae1f5c9196eae695d1cde1b2f784"; + sha256 = "affdd263d8b8eb3c98170b78bf83867cdb6a14901d586e00ddb65bfe2f0c4e60"; }; propagatedBuildInputs = [ vine ]; diff --git a/pkgs/development/python-modules/amqplib/default.nix b/pkgs/development/python-modules/amqplib/default.nix index c7b4dc865bb..430065b7d1f 100644 --- a/pkgs/development/python-modules/amqplib/default.nix +++ b/pkgs/development/python-modules/amqplib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, python }: +{ lib, buildPythonPackage, fetchPypi, python }: buildPythonPackage rec { pname = "amqplib"; diff --git a/pkgs/development/python-modules/aniso8601/default.nix b/pkgs/development/python-modules/aniso8601/default.nix index c6c05283f28..538cb11db13 100644 --- a/pkgs/development/python-modules/aniso8601/default.nix +++ b/pkgs/development/python-modules/aniso8601/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , dateutil, mock, isPy3k }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ dateutil ]; - checkInputs = stdenv.lib.optional (!isPy3k) mock; + checkInputs = lib.optional (!isPy3k) mock; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/annoy/default.nix b/pkgs/development/python-modules/annoy/default.nix index 0bd06084380..d5f24492c90 100644 --- a/pkgs/development/python-modules/annoy/default.nix +++ b/pkgs/development/python-modules/annoy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , h5py diff --git a/pkgs/development/python-modules/anonip/default.nix b/pkgs/development/python-modules/anonip/default.nix index 9c1b3abf980..0663fddd6fb 100644 --- a/pkgs/development/python-modules/anonip/default.nix +++ b/pkgs/development/python-modules/anonip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchFromGitHub, ipaddress, isPy27 }: +{ lib, buildPythonPackage, fetchFromGitHub, ipaddress, isPy27 }: buildPythonPackage rec { pname = "anonip"; diff --git a/pkgs/development/python-modules/ansi/default.nix b/pkgs/development/python-modules/ansi/default.nix index 65f51c17d7d..d198fde80bb 100644 --- a/pkgs/development/python-modules/ansi/default.nix +++ b/pkgs/development/python-modules/ansi/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "ansi"; - version = "0.1.5"; + version = "0.2.0"; src = fetchPypi { inherit pname version; - sha256 = "02sknsbx55r6nylznslmmzzkfi3rsw7akpyzi6f1bqvr2ila8p0f"; + sha256 = "98e9b27c4bb187867a69480cbc63b843331622fec7e7d090873d806e1b5d8a80"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/ansicolor/default.nix b/pkgs/development/python-modules/ansicolor/default.nix index 3d96061362e..99a419a60fa 100644 --- a/pkgs/development/python-modules/ansicolor/default.nix +++ b/pkgs/development/python-modules/ansicolor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "ansicolor"; diff --git a/pkgs/development/python-modules/ansicolors/default.nix b/pkgs/development/python-modules/ansicolors/default.nix index 7d6dd2127e6..fab91690ab2 100644 --- a/pkgs/development/python-modules/ansicolors/default.nix +++ b/pkgs/development/python-modules/ansicolors/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest }: +{ lib, buildPythonPackage, fetchPypi, pytest }: buildPythonPackage rec { pname = "ansicolors"; diff --git a/pkgs/development/python-modules/ansiconv/default.nix b/pkgs/development/python-modules/ansiconv/default.nix index 6a3571960d0..ba0c06f536a 100644 --- a/pkgs/development/python-modules/ansiconv/default.nix +++ b/pkgs/development/python-modules/ansiconv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pytest }: +{ lib, buildPythonPackage, fetchFromGitHub, pytest }: buildPythonPackage rec { pname = "ansiconv"; diff --git a/pkgs/development/python-modules/apache-airflow/default.nix b/pkgs/development/python-modules/apache-airflow/default.nix index ca2cb03f967..705b7b721f8 100644 --- a/pkgs/development/python-modules/apache-airflow/default.nix +++ b/pkgs/development/python-modules/apache-airflow/default.nix @@ -143,11 +143,9 @@ buildPythonPackage rec { --replace "flask-appbuilder>=1.12.5, <2.0.0" "flask-appbuilder" \ --replace "flask-admin==1.5.3" "flask-admin" \ --replace "flask-login>=0.3, <0.5" "flask-login" \ - --replace "pendulum==1.4.4" "pendulum" \ --replace "cached_property~=1.5" "cached_property" \ --replace "dill>=0.2.2, <0.3" "dill" \ --replace "configparser>=3.5.0, <3.6.0" "configparser" \ - --replace "jinja2>=2.10.1, <2.11.0" "jinja2" \ --replace "colorlog==4.0.2" "colorlog" \ --replace "funcsigs==1.0.0" "funcsigs" \ --replace "flask-swagger==0.2.13" "flask-swagger" \ diff --git a/pkgs/development/python-modules/apipkg/default.nix b/pkgs/development/python-modules/apipkg/default.nix index 88535bb7cf1..10e2369e12e 100644 --- a/pkgs/development/python-modules/apipkg/default.nix +++ b/pkgs/development/python-modules/apipkg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , pytest, setuptools_scm, isPy3k }: buildPythonPackage rec { @@ -22,13 +22,13 @@ buildPythonPackage rec { # Failing tests on Python 3 # https://github.com/pytest-dev/apipkg/issues/17 checkPhase = let - disabledTests = stdenv.lib.optionals isPy3k [ + disabledTests = lib.optionals isPy3k [ "test_error_loading_one_element" "test_aliasmodule_proxy_methods" "test_eagerload_on_bython" ]; - testExpression = stdenv.lib.optionalString (disabledTests != []) - "-k 'not ${stdenv.lib.concatStringsSep " and not " disabledTests}'"; + testExpression = lib.optionalString (disabledTests != []) + "-k 'not ${lib.concatStringsSep " and not " disabledTests}'"; in '' py.test ${testExpression} ''; diff --git a/pkgs/development/python-modules/approvaltests/default.nix b/pkgs/development/python-modules/approvaltests/default.nix index bc47de37128..6f2c55d45cb 100644 --- a/pkgs/development/python-modules/approvaltests/default.nix +++ b/pkgs/development/python-modules/approvaltests/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy37, pyperclip }: +{ lib, buildPythonPackage, fetchFromGitHub, isPy37, pyperclip }: buildPythonPackage rec { version = "0.2.6"; diff --git a/pkgs/development/python-modules/apptools/default.nix b/pkgs/development/python-modules/apptools/default.nix index 47144fc07aa..a03b051b11d 100644 --- a/pkgs/development/python-modules/apptools/default.nix +++ b/pkgs/development/python-modules/apptools/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { ]; doCheck = true; - checkPhase = ''HOME=$TMP nosetests''; + checkPhase = "HOME=$TMP nosetests"; meta = with lib; { description = "Set of packages that Enthought has found useful in creating a number of applications."; diff --git a/pkgs/development/python-modules/apsw/default.nix b/pkgs/development/python-modules/apsw/default.nix index de74480765a..8933d4e91bc 100644 --- a/pkgs/development/python-modules/apsw/default.nix +++ b/pkgs/development/python-modules/apsw/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch +{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch , sqlite, isPyPy }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 4506f422f92..8cd0f20a7f2 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.0.5327"; + version = "9.0.5610"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "0r7nj2hf51c954ihfxyhpbz1sd9lrc6i9zfkz11s22wpggvp06mz"; + sha256 = "sha256-YlqCRLx8mqHXMKPCWqcGvHxRBGOxbwMZWPEDX/jEDdI="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/aresponses/default.nix b/pkgs/development/python-modules/aresponses/default.nix index 56093192d6c..53353a13788 100644 --- a/pkgs/development/python-modules/aresponses/default.nix +++ b/pkgs/development/python-modules/aresponses/default.nix @@ -1,23 +1,25 @@ { lib -, buildPythonPackage -, fetchPypi -# propagatedBuildInputs , aiohttp -# buildInputs +, buildPythonPackage +, fetchFromGitHub +, isPy3k , pytest , pytest-asyncio -, isPy3k +, pytest-cov +, pytestCheckHook }: buildPythonPackage rec { pname = "aresponses"; - version = "2.0.0"; + version = "2.1.2"; disabled = !isPy3k; - src = fetchPypi { - inherit pname version; - sha256 = "58693a6b715edfa830a20903ee1d1b2a791251923f311b3bebf113e8ff07bb35"; + src = fetchFromGitHub { + owner = "CircleUp"; + repo = pname; + rev = version; + sha256 = "007wrk4wdy97a81imgzxd6sm5dly9v7abmxh9fyfi0vp1p7s75bw"; }; propagatedBuildInputs = [ @@ -29,13 +31,27 @@ buildPythonPackage rec { pytest-asyncio ]; - # tests only distributed via git repository, not pypi - doCheck = false; + checkInputs = [ + aiohttp + pytest-asyncio + pytest-cov + pytestCheckHook + ]; + + # Disable tests which requires network access + disabledTests = [ + "test_foo" + "test_passthrough" + ]; + + __darwinAllowLocalNetworking = true; + + pythonImportsCheck = [ "aresponses" ]; meta = with lib; { description = "Asyncio testing server"; homepage = "https://github.com/circleup/aresponses"; license = licenses.mit; - maintainers = [ maintainers.makefu ]; + maintainers = with maintainers; [ makefu ]; }; } diff --git a/pkgs/development/python-modules/argh/default.nix b/pkgs/development/python-modules/argh/default.nix index 0e2beb6a31e..bbe120ec14f 100644 --- a/pkgs/development/python-modules/argh/default.nix +++ b/pkgs/development/python-modules/argh/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/pkgs/development/python-modules/args/default.nix b/pkgs/development/python-modules/args/default.nix index cb349484f27..9faf16037d0 100644 --- a/pkgs/development/python-modules/args/default.nix +++ b/pkgs/development/python-modules/args/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "args"; diff --git a/pkgs/development/python-modules/aria2p/default.nix b/pkgs/development/python-modules/aria2p/default.nix index 076fec8c56b..2bb950beb28 100644 --- a/pkgs/development/python-modules/aria2p/default.nix +++ b/pkgs/development/python-modules/aria2p/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder , aria2, poetry, pytest, pytestcov, pytest_xdist, responses , asciimatics, loguru, requests, setuptools, websocket_client }: diff --git a/pkgs/development/python-modules/arrow/default.nix b/pkgs/development/python-modules/arrow/default.nix index 7dbe3b98fca..d87f1ede3cc 100644 --- a/pkgs/development/python-modules/arrow/default.nix +++ b/pkgs/development/python-modules/arrow/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, isPy27 +{ lib, buildPythonPackage, fetchPypi, isPy27 , nose, chai, simplejson, backports_functools_lru_cache , python-dateutil, pytz, pytest-mock, sphinx, dateparser, pytestcov , pytestCheckHook diff --git a/pkgs/development/python-modules/asana/default.nix b/pkgs/development/python-modules/asana/default.nix index ed5e441df97..c7839f05147 100644 --- a/pkgs/development/python-modules/asana/default.nix +++ b/pkgs/development/python-modules/asana/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage, pythonAtLeast, pytest, requests, requests_oauthlib, six -, fetchFromGitHub, responses, lib, stdenv +, fetchFromGitHub, responses, lib }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/asgi-csrf/default.nix b/pkgs/development/python-modules/asgi-csrf/default.nix index eabb3d525ca..4988a04e8e4 100644 --- a/pkgs/development/python-modules/asgi-csrf/default.nix +++ b/pkgs/development/python-modules/asgi-csrf/default.nix @@ -1,8 +1,17 @@ -{ lib, stdenv, buildPythonPackage, isPy27, fetchFromGitHub, itsdangerous, python-multipart -, pytestCheckHook, starlette, httpx, pytest-asyncio }: +{ lib +, buildPythonPackage +, isPy27 +, fetchFromGitHub +, itsdangerous +, python-multipart +, pytestCheckHook +, starlette +, httpx +, pytest-asyncio +}: buildPythonPackage rec { - version = "0.7.1"; + version = "0.8"; pname = "asgi-csrf"; disabled = isPy27; @@ -11,7 +20,7 @@ buildPythonPackage rec { owner = "simonw"; repo = pname; rev = version; - sha256 = "1hhqrb9r46y6i3d3w6hc9zm6yyikdyd2k5pcbyw0r9fl959yi4hf"; + sha256 = "sha256-0I/p9SjVVZhJQeR7s1R3tooP9XMNLPlcxl0dBSzsVaw="; }; propagatedBuildInputs = [ @@ -26,10 +35,7 @@ buildPythonPackage rec { starlette ]; - # tests fail while importing a private module from httpx - # E ModuleNotFoundError: No module named 'httpx._content_streams' - # https://github.com/simonw/asgi-csrf/issues/18 - doCheck = false; + doCheck = false; # asgi-lifespan missing pythonImportsCheck = [ "asgi_csrf" ]; diff --git a/pkgs/development/python-modules/asn1ate/default.nix b/pkgs/development/python-modules/asn1ate/default.nix index 2735bbf2f70..a141fc746f7 100644 --- a/pkgs/development/python-modules/asn1ate/default.nix +++ b/pkgs/development/python-modules/asn1ate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pyparsing }: +{ lib, buildPythonPackage, fetchFromGitHub, pyparsing }: buildPythonPackage rec { pname = "asn1ate"; diff --git a/pkgs/development/python-modules/astral/default.nix b/pkgs/development/python-modules/astral/default.nix index 4ea53e17eb0..8c97ef6750f 100644 --- a/pkgs/development/python-modules/astral/default.nix +++ b/pkgs/development/python-modules/astral/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, pytz, requests, pytest, freezegun }: +{ lib, buildPythonPackage, fetchPypi, isPy27, pytz, requests, pytest, freezegun }: buildPythonPackage rec { pname = "astral"; diff --git a/pkgs/development/python-modules/astunparse/default.nix b/pkgs/development/python-modules/astunparse/default.nix index c9001da5c70..b32df24f5bb 100644 --- a/pkgs/development/python-modules/astunparse/default.nix +++ b/pkgs/development/python-modules/astunparse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchPypi , buildPythonPackage , six diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix index d3684ea5720..9271adeb617 100644 --- a/pkgs/development/python-modules/asyncssh/default.nix +++ b/pkgs/development/python-modules/asyncssh/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder +{ lib, buildPythonPackage, fetchPypi, pythonOlder , cryptography , bcrypt, gssapi, libnacl, libsodium, nettle, pyopenssl , openssl, openssh, pytestCheckHook }: diff --git a/pkgs/development/python-modules/asyncwhois/default.nix b/pkgs/development/python-modules/asyncwhois/default.nix index a6ec6049ca2..077c5078caa 100644 --- a/pkgs/development/python-modules/asyncwhois/default.nix +++ b/pkgs/development/python-modules/asyncwhois/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "asyncwhois"; - version = "0.2.2"; + version = "0.2.3"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "59ed35fbe646491b6c3e1dcf6db9b4870c3d44c6c023a1c3badd6226551d7b7e"; + sha256 = "95df90d5be581e3c69398abc6a3ec69a4e568852d9d6df4582bfcc0e22ffb3bb"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/atenpdu/default.nix b/pkgs/development/python-modules/atenpdu/default.nix new file mode 100644 index 00000000000..c8307608204 --- /dev/null +++ b/pkgs/development/python-modules/atenpdu/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pysnmp +}: + +buildPythonPackage rec { + pname = "atenpdu"; + version = "0.3.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1np9p3d180c26p54nw33alb003lhx6fprr21h45dd8gqk3slm13c"; + }; + + propagatedBuildInputs = [ pysnmp ]; + + # Project has no test + doCheck = false; + pythonImportsCheck = [ "atenpdu" ]; + + meta = with lib; { + description = "Python interface to control ATEN PE PDUs"; + homepage = "https://github.com/mtdcr/pductl"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/atomiclong/default.nix b/pkgs/development/python-modules/atomiclong/default.nix index 7bcb36d548d..0fccc943c8a 100644 --- a/pkgs/development/python-modules/atomiclong/default.nix +++ b/pkgs/development/python-modules/atomiclong/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, cffi }: +{ lib, buildPythonPackage, fetchPypi, pytest, cffi }: buildPythonPackage rec { pname = "atomiclong"; diff --git a/pkgs/development/python-modules/atomicwrites/default.nix b/pkgs/development/python-modules/atomicwrites/default.nix index e958b0f16d6..5335c044cd2 100644 --- a/pkgs/development/python-modules/atomicwrites/default.nix +++ b/pkgs/development/python-modules/atomicwrites/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest }: +{ lib, buildPythonPackage, fetchPypi, pytest }: buildPythonPackage rec { pname = "atomicwrites"; diff --git a/pkgs/development/python-modules/atomman/default.nix b/pkgs/development/python-modules/atomman/default.nix index 147d2e77deb..b576504588a 100644 --- a/pkgs/development/python-modules/atomman/default.nix +++ b/pkgs/development/python-modules/atomman/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy27 +{ lib, buildPythonPackage, fetchFromGitHub, isPy27 , cython , datamodeldict , matplotlib diff --git a/pkgs/development/python-modules/atsim_potentials/default.nix b/pkgs/development/python-modules/atsim_potentials/default.nix index 6b8b8dccef8..4802ea867b7 100644 --- a/pkgs/development/python-modules/atsim_potentials/default.nix +++ b/pkgs/development/python-modules/atsim_potentials/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , configparser diff --git a/pkgs/development/python-modules/attrdict/default.nix b/pkgs/development/python-modules/attrdict/default.nix index 5c7514f9da6..cb87b9027f0 100644 --- a/pkgs/development/python-modules/attrdict/default.nix +++ b/pkgs/development/python-modules/attrdict/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, coverage, nose, six }: +{ lib, buildPythonPackage, fetchPypi, coverage, nose, six }: buildPythonPackage rec { pname = "attrdict"; diff --git a/pkgs/development/python-modules/authlib/default.nix b/pkgs/development/python-modules/authlib/default.nix index 82014b9be99..4fa14a60ff8 100644 --- a/pkgs/development/python-modules/authlib/default.nix +++ b/pkgs/development/python-modules/authlib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , pytest @@ -8,14 +8,14 @@ }: buildPythonPackage rec { - version = "0.15.2"; + version = "0.15.3"; pname = "authlib"; src = fetchFromGitHub { owner = "lepture"; repo = "authlib"; rev = "v${version}"; - sha256 = "0jsqh2nirx3xifsakqdpd3wpdig6czavv3yj4lyqz3wh9xjpvswg"; + sha256 = "1lqicv8awyygqh1z8vhwvx38dw619kgbirdn8c9sc3qilagq1rdx"; }; propagatedBuildInputs = [ cryptography requests ]; diff --git a/pkgs/development/python-modules/authres/default.nix b/pkgs/development/python-modules/authres/default.nix index c3d0402d48d..196e573717b 100644 --- a/pkgs/development/python-modules/authres/default.nix +++ b/pkgs/development/python-modules/authres/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, python }: +{ lib, fetchPypi, buildPythonPackage, python }: buildPythonPackage rec { pname = "authres"; diff --git a/pkgs/development/python-modules/autograd/default.nix b/pkgs/development/python-modules/autograd/default.nix index fef97a7a6f4..0bdee21b69c 100644 --- a/pkgs/development/python-modules/autograd/default.nix +++ b/pkgs/development/python-modules/autograd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, numpy, future }: +{ lib, buildPythonPackage, fetchPypi, numpy, future }: buildPythonPackage rec { pname = "autograd"; diff --git a/pkgs/development/python-modules/autologging/default.nix b/pkgs/development/python-modules/autologging/default.nix index 7cd66dc2c3f..fdd935303d0 100644 --- a/pkgs/development/python-modules/autologging/default.nix +++ b/pkgs/development/python-modules/autologging/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "Autologging"; diff --git a/pkgs/development/python-modules/automat/default.nix b/pkgs/development/python-modules/automat/default.nix index fa395f119ee..20f54870e1f 100644 --- a/pkgs/development/python-modules/automat/default.nix +++ b/pkgs/development/python-modules/automat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, +{ lib, buildPythonPackage, fetchPypi, m2r, setuptools_scm, six, attrs }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix index afeaef40661..c748c0cb8c1 100644 --- a/pkgs/development/python-modules/autopep8/default.nix +++ b/pkgs/development/python-modules/autopep8/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, pycodestyle, glibcLocales +{ lib, fetchPypi, buildPythonPackage, pycodestyle, glibcLocales , toml }: diff --git a/pkgs/development/python-modules/av/default.nix b/pkgs/development/python-modules/av/default.nix index 594ac42018b..bf21025e862 100644 --- a/pkgs/development/python-modules/av/default.nix +++ b/pkgs/development/python-modules/av/default.nix @@ -4,22 +4,22 @@ , isPy27 , numpy , ffmpeg -, pkgconfig +, pkg-config }: buildPythonPackage rec { pname = "av"; - version = "8.0.2"; + version = "8.0.3"; disabled = isPy27; # setup.py no longer compatible src = fetchPypi { inherit pname version; - sha256 = "a3bba6bf68766b8a1a057f28869c7078cf0a1ec3207c7788c2ce8fe6f6bd8267"; + sha256 = "521814309c91d526b6b5c9517018aef2dd12bc3d86351037db69aa67730692b8"; }; checkInputs = [ numpy ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ffmpeg ]; # Tests require downloading files from internet diff --git a/pkgs/development/python-modules/avea/default.nix b/pkgs/development/python-modules/avea/default.nix index 10674ca667d..64e0dc28633 100644 --- a/pkgs/development/python-modules/avea/default.nix +++ b/pkgs/development/python-modules/avea/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "avea"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "k0rventen"; repo = pname; rev = "v${version}"; - sha256 = "13s21dnhbh10dd60xq2cklp5jyv46rpl3nivn1imcswp02930ihz"; + sha256 = "1dirf0zdf4hb941w1dvh97vsvcy4h3w9r8jwdgr1ggmhdf9kfx4v"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/avion/default.nix b/pkgs/development/python-modules/avion/default.nix new file mode 100644 index 00000000000..a456c110ff4 --- /dev/null +++ b/pkgs/development/python-modules/avion/default.nix @@ -0,0 +1,37 @@ +{ lib +, bluepy +, buildPythonPackage +, csrmesh +, fetchPypi +, pycryptodome +, requests +}: + +buildPythonPackage rec { + pname = "avion"; + version = "0.10"; + + src = fetchPypi { + inherit pname version; + sha256 = "0zgv45086b97ngyqxdp41wxb7hpn9g7alygc21j9y3dib700vzdz"; + }; + + propagatedBuildInputs = [ + bluepy + csrmesh + pycryptodome + requests + ]; + + # Project has no test + doCheck = false; + # bluepy/uuids.json is not found + # pythonImportsCheck = [ "avion" ]; + + meta = with lib; { + description = "Python API for controlling Avi-on Bluetooth dimmers"; + homepage = "https://github.com/mjg59/python-avion"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/avro-python3/default.nix b/pkgs/development/python-modules/avro-python3/default.nix index 3e9a0e492d3..e0294246fb2 100644 --- a/pkgs/development/python-modules/avro-python3/default.nix +++ b/pkgs/development/python-modules/avro-python3/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, pycodestyle, isort }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, pycodestyle, isort }: buildPythonPackage rec { pname = "avro-python3"; diff --git a/pkgs/development/python-modules/avro/default.nix b/pkgs/development/python-modules/avro/default.nix index 9e08cd8ae1d..5a38e86eee3 100644 --- a/pkgs/development/python-modules/avro/default.nix +++ b/pkgs/development/python-modules/avro/default.nix @@ -1,18 +1,18 @@ -{ lib, stdenv, buildPythonPackage, isPy3k, fetchPypi, pycodestyle, isort }: +{ lib, buildPythonPackage, isPy3k, fetchPypi, pycodestyle, isort }: buildPythonPackage rec { pname = "avro"; - version = "1.10.0"; + version = "1.10.1"; src = fetchPypi { inherit pname version; - sha256 = "bbf9f89fd20b4cf3156f10ec9fbce83579ece3e0403546c305957f9dac0d2f03"; + sha256 = "b3a405df5aa8654b992d2aca7b80482b858a1919a44dc0b10a682162e8ee340a"; }; patchPhase = '' # this test requires network access sed -i 's/test_server_with_path/noop/' avro/test/test_ipc.py - '' + (stdenv.lib.optionalString isPy3k '' + '' + (lib.optionalString isPy3k '' # these files require twisted, which is not python3 compatible rm avro/txipc.py rm avro/test/txsample* diff --git a/pkgs/development/python-modules/avro3k/default.nix b/pkgs/development/python-modules/avro3k/default.nix index b600bc75c7a..f6ad9bf086c 100644 --- a/pkgs/development/python-modules/avro3k/default.nix +++ b/pkgs/development/python-modules/avro3k/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k }: +{ lib, buildPythonPackage, fetchPypi, isPy3k }: buildPythonPackage rec { pname = "avro3k"; diff --git a/pkgs/development/python-modules/awesome-slugify/default.nix b/pkgs/development/python-modules/awesome-slugify/default.nix index 00882cb0827..47ca9859b5e 100644 --- a/pkgs/development/python-modules/awesome-slugify/default.nix +++ b/pkgs/development/python-modules/awesome-slugify/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, unidecode, regex, python }: +{ lib, buildPythonPackage, fetchPypi, unidecode, regex, python }: buildPythonPackage rec { pname = "awesome-slugify"; diff --git a/pkgs/development/python-modules/awesomeversion/default.nix b/pkgs/development/python-modules/awesomeversion/default.nix new file mode 100644 index 00000000000..8f832f827ed --- /dev/null +++ b/pkgs/development/python-modules/awesomeversion/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "awesomeversion"; + version = "21.2.0"; + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "ludeeus"; + repo = pname; + rev = version; + sha256 = "1rzd0mcxdjnnzg35hvdvacwrr9brwmkw9bwlb5x6bcp24ry9yl0q"; + }; + + postPatch = '' + substituteInPlace setup.py --replace "main" ${version} + ''; + + propagatedBuildInputs = [ requests ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "awesomeversion" ]; + + meta = with lib; { + description = "Python module to deal with versions"; + homepage = "https://github.com/ludeeus/awesomeversion"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/awsiotpythonsdk/default.nix b/pkgs/development/python-modules/awsiotpythonsdk/default.nix new file mode 100644 index 00000000000..68b44ea5a5d --- /dev/null +++ b/pkgs/development/python-modules/awsiotpythonsdk/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "AWSIoTPythonSDK"; + version = "1.4.9"; + + src = fetchFromGitHub { + owner = "aws"; + repo = "aws-iot-device-sdk-python"; + rev = "v${version}"; + sha256 = "0mbppz1lnia4br5vjz1l4z4vw47y3bzcfpckzhs9lxhj4vq6d001"; + }; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "AWSIoTPythonSDK" ]; + + meta = with lib; { + description = "Python SDK for connecting to AWS IoT"; + homepage = "https://github.com/aws/aws-iot-device-sdk-python"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/axis/default.nix b/pkgs/development/python-modules/axis/default.nix new file mode 100644 index 00000000000..707d958bab5 --- /dev/null +++ b/pkgs/development/python-modules/axis/default.nix @@ -0,0 +1,38 @@ +{ lib +, attrs +, buildPythonPackage +, fetchFromGitHub +, httpx +, packaging +, xmltodict +}: + +buildPythonPackage rec { + pname = "axis"; + version = "43"; + + src = fetchFromGitHub { + owner = "Kane610"; + repo = pname; + rev = "v${version}"; + sha256 = "1p9yfixsrkw7rxbvgybcb653rbqv0x18wzqkh620g193snm9sgm2"; + }; + + propagatedBuildInputs = [ + attrs + httpx + packaging + xmltodict + ]; + + # Tests requires a server on localhost + doCheck = false; + pythonImportsCheck = [ "axis" ]; + + meta = with lib; { + description = "Python library for communicating with devices from Axis Communications"; + homepage = "https://github.com/Kane610/axis"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/azure-identity/default.nix b/pkgs/development/python-modules/azure-identity/default.nix index e7d2d5c83ac..a0120ae3506 100644 --- a/pkgs/development/python-modules/azure-identity/default.nix +++ b/pkgs/development/python-modules/azure-identity/default.nix @@ -18,7 +18,6 @@ buildPythonPackage rec { pname = "azure-identity"; version = "1.5.0"; - disabled = isPy38; src = fetchPypi { inherit pname version; @@ -38,11 +37,6 @@ buildPythonPackage rec { msrestazure ]; - prePatch = '' - substituteInPlace setup.py \ - --replace msal-extensions~=0.1.3 msal-extensions - ''; - pythonImportsCheck = [ "azure.identity" ]; # Requires checkout from mono-repo and a mock account: diff --git a/pkgs/development/python-modules/azure-mgmt-botservice/default.nix b/pkgs/development/python-modules/azure-mgmt-botservice/default.nix index d9375942b4d..ead8dbd3f01 100644 --- a/pkgs/development/python-modules/azure-mgmt-botservice/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-botservice/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "0.2.0"; + version = "0.3.0"; pname = "azure-mgmt-botservice"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "10sxllwvybjlp35h5mjdxhkw2wzpl4b03i08p4jnv8cswrc8h7dj"; + sha256 = "f8318878a66a0685a01bf27b7d1409c44eb90eb72b0a616c1a2455c72330f2f1"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/azure-mgmt-cdn/default.nix b/pkgs/development/python-modules/azure-mgmt-cdn/default.nix index b204add2b5e..dfadfbbc10e 100644 --- a/pkgs/development/python-modules/azure-mgmt-cdn/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-cdn/default.nix @@ -5,23 +5,25 @@ , msrestazure , azure-common , azure-mgmt-nspkg +, azure-mgmt-core , isPy3k }: buildPythonPackage rec { pname = "azure-mgmt-cdn"; - version = "6.0.0"; + version = "10.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "590cd35c9f1556a2d93d93a88b5c5661f716de094f22db30f4d05dc58a131c84"; + sha256 = "f1216f505126483c568be511a3e0e654f886f13730dae5368609ff0573528cf2"; }; propagatedBuildInputs = [ msrest msrestazure azure-common + azure-mgmt-core ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix index 2aca8fdbd7d..e8a45ebf5aa 100644 --- a/pkgs/development/python-modules/azure-mgmt-compute/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-compute/default.nix @@ -8,13 +8,13 @@ }: buildPythonPackage rec { - version = "18.0.0"; + version = "18.1.0"; pname = "azure-mgmt-compute"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "34815c91193640ad8ff0c4dad7f2d997548c853d2e8b10250329ed516e55879e"; + sha256 = "02de691c5ce7237993e65b0ae6154b3bf8ec32bcb15f13ade72bc7f3cb3183d4"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix b/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix index e6fd01f7347..9eb1d2afc14 100644 --- a/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "azure-mgmt-loganalytics"; - version = "7.0.0"; + version = "8.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "e603f9fc61b8d2f93d8814bcca012a8b425cf0c0320ddf1e84462929cf34d1af"; + sha256 = "3e7a93186594c328a6f34f0e0d9209a05021228baa85aa4c1c4ffdbf8005a45f"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-monitor/default.nix b/pkgs/development/python-modules/azure-mgmt-monitor/default.nix index 742556ef34f..db4aa3fb77c 100644 --- a/pkgs/development/python-modules/azure-mgmt-monitor/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-monitor/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "azure-mgmt-monitor"; - version = "1.0.1"; + version = "2.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "04bd89d74fe47f966b09e3256ffefcfa5c1a51057a6b33c092afe5ae17a1a7b7"; + sha256 = "e7f7943fe8f0efe98b3b1996cdec47c709765257a6e09e7940f7838a0f829e82"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/pkgs/development/python-modules/azure-mgmt-network/default.nix index 95bcd9dbc40..b15fd3afa09 100644 --- a/pkgs/development/python-modules/azure-mgmt-network/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix @@ -10,14 +10,14 @@ }: buildPythonPackage rec { - version = "17.0.0"; + version = "17.1.0"; pname = "azure-mgmt-network"; disabled = !isPy3k; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "3694f2675e152afccb1588a6cc7bb4b4795d442a4e5d7082cdf1f4e32a779199"; + sha256 = "f47852836a5960447ab534784a9285696969f007744ba030828da2eab92621ab"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix index 229cf58cea9..4ce18c4ae3b 100644 --- a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "azure-mgmt-recoveryservicesbackup"; - version = "0.10.0"; + version = "0.11.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "2debf30be50d5bb85acf4f73a2e57e11c814ead04e58f52279e5ef0a2df71d4f"; + sha256 = "f2b85d1d7d7db2af106000910ea5f8b95639874176a5de2f7ab37a2caa67af6b"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-reservations/default.nix b/pkgs/development/python-modules/azure-mgmt-reservations/default.nix index 61ef82d74ac..76ef894b96a 100644 --- a/pkgs/development/python-modules/azure-mgmt-reservations/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-reservations/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-reservations"; - version = "0.8.0"; + version = "0.9.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "b12318392e6f5100246c60de88879e24b15db104d00f9704a4ff51e7344594f1"; + sha256 = "1dc97f48f3edb67116da8604ab76ef93233319f56455532be307f323e9ebf0e6"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-synapse/default.nix b/pkgs/development/python-modules/azure-mgmt-synapse/default.nix index 22b6281fa76..fcde20b9bf7 100644 --- a/pkgs/development/python-modules/azure-mgmt-synapse/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-synapse/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "azure-mgmt-synapse"; - version = "0.6.0"; + version = "0.7.0"; disabled = pythonOlder "3"; src = fetchPypi { inherit pname version; - sha256 = "f81cb52b220774aab93ffcf25bdc17e03fd84b6916836640789f86fbf636b984"; + sha256 = "3cf37df471f75441b0afe98a0f3a548434e9bc6a6426dca8c089950b5423f63f"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/azure-servicebus/default.nix b/pkgs/development/python-modules/azure-servicebus/default.nix index 2f61a2d9bad..356de52212d 100644 --- a/pkgs/development/python-modules/azure-servicebus/default.nix +++ b/pkgs/development/python-modules/azure-servicebus/default.nix @@ -11,15 +11,15 @@ buildPythonPackage rec { pname = "azure-servicebus"; - version = "7.0.0"; + version = "7.0.1"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "875527251c1fed99fcb90597c6abb7daa4bc0ed88e080b4c36f897b704668450"; + sha256 = "46d1e7b9da537da831c3184d42d3e2bc3c7ab9234e204a9d4c2e5dc54010721b"; }; - buildInputs = [ + propagatedBuildInputs = [ uamqp azure-common azure-core diff --git a/pkgs/development/python-modules/azure-storage-blob/default.nix b/pkgs/development/python-modules/azure-storage-blob/default.nix index 9ded3d5c761..cd42be98f9f 100644 --- a/pkgs/development/python-modules/azure-storage-blob/default.nix +++ b/pkgs/development/python-modules/azure-storage-blob/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-storage-blob"; - version = "12.6.0"; + version = "12.7.1"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "dc7832d48ae3f5b31a0b24191084ce6ef7d8dfbf73e553dfe34eaddcb6813be3"; + sha256 = "c6249f211684929ea6c9d34b5151b06d039775344f0d48fcf479736ed4c11b9e"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-storage-file-share/default.nix b/pkgs/development/python-modules/azure-storage-file-share/default.nix index ad228046449..c6413f191fc 100644 --- a/pkgs/development/python-modules/azure-storage-file-share/default.nix +++ b/pkgs/development/python-modules/azure-storage-file-share/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "azure-storage-file-share"; - version = "12.3.0"; + version = "12.4.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "9f24a0ab51fd7ad294353594660b21081233f68ed8ee7483cdca26a70ce0ccbc"; + sha256 = "7503d05882970abc977529ff5a4b81e79f62fd51b238fe306f72e13f57a522ca"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix index f33df1fdbe8..5a414388c4c 100644 --- a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix +++ b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix @@ -23,8 +23,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "azure.synapse.artifacts" ]; meta = with lib; { - description = "CHANGE"; - homepage = "https://github.com/CHANGE/azure-synapse-artifacts/"; + description = "Microsoft Azure Synapse Artifacts Client Library for Python"; + homepage = "https://github.com/Azure/azure-sdk-for-python"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; }; diff --git a/pkgs/development/python-modules/b2sdk/default.nix b/pkgs/development/python-modules/b2sdk/default.nix index da43f6e5690..cd695132d7a 100644 --- a/pkgs/development/python-modules/b2sdk/default.nix +++ b/pkgs/development/python-modules/b2sdk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools_scm, isPy27, pytestCheckHook +{ lib, buildPythonPackage, fetchPypi, setuptools_scm, isPy27, pytestCheckHook , requests, arrow, logfury, tqdm }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/babelfish/default.nix b/pkgs/development/python-modules/babelfish/default.nix index 5ac04429215..ba015f597ce 100644 --- a/pkgs/development/python-modules/babelfish/default.nix +++ b/pkgs/development/python-modules/babelfish/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools }: +{ lib, buildPythonPackage, fetchPypi, setuptools }: buildPythonPackage rec { pname = "babelfish"; diff --git a/pkgs/development/python-modules/babelgladeextractor/default.nix b/pkgs/development/python-modules/babelgladeextractor/default.nix index 0df03754127..b1516d1abdb 100644 --- a/pkgs/development/python-modules/babelgladeextractor/default.nix +++ b/pkgs/development/python-modules/babelgladeextractor/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , isPy3k , buildPythonPackage , fetchPypi diff --git a/pkgs/development/python-modules/backports-shutil-which/default.nix b/pkgs/development/python-modules/backports-shutil-which/default.nix index 5fe922b9046..52163abe8bc 100644 --- a/pkgs/development/python-modules/backports-shutil-which/default.nix +++ b/pkgs/development/python-modules/backports-shutil-which/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, pytest }: +{ lib, fetchPypi, buildPythonPackage, pytest }: buildPythonPackage rec { pname = "backports.shutil_which"; diff --git a/pkgs/development/python-modules/backports_csv/default.nix b/pkgs/development/python-modules/backports_csv/default.nix index 5216149ddc2..6086178c959 100644 --- a/pkgs/development/python-modules/backports_csv/default.nix +++ b/pkgs/development/python-modules/backports_csv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, future }: +{ lib, buildPythonPackage, fetchPypi, future }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/backports_os/default.nix b/pkgs/development/python-modules/backports_os/default.nix index b3e231bcd05..39973e433ee 100644 --- a/pkgs/development/python-modules/backports_os/default.nix +++ b/pkgs/development/python-modules/backports_os/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , setuptools_scm diff --git a/pkgs/development/python-modules/backports_unittest-mock/default.nix b/pkgs/development/python-modules/backports_unittest-mock/default.nix index 08f98de79f2..a9950eb704f 100644 --- a/pkgs/development/python-modules/backports_unittest-mock/default.nix +++ b/pkgs/development/python-modules/backports_unittest-mock/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools_scm, mock }: +{ lib, buildPythonPackage, fetchPypi, setuptools_scm, mock }: buildPythonPackage rec { pname = "backports.unittest_mock"; diff --git a/pkgs/development/python-modules/backports_weakref/default.nix b/pkgs/development/python-modules/backports_weakref/default.nix index 9770fb45981..c04b88a3f32 100644 --- a/pkgs/development/python-modules/backports_weakref/default.nix +++ b/pkgs/development/python-modules/backports_weakref/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , setuptools_scm diff --git a/pkgs/development/python-modules/bacpypes/default.nix b/pkgs/development/python-modules/bacpypes/default.nix index 59542e61c56..f07c5e90d51 100644 --- a/pkgs/development/python-modules/bacpypes/default.nix +++ b/pkgs/development/python-modules/bacpypes/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, fetchFromGitHub +{ lib, buildPythonPackage, fetchPypi, fetchFromGitHub , wheel, pytestCheckHook, pytestrunner }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/bap/default.nix b/pkgs/development/python-modules/bap/default.nix index d2575afb77d..03abf67f86a 100644 --- a/pkgs/development/python-modules/bap/default.nix +++ b/pkgs/development/python-modules/bap/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, buildPythonPackage, fetchFromGitHub, bap, requests}: +{lib, buildPythonPackage, fetchFromGitHub, bap, requests}: buildPythonPackage rec { pname = "bap"; diff --git a/pkgs/development/python-modules/base36/default.nix b/pkgs/development/python-modules/base36/default.nix new file mode 100644 index 00000000000..348422e31fa --- /dev/null +++ b/pkgs/development/python-modules/base36/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "base36"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "tonyseek"; + repo = "python-base36"; + rev = "v${version}"; + sha256 = "076nmk9s0zkmgs2zqzkaqij5cmzhf4mrhivbb9n6cvz52i1mppr5"; + }; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "[pytest]" "[tool:pytest]" \ + --replace "--pep8 --cov" "" + ''; + + checkInputs = [ pytestCheckHook ]; + + pytestFlagsArray = [ "test_base36.py" ]; + pythonImportsCheck = [ "base36" ]; + + meta = with lib; { + description = "Python implementation for the positional numeral system using 36 as the radix"; + homepage = "https://github.com/tonyseek/python-base36"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/base58/default.nix b/pkgs/development/python-modules/base58/default.nix index a36727429ca..1e1da32f6c9 100644 --- a/pkgs/development/python-modules/base58/default.nix +++ b/pkgs/development/python-modules/base58/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, isPy27, pytest, pyhamcrest }: +{ lib, fetchPypi, buildPythonPackage, isPy27, pytest, pyhamcrest }: buildPythonPackage rec { pname = "base58"; diff --git a/pkgs/development/python-modules/basemap/default.nix b/pkgs/development/python-modules/basemap/default.nix index c97548bdee8..2fadda388ba 100644 --- a/pkgs/development/python-modules/basemap/default.nix +++ b/pkgs/development/python-modules/basemap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , numpy diff --git a/pkgs/development/python-modules/bash_kernel/default.nix b/pkgs/development/python-modules/bash_kernel/default.nix index 9ac72a21fa7..ba4672a1774 100644 --- a/pkgs/development/python-modules/bash_kernel/default.nix +++ b/pkgs/development/python-modules/bash_kernel/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "bash_kernel"; - version = "0.7.1"; + version = "0.7.2"; format = "flit"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1s2kc7m52kq28b4j1q3456g5ani6nmq4n0rpbqi3yvh7ks0rby19"; + sha256 = "0w0nbr3iqqsgpk83rgd0f5b02462bkyj2n0h6i9dwyc1vpnq9350"; }; patches = [ diff --git a/pkgs/development/python-modules/batinfo/default.nix b/pkgs/development/python-modules/batinfo/default.nix index 0ed3486272d..17d28c12914 100644 --- a/pkgs/development/python-modules/batinfo/default.nix +++ b/pkgs/development/python-modules/batinfo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "batinfo"; diff --git a/pkgs/development/python-modules/bayespy/default.nix b/pkgs/development/python-modules/bayespy/default.nix index b470d21b1be..6ebe9919ec9 100644 --- a/pkgs/development/python-modules/bayespy/default.nix +++ b/pkgs/development/python-modules/bayespy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder +{ lib, buildPythonPackage, fetchPypi, pythonOlder , pytest, nose, glibcLocales , numpy, scipy, matplotlib, h5py }: diff --git a/pkgs/development/python-modules/bc-python-hcl2/default.nix b/pkgs/development/python-modules/bc-python-hcl2/default.nix new file mode 100644 index 00000000000..34eab21bf5d --- /dev/null +++ b/pkgs/development/python-modules/bc-python-hcl2/default.nix @@ -0,0 +1,49 @@ +{ lib, buildPythonPackage, fetchPypi, nose }: + +let + lark-parser = buildPythonPackage rec { + pname = "lark-parser"; + version = "0.7.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "JiFeuxV+b7LudDGapERbnzt+RW4mviFc4Z/aqpAcIKQ="; + }; + + doCheck = true; + }; +in +buildPythonPackage rec { + pname = "bc-python-hcl2"; + version = "0.3.11"; + + src = fetchPypi { + inherit pname version; + sha256 = "VZhI1oJ2EDZGyz3iI6/KYvJq4BGafzR+rcSgHqlUDrA="; + }; + + # Nose is required during build process, so can not use `checkInputs`. + buildInputs = [ + nose + ]; + + propagatedBuildInputs = [ + lark-parser + ]; + + pythonImportsCheck = [ "hcl2" ]; + + meta = with lib; { + description = "A parser for HCL2 written in Python using Lark"; + longDescription = '' + A parser for HCL2 written in Python using Lark. + This parser only supports HCL2 and isn't backwards compatible with HCL v1. + It can be used to parse any HCL2 config file such as Terraform. + ''; + # Although this is the main homepage from PyPi but it is also a homepage + # of another PyPi package (python-hcl2). But these two are different. + homepage = "https://github.com/amplify-education/python-hcl2"; + license = licenses.mit; + maintainers = [ maintainers.anhdle14 ]; + }; +} diff --git a/pkgs/development/python-modules/bcdoc/default.nix b/pkgs/development/python-modules/bcdoc/default.nix index 185fcb86b0b..29c267aa45f 100644 --- a/pkgs/development/python-modules/bcdoc/default.nix +++ b/pkgs/development/python-modules/bcdoc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, docutils, six }: +{ lib, buildPythonPackage, fetchPypi, docutils, six }: buildPythonPackage rec { pname = "bcdoc"; diff --git a/pkgs/development/python-modules/bcrypt/3_1.nix b/pkgs/development/python-modules/bcrypt/3_1.nix index c70161cf28b..df57eb3cd0c 100644 --- a/pkgs/development/python-modules/bcrypt/3_1.nix +++ b/pkgs/development/python-modules/bcrypt/3_1.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , isPyPy, cffi, pytest, six }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/bcrypt/default.nix b/pkgs/development/python-modules/bcrypt/default.nix index dc50c56018e..cfd17262a2b 100644 --- a/pkgs/development/python-modules/bcrypt/default.nix +++ b/pkgs/development/python-modules/bcrypt/default.nix @@ -1,8 +1,6 @@ -{ stdenv, buildPythonPackage, isPyPy, fetchPypi, pythonOlder +{ lib, buildPythonPackage, isPyPy, fetchPypi, pythonOlder , cffi, pycparser, mock, pytest, py, six }: -with stdenv.lib; - buildPythonPackage rec { version = "3.2.0"; pname = "bcrypt"; @@ -12,10 +10,12 @@ buildPythonPackage rec { inherit pname version; sha256 = "5b93c1726e50a93a033c36e5ca7fdcd29a5c7395af50a6892f5d9e7c6cfbfb29"; }; + buildInputs = [ pycparser mock pytest py ]; - propagatedBuildInputs = [ six ] ++ optional (!isPyPy) cffi; - meta = { + propagatedBuildInputs = [ six ] ++ lib.optional (!isPyPy) cffi; + + meta = with lib; { maintainers = with maintainers; [ domenkozar ]; description = "Modern password hashing for your software and your servers"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix index f1dc7a5349d..e4a6a5f5625 100644 --- a/pkgs/development/python-modules/beancount/default.nix +++ b/pkgs/development/python-modules/beancount/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k +{ lib, buildPythonPackage, fetchPypi, isPy3k , beautifulsoup4, bottle, chardet, dateutil , google_api_python_client, lxml, oauth2client , ply, python_magic, pytest, requests }: @@ -33,7 +33,7 @@ buildPythonPackage rec { pytest ]; - meta = { + meta = with lib; { homepage = "http://furius.ca/beancount/"; description = "Double-entry bookkeeping computer language"; longDescription = '' @@ -41,8 +41,8 @@ buildPythonPackage rec { financial transaction records in a text file, read them in memory, generate a variety of reports from them, and provides a web interface. ''; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ ]; + license = licenses.gpl2; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/beanstalkc/default.nix b/pkgs/development/python-modules/beanstalkc/default.nix index c24e9a03d15..ffdb2f6f8f2 100644 --- a/pkgs/development/python-modules/beanstalkc/default.nix +++ b/pkgs/development/python-modules/beanstalkc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildPythonPackage }: +{ lib, fetchFromGitHub, buildPythonPackage }: buildPythonPackage rec { pname = "beanstalkc"; @@ -13,10 +13,10 @@ buildPythonPackage rec { doCheck = false; - meta = { + meta = with lib; { description = "A simple beanstalkd client library for Python"; - maintainers = with stdenv.lib.maintainers; [ aanderse ]; - license = with stdenv.lib.licenses; [ asl20 ]; + maintainers = with maintainers; [ aanderse ]; + license = licenses.asl20; homepage = "https://github.com/earl/beanstalkc"; }; } diff --git a/pkgs/development/python-modules/beautifulsoup4/default.nix b/pkgs/development/python-modules/beautifulsoup4/default.nix index 555669da243..b00c03a09c1 100644 --- a/pkgs/development/python-modules/beautifulsoup4/default.nix +++ b/pkgs/development/python-modules/beautifulsoup4/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, soupsieve, pytest, python }: +{ lib, buildPythonPackage, fetchPypi, soupsieve, pytest, python }: buildPythonPackage rec { pname = "beautifulsoup4"; diff --git a/pkgs/development/python-modules/bedup/default.nix b/pkgs/development/python-modules/bedup/default.nix index 0e339dca097..454a972f177 100644 --- a/pkgs/development/python-modules/bedup/default.nix +++ b/pkgs/development/python-modules/bedup/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , btrfs-progs @@ -25,7 +25,7 @@ buildPythonPackage rec { buildInputs = [ btrfs-progs ]; propagatedBuildInputs = [ contextlib2 pyxdg pycparser alembic ] - ++ stdenv.lib.optionals (!isPyPy) [ cffi ]; + ++ lib.optionals (!isPyPy) [ cffi ]; meta = with lib; { description = "Deduplication for Btrfs"; diff --git a/pkgs/development/python-modules/behave/default.nix b/pkgs/development/python-modules/behave/default.nix index 56217dca617..43c74fc9571 100644 --- a/pkgs/development/python-modules/behave/default.nix +++ b/pkgs/development/python-modules/behave/default.nix @@ -26,7 +26,7 @@ buildPythonApplication rec { # timing-based test flaky on Darwin # https://github.com/NixOS/nixpkgs/pull/97737#issuecomment-691489824 - disabledTests = stdenv.lib.optionals stdenv.isDarwin [ "test_step_decorator_async_run_until_complete" ]; + disabledTests = lib.optionals stdenv.isDarwin [ "test_step_decorator_async_run_until_complete" ]; postCheck = '' export LANG="en_US.UTF-8" diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index 614a1ad98a9..d47c5d716a7 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -1,26 +1,27 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchFromGitHub , click, click-log, pure-pcapy3 -, pyserial, pyserial-asyncio, voluptuous, zigpy -, asynctest, pytest, pytest-asyncio }: +, pyserial-asyncio, voluptuous, zigpy +, asynctest, pytestCheckHook, pytest-asyncio }: -let +buildPythonPackage rec { pname = "bellows"; version = "0.21.0"; -in buildPythonPackage rec { - inherit pname version; - - src = fetchPypi { - inherit pname version; - sha256 = "fd2ac40c1f3550580dc561ae58d7d15cfa12e6a7cc5d35ee80e7a1cb6a4cda4f"; + src = fetchFromGitHub { + owner = "zigpy"; + repo = "bellows"; + rev = version; + sha256 = "1gja7cb1cyzbi19k8awa2gyc3bjam0adapalpk5slxny0vxlc73a"; }; propagatedBuildInputs = [ - click click-log pure-pcapy3 pyserial pyserial-asyncio voluptuous zigpy + click click-log pure-pcapy3 pyserial-asyncio voluptuous zigpy ]; checkInputs = [ - asynctest pytest pytest-asyncio + asynctest + pytestCheckHook + pytest-asyncio ]; prePatch = '' diff --git a/pkgs/development/python-modules/bespon/default.nix b/pkgs/development/python-modules/bespon/default.nix index 555a0a48758..599ad71b241 100644 --- a/pkgs/development/python-modules/bespon/default.nix +++ b/pkgs/development/python-modules/bespon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/betacode/default.nix b/pkgs/development/python-modules/betacode/default.nix index 8bd78fb49d2..79136e479d2 100644 --- a/pkgs/development/python-modules/betacode/default.nix +++ b/pkgs/development/python-modules/betacode/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { inherit pname version; sha256 = "0s84kd9vblbjz61q7zchx64a6hmdqb4lillna5ryh0g9ij76g6r5"; }; - preBuild = ''echo > README.rst''; + preBuild = "echo > README.rst"; # setup.py uses a python3 os.path.join disabled = !isPy3k; propagatedBuildInputs = [ pygtrie ]; diff --git a/pkgs/development/python-modules/betamax-matchers/default.nix b/pkgs/development/python-modules/betamax-matchers/default.nix index 424b8ef4ef3..459d3c51d7e 100644 --- a/pkgs/development/python-modules/betamax-matchers/default.nix +++ b/pkgs/development/python-modules/betamax-matchers/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , betamax, requests_toolbelt }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/betamax-serializers/default.nix b/pkgs/development/python-modules/betamax-serializers/default.nix index 3d3cad4d95b..0ddc9845bfa 100644 --- a/pkgs/development/python-modules/betamax-serializers/default.nix +++ b/pkgs/development/python-modules/betamax-serializers/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , betamax, pyyaml }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/betamax/default.nix b/pkgs/development/python-modules/betamax/default.nix index 5e1469bfc52..5906a531f22 100644 --- a/pkgs/development/python-modules/betamax/default.nix +++ b/pkgs/development/python-modules/betamax/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, requests }: +{ lib, buildPythonPackage, fetchPypi, requests }: buildPythonPackage rec { pname = "betamax"; diff --git a/pkgs/development/python-modules/bidict/default.nix b/pkgs/development/python-modules/bidict/default.nix index 34b9f4cf5ff..dcb684a55e0 100644 --- a/pkgs/development/python-modules/bidict/default.nix +++ b/pkgs/development/python-modules/bidict/default.nix @@ -3,7 +3,7 @@ , sphinx , hypothesis , py -, pytest +, pytestCheckHook , pytest-benchmark , sortedcollections , sortedcontainers @@ -23,23 +23,14 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ sphinx ]; - # this can be removed >0.19.0 - postPatch = '' - substituteInPlace setup.py \ - --replace "setuptools_scm < 4" "setuptools_scm" - ''; - checkInputs = [ hypothesis py - pytest + pytestCheckHook pytest-benchmark sortedcollections sortedcontainers ]; - checkPhase = '' - pytest tests - ''; meta = with lib; { homepage = "https://github.com/jab/bidict"; diff --git a/pkgs/development/python-modules/bids-validator/default.nix b/pkgs/development/python-modules/bids-validator/default.nix index 22807bb3535..ab12f409750 100644 --- a/pkgs/development/python-modules/bids-validator/default.nix +++ b/pkgs/development/python-modules/bids-validator/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "1.5.8"; + version = "1.5.10"; pname = "bids-validator"; src = fetchPypi { inherit pname version; - sha256 = "5b8c3b9047d2e00e25746d55f56f62071f0a82dd2de59371a1ee589fe28b2852"; + sha256 = "ae421596b6b69670bd5a4ed3e586c6147e04448704b14b0705fd2bfe03d16b41"; }; # needs packages which are not available in nixpkgs diff --git a/pkgs/development/python-modules/billiard/default.nix b/pkgs/development/python-modules/billiard/default.nix index 4f8aa3565da..2d4eabf215e 100644 --- a/pkgs/development/python-modules/billiard/default.nix +++ b/pkgs/development/python-modules/billiard/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPyPy, pytestCheckHook, case, psutil, fetchpatch }: +{ lib, buildPythonPackage, fetchPypi, isPyPy, pytestCheckHook, case, psutil, fetchpatch }: buildPythonPackage rec { pname = "billiard"; diff --git a/pkgs/development/python-modules/binho-host-adapter/default.nix b/pkgs/development/python-modules/binho-host-adapter/default.nix new file mode 100644 index 00000000000..2249a28a554 --- /dev/null +++ b/pkgs/development/python-modules/binho-host-adapter/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pyserial +}: + +buildPythonPackage rec { + pname = "binho-host-adapter"; + version = "0.1.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "0mp8xa1qwaww2k5g2nqg7mcivzsbfw2ny1l9yjsi73109slafv8y"; + }; + + propagatedBuildInputs = [ pyserial ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "binhoHostAdapter" ]; + + meta = with lib; { + description = "Python library for Binho Multi-Protocol USB Host Adapters"; + homepage = "https://github.com/adafruit/Adafruit_Python_PlatformDetect"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/binwalk/default.nix b/pkgs/development/python-modules/binwalk/default.nix index 3d1b9c0a90c..74d79bd677b 100644 --- a/pkgs/development/python-modules/binwalk/default.nix +++ b/pkgs/development/python-modules/binwalk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , zlib @@ -17,10 +17,10 @@ , matplotlib , nose , pycrypto -, pyqtgraph ? null }: +, pyqtgraph +, visualizationSupport ? false }: let - visualizationSupport = (pyqtgraph != null) && (matplotlib != null); version = "2.2.0"; in buildPythonPackage { @@ -35,7 +35,7 @@ buildPythonPackage { }; propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract cramfsswap cramfsprogs sasquatch squashfsTools lzma pycrypto ] - ++ stdenv.lib.optionals visualizationSupport [ matplotlib pyqtgraph ]; + ++ lib.optionals visualizationSupport [ matplotlib pyqtgraph ]; # setup.py only installs version.py during install, not test postPatch = '' diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index 08e81476ba6..2f98f3917b8 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "bitarray"; - version = "1.6.1"; + version = "1.6.3"; src = fetchPypi { inherit pname version; - sha256 = "ab85b38365dd9956264226b30dababa02161ed49bb36c7ee82cc6545e07b1599"; + sha256 = "ae27ce4bef4f35b4cc2c0b0d9cf02ed49eee567c23d70cb5066ad215f9b62b3c"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/bitbox02/default.nix b/pkgs/development/python-modules/bitbox02/default.nix index e9cf4b36a49..ce62fd6dce0 100644 --- a/pkgs/development/python-modules/bitbox02/default.nix +++ b/pkgs/development/python-modules/bitbox02/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "bitbox02"; - version = "5.1.0"; + version = "5.2.0"; src = fetchPypi { inherit pname version; - sha256 = "0hnjjjarr4q22wh03zyyqfhsizzsvg46030kks3qkzbsv29vqqh5"; + sha256 = "52b0b617660601939b30c8b588c28910946448b1b6d69ca231d5e3e47a322b71"; }; propagatedBuildInputs = [ base58 ecdsa hidapi noiseprotocol protobuf semver typing-extensions ]; diff --git a/pkgs/development/python-modules/bitbucket-api/default.nix b/pkgs/development/python-modules/bitbucket-api/default.nix index 559661bbb4f..b874f1af525 100644 --- a/pkgs/development/python-modules/bitbucket-api/default.nix +++ b/pkgs/development/python-modules/bitbucket-api/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k +{ lib, buildPythonPackage, fetchPypi, isPy3k , requests_oauthlib, nose, sh }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/bitbucket-cli/default.nix b/pkgs/development/python-modules/bitbucket-cli/default.nix index 50075fe70fc..bb1fa1d6c17 100644 --- a/pkgs/development/python-modules/bitbucket-cli/default.nix +++ b/pkgs/development/python-modules/bitbucket-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, requests }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, requests }: buildPythonPackage rec { pname = "bitbucket-cli"; diff --git a/pkgs/development/python-modules/bitmath/default.nix b/pkgs/development/python-modules/bitmath/default.nix index 49992c561f7..5643ea29bc2 100644 --- a/pkgs/development/python-modules/bitmath/default.nix +++ b/pkgs/development/python-modules/bitmath/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, progressbar231, progressbar33, mock }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, progressbar231, progressbar33, mock }: buildPythonPackage rec { pname = "bitmath"; diff --git a/pkgs/development/python-modules/bitstring/default.nix b/pkgs/development/python-modules/bitstring/default.nix index d6eaf31056f..ed67f2be5c5 100644 --- a/pkgs/development/python-modules/bitstring/default.nix +++ b/pkgs/development/python-modules/bitstring/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "bitstring"; diff --git a/pkgs/development/python-modules/bjoern/default.nix b/pkgs/development/python-modules/bjoern/default.nix index 2949ecbf6f9..ef599d89be2 100644 --- a/pkgs/development/python-modules/bjoern/default.nix +++ b/pkgs/development/python-modules/bjoern/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, libev, python }: +{ lib, buildPythonPackage, fetchPypi, libev, python }: buildPythonPackage rec { pname = "bjoern"; diff --git a/pkgs/development/python-modules/black-macchiato/default.nix b/pkgs/development/python-modules/black-macchiato/default.nix index 536ad1f14b6..80aed4e6fef 100644 --- a/pkgs/development/python-modules/black-macchiato/default.nix +++ b/pkgs/development/python-modules/black-macchiato/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, diff --git a/pkgs/development/python-modules/bleak/default.nix b/pkgs/development/python-modules/bleak/default.nix index 06dc3217dc8..38390e8377e 100644 --- a/pkgs/development/python-modules/bleak/default.nix +++ b/pkgs/development/python-modules/bleak/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, isPy3k, fetchPypi, bluez, txdbus, pytest, pytestcov }: +{ lib, buildPythonPackage, isPy3k, fetchPypi, bluez, txdbus, pytest, pytestcov }: buildPythonPackage rec { pname = "bleak"; diff --git a/pkgs/development/python-modules/blessed/default.nix b/pkgs/development/python-modules/blessed/default.nix index 7adacecc647..f0167625cf6 100644 --- a/pkgs/development/python-modules/blessed/default.nix +++ b/pkgs/development/python-modules/blessed/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, six +{ lib, buildPythonPackage, fetchPypi, fetchpatch, six , wcwidth, pytest, mock, glibcLocales }: diff --git a/pkgs/development/python-modules/blessings/default.nix b/pkgs/development/python-modules/blessings/default.nix index 5263a92ec3d..00b7fd9a63d 100644 --- a/pkgs/development/python-modules/blessings/default.nix +++ b/pkgs/development/python-modules/blessings/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/pkgs/development/python-modules/blinker/default.nix b/pkgs/development/python-modules/blinker/default.nix index e33ad162631..5591113ab0a 100644 --- a/pkgs/development/python-modules/blinker/default.nix +++ b/pkgs/development/python-modules/blinker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "blinker"; diff --git a/pkgs/development/python-modules/blis/default.nix b/pkgs/development/python-modules/blis/default.nix index eeb62e8fed3..5d292c93fbb 100644 --- a/pkgs/development/python-modules/blis/default.nix +++ b/pkgs/development/python-modules/blis/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , cython @@ -35,6 +35,5 @@ buildPythonPackage rec { homepage = "https://github.com/explosion/cython-blis"; license = licenses.bsd3; platforms = platforms.x86_64; - maintainers = with maintainers; [ danieldk ]; }; } diff --git a/pkgs/development/python-modules/blist/default.nix b/pkgs/development/python-modules/blist/default.nix index 505f01af5fe..d4dcb54c5cd 100644 --- a/pkgs/development/python-modules/blist/default.nix +++ b/pkgs/development/python-modules/blist/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchpatch , fetchPypi diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix index 94abc39fd28..fd97fa20648 100644 --- a/pkgs/development/python-modules/blivet/default.nix +++ b/pkgs/development/python-modules/blivet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonPackage, pykickstart, pyparted, pyblock +{ lib, fetchFromGitHub, buildPythonPackage, pykickstart, pyparted, pyblock , pyudev, six, libselinux, multipath-tools, lsof, util-linux }: diff --git a/pkgs/development/python-modules/block-io/default.nix b/pkgs/development/python-modules/block-io/default.nix index 3a9704d71bc..b823b8711a5 100644 --- a/pkgs/development/python-modules/block-io/default.nix +++ b/pkgs/development/python-modules/block-io/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, base58, ecdsa, pycryptodome, requests, six, setuptools }: +{ lib, fetchPypi, buildPythonPackage, base58, ecdsa, pycryptodome, requests, six, setuptools }: buildPythonPackage rec { pname = "block-io"; diff --git a/pkgs/development/python-modules/blockdiag/default.nix b/pkgs/development/python-modules/blockdiag/default.nix index 5adc854d026..f5d8b93c481 100644 --- a/pkgs/development/python-modules/blockdiag/default.nix +++ b/pkgs/development/python-modules/blockdiag/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchFromGitHub , setuptools, funcparserlib, pillow, webcolors, reportlab, docutils }: diff --git a/pkgs/development/python-modules/bluepy-devices/default.nix b/pkgs/development/python-modules/bluepy-devices/default.nix new file mode 100644 index 00000000000..c1baeedcb5e --- /dev/null +++ b/pkgs/development/python-modules/bluepy-devices/default.nix @@ -0,0 +1,29 @@ +{ lib +, bluepy +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "bluepy-devices"; + version = "0.2.1"; + + src = fetchPypi { + pname = "bluepy_devices"; + inherit version; + sha256 = "02zzzivxq2vifgs65m2rm8pqlsbzsbc419c032irzvfxjx539mr8"; + }; + + propagatedBuildInputs = [ bluepy ]; + + # Project has no test + doCheck = false; + pythonImportsCheck = [ "bluepy_devices" ]; + + meta = with lib; { + description = "Python BTLE Device Interface for bluepy"; + homepage = "https://github.com/bimbar/bluepy_devices"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/bluepy/default.nix b/pkgs/development/python-modules/bluepy/default.nix index d833d20934d..11930050ba3 100644 --- a/pkgs/development/python-modules/bluepy/default.nix +++ b/pkgs/development/python-modules/bluepy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pkg-config diff --git a/pkgs/development/python-modules/boltons/default.nix b/pkgs/development/python-modules/boltons/default.nix index 13e264340da..f4842981c4a 100644 --- a/pkgs/development/python-modules/boltons/default.nix +++ b/pkgs/development/python-modules/boltons/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pytest }: +{ lib, buildPythonPackage, fetchFromGitHub, pytest }: buildPythonPackage rec { pname = "boltons"; diff --git a/pkgs/development/python-modules/boltztrap2/default.nix b/pkgs/development/python-modules/boltztrap2/default.nix index 48bc53bbeed..f80a8deb9ab 100644 --- a/pkgs/development/python-modules/boltztrap2/default.nix +++ b/pkgs/development/python-modules/boltztrap2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , spglib diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix index 690c88b83f4..5a6333d656a 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python, fetchPypi, makeWrapper, unzip, makeSetupHook +{ lib, stdenv, python, fetchPypi, makeWrapper, unzip, makeSetupHook , pipInstallHook , setuptoolsBuildHook , wheel, pip, setuptools @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { buildPhase = ":"; - installPhase = stdenv.lib.strings.optionalString (!stdenv.hostPlatform.isWindows) '' + installPhase = lib.strings.optionalString (!stdenv.hostPlatform.isWindows) '' export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0 '' + '' # Give folders a known name @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { meta = { description = "Version of pip used for bootstrapping"; - license = stdenv.lib.unique (pip.meta.license ++ setuptools.meta.license ++ wheel.meta.license); + license = lib.unique (pip.meta.license ++ setuptools.meta.license ++ wheel.meta.license); homepage = pip.meta.homepage; }; } diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index d4bcb9381e8..1baabf69203 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.16.51"; # N.B: if you change this, change botocore too + version = "1.16.63"; # N.B: if you change this, change botocore too src = fetchPypi { inherit pname version; - sha256 = "sha256-EdxJJoLPKk+P85ewoQmDc0Dvk+d8ouZXFc4k7PBDcXw="; + sha256 = "sha256-yRnayXcxFQJeHip+Ri9gygguMiu29DVCR1I+QiYTOws="; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 8e4812e868e..47585feac98 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.19.51"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.19.63"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-sgTFtHewQ8f2HLpdtHnGsl9oT3QJtxqOzbWms/V7XLQ="; + sha256 = "sha256-02lPbvkY3vgIJRPl7zCc1s2DthLpmE46ZuityYxlCpI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bottle/default.nix b/pkgs/development/python-modules/bottle/default.nix index 213d69dd989..eeaf34a44eb 100644 --- a/pkgs/development/python-modules/bottle/default.nix +++ b/pkgs/development/python-modules/bottle/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools }: +{ lib, buildPythonPackage, fetchPypi, setuptools }: buildPythonPackage rec { pname = "bottle"; diff --git a/pkgs/development/python-modules/box2d/default.nix b/pkgs/development/python-modules/box2d/default.nix index 92ac90ab6d4..e6f6a390f37 100644 --- a/pkgs/development/python-modules/box2d/default.nix +++ b/pkgs/development/python-modules/box2d/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , swig2 diff --git a/pkgs/development/python-modules/bpython/default.nix b/pkgs/development/python-modules/bpython/default.nix index 108d8ec0c66..8a37ed0bd97 100644 --- a/pkgs/development/python-modules/bpython/default.nix +++ b/pkgs/development/python-modules/bpython/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , curtsies diff --git a/pkgs/development/python-modules/braintree/default.nix b/pkgs/development/python-modules/braintree/default.nix index 7eba4743f0f..7ad0b5604fc 100644 --- a/pkgs/development/python-modules/braintree/default.nix +++ b/pkgs/development/python-modules/braintree/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "braintree"; - version = "4.5.0"; + version = "4.6.0"; src = fetchPypi { inherit pname version; - sha256 = "98b9775e3d5f793c0a47df6b3649cd175705ee2d9163f7853e8c73acec7b923f"; + sha256 = "ef19892f99fa497c90684db6d41442e94b2d3b0ed00afe2c574e46d89cb9a89c"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/bravado-core/default.nix b/pkgs/development/python-modules/bravado-core/default.nix index 55a12009a15..8c65cca07b2 100644 --- a/pkgs/development/python-modules/bravado-core/default.nix +++ b/pkgs/development/python-modules/bravado-core/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pytest-benchmark ]; - checkPhase = ''pytest --benchmark-skip''; + checkPhase = "pytest --benchmark-skip"; propagatedBuildInputs = [ python-dateutil diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix index e283c9ee6be..29de26ac495 100644 --- a/pkgs/development/python-modules/breathe/default.nix +++ b/pkgs/development/python-modules/breathe/default.nix @@ -1,13 +1,13 @@ { lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k, isPy27 }: buildPythonPackage rec { - version = "4.25.1"; + version = "4.26.1"; pname = "breathe"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "bf81658ed31f8f586247d203923479fcde6c3797d376c804bdafa7e56ffd43b5"; + sha256 = "f59ecadebbb76e3b4710e8c9d2f8f98d51e54701930a38ddf732930653dcf6b5"; }; propagatedBuildInputs = [ docutils six sphinx ]; diff --git a/pkgs/development/python-modules/brottsplatskartan/default.nix b/pkgs/development/python-modules/brottsplatskartan/default.nix new file mode 100644 index 00000000000..8daf79f208d --- /dev/null +++ b/pkgs/development/python-modules/brottsplatskartan/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytest-cov +, pytestCheckHook +, requests +}: + +buildPythonPackage rec { + pname = "brottsplatskartan"; + version = "1.0.5"; + + src = fetchFromGitHub { + owner = "chrillux"; + repo = pname; + rev = version; + sha256 = "07iwmnchvpw156j23yfccg4c32izbwm8b02bjr1xgmcwzbq21ks9"; + }; + + propagatedBuildInputs = [ requests ]; + + checkInputs = [ + pytest-cov + pytestCheckHook + ]; + + pythonImportsCheck = [ "brottsplatskartan" ]; + + meta = with lib; { + description = "Python API wrapper for brottsplatskartan.se"; + homepage = "https://github.com/chrillux/brottsplatskartan"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/browser-cookie3/default.nix b/pkgs/development/python-modules/browser-cookie3/default.nix index ad8fe1c8a07..7b579a84ba1 100644 --- a/pkgs/development/python-modules/browser-cookie3/default.nix +++ b/pkgs/development/python-modules/browser-cookie3/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "browser-cookie3"; - version = "0.11.4"; + version = "0.12.0"; src = fetchPypi { inherit pname version; - sha256 = "3d140c6b651dbd8b8555aca6472557fcfda4dd93afc26ea3a200be922a843e2c"; + sha256 = "5f26422091ad0e97375d565f8fbacfaf314d0722db35c921635eab23686e4fc4"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/bsblan/default.nix b/pkgs/development/python-modules/bsblan/default.nix new file mode 100644 index 00000000000..f670bebc8ed --- /dev/null +++ b/pkgs/development/python-modules/bsblan/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, aresponses +, coverage +, mypy +, pytest-asyncio +, pytest-cov +, pytest-mock +, aiohttp +, attrs +, cattrs +, yarl +}: + +buildPythonPackage rec { + pname = "bsblan"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "liudger"; + repo = "python-bsblan"; + rev = "v.${version}"; + sha256 = "0vyg9vsrs34jahlav83qp2djv81p3ks31qz4qh46zdij2nx7l1fv"; + }; + + propagatedBuildInputs = [ + aiohttp + attrs + cattrs + yarl + ]; + + checkInputs = [ + aresponses + coverage + mypy + pytest-asyncio + pytest-cov + pytest-mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "bsblan" ]; + + meta = with lib; { + description = "Python client for BSB-Lan"; + homepage = "https://github.com/liudger/python-bsblan"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/bsddb3/default.nix b/pkgs/development/python-modules/bsddb3/default.nix index 9877a03a087..82459398ca7 100644 --- a/pkgs/development/python-modules/bsddb3/default.nix +++ b/pkgs/development/python-modules/bsddb3/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pkgs diff --git a/pkgs/development/python-modules/bsdiff4/default.nix b/pkgs/development/python-modules/bsdiff4/default.nix index f70f71c1a69..339e649c53a 100644 --- a/pkgs/development/python-modules/bsdiff4/default.nix +++ b/pkgs/development/python-modules/bsdiff4/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , aflplusplus diff --git a/pkgs/development/python-modules/bt-proximity/default.nix b/pkgs/development/python-modules/bt-proximity/default.nix index 209565fa21b..8ac1b977f39 100644 --- a/pkgs/development/python-modules/bt-proximity/default.nix +++ b/pkgs/development/python-modules/bt-proximity/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchFromGitHub , pybluez }: buildPythonPackage { diff --git a/pkgs/development/python-modules/btchip/default.nix b/pkgs/development/python-modules/btchip/default.nix index ebb14a77b56..3d206c829e8 100644 --- a/pkgs/development/python-modules/btchip/default.nix +++ b/pkgs/development/python-modules/btchip/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, hidapi, pyscard, ecdsa }: +{ lib, buildPythonPackage, fetchPypi, hidapi, pyscard, ecdsa }: buildPythonPackage rec { pname = "btchip-python"; diff --git a/pkgs/development/python-modules/btrees/default.nix b/pkgs/development/python-modules/btrees/default.nix index 471ba54215d..3da6852c54d 100644 --- a/pkgs/development/python-modules/btrees/default.nix +++ b/pkgs/development/python-modules/btrees/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchPypi , buildPythonPackage , persistent diff --git a/pkgs/development/python-modules/btrfs/default.nix b/pkgs/development/python-modules/btrfs/default.nix index 8ea93fe005e..adaf1f610e3 100644 --- a/pkgs/development/python-modules/btrfs/default.nix +++ b/pkgs/development/python-modules/btrfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/bugsnag/default.nix b/pkgs/development/python-modules/bugsnag/default.nix index 5e3b0b4e89f..33845368480 100644 --- a/pkgs/development/python-modules/bugsnag/default.nix +++ b/pkgs/development/python-modules/bugsnag/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonOlder diff --git a/pkgs/development/python-modules/bugwarrior/default.nix b/pkgs/development/python-modules/bugwarrior/default.nix index 3d27384efe1..c59d2196d20 100644 --- a/pkgs/development/python-modules/bugwarrior/default.nix +++ b/pkgs/development/python-modules/bugwarrior/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder, setuptools +{ lib, buildPythonPackage, fetchPypi, pythonOlder, setuptools , twiggy, requests, offtrac, bugzilla, taskw, dateutil, pytz, keyring, six , jinja2, pycurl, dogpile_cache, lockfile, click, pyxdg, future, jira }: diff --git a/pkgs/development/python-modules/bugz/default.nix b/pkgs/development/python-modules/bugz/default.nix index 5324a43e1b0..a57e957efe6 100644 --- a/pkgs/development/python-modules/bugz/default.nix +++ b/pkgs/development/python-modules/bugz/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub }: diff --git a/pkgs/development/python-modules/bugzilla/default.nix b/pkgs/development/python-modules/bugzilla/default.nix index fc122ecd233..365f3654298 100644 --- a/pkgs/development/python-modules/bugzilla/default.nix +++ b/pkgs/development/python-modules/bugzilla/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , pep8, coverage, logilab_common, requests }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/build/default.nix b/pkgs/development/python-modules/build/default.nix index 97a7f9a201b..46c3bea0b8c 100644 --- a/pkgs/development/python-modules/build/default.nix +++ b/pkgs/development/python-modules/build/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "build"; - version = "0.0.3.1"; + version = "0.1.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "757b5542168326b6f1898a1ce1131bb2cf306ee4c7e54e39c815c5be217ff87d"; + sha256 = "1d6m21lijwm04g50nwgsgj7x3vhblzw7jv05ah8psqgzk20bbch8"; }; nativeBuildInputs = [ @@ -39,8 +39,14 @@ buildPythonPackage rec { # No tests in archive doCheck = false; - meta = { - description = "A simple, correct PEP517 package builder"; - license = lib.licenses.mit; + meta = with lib; { + description = "Simple, correct PEP517 package builder"; + longDescription = '' + build will invoke the PEP 517 hooks to build a distribution package. It + is a simple build tool and does not perform any dependency management. + ''; + homepage = "https://github.com/pypa/build"; + maintainers = with maintainers; [ fab ]; + license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/buildout-nix/default.nix b/pkgs/development/python-modules/buildout-nix/default.nix index cf8b1382301..7f7afd67e7e 100644 --- a/pkgs/development/python-modules/buildout-nix/default.nix +++ b/pkgs/development/python-modules/buildout-nix/default.nix @@ -1,4 +1,4 @@ -{ fetchPypi, stdenv, buildPythonPackage }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "zc.buildout"; @@ -13,10 +13,10 @@ buildPythonPackage rec { postInstall = "mv $out/bin/buildout{,-nix}"; - meta = { + meta = with lib; { homepage = "http://www.buildout.org"; description = "A software build and configuration system"; - license = stdenv.lib.licenses.zpl21; - maintainers = [ stdenv.lib.maintainers.goibhniu ]; + license = licenses.zpl21; + maintainers = [ maintainers.goibhniu ]; }; } diff --git a/pkgs/development/python-modules/buildout/default.nix b/pkgs/development/python-modules/buildout/default.nix index 0751b284a78..a9fe66a37ea 100644 --- a/pkgs/development/python-modules/buildout/default.nix +++ b/pkgs/development/python-modules/buildout/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "zc.buildout"; diff --git a/pkgs/development/python-modules/bumps/default.nix b/pkgs/development/python-modules/bumps/default.nix index 05f082c747b..7e94bd55b28 100644 --- a/pkgs/development/python-modules/bumps/default.nix +++ b/pkgs/development/python-modules/bumps/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, six}: +{ lib, buildPythonPackage, fetchPypi, six}: buildPythonPackage rec { pname = "bumps"; diff --git a/pkgs/development/python-modules/bunch/default.nix b/pkgs/development/python-modules/bunch/default.nix index ce77085e4f7..2758ff5b418 100644 --- a/pkgs/development/python-modules/bunch/default.nix +++ b/pkgs/development/python-modules/bunch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "bunch"; diff --git a/pkgs/development/python-modules/bwapy/default.nix b/pkgs/development/python-modules/bwapy/default.nix index c736eb577d4..f6c926cf419 100644 --- a/pkgs/development/python-modules/bwapy/default.nix +++ b/pkgs/development/python-modules/bwapy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , pythonOlder , fetchPypi diff --git a/pkgs/development/python-modules/cachecontrol/default.nix b/pkgs/development/python-modules/cachecontrol/default.nix index 53b13ddb568..ba9b9022ac8 100644 --- a/pkgs/development/python-modules/cachecontrol/default.nix +++ b/pkgs/development/python-modules/cachecontrol/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , requests diff --git a/pkgs/development/python-modules/cached-property/default.nix b/pkgs/development/python-modules/cached-property/default.nix index d25e2e963dc..72bf870c37b 100644 --- a/pkgs/development/python-modules/cached-property/default.nix +++ b/pkgs/development/python-modules/cached-property/default.nix @@ -1,28 +1,25 @@ { lib , buildPythonPackage -, fetchFromGitHub -, pytest +, fetchPypi +, pytestCheckHook , freezegun }: buildPythonPackage rec { pname = "cached-property"; - version = "1.5.1"; + version = "1.5.2"; - # conftest.py is missing in PyPI tarball - src = fetchFromGitHub { - owner = "pydanny"; - repo = pname; - rev = version; - sha256 = "0xh0pwmiikx0il9nnfyf034ydmlw6992s0d209agd9j5d3s2k5q6"; + src = fetchPypi { + inherit pname version; + sha256 = "9fa5755838eecbb2d234c3aa390bd80fbd3ac6b6869109bfc1b499f7bd89a130"; }; - checkInputs = [ pytest freezegun ]; + checkInputs = [ pytestCheckHook freezegun ]; - # https://github.com/pydanny/cached-property/issues/131 - checkPhase = '' - py.test -k "not test_threads_ttl_expiry" - ''; + disabledTests = [ + # https://github.com/pydanny/cached-property/issues/131 + "test_threads_ttl_expiry" + ]; meta = { description = "A decorator for caching properties in classes"; diff --git a/pkgs/development/python-modules/cachelib/default.nix b/pkgs/development/python-modules/cachelib/default.nix index 503b546116e..154c67bb379 100644 --- a/pkgs/development/python-modules/cachelib/default.nix +++ b/pkgs/development/python-modules/cachelib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "cachelib"; diff --git a/pkgs/development/python-modules/cachetools/default.nix b/pkgs/development/python-modules/cachetools/default.nix index 6fd3f637875..120fd5df124 100644 --- a/pkgs/development/python-modules/cachetools/default.nix +++ b/pkgs/development/python-modules/cachetools/default.nix @@ -1,17 +1,28 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27 }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: buildPythonPackage rec { pname = "cachetools"; - version = "4.1.1"; + version = "4.2.1"; - src = fetchPypi { - inherit pname version; - sha256 = "bbaa39c3dede00175df2dc2b03d0cf18dd2d32a7de7beb68072d13043c9edb20"; + src = fetchFromGitHub { + owner = "tkem"; + repo = pname; + rev = "v${version}"; + sha256 = "1b662ph8m2d05d2vi3izgnr6v7h9zfvscfsaaw8nhdmmm15ivfa6"; }; + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "cachetools" ]; + meta = with lib; { description = "Extensible memoizing collections and decorators"; homepage = "https://github.com/tkem/cachetools"; - license = licenses.mit; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/cadquery/default.nix b/pkgs/development/python-modules/cadquery/default.nix index e1566baff6b..72334390bc3 100644 --- a/pkgs/development/python-modules/cadquery/default.nix +++ b/pkgs/development/python-modules/cadquery/default.nix @@ -48,7 +48,7 @@ let libGL libGLU libX11 - ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ]; + ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; propagatedBuildInputs = [ six diff --git a/pkgs/development/python-modules/cairosvg/1_x.nix b/pkgs/development/python-modules/cairosvg/1_x.nix index bb5629cf4e5..3e1a67f8282 100644 --- a/pkgs/development/python-modules/cairosvg/1_x.nix +++ b/pkgs/development/python-modules/cairosvg/1_x.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, cairocffi, nose, fontconfig +{ lib, buildPythonPackage, fetchFromGitHub, cairocffi, nose, fontconfig , cssselect2, defusedxml, pillow, tinycss2 }: # CairoSVG 2.x dropped support for Python 2 so offer CairoSVG 1.x as an diff --git a/pkgs/development/python-modules/cairosvg/default.nix b/pkgs/development/python-modules/cairosvg/default.nix index 9d1c54651c2..53f3ebc0c08 100644 --- a/pkgs/development/python-modules/cairosvg/default.nix +++ b/pkgs/development/python-modules/cairosvg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, fetchpatch +{ lib, buildPythonPackage, fetchPypi, isPy3k, fetchpatch , cairocffi, cssselect2, defusedxml, pillow, tinycss2 , pytest, pytestrunner, pytestcov, pytest-flake8, pytest-isort }: diff --git a/pkgs/development/python-modules/canonicaljson/default.nix b/pkgs/development/python-modules/canonicaljson/default.nix index 96af6f4bf78..4a4f56f5abf 100644 --- a/pkgs/development/python-modules/canonicaljson/default.nix +++ b/pkgs/development/python-modules/canonicaljson/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , frozendict, simplejson, six, isPy27 }: diff --git a/pkgs/development/python-modules/capstone/default.nix b/pkgs/development/python-modules/capstone/default.nix index 7d5e416a9c5..d7df0bee5ca 100644 --- a/pkgs/development/python-modules/capstone/default.nix +++ b/pkgs/development/python-modules/capstone/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "capstone"; - version = stdenv.lib.getVersion capstone; + version = lib.getVersion capstone; src = capstone.src; sourceRoot = "${capstone.name}/bindings/python"; diff --git a/pkgs/development/python-modules/capturer/default.nix b/pkgs/development/python-modules/capturer/default.nix index 821561c0555..0e8732f69a8 100644 --- a/pkgs/development/python-modules/capturer/default.nix +++ b/pkgs/development/python-modules/capturer/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, humanfriendly, pytest, pytestcov }: +{ stdenv, lib, buildPythonPackage, fetchFromGitHub, humanfriendly, pytestCheckHook, pytestcov }: buildPythonPackage rec { pname = "capturer"; @@ -13,10 +13,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ humanfriendly ]; - checkPhase = '' - PATH=$PATH:$out/bin pytest . - ''; - checkInputs = [ pytest ]; + # hangs on darwin + doCheck = !stdenv.isDarwin; + checkInputs = [ pytestCheckHook ]; meta = with lib; { description = "Easily capture stdout/stderr of the current process and subprocesses"; diff --git a/pkgs/development/python-modules/carbon/default.nix b/pkgs/development/python-modules/carbon/default.nix index e0a31829b05..b651a654d5e 100644 --- a/pkgs/development/python-modules/carbon/default.nix +++ b/pkgs/development/python-modules/carbon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k +{ lib, buildPythonPackage, fetchPypi, isPy3k , twisted, whisper, txamqp, cachetools, urllib3 }: diff --git a/pkgs/development/python-modules/carrot/default.nix b/pkgs/development/python-modules/carrot/default.nix index c2262decd31..a772535ad82 100644 --- a/pkgs/development/python-modules/carrot/default.nix +++ b/pkgs/development/python-modules/carrot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , nose, amqplib, anyjson }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index 6633657d186..d1b795a9ef4 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "0.15.0"; + version = "0.16.0"; disabled = isPy27; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "v${version}"; - sha256 = "0w34xs9qpf1x4rq2ri4fhx3yi8h4inzavv9hjsx8mlkzid7gdx1b"; + sha256 = "1983p8pkbdj6yaclkdng7fn0pmlbz1yc75a4a847ppw47075ryph"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/case/default.nix b/pkgs/development/python-modules/case/default.nix index 5d1a7696516..3f95d9e22af 100644 --- a/pkgs/development/python-modules/case/default.nix +++ b/pkgs/development/python-modules/case/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , six, nose, unittest2, mock }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/cassandra-driver/default.nix b/pkgs/development/python-modules/cassandra-driver/default.nix index 32cf844cf00..55468ba0fdf 100644 --- a/pkgs/development/python-modules/cassandra-driver/default.nix +++ b/pkgs/development/python-modules/cassandra-driver/default.nix @@ -1,47 +1,85 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, python, pythonOlder +{ stdenv, lib, buildPythonPackage, fetchFromGitHub, python, pythonOlder , cython , eventlet , futures +, iana-etc +, geomet , libev , mock , nose -, pytest +, pytestCheckHook , pytz , pyyaml , scales , six , sure +, gremlinpython +, gevent +, twisted +, libredirect }: buildPythonPackage rec { pname = "cassandra-driver"; version = "3.24.0"; - src = fetchPypi { - inherit pname version; - sha256 = "83ec8d9a5827ee44bb1c0601a63696a8a9086beaf0151c8255556299246081bd"; + # pypi tarball doesn't include tests + src = fetchFromGitHub { + owner = "datastax"; + repo = "python-driver"; + rev = version; + sha256 = "1rr69hly5q810xpn8rkzxwzlq55wxxp7kwki9vfri3gh674d2wip"; }; nativeBuildInputs = [ cython ]; buildInputs = [ libev ]; - propagatedBuildInputs = [ six ] + propagatedBuildInputs = [ six geomet ] ++ lib.optionals (pythonOlder "3.4") [ futures ]; - checkInputs = [ eventlet mock nose pytest pytz pyyaml sure ]; - - # ignore test files which try to do socket.getprotocolname('tcp') - # as it fails in sandbox mode due to lack of a /etc/protocols file - checkPhase = '' - pytest tests/unit \ - --ignore=tests/unit/io/test_libevreactor.py \ - --ignore=tests/unit/io/test_eventletreactor.py \ - --ignore=tests/unit/io/test_asyncorereactor.py + # Make /etc/protocols accessible to allow socket.getprotobyname('tcp') in sandbox, + # also /etc/resolv.conf is referenced by some tests + preCheck = (lib.optionalString stdenv.isLinux '' + echo "nameserver 127.0.0.1" > resolv.conf + export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf) + export LD_PRELOAD=${libredirect}/lib/libredirect.so + '') + '' + # increase tolerance for time-based test + substituteInPlace tests/unit/io/utils.py --replace 'delta=.15' 'delta=.3' + ''; + postCheck = '' + unset NIX_REDIRECTS LD_PRELOAD ''; + checkInputs = [ + pytestCheckHook + eventlet + mock + nose + pytz + pyyaml + sure + scales + gremlinpython + gevent + twisted + ]; + + pytestFlagsArray = [ + "tests/unit" + # requires puresasl + "--ignore=tests/unit/advanced/test_auth.py" + ]; + disabledTests = [ + # doesn't seem to be intended to be run directly + "_PoolTests" + # attempts to make connection to localhost + "test_connection_initialization" + ]; + meta = with lib; { description = "A Python client driver for Apache Cassandra"; homepage = "http://datastax.github.io/python-driver"; license = licenses.asl20; - broken = true; # geomet doesn't exist + maintainers = with maintainers; [ turion ris ]; }; } diff --git a/pkgs/development/python-modules/casttube/default.nix b/pkgs/development/python-modules/casttube/default.nix index 85b1147c13a..9d29a013743 100644 --- a/pkgs/development/python-modules/casttube/default.nix +++ b/pkgs/development/python-modules/casttube/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, requests }: +{ lib, buildPythonPackage, fetchPypi, requests }: buildPythonPackage rec { pname = "casttube"; diff --git a/pkgs/development/python-modules/catalogue/default.nix b/pkgs/development/python-modules/catalogue/default.nix index c4cd89cab68..d07b7f29dc3 100644 --- a/pkgs/development/python-modules/catalogue/default.nix +++ b/pkgs/development/python-modules/catalogue/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonOlder @@ -26,6 +26,5 @@ buildPythonPackage rec { homepage = "https://github.com/explosion/catalogue"; changelog = "https://github.com/explosion/catalogue/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ danieldk ]; }; } diff --git a/pkgs/development/python-modules/catboost/default.nix b/pkgs/development/python-modules/catboost/default.nix new file mode 100644 index 00000000000..8c5184240f6 --- /dev/null +++ b/pkgs/development/python-modules/catboost/default.nix @@ -0,0 +1,56 @@ +{ buildPythonPackage, fetchFromGitHub, fetchpatch, lib, pythonOlder +, clang_7, python2 +, graphviz, matplotlib, numpy, pandas, plotly, scipy, six +, withCuda ? false, cudatoolkit }: + +buildPythonPackage rec { + pname = "catboost"; + version = "0.24.4"; + + disabled = pythonOlder "3.4"; + + src = fetchFromGitHub { + owner = "catboost"; + repo = "catboost"; + rev = "v${version}"; + sha256 = "sha256-pzmwEiKziB4ldnKgeCsP2HdnisX8sOkLssAzNfcSEx8="; + }; + + nativeBuildInputs = [ clang_7 python2 ]; + + propagatedBuildInputs = [ graphviz matplotlib numpy pandas scipy plotly six ] + ++ lib.optional withCuda [ cudatoolkit ]; + + patches = [ + ./nix-support.patch + (fetchpatch { + name = "format.patch"; + url = "https://github.com/catboost/catboost/pull/1528/commits/a692ba42e5c0f62e5da82b2f6fccfa77deb3419c.patch"; + sha256 = "sha256-fNGucHxsSDFRLk3hFH7rm+zzTdDpY9/QjRs8K+AzVvo="; + }) + ]; + + preBuild = '' + cd catboost/python-package + ''; + setupPyBuildFlags = [ "--with-ymake=no" ]; + CUDA_ROOT = lib.optional withCuda cudatoolkit; + enableParallelBuilding = true; + + # Tests use custom "ya" tool, not yet supported. + dontUseSetuptoolsCheck = true; + pythonImportsCheck = [ "catboost" ]; + + meta = with lib; { + description = "High-performance library for gradient boosting on decision trees."; + longDescription = '' + A fast, scalable, high performance Gradient Boosting on Decision Trees + library, used for ranking, classification, regression and other machine + learning tasks for Python, R, Java, C++. Supports computation on CPU and GPU. + ''; + license = licenses.asl20; + platforms = [ "x86_64-linux" ]; + homepage = "https://catboost.ai"; + maintainers = with maintainers; [ PlushBeaver ]; + }; +} diff --git a/pkgs/development/python-modules/catboost/nix-support.patch b/pkgs/development/python-modules/catboost/nix-support.patch new file mode 100644 index 00000000000..feaf97d5707 --- /dev/null +++ b/pkgs/development/python-modules/catboost/nix-support.patch @@ -0,0 +1,181 @@ +diff --git a/catboost/python-package/setup.py b/catboost/python-package/setup.py +index 17f1d8ff14..07da618cd1 100644 +--- a/catboost/python-package/setup.py ++++ b/catboost/python-package/setup.py +@@ -80,7 +80,7 @@ class Helper(object): + self.with_cuda = os.environ.get('CUDA_PATH') or os.environ.get('CUDA_ROOT') or None + self.os_sdk = 'local' + self.with_ymake = True +- self.parallel = None ++ self.parallel = os.environ.get('NIX_BUILD_CORES') or None + + def finalize_options(self): + if os.path.exists(str(self.with_cuda)): +@@ -222,11 +222,12 @@ class build_ext(_build_ext): + + def build_with_make(self, topsrc_dir, build_dir, catboost_ext, put_dir, verbose, dry_run): + logging.info('Buildling {} with gnu make'.format(catboost_ext)) +- makefile = 'python{}.{}CLANG50-LINUX-X86_64.makefile'.format(python_version()[0], 'CUDA.' if self.with_cuda else '') ++ makefile = 'python{}.{}CLANG7-LINUX-X86_64.makefile'.format(python_version()[0], 'CUDA.' if self.with_cuda else '') + make_cmd = [ + 'make', '-f', '../../make/' + makefile, +- 'CC=clang-5.0', +- 'CXX=clang++-5.0', ++ 'CC=clang', ++ 'CXX=clang++', ++ 'PYTHON=python2', + 'BUILD_ROOT=' + build_dir, + 'SOURCE_ROOT=' + topsrc_dir, + ] +diff --git a/make/python2.CLANG7-LINUX-X86_64.makefile b/make/python2.CLANG7-LINUX-X86_64.makefile +index e54b7078e8..fb7b208af9 100644 +--- a/make/python2.CLANG7-LINUX-X86_64.makefile ++++ b/make/python2.CLANG7-LINUX-X86_64.makefile +@@ -4,33 +4,6 @@ BUILD_ROOT = $(shell pwd) + SOURCE_ROOT = $(shell pwd) + PYTHON = $(shell which python) + +-ifneq ($(MAKECMDGOALS),help) +-define _CC_TEST +-__clang_major__ __clang_minor__ +-endef +- +-_CC_VERSION = $(shell echo '$(_CC_TEST)' | $(CC) -E -P -) +-$(info _CC_VERSION = '$(_CC_VERSION)') +- +-ifneq '$(_CC_VERSION)' '7 0' +- $(error clang 7.0 is required) +-endif +-endif +- +-ifneq ($(MAKECMDGOALS),help) +-define _CXX_TEST +-__clang_major__ __clang_minor__ +-endef +- +-_CXX_VERSION = $(shell echo '$(_CXX_TEST)' | $(CXX) -E -P -) +-$(info _CXX_VERSION = '$(_CXX_VERSION)') +- +-ifneq '$(_CXX_VERSION)' '7 0' +- $(error clang 7.0 is required) +-endif +-endif +- +- + all\ + ::\ + $(BUILD_ROOT)/catboost/python-package/catboost/_catboost.so\ +diff --git a/make/python2.CUDA.CLANG7-LINUX-X86_64.makefile b/make/python2.CUDA.CLANG7-LINUX-X86_64.makefile +index 2a22a79b25..522fb54a7c 100644 +--- a/make/python2.CUDA.CLANG7-LINUX-X86_64.makefile ++++ b/make/python2.CUDA.CLANG7-LINUX-X86_64.makefile +@@ -4,33 +4,6 @@ BUILD_ROOT = $(shell pwd) + SOURCE_ROOT = $(shell pwd) + PYTHON = $(shell which python) + +-ifneq ($(MAKECMDGOALS),help) +-define _CC_TEST +-__clang_major__ __clang_minor__ +-endef +- +-_CC_VERSION = $(shell echo '$(_CC_TEST)' | $(CC) -E -P -) +-$(info _CC_VERSION = '$(_CC_VERSION)') +- +-ifneq '$(_CC_VERSION)' '7 0' +- $(error clang 7.0 is required) +-endif +-endif +- +-ifneq ($(MAKECMDGOALS),help) +-define _CXX_TEST +-__clang_major__ __clang_minor__ +-endef +- +-_CXX_VERSION = $(shell echo '$(_CXX_TEST)' | $(CXX) -E -P -) +-$(info _CXX_VERSION = '$(_CXX_VERSION)') +- +-ifneq '$(_CXX_VERSION)' '7 0' +- $(error clang 7.0 is required) +-endif +-endif +- +- + all\ + ::\ + $(BUILD_ROOT)/catboost/python-package/catboost/_catboost.so\ +diff --git a/make/python3.CLANG7-LINUX-X86_64.makefile b/make/python3.CLANG7-LINUX-X86_64.makefile +index fee6750bcb..dc55908371 100644 +--- a/make/python3.CLANG7-LINUX-X86_64.makefile ++++ b/make/python3.CLANG7-LINUX-X86_64.makefile +@@ -4,33 +4,6 @@ BUILD_ROOT = $(shell pwd) + SOURCE_ROOT = $(shell pwd) + PYTHON = $(shell which python) + +-ifneq ($(MAKECMDGOALS),help) +-define _CC_TEST +-__clang_major__ __clang_minor__ +-endef +- +-_CC_VERSION = $(shell echo '$(_CC_TEST)' | $(CC) -E -P -) +-$(info _CC_VERSION = '$(_CC_VERSION)') +- +-ifneq '$(_CC_VERSION)' '7 0' +- $(error clang 7.0 is required) +-endif +-endif +- +-ifneq ($(MAKECMDGOALS),help) +-define _CXX_TEST +-__clang_major__ __clang_minor__ +-endef +- +-_CXX_VERSION = $(shell echo '$(_CXX_TEST)' | $(CXX) -E -P -) +-$(info _CXX_VERSION = '$(_CXX_VERSION)') +- +-ifneq '$(_CXX_VERSION)' '7 0' +- $(error clang 7.0 is required) +-endif +-endif +- +- + all\ + ::\ + $(BUILD_ROOT)/catboost/python-package/catboost/_catboost.so\ +diff --git a/make/python3.CUDA.CLANG7-LINUX-X86_64.makefile b/make/python3.CUDA.CLANG7-LINUX-X86_64.makefile +index 5146830476..ff8535b03e 100644 +--- a/make/python3.CUDA.CLANG7-LINUX-X86_64.makefile ++++ b/make/python3.CUDA.CLANG7-LINUX-X86_64.makefile +@@ -4,33 +4,6 @@ BUILD_ROOT = $(shell pwd) + SOURCE_ROOT = $(shell pwd) + PYTHON = $(shell which python) + +-ifneq ($(MAKECMDGOALS),help) +-define _CC_TEST +-__clang_major__ __clang_minor__ +-endef +- +-_CC_VERSION = $(shell echo '$(_CC_TEST)' | $(CC) -E -P -) +-$(info _CC_VERSION = '$(_CC_VERSION)') +- +-ifneq '$(_CC_VERSION)' '7 0' +- $(error clang 7.0 is required) +-endif +-endif +- +-ifneq ($(MAKECMDGOALS),help) +-define _CXX_TEST +-__clang_major__ __clang_minor__ +-endef +- +-_CXX_VERSION = $(shell echo '$(_CXX_TEST)' | $(CXX) -E -P -) +-$(info _CXX_VERSION = '$(_CXX_VERSION)') +- +-ifneq '$(_CXX_VERSION)' '7 0' +- $(error clang 7.0 is required) +-endif +-endif +- +- + all\ + ::\ + $(BUILD_ROOT)/catboost/python-package/catboost/_catboost.so\ diff --git a/pkgs/development/python-modules/cattrs/default.nix b/pkgs/development/python-modules/cattrs/default.nix new file mode 100644 index 00000000000..a48e29b827b --- /dev/null +++ b/pkgs/development/python-modules/cattrs/default.nix @@ -0,0 +1,35 @@ +{ lib +, attrs +, buildPythonPackage +, fetchFromGitHub +, hypothesis +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "cattrs"; + version = "1.1.2"; + + src = fetchFromGitHub { + owner = "Tinche"; + repo = pname; + rev = "v${version}"; + sha256 = "083d5mi6x7qcl26wlvwwn7gsp5chxlxkh4rp3a41w8cfwwr3h6l8"; + }; + + propagatedBuildInputs = [ attrs ]; + + checkInputs = [ + hypothesis + pytestCheckHook + ]; + + pythonImportsCheck = [ "cattr" ]; + + meta = with lib; { + description = "Python custom class converters for attrs"; + homepage = "https://github.com/Tinche/cattrs"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/cbor/default.nix b/pkgs/development/python-modules/cbor/default.nix index f081511265f..cc3d8914ad2 100644 --- a/pkgs/development/python-modules/cbor/default.nix +++ b/pkgs/development/python-modules/cbor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "cbor"; diff --git a/pkgs/development/python-modules/cbor2/default.nix b/pkgs/development/python-modules/cbor2/default.nix index 08503297d1f..f793ecfae37 100644 --- a/pkgs/development/python-modules/cbor2/default.nix +++ b/pkgs/development/python-modules/cbor2/default.nix @@ -1,4 +1,10 @@ -{ lib, buildPythonPackage, fetchPypi, pytest, pytestcov, setuptools_scm }: +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pytest-cov +, setuptools_scm +}: buildPythonPackage rec { pname = "cbor2"; @@ -10,12 +16,16 @@ buildPythonPackage rec { }; nativeBuildInputs = [ setuptools_scm ]; - checkInputs = [ pytest pytestcov ]; - checkPhase = "pytest"; + checkInputs = [ + pytest-cov + pytestCheckHook + ]; + + pythonImportsCheck = [ "cbor2" ]; meta = with lib; { - description = "Pure Python CBOR (de)serializer with extensive tag support"; + description = "Python CBOR (de)serializer with extensive tag support"; homepage = "https://github.com/agronholm/cbor2"; license = licenses.mit; maintainers = with maintainers; [ taneb ]; diff --git a/pkgs/development/python-modules/cccolutils/default.nix b/pkgs/development/python-modules/cccolutils/default.nix index 96e75405ee3..e231624e40f 100644 --- a/pkgs/development/python-modules/cccolutils/default.nix +++ b/pkgs/development/python-modules/cccolutils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, krb5Full, nose, GitPython, mock, git }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, krb5Full, nose, GitPython, mock, git }: buildPythonPackage rec { pname = "CCColUtils"; diff --git a/pkgs/development/python-modules/cddb/default.nix b/pkgs/development/python-modules/cddb/default.nix index 0956a971ebd..55d659376c6 100644 --- a/pkgs/development/python-modules/cddb/default.nix +++ b/pkgs/development/python-modules/cddb/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { version = "1.4"; disabled = isPy3k; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.IOKit ]; + buildInputs = lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.IOKit ]; src = pkgs.fetchurl { url = "http://cddb-py.sourceforge.net/${pname}-${version}.tar.gz"; diff --git a/pkgs/development/python-modules/cdecimal/default.nix b/pkgs/development/python-modules/cdecimal/default.nix index f788d32520e..cf889050590 100644 --- a/pkgs/development/python-modules/cdecimal/default.nix +++ b/pkgs/development/python-modules/cdecimal/default.nix @@ -1,6 +1,4 @@ -{ lib, stdenv, fetchurl, buildPythonPackage, isPy3k }: - -with stdenv.lib; +{ lib, buildPythonPackage, fetchurl, isPy3k }: buildPythonPackage rec { pname = "cdecimal"; diff --git a/pkgs/development/python-modules/cement/default.nix b/pkgs/development/python-modules/cement/default.nix index 9133389f0ce..f021ea16b62 100644 --- a/pkgs/development/python-modules/cement/default.nix +++ b/pkgs/development/python-modules/cement/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k }: +{ lib, buildPythonPackage, fetchPypi, isPy3k }: buildPythonPackage rec { pname = "cement"; diff --git a/pkgs/development/python-modules/censys/default.nix b/pkgs/development/python-modules/censys/default.nix new file mode 100644 index 00000000000..561d9651fed --- /dev/null +++ b/pkgs/development/python-modules/censys/default.nix @@ -0,0 +1,50 @@ +{ lib +, backoff +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, requests +, pytestcov +, requests-mock +, parameterized +}: + +buildPythonPackage rec { + pname = "censys"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "censys"; + repo = "censys-python"; + rev = "v${version}"; + sha256 = "0vvd13g48i4alnqil98zc09zi5kv6l2s3kdfyg5syjxvq4lfd476"; + }; + + propagatedBuildInputs = [ + backoff + requests + ]; + + checkInputs = [ + pytestcov + pytestCheckHook + requests-mock + parameterized + ]; + + # The tests want to write a configuration file + preCheck = '' + export HOME=$(mktemp -d) + mkdir -p $HOME + ''; + # All other tests require an API key + pytestFlagsArray = [ "tests/test_config.py" ]; + pythonImportsCheck = [ "censys" ]; + + meta = with lib; { + description = "Python API wrapper for the Censys Search Engine (censys.io)"; + homepage = "https://github.com/censys/censys-python"; + license = with licenses; [ asl20 ]; + maintainers = [ maintainers.fab ]; + }; +} diff --git a/pkgs/development/python-modules/cerberus/default.nix b/pkgs/development/python-modules/cerberus/default.nix index 08b7527c54c..cdf6519d325 100644 --- a/pkgs/development/python-modules/cerberus/default.nix +++ b/pkgs/development/python-modules/cerberus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytestrunner, pytest }: +{ lib, buildPythonPackage, fetchPypi, pytestrunner, pytest }: buildPythonPackage rec { pname = "Cerberus"; diff --git a/pkgs/development/python-modules/cert-chain-resolver/default.nix b/pkgs/development/python-modules/cert-chain-resolver/default.nix new file mode 100644 index 00000000000..eea43d5c739 --- /dev/null +++ b/pkgs/development/python-modules/cert-chain-resolver/default.nix @@ -0,0 +1,36 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, pytestCheckHook +, pytest-mock +, cryptography +}: + +buildPythonPackage rec { + pname = "cert-chain-resolver"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "rkoopmans"; + repo = "python-certificate-chain-resolver"; + rev = version; + sha256 = "1kmig4ksbx1wvgcjn4r9jjg2pn1ag5rq871bjwxkp9kslb3x3d1l"; + }; + + propagatedBuildInputs = [ cryptography ]; + + checkInputs = [ pytestCheckHook pytest-mock ]; + + # online tests + disabledTests = [ + "test_cert_returns_completed_chain" + "test_display_flag_is_properly_formatted" + ]; + + meta = with lib; { + homepage = "https://github.com/rkoopmans/python-certificate-chain-resolver"; + description = "Resolve / obtain the certificate intermediates of a x509 certificate"; + license = licenses.mit; + maintainers = with maintainers; [ veehaitch ]; + }; +} diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix index d7e74f5eff8..cb842f1455f 100644 --- a/pkgs/development/python-modules/certbot/default.nix +++ b/pkgs/development/python-modules/certbot/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "certbot"; - version = "1.10.1"; + version = "1.11.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "035cdw2h3f511drc0q1j65j911m1pj6c5ghywavkhib0chim044c"; + sha256 = "sha256-IGXiIOLP/Uq6HdXAschp1jFYq52ohRK4VLtkjF4Tb44="; }; sourceRoot = "source/${pname}"; diff --git a/pkgs/development/python-modules/certipy/default.nix b/pkgs/development/python-modules/certipy/default.nix index 049e3ffdb5d..a3cde807076 100644 --- a/pkgs/development/python-modules/certipy/default.nix +++ b/pkgs/development/python-modules/certipy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pyopenssl diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index 55390ea5ff9..3dcd6a996cb 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -17,7 +17,7 @@ if isPyPy then null else buildPythonPackage rec { # On Darwin, the cffi tests want to hit libm a lot, and look for it in a global # impure search path. It's obnoxious how much repetition there is, and how difficult # it is to get it to search somewhere else (since we do actually have a libm symlink in libSystem) - prePatch = stdenv.lib.optionalString stdenv.isDarwin '' + prePatch = lib.optionalString stdenv.isDarwin '' substituteInPlace testing/cffi0/test_parsing.py \ --replace 'lib_m = "m"' 'lib_m = "System"' \ --replace '"libm" in name' '"libSystem" in name' @@ -29,7 +29,7 @@ if isPyPy then null else buildPythonPackage rec { ''; # The tests use -Werror but with python3.6 clang detects some unreachable code. - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument -Wno-unreachable-code"; doCheck = !stdenv.hostPlatform.isMusl && !stdenv.isDarwin; # TODO: Investigate @@ -40,7 +40,7 @@ if isPyPy then null else buildPythonPackage rec { meta = with lib; { maintainers = with maintainers; [ domenkozar lnl7 ]; homepage = "https://cffi.readthedocs.org/"; - license = with licenses; [ mit ]; + license = licenses.mit; description = "Foreign Function Interface for Python calling C code"; }; } diff --git a/pkgs/development/python-modules/cftime/default.nix b/pkgs/development/python-modules/cftime/default.nix index 0235c611c61..78dcecfb6a9 100644 --- a/pkgs/development/python-modules/cftime/default.nix +++ b/pkgs/development/python-modules/cftime/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "cftime"; - version = "1.3.0"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "8d6a1144f43b9d7a180d7ceb3aa8015b7133c615fbac231bed184a91129f0207"; + sha256 = "77fd86e69b234d41fa8634d627e9e9ee0501c2a8a95268c2b524d38e0a33f090"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/cgroup-utils/default.nix b/pkgs/development/python-modules/cgroup-utils/default.nix index 2000a4e0a3b..8b3a6afa9b3 100644 --- a/pkgs/development/python-modules/cgroup-utils/default.nix +++ b/pkgs/development/python-modules/cgroup-utils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pep8, nose }: +{ lib, buildPythonPackage, fetchFromGitHub, pep8, nose }: buildPythonPackage rec { version = "0.8"; diff --git a/pkgs/development/python-modules/chai/default.nix b/pkgs/development/python-modules/chai/default.nix index 3400b33635a..9f9d48d9017 100644 --- a/pkgs/development/python-modules/chai/default.nix +++ b/pkgs/development/python-modules/chai/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "chai"; diff --git a/pkgs/development/python-modules/chainer/default.nix b/pkgs/development/python-modules/chainer/default.nix index 0c3b7a946fc..9dd656efa88 100644 --- a/pkgs/development/python-modules/chainer/default.nix +++ b/pkgs/development/python-modules/chainer/default.nix @@ -1,11 +1,11 @@ { lib, buildPythonPackage, fetchFromGitHub, isPy3k -, filelock, protobuf, numpy, pytest, mock, typing-extensions +, filelock, protobuf, numpy, pytestCheckHook, mock, typing-extensions , cupy, cudaSupport ? false }: buildPythonPackage rec { pname = "chainer"; - version = "6.5.0"; + version = "7.7.0"; disabled = !isPy3k; # python2.7 abandoned upstream # no tests in Pypi tarball @@ -13,16 +13,11 @@ buildPythonPackage rec { owner = "chainer"; repo = "chainer"; rev = "v${version}"; - sha256 = "0ha9fbl6sa3fbnsz3y1pg335iiskdbxw838m5j06zgzy156zna1x"; + sha256 = "0m97k5bv4pcp5rvbczvrr2vxddwzw2h42cm021f5y779jx5ghclh"; }; - # remove on 7.0 or 6.6 release - postPatch = '' - sed -i '/typing/d' setup.py - ''; - checkInputs = [ - pytest + pytestCheckHook mock ]; @@ -33,10 +28,13 @@ buildPythonPackage rec { typing-extensions ] ++ lib.optionals cudaSupport [ cupy ]; - # avoid gpu tests - checkPhase = '' - pytest tests/chainer_tests/utils_tests -k 'not gpu and not cupy' - ''; + pytestFlagsArray = [ "tests/chainer_tests/utils_tests" ]; + + disabledTests = [ + "gpu" + "cupy" + "ideep" + ]; meta = with lib; { description = "A flexible framework of neural networks for deep learning"; diff --git a/pkgs/development/python-modules/chainmap/default.nix b/pkgs/development/python-modules/chainmap/default.nix index 3858fc44f23..4619bff2b04 100644 --- a/pkgs/development/python-modules/chainmap/default.nix +++ b/pkgs/development/python-modules/chainmap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "chainmap"; diff --git a/pkgs/development/python-modules/chalice/default.nix b/pkgs/development/python-modules/chalice/default.nix index 224ff33d5f0..5445157b853 100644 --- a/pkgs/development/python-modules/chalice/default.nix +++ b/pkgs/development/python-modules/chalice/default.nix @@ -22,11 +22,11 @@ buildPythonPackage rec { pname = "chalice"; - version = "1.21.7"; + version = "1.21.9"; src = fetchPypi { inherit pname version; - sha256 = "22512bccb9b881b8d5a33bd45c7ad539dee60f2f8685a5ed8afd5000a962b0f8"; + sha256 = "312f88838c8ea4b4ac79dce0e5b4ba3125130ca66ea99a4694f535501dca95e3"; }; checkInputs = [ watchdog pytest hypothesis mock ]; diff --git a/pkgs/development/python-modules/chameleon/default.nix b/pkgs/development/python-modules/chameleon/default.nix index a2ffcb9a023..fccfec53512 100644 --- a/pkgs/development/python-modules/chameleon/default.nix +++ b/pkgs/development/python-modules/chameleon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub }: diff --git a/pkgs/development/python-modules/channels-redis/default.nix b/pkgs/development/python-modules/channels-redis/default.nix index 3f341f5527a..1e267aa5126 100644 --- a/pkgs/development/python-modules/channels-redis/default.nix +++ b/pkgs/development/python-modules/channels-redis/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , aioredis , asgiref , buildPythonPackage diff --git a/pkgs/development/python-modules/channels/default.nix b/pkgs/development/python-modules/channels/default.nix index c2836ef4faa..0f5e708d091 100644 --- a/pkgs/development/python-modules/channels/default.nix +++ b/pkgs/development/python-modules/channels/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, +{ lib, buildPythonPackage, fetchPypi, asgiref, django, daphne }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/chardet/default.nix b/pkgs/development/python-modules/chardet/default.nix index bbc41df0cd8..65381d40268 100644 --- a/pkgs/development/python-modules/chardet/default.nix +++ b/pkgs/development/python-modules/chardet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch +{ lib, buildPythonPackage, fetchPypi, fetchpatch , pytest, pytestrunner, hypothesis }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/check-manifest/default.nix b/pkgs/development/python-modules/check-manifest/default.nix index 18ce078269a..95bb9660d4c 100644 --- a/pkgs/development/python-modules/check-manifest/default.nix +++ b/pkgs/development/python-modules/check-manifest/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pep517, toml, mock, breezy, git }: +{ lib, buildPythonPackage, fetchPypi, pep517, toml, mock, breezy, git, build }: buildPythonPackage rec { pname = "check-manifest"; - version = "0.45"; + version = "0.46"; src = fetchPypi { inherit pname version; - sha256 = "636b65a3b685374ad429ff22fe213966765b145f08bc560c8d033b604c7bee4c"; + sha256 = "5895e42a012989bdc51854a02c82c8d6898112a4ab11f2d7878200520b49d428"; }; # Test requires filesystem access @@ -14,7 +14,7 @@ buildPythonPackage rec { substituteInPlace tests.py --replace "test_build_sdist" "no_test_build_sdist" ''; - propagatedBuildInputs = [ pep517 toml ]; + propagatedBuildInputs = [ build pep517 toml ]; checkInputs = [ mock breezy git ]; diff --git a/pkgs/development/python-modules/cheetah3/default.nix b/pkgs/development/python-modules/cheetah3/default.nix index e4fd549445a..a705bffa810 100644 --- a/pkgs/development/python-modules/cheetah3/default.nix +++ b/pkgs/development/python-modules/cheetah3/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, stdenv }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "Cheetah3"; @@ -11,10 +11,10 @@ buildPythonPackage rec { doCheck = false; # Circular dependency - meta = { + meta = with lib; { homepage = "http://www.cheetahtemplate.org/"; description = "A template engine and code generation tool"; - license = lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ pjjw ]; + license = licenses.mit; + maintainers = with maintainers; [ pjjw ]; }; } diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index c9d3094d595..e5c7c23e2e4 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, isPy3k +{ lib +, stdenv +, fetchPypi +, buildPythonPackage +, isPy3k , jaraco_functools , jaraco_text , more-itertools @@ -33,7 +37,8 @@ buildPythonPackage rec { # install_requires jaraco_functools - more-itertools six + more-itertools + six ]; checkInputs = [ @@ -49,10 +54,6 @@ buildPythonPackage rec { trustme ]; - # avoid attempting to use 3 packages not available on nixpkgs - # (jaraco.apt, jaraco.context, yg.lockfile) - pytestFlagsArray = [ "--ignore=cheroot/test/test_wsgi.py" ]; - # Disable doctest plugin because times out # Disable xdist (-n arg) because it's incompatible with testmon # Deselect test_bind_addr_unix on darwin because times out @@ -64,7 +65,7 @@ buildPythonPackage rec { rm pytest.ini ''; - disabledTests= [ + disabledTests = [ "tls" # touches network "peercreds_unix_sock" # test urls no longer allowed ] ++ lib.optionals stdenv.isDarwin [ @@ -72,6 +73,12 @@ buildPythonPackage rec { "bind_addr_unix" ]; + disabledTestFiles = [ + # avoid attempting to use 3 packages not available on nixpkgs + # (jaraco.apt, jaraco.context, yg.lockfile) + "cheroot/test/test_wsgi.py" + ]; + # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/cherrypy/17.nix b/pkgs/development/python-modules/cherrypy/17.nix index 9982db19f38..2ee8eb3bd0c 100644 --- a/pkgs/development/python-modules/cherrypy/17.nix +++ b/pkgs/development/python-modules/cherrypy/17.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { ]; checkPhase = '' - pytest ${stdenv.lib.optionalString stdenv.isDarwin "--ignore=cherrypy/test/test_wsgi_unix_socket.py"} + pytest ${lib.optionalString stdenv.isDarwin "--ignore=cherrypy/test/test_wsgi_unix_socket.py"} ''; meta = with lib; { diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index 76fd780e523..8a915d520e5 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { -k 'not KeyboardInterrupt and not daemonize and not Autoreload' \ --deselect=cherrypy/test/test_static.py::StaticTest::test_null_bytes \ --deselect=cherrypy/test/test_tools.py::ToolTests::testCombinedTools \ - ${stdenv.lib.optionalString stdenv.isDarwin + ${lib.optionalString stdenv.isDarwin "--deselect=cherrypy/test/test_bus.py::BusMethodTests::test_block"} ''; diff --git a/pkgs/development/python-modules/cjson/default.nix b/pkgs/development/python-modules/cjson/default.nix index ce70a2f459d..d34534e3eb8 100644 --- a/pkgs/development/python-modules/cjson/default.nix +++ b/pkgs/development/python-modules/cjson/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, isPyPy }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, isPyPy }: buildPythonPackage rec { pname = "python-cjson"; diff --git a/pkgs/development/python-modules/ckcc-protocol/default.nix b/pkgs/development/python-modules/ckcc-protocol/default.nix index dd72f5705e7..eaf89948e8f 100644 --- a/pkgs/development/python-modules/ckcc-protocol/default.nix +++ b/pkgs/development/python-modules/ckcc-protocol/default.nix @@ -1,9 +1,8 @@ -{ stdenv +{ lib , buildPythonPackage , click , ecdsa , hidapi -, lib , fetchPypi , pytest , pyaes diff --git a/pkgs/development/python-modules/cld2-cffi/default.nix b/pkgs/development/python-modules/cld2-cffi/default.nix index df28bcdf3aa..fc5a6b0e54b 100644 --- a/pkgs/development/python-modules/cld2-cffi/default.nix +++ b/pkgs/development/python-modules/cld2-cffi/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { checkInputs = [ nose ]; # gcc doesn't approve of this code, so disable -Werror - NIX_CFLAGS_COMPILE = "-w" + stdenv.lib.optionalString stdenv.cc.isClang " -Wno-error=c++11-narrowing"; + NIX_CFLAGS_COMPILE = "-w" + lib.optionalString stdenv.cc.isClang " -Wno-error=c++11-narrowing"; checkPhase = "nosetests -v"; diff --git a/pkgs/development/python-modules/clf/default.nix b/pkgs/development/python-modules/clf/default.nix index f4168d689d4..978d08051f7 100644 --- a/pkgs/development/python-modules/clf/default.nix +++ b/pkgs/development/python-modules/clf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , docopt, requests, pygments }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/cliapp/default.nix b/pkgs/development/python-modules/cliapp/default.nix index 4b7611c092e..e410a37fcb4 100644 --- a/pkgs/development/python-modules/cliapp/default.nix +++ b/pkgs/development/python-modules/cliapp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchgit , sphinx diff --git a/pkgs/development/python-modules/click-completion/default.nix b/pkgs/development/python-modules/click-completion/default.nix index 61a15428632..19fdac37615 100644 --- a/pkgs/development/python-modules/click-completion/default.nix +++ b/pkgs/development/python-modules/click-completion/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, +{ lib, buildPythonPackage, fetchPypi, isPy3k, click, jinja2, shellingham, six }: diff --git a/pkgs/development/python-modules/click-didyoumean/default.nix b/pkgs/development/python-modules/click-didyoumean/default.nix index 8d3c3ba3e24..c4574072b4c 100644 --- a/pkgs/development/python-modules/click-didyoumean/default.nix +++ b/pkgs/development/python-modules/click-didyoumean/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, +{ lib, buildPythonPackage, fetchPypi, click }: diff --git a/pkgs/development/python-modules/click-help-colors/default.nix b/pkgs/development/python-modules/click-help-colors/default.nix index dbe4e33ca84..b17dc1a0c11 100644 --- a/pkgs/development/python-modules/click-help-colors/default.nix +++ b/pkgs/development/python-modules/click-help-colors/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage +{ lib, fetchPypi, buildPythonPackage , click, pytest }: diff --git a/pkgs/development/python-modules/click-log/default.nix b/pkgs/development/python-modules/click-log/default.nix index 4aa63dd4537..3145d4775e3 100644 --- a/pkgs/development/python-modules/click-log/default.nix +++ b/pkgs/development/python-modules/click-log/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, click }: +{ lib, buildPythonPackage, fetchPypi, click }: buildPythonPackage rec { pname = "click-log"; diff --git a/pkgs/development/python-modules/click-plugins/default.nix b/pkgs/development/python-modules/click-plugins/default.nix index c2b25341e17..31ae00a348d 100644 --- a/pkgs/development/python-modules/click-plugins/default.nix +++ b/pkgs/development/python-modules/click-plugins/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, +{ lib, buildPythonPackage, fetchPypi, click, pytest }: diff --git a/pkgs/development/python-modules/click-repl/default.nix b/pkgs/development/python-modules/click-repl/default.nix index 23adb12da65..ee8773999ff 100644 --- a/pkgs/development/python-modules/click-repl/default.nix +++ b/pkgs/development/python-modules/click-repl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, click, prompt_toolkit }: +{ lib, buildPythonPackage, fetchPypi, click, prompt_toolkit }: buildPythonPackage rec { pname = "click-repl"; diff --git a/pkgs/development/python-modules/clickclick/default.nix b/pkgs/development/python-modules/clickclick/default.nix index e211b955ac8..d829f43dc0d 100644 --- a/pkgs/development/python-modules/clickclick/default.nix +++ b/pkgs/development/python-modules/clickclick/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchFromGitHub, isPy36, flake8, click, pyyaml, six, pytestCheckHook, pytestcov }: +{ lib, buildPythonPackage, fetchFromGitHub, isPy36, flake8, click, pyyaml, six, pytestCheckHook, pytestcov }: buildPythonPackage rec { pname = "clickclick"; diff --git a/pkgs/development/python-modules/cliff/default.nix b/pkgs/development/python-modules/cliff/default.nix index 1c551bfb0d9..33a129d287e 100644 --- a/pkgs/development/python-modules/cliff/default.nix +++ b/pkgs/development/python-modules/cliff/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "cliff"; - version = "3.5.0"; + version = "3.6.0"; src = fetchPypi { inherit pname version; - sha256 = "5bfb684b5fcdff0afaaccd1298a376c0e62e644c46b7e9abc034595b41fe1759"; + sha256 = "a3f4fa67eeafbcfa7cf9fe4b1755d410876528e1d0d115740db00b50a1250272"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cligj/default.nix b/pkgs/development/python-modules/cligj/default.nix index f9d953d8536..b44f4e0ec17 100644 --- a/pkgs/development/python-modules/cligj/default.nix +++ b/pkgs/development/python-modules/cligj/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchFromGitHub , click, pytest, glibcLocales }: diff --git a/pkgs/development/python-modules/clint/default.nix b/pkgs/development/python-modules/clint/default.nix index 133fc0de55c..66e2d5f52f3 100644 --- a/pkgs/development/python-modules/clint/default.nix +++ b/pkgs/development/python-modules/clint/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , python diff --git a/pkgs/development/python-modules/clize/default.nix b/pkgs/development/python-modules/clize/default.nix index c9c3f5c905c..1418db69a39 100644 --- a/pkgs/development/python-modules/clize/default.nix +++ b/pkgs/development/python-modules/clize/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , dateutil diff --git a/pkgs/development/python-modules/closure-linter/default.nix b/pkgs/development/python-modules/closure-linter/default.nix index 75f5ba0b449..18782fb50bb 100644 --- a/pkgs/development/python-modules/closure-linter/default.nix +++ b/pkgs/development/python-modules/closure-linter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchgit , isPy3k diff --git a/pkgs/development/python-modules/cloudpickle/default.nix b/pkgs/development/python-modules/cloudpickle/default.nix index e5b4a63a564..f525b6e7f1d 100644 --- a/pkgs/development/python-modules/cloudpickle/default.nix +++ b/pkgs/development/python-modules/cloudpickle/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, pytest, mock }: +{ lib, buildPythonPackage, fetchPypi, isPy27, pytest, mock }: buildPythonPackage rec { pname = "cloudpickle"; diff --git a/pkgs/development/python-modules/cloudscraper/default.nix b/pkgs/development/python-modules/cloudscraper/default.nix index faa1affcd06..591d1aac2e6 100644 --- a/pkgs/development/python-modules/cloudscraper/default.nix +++ b/pkgs/development/python-modules/cloudscraper/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "cloudscraper"; - version = "1.2.52"; + version = "1.2.56"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "07j2nhzimzhcskj2wpxpvpb3dhpci19daw02r2ckkjiq3zifhm6v"; + sha256 = "84c5910023dd393619b2b793fdb154392c5c8887b55e4bcac3ad2646f1cfe212"; }; propagatedBuildInputs = [ @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python module to bypass Cloudflare's anti-bot page"; - homepage = https://github.com/venomous/cloudscraper; + homepage = "https://github.com/venomous/cloudscraper"; license = licenses.mit; maintainers = with maintainers; [ kini ]; }; diff --git a/pkgs/development/python-modules/clustershell/default.nix b/pkgs/development/python-modules/clustershell/default.nix index a0e744f9919..d247cecdfa6 100644 --- a/pkgs/development/python-modules/clustershell/default.nix +++ b/pkgs/development/python-modules/clustershell/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pyyaml, openssh +{ lib, buildPythonPackage, fetchPypi, pyyaml, openssh , nose, bc, hostname, coreutils, bash, gnused }: diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index be4e64f760e..bafdb9cb95d 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { LC_ALL="en_US.UTF-8"; - postPatch = stdenv.lib.optional stdenv.isDarwin '' + postPatch = lib.optional stdenv.isDarwin '' # Fake the impure dependencies pbpaste and pbcopy mkdir bin echo '#!${stdenv.shell}' > bin/pbpaste @@ -38,7 +38,7 @@ buildPythonPackage rec { wcwidth attrs ] - ++ stdenv.lib.optionals (pythonOlder "3.5") [contextlib2 typing] + ++ lib.optionals (pythonOlder "3.5") [contextlib2 typing] ; @@ -46,7 +46,7 @@ buildPythonPackage rec { # pytest-cov # argcomplete will generate errors checkInputs= [ pytest mock which vim glibcLocales pytest-mock ] - ++ stdenv.lib.optional (pythonOlder "3.6") [ mock ]; + ++ lib.optional (pythonOlder "3.6") [ mock ]; checkPhase = '' # test_path_completion_user_expansion might be fixed in the next release py.test -k 'not test_path_completion_user_expansion' diff --git a/pkgs/development/python-modules/cmdline/default.nix b/pkgs/development/python-modules/cmdline/default.nix index 4249ed7164b..71273ed1a22 100644 --- a/pkgs/development/python-modules/cmdline/default.nix +++ b/pkgs/development/python-modules/cmdline/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pyyaml }: +{ lib, buildPythonPackage, fetchPypi, pyyaml }: buildPythonPackage rec { pname = "cmdline"; diff --git a/pkgs/development/python-modules/cmdtest/default.nix b/pkgs/development/python-modules/cmdtest/default.nix index 5bb4ef79a20..28d78203b6d 100644 --- a/pkgs/development/python-modules/cmdtest/default.nix +++ b/pkgs/development/python-modules/cmdtest/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , cliapp diff --git a/pkgs/development/python-modules/cmsis-svd/default.nix b/pkgs/development/python-modules/cmsis-svd/default.nix new file mode 100644 index 00000000000..cdfdd05e521 --- /dev/null +++ b/pkgs/development/python-modules/cmsis-svd/default.nix @@ -0,0 +1,28 @@ +{ lib, buildPythonPackage, fetchFromGitHub, six }: + +buildPythonPackage rec { + pname = "cmsis-svd"; + version = "0.4"; + + src = fetchFromGitHub { + owner = "posborne"; + repo = pname; + rev = "python-${version}"; + sha256 = "01f2z01gqgx0risqnbrlaqj49fmly30zbwsf7rr465ggnl2c04r0"; + }; + + preConfigure = '' + cd python + ''; + + propagatedBuildInputs = [ six ]; + + pythonImportsCheck = [ "cmsis_svd" ]; + + meta = with lib; { + description = "CMSIS SVD parser"; + homepage = "https://github.com/posborne/cmsis-svd"; + maintainers = with maintainers; [ dump_stack ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/cntk/default.nix b/pkgs/development/python-modules/cntk/default.nix index ce388bb1d5d..b1bba8cf1e0 100644 --- a/pkgs/development/python-modules/cntk/default.nix +++ b/pkgs/development/python-modules/cntk/default.nix @@ -3,7 +3,7 @@ , pkgs , numpy , scipy -, openmpi +, mpi , enum34 , protobuf , pip @@ -17,8 +17,8 @@ in buildPythonPackage { inherit (cntk) name version src; - nativeBuildInputs = [ swig openmpi ]; - buildInputs = [ cntk openmpi ]; + nativeBuildInputs = [ swig mpi ]; + buildInputs = [ cntk mpi ]; propagatedBuildInputs = [ numpy scipy enum34 protobuf pip ]; CNTK_LIB_PATH = "${cntk}/lib"; @@ -28,7 +28,7 @@ buildPythonPackage { postPatch = '' cd bindings/python - sed -i 's,"libmpi.so.12","${openmpi}/lib/libmpi.so",g' cntk/train/distributed.py + sed -i 's,"libmpi.so.12","${mpi}/lib/libmpi.so",g' cntk/train/distributed.py # Remove distro and libs checks; they aren't compatible with NixOS and besides we guarantee # compatibility by providing a package. diff --git a/pkgs/development/python-modules/coconut/default.nix b/pkgs/development/python-modules/coconut/default.nix index b75a82b6c2b..55eadddaa1d 100644 --- a/pkgs/development/python-modules/coconut/default.nix +++ b/pkgs/development/python-modules/coconut/default.nix @@ -1,17 +1,15 @@ -{ - lib, - buildPythonApplication, - fetchFromGitHub, - fetchpatch, - - cpyparsing, - ipykernel, - mypy, - pygments, - pytest, - prompt_toolkit, - tkinter, - watchdog +{ lib +, buildPythonApplication +, fetchFromGitHub +, fetchpatch +, cpyparsing +, ipykernel +, mypy +, pygments +, pytestCheckHook +, prompt_toolkit +, tkinter +, watchdog }: buildPythonApplication rec { @@ -33,15 +31,26 @@ buildPythonApplication rec { url = "https://github.com/LibreCybernetics/coconut/commit/2916a087da1e063cc4438b68d4077347fd1ea4a2.patch"; sha256 = "136jbd2rvnifw30y73vv667002nf7sbkm5qyihshj4db7ngysr6q"; }) + (fetchpatch { + name = "support-python-3.9.patch"; + url = "https://github.com/evhub/coconut/commit/5c724b4dd92fb62c614d8192e3cac3dd1d475790.patch"; + sha256 = "04xmzyfmyv6gr2l2z6pdxlllwzcmwxvahxzqyxglr36hfl33ad71"; + }) + ]; + + checkInputs = [ + pytestCheckHook + tkinter ]; - checkInputs = [ pytest tkinter ]; # Currently most tests do not work on Hydra due to external fetches. - checkPhase = '' - pytest tests/constants_test.py - pytest tests/main_test.py::TestShell::test_compile_to_file - pytest tests/main_test.py::TestShell::test_convenience - ''; + pytestFlagsArray = [ + "tests/constants_test.py" + "tests/main_test.py::TestShell::test_compile_to_file" + "tests/main_test.py::TestShell::test_convenience" + ]; + + pythonImportsCheck = [ "coconut" ]; meta = with lib; { homepage = "http://coconut-lang.org/"; diff --git a/pkgs/development/python-modules/cocotb/default.nix b/pkgs/development/python-modules/cocotb/default.nix index e95900d17b5..9cbf86ab1cf 100644 --- a/pkgs/development/python-modules/cocotb/default.nix +++ b/pkgs/development/python-modules/cocotb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, setuptools, swig, verilog }: +{ lib, buildPythonPackage, fetchFromGitHub, setuptools, swig, verilog }: buildPythonPackage rec { pname = "cocotb"; diff --git a/pkgs/development/python-modules/codecov/default.nix b/pkgs/development/python-modules/codecov/default.nix index 455888c447d..924422bf7d4 100644 --- a/pkgs/development/python-modules/codecov/default.nix +++ b/pkgs/development/python-modules/codecov/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, requests, coverage, unittest2 }: +{ lib, buildPythonPackage, fetchPypi, requests, coverage, unittest2 }: buildPythonPackage rec { pname = "codecov"; @@ -20,9 +20,9 @@ buildPythonPackage rec { # No tests in archive doCheck = false; - meta = { + meta = with lib; { description = "Python report uploader for Codecov"; homepage = "https://codecov.io/"; - license = stdenv.lib.licenses.asl20; + license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/cogapp/default.nix b/pkgs/development/python-modules/cogapp/default.nix index 019faeaebc3..c996c23d9ae 100644 --- a/pkgs/development/python-modules/cogapp/default.nix +++ b/pkgs/development/python-modules/cogapp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "cogapp"; diff --git a/pkgs/development/python-modules/coilmq/default.nix b/pkgs/development/python-modules/coilmq/default.nix index bc0b6af146a..b21ea193cbf 100644 --- a/pkgs/development/python-modules/coilmq/default.nix +++ b/pkgs/development/python-modules/coilmq/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , stompclient, python-daemon, redis, pid, pytest, six, click, coverage , sqlalchemy }: diff --git a/pkgs/development/python-modules/colanderalchemy/default.nix b/pkgs/development/python-modules/colanderalchemy/default.nix index a5b29af1c31..a3fa33f327c 100644 --- a/pkgs/development/python-modules/colanderalchemy/default.nix +++ b/pkgs/development/python-modules/colanderalchemy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , unittest2 diff --git a/pkgs/development/python-modules/colorama/default.nix b/pkgs/development/python-modules/colorama/default.nix index 6778c6acadb..1d472035b2f 100644 --- a/pkgs/development/python-modules/colorama/default.nix +++ b/pkgs/development/python-modules/colorama/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage }: +{ lib, fetchPypi, buildPythonPackage }: buildPythonPackage rec { pname = "colorama"; diff --git a/pkgs/development/python-modules/colorcet/default.nix b/pkgs/development/python-modules/colorcet/default.nix index 05304175b71..6198e4e1b28 100644 --- a/pkgs/development/python-modules/colorcet/default.nix +++ b/pkgs/development/python-modules/colorcet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , param @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "colorcet"; - version = "2.0.2"; + version = "2.0.6"; src = fetchPypi { inherit pname version; - sha256 = "1vkx00im4s6zhr2m1j9r0a5vmhkl488b4xpzxb1pidbl19wi6j2i"; + sha256 = "efa44b6f4078261e62d0039c76aba17ac8d3ebaf0bc2291a111aee3905313433"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/colorclass/default.nix b/pkgs/development/python-modules/colorclass/default.nix index 08da356e222..50a052ec1f9 100644 --- a/pkgs/development/python-modules/colorclass/default.nix +++ b/pkgs/development/python-modules/colorclass/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "colorclass"; diff --git a/pkgs/development/python-modules/colored/default.nix b/pkgs/development/python-modules/colored/default.nix index 5caa0cad2f6..502f31aa9b8 100644 --- a/pkgs/development/python-modules/colored/default.nix +++ b/pkgs/development/python-modules/colored/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/coloredlogs/default.nix b/pkgs/development/python-modules/coloredlogs/default.nix index 3005429658b..caa783bb823 100644 --- a/pkgs/development/python-modules/coloredlogs/default.nix +++ b/pkgs/development/python-modules/coloredlogs/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , humanfriendly @@ -20,13 +21,18 @@ buildPythonPackage rec { sha256 = "0rnmxwrim4razlv4vi3krxk5lc5ksck6h5374j8avqwplika7q2x"; }; + # capturer is broken on darwin / py38, so we skip the test until a fix for + # https://github.com/xolox/python-capturer/issues/10 is released. + doCheck = !stdenv.isDarwin; checkPhase = '' PATH=$PATH:$out/bin pytest . -k "not test_plain_text_output_format \ and not test_auto_install" ''; - checkInputs = [ pytest mock util-linux ]; + checkInputs = [ pytest mock util-linux verboselogs capturer ]; - propagatedBuildInputs = [ humanfriendly verboselogs capturer ]; + pythonImportsCheck = [ "coloredlogs" ]; + + propagatedBuildInputs = [ humanfriendly ]; meta = with lib; { description = "Colored stream handler for Python's logging module"; diff --git a/pkgs/development/python-modules/colorlog/default.nix b/pkgs/development/python-modules/colorlog/default.nix index 829f157fced..0740ee33b5f 100644 --- a/pkgs/development/python-modules/colorlog/default.nix +++ b/pkgs/development/python-modules/colorlog/default.nix @@ -1,23 +1,21 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest }: +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +}: buildPythonPackage rec { pname = "colorlog"; - version = "4.6.2"; + version = "4.7.2"; src = fetchPypi { inherit pname version; - sha256 = "54e5f153419c22afc283c130c4201db19a3dbd83221a0f4657d5ee66234a2ea4"; + sha256 = "0lc2r105hxbyh29dsgczdi379lh57gnbj56jsxi5g9rqcihmpl0q"; }; - checkInputs = [ pytest ]; + checkInputs = [ pytestCheckHook ]; - # tests are no longer packaged in pypi - doCheck = false; - checkPhase = '' - py.test -p no:logging - ''; - - pythonImportsCheck = [ "colorlog" ]; + pythonImportsCheck = [ "colorlog" ]; meta = with lib; { description = "Log formatting with colors"; diff --git a/pkgs/development/python-modules/colorlover/default.nix b/pkgs/development/python-modules/colorlover/default.nix index 6aea26e8936..70dd66e8f81 100644 --- a/pkgs/development/python-modules/colorlover/default.nix +++ b/pkgs/development/python-modules/colorlover/default.nix @@ -1,4 +1,6 @@ -{ buildPythonPackage, fetchPypi, stdenv +{ lib +, buildPythonPackage +, fetchPypi }: buildPythonPackage rec { @@ -13,10 +15,10 @@ buildPythonPackage rec { # no tests included in distributed archive doCheck = false; - meta = { + meta = with lib; { homepage = "https://github.com/jackparmer/colorlover"; description = "Color scales in Python for humans"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ globin ]; + license = licenses.mit; + maintainers = with maintainers; [ globin ]; }; } diff --git a/pkgs/development/python-modules/colour/default.nix b/pkgs/development/python-modules/colour/default.nix index 6a6ad9d4946..f7419666f53 100644 --- a/pkgs/development/python-modules/colour/default.nix +++ b/pkgs/development/python-modules/colour/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, d2to1 }: +{ lib, buildPythonPackage, fetchPypi, d2to1 }: buildPythonPackage rec { pname = "colour"; diff --git a/pkgs/development/python-modules/configobj/default.nix b/pkgs/development/python-modules/configobj/default.nix index d0988689275..746c5f35f25 100644 --- a/pkgs/development/python-modules/configobj/default.nix +++ b/pkgs/development/python-modules/configobj/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage +{ lib, buildPythonPackage , fetchFromGitHub , six , mock, pytest diff --git a/pkgs/development/python-modules/configshell/default.nix b/pkgs/development/python-modules/configshell/default.nix index ba3700962bf..a41d077f22d 100644 --- a/pkgs/development/python-modules/configshell/default.nix +++ b/pkgs/development/python-modules/configshell/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonPackage, pyparsing, six, urwid }: +{ lib, fetchFromGitHub, buildPythonPackage, pyparsing, six, urwid }: buildPythonPackage rec { pname = "configshell"; diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix index f3e8b1c943b..cd2ddf9da69 100644 --- a/pkgs/development/python-modules/confluent-kafka/default.nix +++ b/pkgs/development/python-modules/confluent-kafka/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro, futures, enum34 }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro, futures, enum34 }: buildPythonPackage rec { version = "1.5.0"; diff --git a/pkgs/development/python-modules/constantly/default.nix b/pkgs/development/python-modules/constantly/default.nix index 189573699b9..e3a9c642f47 100644 --- a/pkgs/development/python-modules/constantly/default.nix +++ b/pkgs/development/python-modules/constantly/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "constantly"; diff --git a/pkgs/development/python-modules/construct/default.nix b/pkgs/development/python-modules/construct/default.nix index bb334f11c75..8d0c83ca9e8 100644 --- a/pkgs/development/python-modules/construct/default.nix +++ b/pkgs/development/python-modules/construct/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook pytest-benchmark numpy arrow ruamel_yaml ]; - disabledTests = stdenv.lib.optionals stdenv.isDarwin [ "test_multiprocessing" ]; + disabledTests = lib.optionals stdenv.isDarwin [ "test_multiprocessing" ]; pytestFlagsArray = [ "--benchmark-disable" ]; diff --git a/pkgs/development/python-modules/consul/default.nix b/pkgs/development/python-modules/consul/default.nix index 3978b14484a..a3b92ee7255 100644 --- a/pkgs/development/python-modules/consul/default.nix +++ b/pkgs/development/python-modules/consul/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , requests, six, pytest }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/contexter/default.nix b/pkgs/development/python-modules/contexter/default.nix index d8b74d4fedb..9937d4b4752 100644 --- a/pkgs/development/python-modules/contexter/default.nix +++ b/pkgs/development/python-modules/contexter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "contexter"; diff --git a/pkgs/development/python-modules/convertdate/default.nix b/pkgs/development/python-modules/convertdate/default.nix index f28923002f7..60eedd3ec17 100644 --- a/pkgs/development/python-modules/convertdate/default.nix +++ b/pkgs/development/python-modules/convertdate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pymeeus, pytz }: +{ lib, buildPythonPackage, fetchFromGitHub, pymeeus, pytz }: buildPythonPackage rec { pname = "convertdate"; diff --git a/pkgs/development/python-modules/cookiecutter/default.nix b/pkgs/development/python-modules/cookiecutter/default.nix index f9a4fe98208..c5ee4d8617d 100644 --- a/pkgs/development/python-modules/cookiecutter/default.nix +++ b/pkgs/development/python-modules/cookiecutter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPyPy +{ lib, buildPythonPackage, fetchPypi, isPyPy , pytest, pytestcov, pytest-mock, freezegun , jinja2, future, binaryornot, click, whichcraft, poyo, jinja2_time, requests , python-slugify }: diff --git a/pkgs/development/python-modules/cookies/default.nix b/pkgs/development/python-modules/cookies/default.nix index 59d2214f758..a4e35dac346 100644 --- a/pkgs/development/python-modules/cookies/default.nix +++ b/pkgs/development/python-modules/cookies/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "cookies"; diff --git a/pkgs/development/python-modules/coreapi/default.nix b/pkgs/development/python-modules/coreapi/default.nix index 8ac69a45739..8b957fee4f6 100644 --- a/pkgs/development/python-modules/coreapi/default.nix +++ b/pkgs/development/python-modules/coreapi/default.nix @@ -1,5 +1,5 @@ { - lib, stdenv, + lib, fetchFromGitHub, buildPythonPackage, django, diff --git a/pkgs/development/python-modules/coreschema/default.nix b/pkgs/development/python-modules/coreschema/default.nix index 73167dea8a7..65bdee5a8da 100644 --- a/pkgs/development/python-modules/coreschema/default.nix +++ b/pkgs/development/python-modules/coreschema/default.nix @@ -1,5 +1,5 @@ { - lib, stdenv, + lib, fetchFromGitHub, buildPythonPackage, jinja2, diff --git a/pkgs/development/python-modules/cornice/default.nix b/pkgs/development/python-modules/cornice/default.nix index 10c55920193..6c488a271e2 100644 --- a/pkgs/development/python-modules/cornice/default.nix +++ b/pkgs/development/python-modules/cornice/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pyramid diff --git a/pkgs/development/python-modules/cot/default.nix b/pkgs/development/python-modules/cot/default.nix index 89e26545d79..a6de8321dc0 100644 --- a/pkgs/development/python-modules/cot/default.nix +++ b/pkgs/development/python-modules/cot/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ colorlog pyvmomi requests verboselogs pyopenssl setuptools ] - ++ stdenv.lib.optional (pythonOlder "3.3") psutil; + ++ lib.optional (pythonOlder "3.3") psutil; checkInputs = [ mock pytestCheckHook pytest-mock qemu ]; @@ -35,9 +35,10 @@ buildPythonPackage rec { "TestQCOW2" "TestRAW" "TestVMDKConversion" + ] ++ lib.optionals stdenv.isDarwin [ + "test_serial_fixup_invalid_host" ]; - # argparse is part of the standardlib prePatch = '' substituteInPlace setup.py --replace "'argparse'," "" diff --git a/pkgs/development/python-modules/cov-core/default.nix b/pkgs/development/python-modules/cov-core/default.nix index 44461a8ca9f..ce3b08fbc9f 100644 --- a/pkgs/development/python-modules/cov-core/default.nix +++ b/pkgs/development/python-modules/cov-core/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, coverage }: +{ lib, buildPythonPackage, fetchPypi, coverage }: buildPythonPackage rec { pname = "cov-core"; diff --git a/pkgs/development/python-modules/cppheaderparser/default.nix b/pkgs/development/python-modules/cppheaderparser/default.nix index b51499de449..7602132c24a 100644 --- a/pkgs/development/python-modules/cppheaderparser/default.nix +++ b/pkgs/development/python-modules/cppheaderparser/default.nix @@ -1,7 +1,7 @@ { buildPythonPackage , fetchPypi , ply -, lib, stdenv +, lib }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/crate/default.nix b/pkgs/development/python-modules/crate/default.nix index 37e49210009..a37160a01ac 100644 --- a/pkgs/development/python-modules/crate/default.nix +++ b/pkgs/development/python-modules/crate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchPypi , buildPythonPackage , urllib3 diff --git a/pkgs/development/python-modules/crayons/default.nix b/pkgs/development/python-modules/crayons/default.nix index c93bf71687f..53caec66596 100644 --- a/pkgs/development/python-modules/crayons/default.nix +++ b/pkgs/development/python-modules/crayons/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, colorama }: +{ lib, fetchPypi, buildPythonPackage, colorama }: buildPythonPackage rec { pname = "crayons"; diff --git a/pkgs/development/python-modules/crc16/default.nix b/pkgs/development/python-modules/crc16/default.nix index 1e3c9cbbf4f..ebf86a3571c 100644 --- a/pkgs/development/python-modules/crc16/default.nix +++ b/pkgs/development/python-modules/crc16/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "crc16"; diff --git a/pkgs/development/python-modules/crccheck/default.nix b/pkgs/development/python-modules/crccheck/default.nix index 1ddf2a2ba68..1762d60dfde 100644 --- a/pkgs/development/python-modules/crccheck/default.nix +++ b/pkgs/development/python-modules/crccheck/default.nix @@ -1,21 +1,24 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi, isPy3k , nose }: -buildPythonPackage rec { +let pname = "crccheck"; - version = "0.6"; + version = "1.0"; +in buildPythonPackage { + inherit pname version; - buildInputs = [ nose ]; + checkInputs = [ nose ]; src = fetchPypi { inherit pname version; - sha256 = "0ckymm6s5kw08i1j35fy2cfha1hyq94pq1kc66brb552qgjs91jn"; - extension = "zip"; + sha256 = "1ay9lgy80j7lklm07iw2wq7giwnv9fbv50mncblqlc39y322vi0p"; }; + disabled = !isPy3k; + meta = with lib; { description = "Python library for CRCs and checksums"; - homepage = "https://bitbucket.org/martin_scharrer/crccheck"; + homepage = "https://sourceforge.net/projects/crccheck/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ etu ]; platforms = platforms.linux; diff --git a/pkgs/development/python-modules/crcmod/default.nix b/pkgs/development/python-modules/crcmod/default.nix index 488b723d89f..082369baf73 100644 --- a/pkgs/development/python-modules/crcmod/default.nix +++ b/pkgs/development/python-modules/crcmod/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "crcmod"; diff --git a/pkgs/development/python-modules/credstash/default.nix b/pkgs/development/python-modules/credstash/default.nix index ca5e1fe334a..0267aee7610 100644 --- a/pkgs/development/python-modules/credstash/default.nix +++ b/pkgs/development/python-modules/credstash/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, cryptography, boto3, pyyaml, docutils, pytest, fetchpatch }: +{ lib, buildPythonPackage, fetchPypi, cryptography, boto3, pyyaml, docutils, pytest, fetchpatch }: buildPythonPackage rec { pname = "credstash"; diff --git a/pkgs/development/python-modules/criticality-score/default.nix b/pkgs/development/python-modules/criticality-score/default.nix new file mode 100644 index 00000000000..6b3348472a4 --- /dev/null +++ b/pkgs/development/python-modules/criticality-score/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchPypi, PyGithub, python-gitlab }: + +buildPythonPackage rec { + pname = "criticality_score"; + version = "1.0.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "0i811a27i87z3j1rw0dwrnw8v0ckbd918ms6shjawhs4cnb1c6x8"; + }; + + propagatedBuildInputs = [ PyGithub python-gitlab ]; + + doCheck = false; + + pythonImportsCheck = [ "criticality_score" ]; + + meta = with lib; { + description = "Python tool for computing the Open Source Project Criticality Score."; + homepage = "https://github.com/ossf/criticality_score"; + license = licenses.asl20; + maintainers = with maintainers; [ wamserma ]; + }; +} diff --git a/pkgs/development/python-modules/cryptacular/default.nix b/pkgs/development/python-modules/cryptacular/default.nix index dc97e96e4f5..dccfddaea1a 100644 --- a/pkgs/development/python-modules/cryptacular/default.nix +++ b/pkgs/development/python-modules/cryptacular/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, pythonAtLeast +{ lib, buildPythonPackage, fetchPypi, isPy27, pythonAtLeast , coverage, nose, pbkdf2 }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/cryptography/3.3.nix b/pkgs/development/python-modules/cryptography/3.3.nix index a9531824158..b6972e6d56b 100644 --- a/pkgs/development/python-modules/cryptography/3.3.nix +++ b/pkgs/development/python-modules/cryptography/3.3.nix @@ -33,18 +33,18 @@ buildPythonPackage rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = stdenv.lib.optionals (!isPyPy) [ + nativeBuildInputs = lib.optionals (!isPyPy) [ cffi ]; buildInputs = [ openssl ] - ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; propagatedBuildInputs = [ packaging six - ] ++ stdenv.lib.optionals (!isPyPy) [ + ] ++ lib.optionals (!isPyPy) [ cffi - ] ++ stdenv.lib.optionals isPy27 [ + ] ++ lib.optionals isPy27 [ ipaddress enum34 ]; diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index bae494989c7..ad402efd759 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -31,18 +31,18 @@ buildPythonPackage rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = stdenv.lib.optionals (!isPyPy) [ + nativeBuildInputs = lib.optionals (!isPyPy) [ cffi ]; buildInputs = [ openssl ] - ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; propagatedBuildInputs = [ packaging six - ] ++ stdenv.lib.optionals (!isPyPy) [ + ] ++ lib.optionals (!isPyPy) [ cffi - ] ++ stdenv.lib.optionals isPy27 [ + ] ++ lib.optionals isPy27 [ ipaddress enum34 ]; diff --git a/pkgs/development/python-modules/csrmesh/default.nix b/pkgs/development/python-modules/csrmesh/default.nix new file mode 100644 index 00000000000..14275634156 --- /dev/null +++ b/pkgs/development/python-modules/csrmesh/default.nix @@ -0,0 +1,32 @@ +{ lib +, bluepy +, buildPythonPackage +, fetchPypi +, pycryptodomex +}: + +buildPythonPackage rec { + pname = "csrmesh"; + version = "0.10.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "03lzam54ypcfvqvikh3gsrivvlidmz1ifdq15xv8c5i3n5b178ag"; + }; + + propagatedBuildInputs = [ + bluepy + pycryptodomex + ]; + + # Project has no test + doCheck = false; + pythonImportsCheck = [ "csrmesh" ]; + + meta = with lib; { + description = "Python implementation of the CSRMesh bridge protocol"; + homepage = "https://github.com/nkaminski/csrmesh"; + license = with licenses; [ lgpl3Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/csscompressor/default.nix b/pkgs/development/python-modules/csscompressor/default.nix index a7256a54e3b..b3d08c12e62 100644 --- a/pkgs/development/python-modules/csscompressor/default.nix +++ b/pkgs/development/python-modules/csscompressor/default.nix @@ -1,4 +1,5 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: + buildPythonPackage rec { pname = "csscompressor"; version = "0.9.5"; @@ -10,10 +11,10 @@ buildPythonPackage rec { doCheck = false; # No tests - meta = { + meta = with lib; { description = "A python port of YUI CSS Compressor"; homepage = "https://pypi.python.org/pypi/csscompressor"; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; maintainers = []; }; } diff --git a/pkgs/development/python-modules/cssmin/default.nix b/pkgs/development/python-modules/cssmin/default.nix index a6f6f3c956a..929640a7c1e 100644 --- a/pkgs/development/python-modules/cssmin/default.nix +++ b/pkgs/development/python-modules/cssmin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "cssmin"; diff --git a/pkgs/development/python-modules/cssselect/default.nix b/pkgs/development/python-modules/cssselect/default.nix index fe13fa9582e..04b6dc36afa 100644 --- a/pkgs/development/python-modules/cssselect/default.nix +++ b/pkgs/development/python-modules/cssselect/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "cssselect"; diff --git a/pkgs/development/python-modules/cssutils/default.nix b/pkgs/development/python-modules/cssutils/default.nix index ea3ac6236e9..a12fbf48c82 100644 --- a/pkgs/development/python-modules/cssutils/default.nix +++ b/pkgs/development/python-modules/cssutils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, mock }: +{ lib, buildPythonPackage, fetchPypi, mock }: buildPythonPackage rec { pname = "cssutils"; diff --git a/pkgs/development/python-modules/csvw/default.nix b/pkgs/development/python-modules/csvw/default.nix index 70e817dc299..410248b0193 100644 --- a/pkgs/development/python-modules/csvw/default.nix +++ b/pkgs/development/python-modules/csvw/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "csvw"; - version = "1.8.1"; + version = "1.10.0"; disabled = isPy27; src = fetchFromGitHub { owner = "cldf"; repo = "csvw"; rev = "v${version}"; - sha256 = "1cafwgkspkc299shsa5x8wfzkx1d63p9rvslj9jwr68fipd1830w"; + sha256 = "0cvfzfi1a2m1xqpm34mwp9r3bhgsnfz4pmslvgn81i42n5grbnis"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index 09685d392d6..5c4978a388f 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage +{ lib, buildPythonPackage , fetchPypi, isPy3k, linuxPackages , fastrlock, numpy, six, wheel, pytest, mock, setuptools , cudatoolkit, cudnn, nccl @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "cupy"; - version = "8.3.0"; + version = "8.4.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "db699fddfde7806445908cf6454c6f4985e7a9563b40405ddf97845d808c5f12"; + sha256 = "58d19af6b2e83388d4f0f6ca4226bae4b947920d2ca4951c2eddc8bc78abf66b"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/curtsies/default.nix b/pkgs/development/python-modules/curtsies/default.nix index f860f2ae5eb..62f1435df30 100644 --- a/pkgs/development/python-modules/curtsies/default.nix +++ b/pkgs/development/python-modules/curtsies/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, pythonOlder, blessings, mock, nose, pyte, wcwidth, typing }: +{ lib, buildPythonPackage, fetchPypi, fetchpatch, pythonOlder, blessings, mock, nose, pyte, wcwidth, typing }: buildPythonPackage rec { pname = "curtsies"; @@ -17,7 +17,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ blessings wcwidth ] - ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ]; + ++ lib.optionals (pythonOlder "3.5") [ typing ]; checkInputs = [ mock pyte nose ]; diff --git a/pkgs/development/python-modules/curve25519-donna/default.nix b/pkgs/development/python-modules/curve25519-donna/default.nix index e42f4021a6f..7698b5d6571 100644 --- a/pkgs/development/python-modules/curve25519-donna/default.nix +++ b/pkgs/development/python-modules/curve25519-donna/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "curve25519-donna"; diff --git a/pkgs/development/python-modules/cvxopt/default.nix b/pkgs/development/python-modules/cvxopt/default.nix index bafa75072f7..9270effcaa9 100644 --- a/pkgs/development/python-modules/cvxopt/default.nix +++ b/pkgs/development/python-modules/cvxopt/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , buildPythonPackage , fetchPypi , isPyPy diff --git a/pkgs/development/python-modules/cx_freeze/default.nix b/pkgs/development/python-modules/cx_freeze/default.nix index 14a585617c6..1c3ee689299 100644 --- a/pkgs/development/python-modules/cx_freeze/default.nix +++ b/pkgs/development/python-modules/cx_freeze/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, pythonOlder, fetchPypi, ncurses, importlib-metadata }: +{ lib, buildPythonPackage, pythonOlder, fetchPypi, ncurses, importlib-metadata }: buildPythonPackage rec { pname = "cx_Freeze"; diff --git a/pkgs/development/python-modules/cx_oracle/default.nix b/pkgs/development/python-modules/cx_oracle/default.nix index ceacad12059..c81443e0990 100644 --- a/pkgs/development/python-modules/cx_oracle/default.nix +++ b/pkgs/development/python-modules/cx_oracle/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, odpic }: +{ lib, buildPythonPackage, fetchPypi, odpic }: buildPythonPackage rec { pname = "cx_Oracle"; - version = "8.0.1"; + version = "8.1.0"; buildInputs = [ odpic ]; src = fetchPypi { inherit pname version; - sha256 = "f10ada7f821a325c6befdd6fef1cac44ebc830736d0b75dda7b8ac9f851087b2"; + sha256 = "e1698c5522ee1355e552b30bfa0a58e6e772475b882c5d69d158bd7e6aed45de"; }; preConfigure = '' diff --git a/pkgs/development/python-modules/cymem/default.nix b/pkgs/development/python-modules/cymem/default.nix index d805ba5de1f..c2de6d82a5b 100644 --- a/pkgs/development/python-modules/cymem/default.nix +++ b/pkgs/development/python-modules/cymem/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , cython diff --git a/pkgs/development/python-modules/cypari2/default.nix b/pkgs/development/python-modules/cypari2/default.nix index 8a0adb3d6c9..a7115d1e940 100644 --- a/pkgs/development/python-modules/cypari2/default.nix +++ b/pkgs/development/python-modules/cypari2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , python , fetchPypi diff --git a/pkgs/development/python-modules/daemonize/default.nix b/pkgs/development/python-modules/daemonize/default.nix index 30d4f1bd714..26f23b7156d 100644 --- a/pkgs/development/python-modules/daemonize/default.nix +++ b/pkgs/development/python-modules/daemonize/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/darcsver/default.nix b/pkgs/development/python-modules/darcsver/default.nix index 6484d84253b..c46337981bd 100644 --- a/pkgs/development/python-modules/darcsver/default.nix +++ b/pkgs/development/python-modules/darcsver/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, mock }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, mock }: buildPythonPackage rec { pname = "darcsver"; diff --git a/pkgs/development/python-modules/dask-glm/default.nix b/pkgs/development/python-modules/dask-glm/default.nix index 1db03b66ffb..86bc2da1565 100644 --- a/pkgs/development/python-modules/dask-glm/default.nix +++ b/pkgs/development/python-modules/dask-glm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , cloudpickle diff --git a/pkgs/development/python-modules/dask-image/default.nix b/pkgs/development/python-modules/dask-image/default.nix index eac503c2f85..a3cc7b6afda 100644 --- a/pkgs/development/python-modules/dask-image/default.nix +++ b/pkgs/development/python-modules/dask-image/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , fetchpatch diff --git a/pkgs/development/python-modules/dask-jobqueue/default.nix b/pkgs/development/python-modules/dask-jobqueue/default.nix index be27399b71f..f4f5c03858a 100644 --- a/pkgs/development/python-modules/dask-jobqueue/default.nix +++ b/pkgs/development/python-modules/dask-jobqueue/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , dask diff --git a/pkgs/development/python-modules/dask-ml/default.nix b/pkgs/development/python-modules/dask-ml/default.nix index 4d3aa8e79a0..4836fe35d18 100644 --- a/pkgs/development/python-modules/dask-ml/default.nix +++ b/pkgs/development/python-modules/dask-ml/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonOlder diff --git a/pkgs/development/python-modules/dask-mpi/default.nix b/pkgs/development/python-modules/dask-mpi/default.nix index f2d8737b38e..1bec4c82872 100644 --- a/pkgs/development/python-modules/dask-mpi/default.nix +++ b/pkgs/development/python-modules/dask-mpi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , dask diff --git a/pkgs/development/python-modules/dask-xgboost/default.nix b/pkgs/development/python-modules/dask-xgboost/default.nix index c60f628d72e..4e64b8c9f0c 100644 --- a/pkgs/development/python-modules/dask-xgboost/default.nix +++ b/pkgs/development/python-modules/dask-xgboost/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , xgboost diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 2fb39303583..72146342144 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "dask"; - version = "2.25.0"; + version = "2021.01.0"; disabled = pythonOlder "3.5"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "dask"; repo = pname; rev = version; - sha256 = "1irp6s577yyjvrvkg00hh1wnl8vrv7pbnbr09mk67z9y7s6xhiw3"; + sha256 = "V2cEOzV/L1zjyQ76zlGyN9CIkq6W8y8Yab4NQi3/Ju4="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/databricks-cli/default.nix b/pkgs/development/python-modules/databricks-cli/default.nix index 30001b781d2..483c565536d 100644 --- a/pkgs/development/python-modules/databricks-cli/default.nix +++ b/pkgs/development/python-modules/databricks-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , click , requests , tabulate diff --git a/pkgs/development/python-modules/databricks-connect/default.nix b/pkgs/development/python-modules/databricks-connect/default.nix index 1c4261c92bf..299fa824034 100644 --- a/pkgs/development/python-modules/databricks-connect/default.nix +++ b/pkgs/development/python-modules/databricks-connect/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "databricks-connect"; - version = "7.3.5"; + version = "7.3.7"; src = fetchPypi { inherit pname version; - sha256 = "c720298b05648f5de8f17de03f93d60ffb30c2d55ce2750e63c17c341a8de5e4"; + sha256 = "35ead50a0550e65a7d6fd78e2c8e54095b53514fba85180768a2dbcdd3f2cf0b"; }; sourceRoot = "."; diff --git a/pkgs/development/python-modules/dataclasses/default.nix b/pkgs/development/python-modules/dataclasses/default.nix index a88995937d8..c276e9d000b 100644 --- a/pkgs/development/python-modules/dataclasses/default.nix +++ b/pkgs/development/python-modules/dataclasses/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy36 }: +{ lib, buildPythonPackage, fetchPypi, isPy36 }: buildPythonPackage rec { pname = "dataclasses"; diff --git a/pkgs/development/python-modules/datadiff/default.nix b/pkgs/development/python-modules/datadiff/default.nix index 68046235227..4124457586c 100644 --- a/pkgs/development/python-modules/datadiff/default.nix +++ b/pkgs/development/python-modules/datadiff/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/pkgs/development/python-modules/datamodeldict/default.nix b/pkgs/development/python-modules/datamodeldict/default.nix index f3eab1d1d4e..551b1096222 100644 --- a/pkgs/development/python-modules/datamodeldict/default.nix +++ b/pkgs/development/python-modules/datamodeldict/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , xmltodict diff --git a/pkgs/development/python-modules/datasette/default.nix b/pkgs/development/python-modules/datasette/default.nix index 2e0039b2317..026c93f2378 100644 --- a/pkgs/development/python-modules/datasette/default.nix +++ b/pkgs/development/python-modules/datasette/default.nix @@ -27,13 +27,13 @@ buildPythonPackage rec { pname = "datasette"; - version = "0.53"; + version = "0.54"; src = fetchFromGitHub { owner = "simonw"; repo = "datasette"; rev = version; - sha256 = "1rsgxkvav1qy2ia2csm1jvabd8klh3ly8719979gdlx2il1cjjkz"; + sha256 = "sha256-7cfoKteBOnwFsViBegAYhb/NLUSwMSyFVbwDF9ngD8w="; }; nativeBuildInputs = [ pytestrunner ]; diff --git a/pkgs/development/python-modules/dateutil/default.nix b/pkgs/development/python-modules/dateutil/default.nix index a6aca68ef29..dcad0c3698a 100644 --- a/pkgs/development/python-modules/dateutil/default.nix +++ b/pkgs/development/python-modules/dateutil/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, six, setuptools_scm, pytest }: +{ lib, buildPythonPackage, fetchPypi, six, setuptools_scm, pytest }: buildPythonPackage rec { pname = "python-dateutil"; version = "2.8.1"; diff --git a/pkgs/development/python-modules/datrie/default.nix b/pkgs/development/python-modules/datrie/default.nix index c7f74730c16..d8bbc96fcc4 100644 --- a/pkgs/development/python-modules/datrie/default.nix +++ b/pkgs/development/python-modules/datrie/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch +{ lib, buildPythonPackage, fetchPypi, fetchpatch , cython, pytest, pytestrunner, hypothesis }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/dbf/default.nix b/pkgs/development/python-modules/dbf/default.nix index 348f91ea683..18560734bd8 100644 --- a/pkgs/development/python-modules/dbf/default.nix +++ b/pkgs/development/python-modules/dbf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, aenum, isPy3k, pythonOlder, enum34, python }: +{ lib, fetchPypi, buildPythonPackage, aenum, isPy3k, pythonOlder, enum34, python }: buildPythonPackage rec { pname = "dbf"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "a4a7a8cdc113d840142d21a796c16c7d329ad35c48f17156446732c83ebc571a"; }; - propagatedBuildInputs = [ aenum ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34; + propagatedBuildInputs = [ aenum ] ++ lib.optional (pythonOlder "3.4") enum34; doCheck = !isPy3k; # tests are not yet ported. diff --git a/pkgs/development/python-modules/dbfread/default.nix b/pkgs/development/python-modules/dbfread/default.nix index 9f78f3fdde1..1708a75fc10 100644 --- a/pkgs/development/python-modules/dbfread/default.nix +++ b/pkgs/development/python-modules/dbfread/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage }: +{ lib, fetchPypi, buildPythonPackage }: buildPythonPackage rec { pname = "dbfread"; diff --git a/pkgs/development/python-modules/dbus-next/default.nix b/pkgs/development/python-modules/dbus-next/default.nix index 76385ac8023..d7cf79f9d07 100644 --- a/pkgs/development/python-modules/dbus-next/default.nix +++ b/pkgs/development/python-modules/dbus-next/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , python diff --git a/pkgs/development/python-modules/dbus/default.nix b/pkgs/development/python-modules/dbus/default.nix index aadf53e9925..a6e2e28c6f5 100644 --- a/pkgs/development/python-modules/dbus/default.nix +++ b/pkgs/development/python-modules/dbus/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, buildPythonPackage, python, pkgconfig, dbus, dbus-glib, isPyPy +{ lib, fetchPypi, buildPythonPackage, python, pkg-config, dbus, dbus-glib, isPyPy , ncurses, pygobject3, isPy3k }: buildPythonPackage rec { @@ -19,7 +19,7 @@ buildPythonPackage rec { disabled = isPyPy; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ dbus dbus-glib ] # My guess why it's sometimes trying to -lncurses. # It seems not to retain the dependency anyway. diff --git a/pkgs/development/python-modules/dbutils/default.nix b/pkgs/development/python-modules/dbutils/default.nix index 42ae779e0d2..848e5038af8 100644 --- a/pkgs/development/python-modules/dbutils/default.nix +++ b/pkgs/development/python-modules/dbutils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytestCheckHook }: +{ lib, buildPythonPackage, fetchPypi, pytestCheckHook }: buildPythonPackage rec { version = "2.0"; diff --git a/pkgs/development/python-modules/dcmstack/default.nix b/pkgs/development/python-modules/dcmstack/default.nix index a6669d0e30d..ee554a6e2bd 100644 --- a/pkgs/development/python-modules/dcmstack/default.nix +++ b/pkgs/development/python-modules/dcmstack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , pythonAtLeast diff --git a/pkgs/development/python-modules/deap/default.nix b/pkgs/development/python-modules/deap/default.nix index 21dc9d3832c..f260727b87a 100644 --- a/pkgs/development/python-modules/deap/default.nix +++ b/pkgs/development/python-modules/deap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, python, numpy, matplotlib, nose }: +{ lib, buildPythonPackage, fetchPypi, python, numpy, matplotlib, nose }: buildPythonPackage rec { pname = "deap"; diff --git a/pkgs/development/python-modules/debian/default.nix b/pkgs/development/python-modules/debian/default.nix index 9f5cb744e55..e97c3420f45 100644 --- a/pkgs/development/python-modules/debian/default.nix +++ b/pkgs/development/python-modules/debian/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "python-debian"; - version = "0.1.38"; + version = "0.1.39"; src = fetchPypi { inherit pname version; - sha256 = "a352bb5f9ef19b0272078f516ee0ec42b05e90ac85651d87c10e7041550dcc1d"; + sha256 = "6cca96239b5981f5203216d2113fea522477628607ed0a8427e15094a792541c"; }; propagatedBuildInputs = [ chardet six ]; diff --git a/pkgs/development/python-modules/deep_merge/default.nix b/pkgs/development/python-modules/deep_merge/default.nix new file mode 100644 index 00000000000..533bc6aa347 --- /dev/null +++ b/pkgs/development/python-modules/deep_merge/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, nose }: + +buildPythonPackage rec { + pname = "deep_merge"; + version = "0.0.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "tUQV+Qk0xC4zQRTihky01OczWzStOW41rYYQyWBlpH4="; + }; + + checkInputs = [ + nose + ]; + + doCheck = false; + + meta = with lib; { + description = "This library contains a simple utility for deep-merging dictionaries and the data structures they contain"; + homepage = "https://github.com/halfak/deep_merge"; + license = licenses.mit; + maintainers = [ maintainers.anhdle14 ]; + }; +} diff --git a/pkgs/development/python-modules/deform/default.nix b/pkgs/development/python-modules/deform/default.nix index bc84df26a27..5698dcbe491 100644 --- a/pkgs/development/python-modules/deform/default.nix +++ b/pkgs/development/python-modules/deform/default.nix @@ -11,11 +11,6 @@ buildPythonPackage rec { sha256 = "1e912937650c1dbb830079dd9c039950762a230223a567740fbf1b23f1090367"; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "iso8601<=0.1.11" iso8601 - ''; - propagatedBuildInputs = [ chameleon colander diff --git a/pkgs/development/python-modules/deluge-client/default.nix b/pkgs/development/python-modules/deluge-client/default.nix index a271371e22f..4426fe65bf5 100644 --- a/pkgs/development/python-modules/deluge-client/default.nix +++ b/pkgs/development/python-modules/deluge-client/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "deluge-client"; diff --git a/pkgs/development/python-modules/demjson/default.nix b/pkgs/development/python-modules/demjson/default.nix index 988c2815da8..25e2692af3b 100644 --- a/pkgs/development/python-modules/demjson/default.nix +++ b/pkgs/development/python-modules/demjson/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python, buildPythonPackage, fetchPypi, isPy3k }: +{ lib, python, buildPythonPackage, fetchPypi, isPy3k }: buildPythonPackage rec { pname = "demjson"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "0ygbddpnvp5lby6mr5kz60la3hkvwwzv3wwb3z0w9ngxl0w21pii"; }; - checkPhase = stdenv.lib.optionalString isPy3k '' + checkPhase = lib.optionalString isPy3k '' ${python.interpreter} -m lib2to3 -w test/test_demjson.py '' + '' ${python.interpreter} test/test_demjson.py diff --git a/pkgs/development/python-modules/dependency-injector/default.nix b/pkgs/development/python-modules/dependency-injector/default.nix index 0c2e2055ff9..979d2811fe6 100644 --- a/pkgs/development/python-modules/dependency-injector/default.nix +++ b/pkgs/development/python-modules/dependency-injector/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, six, unittest2, pyyaml, flask }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, six, unittest2, pyyaml, flask }: let testPath = diff --git a/pkgs/development/python-modules/deprecated/default.nix b/pkgs/development/python-modules/deprecated/default.nix index bca1de711f2..0374bebe4f9 100644 --- a/pkgs/development/python-modules/deprecated/default.nix +++ b/pkgs/development/python-modules/deprecated/default.nix @@ -1,13 +1,13 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, - wrapt, pytest, tox }: +{ lib, fetchPypi, buildPythonPackage, + wrapt, pytest, tox }: buildPythonPackage rec { pname = "Deprecated"; - version = "1.2.10"; + version = "1.2.11"; src = fetchPypi { inherit pname version; - sha256 = "0x3zkmykcyjn8k57g8lcf89fxw8q7hvvcj6xkwb0f2zrnmpscnsj"; + sha256 = "471ec32b2755172046e28102cd46c481f21c6036a0ec027521eba8521aa4ef35"; }; propagatedBuildInputs = [ wrapt ]; diff --git a/pkgs/development/python-modules/derpconf/default.nix b/pkgs/development/python-modules/derpconf/default.nix index f9b8f5dec7c..cc7b6870ad8 100644 --- a/pkgs/development/python-modules/derpconf/default.nix +++ b/pkgs/development/python-modules/derpconf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, six }: +{ lib, buildPythonPackage, fetchPypi, six }: buildPythonPackage rec { pname = "derpconf"; diff --git a/pkgs/development/python-modules/descartes/default.nix b/pkgs/development/python-modules/descartes/default.nix index 5280ff2417a..b10526ff0fd 100644 --- a/pkgs/development/python-modules/descartes/default.nix +++ b/pkgs/development/python-modules/descartes/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, +{ lib, buildPythonPackage, fetchPypi, matplotlib, shapely }: diff --git a/pkgs/development/python-modules/deskcon/default.nix b/pkgs/development/python-modules/deskcon/default.nix index 01918445b34..43d5a955027 100644 --- a/pkgs/development/python-modules/deskcon/default.nix +++ b/pkgs/development/python-modules/deskcon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , pyopenssl , pkgs diff --git a/pkgs/development/python-modules/devolo-home-control-api/default.nix b/pkgs/development/python-modules/devolo-home-control-api/default.nix new file mode 100644 index 00000000000..1e388fd3a11 --- /dev/null +++ b/pkgs/development/python-modules/devolo-home-control-api/default.nix @@ -0,0 +1,49 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pytest-cov +, pytest-mock +, requests +, zeroconf +, websocket_client +, pytest-runner +}: + +buildPythonPackage rec { + pname = "devolo-home-control-api"; + version = "0.16.0"; + + src = fetchFromGitHub { + owner = "2Fake"; + repo = "devolo_home_control_api"; + rev = "v${version}"; + sha256 = "19zzdbx0dxlm8pq0yk00nn9gqqblgpp16fgl7z6a98hsa6459zzb"; + }; + + nativeBuildInputs = [ pytest-runner ]; + + propagatedBuildInputs = [ + requests + zeroconf + websocket_client + ]; + + checkInputs = [ + pytestCheckHook + pytest-cov + pytest-mock + ]; + + # Disable test that requires network access + disabledTests = [ "test__on_pong" ]; + pythonImportsCheck = [ "devolo_home_control_api" ]; + + meta = with lib; { + description = "Python library to work with devolo Home Control"; + homepage = "https://github.com/2Fake/devolo_home_control_api"; + license = with licenses; [ gpl3Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/diff_cover/default.nix b/pkgs/development/python-modules/diff_cover/default.nix index 9672cca46b0..03b1f4fa28e 100644 --- a/pkgs/development/python-modules/diff_cover/default.nix +++ b/pkgs/development/python-modules/diff_cover/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , inflect , jinja2 , jinja2_pluralize diff --git a/pkgs/development/python-modules/digi-xbee/default.nix b/pkgs/development/python-modules/digi-xbee/default.nix index ad653c6313c..d5f1445a677 100644 --- a/pkgs/development/python-modules/digi-xbee/default.nix +++ b/pkgs/development/python-modules/digi-xbee/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy27, pyserial, srp, lib }: +{ buildPythonPackage, fetchPypi, isPy27, pyserial, srp, lib }: buildPythonPackage rec { pname = "digi-xbee"; diff --git a/pkgs/development/python-modules/digitalocean/default.nix b/pkgs/development/python-modules/digitalocean/default.nix index f052d8f978e..7ba0d106e25 100644 --- a/pkgs/development/python-modules/digitalocean/default.nix +++ b/pkgs/development/python-modules/digitalocean/default.nix @@ -1,4 +1,5 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchFromGitHub , fetchPypi , isPy3k @@ -8,18 +9,17 @@ , pytestCheckHook , requests , responses -, lib, stdenv }: buildPythonPackage rec { pname = "python-digitalocean"; - version = "1.15.0"; + version = "1.16.0"; src = fetchFromGitHub { owner = "koalalorenzo"; - repo = "python-digitalocean"; + repo = pname; rev = "v${version}"; - sha256 = "1pz15mh72i992p63grwzqn2bbp6sm37zcp4f0fy1z7rsargwsbcz"; + sha256 = "16fxlfpisj4rcj9dvlifs6bpx42a0sn9b07bnyzwrbhi6nfvkd2g"; }; propagatedBuildInputs = [ @@ -33,7 +33,7 @@ buildPythonPackage rec { pytest pytestCheckHook responses - ] ++ stdenv.lib.optionals (!isPy3k) [ + ] ++ lib.optionals (!isPy3k) [ mock ]; @@ -41,13 +41,12 @@ buildPythonPackage rec { cd digitalocean ''; + pythonImportsCheck = [ "digitalocean" ]; + meta = with lib; { - description = "digitalocean.com API to manage Droplets and Images"; - homepage = "https://pypi.python.org/pypi/python-digitalocean"; - license = licenses.lgpl3; - maintainers = with maintainers; [ - kiwi - teh - ]; + description = "Python API to manage Digital Ocean Droplets and Images"; + homepage = "https://github.com/koalalorenzo/python-digitalocean"; + license = with licenses; [ lgpl3Only ]; + maintainers = with maintainers; [ kiwi teh ]; }; } diff --git a/pkgs/development/python-modules/discogs_client/default.nix b/pkgs/development/python-modules/discogs_client/default.nix index 5e3ac1e1fcd..e522ac4b6c9 100644 --- a/pkgs/development/python-modules/discogs_client/default.nix +++ b/pkgs/development/python-modules/discogs_client/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, requests, oauthlib }: +{ lib, buildPythonPackage, fetchPypi, requests, oauthlib }: buildPythonPackage rec { pname = "discogs-client"; diff --git a/pkgs/development/python-modules/diskcache/default.nix b/pkgs/development/python-modules/diskcache/default.nix index 793b0edd697..8b968c3272f 100644 --- a/pkgs/development/python-modules/diskcache/default.nix +++ b/pkgs/development/python-modules/diskcache/default.nix @@ -1,7 +1,8 @@ -{ lib +{ stdenv +, lib , buildPythonPackage , fetchFromGitHub -, pytest +, pytestCheckHook , pytestcov , pytest_xdist , pytest-django @@ -11,28 +12,25 @@ buildPythonPackage rec { pname = "diskcache"; - version = "4.1.0"; + version = "5.1.0"; src = fetchFromGitHub { owner = "grantjenks"; repo = "python-diskcache"; rev = "v${version}"; - sha256 = "0xy2vpk4hixb4gg871d9sx9wxdz8pi0pmnfdwg4bf8jqfjg022w8"; + sha256 = "0xwqw60dbn1x2294galcs08vm6ydcr677lr8slqz8a3ry6sgkhn9"; }; checkInputs = [ - pytest + pytestCheckHook pytestcov pytest_xdist pytest-django mock ]; - disabled = lib.versionAtLeast django.version "2.0"; - - checkPhase = '' - pytest - ''; + # Darwin sandbox causes most tests to fail. + doCheck = !stdenv.isDarwin; meta = with lib; { description = "Disk and file backed persistent cache"; diff --git a/pkgs/development/python-modules/distlib/default.nix b/pkgs/development/python-modules/distlib/default.nix index 403834a3731..12e05b58c4c 100644 --- a/pkgs/development/python-modules/distlib/default.nix +++ b/pkgs/development/python-modules/distlib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "distlib"; diff --git a/pkgs/development/python-modules/distorm3/default.nix b/pkgs/development/python-modules/distorm3/default.nix index e9b8e66d4c9..d798414c197 100644 --- a/pkgs/development/python-modules/distorm3/default.nix +++ b/pkgs/development/python-modules/distorm3/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "distorm3"; diff --git a/pkgs/development/python-modules/distro/default.nix b/pkgs/development/python-modules/distro/default.nix index 81bcccd8bd6..16d26e741aa 100644 --- a/pkgs/development/python-modules/distro/default.nix +++ b/pkgs/development/python-modules/distro/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage }: +{ lib, fetchPypi, buildPythonPackage }: buildPythonPackage rec { pname = "distro"; diff --git a/pkgs/development/python-modules/distutils_extra/default.nix b/pkgs/development/python-modules/distutils_extra/default.nix index 882a3995799..c2fbcdfe46c 100644 --- a/pkgs/development/python-modules/distutils_extra/default.nix +++ b/pkgs/development/python-modules/distutils_extra/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl }: diff --git a/pkgs/development/python-modules/dj-email-url/default.nix b/pkgs/development/python-modules/dj-email-url/default.nix index f8dd9dca202..ee2d8e2f21e 100644 --- a/pkgs/development/python-modules/dj-email-url/default.nix +++ b/pkgs/development/python-modules/dj-email-url/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , python }: buildPythonPackage rec { - version = "1.0.1"; + version = "1.0.2"; pname = "dj-email-url"; src = fetchPypi { inherit pname version; - sha256 = "32dc567c5cc3d4106710ec36dd645c8c1b20e2d8f588a17ab88bcc23e347d00a"; + sha256 = "838fd4ded9deba53ae757debef431e25fa7fca31d3948b3c4808ccdc84fab2b7"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/dj-search-url/default.nix b/pkgs/development/python-modules/dj-search-url/default.nix index 321bec8149d..b216c8e62a1 100644 --- a/pkgs/development/python-modules/dj-search-url/default.nix +++ b/pkgs/development/python-modules/dj-search-url/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/django-allauth/default.nix b/pkgs/development/python-modules/django-allauth/default.nix index fafd7ab9a63..143e76cf0d8 100644 --- a/pkgs/development/python-modules/django-allauth/default.nix +++ b/pkgs/development/python-modules/django-allauth/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, requests, requests_oauthlib +{ lib, buildPythonPackage, fetchFromGitHub, requests, requests_oauthlib , django, python3-openid, mock, coverage }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/django-anymail/default.nix b/pkgs/development/python-modules/django-anymail/default.nix index 892cf179c37..6f1d81c9287 100644 --- a/pkgs/development/python-modules/django-anymail/default.nix +++ b/pkgs/development/python-modules/django-anymail/default.nix @@ -1,5 +1,5 @@ { - lib, stdenv, + lib, buildPythonPackage, fetchFromGitHub, six, @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "django-anymail"; - version = "8.1"; + version = "8.2"; src = fetchFromGitHub { owner = "anymail"; repo = pname; rev = "v${version}"; - sha256 = "1v8ayd3nh7pna9lg0pzwgwmvmzzh2g1kxsy7i6mka0hi52g1xvz5"; + sha256 = "0zd4w707az36pp8wimlz6sfxwy9w190qp93brl78pva3rhnx5p97"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django-auth-ldap/default.nix b/pkgs/development/python-modules/django-auth-ldap/default.nix index d0dacd659a1..2271be1d16f 100644 --- a/pkgs/development/python-modules/django-auth-ldap/default.nix +++ b/pkgs/development/python-modules/django-auth-ldap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi, isPy27 , ldap , django diff --git a/pkgs/development/python-modules/django-cache-url/default.nix b/pkgs/development/python-modules/django-cache-url/default.nix index 103bfb29578..6487e276232 100644 --- a/pkgs/development/python-modules/django-cache-url/default.nix +++ b/pkgs/development/python-modules/django-cache-url/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/pkgs/development/python-modules/django-cleanup/default.nix b/pkgs/development/python-modules/django-cleanup/default.nix index 39f65275fee..83dbbc5d197 100644 --- a/pkgs/development/python-modules/django-cleanup/default.nix +++ b/pkgs/development/python-modules/django-cleanup/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, django +{ lib, buildPythonPackage, fetchPypi, django , redis, async-timeout, hiredis }: diff --git a/pkgs/development/python-modules/django-compat/default.nix b/pkgs/development/python-modules/django-compat/default.nix index ef18bfe77ec..d33a4be2817 100644 --- a/pkgs/development/python-modules/django-compat/default.nix +++ b/pkgs/development/python-modules/django-compat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python, +{ lib, buildPythonPackage, fetchFromGitHub, python, django, six }: diff --git a/pkgs/development/python-modules/django-configurations/default.nix b/pkgs/development/python-modules/django-configurations/default.nix index bf1835071f8..b6b736e9238 100644 --- a/pkgs/development/python-modules/django-configurations/default.nix +++ b/pkgs/development/python-modules/django-configurations/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , django-discover-runner diff --git a/pkgs/development/python-modules/django-csp/default.nix b/pkgs/development/python-modules/django-csp/default.nix index d87e39b8e3f..1f7b2811405 100644 --- a/pkgs/development/python-modules/django-csp/default.nix +++ b/pkgs/development/python-modules/django-csp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, django }: +{ lib, fetchPypi, buildPythonPackage, django }: buildPythonPackage rec { pname = "django-csp"; diff --git a/pkgs/development/python-modules/django-discover-runner/default.nix b/pkgs/development/python-modules/django-discover-runner/default.nix index 63d51d41fc9..8d07148ce18 100644 --- a/pkgs/development/python-modules/django-discover-runner/default.nix +++ b/pkgs/development/python-modules/django-discover-runner/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , django diff --git a/pkgs/development/python-modules/django-dynamic-preferences/default.nix b/pkgs/development/python-modules/django-dynamic-preferences/default.nix index 7288896c4fe..7e5105807cf 100644 --- a/pkgs/development/python-modules/django-dynamic-preferences/default.nix +++ b/pkgs/development/python-modules/django-dynamic-preferences/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , django, persisting-theory, six }: diff --git a/pkgs/development/python-modules/django-filter/default.nix b/pkgs/development/python-modules/django-filter/default.nix index e4ca546bbc2..00c260946cc 100644 --- a/pkgs/development/python-modules/django-filter/default.nix +++ b/pkgs/development/python-modules/django-filter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , django diff --git a/pkgs/development/python-modules/django-gravatar2/default.nix b/pkgs/development/python-modules/django-gravatar2/default.nix index 08312606603..458723601dd 100644 --- a/pkgs/development/python-modules/django-gravatar2/default.nix +++ b/pkgs/development/python-modules/django-gravatar2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "django-gravatar2"; diff --git a/pkgs/development/python-modules/django-hijack-admin/default.nix b/pkgs/development/python-modules/django-hijack-admin/default.nix index 54056547f48..ee5a47d3787 100644 --- a/pkgs/development/python-modules/django-hijack-admin/default.nix +++ b/pkgs/development/python-modules/django-hijack-admin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python, +{ lib, buildPythonPackage, fetchFromGitHub, python, django_hijack, django_nose }: buildPythonPackage rec { pname = "django-hijack-admin"; diff --git a/pkgs/development/python-modules/django-hijack/default.nix b/pkgs/development/python-modules/django-hijack/default.nix index bd6f870de66..fd9c30a4bc7 100644 --- a/pkgs/development/python-modules/django-hijack/default.nix +++ b/pkgs/development/python-modules/django-hijack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python, +{ lib, buildPythonPackage, fetchFromGitHub, python, django, django_compat, django_nose }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/django-logentry-admin/default.nix b/pkgs/development/python-modules/django-logentry-admin/default.nix index 59e9782f050..7bba272c155 100644 --- a/pkgs/development/python-modules/django-logentry-admin/default.nix +++ b/pkgs/development/python-modules/django-logentry-admin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonPackage, django, pytest, pytest-django }: +{ lib, fetchFromGitHub, buildPythonPackage, django, pytest, pytest-django }: buildPythonPackage rec { pname = "django-logentry-admin"; diff --git a/pkgs/development/python-modules/django-mailman3/default.nix b/pkgs/development/python-modules/django-mailman3/default.nix index 40063c89e43..11939b9b773 100644 --- a/pkgs/development/python-modules/django-mailman3/default.nix +++ b/pkgs/development/python-modules/django-mailman3/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, django-gravatar2, django_compressor +{ lib, buildPythonPackage, fetchPypi, django-gravatar2, django_compressor , django-allauth, mailmanclient, django, mock }: diff --git a/pkgs/development/python-modules/django-maintenance-mode/default.nix b/pkgs/development/python-modules/django-maintenance-mode/default.nix index c599e28d206..b4d90da0880 100644 --- a/pkgs/development/python-modules/django-maintenance-mode/default.nix +++ b/pkgs/development/python-modules/django-maintenance-mode/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonPackage, pytest, django }: +{ lib, fetchFromGitHub, buildPythonPackage, pytest, django }: buildPythonPackage rec { pname = "django-maintenance-mode"; diff --git a/pkgs/development/python-modules/django-oauth-toolkit/default.nix b/pkgs/development/python-modules/django-oauth-toolkit/default.nix index 6e16af5bc8f..e7cb4814cb4 100644 --- a/pkgs/development/python-modules/django-oauth-toolkit/default.nix +++ b/pkgs/development/python-modules/django-oauth-toolkit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchFromGitHub , django, requests, oauthlib }: diff --git a/pkgs/development/python-modules/django-paintstore/default.nix b/pkgs/development/python-modules/django-paintstore/default.nix index 4fed9bf470b..8790067e4af 100644 --- a/pkgs/development/python-modules/django-paintstore/default.nix +++ b/pkgs/development/python-modules/django-paintstore/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, requests, requests_oauthlib +{ lib, buildPythonPackage, fetchPypi, requests, requests_oauthlib , django, python3-openid }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/django-polymorphic/default.nix b/pkgs/development/python-modules/django-polymorphic/default.nix index c08facd3650..4b8d79a2917 100644 --- a/pkgs/development/python-modules/django-polymorphic/default.nix +++ b/pkgs/development/python-modules/django-polymorphic/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, python, django, dj-database-url }: +{ lib, buildPythonPackage, fetchFromGitHub, python, django, dj-database-url }: buildPythonPackage rec { pname = "django-polymorphic"; @@ -19,9 +19,9 @@ buildPythonPackage rec { ${python.interpreter} runtests.py ''; - meta = { + meta = with lib; { homepage = "https://github.com/django-polymorphic/django-polymorphic"; description = "Improved Django model inheritance with automatic downcasting"; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/django-postgresql-netfields/default.nix b/pkgs/development/python-modules/django-postgresql-netfields/default.nix index f2bd574919a..141a46f5315 100644 --- a/pkgs/development/python-modules/django-postgresql-netfields/default.nix +++ b/pkgs/development/python-modules/django-postgresql-netfields/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , django , netaddr diff --git a/pkgs/development/python-modules/django-q/default.nix b/pkgs/development/python-modules/django-q/default.nix index 2eb3b19f554..16b1e0bcc59 100644 --- a/pkgs/development/python-modules/django-q/default.nix +++ b/pkgs/development/python-modules/django-q/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, django-picklefield, arrow +{ lib, buildPythonPackage, fetchPypi, django-picklefield, arrow , blessed, django, future }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/django-ranged-response/default.nix b/pkgs/development/python-modules/django-ranged-response/default.nix index d517563590f..df5fc4b205b 100644 --- a/pkgs/development/python-modules/django-ranged-response/default.nix +++ b/pkgs/development/python-modules/django-ranged-response/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchPypi, buildPythonPackage, django }: +{ lib, fetchurl, fetchPypi, buildPythonPackage, django }: buildPythonPackage rec { pname = "django-ranged-response"; diff --git a/pkgs/development/python-modules/django-raster/default.nix b/pkgs/development/python-modules/django-raster/default.nix index a3aed647a33..609388a311c 100644 --- a/pkgs/development/python-modules/django-raster/default.nix +++ b/pkgs/development/python-modules/django-raster/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, +{ lib, buildPythonPackage, fetchPypi, isPy3k, numpy, django_colorful, pillow, psycopg2, pyparsing, django, celery, boto3, importlib-metadata }: -if stdenv.lib.versionOlder django.version "2.0" +if lib.versionOlder django.version "2.0" then throw "django-raster requires Django >= 2.0. Consider overiding the python package set to use django_2." else buildPythonPackage rec { diff --git a/pkgs/development/python-modules/django-storages/default.nix b/pkgs/development/python-modules/django-storages/default.nix index 869c3bf74ee..6efba78d4ca 100644 --- a/pkgs/development/python-modules/django-storages/default.nix +++ b/pkgs/development/python-modules/django-storages/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , django }: diff --git a/pkgs/development/python-modules/django-versatileimagefield/default.nix b/pkgs/development/python-modules/django-versatileimagefield/default.nix index 39912f47420..4307fc69d45 100644 --- a/pkgs/development/python-modules/django-versatileimagefield/default.nix +++ b/pkgs/development/python-modules/django-versatileimagefield/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , django diff --git a/pkgs/development/python-modules/django-webpack-loader/default.nix b/pkgs/development/python-modules/django-webpack-loader/default.nix index e3e094ab706..3e849b48773 100644 --- a/pkgs/development/python-modules/django-webpack-loader/default.nix +++ b/pkgs/development/python-modules/django-webpack-loader/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "django-webpack-loader"; diff --git a/pkgs/development/python-modules/django-widget-tweaks/default.nix b/pkgs/development/python-modules/django-widget-tweaks/default.nix index 8529df09bb7..853e12327d3 100644 --- a/pkgs/development/python-modules/django-widget-tweaks/default.nix +++ b/pkgs/development/python-modules/django-widget-tweaks/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchFromGitHub, python, lib, stdenv, django }: +{ buildPythonPackage, fetchFromGitHub, python, lib, django }: buildPythonPackage rec { pname = "django-widget-tweaks"; diff --git a/pkgs/development/python-modules/django/2.nix b/pkgs/development/python-modules/django/2.nix index 641ec02aae0..eac48593de2 100644 --- a/pkgs/development/python-modules/django/2.nix +++ b/pkgs/development/python-modules/django/2.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "cf5370a4d7765a9dd6d42a7b96b53c74f9446cd38209211304b210fe0404b861"; }; - patches = stdenv.lib.optional withGdal + patches = lib.optional withGdal (substituteAll { src = ./1.10-gis-libs.template.patch; geos = geos; diff --git a/pkgs/development/python-modules/django/3.nix b/pkgs/development/python-modules/django/3.nix index 2ea5b5a006c..2444146e837 100644 --- a/pkgs/development/python-modules/django/3.nix +++ b/pkgs/development/python-modules/django/3.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { sha256 = "2d78425ba74c7a1a74b196058b261b9733a8570782f4e2828974777ccca7edf7"; }; - patches = stdenv.lib.optional withGdal + patches = lib.optional withGdal (substituteAll { src = ./django_3_set_geos_gdal_lib.patch; geos = geos; diff --git a/pkgs/development/python-modules/django_appconf/default.nix b/pkgs/development/python-modules/django_appconf/default.nix index c9c9913d764..5da9ed0ca26 100644 --- a/pkgs/development/python-modules/django_appconf/default.nix +++ b/pkgs/development/python-modules/django_appconf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, six, django, fetchpatch }: +{ lib, buildPythonPackage, fetchFromGitHub, six, django, fetchpatch }: buildPythonPackage rec { pname = "django-appconf"; version = "1.0.3"; diff --git a/pkgs/development/python-modules/django_classytags/default.nix b/pkgs/development/python-modules/django_classytags/default.nix index e0a297e53c0..2ef8639c17e 100644 --- a/pkgs/development/python-modules/django_classytags/default.nix +++ b/pkgs/development/python-modules/django_classytags/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , django diff --git a/pkgs/development/python-modules/django_colorful/default.nix b/pkgs/development/python-modules/django_colorful/default.nix index 468327139e6..5de127a9722 100644 --- a/pkgs/development/python-modules/django_colorful/default.nix +++ b/pkgs/development/python-modules/django_colorful/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , django diff --git a/pkgs/development/python-modules/django_compressor/default.nix b/pkgs/development/python-modules/django_compressor/default.nix index f0080436489..edf5faa5af4 100644 --- a/pkgs/development/python-modules/django_compressor/default.nix +++ b/pkgs/development/python-modules/django_compressor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, +{ lib, buildPythonPackage, fetchPypi, rcssmin, rjsmin, django_appconf }: buildPythonPackage rec { pname = "django_compressor"; diff --git a/pkgs/development/python-modules/django_contrib_comments/default.nix b/pkgs/development/python-modules/django_contrib_comments/default.nix index a8872967df4..a452db3cf28 100644 --- a/pkgs/development/python-modules/django_contrib_comments/default.nix +++ b/pkgs/development/python-modules/django_contrib_comments/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , django diff --git a/pkgs/development/python-modules/django_environ/default.nix b/pkgs/development/python-modules/django_environ/default.nix index fa2618fa1a7..3f01a2b294a 100644 --- a/pkgs/development/python-modules/django_environ/default.nix +++ b/pkgs/development/python-modules/django_environ/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , django diff --git a/pkgs/development/python-modules/django_evolution/default.nix b/pkgs/development/python-modules/django_evolution/default.nix index dba92efb2d9..816442d6e2a 100644 --- a/pkgs/development/python-modules/django_evolution/default.nix +++ b/pkgs/development/python-modules/django_evolution/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/django_guardian/default.nix b/pkgs/development/python-modules/django_guardian/default.nix index 60023660ea5..957944f01d3 100644 --- a/pkgs/development/python-modules/django_guardian/default.nix +++ b/pkgs/development/python-modules/django_guardian/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , django_environ, mock, django , pytest, pytestrunner, pytest-django }: diff --git a/pkgs/development/python-modules/django_modelcluster/default.nix b/pkgs/development/python-modules/django_modelcluster/default.nix index 500fe2e2fbc..fdd4bd03b70 100644 --- a/pkgs/development/python-modules/django_modelcluster/default.nix +++ b/pkgs/development/python-modules/django_modelcluster/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytz diff --git a/pkgs/development/python-modules/django_nose/default.nix b/pkgs/development/python-modules/django_nose/default.nix index 7f2f9efcfc5..2506f6aba44 100644 --- a/pkgs/development/python-modules/django_nose/default.nix +++ b/pkgs/development/python-modules/django_nose/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/pkgs/development/python-modules/django_redis/default.nix b/pkgs/development/python-modules/django_redis/default.nix index 434dea7f0f2..56e4e845f08 100644 --- a/pkgs/development/python-modules/django_redis/default.nix +++ b/pkgs/development/python-modules/django_redis/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, +{ lib, fetchPypi, buildPythonPackage, mock, django, redis, msgpack }: buildPythonPackage rec { pname = "django-redis"; diff --git a/pkgs/development/python-modules/django_reversion/default.nix b/pkgs/development/python-modules/django_reversion/default.nix index 16574770ff9..6de1ce64328 100644 --- a/pkgs/development/python-modules/django_reversion/default.nix +++ b/pkgs/development/python-modules/django_reversion/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , django @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "django-reversion"; - version = "3.0.8"; + version = "3.0.9"; src = fetchPypi { inherit pname version; - sha256 = "49e9930f90322dc6a2754dd26144285cfcc1c5bd0c1c39ca95d5602c5054ae32"; + sha256 = "a5af55f086a3f9c38be2f049c251e06005b9ed48ba7a109473736b1fc95a066f"; }; # tests assume the availability of a mysql/postgresql database diff --git a/pkgs/development/python-modules/django_silk/default.nix b/pkgs/development/python-modules/django_silk/default.nix index 66475b35d2a..653bcdc5551 100644 --- a/pkgs/development/python-modules/django_silk/default.nix +++ b/pkgs/development/python-modules/django_silk/default.nix @@ -1,7 +1,9 @@ -{ lib, stdenv +{ lib , buildPythonPackage , python +, pythonAtLeast , fetchFromGitHub +, fetchpatch , django , pygments , simplejson @@ -23,15 +25,23 @@ buildPythonPackage rec { pname = "django-silk"; - version = "4.0.1"; + version = "4.1.0"; # pypi tarball doesn't include test project src = fetchFromGitHub { owner = "jazzband"; repo = "django-silk"; rev = version; - sha256 = "0yy9rzxvwlp2xvnw76r9hnqajlp417snam92xpb6ay0hxwslwqyb"; + sha256 = "1km3hmx1sir0c5gqr2p1h2938slhxp2hzf10cb80q98mas8spjkn"; }; + + patches = lib.optional (pythonAtLeast "3.9") (fetchpatch { + # should be able to remove after 4.1.1 + name = "python-3.9-support.patch"; + url = "https://github.com/jazzband/django-silk/commit/134089e4cad7bd3b76fb0f70c423082cb7d2b34a.patch"; + sha256 = "09c1xd9y33h3ibiv5w9af9d79c909rgc1g5sxpd4y232h5id3c8r"; + }); + # "test_time_taken" tests aren't suitable for reproducible execution, but django's # test runner doesn't have an easy way to ignore tests - so instead prevent it from picking # them up as tests diff --git a/pkgs/development/python-modules/django_taggit/default.nix b/pkgs/development/python-modules/django_taggit/default.nix index e715dde7c41..b51f0421fd9 100644 --- a/pkgs/development/python-modules/django_taggit/default.nix +++ b/pkgs/development/python-modules/django_taggit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , python , fetchPypi diff --git a/pkgs/development/python-modules/django_treebeard/default.nix b/pkgs/development/python-modules/django_treebeard/default.nix index fd8789d1fb8..88536b210d2 100644 --- a/pkgs/development/python-modules/django_treebeard/default.nix +++ b/pkgs/development/python-modules/django_treebeard/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "django-treebeard"; - version = "4.3.1"; + version = "4.4"; src = fetchPypi { inherit pname version; - sha256 = "83aebc34a9f06de7daaec330d858d1c47887e81be3da77e3541fe7368196dd8a"; + sha256 = "f50e4eea146f7af6702decf7ef198ac1eee1fb9bb4af2c5dba276c3c48f76623"; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/djangoql/default.nix b/pkgs/development/python-modules/djangoql/default.nix index ec39f0739ae..ef9e6be1d3c 100644 --- a/pkgs/development/python-modules/djangoql/default.nix +++ b/pkgs/development/python-modules/djangoql/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "djangoql"; - version = "0.14.2"; + version = "0.14.3"; src = fetchPypi { inherit pname version; - sha256 = "91fd65d9ee4b09092602ff05aca8a21c5a18062faf56f269a011b8e8e41483c6"; + sha256 = "d1b1344cb1e037f094c04ccc67b809e8df80dea1e88cfb919078426131737018"; }; propagatedBuildInputs = [ ply ]; diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix index ce92fab3e96..66a57625b4a 100644 --- a/pkgs/development/python-modules/djangorestframework/default.nix +++ b/pkgs/development/python-modules/djangorestframework/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, django, isPy27 }: +{ lib, buildPythonPackage, fetchFromGitHub, django, isPy27 }: buildPythonPackage rec { version = "3.12.2"; diff --git a/pkgs/development/python-modules/dkimpy/default.nix b/pkgs/development/python-modules/dkimpy/default.nix index e7a80d91d24..aaaf5708a59 100644 --- a/pkgs/development/python-modules/dkimpy/default.nix +++ b/pkgs/development/python-modules/dkimpy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, openssl, buildPythonPackage +{ lib, fetchPypi, openssl, buildPythonPackage , pytest, dnspython, pynacl, authres, python }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/docker-pycreds/default.nix b/pkgs/development/python-modules/docker-pycreds/default.nix index 543f4994020..c022d62bfa8 100644 --- a/pkgs/development/python-modules/docker-pycreds/default.nix +++ b/pkgs/development/python-modules/docker-pycreds/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, six }: +{ lib, buildPythonPackage, fetchPypi, six }: buildPythonPackage rec { pname = "docker-pycreds"; diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix index 7a23d17aca2..5b148a9d62a 100644 --- a/pkgs/development/python-modules/docker/default.nix +++ b/pkgs/development/python-modules/docker/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "docker"; - version = "4.4.0"; + version = "4.4.1"; src = fetchPypi { inherit pname version; - sha256 = "cffc771d4ea1389fc66bc95cb72d304aa41d1a1563482a9a000fba3a84ed5071"; + sha256 = "sha256-BgSnRxnV0t5Dh1OTS3Vb/NpvYvSbjkswlppLCiqKEiA="; }; nativeBuildInputs = lib.optional isPy27 mock; diff --git a/pkgs/development/python-modules/dockerfile-parse/default.nix b/pkgs/development/python-modules/dockerfile-parse/default.nix index 74e363d18b9..45fe856f6f0 100644 --- a/pkgs/development/python-modules/dockerfile-parse/default.nix +++ b/pkgs/development/python-modules/dockerfile-parse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, six, pytestcov, pytest }: +{ lib, buildPythonPackage, fetchPypi, six, pytestcov, pytest }: buildPythonPackage rec { version = "1.1.0"; diff --git a/pkgs/development/python-modules/dockerpty/default.nix b/pkgs/development/python-modules/dockerpty/default.nix index b6267b87c1b..775767e6fec 100644 --- a/pkgs/development/python-modules/dockerpty/default.nix +++ b/pkgs/development/python-modules/dockerpty/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, six }: +{ lib, buildPythonPackage, fetchPypi, six }: buildPythonPackage rec { pname = "dockerpty"; diff --git a/pkgs/development/python-modules/docopt/default.nix b/pkgs/development/python-modules/docopt/default.nix index 2dc4bb38cf1..68df40a3cbf 100644 --- a/pkgs/development/python-modules/docopt/default.nix +++ b/pkgs/development/python-modules/docopt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "docopt"; diff --git a/pkgs/development/python-modules/doctest-ignore-unicode/default.nix b/pkgs/development/python-modules/doctest-ignore-unicode/default.nix index 12d15799ecc..533dbed29b3 100644 --- a/pkgs/development/python-modules/doctest-ignore-unicode/default.nix +++ b/pkgs/development/python-modules/doctest-ignore-unicode/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, nose }: +{ lib, buildPythonPackage, fetchPypi, nose }: buildPythonPackage rec { pname = "doctest-ignore-unicode"; diff --git a/pkgs/development/python-modules/dogpile.cache/default.nix b/pkgs/development/python-modules/dogpile.cache/default.nix index 5dba1b91bc1..4b53045e249 100644 --- a/pkgs/development/python-modules/dogpile.cache/default.nix +++ b/pkgs/development/python-modules/dogpile.cache/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonOlder @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "dogpile.cache"; - version = "1.1.1"; + version = "1.1.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "40147b19696f387415a7efaaa4cf8ea0b5d31bdd1b53e5187e75d48ddfee9f0e"; + sha256 = "2134464672a3deb7ef1366a8691726686d8c62540e4208f1a40c9aaa1a0b6a45"; }; # Disable concurrency tests that often fail, diff --git a/pkgs/development/python-modules/dogpile.core/default.nix b/pkgs/development/python-modules/dogpile.core/default.nix index f6eabc378b3..8ef37282250 100644 --- a/pkgs/development/python-modules/dogpile.core/default.nix +++ b/pkgs/development/python-modules/dogpile.core/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "dogpile.core"; diff --git a/pkgs/development/python-modules/doit/default.nix b/pkgs/development/python-modules/doit/default.nix new file mode 100644 index 00000000000..4ceb8e71f64 --- /dev/null +++ b/pkgs/development/python-modules/doit/default.nix @@ -0,0 +1,51 @@ +{ lib +, stdenv +, fetchPypi +, buildPythonPackage +, isPy3k +, mock +, pytestCheckHook +, cloudpickle +, pyinotify +, macfsevents +}: + +buildPythonPackage rec { + pname = "doit"; + version = "0.33.1"; + + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "37c3b35c2151647b968b2af24481112b2f813c30f695366db0639d529190a143"; + }; + + propagatedBuildInputs = [ cloudpickle ] + ++ lib.optional stdenv.isLinux pyinotify + ++ lib.optional stdenv.isDarwin macfsevents; + + # hangs on darwin + doCheck = !stdenv.isDarwin; + + checkInputs = [ mock pytestCheckHook ]; + + disabledTests = [ + # depends on doit-py, which has a circular dependency on doit + "test___main__.py" + ]; + + meta = with lib; { + homepage = "https://pydoit.org/"; + description = "A task management & automation tool"; + license = licenses.mit; + longDescription = '' + doit is a modern open-source build-tool written in python + designed to be simple to use and flexible to deal with complex + work-flows. It is specially suitable for building and managing + custom work-flows where there is no out-of-the-box solution + available. + ''; + maintainers = with maintainers; [ pSub ]; + }; +} diff --git a/pkgs/development/python-modules/dot2tex/default.nix b/pkgs/development/python-modules/dot2tex/default.nix index 2626f420676..2154f33bb8b 100644 --- a/pkgs/development/python-modules/dot2tex/default.nix +++ b/pkgs/development/python-modules/dot2tex/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , python , buildPythonPackage , fetchPypi diff --git a/pkgs/development/python-modules/dotty-dict/default.nix b/pkgs/development/python-modules/dotty-dict/default.nix new file mode 100644 index 00000000000..22d469b9669 --- /dev/null +++ b/pkgs/development/python-modules/dotty-dict/default.nix @@ -0,0 +1,26 @@ +{ lib +, fetchPypi +, buildPythonPackage +, setuptools_scm +}: + +buildPythonPackage rec { + pname = "dotty_dict"; + version = "1.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-6wA1o2KezYQ5emjx9C8elKvRw0V3oZzT6srTMe58uvA="; + }; + + nativeBuildInputs = [ setuptools_scm ]; + + doCheck = false; + + meta = with lib; { + description = "Dictionary wrapper for quick access to deeply nested keys"; + homepage = "https://dotty-dict.readthedocs.io"; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; + }; +} diff --git a/pkgs/development/python-modules/dpath/default.nix b/pkgs/development/python-modules/dpath/default.nix index 505bd7bb456..9db726a12a1 100644 --- a/pkgs/development/python-modules/dpath/default.nix +++ b/pkgs/development/python-modules/dpath/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, isPy27 +{ lib, fetchPypi, buildPythonPackage, isPy27 , mock, pytestCheckHook, nose, hypothesis }: diff --git a/pkgs/development/python-modules/dpkt/default.nix b/pkgs/development/python-modules/dpkt/default.nix index 177b260e804..52f4f42661d 100644 --- a/pkgs/development/python-modules/dpkt/default.nix +++ b/pkgs/development/python-modules/dpkt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage }: +{ lib, fetchPypi, buildPythonPackage }: buildPythonPackage rec { pname = "dpkt"; diff --git a/pkgs/development/python-modules/drf-yasg/default.nix b/pkgs/development/python-modules/drf-yasg/default.nix index dd92d51d6c6..d69ece809bb 100644 --- a/pkgs/development/python-modules/drf-yasg/default.nix +++ b/pkgs/development/python-modules/drf-yasg/default.nix @@ -1,5 +1,5 @@ { - lib, stdenv, + lib, buildPythonPackage, fetchPypi, inflection, diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix index 22e66d0a4a4..ca0283b2cbd 100644 --- a/pkgs/development/python-modules/dropbox/default.nix +++ b/pkgs/development/python-modules/dropbox/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , pytestrunner, requests, urllib3, mock, setuptools }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/dtopt/default.nix b/pkgs/development/python-modules/dtopt/default.nix index 84631c21708..a5d4675f993 100644 --- a/pkgs/development/python-modules/dtopt/default.nix +++ b/pkgs/development/python-modules/dtopt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/duecredit/default.nix b/pkgs/development/python-modules/duecredit/default.nix index 28aaf8ee47c..ba51405e5e9 100644 --- a/pkgs/development/python-modules/duecredit/default.nix +++ b/pkgs/development/python-modules/duecredit/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "duecredit"; - version = "0.8.0"; + version = "0.8.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1yxd8579pakrfhq0hls0iy37nxllsm8y33na220g08znibrp7ix0"; + sha256 = "43b3f01ab5fb2bf2ecc27d3fcf92b873c6b288f44becef3e2e87c96cb89d7b01"; }; # bin/duecredit requires setuptools at runtime diff --git a/pkgs/development/python-modules/dufte/default.nix b/pkgs/development/python-modules/dufte/default.nix index 7836c8aa60a..d1c9680cb7b 100644 --- a/pkgs/development/python-modules/dufte/default.nix +++ b/pkgs/development/python-modules/dufte/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k @@ -6,24 +6,25 @@ , importlib-metadata , matplotlib , numpy +, exdown , pytestCheckHook }: buildPythonPackage rec { pname = "dufte"; - version = "0.2.9"; + version = "0.2.12"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0nkaczipbsm8c14j9svxry2wigmn5iharibb6b8g062sjaph8x17"; + sha256 = "0ag1d7h1wijkc7v2vpgkbqjlnpiwd4nh8zhxiby0989bpmlp3jr3"; }; format = "pyproject"; propagatedBuildInputs = [ matplotlib numpy - ] ++ stdenv.lib.optionals (pythonOlder "3.8") [ + ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; @@ -32,7 +33,8 @@ buildPythonPackage rec { mkdir -p $HOME/.matplotlib echo "backend: ps" > $HOME/.matplotlib/matplotlibrc ''; - checkInputs = [ pytestCheckHook ]; + + checkInputs = [ exdown pytestCheckHook ]; pythonImportsCheck = [ "dufte" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index dd067514ccc..5d4ac94f7fa 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -4,12 +4,12 @@ , git, glibcLocales }: buildPythonPackage rec { - version = "0.20.14"; + version = "0.20.15"; pname = "dulwich"; src = fetchPypi { inherit pname version; - sha256 = "21d6ee82708f7c67ce3fdcaf1f1407e524f7f4f7411a410a972faa2176baec0d"; + sha256 = "1248942fr12av2rkzpm2fq0qn6rajvv2lcgq65h8kby27qvp65zv"; }; LC_ALL = "en_US.UTF-8"; @@ -23,8 +23,13 @@ buildPythonPackage rec { meta = with lib; { description = "Simple Python implementation of the Git file formats and protocols"; - homepage = "https://samba.org/~jelmer/dulwich/"; - license = licenses.gpl2Plus; + longDescription = '' + Dulwich is a Python implementation of the Git file formats and protocols, which + does not depend on Git itself. All functionality is available in pure Python. + ''; + homepage = "https://www.dulwich.io/"; + changelog = "https://github.com/dulwich/dulwich/blob/dulwich-${version}/NEWS"; + license = with licenses; [ asl20 gpl2Plus]; maintainers = with maintainers; [ koral ]; }; } diff --git a/pkgs/development/python-modules/dyn/default.nix b/pkgs/development/python-modules/dyn/default.nix index b5fa28f2de6..7cddb324f3a 100644 --- a/pkgs/development/python-modules/dyn/default.nix +++ b/pkgs/development/python-modules/dyn/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, pytestcov, mock +{ lib, buildPythonPackage, fetchPypi, pytest, pytestcov, mock , pytest_xdist, covCore, glibcLocales }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/dynd/default.nix b/pkgs/development/python-modules/dynd/default.nix index f23d19510ee..9323255cc27 100644 --- a/pkgs/development/python-modules/dynd/default.nix +++ b/pkgs/development/python-modules/dynd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , isPyPy , isPy3k diff --git a/pkgs/development/python-modules/easydict/default.nix b/pkgs/development/python-modules/easydict/default.nix index d8dbb045ddc..e1898d3fc9e 100644 --- a/pkgs/development/python-modules/easydict/default.nix +++ b/pkgs/development/python-modules/easydict/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "easydict"; @@ -11,9 +11,9 @@ buildPythonPackage rec { docheck = false; # No tests in archive - meta = { + meta = with lib; { homepage = "https://github.com/makinacorpus/easydict"; - license = with stdenv.lib; licenses.lgpl3; + license = licenses.lgpl3; description = "Access dict values as attributes (works recursively)"; }; } diff --git a/pkgs/development/python-modules/easygui/default.nix b/pkgs/development/python-modules/easygui/default.nix index 441d839d36f..322e6461e5d 100644 --- a/pkgs/development/python-modules/easygui/default.nix +++ b/pkgs/development/python-modules/easygui/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage }: +{ lib, fetchPypi, buildPythonPackage }: buildPythonPackage rec { pname = "easygui"; diff --git a/pkgs/development/python-modules/easyprocess/default.nix b/pkgs/development/python-modules/easyprocess/default.nix index fc86edf5d4d..c98a8b572d4 100644 --- a/pkgs/development/python-modules/easyprocess/default.nix +++ b/pkgs/development/python-modules/easyprocess/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "EasyProcess"; diff --git a/pkgs/development/python-modules/easysnmp/default.nix b/pkgs/development/python-modules/easysnmp/default.nix index d5c69d4c7e9..11b13d8325a 100644 --- a/pkgs/development/python-modules/easysnmp/default.nix +++ b/pkgs/development/python-modules/easysnmp/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , buildPythonPackage , pythonAtLeast , fetchFromGitHub diff --git a/pkgs/development/python-modules/ecdsa/default.nix b/pkgs/development/python-modules/ecdsa/default.nix index 2a17f84bb3b..3c892185687 100644 --- a/pkgs/development/python-modules/ecdsa/default.nix +++ b/pkgs/development/python-modules/ecdsa/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pkgs diff --git a/pkgs/development/python-modules/ed25519/default.nix b/pkgs/development/python-modules/ed25519/default.nix index 183d7cc3ca5..47692075d3b 100644 --- a/pkgs/development/python-modules/ed25519/default.nix +++ b/pkgs/development/python-modules/ed25519/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage }: +{ lib, fetchPypi, buildPythonPackage }: buildPythonPackage rec { pname = "ed25519"; diff --git a/pkgs/development/python-modules/editorconfig/default.nix b/pkgs/development/python-modules/editorconfig/default.nix index 727c3003db5..4329db98c2b 100644 --- a/pkgs/development/python-modules/editorconfig/default.nix +++ b/pkgs/development/python-modules/editorconfig/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchgit , cmake diff --git a/pkgs/development/python-modules/edward/default.nix b/pkgs/development/python-modules/edward/default.nix index c1171043356..ac2d5023cc9 100644 --- a/pkgs/development/python-modules/edward/default.nix +++ b/pkgs/development/python-modules/edward/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, pythonAtLeast +{ lib, buildPythonPackage, fetchPypi, isPy27, pythonAtLeast , Keras, numpy, scipy, six, tensorflow }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/eggdeps/default.nix b/pkgs/development/python-modules/eggdeps/default.nix index ae339368ff5..02c2c644449 100644 --- a/pkgs/development/python-modules/eggdeps/default.nix +++ b/pkgs/development/python-modules/eggdeps/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , zope_interface diff --git a/pkgs/development/python-modules/elasticsearch-dsl/default.nix b/pkgs/development/python-modules/elasticsearch-dsl/default.nix index 44188902591..a2f2ff038db 100644 --- a/pkgs/development/python-modules/elasticsearch-dsl/default.nix +++ b/pkgs/development/python-modules/elasticsearch-dsl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k @@ -18,7 +18,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ elasticsearch python-dateutil six ] - ++ stdenv.lib.optional (!isPy3k) ipaddress; + ++ lib.optional (!isPy3k) ipaddress; # ImportError: No module named test_elasticsearch_dsl # Tests require a local instance of elasticsearch diff --git a/pkgs/development/python-modules/elasticsearch/default.nix b/pkgs/development/python-modules/elasticsearch/default.nix index 4929d1f51a4..9161525c2bc 100644 --- a/pkgs/development/python-modules/elasticsearch/default.nix +++ b/pkgs/development/python-modules/elasticsearch/default.nix @@ -2,7 +2,7 @@ , fetchPypi , urllib3, requests , nosexcover, mock -, lib, stdenv +, lib }: buildPythonPackage (rec { diff --git a/pkgs/development/python-modules/elementpath/default.nix b/pkgs/development/python-modules/elementpath/default.nix index 27040526312..a5a639484ec 100644 --- a/pkgs/development/python-modules/elementpath/default.nix +++ b/pkgs/development/python-modules/elementpath/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchFromGitHub, isPy27 }: buildPythonPackage rec { - version = "2.1.0"; + version = "2.1.3"; pname = "elementpath"; disabled = isPy27; # uses incompatible class syntax @@ -9,7 +9,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "elementpath"; rev = "v${version}"; - sha256 = "17a0gcwmv87kikirgkgr305f5c7wz34hf7djssx4xbk9lfq9m2lg"; + sha256 = "062l1dqbaz1pab3qz6x5zmja8m8gw1bxgfl4kx91gdh0zsiakg8j"; }; # avoid circular dependency with xmlschema which directly depends on this diff --git a/pkgs/development/python-modules/eliot/default.nix b/pkgs/development/python-modules/eliot/default.nix index 472834c5c72..152561b69ce 100644 --- a/pkgs/development/python-modules/eliot/default.nix +++ b/pkgs/development/python-modules/eliot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonOlder diff --git a/pkgs/development/python-modules/emcee/default.nix b/pkgs/development/python-modules/emcee/default.nix index 12974a9422d..a4f2bece349 100644 --- a/pkgs/development/python-modules/emcee/default.nix +++ b/pkgs/development/python-modules/emcee/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , numpy }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/emoji/default.nix b/pkgs/development/python-modules/emoji/default.nix index aabebe1c521..d15185e1447 100644 --- a/pkgs/development/python-modules/emoji/default.nix +++ b/pkgs/development/python-modules/emoji/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { checkInputs = [ nose ]; - checkPhase = ''nosetests''; + checkPhase = "nosetests"; meta = with lib; { description = "Emoji for Python"; diff --git a/pkgs/development/python-modules/emv/default.nix b/pkgs/development/python-modules/emv/default.nix index 26d40d8d205..f68729a42b6 100644 --- a/pkgs/development/python-modules/emv/default.nix +++ b/pkgs/development/python-modules/emv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchFromGitHub , click, enum-compat, pyscard, pycountry, terminaltables , pytestCheckHook, pythonOlder }: diff --git a/pkgs/development/python-modules/enum/default.nix b/pkgs/development/python-modules/enum/default.nix index ad266623c78..db827601d5d 100644 --- a/pkgs/development/python-modules/enum/default.nix +++ b/pkgs/development/python-modules/enum/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/enum34/default.nix b/pkgs/development/python-modules/enum34/default.nix index 5e26853098f..91f54dc99cb 100644 --- a/pkgs/development/python-modules/enum34/default.nix +++ b/pkgs/development/python-modules/enum34/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonAtLeast diff --git a/pkgs/development/python-modules/enzyme/default.nix b/pkgs/development/python-modules/enzyme/default.nix index 110575464cb..ee547ad9b7b 100644 --- a/pkgs/development/python-modules/enzyme/default.nix +++ b/pkgs/development/python-modules/enzyme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage }: +{ lib, fetchPypi, buildPythonPackage }: buildPythonPackage rec { pname = "enzyme"; @@ -12,9 +12,9 @@ buildPythonPackage rec { sha256 = "1fv2kh2v4lwj0hhrhj9pib1pdjh01yr4xgyljhx11l94gjlpy5pj"; }; - meta = { + meta = with lib; { homepage = "https://github.com/Diaoul/enzyme"; - license = with stdenv.lib; licenses.asl20; + license = licenses.asl20; description = "Python video metadata parser"; }; } diff --git a/pkgs/development/python-modules/epc/default.nix b/pkgs/development/python-modules/epc/default.nix index d7459543163..3950afa578e 100644 --- a/pkgs/development/python-modules/epc/default.nix +++ b/pkgs/development/python-modules/epc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , sexpdata diff --git a/pkgs/development/python-modules/ephem/default.nix b/pkgs/development/python-modules/ephem/default.nix index 4d6e5940926..c0d77c29748 100644 --- a/pkgs/development/python-modules/ephem/default.nix +++ b/pkgs/development/python-modules/ephem/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k +{ lib, buildPythonPackage, fetchPypi, isPy3k , glibcLocales, pytest }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/et_xmlfile/default.nix b/pkgs/development/python-modules/et_xmlfile/default.nix index 5ba9490d945..e407ca35e89 100644 --- a/pkgs/development/python-modules/et_xmlfile/default.nix +++ b/pkgs/development/python-modules/et_xmlfile/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , lxml diff --git a/pkgs/development/python-modules/etcd/default.nix b/pkgs/development/python-modules/etcd/default.nix index 338992259a1..0c2fd0c2952 100644 --- a/pkgs/development/python-modules/etcd/default.nix +++ b/pkgs/development/python-modules/etcd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , simplejson diff --git a/pkgs/development/python-modules/etebase/default.nix b/pkgs/development/python-modules/etebase/default.nix index c0f9125a8d7..7832f6b4787 100644 --- a/pkgs/development/python-modules/etebase/default.nix +++ b/pkgs/development/python-modules/etebase/default.nix @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { wheel ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; propagatedBuildInputs = [ python diff --git a/pkgs/development/python-modules/eth-utils/default.nix b/pkgs/development/python-modules/eth-utils/default.nix index 25f2ebd5541..9c67f0816e3 100644 --- a/pkgs/development/python-modules/eth-utils/default.nix +++ b/pkgs/development/python-modules/eth-utils/default.nix @@ -1,9 +1,9 @@ -{ lib, fetchFromGitHub, buildPythonPackage, pytest, eth-hash, eth-typing, +{ lib, fetchFromGitHub, buildPythonPackage, pytestCheckHook, eth-hash, eth-typing, cytoolz, hypothesis }: buildPythonPackage rec { pname = "eth-utils"; - version = "1.8.4"; + version = "1.9.5"; # Tests are missing from the PyPI source tarball so let's use GitHub # https://github.com/ethereum/eth-utils/issues/130 @@ -11,20 +11,13 @@ buildPythonPackage rec { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "1hfzb3xz3j50dgp51nx2jssh9j07np24fqmpnyr2ycsll90g1j6q"; + sha256 = "1h3xlw74zdf6cfvqf9193lx05bpdm05pmy9ap1g7q2kx0j2b6352"; }; - checkInputs = [ pytest hypothesis ]; + checkInputs = [ pytestCheckHook hypothesis ]; propagatedBuildInputs = [ eth-hash eth-typing cytoolz ]; - # setuptools-markdown uses pypandoc which is broken at the moment - preConfigure = '' - substituteInPlace setup.py --replace \'setuptools-markdown\' "" - ''; - - checkPhase = '' - pytest . - ''; + pythonImportsCheck = [ "eth_utils" ]; meta = { description = "Common utility functions for codebases which interact with ethereum"; diff --git a/pkgs/development/python-modules/evdev/default.nix b/pkgs/development/python-modules/evdev/default.nix index 305ada89552..1a3f2a0e642 100644 --- a/pkgs/development/python-modules/evdev/default.nix +++ b/pkgs/development/python-modules/evdev/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "evdev"; - version = "1.3.0"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "0kb3636yaw9l8xi8s184w0r0n9ic5dw3b8hx048jf9fpzss4kimi"; + sha256 = "8782740eb1a86b187334c07feb5127d3faa0b236e113206dfe3ae8f77fb1aaf1"; }; buildInputs = [ linuxHeaders ]; diff --git a/pkgs/development/python-modules/eve/default.nix b/pkgs/development/python-modules/eve/default.nix index b931db188e3..4d5c6173cd7 100644 --- a/pkgs/development/python-modules/eve/default.nix +++ b/pkgs/development/python-modules/eve/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , flask diff --git a/pkgs/development/python-modules/eventlib/default.nix b/pkgs/development/python-modules/eventlib/default.nix index 1b2b44d65f7..4d4bff85842 100644 --- a/pkgs/development/python-modules/eventlib/default.nix +++ b/pkgs/development/python-modules/eventlib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , isPy3k , fetchdarcs diff --git a/pkgs/development/python-modules/evernote/default.nix b/pkgs/development/python-modules/evernote/default.nix index 70c7fad963a..8c6e4b6c7c2 100644 --- a/pkgs/development/python-modules/evernote/default.nix +++ b/pkgs/development/python-modules/evernote/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/pkgs/development/python-modules/exchangelib/default.nix b/pkgs/development/python-modules/exchangelib/default.nix index e380ca613cf..706e4d8137f 100644 --- a/pkgs/development/python-modules/exchangelib/default.nix +++ b/pkgs/development/python-modules/exchangelib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonPackage, +{ lib, fetchFromGitHub, buildPythonPackage, pythonOlder, lxml, tzlocal, python-dateutil, pygments, requests-kerberos, defusedxml, cached-property, isodate, requests_ntlm, dnspython, diff --git a/pkgs/development/python-modules/exdown/default.nix b/pkgs/development/python-modules/exdown/default.nix new file mode 100644 index 00000000000..17cab3fe55f --- /dev/null +++ b/pkgs/development/python-modules/exdown/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchPypi, pythonOlder +, importlib-metadata }: + +buildPythonPackage rec { + pname = "exdown"; + version = "0.7.1"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-vnSso3vmPIjX7JX+NwoxguwqwPHocJACeh5H0ClPcUI="; + }; + + propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + + pythonImportsCheck = [ "exdown" ]; + + meta = with lib; { + description = "Extract code blocks from markdown"; + homepage = "https://github.com/nschloe/exdown"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/execnet/default.nix b/pkgs/development/python-modules/execnet/default.nix index 0a22ab4b051..ec4bcca9f86 100644 --- a/pkgs/development/python-modules/execnet/default.nix +++ b/pkgs/development/python-modules/execnet/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , buildPythonPackage , isPyPy , fetchPypi diff --git a/pkgs/development/python-modules/exifread/default.nix b/pkgs/development/python-modules/exifread/default.nix index e86a681a8e3..e26f616f8db 100644 --- a/pkgs/development/python-modules/exifread/default.nix +++ b/pkgs/development/python-modules/exifread/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/eyed3/default.nix b/pkgs/development/python-modules/eyed3/default.nix index 08faf5c2ba8..3dfd810f99c 100644 --- a/pkgs/development/python-modules/eyed3/default.nix +++ b/pkgs/development/python-modules/eyed3/default.nix @@ -1,11 +1,10 @@ -{ stdenv +{ lib , buildPythonPackage , fetchPypi , pythonOlder , python , isPyPy , six -, lib , filetype , deprecation , dataclasses diff --git a/pkgs/development/python-modules/ezdxf/default.nix b/pkgs/development/python-modules/ezdxf/default.nix index 6dfefe09204..3fd30062b0d 100644 --- a/pkgs/development/python-modules/ezdxf/default.nix +++ b/pkgs/development/python-modules/ezdxf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, pyparsing, pytest }: +{ lib, buildPythonPackage, pythonOlder, fetchFromGitHub, pyparsing, pytest }: buildPythonPackage rec { version = "0.12"; diff --git a/pkgs/development/python-modules/face/default.nix b/pkgs/development/python-modules/face/default.nix index 89e7156fa52..db1810ca056 100644 --- a/pkgs/development/python-modules/face/default.nix +++ b/pkgs/development/python-modules/face/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, boltons, pytest }: +{ lib, buildPythonPackage, fetchPypi, boltons, pytest }: buildPythonPackage rec { pname = "face"; diff --git a/pkgs/development/python-modules/face_recognition/default.nix b/pkgs/development/python-modules/face_recognition/default.nix index 1896bdfac59..6b2c6411aa1 100644 --- a/pkgs/development/python-modules/face_recognition/default.nix +++ b/pkgs/development/python-modules/face_recognition/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage, fetchFromGitHub, pillow, click, dlib, numpy -, face_recognition_models, lib, stdenv, flake8, pytest, glibcLocales +, face_recognition_models, lib, flake8, pytest, glibcLocales }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/face_recognition_models/default.nix b/pkgs/development/python-modules/face_recognition_models/default.nix index d5838438b7d..6ec2634029b 100644 --- a/pkgs/development/python-modules/face_recognition_models/default.nix +++ b/pkgs/development/python-modules/face_recognition_models/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, lib, stdenv, fetchPypi, setuptools }: +{ buildPythonPackage, lib, fetchPypi, setuptools }: buildPythonPackage rec { pname = "face_recognition_models"; diff --git a/pkgs/development/python-modules/fake-useragent/default.nix b/pkgs/development/python-modules/fake-useragent/default.nix index be26ab98af6..9b207a81c3c 100644 --- a/pkgs/development/python-modules/fake-useragent/default.nix +++ b/pkgs/development/python-modules/fake-useragent/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, six, pytest }: +{ lib, fetchPypi, buildPythonPackage, six, pytest }: buildPythonPackage rec { pname = "fake-useragent"; diff --git a/pkgs/development/python-modules/fake_factory/default.nix b/pkgs/development/python-modules/fake_factory/default.nix index 82af8d04e07..2e561a163ab 100644 --- a/pkgs/development/python-modules/fake_factory/default.nix +++ b/pkgs/development/python-modules/fake_factory/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , python diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index abdb0f58394..990908efe03 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -1,59 +1,45 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder, -# Build inputs -dateutil, six, text-unidecode, ipaddress ? null -# Test inputs -, email_validator +{ lib +, buildPythonPackage +, fetchPypi +, dateutil +, text-unidecode , freezegun -, mock -, more-itertools , pytestCheckHook -, pytestrunner , ukpostcodeparser , validators }: -assert pythonOlder "3.3" -> ipaddress != null; - buildPythonPackage rec { pname = "Faker"; - version = "4.18.0"; + version = "5.5.1"; src = fetchPypi { inherit pname version; - sha256 = "0raxw6mgvf9523v7917zqw76vqnpp0d6v3i310qnjnhpxmm78yb2"; + sha256 = "1bskhmiir1ajipj7j535j2mxgnp6s3mxbvlag4aryj9zbhgg1c19"; }; - nativeBuildInputs = [ pytestrunner ]; + propagatedBuildInputs = [ + dateutil + text-unidecode + ]; + checkInputs = [ - email_validator freezegun pytestCheckHook ukpostcodeparser validators - ] - ++ lib.optionals (pythonOlder "3.3") [ mock ] - ++ lib.optionals (pythonOlder "3.0") [ more-itertools ]; + ]; # avoid tests which import random2, an abandoned library pytestFlagsArray = [ "--ignore=tests/providers/test_ssn.py" ]; - - propagatedBuildInputs = [ - dateutil - six - text-unidecode - ]; - - postPatch = '' - substituteInPlace setup.py --replace "pytest>=3.8.0,<3.9" "pytest" - ''; + pythonImportsCheck = [ "faker" ]; meta = with lib; { - description = "A Python library for generating fake user data"; - homepage = "http://faker.rtfd.org"; - license = licenses.mit; + description = "Python library for generating fake user data"; + homepage = "http://faker.rtfd.org"; + license = licenses.mit; maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/falcon/default.nix b/pkgs/development/python-modules/falcon/default.nix index 8d1aa02026c..eb6cbfa242e 100644 --- a/pkgs/development/python-modules/falcon/default.nix +++ b/pkgs/development/python-modules/falcon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , coverage diff --git a/pkgs/development/python-modules/fasteners/default.nix b/pkgs/development/python-modules/fasteners/default.nix index b81ebb4faa0..55b9d3b3023 100644 --- a/pkgs/development/python-modules/fasteners/default.nix +++ b/pkgs/development/python-modules/fasteners/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six monotonic ]; - checkInputs = [ testtools nose ] ++ stdenv.lib.optionals (!isPy3k) [ futures ]; + checkInputs = [ testtools nose ] ++ lib.optionals (!isPy3k) [ futures ]; checkPhase = '' nosetests diff --git a/pkgs/development/python-modules/fastentrypoints/default.nix b/pkgs/development/python-modules/fastentrypoints/default.nix index eb86784ddc7..7671feb359f 100644 --- a/pkgs/development/python-modules/fastentrypoints/default.nix +++ b/pkgs/development/python-modules/fastentrypoints/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "fastentrypoints"; diff --git a/pkgs/development/python-modules/fastimport/default.nix b/pkgs/development/python-modules/fastimport/default.nix index 55aad9d71ea..383a0e4fbd5 100644 --- a/pkgs/development/python-modules/fastimport/default.nix +++ b/pkgs/development/python-modules/fastimport/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, python, fetchPypi}: +{ lib, buildPythonPackage, python, fetchPypi}: buildPythonPackage rec { pname = "fastimport"; diff --git a/pkgs/development/python-modules/fastpair/default.nix b/pkgs/development/python-modules/fastpair/default.nix index 82964070d03..9a3f8c53b1d 100644 --- a/pkgs/development/python-modules/fastpair/default.nix +++ b/pkgs/development/python-modules/fastpair/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pytestrunner, pytest, scipy }: +{ lib, buildPythonPackage, fetchFromGitHub, pytestrunner, pytest, scipy }: buildPythonPackage { pname = "fastpair"; diff --git a/pkgs/development/python-modules/fastpbkdf2/default.nix b/pkgs/development/python-modules/fastpbkdf2/default.nix index e033dc42d45..e154471d7a8 100644 --- a/pkgs/development/python-modules/fastpbkdf2/default.nix +++ b/pkgs/development/python-modules/fastpbkdf2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonPackage +{ lib, fetchFromGitHub, buildPythonPackage , openssl, pytest, cffi, six }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/fastprogress/default.nix b/pkgs/development/python-modules/fastprogress/default.nix index 25cc2b8792f..9b43c05989f 100644 --- a/pkgs/development/python-modules/fastprogress/default.nix +++ b/pkgs/development/python-modules/fastprogress/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , numpy diff --git a/pkgs/development/python-modules/fastrlock/default.nix b/pkgs/development/python-modules/fastrlock/default.nix index 7aedbbdd8f7..0821778d024 100644 --- a/pkgs/development/python-modules/fastrlock/default.nix +++ b/pkgs/development/python-modules/fastrlock/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "fastrlock"; diff --git a/pkgs/development/python-modules/fasttext/default.nix b/pkgs/development/python-modules/fasttext/default.nix index bf3bd987564..f3bddec76bd 100644 --- a/pkgs/development/python-modules/fasttext/default.nix +++ b/pkgs/development/python-modules/fasttext/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, buildPythonPackage, fetchFromGitHub, numpy, pkgs, pybind11 }: +{lib, buildPythonPackage, fetchFromGitHub, numpy, pkgs, pybind11 }: buildPythonPackage rec { inherit (pkgs.fasttext) pname version src; diff --git a/pkgs/development/python-modules/fdint/default.nix b/pkgs/development/python-modules/fdint/default.nix index 4de0d18ca8b..413416c99a2 100644 --- a/pkgs/development/python-modules/fdint/default.nix +++ b/pkgs/development/python-modules/fdint/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , cython diff --git a/pkgs/development/python-modules/feedgen/default.nix b/pkgs/development/python-modules/feedgen/default.nix index 509ffaed9d7..59ca95a0338 100644 --- a/pkgs/development/python-modules/feedgen/default.nix +++ b/pkgs/development/python-modules/feedgen/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, dateutil, lxml }: +{ lib, buildPythonPackage, fetchPypi, dateutil, lxml }: buildPythonPackage rec { pname = "feedgen"; diff --git a/pkgs/development/python-modules/feedgenerator/default.nix b/pkgs/development/python-modules/feedgenerator/default.nix index 8508cc637f2..d5eb1306b39 100644 --- a/pkgs/development/python-modules/feedgenerator/default.nix +++ b/pkgs/development/python-modules/feedgenerator/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, glibcLocales, fetchPypi, six, pytz }: +{ lib, buildPythonPackage, glibcLocales, fetchPypi, six, pytz }: buildPythonPackage rec { pname = "feedgenerator"; diff --git a/pkgs/development/python-modules/feedparser/5.nix b/pkgs/development/python-modules/feedparser/5.nix index a79048c5525..58cdad9884e 100644 --- a/pkgs/development/python-modules/feedparser/5.nix +++ b/pkgs/development/python-modules/feedparser/5.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/feedparser/default.nix b/pkgs/development/python-modules/feedparser/default.nix index 7b48fe6f73e..38e9761952d 100644 --- a/pkgs/development/python-modules/feedparser/default.nix +++ b/pkgs/development/python-modules/feedparser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/pkgs/development/python-modules/filebrowser_safe/default.nix b/pkgs/development/python-modules/filebrowser_safe/default.nix index df132211d4f..0cc1eae5ac2 100644 --- a/pkgs/development/python-modules/filebrowser_safe/default.nix +++ b/pkgs/development/python-modules/filebrowser_safe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , django diff --git a/pkgs/development/python-modules/filebytes/default.nix b/pkgs/development/python-modules/filebytes/default.nix index bfac6a0e6b2..5b6d6284ced 100644 --- a/pkgs/development/python-modules/filebytes/default.nix +++ b/pkgs/development/python-modules/filebytes/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/filelock/default.nix b/pkgs/development/python-modules/filelock/default.nix index 77ddec306fc..97073bb6b03 100644 --- a/pkgs/development/python-modules/filelock/default.nix +++ b/pkgs/development/python-modules/filelock/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "filelock"; diff --git a/pkgs/development/python-modules/filterpy/default.nix b/pkgs/development/python-modules/filterpy/default.nix index 53059ce43d0..9740117b9b9 100644 --- a/pkgs/development/python-modules/filterpy/default.nix +++ b/pkgs/development/python-modules/filterpy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , numpy diff --git a/pkgs/development/python-modules/fints/default.nix b/pkgs/development/python-modules/fints/default.nix index 8e02dac5850..c4dfc04046b 100644 --- a/pkgs/development/python-modules/fints/default.nix +++ b/pkgs/development/python-modules/fints/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy27 +{ lib, buildPythonPackage, fetchFromGitHub, isPy27 , bleach , mt-940 , pytest diff --git a/pkgs/development/python-modules/fire/default.nix b/pkgs/development/python-modules/fire/default.nix index 5a14f772546..bf3be8a6907 100644 --- a/pkgs/development/python-modules/fire/default.nix +++ b/pkgs/development/python-modules/fire/default.nix @@ -1,18 +1,18 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, six, hypothesis, mock +{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, six, hypothesis, mock , python-Levenshtein, pytest, termcolor, isPy27, enum34 }: buildPythonPackage rec { pname = "fire"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "google"; repo = "python-fire"; rev = "v${version}"; - sha256 = "0s5r6l39ck2scks54hmwwdf4lcihqqnqzjfx9lz2b67vxkajpwmc"; + sha256 = "1caz6j2kdhj0kccrnqri6b4g2d6wzkkx8y9vxyvm7axvrwkv2vyn"; }; - propagatedBuildInputs = [ six termcolor ] ++ stdenv.lib.optional isPy27 enum34; + propagatedBuildInputs = [ six termcolor ] ++ lib.optional isPy27 enum34; checkInputs = [ hypothesis mock python-Levenshtein pytest ]; diff --git a/pkgs/development/python-modules/first/default.nix b/pkgs/development/python-modules/first/default.nix index a5bdf847eff..491fcd39805 100644 --- a/pkgs/development/python-modules/first/default.nix +++ b/pkgs/development/python-modules/first/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "first"; diff --git a/pkgs/development/python-modules/flake8-blind-except/default.nix b/pkgs/development/python-modules/flake8-blind-except/default.nix index 1c2dbe5f52c..c3974d0e007 100644 --- a/pkgs/development/python-modules/flake8-blind-except/default.nix +++ b/pkgs/development/python-modules/flake8-blind-except/default.nix @@ -2,10 +2,10 @@ buildPythonPackage rec { pname = "flake8-blind-except"; - version = "0.1.1"; + version = "0.2.0"; src = fetchPypi { inherit pname version; - sha256 = "16g58mkr3fcn2vlfhp3rlahj93qswc7jd5qrqp748mc26dk3b8xc"; + sha256 = "02a860a1a19cb602c006a3fe0778035b0d14d3f57929b4b798bc7d6684f204e5"; }; meta = { homepage = "https://github.com/elijahandrews/flake8-blind-except"; diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix index 33459b7c66b..6f1d8181a58 100644 --- a/pkgs/development/python-modules/flake8/default.nix +++ b/pkgs/development/python-modules/flake8/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder +{ lib, buildPythonPackage, fetchPypi, pythonOlder , mock, pytest, pytestrunner , configparser, enum34, mccabe, pycodestyle, pyflakes, functools32, typing, importlib-metadata }: @@ -14,10 +14,10 @@ buildPythonPackage rec { checkInputs = [ pytest mock pytestrunner ]; propagatedBuildInputs = [ pyflakes pycodestyle mccabe ] - ++ stdenv.lib.optionals (pythonOlder "3.2") [ configparser functools32 ] - ++ stdenv.lib.optionals (pythonOlder "3.4") [ enum34 ] - ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ] - ++ stdenv.lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + ++ lib.optionals (pythonOlder "3.2") [ configparser functools32 ] + ++ lib.optionals (pythonOlder "3.4") [ enum34 ] + ++ lib.optionals (pythonOlder "3.5") [ typing ] + ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; # fixtures fail to initialize correctly checkPhase = '' diff --git a/pkgs/development/python-modules/flaky/default.nix b/pkgs/development/python-modules/flaky/default.nix index 02b0641a34e..fe068211dfb 100644 --- a/pkgs/development/python-modules/flaky/default.nix +++ b/pkgs/development/python-modules/flaky/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , mock diff --git a/pkgs/development/python-modules/flask-appbuilder/default.nix b/pkgs/development/python-modules/flask-appbuilder/default.nix index 60dc18a9877..6e98f6e80ac 100644 --- a/pkgs/development/python-modules/flask-appbuilder/default.nix +++ b/pkgs/development/python-modules/flask-appbuilder/default.nix @@ -5,6 +5,7 @@ , apispec , colorama , click +, email_validator , flask , flask-babel , flask_login @@ -19,18 +20,17 @@ , python-dateutil , prison , pyjwt -, pyyaml , sqlalchemy-utils }: buildPythonPackage rec { pname = "flask-appbuilder"; - version = "2.3.0"; + version = "3.1.1"; src = fetchPypi { pname = "Flask-AppBuilder"; inherit version; - sha256 = "04bsswi7daaqda01a83rd1f2gq6asii520f9arjf7bsy24pmbprc"; + sha256 = "076b020b0ba125339a2e710e74eab52648cde2b18599f7cb0fa1eada9bbb648c"; }; checkInputs = [ @@ -41,6 +41,7 @@ buildPythonPackage rec { apispec colorama click + email_validator flask flask-babel flask_login @@ -56,21 +57,18 @@ buildPythonPackage rec { prison pyjwt sqlalchemy-utils - pyyaml ]; postPatch = '' substituteInPlace setup.py \ - --replace "apispec[yaml]>=1.1.1, <2" "apispec" \ - --replace "jsonschema>=3.0.1, <4" "jsonschema" \ - --replace "marshmallow>=2.18.0, <4.0.0" "marshmallow" \ - --replace "PyJWT>=1.7.1" "PyJWT" \ - --replace "Flask-SQLAlchemy>=2.4, <3" "Flask-SQLAlchemy" \ - --replace "Flask-JWT-Extended>=3.18, <4" "Flask-JWT-Extended" \ + --replace "apispec[yaml]>=3.3, <4" "apispec" \ --replace "Flask-Login>=0.3, <0.5" "Flask-Login" \ - --replace "Flask-Babel>=1, <2" "Flask-Babel" + --replace "Flask-Babel>=1, <2" "Flask-Babel" \ + --replace "marshmallow-sqlalchemy>=0.22.0, <0.24.0" "marshmallow-sqlalchemy" \ + --replace "prison>=0.1.3, <1.0.0" "prison" ''; + # majority of tests require network access or mongo doCheck = false; diff --git a/pkgs/development/python-modules/flask-babel/default.nix b/pkgs/development/python-modules/flask-babel/default.nix index da6176e6781..602564d1626 100644 --- a/pkgs/development/python-modules/flask-babel/default.nix +++ b/pkgs/development/python-modules/flask-babel/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , python , fetchPypi diff --git a/pkgs/development/python-modules/flask-common/default.nix b/pkgs/development/python-modules/flask-common/default.nix index 7dbf507f220..cba8e9e8efd 100644 --- a/pkgs/development/python-modules/flask-common/default.nix +++ b/pkgs/development/python-modules/flask-common/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage +{ lib, fetchPypi, buildPythonPackage , crayons, flask, flask-caching, gunicorn, maya, meinheld, whitenoise }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/flask-compress/default.nix b/pkgs/development/python-modules/flask-compress/default.nix index 9491ca8be77..1e133df2b2b 100644 --- a/pkgs/development/python-modules/flask-compress/default.nix +++ b/pkgs/development/python-modules/flask-compress/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, flask +{ lib, fetchPypi, buildPythonPackage, flask , brotli }: diff --git a/pkgs/development/python-modules/flask-cors/default.nix b/pkgs/development/python-modules/flask-cors/default.nix index 731e8b106ab..25c054b231b 100644 --- a/pkgs/development/python-modules/flask-cors/default.nix +++ b/pkgs/development/python-modules/flask-cors/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage +{ lib, fetchPypi, buildPythonPackage , nose, flask, six, packaging }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/flask-elastic/default.nix b/pkgs/development/python-modules/flask-elastic/default.nix index 6986cd75be6..3a9daa577d4 100644 --- a/pkgs/development/python-modules/flask-elastic/default.nix +++ b/pkgs/development/python-modules/flask-elastic/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , flask, elasticsearch }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/flask-jwt-extended/default.nix b/pkgs/development/python-modules/flask-jwt-extended/default.nix index cf8a70b0533..580cd1f89f7 100644 --- a/pkgs/development/python-modules/flask-jwt-extended/default.nix +++ b/pkgs/development/python-modules/flask-jwt-extended/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, dateutil, flask, pyjwt, werkzeug, pytest }: +{ lib, buildPythonPackage, fetchPypi, dateutil, flask, pyjwt, werkzeug, pytest }: buildPythonPackage rec { pname = "Flask-JWT-Extended"; diff --git a/pkgs/development/python-modules/flask-ldap-login/default.nix b/pkgs/development/python-modules/flask-ldap-login/default.nix index 1673ca24e6e..08aa2efb8f2 100644 --- a/pkgs/development/python-modules/flask-ldap-login/default.nix +++ b/pkgs/development/python-modules/flask-ldap-login/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, fetchpatch +{ lib, buildPythonPackage, isPy3k, fetchFromGitHub, fetchpatch , flask, flask_wtf, flask_testing, ldap , mock, nose }: diff --git a/pkgs/development/python-modules/flask-limiter/default.nix b/pkgs/development/python-modules/flask-limiter/default.nix index 38d42da1c8a..d22096f9149 100644 --- a/pkgs/development/python-modules/flask-limiter/default.nix +++ b/pkgs/development/python-modules/flask-limiter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, flask, limits }: +{ lib, fetchPypi, buildPythonPackage, flask, limits }: buildPythonPackage rec { pname = "Flask-Limiter"; diff --git a/pkgs/development/python-modules/flask-login/default.nix b/pkgs/development/python-modules/flask-login/default.nix index 919e353eb8e..9d54849e92d 100644 --- a/pkgs/development/python-modules/flask-login/default.nix +++ b/pkgs/development/python-modules/flask-login/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonAtLeast +{ lib, buildPythonPackage, fetchPypi, pythonAtLeast , flask, blinker, nose, mock, semantic-version }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/flask-migrate/default.nix b/pkgs/development/python-modules/flask-migrate/default.nix index 24ed04437a0..dfa1a0fbd01 100644 --- a/pkgs/development/python-modules/flask-migrate/default.nix +++ b/pkgs/development/python-modules/flask-migrate/default.nix @@ -1,25 +1,23 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k, glibcLocales, flask, flask_sqlalchemy, flask_script, alembic }: - -with stdenv.lib; +{ lib, buildPythonPackage, fetchPypi, isPy3k, glibcLocales, flask, flask_sqlalchemy, flask_script, alembic }: buildPythonPackage rec { pname = "Flask-Migrate"; - version = "2.5.3"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "a69d508c2e09d289f6e55a417b3b8c7bfe70e640f53d2d9deb0d056a384f37ee"; + sha256 = "8626af845e6071ef80c70b0dc16d373f761c981f0ad61bb143a529cab649e725"; }; - checkInputs = [ flask_script ] ++ optional isPy3k glibcLocales; + checkInputs = [ flask_script ] ++ lib.optional isPy3k glibcLocales; propagatedBuildInputs = [ flask flask_sqlalchemy alembic ]; # tests invoke the flask cli which uses click and therefore has py3k encoding troubles - preCheck = optionalString isPy3k '' + preCheck = lib.optionalString isPy3k '' export LANG="en_US.UTF-8" ''; - meta = { + meta = with lib; { description = "SQLAlchemy database migrations for Flask applications using Alembic"; license = licenses.mit; homepage = "https://github.com/miguelgrinberg/Flask-Migrate"; diff --git a/pkgs/development/python-modules/flask-paginate/default.nix b/pkgs/development/python-modules/flask-paginate/default.nix index 0d618e2b55d..212e3a6fcc2 100644 --- a/pkgs/development/python-modules/flask-paginate/default.nix +++ b/pkgs/development/python-modules/flask-paginate/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "flask-paginate"; - version = "0.7.1"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "949b93d0535d1223b91ac0048586bd878aaebf4044c54c1dc3068acc9bdf441f"; + sha256 = "60b2a696bf63d2bc1c90a5b1a861c280461732b88f079c267dc98021911a007b"; }; propagatedBuildInputs = [ flask ]; diff --git a/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix b/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix index 550f6520e7d..18e48329288 100644 --- a/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix +++ b/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , isPy3k diff --git a/pkgs/development/python-modules/flask-silk/default.nix b/pkgs/development/python-modules/flask-silk/default.nix index 92d2f90848c..f6b6fd81528 100644 --- a/pkgs/development/python-modules/flask-silk/default.nix +++ b/pkgs/development/python-modules/flask-silk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , flask diff --git a/pkgs/development/python-modules/flask-sqlalchemy/default.nix b/pkgs/development/python-modules/flask-sqlalchemy/default.nix index 16b8c9c7fc7..1bac82fb44f 100644 --- a/pkgs/development/python-modules/flask-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/flask-sqlalchemy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, flask, mock, sqlalchemy, pytest }: +{ lib, buildPythonPackage, fetchPypi, flask, mock, sqlalchemy, pytest }: buildPythonPackage rec { pname = "Flask-SQLAlchemy"; diff --git a/pkgs/development/python-modules/flask-swagger-ui/default.nix b/pkgs/development/python-modules/flask-swagger-ui/default.nix index 79650e7c175..d238ba5acb7 100644 --- a/pkgs/development/python-modules/flask-swagger-ui/default.nix +++ b/pkgs/development/python-modules/flask-swagger-ui/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, flask }: +{ lib, buildPythonPackage, fetchPypi, flask }: buildPythonPackage rec { pname = "flask-swagger-ui"; diff --git a/pkgs/development/python-modules/flask-swagger/default.nix b/pkgs/development/python-modules/flask-swagger/default.nix index 20624c31862..66c45b85522 100644 --- a/pkgs/development/python-modules/flask-swagger/default.nix +++ b/pkgs/development/python-modules/flask-swagger/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , flask, pyyaml }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/flask-testing/default.nix b/pkgs/development/python-modules/flask-testing/default.nix index 9f4d66335de..6cfcffdb7be 100644 --- a/pkgs/development/python-modules/flask-testing/default.nix +++ b/pkgs/development/python-modules/flask-testing/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ flask ]; - checkInputs = [ blinker ] ++ stdenv.lib.optionals (!isPy3k) [ twill ]; + checkInputs = [ blinker ] ++ lib.optionals (!isPy3k) [ twill ]; # twill integration is outdated in Python 2, hence it the tests fails. # Some of the tests use localhost networking on darwin. diff --git a/pkgs/development/python-modules/flask-versioned/default.nix b/pkgs/development/python-modules/flask-versioned/default.nix index 15e7b2c1875..e30abdb7cb4 100644 --- a/pkgs/development/python-modules/flask-versioned/default.nix +++ b/pkgs/development/python-modules/flask-versioned/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, flask }: +{ lib, buildPythonPackage, fetchFromGitHub, flask }: buildPythonPackage rec { pname = "Flask-Versioned"; diff --git a/pkgs/development/python-modules/flask-wtf/default.nix b/pkgs/development/python-modules/flask-wtf/default.nix index eadc7842a01..00af0ce61e9 100644 --- a/pkgs/development/python-modules/flask-wtf/default.nix +++ b/pkgs/development/python-modules/flask-wtf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, flask, wtforms, nose }: +{ lib, fetchPypi, buildPythonPackage, flask, wtforms, nose }: buildPythonPackage rec { pname = "Flask-WTF"; diff --git a/pkgs/development/python-modules/flask/default.nix b/pkgs/development/python-modules/flask/default.nix index d121b4e32c8..27f436c3c53 100644 --- a/pkgs/development/python-modules/flask/default.nix +++ b/pkgs/development/python-modules/flask/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , itsdangerous, click, werkzeug, jinja2, pytest }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/flaskbabel/default.nix b/pkgs/development/python-modules/flaskbabel/default.nix index eef31359f50..d15950bba9a 100644 --- a/pkgs/development/python-modules/flaskbabel/default.nix +++ b/pkgs/development/python-modules/flaskbabel/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , flask diff --git a/pkgs/development/python-modules/flatbuffers/default.nix b/pkgs/development/python-modules/flatbuffers/default.nix index d06ea28b334..f697f7b8ae0 100644 --- a/pkgs/development/python-modules/flatbuffers/default.nix +++ b/pkgs/development/python-modules/flatbuffers/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib , buildPythonPackage , flatbuffers }: @@ -16,6 +16,6 @@ buildPythonPackage rec { meta = flatbuffers.meta // { description = "Python runtime library for use with the Flatbuffers serialization format"; - maintainers = with stdenv.lib.maintainers; [ wulfsta ]; + maintainers = with lib.maintainers; [ wulfsta ]; }; } diff --git a/pkgs/development/python-modules/flowlogs_reader/default.nix b/pkgs/development/python-modules/flowlogs_reader/default.nix index 1a6591040a2..9fd36fab294 100644 --- a/pkgs/development/python-modules/flowlogs_reader/default.nix +++ b/pkgs/development/python-modules/flowlogs_reader/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/pkgs/development/python-modules/flup/default.nix b/pkgs/development/python-modules/flup/default.nix index 52ac5da27aa..fa19d9bdf7a 100644 --- a/pkgs/development/python-modules/flup/default.nix +++ b/pkgs/development/python-modules/flup/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , isPy3k , fetchPypi diff --git a/pkgs/development/python-modules/flux-led/default.nix b/pkgs/development/python-modules/flux-led/default.nix index ddec811e21c..64eafed6c19 100644 --- a/pkgs/development/python-modules/flux-led/default.nix +++ b/pkgs/development/python-modules/flux-led/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchFromGitHub , aiohttp, zigpy , pytest, isPy27 }: diff --git a/pkgs/development/python-modules/fnvhash/default.nix b/pkgs/development/python-modules/fnvhash/default.nix new file mode 100644 index 00000000000..d506b51a92c --- /dev/null +++ b/pkgs/development/python-modules/fnvhash/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "fnvhash"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "znerol"; + repo = "py-fnvhash"; + rev = "v${version}"; + sha256 = "00h8i70qd3dpsyf2dp7fkcb9m2prd6m3l33qv3wf6idpnqgjz6fq"; + }; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "fnvhash" ]; + + meta = with lib; { + description = "Python FNV hash implementation"; + homepage = "https://github.com/znerol/py-fnvhash"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/foolscap/default.nix b/pkgs/development/python-modules/foolscap/default.nix index 396bef6d009..e0d38a5a131 100644 --- a/pkgs/development/python-modules/foolscap/default.nix +++ b/pkgs/development/python-modules/foolscap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , mock diff --git a/pkgs/development/python-modules/forbiddenfruit/default.nix b/pkgs/development/python-modules/forbiddenfruit/default.nix index 64713d96ade..1bb3b17e9df 100644 --- a/pkgs/development/python-modules/forbiddenfruit/default.nix +++ b/pkgs/development/python-modules/forbiddenfruit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/pkgs/development/python-modules/fortiosapi/default.nix b/pkgs/development/python-modules/fortiosapi/default.nix new file mode 100644 index 00000000000..8b0425c3881 --- /dev/null +++ b/pkgs/development/python-modules/fortiosapi/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, oyaml +, packaging +, paramiko +, pexpect +, requests +}: + +buildPythonPackage rec { + pname = "fortiosapi"; + version = "1.0.5"; + + src = fetchFromGitHub { + owner = "fortinet-solutions-cse"; + repo = pname; + rev = "v${version}"; + sha256 = "0679dizxcd4sk1b4h6ss8qsbjb3c8qyijlp4gzjqji91w6anzg9k"; + }; + + propagatedBuildInputs = [ + pexpect + requests + paramiko + packaging + oyaml + ]; + + # Tests require a local VM + doCheck = false; + pythonImportsCheck = [ "fortiosapi" ]; + + meta = with lib; { + description = "Python module to work with Fortigate/Fortios devices"; + homepage = "https://github.com/fortinet-solutions-cse/fortiosapi"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/foxdot/default.nix b/pkgs/development/python-modules/foxdot/default.nix index d60c1e89900..072129e6ea5 100644 --- a/pkgs/development/python-modules/foxdot/default.nix +++ b/pkgs/development/python-modules/foxdot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, tkinter, supercollider }: +{ lib, buildPythonPackage, fetchPypi, tkinter, supercollider }: buildPythonPackage rec { pname = "FoxDot"; diff --git a/pkgs/development/python-modules/freezegun/0.3.nix b/pkgs/development/python-modules/freezegun/0.3.nix index 9dc88596f26..a83a432d89d 100644 --- a/pkgs/development/python-modules/freezegun/0.3.nix +++ b/pkgs/development/python-modules/freezegun/0.3.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 @@ -11,17 +11,15 @@ buildPythonPackage rec { pname = "freezegun"; - version = "0.3.5"; + version = "0.3.15"; src = fetchPypi { inherit pname version; - sha256 = "02ly89wwn0plcw8clkkzvxaw6zlpm8qyqpm9x2mfw4a0vppb4ngf"; + sha256 = "e2062f2c7f95cc276a834c22f1a17179467176b624cc6f936e8bc3be5535ad1b"; }; propagatedBuildInputs = [ dateutil six ]; checkInputs = [ mock nose pytest ]; - # contains python3 specific code - doCheck = !isPy27; meta = with lib; { description = "FreezeGun: Let your Python tests travel through time"; diff --git a/pkgs/development/python-modules/freezegun/default.nix b/pkgs/development/python-modules/freezegun/default.nix index f1b1d9738d7..00d03435de9 100644 --- a/pkgs/development/python-modules/freezegun/default.nix +++ b/pkgs/development/python-modules/freezegun/default.nix @@ -1,29 +1,23 @@ -{ lib, stdenv +{ lib , buildPythonPackage , pythonOlder , fetchPypi -, isPy27 , dateutil -, six -, mock -, nose -, pytest +, pytestCheckHook }: buildPythonPackage rec { pname = "freezegun"; - version = "1.0.0"; + version = "1.1.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "1cf08e441f913ff5e59b19cc065a8faa9dd1ddc442eaf0375294f344581a0643"; + sha256 = "177f9dd59861d871e27a484c3332f35a6e3f5d14626f2bf91be37891f18927f3"; }; - propagatedBuildInputs = [ dateutil six ]; - checkInputs = [ mock nose pytest ]; - # contains python3 specific code - doCheck = !isPy27; + propagatedBuildInputs = [ dateutil ]; + checkInputs = [ pytestCheckHook ]; meta = with lib; { description = "FreezeGun: Let your Python tests travel through time"; diff --git a/pkgs/development/python-modules/fritzconnection/default.nix b/pkgs/development/python-modules/fritzconnection/default.nix index 05999d8da79..b8312d1c8ec 100644 --- a/pkgs/development/python-modules/fritzconnection/default.nix +++ b/pkgs/development/python-modules/fritzconnection/default.nix @@ -1,37 +1,26 @@ -{ lib, stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, pytest, requests }: +{ lib, buildPythonPackage, pythonOlder, fetchFromGitHub, pytestCheckHook, requests }: buildPythonPackage rec { pname = "fritzconnection"; - version = "1.2.1"; + version = "1.4.0"; + # no tests on PyPI src = fetchFromGitHub { owner = "kbr"; repo = pname; rev = version; - sha256 = "17z4shs56ci9mxmilppv5xy9gbnbp6p1h2ms6x55nkvwndacrp7x"; + sha256 = "1p8dqcc75xfhyvc9izjzz8c7qfrdkjkrkj36j7ms5fimn5bwk70q"; }; - disabled = pythonOlder "3.5"; - - # Exclude test files from build, which cause ImportMismtachErrors and - # otherwise missing resources during tests. This patch can be dropped once - # https://github.com/kbr/fritzconnection/pull/39 is merged. - prePatch = '' - substituteInPlace setup.py \ - --replace 'find_packages()' 'find_packages(exclude=["*.tests"])' - ''; + disabled = pythonOlder "3.6"; propagatedBuildInputs = [ requests ]; - checkInputs = [ pytest ]; - - checkPhase = '' - pytest - ''; + checkInputs = [ pytestCheckHook ]; meta = with lib; { description = "Python-Tool to communicate with the AVM FritzBox using the TR-064 protocol"; - homepage = "https://bitbucket.org/kbr/fritzconnection"; + homepage = "https://github.com/kbr/fritzconnection"; license = licenses.mit; maintainers = with maintainers; [ dotlambda valodim ]; }; diff --git a/pkgs/development/python-modules/frozendict/default.nix b/pkgs/development/python-modules/frozendict/default.nix index dd0c9929826..e172f3815b7 100644 --- a/pkgs/development/python-modules/frozendict/default.nix +++ b/pkgs/development/python-modules/frozendict/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "frozendict"; diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix index 63342c7045d..dbc36317228 100644 --- a/pkgs/development/python-modules/ftfy/default.nix +++ b/pkgs/development/python-modules/ftfy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , isPy3k , fetchPypi diff --git a/pkgs/development/python-modules/ftputil/default.nix b/pkgs/development/python-modules/ftputil/default.nix index f38f5d74097..883ff69c6d6 100644 --- a/pkgs/development/python-modules/ftputil/default.nix +++ b/pkgs/development/python-modules/ftputil/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { and not test_conditional_upload and not test_conditional_download_with_older_target \ '' # need until https://ftputil.sschwarzer.net/trac/ticket/140#ticket is fixed - + lib.optionalString stdenv.isDarwin ''and not test_error_message_reuse'' + + lib.optionalString stdenv.isDarwin "and not test_error_message_reuse" + ''"''; meta = with lib; { diff --git a/pkgs/development/python-modules/fudge/default.nix b/pkgs/development/python-modules/fudge/default.nix index 3f53b66d1ef..ba97b2e8f47 100644 --- a/pkgs/development/python-modules/fudge/default.nix +++ b/pkgs/development/python-modules/fudge/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/pkgs/development/python-modules/funcparserlib/default.nix b/pkgs/development/python-modules/funcparserlib/default.nix index 773ed1dccd6..19e2dd146d2 100644 --- a/pkgs/development/python-modules/funcparserlib/default.nix +++ b/pkgs/development/python-modules/funcparserlib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , python diff --git a/pkgs/development/python-modules/funcsigs/default.nix b/pkgs/development/python-modules/funcsigs/default.nix index aaa49254ecc..8a7335accda 100644 --- a/pkgs/development/python-modules/funcsigs/default.nix +++ b/pkgs/development/python-modules/funcsigs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , isPyPy, isPy3k, unittest2 }: @@ -14,7 +14,7 @@ buildPythonPackage rec { buildInputs = [ unittest2 ]; # https://github.com/testing-cabal/funcsigs/issues/10 - patches = stdenv.lib.optional (isPyPy && isPy3k) [ ./fix-pypy3-tests.patch ]; + patches = lib.optional (isPyPy && isPy3k) [ ./fix-pypy3-tests.patch ]; meta = with lib; { description = "Python function signatures from PEP362 for Python 2.6, 2.7 and 3.2+"; diff --git a/pkgs/development/python-modules/functools32/default.nix b/pkgs/development/python-modules/functools32/default.nix index cec9da42395..be907e963c1 100644 --- a/pkgs/development/python-modules/functools32/default.nix +++ b/pkgs/development/python-modules/functools32/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/funcy/default.nix b/pkgs/development/python-modules/funcy/default.nix index 3db08cf22bb..515f0925caf 100644 --- a/pkgs/development/python-modules/funcy/default.nix +++ b/pkgs/development/python-modules/funcy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/furl/default.nix b/pkgs/development/python-modules/furl/default.nix index b7592885007..72089da11e1 100644 --- a/pkgs/development/python-modules/furl/default.nix +++ b/pkgs/development/python-modules/furl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, flake8, six, orderedmultidict, pytest }: +{ lib, buildPythonPackage, fetchPypi, flake8, six, orderedmultidict, pytest }: buildPythonPackage rec { pname = "furl"; diff --git a/pkgs/development/python-modules/fuse-python/default.nix b/pkgs/development/python-modules/fuse-python/default.nix index 01ab12b1ab5..14f2cb584ea 100644 --- a/pkgs/development/python-modules/fuse-python/default.nix +++ b/pkgs/development/python-modules/fuse-python/default.nix @@ -1,20 +1,22 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pkgconfig, fuse }: +{ lib, buildPythonPackage, fetchPypi, pkg-config, fuse }: buildPythonPackage rec { pname = "fuse-python"; - version = "1.0.0"; + version = "1.0.1"; src = fetchPypi { inherit pname version; - sha256 = "cbaa21c8f0a440302d1ba9fd57a80cf9ff227e5a3820708a8ba8450db883cc05"; + sha256 = "da42d4f596a2e91602bcdf46cc51747df31c074a3ceb78bccc253c483a8a75fb"; }; buildInputs = [ fuse ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; - # no tests in the Pypi archive + # no tests implemented doCheck = false; + pythonImportsCheck = [ "fuse" ]; + meta = with lib; { description = "Python bindings for FUSE"; homepage = "https://github.com/libfuse/python-fuse"; diff --git a/pkgs/development/python-modules/fusepy/default.nix b/pkgs/development/python-modules/fusepy/default.nix index 858d3e13ea0..45b70863042 100644 --- a/pkgs/development/python-modules/fusepy/default.nix +++ b/pkgs/development/python-modules/fusepy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pkgs diff --git a/pkgs/development/python-modules/fuzzywuzzy/default.nix b/pkgs/development/python-modules/fuzzywuzzy/default.nix index c2d16a55984..0bcf8efc359 100644 --- a/pkgs/development/python-modules/fuzzywuzzy/default.nix +++ b/pkgs/development/python-modules/fuzzywuzzy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, python-Levenshtein, pycodestyle, hypothesis, pytest }: +{ lib, buildPythonPackage, fetchPypi, python-Levenshtein, pycodestyle, hypothesis, pytest }: buildPythonPackage rec { pname = "fuzzywuzzy"; diff --git a/pkgs/development/python-modules/gast/default.nix b/pkgs/development/python-modules/gast/default.nix index e4dbe43ef8d..38334d5cc6b 100644 --- a/pkgs/development/python-modules/gast/default.nix +++ b/pkgs/development/python-modules/gast/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, astunparse }: +{ lib, fetchPypi, buildPythonPackage, astunparse }: buildPythonPackage rec { pname = "gast"; diff --git a/pkgs/development/python-modules/gateone/default.nix b/pkgs/development/python-modules/gateone/default.nix index 981cbbb7e8c..5c45e875e5d 100644 --- a/pkgs/development/python-modules/gateone/default.nix +++ b/pkgs/development/python-modules/gateone/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , tornado , futures diff --git a/pkgs/development/python-modules/gcovr/default.nix b/pkgs/development/python-modules/gcovr/default.nix index bedb7f3a375..1332777189b 100644 --- a/pkgs/development/python-modules/gcovr/default.nix +++ b/pkgs/development/python-modules/gcovr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , jinja2 diff --git a/pkgs/development/python-modules/gdata/default.nix b/pkgs/development/python-modules/gdata/default.nix index bf9c01c250a..94430d0d941 100644 --- a/pkgs/development/python-modules/gdata/default.nix +++ b/pkgs/development/python-modules/gdata/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl }: diff --git a/pkgs/development/python-modules/gdrivefs/default.nix b/pkgs/development/python-modules/gdrivefs/default.nix index aab5efea97d..6060dc3a5bb 100644 --- a/pkgs/development/python-modules/gdrivefs/default.nix +++ b/pkgs/development/python-modules/gdrivefs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , isPy3k diff --git a/pkgs/development/python-modules/geeknote/default.nix b/pkgs/development/python-modules/geeknote/default.nix index 4eb209a8af7..6c416548184 100644 --- a/pkgs/development/python-modules/geeknote/default.nix +++ b/pkgs/development/python-modules/geeknote/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , isPy27 diff --git a/pkgs/development/python-modules/genanki/default.nix b/pkgs/development/python-modules/genanki/default.nix index f43fdabf09e..3f217afd8bb 100644 --- a/pkgs/development/python-modules/genanki/default.nix +++ b/pkgs/development/python-modules/genanki/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k +{ lib, buildPythonPackage, fetchPypi, isPy3k , cached-property, frozendict, pystache, pyyaml, pytest, pytestrunner }: diff --git a/pkgs/development/python-modules/genpy/default.nix b/pkgs/development/python-modules/genpy/default.nix index 64e253b3201..d5e82332c30 100644 --- a/pkgs/development/python-modules/genpy/default.nix +++ b/pkgs/development/python-modules/genpy/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "genpy"; - version = "2016.1.3"; + version = "2021.1"; src = fetchPypi { inherit pname version; - sha256 = "1c11726f1e8ace8bbdfc87816403c9a59f53a8c3d45c99187ae17c9725d87a91"; + sha256 = "9bc062fa98c5c466ff464d8974be81a6bf67af9247b5e5176215ad1e81a6cdac"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/genshi/default.nix b/pkgs/development/python-modules/genshi/default.nix index 9a6e4508e30..c476960bbf8 100644 --- a/pkgs/development/python-modules/genshi/default.nix +++ b/pkgs/development/python-modules/genshi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , setuptools diff --git a/pkgs/development/python-modules/genzshcomp/default.nix b/pkgs/development/python-modules/genzshcomp/default.nix index 8f486cc29ef..a848eff41a6 100644 --- a/pkgs/development/python-modules/genzshcomp/default.nix +++ b/pkgs/development/python-modules/genzshcomp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , setuptools diff --git a/pkgs/development/python-modules/geoalchemy2/default.nix b/pkgs/development/python-modules/geoalchemy2/default.nix index 56f9346668f..b629d48c61f 100644 --- a/pkgs/development/python-modules/geoalchemy2/default.nix +++ b/pkgs/development/python-modules/geoalchemy2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , sqlalchemy diff --git a/pkgs/development/python-modules/geographiclib/default.nix b/pkgs/development/python-modules/geographiclib/default.nix index 98c1ee417e4..5167b986604 100644 --- a/pkgs/development/python-modules/geographiclib/default.nix +++ b/pkgs/development/python-modules/geographiclib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/geojson-client/default.nix b/pkgs/development/python-modules/geojson-client/default.nix new file mode 100644 index 00000000000..7e683e20483 --- /dev/null +++ b/pkgs/development/python-modules/geojson-client/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, geojson +, haversine +, pytz +, requests +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "geojson-client"; + version = "0.5"; + + src = fetchFromGitHub { + owner = "exxamalte"; + repo = "python-geojson-client"; + rev = "v${version}"; + sha256 = "1cc6ymbn45dv7xdl1r8bbizlmsdbxjmsfza442yxmmm19nxnnqjv"; + }; + + propagatedBuildInputs = [ + geojson + haversine + pytz + requests + ]; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "geojson_client" ]; + + meta = with lib; { + description = "Python module for convenient access to GeoJSON feeds"; + homepage = "https://github.com/exxamalte/python-geojson-client"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/geomet/default.nix b/pkgs/development/python-modules/geomet/default.nix new file mode 100644 index 00000000000..a4df450098d --- /dev/null +++ b/pkgs/development/python-modules/geomet/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, click +, six +}: + +buildPythonPackage rec { + pname = "geomet"; + version = "0.2.1"; + + # pypi tarball doesn't include tests + src = fetchFromGitHub { + owner = "geomet"; + repo = "geomet"; + rev = version; + sha256 = "0fdi26glsmrsyqk86rnsfcqw79svn2b0ikdv89pq98ihrpwhn85y"; + }; + + patches = [ + (fetchpatch { + name = "python-3.8-support.patch"; + url = "https://github.com/geomet/geomet/commit/dc4cb4a856d3ad814b57b4b7487d86d9e0f0fad4.patch"; + sha256 = "1f1cdfqyp3z01jdjvax77219l3gc75glywqrisqpd2k0m0g7fwh3"; + }) + ]; + + propagatedBuildInputs = [ click six ]; + + meta = with lib; { + homepage = "https://github.com/geomet/geomet"; + license = licenses.asl20; + description = "Convert GeoJSON to WKT/WKB (Well-Known Text/Binary), and vice versa."; + maintainers = with maintainers; [ turion ris ]; + }; +} diff --git a/pkgs/development/python-modules/geopy/2.nix b/pkgs/development/python-modules/geopy/2.nix index ae4e07e2547..48df43e2217 100644 --- a/pkgs/development/python-modules/geopy/2.nix +++ b/pkgs/development/python-modules/geopy/2.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/pkgs/development/python-modules/geopy/default.nix b/pkgs/development/python-modules/geopy/default.nix index fdf478d1610..693a4221ee0 100644 --- a/pkgs/development/python-modules/geopy/default.nix +++ b/pkgs/development/python-modules/geopy/default.nix @@ -1,30 +1,42 @@ -{ lib, stdenv +{ lib +, async_generator , buildPythonPackage , fetchFromGitHub -, isPy3k , geographiclib +, isPy3k +, pytestCheckHook }: buildPythonPackage rec { - pname = "geopy-unstable"; - version = "2019-11-10"; - + pname = "geopy"; + version = "2.1.0"; disabled = !isPy3k; # only Python 3 - doCheck = false; # Needs network access - - propagatedBuildInputs = [ geographiclib ]; src = fetchFromGitHub { - owner = "geopy"; - repo = "geopy"; - rev = "531b7de6126838a3e69370227aa7f2086ba52b89"; - sha256 = "07l1pblzg3hb3dbvd9rq8x78ly5dv0zxbc5hwskqil0bhv5v1p39"; + owner = pname; + repo = pname; + rev = version; + sha256 = "0239a4achk49ngagb6aqy6cgzfwgbxir07vwi13ysbpx78y0l4g9"; }; + propagatedBuildInputs = [ geographiclib ]; + + checkInputs = [ + async_generator + pytestCheckHook + ]; + + # Exclude tests which perform API calls + pytestFlagsArray = [ "--ignore test/geocoders/" ]; + pythonImportsCheck = [ "geopy" ]; + + __darwinAllowLocalNetworking = true; + meta = with lib; { homepage = "https://github.com/geopy/geopy"; description = "Python Geocoding Toolbox"; - license = licenses.mit; - maintainers = with maintainers; [GuillaumeDesforges]; + changelog = "https://github.com/geopy/geopy/releases/tag/${version}"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ GuillaumeDesforges ]; }; } diff --git a/pkgs/development/python-modules/gevent-socketio/default.nix b/pkgs/development/python-modules/gevent-socketio/default.nix index 88d1089d5a3..4a25e0d7e14 100644 --- a/pkgs/development/python-modules/gevent-socketio/default.nix +++ b/pkgs/development/python-modules/gevent-socketio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , versiontools diff --git a/pkgs/development/python-modules/gevent-websocket/default.nix b/pkgs/development/python-modules/gevent-websocket/default.nix index 431a0c09a30..7ff62a378ca 100644 --- a/pkgs/development/python-modules/gevent-websocket/default.nix +++ b/pkgs/development/python-modules/gevent-websocket/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/gevent/default.nix b/pkgs/development/python-modules/gevent/default.nix index ba80a928f25..3fe9e648ce3 100644 --- a/pkgs/development/python-modules/gevent/default.nix +++ b/pkgs/development/python-modules/gevent/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, isPyPy, python, libev, greenlet +{ lib, fetchPypi, buildPythonPackage, isPyPy, python, libev, greenlet , zope_interface }: @@ -15,7 +15,7 @@ buildPythonPackage rec { buildInputs = [ libev ]; propagatedBuildInputs = [ zope_interface - ] ++ stdenv.lib.optionals (!isPyPy) [ greenlet ]; + ] ++ lib.optionals (!isPyPy) [ greenlet ]; checkPhase = '' cd greentest diff --git a/pkgs/development/python-modules/geventhttpclient/default.nix b/pkgs/development/python-modules/geventhttpclient/default.nix index fafbef12bd3..c82da3c8a98 100644 --- a/pkgs/development/python-modules/geventhttpclient/default.nix +++ b/pkgs/development/python-modules/geventhttpclient/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/pkgs/development/python-modules/ghdiff/default.nix b/pkgs/development/python-modules/ghdiff/default.nix index a9582648117..efbdc2f59f9 100644 --- a/pkgs/development/python-modules/ghdiff/default.nix +++ b/pkgs/development/python-modules/ghdiff/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , zope_testrunner, six, chardet}: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/gipc/default.nix b/pkgs/development/python-modules/gipc/default.nix index a48547f2909..8df2808328f 100644 --- a/pkgs/development/python-modules/gipc/default.nix +++ b/pkgs/development/python-modules/gipc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , gevent diff --git a/pkgs/development/python-modules/git-annex-adapter/default.nix b/pkgs/development/python-modules/git-annex-adapter/default.nix index 1c76e5622b8..d41874cff3b 100644 --- a/pkgs/development/python-modules/git-annex-adapter/default.nix +++ b/pkgs/development/python-modules/git-annex-adapter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, substituteAll +{ lib, buildPythonPackage, isPy3k, fetchFromGitHub, fetchpatch, substituteAll , python, util-linux, pygit2, gitMinimal, git-annex, cacert }: @@ -17,6 +17,11 @@ buildPythonPackage rec { }; patches = [ + # fix tests with recent versions of git-annex + (fetchpatch { + url = "https://github.com/alpernebbi/git-annex-adapter/commit/6c210d828e8a57b12c716339ad1bf15c31cd4a55.patch"; + sha256 = "17kp7pnm9svq9av4q7hfic95xa1w3z02dnr8nmg14sjck2rlmqsi"; + }) (substituteAll { src = ./git-annex-path.patch; gitAnnex = "${git-annex}/bin/git-annex"; diff --git a/pkgs/development/python-modules/git-sweep/default.nix b/pkgs/development/python-modules/git-sweep/default.nix index adb9de4dbc0..2d7da28535c 100644 --- a/pkgs/development/python-modules/git-sweep/default.nix +++ b/pkgs/development/python-modules/git-sweep/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , GitPython @@ -15,6 +15,11 @@ buildPythonPackage rec { propagatedBuildInputs = [ GitPython ]; + # no tests + doCheck = false; + + pythonImportsCheck = [ "gitsweep" ]; + meta = with lib; { description = "A command-line tool that helps you clean up Git branches"; homepage = "https://github.com/arc90/git-sweep"; diff --git a/pkgs/development/python-modules/glances-api/default.nix b/pkgs/development/python-modules/glances-api/default.nix index 23e152c300f..2f5a1416e41 100644 --- a/pkgs/development/python-modules/glances-api/default.nix +++ b/pkgs/development/python-modules/glances-api/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "glances_api" ]; meta = with lib; { - description = "Python Wrapper for interacting with the Volkszahler API"; + description = "Python API for interacting with Glances"; homepage = "https://github.com/home-assistant-ecosystem/python-glances-api"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/globre/default.nix b/pkgs/development/python-modules/globre/default.nix index 21d2983ab01..5debd1d0ab6 100644 --- a/pkgs/development/python-modules/globre/default.nix +++ b/pkgs/development/python-modules/globre/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , pythonAtLeast , buildPythonPackage , fetchPypi diff --git a/pkgs/development/python-modules/glom/default.nix b/pkgs/development/python-modules/glom/default.nix index 2acc87a17ac..89f0de47490 100644 --- a/pkgs/development/python-modules/glom/default.nix +++ b/pkgs/development/python-modules/glom/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , boltons diff --git a/pkgs/development/python-modules/glymur/default.nix b/pkgs/development/python-modules/glymur/default.nix index f8a0e463238..50ed257f57e 100644 --- a/pkgs/development/python-modules/glymur/default.nix +++ b/pkgs/development/python-modules/glymur/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy - ] ++ stdenv.lib.optional isPy27 [ contextlib2 mock importlib-resources ]; + ] ++ lib.optional isPy27 [ contextlib2 mock importlib-resources ]; checkInputs = [ scikitimage diff --git a/pkgs/development/python-modules/gmpy2/default.nix b/pkgs/development/python-modules/gmpy2/default.nix index 808b918681b..204415d7531 100644 --- a/pkgs/development/python-modules/gmpy2/default.nix +++ b/pkgs/development/python-modules/gmpy2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , fetchpatch diff --git a/pkgs/development/python-modules/gmusicapi/default.nix b/pkgs/development/python-modules/gmusicapi/default.nix index 821e0ba0afa..1797f1d4264 100644 --- a/pkgs/development/python-modules/gmusicapi/default.nix +++ b/pkgs/development/python-modules/gmusicapi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , validictory diff --git a/pkgs/development/python-modules/gnureadline/default.nix b/pkgs/development/python-modules/gnureadline/default.nix index 71116c37041..6f3ae30e8cd 100644 --- a/pkgs/development/python-modules/gnureadline/default.nix +++ b/pkgs/development/python-modules/gnureadline/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPyPy diff --git a/pkgs/development/python-modules/gnutls/default.nix b/pkgs/development/python-modules/gnutls/default.nix index addbee81bd3..3c68a1713a0 100644 --- a/pkgs/development/python-modules/gnutls/default.nix +++ b/pkgs/development/python-modules/gnutls/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/goobook/default.nix b/pkgs/development/python-modules/goobook/default.nix index c587c928e7e..83175b6c86a 100644 --- a/pkgs/development/python-modules/goobook/default.nix +++ b/pkgs/development/python-modules/goobook/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k +{ lib, buildPythonPackage, fetchPypi, isPy3k , docutils, installShellFiles , google_api_python_client, simplejson, oauth2client, setuptools, xdg }: diff --git a/pkgs/development/python-modules/goocalendar/default.nix b/pkgs/development/python-modules/goocalendar/default.nix index 46bafa43388..b0eea600384 100644 --- a/pkgs/development/python-modules/goocalendar/default.nix +++ b/pkgs/development/python-modules/goocalendar/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv +{ lib , fetchPypi , buildPythonPackage -, pkgconfig +, pkg-config , gtk3 , gobject-introspection , pygtk @@ -10,8 +10,6 @@ , isPy3k }: -with stdenv.lib; - buildPythonPackage rec { pname = "GooCalendar"; version = "0.7.1"; @@ -24,7 +22,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config gobject-introspection ]; diff --git a/pkgs/development/python-modules/google-apputils/default.nix b/pkgs/development/python-modules/google-apputils/default.nix index 7cc7f485882..321837f56ae 100644 --- a/pkgs/development/python-modules/google-apputils/default.nix +++ b/pkgs/development/python-modules/google-apputils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/google-auth/default.nix b/pkgs/development/python-modules/google-auth/default.nix index 9120f93a3bd..22b02552cd7 100644 --- a/pkgs/development/python-modules/google-auth/default.nix +++ b/pkgs/development/python-modules/google-auth/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchpatch , fetchPypi diff --git a/pkgs/development/python-modules/google-cloud-asset/default.nix b/pkgs/development/python-modules/google-cloud-asset/default.nix index 8f04fb7451d..aec3b51acb5 100644 --- a/pkgs/development/python-modules/google-cloud-asset/default.nix +++ b/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , grpc_google_iam_v1 diff --git a/pkgs/development/python-modules/google-cloud-automl/default.nix b/pkgs/development/python-modules/google-cloud-automl/default.nix index 302ce8ceaed..83fe052a542 100644 --- a/pkgs/development/python-modules/google-cloud-automl/default.nix +++ b/pkgs/development/python-modules/google-cloud-automl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytestCheckHook diff --git a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix index 4ec12a8fa2f..8f67fed79d7 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , google-api-core diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index b8620ee8b35..a99588199bf 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytestCheckHook @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "2.6.1"; + version = "2.6.2"; src = fetchPypi { inherit pname version; - sha256 = "1vs4im0fixmszh6p77icys9g7fymwmkfc6va0ng9kpjv1h6gv68z"; + sha256 = "1c940bf190a681d80b6f6cd7541924ad411de5f0585b2c8c5e420ab750e2024d"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/pkgs/development/python-modules/google-cloud-bigtable/default.nix index 9632dc902d1..93cbc22b7cd 100644 --- a/pkgs/development/python-modules/google-cloud-bigtable/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigtable/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , grpc_google_iam_v1 diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix index 6d91bed83ae..1cf94d220e6 100644 --- a/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/pkgs/development/python-modules/google-cloud-container/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , google-api-core diff --git a/pkgs/development/python-modules/google-cloud-core/default.nix b/pkgs/development/python-modules/google-cloud-core/default.nix index 72709c62cec..44764a4edb1 100644 --- a/pkgs/development/python-modules/google-cloud-core/default.nix +++ b/pkgs/development/python-modules/google-cloud-core/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonOlder diff --git a/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/pkgs/development/python-modules/google-cloud-dataproc/default.nix index 1b7a570fed2..095e01fbbd7 100644 --- a/pkgs/development/python-modules/google-cloud-dataproc/default.nix +++ b/pkgs/development/python-modules/google-cloud-dataproc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , google-api-core diff --git a/pkgs/development/python-modules/google-cloud-datastore/default.nix b/pkgs/development/python-modules/google-cloud-datastore/default.nix index 84f98550b9a..4c8c79c7dda 100644 --- a/pkgs/development/python-modules/google-cloud-datastore/default.nix +++ b/pkgs/development/python-modules/google-cloud-datastore/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , google-api-core diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix index 9076c129804..451607a5357 100644 --- a/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , google-api-core diff --git a/pkgs/development/python-modules/google-cloud-dns/default.nix b/pkgs/development/python-modules/google-cloud-dns/default.nix index 0636da60e9a..fa4c8c6c52d 100644 --- a/pkgs/development/python-modules/google-cloud-dns/default.nix +++ b/pkgs/development/python-modules/google-cloud-dns/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , google-api-core diff --git a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix index b3181f8fcde..1457c044fe5 100644 --- a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix +++ b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytestCheckHook diff --git a/pkgs/development/python-modules/google-cloud-firestore/default.nix b/pkgs/development/python-modules/google-cloud-firestore/default.nix index f0c235ca0c9..30ef0af76a1 100644 --- a/pkgs/development/python-modules/google-cloud-firestore/default.nix +++ b/pkgs/development/python-modules/google-cloud-firestore/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , aiounittest diff --git a/pkgs/development/python-modules/google-cloud-iam/default.nix b/pkgs/development/python-modules/google-cloud-iam/default.nix index f96940f4e67..243c2b86c1e 100644 --- a/pkgs/development/python-modules/google-cloud-iam/default.nix +++ b/pkgs/development/python-modules/google-cloud-iam/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-iam"; - version = "2.0.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1zxsx5avs8njiyw32zvsx2yblmmiwxy771x334hbgmy0aqms4lak"; + sha256 = "d34604508e3e87b9161ccd5ff29474867ac91ffb8d29e1a2fc9ff0e26d934b73"; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-iot/default.nix b/pkgs/development/python-modules/google-cloud-iot/default.nix index 2b28f84a315..ac511f80647 100644 --- a/pkgs/development/python-modules/google-cloud-iot/default.nix +++ b/pkgs/development/python-modules/google-cloud-iot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , grpc_google_iam_v1 diff --git a/pkgs/development/python-modules/google-cloud-kms/default.nix b/pkgs/development/python-modules/google-cloud-kms/default.nix index 6675767a244..94dd7c1ba8f 100644 --- a/pkgs/development/python-modules/google-cloud-kms/default.nix +++ b/pkgs/development/python-modules/google-cloud-kms/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytestCheckHook diff --git a/pkgs/development/python-modules/google-cloud-language/default.nix b/pkgs/development/python-modules/google-cloud-language/default.nix index 7186ecd6f35..c43c51d97f7 100644 --- a/pkgs/development/python-modules/google-cloud-language/default.nix +++ b/pkgs/development/python-modules/google-cloud-language/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , google-api-core diff --git a/pkgs/development/python-modules/google-cloud-logging/default.nix b/pkgs/development/python-modules/google-cloud-logging/default.nix index 58d03f206fc..b8ffa935fc3 100644 --- a/pkgs/development/python-modules/google-cloud-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-logging/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , django diff --git a/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/pkgs/development/python-modules/google-cloud-monitoring/default.nix index 8dc665fe210..f8fc079aa3e 100644 --- a/pkgs/development/python-modules/google-cloud-monitoring/default.nix +++ b/pkgs/development/python-modules/google-cloud-monitoring/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , google-api-core diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix index 46a28b1ffd1..d3846ad4f42 100644 --- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytestCheckHook diff --git a/pkgs/development/python-modules/google-cloud-redis/default.nix b/pkgs/development/python-modules/google-cloud-redis/default.nix index 4dcf7fd3d31..86fbc360d73 100644 --- a/pkgs/development/python-modules/google-cloud-redis/default.nix +++ b/pkgs/development/python-modules/google-cloud-redis/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , google-api-core diff --git a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix index 11baf3d73f3..8a265182fba 100644 --- a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytestCheckHook diff --git a/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix b/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix index 81fa97f152b..0a3285566f1 100644 --- a/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix +++ b/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , google-api-core diff --git a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix index bb18b72caad..a143a418c22 100644 --- a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-secret-manager"; - version = "2.1.0"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "0c2w8ny3n84faq1mq86f16lzqgqbk1977q2f5qxn5a5ccj8v821g"; + sha256 = "97a46d2318f00c1c6ae1a4ab587e338677c5cc1651d7c6304982d74fa364dd9d"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix index 242198a2197..184044594d5 100644 --- a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix +++ b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , grpc_google_iam_v1 diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix index c78f3284730..759a8f25c1a 100644 --- a/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , grpc_google_iam_v1 @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "2.1.0"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "0mkkx6l3cbwfwng12zpisbv6m919fkhdb48xk24ayc19193bi86n"; + sha256 = "060c53bc6f541660a2fe868fd83a695207d4e7b050e04fe103d1e77634b813c7"; }; postPatch = '' diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix index 3359cfdd743..c57329eebcc 100644 --- a/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , google-api-core diff --git a/pkgs/development/python-modules/google-cloud-tasks/default.nix b/pkgs/development/python-modules/google-cloud-tasks/default.nix index e30986af610..5911bfe6156 100644 --- a/pkgs/development/python-modules/google-cloud-tasks/default.nix +++ b/pkgs/development/python-modules/google-cloud-tasks/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , google-api-core diff --git a/pkgs/development/python-modules/google-cloud-testutils/default.nix b/pkgs/development/python-modules/google-cloud-testutils/default.nix index 3f6792fa77b..2380e9183b7 100644 --- a/pkgs/development/python-modules/google-cloud-testutils/default.nix +++ b/pkgs/development/python-modules/google-cloud-testutils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, google-auth, six }: +{ lib, buildPythonPackage, fetchPypi, google-auth, six }: buildPythonPackage rec { pname = "google-cloud-testutils"; diff --git a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix index a7228a42999..3c84c21344a 100644 --- a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix +++ b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytestCheckHook diff --git a/pkgs/development/python-modules/google-cloud-trace/default.nix b/pkgs/development/python-modules/google-cloud-trace/default.nix index 1252c99bf48..486a71c7a97 100644 --- a/pkgs/development/python-modules/google-cloud-trace/default.nix +++ b/pkgs/development/python-modules/google-cloud-trace/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , google-api-core diff --git a/pkgs/development/python-modules/google-cloud-translate/default.nix b/pkgs/development/python-modules/google-cloud-translate/default.nix index 32d402e1cf0..2b0ac55fa2e 100644 --- a/pkgs/development/python-modules/google-cloud-translate/default.nix +++ b/pkgs/development/python-modules/google-cloud-translate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytestCheckHook diff --git a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix index 43fed1fe27f..26e3320a5cc 100644 --- a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix +++ b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , mock diff --git a/pkgs/development/python-modules/google-cloud-vision/default.nix b/pkgs/development/python-modules/google-cloud-vision/default.nix index 57a51f96e65..b6922912380 100644 --- a/pkgs/development/python-modules/google-cloud-vision/default.nix +++ b/pkgs/development/python-modules/google-cloud-vision/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , google-api-core @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-vision"; - version = "2.0.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0qbwhapmn5ia853c4nfnz1qiksngvr8j0xxjasrykwhxcsd7s1ka"; + sha256 = "2bae8b4aca9aa38ad7459102cc5743c506adf9060ad2b3b15cff1e8021085017"; }; propagatedBuildInputs = [ libcst google-api-core proto-plus]; diff --git a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix index 20614f5b5d8..ac91ab85bd6 100644 --- a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytestCheckHook diff --git a/pkgs/development/python-modules/google-crc32c/default.nix b/pkgs/development/python-modules/google-crc32c/default.nix index aaf16d9e7c8..b36635654a9 100644 --- a/pkgs/development/python-modules/google-crc32c/default.nix +++ b/pkgs/development/python-modules/google-crc32c/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "google-crc32c"; - version = "1.1.0"; + version = "1.1.2"; src = fetchFromGitHub { owner = "googleapis"; repo = "python-crc32c"; rev = "v${version}"; - sha256 = "0vbidg9yrv9k8xvk8rl43lsf4cg3dci4a9k4srwwrchbxivz1gr6"; + sha256 = "058g69yp7x41mv0d84yp31jv64fpm4r25b86rvvqgc6n74w6jj7k"; }; buildInputs = [ crc32c ]; diff --git a/pkgs/development/python-modules/google-music/default.nix b/pkgs/development/python-modules/google-music/default.nix index e5b42c5310f..90978ad2cba 100644 --- a/pkgs/development/python-modules/google-music/default.nix +++ b/pkgs/development/python-modules/google-music/default.nix @@ -19,11 +19,6 @@ buildPythonPackage rec { sha256 = "0fsp491ifsw0i1r98l8xr41m8d00nw9n5bin8k3laqzq1p65d6dp"; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "audio-metadata>=0.8,<0.9" "audio-metadata" - ''; - propagatedBuildInputs = [ appdirs audio-metadata diff --git a/pkgs/development/python-modules/googleapis_common_protos/default.nix b/pkgs/development/python-modules/googleapis_common_protos/default.nix index 7e5b786b4fb..898971629ae 100644 --- a/pkgs/development/python-modules/googleapis_common_protos/default.nix +++ b/pkgs/development/python-modules/googleapis_common_protos/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , grpc diff --git a/pkgs/development/python-modules/googlemaps/default.nix b/pkgs/development/python-modules/googlemaps/default.nix index c971119833e..007d4eb2cea 100644 --- a/pkgs/development/python-modules/googlemaps/default.nix +++ b/pkgs/development/python-modules/googlemaps/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , requests diff --git a/pkgs/development/python-modules/gorilla/default.nix b/pkgs/development/python-modules/gorilla/default.nix index bf4212edc51..42da4541647 100644 --- a/pkgs/development/python-modules/gorilla/default.nix +++ b/pkgs/development/python-modules/gorilla/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi}: +{ lib, buildPythonPackage, fetchPypi}: buildPythonPackage rec { pname = "gorilla"; diff --git a/pkgs/development/python-modules/gpapi/default.nix b/pkgs/development/python-modules/gpapi/default.nix index 788473b5ab8..6ed9f48dd61 100644 --- a/pkgs/development/python-modules/gpapi/default.nix +++ b/pkgs/development/python-modules/gpapi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder +{ lib, buildPythonPackage, fetchPypi, pythonOlder , requests , protobuf , pycryptodome diff --git a/pkgs/development/python-modules/gphoto2/default.nix b/pkgs/development/python-modules/gphoto2/default.nix index a25c8551490..31ac03347cb 100644 --- a/pkgs/development/python-modules/gphoto2/default.nix +++ b/pkgs/development/python-modules/gphoto2/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage -, pkgconfig +{ lib, fetchPypi, buildPythonPackage +, pkg-config , libgphoto2 }: buildPythonPackage rec { @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "48b4c4ab70826d3ddaaf7440564d513c02d78680fa690994b0640d383ffb8a7d"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libgphoto2 ]; diff --git a/pkgs/development/python-modules/gplaycli/default.nix b/pkgs/development/python-modules/gplaycli/default.nix index ecd52ad848c..28f244bc354 100644 --- a/pkgs/development/python-modules/gplaycli/default.nix +++ b/pkgs/development/python-modules/gplaycli/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, lib, stdenv, libffi, isPy3k, pyasn1, clint, ndg-httpsclient +{ buildPythonPackage, lib, libffi, isPy3k, pyasn1, clint, ndg-httpsclient , protobuf, requests, args, gpapi, pyaxmlparser, fetchFromGitHub }: diff --git a/pkgs/development/python-modules/gps3/default.nix b/pkgs/development/python-modules/gps3/default.nix new file mode 100644 index 00000000000..76321182dcb --- /dev/null +++ b/pkgs/development/python-modules/gps3/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "gps3"; + version = "0.33.3"; + + src = fetchFromGitHub { + owner = "onkelbeh"; + repo = pname; + rev = version; + sha256 = "0a0qpk7d2b1cld58qcdn6bxrkil6ascs51af01dy4p83062h1hi6"; + }; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "gps3" ]; + + meta = with lib; { + description = "Python client for GPSD"; + homepage = "https://github.com/onkelbeh/gps3"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/gpsoauth/default.nix b/pkgs/development/python-modules/gpsoauth/default.nix index 2c4dfcd8139..1ad50642e2b 100644 --- a/pkgs/development/python-modules/gpsoauth/default.nix +++ b/pkgs/development/python-modules/gpsoauth/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , cffi diff --git a/pkgs/development/python-modules/gpyopt/default.nix b/pkgs/development/python-modules/gpyopt/default.nix index 22e6743582c..85b6efabaa8 100644 --- a/pkgs/development/python-modules/gpyopt/default.nix +++ b/pkgs/development/python-modules/gpyopt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, setuptools +{ lib, buildPythonPackage, fetchFromGitHub, setuptools , numpy, scipy, gpy, emcee, nose }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/gradient-utils/default.nix b/pkgs/development/python-modules/gradient-utils/default.nix new file mode 100644 index 00000000000..cf0ffb6bb41 --- /dev/null +++ b/pkgs/development/python-modules/gradient-utils/default.nix @@ -0,0 +1,46 @@ +{ buildPythonPackage +, fetchFromGitHub +, hyperopt +, lib +, mock +, numpy +, poetry +, prometheus_client +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "gradient-utils"; + version = "0.3.2"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "Paperspace"; + repo = pname; + rev = "v${version}"; + sha256 = "083hnkv19mhvdc8nx28f1nph50c903gxh9g9q8531abv0w8m0744"; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'numpy = "1.18.5"' 'numpy = "^1.18.5"' \ + --replace 'hyperopt = "0.1.2"' 'hyperopt = ">=0.1.2"' + ''; + + nativeBuildInputs = [ poetry ]; + checkInputs = [ mock pytestCheckHook ]; + propagatedBuildInputs = [ hyperopt prometheus_client numpy ]; + + preCheck = "export HOSTNAME=myhost-experimentId"; + disabledTests = [ + "test_add_metrics_pushes_metrics" # requires a working prometheus push gateway + ]; + + meta = with lib; { + description = "Gradient ML SDK"; + homepage = "https://github.com/Paperspace/gradient-utils"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ freezeboy ]; + }; +} diff --git a/pkgs/development/python-modules/gradient/default.nix b/pkgs/development/python-modules/gradient/default.nix new file mode 100644 index 00000000000..14df3b882bb --- /dev/null +++ b/pkgs/development/python-modules/gradient/default.nix @@ -0,0 +1,40 @@ +{ lib, fetchPypi, buildPythonPackage +, attrs, boto3, requests, gradient_statsd, terminaltables +, click-completion , click-didyoumean, click-help-colors +, colorama, requests_toolbelt, gradient-utils, halo, progressbar2 +, marshmallow, pyyaml, websocket_client +}: + +buildPythonPackage rec { + pname = "gradient"; + version = "1.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "15s21945hg342195ig7nchap5mdnsw931iis92pr7hy8ff0rks3n"; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace 'attrs<=' 'attrs>=' \ + --replace 'colorama==' 'colorama>=' \ + --replace 'PyYAML==' 'PyYAML>=' \ + --replace 'marshmallow<' 'marshmallow>=' + ''; + + propagatedBuildInputs = [ attrs boto3 requests gradient_statsd terminaltables + click-completion click-didyoumean click-help-colors requests_toolbelt + colorama gradient-utils halo marshmallow progressbar2 pyyaml websocket_client + ]; + + # tries to use /homeless-shelter to mimic container usage, etc + doCheck = false; + + meta = with lib; { + description = "The command line interface for Gradient"; + homepage = "https://github.com/Paperspace/gradient-cli"; + license = licenses.isc; + platforms = platforms.unix; + maintainers = with maintainers; [ thoughtpolice ]; + }; +} diff --git a/pkgs/development/python-modules/gradient_sdk/default.nix b/pkgs/development/python-modules/gradient_sdk/default.nix deleted file mode 100644 index adaafd8eadb..00000000000 --- a/pkgs/development/python-modules/gradient_sdk/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage -, hyperopt -}: - -buildPythonPackage rec { - pname = "gradient_sdk"; - version = "0.0.4"; - - src = fetchPypi { - inherit pname version; - sha256 = "Q9oeYjjgJf2lhxW1ypsweQAPpMglmW9PxgzMsgTqJkY="; - }; - - propagatedBuildInputs = [ hyperopt ]; - - pythonImportsCheck = [ "gradient_sdk" ]; - - meta = with lib; { - description = "Gradient ML SDK"; - homepage = "https://github.com/Paperspace/gradient-sdk"; - license = licenses.mit; - platforms = platforms.unix; - maintainers = with maintainers; [ freezeboy ]; - }; -} diff --git a/pkgs/development/python-modules/gradient_statsd/default.nix b/pkgs/development/python-modules/gradient_statsd/default.nix index 607737d99ae..ada005d14f8 100644 --- a/pkgs/development/python-modules/gradient_statsd/default.nix +++ b/pkgs/development/python-modules/gradient_statsd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage +{ lib, fetchPypi, buildPythonPackage , boto3, requests, datadog, configparser, python }: diff --git a/pkgs/development/python-modules/graphite-web/default.nix b/pkgs/development/python-modules/graphite-web/default.nix index 0bced13cd11..17ac9132916 100644 --- a/pkgs/development/python-modules/graphite-web/default.nix +++ b/pkgs/development/python-modules/graphite-web/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k +{ lib, buildPythonPackage, fetchPypi, isPy3k , django, django_tagging, whisper, pycairo, cairocffi, ldap, memcached, pytz, urllib3, scandir }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/graphite_beacon/default.nix b/pkgs/development/python-modules/graphite_beacon/default.nix index 06b66ccbc14..20522d28304 100644 --- a/pkgs/development/python-modules/graphite_beacon/default.nix +++ b/pkgs/development/python-modules/graphite_beacon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , tornado_5, pyyaml, funcparserlib , nixosTests }: diff --git a/pkgs/development/python-modules/graphviz/default.nix b/pkgs/development/python-modules/graphviz/default.nix index f531c547f9c..1a0e6d903a4 100644 --- a/pkgs/development/python-modules/graphviz/default.nix +++ b/pkgs/development/python-modules/graphviz/default.nix @@ -6,21 +6,21 @@ , makeFontsConf , freefont_ttf , mock -, pytest +, pytestCheckHook , pytest-mock , pytestcov }: buildPythonPackage rec { pname = "graphviz"; - version = "0.14.1"; + version = "0.16"; # patch does not apply to PyPI tarball due to different line endings src = fetchFromGitHub { owner = "xflr6"; repo = "graphviz"; rev = version; - sha256 = "02bdiac5x93f2mjw5kpgs6kv81hzg07y0mw1nxvhyg8aignzmh3c"; + sha256 = "147vi60mi57z623lhllwwzczzicv2iwj1yrmllj5xx5788i73j6g"; }; patches = [ @@ -35,11 +35,7 @@ buildPythonPackage rec { fontDirectories = [ freefont_ttf ]; }; - checkInputs = [ mock pytest pytest-mock pytestcov ]; - - checkPhase = '' - pytest - ''; + checkInputs = [ mock pytestCheckHook pytest-mock pytestcov ]; meta = with lib; { description = "Simple Python interface for Graphviz"; diff --git a/pkgs/development/python-modules/graphviz/hardcode-graphviz-path.patch b/pkgs/development/python-modules/graphviz/hardcode-graphviz-path.patch index d6da1ff47ce..fa2f634bbc2 100644 --- a/pkgs/development/python-modules/graphviz/hardcode-graphviz-path.patch +++ b/pkgs/development/python-modules/graphviz/hardcode-graphviz-path.patch @@ -1,19 +1,28 @@ diff --git a/graphviz/backend.py b/graphviz/backend.py -index 6f4cc0c..bc4781e 100644 +index d2c4b97..f7175cd 100644 --- a/graphviz/backend.py +++ b/graphviz/backend.py @@ -122,7 +122,7 @@ def command(engine, format_, filepath=None, renderer=None, formatter=None): raise ValueError('unknown formatter: %r' % formatter) output_format = [f for f in (format_, renderer, formatter) if f is not None] -- cmd = [engine, '-T%s' % ':'.join(output_format)] -+ cmd = [os.path.join('@graphviz@/bin', engine), '-T%s' % ':'.join(output_format)] +- cmd = ['dot', '-K%s' % engine, '-T%s' % ':'.join(output_format)] ++ cmd = ['@graphviz@/bin/dot', '-K%s' % engine, '-T%s' % ':'.join(output_format)] if filepath is None: rendered = None -@@ -255,7 +255,7 @@ def version(): - subprocess.CalledProcessError: If the exit status is non-zero. - RuntimmeError: If the output cannot be parsed into a version number. +@@ -275,7 +275,7 @@ def unflatten(source, + if fanout and stagger is None: + raise RequiredArgumentError('fanout given without stagger') + +- cmd = ['unflatten'] ++ cmd = ['@graphviz@/bin/unflatten'] + if stagger is not None: + cmd += ['-l', str(stagger)] + if fanout: +@@ -304,7 +304,7 @@ def version(): + Graphviz Release version entry format + https://gitlab.com/graphviz/graphviz/-/blob/f94e91ba819cef51a4b9dcb2d76153684d06a913/gen_version.py#L17-20 """ - cmd = ['dot', '-V'] + cmd = ['@graphviz@/bin/dot', '-V'] @@ -21,10 +30,10 @@ index 6f4cc0c..bc4781e 100644 stdout=subprocess.PIPE, stderr=subprocess.STDOUT) diff --git a/tests/test_backend.py b/tests/test_backend.py -index 9f307f5..e43bf5b 100644 +index d10ef1a..e4aba58 100644 --- a/tests/test_backend.py +++ b/tests/test_backend.py -@@ -50,7 +50,7 @@ def test_run_encoding_mocked(mocker, Popen, input=u'sp\xe4m', encoding='utf-8'): +@@ -52,7 +52,7 @@ def test_run_encoding_mocked(mocker, Popen, input=u'sp\xe4m', encoding='utf-8'): m.decode.assert_called_once_with(encoding) @@ -33,34 +42,43 @@ index 9f307f5..e43bf5b 100644 @pytest.mark.usefixtures('empty_path') @pytest.mark.parametrize('func, args', [ (render, ['dot', 'pdf', 'nonfilepath']), -@@ -143,7 +143,7 @@ def test_render_mocked(capsys, mocker, Popen, quiet): # noqa: N803 +@@ -146,7 +146,7 @@ def test_render_mocked(capsys, mocker, Popen, quiet): # noqa: N803 assert render('dot', 'pdf', 'nonfilepath', quiet=quiet) == 'nonfilepath.pdf' -- Popen.assert_called_once_with(['dot', '-Tpdf', '-O', 'nonfilepath'], -+ Popen.assert_called_once_with(['@graphviz@/bin/dot', '-Tpdf', '-O', 'nonfilepath'], +- Popen.assert_called_once_with(['dot', '-Kdot', '-Tpdf', '-O', 'nonfilepath'], ++ Popen.assert_called_once_with(['@graphviz@/bin/dot', '-Kdot', '-Tpdf', '-O', 'nonfilepath'], stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=None, startupinfo=mocker.ANY) -@@ -201,7 +201,7 @@ def test_pipe_pipe_invalid_data_mocked(mocker, py2, Popen, quiet): # noqa: N803 +@@ -208,7 +208,7 @@ def test_pipe_pipe_invalid_data_mocked(mocker, py2, Popen, quiet): # noqa: N803 assert e.value.stdout is mocker.sentinel.out e.value.stdout = mocker.sentinel.new_stdout assert e.value.stdout is mocker.sentinel.new_stdout -- Popen.assert_called_once_with(['dot', '-Tpng'], -+ Popen.assert_called_once_with(['@graphviz@/bin/dot', '-Tpng'], +- Popen.assert_called_once_with(['dot', '-Kdot', '-Tpng'], ++ Popen.assert_called_once_with(['@graphviz@/bin/dot', '-Kdot', '-Tpng'], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, -@@ -224,7 +224,7 @@ def test_pipe_mocked(capsys, mocker, Popen, quiet): # noqa: N803 +@@ -231,7 +231,7 @@ def test_pipe_mocked(capsys, mocker, Popen, quiet): # noqa: N803 assert pipe('dot', 'png', b'nongraph', quiet=quiet) is mocker.sentinel.out -- Popen.assert_called_once_with(['dot', '-Tpng'], -+ Popen.assert_called_once_with(['@graphviz@/bin/dot', '-Tpng'], +- Popen.assert_called_once_with(['dot', '-Kdot', '-Tpng'], ++ Popen.assert_called_once_with(['@graphviz@/bin/dot', '-Kdot', '-Tpng'], + stdin=subprocess.PIPE, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, +@@ -259,7 +259,7 @@ def test_unflatten_mocked(capsys, mocker, Popen): + proc.communicate.return_value = (b'nonresult', b'') + + assert unflatten('nonsource') == 'nonresult' +- Popen.assert_called_once_with(['unflatten'], ++ Popen.assert_called_once_with(['@graphviz@/bin/unflatten'], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, -@@ -250,7 +250,7 @@ def test_version_parsefail_mocked(mocker, Popen): # noqa: N803 +@@ -290,7 +290,7 @@ def test_version_parsefail_mocked(mocker, Popen): # noqa: N803 with pytest.raises(RuntimeError, match=r'nonversioninfo'): version() @@ -69,7 +87,7 @@ index 9f307f5..e43bf5b 100644 stdout=subprocess.PIPE, stderr=subprocess.STDOUT, startupinfo=mocker.ANY) -@@ -269,7 +269,7 @@ def test_version_mocked(mocker, Popen, stdout, expected): # noqa: N803 +@@ -312,7 +312,7 @@ def test_version_mocked(mocker, Popen, stdout, expected): # noqa: N803 assert version() == expected diff --git a/pkgs/development/python-modules/grappelli_safe/default.nix b/pkgs/development/python-modules/grappelli_safe/default.nix index 7b2dd7e3fed..ae7ddb0c76b 100644 --- a/pkgs/development/python-modules/grappelli_safe/default.nix +++ b/pkgs/development/python-modules/grappelli_safe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/gremlinpython/default.nix b/pkgs/development/python-modules/gremlinpython/default.nix new file mode 100644 index 00000000000..97d169283b2 --- /dev/null +++ b/pkgs/development/python-modules/gremlinpython/default.nix @@ -0,0 +1,54 @@ +{ stdenv, lib, buildPythonPackage, fetchFromGitHub, python, pythonOlder +, pytestCheckHook, pyhamcrest, pytestrunner, pytest +, six, isodate, tornado, aenum, radish-bdd, mock +}: + +buildPythonPackage rec { + pname = "gremlinpython"; + version = "3.4.8"; + + # pypi tarball doesn't include tests + src = fetchFromGitHub { + owner = "apache"; + repo = "tinkerpop"; + rev = version; + sha256 = "0kcyhfxz7z4f8i64gig8q1q9dhy24cprbh63vwsdiwryg74q4chl"; + }; + sourceRoot = "source/gremlin-python/src/main/jython"; + postPatch = '' + substituteInPlace setup.py \ + --replace 'tornado>=4.4.1,<6.0' 'tornado' \ + --replace 'PyHamcrest>=1.9.0,<2.0.0' 'PyHamcrest' \ + --replace 'radish-bdd==0.8.6' 'radish-bdd' \ + --replace 'mock>=3.0.5,<4.0.0' 'mock' \ + --replace 'pytest>=4.6.4,<5.0.0' 'pytest' + ''; + + nativeBuildInputs = [ pytestrunner ]; # simply to placate requirements + propagatedBuildInputs = [ six isodate tornado aenum ]; + + checkInputs = [ pytestCheckHook pyhamcrest radish-bdd mock ]; + + # disable custom pytest report generation + preCheck = '' + substituteInPlace setup.cfg --replace 'addopts' '#addopts' + ''; + + # many tests expect a running tinkerpop server + pytestFlagsArray = [ + "--ignore=tests/driver/test_client.py" + "--ignore=tests/driver/test_driver_remote_connection.py" + "--ignore=tests/driver/test_driver_remote_connection_threaded.py" + "--ignore=tests/process/test_dsl.py" + "--ignore=tests/structure/io/test_functionalityio.py" + # disabledTests doesn't quite allow us to be precise enough for this + "-k 'not (TestFunctionalGraphSONIO and (test_timestamp or test_datetime or test_uuid))'" + ]; + + meta = with lib; { + description = "Gremlin-Python implements Gremlin, the graph traversal language of Apache TinkerPop, within the Python language"; + homepage = "https://tinkerpop.apache.org/"; + license = licenses.asl20; + maintainers = with maintainers; [ turion ris ]; + }; +} diff --git a/pkgs/development/python-modules/grequests/default.nix b/pkgs/development/python-modules/grequests/default.nix index 5ce5df8cdea..50c95df7dc9 100644 --- a/pkgs/development/python-modules/grequests/default.nix +++ b/pkgs/development/python-modules/grequests/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , requests diff --git a/pkgs/development/python-modules/grip/default.nix b/pkgs/development/python-modules/grip/default.nix index 019cd798d64..dafa692493e 100644 --- a/pkgs/development/python-modules/grip/default.nix +++ b/pkgs/development/python-modules/grip/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , fetchpatch # Python bits: diff --git a/pkgs/development/python-modules/grpc_google_iam_v1/default.nix b/pkgs/development/python-modules/grpc_google_iam_v1/default.nix index dd9527006da..7291cd4b65e 100644 --- a/pkgs/development/python-modules/grpc_google_iam_v1/default.nix +++ b/pkgs/development/python-modules/grpc_google_iam_v1/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , grpcio diff --git a/pkgs/development/python-modules/grpcio-gcp/default.nix b/pkgs/development/python-modules/grpcio-gcp/default.nix index 1b631c0973e..656e147ac50 100644 --- a/pkgs/development/python-modules/grpcio-gcp/default.nix +++ b/pkgs/development/python-modules/grpcio-gcp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , grpcio diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index efae4b102d4..629c51071ab 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, protobuf, grpcio, setuptools }: +{ lib, buildPythonPackage, fetchPypi, protobuf, grpcio, setuptools }: buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.34.0"; + version = "1.34.1"; src = fetchPypi { inherit pname version; - sha256 = "db5a6f0130256d534cbe35eab37d37a448d96f4fd736e5051c6be1aee49cea1d"; + sha256 = "b411f36748f4ead33411544d785e37825598bbb8abbe79eca422e395be5a3d08"; }; outputs = [ "out" "dev" ]; @@ -18,6 +18,8 @@ buildPythonPackage rec { # no tests in the package doCheck = false; + pythonImportsCheck = [ "grpc_tools" ]; + meta = with lib; { description = "Protobuf code generator for gRPC"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index 6288828cd1b..1b1ffb975fb 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -21,13 +21,13 @@ buildPythonPackage rec { outputs = [ "out" "dev" ]; nativeBuildInputs = [ cython pkg-config ] - ++ stdenv.lib.optional stdenv.isDarwin darwin.cctools; + ++ lib.optional stdenv.isDarwin darwin.cctools; buildInputs = [ c-ares openssl zlib ]; propagatedBuildInputs = [ six protobuf ] - ++ stdenv.lib.optionals (isPy27) [ enum34 futures ]; + ++ lib.optionals (isPy27) [ enum34 futures ]; - preBuild = stdenv.lib.optionalString stdenv.isDarwin "unset AR"; + preBuild = lib.optionalString stdenv.isDarwin "unset AR"; GRPC_BUILD_WITH_BORING_SSL_ASM = ""; GRPC_PYTHON_BUILD_SYSTEM_OPENSSL = 1; diff --git a/pkgs/development/python-modules/gsd/1.7.nix b/pkgs/development/python-modules/gsd/1.7.nix index 0512a4906a2..8d19acdc70d 100644 --- a/pkgs/development/python-modules/gsd/1.7.nix +++ b/pkgs/development/python-modules/gsd/1.7.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , numpy diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix index 7cf2a8c8df1..0370f80b4a4 100644 --- a/pkgs/development/python-modules/gspread/default.nix +++ b/pkgs/development/python-modules/gspread/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , requests diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix index c66ceedc3ce..ea89f7214c6 100644 --- a/pkgs/development/python-modules/gst-python/default.nix +++ b/pkgs/development/python-modules/gst-python/default.nix @@ -1,9 +1,10 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchurl , meson , ninja -, stdenv -, pkgconfig + +, pkg-config , python3 , pygobject3 , gobject-introspection @@ -30,7 +31,7 @@ buildPythonPackage rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config python3 gobject-introspection gst-plugins-base @@ -51,11 +52,9 @@ buildPythonPackage rec { # https://github.com/NixOS/nixpkgs/issues/47390 installCheckPhase = "meson test --print-errorlogs"; - meta = { + meta = with lib; { homepage = "https://gstreamer.freedesktop.org"; - description = "Python bindings for GStreamer"; - - license = stdenv.lib.licenses.lgpl2Plus; + license = licenses.lgpl2Plus; }; } diff --git a/pkgs/development/python-modules/gtimelog/default.nix b/pkgs/development/python-modules/gtimelog/default.nix index 3af8e97ba71..bb31baa7888 100644 --- a/pkgs/development/python-modules/gtimelog/default.nix +++ b/pkgs/development/python-modules/gtimelog/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper +{ lib, fetchFromGitHub, makeWrapper , glibcLocales, gobject-introspection, gtk3, libsoup, libsecret , buildPythonPackage, python , pygobject3, freezegun, mock diff --git a/pkgs/development/python-modules/guestfs/default.nix b/pkgs/development/python-modules/guestfs/default.nix index 23a2545525a..0f1d2ddf05c 100644 --- a/pkgs/development/python-modules/guestfs/default.nix +++ b/pkgs/development/python-modules/guestfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchurl, libguestfs, qemu }: +{ lib, buildPythonPackage, fetchurl, libguestfs, qemu }: buildPythonPackage rec { pname = "guestfs"; diff --git a/pkgs/development/python-modules/gumath/default.nix b/pkgs/development/python-modules/gumath/default.nix index ccf1627d7f3..601aecdf331 100644 --- a/pkgs/development/python-modules/gumath/default.nix +++ b/pkgs/development/python-modules/gumath/default.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , buildPythonPackage , python , numba @@ -28,7 +29,7 @@ buildPythonPackage { 'add_runtime_library_dirs = ["${libndtypes}/lib", "${libxnd}/lib", "${libgumath}/lib"]' ''; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.isDarwin '' install_name_tool -add_rpath ${libgumath}/lib $out/${python.sitePackages}/gumath/_gumath.*.so ''; diff --git a/pkgs/development/python-modules/gunicorn/19.nix b/pkgs/development/python-modules/gunicorn/19.nix index c1091fa980c..7d43ce95a7e 100644 --- a/pkgs/development/python-modules/gunicorn/19.nix +++ b/pkgs/development/python-modules/gunicorn/19.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , coverage , mock , pytest diff --git a/pkgs/development/python-modules/gunicorn/default.nix b/pkgs/development/python-modules/gunicorn/default.nix index 983335f4395..3f3eceee378 100644 --- a/pkgs/development/python-modules/gunicorn/default.nix +++ b/pkgs/development/python-modules/gunicorn/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27 +{ lib, buildPythonPackage, fetchPypi, isPy27 , coverage , mock , pytest diff --git a/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix b/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix index f70625b86fe..6f765bd98d6 100644 --- a/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix +++ b/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, sphinx, fetchPypi }: +{ lib, buildPythonPackage, sphinx, fetchPypi }: buildPythonPackage rec { pname = "guzzle_sphinx_theme"; diff --git a/pkgs/development/python-modules/gym/default.nix b/pkgs/development/python-modules/gym/default.nix index d826fc33324..263bdfa2f47 100644 --- a/pkgs/development/python-modules/gym/default.nix +++ b/pkgs/development/python-modules/gym/default.nix @@ -12,13 +12,6 @@ buildPythonPackage rec { sha256 = "96a7dd4e9cdb39e30c7a79e5773570fd9408f7fdb58c714c293cfbb314818eb6"; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "pyglet>=1.2.0,<=1.3.2" "pyglet" \ - --replace "cloudpickle>=1.2.0,<1.4.0" "cloudpickle~=1.2" - ''; - # cloudpickle range has been expanded in package but not yet released - propagatedBuildInputs = [ numpy requests six pyglet scipy cloudpickle ]; diff --git a/pkgs/development/python-modules/gyp/default.nix b/pkgs/development/python-modules/gyp/default.nix index b08814d4bd1..5be56c81257 100644 --- a/pkgs/development/python-modules/gyp/default.nix +++ b/pkgs/development/python-modules/gyp/default.nix @@ -14,7 +14,7 @@ buildPythonPackage { sha256 = "0r9phq5yrmj968vdvy9vivli35wn1j9a6iwshp69wl7q4p0x8q2b"; }; - patches = stdenv.lib.optionals stdenv.isDarwin [ + patches = lib.optionals stdenv.isDarwin [ ./no-darwin-cflags.patch ./no-xcode.patch ]; diff --git a/pkgs/development/python-modules/h2/default.nix b/pkgs/development/python-modules/h2/default.nix index 6dad775732c..ba681658e9a 100644 --- a/pkgs/development/python-modules/h2/default.nix +++ b/pkgs/development/python-modules/h2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , enum34, hpack, hyperframe, pytestCheckHook, hypothesis }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix index a9ebdc5dfe8..c167e2115c6 100644 --- a/pkgs/development/python-modules/h5py/default.nix +++ b/pkgs/development/python-modules/h5py/default.nix @@ -1,11 +1,9 @@ -{ stdenv, fetchPypi, isPy27, python, buildPythonPackage, pythonOlder +{ lib, fetchPypi, isPy27, python, buildPythonPackage, pythonOlder , numpy, hdf5, cython, six, pkgconfig, unittest2, fetchpatch , mpi4py ? null, openssh, pytestCheckHook, cached-property }: assert hdf5.mpiSupport -> mpi4py != null && hdf5.mpi == mpi4py.mpi; -with stdenv.lib; - let mpi = hdf5.mpi; mpiSupport = hdf5.mpiSupport; @@ -31,27 +29,26 @@ in buildPythonPackage rec { postConfigure = '' # Needed to run the tests reliably. See: # https://bitbucket.org/mpi4py/mpi4py/issues/87/multiple-test-errors-with-openmpi-30 - ${optionalString mpiSupport "export OMPI_MCA_rmaps_base_oversubscribe=yes"} + ${lib.optionalString mpiSupport "export OMPI_MCA_rmaps_base_oversubscribe=yes"} ''; preBuild = if mpiSupport then "export CC=${mpi}/bin/mpicc" else ""; # tests now require pytest-mpi, which isn't available and difficult to package doCheck = false; - checkInputs = optional isPy27 unittest2 ++ [ pytestCheckHook openssh ]; + checkInputs = lib.optional isPy27 unittest2 ++ [ pytestCheckHook openssh ]; nativeBuildInputs = [ pkgconfig cython ]; buildInputs = [ hdf5 ] - ++ optional mpiSupport mpi; + ++ lib.optional mpiSupport mpi; propagatedBuildInputs = [ numpy six] - ++ optionals mpiSupport [ mpi4py openssh ] - ++ optionals (pythonOlder "3.8") [ cached-property ]; + ++ lib.optionals mpiSupport [ mpi4py openssh ] + ++ lib.optionals (pythonOlder "3.8") [ cached-property ]; pythonImportsCheck = [ "h5py" ]; - meta = { - description = - "Pythonic interface to the HDF5 binary data format"; + meta = with lib; { + description = "Pythonic interface to the HDF5 binary data format"; homepage = "http://www.h5py.org/"; - license = stdenv.lib.licenses.bsd2; + license = licenses.bsd2; }; } diff --git a/pkgs/development/python-modules/ha-ffmpeg/default.nix b/pkgs/development/python-modules/ha-ffmpeg/default.nix index 653c4483ce8..84810fd2b53 100644 --- a/pkgs/development/python-modules/ha-ffmpeg/default.nix +++ b/pkgs/development/python-modules/ha-ffmpeg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k +{ lib, buildPythonPackage, fetchPypi, isPy3k , ffmpeg_3, async-timeout }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/halo/default.nix b/pkgs/development/python-modules/halo/default.nix new file mode 100644 index 00000000000..e167371b42a --- /dev/null +++ b/pkgs/development/python-modules/halo/default.nix @@ -0,0 +1,34 @@ +{ buildPythonPackage +, colorama +, fetchPypi +, isPy27 +, lib +, log-symbols +, pytestCheckHook +, six +, spinners +, termcolor }: + +buildPythonPackage rec { + pname = "halo"; + version = "0.0.31"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "1mn97h370ggbc9vi6x8r6akd5q8i512y6kid2nvm67g93r9a6rvv"; + }; + + propagatedBuildInputs = [ colorama log-symbols termcolor six spinners ]; + + # Tests are not included in the PyPI distribution and the git repo does not have tagged releases + doCheck = false; + pythonImportsCheck = [ "halo" ]; + + meta = with lib; { + description = "Beautiful Spinners for Terminal, IPython and Jupyter."; + homepage = "https://github.com/manrajgrover/halo"; + license = licenses.mit; + maintainers = with maintainers; [ urbas ]; + }; +} diff --git a/pkgs/development/python-modules/handout/default.nix b/pkgs/development/python-modules/handout/default.nix index b2b7b4b3d14..316c9a6edca 100644 --- a/pkgs/development/python-modules/handout/default.nix +++ b/pkgs/development/python-modules/handout/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , imageio, imageio-ffmpeg }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index 90ff3df89e1..102ab3a2540 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -1,33 +1,50 @@ -{ lib, buildPythonPackage, fetchFromGitHub -, acme, aiohttp, snitun, attrs, pycognito, warrant -, pytest-aiohttp, asynctest, atomicwrites, pytest }: +{ lib +, acme +, aiohttp +, asynctest +, atomicwrites +, attrs +, buildPythonPackage +, fetchFromGitHub +, pycognito +, pytest-aiohttp +, pytestCheckHook +, snitun +, warrant +}: buildPythonPackage rec { pname = "hass-nabucasa"; - version = "0.39.0"; + version = "0.41.0"; src = fetchFromGitHub { owner = "nabucasa"; repo = pname; rev = version; - sha256 = "1bsvwxddpp4dsq3k2320qrx5x9lscqzffzz1zj6fbwgc4741f01w"; + sha256 = "sha256-ewWw3PyJGRHP23J6WBBWs9YGl4vTb9/j/soZ6n5wbLM="; }; postPatch = '' sed -i 's/"acme.*"/"acme"/' setup.py - sed -i 's/"attrs.*"/"attrs"/' setup.py - sed -i 's/"cryptography.*"/"cryptography"/' setup.py ''; propagatedBuildInputs = [ - acme aiohttp atomicwrites snitun attrs warrant pycognito + acme + aiohttp + atomicwrites + attrs + pycognito + snitun + warrant ]; - checkInputs = [ pytest pytest-aiohttp asynctest ]; + checkInputs = [ + asynctest + pytest-aiohttp + pytestCheckHook + ]; - checkPhase = '' - pytest tests/ - ''; + pythonImportsCheck = [ "hass_nabucasa" ]; meta = with lib; { homepage = "https://github.com/NabuCasa/hass-nabucasa"; diff --git a/pkgs/development/python-modules/hatasmota/default.nix b/pkgs/development/python-modules/hatasmota/default.nix new file mode 100644 index 00000000000..44665c1177d --- /dev/null +++ b/pkgs/development/python-modules/hatasmota/default.nix @@ -0,0 +1,34 @@ +{ lib +, attrs +, buildPythonPackage +, fetchFromGitHub +, voluptuous +}: + +buildPythonPackage rec { + pname = "hatasmota"; + version = "0.2.7"; + + src = fetchFromGitHub { + owner = "emontnemery"; + repo = pname; + rev = version; + sha256 = "sha256-QOireN6uRIa7UBKsE63r6yT+mzfs8uOGzzDcNahELws="; + }; + + propagatedBuildInputs = [ + attrs + voluptuous + ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "hatasmota" ]; + + meta = with lib; { + description = "Python module to help parse and construct Tasmota MQTT messages"; + homepage = "https://github.com/emontnemery/hatasmota"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/haversine/default.nix b/pkgs/development/python-modules/haversine/default.nix new file mode 100644 index 00000000000..7f5e462d1b3 --- /dev/null +++ b/pkgs/development/python-modules/haversine/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, numpy +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "haversine"; + version = "2.3.0"; + + src = fetchFromGitHub { + owner = "mapado"; + repo = pname; + rev = "v${version}"; + sha256 = "1c3yf9162b2b7l1lsw3ffd1linnc542qvljpgwxp6y5arrmljqnv"; + }; + + checkInputs = [ + numpy + pytestCheckHook + ]; + + pythonImportsCheck = [ "haversine" ]; + + meta = with lib; { + description = "Python module the distance between 2 points on earth"; + homepage = "https://github.com/mapado/haversine"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/hawkauthlib/default.nix b/pkgs/development/python-modules/hawkauthlib/default.nix index a0b7d50b560..7afb4eefa06 100644 --- a/pkgs/development/python-modules/hawkauthlib/default.nix +++ b/pkgs/development/python-modules/hawkauthlib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , requests diff --git a/pkgs/development/python-modules/hbmqtt/default.nix b/pkgs/development/python-modules/hbmqtt/default.nix index 053e955ad80..c457da91886 100644 --- a/pkgs/development/python-modules/hbmqtt/default.nix +++ b/pkgs/development/python-modules/hbmqtt/default.nix @@ -1,11 +1,12 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, setuptools +{ lib, buildPythonPackage, fetchPypi, isPy3k, pythonAtLeast, setuptools , transitions, websockets, passlib, docopt, pyyaml, nose }: buildPythonPackage rec { pname = "hbmqtt"; version = "0.9.6"; - disabled = !isPy3k; + # https://github.com/beerfactory/hbmqtt/issues/223 + disabled = !isPy3k || pythonAtLeast "3.9"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/hcs_utils/default.nix b/pkgs/development/python-modules/hcs_utils/default.nix index 56e9811396e..5dd94e5de2e 100644 --- a/pkgs/development/python-modules/hcs_utils/default.nix +++ b/pkgs/development/python-modules/hcs_utils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pythonOlder, buildPythonPackage, fetchPypi, six, glibcLocales, pytest }: +{ lib, pythonOlder, buildPythonPackage, fetchPypi, six, glibcLocales, pytest }: buildPythonPackage rec { pname = "hcs_utils"; diff --git a/pkgs/development/python-modules/hdmedians/default.nix b/pkgs/development/python-modules/hdmedians/default.nix index 3b65e10bfce..f1b0d13e56e 100644 --- a/pkgs/development/python-modules/hdmedians/default.nix +++ b/pkgs/development/python-modules/hdmedians/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/pkgs/development/python-modules/heapdict/default.nix b/pkgs/development/python-modules/heapdict/default.nix index 4cd695925f2..61cbe39a256 100644 --- a/pkgs/development/python-modules/heapdict/default.nix +++ b/pkgs/development/python-modules/heapdict/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k }: +{ lib, buildPythonPackage, fetchPypi, isPy3k }: buildPythonPackage rec { pname = "HeapDict"; diff --git a/pkgs/development/python-modules/helper/default.nix b/pkgs/development/python-modules/helper/default.nix index 4c7ff0c3878..8560364d4f4 100644 --- a/pkgs/development/python-modules/helper/default.nix +++ b/pkgs/development/python-modules/helper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pyyaml, mock }: +{ lib, buildPythonPackage, fetchPypi, pyyaml, mock }: buildPythonPackage rec { pname = "helper"; diff --git a/pkgs/development/python-modules/hetzner/default.nix b/pkgs/development/python-modules/hetzner/default.nix index 3b938dfc237..9b89567d8ef 100644 --- a/pkgs/development/python-modules/hetzner/default.nix +++ b/pkgs/development/python-modules/hetzner/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub }: diff --git a/pkgs/development/python-modules/heudiconv/default.nix b/pkgs/development/python-modules/heudiconv/default.nix index ce291818824..4e65f5b9172 100644 --- a/pkgs/development/python-modules/heudiconv/default.nix +++ b/pkgs/development/python-modules/heudiconv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/pkgs/development/python-modules/hg-evolve/default.nix b/pkgs/development/python-modules/hg-evolve/default.nix index bcc93ba10cb..38a770e879f 100644 --- a/pkgs/development/python-modules/hg-evolve/default.nix +++ b/pkgs/development/python-modules/hg-evolve/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k @@ -19,6 +19,6 @@ buildPythonPackage rec { description = "Enables the “changeset evolution” feature of Mercurial core"; homepage = "https://www.mercurial-scm.org/doc/evolution/"; maintainers = with maintainers; [ xavierzwirtz ]; - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/development/python-modules/hg-git/default.nix b/pkgs/development/python-modules/hg-git/default.nix index fd321493b09..1d8e1ec1e29 100644 --- a/pkgs/development/python-modules/hg-git/default.nix +++ b/pkgs/development/python-modules/hg-git/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , dulwich @@ -30,7 +30,7 @@ buildPythonPackage rec { description = "Push and pull from a Git server using Mercurial"; homepage = "http://hg-git.github.com/"; maintainers = with maintainers; [ koral ]; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2; }; } diff --git a/pkgs/development/python-modules/hglib/default.nix b/pkgs/development/python-modules/hglib/default.nix index afac7983584..a6ed6b935ad 100644 --- a/pkgs/development/python-modules/hglib/default.nix +++ b/pkgs/development/python-modules/hglib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, substituteAll, python, nose, mercurial }: +{ lib, buildPythonPackage, fetchPypi, fetchpatch, substituteAll, python, nose, mercurial }: buildPythonPackage rec { pname = "python-hglib"; diff --git a/pkgs/development/python-modules/hgsvn/default.nix b/pkgs/development/python-modules/hgsvn/default.nix index 2ee6024cd47..b8b6d43b548 100644 --- a/pkgs/development/python-modules/hgsvn/default.nix +++ b/pkgs/development/python-modules/hgsvn/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/pkgs/development/python-modules/hidapi/default.nix b/pkgs/development/python-modules/hidapi/default.nix index c5ee1c20839..790e7aa08fc 100644 --- a/pkgs/development/python-modules/hidapi/default.nix +++ b/pkgs/development/python-modules/hidapi/default.nix @@ -10,16 +10,16 @@ buildPythonPackage rec { }; propagatedBuildInputs = - stdenv.lib.optionals stdenv.isLinux [ libusb1 udev ] ++ - stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit CoreFoundation IOKit ]) ++ + lib.optionals stdenv.isLinux [ libusb1 udev ] ++ + lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit CoreFoundation IOKit ]) ++ [ cython ]; # Fix the USB backend library lookup - postPatch = stdenv.lib.optionalString stdenv.isLinux '' + postPatch = lib.optionalString stdenv.isLinux '' libusb=${libusb1.dev}/include/libusb-1.0 test -d $libusb || { echo "ERROR: $libusb doesn't exist, please update/fix this build expression."; exit 1; } sed -i -e "s|/usr/include/libusb-1.0|$libusb|" setup.py - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' substituteInPlace setup.py --replace 'macos_sdk_path =' 'macos_sdk_path = "" #' ''; diff --git a/pkgs/development/python-modules/hieroglyph/default.nix b/pkgs/development/python-modules/hieroglyph/default.nix index 418059c5165..d7fa9af5efa 100644 --- a/pkgs/development/python-modules/hieroglyph/default.nix +++ b/pkgs/development/python-modules/hieroglyph/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, isPy27, sphinx }: +{ lib, fetchPypi, buildPythonPackage, isPy27, sphinx }: buildPythonPackage rec { pname = "hieroglyph"; diff --git a/pkgs/development/python-modules/hiredis/default.nix b/pkgs/development/python-modules/hiredis/default.nix index e9d5677f8be..ef10d195671 100644 --- a/pkgs/development/python-modules/hiredis/default.nix +++ b/pkgs/development/python-modules/hiredis/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , redis diff --git a/pkgs/development/python-modules/hiro/default.nix b/pkgs/development/python-modules/hiro/default.nix index 3ff672a22db..00b56060964 100644 --- a/pkgs/development/python-modules/hiro/default.nix +++ b/pkgs/development/python-modules/hiro/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, six, mock }: +{ lib, buildPythonPackage, fetchPypi, six, mock }: buildPythonPackage rec { pname = "hiro"; version = "0.5.1"; diff --git a/pkgs/development/python-modules/hjson/default.nix b/pkgs/development/python-modules/hjson/default.nix index 3393ad18691..096edbe5252 100644 --- a/pkgs/development/python-modules/hjson/default.nix +++ b/pkgs/development/python-modules/hjson/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , pythonImportsCheckHook diff --git a/pkgs/development/python-modules/hkdf/default.nix b/pkgs/development/python-modules/hkdf/default.nix index 966ce7001fb..43e7a8f4ce3 100644 --- a/pkgs/development/python-modules/hkdf/default.nix +++ b/pkgs/development/python-modules/hkdf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/pkgs/development/python-modules/hocr-tools/default.nix b/pkgs/development/python-modules/hocr-tools/default.nix index 79a2e83508a..cfbf63a5869 100644 --- a/pkgs/development/python-modules/hocr-tools/default.nix +++ b/pkgs/development/python-modules/hocr-tools/default.nix @@ -3,7 +3,7 @@ , lxml , pillow , reportlab -, lib, stdenv +, lib }: buildPythonPackage rec { pname = "hocr-tools"; diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index b5e0062d115..789dc57a571 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , convertdate diff --git a/pkgs/development/python-modules/hoomd-blue/default.nix b/pkgs/development/python-modules/hoomd-blue/default.nix index edb647a3fc6..f726340b7c8 100644 --- a/pkgs/development/python-modules/hoomd-blue/default.nix +++ b/pkgs/development/python-modules/hoomd-blue/default.nix @@ -29,9 +29,9 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = stdenv.lib.optionals withMPI [ mpi ]; + buildInputs = lib.optionals withMPI [ mpi ]; propagatedBuildInputs = [ python.pkgs.numpy ] - ++ stdenv.lib.optionals withMPI [ python.pkgs.mpi4py ]; + ++ lib.optionals withMPI [ python.pkgs.mpi4py ]; dontAddPrefix = true; cmakeFlags = [ diff --git a/pkgs/development/python-modules/hpack/default.nix b/pkgs/development/python-modules/hpack/default.nix index 9b6f724cd31..a5140a216cf 100644 --- a/pkgs/development/python-modules/hpack/default.nix +++ b/pkgs/development/python-modules/hpack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/hsaudiotag/default.nix b/pkgs/development/python-modules/hsaudiotag/default.nix index fba71dc3f10..d38ceec7e13 100644 --- a/pkgs/development/python-modules/hsaudiotag/default.nix +++ b/pkgs/development/python-modules/hsaudiotag/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/hsaudiotag3k/default.nix b/pkgs/development/python-modules/hsaudiotag3k/default.nix index 52919e48983..66ea895960c 100644 --- a/pkgs/development/python-modules/hsaudiotag3k/default.nix +++ b/pkgs/development/python-modules/hsaudiotag3k/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/html2text/2018.nix b/pkgs/development/python-modules/html2text/2018.nix index 73540359ee1..06d0c14c7e4 100644 --- a/pkgs/development/python-modules/html2text/2018.nix +++ b/pkgs/development/python-modules/html2text/2018.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/html5-parser/default.nix b/pkgs/development/python-modules/html5-parser/default.nix index 61c23ac2022..d20f0a9abfd 100644 --- a/pkgs/development/python-modules/html5-parser/default.nix +++ b/pkgs/development/python-modules/html5-parser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pkgs, pkgconfig, chardet, lxml }: +{ lib, buildPythonPackage, fetchPypi, pkgs, pkg-config, chardet, lxml }: buildPythonPackage rec { pname = "html5-parser"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "25fe8f6848cbc15187f6748c0695df32bcf1b37df6420b6a01b4ebe1ec1ed48f"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ chardet lxml pkgs.libxml2 ]; doCheck = false; # No such file or directory: 'run_tests.py' diff --git a/pkgs/development/python-modules/htmllaundry/default.nix b/pkgs/development/python-modules/htmllaundry/default.nix index ef660fc0b92..e844c99693a 100644 --- a/pkgs/development/python-modules/htmllaundry/default.nix +++ b/pkgs/development/python-modules/htmllaundry/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi, nose , six diff --git a/pkgs/development/python-modules/htmlmin/default.nix b/pkgs/development/python-modules/htmlmin/default.nix index ccbc157837c..e91aedc6cdb 100644 --- a/pkgs/development/python-modules/htmlmin/default.nix +++ b/pkgs/development/python-modules/htmlmin/default.nix @@ -1,4 +1,5 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: + buildPythonPackage rec { pname = "htmlmin"; version = "0.1.12"; @@ -10,10 +11,10 @@ buildPythonPackage rec { # Tests run fine in a normal source checkout, but not when being built by nix. doCheck = false; - meta = { + meta = with lib; { description = "A configurable HTML Minifier with safety features"; homepage = "https://pypi.python.org/pypi/htmlmin"; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; maintainers = []; }; } diff --git a/pkgs/development/python-modules/httmock/default.nix b/pkgs/development/python-modules/httmock/default.nix index 117c7f5e132..cbf6b95ccd3 100644 --- a/pkgs/development/python-modules/httmock/default.nix +++ b/pkgs/development/python-modules/httmock/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, requests }: +{ lib, buildPythonPackage, fetchFromGitHub, requests }: buildPythonPackage rec { pname = "httmock"; diff --git a/pkgs/development/python-modules/http_signature/default.nix b/pkgs/development/python-modules/http_signature/default.nix index 145eea751b9..9169f1e4126 100644 --- a/pkgs/development/python-modules/http_signature/default.nix +++ b/pkgs/development/python-modules/http_signature/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/httpauth/default.nix b/pkgs/development/python-modules/httpauth/default.nix index b7867e22f17..a7d4240db14 100644 --- a/pkgs/development/python-modules/httpauth/default.nix +++ b/pkgs/development/python-modules/httpauth/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/httpbin/default.nix b/pkgs/development/python-modules/httpbin/default.nix index cbaf89c3ca6..2e711141fcb 100644 --- a/pkgs/development/python-modules/httpbin/default.nix +++ b/pkgs/development/python-modules/httpbin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , fetchpatch diff --git a/pkgs/development/python-modules/httpretty/0.nix b/pkgs/development/python-modules/httpretty/0.nix index 436bbd97fd2..92ed5c6616e 100644 --- a/pkgs/development/python-modules/httpretty/0.nix +++ b/pkgs/development/python-modules/httpretty/0.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , tornado @@ -20,7 +20,7 @@ buildPythonPackage rec { # drop this for version > 0.9.7 # Flaky tests: https://github.com/gabrielfalcao/HTTPretty/pull/394 - doCheck = stdenv.lib.versionAtLeast version "0.9.8"; + doCheck = lib.versionAtLeast version "0.9.8"; src = fetchPypi { inherit pname version; @@ -37,7 +37,7 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; # Those flaky tests are failing intermittently on all platforms - NOSE_EXCLUDE = stdenv.lib.concatStringsSep "," [ + NOSE_EXCLUDE = lib.concatStringsSep "," [ "tests.functional.test_httplib2.test_callback_response" "tests.functional.test_requests.test_streaming_responses" "tests.functional.test_httplib2.test_callback_response" diff --git a/pkgs/development/python-modules/httpretty/default.nix b/pkgs/development/python-modules/httpretty/default.nix index 93cf6a0927f..8974672d0a9 100644 --- a/pkgs/development/python-modules/httpretty/default.nix +++ b/pkgs/development/python-modules/httpretty/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , tornado @@ -23,7 +23,7 @@ buildPythonPackage rec { # drop this for version > 0.9.7 # Flaky tests: https://github.com/gabrielfalcao/HTTPretty/pull/394 - doCheck = stdenv.lib.versionAtLeast version "0.9.8"; + doCheck = lib.versionAtLeast version "0.9.8"; src = fetchPypi { inherit pname version; @@ -44,7 +44,7 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; # Those flaky tests are failing intermittently on all platforms - NOSE_EXCLUDE = stdenv.lib.concatStringsSep "," [ + NOSE_EXCLUDE = lib.concatStringsSep "," [ "tests.functional.test_httplib2.test_callback_response" "tests.functional.test_requests.test_streaming_responses" "tests.functional.test_httplib2.test_callback_response" diff --git a/pkgs/development/python-modules/hug/default.nix b/pkgs/development/python-modules/hug/default.nix index 6769b5371b8..872798c6ced 100644 --- a/pkgs/development/python-modules/hug/default.nix +++ b/pkgs/development/python-modules/hug/default.nix @@ -1,8 +1,7 @@ { lib , buildPythonPackage, fetchFromGitHub, isPy27 , falcon -, pytestrunner , requests -, pytest +, pytestCheckHook , marshmallow , mock , numpy @@ -20,19 +19,33 @@ buildPythonPackage rec { sha256 = "05rsv16g7ph100p8kl4l2jba0y4wcpp3xblc02mfp67zp1279vaq"; }; - nativeBuildInputs = [ pytestrunner ]; propagatedBuildInputs = [ falcon requests ]; - checkInputs = [ mock marshmallow pytest numpy ]; - checkPhase = '' - mv hug hug.hidden - # some tests attempt network access - PATH=$out/bin:$PATH pytest -k "not (test_request or test_datagram_request)" + checkInputs = [ mock marshmallow pytestCheckHook numpy ]; + + postPatch = '' + substituteInPlace setup.py --replace '"pytest-runner"' "" + ''; + + preCheck = '' + # some tests need the `hug` CLI on the PATH + export PATH=$out/bin:$PATH ''; + disabledTests = [ + # some tests attempt network access + "test_datagram_request" + "test_request" + # these tests use an unstable test dependency (https://github.com/hugapi/hug/issues/859) + "test_marshmallow_custom_context" + "test_marshmallow_schema" + "test_transform" + "test_validate_route_args_negative_case" + ]; + meta = with lib; { description = "A Python framework that makes developing APIs as simple as possible, but no simpler"; - homepage = "https://github.com/timothycrosley/hug"; + homepage = "https://github.com/hugapi/hug"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/humanize/default.nix b/pkgs/development/python-modules/humanize/default.nix index 09e94f6275d..b6f78e5cf8f 100644 --- a/pkgs/development/python-modules/humanize/default.nix +++ b/pkgs/development/python-modules/humanize/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/pkgs/development/python-modules/hupper/default.nix b/pkgs/development/python-modules/hupper/default.nix index b70202138d4..1fe5ab7153d 100644 --- a/pkgs/development/python-modules/hupper/default.nix +++ b/pkgs/development/python-modules/hupper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , pytest, pytestcov, watchdog, mock }: @@ -17,5 +17,5 @@ buildPythonPackage rec { # FIXME: watchdog dependency is disabled on Darwin because of #31865, which causes very silent # segfaults in the testsuite that end up failing the tests in a background thread (in myapp) - checkInputs = [ pytest pytestcov mock ] ++ stdenv.lib.optional (!stdenv.isDarwin) watchdog; + checkInputs = [ pytest pytestcov mock ] ++ lib.optional (!stdenv.isDarwin) watchdog; } diff --git a/pkgs/development/python-modules/hydra-check/default.nix b/pkgs/development/python-modules/hydra-check/default.nix index 7316a6fc971..c01876d3f64 100644 --- a/pkgs/development/python-modules/hydra-check/default.nix +++ b/pkgs/development/python-modules/hydra-check/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "hydra-check"; - version = "1.1.1"; + version = "1.2.0"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "nix-community"; - repo = "hydra-check"; + repo = pname; rev = version; - sha256 = "1dmsscsib8ckp496gsfqxmq8d35zs71n99xmziq9iprvy7n5clq2"; + sha256 = "EegoQ8qTrFGFYbCDsbAOE4Afg9haLjYdC0Cux/yvSk8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hydrawiser/default.nix b/pkgs/development/python-modules/hydrawiser/default.nix new file mode 100644 index 00000000000..feccc73707c --- /dev/null +++ b/pkgs/development/python-modules/hydrawiser/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytest-asyncio +, pytest-cov +, pytestCheckHook +, pythonOlder +, pyyaml +, requests +, requests-mock +}: + +buildPythonPackage rec { + pname = "hydrawiser"; + version = "0.2"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "ptcryan"; + repo = pname; + rev = "v${version}"; + sha256 = "161hazlpvd71xcl2ja86560wm5lnrjv210ki3ji37l6c6gwmhjdj"; + }; + + propagatedBuildInputs = [ requests ]; + + checkInputs = [ + pytest-asyncio + pytest-cov + pytestCheckHook + requests + requests-mock + ]; + + pythonImportsCheck = [ "hydrawiser" ]; + + meta = with lib; { + description = "Python library for Hydrawise API"; + homepage = "https://github.com/ptcryan/hydrawiser"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/hyperframe/default.nix b/pkgs/development/python-modules/hyperframe/default.nix index a74198f3832..6cdee9948b9 100644 --- a/pkgs/development/python-modules/hyperframe/default.nix +++ b/pkgs/development/python-modules/hyperframe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytestCheckHook }: +{ lib, buildPythonPackage, fetchPypi, pytestCheckHook }: buildPythonPackage rec { pname = "hyperframe"; diff --git a/pkgs/development/python-modules/hyperopt/default.nix b/pkgs/development/python-modules/hyperopt/default.nix index ba4aeef402e..d407ff95a01 100644 --- a/pkgs/development/python-modules/hyperopt/default.nix +++ b/pkgs/development/python-modules/hyperopt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage +{ lib, fetchPypi, buildPythonPackage , cloudpickle, numpy, future, networkx , six, tqdm, scipy, pymongo }: diff --git a/pkgs/development/python-modules/i3-py/default.nix b/pkgs/development/python-modules/i3-py/default.nix index 4dea7526b7e..312c1bb45c7 100644 --- a/pkgs/development/python-modules/i3-py/default.nix +++ b/pkgs/development/python-modules/i3-py/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/i3ipc/default.nix b/pkgs/development/python-modules/i3ipc/default.nix index c27d4135411..37d5ccd8786 100644 --- a/pkgs/development/python-modules/i3ipc/default.nix +++ b/pkgs/development/python-modules/i3ipc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchFromGitHub , xorgserver, pytest, pytest-xvfb, i3, python, xlib, xdpyinfo , makeFontsConf, coreutils }: diff --git a/pkgs/development/python-modules/icalendar/default.nix b/pkgs/development/python-modules/icalendar/default.nix index 4499d5d62f4..8e75a945d10 100644 --- a/pkgs/development/python-modules/icalendar/default.nix +++ b/pkgs/development/python-modules/icalendar/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , setuptools diff --git a/pkgs/development/python-modules/icecream/default.nix b/pkgs/development/python-modules/icecream/default.nix index eba5a70577f..b75d0d5d432 100644 --- a/pkgs/development/python-modules/icecream/default.nix +++ b/pkgs/development/python-modules/icecream/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "icecream"; - version = "2.0.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "16kpixl43nrn093cvkmxiq2dzd9xc73zwzkmwp0rs7x01nji8kj3"; + sha256 = "c2e7b74c1c12caa2cfde050f2e636493ee77a9fb4a494b5593418ab359924a24"; }; propagatedBuildInputs = [ asttokens colorama executing pygments ]; diff --git a/pkgs/development/python-modules/icmplib/default.nix b/pkgs/development/python-modules/icmplib/default.nix new file mode 100644 index 00000000000..b89df0bd2ce --- /dev/null +++ b/pkgs/development/python-modules/icmplib/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pbr +, pythonOlder +, requests +, six +}: + +buildPythonPackage rec { + pname = "icmplib"; + version = "2.0.1"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "ValentinBELYN"; + repo = pname; + rev = "v${version}"; + sha256 = "0vps4iz87f8l0z3va92srsx5v19nnd65c22hvbgvhag3vhqsxg7h"; + }; + + propagatedBuildInputs = [ + pbr + six + requests + ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "icmplib" ]; + + meta = with lib; { + description = "Python implementation of the ICMP protocol"; + homepage = "https://github.com/ValentinBELYN/icmplib"; + license = with licenses; [ lgpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/ics/default.nix b/pkgs/development/python-modules/ics/default.nix index c186020fee1..011909d6b80 100644 --- a/pkgs/development/python-modules/ics/default.nix +++ b/pkgs/development/python-modules/ics/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder , tatsu, arrow , pytestCheckHook, pytest-flakes }: diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index 7f2f8c26339..f3b8393a275 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "identify"; - version = "1.5.11"; + version = "1.5.13"; src = fetchPypi { inherit pname version; - sha256 = "b2c71bf9f5c482c389cef816f3a15f1c9d7429ad70f497d4a2e522442d80c6de"; + sha256 = "70b638cf4743f33042bebb3b51e25261a0a10e80f978739f17e7fd4837664a66"; }; # Tests not included in PyPI tarball diff --git a/pkgs/development/python-modules/ifaddr/default.nix b/pkgs/development/python-modules/ifaddr/default.nix index 47997dbdc26..35bafd67fa9 100644 --- a/pkgs/development/python-modules/ifaddr/default.nix +++ b/pkgs/development/python-modules/ifaddr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , ipaddress diff --git a/pkgs/development/python-modules/ifconfig-parser/default.nix b/pkgs/development/python-modules/ifconfig-parser/default.nix index bdfd3767f8c..be4e2026bf1 100644 --- a/pkgs/development/python-modules/ifconfig-parser/default.nix +++ b/pkgs/development/python-modules/ifconfig-parser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub }: +{ lib, buildPythonPackage, fetchFromGitHub }: buildPythonPackage rec { pname = "ifconfig-parser"; diff --git a/pkgs/development/python-modules/ijson/default.nix b/pkgs/development/python-modules/ijson/default.nix index a82a20ca7c8..8ccc7eb4e0c 100644 --- a/pkgs/development/python-modules/ijson/default.nix +++ b/pkgs/development/python-modules/ijson/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "ijson"; diff --git a/pkgs/development/python-modules/image-match/default.nix b/pkgs/development/python-modules/image-match/default.nix index 5c1953d6ac3..7464f3c8997 100644 --- a/pkgs/development/python-modules/image-match/default.nix +++ b/pkgs/development/python-modules/image-match/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pytestrunner, scikitimage }: +{ lib, buildPythonPackage, fetchFromGitHub, pytestrunner, scikitimage }: buildPythonPackage { pname = "image-match"; diff --git a/pkgs/development/python-modules/imagecorruptions/default.nix b/pkgs/development/python-modules/imagecorruptions/default.nix index 65c1cfd020a..8d2b7fd8da8 100644 --- a/pkgs/development/python-modules/imagecorruptions/default.nix +++ b/pkgs/development/python-modules/imagecorruptions/default.nix @@ -2,7 +2,7 @@ , fetchPypi , numpy , scikitimage -, lib, stdenv +, lib , opencv3 }: diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix index e63678a524a..67920dc7b7d 100644 --- a/pkgs/development/python-modules/imageio/default.nix +++ b/pkgs/development/python-modules/imageio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , isPy27 , pathlib @@ -24,7 +24,7 @@ buildPythonPackage rec { inherit pname version; }; - checkInputs = [ pytest psutil ] ++ stdenv.lib.optionals isPy3k [ + checkInputs = [ pytest psutil ] ++ lib.optionals isPy3k [ imageio-ffmpeg ffmpeg_3 ]; propagatedBuildInputs = [ numpy pillow ]; diff --git a/pkgs/development/python-modules/imagesize/default.nix b/pkgs/development/python-modules/imagesize/default.nix index cd48f54ee8f..42cf6b50764 100644 --- a/pkgs/development/python-modules/imagesize/default.nix +++ b/pkgs/development/python-modules/imagesize/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/imap-tools/default.nix b/pkgs/development/python-modules/imap-tools/default.nix new file mode 100644 index 00000000000..107febe4041 --- /dev/null +++ b/pkgs/development/python-modules/imap-tools/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, isPy27 +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "imap-tools"; + version = "0.37.0"; + + disabled = isPy27; + + src = fetchFromGitHub { + owner = "ikvk"; + repo = "imap_tools"; + rev = "v${version}"; + sha256 = "1501lk3fjxqmzxffahbj33y795gwl96yqvk3fs86cchm6vz2gnkk"; + }; + + checkInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # tests require a network connection + "test_action" + "test_folders" + "test_connectio" + "test_attributes" + "test_live" + ]; + + pythonImportsCheck = [ "imap_tools" ]; + + meta = with lib; { + description = "Work with email and mailbox by IMAP"; + homepage = "https://github.com/ikvk/imap_tools"; + license = licenses.asl20; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/imapclient/default.nix b/pkgs/development/python-modules/imapclient/default.nix index c091f53b8d4..27667f860ff 100644 --- a/pkgs/development/python-modules/imapclient/default.nix +++ b/pkgs/development/python-modules/imapclient/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , mock diff --git a/pkgs/development/python-modules/imbalanced-learn/0.4.nix b/pkgs/development/python-modules/imbalanced-learn/0.4.nix index fe21096d635..96ba16b1cd1 100644 --- a/pkgs/development/python-modules/imbalanced-learn/0.4.nix +++ b/pkgs/development/python-modules/imbalanced-learn/0.4.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, scikitlearn, pandas, nose, pytest }: +{ lib, buildPythonPackage, fetchPypi, scikitlearn, pandas, nose, pytest }: buildPythonPackage rec { pname = "imbalanced-learn"; diff --git a/pkgs/development/python-modules/imbalanced-learn/default.nix b/pkgs/development/python-modules/imbalanced-learn/default.nix index 4253ed30e41..f5418b89e80 100644 --- a/pkgs/development/python-modules/imbalanced-learn/default.nix +++ b/pkgs/development/python-modules/imbalanced-learn/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27 +{ lib, buildPythonPackage, fetchPypi, isPy27 , pandas , pytestCheckHook , scikitlearn diff --git a/pkgs/development/python-modules/imgaug/default.nix b/pkgs/development/python-modules/imgaug/default.nix index 9ca8531dbbc..343c7869a6c 100644 --- a/pkgs/development/python-modules/imgaug/default.nix +++ b/pkgs/development/python-modules/imgaug/default.nix @@ -9,7 +9,7 @@ , scipy , shapely , six -, lib, stdenv +, lib }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/imgsize/default.nix b/pkgs/development/python-modules/imgsize/default.nix index d1a69c043d0..a8f50cd8f32 100644 --- a/pkgs/development/python-modules/imgsize/default.nix +++ b/pkgs/development/python-modules/imgsize/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub }: diff --git a/pkgs/development/python-modules/importmagic/default.nix b/pkgs/development/python-modules/importmagic/default.nix index 3a6a3c9ef8d..54308d632b2 100644 --- a/pkgs/development/python-modules/importmagic/default.nix +++ b/pkgs/development/python-modules/importmagic/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/pkgs/development/python-modules/imread/default.nix b/pkgs/development/python-modules/imread/default.nix index 0caff884967..3d09e6a4397 100644 --- a/pkgs/development/python-modules/imread/default.nix +++ b/pkgs/development/python-modules/imread/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose -, pkgconfig +, pkg-config , libjpeg , libpng , libtiff @@ -21,7 +21,7 @@ buildPythonPackage rec { }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ nose libjpeg libpng libtiff libwebp ]; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/imutils/default.nix b/pkgs/development/python-modules/imutils/default.nix index 33c2ae0001c..f402f913f38 100644 --- a/pkgs/development/python-modules/imutils/default.nix +++ b/pkgs/development/python-modules/imutils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , opencv3 diff --git a/pkgs/development/python-modules/inflection/default.nix b/pkgs/development/python-modules/inflection/default.nix index 6f439f0f69a..f6d327d229d 100644 --- a/pkgs/development/python-modules/inflection/default.nix +++ b/pkgs/development/python-modules/inflection/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { checkInputs = [ pytest ]; # Suppress overly verbose output if tests run successfully - checkPhase = ''pytest >/dev/null || pytest''; + checkPhase = "pytest >/dev/null || pytest"; meta = { homepage = "https://github.com/jpvanhal/inflection"; diff --git a/pkgs/development/python-modules/influxdb/default.nix b/pkgs/development/python-modules/influxdb/default.nix index 2d0fd5a93ad..69fe83b8779 100644 --- a/pkgs/development/python-modules/influxdb/default.nix +++ b/pkgs/development/python-modules/influxdb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , requests diff --git a/pkgs/development/python-modules/influxgraph/default.nix b/pkgs/development/python-modules/influxgraph/default.nix index 982b3fb8db5..c8403cf6446 100644 --- a/pkgs/development/python-modules/influxgraph/default.nix +++ b/pkgs/development/python-modules/influxgraph/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k +{ lib, buildPythonPackage, fetchPypi, isPy3k , influxdb, graphite_api, memcached }: @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "0l33sfwdh4bfprmzp2kx0d9098g6yxbnhyyx9qr3kzczpm0jg9vy"; }; - patchPhase = stdenv.lib.optionalString isPy3k '' + patchPhase = lib.optionalString isPy3k '' sed 's/python-memcached/python3-memcached/' \ -i ./influxgraph.egg-info/requires.txt \ -i ./setup.py diff --git a/pkgs/development/python-modules/infoqscraper/default.nix b/pkgs/development/python-modules/infoqscraper/default.nix index 4baa891a779..b250dfc6c7f 100644 --- a/pkgs/development/python-modules/infoqscraper/default.nix +++ b/pkgs/development/python-modules/infoqscraper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , html5lib , six diff --git a/pkgs/development/python-modules/inifile/default.nix b/pkgs/development/python-modules/inifile/default.nix index 9bd24a4d788..c94c12ab0a8 100644 --- a/pkgs/development/python-modules/inifile/default.nix +++ b/pkgs/development/python-modules/inifile/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/iniparse/default.nix b/pkgs/development/python-modules/iniparse/default.nix index c515b7865b1..e4473c0bd1c 100644 --- a/pkgs/development/python-modules/iniparse/default.nix +++ b/pkgs/development/python-modules/iniparse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , python diff --git a/pkgs/development/python-modules/inquirer/default.nix b/pkgs/development/python-modules/inquirer/default.nix index c434a3f52bc..e55fd8f39d5 100644 --- a/pkgs/development/python-modules/inquirer/default.nix +++ b/pkgs/development/python-modules/inquirer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python-editor, readchar, blessed, pytest, pytestcov, pexpect, pytest-mock }: +{ lib, buildPythonPackage, fetchFromGitHub, python-editor, readchar, blessed, pytest, pytestcov, pexpect, pytest-mock }: buildPythonPackage rec { pname = "inquirer"; diff --git a/pkgs/development/python-modules/internetarchive/default.nix b/pkgs/development/python-modules/internetarchive/default.nix index 879c90c40a4..ca91ad954a4 100644 --- a/pkgs/development/python-modules/internetarchive/default.nix +++ b/pkgs/development/python-modules/internetarchive/default.nix @@ -19,11 +19,11 @@ buildPythonPackage rec { pname = "internetarchive"; - version = "1.9.6"; + version = "1.9.9"; src = fetchPypi { inherit pname version; - sha256 = "0e9b24577086283280a5089b3e65086640b4e42d61ca4af913639f45b02b9e4c"; + sha256 = "a1614cbf35499d833e07699ddfd344764f86959fd5535aa9ce1203f57a77f970"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/interruptingcow/default.nix b/pkgs/development/python-modules/interruptingcow/default.nix index b4e1dfaff18..62e021afdbb 100644 --- a/pkgs/development/python-modules/interruptingcow/default.nix +++ b/pkgs/development/python-modules/interruptingcow/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "interruptingcow"; version = "0.8"; diff --git a/pkgs/development/python-modules/intervaltree/default.nix b/pkgs/development/python-modules/intervaltree/default.nix index 27a5fa3650e..dca73a93e8f 100644 --- a/pkgs/development/python-modules/intervaltree/default.nix +++ b/pkgs/development/python-modules/intervaltree/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , python, pytest, sortedcontainers }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/ipaddr/default.nix b/pkgs/development/python-modules/ipaddr/default.nix index 427681fedb8..b29ee917928 100644 --- a/pkgs/development/python-modules/ipaddr/default.nix +++ b/pkgs/development/python-modules/ipaddr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/ipaddress/default.nix b/pkgs/development/python-modules/ipaddress/default.nix index f2e479aff96..06211470daa 100644 --- a/pkgs/development/python-modules/ipaddress/default.nix +++ b/pkgs/development/python-modules/ipaddress/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonAtLeast diff --git a/pkgs/development/python-modules/ipdb/default.nix b/pkgs/development/python-modules/ipdb/default.nix index b21907f75ff..7b8c877371c 100644 --- a/pkgs/development/python-modules/ipdb/default.nix +++ b/pkgs/development/python-modules/ipdb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , ipython diff --git a/pkgs/development/python-modules/ipdbplugin/default.nix b/pkgs/development/python-modules/ipdbplugin/default.nix index 057d82cbebc..9788fd8a544 100644 --- a/pkgs/development/python-modules/ipdbplugin/default.nix +++ b/pkgs/development/python-modules/ipdbplugin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/pkgs/development/python-modules/ipfsapi/default.nix b/pkgs/development/python-modules/ipfsapi/default.nix index 3deb0c6cb80..c97eafb6054 100644 --- a/pkgs/development/python-modules/ipfsapi/default.nix +++ b/pkgs/development/python-modules/ipfsapi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , isPy27 diff --git a/pkgs/development/python-modules/iptools/default.nix b/pkgs/development/python-modules/iptools/default.nix index 431c05bb388..3f2b854b6e7 100644 --- a/pkgs/development/python-modules/iptools/default.nix +++ b/pkgs/development/python-modules/iptools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/pkgs/development/python-modules/ipython/5.nix b/pkgs/development/python-modules/ipython/5.nix index 598e890bb1c..a75ceaa0b76 100644 --- a/pkgs/development/python-modules/ipython/5.nix +++ b/pkgs/development/python-modules/ipython/5.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { sha256 = "4bac649857611baaaf76bc82c173aa542f7486446c335fe1a6c05d0d491c8906"; }; - prePatch = stdenv.lib.optionalString stdenv.isDarwin '' + prePatch = lib.optionalString stdenv.isDarwin '' substituteInPlace setup.py --replace "'gnureadline'" " " ''; diff --git a/pkgs/development/python-modules/ipyvue/default.nix b/pkgs/development/python-modules/ipyvue/default.nix index 3941f08348a..0ccb1b2a4e1 100644 --- a/pkgs/development/python-modules/ipyvue/default.nix +++ b/pkgs/development/python-modules/ipyvue/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "ipyvue"; - version = "1.4.1"; + version = "1.5.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "5b59cf92a1eb7fbef4f2d02be49ac562a721a6cf34f991ac963222cf4c8885a1"; + sha256 = "e8549a7ac7dc45948a5f2735e17f97622313c7fea24ea3c1bd4a5ebf02bf5638"; }; propagatedBuildInputs = [ ipywidgets ]; diff --git a/pkgs/development/python-modules/isbnlib/default.nix b/pkgs/development/python-modules/isbnlib/default.nix index 8398117041b..4957b5d3131 100644 --- a/pkgs/development/python-modules/isbnlib/default.nix +++ b/pkgs/development/python-modules/isbnlib/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "isbnlib"; - version = "3.10.4"; + version = "3.10.6"; src = fetchPypi { inherit pname version; - sha256 = "f5bfbc362e2a73dfc82449ac459b59a7f6b20bcebf82f6bd87d773dc45073646"; + sha256 = "b324c7c8689741bba6d71d1369d49780a24fe946b11a3c005d56e09bf705cd19"; }; checkInputs = [ @@ -22,6 +22,8 @@ buildPythonPackage rec { # requires network connection doCheck = false; + pythonImportsCheck = [ "isbnlib" ]; + meta = with lib; { description = "Extract, clean, transform, hyphenate and metadata for ISBNs"; homepage = "https://github.com/xlcnd/isbnlib"; diff --git a/pkgs/development/python-modules/iso3166/default.nix b/pkgs/development/python-modules/iso3166/default.nix index acf6d3c9331..61ec91075b5 100644 --- a/pkgs/development/python-modules/iso3166/default.nix +++ b/pkgs/development/python-modules/iso3166/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonPackage, pytest }: +{ lib, fetchFromGitHub, buildPythonPackage, pytest }: buildPythonPackage { pname = "iso3166"; diff --git a/pkgs/development/python-modules/isodate/default.nix b/pkgs/development/python-modules/isodate/default.nix index d2098a83c95..19a643d216a 100644 --- a/pkgs/development/python-modules/isodate/default.nix +++ b/pkgs/development/python-modules/isodate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , python diff --git a/pkgs/development/python-modules/itsdangerous/default.nix b/pkgs/development/python-modules/itsdangerous/default.nix index e89786d4e18..d1669a1ed5b 100644 --- a/pkgs/development/python-modules/itsdangerous/default.nix +++ b/pkgs/development/python-modules/itsdangerous/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/itypes/default.nix b/pkgs/development/python-modules/itypes/default.nix index 417d1a20b3b..1b684547240 100644 --- a/pkgs/development/python-modules/itypes/default.nix +++ b/pkgs/development/python-modules/itypes/default.nix @@ -1,5 +1,5 @@ { - lib, stdenv, + lib, fetchFromGitHub, buildPythonPackage, pytest, diff --git a/pkgs/development/python-modules/j2cli/default.nix b/pkgs/development/python-modules/j2cli/default.nix index 14cf18ae694..d6efe84edfd 100644 --- a/pkgs/development/python-modules/j2cli/default.nix +++ b/pkgs/development/python-modules/j2cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , jinja2 diff --git a/pkgs/development/python-modules/jabberbot/default.nix b/pkgs/development/python-modules/jabberbot/default.nix index 4c625d94485..d00ccd06c8d 100644 --- a/pkgs/development/python-modules/jabberbot/default.nix +++ b/pkgs/development/python-modules/jabberbot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, isPy3k, fetchPypi, xmpppy }: +{ lib, buildPythonPackage, isPy3k, fetchPypi, xmpppy }: buildPythonPackage rec { pname = "jabberbot"; diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix index 6f120fa6ea2..b4590ed28d3 100644 --- a/pkgs/development/python-modules/jc/default.nix +++ b/pkgs/development/python-modules/jc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , ruamel_yaml diff --git a/pkgs/development/python-modules/jdatetime/default.nix b/pkgs/development/python-modules/jdatetime/default.nix index d4aa49c3ca3..90f7c310faa 100644 --- a/pkgs/development/python-modules/jdatetime/default.nix +++ b/pkgs/development/python-modules/jdatetime/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, six }: +{ lib, buildPythonPackage, fetchPypi, six }: buildPythonPackage rec { pname = "jdatetime"; diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix index 6e833a77460..305b9f6c6b6 100644 --- a/pkgs/development/python-modules/jedi/default.nix +++ b/pkgs/development/python-modules/jedi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, fetchPypi, pytest, glibcLocales, tox, pytestcov, parso }: +{ lib, buildPythonPackage, fetchFromGitHub, fetchPypi, pytest, glibcLocales, tox, pytestcov, parso }: buildPythonPackage rec { pname = "jedi"; diff --git a/pkgs/development/python-modules/jenkins-job-builder/default.nix b/pkgs/development/python-modules/jenkins-job-builder/default.nix index 3cc2bb69e0e..7d4f6dd9363 100644 --- a/pkgs/development/python-modules/jenkins-job-builder/default.nix +++ b/pkgs/development/python-modules/jenkins-job-builder/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "jenkins-job-builder"; - version = "3.7.0"; + version = "3.8.0"; src = fetchPypi { inherit pname version; - sha256 = "bca1f458206fc8be82d790685b603d4158e2034a651f2e148e31526984b9d551"; + sha256 = "sha256-uRyeRP1y3GS7tXb0kHLBi7+trJRme/Ke3xgOY+LqZ6k="; }; postPatch = '' @@ -24,7 +24,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pbr python-jenkins pyyaml six stevedore fasteners jinja2 ]; # Need to fix test deps, relies on stestr and a few other packages that aren't available on nixpkgs - checkPhase = ''$out/bin/jenkins-jobs --help''; + checkPhase = "$out/bin/jenkins-jobs --help"; meta = with lib; { description = "Jenkins Job Builder is a system for configuring Jenkins jobs using simple YAML files stored in Git"; diff --git a/pkgs/development/python-modules/jinja2_pluralize/default.nix b/pkgs/development/python-modules/jinja2_pluralize/default.nix index 0a6d0c365a0..db196403822 100644 --- a/pkgs/development/python-modules/jinja2_pluralize/default.nix +++ b/pkgs/development/python-modules/jinja2_pluralize/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, jinja2, inflect }: +{ lib, buildPythonPackage, fetchPypi, jinja2, inflect }: buildPythonPackage rec { pname = "jinja2_pluralize"; diff --git a/pkgs/development/python-modules/jinja2_time/default.nix b/pkgs/development/python-modules/jinja2_time/default.nix index 7887fe96f75..4268413fd3f 100644 --- a/pkgs/development/python-modules/jinja2_time/default.nix +++ b/pkgs/development/python-modules/jinja2_time/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , arrow diff --git a/pkgs/development/python-modules/jmespath/default.nix b/pkgs/development/python-modules/jmespath/default.nix index 3b31700de0e..3f74ae8d810 100644 --- a/pkgs/development/python-modules/jmespath/default.nix +++ b/pkgs/development/python-modules/jmespath/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , ply diff --git a/pkgs/development/python-modules/johnnycanencrypt/default.nix b/pkgs/development/python-modules/johnnycanencrypt/default.nix index 407bb44d8b2..77789fa44db 100644 --- a/pkgs/development/python-modules/johnnycanencrypt/default.nix +++ b/pkgs/development/python-modules/johnnycanencrypt/default.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , rustPlatform , fetchFromGitHub , pipInstallHook @@ -49,7 +50,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ pcsclite nettle - ] ++ stdenv.lib.optionals stdenv.isDarwin [ PCSC ]; + ] ++ lib.optionals stdenv.isDarwin [ PCSC ]; # Needed b/c need to check AFTER python wheel is installed (using Rust Build, not buildPythonPackage) doCheck = false; @@ -60,6 +61,12 @@ rustPlatform.buildRustPackage rec { numpy ]; + # Remove with the next release after 0.5.0. This change is required + # for compatibility with maturin 0.9.0. + postPatch = '' + sed '/project-url = /d' -i Cargo.toml + ''; + buildPhase = '' runHook preBuild maturin build --release --manylinux off --strip --cargo-extra-args="-j $NIX_BUILD_CORES --frozen" @@ -83,7 +90,7 @@ rustPlatform.buildRustPackage rec { pythonImportsCheck = [ "johnnycanencrypt" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/kushaldas/johnnycanencrypt"; description = "Python module for OpenPGP written in Rust"; license = licenses.gpl3Plus; diff --git a/pkgs/development/python-modules/jpylyzer/default.nix b/pkgs/development/python-modules/jpylyzer/default.nix index c5c9cdf1505..6f9ceb96e3f 100644 --- a/pkgs/development/python-modules/jpylyzer/default.nix +++ b/pkgs/development/python-modules/jpylyzer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , buildPythonPackage , six diff --git a/pkgs/development/python-modules/json-schema-for-humans/default.nix b/pkgs/development/python-modules/json-schema-for-humans/default.nix index bc32f57f50a..4e762e456ce 100644 --- a/pkgs/development/python-modules/json-schema-for-humans/default.nix +++ b/pkgs/development/python-modules/json-schema-for-humans/default.nix @@ -1,26 +1,18 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, fetchurl +{ lib, buildPythonPackage, fetchFromGitHub , pbr, click, dataclasses-json, htmlmin, jinja2, markdown2, pygments, pytz, pyyaml, requests, pytestCheckHook, beautifulsoup4, tox }: buildPythonPackage rec { pname = "json-schema-for-humans"; - version = "0.27.0"; + version = "0.27.1"; src = fetchFromGitHub { owner = "coveooss"; repo = pname; rev = "v${version}"; - sha256 = "1r40i192z6aasil5vsgcgp5yvx392dhhqnfc2qxbxvpja6l3p6p2"; + sha256 = "0d2a4a2lcqssr5g9rmc76f86nkqc9grixh507vzc9fi1h3gbi765"; }; - patches = [ (fetchurl { - url = "https://github.com/coveooss/json-schema-for-humans/commit/1fe2e2391da5a796204fd1889e4a11a53f83f7c9.patch"; - sha256 = "0kpydpddlg0rib9snl8albhbrrs6d3ds292gpgpg7bdpqrwamdib"; - }) (fetchurl { - url = "https://github.com/astro/json-schema-for-humans/commit/9bcc9b461102062dff214ca1ec2375b8aea53711.patch"; - sha256 = "142a07v8bn1j20b7177yb60f4944kbx4cdqqq2nz6xkxmamw704d"; - }) ]; - nativeBuildInputs = [ pbr ]; propagatedBuildInputs = [ click dataclasses-json htmlmin jinja2 markdown2 @@ -34,7 +26,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook beautifulsoup4 ]; pytestFlagsArray = [ "--ignore tests/generate_test.py" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Quickly generate HTML documentation from a JSON schema"; homepage = "https://github.com/coveooss/json-schema-for-humans"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/jsonfield/default.nix b/pkgs/development/python-modules/jsonfield/default.nix index 07ee609d653..6b7faf9a312 100644 --- a/pkgs/development/python-modules/jsonfield/default.nix +++ b/pkgs/development/python-modules/jsonfield/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, django, pytestCheckHook, pytest-django }: +{ lib, fetchPypi, buildPythonPackage, django, pytestCheckHook, pytest-django }: buildPythonPackage rec { pname = "jsonfield"; diff --git a/pkgs/development/python-modules/jsonmerge/default.nix b/pkgs/development/python-modules/jsonmerge/default.nix index 4fc558fd394..3ca8dc01a4b 100644 --- a/pkgs/development/python-modules/jsonmerge/default.nix +++ b/pkgs/development/python-modules/jsonmerge/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "jsonmerge"; - version = "1.7.0"; + version = "1.8.0"; src = fetchPypi { inherit pname version; - sha256 = "2004a421890311176136fb911c339c4bab45984808814feaed6a328c6e211ba2"; + sha256 = "a86bfc44f32f6a28b749743df8960a4ce1930666b3b73882513825f845cb9558"; }; propagatedBuildInputs = [ jsonschema ]; diff --git a/pkgs/development/python-modules/jsonpath_rw/default.nix b/pkgs/development/python-modules/jsonpath_rw/default.nix index 81a6eb3fb27..d2b177c742a 100644 --- a/pkgs/development/python-modules/jsonpath_rw/default.nix +++ b/pkgs/development/python-modules/jsonpath_rw/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPyPy diff --git a/pkgs/development/python-modules/jsonpointer/default.nix b/pkgs/development/python-modules/jsonpointer/default.nix index e2f22ec8638..e1eaaed6c17 100644 --- a/pkgs/development/python-modules/jsonpointer/default.nix +++ b/pkgs/development/python-modules/jsonpointer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with lib; { description = "Resolve JSON Pointers in Python"; homepage = "https://github.com/stefankoegl/python-json-pointer"; - license = stdenv.lib.licenses.bsd2; # "Modified BSD license, says pypi" + license = licenses.bsd2; # "Modified BSD license, says pypi" }; } diff --git a/pkgs/development/python-modules/jsonref/default.nix b/pkgs/development/python-modules/jsonref/default.nix index b901d811a23..3154f63f318 100644 --- a/pkgs/development/python-modules/jsonref/default.nix +++ b/pkgs/development/python-modules/jsonref/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , pytest, mock }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/jsonrpc-async/default.nix b/pkgs/development/python-modules/jsonrpc-async/default.nix index 0b77db5df4e..00f0d748bbb 100644 --- a/pkgs/development/python-modules/jsonrpc-async/default.nix +++ b/pkgs/development/python-modules/jsonrpc-async/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , aiohttp, jsonrpc-base }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/jsonrpc-base/default.nix b/pkgs/development/python-modules/jsonrpc-base/default.nix index cc4bd1b2f68..db47a2240fb 100644 --- a/pkgs/development/python-modules/jsonrpc-base/default.nix +++ b/pkgs/development/python-modules/jsonrpc-base/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "jsonrpc-base"; diff --git a/pkgs/development/python-modules/jsonrpc-websocket/default.nix b/pkgs/development/python-modules/jsonrpc-websocket/default.nix index d14d382f013..bf8960ad27d 100644 --- a/pkgs/development/python-modules/jsonrpc-websocket/default.nix +++ b/pkgs/development/python-modules/jsonrpc-websocket/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , aiohttp, jsonrpc-base, pep8 , pytestCheckHook , pytest-asyncio diff --git a/pkgs/development/python-modules/jsonwatch/default.nix b/pkgs/development/python-modules/jsonwatch/default.nix index feced944225..7b08572d231 100644 --- a/pkgs/development/python-modules/jsonwatch/default.nix +++ b/pkgs/development/python-modules/jsonwatch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , six diff --git a/pkgs/development/python-modules/jug/default.nix b/pkgs/development/python-modules/jug/default.nix index eff6accaa02..7646c007818 100644 --- a/pkgs/development/python-modules/jug/default.nix +++ b/pkgs/development/python-modules/jug/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch +{ lib, buildPythonPackage, fetchPypi, fetchpatch , nose, numpy , bottle, pyyaml, redis, six , zlib diff --git a/pkgs/development/python-modules/junos-eznc/default.nix b/pkgs/development/python-modules/junos-eznc/default.nix index d9234d836b0..60ec37dbde9 100644 --- a/pkgs/development/python-modules/junos-eznc/default.nix +++ b/pkgs/development/python-modules/junos-eznc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/pkgs/development/python-modules/jupyter-repo2docker/default.nix b/pkgs/development/python-modules/jupyter-repo2docker/default.nix index f01605513cb..5d8060d1944 100644 --- a/pkgs/development/python-modules/jupyter-repo2docker/default.nix +++ b/pkgs/development/python-modules/jupyter-repo2docker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonAtLeast +{ lib, buildPythonPackage, fetchPypi, pythonAtLeast , docker , escapism , jinja2 diff --git a/pkgs/development/python-modules/jupyter-telemetry/default.nix b/pkgs/development/python-modules/jupyter-telemetry/default.nix index 0f0c0d346e6..9dddd8ec568 100644 --- a/pkgs/development/python-modules/jupyter-telemetry/default.nix +++ b/pkgs/development/python-modules/jupyter-telemetry/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , buildPythonPackage , fetchPypi , pythonOlder diff --git a/pkgs/development/python-modules/jupyter/default.nix b/pkgs/development/python-modules/jupyter/default.nix index 03d28bbf55d..818623c2513 100644 --- a/pkgs/development/python-modules/jupyter/default.nix +++ b/pkgs/development/python-modules/jupyter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , notebook diff --git a/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix b/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix index dc38acc66f7..71fba8a1222 100644 --- a/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix +++ b/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "jupyterhub-systemdspawner"; - version = "0.14"; + version = "0.15.0"; src = fetchPypi { inherit pname version; - sha256 = "080dd9cd9292266dad35d1efc7aa1af0ed6993d15eadc79bd959d1ee273d1923"; + sha256 = "b6e2d981657aa5d3794abb89b1650d056524158a3d0f0f706007cae9b6dbeb2b"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jupyterlab_server/default.nix b/pkgs/development/python-modules/jupyterlab_server/default.nix index bfbd1cc89e0..3d9b5b9f831 100644 --- a/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/pkgs/development/python-modules/jupyterlab_server/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , notebook diff --git a/pkgs/development/python-modules/kaa-base/default.nix b/pkgs/development/python-modules/kaa-base/default.nix index 24a02f7f696..5b789f5eda8 100644 --- a/pkgs/development/python-modules/kaa-base/default.nix +++ b/pkgs/development/python-modules/kaa-base/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPyPy diff --git a/pkgs/development/python-modules/kaa-metadata/default.nix b/pkgs/development/python-modules/kaa-metadata/default.nix index 5164004e8ea..5a50d9e9c0a 100644 --- a/pkgs/development/python-modules/kaa-metadata/default.nix +++ b/pkgs/development/python-modules/kaa-metadata/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , kaa-base diff --git a/pkgs/development/python-modules/kafka-python/default.nix b/pkgs/development/python-modules/kafka-python/default.nix index b147b30c2ce..d8f37f563d4 100644 --- a/pkgs/development/python-modules/kafka-python/default.nix +++ b/pkgs/development/python-modules/kafka-python/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, six, mock }: +{ lib, buildPythonPackage, fetchPypi, pytest, six, mock }: buildPythonPackage rec { version = "2.0.2"; diff --git a/pkgs/development/python-modules/kaitaistruct/default.nix b/pkgs/development/python-modules/kaitaistruct/default.nix index 866042b6942..1050ae88e43 100644 --- a/pkgs/development/python-modules/kaitaistruct/default.nix +++ b/pkgs/development/python-modules/kaitaistruct/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "kaitaistruct"; diff --git a/pkgs/development/python-modules/kajiki/default.nix b/pkgs/development/python-modules/kajiki/default.nix index 2a45404919c..471ee4416b6 100644 --- a/pkgs/development/python-modules/kajiki/default.nix +++ b/pkgs/development/python-modules/kajiki/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , Babel diff --git a/pkgs/development/python-modules/kaptan/default.nix b/pkgs/development/python-modules/kaptan/default.nix index dea22059f09..c5f00393839 100644 --- a/pkgs/development/python-modules/kaptan/default.nix +++ b/pkgs/development/python-modules/kaptan/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pyyaml diff --git a/pkgs/development/python-modules/kazoo/default.nix b/pkgs/development/python-modules/kazoo/default.nix index d8743776578..31b65023371 100644 --- a/pkgs/development/python-modules/kazoo/default.nix +++ b/pkgs/development/python-modules/kazoo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/pkgs/development/python-modules/keep/default.nix b/pkgs/development/python-modules/keep/default.nix index 22ae853c043..5a70dcb4676 100644 --- a/pkgs/development/python-modules/keep/default.nix +++ b/pkgs/development/python-modules/keep/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , PyGithub diff --git a/pkgs/development/python-modules/keepalive/default.nix b/pkgs/development/python-modules/keepalive/default.nix index 7a488edf895..b6daec6ca20 100644 --- a/pkgs/development/python-modules/keepalive/default.nix +++ b/pkgs/development/python-modules/keepalive/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/keepkey/default.nix b/pkgs/development/python-modules/keepkey/default.nix index 437a0193c61..6b4568cd748 100644 --- a/pkgs/development/python-modules/keepkey/default.nix +++ b/pkgs/development/python-modules/keepkey/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonPackage, pytest +{ lib, fetchFromGitHub, buildPythonPackage, pytest , ecdsa , mnemonic, protobuf, hidapi, trezor }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/keepkey_agent/default.nix b/pkgs/development/python-modules/keepkey_agent/default.nix index b9189cf4e16..27ef7d8dbf4 100644 --- a/pkgs/development/python-modules/keepkey_agent/default.nix +++ b/pkgs/development/python-modules/keepkey_agent/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , keepkey diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index 7274d3d17a6..e90dd1a806a 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , pytest, pytestcov, pytest_xdist , six, numpy, scipy, pyyaml, h5py , keras-applications, keras-preprocessing diff --git a/pkgs/development/python-modules/kerberos/default.nix b/pkgs/development/python-modules/kerberos/default.nix index df9babdc582..7a9ce3aab44 100644 --- a/pkgs/development/python-modules/kerberos/default.nix +++ b/pkgs/development/python-modules/kerberos/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , kerberos @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "kerberos"; - version = "1.3.0"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "19663qxmma0i8bfbjc2iwy5hgq0g4pfb75r023v5dps68zfvffgh"; + sha256 = "cdd046142a4e0060f96a00eb13d82a5d9ebc0f2d7934393ed559bac773460a2c"; }; nativeBuildInputs = [ kerberos ]; diff --git a/pkgs/development/python-modules/keyring/2.nix b/pkgs/development/python-modules/keyring/2.nix index 1dc7eb0a8f9..ee3b42b9bb8 100644 --- a/pkgs/development/python-modules/keyring/2.nix +++ b/pkgs/development/python-modules/keyring/2.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { checkInputs = [ pytest pytest-flake8 ]; - propagatedBuildInputs = [ dbus-python entrypoints ] ++ stdenv.lib.optional stdenv.isLinux secretstorage; + propagatedBuildInputs = [ dbus-python entrypoints ] ++ lib.optional stdenv.isLinux secretstorage; doCheck = !stdenv.isDarwin; diff --git a/pkgs/development/python-modules/keyrings-alt/default.nix b/pkgs/development/python-modules/keyrings-alt/default.nix index eb1f12e0aa3..5b53d201a0b 100644 --- a/pkgs/development/python-modules/keyrings-alt/default.nix +++ b/pkgs/development/python-modules/keyrings-alt/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder, isPy27, six +{ lib, buildPythonPackage, fetchPypi, pythonOlder, isPy27, six , pytest, backports_unittest-mock, keyring, setuptools_scm, toml }: buildPythonPackage rec { pname = "keyrings.alt"; - version = "4.0.1"; + version = "4.0.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "cd23d4c6930b5271134ac815d868164cb6d0d2252ee6dcb07fadfca26caaa230"; + sha256 = "cc475635099d6edd7e475c5a479e5b4da5e811a3af04495a1e9ada488d16fe25"; }; postPatch = '' @@ -20,7 +20,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools_scm toml ]; propagatedBuildInputs = [ six ]; - checkInputs = [ pytest keyring ] ++ stdenv.lib.optional (pythonOlder "3.3") backports_unittest-mock; + checkInputs = [ pytest keyring ] ++ lib.optional (pythonOlder "3.3") backports_unittest-mock; # heavily relies on importing tests from keyring package doCheck = false; diff --git a/pkgs/development/python-modules/kitchen/default.nix b/pkgs/development/python-modules/kitchen/default.nix index 1a14b974114..0b6f41d2c19 100644 --- a/pkgs/development/python-modules/kitchen/default.nix +++ b/pkgs/development/python-modules/kitchen/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "kitchen"; version = "1.2.6"; diff --git a/pkgs/development/python-modules/kiwisolver/1_1.nix b/pkgs/development/python-modules/kiwisolver/1_1.nix index f4621c9c54d..0702e3518e0 100644 --- a/pkgs/development/python-modules/kiwisolver/1_1.nix +++ b/pkgs/development/python-modules/kiwisolver/1_1.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "53eaed412477c836e1b9522c19858a8557d6e595077830146182225613b11a75"; }; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; # Does not include tests doCheck = false; diff --git a/pkgs/development/python-modules/kiwisolver/default.nix b/pkgs/development/python-modules/kiwisolver/default.nix index a24e7300538..d4d62787092 100644 --- a/pkgs/development/python-modules/kiwisolver/default.nix +++ b/pkgs/development/python-modules/kiwisolver/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "950a199911a8d94683a6b10321f9345d5a3a8433ec58b217ace979e18f16e248"; }; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; nativeBuildInputs = [ cppy diff --git a/pkgs/development/python-modules/knack/default.nix b/pkgs/development/python-modules/knack/default.nix index dd45e967231..c08bdab4cf3 100644 --- a/pkgs/development/python-modules/knack/default.nix +++ b/pkgs/development/python-modules/knack/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , buildPythonPackage , fetchPypi , argcomplete diff --git a/pkgs/development/python-modules/koji/default.nix b/pkgs/development/python-modules/koji/default.nix index eac2ab59643..5f560be4e88 100644 --- a/pkgs/development/python-modules/koji/default.nix +++ b/pkgs/development/python-modules/koji/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPythonPackage, isPy3k, pycurl, six, rpm, dateutil }: +{ lib, fetchurl, buildPythonPackage, isPy3k, pycurl, six, rpm, dateutil }: buildPythonPackage rec { pname = "koji"; @@ -23,10 +23,10 @@ buildPythonPackage rec { rm -rf $out/nix ''; - meta = { + meta = with lib; { description = "An RPM-based build system"; homepage = "https://pagure.io/koji"; - license = stdenv.lib.licenses.lgpl21; - platforms = stdenv.lib.platforms.unix; + license = licenses.lgpl21; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/korean-lunar-calendar/default.nix b/pkgs/development/python-modules/korean-lunar-calendar/default.nix index 8ad94d955ae..a1b22a727ad 100644 --- a/pkgs/development/python-modules/korean-lunar-calendar/default.nix +++ b/pkgs/development/python-modules/korean-lunar-calendar/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/kubernetes/default.nix b/pkgs/development/python-modules/kubernetes/default.nix index 17218078196..f2cb598a6c9 100644 --- a/pkgs/development/python-modules/kubernetes/default.nix +++ b/pkgs/development/python-modules/kubernetes/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonAtLeast, +{ lib, buildPythonPackage, fetchPypi, pythonAtLeast, ipaddress, websocket_client, urllib3, pyyaml, requests_oauthlib, python-dateutil, google-auth, adal, isort, pytest, coverage, mock, sphinx, autopep8, pep8, codecov, recommonmark, nose }: diff --git a/pkgs/development/python-modules/larch/default.nix b/pkgs/development/python-modules/larch/default.nix index 7708bc0dbc0..630430b8270 100644 --- a/pkgs/development/python-modules/larch/default.nix +++ b/pkgs/development/python-modules/larch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , sphinx diff --git a/pkgs/development/python-modules/lasagne/default.nix b/pkgs/development/python-modules/lasagne/default.nix index 5bddf5cbe6f..5db149708ff 100644 --- a/pkgs/development/python-modules/lasagne/default.nix +++ b/pkgs/development/python-modules/lasagne/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , numpy diff --git a/pkgs/development/python-modules/latexcodec/default.nix b/pkgs/development/python-modules/latexcodec/default.nix index 77b75193ca4..37ffe23b806 100644 --- a/pkgs/development/python-modules/latexcodec/default.nix +++ b/pkgs/development/python-modules/latexcodec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, six, pytest }: +{ lib, buildPythonPackage, fetchPypi, six, pytest }: buildPythonPackage rec { pname = "latexcodec"; @@ -17,10 +17,10 @@ buildPythonPackage rec { pytest ''; - meta = { + meta = with lib; { homepage = "https://github.com/mcmtroffaes/latexcodec"; description = "Lexer and codec to work with LaTeX code in Python"; - license = stdenv.lib.licenses.mit; + license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/lazr/config.nix b/pkgs/development/python-modules/lazr/config.nix index d8a895c8357..b10ad25972b 100644 --- a/pkgs/development/python-modules/lazr/config.nix +++ b/pkgs/development/python-modules/lazr/config.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "lazr.config"; - version = "2.2.2"; + version = "2.2.3"; propagatedBuildInputs = [ lazr_delegates ]; src = fetchPypi { inherit pname version; - sha256 = "cdb9a70dac4a76ca1ff3528d9eafe5414c6c69c1b92e7e84d3477ae85f6bb787"; + sha256 = "b74a73f8b63e6dc6732fc1f3d88e2f236596ddf089ef6e1794ece060e8cfabe1"; }; } diff --git a/pkgs/development/python-modules/lazy-object-proxy/default.nix b/pkgs/development/python-modules/lazy-object-proxy/default.nix index 63784b4005b..82a784cfe3c 100644 --- a/pkgs/development/python-modules/lazy-object-proxy/default.nix +++ b/pkgs/development/python-modules/lazy-object-proxy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/pkgs/development/python-modules/lazy_import/default.nix b/pkgs/development/python-modules/lazy_import/default.nix index 1bc52b3a65c..60eba0577b0 100644 --- a/pkgs/development/python-modules/lazy_import/default.nix +++ b/pkgs/development/python-modules/lazy_import/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , pytest , pytest_xdist , six }: diff --git a/pkgs/development/python-modules/ldap3/default.nix b/pkgs/development/python-modules/ldap3/default.nix index e1accc4d177..71af0d294a2 100644 --- a/pkgs/development/python-modules/ldap3/default.nix +++ b/pkgs/development/python-modules/ldap3/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, pyasn1 }: +{ lib, fetchPypi, buildPythonPackage, pyasn1 }: buildPythonPackage rec { pname = "ldap3"; diff --git a/pkgs/development/python-modules/ldaptor/default.nix b/pkgs/development/python-modules/ldaptor/default.nix index 2a4550d6b42..e3694bffe37 100644 --- a/pkgs/development/python-modules/ldaptor/default.nix +++ b/pkgs/development/python-modules/ldaptor/default.nix @@ -3,12 +3,13 @@ , fetchPypi , twisted , passlib -, pycrypto , pyopenssl , pyparsing , service-identity , zope_interface , isPy3k +, pythonAtLeast +, python }: buildPythonPackage rec { @@ -21,13 +22,15 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - twisted passlib pycrypto pyopenssl pyparsing service-identity zope_interface + twisted passlib pyopenssl pyparsing service-identity zope_interface ]; - disabled = isPy3k; + # https://github.com/twisted/ldaptor/pull/210 + disabled = !isPy3k || pythonAtLeast "3.9"; - # TypeError: None is neither bytes nor unicode - doCheck = false; + checkPhase = '' + ${python.interpreter} -m twisted.trial ldaptor + ''; meta = { description = "A Pure-Python Twisted library for LDAP"; diff --git a/pkgs/development/python-modules/le/default.nix b/pkgs/development/python-modules/le/default.nix index 6415b255c71..d42527ae97a 100644 --- a/pkgs/development/python-modules/le/default.nix +++ b/pkgs/development/python-modules/le/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , isPy3k diff --git a/pkgs/development/python-modules/leather/default.nix b/pkgs/development/python-modules/leather/default.nix index 99c1f080a03..197e88e8e8b 100644 --- a/pkgs/development/python-modules/leather/default.nix +++ b/pkgs/development/python-modules/leather/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, six }: +{ lib, fetchPypi, buildPythonPackage, six }: buildPythonPackage rec { pname = "leather"; diff --git a/pkgs/development/python-modules/ledger_agent/default.nix b/pkgs/development/python-modules/ledger_agent/default.nix index 4fc935799c3..8a0ace12645 100644 --- a/pkgs/development/python-modules/ledger_agent/default.nix +++ b/pkgs/development/python-modules/ledger_agent/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , ledgerblue diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix index f853dfbf01f..fe94753f1a6 100644 --- a/pkgs/development/python-modules/ledgerblue/default.nix +++ b/pkgs/development/python-modules/ledgerblue/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, hidapi +{ lib, fetchPypi, buildPythonPackage, hidapi , pycrypto, pillow, protobuf, future, ecpy, python-u2flib-host, pycryptodomex , websocket_client }: diff --git a/pkgs/development/python-modules/ledgerwallet/default.nix b/pkgs/development/python-modules/ledgerwallet/default.nix index a95d8140e11..42bc0c39129 100644 --- a/pkgs/development/python-modules/ledgerwallet/default.nix +++ b/pkgs/development/python-modules/ledgerwallet/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { sha256 = "0fb93h2wxm9as9rsywlgz2ng4wrlbjphn6mgbhj6nls2i86rrdxk"; }; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ AppKit ]; + buildInputs = lib.optionals stdenv.isDarwin [ AppKit ]; propagatedBuildInputs = [ cryptography click construct ecdsa hidapi intelhex pillow protobuf requests tabulate ]; diff --git a/pkgs/development/python-modules/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix index debe88f2f6c..47be977755c 100644 --- a/pkgs/development/python-modules/libagent/default.nix +++ b/pkgs/development/python-modules/libagent/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonPackage, ed25519, ecdsa , semver, mnemonic, +{ lib, fetchFromGitHub, buildPythonPackage, ed25519, ecdsa , semver, mnemonic, unidecode, mock, pytest , backports-shutil-which, ConfigArgParse, python-daemon, pymsgbox }: diff --git a/pkgs/development/python-modules/libais/default.nix b/pkgs/development/python-modules/libais/default.nix index eb1ce861dd2..33710c6682d 100644 --- a/pkgs/development/python-modules/libais/default.nix +++ b/pkgs/development/python-modules/libais/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, +{ lib, buildPythonPackage, fetchPypi, six, pytest, pytestrunner, pytestcov, coverage }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix index 5a5116de547..6e5d8f771e8 100644 --- a/pkgs/development/python-modules/libarcus/default.nix +++ b/pkgs/development/python-modules/libarcus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, python, fetchFromGitHub +{ lib, buildPythonPackage, python, fetchFromGitHub , cmake, sip, protobuf, pythonOlder }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/libasyncns/default.nix b/pkgs/development/python-modules/libasyncns/default.nix index 72147fb70f2..38ca9b26360 100644 --- a/pkgs/development/python-modules/libasyncns/default.nix +++ b/pkgs/development/python-modules/libasyncns/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, buildPythonPackage, fetchurl -, libasyncns, pkgconfig }: +{ lib, buildPythonPackage, fetchurl +, libasyncns, pkg-config }: buildPythonPackage rec { pname = "libasyncns-python"; @@ -13,7 +13,7 @@ buildPythonPackage rec { patches = [ ./libasyncns-fix-res-consts.patch ]; buildInputs = [ libasyncns ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; doCheck = false; # requires network access meta = with lib; { diff --git a/pkgs/development/python-modules/libcloud/default.nix b/pkgs/development/python-modules/libcloud/default.nix index bda0553b8ee..0449f609958 100644 --- a/pkgs/development/python-modules/libcloud/default.nix +++ b/pkgs/development/python-modules/libcloud/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "apache-libcloud"; - version = "3.3.0"; + version = "3.3.1"; src = fetchPypi { inherit pname version; - sha256 = "2e3e4d02f9b3197f9119e737bc704fba52f34459d4bc96d8ad8f183d600747ba"; + sha256 = "d7450453eaf5904eb4fb4f74cf9f37dc83721a719bce34f5abb336b1a1ab974d"; }; checkInputs = [ mock pytest pytestrunner requests-mock ]; @@ -28,9 +28,12 @@ buildPythonPackage rec { # requires a certificates file doCheck = false; + pythonImportsCheck = [ "libcloud" ]; + meta = with lib; { description = "A unified interface to many cloud providers"; - homepage = "http://incubator.apache.org/libcloud/"; + homepage = "https://libcloud.apache.org/"; + changelog = "https://github.com/apache/libcloud/blob/v${version}/CHANGES.rst"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/libevdev/default.nix b/pkgs/development/python-modules/libevdev/default.nix index 227cabe0099..4a4ba489e0a 100644 --- a/pkgs/development/python-modules/libevdev/default.nix +++ b/pkgs/development/python-modules/libevdev/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , isPy27 , fetchPypi @@ -20,7 +20,7 @@ buildPythonPackage rec { patches = [ (substituteAll { src = ./fix-paths.patch; - libevdev = stdenv.lib.getLib pkgs.libevdev; + libevdev = lib.getLib pkgs.libevdev; }) ]; diff --git a/pkgs/development/python-modules/libgpuarray/default.nix b/pkgs/development/python-modules/libgpuarray/default.nix index 80e560e4cce..567ad2cf489 100644 --- a/pkgs/development/python-modules/libgpuarray/default.nix +++ b/pkgs/development/python-modules/libgpuarray/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { postFixup = '' rm $out/lib/libgpuarray-static.a - '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.isDarwin) '' function fixRunPath { p=$(patchelf --print-rpath $1) patchelf --set-rpath "$p:$libraryPath" $1 diff --git a/pkgs/development/python-modules/libkeepass/default.nix b/pkgs/development/python-modules/libkeepass/default.nix index cfc687e37c1..aa922db9c10 100644 --- a/pkgs/development/python-modules/libkeepass/default.nix +++ b/pkgs/development/python-modules/libkeepass/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage +{ lib, fetchPypi, buildPythonPackage , lxml, pycryptodome, colorama }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/liblarch/default.nix b/pkgs/development/python-modules/liblarch/default.nix index b824dec172e..5ff8d25d54b 100644 --- a/pkgs/development/python-modules/liblarch/default.nix +++ b/pkgs/development/python-modules/liblarch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , buildPythonPackage , python diff --git a/pkgs/development/python-modules/libmr/default.nix b/pkgs/development/python-modules/libmr/default.nix index a0ef924e56e..d775cc7b245 100644 --- a/pkgs/development/python-modules/libmr/default.nix +++ b/pkgs/development/python-modules/libmr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, numpy, cython }: +{ lib, buildPythonPackage, fetchPypi, numpy, cython }: buildPythonPackage rec { pname = "libmr"; diff --git a/pkgs/development/python-modules/librosa/default.nix b/pkgs/development/python-modules/librosa/default.nix index 777eed4ddb3..ce8f2a73fa7 100644 --- a/pkgs/development/python-modules/librosa/default.nix +++ b/pkgs/development/python-modules/librosa/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , joblib diff --git a/pkgs/development/python-modules/libsavitar/default.nix b/pkgs/development/python-modules/libsavitar/default.nix index 559289987e6..7ef22e3f6ee 100644 --- a/pkgs/development/python-modules/libsavitar/default.nix +++ b/pkgs/development/python-modules/libsavitar/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, python, pythonOlder, fetchFromGitHub, cmake, sip }: +{ lib, buildPythonPackage, python, pythonOlder, fetchFromGitHub, cmake, sip }: buildPythonPackage rec { pname = "libsavitar"; diff --git a/pkgs/development/python-modules/libsoundtouch/default.nix b/pkgs/development/python-modules/libsoundtouch/default.nix index 40f1b2f8e9c..a4f98ffada8 100644 --- a/pkgs/development/python-modules/libsoundtouch/default.nix +++ b/pkgs/development/python-modules/libsoundtouch/default.nix @@ -1,6 +1,6 @@ { buildPythonPackage , fetchFromGitHub -, stdenv + , lib , pythonOlder , requests diff --git a/pkgs/development/python-modules/libthumbor/default.nix b/pkgs/development/python-modules/libthumbor/default.nix index 72e62514a52..c3d8ec9526f 100644 --- a/pkgs/development/python-modules/libthumbor/default.nix +++ b/pkgs/development/python-modules/libthumbor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , django diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix index df9728eb334..e019951f6ff 100644 --- a/pkgs/development/python-modules/libtmux/default.nix +++ b/pkgs/development/python-modules/libtmux/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, pytest }: +{ lib, fetchPypi, buildPythonPackage, pytest }: buildPythonPackage rec { pname = "libtmux"; diff --git a/pkgs/development/python-modules/libversion/default.nix b/pkgs/development/python-modules/libversion/default.nix index dafaf412f07..2edc9211d92 100644 --- a/pkgs/development/python-modules/libversion/default.nix +++ b/pkgs/development/python-modules/libversion/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pkgconfig, libversion, pythonOlder }: +{ lib, buildPythonPackage, fetchPypi, pkg-config, libversion, pythonOlder }: buildPythonPackage rec { pname = "libversion"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "1h8x9hglrqi03f461lhw3wwz23zs84dgw7hx4laxcmyrgvyzvcq1"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libversion ]; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/libvirt/5.9.0.nix b/pkgs/development/python-modules/libvirt/5.9.0.nix index c751734e153..bfc6b711ab2 100644 --- a/pkgs/development/python-modules/libvirt/5.9.0.nix +++ b/pkgs/development/python-modules/libvirt/5.9.0.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchgit, pkgconfig, lxml, libvirt, nose }: +{ lib, buildPythonPackage, fetchgit, pkg-config, lxml, libvirt, nose }: buildPythonPackage rec { pname = "libvirt"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "0qvr0s7yasswy1s5cvkm91iifk33pb8s7nbb38zznc46706b358r"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libvirt lxml ]; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix index e02b34e3816..98b8a7c9e55 100644 --- a/pkgs/development/python-modules/libvirt/default.nix +++ b/pkgs/development/python-modules/libvirt/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitLab, pkgconfig, lxml, libvirt, nose }: +{ lib, buildPythonPackage, fetchFromGitLab, pkg-config, lxml, libvirt, nose }: buildPythonPackage rec { pname = "libvirt"; - version = "6.6.0"; + version = "7.0.0"; src = assert version == libvirt.version; fetchFromGitLab { owner = "libvirt"; repo = "libvirt-python"; rev = "v${version}"; - sha256 = "0jj6b2nlx7qldwbvixz74abn3p0sq4lkf6ak74vynrv5xvlycb9v"; + sha256 = "0vdvpqiypxis8wny7q39qps050zi13l66pnpa47040q6bar0d4xw"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libvirt lxml ]; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/lightblue/default.nix b/pkgs/development/python-modules/lightblue/default.nix index 3e85a3cfaa0..feb27181244 100644 --- a/pkgs/development/python-modules/lightblue/default.nix +++ b/pkgs/development/python-modules/lightblue/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , pkgs diff --git a/pkgs/development/python-modules/lightgbm/default.nix b/pkgs/development/python-modules/lightgbm/default.nix index d7157244b6a..62686234b6e 100644 --- a/pkgs/development/python-modules/lightgbm/default.nix +++ b/pkgs/development/python-modules/lightgbm/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { # we never actually explicitly call the install command so this is the only way # to inject these options to it - however, openmp-library doesn't appear to have # any effect, so we have to inject it into NIX_LDFLAGS manually below - postPatch = stdenv.lib.optionalString stdenv.cc.isClang '' + postPatch = lib.optionalString stdenv.cc.isClang '' cat >> setup.cfg <<EOF [install] @@ -44,7 +44,7 @@ buildPythonPackage rec { postConfigure = '' export HOME=$(mktemp -d) - '' + stdenv.lib.optionalString stdenv.cc.isClang '' + '' + lib.optionalString stdenv.cc.isClang '' export NIX_LDFLAGS="$NIX_LDFLAGS -L${llvmPackages.openmp}/lib -lomp" ''; diff --git a/pkgs/development/python-modules/lightning/default.nix b/pkgs/development/python-modules/lightning/default.nix index 782bd41413e..f6d21f95dbf 100644 --- a/pkgs/development/python-modules/lightning/default.nix +++ b/pkgs/development/python-modules/lightning/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/pkgs/development/python-modules/limits/default.nix b/pkgs/development/python-modules/limits/default.nix index e1cd31867de..fc6982440d6 100644 --- a/pkgs/development/python-modules/limits/default.nix +++ b/pkgs/development/python-modules/limits/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, six }: +{ lib, fetchPypi, buildPythonPackage, six }: buildPythonPackage rec { pname = "limits"; diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix index c92e014e989..ff7ac9fb3f9 100644 --- a/pkgs/development/python-modules/limnoria/default.nix +++ b/pkgs/development/python-modules/limnoria/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/pkgs/development/python-modules/linecache2/default.nix b/pkgs/development/python-modules/linecache2/default.nix index 3945ec5001c..3c2238b0875 100644 --- a/pkgs/development/python-modules/linecache2/default.nix +++ b/pkgs/development/python-modules/linecache2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pbr diff --git a/pkgs/development/python-modules/linode-api/default.nix b/pkgs/development/python-modules/linode-api/default.nix index 4689050ba6c..7df182d94fe 100644 --- a/pkgs/development/python-modules/linode-api/default.nix +++ b/pkgs/development/python-modules/linode-api/default.nix @@ -1,4 +1,4 @@ -{ stdenv, +{ buildPythonPackage, fetchFromGitHub, pythonOlder, @@ -15,9 +15,9 @@ buildPythonPackage rec { disabled = (pythonOlder "2.7"); propagatedBuildInputs = [ requests future ] - ++ stdenv.lib.optionals (pythonOlder "3.4") [ enum34 ]; + ++ lib.optionals (pythonOlder "3.4") [ enum34 ]; - postPatch = (stdenv.lib.optionalString (!pythonOlder "3.4") '' + postPatch = (lib.optionalString (!pythonOlder "3.4") '' sed -i -e '/"enum34",/d' setup.py ''); diff --git a/pkgs/development/python-modules/linode/default.nix b/pkgs/development/python-modules/linode/default.nix index 611b91bb930..3433c0e5717 100644 --- a/pkgs/development/python-modules/linode/default.nix +++ b/pkgs/development/python-modules/linode/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , requests diff --git a/pkgs/development/python-modules/livelossplot/default.nix b/pkgs/development/python-modules/livelossplot/default.nix index bbf1b966bf1..2951ab7a427 100644 --- a/pkgs/development/python-modules/livelossplot/default.nix +++ b/pkgs/development/python-modules/livelossplot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , isPy27 diff --git a/pkgs/development/python-modules/livestreamer-curses/default.nix b/pkgs/development/python-modules/livestreamer-curses/default.nix index d76eb736ac7..5f17a700617 100644 --- a/pkgs/development/python-modules/livestreamer-curses/default.nix +++ b/pkgs/development/python-modules/livestreamer-curses/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , isPyPy diff --git a/pkgs/development/python-modules/livestreamer/default.nix b/pkgs/development/python-modules/livestreamer/default.nix index 3583d469434..184a215c407 100644 --- a/pkgs/development/python-modules/livestreamer/default.nix +++ b/pkgs/development/python-modules/livestreamer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , pkgs , isPyPy @@ -22,7 +22,7 @@ buildPythonPackage rec { buildInputs = [ pkgs.makeWrapper ]; propagatedBuildInputs = [ pkgs.rtmpdump pycrypto requests ] - ++ stdenv.lib.optionals isPy27 [ singledispatch futures ]; + ++ lib.optionals isPy27 [ singledispatch futures ]; postInstall = '' wrapProgram $out/bin/livestreamer --prefix PATH : ${pkgs.rtmpdump}/bin diff --git a/pkgs/development/python-modules/llfuse/default.nix b/pkgs/development/python-modules/llfuse/default.nix index 35235aaab40..e615582a282 100644 --- a/pkgs/development/python-modules/llfuse/default.nix +++ b/pkgs/development/python-modules/llfuse/default.nix @@ -1,11 +1,7 @@ -{ lib, stdenv, fetchPypi, fetchpatch, buildPythonPackage, pkgconfig, pytest, fuse, attr, which +{ lib, stdenv, fetchPypi, fetchpatch, buildPythonPackage, pkg-config, pytest, fuse, attr, which , contextlib2, osxfuse }: -let - inherit (stdenv.lib) optionals optionalString; -in - buildPythonPackage rec { pname = "llfuse"; version = "1.3.8"; @@ -23,17 +19,19 @@ buildPythonPackage rec { }) ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = - optionals stdenv.isLinux [ fuse ] - ++ optionals stdenv.isDarwin [ osxfuse ]; + lib.optionals stdenv.isLinux [ fuse ] + ++ lib.optionals stdenv.isDarwin [ osxfuse ]; + checkInputs = [ pytest which ] ++ - optionals stdenv.isLinux [ attr ]; + lib.optionals stdenv.isLinux [ attr ]; propagatedBuildInputs = [ contextlib2 ]; checkPhase = '' - py.test -k "not test_listdir" ${optionalString stdenv.isDarwin ''-m "not uses_fuse"''} + py.test -k "not test_listdir" ${lib.optionalString stdenv.isDarwin ''-m "not uses_fuse"''} ''; meta = with lib; { diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix index 7a7106a5eaa..02ee088782a 100644 --- a/pkgs/development/python-modules/llvmlite/default.nix +++ b/pkgs/development/python-modules/llvmlite/default.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , fetchPypi , buildPythonPackage , python @@ -21,7 +22,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ llvm ]; - propagatedBuildInputs = [ ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34; + propagatedBuildInputs = [ ] ++ lib.optional (pythonOlder "3.4") enum34; # Disable static linking # https://github.com/numba/llvmlite/issues/93 @@ -38,14 +39,14 @@ buildPythonPackage rec { ${python.executable} runtests.py ''; - __impureHostDeps = stdenv.lib.optionals stdenv.isDarwin [ "/usr/lib/libm.dylib" ]; + __impureHostDeps = lib.optionals stdenv.isDarwin [ "/usr/lib/libm.dylib" ]; passthru.llvm = llvm; - meta = { + meta = with lib; { description = "A lightweight LLVM python binding for writing JIT compilers"; homepage = "http://llvmlite.pydata.org/"; - license = stdenv.lib.licenses.bsd2; - maintainers = with stdenv.lib.maintainers; [ fridh ]; + license = licenses.bsd2; + maintainers = with maintainers; [ fridh ]; }; } diff --git a/pkgs/development/python-modules/lmdb/default.nix b/pkgs/development/python-modules/lmdb/default.nix index 20020b97ef2..f3e7a86a2aa 100644 --- a/pkgs/development/python-modules/lmdb/default.nix +++ b/pkgs/development/python-modules/lmdb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytestCheckHook diff --git a/pkgs/development/python-modules/lmtpd/default.nix b/pkgs/development/python-modules/lmtpd/default.nix index 3a1beba29d4..bb27c29173b 100644 --- a/pkgs/development/python-modules/lmtpd/default.nix +++ b/pkgs/development/python-modules/lmtpd/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, isPy3k, lib, stdenv }: +{ buildPythonPackage, fetchPypi, isPy3k, lib }: buildPythonPackage rec { pname = "lmtpd"; diff --git a/pkgs/development/python-modules/localzone/default.nix b/pkgs/development/python-modules/localzone/default.nix index 8690b1e4c91..0960a824817 100644 --- a/pkgs/development/python-modules/localzone/default.nix +++ b/pkgs/development/python-modules/localzone/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , dnspython diff --git a/pkgs/development/python-modules/locket/default.nix b/pkgs/development/python-modules/locket/default.nix index 45985a17d3e..e0be7d8f944 100644 --- a/pkgs/development/python-modules/locket/default.nix +++ b/pkgs/development/python-modules/locket/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest }: +{ lib, buildPythonPackage, fetchPypi, pytest }: buildPythonPackage rec { pname = "locket"; diff --git a/pkgs/development/python-modules/log-symbols/default.nix b/pkgs/development/python-modules/log-symbols/default.nix new file mode 100644 index 00000000000..f8cdce634ac --- /dev/null +++ b/pkgs/development/python-modules/log-symbols/default.nix @@ -0,0 +1,30 @@ +{ buildPythonPackage +, colorama +, fetchPypi +, isPy27 +, pytestCheckHook +, lib }: + +buildPythonPackage rec { + pname = "log_symbols"; + version = "0.0.14"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "0mh5d0igw33libfmbsr1ri1p1y644p36nwaa2w6kzrd8w5pvq2yg"; + }; + + propagatedBuildInputs = [ colorama ]; + + # Tests are not included in the PyPI distribution and the git repo does not have tagged releases + doCheck = false; + pythonImportsCheck = [ "log_symbols" ]; + + meta = with lib; { + description = "Colored Symbols for Various Log Levels."; + homepage = "https://github.com/manrajgrover/py-log-symbols"; + license = licenses.mit; + maintainers = with maintainers; [ urbas ]; + }; +} diff --git a/pkgs/development/python-modules/logilab/common.nix b/pkgs/development/python-modules/logilab/common.nix index b7ba746d79e..a1cb1b248ae 100644 --- a/pkgs/development/python-modules/logilab/common.nix +++ b/pkgs/development/python-modules/logilab/common.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, unittest2, six }: +{ lib, buildPythonPackage, fetchPypi, isPy27, unittest2, six }: buildPythonPackage rec { pname = "logilab-common"; diff --git a/pkgs/development/python-modules/logilab/constraint.nix b/pkgs/development/python-modules/logilab/constraint.nix index 9a071b5cf5f..bbc65a51c3c 100644 --- a/pkgs/development/python-modules/logilab/constraint.nix +++ b/pkgs/development/python-modules/logilab/constraint.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, logilab_common, six }: +{ lib, buildPythonPackage, fetchPypi, logilab_common, six }: buildPythonPackage rec { pname = "logilab-constraint"; diff --git a/pkgs/development/python-modules/logilab_astng/default.nix b/pkgs/development/python-modules/logilab_astng/default.nix index 15cea1d7baa..dac5862324a 100644 --- a/pkgs/development/python-modules/logilab_astng/default.nix +++ b/pkgs/development/python-modules/logilab_astng/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , logilab_common diff --git a/pkgs/development/python-modules/loguru/default.nix b/pkgs/development/python-modules/loguru/default.nix index da91d9eeddd..458d2ca5032 100644 --- a/pkgs/development/python-modules/loguru/default.nix +++ b/pkgs/development/python-modules/loguru/default.nix @@ -12,10 +12,10 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook colorama ]; - pytestFlagsArray = stdenv.lib.optionals stdenv.isDarwin [ "--ignore=tests/test_multiprocessing.py" ]; + pytestFlagsArray = lib.optionals stdenv.isDarwin [ "--ignore=tests/test_multiprocessing.py" ]; disabledTests = [ "test_time_rotation_reopening" "test_file_buffering" ] - ++ stdenv.lib.optionals stdenv.isDarwin [ "test_rotation_and_retention" "test_rotation_and_retention_timed_file" "test_renaming" "test_await_complete_inheritance" ]; + ++ lib.optionals stdenv.isDarwin [ "test_rotation_and_retention" "test_rotation_and_retention_timed_file" "test_renaming" "test_await_complete_inheritance" ]; meta = with lib; { homepage = "https://github.com/Delgan/loguru"; diff --git a/pkgs/development/python-modules/logutils/default.nix b/pkgs/development/python-modules/logutils/default.nix index d49667d7cc8..0a49262647e 100644 --- a/pkgs/development/python-modules/logutils/default.nix +++ b/pkgs/development/python-modules/logutils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/lpod/default.nix b/pkgs/development/python-modules/lpod/default.nix index 67b48cecd62..9c719d234f8 100644 --- a/pkgs/development/python-modules/lpod/default.nix +++ b/pkgs/development/python-modules/lpod/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , lxml diff --git a/pkgs/development/python-modules/lsi/default.nix b/pkgs/development/python-modules/lsi/default.nix index 0fca2f7b372..b570a62d9e3 100644 --- a/pkgs/development/python-modules/lsi/default.nix +++ b/pkgs/development/python-modules/lsi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , isPy3k , fetchPypi diff --git a/pkgs/development/python-modules/lxc/default.nix b/pkgs/development/python-modules/lxc/default.nix index a20db9dd503..4534e0a01ef 100644 --- a/pkgs/development/python-modules/lxc/default.nix +++ b/pkgs/development/python-modules/lxc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , isPy3k diff --git a/pkgs/development/python-modules/lyricwikia/default.nix b/pkgs/development/python-modules/lyricwikia/default.nix index 585c38ab33e..a5ea55c39cf 100644 --- a/pkgs/development/python-modules/lyricwikia/default.nix +++ b/pkgs/development/python-modules/lyricwikia/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, pytestrunner, six, beautifulsoup4, requests, }: +{ lib, fetchPypi, buildPythonPackage, pytestrunner, six, beautifulsoup4, requests, }: buildPythonPackage rec { pname = "lyricwikia"; version = "0.1.11"; diff --git a/pkgs/development/python-modules/m2crypto/default.nix b/pkgs/development/python-modules/m2crypto/default.nix index af07be47dcd..8e214540b12 100644 --- a/pkgs/development/python-modules/m2crypto/default.nix +++ b/pkgs/development/python-modules/m2crypto/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , fetchpatch , buildPythonPackage , fetchPypi diff --git a/pkgs/development/python-modules/m2r/default.nix b/pkgs/development/python-modules/m2r/default.nix index 149e4d6ed56..35331c14b08 100644 --- a/pkgs/development/python-modules/m2r/default.nix +++ b/pkgs/development/python-modules/m2r/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, +{ lib, buildPythonPackage, fetchPypi, mistune, docutils } : buildPythonPackage rec { pname = "m2r"; diff --git a/pkgs/development/python-modules/maestral/default.nix b/pkgs/development/python-modules/maestral/default.nix index b24ebbcc9eb..990545e4173 100644 --- a/pkgs/development/python-modules/maestral/default.nix +++ b/pkgs/development/python-modules/maestral/default.nix @@ -38,17 +38,17 @@ buildPythonPackage rec { sqlalchemy survey watchdog - ] ++ stdenv.lib.optionals (pythonOlder "3.8") [ + ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata - ] ++ stdenv.lib.optionals (pythonOlder "3.9") [ + ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources - ] ++ stdenv.lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ dbus-next ]; makeWrapperArgs = [ # Add the installed directories to the python path so the daemon can find them - "--prefix" "PYTHONPATH" ":" "${stdenv.lib.concatStringsSep ":" (map (p: p + "/lib/${python.libPrefix}/site-packages") (python.pkgs.requiredPythonModules propagatedBuildInputs))}" + "--prefix" "PYTHONPATH" ":" "${lib.concatStringsSep ":" (map (p: p + "/lib/${python.libPrefix}/site-packages") (python.pkgs.requiredPythonModules propagatedBuildInputs))}" "--prefix" "PYTHONPATH" ":" "$out/lib/${python.libPrefix}/site-packages" ]; diff --git a/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix b/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix index 14ae268c03a..dfd16c04a6f 100644 --- a/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix +++ b/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, six, attrs, twisted, pyopenssl, service-identity, autobahn, treq, mock, pytest }: +{ lib, buildPythonPackage, fetchPypi, isPy27, six, attrs, twisted, pyopenssl, service-identity, autobahn, treq, mock, pytest }: buildPythonPackage rec { version = "0.4.1"; diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix index c85c7e2307f..0d8b3a1ec07 100644 --- a/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/pkgs/development/python-modules/magic-wormhole/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ spake2 pynacl six attrs twisted autobahn automat hkdf tqdm click humanize txtorcon ]; checkInputs = [ mock magic-wormhole-transit-relay magic-wormhole-mailbox-server ]; - postPatch = stdenv.lib.optionalString stdenv.isLinux '' + postPatch = lib.optionalString stdenv.isLinux '' sed -i -e "s|'ifconfig'|'${nettools}/bin/ifconfig'|" src/wormhole/ipaddrs.py ''; diff --git a/pkgs/development/python-modules/mailcap-fix/default.nix b/pkgs/development/python-modules/mailcap-fix/default.nix index 08991edce4a..da735d9d048 100644 --- a/pkgs/development/python-modules/mailcap-fix/default.nix +++ b/pkgs/development/python-modules/mailcap-fix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy36 diff --git a/pkgs/development/python-modules/mailchimp/default.nix b/pkgs/development/python-modules/mailchimp/default.nix index 0032caa7a0a..91563b7fe7e 100644 --- a/pkgs/development/python-modules/mailchimp/default.nix +++ b/pkgs/development/python-modules/mailchimp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , docopt diff --git a/pkgs/development/python-modules/mailman-hyperkitty/default.nix b/pkgs/development/python-modules/mailman-hyperkitty/default.nix index 8ab80e33717..1d3b69f6bf2 100644 --- a/pkgs/development/python-modules/mailman-hyperkitty/default.nix +++ b/pkgs/development/python-modules/mailman-hyperkitty/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, mailman, mock }: +{ lib, buildPythonPackage, fetchPypi, mailman, mock }: buildPythonPackage rec { pname = "mailman-hyperkitty"; diff --git a/pkgs/development/python-modules/mailman-rss/default.nix b/pkgs/development/python-modules/mailman-rss/default.nix index c47d300d850..e2043b0d6d4 100644 --- a/pkgs/development/python-modules/mailman-rss/default.nix +++ b/pkgs/development/python-modules/mailman-rss/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, withTwitter ? false}: +{ lib, python3Packages, withTwitter ? false}: python3Packages.buildPythonApplication rec { pname = "mailman-rss"; @@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec { }; propagatedBuildInputs = with python3Packages; [ dateutil future requests beautifulsoup4 ] - ++ stdenv.lib.optional withTwitter python3Packages.twitter + ++ lib.optional withTwitter python3Packages.twitter ; # No tests in Pypi Tarball diff --git a/pkgs/development/python-modules/mailmanclient/default.nix b/pkgs/development/python-modules/mailmanclient/default.nix index 280ee95b830..edc19f66f71 100644 --- a/pkgs/development/python-modules/mailmanclient/default.nix +++ b/pkgs/development/python-modules/mailmanclient/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, six, httplib2, requests }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, six, httplib2, requests }: buildPythonPackage rec { pname = "mailmanclient"; diff --git a/pkgs/development/python-modules/manuel/default.nix b/pkgs/development/python-modules/manuel/default.nix index 59243783ecf..2f14ed863c3 100644 --- a/pkgs/development/python-modules/manuel/default.nix +++ b/pkgs/development/python-modules/manuel/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/pkgs/development/python-modules/mapsplotlib/default.nix b/pkgs/development/python-modules/mapsplotlib/default.nix index 54d0ade40f3..28a6e9c0c5c 100644 --- a/pkgs/development/python-modules/mapsplotlib/default.nix +++ b/pkgs/development/python-modules/mapsplotlib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , isPy3k , fetchPypi diff --git a/pkgs/development/python-modules/marionette-harness/mozinfo.nix b/pkgs/development/python-modules/marionette-harness/mozinfo.nix index b7d91cc16f5..99f3afc31f6 100644 --- a/pkgs/development/python-modules/marionette-harness/mozinfo.nix +++ b/pkgs/development/python-modules/marionette-harness/mozinfo.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/marisa/default.nix b/pkgs/development/python-modules/marisa/default.nix index a30f7062df0..93a4ccb959f 100644 --- a/pkgs/development/python-modules/marisa/default.nix +++ b/pkgs/development/python-modules/marisa/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, marisa, swig +{ lib, buildPythonPackage, fetchFromGitHub, marisa, swig , isPy3k }: diff --git a/pkgs/development/python-modules/markdown-macros/default.nix b/pkgs/development/python-modules/markdown-macros/default.nix index e248bfe60cc..e95cbe3c4c1 100644 --- a/pkgs/development/python-modules/markdown-macros/default.nix +++ b/pkgs/development/python-modules/markdown-macros/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , fetchpatch diff --git a/pkgs/development/python-modules/markdown2/default.nix b/pkgs/development/python-modules/markdown2/default.nix index 2f929012df8..b1513d06e58 100644 --- a/pkgs/development/python-modules/markdown2/default.nix +++ b/pkgs/development/python-modules/markdown2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "markdown2"; diff --git a/pkgs/development/python-modules/markdownsuperscript/default.nix b/pkgs/development/python-modules/markdownsuperscript/default.nix index 6c2e6ab1b63..94cfb637a15 100644 --- a/pkgs/development/python-modules/markdownsuperscript/default.nix +++ b/pkgs/development/python-modules/markdownsuperscript/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, markdown, +{ lib, buildPythonPackage, fetchPypi, markdown, pytest, pytestrunner, pytestcov, coverage }: buildPythonPackage rec { @@ -22,10 +22,10 @@ buildPythonPackage rec { checkInputs = [ pytest pytestrunner pytestcov coverage ]; - meta = { + meta = with lib; { description = "An extension to the Python Markdown package enabling superscript text"; homepage = "https://github.com/jambonrose/markdown_superscript_extension"; - license = stdenv.lib.licenses.bsd2; + license = licenses.bsd2; broken = true; # unmaintained in nixpkgs, barely maintained in pypi, added 2020-11-29 }; } diff --git a/pkgs/development/python-modules/markerlib/default.nix b/pkgs/development/python-modules/markerlib/default.nix index d039198b393..7762a970fb1 100644 --- a/pkgs/development/python-modules/markerlib/default.nix +++ b/pkgs/development/python-modules/markerlib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , setuptools diff --git a/pkgs/development/python-modules/markupsafe/default.nix b/pkgs/development/python-modules/markupsafe/default.nix index 6a6e06cd317..ae0878c7a97 100644 --- a/pkgs/development/python-modules/markupsafe/default.nix +++ b/pkgs/development/python-modules/markupsafe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/matplotlib/2.nix b/pkgs/development/python-modules/matplotlib/2.nix index 17a9fb246bd..2c929d9a694 100644 --- a/pkgs/development/python-modules/matplotlib/2.nix +++ b/pkgs/development/python-modules/matplotlib/2.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchPypi, python, buildPythonPackage, pycairo, backports_functools_lru_cache , which, cycler, dateutil, nose, numpy, pyparsing, sphinx, tornado, kiwisolver -, freetype, libpng, pkgconfig, mock, pytz, pygobject3, gobject-introspection, functools32, subprocess32 +, freetype, libpng, pkg-config, mock, pytz, pygobject3, gobject-introspection, functools32, subprocess32 , fetchpatch , enableGhostscript ? false, ghostscript ? null, gtk3 , enableGtk3 ? false, cairo @@ -39,20 +39,20 @@ buildPythonPackage rec { XDG_RUNTIME_DIR = "/tmp"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ which sphinx ] - ++ stdenv.lib.optional enableGhostscript ghostscript - ++ stdenv.lib.optional stdenv.isDarwin [ Cocoa ]; + ++ lib.optional enableGhostscript ghostscript + ++ lib.optional stdenv.isDarwin [ Cocoa ]; propagatedBuildInputs = [ cycler dateutil nose numpy pyparsing tornado freetype kiwisolver libpng mock pytz ] - ++ stdenv.lib.optional (pythonOlder "3.3") backports_functools_lru_cache - ++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ] - ++ stdenv.lib.optionals enableTk [ tcl tk tkinter libX11 ] - ++ stdenv.lib.optionals enableQt [ pyqt4 ] - ++ stdenv.lib.optionals python.isPy2 [ functools32 subprocess32 ]; + ++ lib.optional (pythonOlder "3.3") backports_functools_lru_cache + ++ lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ] + ++ lib.optionals enableTk [ tcl tk tkinter libX11 ] + ++ lib.optionals enableQt [ pyqt4 ] + ++ lib.optionals python.isPy2 [ functools32 subprocess32 ]; setup_cfg = ./setup.cfg; preBuild = '' @@ -67,10 +67,9 @@ buildPythonPackage rec { # script. postPatch = let - inherit (stdenv.lib.strings) substring; - tcl_tk_cache = ''"${tk}/lib", "${tcl}/lib", "${substring 0 3 tk.version}"''; + tcl_tk_cache = ''"${tk}/lib", "${tcl}/lib", "${lib.strings.substring 0 3 tk.version}"''; in - stdenv.lib.optionalString enableTk + lib.optionalString enableTk "sed -i '/self.tcl_tk_cache = None/s|None|${tcl_tk_cache}|' setupext.py"; # Matplotlib needs to be built against a specific version of freetype in diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index f075ba47ce8..bf21422b772 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchPypi, python, buildPythonPackage, isPy3k, pycairo, backports_functools_lru_cache , which, cycler, dateutil, nose, numpy, pyparsing, sphinx, tornado, kiwisolver -, freetype, libpng, pkgconfig, mock, pytz, pygobject3, gobject-introspection +, freetype, libpng, pkg-config, mock, pytz, pygobject3, gobject-introspection , certifi, pillow , enableGhostscript ? true, ghostscript ? null, gtk3 , enableGtk3 ? false, cairo @@ -32,18 +32,18 @@ buildPythonPackage rec { XDG_RUNTIME_DIR = "/tmp"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ which sphinx ] - ++ stdenv.lib.optional enableGhostscript ghostscript - ++ stdenv.lib.optional stdenv.isDarwin [ Cocoa ]; + ++ lib.optional enableGhostscript ghostscript + ++ lib.optional stdenv.isDarwin [ Cocoa ]; propagatedBuildInputs = [ cycler dateutil numpy pyparsing tornado freetype kiwisolver certifi libpng mock pytz pillow ] - ++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ] - ++ stdenv.lib.optionals enableTk [ tcl tk tkinter libX11 ] - ++ stdenv.lib.optionals enableQt [ pyqt5 ]; + ++ lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ] + ++ lib.optionals enableTk [ tcl tk tkinter libX11 ] + ++ lib.optionals enableQt [ pyqt5 ]; setup_cfg = if stdenv.isDarwin then ./setup-darwin.cfg else ./setup.cfg; preBuild = '' @@ -58,10 +58,9 @@ buildPythonPackage rec { # script. postPatch = let - inherit (stdenv.lib.strings) substring; - tcl_tk_cache = ''"${tk}/lib", "${tcl}/lib", "${substring 0 3 tk.version}"''; + tcl_tk_cache = ''"${tk}/lib", "${tcl}/lib", "${lib.strings.substring 0 3 tk.version}"''; in - stdenv.lib.optionalString enableTk + lib.optionalString enableTk "sed -i '/self.tcl_tk_cache = None/s|None|${tcl_tk_cache}|' setupext.py"; # Matplotlib needs to be built against a specific version of freetype in diff --git a/pkgs/development/python-modules/matrix-client/default.nix b/pkgs/development/python-modules/matrix-client/default.nix index 34c99a1ebe1..b8439a0c23d 100644 --- a/pkgs/development/python-modules/matrix-client/default.nix +++ b/pkgs/development/python-modules/matrix-client/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , requests diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix index 0944d5fa4cf..8c77cffc4d0 100644 --- a/pkgs/development/python-modules/mautrix/default.nix +++ b/pkgs/development/python-modules/mautrix/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "mautrix"; - version = "0.8.6"; + version = "0.8.11"; src = fetchPypi { inherit pname version; - sha256 = "e28d89cb8297ec36d78ef79507613c45ab3ab0bc709f1944ca5be349797f8f6b"; + sha256 = "d1958b9bd8c2631ccd6ebd4a54e35e5190dae2c0daeb786aec02f263b2c2e0b1"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/maya/default.nix b/pkgs/development/python-modules/maya/default.nix index 9cd1019a030..4a751a188c2 100644 --- a/pkgs/development/python-modules/maya/default.nix +++ b/pkgs/development/python-modules/maya/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, fetchpatch, buildPythonPackage +{ lib, fetchPypi, fetchpatch, buildPythonPackage , dateparser, humanize, pendulum, ruamel_yaml, tzlocal }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/mccabe/default.nix b/pkgs/development/python-modules/mccabe/default.nix index 2886a436a00..03343aec16e 100644 --- a/pkgs/development/python-modules/mccabe/default.nix +++ b/pkgs/development/python-modules/mccabe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, pytestrunner }: +{ lib, buildPythonPackage, fetchPypi, pytest, pytestrunner }: buildPythonPackage rec { pname = "mccabe"; diff --git a/pkgs/development/python-modules/mdp/default.nix b/pkgs/development/python-modules/mdp/default.nix index 5313cd8e89a..55a440e6808 100644 --- a/pkgs/development/python-modules/mdp/default.nix +++ b/pkgs/development/python-modules/mdp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, future, numpy }: +{ lib, buildPythonPackage, fetchPypi, pytest, future, numpy }: buildPythonPackage rec { pname = "MDP"; diff --git a/pkgs/development/python-modules/mechanize/default.nix b/pkgs/development/python-modules/mechanize/default.nix index e2d2269a43c..7eb119fa955 100644 --- a/pkgs/development/python-modules/mechanize/default.nix +++ b/pkgs/development/python-modules/mechanize/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , html5lib diff --git a/pkgs/development/python-modules/meinheld/default.nix b/pkgs/development/python-modules/meinheld/default.nix index ce7f2316800..9cf02e4c886 100644 --- a/pkgs/development/python-modules/meinheld/default.nix +++ b/pkgs/development/python-modules/meinheld/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, greenlet }: +{ lib, fetchPypi, buildPythonPackage, greenlet }: buildPythonPackage rec { pname = "meinheld"; diff --git a/pkgs/development/python-modules/meld3/default.nix b/pkgs/development/python-modules/meld3/default.nix index 8871bfdda46..a751dbeac3f 100644 --- a/pkgs/development/python-modules/meld3/default.nix +++ b/pkgs/development/python-modules/meld3/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/meliae/default.nix b/pkgs/development/python-modules/meliae/default.nix index d602e3d94fd..4c6aa746448 100644 --- a/pkgs/development/python-modules/meliae/default.nix +++ b/pkgs/development/python-modules/meliae/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , cython diff --git a/pkgs/development/python-modules/memcached/default.nix b/pkgs/development/python-modules/memcached/default.nix index b75bd31361d..02f4bc3aa44 100644 --- a/pkgs/development/python-modules/memcached/default.nix +++ b/pkgs/development/python-modules/memcached/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , fetchPypi diff --git a/pkgs/development/python-modules/memory_profiler/default.nix b/pkgs/development/python-modules/memory_profiler/default.nix index 28ff6b7c5e3..994863dbbc0 100644 --- a/pkgs/development/python-modules/memory_profiler/default.nix +++ b/pkgs/development/python-modules/memory_profiler/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , python }: diff --git a/pkgs/development/python-modules/mergedeep/default.nix b/pkgs/development/python-modules/mergedeep/default.nix index 13aadbc9952..cdd19beb68d 100644 --- a/pkgs/development/python-modules/mergedeep/default.nix +++ b/pkgs/development/python-modules/mergedeep/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, buildPythonPackage, isPy27, fetchFromGitHub, pytest }: +{ lib, buildPythonPackage, isPy27, fetchFromGitHub, pytest }: buildPythonPackage rec { pname = "mergedeep"; - version = "1.3.0"; + version = "1.3.1"; disabled = isPy27; # PyPI tarball doesn't include tests directory @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "clarketm"; repo = "mergedeep"; rev = "v${version}"; - sha256 = "1a0y26a04limiggjwqyyqpryxiylbqya74nq1bij75zhz42sa02b"; + sha256 = "1ryccb64hg438y1wsjlfp4ciq05q4c6khwhllwdnndm8cbkbrgph"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/mesa/default.nix b/pkgs/development/python-modules/mesa/default.nix index 5b97f972dad..aaf13a76530 100644 --- a/pkgs/development/python-modules/mesa/default.nix +++ b/pkgs/development/python-modules/mesa/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy27 +{ lib, buildPythonPackage, fetchFromGitHub, isPy27 , cookiecutter, networkx , pandas, tornado, tqdm , pytest }: diff --git a/pkgs/development/python-modules/metaphone/default.nix b/pkgs/development/python-modules/metaphone/default.nix index 1c8557f15c4..d6b0c30c504 100644 --- a/pkgs/development/python-modules/metaphone/default.nix +++ b/pkgs/development/python-modules/metaphone/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, isPy3k, fetchPypi, nose }: +{ lib, buildPythonPackage, isPy3k, fetchPypi, nose }: buildPythonPackage rec { pname = "metaphone"; diff --git a/pkgs/development/python-modules/mezzanine/default.nix b/pkgs/development/python-modules/mezzanine/default.nix index d27fd862045..c157cd2a6be 100644 --- a/pkgs/development/python-modules/mezzanine/default.nix +++ b/pkgs/development/python-modules/mezzanine/default.nix @@ -1,5 +1,5 @@ { lib -, stdenv + , buildPythonPackage , fetchPypi , isPyPy @@ -28,8 +28,8 @@ buildPythonPackage rec { sha256 = "42c7909953cc5aea91921b47d804b61e14893bf48a2a476ce49a96559a0fa1d3"; }; - disabled = isPyPy || stdenv.lib.versionOlder django.version "1.11" - || stdenv.lib.versionAtLeast django.version "2.0"; + disabled = isPyPy || lib.versionOlder django.version "1.11" + || lib.versionAtLeast django.version "2.0"; buildInputs = [ pyflakes pep8 ]; propagatedBuildInputs = [ django django_contrib_comments filebrowser_safe grappelli_safe bleach tzlocal beautifulsoup4 requests requests_oauthlib future pillow chardet ]; diff --git a/pkgs/development/python-modules/micawber/default.nix b/pkgs/development/python-modules/micawber/default.nix index 9d31dd378ac..73f50d32a5f 100644 --- a/pkgs/development/python-modules/micawber/default.nix +++ b/pkgs/development/python-modules/micawber/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, beautifulsoup4 }: +{ lib, buildPythonPackage, fetchPypi, beautifulsoup4 }: buildPythonPackage rec { pname = "micawber"; diff --git a/pkgs/development/python-modules/midiutil/default.nix b/pkgs/development/python-modules/midiutil/default.nix index 5ac8d917d75..d1cae8c7804 100644 --- a/pkgs/development/python-modules/midiutil/default.nix +++ b/pkgs/development/python-modules/midiutil/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "MIDIUtil"; diff --git a/pkgs/development/python-modules/milc/default.nix b/pkgs/development/python-modules/milc/default.nix index dc824d56547..998f0a58b2b 100644 --- a/pkgs/development/python-modules/milc/default.nix +++ b/pkgs/development/python-modules/milc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , appdirs diff --git a/pkgs/development/python-modules/minimock/default.nix b/pkgs/development/python-modules/minimock/default.nix index f154eabb744..faa836b71d7 100644 --- a/pkgs/development/python-modules/minimock/default.nix +++ b/pkgs/development/python-modules/minimock/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , nose diff --git a/pkgs/development/python-modules/miniupnpc/default.nix b/pkgs/development/python-modules/miniupnpc/default.nix index 7178405ab74..fe7a9f69691 100644 --- a/pkgs/development/python-modules/miniupnpc/default.nix +++ b/pkgs/development/python-modules/miniupnpc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "miniupnpc"; diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix index 89cc8f99146..5ffde397337 100644 --- a/pkgs/development/python-modules/mlflow/default.nix +++ b/pkgs/development/python-modules/mlflow/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27 +{ lib, buildPythonPackage, fetchPypi, isPy27 , alembic , click , cloudpickle diff --git a/pkgs/development/python-modules/mlrose/default.nix b/pkgs/development/python-modules/mlrose/default.nix index c3c7c55f292..40e3b6ce095 100644 --- a/pkgs/development/python-modules/mlrose/default.nix +++ b/pkgs/development/python-modules/mlrose/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, isPy27, buildPythonPackage, fetchPypi, scikitlearn }: +{ lib, isPy27, buildPythonPackage, fetchPypi, scikitlearn }: buildPythonPackage rec { pname = "mlrose"; diff --git a/pkgs/development/python-modules/mlxtend/default.nix b/pkgs/development/python-modules/mlxtend/default.nix index 94af156d9af..35f55bb2793 100644 --- a/pkgs/development/python-modules/mlxtend/default.nix +++ b/pkgs/development/python-modules/mlxtend/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , isPy27 diff --git a/pkgs/development/python-modules/mmh3/default.nix b/pkgs/development/python-modules/mmh3/default.nix index 8ac24188003..cd2b01d0578 100644 --- a/pkgs/development/python-modules/mmh3/default.nix +++ b/pkgs/development/python-modules/mmh3/default.nix @@ -18,6 +18,5 @@ buildPythonPackage rec { description = "Python wrapper for MurmurHash3, a set of fast and robust hash functions"; homepage = "https://pypi.org/project/mmh3/"; license = licenses.cc0; - maintainers = [ maintainers.danieldk ]; }; } diff --git a/pkgs/development/python-modules/mmpython/default.nix b/pkgs/development/python-modules/mmpython/default.nix index e40fc197a5b..64c270ca072 100644 --- a/pkgs/development/python-modules/mmpython/default.nix +++ b/pkgs/development/python-modules/mmpython/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , isPyPy diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix index f7e97bb955c..2102718ab6e 100644 --- a/pkgs/development/python-modules/mocket/default.nix +++ b/pkgs/development/python-modules/mocket/default.nix @@ -5,23 +5,25 @@ , python , python_magic , six -, urllib3 }: +, urllib3 +, pytestCheckHook +, pytest-mock +, aiohttp +, gevent +, redis +, requests +, sure +}: buildPythonPackage rec { pname = "mocket"; - version = "3.9.35"; + version = "3.9.39"; src = fetchPypi { inherit pname version; - sha256 = "d822a2adfd8e028a2856785fbfe78e7dd8c7a3b623516298aef6d42a4c9149d1"; + sha256 = "1mbcgfy1vfwwzn54vkq8xmfzdyc28brfpqk4d55r3a6abwwsn6a4"; }; - patchPhase = '' - sed -iE "s,python-magic==.*,python-magic," requirements.txt - sed -iE "s,urllib3==.*,urllib3," requirements.txt - substituteInPlace setup.py --replace 'setup_requires=["pipenv"]' "setup_requires=[]" - ''; - propagatedBuildInputs = [ decorator http-parser @@ -30,8 +32,36 @@ buildPythonPackage rec { six ] ++ lib.optionals (isPy27) [ six ]; - # Pypi has no runtests.py, github has no requirements.txt. No way to test, no way to install. - doCheck = false; + checkInputs = [ + pytestCheckHook + pytest-mock + aiohttp + gevent + redis + requests + sure + ]; + + pytestFlagsArray = [ + "--ignore=tests/main/test_pook.py" # pook is not packaged + "--ignore=tests/main/test_redis.py" # requires a live redis instance + ] ++ lib.optionals (pythonOlder "3.8") [ + # uses IsolatedAsyncioTestCase which is only available >= 3.8 + "--ignore=tests/tests38/test_http_aiohttp.py" + ]; + + disabledTests = [ + # tests that require network access (like DNS lookups) + "test_truesendall" + "test_truesendall_with_chunk_recording" + "test_truesendall_with_gzip_recording" + "test_truesendall_with_recording" + "test_wrongpath_truesendall" + "test_truesendall_with_dump_from_recording" + "test_truesendall_with_recording_https" + "test_truesendall_after_mocket_session" + "test_real_request_session" + ]; pythonImportsCheck = [ "mocket" ]; diff --git a/pkgs/development/python-modules/mockito/default.nix b/pkgs/development/python-modules/mockito/default.nix index 534d6674a8d..69cdf7b56b0 100644 --- a/pkgs/development/python-modules/mockito/default.nix +++ b/pkgs/development/python-modules/mockito/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, funcsigs, pytest, numpy }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, funcsigs, pytest, numpy }: buildPythonPackage rec { version = "1.2.2"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "d6b3aca6cdb92bbd47e19ebdb1a0b84ef23ab874eae5c6d505323c8657257c06"; }; - propagatedBuildInputs = stdenv.lib.optionals (!isPy3k) [ funcsigs ]; + propagatedBuildInputs = lib.optionals (!isPy3k) [ funcsigs ]; checkInputs = [ pytest numpy ]; # tests are no longer packaged in pypi tarball diff --git a/pkgs/development/python-modules/modestmaps/default.nix b/pkgs/development/python-modules/modestmaps/default.nix index 19316c26802..202589b7435 100644 --- a/pkgs/development/python-modules/modestmaps/default.nix +++ b/pkgs/development/python-modules/modestmaps/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pillow @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "A library for building interactive maps"; homepage = "http://modestmaps.com"; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/mongodict/default.nix b/pkgs/development/python-modules/mongodict/default.nix index 467093e84ce..c2fbd6a7ad1 100644 --- a/pkgs/development/python-modules/mongodict/default.nix +++ b/pkgs/development/python-modules/mongodict/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pymongo diff --git a/pkgs/development/python-modules/mongoengine/default.nix b/pkgs/development/python-modules/mongoengine/default.nix index 3ac24f7430d..c8969d9e2d4 100644 --- a/pkgs/development/python-modules/mongoengine/default.nix +++ b/pkgs/development/python-modules/mongoengine/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "mongoengine"; - version = "0.21.0"; + version = "0.22.0"; disabled = isPy27; src = fetchFromGitHub { owner = "MongoEngine"; repo = pname; rev = "v${version}"; - sha256 = "02amfdirdw3nc0kgiyax7yndk5b65g83kbjvwwxbgnlcrb9vjzcd"; + sha256 = "14n9rl8w3i1fq96f3jzsg7gy331d7fmrapva6m38ih53rnf38bdf"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/monotonic/default.nix b/pkgs/development/python-modules/monotonic/default.nix index 7dffd328442..e93bf206eda 100644 --- a/pkgs/development/python-modules/monotonic/default.nix +++ b/pkgs/development/python-modules/monotonic/default.nix @@ -12,9 +12,9 @@ buildPythonPackage rec { sha256 = "23953d55076df038541e648a53676fb24980f7a1be290cdda21300b3bc21dfb0"; }; - __propagatedImpureHostDeps = stdenv.lib.optional stdenv.isDarwin "/usr/lib/libc.dylib"; + __propagatedImpureHostDeps = lib.optional stdenv.isDarwin "/usr/lib/libc.dylib"; - patchPhase = stdenv.lib.optionalString stdenv.isLinux '' + patchPhase = lib.optionalString stdenv.isLinux '' substituteInPlace monotonic.py --replace \ "ctypes.util.find_library('c')" "'${stdenv.glibc.out}/lib/libc.so.6'" ''; diff --git a/pkgs/development/python-modules/moretools/default.nix b/pkgs/development/python-modules/moretools/default.nix index d39f67a7311..5a96682accd 100644 --- a/pkgs/development/python-modules/moretools/default.nix +++ b/pkgs/development/python-modules/moretools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , six, pathpy, zetup, pytest , decorator }: diff --git a/pkgs/development/python-modules/moviepy/default.nix b/pkgs/development/python-modules/moviepy/default.nix index 13f8d5884cf..4cd1fec3d8b 100644 --- a/pkgs/development/python-modules/moviepy/default.nix +++ b/pkgs/development/python-modules/moviepy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonAtLeast @@ -39,7 +39,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy decorator imageio imageio-ffmpeg tqdm requests proglog - ] ++ (stdenv.lib.optionals advancedProcessing [ + ] ++ (lib.optionals advancedProcessing [ opencv3 scikitimage scikitlearn scipy matplotlib youtube-dl ]); diff --git a/pkgs/development/python-modules/mox/default.nix b/pkgs/development/python-modules/mox/default.nix index 94d4791224d..380dbe594a5 100644 --- a/pkgs/development/python-modules/mox/default.nix +++ b/pkgs/development/python-modules/mox/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl }: diff --git a/pkgs/development/python-modules/mox3/default.nix b/pkgs/development/python-modules/mox3/default.nix index 77a02ae8a73..1883c9c8c01 100644 --- a/pkgs/development/python-modules/mox3/default.nix +++ b/pkgs/development/python-modules/mox3/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonOlder diff --git a/pkgs/development/python-modules/mozsvc/default.nix b/pkgs/development/python-modules/mozsvc/default.nix index 55afb1773fe..0caa347edac 100644 --- a/pkgs/development/python-modules/mozsvc/default.nix +++ b/pkgs/development/python-modules/mozsvc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , pyramid diff --git a/pkgs/development/python-modules/mpd/default.nix b/pkgs/development/python-modules/mpd/default.nix index 212e6b5f13c..b535144fac9 100644 --- a/pkgs/development/python-modules/mpd/default.nix +++ b/pkgs/development/python-modules/mpd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/mpd2/default.nix b/pkgs/development/python-modules/mpd2/default.nix index f842826d20b..031f26c4997 100644 --- a/pkgs/development/python-modules/mpd2/default.nix +++ b/pkgs/development/python-modules/mpd2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonOlder @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "python-mpd2"; - version = "3.0.1"; + version = "3.0.3"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0fxssbmnv44m03shjyvbqslc69b0160702j2s0flgvdxjggrnbjj"; + sha256 = "1ikvn2qv6cnbjscpbk6hhsqg34h832mxgg6hp1mf4d8d6nwdx4sn"; }; buildInputs = [ mock ]; @@ -27,7 +27,7 @@ buildPythonPackage rec { description = "A Python client module for the Music Player Daemon"; homepage = "https://github.com/Mic92/python-mpd2"; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ rvl mic92 ]; + maintainers = with maintainers; [ rvl mic92 hexa ]; }; } diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix index c16c4719a34..058133665f4 100644 --- a/pkgs/development/python-modules/mpi4py/default.nix +++ b/pkgs/development/python-modules/mpi4py/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, python, buildPythonPackage, mpi, openssh }: +{ lib, fetchPypi, python, buildPythonPackage, mpi, openssh }: buildPythonPackage rec { pname = "mpi4py"; @@ -43,10 +43,9 @@ buildPythonPackage rec { nativeBuildInputs = [ mpi openssh ]; - meta = { - description = - "Python bindings for the Message Passing Interface standard"; + meta = with lib; { + description = "Python bindings for the Message Passing Interface standard"; homepage = "https://bitbucket.org/mpi4py/mpi4py/"; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/mpmath/default.nix b/pkgs/development/python-modules/mpmath/default.nix index 86d55b34f04..42de3d2da9a 100644 --- a/pkgs/development/python-modules/mpmath/default.nix +++ b/pkgs/development/python-modules/mpmath/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = "http://mpmath.org/"; + homepage = "https://mpmath.org/"; description = "A pure-Python library for multiprecision floating arithmetic"; license = licenses.bsd3; maintainers = with maintainers; [ lovek323 ]; diff --git a/pkgs/development/python-modules/mrbob/default.nix b/pkgs/development/python-modules/mrbob/default.nix index 64d0ce13a86..8921719a3ae 100644 --- a/pkgs/development/python-modules/mrbob/default.nix +++ b/pkgs/development/python-modules/mrbob/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, lib, stdenv, glibcLocales, mock, nose, isPy3k, jinja2, six +{ buildPythonPackage, lib, glibcLocales, mock, nose, isPy3k, jinja2, six , fetchPypi }: diff --git a/pkgs/development/python-modules/msgpack-numpy/default.nix b/pkgs/development/python-modules/msgpack-numpy/default.nix index 56bfa06a628..8b50e04d428 100644 --- a/pkgs/development/python-modules/msgpack-numpy/default.nix +++ b/pkgs/development/python-modules/msgpack-numpy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , cython diff --git a/pkgs/development/python-modules/msldap/default.nix b/pkgs/development/python-modules/msldap/default.nix index 3a5546c0afe..ea2ae26c96b 100644 --- a/pkgs/development/python-modules/msldap/default.nix +++ b/pkgs/development/python-modules/msldap/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "msldap"; - version = "0.3.22"; + version = "0.3.24"; src = fetchPypi { inherit pname version; - sha256 = "1ivq56953skql8f255nqx2sg4mm0kz2pr5b4dx62dx7jdgd1xym3"; + sha256 = "0q9bhw0lfw9iykjdsqz62ipy3ihfz6kprzw5sc7v1678l2pvs84j"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/msrplib/default.nix b/pkgs/development/python-modules/msrplib/default.nix index 16c4cc0f43a..e615b3e34e2 100644 --- a/pkgs/development/python-modules/msrplib/default.nix +++ b/pkgs/development/python-modules/msrplib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchdarcs , eventlib diff --git a/pkgs/development/python-modules/multi_key_dict/default.nix b/pkgs/development/python-modules/multi_key_dict/default.nix index f76cde9bec5..cb539e4dd90 100644 --- a/pkgs/development/python-modules/multi_key_dict/default.nix +++ b/pkgs/development/python-modules/multi_key_dict/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix index 43cbbbc6b77..555011a314d 100644 --- a/pkgs/development/python-modules/multidict/default.nix +++ b/pkgs/development/python-modules/multidict/default.nix @@ -1,25 +1,22 @@ { lib , fetchPypi , buildPythonPackage -, pytest, pytestrunner, pytestcov +, pytestCheckHook, pytestrunner, pytestcov , isPy3k -, isPy38 }: buildPythonPackage rec { pname = "multidict"; - version = "5.0.2"; + version = "5.1.0"; src = fetchPypi { inherit pname version; - sha256 = "e5bf89fe57f702a046c7ec718fe330ed50efd4bcf74722940db2eb0919cddb1c"; + sha256 = "25b4e5f22d3a37ddf3effc0710ba692cfc792c2b9edfb9c05aefe823256e84d5"; }; - checkInputs = [ pytest pytestrunner pytestcov ]; + checkInputs = [ pytestCheckHook pytestrunner pytestcov ]; disabled = !isPy3k; - # pickle files needed for 3.8 https://github.com/aio-libs/multidict/pull/363 - doCheck = !isPy38; meta = with lib; { description = "Multidict implementation"; diff --git a/pkgs/development/python-modules/munch/default.nix b/pkgs/development/python-modules/munch/default.nix index 2ff2ce4cefb..f6ca7c1d690 100644 --- a/pkgs/development/python-modules/munch/default.nix +++ b/pkgs/development/python-modules/munch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/pkgs/development/python-modules/munkres/default.nix b/pkgs/development/python-modules/munkres/default.nix index cb88b666cfa..ffb4f877490 100644 --- a/pkgs/development/python-modules/munkres/default.nix +++ b/pkgs/development/python-modules/munkres/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , fetchpatch diff --git a/pkgs/development/python-modules/murmurhash/default.nix b/pkgs/development/python-modules/murmurhash/default.nix index 68aa29a6ede..c2a7eb19337 100644 --- a/pkgs/development/python-modules/murmurhash/default.nix +++ b/pkgs/development/python-modules/murmurhash/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , cython diff --git a/pkgs/development/python-modules/musicbrainzngs/default.nix b/pkgs/development/python-modules/musicbrainzngs/default.nix index 02ec3815711..e5f5eff6b28 100644 --- a/pkgs/development/python-modules/musicbrainzngs/default.nix +++ b/pkgs/development/python-modules/musicbrainzngs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pkgs diff --git a/pkgs/development/python-modules/mutag/default.nix b/pkgs/development/python-modules/mutag/default.nix index 45725c0fabb..ee190008f59 100644 --- a/pkgs/development/python-modules/mutag/default.nix +++ b/pkgs/development/python-modules/mutag/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchgit , isPy3k diff --git a/pkgs/development/python-modules/muttils/default.nix b/pkgs/development/python-modules/muttils/default.nix index 1d6b5ce8df4..98f96d13212 100644 --- a/pkgs/development/python-modules/muttils/default.nix +++ b/pkgs/development/python-modules/muttils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , isPy3k diff --git a/pkgs/development/python-modules/mwclient/default.nix b/pkgs/development/python-modules/mwclient/default.nix index ac9373b574a..2eed1eefeec 100644 --- a/pkgs/development/python-modules/mwclient/default.nix +++ b/pkgs/development/python-modules/mwclient/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchFromGitHub , requests, requests_oauthlib, six , pytest, pytestcache, pytestcov, responses, mock }: diff --git a/pkgs/development/python-modules/mwlib-ext/default.nix b/pkgs/development/python-modules/mwlib-ext/default.nix index 0a81fd58d7e..b9b18eaf9e5 100644 --- a/pkgs/development/python-modules/mwlib-ext/default.nix +++ b/pkgs/development/python-modules/mwlib-ext/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/mwlib-rl/default.nix b/pkgs/development/python-modules/mwlib-rl/default.nix index d27de2ed45c..fdb70726eb6 100644 --- a/pkgs/development/python-modules/mwlib-rl/default.nix +++ b/pkgs/development/python-modules/mwlib-rl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , mwlib diff --git a/pkgs/development/python-modules/mwlib/default.nix b/pkgs/development/python-modules/mwlib/default.nix index e9defe3ee14..d9edb2ef3ba 100644 --- a/pkgs/development/python-modules/mwlib/default.nix +++ b/pkgs/development/python-modules/mwlib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/mwparserfromhell/default.nix b/pkgs/development/python-modules/mwparserfromhell/default.nix index 0546688b867..56aa4661516 100644 --- a/pkgs/development/python-modules/mwparserfromhell/default.nix +++ b/pkgs/development/python-modules/mwparserfromhell/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/mxnet/default.nix b/pkgs/development/python-modules/mxnet/default.nix index 65eb2d44ffc..2ad3b9fd6df 100644 --- a/pkgs/development/python-modules/mxnet/default.nix +++ b/pkgs/development/python-modules/mxnet/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib , buildPythonPackage , pkgs , requests @@ -14,15 +14,13 @@ buildPythonPackage { buildInputs = [ pkgs.mxnet ]; propagatedBuildInputs = [ requests numpy graphviz ]; - LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ pkgs.mxnet ]; + LD_LIBRARY_PATH = lib.makeLibraryPath [ pkgs.mxnet ]; doCheck = !isPy3k; postPatch = '' substituteInPlace python/setup.py \ - --replace "graphviz<0.9.0," "graphviz" \ - --replace "numpy<=1.15.2," "numpy" \ - --replace "requests<2.19.0," "requests" + --replace "graphviz<0.9.0," "graphviz" ''; preConfigure = '' diff --git a/pkgs/development/python-modules/mypy-protobuf/default.nix b/pkgs/development/python-modules/mypy-protobuf/default.nix index f444ba039c2..69178edb691 100644 --- a/pkgs/development/python-modules/mypy-protobuf/default.nix +++ b/pkgs/development/python-modules/mypy-protobuf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonApplication, protobuf }: +{ lib, fetchPypi, buildPythonApplication, protobuf }: buildPythonApplication rec { pname = "mypy-protobuf"; diff --git a/pkgs/development/python-modules/mypy/extensions.nix b/pkgs/development/python-modules/mypy/extensions.nix index 21a3ee21dbd..5992a6815d8 100644 --- a/pkgs/development/python-modules/mypy/extensions.nix +++ b/pkgs/development/python-modules/mypy/extensions.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, typing, pythonOlder }: +{ lib, fetchPypi, buildPythonPackage, typing, pythonOlder }: buildPythonPackage rec { pname = "mypy-extensions"; diff --git a/pkgs/development/python-modules/mysql-connector/default.nix b/pkgs/development/python-modules/mysql-connector/default.nix index d3465110194..692c021a64f 100644 --- a/pkgs/development/python-modules/mysql-connector/default.nix +++ b/pkgs/development/python-modules/mysql-connector/default.nix @@ -4,13 +4,13 @@ let py = python; in buildPythonPackage rec { pname = "mysql-connector"; - version = "8.0.22"; + version = "8.0.23"; src = fetchFromGitHub { owner = "mysql"; repo = "mysql-connector-python"; rev = version; - sha256 = "084q8x86ywgxgpsgdid8y9rjjys06146dqinfpmlggjswbq9kl0d"; + sha256 = "sha256-YVtcHbDsW1mTjbCY1YhqgtqWv4keKlLExn2AhlOzNEw="; }; propagatedBuildInputs = with py.pkgs; [ protobuf dnspython ]; diff --git a/pkgs/development/python-modules/mysqlclient/default.nix b/pkgs/development/python-modules/mysqlclient/default.nix index 9d91543b7ff..b7a0f39990e 100644 --- a/pkgs/development/python-modules/mysqlclient/default.nix +++ b/pkgs/development/python-modules/mysqlclient/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, libmysqlclient }: +{ lib, buildPythonPackage, fetchPypi, libmysqlclient }: buildPythonPackage rec { pname = "mysqlclient"; diff --git a/pkgs/development/python-modules/namebench/default.nix b/pkgs/development/python-modules/namebench/default.nix index eefdcce7990..b7b542b8a7a 100644 --- a/pkgs/development/python-modules/namebench/default.nix +++ b/pkgs/development/python-modules/namebench/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , isPy3k , isPyPy diff --git a/pkgs/development/python-modules/nameparser/default.nix b/pkgs/development/python-modules/nameparser/default.nix index 0c8e442affc..0d7b53f03cb 100644 --- a/pkgs/development/python-modules/nameparser/default.nix +++ b/pkgs/development/python-modules/nameparser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , glibcLocales diff --git a/pkgs/development/python-modules/nanoleaf/default.nix b/pkgs/development/python-modules/nanoleaf/default.nix index f6131cd5309..8712c582bed 100644 --- a/pkgs/development/python-modules/nanoleaf/default.nix +++ b/pkgs/development/python-modules/nanoleaf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, requests }: +{ lib, buildPythonPackage, fetchPypi, requests }: buildPythonPackage rec { pname = "nanoleaf"; diff --git a/pkgs/development/python-modules/nanomsg-python/default.nix b/pkgs/development/python-modules/nanomsg-python/default.nix index 4cf33fb2074..765941457d4 100644 --- a/pkgs/development/python-modules/nanomsg-python/default.nix +++ b/pkgs/development/python-modules/nanomsg-python/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, nanomsg }: +{ lib, buildPythonPackage, fetchFromGitHub, nanomsg }: buildPythonPackage { pname = "nanomsg-python"; diff --git a/pkgs/development/python-modules/nbclient/default.nix b/pkgs/development/python-modules/nbclient/default.nix index d846511eb3f..c320415e075 100644 --- a/pkgs/development/python-modules/nbclient/default.nix +++ b/pkgs/development/python-modules/nbclient/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder, +{ lib, buildPythonPackage, fetchPypi, pythonOlder, async_generator, traitlets, nbformat, nest-asyncio, jupyter_client, pytest, xmltodict, nbconvert, ipywidgets , doCheck ? true diff --git a/pkgs/development/python-modules/nbdime/default.nix b/pkgs/development/python-modules/nbdime/default.nix index 1de21f3511a..299cfc87024 100644 --- a/pkgs/development/python-modules/nbdime/default.nix +++ b/pkgs/development/python-modules/nbdime/default.nix @@ -12,7 +12,7 @@ , tabulate , nbformat , jsonschema -, pytest +, pytestCheckHook , colorama , pygments , tornado @@ -40,7 +40,16 @@ buildPythonPackage rec { jsonschema mock tabulate - pytest + pytestCheckHook + ]; + + disabledTests = [ + "test_apply_filter_no_repo" + "test_diff_api_checkpoint" + "test_filter_cmd_invalid_filter" + "test_inline_merge" + "test_interrogate_filter_no_repo" + "test_merge_input_strategy_inline_source_conflict" ]; nativeBuildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix index 28946bd1a6e..3826a746758 100644 --- a/pkgs/development/python-modules/nbxmpp/default.nix +++ b/pkgs/development/python-modules/nbxmpp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchzip, gobject-introspection, idna, libsoup, precis-i18n, pygobject3, pyopenssl }: +{ lib, buildPythonPackage, fetchzip, gobject-introspection, idna, libsoup, precis-i18n, pygobject3, pyopenssl }: let pname = "nbxmpp"; diff --git a/pkgs/development/python-modules/ncclient/default.nix b/pkgs/development/python-modules/ncclient/default.nix index f933587dcad..ba3b9e4b087 100644 --- a/pkgs/development/python-modules/ncclient/default.nix +++ b/pkgs/development/python-modules/ncclient/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , paramiko diff --git a/pkgs/development/python-modules/ndg-httpsclient/default.nix b/pkgs/development/python-modules/ndg-httpsclient/default.nix index 7768614a5d1..0082b8e8db2 100644 --- a/pkgs/development/python-modules/ndg-httpsclient/default.nix +++ b/pkgs/development/python-modules/ndg-httpsclient/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , pyopenssl diff --git a/pkgs/development/python-modules/ndtypes/default.nix b/pkgs/development/python-modules/ndtypes/default.nix index 0a6e5635a4f..75fc5373b4c 100644 --- a/pkgs/development/python-modules/ndtypes/default.nix +++ b/pkgs/development/python-modules/ndtypes/default.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , buildPythonPackage , python , numpy @@ -26,7 +27,7 @@ buildPythonPackage { postInstall = '' mkdir $out/include cp python/ndtypes/*.h $out/include - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' install_name_tool -add_rpath ${libndtypes}/lib $out/${python.sitePackages}/ndtypes/_ndtypes.*.so ''; diff --git a/pkgs/development/python-modules/netaddr/default.nix b/pkgs/development/python-modules/netaddr/default.nix index d92673104a9..3f7f78a374c 100644 --- a/pkgs/development/python-modules/netaddr/default.nix +++ b/pkgs/development/python-modules/netaddr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonOlder @@ -18,7 +18,7 @@ buildPythonPackage rec { LC_ALL = "en_US.UTF-8"; - propagatedBuildInputs = stdenv.lib.optionals (pythonOlder "3.7") [ importlib-resources ]; + propagatedBuildInputs = lib.optionals (pythonOlder "3.7") [ importlib-resources ]; checkInputs = [ glibcLocales pytestCheckHook ]; diff --git a/pkgs/development/python-modules/netcdf4/default.nix b/pkgs/development/python-modules/netcdf4/default.nix index 456124b19bd..60f7dbe6c23 100644 --- a/pkgs/development/python-modules/netcdf4/default.nix +++ b/pkgs/development/python-modules/netcdf4/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, isPyPy, pytest +{ lib, buildPythonPackage, fetchPypi, isPyPy, pytest , numpy, zlib, netcdf, hdf5, curl, libjpeg, cython, cftime }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/netdisco/default.nix b/pkgs/development/python-modules/netdisco/default.nix index e546ac6cd57..489b6bddf56 100644 --- a/pkgs/development/python-modules/netdisco/default.nix +++ b/pkgs/development/python-modules/netdisco/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, isPy3k, fetchPypi, requests, zeroconf, netifaces, pytest }: +{ lib, buildPythonPackage, isPy3k, fetchPypi, requests, zeroconf, netifaces, pytest }: buildPythonPackage rec { pname = "netdisco"; diff --git a/pkgs/development/python-modules/netifaces/default.nix b/pkgs/development/python-modules/netifaces/default.nix index 07dc63c2181..f7638b29a4c 100644 --- a/pkgs/development/python-modules/netifaces/default.nix +++ b/pkgs/development/python-modules/netifaces/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/neuronpy/default.nix b/pkgs/development/python-modules/neuronpy/default.nix index b81398f918c..2d388dfa4c2 100644 --- a/pkgs/development/python-modules/neuronpy/default.nix +++ b/pkgs/development/python-modules/neuronpy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , numpy diff --git a/pkgs/development/python-modules/nevow/default.nix b/pkgs/development/python-modules/nevow/default.nix index 356754fdeac..b608ae58fc7 100644 --- a/pkgs/development/python-modules/nevow/default.nix +++ b/pkgs/development/python-modules/nevow/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchpatch, fetchPypi, isPy3k, twisted }: +{ lib, buildPythonPackage, fetchpatch, fetchPypi, isPy3k, twisted }: buildPythonPackage rec { pname = "Nevow"; diff --git a/pkgs/development/python-modules/nibabel/default.nix b/pkgs/development/python-modules/nibabel/default.nix index e67bdcc3194..91195abce1c 100644 --- a/pkgs/development/python-modules/nibabel/default.nix +++ b/pkgs/development/python-modules/nibabel/default.nix @@ -34,6 +34,5 @@ buildPythonPackage rec { description = "Access a multitude of neuroimaging data formats"; license = licenses.mit; maintainers = with maintainers; [ ashgillman ]; - platforms = platforms.x86_64; # https://github.com/nipy/nibabel/issues/861 }; } diff --git a/pkgs/development/python-modules/nidaqmx/default.nix b/pkgs/development/python-modules/nidaqmx/default.nix index 937e6c1c91b..9d916cc9324 100644 --- a/pkgs/development/python-modules/nidaqmx/default.nix +++ b/pkgs/development/python-modules/nidaqmx/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { # Fixture "x_series_device" called directly. Fixtures are not meant to be called directly doCheck = false; - pythonCheckImports = [ + pythonImportsCheck = [ "nidaqmx.task" ]; diff --git a/pkgs/development/python-modules/nimfa/default.nix b/pkgs/development/python-modules/nimfa/default.nix index dc889440aa4..eb04e0c4d89 100644 --- a/pkgs/development/python-modules/nimfa/default.nix +++ b/pkgs/development/python-modules/nimfa/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/nine/default.nix b/pkgs/development/python-modules/nine/default.nix index 1747332ed5a..e2ca5c6f27d 100644 --- a/pkgs/development/python-modules/nine/default.nix +++ b/pkgs/development/python-modules/nine/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/nipy/default.nix b/pkgs/development/python-modules/nipy/default.nix index 719e07b617b..6229baef32a 100644 --- a/pkgs/development/python-modules/nipy/default.nix +++ b/pkgs/development/python-modules/nipy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonOlder @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "1pn731nsczrx198i2gadffqmfbhviglrclv6xxwhnbv6w5hfs2yk"; }; - buildInputs = stdenv.lib.optional doCheck [ nose ]; + buildInputs = lib.optional doCheck [ nose ]; propagatedBuildInputs = [ matplotlib nibabel numpy scipy sympy ]; checkPhase = '' # wants to be run in a different directory diff --git a/pkgs/development/python-modules/nitime/default.nix b/pkgs/development/python-modules/nitime/default.nix index 68eeab46afc..ccbf540f75f 100644 --- a/pkgs/development/python-modules/nitime/default.nix +++ b/pkgs/development/python-modules/nitime/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , python , fetchPypi +, isPy27 , pytestCheckHook , cython , numpy @@ -13,20 +14,18 @@ buildPythonPackage rec { pname = "nitime"; - version = "0.8.1"; - disabled = python.pythonVersion != "3.7"; # gcc error when running Cython with Python 3.8 + version = "0.9"; + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0hb3x5196z2zaawb8s7lhja0vd3n983ncaynqfl9qg315x9ax7i6"; + sha256 = "sha256-bn2QrbsfqUJim84vH5tt5T6h3YsGAlgu9GCMiNQ0OHQ="; }; + checkInputs = [ pytestCheckHook ]; buildInputs = [ cython ]; - propagatedBuildInputs = [ numpy scipy matplotlib networkx nibabel ]; - checkInputs = [ pytestCheckHook ]; - meta = with lib; { homepage = "https://nipy.org/nitime"; description = "Algorithms and containers for time-series analysis in time and spectral domains"; diff --git a/pkgs/development/python-modules/nixpkgs/default.nix b/pkgs/development/python-modules/nixpkgs/default.nix index 4edd31d6a25..acebe5d758f 100644 --- a/pkgs/development/python-modules/nixpkgs/default.nix +++ b/pkgs/development/python-modules/nixpkgs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pbr diff --git a/pkgs/development/python-modules/node-semver/default.nix b/pkgs/development/python-modules/node-semver/default.nix index 5ba62fb9210..535ff621de5 100644 --- a/pkgs/development/python-modules/node-semver/default.nix +++ b/pkgs/development/python-modules/node-semver/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, pytest }: +{ lib, fetchPypi, buildPythonPackage, pytest }: buildPythonPackage rec { version = "0.7.0"; diff --git a/pkgs/development/python-modules/noise/default.nix b/pkgs/development/python-modules/noise/default.nix index 98f336c4986..ebd0178602c 100644 --- a/pkgs/development/python-modules/noise/default.nix +++ b/pkgs/development/python-modules/noise/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "noise"; diff --git a/pkgs/development/python-modules/nose-cover3/default.nix b/pkgs/development/python-modules/nose-cover3/default.nix index 185270176ac..b75dcc526c5 100644 --- a/pkgs/development/python-modules/nose-cover3/default.nix +++ b/pkgs/development/python-modules/nose-cover3/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/pkgs/development/python-modules/nose-cprof/default.nix b/pkgs/development/python-modules/nose-cprof/default.nix index 4f90ee4be8b..f4959ec7be7 100644 --- a/pkgs/development/python-modules/nose-cprof/default.nix +++ b/pkgs/development/python-modules/nose-cprof/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/pkgs/development/python-modules/nose-focus/default.nix b/pkgs/development/python-modules/nose-focus/default.nix index 8e31867d85c..2805dc4545a 100644 --- a/pkgs/development/python-modules/nose-focus/default.nix +++ b/pkgs/development/python-modules/nose-focus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, six, nose, nose-of-yeti +{ lib, buildPythonPackage, fetchFromGitHub, six, nose, nose-of-yeti , nose-pattern-exclude, which }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/nose-of-yeti/default.nix b/pkgs/development/python-modules/nose-of-yeti/default.nix index 2bd63f3295d..16fb264b39a 100644 --- a/pkgs/development/python-modules/nose-of-yeti/default.nix +++ b/pkgs/development/python-modules/nose-of-yeti/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, six, nose, fudge, should-dsl }: +{ lib, buildPythonPackage, fetchFromGitHub, six, nose, fudge, should-dsl }: buildPythonPackage rec { pname = "nose-of-yeti"; diff --git a/pkgs/development/python-modules/nose-pattern-exclude/default.nix b/pkgs/development/python-modules/nose-pattern-exclude/default.nix index 05a7102f1ae..a550dc5aee1 100644 --- a/pkgs/development/python-modules/nose-pattern-exclude/default.nix +++ b/pkgs/development/python-modules/nose-pattern-exclude/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, nose }: +{ lib, buildPythonPackage, fetchPypi, nose }: buildPythonPackage rec { pname = "nose-pattern-exclude"; diff --git a/pkgs/development/python-modules/nose/default.nix b/pkgs/development/python-modules/nose/default.nix index 2805b7c2ea1..456bbfd9aed 100644 --- a/pkgs/development/python-modules/nose/default.nix +++ b/pkgs/development/python-modules/nose/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , python diff --git a/pkgs/development/python-modules/nose2/default.nix b/pkgs/development/python-modules/nose2/default.nix index b815e223d82..004991e1ce9 100644 --- a/pkgs/development/python-modules/nose2/default.nix +++ b/pkgs/development/python-modules/nose2/default.nix @@ -1,6 +1,7 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi +, python , six , pythonOlder , coverage @@ -8,20 +9,21 @@ buildPythonPackage rec { pname = "nose2"; - version = "0.9.2"; + version = "0.10.0"; # Requires mock 2.0.0 if python < 3.6, but NixPkgs has mock 3.0.5. disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0pmbb6nk31yhgh4zkcblzxsznml7f7pf5q1ihgrwvbxv4mwzfql7"; + sha256 = "886ba617a96de0130c54b24479bd5c2d74d5c940d40f3809c3a275511a0c4a60"; }; propagatedBuildInputs = [ six coverage ]; - # AttributeError: 'module' object has no attribute 'collector' - doCheck = false; + checkPhase = '' + ${python.interpreter} -m unittest + ''; meta = with lib; { description = "nose2 is the next generation of nicer testing for Python"; diff --git a/pkgs/development/python-modules/nose_progressive/default.nix b/pkgs/development/python-modules/nose_progressive/default.nix index b920bb40736..bef7058bc3f 100644 --- a/pkgs/development/python-modules/nose_progressive/default.nix +++ b/pkgs/development/python-modules/nose_progressive/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/pkgs/development/python-modules/nosejs/default.nix b/pkgs/development/python-modules/nosejs/default.nix index c165e87ff2e..f80953bd2d7 100644 --- a/pkgs/development/python-modules/nosejs/default.nix +++ b/pkgs/development/python-modules/nosejs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/pkgs/development/python-modules/nosexcover/default.nix b/pkgs/development/python-modules/nosexcover/default.nix index 36747a50aae..f60ed65448d 100644 --- a/pkgs/development/python-modules/nosexcover/default.nix +++ b/pkgs/development/python-modules/nosexcover/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , coverage diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index 116fa153cda..bab3aa590ec 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -68,6 +68,7 @@ buildPythonPackage rec { "launch_socket" "sock_server" "test_list_formats" # tries to find python MIME type + "KernelCullingTest" # has a race condition failing on slower hardware ] ++ lib.optional stdenv.isDarwin [ "test_delete" "test_checkpoints_follow_file" diff --git a/pkgs/development/python-modules/notify/default.nix b/pkgs/development/python-modules/notify/default.nix index 5621f0b24af..1a60cf70d2d 100644 --- a/pkgs/development/python-modules/notify/default.nix +++ b/pkgs/development/python-modules/notify/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { sha256 = "1kh4spwgqxm534qlzzf2ijchckvs0pwjxl1irhicjmlg7mybnfvx"; }; - patches = stdenv.lib.singleton (fetchurl { + patches = lib.singleton (fetchurl { name = "libnotify07.patch"; url = "https://src.fedoraproject.org/cgit/notify-python.git/plain/" + "libnotify07.patch?id2=289573d50ae4838a1658d573d2c9f4c75e86db0c"; diff --git a/pkgs/development/python-modules/notmuch/2.nix b/pkgs/development/python-modules/notmuch/2.nix index 970928e03f4..bde039836ff 100644 --- a/pkgs/development/python-modules/notmuch/2.nix +++ b/pkgs/development/python-modules/notmuch/2.nix @@ -1,5 +1,5 @@ { lib -, stdenv + , buildPythonPackage , notmuch , python diff --git a/pkgs/development/python-modules/notmuch/default.nix b/pkgs/development/python-modules/notmuch/default.nix index 609d4c78d5d..90695b84c66 100644 --- a/pkgs/development/python-modules/notmuch/default.nix +++ b/pkgs/development/python-modules/notmuch/default.nix @@ -1,5 +1,5 @@ { lib -, stdenv + , buildPythonPackage , notmuch , python diff --git a/pkgs/development/python-modules/npyscreen/default.nix b/pkgs/development/python-modules/npyscreen/default.nix new file mode 100644 index 00000000000..1e93d54b3a2 --- /dev/null +++ b/pkgs/development/python-modules/npyscreen/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "npyscreen"; + version = "4.10.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0vhjwn0dan3zmffvh80dxb4x67jysvvf1imp6pk4dsfslpwy0bk2"; + }; + + # Tests are outdated + doCheck = false; + + meta = with lib; { + description = "Framework for developing console applications using Python and curses"; + homepage = "http://www.npcole.com/npyscreen/"; + maintainers = with maintainers; [ dump_stack ]; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/ntplib/default.nix b/pkgs/development/python-modules/ntplib/default.nix index 266482a8ff2..be8a370f3f3 100644 --- a/pkgs/development/python-modules/ntplib/default.nix +++ b/pkgs/development/python-modules/ntplib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/nuitka/default.nix b/pkgs/development/python-modules/nuitka/default.nix index 4056c8a440e..44ee4597dbe 100644 --- a/pkgs/development/python-modules/nuitka/default.nix +++ b/pkgs/development/python-modules/nuitka/default.nix @@ -26,12 +26,12 @@ in buildPythonPackage rec { postPatch = '' patchShebangs tests/run-tests - '' + stdenv.lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.isLinux '' substituteInPlace nuitka/plugins/standard/ImplicitImports.py --replace 'locateDLL("uuid")' '"${pkgs.util-linux.out}/lib/libuuid.so"' ''; # We do not want any wrappers here. - postFixup = ''''; + postFixup = ""; checkPhase = '' tests/run-tests diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index ad31b8e960c..aa08ead2d97 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , pythonOlder , fetchPypi , python @@ -23,10 +24,10 @@ buildPythonPackage rec { sha256 = "16bd59572114adbf5f600ea383880d7b2071ae45477e84a24994e089ea390768"; }; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; propagatedBuildInputs = [numpy llvmlite] - ++ stdenv.lib.optionals isPy27 [ funcsigs singledispatch]; + ++ lib.optionals isPy27 [ funcsigs singledispatch]; # Copy test script into $out and run the test suite. checkPhase = '' @@ -35,10 +36,10 @@ buildPythonPackage rec { # ImportError: cannot import name '_typeconv' doCheck = false; - meta = { + meta = with lib; { homepage = "http://numba.pydata.org/"; - license = stdenv.lib.licenses.bsd2; + license = licenses.bsd2; description = "Compiling Python code using LLVM"; - maintainers = with stdenv.lib.maintainers; [ fridh ]; + maintainers = with maintainers; [ fridh ]; }; } diff --git a/pkgs/development/python-modules/numericalunits/default.nix b/pkgs/development/python-modules/numericalunits/default.nix index 0c71b065a32..8e2f630fdba 100644 --- a/pkgs/development/python-modules/numericalunits/default.nix +++ b/pkgs/development/python-modules/numericalunits/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/nvchecker/default.nix b/pkgs/development/python-modules/nvchecker/default.nix index 832e281a9a1..17537be82b4 100644 --- a/pkgs/development/python-modules/nvchecker/default.nix +++ b/pkgs/development/python-modules/nvchecker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , pythonOlder diff --git a/pkgs/development/python-modules/nwdiag/default.nix b/pkgs/development/python-modules/nwdiag/default.nix index 4676fdef0cd..c8147d9d9a4 100644 --- a/pkgs/development/python-modules/nwdiag/default.nix +++ b/pkgs/development/python-modules/nwdiag/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, buildPythonPackage, pep8, nose, unittest2, docutils +{ lib, fetchurl, buildPythonPackage, pep8, nose, unittest2, docutils , blockdiag, setuptools }: diff --git a/pkgs/development/python-modules/nxt-python/default.nix b/pkgs/development/python-modules/nxt-python/default.nix index 4057ba1de8a..38920dc5542 100644 --- a/pkgs/development/python-modules/nxt-python/default.nix +++ b/pkgs/development/python-modules/nxt-python/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchgit , isPy3k diff --git a/pkgs/development/python-modules/oath/default.nix b/pkgs/development/python-modules/oath/default.nix index 158cf036840..fd12a830472 100644 --- a/pkgs/development/python-modules/oath/default.nix +++ b/pkgs/development/python-modules/oath/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/oauth/default.nix b/pkgs/development/python-modules/oauth/default.nix index 0e53eaec7c0..c74de8d6bd6 100644 --- a/pkgs/development/python-modules/oauth/default.nix +++ b/pkgs/development/python-modules/oauth/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/oauth2/default.nix b/pkgs/development/python-modules/oauth2/default.nix index 70b2e94e37c..d9c0ae505f7 100644 --- a/pkgs/development/python-modules/oauth2/default.nix +++ b/pkgs/development/python-modules/oauth2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , httplib2 diff --git a/pkgs/development/python-modules/oauthlib/3.1.nix b/pkgs/development/python-modules/oauthlib/3.1.nix index 40501733e4c..10757812037 100644 --- a/pkgs/development/python-modules/oauthlib/3.1.nix +++ b/pkgs/development/python-modules/oauthlib/3.1.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , mock diff --git a/pkgs/development/python-modules/oauthlib/default.nix b/pkgs/development/python-modules/oauthlib/default.nix index df65547a256..5c4cbc78adb 100644 --- a/pkgs/development/python-modules/oauthlib/default.nix +++ b/pkgs/development/python-modules/oauthlib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , mock diff --git a/pkgs/development/python-modules/obfsproxy/default.nix b/pkgs/development/python-modules/obfsproxy/default.nix index 1dec57cafb4..b5736851fbb 100644 --- a/pkgs/development/python-modules/obfsproxy/default.nix +++ b/pkgs/development/python-modules/obfsproxy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchgit , pyptlib diff --git a/pkgs/development/python-modules/objgraph/default.nix b/pkgs/development/python-modules/objgraph/default.nix index 8bb119bcb4b..c79b11252be 100644 --- a/pkgs/development/python-modules/objgraph/default.nix +++ b/pkgs/development/python-modules/objgraph/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPyPy diff --git a/pkgs/development/python-modules/offtrac/default.nix b/pkgs/development/python-modules/offtrac/default.nix index edec161a133..1ae555ffa15 100644 --- a/pkgs/development/python-modules/offtrac/default.nix +++ b/pkgs/development/python-modules/offtrac/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/ofxclient/default.nix b/pkgs/development/python-modules/ofxclient/default.nix index 5ef7060b7f6..72e2be7c78b 100644 --- a/pkgs/development/python-modules/ofxclient/default.nix +++ b/pkgs/development/python-modules/ofxclient/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, +{ lib, buildPythonPackage, fetchPypi, ofxhome, ofxparse, beautifulsoup4, lxml, keyring }: diff --git a/pkgs/development/python-modules/ofxhome/default.nix b/pkgs/development/python-modules/ofxhome/default.nix index d9a28da1806..72ca65ed171 100644 --- a/pkgs/development/python-modules/ofxhome/default.nix +++ b/pkgs/development/python-modules/ofxhome/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, nose }: +{ lib, buildPythonPackage, fetchPypi, nose }: buildPythonPackage rec { version = "0.3.3"; diff --git a/pkgs/development/python-modules/ofxparse/default.nix b/pkgs/development/python-modules/ofxparse/default.nix index 235875eec7c..d018a924d89 100644 --- a/pkgs/development/python-modules/ofxparse/default.nix +++ b/pkgs/development/python-modules/ofxparse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/pkgs/development/python-modules/ofxtools/default.nix b/pkgs/development/python-modules/ofxtools/default.nix index 8f280d1cfd4..a32b0b23294 100644 --- a/pkgs/development/python-modules/ofxtools/default.nix +++ b/pkgs/development/python-modules/ofxtools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , nose diff --git a/pkgs/development/python-modules/olefile/default.nix b/pkgs/development/python-modules/olefile/default.nix index 96c0a0b51be..d2c39e54ef4 100644 --- a/pkgs/development/python-modules/olefile/default.nix +++ b/pkgs/development/python-modules/olefile/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "olefile"; version = "0.46"; diff --git a/pkgs/development/python-modules/omegaconf/default.nix b/pkgs/development/python-modules/omegaconf/default.nix index 930a0367824..ad9da46243b 100644 --- a/pkgs/development/python-modules/omegaconf/default.nix +++ b/pkgs/development/python-modules/omegaconf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder , pytest, pytestrunner, pyyaml, six, pathlib2, isPy27 }: buildPythonPackage rec { @@ -14,7 +14,7 @@ buildPythonPackage rec { checkInputs = [ pytest ]; buildInputs = [ pytestrunner ]; - propagatedBuildInputs = [ pyyaml six ] ++ stdenv.lib.optional isPy27 pathlib2; + propagatedBuildInputs = [ pyyaml six ] ++ lib.optional isPy27 pathlib2; meta = with lib; { description = "A framework for configuring complex applications"; diff --git a/pkgs/development/python-modules/onkyo-eiscp/default.nix b/pkgs/development/python-modules/onkyo-eiscp/default.nix index 067db3a69fe..08770678432 100644 --- a/pkgs/development/python-modules/onkyo-eiscp/default.nix +++ b/pkgs/development/python-modules/onkyo-eiscp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , docopt, netifaces }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/openant/default.nix b/pkgs/development/python-modules/openant/default.nix index 374b7cb059d..71f699e0552 100644 --- a/pkgs/development/python-modules/openant/default.nix +++ b/pkgs/development/python-modules/openant/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , pyusb diff --git a/pkgs/development/python-modules/openbabel-bindings/default.nix b/pkgs/development/python-modules/openbabel-bindings/default.nix new file mode 100644 index 00000000000..6488b8fad2f --- /dev/null +++ b/pkgs/development/python-modules/openbabel-bindings/default.nix @@ -0,0 +1,27 @@ +{ lib, openbabel, python, buildPythonPackage }: + +buildPythonPackage rec { + pname = "openbabel"; + version = "3.1.1"; + + src = "${openbabel}/lib/python${python.sourceVersion.major}.${python.sourceVersion.minor}/site-packages"; + + nativeBuildInputs = [ openbabel ]; + + # these env variables are used by the bindings to find libraries + # they need to be included explicitly in your nix-shell for + # some functionality to work (inparticular, pybel). + # see https://openbabel.org/docs/dev/Installation/install.html + BABEL_LIBDIR = "${openbabel}/lib/openbabel/3.1.0"; + LD_LIBRARY_PATH = "$LD_LIBRARY_PATH:${openbabel}/lib"; + + doCheck = false; + pythonImportsCheck = [ "openbabel" ]; + + meta = with lib; { + homepage = "http://openbabel.org/wiki/Main_Page"; + description = "Python bindings for openbabel"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ danielbarter ]; + }; +} diff --git a/pkgs/development/python-modules/openidc-client/default.nix b/pkgs/development/python-modules/openidc-client/default.nix index 7d373c13a8a..ce6ccee9793 100644 --- a/pkgs/development/python-modules/openidc-client/default.nix +++ b/pkgs/development/python-modules/openidc-client/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, requests }: +{ lib, buildPythonPackage, fetchPypi, requests }: buildPythonPackage rec { pname = "openidc-client"; diff --git a/pkgs/development/python-modules/openrazer/common.nix b/pkgs/development/python-modules/openrazer/common.nix index 843380ebf21..2ed723944dd 100644 --- a/pkgs/development/python-modules/openrazer/common.nix +++ b/pkgs/development/python-modules/openrazer/common.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub }: rec { version = "2.9.0"; diff --git a/pkgs/development/python-modules/openrazer/daemon.nix b/pkgs/development/python-modules/openrazer/daemon.nix index 6c22d3bae5d..8b1ff86fcab 100644 --- a/pkgs/development/python-modules/openrazer/daemon.nix +++ b/pkgs/development/python-modules/openrazer/daemon.nix @@ -11,12 +11,11 @@ , pygobject3 , pyudev , setproctitle -, stdenv , wrapGAppsHook }: let - common = import ./common.nix { inherit stdenv lib fetchFromGitHub; }; + common = import ./common.nix { inherit lib fetchFromGitHub; }; in buildPythonApplication (common // rec { pname = "openrazer_daemon"; diff --git a/pkgs/development/python-modules/openrazer/pylib.nix b/pkgs/development/python-modules/openrazer/pylib.nix index 52fe63318a3..fb83d64c502 100644 --- a/pkgs/development/python-modules/openrazer/pylib.nix +++ b/pkgs/development/python-modules/openrazer/pylib.nix @@ -3,12 +3,11 @@ , dbus-python , fetchFromGitHub , numpy -, stdenv , openrazer-daemon }: let - common = import ./common.nix { inherit stdenv lib fetchFromGitHub; }; + common = import ./common.nix { inherit lib fetchFromGitHub; }; in buildPythonPackage (common // rec { pname = "openrazer"; diff --git a/pkgs/development/python-modules/ordereddict/default.nix b/pkgs/development/python-modules/ordereddict/default.nix index e2931840a66..6ef00640585 100644 --- a/pkgs/development/python-modules/ordereddict/default.nix +++ b/pkgs/development/python-modules/ordereddict/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/orderedmultidict/default.nix b/pkgs/development/python-modules/orderedmultidict/default.nix index 7cb4871031b..7c37cc7aa5a 100644 --- a/pkgs/development/python-modules/orderedmultidict/default.nix +++ b/pkgs/development/python-modules/orderedmultidict/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, flake8, six, pythonOlder, importlib-metadata }: +{ lib, buildPythonPackage, fetchPypi, flake8, six, pythonOlder, importlib-metadata }: buildPythonPackage rec { pname = "orderedmultidict"; @@ -12,7 +12,7 @@ buildPythonPackage rec { checkInputs = [ flake8 ]; propagatedBuildInputs = [ six ] - ++ stdenv.lib.optionals (pythonOlder "3.8") [ + ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; diff --git a/pkgs/development/python-modules/orderedset/default.nix b/pkgs/development/python-modules/orderedset/default.nix index aced6cf0853..db9c265ef3e 100644 --- a/pkgs/development/python-modules/orderedset/default.nix +++ b/pkgs/development/python-modules/orderedset/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "orderedset"; diff --git a/pkgs/development/python-modules/orvibo/default.nix b/pkgs/development/python-modules/orvibo/default.nix new file mode 100644 index 00000000000..6209baa144b --- /dev/null +++ b/pkgs/development/python-modules/orvibo/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, click +, fetchFromGitHub +, mock +, pytest-runner +, pytestCheckHook +, requests +, websocket_client +}: + +buildPythonPackage rec { + pname = "orvibo"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "happyleavesaoc"; + repo = "python-orvibo"; + rev = version; + sha256 = "042prd5yxqvlfija7ii1xn424iv1p7ndhxv6m67ij8cbvspwx356"; + }; + + # Project as no tests + doCheck = false; + pythonImportsCheck = [ "orvibo" ]; + + meta = with lib; { + description = "Python client to work with Orvibo devices"; + homepage = "https://github.com/happyleavesaoc/python-orvibo"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/osc/default.nix b/pkgs/development/python-modules/osc/default.nix index dad78727f2d..ac7e401bf6c 100644 --- a/pkgs/development/python-modules/osc/default.nix +++ b/pkgs/development/python-modules/osc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, bashInteractive, urlgrabber +{ lib, buildPythonPackage, fetchFromGitHub, bashInteractive, urlgrabber , m2crypto, rpm, chardet }: diff --git a/pkgs/development/python-modules/oset/default.nix b/pkgs/development/python-modules/oset/default.nix index aa435b403e8..5d8a5f741bd 100644 --- a/pkgs/development/python-modules/oset/default.nix +++ b/pkgs/development/python-modules/oset/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "oset"; @@ -11,9 +11,9 @@ buildPythonPackage rec { doCheck = false; - meta = { + meta = with lib; { description = "Ordered set"; - license = stdenv.lib.licenses.psfl; + license = licenses.psfl; }; } diff --git a/pkgs/development/python-modules/osmnx/default.nix b/pkgs/development/python-modules/osmnx/default.nix index c624e262cf9..e1c22ddbfa3 100755 --- a/pkgs/development/python-modules/osmnx/default.nix +++ b/pkgs/development/python-modules/osmnx/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, geopandas, descartes, matplotlib, networkx, numpy +{ lib, buildPythonPackage, fetchFromGitHub, geopandas, descartes, matplotlib, networkx, numpy , pandas, requests, Rtree, shapely, pytest, coverage, coveralls, folium, scikitlearn, scipy}: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/osqp/default.nix b/pkgs/development/python-modules/osqp/default.nix index e2eb0139f12..1db266e116d 100644 --- a/pkgs/development/python-modules/osqp/default.nix +++ b/pkgs/development/python-modules/osqp/default.nix @@ -8,15 +8,16 @@ , scipy # check inputs , pytestCheckHook +, cvxopt }: buildPythonPackage rec { pname = "osqp"; - version = "0.6.2"; + version = "0.6.2.post0"; src = fetchPypi { inherit pname version; - sha256 = "262162039f6ad6c9ffee658541b18cfae8240b65edbde71d9b9e3af42fbfe4b3"; + sha256 = "5f0695f26a3bef0fae91254bc283fab790dcca0064bfe0f425167f9c9e8b4cbc"; }; nativeBuildInputs = [ cmake ]; @@ -30,18 +31,10 @@ buildPythonPackage rec { ]; pythonImportsCheck = [ "osqp" ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ pytestCheckHook cvxopt ]; disabledTests = [ "mkl_" ]; - pytestFlagsArray = [ - # These cannot collect b/c of circular dependency on cvxpy: https://github.com/oxfordcontrol/osqp-python/issues/50 - "--ignore=module/tests/basic_test.py" - "--ignore=module/tests/feasibility_test.py" - "--ignore=module/tests/polishing_test.py" - "--ignore=module/tests/unconstrained_test.py" - "--ignore=module/tests/update_matrices_test.py" - ]; meta = with lib; { description = "The Operator Splitting QP Solver"; diff --git a/pkgs/development/python-modules/ovito/default.nix b/pkgs/development/python-modules/ovito/default.nix index a33e5d19b44..d0923287183 100644 --- a/pkgs/development/python-modules/ovito/default.nix +++ b/pkgs/development/python-modules/ovito/default.nix @@ -30,6 +30,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = with python.pkgs; [ sphinx numpy sip pyqt5 matplotlib ase ]; + dontWrapQtApps = true; + meta = with lib; { description = "Scientific visualization and analysis software for atomistic simulation data"; homepage = "https://www.ovito.org"; diff --git a/pkgs/development/python-modules/packaging/2.nix b/pkgs/development/python-modules/packaging/2.nix index 5d841eb4fb1..a9b4e159469 100644 --- a/pkgs/development/python-modules/packaging/2.nix +++ b/pkgs/development/python-modules/packaging/2.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pyparsing diff --git a/pkgs/development/python-modules/packaging/default.nix b/pkgs/development/python-modules/packaging/default.nix index 973e516f5a9..689c2e4516d 100644 --- a/pkgs/development/python-modules/packaging/default.nix +++ b/pkgs/development/python-modules/packaging/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pyparsing diff --git a/pkgs/development/python-modules/pagelabels/default.nix b/pkgs/development/python-modules/pagelabels/default.nix index 5daa60f475d..c17f0ad60dd 100644 --- a/pkgs/development/python-modules/pagelabels/default.nix +++ b/pkgs/development/python-modules/pagelabels/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pdfrw }: +{ lib, buildPythonPackage, fetchPypi, pdfrw }: buildPythonPackage rec { pname = "pagelabels"; diff --git a/pkgs/development/python-modules/pagerduty/default.nix b/pkgs/development/python-modules/pagerduty/default.nix index ebe2c8b5854..8390cceb2fc 100644 --- a/pkgs/development/python-modules/pagerduty/default.nix +++ b/pkgs/development/python-modules/pagerduty/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/palettable/default.nix b/pkgs/development/python-modules/palettable/default.nix index d61973aa3bf..dce72bb74bb 100644 --- a/pkgs/development/python-modules/palettable/default.nix +++ b/pkgs/development/python-modules/palettable/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest }: +{ lib, buildPythonPackage, fetchPypi, pytest }: buildPythonPackage rec { pname = "palettable"; diff --git a/pkgs/development/python-modules/pamela/default.nix b/pkgs/development/python-modules/pamela/default.nix index 40597c36b58..7fd62dae2cd 100644 --- a/pkgs/development/python-modules/pamela/default.nix +++ b/pkgs/development/python-modules/pamela/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pkgs @@ -16,7 +16,7 @@ buildPythonPackage rec { postUnpack = '' substituteInPlace $sourceRoot/pamela.py --replace \ 'find_library("pam")' \ - '"${stdenv.lib.getLib pkgs.pam}/lib/libpam.so"' + '"${lib.getLib pkgs.pam}/lib/libpam.so"' ''; doCheck = false; diff --git a/pkgs/development/python-modules/pamqp/default.nix b/pkgs/development/python-modules/pamqp/default.nix index 2e8e4500f24..6df8b5491c9 100644 --- a/pkgs/development/python-modules/pamqp/default.nix +++ b/pkgs/development/python-modules/pamqp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , mock diff --git a/pkgs/development/python-modules/pandas-datareader/default.nix b/pkgs/development/python-modules/pandas-datareader/default.nix index c4bf9c140df..ea0ba44e99d 100644 --- a/pkgs/development/python-modules/pandas-datareader/default.nix +++ b/pkgs/development/python-modules/pandas-datareader/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytestCheckHook diff --git a/pkgs/development/python-modules/pandas/2.nix b/pkgs/development/python-modules/pandas/2.nix index e4f65a94dc5..936a3db296e 100644 --- a/pkgs/development/python-modules/pandas/2.nix +++ b/pkgs/development/python-modules/pandas/2.nix @@ -1,6 +1,7 @@ # Python 2 expression -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchPypi , python , stdenv @@ -26,11 +27,7 @@ , libcxx ? null }: -let - inherit (stdenv.lib) optional optionals optionalString; - inherit (stdenv) isDarwin; - -in buildPythonPackage rec { +buildPythonPackage rec { pname = "pandas"; version = "0.24.2"; @@ -42,7 +39,7 @@ in buildPythonPackage rec { checkInputs = [ pytest glibcLocales moto hypothesis ]; nativeBuildInputs = [ cython ]; - buildInputs = optional isDarwin libcxx; + buildInputs = lib.optional stdenv.isDarwin libcxx; propagatedBuildInputs = [ dateutil scipy @@ -61,7 +58,7 @@ in buildPythonPackage rec { # For OSX, we need to add a dependency on libcxx, which provides # `complex.h` and other libraries that pandas depends on to build. - postPatch = optionalString isDarwin '' + postPatch = lib.optionalString stdenv.isDarwin '' cpp_sdk="${libcxx}/include/c++/v1"; echo "Adding $cpp_sdk to the setup.py common_include variable" substituteInPlace setup.py \ @@ -70,7 +67,7 @@ in buildPythonPackage rec { ''; - disabledTests = stdenv.lib.concatMapStringsSep " and " (s: "not " + s) ([ + disabledTests = lib.concatMapStringsSep " and " (s: "not " + s) ([ # since dateutil 0.6.0 the following fails: test_fallback_plural, test_ambiguous_flags, test_ambiguous_compat # was supposed to be solved by https://github.com/dateutil/dateutil/issues/321, but is not the case "test_fallback_plural" @@ -86,7 +83,7 @@ in buildPythonPackage rec { "io" # KeyError Timestamp "test_to_excel" - ] ++ optionals isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ "test_locale" "test_clipboard" ]); @@ -98,7 +95,7 @@ in buildPythonPackage rec { '' # TODO: Get locale and clipboard support working on darwin. # Until then we disable the tests. - + optionalString isDarwin '' + + lib.optionalString stdenv.isDarwin '' # Fake the impure dependencies pbpaste and pbcopy echo "#!${runtimeShell}" > pbcopy echo "#!${runtimeShell}" > pbpaste @@ -109,14 +106,14 @@ in buildPythonPackage rec { runHook postCheck ''; - meta = { + meta = with lib; { # https://github.com/pandas-dev/pandas/issues/14866 # pandas devs are no longer testing i686 so safer to assume it's broken broken = stdenv.isi686; homepage = "https://pandas.pydata.org/"; description = "Python Data Analysis Library"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ raskin knedlsepp ]; - platforms = stdenv.lib.platforms.unix; + license = licenses.bsd3; + maintainers = with maintainers; [ raskin knedlsepp ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index b9865fe628b..ab70a7782ad 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -27,11 +27,7 @@ , libcxx ? null }: -let - inherit (stdenv.lib) optional optionals optionalString; - inherit (stdenv) isDarwin; - -in buildPythonPackage rec { +buildPythonPackage rec { pname = "pandas"; version = "1.1.5"; @@ -41,7 +37,7 @@ in buildPythonPackage rec { }; nativeBuildInputs = [ cython ]; - buildInputs = optional isDarwin libcxx; + buildInputs = lib.optional stdenv.isDarwin libcxx; propagatedBuildInputs = [ beautifulsoup4 bottleneck @@ -62,11 +58,11 @@ in buildPythonPackage rec { # doesn't work with -Werror,-Wunused-command-line-argument # https://github.com/NixOS/nixpkgs/issues/39687 - hardeningDisable = optional stdenv.cc.isClang "strictoverflow"; + hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow"; # For OSX, we need to add a dependency on libcxx, which provides # `complex.h` and other libraries that pandas depends on to build. - postPatch = optionalString isDarwin '' + postPatch = lib.optionalString stdenv.isDarwin '' cpp_sdk="${libcxx}/include/c++/v1"; echo "Adding $cpp_sdk to the setup.py common_include variable" substituteInPlace setup.py \ @@ -76,7 +72,7 @@ in buildPythonPackage rec { # Parallel Cythonization is broken in Python 3.8 on Darwin. Fixed in the next # release. https://github.com/pandas-dev/pandas/pull/30862 - setupPyBuildFlags = optionals (!(isPy38 && isDarwin)) [ + setupPyBuildFlags = lib.optionals (!(isPy38 && stdenv.isDarwin)) [ # As suggested by # https://pandas.pydata.org/pandas-docs/stable/development/contributing.html#creating-a-python-environment "--parallel=$NIX_BUILD_CORES" @@ -114,7 +110,7 @@ in buildPythonPackage rec { "test_constructor_with_embedded_frames" # tries to import compiled C extension locally "test_missing_required_dependency" - ] ++ optionals isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ "test_locale" "test_clipboard" ]; @@ -128,7 +124,7 @@ in buildPythonPackage rec { '' # TODO: Get locale and clipboard support working on darwin. # Until then we disable the tests. - + optionalString isDarwin '' + + lib.optionalString stdenv.isDarwin '' # Fake the impure dependencies pbpaste and pbcopy echo "#!${runtimeShell}" > pbcopy echo "#!${runtimeShell}" > pbpaste diff --git a/pkgs/development/python-modules/pandocfilters/default.nix b/pkgs/development/python-modules/pandocfilters/default.nix index d31bc2657c9..8ca57440b3f 100644 --- a/pkgs/development/python-modules/pandocfilters/default.nix +++ b/pkgs/development/python-modules/pandocfilters/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/panflute/default.nix b/pkgs/development/python-modules/panflute/default.nix new file mode 100644 index 00000000000..da08b858b1b --- /dev/null +++ b/pkgs/development/python-modules/panflute/default.nix @@ -0,0 +1,28 @@ +{ lib +, fetchPypi +, click +, pyyaml +, buildPythonPackage +, isPy3k +}: + +buildPythonPackage rec{ + version = "2.0.5"; + pname = "panflute"; + + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "1ssmqcyr91f0gpl49lz6a9jkl17l06h6qcik24rlmva28ii6aszz"; + }; + + propagatedBuildInputs = [ click pyyaml ]; + + meta = with lib; { + description = "A Pythonic alternative to John MacFarlane's pandocfilters, with extra helper functions"; + homepage = "http://scorreia.com/software/panflute"; + license = licenses.bsd3; + maintainers = with maintainers; [ synthetica ]; + }; +} diff --git a/pkgs/development/python-modules/paperspace/default.nix b/pkgs/development/python-modules/paperspace/default.nix deleted file mode 100644 index 4553b253819..00000000000 --- a/pkgs/development/python-modules/paperspace/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage -, boto3, requests, gradient_statsd, terminaltables -, click-completion , click-didyoumean, click-help-colors -, colorama, requests_toolbelt, gradient_sdk, progressbar2 -}: - -buildPythonPackage rec { - pname = "paperspace"; - version = "0.2.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "7959305128fea6da8ca0cdc528783a89859dacb9b54bf8eb89fd04a518872191"; - }; - - propagatedBuildInputs = [ boto3 requests gradient_statsd terminaltables - click-completion click-didyoumean click-help-colors requests_toolbelt - colorama gradient_sdk progressbar2 - ]; - - # tries to use /homeless-shelter to mimic container usage, etc - doCheck = false; - - meta = with lib; { - description = "Python API for Paperspace Cloud"; - homepage = "https://paperspace.com"; - license = licenses.isc; - platforms = platforms.unix; - maintainers = with maintainers; [ thoughtpolice ]; - }; -} diff --git a/pkgs/development/python-modules/papis/default.nix b/pkgs/development/python-modules/papis/default.nix index 93eafff6c93..b05a525d91a 100644 --- a/pkgs/development/python-modules/papis/default.nix +++ b/pkgs/development/python-modules/papis/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, xdg_utils +{ lib, buildPythonPackage, fetchFromGitHub, xdg-utils , requests, filetype, pyparsing, configparser, arxiv2bib , pyyaml, chardet, beautifulsoup4, colorama, bibtexparser , click, python-slugify, habanero, isbnlib, typing-extensions @@ -40,13 +40,12 @@ buildPythonPackage rec { --replace "python-slugify>=1.2.6,<4" "python-slugify" ''; - # pytest seems to hang with python3.8 - doCheck = !stdenv.isDarwin && pythonOlder "3.8"; + doCheck = !stdenv.isDarwin; checkInputs = ([ pytest pytestcov ]) ++ [ - xdg_utils + xdg-utils ]; # most of the downloader tests and 4 other tests require a network connection diff --git a/pkgs/development/python-modules/parameterized/default.nix b/pkgs/development/python-modules/parameterized/default.nix index 16925bd1286..207a6a38bd5 100644 --- a/pkgs/development/python-modules/parameterized/default.nix +++ b/pkgs/development/python-modules/parameterized/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, nose, mock, glibcLocales, isPy3k, isPy38 }: +{ lib, fetchPypi, buildPythonPackage, nose, mock, glibcLocales, isPy3k, isPy38 }: buildPythonPackage rec { pname = "parameterized"; diff --git a/pkgs/development/python-modules/paramz/default.nix b/pkgs/development/python-modules/paramz/default.nix index 65cc79745ca..99065aa1994 100644 --- a/pkgs/development/python-modules/paramz/default.nix +++ b/pkgs/development/python-modules/paramz/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, numpy, scipy, six, decorator, nose }: +{ lib, buildPythonPackage, fetchPypi, numpy, scipy, six, decorator, nose }: buildPythonPackage rec { pname = "paramz"; diff --git a/pkgs/development/python-modules/parse-type/default.nix b/pkgs/development/python-modules/parse-type/default.nix index e787c65fc11..decb15ff5e6 100644 --- a/pkgs/development/python-modules/parse-type/default.nix +++ b/pkgs/development/python-modules/parse-type/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi +{ lib, fetchPypi , buildPythonPackage, pythonOlder , pytest, pytestrunner , parse, six, enum34 @@ -14,7 +14,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest pytestrunner ]; - propagatedBuildInputs = [ parse six ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34; + propagatedBuildInputs = [ parse six ] ++ lib.optional (pythonOlder "3.4") enum34; checkPhase = '' py.test tests diff --git a/pkgs/development/python-modules/parse/default.nix b/pkgs/development/python-modules/parse/default.nix index d72e607bc41..c5c0c1d7ae6 100644 --- a/pkgs/development/python-modules/parse/default.nix +++ b/pkgs/development/python-modules/parse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi +{ lib, fetchPypi , buildPythonPackage, python }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/parsedatetime/default.nix b/pkgs/development/python-modules/parsedatetime/default.nix index 1f98940fff0..77196a7c0e9 100644 --- a/pkgs/development/python-modules/parsedatetime/default.nix +++ b/pkgs/development/python-modules/parsedatetime/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/pkgs/development/python-modules/parsimonious/default.nix b/pkgs/development/python-modules/parsimonious/default.nix index d41953246db..557e632f2ed 100644 --- a/pkgs/development/python-modules/parsimonious/default.nix +++ b/pkgs/development/python-modules/parsimonious/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/pkgs/development/python-modules/paste/default.nix b/pkgs/development/python-modules/paste/default.nix index a29deed503e..533a4dc3a30 100644 --- a/pkgs/development/python-modules/paste/default.nix +++ b/pkgs/development/python-modules/paste/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/pkgs/development/python-modules/pastedeploy/default.nix b/pkgs/development/python-modules/pastedeploy/default.nix index 950b232fa7e..672708b0fd9 100644 --- a/pkgs/development/python-modules/pastedeploy/default.nix +++ b/pkgs/development/python-modules/pastedeploy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytestrunner diff --git a/pkgs/development/python-modules/pastescript/default.nix b/pkgs/development/python-modules/pastescript/default.nix index 57dbb7b9352..a526d383393 100644 --- a/pkgs/development/python-modules/pastescript/default.nix +++ b/pkgs/development/python-modules/pastescript/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/pkgs/development/python-modules/patator/default.nix b/pkgs/development/python-modules/patator/default.nix index 96ed85d7bce..2f0a9b9b62b 100644 --- a/pkgs/development/python-modules/patator/default.nix +++ b/pkgs/development/python-modules/patator/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, isPy27, fetchPypi +{ lib, buildPythonPackage, isPy27, fetchPypi , paramiko, pycurl, ajpy, impacket, pyopenssl, cx_oracle, mysqlclient , psycopg2, pycrypto, dnspython, ipy, pysnmp, pyasn1, pysqlcipher3 }: diff --git a/pkgs/development/python-modules/patch-ng/default.nix b/pkgs/development/python-modules/patch-ng/default.nix index 981dc067fe7..126155722f4 100644 --- a/pkgs/development/python-modules/patch-ng/default.nix +++ b/pkgs/development/python-modules/patch-ng/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/patch/default.nix b/pkgs/development/python-modules/patch/default.nix index 8d7e78c6c27..ed11b3a4b52 100644 --- a/pkgs/development/python-modules/patch/default.nix +++ b/pkgs/development/python-modules/patch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchzip }: diff --git a/pkgs/development/python-modules/path-and-address/default.nix b/pkgs/development/python-modules/path-and-address/default.nix index 9512b0eb0b8..bd71ffad0f2 100644 --- a/pkgs/development/python-modules/path-and-address/default.nix +++ b/pkgs/development/python-modules/path-and-address/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , pytest diff --git a/pkgs/development/python-modules/pathos/default.nix b/pkgs/development/python-modules/pathos/default.nix index 77807090602..fd6bd238d1e 100644 --- a/pkgs/development/python-modules/pathos/default.nix +++ b/pkgs/development/python-modules/pathos/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , dill diff --git a/pkgs/development/python-modules/pathtools/default.nix b/pkgs/development/python-modules/pathtools/default.nix index 57fff82a81d..86c2aeb88dc 100644 --- a/pkgs/development/python-modules/pathtools/default.nix +++ b/pkgs/development/python-modules/pathtools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/patool/default.nix b/pkgs/development/python-modules/patool/default.nix index 1420597a1f3..2fa07d32ccb 100644 --- a/pkgs/development/python-modules/patool/default.nix +++ b/pkgs/development/python-modules/patool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook, p7zip, +{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook, p7zip, unzip, cabextract, zip, zopfli, lzip, zpaq, gnutar, gnugrep, diffutils, file, gzip, bzip2, xz}: diff --git a/pkgs/development/python-modules/paver/default.nix b/pkgs/development/python-modules/paver/default.nix index 5d01df22b6d..8721ef3dd60 100644 --- a/pkgs/development/python-modules/paver/default.nix +++ b/pkgs/development/python-modules/paver/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/pkgs/development/python-modules/pbkdf2/default.nix b/pkgs/development/python-modules/pbkdf2/default.nix index 18a2b9b95a3..8f489ca24b9 100644 --- a/pkgs/development/python-modules/pbkdf2/default.nix +++ b/pkgs/development/python-modules/pbkdf2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "pbkdf2"; diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix index bc7c6399473..6b204a946b3 100644 --- a/pkgs/development/python-modules/pbr/default.nix +++ b/pkgs/development/python-modules/pbr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "pbr"; @@ -12,9 +12,9 @@ buildPythonPackage rec { # circular dependencies with fixtures doCheck = false; - meta = { + meta = with lib; { homepage = "http://docs.openstack.org/developer/pbr/"; - license = stdenv.lib.licenses.asl20; + license = licenses.asl20; description = "Python Build Reasonableness"; }; } diff --git a/pkgs/development/python-modules/pc-ble-driver-py/default.nix b/pkgs/development/python-modules/pc-ble-driver-py/default.nix index 6a12eea1b00..bd6432db534 100644 --- a/pkgs/development/python-modules/pc-ble-driver-py/default.nix +++ b/pkgs/development/python-modules/pc-ble-driver-py/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, git, swig, boost, udev, pc-ble-driver, pythonOlder +{ lib, fetchFromGitHub, cmake, git, swig, boost, udev, pc-ble-driver, pythonOlder , buildPythonPackage, enum34, wrapt, future, setuptools, scikit-build, pythonAtLeast }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pcpp/default.nix b/pkgs/development/python-modules/pcpp/default.nix index aea7ff0fcda..704e979c2ca 100644 --- a/pkgs/development/python-modules/pcpp/default.nix +++ b/pkgs/development/python-modules/pcpp/default.nix @@ -1,6 +1,6 @@ { buildPythonPackage , fetchFromGitHub -, lib, stdenv +, lib }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pdf2image/default.nix b/pkgs/development/python-modules/pdf2image/default.nix index adc43ef4c2e..4eddc028a25 100644 --- a/pkgs/development/python-modules/pdf2image/default.nix +++ b/pkgs/development/python-modules/pdf2image/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pillow, poppler_utils }: +{ lib, buildPythonPackage, fetchPypi, pillow, poppler_utils }: buildPythonPackage rec { pname = "pdf2image"; diff --git a/pkgs/development/python-modules/pdfkit/default.nix b/pkgs/development/python-modules/pdfkit/default.nix index 10bc09e8ca9..431f7f09796 100644 --- a/pkgs/development/python-modules/pdfkit/default.nix +++ b/pkgs/development/python-modules/pdfkit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/pdfminer_six/default.nix b/pkgs/development/python-modules/pdfminer_six/default.nix index 9a659eebe33..96ba6686905 100644 --- a/pkgs/development/python-modules/pdfminer_six/default.nix +++ b/pkgs/development/python-modules/pdfminer_six/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy3k, cryptography, chardet, nose, sortedcontainers }: +{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, cryptography, chardet, nose, sortedcontainers }: buildPythonPackage rec { pname = "pdfminer_six"; diff --git a/pkgs/development/python-modules/pdfposter/default.nix b/pkgs/development/python-modules/pdfposter/default.nix index 0a21ed1e499..00cfea5cc9b 100644 --- a/pkgs/development/python-modules/pdfposter/default.nix +++ b/pkgs/development/python-modules/pdfposter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pypdf2 }: +{ lib, buildPythonPackage, fetchPypi, pypdf2 }: buildPythonPackage rec { pname = "pdftools.pdfposter"; diff --git a/pkgs/development/python-modules/pdfrw/default.nix b/pkgs/development/python-modules/pdfrw/default.nix index 49abb3751c9..5cc619ef6a4 100644 --- a/pkgs/development/python-modules/pdfrw/default.nix +++ b/pkgs/development/python-modules/pdfrw/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "pdfrw"; diff --git a/pkgs/development/python-modules/pdfx/default.nix b/pkgs/development/python-modules/pdfx/default.nix index 97dee7e7570..a8c110fdba7 100644 --- a/pkgs/development/python-modules/pdfx/default.nix +++ b/pkgs/development/python-modules/pdfx/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pdfminer, chardet, pytest }: +{ lib, buildPythonPackage, fetchFromGitHub, pdfminer, chardet, pytest }: buildPythonPackage rec { pname = "pdfx"; diff --git a/pkgs/development/python-modules/pebble/default.nix b/pkgs/development/python-modules/pebble/default.nix new file mode 100644 index 00000000000..68aa1ba9707 --- /dev/null +++ b/pkgs/development/python-modules/pebble/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, isPy27, fetchPypi, pytestCheckHook }: + +buildPythonPackage rec { + pname = "pebble"; + version = "4.6.0"; + disabled = isPy27; + + src = fetchPypi { + pname = "Pebble"; + inherit version; + sha256 = "0a595f7mrf89xlck9b2x83bqybc9zd9jxkl0sa5cf19vax18rg8h"; + }; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "API to manage threads and processes within an application"; + homepage = "https://github.com/noxdafox/pebble"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ orivej ]; + }; +} diff --git a/pkgs/development/python-modules/pecan/default.nix b/pkgs/development/python-modules/pecan/default.nix index 7303a9b1504..a66c4077c3c 100644 --- a/pkgs/development/python-modules/pecan/default.nix +++ b/pkgs/development/python-modules/pecan/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchPypi , buildPythonPackage , isPy27 @@ -45,7 +45,7 @@ buildPythonPackage rec { mock sqlalchemy virtualenv - ] ++ stdenv.lib.optionals isPy27 [ Kajiki ]; + ] ++ lib.optionals isPy27 [ Kajiki ]; pytestFlagsArray = [ "--pyargs pecan " diff --git a/pkgs/development/python-modules/peewee/default.nix b/pkgs/development/python-modules/peewee/default.nix index ee3d08a173c..6f5d8e26227 100644 --- a/pkgs/development/python-modules/peewee/default.nix +++ b/pkgs/development/python-modules/peewee/default.nix @@ -1,4 +1,6 @@ -{ stdenv, lib, buildPythonPackage, fetchFromGitHub +{ lib +, buildPythonPackage +, fetchFromGitHub , sqlite , cython , apsw @@ -40,7 +42,7 @@ buildPythonPackage rec { doCheck = withPostgres; - meta = with stdenv.lib;{ + meta = with lib; { description = "a small, expressive orm"; homepage = "http://peewee-orm.com"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix index 0b103b780c0..71bec7e42df 100644 --- a/pkgs/development/python-modules/pelican/default.nix +++ b/pkgs/development/python-modules/pelican/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy27 +{ lib, buildPythonPackage, fetchFromGitHub, isPy27 , glibcLocales, git , mock, nose, markdown, lxml, typogrify , jinja2, pygments, docutils, pytz, unidecode, six, dateutil, feedgenerator diff --git a/pkgs/development/python-modules/pep257/default.nix b/pkgs/development/python-modules/pep257/default.nix index 296b55eec12..e9cba70e631 100644 --- a/pkgs/development/python-modules/pep257/default.nix +++ b/pkgs/development/python-modules/pep257/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchurl, pytest, mock }: +{ lib, buildPythonPackage, fetchurl, pytest, mock }: buildPythonPackage rec { pname = "pep257"; version = "0.7.0"; diff --git a/pkgs/development/python-modules/pep8/default.nix b/pkgs/development/python-modules/pep8/default.nix index 8ef3bfea0f5..cc0e546b957 100644 --- a/pkgs/development/python-modules/pep8/default.nix +++ b/pkgs/development/python-modules/pep8/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/peppercorn/default.nix b/pkgs/development/python-modules/peppercorn/default.nix index 6caf61b0cd0..310cc565b21 100644 --- a/pkgs/development/python-modules/peppercorn/default.nix +++ b/pkgs/development/python-modules/peppercorn/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/persisting-theory/default.nix b/pkgs/development/python-modules/persisting-theory/default.nix index 86bae927d9f..6859b6264a8 100644 --- a/pkgs/development/python-modules/persisting-theory/default.nix +++ b/pkgs/development/python-modules/persisting-theory/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , nose }: diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index 1d7de0088a8..e65f62c8ff7 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , setuptools diff --git a/pkgs/development/python-modules/pexif/default.nix b/pkgs/development/python-modules/pexif/default.nix index 326dde176ae..a31d80eed05 100644 --- a/pkgs/development/python-modules/pexif/default.nix +++ b/pkgs/development/python-modules/pexif/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/pg8000/1_12.nix b/pkgs/development/python-modules/pg8000/1_12.nix index d84bb2014b8..e53817b3911 100644 --- a/pkgs/development/python-modules/pg8000/1_12.nix +++ b/pkgs/development/python-modules/pg8000/1_12.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytz diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix index 8f63e00e799..9f9bb1702a9 100644 --- a/pkgs/development/python-modules/pg8000/default.nix +++ b/pkgs/development/python-modules/pg8000/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , scramp diff --git a/pkgs/development/python-modules/pgpdump/default.nix b/pkgs/development/python-modules/pgpdump/default.nix index d795cc3678f..e952ced742c 100644 --- a/pkgs/development/python-modules/pgpdump/default.nix +++ b/pkgs/development/python-modules/pgpdump/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/pgsanity/default.nix b/pkgs/development/python-modules/pgsanity/default.nix index b95f461aa37..26e5eb2bd6a 100644 --- a/pkgs/development/python-modules/pgsanity/default.nix +++ b/pkgs/development/python-modules/pgsanity/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , python , fetchPypi , buildPythonPackage @@ -30,7 +30,7 @@ buildPythonPackage rec { run it through ecpg and let ecpg report on the syntax errors of the SQL. ''; - license = stdenv.lib.licenses.mit; + license = licenses.mit; maintainers = with maintainers; [ nalbyuites ]; }; } diff --git a/pkgs/development/python-modules/pgspecial/default.nix b/pkgs/development/python-modules/pgspecial/default.nix index 796a3819881..476921da632 100644 --- a/pkgs/development/python-modules/pgspecial/default.nix +++ b/pkgs/development/python-modules/pgspecial/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, psycopg2, click, sqlparse }: +{ lib, buildPythonPackage, fetchPypi, pytest, psycopg2, click, sqlparse }: buildPythonPackage rec { pname = "pgspecial"; diff --git a/pkgs/development/python-modules/phe/default.nix b/pkgs/development/python-modules/phe/default.nix index 5a00a4ccb09..86a5ec848ac 100644 --- a/pkgs/development/python-modules/phe/default.nix +++ b/pkgs/development/python-modules/phe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPyPy, isPy3k, click, gmpy2, numpy } : +{ lib, buildPythonPackage, fetchPypi, isPyPy, isPy3k, click, gmpy2, numpy } : let pname = "phe"; diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 62149a78866..354ca2796e1 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "phonenumbers"; @@ -9,10 +9,10 @@ buildPythonPackage rec { sha256 = "96d02120a3481e22d8a8eb5e4595ceec1930855749f6e4a06ef931881f59f562"; }; - meta = { + meta = with lib; { description = "Python version of Google's common library for parsing, formatting, storing and validating international phone numbers"; homepage = "https://github.com/daviddrysdale/python-phonenumbers"; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ fadenb ]; + license = licenses.asl20; + maintainers = with maintainers; [ fadenb ]; }; } diff --git a/pkgs/development/python-modules/phonopy/default.nix b/pkgs/development/python-modules/phonopy/default.nix index 03e0c54caab..2259fcd7ba5 100644 --- a/pkgs/development/python-modules/phonopy/default.nix +++ b/pkgs/development/python-modules/phonopy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, python, fetchPypi, numpy, pyyaml, matplotlib, h5py, spglib, pytestCheckHook }: +{ lib, buildPythonPackage, python, fetchPypi, numpy, pyyaml, matplotlib, h5py, spglib, pytestCheckHook }: buildPythonPackage rec { pname = "phonopy"; diff --git a/pkgs/development/python-modules/phx-class-registry/default.nix b/pkgs/development/python-modules/phx-class-registry/default.nix index 9ed84e86371..94538dc6e74 100644 --- a/pkgs/development/python-modules/phx-class-registry/default.nix +++ b/pkgs/development/python-modules/phx-class-registry/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, pytestCheckHook }: +{ lib, buildPythonPackage, fetchPypi, isPy27, pytestCheckHook }: buildPythonPackage rec { pname = "phx-class-registry"; diff --git a/pkgs/development/python-modules/pickleshare/default.nix b/pkgs/development/python-modules/pickleshare/default.nix index 0171adc6bfc..34798cc3ee5 100644 --- a/pkgs/development/python-modules/pickleshare/default.nix +++ b/pkgs/development/python-modules/pickleshare/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pathpy @@ -16,7 +16,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ pathpy ] - ++ stdenv.lib.optional (pythonOlder "3.4") pathlib2; + ++ lib.optional (pythonOlder "3.4") pathlib2; # No proper test suite doCheck = false; diff --git a/pkgs/development/python-modules/pid/default.nix b/pkgs/development/python-modules/pid/default.nix index 95aca29da5d..f4ce57b3a20 100644 --- a/pkgs/development/python-modules/pid/default.nix +++ b/pkgs/development/python-modules/pid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/pkgs/development/python-modules/piep/default.nix b/pkgs/development/python-modules/piep/default.nix index c4fd24d070e..aacd9e314cb 100644 --- a/pkgs/development/python-modules/piep/default.nix +++ b/pkgs/development/python-modules/piep/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/pkgs/development/python-modules/piexif/default.nix b/pkgs/development/python-modules/piexif/default.nix index c08ee8338b0..440df36384c 100644 --- a/pkgs/development/python-modules/piexif/default.nix +++ b/pkgs/development/python-modules/piexif/default.nix @@ -1,18 +1,28 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pillow }: +{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, pillow }: buildPythonPackage rec { pname = "piexif"; version = "1.1.3"; + # patch does not apply to PyPI sdist due to different line endings + src = fetchFromGitHub { + owner = "hMatoba"; + repo = "Piexif"; + rev = version; + sha256 = "1akmaxq1cjr8wghwaaql1bd3sajl8psshl58lprgfsigrvnklp8b"; + }; + + patches = [ + # Fix tests with Pillow >= 7.2.0: https://github.com/hMatoba/Piexif/pull/109 + (fetchpatch { + url = "https://github.com/hMatoba/Piexif/commit/5209b53e9689ce28dcd045f384633378d619718f.patch"; + sha256 = "0ak571jf76r1vszp2g3cd5c16fz2zkbi43scayy933m5qdrhd8g1"; + }) + ]; + # Pillow needed for unit tests checkInputs = [ pillow ]; - src = fetchPypi { - inherit pname version; - extension = "zip"; - sha256 = "06sz58q4mrw472p8fbnq7wsj8zpi5js5r8phm2hiwfmz0v33bjw3"; - }; - meta = with lib; { description = "Simplify Exif manipulations with Python"; homepage = "https://github.com/hMatoba/Piexif"; diff --git a/pkgs/development/python-modules/pika-pool/default.nix b/pkgs/development/python-modules/pika-pool/default.nix index a36fcdf18bb..051fdef8fe7 100644 --- a/pkgs/development/python-modules/pika-pool/default.nix +++ b/pkgs/development/python-modules/pika-pool/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , pika }: diff --git a/pkgs/development/python-modules/pika/default.nix b/pkgs/development/python-modules/pika/default.nix index ec8310bdb55..c1bfe5297d7 100644 --- a/pkgs/development/python-modules/pika/default.nix +++ b/pkgs/development/python-modules/pika/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index ff2a2ce4c5e..38efe0a49b0 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -18,7 +18,7 @@ , qpdf , setuptools-scm-git-archive , setuptools_scm -, lib, stdenv +, lib }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pilkit/default.nix b/pkgs/development/python-modules/pilkit/default.nix index 4a3c682c122..bc21d6bf465 100644 --- a/pkgs/development/python-modules/pilkit/default.nix +++ b/pkgs/development/python-modules/pilkit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pillow diff --git a/pkgs/development/python-modules/pillow-simd/default.nix b/pkgs/development/python-modules/pillow-simd/default.nix new file mode 100644 index 00000000000..3aed634dfb1 --- /dev/null +++ b/pkgs/development/python-modules/pillow-simd/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPyPy, isPy3k +, olefile, freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2 +, tk, libX11, openjpeg, libimagequant, pyroma, numpy, pytestCheckHook +}@args: + +import ../pillow/generic.nix (rec { + pname = "Pillow-SIMD"; + version = "7.0.0.post3"; + + disabled = !isPy3k; + + src = fetchFromGitHub { + owner = "uploadcare"; + repo = "pillow-simd"; + rev = "v${version}"; + sha256 = "1h832xp1bzf951hr4dmjmxqfsv28sx9lr2cq96qdz1c72k40zj1h"; + }; + + meta = with lib; { + homepage = "https://python-pillow.github.io/pillow-perf/"; + description = "The friendly PIL fork - SIMD version"; + longDescription = '' + Pillow-SIMD is "following" Pillow. Pillow-SIMD versions are 100% compatible drop-in replacements for Pillow of the same version. + + SIMD stands for "single instruction, multiple data" and its essence is in performing the same operation on multiple data points simultaneously by using multiple processing elements. Common CPU SIMD instruction sets are MMX, SSE-SSE4, AVX, AVX2, AVX512, NEON. + + Currently, Pillow-SIMD can be compiled with SSE4 (default) or AVX2 support. + ''; + license = "http://www.pythonware.com/products/pil/license.htm"; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} // args ) diff --git a/pkgs/development/python-modules/pillow/6.nix b/pkgs/development/python-modules/pillow/6.nix index ce28b19a013..51833edfd0b 100644 --- a/pkgs/development/python-modules/pillow/6.nix +++ b/pkgs/development/python-modules/pillow/6.nix @@ -1,75 +1,22 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPyPy -, olefile -, freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2, tk, libX11 -, openjpeg, libimagequant -, pytest, pytestrunner, pyroma, numpy -}: +{ lib, stdenv, buildPythonPackage, fetchPypi, isPyPy, isPy3k +, olefile, freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2, tk, libX11 +, openjpeg, libimagequant, pyroma, numpy, pytestCheckHook +}@args: -buildPythonPackage rec { +import ./generic.nix (rec { pname = "Pillow"; version = "6.2.2"; + disabled = !isPy3k; + src = fetchPypi { inherit pname version; sha256 = "0l5rv8jkdrb5q846v60v03mcq64yrhklidjkgwv6s1pda71g17yv"; }; - # Disable imagefont tests, because they don't work well with infinality: - # https://github.com/python-pillow/Pillow/issues/1259 - postPatch = '' - rm Tests/test_imagefont.py - ''; - - checkPhase = '' - runHook preCheck - python -m pytest -v -x -W always${stdenv.lib.optionalString stdenv.isDarwin " --deselect=Tests/test_file_icns.py::TestFileIcns::test_save --deselect=Tests/test_imagegrab.py::TestImageGrab::test_grab"} - runHook postCheck - ''; - - propagatedBuildInputs = [ olefile ]; - - checkInputs = [ pytest pytestrunner pyroma numpy ]; - - buildInputs = [ - freetype libjpeg openjpeg libimagequant zlib libtiff libwebp tcl lcms2 ] - ++ stdenv.lib.optionals (isPyPy) [ tk libX11 ]; - - # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp. - # NOTE: The Pillow install script will, by default, add paths like /usr/lib - # and /usr/include to the search paths. This can break things when building - # on a non-NixOS system that has some libraries installed that are not - # installed in Nix (for example, Arch Linux has jpeg2000 but Nix doesn't - # build Pillow with this support). We patch the `disable_platform_guessing` - # setting here, instead of passing the `--disable-platform-guessing` - # command-line option, since the command-line option doesn't work when we run - # tests. - preConfigure = let - libinclude' = pkg: ''"${pkg.out}/lib", "${pkg.out}/include"''; - libinclude = pkg: ''"${pkg.out}/lib", "${pkg.dev}/include"''; - in '' - sed -i "setup.py" \ - -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = ${libinclude freetype}|g ; - s|^JPEG_ROOT =.*$|JPEG_ROOT = ${libinclude libjpeg}|g ; - s|^JPEG2K_ROOT =.*$|JPEG2K_ROOT = ${libinclude openjpeg}|g ; - s|^IMAGEQUANT_ROOT =.*$|IMAGEQUANT_ROOT = ${libinclude' libimagequant}|g ; - s|^ZLIB_ROOT =.*$|ZLIB_ROOT = ${libinclude zlib}|g ; - s|^LCMS_ROOT =.*$|LCMS_ROOT = ${libinclude lcms2}|g ; - s|^TIFF_ROOT =.*$|TIFF_ROOT = ${libinclude libtiff}|g ; - s|^TCL_ROOT=.*$|TCL_ROOT = ${libinclude' tcl}|g ; - s|self\.disable_platform_guessing = None|self.disable_platform_guessing = True|g ;' - export LDFLAGS="-L${libwebp}/lib" - export CFLAGS="-I${libwebp}/include" - '' - # Remove impurities - + stdenv.lib.optionalString stdenv.isDarwin '' - substituteInPlace setup.py \ - --replace '"/Library/Frameworks",' "" \ - --replace '"/System/Library/Frameworks"' "" - ''; - meta = with lib; { - homepage = "https://python-pillow.github.io/"; - description = "Fork of The Python Imaging Library (PIL)"; + homepage = "https://python-pillow.org/"; + description = "The friendly PIL fork (Python Imaging Library)"; longDescription = '' The Python Imaging Library (PIL) adds image processing capabilities to your Python interpreter. This library @@ -77,6 +24,6 @@ buildPythonPackage rec { processing and graphics capabilities. ''; license = "http://www.pythonware.com/products/pil/license.htm"; - maintainers = with maintainers; [ goibhniu prikhi ]; + maintainers = with maintainers; [ goibhniu prikhi SuperSandro2000 ]; }; -} +} // args ) diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index 1122d21b534..051e6ab8c6f 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -1,12 +1,9 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPyPy -, olefile -, freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2, tk, libX11 -, openjpeg, libimagequant -, pyroma, numpy, pytestCheckHook -, isPy3k -}: +{ lib, stdenv, buildPythonPackage, fetchPypi, isPyPy, isPy3k +, olefile, freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2, tk, libX11 +, libxcb, openjpeg, libimagequant, pyroma, numpy, pytestCheckHook +}@args: -buildPythonPackage rec { +import ./generic.nix (rec { pname = "Pillow"; version = "8.0.1"; @@ -17,56 +14,6 @@ buildPythonPackage rec { sha256 = "11c5c6e9b02c9dac08af04f093eb5a2f84857df70a7d4a6a6ad461aca803fb9e"; }; - # Disable imagefont tests, because they don't work well with infinality: - # https://github.com/python-pillow/Pillow/issues/1259 - postPatch = '' - rm Tests/test_imagefont.py - ''; - - # Disable darwin tests which require executables: `iconutil` and `screencapture` - disabledTests = stdenv.lib.optionals stdenv.isDarwin [ "test_save" "test_grab" "test_grabclipboard" ]; - - propagatedBuildInputs = [ olefile ]; - - checkInputs = [ pytestCheckHook pyroma numpy ]; - - buildInputs = [ - freetype libjpeg openjpeg libimagequant zlib libtiff libwebp tcl lcms2 ] - ++ stdenv.lib.optionals (isPyPy) [ tk libX11 ]; - - # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp. - # NOTE: The Pillow install script will, by default, add paths like /usr/lib - # and /usr/include to the search paths. This can break things when building - # on a non-NixOS system that has some libraries installed that are not - # installed in Nix (for example, Arch Linux has jpeg2000 but Nix doesn't - # build Pillow with this support). We patch the `disable_platform_guessing` - # setting here, instead of passing the `--disable-platform-guessing` - # command-line option, since the command-line option doesn't work when we run - # tests. - preConfigure = let - libinclude' = pkg: ''"${pkg.out}/lib", "${pkg.out}/include"''; - libinclude = pkg: ''"${pkg.out}/lib", "${pkg.dev}/include"''; - in '' - sed -i "setup.py" \ - -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = ${libinclude freetype}|g ; - s|^JPEG_ROOT =.*$|JPEG_ROOT = ${libinclude libjpeg}|g ; - s|^JPEG2K_ROOT =.*$|JPEG2K_ROOT = ${libinclude openjpeg}|g ; - s|^IMAGEQUANT_ROOT =.*$|IMAGEQUANT_ROOT = ${libinclude' libimagequant}|g ; - s|^ZLIB_ROOT =.*$|ZLIB_ROOT = ${libinclude zlib}|g ; - s|^LCMS_ROOT =.*$|LCMS_ROOT = ${libinclude lcms2}|g ; - s|^TIFF_ROOT =.*$|TIFF_ROOT = ${libinclude libtiff}|g ; - s|^TCL_ROOT=.*$|TCL_ROOT = ${libinclude' tcl}|g ; - s|self\.disable_platform_guessing = None|self.disable_platform_guessing = True|g ;' - export LDFLAGS="-L${libwebp}/lib" - export CFLAGS="-I${libwebp}/include" - '' - # Remove impurities - + stdenv.lib.optionalString stdenv.isDarwin '' - substituteInPlace setup.py \ - --replace '"/Library/Frameworks",' "" \ - --replace '"/System/Library/Frameworks"' "" - ''; - meta = with lib; { homepage = "https://python-pillow.org/"; description = "The friendly PIL fork (Python Imaging Library)"; @@ -77,6 +24,6 @@ buildPythonPackage rec { processing and graphics capabilities. ''; license = "http://www.pythonware.com/products/pil/license.htm"; - maintainers = with maintainers; [ goibhniu prikhi ]; + maintainers = with maintainers; [ goibhniu prikhi SuperSandro2000 ]; }; -} +} // args ) diff --git a/pkgs/development/python-modules/pillow/generic.nix b/pkgs/development/python-modules/pillow/generic.nix new file mode 100644 index 00000000000..dbf27febeb9 --- /dev/null +++ b/pkgs/development/python-modules/pillow/generic.nix @@ -0,0 +1,73 @@ +{ pname +, version +, disabled +, src +, meta +, ... +}@args: + +with args; + +buildPythonPackage rec { + inherit pname version src meta; + + # Disable imagefont tests, because they don't work well with infinality: + # https://github.com/python-pillow/Pillow/issues/1259 + postPatch = '' + rm Tests/test_imagefont.py + ''; + + # Disable darwin tests which require executables: `iconutil` and `screencapture` + disabledTests = lib.optionals stdenv.isDarwin [ + "test_grab" + "test_grabclipboard" + "test_save" + + # pillow-simd + "test_roundtrip" + "test_basic" + ]; + + propagatedBuildInputs = [ olefile ]; + + checkInputs = [ pytestCheckHook pyroma numpy ]; + + buildInputs = [ freetype libjpeg openjpeg libimagequant zlib libtiff libwebp tcl lcms2 ] + ++ lib.optionals (lib.versionAtLeast version "7.1.0") [ libxcb ] + ++ lib.optionals (isPyPy) [ tk libX11 ]; + + # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp. + # NOTE: The Pillow install script will, by default, add paths like /usr/lib + # and /usr/include to the search paths. This can break things when building + # on a non-NixOS system that has some libraries installed that are not + # installed in Nix (for example, Arch Linux has jpeg2000 but Nix doesn't + # build Pillow with this support). We patch the `disable_platform_guessing` + # setting here, instead of passing the `--disable-platform-guessing` + # command-line option, since the command-line option doesn't work when we run + # tests. + preConfigure = let + libinclude' = pkg: ''"${pkg.out}/lib", "${pkg.out}/include"''; + libinclude = pkg: ''"${pkg.out}/lib", "${pkg.dev}/include"''; + in '' + sed -i "setup.py" \ + -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = ${libinclude freetype}|g ; + s|^JPEG_ROOT =.*$|JPEG_ROOT = ${libinclude libjpeg}|g ; + s|^JPEG2K_ROOT =.*$|JPEG2K_ROOT = ${libinclude openjpeg}|g ; + s|^IMAGEQUANT_ROOT =.*$|IMAGEQUANT_ROOT = ${libinclude' libimagequant}|g ; + s|^ZLIB_ROOT =.*$|ZLIB_ROOT = ${libinclude zlib}|g ; + s|^LCMS_ROOT =.*$|LCMS_ROOT = ${libinclude lcms2}|g ; + s|^TIFF_ROOT =.*$|TIFF_ROOT = ${libinclude libtiff}|g ; + s|^TCL_ROOT=.*$|TCL_ROOT = ${libinclude' tcl}|g ; + s|self\.disable_platform_guessing = None|self.disable_platform_guessing = True|g ;' + export LDFLAGS="$LDFLAGS -L${libwebp}/lib" + export CFLAGS="$CFLAGS -I${libwebp}/include" + '' + lib.optionalString (lib.versionAtLeast version "7.1.0") '' + export LDFLAGS="$LDFLAGS -L${libxcb}/lib" + export CFLAGS="$CFLAGS -I${libxcb.dev}/include" + '' + lib.optionalString stdenv.isDarwin '' + # Remove impurities + substituteInPlace setup.py \ + --replace '"/Library/Frameworks",' "" \ + --replace '"/System/Library/Frameworks"' "" + ''; +} diff --git a/pkgs/development/python-modules/pillowfight/default.nix b/pkgs/development/python-modules/pillowfight/default.nix index 9e23f69d19c..c022fdb988d 100644 --- a/pkgs/development/python-modules/pillowfight/default.nix +++ b/pkgs/development/python-modules/pillowfight/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pillow diff --git a/pkgs/development/python-modules/pims/default.nix b/pkgs/development/python-modules/pims/default.nix index d2a5641acff..bfe4e2b9ea0 100644 --- a/pkgs/development/python-modules/pims/default.nix +++ b/pkgs/development/python-modules/pims/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , slicerator diff --git a/pkgs/development/python-modules/pint/default.nix b/pkgs/development/python-modules/pint/default.nix index bb2a20cf62f..c0aa86a3763 100644 --- a/pkgs/development/python-modules/pint/default.nix +++ b/pkgs/development/python-modules/pint/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.6"; nativeBuildInputs = [ setuptools_scm ]; - + propagatedBuildInputs = [ packaging ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index 398ab8cd29b..4ea6f75932c 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, pip, pytest, click, six +{ lib, fetchPypi, buildPythonPackage, pip, pytest, click, six , setuptools_scm, git, glibcLocales, mock }: buildPythonPackage rec { @@ -14,7 +14,7 @@ buildPythonPackage rec { checkInputs = [ pytest git glibcLocales mock ]; propagatedBuildInputs = [ pip click six setuptools_scm ]; - disabledTests = stdenv.lib.concatMapStringsSep " and " (s: "not " + s) [ + disabledTests = lib.concatMapStringsSep " and " (s: "not " + s) [ # Depend on network tests: "test_allow_unsafe_option" #paramaterized, but all fail "test_annotate_option" #paramaterized, but all fail diff --git a/pkgs/development/python-modules/pipx/default.nix b/pkgs/development/python-modules/pipx/default.nix index 122f34edb60..c29847c9f29 100644 --- a/pkgs/development/python-modules/pipx/default.nix +++ b/pkgs/development/python-modules/pipx/default.nix @@ -5,12 +5,13 @@ , userpath , argcomplete , packaging +, importlib-metadata , pytestCheckHook }: buildPythonPackage rec { pname = "pipx"; - version = "0.15.6.0"; + version = "0.16.0.0"; disabled = pythonOlder "3.6"; @@ -19,10 +20,16 @@ buildPythonPackage rec { owner = "pipxproject"; repo = pname; rev = version; - sha256 = "1yffswayjfkmq86ygisja0mkg55pqj9pdml5nc0z05222sfnvn1a"; + sha256 = "08mn7vm8iw20pg0gfn491y1jx8wcyjijps6f1hy7ipzd5ckynscn"; }; - propagatedBuildInputs = [ userpath argcomplete packaging ]; + propagatedBuildInputs = [ + userpath + argcomplete + packaging + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ]; checkInputs = [ pytestCheckHook ]; @@ -31,6 +38,7 @@ buildPythonPackage rec { ''; # disable tests, which require internet connection + pytestFlagsArray = [ "--ignore=tests/test_install_all_packages.py" ]; disabledTests = [ "install" "inject" @@ -38,10 +46,12 @@ buildPythonPackage rec { "missing_interpreter" "cache" "internet" + "run" "runpip" "upgrade" "suffix" "legacy_venv" + "determination" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pivy/default.nix b/pkgs/development/python-modules/pivy/default.nix index aae90d2f8b4..c51f8cb54e0 100644 --- a/pkgs/development/python-modules/pivy/default.nix +++ b/pkgs/development/python-modules/pivy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pkgs, qtbase, qmake, soqt }: +{ lib, buildPythonPackage, fetchFromGitHub, pkgs, qtbase, qmake, soqt }: buildPythonPackage rec { pname = "pivy"; @@ -29,8 +29,7 @@ buildPythonPackage rec { ]; dontUseQmakeConfigure = true; - dontUseCmakeConfigure = true; - + dontWrapQtApps =true; doCheck = false; postPatch = '' diff --git a/pkgs/development/python-modules/pkginfo/default.nix b/pkgs/development/python-modules/pkginfo/default.nix index dbf487c5d3a..5216ab17879 100644 --- a/pkgs/development/python-modules/pkginfo/default.nix +++ b/pkgs/development/python-modules/pkginfo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "pkginfo"; diff --git a/pkgs/development/python-modules/pkuseg/default.nix b/pkgs/development/python-modules/pkuseg/default.nix index 8e3e301793a..d59fe56203a 100644 --- a/pkgs/development/python-modules/pkuseg/default.nix +++ b/pkgs/development/python-modules/pkuseg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k @@ -31,6 +31,5 @@ buildPythonPackage rec { description = "Toolkit for multi-domain Chinese word segmentation"; homepage = "https://github.com/lancopku/pkuseg-python"; license = licenses.unfree; - maintainers = with maintainers; [ danieldk ]; }; } diff --git a/pkgs/development/python-modules/plac/default.nix b/pkgs/development/python-modules/plac/default.nix index 9e2c66d9d1e..9261133bc92 100644 --- a/pkgs/development/python-modules/plac/default.nix +++ b/pkgs/development/python-modules/plac/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , python diff --git a/pkgs/development/python-modules/pluginbase/default.nix b/pkgs/development/python-modules/pluginbase/default.nix index 956ea1b720a..697717eeca6 100644 --- a/pkgs/development/python-modules/pluginbase/default.nix +++ b/pkgs/development/python-modules/pluginbase/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, pytest }: +{ lib, fetchPypi, buildPythonPackage, pytest }: buildPythonPackage rec { version = "1.0.0"; diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix new file mode 100644 index 00000000000..f4be0e5140b --- /dev/null +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -0,0 +1,66 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, aiohttp +, async-timeout +, crcmod +, defusedxml +, pyserial +, pytz +, python-dateutil +, semver +, jsonpickle +, mypy +, pytest-aiohttp +, pytest-asyncio +, pytest-cov +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "plugwise"; + version = "0.8.5"; + + src = fetchFromGitHub { + owner = pname; + repo = "python-plugwise"; + rev = version; + sha256 = "1gviyy31l1j8z0if2id3m13r43kw4mcgd8921813yfhmf174piq4"; + }; + + propagatedBuildInputs = [ + aiohttp + async-timeout + crcmod + defusedxml + pyserial + pytz + python-dateutil + semver + ]; + + checkInputs = [ + jsonpickle + mypy + pytest-aiohttp + pytest-asyncio + pytest-cov + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "plugwise" ]; + + __darwinAllowLocalNetworking = true; + + meta = with lib; { + description = "Python module for Plugwise Smiles, Stretch and USB stick"; + longDescription = '' + XKNX is an asynchronous Python library for reading and writing KNX/IP + packets. It provides support for KNX/IP routing and tunneling devices. + ''; + homepage = "https://github.com/plugwise/python-plugwise"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/plyvel/default.nix b/pkgs/development/python-modules/plyvel/default.nix index 0872a534760..aa247c8e426 100644 --- a/pkgs/development/python-modules/plyvel/default.nix +++ b/pkgs/development/python-modules/plyvel/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pkgs @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "a7a09033a0fd33ca47094e8bbe01714abfcf644f4b7a337d3970e91a2599e2c4"; }; - buildInputs = [ pkgs.leveldb ] ++ stdenv.lib.optional isPy3k pytest; + buildInputs = [ pkgs.leveldb ] ++ lib.optional isPy3k pytest; # no tests for python2 doCheck = isPy3k; diff --git a/pkgs/development/python-modules/pocket/default.nix b/pkgs/development/python-modules/pocket/default.nix index 3599d3dec55..e5a2d464bde 100644 --- a/pkgs/development/python-modules/pocket/default.nix +++ b/pkgs/development/python-modules/pocket/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , requests diff --git a/pkgs/development/python-modules/polib/default.nix b/pkgs/development/python-modules/polib/default.nix index f7c4e1139a8..00353ac0cca 100644 --- a/pkgs/development/python-modules/polib/default.nix +++ b/pkgs/development/python-modules/polib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "polib"; diff --git a/pkgs/development/python-modules/pomegranate/default.nix b/pkgs/development/python-modules/pomegranate/default.nix index 7595730eb31..8f260ad8ccb 100644 --- a/pkgs/development/python-modules/pomegranate/default.nix +++ b/pkgs/development/python-modules/pomegranate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, numpy, scipy, cython, networkx, joblib, nose, pyyaml }: +{ lib, buildPythonPackage, fetchFromGitHub, numpy, scipy, cython, networkx, joblib, nose, pyyaml }: buildPythonPackage rec { pname = "pomegranate"; diff --git a/pkgs/development/python-modules/pony/default.nix b/pkgs/development/python-modules/pony/default.nix index 7a734927ee1..03330c4cfec 100644 --- a/pkgs/development/python-modules/pony/default.nix +++ b/pkgs/development/python-modules/pony/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python, buildPythonPackage, fetchPypi }: +{ lib, python, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "pony"; diff --git a/pkgs/development/python-modules/pooch/default.nix b/pkgs/development/python-modules/pooch/default.nix index 282239d9890..de0ba145828 100644 --- a/pkgs/development/python-modules/pooch/default.nix +++ b/pkgs/development/python-modules/pooch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , isPy27 , fetchPypi diff --git a/pkgs/development/python-modules/poolsense/default.nix b/pkgs/development/python-modules/poolsense/default.nix new file mode 100644 index 00000000000..0ffdf895227 --- /dev/null +++ b/pkgs/development/python-modules/poolsense/default.nix @@ -0,0 +1,28 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "poolsense"; + version = "0.0.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "09y4fq0gdvgkfsykpxnvmfv92dpbknnq5v82spz43ak6hjnhgcyp"; + }; + + propagatedBuildInputs = [ aiohttp ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "poolsense" ]; + + meta = with lib; { + description = "Python module to access PoolSense device"; + homepage = "https://github.com/haemishkyd/poolsense"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/poppler-qt5/default.nix b/pkgs/development/python-modules/poppler-qt5/default.nix index cd2aac6275e..345f092a80f 100644 --- a/pkgs/development/python-modules/poppler-qt5/default.nix +++ b/pkgs/development/python-modules/poppler-qt5/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, lib, stdenv, sip, qtbase, pyqt5, poppler, pkgconfig, fetchpatch +{ buildPythonPackage, fetchPypi, lib, sip, qtbase, pyqt5, poppler, pkg-config, fetchpatch , substituteAll }: @@ -28,12 +28,14 @@ buildPythonPackage rec { ]; buildInputs = [ qtbase.dev poppler ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ sip pyqt5.dev ]; # no tests, just bindings for `poppler_qt5` doCheck = false; + dontWrapQtApps = true; + meta = with lib; { homepage = "https://github.com/wbsoft/python-poppler-qt5"; license = licenses.gpl2; diff --git a/pkgs/development/python-modules/portend/default.nix b/pkgs/development/python-modules/portend/default.nix index 10b30d05fa3..1408f7ca905 100644 --- a/pkgs/development/python-modules/portend/default.nix +++ b/pkgs/development/python-modules/portend/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , pytest, setuptools_scm, tempora, pytest-black, pytestcov }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/posix_ipc/default.nix b/pkgs/development/python-modules/posix_ipc/default.nix index 2fb6128dc1b..59f4b4b707f 100644 --- a/pkgs/development/python-modules/posix_ipc/default.nix +++ b/pkgs/development/python-modules/posix_ipc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/potr/default.nix b/pkgs/development/python-modules/potr/default.nix index 9f2774b9a60..671010bb900 100644 --- a/pkgs/development/python-modules/potr/default.nix +++ b/pkgs/development/python-modules/potr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, pycrypto }: +{ lib, fetchPypi, buildPythonPackage, pycrypto }: buildPythonPackage rec { pname = "python-potr"; diff --git a/pkgs/development/python-modules/power/default.nix b/pkgs/development/python-modules/power/default.nix index d1998faf6b6..8f72553092e 100644 --- a/pkgs/development/python-modules/power/default.nix +++ b/pkgs/development/python-modules/power/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/pox/default.nix b/pkgs/development/python-modules/pox/default.nix index e7013154f99..24591824e07 100644 --- a/pkgs/development/python-modules/pox/default.nix +++ b/pkgs/development/python-modules/pox/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/poyo/default.nix b/pkgs/development/python-modules/poyo/default.nix index d600e46c6b4..b7963258f33 100644 --- a/pkgs/development/python-modules/poyo/default.nix +++ b/pkgs/development/python-modules/poyo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/ppscore/default.nix b/pkgs/development/python-modules/ppscore/default.nix index 00542c6e90e..ad3a393a00d 100644 --- a/pkgs/development/python-modules/ppscore/default.nix +++ b/pkgs/development/python-modules/ppscore/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , isPy27 diff --git a/pkgs/development/python-modules/praw/6.3.nix b/pkgs/development/python-modules/praw/6.3.nix index 00182eda037..3fc485c00ec 100644 --- a/pkgs/development/python-modules/praw/6.3.nix +++ b/pkgs/development/python-modules/praw/6.3.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchFromGitHub , betamax , betamax-serializers , betamax-matchers diff --git a/pkgs/development/python-modules/praw/default.nix b/pkgs/development/python-modules/praw/default.nix index 61b869e87fb..a4c048e9c9b 100644 --- a/pkgs/development/python-modules/praw/default.nix +++ b/pkgs/development/python-modules/praw/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchFromGitHub , betamax , betamax-serializers , betamax-matchers diff --git a/pkgs/development/python-modules/prawcore/default.nix b/pkgs/development/python-modules/prawcore/default.nix index 533c31d87ce..2b6eff885f9 100644 --- a/pkgs/development/python-modules/prawcore/default.nix +++ b/pkgs/development/python-modules/prawcore/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27 +{ lib, buildPythonPackage, fetchPypi, isPy27 , requests , testfixtures, mock, requests_toolbelt , betamax, betamax-serializers, betamax-matchers, pytest diff --git a/pkgs/development/python-modules/preggy/default.nix b/pkgs/development/python-modules/preggy/default.nix index a2144f303be..44be123335f 100644 --- a/pkgs/development/python-modules/preggy/default.nix +++ b/pkgs/development/python-modules/preggy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, six, unidecode, nose, yanc }: +{ lib, buildPythonPackage, fetchPypi, six, unidecode, nose, yanc }: buildPythonPackage rec { pname = "preggy"; diff --git a/pkgs/development/python-modules/preshed/default.nix b/pkgs/development/python-modules/preshed/default.nix index 5d75c95d770..767d5b867f0 100644 --- a/pkgs/development/python-modules/preshed/default.nix +++ b/pkgs/development/python-modules/preshed/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , murmurhash diff --git a/pkgs/development/python-modules/pretend/default.nix b/pkgs/development/python-modules/pretend/default.nix index 4fe726591e6..87e0e6613b1 100644 --- a/pkgs/development/python-modules/pretend/default.nix +++ b/pkgs/development/python-modules/pretend/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "pretend"; diff --git a/pkgs/development/python-modules/prettytable/1.nix b/pkgs/development/python-modules/prettytable/1.nix index 5b7457af9bf..0bd18f0721f 100644 --- a/pkgs/development/python-modules/prettytable/1.nix +++ b/pkgs/development/python-modules/prettytable/1.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , glibcLocales diff --git a/pkgs/development/python-modules/prettytable/default.nix b/pkgs/development/python-modules/prettytable/default.nix index 5a15cfd24eb..5463403dec7 100644 --- a/pkgs/development/python-modules/prettytable/default.nix +++ b/pkgs/development/python-modules/prettytable/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , glibcLocales diff --git a/pkgs/development/python-modules/privacyidea/ldap-proxy.nix b/pkgs/development/python-modules/privacyidea/ldap-proxy.nix index ec87186a4fd..25a81510c7d 100644 --- a/pkgs/development/python-modules/privacyidea/ldap-proxy.nix +++ b/pkgs/development/python-modules/privacyidea/ldap-proxy.nix @@ -1,9 +1,12 @@ -{ lib, buildPythonPackage, fetchFromGitHub, twisted, ldaptor, configobj }: +{ lib, buildPythonPackage, isPy3k, fetchFromGitHub, twisted, ldaptor, configobj }: buildPythonPackage rec { pname = "privacyidea-ldap-proxy"; version = "0.6.1"; + # https://github.com/privacyidea/privacyidea-ldap-proxy/issues/50 + disabled = isPy3k; + src = fetchFromGitHub { owner = "privacyidea"; repo = pname; diff --git a/pkgs/development/python-modules/proboscis/default.nix b/pkgs/development/python-modules/proboscis/default.nix index 00905136716..a2a1d04ebe0 100644 --- a/pkgs/development/python-modules/proboscis/default.nix +++ b/pkgs/development/python-modules/proboscis/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, nose }: +{ lib, buildPythonPackage, fetchPypi, nose }: buildPythonPackage rec { pname = "proboscis"; diff --git a/pkgs/development/python-modules/process-tests/default.nix b/pkgs/development/python-modules/process-tests/default.nix index 4b83205d723..abf175b5531 100644 --- a/pkgs/development/python-modules/process-tests/default.nix +++ b/pkgs/development/python-modules/process-tests/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/proglog/default.nix b/pkgs/development/python-modules/proglog/default.nix index 3f8c1104381..9839ea9dd23 100644 --- a/pkgs/development/python-modules/proglog/default.nix +++ b/pkgs/development/python-modules/proglog/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, tqdm }: +{ lib, fetchPypi, buildPythonPackage, tqdm }: buildPythonPackage rec { pname = "proglog"; diff --git a/pkgs/development/python-modules/progress/default.nix b/pkgs/development/python-modules/progress/default.nix index 2c5dbc1386e..fcc1a7a9229 100644 --- a/pkgs/development/python-modules/progress/default.nix +++ b/pkgs/development/python-modules/progress/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , python diff --git a/pkgs/development/python-modules/progressbar/default.nix b/pkgs/development/python-modules/progressbar/default.nix index a1fdddd95db..68967ecf653 100644 --- a/pkgs/development/python-modules/progressbar/default.nix +++ b/pkgs/development/python-modules/progressbar/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "progressbar"; diff --git a/pkgs/development/python-modules/progressbar2/default.nix b/pkgs/development/python-modules/progressbar2/default.nix index cc3029ade64..b5c488c0838 100644 --- a/pkgs/development/python-modules/progressbar2/default.nix +++ b/pkgs/development/python-modules/progressbar2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , python , buildPythonPackage , fetchPypi diff --git a/pkgs/development/python-modules/progressbar231/default.nix b/pkgs/development/python-modules/progressbar231/default.nix index f8980647482..d421efde8aa 100644 --- a/pkgs/development/python-modules/progressbar231/default.nix +++ b/pkgs/development/python-modules/progressbar231/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k }: +{ lib, buildPythonPackage, fetchPypi, isPy3k }: buildPythonPackage rec { pname = "progressbar231"; diff --git a/pkgs/development/python-modules/progressbar33/default.nix b/pkgs/development/python-modules/progressbar33/default.nix index 0b53b83f5cc..a483a6001f0 100644 --- a/pkgs/development/python-modules/progressbar33/default.nix +++ b/pkgs/development/python-modules/progressbar33/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "progressbar33"; diff --git a/pkgs/development/python-modules/proto-plus/default.nix b/pkgs/development/python-modules/proto-plus/default.nix index 1cd732b19ae..cc9444098de 100644 --- a/pkgs/development/python-modules/proto-plus/default.nix +++ b/pkgs/development/python-modules/proto-plus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix index 4925c3dfd02..e7bbdd6ccdf 100644 --- a/pkgs/development/python-modules/protobuf/default.nix +++ b/pkgs/development/python-modules/protobuf/default.nix @@ -1,4 +1,5 @@ { buildPackages +, lib , stdenv , fetchpatch , python @@ -14,8 +15,6 @@ , doCheck ? true }: -with stdenv.lib; - buildPythonPackage { inherit (protobuf) pname src version; inherit disabled; @@ -23,18 +22,18 @@ buildPythonPackage { NIX_CFLAGS_COMPILE = toString ( # work around python distutils compiling C++ with $CC - optional stdenv.isDarwin "-I${libcxx}/include/c++/v1" - ++ optional (versionOlder protobuf.version "2.7.0") "-std=c++98" + lib.optional stdenv.isDarwin "-I${libcxx}/include/c++/v1" + ++ lib.optional (lib.versionOlder protobuf.version "2.7.0") "-std=c++98" ); outputs = [ "out" "dev" ]; - propagatedBuildInputs = [ six ] ++ optionals isPy27 [ google-apputils ]; + propagatedBuildInputs = [ six ] ++ lib.optionals isPy27 [ google-apputils ]; propagatedNativeBuildInputs = [ buildPackages.protobuf ]; # For protoc. - nativeBuildInputs = [ pyext ] ++ optionals isPy27 [ google-apputils ]; + nativeBuildInputs = [ pyext ] ++ lib.optionals isPy27 [ google-apputils ]; buildInputs = [ protobuf ]; - patches = optional (isPy37 && (versionOlder protobuf.version "3.6.1.2")) + patches = lib.optional (isPy37 && (lib.versionOlder protobuf.version "3.6.1.2")) # Python 3.7 compatibility (not needed for protobuf >= 3.6.1.2) (fetchpatch { url = "https://github.com/protocolbuffers/protobuf/commit/0a59054c30e4f0ba10f10acfc1d7f3814c63e1a7.patch"; @@ -50,7 +49,7 @@ buildPythonPackage { cd python ''; - preConfigure = optionalString (versionAtLeast protobuf.version "2.6.0") '' + preConfigure = lib.optionalString (lib.versionAtLeast protobuf.version "2.6.0") '' export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=cpp export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION_VERSION=2 ''; @@ -58,21 +57,21 @@ buildPythonPackage { preBuild = '' # Workaround for https://github.com/google/protobuf/issues/2895 ${python.pythonForBuild.interpreter} setup.py build - '' + optionalString (versionAtLeast protobuf.version "2.6.0") '' + '' + lib.optionalString (lib.versionAtLeast protobuf.version "2.6.0") '' ${python.pythonForBuild.interpreter} setup.py build_ext --cpp_implementation ''; - installFlags = optional (versionAtLeast protobuf.version "2.6.0") + installFlags = lib.optional (lib.versionAtLeast protobuf.version "2.6.0") "--install-option='--cpp_implementation'"; # the _message.so isn't installed, so we'll do that manually. # if someone can figure out a less hacky way to get the _message.so to # install, please do replace this. - postInstall = optionalString (versionAtLeast protobuf.version "2.6.0") '' + postInstall = lib.optionalString (lib.versionAtLeast protobuf.version "2.6.0") '' cp -v $(find build -name "_message*") $out/${python.sitePackages}/google/protobuf/pyext ''; - meta = { + meta = with lib; { description = "Protocol Buffers are Google's data interchange format"; homepage = "https://developers.google.com/protocol-buffers/"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/prov/default.nix b/pkgs/development/python-modules/prov/default.nix index fba5a41389c..acee0f09b84 100644 --- a/pkgs/development/python-modules/prov/default.nix +++ b/pkgs/development/python-modules/prov/default.nix @@ -1,14 +1,11 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , lxml , networkx , dateutil -, six -, pydotplus , rdflib , pydot -, glibcLocales }: buildPythonPackage rec { @@ -20,28 +17,17 @@ buildPythonPackage rec { sha256 = "b6438f2195ecb9f6e8279b58971e02bc51814599b5d5383366eef91d867422ee"; }; - prePatch = '' - substituteInPlace setup.py --replace "six==1.10.0" "six>=1.10.0" - ''; - propagatedBuildInputs = [ lxml networkx dateutil - six - pydotplus rdflib ]; checkInputs = [ pydot - glibcLocales ]; - preCheck = '' - export LC_ALL="en_US.utf-8" - ''; - meta = with lib; { description = "A Python library for W3C Provenance Data Model (PROV)"; homepage = "https://github.com/trungdong/prov"; diff --git a/pkgs/development/python-modules/psautohint/default.nix b/pkgs/development/python-modules/psautohint/default.nix index 68d15133670..4e9f07e2ccb 100644 --- a/pkgs/development/python-modules/psautohint/default.nix +++ b/pkgs/development/python-modules/psautohint/default.nix @@ -2,7 +2,7 @@ , fonttools , lxml, fs # for fonttools extras , setuptools_scm -, pytestCheckHook, pytest_5, pytestcov, pytest_xdist +, pytestCheckHook, pytestcov, pytest_xdist }: buildPythonPackage rec { @@ -30,14 +30,14 @@ buildPythonPackage rec { propagatedBuildInputs = [ fonttools lxml fs ]; checkInputs = [ - # Override pytestCheckHook to use pytest v5, because some tests fail on pytest >= v6 - # https://github.com/adobe-type-tools/psautohint/issues/284#issuecomment-742800965 - # Override might be able to be removed in future, check package dependency pins (coverage.yml) - (pytestCheckHook.override{ pytest = pytest_5; }) + pytestCheckHook pytestcov pytest_xdist ]; disabledTests = [ + # Test that fails on pytest >= v6 + # https://github.com/adobe-type-tools/psautohint/issues/284#issuecomment-742800965 + "test_hashmap_old_version" # Slow tests, reduces test time from ~5 mins to ~30s "test_mmufo" "test_flex_ufo" diff --git a/pkgs/development/python-modules/ptable/default.nix b/pkgs/development/python-modules/ptable/default.nix index ffa9bdacd2d..ae2ad58a1ac 100644 --- a/pkgs/development/python-modules/ptable/default.nix +++ b/pkgs/development/python-modules/ptable/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, nose }: +{ lib, buildPythonPackage, fetchFromGitHub, nose }: buildPythonPackage { pname = "ptable"; diff --git a/pkgs/development/python-modules/ptest/default.nix b/pkgs/development/python-modules/ptest/default.nix index c19780a4411..2a4180a4cbe 100644 --- a/pkgs/development/python-modules/ptest/default.nix +++ b/pkgs/development/python-modules/ptest/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub }: diff --git a/pkgs/development/python-modules/ptpython/default.nix b/pkgs/development/python-modules/ptpython/default.nix index fd7b92692fc..2758c3a582f 100644 --- a/pkgs/development/python-modules/ptpython/default.nix +++ b/pkgs/development/python-modules/ptpython/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, pythonOlder, fetchPypi, prompt_toolkit, appdirs, docopt, jedi +{ lib, buildPythonPackage, pythonOlder, fetchPypi, prompt_toolkit, appdirs, docopt, jedi , pygments, importlib-metadata, isPy3k }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/publicsuffix/default.nix b/pkgs/development/python-modules/publicsuffix/default.nix index abac4fb3baa..997bc31c865 100644 --- a/pkgs/development/python-modules/publicsuffix/default.nix +++ b/pkgs/development/python-modules/publicsuffix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k }: +{ lib, buildPythonPackage, fetchPypi, isPy3k }: buildPythonPackage rec { pname = "publicsuffix"; diff --git a/pkgs/development/python-modules/publicsuffix2/default.nix b/pkgs/development/python-modules/publicsuffix2/default.nix index 2d9bc73baa3..30a02ec2f0d 100644 --- a/pkgs/development/python-modules/publicsuffix2/default.nix +++ b/pkgs/development/python-modules/publicsuffix2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, requests }: +{ lib, buildPythonPackage, fetchFromGitHub, requests }: buildPythonPackage rec { pname = "publicsuffix2"; diff --git a/pkgs/development/python-modules/pubnub/default.nix b/pkgs/development/python-modules/pubnub/default.nix new file mode 100644 index 00000000000..e4bab25fd9c --- /dev/null +++ b/pkgs/development/python-modules/pubnub/default.nix @@ -0,0 +1,57 @@ +{ lib +, aiohttp +, buildPythonPackage +, cbor2 +, fetchFromGitHub +, pycryptodomex +, pytestCheckHook +, pyyaml +, pytest-vcr +, pytest-asyncio +, requests +, six +}: + +buildPythonPackage rec { + pname = "pubnub"; + version = "4.8.0"; + + src = fetchFromGitHub { + owner = pname; + repo = "python"; + rev = "v${version}"; + sha256 = "16wjal95042kh5fxhvji0rwmw892pacqcnyms520mw15wcwilqir"; + }; + + propagatedBuildInputs = [ + cbor2 + pycryptodomex + requests + six + ]; + + checkInputs = [ + aiohttp + pycryptodomex + pytest-asyncio + pytestCheckHook + pytest-vcr + + ]; + + # Some tests don't pass with recent releases of tornado/twisted + pytestFlagsArray = [ + "--ignore tests/integrational" + "--ignore tests/manual/asyncio" + "--ignore tests/manual/tornado/test_reconnections.py" + ]; + + pythonImportsCheck = [ "pubnub" ]; + + meta = with lib; { + description = "Python-based APIs for PubNub"; + homepage = "https://github.com/pubnub/python"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pubnubsub-handler/default.nix b/pkgs/development/python-modules/pubnubsub-handler/default.nix new file mode 100644 index 00000000000..32ad2a8e1b8 --- /dev/null +++ b/pkgs/development/python-modules/pubnubsub-handler/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pubnub +, pycryptodomex +, requests +}: + +buildPythonPackage rec { + pname = "pubnubsub-handler"; + version = "1.0.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256:1c44x19zi709sazgl060nkqa7vbaf3iyhwcnwdykhsbipvp6bscy"; + }; + + propagatedBuildInputs = [ + pubnub + pycryptodomex + requests + ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "pubnubsubhandler" ]; + + meta = with lib; { + description = "PubNub subscription between PubNub and Home Assistant"; + homepage = "https://github.com/w1ll1am23/pubnubsub-handler"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pudb/default.nix b/pkgs/development/python-modules/pudb/default.nix index 0ee2a8470b5..db48fbf1e48 100644 --- a/pkgs/development/python-modules/pudb/default.nix +++ b/pkgs/development/python-modules/pudb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pygments diff --git a/pkgs/development/python-modules/pulp/default.nix b/pkgs/development/python-modules/pulp/default.nix index 480714e9e28..3e4c4b4b663 100644 --- a/pkgs/development/python-modules/pulp/default.nix +++ b/pkgs/development/python-modules/pulp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchPypi , buildPythonPackage , pyparsing diff --git a/pkgs/development/python-modules/pure-pcapy3/default.nix b/pkgs/development/python-modules/pure-pcapy3/default.nix index 9679cc593df..636cbaff71c 100644 --- a/pkgs/development/python-modules/pure-pcapy3/default.nix +++ b/pkgs/development/python-modules/pure-pcapy3/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "pure-pcapy3"; diff --git a/pkgs/development/python-modules/purepng/default.nix b/pkgs/development/python-modules/purepng/default.nix index 715b2ca6902..3615935b88e 100644 --- a/pkgs/development/python-modules/purepng/default.nix +++ b/pkgs/development/python-modules/purepng/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , python , fetchFromGitHub diff --git a/pkgs/development/python-modules/pushover/default.nix b/pkgs/development/python-modules/pushover/default.nix index 1093f125a96..1ef14af135f 100644 --- a/pkgs/development/python-modules/pushover/default.nix +++ b/pkgs/development/python-modules/pushover/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , requests }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pvlib/default.nix b/pkgs/development/python-modules/pvlib/default.nix index 006246e5836..3a93b36cb2b 100644 --- a/pkgs/development/python-modules/pvlib/default.nix +++ b/pkgs/development/python-modules/pvlib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, pythonOlder, numpy, pandas, pytz, six +{ lib, buildPythonPackage, fetchPypi, fetchpatch, pythonOlder, numpy, pandas, pytz, six , pytestCheckHook, flaky, mock, pytest-mock, requests }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pweave/default.nix b/pkgs/development/python-modules/pweave/default.nix index fe74fcece1c..1b8e1a3cc6f 100644 --- a/pkgs/development/python-modules/pweave/default.nix +++ b/pkgs/development/python-modules/pweave/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , mock diff --git a/pkgs/development/python-modules/pwntools/default.nix b/pkgs/development/python-modules/pwntools/default.nix index 8f559edf41f..a24e1d5db13 100644 --- a/pkgs/development/python-modules/pwntools/default.nix +++ b/pkgs/development/python-modules/pwntools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , debugger , fetchPypi @@ -62,7 +62,7 @@ buildPythonPackage rec { postFixup = '' mkdir -p "$out/bin" - makeWrapper "${debugger}/bin/${stdenv.lib.strings.getName debugger}" "$out/bin/pwntools-gdb" + makeWrapper "${debugger}/bin/${lib.strings.getName debugger}" "$out/bin/pwntools-gdb" ''; meta = with lib; { diff --git a/pkgs/development/python-modules/pxml/default.nix b/pkgs/development/python-modules/pxml/default.nix index 57614089e66..21dc2f4abc4 100644 --- a/pkgs/development/python-modules/pxml/default.nix +++ b/pkgs/development/python-modules/pxml/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , pythonAtLeast , isPy27 , buildPythonPackage diff --git a/pkgs/development/python-modules/py-radix/default.nix b/pkgs/development/python-modules/py-radix/default.nix index fa057ae9925..18fff5ec97f 100644 --- a/pkgs/development/python-modules/py-radix/default.nix +++ b/pkgs/development/python-modules/py-radix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , coverage diff --git a/pkgs/development/python-modules/py-sonic/default.nix b/pkgs/development/python-modules/py-sonic/default.nix index ebaf5f7f64f..c35e650e18b 100644 --- a/pkgs/development/python-modules/py-sonic/default.nix +++ b/pkgs/development/python-modules/py-sonic/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "py-sonic"; - version = "0.7.7"; + version = "0.7.8"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "4cea42a2b0dc2ed0fd8568d6bf0509cfa2675a8b1c347ce9364a00881ebc0272"; + sha256 = "1nfpiry1jlgcyxcs5zamyfxwdvdiwg4yw0v8jysfc74hm362rg7d"; }; # package has no tests diff --git a/pkgs/development/python-modules/py/default.nix b/pkgs/development/python-modules/py/default.nix index 4d2b77bb1f2..aa12deabb37 100644 --- a/pkgs/development/python-modules/py/default.nix +++ b/pkgs/development/python-modules/py/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools_scm }: +{ lib, buildPythonPackage, fetchPypi, setuptools_scm }: buildPythonPackage rec { pname = "py"; diff --git a/pkgs/development/python-modules/py3dns/default.nix b/pkgs/development/python-modules/py3dns/default.nix index 1f7aeaf1e11..12297b9a6f7 100644 --- a/pkgs/development/python-modules/py3dns/default.nix +++ b/pkgs/development/python-modules/py3dns/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/py3exiv2/default.nix b/pkgs/development/python-modules/py3exiv2/default.nix index f9ed9acd0c8..0c2ae128827 100644 --- a/pkgs/development/python-modules/py3exiv2/default.nix +++ b/pkgs/development/python-modules/py3exiv2/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, isPy3k, fetchPypi, stdenv, exiv2, boost, libcxx, substituteAll, python }: +{ lib, buildPythonPackage, isPy3k, fetchPypi, stdenv, exiv2, boost, libcxx, substituteAll, python }: buildPythonPackage rec { pname = "py3exiv2"; @@ -13,13 +13,13 @@ buildPythonPackage rec { buildInputs = [ exiv2 boost ]; # work around python distutils compiling C++ with $CC (see issue #26709) - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; - meta = { + meta = with lib; { homepage = "https://launchpad.net/py3exiv2"; description = "A Python3 binding to the library exiv2"; - license = with stdenv.lib.licenses; [ gpl3 ]; - maintainers = with stdenv.lib.maintainers; [ vinymeuh ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = licenses.gpl3; + maintainers = with maintainers; [ vinymeuh ]; + platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix index a2aeaceef6d..bd0f179dc85 100644 --- a/pkgs/development/python-modules/py3status/default.nix +++ b/pkgs/development/python-modules/py3status/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , requests @@ -33,9 +33,8 @@ buildPythonPackage rec { doCheck = false; propagatedBuildInputs = [ - pytz requests tzlocal i3ipc pydbus pygobject3 pyserial setuptools dbus-python + pytz requests tzlocal i3ipc pydbus pygobject3 pyserial setuptools dbus-python file ]; - buildInputs = [ file ]; prePatch = '' sed -i -e "s|'file|'${file}/bin/file|" py3status/parse_config.py sed -i -e "s|\[\"acpi\"|\[\"${acpi}/bin/acpi\"|" py3status/modules/battery_level.py diff --git a/pkgs/development/python-modules/py4j/default.nix b/pkgs/development/python-modules/py4j/default.nix index 588d7a32d22..8eb1649fcc5 100644 --- a/pkgs/development/python-modules/py4j/default.nix +++ b/pkgs/development/python-modules/py4j/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, lib, stdenv }: +{ buildPythonPackage, fetchPypi, lib }: buildPythonPackage rec { pname = "py4j"; diff --git a/pkgs/development/python-modules/pyGithub/default.nix b/pkgs/development/python-modules/pyGithub/default.nix index e30ecb95765..c214b375ff3 100644 --- a/pkgs/development/python-modules/pyGithub/default.nix +++ b/pkgs/development/python-modules/pyGithub/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , cryptography , deprecated @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "PyGithub"; - version = "1.51"; + version = "1.54.1"; disabled = !isPy3k; src = fetchFromGitHub { owner = "PyGithub"; repo = "PyGithub"; rev = "v${version}"; - sha256 = "1hz5fc3rkryl4vzxmmwx75p25wk0ida54lf6bz7261rm5hb05r7j"; + sha256 = "1nl74bp5ikdnrc8xq0qr25ryl1mvarf0xi43k8w5jzlrllhq0nkq"; }; checkInputs = [ httpretty parameterized pytestCheckHook ]; diff --git a/pkgs/development/python-modules/py_scrypt/default.nix b/pkgs/development/python-modules/py_scrypt/default.nix index af86ce3821e..b5ae4193f18 100644 --- a/pkgs/development/python-modules/py_scrypt/default.nix +++ b/pkgs/development/python-modules/py_scrypt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , openssl diff --git a/pkgs/development/python-modules/pyacoustid/default.nix b/pkgs/development/python-modules/pyacoustid/default.nix index d424b214429..5bebb1d5bc7 100644 --- a/pkgs/development/python-modules/pyacoustid/default.nix +++ b/pkgs/development/python-modules/pyacoustid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , requests diff --git a/pkgs/development/python-modules/pyahocorasick/default.nix b/pkgs/development/python-modules/pyahocorasick/default.nix new file mode 100644 index 00000000000..9ef89c6e920 --- /dev/null +++ b/pkgs/development/python-modules/pyahocorasick/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pyahocorasick"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "WojciechMula"; + repo = pname; + rev = version; + sha256 = "0plm9x2gziayjsl7flsgn1z8qx88c9vqm4fs1wq7dv7fr188liik"; + }; + + checkInputs = [ pytestCheckHook ]; + + pytestFlagsArray = [ "unittests.py" ]; + pythonImportsCheck = [ "ahocorasick" ]; + + meta = with lib; { + description = "Python module implementing Aho-Corasick algorithm"; + longDescription = '' + This Python module is a fast and memory efficient library for exact or + approximate multi-pattern string search meaning that you can find multiple + key strings occurrences at once in some input text. + ''; + homepage = "https://github.com/WojciechMula/pyahocorasick"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyalgotrade/default.nix b/pkgs/development/python-modules/pyalgotrade/default.nix index 075103e9e40..680a8f6f830 100644 --- a/pkgs/development/python-modules/pyalgotrade/default.nix +++ b/pkgs/development/python-modules/pyalgotrade/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , matplotlib diff --git a/pkgs/development/python-modules/pyamf/default.nix b/pkgs/development/python-modules/pyamf/default.nix index f0cf111a87a..cebb1cc3f0b 100644 --- a/pkgs/development/python-modules/pyamf/default.nix +++ b/pkgs/development/python-modules/pyamf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, isPy3k, defusedxml }: +{ lib, fetchPypi, buildPythonPackage, isPy3k, defusedxml }: buildPythonPackage rec { pname = "PyAMF"; diff --git a/pkgs/development/python-modules/pyannotate/default.nix b/pkgs/development/python-modules/pyannotate/default.nix index 4442d90ae71..332a4161fe7 100644 --- a/pkgs/development/python-modules/pyannotate/default.nix +++ b/pkgs/development/python-modules/pyannotate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonOlder @@ -19,7 +19,7 @@ buildPythonPackage rec { checkInputs = [ pytest ]; propagatedBuildInputs = [ six mypy-extensions ] - ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ]; + ++ lib.optionals (pythonOlder "3.5") [ typing ]; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index 82f8f5da3d9..b9c84c484df 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, futures, hypothesis, numpy, pandas, pytestCheckHook, pytest-lazy-fixture, pkgconfig, setuptools_scm, six }: +{ lib, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, futures, hypothesis, numpy, pandas, pytestCheckHook, pytest-lazy-fixture, pkg-config, setuptools_scm, six }: let _arrow-cpp = arrow-cpp.override { python3 = python; }; @@ -12,7 +12,7 @@ buildPythonPackage rec { sourceRoot = "apache-arrow-${version}/python"; - nativeBuildInputs = [ cmake cython pkgconfig setuptools_scm ]; + nativeBuildInputs = [ cmake cython pkg-config setuptools_scm ]; propagatedBuildInputs = [ numpy six ]; checkInputs = [ hypothesis pandas pytestCheckHook pytest-lazy-fixture ]; @@ -34,6 +34,13 @@ buildPythonPackage rec { export PYARROW_PARALLEL=$NIX_BUILD_CORES ''; + # Deselect a single test because pyarrow prints a 2-line error message where + # only a single line is expected. The additional line of output comes from + # the glog library which is an optional dependency of arrow-cpp that is + # enabled in nixpkgs. + # Upstream Issue: https://issues.apache.org/jira/browse/ARROW-11393 + pytestFlagsArray = [ "--deselect=pyarrow/tests/test_memory.py::test_env_var" ]; + dontUseSetuptoolsCheck = true; preCheck = '' mv pyarrow/tests tests diff --git a/pkgs/development/python-modules/pyasn1-modules/default.nix b/pkgs/development/python-modules/pyasn1-modules/default.nix index 2be2e8b9c11..4bb515e17aa 100644 --- a/pkgs/development/python-modules/pyasn1-modules/default.nix +++ b/pkgs/development/python-modules/pyasn1-modules/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pyasn1 diff --git a/pkgs/development/python-modules/pyasn1/default.nix b/pkgs/development/python-modules/pyasn1/default.nix index 9b269f79c86..a0037d64683 100644 --- a/pkgs/development/python-modules/pyasn1/default.nix +++ b/pkgs/development/python-modules/pyasn1/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, }: +{ lib, buildPythonPackage, fetchPypi, }: buildPythonPackage rec { pname = "pyasn1"; diff --git a/pkgs/development/python-modules/pyatmo/default.nix b/pkgs/development/python-modules/pyatmo/default.nix index 22acf872526..6bea15df386 100644 --- a/pkgs/development/python-modules/pyatmo/default.nix +++ b/pkgs/development/python-modules/pyatmo/default.nix @@ -12,20 +12,20 @@ buildPythonPackage rec { pname = "pyatmo"; - version = "4.2.1"; + version = "4.2.2"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "jabesq"; - repo = "netatmo-api-python"; + repo = "pyatmo"; rev = "v${version}"; - sha256 = "12lmjhqjn71a358nkpzl3dwgiwmmz4lcv9f0qf69ngznpiirk28m"; + sha256 = "sha256-3IxDDLa8KMHVkHAeTmdNVRPc5aKzF3VwL2kKnG8Fp7I="; }; postPatch = '' substituteInPlace setup.cfg \ - --replace "oauthlib~=3.1.0" "oauthlib" \ - --replace "requests~=2.23.0" "requests" + --replace "oauthlib~=3.1" "oauthlib" \ + --replace "requests~=2.24" "requests" ''; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyatspi/default.nix b/pkgs/development/python-modules/pyatspi/default.nix index 6ac0c776fcd..5ae00417b6c 100644 --- a/pkgs/development/python-modules/pyatspi/default.nix +++ b/pkgs/development/python-modules/pyatspi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, buildPythonPackage, isPy3k, at-spi2-core, pygobject3, gnome3 }: +{ lib, fetchurl, pkg-config, buildPythonPackage, isPy3k, at-spi2-core, pygobject3, gnome3 }: buildPythonPackage rec { pname = "pyatspi"; @@ -6,11 +6,11 @@ buildPythonPackage rec { format = "other"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "/4CTEv0ML2HhkcGBoaY4owtXm5G2gs+1oFU1pVJltD0="; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ at-spi2-core diff --git a/pkgs/development/python-modules/pyatv/default.nix b/pkgs/development/python-modules/pyatv/default.nix index 187f94dbd77..2fca74b33aa 100644 --- a/pkgs/development/python-modules/pyatv/default.nix +++ b/pkgs/development/python-modules/pyatv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage +{ lib, buildPythonPackage , aiohttp , aiozeroconf , asynctest @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "pyatv"; - version = "0.7.5"; + version = "0.7.6"; src = fetchFromGitHub { owner = "postlund"; repo = pname; rev = "v${version}"; - sha256 = "06qj6r9kcal2nimg8rpjfid8rnlz43l7hn0v9v1mpayjmv2fl8sp"; + sha256 = "1lahv6f97fizgh5b2w5yz9455l8ygn99rslhiygkgjywi2flx3p3"; }; nativeBuildInputs = [ pytestrunner]; diff --git a/pkgs/development/python-modules/pyaudio/default.nix b/pkgs/development/python-modules/pyaudio/default.nix index d88dc7009b7..e937b8759f6 100644 --- a/pkgs/development/python-modules/pyaudio/default.nix +++ b/pkgs/development/python-modules/pyaudio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPyPy diff --git a/pkgs/development/python-modules/pyaxmlparser/default.nix b/pkgs/development/python-modules/pyaxmlparser/default.nix index 63e180b11b2..e77c6dda840 100644 --- a/pkgs/development/python-modules/pyaxmlparser/default.nix +++ b/pkgs/development/python-modules/pyaxmlparser/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, lib, stdenv, lxml, click, fetchFromGitHub, pytest, isPy3k }: +{ buildPythonPackage, lib, lxml, click, fetchFromGitHub, pytest, isPy3k }: buildPythonPackage rec { version = "0.3.24"; diff --git a/pkgs/development/python-modules/pybase64/default.nix b/pkgs/development/python-modules/pybase64/default.nix index e462d53fea8..aa65d7ccadf 100644 --- a/pkgs/development/python-modules/pybase64/default.nix +++ b/pkgs/development/python-modules/pybase64/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, isPy3k, lib, stdenv, fetchPypi, six, pytest }: +{ buildPythonPackage, isPy3k, lib, fetchPypi, six, pytest }: buildPythonPackage rec { pname = "pybase64"; diff --git a/pkgs/development/python-modules/pybindgen/default.nix b/pkgs/development/python-modules/pybindgen/default.nix index 4b6f7f1682f..9e8174f9b7f 100644 --- a/pkgs/development/python-modules/pybindgen/default.nix +++ b/pkgs/development/python-modules/pybindgen/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, isPy3k, setuptools_scm, pygccxml }: +{ lib, fetchPypi, buildPythonPackage, isPy3k, setuptools_scm, pygccxml }: buildPythonPackage rec { pname = "PyBindGen"; version = "0.21.0"; diff --git a/pkgs/development/python-modules/pyblackbird/default.nix b/pkgs/development/python-modules/pyblackbird/default.nix new file mode 100644 index 00000000000..fd8f46a968f --- /dev/null +++ b/pkgs/development/python-modules/pyblackbird/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pyserial +, pyserial-asyncio +}: + +buildPythonPackage rec { + pname = "pyblackbird"; + version = "0.5"; + + src = fetchFromGitHub { + owner = "koolsb"; + repo = pname; + rev = version; + sha256 = "0m1yd1cb3z8011x7nicxpf091bdcwghcphn0l21c65f71rabzg6s"; + }; + + propagatedBuildInputs = [ + pyserial + pyserial-asyncio + ]; + + # Test setup try to create a serial port + doCheck = false; + pythonImportsCheck = [ "pyblackbird" ]; + + meta = with lib; { + description = "Python implementation for Monoprice Blackbird units"; + homepage = "https://github.com/koolsb/pyblackbird"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyblosxom/default.nix b/pkgs/development/python-modules/pyblosxom/default.nix index dee6aea559a..77e47eb9836 100644 --- a/pkgs/development/python-modules/pyblosxom/default.nix +++ b/pkgs/development/python-modules/pyblosxom/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , pygments diff --git a/pkgs/development/python-modules/pybluez/default.nix b/pkgs/development/python-modules/pybluez/default.nix index a02861c68cd..1cd7d91ef25 100644 --- a/pkgs/development/python-modules/pybluez/default.nix +++ b/pkgs/development/python-modules/pybluez/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , pkgs diff --git a/pkgs/development/python-modules/pybotvac/default.nix b/pkgs/development/python-modules/pybotvac/default.nix index 06ebf85ffe8..ca093ba8e8b 100644 --- a/pkgs/development/python-modules/pybotvac/default.nix +++ b/pkgs/development/python-modules/pybotvac/default.nix @@ -1,18 +1,33 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, requests }: +{ lib +, buildPythonPackage +, fetchPypi +, requests +, requests_oauthlib +, voluptuous +}: buildPythonPackage rec { pname = "pybotvac"; - version = "0.0.18"; + version = "0.0.20"; src = fetchPypi { inherit pname version; - sha256 = "e983c9ffc0734c2e5a7c2adf5d0d0dfe399d94157c590ef70fad765f882c341f"; + sha256 = "sha256-1NnTSO4vO3Ryt4vYD5ZTQGr241GqA2KsGRBVowSTCzM="; }; - propagatedBuildInputs = [ requests ]; + propagatedBuildInputs = [ + requests + requests_oauthlib + voluptuous + ]; + + # no tests + doCheck = false; + + pythonImportsCheck = [ "pybotvac" ]; meta = with lib; { - description = "Python package for controlling Neato pybotvac Connected vacuum robot"; + description = "Python module for interacting with Neato Botvac Connected vacuum robots"; homepage = "https://github.com/stianaske/pybotvac"; license = licenses.mit; maintainers = with maintainers; [ elseym ]; diff --git a/pkgs/development/python-modules/pybrowserid/default.nix b/pkgs/development/python-modules/pybrowserid/default.nix index eacbd81055c..7517de59754 100644 --- a/pkgs/development/python-modules/pybrowserid/default.nix +++ b/pkgs/development/python-modules/pybrowserid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , requests, mock }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pybtex-docutils/default.nix b/pkgs/development/python-modules/pybtex-docutils/default.nix index 878654cef16..2dbd4e8cff5 100644 --- a/pkgs/development/python-modules/pybtex-docutils/default.nix +++ b/pkgs/development/python-modules/pybtex-docutils/default.nix @@ -1,7 +1,7 @@ -{ stdenv, buildPythonPackage, fetchPypi, docutils, pybtex, six }: +{ lib, buildPythonPackage, fetchPypi, docutils, pybtex, six }: buildPythonPackage rec { - version = "0.2.2"; + version = "1.0.0"; pname = "pybtex-docutils"; doCheck = false; @@ -9,12 +9,12 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "ea90935da188a0f4de2fe6b32930e185c33a0e306154322ccc12e519ebb5fa7d"; + sha256 = "cead6554b4af99c287dd29f38b1fa152c9542f56a51cb6cbc3997c95b2725b2e"; }; - meta = { + meta = with lib; { description = "A docutils backend for pybtex"; homepage = "https://github.com/mcmtroffaes/pybtex-docutils"; - license = stdenv.lib.licenses.mit; + license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/pybtex/default.nix b/pkgs/development/python-modules/pybtex/default.nix index a62e7e27f9c..fb6fbf8dd38 100644 --- a/pkgs/development/python-modules/pybtex/default.nix +++ b/pkgs/development/python-modules/pybtex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, latexcodec, pyyaml }: +{ lib, buildPythonPackage, fetchPypi, latexcodec, pyyaml }: buildPythonPackage rec { version = "0.23.0"; @@ -12,9 +12,9 @@ buildPythonPackage rec { sha256 = "b92be18ccd5e9a37895949dcf359a1f6890246b73646dddf1129178ee12e4bef"; }; - meta = { + meta = with lib; { homepage = "https://pybtex.org/"; description = "A BibTeX-compatible bibliography processor written in Python"; - license = stdenv.lib.licenses.mit; + license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/pycallgraph/default.nix b/pkgs/development/python-modules/pycallgraph/default.nix index 1353af406ca..af9f18aad2c 100644 --- a/pkgs/development/python-modules/pycallgraph/default.nix +++ b/pkgs/development/python-modules/pycallgraph/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/pkgs/development/python-modules/pycangjie/default.nix b/pkgs/development/python-modules/pycangjie/default.nix index 74c8ecd92b1..1f7ccde2576 100644 --- a/pkgs/development/python-modules/pycangjie/default.nix +++ b/pkgs/development/python-modules/pycangjie/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, bash, autoconf, automake, libtool, pkgconfig, libcangjie +{ lib, fetchurl, bash, autoconf, automake, libtool, pkg-config, libcangjie , sqlite, buildPythonPackage, cython }: @@ -14,7 +14,7 @@ in buildPythonPackage { sha256 = "12yi09nyffmn4va7lzk4irw349qzlbxgsnb89dh15cnw0xmrin05"; }; - nativeBuildInputs = [ pkgconfig libtool autoconf automake cython ]; + nativeBuildInputs = [ pkg-config libtool autoconf automake cython ]; buildInputs = [ libcangjie sqlite ]; preConfigure = '' diff --git a/pkgs/development/python-modules/pycapnp/default.nix b/pkgs/development/python-modules/pycapnp/default.nix index ab9088cf1e5..7e8954e04d0 100644 --- a/pkgs/development/python-modules/pycapnp/default.nix +++ b/pkgs/development/python-modules/pycapnp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , capnproto , cython diff --git a/pkgs/development/python-modules/pycarddav/default.nix b/pkgs/development/python-modules/pycarddav/default.nix index 7885cf65b83..b3479695a89 100644 --- a/pkgs/development/python-modules/pycarddav/default.nix +++ b/pkgs/development/python-modules/pycarddav/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/pycares/default.nix b/pkgs/development/python-modules/pycares/default.nix index 8404063ac1f..9b3ec94babc 100644 --- a/pkgs/development/python-modules/pycares/default.nix +++ b/pkgs/development/python-modules/pycares/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , python diff --git a/pkgs/development/python-modules/pycassa/default.nix b/pkgs/development/python-modules/pycassa/default.nix index d366486c8f8..0e07d8d436f 100644 --- a/pkgs/development/python-modules/pycassa/default.nix +++ b/pkgs/development/python-modules/pycassa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, thrift, isPy3k }: +{ lib, buildPythonPackage, fetchPypi, thrift, isPy3k }: let @@ -30,9 +30,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ thrift' ]; - meta = { + meta = with lib; { description = "A python client library for Apache Cassandra"; homepage = "https://github.com/pycassa/pycassa"; - license = stdenv.lib.licenses.mit; + license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/pycdio/default.nix b/pkgs/development/python-modules/pycdio/default.nix index b290d9ea959..712029b692c 100644 --- a/pkgs/development/python-modules/pycdio/default.nix +++ b/pkgs/development/python-modules/pycdio/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { nativeBuildInputs = [ nose pkgs.pkgconfig pkgs.swig ]; buildInputs = [ setuptools pkgs.libcdio ] - ++ stdenv.lib.optional stdenv.isDarwin pkgs.libiconv; + ++ lib.optional stdenv.isDarwin pkgs.libiconv; # Run tests using nosetests but first need to install the binaries # to the root source directory where they can be found. diff --git a/pkgs/development/python-modules/pycfdns/default.nix b/pkgs/development/python-modules/pycfdns/default.nix new file mode 100644 index 00000000000..ca0b0fe5ecf --- /dev/null +++ b/pkgs/development/python-modules/pycfdns/default.nix @@ -0,0 +1,34 @@ +{ lib +, aiohttp +, async-timeout +, buildPythonPackage +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "pycfdns"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "ludeeus"; + repo = pname; + rev = version; + sha256 = "0df4695cb0h6f2lnn6dx4h5al2ra93zp1hzfaz07nj2gvirswp83"; + }; + + propagatedBuildInputs = [ + aiohttp + async-timeout + ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "pycfdns" ]; + + meta = with lib; { + description = "Python module for updating Cloudflare DNS A records"; + homepage = "https://github.com/ludeeus/pycfdns"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pychart/default.nix b/pkgs/development/python-modules/pychart/default.nix index 2c2399fca92..f020361474a 100644 --- a/pkgs/development/python-modules/pychart/default.nix +++ b/pkgs/development/python-modules/pychart/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27 }: +{ lib, buildPythonPackage, fetchPypi, isPy27 }: buildPythonPackage rec { pname = "pychart"; diff --git a/pkgs/development/python-modules/pychef/default.nix b/pkgs/development/python-modules/pychef/default.nix index 1702cde840c..ddd7dec820d 100644 --- a/pkgs/development/python-modules/pychef/default.nix +++ b/pkgs/development/python-modules/pychef/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index fecf3f09ca7..9eefaa5f364 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "PyChromecast"; - version = "7.7.2"; + version = "8.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1w7jayb0z529bh1ybb16pfm0m08qqi4px1q0qwlvcxlcrd2v3m5a"; + sha256 = "0dlxgh57j25cvk2pqr2dj4lv6yn0pix2rcl2kzqsg2405rdjks91"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/pyclipper/default.nix b/pkgs/development/python-modules/pyclipper/default.nix index e8938954709..27a2a1d8084 100644 --- a/pkgs/development/python-modules/pyclipper/default.nix +++ b/pkgs/development/python-modules/pyclipper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchPypi , buildPythonPackage , setuptools_scm diff --git a/pkgs/development/python-modules/pycm/default.nix b/pkgs/development/python-modules/pycm/default.nix index ada4eeeb556..8e0a9e3b152 100644 --- a/pkgs/development/python-modules/pycm/default.nix +++ b/pkgs/development/python-modules/pycm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy3k, numpy, pytest }: +{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, numpy, pytest }: buildPythonPackage rec { pname = "pycm"; diff --git a/pkgs/development/python-modules/pycognito/default.nix b/pkgs/development/python-modules/pycognito/default.nix index a30c1cd344b..511df9f07f5 100644 --- a/pkgs/development/python-modules/pycognito/default.nix +++ b/pkgs/development/python-modules/pycognito/default.nix @@ -1,24 +1,25 @@ { lib +, boto3 , buildPythonPackage -, fetchFromGitHub , cryptography -, boto3 , envs +, fetchFromGitHub +, isPy27 +, mock +, pytestCheckHook , python-jose , requests -, mock -, isPy27 }: buildPythonPackage rec { pname = "pycognito"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { owner = "pvizeli"; - repo = "pycognito"; + repo = pname; rev = version; - sha256 = "HLzPrRon+ipcUZlD1l4nYSwSbdDLwOALy4ejGunjK0w="; + sha256 = "sha256-RJeHPCTuaLN+zB0N0FGt4qrTI6++1ks5iBn64Cx0Psc="; }; postPatch = '' @@ -35,7 +36,13 @@ buildPythonPackage rec { disabled = isPy27; - checkInputs = [ mock ]; + checkInputs = [ + mock + pytestCheckHook + ]; + + pytestFlagsArray = [ "tests.py" ]; + pythonImportsCheck = [ "pycognito" ]; meta = with lib; { description = "Python class to integrate Boto3's Cognito client so it is easy to login users. With SRP support"; diff --git a/pkgs/development/python-modules/pycoin/default.nix b/pkgs/development/python-modules/pycoin/default.nix index a21c8f6f549..d42cfcadfee 100644 --- a/pkgs/development/python-modules/pycoin/default.nix +++ b/pkgs/development/python-modules/pycoin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchPypi , buildPythonPackage , gnupg diff --git a/pkgs/development/python-modules/pycollada/default.nix b/pkgs/development/python-modules/pycollada/default.nix index 4b177012f4e..e8e0809c022 100644 --- a/pkgs/development/python-modules/pycollada/default.nix +++ b/pkgs/development/python-modules/pycollada/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, numpy, dateutil }: +{ lib, fetchPypi, buildPythonPackage, numpy, dateutil }: buildPythonPackage rec { pname = "pycollada"; diff --git a/pkgs/development/python-modules/pycontracts/default.nix b/pkgs/development/python-modules/pycontracts/default.nix index 0b511e024dc..2a90bef7256 100644 --- a/pkgs/development/python-modules/pycontracts/default.nix +++ b/pkgs/development/python-modules/pycontracts/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , nose, pyparsing, decorator, six, future }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pycountry/default.nix b/pkgs/development/python-modules/pycountry/default.nix index b402e909240..525a5610711 100644 --- a/pkgs/development/python-modules/pycountry/default.nix +++ b/pkgs/development/python-modules/pycountry/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , diff --git a/pkgs/development/python-modules/pycparser/default.nix b/pkgs/development/python-modules/pycparser/default.nix index a246ce53a1e..5fe7cab1cdb 100644 --- a/pkgs/development/python-modules/pycparser/default.nix +++ b/pkgs/development/python-modules/pycparser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, python }: +{ lib, buildPythonPackage, fetchPypi, python }: buildPythonPackage rec { pname = "pycparser"; diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix index 40084c2885e..e88b8529a35 100644 --- a/pkgs/development/python-modules/pycryptodome/default.nix +++ b/pkgs/development/python-modules/pycryptodome/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage }: +{ lib, fetchPypi, buildPythonPackage }: buildPythonPackage rec { version = "3.9.9"; @@ -9,9 +9,9 @@ buildPythonPackage rec { sha256 = "910e202a557e1131b1c1b3f17a63914d57aac55cf9fb9b51644962841c3995c4"; }; - meta = { + meta = with lib; { homepage = "https://www.pycryptodome.org/"; description = "Python Cryptography Toolkit"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/pycryptopp/default.nix b/pkgs/development/python-modules/pycryptopp/default.nix index 0f17d9e59a8..7079cde0d59 100644 --- a/pkgs/development/python-modules/pycryptopp/default.nix +++ b/pkgs/development/python-modules/pycryptopp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , fetchpatch diff --git a/pkgs/development/python-modules/pycuda/default.nix b/pkgs/development/python-modules/pycuda/default.nix index 368894228af..1db5df28e32 100644 --- a/pkgs/development/python-modules/pycuda/default.nix +++ b/pkgs/development/python-modules/pycuda/default.nix @@ -12,7 +12,7 @@ , cudatoolkit , python , mkDerivation -, lib, stdenv +, lib }: let compyte = import ./compyte.nix { @@ -28,7 +28,7 @@ buildPythonPackage rec { sha256 = "effa3b99b55af67f3afba9b0d1b64b4a0add4dd6a33bdd6786df1aa4cc8761a5"; }; - preConfigure = with stdenv.lib.versions; '' + preConfigure = with lib.versions; '' ${python.interpreter} configure.py --boost-inc-dir=${boost.dev}/include \ --boost-lib-dir=${boost}/lib \ --no-use-shipped-boost \ diff --git a/pkgs/development/python-modules/pydenticon/default.nix b/pkgs/development/python-modules/pydenticon/default.nix index 763cfb9b845..44913e1de47 100644 --- a/pkgs/development/python-modules/pydenticon/default.nix +++ b/pkgs/development/python-modules/pydenticon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pillow diff --git a/pkgs/development/python-modules/pydicom/default.nix b/pkgs/development/python-modules/pydicom/default.nix index 08c5f099d28..be3cddc7c14 100644 --- a/pkgs/development/python-modules/pydicom/default.nix +++ b/pkgs/development/python-modules/pydicom/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , isPy27 diff --git a/pkgs/development/python-modules/pydispatcher/default.nix b/pkgs/development/python-modules/pydispatcher/default.nix index d132fad7313..d949b16d105 100644 --- a/pkgs/development/python-modules/pydispatcher/default.nix +++ b/pkgs/development/python-modules/pydispatcher/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/pkgs/development/python-modules/pydns/default.nix b/pkgs/development/python-modules/pydns/default.nix index a93820bfaef..a6fb07c1520 100644 --- a/pkgs/development/python-modules/pydns/default.nix +++ b/pkgs/development/python-modules/pydns/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/pydotplus/default.nix b/pkgs/development/python-modules/pydotplus/default.nix deleted file mode 100644 index f794a150ec1..00000000000 --- a/pkgs/development/python-modules/pydotplus/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv -, buildPythonPackage -, fetchPypi -, pyparsing -, graphviz -}: - -buildPythonPackage rec { - pname = "pydotplus"; - version = "2.0.2"; - - src = fetchPypi { - inherit pname version; - sha256 = "1i05cnk3yh722fdyaq0asr7z9xf7v7ikbmnpxa8j6pdqx6g5xs4i"; - }; - - propagatedBuildInputs = [ - pyparsing - graphviz - ]; - - meta = with lib; { - homepage = "https://github.com/erocarrera/pydot"; - description = "An improved version of the old pydot project that provides a Python Interface to Graphviz’s Dot language"; - license = licenses.mit; - maintainers = with maintainers; [ ashgillman ]; - }; -} diff --git a/pkgs/development/python-modules/pydub/default.nix b/pkgs/development/python-modules/pydub/default.nix index 13b99983198..884df63ce03 100644 --- a/pkgs/development/python-modules/pydub/default.nix +++ b/pkgs/development/python-modules/pydub/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { # disable a test that fails on aarch64 due to rounding errors - postPatch = stdenv.lib.optionalString stdenv.isAarch64 '' + postPatch = lib.optionalString stdenv.isAarch64 '' substituteInPlace test/test.py \ --replace "test_overlay_with_gain_change" "notest_overlay_with_gain_change" ''; diff --git a/pkgs/development/python-modules/pyechonest/default.nix b/pkgs/development/python-modules/pyechonest/default.nix index 10ade4fa2ca..83820629552 100644 --- a/pkgs/development/python-modules/pyechonest/default.nix +++ b/pkgs/development/python-modules/pyechonest/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k }: +{ lib, buildPythonPackage, fetchPypi, isPy3k }: buildPythonPackage rec { pname = "pyechonest"; diff --git a/pkgs/development/python-modules/pyedimax/default.nix b/pkgs/development/python-modules/pyedimax/default.nix new file mode 100644 index 00000000000..03229b30bdd --- /dev/null +++ b/pkgs/development/python-modules/pyedimax/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +}: + +buildPythonPackage rec { + pname = "pyedimax"; + version = "0.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1i3gr5vygqh2ryg67sl13aaql7nvf3nbybrg54628r4g7911b5rk"; + }; + + propagatedBuildInputs = [ requests ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "pyedimax" ]; + + meta = with lib; { + description = "Python library for interfacing with the Edimax smart plugs"; + homepage = "https://github.com/andreipop2005/pyedimax"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyee/default.nix b/pkgs/development/python-modules/pyee/default.nix index 3c92dee783a..7e388b93971 100644 --- a/pkgs/development/python-modules/pyee/default.nix +++ b/pkgs/development/python-modules/pyee/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, lib, vcversioner, pytestrunner, mock, pytest, pytest-asyncio, pytest-trio, twisted, zipp, pyparsing, pyhamcrest, futures, attrs, stdenv, isPy27 }: +{ buildPythonPackage, fetchPypi, lib, vcversioner, pytestrunner, mock, pytest, pytest-asyncio, pytest-trio, twisted, zipp, pyparsing, pyhamcrest, futures, attrs, isPy27 }: buildPythonPackage rec { pname = "pyee"; @@ -21,7 +21,7 @@ buildPythonPackage rec { pytest-trio pytestrunner twisted - ] ++ stdenv.lib.optional isPy27 [ + ] ++ lib.optional isPy27 [ attrs futures pyparsing diff --git a/pkgs/development/python-modules/pyelftools/default.nix b/pkgs/development/python-modules/pyelftools/default.nix index 5686a6ffadb..258c97a3c11 100644 --- a/pkgs/development/python-modules/pyelftools/default.nix +++ b/pkgs/development/python-modules/pyelftools/default.nix @@ -1,18 +1,19 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , python +, stdenv }: buildPythonPackage rec { pname = "pyelftools"; - version = "unstable-2020-09-23"; + version = "0.27"; src = fetchFromGitHub { owner = "eliben"; repo = pname; - rev = "ab84e68837113b2d700ad379d94c1dd4a73125ea"; - sha256 = "sha256-O7l1kj0k8bOSOtZJVzS674oVnM+X3oP00Ybs0qjb64Q="; + rev = "v${version}"; + sha256 = "09igdym2qj2fvfcazbz25qybmgz7ccrn25xn3havfkdkka0z0i3p"; }; doCheck = stdenv.is64bit && !stdenv.isDarwin; @@ -25,10 +26,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "elftools" ]; meta = with lib; { - description = "A library for analyzing ELF files and DWARF debugging information"; + description = "Python library for analyzing ELF files and DWARF debugging information"; homepage = "https://github.com/eliben/pyelftools"; license = licenses.publicDomain; maintainers = with maintainers; [ igsha pamplemousse ]; }; - } diff --git a/pkgs/development/python-modules/pyemd/default.nix b/pkgs/development/python-modules/pyemd/default.nix index 4e7594fbab5..c7b277a6098 100644 --- a/pkgs/development/python-modules/pyemd/default.nix +++ b/pkgs/development/python-modules/pyemd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, numpy, cython }: +{ lib, buildPythonPackage, fetchPypi, numpy, cython }: buildPythonPackage rec { pname = "pyemd"; diff --git a/pkgs/development/python-modules/pyexcelerator/default.nix b/pkgs/development/python-modules/pyexcelerator/default.nix index 37388507394..b3a376616d3 100644 --- a/pkgs/development/python-modules/pyexcelerator/default.nix +++ b/pkgs/development/python-modules/pyexcelerator/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/pyexiv2/default.nix b/pkgs/development/python-modules/pyexiv2/default.nix index cca8b552de1..bf7afdf79e2 100644 --- a/pkgs/development/python-modules/pyexiv2/default.nix +++ b/pkgs/development/python-modules/pyexiv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchurl, python, exiv2, scons, boost }: +{ lib, buildPythonPackage, fetchurl, python, exiv2, scons, boost }: buildPythonPackage rec { pname = "pyexiv2"; @@ -20,8 +20,8 @@ buildPythonPackage rec { buildInputs = [ python exiv2 scons boost ]; - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with lib; { + platforms = platforms.linux; # Likely needs an older boost which does not have `boost_pythonXY` but `boost_python`. broken = true; # 2018-06-23 }; diff --git a/pkgs/development/python-modules/pyext/default.nix b/pkgs/development/python-modules/pyext/default.nix index befbd3c2de1..eb88bf78586 100644 --- a/pkgs/development/python-modules/pyext/default.nix +++ b/pkgs/development/python-modules/pyext/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub }: +{ lib, buildPythonPackage, fetchFromGitHub }: buildPythonPackage { pname = "pyext"; diff --git a/pkgs/development/python-modules/pyface/default.nix b/pkgs/development/python-modules/pyface/default.nix index db118fbbd8c..d317ebdf21b 100644 --- a/pkgs/development/python-modules/pyface/default.nix +++ b/pkgs/development/python-modules/pyface/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage +{ lib, fetchPypi, buildPythonPackage , setuptools, six, traits }: @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with lib; { description = "Traits-capable windowing framework"; homepage = "https://github.com/enthought/pyface"; - maintainers = with stdenv.lib.maintainers; [ knedlsepp ]; + maintainers = with maintainers; [ knedlsepp ]; license = licenses.bsdOriginal; }; } diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix index 4deaa3eb268..64ec58487c4 100644 --- a/pkgs/development/python-modules/pyfakefs/default.nix +++ b/pkgs/development/python-modules/pyfakefs/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { --replace "test_append_mode_tell_linux_windows" "notest_append_mode_tell_linux_windows" substituteInPlace pyfakefs/tests/fake_filesystem_unittest_test.py \ --replace "test_copy_real_file" "notest_copy_real_file" - '' + (stdenv.lib.optionalString stdenv.isDarwin '' + '' + (lib.optionalString stdenv.isDarwin '' # this test fails on darwin due to case-insensitive file system substituteInPlace pyfakefs/tests/fake_os_test.py \ --replace "test_rename_dir_to_existing_dir" "notest_rename_dir_to_existing_dir" diff --git a/pkgs/development/python-modules/pyfantom/default.nix b/pkgs/development/python-modules/pyfantom/default.nix index a17388b34b5..d7c77e763e7 100644 --- a/pkgs/development/python-modules/pyfantom/default.nix +++ b/pkgs/development/python-modules/pyfantom/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchgit }: diff --git a/pkgs/development/python-modules/pyfftw/default.nix b/pkgs/development/python-modules/pyfftw/default.nix index ff66dc8f867..155254a6af3 100644 --- a/pkgs/development/python-modules/pyfftw/default.nix +++ b/pkgs/development/python-modules/pyfftw/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , fftw, fftwFloat, fftwLongDouble, numpy, scipy, cython, dask }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pyfido/default.nix b/pkgs/development/python-modules/pyfido/default.nix new file mode 100644 index 00000000000..43909e2c130 --- /dev/null +++ b/pkgs/development/python-modules/pyfido/default.nix @@ -0,0 +1,28 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "pyfido"; + version = "2.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0b28bhyhscaw7dbc92dxswann05x8mz92cagyawdfm8jnc67gq4b"; + }; + + propagatedBuildInputs = [ aiohttp ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "pyfido" ]; + + meta = with lib; { + description = "Python client to get fido account data"; + homepage = "https://github.com/titilambert/pyfido"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyfiglet/default.nix b/pkgs/development/python-modules/pyfiglet/default.nix index a4fe9ec9dfe..e9671e03cb3 100644 --- a/pkgs/development/python-modules/pyfiglet/default.nix +++ b/pkgs/development/python-modules/pyfiglet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { version = "0.8.post1"; diff --git a/pkgs/development/python-modules/pyflakes/default.nix b/pkgs/development/python-modules/pyflakes/default.nix index 2ff88a78a4e..cf1b8878183 100644 --- a/pkgs/development/python-modules/pyflakes/default.nix +++ b/pkgs/development/python-modules/pyflakes/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder, unittest2 }: +{ lib, buildPythonPackage, fetchPypi, pythonOlder, unittest2 }: buildPythonPackage rec { pname = "pyflakes"; diff --git a/pkgs/development/python-modules/pyfnip/default.nix b/pkgs/development/python-modules/pyfnip/default.nix new file mode 100644 index 00000000000..1306c530bb4 --- /dev/null +++ b/pkgs/development/python-modules/pyfnip/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +}: + +buildPythonPackage rec { + pname = "pyfnip"; + version = "0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0q52rb0kshgbligxjqrwz0v7kgqjbv6jahdb66ndxy93mfr0ig3a"; + }; + + propagatedBuildInputs = [ requests ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "pyfnip" ]; + + meta = with lib; { + description = "Python client to get fido account data"; + homepage = "https://github.com/juhaniemi/pyfnip"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyfribidi/default.nix b/pkgs/development/python-modules/pyfribidi/default.nix index 17905b2bb39..dfe5449b282 100644 --- a/pkgs/development/python-modules/pyfribidi/default.nix +++ b/pkgs/development/python-modules/pyfribidi/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , buildPythonPackage , fetchPypi , isPyPy @@ -16,14 +17,14 @@ buildPythonPackage rec { sha256 = "64726a4a56783acdc79c6b9b3a15f16e6071077c897a0b999f3b43f744bc621c"; }; - patches = stdenv.lib.optional stdenv.cc.isClang ./pyfribidi-clang.patch; + patches = lib.optional stdenv.cc.isClang ./pyfribidi-clang.patch; propagatedBuildInputs = [ six ]; meta = with lib; { description = "A simple wrapper around fribidi"; homepage = "https://github.com/pediapress/pyfribidi"; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2; }; } diff --git a/pkgs/development/python-modules/pyfritzhome/default.nix b/pkgs/development/python-modules/pyfritzhome/default.nix index 7c5dfecd269..b7b4b3cdbcb 100644 --- a/pkgs/development/python-modules/pyfritzhome/default.nix +++ b/pkgs/development/python-modules/pyfritzhome/default.nix @@ -1,20 +1,25 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder , requests -, nose, mock }: +, nose +, mock +}: buildPythonPackage rec { pname = "pyfritzhome"; - version = "0.4.2"; + version = "0.6.0"; disabled = pythonOlder "3.5"; - src = fetchPypi { - inherit pname version; - sha256 = "0ncyv8svw0fhs01ijjkb1gcinb3jpyjvv9xw1bhnf4ri7b27g6ww"; + src = fetchFromGitHub { + owner = "hthiery"; + repo = "python-fritzhome"; + rev = version; + sha256 = "1wzys84hxrjcg86fcn7f7i2i6979qwcpny2afk5rvwljh8f7bli5"; }; - propagatedBuildInputs = [ - requests - ]; + propagatedBuildInputs = [ requests ]; checkInputs = [ mock @@ -25,6 +30,8 @@ buildPythonPackage rec { nosetests --with-coverage ''; + pythonImportsCheck = [ "pyfritzhome" ]; + meta = with lib; { description = "Python Library to access AVM FRITZ!Box homeautomation"; homepage = "https://github.com/hthiery/python-fritzhome"; diff --git a/pkgs/development/python-modules/pyftdi/default.nix b/pkgs/development/python-modules/pyftdi/default.nix index 71253a894e7..2b46a4ce682 100644 --- a/pkgs/development/python-modules/pyftdi/default.nix +++ b/pkgs/development/python-modules/pyftdi/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyftdi"; - version = "0.52.0"; + version = "0.52.9"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "eblot"; repo = pname; rev = "v${version}"; - sha256 = "0nm4z7v9qcb9mxqbl21jgzica4faldnpy5qmbkrc6scnx55pxfm9"; + sha256 = "07q9wmpl97a6laxfbcjqhv373msbsjppsyf5i77h0f6ccil0q1i6"; }; propagatedBuildInputs = [ pyusb pyserial ]; diff --git a/pkgs/development/python-modules/pyftpdlib/default.nix b/pkgs/development/python-modules/pyftpdlib/default.nix index 5d0d72eb495..b3aa456c4a9 100644 --- a/pkgs/development/python-modules/pyftpdlib/default.nix +++ b/pkgs/development/python-modules/pyftpdlib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , mock diff --git a/pkgs/development/python-modules/pyfttt/default.nix b/pkgs/development/python-modules/pyfttt/default.nix index 8648ad4f876..c8b52fce409 100644 --- a/pkgs/development/python-modules/pyfttt/default.nix +++ b/pkgs/development/python-modules/pyfttt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , requests }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pygal/default.nix b/pkgs/development/python-modules/pygal/default.nix index 733bfa15a4c..ec4cff2de61 100644 --- a/pkgs/development/python-modules/pygal/default.nix +++ b/pkgs/development/python-modules/pygal/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , fetchpatch @@ -55,7 +55,7 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ cairosvg tinycss cssselect ] - ++ stdenv.lib.optionals (!isPyPy) [ lxml ]; + ++ lib.optionals (!isPyPy) [ lxml ]; meta = with lib; { description = "Sexy and simple python charting"; diff --git a/pkgs/development/python-modules/pygame_sdl2/default.nix b/pkgs/development/python-modules/pygame_sdl2/default.nix index afca3dd7bc1..00965b4a149 100644 --- a/pkgs/development/python-modules/pygame_sdl2/default.nix +++ b/pkgs/development/python-modules/pygame_sdl2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchurl, isPy27 +{ lib, buildPythonPackage, fetchurl, isPy27 , cython, SDL2, SDL2_image, SDL2_ttf, SDL2_mixer, libjpeg, libpng }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pygccxml/default.nix b/pkgs/development/python-modules/pygccxml/default.nix index a1a6b0222b8..7e06b27a23f 100644 --- a/pkgs/development/python-modules/pygccxml/default.nix +++ b/pkgs/development/python-modules/pygccxml/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, castxml, fetchFromGitHub, buildPythonPackage, +{ lib, castxml, fetchFromGitHub, buildPythonPackage, llvmPackages }: buildPythonPackage rec { pname = "pygccxml"; diff --git a/pkgs/development/python-modules/pygdbmi/default.nix b/pkgs/development/python-modules/pygdbmi/default.nix index b3d1fb3d26d..c1be042dc7d 100644 --- a/pkgs/development/python-modules/pygdbmi/default.nix +++ b/pkgs/development/python-modules/pygdbmi/default.nix @@ -7,15 +7,13 @@ buildPythonPackage rec { pname = "pygdbmi"; - version = "0.9.0.2"; + version = "0.10.0.0"; src = fetchFromGitHub { - #inherit pname version; - #inherit pname version; owner = "cs01"; repo = "pygdbmi"; rev = version; - sha256 = "01isx7912dbalmc3xsafk1a1n6bzzfrjn2363djcq0v57rqii53d"; + sha256 = "0a6b3zyxwdcb671c6lrwxm8fhvsbjh0m8hf1r18m9dha86laimjr"; }; checkInputs = [ gdb ]; diff --git a/pkgs/development/python-modules/pygeoip/default.nix b/pkgs/development/python-modules/pygeoip/default.nix index 7aa16ac1e9a..b9b588d669a 100644 --- a/pkgs/development/python-modules/pygeoip/default.nix +++ b/pkgs/development/python-modules/pygeoip/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , nose }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pygments-better-html/default.nix b/pkgs/development/python-modules/pygments-better-html/default.nix index 2e5d6271c66..152e9463b0e 100644 --- a/pkgs/development/python-modules/pygments-better-html/default.nix +++ b/pkgs/development/python-modules/pygments-better-html/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pygments diff --git a/pkgs/development/python-modules/pygments-markdown-lexer/default.nix b/pkgs/development/python-modules/pygments-markdown-lexer/default.nix index 31a6b043494..0a88e34005c 100644 --- a/pkgs/development/python-modules/pygments-markdown-lexer/default.nix +++ b/pkgs/development/python-modules/pygments-markdown-lexer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pygments diff --git a/pkgs/development/python-modules/pygobject/3.36.nix b/pkgs/development/python-modules/pygobject/3.36.nix index 59e19227196..ccad57eba1e 100644 --- a/pkgs/development/python-modules/pygobject/3.36.nix +++ b/pkgs/development/python-modules/pygobject/3.36.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, buildPythonPackage, pkgconfig, glib, gobject-introspection, +{ lib, stdenv, fetchurl, buildPythonPackage, pkg-config, glib, gobject-introspection, pycairo, cairo, which, ncurses, meson, ninja, isPy3k, gnome3 }: buildPythonPackage rec { @@ -8,7 +8,7 @@ buildPythonPackage rec { format = "other"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0b9CgC0c7BE7Wtqg579/N0W0RSHcIWNYjSdtXNYdcY8="; }; @@ -18,9 +18,9 @@ buildPythonPackage rec { "-Dpython=python${if isPy3k then "3" else "2" }" ]; - nativeBuildInputs = [ pkgconfig meson ninja gobject-introspection ]; + nativeBuildInputs = [ pkg-config meson ninja gobject-introspection ]; buildInputs = [ glib gobject-introspection ] - ++ stdenv.lib.optionals stdenv.isDarwin [ which ncurses ]; + ++ lib.optionals stdenv.isDarwin [ which ncurses ]; propagatedBuildInputs = [ pycairo cairo ]; passthru = { diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix index 68f1bfa7b26..8c26ec6174b 100644 --- a/pkgs/development/python-modules/pygobject/3.nix +++ b/pkgs/development/python-modules/pygobject/3.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, buildPythonPackage, pkgconfig, glib, gobject-introspection, +{ lib, stdenv, fetchurl, buildPythonPackage, pkg-config, glib, gobject-introspection, pycairo, cairo, which, ncurses, meson, ninja, isPy3k, gnome3 }: buildPythonPackage rec { @@ -10,15 +10,15 @@ buildPythonPackage rec { format = "other"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "A3LRu5Ei/Bn1AKJJsfOMK7Z0hQAPWIdJe0sgWz5whNU="; }; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig meson ninja gobject-introspection ]; + nativeBuildInputs = [ pkg-config meson ninja gobject-introspection ]; buildInputs = [ glib gobject-introspection ] - ++ stdenv.lib.optionals stdenv.isDarwin [ which ncurses ]; + ++ lib.optionals stdenv.isDarwin [ which ncurses ]; propagatedBuildInputs = [ pycairo cairo ]; passthru = { diff --git a/pkgs/development/python-modules/pygobject/default.nix b/pkgs/development/python-modules/pygobject/default.nix index 0b72561e870..bf42d17b4de 100644 --- a/pkgs/development/python-modules/pygobject/default.nix +++ b/pkgs/development/python-modules/pygobject/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, buildPythonPackage, pkgconfig, glib, isPy3k, pythonAtLeast }: +{ lib, stdenv, fetchurl, python, buildPythonPackage, pkg-config, glib, isPy3k, pythonAtLeast }: buildPythonPackage rec { pname = "pygobject"; @@ -13,20 +13,20 @@ buildPythonPackage rec { outputs = [ "out" "devdoc" ]; - patches = stdenv.lib.optionals stdenv.isDarwin [ + patches = lib.optionals stdenv.isDarwin [ ./pygobject-2.0-fix-darwin.patch ]; configureFlags = [ "--disable-introspection" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib ]; # in a "normal" setup, pygobject and pygtk are installed into the # same site-packages: we need a pth file for both. pygtk.py would be # used to select a specific version, in our setup it should have no # effect, but we leave it in case somebody expects and calls it. - postInstall = stdenv.lib.optionalString (!isPy3k) '' + postInstall = lib.optionalString (!isPy3k) '' mv $out/lib/${python.libPrefix}/site-packages/{pygtk.pth,${pname}-${version}.pth} # Prevent wrapping of codegen files as these are meant to be @@ -34,9 +34,9 @@ buildPythonPackage rec { chmod a-x $out/share/pygobject/*/codegen/*.py ''; - meta = { + meta = with lib; { homepage = "https://pygobject.readthedocs.io/"; description = "Python bindings for GLib"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/pygpgme/default.nix b/pkgs/development/python-modules/pygpgme/default.nix index 416410ab3ce..29be02751bb 100644 --- a/pkgs/development/python-modules/pygpgme/default.nix +++ b/pkgs/development/python-modules/pygpgme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchurl, isPyPy +{ lib, buildPythonPackage, fetchurl, isPyPy , gpgme }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pygraphviz/default.nix b/pkgs/development/python-modules/pygraphviz/default.nix index 0b3e99dd28b..e9b66a95771 100644 --- a/pkgs/development/python-modules/pygraphviz/default.nix +++ b/pkgs/development/python-modules/pygraphviz/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, buildPythonPackage, isPy3k, fetchPypi, substituteAll, graphviz -, pkgconfig, doctest-ignore-unicode, mock, nose }: +{ lib, buildPythonPackage, isPy3k, fetchPypi, substituteAll, graphviz +, pkg-config, doctest-ignore-unicode, mock, nose }: buildPythonPackage rec { pname = "pygraphviz"; @@ -13,7 +13,7 @@ buildPythonPackage rec { extension = "zip"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ graphviz ]; checkInputs = [ doctest-ignore-unicode mock nose ]; diff --git a/pkgs/development/python-modules/pygreat/default.nix b/pkgs/development/python-modules/pygreat/default.nix index 20a96d1f8f2..92526b465b1 100644 --- a/pkgs/development/python-modules/pygreat/default.nix +++ b/pkgs/development/python-modules/pygreat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, future, pyusb }: +{ lib, buildPythonPackage, isPy3k, fetchFromGitHub, future, pyusb }: buildPythonPackage { pname = "pygreat"; diff --git a/pkgs/development/python-modules/pygrok/default.nix b/pkgs/development/python-modules/pygrok/default.nix index 8f694a117fe..56d8b05af9a 100644 --- a/pkgs/development/python-modules/pygrok/default.nix +++ b/pkgs/development/python-modules/pygrok/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchFromGitHub, regex, pytest }: +{ lib, buildPythonPackage, fetchFromGitHub, regex, pytest }: buildPythonPackage rec { pname = "pygrok"; diff --git a/pkgs/development/python-modules/pygtk/default.nix b/pkgs/development/python-modules/pygtk/default.nix index 22a44ce7607..938b55630c0 100644 --- a/pkgs/development/python-modules/pygtk/default.nix +++ b/pkgs/development/python-modules/pygtk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, python, pkgconfig, gtk2, pygobject2, pycairo, pango +{ lib, stdenv, fetchurl, fetchpatch, python, pkg-config, gtk2, pygobject2, pycairo, pango , buildPythonPackage, libglade ? null, isPy3k }: buildPythonPackage rec { @@ -8,7 +8,7 @@ buildPythonPackage rec { disabled = isPy3k; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "04k942gn8vl95kwf0qskkv6npclfm31d78ljkrkgyqxxcni1w76d"; }; @@ -24,10 +24,10 @@ buildPythonPackage rec { }) ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pango - ] ++ stdenv.lib.optional (libglade != null) libglade; + ] ++ lib.optional (libglade != null) libglade; propagatedBuildInputs = [ gtk2 pygobject2 pycairo ]; @@ -35,11 +35,11 @@ buildPythonPackage rec { buildPhase = "buildPhase"; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-ObjC"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-ObjC"; installPhase = "installPhase"; - checkPhase = stdenv.lib.optionalString (libglade == null) + checkPhase = lib.optionalString (libglade == null) '' sed -i -e "s/glade = importModule('gtk.glade', buildDir)//" \ tests/common.py diff --git a/pkgs/development/python-modules/pygtksourceview/default.nix b/pkgs/development/python-modules/pygtksourceview/default.nix index 947b5733a7e..57a21f1e178 100644 --- a/pkgs/development/python-modules/pygtksourceview/default.nix +++ b/pkgs/development/python-modules/pygtksourceview/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, python, buildPythonPackage, pkgconfig, pygobject2, glib, pygtk, gnome2 }: +{ lib, fetchurl, python, buildPythonPackage, pkg-config, pygobject2, glib, pygtk, gnome2 }: buildPythonPackage rec { pname = "pygtksourceview"; @@ -12,7 +12,7 @@ buildPythonPackage rec { patches = [ ./codegendir.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ python pygobject2 glib pygtk gnome2.gtksourceview ]; meta = { diff --git a/pkgs/development/python-modules/pyhamcrest/1.nix b/pkgs/development/python-modules/pyhamcrest/1.nix index 5df52d9b658..4c2ec4df681 100644 --- a/pkgs/development/python-modules/pyhamcrest/1.nix +++ b/pkgs/development/python-modules/pyhamcrest/1.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , mock, pytest , six }: diff --git a/pkgs/development/python-modules/pyhamcrest/default.nix b/pkgs/development/python-modules/pyhamcrest/default.nix index a66e26b1319..fd6ba2f2df9 100644 --- a/pkgs/development/python-modules/pyhamcrest/default.nix +++ b/pkgs/development/python-modules/pyhamcrest/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , mock, pytest , six }: diff --git a/pkgs/development/python-modules/pyhaversion/default.nix b/pkgs/development/python-modules/pyhaversion/default.nix index 27d750a5df7..22290695cc0 100644 --- a/pkgs/development/python-modules/pyhaversion/default.nix +++ b/pkgs/development/python-modules/pyhaversion/default.nix @@ -1,40 +1,49 @@ { lib -, buildPythonPackage -, fetchPypi -, pythonOlder , aiohttp +, aresponses , async-timeout -, semantic-version -, pytestrunner +, awesomeversion +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytest-asyncio +, pytestCheckHook }: + buildPythonPackage rec { pname = "pyhaversion"; - version = "3.4.2"; + version = "20.12.1"; + + # Only 3.8.0 and beyond are supported disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - sha256 = "b4e49dfa0f9dae10edd072e630d902e5497daa312baad58b7df7618efe863377"; + src = fetchFromGitHub { + owner = "ludeeus"; + repo = pname; + rev = version; + sha256 = "17yl67dgw75dghljcfwzblm11kqnh6sxf47w62mxz86aq9zrvcxd"; }; propagatedBuildInputs = [ aiohttp async-timeout - semantic-version + awesomeversion ]; - buildInputs = [ - pytestrunner + checkInputs = [ + aresponses + awesomeversion + pytest-asyncio + pytestCheckHook ]; - # no tests - doCheck = false; pythonImportsCheck = [ "pyhaversion" ]; meta = with lib; { - description = "A python module to the newest version number of Home Assistant"; + description = "Python module to the newest version number of Home Assistant"; homepage = "https://github.com/ludeeus/pyhaversion"; + changelog = "https://github.com/ludeeus/pyhaversion/releases/tag/${version}"; license = with licenses; [ mit ]; - maintainers = [ maintainers.makefu ]; + maintainers = with maintainers; [ makefu ]; }; } diff --git a/pkgs/development/python-modules/pyhomematic/default.nix b/pkgs/development/python-modules/pyhomematic/default.nix index 502d648b400..65d3f60da04 100644 --- a/pkgs/development/python-modules/pyhomematic/default.nix +++ b/pkgs/development/python-modules/pyhomematic/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, isPy3k, fetchPypi }: +{ lib, buildPythonPackage, isPy3k, fetchPypi }: buildPythonPackage rec { pname = "pyhomematic"; diff --git a/pkgs/development/python-modules/pyicu/default.nix b/pkgs/development/python-modules/pyicu/default.nix index 3512e33c81d..e152002cdd1 100644 --- a/pkgs/development/python-modules/pyicu/default.nix +++ b/pkgs/development/python-modules/pyicu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/pkgs/development/python-modules/pyinotify/default.nix b/pkgs/development/python-modules/pyinotify/default.nix index 92c2f5bb671..e5714ec1800 100644 --- a/pkgs/development/python-modules/pyinotify/default.nix +++ b/pkgs/development/python-modules/pyinotify/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/pyinputevent/default.nix b/pkgs/development/python-modules/pyinputevent/default.nix index a52a0bb4001..1d4f4cfa784 100644 --- a/pkgs/development/python-modules/pyinputevent/default.nix +++ b/pkgs/development/python-modules/pyinputevent/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub }: diff --git a/pkgs/development/python-modules/pyinsteon/default.nix b/pkgs/development/python-modules/pyinsteon/default.nix new file mode 100644 index 00000000000..8596883326b --- /dev/null +++ b/pkgs/development/python-modules/pyinsteon/default.nix @@ -0,0 +1,60 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, aiofiles +, aiohttp +, async_generator +, pypubsub +, pyserial +, pyserial-asyncio +, pyyaml +, pytestCheckHook +, pythonOlder +, pytest-cov +, pytest-asyncio +, pytest-timeout +}: + +buildPythonPackage rec { + pname = "pyinsteon"; + version = "1.0.8"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = version; + sha256 = "0d028fcqmdzxp0vsz7digx794s9l65ydsnsyvyx275z6577x7h4h"; + }; + + propagatedBuildInputs = [ + aiofiles + aiohttp + async_generator + pypubsub + pyserial + pyserial-asyncio + pyyaml + ]; + + checkInputs = [ + pytest-asyncio + pytest-cov + pytest-timeout + pytestCheckHook + ]; + + pythonImportsCheck = [ "pyinsteon" ]; + + meta = with lib; { + description = "Python library to support Insteon home automation projects"; + longDescription = '' + This is a Python package to interface with an Insteon Modem. It has been + tested to work with most USB or RS-232 serial based devices such as the + 2413U, 2412S, 2448A7 and Hub models 2242 and 2245. + ''; + homepage = "https://github.com/pyinsteon/pyinsteon"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyipp/default.nix b/pkgs/development/python-modules/pyipp/default.nix index 98bb6360ce5..ed5a5f4576a 100644 --- a/pkgs/development/python-modules/pyipp/default.nix +++ b/pkgs/development/python-modules/pyipp/default.nix @@ -1,11 +1,18 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy27 -, aiohttp, deepmerge, yarl -, aresponses, pytest, pytest-asyncio, pytestcov }: +{ lib +, aiohttp +, aresponses +, buildPythonPackage +, deepmerge +, fetchFromGitHub +, pytest-asyncio +, pytestCheckHook +, pytestcov +, yarl +}: buildPythonPackage rec { pname = "pyipp"; version = "0.11.0"; - disabled = isPy27; src = fetchFromGitHub { owner = "ctalkington"; @@ -22,14 +29,26 @@ buildPythonPackage rec { checkInputs = [ aresponses - pytest pytest-asyncio pytestcov + pytestCheckHook ]; - checkPhase = '' - pytest -q . - ''; + # Some tests are failing due to encoding issues + # https://github.com/ctalkington/python-ipp/issues/121 + disabledTests = [ + "test_internal_session" + "test_request_port" + "est_http_error426" + "test_unexpected_response" + "test_printer" + "test_raw" + "test_ipp_request" + "test_request_tls" + "test_ipp_error_0x0503" + ]; + + pythonImportsCheck = [ "pyipp" ]; meta = with lib; { description = "Asynchronous Python client for Internet Printing Protocol (IPP)"; diff --git a/pkgs/development/python-modules/pyiqvia/default.nix b/pkgs/development/python-modules/pyiqvia/default.nix index 762e39fe4b1..f231f98df85 100644 --- a/pkgs/development/python-modules/pyiqvia/default.nix +++ b/pkgs/development/python-modules/pyiqvia/default.nix @@ -3,7 +3,7 @@ , aiohttp , aresponses , fetchFromGitHub -, poetry +, poetry-core , pytest-aiohttp , pytest-asyncio , pytestCheckHook @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pyiqvia"; - version = "0.3.1"; + version = "0.3.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -21,10 +21,10 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "1yjsbq4p040a35n8g2l0wgnv83wkjirv4rj73s2mjzn3cxf395bz"; + sha256 = "089lah23939m523jmjkaw2li0fikp2nswxznfvzwnr6wjpp3m9as"; }; - nativeBuildInputs = [ poetry ]; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ aiohttp ]; diff --git a/pkgs/development/python-modules/pykdtree/default.nix b/pkgs/development/python-modules/pykdtree/default.nix index f37ddb2483e..3161548f8b5 100644 --- a/pkgs/development/python-modules/pykdtree/default.nix +++ b/pkgs/development/python-modules/pykdtree/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, numpy, nose, openmp }: +{ lib, buildPythonPackage, fetchPypi, numpy, nose, openmp }: buildPythonPackage rec { pname = "pykdtree"; diff --git a/pkgs/development/python-modules/pykerberos/default.nix b/pkgs/development/python-modules/pykerberos/default.nix index 07a32a25a0c..13d7a4fd248 100644 --- a/pkgs/development/python-modules/pykerberos/default.nix +++ b/pkgs/development/python-modules/pykerberos/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, krb5 }: +{ lib, fetchPypi, buildPythonPackage, krb5 }: buildPythonPackage rec { pname = "pykerberos"; diff --git a/pkgs/development/python-modules/pykickstart/default.nix b/pkgs/development/python-modules/pykickstart/default.nix index bc10295e232..8b1eefdafed 100644 --- a/pkgs/development/python-modules/pykickstart/default.nix +++ b/pkgs/development/python-modules/pykickstart/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , urlgrabber diff --git a/pkgs/development/python-modules/pykira/default.nix b/pkgs/development/python-modules/pykira/default.nix new file mode 100644 index 00000000000..43d381e6bce --- /dev/null +++ b/pkgs/development/python-modules/pykira/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "pykira"; + version = "0.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0zxglzmd2k1nc4wri76ykra910fdgli027nw9d6541ic7xmw87vj"; + }; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "pykira" ]; + + meta = with lib; { + description = "Python module to interact with Kira modules"; + homepage = "https://github.com/stu-gott/pykira"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pylast/default.nix b/pkgs/development/python-modules/pylast/default.nix index 707554be559..26812ff9151 100644 --- a/pkgs/development/python-modules/pylast/default.nix +++ b/pkgs/development/python-modules/pylast/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, certifi, six +{ lib, buildPythonPackage, fetchPypi, isPy3k, certifi, six , setuptools_scm }: diff --git a/pkgs/development/python-modules/pylibconfig2/default.nix b/pkgs/development/python-modules/pylibconfig2/default.nix index 25989d0353e..2cabb78544e 100644 --- a/pkgs/development/python-modules/pylibconfig2/default.nix +++ b/pkgs/development/python-modules/pylibconfig2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pyparsing }: +{ lib, buildPythonPackage, fetchPypi, pyparsing }: buildPythonPackage rec { pname = "pylibconfig2"; version = "0.2.5"; diff --git a/pkgs/development/python-modules/pyliblo/default.nix b/pkgs/development/python-modules/pyliblo/default.nix index 454f08fd10e..64f8e62c286 100644 --- a/pkgs/development/python-modules/pyliblo/default.nix +++ b/pkgs/development/python-modules/pyliblo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , isPyPy diff --git a/pkgs/development/python-modules/pylibmc/default.nix b/pkgs/development/python-modules/pylibmc/default.nix index 8bb62c09134..9fb8401bdc4 100644 --- a/pkgs/development/python-modules/pylibmc/default.nix +++ b/pkgs/development/python-modules/pylibmc/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, lib, stdenv, libmemcached, zlib, cyrus_sasl }: +{ buildPythonPackage, fetchPypi, lib, libmemcached, zlib, cyrus_sasl }: buildPythonPackage rec { version = "1.6.1"; diff --git a/pkgs/development/python-modules/pylink-square/default.nix b/pkgs/development/python-modules/pylink-square/default.nix new file mode 100644 index 00000000000..287e8c338a8 --- /dev/null +++ b/pkgs/development/python-modules/pylink-square/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, fetchPypi +, fetchFromGitHub +, mock +, psutil +, six +, future +}: + +let + mock' = mock.overridePythonAttrs (old: rec { + version = "2.0.0"; + src = fetchPypi { + inherit (old) pname; + inherit version; + sha256 = "1flbpksir5sqrvq2z0dp8sl4bzbadg21sj4d42w3klpdfvgvcn5i"; + }; + }); +in buildPythonPackage rec { + pname = "pylink-square"; + version = "0.8.1"; + + src = fetchFromGitHub { + owner = "square"; + repo = "pylink"; + rev = "v${version}"; + sha256 = "1q5sm1017pcqcgwhsliiiv1wh609lrjdlc8f5ihlschk1d0qidpd"; + }; + + buildInputs = [ mock' ]; + propagatedBuildInputs = [ psutil six future ]; + + preCheck = '' + # For an unknown reason, `pylink --version` output is different + # inside the nix build environment across different python versions + substituteInPlace tests/unit/test_main.py --replace \ + "expected = 'pylink %s' % pylink.__version__" \ + "return" + ''; + + pythonImportsCheck = [ "pylink" ]; + + meta = with lib; { + description = "Python interface for the SEGGER J-Link"; + homepage = "https://github.com/Square/pylink"; + maintainers = with maintainers; [ dump_stack ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/pylutron/default.nix b/pkgs/development/python-modules/pylutron/default.nix new file mode 100644 index 00000000000..90a45640812 --- /dev/null +++ b/pkgs/development/python-modules/pylutron/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "pylutron"; + version = "0.2.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "1q8qdy26s9hvfsh75pak7xiqjwrwsgq18p4d86dwf4dwmy5s4qj1"; + }; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "pylutron" ]; + + meta = with lib; { + description = "Python library for controlling a Lutron RadioRA 2 system"; + homepage = "https://github.com/thecynic/pylutron"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pymaging/default.nix b/pkgs/development/python-modules/pymaging/default.nix index 3b35ce3e716..8869924bddb 100644 --- a/pkgs/development/python-modules/pymaging/default.nix +++ b/pkgs/development/python-modules/pymaging/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub }: diff --git a/pkgs/development/python-modules/pymaging_png/default.nix b/pkgs/development/python-modules/pymaging_png/default.nix index 64ea5b4ff5b..6d12ddd4006 100644 --- a/pkgs/development/python-modules/pymaging_png/default.nix +++ b/pkgs/development/python-modules/pymaging_png/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , pymaging diff --git a/pkgs/development/python-modules/pymata-express/default.nix b/pkgs/development/python-modules/pymata-express/default.nix new file mode 100644 index 00000000000..1a50a91a309 --- /dev/null +++ b/pkgs/development/python-modules/pymata-express/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pyserial +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pymata-express"; + version = "1.19"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "MrYsLab"; + repo = pname; + rev = "v${version}"; + sha256 = "0gfjmqcxwsnfjgll6ql5xd1n3xp4klf4fcaajaivh053i02p0a79"; + }; + + propagatedBuildInputs = [ pyserial ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "pymata_express" ]; + + meta = with lib; { + description = "Python Asyncio Arduino Firmata Client"; + longDescription = '' + Pymata-Express is a Python Firmata Protocol client. When used in conjunction + with an Arduino Firmata sketch, it permits you to control and monitor Arduino + hardware remotely over a serial link. + ''; + homepage = "https://mryslab.github.io/pymata-express/"; + license = with licenses; [ agpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix index 84fcdbef6a3..bae7a561323 100644 --- a/pkgs/development/python-modules/pymatgen/default.nix +++ b/pkgs/development/python-modules/pymatgen/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , enum34 , glibcLocales , matplotlib diff --git a/pkgs/development/python-modules/pymeeus/default.nix b/pkgs/development/python-modules/pymeeus/default.nix index 96fb9d6f694..13e80a38e4b 100644 --- a/pkgs/development/python-modules/pymeeus/default.nix +++ b/pkgs/development/python-modules/pymeeus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest }: +{ lib, buildPythonPackage, fetchPypi, pytest }: buildPythonPackage rec { pname = "PyMeeus"; diff --git a/pkgs/development/python-modules/pymemoize/default.nix b/pkgs/development/python-modules/pymemoize/default.nix index b44ff9fef49..f66a6ef702b 100644 --- a/pkgs/development/python-modules/pymemoize/default.nix +++ b/pkgs/development/python-modules/pymemoize/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , django diff --git a/pkgs/development/python-modules/pymetar/default.nix b/pkgs/development/python-modules/pymetar/default.nix index 84139091ae4..72a17f27dca 100644 --- a/pkgs/development/python-modules/pymetar/default.nix +++ b/pkgs/development/python-modules/pymetar/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python, buildPythonPackage, isPy3k, fetchPypi }: +{ lib, python, buildPythonPackage, isPy3k, fetchPypi }: buildPythonPackage rec { pname = "pymetar"; diff --git a/pkgs/development/python-modules/pymetno/default.nix b/pkgs/development/python-modules/pymetno/default.nix index 2b10e2f164f..b3d91c595d8 100644 --- a/pkgs/development/python-modules/pymetno/default.nix +++ b/pkgs/development/python-modules/pymetno/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , aiohttp diff --git a/pkgs/development/python-modules/pymsgbox/default.nix b/pkgs/development/python-modules/pymsgbox/default.nix index d69c0011ac5..84ab3dcab1b 100644 --- a/pkgs/development/python-modules/pymsgbox/default.nix +++ b/pkgs/development/python-modules/pymsgbox/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, tkinter }: +{ lib, fetchPypi, buildPythonPackage, tkinter }: buildPythonPackage rec { pname = "PyMsgBox"; diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix index 8ce7d5a19c6..501f829dc14 100644 --- a/pkgs/development/python-modules/pymupdf/default.nix +++ b/pkgs/development/python-modules/pymupdf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, mupdf, swig }: +{ lib, buildPythonPackage, fetchPypi, mupdf, swig }: buildPythonPackage rec { pname = "pymupdf"; version = "1.18.0"; diff --git a/pkgs/development/python-modules/pymyq/default.nix b/pkgs/development/python-modules/pymyq/default.nix new file mode 100644 index 00000000000..2500909d534 --- /dev/null +++ b/pkgs/development/python-modules/pymyq/default.nix @@ -0,0 +1,36 @@ +{ lib +, aiodns +, aiohttp +, async-timeout +, buildPythonPackage +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "pymyq"; + version = "2.0.14"; + + src = fetchFromGitHub { + owner = "arraylabs"; + repo = pname; + rev = "v${version}"; + sha256 = "18825b9c6qk4zcvva79hpg6098z4zqxyapnqmjsli23npw0zh67w"; + }; + + propagatedBuildInputs = [ + aiodns + aiohttp + async-timeout + ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "pymyq" ]; + + meta = with lib; { + description = "Python wrapper for MyQ API"; + homepage = "https://github.com/arraylabs/pymyq"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pymysqlsa/default.nix b/pkgs/development/python-modules/pymysqlsa/default.nix index 6009b03e508..49b5a49193d 100644 --- a/pkgs/development/python-modules/pymysqlsa/default.nix +++ b/pkgs/development/python-modules/pymysqlsa/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pymysql diff --git a/pkgs/development/python-modules/pynac/default.nix b/pkgs/development/python-modules/pynac/default.nix index 656825a36bb..a6df8cb036d 100644 --- a/pkgs/development/python-modules/pynac/default.nix +++ b/pkgs/development/python-modules/pynac/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl }: diff --git a/pkgs/development/python-modules/pynacl/default.nix b/pkgs/development/python-modules/pynacl/default.nix index be69bf3d802..37cf0a9ef10 100644 --- a/pkgs/development/python-modules/pynacl/default.nix +++ b/pkgs/development/python-modules/pynacl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/pkgs/development/python-modules/pync/default.nix b/pkgs/development/python-modules/pync/default.nix index 20811f2df9d..9506b8bae95 100644 --- a/pkgs/development/python-modules/pync/default.nix +++ b/pkgs/development/python-modules/pync/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { buildInputs = [ pkgs.coreutils ]; propagatedBuildInputs = [ dateutil ]; - preInstall = stdenv.lib.optionalString stdenv.isDarwin '' + preInstall = lib.optionalString stdenv.isDarwin '' sed -i 's|^\([ ]*\)self.bin_path.*$|\1self.bin_path = "${pkgs.terminal-notifier}/bin/terminal-notifier"|' build/lib/pync/TerminalNotifier.py ''; diff --git a/pkgs/development/python-modules/pynest2d/default.nix b/pkgs/development/python-modules/pynest2d/default.nix index 6214f3db42b..7ca72293382 100644 --- a/pkgs/development/python-modules/pynest2d/default.nix +++ b/pkgs/development/python-modules/pynest2d/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python3, cmake +{ lib, buildPythonPackage, fetchFromGitHub, python3, cmake , pythonOlder, libnest2d, sip, clipper }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pynisher/default.nix b/pkgs/development/python-modules/pynisher/default.nix index 0ecac704e1e..28e9922e172 100644 --- a/pkgs/development/python-modules/pynisher/default.nix +++ b/pkgs/development/python-modules/pynisher/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, psutil, docutils }: +{ lib, buildPythonPackage, fetchPypi, psutil, docutils }: buildPythonPackage rec { pname = "pynisher"; diff --git a/pkgs/development/python-modules/pynndescent/default.nix b/pkgs/development/python-modules/pynndescent/default.nix new file mode 100644 index 00000000000..aab8f4e743a --- /dev/null +++ b/pkgs/development/python-modules/pynndescent/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, fetchPypi +, fetchpatch +, nose +, scikitlearn +, scipy +, numba +, llvmlite +, joblib +}: + +buildPythonPackage rec { + pname = "pynndescent"; + version = "0.5.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "74a05a54d13573a38878781d44812ac6df97d8762a56f9bb5dd87a99911820fe"; + }; + + patches = [ + # fixes tests, included in 0.5.2 + (fetchpatch { + url = "https://github.com/lmcinnes/pynndescent/commit/ef5d8c3c3bfe976063b6621e3e0734c0c22d813b.patch"; + sha256 = "sha256-49n3kevs3wpzd4FfZVKmNpF2o1V8pJs4KOx8zCAhR3s="; + }) + ]; + + checkInputs = [ + nose + ]; + + propagatedBuildInputs = [ + scikitlearn + scipy + numba + llvmlite + joblib + ]; + + checkPhase = '' + nosetests + ''; + + meta = with lib; { + description = "Nearest Neighbor Descent"; + homepage = "https://github.com/lmcinnes/pynndescent"; + license = licenses.bsd2; + maintainers = [ maintainers.mic92 ]; + }; +} diff --git a/pkgs/development/python-modules/pynput/default.nix b/pkgs/development/python-modules/pynput/default.nix index 5f193a8ab35..49da01f8e71 100644 --- a/pkgs/development/python-modules/pynput/default.nix +++ b/pkgs/development/python-modules/pynput/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { nativeBuildInputs = [ sphinx ]; propagatedBuildInputs = [ setuptools-lint xlib ] - ++ stdenv.lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.isLinux [ evdev ]; diff --git a/pkgs/development/python-modules/pynzb/default.nix b/pkgs/development/python-modules/pynzb/default.nix index 294c2374f53..3f1cca75dc1 100644 --- a/pkgs/development/python-modules/pynzb/default.nix +++ b/pkgs/development/python-modules/pynzb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , python diff --git a/pkgs/development/python-modules/pyobjc/default.nix b/pkgs/development/python-modules/pyobjc/default.nix index 9799cbaf0e8..4b27bea10bc 100644 --- a/pkgs/development/python-modules/pyobjc/default.nix +++ b/pkgs/development/python-modules/pyobjc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, isPy3k, buildPythonPackage }: +{ lib, fetchPypi, isPy3k, buildPythonPackage }: buildPythonPackage rec { pname = "pyobjc"; @@ -13,10 +13,10 @@ buildPythonPackage rec { sha256 = "2b6c3e98f1408564ace1df36927154d7827c8e2f382386ab5d2db95c891e35a0"; }; - meta = { + meta = with lib; { description = "A bridge between the Python and Objective-C programming languages"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ ]; + license = licenses.mit; + maintainers = with maintainers; [ ]; homepage = "https://pythonhosted.org/pyobjc/"; }; } diff --git a/pkgs/development/python-modules/pyodbc/default.nix b/pkgs/development/python-modules/pyodbc/default.nix index 2dec1d8705b..8f2686a7914 100644 --- a/pkgs/development/python-modules/pyodbc/default.nix +++ b/pkgs/development/python-modules/pyodbc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPyPy, unixODBC }: +{ lib, buildPythonPackage, fetchPypi, isPyPy, unixODBC }: buildPythonPackage rec { pname = "pyodbc"; diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index 4171eaeeb57..cf881a58048 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchPypi , buildPythonPackage , Mako diff --git a/pkgs/development/python-modules/pyopengl-accelerate/default.nix b/pkgs/development/python-modules/pyopengl-accelerate/default.nix index 23de6b2323f..c6839bba989 100644 --- a/pkgs/development/python-modules/pyopengl-accelerate/default.nix +++ b/pkgs/development/python-modules/pyopengl-accelerate/default.nix @@ -1,7 +1,6 @@ -{ stdenv +{ lib , buildPythonPackage , fetchPypi -, lib }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix index 202607186b9..c8b3bd4158c 100644 --- a/pkgs/development/python-modules/pyopenssl/default.nix +++ b/pkgs/development/python-modules/pyopenssl/default.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , buildPythonPackage , fetchPypi , openssl @@ -13,9 +14,6 @@ , fetchpatch }: -with stdenv.lib; - - let # https://github.com/pyca/pyopenssl/issues/791 # These tests, we disable in the case that libressl is passed in as openssl. @@ -51,21 +49,20 @@ let # https://github.com/pyca/pyopenssl/issues/768 "test_wantWriteError" ] ++ ( - optionals (hasPrefix "libressl" openssl.meta.name) failingLibresslTests + lib.optionals (lib.hasPrefix "libressl" openssl.meta.name) failingLibresslTests ) ++ ( - optionals (versionAtLeast (getVersion openssl.name) "1.1") failingOpenSSL_1_1Tests + lib.optionals (lib.versionAtLeast (lib.getVersion openssl.name) "1.1") failingOpenSSL_1_1Tests ) ++ ( # https://github.com/pyca/pyopenssl/issues/974 - optionals stdenv.isi686 [ "test_verify_with_time" ] + lib.optionals stdenv.is32bit [ "test_verify_with_time" ] ); # Compose the final string expression, including the "-k" and the single quotes. - testExpression = optionalString (disabledTests != []) - "-k 'not ${concatStringsSep " and not " disabledTests}'"; + testExpression = lib.optionalString (disabledTests != []) + "-k 'not ${lib.concatStringsSep " and not " disabledTests}'"; in - buildPythonPackage rec { pname = "pyOpenSSL"; version = "20.0.0"; diff --git a/pkgs/development/python-modules/pyopnsense/default.nix b/pkgs/development/python-modules/pyopnsense/default.nix new file mode 100644 index 00000000000..f4f5bf6c70d --- /dev/null +++ b/pkgs/development/python-modules/pyopnsense/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchPypi +, fixtures +, mock +, pbr +, pytest-cov +, pytestCheckHook +, pythonOlder +, requests +, six +}: + +buildPythonPackage rec { + pname = "pyopnsense"; + version = "0.3.0"; + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "06rssdb3zhccnm63z96mw5yd38d9i99fgigfcdxn9divalbbhp5a"; + }; + + propagatedBuildInputs = [ + pbr + six + requests + ]; + + checkInputs = [ + fixtures + mock + pytest-cov + pytestCheckHook + ]; + + pythonImportsCheck = [ "pyopnsense" ]; + + meta = with lib; { + description = "Python client for the OPNsense API"; + homepage = "https://github.com/mtreinish/pyopnsense"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyotp/default.nix b/pkgs/development/python-modules/pyotp/default.nix index 7ad07b3a6e8..ed25a3ecbe7 100644 --- a/pkgs/development/python-modules/pyotp/default.nix +++ b/pkgs/development/python-modules/pyotp/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pyotp"; - version = "2.4.1"; + version = "2.5.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "038a3f70b34eaad3f72459e8b411662ef8dfcdd95f7d9203fa489e987a75584b"; + sha256 = "2a54d393aff3a244b566d78d597c9cb42e91b3b12f3169cec89d9dfff1c9c5bc"; }; pythonImportsCheck = [ "pyotp" ]; diff --git a/pkgs/development/python-modules/pypandoc/default.nix b/pkgs/development/python-modules/pypandoc/default.nix index ffe7bf01423..c54e220228a 100644 --- a/pkgs/development/python-modules/pypandoc/default.nix +++ b/pkgs/development/python-modules/pypandoc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch +{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch , pandoc, haskellPackages, texlive }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pyparted/default.nix b/pkgs/development/python-modules/pyparted/default.nix index b6768ad992d..f46a5d2db82 100644 --- a/pkgs/development/python-modules/pyparted/default.nix +++ b/pkgs/development/python-modules/pyparted/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { sed -i -e ' s|e\.path\.startswith("/tmp/temp-device-")|"temp-device-" in e.path| ' tests/test__ped_ped.py - '' + stdenv.lib.optionalString stdenv.isi686 '' + '' + lib.optionalString stdenv.isi686 '' # remove some integers in this test case which overflow on 32bit systems sed -i -r -e '/class *UnitGetSizeTestCase/,/^$/{/[0-9]{11}/d}' \ tests/test__ped_ped.py diff --git a/pkgs/development/python-modules/pypass/default.nix b/pkgs/development/python-modules/pypass/default.nix index 2458a29ac31..f3e49452c89 100644 --- a/pkgs/development/python-modules/pypass/default.nix +++ b/pkgs/development/python-modules/pypass/default.nix @@ -1,4 +1,5 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , click , colorama , enum34 @@ -11,7 +12,6 @@ , pexpect , pythonAtLeast , pythonOlder -, stdenv , substituteAll , tree , xclip @@ -43,7 +43,7 @@ buildPythonPackage rec { ]; # Remove enum34 requirement if Python >= 3.4 - postPatch = stdenv.lib.optionalString (pythonAtLeast "3.4") '' + postPatch = lib.optionalString (pythonAtLeast "3.4") '' substituteInPlace requirements.txt --replace "enum34" "" ''; @@ -53,7 +53,7 @@ buildPythonPackage rec { click colorama pexpect - ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34; + ] ++ lib.optional (pythonOlder "3.4") enum34; checkInputs = [ nose ]; @@ -74,11 +74,11 @@ buildPythonPackage rec { runHook postCheck ''; - meta = { + meta = with lib; { description = "Password manager pass in Python"; homepage = "https://github.com/aviau/python-pass"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ jluttine ]; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = with maintainers; [ jluttine ]; }; } diff --git a/pkgs/development/python-modules/pypck/default.nix b/pkgs/development/python-modules/pypck/default.nix index f8e6cc96aff..3d39b3516b6 100644 --- a/pkgs/development/python-modules/pypck/default.nix +++ b/pkgs/development/python-modules/pypck/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pypck"; - version = "0.7.8"; + version = "0.7.9"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "alengwenus"; repo = pname; rev = version; - sha256 = "06yqyqpzpypid27z31prvsp7nzpjqzn7gjlfqwjhhxl8fdgh8hkr"; + sha256 = "0clpi6bplzw7qg2m0hgwqr71zwxrh901gwprhd1yjykn30njp5bw"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/pypdf/default.nix b/pkgs/development/python-modules/pypdf/default.nix index d69b1078aee..1244f374b44 100644 --- a/pkgs/development/python-modules/pypdf/default.nix +++ b/pkgs/development/python-modules/pypdf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/pypdf2/default.nix b/pkgs/development/python-modules/pypdf2/default.nix index cd91cc347a4..26d27f4455a 100644 --- a/pkgs/development/python-modules/pypdf2/default.nix +++ b/pkgs/development/python-modules/pypdf2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , glibcLocales diff --git a/pkgs/development/python-modules/pypeg2/default.nix b/pkgs/development/python-modules/pypeg2/default.nix index 1f16a307a0c..8b630f743d1 100644 --- a/pkgs/development/python-modules/pypeg2/default.nix +++ b/pkgs/development/python-modules/pypeg2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/pyphen/default.nix b/pkgs/development/python-modules/pyphen/default.nix index d8b9abcf97a..2f573b67838 100644 --- a/pkgs/development/python-modules/pyphen/default.nix +++ b/pkgs/development/python-modules/pyphen/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "Pyphen"; diff --git a/pkgs/development/python-modules/pypillowfight/default.nix b/pkgs/development/python-modules/pypillowfight/default.nix index bc0e4535999..1fc4198ebeb 100644 --- a/pkgs/development/python-modules/pypillowfight/default.nix +++ b/pkgs/development/python-modules/pypillowfight/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitLab, nose, pillow +{ lib, buildPythonPackage, fetchFromGitLab, nose, pillow , isPy3k, isPyPy }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pyplatec/default.nix b/pkgs/development/python-modules/pyplatec/default.nix index 8747840fd7c..0c8c6c4328a 100644 --- a/pkgs/development/python-modules/pyplatec/default.nix +++ b/pkgs/development/python-modules/pyplatec/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/pypoppler/default.nix b/pkgs/development/python-modules/pypoppler/default.nix index 83190bc292a..348f9171502 100644 --- a/pkgs/development/python-modules/pypoppler/default.nix +++ b/pkgs/development/python-modules/pypoppler/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/pyprind/default.nix b/pkgs/development/python-modules/pyprind/default.nix index d270136558f..9c13a953570 100644 --- a/pkgs/development/python-modules/pyprind/default.nix +++ b/pkgs/development/python-modules/pyprind/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage +{ lib, fetchPypi, buildPythonPackage , psutil , pytest }: diff --git a/pkgs/development/python-modules/pyptlib/default.nix b/pkgs/development/python-modules/pyptlib/default.nix index af2575d2143..9f9f99884b9 100644 --- a/pkgs/development/python-modules/pyptlib/default.nix +++ b/pkgs/development/python-modules/pyptlib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPyPy diff --git a/pkgs/development/python-modules/pypugjs/default.nix b/pkgs/development/python-modules/pypugjs/default.nix index b806177b4d7..22ac89cf6a9 100644 --- a/pkgs/development/python-modules/pypugjs/default.nix +++ b/pkgs/development/python-modules/pypugjs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, six, chardet, nose +{ lib, buildPythonPackage, fetchPypi, fetchpatch, six, chardet, nose , django, jinja2, tornado, pyramid, pyramid_mako, Mako }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pyqt-builder/default.nix b/pkgs/development/python-modules/pyqt-builder/default.nix new file mode 100644 index 00000000000..d7f15d966b3 --- /dev/null +++ b/pkgs/development/python-modules/pyqt-builder/default.nix @@ -0,0 +1,25 @@ +{ lib, fetchPypi, buildPythonPackage, packaging, sip_5 }: + +buildPythonPackage rec { + pname = "pyqt-builder"; + version = "1.6.0"; + + src = fetchPypi { + pname = "PyQt-builder"; + inherit version; + sha256 = "0g51yak53zzjs4gpq65i01cmpz7w8cjny9wfyxlgr2vi0wag107v"; + }; + + propagatedBuildInputs = [ packaging sip_5 ]; + + pythonImportsCheck = [ "pyqtbuild" ]; + + # There aren't tests + doCheck = false; + + meta = with lib; { + description = "PEP 517 compliant build system for PyQt"; + homepage = "https://pypi.org/project/PyQt-builder/"; + license = licenses.gpl3Only; + }; +} diff --git a/pkgs/development/python-modules/pyqt/4.x.nix b/pkgs/development/python-modules/pyqt/4.x.nix index 05cf0aba354..3427438b8a2 100644 --- a/pkgs/development/python-modules/pyqt/4.x.nix +++ b/pkgs/development/python-modules/pyqt/4.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPythonPackage, python, dbus-python, sip, qt4, pkgconfig, lndir, dbus, makeWrapper }: +{ lib, stdenv, fetchurl, buildPythonPackage, python, dbus-python, sip, qt4, pkg-config, lndir, dbus, makeWrapper }: buildPythonPackage rec { pname = "PyQt-x11-gpl"; @@ -16,13 +16,13 @@ buildPythonPackage rec { rm -rf "$out/nix-support" export PYTHONPATH=$PYTHONPATH:$out/lib/${python.libPrefix}/site-packages - ${stdenv.lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.isDarwin '' export QMAKESPEC="unsupported/macx-clang-libc++" # macOS target after bootstrapping phase \ ''} substituteInPlace configure.py \ --replace 'install_dir=pydbusmoddir' "install_dir='$out/lib/${python.libPrefix}/site-packages/dbus/mainloop'" \ - ${stdenv.lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.isDarwin '' --replace "qt_macx_spec = 'macx-g++'" "qt_macx_spec = 'unsupported/macx-clang-libc++'" # for bootstrapping phase \ ''} @@ -38,11 +38,11 @@ buildPythonPackage rec { "--destdir=${placeholder "out"}/${python.sitePackages}" "--plugin-destdir=${placeholder "out"}/lib/qt4/plugins" "--sipdir=${placeholder "out"}/share/sip/PyQt4" - "--dbus=${stdenv.lib.getDev dbus-python}/include/dbus-1.0" + "--dbus=${lib.getDev dbus-python}/include/dbus-1.0" "--verbose" ]; - nativeBuildInputs = [ pkgconfig lndir makeWrapper qt4 ]; + nativeBuildInputs = [ pkg-config lndir makeWrapper qt4 ]; buildInputs = [ qt4 dbus ]; propagatedBuildInputs = [ sip ]; @@ -59,11 +59,11 @@ buildPythonPackage rec { qt = qt4; }; - meta = { + meta = with lib; { description = "Python bindings for Qt"; license = "GPL"; homepage = "http://www.riverbankcomputing.co.uk"; - maintainers = [ stdenv.lib.maintainers.sander ]; - platforms = stdenv.lib.platforms.mesaPlatforms; + maintainers = [ maintainers.sander ]; + platforms = platforms.mesaPlatforms; }; } diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index 0c32985cfaa..6e4b4d37f28 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -1,4 +1,4 @@ -{ lib, pythonPackages, pkgconfig +{ lib, pythonPackages, pkg-config , dbus , qmake, lndir , qtbase @@ -15,18 +15,35 @@ let inherit (pythonPackages) buildPythonPackage python isPy3k dbus-python enum34; - sip = (pythonPackages.sip.override { sip-module = "PyQt5.sip"; }).overridePythonAttrs(oldAttrs: { - # If we install sip in another folder, then we need to create a __init__.py as well - # if we want to be able to import it with Python 2. - # Python 3 could rely on it being an implicit namespace package, however, - # PyQt5 we made an explicit namespace package so sip should be as well. - postInstall = '' - cat << EOF > $out/${python.sitePackages}/PyQt5/__init__.py - from pkgutil import extend_path - __path__ = extend_path(__path__, __name__) - EOF - ''; - }); + sip = if isPy3k then + pythonPackages.sip_5 + else + (pythonPackages.sip.override { sip-module = "PyQt5.sip"; }).overridePythonAttrs(oldAttrs: { + # If we install sip in another folder, then we need to create a __init__.py as well + # if we want to be able to import it with Python 2. + # Python 3 could rely on it being an implicit namespace package, however, + # PyQt5 we made an explicit namespace package so sip should be as well. + postInstall = '' + cat << EOF > $out/${python.sitePackages}/PyQt5/__init__.py + from pkgutil import extend_path + __path__ = extend_path(__path__, __name__) + EOF + ''; + }); + + pyqt5_sip = buildPythonPackage rec { + pname = "PyQt5_sip"; + version = "12.8.1"; + + src = pythonPackages.fetchPypi { + inherit pname version; + sha256 = "30e944db9abee9cc757aea16906d4198129558533eb7fadbe48c5da2bd18e0bd"; + }; + + # There is no test code and the check phase fails with: + # > error: could not create 'PyQt5/sip.cpython-38-x86_64-linux-gnu.so': No such file or directory + doCheck = false; + }; in buildPythonPackage rec { pname = "PyQt5"; @@ -40,8 +57,10 @@ in buildPythonPackage rec { outputs = [ "out" "dev" ]; + dontWrapQtApps = true; + nativeBuildInputs = [ - pkgconfig + pkg-config qmake lndir sip @@ -69,8 +88,7 @@ in buildPythonPackage rec { propagatedBuildInputs = [ dbus-python - sip - ] ++ lib.optional (!isPy3k) enum34; + ] ++ (if isPy3k then [ pyqt5_sip ] else [ sip enum34 ]); patches = [ # Fix some wrong assumptions by ./configure.py @@ -103,7 +121,7 @@ in buildPythonPackage rec { runHook postConfigure ''; - postInstall = '' + postInstall = lib.optionalString (!isPy3k) '' ln -s ${sip}/${python.sitePackages}/PyQt5/sip.* $out/${python.sitePackages}/PyQt5/ for i in $out/bin/*; do wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH" @@ -116,26 +134,21 @@ in buildPythonPackage rec { EOF ''; - installCheckPhase = let - modules = [ - "PyQt5" - "PyQt5.QtCore" - "PyQt5.QtQml" - "PyQt5.QtWidgets" - "PyQt5.QtGui" - ] + # Checked using pythonImportsCheck + doCheck = false; + + pythonImportsCheck = [ + "PyQt5" + "PyQt5.QtCore" + "PyQt5.QtQml" + "PyQt5.QtWidgets" + "PyQt5.QtGui" + ] ++ lib.optional withWebSockets "PyQt5.QtWebSockets" ++ lib.optional withWebKit "PyQt5.QtWebKit" ++ lib.optional withMultimedia "PyQt5.QtMultimedia" ++ lib.optional withConnectivity "PyQt5.QtConnectivity" - ; - imports = lib.concatMapStrings (module: "import ${module};") modules; - in '' - echo "Checking whether modules can be imported..." - ${python.interpreter} -c "${imports}" - ''; - - doCheck = true; + ; enableParallelBuilding = true; diff --git a/pkgs/development/python-modules/pyqtgraph/default.nix b/pkgs/development/python-modules/pyqtgraph/default.nix index 98b30b24707..f43bfb9aaa6 100644 --- a/pkgs/development/python-modules/pyqtgraph/default.nix +++ b/pkgs/development/python-modules/pyqtgraph/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , numpy diff --git a/pkgs/development/python-modules/pyqtwebengine/default.nix b/pkgs/development/python-modules/pyqtwebengine/default.nix index 51506598ca1..dc631b2118e 100644 --- a/pkgs/development/python-modules/pyqtwebengine/default.nix +++ b/pkgs/development/python-modules/pyqtwebengine/default.nix @@ -1,4 +1,4 @@ -{ lib, pythonPackages, pkgconfig +{ lib, pythonPackages, pkg-config , qmake, qtbase, qtsvg, qtwebengine , wrapQtAppsHook }: @@ -27,7 +27,7 @@ in buildPythonPackage rec { outputs = [ "out" "dev" ]; nativeBuildInputs = [ - pkgconfig + pkg-config qmake sip qtbase @@ -45,6 +45,8 @@ in buildPythonPackage rec { propagatedBuildInputs = [ pyqt5 ] ++ lib.optional (!isPy3k) enum34; + dontWrapQtApps = true; + configurePhase = '' runHook preConfigure diff --git a/pkgs/development/python-modules/pyquery/default.nix b/pkgs/development/python-modules/pyquery/default.nix index 2496d9d968f..2bb2eb1c6fc 100644 --- a/pkgs/development/python-modules/pyquery/default.nix +++ b/pkgs/development/python-modules/pyquery/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , cssselect diff --git a/pkgs/development/python-modules/pyramid/default.nix b/pkgs/development/python-modules/pyramid/default.nix index 5f1e5c7d75a..44ac5a9221a 100644 --- a/pkgs/development/python-modules/pyramid/default.nix +++ b/pkgs/development/python-modules/pyramid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , webtest diff --git a/pkgs/development/python-modules/pyramid_beaker/default.nix b/pkgs/development/python-modules/pyramid_beaker/default.nix index 88dc62886fc..5c4e7c104bf 100644 --- a/pkgs/development/python-modules/pyramid_beaker/default.nix +++ b/pkgs/development/python-modules/pyramid_beaker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, beaker, pyramid }: +{ lib, buildPythonPackage, fetchPypi, pytest, beaker, pyramid }: buildPythonPackage rec { pname = "pyramid_beaker"; diff --git a/pkgs/development/python-modules/pyramid_chameleon/default.nix b/pkgs/development/python-modules/pyramid_chameleon/default.nix index 2bb5a03bdb9..d3388fdff35 100644 --- a/pkgs/development/python-modules/pyramid_chameleon/default.nix +++ b/pkgs/development/python-modules/pyramid_chameleon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , chameleon diff --git a/pkgs/development/python-modules/pyramid_exclog/default.nix b/pkgs/development/python-modules/pyramid_exclog/default.nix index 80514cc91b4..55da77f4964 100644 --- a/pkgs/development/python-modules/pyramid_exclog/default.nix +++ b/pkgs/development/python-modules/pyramid_exclog/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pyramid diff --git a/pkgs/development/python-modules/pyramid_hawkauth/default.nix b/pkgs/development/python-modules/pyramid_hawkauth/default.nix index ab4025b7230..f2f156e98b6 100644 --- a/pkgs/development/python-modules/pyramid_hawkauth/default.nix +++ b/pkgs/development/python-modules/pyramid_hawkauth/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , pyramid diff --git a/pkgs/development/python-modules/pyramid_jinja2/default.nix b/pkgs/development/python-modules/pyramid_jinja2/default.nix index 0497ab79613..464d8d209bf 100644 --- a/pkgs/development/python-modules/pyramid_jinja2/default.nix +++ b/pkgs/development/python-modules/pyramid_jinja2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , webtest diff --git a/pkgs/development/python-modules/pyramid_mako/default.nix b/pkgs/development/python-modules/pyramid_mako/default.nix index 8c71563e2d7..2f8c5e1e075 100644 --- a/pkgs/development/python-modules/pyramid_mako/default.nix +++ b/pkgs/development/python-modules/pyramid_mako/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , webtest diff --git a/pkgs/development/python-modules/pyramid_multiauth/default.nix b/pkgs/development/python-modules/pyramid_multiauth/default.nix index 9167918fc47..545883a25c1 100644 --- a/pkgs/development/python-modules/pyramid_multiauth/default.nix +++ b/pkgs/development/python-modules/pyramid_multiauth/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pyramid diff --git a/pkgs/development/python-modules/pyregion/default.nix b/pkgs/development/python-modules/pyregion/default.nix index b1868e7edde..86a5ef6bfe0 100644 --- a/pkgs/development/python-modules/pyregion/default.nix +++ b/pkgs/development/python-modules/pyregion/default.nix @@ -33,8 +33,8 @@ buildPythonPackage rec { name = "conftest-astropy-3-fix.patch"; url = "https://github.com/astropy/pyregion/pull/136.patch"; sha256 = "13yxjxiqnhjy9gh24hvv6pnwx7qic2mcx3ccr1igjrc3f881d59m"; - }) - ]; + }) + ]; nativeBuildInputs = [ astropy-helpers ]; diff --git a/pkgs/development/python-modules/pyreport/default.nix b/pkgs/development/python-modules/pyreport/default.nix index 09a1e7c6b41..6b9649699ba 100644 --- a/pkgs/development/python-modules/pyreport/default.nix +++ b/pkgs/development/python-modules/pyreport/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/pyres/default.nix b/pkgs/development/python-modules/pyres/default.nix index 6d49bd02594..bb15a4d927a 100644 --- a/pkgs/development/python-modules/pyres/default.nix +++ b/pkgs/development/python-modules/pyres/default.nix @@ -31,6 +31,9 @@ buildPythonPackage rec { sha256 = "1rkpv7gbjxl9h9g7kncmsrgmi77l7pgfq8d7dbnsr3ia2jmjqb8y"; }; + # started redis-server makes this hang on darwin + doCheck = !stdenv.isDarwin; + checkPhase = '' redis-server & nosetests . --exclude test_worker_pids diff --git a/pkgs/development/python-modules/pyrfc3339/default.nix b/pkgs/development/python-modules/pyrfc3339/default.nix index f6be3c4c897..9885d4f5443 100644 --- a/pkgs/development/python-modules/pyrfc3339/default.nix +++ b/pkgs/development/python-modules/pyrfc3339/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytz diff --git a/pkgs/development/python-modules/pyro4/default.nix b/pkgs/development/python-modules/pyro4/default.nix index a84b22e0656..626560d89b6 100644 --- a/pkgs/development/python-modules/pyro4/default.nix +++ b/pkgs/development/python-modules/pyro4/default.nix @@ -1,7 +1,6 @@ -{ stdenv +{ lib , buildPythonPackage , fetchPypi -, lib , python , serpent , dill diff --git a/pkgs/development/python-modules/pyroma/default.nix b/pkgs/development/python-modules/pyroma/default.nix index e533f650169..bddf2413970 100644 --- a/pkgs/development/python-modules/pyroma/default.nix +++ b/pkgs/development/python-modules/pyroma/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , docutils, pygments, setuptools }: diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index f2378863720..e5c87a94b07 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, buildPythonPackage, fetchPypi}: +{lib, buildPythonPackage, fetchPypi}: buildPythonPackage rec { pname = "pyroute2"; diff --git a/pkgs/development/python-modules/pyrr/default.nix b/pkgs/development/python-modules/pyrr/default.nix index f8ac5d8e867..cb1da523868 100644 --- a/pkgs/development/python-modules/pyrr/default.nix +++ b/pkgs/development/python-modules/pyrr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , setuptools diff --git a/pkgs/development/python-modules/pyrsistent/default.nix b/pkgs/development/python-modules/pyrsistent/default.nix index 211bc85f511..79f6666474e 100644 --- a/pkgs/development/python-modules/pyrsistent/default.nix +++ b/pkgs/development/python-modules/pyrsistent/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/pkgs/development/python-modules/pyrss2gen/default.nix b/pkgs/development/python-modules/pyrss2gen/default.nix index e3586e6dbf1..4a7dc788caa 100644 --- a/pkgs/development/python-modules/pyrss2gen/default.nix +++ b/pkgs/development/python-modules/pyrss2gen/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/pysaml2/default.nix b/pkgs/development/python-modules/pysaml2/default.nix index 7d2fdb5b426..1bb096dc0c7 100644 --- a/pkgs/development/python-modules/pysaml2/default.nix +++ b/pkgs/development/python-modules/pysaml2/default.nix @@ -1,17 +1,16 @@ -{ lib, stdenv +{ lib , buildPythonPackage , isPy3k , fetchFromGitHub -, fetchpatch , substituteAll , xmlsec -, cryptography, defusedxml, future, pyopenssl, dateutil, pytz, requests, six -, mock, pyasn1, pymongo, pytest, responses +, cryptography, defusedxml, pyopenssl, dateutil, pytz, requests, six +, mock, pyasn1, pymongo, pytest, responses, xmlschema, importlib-resources }: buildPythonPackage rec { pname = "pysaml2"; - version = "5.0.0"; + version = "6.5.1"; disabled = !isPy3k; @@ -20,7 +19,7 @@ buildPythonPackage rec { owner = "IdentityPython"; repo = pname; rev = "v${version}"; - sha256 = "0hwhxz45h8l1b0615hf855z7valfcmm0nb7k31bcj84v68zp5rjs"; + sha256 = "1gh74csjk6af23agyigk4id79s4li1xnkmbpp73aqyvlly2kd0b7"; }; patches = [ @@ -28,12 +27,6 @@ buildPythonPackage rec { src = ./hardcode-xmlsec1-path.patch; inherit xmlsec; }) - # remove on next release - (fetchpatch { - name = "fix-test-dates.patch"; - url = "https://github.com/IdentityPython/pysaml2/commit/1d97d2d26f63e42611558fdd0e439bb8a7496a27.patch"; - sha256 = "0r6d6hkk6z9yw7aqnsnylii516ysmdsc8dghwmgnwvw6cm7l388p"; - }) ]; postPatch = '' @@ -41,7 +34,17 @@ buildPythonPackage rec { sed -i 's/2999\(-.*T\)/2029\1/g' tests/*.xml ''; - propagatedBuildInputs = [ cryptography defusedxml future pyopenssl dateutil pytz requests six ]; + propagatedBuildInputs = [ + cryptography + dateutil + defusedxml + importlib-resources + pyopenssl + pytz + requests + six + xmlschema + ]; checkInputs = [ mock pyasn1 pymongo pytest responses ]; diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix index 9798d94900b..28c40e5ec5f 100644 --- a/pkgs/development/python-modules/pyscard/default.nix +++ b/pkgs/development/python-modules/pyscard/default.nix @@ -1,11 +1,8 @@ -{ stdenv, fetchPypi, buildPythonPackage, swig, pcsclite, PCSC }: +{ lib, stdenv, fetchPypi, 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 { @@ -24,19 +21,19 @@ buildPythonPackage rec { '' else '' substituteInPlace smartcard/scard/winscarddll.c \ --replace "libpcsclite.so.1" \ - "${getLib pcsclite}/lib/libpcsclite${sharedLibrary}" + "${lib.getLib pcsclite}/lib/libpcsclite${stdenv.hostPlatform.extensions.sharedLibrary}" ''; - NIX_CFLAGS_COMPILE = optionalString (! withApplePCSC) - "-I ${getDev pcsclite}/include/PCSC"; + NIX_CFLAGS_COMPILE = lib.optionalString (! withApplePCSC) + "-I ${lib.getDev pcsclite}/include/PCSC"; propagatedBuildInputs = if withApplePCSC then [ PCSC ] else [ pcsclite ]; nativeBuildInputs = [ swig ]; - meta = { + meta = with lib; { homepage = "https://pyscard.sourceforge.io/"; description = "Smartcard library for python"; - license = stdenv.lib.licenses.lgpl21; - maintainers = with stdenv.lib.maintainers; [ layus ]; + license = licenses.lgpl21; + maintainers = with maintainers; [ layus ]; }; } diff --git a/pkgs/development/python-modules/pyscss/default.nix b/pkgs/development/python-modules/pyscss/default.nix index 87f23b8edf7..e4e7791fa79 100644 --- a/pkgs/development/python-modules/pyscss/default.nix +++ b/pkgs/development/python-modules/pyscss/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , pytest @@ -23,8 +23,8 @@ buildPythonPackage rec { checkInputs = [ pytest ]; propagatedBuildInputs = [ six ] - ++ (stdenv.lib.optionals (pythonOlder "3.4") [ enum34 pathlib ]) - ++ (stdenv.lib.optionals (pythonOlder "2.7") [ ordereddict ]); + ++ (lib.optionals (pythonOlder "3.4") [ enum34 pathlib ]) + ++ (lib.optionals (pythonOlder "2.7") [ ordereddict ]); checkPhase = '' py.test diff --git a/pkgs/development/python-modules/pysendfile/default.nix b/pkgs/development/python-modules/pysendfile/default.nix index a35f2ae77f0..1a7c783e829 100644 --- a/pkgs/development/python-modules/pysendfile/default.nix +++ b/pkgs/development/python-modules/pysendfile/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , python diff --git a/pkgs/development/python-modules/pysensors/default.nix b/pkgs/development/python-modules/pysensors/default.nix index 214412c4cee..8cff62b89c1 100644 --- a/pkgs/development/python-modules/pysensors/default.nix +++ b/pkgs/development/python-modules/pysensors/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, python, fetchFromGitHub, lm_sensors }: +{ lib, buildPythonPackage, python, fetchFromGitHub, lm_sensors }: buildPythonPackage { version = "2017-07-13"; pname = "pysensors"; diff --git a/pkgs/development/python-modules/pyserial-asyncio/default.nix b/pkgs/development/python-modules/pyserial-asyncio/default.nix index ff3d624490b..54f3f80a3f8 100644 --- a/pkgs/development/python-modules/pyserial-asyncio/default.nix +++ b/pkgs/development/python-modules/pyserial-asyncio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k +{ lib, buildPythonPackage, fetchPypi, isPy3k , pyserial }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pysftp/default.nix b/pkgs/development/python-modules/pysftp/default.nix index 28daf6b385e..3333a30bd1a 100644 --- a/pkgs/development/python-modules/pysftp/default.nix +++ b/pkgs/development/python-modules/pysftp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPyPy diff --git a/pkgs/development/python-modules/pyshp/default.nix b/pkgs/development/python-modules/pyshp/default.nix index 661c70a0ab2..7f494e98ad2 100644 --- a/pkgs/development/python-modules/pyshp/default.nix +++ b/pkgs/development/python-modules/pyshp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , setuptools }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pyside/apiextractor.nix b/pkgs/development/python-modules/pyside/apiextractor.nix index 10f030b13f6..9398a62997b 100644 --- a/pkgs/development/python-modules/pyside/apiextractor.nix +++ b/pkgs/development/python-modules/pyside/apiextractor.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, libxml2, libxslt, python3, qt4 }: +{ lib, stdenv, fetchurl, cmake, libxml2, libxslt, python3, qt4 }: # This derivation does not provide any Python module and should therefore be called via `all-packages.nix`. let @@ -20,11 +20,11 @@ in stdenv.mkDerivation { nativeBuildInputs = [ cmake pythonEnv ]; buildInputs = [ qt4 libxml2 libxslt ]; - meta = { + meta = with lib; { description = "Eases the development of bindings of Qt-based libraries for high level languages by automating most of the process"; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2; homepage = "http://www.pyside.org/docs/apiextractor/"; maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; }; } diff --git a/pkgs/development/python-modules/pyside/default.nix b/pkgs/development/python-modules/pyside/default.nix index 08fd8cbfa86..f880791eeec 100644 --- a/pkgs/development/python-modules/pyside/default.nix +++ b/pkgs/development/python-modules/pyside/default.nix @@ -23,6 +23,8 @@ buildPythonPackage rec { makeFlags = [ "QT_PLUGIN_PATH=${pysideShiboken}/lib/generatorrunner" ]; + dontWrapQtApps = true; + meta = { description = "LGPL-licensed Python bindings for the Qt cross-platform application and UI framework"; license = lib.licenses.lgpl21; diff --git a/pkgs/development/python-modules/pyside/generatorrunner.nix b/pkgs/development/python-modules/pyside/generatorrunner.nix index cbc586f4734..532ee6b2b24 100644 --- a/pkgs/development/python-modules/pyside/generatorrunner.nix +++ b/pkgs/development/python-modules/pyside/generatorrunner.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pysideApiextractor, python3, qt4 }: +{ lib, stdenv, fetchurl, cmake, pysideApiextractor, python3, qt4 }: # This derivation does not provide any Python module and should therefore be called via `all-packages.nix`. let @@ -22,11 +22,11 @@ in stdenv.mkDerivation { nativeBuildInputs = [ cmake pythonEnv ]; buildInputs = [ pysideApiextractor qt4 ]; - meta = { + meta = with lib; { description = "Eases the development of binding generators for C++ and Qt-based libraries by providing a framework to help automating most of the process"; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2; homepage = "http://www.pyside.org/docs/generatorrunner/"; maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; }; } diff --git a/pkgs/development/python-modules/pyside2-tools/default.nix b/pkgs/development/python-modules/pyside2-tools/default.nix index 095a10c1047..20f1a572f1b 100644 --- a/pkgs/development/python-modules/pyside2-tools/default.nix +++ b/pkgs/development/python-modules/pyside2-tools/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation { "-DBUILD_TESTS=OFF" ]; + dontWrapQtApps = true; + # The upstream build system consists of a `setup.py` whichs builds three # different python libraries and calls cmake as a subprocess. We call cmake # directly because that's easier to get working. However, the `setup.py` diff --git a/pkgs/development/python-modules/pyside2/default.nix b/pkgs/development/python-modules/pyside2/default.nix index 6986c8e5384..c2786b647d6 100644 --- a/pkgs/development/python-modules/pyside2/default.nix +++ b/pkgs/development/python-modules/pyside2/default.nix @@ -30,6 +30,8 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ shiboken2 ]; + dontWrapQtApps = true; + meta = with lib; { description = "LGPL-licensed Python bindings for Qt"; license = licenses.lgpl21; diff --git a/pkgs/development/python-modules/pysigset/default.nix b/pkgs/development/python-modules/pysigset/default.nix index 8e31735db2e..ccacb412924 100644 --- a/pkgs/development/python-modules/pysigset/default.nix +++ b/pkgs/development/python-modules/pysigset/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "pysigset"; diff --git a/pkgs/development/python-modules/pyslurm/default.nix b/pkgs/development/python-modules/pyslurm/default.nix index a113314aa40..abb85930e40 100644 --- a/pkgs/development/python-modules/pyslurm/default.nix +++ b/pkgs/development/python-modules/pyslurm/default.nix @@ -22,6 +22,7 @@ buildPythonPackage rec { description = "Python bindings to Slurm"; license = licenses.gpl2; maintainers = with maintainers; [ bhipple ]; + platforms = platforms.linux; broken = true; # still needs slurm-19.05, but nixpkgs has slurm-20+ now }; } diff --git a/pkgs/development/python-modules/pysmbc/default.nix b/pkgs/development/python-modules/pysmbc/default.nix index eff4dd58c1d..bea1438f679 100644 --- a/pkgs/development/python-modules/pysmbc/default.nix +++ b/pkgs/development/python-modules/pysmbc/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi -, samba, pkgconfig +{ lib, buildPythonPackage, fetchPypi +, samba, pkg-config , setuptools }: buildPythonPackage rec { @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "14b75f358ical7zzqh3g1qkh2dxwxn2gz7sah5f5svndqkd3z8jy"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ setuptools samba ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pysmf/default.nix b/pkgs/development/python-modules/pysmf/default.nix index 02559510100..25f5fc6a20c 100644 --- a/pkgs/development/python-modules/pysmf/default.nix +++ b/pkgs/development/python-modules/pysmf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pkg-config, libsmf, glib, pytest }: +{ lib, buildPythonPackage, fetchPypi, pkg-config, libsmf, glib, pytest }: buildPythonPackage rec { pname = "pysmf"; diff --git a/pkgs/development/python-modules/pysmi/default.nix b/pkgs/development/python-modules/pysmi/default.nix index 953581aa302..7b96b97f0bb 100644 --- a/pkgs/development/python-modules/pysmi/default.nix +++ b/pkgs/development/python-modules/pysmi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , ply diff --git a/pkgs/development/python-modules/pysnmp/default.nix b/pkgs/development/python-modules/pysnmp/default.nix index 7dce4d9b4d1..0b0e298d5d0 100644 --- a/pkgs/development/python-modules/pysnmp/default.nix +++ b/pkgs/development/python-modules/pysnmp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pyasn1 diff --git a/pkgs/development/python-modules/pysocks/default.nix b/pkgs/development/python-modules/pysocks/default.nix index 79c163726b7..70fb74ab4dd 100644 --- a/pkgs/development/python-modules/pysocks/default.nix +++ b/pkgs/development/python-modules/pysocks/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/pysoma/default.nix b/pkgs/development/python-modules/pysoma/default.nix new file mode 100644 index 00000000000..893736ff160 --- /dev/null +++ b/pkgs/development/python-modules/pysoma/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "pysoma"; + version = "0.0.10"; + + src = fetchPypi { + inherit pname version; + sha256 = "1q8afi6m3mfh0rfpghyvx6z76kgrpkbnlqzbs4p8ax13n0fnlkdi"; + }; + + # Project has no test + doCheck = false; + pythonImportsCheck = [ "api" ]; + + meta = with lib; { + description = "Python wrapper for the HTTP API provided by SOMA Connect"; + homepage = "https://pypi.org/project/pysoma"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyspark/default.nix b/pkgs/development/python-modules/pyspark/default.nix index 342755131a3..f8a7c09b407 100644 --- a/pkgs/development/python-modules/pyspark/default.nix +++ b/pkgs/development/python-modules/pyspark/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, lib, stdenv, py4j }: +{ buildPythonPackage, fetchPypi, lib, py4j }: buildPythonPackage rec { pname = "pyspark"; diff --git a/pkgs/development/python-modules/pyspotify/default.nix b/pkgs/development/python-modules/pyspotify/default.nix index a6bf14cdca0..302eb12de5a 100644 --- a/pkgs/development/python-modules/pyspotify/default.nix +++ b/pkgs/development/python-modules/pyspotify/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { find -print0 | xargs -0 touch ''; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.isDarwin '' find "$out" -name _spotify.so -exec \ install_name_tool -change \ @loader_path/../Frameworks/libspotify.framework/libspotify \ diff --git a/pkgs/development/python-modules/pyspread/default.nix b/pkgs/development/python-modules/pyspread/default.nix deleted file mode 100644 index a14911b7a3e..00000000000 --- a/pkgs/development/python-modules/pyspread/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ buildPythonPackage -, fetchPypi -, isPy3k -, lib, stdenv -, numpy -, wxPython -, matplotlib -, pycairo -, python-gnupg -, xlrd -, xlwt -, jedi -, pyenchant -, basemap -, pygtk -, makeDesktopItem -}: - -buildPythonPackage rec { - pname = "pyspread"; - version = "1.99.5"; - - src = fetchPypi { - inherit pname version; - sha256 = "d396c2f94bf1ef6140877ab19205e6f2375bfe01d1bf50ff33bb63384744dd78"; - }; - - propagatedBuildInputs = [ numpy wxPython matplotlib pycairo python-gnupg xlrd xlwt jedi pyenchant basemap pygtk ]; - # Could also (optionally) add pyrsvg and python bindings for libvlc - - # Tests try to access X Display - doCheck = false; - - disabled = isPy3k; - - desktopItem = makeDesktopItem rec { - name = pname; - exec = name; - icon = name; - desktopName = "Pyspread"; - genericName = "Spreadsheet"; - comment = meta.description; - categories = "Development;Spreadsheet;"; - }; - - postInstall = '' - mkdir -p $out/share/applications - cp $desktopItem/share/applications/* $out/share/applications - ''; - - meta = with lib; { - description = "Pyspread is a non-traditional spreadsheet application that is based on and written in the programming language Python"; - homepage = "https://manns.github.io/pyspread/"; - license = licenses.gpl3; - }; -} diff --git a/pkgs/development/python-modules/pysqlite/default.nix b/pkgs/development/python-modules/pysqlite/default.nix index fec1bbd0bed..09cc312223a 100644 --- a/pkgs/development/python-modules/pysqlite/default.nix +++ b/pkgs/development/python-modules/pysqlite/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { substituteInPlace "setup.cfg" \ --replace "/usr/local/include" "${pkgs.sqlite.dev}/include" \ --replace "/usr/local/lib" "${pkgs.sqlite.out}/lib" - ${stdenv.lib.optionalString (!stdenv.isDarwin) ''export LDSHARED="$CC -pthread -shared"''} + ${lib.optionalString (!stdenv.isDarwin) ''export LDSHARED="$CC -pthread -shared"''} ''; meta = with lib; { diff --git a/pkgs/development/python-modules/pysqueezebox/default.nix b/pkgs/development/python-modules/pysqueezebox/default.nix index 7c5d8ca5abf..8445f6d7e89 100644 --- a/pkgs/development/python-modules/pysqueezebox/default.nix +++ b/pkgs/development/python-modules/pysqueezebox/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, pythonOlder, aiohttp }: +{ lib, fetchPypi, buildPythonPackage, pythonOlder, aiohttp }: buildPythonPackage rec { pname = "pysqueezebox"; diff --git a/pkgs/development/python-modules/pysrt/default.nix b/pkgs/development/python-modules/pysrt/default.nix index 4012a732466..1099bffc40f 100644 --- a/pkgs/development/python-modules/pysrt/default.nix +++ b/pkgs/development/python-modules/pysrt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , chardet diff --git a/pkgs/development/python-modules/pyssim/default.nix b/pkgs/development/python-modules/pyssim/default.nix index 4f73ada61af..cdbbfeabf88 100644 --- a/pkgs/development/python-modules/pyssim/default.nix +++ b/pkgs/development/python-modules/pyssim/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, numpy, scipy, pillow }: +{ lib, buildPythonPackage, fetchFromGitHub, numpy, scipy, pillow }: buildPythonPackage rec { pname = "pyssim"; diff --git a/pkgs/development/python-modules/pystache/default.nix b/pkgs/development/python-modules/pystache/default.nix index 6ed036aecb1..c93655e10a8 100644 --- a/pkgs/development/python-modules/pystache/default.nix +++ b/pkgs/development/python-modules/pystache/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, python, fetchPypi, isPy3k, glibcLocales }: +{ lib, buildPythonPackage, python, fetchPypi, isPy3k, glibcLocales }: buildPythonPackage rec { pname = "pystache"; diff --git a/pkgs/development/python-modules/pystemd/default.nix b/pkgs/development/python-modules/pystemd/default.nix index 69186591949..e77dd605388 100644 --- a/pkgs/development/python-modules/pystemd/default.nix +++ b/pkgs/development/python-modules/pystemd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python, systemd }: +{ lib, python, systemd }: python.pkgs.buildPythonPackage rec { pname = "pystemd"; diff --git a/pkgs/development/python-modules/pystemmer/default.nix b/pkgs/development/python-modules/pystemmer/default.nix index 0ba23ffec5d..120867f389c 100644 --- a/pkgs/development/python-modules/pystemmer/default.nix +++ b/pkgs/development/python-modules/pystemmer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python, fetchPypi, buildPythonPackage, cython }: +{ lib, python, fetchPypi, buildPythonPackage, cython }: buildPythonPackage rec { pname = "PyStemmer"; diff --git a/pkgs/development/python-modules/pytabix/default.nix b/pkgs/development/python-modules/pytabix/default.nix index db8437d8957..fb2e622eac9 100644 --- a/pkgs/development/python-modules/pytabix/default.nix +++ b/pkgs/development/python-modules/pytabix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , isPy3k , fetchPypi diff --git a/pkgs/development/python-modules/pytado/default.nix b/pkgs/development/python-modules/pytado/default.nix index 636210c93d5..a54c89f348d 100644 --- a/pkgs/development/python-modules/pytado/default.nix +++ b/pkgs/development/python-modules/pytado/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub }: +{ lib, buildPythonPackage, fetchFromGitHub }: buildPythonPackage rec { pname = "PyTado"; diff --git a/pkgs/development/python-modules/pyte/default.nix b/pkgs/development/python-modules/pyte/default.nix index 65d3d9218d0..e930f1d5717 100644 --- a/pkgs/development/python-modules/pyte/default.nix +++ b/pkgs/development/python-modules/pyte/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, pytestrunner, wcwidth }: +{ lib, buildPythonPackage, fetchPypi, pytest, pytestrunner, wcwidth }: buildPythonPackage rec { pname = "pyte"; diff --git a/pkgs/development/python-modules/pytest-aiohttp/default.nix b/pkgs/development/python-modules/pytest-aiohttp/default.nix index 7384eb36070..fad9a70af0f 100644 --- a/pkgs/development/python-modules/pytest-aiohttp/default.nix +++ b/pkgs/development/python-modules/pytest-aiohttp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, aiohttp }: +{ lib, buildPythonPackage, fetchPypi, pytest, aiohttp }: buildPythonPackage rec { pname = "pytest-aiohttp"; diff --git a/pkgs/development/python-modules/pytest-annotate/default.nix b/pkgs/development/python-modules/pytest-annotate/default.nix index 1a7f77bf9b6..68b67f061bb 100644 --- a/pkgs/development/python-modules/pytest-annotate/default.nix +++ b/pkgs/development/python-modules/pytest-annotate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pyannotate diff --git a/pkgs/development/python-modules/pytest-ansible/default.nix b/pkgs/development/python-modules/pytest-ansible/default.nix index 309a33e8907..4ca6bdac6e9 100644 --- a/pkgs/development/python-modules/pytest-ansible/default.nix +++ b/pkgs/development/python-modules/pytest-ansible/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , ansible diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix index 961845a28e1..0f37d09a9e0 100644 --- a/pkgs/development/python-modules/pytest-asyncio/default.nix +++ b/pkgs/development/python-modules/pytest-asyncio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, isPy3k, isPy35, async_generator }: +{ lib, buildPythonPackage, fetchPypi, pytest, isPy3k, isPy35, async_generator }: buildPythonPackage rec { pname = "pytest-asyncio"; version = "0.14.0"; @@ -11,7 +11,7 @@ buildPythonPackage rec { }; buildInputs = [ pytest ] - ++ stdenv.lib.optionals isPy35 [ async_generator ]; + ++ lib.optionals isPy35 [ async_generator ]; # No tests in archive doCheck = false; diff --git a/pkgs/development/python-modules/pytest-bdd/default.nix b/pkgs/development/python-modules/pytest-bdd/default.nix index 493a2307e7e..83757c2e166 100644 --- a/pkgs/development/python-modules/pytest-bdd/default.nix +++ b/pkgs/development/python-modules/pytest-bdd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchFromGitHub , execnet , glob2 , Mako diff --git a/pkgs/development/python-modules/pytest-catchlog/default.nix b/pkgs/development/python-modules/pytest-catchlog/default.nix index 2fb02244d1d..39c26a3e0f3 100644 --- a/pkgs/development/python-modules/pytest-catchlog/default.nix +++ b/pkgs/development/python-modules/pytest-catchlog/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, unzip }: +{ lib, buildPythonPackage, fetchPypi, pytest, unzip }: buildPythonPackage rec { pname = "pytest-catchlog"; diff --git a/pkgs/development/python-modules/pytest-celery/default.nix b/pkgs/development/python-modules/pytest-celery/default.nix index 034c657b5b0..414cf1ecc9c 100644 --- a/pkgs/development/python-modules/pytest-celery/default.nix +++ b/pkgs/development/python-modules/pytest-celery/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, setuptools_scm }: +{ lib, buildPythonPackage, fetchPypi, pytest, setuptools_scm }: buildPythonPackage rec { pname = "pytest-celery"; diff --git a/pkgs/development/python-modules/pytest-check/default.nix b/pkgs/development/python-modules/pytest-check/default.nix index 41f316a18a6..4c3e9dd96fe 100644 --- a/pkgs/development/python-modules/pytest-check/default.nix +++ b/pkgs/development/python-modules/pytest-check/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "pytest-check"; - version = "0.3.9"; + version = "1.0.1"; src = fetchPypi { pname = "pytest_check"; inherit version; - sha256 = "0asrrz0fgk6wqffsz1ffd6z9xyw314fwh5bwjzcq75w8w1g4ass9"; + sha256 = "1i01i5ab06ic11na13gcacrlcs2ab6rmaii0yz0x06z5ynnljn6s"; }; propagatedBuildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-cov/default.nix b/pkgs/development/python-modules/pytest-cov/default.nix index aa921ddeb3d..003d7e14ab5 100644 --- a/pkgs/development/python-modules/pytest-cov/default.nix +++ b/pkgs/development/python-modules/pytest-cov/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , pytest, coverage }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pytest-datadir/default.nix b/pkgs/development/python-modules/pytest-datadir/default.nix index b1cdb1033a6..1dc218c0808 100644 --- a/pkgs/development/python-modules/pytest-datadir/default.nix +++ b/pkgs/development/python-modules/pytest-datadir/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchFromGitHub , setuptools_scm, pytest, cmake }: diff --git a/pkgs/development/python-modules/pytest-datafiles/default.nix b/pkgs/development/python-modules/pytest-datafiles/default.nix index bc6e2441b0f..bdcab2788ae 100644 --- a/pkgs/development/python-modules/pytest-datafiles/default.nix +++ b/pkgs/development/python-modules/pytest-datafiles/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, py, pytest }: +{ lib, buildPythonPackage, fetchPypi, py, pytest }: buildPythonPackage rec { pname = "pytest-datafiles"; diff --git a/pkgs/development/python-modules/pytest-dependency/default.nix b/pkgs/development/python-modules/pytest-dependency/default.nix index 9a3dbed55b1..7108a8f4c17 100644 --- a/pkgs/development/python-modules/pytest-dependency/default.nix +++ b/pkgs/development/python-modules/pytest-dependency/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, pytest }: +{ lib, buildPythonPackage, fetchPypi, fetchpatch, pytest }: buildPythonPackage rec { version = "0.5.1"; diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix index 069aa2812eb..bfcda812529 100644 --- a/pkgs/development/python-modules/pytest-django/default.nix +++ b/pkgs/development/python-modules/pytest-django/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/pkgs/development/python-modules/pytest-factoryboy/default.nix b/pkgs/development/python-modules/pytest-factoryboy/default.nix index 66d7579d0ed..e63b7329c96 100644 --- a/pkgs/development/python-modules/pytest-factoryboy/default.nix +++ b/pkgs/development/python-modules/pytest-factoryboy/default.nix @@ -1,42 +1,44 @@ -{ lib, stdenv -, fetchFromGitHub +{ lib , buildPythonPackage -, pytestCheckHook -, pytest -, inflection , factory_boy +, fetchFromGitHub +, inflection +, mock +, pytest , pytestcache +, pytestCheckHook , pytestcov -, mock }: buildPythonPackage rec { pname = "pytest-factoryboy"; - version = "2.0.3"; + version = "2.1.0"; src = fetchFromGitHub { owner = "pytest-dev"; repo = "pytest-factoryboy"; rev = version; - sha256 = "0m1snyybq2k51khlydhisq300vzys897vdbsicph628iran950hn"; + sha256 = "0v6b4ly0p8nknpnp3f4dbslfsifzzjx2vv27rfylx04kzdhg4m9p"; }; - # TODO: remove in next release, it's removed in master. - postPatch = "substituteInPlace tox.ini --replace '--pep8' ''"; - - propagatedBuildInputs = [ factory_boy inflection pytest ]; + propagatedBuildInputs = [ + factory_boy + inflection + pytest + ]; - # The project uses tox, which we can't. So we simply run pytest manually. checkInputs = [ mock pytestCheckHook pytestcache pytestcov ]; + pytestFlagsArray = [ "--ignore=docs" ]; + pythonImportsCheck = [ "pytest_factoryboy" ]; meta = with lib; { - description = "Integration of factory_boy into the pytest runner."; + description = "Integration of factory_boy into the pytest runner"; homepage = "https://pytest-factoryboy.readthedocs.io/en/latest/"; maintainers = with maintainers; [ winpat ]; license = licenses.mit; diff --git a/pkgs/development/python-modules/pytest-fixture-config/default.nix b/pkgs/development/python-modules/pytest-fixture-config/default.nix index 061f62bfc17..32392f8f14c 100644 --- a/pkgs/development/python-modules/pytest-fixture-config/default.nix +++ b/pkgs/development/python-modules/pytest-fixture-config/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , setuptools-git, pytest }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pytest-flakes/default.nix b/pkgs/development/python-modules/pytest-flakes/default.nix index fd4ed097806..805c19751ed 100644 --- a/pkgs/development/python-modules/pytest-flakes/default.nix +++ b/pkgs/development/python-modules/pytest-flakes/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder +{ lib, buildPythonPackage, fetchPypi, pythonOlder , pytest , pyflakes }: diff --git a/pkgs/development/python-modules/pytest-flask/default.nix b/pkgs/development/python-modules/pytest-flask/default.nix index 74e33a7731b..7b459b4a294 100644 --- a/pkgs/development/python-modules/pytest-flask/default.nix +++ b/pkgs/development/python-modules/pytest-flask/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, flask, werkzeug, setuptools_scm, isPy27 }: +{ lib, buildPythonPackage, fetchPypi, pytest, flask, werkzeug, setuptools_scm, isPy27 }: buildPythonPackage rec { pname = "pytest-flask"; diff --git a/pkgs/development/python-modules/pytest-forked/default.nix b/pkgs/development/python-modules/pytest-forked/default.nix index 89200f519e7..855e1fb470c 100644 --- a/pkgs/development/python-modules/pytest-forked/default.nix +++ b/pkgs/development/python-modules/pytest-forked/default.nix @@ -2,7 +2,9 @@ , buildPythonPackage , fetchPypi , setuptools_scm +, py , pytest +, pytestCheckHook }: buildPythonPackage rec { @@ -14,19 +16,16 @@ buildPythonPackage rec { sha256 = "6aa9ac7e00ad1a539c41bec6d21011332de671e938c7637378ec9710204e37ca"; }; - buildInputs = [ pytest setuptools_scm ]; + nativeBuildInputs = [ setuptools_scm ]; - # Do not function - doCheck = false; + propagatedBuildInputs = [ py pytest ]; - checkPhase = '' - py.test testing - ''; + checkInputs = [ pytestCheckHook ]; meta = { description = "Run tests in isolated forked subprocesses"; homepage = "https://github.com/pytest-dev/pytest-forked"; license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; }; - } diff --git a/pkgs/development/python-modules/pytest-freezegun/default.nix b/pkgs/development/python-modules/pytest-freezegun/default.nix index 424d8fde232..e5fbb6bb070 100644 --- a/pkgs/development/python-modules/pytest-freezegun/default.nix +++ b/pkgs/development/python-modules/pytest-freezegun/default.nix @@ -1,18 +1,21 @@ { lib , buildPythonPackage -, fetchPypi +, isPy27 +, fetchFromGitHub , freezegun , pytest +, pytestCheckHook }: buildPythonPackage rec { pname = "pytest-freezegun"; version = "0.4.2"; - src = fetchPypi { - inherit pname version; - extension = "zip"; - sha256 = "19c82d5633751bf3ec92caa481fb5cffaac1787bd485f0df6436fd6242176949"; + src = fetchFromGitHub { + owner = "ktosiek"; + repo = "pytest-freezegun"; + rev = version; + sha256 = "10c4pbh03b4s1q8cjd75lr0fvyf9id0zmdk29566qqsmaz28npas"; }; propagatedBuildInputs = [ @@ -20,6 +23,10 @@ buildPythonPackage rec { pytest ]; + checkInputs = [ + pytestCheckHook + ]; + meta = with lib; { description = "Wrap tests with fixtures in freeze_time"; homepage = "https://github.com/ktosiek/pytest-freezegun"; diff --git a/pkgs/development/python-modules/pytest-helpers-namespace/default.nix b/pkgs/development/python-modules/pytest-helpers-namespace/default.nix index 41263ce692b..c634aa00718 100644 --- a/pkgs/development/python-modules/pytest-helpers-namespace/default.nix +++ b/pkgs/development/python-modules/pytest-helpers-namespace/default.nix @@ -1,7 +1,7 @@ { buildPythonPackage , fetchFromGitHub , pytest -, lib, stdenv +, lib }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pytest-html/default.nix b/pkgs/development/python-modules/pytest-html/default.nix index 0b1090f7b81..1b09d6863b9 100644 --- a/pkgs/development/python-modules/pytest-html/default.nix +++ b/pkgs/development/python-modules/pytest-html/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder +{ lib, buildPythonPackage, fetchPypi, pythonOlder , pytest, pytest-metadata, setuptools_scm }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pytest-instafail/default.nix b/pkgs/development/python-modules/pytest-instafail/default.nix new file mode 100644 index 00000000000..f9942dd5bcd --- /dev/null +++ b/pkgs/development/python-modules/pytest-instafail/default.nix @@ -0,0 +1,24 @@ +{ buildPythonPackage +, fetchPypi +, lib +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pytest-instafail"; + version = "0.4.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "10lpr6mjcinabqynj6v85bvb1xmapnhqmg50nys1r6hg7zgky9qr"; + }; + + checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "pytest_instafail" ]; + meta = { + description = "pytest plugin that shows failures and errors instantly instead of waiting until the end of test session"; + homepage = "https://github.com/pytest-dev/pytest-instafail"; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.jacg ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-metadata/default.nix b/pkgs/development/python-modules/pytest-metadata/default.nix index e8b224dc1d4..f7766003be1 100644 --- a/pkgs/development/python-modules/pytest-metadata/default.nix +++ b/pkgs/development/python-modules/pytest-metadata/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , pytest, setuptools_scm }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pytest-mpl/default.nix b/pkgs/development/python-modules/pytest-mpl/default.nix index 0cc3a993c23..30a2757ecf3 100644 --- a/pkgs/development/python-modules/pytest-mpl/default.nix +++ b/pkgs/development/python-modules/pytest-mpl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/pkgs/development/python-modules/pytest-order/default.nix b/pkgs/development/python-modules/pytest-order/default.nix new file mode 100644 index 00000000000..b07be1178c6 --- /dev/null +++ b/pkgs/development/python-modules/pytest-order/default.nix @@ -0,0 +1,35 @@ +{ buildPythonPackage +, fetchPypi +, lib +, pytest +, pytest-xdist +, pytest-dependency +, pytest-mock +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pytest-order"; + version = "0.9.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "0b7i8z6rywnkb3skyg8bnfqgkjrwvkn64b4q07wfl1q7x65ksd26"; + }; + + propagatedBuildInputs = [ pytest ]; + + checkInputs = [ + pytestCheckHook + pytest-xdist + pytest-dependency + pytest-mock + ]; + + meta = { + description = "Pytest plugin that allows you to customize the order in which your tests are run"; + homepage = "https://github.com/mrbean-bremen/pytest-order"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.jacg ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-pep257/default.nix b/pkgs/development/python-modules/pytest-pep257/default.nix index eb5203c0246..827386786b7 100644 --- a/pkgs/development/python-modules/pytest-pep257/default.nix +++ b/pkgs/development/python-modules/pytest-pep257/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, pep257 }: +{ lib, buildPythonPackage, fetchPypi, pytest, pep257 }: buildPythonPackage rec { pname = "pytest-pep257"; diff --git a/pkgs/development/python-modules/pytest-quickcheck/default.nix b/pkgs/development/python-modules/pytest-quickcheck/default.nix index 5148fa4b760..4e08a8fabba 100644 --- a/pkgs/development/python-modules/pytest-quickcheck/default.nix +++ b/pkgs/development/python-modules/pytest-quickcheck/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, pytest-flakes, tox }: +{ lib, buildPythonPackage, fetchPypi, pytest, pytest-flakes, tox }: buildPythonPackage rec { pname = "pytest-quickcheck"; version = "0.8.6"; diff --git a/pkgs/development/python-modules/pytest-raisesregexp/default.nix b/pkgs/development/python-modules/pytest-raisesregexp/default.nix index 0d02a25ec3c..78b99714378 100644 --- a/pkgs/development/python-modules/pytest-raisesregexp/default.nix +++ b/pkgs/development/python-modules/pytest-raisesregexp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , py, pytest }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pytest-random-order/default.nix b/pkgs/development/python-modules/pytest-random-order/default.nix index 2def886c5cb..d84bb3c9acf 100644 --- a/pkgs/development/python-modules/pytest-random-order/default.nix +++ b/pkgs/development/python-modules/pytest-random-order/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonOlder diff --git a/pkgs/development/python-modules/pytest-relaxed/default.nix b/pkgs/development/python-modules/pytest-relaxed/default.nix index 401307039e5..19d031b6a2b 100644 --- a/pkgs/development/python-modules/pytest-relaxed/default.nix +++ b/pkgs/development/python-modules/pytest-relaxed/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/pkgs/development/python-modules/pytest-rerunfailures/default.nix b/pkgs/development/python-modules/pytest-rerunfailures/default.nix index 537f32316a3..1bd91fe70f7 100644 --- a/pkgs/development/python-modules/pytest-rerunfailures/default.nix +++ b/pkgs/development/python-modules/pytest-rerunfailures/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, pythonOlder, fetchPypi, pytest, mock }: +{ lib, buildPythonPackage, pythonOlder, fetchPypi, pytest, mock }: buildPythonPackage rec { pname = "pytest-rerunfailures"; diff --git a/pkgs/development/python-modules/pytest-server-fixtures/default.nix b/pkgs/development/python-modules/pytest-server-fixtures/default.nix index 41fcfc7b159..ca3c9a37c1a 100644 --- a/pkgs/development/python-modules/pytest-server-fixtures/default.nix +++ b/pkgs/development/python-modules/pytest-server-fixtures/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , pytest, pytest-shutil, pytest-fixture-config, psutil , requests, future, retry }: diff --git a/pkgs/development/python-modules/pytest-shutil/default.nix b/pkgs/development/python-modules/pytest-shutil/default.nix index 3edafdfb473..9d088e44f8d 100644 --- a/pkgs/development/python-modules/pytest-shutil/default.nix +++ b/pkgs/development/python-modules/pytest-shutil/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, isPyPy, buildPythonPackage, fetchPypi +{ lib, isPyPy, buildPythonPackage, fetchPypi , pytest, cmdline, pytestcov, coverage, setuptools-git, mock, pathpy, execnet , contextlib2, termcolor }: diff --git a/pkgs/development/python-modules/pytest-subtesthack/default.nix b/pkgs/development/python-modules/pytest-subtesthack/default.nix index f7454ee644c..5006ac51150 100644 --- a/pkgs/development/python-modules/pytest-subtesthack/default.nix +++ b/pkgs/development/python-modules/pytest-subtesthack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest }: +{ lib, buildPythonPackage, fetchPypi, pytest }: buildPythonPackage rec { pname = "pytest-subtesthack"; diff --git a/pkgs/development/python-modules/pytest-vcr/default.nix b/pkgs/development/python-modules/pytest-vcr/default.nix new file mode 100644 index 00000000000..9373c597b36 --- /dev/null +++ b/pkgs/development/python-modules/pytest-vcr/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pytest +, vcrpy +}: + +buildPythonPackage rec { + pname = "pytest-vcr"; + version = "1.0.2"; + + src = fetchFromGitHub { + owner = "ktosiek"; + repo = pname; + rev = version; + sha256 = "1i6fin91mklvbi8jzfiswvwf1m91f43smpj36a17xrzk4gisfs6i"; + }; + + propagatedBuildInputs = [ + pytest + vcrpy + ]; + + # Tests are using an obsolete attribute 'config' + # https://github.com/ktosiek/pytest-vcr/issues/43 + doCheck = false; + pythonImportsCheck = [ "pytest_vcr" ]; + + meta = with lib; { + description = "Integration VCR.py into pytest"; + homepage = "https://github.com/ktosiek/pytest-vcr"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-virtualenv/default.nix b/pkgs/development/python-modules/pytest-virtualenv/default.nix index 5234723a536..8ea981ba2e7 100644 --- a/pkgs/development/python-modules/pytest-virtualenv/default.nix +++ b/pkgs/development/python-modules/pytest-virtualenv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , pytest, pytestcov, mock, cmdline, pytest-fixture-config, pytest-shutil, virtualenv }: buildPythonPackage rec { @@ -12,7 +12,7 @@ buildPythonPackage rec { checkInputs = [ pytest pytestcov mock cmdline ]; propagatedBuildInputs = [ pytest-fixture-config pytest-shutil virtualenv ]; - checkPhase = '' py.test tests/unit ''; + checkPhase = "py.test tests/unit "; nativeBuildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-xdist/1.nix b/pkgs/development/python-modules/pytest-xdist/1.nix index 0c5ae06e861..fa794f94141 100644 --- a/pkgs/development/python-modules/pytest-xdist/1.nix +++ b/pkgs/development/python-modules/pytest-xdist/1.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, execnet, pytest +{ lib, fetchPypi, buildPythonPackage, execnet, pytest , setuptools_scm, pytest-forked, filelock, psutil, six, isPy3k }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix index e5019f842fe..94feb102994 100644 --- a/pkgs/development/python-modules/pytest-xdist/default.nix +++ b/pkgs/development/python-modules/pytest-xdist/default.nix @@ -1,28 +1,39 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, execnet, pytest_6 -, setuptools_scm, pytest-forked, filelock, psutil, six, isPy3k }: +{ lib +, buildPythonPackage +, fetchPypi +, isPy27 +, setuptools_scm +, pytestCheckHook +, filelock +, execnet +, pytest +, pytest-forked +, psutil +}: buildPythonPackage rec { pname = "pytest-xdist"; - version = "2.1.0"; - disabled = !isPy3k; + version = "2.2.0"; + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0wh6pn66nncfs6ay0n863bgyriwsgppn8flx5l7551j1lbqkinc2"; + sha256 = "1d8edbb1a45e8e1f8e44b1260583107fc23f8bc8da6d18cb331ff61d41258ecf"; }; - nativeBuildInputs = [ setuptools_scm pytest_6 ]; - checkInputs = [ pytest_6 filelock ]; - propagatedBuildInputs = [ execnet pytest-forked psutil six ]; + nativeBuildInputs = [ setuptools_scm ]; + checkInputs = [ pytestCheckHook filelock ]; + propagatedBuildInputs = [ execnet pytest pytest-forked psutil ]; - # pytest6 doesn't allow for new lines - # capture_deprecated not compatible with latest pytest6 - checkPhase = '' - # Excluded tests access file system - export HOME=$TMPDIR - pytest -n $NIX_BUILD_CORES \ - -k "not (distribution_rsyncdirs_example or rsync or warning_captured_deprecated_in_pytest_6)" - ''; + # access file system + disabledTests = [ + "test_distribution_rsyncdirs_example" + "test_rsync_popen_with_path" + "test_popen_rsync_subdir" + "test_rsync_report" + "test_init_rsync_roots" + "test_rsyncignore" + ]; meta = with lib; { description = "py.test xdist plugin for distributed testing and loop-on-failing modes"; diff --git a/pkgs/development/python-modules/pytest/4.nix b/pkgs/development/python-modules/pytest/4.nix index 88963537c9d..f30eec15a0a 100644 --- a/pkgs/development/python-modules/pytest/4.nix +++ b/pkgs/development/python-modules/pytest/4.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, pythonOlder, fetchPypi, attrs, hypothesis, py +{ lib, buildPythonPackage, pythonOlder, fetchPypi, attrs, hypothesis, py , setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools , atomicwrites, mock, writeText, pathlib2, wcwidth, packaging, isPyPy }: @@ -14,8 +14,8 @@ buildPythonPackage rec { checkInputs = [ hypothesis mock ]; buildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites wcwidth packaging ] - ++ stdenv.lib.optionals (!isPy3k) [ funcsigs ] - ++ stdenv.lib.optionals (pythonOlder "3.6") [ pathlib2 ]; + ++ lib.optionals (!isPy3k) [ funcsigs ] + ++ lib.optionals (pythonOlder "3.6") [ pathlib2 ]; doCheck = !isPyPy; # https://github.com/pytest-dev/pytest/issues/3460 checkPhase = '' diff --git a/pkgs/development/python-modules/pytest/5.nix b/pkgs/development/python-modules/pytest/5.nix index ade36f4aa0b..341d5ac2240 100644 --- a/pkgs/development/python-modules/pytest/5.nix +++ b/pkgs/development/python-modules/pytest/5.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, pythonOlder, fetchPypi, isPy3k, isPyPy +{ lib, buildPythonPackage, pythonOlder, fetchPypi, isPy3k, isPyPy , atomicwrites , attrs , funcsigs @@ -43,7 +43,7 @@ buildPythonPackage rec { six toml wcwidth - ] ++ stdenv.lib.optionals (pythonOlder "3.6") [ pathlib2 ]; + ] ++ lib.optionals (pythonOlder "3.6") [ pathlib2 ]; doCheck = !isPyPy; # https://github.com/pytest-dev/pytest/issues/3460 diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 3c8e00f1af8..798084d1111 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, pythonOlder, fetchPypi, isPy3k, isPyPy +{ lib, buildPythonPackage, pythonOlder, fetchPypi, isPy3k, isPyPy , atomicwrites , attrs , funcsigs @@ -45,7 +45,7 @@ buildPythonPackage rec { six toml wcwidth - ] ++ stdenv.lib.optionals (pythonOlder "3.6") [ pathlib2 ]; + ] ++ lib.optionals (pythonOlder "3.6") [ pathlib2 ]; doCheck = !isPyPy; # https://github.com/pytest-dev/pytest/issues/3460 diff --git a/pkgs/development/python-modules/pytestcache/default.nix b/pkgs/development/python-modules/pytestcache/default.nix index 877e357d946..cf8643db06d 100644 --- a/pkgs/development/python-modules/pytestcache/default.nix +++ b/pkgs/development/python-modules/pytestcache/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , pytest, execnet }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pytestrunner/default.nix b/pkgs/development/python-modules/pytestrunner/default.nix index 7fd901babd0..d6203276b82 100644 --- a/pkgs/development/python-modules/pytestrunner/default.nix +++ b/pkgs/development/python-modules/pytestrunner/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools_scm, pytest }: +{ lib, buildPythonPackage, fetchPypi, setuptools_scm, pytest }: buildPythonPackage rec { pname = "pytest-runner"; diff --git a/pkgs/development/python-modules/python-doi/default.nix b/pkgs/development/python-modules/python-doi/default.nix index 7e94f743da4..e0cb03d611d 100644 --- a/pkgs/development/python-modules/python-doi/default.nix +++ b/pkgs/development/python-modules/python-doi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy3k }: +{ lib, buildPythonPackage, fetchFromGitHub, isPy3k }: buildPythonPackage rec { pname = "python-doi"; diff --git a/pkgs/development/python-modules/python-editor/default.nix b/pkgs/development/python-modules/python-editor/default.nix index 19efcb89d3d..212e191568c 100644 --- a/pkgs/development/python-modules/python-editor/default.nix +++ b/pkgs/development/python-modules/python-editor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { version = "1.0.4"; diff --git a/pkgs/development/python-modules/python-efl/default.nix b/pkgs/development/python-modules/python-efl/default.nix index bfd14ab3635..293d9771280 100644 --- a/pkgs/development/python-modules/python-efl/default.nix +++ b/pkgs/development/python-modules/python-efl/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv +{ lib , fetchurl , buildPythonPackage -, pkgconfig +, pkg-config , python , dbus-python , enlightenment @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "0bk161xwlz4dlv56r68xwkm8snzfifaxd1j7w2wcyyk4fgvnvq4r"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ enlightenment.efl ]; diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix index 19c8941d2fc..ed03d966307 100644 --- a/pkgs/development/python-modules/python-engineio/default.nix +++ b/pkgs/development/python-modules/python-engineio/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { doCheck = !stdenv.isDarwin; - preCheck = stdenv.lib.optionalString stdenv.isLinux '' + preCheck = lib.optionalString stdenv.isLinux '' echo "nameserver 127.0.0.1" > resolv.conf export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf) \ LD_PRELOAD=${libredirect}/lib/libredirect.so diff --git a/pkgs/development/python-modules/python-etcd/default.nix b/pkgs/development/python-modules/python-etcd/default.nix index f4305473797..f9b01802c42 100644 --- a/pkgs/development/python-modules/python-etcd/default.nix +++ b/pkgs/development/python-modules/python-etcd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/pkgs/development/python-modules/python-forecastio/default.nix b/pkgs/development/python-modules/python-forecastio/default.nix index 392c5c2126d..991ec3279de 100644 --- a/pkgs/development/python-modules/python-forecastio/default.nix +++ b/pkgs/development/python-modules/python-forecastio/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, lib, stdenv, fetchPypi +{ buildPythonPackage, lib, fetchPypi , requests , nose , responses diff --git a/pkgs/development/python-modules/python-frontmatter/default.nix b/pkgs/development/python-modules/python-frontmatter/default.nix index 661ea4ba249..6c6806f043c 100644 --- a/pkgs/development/python-modules/python-frontmatter/default.nix +++ b/pkgs/development/python-modules/python-frontmatter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonPackage rec { pname = "python-frontmatter"; diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix index c706ff7903c..1a2e28d57ab 100644 --- a/pkgs/development/python-modules/python-gitlab/default.nix +++ b/pkgs/development/python-modules/python-gitlab/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, requests, mock, httmock, pythonOlder, pytest, responses }: +{ lib, buildPythonPackage, fetchPypi, requests, mock, httmock, pythonOlder, pytest, responses }: buildPythonPackage rec { pname = "python-gitlab"; diff --git a/pkgs/development/python-modules/python-gnupg/default.nix b/pkgs/development/python-modules/python-gnupg/default.nix index 36ca3a71906..fe686761107 100644 --- a/pkgs/development/python-modules/python-gnupg/default.nix +++ b/pkgs/development/python-modules/python-gnupg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, gnupg }: +{ lib, buildPythonPackage, fetchPypi, gnupg }: buildPythonPackage rec { pname = "python-gnupg"; diff --git a/pkgs/development/python-modules/python-hosts/default.nix b/pkgs/development/python-modules/python-hosts/default.nix index 238b9b9e4af..c8f1179bc66 100644 --- a/pkgs/development/python-modules/python-hosts/default.nix +++ b/pkgs/development/python-modules/python-hosts/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pyyaml, pytest, pytestcov }: +{ lib, buildPythonPackage, fetchPypi, pyyaml, pytest, pytestcov }: buildPythonPackage rec { pname = "python-hosts"; diff --git a/pkgs/development/python-modules/python-hpilo/default.nix b/pkgs/development/python-modules/python-hpilo/default.nix new file mode 100644 index 00000000000..f151e3ffb4c --- /dev/null +++ b/pkgs/development/python-modules/python-hpilo/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, utils +}: + +buildPythonPackage rec { + pname = "python-hpilo"; + version = "4.4.3"; + + src = fetchFromGitHub { + owner = "seveas"; + repo = pname; + rev = version; + sha256 = "1dk5xswydw7nmn9hlna1xca1mzcas9qv2kmid5yx8kvk3hjqci9v"; + }; + + # Most tests requires an actual iLO to run + doCheck = false; + pythonImportsCheck = [ "hpilo" ]; + + meta = with lib; { + description = "Python module to access the HP iLO XML interface"; + homepage = "https://seveas.github.io/python-hpilo/"; + license = with licenses; [ asl20 gpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/python-http-client/default.nix b/pkgs/development/python-modules/python-http-client/default.nix new file mode 100644 index 00000000000..f4b19ba379e --- /dev/null +++ b/pkgs/development/python-modules/python-http-client/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, mock +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "python_http_client"; + version = "3.3.1"; + + src = fetchFromGitHub { + owner = "sendgrid"; + repo = "python-http-client"; + rev = version; + sha256 = "0mbcg0vb9v41v7hbvycrxx5wyrf3ysvfgxkix8hn8c4x5l2lmidc"; + }; + + checkInputs = [ + mock + pytestCheckHook + ]; + + # Failure was fixed by https://github.com/sendgrid/python-http-client/commit/6d62911ab0d0645b499e14bb17c302b48f3c10e4 + disabledTests = [ "test__daterange" ]; + pythonImportsCheck = [ "python_http_client" ]; + + meta = with lib; { + description = "Python HTTP library to call APIs"; + homepage = "https://github.com/sendgrid/python-http-client"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/python-igraph/default.nix b/pkgs/development/python-modules/python-igraph/default.nix index 51d544eb5f8..728d47b1f96 100644 --- a/pkgs/development/python-modules/python-igraph/default.nix +++ b/pkgs/development/python-modules/python-igraph/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage, fetchPypi, lib, isPy3k -, pkgconfig, igraph +, pkg-config, igraph , texttable }: buildPythonPackage rec { @@ -7,7 +7,7 @@ buildPythonPackage rec { version = "0.8.3"; disabled = !isPy3k; # fails to build - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ igraph ]; propagatedBuildInputs = [ texttable ]; diff --git a/pkgs/development/python-modules/python-jose/default.nix b/pkgs/development/python-modules/python-jose/default.nix index 0de220094c0..15c6474cc38 100644 --- a/pkgs/development/python-modules/python-jose/default.nix +++ b/pkgs/development/python-modules/python-jose/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchFromGitHub , future, six, ecdsa, rsa , pycrypto, pytestcov, pytestrunner, cryptography , pytestCheckHook diff --git a/pkgs/development/python-modules/python-json-logger/default.nix b/pkgs/development/python-modules/python-json-logger/default.nix index 96ce13ab265..cb36bf50e18 100644 --- a/pkgs/development/python-modules/python-json-logger/default.nix +++ b/pkgs/development/python-modules/python-json-logger/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/pkgs/development/python-modules/python-jsonrpc-server/default.nix b/pkgs/development/python-modules/python-jsonrpc-server/default.nix index 9879a441b3e..53dab817eb2 100644 --- a/pkgs/development/python-modules/python-jsonrpc-server/default.nix +++ b/pkgs/development/python-modules/python-jsonrpc-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchFromGitHub, pythonOlder +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder , pytestCheckHook, mock, pytestcov, coverage , future, futures, ujson, isPy38 }: @@ -23,7 +23,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ future ujson ] - ++ stdenv.lib.optional (pythonOlder "3.2") futures; + ++ lib.optional (pythonOlder "3.2") futures; meta = with lib; { homepage = "https://github.com/palantir/python-jsonrpc-server"; diff --git a/pkgs/development/python-modules/python-language-server/default.nix b/pkgs/development/python-modules/python-language-server/default.nix index dc3b33a6f53..e221f5b1efc 100644 --- a/pkgs/development/python-modules/python-language-server/default.nix +++ b/pkgs/development/python-modules/python-language-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchFromGitHub, pythonOlder, isPy27 +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, isPy27 , backports_functools_lru_cache, configparser, futures, future, jedi, pluggy, python-jsonrpc-server, flake8 , pytestCheckHook, mock, pytestcov, coverage, setuptools, ujson, flaky , # Allow building a limited set of providers, e.g. ["pycodestyle"]. @@ -30,24 +30,25 @@ buildPythonPackage rec { sha256 = "07x6jr4z20jxn03bxblwc8vk0ywha492cgwfhj7q97nb5cm7kx0q"; }; - propagatedBuildInputs = [ setuptools jedi pluggy future python-jsonrpc-server flake8 ujson ] - ++ stdenv.lib.optional (withProvider "autopep8") autopep8 - ++ stdenv.lib.optional (withProvider "mccabe") mccabe - ++ stdenv.lib.optional (withProvider "pycodestyle") pycodestyle - ++ stdenv.lib.optional (withProvider "pydocstyle") pydocstyle - ++ stdenv.lib.optional (withProvider "pyflakes") pyflakes - ++ stdenv.lib.optional (withProvider "pylint") pylint - ++ stdenv.lib.optional (withProvider "rope") rope - ++ stdenv.lib.optional (withProvider "yapf") yapf - ++ stdenv.lib.optional isPy27 configparser - ++ stdenv.lib.optionals (pythonOlder "3.2") [ backports_functools_lru_cache futures ]; - + propagatedBuildInputs = [ setuptools jedi pluggy future python-jsonrpc-server ujson ] + ++ lib.optional (withProvider "autopep8") autopep8 + ++ lib.optional (withProvider "mccabe") mccabe + ++ lib.optional (withProvider "pycodestyle") pycodestyle + ++ lib.optional (withProvider "pydocstyle") pydocstyle + ++ lib.optional (withProvider "pyflakes") pyflakes + ++ lib.optional (withProvider "pylint") pylint + ++ lib.optional (withProvider "rope") rope + ++ lib.optional (withProvider "yapf") yapf + ++ lib.optional isPy27 configparser + ++ lib.optionals (pythonOlder "3.2") [ backports_functools_lru_cache futures ]; # The tests require all the providers, disable otherwise. doCheck = providers == ["*"]; checkInputs = [ pytestCheckHook mock pytestcov coverage flaky + # Do not propagate flake8 or it will enable pyflakes implicitly + flake8 # rope is technically a dependency, but we don't add it by default since we # already have jedi, which is the preferred option rope @@ -68,7 +69,7 @@ buildPythonPackage rec { "test_snippet_parsing" "test_numpy_hover" "test_symbols" - ] ++ stdenv.lib.optional isPy27 "test_flake8_lint"; + ] ++ lib.optional isPy27 "test_flake8_lint"; meta = with lib; { homepage = "https://github.com/palantir/python-language-server"; diff --git a/pkgs/development/python-modules/python-ldap-test/default.nix b/pkgs/development/python-modules/python-ldap-test/default.nix index 94d8abd1fab..379aaa5ab64 100644 --- a/pkgs/development/python-modules/python-ldap-test/default.nix +++ b/pkgs/development/python-modules/python-ldap-test/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, py4j }: +{ lib, buildPythonPackage, fetchPypi, py4j }: buildPythonPackage rec { pname = "python-ldap-test"; diff --git a/pkgs/development/python-modules/python-levenshtein/default.nix b/pkgs/development/python-modules/python-levenshtein/default.nix index 60767e77e76..b4760cef629 100644 --- a/pkgs/development/python-modules/python-levenshtein/default.nix +++ b/pkgs/development/python-modules/python-levenshtein/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: buildPythonPackage rec { pname = "python-Levenshtein"; - version = "0.12.0"; + version = "0.12.1"; src = fetchPypi { inherit pname version; - sha256 = "1c9ybqcja31nghfcc8xxbbz9h60s9qi12b9hr4jyl69xbvg12fh3"; + sha256 = "0489zzjlfgzpc7vggs7s7db13pld2nlnw7iwgdz1f386i0x2fkjm"; }; # No tests included in archive diff --git a/pkgs/development/python-modules/python-ly/default.nix b/pkgs/development/python-modules/python-ly/default.nix index 6f83a7f61c7..cc38553a817 100644 --- a/pkgs/development/python-modules/python-ly/default.nix +++ b/pkgs/development/python-modules/python-ly/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, lib, stdenv }: +{ buildPythonPackage, fetchPypi, lib }: buildPythonPackage rec { pname = "python-ly"; diff --git a/pkgs/development/python-modules/python-lzf/default.nix b/pkgs/development/python-modules/python-lzf/default.nix index a1fd0113423..61194ff8f9c 100644 --- a/pkgs/development/python-modules/python-lzf/default.nix +++ b/pkgs/development/python-modules/python-lzf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { version = "0.2.4"; diff --git a/pkgs/development/python-modules/python-mapnik/default.nix b/pkgs/development/python-modules/python-mapnik/default.nix index e129bf45219..36c297358e8 100644 --- a/pkgs/development/python-modules/python-mapnik/default.nix +++ b/pkgs/development/python-modules/python-mapnik/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , isPyPy , python @@ -30,7 +30,7 @@ in buildPythonPackage rec { disabled = isPyPy; doCheck = false; # doesn't find needed test data files preBuild = let - pythonVersion = with stdenv.lib.versions; "${major python.version}${minor python.version}"; + pythonVersion = with lib.versions; "${major python.version}${minor python.version}"; in '' export BOOST_PYTHON_LIB="boost_python${pythonVersion}" export BOOST_THREAD_LIB="boost_thread" diff --git a/pkgs/development/python-modules/python-miio/default.nix b/pkgs/development/python-modules/python-miio/default.nix index 8321795c2fb..78c89408ac2 100644 --- a/pkgs/development/python-modules/python-miio/default.nix +++ b/pkgs/development/python-modules/python-miio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , appdirs diff --git a/pkgs/development/python-modules/python-mnist/default.nix b/pkgs/development/python-modules/python-mnist/default.nix index a24f2a383a3..131c0f2f5ac 100644 --- a/pkgs/development/python-modules/python-mnist/default.nix +++ b/pkgs/development/python-modules/python-mnist/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "python-mnist"; diff --git a/pkgs/development/python-modules/python-nomad/default.nix b/pkgs/development/python-modules/python-nomad/default.nix index ba3ecd3883a..4bb12ab7237 100644 --- a/pkgs/development/python-modules/python-nomad/default.nix +++ b/pkgs/development/python-modules/python-nomad/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, requests }: +{ lib, buildPythonPackage, fetchPypi, requests }: buildPythonPackage rec { pname = "python-nomad"; diff --git a/pkgs/development/python-modules/python-otr/default.nix b/pkgs/development/python-modules/python-otr/default.nix index 7a40998eebd..6b657dba78d 100644 --- a/pkgs/development/python-modules/python-otr/default.nix +++ b/pkgs/development/python-modules/python-otr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , isPy3k diff --git a/pkgs/development/python-modules/python-packer/default.nix b/pkgs/development/python-modules/python-packer/default.nix index ba02ec84635..2e2b59eb29d 100644 --- a/pkgs/development/python-modules/python-packer/default.nix +++ b/pkgs/development/python-modules/python-packer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, sh }: +{ lib, buildPythonPackage, fetchPypi, fetchpatch, sh }: buildPythonPackage rec { pname = "python-packer"; diff --git a/pkgs/development/python-modules/python-pipedrive/default.nix b/pkgs/development/python-modules/python-pipedrive/default.nix index 6e0c0ef5788..d776002b212 100644 --- a/pkgs/development/python-modules/python-pipedrive/default.nix +++ b/pkgs/development/python-modules/python-pipedrive/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , python diff --git a/pkgs/development/python-modules/python-prjxray/default.nix b/pkgs/development/python-modules/python-prjxray/default.nix deleted file mode 100644 index 5b92311612b..00000000000 --- a/pkgs/development/python-modules/python-prjxray/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv -, fetchFromGitHub -, pkgs -, buildPythonPackage -, intervaltree -, numpy -, openpyxl -, parse -, progressbar -, pyjson5 -, pyyaml -, simplejson -, symbiflow-fasm -, textx -}: - -buildPythonPackage rec { - pname = "python-prjxray"; - version = pkgs.prjxray-tools.version; - - src = pkgs.prjxray-tools.src; - - propagatedBuildInputs = [ - intervaltree - numpy - openpyxl - parse - progressbar - pyjson5 - pyyaml - simplejson - symbiflow-fasm - textx - ]; - - doCheck = false; - - meta = with stdenv.lib; { - description = "Documenting the Xilinx 7-series bit-stream format"; - homepage = "https://github.com/SymbiFlow/prjxray"; - license = licenses.isc; - maintainers = with maintainers; [ mcaju ]; - }; -} diff --git a/pkgs/development/python-modules/python-ptrace/default.nix b/pkgs/development/python-modules/python-ptrace/default.nix index 2d81581c0cc..1af58300c2f 100644 --- a/pkgs/development/python-modules/python-ptrace/default.nix +++ b/pkgs/development/python-modules/python-ptrace/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/pkgs/development/python-modules/python-rapidjson/default.nix b/pkgs/development/python-modules/python-rapidjson/default.nix index c4cf0dc7425..4ef3b9f8379 100644 --- a/pkgs/development/python-modules/python-rapidjson/default.nix +++ b/pkgs/development/python-modules/python-rapidjson/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonOlder diff --git a/pkgs/development/python-modules/python-redis-lock/default.nix b/pkgs/development/python-modules/python-redis-lock/default.nix index 7cf2affc417..7a53e73b2b8 100644 --- a/pkgs/development/python-modules/python-redis-lock/default.nix +++ b/pkgs/development/python-modules/python-redis-lock/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , redis @@ -24,7 +24,7 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ redis ] - ++ stdenv.lib.optional withDjango django_redis; + ++ lib.optional withDjango django_redis; meta = with lib; { diff --git a/pkgs/development/python-modules/python-simple-hipchat/default.nix b/pkgs/development/python-modules/python-simple-hipchat/default.nix index 8ec7f6887ad..3162a032628 100644 --- a/pkgs/development/python-modules/python-simple-hipchat/default.nix +++ b/pkgs/development/python-modules/python-simple-hipchat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , unzip }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/python-slugify/default.nix b/pkgs/development/python-modules/python-slugify/default.nix index 1860ff6d24d..fd488f4be9d 100644 --- a/pkgs/development/python-modules/python-slugify/default.nix +++ b/pkgs/development/python-modules/python-slugify/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, python, text-unidecode }: +{ lib, fetchPypi, buildPythonPackage, python, text-unidecode }: buildPythonPackage rec { pname = "python-slugify"; diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix index ee9a6030144..e9c2ae146b0 100644 --- a/pkgs/development/python-modules/python-socketio/default.nix +++ b/pkgs/development/python-modules/python-socketio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , bidict , buildPythonPackage , fetchFromGitHub diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix index 52dea24c45f..b681fcf85a9 100644 --- a/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchPypi , buildPythonPackage , certifi diff --git a/pkgs/development/python-modules/python-twitter/default.nix b/pkgs/development/python-modules/python-twitter/default.nix index 4b1e7e2c1eb..c368d97633f 100644 --- a/pkgs/development/python-modules/python-twitter/default.nix +++ b/pkgs/development/python-modules/python-twitter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , fetchpatch diff --git a/pkgs/development/python-modules/python-u2flib-host/default.nix b/pkgs/development/python-modules/python-u2flib-host/default.nix index 7f6f14c9888..94f56698a3e 100644 --- a/pkgs/development/python-modules/python-u2flib-host/default.nix +++ b/pkgs/development/python-modules/python-u2flib-host/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, requests, hidapi }: +{ lib, fetchPypi, buildPythonPackage, requests, hidapi }: buildPythonPackage rec { pname = "python-u2flib-host"; diff --git a/pkgs/development/python-modules/python-uinput/default.nix b/pkgs/development/python-modules/python-uinput/default.nix index 69f741e7437..8d82ffb6b3b 100644 --- a/pkgs/development/python-modules/python-uinput/default.nix +++ b/pkgs/development/python-modules/python-uinput/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , udev }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/python-unshare/default.nix b/pkgs/development/python-modules/python-unshare/default.nix index fa82027777f..f80721078db 100644 --- a/pkgs/development/python-modules/python-unshare/default.nix +++ b/pkgs/development/python-modules/python-unshare/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub }: diff --git a/pkgs/development/python-modules/python-vipaccess/default.nix b/pkgs/development/python-modules/python-vipaccess/default.nix index f96086393f2..8c3a5bf797d 100644 --- a/pkgs/development/python-modules/python-vipaccess/default.nix +++ b/pkgs/development/python-modules/python-vipaccess/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , oath diff --git a/pkgs/development/python-modules/python-wifi/default.nix b/pkgs/development/python-modules/python-wifi/default.nix index 503fbe101b9..7f6eee4906c 100644 --- a/pkgs/development/python-modules/python-wifi/default.nix +++ b/pkgs/development/python-modules/python-wifi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/pkgs/development/python-modules/python-wink/default.nix b/pkgs/development/python-modules/python-wink/default.nix new file mode 100644 index 00000000000..fa0dc670133 --- /dev/null +++ b/pkgs/development/python-modules/python-wink/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +}: + +buildPythonPackage rec { + pname = "python-wink"; + version = "1.10.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "1r6qabnqxyy3llnj10z60d4w9pg2zabysl3l7znpy1adss4ywxl0"; + }; + + propagatedBuildInputs = [ requests ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "pywink" ]; + + meta = with lib; { + description = "Python implementation of the Wink API"; + homepage = "https://github.com/python-wink/python-wink"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/python-xmp-toolkit/default.nix b/pkgs/development/python-modules/python-xmp-toolkit/default.nix index ff4942abef5..3e6d7284568 100644 --- a/pkgs/development/python-modules/python-xmp-toolkit/default.nix +++ b/pkgs/development/python-modules/python-xmp-toolkit/default.nix @@ -26,7 +26,7 @@ buildPythonPackage { buildInputs = [ exempi ]; - checkInputs = stdenv.lib.optionals (pythonOlder "3.3") [ mock ]; + checkInputs = lib.optionals (pythonOlder "3.3") [ mock ]; propagatedBuildInputs = [ pytz ]; diff --git a/pkgs/development/python-modules/python2-pythondialog/default.nix b/pkgs/development/python-modules/python2-pythondialog/default.nix index b9d9b110f60..78378a738db 100644 --- a/pkgs/development/python-modules/python2-pythondialog/default.nix +++ b/pkgs/development/python-modules/python2-pythondialog/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/python3-openid/default.nix b/pkgs/development/python-modules/python3-openid/default.nix index ad8ea88d1d0..769067f53fb 100644 --- a/pkgs/development/python-modules/python3-openid/default.nix +++ b/pkgs/development/python-modules/python3-openid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, isPy3k, buildPythonPackage, fetchPypi, defusedxml }: +{ lib, isPy3k, buildPythonPackage, fetchPypi, defusedxml }: buildPythonPackage rec { pname = "python3-openid"; diff --git a/pkgs/development/python-modules/python_fedora/default.nix b/pkgs/development/python-modules/python_fedora/default.nix index df12d7aeaff..6a5c6a304f1 100644 --- a/pkgs/development/python-modules/python_fedora/default.nix +++ b/pkgs/development/python-modules/python_fedora/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, kitchen, requests, bunch, paver +{ lib, buildPythonPackage, fetchPypi, kitchen, requests, bunch, paver , six, munch, urllib3, beautifulsoup4, openidc-client, lockfile }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/python_keyczar/default.nix b/pkgs/development/python-modules/python_keyczar/default.nix index 5fff75ada91..66cf28a15dd 100644 --- a/pkgs/development/python-modules/python_keyczar/default.nix +++ b/pkgs/development/python-modules/python_keyczar/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pyasn1 diff --git a/pkgs/development/python-modules/python_mimeparse/default.nix b/pkgs/development/python-modules/python_mimeparse/default.nix index c3f85affe81..0f713bd2139 100644 --- a/pkgs/development/python-modules/python_mimeparse/default.nix +++ b/pkgs/development/python-modules/python_mimeparse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/python_openzwave/default.nix b/pkgs/development/python-modules/python_openzwave/default.nix index 7c7151ed928..8f649d4d4d2 100644 --- a/pkgs/development/python-modules/python_openzwave/default.nix +++ b/pkgs/development/python-modules/python_openzwave/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k -, pkgconfig +{ lib, buildPythonPackage, fetchPypi, isPy3k +, pkg-config , systemd, libyaml, openzwave, cython, pyserial , six, pydispatcher, urwid }: @@ -15,7 +15,7 @@ buildPythonPackage rec { extension = "zip"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ systemd libyaml openzwave cython ]; propagatedBuildInputs = [ six urwid pydispatcher pyserial ]; diff --git a/pkgs/development/python-modules/python_statsd/default.nix b/pkgs/development/python-modules/python_statsd/default.nix index ae293c44c0f..2aabaec2e14 100644 --- a/pkgs/development/python-modules/python_statsd/default.nix +++ b/pkgs/development/python-modules/python_statsd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/pythondialog/default.nix b/pkgs/development/python-modules/pythondialog/default.nix index c385f11b2f0..6f8b6a2bbec 100644 --- a/pkgs/development/python-modules/pythondialog/default.nix +++ b/pkgs/development/python-modules/pythondialog/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/pythonirclib/default.nix b/pkgs/development/python-modules/pythonirclib/default.nix index 178e1855a06..54c84fe6ef5 100644 --- a/pkgs/development/python-modules/pythonirclib/default.nix +++ b/pkgs/development/python-modules/pythonirclib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , paver diff --git a/pkgs/development/python-modules/pythonix/default.nix b/pkgs/development/python-modules/pythonix/default.nix index 80535b28bf2..9261ab2a8f2 100644 --- a/pkgs/development/python-modules/pythonix/default.nix +++ b/pkgs/development/python-modules/pythonix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, ninja, boost, meson, pkg-config, nix, isPy3k, python }: +{ lib, buildPythonPackage, fetchFromGitHub, ninja, boost, meson, pkg-config, nix, isPy3k, python }: buildPythonPackage rec { pname = "pythonix"; diff --git a/pkgs/development/python-modules/pythonnet/default.nix b/pkgs/development/python-modules/pythonnet/default.nix index 82ddb8c810b..d0054f7076a 100644 --- a/pkgs/development/python-modules/pythonnet/default.nix +++ b/pkgs/development/python-modules/pythonnet/default.nix @@ -6,7 +6,7 @@ , pytest , pycparser , psutil -, pkgconfig +, pkg-config , dotnetbuildhelpers , clang , glib @@ -53,7 +53,7 @@ buildPythonPackage rec { pytest pycparser - pkgconfig + pkg-config dotnetbuildhelpers clang diff --git a/pkgs/development/python-modules/pythonocc-core/default.nix b/pkgs/development/python-modules/pythonocc-core/default.nix index cbcf4ab9d02..d1d06d22c64 100644 --- a/pkgs/development/python-modules/pythonocc-core/default.nix +++ b/pkgs/development/python-modules/pythonocc-core/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ python opencascade smesh freetype libGL libGLU libX11 - ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ]; + ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; cmakeFlags = [ "-Wno-dev" diff --git a/pkgs/development/python-modules/pytile/default.nix b/pkgs/development/python-modules/pytile/default.nix index 52b3d828ded..771ae4d1328 100644 --- a/pkgs/development/python-modules/pytile/default.nix +++ b/pkgs/development/python-modules/pytile/default.nix @@ -4,28 +4,29 @@ , aresponses , buildPythonPackage , fetchFromGitHub -, poetry +, poetry-core , pylint , pytest-aiohttp , pytest-asyncio , pytestCheckHook , pythonAtLeast }: + buildPythonPackage rec { pname = "pytile"; - version = "5.1.0"; + version = "5.1.1"; disabled = pythonAtLeast "3.9"; src = fetchFromGitHub { owner = "bachya"; repo = pname; rev = version; - sha256 = "0hdyb8ca4ihqf7yfkr3hbpkwz7g182ycra151y5dxn0319fillc3"; + sha256 = "sha256-bVoFTaK/Alemtc5I+Z/M9y/FWczvJ+P86R0DMD89/BM="; }; format = "pyproject"; - nativeBuildInputs = [ poetry ]; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ aiohttp diff --git a/pkgs/development/python-modules/pytimeparse/default.nix b/pkgs/development/python-modules/pytimeparse/default.nix index 1ced6437530..3bf0ad078c5 100644 --- a/pkgs/development/python-modules/pytimeparse/default.nix +++ b/pkgs/development/python-modules/pytimeparse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, nose }: +{ lib, fetchPypi, buildPythonPackage, nose }: buildPythonPackage rec { pname = "pytimeparse"; diff --git a/pkgs/development/python-modules/pytmx/default.nix b/pkgs/development/python-modules/pytmx/default.nix index aa6eecfdeb5..17c18a96c73 100644 --- a/pkgs/development/python-modules/pytmx/default.nix +++ b/pkgs/development/python-modules/pytmx/default.nix @@ -1,21 +1,28 @@ -{ lib, fetchFromGitHub, isPy3k, buildPythonPackage, pygame, pyglet, pysdl2, six }: +{ lib, fetchFromGitHub +, python, buildPythonPackage, isPy27 +, pygame, pyglet, pysdl2, six +}: buildPythonPackage rec { pname = "pytmx"; - version = "3.22.0"; + version = "3.24.0"; + + disabled = isPy27; src = fetchFromGitHub { # The release was not git tagged. owner = "bitcraft"; repo = "PyTMX"; - rev = "187fd429dadcdc5828e78e6748a983aa1434e4d2"; - sha256 = "0480pr61v54bwdyzb983sk0fqkyfbcgrdn8k11yf1yck4zb119gc"; + rev = "eb96efea30d57b731654b2a167d86b8b553b147d"; + sha256 = "1g1j4w75zw76p5f8m5v0hdigdlva2flf0ngyk8nvqcwzcl5vq5wc"; }; propagatedBuildInputs = [ pygame pyglet pysdl2 six ]; checkPhase = '' - python -m unittest tests.pytmx.test_pytmx + # Change into the test directory due to a relative resource path. + cd tests/pytmx + ${python.interpreter} -m unittest test_pytmx ''; meta = with lib; { diff --git a/pkgs/development/python-modules/pytoml/default.nix b/pkgs/development/python-modules/pytoml/default.nix index 64e6ed4c669..b13dfd07dad 100644 --- a/pkgs/development/python-modules/pytoml/default.nix +++ b/pkgs/development/python-modules/pytoml/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , python diff --git a/pkgs/development/python-modules/pytorch/bin.nix b/pkgs/development/python-modules/pytorch/bin.nix index a25f2013adf..1ffda5c86b0 100644 --- a/pkgs/development/python-modules/pytorch/bin.nix +++ b/pkgs/development/python-modules/pytorch/bin.nix @@ -52,7 +52,7 @@ in buildPythonPackage { ''; postFixup = let - rpath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib nvidia_x11 ]; + rpath = lib.makeLibraryPath [ stdenv.cc.cc.lib nvidia_x11 ]; in '' find $out/${python.sitePackages}/torch/lib -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do echo "setting rpath for $lib..." diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix index f072972937a..db1914f4ee7 100644 --- a/pkgs/development/python-modules/pytorch/default.nix +++ b/pkgs/development/python-modules/pytorch/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, buildPythonPackage, python, cudaSupport ? false, cudatoolkit ? null, cudnn ? null, nccl ? null, magma ? null, mklDnnSupport ? true, useSystemNccl ? true, - openMPISupport ? false, openmpi ? null, + MPISupport ? false, mpi, buildDocs ? false, cudaArchList ? null, @@ -29,8 +29,6 @@ isPy3k, pythonOlder }: -assert !openMPISupport || openmpi != null; - # assert that everything needed for cuda is present and that the correct cuda versions are used assert !cudaSupport || cudatoolkit != null; assert cudnn == null || cudatoolkit != null; @@ -38,7 +36,7 @@ assert !cudaSupport || (let majorIs = lib.versions.major cudatoolkit.version; in majorIs == "9" || majorIs == "10" || majorIs == "11"); # confirm that cudatoolkits are sync'd across dependencies -assert !(openMPISupport && cudaSupport) || openmpi.cudatoolkit == cudatoolkit; +assert !(MPISupport && cudaSupport) || mpi.cudatoolkit == cudatoolkit; assert !cudaSupport || magma.cudatoolkit == cudatoolkit; let @@ -224,7 +222,7 @@ in buildPythonPackage rec { typing-extensions # the following are required for tensorboard support pillow six future tensorflow-tensorboard protobuf - ] ++ lib.optionals openMPISupport [ openmpi ] + ] ++ lib.optionals MPISupport [ mpi ] ++ lib.optionals (pythonOlder "3.7") [ dataclasses ]; checkInputs = [ hypothesis ninja psutil ]; @@ -267,7 +265,7 @@ in buildPythonPackage rec { cp -r $out/${python.sitePackages}/torch/lib $lib/lib ''; - postFixup = stdenv.lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.isDarwin '' for f in $(ls $lib/lib/*.dylib); do install_name_tool -id $lib/lib/$(basename $f) $f || true done diff --git a/pkgs/development/python-modules/pytrends/default.nix b/pkgs/development/python-modules/pytrends/default.nix index 83980c3d00b..3ce1e70e823 100644 --- a/pkgs/development/python-modules/pytrends/default.nix +++ b/pkgs/development/python-modules/pytrends/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/pkgs/development/python-modules/pytricia/default.nix b/pkgs/development/python-modules/pytricia/default.nix index 8e168bf8181..01c4ea014ad 100644 --- a/pkgs/development/python-modules/pytricia/default.nix +++ b/pkgs/development/python-modules/pytricia/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub }: diff --git a/pkgs/development/python-modules/pytun/default.nix b/pkgs/development/python-modules/pytun/default.nix index 2b49b169c6d..3437c0fbe7a 100644 --- a/pkgs/development/python-modules/pytun/default.nix +++ b/pkgs/development/python-modules/pytun/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub }: diff --git a/pkgs/development/python-modules/pytz/default.nix b/pkgs/development/python-modules/pytz/default.nix index 0351840b3e0..dab8f479c04 100644 --- a/pkgs/development/python-modules/pytz/default.nix +++ b/pkgs/development/python-modules/pytz/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytz"; - version = "2020.4"; + version = "2020.5"; src = fetchPypi { inherit pname version; - sha256 = "3e6b7dd2d1e0a59084bcee14a17af60c5c562cdc16d828e8eba2e683d3a7e268"; + sha256 = "180befebb1927b16f6b57101720075a984c019ac16b1b7575673bea42c6c3da5"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/pytzdata/default.nix b/pkgs/development/python-modules/pytzdata/default.nix index 739325d3333..342bb088170 100644 --- a/pkgs/development/python-modules/pytzdata/default.nix +++ b/pkgs/development/python-modules/pytzdata/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage }: +{ lib, fetchPypi, buildPythonPackage }: buildPythonPackage rec { pname = "pytzdata"; diff --git a/pkgs/development/python-modules/pyunifi/default.nix b/pkgs/development/python-modules/pyunifi/default.nix index 1eec6f3ea84..dfbae696b8e 100644 --- a/pkgs/development/python-modules/pyunifi/default.nix +++ b/pkgs/development/python-modules/pyunifi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , requests }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pyupdate/default.nix b/pkgs/development/python-modules/pyupdate/default.nix index f33aba8d625..cd0460dc7e1 100644 --- a/pkgs/development/python-modules/pyupdate/default.nix +++ b/pkgs/development/python-modules/pyupdate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k +{ lib, buildPythonPackage, fetchPypi, isPy3k , requests }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pyutil/default.nix b/pkgs/development/python-modules/pyutil/default.nix index effb9f7b7e6..dd1c7b2da5b 100644 --- a/pkgs/development/python-modules/pyutil/default.nix +++ b/pkgs/development/python-modules/pyutil/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , setuptoolsDarcs @@ -24,7 +24,7 @@ buildPythonPackage rec { # package, apparently some kind of plugin. doCheck = false; - prePatch = stdenv.lib.optionalString isPyPy '' + prePatch = lib.optionalString isPyPy '' grep -rl 'utf-8-with-signature-unix' ./ | xargs sed -i -e "s|utf-8-with-signature-unix|utf-8|g" ''; diff --git a/pkgs/development/python-modules/pyuv/default.nix b/pkgs/development/python-modules/pyuv/default.nix index 95477196d8b..0be0d61ed0d 100644 --- a/pkgs/development/python-modules/pyuv/default.nix +++ b/pkgs/development/python-modules/pyuv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , isPyPy , pkgs diff --git a/pkgs/development/python-modules/pyvera/default.nix b/pkgs/development/python-modules/pyvera/default.nix new file mode 100644 index 00000000000..4415ca7c376 --- /dev/null +++ b/pkgs/development/python-modules/pyvera/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, poetry-core +, pytest-cov +, pytest-asyncio +, pytest-timeout +, responses +, pytestCheckHook +, requests +}: + +buildPythonPackage rec { + pname = "pyvera"; + version = "0.3.11"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "pavoni"; + repo = pname; + rev = version; + sha256 = "0yi2cjd3jag95xa0k24f7d7agi26ywb3219a0j0k8l2nsx2sdi87"; + }; + + patches = [ + (fetchpatch { + # build-system section is missing https://github.com/pavoni/pyvera/pull/142 + url = "https://github.com/pavoni/pyvera/pull/142/commits/e90995a8d55107118d324e8cf189ddf1d9e3aa6c.patch"; + sha256 = "1psq3fiwg20kcwyybzh5g17dzn5fh29lhm238npyg846innbzgs7"; + }) + ]; + + nativeBuildInputs = [ poetry-core ]; + + propagatedBuildInputs = [ requests ]; + + checkInputs = [ + pytest-asyncio + pytest-timeout + pytest-cov + pytestCheckHook + responses + ]; + + pythonImportsCheck = [ "pyvera" ]; + + meta = with lib; { + description = "Python library to control devices via the Vera hub"; + homepage = "https://github.com/pavoni/pyvera"; + license = with licenses; [ gpl2Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyvlx/default.nix b/pkgs/development/python-modules/pyvlx/default.nix new file mode 100644 index 00000000000..1a78aefa6da --- /dev/null +++ b/pkgs/development/python-modules/pyvlx/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pyyaml +}: + +buildPythonPackage rec { + pname = "pyvlx"; + version = "0.2.19"; + + src = fetchFromGitHub { + owner = "Julius2342"; + repo = pname; + rev = version; + sha256 = "031gp3sjagvmgdhfpdqlawva425ja1n3bmxk6jyn4zx54szj9zwf"; + }; + + propagatedBuildInputs = [ pyyaml ]; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "pyvlx" ]; + + meta = with lib; { + description = "Python client to work with Velux units"; + longDescription = '' + PyVLX uses the Velux KLF 200 interface to control io-Homecontrol + devices, e.g. Velux Windows. + ''; + homepage = "https://github.com/Julius2342/pyvlx"; + license = with licenses; [ lgpl2Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyvoro/default.nix b/pkgs/development/python-modules/pyvoro/default.nix index 7013cc7809d..2fd5a96fa93 100644 --- a/pkgs/development/python-modules/pyvoro/default.nix +++ b/pkgs/development/python-modules/pyvoro/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/pywatchman/default.nix b/pkgs/development/python-modules/pywatchman/default.nix index 5e3c4d6cc5a..a2cd2a6eed5 100644 --- a/pkgs/development/python-modules/pywatchman/default.nix +++ b/pkgs/development/python-modules/pywatchman/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, watchman }: +{ lib, buildPythonPackage, fetchPypi, watchman }: buildPythonPackage rec { pname = "pywatchman"; diff --git a/pkgs/development/python-modules/pywebdav/default.nix b/pkgs/development/python-modules/pywebdav/default.nix index 5ed3e28b5b1..2f6bb8553a4 100644 --- a/pkgs/development/python-modules/pywebdav/default.nix +++ b/pkgs/development/python-modules/pywebdav/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, isPy3k }: +{ lib, fetchPypi, buildPythonPackage, isPy3k }: buildPythonPackage rec { pname = "PyWebDAV"; diff --git a/pkgs/development/python-modules/pyworld/default.nix b/pkgs/development/python-modules/pyworld/default.nix new file mode 100644 index 00000000000..73cd1fcea22 --- /dev/null +++ b/pkgs/development/python-modules/pyworld/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, numpy +, cython +}: + +buildPythonPackage rec { + pname = "pyworld"; + version = "0.2.12"; + + src = fetchPypi { + inherit pname version; + sha256 = "896c910696975855578d855f490f94d7a57119e0a75f7f15e11fdf58ba891627"; + }; + + nativeBuildInputs = [ + cython + ]; + + propagatedBuildInputs = [ + numpy + ]; + + pythonImportsCheck = [ "pyworld" ]; + + meta = with lib; { + description = "PyWorld is a Python wrapper for WORLD vocoder"; + homepage = https://github.com/JeremyCCHsu/Python-Wrapper-for-World-Vocoder; + license = licenses.mit; + maintainers = [ maintainers.mic92 ]; + }; +} diff --git a/pkgs/development/python-modules/pyx/default.nix b/pkgs/development/python-modules/pyx/default.nix index b19e5f97e14..d46bd718a3a 100644 --- a/pkgs/development/python-modules/pyx/default.nix +++ b/pkgs/development/python-modules/pyx/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/pyxeoma/default.nix b/pkgs/development/python-modules/pyxeoma/default.nix new file mode 100644 index 00000000000..9b8b6eeac8f --- /dev/null +++ b/pkgs/development/python-modules/pyxeoma/default.nix @@ -0,0 +1,28 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "pyxeoma"; + version = "1.4.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0c9q6xdh2ciisv0crlz069haz01gfkhd5kasyr14jng4vjpzinc7"; + }; + + propagatedBuildInputs = [ aiohttp ]; + + # Project doesn't have any tests + doCheck = false; + pythonImportsCheck = [ "pyxeoma" ]; + + meta = with lib; { + description = "Python wrapper for Xeoma web server API"; + homepage = "https://github.com/jeradM/pyxeoma"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyyaml/default.nix b/pkgs/development/python-modules/pyyaml/default.nix index 95ceeab3a04..93cfad78d50 100644 --- a/pkgs/development/python-modules/pyyaml/default.nix +++ b/pkgs/development/python-modules/pyyaml/default.nix @@ -2,18 +2,13 @@ buildPythonPackage rec { pname = "PyYAML"; - version = "5.3.1"; + version = "5.4.1"; src = fetchPypi { inherit pname version; - sha256 = "0pb4zvkfxfijkpgd1b86xjsqql97ssf1knbd1v53wkg1qm9cgsmq"; + sha256 = "607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e"; }; - # force regeneration using Cython - postPatch = '' - rm ext/_yaml.c - ''; - nativeBuildInputs = [ cython buildPackages.stdenv.cc ]; buildInputs = [ libyaml ]; diff --git a/pkgs/development/python-modules/pyzufall/default.nix b/pkgs/development/python-modules/pyzufall/default.nix index 03fce00629d..e0434e8e4dd 100644 --- a/pkgs/development/python-modules/pyzufall/default.nix +++ b/pkgs/development/python-modules/pyzufall/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, python, buildPythonPackage, nose, future, coverage }: +{ lib, fetchPypi, python, buildPythonPackage, nose, future, coverage }: buildPythonPackage rec { pname = "PyZufall"; diff --git a/pkgs/development/python-modules/qimage2ndarray/default.nix b/pkgs/development/python-modules/qimage2ndarray/default.nix index a7c0fa3ff4a..3949361a0a8 100644 --- a/pkgs/development/python-modules/qimage2ndarray/default.nix +++ b/pkgs/development/python-modules/qimage2ndarray/default.nix @@ -1,7 +1,6 @@ { lib, pkgs, buildPythonPackage, fetchPypi, isPy3k , numpy , pyqt5 -, nose }: buildPythonPackage rec { @@ -14,15 +13,14 @@ buildPythonPackage rec { sha256 = "b02bd2dc7de774f954544312ec1020cf2d7e03fdd23ec9eb79901da55ccb3365"; }; - checkInputs = [ - nose - ]; - propagatedBuildInputs = [ numpy pyqt5 ]; + # no tests executed + doCheck = false; + meta = { homepage = "https://github.com/hmeine/qimage2ndarray"; description = "A small python extension for quickly converting between QImages and numpy.ndarrays (in both directions)"; diff --git a/pkgs/development/python-modules/qpid-python/default.nix b/pkgs/development/python-modules/qpid-python/default.nix index ef540538792..24c90d072a2 100644 --- a/pkgs/development/python-modules/qpid-python/default.nix +++ b/pkgs/development/python-modules/qpid-python/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , isPy3k diff --git a/pkgs/development/python-modules/qrcode/default.nix b/pkgs/development/python-modules/qrcode/default.nix index 113d53ff29b..29f2ab49606 100644 --- a/pkgs/development/python-modules/qrcode/default.nix +++ b/pkgs/development/python-modules/qrcode/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/pkgs/development/python-modules/qscintilla-qt5/default.nix b/pkgs/development/python-modules/qscintilla-qt5/default.nix index 2ee9c82f08d..dcbe213966f 100644 --- a/pkgs/development/python-modules/qscintilla-qt5/default.nix +++ b/pkgs/development/python-modules/qscintilla-qt5/default.nix @@ -14,6 +14,8 @@ buildPythonPackage { buildInputs = [ qscintilla ]; propagatedBuildInputs = [ pyqt5 ]; + dontWrapQtApps = true; + postPatch = '' substituteInPlace Python/configure.py \ --replace \ diff --git a/pkgs/development/python-modules/qscintilla/default.nix b/pkgs/development/python-modules/qscintilla/default.nix index 82c3773f303..24719de779e 100644 --- a/pkgs/development/python-modules/qscintilla/default.nix +++ b/pkgs/development/python-modules/qscintilla/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , disabledIf , isPy3k diff --git a/pkgs/development/python-modules/qserve/default.nix b/pkgs/development/python-modules/qserve/default.nix index ff606d13236..0548b6fdf17 100644 --- a/pkgs/development/python-modules/qserve/default.nix +++ b/pkgs/development/python-modules/qserve/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/qtawesome/default.nix b/pkgs/development/python-modules/qtawesome/default.nix index 11b4885e4c8..4945bead42d 100644 --- a/pkgs/development/python-modules/qtawesome/default.nix +++ b/pkgs/development/python-modules/qtawesome/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, qtpy, six, pyqt5, pytest }: +{ lib, buildPythonPackage, fetchPypi, qtpy, six, pyqt5, pytest }: buildPythonPackage rec { pname = "QtAwesome"; diff --git a/pkgs/development/python-modules/qtpy/default.nix b/pkgs/development/python-modules/qtpy/default.nix index 76db7090a04..17e1d9dbe83 100644 --- a/pkgs/development/python-modules/qtpy/default.nix +++ b/pkgs/development/python-modules/qtpy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pyside, pytest }: +{ lib, buildPythonPackage, fetchPypi, pyside, pytest }: buildPythonPackage rec { pname = "QtPy"; diff --git a/pkgs/development/python-modules/querystring-parser/default.nix b/pkgs/development/python-modules/querystring-parser/default.nix index 25b3c113cec..6288d196bb4 100644 --- a/pkgs/development/python-modules/querystring-parser/default.nix +++ b/pkgs/development/python-modules/querystring-parser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, python, isPy27 +{ lib, buildPythonPackage, fetchPypi, python, isPy27 , six }: diff --git a/pkgs/development/python-modules/queuelib/default.nix b/pkgs/development/python-modules/queuelib/default.nix index 7471ea18065..3814663c044 100644 --- a/pkgs/development/python-modules/queuelib/default.nix +++ b/pkgs/development/python-modules/queuelib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/pkgs/development/python-modules/rabbitpy/default.nix b/pkgs/development/python-modules/rabbitpy/default.nix index 79975ada501..0de5d6de3bb 100644 --- a/pkgs/development/python-modules/rabbitpy/default.nix +++ b/pkgs/development/python-modules/rabbitpy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , mock diff --git a/pkgs/development/python-modules/rachiopy/default.nix b/pkgs/development/python-modules/rachiopy/default.nix new file mode 100644 index 00000000000..3fcf773e83d --- /dev/null +++ b/pkgs/development/python-modules/rachiopy/default.nix @@ -0,0 +1,35 @@ +{ lib +, requests +, buildPythonPackage +, fetchFromGitHub +, jsonschema +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "rachiopy"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "rfverbruggen"; + repo = pname; + rev = version; + sha256 = "1d5v9qc7ymzns3ivc5fzwxnxz9sjkhklh57cw05va95mpk5kdskc"; + }; + + propagatedBuildInputs = [ requests ]; + + checkInputs = [ + jsonschema + pytestCheckHook + ]; + + pythonImportsCheck = [ "rachiopy" ]; + + meta = with lib; { + description = "Python client for Rachio Irrigation controller"; + homepage = "https://github.com/rfverbruggen/rachiopy"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/radicale_infcloud/default.nix b/pkgs/development/python-modules/radicale_infcloud/default.nix index 5c561b6e654..5d3540e0195 100644 --- a/pkgs/development/python-modules/radicale_infcloud/default.nix +++ b/pkgs/development/python-modules/radicale_infcloud/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonPackage }: +{ lib, fetchFromGitHub, buildPythonPackage }: buildPythonPackage { pname = "radicale_infcloud"; diff --git a/pkgs/development/python-modules/rainbowstream/default.nix b/pkgs/development/python-modules/rainbowstream/default.nix index c5ec1d3ab4e..e484c07f31c 100644 --- a/pkgs/development/python-modules/rainbowstream/default.nix +++ b/pkgs/development/python-modules/rainbowstream/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , python diff --git a/pkgs/development/python-modules/ramlfications/default.nix b/pkgs/development/python-modules/ramlfications/default.nix index 2d3e2bdc0e0..c3ae88d1775 100644 --- a/pkgs/development/python-modules/ramlfications/default.nix +++ b/pkgs/development/python-modules/ramlfications/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , mock, pytest, pytest-mock, pytest-server-fixtures, pytest-localserver , termcolor, click, markdown2, six, jsonref, pyyaml, xmltodict, attrs }: diff --git a/pkgs/development/python-modules/random2/default.nix b/pkgs/development/python-modules/random2/default.nix index 9ed7701a3f4..6845a5707da 100644 --- a/pkgs/development/python-modules/random2/default.nix +++ b/pkgs/development/python-modules/random2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPyPy diff --git a/pkgs/development/python-modules/rarfile/default.nix b/pkgs/development/python-modules/rarfile/default.nix index 6b875528d1d..545782d853e 100644 --- a/pkgs/development/python-modules/rarfile/default.nix +++ b/pkgs/development/python-modules/rarfile/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pytestCheckHook, nose, libarchive, glibcLocales, isPy27 +{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook, nose, libarchive, glibcLocales, isPy27 # unrar is non-free software , useUnrar ? false, unrar }: @@ -28,8 +28,7 @@ buildPythonPackage rec { else ''--replace 'ALT_TOOL = "bsdtar"' "ALT_TOOL = \"${libarchive}/bin/bsdtar\"" '') - + '' - ''; + + ""; # the tests only work with the standard unrar package doCheck = useUnrar; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/ratelimiter/default.nix b/pkgs/development/python-modules/ratelimiter/default.nix index 4d3ff6d486b..fc51e1488d6 100644 --- a/pkgs/development/python-modules/ratelimiter/default.nix +++ b/pkgs/development/python-modules/ratelimiter/default.nix @@ -1,5 +1,5 @@ { - lib, stdenv + lib , buildPythonPackage , fetchPypi , pytest diff --git a/pkgs/development/python-modules/rawkit/default.nix b/pkgs/development/python-modules/rawkit/default.nix index 974f7ac4d1c..0a96123db04 100644 --- a/pkgs/development/python-modules/rawkit/default.nix +++ b/pkgs/development/python-modules/rawkit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, fetchpatch +{ lib, fetchPypi, buildPythonPackage, fetchpatch , libraw , pytest, mock }: diff --git a/pkgs/development/python-modules/rbtools/default.nix b/pkgs/development/python-modules/rbtools/default.nix index f1c9685d5cc..1c99ee0fc8d 100644 --- a/pkgs/development/python-modules/rbtools/default.nix +++ b/pkgs/development/python-modules/rbtools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , isPy3k @@ -16,7 +16,7 @@ buildPythonPackage rec { disabled = !isPy3k; src = fetchurl { - url = "https://downloads.reviewboard.org/releases/RBTools/${stdenv.lib.versions.majorMinor version}/RBTools-${version}.tar.gz"; + url = "https://downloads.reviewboard.org/releases/RBTools/${lib.versions.majorMinor version}/RBTools-${version}.tar.gz"; sha256 = "577c2f8bbf88f77bda84ee95af0310b59111c156f48a5aab56ca481e2f77eaf4"; }; diff --git a/pkgs/development/python-modules/rcssmin/default.nix b/pkgs/development/python-modules/rcssmin/default.nix index 507102222fe..3de6f203803 100644 --- a/pkgs/development/python-modules/rcssmin/default.nix +++ b/pkgs/development/python-modules/rcssmin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "rcssmin"; version = "1.0.6"; diff --git a/pkgs/development/python-modules/readchar/default.nix b/pkgs/development/python-modules/readchar/default.nix index 211f5d63a7d..ea13c7083fe 100644 --- a/pkgs/development/python-modules/readchar/default.nix +++ b/pkgs/development/python-modules/readchar/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, flake8, pytest, pytestcov, pexpect }: +{ lib, buildPythonPackage, fetchFromGitHub, flake8, pytest, pytestcov, pexpect }: buildPythonPackage rec { pname = "readchar"; diff --git a/pkgs/development/python-modules/readme/default.nix b/pkgs/development/python-modules/readme/default.nix index 044c487eb03..95b45185a08 100644 --- a/pkgs/development/python-modules/readme/default.nix +++ b/pkgs/development/python-modules/readme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/pkgs/development/python-modules/rebulk/default.nix b/pkgs/development/python-modules/rebulk/default.nix index 750efe357c2..8a4754e7a61 100644 --- a/pkgs/development/python-modules/rebulk/default.nix +++ b/pkgs/development/python-modules/rebulk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, pytestrunner, six, regex}: +{ lib, buildPythonPackage, fetchPypi, pytest, pytestrunner, six, regex}: buildPythonPackage rec { pname = "rebulk"; diff --git a/pkgs/development/python-modules/recaptcha_client/default.nix b/pkgs/development/python-modules/recaptcha_client/default.nix index 08e7ff47aa1..dce24cfa7a8 100644 --- a/pkgs/development/python-modules/recaptcha_client/default.nix +++ b/pkgs/development/python-modules/recaptcha_client/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonAtLeast diff --git a/pkgs/development/python-modules/reedsolo/default.nix b/pkgs/development/python-modules/reedsolo/default.nix index c87a89b82a4..d9dd54e29f4 100644 --- a/pkgs/development/python-modules/reedsolo/default.nix +++ b/pkgs/development/python-modules/reedsolo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, cython, nose }: +{ lib, buildPythonPackage, fetchFromGitHub, cython, nose }: buildPythonPackage rec { pname = "reedsolo"; diff --git a/pkgs/development/python-modules/regenmaschine/default.nix b/pkgs/development/python-modules/regenmaschine/default.nix new file mode 100644 index 00000000000..3380ef99f18 --- /dev/null +++ b/pkgs/development/python-modules/regenmaschine/default.nix @@ -0,0 +1,51 @@ +{ lib +, aiohttp +, aresponses +, asynctest +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytest-aiohttp +, pytest-asyncio +, pytest-cov +, pytest-mock +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "regenmaschine"; + version = "3.1.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "bachya"; + repo = pname; + rev = version; + sha256 = "0m6i7vspp8ssdk2k32kznql1j8gkp300kzb7pk67hzvpijdy3mca"; + }; + + nativeBuildInputs = [ poetry-core ]; + + propagatedBuildInputs = [ aiohttp ]; + + checkInputs = [ + aresponses + asynctest + pytest-aiohttp + pytest-asyncio + pytest-cov + pytest-mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "regenmaschine" ]; + + __darwinAllowLocalNetworking = true; + + meta = with lib; { + description = "Python library for interacting with RainMachine smart sprinkler controllers"; + homepage = "https://github.com/bachya/regenmaschine"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/reikna/default.nix b/pkgs/development/python-modules/reikna/default.nix index ebe3dc772d7..896bc8e02f0 100644 --- a/pkgs/development/python-modules/reikna/default.nix +++ b/pkgs/development/python-modules/reikna/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib , fetchPypi , buildPythonPackage , sphinx @@ -23,8 +23,8 @@ buildPythonPackage rec { checkInputs = [ sphinx pytestcov pytest ]; propagatedBuildInputs = [ Mako numpy funcsigs ] - ++ stdenv.lib.optional withCuda pycuda - ++ stdenv.lib.optional withOpenCL pyopencl; + ++ lib.optional withCuda pycuda + ++ lib.optional withOpenCL pyopencl; checkPhase = '' py.test @@ -33,11 +33,11 @@ buildPythonPackage rec { # Requires device doCheck = false; - meta = { + meta = with lib; { description = "GPGPU algorithms for PyCUDA and PyOpenCL"; homepage = "https://github.com/fjarri/reikna"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.fridh ]; + license = licenses.mit; + maintainers = [ maintainers.fridh ]; }; diff --git a/pkgs/development/python-modules/remotecv/default.nix b/pkgs/development/python-modules/remotecv/default.nix index dc40763f6fe..078e431f3ba 100644 --- a/pkgs/development/python-modules/remotecv/default.nix +++ b/pkgs/development/python-modules/remotecv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pillow, pyres, nose +{ lib, buildPythonPackage, fetchFromGitHub, pillow, pyres, nose , preggy, numpy, yanc, nose-focus, mock, opencv }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/rencode/default.nix b/pkgs/development/python-modules/rencode/default.nix index a8f0f81ee71..a742c422ee9 100644 --- a/pkgs/development/python-modules/rencode/default.nix +++ b/pkgs/development/python-modules/rencode/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchgit , cython diff --git a/pkgs/development/python-modules/repeated_test/default.nix b/pkgs/development/python-modules/repeated_test/default.nix index a9355cda41c..2c51238e19b 100644 --- a/pkgs/development/python-modules/repeated_test/default.nix +++ b/pkgs/development/python-modules/repeated_test/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , unittest2 diff --git a/pkgs/development/python-modules/repocheck/default.nix b/pkgs/development/python-modules/repocheck/default.nix index ad8c3aef2ea..9d6c2c41921 100644 --- a/pkgs/development/python-modules/repocheck/default.nix +++ b/pkgs/development/python-modules/repocheck/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub }: diff --git a/pkgs/development/python-modules/repoze_lru/default.nix b/pkgs/development/python-modules/repoze_lru/default.nix index 7b8f0ecd809..e986f47e6e0 100644 --- a/pkgs/development/python-modules/repoze_lru/default.nix +++ b/pkgs/development/python-modules/repoze_lru/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix b/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix index 53761203113..5d5e27a2e11 100644 --- a/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix +++ b/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , zope_interface diff --git a/pkgs/development/python-modules/repoze_who/default.nix b/pkgs/development/python-modules/repoze_who/default.nix index f64158f26a1..1b33bb6954b 100644 --- a/pkgs/development/python-modules/repoze_who/default.nix +++ b/pkgs/development/python-modules/repoze_who/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , zope_interface diff --git a/pkgs/development/python-modules/requests-cache/default.nix b/pkgs/development/python-modules/requests-cache/default.nix index 2b3d57831c8..d39fcc5f2a6 100644 --- a/pkgs/development/python-modules/requests-cache/default.nix +++ b/pkgs/development/python-modules/requests-cache/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , mock, requests, six, urllib3 }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/requests-http-signature/default.nix b/pkgs/development/python-modules/requests-http-signature/default.nix index cd36a452819..225a8f149e4 100644 --- a/pkgs/development/python-modules/requests-http-signature/default.nix +++ b/pkgs/development/python-modules/requests-http-signature/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , requests diff --git a/pkgs/development/python-modules/requests-kerberos/default.nix b/pkgs/development/python-modules/requests-kerberos/default.nix index a1c6f4fb0a1..73272990e0f 100644 --- a/pkgs/development/python-modules/requests-kerberos/default.nix +++ b/pkgs/development/python-modules/requests-kerberos/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonPackage, requests, pykerberos, mock }: +{ lib, fetchFromGitHub, buildPythonPackage, requests, pykerberos, mock }: buildPythonPackage rec { pname = "requests-kerberos"; diff --git a/pkgs/development/python-modules/requests-oauthlib/default.nix b/pkgs/development/python-modules/requests-oauthlib/default.nix index 5de13530f66..aed6576c90d 100644 --- a/pkgs/development/python-modules/requests-oauthlib/default.nix +++ b/pkgs/development/python-modules/requests-oauthlib/default.nix @@ -1,21 +1,43 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi -, oauthlib, requests }: +{ lib +, buildPythonPackage +, fetchPypi +, mock +, oauthlib +, pytestCheckHook +, requests +, requests-mock +}: buildPythonPackage rec { - version = "1.3.0"; pname = "requests-oauthlib"; + version = "1.3.0"; src = fetchPypi { inherit pname version; sha256 = "0smaxs5ixng4z0k6dsgmm6s972ka3p6a2ykdpnl23mqzlw0ic9ml"; }; - doCheck = false; # Internet tests fail when building in chroot propagatedBuildInputs = [ oauthlib requests ]; + checkInputs = [ + mock + pytestCheckHook + requests-mock + ]; + + # Exclude tests which require network access + disabledTests = [ + "testCanPostBinaryData" + "test_content_type_override" + "test_url_is_native_str" + ]; + + pythonImportsCheck = [ "requests_oauthlib" ]; + meta = with lib; { description = "OAuthlib authentication support for Requests"; homepage = "https://github.com/requests/requests-oauthlib"; + license = with licenses; [ isc ]; maintainers = with maintainers; [ prikhi ]; }; } diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix index a49b0710220..e0dfb9a24a6 100644 --- a/pkgs/development/python-modules/requests/default.nix +++ b/pkgs/development/python-modules/requests/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage +{ lib, fetchPypi, buildPythonPackage , urllib3, idna, chardet, certifi , pytest }: diff --git a/pkgs/development/python-modules/resampy/default.nix b/pkgs/development/python-modules/resampy/default.nix index 38b4ae9911d..551c7f5b93e 100644 --- a/pkgs/development/python-modules/resampy/default.nix +++ b/pkgs/development/python-modules/resampy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , pytest diff --git a/pkgs/development/python-modules/respx/default.nix b/pkgs/development/python-modules/respx/default.nix new file mode 100644 index 00000000000..61e2016a497 --- /dev/null +++ b/pkgs/development/python-modules/respx/default.nix @@ -0,0 +1,50 @@ +{ lib +, attrs +, buildPythonPackage +, fetchFromGitHub +, httpcore +, httpx +, pytest-asyncio +, pytest-cov +, pytestCheckHook +, trio +, xmltodict +}: + +buildPythonPackage rec { + pname = "respx"; + version = "0.16.3"; + + src = fetchFromGitHub { + owner = "lundberg"; + repo = pname; + rev = version; + sha256 = "0if9sg83rznl37hsjw6pfk78jpxi421g9p21wd92jcd6073g4nbd"; + }; + + # Coverage is under 100 % due to the excluded tests + postPatch = '' + substituteInPlace setup.cfg --replace "--cov-fail-under 100" "" + ''; + + propagatedBuildInputs = [ httpx ]; + + checkInputs = [ + httpcore + httpx + pytest-asyncio + pytest-cov + pytestCheckHook + trio + ]; + + disabledTests = [ "test_pass_through" ]; + pythonImportsCheck = [ "respx" ]; + + meta = with lib; { + description = "Python library for mocking HTTPX"; + homepage = "https://lundberg.github.io/respx/"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/rethinkdb/default.nix b/pkgs/development/python-modules/rethinkdb/default.nix index b3590023373..947aa505f70 100644 --- a/pkgs/development/python-modules/rethinkdb/default.nix +++ b/pkgs/development/python-modules/rethinkdb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/pkgs/development/python-modules/retry_decorator/default.nix b/pkgs/development/python-modules/retry_decorator/default.nix index 12ba4f9a1a5..c2f91c8fe1b 100644 --- a/pkgs/development/python-modules/retry_decorator/default.nix +++ b/pkgs/development/python-modules/retry_decorator/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/retrying/default.nix b/pkgs/development/python-modules/retrying/default.nix index 65127d040f4..5e2451affb9 100644 --- a/pkgs/development/python-modules/retrying/default.nix +++ b/pkgs/development/python-modules/retrying/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/pkgs/development/python-modules/rfc-bibtex/default.nix b/pkgs/development/python-modules/rfc-bibtex/default.nix index c002f0baaa9..b9b7cdb76c4 100644 --- a/pkgs/development/python-modules/rfc-bibtex/default.nix +++ b/pkgs/development/python-modules/rfc-bibtex/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, fetchPypi, isPy3k }: +{ lib, buildPythonApplication, fetchPypi, isPy3k }: buildPythonApplication rec { pname = "rfc-bibtex"; diff --git a/pkgs/development/python-modules/rfc3986/default.nix b/pkgs/development/python-modules/rfc3986/default.nix index 561bda08d0c..93f2f2ce37d 100644 --- a/pkgs/development/python-modules/rfc3986/default.nix +++ b/pkgs/development/python-modules/rfc3986/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, idna, pytestCheckHook }: +{ lib, buildPythonPackage, fetchPypi, idna, pytestCheckHook }: buildPythonPackage rec { pname = "rfc3986"; diff --git a/pkgs/development/python-modules/rfc3987/default.nix b/pkgs/development/python-modules/rfc3987/default.nix index 1ec8fc2153c..41beb1c8c17 100644 --- a/pkgs/development/python-modules/rfc3987/default.nix +++ b/pkgs/development/python-modules/rfc3987/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "rfc3987"; diff --git a/pkgs/development/python-modules/rfc6555/default.nix b/pkgs/development/python-modules/rfc6555/default.nix index 0bd7b0ca686..4e47915bdf7 100644 --- a/pkgs/development/python-modules/rfc6555/default.nix +++ b/pkgs/development/python-modules/rfc6555/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pythonPackages }: +{ lib, buildPythonPackage, fetchPypi, pythonPackages }: buildPythonPackage rec { pname = "rfc6555"; @@ -19,10 +19,10 @@ buildPythonPackage rec { py.test tests/ ''; - meta = { + meta = with lib; { 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 ]; + license = licenses.asl20; + maintainers = with maintainers; [ endocrimes ]; }; } diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix index 1e667f1f3de..64739b3c65c 100644 --- a/pkgs/development/python-modules/rich/default.nix +++ b/pkgs/development/python-modules/rich/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , pythonOlder @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "rich"; - version = "9.1.0"; + version = "9.10.0"; # tests not included in pypi tarball src = fetchFromGitHub { owner = "willmcgugan"; repo = pname; rev = "v${version}"; - sha256 = "18iha0fs8vm0j11k39yxj26h8qxrp27ijhx6h1yyizbygmr5b5nk"; + sha256 = "1m1rswg16r4pxv7504nk7lpyxrwf16xw4w55rs3jisryx14ccic6"; }; format = "pyproject"; @@ -32,7 +32,7 @@ buildPythonPackage rec { ipywidgets pygments typing-extensions - ] ++ stdenv.lib.optional (pythonOlder "3.7") dataclasses; + ] ++ lib.optional (pythonOlder "3.7") dataclasses; checkInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "rich" ]; diff --git a/pkgs/development/python-modules/rjsmin/default.nix b/pkgs/development/python-modules/rjsmin/default.nix index 7ca9d711739..d78c445a3e5 100644 --- a/pkgs/development/python-modules/rjsmin/default.nix +++ b/pkgs/development/python-modules/rjsmin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "rjsmin"; version = "1.1.0"; diff --git a/pkgs/development/python-modules/rl-coach/default.nix b/pkgs/development/python-modules/rl-coach/default.nix index 0ac5d9ab2a3..0724abec19a 100644 --- a/pkgs/development/python-modules/rl-coach/default.nix +++ b/pkgs/development/python-modules/rl-coach/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , buildPythonPackage , pythonOlder , fetchPypi diff --git a/pkgs/development/python-modules/robomachine/default.nix b/pkgs/development/python-modules/robomachine/default.nix index fe069be459c..4f5d44006c4 100644 --- a/pkgs/development/python-modules/robomachine/default.nix +++ b/pkgs/development/python-modules/robomachine/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, pyparsing, robotframework, allpairspy }: +{ lib, fetchPypi, buildPythonPackage, pyparsing, robotframework, allpairspy }: buildPythonPackage rec { pname = "RoboMachine"; diff --git a/pkgs/development/python-modules/roboschool/default.nix b/pkgs/development/python-modules/roboschool/default.nix index 9387f3775be..97eee2155a5 100644 --- a/pkgs/development/python-modules/roboschool/default.nix +++ b/pkgs/development/python-modules/roboschool/default.nix @@ -9,7 +9,7 @@ , assimp , gym , bullet-roboschool -, pkgconfig +, pkg-config , which }: @@ -32,7 +32,7 @@ buildPythonPackage rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config qtbase # needs the `moc` tool which ]; @@ -44,6 +44,8 @@ buildPythonPackage rec { boost ]; + dontWrapQtApps = true; + NIX_CFLAGS_COMPILE="-I ${python}/include/${python.libPrefix}"; patches = [ diff --git a/pkgs/development/python-modules/robot-detection/default.nix b/pkgs/development/python-modules/robot-detection/default.nix index 3cf064d2669..31b1f43a4e2 100644 --- a/pkgs/development/python-modules/robot-detection/default.nix +++ b/pkgs/development/python-modules/robot-detection/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, six }: +{ lib, buildPythonPackage, fetchPypi, six }: buildPythonPackage rec { pname = "robot-detection"; diff --git a/pkgs/development/python-modules/robotframework-databaselibrary/default.nix b/pkgs/development/python-modules/robotframework-databaselibrary/default.nix index c3eb309dfe0..8dfbb32fe08 100644 --- a/pkgs/development/python-modules/robotframework-databaselibrary/default.nix +++ b/pkgs/development/python-modules/robotframework-databaselibrary/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , robotframework diff --git a/pkgs/development/python-modules/robotframework-requests/default.nix b/pkgs/development/python-modules/robotframework-requests/default.nix index 967138620e9..f23979f21fd 100644 --- a/pkgs/development/python-modules/robotframework-requests/default.nix +++ b/pkgs/development/python-modules/robotframework-requests/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , unittest2 diff --git a/pkgs/development/python-modules/robotframework-ride/default.nix b/pkgs/development/python-modules/robotframework-ride/default.nix index 39e42596e2a..bc9e0873fe5 100644 --- a/pkgs/development/python-modules/robotframework-ride/default.nix +++ b/pkgs/development/python-modules/robotframework-ride/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, buildPythonPackage, isPy3k, pygments, wxPython }: +{ lib, fetchurl, buildPythonPackage, isPy3k, pygments, wxPython }: buildPythonPackage rec { version = "1.2.3"; diff --git a/pkgs/development/python-modules/robotframework-selenium2library/default.nix b/pkgs/development/python-modules/robotframework-selenium2library/default.nix index 5fa87d17d11..6d079a99b4f 100644 --- a/pkgs/development/python-modules/robotframework-selenium2library/default.nix +++ b/pkgs/development/python-modules/robotframework-selenium2library/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, robotframework-seleniumlibrary }: +{ lib, buildPythonPackage, fetchPypi, robotframework-seleniumlibrary }: buildPythonPackage rec { version = "3.0.0"; diff --git a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix index 60123d6b87d..fbb8cb034a5 100644 --- a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix +++ b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python, robotframework, selenium, mockito, robotstatuschecker, approvaltests }: +{ lib, buildPythonPackage, fetchFromGitHub, python, robotframework, selenium, mockito, robotstatuschecker, approvaltests }: buildPythonPackage rec { version = "3.3.1"; diff --git a/pkgs/development/python-modules/robotframework-sshlibrary/default.nix b/pkgs/development/python-modules/robotframework-sshlibrary/default.nix index 7e3bcbcc55d..62fb43e0269 100644 --- a/pkgs/development/python-modules/robotframework-sshlibrary/default.nix +++ b/pkgs/development/python-modules/robotframework-sshlibrary/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , robotframework diff --git a/pkgs/development/python-modules/robotframework-tools/default.nix b/pkgs/development/python-modules/robotframework-tools/default.nix index 5bc7bbceae7..9b90b25bfb7 100644 --- a/pkgs/development/python-modules/robotframework-tools/default.nix +++ b/pkgs/development/python-modules/robotframework-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/robotframework/default.nix b/pkgs/development/python-modules/robotframework/default.nix index 953602ca1ad..cc57fa0d026 100644 --- a/pkgs/development/python-modules/robotframework/default.nix +++ b/pkgs/development/python-modules/robotframework/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage }: +{ lib, fetchPypi, buildPythonPackage }: buildPythonPackage rec { pname = "robotframework"; diff --git a/pkgs/development/python-modules/robotstatuschecker/default.nix b/pkgs/development/python-modules/robotstatuschecker/default.nix index b0bd44f9c15..81226a23452 100644 --- a/pkgs/development/python-modules/robotstatuschecker/default.nix +++ b/pkgs/development/python-modules/robotstatuschecker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python, robotframework }: +{ lib, buildPythonPackage, fetchFromGitHub, python, robotframework }: buildPythonPackage rec { version = "1.3"; diff --git a/pkgs/development/python-modules/robotsuite/default.nix b/pkgs/development/python-modules/robotsuite/default.nix index 126153ec50e..5c46686adae 100644 --- a/pkgs/development/python-modules/robotsuite/default.nix +++ b/pkgs/development/python-modules/robotsuite/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , unittest2, lxml, robotframework }: diff --git a/pkgs/development/python-modules/roku/default.nix b/pkgs/development/python-modules/roku/default.nix index 5e3644468fe..c82eda6e35c 100644 --- a/pkgs/development/python-modules/roku/default.nix +++ b/pkgs/development/python-modules/roku/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonPackage, requests, pytest, flask, isPy27 +{ lib, fetchFromGitHub, buildPythonPackage, requests, pytest, flask, isPy27 }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/roman/default.nix b/pkgs/development/python-modules/roman/default.nix index 33f0f7f18d7..cde0ab0f271 100644 --- a/pkgs/development/python-modules/roman/default.nix +++ b/pkgs/development/python-modules/roman/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/roombapy/default.nix b/pkgs/development/python-modules/roombapy/default.nix new file mode 100644 index 00000000000..9c438bde756 --- /dev/null +++ b/pkgs/development/python-modules/roombapy/default.nix @@ -0,0 +1,37 @@ +{ buildPythonPackage +, fetchFromGitHub +, hbmqtt +, lib +, paho-mqtt +, poetry +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "roombapy"; + version = "1.6.2-1"; + + src = fetchFromGitHub { + owner = "pschmitt"; + repo = "roombapy"; + rev = version; + sha256 = "14k7bys479xwpa4alpdwphzmxm3x8kc48nfqnshn1wj94vyxc425"; + }; + + format = "pyproject"; + + nativeBuildInputs = [ poetry ]; + propagatedBuildInputs = [ paho-mqtt ]; + + checkInputs = [ hbmqtt pytest-asyncio pytestCheckHook ]; + pytestFlagsArray = [ "tests/" "--ignore=tests/test_discovery.py" ]; + pythonImportsCheck = [ "roombapy" ]; + + meta = with lib; { + homepage = "https://github.com/pschmitt/roombapy"; + description = "Python program and library to control Wi-Fi enabled iRobot Roombas"; + maintainers = with maintainers; [ justinas ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/rope/default.nix b/pkgs/development/python-modules/rope/default.nix index 65edd602d8d..c4e451aade5 100644 --- a/pkgs/development/python-modules/rope/default.nix +++ b/pkgs/development/python-modules/rope/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonAtLeast, nose }: +{ lib, buildPythonPackage, fetchPypi, pythonAtLeast, nose }: buildPythonPackage rec { pname = "rope"; diff --git a/pkgs/development/python-modules/ropper/default.nix b/pkgs/development/python-modules/ropper/default.nix index 8b193caa7b8..5a472ceb180 100644 --- a/pkgs/development/python-modules/ropper/default.nix +++ b/pkgs/development/python-modules/ropper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonApplication , fetchPypi , capstone diff --git a/pkgs/development/python-modules/routes/default.nix b/pkgs/development/python-modules/routes/default.nix index 0129ef69e2c..1176fcb4eb0 100644 --- a/pkgs/development/python-modules/routes/default.nix +++ b/pkgs/development/python-modules/routes/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , repoze_lru diff --git a/pkgs/development/python-modules/rpdb/default.nix b/pkgs/development/python-modules/rpdb/default.nix index fb84adb7d24..69a886f6e0d 100644 --- a/pkgs/development/python-modules/rpdb/default.nix +++ b/pkgs/development/python-modules/rpdb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/rpkg/default.nix b/pkgs/development/python-modules/rpkg/default.nix index 731a5738e73..5f1cfc622c9 100644 --- a/pkgs/development/python-modules/rpkg/default.nix +++ b/pkgs/development/python-modules/rpkg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, isPy3k, fetchurl, six, pycurl, cccolutils +{ lib, buildPythonPackage, isPy3k, fetchurl, six, pycurl, cccolutils , koji, rpmfluff }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/rply/default.nix b/pkgs/development/python-modules/rply/default.nix index 0da9d2b7101..33f8547496d 100644 --- a/pkgs/development/python-modules/rply/default.nix +++ b/pkgs/development/python-modules/rply/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pytest, fetchFromGitHub, buildPythonPackage, appdirs }: +{ lib, pytest, fetchFromGitHub, buildPythonPackage, appdirs }: buildPythonPackage rec { pname = "rply"; diff --git a/pkgs/development/python-modules/rpmfluff/default.nix b/pkgs/development/python-modules/rpmfluff/default.nix index 96050ba14b0..9957393770b 100644 --- a/pkgs/development/python-modules/rpmfluff/default.nix +++ b/pkgs/development/python-modules/rpmfluff/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , glibcLocales diff --git a/pkgs/development/python-modules/rq/default.nix b/pkgs/development/python-modules/rq/default.nix index c9ca5977cb1..8ec05aae9d5 100644 --- a/pkgs/development/python-modules/rq/default.nix +++ b/pkgs/development/python-modules/rq/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonPackage, isPy27, click, redis }: +{ lib, fetchFromGitHub, buildPythonPackage, isPy27, click, redis }: buildPythonPackage rec { pname = "rq"; diff --git a/pkgs/development/python-modules/rsa/4_0.nix b/pkgs/development/python-modules/rsa/4_0.nix index a6aa89b2ea1..1a9ad2171a0 100644 --- a/pkgs/development/python-modules/rsa/4_0.nix +++ b/pkgs/development/python-modules/rsa/4_0.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , unittest2 @@ -20,7 +20,7 @@ buildPythonPackage rec { checkInputs = [ unittest2 mock ]; propagatedBuildInputs = [ pyasn1 ]; - preConfigure = stdenv.lib.optionalString (isPy3k && pythonOlder "3.7") '' + preConfigure = lib.optionalString (isPy3k && pythonOlder "3.7") '' substituteInPlace setup.py --replace "open('README.md')" "open('README.md',encoding='utf-8')" ''; diff --git a/pkgs/development/python-modules/rsa/default.nix b/pkgs/development/python-modules/rsa/default.nix index 1f26350fc36..7a990061e00 100644 --- a/pkgs/development/python-modules/rsa/default.nix +++ b/pkgs/development/python-modules/rsa/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , unittest2 @@ -21,7 +21,7 @@ buildPythonPackage rec { checkInputs = [ unittest2 mock ]; propagatedBuildInputs = [ pyasn1 ]; - preConfigure = stdenv.lib.optionalString (isPy3k && pythonOlder "3.7") '' + preConfigure = lib.optionalString (isPy3k && pythonOlder "3.7") '' substituteInPlace setup.py --replace "open('README.md')" "open('README.md',encoding='utf-8')" ''; diff --git a/pkgs/development/python-modules/rtslib/default.nix b/pkgs/development/python-modules/rtslib/default.nix index e53756b0181..e6289378c96 100644 --- a/pkgs/development/python-modules/rtslib/default.nix +++ b/pkgs/development/python-modules/rtslib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonPackage, six, pyudev, pygobject3 }: +{ lib, fetchFromGitHub, buildPythonPackage, six, pyudev, pygobject3 }: buildPythonPackage rec { pname = "rtslib"; diff --git a/pkgs/development/python-modules/ruamel_base/default.nix b/pkgs/development/python-modules/ruamel_base/default.nix index 950f523f4a9..1f829bb4e0b 100644 --- a/pkgs/development/python-modules/ruamel_base/default.nix +++ b/pkgs/development/python-modules/ruamel_base/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/ruamel_ordereddict/default.nix b/pkgs/development/python-modules/ruamel_ordereddict/default.nix index 1e5820a37f7..98c36221dcd 100644 --- a/pkgs/development/python-modules/ruamel_ordereddict/default.nix +++ b/pkgs/development/python-modules/ruamel_ordereddict/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/ruamel_yaml_clib/default.nix b/pkgs/development/python-modules/ruamel_yaml_clib/default.nix index debf2aaf774..8304f5d7dad 100644 --- a/pkgs/development/python-modules/ruamel_yaml_clib/default.nix +++ b/pkgs/development/python-modules/ruamel_yaml_clib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchhg , ruamel_base diff --git a/pkgs/development/python-modules/rubymarshal/default.nix b/pkgs/development/python-modules/rubymarshal/default.nix index edb793c19d5..51cec6f8602 100644 --- a/pkgs/development/python-modules/rubymarshal/default.nix +++ b/pkgs/development/python-modules/rubymarshal/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, hypothesis, isPy3k }: +{ lib, buildPythonPackage, fetchPypi, hypothesis, isPy3k }: buildPythonPackage rec { pname = "rubymarshal"; diff --git a/pkgs/development/python-modules/runsnakerun/default.nix b/pkgs/development/python-modules/runsnakerun/default.nix index 1475b003231..ace9b8269c5 100644 --- a/pkgs/development/python-modules/runsnakerun/default.nix +++ b/pkgs/development/python-modules/runsnakerun/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , squaremap diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index 0154059c4f7..9bb2a513174 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, docutils, aiobotocore, fsspec }: +{ lib, buildPythonPackage, fetchPypi, docutils, aiobotocore, fsspec }: buildPythonPackage rec { pname = "s3fs"; diff --git a/pkgs/development/python-modules/s3transfer/default.nix b/pkgs/development/python-modules/s3transfer/default.nix index 27551a798d7..6f816fc9bb8 100644 --- a/pkgs/development/python-modules/s3transfer/default.nix +++ b/pkgs/development/python-modules/s3transfer/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib , fetchPypi , pythonOlder , buildPythonPackage @@ -23,7 +23,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ botocore - ] ++ stdenv.lib.optional (pythonOlder "3") futures; + ] ++ lib.optional (pythonOlder "3") futures; buildInputs = [ docutils @@ -43,9 +43,9 @@ buildPythonPackage rec { # version on pypi has no tests/ dir doCheck = false; - meta = { + meta = with lib; { homepage = "https://github.com/boto/s3transfer"; - license = stdenv.lib.licenses.asl20; + license = licenses.asl20; description = "A library for managing Amazon S3 transfers"; }; } diff --git a/pkgs/development/python-modules/sacremoses/default.nix b/pkgs/development/python-modules/sacremoses/default.nix index 9f97757edad..4ffea014001 100644 --- a/pkgs/development/python-modules/sacremoses/default.nix +++ b/pkgs/development/python-modules/sacremoses/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage -, lib, stdenv +, lib , fetchFromGitHub , click , six diff --git a/pkgs/development/python-modules/safe/default.nix b/pkgs/development/python-modules/safe/default.nix index d167760c3e0..6a4515b90f8 100644 --- a/pkgs/development/python-modules/safe/default.nix +++ b/pkgs/development/python-modules/safe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/pkgs/development/python-modules/salmon-mail/default.nix b/pkgs/development/python-modules/salmon-mail/default.nix index 5e6aa5927ec..0b8edf8bdd9 100644 --- a/pkgs/development/python-modules/salmon-mail/default.nix +++ b/pkgs/development/python-modules/salmon-mail/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, dnspython, chardet, lmtpd +{ lib, buildPythonPackage, fetchPypi, dnspython, chardet, lmtpd , python-daemon, six, jinja2, mock, click }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/samplerate/default.nix b/pkgs/development/python-modules/samplerate/default.nix index a4a19f7ad12..9c26c9e2e2b 100644 --- a/pkgs/development/python-modules/samplerate/default.nix +++ b/pkgs/development/python-modules/samplerate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , numpy , pkgs diff --git a/pkgs/development/python-modules/samsungtvws/default.nix b/pkgs/development/python-modules/samsungtvws/default.nix index b41935c5825..3a12568c4d6 100644 --- a/pkgs/development/python-modules/samsungtvws/default.nix +++ b/pkgs/development/python-modules/samsungtvws/default.nix @@ -5,18 +5,14 @@ buildPythonPackage rec { pname = "samsungtvws"; - version = "1.5.3"; + version = "1.6.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "054rr8hiacdjfxqssnxnd3xp9hh8350zjzzjvh1199bpps4l1l6n"; + sha256 = "09nls4n0lbnr8nj8105lagr9h2my8lb1s2k285kmsbli36ywd8lj"; }; - patchPhase = '' - substituteInPlace setup.py --replace "websocket-client==" "websocket-client>=" - ''; - propagatedBuildInputs = [ websocket_client requests diff --git a/pkgs/development/python-modules/sandboxlib/default.nix b/pkgs/development/python-modules/sandboxlib/default.nix index 42872e31891..1be4c485b80 100644 --- a/pkgs/development/python-modules/sandboxlib/default.nix +++ b/pkgs/development/python-modules/sandboxlib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pbr diff --git a/pkgs/development/python-modules/sapi-python-client/default.nix b/pkgs/development/python-modules/sapi-python-client/default.nix index 8a7a62d8ce8..222b4c60c7f 100644 --- a/pkgs/development/python-modules/sapi-python-client/default.nix +++ b/pkgs/development/python-modules/sapi-python-client/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, git, setuptools, setuptools_scm, fetchFromGitHub, requests, boto3, buildPythonPackage, responses }: +{ lib, git, setuptools, setuptools_scm, fetchFromGitHub, requests, boto3, buildPythonPackage, responses }: buildPythonPackage rec { pname = "sapi-python-client"; diff --git a/pkgs/development/python-modules/scales/default.nix b/pkgs/development/python-modules/scales/default.nix index 5aae6297268..3806ffb9d46 100644 --- a/pkgs/development/python-modules/scales/default.nix +++ b/pkgs/development/python-modules/scales/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/pkgs/development/python-modules/schedule/default.nix b/pkgs/development/python-modules/schedule/default.nix index 596ed993233..2eda0cd6ac9 100644 --- a/pkgs/development/python-modules/schedule/default.nix +++ b/pkgs/development/python-modules/schedule/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , mock diff --git a/pkgs/development/python-modules/schema/default.nix b/pkgs/development/python-modules/schema/default.nix index 1502c7d10ab..483a891f933 100644 --- a/pkgs/development/python-modules/schema/default.nix +++ b/pkgs/development/python-modules/schema/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, contextlib2, pytest, mock }: +{ lib, buildPythonPackage, fetchPypi, contextlib2, pytest, mock }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/scikit-bio/default.nix b/pkgs/development/python-modules/scikit-bio/default.nix index 8fa0186498f..f14c4d82f42 100644 --- a/pkgs/development/python-modules/scikit-bio/default.nix +++ b/pkgs/development/python-modules/scikit-bio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , cython diff --git a/pkgs/development/python-modules/scikitlearn/default.nix b/pkgs/development/python-modules/scikitlearn/default.nix index 5414fe43cc1..e7307c92632 100644 --- a/pkgs/development/python-modules/scikitlearn/default.nix +++ b/pkgs/development/python-modules/scikitlearn/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "scikit-learn"; - version = "0.23.2"; + version = "0.24.1"; # UnboundLocalError: local variable 'message' referenced before assignment disabled = stdenv.isi686; # https://github.com/scikit-learn/scikit-learn/issues/5534 src = fetchPypi { inherit pname version; - sha256 = "20766f515e6cd6f954554387dfae705d93c7b544ec0e6c6a5d8e006f6f7ef480"; + sha256 = "oDNKGALmTWVgIsO/q1anP71r9LEpg0PzaIryFRgQu98="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/scikits-odes/default.nix b/pkgs/development/python-modules/scikits-odes/default.nix index 383cf1f70c6..8921e0061aa 100644 --- a/pkgs/development/python-modules/scikits-odes/default.nix +++ b/pkgs/development/python-modules/scikits-odes/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , buildPythonPackage , fetchPypi , fetchurl diff --git a/pkgs/development/python-modules/scp/default.nix b/pkgs/development/python-modules/scp/default.nix index f5cd96e71aa..abbe932c267 100644 --- a/pkgs/development/python-modules/scp/default.nix +++ b/pkgs/development/python-modules/scp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , paramiko diff --git a/pkgs/development/python-modules/scrapy-deltafetch/default.nix b/pkgs/development/python-modules/scrapy-deltafetch/default.nix index 900943a0e15..006c8ed0302 100644 --- a/pkgs/development/python-modules/scrapy-deltafetch/default.nix +++ b/pkgs/development/python-modules/scrapy-deltafetch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchPypi, buildPythonPackage, scrapy, bsddb3 }: +{ lib, fetchPypi, buildPythonPackage, scrapy, bsddb3 }: buildPythonPackage rec { pname = "scrapy-deltafetch"; diff --git a/pkgs/development/python-modules/scrapy-fake-useragent/default.nix b/pkgs/development/python-modules/scrapy-fake-useragent/default.nix index 4f6eecfe914..f9f896a563b 100644 --- a/pkgs/development/python-modules/scrapy-fake-useragent/default.nix +++ b/pkgs/development/python-modules/scrapy-fake-useragent/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonPackage, pytestCheckHook, pytestcov, pytest-mock, fake-useragent, faker, scrapy }: +{ lib, fetchFromGitHub, buildPythonPackage, pytestCheckHook, pytestcov, pytest-mock, fake-useragent, faker, scrapy }: buildPythonPackage rec { pname = "scrapy-fake-useragent"; diff --git a/pkgs/development/python-modules/scrapy-splash/default.nix b/pkgs/development/python-modules/scrapy-splash/default.nix index ab00377f4a0..5f6721f8162 100644 --- a/pkgs/development/python-modules/scrapy-splash/default.nix +++ b/pkgs/development/python-modules/scrapy-splash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchPypi, buildPythonPackage, scrapy, six }: +{ lib, fetchPypi, buildPythonPackage, scrapy, six }: buildPythonPackage rec { pname = "scrapy-splash"; diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index 48bafa41dff..6887eded3bf 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -80,7 +80,7 @@ buildPythonPackage rec { "test_retry_dns_error" "test_custom_asyncio_loop_enabled_true" "test_custom_loop_asyncio" - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ "test_xmliter_encoding" "test_download" ]; diff --git a/pkgs/development/python-modules/screeninfo/default.nix b/pkgs/development/python-modules/screeninfo/default.nix index f53a7053ff5..5f238a7e05f 100644 --- a/pkgs/development/python-modules/screeninfo/default.nix +++ b/pkgs/development/python-modules/screeninfo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, fetchPypi, isPy27, isPy36, dataclasses, libX11, libXinerama, libXrandr }: +{ lib, buildPythonApplication, fetchPypi, isPy27, isPy36, dataclasses, libX11, libXinerama, libXrandr }: buildPythonApplication rec { pname = "screeninfo"; @@ -23,7 +23,7 @@ buildPythonApplication rec { --replace "load_library(\"Xrandr\")" "ctypes.cdll.LoadLibrary(\"${libXrandr}/lib/libXrandr.so\")" ''; - propagatedBuildInputs = stdenv.lib.optional isPy36 dataclasses; + propagatedBuildInputs = lib.optional isPy36 dataclasses; buildInputs = [ libX11 libXinerama libXrandr]; diff --git a/pkgs/development/python-modules/scripttest/default.nix b/pkgs/development/python-modules/scripttest/default.nix index ab234ce2243..5fe4b2b2ee6 100644 --- a/pkgs/development/python-modules/scripttest/default.nix +++ b/pkgs/development/python-modules/scripttest/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/pkgs/development/python-modules/sdnotify/default.nix b/pkgs/development/python-modules/sdnotify/default.nix index 0003d9c0131..a447283c63a 100644 --- a/pkgs/development/python-modules/sdnotify/default.nix +++ b/pkgs/development/python-modules/sdnotify/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/seabreeze/default.nix b/pkgs/development/python-modules/seabreeze/default.nix index cc9594d0452..f4a4955a739 100644 --- a/pkgs/development/python-modules/seabreeze/default.nix +++ b/pkgs/development/python-modules/seabreeze/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , buildPythonPackage , pyusb diff --git a/pkgs/development/python-modules/secp256k1/default.nix b/pkgs/development/python-modules/secp256k1/default.nix index 3cd6b2fe3cc..78ddb269f3d 100644 --- a/pkgs/development/python-modules/secp256k1/default.nix +++ b/pkgs/development/python-modules/secp256k1/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, pkgconfig +, pkg-config , pytest , pytestrunner , cffi @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "a3b43e02d321c09eafa769a6fc2c156f555cab3a7db62175ef2fd21e16cdf20c"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; checkInputs = [ pytest pytestrunner ]; propagatedBuildInputs = [ cffi secp256k1 ]; diff --git a/pkgs/development/python-modules/seekpath/default.nix b/pkgs/development/python-modules/seekpath/default.nix index 637b55eec8d..dbfe4510776 100644 --- a/pkgs/development/python-modules/seekpath/default.nix +++ b/pkgs/development/python-modules/seekpath/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, numpy, future, spglib, glibcLocales, pytest, scipy }: +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, numpy, future, spglib, glibcLocales, pytest, scipy }: buildPythonPackage rec { pname = "seekpath"; diff --git a/pkgs/development/python-modules/segments/default.nix b/pkgs/development/python-modules/segments/default.nix index 8c2e22708aa..00953a8e909 100644 --- a/pkgs/development/python-modules/segments/default.nix +++ b/pkgs/development/python-modules/segments/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "segments"; - version = "2.1.3"; + version = "2.2.0"; disabled = isPy27; src = fetchFromGitHub { owner = "cldf"; repo = pname; rev = "v${version}"; - sha256 = "12lnpk834r3y7hw5x7nvswa60ddh69ylvr44k46gqcfba160hhb0"; + sha256 = "04yc8q79zk09xj0wnal0vdg5azi9jlarfmf2iyljqyr80p79gwvv"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/selectors2/default.nix b/pkgs/development/python-modules/selectors2/default.nix index ff6b81d3105..bd3f77b5b08 100644 --- a/pkgs/development/python-modules/selectors2/default.nix +++ b/pkgs/development/python-modules/selectors2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , nose, psutil, mock }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/selectors34/default.nix b/pkgs/development/python-modules/selectors34/default.nix index ea3b403fdae..2209ccf43d2 100644 --- a/pkgs/development/python-modules/selectors34/default.nix +++ b/pkgs/development/python-modules/selectors34/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , python diff --git a/pkgs/development/python-modules/selenium/default.nix b/pkgs/development/python-modules/selenium/default.nix index b32dfe2653e..664f84933ed 100644 --- a/pkgs/development/python-modules/selenium/default.nix +++ b/pkgs/development/python-modules/selenium/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { geckodriver urllib3 ]; - patchPhase = stdenv.lib.optionalString stdenv.isLinux '' + patchPhase = lib.optionalString stdenv.isLinux '' cp "${x_ignore_nofocus}/cpp/linux-specific/"* . substituteInPlace x_ignore_nofocus.c --replace "/usr/lib/libX11.so.6" "${xorg.libX11.out}/lib/libX11.so.6" cc -c -fPIC x_ignore_nofocus.c -o x_ignore_nofocus.o diff --git a/pkgs/development/python-modules/semantic/default.nix b/pkgs/development/python-modules/semantic/default.nix index 83e4879e1fd..518b7637ad7 100644 --- a/pkgs/development/python-modules/semantic/default.nix +++ b/pkgs/development/python-modules/semantic/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/semver/default.nix b/pkgs/development/python-modules/semver/default.nix index 71ec776db7c..c281a6d6b0d 100644 --- a/pkgs/development/python-modules/semver/default.nix +++ b/pkgs/development/python-modules/semver/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , buildPythonPackage , pytestCheckHook diff --git a/pkgs/development/python-modules/sendgrid/default.nix b/pkgs/development/python-modules/sendgrid/default.nix new file mode 100644 index 00000000000..77cd3593863 --- /dev/null +++ b/pkgs/development/python-modules/sendgrid/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, flask +, pytestCheckHook +, python-http-client +, pyyaml +, starkbank-ecdsa +, werkzeug +}: + +buildPythonPackage rec { + pname = "sendgrid"; + version = "6.5.0"; + + src = fetchFromGitHub { + owner = pname; + repo = "sendgrid-python"; + rev = version; + sha256 = "14kqjdv49486ksc1s0m0hc4k5nf9vn1v1g489mpib01hiiqxjp1b"; + }; + + propagatedBuildInputs = [ + python-http-client + starkbank-ecdsa + ]; + + checkInputs = [ + flask + pytestCheckHook + pyyaml + werkzeug + ]; + + # Exclude tests that require network access + pytestFlagsArray = [ + "--ignore test/test_sendgrid.py" + "--ignore live_test.py" + ]; + + pythonImportsCheck = [ "sendgrid" ]; + + meta = with lib; { + description = "Python client for SendGrid"; + homepage = "https://github.com/sendgrid/sendgrid-python"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/sentencepiece/default.nix b/pkgs/development/python-modules/sentencepiece/default.nix index 430e61399b2..c1ad64b3f5e 100644 --- a/pkgs/development/python-modules/sentencepiece/default.nix +++ b/pkgs/development/python-modules/sentencepiece/default.nix @@ -1,14 +1,14 @@ { buildPythonPackage -, stdenv + , sentencepiece -, pkgconfig +, pkg-config }: buildPythonPackage rec { pname = "sentencepiece"; inherit (sentencepiece) version src; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ sentencepiece.dev ]; sourceRoot = "source/python"; diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index b846c0bc743..b3a1c4ee2f4 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -17,7 +17,7 @@ , rq , sanic , sqlalchemy -, lib, stdenv +, lib , tornado , urllib3 , trytond @@ -38,7 +38,7 @@ buildPythonPackage rec { checkInputs = [ blinker botocore chalice django flask tornado bottle rq falcon sqlalchemy werkzeug trytond executing pure-eval asttokens ] - ++ stdenv.lib.optionals isPy3k [ celery pyramid sanic aiohttp ]; + ++ lib.optionals isPy3k [ celery pyramid sanic aiohttp ]; propagatedBuildInputs = [ urllib3 certifi ]; diff --git a/pkgs/development/python-modules/sepaxml/default.nix b/pkgs/development/python-modules/sepaxml/default.nix index 095b47db2bf..8f6d4eb94f5 100644 --- a/pkgs/development/python-modules/sepaxml/default.nix +++ b/pkgs/development/python-modules/sepaxml/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy27 +{ lib, buildPythonPackage, fetchFromGitHub, isPy27 , lxml , pytest , text-unidecode diff --git a/pkgs/development/python-modules/seqdiag/default.nix b/pkgs/development/python-modules/seqdiag/default.nix index ba4cdca0c63..2ae9defc504 100644 --- a/pkgs/development/python-modules/seqdiag/default.nix +++ b/pkgs/development/python-modules/seqdiag/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, buildPythonPackage, isPy27, pep8, nose, unittest2, docutils +{ lib, fetchurl, buildPythonPackage, isPy27, pep8, nose, unittest2, docutils , blockdiag }: diff --git a/pkgs/development/python-modules/serpent/default.nix b/pkgs/development/python-modules/serpent/default.nix index 36840813b40..50f6e0b63a6 100644 --- a/pkgs/development/python-modules/serpent/default.nix +++ b/pkgs/development/python-modules/serpent/default.nix @@ -1,7 +1,6 @@ -{ stdenv +{ lib , buildPythonPackage , fetchPypi -, lib , python , isPy27 , enum34 diff --git a/pkgs/development/python-modules/serversyncstorage/default.nix b/pkgs/development/python-modules/serversyncstorage/default.nix index fa212d6a4de..a409d48837e 100644 --- a/pkgs/development/python-modules/serversyncstorage/default.nix +++ b/pkgs/development/python-modules/serversyncstorage/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , isPy27 diff --git a/pkgs/development/python-modules/setproctitle/default.nix b/pkgs/development/python-modules/setproctitle/default.nix index a9c0e7fda89..9338166efef 100644 --- a/pkgs/development/python-modules/setproctitle/default.nix +++ b/pkgs/development/python-modules/setproctitle/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytestCheckHook diff --git a/pkgs/development/python-modules/setuptools-git/default.nix b/pkgs/development/python-modules/setuptools-git/default.nix index 18fae7b1610..06e699e19a3 100644 --- a/pkgs/development/python-modules/setuptools-git/default.nix +++ b/pkgs/development/python-modules/setuptools-git/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pkgs diff --git a/pkgs/development/python-modules/setuptools-lint/default.nix b/pkgs/development/python-modules/setuptools-lint/default.nix index ba42c21ad36..f1eb2903f03 100644 --- a/pkgs/development/python-modules/setuptools-lint/default.nix +++ b/pkgs/development/python-modules/setuptools-lint/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pylint }: +{ lib, buildPythonPackage, fetchPypi, pylint }: buildPythonPackage rec { pname = "setuptools-lint"; diff --git a/pkgs/development/python-modules/setuptools-rust/default.nix b/pkgs/development/python-modules/setuptools-rust/default.nix index 2d9a4b17d40..ee4a3b55164 100644 --- a/pkgs/development/python-modules/setuptools-rust/default.nix +++ b/pkgs/development/python-modules/setuptools-rust/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix b/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix index d8558aaf83a..98795eadfd4 100644 --- a/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix +++ b/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools_scm, pytest }: +{ lib, buildPythonPackage, fetchPypi, setuptools_scm, pytest }: buildPythonPackage rec { pname = "setuptools-scm-git-archive"; diff --git a/pkgs/development/python-modules/setuptools_scm/default.nix b/pkgs/development/python-modules/setuptools_scm/default.nix index a766bb6c294..ba716c313fd 100644 --- a/pkgs/development/python-modules/setuptools_scm/default.nix +++ b/pkgs/development/python-modules/setuptools_scm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pip, pytest }: +{ lib, buildPythonPackage, fetchPypi, pip, pytest }: buildPythonPackage rec { pname = "setuptools_scm"; diff --git a/pkgs/development/python-modules/setuptoolsdarcs/default.nix b/pkgs/development/python-modules/setuptoolsdarcs/default.nix index f6358a831c9..41fe5043ea8 100644 --- a/pkgs/development/python-modules/setuptoolsdarcs/default.nix +++ b/pkgs/development/python-modules/setuptoolsdarcs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , darcsver diff --git a/pkgs/development/python-modules/setuptoolstrial/default.nix b/pkgs/development/python-modules/setuptoolstrial/default.nix index 1d29f77cf0f..bef492e5dbc 100644 --- a/pkgs/development/python-modules/setuptoolstrial/default.nix +++ b/pkgs/development/python-modules/setuptoolstrial/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/pkgs/development/python-modules/sexpdata/default.nix b/pkgs/development/python-modules/sexpdata/default.nix index 89f716d9be2..fd7d99fbb3f 100644 --- a/pkgs/development/python-modules/sexpdata/default.nix +++ b/pkgs/development/python-modules/sexpdata/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/sgmllib3k/default.nix b/pkgs/development/python-modules/sgmllib3k/default.nix index 6884bed2748..1104c843c6e 100644 --- a/pkgs/development/python-modules/sgmllib3k/default.nix +++ b/pkgs/development/python-modules/sgmllib3k/default.nix @@ -1,8 +1,7 @@ -{ stdenv +{ lib , buildPythonPackage , fetchFromGitHub , isPy27 -, lib }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/shap/default.nix b/pkgs/development/python-modules/shap/default.nix index 1ce9a879ee1..cfbd6f92b04 100644 --- a/pkgs/development/python-modules/shap/default.nix +++ b/pkgs/development/python-modules/shap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , isPy27 diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix index f852f77bcfd..b5dd0be5445 100644 --- a/pkgs/development/python-modules/shapely/default.nix +++ b/pkgs/development/python-modules/shapely/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { (substituteAll { src = ./library-paths.patch; libgeos_c = GEOS_LIBRARY_PATH; - libc = stdenv.lib.optionalString (!stdenv.isDarwin) "${stdenv.cc.libc}/lib/libc${stdenv.hostPlatform.extensions.sharedLibrary}.6"; + libc = lib.optionalString (!stdenv.isDarwin) "${stdenv.cc.libc}/lib/libc${stdenv.hostPlatform.extensions.sharedLibrary}.6"; }) ]; diff --git a/pkgs/development/python-modules/shellingham/default.nix b/pkgs/development/python-modules/shellingham/default.nix index 77a4b98f54c..300368b31f1 100644 --- a/pkgs/development/python-modules/shellingham/default.nix +++ b/pkgs/development/python-modules/shellingham/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/shiboken2/default.nix b/pkgs/development/python-modules/shiboken2/default.nix index b7508a8f644..23836addd0c 100644 --- a/pkgs/development/python-modules/shiboken2/default.nix +++ b/pkgs/development/python-modules/shiboken2/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation { "-DBUILD_TESTS=OFF" ]; + dontWrapQtApps = true; + postInstall = '' rm $out/bin/shiboken_tool.py ''; diff --git a/pkgs/development/python-modules/shippai/default.nix b/pkgs/development/python-modules/shippai/default.nix index 8fd15b71a01..e7efb1ef2dc 100644 --- a/pkgs/development/python-modules/shippai/default.nix +++ b/pkgs/development/python-modules/shippai/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "shippai"; diff --git a/pkgs/development/python-modules/shodan/default.nix b/pkgs/development/python-modules/shodan/default.nix index f361659d9ac..9637602cce1 100644 --- a/pkgs/development/python-modules/shodan/default.nix +++ b/pkgs/development/python-modules/shodan/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "shodan"; - version = "1.24.0"; + version = "1.25.0"; src = fetchPypi { inherit pname version; - sha256 = "0b5ec40c954cd48c4e3234e81ad92afdc68438f82ad392fed35b7097eb77b6dd"; + sha256 = "sha256-fivdvBtgv2IAQtABD0t2KoC0MRHb6pwEHXLUMl4mDCM="; }; propagatedBuildInputs = [ @@ -27,6 +27,7 @@ buildPythonPackage rec { # The tests require a shodan api key, so skip them. doCheck = false; + pythonImportsCheck = [ "shodan" ]; meta = with lib; { description = "Python library and command-line utility for Shodan"; diff --git a/pkgs/development/python-modules/shortuuid/default.nix b/pkgs/development/python-modules/shortuuid/default.nix index 35401afa6e3..f1c1efbc0ec 100644 --- a/pkgs/development/python-modules/shortuuid/default.nix +++ b/pkgs/development/python-modules/shortuuid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , isPy3k , fetchPypi diff --git a/pkgs/development/python-modules/should-dsl/default.nix b/pkgs/development/python-modules/should-dsl/default.nix index 1499f1ce4bc..7510ba88d1d 100644 --- a/pkgs/development/python-modules/should-dsl/default.nix +++ b/pkgs/development/python-modules/should-dsl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "should-dsl"; diff --git a/pkgs/development/python-modules/shouldbe/default.nix b/pkgs/development/python-modules/shouldbe/default.nix index 9959f26036c..b733c1c9516 100644 --- a/pkgs/development/python-modules/shouldbe/default.nix +++ b/pkgs/development/python-modules/shouldbe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , pythonAtLeast , fetchPypi diff --git a/pkgs/development/python-modules/signedjson/default.nix b/pkgs/development/python-modules/signedjson/default.nix index 12614a3446b..2f47113408e 100644 --- a/pkgs/development/python-modules/signedjson/default.nix +++ b/pkgs/development/python-modules/signedjson/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , canonicaljson diff --git a/pkgs/development/python-modules/sigtools/default.nix b/pkgs/development/python-modules/sigtools/default.nix index 0c11a2b6c56..1d81ba5180c 100644 --- a/pkgs/development/python-modules/sigtools/default.nix +++ b/pkgs/development/python-modules/sigtools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , repeated_test diff --git a/pkgs/development/python-modules/simanneal/default.nix b/pkgs/development/python-modules/simanneal/default.nix index 958f53be567..2d29797b28f 100644 --- a/pkgs/development/python-modules/simanneal/default.nix +++ b/pkgs/development/python-modules/simanneal/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonPackage, pytest }: +{ lib, fetchFromGitHub, buildPythonPackage, pytest }: buildPythonPackage rec { pname = "simanneal"; diff --git a/pkgs/development/python-modules/simple-websocket-server/default.nix b/pkgs/development/python-modules/simple-websocket-server/default.nix index f8d579b6088..7228e6d9f3e 100644 --- a/pkgs/development/python-modules/simple-websocket-server/default.nix +++ b/pkgs/development/python-modules/simple-websocket-server/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub }: +{ lib, buildPythonPackage, fetchFromGitHub }: buildPythonPackage { pname = "simple-websocket-server"; diff --git a/pkgs/development/python-modules/simpleai/default.nix b/pkgs/development/python-modules/simpleai/default.nix index 0786ebfae6e..2ad7fe9ba28 100644 --- a/pkgs/development/python-modules/simpleai/default.nix +++ b/pkgs/development/python-modules/simpleai/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , numpy diff --git a/pkgs/development/python-modules/simplebayes/default.nix b/pkgs/development/python-modules/simplebayes/default.nix index b7dd0310a08..06fe8e236b3 100644 --- a/pkgs/development/python-modules/simplebayes/default.nix +++ b/pkgs/development/python-modules/simplebayes/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , nose @@ -21,7 +21,7 @@ buildPythonPackage { checkInputs = [ nose mock ]; - postPatch = stdenv.lib.optionalString isPy3k '' + postPatch = lib.optionalString isPy3k '' sed -i -e 's/open *(\([^)]*\))/open(\1, encoding="utf-8")/' setup.py ''; diff --git a/pkgs/development/python-modules/simpleparse/default.nix b/pkgs/development/python-modules/simpleparse/default.nix index 6395f4af223..e81a7d41b7a 100644 --- a/pkgs/development/python-modules/simpleparse/default.nix +++ b/pkgs/development/python-modules/simpleparse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/sip/5.x.nix b/pkgs/development/python-modules/sip/5.x.nix new file mode 100644 index 00000000000..cebffd5765b --- /dev/null +++ b/pkgs/development/python-modules/sip/5.x.nix @@ -0,0 +1,26 @@ +{ lib, fetchPypi, buildPythonPackage, packaging, toml }: + +buildPythonPackage rec { + pname = "sip"; + version = "5.5.0"; + + src = fetchPypi { + pname = "sip"; + inherit version; + sha256 = "1idaivamp1jvbbai9yzv471c62xbqxhaawccvskaizihkd0lq0jx"; + }; + + propagatedBuildInputs = [ packaging toml ]; + + # There aren't tests + doCheck = false; + + pythonImportsCheck = [ "sipbuild" ]; + + meta = with lib; { + description = "Creates C++ bindings for Python modules"; + homepage = "http://www.riverbankcomputing.co.uk/"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ eduardosm ]; + }; +} diff --git a/pkgs/development/python-modules/sipsimple/default.nix b/pkgs/development/python-modules/sipsimple/default.nix index d7791fcf96c..568ce67d143 100644 --- a/pkgs/development/python-modules/sipsimple/default.nix +++ b/pkgs/development/python-modules/sipsimple/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { export LD=$CC ''; - nativeBuildInputs = [ pkgs.pkgconfig ]; + nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = with pkgs; [ alsaLib ffmpeg_3 libv4l sqlite libvpx ]; propagatedBuildInputs = [ cython pkgs.openssl dnspython dateutil xcaplib msrplib lxml python-otr ]; diff --git a/pkgs/development/python-modules/skein/default.nix b/pkgs/development/python-modules/skein/default.nix index 40a17926427..ad7cc021439 100644 --- a/pkgs/development/python-modules/skein/default.nix +++ b/pkgs/development/python-modules/skein/default.nix @@ -5,7 +5,7 @@ , jre , lib , pythonPackages -, stdenv + }: let diff --git a/pkgs/development/python-modules/skein/skeinrepo.nix b/pkgs/development/python-modules/skein/skeinrepo.nix index 85b4f19c8f7..d7bdef56ebe 100644 --- a/pkgs/development/python-modules/skein/skeinrepo.nix +++ b/pkgs/development/python-modules/skein/skeinrepo.nix @@ -7,8 +7,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ maven ] ++ lib.optional stdenv.isLinux autoPatchelfHook; - doBuild = false; - installPhase = '' mkdir -p $out diff --git a/pkgs/development/python-modules/sklearn-deap/default.nix b/pkgs/development/python-modules/sklearn-deap/default.nix index 36ec8b18ca7..958fc613f6f 100644 --- a/pkgs/development/python-modules/sklearn-deap/default.nix +++ b/pkgs/development/python-modules/sklearn-deap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, numpy, scipy, deap, scikitlearn, python }: +{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, numpy, scipy, deap, scikitlearn, python }: buildPythonPackage rec { pname = "sklearn-deap"; diff --git a/pkgs/development/python-modules/slackclient/default.nix b/pkgs/development/python-modules/slackclient/default.nix index 571398b783d..a690788095e 100644 --- a/pkgs/development/python-modules/slackclient/default.nix +++ b/pkgs/development/python-modules/slackclient/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , aiohttp diff --git a/pkgs/development/python-modules/sleekxmpp/default.nix b/pkgs/development/python-modules/sleekxmpp/default.nix index e6d5e59a80e..07be197f276 100644 --- a/pkgs/development/python-modules/sleekxmpp/default.nix +++ b/pkgs/development/python-modules/sleekxmpp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, dns, pyasn1 }: +{ lib, fetchPypi, buildPythonPackage, dns, pyasn1 }: buildPythonPackage rec { pname = "sleekxmpp"; diff --git a/pkgs/development/python-modules/slicer/default.nix b/pkgs/development/python-modules/slicer/default.nix index b5521f415d7..83f3e412ddc 100644 --- a/pkgs/development/python-modules/slicer/default.nix +++ b/pkgs/development/python-modules/slicer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/pkgs/development/python-modules/slicerator/default.nix b/pkgs/development/python-modules/slicerator/default.nix index 39669220003..191159a648e 100644 --- a/pkgs/development/python-modules/slicerator/default.nix +++ b/pkgs/development/python-modules/slicerator/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , python diff --git a/pkgs/development/python-modules/slob/default.nix b/pkgs/development/python-modules/slob/default.nix index a7520c62a62..0caec499a95 100644 --- a/pkgs/development/python-modules/slob/default.nix +++ b/pkgs/development/python-modules/slob/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , isPy3k diff --git a/pkgs/development/python-modules/slowaes/default.nix b/pkgs/development/python-modules/slowaes/default.nix index 5d738fea57e..ddca8509744 100644 --- a/pkgs/development/python-modules/slowaes/default.nix +++ b/pkgs/development/python-modules/slowaes/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/smartdc/default.nix b/pkgs/development/python-modules/smartdc/default.nix index 0b36a7e9f6e..ceba9eae9e4 100644 --- a/pkgs/development/python-modules/smartdc/default.nix +++ b/pkgs/development/python-modules/smartdc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , requests diff --git a/pkgs/development/python-modules/smartypants/default.nix b/pkgs/development/python-modules/smartypants/default.nix index a497f3db413..d1e11e30d61 100644 --- a/pkgs/development/python-modules/smartypants/default.nix +++ b/pkgs/development/python-modules/smartypants/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchhg , isPyPy diff --git a/pkgs/development/python-modules/snakeviz/default.nix b/pkgs/development/python-modules/snakeviz/default.nix index 2c54f65d9c3..42602f15e9b 100644 --- a/pkgs/development/python-modules/snakeviz/default.nix +++ b/pkgs/development/python-modules/snakeviz/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, tornado }: +{ lib, fetchPypi, buildPythonPackage, tornado }: buildPythonPackage rec { pname = "snakeviz"; diff --git a/pkgs/development/python-modules/snapcast/default.nix b/pkgs/development/python-modules/snapcast/default.nix index 8446683cb1a..c5df9f7d991 100644 --- a/pkgs/development/python-modules/snapcast/default.nix +++ b/pkgs/development/python-modules/snapcast/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, pytest +{ lib, buildPythonPackage, fetchPypi, isPy3k, pytest , construct }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/snappergui/default.nix b/pkgs/development/python-modules/snappergui/default.nix deleted file mode 100644 index d63390185a9..00000000000 --- a/pkgs/development/python-modules/snappergui/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv -, buildPythonPackage -, fetchgit -, pygobject3 -, dbus-python -}: - -buildPythonPackage { - pname = "Snapper-GUI"; - version = "0.1"; - - src = fetchgit { - url = "https://github.com/ricardomv/snapper-gui"; - rev = "11d98586b122180c75a86fccda45c4d7e3137591"; - sha256 = "7a9f86fc17dbf130526e70c3e925eac30e2c74d6b932efbf7e7cd9fbba6dc4b1"; - }; - - # no tests available - doCheck = false; - - propagatedBuildInputs = [ pygobject3 dbus-python ]; - - meta = with lib; { - homepage = "https://github.com/ricardomv/snapper-gui"; - description = "Graphical frontend for snapper"; - license = licenses.gpl2; - maintainers = with maintainers; [ tstrobel ]; - }; - -} diff --git a/pkgs/development/python-modules/snowballstemmer/default.nix b/pkgs/development/python-modules/snowballstemmer/default.nix index 3364470da1b..84b2bb2e143 100644 --- a/pkgs/development/python-modules/snowballstemmer/default.nix +++ b/pkgs/development/python-modules/snowballstemmer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, PyStemmer, fetchPypi }: +{ lib, buildPythonPackage, PyStemmer, fetchPypi }: buildPythonPackage rec { pname = "snowballstemmer"; diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix index 3e958a3076c..96f489ec6ed 100644 --- a/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -25,12 +25,12 @@ buildPythonPackage rec { pname = "snowflake-connector-python"; - version = "2.3.6"; + version = "2.3.8"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1a4ebf25989fc13d6f70dc3e2064721c54834e493a7964a1d67be61d40e75f50"; + sha256 = "sha256-zsS5+0UGDwZM65MILfgAvZ67AbXGcLsVmGacgoxX530="; }; propagatedBuildInputs = [ @@ -59,6 +59,7 @@ buildPythonPackage rec { substituteInPlace setup.py \ --replace "'boto3>=1.4.4,<1.16'," "'boto3~=1.16'," \ --replace "'cryptography>=2.5.0,<3.0.0'," "'cryptography'," \ + --replace "'pyOpenSSL>=16.2.0,<20.0.0'," "'pyOpenSSL'," \ --replace "'idna<2.10'," "'idna'," \ --replace "'requests<2.24.0'," "'requests'," ''; diff --git a/pkgs/development/python-modules/socksipy-branch/default.nix b/pkgs/development/python-modules/socksipy-branch/default.nix index ca9d8707ac6..abfee3718b5 100644 --- a/pkgs/development/python-modules/socksipy-branch/default.nix +++ b/pkgs/development/python-modules/socksipy-branch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/somajo/default.nix b/pkgs/development/python-modules/somajo/default.nix index bd351b5e86f..54cd9beede3 100644 --- a/pkgs/development/python-modules/somajo/default.nix +++ b/pkgs/development/python-modules/somajo/default.nix @@ -1,23 +1,26 @@ -{ pkgs, lib, stdenv, fetchFromGitHub, buildPythonPackage, isPy3k, regex }: +{ lib, stdenv, fetchFromGitHub, buildPythonPackage, isPy3k, regex }: buildPythonPackage rec { pname = "SoMaJo"; - version = "2.1.1"; + version = "2.1.2"; disabled = !isPy3k; src = fetchFromGitHub { owner = "tsproisl"; repo = pname; rev = "v${version}"; - sha256 = "0yj3yb0qvfdv4wh7nzcsh9in8nzk7b59dvjj0x02rsmlv4kw9ah1"; + sha256 = "1c4g8nhlcc348w0axdswv69q8k3qxwbnvim1yf7vagd0adv83gsj"; }; propagatedBuildInputs = [ regex ]; + # loops forever + doCheck = !stdenv.isDarwin; + meta = with lib; { description = "Tokenizer and sentence splitter for German and English web texts"; homepage = "https://github.com/tsproisl/SoMaJo"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ danieldk ]; }; } diff --git a/pkgs/development/python-modules/sopel/default.nix b/pkgs/development/python-modules/sopel/default.nix index 095c0917e59..7b549933588 100644 --- a/pkgs/development/python-modules/sopel/default.nix +++ b/pkgs/development/python-modules/sopel/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPyPy +{ lib, buildPythonPackage, fetchPypi, isPyPy , dnspython , geoip2 , ipython diff --git a/pkgs/development/python-modules/sorl_thumbnail/default.nix b/pkgs/development/python-modules/sorl_thumbnail/default.nix index e918a1aee3b..daeca60c1e1 100644 --- a/pkgs/development/python-modules/sorl_thumbnail/default.nix +++ b/pkgs/development/python-modules/sorl_thumbnail/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/pkgs/development/python-modules/sortedcollections/default.nix b/pkgs/development/python-modules/sortedcollections/default.nix index 7bdeeffc086..9f9f99a1856 100644 --- a/pkgs/development/python-modules/sortedcollections/default.nix +++ b/pkgs/development/python-modules/sortedcollections/default.nix @@ -1,24 +1,28 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub +, pytest-cov , pytestCheckHook , sortedcontainers }: buildPythonPackage rec { pname = "sortedcollections"; - version = "1.2.3"; + version = "2.1.0"; src = fetchFromGitHub { owner = "grantjenks"; repo = "python-sortedcollections"; rev = "v${version}"; - sha256 = "06ifkbhkj5fpsafibw0fs7b778g7q0gd03crvbjk04k0f3wjxc5z"; + sha256 = "sha256-GkZO8afUAgDpDjIa3dhO6nxykqrljeKldunKMODSXfg="; }; propagatedBuildInputs = [ sortedcontainers ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytest-cov + pytestCheckHook + ]; pythonImportsCheck = [ "sortedcollections" ]; diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index e13127abeb3..eef7b116b89 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -71,6 +71,6 @@ buildPythonPackage rec { description = "Industrial-strength Natural Language Processing (NLP) with Python and Cython"; homepage = "https://github.com/explosion/spaCy"; license = licenses.mit; - maintainers = with maintainers; [ danieldk sdll ]; + maintainers = with maintainers; [ sdll ]; }; } diff --git a/pkgs/development/python-modules/spacy/models.nix b/pkgs/development/python-modules/spacy/models.nix index 4279383ae6b..8c57d2e0d26 100644 --- a/pkgs/development/python-modules/spacy/models.nix +++ b/pkgs/development/python-modules/spacy/models.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchurl, jieba, pkuseg, spacy }: +{ lib, buildPythonPackage, fetchurl, jieba, pkuseg, spacy }: let buildModelPackage = { pname, version, sha256, license }: let @@ -24,8 +24,8 @@ let }; }; - makeModelSet = models: with stdenv.lib; listToAttrs (map (m: nameValuePair m.pname (buildModelPackage m)) models); + makeModelSet = models: with lib; listToAttrs (map (m: nameValuePair m.pname (buildModelPackage m)) models); -in makeModelSet (stdenv.lib.importJSON ./models.json) +in makeModelSet (lib.importJSON ./models.json) # cat models.json | jq -r '.[] | @uri "https://github.com/explosion/spacy-models/releases/download/\(.pname)-\(.version)/\(.pname)-\(.version).tar.gz"' | xargs -n1 nix-prefetch-url diff --git a/pkgs/development/python-modules/spark_parser/default.nix b/pkgs/development/python-modules/spark_parser/default.nix index cfb641ddcfb..fb30daf81fe 100644 --- a/pkgs/development/python-modules/spark_parser/default.nix +++ b/pkgs/development/python-modules/spark_parser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ click ]; meta = with lib; { - description = ''An Early-Algorithm Context-free grammar Parser''; + description = "An Early-Algorithm Context-free grammar Parser"; homepage = "https://github.com/rocky/python-spark"; license = licenses.mit; maintainers = with maintainers; [raskin]; diff --git a/pkgs/development/python-modules/sparqlwrapper/default.nix b/pkgs/development/python-modules/sparqlwrapper/default.nix index b97cbee2a5f..41c11172d9b 100644 --- a/pkgs/development/python-modules/sparqlwrapper/default.nix +++ b/pkgs/development/python-modules/sparqlwrapper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/pkgs/development/python-modules/speaklater/default.nix b/pkgs/development/python-modules/speaklater/default.nix index efb0908dc5f..a9acfb2dbb3 100644 --- a/pkgs/development/python-modules/speaklater/default.nix +++ b/pkgs/development/python-modules/speaklater/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/spglib/default.nix b/pkgs/development/python-modules/spglib/default.nix index 08bbb34156b..88da35a0f97 100644 --- a/pkgs/development/python-modules/spglib/default.nix +++ b/pkgs/development/python-modules/spglib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, numpy, nose, pyyaml }: +{ lib, buildPythonPackage, fetchPypi, fetchpatch, numpy, nose, pyyaml }: buildPythonPackage rec { pname = "spglib"; diff --git a/pkgs/development/python-modules/sphinx-autobuild/default.nix b/pkgs/development/python-modules/sphinx-autobuild/default.nix new file mode 100644 index 00000000000..958c1a6b19c --- /dev/null +++ b/pkgs/development/python-modules/sphinx-autobuild/default.nix @@ -0,0 +1,30 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, sphinx +, livereload +}: + +buildPythonPackage rec { + pname = "sphinx-autobuild"; + version = "2020.9.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1vbaf4vrxahylyp8zrlw5dx1d2faajp926c3pl5i1wlkp1yll62b"; + }; + + propagatedBuildInputs = [ sphinx livereload ]; + + # No tests included. + doCheck = false; + pythonImportsCheck = [ "sphinx_autobuild" ]; + + meta = with lib; { + description = "Rebuild Sphinx documentation on changes, with live-reload in the browser"; + homepage = "https://github.com/executablebooks/sphinx-autobuild"; + license = with licenses; [ mit ]; + maintainer = with maintainers; [holgerpeters]; + }; +} diff --git a/pkgs/development/python-modules/sphinx_pypi_upload/default.nix b/pkgs/development/python-modules/sphinx_pypi_upload/default.nix index 77f283795db..d2c20e980e7 100644 --- a/pkgs/development/python-modules/sphinx_pypi_upload/default.nix +++ b/pkgs/development/python-modules/sphinx_pypi_upload/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/sphinx_rtd_theme/default.nix b/pkgs/development/python-modules/sphinx_rtd_theme/default.nix index 11e3c2a87e9..87da4131351 100644 --- a/pkgs/development/python-modules/sphinx_rtd_theme/default.nix +++ b/pkgs/development/python-modules/sphinx_rtd_theme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , sphinx diff --git a/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix index e2bfc5bdaa5..9c3c16657f2 100644 --- a/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix b/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix index 6822c0f153d..068c4d5d2e9 100644 --- a/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonOlder diff --git a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix index bc9a90efcf2..b429522f9d3 100644 --- a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix @@ -1,5 +1,11 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k -, oset, pybtex, pybtex-docutils, sphinx +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +, oset +, pybtex +, pybtex-docutils +, sphinx }: buildPythonPackage rec { @@ -15,10 +21,13 @@ buildPythonPackage rec { propagatedBuildInputs = [ oset pybtex pybtex-docutils sphinx ]; - meta = { + doCheck = false; + pythonImportsCheck = [ "sphinxcontrib.bibtex" ]; + + meta = with lib; { description = "A Sphinx extension for BibTeX style citations"; homepage = "https://github.com/mcmtroffaes/sphinxcontrib-bibtex"; - license = stdenv.lib.licenses.bsd2; + license = licenses.bsd2; + maintainers = with maintainers; [ SuperSandro2000 ]; }; - } diff --git a/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix b/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix index a2603b876e5..956e3c033b9 100644 --- a/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , python diff --git a/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix index 7398cbc433f..1f33c06b984 100644 --- a/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix index 150840f19b4..8ca631a2b3c 100644 --- a/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix b/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix index 609799f1864..cd67732605b 100644 --- a/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix index 6375bdab3c2..a9548305d3b 100644 --- a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix index adf02860d12..9d16ede62a2 100644 --- a/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix b/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix index 52ebe15c1b6..b898e9cb67d 100644 --- a/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix index a3054f34145..2b5beb4df07 100644 --- a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , buildPythonPackage , fetchPypi , pythonOlder diff --git a/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix b/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix index ee652b42d8a..21ada23d47f 100644 --- a/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , sphinx diff --git a/pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix b/pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix index 2d56b57df9b..a298025f8ba 100644 --- a/pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , sphinx diff --git a/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix b/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix index db8997dfd21..e028b6eea80 100644 --- a/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , sphinx diff --git a/pkgs/development/python-modules/spinners/default.nix b/pkgs/development/python-modules/spinners/default.nix new file mode 100644 index 00000000000..1e71296fd17 --- /dev/null +++ b/pkgs/development/python-modules/spinners/default.nix @@ -0,0 +1,26 @@ +{ buildPythonPackage +, fetchPypi +, isPy27 +, lib }: + +buildPythonPackage rec { + pname = "spinners"; + version = "0.0.24"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "0zz2z6dpdjdq5z8m8w8dfi8by0ih1zrdq0caxm1anwhxg2saxdhy"; + }; + + # Tests are not included in the PyPI distribution and the git repo does not have tagged releases + doCheck = false; + pythonImportsCheck = [ "spinners" ]; + + meta = with lib; { + description = "Spinners for the Terminal."; + homepage = "https://github.com/manrajgrover/py-spinners"; + license = licenses.mit; + maintainers = with maintainers; [ urbas ]; + }; +} diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix index e0a8d6b9c18..9533db6e4a7 100644 --- a/pkgs/development/python-modules/spyder-kernels/default.nix +++ b/pkgs/development/python-modules/spyder-kernels/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, cloudpickle, ipykernel, wurlitzer, +{ lib, buildPythonPackage, fetchPypi, cloudpickle, ipykernel, wurlitzer, jupyter_client, pyzmq }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/spyder/3.nix b/pkgs/development/python-modules/spyder/3.nix index 34d59d0eb22..0fb98fa38e3 100644 --- a/pkgs/development/python-modules/spyder/3.nix +++ b/pkgs/development/python-modules/spyder/3.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, jedi, pycodestyle, +{ lib, buildPythonPackage, fetchFromGitHub, jedi, pycodestyle, psutil, pyflakes, rope, pylint, keyring, numpydoc, qtconsole, qtawesome, nbconvert, mccabe, pyopengl, cloudpickle, pygments, spyder-kernels_0_5, qtpy, pyzmq, chardet, pyqtwebengine diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix index de1b8123dd9..c41ef74c5b1 100644 --- a/pkgs/development/python-modules/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -1,8 +1,9 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, makeDesktopItem, intervaltree, jedi, pycodestyle, - psutil, pyflakes, rope, numpy, scipy, matplotlib, pylint, keyring, numpydoc, - qtconsole, qtawesome, nbconvert, mccabe, pyopengl, cloudpickle, pygments, - spyder-kernels, qtpy, pyzmq, chardet, qdarkstyle, watchdog, python-language-server -, pyqtwebengine, atomicwrites, pyxdg, diff-match-patch, three-merge, pyls-black, pyls-spyder +{ lib, buildPythonPackage, fetchPypi, isPy27, makeDesktopItem, intervaltree, + jedi, pycodestyle, psutil, pyflakes, rope, numpy, scipy, matplotlib, pylint, + keyring, numpydoc, qtconsole, qtawesome, nbconvert, mccabe, pyopengl, + cloudpickle, pygments, spyder-kernels, qtpy, pyzmq, chardet, qdarkstyle, + watchdog, python-language-server, pyqtwebengine, atomicwrites, pyxdg, + diff-match-patch, three-merge, pyls-black, pyls-spyder, flake8 }: buildPythonPackage rec { @@ -23,6 +24,7 @@ buildPythonPackage rec { numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels pygments qtpy pyzmq chardet pyqtwebengine qdarkstyle watchdog python-language-server atomicwrites pyxdg diff-match-patch three-merge pyls-black pyls-spyder + flake8 ]; # There is no test for spyder @@ -44,8 +46,7 @@ buildPythonPackage rec { sed -i /pyqtwebengine/d setup.py substituteInPlace setup.py \ --replace "pyqt5<5.13" "pyqt5" \ - --replace "parso==0.7.0" "parso" \ - --replace "jedi==0.17.1" "jedi" + --replace "parso==0.7.0" "parso" ''; postInstall = '' diff --git a/pkgs/development/python-modules/sqlalchemy-continuum/default.nix b/pkgs/development/python-modules/sqlalchemy-continuum/default.nix index 4050adc29f5..33b408240fc 100644 --- a/pkgs/development/python-modules/sqlalchemy-continuum/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-continuum/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , fetchPypi , buildPythonPackage , flask diff --git a/pkgs/development/python-modules/sqlalchemy-i18n/default.nix b/pkgs/development/python-modules/sqlalchemy-i18n/default.nix index 4ef0adefe3e..84be4587e66 100644 --- a/pkgs/development/python-modules/sqlalchemy-i18n/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-i18n/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , fetchPypi , buildPythonPackage , sqlalchemy diff --git a/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix b/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix index 6a8c910cfce..15ac7dc3a55 100644 --- a/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , pytest , Wand diff --git a/pkgs/development/python-modules/sqlite-utils/default.nix b/pkgs/development/python-modules/sqlite-utils/default.nix index 99a6369de55..2bb700f6755 100644 --- a/pkgs/development/python-modules/sqlite-utils/default.nix +++ b/pkgs/development/python-modules/sqlite-utils/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "sqlite-utils"; - version = "3.2"; + version = "3.3"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "83d60e0f0de5e4a367e2ad414dc008c0602e2af35325b09e41c7b2c69808dcc1"; + sha256 = "1linla3za1gb3w0n0k6h3q8in62qhipizff259p14gzmyr95rjjv"; }; propagatedBuildInputs = [ @@ -37,11 +37,6 @@ buildPythonPackage rec { hypothesis ]; - # disabled until upstream updates tests - disabledTests = lib.optionals (lib.versionAtLeast sqlite.version "3.34.0") [ - "test_optimize" - ]; - meta = with lib; { description = "Python CLI utility and library for manipulating SQLite databases"; homepage = "https://github.com/simonw/sqlite-utils"; diff --git a/pkgs/development/python-modules/sqlite3dbm/default.nix b/pkgs/development/python-modules/sqlite3dbm/default.nix index 1d0b3f15c3f..3057f89adf4 100644 --- a/pkgs/development/python-modules/sqlite3dbm/default.nix +++ b/pkgs/development/python-modules/sqlite3dbm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/sqlobject/default.nix b/pkgs/development/python-modules/sqlobject/default.nix index ccbc6659fe3..f3c438342bc 100644 --- a/pkgs/development/python-modules/sqlobject/default.nix +++ b/pkgs/development/python-modules/sqlobject/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/pkgs/development/python-modules/squaremap/default.nix b/pkgs/development/python-modules/squaremap/default.nix index c17a88435dd..bab9e2f99f2 100644 --- a/pkgs/development/python-modules/squaremap/default.nix +++ b/pkgs/development/python-modules/squaremap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , isPy3k , fetchPypi diff --git a/pkgs/development/python-modules/srp/default.nix b/pkgs/development/python-modules/srp/default.nix index 2afbb22d64e..c0d3a0a4aed 100644 --- a/pkgs/development/python-modules/srp/default.nix +++ b/pkgs/development/python-modules/srp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, six, lib }: +{ buildPythonPackage, fetchPypi, six, lib }: buildPythonPackage rec { pname = "srp"; diff --git a/pkgs/development/python-modules/srptools/default.nix b/pkgs/development/python-modules/srptools/default.nix index f130009d30d..68ca009d9dc 100644 --- a/pkgs/development/python-modules/srptools/default.nix +++ b/pkgs/development/python-modules/srptools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, six, pytest, pytestrunner }: +{ lib, buildPythonPackage, fetchPypi, six, pytest, pytestrunner }: buildPythonPackage rec { pname = "srptools"; diff --git a/pkgs/development/python-modules/srsly/default.nix b/pkgs/development/python-modules/srsly/default.nix index 42320e50fa8..ab7dea9cf53 100644 --- a/pkgs/development/python-modules/srsly/default.nix +++ b/pkgs/development/python-modules/srsly/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , buildPythonPackage , fetchPypi , pythonOlder @@ -41,6 +40,5 @@ buildPythonPackage rec { description = "Modern high-performance serialization utilities for Python"; homepage = "https://github.com/explosion/srsly"; license = licenses.mit; - maintainers = with maintainers; [ danieldk ]; }; } diff --git a/pkgs/development/python-modules/srvlookup/default.nix b/pkgs/development/python-modules/srvlookup/default.nix index c399ee760fd..f325d40ba92 100644 --- a/pkgs/development/python-modules/srvlookup/default.nix +++ b/pkgs/development/python-modules/srvlookup/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage +{ lib, fetchPypi, buildPythonPackage , dnspython , mock, nose }: diff --git a/pkgs/development/python-modules/ssdeep/default.nix b/pkgs/development/python-modules/ssdeep/default.nix index 8300c3ec2f6..904595865b8 100644 --- a/pkgs/development/python-modules/ssdeep/default.nix +++ b/pkgs/development/python-modules/ssdeep/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pkgs diff --git a/pkgs/development/python-modules/ssdp/default.nix b/pkgs/development/python-modules/ssdp/default.nix index 82ea4b066a3..ac39cffa393 100644 --- a/pkgs/development/python-modules/ssdp/default.nix +++ b/pkgs/development/python-modules/ssdp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/pkgs/development/python-modules/sseclient/default.nix b/pkgs/development/python-modules/sseclient/default.nix index 9d944e112fe..6bbeb23ed1f 100644 --- a/pkgs/development/python-modules/sseclient/default.nix +++ b/pkgs/development/python-modules/sseclient/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27 +{ lib, buildPythonPackage, fetchPypi, isPy27 , requests, six , backports_unittest-mock, pytestCheckHook, pytestrunner }: diff --git a/pkgs/development/python-modules/sslib/default.nix b/pkgs/development/python-modules/sslib/default.nix index 026ac8a30b7..407053785f0 100644 --- a/pkgs/development/python-modules/sslib/default.nix +++ b/pkgs/development/python-modules/sslib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, isPy3k }: +{ lib, fetchPypi, buildPythonPackage, isPy3k }: buildPythonPackage rec { pname = "sslib"; diff --git a/pkgs/development/python-modules/starkbank-ecdsa/default.nix b/pkgs/development/python-modules/starkbank-ecdsa/default.nix new file mode 100644 index 00000000000..70b66b9a468 --- /dev/null +++ b/pkgs/development/python-modules/starkbank-ecdsa/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "starkbank-ecdsa"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "starkbank"; + repo = "ecdsa-python"; + rev = "v${version}"; + sha256 = "03smk33zhmv1j1svgjnykak0jnw8yl0yv03i1gsasx71f33zmfwi"; + }; + + checkInputs = [ pytestCheckHook ]; + pytestFlagsArray = [ "-v tests/*.py" ]; + pythonImportsCheck = [ "ellipticcurve" ]; + + meta = with lib; { + description = "Python ECDSA library"; + homepage = "https://github.com/starkbank/ecdsa-python"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/staticjinja/default.nix b/pkgs/development/python-modules/staticjinja/default.nix index d49bae2eab9..a49f6a4fdfc 100644 --- a/pkgs/development/python-modules/staticjinja/default.nix +++ b/pkgs/development/python-modules/staticjinja/default.nix @@ -6,12 +6,16 @@ , easywatch , jinja2 , pytestCheckHook +, pytest-check +, fetchPypi , markdown +, sphinx +, sphinx_rtd_theme }: buildPythonPackage rec { pname = "staticjinja"; - version = "0.4.0"; + version = "1.0.3"; disabled = isPy27; # 0.4.0 drops python2 support @@ -21,7 +25,7 @@ buildPythonPackage rec { owner = "staticjinja"; repo = pname; rev = version; - sha256 = "0pysk8pzmcg1nfxz8m4i6bvww71w2zg6xp33zgg5vrf8yd2dfx9i"; + sha256 = "12rpv5gv64i5j4w98wm1444xnnmarcn3pg783j3fkkzc58lk5wwj"; }; propagatedBuildInputs = [ @@ -32,13 +36,18 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook + pytest-check markdown + sphinx_rtd_theme + sphinx ]; - # Import paths differ by a "build/lib" subdirectory, but the files are - # the same, so we ignore import mismatches. preCheck = '' + # Import paths differ by a "build/lib" subdirectory, but the files are + # the same, so we ignore import mismatches. export PY_IGNORE_IMPORTMISMATCH=1 + # The tests need to find and call the installed staticjinja executable + export PATH="$PATH:$out/bin"; ''; meta = with lib; { diff --git a/pkgs/development/python-modules/statsd/default.nix b/pkgs/development/python-modules/statsd/default.nix index 447fed3263c..561a1d14ca4 100644 --- a/pkgs/development/python-modules/statsd/default.nix +++ b/pkgs/development/python-modules/statsd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/pkgs/development/python-modules/stompclient/default.nix b/pkgs/development/python-modules/stompclient/default.nix index 17bafbad282..149be55da58 100644 --- a/pkgs/development/python-modules/stompclient/default.nix +++ b/pkgs/development/python-modules/stompclient/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/strict-rfc3339/default.nix b/pkgs/development/python-modules/strict-rfc3339/default.nix index 53701999b02..e76365a525a 100644 --- a/pkgs/development/python-modules/strict-rfc3339/default.nix +++ b/pkgs/development/python-modules/strict-rfc3339/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "strict-rfc3339"; diff --git a/pkgs/development/python-modules/stringcase/default.nix b/pkgs/development/python-modules/stringcase/default.nix index 10afb511393..e02cc0384f9 100644 --- a/pkgs/development/python-modules/stringcase/default.nix +++ b/pkgs/development/python-modules/stringcase/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, lib, stdenv +{ buildPythonPackage, fetchPypi, lib }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/stringtemplate/default.nix b/pkgs/development/python-modules/stringtemplate/default.nix index c70cac59920..8bdb69a3074 100644 --- a/pkgs/development/python-modules/stringtemplate/default.nix +++ b/pkgs/development/python-modules/stringtemplate/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, buildPythonPackage, antlr, isPy3k}: +{ lib, fetchurl, buildPythonPackage, antlr, isPy3k }: buildPythonPackage rec { pname = "PyStringTemplate"; @@ -16,9 +16,9 @@ buildPythonPackage rec { # No tests included in archive doCheck = false; - meta = { + meta = with lib; { homepage = "https://www.stringtemplate.org/"; description = "Text Templating Library"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/development/python-modules/subdownloader/default.nix b/pkgs/development/python-modules/subdownloader/default.nix index 2dac94ac15d..2b536fa0e62 100644 --- a/pkgs/development/python-modules/subdownloader/default.nix +++ b/pkgs/development/python-modules/subdownloader/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , mmpython diff --git a/pkgs/development/python-modules/suds-jurko/default.nix b/pkgs/development/python-modules/suds-jurko/default.nix index 4bf74fe00b4..af307919387 100644 --- a/pkgs/development/python-modules/suds-jurko/default.nix +++ b/pkgs/development/python-modules/suds-jurko/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPyPy diff --git a/pkgs/development/python-modules/suds/default.nix b/pkgs/development/python-modules/suds/default.nix index 24425fef95f..1a96df26da1 100644 --- a/pkgs/development/python-modules/suds/default.nix +++ b/pkgs/development/python-modules/suds/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/sumo/default.nix b/pkgs/development/python-modules/sumo/default.nix index e647cd4a9d2..e1b3d8c705e 100644 --- a/pkgs/development/python-modules/sumo/default.nix +++ b/pkgs/development/python-modules/sumo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy27 +{ lib, buildPythonPackage, fetchFromGitHub, isPy27 , h5py , matplotlib , numpy diff --git a/pkgs/development/python-modules/sure/default.nix b/pkgs/development/python-modules/sure/default.nix index efff79f679f..ee21e9c4516 100644 --- a/pkgs/development/python-modules/sure/default.nix +++ b/pkgs/development/python-modules/sure/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , rednose diff --git a/pkgs/development/python-modules/survey/default.nix b/pkgs/development/python-modules/survey/default.nix index f9bec0451ff..436127fae9c 100644 --- a/pkgs/development/python-modules/survey/default.nix +++ b/pkgs/development/python-modules/survey/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , wrapio diff --git a/pkgs/development/python-modules/svg-path/default.nix b/pkgs/development/python-modules/svg-path/default.nix index 585dbf64b3c..820d4121633 100644 --- a/pkgs/development/python-modules/svg-path/default.nix +++ b/pkgs/development/python-modules/svg-path/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "svg.path"; version = "4.0.2"; diff --git a/pkgs/development/python-modules/svg2tikz/default.nix b/pkgs/development/python-modules/svg2tikz/default.nix index fb0475ef3b9..38516ab73c3 100644 --- a/pkgs/development/python-modules/svg2tikz/default.nix +++ b/pkgs/development/python-modules/svg2tikz/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchgit , lxml diff --git a/pkgs/development/python-modules/swagger-ui-bundle/default.nix b/pkgs/development/python-modules/swagger-ui-bundle/default.nix index 613de201b2d..9dbd29739fe 100644 --- a/pkgs/development/python-modules/swagger-ui-bundle/default.nix +++ b/pkgs/development/python-modules/swagger-ui-bundle/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, jinja2, flake8 }: +{ lib, buildPythonPackage, fetchPypi, jinja2, flake8 }: buildPythonPackage rec { pname = "swagger-ui-bundle"; diff --git a/pkgs/development/python-modules/swisshydrodata/default.nix b/pkgs/development/python-modules/swisshydrodata/default.nix new file mode 100644 index 00000000000..f4f191d2b42 --- /dev/null +++ b/pkgs/development/python-modules/swisshydrodata/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +}: + +buildPythonPackage rec { + pname = "swisshydrodata"; + version = "0.0.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "1adpy6k2bknffzl5rckqpvaqyrvc00d6a4a4541438dqasx61npl"; + }; + + propagatedBuildInputs = [ requests ]; + + # Tests are not releases at the moment + doCheck = false; + pythonImportsCheck = [ "swisshydrodata" ]; + + meta = with lib; { + description = "Python client to get data from the Swiss federal Office for Environment FEON"; + homepage = "https://github.com/bouni/swisshydrodata"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/swspotify/default.nix b/pkgs/development/python-modules/swspotify/default.nix index 321a48e72b6..e213e9e265e 100644 --- a/pkgs/development/python-modules/swspotify/default.nix +++ b/pkgs/development/python-modules/swspotify/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchFromGitHub, requests, flask-cors, dbus-python, pytestCheckHook, mock, isPy27 }: +{ lib, buildPythonPackage, fetchFromGitHub, requests, flask-cors, dbus-python, pytestCheckHook, mock, isPy27 }: buildPythonPackage rec { pname = "SwSpotify"; diff --git a/pkgs/development/python-modules/sybase/default.nix b/pkgs/development/python-modules/sybase/default.nix index 20c2a158a3b..5a14e7e7f40 100644 --- a/pkgs/development/python-modules/sybase/default.nix +++ b/pkgs/development/python-modules/sybase/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , isPy3k diff --git a/pkgs/development/python-modules/symbiflow-fasm/default.nix b/pkgs/development/python-modules/symbiflow-fasm/default.nix deleted file mode 100644 index 609987441ea..00000000000 --- a/pkgs/development/python-modules/symbiflow-fasm/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv -, pkgs -, fetchFromGitHub -, buildPythonPackage -, textx -}: - -buildPythonPackage rec { - pname = "symbiflow-fasm"; - version = "0.0.1-g4857dde"; - - src = fetchFromGitHub { - owner = "SymbiFlow"; - repo = "fasm"; - rev = "4857dde757edd88688c2faf808774d85bdbe3900"; - sha256 = "1za7f8slf8wvp1mfbfc3vdv61115p49k0vwngs4db6ips1qg1435"; - }; - - propagatedBuildInputs = [ textx ]; - - meta = with stdenv.lib; { - description = "FPGA Assembly (FASM) Parser and Generation library"; - homepage = "https://github.com/SymbiFlow/fasm"; - license = licenses.isc; - maintainers = with maintainers; [ mcaju ]; - }; -} diff --git a/pkgs/development/python-modules/systemd/default.nix b/pkgs/development/python-modules/systemd/default.nix index 63ad1023b87..86c330bd1d8 100644 --- a/pkgs/development/python-modules/systemd/default.nix +++ b/pkgs/development/python-modules/systemd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, systemd, pkgconfig }: +{ lib, buildPythonPackage, fetchFromGitHub, systemd, pkg-config }: buildPythonPackage rec { pname = "systemd"; @@ -12,7 +12,7 @@ buildPythonPackage rec { }; buildInputs = [ systemd ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; doCheck = false; diff --git a/pkgs/development/python-modules/sysv_ipc/default.nix b/pkgs/development/python-modules/sysv_ipc/default.nix index 87a81e4fb17..5d9b5a034c2 100644 --- a/pkgs/development/python-modules/sysv_ipc/default.nix +++ b/pkgs/development/python-modules/sysv_ipc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/tables/3.5.nix b/pkgs/development/python-modules/tables/3.5.nix index bf0eb51c851..efc47a1ad3f 100644 --- a/pkgs/development/python-modules/tables/3.5.nix +++ b/pkgs/development/python-modules/tables/3.5.nix @@ -1,8 +1,6 @@ -{ stdenv, lib, fetchPypi, python, buildPythonPackage +{ lib, fetchPypi, python, buildPythonPackage , cython, bzip2, lzo, numpy, numexpr, hdf5, six, c-blosc, mock }: -with stdenv.lib; - buildPythonPackage rec { version = "3.5.2"; pname = "tables"; @@ -18,10 +16,10 @@ buildPythonPackage rec { # The setup script complains about missing run-paths, but they are # actually set. setupPyBuildFlags = [ - "--hdf5=${getDev hdf5}" - "--lzo=${getDev lzo}" - "--bzip2=${getDev bzip2}" - "--blosc=${getDev c-blosc}" + "--hdf5=${lib.getDev hdf5}" + "--lzo=${lib.getDev lzo}" + "--bzip2=${lib.getDev bzip2}" + "--blosc=${lib.getDev c-blosc}" ]; # Run the test suite. # It requires the build path to be in the python search path. @@ -50,9 +48,9 @@ buildPythonPackage rec { # Disable tests until the failure described above is fixed. doCheck = false; - meta = { + meta = with lib; { description = "Hierarchical datasets for Python"; homepage = "http://www.pytables.org/"; - license = stdenv.lib.licenses.bsd2; + license = licenses.bsd2; }; } diff --git a/pkgs/development/python-modules/tables/default.nix b/pkgs/development/python-modules/tables/default.nix index cd2af0dc28d..fe49ab4d9ed 100644 --- a/pkgs/development/python-modules/tables/default.nix +++ b/pkgs/development/python-modules/tables/default.nix @@ -1,8 +1,6 @@ -{ stdenv, lib, fetchPypi, python, buildPythonPackage, isPy38 +{ lib, fetchPypi, python, buildPythonPackage, isPy38 , cython, bzip2, lzo, numpy, numexpr, hdf5, six, c-blosc, mock }: -with stdenv.lib; - buildPythonPackage rec { version = "3.6.1"; pname = "tables"; @@ -30,10 +28,10 @@ buildPythonPackage rec { # The setup script complains about missing run-paths, but they are # actually set. setupPyBuildFlags = [ - "--hdf5=${getDev hdf5}" - "--lzo=${getDev lzo}" - "--bzip2=${getDev bzip2}" - "--blosc=${getDev c-blosc}" + "--hdf5=${lib.getDev hdf5}" + "--lzo=${lib.getDev lzo}" + "--bzip2=${lib.getDev bzip2}" + "--blosc=${lib.getDev c-blosc}" ]; # Run the test suite. # It requires the build path to be in the python search path. @@ -62,9 +60,9 @@ buildPythonPackage rec { # Disable tests until the failure described above is fixed. doCheck = false; - meta = { + meta = with lib; { description = "Hierarchical datasets for Python"; homepage = "http://www.pytables.org/"; - license = stdenv.lib.licenses.bsd2; + license = licenses.bsd2; }; } diff --git a/pkgs/development/python-modules/tarman/default.nix b/pkgs/development/python-modules/tarman/default.nix index 682da22ced8..c2a2c4405e2 100644 --- a/pkgs/development/python-modules/tarman/default.nix +++ b/pkgs/development/python-modules/tarman/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/taskw/default.nix b/pkgs/development/python-modules/taskw/default.nix index 5a135894713..9e1ae3302c1 100644 --- a/pkgs/development/python-modules/taskw/default.nix +++ b/pkgs/development/python-modules/taskw/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/pkgs/development/python-modules/tatsu/default.nix b/pkgs/development/python-modules/tatsu/default.nix index 0469fc30e75..540c315c8ff 100644 --- a/pkgs/development/python-modules/tatsu/default.nix +++ b/pkgs/development/python-modules/tatsu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder , colorama, mypy, pyyaml, regex , dataclasses, typing , pytestrunner, pytest-mypy @@ -25,8 +25,8 @@ buildPythonPackage rec { nativeBuildInputs = [ pytestrunner ]; propagatedBuildInputs = [ colorama mypy pyyaml regex ] - ++ stdenv.lib.optionals (pythonOlder "3.7") [ dataclasses ] - ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ]; + ++ lib.optionals (pythonOlder "3.7") [ dataclasses ] + ++ lib.optionals (pythonOlder "3.5") [ typing ]; checkInputs = [ pytest-mypy ]; checkPhase = '' diff --git a/pkgs/development/python-modules/tblib/default.nix b/pkgs/development/python-modules/tblib/default.nix index 7e704e0b2c6..2f06b665d33 100644 --- a/pkgs/development/python-modules/tblib/default.nix +++ b/pkgs/development/python-modules/tblib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "tblib"; diff --git a/pkgs/development/python-modules/telegram/default.nix b/pkgs/development/python-modules/telegram/default.nix index 95293d095fd..c297efc0efd 100644 --- a/pkgs/development/python-modules/telegram/default.nix +++ b/pkgs/development/python-modules/telegram/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/tensorflow-estimator/default.nix b/pkgs/development/python-modules/tensorflow-estimator/default.nix index bca75224fa3..dd3b4641bea 100644 --- a/pkgs/development/python-modules/tensorflow-estimator/default.nix +++ b/pkgs/development/python-modules/tensorflow-estimator/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage +{ lib, fetchPypi, buildPythonPackage , numpy , absl-py , mock diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix index c0a9d5eadaf..ef6d4f45ef9 100644 --- a/pkgs/development/python-modules/tensorflow/bin.nix +++ b/pkgs/development/python-modules/tensorflow/bin.nix @@ -125,7 +125,7 @@ in buildPythonPackage { zlib ]; - rpath = stdenv.lib.makeLibraryPath (libpaths ++ cudapaths); + rpath = lib.makeLibraryPath (libpaths ++ cudapaths); in lib.optionalString stdenv.isLinux '' # This is an array containing all the directories in the tensorflow2 diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 342a87a6e8d..9f64a689e2b 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -11,7 +11,7 @@ # Common deps , git, pybind11, which, binutils, glibcLocales, cython, perl # Common libraries -, jemalloc, openmpi, gast, grpc, sqlite, boringssl, jsoncpp +, jemalloc, mpi, gast, grpc, sqlite, boringssl, jsoncpp , curl, snappy, flatbuffers-core, lmdb-core, icu, double-conversion, libpng, libjpeg_turbo, giflib # Upsteam by default includes cuda support since tensorflow 1.15. We could do # that in nix as well. It would make some things easier and less confusing, but @@ -129,7 +129,7 @@ let buildInputs = [ jemalloc - openmpi + mpi glibcLocales git diff --git a/pkgs/development/python-modules/termcolor/default.nix b/pkgs/development/python-modules/termcolor/default.nix index df0f4d6208a..e440dab114f 100644 --- a/pkgs/development/python-modules/termcolor/default.nix +++ b/pkgs/development/python-modules/termcolor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/terminaltables/default.nix b/pkgs/development/python-modules/terminaltables/default.nix index 28e49316ad7..51a0b071224 100644 --- a/pkgs/development/python-modules/terminaltables/default.nix +++ b/pkgs/development/python-modules/terminaltables/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix index c4520b1c198..08ef9975b22 100644 --- a/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/pkgs/development/python-modules/teslajsonpy/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "teslajsonpy"; - version = "0.10.4"; + version = "0.11.0"; src = fetchFromGitHub { owner = "zabuldon"; repo = pname; rev = "v${version}"; - sha256 = "18frynmy47i9c24mdy819y2dnjwmhnmkly5mbmhikpbmm6d0yjf1"; + sha256 = "sha256-yfaUa12doOvdFkbHHdOYcFcu86hYZtt2i0tya2ENjf4="; }; propagatedBuildInputs = [ @@ -27,7 +27,12 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook ]; # Not all Home Assistant related check pass - disabledTests = [ "test_values_on_init" ]; + # https://github.com/zabuldon/teslajsonpy/issues/121 + # https://github.com/zabuldon/teslajsonpy/pull/124 + disabledTests = [ + "test_values_on_init" + "test_get_value_on_init" + ]; pythonImportsCheck = [ "teslajsonpy" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/testing-common-database/default.nix b/pkgs/development/python-modules/testing-common-database/default.nix new file mode 100644 index 00000000000..1d50ed1ec49 --- /dev/null +++ b/pkgs/development/python-modules/testing-common-database/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "testing.common.database"; + version = "2.0.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "0wvdv0frl7xib05sixjv9m6jywaa2wdhdhsqqdfk45akk2r80pcn"; + }; + + # There are no unit tests + doCheck = false; + + meta = with lib; { + description = "utilities for testing.* packages"; + homepage = "https://github.com/tk0miya/testing.common.database"; + license = licenses.asl20; + maintainers = with maintainers; [ jluttine ]; + }; +} diff --git a/pkgs/development/python-modules/testing-postgresql/default.nix b/pkgs/development/python-modules/testing-postgresql/default.nix new file mode 100644 index 00000000000..7ebff6ccc36 --- /dev/null +++ b/pkgs/development/python-modules/testing-postgresql/default.nix @@ -0,0 +1,37 @@ +{ lib, buildPythonPackage, fetchFromGitHub, postgresql, testing-common-database +, pg8000, pytestCheckHook, psycopg2, sqlalchemy }: + +buildPythonPackage rec { + pname = "testing.postgresql"; + # Version 1.3.0 isn't working so let's use the latest commit from GitHub + version = "unstable-2017-10-31"; + + src = fetchFromGitHub { + owner = "tk0miya"; + repo = pname; + rev = "c81ded434d00ec8424de0f9e1f4063c778c6aaa8"; + sha256 = "1asqsi38di768i1sc1qm1k068dj0906ds6lnx7xcbxws0s25m2q3"; + }; + + # Add PostgreSQL to search path + prePatch = '' + substituteInPlace src/testing/postgresql.py \ + --replace "/usr/local/pgsql" "${postgresql}" + ''; + + propagatedBuildInputs = [ testing-common-database pg8000 ]; + + # Fix tests for Darwin build. See: + # https://github.com/NixOS/nixpkgs/pull/74716#issuecomment-598546916 + __darwinAllowLocalNetworking = true; + + checkInputs = [ pytestCheckHook psycopg2 sqlalchemy ]; + + meta = with lib; { + description = "Use temporary postgresql instance in testing"; + homepage = "https://github.com/tk0miya/testing.postgresql"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ jluttine ]; + }; +} diff --git a/pkgs/development/python-modules/testpath/default.nix b/pkgs/development/python-modules/testpath/default.nix index a5ab52e5cdd..c95bd0c78b6 100644 --- a/pkgs/development/python-modules/testpath/default.nix +++ b/pkgs/development/python-modules/testpath/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/testrepository/default.nix b/pkgs/development/python-modules/testrepository/default.nix index c249ca212b6..45093a5f7cf 100644 --- a/pkgs/development/python-modules/testrepository/default.nix +++ b/pkgs/development/python-modules/testrepository/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , testtools diff --git a/pkgs/development/python-modules/testscenarios/default.nix b/pkgs/development/python-modules/testscenarios/default.nix index 465384edcb0..8df35ac4b88 100644 --- a/pkgs/development/python-modules/testscenarios/default.nix +++ b/pkgs/development/python-modules/testscenarios/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , testtools diff --git a/pkgs/development/python-modules/textx/default.nix b/pkgs/development/python-modules/textx/default.nix deleted file mode 100644 index 07c568b87d4..00000000000 --- a/pkgs/development/python-modules/textx/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, pytestCheckHook -, arpeggio -, click -, jinja2 -}: - -buildPythonPackage rec { - pname = "textX"; - version = "2.2.0"; - - src = fetchPypi { - inherit pname; - inherit version; - sha256 = "00mwd588ms96qp27m5vpjkzk30wfw53hnmv8y77slxca8lw9vq82"; - }; - - checkInputs = [ pytestCheckHook ]; - - pytestFlagsArray = [ "tests/functional" ]; - - propagatedBuildInputs = [ - arpeggio - click - jinja2 - ]; - - meta = with stdenv.lib; { - description = "textX is a meta-language for building Domain-Specific Languages (DSLs) in Python"; - homepage = "https://textx.github.io"; - license = licenses.mit; - maintainers = with maintainers; [ mcaju ]; - }; -} diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index bd520f2c4bf..75e1a029a25 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -78,6 +78,6 @@ buildPythonPackage rec { description = "Practical Machine Learning for NLP in Python"; homepage = "https://github.com/explosion/thinc"; license = licenses.mit; - maintainers = with maintainers; [ aborsu danieldk sdll ]; + maintainers = with maintainers; [ aborsu sdll ]; }; } diff --git a/pkgs/development/python-modules/threadpool/default.nix b/pkgs/development/python-modules/threadpool/default.nix index 7a1696feb66..9c83e7e45c2 100644 --- a/pkgs/development/python-modules/threadpool/default.nix +++ b/pkgs/development/python-modules/threadpool/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/thrift/default.nix b/pkgs/development/python-modules/thrift/default.nix index c7279b867b1..7b16d666870 100644 --- a/pkgs/development/python-modules/thrift/default.nix +++ b/pkgs/development/python-modules/thrift/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/pkgs/development/python-modules/thumborpexif/default.nix b/pkgs/development/python-modules/thumborpexif/default.nix index abfad4ffaac..28b2e5a9f93 100644 --- a/pkgs/development/python-modules/thumborpexif/default.nix +++ b/pkgs/development/python-modules/thumborpexif/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/pkgs/development/python-modules/tilestache/default.nix b/pkgs/development/python-modules/tilestache/default.nix index 170360c133e..ce46fd56f24 100644 --- a/pkgs/development/python-modules/tilestache/default.nix +++ b/pkgs/development/python-modules/tilestache/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , modestmaps diff --git a/pkgs/development/python-modules/timelib/default.nix b/pkgs/development/python-modules/timelib/default.nix index 65b121ddfaf..e2f3cc1d3cc 100644 --- a/pkgs/development/python-modules/timelib/default.nix +++ b/pkgs/development/python-modules/timelib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/timeout-decorator/default.nix b/pkgs/development/python-modules/timeout-decorator/default.nix index b1160cafe30..c2d21fea153 100644 --- a/pkgs/development/python-modules/timeout-decorator/default.nix +++ b/pkgs/development/python-modules/timeout-decorator/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "timeout-decorator"; version = "0.5.0"; diff --git a/pkgs/development/python-modules/tissue/default.nix b/pkgs/development/python-modules/tissue/default.nix index fc4316c98fe..e1ef7f9edf4 100644 --- a/pkgs/development/python-modules/tissue/default.nix +++ b/pkgs/development/python-modules/tissue/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/pkgs/development/python-modules/tkinter/default.nix b/pkgs/development/python-modules/tkinter/default.nix index 1efebed9872..9f82dee45ef 100644 --- a/pkgs/development/python-modules/tkinter/default.nix +++ b/pkgs/development/python-modules/tkinter/default.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , buildPythonPackage , python , py @@ -17,7 +18,7 @@ buildPythonPackage { # Move the tkinter module mkdir -p $out/${py.sitePackages} mv lib/${py.libPrefix}/lib-dynload/_tkinter* $out/${py.sitePackages}/ - '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.isDarwin) '' # Update the rpath to point to python without x11Support old_rpath=$(patchelf --print-rpath $out/${py.sitePackages}/_tkinter*) new_rpath=$(sed "s#${py}#${python}#g" <<< "$old_rpath" ) diff --git a/pkgs/development/python-modules/tld/default.nix b/pkgs/development/python-modules/tld/default.nix index 01aa6a29005..13f23edaad1 100644 --- a/pkgs/development/python-modules/tld/default.nix +++ b/pkgs/development/python-modules/tld/default.nix @@ -1,39 +1,39 @@ -{ lib, stdenv, fetchPypi, python }: - -python.pkgs.buildPythonPackage rec { - pname = "tld"; - version = "0.12.4"; +{ lib +, buildPythonPackage +, factory_boy +, faker +, fetchPypi +, pytest-cov +, pytestCheckHook +, six +, tox +}: + +buildPythonPackage rec { + pname = "tld"; + version = "0.12.5"; src = fetchPypi { inherit pname version; - sha256 = "0976g7jcpi3jv7snawmfis5ybb6737cv2xw7wlanlfkyqljip24x"; + sha256 = "0d1lbbg2qdw5jjxks0dqlf69bki5885mhj8ysvgylmrni56hjqqv"; }; - propagatedBuildInputs = with python.pkgs; [ six ]; - checkInputs = with python.pkgs; [ factory_boy faker pytestcov tox pytestCheckHook]; - - # https://github.com/barseghyanartur/tld/issues/54 - disabledTests = [ - "test_1_update_tld_names" - "test_1_update_tld_names_command" - "test_2_update_tld_names_module" + checkInputs = [ + factory_boy + faker + pytest-cov + pytestCheckHook + tox ]; - preCheck = '' - export PATH="$PATH:$out/bin" - ''; - - dontUseSetuptoolsCheck = true; - - pythonImportsCheck = [ - "tld" - ]; + pythonImportsCheck = [ "tld" ]; meta = with lib; { homepage = "https://github.com/barseghyanartur/tld"; description = "Extracts the top level domain (TLD) from the URL given"; - license = licenses.lgpl21; - maintainers = with maintainers; [ ]; + # https://github.com/barseghyanartur/tld/blob/master/README.rst#license + # MPL-1.1 OR GPL-2.0-only OR LGPL-2.1-or-later + license = with licenses; [ lgpl21Plus mpl11 gpl2Only ]; + maintainers = with maintainers; [ fab ]; }; - } diff --git a/pkgs/development/python-modules/tlsh/default.nix b/pkgs/development/python-modules/tlsh/default.nix index 302b113364d..7be95b97088 100644 --- a/pkgs/development/python-modules/tlsh/default.nix +++ b/pkgs/development/python-modules/tlsh/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , cmake diff --git a/pkgs/development/python-modules/tlslite-ng/default.nix b/pkgs/development/python-modules/tlslite-ng/default.nix index a952c95d93e..37751890c7b 100644 --- a/pkgs/development/python-modules/tlslite-ng/default.nix +++ b/pkgs/development/python-modules/tlslite-ng/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , ecdsa diff --git a/pkgs/development/python-modules/tlslite/default.nix b/pkgs/development/python-modules/tlslite/default.nix index a1e78c5db76..52b662be2b2 100644 --- a/pkgs/development/python-modules/tlslite/default.nix +++ b/pkgs/development/python-modules/tlslite/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/tmb/default.nix b/pkgs/development/python-modules/tmb/default.nix new file mode 100644 index 00000000000..713cf613928 --- /dev/null +++ b/pkgs/development/python-modules/tmb/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +}: + +buildPythonPackage rec { + pname = "tmb"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "alemuro"; + repo = pname; + rev = version; + sha256 = "sha256-xwzaJuiQxExUA5W4kW7t1713S6NOvDNagcD3/dwA+DE="; + }; + + propagatedBuildInputs = [ requests ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "tmb" ]; + + meta = with lib; { + homepage = "https://github.com/alemuro/tmb"; + description = "Python library that interacts with TMB API"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/todoist/default.nix b/pkgs/development/python-modules/todoist/default.nix index ac781796230..62749d3b02f 100644 --- a/pkgs/development/python-modules/todoist/default.nix +++ b/pkgs/development/python-modules/todoist/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage +{ lib, fetchPypi, buildPythonPackage , requests, fetchpatch, pythonOlder, typing }: @@ -23,12 +23,12 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ requests ] ++ stdenv.lib.optional (pythonOlder "3.5") typing; + propagatedBuildInputs = [ requests ] ++ lib.optional (pythonOlder "3.5") typing; - meta = { + meta = with lib; { description = "The official Todoist Python API library"; homepage = "https://todoist-python.readthedocs.io/en/latest/"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ ma27 ]; + license = licenses.mit; + maintainers = with maintainers; [ ma27 ]; }; } diff --git a/pkgs/development/python-modules/toggl-cli/default.nix b/pkgs/development/python-modules/toggl-cli/default.nix index 875e70cee58..d7eece65002 100644 --- a/pkgs/development/python-modules/toggl-cli/default.nix +++ b/pkgs/development/python-modules/toggl-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonAtLeast, pythonOlder +{ lib, buildPythonPackage, fetchPypi, pythonAtLeast, pythonOlder , click , click-completion , factory_boy diff --git a/pkgs/development/python-modules/tokenizers/default.nix b/pkgs/development/python-modules/tokenizers/default.nix index d5d92b19061..cf122613f63 100644 --- a/pkgs/development/python-modules/tokenizers/default.nix +++ b/pkgs/development/python-modules/tokenizers/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , rustPlatform , fetchFromGitHub , fetchurl @@ -7,6 +7,7 @@ , wheel , numpy , python +, datasets , pytestCheckHook , requests }: @@ -50,16 +51,16 @@ let }; in rustPlatform.buildRustPackage rec { pname = "tokenizers"; - version = "0.9.4"; + version = "0.10.0"; src = fetchFromGitHub { owner = "huggingface"; repo = pname; rev = "python-v${version}"; - hash = "sha256-JXoH9yfhMIFg5qDY5zrF6iWb7XKugjMfk1NxSizfaWg="; + hash = "sha256-rQ2hRV52naEf6PvRsWVCTN7B1oXAQGmnpJw4iIdhamw="; }; - cargoSha256 = "sha256-u9qitrOxJSABs0VjwHUZgmw7VTQXNbp6l8fKKE/RQ7M="; + cargoSha256 = "sha256-BoHIN/519Top1NUBjpB/oEMqi86Omt3zTQcXFWqrek0="; sourceRoot = "source/bindings/python"; @@ -75,6 +76,7 @@ in rustPlatform.buildRustPackage rec { ]; installCheckInputs = [ + datasets pytestCheckHook requests ]; @@ -105,6 +107,15 @@ in rustPlatform.buildRustPackage rec { pipInstallPhase ''; + preCheck = '' + HOME=$TMPDIR + ''; + + disabledTests = [ + # Downloads data using the datasets module. + "TestTrainFromIterators" + ]; + meta = with lib; { homepage = "https://github.com/huggingface/tokenizers"; description = "Fast State-of-the-Art Tokenizers optimized for Research and Production"; diff --git a/pkgs/development/python-modules/tokenlib/default.nix b/pkgs/development/python-modules/tokenlib/default.nix index 2bed1887016..bed053f8282 100644 --- a/pkgs/development/python-modules/tokenlib/default.nix +++ b/pkgs/development/python-modules/tokenlib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , requests diff --git a/pkgs/development/python-modules/toml/default.nix b/pkgs/development/python-modules/toml/default.nix index 0d0d87c73d1..bdc1b141eed 100644 --- a/pkgs/development/python-modules/toml/default.nix +++ b/pkgs/development/python-modules/toml/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "toml"; diff --git a/pkgs/development/python-modules/toonapi/default.nix b/pkgs/development/python-modules/toonapi/default.nix new file mode 100644 index 00000000000..00367098992 --- /dev/null +++ b/pkgs/development/python-modules/toonapi/default.nix @@ -0,0 +1,36 @@ +{ lib +, aiohttp +, backoff +, buildPythonPackage +, fetchFromGitHub +, yarl +}: + +buildPythonPackage rec { + pname = "toonapi"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "frenck"; + repo = "python-toonapi"; + rev = "v${version}"; + sha256 = "1d4n615vlcgkvmchrfjw4h3ndav3ljmcfydxr2b41zn83mzizqdf"; + }; + + propagatedBuildInputs = [ + aiohttp + backoff + yarl + ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "toonapi" ]; + + meta = with lib; { + description = "Python client for the Quby ToonAPI"; + homepage = "https://github.com/frenck/python-toonapi"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/toposort/default.nix b/pkgs/development/python-modules/toposort/default.nix index 43df3c4e21e..540835c7e31 100644 --- a/pkgs/development/python-modules/toposort/default.nix +++ b/pkgs/development/python-modules/toposort/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix index 928616eb4f8..79f6a19ffcb 100644 --- a/pkgs/development/python-modules/torchvision/default.nix +++ b/pkgs/development/python-modules/torchvision/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , ninja diff --git a/pkgs/development/python-modules/traceback2/default.nix b/pkgs/development/python-modules/traceback2/default.nix index 5309ae47a02..040874286bd 100644 --- a/pkgs/development/python-modules/traceback2/default.nix +++ b/pkgs/development/python-modules/traceback2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pbr diff --git a/pkgs/development/python-modules/tracing/default.nix b/pkgs/development/python-modules/tracing/default.nix index f4c01f003a9..c2adc9ec9c5 100644 --- a/pkgs/development/python-modules/tracing/default.nix +++ b/pkgs/development/python-modules/tracing/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , sphinx diff --git a/pkgs/development/python-modules/trackpy/default.nix b/pkgs/development/python-modules/trackpy/default.nix index 6132a30c414..ff4c4a76758 100644 --- a/pkgs/development/python-modules/trackpy/default.nix +++ b/pkgs/development/python-modules/trackpy/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { ]; checkPhase = '' - ${stdenv.lib.optionalString (stdenv.isDarwin) '' + ${lib.optionalString (stdenv.isDarwin) '' # specifically needed for darwin export HOME=$(mktemp -d) mkdir -p $HOME/.matplotlib diff --git a/pkgs/development/python-modules/traits/default.nix b/pkgs/development/python-modules/traits/default.nix index e3bc8b43fe4..d9986dd87fe 100644 --- a/pkgs/development/python-modules/traits/default.nix +++ b/pkgs/development/python-modules/traits/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/pkgs/development/python-modules/transaction/default.nix b/pkgs/development/python-modules/transaction/default.nix index def2559a72d..6bb5987ba48 100644 --- a/pkgs/development/python-modules/transaction/default.nix +++ b/pkgs/development/python-modules/transaction/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchPypi , buildPythonPackage , zope_interface diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index 743cbebea75..65c2af44493 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -1,32 +1,28 @@ { buildPythonPackage -, lib, stdenv +, lib , fetchFromGitHub -, isPy39 +, pythonOlder , cookiecutter , filelock +, importlib-metadata , regex , requests , numpy -, pandas -, parameterized , protobuf , sacremoses -, timeout-decorator , tokenizers , tqdm -, pytestCheckHook }: buildPythonPackage rec { pname = "transformers"; - version = "4.1.1"; - disabled = isPy39; + version = "4.2.2"; src = fetchFromGitHub { owner = "huggingface"; repo = pname; rev = "v${version}"; - sha256 = "1l1gxdsakjmzsgggypq45pnwm87brhlccjfzafs43460pz0wbd6k"; + hash = "sha256-sBMCzEgYX6HQbzoEIYnmMdpYecCCsQjTdl2mO1Veu9M="; }; propagatedBuildInputs = [ @@ -39,63 +35,16 @@ buildPythonPackage rec { sacremoses tokenizers tqdm - ]; + ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; - checkInputs = [ - pandas - parameterized - pytestCheckHook - timeout-decorator - ]; + # Many tests require internet access. + doCheck = false; postPatch = '' - substituteInPlace setup.py \ - --replace "tokenizers == 0.9.4" "tokenizers" + sed -ri 's/tokenizers==[^"]+/tokenizers/g' setup.py src/transformers/dependency_versions_table.py ''; - preCheck = '' - export HOME="$TMPDIR" - - # This test requires the `datasets` module to download test - # data. However, since we cannot download in the Nix sandbox - # and `dataset` is an optional dependency for transformers - # itself, we will just remove the tests files that import - # `dataset`. - rm tests/test_retrieval_rag.py - rm tests/test_trainer.py - ''; - - # We have to run from the main directory for the tests. However, - # letting pytest discover tests leads to errors. - pytestFlagsArray = [ "tests" ]; - - # Disable tests that require network access. - disabledTests = [ - "BlenderbotSmallTokenizerTest" - "Blenderbot3BTokenizerTests" - "GetFromCacheTests" - "TokenizationTest" - "TestTokenizationBart" - "test_all_tokenizers" - "test_batch_encoding_is_fast" - "test_batch_encoding_pickle" - "test_batch_encoding_word_to_tokens" - "test_config_from_model_shortcut" - "test_config_model_type_from_model_identifier" - "test_from_pretrained_use_fast_toggle" - "test_hf_api" - "test_outputs_can_be_shorter" - "test_outputs_not_longer_than_maxlen" - "test_padding_accepts_tensors" - "test_pretokenized_tokenizers" - "test_tokenizer_equivalence_en_de" - "test_tokenizer_from_model_type" - "test_tokenizer_from_model_type" - "test_tokenizer_from_pretrained" - "test_tokenizer_from_tokenizer_class" - "test_tokenizer_identifier_with_correct_config" - "test_tokenizer_identifier_non_existent" - ]; + pythonImportsCheck = [ "transformers" ]; meta = with lib; { homepage = "https://github.com/huggingface/transformers"; diff --git a/pkgs/development/python-modules/transip/default.nix b/pkgs/development/python-modules/transip/default.nix index e270d5a0662..94d3cb85be4 100644 --- a/pkgs/development/python-modules/transip/default.nix +++ b/pkgs/development/python-modules/transip/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , isPy27 diff --git a/pkgs/development/python-modules/transitions/default.nix b/pkgs/development/python-modules/transitions/default.nix index 82958029923..2dda33fd968 100644 --- a/pkgs/development/python-modules/transitions/default.nix +++ b/pkgs/development/python-modules/transitions/default.nix @@ -1,26 +1,21 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi -, six, nose, mock, dill, pycodestyle }: +{ lib, buildPythonPackage, fetchFromGitHub +, six, pytestCheckHook, mock, dill, pycodestyle }: buildPythonPackage rec { pname = "transitions"; - version = "0.8.5"; + version = "0.8.6"; - src = fetchPypi { - inherit pname version; - sha256 = "e441c66a0c753d56c01c3e5e547f21dbe4a5569c939f12477475c5e81d79769b"; + # test_codestyle.py fails in PyPI sdist + src = fetchFromGitHub { + owner = "pytransitions"; + repo = "transitions"; + rev = version; + sha256 = "1d913hzzyqhdhhbkbvjw65dqkajrw50a4sxhyxk0jlg8pcs7bs7v"; }; - postPatch = '' - substituteInPlace setup.py --replace "dill<0.2.7" dill - ''; - propagatedBuildInputs = [ six ]; - checkInputs = [ nose mock dill pycodestyle ]; - - checkPhase = '' - nosetests - ''; + checkInputs = [ pytestCheckHook mock dill pycodestyle ]; meta = with lib; { homepage = "https://github.com/pytransitions/transitions"; diff --git a/pkgs/development/python-modules/translationstring/default.nix b/pkgs/development/python-modules/translationstring/default.nix index 2f39b57b480..f7036128e08 100644 --- a/pkgs/development/python-modules/translationstring/default.nix +++ b/pkgs/development/python-modules/translationstring/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/transmissionrpc/default.nix b/pkgs/development/python-modules/transmissionrpc/default.nix index a128b150579..39901a17f00 100644 --- a/pkgs/development/python-modules/transmissionrpc/default.nix +++ b/pkgs/development/python-modules/transmissionrpc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix index 477223e9618..447e2a5b986 100644 --- a/pkgs/development/python-modules/treq/default.nix +++ b/pkgs/development/python-modules/treq/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, service-identity, requests, six +{ lib, fetchPypi, buildPythonPackage, service-identity, requests, six , mock, twisted, incremental, pep8, httpbin }: diff --git a/pkgs/development/python-modules/trezor_agent/default.nix b/pkgs/development/python-modules/trezor_agent/default.nix index 537b4db7995..cef74c8636b 100644 --- a/pkgs/development/python-modules/trezor_agent/default.nix +++ b/pkgs/development/python-modules/trezor_agent/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , trezor diff --git a/pkgs/development/python-modules/trueskill/default.nix b/pkgs/development/python-modules/trueskill/default.nix index 0c3efa404ec..db16ed7fafb 100644 --- a/pkgs/development/python-modules/trueskill/default.nix +++ b/pkgs/development/python-modules/trueskill/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , six }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix index 7db53969402..68254d8601e 100644 --- a/pkgs/development/python-modules/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib , buildPythonApplication , fetchPypi , pythonOlder @@ -21,8 +21,6 @@ , withPostgresql ? true }: -with stdenv.lib; - buildPythonApplication rec { pname = "trytond"; version = "5.8.2"; @@ -56,14 +54,14 @@ buildPythonApplication rec { python-Levenshtein simplejson html2text - ] ++ stdenv.lib.optional withPostgresql psycopg2; + ] ++ lib.optional withPostgresql psycopg2; # If unset, trytond will try to mkdir /homeless-shelter preCheck = '' export HOME=$(mktemp -d) ''; - meta = { + meta = with lib; { description = "The server of the Tryton application platform"; longDescription = '' The server for Tryton, a three-tier high-level general purpose diff --git a/pkgs/development/python-modules/ttystatus/default.nix b/pkgs/development/python-modules/ttystatus/default.nix index 24eb1063707..f32045ce9cd 100644 --- a/pkgs/development/python-modules/ttystatus/default.nix +++ b/pkgs/development/python-modules/ttystatus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , sphinx diff --git a/pkgs/development/python-modules/tubeup/default.nix b/pkgs/development/python-modules/tubeup/default.nix index 29764259910..7a4b4454b3b 100644 --- a/pkgs/development/python-modules/tubeup/default.nix +++ b/pkgs/development/python-modules/tubeup/default.nix @@ -2,27 +2,27 @@ , buildPythonPackage , internetarchive , fetchPypi -, youtube-dlc +, youtube-dl , docopt , isPy27 }: buildPythonPackage rec { pname = "tubeup"; - version = "0.0.20"; + version = "0.0.21"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "8bf4004629b8427173c8259e1a09065db99135d6cc390b70a8a67b52a34a3f67"; + sha256 = "326a499be032bee7f7ed921d85abff4b3b4dcd2c3d6ad694f08ef98dbcef19b6"; }; postPatch = '' substituteInPlace setup.py --replace "docopt==0.6.2" "docopt" ''; - propagatedBuildInputs = [ internetarchive docopt youtube-dlc ]; + propagatedBuildInputs = [ internetarchive docopt youtube-dl ]; pythonImportsCheck = [ "tubeup" ]; diff --git a/pkgs/development/python-modules/tumpa/default.nix b/pkgs/development/python-modules/tumpa/default.nix index 28560feb04f..6d953740eb8 100644 --- a/pkgs/development/python-modules/tumpa/default.nix +++ b/pkgs/development/python-modules/tumpa/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib , buildPythonPackage , fetchFromGitHub , setuptools @@ -27,7 +27,7 @@ buildPythonPackage rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "OpenPGP key creation and smartcard access"; homepage = "https://github.com/kushaldas/tumpa"; license = licenses.gpl3Plus; diff --git a/pkgs/development/python-modules/tvdb_api/default.nix b/pkgs/development/python-modules/tvdb_api/default.nix index f2cdbe8dc63..845aff673b7 100644 --- a/pkgs/development/python-modules/tvdb_api/default.nix +++ b/pkgs/development/python-modules/tvdb_api/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , requests-cache diff --git a/pkgs/development/python-modules/tvnamer/default.nix b/pkgs/development/python-modules/tvnamer/default.nix index fa155b86f40..6a720421c72 100644 --- a/pkgs/development/python-modules/tvnamer/default.nix +++ b/pkgs/development/python-modules/tvnamer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/pkgs/development/python-modules/twiggy/default.nix b/pkgs/development/python-modules/twiggy/default.nix index 9647dc8ae67..45e59860227 100644 --- a/pkgs/development/python-modules/twiggy/default.nix +++ b/pkgs/development/python-modules/twiggy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index 7931a4ad0ec..ff4bb845c89 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchFromGitHub , pyjwt, pysocks, pytz, requests, six, nose, mock }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index efec0b737bc..421565725b1 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { # Patch t.p._inotify to point to libc. Without this, # twisted.python.runtime.platform.supportsINotify() == False - patchPhase = stdenv.lib.optionalString stdenv.isLinux '' + patchPhase = lib.optionalString stdenv.isLinux '' substituteInPlace src/twisted/python/_inotify.py --replace \ "ctypes.util.find_library('c')" "'${stdenv.glibc.out}/lib/libc.so.6'" ''; diff --git a/pkgs/development/python-modules/twitter-common-collections/default.nix b/pkgs/development/python-modules/twitter-common-collections/default.nix index 72f30514dc6..644a97d2b2e 100644 --- a/pkgs/development/python-modules/twitter-common-collections/default.nix +++ b/pkgs/development/python-modules/twitter-common-collections/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , twitter-common-lang diff --git a/pkgs/development/python-modules/twitter-common-confluence/default.nix b/pkgs/development/python-modules/twitter-common-confluence/default.nix index ee5bf9bdbe1..d718a18822b 100644 --- a/pkgs/development/python-modules/twitter-common-confluence/default.nix +++ b/pkgs/development/python-modules/twitter-common-confluence/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , twitter-common-log diff --git a/pkgs/development/python-modules/twitter-common-dirutil/default.nix b/pkgs/development/python-modules/twitter-common-dirutil/default.nix index 14b0bcd0673..bf9ec099ddb 100644 --- a/pkgs/development/python-modules/twitter-common-dirutil/default.nix +++ b/pkgs/development/python-modules/twitter-common-dirutil/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , twitter-common-lang diff --git a/pkgs/development/python-modules/twitter-common-lang/default.nix b/pkgs/development/python-modules/twitter-common-lang/default.nix index 4b4a5c0fc2e..93178f46792 100644 --- a/pkgs/development/python-modules/twitter-common-lang/default.nix +++ b/pkgs/development/python-modules/twitter-common-lang/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/twitter-common-log/default.nix b/pkgs/development/python-modules/twitter-common-log/default.nix index 8cf99c39dc2..61f5d99a8f1 100644 --- a/pkgs/development/python-modules/twitter-common-log/default.nix +++ b/pkgs/development/python-modules/twitter-common-log/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , twitter-common-options diff --git a/pkgs/development/python-modules/twitter-common-options/default.nix b/pkgs/development/python-modules/twitter-common-options/default.nix index a5505330bc0..b3ae7f7f5d9 100644 --- a/pkgs/development/python-modules/twitter-common-options/default.nix +++ b/pkgs/development/python-modules/twitter-common-options/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/twitter/default.nix b/pkgs/development/python-modules/twitter/default.nix index 23d647d9315..7114dc661f4 100644 --- a/pkgs/development/python-modules/twitter/default.nix +++ b/pkgs/development/python-modules/twitter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/txaio/default.nix b/pkgs/development/python-modules/txaio/default.nix index 4d756fa89f3..814b6234ee3 100644 --- a/pkgs/development/python-modules/txaio/default.nix +++ b/pkgs/development/python-modules/txaio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, mock, six, twisted, isPy37, isPy27 }: +{ lib, buildPythonPackage, fetchPypi, pytest, mock, six, twisted, isPy37, isPy27 }: buildPythonPackage rec { pname = "txaio"; diff --git a/pkgs/development/python-modules/txamqp/default.nix b/pkgs/development/python-modules/txamqp/default.nix index f0e3904a881..cc66e041ae3 100644 --- a/pkgs/development/python-modules/txamqp/default.nix +++ b/pkgs/development/python-modules/txamqp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , twisted diff --git a/pkgs/development/python-modules/txdbus/default.nix b/pkgs/development/python-modules/txdbus/default.nix index 461ddeee34b..31afbd4fdf9 100644 --- a/pkgs/development/python-modules/txdbus/default.nix +++ b/pkgs/development/python-modules/txdbus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, six, twisted }: +{ lib, buildPythonPackage, fetchPypi, six, twisted }: buildPythonPackage rec { pname = "txdbus"; diff --git a/pkgs/development/python-modules/txgithub/default.nix b/pkgs/development/python-modules/txgithub/default.nix index 402e5011ede..09af476e94d 100644 --- a/pkgs/development/python-modules/txgithub/default.nix +++ b/pkgs/development/python-modules/txgithub/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pyopenssl diff --git a/pkgs/development/python-modules/txrequests/default.nix b/pkgs/development/python-modules/txrequests/default.nix index 06979e2b9b3..be32dc4a738 100644 --- a/pkgs/development/python-modules/txrequests/default.nix +++ b/pkgs/development/python-modules/txrequests/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , twisted diff --git a/pkgs/development/python-modules/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix index 448e52af7af..7aced09b33d 100644 --- a/pkgs/development/python-modules/typeguard/default.nix +++ b/pkgs/development/python-modules/typeguard/default.nix @@ -1,7 +1,7 @@ { buildPythonPackage , fetchPypi , pythonOlder -, lib, stdenv +, lib , setuptools_scm , pytest , typing-extensions diff --git a/pkgs/development/python-modules/typogrify/default.nix b/pkgs/development/python-modules/typogrify/default.nix index faa1c8641c0..25445d8a7d2 100644 --- a/pkgs/development/python-modules/typogrify/default.nix +++ b/pkgs/development/python-modules/typogrify/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPyPy diff --git a/pkgs/development/python-modules/tzlocal/default.nix b/pkgs/development/python-modules/tzlocal/default.nix index df0923833fd..a7cd91d6845 100644 --- a/pkgs/development/python-modules/tzlocal/default.nix +++ b/pkgs/development/python-modules/tzlocal/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , pytz }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/ua-parser/default.nix b/pkgs/development/python-modules/ua-parser/default.nix index 370ed527d19..36d725d14f4 100644 --- a/pkgs/development/python-modules/ua-parser/default.nix +++ b/pkgs/development/python-modules/ua-parser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pyyaml }: +{ lib, buildPythonPackage, fetchPypi, pyyaml }: buildPythonPackage rec { pname = "ua-parser"; diff --git a/pkgs/development/python-modules/uamqp/default.nix b/pkgs/development/python-modules/uamqp/default.nix index a0d24785eb6..05bc653b059 100644 --- a/pkgs/development/python-modules/uamqp/default.nix +++ b/pkgs/development/python-modules/uamqp/default.nix @@ -1,23 +1,37 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k +{ stdenv +, lib +, buildPythonPackage +, fetchPypi +, fetchpatch +, isPy3k , certifi -, CFNetwork , cmake , enum34 , openssl -, Security , six -, stdenv +, CFNetwork +, CoreFoundation +, Security }: buildPythonPackage rec { pname = "uamqp"; - version = "1.2.12"; + version = "1.2.13"; src = fetchPypi { inherit pname version; - sha256 = "c6657f1d8aae566b89d02c6282827dddcec2a90f75dc0d2d91a47e00c8999d99"; + sha256 = "sha256-zDUFe/yMCThn+qJqDekMrUHEf1glGxBw4pioExLLoqg="; }; + patches = [ + (fetchpatch { + url = "https://github.com/Azure/azure-c-shared-utility/commit/52ab2095649b5951e6af77f68954209473296983.patch"; + sha256 = "06pxhdpkv94pv3lhj1vy0wlsqsdznz485bvg3zafj67r55g40lhd"; + stripLen = "2"; + extraPrefix = "src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/"; + }) + ]; + buildInputs = [ openssl certifi @@ -25,7 +39,9 @@ buildPythonPackage rec { ] ++ lib.optionals (!isPy3k) [ enum34 ] ++ lib.optionals stdenv.isDarwin [ - CFNetwork Security + CoreFoundation + CFNetwork + Security ]; dontUseCmakeConfigure = true; diff --git a/pkgs/development/python-modules/ufoprocessor/default.nix b/pkgs/development/python-modules/ufoprocessor/default.nix index db5b1400fe4..b0f5b11ad3a 100644 --- a/pkgs/development/python-modules/ufoprocessor/default.nix +++ b/pkgs/development/python-modules/ufoprocessor/default.nix @@ -26,6 +26,15 @@ buildPythonPackage rec { mutatormath ]; + checkPhase = '' + runHook preCheck + for t in Tests/*.py; do + # https://github.com/LettError/ufoProcessor/issues/32 + [[ "$(basename "$t")" = "tests_fp.py" ]] || python "$t" + done + runHook postCheck + ''; + meta = with lib; { description = "Read, write and generate UFOs with designspace data"; homepage = "https://github.com/LettError/ufoProcessor"; diff --git a/pkgs/development/python-modules/ujson/2.nix b/pkgs/development/python-modules/ujson/2.nix index f31b26a1960..36aa5a020c3 100644 --- a/pkgs/development/python-modules/ujson/2.nix +++ b/pkgs/development/python-modules/ujson/2.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , setuptools_scm diff --git a/pkgs/development/python-modules/ujson/default.nix b/pkgs/development/python-modules/ujson/default.nix index 1c12a092a2f..9c759bd41b3 100644 --- a/pkgs/development/python-modules/ujson/default.nix +++ b/pkgs/development/python-modules/ujson/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/umalqurra/default.nix b/pkgs/development/python-modules/umalqurra/default.nix index 4411dbac11b..0e1b4c681e5 100644 --- a/pkgs/development/python-modules/umalqurra/default.nix +++ b/pkgs/development/python-modules/umalqurra/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/umap-learn/default.nix b/pkgs/development/python-modules/umap-learn/default.nix index f471fbef4c8..b9abe2bb768 100644 --- a/pkgs/development/python-modules/umap-learn/default.nix +++ b/pkgs/development/python-modules/umap-learn/default.nix @@ -6,22 +6,25 @@ , scikitlearn , scipy , numba +, pynndescent +, tensorflow , pytestCheckHook }: buildPythonPackage rec { pname = "umap-learn"; - version = "0.4.5"; + version = "0.5.0"; src = fetchFromGitHub { owner = "lmcinnes"; repo = "umap"; rev = version; - sha256 = "080by8h4rxr5ijx8vp8kn952chiqz029j26c04k4js4g9s7201bq"; + sha256 = "sha256-2Z5RDi4bz8hh8zMwkcCQY9NrGaVd1DJEBOmrCl2oSvM="; }; checkInputs = [ nose + tensorflow pytestCheckHook ]; @@ -30,8 +33,13 @@ buildPythonPackage rec { scikitlearn scipy numba + pynndescent ]; + preCheck = '' + export HOME=$TMPDIR + ''; + disabledTests = [ # Plot functionality requires additional packages. # These test also fail with 'RuntimeError: cannot cache function' error. diff --git a/pkgs/development/python-modules/umemcache/default.nix b/pkgs/development/python-modules/umemcache/default.nix index f852483cda6..26f8ba02756 100644 --- a/pkgs/development/python-modules/umemcache/default.nix +++ b/pkgs/development/python-modules/umemcache/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, isPy3k, fetchurl }: +{ lib, buildPythonPackage, isPy3k, fetchurl }: buildPythonPackage rec { pname = "umemcache"; diff --git a/pkgs/development/python-modules/uncertainties/default.nix b/pkgs/development/python-modules/uncertainties/default.nix index 117188198ca..b43927c063e 100644 --- a/pkgs/development/python-modules/uncertainties/default.nix +++ b/pkgs/development/python-modules/uncertainties/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage +{ lib, fetchPypi, buildPythonPackage , nose, numpy, future }: diff --git a/pkgs/development/python-modules/uncompyle6/default.nix b/pkgs/development/python-modules/uncompyle6/default.nix index 4f8d461c87e..31095fcd50e 100644 --- a/pkgs/development/python-modules/uncompyle6/default.nix +++ b/pkgs/development/python-modules/uncompyle6/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonAtLeast diff --git a/pkgs/development/python-modules/unicode-slugify/default.nix b/pkgs/development/python-modules/unicode-slugify/default.nix index 80ac5151b53..a0574f948f0 100644 --- a/pkgs/development/python-modules/unicode-slugify/default.nix +++ b/pkgs/development/python-modules/unicode-slugify/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/pkgs/development/python-modules/unicodecsv/default.nix b/pkgs/development/python-modules/unicodecsv/default.nix index 9393ff58bc2..ede2b0d3f09 100644 --- a/pkgs/development/python-modules/unicodecsv/default.nix +++ b/pkgs/development/python-modules/unicodecsv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/unicorn/default.nix b/pkgs/development/python-modules/unicorn/default.nix index 215a32e3b60..484f422adf3 100644 --- a/pkgs/development/python-modules/unicorn/default.nix +++ b/pkgs/development/python-modules/unicorn/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "unicorn"; - version = stdenv.lib.getVersion unicorn-emu; + version = lib.getVersion unicorn-emu; src = unicorn-emu.src; sourceRoot = "source/bindings/python"; diff --git a/pkgs/development/python-modules/unidecode/default.nix b/pkgs/development/python-modules/unidecode/default.nix index 34de3d71386..70724bb71b5 100644 --- a/pkgs/development/python-modules/unidecode/default.nix +++ b/pkgs/development/python-modules/unidecode/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, glibcLocales }: +{ lib, buildPythonPackage, fetchPypi, glibcLocales }: buildPythonPackage rec { pname = "Unidecode"; diff --git a/pkgs/development/python-modules/unifi/default.nix b/pkgs/development/python-modules/unifi/default.nix index 66ab9ba3972..fc98695dd6f 100644 --- a/pkgs/development/python-modules/unifi/default.nix +++ b/pkgs/development/python-modules/unifi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage +{ lib, buildPythonPackage , fetchPypi, urllib3 }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/unittest2/default.nix b/pkgs/development/python-modules/unittest2/default.nix index a7c1252f4b4..ae8cab53b0c 100644 --- a/pkgs/development/python-modules/unittest2/default.nix +++ b/pkgs/development/python-modules/unittest2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/pkgs/development/python-modules/unpaddedbase64/default.nix b/pkgs/development/python-modules/unpaddedbase64/default.nix index 52d2a42b4ba..96b27127cc6 100644 --- a/pkgs/development/python-modules/unpaddedbase64/default.nix +++ b/pkgs/development/python-modules/unpaddedbase64/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub }: diff --git a/pkgs/development/python-modules/upass/default.nix b/pkgs/development/python-modules/upass/default.nix index 442876d7a97..61197c7219d 100644 --- a/pkgs/development/python-modules/upass/default.nix +++ b/pkgs/development/python-modules/upass/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , pyperclip diff --git a/pkgs/development/python-modules/update_checker/default.nix b/pkgs/development/python-modules/update_checker/default.nix index f9171e8cbc9..432232c60f9 100644 --- a/pkgs/development/python-modules/update_checker/default.nix +++ b/pkgs/development/python-modules/update_checker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, requests, isPy27 +{ lib, buildPythonPackage, fetchPypi, requests, isPy27 }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/upnpy/default.nix b/pkgs/development/python-modules/upnpy/default.nix new file mode 100644 index 00000000000..d64ff4b875c --- /dev/null +++ b/pkgs/development/python-modules/upnpy/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "upnpy"; + version = "1.1.8"; + + src = fetchFromGitHub { + owner = "5kyc0d3r"; + repo = pname; + rev = "v${version}"; + sha256 = "17rqcmmwsl0m4722b1cr74f80kqwq7cgxsy7lq9c88zf6srcgjsf"; + }; + + # Project has not published tests yet + doCheck = false; + pythonImportsCheck = [ "upnpy" ]; + + meta = with lib; { + description = "UPnP client library for Python"; + homepage = "https://github.com/5kyc0d3r/upnpy"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/uproot3-methods/default.nix b/pkgs/development/python-modules/uproot3-methods/default.nix index 5164bf854ad..21fe31630de 100644 --- a/pkgs/development/python-modules/uproot3-methods/default.nix +++ b/pkgs/development/python-modules/uproot3-methods/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , numpy diff --git a/pkgs/development/python-modules/uptime/default.nix b/pkgs/development/python-modules/uptime/default.nix index 8f8c067d36a..640d2a6ed57 100644 --- a/pkgs/development/python-modules/uptime/default.nix +++ b/pkgs/development/python-modules/uptime/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix index f5bca2ed0fe..ff262d6b0a3 100644 --- a/pkgs/development/python-modules/uranium/default.nix +++ b/pkgs/development/python-modules/uranium/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python, cmake +{ lib, buildPythonPackage, fetchFromGitHub, python, cmake , pyqt5, numpy, scipy, shapely, libarcus, doxygen, gettext, pythonOlder }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/uritools/default.nix b/pkgs/development/python-modules/uritools/default.nix index b06da7c6acc..2f4710eea46 100644 --- a/pkgs/development/python-modules/uritools/default.nix +++ b/pkgs/development/python-modules/uritools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27 }: +{ lib, buildPythonPackage, fetchPypi, isPy27 }: buildPythonPackage rec { pname = "uritools"; diff --git a/pkgs/development/python-modules/url-normalize/default.nix b/pkgs/development/python-modules/url-normalize/default.nix new file mode 100644 index 00000000000..ea7825d9ffd --- /dev/null +++ b/pkgs/development/python-modules/url-normalize/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry +, pytest-cov +, pytest-flakes +, pytest-mock +, pytest-socket +, pytestCheckHook +, six +}: + +buildPythonPackage rec { + pname = "url-normalize"; + version = "1.4.3"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "niksite"; + repo = pname; + rev = version; + sha256 = "09nac5nh94x0n4bfazjfxk96b20mfsx6r1fnvqv85gkzs0rwqkaq"; + }; + + nativeBuildInputs = [ poetry ]; + + propagatedBuildInputs = [ six ]; + + checkInputs = [ + pytest-cov + pytest-flakes + pytest-mock + pytest-socket + pytestCheckHook + ]; + + pythonImportsCheck = [ "url_normalize" ]; + + meta = with lib; { + description = "URL normalization for Python"; + homepage = "https://github.com/niksite/url-normalize"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/urlgrabber/default.nix b/pkgs/development/python-modules/urlgrabber/default.nix index 3a7158be73c..e78dc9b904d 100644 --- a/pkgs/development/python-modules/urlgrabber/default.nix +++ b/pkgs/development/python-modules/urlgrabber/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pycurl, six }: +{ lib, buildPythonPackage, fetchPypi, pycurl, six }: buildPythonPackage rec { pname = "urlgrabber"; diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix index 4bf36439174..6cf7ce34d38 100644 --- a/pkgs/development/python-modules/urllib3/default.nix +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , pytest, mock, tornado, pyopenssl, cryptography , idna, certifi, ipaddress, pysocks }: @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "19188f96923873c92ccb987120ec4acaa12f0461fa9ce5d3d0772bc965a39e08"; }; - NOSE_EXCLUDE = stdenv.lib.concatStringsSep "," [ + NOSE_EXCLUDE = lib.concatStringsSep "," [ "test_headers" "test_headerdict" "test_can_validate_ip_san" "test_delayed_body_read_timeout" "test_timeout_errors_cause_retries" "test_select_multiple_interrupts_with_event" ]; diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix index e3c5311136c..7dcc56d9f6e 100644 --- a/pkgs/development/python-modules/urwid/default.nix +++ b/pkgs/development/python-modules/urwid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, isPy27, glibcLocales }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, isPy27, glibcLocales }: buildPythonPackage rec { pname = "urwid"; @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with lib; { description = "A full-featured console (xterm et al.) user interface library"; - homepage = "http://excess.org/urwid"; + homepage = "https://excess.org/urwid"; repositories.git = "git://github.com/wardi/urwid.git"; license = licenses.lgpl21; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/urwidtrees/default.nix b/pkgs/development/python-modules/urwidtrees/default.nix index 4c3a3e896f8..863989156c3 100644 --- a/pkgs/development/python-modules/urwidtrees/default.nix +++ b/pkgs/development/python-modules/urwidtrees/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , glibcLocales diff --git a/pkgs/development/python-modules/usbtmc/default.nix b/pkgs/development/python-modules/usbtmc/default.nix index b1f5b301dee..6dbb6ce184f 100644 --- a/pkgs/development/python-modules/usbtmc/default.nix +++ b/pkgs/development/python-modules/usbtmc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, buildPythonPackage, pyusb }: +{ lib, fetchurl, buildPythonPackage, pyusb }: buildPythonPackage rec { pname = "usbtmc"; diff --git a/pkgs/development/python-modules/user-agents/default.nix b/pkgs/development/python-modules/user-agents/default.nix index 7f8470cfbdc..d01c601c82a 100644 --- a/pkgs/development/python-modules/user-agents/default.nix +++ b/pkgs/development/python-modules/user-agents/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, ua-parser }: +{ lib, buildPythonPackage, fetchFromGitHub, ua-parser }: buildPythonPackage rec { pname = "user-agents"; diff --git a/pkgs/development/python-modules/utils/default.nix b/pkgs/development/python-modules/utils/default.nix new file mode 100644 index 00000000000..a6dd57e0e5e --- /dev/null +++ b/pkgs/development/python-modules/utils/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, mock +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "utils"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "haaksmash"; + repo = "pyutils"; + rev = version; + sha256 = "07pr39cfw5ayzkp6h53y7lfpd0w19pphsdzsf100fsyy3npavgbr"; + }; + + checkInputs = [ + mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "utils" ]; + + meta = with lib; { + description = "Python set of utility functions and objects"; + homepage = "https://github.com/haaksmash/pyutils"; + license = with licenses; [ lgpl3Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/validate-email/default.nix b/pkgs/development/python-modules/validate-email/default.nix index 327cfcf3f0d..2b1fdb4963d 100644 --- a/pkgs/development/python-modules/validate-email/default.nix +++ b/pkgs/development/python-modules/validate-email/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "validate-email"; diff --git a/pkgs/development/python-modules/validictory/default.nix b/pkgs/development/python-modules/validictory/default.nix index e89b3d7bcd2..29ffb76591e 100644 --- a/pkgs/development/python-modules/validictory/default.nix +++ b/pkgs/development/python-modules/validictory/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/vcversioner/default.nix b/pkgs/development/python-modules/vcversioner/default.nix index 7d73a6e812d..236bb8d149b 100644 --- a/pkgs/development/python-modules/vcversioner/default.nix +++ b/pkgs/development/python-modules/vcversioner/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "vcversioner"; diff --git a/pkgs/development/python-modules/vdf/default.nix b/pkgs/development/python-modules/vdf/default.nix index 9e4e92d21ae..846aa7a13df 100644 --- a/pkgs/development/python-modules/vdf/default.nix +++ b/pkgs/development/python-modules/vdf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchFromGitHub , pytest, pytestcov, mock }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/vdirsyncer/default.nix b/pkgs/development/python-modules/vdirsyncer/default.nix index bda65ab4907..1f7642bfe34 100644 --- a/pkgs/development/python-modules/vdirsyncer/default.nix +++ b/pkgs/development/python-modules/vdirsyncer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/pkgs/development/python-modules/vega/default.nix b/pkgs/development/python-modules/vega/default.nix index 3a36d5de606..083aa630209 100644 --- a/pkgs/development/python-modules/vega/default.nix +++ b/pkgs/development/python-modules/vega/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage , fetchPypi, pythonOlder +{ lib, buildPythonPackage , fetchPypi, pythonOlder , pytest, jupyter_core, pandas, ipywidgets, jupyter, altair }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/venusian/default.nix b/pkgs/development/python-modules/venusian/default.nix index 68d974aabec..82e291ae462 100644 --- a/pkgs/development/python-modules/venusian/default.nix +++ b/pkgs/development/python-modules/venusian/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/pkgs/development/python-modules/versioneer/default.nix b/pkgs/development/python-modules/versioneer/default.nix index fa3329503a3..3685e78d4b4 100644 --- a/pkgs/development/python-modules/versioneer/default.nix +++ b/pkgs/development/python-modules/versioneer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27 }: +{ lib, buildPythonPackage, fetchPypi, isPy27 }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/versiontools/default.nix b/pkgs/development/python-modules/versiontools/default.nix index 45b34d95301..f74c8610b4c 100644 --- a/pkgs/development/python-modules/versiontools/default.nix +++ b/pkgs/development/python-modules/versiontools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/veryprettytable/default.nix b/pkgs/development/python-modules/veryprettytable/default.nix index f2c8cee451d..003fd6db621 100644 --- a/pkgs/development/python-modules/veryprettytable/default.nix +++ b/pkgs/development/python-modules/veryprettytable/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , termcolor diff --git a/pkgs/development/python-modules/vidstab/default.nix b/pkgs/development/python-modules/vidstab/default.nix index 548105a0177..4119b26259d 100644 --- a/pkgs/development/python-modules/vidstab/default.nix +++ b/pkgs/development/python-modules/vidstab/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , numpy diff --git a/pkgs/development/python-modules/vine/default.nix b/pkgs/development/python-modules/vine/default.nix index 048fa435e0b..8fc895cfa44 100644 --- a/pkgs/development/python-modules/vine/default.nix +++ b/pkgs/development/python-modules/vine/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , case, pytest, pythonOlder }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/virtkey/default.nix b/pkgs/development/python-modules/virtkey/default.nix index 9ab89e9ac0d..072fd25c7f0 100644 --- a/pkgs/development/python-modules/virtkey/default.nix +++ b/pkgs/development/python-modules/virtkey/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchurl, pkgconfig, gtk2, libX11, libXtst, libXi, libxkbfile, xorgproto }: +{ lib, buildPythonPackage, fetchurl, pkg-config, gtk2, libX11, libXtst, libXi, libxkbfile, xorgproto }: let majorVersion = "0.63"; @@ -12,7 +12,7 @@ in buildPythonPackage rec { sha256 = "0hd99hrxn6bh3rxcrdnad5cqjsphrn1s6fzx91q07d44k6cg6qcr"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 libX11 libXtst libXi libxkbfile xorgproto ]; diff --git a/pkgs/development/python-modules/virtualenv-clone/default.nix b/pkgs/development/python-modules/virtualenv-clone/default.nix index 9b225021cf2..4dfebc13075 100644 --- a/pkgs/development/python-modules/virtualenv-clone/default.nix +++ b/pkgs/development/python-modules/virtualenv-clone/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index 233101728f8..8b64bddc5a4 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -1,18 +1,25 @@ { buildPythonPackage -, fetchPypi -, lib -, stdenv -, pythonOlder -, isPy27 , appdirs , contextlib2 +, cython , distlib +, fetchPypi , filelock +, fish +, flaky , importlib-metadata , importlib-resources +, isPy27 +, lib , pathlib2 +, pytest-freezegun +, pytest-mock +, pytest-timeout +, pytestCheckHook +, pythonOlder , setuptools_scm , six +, stdenv }: buildPythonPackage rec { @@ -47,10 +54,37 @@ buildPythonPackage rec { ./0001-Check-base_prefix-and-base_exec_prefix-for-Python-2.patch ]; - meta = { + checkInputs = [ + cython + fish + flaky + pytest-freezegun + pytest-mock + pytest-timeout + pytestCheckHook + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + # Ignore tests which require network access + disabledTestFiles = [ + "tests/unit/create/test_creator.py" + "tests/unit/seed/embed/test_bootstrap_link_via_app_data.py" + ]; + + disabledTests = [ + "test_can_build_c_extensions" + "test_xonsh" # imports xonsh, which is not in pythonPackages + ]; + + pythonImportsCheck = [ "virtualenv" ]; + + meta = with lib; { description = "A tool to create isolated Python environments"; homepage = "http://www.virtualenv.org"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ goibhniu ]; + license = licenses.mit; + maintainers = with maintainers; [ goibhniu ]; }; } diff --git a/pkgs/development/python-modules/virtualenvwrapper/default.nix b/pkgs/development/python-modules/virtualenvwrapper/default.nix index 658f41126fc..087a1a2ca51 100644 --- a/pkgs/development/python-modules/virtualenvwrapper/default.nix +++ b/pkgs/development/python-modules/virtualenvwrapper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pbr diff --git a/pkgs/development/python-modules/vmprof/default.nix b/pkgs/development/python-modules/vmprof/default.nix index f8be722ef90..3962a1e02c3 100644 --- a/pkgs/development/python-modules/vmprof/default.nix +++ b/pkgs/development/python-modules/vmprof/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , colorama diff --git a/pkgs/development/python-modules/vncdo/default.nix b/pkgs/development/python-modules/vncdo/default.nix index cb1b1677e1b..ef33a46cc34 100644 --- a/pkgs/development/python-modules/vncdo/default.nix +++ b/pkgs/development/python-modules/vncdo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, fetchFromGitHub , buildPythonPackage, isPy27 , pillow , twisted diff --git a/pkgs/development/python-modules/voluptuous-serialize/default.nix b/pkgs/development/python-modules/voluptuous-serialize/default.nix index d054a32c30e..4c31b5f758a 100644 --- a/pkgs/development/python-modules/voluptuous-serialize/default.nix +++ b/pkgs/development/python-modules/voluptuous-serialize/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, buildPythonPackage, isPy3k, fetchPypi, voluptuous, pytest }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy3k +, pytestCheckHook +, voluptuous +}: buildPythonPackage rec { pname = "voluptuous-serialize"; @@ -6,28 +12,24 @@ buildPythonPackage rec { disabled = !isPy3k; - src = fetchPypi { - inherit pname version; - sha256 = "1r7avibzf009h5rlh7mbh1fc01daligvi2axjn5qxh810g5igfn6"; + src = fetchFromGitHub { + owner = "home-assistant-libs"; + repo = pname; + rev = version; + sha256 = "1km2y1xaagkdvsy3bmi1sc040x5yyfdw6llmwdv9z8nz67m9v1ya"; }; - propagatedBuildInputs = [ - voluptuous - ]; + propagatedBuildInputs = [ voluptuous ]; checkInputs = [ - pytest + pytestCheckHook + voluptuous ]; - checkPhase = '' - py.test - ''; - - # no tests in PyPI tarball - doCheck = false; + pythonImportsCheck = [ "voluptuous_serialize" ]; meta = with lib; { - homepage = "https://github.com/balloob/voluptuous-serialize"; + homepage = "https://github.com/home-assistant-libs/voluptuous-serialize"; license = licenses.asl20; description = "Convert Voluptuous schemas to dictionaries so they can be serialized"; maintainers = with maintainers; [ etu ]; diff --git a/pkgs/development/python-modules/voluptuous/default.nix b/pkgs/development/python-modules/voluptuous/default.nix index 63be8cd4bd0..9882724fbb6 100644 --- a/pkgs/development/python-modules/voluptuous/default.nix +++ b/pkgs/development/python-modules/voluptuous/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, nose }: +{ lib, buildPythonPackage, fetchPypi, nose }: buildPythonPackage rec { pname = "voluptuous"; diff --git a/pkgs/development/python-modules/vsure/default.nix b/pkgs/development/python-modules/vsure/default.nix new file mode 100644 index 00000000000..578578a21b1 --- /dev/null +++ b/pkgs/development/python-modules/vsure/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +}: + +buildPythonPackage rec { + pname = "vsure"; + version = "1.6.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1lsr0wl1dwbzpn68ww348yk6v42bw89nrghz5gjsimrr428zw6qn"; + }; + + propagatedBuildInputs = [ requests ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "verisure" ]; + + meta = with lib; { + description = "Python library for working with verisure devices"; + homepage = "https://github.com/persandstrom/python-verisure"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/vultr/default.nix b/pkgs/development/python-modules/vultr/default.nix index d4349d310be..975e4098112 100644 --- a/pkgs/development/python-modules/vultr/default.nix +++ b/pkgs/development/python-modules/vultr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , requests diff --git a/pkgs/development/python-modules/vulture/default.nix b/pkgs/development/python-modules/vulture/default.nix index b657d26c706..7ab5bcbb65b 100644 --- a/pkgs/development/python-modules/vulture/default.nix +++ b/pkgs/development/python-modules/vulture/default.nix @@ -1,17 +1,32 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, coverage, pytest, pytestcov }: +{ lib +, buildPythonPackage +, coverage +, fetchPypi +, isPy27 +, pytest-cov +, pytestCheckHook +, toml +}: buildPythonPackage rec { pname = "vulture"; - version = "2.1"; + version = "2.3"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "933bf7f3848e9e39ecab6a12faa59d5185471c887534abac13baea6fe8138cc2"; + sha256 = "0ryrmsm72z3fzaanyblz49q40h9d3bbl4pspn2lvkkp9rcmsdm83"; }; - checkInputs = [ coverage pytest pytestcov ]; - checkPhase = "pytest"; + propagatedBuildInputs = [ toml ]; + + checkInputs = [ + coverage + pytest-cov + pytestCheckHook + ]; + + pythonImportsCheck = [ "vulture" ]; meta = with lib; { description = "Finds unused code in Python programs"; diff --git a/pkgs/development/python-modules/vxi11/default.nix b/pkgs/development/python-modules/vxi11/default.nix index 5d9531aa904..242fe47b33d 100644 --- a/pkgs/development/python-modules/vxi11/default.nix +++ b/pkgs/development/python-modules/vxi11/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, nose }: +{ lib, buildPythonPackage, fetchFromGitHub, nose }: buildPythonPackage rec { pname = "python-vxi11"; diff --git a/pkgs/development/python-modules/w3lib/default.nix b/pkgs/development/python-modules/w3lib/default.nix index ae404e01cfb..0c80423e36a 100644 --- a/pkgs/development/python-modules/w3lib/default.nix +++ b/pkgs/development/python-modules/w3lib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/pkgs/development/python-modules/waitress/default.nix b/pkgs/development/python-modules/waitress/default.nix index 09f4f66e0b5..4edd4c6ccff 100644 --- a/pkgs/development/python-modules/waitress/default.nix +++ b/pkgs/development/python-modules/waitress/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/wakeonlan/default.nix b/pkgs/development/python-modules/wakeonlan/default.nix index 29c30e7ba6a..86d405a33ef 100644 --- a/pkgs/development/python-modules/wakeonlan/default.nix +++ b/pkgs/development/python-modules/wakeonlan/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, setuptools_scm, pytest, mock }: +{ lib, fetchPypi, buildPythonPackage, setuptools_scm, pytest, mock }: buildPythonPackage rec { pname = "wakeonlan"; diff --git a/pkgs/development/python-modules/waqiasync/default.nix b/pkgs/development/python-modules/waqiasync/default.nix new file mode 100644 index 00000000000..3b8dfce6114 --- /dev/null +++ b/pkgs/development/python-modules/waqiasync/default.nix @@ -0,0 +1,32 @@ +{ lib +, aiohttp +, async-timeout +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "waqiasync"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1yxls7ywfg954c3vxgnp98qa1b8dsq9b2fld11fb9sx1k4mjc29d"; + }; + + propagatedBuildInputs = [ + aiohttp + async-timeout + ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "waqiasync" ]; + + meta = with lib; { + description = "Python library for http://aqicn.org"; + homepage = "https://github.com/andrey-git/waqi-async"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/warlock/default.nix b/pkgs/development/python-modules/warlock/default.nix index 80dcabdcb20..1b62c918f33 100644 --- a/pkgs/development/python-modules/warlock/default.nix +++ b/pkgs/development/python-modules/warlock/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/pkgs/development/python-modules/wasabi/default.nix b/pkgs/development/python-modules/wasabi/default.nix index 5a0c2ecaa5f..3e674ae266f 100644 --- a/pkgs/development/python-modules/wasabi/default.nix +++ b/pkgs/development/python-modules/wasabi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytestCheckHook @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "wasabi"; - version = "0.8.0"; + version = "0.8.1"; src = fetchPypi { inherit pname version; - sha256 = "75fec6db6193c8615d7f398ae4aa2c4ad294e6e3e81c6a6dbbbd3864ee2223c3"; + sha256 = "6e5228a51f5550844ef5080e74759e7ecb6e344241989d018686ba968f0b4f5a"; }; checkInputs = [ pytestCheckHook ]; @@ -20,6 +20,5 @@ buildPythonPackage rec { homepage = "https://github.com/ines/wasabi"; changelog = "https://github.com/ines/wasabi/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ danieldk ]; }; } diff --git a/pkgs/development/python-modules/wasmer/default.nix b/pkgs/development/python-modules/wasmer/default.nix index e8307365574..62c8a2a06b7 100644 --- a/pkgs/development/python-modules/wasmer/default.nix +++ b/pkgs/development/python-modules/wasmer/default.nix @@ -8,19 +8,19 @@ }: let pname = "wasmer"; - version = "1.0.0-beta1"; + version = "1.0.0"; wheel = rustPlatform.buildRustPackage rec { - name = "${pname}-${version}-py${python.version}"; + inherit pname version; src = fetchFromGitHub { owner = "wasmerio"; repo = "wasmer-python"; rev = version; - sha256 = "0302lcfjlw7nz18nf86z6swhhpp1qnpwcsm2fj4avl22rsv0h78j"; + hash = "sha256-I1GfjLaPYMIHKh2m/5IQepUsJNiVUEJg49wyuuzUYtY="; }; - cargoSha256 = "0d83dniijjq8rc4fcwj6ja5x4hxh187afnqfd8c9fzb8nx909a0v"; + cargoHash = "sha256-txOOia1C4W+nsXuXp4EytEn82CFfSmiOYwRLC4WPImc="; nativeBuildInputs = [ maturin python ]; @@ -50,8 +50,6 @@ let in buildPythonPackage rec { inherit pname version; - # we can only support one python version because the cargo hash changes with the python version - disabled = !isPy38; format = "wheel"; src = wheel; diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix index 893cdd7e99b..693cfcce926 100644 --- a/pkgs/development/python-modules/watchdog/default.nix +++ b/pkgs/development/python-modules/watchdog/default.nix @@ -5,22 +5,34 @@ , pathtools , pyyaml , pkgs +, pytest-cov +, pytestCheckHook }: buildPythonPackage rec { pname = "watchdog"; - version = "0.10.4"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "e38bffc89b15bafe2a131f0e1c74924cf07dcec020c2e0a26cccd208831fcd43"; + sha256 = "sha256-N2y8KjXAOSsP5/8W+8GzA/2Z1N2ZEatVge6daa3IiYI="; }; - buildInputs = stdenv.lib.optionals stdenv.isDarwin + buildInputs = lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.CoreServices ]; - propagatedBuildInputs = [ argh pathtools pyyaml ]; - doCheck = false; + propagatedBuildInputs = [ + argh + pathtools + pyyaml + ]; + + checkInputs = [ + pytest-cov + pytestCheckHook + ]; + + pythonImportsCheck = [ "watchdog" ]; meta = with lib; { description = "Python API and shell utilities to monitor file system events"; diff --git a/pkgs/development/python-modules/waterfurnace/default.nix b/pkgs/development/python-modules/waterfurnace/default.nix new file mode 100644 index 00000000000..a07c1e6333e --- /dev/null +++ b/pkgs/development/python-modules/waterfurnace/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, click +, fetchFromGitHub +, mock +, pytest-runner +, pytestCheckHook +, requests +, websocket_client +}: + +buildPythonPackage rec { + pname = "waterfurnace"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "sdague"; + repo = pname; + rev = "v${version}"; + sha256 = "1ba247fw1fvi7zy31zj2wbjq7fajrbxhp139cl9jj67rfvxfv8xf"; + }; + + propagatedBuildInputs = [ + click + pytest-runner + requests + websocket_client + ]; + + checkInputs = [ + mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "waterfurnace" ]; + + meta = with lib; { + description = "Python interface to waterfurnace geothermal systems"; + homepage = "https://github.com/sdague/waterfurnace"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/web/default.nix b/pkgs/development/python-modules/web/default.nix index 84b4cc8dcfb..1b40519d592 100644 --- a/pkgs/development/python-modules/web/default.nix +++ b/pkgs/development/python-modules/web/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytestCheckHook +{ lib, buildPythonPackage, fetchPypi, pytestCheckHook , cheroot , dbutils, mysqlclient, pymysql, mysql-connector, psycopg2 }: diff --git a/pkgs/development/python-modules/webapp2/default.nix b/pkgs/development/python-modules/webapp2/default.nix index 048c5d91b1d..841fb5bd74b 100644 --- a/pkgs/development/python-modules/webapp2/default.nix +++ b/pkgs/development/python-modules/webapp2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , webob diff --git a/pkgs/development/python-modules/webhelpers/default.nix b/pkgs/development/python-modules/webhelpers/default.nix index 040341ed376..dcb2bd3817d 100644 --- a/pkgs/development/python-modules/webhelpers/default.nix +++ b/pkgs/development/python-modules/webhelpers/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , routes diff --git a/pkgs/development/python-modules/webob/default.nix b/pkgs/development/python-modules/webob/default.nix index 78ca8f918a3..124b45a2eb3 100644 --- a/pkgs/development/python-modules/webob/default.nix +++ b/pkgs/development/python-modules/webob/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/pkgs/development/python-modules/websockify/default.nix b/pkgs/development/python-modules/websockify/default.nix index 021344b2207..d3072e75041 100644 --- a/pkgs/development/python-modules/websockify/default.nix +++ b/pkgs/development/python-modules/websockify/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , numpy diff --git a/pkgs/development/python-modules/webtest/default.nix b/pkgs/development/python-modules/webtest/default.nix index 98ee58d3f6c..d56e5415b91 100644 --- a/pkgs/development/python-modules/webtest/default.nix +++ b/pkgs/development/python-modules/webtest/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix index 858130b805f..7f35dd124d8 100644 --- a/pkgs/development/python-modules/werkzeug/default.nix +++ b/pkgs/development/python-modules/werkzeug/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ itsdangerous ]; checkInputs = [ pytestCheckHook requests hypothesis pytest-timeout ]; - disabledTests = stdenv.lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.isDarwin [ "test_get_machine_id" ]; diff --git a/pkgs/development/python-modules/whisper/default.nix b/pkgs/development/python-modules/whisper/default.nix index ad25df4868a..7b084c16267 100644 --- a/pkgs/development/python-modules/whisper/default.nix +++ b/pkgs/development/python-modules/whisper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, mock, six }: +{ lib, buildPythonPackage, fetchPypi, mock, six }: buildPythonPackage rec { pname = "whisper"; diff --git a/pkgs/development/python-modules/whitenoise/default.nix b/pkgs/development/python-modules/whitenoise/default.nix index 2399c6ed73f..3c63c727c0d 100644 --- a/pkgs/development/python-modules/whitenoise/default.nix +++ b/pkgs/development/python-modules/whitenoise/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, isPy27 }: +{ lib, fetchPypi, buildPythonPackage, isPy27 }: buildPythonPackage rec { pname = "whitenoise"; diff --git a/pkgs/development/python-modules/whoosh/default.nix b/pkgs/development/python-modules/whoosh/default.nix index f5bbccec2a5..d3ff703f694 100644 --- a/pkgs/development/python-modules/whoosh/default.nix +++ b/pkgs/development/python-modules/whoosh/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest }: +{ lib, buildPythonPackage, fetchPypi, pytest }: buildPythonPackage rec { pname = "Whoosh"; diff --git a/pkgs/development/python-modules/willow/default.nix b/pkgs/development/python-modules/willow/default.nix index fbf4965117b..3dafd4df44b 100644 --- a/pkgs/development/python-modules/willow/default.nix +++ b/pkgs/development/python-modules/willow/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonOlder diff --git a/pkgs/development/python-modules/word2vec/default.nix b/pkgs/development/python-modules/word2vec/default.nix index 647914bfbe5..259566c8fc2 100644 --- a/pkgs/development/python-modules/word2vec/default.nix +++ b/pkgs/development/python-modules/word2vec/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , fetchzip diff --git a/pkgs/development/python-modules/wordcloud/default.nix b/pkgs/development/python-modules/wordcloud/default.nix index b4dd108ae73..80f22efbda8 100644 --- a/pkgs/development/python-modules/wordcloud/default.nix +++ b/pkgs/development/python-modules/wordcloud/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchFromGitHub , matplotlib , mock , numpy diff --git a/pkgs/development/python-modules/worldengine/default.nix b/pkgs/development/python-modules/worldengine/default.nix index 51c0de77917..13ce4bc873d 100644 --- a/pkgs/development/python-modules/worldengine/default.nix +++ b/pkgs/development/python-modules/worldengine/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , pythonOlder , isPy27 diff --git a/pkgs/development/python-modules/wrapio/default.nix b/pkgs/development/python-modules/wrapio/default.nix index 757585bd145..bbbc1917f54 100644 --- a/pkgs/development/python-modules/wrapio/default.nix +++ b/pkgs/development/python-modules/wrapio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/wrf-python/default.nix b/pkgs/development/python-modules/wrf-python/default.nix index c4bc74a58d2..29279cc1a44 100644 --- a/pkgs/development/python-modules/wrf-python/default.nix +++ b/pkgs/development/python-modules/wrf-python/default.nix @@ -39,5 +39,5 @@ buildPythonPackage rec { homepage = "http://wrf-python.rtfd.org"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ mhaselsteiner ]; - }; + }; } diff --git a/pkgs/development/python-modules/ws4py/default.nix b/pkgs/development/python-modules/ws4py/default.nix index 2b7a66df285..8abf78520dc 100644 --- a/pkgs/development/python-modules/ws4py/default.nix +++ b/pkgs/development/python-modules/ws4py/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, mock, git +{ lib, buildPythonPackage, fetchPypi, pytest, mock, git , cherrypy, gevent, tornado }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/wsgiproxy/default.nix b/pkgs/development/python-modules/wsgiproxy/default.nix index 12aa3c88d96..e2cc26ff143 100644 --- a/pkgs/development/python-modules/wsgiproxy/default.nix +++ b/pkgs/development/python-modules/wsgiproxy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , paste diff --git a/pkgs/development/python-modules/wsgiproxy2/default.nix b/pkgs/development/python-modules/wsgiproxy2/default.nix index 81a2f98b86f..2a9856cdd08 100644 --- a/pkgs/development/python-modules/wsgiproxy2/default.nix +++ b/pkgs/development/python-modules/wsgiproxy2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/pkgs/development/python-modules/wtforms/default.nix b/pkgs/development/python-modules/wtforms/default.nix index 45c465ddcba..96440c438bc 100644 --- a/pkgs/development/python-modules/wtforms/default.nix +++ b/pkgs/development/python-modules/wtforms/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , markupsafe diff --git a/pkgs/development/python-modules/wxPython/3.0.nix b/pkgs/development/python-modules/wxPython/3.0.nix index dc15c1c01be..6649c5f6931 100644 --- a/pkgs/development/python-modules/wxPython/3.0.nix +++ b/pkgs/development/python-modules/wxPython/3.0.nix @@ -6,7 +6,7 @@ , libX11 , wxGTK , wxmac -, pkgconfig +, pkg-config , buildPythonPackage , pyopengl , isPy3k @@ -35,7 +35,7 @@ buildPythonPackage rec { hardeningDisable = [ "format" ]; - nativeBuildInputs = [ pkgconfig ] + nativeBuildInputs = [ pkg-config ] ++ (lib.optionals (!stdenv.isDarwin) [ wxGTK libX11 ]) ++ (lib.optionals stdenv.isDarwin [ wxmac ]); diff --git a/pkgs/development/python-modules/wxPython/4.0.nix b/pkgs/development/python-modules/wxPython/4.0.nix index 406493362c4..d72d4aa35d4 100644 --- a/pkgs/development/python-modules/wxPython/4.0.nix +++ b/pkgs/development/python-modules/wxPython/4.0.nix @@ -2,17 +2,25 @@ , stdenv , buildPythonPackage , fetchPypi -, pkgconfig +, pkg-config , which , cairo , pango , python , doxygen , ncurses -, wxGTK +, libintl , numpy , pillow , six +, wxGTK +, wxmac +, IOKit +, Carbon +, Cocoa +, AudioToolbox +, OpenGL +, CoreFoundation }: buildPythonPackage rec { @@ -26,8 +34,16 @@ buildPythonPackage rec { doCheck = false; - nativeBuildInputs = [ pkgconfig which doxygen wxGTK ]; - buildInputs = [ ncurses wxGTK.gtk ]; + nativeBuildInputs = [ pkg-config which doxygen ] + ++ (if stdenv.isDarwin then [ wxmac ] else [ wxGTK ]); + + buildInputs = [ ncurses libintl ] + ++ (if stdenv.isDarwin + then + [ AudioToolbox Carbon Cocoa CoreFoundation IOKit OpenGL ] + else + [ wxGTK.gtk ] + ); DOXYGEN = "${doxygen}/bin/doxygen"; @@ -50,7 +66,7 @@ buildPythonPackage rec { ${python.interpreter} setup.py install --skip-build --prefix=$out ''; - passthru = { inherit wxGTK; }; + passthru = { wxWidgets = if stdenv.isDarwin then wxmac else wxGTK; }; meta = { diff --git a/pkgs/development/python-modules/wxPython/4.1.nix b/pkgs/development/python-modules/wxPython/4.1.nix index 6d07f8b5e28..e4cb6ec79e0 100644 --- a/pkgs/development/python-modules/wxPython/4.1.nix +++ b/pkgs/development/python-modules/wxPython/4.1.nix @@ -3,7 +3,7 @@ , fetchPypi , buildPythonPackage , which -, pkgconfig +, pkg-config , python , isPy27 , pyopengl @@ -30,7 +30,7 @@ buildPythonPackage rec { # https://github.com/wxWidgets/Phoenix/issues/1316 doCheck = false; - nativeBuildInputs = [ which doxygen wxGTK pkgconfig ]; + nativeBuildInputs = [ which doxygen wxGTK pkg-config ]; buildInputs = [ wxGTK.gtk diff --git a/pkgs/development/python-modules/x11_hash/default.nix b/pkgs/development/python-modules/x11_hash/default.nix index 21bb787402c..e9cfe317432 100644 --- a/pkgs/development/python-modules/x11_hash/default.nix +++ b/pkgs/development/python-modules/x11_hash/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/x256/default.nix b/pkgs/development/python-modules/x256/default.nix index 4ceb2dcae79..4430fa2e4b8 100644 --- a/pkgs/development/python-modules/x256/default.nix +++ b/pkgs/development/python-modules/x256/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/xapp/default.nix b/pkgs/development/python-modules/xapp/default.nix index 28901017b2b..72f386b3627 100644 --- a/pkgs/development/python-modules/xapp/default.nix +++ b/pkgs/development/python-modules/xapp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , buildPythonPackage , psutil @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "xapp"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = "python-xapp"; rev = version; - sha256 = "1pp3z4q6ryxcc26kaq222j53ji110n2v7rx29c7vy1fbb8mq64im"; + sha256 = "1zgh4k96i939w4scikajmlriayk1zg3md16f8fckjvqbphpxrysl"; }; propagatedBuildInputs = [ @@ -33,6 +33,9 @@ buildPythonPackage rec { substituteInPlace "xapp/os.py" --replace "/usr/bin/pkexec" "${polkit}/bin/pkexec" ''; + doCheck = false; + pythonImportsCheck = [ "xapp" ]; + meta = with lib; { homepage = "https://github.com/linuxmint/python-xapp"; description = "Cross-desktop libraries and common resources for python"; diff --git a/pkgs/development/python-modules/xattr/default.nix b/pkgs/development/python-modules/xattr/default.nix index 3583358a560..a39c3532f4b 100644 --- a/pkgs/development/python-modules/xattr/default.nix +++ b/pkgs/development/python-modules/xattr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , python diff --git a/pkgs/development/python-modules/xc-fasm/default.nix b/pkgs/development/python-modules/xc-fasm/default.nix deleted file mode 100644 index bf00bb15901..00000000000 --- a/pkgs/development/python-modules/xc-fasm/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenv -, fetchFromGitHub -, buildPythonPackage -, pytestCheckHook -, simplejson -, intervaltree -, python-prjxray -, symbiflow-fasm -, textx -}: - -buildPythonPackage rec { - pname = "xc-fasm"; - version = "0.0.1-g0ddd9516"; - - src = fetchFromGitHub { - owner = "SymbiFlow"; - repo = "xc-fasm"; - rev = "0ddd951602d47d5b95f2072f8aa751af5e81e577"; - sha256 = "15bzw92sx99s0zldr48na4yhrnp7b90nxsd8ya6ag1pvvijp2al4"; - }; - - propagatedBuildInputs = [ - simplejson - intervaltree - python-prjxray - symbiflow-fasm - textx - ]; - - # Pip will check for and then install missing dependecies. - # Because some of them are installed from git, it will try - # to download them even if they're present in - # propagatedBuildInputs. - pipInstallFlags = [ "--no-deps" ]; - - checkInputs = [ pytestCheckHook ]; - - meta = with stdenv.lib; { - description = "XC FASM libraries"; - homepage = "https://github.com/SymbiFlow/xc-fasm"; - license = licenses.isc; - maintainers = with maintainers; [ mcaju ]; - }; -} diff --git a/pkgs/development/python-modules/xcaplib/default.nix b/pkgs/development/python-modules/xcaplib/default.nix index f6bb5712c2e..086eaf1e348 100644 --- a/pkgs/development/python-modules/xcaplib/default.nix +++ b/pkgs/development/python-modules/xcaplib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchdarcs , isPy3k diff --git a/pkgs/development/python-modules/xcffib/default.nix b/pkgs/development/python-modules/xcffib/default.nix index 33431684708..8f51ec1e77f 100644 --- a/pkgs/development/python-modules/xcffib/default.nix +++ b/pkgs/development/python-modules/xcffib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , xorg diff --git a/pkgs/development/python-modules/xdg/default.nix b/pkgs/development/python-modules/xdg/default.nix index 8b2d73b00fb..e47a91fb993 100644 --- a/pkgs/development/python-modules/xdg/default.nix +++ b/pkgs/development/python-modules/xdg/default.nix @@ -1,11 +1,11 @@ { lib, buildPythonPackage, fetchFromGitHub, isPy27 , clikit -, poetry +, poetry-core , pytestCheckHook }: buildPythonPackage rec { - version = "4.0.1"; + version = "5.0.1"; pname = "xdg"; disabled = isPy27; format = "pyproject"; @@ -14,10 +14,10 @@ buildPythonPackage rec { owner = "srstevenson"; repo = pname; rev = version; - sha256 = "13kgnbwam6wmdbig0m98vmyjcqrp0j62nmfknb6prr33ns2nxbs2"; + sha256 = "sha256-WMY9Hs9SbErTp8hVBoCWTz4dLQhuzqTRpXFEyE7+woo="; }; - nativeBuildInputs = [ poetry ]; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ clikit diff --git a/pkgs/development/python-modules/xdot/default.nix b/pkgs/development/python-modules/xdot/default.nix index 21b45b9c322..7dbbd89e781 100644 --- a/pkgs/development/python-modules/xdot/default.nix +++ b/pkgs/development/python-modules/xdot/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, python3, xvfb_run, stdenv +{ lib, buildPythonPackage, fetchPypi, isPy3k, python3, xvfb_run , wrapGAppsHook, gobject-introspection, pygobject3, graphviz, gtk3, numpy }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/xhtml2pdf/default.nix b/pkgs/development/python-modules/xhtml2pdf/default.nix index e3328c7e453..efdb40cd6f8 100644 --- a/pkgs/development/python-modules/xhtml2pdf/default.nix +++ b/pkgs/development/python-modules/xhtml2pdf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pillow diff --git a/pkgs/development/python-modules/xkcdpass/default.nix b/pkgs/development/python-modules/xkcdpass/default.nix index 88f7b9b94a1..e372a843cf8 100644 --- a/pkgs/development/python-modules/xkcdpass/default.nix +++ b/pkgs/development/python-modules/xkcdpass/default.nix @@ -1,6 +1,8 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi +, pytestCheckHook +, installShellFiles }: buildPythonPackage rec { @@ -12,14 +14,21 @@ buildPythonPackage rec { sha256 = "0ghsjs5bxl996pap910q9s21nywb26mfpjd92rbfywbnj8f2k2cy"; }; - # No tests included - # https://github.com/redacted/XKCD-password-generator/issues/32 - doCheck = false; + nativeBuildInputs = [ installShellFiles ]; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "xkcdpass" ]; + + postInstall = '' + installManPage *.? + install -Dm444 -t $out/share/doc/${pname} README* + ''; meta = with lib; { - homepage = "https://pypi.python.org/pypi/xkcdpass/"; description = "Generate secure multiword passwords/passphrases, inspired by XKCD"; + homepage = "https://pypi.python.org/pypi/xkcdpass/"; license = licenses.bsd3; + maintainers = with maintainers; [ peterhoeg ]; }; - } diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix new file mode 100644 index 00000000000..b448f87a2d3 --- /dev/null +++ b/pkgs/development/python-modules/xknx/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, netifaces +, voluptuous +, pyyaml +, pytest-asyncio +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "xknx"; + version = "0.16.1"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "XKNX"; + repo = pname; + rev = version; + sha256 = "0nma0fq67p9c90b6s5v7n4s6j94sdiwqf8rk1k2vfc6nxxn1jfll"; + }; + + propagatedBuildInputs = [ + voluptuous + netifaces + pyyaml + ]; + + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "xknx" ]; + + meta = with lib; { + description = "KNX Library Written in Python"; + longDescription = '' + XKNX is an asynchronous Python library for reading and writing KNX/IP + packets. It provides support for KNX/IP routing and tunneling devices. + ''; + homepage = "https://github.com/XKNX/xknx"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/xlrd/default.nix b/pkgs/development/python-modules/xlrd/default.nix index 031ac047936..d880fd83396 100644 --- a/pkgs/development/python-modules/xlrd/default.nix +++ b/pkgs/development/python-modules/xlrd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/pkgs/development/python-modules/xlsx2csv/default.nix b/pkgs/development/python-modules/xlsx2csv/default.nix index a5b67632d83..6f7726da68d 100644 --- a/pkgs/development/python-modules/xlsx2csv/default.nix +++ b/pkgs/development/python-modules/xlsx2csv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index e06daf3c5b8..fdf042c2ac2 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, pythonAtLeast, intervaltree, pyflakes, requests, lxml, google-i18n-address +{ lib, fetchPypi, buildPythonPackage, pythonAtLeast, intervaltree, pyflakes, requests, lxml, google-i18n-address , pycountry, html5lib, six, kitchen, pypdf2, dict2xml, weasyprint, pyyaml, jinja2, ConfigArgParse, appdirs }: diff --git a/pkgs/development/python-modules/xmodem/default.nix b/pkgs/development/python-modules/xmodem/default.nix index 9023c4cc79e..a53567f7fa8 100644 --- a/pkgs/development/python-modules/xmodem/default.nix +++ b/pkgs/development/python-modules/xmodem/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pytest, which, lrzsz }: +{ lib, buildPythonPackage, fetchFromGitHub, pytest, which, lrzsz }: buildPythonPackage rec { pname = "xmodem"; diff --git a/pkgs/development/python-modules/xmpppy/default.nix b/pkgs/development/python-modules/xmpppy/default.nix index fd046adadd9..65e2b3711fa 100644 --- a/pkgs/development/python-modules/xmpppy/default.nix +++ b/pkgs/development/python-modules/xmpppy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchurl, isPy3k }: +{ lib, buildPythonPackage, fetchurl, isPy3k }: buildPythonPackage rec { pname = "xmpp.py"; version = "0.5.0rc1"; diff --git a/pkgs/development/python-modules/xnd/default.nix b/pkgs/development/python-modules/xnd/default.nix index 3178e171f84..3657997f5a7 100644 --- a/pkgs/development/python-modules/xnd/default.nix +++ b/pkgs/development/python-modules/xnd/default.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , buildPythonPackage , python , ndtypes @@ -27,7 +28,7 @@ buildPythonPackage { postInstall = '' mkdir $out/include cp python/xnd/*.h $out/include - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' install_name_tool -add_rpath ${libxnd}/lib $out/${python.sitePackages}/xnd/_xnd.*.so ''; diff --git a/pkgs/development/python-modules/xvfbwrapper/default.nix b/pkgs/development/python-modules/xvfbwrapper/default.nix index 0852fd2e15c..f037cb40338 100644 --- a/pkgs/development/python-modules/xvfbwrapper/default.nix +++ b/pkgs/development/python-modules/xvfbwrapper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , xorgserver diff --git a/pkgs/development/python-modules/xxhash/default.nix b/pkgs/development/python-modules/xxhash/default.nix index d2f6ae54a4c..08bcfcdacde 100644 --- a/pkgs/development/python-modules/xxhash/default.nix +++ b/pkgs/development/python-modules/xxhash/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix index 7145c504cd9..13545c0430d 100644 --- a/pkgs/development/python-modules/yamllint/default.nix +++ b/pkgs/development/python-modules/yamllint/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , nose, pyyaml, pathspec }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/yanc/default.nix b/pkgs/development/python-modules/yanc/default.nix index 6d4a3b41fbc..925276c0ad6 100644 --- a/pkgs/development/python-modules/yanc/default.nix +++ b/pkgs/development/python-modules/yanc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, pythonOlder, fetchPypi, nose }: +{ lib, buildPythonPackage, pythonOlder, fetchPypi, nose }: buildPythonPackage rec { pname = "yanc"; diff --git a/pkgs/development/python-modules/yapf/default.nix b/pkgs/development/python-modules/yapf/default.nix index 36409ae4019..9c0e9d35399 100644 --- a/pkgs/development/python-modules/yapf/default.nix +++ b/pkgs/development/python-modules/yapf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "yapf"; diff --git a/pkgs/development/python-modules/yapsy/default.nix b/pkgs/development/python-modules/yapsy/default.nix index 359a855a3e5..e60b0a11473 100644 --- a/pkgs/development/python-modules/yapsy/default.nix +++ b/pkgs/development/python-modules/yapsy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/yarl/default.nix b/pkgs/development/python-modules/yarl/default.nix index 7a88b695f63..0aeb85e6ca2 100644 --- a/pkgs/development/python-modules/yarl/default.nix +++ b/pkgs/development/python-modules/yarl/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , fetchPypi , buildPythonPackage , pythonOlder diff --git a/pkgs/development/python-modules/ydiff/default.nix b/pkgs/development/python-modules/ydiff/default.nix index 89b063f84be..e7452b89a53 100644 --- a/pkgs/development/python-modules/ydiff/default.nix +++ b/pkgs/development/python-modules/ydiff/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi, docutils, pygments +, gitMinimal, mercurial, subversion, patchutils, less +}: buildPythonPackage rec { pname = "ydiff"; @@ -9,21 +11,38 @@ buildPythonPackage rec { sha256 = "f5430577ecd30974d766ee9b8333e06dc76a947b4aae36d39612a0787865a121"; }; - # test suite requires a multitude of other version control tooling - # currently only a single file, an import/usage should suffice + patchPhase = '' + substituteInPlace ydiff.py \ + --replace "['git'" "['${gitMinimal}/bin/git'" \ + --replace "['hg'" "['${mercurial}/bin/hg'" \ + --replace "['svn'" "['${subversion}/bin/svn'" \ + --replace "['filterdiff'" "['${patchutils}/bin/filterdiff'" \ + --replace "['less'" "['${less}/bin/less'" # doesn't support PAGER from env + substituteInPlace tests/test_ydiff.py \ + --replace /bin/rm rm \ + --replace /bin/sh sh + patchShebangs setup.py + patchShebangs tests/*.sh + ''; + + checkInputs = [ docutils pygments ]; + checkPhase = '' - $out/bin/ydiff --help + runHook preCheck + make doc-check reg # We don't want the linter or coverage check. + runHook postCheck ''; meta = with lib; { description = "View colored, incremental diff in workspace or from stdin with side by side and auto pager support (Was \"cdiff\")"; longDescription = '' - Term based tool to view colored, incremental diff in a Git/Mercurial/Svn - workspace or from stdin, with side by side (similar to diff -y) and auto - pager support + Term based tool to view colored, incremental diff in a version + controlled workspace (supports Git, Mercurial, Perforce and Svn + so far) or from stdin, with side by side (similar to diff -y) + and auto pager support. ''; homepage = "https://github.com/ymattw/ydiff"; license = licenses.bsd3; - maintainers = teams.deshaw.members; + maintainers = (with maintainers; [ leenaars ]) ++ teams.deshaw.members; }; } diff --git a/pkgs/development/python-modules/youtube-dlc/default.nix b/pkgs/development/python-modules/youtube-dlc/default.nix deleted file mode 100644 index 9599828e65e..00000000000 --- a/pkgs/development/python-modules/youtube-dlc/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi }: - -buildPythonPackage rec { - pname = "youtube_dlc"; - version = "2020.11.11.post3"; - - src = fetchPypi { - inherit pname version; - sha256 = "WqoKpfvVPZrN+pW6s8JoApJusn5CXyPcg9VcsY8R0FM="; - }; - - # They are broken - doCheck = false; - - pythonImportsCheck = [ "youtube_dlc" ]; - - meta = with lib; { - homepage = "Media downloader supporting various sites such as youtube"; - description = "https://github.com/blackjack4494/yt-dlc"; - platforms = platforms.linux; - maintainers = with maintainers; [ freezeboy ]; - }; -} diff --git a/pkgs/development/python-modules/yowsup/default.nix b/pkgs/development/python-modules/yowsup/default.nix index 48c21434194..0ff3212f48c 100644 --- a/pkgs/development/python-modules/yowsup/default.nix +++ b/pkgs/development/python-modules/yowsup/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, lib, stdenv, fetchFromGitHub, six, python-axolotl, pytest +{ buildPythonPackage, lib, fetchFromGitHub, six, python-axolotl, pytest , isPy3k, consonance, appdirs }: diff --git a/pkgs/development/python-modules/z3c-checkversions/default.nix b/pkgs/development/python-modules/z3c-checkversions/default.nix index f1af120d56e..8610306ea6f 100644 --- a/pkgs/development/python-modules/z3c-checkversions/default.nix +++ b/pkgs/development/python-modules/z3c-checkversions/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , python diff --git a/pkgs/development/python-modules/zake/default.nix b/pkgs/development/python-modules/zake/default.nix index 1d1d21a462e..89635a88f35 100644 --- a/pkgs/development/python-modules/zake/default.nix +++ b/pkgs/development/python-modules/zake/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , kazoo diff --git a/pkgs/development/python-modules/zbaemon/default.nix b/pkgs/development/python-modules/zbaemon/default.nix index 4e126074b18..23eae31057f 100644 --- a/pkgs/development/python-modules/zbaemon/default.nix +++ b/pkgs/development/python-modules/zbaemon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , zconfig diff --git a/pkgs/development/python-modules/zbase32/default.nix b/pkgs/development/python-modules/zbase32/default.nix index a4e7a476bec..715da719bbb 100644 --- a/pkgs/development/python-modules/zbase32/default.nix +++ b/pkgs/development/python-modules/zbase32/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , setuptoolsDarcs diff --git a/pkgs/development/python-modules/zc_lockfile/default.nix b/pkgs/development/python-modules/zc_lockfile/default.nix index 3b75de3a24b..97289ec3630 100644 --- a/pkgs/development/python-modules/zc_lockfile/default.nix +++ b/pkgs/development/python-modules/zc_lockfile/default.nix @@ -2,7 +2,7 @@ , fetchPypi , mock , zope_testing -, lib, stdenv +, lib }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/zconfig/default.nix b/pkgs/development/python-modules/zconfig/default.nix index 4882f92b047..a6a00ad821b 100644 --- a/pkgs/development/python-modules/zconfig/default.nix +++ b/pkgs/development/python-modules/zconfig/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { url = "https://github.com/zopefoundation/ZConfig/commit/f0c2990d35ac3c924ecc8be4a5c71c8e4abbd0e5.patch"; sha256 = "1bjg3wrvii0rwzf3s0vlpzgg2ckj0h2zxkyxwjcr64s4k2vaq9ij"; }) - ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./remove-setlocale-test.patch; + ] ++ lib.optional stdenv.hostPlatform.isMusl ./remove-setlocale-test.patch; buildInputs = [ manuel docutils ]; propagatedBuildInputs = [ zope_testrunner ]; diff --git a/pkgs/development/python-modules/zdaemon/default.nix b/pkgs/development/python-modules/zdaemon/default.nix index 4e126074b18..23eae31057f 100644 --- a/pkgs/development/python-modules/zdaemon/default.nix +++ b/pkgs/development/python-modules/zdaemon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , zconfig diff --git a/pkgs/development/python-modules/zerobin/default.nix b/pkgs/development/python-modules/zerobin/default.nix index e1208875668..19d02a70496 100644 --- a/pkgs/development/python-modules/zerobin/default.nix +++ b/pkgs/development/python-modules/zerobin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , cherrypy diff --git a/pkgs/development/python-modules/zeroc-ice/default.nix b/pkgs/development/python-modules/zeroc-ice/default.nix index f85674d6867..6dccf51100e 100644 --- a/pkgs/development/python-modules/zeroc-ice/default.nix +++ b/pkgs/development/python-modules/zeroc-ice/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, openssl, bzip2 }: +{ lib, buildPythonPackage, fetchPypi, openssl, bzip2 }: buildPythonPackage rec { pname = "zeroc-ice"; diff --git a/pkgs/development/python-modules/zfec/default.nix b/pkgs/development/python-modules/zfec/default.nix index 8a5aaf46b0e..bcec7a09251 100644 --- a/pkgs/development/python-modules/zfec/default.nix +++ b/pkgs/development/python-modules/zfec/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , setuptoolsDarcs diff --git a/pkgs/development/python-modules/zict/default.nix b/pkgs/development/python-modules/zict/default.nix index da36c1cba89..611660fc3eb 100644 --- a/pkgs/development/python-modules/zict/default.nix +++ b/pkgs/development/python-modules/zict/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , pytest, heapdict, pythonOlder }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix index 4de49cbc46b..1a1c639a473 100644 --- a/pkgs/development/python-modules/zigpy-znp/default.nix +++ b/pkgs/development/python-modules/zigpy-znp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , async-timeout , asynctest , buildPythonPackage diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index 483c239ae5d..9a6b0feb3b7 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.29.0"; + version = "0.30.0"; src = fetchFromGitHub { owner = "zigpy"; repo = "zigpy"; rev = version; - sha256 = "1r4i2ya9f241rls9mi24dksx4srrzi8agshnqy12rclxlh7qb1aw"; + sha256 = "14qyxm7bj62fsvxfp6x3r1ygjlv7q3jjvq6gzj30na78x1fqr9g1"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zodb/default.nix b/pkgs/development/python-modules/zodb/default.nix index d48b9c4b950..aa7cc6c97eb 100644 --- a/pkgs/development/python-modules/zodb/default.nix +++ b/pkgs/development/python-modules/zodb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchPypi , buildPythonPackage , python diff --git a/pkgs/development/python-modules/zope_broken/default.nix b/pkgs/development/python-modules/zope_broken/default.nix index 899d7f3344b..a3583654e66 100644 --- a/pkgs/development/python-modules/zope_broken/default.nix +++ b/pkgs/development/python-modules/zope_broken/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , zope_interface diff --git a/pkgs/development/python-modules/zope_component/default.nix b/pkgs/development/python-modules/zope_component/default.nix index 6ea86b9b984..65556c9dc41 100644 --- a/pkgs/development/python-modules/zope_component/default.nix +++ b/pkgs/development/python-modules/zope_component/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , zope-deferredimport diff --git a/pkgs/development/python-modules/zope_configuration/default.nix b/pkgs/development/python-modules/zope_configuration/default.nix index e8d05b7767b..e3ede9f94af 100644 --- a/pkgs/development/python-modules/zope_configuration/default.nix +++ b/pkgs/development/python-modules/zope_configuration/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , zope_i18nmessageid diff --git a/pkgs/development/python-modules/zope_contenttype/default.nix b/pkgs/development/python-modules/zope_contenttype/default.nix index 6b66cca18aa..15010d80a14 100644 --- a/pkgs/development/python-modules/zope_contenttype/default.nix +++ b/pkgs/development/python-modules/zope_contenttype/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , zope_testrunner diff --git a/pkgs/development/python-modules/zope_deprecation/default.nix b/pkgs/development/python-modules/zope_deprecation/default.nix index cda7af8e7a0..7eb66f7a9c5 100644 --- a/pkgs/development/python-modules/zope_deprecation/default.nix +++ b/pkgs/development/python-modules/zope_deprecation/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , zope_testing diff --git a/pkgs/development/python-modules/zope_dottedname/default.nix b/pkgs/development/python-modules/zope_dottedname/default.nix index 0e8f3543136..cbd5cd6d653 100644 --- a/pkgs/development/python-modules/zope_dottedname/default.nix +++ b/pkgs/development/python-modules/zope_dottedname/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/zope_event/default.nix b/pkgs/development/python-modules/zope_event/default.nix index cc82da7ea9a..2ebf6e017b5 100644 --- a/pkgs/development/python-modules/zope_event/default.nix +++ b/pkgs/development/python-modules/zope_event/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/zope_exceptions/default.nix b/pkgs/development/python-modules/zope_exceptions/default.nix index 09f08c7bba4..0586227c61c 100644 --- a/pkgs/development/python-modules/zope_exceptions/default.nix +++ b/pkgs/development/python-modules/zope_exceptions/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , zope_interface diff --git a/pkgs/development/python-modules/zope_filerepresentation/default.nix b/pkgs/development/python-modules/zope_filerepresentation/default.nix index 7aae2a24d62..4792a09e26b 100644 --- a/pkgs/development/python-modules/zope_filerepresentation/default.nix +++ b/pkgs/development/python-modules/zope_filerepresentation/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , zope_schema diff --git a/pkgs/development/python-modules/zope_i18nmessageid/default.nix b/pkgs/development/python-modules/zope_i18nmessageid/default.nix index 49270488ecd..1155adc83e9 100644 --- a/pkgs/development/python-modules/zope_i18nmessageid/default.nix +++ b/pkgs/development/python-modules/zope_i18nmessageid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/pkgs/development/python-modules/zope_interface/default.nix b/pkgs/development/python-modules/zope_interface/default.nix index 7a32045fc3e..7b5d7abf682 100644 --- a/pkgs/development/python-modules/zope_interface/default.nix +++ b/pkgs/development/python-modules/zope_interface/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , zope_event diff --git a/pkgs/development/python-modules/zope_lifecycleevent/default.nix b/pkgs/development/python-modules/zope_lifecycleevent/default.nix index 28070ea67e7..809d8252cb2 100644 --- a/pkgs/development/python-modules/zope_lifecycleevent/default.nix +++ b/pkgs/development/python-modules/zope_lifecycleevent/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k @@ -22,7 +22,7 @@ buildPythonPackage rec { doCheck = false; # zope uses pep 420 namespaces for python3, doesn't work with nix + python2 - pythonImportsCheck = stdenv.lib.optionals isPy3k [ + pythonImportsCheck = lib.optionals isPy3k [ "zope.lifecycleevent" "zope.interface" ]; diff --git a/pkgs/development/python-modules/zope_location/default.nix b/pkgs/development/python-modules/zope_location/default.nix index 62b2cef9ea7..69fee2e338f 100644 --- a/pkgs/development/python-modules/zope_location/default.nix +++ b/pkgs/development/python-modules/zope_location/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , zope_proxy diff --git a/pkgs/development/python-modules/zope_proxy/default.nix b/pkgs/development/python-modules/zope_proxy/default.nix index af108c058c7..67e8a191d97 100644 --- a/pkgs/development/python-modules/zope_proxy/default.nix +++ b/pkgs/development/python-modules/zope_proxy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , zope_interface diff --git a/pkgs/development/python-modules/zope_schema/default.nix b/pkgs/development/python-modules/zope_schema/default.nix index c7e228c4e05..75683cb2eb8 100644 --- a/pkgs/development/python-modules/zope_schema/default.nix +++ b/pkgs/development/python-modules/zope_schema/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , zope_location diff --git a/pkgs/development/python-modules/zope_size/default.nix b/pkgs/development/python-modules/zope_size/default.nix index 79eadc880a2..6945dddceaa 100644 --- a/pkgs/development/python-modules/zope_size/default.nix +++ b/pkgs/development/python-modules/zope_size/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , zope_i18nmessageid diff --git a/pkgs/development/python-modules/zope_testing/default.nix b/pkgs/development/python-modules/zope_testing/default.nix index 3d7cbf90c25..2f37f15453d 100644 --- a/pkgs/development/python-modules/zope_testing/default.nix +++ b/pkgs/development/python-modules/zope_testing/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPyPy diff --git a/pkgs/development/python-modules/zope_testrunner/default.nix b/pkgs/development/python-modules/zope_testrunner/default.nix index c516106e48b..5ee42c84275 100644 --- a/pkgs/development/python-modules/zope_testrunner/default.nix +++ b/pkgs/development/python-modules/zope_testrunner/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , zope_interface diff --git a/pkgs/development/python-modules/zstd/default.nix b/pkgs/development/python-modules/zstd/default.nix index 716b1372645..1d8fa8d93e9 100644 --- a/pkgs/development/python-modules/zstd/default.nix +++ b/pkgs/development/python-modules/zstd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkgconfig, fetchPypi, buildPythonPackage +{ lib, pkg-config, fetchPypi, buildPythonPackage , buildPackages , zstd, pytest }: @@ -13,10 +13,10 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "/usr/bin/pkg-config" "${buildPackages.pkgconfig}/bin/${buildPackages.pkgconfig.targetPrefix}pkg-config" + --replace "/usr/bin/pkg-config" "${buildPackages.pkg-config}/bin/${buildPackages.pkg-config.targetPrefix}pkg-config" ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ zstd ]; setupPyBuildFlags = [ diff --git a/pkgs/development/python-modules/zulip/default.nix b/pkgs/development/python-modules/zulip/default.nix index 229a4f17bd3..2c7b7582b80 100644 --- a/pkgs/development/python-modules/zulip/default.nix +++ b/pkgs/development/python-modules/zulip/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "zulip"; - version = "0.7.0"; + version = "0.7.1"; disabled = !isPy3k; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "zulip"; repo = "python-zulip-api"; rev = version; - sha256 = "0waldgpzq3ms1r1z14lxdj56lf082fnmi83l3fn8i8gqr8nvnch1"; + sha256 = "0da1ki1v252avy27j6d7snnc0gyq0xa9fypm3qdmxhw2w79d6q36"; }; sourceRoot = "source/zulip"; diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 5492874efda..e827c9b807f 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -237,7 +237,7 @@ let BayesSAE = [ pkgs.gsl_1 ]; BayesVarSel = [ pkgs.gsl_1 ]; BayesXsrc = [ pkgs.readline.dev pkgs.ncurses ]; - bigGP = [ pkgs.openmpi ]; + bigGP = [ pkgs.mpi ]; bio3d = [ pkgs.zlib ]; BiocCheck = [ pkgs.which ]; Biostrings = [ pkgs.zlib ]; @@ -246,7 +246,7 @@ let Cairo = [ pkgs.libtiff pkgs.libjpeg pkgs.cairo.dev pkgs.x11 pkgs.fontconfig.lib ]; Cardinal = [ pkgs.which ]; chebpol = [ pkgs.fftw ]; - ChemmineOB = [ pkgs.openbabel pkgs.pkgconfig ]; + ChemmineOB = [ pkgs.openbabel pkgs.pkg-config ]; cit = [ pkgs.gsl_1 ]; curl = [ pkgs.curl.dev ]; data_table = [pkgs.zlib.dev] ++ lib.optional stdenv.isDarwin pkgs.llvmPackages.openmp; @@ -257,12 +257,13 @@ let fftwtools = [ pkgs.fftw.dev ]; Formula = [ pkgs.gmp ]; gdtools = [ pkgs.cairo.dev pkgs.fontconfig.lib pkgs.freetype.dev ]; - git2r = [ pkgs.zlib.dev pkgs.openssl.dev pkgs.libssh2.dev pkgs.libgit2 pkgs.pkgconfig ]; + git2r = [ pkgs.zlib.dev pkgs.openssl.dev pkgs.libssh2.dev pkgs.libgit2 pkgs.pkg-config ]; GLAD = [ pkgs.gsl_1 ]; glpkAPI = [ pkgs.gmp pkgs.glpk ]; gmp = [ pkgs.gmp.dev ]; graphscan = [ pkgs.gsl_1 ]; gsl = [ pkgs.gsl_1 ]; + gert = [ pkgs.libgit2 ]; haven = [ pkgs.libiconv pkgs.zlib.dev ]; h5vc = [ pkgs.zlib.dev ]; HiCseg = [ pkgs.gsl_1 ]; @@ -279,11 +280,12 @@ let mvabund = [ pkgs.gsl_1 ]; mwaved = [ pkgs.fftw.dev ]; ncdf4 = [ pkgs.netcdf ]; - nloptr = [ pkgs.nlopt pkgs.pkgconfig ]; + nloptr = [ pkgs.nlopt pkgs.pkg-config ]; + n1qn1 = [ pkgs.gfortran ]; odbc = [ pkgs.unixODBC ]; pander = [ pkgs.pandoc pkgs.which ]; - pbdMPI = [ pkgs.openmpi ]; - pbdPROF = [ pkgs.openmpi ]; + pbdMPI = [ pkgs.mpi ]; + pbdPROF = [ pkgs.mpi ]; pbdZMQ = lib.optionals stdenv.isDarwin [ pkgs.which ]; pdftools = [ pkgs.poppler.dev ]; phytools = [ pkgs.which ]; @@ -307,14 +309,14 @@ let RGtk2 = [ pkgs.gtk2.dev ]; rhdf5 = [ pkgs.zlib ]; Rhdf5lib = [ pkgs.zlib ]; - Rhpc = [ pkgs.zlib pkgs.bzip2.dev pkgs.icu pkgs.lzma.dev pkgs.openmpi pkgs.pcre.dev ]; + Rhpc = [ pkgs.zlib pkgs.bzip2.dev pkgs.icu pkgs.lzma.dev pkgs.mpi pkgs.pcre.dev ]; Rhtslib = [ pkgs.zlib.dev pkgs.automake pkgs.autoconf pkgs.bzip2.dev pkgs.lzma.dev pkgs.curl.dev ]; rjags = [ pkgs.jags ]; rJava = [ pkgs.zlib pkgs.bzip2.dev pkgs.icu pkgs.lzma.dev pkgs.pcre.dev pkgs.jdk pkgs.libzip ]; Rlibeemd = [ pkgs.gsl_1 ]; rmatio = [ pkgs.zlib.dev ]; Rmpfr = [ pkgs.gmp pkgs.mpfr.dev ]; - Rmpi = [ pkgs.openmpi ]; + Rmpi = [ pkgs.mpi ]; RMySQL = [ pkgs.zlib pkgs.libmysqlclient pkgs.openssl.dev ]; RNetCDF = [ pkgs.netcdf pkgs.udunits ]; RODBC = [ pkgs.libiodbc ]; @@ -329,7 +331,8 @@ let rtiff = [ pkgs.libtiff.dev ]; runjags = [ pkgs.jags ]; RVowpalWabbit = [ pkgs.zlib.dev pkgs.boost ]; - rzmq = [ pkgs.zeromq ]; + rzmq = [ pkgs.zeromq pkgs.pkg-config ]; + clustermq = [ pkgs.zeromq ]; SAVE = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre ]; sdcTable = [ pkgs.gmp pkgs.glpk ]; seewave = [ pkgs.fftw.dev pkgs.libsndfile.dev ]; @@ -384,36 +387,42 @@ let nat = [ pkgs.which ]; nat_templatebrains = [ pkgs.which ]; pbdZMQ = lib.optionals stdenv.isDarwin [ pkgs.darwin.binutils ]; + clustermq = [ pkgs.pkg-config ]; RMark = [ pkgs.which ]; RPushbullet = [ pkgs.which ]; RcppEigen = [ pkgs.libiconv ]; RCurl = [ pkgs.curl.dev ]; - R2SWF = [ pkgs.pkgconfig ]; + R2SWF = [ pkgs.pkg-config ]; rgl = [ pkgs.libGLU pkgs.libGLU.dev pkgs.libGL pkgs.xlibsWrapper ]; - RGtk2 = [ pkgs.pkgconfig ]; - RProtoBuf = [ pkgs.pkgconfig ]; - Rpoppler = [ pkgs.pkgconfig ]; - XML = [ pkgs.pkgconfig ]; - cairoDevice = [ pkgs.pkgconfig ]; - chebpol = [ pkgs.pkgconfig ]; - fftw = [ pkgs.pkgconfig ]; - gdtools = [ pkgs.pkgconfig ]; + RGtk2 = [ pkgs.pkg-config ]; + RProtoBuf = [ pkgs.pkg-config ]; + Rpoppler = [ pkgs.pkg-config ]; + XML = [ pkgs.pkg-config ]; + cairoDevice = [ pkgs.pkg-config ]; + chebpol = [ pkgs.pkg-config ]; + fftw = [ pkgs.pkg-config ]; + gdtools = [ pkgs.pkg-config ]; jqr = [ pkgs.jq.lib ]; - kza = [ pkgs.pkgconfig ]; - magick = [ pkgs.pkgconfig ]; - mwaved = [ pkgs.pkgconfig ]; - odbc = [ pkgs.pkgconfig ]; - openssl = [ pkgs.pkgconfig ]; - pdftools = [ pkgs.pkgconfig ]; - sf = [ pkgs.pkgconfig pkgs.sqlite.dev pkgs.proj.dev ]; - showtext = [ pkgs.pkgconfig ]; - spate = [ pkgs.pkgconfig ]; - stringi = [ pkgs.pkgconfig ]; - sysfonts = [ pkgs.pkgconfig ]; - systemfonts = [ pkgs.pkgconfig ]; - tesseract = [ pkgs.pkgconfig ]; - Cairo = [ pkgs.pkgconfig ]; - Rsymphony = [ pkgs.pkgconfig pkgs.doxygen pkgs.graphviz pkgs.subversion ]; + kza = [ pkgs.pkg-config ]; + magick = [ pkgs.pkg-config ]; + mwaved = [ pkgs.pkg-config ]; + odbc = [ pkgs.pkg-config ]; + openssl = [ pkgs.pkg-config ]; + pdftools = [ pkgs.pkg-config ]; + sf = [ pkgs.pkg-config pkgs.sqlite.dev pkgs.proj.dev ]; + showtext = [ pkgs.pkg-config ]; + spate = [ pkgs.pkg-config ]; + stringi = [ pkgs.pkg-config ]; + sysfonts = [ pkgs.pkg-config ]; + systemfonts = [ pkgs.pkg-config ]; + tesseract = [ pkgs.pkg-config ]; + Cairo = [ pkgs.pkg-config ]; + CLVTools = [ pkgs.gsl ]; + JMcmprsk = [ pkgs.gsl ]; + mashr = [ pkgs.gsl ]; + hadron = [ pkgs.gsl ]; + AMOUNTAIN = [ pkgs.gsl ]; + Rsymphony = [ pkgs.pkg-config pkgs.doxygen pkgs.graphviz pkgs.subversion ]; tcltk2 = [ pkgs.tcl pkgs.tk ]; tikzDevice = [ pkgs.which pkgs.texlive.combined.scheme-medium ]; gridGraphics = [ pkgs.which ]; @@ -663,6 +672,14 @@ let ''; }); + rzmq = old.rzmq.overrideDerivation (attrs: { + preConfigure = "patchShebangs configure"; + }); + + clustermq = old.clustermq.overrideDerivation (attrs: { + preConfigure = "patchShebangs configure"; + }); + Cairo = old.Cairo.overrideDerivation (attrs: { NIX_LDFLAGS = "-lfontconfig"; }); @@ -792,7 +809,7 @@ let openssl = old.openssl.overrideDerivation (attrs: { preConfigure = '' patchShebangs configure - ''; + ''; PKGCONFIG_CFLAGS = "-I${pkgs.openssl.dev}/include"; PKGCONFIG_LIBS = "-Wl,-rpath,${pkgs.openssl.out}/lib -L${pkgs.openssl.out}/lib -lssl -lcrypto"; }); @@ -847,6 +864,12 @@ let ''; }); + libgeos = old.libgeos.overrideDerivation (attrs: { + preConfigure = '' + patchShebangs configure + ''; + }); + protolite = old.protolite.overrideDerivation (attrs: { preConfigure = '' patchShebangs configure diff --git a/pkgs/development/r-modules/generic-builder.nix b/pkgs/development/r-modules/generic-builder.nix index 3adb84a0ba5..1e96a64a5e2 100644 --- a/pkgs/development/r-modules/generic-builder.nix +++ b/pkgs/development/r-modules/generic-builder.nix @@ -1,14 +1,14 @@ -{ stdenv, R, libcxx, xvfb_run, util-linux, Cocoa, Foundation, gettext, gfortran }: +{ stdenv, lib, R, libcxx, xvfb_run, util-linux, Cocoa, Foundation, gettext, gfortran }: { name, buildInputs ? [], requireX ? false, ... } @ attrs: stdenv.mkDerivation ({ buildInputs = buildInputs ++ [R gettext] ++ - stdenv.lib.optionals requireX [util-linux xvfb_run] ++ - stdenv.lib.optionals stdenv.isDarwin [Cocoa Foundation gfortran]; + lib.optionals requireX [util-linux xvfb_run] ++ + lib.optionals stdenv.isDarwin [Cocoa Foundation gfortran]; NIX_CFLAGS_COMPILE = - stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; + lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; configurePhase = '' runHook preConfigure diff --git a/pkgs/development/r-modules/patches/qtbase.patch b/pkgs/development/r-modules/patches/qtbase.patch deleted file mode 100644 index 14427b72630..00000000000 --- a/pkgs/development/r-modules/patches/qtbase.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ru -x '*~' qtbase_orig/src/Makefile qtbase/src/Makefile ---- qtbase_orig/src/Makefile 2012-03-03 03:57:47.000000000 +0900 -+++ qtbase/src/Makefile 2014-11-01 23:06:51.383876323 +0900 -@@ -10,6 +10,9 @@ - -DR_INCLUDES=${R_INCLUDE_DIR} \ - -DCMAKE_INSTALL_PREFIX=../src; \ - make install -+# I could not control RPATH via CMake. HELP WANTED! -+ patchelf --set-rpath ${CMAKE_LIBRARY_PATH} qtbase.so -+ find ../inst/local/ -executable -type f -print0 | xargs -0 patchelf --set-rpath ${CMAKE_LIBRARY_PATH} - - clean: - rm -rf ../kdebindings-build diff --git a/pkgs/development/r-modules/wrapper.nix b/pkgs/development/r-modules/wrapper.nix index 76e819501a5..12704149666 100644 --- a/pkgs/development/r-modules/wrapper.nix +++ b/pkgs/development/r-modules/wrapper.nix @@ -1,21 +1,31 @@ -{ runCommand, R, makeWrapper, recommendedPackages, packages }: - -runCommand (R.name + "-wrapper") { +{ symlinkJoin, R, makeWrapper, recommendedPackages, packages }: +symlinkJoin { + name = R.name + "-wrapper"; preferLocalBuild = true; allowSubstitutes = false; buildInputs = [R] ++ recommendedPackages ++ packages; + paths = [ R ]; nativeBuildInputs = [makeWrapper]; + postBuild = '' + cd ${R}/bin + for exe in *; do + rm "$out/bin/$exe" + + makeWrapper "${R}/bin/$exe" "$out/bin/$exe" \ + --prefix "R_LIBS_SITE" ":" "$R_LIBS_SITE" + done + ''; + # Make the list of recommended R packages accessible to other packages such as rpy2 passthru = { inherit recommendedPackages; }; + + meta = R.meta // { + # To prevent builds on hydra + hydraPlatforms = []; + # prefer wrapper over the package + priority = (R.meta.priority or 0) - 1; + }; } -'' -mkdir -p $out/bin -cd ${R}/bin -for exe in *; do - makeWrapper ${R}/bin/$exe $out/bin/$exe \ - --prefix "R_LIBS_SITE" ":" "$R_LIBS_SITE" -done -'' diff --git a/pkgs/development/ruby-modules/bundix/default.nix b/pkgs/development/ruby-modules/bundix/default.nix index 34114ad9a4f..f3ac42b9406 100644 --- a/pkgs/development/ruby-modules/bundix/default.nix +++ b/pkgs/development/ruby-modules/bundix/default.nix @@ -1,5 +1,5 @@ { buildRubyGem, fetchFromGitHub, makeWrapper, lib, bundler, nix, - nix-prefetch-git }: + nix-prefetch-git, fetchpatch }: buildRubyGem rec { inherit (bundler) ruby; @@ -15,6 +15,15 @@ buildRubyGem rec { sha256 = "05y8sy6v9km1dwvpjzkjxpfzv95g6yzac1b5blac2f1r2kw167p8"; }; + patches = [ + # write trailing newline to gemset.nix + # https://github.com/nix-community/bundix/pull/78 + (fetchpatch { + url = "https://github.com/nix-community/bundix/commit/02ca7a6c656a1e5e5465ad78b31040d82ae1a7e6.patch"; + sha256 = "18r30icv7r79dlmxz1d1qlk5b6c7r257x23sqav55yhfail9hqrb"; + }) + ]; + buildInputs = [ ruby bundler ]; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/ruby-modules/bundler-app/default.nix b/pkgs/development/ruby-modules/bundler-app/default.nix index 0859f08c2f7..03bf7275cc7 100644 --- a/pkgs/development/ruby-modules/bundler-app/default.nix +++ b/pkgs/development/ruby-modules/bundler-app/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, callPackage, runCommand, makeWrapper, ruby }@defs: +{ lib, callPackage, runCommand, makeWrapper, ruby }@defs: # Use for simple installation of Ruby tools shipped in a Gem. # Start with a Gemfile that includes `gem <toolgem>` diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 3f91cdfebc8..70cb7e3ca39 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -265,7 +265,7 @@ in hitimes = attrs: { buildInputs = - stdenv.lib.optionals stdenv.isDarwin + lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; }; @@ -515,7 +515,7 @@ in --replace "gobject-2.0" "${glib.out}/lib/libgobject-2.0${stdenv.hostPlatform.extensions.sharedLibrary}" substituteInPlace lib/vips.rb \ - --replace "vips_libname = 'vips'" "vips_libname = '${stdenv.lib.getLib vips}/lib/libvips${stdenv.hostPlatform.extensions.sharedLibrary}'" + --replace "vips_libname = 'vips'" "vips_libname = '${lib.getLib vips}/lib/libvips${stdenv.hostPlatform.extensions.sharedLibrary}'" ''; }; @@ -632,7 +632,7 @@ in }; zookeeper = attrs: { - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.cctools ]; + buildInputs = lib.optionals stdenv.isDarwin [ darwin.cctools ]; dontBuild = false; postPatch = '' sed -i ext/extconf.rb -e "4a \ diff --git a/pkgs/development/ruby-modules/solargraph/gemset.nix b/pkgs/development/ruby-modules/solargraph/gemset.nix index 804fa917fd2..cd9575f1283 100644 --- a/pkgs/development/ruby-modules/solargraph/gemset.nix +++ b/pkgs/development/ruby-modules/solargraph/gemset.nix @@ -247,4 +247,4 @@ }; version = "0.9.26"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/ruby-modules/testing/driver.nix b/pkgs/development/ruby-modules/testing/driver.nix index 65e7c8d4416..23a9a1cec54 100644 --- a/pkgs/development/ruby-modules/testing/driver.nix +++ b/pkgs/development/ruby-modules/testing/driver.nix @@ -5,7 +5,7 @@ nix-build -E 'with import <nixpkgs> { }; callPackage ./test.nix {}' --show-trace Confusingly, the ideal result ends with something like: error: build of ‘/nix/store/3245f3dcl2wxjs4rci7n069zjlz8qg85-test-results.tap.drv’ failed */ -{ writeText, lib, callPackage, testFiles, stdenv, ruby }@defs: +{ writeText, lib, callPackage, testFiles, ruby }@defs: let testTools = rec { test = import ./testing.nix; diff --git a/pkgs/development/tools/alloy/default.nix b/pkgs/development/tools/alloy/default.nix index 44a6d7329ba..1dade32ac64 100644 --- a/pkgs/development/tools/alloy/default.nix +++ b/pkgs/development/tools/alloy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, makeWrapper, makeDesktopItem }: +{ lib, stdenv, fetchurl, jre, makeWrapper, makeDesktopItem }: let generic = { major, version, src }: @@ -30,7 +30,7 @@ let generic = { major, version, src }: cp -r ${desktopItem}/share/applications $out/share ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Language & tool for relational models"; longDescription = '' Alloy is a language for describing structures and a tool for exploring diff --git a/pkgs/development/tools/ameba/default.nix b/pkgs/development/tools/ameba/default.nix index f8cb7441116..13e9c56be9f 100644 --- a/pkgs/development/tools/ameba/default.nix +++ b/pkgs/development/tools/ameba/default.nix @@ -1,14 +1,14 @@ -{ stdenv, lib, fetchFromGitHub, crystal }: +{ lib, fetchFromGitHub, crystal }: crystal.buildCrystalPackage rec { pname = "ameba"; - version = "0.13.3"; + version = "0.13.4"; src = fetchFromGitHub { owner = "crystal-ameba"; repo = "ameba"; rev = "v${version}"; - sha256 = "0yhb8vfrfzsm3a45h2jmcrn1n7jy3zn2hwims3dikgq8kaggws9y"; + sha256 = "sha256-+ZsefwH1hag2syWaEXkdxgmxk6JsxP7MvV+ILlo+Hy8="; }; meta = with lib; { diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index 20b26437e75..eb827882b75 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, jre, nixosTests, writeScript, common-updater-scripts, git +{ lib, stdenv, fetchurl, jre, nixosTests, writeScript, common-updater-scripts, git , nixfmt, nix, coreutils, gnused, disableRemoteLogging ? true }: -with stdenv.lib; +with lib; let repo = "git@github.com:lihaoyi/Ammonite.git"; @@ -34,7 +34,7 @@ let #!${stdenv.shell} set -o errexit PATH=${ - stdenv.lib.makeBinPath [ + lib.makeBinPath [ common-updater-scripts coreutils git diff --git a/pkgs/development/tools/analysis/autoflake/default.nix b/pkgs/development/tools/analysis/autoflake/default.nix index 396a5817c67..03e01aadb71 100644 --- a/pkgs/development/tools/analysis/autoflake/default.nix +++ b/pkgs/development/tools/analysis/autoflake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages }: +{ lib, python3Packages }: with python3Packages; buildPythonApplication rec { @@ -14,7 +14,7 @@ buildPythonApplication rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/myint/autoflake"; description = "A simple program which removes unused imports and unused variables as reported by pyflakes"; license = licenses.mit; diff --git a/pkgs/development/tools/analysis/bingrep/default.nix b/pkgs/development/tools/analysis/bingrep/default.nix index 236669dc54f..338bc3e189c 100644 --- a/pkgs/development/tools/analysis/bingrep/default.nix +++ b/pkgs/development/tools/analysis/bingrep/default.nix @@ -1,19 +1,19 @@ -{ stdenv, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "bingrep"; - version = "0.8.2"; + version = "0.8.5"; src = fetchFromGitHub { owner = "m4b"; repo = pname; rev = "v${version}"; - sha256 = "1qv41g7mblnq07145m03s2fhbrjfsc0924zb9z4cp159ygkggxcy"; + sha256 = "sha256-ayA3aEidZPa5GJgbbm5K3X2Xgd5Eb6TgUU80Gw/p07w="; }; - cargoSha256 = "1z53408mcmy698xb2sxj1s1p9xc9srlkj0v8wswhdp7nq27vwkdj"; + cargoSha256 = "sha256-3eGYU5O7HSpawIL/8OVmROCzXfdnoMAnIujjrIp00xg="; - meta = with stdenv.lib; { + meta = with lib; { description = "Greps through binaries from various OSs and architectures, and colors them"; homepage = "https://github.com/m4b/bingrep"; license = licenses.mit; diff --git a/pkgs/development/tools/analysis/brakeman/default.nix b/pkgs/development/tools/analysis/brakeman/default.nix index de351524f39..3ac6b34f948 100644 --- a/pkgs/development/tools/analysis/brakeman/default.nix +++ b/pkgs/development/tools/analysis/brakeman/default.nix @@ -4,13 +4,13 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "brakeman"; - version = "4.8.0"; - source.sha256 = "0xy28pq4x1i7xns5af9k8fx35sqffz2lg94fgbsi9zhi877b7srg"; + version = "5.0.0"; + source.sha256 = "0k1ynqsr9b0vnxqb7d5hbdk4q1i98zjzdnx4y1ylikz4rmkizf91"; meta = with lib; { description = "Static analysis security scanner for Ruby on Rails"; homepage = "https://brakemanscanner.org/"; - changelog = "https://github.com/presidentbeef/brakeman/releases/tag/v${version}"; + changelog = "https://github.com/presidentbeef/brakeman/blob/v${version}/CHANGES.md"; license = [ licenses.unfreeRedistributable ]; platforms = ruby.meta.platforms; maintainers = [ maintainers.marsam ]; diff --git a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix index b4cfa356b27..a0f251bfe91 100644 --- a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix +++ b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgconfig, rustPlatform, fetchFromGitHub, openssl }: +{ lib, pkg-config, rustPlatform, fetchFromGitHub, openssl }: rustPlatform.buildRustPackage rec { pname = "cargo-tarpaulin"; @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config ]; buildInputs = [ openssl ]; diff --git a/pkgs/development/tools/analysis/cccc/default.nix b/pkgs/development/tools/analysis/cccc/default.nix index 374331f3ac8..bcbda8ad7e6 100644 --- a/pkgs/development/tools/analysis/cccc/default.nix +++ b/pkgs/development/tools/analysis/cccc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: let name = "cccc"; @@ -30,8 +30,8 @@ stdenv.mkDerivation { complexity and metrics proposed by Chidamber&Kemerer and Henry&Kafura. ''; homepage = "http://cccc.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.linquize ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.linquize ]; }; } diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix new file mode 100644 index 00000000000..06c366529df --- /dev/null +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -0,0 +1,77 @@ +{ pkgs, lib, python3, fetchFromGitHub }: + +let + pname = "checkov"; + version = "1.0.674"; + src = fetchFromGitHub { + owner = "bridgecrewio"; + repo = pname; + rev = version; + sha256 = "/S8ic5ZVxA2vd/rjRPX5gslbmnULL7BSx34vgWIsheQ="; + }; + + disabled = pkgs.python3Packages.pythonOlder "3.7"; + + # CheckOV only work with `dpath 1.5.0` + dpath = pkgs.python3Packages.buildPythonPackage rec { + pname = "dpath"; + version = "1.5.0"; + + src = pkgs.python3Packages.fetchPypi { + inherit pname version; + sha256 = "SWYVtOqEI20Y4NKGEi3nSGmmDg+H4sfsZ4f/KGxINhs="; + }; + + doCheck = false; + }; +in +python3.pkgs.buildPythonPackage rec { + inherit pname version disabled src; + + nativeBuildInputs = with python3.pkgs; [ setuptools_scm ]; + + propagatedBuildInputs = with python3.pkgs; [ + pytest + coverage + bandit + bc-python-hcl2 + deep_merge + tabulate + colorama + termcolor + junit-xml + dpath + pyyaml + boto3 + GitPython + six + jmespath + tqdm + update_checker + semantic-version + packaging + ]; + + # Both of these tests are pulling from external srouces (https://github.com/bridgecrewio/checkov/blob/f03a4204d291cf47e3753a02a9b8c8d805bbd1be/.github/workflows/build.yml) + preCheck = '' + rm -rf integration_tests/* + rm -rf tests/terraform/* + ''; + + # Wrap the executable so that the python packages are available + # it's just a shebang script which calls `python -m checkov "$@"` + postFixup = '' + wrapProgram $out/bin/checkov \ + --set PYTHONPATH $PYTHONPATH + ''; + + meta = with lib; { + homepage = "https://github.com/bridgecrewio/checkov"; + description = "Static code analysis tool for infrastructure-as-code"; + longDescription = '' + Prevent cloud misconfigurations during build-time for Terraform, Cloudformation, Kubernetes, Serverless framework and other infrastructure-as-code-languages with Checkov by Bridgecrew. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ anhdle14 ]; + }; +} diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 786ed360ef3..e5325f7da8c 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, makeWrapper, jre }: +{ lib, stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "8.38"; + version = "8.39"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "1j4k75iv32fsp40ajdfm99zady5c0h0f39xvmv70frp8p58kq3rl"; + sha256 = "sha256-CPPSJVKf01TA89Qk/uyvIU+ejo5JyT4Mc35KKJPv4IE="; }; nativeBuildInputs = [ makeWrapper ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Checks Java source against a coding standard"; longDescription = '' checkstyle is a development tool to help programmers write Java code that diff --git a/pkgs/development/tools/analysis/clang-analyzer/default.nix b/pkgs/development/tools/analysis/clang-analyzer/default.nix index 43b32052bf3..4752b31649d 100644 --- a/pkgs/development/tools/analysis/clang-analyzer/default.nix +++ b/pkgs/development/tools/analysis/clang-analyzer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, clang, llvmPackages, perl, makeWrapper, python3 }: +{ lib, stdenv, fetchurl, clang, llvmPackages, perl, makeWrapper, python3 }: stdenv.mkDerivation rec { pname = "clang-analyzer"; @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { meta = { description = "Clang Static Analyzer"; homepage = "http://clang-analyzer.llvm.org"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = lib.licenses.bsd3; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.thoughtpolice ]; }; } diff --git a/pkgs/development/tools/analysis/coan/default.nix b/pkgs/development/tools/analysis/coan/default.nix index 4c6e9f1a078..1e0b79e0daa 100644 --- a/pkgs/development/tools/analysis/coan/default.nix +++ b/pkgs/development/tools/analysis/coan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl }: +{ lib, stdenv, fetchurl, perl }: stdenv.mkDerivation rec { version = "6.0.1"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { mv -v $out/share/man/man1/coan.1.{1,gz} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "The C preprocessor chainsaw"; longDescription = '' A software engineering tool for analysing preprocessor-based diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index fc37324bc92..4d7bc7c277b 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchzip , zlib , xorg @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.4.0"; + version = "2.4.2"; dontConfigure = true; dontBuild = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "1mplya2dyqqmm6gj4if2k4h2fra15rxf2yfnhphqhz40kz75sxk8"; + sha256 = "sha256-hOTxlrS47gS7stfNXuGKkAbCINhPXBVncOdPr1EDU5M="; }; nativeBuildInputs = [ @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { ln -s $out/codeql/codeql $out/bin/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Semantic code analysis engine"; homepage = "https://semmle.com/codeql"; maintainers = [ maintainers.dump_stack ]; diff --git a/pkgs/development/tools/analysis/cov-build/default.nix b/pkgs/development/tools/analysis/cov-build/default.nix index bd8c5c37c86..93a4ffab388 100644 --- a/pkgs/development/tools/analysis/cov-build/default.nix +++ b/pkgs/development/tools/analysis/cov-build/default.nix @@ -1,4 +1,4 @@ -{ stdenv, requireFile }: +{ lib, stdenv, requireFile }: let message = '' @@ -41,8 +41,8 @@ stdenv.mkDerivation rec { meta = { description = "Coverity Scan build tools"; homepage = "https://scan.coverity.com"; - license = stdenv.lib.licenses.unfreeRedistributable; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = lib.licenses.unfreeRedistributable; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.thoughtpolice ]; }; } diff --git a/pkgs/development/tools/analysis/coz/default.nix b/pkgs/development/tools/analysis/coz/default.nix index 42b47a9a8fd..17968a466bf 100644 --- a/pkgs/development/tools/analysis/coz/default.nix +++ b/pkgs/development/tools/analysis/coz/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , libelfin , ncurses @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/plasma-umass/coz"; description = "Profiler based on casual profiling"; - license = stdenv.lib.licenses.bsd2; - maintainers = with stdenv.lib.maintainers; [ zimbatm ]; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ zimbatm ]; }; } diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index 91bcecbb43d..30c0614446e 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxslt, docbook_xsl, docbook_xml_dtd_45, pcre, withZ3 ? true, z3 }: +{ lib, stdenv, fetchurl, libxslt, docbook_xsl, docbook_xml_dtd_45, pcre, withZ3 ? true, z3 }: stdenv.mkDerivation rec { pname = "cppcheck"; @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { sha256 = "0mlw0z20qf0g9qrmdmbykzf87wlcgmah8bacmp4mk6dwfzr9g9n3"; }; - buildInputs = [ pcre ] ++ stdenv.lib.optionals withZ3 [ z3 ]; + buildInputs = [ pcre ] ++ lib.optionals withZ3 [ z3 ]; nativeBuildInputs = [ libxslt docbook_xsl docbook_xml_dtd_45 ]; makeFlags = [ "PREFIX=$(out)" "FILESDIR=$(out)/cfg" "HAVE_RULES=yes" ] - ++ stdenv.lib.optionals withZ3 [ "USE_Z3=yes" "CPPFLAGS=-DNEW_Z3=1" ]; + ++ lib.optionals withZ3 [ "USE_Z3=yes" "CPPFLAGS=-DNEW_Z3=1" ]; outputs = [ "out" "man" ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { cp cppcheck.1 $man/share/man/man1/cppcheck.1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A static analysis tool for C/C++ code"; longDescription = '' Check C/C++ code for memory leaks, mismatching allocation-deallocation, diff --git a/pkgs/development/tools/analysis/egypt/default.nix b/pkgs/development/tools/analysis/egypt/default.nix index 080b19bf163..02665022099 100644 --- a/pkgs/development/tools/analysis/egypt/default.nix +++ b/pkgs/development/tools/analysis/egypt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perlPackages }: +{ lib, fetchurl, perlPackages }: perlPackages.buildPerlPackage rec { pname = "egypt"; @@ -15,7 +15,7 @@ perlPackages.buildPerlPackage rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool for making call graphs of C programmes"; longDescription = '' Egypt is a simple tool for creating call graphs of C programs. It neither diff --git a/pkgs/development/tools/analysis/emma/default.nix b/pkgs/development/tools/analysis/emma/default.nix index 3cc16c07ec5..97f93722a18 100644 --- a/pkgs/development/tools/analysis/emma/default.nix +++ b/pkgs/development/tools/analysis/emma/default.nix @@ -1,8 +1,8 @@ -{stdenv, fetchurl, unzip}: +{lib, stdenv, fetchurl, unzip}: stdenv.mkDerivation { name = "emma-2.0.5312"; - + src = fetchurl { url = "mirror://sourceforge/emma/emma-2.0.5312.zip"; sha256 = "0xxy39s2lvgs56vicjzpcz936l1vjaplliwa0dm7v3iyvw6jn7vj"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { homepage = "http://emma.sourceforge.net/"; description = "A code coverage tool for Java"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.cpl10; + platforms = lib.platforms.unix; + license = lib.licenses.cpl10; }; } diff --git a/pkgs/development/tools/analysis/evmdis/default.nix b/pkgs/development/tools/analysis/evmdis/default.nix index 64a1c317393..4061090b182 100644 --- a/pkgs/development/tools/analysis/evmdis/default.nix +++ b/pkgs/development/tools/analysis/evmdis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage { pname = "evmdis-unstable"; @@ -12,7 +12,7 @@ buildGoPackage { sha256 = "09y4j7ipgv8yd99g3xk3f079w8fqfj7kl1y7ry81ainysn0qlqrg"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/Arachnid/evmdis"; description = "Ethereum EVM disassembler"; license = [ licenses.asl20 ]; diff --git a/pkgs/development/tools/analysis/findbugs/default.nix b/pkgs/development/tools/analysis/findbugs/default.nix index d522b2b9422..265f6290453 100644 --- a/pkgs/development/tools/analysis/findbugs/default.nix +++ b/pkgs/development/tools/analysis/findbugs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "findbugs-3.0.1"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { EOF ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A static analysis tool to find bugs in Java programs automatically"; homepage = "http://findbugs.sourceforge.net/"; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 80731a2106e..11f0297509d 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, ocamlPackages, CoreServices }: +{ lib, stdenv, fetchFromGitHub, ocamlPackages, CoreServices }: stdenv.mkDerivation rec { pname = "flow"; - version = "0.141.0"; + version = "0.143.1"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "1hbq55gi834zapmly0gmg3kpqa1zwxcw4gll4g6vgzr0pfa0bwb2"; + sha256 = "sha256-x7+hLbfccyJLc84246R8xay0FJlK/3JgNc6pqeowl9Q="; }; installPhase = '' @@ -17,9 +17,9 @@ stdenv.mkDerivation rec { ''; buildInputs = (with ocamlPackages; [ ocaml findlib ocamlbuild dtoa core_kernel sedlex_2 ocaml_lwt lwt_log lwt_ppx ppx_deriving ppx_gen_rec ppx_tools_versioned visitors wtf8 ocaml-migrate-parsetree ]) - ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; + ++ lib.optionals stdenv.isDarwin [ CoreServices ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A static type checker for JavaScript"; homepage = "https://flow.org/"; changelog = "https://github.com/facebook/flow/releases/tag/v${version}"; diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix index 94012ce7ff6..394bd6558fb 100644 --- a/pkgs/development/tools/analysis/frama-c/default.nix +++ b/pkgs/development/tools/analysis/frama-c/default.nix @@ -73,8 +73,8 @@ stdenv.mkDerivation rec { meta = { description = "An extensible and collaborative platform dedicated to source-code analysis of C software"; homepage = "http://frama-c.com/"; - license = stdenv.lib.licenses.lgpl21; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice amiddelk ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.lgpl21; + maintainers = with lib.maintainers; [ thoughtpolice amiddelk ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix b/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix index d0221e80b9b..8984a395818 100644 --- a/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix +++ b/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { cp -ar $src/Documentation/html $out/share/doc/${name}/. ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Automatically generate all types of basic memory management operations and write into trace files"; homepage = "https://github.com/GarCoSim"; maintainers = [ maintainers.cmcdragonkai ]; diff --git a/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix b/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix index 10f0d74c0dc..3f97485cbfa 100644 --- a/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix +++ b/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit }: +{ lib, stdenv, fetchgit }: stdenv.mkDerivation { @@ -17,7 +17,7 @@ stdenv.mkDerivation { cp ./traceFileSim "$out/bin" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Ease the analysis of existing memory management techniques, as well as the prototyping of new memory management techniques"; homepage = "https://github.com/GarCoSim"; maintainers = [ maintainers.cmcdragonkai ]; diff --git a/pkgs/development/tools/analysis/hopper/default.nix b/pkgs/development/tools/analysis/hopper/default.nix index 68f12dac70f..b169877f5c1 100644 --- a/pkgs/development/tools/analysis/hopper/default.nix +++ b/pkgs/development/tools/analysis/hopper/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { --replace "Exec=/opt/hopper-${rev}/bin/Hopper" "Exec=$out/bin/hopper" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.hopperapp.com/index.html"; description = "A macOS and Linux Disassembler"; license = licenses.unfree; diff --git a/pkgs/development/tools/analysis/hotspot/default.nix b/pkgs/development/tools/analysis/hotspot/default.nix index de29b29df31..94b440f58c8 100644 --- a/pkgs/development/tools/analysis/hotspot/default.nix +++ b/pkgs/development/tools/analysis/hotspot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, +{ lib, mkDerivation, cmake, elfutils, @@ -58,8 +58,8 @@ mkDerivation rec { then displays the result in a graphical way. ''; homepage = "https://github.com/KDAB/hotspot"; - license = with stdenv.lib.licenses; [ gpl2 gpl3 ]; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ nh2 ]; + license = with lib.licenses; [ gpl2 gpl3 ]; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ nh2 ]; }; } diff --git a/pkgs/development/tools/analysis/include-what-you-use/default.nix b/pkgs/development/tools/analysis/include-what-you-use/default.nix index 67157218154..db1cf9c6ead 100644 --- a/pkgs/development/tools/analysis/include-what-you-use/default.nix +++ b/pkgs/development/tools/analysis/include-what-you-use/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, llvmPackages, python2 }: +{ lib, stdenv, fetchurl, cmake, llvmPackages, python2 }: stdenv.mkDerivation rec { pname = "include-what-you-use"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { --replace "'include-what-you-use'" "'$out/bin/include-what-you-use'" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Analyze #includes in C/C++ source files with clang"; longDescription = '' For every symbol (type, function variable, or macro) that you use in diff --git a/pkgs/development/tools/analysis/jdepend/default.nix b/pkgs/development/tools/analysis/jdepend/default.nix index c903833a731..faa68dadc3b 100644 --- a/pkgs/development/tools/analysis/jdepend/default.nix +++ b/pkgs/development/tools/analysis/jdepend/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ant, jdk, runtimeShell }: +{ lib, stdenv, fetchFromGitHub, ant, jdk, runtimeShell }: stdenv.mkDerivation rec { pname = "jdepend"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { chmod a+x $out/bin/jdepend ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Traverses Java class file directories and generates design quality metrics for each Java package"; homepage = "http://www.clarkware.com/software/JDepend.html"; license = licenses.bsd3; diff --git a/pkgs/development/tools/analysis/kcov/default.nix b/pkgs/development/tools/analysis/kcov/default.nix index 8c75842d1b6..15891e74044 100644 --- a/pkgs/development/tools/analysis/kcov/default.nix +++ b/pkgs/development/tools/analysis/kcov/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, cmake, pkgconfig, zlib, curl, elfutils, python, libiberty, libopcodes}: +{lib, stdenv, fetchFromGitHub, cmake, pkg-config, zlib, curl, elfutils, python, libiberty, libopcodes}: stdenv.mkDerivation rec { pname = "kcov"; @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { }; preConfigure = "patchShebangs src/bin-to-c-source.py"; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ zlib curl elfutils python libiberty libopcodes ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Code coverage tester for compiled programs, Python scripts and shell scripts"; longDescription = '' diff --git a/pkgs/development/tools/analysis/lcov/default.nix b/pkgs/development/tools/analysis/lcov/default.nix index c6faeaa72f2..35c75d67da5 100644 --- a/pkgs/development/tools/analysis/lcov/default.nix +++ b/pkgs/development/tools/analysis/lcov/default.nix @@ -1,4 +1,4 @@ - {stdenv, fetchFromGitHub, perl, perlPackages, makeWrapper }: + {lib, stdenv, fetchFromGitHub, perl, perlPackages, makeWrapper }: stdenv.mkDerivation rec { pname = "lcov"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/genpng --set PERL5LIB ${perlPackages.makeFullPerlPath [ perlPackages.GD ]} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Code coverage tool that enhances GNU gcov"; longDescription = @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://ltp.sourceforge.net/coverage/lcov.php"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; maintainers = with maintainers; [ dezgeg ]; platforms = platforms.all; diff --git a/pkgs/development/tools/analysis/makefile2graph/default.nix b/pkgs/development/tools/analysis/makefile2graph/default.nix index 20fe74ecb74..66f767f4702 100644 --- a/pkgs/development/tools/analysis/makefile2graph/default.nix +++ b/pkgs/development/tools/analysis/makefile2graph/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, bash, gnumake }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, bash, gnumake }: stdenv.mkDerivation { name = "makefile2graph-2018-01-03"; @@ -19,10 +19,10 @@ stdenv.mkDerivation { --replace '/bin/sh' ${bash}/bin/bash \ --replace 'make2graph' "$out/bin/make2graph" wrapProgram $out/bin/makefile2graph \ - --set PATH ${stdenv.lib.makeBinPath [ gnumake ]} + --set PATH ${lib.makeBinPath [ gnumake ]} ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/lindenb/makefile2graph"; description = "Creates a graph of dependencies from GNU-Make; Output is a graphiz-dot file or a Gexf-XML file"; maintainers = with maintainers; [ cmcdragonkai ]; diff --git a/pkgs/development/tools/analysis/oclgrind/default.nix b/pkgs/development/tools/analysis/oclgrind/default.nix index 8cc0477ca59..72154e909b6 100644 --- a/pkgs/development/tools/analysis/oclgrind/default.nix +++ b/pkgs/development/tools/analysis/oclgrind/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, llvmPackages, readline, python }: +{ lib, stdenv, fetchFromGitHub, cmake, llvmPackages, readline, python }: stdenv.mkDerivation rec { pname = "oclgrind"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { "-DCLANG_ROOT=${llvmPackages.clang-unwrapped}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An OpenCL device simulator and debugger"; homepage = "https://github.com/jrprice/oclgrind"; license = licenses.bsd3; diff --git a/pkgs/development/tools/analysis/panopticon/default.nix b/pkgs/development/tools/analysis/panopticon/default.nix index cbc736e1a26..91f3f24d6f1 100644 --- a/pkgs/development/tools/analysis/panopticon/default.nix +++ b/pkgs/development/tools/analysis/panopticon/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, rustPlatform, qt5, git, cmake -, pkgconfig, makeWrapper }: +{ lib, fetchFromGitHub, rustPlatform, qt5, git, cmake +, pkg-config, makeWrapper }: rustPlatform.buildRustPackage rec { pname = "panopticon"; @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1zv87nqhrzsxx0m891df4vagzssj3kblfv9yp7j96dw0vn9950qa"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ makeWrapper ]; propagatedBuildInputs = with qt5; [ qt5.qtbase @@ -23,6 +23,8 @@ rustPlatform.buildRustPackage rec { git ]; + dontWrapQtApps = true; + cargoSha256 = "1hdsn011y9invfy7can8c02zwa7birj9y1rxhrj7wyv4gh3659i0"; doCheck = false; @@ -34,7 +36,7 @@ rustPlatform.buildRustPackage rec { makeWrapper $out/share/${pname}/${pname} $out/bin/${pname} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A libre cross-platform disassembler"; longDescription = '' Panopticon is a cross platform disassembler for reverse diff --git a/pkgs/development/tools/analysis/pev/default.nix b/pkgs/development/tools/analysis/pev/default.nix index 42e382c8bca..a46bc067f11 100644 --- a/pkgs/development/tools/analysis/pev/default.nix +++ b/pkgs/development/tools/analysis/pev/default.nix @@ -1,4 +1,4 @@ -{ stdenv, openssl, fetchFromGitHub }: +{ lib, stdenv, openssl, fetchFromGitHub }: stdenv.mkDerivation { pname = "pev"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { installFlags = [ "prefix=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A full-featured, open source, multiplatform command line toolkit to work with PE (Portable Executables) binaries"; homepage = "https://pev.sourceforge.net/"; license = licenses.gpl2; diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix index 497a244f68b..3aa37d650cb 100644 --- a/pkgs/development/tools/analysis/pmd/default.nix +++ b/pkgs/development/tools/analysis/pmd/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, unzip, makeWrapper, openjdk }: +{ lib, stdenv, fetchurl, unzip, makeWrapper, openjdk }: stdenv.mkDerivation rec { pname = "pmd"; - version = "6.29.0"; + version = "6.30.0"; src = fetchurl { url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip"; - sha256 = "08iibpf9jhkk7ihsmlm85wpjwy1bvznbvggvqyw6109f9gzlrvvq"; + sha256 = "sha256-LgQmoUdsG5sAyHs9YyiaOFonMFaVtHKdp/KvSAWSy8w="; }; nativeBuildInputs = [ unzip makeWrapper ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An extensible cross-language static code analyzer"; homepage = "https://pmd.github.io/"; changelog = "https://pmd.github.io/pmd-${version}/pmd_release_notes.html"; diff --git a/pkgs/development/tools/analysis/qcachegrind/default.nix b/pkgs/development/tools/analysis/qcachegrind/default.nix index d9f39667cef..5e321db01aa 100644 --- a/pkgs/development/tools/analysis/qcachegrind/default.nix +++ b/pkgs/development/tools/analysis/qcachegrind/default.nix @@ -1,7 +1,7 @@ -{ stdenv, qmake, qtbase, perl, python, php, kcachegrind }: +{ lib, stdenv, qmake, qtbase, perl, python, php, kcachegrind }: let - name = stdenv.lib.replaceStrings ["kcachegrind"] ["qcachegrind"] kcachegrind.name; + name = lib.replaceStrings ["kcachegrind"] ["qcachegrind"] kcachegrind.name; in stdenv.mkDerivation { inherit name; @@ -12,6 +12,8 @@ in stdenv.mkDerivation { nativeBuildInputs = [ qmake ]; + dontWrapQtApps = true; + postInstall = '' mkdir -p $out/bin cp -p converters/dprof2calltree $out/bin/dprof2calltree @@ -31,7 +33,7 @@ in stdenv.mkDerivation { install -Dm644 kcachegrind/48-apps-kcachegrind.png "$out/share/icons/hicolor/48x48/apps/kcachegrind.png" ''); - meta = with stdenv.lib; { + meta = with lib; { description = "A Qt GUI to visualize profiling data"; license = licenses.gpl2; platforms = platforms.unix; diff --git a/pkgs/development/tools/analysis/radare2/cutter.nix b/pkgs/development/tools/analysis/radare2/cutter.nix index d4a102ac097..6d9543e3836 100644 --- a/pkgs/development/tools/analysis/radare2/cutter.nix +++ b/pkgs/development/tools/analysis/radare2/cutter.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, lib, mkDerivation # nativeBuildInputs -, qmake, pkgconfig +, qmake, pkg-config # Qt , qtbase, qtsvg, qtwebengine # buildInputs @@ -30,12 +30,12 @@ mkDerivation rec { --replace "include(lib_radare2.pri)" "" ''; - nativeBuildInputs = [ qmake pkgconfig python3 wrapQtAppsHook ]; + nativeBuildInputs = [ qmake pkg-config python3 wrapQtAppsHook ]; propagatedBuildInputs = [ python3.pkgs.pyside2 ]; buildInputs = [ qtbase qtsvg qtwebengine r2-for-cutter python3 ]; qmakeFlags = with python3.pkgs; [ - "CONFIG+=link_pkgconfig" + "CONFIG+=link_pkg-config" "PKGCONFIG+=r_core" # Leaving this enabled doesn't break build but generates errors # at runtime (to console) about being unable to load needed bits. diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 3d6ec0f1bf3..3623893ea63 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -1,6 +1,6 @@ -{stdenv, fetchFromGitHub +{lib, stdenv, fetchFromGitHub , buildPackages -, pkgconfig +, pkg-config , libusb-compat-0_1, readline, libewf, perl, zlib, openssl , libuv, file, libzip, xxHash , gtk2 ? null, vte ? null, gtkdialog ? null @@ -19,7 +19,7 @@ assert pythonBindings -> python3 != null; let - inherit (stdenv.lib) optional; + inherit (lib) optional; generic = { version_commit, # unused @@ -56,11 +56,6 @@ let # radare 3.3 compat for radare2-cutter (cd shlr && ln -s ../capstone-${cs_ver} capstone) tar -czvf shlr/capstone-${cs_ver}.tar.gz capstone-${cs_ver} - # necessary because they broke the offline-build: - # https://github.com/radare/radare2/commit/6290e4ff4cc167e1f2c28ab924e9b99783fb1b38#diff-a44d840c10f1f1feaf401917ae4ccd54R258 - # https://github.com/radare/radare2/issues/13087#issuecomment-465159716 - curl() { true; } - export -f curl ''; postInstall = '' @@ -83,7 +78,7 @@ let enableParallelBuilding = true; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ file readline libusb-compat-0_1 libewf perl zlib openssl libuv ] ++ optional useX11 [ gtkdialog vte gtk2 ] ++ optional rubyBindings [ ruby ] @@ -100,9 +95,9 @@ let meta = { description = "unix-like reverse engineering framework and commandline tools"; homepage = "http://radare.org/"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ raskin makefu mic92 ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ raskin makefu mic92 ]; + platforms = with lib.platforms; linux; inherit version; }; }; diff --git a/pkgs/development/tools/analysis/randoop/default.nix b/pkgs/development/tools/analysis/randoop/default.nix index b51b26eab17..0d10d6d6b27 100644 --- a/pkgs/development/tools/analysis/randoop/default.nix +++ b/pkgs/development/tools/analysis/randoop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { version = "4.2.5"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cp README.txt $out/doc ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Automatic test generation for Java"; homepage = "https://randoop.github.io/randoop/"; license = licenses.mit; diff --git a/pkgs/development/tools/analysis/retdec/default.nix b/pkgs/development/tools/analysis/retdec/default.nix index 1d2255027a4..1701abeb25f 100644 --- a/pkgs/development/tools/analysis/retdec/default.nix +++ b/pkgs/development/tools/analysis/retdec/default.nix @@ -9,7 +9,7 @@ , autoconf , automake , libtool -, pkgconfig +, pkg-config , bison , flex , groff @@ -145,7 +145,7 @@ in stdenv.mkDerivation rec { autoconf automake libtool - pkgconfig + pkg-config bison flex groff diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix index 92f2494dbe2..c0121d24217 100644 --- a/pkgs/development/tools/analysis/rr/default.nix +++ b/pkgs/development/tools/analysis/rr/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, cmake, libpfm, zlib, pkg-config, python3Packages, which, procps, gdb, capnproto }: +{ lib, gcc9Stdenv, fetchFromGitHub, cmake, libpfm, zlib, pkg-config, python3Packages, which, procps, gdb, capnproto }: -stdenv.mkDerivation rec { +gcc9Stdenv.mkDerivation rec { version = "5.4.0"; pname = "rr"; @@ -52,8 +52,8 @@ stdenv.mkDerivation rec { time the same execution is replayed. ''; - license = with stdenv.lib.licenses; [ mit bsd2 ]; - maintainers = with stdenv.lib.maintainers; [ pierron thoughtpolice ]; - platforms = stdenv.lib.platforms.x86; + license = with lib.licenses; [ mit bsd2 ]; + maintainers = with lib.maintainers; [ pierron thoughtpolice ]; + platforms = lib.platforms.x86; }; } diff --git a/pkgs/development/tools/analysis/smatch/default.nix b/pkgs/development/tools/analysis/smatch/default.nix index 1443c31192d..4330ec3d742 100644 --- a/pkgs/development/tools/analysis/smatch/default.nix +++ b/pkgs/development/tools/analysis/smatch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, sqlite, pkgconfig, perl +{ lib, stdenv, fetchgit, sqlite, pkg-config, perl , buildllvmsparse ? true , buildc2xml ? true , llvm ? null, libxml2 ? null @@ -16,10 +16,10 @@ stdenv.mkDerivation { sha256 = "0r43qi6vryqg450fj73yjwbb7gzcgx64rhrhb3r1m6a252srijiy"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [sqlite perl] - ++ stdenv.lib.optional buildllvmsparse llvm - ++ stdenv.lib.optional buildc2xml libxml2; + ++ lib.optional buildllvmsparse llvm + ++ lib.optional buildc2xml libxml2; preBuild = '' sed -i Makefile \ @@ -29,7 +29,7 @@ stdenv.mkDerivation { meta = { description = "A semantic analysis tool for C"; homepage = "http://smatch.sourceforge.net/"; - license = stdenv.lib.licenses.free; /* OSL, see http://www.opensource.org */ - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.free; /* OSL, see http://www.opensource.org */ + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/tools/analysis/snowman/default.nix b/pkgs/development/tools/analysis/snowman/default.nix index 82eb58879f1..870f084580b 100644 --- a/pkgs/development/tools/analysis/snowman/default.nix +++ b/pkgs/development/tools/analysis/snowman/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub, cmake, boost, qtbase }: +{ lib, mkDerivation, fetchFromGitHub, cmake, boost, qtbase }: mkDerivation rec { pname = "snowman"; @@ -19,7 +19,7 @@ mkDerivation rec { export sourceRoot=$sourceRoot/src ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Native code to C/C++ decompiler"; homepage = "http://derevenets.com/"; diff --git a/pkgs/development/tools/analysis/sparse/default.nix b/pkgs/development/tools/analysis/sparse/default.nix index 945f6c80af5..e0d9840472b 100644 --- a/pkgs/development/tools/analysis/sparse/default.nix +++ b/pkgs/development/tools/analysis/sparse/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, libxml2, llvm }: +{ fetchurl, lib, stdenv, pkg-config, libxml2, llvm }: stdenv.mkDerivation rec { name = "sparse-0.5.0"; @@ -12,15 +12,15 @@ stdenv.mkDerivation rec { sed -i Makefile -e "s|^PREFIX=.*$|PREFIX=$out|g" ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxml2 llvm ]; doCheck = true; meta = { description = "Semantic parser for C"; homepage = "https://git.kernel.org/cgit/devel/sparse/sparse.git/"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.thoughtpolice ]; }; } diff --git a/pkgs/development/tools/analysis/spin/default.nix b/pkgs/development/tools/analysis/spin/default.nix index 73e88f9811c..49e31f53a84 100644 --- a/pkgs/development/tools/analysis/spin/default.nix +++ b/pkgs/development/tools/analysis/spin/default.nix @@ -2,13 +2,13 @@ , withISpin ? true, tk, swarm, graphviz }: let - binPath = stdenv.lib.makeBinPath [ gcc ]; - ibinPath = stdenv.lib.makeBinPath [ gcc tk swarm graphviz tk ]; + binPath = lib.makeBinPath [ gcc ]; + ibinPath = lib.makeBinPath [ gcc tk swarm graphviz tk ]; in stdenv.mkDerivation rec { pname = "spin"; version = "6.4.9"; - url-version = stdenv.lib.replaceChars ["."] [""] version; + url-version = lib.replaceChars ["."] [""] version; src = fetchurl { # The homepage is behind CloudFlare anti-DDoS protection, which blocks cURL. @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { --prefix PATH ':' "$out/bin:${ibinPath}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Formal verification tool for distributed software systems"; homepage = "http://spinroot.com/"; license = licenses.free; diff --git a/pkgs/development/tools/analysis/splint/default.nix b/pkgs/development/tools/analysis/splint/default.nix index 4dc93897e86..581ff56bb61 100644 --- a/pkgs/development/tools/analysis/splint/default.nix +++ b/pkgs/development/tools/analysis/splint/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, flex }: +{ fetchurl, lib, stdenv, flex }: stdenv.mkDerivation rec { name = "splint-3.1.2"; @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { sha256 = "02pv8kscsrkrzip9r08pfs9xs98q74c52mlxzbii6cv6vx1vd3f7"; }; - patches = [ ./tmpdir.patch ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin.patch; + patches = [ ./tmpdir.patch ] ++ lib.optional stdenv.isDarwin ./darwin.patch; buildInputs = [ flex ]; doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.splint.org/"; description = "Annotation-assisted lightweight static analyzer for C"; diff --git a/pkgs/development/tools/analysis/swarm/default.nix b/pkgs/development/tools/analysis/swarm/default.nix index 03f218546eb..894d9a2357e 100644 --- a/pkgs/development/tools/analysis/swarm/default.nix +++ b/pkgs/development/tools/analysis/swarm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { name = "swarm-2019-03-11"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { install -Dm644 Doc/swarm.1 $out/share/man/man1/swarm.1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Verification script generator for Spin"; homepage = "http://spinroot.com/"; license = licenses.free; diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index 617d255d7e5..b7e6225a717 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.23.1"; + version = "0.24.0"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "19vgan743xsnglwva93fs4sqcbpqbyrxbgn5qff809ns8hj8ir94"; + sha256 = "18alpz29i0w44xnrpw82h16k99q01dd0gkp7ap5cqcf2cyjgzb06"; }; - vendorSha256 = "1y6ra9bkp6wl0pikvyqywhg5w18v3glnyvwqrddkkkabspl05nqx"; + vendorSha256 = "1r58nchag97fs0c7rxxxfa8y0vg9df76mmvn4hdc8vzi4h1025nd"; doCheck = false; diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index 7d66264564b..c4d22ecd89b 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.36.10"; + version = "0.37.1"; src = fetchFromGitHub { owner = "tfsec"; repo = pname; rev = "v${version}"; - sha256 = "11kv13d4cw515r79azfha1ksmvsha1rvg0jak9nvz9ggivyn0s7a"; + sha256 = "sha256-ZYJqnyIFwyPODFqXAZp1ep0Ofl/JH2F07gqPx4WZ7mo="; }; goPackagePath = "github.com/tfsec/tfsec"; diff --git a/pkgs/development/tools/analysis/uefi-firmware-parser/default.nix b/pkgs/development/tools/analysis/uefi-firmware-parser/default.nix index 0ad042d74de..b879a6ef237 100644 --- a/pkgs/development/tools/analysis/uefi-firmware-parser/default.nix +++ b/pkgs/development/tools/analysis/uefi-firmware-parser/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3, fetchFromGitHub }: +{ lib, python3, fetchFromGitHub }: with python3.pkgs; @@ -14,7 +14,7 @@ buildPythonApplication rec { sha256 = "1yn9vi91j1yxkn0icdnjhgl0qrqqkzyhccj39af4f19q1gdw995l"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/theopolis/uefi-firmware-parser/"; description = "Parse BIOS/Intel ME/UEFI firmware related structures: Volumes, FileSystems, Files, etc"; # MIT + license headers in some files diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index 60d3a7c5ebc..d99bbe1cae4 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, gdb, cctools, xnu, bootstrap_cmds }: +{ lib, stdenv, fetchurl, perl, gdb, cctools, xnu, bootstrap_cmds }: stdenv.mkDerivation rec { name = "valgrind-3.16.1"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { # GDB is needed to provide a sane default for `--db-command'. # Perl is needed for `callgrind_{annotate,control}'. - buildInputs = [ gdb perl ] ++ stdenv.lib.optionals (stdenv.isDarwin) [ bootstrap_cmds xnu ]; + buildInputs = [ gdb perl ] ++ lib.optionals (stdenv.isDarwin) [ bootstrap_cmds xnu ]; # Perl is also a native build input. nativeBuildInputs = [ perl ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; separateDebugInfo = stdenv.isLinux; - preConfigure = stdenv.lib.optionalString stdenv.isDarwin ( + preConfigure = lib.optionalString stdenv.isDarwin ( let OSRELEASE = '' $(awk -F '"' '/#define OSRELEASE/{ print $2 }' \ <${xnu}/Library/Frameworks/Kernel.framework/Headers/libkern/version.h)''; @@ -50,8 +50,8 @@ stdenv.mkDerivation rec { postPatch = ""; configureFlags = - stdenv.lib.optional (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "x86_64-darwin") "--enable-only64bit" - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin "--with-xcodedir=${xnu}/include"; + lib.optional (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "x86_64-darwin") "--enable-only64bit" + ++ lib.optional stdenv.hostPlatform.isDarwin "--with-xcodedir=${xnu}/include"; doCheck = false; # fails @@ -76,10 +76,10 @@ stdenv.mkDerivation rec { Valgrind to build new tools. ''; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.unix; + maintainers = [ lib.maintainers.eelco ]; + platforms = lib.platforms.unix; badPlatforms = [ "armv5tel-linux" "armv6l-linux" "armv6m-linux" "sparc-linux" "sparc64-linux" diff --git a/pkgs/development/tools/analysis/valkyrie/default.nix b/pkgs/development/tools/analysis/valkyrie/default.nix index 1c571fe6be0..10b9f7291a2 100644 --- a/pkgs/development/tools/analysis/valkyrie/default.nix +++ b/pkgs/development/tools/analysis/valkyrie/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, qmake4Hook }: +{ lib, stdenv, fetchurl, qt4, qmake4Hook }: stdenv.mkDerivation rec { name = "valkyrie-2.0.0"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ qmake4Hook ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.valgrind.org/"; description = "Qt4-based GUI for the Valgrind 3.6.x series"; license = licenses.gpl2; diff --git a/pkgs/development/tools/apktool/default.nix b/pkgs/development/tools/apktool/default.nix index 2ff9c58fb33..33721e60b0e 100644 --- a/pkgs/development/tools/apktool/default.nix +++ b/pkgs/development/tools/apktool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, jre, build-tools }: +{ lib, stdenv, fetchurl, makeWrapper, jre, build-tools }: stdenv.mkDerivation rec { pname = "apktool"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { --prefix PATH : "${builtins.head build-tools}/libexec/android-sdk/build-tools/28.0.3" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool for reverse engineering Android apk files"; homepage = "https://ibotpeaches.github.io/Apktool/"; license = licenses.asl20; diff --git a/pkgs/development/tools/asn2quickder/default.nix b/pkgs/development/tools/asn2quickder/default.nix index 68a0c0f6073..9ffcbb172d4 100644 --- a/pkgs/development/tools/asn2quickder/default.nix +++ b/pkgs/development/tools/asn2quickder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonApplication, fetchFromGitHub, makeWrapper, cmake +{ lib, buildPythonApplication, fetchFromGitHub, makeWrapper, cmake , pytestrunner, pytest, six, pyparsing, asn1ate }: buildPythonApplication rec { @@ -23,7 +23,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ pyparsing asn1ate six ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An ASN.1 compiler with a backend for Quick DER"; homepage = "https://github.com/vanrein/asn2quickder"; license = licenses.bsd3; diff --git a/pkgs/development/tools/async/default.nix b/pkgs/development/tools/async/default.nix index 54e16cb6faa..a45e93ab151 100644 --- a/pkgs/development/tools/async/default.nix +++ b/pkgs/development/tools/async/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "async"; diff --git a/pkgs/development/tools/avro-tools/default.nix b/pkgs/development/tools/avro-tools/default.nix index 5327ab354e9..5dd058614c1 100644 --- a/pkgs/development/tools/avro-tools/default.nix +++ b/pkgs/development/tools/avro-tools/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { --add-flags "-jar $out/libexec/avro-tools/${pname}.jar" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://avro.apache.org/"; description = "Avro command-line tools and utilities"; license = lib.licenses.asl20; diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix index 52b1a26d814..8a48b43312e 100644 --- a/pkgs/development/tools/aws-sam-cli/default.nix +++ b/pkgs/development/tools/aws-sam-cli/default.nix @@ -15,6 +15,22 @@ let }; }); + aws-sam-translator = super.aws-sam-translator.overridePythonAttrs (oldAttrs: rec { + version = "1.27.0"; + src = oldAttrs.src.override { + inherit version; + sha256 = "sha256-MlgSL0zWcbo9wUE4LdBBLBI9ufExe+2LJucin2NjRFQ="; + }; + }); + + dateparser = super.dateparser.overridePythonAttrs (oldAttrs: rec { + version = "0.7.0"; + src = oldAttrs.src.override { + inherit version; + sha256 = "sha256-lAgoGDyTe87FMHUyEbcPZzwKmquDHkMnNImzEFON/4Y="; + }; + }); + cookiecutter = super.cookiecutter.overridePythonAttrs (oldAttrs: rec { version = "1.6.0"; src = oldAttrs.src.override { @@ -68,7 +84,7 @@ buildPythonApplication rec { postPatch = '' substituteInPlace requirements/base.txt \ --replace "boto3~=1.14.0, >=1.14.23" "boto3~=1.14" \ - --replace "docker~=4.2.0" "docker~=4.3.1" \ + --replace "docker~=4.2.0" "docker~=4.3" \ --replace "jmespath~=0.9.5" "jmespath~=0.10.0" \ --replace "python-dateutil~=2.6, <2.8.1" "python-dateutil~=2.6" \ --replace "requests==2.23.0" "requests~=2.24" \ diff --git a/pkgs/development/tools/azcopy/default.nix b/pkgs/development/tools/azcopy/default.nix index 1c5bb899b69..98a6bcd5bbc 100644 --- a/pkgs/development/tools/azcopy/default.nix +++ b/pkgs/development/tools/azcopy/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "azure-storage-azcopy"; - version = "10.7.0"; + version = "10.8.0"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-storage-azcopy"; rev = "v${version}"; - sha256 = "0l2109r9a8fhd66zgsi56zdmy390fpnvy08rbxf6rfc0a55n96ka"; + sha256 = "sha256-zA0/5lpVefZD0m7g7SfqSRAFkQm2b+g/F3doCl9oAn8="; }; subPackages = [ "." ]; - vendorSha256 = "032yzl8mmgmmxbpsymndp4ddgi572jh5drwql0bjjabp3yqwj1g1"; + vendorSha256 = "sha256-t7PluxN6naDB35eC59Xus1hgZflgViWF2yFog9mkaOA="; doCheck = false; @@ -21,7 +21,7 @@ buildGoModule rec { ln -rs "$out/bin/azure-storage-azcopy" "$out/bin/azcopy" ''; - meta = with stdenv.lib; { + meta = with lib; { maintainers = with maintainers; [ colemickens ]; license = licenses.mit; description = "The new Azure Storage data transfer utility - AzCopy v10"; diff --git a/pkgs/development/tools/bazel-kazel/default.nix b/pkgs/development/tools/bazel-kazel/default.nix index c8127256a61..ba9412c286c 100644 --- a/pkgs/development/tools/bazel-kazel/default.nix +++ b/pkgs/development/tools/bazel-kazel/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "bazel-kazel"; - version = "0.1.3"; + version = "0.2.0"; src = fetchFromGitHub { owner = "kubernetes"; repo = "repo-infra"; rev = "v${version}"; - sha256 = "1mmla4j30ka368gsf4v8h23f32rsc4fpyrqswafw98x07xngmmqr"; + sha256 = "sha256-YWTWw5vDkDvIHOTqZM2xH8VPaVRuB2oyynvwWNmvPXs="; }; - vendorSha256 = "1pzkjh4n9ai8yqi98bkdhicjdr2l8j3fckl5n90c2gdcwqyxvgkf"; + vendorSha256 = "sha256-1+7Mx1Zh1WolqTpWNe560PRzRYaWVUVLvNvUOysaW5I="; doCheck = false; diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix index e0a7febb875..94efcc9be06 100644 --- a/pkgs/development/tools/bazel-watcher/default.nix +++ b/pkgs/development/tools/bazel-watcher/default.nix @@ -3,7 +3,7 @@ , git , go , python -, stdenv +, lib, stdenv }: let @@ -73,7 +73,7 @@ buildBazelPackage rec { ''; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/bazelbuild/bazel-watcher"; description = "Tools for building Bazel targets when source files change"; license = licenses.asl20; diff --git a/pkgs/development/tools/bazelisk/default.nix b/pkgs/development/tools/bazelisk/default.nix index 2a20888426d..2cfde85f224 100644 --- a/pkgs/development/tools/bazelisk/default.nix +++ b/pkgs/development/tools/bazelisk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "bazelisk"; @@ -17,7 +17,7 @@ buildGoModule rec { buildFlagsArray = [ "-ldflags=-s -w -X main.BazeliskVersion=${version}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A user-friendly launcher for Bazel"; longDescription = '' BEWARE: This package does not work on NixOS. diff --git a/pkgs/development/tools/bloaty/default.nix b/pkgs/development/tools/bloaty/default.nix index fcab0fb198e..ff24e7b7c1c 100644 --- a/pkgs/development/tools/bloaty/default.nix +++ b/pkgs/development/tools/bloaty/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, zlib, fetchFromGitHub }: +{ lib, stdenv, cmake, zlib, fetchFromGitHub }: stdenv.mkDerivation rec { version = "1.1"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { install -Dm755 {.,$out/bin}/bloaty ''; - meta = with stdenv.lib; { + meta = with lib; { description = "a size profiler for binaries"; homepage = "https://github.com/google/bloaty"; license = licenses.asl20; diff --git a/pkgs/development/tools/boost-build/default.nix b/pkgs/development/tools/boost-build/default.nix index 8ce475c893d..8566edd2315 100644 --- a/pkgs/development/tools/boost-build/default.nix +++ b/pkgs/development/tools/boost-build/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "boost-build"; @@ -27,9 +27,9 @@ stdenv.mkDerivation rec { ./b2 install --prefix=$out ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.boost.org/boost-build2/"; - license = stdenv.lib.licenses.boost; + license = lib.licenses.boost; platforms = platforms.unix; maintainers = with maintainers; [ ivan-tkatchev ]; }; diff --git a/pkgs/development/tools/build-managers/apache-ant/1.9.nix b/pkgs/development/tools/build-managers/apache-ant/1.9.nix index 49f8435b377..182b8633aa0 100644 --- a/pkgs/development/tools/build-managers/apache-ant/1.9.nix +++ b/pkgs/development/tools/build-managers/apache-ant/1.9.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, coreutils, makeWrapper }: +{ fetchurl, lib, stdenv, coreutils, makeWrapper }: let version = "1.9.15"; in @@ -105,8 +105,8 @@ stdenv.mkDerivation { by an object that implements a particular Task interface. ''; - license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.eelco ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/tools/build-managers/apache-ant/default.nix b/pkgs/development/tools/build-managers/apache-ant/default.nix index caa9bc3b9eb..d88068c1c3e 100644 --- a/pkgs/development/tools/build-managers/apache-ant/default.nix +++ b/pkgs/development/tools/build-managers/apache-ant/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, coreutils, makeWrapper }: +{ fetchurl, lib, stdenv, coreutils, makeWrapper }: let version = "1.10.9"; in @@ -105,8 +105,8 @@ stdenv.mkDerivation { by an object that implements a particular Task interface. ''; - license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.eelco ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/tools/build-managers/apache-maven/default.nix b/pkgs/development/tools/build-managers/apache-maven/default.nix index 83260cbc186..4658703f8b1 100644 --- a/pkgs/development/tools/build-managers/apache-maven/default.nix +++ b/pkgs/development/tools/build-managers/apache-maven/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jdk, makeWrapper }: +{ lib, stdenv, fetchurl, jdk, makeWrapper }: assert jdk != null; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { inherit jdk; - meta = with stdenv.lib; { + meta = with lib; { description = "Build automation tool (used primarily for Java projects)"; homepage = "http://maven.apache.org/"; license = licenses.asl20; diff --git a/pkgs/development/tools/build-managers/arpa2cm/default.nix b/pkgs/development/tools/build-managers/arpa2cm/default.nix index 9ed9da0d268..0af9e77acf5 100644 --- a/pkgs/development/tools/build-managers/arpa2cm/default.nix +++ b/pkgs/development/tools/build-managers/arpa2cm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "arpa2cm"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "CMake Module library for the ARPA2 project"; license = licenses.bsd2; maintainers = with maintainers; [ leenaars ]; diff --git a/pkgs/development/tools/build-managers/bam/default.nix b/pkgs/development/tools/build-managers/bam/default.nix index 969cd987974..a828c57b8c0 100644 --- a/pkgs/development/tools/build-managers/bam/default.nix +++ b/pkgs/development/tools/build-managers/bam/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, lua5_3, python }: +{ lib, stdenv, fetchFromGitHub, lua5_3, python }: stdenv.mkDerivation rec { pname = "bam"; @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { buildInputs = [ lua5_3 python ]; - buildPhase = ''${stdenv.shell} make_unix.sh''; + buildPhase = "${stdenv.shell} make_unix.sh"; - checkPhase = ''${python.interpreter} scripts/test.py''; + checkPhase = "${python.interpreter} scripts/test.py"; installPhase = '' mkdir -p "$out/share/bam" @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { cp bam "$out/bin" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Yet another build manager"; maintainers = with maintainers; [ diff --git a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix index 0c9f4d7c50a..80c949c1efb 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , git , go -, stdenv +, lib }: buildBazelPackage rec { @@ -80,7 +80,7 @@ buildBazelPackage rec { ''; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/buchgr/bazel-remote"; description = "A remote HTTP/1.1 cache for Bazel"; license = licenses.asl20; diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix index 66560e768d2..441254ce263 100644 --- a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix +++ b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "bazel-buildtools"; @@ -19,7 +19,7 @@ buildGoPackage rec { buildFlagsArray = [ "-ldflags=-s -w -X main.buildVersion=${version} -X main.buildScmRevision=${src.rev}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Tools for working with Google's bazel buildtool. Includes buildifier, buildozer, and unused_deps"; homepage = "https://github.com/bazelbuild/buildtools"; license = licenses.asl20; diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix index 756e68b5678..74b1f704020 100644 --- a/pkgs/development/tools/build-managers/bear/default.nix +++ b/pkgs/development/tools/build-managers/bear/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , pkg-config @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ./no-double-relative.patch ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool that generates a compilation database for clang tooling"; longDescription = '' Note: the bear command is very useful to generate compilation commands diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix index c1b3a7aa156..12fd01e5e4e 100644 --- a/pkgs/development/tools/build-managers/bloop/default.nix +++ b/pkgs/development/tools/build-managers/bloop/default.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { installShellCompletion --name bloop.fish --fish ${bloop-fish} ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://scalacenter.github.io/bloop/"; license = licenses.asl20; description = "A Scala build server and command-line tool to make the compile and test developer workflows fast and productive in a build-tool-agnostic way"; diff --git a/pkgs/development/tools/build-managers/bmake/default.nix b/pkgs/development/tools/build-managers/bmake/default.nix index 9bda4cde044..e1e9b348503 100644 --- a/pkgs/development/tools/build-managers/bmake/default.nix +++ b/pkgs/development/tools/build-managers/bmake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , getopt }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ./fix-unexport-env-test.patch ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Portable version of NetBSD 'make'"; homepage = "http://www.crufty.net/help/sjg/bmake.html"; license = licenses.bsd3; diff --git a/pkgs/development/tools/build-managers/boot/default.nix b/pkgs/development/tools/build-managers/boot/default.nix index 09c1eada54b..68a4d5f44ea 100644 --- a/pkgs/development/tools/build-managers/boot/default.nix +++ b/pkgs/development/tools/build-managers/boot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jdk }: +{ lib, stdenv, fetchurl, jdk }: stdenv.mkDerivation rec { version = "2.7.2"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ jdk ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Build tooling for Clojure"; homepage = "https://boot-clj.com/"; license = licenses.epl10; diff --git a/pkgs/development/tools/build-managers/buck/default.nix b/pkgs/development/tools/build-managers/buck/default.nix index 41fc0940b9d..0fbcb95704b 100644 --- a/pkgs/development/tools/build-managers/buck/default.nix +++ b/pkgs/development/tools/build-managers/buck/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, jdk, ant, python2, python2Packages, watchman, bash, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, jdk, ant, python2, python2Packages, watchman, bash, makeWrapper }: stdenv.mkDerivation rec { pname = "buck"; @@ -30,10 +30,10 @@ stdenv.mkDerivation rec { install -D -m755 buck-out/gen/programs/buck.pex $out/bin/buck wrapProgram $out/bin/buck \ --prefix PYTHONPATH : $PYTHONPATH \ - --prefix PATH : "${stdenv.lib.makeBinPath [jdk watchman]}" + --prefix PATH : "${lib.makeBinPath [jdk watchman]}" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://buck.build/"; description = "A high-performance build tool"; maintainers = [ maintainers.jgertm maintainers.marsam ]; diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix index 804bdd76f67..9dabd7b3556 100644 --- a/pkgs/development/tools/build-managers/cmake/2.8.nix +++ b/pkgs/development/tools/build-managers/cmake/2.8.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, fetchpatch, curl, expat, zlib, bzip2 +{ lib, stdenv, fetchurl, fetchpatch, curl, expat, zlib, bzip2 , useNcurses ? false, ncurses, useQt4 ? false, qt4, ps }: -with stdenv.lib; +with lib; assert stdenv ? cc; assert stdenv.cc ? libc; let - os = stdenv.lib.optionalString; + os = lib.optionalString; majorVersion = "2.8"; minorVersion = "12.2"; version = "${majorVersion}.${minorVersion}"; @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { "--mandir=/share/man" "--system-libs" "--no-system-libarchive" - ] ++ stdenv.lib.optional useQt4 "--qt-gui"; + ] ++ lib.optional useQt4 "--qt-gui"; setupHook = ./setup-hook.sh; @@ -80,8 +80,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://cmake.org"; description = "Cross-Platform Makefile Generator"; - platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ xfix ]; - license = stdenv.lib.licenses.bsd3; + platforms = if useQt4 then qt4.meta.platforms else lib.platforms.unix; + maintainers = with lib.maintainers; [ xfix ]; + license = lib.licenses.bsd3; }; } diff --git a/pkgs/development/tools/build-managers/cmake/application-services.patch b/pkgs/development/tools/build-managers/cmake/application-services.patch index 75873d6055c..f64e220eb29 100644 --- a/pkgs/development/tools/build-managers/cmake/application-services.patch +++ b/pkgs/development/tools/build-managers/cmake/application-services.patch @@ -14,15 +14,16 @@ diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.c index a5ce5d18f4..3d6838ce82 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx -@@ -43,11 +43,6 @@ +@@ -43,11 +43,10 @@ struct cmLinkImplementation; --#if !defined(CMAKE_BOOTSTRAP) && defined(__APPLE__) + #if !defined(CMAKE_BOOTSTRAP) && defined(__APPLE__) -# define HAVE_APPLICATION_SERVICES -# include <ApplicationServices/ApplicationServices.h> --#endif -- ++# include <CoreFoundation/CoreFoundation.h> + #endif + #if !defined(CMAKE_BOOTSTRAP) # include "cmXMLParser.h" diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index d38f42e4b33..5de894bd1b4 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig +{ stdenv, lib, fetchurl, pkg-config , bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash , buildPackages # darwin attributes @@ -14,18 +14,18 @@ assert withQt5 -> useQt4 == false; assert useQt4 -> withQt5 == false; -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { pname = "cmake" + lib.optionalString isBootstrap "-boot" + lib.optionalString useNcurses "-cursesUI" + lib.optionalString withQt5 "-qt5UI" + lib.optionalString useQt4 "-qt4UI"; - version = "3.19.2"; + version = "3.19.3"; src = fetchurl { url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz"; # compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt - sha256 = "1w67w0ak6vf37501dlz9yhnzlvvpw1w10n2nm3hi7yxp4cxzvq73"; + sha256 = "sha256-P6ynwTFJSh401m6fiXL/U2nkjUGeqM6qPcFbTBE2dzI="; }; patches = [ @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ setupHook pkgconfig ]; + nativeBuildInputs = [ setupHook pkg-config ]; buildInputs = [] ++ lib.optionals useSharedLibraries [ bzip2 curl expat libarchive xz zlib libuv rhash ] @@ -130,4 +130,5 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ ttuegel lnl7 ]; license = licenses.bsd3; }; -} +} // (if withQt5 then { dontWrapQtApps = true; } else {}) +) diff --git a/pkgs/development/tools/build-managers/colormake/default.nix b/pkgs/development/tools/build-managers/colormake/default.nix index 7eed8806955..251268a449d 100644 --- a/pkgs/development/tools/build-managers/colormake/default.nix +++ b/pkgs/development/tools/build-managers/colormake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, perl }: +{ lib, stdenv, fetchFromGitHub, perl }: stdenv.mkDerivation { pname = "colormake"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { cp -fa colormake.pl colormake colormake-short clmake clmake-short $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple wrapper around make to colorize the output"; homepage = "https://bre.klaki.net/programs/colormake/"; license = licenses.gpl2; diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index e09277e498d..c73b7149a36 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -1,4 +1,4 @@ -{ lib, python3, fetchFromGitHub, git, pkgconfig }: +{ lib, python3, fetchFromGitHub, git, pkg-config }: # Note: # Conan has specific dependency demands; check @@ -72,7 +72,7 @@ in newPython.pkgs.buildPythonApplication rec { ]; checkInputs = [ - pkgconfig + pkg-config git ] ++ (with newPython.pkgs; [ codecov diff --git a/pkgs/development/tools/build-managers/doit/default.nix b/pkgs/development/tools/build-managers/doit/default.nix deleted file mode 100644 index b906d64f0af..00000000000 --- a/pkgs/development/tools/build-managers/doit/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl, python3Packages }: - -let - - name = "doit"; - version = "0.32.0"; - -in python3Packages.buildPythonApplication { - name = "${name}-${version}"; - - src = fetchurl { - url = "mirror://pypi/d/${name}/${name}-${version}.tar.gz"; - sha256 = "033m6y9763l81kgqd07rm62bngv3dsm3k9p28nwsn2qawl8h8g9j"; - }; - - buildInputs = with python3Packages; [ mock pytest ]; - - propagatedBuildInputs = with python3Packages; [ cloudpickle ] - ++ stdenv.lib.optional stdenv.isLinux pyinotify - ++ stdenv.lib.optional stdenv.isDarwin macfsevents; - - # Tests fail due to mysterious gdbm.open() resource temporarily - # unavailable errors. - doCheck = false; - checkPhase = "py.test"; - - meta = with stdenv.lib; { - homepage = "https://pydoit.org/"; - description = "A task management & automation tool"; - license = licenses.mit; - longDescription = '' - doit is a modern open-source build-tool written in python - designed to be simple to use and flexible to deal with complex - work-flows. It is specially suitable for building and managing - custom work-flows where there is no out-of-the-box solution - available. - ''; - maintainers = with maintainers; [ pSub ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/tools/build-managers/drake/gemset.nix b/pkgs/development/tools/build-managers/drake/gemset.nix index 061ed5d973a..09b3bc7ec06 100644 --- a/pkgs/development/tools/build-managers/drake/gemset.nix +++ b/pkgs/development/tools/build-managers/drake/gemset.nix @@ -20,4 +20,4 @@ }; version = "0.9.2.0.3.1"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/build-managers/dub/default.nix b/pkgs/development/tools/build-managers/dub/default.nix index 2668eca4569..2df829a0229 100644 --- a/pkgs/development/tools/build-managers/dub/default.nix +++ b/pkgs/development/tools/build-managers/dub/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, curl, dmd, libevent, rsync }: +{ lib, stdenv, fetchFromGitHub, curl, dmd, libevent, rsync }: stdenv.mkDerivation rec { pname = "dub"; @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { cp bin/dub $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Package and build manager for D applications and libraries"; homepage = "https://code.dlang.org/"; license = licenses.mit; diff --git a/pkgs/development/tools/build-managers/fac/default.nix b/pkgs/development/tools/build-managers/fac/default.nix index 8c41eb3ac51..601f7ea9fea 100644 --- a/pkgs/development/tools/build-managers/fac/default.nix +++ b/pkgs/development/tools/build-managers/fac/default.nix @@ -1,4 +1,4 @@ -{ stdenv, git, fetchFromGitHub, rustPlatform }: +{ lib, git, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "fac-build"; @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { 'std::process::Command::new("${git}/bin/git")' ''; - meta = with stdenv.lib; { + meta = with lib; { description = '' A build system that uses ptrace to handle dependencies automatically ''; diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix index a83281c4e96..387650e85ab 100644 --- a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, guileSupport ? false, pkgconfig ? null , guile ? null }: +{ lib, stdenv, fetchurl, guileSupport ? false, pkg-config ? null , guile ? null }: -assert guileSupport -> ( pkgconfig != null && guile != null ); +assert guileSupport -> ( pkg-config != null && guile != null ); let version = "4.2.1"; @@ -25,10 +25,10 @@ stdenv.mkDerivation { ./glibc-2.27-glob.patch ]; - nativeBuildInputs = stdenv.lib.optionals guileSupport [ pkgconfig ]; - buildInputs = stdenv.lib.optionals guileSupport [ guile ]; + nativeBuildInputs = lib.optionals guileSupport [ pkg-config ]; + buildInputs = lib.optionals guileSupport [ guile ]; - configureFlags = stdenv.lib.optional guileSupport "--with-guile" + configureFlags = lib.optional guileSupport "--with-guile" # Make uses this test to decide whether it should keep track of # subseconds. Apple made this possible with APFS and macOS 10.13. @@ -37,11 +37,11 @@ stdenv.mkDerivation { # a second. So, tell Make to ignore nanoseconds in mtime here by # overriding the autoconf test for the struct. # See https://github.com/NixOS/nixpkgs/issues/51221 for discussion. - ++ stdenv.lib.optional stdenv.isDarwin "ac_cv_struct_st_mtim_nsec=no"; + ++ lib.optional stdenv.isDarwin "ac_cv_struct_st_mtim_nsec=no"; outputs = [ "out" "man" "info" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.gnu.org/software/make/"; description = "A tool to control the generation of non-source files from sources"; license = licenses.gpl3Plus; diff --git a/pkgs/development/tools/build-managers/gnumake/default.nix b/pkgs/development/tools/build-managers/gnumake/default.nix index f01f38ecd23..fb9dab54049 100644 --- a/pkgs/development/tools/build-managers/gnumake/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, guileSupport ? false, pkgconfig ? null , guile ? null }: +{ lib, stdenv, fetchurl, guileSupport ? false, pkg-config ? null , guile ? null }: -assert guileSupport -> ( pkgconfig != null && guile != null ); +assert guileSupport -> ( pkg-config != null && guile != null ); let version = "4.3"; @@ -21,10 +21,10 @@ stdenv.mkDerivation { ./impure-dirs.patch ]; - nativeBuildInputs = stdenv.lib.optionals guileSupport [ pkgconfig ]; - buildInputs = stdenv.lib.optionals guileSupport [ guile ]; + nativeBuildInputs = lib.optionals guileSupport [ pkg-config ]; + buildInputs = lib.optionals guileSupport [ guile ]; - configureFlags = stdenv.lib.optional guileSupport "--with-guile" + configureFlags = lib.optional guileSupport "--with-guile" # Make uses this test to decide whether it should keep track of # subseconds. Apple made this possible with APFS and macOS 10.13. @@ -33,11 +33,11 @@ stdenv.mkDerivation { # a second. So, tell Make to ignore nanoseconds in mtime here by # overriding the autoconf test for the struct. # See https://github.com/NixOS/nixpkgs/issues/51221 for discussion. - ++ stdenv.lib.optional stdenv.isDarwin "ac_cv_struct_st_mtim_nsec=no"; + ++ lib.optional stdenv.isDarwin "ac_cv_struct_st_mtim_nsec=no"; outputs = [ "out" "man" "info" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.gnu.org/software/make/"; description = "A tool to control the generation of non-source files from sources"; license = licenses.gpl3Plus; diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index d06282739af..d314064904d 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, jdk, java ? jdk, makeWrapper }: +{ lib, stdenv, fetchurl, unzip, jdk, java ? jdk, makeWrapper }: rec { gradleGen = {name, src, nativeVersion} : stdenv.mkDerivation { @@ -46,20 +46,20 @@ rec { build-by-convention behavior. ''; homepage = "http://www.gradle.org/"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; }; }; - gradle_latest = gradle_6_7; + gradle_latest = gradle_6_8; - gradle_6_7 = gradleGen rec { - name = "gradle-6.7"; - nativeVersion = "0.22-milestone-8"; + gradle_6_8 = gradleGen rec { + name = "gradle-6.8.1"; + nativeVersion = "0.22-milestone-9"; src = fetchurl { url = "https://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "1i6zm55wzy13wvvmf3804b0rs47yrqqablf4gpf374ls05cpgmca"; + sha256 = "1zfn7400k39qbiidd5zxay6v5f5xz8x4g7rrf04p71bkmws1lngx"; }; }; diff --git a/pkgs/development/tools/build-managers/gup/default.nix b/pkgs/development/tools/build-managers/gup/default.nix index 30c4d4ec4de..dcc0c3aef90 100644 --- a/pkgs/development/tools/build-managers/gup/default.nix +++ b/pkgs/development/tools/build-managers/gup/default.nix @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { meta = { inherit (src.meta) homepage; description = "A better make, inspired by djb's redo"; - license = stdenv.lib.licenses.lgpl2Plus; - maintainers = [ stdenv.lib.maintainers.timbertson ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.lgpl2Plus; + maintainers = [ lib.maintainers.timbertson ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/tools/build-managers/icmake/default.nix b/pkgs/development/tools/build-managers/icmake/default.nix index 89e2b8d0cc6..6320646974a 100644 --- a/pkgs/development/tools/build-managers/icmake/default.nix +++ b/pkgs/development/tools/build-managers/icmake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, makeWrapper, gcc, ncurses }: +{ lib, stdenv, fetchFromGitLab, makeWrapper, gcc, ncurses }: stdenv.mkDerivation rec { pname = "icmake"; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { --prefix PATH : ${ncurses}/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A program maintenance (make) utility using a C-like grammar"; homepage = "https://fbb-git.gitlab.io/icmake/"; license = licenses.gpl3; diff --git a/pkgs/development/tools/build-managers/jam/default.nix b/pkgs/development/tools/build-managers/jam/default.nix index 7d7502fad4b..6f5ecde8f88 100644 --- a/pkgs/development/tools/build-managers/jam/default.nix +++ b/pkgs/development/tools/build-managers/jam/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, yacc }: +{ lib, stdenv, fetchurl, yacc }: stdenv.mkDerivation rec { name = "jam-2.6.1"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.perforce.com/resources/documentation/jam"; license = licenses.free; description = "Just Another Make"; diff --git a/pkgs/development/tools/build-managers/kati/default.nix b/pkgs/development/tools/build-managers/kati/default.nix index a7fced4482b..ed5923e74d0 100644 --- a/pkgs/development/tools/build-managers/kati/default.nix +++ b/pkgs/development/tools/build-managers/kati/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { pname = "kati-unstable"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { install -D ckati $out/bin/ckati ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An experimental GNU make clone"; homepage = "https://github.com/google/kati"; platforms = platforms.all; diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix index f1445970f6a..488697033d9 100644 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/pkgs/development/tools/build-managers/leiningen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper +{ lib, stdenv, fetchurl, makeWrapper , coreutils, jdk, rlwrap, gnupg }: stdenv.mkDerivation rec { @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { substituteInPlace $out/bin/lein \ --replace 'LEIN_JAR=/usr/share/java/leiningen-$LEIN_VERSION-standalone.jar' "LEIN_JAR=$out/share/$JARNAME" wrapProgram $out/bin/lein \ - --prefix PATH ":" "${stdenv.lib.makeBinPath [ rlwrap coreutils ]}" \ + --prefix PATH ":" "${lib.makeBinPath [ rlwrap coreutils ]}" \ --set LEIN_GPG ${gnupg}/bin/gpg \ --set JAVA_CMD ${jdk}/bin/java ''; @@ -46,8 +46,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://leiningen.org/"; description = "Project automation for Clojure"; - license = stdenv.lib.licenses.epl10; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - maintainers = with stdenv.lib.maintainers; [ thiagokokada ]; + license = lib.licenses.epl10; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + maintainers = with lib.maintainers; [ thiagokokada ]; }; } diff --git a/pkgs/development/tools/build-managers/mage/default.nix b/pkgs/development/tools/build-managers/mage/default.nix index 6c9d8bfc838..d8ccd3ad2fe 100644 --- a/pkgs/development/tools/build-managers/mage/default.nix +++ b/pkgs/development/tools/build-managers/mage/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mage"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "magefile"; repo = pname; rev = "v${version}"; - sha256 = "0c77xgz2bz4j9sh9v7f49iqyamc4lvvldcmn6v50hk98s9193gbf"; + sha256 = "sha256-ghOk44VcQUAAYm9NCLsgYdky1KEpwOeChBNrgUKjnC8="; }; - vendorSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; + vendorSha256 = null; doCheck = false; diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 890c457da05..7009aa4898f 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -1,6 +1,6 @@ { lib , python3 -, stdenv + , writeTextDir , substituteAll , fetchpatch @@ -63,7 +63,7 @@ python3.pkgs.buildPythonApplication rec { # 0.45 update enabled tests but they are failing doCheck = false; - # checkInputs = [ ninja pkgconfig ]; + # checkInputs = [ ninja pkg-config ]; # checkPhase = "python ./run_project_tests.py"; postFixup = '' diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix index a3865e2c52c..5942e20ec92 100644 --- a/pkgs/development/tools/build-managers/mill/default.nix +++ b/pkgs/development/tools/build-managers/mill/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, makeWrapper }: +{ lib, stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { pname = "mill"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.lihaoyi.com/mill"; license = licenses.mit; description = "A build tool for Scala, Java and more"; @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { modules (written in Java or Scala) or through an external subprocesses. ''; maintainers = with maintainers; [ scalavision ]; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/tools/build-managers/mk/default.nix b/pkgs/development/tools/build-managers/mk/default.nix index 09028789daa..1eaa51a5de0 100644 --- a/pkgs/development/tools/build-managers/mk/default.nix +++ b/pkgs/development/tools/build-managers/mk/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation { name = "mk-2006-01-31"; @@ -9,6 +9,6 @@ stdenv.mkDerivation { builder = ./builder.sh; meta = { - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/tools/build-managers/msbuild/default.nix b/pkgs/development/tools/build-managers/msbuild/default.nix index 1b805df95a0..ce08986b3e1 100644 --- a/pkgs/development/tools/build-managers/msbuild/default.nix +++ b/pkgs/development/tools/build-managers/msbuild/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, glibcLocales, mono, dotnetPackages, unzip, dotnet-sdk }: +{ lib, stdenv, fetchurl, makeWrapper, glibcLocales, mono, dotnetPackages, unzip, dotnet-sdk }: let @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { # https://github.com/NixOS/nixpkgs/issues/38991 # bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8) - LOCALE_ARCHIVE = stdenv.lib.optionalString stdenv.isLinux + LOCALE_ARCHIVE = lib.optionalString stdenv.isLinux "${glibcLocales}/lib/locale/locale-archive"; buildPhase = '' @@ -122,7 +122,7 @@ EOF ${mono}/bin/mono Helloworld.exe | grep "Hello, world!" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Mono version of Microsoft Build Engine, the build platform for .NET, and Visual Studio"; homepage = "https://github.com/mono/msbuild"; license = licenses.mit; diff --git a/pkgs/development/tools/build-managers/ninja/default.nix b/pkgs/development/tools/build-managers/ninja/default.nix index 8fc81a1a979..ddc61ca86d9 100644 --- a/pkgs/development/tools/build-managers/ninja/default.nix +++ b/pkgs/development/tools/build-managers/ninja/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, fetchpatch, python3, buildDocs ? true, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxslt, re2c }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, python3, buildDocs ? true, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxslt, re2c }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "ninja"; diff --git a/pkgs/development/tools/build-managers/pants/default.nix b/pkgs/development/tools/build-managers/pants/default.nix index 9757d8cda8d..53333c217ba 100644 --- a/pkgs/development/tools/build-managers/pants/default.nix +++ b/pkgs/development/tools/build-managers/pants/default.nix @@ -1,6 +1,6 @@ -{ stdenv, pythonPackages }: +{ lib, pythonPackages }: -with stdenv.lib; +with lib; with pythonPackages; buildPythonApplication rec { diff --git a/pkgs/development/tools/build-managers/qbs/default.nix b/pkgs/development/tools/build-managers/qbs/default.nix index 359c942d189..73c23b88752 100644 --- a/pkgs/development/tools/build-managers/qbs/default.nix +++ b/pkgs/development/tools/build-managers/qbs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qmake, qtbase, qtscript }: +{ lib, stdenv, fetchFromGitHub, qmake, qtbase, qtscript }: stdenv.mkDerivation rec { pname = "qbs"; @@ -14,13 +14,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ qmake ]; + dontWrapQtApps = true; + qmakeFlags = [ "QBS_INSTALL_PREFIX=$(out)" "qbs.pro" ]; buildInputs = [ qtbase qtscript ]; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool that helps simplify the build process for developing projects across multiple platforms"; homepage = "https://wiki.qt.io/Qbs"; license = licenses.lgpl3; diff --git a/pkgs/development/tools/build-managers/rake/gemset.nix b/pkgs/development/tools/build-managers/rake/gemset.nix index 05a59cff850..534c5efcfb1 100644 --- a/pkgs/development/tools/build-managers/rake/gemset.nix +++ b/pkgs/development/tools/build-managers/rake/gemset.nix @@ -9,4 +9,4 @@ }; version = "12.3.2"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/build-managers/rebar/default.nix b/pkgs/development/tools/build-managers/rebar/default.nix index 1c5996c6b1c..d3926beb321 100644 --- a/pkgs/development/tools/build-managers/rebar/default.nix +++ b/pkgs/development/tools/build-managers/rebar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, erlang }: +{ lib, stdenv, fetchurl, erlang }: let @@ -35,7 +35,7 @@ stdenv.mkDerivation { variety of locations (git, hg, etc). ''; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.asl20; + platforms = lib.platforms.unix; + license = lib.licenses.asl20; }; } diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix index bf28868d0e7..aa3af12c934 100644 --- a/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/pkgs/development/tools/build-managers/rebar3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, +{ lib, stdenv, fetchFromGitHub, fetchHex, erlang, tree }: @@ -135,8 +135,8 @@ stdenv.mkDerivation rec { variety of locations (hex.pm, git, hg, and so on). ''; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ gleber tazjin ]; - license = stdenv.lib.licenses.asl20; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ gleber tazjin ]; + license = lib.licenses.asl20; }; } diff --git a/pkgs/development/tools/build-managers/redo-apenwarr/default.nix b/pkgs/development/tools/build-managers/redo-apenwarr/default.nix index c62fb0f2515..638f10f0187 100644 --- a/pkgs/development/tools/build-managers/redo-apenwarr/default.nix +++ b/pkgs/development/tools/build-managers/redo-apenwarr/default.nix @@ -30,7 +30,7 @@ --replace "/bin/ls" "ls" substituteInPlace t/110-compile/hello.o.do \ - --replace "/usr/include" "${stdenv.lib.getDev stdenv.cc.libc}/include" + --replace "/usr/include" "${lib.getDev stdenv.cc.libc}/include" substituteInPlace t/200-shell/nonshelltest.do \ --replace "/usr/bin/env perl" "${perl}/bin/perl" diff --git a/pkgs/development/tools/build-managers/redo-c/default.nix b/pkgs/development/tools/build-managers/redo-c/default.nix index 1480f32a50f..40708b7877a 100644 --- a/pkgs/development/tools/build-managers/redo-c/default.nix +++ b/pkgs/development/tools/build-managers/redo-c/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "redo-c"; version = "0.2"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { cp '${./Makefile}' Makefile ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An implementation of the redo build system in portable C with zero dependencies"; homepage = "https://github.com/leahneukirchen/redo-c"; license = licenses.cc0; diff --git a/pkgs/development/tools/build-managers/redo-sh/default.nix b/pkgs/development/tools/build-managers/redo-sh/default.nix index 315b74b820e..d22f4bc487f 100644 --- a/pkgs/development/tools/build-managers/redo-sh/default.nix +++ b/pkgs/development/tools/build-managers/redo-sh/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, makeWrapper, coreutils }: +{ lib, stdenv, fetchurl, makeWrapper, coreutils }: stdenv.mkDerivation { - version = "4.0.3"; + version = "4.0.4"; pname = "redo-sh"; src = fetchurl { url = "http://news.dieweltistgarnichtso.net/bin/archives/redo-sh.tar.gz"; - sha256 = "1n84ld4fihqa7a6kn3f177dknz89qcvissfwz1m21bwdq950avia"; + sha256 = "0d3hz3vy5qmjr9r4f8a5cx9hikpzs8h8f0fsl3dpbialf4wck24g"; }; buildInputs = [ makeWrapper ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Redo implementation in Bourne Shell"; homepage = "http://news.dieweltistgarnichtso.net/bin/redo-sh.html"; license = licenses.agpl3; diff --git a/pkgs/development/tools/build-managers/redo/default.nix b/pkgs/development/tools/build-managers/redo/default.nix index a735a05dc5b..48fbffc3940 100644 --- a/pkgs/development/tools/build-managers/redo/default.nix +++ b/pkgs/development/tools/build-managers/redo/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, perl }: +{lib, stdenv, fetchurl, perl }: stdenv.mkDerivation rec { name = "redo-1.4"; @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://jdebp.eu./Softwares/redo/"; description = "A system for building target files from source files"; - license = stdenv.lib.licenses.bsd2; - maintainers = [ stdenv.lib.maintainers.vrthra ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.vrthra ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/tools/build-managers/remake/default.nix b/pkgs/development/tools/build-managers/remake/default.nix index 7d44bc74df8..f61a7e77458 100644 --- a/pkgs/development/tools/build-managers/remake/default.nix +++ b/pkgs/development/tools/build-managers/remake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, readline }: +{ lib, stdenv, fetchurl, readline }: stdenv.mkDerivation rec { pname = "remake"; @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { meta = { homepage = "http://bashdb.sourceforge.net/remake/"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; description = "GNU Make with comprehensible tracing and a debugger"; - platforms = with stdenv.lib.platforms; linux ++ darwin; - maintainers = with stdenv.lib.maintainers; [ bjornfor ]; + platforms = with lib.platforms; linux ++ darwin; + maintainers = with lib.maintainers; [ bjornfor ]; }; } diff --git a/pkgs/development/tools/build-managers/rocm-cmake/default.nix b/pkgs/development/tools/build-managers/rocm-cmake/default.nix index 1dd931981da..5b9a456ce75 100644 --- a/pkgs/development/tools/build-managers/rocm-cmake/default.nix +++ b/pkgs/development/tools/build-managers/rocm-cmake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "rocm-cmake"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "CMake modules for common build tasks for the ROCm stack"; homepage = "https://github.com/RadeonOpenCompute/rocm-cmake"; license = licenses.mit; diff --git a/pkgs/development/tools/build-managers/samurai/default.nix b/pkgs/development/tools/build-managers/samurai/default.nix index f8b649e0409..4360a3f3a30 100644 --- a/pkgs/development/tools/build-managers/samurai/default.nix +++ b/pkgs/development/tools/build-managers/samurai/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "samurai"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { makeFlags = [ "DESTDIR=" "PREFIX=${placeholder "out"}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "ninja-compatible build tool written in C"; homepage = "https://github.com/michaelforney/samurai"; license = with licenses; [ mit asl20 ]; # see LICENSE diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix index 24c2bdd2af3..ea737457ec4 100644 --- a/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ b/pkgs/development/tools/build-managers/sbt-extras/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, which, curl, makeWrapper, jdk, writeScript +{ lib, stdenv, fetchFromGitHub, which, curl, makeWrapper, jdk, writeScript , common-updater-scripts, cacert, git, nixfmt, nix, jq, coreutils, gnused , nixosTests }: stdenv.mkDerivation rec { pname = "sbt-extras"; - rev = "4db8d5c27413f69297adfffac57485d88d73c60e"; - version = "2020-12-26"; + rev = "562e2f74295f9c3ba2b3c8a87f6665b171dcdf47"; + version = "2021-02-01"; src = fetchFromGitHub { owner = "paulp"; repo = "sbt-extras"; inherit rev; - sha256 = "B8abzdohkw3aPhbENJ2vxZFLWhIpf0HF/uv+WJbVRYg="; + sha256 = "1787ghqc62wnhkhc6x2ly63bvkmprgifw497npx2l08d3s4q7kbk"; }; dontBuild = true; @@ -25,9 +25,7 @@ stdenv.mkDerivation rec { install bin/sbt $out/bin - wrapProgram $out/bin/sbt --prefix PATH : ${ - stdenv.lib.makeBinPath [ which curl ] - } + wrapProgram $out/bin/sbt --prefix PATH : ${lib.makeBinPath [ which curl ]} ''; passthru = { @@ -37,7 +35,7 @@ stdenv.mkDerivation rec { #!${stdenv.shell} set -xo errexit PATH=${ - stdenv.lib.makeBinPath [ + lib.makeBinPath [ common-updater-scripts curl cacert @@ -70,8 +68,8 @@ stdenv.mkDerivation rec { description = "A more featureful runner for sbt, the simple/scala/standard build tool"; homepage = "https://github.com/paulp/sbt-extras"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ nequissimus puffnfresh ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ nequissimus puffnfresh ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index a9314cef0cc..9e45c3e8b90 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -1,23 +1,23 @@ -{ stdenv, fetchurl, jre, autoPatchelfHook, zlib, writeScript +{ lib, stdenv, fetchurl, jre, autoPatchelfHook, zlib, writeScript , common-updater-scripts, git, nixfmt, nix, coreutils, gnused, nixosTests }: stdenv.mkDerivation rec { pname = "sbt"; - version = "1.4.6"; + version = "1.4.7"; src = fetchurl { url = "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"; - sha256 = "sha256-hqbyjnmWYHQQEGarGqGSZ9DI1E6uIdqpPJxgVspvnaQ="; + sha256 = "sha256-wqdZ/kCjwhoWtaiNAM1m869vByHk6mG2OULfuDotVP0="; }; patchPhase = '' echo -java-home ${jre.home} >>conf/sbtopts ''; - nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; - buildInputs = stdenv.lib.optionals stdenv.isLinux [ zlib ]; + buildInputs = lib.optionals stdenv.isLinux [ zlib ]; installPhase = '' mkdir -p $out/share/sbt $out/bin @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { } $out/bin/sbtn ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.scala-sbt.org/"; license = licenses.bsd3; description = "A build tool for Scala, Java and more"; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { #!${stdenv.shell} set -o errexit PATH=${ - stdenv.lib.makeBinPath [ + lib.makeBinPath [ common-updater-scripts git nixfmt diff --git a/pkgs/development/tools/build-managers/scons/common.nix b/pkgs/development/tools/build-managers/scons/common.nix index 7a15c193423..8b5b608fdf3 100644 --- a/pkgs/development/tools/build-managers/scons/common.nix +++ b/pkgs/development/tools/build-managers/scons/common.nix @@ -1,6 +1,6 @@ { version, sha256 }: -{ stdenv, fetchurl, python3Packages, lib }: +{ fetchurl, python3Packages, lib }: python3Packages.buildPythonApplication rec { pname = "scons"; @@ -16,12 +16,20 @@ python3Packages.buildPythonApplication rec { postPatch = lib.optionalString (lib.versionAtLeast version "4.0.0") '' substituteInPlace setup.cfg \ --replace "build/dist" "dist" + '' + lib.optionalString (lib.versionAtLeast version "4.1.0") '' + substituteInPlace setup.cfg \ + --replace "build/doc/man/" "" ''; # The release tarballs don't contain any tests (runtest.py and test/*): doCheck = lib.versionOlder version "4.0.0"; - meta = with stdenv.lib; { + postInstall = lib.optionalString (lib.versionAtLeast version "4.1.0") '' + mkdir -p "$out/share/man/man1" + mv "$out/"*.1 "$out/share/man/man1/" + ''; + + meta = with lib; { description = "An improved, cross-platform substitute for Make"; longDescription = '' SCons is an Open Source software construction tool. Think of diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix index eb86d595597..4b07eb0501d 100644 --- a/pkgs/development/tools/build-managers/scons/default.nix +++ b/pkgs/development/tools/build-managers/scons/default.nix @@ -12,7 +12,7 @@ in { sha256 = "1yzq2gg9zwz9rvfn42v5jzl3g4qf1khhny6zfbi2hib55zvg60bq"; }).override { python3Packages = python2Packages; }; scons_latest = mkScons { - version = "4.0.1"; - sha256 = "0z00l9wzaiqyjq0hapbvsjclvcfjjjq04kmxi7ffq966nl2d2bkj"; + version = "4.1.0"; + sha256 = "11axk03142ziax6i3wwy9qpqp7r3i7h5jg9y2xzph9i15rv8vlkj"; }; } diff --git a/pkgs/development/tools/build-managers/shards/default.nix b/pkgs/development/tools/build-managers/shards/default.nix index cf422fc2e07..8cab1667b21 100644 --- a/pkgs/development/tools/build-managers/shards/default.nix +++ b/pkgs/development/tools/build-managers/shards/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib , fetchFromGitHub , crystal_0_34 , crystal_0_35 @@ -26,7 +26,7 @@ let # tries to execute git which fails spectacularly doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Dependency manager for the Crystal language"; license = licenses.asl20; maintainers = with maintainers; [ peterhoeg ]; diff --git a/pkgs/development/tools/build-managers/tup/default.nix b/pkgs/development/tools/build-managers/tup/default.nix index 628e0c4797b..f0e6efdca3e 100644 --- a/pkgs/development/tools/build-managers/tup/default.nix +++ b/pkgs/development/tools/build-managers/tup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fuse3, pkgconfig, pcre }: +{ lib, stdenv, fetchFromGitHub, fuse3, pkg-config, pcre }: stdenv.mkDerivation rec { pname = "tup"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1qd07h4wi0743l7z2vybfvhwp61g2p2pc5qhl40672ryl24nvd1d"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ fuse3 pcre ]; configurePhase = '' @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; - meta = with stdenv.lib; { + meta = with lib; { description = "A fast, file-based build system"; longDescription = '' Tup is a file-based build system for Linux, OSX, and Windows. It inputs a list diff --git a/pkgs/development/tools/build-managers/waf/default.nix b/pkgs/development/tools/build-managers/waf/default.nix index 49aae7c3014..ae62ce539ba 100644 --- a/pkgs/development/tools/build-managers/waf/default.nix +++ b/pkgs/development/tools/build-managers/waf/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchFromGitLab, python, ensureNewerSourcesForZipFilesHook +{ lib, stdenv, fetchFromGitLab, python, ensureNewerSourcesForZipFilesHook # optional list of extra waf tools, e.g. `[ "doxygen" "pytest" ]` , withTools ? null }: let - wafToolsArg = with stdenv.lib.strings; + wafToolsArg = with lib.strings; optionalString (!isNull withTools) " --tools=\"${concatStringsSep "," withTools}\""; in stdenv.mkDerivation rec { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { install -D waf $out/bin/waf ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Meta build system"; homepage = "https://waf.io"; license = licenses.bsd3; diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index a680dd097fe..18d41d6f740 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib , buildGoModule , fetchFromGitHub , go-md2man @@ -14,13 +14,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.19.0"; + version = "1.19.3"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "15ps4z41r8inyg0g1k8s9s3hkbnrl942w0n3957bv8g8gjihww0f"; + sha256 = "sha256-mHr+FuDMxLA5Y7BNbDN75mdHVP6Ah1/S5vXg6cC/dcE="; }; outputs = [ "out" "man" ]; @@ -52,7 +52,7 @@ buildGoModule rec { make -C docs install PREFIX="$man" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool which facilitates building OCI images"; homepage = "https://buildah.io/"; changelog = "https://github.com/containers/buildah/releases/tag/v${version}"; diff --git a/pkgs/development/tools/buildkit/default.nix b/pkgs/development/tools/buildkit/default.nix index 30a013dac11..55894058794 100644 --- a/pkgs/development/tools/buildkit/default.nix +++ b/pkgs/development/tools/buildkit/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchFromGitHub, buildGoPackage }: +{ lib, stdenv, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { pname = "buildkit"; version = "0.8.1"; goPackagePath = "github.com/moby/buildkit"; - subPackages = [ "cmd/buildctl" ] ++ stdenv.lib.optionals stdenv.isLinux [ "cmd/buildkitd" ]; + subPackages = [ "cmd/buildctl" ] ++ lib.optionals stdenv.isLinux [ "cmd/buildkitd" ]; src = fetchFromGitHub { owner = "moby"; @@ -16,7 +16,7 @@ buildGoPackage rec { buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/version.Version=${version} -X ${goPackagePath}/version.Revision=${src.rev}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Concurrent, cache-efficient, and Dockerfile-agnostic builder toolkit"; homepage = "https://github.com/moby/buildkit"; license = licenses.asl20; diff --git a/pkgs/development/tools/buildpack/default.nix b/pkgs/development/tools/buildpack/default.nix index dbb45df40c2..68d0a53387a 100644 --- a/pkgs/development/tools/buildpack/default.nix +++ b/pkgs/development/tools/buildpack/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pack"; - version = "0.15.1"; + version = "0.16.0"; src = fetchFromGitHub { owner = "buildpacks"; repo = pname; rev = "v${version}"; - sha256 = "026qy81hfblx98z9hip7gpqcfqgzfhm5bimg6p9gi5fd5wsbfs4c"; + sha256 = "sha256-fNPgdMwqQq2Gh/rkf6KHEd34rnQqhw7Jf1L34oVorqM="; }; - vendorSha256 = "0i6nplh1papcmdzas9f8pkccsx5csbxxkvy5a6130jjbwdm14jw7"; + vendorSha256 = "sha256-U38j5fxECKjYr5pqaNk0+Z0opQNqiYV2+6dIEaHUVF8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/cadre/gemset.nix b/pkgs/development/tools/cadre/gemset.nix index 33fd428debf..e98f5c5f3e6 100644 --- a/pkgs/development/tools/cadre/gemset.nix +++ b/pkgs/development/tools/cadre/gemset.nix @@ -32,4 +32,4 @@ }; version = "1.2.1"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/capnproto-java/default.nix b/pkgs/development/tools/capnproto-java/default.nix new file mode 100644 index 00000000000..95b78b724eb --- /dev/null +++ b/pkgs/development/tools/capnproto-java/default.nix @@ -0,0 +1,35 @@ +{ lib, stdenv, fetchFromGitHub, fetchpatch, capnproto, pkg-config }: + +stdenv.mkDerivation rec { + pname = "capnproto-java"; + version = "0.1.5"; + + src = fetchFromGitHub { + owner = "capnproto"; + repo = pname; + rev = "v${version}"; + hash = "sha256:1512x70xa6mlg9dmr84r8xbf0jzysjal51ivhhh2ppl97yiqjgls"; + }; + + patches = [ + # Add make install rule + (fetchpatch { + url = "https://github.com/capnproto/capnproto-java/commit/e96448d3f5737db25e55cd268652712b69db5cc0.diff"; + sha256 = "0f3vyap1zsxy675900pzg5ngh7bf9icllm1w04q64g8i91sdzljl"; + }) + ]; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ capnproto ]; + + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + + meta = with lib; { + description = "Cap'n Proto codegen plugin for Java"; + longDescription = "Only includes compiler plugin, the Java runtime/library that the generated code will link to must be built separately with Maven."; + homepage = "https://dwrensha.github.io/capnproto-java/index.html"; + license = licenses.mit; + maintainers = with maintainers; [ bhipple ]; + }; +} diff --git a/pkgs/development/tools/cargo-web/default.nix b/pkgs/development/tools/cargo-web/default.nix index 3008c15d848..c85ef52564a 100644 --- a/pkgs/development/tools/cargo-web/default.nix +++ b/pkgs/development/tools/cargo-web/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, openssl, perl, pkgconfig, rustPlatform +{ lib, stdenv, fetchFromGitHub, openssl, perl, pkg-config, rustPlatform , CoreServices, Security }: @@ -15,10 +15,10 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0i9xp7vd1rp6xgkbbrspm3qq4hxwfwa00di3k73z1x64d3d8r5fm"; - nativeBuildInputs = [ openssl perl pkgconfig ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; + nativeBuildInputs = [ openssl perl pkg-config ]; + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Security ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A Cargo subcommand for the client-side Web"; homepage = "https://github.com/koute/cargo-web"; license = with licenses; [ asl20 /* or */ mit ]; diff --git a/pkgs/development/tools/cask/default.nix b/pkgs/development/tools/cask/default.nix index 925d10b23b4..886d435b811 100644 --- a/pkgs/development/tools/cask/default.nix +++ b/pkgs/development/tools/cask/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, python, emacsPackages }: +{ lib, stdenv, fetchurl, python, emacs }: stdenv.mkDerivation rec { pname = "cask"; - inherit (emacsPackages.melpaStablePackages.cask) src version; + inherit (emacs.pkgs.melpaStablePackages.cask) src version; doCheck = true; - nativeBuildInputs = [ emacsPackages.emacs ]; - buildInputs = with emacsPackages; [ + nativeBuildInputs = [ emacs ]; + buildInputs = with emacs.pkgs; [ s f dash ansi ecukes servant ert-runner el-mock noflet ert-async shell-split-string git package-build ] ++ [ @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ln -s $out/share/emacs/site-lisp/cask/bin/cask $out/bin/cask ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Project management for Emacs"; longDescription = '' Cask is a project management tool for Emacs that helps automate the diff --git a/pkgs/development/tools/castxml/default.nix b/pkgs/development/tools/castxml/default.nix index 90be513bd50..ff47bd0e9f3 100644 --- a/pkgs/development/tools/castxml/default.nix +++ b/pkgs/development/tools/castxml/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "0ypj67xrgj228myp7l1gsjw1ja97q68nmj98dsd33srmiayqraj4"; }; - nativeBuildInputs = [ cmake ] ++ stdenv.lib.optionals withMan [ python3Packages.sphinx ]; + nativeBuildInputs = [ cmake ] ++ lib.optionals withMan [ python3Packages.sphinx ]; clangVersion = lib.getVersion llvmPackages.clang; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ctest -E 'cmd.cc-(gnu|msvc)-((c-src-c)|(src-cxx))-cmd' ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/CastXML/CastXML"; license = licenses.asl20; description = "Abstract syntax tree XML output tool"; diff --git a/pkgs/development/tools/cbor-diag/gemset.nix b/pkgs/development/tools/cbor-diag/gemset.nix index 49de5b06f54..c3fa8f42069 100644 --- a/pkgs/development/tools/cbor-diag/gemset.nix +++ b/pkgs/development/tools/cbor-diag/gemset.nix @@ -51,4 +51,4 @@ }; version = "1.6.10"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/cddl/gemset.nix b/pkgs/development/tools/cddl/gemset.nix index a66833e27d9..c1f1c64495e 100644 --- a/pkgs/development/tools/cddl/gemset.nix +++ b/pkgs/development/tools/cddl/gemset.nix @@ -92,4 +92,4 @@ }; version = "1.6.10"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/cdecl/default.nix b/pkgs/development/tools/cdecl/default.nix index 7981681a641..7e0a07ad834 100644 --- a/pkgs/development/tools/cdecl/default.nix +++ b/pkgs/development/tools/cdecl/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, yacc, flex, readline, ncurses, gnused}: +{lib, stdenv, fetchurl, yacc, flex, readline, ncurses, gnused}: stdenv.mkDerivation { name = "cdecl-2.5"; @@ -18,8 +18,8 @@ stdenv.mkDerivation { meta = { description = "Translator English -- C/C++ declarations"; - license = stdenv.lib.licenses.publicDomain; - maintainers = with stdenv.lib.maintainers; [joelteon]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.publicDomain; + maintainers = with lib.maintainers; [joelteon]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/tools/chefdk/gemset.nix b/pkgs/development/tools/chefdk/gemset.nix index 326dfae7931..1f9522ba4c5 100644 --- a/pkgs/development/tools/chefdk/gemset.nix +++ b/pkgs/development/tools/chefdk/gemset.nix @@ -2453,4 +2453,4 @@ }; version = "1.0.5"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/chit/default.nix b/pkgs/development/tools/chit/default.nix index 564c5dcbcb5..ac8f15a4158 100644 --- a/pkgs/development/tools/chit/default.nix +++ b/pkgs/development/tools/chit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl +{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl , darwin }: @@ -17,13 +17,13 @@ buildRustPackage rec { cargoSha256 = "1w25k3bqmmcrhpkw510vbwph0rfmrzi2wby0z2rz1q4k1f9k486m"; - nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkgconfig ]; + nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; buildInputs = [] - ++ stdenv.lib.optionals stdenv.isLinux [ openssl ] - ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation CoreServices Security ]) + ++ lib.optionals stdenv.isLinux [ openssl ] + ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation CoreServices Security ]) ; - meta = with stdenv.lib; { + meta = with lib; { description = "Crate help in terminal: A tool for looking up details about rust crates without going to crates.io"; longDescription = '' Chit helps answer these questions: diff --git a/pkgs/development/tools/clang-tools/default.nix b/pkgs/development/tools/clang-tools/default.nix index 2e8f48901ab..498310d4324 100644 --- a/pkgs/development/tools/clang-tools/default.nix +++ b/pkgs/development/tools/clang-tools/default.nix @@ -1,11 +1,11 @@ -{ stdenv, llvmPackages }: +{ lib, stdenv, llvmPackages }: let clang = llvmPackages.clang-unwrapped; in stdenv.mkDerivation { pname = "clang-tools"; - version = stdenv.lib.getVersion clang; + version = lib.getVersion clang; dontUnpack = true; @@ -13,7 +13,7 @@ in stdenv.mkDerivation { runHook preInstall mkdir -p $out/bin - export libc_includes="${stdenv.lib.getDev stdenv.cc.libc}/include" + export libc_includes="${lib.getDev stdenv.cc.libc}/include" export libcpp_includes="${llvmPackages.libcxx}/include/c++/v1" export clang=${clang} @@ -34,6 +34,6 @@ in stdenv.mkDerivation { meta = clang.meta // { description = "Standalone command line tools for C++ development"; - maintainers = with stdenv.lib.maintainers; [ aherrmann ]; + maintainers = with lib.maintainers; [ aherrmann ]; }; } diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/development/tools/clj-kondo/default.nix index 702e5935689..0cc386b657c 100644 --- a/pkgs/development/tools/clj-kondo/default.nix +++ b/pkgs/development/tools/clj-kondo/default.nix @@ -2,17 +2,17 @@ stdenv.mkDerivation rec { pname = "clj-kondo"; - version = "2020.11.07"; + version = "2020.12.12"; reflectionJson = fetchurl { name = "reflection.json"; url = "https://raw.githubusercontent.com/borkdude/${pname}/v${version}/reflection.json"; - sha256 = "0mwclqjh38alkddr5r7bfqn5lplx06h9gladi89kp06qdxc1hp7a"; + sha256 = "ea5c18586fd8803b138a4dd197a0019d5e5a2c76ebe4925b9b54a10125a68c57"; }; src = fetchurl { url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "1xqryfcn82bp8wasqnllfgvhl5w9zm63yw8c2kgxz18dayhq4i31"; + sha256 = "27b8a82fb613803ab9c712866b7cc89c40fcafc4ac3af178c11b4ed7549934dc"; }; dontUnpack = true; @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { native-image \ -jar ${src} \ -H:Name=clj-kondo \ + ${lib.optionalString stdenv.isDarwin ''-H:-CheckToolchain''} \ -H:+ReportExceptionStackTraces \ -J-Dclojure.spec.skip-macros=true \ -J-Dclojure.compiler.direct-linking=true \ diff --git a/pkgs/development/tools/clog-cli/default.nix b/pkgs/development/tools/clog-cli/default.nix index 6d843ead24e..c3b477e3ea3 100644 --- a/pkgs/development/tools/clog-cli/default.nix +++ b/pkgs/development/tools/clog-cli/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, rustPlatform, stdenv }: +{ fetchFromGitHub, rustPlatform, lib }: with rustPlatform; @@ -18,8 +18,8 @@ buildRustPackage rec { meta = { description = "Generate changelogs from local git metadata"; homepage = "https://github.com/clog-tool/clog-cli"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; - maintainers = [stdenv.lib.maintainers.nthorne]; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = [lib.maintainers.nthorne]; }; } diff --git a/pkgs/development/tools/cloud-nuke/default.nix b/pkgs/development/tools/cloud-nuke/default.nix index 5fcaa35378d..e729b8c448a 100644 --- a/pkgs/development/tools/cloud-nuke/default.nix +++ b/pkgs/development/tools/cloud-nuke/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cloud-nuke"; - version = "0.1.24"; + version = "0.1.25"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "11d335lx6pa8pvsiv9m00ig8b8y203rzad4krr0p9c04ppw0c966"; + sha256 = "sha256-tbwmHsiR/RJl3CJrzJtI6GA3v9mNAirbEHXX+wDMd2k="; }; - vendorSha256 = "1dr1sql0ph3k6hylgikhiaaskxwnsynspp770p9i7y7fasmb53jw"; + vendorSha256 = "sha256-vOaklBsMuKTQ3cJgXDClM1RWh+ovemO1uDWXeK1ygU4="; buildFlagsArray = [ "-ldflags=-s -w -X main.VERSION=${version}" ]; diff --git a/pkgs/development/tools/clpm/default.nix b/pkgs/development/tools/clpm/default.nix index e051dfef19b..03174d6c4fc 100644 --- a/pkgs/development/tools/clpm/default.nix +++ b/pkgs/development/tools/clpm/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchgit , wrapLisp , sbcl @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { # fixupPhase results in fatal error in SBCL, `Can't find sbcl.core` dontFixup = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Common Lisp Package Manager"; homepage = "https://www.clpm.dev/"; license = licenses.bsd2; diff --git a/pkgs/development/tools/cmake-language-server/default.nix b/pkgs/development/tools/cmake-language-server/default.nix index c5398f695d2..2c85890e70b 100644 --- a/pkgs/development/tools/cmake-language-server/default.nix +++ b/pkgs/development/tools/cmake-language-server/default.nix @@ -17,7 +17,7 @@ buildPythonApplication rec { }; # can be removed after v0.1.2 - patches = stdenv.lib.optional stdenv.isDarwin (fetchpatch { + patches = lib.optional stdenv.isDarwin (fetchpatch { url = "https://github.com/regen100/cmake-language-server/commit/0ec120f39127f25898ab110b43819e3e9becb8a3.patch"; sha256 = "1xbmarvsvzd61fnlap4qscnijli2rw2iqr7cyyvar2jd87z6sfp0"; }); diff --git a/pkgs/development/tools/compass/gemset.nix b/pkgs/development/tools/compass/gemset.nix index 1beb3d3fec0..3e93f6e417a 100644 --- a/pkgs/development/tools/compass/gemset.nix +++ b/pkgs/development/tools/compass/gemset.nix @@ -93,4 +93,4 @@ }; version = "3.4.25"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/compile-daemon/default.nix b/pkgs/development/tools/compile-daemon/default.nix index 24aca0dada7..a12fb4424e8 100644 --- a/pkgs/development/tools/compile-daemon/default.nix +++ b/pkgs/development/tools/compile-daemon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "compile-daemon-unstable"; @@ -16,7 +16,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - meta = with stdenv.lib; { + meta = with lib; { description = "Very simple compile daemon for Go"; license = licenses.bsd2; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix index 82ac1556574..ed1171458b1 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, buildGoModule, +{ fetchFromGitHub, lib, buildGoModule, makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep }: buildGoModule rec { name = "buildkite-agent-${version}"; @@ -27,10 +27,10 @@ buildGoModule rec { # These are runtime dependencies wrapProgram $out/bin/buildkite-agent \ - --prefix PATH : '${stdenv.lib.makeBinPath [ openssh git coreutils gnused gnugrep ]}' + --prefix PATH : '${lib.makeBinPath [ openssh git coreutils gnused gnugrep ]}' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Build runner for buildkite.com"; longDescription = '' The buildkite-agent is a small, reliable, and cross-platform build runner diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix index 39178201456..64ca730d7dc 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep +{ buildGoPackage, makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep , src, version, hasBootstrapScript, postPatch ? "" , ... }: let @@ -13,7 +13,7 @@ buildGoPackage { nativeBuildInputs = [ makeWrapper ]; postInstall = '' - ${stdenv.lib.optionalString hasBootstrapScript '' + ${lib.optionalString hasBootstrapScript '' # Install bootstrap.sh mkdir -p $out/libexec/buildkite-agent cp $NIX_BUILD_TOP/go/src/${goPackagePath}/templates/bootstrap.sh $out/libexec/buildkite-agent @@ -25,11 +25,11 @@ buildGoPackage { # These are runtime dependencies wrapProgram $out/bin/buildkite-agent \ - ${stdenv.lib.optionalString hasBootstrapScript "--set BUILDKITE_BOOTSTRAP_SCRIPT_PATH $out/libexec/buildkite-agent/bootstrap.sh"} \ - --prefix PATH : '${stdenv.lib.makeBinPath [ openssh git coreutils gnused gnugrep ]}' + ${lib.optionalString hasBootstrapScript "--set BUILDKITE_BOOTSTRAP_SCRIPT_PATH $out/libexec/buildkite-agent/bootstrap.sh"} \ + --prefix PATH : '${lib.makeBinPath [ openssh git coreutils gnused gnugrep ]}' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Build runner for buildkite.com"; longDescription = '' The buildkite-agent is a small, reliable, and cross-platform build runner diff --git a/pkgs/development/tools/continuous-integration/drone-cli/default.nix b/pkgs/development/tools/continuous-integration/drone-cli/default.nix index 2a8e10008c2..6c9cffe41b2 100644 --- a/pkgs/development/tools/continuous-integration/drone-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/drone-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule }: let version = "1.2.4"; in buildGoModule rec { @@ -21,7 +21,7 @@ in buildGoModule rec { sha256 = "14sm5k2ifvr4g9369zqgb92vrr4rc0bxf5m52l3g8bd2s8fq8nx8"; }; - meta = with stdenv.lib; { + meta = with lib; { maintainers = with maintainers; [ bricewge ]; license = licenses.asl20; description = "Command line client for the Drone continuous integration server"; diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix index 7a7f0d023d8..c6d609e38cf 100644 --- a/pkgs/development/tools/continuous-integration/drone/default.nix +++ b/pkgs/development/tools/continuous-integration/drone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { name = "drone.io-${version}"; @@ -15,7 +15,7 @@ buildGoModule rec { sha256 = "sha256-12Jac+mXWdUX8gWvmpdO9ROv7Bi0YzvyqnNDVNJOr34="; }; - meta = with stdenv.lib; { + meta = with lib; { maintainers = with maintainers; [ elohmeier vdemeester ]; license = licenses.asl20; description = "Continuous Integration platform built on container technology"; diff --git a/pkgs/development/tools/continuous-integration/fly/default.nix b/pkgs/development/tools/continuous-integration/fly/default.nix index f993faf544d..3fa1b7b95f3 100644 --- a/pkgs/development/tools/continuous-integration/fly/default.nix +++ b/pkgs/development/tools/continuous-integration/fly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fly"; - version = "6.7.2"; + version = "6.7.4"; src = fetchFromGitHub { owner = "concourse"; repo = "concourse"; rev = "v${version}"; - sha256 = "0c5alf2a0088i25mglla9dl4m3wr5y8pnl5cczgn06sz8qp9a0s0"; + sha256 = "sha256-EFcgS+ZrmdrIwHAzwSuQFe7UgeWsTRjm2sDv5COdi/k="; }; - vendorSha256 = "1fxbxkg7disndlmb065abnfn7sn79qclkcbizmrq49f064w1ijr4"; + vendorSha256 = "sha256-xeptlcJLj+R1BdC8Rdi3hsJVxdrmvfeTMsrhMNGrXi8="; doCheck = false; diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 3d127591bd0..20cb953edea 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "13.7.0"; + version = "13.8.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz"; - sha256 = "0hbzvw6bdy31yqnri7379gpm8n5nv6ayr1idg02c9zqgcsgm34jf"; + sha256 = "15pf6mxma8gkzyxkzm1rjwa514p7gzabn3c474lcvsjpmp76wv68"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; - sha256 = "036drxlkmm35mdl0f5k79hnmwvf8gadgsxx71jprn1fjjzk3cxmz"; + sha256 = "1c4lpy7nc62rqk8bfwiy5pcgvcwx70qkz3lv9w512fr3n5hjd4c0"; }; in buildGoPackage rec { @@ -30,7 +30,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "0v2wcalvs7gsbi33jm35k01cqv2iqz3k3yfjjw08dssg358d0vfp"; + sha256 = "0v0iqpllzaabkahlc5pidzzw0bjlli984pdna3f3bbg67lm5a421"; }; patches = [ ./fix-shell-path.patch ]; diff --git a/pkgs/development/tools/continuous-integration/gocd-agent/default.nix b/pkgs/development/tools/continuous-integration/gocd-agent/default.nix index 7cefd896f48..6e58b74654d 100644 --- a/pkgs/development/tools/continuous-integration/gocd-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/gocd-agent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { name = "gocd-agent-${version}-${rev}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { url = "https://download.go.cd/binaries/${version}-${rev}/generic/go-agent-${version}-${rev}.zip"; sha256 = "1nirdv82i8x4s1dyb0rmxldh8avappd4g3mbbl6xp7r7s0drcprp"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A continuous delivery server specializing in advanced workflow modeling and visualization"; homepage = "http://www.go.cd"; license = licenses.asl20; diff --git a/pkgs/development/tools/continuous-integration/gocd-server/default.nix b/pkgs/development/tools/continuous-integration/gocd-server/default.nix index d23bc9d8d8e..90eb61dbff8 100644 --- a/pkgs/development/tools/continuous-integration/gocd-server/default.nix +++ b/pkgs/development/tools/continuous-integration/gocd-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { name = "gocd-server-${version}-${rev}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0c30qzd6awlw0zx91rk6na0mmgykqkgrw9ychx18ivjwma0hr0sc"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A continuous delivery server specializing in advanced workflow modeling and visualization"; homepage = "http://www.go.cd"; license = licenses.asl20; diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 13a6d596599..d9eef5e3c4e 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl, common-updater-scripts, coreutils, git, gnused, nix, nixfmt -, writeScript, nixosTests, jq, cacert, curl }: +{ lib, stdenv, fetchurl, common-updater-scripts, coreutils, git, gnused, nix +, nixfmt, writeScript, nixosTests, jq, cacert, curl }: stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.263.1"; + version = "2.263.3"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "1wfn5r356fqy8ypqnw44ir0cy8qr5ck6xckxnnn2c9x324mypv8f"; + sha256 = "0lyzmv378yjz4p4dlpm1nwdq4p781nycvspdik82xbxg4s6gamd3"; }; buildCommand = '' @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { #!${stdenv.shell} set -o errexit PATH=${ - stdenv.lib.makeBinPath [ + lib.makeBinPath [ cacert common-updater-scripts coreutils @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ''; }; - meta = with stdenv.lib; { + meta = with lib; { description = "An extendable open source continuous integration server"; homepage = "https://jenkins-ci.org"; license = licenses.mit; diff --git a/pkgs/development/tools/continuous-integration/laminar/default.nix b/pkgs/development/tools/continuous-integration/laminar/default.nix index 5a326e94a54..f64cbd5e85f 100644 --- a/pkgs/development/tools/continuous-integration/laminar/default.nix +++ b/pkgs/development/tools/continuous-integration/laminar/default.nix @@ -70,7 +70,7 @@ in stdenv.mkDerivation rec { rm -r $out/lib # it contains only systemd unit file ''); - meta = with stdenv.lib; { + meta = with lib; { description = "Lightweight and modular continuous integration service"; homepage = "https://laminar.ohwg.net"; license = licenses.gpl3; diff --git a/pkgs/development/tools/convco/default.nix b/pkgs/development/tools/convco/default.nix new file mode 100644 index 00000000000..d6be170bb8f --- /dev/null +++ b/pkgs/development/tools/convco/default.nix @@ -0,0 +1,26 @@ +{ lib, rustPlatform, fetchFromGitHub, stdenv, openssl, perl, pkg-config, libiconv, Security }: + +rustPlatform.buildRustPackage rec { + pname = "convco"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "convco"; + repo = pname; + rev = "v${version}"; + sha256 = "0fqq6irbq1aikhhw08gc9kp0vbk2aminfbvwdlm58cvywyq91bn4"; + }; + + cargoSha256 = "073sfv42fbl8rjm3dih1ghs9vq75mjshp66zdzdan2dmmrnw5m9z"; + + nativeBuildInputs = [ openssl perl pkg-config ]; + + buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; + + meta = with lib; { + description = "A Conventional commit cli"; + homepage = "https://github.com/convco/convco"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ hoverbear ]; + }; +} diff --git a/pkgs/development/tools/corgi/default.nix b/pkgs/development/tools/corgi/default.nix index a1549de1843..e39e42c40af 100644 --- a/pkgs/development/tools/corgi/default.nix +++ b/pkgs/development/tools/corgi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "corgi-${rev}"; @@ -16,7 +16,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - meta = with stdenv.lib; { + meta = with lib; { description = "CLI workflow manager"; longDescription = '' Corgi is a command-line tool that helps with your repetitive command usages by organizing them into reusable snippet. diff --git a/pkgs/development/tools/corundum/gemset.nix b/pkgs/development/tools/corundum/gemset.nix index e395e098e6d..a6ec2f2b9b9 100644 --- a/pkgs/development/tools/corundum/gemset.nix +++ b/pkgs/development/tools/corundum/gemset.nix @@ -151,4 +151,4 @@ }; version = "1.2.1"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix index a0f69033923..e016f0ef7c9 100644 --- a/pkgs/development/tools/coursier/default.nix +++ b/pkgs/development/tools/coursier/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, makeWrapper, jre, writeScript, common-updater-scripts +{ lib, stdenv, fetchurl, makeWrapper, jre, writeScript, common-updater-scripts , coreutils, git, gnused, nix, nixfmt }: let - version = "2.0.8"; + version = "2.0.9"; zshCompletion = fetchurl { url = @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; - sha256 = "sha256-7dNJUMZu6YY3076cnjWHRisJZVn1NPRH1VC+cJjfI/8="; + sha256 = "sha256-jqSv9VBLotl6YVWgWNznvTThRIiMUStQ0WbN6u01b1c="; }; nativeBuildInputs = [ makeWrapper ]; @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { #!${stdenv.shell} set -o errexit PATH=${ - stdenv.lib.makeBinPath [ + lib.makeBinPath [ common-updater-scripts coreutils git @@ -62,7 +62,7 @@ in stdenv.mkDerivation rec { fi ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://get-coursier.io/"; description = "A Scala library to fetch dependencies from Maven / Ivy repositories"; diff --git a/pkgs/development/tools/cppclean/default.nix b/pkgs/development/tools/cppclean/default.nix index 283d9845dfa..460d7cddb83 100644 --- a/pkgs/development/tools/cppclean/default.nix +++ b/pkgs/development/tools/cppclean/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: with python3Packages; @@ -21,7 +21,7 @@ buildPythonApplication rec { ./test.bash ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Finds problems in C++ source that slow development of large code bases"; homepage = "https://github.com/myint/cppclean"; license = licenses.asl20; diff --git a/pkgs/development/tools/cucumber/gemset.nix b/pkgs/development/tools/cucumber/gemset.nix index 99d519a83b6..d96d9071806 100644 --- a/pkgs/development/tools/cucumber/gemset.nix +++ b/pkgs/development/tools/cucumber/gemset.nix @@ -111,4 +111,4 @@ }; version = "0.1.2"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/cue/default.nix b/pkgs/development/tools/cue/default.nix index cdd0f2ae105..28660732ea4 100644 --- a/pkgs/development/tools/cue/default.nix +++ b/pkgs/development/tools/cue/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchgit, stdenv }: +{ buildGoModule, fetchgit, lib }: buildGoModule rec { pname = "cue"; @@ -23,7 +23,7 @@ buildGoModule rec { meta = { description = "A data constraint language which aims to simplify tasks involving defining and using data"; homepage = "https://cuelang.org/"; - maintainers = with stdenv.lib.maintainers; [ solson ]; - license = stdenv.lib.licenses.asl20; + maintainers = with lib.maintainers; [ solson ]; + license = lib.licenses.asl20; }; } diff --git a/pkgs/development/tools/dapper/default.nix b/pkgs/development/tools/dapper/default.nix index 664dd61246d..a95cac4514b 100644 --- a/pkgs/development/tools/dapper/default.nix +++ b/pkgs/development/tools/dapper/default.nix @@ -5,7 +5,7 @@ buildGoPackage rec { pname = "dapper"; - version = "0.5.3"; + version = "0.5.5"; goPackagePath = "github.com/rancher/dapper"; @@ -13,7 +13,7 @@ buildGoPackage rec { owner = "rancher"; repo = "dapper"; rev = "v${version}"; - sha256 = "1h62jahrxpmqx6r3mlakzap8gisrymgkp5syyarpab05qm1inngd"; + sha256 = "sha256-QzPW1uC/WuYM/lLqyKodIozGTz5Qn1haoDvgNgjhrRA="; }; patchPhase = '' substituteInPlace main.go --replace 0.0.0 ${version} diff --git a/pkgs/development/tools/dapr/cli/default.nix b/pkgs/development/tools/dapr/cli/default.nix index 7a8243ece25..57fd984dc17 100644 --- a/pkgs/development/tools/dapr/cli/default.nix +++ b/pkgs/development/tools/dapr/cli/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib, stdenv }: +{ buildGoModule, fetchFromGitHub, lib }: let pname = "dapr"; diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix index fe7721f5ed4..6634c2b6384 100644 --- a/pkgs/development/tools/database/dbmate/default.nix +++ b/pkgs/development/tools/database/dbmate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "dbmate"; @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Database migration tool"; homepage = "https://github.com/amacneil/dbmate"; license = licenses.mit; diff --git a/pkgs/development/tools/database/dbmate/deps.nix b/pkgs/development/tools/database/dbmate/deps.nix deleted file mode 100644 index 97bfc10b20a..00000000000 --- a/pkgs/development/tools/database/dbmate/deps.nix +++ /dev/null @@ -1,84 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "346938d642f2ec3594ed81d874461961cd0faa76"; - sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; - }; - } - { - goPackagePath = "github.com/go-sql-driver/mysql"; - fetch = { - type = "git"; - url = "https://github.com/go-sql-driver/mysql"; - rev = "2cc627ac8defc45d65066ae98f898166f580f9a4"; - sha256 = "0n589y9ak2m6glaqmqlggrfv2hghy5i2906r123svf92ci4r9sww"; - }; - } - { - goPackagePath = "github.com/joho/godotenv"; - fetch = { - type = "git"; - url = "https://github.com/joho/godotenv"; - rev = "a79fa1e548e2c689c241d10173efd51e5d689d5b"; - sha256 = "09610yqswxa02905mp9cqgsm50r76saagzddc55sqav4ad04j6qm"; - }; - } - { - goPackagePath = "github.com/lib/pq"; - fetch = { - type = "git"; - url = "https://github.com/lib/pq"; - rev = "19c8e9ad00952ce0c64489b60e8df88bb16dd514"; - sha256 = "0lm79ja5id7phf1jwf1vs987azaxis0q7qr69px0r6gqiva0q0vz"; - }; - } - { - goPackagePath = "github.com/mattn/go-sqlite3"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-sqlite3"; - rev = "6c771bb9887719704b210e87e934f08be014bdb1"; - sha256 = "0x6s7hy3ab3qw6dfl81y7ighjva5j4rrzvqhppf1qwz5alpfmpdm"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "792786c7400a136282c1664665ae0a8db921c6c2"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "b91bfb9ebec76498946beb6af7c0230c7cc7ba6c"; - sha256 = "178xyfgsbs40jq406aqj0r67ik1b81gdc28z45nbcw6hfhz82rvl"; - }; - } - { - goPackagePath = "github.com/urfave/cli"; - fetch = { - type = "git"; - url = "https://github.com/urfave/cli"; - rev = "cfb38830724cc34fedffe9a2a29fb54fa9169cd1"; - sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"; - }; - } - { - goPackagePath = "google.golang.org/appengine"; - fetch = { - type = "git"; - url = "https://github.com/golang/appengine"; - rev = "150dc57a1b433e64154302bdc40b6bb8aefa313a"; - sha256 = "0w3knznv39k8bm85ri62f83czcrxknql7dv6p9hk1a5jx3xljgxq"; - }; - } -] diff --git a/pkgs/development/tools/database/ephemeralpg/default.nix b/pkgs/development/tools/database/ephemeralpg/default.nix index b2599cce430..ae10c402945 100644 --- a/pkgs/development/tools/database/ephemeralpg/default.nix +++ b/pkgs/development/tools/database/ephemeralpg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, postgresql, getopt, makeWrapper }: +{ lib, stdenv, fetchurl, postgresql, getopt, makeWrapper }: stdenv.mkDerivation rec { pname = "ephemeralpg"; version = "3.1"; @@ -10,9 +10,9 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out PREFIX=$out make install - wrapProgram $out/bin/pg_tmp --prefix PATH : ${stdenv.lib.makeBinPath [ postgresql getopt ]} + wrapProgram $out/bin/pg_tmp --prefix PATH : ${lib.makeBinPath [ postgresql getopt ]} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Run tests on an isolated, temporary PostgreSQL database"; license = licenses.isc; homepage = "http://ephemeralpg.org/"; diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index 6eb24a812aa..16e5fce1ebc 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, jre, makeWrapper -, mysqlSupport ? true, mysql_jdbc ? null }: +{ lib, stdenv, fetchurl, jre, makeWrapper +, mysqlSupport ? true, mysql_jdbc +, postgresqlSupport ? true, postgresql_jdbc }: -assert mysqlSupport -> mysql_jdbc != null; - -with stdenv.lib; let - extraJars = optional mysqlSupport mysql_jdbc; + extraJars = + lib.optional mysqlSupport mysql_jdbc + ++ lib.optional postgresqlSupport postgresql_jdbc; in stdenv.mkDerivation rec { @@ -47,15 +47,15 @@ stdenv.mkDerivation rec { # taken from the executable script in the source CP="$out/liquibase.jar" ${addJars "$out/lib"} - ${concatStringsSep "\n" (map (p: addJars "${p}/share/java") extraJars)} + ${lib.concatStringsSep "\n" (map (p: addJars "${p}/share/java") extraJars)} - ${getBin jre}/bin/java -cp "\$CP" \$JAVA_OPTS \ + ${lib.getBin jre}/bin/java -cp "\$CP" \$JAVA_OPTS \ liquibase.integration.commandline.Main \''${1+"\$@"} EOF chmod +x $out/bin/liquibase ''; - meta = { + meta = with lib; { description = "Version Control for your database"; homepage = "https://www.liquibase.org/"; changelog = "https://raw.githubusercontent.com/liquibase/liquibase/v${version}/changelog.txt"; diff --git a/pkgs/development/tools/database/pg_checksums/default.nix b/pkgs/development/tools/database/pg_checksums/default.nix index f440e550a89..65e7c06b140 100644 --- a/pkgs/development/tools/database/pg_checksums/default.nix +++ b/pkgs/development/tools/database/pg_checksums/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libxslt, docbook_xsl, postgresql }: +{ lib, stdenv, fetchFromGitHub, libxslt, docbook_xsl, postgresql }: stdenv.mkDerivation rec { pname = "pg_checksums"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { install -Dm644 -t $out/share/man/man1 doc/man1/pg_checksums.1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Activate/deactivate/verify checksums in offline PostgreSQL clusters"; homepage = "https://github.com/credativ/pg_checksums"; maintainers = [ maintainers.marsam ]; diff --git a/pkgs/development/tools/database/pgcli/default.nix b/pkgs/development/tools/database/pgcli/default.nix index b4c26d6fb5c..cc7524e3a43 100644 --- a/pkgs/development/tools/database/pgcli/default.nix +++ b/pkgs/development/tools/database/pgcli/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonApplication , fetchPypi , isPy3k @@ -46,9 +46,9 @@ buildPythonApplication rec { checkInputs = [ pytestCheckHook mock ]; - disabledTests = stdenv.lib.optionals stdenv.isDarwin [ "test_application_name_db_uri" ]; + disabledTests = lib.optionals stdenv.isDarwin [ "test_application_name_db_uri" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Command-line interface for PostgreSQL"; longDescription = '' Rich command-line interface for PostgreSQL with auto-completion and diff --git a/pkgs/development/tools/database/pyrseas/default.nix b/pkgs/development/tools/database/pyrseas/default.nix index c86a0f6df8b..075cd5053be 100644 --- a/pkgs/development/tools/database/pyrseas/default.nix +++ b/pkgs/development/tools/database/pyrseas/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pythonPackages, fetchFromGitHub }: +{ lib, pythonPackages, fetchFromGitHub }: let pgdbconn = pythonPackages.buildPythonPackage { @@ -39,7 +39,7 @@ pythonPackages.buildPythonApplication { meta = { description = "A declarative language to describe PostgreSQL databases"; homepage = "https://perseas.github.io/"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ pmeunier ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ pmeunier ]; }; } diff --git a/pkgs/development/tools/database/shmig/default.nix b/pkgs/development/tools/database/shmig/default.nix index ca07a056940..447dbc23fdf 100644 --- a/pkgs/development/tools/database/shmig/default.nix +++ b/pkgs/development/tools/database/shmig/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Minimalistic database migration tool with MySQL, PostgreSQL and SQLite support"; homepage = "https://github.com/mbucc/shmig"; license = licenses.bsd3; diff --git a/pkgs/development/tools/database/sqlcheck/default.nix b/pkgs/development/tools/database/sqlcheck/default.nix index 33b2abce277..2afd004f4d7 100644 --- a/pkgs/development/tools/database/sqlcheck/default.nix +++ b/pkgs/development/tools/database/sqlcheck/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "sqlcheck"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Automatically identify anti-patterns in SQL queries"; license = licenses.asl20; diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix index 49cc7b42b3d..c42197e13cf 100644 --- a/pkgs/development/tools/database/sqldeveloper/default.nix +++ b/pkgs/development/tools/database/sqldeveloper/default.nix @@ -1,7 +1,7 @@ -{ stdenv, makeDesktopItem, makeWrapper, requireFile, unzip, jdk }: +{ lib, stdenv, makeDesktopItem, makeWrapper, requireFile, unzip, jdk }: let - version = "20.2.0.175.1842"; + version = "20.4.0.379.2205"; desktopItem = makeDesktopItem { name = "sqldeveloper"; @@ -46,7 +46,7 @@ in nix-prefetch-url --type sha256 file:///path/to/${name} ''; - sha256 = "1fcaq7ffn1q35f7rvp3ybs2191lvfc0jgjx7y4wn1nqglgj7zy7n"; + sha256 = "1h53gl41ydr7kim6q9ckg3xyhb0rhmwj7jnis0xz6vms52b3h59k"; }; buildInputs = [ makeWrapper unzip ]; @@ -65,7 +65,7 @@ in --run "cd $out/libexec/sqldeveloper/bin" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Oracle's Oracle DB GUI client"; longDescription = '' Oracle SQL Developer is a free integrated development environment that diff --git a/pkgs/development/tools/database/squirrel-sql/default.nix b/pkgs/development/tools/database/squirrel-sql/default.nix index 924a82bfd85..5aca6d55bc8 100644 --- a/pkgs/development/tools/database/squirrel-sql/default.nix +++ b/pkgs/development/tools/database/squirrel-sql/default.nix @@ -1,6 +1,6 @@ # To enable specific database drivers, override this derivation and pass the # driver packages in the drivers argument (e.g. mysql_jdbc, postgresql_jdbc). -{ stdenv, fetchurl, makeDesktopItem, makeWrapper, unzip +{ lib, stdenv, fetchurl, makeDesktopItem, makeWrapper, unzip , jre , drivers ? [] }: @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { installPhase = '' runHook preInstall - + mkdir -p $out/share/squirrel-sql cp -r . $out/share/squirrel-sql @@ -55,7 +55,7 @@ in stdenv.mkDerivation rec { ln -s $out/share/squirrel-sql/icons/acorn.png \ $out/share/icons/hicolor/32x32/apps/squirrel-sql.png ln -s ${desktopItem}/share/applications $out/share - + runHook postInstall ''; @@ -69,7 +69,7 @@ in stdenv.mkDerivation rec { icon = "squirrel-sql"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Universal SQL Client"; homepage = "http://squirrel-sql.sourceforge.net/"; license = licenses.lgpl21; diff --git a/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix b/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix index a0e05bf4ae5..42c2a55fd3e 100644 --- a/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix +++ b/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "timescaledb-parallel-copy"; @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "03siay3hv1sgmmp7w4f9b0xb8c6bnbx0v4wy5grjl5k04zhnj76b"; - meta = with stdenv.lib; { + meta = with lib; { description = "Bulk, parallel insert of CSV records into PostgreSQL"; homepage = "https://github.com/timescale/timescaledb-parallel-copy"; license = licenses.asl20; diff --git a/pkgs/development/tools/database/timescaledb-tune/default.nix b/pkgs/development/tools/database/timescaledb-tune/default.nix index 787c7c3131b..34d5d12607f 100644 --- a/pkgs/development/tools/database/timescaledb-tune/default.nix +++ b/pkgs/development/tools/database/timescaledb-tune/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "timescaledb-tune"; @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "0hbpprbxs19fcar7xcy42kn9yfzhal2zsv5pml9ghiv2s61yns4z"; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool for tuning your TimescaleDB for better performance"; homepage = "https://github.com/timescale/timescaledb-tune"; license = licenses.asl20; diff --git a/pkgs/development/tools/database/webdis/default.nix b/pkgs/development/tools/database/webdis/default.nix index ec22252cbe0..5de8296299f 100644 --- a/pkgs/development/tools/database/webdis/default.nix +++ b/pkgs/development/tools/database/webdis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, hiredis, http-parser, jansson, libevent, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, hiredis, http-parser, jansson, libevent, fetchpatch }: stdenv.mkDerivation rec { pname = "webdis"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { "CONFDIR=${placeholder "out"}/share/webdis" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A Redis HTTP interface with JSON output"; homepage = "https://webd.is/"; license = licenses.bsd2; diff --git a/pkgs/development/tools/dcadec/default.nix b/pkgs/development/tools/dcadec/default.nix index 55f888056cf..9f5f4f0a3b5 100644 --- a/pkgs/development/tools/dcadec/default.nix +++ b/pkgs/development/tools/dcadec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "dcadec"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails with "ERROR: Run 'git submodule update --init test/samples' first." - meta = with stdenv.lib; { + meta = with lib; { description = "DTS Coherent Acoustics decoder with support for HD extensions"; maintainers = with maintainers; [ edwtjo ]; homepage = "https://github.com/foo86/dcadec"; diff --git a/pkgs/development/tools/deis/default.nix b/pkgs/development/tools/deis/default.nix index 4a07a05a636..8286435d9a3 100644 --- a/pkgs/development/tools/deis/default.nix +++ b/pkgs/development/tools/deis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "deis"; @@ -25,7 +25,7 @@ buildGoPackage rec { export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://deis.io"; description = "A command line utility used to interact with the Deis open source PaaS"; license = licenses.asl20; diff --git a/pkgs/development/tools/deisctl/default.nix b/pkgs/development/tools/deisctl/default.nix index a245a06afe1..67245a5ebbe 100644 --- a/pkgs/development/tools/deisctl/default.nix +++ b/pkgs/development/tools/deisctl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "deis"; @@ -19,7 +19,7 @@ buildGoPackage rec { export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://deis.io"; description = "A command-line utility used to provision and operate a Deis cluster"; license = licenses.asl20; diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix index e81a1273af8..f0926e23aa7 100644 --- a/pkgs/development/tools/delve/default.nix +++ b/pkgs/development/tools/delve/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "delve"; - version = "1.5.1"; + version = "1.6.0"; goPackagePath = "github.com/go-delve/delve"; excludedPackages = "\\(_fixtures\\|scripts\\|service/test\\)"; @@ -11,10 +11,10 @@ buildGoPackage rec { owner = "go-delve"; repo = "delve"; rev = "v${version}"; - sha256 = "10zvla2jqxqibxdk3zbnsxg63i0zcwcn9npvw3bbicwd2z4vvskk"; + sha256 = "sha256-krNCS5GaEMuwQ9XS8w0myL+xZX6goNNNBgUiRVoZPIU="; }; - meta = with stdenv.lib; { + meta = with lib; { description = "debugger for the Go programming language"; homepage = "https://github.com/derekparker/delve"; maintainers = with maintainers; [ vdemeester ]; diff --git a/pkgs/development/tools/dep/default.nix b/pkgs/development/tools/dep/default.nix index 8b7c54832e2..ff7bad87afd 100644 --- a/pkgs/development/tools/dep/default.nix +++ b/pkgs/development/tools/dep/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "dep"; @@ -17,7 +17,7 @@ buildGoPackage rec { buildFlagsArray = ("-ldflags=-s -w -X main.commitHash=${rev} -X main.version=${version}"); - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/golang/dep"; description = "Go dependency management tool"; license = licenses.bsd3; diff --git a/pkgs/development/tools/dep2nix/default.nix b/pkgs/development/tools/dep2nix/default.nix index daa68b1b931..5d98ecd5729 100644 --- a/pkgs/development/tools/dep2nix/default.nix +++ b/pkgs/development/tools/dep2nix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoPackage +{ lib, fetchFromGitHub, buildGoPackage , makeWrapper, nix-prefetch-scripts }: buildGoPackage rec { diff --git a/pkgs/development/tools/detect-secrets/default.nix b/pkgs/development/tools/detect-secrets/default.nix index 1e42a32f7ca..f0dddf66ff4 100644 --- a/pkgs/development/tools/detect-secrets/default.nix +++ b/pkgs/development/tools/detect-secrets/default.nix @@ -1,29 +1,53 @@ -{ lib, buildPythonApplication, fetchFromGitHub, isPy27, pyyaml, unidiff, configparser, enum34, future, functools32, mock, pytest }: +{ lib +, buildPythonApplication +, configparser +, enum34 +, fetchFromGitHub +, functools32 +, future +, isPy27 +, mock +, pyahocorasick +, pytestCheckHook +, pyyaml +, requests +, responses +, unidiff +}: buildPythonApplication rec { pname = "detect-secrets"; - version = "0.12.4"; + version = "0.14.3"; + disabled = isPy27; # PyPI tarball doesn't ship tests src = fetchFromGitHub { owner = "Yelp"; - repo = "detect-secrets"; + repo = pname; rev = "v${version}"; - sha256 = "01y5xd0irxxib4wnf5834gwa7ibb81h5y4dl8b26gyzgvm5zfpk1"; + sha256 = "0c4hxih9ljmv0d3izq5idyspk5zci26gdb6lv9klwcshwrfkvxj0"; }; - propagatedBuildInputs = [ pyyaml ] - ++ lib.optionals isPy27 [ configparser enum34 future functools32 ]; + propagatedBuildInputs = [ + pyyaml + requests + ]; - checkInputs = [ mock pytest unidiff ]; + checkInputs = [ + mock + pyahocorasick + pytestCheckHook + responses + unidiff + ]; - # deselect tests which require git setup - checkPhase = '' - PYTHONPATH=$PWD:$PYTHONPATH pytest \ - --deselect tests/main_test.py::TestMain \ - --deselect tests/pre_commit_hook_test.py::TestPreCommitHook \ - --deselect tests/core/baseline_test.py::TestInitializeBaseline - ''; + disabledTests = [ + "TestMain" + "TestPreCommitHook" + "TestInitializeBaseline" + ]; + + pythonImportsCheck = [ "detect_secrets" ]; meta = with lib; { description = "An enterprise friendly way of detecting and preventing secrets in code"; diff --git a/pkgs/development/tools/devd/default.nix b/pkgs/development/tools/devd/default.nix index 2d5a38458d3..0789850a494 100644 --- a/pkgs/development/tools/devd/default.nix +++ b/pkgs/development/tools/devd/default.nix @@ -1,4 +1,4 @@ -{ buildGoPackage, fetchFromGitHub, stdenv }: +{ buildGoPackage, fetchFromGitHub, lib }: buildGoPackage rec { pname = "devd"; @@ -11,7 +11,7 @@ buildGoPackage rec { }; goPackagePath = "github.com/cortesi/devd"; subPackages = [ "cmd/devd" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A local webserver for developers"; homepage = "https://github.com/cortesi/devd"; license = licenses.mit; diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix index 1a0fdf40308..5905e05d071 100644 --- a/pkgs/development/tools/devpi-client/default.nix +++ b/pkgs/development/tools/devpi-client/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib , buildPythonApplication , fetchPypi # buildInputs @@ -25,11 +25,11 @@ buildPythonApplication rec { pname = "devpi-client"; - version = "5.2.0"; + version = "5.2.1"; src = fetchPypi { inherit pname version; - sha256 = "1y8r1pjav0gyrbnyqjnc202sa962n1gasi8233xj7jc39lv3iq40"; + sha256 = "74ff365efeaa7b78c9eb7f6d7bd349ccd6252a6cdf879bcb4137ee5ff0fb127a"; }; buildInputs = [ glibcLocales pkginfo check-manifest ]; @@ -49,7 +49,7 @@ buildPythonApplication rec { LC_ALL = "en_US.UTF-8"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://doc.devpi.net"; description = "Client for devpi, a pypi index server and packaging meta tool"; license = licenses.mit; diff --git a/pkgs/development/tools/devpi-server/default.nix b/pkgs/development/tools/devpi-server/default.nix index 7ddff92402c..8a484a23349 100644 --- a/pkgs/development/tools/devpi-server/default.nix +++ b/pkgs/development/tools/devpi-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages, nginx }: +{ lib, fetchFromGitHub, python3Packages, nginx }: python3Packages.buildPythonApplication rec { pname = "devpi-server"; @@ -33,7 +33,7 @@ python3Packages.buildPythonApplication rec { pytestCheckHook pytest-flake8 webtest - ] ++ stdenv.lib.optionals isPy27 [ mock ]; + ] ++ lib.optionals isPy27 [ mock ]; # root_passwd_hash tries to write to store # TestMirrorIndexThings tries to write to /var through ngnix @@ -55,7 +55,7 @@ python3Packages.buildPythonApplication rec { "TestMirrorIndexThings" ]; - meta = with stdenv.lib;{ + meta = with lib;{ homepage = "http://doc.devpi.net"; description = "Github-style pypi index server and packaging meta tool"; license = licenses.mit; diff --git a/pkgs/development/tools/devtodo/default.nix b/pkgs/development/tools/devtodo/default.nix index f4a974da347..34fdd2c794e 100644 --- a/pkgs/development/tools/devtodo/default.nix +++ b/pkgs/development/tools/devtodo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, readline, ncurses }: +{ lib, stdenv, fetchurl, readline, ncurses }: stdenv.mkDerivation rec { pname = "devtodo"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://swapoff.org/devtodo1.html"; description = "A hierarchical command-line task manager"; license = licenses.gpl2; diff --git a/pkgs/development/tools/diesel-cli/default.nix b/pkgs/development/tools/diesel-cli/default.nix index 6a447dd57c9..bd8e71090c5 100644 --- a/pkgs/development/tools/diesel-cli/default.nix +++ b/pkgs/development/tools/diesel-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, rustPlatform, fetchFromGitHub, openssl, pkgconfig, Security +{ stdenv, lib, rustPlatform, fetchFromGitHub, openssl, pkg-config, Security , sqliteSupport ? true, sqlite , postgresqlSupport ? true, postgresql , mysqlSupport ? true, mysql, zlib, libiconv @@ -8,7 +8,7 @@ assert lib.assertMsg (sqliteSupport == true || postgresqlSupport == true || mysq "support for at least one database must be enabled"; let - inherit (stdenv.lib) optional optionals optionalString; + inherit (lib) optional optionals optionalString; features = '' ${optionalString sqliteSupport "sqlite"} \ ${optionalString postgresqlSupport "postgres"} \ @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec { cargoPatches = [ ./cargo-lock.patch ]; cargoSha256 = "1vbb7r0dpmq8363i040bkhf279pz51c59kcq9v5qr34hs49ish8g"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ optional stdenv.isDarwin Security ++ optional (stdenv.isDarwin && mysqlSupport) libiconv diff --git a/pkgs/development/tools/dive/default.nix b/pkgs/development/tools/dive/default.nix index 3cb050df036..07ca12cc9cc 100644 --- a/pkgs/development/tools/dive/default.nix +++ b/pkgs/development/tools/dive/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, pkg-config, btrfs-progs, gpgme, lvm2 }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, pkg-config, btrfs-progs, gpgme, lvm2 }: buildGoModule rec { pname = "dive"; @@ -17,11 +17,11 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = stdenv.lib.optionals stdenv.isLinux [ btrfs-progs gpgme lvm2 ]; + buildInputs = lib.optionals stdenv.isLinux [ btrfs-progs gpgme lvm2 ]; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool for exploring each layer in a docker image"; homepage = "https://github.com/wagoodman/dive"; license = licenses.mit; diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index 2b4bf66a015..4d05bd3ed11 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "doctl"; - version = "1.54.0"; + version = "1.55.0"; vendorSha256 = null; @@ -32,7 +32,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "163n3d07vv9d4356ql6hbw2vg6n5c834axz7y4gk8gm9badbna82"; + sha256 = "sha256-vhg5X8H4VegSDORtj1rgNKlWQo1H1e/vvO01LJkVK+A="; }; meta = with lib; { diff --git a/pkgs/development/tools/documentation/antora/default.nix b/pkgs/development/tools/documentation/antora/default.nix index 781fee2bb26..ea8aeb83c8c 100644 --- a/pkgs/development/tools/documentation/antora/default.nix +++ b/pkgs/development/tools/documentation/antora/default.nix @@ -1,15 +1,15 @@ -{ stdenv, nodePackages }: +{ lib, nodePackages }: let linkNodeDeps = ({ pkg, deps, name ? "" }: let - targetModule = if name != "" then name else stdenv.lib.getName pkg; + targetModule = if name != "" then name else lib.getName pkg; in nodePackages.${pkg}.override (oldAttrs: { postInstall = '' mkdir -p $out/lib/node_modules/${targetModule}/node_modules - ${stdenv.lib.concatStringsSep "\n" (map (dep: '' - ln -s ${nodePackages.${dep}}/lib/node_modules/${stdenv.lib.getName dep} \ - $out/lib/node_modules/${targetModule}/node_modules/${stdenv.lib.getName dep} + ${lib.concatStringsSep "\n" (map (dep: '' + ln -s ${nodePackages.${dep}}/lib/node_modules/${lib.getName dep} \ + $out/lib/node_modules/${targetModule}/node_modules/${lib.getName dep} '') deps )} ''; diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index 613dec86d7c..a4a70dabd69 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, fetchFromGitHub, python3, flex, bison, qt5, CoreServices, libiconv }: +{ lib, stdenv, cmake, fetchFromGitHub, python3, flex, bison, qt5, CoreServices, libiconv }: stdenv.mkDerivation rec { pname = "doxygen"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "doxygen"; repo = "doxygen"; - rev = "Release_${stdenv.lib.replaceStrings [ "." ] [ "_" ] version}"; + rev = "Release_${lib.replaceStrings [ "." ] [ "_" ] version}"; sha256 = "17chvi3i80rj4750smpizf562xjzd2xcv5rfyh997pyvc1zbq5rh"; }; @@ -19,21 +19,21 @@ stdenv.mkDerivation rec { ]; buildInputs = - stdenv.lib.optionals (qt5 != null) (with qt5; [ qtbase wrapQtAppsHook ]) - ++ stdenv.lib.optional stdenv.isSunOS libiconv - ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices libiconv ]; + lib.optionals (qt5 != null) (with qt5; [ qtbase wrapQtAppsHook ]) + ++ lib.optional stdenv.isSunOS libiconv + ++ lib.optionals stdenv.isDarwin [ CoreServices libiconv ]; cmakeFlags = [ "-DICONV_INCLUDE_DIR=${libiconv}/include" ] ++ - stdenv.lib.optional (qt5 != null) "-Dbuild_wizard=YES"; + lib.optional (qt5 != null) "-Dbuild_wizard=YES"; NIX_CFLAGS_COMPILE = - stdenv.lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.9"; + lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.9"; enableParallelBuilding = false; meta = { - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; homepage = "http://doxygen.nl/"; description = "Source code documentation generator tool"; @@ -45,6 +45,6 @@ stdenv.mkDerivation rec { manual (in LaTeX) from a set of documented source files. ''; - platforms = if qt5 != null then stdenv.lib.platforms.linux else stdenv.lib.platforms.unix; + platforms = if qt5 != null then lib.platforms.linux else lib.platforms.unix; }; } diff --git a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix index 54c37fa6183..d031145a997 100644 --- a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix +++ b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libxml2Python, libxslt, intltool, gnome3 +{ lib, fetchurl, pkg-config, libxml2Python, libxslt, intltool, gnome3 , python2Packages }: python2Packages.buildPythonApplication rec { @@ -8,11 +8,11 @@ python2Packages.buildPythonApplication rec { format = "other"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "19n4x25ndzngaciiyd8dd6s2mf9gv6nv3wv27ggns2smm7zkj1nb"; }; - nativeBuildInputs = [ intltool pkgconfig libxslt.dev ]; + nativeBuildInputs = [ intltool pkg-config libxslt.dev ]; buildInputs = [ libxslt ]; configureFlags = [ "--disable-scrollkeeper" ]; @@ -34,7 +34,7 @@ python2Packages.buildPythonApplication rec { rm $out/nix-support/propagated-build-inputs ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Collection of documentation utilities for the GNOME project"; homepage = "https://gitlab.gnome.org/GNOME/gnome-doc-utils"; license = with licenses; [ gpl2Plus lgpl2Plus ]; diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix index 10b48d51191..d82c288e5aa 100644 --- a/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib , fetchFromGitLab , meson , ninja @@ -44,7 +44,7 @@ python3.pkgs.buildPythonApplication rec { docbook_xml_dtd_43 docbook_xsl libxslt - ] ++ stdenv.lib.optionals withDblatex [ + ] ++ lib.optionals withDblatex [ dblatex ]; @@ -77,7 +77,7 @@ python3.pkgs.buildPythonApplication rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Tools to extract documentation embedded in GTK and GNOME source code"; homepage = "https://www.gtk.org/gtk-doc"; license = licenses.gpl2; diff --git a/pkgs/development/tools/documentation/mdsh/default.nix b/pkgs/development/tools/documentation/mdsh/default.nix index 5ab74a4b95f..c8e6cafa27a 100644 --- a/pkgs/development/tools/documentation/mdsh/default.nix +++ b/pkgs/development/tools/documentation/mdsh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "mdsh"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "118ykkqlf0x6gcgywx4pg3qawfhfr5q5f51gvrw9s302c1lmgk3g"; - meta = with stdenv.lib; { + meta = with lib; { description = "Markdown shell pre-processor"; homepage = "https://github.com/zimbatm/mdsh"; license = with licenses; [ mit ]; diff --git a/pkgs/development/tools/documentation/mkdocs/default.nix b/pkgs/development/tools/documentation/mkdocs/default.nix index 8d4480945bd..64d834f1bb2 100644 --- a/pkgs/development/tools/documentation/mkdocs/default.nix +++ b/pkgs/development/tools/documentation/mkdocs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, python3, fetchFromGitHub }: +{ lib, python3, fetchFromGitHub }: with python3.pkgs; @@ -35,13 +35,13 @@ buildPythonApplication rec { backports_tempfile ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Project documentation with Markdown / static website generator"; longDescription = '' MkDocs is a fast, simple and downright gorgeous static site generator that's geared towards building project documentation. Documentation source files are written in Markdown, and configured with a single YAML configuration file. - + MkDocs can also be used to generate general-purpose Websites. ''; homepage = "http://mkdocs.org/"; diff --git a/pkgs/development/tools/dot-http/default.nix b/pkgs/development/tools/dot-http/default.nix index 9ff3001882c..b156847870d 100644 --- a/pkgs/development/tools/dot-http/default.nix +++ b/pkgs/development/tools/dot-http/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/pkgs/development/tools/drip/default.nix b/pkgs/development/tools/drip/default.nix index b4edf8ec081..2724e41e8e6 100644 --- a/pkgs/development/tools/drip/default.nix +++ b/pkgs/development/tools/drip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, jdk8, which, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, jdk8, which, makeWrapper }: stdenv.mkDerivation rec { pname = "drip"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A launcher for the Java Virtual Machine intended to be a drop-in replacement for the java command, only faster"; license = licenses.epl10; homepage = "https://github.com/ninjudd/drip"; diff --git a/pkgs/development/tools/drm_info/default.nix b/pkgs/development/tools/drm_info/default.nix index c052db92e0c..86d55ab0780 100644 --- a/pkgs/development/tools/drm_info/default.nix +++ b/pkgs/development/tools/drm_info/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , libdrm, json_c, pciutils -, meson, ninja, pkgconfig +, meson, ninja, pkg-config }: stdenv.mkDerivation rec { @@ -14,10 +14,10 @@ stdenv.mkDerivation rec { sha256 = "0s4zp8xz21zcpinbcwdvg48rf0xr7rs0dqri28q093vfmllsk36f"; }; - nativeBuildInputs = [ meson ninja pkgconfig ]; + nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ libdrm json_c pciutils ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Small utility to dump info about DRM devices"; homepage = "https://github.com/ascent12/drm_info"; license = licenses.mit; diff --git a/pkgs/development/tools/dtools/default.nix b/pkgs/development/tools/dtools/default.nix index 5efa579ec5a..1c1604db654 100644 --- a/pkgs/development/tools/dtools/default.nix +++ b/pkgs/development/tools/dtools/default.nix @@ -49,13 +49,13 @@ stdenv.mkDerivation rec { installPhase = '' $makeCmd INSTALL_DIR=$out install - ''; + ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Ancillary tools for the D programming language compiler"; homepage = "https://github.com/dlang/tools"; license = lib.licenses.boost; maintainers = with maintainers; [ ThomasMader ]; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/tools/easyjson/default.nix b/pkgs/development/tools/easyjson/default.nix index ef99bbd01c3..75bfc1d4c14 100644 --- a/pkgs/development/tools/easyjson/default.nix +++ b/pkgs/development/tools/easyjson/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage { pname = "easyjson"; @@ -12,7 +12,7 @@ buildGoPackage { sha256 = "0q85h383mhbkcjm2vqm72bi8n2252fv3c56q3lclzb8n2crnjcdk"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mailru/easyjson"; description = "Fast JSON serializer for golang"; license = licenses.mit; diff --git a/pkgs/development/tools/eclipse-mat/default.nix b/pkgs/development/tools/eclipse-mat/default.nix index e424c5ce70b..633e13d25f7 100644 --- a/pkgs/development/tools/eclipse-mat/default.nix +++ b/pkgs/development/tools/eclipse-mat/default.nix @@ -21,7 +21,7 @@ with lib; let - pVersion = "1.10.0.20200225"; + pVersion = "1.11.0.20201202"; pVersionTriple = splitVersion pVersion; majorVersion = elemAt pVersionTriple 0; minorVersion = elemAt pVersionTriple 1; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://ftp.halifax.rwth-aachen.de/eclipse//mat/${baseVersion}/rcp/MemoryAnalyzer-${version}-linux.gtk.x86_64.zip"; - sha256 = "11cg01gjjvlm6lr6z6rwqs1r31xx5pxddnz55ca0s33lrnywf9fx"; + sha256 = "sha256-HtIKcGfdjb2wovGGSxv16ud7y1cPQFBn77pkhiekAkI="; }; desktopItem = makeDesktopItem { @@ -62,13 +62,13 @@ stdenv.mkDerivation rec { libCairo=$out/eclipse/libcairo-swt.so patchelf --set-interpreter $interpreter $out/mat/MemoryAnalyzer [ -f $libCairo ] && patchelf --set-rpath ${ - stdenv.lib.makeLibraryPath [ freetype fontconfig libX11 libXrender zlib ] + lib.makeLibraryPath [ freetype fontconfig libX11 libXrender zlib ] } $libCairo # Create wrapper script. Pass -configuration to store settings in ~/.eclipse-mat/<version> makeWrapper $out/mat/MemoryAnalyzer $out/bin/eclipse-mat \ --prefix PATH : ${jdk}/bin \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk3 libXtst webkitgtk ])} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk3 libXtst webkitgtk ])} \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ --add-flags "-configuration \$HOME/.eclipse-mat/''${version}/configuration" diff --git a/pkgs/development/tools/ejson/gemset.nix b/pkgs/development/tools/ejson/gemset.nix index 70c61be984c..93fa1131f2a 100644 --- a/pkgs/development/tools/ejson/gemset.nix +++ b/pkgs/development/tools/ejson/gemset.nix @@ -185,4 +185,4 @@ }; version = "0.0.23"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 29d00a159ab..2e60885111d 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , libXScrnSaver , makeWrapper , fetchurl @@ -76,30 +76,30 @@ rec { headers = "18frb1z5qkyff5z1w44mf4iz9aw9j4lq0h9yxgfnp33zf7sl9qb5"; }; - electron_9 = mkElectron "9.4.0" { - x86_64-linux = "2a81ef31fc4b1e1ea450f2c145179ad7c4b6fc752a7b9f3e27abd2461e908ea6"; - x86_64-darwin = "38fa3d93b74c425008d17712daa7676a0f4eb1a70b92da6d7a5c66bb078546cd"; - i686-linux = "629caa459e2fdf31e82501dfd194358d14112152c9d719be579850605ddd929a"; - armv7l-linux = "f46ae7a45d89007cec1c3f45e8e059f2d0e0b73dcadc009b96589ce8bb5e0e21"; - aarch64-linux = "7ebb9cebfa32add20f56b9b414a473f1cb55c90d55735b133f353a23ad76becd"; - headers = "17729m93a387v1sc0ayzfjpvbl1wr9vhlf8y11wyr4704iyimr72"; + electron_9 = mkElectron "9.4.1" { + x86_64-linux = "36c6c33e2702f591c34a7e6ebd7d0828d554a4ce2eafb319a0cd16ffd4cc4b28"; + x86_64-darwin = "3e2f87d899be684eab226c572c566e89c05114059c9add1a33d2be63100b18fd"; + i686-linux = "be5f8d18f11ad7c0655faec4040a8af6239f29f1155210024a01826a30b0dbbe"; + armv7l-linux = "b710a0e3b80ef265760d49c9210f78a6410007521b0ed73c8b868b05d22a0a60"; + aarch64-linux = "e2fc73309780fc0e9b5abebcb8256b2bc389672f0bcc261269da5891a3df66dc"; + headers = "0sabqcjd6gcc6khyhiz3rk30p1y4bxsajy4rs9866bqyafq86j6q"; }; - electron_10 = mkElectron "10.2.0" { - x86_64-linux = "71e6f27433c7a098d0d0d4f2b624bc05cc81614d4e8cd0df71a78a6f9f4e4d5a"; - x86_64-darwin = "c6c32fa6b59d33f79e2f5cc317d7c61f0e1b8d7ab22c46a7a4e3fc3233785d7c"; - i686-linux = "d18208292cc5b64fed42b7ed21740b20f31c92b7612eb54ea1b71f8058a7439d"; - armv7l-linux = "b588b1d14b6f13b1e705180c52fae85113033efa630417a97555a085d7442ec4"; - aarch64-linux = "6cd8172939005cd12705d3c30be57e02e8b5271362ad60fb7378cc99a21db1e0"; - headers = "116h3b02da18w5mqgw6adgbzc9l02vl3c62syw4wsy6xww6i0mgr"; + electron_10 = mkElectron "10.3.0" { + x86_64-linux = "1a4afb659400c7acca0734df1b981b867e5dfdd15d4d3b73fd276d87b682f089"; + x86_64-darwin = "9c5cca484b28dc5cca89a7f1c77e65b3a04251f4eee740265c358efae351cb94"; + i686-linux = "fcb298bca0ab229e92b92c418d3e352885ff4291f735a35c7822b3ca17ae8a86"; + armv7l-linux = "48accf0fbef1f2d1a81e12c2e66b9280f871029b16947d0bebe036cf1fb71b1c"; + aarch64-linux = "2c99b4ec87ba657c33efb3a7e907e3f3e315e87347954231cb8bae393c1c96fd"; + headers = "1k97pfzxqrgw4y76js2chq13avgp9czin9q9mlh1zdf13bih96hj"; }; - electron_11 = mkElectron "11.1.0" { - x86_64-linux = "64f9c0864a12a9e0a435b967ed63209a9bb447456aafe8660edaaa2f6517c538"; - x86_64-darwin = "827b0b3e562535de25d3e4d2c4d7529338efae9197e8cf6702dda786b5870bd0"; - i686-linux = "aa424de2c480d0deb26aa53dc45622857521cb9876cf29a52d32a4da66cae3c6"; - armv7l-linux = "375bbea1ecf521ab95760052df5e0ad167e41f61cc79c7c441553ecc2f64d1dd"; - aarch64-linux = "caaf1f9a2e62c9dbbcb777e5c64640d8a1f60a0f5791a2c8f62ab44067c88777"; - headers = "1kafrz2rxryv7psgfn20qrkpcn83hi9fz7df2ra1nzkngfj7xdjr"; + electron_11 = mkElectron "11.2.1" { + x86_64-linux = "607d9d58c9a3b5c36461acc6bbe473bc604eee42a55c2c617ac46d095cf98abb"; + x86_64-darwin = "39d95668a3ea04bdc652ff9e2889c7a88f638534420e8e256679cbf4b7658a65"; + i686-linux = "59f226133d01fb6acf86fe98907964f79dcf2902054e5c4c9c4ff84a3ea88f4a"; + armv7l-linux = "85051d8eacf04aeec3dd74e46e7888d01bd4e6caf7ec2001122a1f3e11db44ee"; + aarch64-linux = "8aa9be5d6c139386390bad64f78b95756206a40fe4982fc9f199b67a7d06bec5"; + headers = "12sy8zzb0z654b85c5l1j8762nhwmkim1pbz1y3qzgbzvpbd5arq"; }; } diff --git a/pkgs/development/tools/electron/generic.nix b/pkgs/development/tools/electron/generic.nix index 6d0dbc8cace..e29064e673a 100644 --- a/pkgs/development/tools/electron/generic.nix +++ b/pkgs/development/tools/electron/generic.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , libXScrnSaver , makeWrapper , fetchurl @@ -20,7 +20,7 @@ version: hashes: let name = "electron-${version}"; - meta = with stdenv.lib; { + meta = with lib; { description = "Cross platform desktop application shell"; homepage = "https://github.com/electron/electron"; license = licenses.mit; @@ -56,7 +56,7 @@ let passthru.headers = headersFetcher version hashes.headers; }; - electronLibPath = with stdenv.lib; makeLibraryPath ( + electronLibPath = with lib; makeLibraryPath ( [ libuuid at-spi2-atk at-spi2-core libappindicator-gtk3 ] ++ optionals (! versionOlder version "9.0.0") [ libdrm mesa ] ++ optionals (! versionOlder version "11.0.0") [ libxkbcommon ] @@ -89,7 +89,7 @@ let $out/lib/electron/electron wrapProgram $out/lib/electron/electron \ - --prefix LD_PRELOAD : ${stdenv.lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1 \ + --prefix LD_PRELOAD : ${lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1 \ "''${gappsWrapperArgs[@]}" ''; }; diff --git a/pkgs/development/tools/eliot-tree/default.nix b/pkgs/development/tools/eliot-tree/default.nix index e60642c5fe6..adcedfe643c 100644 --- a/pkgs/development/tools/eliot-tree/default.nix +++ b/pkgs/development/tools/eliot-tree/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages }: +{ lib, python3Packages }: python3Packages.buildPythonApplication rec { pname = "eliot-tree"; diff --git a/pkgs/development/tools/erlang/cuter/default.nix b/pkgs/development/tools/erlang/cuter/default.nix index f9d63cc86d8..44ed61ac1d5 100644 --- a/pkgs/development/tools/erlang/cuter/default.nix +++ b/pkgs/development/tools/erlang/cuter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoreconfHook, which, writeText, makeWrapper, fetchFromGitHub, erlang +{ lib, stdenv, autoreconfHook, which, writeText, makeWrapper, fetchFromGitHub, erlang , z3, python }: stdenv.mkDerivation rec { @@ -38,9 +38,9 @@ stdenv.mkDerivation rec { meta = { description = "A concolic testing tool for the Erlang functional programming language"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; homepage = "https://github.com/aggelgian/cuter"; - maintainers = with stdenv.lib.maintainers; [ ericbmerritt ]; - platforms = with stdenv.lib.platforms; unix; + maintainers = with lib.maintainers; [ ericbmerritt ]; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/development/tools/errcheck/default.nix b/pkgs/development/tools/errcheck/default.nix index 3c42c1437a4..eb9589f723d 100644 --- a/pkgs/development/tools/errcheck/default.nix +++ b/pkgs/development/tools/errcheck/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "errcheck"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "kisielk"; repo = "errcheck"; rev = "v${version}"; - sha256 = "00skyvy31yliw0f395j5h3gichi5n2q1m24izjidxvyc2av7pjn6"; + sha256 = "sha256-ZmocFXtg+Thdup+RqDYC/Td3+m1nS0FydZecfsWXIzI="; }; - vendorSha256 = "0mx506qb5sy6p4zqjs1n0w7dg8pz2wf982qi9v7nrhxysl2rlnxf"; + vendorSha256 = "sha256-rluaBdW+w2zPThELlBwX/6LXDgc2aIk/ucbrsrABpVc="; meta = with lib; { description = "Program for checking for unchecked errors in go programs"; diff --git a/pkgs/development/tools/fac/default.nix b/pkgs/development/tools/fac/default.nix index 6a23f84f236..c50fd834e03 100644 --- a/pkgs/development/tools/fac/default.nix +++ b/pkgs/development/tools/fac/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, git }: +{ lib, buildGoPackage, fetchFromGitHub, makeWrapper, git }: buildGoPackage rec { pname = "fac"; @@ -25,7 +25,7 @@ buildGoPackage rec { install -D go/src/${goPackagePath}/assets/doc/fac.1 $out/share/man/man1/fac.1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "CUI for fixing git conflicts"; inherit (src.meta) homepage; license = licenses.mit; diff --git a/pkgs/development/tools/fac/deps.nix b/pkgs/development/tools/fac/deps.nix index 65335497e5f..8545bae7e22 100644 --- a/pkgs/development/tools/fac/deps.nix +++ b/pkgs/development/tools/fac/deps.nix @@ -63,4 +63,4 @@ sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; }; } -] \ No newline at end of file +] diff --git a/pkgs/development/tools/fdroidserver/default.nix b/pkgs/development/tools/fdroidserver/default.nix index 1b0c44f5754..2cc5e6b7ca5 100644 --- a/pkgs/development/tools/fdroidserver/default.nix +++ b/pkgs/development/tools/fdroidserver/default.nix @@ -49,6 +49,9 @@ python.pkgs.buildPythonApplication rec { ruamel_yaml ]; + # no tests + doCheck = false; + meta = with lib; { homepage = "https://f-droid.org"; description = "Server and tools for F-Droid, the Free Software repository system for Android"; diff --git a/pkgs/development/tools/fedpkg/default.nix b/pkgs/development/tools/fedpkg/default.nix index 4fbecc2d58d..d9633e88f34 100644 --- a/pkgs/development/tools/fedpkg/default.nix +++ b/pkgs/development/tools/fedpkg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonApplication, buildPythonPackage, isPy3k, fetchurl, rpkg, offtrac, urlgrabber, pyopenssl, python_fedora }: +{ lib, buildPythonApplication, buildPythonPackage, isPy3k, fetchurl, rpkg, offtrac, urlgrabber, pyopenssl, python_fedora }: let fedora_cert = buildPythonPackage rec { @@ -26,7 +26,7 @@ in buildPythonApplication rec { patches = [ ./fix-paths.patch ]; propagatedBuildInputs = [ rpkg offtrac urlgrabber fedora_cert ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Subclass of the rpkg project for dealing with rpm packaging"; homepage = "https://pagure.io/fedpkg"; license = licenses.gpl2; diff --git a/pkgs/development/tools/flamegraph/default.nix b/pkgs/development/tools/flamegraph/default.nix index 23ada99eac0..3a64d741de5 100644 --- a/pkgs/development/tools/flamegraph/default.nix +++ b/pkgs/development/tools/flamegraph/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, perl }: +{ lib, stdenv, fetchFromGitHub, perl }: stdenv.mkDerivation rec { pname = "FlameGraph"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { license = with licenses; [ asl20 cddl gpl2Plus ]; homepage = "http://www.brendangregg.com/flamegraphs.html"; description = "Visualization for profiled code"; diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix index 79c8236a065..dd9282c6896 100644 --- a/pkgs/development/tools/flatpak-builder/default.nix +++ b/pkgs/development/tools/flatpak-builder/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , substituteAll , nixosTests @@ -11,7 +11,7 @@ , gettext , libxml2 , libxslt -, pkgconfig +, pkg-config , xmlto , acl @@ -64,7 +64,7 @@ in stdenv.mkDerivation rec { gettext libxml2 libxslt - pkgconfig + pkg-config xmlto ]; @@ -145,7 +145,7 @@ in stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool to build flatpaks from source"; homepage = "https://github.com/flatpak/flatpak-builder"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/tools/flootty/default.nix b/pkgs/development/tools/flootty/default.nix index 2b8f174f763..e4f76ca9f6a 100644 --- a/pkgs/development/tools/flootty/default.nix +++ b/pkgs/development/tools/flootty/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages }: +{ lib, python3Packages }: python3Packages.buildPythonApplication rec { pname = "Flootty"; @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { sha256 = "0gfl143ly81pmmrcml91yr0ypvwrs5q4s1sfdc0l2qkqpy233ih7"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A collaborative terminal. In practice, it's similar to a shared screen or tmux session"; homepage = "https://floobits.com/help/flootty"; license = licenses.asl20; diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index af58da17510..4f2bd805260 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl, jre_headless, makeWrapper }: +{ lib, stdenv, fetchurl, jre_headless, makeWrapper }: let - version = "7.3.1"; + version = "7.5.2"; in stdenv.mkDerivation { pname = "flyway"; inherit version; src = fetchurl { url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "1qridl42jldwv6wka7l54g354aj9f3vbgzhyz5gdz5vdzs9x93w8"; + sha256 = "sha256-oO7k6JOKUm11OYNN+tH/zqF9ucgrsnF4PcphT8+xnS8="; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; @@ -22,7 +22,7 @@ --add-flags "org.flywaydb.commandline.Main" \ --add-flags "-jarDirs='$out/share/flyway/jars'" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Evolve your Database Schema easily and reliably across all your instances"; longDescription = '' The Flyway command-line tool is a standalone Flyway distribution. diff --git a/pkgs/development/tools/fmbt/default.nix b/pkgs/development/tools/fmbt/default.nix index 71365c01bfd..e6bb2032741 100644 --- a/pkgs/development/tools/fmbt/default.nix +++ b/pkgs/development/tools/fmbt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python, autoreconfHook, pkgconfig, makeWrapper +{ lib, stdenv, fetchFromGitHub, python, autoreconfHook, pkg-config, makeWrapper , flex , gettext, libedit, glib, imagemagick, libxml2, boost, gnuplot, graphviz , tesseract, gts, libXtst @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { sha256 = "1jb9nb2mipc5cg99a80dny4m06vz2zral0q30fv75rz2cb6ja4zp"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig flex makeWrapper + nativeBuildInputs = [ autoreconfHook pkg-config flex makeWrapper python.pkgs.wrapPython ]; buildInputs = [ python gettext libedit glib imagemagick libxml2 boost - gnuplot graphviz tesseract gts + gnuplot graphviz tesseract gts ]; propagatedBuildInputs = with python.pkgs; [ @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { preBuild = '' export PYTHONPATH="$PYTHONPATH:$out/lib/python${python.pythonVersion}/site-packages" export PATH="$PATH:$out/bin" - export LD_LIBRARY_PATH="${stdenv.lib.makeLibraryPath [libXtst]}" + export LD_LIBRARY_PATH="${lib.makeLibraryPath [libXtst]}" ''; postInstall = '' @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Free Model-Based Testing tool"; homepage = "https://github.com/intel/fMBT"; license = licenses.lgpl21; diff --git a/pkgs/development/tools/fusee-launcher/default.nix b/pkgs/development/tools/fusee-launcher/default.nix index 077dc8b87f9..08cf6caae3e 100644 --- a/pkgs/development/tools/fusee-launcher/default.nix +++ b/pkgs/development/tools/fusee-launcher/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , python3Packages , python3 , fetchFromGitHub @@ -32,7 +32,7 @@ stdenv.mkDerivation { buildInputs = [ python3 python3Packages.pyusb ]; pythonPath = with python3Packages; [ pyusb ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/Cease-and-DeSwitch/fusee-launcher"; description = "Work-in-progress launcher for one of the Tegra X1 bootROM exploits"; license = licenses.gpl2; diff --git a/pkgs/development/tools/galen/default.nix b/pkgs/development/tools/galen/default.nix index 89d6b700018..00831c05691 100644 --- a/pkgs/development/tools/galen/default.nix +++ b/pkgs/development/tools/galen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre8, unzip }: +{ lib, stdenv, fetchurl, jre8, unzip }: stdenv.mkDerivation rec { pname = "galen"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { cp galen.jar $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://galenframework.com"; description = "Automated layout testing for websites"; license = licenses.asl20; diff --git a/pkgs/development/tools/gamecube-tools/default.nix b/pkgs/development/tools/gamecube-tools/default.nix index 7c31f691b4e..2f7c088cd48 100644 --- a/pkgs/development/tools/gamecube-tools/default.nix +++ b/pkgs/development/tools/gamecube-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook +{ lib, stdenv, fetchFromGitHub, autoreconfHook , freeimage, libGL }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "0zvpkzqvl8iv4ndzhkjkmrzpampyzgb91spv0h2x2arl8zy4z7ca"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Tools for gamecube/wii projects"; homepage = "https://github.com/devkitPro/gamecube-tools/"; license = licenses.gpl2; diff --git a/pkgs/development/tools/gauge/default.nix b/pkgs/development/tools/gauge/default.nix index dd48998c741..168910da06f 100644 --- a/pkgs/development/tools/gauge/default.nix +++ b/pkgs/development/tools/gauge/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gauge"; @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "02yrk4d5mm4j2grlhqkf4grxawx91kd2vhdn7k5wd2dl6wsnlgcl"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Light weight cross-platform test automation"; homepage = "https://gauge.org"; license = licenses.gpl3; diff --git a/pkgs/development/tools/gdm/default.nix b/pkgs/development/tools/gdm/default.nix index 2f26a1c35f8..7ecb7895d2f 100644 --- a/pkgs/development/tools/gdm/default.nix +++ b/pkgs/development/tools/gdm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gdm"; @@ -15,7 +15,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - meta = with stdenv.lib; { + meta = with lib; { description = "Minimalist dependency manager for Go written in Go"; homepage = "https://github.com/sparrc/gdm"; license = licenses.unlicense; diff --git a/pkgs/development/tools/ginkgo/default.nix b/pkgs/development/tools/ginkgo/default.nix index b65e7c6a5ee..05db94c7f1e 100644 --- a/pkgs/development/tools/ginkgo/default.nix +++ b/pkgs/development/tools/ginkgo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "ginkgo"; diff --git a/pkgs/development/tools/gir/default.nix b/pkgs/development/tools/gir/default.nix index 8f38b41f7ae..c88ffef4df1 100644 --- a/pkgs/development/tools/gir/default.nix +++ b/pkgs/development/tools/gir/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "gir"; diff --git a/pkgs/development/tools/git-ftp/default.nix b/pkgs/development/tools/git-ftp/default.nix index 0c107ecc503..25295ad0062 100644 --- a/pkgs/development/tools/git-ftp/default.nix +++ b/pkgs/development/tools/git-ftp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pandoc, man }: +{ lib, stdenv, fetchFromGitHub, pandoc, man }: stdenv.mkDerivation rec { pname = "git-ftp"; version = "1.6.0"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [pandoc man]; - meta = with stdenv.lib; { + meta = with lib; { description = "Git powered FTP client written as shell script"; homepage = "https://git-ftp.github.io/"; license = licenses.gpl3; diff --git a/pkgs/development/tools/git-quick-stats/default.nix b/pkgs/development/tools/git-quick-stats/default.nix index 500c9a55c1d..ed9205ee251 100644 --- a/pkgs/development/tools/git-quick-stats/default.nix +++ b/pkgs/development/tools/git-quick-stats/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , makeWrapper , coreutils @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "git-quick-stats"; - version = "2.1.4"; + version = "2.1.5"; src = fetchFromGitHub { repo = "git-quick-stats"; owner = "arzzen"; rev = version; - sha256 = "0fg0fijghcz7hvbc9y8dfksz0qmsz700kc2mfb03y90kja99v68y"; + sha256 = "sha256-d5B+SSUXtOD4x+dChQsUCkiHuHcW3lOrL4QhQekY7cA="; }; nativeBuildInputs = [ makeWrapper ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { postInstall = let - path = stdenv.lib.makeBinPath [ + path = lib.makeBinPath [ coreutils gawk git @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/git-quick-stats --suffix PATH : ${path} ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/arzzen/git-quick-stats"; description = "A simple and efficient way to access various statistics in git repository"; platforms = platforms.all; diff --git a/pkgs/development/tools/git-repo-updater/default.nix b/pkgs/development/tools/git-repo-updater/default.nix index dbf83677999..d78972aa07b 100644 --- a/pkgs/development/tools/git-repo-updater/default.nix +++ b/pkgs/development/tools/git-repo-updater/default.nix @@ -12,6 +12,9 @@ buildPythonApplication rec { propagatedBuildInputs = [ colorama GitPython ]; + # no tests + doCheck = false; + meta = with lib; { description = "Easily update multiple Git repositories at once"; homepage = "https://github.com/earwig/git-repo-updater"; diff --git a/pkgs/development/tools/git-series/default.nix b/pkgs/development/tools/git-series/default.nix index 3507131082e..0f7677c7aa2 100644 --- a/pkgs/development/tools/git-series/default.nix +++ b/pkgs/development/tools/git-series/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, fetchpatch, rustPlatform -, openssl, cmake, perl, pkgconfig, zlib, curl, libgit2, libssh2 +{ lib, fetchFromGitHub, fetchpatch, rustPlatform +, openssl, cmake, perl, pkg-config, zlib, curl, libgit2, libssh2 }: with rustPlatform; @@ -36,14 +36,14 @@ buildRustPackage rec { LIBGIT2_SYS_USE_PKG_CONFIG = true; LIBSSH2_SYS_USE_PKG_CONFIG = true; - nativeBuildInputs = [ cmake pkgconfig perl ]; + nativeBuildInputs = [ cmake pkg-config perl ]; buildInputs = [ openssl zlib curl libgit2 libssh2 ]; postBuild = '' install -D "$src/git-series.1" "$out/man/man1/git-series.1" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool to help with formatting git patches for review on mailing lists"; longDescription = '' git series tracks changes to a patch series over time. git diff --git a/pkgs/development/tools/github-changelog-generator/gemset.nix b/pkgs/development/tools/github-changelog-generator/gemset.nix index 3382557aaa5..173ee55b6e7 100644 --- a/pkgs/development/tools/github-changelog-generator/gemset.nix +++ b/pkgs/development/tools/github-changelog-generator/gemset.nix @@ -152,4 +152,4 @@ }; version = "1.2.5"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/github/cligh/default.nix b/pkgs/development/tools/github/cligh/default.nix index 5eb65dc4fbd..ce340239ac4 100644 --- a/pkgs/development/tools/github/cligh/default.nix +++ b/pkgs/development/tools/github/cligh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildPythonApplication, pyxdg, PyGithub }: +{ lib, fetchFromGitHub, buildPythonApplication, pyxdg, PyGithub }: buildPythonApplication rec { pname = "cligh"; @@ -15,7 +15,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ pyxdg PyGithub ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://the-brannons.com/software/cligh.html"; description = "A simple command-line interface to the facilities of Github"; longDescription = '' diff --git a/pkgs/development/tools/github/github-release/default.nix b/pkgs/development/tools/github/github-release/default.nix index 8b68426d4b5..81b125ac058 100644 --- a/pkgs/development/tools/github/github-release/default.nix +++ b/pkgs/development/tools/github/github-release/default.nix @@ -1,4 +1,4 @@ -{ stdenv, system, fetchurl }: +{ lib, stdenv, system, fetchurl }: let linuxPredicate = system == "x86_64-linux"; @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { cp "${metadata.archiveBinaryPath}/github-release" "$out/bin/" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Commandline app to create and edit releases on Github (and upload artifacts)"; longDescription = '' A small commandline app written in Go that allows you to easily create and diff --git a/pkgs/development/tools/glade/default.nix b/pkgs/development/tools/glade/default.nix index 0e3cdf4bda1..d77772c32db 100644 --- a/pkgs/development/tools/glade/default.nix +++ b/pkgs/development/tools/glade/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { version = "3.38.2"; src = fetchurl { - url = "mirror://gnome/sources/glade/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/glade/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1dxsiz9ahqkxg2a1dw9sbd8jg59y5pdz4c1gvnbmql48gmj8gz4q"; }; diff --git a/pkgs/development/tools/glide/default.nix b/pkgs/development/tools/glide/default.nix index 4f511813ad0..05e4ae81061 100644 --- a/pkgs/development/tools/glide/default.nix +++ b/pkgs/development/tools/glide/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "glide"; @@ -18,7 +18,7 @@ buildGoPackage rec { sha256 = "1wskg1cxqy9sp0738qiiagdw09dbs3swxsk4z6w5hsfiq2h44a54"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://glide.sh"; description = "Package management for Go"; license = licenses.mit; diff --git a/pkgs/development/tools/gllvm/default.nix b/pkgs/development/tools/gllvm/default.nix index efa7ae21c3a..78038440a96 100644 --- a/pkgs/development/tools/gllvm/default.nix +++ b/pkgs/development/tools/gllvm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gllvm"; @@ -13,7 +13,7 @@ buildGoPackage rec { sha256 = "15cgngvd9mg057iz32fk5kcprcvvavahbvfvl5ds8x7shbm60g7s"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/SRI-CSL/gllvm"; description = "Whole Program LLVM: wllvm ported to go"; license = licenses.bsd3; diff --git a/pkgs/development/tools/glock/default.nix b/pkgs/development/tools/glock/default.nix index 0ffa521f38f..b2d1e09e74f 100644 --- a/pkgs/development/tools/glock/default.nix +++ b/pkgs/development/tools/glock/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "glock"; - version = "20160816-${stdenv.lib.strings.substring 0 7 rev}"; + version = "20160816-${lib.strings.substring 0 7 rev}"; rev = "b8c84ff5ade15a6238ca61c20d3afc70d2e41276"; goPackagePath = "github.com/robfig/glock"; @@ -16,7 +16,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/robfig/glock"; description = "A command-line tool to lock Go dependencies to specific revisions"; license = licenses.mit; diff --git a/pkgs/development/tools/glslviewer/default.nix b/pkgs/development/tools/glslviewer/default.nix index 84b3d2a6b1e..3f83e1fcb02 100644 --- a/pkgs/development/tools/glslviewer/default.nix +++ b/pkgs/development/tools/glslviewer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, glfw, pkgconfig, libXrandr, libXdamage +{ lib, stdenv, fetchFromGitHub, glfw, pkg-config, libXrandr, libXdamage , libXext, libXrender, libXinerama, libXcursor, libXxf86vm, libXi , libX11, libGLU, python3Packages, ensureNewerSourcesForZipFilesHook , Cocoa @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { sha256 = "0v7x93b61ama0gmzlx1zc56jgi7bvzsfvbkfl82xzwf2h5g1zni7"; }; - nativeBuildInputs = [ pkgconfig ensureNewerSourcesForZipFilesHook python3Packages.six ]; + nativeBuildInputs = [ pkg-config ensureNewerSourcesForZipFilesHook python3Packages.six ]; buildInputs = [ glfw libGLU glfw libXrandr libXdamage libXext libXrender libXinerama libXcursor libXxf86vm libXi libX11 ] ++ (with python3Packages; [ python setuptools wrapPython ]) - ++ stdenv.lib.optional stdenv.isDarwin Cocoa; + ++ lib.optional stdenv.isDarwin Cocoa; pythonPath = with python3Packages; [ pyyaml requests ]; # Makefile has /usr/local/bin hard-coded for 'make install' @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { wrapPythonPrograms ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Live GLSL coding renderer"; homepage = "http://patriciogonzalezvivo.com/2015/glslViewer/"; license = licenses.bsd3; diff --git a/pkgs/development/tools/gnome-desktop-testing/default.nix b/pkgs/development/tools/gnome-desktop-testing/default.nix index e0dc9ecda80..5f01881958f 100644 --- a/pkgs/development/tools/gnome-desktop-testing/default.nix +++ b/pkgs/development/tools/gnome-desktop-testing/default.nix @@ -1,7 +1,7 @@ -{ stdenv +{ lib, stdenv , glib , autoreconfHook -, pkgconfig +, pkg-config , systemd , fetchFromGitLab }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config ]; buildInputs = [ @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "GNOME test runner for installed tests"; homepage = "https://wiki.gnome.org/Initiatives/GnomeGoals/InstalledTests"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/tools/gnulib/default.nix b/pkgs/development/tools/gnulib/default.nix index 81e4d879375..2a2ce1b190f 100644 --- a/pkgs/development/tools/gnulib/default.nix +++ b/pkgs/development/tools/gnulib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit }: +{ lib, stdenv, fetchgit }: stdenv.mkDerivation { pname = "gnulib"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { homepage = "https://www.gnu.org/software/gnulib/"; description = "Central location for code to be shared among GNU packages"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/tools/go-bindata-assetfs/default.nix b/pkgs/development/tools/go-bindata-assetfs/default.nix index 30344a52e06..5131436e024 100644 --- a/pkgs/development/tools/go-bindata-assetfs/default.nix +++ b/pkgs/development/tools/go-bindata-assetfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "go-bindata-assetfs"; @@ -13,7 +13,7 @@ buildGoPackage rec { sha256 = "0b6q8h9fwpgpkvml1j87wq9174g7px1dmskhm884drpvswda2djk"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Serve embedded files from jteeuwen/go-bindata"; license = licenses.bsd2; maintainers = with maintainers; [ avnik ]; diff --git a/pkgs/development/tools/go-bindata/default.nix b/pkgs/development/tools/go-bindata/default.nix index 9256fab43bf..3b73c527315 100644 --- a/pkgs/development/tools/go-bindata/default.nix +++ b/pkgs/development/tools/go-bindata/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage { pname = "go-bindata"; @@ -15,7 +15,7 @@ buildGoPackage { excludedPackages = "testdata"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/jteeuwen/go-bindata"; description = "A small utility which generates Go code from any file, useful for embedding binary data in a Go program"; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/development/tools/go-junit-report/default.nix b/pkgs/development/tools/go-junit-report/default.nix index f1e822e3633..110cdbfabc9 100644 --- a/pkgs/development/tools/go-junit-report/default.nix +++ b/pkgs/development/tools/go-junit-report/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "go-junit-report-unstable"; diff --git a/pkgs/development/tools/go-langserver/default.nix b/pkgs/development/tools/go-langserver/default.nix index c6a0dcc0d9d..ac6034dffa4 100644 --- a/pkgs/development/tools/go-langserver/default.nix +++ b/pkgs/development/tools/go-langserver/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "go-langserver"; @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "1wv7xf81s3qi8xydxjkkp8vacdzrq8sbj04346fz73nsn85z0sgp"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A Go language server protocol server"; homepage = "https://github.com/sourcegraph/go-langserver"; license = licenses.mit; diff --git a/pkgs/development/tools/go-migrate/default.nix b/pkgs/development/tools/go-migrate/default.nix index 1786bfe5f0f..d07e3cd80d3 100644 --- a/pkgs/development/tools/go-migrate/default.nix +++ b/pkgs/development/tools/go-migrate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "go-migrate"; diff --git a/pkgs/development/tools/go-minimock/default.nix b/pkgs/development/tools/go-minimock/default.nix index ed4374e7764..3131fc59b41 100644 --- a/pkgs/development/tools/go-minimock/default.nix +++ b/pkgs/development/tools/go-minimock/default.nix @@ -11,6 +11,10 @@ buildGoModule rec { sha256 = "0r0krbwvx5w1z0yv2qqi92irbsfhkvwvaigy350cvcz9gmcppj4h"; }; + buildFlagsArray = [ + "-ldflags=-s -w -X main.version=${version}" + ]; + vendorSha256 = "1macwm6hybjinwnx62v146yxydcn5k5r587nxwkf4ffy76s2m3jc"; doCheck = true; diff --git a/pkgs/development/tools/go-motion/default.nix b/pkgs/development/tools/go-motion/default.nix index 824668055b1..9ece650f0cb 100644 --- a/pkgs/development/tools/go-motion/default.nix +++ b/pkgs/development/tools/go-motion/default.nix @@ -9,7 +9,7 @@ buildGoPackage rec { rev = "218875ebe23806e7af82f3b5b14bb3355534f679"; goPackagePath = "github.com/fatih/motion"; - excludedPackages = ''testdata''; + excludedPackages = "testdata"; src = fetchFromGitHub { inherit rev; diff --git a/pkgs/development/tools/go-outline/default.nix b/pkgs/development/tools/go-outline/default.nix index f10ee426c08..fe4c2e8d4df 100644 --- a/pkgs/development/tools/go-outline/default.nix +++ b/pkgs/development/tools/go-outline/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "go-outline"; @@ -18,7 +18,7 @@ buildGoPackage rec { meta = { description = "Utility to extract JSON representation of declarations from a Go source file"; homepage = "https://github.com/ramya-rao-a/go-outline"; - maintainers = with stdenv.lib.maintainers; [ vdemeester ]; - license = stdenv.lib.licenses.mit; + maintainers = with lib.maintainers; [ vdemeester ]; + license = lib.licenses.mit; }; } diff --git a/pkgs/development/tools/go-protobuf/default.nix b/pkgs/development/tools/go-protobuf/default.nix index c5e9af3e7bb..1fa027ae72b 100644 --- a/pkgs/development/tools/go-protobuf/default.nix +++ b/pkgs/development/tools/go-protobuf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "go-protobuf"; @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/golang/protobuf"; description = " Go bindings for protocol buffer"; maintainers = with maintainers; [ lewo ]; diff --git a/pkgs/development/tools/go-repo-root/default.nix b/pkgs/development/tools/go-repo-root/default.nix index 3392a19b636..b7653aa144e 100644 --- a/pkgs/development/tools/go-repo-root/default.nix +++ b/pkgs/development/tools/go-repo-root/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "go-repo-root"; - version = "20140911-${stdenv.lib.strings.substring 0 7 rev}"; + version = "20140911-${lib.strings.substring 0 7 rev}"; rev = "90041e5c7dc634651549f96814a452f4e0e680f9"; goPackagePath = "github.com/cstrahan/go-repo-root"; diff --git a/pkgs/development/tools/go-swagger/default.nix b/pkgs/development/tools/go-swagger/default.nix index 7f0a1a50b6d..1515dae3391 100644 --- a/pkgs/development/tools/go-swagger/default.nix +++ b/pkgs/development/tools/go-swagger/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-swagger"; - version = "0.25.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "go-swagger"; repo = pname; rev = "v${version}"; - sha256 = "05zyja58ff0k4fsfmb1j8q5p7lysi78m7jklrzz2xv8ianifkfbg"; + sha256 = "sha256-mBBjZRjaD1m6sIKR1/MRAKW25bGVNihxBwQMbw/lby4="; }; - vendorSha256 = "0vvr167spwk7whqzdp5vd8sm0qwc5g3namm4iqw3vff2pifjgs40"; + vendorSha256 = "sha256-Am0ypcViUcAcf96qv5qE7K3FvQuQs1XlpIqZf2upWyc="; doCheck = false; diff --git a/pkgs/development/tools/go-symbols/default.nix b/pkgs/development/tools/go-symbols/default.nix index 1e2b63ba154..a259b768561 100644 --- a/pkgs/development/tools/go-symbols/default.nix +++ b/pkgs/development/tools/go-symbols/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "go-symbols"; @@ -17,7 +17,7 @@ buildGoPackage rec { meta = { description = "A utility for extracting a JSON representation of the package symbols from a go source tree"; homepage = "https://github.com/acroca/go-symbols"; - maintainers = with stdenv.lib.maintainers; [ vdemeester ]; - license = stdenv.lib.licenses.mit; + maintainers = with lib.maintainers; [ vdemeester ]; + license = lib.licenses.mit; }; } diff --git a/pkgs/development/tools/go-tools/default.nix b/pkgs/development/tools/go-tools/default.nix index 3d3c9db9a1e..57e836d8f4e 100644 --- a/pkgs/development/tools/go-tools/default.nix +++ b/pkgs/development/tools/go-tools/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "go-tools"; - version = "2020.2"; + version = "2020.2.1"; src = fetchFromGitHub { owner = "dominikh"; repo = "go-tools"; rev = version; - sha256 = "1qqpr481rx6n75xp1racsjjyn2fa8f28pcb0r9kd56qq890h3qgj"; + sha256 = "0a1a4dhz33grwg892436bjhgp8sygrg8yhdhy8dh6i3l6n9dalfh"; }; - vendorSha256 = "1axci0l7pymy66j6lilm49ksrwp7dvnj5krai2kvy96n3arcnsvq"; + vendorSha256 = "081p008sb3lkc8j6sa6n42qi04za4a631kihrd4ca6aigwkgl3ak"; doCheck = false; diff --git a/pkgs/development/tools/go2nix/default.nix b/pkgs/development/tools/go2nix/default.nix index 300f82ee548..b5a224cb5ae 100644 --- a/pkgs/development/tools/go2nix/default.nix +++ b/pkgs/development/tools/go2nix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, go-bindata, gotools, nix-prefetch-git, git, makeWrapper, +{ lib, buildGoPackage, go-bindata, gotools, nix-prefetch-git, git, makeWrapper, fetchFromGitHub }: buildGoPackage rec { @@ -21,7 +21,7 @@ buildGoPackage rec { nativeBuildInputs = [ go-bindata gotools makeWrapper ]; - preBuild = ''go generate ./...''; + preBuild = "go generate ./..."; postInstall = '' wrapProgram $out/bin/go2nix \ @@ -36,7 +36,7 @@ buildGoPackage rec { doCheck = false; # tries to access the net - meta = with stdenv.lib; { + meta = with lib; { description = "Go apps packaging for Nix"; homepage = "https://github.com/kamilchm/go2nix"; license = licenses.mit; diff --git a/pkgs/development/tools/goa/default.nix b/pkgs/development/tools/goa/default.nix index 6a373099a01..56b47bd8c60 100644 --- a/pkgs/development/tools/goa/default.nix +++ b/pkgs/development/tools/goa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "goa"; @@ -16,7 +16,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://goa.design"; description = "A framework for building microservices in Go using a unique design-first approach"; license = licenses.mit; diff --git a/pkgs/development/tools/gocode-gomod/default.nix b/pkgs/development/tools/gocode-gomod/default.nix index 01ee2931c99..f610b19d79b 100644 --- a/pkgs/development/tools/gocode-gomod/default.nix +++ b/pkgs/development/tools/gocode-gomod/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "gocode-gomod"; @@ -9,7 +9,7 @@ buildGoModule rec { # standard packages. allowGoReference = true; - excludedPackages = ''internal/suggest/testdata''; + excludedPackages = "internal/suggest/testdata"; src = fetchFromGitHub { owner = "stamblerre"; @@ -24,7 +24,7 @@ buildGoModule rec { mv $out/bin/gocode $out/bin/gocode-gomod ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An autocompletion daemon for the Go programming language"; longDescription = '' Gocode is a helper tool which is intended to be integrated with your diff --git a/pkgs/development/tools/gocode/default.nix b/pkgs/development/tools/gocode/default.nix index f38d06b34c6..be9f70da934 100644 --- a/pkgs/development/tools/gocode/default.nix +++ b/pkgs/development/tools/gocode/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gocode-unstable"; @@ -6,7 +6,7 @@ buildGoPackage rec { rev = "4acdcbdea79de6b3dee1c637eca5cbea0fdbe37c"; goPackagePath = "github.com/mdempsky/gocode"; - excludedPackages = ''internal/suggest/testdata''; + excludedPackages = "internal/suggest/testdata"; # we must allow references to the original `go` package, # because `gocode` needs to dig into $GOROOT to provide completions for the @@ -23,7 +23,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - meta = with stdenv.lib; { + meta = with lib; { description = "An autocompletion daemon for the Go programming language"; longDescription = '' Gocode is a helper tool which is intended to be integrated with your diff --git a/pkgs/development/tools/goconvey/default.nix b/pkgs/development/tools/goconvey/default.nix index 173da3ff29d..fb6ce653cc4 100644 --- a/pkgs/development/tools/goconvey/default.nix +++ b/pkgs/development/tools/goconvey/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "goconvey"; @@ -19,7 +19,7 @@ buildGoPackage rec { meta = { description = "Go testing in the browser. Integrates with `go test`. Write behavioral tests in Go"; homepage = "https://github.com/smartystreets/goconvey"; - maintainers = with stdenv.lib.maintainers; [ vdemeester ]; - license = stdenv.lib.licenses.mit; + maintainers = with lib.maintainers; [ vdemeester ]; + license = lib.licenses.mit; }; } diff --git a/pkgs/development/tools/godef/default.nix b/pkgs/development/tools/godef/default.nix index c8149ecc82d..99fe932013e 100644 --- a/pkgs/development/tools/godef/default.nix +++ b/pkgs/development/tools/godef/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "godef"; @@ -21,7 +21,7 @@ buildGoModule rec { meta = { description = "Print where symbols are defined in Go source code"; homepage = "https://github.com/rogpeppe/godef/"; - maintainers = with stdenv.lib.maintainers; [ vdemeester rvolosatovs ]; - license = stdenv.lib.licenses.bsd3; + maintainers = with lib.maintainers; [ vdemeester rvolosatovs ]; + license = lib.licenses.bsd3; }; } diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix index 492430cc7c7..217717d3e7d 100644 --- a/pkgs/development/tools/godot/default.nix +++ b/pkgs/development/tools/godot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, scons, pkgconfig, libX11, libXcursor +{ stdenv, lib, fetchFromGitHub, scons, pkg-config, libX11, libXcursor , libXinerama, libXrandr, libXrender, libpulseaudio ? null , libXi ? null, libXext, libXfixes, freetype, openssl , alsaLib, libGLU, zlib, yasm ? null }: @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { sha256 = "19vrp5lhyvxbm6wjxzn28sn3i0s8j08ca7nani8l1nrhvlc8wi0v"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ scons libX11 libXcursor libXinerama libXrandr libXrender libXi libXext libXfixes freetype openssl alsaLib libpulseaudio @@ -61,8 +61,8 @@ in stdenv.mkDerivation rec { meta = { homepage = "https://godotengine.org"; description = "Free and Open Source 2D and 3D game engine"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; platforms = [ "i686-linux" "x86_64-linux" ]; - maintainers = [ stdenv.lib.maintainers.twey ]; + maintainers = [ lib.maintainers.twey ]; }; } diff --git a/pkgs/development/tools/godot/headless.nix b/pkgs/development/tools/godot/headless.nix index 0ae28b774fb..a8d640eba1a 100644 --- a/pkgs/development/tools/godot/headless.nix +++ b/pkgs/development/tools/godot/headless.nix @@ -1,4 +1,4 @@ -{ godot, stdenv }: +{ godot, lib }: godot.overrideAttrs (oldAttrs: rec { pname = "godot-headless"; sconsFlags = "target=release_debug platform=server tools=yes"; @@ -14,5 +14,5 @@ godot.overrideAttrs (oldAttrs: rec { ''; meta.description = "Free and Open Source 2D and 3D game engine (headless build)"; - meta.maintainers = with stdenv.lib.maintainers; [ twey yusdacra ]; + meta.maintainers = with lib.maintainers; [ twey yusdacra ]; }) diff --git a/pkgs/development/tools/godot/server.nix b/pkgs/development/tools/godot/server.nix index 48f21b796c3..4254dc746b6 100644 --- a/pkgs/development/tools/godot/server.nix +++ b/pkgs/development/tools/godot/server.nix @@ -1,4 +1,4 @@ -{ godot, stdenv }: +{ godot, lib }: godot.overrideAttrs (oldAttrs: rec { pname = "godot-server"; sconsFlags = "target=release platform=server tools=no"; @@ -14,5 +14,5 @@ godot.overrideAttrs (oldAttrs: rec { ''; meta.description = "Free and Open Source 2D and 3D game engine (server build)"; - meta.maintainers = with stdenv.lib.maintainers; [ twey yusdacra ]; + meta.maintainers = with lib.maintainers; [ twey yusdacra ]; }) diff --git a/pkgs/development/tools/gofumpt/default.nix b/pkgs/development/tools/gofumpt/default.nix index 82ae3d4bb7b..e55cea0895b 100644 --- a/pkgs/development/tools/gofumpt/default.nix +++ b/pkgs/development/tools/gofumpt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gofumpt"; - version = "2020-10-27"; + version = "0.1.0"; src = fetchFromGitHub { owner = "mvdan"; repo = pname; - rev = "85d5401eb0f699d87b0d6c949dd4c0d5fb23f2e0"; - sha256 = "0n72d7p4y89kfilcdx3qb63qy6xm8dyp6q8s8954wrkm2wlhkwiy"; + rev = "v${version}"; + sha256 = "0xln0a5n8na3p6b7l8im3bh4ys5rr3k413ibzk8mnp471f5h1558"; }; - vendorSha256 = "1s546hp4ngzqvfx7dbd43k7b94z0mvndgdkndh4ypkkl3rpd9kkz"; + vendorSha256 = "05qdwz1icl8in0j94gx9pgplidm2v29hsn4kgg5gw35bsbn1c7id"; doCheck = false; diff --git a/pkgs/development/tools/gojsontoyaml/default.nix b/pkgs/development/tools/gojsontoyaml/default.nix index 0f772134a0e..0fd45598a83 100644 --- a/pkgs/development/tools/gojsontoyaml/default.nix +++ b/pkgs/development/tools/gojsontoyaml/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "gojsontoyaml"; diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index e91f8cfeb76..2e973e9a0b0 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.35.0"; + version = "1.36.0"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - sha256 = "03pg8qfysjdbpxzdcs4y5cn0gshr5k53p7rjqak7q8vdykva60s1"; + sha256 = "sha256-AObZI104q+kOvV3/6aAusl5PMro1nbNUasvmJ4mRGz8="; }; - vendorSha256 = "18dgx087jixwcfcab546qhy5qq1n1ahrsr7i7d7d3v9vklslics8"; + vendorSha256 = "sha256-jr8sYfonggAHqtq3A8YVuTqJu3/iIu0OgBEUWj6bq+A="; doCheck = false; diff --git a/pkgs/development/tools/golint/default.nix b/pkgs/development/tools/golint/default.nix index 284bb32f89e..89b9f146495 100644 --- a/pkgs/development/tools/golint/default.nix +++ b/pkgs/development/tools/golint/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "lint"; - version = "20181026-${stdenv.lib.strings.substring 0 7 rev}"; + version = "20181026-${lib.strings.substring 0 7 rev}"; rev = "c67002cb31c3a748b7688c27f20d8358b4193582"; goPackagePath = "golang.org/x/lint"; @@ -20,7 +20,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://golang.org"; description = "Linter for Go source code"; license = licenses.bsd3; diff --git a/pkgs/development/tools/gomacro/default.nix b/pkgs/development/tools/gomacro/default.nix new file mode 100644 index 00000000000..e96fccd0a3b --- /dev/null +++ b/pkgs/development/tools/gomacro/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "gomacro"; + rev = "b4c3ab9b218fd12f22759354f4f3e37635828d1f"; + version = "20210131-${lib.strings.substring 0 7 rev}"; + + src = fetchFromGitHub { + owner = "cosmos72"; + repo = "gomacro"; + sha256 = "0ci486zqrhzvs3njn2ygaxsgjx3fn8bbj2q3sd80xvjiyjvq866g"; + inherit rev; + }; + + vendorSha256 = "1ib4h57drikyy5aq4ms6vc1p29djlpjrh7xd3bgyykr9zmm2w1kx"; + subPackages = [ "." ]; + + meta = with lib; { + description = "Interactive Go interpreter and debugger with generics and macros"; + homepage = "https://github.com/cosmos72/gomacro"; + license = licenses.mpl20; + maintainers = with maintainers; [ shofius ]; + }; +} diff --git a/pkgs/development/tools/gomodifytags/default.nix b/pkgs/development/tools/gomodifytags/default.nix index 70bbc635cc1..254113f2106 100644 --- a/pkgs/development/tools/gomodifytags/default.nix +++ b/pkgs/development/tools/gomodifytags/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "gomodifytags"; @@ -18,7 +18,7 @@ buildGoModule rec { meta = { description = "Go tool to modify struct field tags"; homepage = "https://github.com/fatih/gomodifytags"; - maintainers = with stdenv.lib.maintainers; [ vdemeester ]; - license = stdenv.lib.licenses.bsd3; + maintainers = with lib.maintainers; [ vdemeester ]; + license = lib.licenses.bsd3; }; } diff --git a/pkgs/development/tools/gomplate/default.nix b/pkgs/development/tools/gomplate/default.nix index f8d6553f74d..45602a05352 100644 --- a/pkgs/development/tools/gomplate/default.nix +++ b/pkgs/development/tools/gomplate/default.nix @@ -1,18 +1,18 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "gomplate"; - version = "3.8.0"; + version = "3.9.0"; owner = "hairyhenderson"; rev = "v${version}"; src = fetchFromGitHub { inherit owner rev; repo = pname; - sha256 = "058shbrhpd8ghdj5qa6n7mf1bh8qvpmiv3yjj39jys359zhin06n"; + sha256 = "sha256-liy8cqn+hWoTOHchCY1LLu23tNvz7eGA+AN0d0APjC4="; }; - vendorSha256 = "0wqz3anxlzb0ds6xmpnaxq5rjgcmzkzrdqhnkfkjq32b7mj9mks3"; + vendorSha256 = "sha256-Ph9z/Tom7O7V7yZ/On+etty+Bl653HiY/J3d3yfweeQ="; # some tests require network access postPatch = '' diff --git a/pkgs/development/tools/google-app-engine-go-sdk/default.nix b/pkgs/development/tools/google-app-engine-go-sdk/default.nix index 485b2c3625f..4d572e070e7 100644 --- a/pkgs/development/tools/google-app-engine-go-sdk/default.nix +++ b/pkgs/development/tools/google-app-engine-go-sdk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, python3Packages, makeWrapper }: +{ lib, stdenv, fetchzip, python3Packages, makeWrapper }: with python3Packages; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Google App Engine SDK for Go"; version = version; homepage = "https://cloud.google.com/appengine/docs/go/"; diff --git a/pkgs/development/tools/gopkgs/default.nix b/pkgs/development/tools/gopkgs/default.nix index 8d26ca7eb44..a5413c6a9c0 100644 --- a/pkgs/development/tools/gopkgs/default.nix +++ b/pkgs/development/tools/gopkgs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "gopkgs"; @@ -20,7 +20,7 @@ buildGoModule rec { meta = { description = "Tool to get list available Go packages"; homepage = "https://github.com/uudashr/gopkgs"; - maintainers = with stdenv.lib.maintainers; [ vdemeester ]; - license = stdenv.lib.licenses.mit; + maintainers = with lib.maintainers; [ vdemeester ]; + license = lib.licenses.mit; }; } diff --git a/pkgs/development/tools/gopkgs/deps.nix b/pkgs/development/tools/gopkgs/deps.nix index 715c7bbbc82..e813a5b2256 100644 --- a/pkgs/development/tools/gopkgs/deps.nix +++ b/pkgs/development/tools/gopkgs/deps.nix @@ -18,4 +18,4 @@ sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; }; } -] \ No newline at end of file +] diff --git a/pkgs/development/tools/gopls/default.nix b/pkgs/development/tools/gopls/default.nix index 7a7c98e2894..1617900acee 100644 --- a/pkgs/development/tools/gopls/default.nix +++ b/pkgs/development/tools/gopls/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchgit }: +{ lib, buildGoModule, fetchgit }: buildGoModule rec { pname = "gopls"; diff --git a/pkgs/development/tools/gore/default.nix b/pkgs/development/tools/gore/default.nix index 0e0264f1522..43bb2d2aad7 100644 --- a/pkgs/development/tools/gore/default.nix +++ b/pkgs/development/tools/gore/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "gore"; - version = "0.5.0"; + version = "0.5.2"; src = fetchFromGitHub { owner = "motemen"; repo = pname; rev = "v${version}"; - sha256 = "61Hn3Vs4BZtAX8WNJlUeodvEWvwLo+lXKsc8JxRwOE4="; + sha256 = "sha256-oiaZvoCxA69slNb3LArLJfaqzfQ1YImxLuQHzW5tibo="; }; - vendorSha256 = "3bq6sRKS5dq7WCPpKGm2q5gFajthR3zhrTFGve9zXhY="; + vendorSha256 = "sha256-vJG7sc+ngagtrYvTwO3OrCSFUgAA7zhaXHkU97nIhcY="; doCheck = false; diff --git a/pkgs/development/tools/gosec/default.nix b/pkgs/development/tools/gosec/default.nix index 44862bb3311..bbc19894661 100644 --- a/pkgs/development/tools/gosec/default.nix +++ b/pkgs/development/tools/gosec/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "gosec"; - version = "2.5.0"; + version = "2.6.1"; subPackages = [ "cmd/gosec" ]; @@ -10,16 +10,16 @@ buildGoModule rec { owner = "securego"; repo = pname; rev = "v${version}"; - sha256 = "0hwa4sxw9sqzivg80nqsi9g1hz8apnnck73x5dvnn1zbwvycx3g9"; + sha256 = "sha256-KMXRYudnJab/X6FBG0lnG9hHVmbKwnrN1oqkSn6q3DU="; }; - vendorSha256 = "1lldi56kah689xf8n1hfpk9qy0gbci62xnjs5jrh54kbgka23gvw"; + vendorSha256 = "sha256-0yxGEUOame9yfeIErLESWY8kZtt7Q4vD3TU6Wl9Xa54="; doCheck = false; buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version} -X main.GitTag=${src.rev} -X main.BuildDate=unknown" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/securego/gosec"; description = "Golang security checker"; license = licenses.asl20; diff --git a/pkgs/development/tools/gotags/default.nix b/pkgs/development/tools/gotags/default.nix index 5499a22ec01..274f7a476c2 100644 --- a/pkgs/development/tools/gotags/default.nix +++ b/pkgs/development/tools/gotags/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "gotags"; - version = "20150803-${stdenv.lib.strings.substring 0 7 rev}"; + version = "20150803-${lib.strings.substring 0 7 rev}"; rev = "be986a34e20634775ac73e11a5b55916085c48e7"; goPackagePath = "github.com/jstemmer/gotags"; diff --git a/pkgs/development/tools/gotests/default.nix b/pkgs/development/tools/gotests/default.nix index 43f221bd324..faa2e60aca4 100644 --- a/pkgs/development/tools/gotests/default.nix +++ b/pkgs/development/tools/gotests/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gotests"; @@ -19,7 +19,7 @@ buildGoPackage rec { meta = { description = "Generate Go tests from your source code"; homepage = "https://github.com/cweill/gotests"; - maintainers = with stdenv.lib.maintainers; [ vdemeester ]; - license = stdenv.lib.licenses.asl20; + maintainers = with lib.maintainers; [ vdemeester ]; + license = lib.licenses.asl20; }; } diff --git a/pkgs/development/tools/gotestsum/default.nix b/pkgs/development/tools/gotestsum/default.nix index 3e3ae19a382..435edd61623 100644 --- a/pkgs/development/tools/gotestsum/default.nix +++ b/pkgs/development/tools/gotestsum/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "gotestsum"; - version = "0.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "gotestyourself"; repo = "gotestsum"; rev = "v${version}"; - sha256 = "0w0s2qvwnb69s18gvkkbwsx9zh7yi8ksnnrfpl8az8sybk6m1iaz"; + sha256 = "sha256-eJxrdR3JYqF+GexcwnyHV4xO75stEDNFzxDtky7PVc8="; }; - vendorSha256 = "09cifc69z1ashjw1mqgbi0gh90h2sypqyl0jswxxcqk89ibgy3am"; + vendorSha256 = "sha256-VQ3/VkxoYtY71xJQj6/XAoIEH4jr4Rq4hFqFnwxzkSU="; doCheck = false; diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix index 2e13f67e9f7..285d546d742 100644 --- a/pkgs/development/tools/gotools/default.nix +++ b/pkgs/development/tools/gotools/default.nix @@ -1,14 +1,14 @@ -{ stdenv, buildGoModule, fetchgit }: +{ lib, buildGoModule, fetchgit }: buildGoModule rec { pname = "gotools-unstable"; - version = "2020-10-27"; - rev = "eafbe7b904eb2418efc832e36ac634dc09084f10"; + version = "2021-01-13"; + rev = "8b4aab62c064010e8e875d2e5a8e63a96fefc87d"; src = fetchgit { inherit rev; url = "https://go.googlesource.com/tools"; - sha256 = "0884znfbm44f4ddjkm0g7qg2a257kwzv1ismd2m225f3c69n3mdg"; + sha256 = "1cmnm9fl2a6hiplj8s6x0l3czcw4xh3j3lvzbgccnp1l8kz8q2vm"; }; # The gopls folder contains a Go submodule which causes a build failure. @@ -40,7 +40,7 @@ buildGoModule rec { ''; excludedPackages = "\\(" - + stdenv.lib.concatStringsSep "\\|" ([ "testdata" "vet" "cover" ]) + + lib.concatStringsSep "\\|" ([ "testdata" "vet" "cover" ]) + "\\)"; # Set GOTOOLDIR for derivations adding this to buildInputs diff --git a/pkgs/development/tools/govendor/default.nix b/pkgs/development/tools/govendor/default.nix index 804a9bf043e..b24afebb3aa 100644 --- a/pkgs/development/tools/govendor/default.nix +++ b/pkgs/development/tools/govendor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "govendor"; @@ -13,7 +13,7 @@ buildGoPackage rec { sha256 = "0g02cd25chyijg0rzab4xr627pkvk5k33mscd6r0gf1v5xvadcfq"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/kardianos/govendor"; description = "Go vendor tool that works with the standard vendor file"; license = licenses.bsd3; diff --git a/pkgs/development/tools/govers/default.nix b/pkgs/development/tools/govers/default.nix index ebce368ea9f..5e2d89cfd5d 100644 --- a/pkgs/development/tools/govers/default.nix +++ b/pkgs/development/tools/govers/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "govers"; - version = "20160623-${stdenv.lib.strings.substring 0 7 rev}"; + version = "20160623-${lib.strings.substring 0 7 rev}"; rev = "77fd787551fc5e7ae30696e009e334d52d2d3a43"; goPackagePath = "github.com/rogpeppe/govers"; diff --git a/pkgs/development/tools/gox/default.nix b/pkgs/development/tools/gox/default.nix index 34e7d338318..4aa7a314c87 100644 --- a/pkgs/development/tools/gox/default.nix +++ b/pkgs/development/tools/gox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gox"; @@ -13,7 +13,7 @@ buildGoPackage rec { sha256 = "0mkh81hd7kn45dz7b6yhzqsg2mvg1g6pwx89jjigxrnqhyg9vrl7"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mitchellh/gox"; description = "A dead simple, no frills Go cross compile tool"; license = licenses.mpl20; diff --git a/pkgs/development/tools/gpp/default.nix b/pkgs/development/tools/gpp/default.nix index ee15df1a9f6..9e49b0c0284 100644 --- a/pkgs/development/tools/gpp/default.nix +++ b/pkgs/development/tools/gpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation { pname = "gpp"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { installCheckPhase = "$out/bin/gpp --help"; doInstallCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "General-purpose preprocessor with customizable syntax"; homepage = "https://logological.org/gpp"; license = licenses.lgpl3; diff --git a/pkgs/development/tools/gron/default.nix b/pkgs/development/tools/gron/default.nix index e0d2d3d1498..f486bc95bc1 100644 --- a/pkgs/development/tools/gron/default.nix +++ b/pkgs/development/tools/gron/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gron"; @@ -16,7 +16,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - meta = with stdenv.lib; { + meta = with lib; { description = "Make JSON greppable!"; longDescription = '' gron transforms JSON into discrete assignments to make it easier to grep diff --git a/pkgs/development/tools/gtk-mac-bundler/default.nix b/pkgs/development/tools/gtk-mac-bundler/default.nix index df21f414ecb..c4ac76f4612 100644 --- a/pkgs/development/tools/gtk-mac-bundler/default.nix +++ b/pkgs/development/tools/gtk-mac-bundler/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; installPhase = '' - mkdir -p $out/bin + mkdir -p $out/bin substitute gtk-mac-bundler.in $out/bin/gtk-mac-bundler \ --subst-var-by PATH $out/share chmod a+x $out/bin/gtk-mac-bundler diff --git a/pkgs/development/tools/guile/g-wrap/default.nix b/pkgs/development/tools/guile/g-wrap/default.nix index 15233979e15..6bb80306e68 100644 --- a/pkgs/development/tools/guile/g-wrap/default.nix +++ b/pkgs/development/tools/guile/g-wrap/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, guile, guile-lib, libffi, pkgconfig, glib }: +{ fetchurl, lib, stdenv, guile, guile-lib, libffi, pkg-config, glib }: stdenv.mkDerivation rec { pname = "g-wrap"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0ak0bha37dfpj9kmyw1r8fj8nva639aw5xr66wr5gd3l1rqf5xhg"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; # Note: Glib support is optional, but it's quite useful (e.g., it's used by # Guile-GNOME). @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A wrapper generator for Guile"; longDescription = '' G-Wrap is a tool (and Guile library) for generating function wrappers for diff --git a/pkgs/development/tools/guile/guile-lint/default.nix b/pkgs/development/tools/guile/guile-lint/default.nix index b8efb30f5f1..6de9e48ae66 100644 --- a/pkgs/development/tools/guile/guile-lint/default.nix +++ b/pkgs/development/tools/guile/guile-lint/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, guile }: +{ lib, stdenv, fetchurl, guile }: stdenv.mkDerivation rec { pname = "guile-lint"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isDarwin; - meta = with stdenv.lib; { + meta = with lib; { description = "Checks syntax and semantics in a Guile program or module"; homepage = "https://user42.tuxfamily.org/guile-lint/index.html"; license = licenses.gpl3Plus; diff --git a/pkgs/development/tools/halfempty/default.nix b/pkgs/development/tools/halfempty/default.nix index c8c267f9187..5b96d338f52 100644 --- a/pkgs/development/tools/halfempty/default.nix +++ b/pkgs/development/tools/halfempty/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, glib, util-linux, scowl }: +{ lib, stdenv, fetchFromGitHub, pkg-config, glib, util-linux, scowl }: stdenv.mkDerivation rec { pname = "halfempty"; - version = "0.30"; + version = "0.40"; src = fetchFromGitHub { owner = "googleprojectzero"; repo = pname; rev = "v${version}"; - sha256 = "0838pw0ccjvlxmjygzrnppz1fx1a10vjzdgjbxgb4wgpqjr8v6vc"; + sha256 = "sha256-YGq6fneAMo2jCpLPrjzRJ0eeOsStKaK5L+lwQfqcfpY="; }; - nativeBuildInputs = [ pkgconfig util-linux ]; + nativeBuildInputs = [ pkg-config util-linux ]; buildInputs = [ glib ]; enableParallelBuilding = true; diff --git a/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix b/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix index 4d7dca12f8f..b857b910f0a 100644 --- a/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix +++ b/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix @@ -1,5 +1,5 @@ { mkDerivation, base, containers, fetchgit, hedgehog -, optparse-applicative, parsec, stdenv, template-haskell, text +, optparse-applicative, parsec, lib, template-haskell, text }: mkDerivation { pname = "dconf2nix"; @@ -20,5 +20,5 @@ mkDerivation { base containers hedgehog parsec template-haskell text ]; description = "Convert dconf files to Nix, as expected by Home Manager"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; } diff --git a/pkgs/development/tools/haskell/haskell-language-server/default.nix b/pkgs/development/tools/haskell/haskell-language-server/default.nix index 44cd234da72..71b6355db58 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/default.nix +++ b/pkgs/development/tools/haskell/haskell-language-server/default.nix @@ -7,7 +7,7 @@ , hls-tactics-plugin, hslogger, hspec, hspec-core , hspec-expectations, lens, lsp-test, mtl, optparse-applicative , optparse-simple, ormolu, process, regex-tdfa, safe-exceptions -, shake, stdenv, stm, stylish-haskell, tasty, tasty-ant-xml +, shake, lib, stm, stylish-haskell, tasty, tasty-ant-xml , tasty-expected-failure, tasty-golden, tasty-hunit, tasty-rerun , temporary, text, transformers, unordered-containers, with-utf8 , yaml @@ -49,5 +49,5 @@ mkDerivation { testToolDepends = [ ghcide ]; homepage = "https://github.com/haskell/haskell-language-server#readme"; description = "LSP server for GHC"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; } diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-class-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-class-plugin.nix index 86c29c7be39..b757dc8c9e8 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/hls-class-plugin.nix +++ b/pkgs/development/tools/haskell/haskell-language-server/hls-class-plugin.nix @@ -1,6 +1,6 @@ { mkDerivation, aeson, base, containers, fetchgit, ghc , ghc-exactprint, ghcide, haskell-lsp, hls-plugin-api, lens, shake -, stdenv, text, transformers, unordered-containers +, lib, text, transformers, unordered-containers }: mkDerivation { pname = "hls-class-plugin"; @@ -17,5 +17,5 @@ mkDerivation { hls-plugin-api lens shake text transformers unordered-containers ]; description = "Explicit imports plugin for Haskell Language Server"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; } diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-eval-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-eval-plugin.nix index 20ebc5f5e89..2677b45a591 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/hls-eval-plugin.nix +++ b/pkgs/development/tools/haskell/haskell-language-server/hls-eval-plugin.nix @@ -2,7 +2,7 @@ , extra, fetchgit, filepath, ghc, ghc-boot-th, ghc-paths, ghcide , hashable, haskell-lsp, haskell-lsp-types, hls-plugin-api , parser-combinators, pretty-simple, QuickCheck, safe-exceptions -, shake, stdenv, temporary, text, time, transformers +, shake, lib, temporary, text, time, transformers , unordered-containers }: mkDerivation { @@ -23,5 +23,5 @@ mkDerivation { unordered-containers ]; description = "Eval plugin for Haskell Language Server"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; } diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix index bad0e82194c..8207b5181ba 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix +++ b/pkgs/development/tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix @@ -1,5 +1,5 @@ { mkDerivation, aeson, base, containers, deepseq, fetchgit, ghc -, ghcide, haskell-lsp-types, hls-plugin-api, shake, stdenv, text +, ghcide, haskell-lsp-types, hls-plugin-api, shake, lib, text , unordered-containers }: mkDerivation { @@ -17,5 +17,5 @@ mkDerivation { hls-plugin-api shake text unordered-containers ]; description = "Explicit imports plugin for Haskell Language Server"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; } diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix index ecbe141fd72..02e314cba3a 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix +++ b/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix @@ -2,7 +2,7 @@ , containers, data-default, deepseq, Diff, directory, extra , fetchgit, filepath, ghc, ghc-lib, ghc-lib-parser-ex, ghcide , hashable, haskell-lsp, hlint, hls-plugin-api, hslogger, lens -, regex-tdfa, shake, stdenv, temporary, text, transformers +, regex-tdfa, shake, lib, temporary, text, transformers , unordered-containers }: mkDerivation { @@ -22,5 +22,5 @@ mkDerivation { regex-tdfa shake temporary text transformers unordered-containers ]; description = "Hlint integration plugin with Haskell Language Server"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; } diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-retrie-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-retrie-plugin.nix index 5a769e7a719..cca8acb8819 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/hls-retrie-plugin.nix +++ b/pkgs/development/tools/haskell/haskell-language-server/hls-retrie-plugin.nix @@ -1,6 +1,6 @@ { mkDerivation, aeson, base, containers, deepseq, directory, extra , fetchgit, ghc, ghcide, hashable, haskell-lsp, haskell-lsp-types -, hls-plugin-api, retrie, safe-exceptions, shake, stdenv, text +, hls-plugin-api, retrie, safe-exceptions, shake, lib, text , transformers, unordered-containers }: mkDerivation { @@ -19,5 +19,5 @@ mkDerivation { shake text transformers unordered-containers ]; description = "Retrie integration plugin for Haskell Language Server"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; } diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix index b5819b705b6..369ce0e27b8 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix +++ b/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix @@ -2,7 +2,7 @@ , directory, extra, fetchgit, filepath, fingertree, generic-lens , ghc, ghc-boot-th, ghc-exactprint, ghc-source-gen, ghcide , haskell-lsp, hie-bios, hls-plugin-api, hspec, hspec-discover -, lens, mtl, QuickCheck, refinery, retrie, shake, stdenv, syb, text +, lens, mtl, QuickCheck, refinery, retrie, shake, lib, syb, text , transformers }: mkDerivation { @@ -28,5 +28,5 @@ mkDerivation { testToolDepends = [ hspec-discover ]; description = "Tactics plugin for Haskell Language Server"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; } diff --git a/pkgs/development/tools/haskell/hyper-haskell/default.nix b/pkgs/development/tools/haskell/hyper-haskell/default.nix index df889d43d46..6b139904616 100644 --- a/pkgs/development/tools/haskell/hyper-haskell/default.nix +++ b/pkgs/development/tools/haskell/hyper-haskell/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, jshon, electron_3 +{ lib, stdenv, fetchFromGitHub, jshon, electron_3 , runtimeShell, hyper-haskell-server, extra-packages ? [] }: let - binPath = stdenv.lib.makeBinPath ([ hyper-haskell-server ] ++ extra-packages); + binPath = lib.makeBinPath ([ hyper-haskell-server ] ++ extra-packages); electron = electron_3; in stdenv.mkDerivation rec { pname = "hyper-haskell"; @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { chmod 755 $out/bin/hyper-haskell ''; - meta = with stdenv.lib; { + meta = with lib; { description = "The strongly hyped graphical interpreter for the Haskell programming language"; homepage = "https://github.com/HeinrichApfelmus/hyper-haskell"; license = licenses.bsd3; diff --git a/pkgs/development/tools/haskell/ihaskell/wrapper.nix b/pkgs/development/tools/haskell/ihaskell/wrapper.nix index 60f8c2ecb25..875d5a8a4a8 100644 --- a/pkgs/development/tools/haskell/ihaskell/wrapper.nix +++ b/pkgs/development/tools/haskell/ihaskell/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, writeScriptBin, makeWrapper, buildEnv, haskell, ghcWithPackages, jupyter, packages }: +{ lib, stdenv, writeScriptBin, makeWrapper, buildEnv, haskell, ghcWithPackages, jupyter, packages }: let ihaskellEnv = ghcWithPackages (self: [ self.ihaskell @@ -9,7 +9,7 @@ let ihaskellSh = writeScriptBin "ihaskell-notebook" '' #! ${stdenv.shell} export GHC_PACKAGE_PATH="$(echo ${ihaskellEnv}/lib/*/package.conf.d| tr ' ' ':'):$GHC_PACKAGE_PATH" - export PATH="${stdenv.lib.makeBinPath ([ ihaskellEnv jupyter ])}''${PATH:+:}$PATH" + export PATH="${lib.makeBinPath ([ ihaskellEnv jupyter ])}''${PATH:+:}$PATH" ${ihaskellEnv}/bin/ihaskell install -l $(${ihaskellEnv}/bin/ghc --print-libdir) && ${jupyter}/bin/jupyter notebook ''; in diff --git a/pkgs/development/tools/haskell/vaultenv/default.nix b/pkgs/development/tools/haskell/vaultenv/default.nix index 1d901cb723c..8c817e8eeef 100644 --- a/pkgs/development/tools/haskell/vaultenv/default.nix +++ b/pkgs/development/tools/haskell/vaultenv/default.nix @@ -1,7 +1,7 @@ { mkDerivation, async, base, bytestring, connection, containers , directory, hpack, hspec, hspec-discover, hspec-expectations , http-client, http-conduit, lens, lens-aeson, megaparsec, mtl -, optparse-applicative, parser-combinators, retry, stdenv, text +, optparse-applicative, parser-combinators, retry, lib, text , unix, unordered-containers, utf8-string, fetchzip, dotenv }: mkDerivation rec { @@ -37,6 +37,6 @@ mkDerivation rec { preConfigure = "hpack"; homepage = "https://github.com/channable/vaultenv#readme"; description = "Runs processes with secrets from HashiCorp Vault"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ lnl7 manveru ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ lnl7 manveru ]; } diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix index edaaa9c3a68..3e6ef4d4d34 100644 --- a/pkgs/development/tools/hcloud/default.nix +++ b/pkgs/development/tools/hcloud/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "hcloud"; @@ -29,7 +29,7 @@ buildGoModule rec { meta = { description = "A command-line interface for Hetzner Cloud, a provider for cloud virtual private servers"; homepage = "https://github.com/hetznercloud/cli"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.zauberpony ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.zauberpony ]; }; } diff --git a/pkgs/development/tools/heroku/default.nix b/pkgs/development/tools/heroku/default.nix index e1aee1e28ca..81c059d2939 100644 --- a/pkgs/development/tools/heroku/default.nix +++ b/pkgs/development/tools/heroku/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "heroku"; - version = "7.45.0"; + version = "7.47.11"; src = fetchurl { url = "https://cli-assets.heroku.com/heroku-v${version}/heroku-v${version}.tar.xz"; - sha256 = "0yxwy7ldi4r7r03a9ay7ikawfwa11x7lvldjskm7nl4a1g4i3jqi"; + sha256 = "1inf2radpkd9jndap91cw0wbb2qmi71i287vyydl492372cf3cs2"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/hexio/default.nix b/pkgs/development/tools/hexio/default.nix index 116e7c3a5ce..5b3fca815e6 100644 --- a/pkgs/development/tools/hexio/default.nix +++ b/pkgs/development/tools/hexio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python, pcsclite, pth }: +{ lib, stdenv, fetchFromGitHub, python, pcsclite, pth }: stdenv.mkDerivation rec { pname = "hexio"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { patchPhase = '' substituteInPlace Makefile \ - --replace '-I/usr/local/include/PCSC/' '-I${stdenv.lib.getDev pcsclite}/include/PCSC/' \ + --replace '-I/usr/local/include/PCSC/' '-I${lib.getDev pcsclite}/include/PCSC/' \ --replace '-L/usr/local/lib/pth' '-I${pth}/lib/' ''; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { make DESTDIR=$out PREFIX=/ install ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Low-level I/O helpers for hexadecimal, tty/serial devices and so on"; homepage = "https://github.com/vanrein/hexio"; license = licenses.bsd2; diff --git a/pkgs/development/tools/htmltest/default.nix b/pkgs/development/tools/htmltest/default.nix new file mode 100644 index 00000000000..83d436dda08 --- /dev/null +++ b/pkgs/development/tools/htmltest/default.nix @@ -0,0 +1,32 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "htmltest"; + version = "0.14.0"; + + src = fetchFromGitHub { + owner = "wjdp"; + repo = pname; + rev = "v${version}"; + sha256 = "0z2j54ywim1nl10vidcnbwhywyzanj4qd93ai533808wrm3ghwb6"; + }; + + vendorSha256 = "0zx3ii9crick647kslzwg4d39li6jds938f9j9dp287rhrlzjfbm"; + + # tests require network access + doCheck = false; + + meta = with lib; { + description = "Tool to test generated HTML output"; + longDescription = '' + htmltest runs your HTML output through a series of checks to ensure all your + links, images, scripts references work, your alt tags are filled in, etc. + ''; + homepage = "https://github.com/wjdp/htmltest"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/tools/iaca/2.1.nix b/pkgs/development/tools/iaca/2.1.nix index f36e2e48fdf..6170cbb4318 100644 --- a/pkgs/development/tools/iaca/2.1.nix +++ b/pkgs/development/tools/iaca/2.1.nix @@ -1,5 +1,5 @@ -{ stdenv, makeWrapper, requireFile, gcc, unzip }: -with stdenv.lib; +{ lib, stdenv, makeWrapper, requireFile, gcc, unzip }: +with lib; # v2.1: last version with NHM/WSM arch support stdenv.mkDerivation { @@ -22,7 +22,7 @@ stdenv.mkDerivation { --set-rpath $out/lib:"${libPath}" \ $out/bin/iaca ''; - postFixup = ''wrapProgram $out/bin/iaca --set LD_LIBRARY_PATH $out/lib''; + postFixup = "wrapProgram $out/bin/iaca --set LD_LIBRARY_PATH $out/lib"; meta = { description = "Intel Architecture Code Analyzer"; homepage = "https://software.intel.com/en-us/articles/intel-architecture-code-analyzer/"; diff --git a/pkgs/development/tools/iaca/3.0.nix b/pkgs/development/tools/iaca/3.0.nix index f03f5354422..731b6431717 100644 --- a/pkgs/development/tools/iaca/3.0.nix +++ b/pkgs/development/tools/iaca/3.0.nix @@ -1,5 +1,5 @@ -{ stdenv, requireFile, unzip }: -with stdenv.lib; +{ lib, stdenv, requireFile, unzip }: +with lib; stdenv.mkDerivation { name = "iaca-3.0"; diff --git a/pkgs/development/tools/icestorm/default.nix b/pkgs/development/tools/icestorm/default.nix index feaea18be18..2644821529b 100644 --- a/pkgs/development/tools/icestorm/default.nix +++ b/pkgs/development/tools/icestorm/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub -, pkgconfig, libftdi1 +{ lib, stdenv, fetchFromGitHub +, pkg-config, libftdi1 , python3, pypy3 # PyPy yields large improvements in build time and runtime performance, and @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { sha256 = "0vxhqs2fampglg3xlfwb35229iv96kvlwp1gyxrdrmlpznhkqdrk"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ passthru.pythonPkg libftdi1 ]; makeFlags = [ "PREFIX=$(out)" ]; @@ -63,8 +63,8 @@ stdenv.mkDerivation rec { creating bitstream files. ''; homepage = "http://www.clifford.at/icestorm/"; - license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ shell thoughtpolice emily ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ shell thoughtpolice emily ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/tools/icr/default.nix b/pkgs/development/tools/icr/default.nix index 50a349d8ff7..11e52f77cb8 100644 --- a/pkgs/development/tools/icr/default.nix +++ b/pkgs/development/tools/icr/default.nix @@ -1,22 +1,32 @@ -{ stdenv, lib, fetchFromGitHub, crystal, shards, makeWrapper, pkgconfig, which -, openssl, readline, libyaml, zlib }: +{ lib +, fetchFromGitHub +, crystal +, shards +, makeWrapper +, pkg-config +, which +, openssl +, readline +, libyaml +, zlib +}: crystal.buildCrystalPackage rec { pname = "icr"; - version = "0.8.0"; + version = "unstable-2020-10-06"; src = fetchFromGitHub { owner = "crystal-community"; - repo = pname; - rev = "v${version}"; - sha256 = "1bz2bhs6csyg2rhrlknlvaiilq3vq8plxjh1hdxmbrfi3n6c7k5a"; + repo = "icr"; + rev = "8c57cd7c1fdf8088cb05c1587bd6c40d244a8a80"; + sha256 = "sha256-b0w6oG2npNgdi2ZowMlJy0iUxQWqb9+DiruQl7Ztb0E="; }; shardsFile = ./shards.nix; buildInputs = [ libyaml openssl readline zlib ]; - nativeBuildInputs = [ makeWrapper pkgconfig which ]; + nativeBuildInputs = [ makeWrapper pkg-config which ]; # tests are failing due to our sandbox doCheck = false; @@ -26,7 +36,7 @@ crystal.buildCrystalPackage rec { --prefix PATH : ${lib.makeBinPath [ crystal shards makeWrapper which ]} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Interactive console for the Crystal programming language"; homepage = "https://github.com/crystal-community/icr"; license = licenses.mit; diff --git a/pkgs/development/tools/ijq/default.nix b/pkgs/development/tools/ijq/default.nix new file mode 100644 index 00000000000..0b0af79301e --- /dev/null +++ b/pkgs/development/tools/ijq/default.nix @@ -0,0 +1,28 @@ +{ buildGoModule, fetchgit, lib, jq, makeWrapper }: + +buildGoModule rec { + pname = "ijq"; + version = "0.2.3"; + + src = fetchgit { + url = "https://git.sr.ht/~gpanders/ijq"; + rev = "v${version}"; + sha256 = "14n54jh5387jf97zhc7aidn7w60zp5624xbvq4jdbsh96apg3bk1"; + }; + + vendorSha256 = "0xbni6lk6y3ig7pj2234fv7ra6b8qv0k8m3bvh59wwans8xpihzb"; + + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram "$out/bin/ijq" \ + --prefix PATH : "${lib.makeBinPath [ jq ]}" + ''; + + meta = with lib; { + description = "Interactive wrapper for jq"; + homepage = "https://git.sr.ht/~gpanders/ijq"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ justinas ]; + }; +} diff --git a/pkgs/development/tools/imatix_gsl/default.nix b/pkgs/development/tools/imatix_gsl/default.nix index edba0d686db..ad729923d67 100644 --- a/pkgs/development/tools/imatix_gsl/default.nix +++ b/pkgs/development/tools/imatix_gsl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pcre } : +{ lib, stdenv, fetchFromGitHub, pcre } : stdenv.mkDerivation { pname = "imatix_gsl"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { preBuild = "cd src"; installFlags = [ "DESTDIR=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { license = licenses.gpl3Plus; homepage = "https://github.com/imatix/gsl/"; description = "A universal code generator"; diff --git a/pkgs/development/tools/ineffassign/default.nix b/pkgs/development/tools/ineffassign/default.nix index 85c643537af..21580957752 100644 --- a/pkgs/development/tools/ineffassign/default.nix +++ b/pkgs/development/tools/ineffassign/default.nix @@ -6,10 +6,10 @@ buildGoPackage rec { pname = "ineffassign-unstable"; version = "2018-09-09"; - rev = "1003c8bd00dc2869cb5ca5282e6ce33834fed514"; + rev = "1003c8bd00dc2869cb5ca5282e6ce33834fed514"; goPackagePath = "github.com/gordonklaus/ineffassign"; - excludedPackages = ''testdata''; + excludedPackages = "testdata"; src = fetchFromGitHub { inherit rev; diff --git a/pkgs/development/tools/interfacer/default.nix b/pkgs/development/tools/interfacer/default.nix index b7f568f4d2b..4358ee24489 100644 --- a/pkgs/development/tools/interfacer/default.nix +++ b/pkgs/development/tools/interfacer/default.nix @@ -9,7 +9,7 @@ buildGoPackage rec { rev = "c20040233aedb03da82d460eca6130fcd91c629a"; goPackagePath = "mvdan.cc/interfacer"; - excludedPackages = ''check/testdata''; + excludedPackages = "check/testdata"; src = fetchFromGitHub { inherit rev; diff --git a/pkgs/development/tools/irony-server/default.nix b/pkgs/development/tools/irony-server/default.nix index cc56b27ca2d..2f8afb176e6 100644 --- a/pkgs/development/tools/irony-server/default.nix +++ b/pkgs/development/tools/irony-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, llvmPackages, irony }: +{ lib, stdenv, cmake, llvmPackages, irony }: stdenv.mkDerivation { pname = "irony-server"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { "-DCMAKE_PREFIX_PATH=${llvmPackages.clang-unwrapped}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "The server part of irony"; homepage = "https://melpa.org/#/irony"; maintainers = [ maintainers.deepfire ]; diff --git a/pkgs/development/tools/java/cfr/default.nix b/pkgs/development/tools/java/cfr/default.nix index ce1501fa4dd..35ac0dbc6a5 100644 --- a/pkgs/development/tools/java/cfr/default.nix +++ b/pkgs/development/tools/java/cfr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, fetchurl, jre }: +{ lib, stdenv, makeWrapper, fetchurl, jre }: stdenv.mkDerivation rec { pname = "cfr"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { makeWrapper ${jre}/bin/java $out/bin/cfr --add-flags "-jar $jar" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Another java decompiler"; longDescription = '' CFR will decompile modern Java features - Java 8 lambdas (pre and post diff --git a/pkgs/development/tools/java/dex2jar/default.nix b/pkgs/development/tools/java/dex2jar/default.nix index c1f7f132985..b20a80355a0 100644 --- a/pkgs/development/tools/java/dex2jar/default.nix +++ b/pkgs/development/tools/java/dex2jar/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://sourceforge.net/projects/dex2jar/; description = "Tools to work with android .dex and java .class files"; maintainers = with maintainers; [ makefu ]; diff --git a/pkgs/development/tools/java/fastjar/default.nix b/pkgs/development/tools/java/fastjar/default.nix index 04fe7c2f46d..52211e302dd 100644 --- a/pkgs/development/tools/java/fastjar/default.nix +++ b/pkgs/development/tools/java/fastjar/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, zlib }: +{ fetchurl, lib, stdenv, zlib }: let version = "0.98"; in stdenv.mkDerivation { @@ -25,8 +25,8 @@ let version = "0.98"; in homepage = "https://savannah.nongnu.org/projects/fastjar/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; maintainers = [ ]; }; } diff --git a/pkgs/development/tools/java/jhiccup/default.nix b/pkgs/development/tools/java/jhiccup/default.nix index 1b235e35485..c2d1a33a49d 100644 --- a/pkgs/development/tools/java/jhiccup/default.nix +++ b/pkgs/development/tools/java/jhiccup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: stdenv.mkDerivation rec { pname = "jhiccup"; @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { meta = { description = "Measure JVM application stalls and GC pauses"; homepage = "https://www.azul.com/jhiccup/"; - license = stdenv.lib.licenses.cc0; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; + license = lib.licenses.cc0; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ thoughtpolice ]; }; } diff --git a/pkgs/development/tools/java/visualvm/default.nix b/pkgs/development/tools/java/visualvm/default.nix index 4c0ec3bc29d..52ccc3d9150 100644 --- a/pkgs/development/tools/java/visualvm/default.nix +++ b/pkgs/development/tools/java/visualvm/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { cp -r . $out ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A visual interface for viewing information about Java applications"; longDescription = '' VisualVM is a visual tool integrating several commandline JDK diff --git a/pkgs/development/tools/jazzy/gemset.nix b/pkgs/development/tools/jazzy/gemset.nix index aa4492560b8..6e2b873d4fd 100644 --- a/pkgs/development/tools/jazzy/gemset.nix +++ b/pkgs/development/tools/jazzy/gemset.nix @@ -431,4 +431,4 @@ }; version = "1.17.1"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/jbake/default.nix b/pkgs/development/tools/jbake/default.nix index 44d537f9762..97d1c753682 100644 --- a/pkgs/development/tools/jbake/default.nix +++ b/pkgs/development/tools/jbake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, makeWrapper, jre }: +{ lib, stdenv, fetchzip, makeWrapper, jre }: stdenv.mkDerivation rec { version = "2.6.5"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Java based, open source, static site/blog generator for developers & designers"; homepage = "https://jbake.org/"; license = licenses.mit; diff --git a/pkgs/development/tools/jbang/default.nix b/pkgs/development/tools/jbang/default.nix index a9ba82e53f6..6bbf086749c 100644 --- a/pkgs/development/tools/jbang/default.nix +++ b/pkgs/development/tools/jbang/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }: stdenv.mkDerivation rec { - version = "0.58.0"; + version = "0.63.0"; pname = "jbang"; src = fetchzip { url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar"; - sha256 = "sha256:08haij8nzzf2759ddzx0i6808g2if0v2fc21mlz00kmggjc03xz3"; + sha256 = "sha256-g3ARa69FvCfs8a3vbQuse8JvRlPXT6ysfmvZAUYnnA4="; }; nativeBuildInputs = [ makeWrapper ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { $out/bin/jbang --version 2>&1 | grep -q "${version}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Run java as scripts anywhere"; longDescription = '' jbang uses the java language to build scripts similar to groovy scripts. Dependencies are automatically diff --git a/pkgs/development/tools/jd/default.nix b/pkgs/development/tools/jd/default.nix index b03fd7a0028..96d2807b9ab 100644 --- a/pkgs/development/tools/jd/default.nix +++ b/pkgs/development/tools/jd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "jd"; @@ -13,7 +13,7 @@ buildGoPackage rec { sha256 = "0dj4k38pf80dl77jns29vx2dj265s4ksg2q2s9n240b7b8z8mn5h"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Interactive JSON Editor"; license = licenses.mit; maintainers = [ maintainers.np ]; diff --git a/pkgs/development/tools/jid/default.nix b/pkgs/development/tools/jid/default.nix index e6eef68ec6c..b48de54dd22 100644 --- a/pkgs/development/tools/jid/default.nix +++ b/pkgs/development/tools/jid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "jid"; @@ -18,7 +18,7 @@ buildGoPackage rec { meta = { description = "A command-line tool to incrementally drill down JSON"; homepage = "https://github.com/simeji/jid"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ stesie ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ stesie ]; }; } diff --git a/pkgs/development/tools/jira_cli/default.nix b/pkgs/development/tools/jira_cli/default.nix index 4040debf15e..cf15a61477e 100644 --- a/pkgs/development/tools/jira_cli/default.nix +++ b/pkgs/development/tools/jira_cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, libffi, openssl, python3Packages }: +{ lib, libffi, openssl, python3Packages }: let inherit (python3Packages) fetchPypi buildPythonApplication vcrpy mock hiro; in @@ -23,7 +23,7 @@ in jira keyrings-alt ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A command line interface to Jira"; homepage = "https://github.com/alisaifee/jira-cli"; maintainers = with maintainers; [ nyarly ]; diff --git a/pkgs/development/tools/jl/default.nix b/pkgs/development/tools/jl/default.nix index 9a1314a6083..15347432f70 100644 --- a/pkgs/development/tools/jl/default.nix +++ b/pkgs/development/tools/jl/default.nix @@ -1,6 +1,6 @@ { mkDerivation, fetchFromGitHub, fetchpatch , aeson, aeson-pretty, attoparsec, base, bytestring, conduit, conduit-extra -, containers, exceptions, mtl, optparse-simple, parsec, scientific, stdenv +, containers, exceptions, mtl, optparse-simple, parsec, scientific, lib , text, unordered-containers, vector }: mkDerivation rec { @@ -30,8 +30,8 @@ mkDerivation rec { aeson aeson-pretty base bytestring conduit conduit-extra containers mtl optparse-simple text vector ]; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; description = "Functional sed for JSON"; - maintainers = with stdenv.lib.maintainers; [ fgaz ]; + maintainers = with lib.maintainers; [ fgaz ]; homepage = "https://github.com/chrisdone/jl"; } diff --git a/pkgs/development/tools/jmespath/default.nix b/pkgs/development/tools/jmespath/default.nix index 5414c51a00c..5abbf71e7f4 100644 --- a/pkgs/development/tools/jmespath/default.nix +++ b/pkgs/development/tools/jmespath/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "jmespath"; @@ -13,7 +13,7 @@ buildGoPackage rec { repo = "go-jmespath"; sha256 = "0f4j0m44limnjd6q5fk152g6jq2a5cshcdms4p3a1br8pl9wp5fb"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A JMESPath implementation in Go"; homepage = "https://github.com/jmespath/go-jmespath"; maintainers = with maintainers; [ cransom ]; diff --git a/pkgs/development/tools/jo/default.nix b/pkgs/development/tools/jo/default.nix index 8592e38de7f..653867956ff 100644 --- a/pkgs/development/tools/jo/default.nix +++ b/pkgs/development/tools/jo/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, autoreconfHook, pandoc, pkgconfig}: +{lib, stdenv, fetchFromGitHub, autoreconfHook, pandoc, pkg-config}: stdenv.mkDerivation rec { pname = "jo"; @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ autoreconfHook pandoc pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pandoc pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A small utility to create JSON objects"; homepage = "https://github.com/jpmens/jo"; license = licenses.gpl2Plus; diff --git a/pkgs/development/tools/jp/default.nix b/pkgs/development/tools/jp/default.nix index f05c788dabe..f1f5b37c10d 100644 --- a/pkgs/development/tools/jp/default.nix +++ b/pkgs/development/tools/jp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "jp"; @@ -13,7 +13,7 @@ buildGoPackage rec { repo = "jp"; sha256 = "0fdbnihbd0kq56am3bmh2zrfk4fqjslcbm48malbgmpqw3a5nvpi"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A command line interface to the JMESPath expression language for JSON"; homepage = "https://github.com/jmespath/jp"; maintainers = with maintainers; [ cransom ]; diff --git a/pkgs/development/tools/jq/default.nix b/pkgs/development/tools/jq/default.nix index 63c7e01a4b8..e8fe27aae09 100644 --- a/pkgs/development/tools/jq/default.nix +++ b/pkgs/development/tools/jq/default.nix @@ -1,4 +1,4 @@ -{ stdenv, nixosTests, fetchurl, oniguruma }: +{ lib, stdenv, nixosTests, fetchurl, oniguruma }: stdenv.mkDerivation rec { pname = "jq"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "--mandir=\${man}/share/man" ] # jq is linked to libjq: - ++ stdenv.lib.optional (!stdenv.isDarwin) "LDFLAGS=-Wl,-rpath,\\\${libdir}"; + ++ lib.optional (!stdenv.isDarwin) "LDFLAGS=-Wl,-rpath,\\\${libdir}"; doInstallCheck = true; installCheckTarget = "check"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { passthru.tests = { inherit (nixosTests) jq; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A lightweight and flexible command-line JSON processor"; license = licenses.mit; maintainers = with maintainers; [ raskin globin ]; diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index 05b2b50f26f..e96d8f38af4 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, coreutils, bash, installShellFiles }: +{ lib, fetchFromGitHub, rustPlatform, coreutils, bash, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "just"; @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec { # Skip "choose" when running "cargo test", since this test case needs "fzf". checkFlags = [ "--skip=choose" "--skip=edit" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A handy way to save and run project-specific commands"; homepage = "https://github.com/casey/just"; license = licenses.cc0; diff --git a/pkgs/development/tools/k6/default.nix b/pkgs/development/tools/k6/default.nix index 35972f9cce5..6a94d40c206 100644 --- a/pkgs/development/tools/k6/default.nix +++ b/pkgs/development/tools/k6/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "k6"; - version = "0.29.0"; + version = "0.30.0"; goPackagePath = "github.com/loadimpact/k6"; @@ -10,12 +10,12 @@ buildGoPackage rec { owner = "loadimpact"; repo = pname; rev = "v${version}"; - sha256 = "1zkw7jga8nsqycvrwnqxifbb5la2z4bmxg3l5638i4xlpn58g711"; + sha256 = "sha256-eUvkW6IBmUp4/zYNlQKrNrxMszdzU8v6tCc2o4DN1As="; }; subPackages = [ "./" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A modern load testing tool, using Go and JavaScript"; homepage = "https://k6.io/"; changelog = "https://github.com/loadimpact/k6/releases/tag/v${version}"; diff --git a/pkgs/development/tools/kafkacat/default.nix b/pkgs/development/tools/kafkacat/default.nix index 6e7db6b35c6..e297de7a0db 100644 --- a/pkgs/development/tools/kafkacat/default.nix +++ b/pkgs/development/tools/kafkacat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, zlib, rdkafka, yajl }: +{ lib, stdenv, fetchFromGitHub, pkg-config, zlib, rdkafka, yajl }: stdenv.mkDerivation rec { pname = "kafkacat"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0z3bw00s269myfd1xqksjyznmgp74xfs09xqlq347adsgby3cmfs"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib rdkafka yajl ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { patchShebangs ./configure ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A generic non-JVM producer and consumer for Apache Kafka"; homepage = "https://github.com/edenhill/kafkacat"; license = licenses.bsd2; diff --git a/pkgs/development/tools/kcli/default.nix b/pkgs/development/tools/kcli/default.nix index 6c9f62c6f72..9cd1c976162 100644 --- a/pkgs/development/tools/kcli/default.nix +++ b/pkgs/development/tools/kcli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "kcli"; diff --git a/pkgs/development/tools/kind/default.nix b/pkgs/development/tools/kind/default.nix index 55f0a0e9f30..47b23ae2342 100644 --- a/pkgs/development/tools/kind/default.nix +++ b/pkgs/development/tools/kind/default.nix @@ -1,19 +1,19 @@ -{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: -with stdenv.lib; +with lib; buildGoModule rec { pname = "kind"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "kubernetes-sigs"; repo = "kind"; - sha256 = "1kyjmlp1kmr3lwylnya6w392j1qpqgbvcacwpnz3ifyh3pbv32qr"; + sha256 = "1pp2x4bfqsd15siahyv9xkdyswsipmp9n86iwavrd0xhliqxlsa7"; }; - vendorSha256 = "04fmqh6lhvvzpvf1l2xk1r8687k5jx2lb5199rgmjbfnjgsa0q2d"; + vendorSha256 = "0c0j4s8kfzk2b3hy0d2g5bp1zr60l6vnwnpynsg6ksv8spwnpl5m"; doCheck = false; @@ -31,7 +31,7 @@ buildGoModule rec { description = "Kubernetes IN Docker - local clusters for testing Kubernetes"; homepage = "https://github.com/kubernetes-sigs/kind"; maintainers = with maintainers; [ offline rawkode ]; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/krew/default.nix b/pkgs/development/tools/krew/default.nix index 8e5d9d76fc4..f2a4f390f82 100644 --- a/pkgs/development/tools/krew/default.nix +++ b/pkgs/development/tools/krew/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "krew"; @@ -19,7 +19,7 @@ buildGoModule rec { description = "Package manager for kubectl plugins"; homepage = "https://github.com/kubernetes-sigs/krew"; maintainers = with maintainers; [ vdemeester ]; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/ktlint/default.nix b/pkgs/development/tools/ktlint/default.nix index 7e71c08ec4b..4abe6b6d17f 100644 --- a/pkgs/development/tools/ktlint/default.nix +++ b/pkgs/development/tools/ktlint/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, jre_headless }: +{ lib, stdenv, fetchurl, makeWrapper, jre_headless }: stdenv.mkDerivation rec { pname = "ktlint"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/ktlint --prefix PATH : "${jre_headless}/bin" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An anti-bikeshedding Kotlin linter with built-in formatter"; homepage = "https://ktlint.github.io/"; license = licenses.mit; diff --git a/pkgs/development/tools/kube-prompt/deps.nix b/pkgs/development/tools/kube-prompt/deps.nix index e2391789a41..b8d9e200a8c 100644 --- a/pkgs/development/tools/kube-prompt/deps.nix +++ b/pkgs/development/tools/kube-prompt/deps.nix @@ -306,4 +306,4 @@ sha256 = "06rszpgckx9gmqz9gbq8wnl39d1dnl28wdgrygj2fhz5prhj0x4s"; }; } -] \ No newline at end of file +] diff --git a/pkgs/development/tools/kubectx/default.nix b/pkgs/development/tools/kubectx/default.nix index 59a7c8300e2..46955855332 100644 --- a/pkgs/development/tools/kubectx/default.nix +++ b/pkgs/development/tools/kubectx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "kubectx"; @@ -21,7 +21,7 @@ buildGoModule rec { installShellCompletion completion/* ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast way to switch between clusters and namespaces in kubectl!"; license = licenses.asl20; homepage = "https://github.com/ahmetb/kubectx"; diff --git a/pkgs/development/tools/kubeprompt/default.nix b/pkgs/development/tools/kubeprompt/default.nix index 4fc8f325342..39cd59cbec6 100644 --- a/pkgs/development/tools/kubeprompt/default.nix +++ b/pkgs/development/tools/kubeprompt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "kubeprompt"; diff --git a/pkgs/development/tools/kubicorn/default.nix b/pkgs/development/tools/kubicorn/default.nix index 67e170f6e25..706b91aad25 100644 --- a/pkgs/development/tools/kubicorn/default.nix +++ b/pkgs/development/tools/kubicorn/default.nix @@ -1,10 +1,10 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: -with stdenv.lib; +with lib; buildGoPackage rec { pname = "kubicorn"; - version = "2018-10-13-${stdenv.lib.strings.substring 0 7 rev}"; + version = "2018-10-13-${lib.strings.substring 0 7 rev}"; rev = "4c7f3623e9188fba43778271afe161a4facfb657"; src = fetchFromGitHub { @@ -20,7 +20,7 @@ buildGoPackage rec { meta = { description = "Simple, cloud native infrastructure for Kubernetes"; homepage = "http://kubicorn.io/"; - maintainers = with stdenv.lib.maintainers; [ offline ]; - license = stdenv.lib.licenses.asl20; + maintainers = with lib.maintainers; [ offline ]; + license = lib.licenses.asl20; }; } diff --git a/pkgs/development/tools/kubie/default.nix b/pkgs/development/tools/kubie/default.nix index 33d4ea0df1d..8a199f9191c 100644 --- a/pkgs/development/tools/kubie/default.nix +++ b/pkgs/development/tools/kubie/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; postInstall = '' installShellCompletion completion/kubie.bash diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix index 4235912c24f..6ff123bb2be 100644 --- a/pkgs/development/tools/kustomize/default.nix +++ b/pkgs/development/tools/kustomize/default.nix @@ -2,9 +2,9 @@ buildGoModule rec { pname = "kustomize"; - version = "3.9.1"; - # rev is the 3.8.7 commit, mainly for kustomize version command output - rev = "7439f1809e5ccd4677ed52be7f98f2ad75122a93"; + version = "3.9.2"; + # rev is the 3.9.2 commit, mainly for kustomize version command output + rev = "e98eada7365fc564c9aba392e954f306a9cbf1dd"; buildFlagsArray = let t = "sigs.k8s.io/kustomize/api/provenance"; in '' @@ -17,13 +17,13 @@ buildGoModule rec { owner = "kubernetes-sigs"; repo = pname; rev = "kustomize/v${version}"; - sha256 = "1v8yfiwzg84bpdh3k3h5v2smxx0dymq717r2mh3pjz3nifkg3ilm"; + sha256 = "0p1rxswfaj0g3y8nfw70qmxrlyv1pnzkapy1mxpzzyf04mmhg7wn"; }; # avoid finding test and development commands sourceRoot = "source/kustomize"; - vendorSha256 = "1nixkmyqzq7387rwam0bsa6qjd40k5p15npq0iz1z2k1ws8pvrg6"; + vendorSha256 = "1pv8g0nnrpzbvd6dqgnrw2i27xkilbrr9npdz6pxr7mmbcg3w3w9"; meta = with lib; { description = "Customization of kubernetes YAML configurations"; diff --git a/pkgs/development/tools/kythe/default.nix b/pkgs/development/tools/kythe/default.nix index 601634b3184..f6a4c2e6c1e 100644 --- a/pkgs/development/tools/kythe/default.nix +++ b/pkgs/development/tools/kythe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, binutils , fetchurl, ncurses5 }: +{ lib, stdenv, binutils , fetchurl, ncurses5 }: stdenv.mkDerivation rec { version = "0.0.30"; @@ -23,14 +23,14 @@ stdenv.mkDerivation rec { write_entries write_tables entrystream; do echo "Patching:" $exe patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $exe - patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ncurses5 ]}" $exe + patchelf --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc ncurses5 ]}" $exe done cd ../ cp -R ./ $out ln -s $out/tools $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A pluggable, (mostly) language-agnostic ecosystem for building tools that work with code"; longDescription = '' The Kythe project was founded to provide and support tools and standards diff --git a/pkgs/development/tools/lattice-diamond/default.nix b/pkgs/development/tools/lattice-diamond/default.nix index 6720603b2e5..4c94ff1e6e2 100644 --- a/pkgs/development/tools/lattice-diamond/default.nix +++ b/pkgs/development/tools/lattice-diamond/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rpmextract, patchelf, makeWrapper, file, requireFile, glib, zlib, +{ lib, stdenv, rpmextract, patchelf, makeWrapper, file, requireFile, glib, zlib, freetype, fontconfig, xorg, libusb-compat-0_1 }: stdenv.mkDerivation { @@ -95,7 +95,7 @@ stdenv.mkDerivation { done ''; - libPath = stdenv.lib.makeLibraryPath [ + libPath = lib.makeLibraryPath [ glib zlib freetype fontconfig xorg.libSM xorg.libICE xorg.libXrender xorg.libXext xorg.libX11 xorg.libXt libusb-compat-0_1 @@ -109,8 +109,8 @@ stdenv.mkDerivation { next-generation replacement for ispLEVER. ''; homepage = "http://www.latticesemi.com/latticediamond"; - license = stdenv.lib.licenses.unfree; - maintainers = with stdenv.lib.maintainers; [ q3k ]; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ q3k ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix index 1ede21609b4..a2707eb72e9 100644 --- a/pkgs/development/tools/lazygit/default.nix +++ b/pkgs/development/tools/lazygit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "lazygit"; @@ -16,7 +16,7 @@ buildGoModule rec { buildFlagsArray = [ "-ldflags=-X main.version=${version} -X main.buildSource=nix" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple terminal UI for git commands"; homepage = "https://github.com/jesseduffield/lazygit"; changelog = "https://github.com/jesseduffield/lazygit/releases/tag/v${version}"; diff --git a/pkgs/development/tools/leaps/default.nix b/pkgs/development/tools/leaps/default.nix index bb8673d4d56..934881b6781 100644 --- a/pkgs/development/tools/leaps/default.nix +++ b/pkgs/development/tools/leaps/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "leaps"; @@ -19,7 +19,7 @@ buildGoPackage rec { description = "A pair programming tool and library written in Golang"; homepage = "https://github.com/jeffail/leaps/"; license = "MIT"; - maintainers = with stdenv.lib.maintainers; [ qknight ]; - platforms = stdenv.lib.platforms.unix; + maintainers = with lib.maintainers; [ qknight ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/tools/libsigrok/default.nix b/pkgs/development/tools/libsigrok/default.nix index 4e104a79d5d..7f32b0bd716 100644 --- a/pkgs/development/tools/libsigrok/default.nix +++ b/pkgs/development/tools/libsigrok/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libzip, glib, libusb1, libftdi1, check +{ lib, stdenv, fetchurl, pkg-config, libzip, glib, libusb1, libftdi1, check , libserialport, librevisa, doxygen, glibmm, python , version ? "0.5.1", sha256 ? "171b553dir5gn6w4f7n37waqk62nq2kf1jykx4ifjacdz5xdw3z4" }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "14sd8xqph4kb109g073daiavpadb20fcz7ch1ipn0waz7nlly4sw"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libzip glib libusb1 libftdi1 check libserialport librevisa doxygen glibmm python ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { tar --strip-components=1 -xvf "${firmware}" -C "$out/share/sigrok-firmware/" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Core library of the sigrok signal analysis software suite"; homepage = "https://sigrok.org/"; license = licenses.gpl3Plus; diff --git a/pkgs/development/tools/libsigrokdecode/default.nix b/pkgs/development/tools/libsigrokdecode/default.nix index e78afc1a861..cb3b3040596 100644 --- a/pkgs/development/tools/libsigrokdecode/default.nix +++ b/pkgs/development/tools/libsigrokdecode/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, python3, libsigrok, check }: +{ lib, stdenv, fetchurl, pkg-config, glib, python3, libsigrok, check }: stdenv.mkDerivation rec { name = "libsigrokdecode-0.5.3"; @@ -8,10 +8,10 @@ stdenv.mkDerivation rec { sha256 = "1h1zi1kpsgf6j2z8j8hjpv1q7n49i3fhqjn8i178rka3cym18265"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib python3 libsigrok check ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Protocol decoding library for the sigrok signal analysis software suite"; homepage = "https://sigrok.org/"; license = licenses.gpl3Plus; diff --git a/pkgs/development/tools/literate-programming/Literate/default.nix b/pkgs/development/tools/literate-programming/Literate/default.nix index 428e6e444a2..87213b911a9 100644 --- a/pkgs/development/tools/literate-programming/Literate/default.nix +++ b/pkgs/development/tools/literate-programming/Literate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, dmd, dub }: +{ lib, stdenv, fetchgit, dmd, dub }: stdenv.mkDerivation { pname = "Literate"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { installPhase = "install -D bin/lit $out/bin/lit"; - meta = with stdenv.lib; { + meta = with lib; { description = "A literate programming tool for any language"; homepage = "http://literate.zbyedidia.webfactional.com/"; license = licenses.mit; diff --git a/pkgs/development/tools/literate-programming/eweb/default.nix b/pkgs/development/tools/literate-programming/eweb/default.nix index 82805af5804..caacc04903e 100644 --- a/pkgs/development/tools/literate-programming/eweb/default.nix +++ b/pkgs/development/tools/literate-programming/eweb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3, asciidoc }: +{ lib, stdenv, fetchurl, python3, asciidoc }: stdenv.mkDerivation rec { pname = "eweb"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { cp etangle.w etangle.html $out/share/doc/${pname}-${version} ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://eweb.sourceforge.net/"; description = "An Asciidoc-based literate programming tool, written in Python"; platforms = platforms.linux; diff --git a/pkgs/development/tools/literate-programming/funnelweb/default.nix b/pkgs/development/tools/literate-programming/funnelweb/default.nix index 9d27351f15d..53b7f208e81 100644 --- a/pkgs/development/tools/literate-programming/funnelweb/default.nix +++ b/pkgs/development/tools/literate-programming/funnelweb/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { install fw $out/bin/fw ''; - meta = with stdenv.lib; { + meta = with lib; { version = "3.20"; description = "A simple, reliable literate-programming macro preprocessor"; homepage = "http://www.ross.net/funnelweb/"; diff --git a/pkgs/development/tools/literate-programming/noweb/default.nix b/pkgs/development/tools/literate-programming/noweb/default.nix index 52586939c1d..5d4441ecfbb 100644 --- a/pkgs/development/tools/literate-programming/noweb/default.nix +++ b/pkgs/development/tools/literate-programming/noweb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gawk, groff, icon-lang ? null }: +{ lib, stdenv, fetchFromGitHub, gawk, groff, icon-lang ? null }: let noweb = stdenv.mkDerivation rec { pname = "noweb"; @@ -13,17 +13,17 @@ let noweb = stdenv.mkDerivation rec { patches = [ ./no-FAQ.patch ]; - nativeBuildInputs = [ groff ] ++ stdenv.lib.optionals (!isNull icon-lang) [ icon-lang ]; + nativeBuildInputs = [ groff ] ++ lib.optionals (!isNull icon-lang) [ icon-lang ]; preBuild = '' mkdir -p "$out/lib/noweb" cd src ''; - makeFlags = stdenv.lib.optionals (!isNull icon-lang) [ + makeFlags = lib.optionals (!isNull icon-lang) [ "LIBSRC=icon" "ICONC=icont" - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ "CC=clang" ]; @@ -70,7 +70,7 @@ let noweb = stdenv.mkDerivation rec { tlType = "run"; passthru.pkgs = [ noweb.tex ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple, extensible literate-programming tool"; homepage = "https://www.cs.tufts.edu/~nr/noweb"; license = licenses.bsd2; diff --git a/pkgs/development/tools/literate-programming/nuweb/default.nix b/pkgs/development/tools/literate-programming/nuweb/default.nix index 1f4fba681c3..37deaacb216 100644 --- a/pkgs/development/tools/literate-programming/nuweb/default.nix +++ b/pkgs/development/tools/literate-programming/nuweb/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, tex}: +{lib, stdenv, fetchurl, tex}: stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { cp htdocs/index.html nuweb.w nuweb.pdf nuwebdoc.pdf README $out/share/doc/${pname}-${version} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple literate programming tool"; homepage = "http://nuweb.sourceforge.net"; license = licenses.free; diff --git a/pkgs/development/tools/makerpm/default.nix b/pkgs/development/tools/makerpm/default.nix index a05615a22d9..5b7fc83df40 100644 --- a/pkgs/development/tools/makerpm/default.nix +++ b/pkgs/development/tools/makerpm/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, zlib, libarchive, openssl }: +{ lib, stdenv, fetchFromGitHub, zlib, libarchive, openssl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation rec { version = "1.0"; pname = "makerpm"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "089dkbh5705ppyi920rd0ksjc0143xmvnhm8qrx93rsgwc1ggi1y"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/ivan-tkatchev/makerpm/"; description = "A clean, simple RPM packager reimplemented completely from scratch"; license = licenses.free; diff --git a/pkgs/development/tools/manul/default.nix b/pkgs/development/tools/manul/default.nix index 71010149a92..306c9143c5c 100644 --- a/pkgs/development/tools/manul/default.nix +++ b/pkgs/development/tools/manul/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage { name = "manul-unstable-2016-09-30"; @@ -16,7 +16,7 @@ buildGoPackage { deleteVendor = true; goDeps = ./deps.nix; - meta = with stdenv.lib; { + meta = with lib; { description = "The madness vendoring utility for Golang programs"; homepage = "https://github.com/kovetskiy/manul"; license = licenses.mit; diff --git a/pkgs/development/tools/mdk/default.nix b/pkgs/development/tools/mdk/default.nix index 5c8924ee21b..6db4395a14f 100644 --- a/pkgs/development/tools/mdk/default.nix +++ b/pkgs/development/tools/mdk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, glib }: +{ lib, stdenv, fetchurl, intltool, pkg-config, glib }: stdenv.mkDerivation { name = "gnu-mdk-1.3.0"; @@ -6,7 +6,7 @@ stdenv.mkDerivation { url = "https://ftp.gnu.org/gnu/mdk/v1.3.0/mdk-1.3.0.tar.gz"; sha256 = "0bhk3c82kyp8167h71vdpbcr852h5blpnwggcswqqwvvykbms7lb"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ intltool glib ]; postInstall = '' mkdir -p $out/share/emacs/site-lisp/ @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "GNU MIX Development Kit (MDK)"; homepage = "https://www.gnu.org/software/mdk/"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl3; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix index 0937ccb5987..729ab88c680 100644 --- a/pkgs/development/tools/metals/default.nix +++ b/pkgs/development/tools/metals/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "metals"; - version = "0.9.8"; + version = "0.9.10"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1gn7v1478sqhz4hv53pgvaw2nqziyiavvhn5q152lkzyvghq08wk"; + outputHash = "1i91jq1p27kkzxk57mm438sablnrx8j5pfyl0yg64wzrashba1xa"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/micronaut/default.nix b/pkgs/development/tools/micronaut/default.nix index ddf9d84f3bf..1139215fbf8 100644 --- a/pkgs/development/tools/micronaut/default.nix +++ b/pkgs/development/tools/micronaut/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { rm bin/mn.bat cp -r . $out wrapProgram $out/bin/mn \ - --prefix JAVA_HOME : ${jdk} + --prefix JAVA_HOME : ${jdk} installShellCompletion --bash --name mn.bash bin/mn_completion runHook postInstall ''; @@ -26,9 +26,9 @@ stdenv.mkDerivation rec { longDescription = '' Micronaut is a modern, JVM-based, full stack microservices framework designed for building modular, easily testable microservice applications. - Reflection-based IoC frameworks load and cache reflection data for - every single field, method, and constructor in your code, whereas with - Micronaut, your application startup time and memory consumption are + Reflection-based IoC frameworks load and cache reflection data for + every single field, method, and constructor in your code, whereas with + Micronaut, your application startup time and memory consumption are not bound to the size of your codebase. ''; homepage = "https://micronaut.io/"; diff --git a/pkgs/development/tools/minizinc/default.nix b/pkgs/development/tools/minizinc/default.nix index bcaa3e56507..4e5f3947262 100644 --- a/pkgs/development/tools/minizinc/default.nix +++ b/pkgs/development/tools/minizinc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, flex, bison }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, flex, bison }: let version = "2.4.3"; in @@ -34,7 +34,7 @@ stdenv.mkDerivation { }) ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.minizinc.org/"; description = "A medium-level constraint modelling language"; diff --git a/pkgs/development/tools/minizinc/ide.nix b/pkgs/development/tools/minizinc/ide.nix index aedf2ab881d..fd366cc39a5 100644 --- a/pkgs/development/tools/minizinc/ide.nix +++ b/pkgs/development/tools/minizinc/ide.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qtbase, qtwebengine, qtwebkit, qmake, makeWrapper, minizinc }: +{ lib, stdenv, fetchFromGitHub, qtbase, qtwebengine, qtwebkit, qmake, makeWrapper, minizinc }: let version = "2.4.3"; in @@ -19,12 +19,13 @@ stdenv.mkDerivation { sourceRoot = "source/MiniZincIDE"; enableParallelBuilding = true; + dontWrapQtApps = true; postInstall = '' - wrapProgram $out/bin/MiniZincIDE --prefix PATH ":" ${stdenv.lib.makeBinPath [ minizinc ]} + wrapProgram $out/bin/MiniZincIDE --prefix PATH ":" ${lib.makeBinPath [ minizinc ]} ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.minizinc.org/"; description = "IDE for MiniZinc, a medium-level constraint modelling language"; diff --git a/pkgs/development/tools/misc/abi-compliance-checker/default.nix b/pkgs/development/tools/misc/abi-compliance-checker/default.nix index c95a340181c..c4dda95a7f2 100644 --- a/pkgs/development/tools/misc/abi-compliance-checker/default.nix +++ b/pkgs/development/tools/misc/abi-compliance-checker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ctags, perl, binutils, abi-dumper }: +{ lib, stdenv, fetchFromGitHub, ctags, perl, binutils, abi-dumper }: stdenv.mkDerivation rec { pname = "abi-compliance-checker"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://lvc.github.io/abi-compliance-checker"; description = "A tool for checking backward API/ABI compatibility of a C/C++ library"; license = licenses.lgpl21; diff --git a/pkgs/development/tools/misc/abi-dumper/default.nix b/pkgs/development/tools/misc/abi-dumper/default.nix index dc2a6d00b5f..6dd2bf41ba6 100644 --- a/pkgs/development/tools/misc/abi-dumper/default.nix +++ b/pkgs/development/tools/misc/abi-dumper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ctags, perl, elfutils, vtable-dumper }: +{ lib, stdenv, fetchFromGitHub, ctags, perl, elfutils, vtable-dumper }: stdenv.mkDerivation rec { pname = "abi-dumper"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { preBuild = "mkdir -p $out"; makeFlags = [ "prefix=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/lvc/abi-dumper"; description = "Dump ABI of an ELF object containing DWARF debug info"; license = licenses.lgpl21; diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix index 4bb2d3d6245..7bd25a6868e 100644 --- a/pkgs/development/tools/misc/act/default.nix +++ b/pkgs/development/tools/misc/act/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "act"; - version = "0.2.17"; + version = "0.2.19"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "v${version}"; - sha256 = "0s7bgm2q7z9xpaj6kfvg63v12k35ckaxwmh6bbjh15xibaw58183"; + sha256 = "sha256-vlE0tN6m/PZtDZiIs/glTWYP+E4qzD0MAeQjX+OAcHY="; }; - vendorSha256 = "0bcrw3hf92m7n58lrlm0vj1wiwwy82q2rl1a725q3d6xwvi5kh9h"; + vendorSha256 = "sha256-9LEyxIBe4c938RQbLOQOsAb9MGNtjngm48P3P83BTNw="; doCheck = false; diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix index 14ef09ee7ed..a5a9d724a79 100644 --- a/pkgs/development/tools/misc/arcanist/default.nix +++ b/pkgs/development/tools/misc/arcanist/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , flex , php -, stdenv +, lib, stdenv }: # Make a custom wrapper. If `wrapProgram` is used, arcanist thinks .arc-wrapped is being @@ -31,7 +31,7 @@ stdenv.mkDerivation { }; buildInputs = [ bison flex php ]; - postPatch = stdenv.lib.optionalString stdenv.isAarch64 '' + postPatch = lib.optionalString stdenv.isAarch64 '' substituteInPlace support/xhpast/Makefile \ --replace "-minline-all-stringops" "" ''; @@ -60,8 +60,8 @@ stdenv.mkDerivation { meta = { description = "Command line interface to Phabricator"; homepage = "http://phabricator.org"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.thoughtpolice ]; }; } diff --git a/pkgs/development/tools/misc/argbash/default.nix b/pkgs/development/tools/misc/argbash/default.nix index 3efff500943..57105050814 100644 --- a/pkgs/development/tools/misc/argbash/default.nix +++ b/pkgs/development/tools/misc/argbash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, runtimeShell, python3Packages, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, autoconf, runtimeShell, python3Packages, makeWrapper }: stdenv.mkDerivation rec { pname = "argbash"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { --prefix PATH : '${autoconf}/bin' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Bash argument parsing code generator"; homepage = "https://argbash.io/"; license = licenses.free; # custom license. See LICENSE in source repo. diff --git a/pkgs/development/tools/misc/asls/default.nix b/pkgs/development/tools/misc/asls/default.nix index 0e08acdeb45..bccda018503 100644 --- a/pkgs/development/tools/misc/asls/default.nix +++ b/pkgs/development/tools/misc/asls/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , erlangR22 }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ erlangR22 ]; installPhase = "install -Dm755 -t $out/bin asls"; - meta = with stdenv.lib; { + meta = with lib; { description = "AssemblyScript Language Server"; homepage = "https://github.com/saulecabrera/asls"; license = licenses.mit; diff --git a/pkgs/development/tools/misc/autobuild/default.nix b/pkgs/development/tools/misc/autobuild/default.nix index 05afa379f99..da387105cef 100644 --- a/pkgs/development/tools/misc/autobuild/default.nix +++ b/pkgs/development/tools/misc/autobuild/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, makeWrapper, perl, openssh, rsync }: +{ fetchurl, lib, stdenv, makeWrapper, perl, openssh, rsync }: stdenv.mkDerivation rec { name = "autobuild-5.3"; @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { ''; homepage = "https://josefsson.org/autobuild/"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/tools/misc/autoconf-archive/default.nix b/pkgs/development/tools/misc/autoconf-archive/default.nix index f002346c994..e0d558b1880 100644 --- a/pkgs/development/tools/misc/autoconf-archive/default.nix +++ b/pkgs/development/tools/misc/autoconf-archive/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xz }: +{ lib, stdenv, fetchurl, xz }: stdenv.mkDerivation rec { pname = "autoconf-archive"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ xz ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Archive of autoconf m4 macros"; homepage = "https://www.gnu.org/software/autoconf-archive/"; license = licenses.gpl3; diff --git a/pkgs/development/tools/misc/autoconf/2.13.nix b/pkgs/development/tools/misc/autoconf/2.13.nix index 424dff8541b..e5280d46b59 100644 --- a/pkgs/development/tools/misc/autoconf/2.13.nix +++ b/pkgs/development/tools/misc/autoconf/2.13.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, m4, perl, lzma}: +{lib, stdenv, fetchurl, m4, perl, lzma}: stdenv.mkDerivation rec { name = "autoconf-2.13"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { can use, in the form of M4 macro calls. ''; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/tools/misc/autoconf/2.64.nix b/pkgs/development/tools/misc/autoconf/2.64.nix index 1fd18bcb12a..6976a291ae7 100644 --- a/pkgs/development/tools/misc/autoconf/2.64.nix +++ b/pkgs/development/tools/misc/autoconf/2.64.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, m4, perl }: +{ lib, stdenv, fetchurl, m4, perl }: stdenv.mkDerivation rec { name = "autoconf-2.64"; @@ -44,8 +44,8 @@ stdenv.mkDerivation rec { can use, in the form of M4 macro calls. ''; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/tools/misc/autoconf/2.69.nix b/pkgs/development/tools/misc/autoconf/2.69.nix index 500d80d4bb8..f2f8ca0a858 100644 --- a/pkgs/development/tools/misc/autoconf/2.69.nix +++ b/pkgs/development/tools/misc/autoconf/2.69.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, m4, perl }: +{ lib, stdenv, fetchurl, m4, perl }: stdenv.mkDerivation rec { name = "autoconf-2.69"; @@ -45,8 +45,8 @@ stdenv.mkDerivation rec { can use, in the form of M4 macro calls. ''; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix index 57a92cee737..ae8fc2d9061 100644 --- a/pkgs/development/tools/misc/autoconf/default.nix +++ b/pkgs/development/tools/misc/autoconf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, m4, perl }: +{ lib, stdenv, fetchurl, m4, perl }: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or @@ -47,8 +47,8 @@ stdenv.mkDerivation rec { can use, in the form of M4 macro calls. ''; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix index 23235499cfb..c6eb6916d1e 100644 --- a/pkgs/development/tools/misc/autogen/default.nix +++ b/pkgs/development/tools/misc/autogen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, fetchurl, autoreconfHook, which, pkgconfig, perl, guile, libxml2 }: +{ lib, stdenv, buildPackages, fetchurl, autoreconfHook, which, pkg-config, perl, guile, libxml2 }: stdenv.mkDerivation rec { pname = "autogen"; @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "lib" "out" "man" "info" ]; nativeBuildInputs = [ - which pkgconfig perl autoreconfHook/*patches applied*/ - ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + which pkg-config perl autoreconfHook/*patches applied*/ + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # autogen needs a build autogen when cross-compiling buildPackages.buildPackages.autogen buildPackages.texinfo ]; @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { # Debian: https://salsa.debian.org/debian/autogen/-/blob/master/debian/rules#L21 "--enable-timeout=78" ] - ++ (stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + ++ (lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--with-libxml2=${libxml2.dev}" "--with-libxml2-cflags=-I${libxml2.dev}/include/libxml2" # the configure check for regcomp wants to run a host program @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { sed -e "s|$lib/lib|/no-such-autogen-lib-path|" -i $f done - '' + stdenv.lib.optionalString (!stdenv.hostPlatform.isDarwin) '' + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' # remove /build/** from RPATHs for f in "$bin"/bin/*; do local nrp="$(patchelf --print-rpath "$f" | sed -E 's@(:|^)/build/[^:]*:@\1@g')" @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Automated text and program generation tool"; license = with licenses; [ gpl3Plus lgpl3Plus ]; homepage = "https://www.gnu.org/software/autogen/"; diff --git a/pkgs/development/tools/misc/automake/automake-1.11.x.nix b/pkgs/development/tools/misc/automake/automake-1.11.x.nix index b79f3047889..5e3167d182d 100644 --- a/pkgs/development/tools/misc/automake/automake-1.11.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.11.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, autoconf }: +{ lib, stdenv, fetchurl, perl, autoconf }: stdenv.mkDerivation rec { name = "automake-1.11.6"; @@ -42,8 +42,8 @@ stdenv.mkDerivation rec { Standards. Automake requires the use of Autoconf. ''; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/tools/misc/automake/automake-1.15.x.nix b/pkgs/development/tools/misc/automake/automake-1.15.x.nix index bf0967e9ddb..0088eb74cc4 100644 --- a/pkgs/development/tools/misc/automake/automake-1.15.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.15.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, autoconf }: +{ lib, stdenv, fetchurl, perl, autoconf }: stdenv.mkDerivation rec { name = "automake-1.15.1"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { branch = "1.15"; homepage = "https://www.gnu.org/software/automake/"; description = "GNU standard-compliant makefile generator"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; longDescription = '' GNU Automake is a tool for automatically generating @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { Standards. Automake requires the use of Autoconf. ''; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/tools/misc/automake/automake-1.16.x.nix b/pkgs/development/tools/misc/automake/automake-1.16.x.nix index 58c559fcc56..48f01f8d0f6 100644 --- a/pkgs/development/tools/misc/automake/automake-1.16.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.16.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, autoconf }: +{ lib, stdenv, fetchurl, perl, autoconf }: stdenv.mkDerivation rec { name = "automake-1.16.3"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { branch = "1.16"; homepage = "https://www.gnu.org/software/automake/"; description = "GNU standard-compliant makefile generator"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; longDescription = '' GNU Automake is a tool for automatically generating @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { Standards. Automake requires the use of Autoconf. ''; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/tools/misc/automoc4/default.nix b/pkgs/development/tools/misc/automoc4/default.nix index 22942e2a658..ac027ec4530 100644 --- a/pkgs/development/tools/misc/automoc4/default.nix +++ b/pkgs/development/tools/misc/automoc4/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, qt4 }: +{ lib, stdenv, fetchurl, cmake, qt4 }: stdenv.mkDerivation rec { pname = "automoc4"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ qt4 ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://techbase.kde.org/Development/Tools/Automoc4"; description = "KDE Meta Object Compiler"; license = licenses.bsd2; diff --git a/pkgs/development/tools/misc/avrdude/default.nix b/pkgs/development/tools/misc/avrdude/default.nix index bb0520cf28e..4d95310c342 100644 --- a/pkgs/development/tools/misc/avrdude/default.nix +++ b/pkgs/development/tools/misc/avrdude/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, yacc, flex, libusb-compat-0_1, libelf, libftdi1, readline +{ lib, stdenv, fetchurl, yacc, flex, libusb-compat-0_1, libelf, libftdi1, readline # docSupport is a big dependency, disabled by default , docSupport ? false, texLive ? null, texinfo ? null, texi2html ? null }: @@ -13,12 +13,12 @@ stdenv.mkDerivation rec { sha256 = "15m1w1qad3dj7r8n5ng1qqcaiyx1gyd6hnc3p2apgjllccdp77qg"; }; - configureFlags = stdenv.lib.optionals docSupport "--enable-doc"; + configureFlags = lib.optionals docSupport "--enable-doc"; buildInputs = [ yacc flex libusb-compat-0_1 libelf libftdi1 readline ] - ++ stdenv.lib.optionals docSupport [ texLive texinfo texi2html ]; + ++ lib.optionals docSupport [ texLive texinfo texi2html ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Command-line tool for programming Atmel AVR microcontrollers"; longDescription = '' AVRDUDE (AVR Downloader/UploaDEr) is an utility to diff --git a/pkgs/development/tools/misc/awf/default.nix b/pkgs/development/tools/misc/awf/default.nix index b1e627e7aa8..b73f1dc0450 100644 --- a/pkgs/development/tools/misc/awf/default.nix +++ b/pkgs/development/tools/misc/awf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, gtk2, gtk3, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, gtk2, gtk3, pkg-config , wrapGAppsHook }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0jl2kxwpvf2n8974zzyp69mqhsbjnjcqm39y0jvijvjb1iy8iman"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ]; buildInputs = [ gtk2 gtk3 ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A Widget Factory"; longDescription = '' A widget factory is a theme preview application for gtk2 and diff --git a/pkgs/development/tools/misc/babeltrace/default.nix b/pkgs/development/tools/misc/babeltrace/default.nix index 03539eb2cc8..26c484017d2 100644 --- a/pkgs/development/tools/misc/babeltrace/default.nix +++ b/pkgs/development/tools/misc/babeltrace/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, libuuid, popt, elfutils }: +{ lib, stdenv, fetchurl, pkg-config, glib, libuuid, popt, elfutils }: stdenv.mkDerivation rec { name = "babeltrace-1.5.8"; @@ -8,10 +8,10 @@ stdenv.mkDerivation rec { sha256 = "1hkg3phnamxfrhwzmiiirbhdgckzfkqwhajl0lmr1wfps7j47wcz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib libuuid popt elfutils ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Command-line tool and library to read and convert LTTng tracefiles"; homepage = "https://www.efficios.com/babeltrace"; license = licenses.mit; diff --git a/pkgs/development/tools/misc/bashdb/default.nix b/pkgs/development/tools/misc/bashdb/default.nix index 0897960f6aa..72ec8c96be3 100644 --- a/pkgs/development/tools/misc/bashdb/default.nix +++ b/pkgs/development/tools/misc/bashdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, python3Packages }: +{ lib, stdenv, fetchurl, makeWrapper, python3Packages }: stdenv.mkDerivation rec { pname = "bashdb"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "Bash script debugger"; homepage = "http://bashdb.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/tools/misc/bin_replace_string/default.nix b/pkgs/development/tools/misc/bin_replace_string/default.nix index 8fc809f0f0c..a732d6e732c 100644 --- a/pkgs/development/tools/misc/bin_replace_string/default.nix +++ b/pkgs/development/tools/misc/bin_replace_string/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libelf, txt2man }: +{ lib, stdenv, fetchurl, libelf, txt2man }: stdenv.mkDerivation { pname = "bin_replace_string"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Edit precompiled binaries"; longDescription = '' bin_replace_string edits C-style strings in precompiled binaries. This is diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 58920d98ea6..5022f8a7f8c 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -4,7 +4,7 @@ , withAllTargets ? false, libbfd, libopcodes , enableShared ? !stdenv.hostPlatform.isStatic , noSysDirs -, gold ? !stdenv.buildPlatform.isDarwin || stdenv.hostPlatform == stdenv.targetPlatform +, gold ? true , bison ? null , flex , texinfo diff --git a/pkgs/development/tools/misc/blackmagic/default.nix b/pkgs/development/tools/misc/blackmagic/default.nix index 48ae364a26e..c49187273c4 100644 --- a/pkgs/development/tools/misc/blackmagic/default.nix +++ b/pkgs/development/tools/misc/blackmagic/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub -, gcc-arm-embedded, libftdi1, libusb-compat-0_1, pkgconfig +, gcc-arm-embedded, libftdi1, libusb-compat-0_1, pkg-config , python, pythonPackages }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gcc-arm-embedded pkgconfig + gcc-arm-embedded pkg-config ]; buildInputs = [ diff --git a/pkgs/development/tools/misc/bossa/default.nix b/pkgs/development/tools/misc/bossa/default.nix index 38cc2867650..74073722857 100644 --- a/pkgs/development/tools/misc/bossa/default.nix +++ b/pkgs/development/tools/misc/bossa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, wxGTK, libX11, readline }: +{ lib, stdenv, fetchgit, wxGTK, libX11, readline }: let # BOSSA needs a "bin2c" program to embed images. @@ -8,8 +8,8 @@ let name = "bossa-bin2c"; src = ./bin2c.c; dontUnpack = true; - buildPhase = ''cc $src -o bin2c''; - installPhase = ''mkdir -p $out/bin; cp bin2c $out/bin/''; + buildPhase = "cc $src -o bin2c"; + installPhase = "mkdir -p $out/bin; cp bin2c $out/bin/"; }; in @@ -36,7 +36,7 @@ stdenv.mkDerivation { cp bin/bossa{c,sh,} $out/bin/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A flash programming utility for Atmel's SAM family of flash-based ARM microcontrollers"; longDescription = '' BOSSA is a flash programming utility for Atmel's SAM family of diff --git a/pkgs/development/tools/misc/bsdbuild/default.nix b/pkgs/development/tools/misc/bsdbuild/default.nix index 6ba8064c094..e3bfc958437 100644 --- a/pkgs/development/tools/misc/bsdbuild/default.nix +++ b/pkgs/development/tools/misc/bsdbuild/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, libtool, pkgconfig, gettext, mandoc, ed }: +{ lib, stdenv, fetchurl, perl, libtool, pkg-config, gettext, mandoc, ed }: stdenv.mkDerivation rec { pname = "bsdbuild"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ perl mandoc ed ]; - nativeBuildInputs = [ pkgconfig libtool gettext ]; + nativeBuildInputs = [ pkg-config libtool gettext ]; prePatch = '' #ignore unfamiliar flags @@ -62,7 +62,7 @@ EOF directory, BSDBuild will produce the required Makefiles in place). ''; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.bsd3; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/tools/misc/cbrowser/default.nix b/pkgs/development/tools/misc/cbrowser/default.nix index f3ba4b3a70d..0f7edeea812 100644 --- a/pkgs/development/tools/misc/cbrowser/default.nix +++ b/pkgs/development/tools/misc/cbrowser/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, tk, makeWrapper }: +{ fetchurl, lib, stdenv, tk, makeWrapper }: stdenv.mkDerivation rec { name = "cbrowser-0.8"; @@ -23,12 +23,12 @@ stdenv.mkDerivation rec { meta = { description = "Tcl/Tk GUI front-end to cscope"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; homepage = "https://sourceforge.net/projects/cbrowser/"; - maintainers = with stdenv.lib.maintainers; [viric]; + maintainers = with lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/development/tools/misc/cc-tool/default.nix b/pkgs/development/tools/misc/cc-tool/default.nix index 6be0ab2acb5..e2a511a0e32 100644 --- a/pkgs/development/tools/misc/cc-tool/default.nix +++ b/pkgs/development/tools/misc/cc-tool/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook , boost @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { install -D udev/90-cc-debugger.rules $out/lib/udev/rules.d/90-cc-debugger.rules ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Command line tool for the Texas Instruments CC Debugger"; longDescription = '' cc-tool provides support for Texas Instruments CC Debugger diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index f9254b2cf15..0cf98d651c5 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -13,13 +13,13 @@ let ccache = stdenv.mkDerivation rec { pname = "ccache"; - version = "4.1"; + version = "4.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1az11q3wmr8wc7alx9l70wq9am41cm0y17g5gsaqmahws3dxfi8m"; + sha256 = "1lr9804xyzbs72f9jbbzy1fjqxwrwpb4rp431wqialvms4251d8f"; }; patches = lib.optional stdenv.isDarwin (substituteAll { @@ -60,7 +60,7 @@ let ccache = stdenv.mkDerivation rec { local cname="$1" if [ -x "${unwrappedCC}/bin/$cname" ]; then makeWrapper ${ccache}/bin/ccache $out/bin/$cname \ - --run ${stdenv.lib.escapeShellArg extraConfig} \ + --run ${lib.escapeShellArg extraConfig} \ --add-flags ${unwrappedCC}/bin/$cname fi } @@ -84,7 +84,7 @@ let ccache = stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Compiler cache for fast recompilation of C/C++ code"; homepage = "https://ccache.dev"; downloadPage = "https://ccache.dev/download.html"; diff --git a/pkgs/development/tools/misc/ccls/default.nix b/pkgs/development/tools/misc/ccls/default.nix index 16365a462a9..40b53ca6934 100644 --- a/pkgs/development/tools/misc/ccls/default.nix +++ b/pkgs/development/tools/misc/ccls/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , cmake, llvmPackages, rapidjson, runtimeShell }: stdenv.mkDerivation rec { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { postFixup = '' # We need to tell ccls where to find the standard library headers. - standard_library_includes="\\\"-isystem\\\", \\\"${stdenv.lib.getDev stdenv.cc.libc}/include\\\"" + standard_library_includes="\\\"-isystem\\\", \\\"${lib.getDev stdenv.cc.libc}/include\\\"" standard_library_includes+=", \\\"-isystem\\\", \\\"${llvmPackages.libcxx}/include/c++/v1\\\"" export standard_library_includes @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { chmod --reference=$out/bin/$wrapped $out/bin/ccls ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A c/c++ language server powered by clang"; homepage = "https://github.com/MaskRay/ccls"; license = licenses.asl20; diff --git a/pkgs/development/tools/misc/cflow/default.nix b/pkgs/development/tools/misc/cflow/default.nix index 8c271bd7673..b9e75d7cb2a 100644 --- a/pkgs/development/tools/misc/cflow/default.nix +++ b/pkgs/development/tools/misc/cflow/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gettext, emacs }: +{ lib, stdenv, fetchurl, gettext, emacs }: stdenv.mkDerivation rec { name = "cflow-1.6"; @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { buildInputs = [ gettext ] ++ # We don't have Emacs/GTK/etc. on {Dar,Cyg}win. - stdenv.lib.optional - (! (stdenv.lib.lists.any (x: stdenv.hostPlatform.system == x) + lib.optional + (! (lib.lists.any (x: stdenv.hostPlatform.system == x) [ "i686-cygwin" ])) emacs; doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool to analyze the control flow of C programs"; longDescription = '' diff --git a/pkgs/development/tools/misc/cgdb/default.nix b/pkgs/development/tools/misc/cgdb/default.nix index a863cec1d4c..0e92d373c0b 100644 --- a/pkgs/development/tools/misc/cgdb/default.nix +++ b/pkgs/development/tools/misc/cgdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, readline, flex, texinfo }: +{ lib, stdenv, fetchurl, ncurses, readline, flex, texinfo }: stdenv.mkDerivation rec { pname = "cgdb"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses readline flex texinfo ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A curses interface to gdb"; homepage = "https://cgdb.github.io/"; diff --git a/pkgs/development/tools/misc/checkbashisms/default.nix b/pkgs/development/tools/misc/checkbashisms/default.nix index 86ac37ee491..524abbfdc90 100644 --- a/pkgs/development/tools/misc/checkbashisms/default.nix +++ b/pkgs/development/tools/misc/checkbashisms/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl }: +{ lib, stdenv, fetchurl, perl }: stdenv.mkDerivation rec { version = "2.0.0.2"; pname = "checkbashisms"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://sourceforge.net/projects/checkbaskisms/"; description = "Check shell scripts for non-portable syntax"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/tools/misc/chrpath/default.nix b/pkgs/development/tools/misc/chrpath/default.nix index 7e08157d7bd..ff804f897d1 100644 --- a/pkgs/development/tools/misc/chrpath/default.nix +++ b/pkgs/development/tools/misc/chrpath/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "chrpath-0.16"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "0yvfq891mcdkf8g18gjjkn2m5rvs8z4z4cl1vwdhx6f2p9a4q3dv"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Command line tool to adjust the RPATH or RUNPATH of ELF binaries"; longDescription = '' chrpath changes, lists or removes the rpath or runpath setting in a diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index ef04e78da60..140e4869e88 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "circleci-cli"; - version = "0.1.11540"; + version = "0.1.11924"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "QtD+H59AlXp+3mXtUA44Dl+3xEvWdO8FybuBnL9sjBA="; + sha256 = "sha256-KY1kqqRRpwNt0ovllfFcWSsJAH2J1NrlQAueqQrw354="; }; - vendorSha256 = "fIk443TD4W0hhNuvFSZiV+fdxjelNsxh1+3qtw9yiZY="; + vendorSha256 = "sha256-6FBMLwoLM2BtnMHQfpY7f7NiQt5evsL4CfYTZvr3gAs="; doCheck = false; @@ -26,7 +26,7 @@ buildGoModule rec { install -Dm644 -t $out/share/circleci-cli _data/data.yml ''; - meta = with stdenv.lib; { + meta = with lib; { # Box blurb edited from the AUR package circleci-cli description = '' Command to enable you to reproduce the CircleCI environment locally and diff --git a/pkgs/development/tools/misc/cl-launch/default.nix b/pkgs/development/tools/misc/cl-launch/default.nix index c245a32a06d..4fe93694ab7 100644 --- a/pkgs/development/tools/misc/cl-launch/default.nix +++ b/pkgs/development/tools/misc/cl-launch/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: let s = # Generated upstream information rec { @@ -30,9 +30,9 @@ stdenv.mkDerivation { meta = { inherit (s) version; - description = ''Common Lisp launcher script''; - license = stdenv.lib.licenses.llgpl21 ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; + description = "Common Lisp launcher script"; + license = lib.licenses.llgpl21 ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/tools/misc/cli11/default.nix b/pkgs/development/tools/misc/cli11/default.nix index de01ab93090..03c3e51cb89 100644 --- a/pkgs/development/tools/misc/cli11/default.nix +++ b/pkgs/development/tools/misc/cli11/default.nix @@ -1,5 +1,5 @@ { - stdenv, + lib, stdenv, fetchFromGitHub, cmake, gtest, @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { sed -i '/TrueFalseTest/d' tests/CMakeLists.txt ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Command line parser for C++11"; homepage = "https://github.com/CLIUtils/CLI11"; platforms = platforms.unix; diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix index 68140904aad..e70067600a7 100644 --- a/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, jre, makeWrapper }: +{ lib, stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { pname = "clojure-lsp"; - version = "2021.01.03-00.42.23"; + version = "2021.01.28-03.03.16"; src = fetchurl { url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/${pname}.jar"; - sha256 = "06h69hwm3kl1nr94l43j91pnvkzgnacsg6a6cly4abrg041qhbv3"; + sha256 = "sha256-7Mj0yZD8WKpeekEkLZfQhHaPDRzcKO9arOCo0pwUflY="; }; dontUnpack = true; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { --add-flags "-jar $out/share/java/${pname}.jar" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Language Server Protocol (LSP) for Clojure"; homepage = "https://github.com/snoe/clojure-lsp"; license = licenses.mit; diff --git a/pkgs/development/tools/misc/coccinelle/default.nix b/pkgs/development/tools/misc/coccinelle/default.nix index f8cad56f099..40a22f18203 100644 --- a/pkgs/development/tools/misc/coccinelle/default.nix +++ b/pkgs/development/tools/misc/coccinelle/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, python, ncurses, ocamlPackages, pkgconfig }: +{ fetchurl, lib, stdenv, python, ncurses, ocamlPackages, pkg-config }: stdenv.mkDerivation rec { pname = "coccinelle"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = with ocamlPackages; [ ocaml findlib menhir ocaml_pcre pycaml - python ncurses pkgconfig + python ncurses pkg-config ]; doCheck = !stdenv.isDarwin; @@ -50,8 +50,8 @@ stdenv.mkDerivation rec { ''; homepage = "http://coccinelle.lip6.fr/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.thoughtpolice ]; }; } diff --git a/pkgs/development/tools/misc/complexity/default.nix b/pkgs/development/tools/misc/complexity/default.nix index 71ed762df04..6e70fbcfcde 100644 --- a/pkgs/development/tools/misc/complexity/default.nix +++ b/pkgs/development/tools/misc/complexity/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, autogen }: +{ fetchurl, lib, stdenv, autogen }: stdenv.mkDerivation rec { pname = "complexity"; @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { addresses several issues not considered in that scoring scheme. ''; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; homepage = "https://www.gnu.org/software/complexity/"; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; + platforms = lib.platforms.gnu ++ lib.platforms.linux; maintainers = [ ]; }; } diff --git a/pkgs/development/tools/misc/cppi/default.nix b/pkgs/development/tools/misc/cppi/default.nix index 8de7391b9ec..9fe5ed96672 100644 --- a/pkgs/development/tools/misc/cppi/default.nix +++ b/pkgs/development/tools/misc/cppi/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv }: +{ fetchurl, lib, stdenv }: stdenv.mkDerivation rec { name = "cppi-1.18"; @@ -23,9 +23,9 @@ stdenv.mkDerivation rec { to the level of nesting of that directive. ''; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/tools/misc/cproto/default.nix b/pkgs/development/tools/misc/cproto/default.nix index e18196fe595..5ee1a64f2c2 100644 --- a/pkgs/development/tools/misc/cproto/default.nix +++ b/pkgs/development/tools/misc/cproto/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, flex, bison }: +{ lib, stdenv, fetchurl, flex, bison }: stdenv.mkDerivation rec { pname = "cproto"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { [ "$("$out/bin/cproto" -V 2>&1)" = '${version}' ] ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool to generate C function prototypes from C source code"; homepage = "https://invisible-island.net/cproto/"; license = licenses.publicDomain; diff --git a/pkgs/development/tools/misc/creduce/default.nix b/pkgs/development/tools/misc/creduce/default.nix index 7bc4aca3d9d..75234fde6ca 100644 --- a/pkgs/development/tools/misc/creduce/default.nix +++ b/pkgs/development/tools/misc/creduce/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, makeWrapper +{ lib, stdenv, fetchurl, cmake, makeWrapper , llvm, clang-unwrapped , flex , zlib @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { # On Linux, c-reduce's preferred way to reason about # the cpu architecture/topology is to use 'lscpu', # so let's make sure it knows where to find it: - postPatch = stdenv.lib.optionalString stdenv.isLinux '' + postPatch = lib.optionalString stdenv.isLinux '' substituteInPlace creduce/creduce_utils.pm --replace \ lscpu ${util-linux}/bin/lscpu ''; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/creduce --prefix PERL5LIB : "$PERL5LIB" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A C program reducer"; homepage = "https://embed.cs.utah.edu/creduce"; # Officially, the license is: https://github.com/csmith-project/creduce/blob/master/COPYING diff --git a/pkgs/development/tools/misc/cscope/default.nix b/pkgs/development/tools/misc/cscope/default.nix index 31d4e83663b..7eb38e385e8 100644 --- a/pkgs/development/tools/misc/cscope/default.nix +++ b/pkgs/development/tools/misc/cscope/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, ncurses +{ fetchurl, lib, stdenv, ncurses , emacsSupport ? true, emacs }: @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-ncurses=${ncurses.dev}" ]; buildInputs = [ ncurses ]; - nativeBuildInputs = stdenv.lib.optional emacsSupport emacs; + nativeBuildInputs = lib.optional emacsSupport emacs; - postInstall = stdenv.lib.optionalString emacsSupport '' + postInstall = lib.optionalString emacsSupport '' cd "contrib/xcscope" sed -i "cscope-indexer" \ @@ -46,8 +46,8 @@ stdenv.mkDerivation rec { homepage = "http://cscope.sourceforge.net/"; - maintainers = with stdenv.lib.maintainers; [viric]; + maintainers = with lib.maintainers; [viric]; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/tools/misc/csmith/default.nix b/pkgs/development/tools/misc/csmith/default.nix index 253dd4065e4..0643e81edf9 100644 --- a/pkgs/development/tools/misc/csmith/default.nix +++ b/pkgs/development/tools/misc/csmith/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, m4, makeWrapper, libbsd, perlPackages }: +{ lib, stdenv, fetchurl, m4, makeWrapper, libbsd, perlPackages }: stdenv.mkDerivation rec { pname = "csmith"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A random generator of C programs"; homepage = "https://embed.cs.utah.edu/csmith"; # Officially, the license is this: https://github.com/csmith-project/csmith/blob/master/COPYING diff --git a/pkgs/development/tools/misc/ctags/default.nix b/pkgs/development/tools/misc/ctags/default.nix index 3adca34a5bb..90825db2a54 100644 --- a/pkgs/development/tools/misc/ctags/default.nix +++ b/pkgs/development/tools/misc/ctags/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, autoreconfHook }: +{ lib, stdenv, fetchsvn, autoreconfHook }: stdenv.mkDerivation rec { name = "ctags-${revision}"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { # don't use $T(E)MP which is set to the build directory configureFlags= [ "--enable-tmpdir=/tmp" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool for fast source code browsing (exuberant ctags)"; longDescription = '' Ctags generates an index (or tag) file of language objects found diff --git a/pkgs/development/tools/misc/cwebbin/default.nix b/pkgs/development/tools/misc/cwebbin/default.nix index 0b89156d71a..3ab8800f3c4 100644 --- a/pkgs/development/tools/misc/cwebbin/default.nix +++ b/pkgs/development/tools/misc/cwebbin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, tie }: +{ lib, stdenv, fetchFromGitHub, fetchurl, tie }: stdenv.mkDerivation rec { pname = "cwebbin"; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { make -f Makefile.unix install $makeFlags ''; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Literate Programming in C/C++"; platforms = with platforms; unix; diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix index 53ba94c7e81..5c130a99c92 100644 --- a/pkgs/development/tools/misc/d-feet/default.nix +++ b/pkgs/development/tools/misc/d-feet/default.nix @@ -1,5 +1,5 @@ -{ stdenv -, pkgconfig +{ lib +, pkg-config , fetchurl , meson , ninja @@ -21,7 +21,7 @@ python3.pkgs.buildPythonApplication rec { format = "other"; src = fetchurl { - url = "mirror://gnome/sources/d-feet/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/d-feet/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1cgxgpj546jgpyns6z9nkm5k48lid8s36mvzj8ydkjqws2d19zqz"; }; @@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec { itstool meson ninja - pkgconfig + pkg-config python3 wrapGAppsHook ]; @@ -68,7 +68,7 @@ python3.pkgs.buildPythonApplication rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "D-Feet is an easy to use D-Bus debugger"; longDescription = '' D-Feet can be used to inspect D-Bus interfaces of running programs diff --git a/pkgs/development/tools/misc/dbench/default.nix b/pkgs/development/tools/misc/dbench/default.nix index 49fb1efbd4a..9565eaa3626 100644 --- a/pkgs/development/tools/misc/dbench/default.nix +++ b/pkgs/development/tools/misc/dbench/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoconf, popt, zlib, rpcsvc-proto, libtirpc }: +{ lib, stdenv, fetchgit, autoconf, popt, zlib, rpcsvc-proto, libtirpc }: stdenv.mkDerivation { name = "dbench-2013-01-01"; @@ -35,7 +35,7 @@ stdenv.mkDerivation { ln -s dbench/doc/dbench/loadfiles $out/share/loadfiles ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Filesystem benchmark tool based on load patterns"; homepage = "https://dbench.samba.org/"; license = licenses.gpl3; diff --git a/pkgs/development/tools/misc/ddd/default.nix b/pkgs/development/tools/misc/ddd/default.nix index 174168b7db7..74eb9fcb293 100644 --- a/pkgs/development/tools/misc/ddd/default.nix +++ b/pkgs/development/tools/misc/ddd/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, motif, ncurses, libX11, libXt}: +{lib, stdenv, fetchurl, motif, ncurses, libX11, libXt}: stdenv.mkDerivation rec { name = "ddd-3.3.12"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.gnu.org/software/ddd"; description = "Graphical front-end for command-line debuggers"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/tools/misc/dejagnu/default.nix b/pkgs/development/tools/misc/dejagnu/default.nix index 73e2ab8ef92..285805ccb02 100644 --- a/pkgs/development/tools/misc/dejagnu/default.nix +++ b/pkgs/development/tools/misc/dejagnu/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, expect, makeWrapper }: +{ fetchurl, lib, stdenv, expect, makeWrapper }: stdenv.mkDerivation rec { name = "dejagnu-1.6.2"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { --prefix PATH ":" "${expect}/bin" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Framework for testing other programs"; longDescription = '' diff --git a/pkgs/development/tools/misc/dfu-programmer/default.nix b/pkgs/development/tools/misc/dfu-programmer/default.nix index 1aaf113d0b9..f0a3a9b7600 100644 --- a/pkgs/development/tools/misc/dfu-programmer/default.nix +++ b/pkgs/development/tools/misc/dfu-programmer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libusb-compat-0_1 }: +{ lib, stdenv, fetchurl, libusb-compat-0_1 }: let version = "0.7.2"; in @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-libusb_1_0" ]; - meta = with stdenv.lib; { + meta = with lib; { license = licenses.gpl2; description = "A Device Firmware Update based USB programmer for Atmel chips with a USB bootloader"; homepage = "http://dfu-programmer.sourceforge.net/"; diff --git a/pkgs/development/tools/misc/dfu-util/default.nix b/pkgs/development/tools/misc/dfu-util/default.nix index 9af9ddc0df7..85917a114c0 100644 --- a/pkgs/development/tools/misc/dfu-util/default.nix +++ b/pkgs/development/tools/misc/dfu-util/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, pkgconfig, libusb1 }: +{ lib, stdenv, fetchurl, pkg-config, libusb1 }: stdenv.mkDerivation rec { pname = "dfu-util"; version = "0.10"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 ]; src = fetchurl { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0hlvc47ccf5hry13saqhc1j5cdq5jyjv4i05kj0mdh3rzj6wagd0"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Device firmware update (DFU) USB programmer"; longDescription = '' dfu-util is a program that implements the host (PC) side of the USB diff --git a/pkgs/development/tools/misc/dialog/default.nix b/pkgs/development/tools/misc/dialog/default.nix index c56620e3105..97db1b5b7e8 100644 --- a/pkgs/development/tools/misc/dialog/default.nix +++ b/pkgs/development/tools/misc/dialog/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , ncurses , withLibrary ? false, libtool , unicodeSupport ? true @@ -24,14 +24,14 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-rpath-hacks" - (stdenv.lib.withFeature withLibrary "libtool") - "--with-ncurses${stdenv.lib.optionalString unicodeSupport "w"}" - "--with-libtool-opts=${stdenv.lib.optionalString enableShared "-shared"}" + (lib.withFeature withLibrary "libtool") + "--with-ncurses${lib.optionalString unicodeSupport "w"}" + "--with-libtool-opts=${lib.optionalString enableShared "-shared"}" ]; - installTargets = [ "install${stdenv.lib.optionalString withLibrary "-full"}" ]; + installTargets = [ "install${lib.optionalString withLibrary "-full"}" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://invisible-island.net/dialog/dialog.html"; description = "Display dialog boxes from shell"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/tools/misc/direvent/default.nix b/pkgs/development/tools/misc/direvent/default.nix index 0ae1884646d..3477d60b784 100644 --- a/pkgs/development/tools/misc/direvent/default.nix +++ b/pkgs/development/tools/misc/direvent/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0m9vi01b1km0cpknflyzsjnknbava0s1n6393b2bpjwyvb6j5613"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Directory event monitoring daemon"; homepage = "https://www.gnu.org.ua/software/direvent/"; license = licenses.gpl3Plus; diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix index 3894ed58728..cad9fe0960b 100644 --- a/pkgs/development/tools/misc/distcc/default.nix +++ b/pkgs/development/tools/misc/distcc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, popt, avahi, pkgconfig, python, gtk2, runCommand +{ lib, stdenv, fetchFromGitHub, popt, avahi, pkg-config, python, gtk2, runCommand , gcc, autoconf, automake, which, procps, libiberty_static , runtimeShell , sysconfDir ? "" # set this parameter to override the default value $out/etc @@ -17,8 +17,8 @@ let sha256 = "1vj31wcdas8wy52hy6749mlrca9v6ynycdiigx5ay8pnya9z73c6"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [popt avahi pkgconfig python gtk2 autoconf automake which procps libiberty_static]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [popt avahi pkg-config python gtk2 autoconf automake which procps libiberty_static]; preConfigure = '' export CPATH=$(ls -d ${gcc.cc}/lib/gcc/*/${gcc.cc.version}/plugin/include) @@ -76,8 +76,8 @@ let homepage = "http://distcc.org"; license = "GPL"; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ anderspapitto ]; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ anderspapitto ]; }; }; in diff --git a/pkgs/development/tools/misc/distcc/masq.nix b/pkgs/development/tools/misc/distcc/masq.nix index f3bccde8160..2387ab1bd41 100644 --- a/pkgs/development/tools/misc/distcc/masq.nix +++ b/pkgs/development/tools/misc/distcc/masq.nix @@ -1,4 +1,4 @@ -{ stdenv, gccRaw, binutils }: +{ lib, stdenv, gccRaw, binutils }: stdenv.mkDerivation { name = "distcc-masq-${gccRaw.name}"; @@ -39,6 +39,6 @@ stdenv.mkDerivation { ''; meta = { - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/tools/misc/doclifter/default.nix b/pkgs/development/tools/misc/doclifter/default.nix index 3c6fa76616f..8b771788111 100644 --- a/pkgs/development/tools/misc/doclifter/default.nix +++ b/pkgs/development/tools/misc/doclifter/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, python}: +{lib, stdenv, fetchurl, python}: stdenv.mkDerivation { name = "doclifter-2.19"; @@ -7,20 +7,20 @@ stdenv.mkDerivation { sha256 = "1as6z7mdjrrkw2kism41q5ybvyzvwcmj9qzla2fz98v9f4jbj2s2"; }; buildInputs = [ python ]; - + makeFlags = [ "PREFIX=$(out)" ]; - + preInstall = '' mkdir -p $out/bin mkdir -p $out/share/man/man1 cp manlifter $out/bin cp manlifter.1 $out/share/man/man1 ''; - + meta = { description = "Lift documents in nroff markups to XML-DocBook"; homepage = "http://www.catb.org/esr/doclifter"; license = "BSD"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/tools/misc/docopts/default.nix b/pkgs/development/tools/misc/docopts/default.nix index 98a24ca5ebe..74450bdfe73 100644 --- a/pkgs/development/tools/misc/docopts/default.nix +++ b/pkgs/development/tools/misc/docopts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "docopts"; @@ -21,7 +21,7 @@ buildGoPackage rec { install -D -m 755 ./go/src/$goPackagePath/docopts.sh $out/bin/docopts.sh ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/docopt/${pname}"; description = "docopt CLI tool for shell scripting"; license = licenses.mit; diff --git a/pkgs/development/tools/misc/drush/default.nix b/pkgs/development/tools/misc/drush/default.nix index d5c345d9d22..32d9975e332 100644 --- a/pkgs/development/tools/misc/drush/default.nix +++ b/pkgs/development/tools/misc/drush/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, php73, which, makeWrapper, bash, coreutils, ncurses }: +{ lib, stdenv, fetchurl, php73, which, makeWrapper, bash, coreutils, ncurses }: stdenv.mkDerivation rec { name = "drush-6.1.0"; - meta = with stdenv.lib; { + meta = with lib; { description = "Command-line shell and Unix scripting interface for Drupal"; homepage = "https://github.com/drush-ops/drush"; license = licenses.gpl2; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { mkdir -p "$out" cp -r . "$out/src" mkdir "$out/bin" - wrapProgram "$out/src/drush" --prefix PATH : "${stdenv.lib.makeBinPath [ which php73 bash coreutils ncurses ]}" + wrapProgram "$out/src/drush" --prefix PATH : "${lib.makeBinPath [ which php73 bash coreutils ncurses ]}" ln -s "$out/src/drush" "$out/bin/drush" ''; } diff --git a/pkgs/development/tools/misc/editorconfig-core-c/default.nix b/pkgs/development/tools/misc/editorconfig-core-c/default.nix index e563ff203a2..de5c1e070fd 100644 --- a/pkgs/development/tools/misc/editorconfig-core-c/default.nix +++ b/pkgs/development/tools/misc/editorconfig-core-c/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, pcre, doxygen }: +{ lib, stdenv, fetchgit, cmake, pcre, doxygen }: stdenv.mkDerivation rec { name = "editorconfig-core-c-${meta.version}"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { # parallel: https://bugzilla.gnome.org/show_bug.cgi?id=791153 enableParallelBuilding = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://editorconfig.org/"; description = "EditorConfig core library written in C"; longDescription = '' diff --git a/pkgs/development/tools/misc/eggdbus/default.nix b/pkgs/development/tools/misc/eggdbus/default.nix index d1211c9fcec..5a5267510d7 100644 --- a/pkgs/development/tools/misc/eggdbus/default.nix +++ b/pkgs/development/tools/misc/eggdbus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus-glib }: +{ lib, stdenv, fetchurl, pkg-config, glib, dbus, dbus-glib }: stdenv.mkDerivation rec { name = "eggdbus-0.6"; @@ -8,10 +8,10 @@ stdenv.mkDerivation rec { sha256 = "118hj63ac65zlg71kydv4607qcg1qpdlql4kvhnwnnhar421jnq4"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib dbus dbus-glib ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://hal.freedesktop.org/releases/"; description = "D-Bus bindings for GObject"; platforms = platforms.linux; diff --git a/pkgs/development/tools/misc/elfinfo/default.nix b/pkgs/development/tools/misc/elfinfo/default.nix index 3778793b71c..e3ee51c58fd 100644 --- a/pkgs/development/tools/misc/elfinfo/default.nix +++ b/pkgs/development/tools/misc/elfinfo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "elfinfo"; @@ -12,7 +12,7 @@ buildGoPackage rec { sha256 = "1n8bg0rcq9fqa6rdnk6x9ngvm59hcayblkpjv9j5myn2vmm6fv8m"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Small utility for showing information about ELF files"; homepage = "https://elfinfo.roboticoverlords.org/"; license = licenses.mit; diff --git a/pkgs/development/tools/misc/elfkickers/default.nix b/pkgs/development/tools/misc/elfkickers/default.nix index e8992b62665..e60b40c7fd4 100644 --- a/pkgs/development/tools/misc/elfkickers/default.nix +++ b/pkgs/development/tools/misc/elfkickers/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "elfkickers"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.muppetlabs.com/~breadbox/software/elfkickers.html"; description = "A collection of programs that access and manipulate ELF files"; platforms = platforms.linux; diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix index 4ad7f830066..72c8c2fab91 100644 --- a/pkgs/development/tools/misc/elfutils/default.nix +++ b/pkgs/development/tools/misc/elfutils/default.nix @@ -1,47 +1,95 @@ -{ lib, stdenv, fetchurl, m4, zlib, bzip2, bison, flex, gettext, xz, setupDebugInfoDirs, argp-standalone }: +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, autoreconfHook, musl-fts +, musl-obstack, m4, zlib, bzip2, bison, flex, gettext, xz, setupDebugInfoDirs +, argp-standalone }: # TODO: Look at the hardcoded paths to kernel, modules etc. stdenv.mkDerivation rec { pname = "elfutils"; - version = "0.180"; + version = "0.182"; src = fetchurl { url = "https://sourceware.org/elfutils/ftp/${version}/${pname}-${version}.tar.bz2"; - sha256 = "17an1f67bfzxin482nbcxdl5qvywm27i9kypjyx8ilarbkivc9xq"; + sha256 = "7MQGkU7fM18Lf8CE6+bEYMTW1Rdb/dZojBx42RRriFg="; }; - patches = [ ./debug-info-from-env.patch ]; + patches = [ + ./debug-info-from-env.patch + ./musl-cdefs_h.patch + (fetchpatch { + name = "fix-aarch64_fregs.patch"; + url = "https://git.alpinelinux.org/aports/plain/main/elfutils/fix-aarch64_fregs.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9"; + sha256 = "zvncoRkQx3AwPx52ehjA2vcFroF+yDC2MQR5uS6DATs="; + }) + (fetchpatch { + name = "musl-asm-ptrace-h.patch"; + url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-asm-ptrace-h.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9"; + sha256 = "8D1wPcdgAkE/TNBOgsHaeTZYhd9l+9TrZg8d5C7kG6k="; + }) + (fetchpatch { + name = "musl-fts-obstack.patch"; + url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-fts-obstack.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9"; + sha256 = "3lbC0UtscTIJgT7kOXnnjWrpPAVt2PYMbW+uJK6K350="; + }) + (fetchpatch { + name = "musl-macros.patch"; + url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-macros.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9"; + sha256 = "tp6O1TRsTAMsFe8vw3LMENT/vAu6OmyA8+pzgThHeA8="; + }) + (fetchpatch { + name = "musl-qsort_r.patch"; + url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-qsort_r.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9"; + sha256 = "FPWCkdtFT3zw8aNnz0Jz5Vmu8B/mRfNgfhbM/ej7d8M="; + }) + (fetchpatch { + name = "musl-strerror_r.patch"; + url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-strerror_r.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9"; + sha256 = "QF6YwWkcT12dZHKzfqFgxy/1fkIllo0AAosbV0sM5PU="; + }) + (fetchpatch { + name = "musl-strndupa.patch"; + url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-strndupa.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9"; + sha256 = "sha256-7daehJj1t0wPtQzTv+/Rpuqqs5Ng/EYnZzrcf2o/Lb0="; + }) + ] ++ lib.optional stdenv.hostPlatform.isMusl [ ./musl-error_h.patch ]; hardeningDisable = [ "format" ]; # We need bzip2 in NativeInputs because otherwise we can't unpack the src, # as the host-bzip2 will be in the path. - nativeBuildInputs = [ m4 bison flex gettext bzip2 ]; + nativeBuildInputs = [ m4 bison flex gettext bzip2 ] + ++ lib.optional stdenv.hostPlatform.isMusl [ pkg-config autoreconfHook ]; buildInputs = [ zlib bzip2 xz ] - ++ lib.optional stdenv.hostPlatform.isMusl argp-standalone; + ++ lib.optional stdenv.hostPlatform.isMusl [ + argp-standalone + musl-fts + musl-obstack + ]; propagatedNativeBuildInputs = [ setupDebugInfoDirs ]; preConfigure = lib.optionalString stdenv.hostPlatform.isMusl '' - NIX_CFLAGS_COMPILE+=" -fgnu89-inline" + NIX_CFLAGS_COMPILE+=" -Wno-null-dereference" ''; - configureFlags = - [ "--program-prefix=eu-" # prevent collisions with binutils - "--enable-deterministic-archives" - "--disable-debuginfod" - ]; + configureFlags = [ + "--program-prefix=eu-" # prevent collisions with binutils + "--enable-deterministic-archives" + "--disable-libdebuginfod" + "--disable-debuginfod" + ]; enableParallelBuilding = true; doCheck = false; # fails 3 out of 174 tests doInstallCheck = false; # fails 70 out of 174 tests - meta = { + meta = with lib; { homepage = "https://sourceware.org/elfutils/"; description = "A set of utilities to handle ELF objects"; - platforms = lib.platforms.linux; - license = lib.licenses.gpl3; - maintainers = [ lib.maintainers.eelco ]; + platforms = platforms.linux; + # licenses are GPL2 or LGPL3+ for libraries, GPL3+ for bins, + # but since this package isn't split that way, all three are listed. + license = with licenses; [ gpl2Only lgpl3Plus gpl3Plus ]; + maintainers = [ maintainers.eelco ]; }; } diff --git a/pkgs/development/tools/misc/elfutils/musl-cdefs_h.patch b/pkgs/development/tools/misc/elfutils/musl-cdefs_h.patch new file mode 100644 index 00000000000..1b5bf466217 --- /dev/null +++ b/pkgs/development/tools/misc/elfutils/musl-cdefs_h.patch @@ -0,0 +1,15 @@ +# avoids a warning about including an internal header when +# compiling with musl-libc +diff -crb --new-file a/lib/fixedsizehash.h b/lib/fixedsizehash.h +*** a/lib/fixedsizehash.h 2020-06-11 11:37:46.000000000 -0400 +--- b/lib/fixedsizehash.h 2021-01-21 05:52:59.000000000 -0500 +*************** +*** 30,36 **** + #include <errno.h> + #include <stdlib.h> + #include <string.h> +- #include <sys/cdefs.h> + + #include <system.h> + +--- 30,35 ---- diff --git a/pkgs/development/tools/misc/elfutils/musl-error_h.patch b/pkgs/development/tools/misc/elfutils/musl-error_h.patch new file mode 100644 index 00000000000..711928078d3 --- /dev/null +++ b/pkgs/development/tools/misc/elfutils/musl-error_h.patch @@ -0,0 +1,66 @@ +diff -crb --new-file a/lib/error.h b/lib/error.h +*** a/lib/error.h 1969-12-31 19:00:00.000000000 -0500 +--- b/lib/error.h 2021-01-21 04:38:25.000000000 -0500 +*************** +*** 0 **** +--- 1,27 ---- ++ #ifndef _ERROR_H_ ++ #define _ERROR_H_ ++ ++ #include <stdarg.h> ++ #include <stdio.h> ++ #include <stdlib.h> ++ #include <string.h> ++ #include <errno.h> ++ ++ static unsigned int error_message_count = 0; ++ ++ static inline void error(int status, int errnum, const char* format, ...) ++ { ++ va_list ap; ++ fprintf(stderr, "%s: ", program_invocation_name); ++ va_start(ap, format); ++ vfprintf(stderr, format, ap); ++ va_end(ap); ++ if (errnum) ++ fprintf(stderr, ": %s", strerror(errnum)); ++ fprintf(stderr, "\n"); ++ error_message_count++; ++ if (status) ++ exit(status); ++ } ++ ++ #endif /* _ERROR_H_ */ +diff -crb --new-file a/src/error.h b/src/error.h +*** a/src/error.h 1969-12-31 19:00:00.000000000 -0500 +--- b/src/error.h 2021-01-21 04:38:29.000000000 -0500 +*************** +*** 0 **** +--- 1,27 ---- ++ #ifndef _ERROR_H_ ++ #define _ERROR_H_ ++ ++ #include <stdarg.h> ++ #include <stdio.h> ++ #include <stdlib.h> ++ #include <string.h> ++ #include <errno.h> ++ ++ static unsigned int error_message_count = 0; ++ ++ static inline void error(int status, int errnum, const char* format, ...) ++ { ++ va_list ap; ++ fprintf(stderr, "%s: ", program_invocation_name); ++ va_start(ap, format); ++ vfprintf(stderr, format, ap); ++ va_end(ap); ++ if (errnum) ++ fprintf(stderr, ": %s", strerror(errnum)); ++ fprintf(stderr, "\n"); ++ error_message_count++; ++ if (status) ++ exit(status); ++ } ++ ++ #endif /* _ERROR_H_ */ diff --git a/pkgs/development/tools/misc/epm/default.nix b/pkgs/development/tools/misc/epm/default.nix index 8caa33c20d1..8f5921783e2 100644 --- a/pkgs/development/tools/misc/epm/default.nix +++ b/pkgs/development/tools/misc/epm/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, rpm}: +{lib, stdenv, fetchFromGitHub, rpm}: stdenv.mkDerivation rec { pname = "epm"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sed -i 's/README/README.md/' Makefile ''; - meta = with stdenv.lib; { + meta = with lib; { description = "The ESP Package Manager generates distribution archives for a variety of platforms"; homepage = "https://www.msweet.org/projects.php?Z2"; license = licenses.gpl2; diff --git a/pkgs/development/tools/misc/findnewest/default.nix b/pkgs/development/tools/misc/findnewest/default.nix index b289c16b7a6..6773e9bc0bd 100644 --- a/pkgs/development/tools/misc/findnewest/default.nix +++ b/pkgs/development/tools/misc/findnewest/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "findnewest"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/0-wiz-0/findnewest"; description = "Recursively find newest file in a hierarchy and print its timestamp"; license = licenses.bsd2; diff --git a/pkgs/development/tools/misc/fsatrace/default.nix b/pkgs/development/tools/misc/fsatrace/default.nix index 69d7c6b3919..132ddf2eacf 100644 --- a/pkgs/development/tools/misc/fsatrace/default.nix +++ b/pkgs/development/tools/misc/fsatrace/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "fsatrace"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ln -s $out/$installDir/fsatrace $out/bin/fsatrace ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/jacereda/fsatrace"; description = "filesystem access tracer"; license = licenses.isc; diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix index e32da3e67b7..6f9f5e113c0 100644 --- a/pkgs/development/tools/misc/fswatch/default.nix +++ b/pkgs/development/tools/misc/fswatch/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook # for xargs @@ -20,12 +20,12 @@ stdenv.mkDerivation rec { sha256 = "11479ac436g8bwk0lfnmdms0cirv9k11pdvfrrg9jwkki1j1abkk"; }; - nativeBuildInputs = [ autoreconfHook ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; + nativeBuildInputs = [ autoreconfHook ] ++ lib.optionals stdenv.isDarwin [ CoreServices ]; buildInputs = [ gettext libtool makeWrapper texinfo ]; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A cross-platform file change monitor with multiple backends"; homepage = "https://github.com/emcrisostomo/fswatch"; license = licenses.gpl3Plus; diff --git a/pkgs/development/tools/misc/fujprog/default.nix b/pkgs/development/tools/misc/fujprog/default.nix index e5cd2e0e2dd..db1f42e3a26 100644 --- a/pkgs/development/tools/misc/fujprog/default.nix +++ b/pkgs/development/tools/misc/fujprog/default.nix @@ -1,7 +1,7 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , IOKit , libftdi1 , libusb-compat-0_1 @@ -20,15 +20,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config ]; buildInputs = [ libftdi1 libusb-compat-0_1 - ] ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit ]; + ] ++ lib.optionals stdenv.isDarwin [ IOKit ]; - meta = with stdenv.lib; { + meta = with lib; { description = "JTAG programmer for the ULX3S and ULX2S open hardware FPGA development boards"; homepage = "https://github.com/kost/fujprog"; license = licenses.bsd2; diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index d9bac6e3c83..2ce779be568 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -1,7 +1,7 @@ -{ stdenv, targetPackages +{ lib, stdenv, targetPackages # Build time -, fetchurl, pkgconfig, perl, texinfo, setupDebugInfoDirs, buildPackages +, fetchurl, pkg-config, perl, texinfo, setupDebugInfoDirs, buildPackages # Run time , ncurses, readline, gmp, mpfr, expat, libipt, zlib, dejagnu @@ -18,7 +18,7 @@ let basename = "gdb"; - targetPrefix = stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) + targetPrefix = lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) "${stdenv.targetPlatform.config}-"; in @@ -40,15 +40,15 @@ stdenv.mkDerivation rec { patches = [ ./debug-info-from-env.patch - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ ./darwin-target-match.patch ]; - nativeBuildInputs = [ pkgconfig texinfo perl setupDebugInfoDirs ]; + nativeBuildInputs = [ pkg-config texinfo perl setupDebugInfoDirs ]; buildInputs = [ ncurses readline gmp mpfr expat libipt zlib guile ] - ++ stdenv.lib.optional pythonSupport python3 - ++ stdenv.lib.optional doCheck dejagnu; + ++ lib.optional pythonSupport python3 + ++ lib.optional doCheck dejagnu; propagatedNativeBuildInputs = [ setupDebugInfoDirs ]; @@ -57,12 +57,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; # darwin build fails with format hardening since v7.12 - hardeningDisable = stdenv.lib.optionals stdenv.isDarwin [ "format" ]; + hardeningDisable = lib.optionals stdenv.isDarwin [ "format" ]; NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral"; # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (stdenv.targetPlatform != stdenv.hostPlatform) "target"; + configurePlatforms = [ "build" "host" ] ++ lib.optional (stdenv.targetPlatform != stdenv.hostPlatform) "target"; # GDB have to be built out of tree. preConfigure = '' @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { ''; configureScript = "../configure"; - configureFlags = with stdenv.lib; [ + configureFlags = with lib; [ "--enable-targets=all" "--enable-64-bit-bfd" "--disable-install-libbfd" "--disable-shared" "--enable-static" @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { "--with-mpfr=${mpfr.dev}" "--with-expat" "--with-libexpat-prefix=${expat.dev}" "--with-auto-load-safe-path=${builtins.concatStringsSep ":" safePaths}" - ] ++ stdenv.lib.optional (!pythonSupport) "--without-python"; + ] ++ lib.optional (!pythonSupport) "--without-python"; postInstall = '' # Remove Info files already provided by Binutils and other packages. @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { # TODO: Investigate & fix the test failures. doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "The GNU Project debugger"; longDescription = '' @@ -103,7 +103,7 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/gdb/"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; platforms = with platforms; linux ++ cygwin ++ darwin; maintainers = with maintainers; [ pierron globin lsix ]; diff --git a/pkgs/development/tools/misc/gdbgui/default.nix b/pkgs/development/tools/misc/gdbgui/default.nix index ecbfc2ae756..a82ff178c9e 100644 --- a/pkgs/development/tools/misc/gdbgui/default.nix +++ b/pkgs/development/tools/misc/gdbgui/default.nix @@ -1,8 +1,12 @@ -{ stdenv +{ lib , buildPythonApplication , fetchPypi , gdb , flask +, six +, bidict +, python-engineio +, python-socketio , flask-socketio , flask-compress , pygdbmi @@ -12,14 +16,48 @@ , eventlet , }: +let + # gdbgui only works with the latest previous major version of flask-socketio, + # which depends itself on the latest previous major versions of dependencies. + python-engineio' = python-engineio.overridePythonAttrs (old: rec { + version = "3.14.2"; + src = fetchPypi { + inherit (old) pname; + inherit version; + sha256 = "119halljynqsgswlhlh750qv56js1p7j52sc0nbwxh8450zmbd7a"; + }; + propagatedBuildInputs = [ six ]; + doCheck = false; + }); + python-socketio' = python-socketio.overridePythonAttrs (old: rec { + version = "4.6.1"; + src = fetchPypi { + inherit (old) pname; + inherit version; + sha256 = "047syhrrxh327p0fnab0d1zy25zijnj3gs1qg3kjpsy1jaj5l7yd"; + }; + propagatedBuildInputs = [ bidict python-engineio' ]; + doCheck = false; + }); + flask-socketio' = flask-socketio.overridePythonAttrs (old: rec { + version = "4.3.2"; + src = fetchPypi { + inherit (old) pname; + inherit version; + sha256 = "0s2xs9kv9cbwy8bcxszhdwlcb9ldv0fj33lwilf5vypj0wsin01p"; + }; + propagatedBuildInputs = [ flask python-socketio' ]; + doCheck = false; + }); +in buildPythonApplication rec { pname = "gdbgui"; - version = "0.13.2.1"; + version = "0.14.0.2"; buildInputs = [ gdb ]; propagatedBuildInputs = [ flask - flask-socketio + flask-socketio' flask-compress pygdbmi pygments @@ -30,28 +68,29 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "0zn5wi47m8pn4amx574ryyhqvhynipxzyxbx0878ap6g36vh6l1h"; + sha256 = "1v6wwsncgnhlg5c7gsmzcp52hfblfnz5kf5pk4d0zybflsxak02d"; }; postPatch = '' echo ${version} > gdbgui/VERSION.txt # remove upper version bound sed -ie 's!, <.*"!"!' setup.py + sed -i 's/greenlet==/greenlet>=/' setup.py ''; postInstall = '' wrapProgram $out/bin/gdbgui \ - --prefix PATH : ${stdenv.lib.makeBinPath [ gdb ]} + --prefix PATH : ${lib.makeBinPath [ gdb ]} ''; # tests do not work without stdout/stdin doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A browser-based frontend for GDB"; homepage = "https://www.gdbgui.com/"; license = licenses.gpl3; platforms = platforms.unix; - maintainers = with maintainers; [ yrashk ]; + maintainers = with maintainers; [ yrashk dump_stack ]; }; } diff --git a/pkgs/development/tools/misc/gede/default.nix b/pkgs/development/tools/misc/gede/default.nix index b27c3a515bb..486557d9219 100644 --- a/pkgs/development/tools/misc/gede/default.nix +++ b/pkgs/development/tools/misc/gede/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "gede"; - version = "2.16.2"; + version = "2.17.1"; src = fetchurl { - url = "http://gede.acidron.com/uploads/source/${pname}-${version}.tar.xz"; - sha256 = "18a8n9yvhgkbc97p2995j7b5ncfdzy1fy13ahdafqmcpkl4r1hrj"; + url = "http://gede.dexar.se/uploads/source/${pname}-${version}.tar.xz"; + sha256 = "0hbsy2ymzgl8xd9mnh43gxdfncy7g6czxfvfyh7zp3ij8yiwf8x3"; }; nativeBuildInputs = [ qmake makeWrapper python ]; @@ -20,12 +20,12 @@ mkDerivation rec { installPhase = '' python build.py install --verbose --prefix="$out" wrapProgram $out/bin/gede \ - --prefix PATH : ${lib.makeBinPath [ ctags gdb ]} + --prefix PATH : ${lib.makeBinPath [ ctags gdb ]} ''; meta = with lib; { description = "Graphical frontend (GUI) to GDB"; - homepage = "http://gede.acidron.com"; + homepage = "http://gede.dexar.se"; license = licenses.bsd2; platforms = platforms.linux; maintainers = with maintainers; [ juliendehos ]; diff --git a/pkgs/development/tools/misc/gengetopt/default.nix b/pkgs/development/tools/misc/gengetopt/default.nix index 0a3b0b1c750..2c09f925d3d 100644 --- a/pkgs/development/tools/misc/gengetopt/default.nix +++ b/pkgs/development/tools/misc/gengetopt/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, texinfo, help2man }: +{ fetchurl, lib, stdenv, texinfo, help2man }: stdenv.mkDerivation rec { pname = "gengetopt"; @@ -37,9 +37,9 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/gengetopt/"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index 36798fe4fc1..fb3ddfcb29b 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, libtool, makeWrapper +{ fetchurl, lib, stdenv, libtool, makeWrapper , coreutils, ctags, ncurses, pythonPackages, sqlite, universal-ctags }: @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { --prefix PYTHONPATH : "$(toPythonPath ${pythonPackages.pygments})" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Source code tag system"; longDescription = '' GNU GLOBAL is a source code tagging system that works the same way diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix index 2e3e4acfdc1..512989a1446 100644 --- a/pkgs/development/tools/misc/gnum4/default.nix +++ b/pkgs/development/tools/misc/gnum4/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or @@ -26,7 +26,7 @@ stdenv.mkDerivation { sha256 = "12lmdnbml9lfvy0khpjc42riicddaz7li8wmbnsam7zsw6al11qk"; }) ] - ++ stdenv.lib.optional stdenv.isDarwin ./darwin-secure-format.patch; + ++ lib.optional stdenv.isDarwin ./darwin-secure-format.patch; meta = { homepage = "https://www.gnu.org/software/m4/"; @@ -49,8 +49,8 @@ stdenv.mkDerivation { compiler or as a macro processor in its own right. ''; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.unix ++ stdenv.lib.platforms.windows; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.unix ++ lib.platforms.windows; }; } diff --git a/pkgs/development/tools/misc/gob2/default.nix b/pkgs/development/tools/misc/gob2/default.nix index b1e107368ba..b78c111ccbf 100644 --- a/pkgs/development/tools/misc/gob2/default.nix +++ b/pkgs/development/tools/misc/gob2/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, pkgconfig, glib, bison, flex, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, glib, bison, flex, gnome3 }: stdenv.mkDerivation rec { pname = "gob2"; version = "2.0.20"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "5fe5d7990fd65b0d4b617ba894408ebaa6df453f2781c15a1cfdf2956c0c5428"; }; # configure script looks for d-bus but it is only needed for tests - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib bison flex ]; passthru = { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Preprocessor for making GObjects with inline C code"; homepage = "https://www.jirka.org/gob.html"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/tools/misc/gperf/3.0.x.nix b/pkgs/development/tools/misc/gperf/3.0.x.nix index e013428a6f7..339511f2cc0 100644 --- a/pkgs/development/tools/misc/gperf/3.0.x.nix +++ b/pkgs/development/tools/misc/gperf/3.0.x.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, autoreconfHook }: +{lib, stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { name = "gperf-3.0.4"; @@ -27,9 +27,9 @@ stdenv.mkDerivation rec { employed by gperf. ''; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; homepage = "https://www.gnu.org/software/gperf/"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/tools/misc/gperf/default.nix b/pkgs/development/tools/misc/gperf/default.nix index bf85cd91380..e998f09683a 100644 --- a/pkgs/development/tools/misc/gperf/default.nix +++ b/pkgs/development/tools/misc/gperf/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { name = "gperf-3.1"; @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { employed by gperf. ''; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; homepage = "https://www.gnu.org/software/gperf/"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/tools/misc/gpshell/default.nix b/pkgs/development/tools/misc/gpshell/default.nix index 182d28375b6..13437b71953 100644 --- a/pkgs/development/tools/misc/gpshell/default.nix +++ b/pkgs/development/tools/misc/gpshell/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, globalplatform, pcsclite, gppcscconnectionplugin +{ lib, stdenv, fetchurl, pkg-config, globalplatform, pcsclite, gppcscconnectionplugin , makeWrapper }: @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { sha256 = "19a77zvyf2vazbv17185s4pynhylk2ky8vhl4i8pg9zww29sicqi"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ globalplatform pcsclite makeWrapper ]; postFixup = '' wrapProgram "$out/bin/gpshell" --prefix LD_LIBRARY_PATH : "${gppcscconnectionplugin}/lib" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://sourceforge.net/p/globalplatform/wiki/Home/"; description = "Smartcard management application"; license = licenses.gpl3; diff --git a/pkgs/development/tools/misc/gputils/default.nix b/pkgs/development/tools/misc/gputils/default.nix index 2ad496bfb88..c07949e8096 100644 --- a/pkgs/development/tools/misc/gputils/default.nix +++ b/pkgs/development/tools/misc/gputils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "gputils"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "055v83fdgqljprapf7rmh8x66mr13fj0qypj49xba5spx0ca123g"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://gputils.sourceforge.io"; description = "A collection of tools for the Microchip (TM) PIC microcontrollers. It includes gpasm, gplink, and gplib"; license = licenses.gpl2; diff --git a/pkgs/development/tools/misc/grpc-tools/default.nix b/pkgs/development/tools/misc/grpc-tools/default.nix new file mode 100644 index 00000000000..3e06f10cbf1 --- /dev/null +++ b/pkgs/development/tools/misc/grpc-tools/default.nix @@ -0,0 +1,40 @@ +{ lib +, stdenv +, cmake +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "grpc-tools"; + version = "1.10.0"; + + src = fetchFromGitHub { + owner = "grpc"; + repo = "grpc-node"; + rev = "3a094f01711942f79abd8a536c45a91b574d626f"; # version 1.10.0 was not tagged + sha256 = "1a7l91kxc3g7mqfqvhc3nb7zy0n21ifs5ck0qqg09qh3f44q04xm"; + fetchSubmodules = true; + }; + + sourceRoot = "source/packages/grpc-tools"; + + nativeBuildInputs = [ cmake ]; + + installPhase = '' + install -Dm755 -t $out/bin grpc_node_plugin + install -Dm755 -t $out/bin deps/protobuf/protoc + ''; + + meta = with lib; { + description = "Distribution of protoc and the gRPC Node protoc plugin for ease of installation with npm"; + longDescription = '' + This package distributes the Protocol Buffers compiler protoc along with + the plugin for generating client and service objects for use with the Node + gRPC libraries. + ''; + homepage = "https://github.com/grpc/grpc-node/tree/master/packages/grpc-tools"; + license = licenses.asl20; + platforms = platforms.all; + maintainers = [ maintainers.nzhang-zh ]; + }; +} diff --git a/pkgs/development/tools/misc/gtkdialog/default.nix b/pkgs/development/tools/misc/gtkdialog/default.nix index 6cdcce77ffd..6651bbb0384 100644 --- a/pkgs/development/tools/misc/gtkdialog/default.nix +++ b/pkgs/development/tools/misc/gtkdialog/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gtk2, pkgconfig }: +{lib, stdenv, fetchurl, gtk2, pkg-config }: stdenv.mkDerivation { name = "gtkdialog-0.8.3"; @@ -8,14 +8,14 @@ stdenv.mkDerivation { sha256 = "ff89d2d7f1e6488e5df5f895716ac1d4198c2467a2a5dc1f51ab408a2faec38e"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 ]; meta = { homepage = "https://code.google.com/archive/p/gtkdialog/"; # community links: http://murga-linux.com/puppy/viewtopic.php?t=111923 -> https://github.com/01micko/gtkdialog description = "Small utility for fast and easy GUI building from many scripted and compiled languages"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/tools/misc/gtkperf/default.nix b/pkgs/development/tools/misc/gtkperf/default.nix index 82ee2917277..4b7f7985a67 100644 --- a/pkgs/development/tools/misc/gtkperf/default.nix +++ b/pkgs/development/tools/misc/gtkperf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk2, pkgconfig, libintl }: +{ lib, stdenv, fetchurl, gtk2, pkg-config, libintl }: stdenv.mkDerivation { name = "gtkperf-0.40.0"; @@ -9,13 +9,13 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 libintl ]; # https://openbenchmarking.org/innhold/7e9780c11550d09aa67bdba71248facbe2d781db patches = [ ./bench.patch ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Application designed to test GTK performance"; homepage = "http://gtkperf.sourceforge.net/"; license = with licenses; [ gpl2 ]; diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index f23b5a9c8fd..6afc4415e11 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perlPackages, gettext }: +{ lib, stdenv, fetchurl, perlPackages, gettext }: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or @@ -27,14 +27,14 @@ stdenv.mkDerivation rec { cat > $out/bin/help2man <<EOF #! $SHELL -e export PERL5LIB=\''${PERL5LIB:+:}${perlPackages.LocaleGettext}/${perlPackages.perl.libPrefix} - ${stdenv.lib.optionalString stdenv.hostPlatform.isCygwin + ${lib.optionalString stdenv.hostPlatform.isCygwin ''export PATH=\''${PATH:+:}${gettext}/bin''} exec -a \$0 $out/bin/.help2man-wrapped "\$@" EOF chmod +x $out/bin/help2man ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Generate man pages from `--help' output"; longDescription = diff --git a/pkgs/development/tools/misc/hound/default.nix b/pkgs/development/tools/misc/hound/default.nix index 4e817251bff..476179ac8e7 100644 --- a/pkgs/development/tools/misc/hound/default.nix +++ b/pkgs/development/tools/misc/hound/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildGoPackage , fetchFromGitHub , makeWrapper @@ -32,8 +32,8 @@ buildGoPackage rec { inherit (src.meta) homepage; description = "Lightning fast code searching made easy"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ grahamc ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ grahamc ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/tools/misc/hydra-cli/default.nix b/pkgs/development/tools/misc/hydra-cli/default.nix index 10ecd8174af..9160a336681 100644 --- a/pkgs/development/tools/misc/hydra-cli/default.nix +++ b/pkgs/development/tools/misc/hydra-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, pkgconfig, openssl, fetchFromGitHub, rustPlatform, darwin }: +{ stdenv, lib, pkg-config, openssl, fetchFromGitHub, rustPlatform, darwin }: rustPlatform.buildRustPackage rec { pname = "hydra-cli"; @@ -16,10 +16,10 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; nativeBuildInputs = [ - pkgconfig + pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A client for the Hydra CI"; homepage = "https://github.com/nlewo/hydra-cli"; license = with licenses; [ mit ]; diff --git a/pkgs/development/tools/misc/hydra/common.nix b/pkgs/development/tools/misc/hydra/common.nix index 4af9fe04587..cf56e6c1a9c 100644 --- a/pkgs/development/tools/misc/hydra/common.nix +++ b/pkgs/development/tools/misc/hydra/common.nix @@ -1,6 +1,6 @@ { stdenv, nix, perlPackages, buildEnv, fetchFromGitHub -, makeWrapper, autoconf, automake, libtool, unzip, pkgconfig, sqlite, libpqxx -, gitAndTools, mercurial, darcs, subversion, breezy, openssl, bzip2, libxslt +, makeWrapper, autoconf, automake, libtool, unzip, pkg-config, sqlite, libpqxx +, top-git, mercurial, darcs, subversion, breezy, openssl, bzip2, libxslt , guile, perl, postgresql, nukeReferences, git, boehmgc, nlohmann_json , docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar , rpm, dpkg, cdrkit, pixz, lib, boost, autoreconfHook, src ? null, version ? null @@ -80,7 +80,7 @@ in stdenv.mkDerivation rec { buildInputs = [ makeWrapper autoconf automake libtool unzip nukeReferences sqlite libpqxx - gitAndTools.top-git mercurial /*darcs*/ subversion breezy openssl bzip2 libxslt + top-git mercurial /*darcs*/ subversion breezy openssl bzip2 libxslt perlDeps perl nix postgresql # for running the tests nlohmann_json @@ -89,10 +89,10 @@ in stdenv.mkDerivation rec { hydraPath = lib.makeBinPath ( [ sqlite subversion openssh nix coreutils findutils pixz - gzip bzip2 lzma gnutar unzip git gitAndTools.top-git mercurial /*darcs*/ gnused breezy + gzip bzip2 lzma gnutar unzip git top-git mercurial /*darcs*/ gnused breezy ] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] ); - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ]; @@ -128,7 +128,7 @@ in stdenv.mkDerivation rec { passthru = { inherit perlDeps migration tests; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Nix-based continuous build system"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/development/tools/misc/icon-naming-utils/default.nix b/pkgs/development/tools/misc/icon-naming-utils/default.nix index 0905ce48463..8fdc448ee91 100644 --- a/pkgs/development/tools/misc/icon-naming-utils/default.nix +++ b/pkgs/development/tools/misc/icon-naming-utils/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, perlPackages, librsvg}: +{lib, stdenv, fetchurl, perlPackages, librsvg}: stdenv.mkDerivation rec { name = "icon-naming-utils-0.8.90"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { --replace '/bin/perl' '/bin/perl -I${perlPackages.XMLSimple}/${perlPackages.perl.libPrefix}' ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://tango.freedesktop.org/Standard_Icon_Naming_Specification"; platforms = with platforms; linux ++ darwin; license = licenses.gpl2; diff --git a/pkgs/development/tools/misc/igprof/default.nix b/pkgs/development/tools/misc/igprof/default.nix index 0780672cc02..47f41f130be 100644 --- a/pkgs/development/tools/misc/igprof/default.nix +++ b/pkgs/development/tools/misc/igprof/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, libunwind, cmake, pcre, gdb}: +{lib, stdenv, fetchFromGitHub, libunwind, cmake, pcre, gdb}: stdenv.mkDerivation rec { version = "5.9.16"; @@ -34,10 +34,10 @@ stdenv.mkDerivation rec { details and see the big picture from combined workloads. ''; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; homepage = "https://igprof.org/"; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ ktf ]; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ ktf ]; }; } diff --git a/pkgs/development/tools/misc/indent/default.nix b/pkgs/development/tools/misc/indent/default.nix index c4b5fecca74..8c5ec6af1c7 100644 --- a/pkgs/development/tools/misc/indent/default.nix +++ b/pkgs/development/tools/misc/indent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, texinfo }: +{ lib, stdenv, fetchurl, texinfo }: stdenv.mkDerivation rec { name = "indent-2.2.12"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ texinfo ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-implicit-function-declaration"; hardeningDisable = [ "format" ]; @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.gnu.org/software/indent/"; description = "A source code reformatter"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = [ stdenv.lib.maintainers.mmahut ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.mmahut ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/tools/misc/inotify-tools/default.nix b/pkgs/development/tools/misc/inotify-tools/default.nix index a9d642f48f0..e085d3dd259 100644 --- a/pkgs/development/tools/misc/inotify-tools/default.nix +++ b/pkgs/development/tools/misc/inotify-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoreconfHook, fetchFromGitHub, fetchpatch }: +{ lib, stdenv, autoreconfHook, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { pname = "inotify-tools"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/rvoicilas/inotify-tools/wiki"; license = licenses.gpl2; maintainers = with maintainers; [ marcweber pSub ]; diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix index 19556aeafc0..62d350593b1 100644 --- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix +++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, xorgproto, udev +{ lib, stdenv, fetchurl, pkg-config, libdrm, libpciaccess, cairo, xorgproto, udev , libX11, libXext, libXv, libXrandr, glib, bison, libunwind, python3, kmod , procps, utilmacros, gtk-doc, openssl, peg, elfutils }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "04fx7xclhick3k7fyk9c4mn8mxzf1253j1r0hrvj9sl40j7lsia0"; }; - nativeBuildInputs = [ pkgconfig utilmacros ]; + nativeBuildInputs = [ pkg-config utilmacros ]; buildInputs = [ libdrm libpciaccess cairo xorgproto udev libX11 kmod libXext libXv libXrandr glib bison libunwind python3 procps gtk-doc openssl peg elfutils ]; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://01.org/linuxgraphics/"; description = "Tools for development and testing of the Intel DRM driver"; license = licenses.mit; diff --git a/pkgs/development/tools/misc/intltool/default.nix b/pkgs/development/tools/misc/intltool/default.nix index 20f880938c6..7a3379d5921 100644 --- a/pkgs/development/tools/misc/intltool/default.nix +++ b/pkgs/development/tools/misc/intltool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, gettext, perlPackages, buildPackages }: +{ lib, stdenv, fetchurl, fetchpatch, gettext, perlPackages, buildPackages }: stdenv.mkDerivation rec { pname = "intltool"; @@ -22,12 +22,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = with perlPackages; [ perl XMLParser ]; propagatedBuildInputs = [ gettext ] ++ (with perlPackages; [ perl XMLParser ]); - postInstall = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + postInstall = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' for f in $out/bin/*; do substituteInPlace $f --replace "${buildPackages.perl}" "${perlPackages.perl}" done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Translation helper tool"; homepage = "https://launchpad.net/intltool/"; license = licenses.gpl2Plus; diff --git a/pkgs/development/tools/misc/iozone/default.nix b/pkgs/development/tools/misc/iozone/default.nix index 93e2673be63..ad62d104873 100644 --- a/pkgs/development/tools/misc/iozone/default.nix +++ b/pkgs/development/tools/misc/iozone/default.nix @@ -55,8 +55,8 @@ stdenv.mkDerivation rec { meta = { description = "IOzone Filesystem Benchmark"; homepage = "http://www.iozone.org/"; - license = stdenv.lib.licenses.unfreeRedistributable; + license = lib.licenses.unfreeRedistributable; platforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]; - maintainers = with stdenv.lib.maintainers; [ Baughn makefu ]; + maintainers = with lib.maintainers; [ Baughn makefu ]; }; } diff --git a/pkgs/development/tools/misc/itm-tools/default.nix b/pkgs/development/tools/misc/itm-tools/default.nix index a121cc67099..32c32b536d9 100644 --- a/pkgs/development/tools/misc/itm-tools/default.nix +++ b/pkgs/development/tools/misc/itm-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkg-config }: +{ lib, fetchFromGitHub, rustPlatform, pkg-config }: rustPlatform.buildRustPackage rec { pname = "itm-tools"; @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Tools for analyzing ITM traces"; homepage = "https://github.com/japaric/itm-tools"; license = with licenses; [ asl20 mit ]; diff --git a/pkgs/development/tools/misc/itstool/default.nix b/pkgs/development/tools/misc/itstool/default.nix index d46256f039a..55e62a2dcae 100644 --- a/pkgs/development/tools/misc/itstool/default.nix +++ b/pkgs/development/tools/misc/itstool/default.nix @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://itstool.org/"; description = "XML to PO and back again"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.all; maintainers = [ ]; }; } diff --git a/pkgs/development/tools/misc/jscoverage/default.nix b/pkgs/development/tools/misc/jscoverage/default.nix index 6ed66c8d3cc..a978c31c34d 100644 --- a/pkgs/development/tools/misc/jscoverage/default.nix +++ b/pkgs/development/tools/misc/jscoverage/default.nix @@ -1,4 +1,4 @@ -{ autoconf, fetchurl, makedepend, perl, python, stdenv, unzip, zip }: +{ autoconf, fetchurl, makedepend, perl, python, lib, stdenv, unzip, zip }: stdenv.mkDerivation rec { name = "jscoverage-0.5.1"; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://siliconforks.com/jscoverage/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/tools/misc/kconfig-frontends/default.nix b/pkgs/development/tools/misc/kconfig-frontends/default.nix index fa413511dc0..3b355b6218a 100644 --- a/pkgs/development/tools/misc/kconfig-frontends/default.nix +++ b/pkgs/development/tools/misc/kconfig-frontends/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, bison, flex, gperf, ncurses, pythonPackages }: +{ lib, stdenv, fetchurl, pkg-config, bison, flex, gperf, ncurses, pythonPackages }: stdenv.mkDerivation rec { basename = "kconfig-frontends"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { url = "http://ymorin.is-a-geek.org/download/${basename}/${name}.tar.xz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ bison flex gperf ncurses pythonPackages.python pythonPackages.wrapPython ]; configureFlags = [ @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { wrapPythonPrograms ''; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=format-security"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=format-security"; - meta = with stdenv.lib; { + meta = with lib; { description = "Out of Linux tree packaging of the kconfig infrastructure"; longDescription = '' Configuration language and system for the Linux kernel and other diff --git a/pkgs/development/tools/misc/kdbg/default.nix b/pkgs/development/tools/misc/kdbg/default.nix index 78acf8e17a7..35e0a52865f 100644 --- a/pkgs/development/tools/misc/kdbg/default.nix +++ b/pkgs/development/tools/misc/kdbg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, extra-cmake-modules, qt5, +{ lib, stdenv, fetchurl, cmake, extra-cmake-modules, qt5, ki18n, kconfig, kiconthemes, kxmlgui, kwindowsystem, qtbase, makeWrapper, }: @@ -18,7 +18,9 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/kdbg --prefix QT_PLUGIN_PATH : ${qtbase}/${qtbase.qtPluginPrefix} ''; - meta = with stdenv.lib; { + dontWrapQtApps = true; + + meta = with lib; { homepage = "https://www.kdbg.org/"; description = '' A graphical user interface to gdb, the GNU debugger. It provides an diff --git a/pkgs/development/tools/misc/kibana/6.x.nix b/pkgs/development/tools/misc/kibana/6.x.nix index 354f77d0fb9..3fa2d219fe3 100644 --- a/pkgs/development/tools/misc/kibana/6.x.nix +++ b/pkgs/development/tools/misc/kibana/6.x.nix @@ -1,6 +1,6 @@ { elk6Version , enableUnfree ? true -, stdenv +, lib, stdenv , makeWrapper , fetchurl , nodejs-10_x @@ -8,7 +8,7 @@ , which }: -with stdenv.lib; +with lib; let nodejs = nodejs-10_x; inherit (builtins) elemAt; @@ -49,7 +49,7 @@ in stdenv.mkDerivation rec { 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 ]}" + --prefix PATH : "${lib.makeBinPath [ nodejs coreutils which ]}" sed -i 's@NODE=.*@NODE=${nodejs}/bin/node@' $out/libexec/kibana/bin/kibana ''; diff --git a/pkgs/development/tools/misc/kibana/7.x.nix b/pkgs/development/tools/misc/kibana/7.x.nix index dc3beb9866c..7f46d6f6512 100644 --- a/pkgs/development/tools/misc/kibana/7.x.nix +++ b/pkgs/development/tools/misc/kibana/7.x.nix @@ -1,6 +1,6 @@ { elk7Version , enableUnfree ? true -, stdenv +, lib, stdenv , makeWrapper , fetchurl , nodejs-10_x @@ -8,7 +8,7 @@ , which }: -with stdenv.lib; +with lib; let nodejs = nodejs-10_x; inherit (builtins) elemAt; @@ -49,7 +49,7 @@ in stdenv.mkDerivation rec { 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 ]}" + --prefix PATH : "${lib.makeBinPath [ nodejs coreutils which ]}" sed -i 's@NODE=.*@NODE=${nodejs}/bin/node@' $out/libexec/kibana/bin/kibana ''; diff --git a/pkgs/development/tools/misc/libtool/default.nix b/pkgs/development/tools/misc/libtool/default.nix index 199c6504f39..2b0089e89f6 100644 --- a/pkgs/development/tools/misc/libtool/default.nix +++ b/pkgs/development/tools/misc/libtool/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, m4, perl}: +{lib, stdenv, fetchurl, m4, perl}: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/libtool/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/tools/misc/libtool/libtool2.nix b/pkgs/development/tools/misc/libtool/libtool2.nix index fbe49dc68b2..6d7c4a9087f 100644 --- a/pkgs/development/tools/misc/libtool/libtool2.nix +++ b/pkgs/development/tools/misc/libtool/libtool2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, m4, perl, help2man +{ lib, stdenv, fetchurl, m4, perl, help2man }: stdenv.mkDerivation rec { @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "GNU Libtool, a generic library support script"; longDescription = '' GNU libtool is a generic library support script. Libtool hides diff --git a/pkgs/development/tools/misc/libwhich/default.nix b/pkgs/development/tools/misc/libwhich/default.nix index 59bbb99bd46..aeda5271142 100644 --- a/pkgs/development/tools/misc/libwhich/default.nix +++ b/pkgs/development/tools/misc/libwhich/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "libwhich"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { install -Dm755 -t $out/bin libwhich ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Like `which`, for dynamic libraries"; homepage = "https://github.com/vtjnash/libwhich"; license = licenses.mit; diff --git a/pkgs/development/tools/misc/loccount/default.nix b/pkgs/development/tools/misc/loccount/default.nix index ace34f35059..32a14404c60 100644 --- a/pkgs/development/tools/misc/loccount/default.nix +++ b/pkgs/development/tools/misc/loccount/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitLab }: +{ lib, buildGoPackage, fetchFromGitLab }: buildGoPackage rec { pname = "loccount"; version = "1.2"; @@ -13,7 +13,7 @@ buildGoPackage rec { sha256 = "18z7ai7wy2k9yd3w65d37apfqs3h9bc2c15y7v1bydppi44zfsdk"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Re-implementation of sloccount in Go"; longDescription = '' loccount is a re-implementation of David A. Wheeler's sloccount tool diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix index e5988b1d5a9..94e3722598b 100644 --- a/pkgs/development/tools/misc/lsof/default.nix +++ b/pkgs/development/tools/misc/lsof/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, buildPackages, ncurses }: +{ lib, stdenv, fetchFromGitHub, buildPackages, ncurses }: -let dialect = with stdenv.lib; last (splitString "-" stdenv.hostPlatform.system); in +let dialect = with lib; last (splitString "-" stdenv.hostPlatform.system); in stdenv.mkDerivation rec { pname = "lsof"; @@ -18,14 +18,14 @@ stdenv.mkDerivation rec { patches = [ ./no-build-info.patch ]; - postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + postPatch = lib.optionalString stdenv.hostPlatform.isMusl '' substituteInPlace dialects/linux/dlsof.h --replace "defined(__UCLIBC__)" 1 - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' sed -i 's|lcurses|lncurses|g' Configure ''; # Stop build scripts from searching global include paths - LSOF_INCLUDE = "${stdenv.lib.getDev stdenv.cc.libc}/include"; + LSOF_INCLUDE = "${lib.getDev stdenv.cc.libc}/include"; configurePhase = "LINUX_CONF_CC=$CC_FOR_BUILD LSOF_CC=$CC LSOF_AR=\"$AR cr\" LSOF_RANLIB=$RANLIB ./Configure -n ${dialect}"; preBuild = '' for filepath in $(find dialects/${dialect} -type f); do @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { cp lsof $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/lsof-org/lsof"; description = "A tool to list open files"; longDescription = '' diff --git a/pkgs/development/tools/misc/ltrace/default.nix b/pkgs/development/tools/misc/ltrace/default.nix index d88d9d7a7be..e1d9ae6b551 100644 --- a/pkgs/development/tools/misc/ltrace/default.nix +++ b/pkgs/development/tools/misc/ltrace/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, elfutils, libunwind }: +{ lib, stdenv, fetchurl, elfutils, libunwind }: stdenv.mkDerivation { name = "ltrace-0.7.3"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { patches="$patches $(cat debian/patches/series | sed 's|^|debian/patches/|')" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Library call tracer"; homepage = "https://www.ltrace.org/"; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix index 03e370aeeb4..223e10d04ab 100644 --- a/pkgs/development/tools/misc/lttng-tools/default.nix +++ b/pkgs/development/tools/misc/lttng-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, popt, libuuid, liburcu, lttng-ust, kmod, libxml2 }: +{ lib, stdenv, fetchurl, pkg-config, popt, libuuid, liburcu, lttng-ust, kmod, libxml2 }: stdenv.mkDerivation rec { pname = "lttng-tools"; @@ -9,10 +9,10 @@ stdenv.mkDerivation rec { sha256 = "1g0g7ypxvc7wd5x4d4ixmfgl9yk0lxax3ymm95hcjwxn5p497r6w"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ popt libuuid liburcu lttng-ust libxml2 kmod ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Tracing tools (kernel + user space) for Linux"; homepage = "https://lttng.org/"; license = licenses.lgpl21; diff --git a/pkgs/development/tools/misc/lttng-ust/default.nix b/pkgs/development/tools/misc/lttng-ust/default.nix index ba3930642b1..94d2e4a33f2 100644 --- a/pkgs/development/tools/misc/lttng-ust/default.nix +++ b/pkgs/development/tools/misc/lttng-ust/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, liburcu, python3 }: +{ lib, stdenv, fetchurl, liburcu, python3 }: # NOTE: # ./configure ... @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ liburcu ]; - meta = with stdenv.lib; { + meta = with lib; { description = "LTTng Userspace Tracer libraries"; homepage = "https://lttng.org/"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/tools/misc/lttv/default.nix b/pkgs/development/tools/misc/lttv/default.nix index abcc476d594..a196c5f4528 100644 --- a/pkgs/development/tools/misc/lttv/default.nix +++ b/pkgs/development/tools/misc/lttv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, gtk2, popt, babeltrace }: +{ lib, stdenv, fetchurl, pkg-config, glib, gtk2, popt, babeltrace }: stdenv.mkDerivation rec { name = "lttv-1.5"; @@ -8,10 +8,10 @@ stdenv.mkDerivation rec { sha256 = "1faldxnh9dld5k0vxckwpqw241ya1r2zv286l6rpgqr500zqw7r1"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib gtk2 popt babeltrace ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Graphical trace viewer for LTTng trace files"; homepage = "https://lttng.org/"; # liblttvtraceread (ltt/ directory) is distributed under the GNU LGPL v2.1. diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix index fa19b249407..77f34cca7de 100644 --- a/pkgs/development/tools/misc/luarocks/default.nix +++ b/pkgs/development/tools/misc/luarocks/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub +{lib, stdenv, fetchFromGitHub , curl, makeWrapper, which, unzip , lua # for 'luarocks pack' @@ -62,9 +62,9 @@ stdenv.mkDerivation rec { export LUA_PATH="src/?.lua;''${LUA_PATH:-}" ''; - meta = with stdenv.lib; { + meta = with lib; { inherit version; - description = ''A package manager for Lua''; + description = "A package manager for Lua"; license = licenses.mit ; maintainers = with maintainers; [raskin teto]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix index 57f200fd0fc..30e02a3623f 100644 --- a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix +++ b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix @@ -1,14 +1,11 @@ { luarocks, fetchFromGitHub }: luarocks.overrideAttrs(old: { pname = "luarocks-nix"; - version = "2019-09-07"; + version = "2021-01-22"; src = fetchFromGitHub { owner = "nix-community"; repo = "luarocks-nix"; - rev = "73b8772e56fd39dfffda9e3b13e9eb31e93d5cde"; - sha256 = "00jgshygw439pbaxg7yph3ijia6nid9r1br416wdbyl5wqhlhm1y"; + rev = "v3.5.0_nix"; + sha256 = "sha256-Ea3PVkCaUPO/mvVZtHtD1G9T/Yom28M9oN6duY4ovHk="; }; - patches = [ - ./darwin-3.1.3.patch - ]; }) diff --git a/pkgs/development/tools/misc/macdylibbundler/default.nix b/pkgs/development/tools/misc/macdylibbundler/default.nix index 5008175363c..c92d7b07798 100644 --- a/pkgs/development/tools/misc/macdylibbundler/default.nix +++ b/pkgs/development/tools/misc/macdylibbundler/default.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, fetchFromGitHub, cctools }: +{ lib, stdenv, makeWrapper, fetchFromGitHub, cctools }: stdenv.mkDerivation { pname = "macdylibbundler"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { --prefix PATH ":" "${cctools}/bin" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Utility to ease bundling libraries into executables for OSX"; longDescription = '' dylibbundler is a small command-line programs that aims to make bundling diff --git a/pkgs/development/tools/misc/mdl/gemset.nix b/pkgs/development/tools/misc/mdl/gemset.nix index f2d332a95bb..eaaa7bed5a5 100644 --- a/pkgs/development/tools/misc/mdl/gemset.nix +++ b/pkgs/development/tools/misc/mdl/gemset.nix @@ -94,4 +94,4 @@ }; version = "2.0.0"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/misc/micronucleus/default.nix b/pkgs/development/tools/misc/micronucleus/default.nix index 890439adc6e..2999b741888 100644 --- a/pkgs/development/tools/misc/micronucleus/default.nix +++ b/pkgs/development/tools/misc/micronucleus/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libusb-compat-0_1 ]; - makeFlags = stdenv.lib.optionals stdenv.isDarwin [ "CC=cc" ]; + makeFlags = lib.optionals stdenv.isDarwin [ "CC=cc" ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/development/tools/misc/msitools/default.nix b/pkgs/development/tools/misc/msitools/default.nix index 0e28f729fe9..f444f86dbfb 100644 --- a/pkgs/development/tools/misc/msitools/default.nix +++ b/pkgs/development/tools/misc/msitools/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, intltool, glib, pkgconfig, libgsf, libuuid, gcab, bzip2, gnome3 }: +{ lib, stdenv, fetchurl, intltool, glib, pkg-config, libgsf, libuuid, gcab, bzip2, gnome3 }: stdenv.mkDerivation rec { pname = "msitools"; version = "0.98"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "19wb3n3nwkpc6bjr0q3f1znaxsfaqgjbdxxnbx8ic8bb5b49hwac"; }; - nativeBuildInputs = [ intltool pkgconfig ]; + nativeBuildInputs = [ intltool pkg-config ]; buildInputs = [ glib libgsf libuuid gcab bzip2 ]; passthru = { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Set of programs to inspect and build Windows Installer (.MSI) files"; homepage = "https://wiki.gnome.org/msitools"; license = [ licenses.gpl2 licenses.lgpl21 ]; diff --git a/pkgs/development/tools/misc/nimlsp/default.nix b/pkgs/development/tools/misc/nimlsp/default.nix index 5795fca457d..1919e26ddec 100644 --- a/pkgs/development/tools/misc/nimlsp/default.nix +++ b/pkgs/development/tools/misc/nimlsp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, srcOnly, nim }: +{ lib, stdenv, fetchFromGitHub, srcOnly, nim }: let astpatternmatching = fetchFromGitHub { owner = "krux02"; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { install -Dt $out/bin src/nimlsp ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Language Server Protocol implementation for Nim"; homepage = "https://github.com/PMunch/nimlsp"; license = licenses.mit; diff --git a/pkgs/development/tools/misc/ninka/default.nix b/pkgs/development/tools/misc/ninka/default.nix index e683bef7b06..8e8fb6bb597 100644 --- a/pkgs/development/tools/misc/ninka/default.nix +++ b/pkgs/development/tools/misc/ninka/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, perl, perlPackages }: +{ lib, stdenv, fetchFromGitHub, perl, perlPackages }: assert stdenv ? glibc; @@ -26,7 +26,7 @@ perlPackages.buildPerlPackage { perl Makefile.PL ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A sentence based license detector"; homepage = "http://ninka.turingmachine.org/"; license = licenses.gpl2; diff --git a/pkgs/development/tools/misc/nrfutil/default.nix b/pkgs/development/tools/misc/nrfutil/default.nix index eeb9100a4c8..6d58a39f704 100644 --- a/pkgs/development/tools/misc/nrfutil/default.nix +++ b/pkgs/development/tools/misc/nrfutil/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python37Packages, fetchFromGitHub }: +{ lib, python37Packages, fetchFromGitHub }: with python37Packages; buildPythonApplication rec { pname = "nrfutil"; @@ -20,7 +20,7 @@ with python37Packages; buildPythonApplication rec { mkdir test-reports ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Device Firmware Update tool for nRF chips"; homepage = "https://github.com/NordicSemiconductor/pc-nrfutil"; license = licenses.unfreeRedistributable; diff --git a/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix b/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix index e9259b7156b..74309a33f22 100644 --- a/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix +++ b/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , pkg-config @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { preConfigure = "echo ${version} > .tarball-version"; - meta = with stdenv.lib; { + meta = with lib; { description = "Freescale/NXP I.MX chip image deploy tools"; longDescription = '' UUU (Universal Update Utility) is a command line tool, evolved out of diff --git a/pkgs/development/tools/misc/objconv/default.nix b/pkgs/development/tools/misc/objconv/default.nix index 52cc1b2d5c5..55147e9a16d 100644 --- a/pkgs/development/tools/misc/objconv/default.nix +++ b/pkgs/development/tools/misc/objconv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { pname = "objconv"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { mv objconv-instructions.pdf $out/doc/objconv ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Object and executable file converter, modifier and disassembler"; homepage = "https://www.agner.org/optimize/"; license = licenses.gpl2; diff --git a/pkgs/development/tools/misc/one_gadget/gemset.nix b/pkgs/development/tools/misc/one_gadget/gemset.nix index 26507a26e91..89425f805b4 100644 --- a/pkgs/development/tools/misc/one_gadget/gemset.nix +++ b/pkgs/development/tools/misc/one_gadget/gemset.nix @@ -31,4 +31,4 @@ }; version = "1.7.2"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/misc/opengrok/default.nix b/pkgs/development/tools/misc/opengrok/default.nix index 79fa383300e..01f2ced1f4b 100644 --- a/pkgs/development/tools/misc/opengrok/default.nix +++ b/pkgs/development/tools/misc/opengrok/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, ctags, makeWrapper, coreutils, git, runtimeShell }: +{ lib, stdenv, fetchurl, jre, ctags, makeWrapper, coreutils, git, runtimeShell }: stdenv.mkDerivation rec { pname = "opengrok"; @@ -18,12 +18,12 @@ stdenv.mkDerivation rec { substituteInPlace $out/bin/OpenGrok --replace "/bin/uname" "${coreutils}/bin/uname" substituteInPlace $out/bin/Messages --replace "#!/bin/ksh" "#!${runtimeShell}" wrapProgram $out/bin/OpenGrok \ - --prefix PATH : "${stdenv.lib.makeBinPath [ ctags git ]}" \ + --prefix PATH : "${lib.makeBinPath [ ctags git ]}" \ --set JAVA_HOME "${jre}" \ --set OPENGROK_TOMCAT_BASE "/var/tomcat" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Source code search and cross reference engine"; homepage = "https://opengrok.github.io/OpenGrok/"; license = licenses.cddl; diff --git a/pkgs/development/tools/misc/pahole/default.nix b/pkgs/development/tools/misc/pahole/default.nix index bb88862a8e8..c39ef5e0051 100644 --- a/pkgs/development/tools/misc/pahole/default.nix +++ b/pkgs/development/tools/misc/pahole/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, elfutils, zlib }: +{ lib, stdenv, fetchgit, cmake, elfutils, zlib }: stdenv.mkDerivation rec { pname = "pahole"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { # Put libraries in "lib" subdirectory, not top level of $out cmakeFlags = [ "-D__LIB=lib" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://git.kernel.org/cgit/devel/pahole/pahole.git/"; description = "Pahole and other DWARF utils"; license = licenses.gpl2; diff --git a/pkgs/development/tools/misc/patchelf/default.nix b/pkgs/development/tools/misc/patchelf/default.nix index 1d31709ccf0..a0c002d8a8c 100644 --- a/pkgs/development/tools/misc/patchelf/default.nix +++ b/pkgs/development/tools/misc/patchelf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { # fails 8 out of 24 tests, problems when loading libc.so.6 doCheck = stdenv.name == "stdenv-linux"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/NixOS/patchelf/blob/master/README"; license = licenses.gpl3; description = "A small utility to modify the dynamic linker and RPATH of ELF executables"; diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix index 0d9eeb84bfb..1d790740e69 100644 --- a/pkgs/development/tools/misc/patchelf/unstable.nix +++ b/pkgs/development/tools/misc/patchelf/unstable.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, fetchFromGitHub }: +{ lib, stdenv, fetchurl, autoreconfHook, fetchFromGitHub }: stdenv.mkDerivation rec { name = "patchelf-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; # Drop test that fails on musl (?) - postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + postPatch = lib.optionalString stdenv.hostPlatform.isMusl '' substituteInPlace tests/Makefile.am \ --replace "set-rpath-library.sh" "" ''; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isDarwin; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/NixOS/patchelf/blob/master/README"; license = licenses.gpl3; description = "A small utility to modify the dynamic linker and RPATH of ELF executables"; diff --git a/pkgs/development/tools/misc/perfect-hash/default.nix b/pkgs/development/tools/misc/perfect-hash/default.nix index 4e405413e3a..71747f0d117 100644 --- a/pkgs/development/tools/misc/perfect-hash/default.nix +++ b/pkgs/development/tools/misc/perfect-hash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3, fetchFromGitHub }: +{ lib, python3, fetchFromGitHub }: python3.pkgs.buildPythonApplication rec { pname = "perfect-hash"; version = "0.4.1"; @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { cp -r examples $out/share/doc/perfect-hash ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Minimal perfect hash function generator"; longDescription = '' Generate a minimal perfect hash function for a given set of keys. diff --git a/pkgs/development/tools/misc/pkg-config/default.nix b/pkgs/development/tools/misc/pkg-config/default.nix index 84f6c330f8c..b0b3115700f 100644 --- a/pkgs/development/tools/misc/pkg-config/default.nix +++ b/pkgs/development/tools/misc/pkg-config/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl, libiconv, vanilla ? false }: +{ lib, stdenv, fetchurl, libiconv, vanilla ? false }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "pkg-config"; version = "0.29.2"; src = fetchurl { - url = "https://pkgconfig.freedesktop.org/releases/${pname}-${version}.tar.gz"; + url = "https://pkg-config.freedesktop.org/releases/${pname}-${version}.tar.gz"; sha256 = "14fmwzki1rlz8bs2p810lk6jqdxsk966d8drgsjmi54cd00rrikg"; }; diff --git a/pkgs/development/tools/misc/pkgconf/default.nix b/pkgs/development/tools/misc/pkgconf/default.nix index 6fca02ad788..c6c984f9699 100644 --- a/pkgs/development/tools/misc/pkgconf/default.nix +++ b/pkgs/development/tools/misc/pkgconf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, removeReferencesTo }: +{ lib, stdenv, fetchurl, removeReferencesTo }: stdenv.mkDerivation rec { pname = "pkgconf"; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { mv ${placeholder "dev"}/share ${placeholder "out"} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Package compiler and linker metadata toolkit"; homepage = "https://git.dereferenced.org/pkgconf/pkgconf"; platforms = platforms.all; diff --git a/pkgs/development/tools/misc/pmccabe/default.nix b/pkgs/development/tools/misc/pmccabe/default.nix index 81a88f20ad2..1fd58fd14a2 100644 --- a/pkgs/development/tools/misc/pmccabe/default.nix +++ b/pkgs/development/tools/misc/pmccabe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "pmccabe"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "McCabe-style function complexity and line counting for C and C++"; homepage = "https://people.debian.org/~bame/pmccabe/"; license = licenses.gpl2Plus; diff --git a/pkgs/development/tools/misc/prelink/default.nix b/pkgs/development/tools/misc/prelink/default.nix index 5d7ca75de32..63fc7c8e64a 100644 --- a/pkgs/development/tools/misc/prelink/default.nix +++ b/pkgs/development/tools/misc/prelink/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libelf }: +{ lib, stdenv, fetchurl, libelf }: let version = "20130503"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { inherit version; buildInputs = [ - libelf stdenv.cc.libc (stdenv.lib.getOutput "static" stdenv.cc.libc) + libelf stdenv.cc.libc (lib.getOutput "static" stdenv.cc.libc) ]; src = fetchurl { @@ -20,6 +20,6 @@ stdenv.mkDerivation { homepage = "https://people.redhat.com/jakub/prelink/"; license = "GPL"; description = "ELF prelinking utility to speed up dynamic linking"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/tools/misc/premake/3.nix b/pkgs/development/tools/misc/premake/3.nix index a630c0ced9e..9176842d75d 100644 --- a/pkgs/development/tools/misc/premake/3.nix +++ b/pkgs/development/tools/misc/premake/3.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip}: +{lib, stdenv, fetchurl, unzip}: let baseName = "premake"; version = "3.7"; @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { homepage = "http://industriousone.com/premake"; description = "A simple build configuration and project generation tool using lua"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.bsd3; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/tools/misc/premake/5.nix b/pkgs/development/tools/misc/premake/5.nix index 5e8606833d3..bb0269d0cc3 100644 --- a/pkgs/development/tools/misc/premake/5.nix +++ b/pkgs/development/tools/misc/premake/5.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, Foundation, readline }: +{ lib, stdenv, fetchFromGitHub, Foundation, readline }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "premake5"; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://premake.github.io"; description = "A simple build configuration and project generation tool using lua"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; platforms = platforms.darwin ++ platforms.linux; }; } diff --git a/pkgs/development/tools/misc/premake/default.nix b/pkgs/development/tools/misc/premake/default.nix index 92445abbba9..ccd8a4574a1 100644 --- a/pkgs/development/tools/misc/premake/default.nix +++ b/pkgs/development/tools/misc/premake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: let baseName = "premake"; version = "4.3"; @@ -25,10 +25,10 @@ stdenv.mkDerivation { premake_cmd = "premake4"; setupHook = ./setup-hook.sh; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://industriousone.com/premake"; description = "A simple build configuration and project generation tool using lua"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; }; diff --git a/pkgs/development/tools/misc/ptags/default.nix b/pkgs/development/tools/misc/ptags/default.nix index 93014af3f62..8406ecf298f 100644 --- a/pkgs/development/tools/misc/ptags/default.nix +++ b/pkgs/development/tools/misc/ptags/default.nix @@ -2,7 +2,7 @@ , cargo , lib , rustPlatform -, stdenv + }: rustPlatform.buildRustPackage rec { @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { $releaseDir/ptags --help > /dev/null ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A parallel universal-ctags wrapper for git repository"; homepage = "https://github.com/dalance/ptags"; maintainers = with maintainers; [ pamplemousse ]; diff --git a/pkgs/development/tools/misc/pwndbg/default.nix b/pkgs/development/tools/misc/pwndbg/default.nix index f9d792d185f..69ed17ab4b9 100644 --- a/pkgs/development/tools/misc/pwndbg/default.nix +++ b/pkgs/development/tools/misc/pwndbg/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , python3 , fetchFromGitHub , makeWrapper @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { --set NIX_PYTHONPATH ${pythonPath} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Exploit Development and Reverse Engineering with GDB Made Easy"; homepage = "https://github.com/pwndbg/pwndbg"; license = licenses.mit; diff --git a/pkgs/development/tools/misc/remarkable/remarkable-toolchain/default.nix b/pkgs/development/tools/misc/remarkable/remarkable-toolchain/default.nix index d259721353b..643e28e82b2 100644 --- a/pkgs/development/tools/misc/remarkable/remarkable-toolchain/default.nix +++ b/pkgs/development/tools/misc/remarkable/remarkable-toolchain/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libarchive, python, file, which }: +{ lib, stdenv, fetchurl, libarchive, python, file, which }: stdenv.mkDerivation rec { pname = "remarkable-toolchain"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ENVCLEANED=1 $src -y -d $out ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A toolchain for cross-compiling to reMarkable tablets"; homepage = "https://remarkable.engineering/"; license = licenses.gpl2; diff --git a/pkgs/development/tools/misc/remarkable/remarkable2-toolchain/default.nix b/pkgs/development/tools/misc/remarkable/remarkable2-toolchain/default.nix new file mode 100644 index 00000000000..7b4df5df164 --- /dev/null +++ b/pkgs/development/tools/misc/remarkable/remarkable2-toolchain/default.nix @@ -0,0 +1,39 @@ +{ lib, stdenv, fetchurl, libarchive, python3, file }: + +stdenv.mkDerivation rec { + pname = "remarkable2-toolchain"; + version = "2.5.2"; + + src = fetchurl { + url = "https://storage.googleapis.com/codex-public-bucket/codex-x86_64-cortexa7hf-neon-rm11x-toolchain-${version}.sh"; + sha256 = "1v410q1jn8flisdpkrymxd4pa1ylawd0rh3rljjpkqw1bp8a5vw1"; + }; + + nativeBuildInputs = [ + libarchive + python3 + file + ]; + + unpackCmd = '' + mkdir src + install $curSrc src/install-toolchain.sh + ''; + + dontBuild = true; + + installPhase = '' + patchShebangs install-toolchain.sh + sed -i -e '3,9d' install-toolchain.sh # breaks PATH + sed -i 's|PYTHON=.*$|PYTHON=${python3}/bin/python|' install-toolchain.sh + ./install-toolchain.sh -D -y -d $out + ''; + + meta = with lib; { + description = "A toolchain for cross-compiling to reMarkable 2 tablets"; + homepage = "https://remarkable.engineering/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ tadfisher ]; + platforms = platforms.x86_64; + }; +} diff --git a/pkgs/development/tools/misc/rman/default.nix b/pkgs/development/tools/misc/rman/default.nix index 09769d5c591..1f7de915c97 100644 --- a/pkgs/development/tools/misc/rman/default.nix +++ b/pkgs/development/tools/misc/rman/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation { name = "rman-3.2"; @@ -27,6 +27,6 @@ stdenv.mkDerivation { meta = { description = "Parse formatted man pages and man page source from most flavors of UNIX and converts them to HTML, ASCII, TkMan, DocBook, and other formats"; license = "artistic"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/tools/misc/rolespec/default.nix b/pkgs/development/tools/misc/rolespec/default.nix index 6eb13bb242d..d86277993ca 100644 --- a/pkgs/development/tools/misc/rolespec/default.nix +++ b/pkgs/development/tools/misc/rolespec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, makeWrapper }: stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { dontPatchELF = true; dontStrip = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/nickjj/rolespec"; description = "A test library for testing Ansible roles"; longDescription = '' diff --git a/pkgs/development/tools/misc/saleae-logic/default.nix b/pkgs/development/tools/misc/saleae-logic/default.nix index b9f84edc964..c26e834ee0f 100644 --- a/pkgs/development/tools/misc/saleae-logic/default.nix +++ b/pkgs/development/tools/misc/saleae-logic/default.nix @@ -6,7 +6,7 @@ # # In NixOS, simply add this package to services.udev.packages. -{ stdenv, fetchurl, unzip, glib, libSM, libICE, gtk2, libXext, libXft +{ lib, stdenv, fetchurl, unzip, glib, libSM, libICE, gtk2, libXext, libXft , fontconfig, libXrender, libXfixes, libX11, libXi, libXrandr, libXcursor , freetype, libXinerama, libxcb, zlib, pciutils , makeDesktopItem, xkeyboardconfig, dbus, runtimeShell, libGL @@ -14,7 +14,7 @@ let - libPath = stdenv.lib.makeLibraryPath [ + libPath = lib.makeLibraryPath [ glib libSM libICE gtk2 libXext libXft fontconfig libXrender libXfixes libX11 libXi libXrandr libXcursor freetype libXinerama libxcb zlib stdenv.cc.cc.lib dbus libGL @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { cp Drivers/99-SaleaeLogic.rules "$out/etc/udev/rules.d/" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Software for Saleae logic analyzers"; homepage = "https://www.saleae.com/"; license = licenses.unfree; diff --git a/pkgs/development/tools/misc/scc/default.nix b/pkgs/development/tools/misc/scc/default.nix index 5fc23547615..8a5cbbcfdfa 100644 --- a/pkgs/development/tools/misc/scc/default.nix +++ b/pkgs/development/tools/misc/scc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "scc"; @@ -16,7 +16,7 @@ buildGoModule rec { # scc has a scripts/ sub-package that's for testing. excludedPackages = [ "scripts" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/boyter/scc"; description = "A very fast accurate code counter with complexity calculations and COCOMO estimates written in pure Go"; maintainers = with maintainers; [ sigma Br1ght0ne ]; diff --git a/pkgs/development/tools/misc/sccache/default.nix b/pkgs/development/tools/misc/sccache/default.nix index 843059b3356..c68a1c1547c 100644 --- a/pkgs/development/tools/misc/sccache/default.nix +++ b/pkgs/development/tools/misc/sccache/default.nix @@ -1,4 +1,14 @@ -{ stdenv, fetchFromGitHub, cargo, rustc, rustPlatform, pkgconfig, glib, openssl, darwin }: +{ stdenv +, lib +, fetchFromGitHub +, cargo +, rustc +, rustPlatform +, pkg-config +, glib +, openssl +, darwin +}: rustPlatform.buildRustPackage rec { version = "0.2.14"; @@ -14,16 +24,16 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--features=all" ]; nativeBuildInputs = [ - pkgconfig cargo rustc + pkg-config cargo rustc ]; buildInputs = [ openssl - ] ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; # Tests fail because of client server setup which is not possible inside the pure environment, # see https://github.com/mozilla/sccache/issues/460 checkPhase = null; - meta = with stdenv.lib; { + meta = with lib; { description = "Ccache with Cloud Storage"; homepage = "https://github.com/mozilla/sccache"; maintainers = with maintainers; [ doronbehar ]; diff --git a/pkgs/development/tools/misc/sipp/default.nix b/pkgs/development/tools/misc/sipp/default.nix index 610e66a2b9c..22bf244662b 100644 --- a/pkgs/development/tools/misc/sipp/default.nix +++ b/pkgs/development/tools/misc/sipp/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ncurses, libpcap }: +{lib, stdenv, fetchurl, ncurses, libpcap }: stdenv.mkDerivation rec { version = "3.6.0"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ncurses libpcap]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://sipp.sf.net"; description = "The SIPp testing tool"; license = licenses.gpl3; diff --git a/pkgs/development/tools/misc/sloccount/default.nix b/pkgs/development/tools/misc/sloccount/default.nix index b2b83aa79b1..fc041f2ee8d 100644 --- a/pkgs/development/tools/misc/sloccount/default.nix +++ b/pkgs/development/tools/misc/sloccount/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, perl, makeWrapper }: +{ fetchurl, lib, stdenv, perl, makeWrapper }: stdenv.mkDerivation rec { name = "sloccount-2.26"; @@ -62,11 +62,11 @@ stdenv.mkDerivation rec { the Perl CPAN library using this tool suite. ''; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; homepage = "https://www.dwheeler.com/sloccount/"; maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/tools/misc/srecord/default.nix b/pkgs/development/tools/misc/srecord/default.nix index f978d4d4e12..a18dcd85255 100644 --- a/pkgs/development/tools/misc/srecord/default.nix +++ b/pkgs/development/tools/misc/srecord/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, libtool, groff, ghostscript, libgcrypt ? null }: +{ lib, stdenv, fetchurl, boost, libtool, groff, ghostscript, libgcrypt ? null }: stdenv.mkDerivation rec { name = "srecord-1.64"; @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { buildInputs = [ boost libtool groff ghostscript libgcrypt ]; - configureFlags = stdenv.lib.optional (libgcrypt == null) "--without-gcrypt"; + configureFlags = lib.optional (libgcrypt == null) "--without-gcrypt"; - meta = with stdenv.lib; { + meta = with lib; { description = "Collection of powerful tools for manipulating EPROM load files"; homepage = "http://srecord.sourceforge.net/"; license = licenses.gpl3Plus; maintainers = [ maintainers.bjornfor ]; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/tools/misc/stlink/default.nix b/pkgs/development/tools/misc/stlink/default.nix index 7595b84721c..e67fd9ca7a8 100644 --- a/pkgs/development/tools/misc/stlink/default.nix +++ b/pkgs/development/tools/misc/stlink/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libusb1 }: +{ lib, stdenv, fetchFromGitHub, cmake, libusb1 }: let # The Darwin build of stlink explicitly refers to static libusb. @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { mkdir -p $out/etc/modprobe.d ''; - meta = with stdenv.lib; { + meta = with lib; { description = "In-circuit debug and programming for ST-Link devices"; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/development/tools/misc/stm32cubemx/default.nix b/pkgs/development/tools/misc/stm32cubemx/default.nix index 9fe34aecade..3b754e4c91b 100644 --- a/pkgs/development/tools/misc/stm32cubemx/default.nix +++ b/pkgs/development/tools/misc/stm32cubemx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, requireFile, makeDesktopItem, libicns, imagemagick, jre, fetchzip }: +{ lib, stdenv, requireFile, makeDesktopItem, libicns, imagemagick, jre, fetchzip }: let version = "6.0.1"; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { ln -s ${desktopItem}/share/applications/* $out/share/applications ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A graphical tool for configuring STM32 microcontrollers and microprocessors"; longDescription = '' A graphical tool that allows a very easy configuration of STM32 diff --git a/pkgs/development/tools/misc/stm32flash/default.nix b/pkgs/development/tools/misc/stm32flash/default.nix index 0c2cb96a9d6..bc7d4b1b3dc 100644 --- a/pkgs/development/tools/misc/stm32flash/default.nix +++ b/pkgs/development/tools/misc/stm32flash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "stm32flash-0.5"; @@ -16,10 +16,10 @@ stdenv.mkDerivation rec { cp stm32flash $out/bin/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Open source flash program for the STM32 ARM processors using the ST bootloader"; homepage = "https://sourceforge.net/projects/stm32flash/"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; platforms = platforms.all; # Should work on all platforms maintainers = with maintainers; [ elitak ]; }; diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index 877aedc4e49..004e1527d35 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, libunwind, buildPackages }: +{ lib, stdenv, fetchurl, perl, libunwind, buildPackages }: stdenv.mkDerivation rec { pname = "strace"; @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ perl ]; - buildInputs = [ perl.out ] ++ stdenv.lib.optional libunwind.supportsHost libunwind; # support -k + buildInputs = [ perl.out ] ++ lib.optional libunwind.supportsHost libunwind; # support -k postPatch = "patchShebangs --host strace-graph"; configureFlags = [ "--enable-mpers=check" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://strace.io/"; description = "A system call tracer for Linux"; license = with licenses; [ lgpl21Plus gpl2Plus ]; # gpl2Plus is for the test suite diff --git a/pkgs/development/tools/misc/swig/2.x.nix b/pkgs/development/tools/misc/swig/2.x.nix index 745cc9a2e78..1068b3e2ad9 100644 --- a/pkgs/development/tools/misc/swig/2.x.nix +++ b/pkgs/development/tools/misc/swig/2.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }: stdenv.mkDerivation rec { pname = "swig"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - meta = with stdenv.lib; { + meta = with lib; { description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages"; homepage = "http://swig.org/"; # Different types of licenses available: http://www.swig.org/Release/LICENSE . diff --git a/pkgs/development/tools/misc/swig/3.x.nix b/pkgs/development/tools/misc/swig/3.x.nix index 853a240ffc3..109243b54ba 100644 --- a/pkgs/development/tools/misc/swig/3.x.nix +++ b/pkgs/development/tools/misc/swig/3.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }: stdenv.mkDerivation rec { pname = "swig"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An interface compiler that connects C/C++ code to higher-level languages"; homepage = "http://swig.org/"; # Different types of licenses available: http://www.swig.org/Release/LICENSE . diff --git a/pkgs/development/tools/misc/swig/4.nix b/pkgs/development/tools/misc/swig/4.nix index 4096b7353fa..56106143027 100644 --- a/pkgs/development/tools/misc/swig/4.nix +++ b/pkgs/development/tools/misc/swig/4.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }: stdenv.mkDerivation rec { pname = "swig"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - meta = with stdenv.lib; { + meta = with lib; { description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages"; homepage = "http://swig.org/"; # Different types of licenses available: http://www.swig.org/Release/LICENSE . diff --git a/pkgs/development/tools/misc/swig/default.nix b/pkgs/development/tools/misc/swig/default.nix index cf0880855db..3c1a5b82dc2 100644 --- a/pkgs/development/tools/misc/swig/default.nix +++ b/pkgs/development/tools/misc/swig/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, tcl }: +{ lib, stdenv, fetchurl, boost, tcl }: stdenv.mkDerivation rec { pname = "swig"; @@ -11,12 +11,12 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isCygwin; # 'make check' uses boost and tcl - buildInputs = stdenv.lib.optionals doCheck [ boost tcl ]; + buildInputs = lib.optionals doCheck [ boost tcl ]; configureFlags = [ "--disable-ccache" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages"; homepage = "http://swig.org/"; # Different types of licenses available: http://www.swig.org/Release/LICENSE . diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/development/tools/misc/sysbench/default.nix index 616a1cbc3fb..2cf8c91d3bf 100644 --- a/pkgs/development/tools/misc/sysbench/default.nix +++ b/pkgs/development/tools/misc/sysbench/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config , libmysqlclient, libaio }: @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "sysbench"; version = "1.0.20"; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libmysqlclient libaio ]; src = fetchFromGitHub { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "Modular, cross-platform and multi-threaded benchmark tool"; homepage = "https://github.com/akopytov/sysbench"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/tools/misc/tcptrack/default.nix b/pkgs/development/tools/misc/tcptrack/default.nix index 9872c91ac4b..5b1fd72a7f5 100644 --- a/pkgs/development/tools/misc/tcptrack/default.nix +++ b/pkgs/development/tools/misc/tcptrack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ncurses, libpcap }: +{ lib, stdenv, fetchFromGitHub, ncurses, libpcap }: stdenv.mkDerivation rec { pname = "tcptrack"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "libpcap based program for live TCP connection monitoring"; license = licenses.lgpl21; diff --git a/pkgs/development/tools/misc/teensy-loader-cli/default.nix b/pkgs/development/tools/misc/teensy-loader-cli/default.nix index 40f3921ec70..156e3f7f895 100644 --- a/pkgs/development/tools/misc/teensy-loader-cli/default.nix +++ b/pkgs/development/tools/misc/teensy-loader-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, go-md2man, installShellFiles, libusb-compat-0_1 }: +{ lib, stdenv, fetchFromGitHub, go-md2man, installShellFiles, libusb-compat-0_1 }: stdenv.mkDerivation rec { pname = "teensy-loader-cli"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { installManPage *.1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Firmware uploader for the Teensy microcontroller boards"; homepage = "https://www.pjrc.com/teensy/"; license = licenses.gpl3; diff --git a/pkgs/development/tools/misc/tet/default.nix b/pkgs/development/tools/misc/tet/default.nix index acc42d61423..6bfcb312923 100644 --- a/pkgs/development/tools/misc/tet/default.nix +++ b/pkgs/development/tools/misc/tet/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv }: +{ fetchurl, lib, stdenv }: stdenv.mkDerivation ({ version = "3.8"; @@ -11,19 +11,19 @@ stdenv.mkDerivation ({ buildInputs = [ ]; - patchPhase = ''chmod +x configure''; + patchPhase = "chmod +x configure"; - configurePhase = ''./configure -t lite''; + configurePhase = "./configure -t lite"; - buildPhase = ''cd src; make; cd -''; + buildPhase = "cd src; make; cd -"; - installPhase = ''cd src; make install; cd -; cp -vr $PWD $out''; + installPhase = "cd src; make install; cd -; cp -vr $PWD $out"; meta = { description = "The Test Environment Toolkit is used in test applications like The Open Group's UNIX Certification program and the Free Standards Group's LSB Certification program"; homepage = "http://tetworks.opengroup.org/Products/tet.htm"; - license = stdenv.lib.licenses.artistic1; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.artistic1; + platforms = lib.platforms.unix; maintainers = [ ]; }; }) diff --git a/pkgs/development/tools/misc/texi2html/default.nix b/pkgs/development/tools/misc/texi2html/default.nix index 755bfcd7274..98f846b7c2f 100644 --- a/pkgs/development/tools/misc/texi2html/default.nix +++ b/pkgs/development/tools/misc/texi2html/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, gettext }: +{ lib, stdenv, fetchurl, perl, gettext, buildPackages }: stdenv.mkDerivation rec { pname = "texi2html"; @@ -9,15 +9,22 @@ stdenv.mkDerivation rec { sha256 = "1yprv64vrlcbksqv25asplnjg07mbq38lfclp1m5lj8cw878pag8"; }; - nativeBuildInputs = [ gettext ]; + strictDeps = true; + + nativeBuildInputs = [ gettext perl ]; buildInputs = [ perl ]; - preBuild = '' - substituteInPlace separated_to_hash.pl \ - --replace "/usr/bin/perl" "${perl}/bin/perl" + postPatch = '' + patchShebangs separated_to_hash.pl + ''; + + postInstall = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + for f in $out/bin/*; do + substituteInPlace $f --replace "${buildPackages.perl}" "${perl}" + done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Perl script which converts Texinfo source files to HTML output"; homepage = "https://www.nongnu.org/texi2html/"; license = licenses.gpl2; diff --git a/pkgs/development/tools/misc/texinfo/common.nix b/pkgs/development/tools/misc/texinfo/common.nix index 057e52615ac..1c5de083bc0 100644 --- a/pkgs/development/tools/misc/texinfo/common.nix +++ b/pkgs/development/tools/misc/texinfo/common.nix @@ -1,6 +1,6 @@ { version, sha256 }: -{ stdenv, buildPackages, fetchurl, perl, xz, gettext +{ lib, stdenv, buildPackages, fetchurl, perl, xz, gettext # we are a dependency of gcc, this simplifies bootstraping , interactive ? false, ncurses, procps @@ -15,7 +15,7 @@ let crossBuildTools = stdenv.hostPlatform != stdenv.buildPlatform; in -with stdenv.lib; +with lib; stdenv.mkDerivation { name = "texinfo-${optionalString interactive "interactive-"}${version}"; @@ -43,7 +43,7 @@ stdenv.mkDerivation { ++ optional interactive ncurses; configureFlags = [ "PERL=${buildPackages.perl}/bin/perl" ] - ++ stdenv.lib.optional stdenv.isSunOS "AWK=${gawk}/bin/awk"; + ++ lib.optional stdenv.isSunOS "AWK=${gawk}/bin/awk"; installFlags = [ "TEXMF=$(out)/texmf-dist" ]; installTargets = [ "install" "install-tex" ]; diff --git a/pkgs/development/tools/misc/tie/default.nix b/pkgs/development/tools/misc/tie/default.nix index 074523309b6..e75248aa867 100644 --- a/pkgs/development/tools/misc/tie/default.nix +++ b/pkgs/development/tools/misc/tie/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "tie"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cp tie $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.ctan.org/tex-archive/web/tie"; description = "Allow multiple web change files"; platforms = with platforms; unix; diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix index 0c366668c5c..47966dcc133 100644 --- a/pkgs/development/tools/misc/tokei/default.nix +++ b/pkgs/development/tools/misc/tokei/default.nix @@ -1,26 +1,26 @@ -{ stdenv, fetchFromGitHub, rustPlatform, libiconv, darwin }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv, darwin }: rustPlatform.buildRustPackage rec { pname = "tokei"; - version = "12.1.1"; + version = "12.1.2"; src = fetchFromGitHub { owner = "XAMPPRocky"; repo = pname; rev = "v${version}"; - sha256 = "1n5n7lxlw6zhrdf4jbmqpyn9k02dpn4wqm93qgiin4i8j8bxwjw8"; + sha256 = "sha256-jqDsxUAMD/MCCI0hamkGuCYa8rEXNZIR8S+84S8FbgI="; }; - cargoSha256 = "0bph6n8i5dfy5ryr3nyd3pxyrl1032vvg63s4s44g01qjm9rfdvf"; + cargoSha256 = "sha256-iUDc54E8AiLMJw9h99kg/3VmaSi8GqfQyrPwa9nJ994="; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; # enable all output formats cargoBuildFlags = [ "--features" "all" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A program that allows you to count your code, quickly"; longDescription = '' Tokei is a program that displays statistics about your code. Tokei will show number of files, total lines within those files and code, comments, and blanks grouped by language. diff --git a/pkgs/development/tools/misc/travis/gemset.nix b/pkgs/development/tools/misc/travis/gemset.nix index e10475a916b..02b39bfca94 100644 --- a/pkgs/development/tools/misc/travis/gemset.nix +++ b/pkgs/development/tools/misc/travis/gemset.nix @@ -266,4 +266,4 @@ }; version = "1.2.8"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/misc/uisp/default.nix b/pkgs/development/tools/misc/uisp/default.nix index ca51e089733..1fb255073ed 100644 --- a/pkgs/development/tools/misc/uisp/default.nix +++ b/pkgs/development/tools/misc/uisp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "uisp-20050207"; @@ -12,8 +12,8 @@ stdenv.mkDerivation { meta = { description = "Tool for AVR microcontrollers which can interface to many hardware in-system programmers"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; homepage = "https://savannah.nongnu.org/projects/uisp"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/tools/misc/uncrustify/default.nix b/pkgs/development/tools/misc/uncrustify/default.nix index 526e71515ae..f6b51a969b2 100644 --- a/pkgs/development/tools/misc/uncrustify/default.nix +++ b/pkgs/development/tools/misc/uncrustify/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, python }: +{ lib, stdenv, fetchFromGitHub, cmake, python }: stdenv.mkDerivation rec { name = "${product}-${version}"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Source code beautifier for C, C++, C#, ObjectiveC, D, Java, Pawn and VALA"; homepage = "http://uncrustify.sourceforge.net/"; license = licenses.gpl2Plus; diff --git a/pkgs/development/tools/misc/unifdef/default.nix b/pkgs/development/tools/misc/unifdef/default.nix index 19dd907b73b..ebb034a92e7 100644 --- a/pkgs/development/tools/misc/unifdef/default.nix +++ b/pkgs/development/tools/misc/unifdef/default.nix @@ -1,31 +1,24 @@ -{ fetchurl, stdenv }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "unifdef-2.6"; + pname = "unifdef"; + version = "2.12"; src = fetchurl { - url = "https://github.com/fanf2/unifdef/archive/${name}.tar.gz"; - sha256 = "1p5wr5ms9w8kijy9h7qs1mz36dlavdj6ngz2bks588w7a20kcqxj"; + url = "https://dotat.at/prog/unifdef/unifdef-${version}.tar.xz"; + sha256 = "00647bp3m9n01ck6ilw6r24fk4mivmimamvm4hxp5p6wxh10zkj3"; }; - postUnpack = '' - substituteInPlace $sourceRoot/unifdef.c \ - --replace '#include "version.h"' "" + makeFlags = [ + "prefix=$(out)" + "DESTDIR=" + ]; - substituteInPlace $sourceRoot/Makefile \ - --replace "unifdef.c: version.h" "unifdef.c:" - ''; - - preBuild = '' - unset HOME - export DESTDIR=$out - ''; - - meta = with stdenv.lib; { - homepage = "http://dotat.at/prog/unifdef/"; + meta = with lib; { + homepage = "https://dotat.at/prog/unifdef/"; description = "Selectively remove C preprocessor conditionals"; license = licenses.bsd2; platforms = platforms.unix; - maintainers = [ maintainers.vrthra ]; + maintainers = with maintainers; [ orivej vrthra ]; }; } diff --git a/pkgs/development/tools/misc/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix index 0bf902eccff..bd362e8d1a4 100644 --- a/pkgs/development/tools/misc/universal-ctags/default.nix +++ b/pkgs/development/tools/misc/universal-ctags/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, perl, pythonPackages, libiconv, jansson }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, perl, pythonPackages, libiconv, jansson }: stdenv.mkDerivation { pname = "universal-ctags"; @@ -11,8 +11,8 @@ stdenv.mkDerivation { sha256 = "14n3ix77rkhq6vq6kspmgjrmm0kg0f8cxikyqdq281sbnfq8bajn"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig pythonPackages.docutils ]; - buildInputs = [ jansson ] ++ stdenv.lib.optional stdenv.isDarwin libiconv; + nativeBuildInputs = [ autoreconfHook pkg-config pythonPackages.docutils ]; + buildInputs = [ jansson ] ++ lib.optional stdenv.isDarwin libiconv; # to generate makefile.in autoreconfPhase = '' @@ -35,7 +35,7 @@ stdenv.mkDerivation { checkFlags = [ "units" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A maintained ctags implementation"; homepage = "https://ctags.io/"; license = licenses.gpl2Plus; diff --git a/pkgs/development/tools/misc/unused/default.nix b/pkgs/development/tools/misc/unused/default.nix index 3e5f9c319ef..1a5f3efe0e6 100644 --- a/pkgs/development/tools/misc/unused/default.nix +++ b/pkgs/development/tools/misc/unused/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, cmake }: +{ lib, fetchFromGitHub, rustPlatform, cmake }: rustPlatform.buildRustPackage rec { pname = "unused"; version = "0.2.1"; @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1c0gj2wp0nydv0binxj3ikm5sm6y5z3pklp5b06dgvq02licz57a"; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool to identify potentially unused code"; homepage = "https://unused.codes"; license = licenses.mit; diff --git a/pkgs/development/tools/misc/usb-modeswitch/data.nix b/pkgs/development/tools/misc/usb-modeswitch/data.nix index 6280b103ab6..7bb9fc69c58 100644 --- a/pkgs/development/tools/misc/usb-modeswitch/data.nix +++ b/pkgs/development/tools/misc/usb-modeswitch/data.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, tcl, usb-modeswitch }: +{ lib, stdenv, fetchurl, tcl, usb-modeswitch }: stdenv.mkDerivation rec { pname = "usb-modeswitch-data"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { # the usb_modeswitch.d directory nativeBuildInputs = [ tcl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Device database and the rules file for 'multi-mode' USB devices"; inherit (usb-modeswitch.meta) license maintainers platforms; }; diff --git a/pkgs/development/tools/misc/usb-modeswitch/default.nix b/pkgs/development/tools/misc/usb-modeswitch/default.nix index 18926a85528..4f9dbe92d2b 100644 --- a/pkgs/development/tools/misc/usb-modeswitch/default.nix +++ b/pkgs/development/tools/misc/usb-modeswitch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, makeWrapper +{ stdenv, lib, fetchurl, pkg-config, makeWrapper , libusb1, tcl, util-linux, coreutils, bash }: stdenv.mkDerivation rec { @@ -35,9 +35,9 @@ stdenv.mkDerivation rec { ''; buildInputs = [ libusb1 tcl ]; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A mode switching tool for controlling 'multi-mode' USB devices"; license = licenses.gpl2; maintainers = with maintainers; [ marcweber peterhoeg ]; diff --git a/pkgs/development/tools/misc/vtable-dumper/default.nix b/pkgs/development/tools/misc/vtable-dumper/default.nix index a44140c1445..1bd59aa9944 100644 --- a/pkgs/development/tools/misc/vtable-dumper/default.nix +++ b/pkgs/development/tools/misc/vtable-dumper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libelf }: +{ lib, stdenv, fetchFromGitHub, libelf }: stdenv.mkDerivation rec { pname = "vtable-dumper"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ libelf ]; makeFlags = [ "prefix=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/lvc/vtable-dumper"; description = "A tool to list content of virtual tables in a C++ shared library"; license = licenses.lgpl21; diff --git a/pkgs/development/tools/misc/watson-ruby/default.nix b/pkgs/development/tools/misc/watson-ruby/default.nix index 81f5430371a..23ec0643d77 100644 --- a/pkgs/development/tools/misc/watson-ruby/default.nix +++ b/pkgs/development/tools/misc/watson-ruby/default.nix @@ -1,4 +1,4 @@ -{ stdenv, bundlerEnv, ruby, bundlerUpdateScript }: +{ lib, stdenv, bundlerEnv, ruby, bundlerUpdateScript }: stdenv.mkDerivation rec { pname = "watson-ruby"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { passthru.updateScript = bundlerUpdateScript "watson-ruby"; - meta = with stdenv.lib; { + meta = with lib; { description = "An inline issue manager"; homepage = "https://goosecode.com/watson/"; license = with licenses; mit; diff --git a/pkgs/development/tools/misc/watson-ruby/gemset.nix b/pkgs/development/tools/misc/watson-ruby/gemset.nix index a3bb144899c..2f865820f5a 100644 --- a/pkgs/development/tools/misc/watson-ruby/gemset.nix +++ b/pkgs/development/tools/misc/watson-ruby/gemset.nix @@ -15,4 +15,4 @@ }; version = "1.6.3"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/misc/whatstyle/default.nix b/pkgs/development/tools/misc/whatstyle/default.nix index c882d6243fa..d448251bf13 100644 --- a/pkgs/development/tools/misc/whatstyle/default.nix +++ b/pkgs/development/tools/misc/whatstyle/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3, fetchFromGitHub, clang-unwrapped }: +{ lib, python3, fetchFromGitHub, clang-unwrapped }: python3.pkgs.buildPythonApplication rec { pname = "whatstyle"; @@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec { doCheck = false; # 3 or 4 failures depending on version, haven't investigated. - meta = with stdenv.lib; { + meta = with lib; { description = "Find a code format style that fits given source files"; homepage = "https://github.com/mikr/whatstyle"; license = licenses.mit; diff --git a/pkgs/development/tools/misc/xc3sprog/default.nix b/pkgs/development/tools/misc/xc3sprog/default.nix index e54dc7844e7..b9785bac7c5 100644 --- a/pkgs/development/tools/misc/xc3sprog/default.nix +++ b/pkgs/development/tools/misc/xc3sprog/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, cmake, libusb-compat-0_1, libftdi }: +{ lib, stdenv, fetchsvn, cmake, libusb-compat-0_1, libftdi }: # The xc3sprog project doesn't seem to make proper releases, they only put out # prebuilt binary subversion snapshots on sourceforge. @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libusb-compat-0_1 libftdi ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Command-line tools for programming FPGAs, microcontrollers and PROMs via JTAG"; homepage = "http://xc3sprog.sourceforge.net/"; license = licenses.gpl2Plus; diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix index 4bbff3ca33f..cf4fe39754f 100644 --- a/pkgs/development/tools/misc/ycmd/default.nix +++ b/pkgs/development/tools/misc/ycmd/default.nix @@ -19,9 +19,9 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ cmake ] - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ boost llvmPackages.libclang ] - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin Cocoa; + ++ lib.optional stdenv.hostPlatform.isDarwin Cocoa; buildPhase = '' export EXTRA_CMAKE_ARGS=-DPATH_TO_LLVM_ROOT=${llvmPackages.clang-unwrapped} @@ -90,7 +90,7 @@ stdenv.mkDerivation { "'$out/lib/ycmd/ycmd/__main__.py'" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A code-completion and comprehension server"; homepage = "https://github.com/Valloric/ycmd"; license = licenses.gpl3; diff --git a/pkgs/development/tools/misc/yodl/default.nix b/pkgs/development/tools/misc/yodl/default.nix index 6bb7e1377af..a8b48e9fa53 100644 --- a/pkgs/development/tools/misc/yodl/default.nix +++ b/pkgs/development/tools/misc/yodl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, perl, icmake, util-linux }: +{ lib, stdenv, fetchFromGitLab, perl, icmake, util-linux }: stdenv.mkDerivation rec { pname = "yodl"; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ./build install man ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A package that implements a pre-document language and tools to process it"; homepage = "https://fbb-git.gitlab.io/yodl/"; license = licenses.gpl3; diff --git a/pkgs/development/tools/mod/default.nix b/pkgs/development/tools/mod/default.nix index 32fd2258daa..c1d17bba57b 100644 --- a/pkgs/development/tools/mod/default.nix +++ b/pkgs/development/tools/mod/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mod"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "marwan-at-work"; repo = "mod"; rev = "v${version}"; - sha256 = "1n0pipbq4fjban8hsxhyl5w8xrl4ai1pvgd02i1j1awmm2l3ykzl"; + sha256 = "sha256-IPdZ2PSS4rYVoMxrunse8Z2NHXLjXAoBcDvB6D70ki0="; }; - vendorSha256 = "032s62rjjq7bqiz5fg17yfkq4j4dsbl6vhvs1wf2sg8jvbqmvdwn"; + vendorSha256 = "sha256-1+06/yXi07iWZhcCEGNnoL2DpeVRYMW/NdyEhZQePbk="; doCheck = false; diff --git a/pkgs/development/tools/modd/default.nix b/pkgs/development/tools/modd/default.nix index 5c63447fdc5..c42e364b88e 100644 --- a/pkgs/development/tools/modd/default.nix +++ b/pkgs/development/tools/modd/default.nix @@ -1,4 +1,4 @@ -{ buildGoPackage, fetchFromGitHub, stdenv }: +{ buildGoPackage, fetchFromGitHub, lib }: buildGoPackage rec { pname = "modd"; @@ -11,7 +11,7 @@ buildGoPackage rec { }; goPackagePath = "github.com/cortesi/modd"; subPackages = [ "cmd/modd" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A flexible developer tool that runs processes and responds to filesystem changes"; homepage = "https://github.com/cortesi/modd"; license = licenses.mit; diff --git a/pkgs/development/tools/mustache-go/default.nix b/pkgs/development/tools/mustache-go/default.nix index 7bcf72df55c..40181f16288 100644 --- a/pkgs/development/tools/mustache-go/default.nix +++ b/pkgs/development/tools/mustache-go/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "mustache-go"; @@ -13,7 +13,7 @@ buildGoPackage rec { sha256 = "0mnh5zbpfwymddm1dppg9i9d1r8jqyg03z2gl6c5a8fgbrnxpjvc"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/cbroglie/mustache"; description = "The mustache template language in Go"; license = [ licenses.mit ]; diff --git a/pkgs/development/tools/nemiver/default.nix b/pkgs/development/tools/nemiver/default.nix index 191b1721349..58c0f2ed28b 100644 --- a/pkgs/development/tools/nemiver/default.nix +++ b/pkgs/development/tools/nemiver/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchurl , fetchpatch -, pkgconfig +, pkg-config , gnome3 , gtk3 , libxml2 @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { version = "0.9.6"; src = fetchurl { - url = "mirror://gnome/sources/nemiver/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/nemiver/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "85ab8cf6c4f83262f441cb0952a6147d075c3c53d0687389a3555e946b694ef2"; }; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { libxml2 intltool itstool - pkgconfig + pkg-config wrapGAppsHook ]; diff --git a/pkgs/development/tools/neoload/default.nix b/pkgs/development/tools/neoload/default.nix index be772f60492..fb85aa80dc3 100644 --- a/pkgs/development/tools/neoload/default.nix +++ b/pkgs/development/tools/neoload/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, writeTextFile, jre, makeWrapper, fontsConf, licenseAccepted ? false }: +{ lib, stdenv, fetchurl, writeTextFile, jre, makeWrapper, fontsConf, licenseAccepted ? false }: # If you happen to use this software on the XMonad window manager, you will have issues with # grey windows, no resizing, menus not showing and other glitches. @@ -87,9 +87,9 @@ in stdenv.mkDerivation { homepage = "https://www.neotys.com/product/overview-neoload.html"; # https://www.neotys.com/documents/legal/eula/neoload/eula_en.html - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; - maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; + maintainers = [ lib.maintainers.bluescreen303 ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/development/tools/node-webkit/nw12.nix b/pkgs/development/tools/node-webkit/nw12.nix index ffd2a78f509..31358129821 100644 --- a/pkgs/development/tools/node-webkit/nw12.nix +++ b/pkgs/development/tools/node-webkit/nw12.nix @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { ln -s ${lib.getLib systemd}/lib/libudev.so $out/share/nwjs/libudev.so.0 - patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}:$out/share/nwjs" $out/share/nwjs/nw + patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:${lib.makeLibraryPath [ stdenv.cc.cc ]}:$out/share/nwjs" $out/share/nwjs/nw patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/nwjs" $out/share/nwjs/nwjc mkdir -p $out/bin @@ -51,7 +51,7 @@ in stdenv.mkDerivation rec { buildInputs = [ makeWrapper ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An app runtime based on Chromium and node.js"; homepage = "https://nwjs.io/"; platforms = ["i686-linux" "x86_64-linux"]; diff --git a/pkgs/development/tools/nrpl/default.nix b/pkgs/development/tools/nrpl/default.nix index a1c9bfd53e3..72177582919 100644 --- a/pkgs/development/tools/nrpl/default.nix +++ b/pkgs/development/tools/nrpl/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { --prefix PATH : ${lib.makeBinPath [ nim tinycc ]} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "REPL for the Nim programming language"; homepage = "https://github.com/wheineman/nrpl"; license = licenses.mit; diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix index 4eedc003272..d3490b2b9c9 100644 --- a/pkgs/development/tools/nwjs/default.nix +++ b/pkgs/development/tools/nwjs/default.nix @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec { dontPatchELF = true; installPhase = - let ccPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]; + let ccPath = lib.makeLibraryPath [ stdenv.cc.cc ]; in '' mkdir -p $out/share/nwjs cp -R * $out/share/nwjs @@ -85,7 +85,7 @@ in stdenv.mkDerivation rec { buildInputs = [ makeWrapper ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An app runtime based on Chromium and node.js"; homepage = "https://nwjs.io/"; platforms = ["i686-linux" "x86_64-linux"]; diff --git a/pkgs/development/tools/ocaml/camlidl/default.nix b/pkgs/development/tools/ocaml/camlidl/default.nix index 309c44d6d46..a464996ff38 100644 --- a/pkgs/development/tools/ocaml/camlidl/default.nix +++ b/pkgs/development/tools/ocaml/camlidl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, writeText }: +{ lib, stdenv, fetchurl, ocaml, writeText }: let pname = "camlidl"; @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { description = "A stub code generator and COM binding for Objective Caml"; homepage = webpage; license = "LGPL"; - maintainers = [ stdenv.lib.maintainers.roconnor ]; + maintainers = [ lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/tools/ocaml/camlp4/default.nix b/pkgs/development/tools/ocaml/camlp4/default.nix index 73228655cca..fffa426ba4c 100644 --- a/pkgs/development/tools/ocaml/camlp4/default.nix +++ b/pkgs/development/tools/ocaml/camlp4/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchzip, which, ocaml, ocamlbuild }: +{ lib, stdenv, fetchzip, which, ocaml, ocamlbuild }: -if stdenv.lib.versionAtLeast ocaml.version "4.09" +if lib.versionAtLeast ocaml.version "4.09" then throw "camlp4 is not available for OCaml ${ocaml.version}" else @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { dontStrip = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A software system for writing extensible parsers for programming languages"; homepage = "https://github.com/ocaml/camlp4"; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix index 6d68a320a91..fc79cafdc42 100644 --- a/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/pkgs/development/tools/ocaml/camlp5/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchzip, ocaml, perl }: +{ lib, stdenv, fetchzip, ocaml, perl }: -if stdenv.lib.versionOlder ocaml.version "4.02" +if lib.versionOlder ocaml.version "4.02" then throw "camlp5 is not available for OCaml ${ocaml.version}" else @@ -26,7 +26,7 @@ stdenv.mkDerivation { dontStrip = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Preprocessor-pretty-printer for OCaml"; longDescription = '' Camlp5 is a preprocessor and pretty-printer for OCaml programs. diff --git a/pkgs/development/tools/ocaml/cppo/default.nix b/pkgs/development/tools/ocaml/cppo/default.nix index a0215fa8147..032f346bf9c 100644 --- a/pkgs/development/tools/ocaml/cppo/default.nix +++ b/pkgs/development/tools/ocaml/cppo/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, fetchFromGitHub, ocaml, findlib, ocamlbuild +{ lib, stdenv, fetchurl, fetchFromGitHub, ocaml, findlib, ocamlbuild , buildDunePackage }: let pname = "cppo"; - meta = with stdenv.lib; { + meta = with lib; { description = "The C preprocessor for OCaml"; longDescription = '' Cppo is an equivalent of the C preprocessor targeted at the OCaml language and its variants. @@ -17,7 +17,7 @@ let in -if stdenv.lib.versionAtLeast ocaml.version "4.02" then +if lib.versionAtLeast ocaml.version "4.02" then buildDunePackage rec { inherit pname; diff --git a/pkgs/development/tools/ocaml/dune-release/default.nix b/pkgs/development/tools/ocaml/dune-release/default.nix index c267b2757a4..60a9bfba58f 100644 --- a/pkgs/development/tools/ocaml/dune-release/default.nix +++ b/pkgs/development/tools/ocaml/dune-release/default.nix @@ -32,9 +32,14 @@ in buildDunePackage rec { # to have a fixed path to the binary in nix store sed -i '/must_exist (Cmd\.v "curl"/d' lib/github.ml - # set bogus user info in git so git commit doesn't fail - sed -i '/git init/ a \ $ git config user.name test; git config user.email "pseudo@pseudo.invalid"' \ - tests/bin/{delegate_info,errors,tag,no_doc,x-commit-hash}/run.t + # fix problems with git invocations in tests + for f in tests/bin/{delegate_info,errors,tag,no_doc,x-commit-hash}/run.t; do + # set bogus user info in git so git commit doesn't fail + sed -i '/git init/ a \ $ git config user.name test; git config user.email "pseudo@pseudo.invalid"' "$f" + # surpress hint to set default branch name + substituteInPlace "$f" --replace "git init" "git init -b main" + done + # ignore weird yes error message sed -i 's/yes |/yes 2>\/dev\/null |/' tests/bin/no_doc/run.t ''; diff --git a/pkgs/development/tools/ocaml/dune/2.nix b/pkgs/development/tools/ocaml/dune/2.nix index 177fa96f5b9..f2fe3693ed7 100644 --- a/pkgs/development/tools/ocaml/dune/2.nix +++ b/pkgs/development/tools/ocaml/dune/2.nix @@ -1,30 +1,22 @@ -{ stdenv, fetchurl, ocaml, findlib, fetchpatch }: +{ lib, stdenv, fetchurl, ocaml, findlib }: -if stdenv.lib.versionOlder ocaml.version "4.08" +if lib.versionOlder ocaml.version "4.08" then throw "dune is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { pname = "dune"; - version = "2.7.1"; + version = "2.8.2"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - sha256 = "0pcjf209gynjwipnpplaqyvyivnawqiwhvqnivhkybisicpqyln3"; + sha256 = "07mf6pnmv1a6wh4la45zf6cn6qy2vcmz4xgx0djj75kw1wiyii72"; }; buildInputs = [ ocaml findlib ]; buildFlags = "release"; - patches = [ - # Fix setup.ml configure path. Remove with the next release. - (fetchpatch { - url = "https://github.com/ocaml/dune/commit/8a3d7f2f2015b71384caa07226d1a89dba9d6c25.patch"; - sha256 = "0dw4q10030h9xcdlxw2vp7qm0hd2qpkb98rir5d55m9vn65w8j28"; - }) - ]; - dontAddPrefix = true; installFlags = [ "PREFIX=${placeholder "out"}" "LIBDIR=$(OCAMLFIND_DESTDIR)" ]; @@ -32,9 +24,9 @@ stdenv.mkDerivation rec { meta = { homepage = "https://dune.build/"; description = "A composable build system"; - changelog = "https://github.com/ocaml/dune/releases/tag/${version}"; - maintainers = [ stdenv.lib.maintainers.vbgl stdenv.lib.maintainers.marsam ]; - license = stdenv.lib.licenses.mit; + changelog = "https://github.com/ocaml/dune/blob/${version}/CHANGES.md"; + maintainers = [ lib.maintainers.vbgl lib.maintainers.marsam ]; + license = lib.licenses.mit; inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/tools/ocaml/dune/default.nix b/pkgs/development/tools/ocaml/dune/default.nix index ef0f5c4fabd..bbdbc45270d 100644 --- a/pkgs/development/tools/ocaml/dune/default.nix +++ b/pkgs/development/tools/ocaml/dune/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, ocaml, findlib, opaline }: +{ stdenv, lib, fetchurl, ocaml, findlib }: -if !stdenv.lib.versionAtLeast ocaml.version "4.02" +if !lib.versionAtLeast ocaml.version "4.02" then throw "dune is not available for OCaml ${ocaml.version}" else @@ -15,20 +15,18 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib ]; buildFlags = [ "release" ]; + makeFlags = [ + "PREFIX=${placeholder "out"}" + "LIBDIR=$(OCAMLFIND_DESTDIR)" + ]; dontAddPrefix = true; - installPhase = '' - runHook preInstall - ${opaline}/bin/opaline -prefix $out -libdir $OCAMLFIND_DESTDIR - runHook postInstall - ''; - - meta = { + meta = with lib; { homepage = "https://dune.build/"; description = "A composable build system"; - maintainers = [ stdenv.lib.maintainers.vbgl stdenv.lib.maintainers.marsam ]; - license = stdenv.lib.licenses.mit; + maintainers = [ maintainers.vbgl maintainers.marsam ]; + license = licenses.mit; inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index 1354e158a8e..8752b2edb66 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, m4, ncurses, ocaml, writeText }: +{ lib, stdenv, fetchurl, fetchpatch, m4, ncurses, ocaml, writeText }: stdenv.mkDerivation rec { pname = "ocaml-findlib"; @@ -49,11 +49,11 @@ stdenv.mkDerivation rec { meta = { homepage = "http://projects.camlcity.org/projects/findlib.html"; description = "O'Caml library manager"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; platforms = ocaml.meta.platforms or []; maintainers = [ - stdenv.lib.maintainers.maggesi - stdenv.lib.maintainers.vbmithr + lib.maintainers.maggesi + lib.maintainers.vbmithr ]; }; } diff --git a/pkgs/development/tools/ocaml/oasis/default.nix b/pkgs/development/tools/ocaml/oasis/default.nix index a0932d919c0..6854c7c20ca 100644 --- a/pkgs/development/tools/ocaml/oasis/default.nix +++ b/pkgs/development/tools/ocaml/oasis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ocamlmod, ocamlify }: +{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, ocamlmod, ocamlify }: stdenv.mkDerivation { version = "0.4.10"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { buildPhase = "ocaml setup.ml -build"; installPhase = "ocaml setup.ml -install"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://oasis.forge.ocamlcore.org/"; description = "Configure, build and install system for OCaml projects"; license = licenses.lgpl21; diff --git a/pkgs/development/tools/ocaml/obelisk/default.nix b/pkgs/development/tools/ocaml/obelisk/default.nix index 483e9c45df0..d5e9d33d5db 100644 --- a/pkgs/development/tools/ocaml/obelisk/default.nix +++ b/pkgs/development/tools/ocaml/obelisk/default.nix @@ -1,20 +1,20 @@ { lib, fetchurl, ocamlPackages }: ocamlPackages.buildDunePackage rec { - pname = "obelisk"; - version = "0.5.2"; - useDune2 = true; - src = fetchurl { - url = "https://github.com/Lelio-Brun/Obelisk/releases/download/v${version}/obelisk-v${version}.tbz"; - sha256 = "0s86gkypyrkrp83xnay258ijri3yjwj3marsjnjf8mz58z0zd9g6"; - }; + pname = "obelisk"; + version = "0.5.2"; + useDune2 = true; + src = fetchurl { + url = "https://github.com/Lelio-Brun/Obelisk/releases/download/v${version}/obelisk-v${version}.tbz"; + sha256 = "0s86gkypyrkrp83xnay258ijri3yjwj3marsjnjf8mz58z0zd9g6"; + }; - buildInputs = with ocamlPackages; [ menhir re ]; + buildInputs = with ocamlPackages; [ menhir re ]; - meta = { - description = "A simple tool which produces pretty-printed output from a Menhir parser file (.mly)"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.vbgl ]; - homepage = "https://github.com/Lelio-Brun/Obelisk"; - }; + meta = { + description = "A simple tool which produces pretty-printed output from a Menhir parser file (.mly)"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; + homepage = "https://github.com/Lelio-Brun/Obelisk"; + }; } diff --git a/pkgs/development/tools/ocaml/obuild/default.nix b/pkgs/development/tools/ocaml/obuild/default.nix index 5e851a93205..e31334000da 100644 --- a/pkgs/development/tools/ocaml/obuild/default.nix +++ b/pkgs/development/tools/ocaml/obuild/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml }: +{ lib, stdenv, fetchzip, ocaml }: let version = "0.1.10"; in @@ -27,7 +27,7 @@ stdenv.mkDerivation { homepage = "https://github.com/ocaml-obuild/obuild"; platforms = ocaml.meta.platforms or []; description = "Simple package build system for OCaml"; - license = stdenv.lib.licenses.lgpl21; - maintainers = with stdenv.lib.maintainers; [ volth ]; + license = lib.licenses.lgpl21; + maintainers = with lib.maintainers; [ volth ]; }; } diff --git a/pkgs/development/tools/ocaml/ocamlbuild/default.nix b/pkgs/development/tools/ocaml/ocamlbuild/default.nix index 7270386972d..c74794b35c9 100644 --- a/pkgs/development/tools/ocaml/ocamlbuild/default.nix +++ b/pkgs/development/tools/ocaml/ocamlbuild/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib }: +{ lib, stdenv, fetchFromGitHub, ocaml, findlib }: let version = "0.14.0"; in @@ -25,7 +25,7 @@ stdenv.mkDerivation { "OCAMLBUILD_LIBDIR=$OCAMLFIND_DESTDIR" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/ocaml/ocamlbuild/"; description = "A build system with builtin rules to easily build most OCaml projects"; license = licenses.lgpl2; diff --git a/pkgs/development/tools/ocaml/ocamlformat/default.nix b/pkgs/development/tools/ocaml/ocamlformat/default.nix index 1de95187af2..57061cfe126 100644 --- a/pkgs/development/tools/ocaml/ocamlformat/default.nix +++ b/pkgs/development/tools/ocaml/ocamlformat/default.nix @@ -40,5 +40,13 @@ rec { version = "0.15.0"; }; - ocamlformat = ocamlformat_0_15_0; + ocamlformat_0_15_1 = mkOCamlformat { + version = "0.15.1"; + }; + + ocamlformat_0_16_0 = mkOCamlformat { + version = "0.16.0"; + }; + + ocamlformat = ocamlformat_0_16_0; } diff --git a/pkgs/development/tools/ocaml/ocamlformat/generic.nix b/pkgs/development/tools/ocaml/ocamlformat/generic.nix index 8fac26c2b3e..24527fcf41a 100644 --- a/pkgs/development/tools/ocaml/ocamlformat/generic.nix +++ b/pkgs/development/tools/ocaml/ocamlformat/generic.nix @@ -18,6 +18,8 @@ let src = "0.14.2" = "16phz1sg9b070p6fm8d42j0piizg05vghdjmw8aj7xm82b1pm7sz"; "0.14.3" = "13pfakdncddm41cp61p0l98scawbvhx1q4zdsglv7ph87l7zwqfl"; "0.15.0" = "0190vz59n6ma9ca1m3syl3mc8i1smj1m3d8x1jp21f710y4llfr6"; + "0.15.1" = "1x6fha495sgk4z05g0p0q3zfqm5l6xzmf6vjm9g9g7c820ym2q9a"; + "0.16.0" = "1vwjvvwha0ljc014v8jp8snki5zsqxlwd7x0dl0rg2i9kcmwc4mr"; }."${version}"; } ; in @@ -39,7 +41,23 @@ buildDunePackage rec { useDune2 = true; buildInputs = - if lib.versionAtLeast version "0.14" + if lib.versionAtLeast version "0.15.1" + then [ + base + cmdliner + fpath + odoc + re + stdio + uuseg + uutf + fix + menhir + (ppxlib.override { version = "0.18.0"; }) + dune-build-info # lib.versionAtLeast version "0.16.0" + ocaml-version # lib.versionAtLeast version "0.16.0" + ] + else if lib.versionAtLeast version "0.14" then [ base cmdliner diff --git a/pkgs/development/tools/ocaml/ocamlify/default.nix b/pkgs/development/tools/ocaml/ocamlify/default.nix index 9b06a55f07d..a43903c34d3 100644 --- a/pkgs/development/tools/ocaml/ocamlify/default.nix +++ b/pkgs/development/tools/ocaml/ocamlify/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild }: +{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild }: stdenv.mkDerivation { name = "ocamlify-0.0.2"; @@ -27,8 +27,8 @@ stdenv.mkDerivation { homepage = "https://forge.ocamlcore.org/projects/ocamlmod/ocamlmod"; description = "Generate OCaml modules from source files"; platforms = ocaml.meta.platforms or []; - license = stdenv.lib.licenses.lgpl21; - maintainers = with stdenv.lib.maintainers; [ + license = lib.licenses.lgpl21; + maintainers = with lib.maintainers; [ maggesi ]; }; diff --git a/pkgs/development/tools/ocaml/ocamlmod/default.nix b/pkgs/development/tools/ocaml/ocamlmod/default.nix index 49342d7b848..77d39029551 100644 --- a/pkgs/development/tools/ocaml/ocamlmod/default.nix +++ b/pkgs/development/tools/ocaml/ocamlmod/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ounit }: +{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, ounit }: stdenv.mkDerivation { pname = "ocamlmod"; @@ -25,7 +25,7 @@ stdenv.mkDerivation { homepage = "https://forge.ocamlcore.org/projects/ocamlmod/ocamlmod"; description = "Generate OCaml modules from source files"; platforms = ocaml.meta.platforms or []; - maintainers = with stdenv.lib.maintainers; [ + maintainers = with lib.maintainers; [ maggesi ]; }; diff --git a/pkgs/development/tools/ocaml/ocp-build/default.nix b/pkgs/development/tools/ocaml/ocp-build/default.nix index 57db5161224..655f7b4d4c2 100644 --- a/pkgs/development/tools/ocaml/ocp-build/default.nix +++ b/pkgs/development/tools/ocaml/ocp-build/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ncurses, cmdliner, re }: +{ lib, stdenv, fetchFromGitHub, ocaml, findlib, ncurses, cmdliner, re }: let version = "1.99.21"; in @@ -20,7 +20,7 @@ stdenv.mkDerivation { export configureFlags="$configureFlags --with-metadir=$OCAMLFIND_DESTDIR" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.typerex.org/ocp-build.html"; description = "A build tool for OCaml"; longDescription = '' diff --git a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix index 476c98ce5bc..b12aa2e6d6d 100644 --- a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix +++ b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocamlPackages }: +{ lib, stdenv, fetchzip, ocamlPackages }: stdenv.mkDerivation rec { @@ -22,8 +22,8 @@ stdenv.mkDerivation rec meta = { homepage = "https://github.com/besport/ocsigen-i18n"; description = "I18n made easy for web sites written with eliom"; - license = stdenv.lib.licenses.lgpl21; - maintainers = [ stdenv.lib.maintainers.gal_bolle ]; + license = lib.licenses.lgpl21; + maintainers = [ lib.maintainers.gal_bolle ]; }; } diff --git a/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix b/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix index 6a3c0c20d85..047246cd0a0 100644 --- a/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix +++ b/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix @@ -1,11 +1,11 @@ -{stdenv, fetchurl, makeWrapper, ocaml, ncurses}: +{lib, stdenv, fetchurl, makeWrapper, ocaml, ncurses}: let pname = "omake"; version = "0.9.8.6-0.rc1"; webpage = "http://omake.metaprl.org"; in -if stdenv.lib.versionAtLeast ocaml.version "4.06" +if lib.versionAtLeast ocaml.version "4.06" then throw "${pname}-${version} is not available for OCaml ${ocaml.version}" else @@ -32,7 +32,7 @@ stdenv.mkDerivation { # # configureFlags = if transitional then "--transitional" else "--strict"; # -# buildFlags = [ "world.opt" ]; +# buildFlags = [ "world.opt" ]; meta = { description = "Omake build system"; diff --git a/pkgs/development/tools/ocaml/omake/default.nix b/pkgs/development/tools/ocaml/omake/default.nix index 2afe0d1e9f5..bcfd86a2d4d 100644 --- a/pkgs/development/tools/ocaml/omake/default.nix +++ b/pkgs/development/tools/ocaml/omake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, ncurses }: +{ lib, stdenv, fetchurl, ocaml, ncurses }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "A build system designed for scalability and portability"; homepage = "http://projects.camlcity.org/projects/omake.html"; - license = with stdenv.lib.licenses; [ + license = with lib.licenses; [ mit /* scripts */ gpl2 /* program */ ]; diff --git a/pkgs/development/tools/ocaml/opaline/default.nix b/pkgs/development/tools/ocaml/opaline/default.nix index a49749ad716..9cdacd289d4 100644 --- a/pkgs/development/tools/ocaml/opaline/default.nix +++ b/pkgs/development/tools/ocaml/opaline/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocamlPackages }: +{ lib, stdenv, fetchFromGitHub, ocamlPackages }: stdenv.mkDerivation rec { version = "0.3.2"; @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { meta = { description = "OPAm Light INstaller Engine"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; inherit (src.meta) homepage; inherit (ocamlPackages.ocaml.meta) platforms; }; diff --git a/pkgs/development/tools/ocaml/opam/1.2.2.nix b/pkgs/development/tools/ocaml/opam/1.2.2.nix index e6c08b97aca..a128f2144e9 100644 --- a/pkgs/development/tools/ocaml/opam/1.2.2.nix +++ b/pkgs/development/tools/ocaml/opam/1.2.2.nix @@ -82,7 +82,7 @@ in stdenv.mkDerivation { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A package manager for OCaml"; homepage = "http://opam.ocamlpro.com/"; maintainers = [ maintainers.henrytill ]; diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index 9e95db79dd0..4fe408fb77f 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -110,7 +110,7 @@ in stdenv.mkDerivation { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A package manager for OCaml"; homepage = "https://opam.ocaml.org/"; maintainers = [ maintainers.henrytill maintainers.marsam ]; diff --git a/pkgs/development/tools/ocaml/opam/installer.nix b/pkgs/development/tools/ocaml/opam/installer.nix new file mode 100644 index 00000000000..4501ddd63f0 --- /dev/null +++ b/pkgs/development/tools/ocaml/opam/installer.nix @@ -0,0 +1,17 @@ +{ lib, unzip, opam, ocamlPackages }: + +ocamlPackages.buildDunePackage { + pname = "opam-installer"; + + useDune2 = true; + + inherit (opam) version src; + nativeBuildInputs = [ unzip ]; + + configureFlags = [ "--disable-checks" "--prefix=$out" ]; + buildInputs = with ocamlPackages; [ opam-format cmdliner ]; + + meta = opam.meta // { + description = "Handle (un)installation from opam install files"; + }; +} diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index 2c4c330b286..622ac80306f 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, ocaml, findlib +{ lib, stdenv, fetchurl, ocaml, findlib , lambdaTerm, cppo, makeWrapper, buildDunePackage }: -if !stdenv.lib.versionAtLeast ocaml.version "4.03" +if !lib.versionAtLeast ocaml.version "4.03" then throw "utop is not available for OCaml ${ocaml.version}" else @@ -58,7 +58,7 @@ buildDunePackage rec { --prefix CAML_LD_LIBRARY_PATH ":" "${get "CAML_LD_LIBRARY_PATH"}" \ --prefix OCAMLPATH ":" "${get "OCAMLPATH"}" \ --prefix OCAMLPATH ":" $(unset OCAMLPATH; addOCamlPath "$out"; printf %s "$OCAMLPATH") \ - --add-flags "-I ${findlib}/lib/ocaml/${stdenv.lib.getVersion ocaml}/site-lib" + --add-flags "-I ${findlib}/lib/ocaml/${lib.getVersion ocaml}/site-lib" done ''; @@ -70,10 +70,10 @@ buildDunePackage rec { It integrates with the tuareg mode in Emacs. ''; homepage = "https://github.com/diml/utop"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; platforms = ocaml.meta.platforms or []; maintainers = [ - stdenv.lib.maintainers.gal_bolle + lib.maintainers.gal_bolle ]; }; } diff --git a/pkgs/development/tools/ofono-phonesim/default.nix b/pkgs/development/tools/ofono-phonesim/default.nix index 086cd818a46..c9728f9cbbf 100644 --- a/pkgs/development/tools/ofono-phonesim/default.nix +++ b/pkgs/development/tools/ofono-phonesim/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv +{ lib , mkDerivation , fetchgit , autoreconfHook -, pkgconfig +, pkg-config , qtbase }: @@ -18,7 +18,7 @@ mkDerivation { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/development/tools/omniorb/default.nix b/pkgs/development/tools/omniorb/default.nix index 2ab8fa23dde..74341c0a7b4 100644 --- a/pkgs/development/tools/omniorb/default.nix +++ b/pkgs/development/tools/omniorb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python2 }: +{ lib, stdenv, fetchurl, python2 }: stdenv.mkDerivation rec { pname = "omniorb"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A robust high performance CORBA ORB for C++ and Python. It is freely available under the terms of the GNU Lesser General Public License (for the libraries), and GNU General Public License (for the tools). omniORB is largely CORBA 2.6 compliant"; homepage = "http://omniorb.sourceforge.net/"; license = licenses.gpl2Plus; diff --git a/pkgs/development/tools/omnisharp-roslyn/default.nix b/pkgs/development/tools/omnisharp-roslyn/default.nix index 9dd085b421f..ac5ab022ef1 100644 --- a/pkgs/development/tools/omnisharp-roslyn/default.nix +++ b/pkgs/development/tools/omnisharp-roslyn/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , mono5 , makeWrapper @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { --add-flags "$out/src/OmniSharp.exe" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "OmniSharp based on roslyn workspaces"; homepage = "https://github.com/OmniSharp/omnisharp-roslyn"; platforms = platforms.linux; diff --git a/pkgs/development/tools/open-policy-agent/default.nix b/pkgs/development/tools/open-policy-agent/default.nix index 98e966cbf53..96cae21a5b7 100644 --- a/pkgs/development/tools/open-policy-agent/default.nix +++ b/pkgs/development/tools/open-policy-agent/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "open-policy-agent"; - version = "0.25.2"; + version = "0.26.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; rev = "v${version}"; - sha256 = "0y4jd1dpq7cy9nfacpf5jbh705gmky44j78q32kq5v566lzrsvvp"; + sha256 = "sha256-bkWfRmcUPNYeUucrbh9xAqmLg7RxEEQGa2DQdN2S6Po="; }; vendorSha256 = null; diff --git a/pkgs/development/tools/operator-sdk/default.nix b/pkgs/development/tools/operator-sdk/default.nix index f97611c7785..c09331de598 100644 --- a/pkgs/development/tools/operator-sdk/default.nix +++ b/pkgs/development/tools/operator-sdk/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "operator-sdk"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "operator-framework"; repo = pname; rev = "v${version}"; - sha256 = "03iy4a5jlsmmzn8cpyp35sc2kgz6shg18ah0qdzkadqqalqlldy8"; + sha256 = "sha256-xYG605Z8WGFH5byJA+sHPBjBmWi8b+TTtWRnQnmYN/4="; }; - vendorSha256 = "0dls086lw3sbal4rf0l3xb0sp6g393n9ylkpzppp75myj7v900vv"; + vendorSha256 = "sha256-0ZowddIiVHVg1OKhaCFo+vQKcUe6wZ6L0J8RdMvZyGk="; doCheck = false; diff --git a/pkgs/development/tools/osslsigncode/default.nix b/pkgs/development/tools/osslsigncode/default.nix index 349a6b10104..e9dd2f08d3a 100644 --- a/pkgs/development/tools/osslsigncode/default.nix +++ b/pkgs/development/tools/osslsigncode/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , autoreconfHook , libgsf -, pkgconfig +, pkg-config , openssl , curl }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "0iwxdzqan2bswz62pmwjcyh01vs6ifpdcannw3s192gqzac1lgg3"; }; - nativeBuildInputs = [ autoreconfHook libgsf pkgconfig openssl curl ]; + nativeBuildInputs = [ autoreconfHook libgsf pkg-config openssl curl ]; meta = with lib; { homepage = "https://github.com/mtrojnar/osslsigncode"; diff --git a/pkgs/development/tools/out-of-tree/default.nix b/pkgs/development/tools/out-of-tree/default.nix index 75737764219..4547012e2f3 100644 --- a/pkgs/development/tools/out-of-tree/default.nix +++ b/pkgs/development/tools/out-of-tree/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchgit, qemu, docker, which, makeWrapper }: +{ lib, buildGoModule, fetchgit, qemu, docker, which, makeWrapper }: buildGoModule rec { pname = "out-of-tree"; @@ -18,7 +18,7 @@ buildGoModule rec { postFixup = '' wrapProgram $out/bin/out-of-tree \ - --prefix PATH : "${stdenv.lib.makeBinPath [ qemu docker which ]}" + --prefix PATH : "${lib.makeBinPath [ qemu docker which ]}" ''; meta = with lib; { diff --git a/pkgs/development/tools/overcommit/gemset.nix b/pkgs/development/tools/overcommit/gemset.nix index b7d58c0ea70..95244c1afe6 100644 --- a/pkgs/development/tools/overcommit/gemset.nix +++ b/pkgs/development/tools/overcommit/gemset.nix @@ -30,4 +30,4 @@ }; version = "0.51.0"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index d4dd46cdcb5..16e5ac08203 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "packer"; version = "1.6.6"; diff --git a/pkgs/development/tools/packet-cli/default.nix b/pkgs/development/tools/packet-cli/default.nix index ec07e4b058e..79457643ce6 100644 --- a/pkgs/development/tools/packet-cli/default.nix +++ b/pkgs/development/tools/packet-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "packet-cli"; diff --git a/pkgs/development/tools/packet/default.nix b/pkgs/development/tools/packet/default.nix index 9bca1ec75b6..723e5d8bb2d 100644 --- a/pkgs/development/tools/packet/default.nix +++ b/pkgs/development/tools/packet/default.nix @@ -1,5 +1,5 @@ # This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -{ stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "packet"; @@ -18,8 +18,8 @@ buildGoPackage rec { meta = { description = "a CLI tool to manage packet.net services"; homepage = "https://github.com/ebsarr/packet"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.grahamc ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.grahamc ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/tools/parinfer-rust/default.nix b/pkgs/development/tools/parinfer-rust/default.nix index 79c8f379188..ce733b8a213 100644 --- a/pkgs/development/tools/parinfer-rust/default.nix +++ b/pkgs/development/tools/parinfer-rust/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, llvmPackages }: +{ lib, rustPlatform, fetchFromGitHub, llvmPackages }: rustPlatform.buildRustPackage rec { pname = "parinfer-rust"; diff --git a/pkgs/development/tools/parsing/antlr/3.5.nix b/pkgs/development/tools/parsing/antlr/3.5.nix index 39c022604d8..2efe752c363 100644 --- a/pkgs/development/tools/parsing/antlr/3.5.nix +++ b/pkgs/development/tools/parsing/antlr/3.5.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { homepage = "https://www.antlr.org/"; license = licenses.bsd3; platforms = platforms.linux; - maintainers = [ stdenv.lib.maintainers.farlion ]; + maintainers = [ lib.maintainers.farlion ]; }; } diff --git a/pkgs/development/tools/parsing/antlr/4.8.nix b/pkgs/development/tools/parsing/antlr/4.8.nix index 411364e203b..0708ba754b2 100644 --- a/pkgs/development/tools/parsing/antlr/4.8.nix +++ b/pkgs/development/tools/parsing/antlr/4.8.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, jre -, fetchFromGitHub, cmake, ninja, pkgconfig, libuuid, darwin }: +, fetchFromGitHub, cmake, ninja, pkg-config, libuuid, darwin }: let version = "4.8"; @@ -18,9 +18,9 @@ let outputs = [ "out" "dev" "doc" ]; - nativeBuildInputs = [ cmake ninja pkgconfig ]; - buildInputs = stdenv.lib.optional stdenv.isLinux libuuid - ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreFoundation; + nativeBuildInputs = [ cmake ninja pkg-config ]; + buildInputs = lib.optional stdenv.isLinux libuuid + ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreFoundation; postUnpack = '' export sourceRoot=$sourceRoot/runtime/Cpp diff --git a/pkgs/development/tools/parsing/bison/default.nix b/pkgs/development/tools/parsing/bison/default.nix index aa8d8df2c1d..662961ae46a 100644 --- a/pkgs/development/tools/parsing/bison/default.nix +++ b/pkgs/development/tools/parsing/bison/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, m4, perl, help2man }: +{ lib, stdenv, fetchurl, m4, perl, help2man }: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1qkp2rfi5njyp5c5avajab00aj74pkmkgzkvshv4p2ydkhswgazv"; }; - nativeBuildInputs = [ m4 perl ] ++ stdenv.lib.optional stdenv.isSunOS help2man; + nativeBuildInputs = [ m4 perl ] ++ lib.optional stdenv.isSunOS help2man; propagatedBuildInputs = [ m4 ]; doCheck = false; # fails @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.gnu.org/software/bison/"; description = "Yacc-compatible parser generator"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; longDescription = '' Bison is a general-purpose parser generator that converts an @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { to use Bison. ''; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; passthru = { glrSupport = true; }; diff --git a/pkgs/development/tools/parsing/flex/2.5.35.nix b/pkgs/development/tools/parsing/flex/2.5.35.nix index c352b5a3837..b2245ff9c9b 100644 --- a/pkgs/development/tools/parsing/flex/2.5.35.nix +++ b/pkgs/development/tools/parsing/flex/2.5.35.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { propagatedBuildInputs = [ m4 ]; - preConfigure = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + preConfigure = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "ac_cv_func_malloc_0_nonnull=yes" "ac_cv_func_realloc_0_nonnull=yes" ]; diff --git a/pkgs/development/tools/parsing/flex/2.6.1.nix b/pkgs/development/tools/parsing/flex/2.6.1.nix index 3a032e60c32..cc0ecb148c4 100644 --- a/pkgs/development/tools/parsing/flex/2.6.1.nix +++ b/pkgs/development/tools/parsing/flex/2.6.1.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { postPatch = '' patchShebangs tests - '' + stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' substituteInPlace Makefile.in --replace "tests" " "; ''; @@ -18,12 +18,12 @@ stdenv.mkDerivation { propagatedBuildInputs = [ m4 ]; - preConfigure = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + preConfigure = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "ac_cv_func_malloc_0_nonnull=yes" "ac_cv_func_realloc_0_nonnull=yes" ]; - postConfigure = stdenv.lib.optionalString (stdenv.isDarwin || stdenv.isCygwin) '' + postConfigure = lib.optionalString (stdenv.isDarwin || stdenv.isCygwin) '' sed -i Makefile -e 's/-no-undefined//;' ''; diff --git a/pkgs/development/tools/parsing/flex/default.nix b/pkgs/development/tools/parsing/flex/default.nix index c77c1f73c69..42b007300a9 100644 --- a/pkgs/development/tools/parsing/flex/default.nix +++ b/pkgs/development/tools/parsing/flex/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs tests - '' + stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + '' + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' substituteInPlace Makefile.in --replace "tests" " " substituteInPlace doc/Makefile.am --replace 'flex.1: $(top_srcdir)/configure.ac' 'flex.1: ' @@ -33,12 +33,12 @@ stdenv.mkDerivation rec { buildInputs = [ bison ]; propagatedBuildInputs = [ m4 ]; - preConfigure = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + preConfigure = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "ac_cv_func_malloc_0_nonnull=yes" "ac_cv_func_realloc_0_nonnull=yes" ]; - postConfigure = stdenv.lib.optionalString (stdenv.isDarwin || stdenv.isCygwin) '' + postConfigure = lib.optionalString (stdenv.isDarwin || stdenv.isCygwin) '' sed -i Makefile -e 's/-no-undefined//;' ''; diff --git a/pkgs/development/tools/parsing/hammer/default.nix b/pkgs/development/tools/parsing/hammer/default.nix index b6cb2447710..0a9dfdec016 100644 --- a/pkgs/development/tools/parsing/hammer/default.nix +++ b/pkgs/development/tools/parsing/hammer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, glib, pkgconfig, python, scons }: +{ lib, stdenv, fetchgit, glib, pkg-config, python, scons }: stdenv.mkDerivation { pname = "hammer"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { rev = "47f34b81e4de834fd3537dd71928c4f3cdb7f533"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib python scons ]; meta = with lib; { diff --git a/pkgs/development/tools/parsing/javacc/default.nix b/pkgs/development/tools/parsing/javacc/default.nix new file mode 100644 index 00000000000..d074e3dda93 --- /dev/null +++ b/pkgs/development/tools/parsing/javacc/default.nix @@ -0,0 +1,32 @@ +{ stdenv, lib, fetchFromGitHub, ant, jdk }: + +stdenv.mkDerivation rec { + pname = "javacc"; + version = "7.0.10"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "${pname}-${version}"; + sha256 = "120jva4sw1kylkwgqf869zxddss01mcn1nmimx9vmd4xaadz7cf2"; + }; + + nativeBuildInputs = [ ant jdk ]; + + buildPhase = '' + ant jar + ''; + + installPhase = '' + mkdir -p $out/target + mv scripts $out/bin + mv target/javacc.jar $out/target/ + ''; + + meta = with lib; { + homepage = "https://javacc.github.io/javacc"; + description = "A parser generator for building parsers from grammars"; + license = licenses.bsd2; + maintainers = [ teams.deshaw.members ]; + }; +} diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix index fd730809711..6bbcf36cd2c 100644 --- a/pkgs/development/tools/parsing/ragel/default.nix +++ b/pkgs/development/tools/parsing/ragel/default.nix @@ -13,15 +13,15 @@ let inherit sha256; }; - buildInputs = stdenv.lib.optional build-manual [ transfig ghostscript tex ]; + buildInputs = lib.optional build-manual [ transfig ghostscript tex ]; - preConfigure = stdenv.lib.optional build-manual '' + preConfigure = lib.optional build-manual '' sed -i "s/build_manual=no/build_manual=yes/g" DIST ''; configureFlags = [ "--with-colm=${colm}" ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-std=gnu++98"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-std=gnu++98"; doCheck = true; @@ -40,12 +40,12 @@ in ragelStable = generic { version = "6.10"; sha256 = "0gvcsl62gh6sg73nwaxav4a5ja23zcnyxncdcdnqa2yjcpdnw5az"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }; ragelDev = generic { version = "7.0.0.12"; sha256 = "0x3si355lv6q051lgpg8bpclpiq5brpri5lv3p8kk2qhzfbyz69r"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix index e1648b84be5..6d8c9237bd0 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix @@ -16,6 +16,7 @@ tree-sitter-json = (builtins.fromJSON (builtins.readFile ./tree-sitter-json.json)); tree-sitter-julia = (builtins.fromJSON (builtins.readFile ./tree-sitter-julia.json)); tree-sitter-lua = (builtins.fromJSON (builtins.readFile ./tree-sitter-lua.json)); + tree-sitter-nix = (builtins.fromJSON (builtins.readFile ./tree-sitter-nix.json)); tree-sitter-ocaml = (builtins.fromJSON (builtins.readFile ./tree-sitter-ocaml.json)); tree-sitter-php = (builtins.fromJSON (builtins.readFile ./tree-sitter-php.json)); tree-sitter-python = (builtins.fromJSON (builtins.readFile ./tree-sitter-python.json)); diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json index 6498e40497e..81ccf5a8472 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-c-sharp", - "rev": "b8bff2a389ecc098dbb7e8abee492816a5eb42db", - "date": "2020-11-15T07:54:17+00:00", - "path": "/nix/store/h5p71g661hbyzcdcj6xff8y5pcsivpa4-tree-sitter-c-sharp", - "sha256": "0x78s2wgd8b6pwjzbmc9fgp0ivdmxv39wikig1m55slai6yq51wh", + "rev": "aae8ab2b681082ce7a35d8d5fdf75ffcf7f994e5", + "date": "2021-01-08T13:18:05+00:00", + "path": "/nix/store/fpx44l1j2dz3drnvfb7746d8zxn37gwi-tree-sitter-c-sharp", + "sha256": "107bxz9bhyixdla3xli06ism8rnkha7pa79hi7lyx00sfnjmgcc8", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json new file mode 100644 index 00000000000..6d055ca0ae9 --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json @@ -0,0 +1,10 @@ +{ + "url": "https://github.com/cstrahan/tree-sitter-nix", + "rev": "791b5ff0e4f0da358cbb941788b78d436a2ca621", + "date": "2019-05-10T15:57:43-05:00", + "path": "/nix/store/5gcddcxf6jfr4f0p203jnbjc0zxk207d-tree-sitter-nix", + "sha256": "1y5b3wh3fcmbgq8r2i97likzfp1zp02m58zacw5a1cjqs5raqz66", + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json index 86551acbee0..ff60ff80101 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-python", - "rev": "65b486b42fe0188e4be344092151042bf1bc6d9a", - "date": "2020-12-15T09:33:20-08:00", - "path": "/nix/store/k9jziqzyxq2bv55pwl03jcmmca83fjyp-tree-sitter-python", - "sha256": "1yxqdlmp0jybm7vvza1ni5a320vrviqkd14pnpcrg9ilzq23mlsh", + "rev": "f568dfabf7c4611077467a9cd13297fa0658abb6", + "date": "2021-01-06T13:32:39-08:00", + "path": "/nix/store/5g256n8ym3ll2kp9jlmnkaxpnyf6rpk3-tree-sitter-python", + "sha256": "1lxmzrkw4k9pba4xywnbd1pk2x5s99qa4skgqvgy3imgbhy7ilkh", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json index 027478e99f8..d5a1767a23c 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-ruby", - "rev": "bb572f60e9538bd11fbde95a54f97522073f1e06", - "date": "2020-12-20T12:25:50-08:00", - "path": "/nix/store/hkjgvxh8l4drk1z4zkhmd0wcj876x5y1-tree-sitter-ruby", - "sha256": "198sfmrb3mxvpfmlwmwfmb3qs075ih0bjmr0ffrdy4nqm4a00cb8", + "rev": "f86d90cce578e28c824afdcdbdca7d031b88c0b0", + "date": "2020-11-02T20:49:49-08:00", + "path": "/nix/store/gs0hhb1dlgmv0y60zyyz7ki30yvpddfx-tree-sitter-ruby", + "sha256": "1n1irdjfmv27p5ia2vqzv8zfsq19pxi0as0wrkb7z7s1lqr1gwrb", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json index 38c9e44f2f6..c02d03d11d9 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-rust", - "rev": "8746bd4b584b8063ee8e445bf31015e887417d33", - "date": "2020-11-23T17:16:42-08:00", - "path": "/nix/store/1zzxvza23wsdyazw47lhjvrs0za6wjpn-tree-sitter-rust", - "sha256": "0bhxfyq8ycnp90pqvr6cf3gpq1vax8a34kaq85dmbrc6ar8a7ap6", + "rev": "2beedf23bedbd7b02b416518693e8eed3944d4a0", + "date": "2021-01-05T10:00:48-08:00", + "path": "/nix/store/2igv1zlnl535b86zj8s9s3ir4q85933x-tree-sitter-rust", + "sha256": "0iicwhxf1f56zqpsagbm8nr30fpssi970mi9i47az206dbs506ly", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json index a875232eab6..fda72fc99c6 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-typescript", - "rev": "a3a4becef889692724bb1c2191f8fc4bce6573f9", - "date": "2020-12-15T13:34:55-08:00", - "path": "/nix/store/dra5wbhgxkkhphm1mhgv87hsfw0g18nw-tree-sitter-typescript", - "sha256": "0ir7lmzwnbf1zwbl4bfsib1jilg8pvfc1nabaq2n2rixvghlvf3d", + "rev": "2d1c7d5c10c33cb444d1781fa76f2936810afec4", + "date": "2021-01-07T09:49:56-08:00", + "path": "/nix/store/s65bv25523lwa9yrqbj9hsh0k4ig6pbx-tree-sitter-typescript", + "sha256": "09bv44n181az5rqjd43wngj9bghwy0237gpvs6xkjf9j19kvy0yi", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix index 7b0b16b403f..631944cb67a 100644 --- a/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -63,6 +63,10 @@ let # If you need a grammar that already exists in the official orga, # make sure to give it a different name. otherGrammars = { + "tree-sitter-nix" = { + orga = "cstrahan"; + repo = "tree-sitter-nix"; + }; "tree-sitter-lua" = { orga = "nvim-treesitter"; repo = "tree-sitter-lua"; diff --git a/pkgs/development/tools/pax-rs/default.nix b/pkgs/development/tools/pax-rs/default.nix index cda3ba5e8a8..ff4219ad09c 100644 --- a/pkgs/development/tools/pax-rs/default.nix +++ b/pkgs/development/tools/pax-rs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, rustPlatform, runCommand } : +{ lib, fetchFromGitHub, fetchurl, rustPlatform, runCommand } : with rustPlatform; buildRustPackage rec { diff --git a/pkgs/development/tools/pew/default.nix b/pkgs/development/tools/pew/default.nix index 6ca94041bb5..2d7294ec105 100644 --- a/pkgs/development/tools/pew/default.nix +++ b/pkgs/development/tools/pew/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3 }: +{ lib, python3 }: with python3.pkgs; diff --git a/pkgs/development/tools/pgformatter/default.nix b/pkgs/development/tools/pgformatter/default.nix index 0e3e1b7e9ca..d5c6872cd7d 100644 --- a/pkgs/development/tools/pgformatter/default.nix +++ b/pkgs/development/tools/pgformatter/default.nix @@ -24,8 +24,8 @@ perlPackages.buildPerlPackage rec { --replace "'INSTALLDIRS' => \$INSTALLDIRS," "'INSTALLDIRS' => \$INSTALLDIRS, 'INSTALLVENDORLIB' => 'bin/lib', 'INSTALLVENDORBIN' => 'bin', 'INSTALLVENDORSCRIPT' => 'bin', 'INSTALLVENDORMAN1DIR' => 'share/man/man1', 'INSTALLVENDORMAN3DIR' => 'share/man/man3'," ''; - nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + postInstall = lib.optionalString stdenv.isDarwin '' shortenPerlShebang $out/bin/pg_format ''; diff --git a/pkgs/development/tools/pgloader/default.nix b/pkgs/development/tools/pgloader/default.nix index 0e16726bb80..94217a765e2 100644 --- a/pkgs/development/tools/pgloader/default.nix +++ b/pkgs/development/tools/pgloader/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ git makeWrapper ]; buildInputs = [ sbcl cacert sqlite freetds libzip curl openssl ]; - LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ sqlite libzip curl git openssl freetds ]; + LD_LIBRARY_PATH = lib.makeLibraryPath [ sqlite libzip curl git openssl freetds ]; buildPhase = '' export PATH=$PATH:$out/bin diff --git a/pkgs/development/tools/phantomjs/default.nix b/pkgs/development/tools/phantomjs/default.nix index f042aa35b6f..66cdb09cf15 100644 --- a/pkgs/development/tools/phantomjs/default.nix +++ b/pkgs/development/tools/phantomjs/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { buildPhase = lib.optionalString (!stdenv.isDarwin) '' patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${stdenv.lib.makeLibraryPath [ freetype fontconfig stdenv.cc.cc stdenv.cc.cc openssl ]}" \ + --set-rpath "${lib.makeLibraryPath [ freetype fontconfig stdenv.cc.cc stdenv.cc.cc openssl ]}" \ bin/phantomjs ''; diff --git a/pkgs/development/tools/phantomjs2/default.nix b/pkgs/development/tools/phantomjs2/default.nix index 9fc2f416b76..3d0db49aedc 100644 --- a/pkgs/development/tools/phantomjs2/default.nix +++ b/pkgs/development/tools/phantomjs2/default.nix @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { bison flex fontconfig freetype gperf icu openssl libjpeg libpng perl python ruby sqlite qtwebkit qtbase makeWrapper - ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AGL ApplicationServices AppKit Cocoa OpenGL darwin.libobjc fakeClang cups ]); @@ -73,15 +73,17 @@ in stdenv.mkDerivation rec { # invalid suffix on literal; C++11 requires a space between litend identifier NIX_CFLAGS_COMPILE = "-Wno-reserved-user-defined-literal"; - __impureHostDeps = stdenv.lib.optional stdenv.isDarwin "/usr/lib/libicucore.dylib"; + __impureHostDeps = lib.optional stdenv.isDarwin "/usr/lib/libicucore.dylib"; enableParallelBuilding = true; + dontWrapQtApps = true; + installPhase = '' mkdir -p $out/share/doc/phantomjs cp -a bin $out cp -a ChangeLog examples LICENSE.BSD README.md third-party.txt $out/share/doc/phantomjs - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' install_name_tool -change \ ${darwin.CF}/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation \ /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation \ @@ -92,7 +94,7 @@ in stdenv.mkDerivation rec { '' + '' wrapProgram $out/bin/phantomjs \ --set QT_QPA_PLATFORM offscreen \ - --prefix PATH : ${stdenv.lib.makeBinPath [ qtbase ]} + --prefix PATH : ${lib.makeBinPath [ qtbase ]} ''; meta = with lib; { diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix index b0e65ed85a0..dbec90d8bf5 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix @@ -1,7 +1,7 @@ { pkgs ? import <nixpkgs> { } , lib ? pkgs.lib , poetry ? null -, poetryLib ? import ./lib.nix { inherit lib pkgs; } +, poetryLib ? import ./lib.nix { inherit lib pkgs; stdenv = pkgs.stdenv; } }: let inherit (poetryLib) isCompatible readTOML moduleName; @@ -71,7 +71,40 @@ in lib.makeScope pkgs.newScope (self: { # Poetry2nix version - version = "1.14.0"; + version = "1.15.2"; + + /* Returns a package of editable sources whose changes will be available without needing to restart the + nix-shell. + In editablePackageSources you can pass a mapping from package name to source directory to have + those packages available in the resulting environment, whose source changes are immediately available. + + */ + mkPoetryEditablePackage = + { projectDir ? null + , pyproject ? projectDir + "/pyproject.toml" + , python ? pkgs.python3 + , pyProject ? readTOML pyproject + # Example: { my-app = ./src; } + , editablePackageSources + }: + assert editablePackageSources != { }; + import ./editable.nix { + inherit pyProject python pkgs lib poetryLib editablePackageSources; + }; + + /* Returns a package containing scripts defined in tool.poetry.scripts. + */ + mkPoetryScriptsPackage = + { projectDir ? null + , pyproject ? projectDir + "/pyproject.toml" + , python ? pkgs.python3 + , pyProject ? readTOML pyproject + , scripts ? pyProject.tool.poetry.scripts + }: + assert scripts != { }; + import ./shell-scripts.nix { + inherit lib python scripts; + }; /* Returns an attrset { python, poetryPackages, pyProject, poetryLock } for the given pyproject/lockfile. @@ -84,11 +117,25 @@ lib.makeScope pkgs.newScope (self: { , python ? pkgs.python3 , pwd ? projectDir , preferWheels ? false + # Example: { my-app = ./src; } + , editablePackageSources ? { } , __isBootstrap ? false # Hack: Always add Poetry as a build input unless bootstrapping }@attrs: let poetryPkg = poetry.override { inherit python; }; pyProject = readTOML pyproject; + + scripts = pyProject.tool.poetry.scripts or { }; + hasScripts = scripts != { }; + scriptsPackage = self.mkPoetryScriptsPackage { + inherit python scripts; + }; + + hasEditable = editablePackageSources != { }; + editablePackage = self.mkPoetryEditablePackage { + inherit pyProject python editablePackageSources; + }; + poetryLock = readTOML poetrylock; lockFiles = let @@ -180,10 +227,13 @@ lib.makeScope pkgs.newScope (self: { inputAttrs = mkInputAttrs { inherit py pyProject; attrs = { }; includeBuildSystem = false; }; + storePackages = builtins.foldl' (acc: v: acc ++ v) [ ] (lib.attrValues inputAttrs); in { python = py; - poetryPackages = builtins.foldl' (acc: v: acc ++ v) [ ] (lib.attrValues inputAttrs); + poetryPackages = storePackages + ++ lib.optional hasScripts scriptsPackage + ++ lib.optional hasEditable editablePackage; poetryLock = poetryLock; inherit pyProject; }; @@ -203,38 +253,17 @@ lib.makeScope pkgs.newScope (self: { , pwd ? projectDir , python ? pkgs.python3 , preferWheels ? false - # Example: { my-app = ./src; } , editablePackageSources ? { } }: let - py = self.mkPoetryPackages ( - { - inherit pyproject poetrylock overrides python pwd preferWheels; - } - ); - - inherit (py) pyProject; - - # Add executables from tool.poetry.scripts - scripts = pyProject.tool.poetry.scripts or { }; - hasScripts = scripts != { }; - scriptsPackage = import ./shell-scripts.nix { - inherit scripts lib; - inherit (py) python; + poetryPython = self.mkPoetryPackages { + inherit pyproject poetrylock overrides python pwd preferWheels editablePackageSources; }; - hasEditable = editablePackageSources != { }; - editablePackage = import ./editable.nix { - inherit pkgs lib poetryLib editablePackageSources; - inherit (py) pyProject python; - }; + inherit (poetryPython) poetryPackages; in - py.python.withPackages ( - _: py.poetryPackages - ++ lib.optional hasEditable editablePackage - ++ lib.optional hasScripts scriptsPackage - ); + poetryPython.python.withPackages (_: poetryPackages); /* Creates a Python application from pyproject.toml and poetry.lock diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix b/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix index 6a0ee70f863..4626f7fec37 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix @@ -1,4 +1,4 @@ -{ lib, pkgs }: +{ lib, pkgs, stdenv }: let inherit (import ./semver.nix { inherit lib ireplace; }) satisfiesSemver; inherit (builtins) genList length; @@ -194,6 +194,23 @@ let inherit src; }; }; + + # Maps Nixpkgs CPU values to target machines known to be supported for manylinux* wheels. + # (a.k.a. `uname -m` output from CentOS 7) + # + # This is current as of manylinux2014 (PEP-0599), and is a superset of manylinux2010 / manylinux1. + # s390x is not supported in Nixpkgs, so we don't map it. + manyLinuxTargetMachines = { + x86_64 = "x86_64"; + i686 = "i686"; + aarch64 = "aarch64"; + armv7l = "armv7l"; + powerpc64 = "ppc64"; + powerpc64le = "ppc64le"; + }; + + # Machine tag for our target platform (if available) + targetMachine = manyLinuxTargetMachines.${stdenv.targetPlatform.parsed.cpu.name} or null; in { inherit @@ -207,5 +224,6 @@ in cleanPythonSources moduleName getPythonVersion + targetMachine ; } diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix index c01f99c01d4..bb7b4e39b03 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix @@ -31,7 +31,7 @@ pythonPackages.callPackage inherit (poetryLib) isCompatible getManyLinuxDeps fetchFromPypi moduleName; inherit (import ./pep425.nix { - inherit lib python; + inherit lib poetryLib python; inherit (pkgs) stdenv; }) selectWheel ; @@ -161,7 +161,7 @@ pythonPackages.callPackage builtins.fetchGit { inherit (source) url; rev = source.resolved_reference or source.reference; - ref = sourceSpec.branch or sourceSpec.rev or sourceSpec.tag or "HEAD"; + ref = sourceSpec.branch or sourceSpec.rev or (if sourceSpec?tag then "refs/tags/${sourceSpec.tag}" else "HEAD"); } ) else if isUrl then diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix index 22627f3df1b..d400986d3d7 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix @@ -56,7 +56,7 @@ self: super: av = super.av.overridePythonAttrs ( old: { nativeBuildInputs = old.nativeBuildInputs ++ [ - pkgs.pkgconfig + pkgs.pkg-config ]; buildInputs = old.buildInputs ++ [ pkgs.ffmpeg_4 ]; } @@ -127,11 +127,23 @@ self: super: cryptography = super.cryptography.overridePythonAttrs ( old: { nativeBuildInputs = old.nativeBuildInputs or [ ] - ++ stdenv.lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) self.python.pythonForBuild.pkgs.cffi; + ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) self.python.pythonForBuild.pkgs.cffi; buildInputs = old.buildInputs ++ [ pkgs.openssl ]; } ); + datadog-lambda = super.datadog-lambda.overridePythonAttrs (old: { + postPatch = '' + substituteInPlace setup.py --replace "setuptools==" "setuptools>=" + ''; + buildInputs = old.buildInputs ++ [ self.setuptools ]; + }); + + ddtrace = super.ddtrace.overridePythonAttrs (old: { + buildInputs = old.buildInputs ++ + (pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.darwin.IOKit ]) ++ [ self.cython ]; + }); + dictdiffer = super.dictdiffer.overridePythonAttrs ( old: { buildInputs = old.buildInputs ++ [ self.pytest-runner ]; @@ -234,7 +246,7 @@ self: super: h5py = super.h5py.overridePythonAttrs ( old: if old.format != "wheel" then rec { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ]; buildInputs = old.buildInputs ++ [ pkgs.hdf5 self.pkgconfig self.cython ]; configure_flags = "--hdf5=${pkgs.hdf5}"; postConfigure = '' @@ -245,7 +257,7 @@ self: super: horovod = super.horovod.overridePythonAttrs ( old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.openmpi ]; + propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.mpi ]; } ); @@ -386,7 +398,7 @@ self: super: ); libvirt-python = super.libvirt-python.overridePythonAttrs ({ nativeBuildInputs ? [ ], ... }: { - nativeBuildInputs = nativeBuildInputs ++ [ pkgs.pkgconfig ]; + nativeBuildInputs = nativeBuildInputs ++ [ pkgs.pkg-config ]; propagatedBuildInputs = [ pkgs.libvirt ]; }); @@ -407,7 +419,7 @@ self: super: export LLVM_CONFIG=${pkgs.llvm}/bin/llvm-config ''; - __impureHostDeps = pkgs.lib.optionals pkgs.stdenv.isDarwin [ "/usr/lib/libm.dylib" ]; + __impureHostDeps = lib.optionals pkgs.stdenv.isDarwin [ "/usr/lib/libm.dylib" ]; passthru = old.passthru // { llvm = pkgs.llvm; }; } @@ -421,7 +433,7 @@ self: super: lxml = super.lxml.overridePythonAttrs ( old: { - nativeBuildInputs = with pkgs; old.nativeBuildInputs ++ [ pkgconfig libxml2.dev libxslt.dev ]; + nativeBuildInputs = with pkgs; old.nativeBuildInputs ++ [ pkg-config libxml2.dev libxslt.dev ]; buildInputs = with pkgs; old.buildInputs ++ [ libxml2 libxslt ]; } ); @@ -443,7 +455,7 @@ self: super: inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; in { - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${pkgs.libcxx}/include/c++/v1"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${pkgs.libcxx}/include/c++/v1"; XDG_RUNTIME_DIR = "/tmp"; @@ -452,7 +464,7 @@ self: super: ++ lib.optional stdenv.isDarwin [ Cocoa ]; nativeBuildInputs = old.nativeBuildInputs ++ [ - pkgs.pkgconfig + pkgs.pkg-config ]; postPatch = '' @@ -466,9 +478,9 @@ self: super: pkgs.libpng pkgs.freetype ] - ++ stdenv.lib.optionals enableGtk3 [ pkgs.cairo self.pycairo pkgs.gtk3 pkgs.gobject-introspection self.pygobject3 ] - ++ stdenv.lib.optionals enableTk [ pkgs.tcl pkgs.tk self.tkinter pkgs.libX11 ] - ++ stdenv.lib.optionals enableQt [ self.pyqt5 ] + ++ lib.optionals enableGtk3 [ pkgs.cairo self.pycairo pkgs.gtk3 pkgs.gobject-introspection self.pygobject3 ] + ++ lib.optionals enableTk [ pkgs.tcl pkgs.tk self.tkinter pkgs.libX11 ] + ++ lib.optionals enableQt [ self.pyqt5 ] ; inherit (super.matplotlib) patches; @@ -528,14 +540,14 @@ self: super: { } { mpi = { - mpicc = "${pkgs.openmpi.outPath}/bin/mpicc"; + mpicc = "${pkgs.mpi.outPath}/bin/mpicc"; }; } ); }; in { - propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.openmpi ]; + propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.mpi ]; enableParallelBuilding = true; preBuild = '' ln -sf ${cfg} mpi.cfg @@ -549,6 +561,12 @@ self: super: } ); + mysqlclient = super.mysqlclient.overridePythonAttrs ( + old: { + buildInputs = old.buildInputs ++ [ pkgs.libmysqlclient ]; + } + ); + netcdf4 = super.netcdf4.overridePythonAttrs ( old: { buildInputs = old.buildInputs ++ [ @@ -615,6 +633,13 @@ self: super: } ); + osqp = super.osqp.overridePythonAttrs ( + old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.cmake ]; + dontUseCmakeConfigure = true; + } + ); + parsel = super.parsel.overridePythonAttrs ( old: rec { nativeBuildInputs = old.nativeBuildInputs ++ [ self.pytest-runner ]; @@ -637,11 +662,33 @@ self: super: pillow = super.pillow.overridePythonAttrs ( old: { - nativeBuildInputs = [ pkgs.pkgconfig ] ++ old.nativeBuildInputs; + nativeBuildInputs = [ pkgs.pkg-config ] ++ old.nativeBuildInputs; buildInputs = with pkgs; [ freetype libjpeg zlib libtiff libwebp tcl lcms2 ] ++ old.buildInputs; } ); + # Work around https://github.com/nix-community/poetry2nix/issues/244 + # where git deps are not picked up as they should + pip = + if lib.versionAtLeast super.pip.version "20.3" then + super.pip.overridePythonAttrs + (old: + let + pname = "pip"; + version = "20.2.4"; + in + { + name = pname + "-" + version; + inherit version; + src = pkgs.fetchFromGitHub { + owner = "pypa"; + repo = pname; + rev = version; + sha256 = "eMVV4ftgV71HLQsSeaOchYlfaJVgzNrwUynn3SA1/Do="; + name = "${pname}-${version}-source"; + }; + }) else super.pip; + poetry-core = super.poetry-core.overridePythonAttrs (old: { # "Vendor" dependencies (for build-system support) postPatch = '' @@ -706,7 +753,7 @@ self: super: nativeBuildInputs = old.nativeBuildInputs ++ [ self.cython - pkgs.pkgconfig + pkgs.pkg-config pkgs.cmake ]; @@ -755,7 +802,7 @@ self: super: nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.meson pkgs.ninja - pkgs.pkgconfig + pkgs.pkg-config ]; propagatedBuildInputs = old.propagatedBuildInputs ++ [ @@ -822,7 +869,7 @@ self: super: pygobject = super.pygobject.overridePythonAttrs ( old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ]; buildInputs = old.buildInputs ++ [ pkgs.glib pkgs.gobject-introspection ]; } ); @@ -873,7 +920,7 @@ self: super: format = "other"; nativeBuildInputs = old.nativeBuildInputs ++ [ - pkgs.pkgconfig + pkgs.pkg-config pkgs.qt5.qmake pkgs.xorg.lndir pkgs.qt5.qtbase @@ -972,6 +1019,10 @@ self: super: pytest = super.pytest.overridePythonAttrs ( old: { + # Fixes https://github.com/pytest-dev/pytest/issues/7891 + postPatch = old.postPatch or "" + '' + sed -i '/\[metadata\]/aversion = ${old.version}' setup.cfg + ''; doCheck = false; } ); @@ -996,6 +1047,28 @@ self: super: } ); + # pytest-splinter seems to put a .marker file in an empty directory + # presumably so it's tracked by and can be installed with MANIFEST.in, see + # https://github.com/pytest-dev/pytest-splinter/commit/a48eeef662f66ff9d3772af618748e73211a186b + # + # This directory then gets used as an empty initial profile directory and is + # zipped up. But if the .marker file is in the Nix store, it has the + # creation date of 1970, and Zip doesn't work with such old files, so it + # fails at runtime! + # + # We fix this here by just removing the file after the installation + # + # The error you get without this is: + # + # E ValueError: ZIP does not support timestamps before 1980 + # /nix/store/55b9ip7xkpimaccw9pa0vacy5q94f5xa-python3-3.7.6/lib/python3.7/zipfile.py:357: ValueError + pytest-splinter = super.pytest-splinter.overrideAttrs (old: { + postInstall = old.postInstall or "" + '' + rm $out/${super.python.sitePackages}/pytest_splinter/profiles/firefox/.marker + ''; + }); + + ffmpeg-python = super.ffmpeg-python.overridePythonAttrs ( old: { buildInputs = old.buildInputs ++ [ self.pytest-runner ]; @@ -1012,7 +1085,7 @@ self: super: pyzmq = super.pyzmq.overridePythonAttrs ( old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ]; propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.zeromq ]; } ); @@ -1117,7 +1190,7 @@ self: super: tables = super.tables.overridePythonAttrs ( old: { HDF5_DIR = "${pkgs.hdf5}"; - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ]; propagatedBuildInputs = old.nativeBuildInputs ++ [ pkgs.hdf5 self.numpy self.numexpr ]; } ); @@ -1168,14 +1241,16 @@ self: super: # is explicitly disabled with USE_CUDA=0. find $out -name "*.so" -exec ${pkgs.patchelf}/bin/patchelf --remove-needed libcuda.so.1 {} \; ''; - buildInputs = old.buildInputs ++ lib.optionals enableCuda [ + buildInputs = (old.buildInputs or [ ]) + ++ [ self.typing-extensions ] + ++ lib.optionals enableCuda [ pkgs.linuxPackages.nvidia_x11 pkgs.nccl.dev pkgs.nccl.out ]; propagatedBuildInputs = [ - super.numpy - super.future + self.numpy + self.future ]; }) ) @@ -1257,15 +1332,15 @@ self: super: format = "wheel"; }; # If "wheel" is built from source - sourcePackage = ( + sourcePackage = (( pkgs.python3.pkgs.override { python = self.python; } - ).wheel.overridePythonAttrs ( - old: { - inherit (super.wheel) pname name version src; - } - ); + ).wheel.override { + inherit (self) buildPythonPackage bootstrapped-pip setuptools; + }).overrideAttrs (old: { + inherit (super.wheel) pname name version src; + }); in if isWheel then wheelPackage else sourcePackage; @@ -1303,6 +1378,15 @@ self: super: } ); + packaging = super.packaging.overridePythonAttrs ( + old: { + buildInputs = old.buildInputs ++ + # From 20.5 until 20.7, packaging used flit for packaging (heh) + # See https://github.com/pypa/packaging/pull/352 and https://github.com/pypa/packaging/pull/367 + lib.optional (lib.versionAtLeast old.version "20.5" && lib.versionOlder old.version "20.8") [ self.flit-core ]; + } + ); + supervisor = super.supervisor.overridePythonAttrs ( old: { propagatedBuildInputs = old.propagatedBuildInputs ++ [ @@ -1317,4 +1401,47 @@ self: super: propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.toolz ]; } ); + + # For some reason the toml dependency of tqdm declared here: + # https://github.com/tqdm/tqdm/blob/67130a23646ae672836b971e1086b6ae4c77d930/pyproject.toml#L2 + # is not translated correctly to a nix dependency. + tqdm = super.tqdm.overrideAttrs ( + old: { + buildInputs = [ super.toml ] ++ old.buildInputs; + } + ); + + watchdog = super.watchdog.overrideAttrs ( + old: { + buildInputs = old.buildInputs or [ ] + ++ pkgs.lib.optional pkgs.stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.CoreServices; + } + ); + + # pyee cannot find `vcversioner` and other "setup requirements", so it tries to + # download them from the internet, which only works when nix sandboxing is disabled. + # Additionally, since pyee uses vcversioner to specify its version, we need to do this + # manually specify its version. + pyee = super.pyee.overrideAttrs ( + old: { + postPatch = old.postPatch or "" + '' + sed -i setup.py \ + -e '/setup_requires/,/],/d' \ + -e 's/vcversioner={},/version="${old.version}",/' + ''; + } + ); + + # nixpkgs has setuptools_scm 4.1.2 + # but newrelic has a seemingly unnecessary version constraint for <4 + # So we patch that out + newrelic = super.newrelic.overridePythonAttrs ( + old: { + postPatch = old.postPatch or "" + '' + substituteInPlace setup.py --replace '"setuptools_scm>=3.2,<4"' '"setuptools_scm"' + ''; + } + ); + + } diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix b/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix index e333bd49718..9e29c5301ab 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix @@ -1,6 +1,7 @@ -{ lib, stdenv, python, isLinux ? stdenv.isLinux }: +{ lib, stdenv, poetryLib, python, isLinux ? stdenv.isLinux }: let inherit (lib.strings) hasSuffix hasInfix splitString removeSuffix; + inherit (poetryLib) targetMachine; # The 'cpxy" as determined by `python.version` # @@ -72,12 +73,16 @@ let withPlatform = if isLinux then - ( - x: x.platform == "manylinux1_${stdenv.platform.kernelArch}" - || x.platform == "manylinux2010_${stdenv.platform.kernelArch}" - || x.platform == "manylinux2014_${stdenv.platform.kernelArch}" - || x.platform == "any" - ) + if targetMachine != null + then + ( + x: x.platform == "manylinux1_${targetMachine}" + || x.platform == "manylinux2010_${targetMachine}" + || x.platform == "manylinux2014_${targetMachine}" + || x.platform == "any" + ) + else + (x: x.platform == "any") else (x: hasInfix "macosx" x.platform || x.platform == "any"); filterWheel = x: let diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix b/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix index ba8145398f5..dc9cd2936d0 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix @@ -1,6 +1,6 @@ { lib, stdenv, poetryLib }: python: let - inherit (poetryLib) ireplace; + inherit (poetryLib) ireplace targetMachine; # Like builtins.substring but with stop being offset instead of length substr = start: stop: s: builtins.substring start (stop - start) s; @@ -95,7 +95,7 @@ let else if stdenv.isDarwin then "darwin" else throw "Unsupported platform" ); - platform_machine = stdenv.platform.kernelArch; + platform_machine = targetMachine; platform_python_implementation = let impl = python.passthru.implementation; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/update b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/update index d69878ad084..33a2823f360 100755 --- a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/update +++ b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/update @@ -3,6 +3,7 @@ rev=$(curl -s https://api.github.com/repos/python-poetry/poetry/releases/latest | jq -r '.name') nix-prefetch-github --rev "$rev" python-poetry poetry > src.json +echo >> src.json src=$(nix-build --no-out-link --expr 'with import <nixpkgs> {}; fetchFromGitHub (lib.importJSON ./src.json)') cp $src/pyproject.toml $src/poetry.lock . diff --git a/pkgs/development/tools/poetry2nix/update b/pkgs/development/tools/poetry2nix/update index f96763dbee3..41866437aa4 100755 --- a/pkgs/development/tools/poetry2nix/update +++ b/pkgs/development/tools/poetry2nix/update @@ -16,7 +16,7 @@ mv poetry2nix-master/* . mkdir build cp *.* build/ cp -r pkgs hooks bin build/ -rm build/shell.nix build/generate.py build/overlay.nix build/flake.nix +rm build/shell.nix build/generate.py build/overlay.nix build/flake.* cat > build/README.md << EOF Dont change these files here, they are maintained at https://github.com/nix-community/poetry2nix diff --git a/pkgs/development/tools/profiling/EZTrace/default.nix b/pkgs/development/tools/profiling/EZTrace/default.nix index e856c1f718a..e057fc8ebe1 100644 --- a/pkgs/development/tools/profiling/EZTrace/default.nix +++ b/pkgs/development/tools/profiling/EZTrace/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl, autoconf, gfortran , libelf, libiberty, zlib, libbfd, libopcodes , buildPackages @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "Tool that aims at generating automatically execution trace from HPC programs"; - license = stdenv.lib.licenses.cecill-b; - maintainers = with stdenv.lib.maintainers; [ ]; + license = lib.licenses.cecill-b; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/tools/profiling/oprofile/default.nix b/pkgs/development/tools/profiling/oprofile/default.nix index ca346cd1f14..6cd3ea80027 100644 --- a/pkgs/development/tools/profiling/oprofile/default.nix +++ b/pkgs/development/tools/profiling/oprofile/default.nix @@ -1,5 +1,5 @@ -{ stdenv, buildPackages -, fetchurl, pkgconfig +{ lib, stdenv, buildPackages +, fetchurl, pkg-config , libbfd, popt, zlib, linuxHeaders, libiberty_static , withGUI ? false, qt4 ? null }: @@ -21,15 +21,15 @@ stdenv.mkDerivation rec { --replace "/bin/cp" "${buildPackages.coreutils}/bin/cp" ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libbfd zlib popt linuxHeaders libiberty_static ] - ++ stdenv.lib.optionals withGUI [ qt4 ]; + ++ lib.optionals withGUI [ qt4 ]; configureFlags = [ "--with-kernel=${linuxHeaders}" "--disable-shared" # needed because only the static libbfd is available ] - ++ stdenv.lib.optional withGUI "--with-qt-dir=${qt4} --enable-gui=qt4"; + ++ lib.optional withGUI "--with-qt-dir=${qt4} --enable-gui=qt4"; meta = { description = "System-wide profiler for Linux"; @@ -45,10 +45,10 @@ stdenv.mkDerivation rec { is profiled: hardware and software interrupt handlers, kernel modules, the kernel, shared libraries, and applications. ''; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; homepage = "http://oprofile.sourceforge.net/"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; maintainers = [ ]; }; } diff --git a/pkgs/development/tools/profiling/pprof/default.nix b/pkgs/development/tools/profiling/pprof/default.nix index dd2345378d4..eab000e8d8e 100644 --- a/pkgs/development/tools/profiling/pprof/default.nix +++ b/pkgs/development/tools/profiling/pprof/default.nix @@ -1,5 +1,5 @@ # This file was originally generated by https://github.com/kamilchm/go2nix v1.2.1 -{ lib, stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "pprof-unstable"; diff --git a/pkgs/development/tools/profiling/sysprof/capture.nix b/pkgs/development/tools/profiling/sysprof/capture.nix index a1f5d00332c..a9443eeadf6 100644 --- a/pkgs/development/tools/profiling/sysprof/capture.nix +++ b/pkgs/development/tools/profiling/sysprof/capture.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , meson , ninja , sysprof @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { meta = sysprof.meta // { description = "Static library for Sysprof capture data generation"; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index 6974800e87f..9e749adea20 100644 --- a/pkgs/development/tools/profiling/sysprof/default.nix +++ b/pkgs/development/tools/profiling/sysprof/default.nix @@ -10,7 +10,7 @@ , libxml2 , meson, ninja , pango -, pkgconfig +, pkg-config , polkit , shared-mime-info , systemd @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1z2i9187f2jx456l7h07wy8m9a0p7pj3xiv1aji3snq7rjb1lkj0"; }; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { libxml2 meson ninja - pkgconfig + pkg-config shared-mime-info wrapGAppsHook gnome3.adwaita-icon-theme diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix index c1f38a62418..c5d65a8239e 100644 --- a/pkgs/development/tools/profiling/systemtap/default.nix +++ b/pkgs/development/tools/profiling/systemtap/default.nix @@ -1,4 +1,4 @@ -{ fetchgit, pkgconfig, gettext, runCommand, makeWrapper +{ lib, fetchgit, pkg-config, gettext, runCommand, makeWrapper , elfutils, kernel, gnumake, python2, python2Packages }: @@ -10,14 +10,13 @@ let version = "4.1"; inherit (kernel) stdenv; - inherit (stdenv) lib; ## stap binaries stapBuild = stdenv.mkDerivation { pname = "systemtap"; inherit version; src = fetchgit { inherit url rev sha256; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ elfutils gettext python2 python2Packages.setuptools ]; enableParallelBuilding = true; }; diff --git a/pkgs/development/tools/pry/gemset.nix b/pkgs/development/tools/pry/gemset.nix index 05e5e1dcfb8..c3f42889e1f 100644 --- a/pkgs/development/tools/pry/gemset.nix +++ b/pkgs/development/tools/pry/gemset.nix @@ -30,4 +30,4 @@ }; version = "0.13.1"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/puppet/puppet-lint/gemset.nix b/pkgs/development/tools/puppet/puppet-lint/gemset.nix index 86d18b0c554..d42626f1cd5 100644 --- a/pkgs/development/tools/puppet/puppet-lint/gemset.nix +++ b/pkgs/development/tools/puppet/puppet-lint/gemset.nix @@ -7,4 +7,4 @@ }; version = "2.3.6"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/purescript/spago/spago.nix b/pkgs/development/tools/purescript/spago/spago.nix index ed0ce05843b..58458ea79aa 100644 --- a/pkgs/development/tools/purescript/spago/spago.nix +++ b/pkgs/development/tools/purescript/spago/spago.nix @@ -6,7 +6,7 @@ , http-conduit, http-types, lens-family-core, megaparsec, mtl , network-uri, open-browser, optparse-applicative, prettyprinter , process, QuickCheck, retry, rio, rio-orphans, safe, semver-range -, stdenv, stm, stringsearch, tar, template-haskell, temporary, text +, lib, stm, stringsearch, tar, template-haskell, temporary, text , time, transformers, turtle, unliftio, unordered-containers , utf8-string, vector, versions, with-utf8, zlib }: @@ -41,5 +41,5 @@ mkDerivation { testToolDepends = [ hspec-discover ]; prePatch = "hpack"; homepage = "https://github.com/purescript/spago#readme"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; } diff --git a/pkgs/development/tools/pxview/default.nix b/pkgs/development/tools/pxview/default.nix index 30d109beb97..20049215a70 100644 --- a/pkgs/development/tools/pxview/default.nix +++ b/pkgs/development/tools/pxview/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, perl, perlPackages, pxlib }: +{ lib, stdenv, fetchurl, pkg-config, perl, perlPackages, pxlib }: stdenv.mkDerivation rec { pname = "pxview"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ pxlib perl ] ++ (with perlPackages; [ libxml_perl ]); - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; configureFlags = [ "--with-pxlib=${pxlib.out}" ]; diff --git a/pkgs/development/tools/py-spy/default.nix b/pkgs/development/tools/py-spy/default.nix index 5edd73eba95..7a93d5ecbe0 100644 --- a/pkgs/development/tools/py-spy/default.nix +++ b/pkgs/development/tools/py-spy/default.nix @@ -1,26 +1,26 @@ -{ lib, stdenv, pkgsBuildBuild, rustPlatform, fetchFromGitHub, pkgconfig, libunwind, python3 }: +{ lib, stdenv, pkgsBuildBuild, rustPlatform, fetchFromGitHub, pkg-config, libunwind, python3 }: rustPlatform.buildRustPackage rec { pname = "py-spy"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "benfred"; repo = "py-spy"; rev = "v${version}"; - sha256 = "1w9nwsmazafr78ghif6njdcqjisr0f1jb6cm1w4ngvigx5qlrbkv"; + sha256 = "sha256-7282DGLNHpKorNTHvpMLmqF2DrEVMIiQIzf5nTuJ7lc="; }; NIX_CFLAGS_COMPILE = "-L${libunwind}/lib"; # error: linker `arm-linux-gnueabihf-gcc` not found - preConfigure = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + preConfigure = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' export RUSTFLAGS="-Clinker=$CC" ''; checkInputs = [ python3 ]; - cargoSha256 = "0hrzmpwd2k4l8gjbry8ddrkv9q9qh8ag096md4q0fyn5bgnxhkah"; + cargoSha256 = "sha256-qVnOuLNMAy+6MP+dh6vLiSXvwQBAwyzRnHzCP60BdWk="; meta = with lib; { description = "Sampling profiler for Python programs"; diff --git a/pkgs/development/tools/pydb/default.nix b/pkgs/development/tools/pydb/default.nix index 67e7a879d88..eaaa057dc0a 100644 --- a/pkgs/development/tools/pydb/default.nix +++ b/pkgs/development/tools/pydb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python2, emacs }: +{ lib, stdenv, fetchurl, python2, emacs }: stdenv.mkDerivation { name = "pydb-1.26"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { description = "Python debugger with GDB-like commands and Emacs bindings"; homepage = "http://bashdb.sourceforge.net/pydb/"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl3; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix index a750a21c1b4..40e3e42d84c 100644 --- a/pkgs/development/tools/qtcreator/default.nix +++ b/pkgs/development/tools/qtcreator/default.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, fetchurl, fetchgit, fetchpatch , qtbase, qtquickcontrols, qtscript, qtdeclarative, qmake, llvmPackages_8 -, withDocumentation ? false, withClangPlugins ? true +, withDocumentation ? false, withClangPlugins ? true }: with lib; @@ -28,9 +28,9 @@ mkDerivation rec { sha256 = "0ibn7bapw7m26nmxl26dns1hnpawfdqk1i1mgg0gjssja8famszg"; }; - buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ] ++ - optionals withClangPlugins [ llvmPackages_8.libclang - clang_qt_vendor + buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ] ++ + optionals withClangPlugins [ llvmPackages_8.libclang + clang_qt_vendor llvmPackages_8.llvm ]; nativeBuildInputs = [ qmake ]; @@ -38,7 +38,7 @@ mkDerivation rec { # 0001-Fix-clang-libcpp-regexp.patch is for fixing regexp that is used to # find clang libc++ library include paths. By default it's not covering paths # like libc++-version, which is default name for libc++ folder in nixos. - # ./0002-Dont-remove-clang-header-paths.patch is for forcing qtcreator to not + # ./0002-Dont-remove-clang-header-paths.patch is for forcing qtcreator to not # remove system clang include paths. patches = [ ./0001-Fix-clang-libcpp-regexp.patch ./0002-Dont-remove-clang-header-paths.patch ]; @@ -53,7 +53,7 @@ mkDerivation rec { preConfigure = '' substituteInPlace src/plugins/plugins.pro \ - --replace '$$[QT_INSTALL_QML]/QtQuick/Controls' '${qtquickcontrols}/${qtbase.qtQmlPrefix}/QtQuick/Controls' + --replace '$$[QT_INSTALL_QML]/QtQuick/Controls' '${qtquickcontrols}/${qtbase.qtQmlPrefix}/QtQuick/Controls' '' + optionalString withClangPlugins '' # Fix paths for llvm/clang includes directories. substituteInPlace src/shared/clang/clang_defines.pri \ diff --git a/pkgs/development/tools/quicktemplate/default.nix b/pkgs/development/tools/quicktemplate/default.nix index 4edb60d11a1..4fe51d3e046 100644 --- a/pkgs/development/tools/quicktemplate/default.nix +++ b/pkgs/development/tools/quicktemplate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "quicktemplate"; diff --git a/pkgs/development/tools/quilt/default.nix b/pkgs/development/tools/quilt/default.nix index dece0a7b44b..71cf10e63b9 100644 --- a/pkgs/development/tools/quilt/default.nix +++ b/pkgs/development/tools/quilt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, bash, perl, diffstat, diffutils, patch, findutils }: +{ lib, stdenv, fetchurl, makeWrapper, bash, perl, diffstat, diffutils, patch, findutils }: stdenv.mkDerivation rec { @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { and more. ''; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/tools/rdbtools/default.nix b/pkgs/development/tools/rdbtools/default.nix index 5674876daba..e2f053c1e81 100644 --- a/pkgs/development/tools/rdbtools/default.nix +++ b/pkgs/development/tools/rdbtools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python }: +{ lib, python }: with python.pkgs; diff --git a/pkgs/development/tools/rdocker/default.nix b/pkgs/development/tools/rdocker/default.nix index 16e832a99b8..098d7a59314 100644 --- a/pkgs/development/tools/rdocker/default.nix +++ b/pkgs/development/tools/rdocker/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation { postInstall = '' wrapProgram $out/bin/rdocker \ - --prefix PATH : ${stdenv.lib.makeBinPath [ openssh ]} + --prefix PATH : ${lib.makeBinPath [ openssh ]} ''; meta = with lib; { description = "Securely control a remote docker daemon CLI using ssh forwarding, no SSL setup needed"; homepage = "https://github.com/dvddarias/rdocker"; - maintainers = [ stdenv.lib.maintainers.pneumaticat ]; + maintainers = [ lib.maintainers.pneumaticat ]; license = licenses.mit; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/development/tools/react-native-debugger/default.nix index f5174da13a1..06b5dd79401 100644 --- a/pkgs/development/tools/react-native-debugger/default.nix +++ b/pkgs/development/tools/react-native-debugger/default.nix @@ -3,7 +3,7 @@ }: let - rpath = stdenv.lib.makeLibraryPath [ + rpath = lib.makeLibraryPath [ cairo stdenv.cc.cc gdk-pixbuf diff --git a/pkgs/development/tools/redis-dump/gemset.nix b/pkgs/development/tools/redis-dump/gemset.nix index 2bfaa1fb952..74e6d4e1b32 100644 --- a/pkgs/development/tools/redis-dump/gemset.nix +++ b/pkgs/development/tools/redis-dump/gemset.nix @@ -50,4 +50,4 @@ }; version = "1.4.1"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/remarshal/default.nix b/pkgs/development/tools/remarshal/default.nix index c37779a5293..385db11d7ff 100644 --- a/pkgs/development/tools/remarshal/default.nix +++ b/pkgs/development/tools/remarshal/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages }: +{ lib, python3Packages }: python3Packages.buildPythonApplication rec { pname = "remarshal"; diff --git a/pkgs/development/tools/renderizer/default.nix b/pkgs/development/tools/renderizer/default.nix index 747e80adf4f..22bf5fbe904 100644 --- a/pkgs/development/tools/renderizer/default.nix +++ b/pkgs/development/tools/renderizer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "renderizer"; diff --git a/pkgs/development/tools/reno/default.nix b/pkgs/development/tools/reno/default.nix index 17a334aba20..ca01f6ebfa2 100644 --- a/pkgs/development/tools/reno/default.nix +++ b/pkgs/development/tools/reno/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , git , gnupg1 , python3Packages diff --git a/pkgs/development/tools/repository-managers/nexus/default.nix b/pkgs/development/tools/repository-managers/nexus/default.nix index ad83b0f30c7..828b8e5b1cd 100644 --- a/pkgs/development/tools/repository-managers/nexus/default.nix +++ b/pkgs/development/tools/repository-managers/nexus/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nexus"; - version = "3.29.0-02"; + version = "3.29.2-02"; src = fetchurl { url = "https://sonatype-download.global.ssl.fastly.net/nexus/3/nexus-${version}-unix.tar.gz"; - sha256 = "0yxk3yy9vllxc9v4dn3fs8hh389lrw2g8gg24rx1w8bg05rrrr8z"; + sha256 = "sha256-vHy7V32xlYaPJdc8oi3j98weOdc4R5S64Dwo9YI8o6c="; }; preferLocalBuild = true; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/nexus \ --set JAVA_HOME ${jre_headless} \ --set ALTERNATIVE_NAME "nexus" \ - --prefix PATH "${stdenv.lib.makeBinPath [ gawk ]}" + --prefix PATH "${lib.makeBinPath [ gawk ]}" runHook postInstall ''; diff --git a/pkgs/development/tools/rgp/default.nix b/pkgs/development/tools/rgp/default.nix index 8beeccfa2fd..3cfd608e225 100644 --- a/pkgs/development/tools/rgp/default.nix +++ b/pkgs/development/tools/rgp/default.nix @@ -53,6 +53,8 @@ stdenv.mkDerivation rec { "${placeholder "out"}/opt/rgp/qt" ]; + dontWrapQtApps = true; + installPhase = '' mkdir -p $out/opt/rgp $out/bin cp -r . $out/opt/rgp/ diff --git a/pkgs/development/tools/richgo/default.nix b/pkgs/development/tools/richgo/default.nix index 1013c4aa8b4..81a912171f3 100644 --- a/pkgs/development/tools/richgo/default.nix +++ b/pkgs/development/tools/richgo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "richgo"; diff --git a/pkgs/development/tools/ronn/gemset.nix b/pkgs/development/tools/ronn/gemset.nix index ce804e1f9f5..534741a6993 100644 --- a/pkgs/development/tools/ronn/gemset.nix +++ b/pkgs/development/tools/ronn/gemset.nix @@ -31,4 +31,4 @@ }; version = "0.7.3"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix index 464178a11d6..e5da0ddf59a 100644 --- a/pkgs/development/tools/rtags/default.nix +++ b/pkgs/development/tools/rtags/default.nix @@ -1,9 +1,9 @@ -{ stdenv, lib, fetchgit, cmake, llvmPackages, openssl, apple_sdk, emacs, pkgconfig }: +{ stdenv, lib, fetchgit, cmake, llvmPackages, openssl, apple_sdk, emacs, pkg-config }: stdenv.mkDerivation rec { pname = "rtags"; version = "2.38"; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ llvmPackages.llvm openssl emacs ] ++ lib.optionals stdenv.cc.isGNU [ llvmPackages.clang-unwrapped ] ++ lib.optionals stdenv.isDarwin [ apple_sdk.libs.xpc apple_sdk.frameworks.CoreServices ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { description = "C/C++ client-server indexer based on clang"; homepage = "https://github.com/andersbakken/rtags"; - license = stdenv.lib.licenses.gpl3; - platforms = with stdenv.lib.platforms; x86_64 ++ aarch64; + license = lib.licenses.gpl3; + platforms = with lib.platforms; x86_64 ++ aarch64; }; } diff --git a/pkgs/development/tools/rubocop/Gemfile.lock b/pkgs/development/tools/rubocop/Gemfile.lock index 74ae51427a9..bfa2b7c238a 100644 --- a/pkgs/development/tools/rubocop/Gemfile.lock +++ b/pkgs/development/tools/rubocop/Gemfile.lock @@ -1,14 +1,14 @@ GEM remote: https://rubygems.org/ specs: - ast (2.4.1) + ast (2.4.2) parallel (1.20.1) parser (3.0.0.0) ast (~> 2.4.1) rainbow (3.0.0) regexp_parser (2.0.3) rexml (3.2.4) - rubocop (1.8.0) + rubocop (1.9.0) parallel (~> 1.10) parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) @@ -17,7 +17,7 @@ GEM rubocop-ast (>= 1.2.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.4.0) + rubocop-ast (1.4.1) parser (>= 2.7.1.5) ruby-progressbar (1.11.0) unicode-display_width (2.0.0) diff --git a/pkgs/development/tools/rubocop/gemset.nix b/pkgs/development/tools/rubocop/gemset.nix index e22424c1ae6..3fe8d2cd58a 100644 --- a/pkgs/development/tools/rubocop/gemset.nix +++ b/pkgs/development/tools/rubocop/gemset.nix @@ -4,10 +4,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1l3468czzjmxl93ap40hp7z94yxp4nbag0bxqs789bm30md90m2a"; + sha256 = "04nc8x27hlzlrr5c2gn7mar4vdr0apw5xg22wp6m8dx3wqr04a0y"; type = "gem"; }; - version = "2.4.1"; + version = "2.4.2"; }; parallel = { groups = ["default"]; @@ -66,10 +66,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12arfnsj32126ps6mxbn7dwrw43cy70sq45rm0ib7qfrmhp5qyid"; + sha256 = "1wz0prg4kx36smbk7fib4a8cdxrj5b5b31c8bavm082vgcpfk759"; type = "gem"; }; - version = "1.8.0"; + version = "1.9.0"; }; rubocop-ast = { dependencies = ["parser"]; @@ -77,10 +77,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qvfp567aprjgcwj757p55ynj0dx2b3c3hd76za9z3c43sphprcj"; + sha256 = "0gkf1p8yal38nlvdb39qaiy0gr85fxfr09j5dxh8qvrgpncpnk78"; type = "gem"; }; - version = "1.4.0"; + version = "1.4.1"; }; ruby-progressbar = { groups = ["default"]; @@ -102,4 +102,4 @@ }; version = "2.0.0"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/rufo/gemset.nix b/pkgs/development/tools/rufo/gemset.nix index cd5c2c462a9..1c63c3f3b79 100644 --- a/pkgs/development/tools/rufo/gemset.nix +++ b/pkgs/development/tools/rufo/gemset.nix @@ -9,4 +9,4 @@ }; version = "0.12.0"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/run/default.nix b/pkgs/development/tools/run/default.nix index a0c169d8466..45fb2b8f957 100644 --- a/pkgs/development/tools/run/default.nix +++ b/pkgs/development/tools/run/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "run"; version = "0.7.2"; diff --git a/pkgs/development/tools/rund/default.nix b/pkgs/development/tools/rund/default.nix index 0752f803c3c..186e044318e 100644 --- a/pkgs/development/tools/rund/default.nix +++ b/pkgs/development/tools/rund/default.nix @@ -44,6 +44,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/dragon-lang/rund"; license = lib.licenses.boost; maintainers = with maintainers; [ jonathanmarler ]; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix index 0330edb4804..f379e58ba16 100644 --- a/pkgs/development/tools/rust/bindgen/default.nix +++ b/pkgs/development/tools/rust/bindgen/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, clang, llvmPackages, rustfmt, writeScriptBin, - runtimeShell }: +{ lib, fetchFromGitHub, rustPlatform, clang, llvmPackages, rustfmt, writeScriptBin +, runtimeShell +, bash +}: rustPlatform.buildRustPackage rec { pname = "rust-bindgen"; @@ -16,7 +18,9 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1dv1ywdy701bnc2jv5jq0hnpal1snlizaj9w6k1wxyrp9szjd48w"; - libclang = llvmPackages.libclang.lib; #for substituteAll + #for substituteAll + libclang = llvmPackages.libclang.lib; + inherit bash; buildInputs = [ libclang ]; diff --git a/pkgs/development/tools/rust/bindgen/wrapper.sh b/pkgs/development/tools/rust/bindgen/wrapper.sh index 95cd0901cec..0b3e3cd4c1e 100755 --- a/pkgs/development/tools/rust/bindgen/wrapper.sh +++ b/pkgs/development/tools/rust/bindgen/wrapper.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!@bash@/bin/bash sep='--' # whether to add -- before new options cxx=0 # whether cxx was explicitly requested lastWasx=0 # whether the last argument passed was -x diff --git a/pkgs/development/tools/rust/cargo-asm/default.nix b/pkgs/development/tools/rust/cargo-asm/default.nix index 490fa9e09c3..f453955a5c7 100644 --- a/pkgs/development/tools/rust/cargo-asm/default.nix +++ b/pkgs/development/tools/rust/cargo-asm/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0d797cisiydblh64vqpfdjf37wmxrvs77phdrqh582lbrvnfhx2j"; - buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.isDarwin Security; # Test checks against machine code output, which fails with some # LLVM/compiler versions. diff --git a/pkgs/development/tools/rust/cargo-binutils/Cargo.lock b/pkgs/development/tools/rust/cargo-binutils/Cargo.lock new file mode 100644 index 00000000000..a1e4cdde3b8 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-binutils/Cargo.lock @@ -0,0 +1,419 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +[[package]] +name = "addr2line" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a55f82cfe485775d02112886f4169bde0c5894d75e79ead7eafe7e40a25e45f7" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e" + +[[package]] +name = "aho-corasick" +version = "0.7.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5" +dependencies = [ + "memchr", +] + +[[package]] +name = "ansi_term" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" +dependencies = [ + "winapi", +] + +[[package]] +name = "anyhow" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee67c11feeac938fae061b232e38e0b6d94f97a9df10e6271319325ac4c56a86" + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi", + "libc", + "winapi", +] + +[[package]] +name = "autocfg" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" + +[[package]] +name = "backtrace" +version = "0.3.55" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef5140344c85b01f9bbb4d4b7288a8aa4b3287ccef913a14bcc78a1063623598" +dependencies = [ + "addr2line", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "bitflags" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" + +[[package]] +name = "cargo-binutils" +version = "0.3.3" +dependencies = [ + "anyhow", + "cargo_metadata", + "clap", + "regex", + "rustc-cfg", + "rustc-demangle", + "rustc_version", + "serde", + "toml", +] + +[[package]] +name = "cargo_metadata" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3a567c24b86754d629addc2db89e340ac9398d07b5875efcff837e3878e17ec" +dependencies = [ + "semver 0.10.0", + "serde", + "serde_json", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "clap" +version = "2.33.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" +dependencies = [ + "ansi_term", + "atty", + "bitflags", + "strsim", + "textwrap", + "unicode-width", + "vec_map", +] + +[[package]] +name = "failure" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" +dependencies = [ + "backtrace", + "failure_derive", +] + +[[package]] +name = "failure_derive" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] + +[[package]] +name = "gimli" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce" + +[[package]] +name = "hermit-abi" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8" +dependencies = [ + "libc", +] + +[[package]] +name = "itoa" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" +version = "0.2.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb" + +[[package]] +name = "memchr" +version = "2.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" + +[[package]] +name = "miniz_oxide" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f2d26ec3309788e423cfbf68ad1800f061638098d76a83681af979dc4eda19d" +dependencies = [ + "adler", + "autocfg", +] + +[[package]] +name = "object" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397" + +[[package]] +name = "proc-macro2" +version = "1.0.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" +dependencies = [ + "unicode-xid", +] + +[[package]] +name = "quote" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "regex" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", + "thread_local", +] + +[[package]] +name = "regex-syntax" +version = "0.6.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189" + +[[package]] +name = "rustc-cfg" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ad221fe7cd09334f8735dcc157b1178e343f43dfaefcd1b09d7fd4fc0921b6f" +dependencies = [ + "failure", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232" + +[[package]] +name = "rustc_version" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" +dependencies = [ + "semver 0.9.0", +] + +[[package]] +name = "ryu" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" + +[[package]] +name = "semver" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +dependencies = [ + "semver-parser", +] + +[[package]] +name = "semver" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "394cec28fa623e00903caf7ba4fa6fb9a0e260280bb8cdbbba029611108a0190" +dependencies = [ + "semver-parser", + "serde", +] + +[[package]] +name = "semver-parser" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" + +[[package]] +name = "serde" +version = "1.0.118" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06c64263859d87aa2eb554587e2d23183398d617427327cf2b3d0ed8c69e4800" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.118" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c84d3526699cd55261af4b941e4e725444df67aa4f9e6a3564f18030d12672df" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fceb2595057b6891a4ee808f70054bd2d12f0e97f1cbb78689b59f676df325a" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "strsim" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" + +[[package]] +name = "syn" +version = "1.0.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4211ce9909eb971f111059df92c45640aad50a619cf55cd76476be803c4c68e6" +dependencies = [ + "proc-macro2", + "quote", + "unicode-xid", +] + +[[package]] +name = "synstructure" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "unicode-xid", +] + +[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "thread_local" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "toml" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" +dependencies = [ + "serde", +] + +[[package]] +name = "unicode-width" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" + +[[package]] +name = "unicode-xid" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" + +[[package]] +name = "vec_map" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/pkgs/development/tools/rust/cargo-binutils/default.nix b/pkgs/development/tools/rust/cargo-binutils/default.nix new file mode 100644 index 00000000000..8b40d9b686d --- /dev/null +++ b/pkgs/development/tools/rust/cargo-binutils/default.nix @@ -0,0 +1,29 @@ +{ lib, fetchFromGitHub, rustPlatform, runCommand }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-binutils"; + version = "0.3.3"; + + # Upstream doesn't commit `Cargo.lock`, see https://github.com/rust-embedded/cargo-binutils/pull/99 + src = let + repo = fetchFromGitHub { + owner = "rust-embedded"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-Dgn+f4aSsDSh+RC8yvt3ydkdtwib5jEVsnZkod5c7Vo="; + }; + in runCommand "source" { } '' + cp -R ${repo} $out + chmod -R +w $out + cp ${./Cargo.lock} $out/Cargo.lock + ''; + + cargoSha256 = "sha256-Zrl269PacPi81TrGTIDzmVndgGY5i5lYyspiOj43rpw="; + + meta = with lib; { + description = "Cargo subcommands to invoke the LLVM tools shipped with the Rust toolchain"; + homepage = "https://github.com/rust-embedded/cargo-binutils"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ stupremee ]; + }; +} diff --git a/pkgs/development/tools/rust/cargo-c/default.nix b/pkgs/development/tools/rust/cargo-c/default.nix index ce57194bc49..c468ad0f4e1 100644 --- a/pkgs/development/tools/rust/cargo-c/default.nix +++ b/pkgs/development/tools/rust/cargo-c/default.nix @@ -5,7 +5,7 @@ rustPlatform.buildRustPackage rec { pname = "cargo-c"; - version = "0.7.0"; + version = "0.7.2"; src = stdenv.mkDerivation rec { name = "${pname}-source-${version}"; @@ -14,11 +14,11 @@ rustPlatform.buildRustPackage rec { owner = "lu-zero"; repo = pname; rev = "v${version}"; - sha256 = "0pd1vnpy29fxmf47pvkyxd6bydar8cykfjx0f1bbw3gfk7vychbj"; + sha256 = "1rgwj3kf31n4rz0b7jw67wsgyapdycfic7plm5gm4n9rlslp5ax5"; }; cargoLock = fetchurl { url = "https://github.com/lu-zero/${pname}/releases/download/v${version}/Cargo.lock"; - sha256 = "10xhd5m63r928gfvr4djmis30mra8wdsx55kgin9kiig2kylx69h"; + sha256 = "0jnawnkf4m7cqcq9iahnxa53l61a5riax400n96vxrqf3fa752c6"; }; installPhase = '' @@ -28,11 +28,11 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "1axg0kr8xsb5fm3r8qgc7s3g70pa8g9vc68d6icm7ms77phczx4r"; + cargoSha256 = "0svmhq64aqw1vidq8jmw7w4xhhnyp04vcs9yzhjyz25c4cn9grsf"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation libiconv Security ]; + ++ lib.optionals stdenv.isDarwin [ CoreFoundation libiconv Security ]; meta = with lib; { description = "A cargo subcommand to build and install C-ABI compatibile dynamic and static libraries"; diff --git a/pkgs/development/tools/rust/cargo-cache/default.nix b/pkgs/development/tools/rust/cargo-cache/default.nix index ade568df674..71d4646c1a1 100644 --- a/pkgs/development/tools/rust/cargo-cache/default.nix +++ b/pkgs/development/tools/rust/cargo-cache/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "cargo-cache"; - version = "0.5.1"; + version = "0.6.1"; src = fetchFromGitHub { owner = "matthiaskrgr"; repo = pname; rev = version; - sha256 = "02d593w1x8160p4m3jwm1dyvv383cy7njijlcaw49jczxv5isqbi"; + sha256 = "sha256-qRwyNSAYuAnU17o/5zqKuvixQw7xfA6wNVzN6QRbZlY="; }; - cargoSha256 = "150ifd7gq6csrasqw91z4nsaj6w7kf69j0w6wydr3z7bdahmlgqw"; + cargoSha256 = "sha256-OpqVP097GYiARq7gbsMGFFGkFaQz3qeux12aMJj7W3Y="; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; checkFlagsArray = [ "offline_tests" ]; diff --git a/pkgs/development/tools/rust/cargo-crev/default.nix b/pkgs/development/tools/rust/cargo-crev/default.nix index 29d8dfdead5..e3c16b09ef3 100644 --- a/pkgs/development/tools/rust/cargo-crev/default.nix +++ b/pkgs/development/tools/rust/cargo-crev/default.nix @@ -11,20 +11,20 @@ rustPlatform.buildRustPackage rec { pname = "cargo-crev"; - version = "0.18.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "crev-dev"; repo = "cargo-crev"; rev = "v${version}"; - sha256 = "1ccwa44hpmpd57ff6w02rvrs63wxwmgls2i1rn285rxypmbysrp0"; + sha256 = "sha256-qoN9pTpmXfwaJ37MqAggiPsH4cPr+nsT6NhAUOVclSw="; }; - cargoSha256 = "1sffivpgrn4my57pcrg46b2yg6fmhxj61d2sqvg60fjljrg595zn"; + cargoSha256 = "sha256-mmd9Ds37ST+OuCt506/YbdpOOJBp7WIVZBq+bQ2SR3U="; nativeBuildInputs = [ perl pkg-config ]; - buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security libiconv curl ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv curl ]; meta = with lib; { description = "A cryptographically verifiable code review system for the cargo (Rust) package manager"; diff --git a/pkgs/development/tools/rust/cargo-deny/default.nix b/pkgs/development/tools/rust/cargo-deny/default.nix index 34126a7713f..ba126e57a14 100644 --- a/pkgs/development/tools/rust/cargo-deny/default.nix +++ b/pkgs/development/tools/rust/cargo-deny/default.nix @@ -2,26 +2,28 @@ , lib , rustPlatform , fetchFromGitHub -, perl, pkgconfig, openssl, Security, libiconv, curl +, perl, pkg-config, openssl, Security, libiconv, curl }: rustPlatform.buildRustPackage rec { pname = "cargo-deny"; - version = "0.7.0"; + version = "0.8.5"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = pname; rev = version; - sha256 = "0mfccjcll7dxrhdi2bhfbggmkqdp8cmq5vf8vbb05qzpvlswvkf7"; + sha256 = "01czsnhlvs78fpx1kpi75386657jmlrqpsj4474nxmgcs75igncx"; }; - cargoSha256 = "1gp5m432273mr0zwq1kdswdjgp0kajr0imymqyc4yj9i931by1xv"; + cargoSha256 = "1d5vh6cifkvqxmbgc2z9259q8879fjw016z959hfivv38rragqbr"; - nativeBuildInputs = [ perl pkgconfig ]; + doCheck = false; + + nativeBuildInputs = [ perl pkg-config ]; buildInputs = [ openssl ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Security libiconv curl ]; + ++ lib.optionals stdenv.isDarwin [ Security libiconv curl ]; meta = with lib; { description = "Cargo plugin to generate list of all licenses for a crate"; diff --git a/pkgs/development/tools/rust/cargo-embed/default.nix b/pkgs/development/tools/rust/cargo-embed/default.nix index e4c5d8ab48c..989885e99a7 100644 --- a/pkgs/development/tools/rust/cargo-embed/default.nix +++ b/pkgs/development/tools/rust/cargo-embed/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib +{ lib , rustPlatform, fetchFromGitHub , libusb1, pkg-config, rustfmt }: diff --git a/pkgs/development/tools/rust/cargo-flash/default.nix b/pkgs/development/tools/rust/cargo-flash/default.nix index dbd79f179aa..39b56c2d656 100644 --- a/pkgs/development/tools/rust/cargo-flash/default.nix +++ b/pkgs/development/tools/rust/cargo-flash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib +{ lib , rustPlatform, fetchFromGitHub , libusb1, pkg-config, rustfmt }: diff --git a/pkgs/development/tools/rust/cargo-fund/default.nix b/pkgs/development/tools/rust/cargo-fund/default.nix index 4e30ea48272..70a2e6feca6 100644 --- a/pkgs/development/tools/rust/cargo-fund/default.nix +++ b/pkgs/development/tools/rust/cargo-fund/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security libiconv curl ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv curl ]; meta = with lib; { description = "Discover funding links for your project's dependencies"; diff --git a/pkgs/development/tools/rust/cargo-fuzz/default.nix b/pkgs/development/tools/rust/cargo-fuzz/default.nix index 904ba6efb52..569c8f88da2 100644 --- a/pkgs/development/tools/rust/cargo-fuzz/default.nix +++ b/pkgs/development/tools/rust/cargo-fuzz/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "cargo-fuzz"; diff --git a/pkgs/development/tools/rust/cargo-geiger/default.nix b/pkgs/development/tools/rust/cargo-geiger/default.nix index 1a5273feeca..3b2702c66f6 100644 --- a/pkgs/development/tools/rust/cargo-geiger/default.nix +++ b/pkgs/development/tools/rust/cargo-geiger/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub -, rustPlatform, pkgconfig, openssl +, rustPlatform, pkg-config, openssl # testing packages , cargo-insta # darwin dependencies @@ -24,12 +24,12 @@ rustPlatform.buildRustPackage rec { ''; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; # FIXME: Use impure version of CoreFoundation because of missing symbols. # CFURLSetResourcePropertyForKey is defined in the headers but there's no # corresponding implementation in the sources from opensource.apple.com. - preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.isDarwin '' export NIX_CFLAGS_COMPILE="-F${CoreFoundation}/Library/Frameworks $NIX_CFLAGS_COMPILE" ''; diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/development/tools/rust/cargo-generate/default.nix index 21b986f9a5d..635f36ee834 100644 --- a/pkgs/development/tools/rust/cargo-generate/default.nix +++ b/pkgs/development/tools/rust/cargo-generate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, Security, openssl, pkgconfig, libiconv, curl }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, Security, openssl, pkg-config, libiconv, curl }: rustPlatform.buildRustPackage rec { pname = "cargo-generate"; @@ -13,10 +13,10 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1vngn9gbiv59wrq230qk2mv00bsbdfk2mi1iqpr736c5wj1caqld"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Security libiconv curl ]; + ++ lib.optionals stdenv.isDarwin [ Security libiconv curl ]; preCheck = '' export HOME=$(mktemp -d) USER=nixbld diff --git a/pkgs/development/tools/rust/cargo-inspect/default.nix b/pkgs/development/tools/rust/cargo-inspect/default.nix index 5a8c9150279..9339660388b 100644 --- a/pkgs/development/tools/rust/cargo-inspect/default.nix +++ b/pkgs/development/tools/rust/cargo-inspect/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "026vc8d0jkc1d7dlp3ldmwks7svpvqzl0k5niri8a12cl5w5b9hj"; }; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; cargoSha256 = "1ryi5qi1zz2yljyj4rn84q9zkzafc9w4nw3zc01hlzpnb1sjw5sw"; diff --git a/pkgs/development/tools/rust/cargo-limit/default.nix b/pkgs/development/tools/rust/cargo-limit/default.nix new file mode 100644 index 00000000000..3b28af1097e --- /dev/null +++ b/pkgs/development/tools/rust/cargo-limit/default.nix @@ -0,0 +1,32 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, nix-update-script +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-limit"; + version = "0.0.5"; + + src = fetchFromGitHub { + owner = "alopatindev"; + repo = "cargo-limit"; + rev = version; + sha256 = "sha256-GYdWKRgdS9gCQRu1C8ht0wC1eBTtIMg585OuAfDn/+4="; + }; + + cargoSha256 = "0381wgyb2xnsiick8invrkhcvp905rrfyikgv01w6qn9872z11s0"; + + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + + meta = with lib; { + description = "Cargo subcommand \"limit\": reduces the noise of compiler messages"; + homepage = "https://github.com/alopatindev/cargo-limit"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ otavio ]; + }; +} diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index e10590f5e59..8c2780fae11 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -4,19 +4,19 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.32.9"; + version = "0.32.11"; src = fetchCrate { inherit pname version; - sha256 = "0f6avprq0d65v5fk3kn2kvw3w024f21yq6v8y7d9rbwqxxf87jlf"; + sha256 = "sha256-A61CZwJiXrsrBqTU15fAR1PTEbDsrgN3gwaIPPjQi2M="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; + ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; - cargoSha256 = "0v0657hh8ivqaq4sn0saaiz06shxavhrh9mksjlzj7c2ym6cxkih"; + cargoSha256 = "sha256-GvizO979sVuEogIJHzjsHD8SWNCf2XgCSRTIESRUe7A="; # Some tests fail because they need network access. # However, Travis ensures a proper build. diff --git a/pkgs/development/tools/rust/cargo-raze/default.nix b/pkgs/development/tools/rust/cargo-raze/default.nix index 6f06648a057..11a52e6ea08 100644 --- a/pkgs/development/tools/rust/cargo-raze/default.nix +++ b/pkgs/development/tools/rust/cargo-raze/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, rustPlatform -, pkgconfig, curl, libgit2, openssl, Security }: +, pkg-config, curl, libgit2, openssl, Security }: rustPlatform.buildRustPackage rec { pname = "cargo-raze"; @@ -15,9 +15,9 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1z20xc508a3slc1ii3hy09swvlyib14zwf9akxc0h24d5m48as1c"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ curl libgit2 openssl ] - ++ stdenv.lib.optional stdenv.isDarwin Security; + ++ lib.optional stdenv.isDarwin Security; doCheck = true; diff --git a/pkgs/development/tools/rust/cargo-readme/default.nix b/pkgs/development/tools/rust/cargo-readme/default.nix new file mode 100644 index 00000000000..358c58bef4d --- /dev/null +++ b/pkgs/development/tools/rust/cargo-readme/default.nix @@ -0,0 +1,34 @@ +{ lib, rustPlatform, fetchFromGitHub, fetchpatch }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-readme"; + version = "3.2.0"; + + src = fetchFromGitHub { + owner = "livioribeiro"; + repo = pname; + # Git tag is missing, see upstream issue: + # https://github.com/livioribeiro/cargo-readme/issues/61 + rev = "cf66017c0120ae198210ebaf58a0be6a78372974"; + sha256 = "sha256-/ufHHM13L83M3UYi6mjdhIjgXx7bZgzvR/X02Zsx7Fw="; + }; + + cargoSha256 = "sha256-QVRl6xCvztWi5zAs3PXYR4saTqO5nTBPIjdlMiMXFTM="; + + patches = [ + (fetchpatch { + # Fixup warning thrown at build when running test-suite + # unused return, see upstream PR: + # https://github.com/livioribeiro/cargo-readme/pull/62 + url = "https://github.com/livioribeiro/cargo-readme/commit/060f2daaa2b2cf981bf490dc36bcc6527545ea03.patch"; + sha256 = "sha256-wlAIgTI9OqtA/Jnswoqp7iOj+1zjrUZA7JpHUiF/n+s="; + }) + ]; + + meta = with lib; { + description = "Generate README.md from docstrings"; + homepage = "https://github.com/livioribeiro/cargo-readme"; + license = with licenses; [ mit asl20 ]; + maintainers = with maintainers; [ baloo ]; + }; +} diff --git a/pkgs/development/tools/rust/cargo-sweep/default.nix b/pkgs/development/tools/rust/cargo-sweep/default.nix index 210449a7230..f20bdb9cc17 100644 --- a/pkgs/development/tools/rust/cargo-sweep/default.nix +++ b/pkgs/development/tools/rust/cargo-sweep/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "cargo-sweep"; diff --git a/pkgs/development/tools/rust/cargo-sync-readme/default.nix b/pkgs/development/tools/rust/cargo-sync-readme/default.nix index 45ea6c430d1..54f21ab4627 100644 --- a/pkgs/development/tools/rust/cargo-sync-readme/default.nix +++ b/pkgs/development/tools/rust/cargo-sync-readme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "cargo-sync-readme"; diff --git a/pkgs/development/tools/rust/cargo-udeps/default.nix b/pkgs/development/tools/rust/cargo-udeps/default.nix index df30ec5d360..e38afac76f2 100644 --- a/pkgs/development/tools/rust/cargo-udeps/default.nix +++ b/pkgs/development/tools/rust/cargo-udeps/default.nix @@ -1,22 +1,22 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, pkgconfig, openssl, CoreServices, Security, libiconv }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, CoreServices, Security, libiconv }: rustPlatform.buildRustPackage rec { pname = "cargo-udeps"; - version = "0.1.16"; + version = "0.1.17"; src = fetchFromGitHub { owner = "est31"; repo = pname; rev = "v${version}"; - sha256 = "1h89xq91gbnbagfmvig5lkxyl08qwgdaf9vr55p599pmv190xq8s"; + sha256 = "sha256-qVmp2DTnQjvN5QWchiGa6huM30+o41zLmby45APfxgk="; }; - cargoSha256 = "17931z5nbigfzvvhr6k64s2j9p1sp9nvmy5fyf92j3ci02dplm5c"; + cargoSha256 = "sha256-zuJbs25lyDRTQPJdI0QBzO3xrdH48+cVhLqIkP7nLbE="; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security libiconv ]; + ++ lib.optionals stdenv.isDarwin [ CoreServices Security libiconv ]; # Requires network access doCheck = false; diff --git a/pkgs/development/tools/rust/cargo-valgrind/default.nix b/pkgs/development/tools/rust/cargo-valgrind/default.nix new file mode 100644 index 00000000000..50cffe74848 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-valgrind/default.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, nix-update-script +, makeWrapper +, valgrind +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-valgrind"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "jfrimmel"; + repo = "cargo-valgrind"; + # repo lacks the 1.3.0 tag + # https://github.com/jfrimmel/cargo-valgrind/issues/33 + rev = "d47dd810e3971d676cde5757df8b2e05ed563e41"; + sha256 = "163ch5bpwny1di758rpfib1ddqclxm48j0lmmv741ji3l4nqid32"; + }; + + cargoSha256 = "008s1y3pkn8613kp1gqf494fs93ix0nrwhrkqi5q9bim2mixgccb"; + + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram $out/bin/cargo-valgrind --prefix PATH : ${lib.makeBinPath [ valgrind ]} + ''; + + meta = with lib; { + description = ''Cargo subcommand "valgrind": runs valgrind and collects its output in a helpful manner''; + homepage = "https://github.com/jfrimmel/cargo-valgrind"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ otavio ]; + }; +} diff --git a/pkgs/development/tools/rust/cargo-wipe/default.nix b/pkgs/development/tools/rust/cargo-wipe/default.nix index 7be91e69f9d..c4c079c523b 100644 --- a/pkgs/development/tools/rust/cargo-wipe/default.nix +++ b/pkgs/development/tools/rust/cargo-wipe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , rustPlatform , fetchFromGitHub , nix-update-script @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-wipe"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "mihai-dinculescu"; repo = "cargo-wipe"; rev = "v${version}"; - sha256 = "1kwkifdp98zsinh7xcsz2va252wxbw73xlrv0r7h3m0bn51d52vw"; + sha256 = "sha256-sVekfGHg2wspP5/zJzXTXupspwJr4hQBucY5+8iUjUQ="; }; - cargoSha256 = "15snr1b1pybwcjzwddxybvry3jyllcmrp8dyfm9yiagks3wrcfb4"; + cargoSha256 = "sha256-IzEurJcPoM/JMQlSL7N84wzZddNpynrsjQEOUNms2YQ="; passthru = { updateScript = nix-update-script { diff --git a/pkgs/development/tools/rust/cargo-xbuild/default.nix b/pkgs/development/tools/rust/cargo-xbuild/default.nix index 2e800402c1d..8aa701779bc 100644 --- a/pkgs/development/tools/rust/cargo-xbuild/default.nix +++ b/pkgs/development/tools/rust/cargo-xbuild/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "cargo-xbuild"; diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix index db2a1c4c660..50809055337 100644 --- a/pkgs/development/tools/rust/cbindgen/default.nix +++ b/pkgs/development/tools/rust/cbindgen/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1lzzckzcgj496chbfd6lhwxcangv0krx8m5k2jwffnb9mfgac7hx"; - buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.isDarwin Security; checkFlags = [ # https://github.com/eqrion/cbindgen/issues/338 diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix index 882622bff7b..d40145f163b 100644 --- a/pkgs/development/tools/rust/maturin/default.nix +++ b/pkgs/development/tools/rust/maturin/default.nix @@ -1,26 +1,26 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, dbus, gmp, openssl, pkgconfig +{ lib, stdenv, fetchFromGitHub, rustPlatform, dbus, gmp, openssl, pkg-config , darwin }: let inherit (darwin.apple_sdk.frameworks) Security; in rustPlatform.buildRustPackage rec { name = "maturin-${version}"; - version = "0.8.3"; + version = "0.9.0"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - sha256 = "08l5r7d75id6qzf8xhkjv4hkdr64cq4dbcmdjywmvf9szjbnr65z"; + sha256 = "sha256-X5/1zEVhhdTuyXcUwC3jVv9Gblmv8LT+ftsVo8BnnZs="; }; - cargoSha256 = "1n0sxkhcdg2rbzqd7826pa7sxlnn0c2sc8l6lc98xw21vvqisc8n"; + cargoSha256 = "sha256-PBmuPIpCwC7fr/MKFaeSd/0avoEATlxoeMHisjouAeI="; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gmp openssl ] - ++ stdenv.lib.optional stdenv.isDarwin Security - ++ stdenv.lib.optional stdenv.isLinux dbus; + ++ lib.optional stdenv.isDarwin Security + ++ lib.optional stdenv.isLinux dbus; # Requires network access, fails in sandbox. doCheck = false; diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix index d5482d58457..3ad4b54b47a 100644 --- a/pkgs/development/tools/rust/racer/default.nix +++ b/pkgs/development/tools/rust/racer/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-iUomr9viCdZk4nV75/OP8vHtJpMbmy+pq1IbaA2lLmE="; nativeBuildInputs = [ makeWrapper ]; - buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.isDarwin Security; # a nightly compiler is required unless we use this cheat code. RUSTC_BOOTSTRAP = 1; diff --git a/pkgs/development/tools/rust/racerd/default.nix b/pkgs/development/tools/rust/racerd/default.nix index 19cc3fdf580..33d6721610e 100644 --- a/pkgs/development/tools/rust/racerd/default.nix +++ b/pkgs/development/tools/rust/racerd/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { doCheck = false; nativeBuildInputs = [ makeWrapper ]; - buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.isDarwin Security; RUST_SRC_PATH = rustPlatform.rustcSrc; diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index a031d552253..85cf35b3568 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -2,10 +2,10 @@ { rust-analyzer-unwrapped = callPackage ./generic.nix rec { - rev = "2021-01-04"; + rev = "2021-02-01"; version = "unstable-${rev}"; - sha256 = "sha256-VRnmx5SfmdMIVQjixWBSaMioqFUlo9VOIKsPvC5t3t4="; - cargoSha256 = "sha256-X63FjFpfwjvQayw4X6Sqfyh4FHsc3flE3OtQpzqowjc="; + sha256 = "sha256-bPv51Jp6zJRdNJehuR8LVaBw/hubSeHbI5BeMwqEn4M="; + cargoSha256 = "sha256-5g9wFQ6qlkJgSHLSLS0pad00XT7KflyGAq8/BknF9/M="; }; rust-analyzer = callPackage ./wrapper.nix {} { diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix index dcb435d5140..56097f9b98c 100644 --- a/pkgs/development/tools/rust/rustup/default.nix +++ b/pkgs/development/tools/rust/rustup/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, runCommand, patchelf , fetchFromGitHub, rustPlatform, makeWrapper -, pkgconfig, curl, zlib, Security, CoreServices }: +, pkg-config, curl, zlib, Security, CoreServices }: let libPath = lib.makeLibraryPath [ @@ -21,11 +21,11 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1zkrrg5m0j9rk65g51v2zh404529p9z84qqb7bfyjmgiqlnh48ig"; - nativeBuildInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = [ curl zlib - ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; + ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security ]; cargoBuildFlags = [ "--features no-self-update" ]; diff --git a/pkgs/development/tools/rust/sqlx-cli/default.nix b/pkgs/development/tools/rust/sqlx-cli/default.nix new file mode 100644 index 00000000000..c6f34a9e20d --- /dev/null +++ b/pkgs/development/tools/rust/sqlx-cli/default.nix @@ -0,0 +1,29 @@ +{ lib, rustPlatform, fetchFromGitHub, pkg-config, openssl }: + +rustPlatform.buildRustPackage rec { + pname = "sqlx-cli"; + version = "0.4.2"; + + src = fetchFromGitHub { + owner = "launchbadge"; + repo = "sqlx"; + rev = "v${version}"; + sha256 = "1q6p4qly9qjn333nj72sar6nbyclfdw9i9l6rnimswylj0rr9n27"; + }; + + cargoSha256 = "1393mwx6iccnqrry4ia4prcnnjxhp4zjq1s3gzwzfyzsrqyad54g"; + + doCheck = false; + cargoBuildFlags = [ "-p sqlx-cli" ]; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ]; + + meta = with lib; { + description = + "SQLx's associated command-line utility for managing databases, migrations, and enabling offline mode with sqlx::query!() and friends."; + homepage = "https://github.com/launchbadge/sqlx"; + license = licenses.asl20; + maintainers = with maintainers; [ greizgh ]; + }; +} diff --git a/pkgs/development/tools/rust/svd2rust/default.nix b/pkgs/development/tools/rust/svd2rust/default.nix index 97da8056290..6ec06fffe21 100644 --- a/pkgs/development/tools/rust/svd2rust/default.nix +++ b/pkgs/development/tools/rust/svd2rust/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: with rustPlatform; diff --git a/pkgs/development/tools/sass/gemset.nix b/pkgs/development/tools/sass/gemset.nix index f4fdc899abf..c0c5937b15a 100644 --- a/pkgs/development/tools/sass/gemset.nix +++ b/pkgs/development/tools/sass/gemset.nix @@ -52,4 +52,4 @@ }; version = "4.0.0"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/sauce-connect/default.nix b/pkgs/development/tools/sauce-connect/default.nix index 9560d45d681..12082de9842 100644 --- a/pkgs/development/tools/sauce-connect/default.nix +++ b/pkgs/development/tools/sauce-connect/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ unzip ]; - patchPhase = stdenv.lib.optionalString stdenv.isLinux '' + patchPhase = lib.optionalString stdenv.isLinux '' patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "$out/lib:${makeLibraryPath [zlib]}" \ diff --git a/pkgs/development/tools/scaff/default.nix b/pkgs/development/tools/scaff/default.nix index 97f94e2d61b..2449769e07f 100644 --- a/pkgs/development/tools/scaff/default.nix +++ b/pkgs/development/tools/scaff/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitLab, pkgconfig, openssl }: +{ lib, rustPlatform, fetchFromGitLab, pkg-config, openssl }: rustPlatform.buildRustPackage rec { pname = "scaff"; @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1v6580mj70d7cqbjw32slz65lg6c8ficq5mdkfbivs63hqkv4hgx"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; meta = with lib; { diff --git a/pkgs/development/tools/scry/default.nix b/pkgs/development/tools/scry/default.nix index dcb8087372d..7346ace2ff3 100644 --- a/pkgs/development/tools/scry/default.nix +++ b/pkgs/development/tools/scry/default.nix @@ -1,16 +1,18 @@ -{ lib, fetchFromGitHub, crystal_0_31, coreutils, shards, makeWrapper, which }: +{ lib, fetchFromGitHub, crystal_0_35, coreutils, makeWrapper }: +let + crystal = crystal_0_35; -let crystal = crystal_0_31; - -in crystal.buildCrystalPackage rec { +in +crystal.buildCrystalPackage rec { pname = "scry"; - version = "0.8.1"; + version = "unstable-2020-09-02"; # to make it work with crystal 0.35 src = fetchFromGitHub { owner = "crystal-lang-tools"; repo = pname; - rev = "v${version}"; - sha256 = "0ii4k9l3dgm1c9lllc8ni9dar59lrxik0v9iz7gk3d6v62wwnq79"; + # rev = "v${version}"; + rev = "580a1879810a9f5d63d8a0d90fbdaa99d86b58da"; + sha256 = "sha256-WjpkkHfy38wDj/ejXyyMtd5rLfTRoj/7D+SAhRROnbU="; }; # we are already testing for this, so we can ignore the failures @@ -18,14 +20,12 @@ in crystal.buildCrystalPackage rec { rm spec/scry/executable_spec.cr ''; - format = "crystal"; + format = "shards"; nativeBuildInputs = [ makeWrapper ]; shardsFile = ./shards.nix; - crystalBinaries.scry.src = "src/scry.cr"; - postFixup = '' wrapProgram $out/bin/scry \ --prefix PATH : ${lib.makeBinPath [ crystal coreutils ]} diff --git a/pkgs/development/tools/scry/fix_for_crystal_0_28_and_above.patch b/pkgs/development/tools/scry/fix_for_crystal_0_28_and_above.patch deleted file mode 100644 index 909b790b81a..00000000000 --- a/pkgs/development/tools/scry/fix_for_crystal_0_28_and_above.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/src/scry/completion_provider.cr b/src/scry/completion_provider.cr -index 29e0d36..f67438c 100644 ---- a/src/scry/completion_provider.cr -+++ b/src/scry/completion_provider.cr -@@ -1,4 +1,5 @@ - require "./log" -+require "compiler/crystal/codegen/target" - require "compiler/crystal/crystal_path" - require "./completion/*" - -diff --git a/src/scry/parse_analyzer.cr b/src/scry/parse_analyzer.cr -index d87eca4..bbe9ed5 100644 ---- a/src/scry/parse_analyzer.cr -+++ b/src/scry/parse_analyzer.cr -@@ -1,4 +1,5 @@ - require "compiler/crystal/syntax" -+require "compiler/crystal/codegen/target" - require "compiler/crystal/crystal_path" - require "./workspace" - require "./text_document" diff --git a/pkgs/development/tools/scss-lint/gemset.nix b/pkgs/development/tools/scss-lint/gemset.nix index 46747f04939..027522e58f8 100644 --- a/pkgs/development/tools/scss-lint/gemset.nix +++ b/pkgs/development/tools/scss-lint/gemset.nix @@ -59,4 +59,4 @@ }; version = "0.57.1"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index 5f01b98e8d1..d777d788aec 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -5,7 +5,7 @@ }: let - upstream-info = (stdenv.lib.importJSON ../../../../applications/networking/browsers/chromium/upstream-info.json).stable.chromedriver; + upstream-info = (lib.importJSON ../../../../applications/networking/browsers/chromium/upstream-info.json).stable.chromedriver; allSpecs = { x86_64-linux = { system = "linux64"; @@ -21,7 +21,7 @@ let spec = allSpecs.${stdenv.hostPlatform.system} or (throw "missing chromedriver binary for ${stdenv.hostPlatform.system}"); - libs = stdenv.lib.makeLibraryPath [ + libs = lib.makeLibraryPath [ stdenv.cc.cc.lib cairo fontconfig freetype gdk-pixbuf glib gtk2 gconf @@ -44,7 +44,7 @@ in stdenv.mkDerivation rec { installPhase = '' install -m755 -D chromedriver $out/bin/chromedriver - '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.isDarwin) '' patchelf --set-interpreter ${glibc.out}/lib/ld-linux-x86-64.so.2 $out/bin/chromedriver wrapProgram "$out/bin/chromedriver" --prefix LD_LIBRARY_PATH : "${libs}:\$LD_LIBRARY_PATH" ''; diff --git a/pkgs/development/tools/selenium/htmlunit-driver/default.nix b/pkgs/development/tools/selenium/htmlunit-driver/default.nix index 400cf24012a..be3048cca25 100644 --- a/pkgs/development/tools/selenium/htmlunit-driver/default.nix +++ b/pkgs/development/tools/selenium/htmlunit-driver/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "htmlunit-driver-standalone"; diff --git a/pkgs/development/tools/selenium/selendroid/default.nix b/pkgs/development/tools/selenium/selendroid/default.nix index bf9eabec53c..c25190cab74 100644 --- a/pkgs/development/tools/selenium/selendroid/default.nix +++ b/pkgs/development/tools/selenium/selendroid/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, makeWrapper, jdk, selenium-server-standalone }: +{ lib, stdenv, fetchurl, makeWrapper, jdk, selenium-server-standalone }: -with stdenv.lib; +with lib; let name = "selendroid-standalone-${version}"; pluginName = "selendroid-grid-plugin-${version}"; diff --git a/pkgs/development/tools/selenium/server/default.nix b/pkgs/development/tools/selenium/server/default.nix index a6d60e33ee3..10893a9d170 100644 --- a/pkgs/development/tools/selenium/server/default.nix +++ b/pkgs/development/tools/selenium/server/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, makeWrapper, jre +{ lib, stdenv, fetchurl, makeWrapper, jre , htmlunit-driver, chromedriver, chromeSupport ? true }: -with stdenv.lib; +with lib; let minorVersion = "3.141"; diff --git a/pkgs/development/tools/setupcfg2nix/info.nix b/pkgs/development/tools/setupcfg2nix/info.nix index 6b65632bf7d..17e888fee41 100644 --- a/pkgs/development/tools/setupcfg2nix/info.nix +++ b/pkgs/development/tools/setupcfg2nix/info.nix @@ -1,7 +1,7 @@ { - pname = ''setupcfg2nix''; - version = ''2.0.1''; + pname = "setupcfg2nix"; + version = "2.0.1"; install_requires = [ - ''setuptools'' + "setuptools" ]; } diff --git a/pkgs/development/tools/shadered/default.nix b/pkgs/development/tools/shadered/default.nix new file mode 100644 index 00000000000..01c16b13946 --- /dev/null +++ b/pkgs/development/tools/shadered/default.nix @@ -0,0 +1,45 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, sfml +, glm +, python3 +, glew +, pkg-config +, SDL2 }: + +stdenv.mkDerivation rec { + pname = "SHADERed"; + version = "1.4.1"; + + src = fetchFromGitHub { + owner = "dfranx"; + repo = pname; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "ivOd4NJgx5KWSDnXSBQLMrdvBuOm8NRzcb2S4lvOrms="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + SDL2 + glew + glm + python3 + sfml + ]; + + NIX_CFLAGS_COMPILE = "-Wno-error=format-security"; + + meta = with lib; { + description = "Lightweight, cross-platform & full-featured shader IDE"; + homepage = "https://github.com/dfranx/SHADERed"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ Scriptkiddi ]; + }; +} diff --git a/pkgs/development/tools/sigrok-cli/default.nix b/pkgs/development/tools/sigrok-cli/default.nix index 79b4a6acdf6..b4173c7aebb 100644 --- a/pkgs/development/tools/sigrok-cli/default.nix +++ b/pkgs/development/tools/sigrok-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, glib, libsigrok, libsigrokdecode }: +{ lib, stdenv, fetchurl, pkg-config, glib, libsigrok, libsigrokdecode }: stdenv.mkDerivation rec { name = "sigrok-cli-0.7.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "15vpn1psriadcbl6v9swwgws7dva85ld03yv6g1mgm27kx11697m"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib libsigrok libsigrokdecode ]; meta = with lib; { diff --git a/pkgs/development/tools/simavr/default.nix b/pkgs/development/tools/simavr/default.nix index 5fd99f14074..1d47b325101 100644 --- a/pkgs/development/tools/simavr/default.nix +++ b/pkgs/development/tools/simavr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libelf, which, pkgconfig, freeglut +{ lib, stdenv, fetchFromGitHub, libelf, which, pkg-config, freeglut , avrgcc, avrlibc , libGLU, libGL , GLUT }: @@ -24,9 +24,9 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-truncation" ]; - nativeBuildInputs = [ which pkgconfig avrgcc ]; + nativeBuildInputs = [ which pkg-config avrgcc ]; buildInputs = [ libelf freeglut libGLU libGL ] - ++ stdenv.lib.optional stdenv.isDarwin GLUT; + ++ lib.optional stdenv.isDarwin GLUT; # Hack to avoid TMPDIR in RPATHs. preFixup = ''rm -rf "$(pwd)" && mkdir "$(pwd)" ''; diff --git a/pkgs/development/tools/slimerjs/default.nix b/pkgs/development/tools/slimerjs/default.nix index 49eea7213bd..76728c5f2d8 100644 --- a/pkgs/development/tools/slimerjs/default.nix +++ b/pkgs/development/tools/slimerjs/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, zip, unzip, firefox, bash}: +{lib, stdenv, fetchFromGitHub, zip, unzip, firefox, bash}: let s = # Generated upstream information rec { @@ -42,9 +42,9 @@ stdenv.mkDerivation { ''; meta = { inherit (s) version; - description = ''Gecko-based programmatically-driven browser''; - license = stdenv.lib.licenses.mpl20 ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + description = "Gecko-based programmatically-driven browser"; + license = lib.licenses.mpl20 ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/tools/so/default.nix b/pkgs/development/tools/so/default.nix index 08481169dcd..99f9cdcd936 100644 --- a/pkgs/development/tools/so/default.nix +++ b/pkgs/development/tools/so/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1ddbhy1plag4ckbmlyj47wnky7vgmfa68msl3hl25h1lwmzaf1aq"; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/pkgs/development/tools/sourcetrail/default.nix b/pkgs/development/tools/sourcetrail/default.nix index d1e26662f0c..46f097e5b60 100644 --- a/pkgs/development/tools/sourcetrail/default.nix +++ b/pkgs/development/tools/sourcetrail/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { desktop-file-utils imagemagick javaIndexer # the resulting jar file is copied by our install script - ] ++ stdenv.lib.optionals doCheck testBinPath; + ] ++ lib.optionals doCheck testBinPath; buildInputs = [ boost pythonIndexer shared-mime-info ] ++ (with qt5; [ qtbase qtsvg ]) @@ -86,9 +86,9 @@ stdenv.mkDerivation rec { ]; postPatch = let - major = stdenv.lib.versions.major version; - minor = stdenv.lib.versions.minor version; - patch = stdenv.lib.versions.patch version; + major = lib.versions.major version; + minor = lib.versions.minor version; + patch = lib.versions.patch version; in '' # Upstream script obtains it's version from git: # https://github.com/CoatiSoftware/Sourcetrail/blob/master/cmake/version.cmake @@ -176,7 +176,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin makeQtWrapper $out/opt/sourcetrail/bin/sourcetrail $out/bin/sourcetrail \ - --prefix PATH : ${stdenv.lib.makeBinPath binPath} + --prefix PATH : ${lib.makeBinPath binPath} ''; checkPhase = '' @@ -188,7 +188,7 @@ stdenv.mkDerivation rec { # shorten PATH to prevent build failures wrapQtApp ./Sourcetrail_test \ --set PATH "" \ - --prefix PATH : ${stdenv.lib.makeBinPath testBinPath} \ + --prefix PATH : ${lib.makeBinPath testBinPath} \ --set MAVEN_OPTS "-Dmaven.repo.local=$TMPDIR/m2repo" ./Sourcetrail_test popd diff --git a/pkgs/development/tools/sourcetrail/jedi.nix b/pkgs/development/tools/sourcetrail/jedi.nix index fa25604f9fc..2e1ca55dad3 100644 --- a/pkgs/development/tools/sourcetrail/jedi.nix +++ b/pkgs/development/tools/sourcetrail/jedi.nix @@ -1,6 +1,6 @@ # Taken from a past commit of nixpkgs -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, glibcLocales, tox, pytestcov, parso }: +{ lib, buildPythonPackage, fetchPypi, pytest, glibcLocales, tox, pytestcov, parso }: buildPythonPackage rec { pname = "jedi"; diff --git a/pkgs/development/tools/sqlint/gemset.nix b/pkgs/development/tools/sqlint/gemset.nix index a86277363fb..aeffdccffa1 100644 --- a/pkgs/development/tools/sqlint/gemset.nix +++ b/pkgs/development/tools/sqlint/gemset.nix @@ -20,4 +20,4 @@ }; version = "0.1.10"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/sqsh/default.nix b/pkgs/development/tools/sqsh/default.nix index 6b408592a0d..9c56efcb59f 100644 --- a/pkgs/development/tools/sqsh/default.nix +++ b/pkgs/development/tools/sqsh/default.nix @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { substituteInPlace src/cmd_connect.c \ --replace CS_TDS_80 CS_TDS_73 - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' substituteInPlace configure --replace "libct.so" "libct.dylib" ''; diff --git a/pkgs/development/tools/stagit/default.nix b/pkgs/development/tools/stagit/default.nix index 1cabcfe044f..f74698bb11e 100644 --- a/pkgs/development/tools/stagit/default.nix +++ b/pkgs/development/tools/stagit/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "stagit"; - version = "0.9.1"; + version = "0.9.4"; src = fetchgit { url = "git://git.codemadness.org/stagit"; rev = version; - sha256 = "0gh28spkry9wbmdj0hmvz3680fvbyzab9cifhj1p76f4fz27rnv9"; + sha256 = "1n0f2pf4gmqnkx4kfn2c79zx2vk4xkg03h7wvdigijkkbhs7a3pm"; }; makeFlags = [ "PREFIX=$(out)" ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "git static site generator"; - homepage = "https://git.codemadness.org/stagit/"; + homepage = "https://git.codemadness.org/stagit/file/README.html"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ jb55 ]; diff --git a/pkgs/development/tools/summon/default.nix b/pkgs/development/tools/summon/default.nix index e01c60e3a89..5c811aaf239 100644 --- a/pkgs/development/tools/summon/default.nix +++ b/pkgs/development/tools/summon/default.nix @@ -1,6 +1,6 @@ -{ stdenv, buildGoModule, fetchFromGitHub, lib, patchResolver ? true }: +{ buildGoModule, fetchFromGitHub, lib, patchResolver ? true }: -with stdenv.lib; +with lib; buildGoModule rec { pname = "summon"; diff --git a/pkgs/development/tools/sumneko-lua-language-server/default.nix b/pkgs/development/tools/sumneko-lua-language-server/default.nix index 05281f1bb83..d63493ba7a1 100644 --- a/pkgs/development/tools/sumneko-lua-language-server/default.nix +++ b/pkgs/development/tools/sumneko-lua-language-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ninja, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, ninja, makeWrapper }: stdenv.mkDerivation rec { pname = "sumneko-lua-language-server"; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { --metapath='~/.cache/sumneko_lua/meta'" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Lua Language Server coded by Lua "; homepage = "https://github.com/sumneko/lua-language-server"; license = licenses.mit; diff --git a/pkgs/development/tools/sunxi-tools/default.nix b/pkgs/development/tools/sunxi-tools/default.nix index 009172d7725..ae9c7c83392 100644 --- a/pkgs/development/tools/sunxi-tools/default.nix +++ b/pkgs/development/tools/sunxi-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, libusb1, zlib }: +{ lib, stdenv, fetchFromGitHub, pkg-config, libusb1, zlib }: stdenv.mkDerivation { name = "sunxi-tools-20181113"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "1yhl6jfl2cws596ymkyhm8h9qkcvp67v8hlh081lsaqv1i8j9yig"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 zlib ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/development/tools/swiftformat/default.nix b/pkgs/development/tools/swiftformat/default.nix index cb3ed5217f0..823496693f2 100644 --- a/pkgs/development/tools/swiftformat/default.nix +++ b/pkgs/development/tools/swiftformat/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "swiftformat"; - version = "0.44.9"; + version = "0.47.10"; src = fetchFromGitHub { owner = "nicklockwood"; repo = "SwiftFormat"; rev = version; - sha256 = "0zajvbaf3r02k53lv5zdxf13apc6chnjmj69zkyac48lpnpbcxq6"; + sha256 = "1gqxpymbhpmap0i2blg9akarlql4mkzv45l4i212gsxcs991b939"; }; preConfigure = "LD=$CC"; diff --git a/pkgs/development/tools/systemfd/default.nix b/pkgs/development/tools/systemfd/default.nix index c25f0491c67..a1c93f46dcb 100644 --- a/pkgs/development/tools/systemfd/default.nix +++ b/pkgs/development/tools/systemfd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchgit, darwin, buildPlatform +{ lib, fetchgit, darwin, buildPlatform , buildRustCrate, buildRustCrateHelpers, defaultCrateOverrides }: ((import ./Cargo.nix { diff --git a/pkgs/development/tools/textql/default.nix b/pkgs/development/tools/textql/default.nix index 7dc899c4fc4..7b80192a75e 100644 --- a/pkgs/development/tools/textql/default.nix +++ b/pkgs/development/tools/textql/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, sqlite }: +{ lib, buildGoPackage, fetchFromGitHub, sqlite }: buildGoPackage rec { pname = "textql"; diff --git a/pkgs/development/tools/the-way/default.nix b/pkgs/development/tools/the-way/default.nix index 7eec364c47b..1e88cfcdcc1 100644 --- a/pkgs/development/tools/the-way/default.nix +++ b/pkgs/development/tools/the-way/default.nix @@ -13,10 +13,10 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ AppKit Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ AppKit Security ]; cargoSha256 = "1aiyfsvmrqcmlw0z1944i9s5g3yxc39na5mf16pb9a4bhw8zcwjr"; - checkFlagsArray = stdenv.lib.optionals stdenv.isDarwin [ "--skip=copy" ]; + checkFlagsArray = lib.optionals stdenv.isDarwin [ "--skip=copy" ]; cargoParallelTestThreads = false; postInstall = '' diff --git a/pkgs/development/tools/tracy/default.nix b/pkgs/development/tools/tracy/default.nix index 927b792b6ba..23d7f29dff1 100644 --- a/pkgs/development/tools/tracy/default.nix +++ b/pkgs/development/tools/tracy/default.nix @@ -1,17 +1,17 @@ -{ stdenv, lib, darwin, fetchFromGitHub, tbb, gtk3, glfw, pkgconfig, freetype, Carbon, AppKit, capstone }: +{ stdenv, lib, darwin, fetchFromGitHub, tbb, gtk3, glfw, pkg-config, freetype, Carbon, AppKit, capstone }: stdenv.mkDerivation rec { pname = "tracy"; - version = "0.7.4"; + version = "0.7.5"; src = fetchFromGitHub { owner = "wolfpld"; repo = "tracy"; rev = "v${version}"; - sha256 = "0s39kimpc03x48kh7lyhblfs8y4mdzcz3g7f806h90x7zndsmfxj"; + sha256 = "0qfb30k6a8vi8vn65vv927wd9nynwwvc9crbmi7a55kp20hzg06r"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glfw capstone ] ++ lib.optionals stdenv.isDarwin [ Carbon AppKit freetype ] diff --git a/pkgs/development/tools/trellis/default.nix b/pkgs/development/tools/trellis/default.nix index 003e3cec9ce..6ce1ad9a38a 100644 --- a/pkgs/development/tools/trellis/default.nix +++ b/pkgs/development/tools/trellis/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "2021.01.02"; # git describe --tags - realVersion = with stdenv.lib; with builtins; + realVersion = with lib; with builtins; "1.0-482-g${substring 0 7 (elemAt srcs 0).rev}"; srcs = [ @@ -54,8 +54,8 @@ stdenv.mkDerivation rec { open Verilog to bitstream toolchain for these devices. ''; homepage = "https://github.com/SymbiFlow/prjtrellis"; - license = stdenv.lib.licenses.isc; + license = lib.licenses.isc; maintainers = with maintainers; [ q3k thoughtpolice emily ]; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/tools/tychus/default.nix b/pkgs/development/tools/tychus/default.nix index edd428480a0..8b330b36ea9 100644 --- a/pkgs/development/tools/tychus/default.nix +++ b/pkgs/development/tools/tychus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoPackage, CoreFoundation }: +{ lib, stdenv, fetchFromGitHub, buildGoPackage, CoreFoundation }: buildGoPackage rec { pname = "tychus"; @@ -15,13 +15,13 @@ buildGoPackage rec { sha256 = "02ybxjsfga89gpg0k21zmykhhnpx1vy3ny8fcwj0qsg73i11alvw"; }; - buildInputs = stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation ]; buildFlags = [ "--tags" "release" ]; meta = { description = "Command line utility to live-reload your application"; homepage = "https://github.com/devlocker/tychus"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; } diff --git a/pkgs/development/tools/tychus/deps.nix b/pkgs/development/tools/tychus/deps.nix index 194aa96ae3c..e8897efffc9 100644 --- a/pkgs/development/tools/tychus/deps.nix +++ b/pkgs/development/tools/tychus/deps.nix @@ -27,4 +27,4 @@ sha256 = "13mhx4i913jil32j295m3a36jzvq1y64xig0naadiz7q9ja011r2"; }; } -] \ No newline at end of file +] diff --git a/pkgs/development/tools/uftrace/default.nix b/pkgs/development/tools/uftrace/default.nix index 2fbf7366538..03ee7228901 100644 --- a/pkgs/development/tools/uftrace/default.nix +++ b/pkgs/development/tools/uftrace/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub}: +{lib, stdenv, fetchFromGitHub}: stdenv.mkDerivation rec { pname = "uftrace"; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { meta = { description = "Function (graph) tracer for user-space"; homepage = "https://github.com/namhyung/uftrace"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [stdenv.lib.maintainers.nthorne]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = [lib.maintainers.nthorne]; }; } diff --git a/pkgs/development/tools/unity3d/default.nix b/pkgs/development/tools/unity3d/default.nix index 9441a3217b7..5c41a1dac93 100644 --- a/pkgs/development/tools/unity3d/default.nix +++ b/pkgs/development/tools/unity3d/default.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation { version = "${ver}x${build}"; src = fetchurl { - url = "https://beta.unity3d.com/download/6e9a27477296/LinuxEditorInstaller/Unity.tar.xz"; + url = "https://beta.unity3d.com/download/6e9a27477296/LinuxEditorInstaller/Unity.tar.xz"; sha1 = "083imikkrgha5w9sihjvv1m74naxm5yv"; }; diff --git a/pkgs/development/tools/unityhub/default.nix b/pkgs/development/tools/unityhub/default.nix index baa89a33ad9..dc2f8022117 100644 --- a/pkgs/development/tools/unityhub/default.nix +++ b/pkgs/development/tools/unityhub/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, appimageTools, gsettings-desktop-schemas, gtk3 }: +{ lib, fetchurl, appimageTools, gsettings-desktop-schemas, gtk3 }: let version = "2.3.2"; @@ -13,7 +13,7 @@ in appimageTools.wrapType2 rec { libX11 libXcursor libXdamage libXfixes libXrender libXi libXcomposite libXext libXrandr libXtst libSM libICE libxcb - libselinux pciutils libpulseaudio libxml2 + libselinux pciutils libpulseaudio libxml2 icu clang ]); profile = '' diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index b3f1bf1a5b8..701b973ad4f 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -34,7 +34,7 @@ let for gem in "$out"/lib/ruby/gems/*/gems/*; do cp -a "$gem/" "$gem.new" rm "$gem" - # needed on macOS, otherwise the mv yields permission denied + # needed on macOS, otherwise the mv yields permission denied chmod +w "$gem.new" mv "$gem.new" "$gem" done diff --git a/pkgs/development/tools/vagrant/gemset.nix b/pkgs/development/tools/vagrant/gemset.nix index 169c3533efc..e617e1a5872 100644 --- a/pkgs/development/tools/vagrant/gemset.nix +++ b/pkgs/development/tools/vagrant/gemset.nix @@ -363,4 +363,4 @@ }; version = "1.3.5"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/vagrant/gemset_libvirt.nix b/pkgs/development/tools/vagrant/gemset_libvirt.nix index df6b6c40496..f50f4438f50 100644 --- a/pkgs/development/tools/vagrant/gemset_libvirt.nix +++ b/pkgs/development/tools/vagrant/gemset_libvirt.nix @@ -156,4 +156,4 @@ }; version = "0.2.1"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/vala-lint/default.nix b/pkgs/development/tools/vala-lint/default.nix index 73ab21716b7..a45ced8a492 100644 --- a/pkgs/development/tools/vala-lint/default.nix +++ b/pkgs/development/tools/vala-lint/default.nix @@ -4,7 +4,7 @@ , meson , ninja , pantheon -, pkgconfig +, pkg-config , vala , gettext , wrapGAppsHook @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { gettext meson ninja - pkgconfig + pkg-config vala wrapGAppsHook ]; diff --git a/pkgs/development/tools/vcstool/default.nix b/pkgs/development/tools/vcstool/default.nix index 95ebfcf64b4..f37b17057e5 100644 --- a/pkgs/development/tools/vcstool/default.nix +++ b/pkgs/development/tools/vcstool/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages +{ lib, python3Packages , git, breezy, subversion }: with python3Packages; @@ -14,7 +14,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ pyyaml setuptools ]; - makeWrapperArgs = ["--prefix" "PATH" ":" (stdenv.lib.makeBinPath [ git breezy subversion ])]; + makeWrapperArgs = ["--prefix" "PATH" ":" (lib.makeBinPath [ git breezy subversion ])]; doCheck = false; # requires network diff --git a/pkgs/development/tools/vend/default.nix b/pkgs/development/tools/vend/default.nix index cfadf694320..0b037a9068c 100644 --- a/pkgs/development/tools/vend/default.nix +++ b/pkgs/development/tools/vend/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "vend"; diff --git a/pkgs/development/tools/vogl/default.nix b/pkgs/development/tools/vogl/default.nix index 5c3b2abe4a4..315a896929d 100644 --- a/pkgs/development/tools/vogl/default.nix +++ b/pkgs/development/tools/vogl/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchFromGitHub -, cmake, git, pkgconfig, wget, zip +, cmake, git, pkg-config, wget, zip , qtbase, qtx11extras , libdwarf, libjpeg_turbo, libunwind, lzma, tinyxml, libX11 , SDL2, SDL2_gfx, SDL2_image, SDL2_ttf @@ -26,7 +26,7 @@ mkDerivation { }) ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ git wget zip diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix index 48e3b39b955..fdf66004deb 100644 --- a/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -8,7 +8,7 @@ , vulkan-headers , vulkan-loader , glslang -, pkgconfig +, pkg-config , xlibsWrapper , libxcb , libXrandr @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config cmake python3 ]; diff --git a/pkgs/development/tools/vultr-cli/default.nix b/pkgs/development/tools/vultr-cli/default.nix index 23dda32b723..505023f3fdd 100644 --- a/pkgs/development/tools/vultr-cli/default.nix +++ b/pkgs/development/tools/vultr-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "vultr-cli"; diff --git a/pkgs/development/tools/vultr/default.nix b/pkgs/development/tools/vultr/default.nix index 7c396f69f25..1f101882b5b 100644 --- a/pkgs/development/tools/vultr/default.nix +++ b/pkgs/development/tools/vultr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "vultr"; @@ -15,7 +15,7 @@ buildGoPackage rec { meta = { description = "A command line tool for Vultr services, a provider for cloud virtual private servers"; homepage = "https://github.com/JamesClonk/vultr"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.zauberpony ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.zauberpony ]; }; } diff --git a/pkgs/development/tools/wasm-bindgen-cli/default.nix b/pkgs/development/tools/wasm-bindgen-cli/default.nix index 5794f5cc335..0024c43e05d 100644 --- a/pkgs/development/tools/wasm-bindgen-cli/default.nix +++ b/pkgs/development/tools/wasm-bindgen-cli/default.nix @@ -1,4 +1,4 @@ -{ rustPlatform, fetchFromGitHub, lib, openssl, pkgconfig, stdenv, curl, Security +{ rustPlatform, fetchFromGitHub, lib, openssl, pkg-config, stdenv, curl, Security , runCommand }: @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { ''; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security curl ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; cargoSha256 = "1wrfly7c3an1mjqm7v13mlvx57hwlcxfjijkimicck04q6qdhbp6"; cargoBuildFlags = [ "-p" pname ]; diff --git a/pkgs/development/tools/wasm-pack/default.nix b/pkgs/development/tools/wasm-pack/default.nix index c5e5190feb3..94ee6d3a1ba 100644 --- a/pkgs/development/tools/wasm-pack/default.nix +++ b/pkgs/development/tools/wasm-pack/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchFromGitHub , rustPlatform -, pkgconfig +, pkg-config , libressl , curl , Security @@ -20,14 +20,14 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0fw04hgxxqsbp1pylp32yd087r9bb8bpa05v90qdshkgp6znfl9s"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ # LibreSSL works around segfault issues caused by OpenSSL being unable to # gracefully exit while doing work. # See: https://github.com/rustwasm/wasm-pack/issues/650 libressl - ] ++ stdenv.lib.optionals stdenv.isDarwin [ curl Security ]; + ] ++ lib.optionals stdenv.isDarwin [ curl Security ]; # Most tests rely on external resources and build artifacts. # Disabling check here to work with build sandboxing. diff --git a/pkgs/development/tools/watchman/default.nix b/pkgs/development/tools/watchman/default.nix index 63f2b0e4933..2acbf13e278 100644 --- a/pkgs/development/tools/watchman/default.nix +++ b/pkgs/development/tools/watchman/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, config, fetchFromGitHub, autoconf, automake, pcre -, libtool, pkgconfig, openssl +, libtool, pkg-config, openssl , confFile ? config.watchman.confFile or null , withApple ? stdenv.isDarwin, CoreServices }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "0fdaj5pmicm6j17d5q7px800m5rmam1a400x3hv1iiifnmhgnkal"; }; - nativeBuildInputs = [ autoconf automake pkgconfig libtool ]; + nativeBuildInputs = [ autoconf automake pkg-config libtool ]; buildInputs = [ pcre openssl ] ++ lib.optionals withApple [ CoreServices ]; diff --git a/pkgs/development/tools/wiggle/default.nix b/pkgs/development/tools/wiggle/default.nix index b89d36273f8..e861f20a919 100644 --- a/pkgs/development/tools/wiggle/default.nix +++ b/pkgs/development/tools/wiggle/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, groff }: +{ lib, stdenv, fetchurl, ncurses, groff }: stdenv.mkDerivation { @@ -37,8 +37,8 @@ stdenv.mkDerivation { already been applied, and will ignore them. ''; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/tools/winpdb/default.nix b/pkgs/development/tools/winpdb/default.nix index 4730ff676d1..b5e0701c136 100644 --- a/pkgs/development/tools/winpdb/default.nix +++ b/pkgs/development/tools/winpdb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pythonPackages, makeDesktopItem }: +{ lib, fetchurl, pythonPackages, makeDesktopItem }: pythonPackages.buildPythonApplication rec { name = "winpdb-1.4.8"; @@ -36,6 +36,9 @@ pythonPackages.buildPythonApplication rec { cp artwork/winpdb-icon.svg "$out"/share/icons/winpdb.svg ''; + # no tests + doCheck = false; + meta = with lib; { description = "Platform independent Python debugger"; longDescription = '' diff --git a/pkgs/development/tools/wllvm/default.nix b/pkgs/development/tools/wllvm/default.nix index a3702f2e3e6..85dbc4f731a 100644 --- a/pkgs/development/tools/wllvm/default.nix +++ b/pkgs/development/tools/wllvm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages }: +{ lib, python3Packages }: python3Packages.buildPythonApplication rec { version = "1.2.8"; diff --git a/pkgs/development/tools/wrangler/default.nix b/pkgs/development/tools/wrangler/default.nix index 04690552894..c7b1c0329f3 100644 --- a/pkgs/development/tools/wrangler/default.nix +++ b/pkgs/development/tools/wrangler/default.nix @@ -2,21 +2,21 @@ rustPlatform.buildRustPackage rec { pname = "wrangler"; - version = "1.12.3"; + version = "1.13.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = pname; rev = "v${version}"; - sha256 = "1h9020yf5jsbilzn94h7qyxw9qnz3vw43g8a2415wvjqq6ihzfvm"; + sha256 = "0xhldarzb71x4k7ydk4yd6g0qv6y2l0mn2lc43hvl9jm29pnz95q"; }; - cargoSha256 = "12azc41y2yx936ax9b1yylc0gy91k0m7ih6p0bkw7m928f762hpx"; + cargoSha256 = "0w845virvw7mvibc76ar2hbffhfzj2v8v1xkrsssrgzyaryb48jk"; - nativeBuildInputs = [ perl ] ++ stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; + nativeBuildInputs = [ perl ] ++ lib.optionals stdenv.isLinux [ pkg-config ]; - buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ] - ++ stdenv.lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.isLinux [ openssl ] + ++ lib.optionals stdenv.isDarwin [ curl darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.CoreServices diff --git a/pkgs/development/tools/ws/default.nix b/pkgs/development/tools/ws/default.nix index 3026289fec1..bef8eb906cf 100644 --- a/pkgs/development/tools/ws/default.nix +++ b/pkgs/development/tools/ws/default.nix @@ -1,5 +1,5 @@ # This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -{ lib, stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "ws"; diff --git a/pkgs/development/tools/xcbuild/default.nix b/pkgs/development/tools/xcbuild/default.nix index abc48b41446..1f38e49daee 100644 --- a/pkgs/development/tools/xcbuild/default.nix +++ b/pkgs/development/tools/xcbuild/default.nix @@ -36,11 +36,11 @@ in stdenv.mkDerivation { cp -r --no-preserve=all ${linenoise} ThirdParty/linenoise ''; - postPatch = stdenv.lib.optionalString (!stdenv.isDarwin) '' + postPatch = lib.optionalString (!stdenv.isDarwin) '' # Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror. sed 1i'#include <sys/sysmacros.h>' \ -i Libraries/xcassets/Headers/xcassets/Slot/SystemVersion.h - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' # Apple Open Sourced LZFSE, but not libcompression, and it isn't # part of an impure framework we can add substituteInPlace Libraries/libcar/Sources/Rendition.cpp \ @@ -59,7 +59,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ cmake ninja ]; buildInputs = [ zlib libxml2 libpng ] - ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices CoreGraphics ImageIO ]; + ++ lib.optionals stdenv.isDarwin [ CoreServices CoreGraphics ImageIO ]; meta = with lib; { description = "Xcode-compatible build tool"; diff --git a/pkgs/development/tools/xcpretty/gemset.nix b/pkgs/development/tools/xcpretty/gemset.nix index 30c68a93c13..ef5591c30cf 100644 --- a/pkgs/development/tools/xcpretty/gemset.nix +++ b/pkgs/development/tools/xcpretty/gemset.nix @@ -16,4 +16,4 @@ }; version = "0.3.0"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/yaml2json/default.nix b/pkgs/development/tools/yaml2json/default.nix index d707caaec5a..77f884b82b6 100644 --- a/pkgs/development/tools/yaml2json/default.nix +++ b/pkgs/development/tools/yaml2json/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage { diff --git a/pkgs/development/tools/ydiff/default.nix b/pkgs/development/tools/ydiff/default.nix deleted file mode 100644 index 510808fc412..00000000000 --- a/pkgs/development/tools/ydiff/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenv, lib, pythonPackages, python3Packages, less, patchutils, git -, subversion, coreutils, which }: - -with pythonPackages; - -buildPythonApplication rec { - pname = "ydiff"; - version = "1.2"; - - src = fetchPypi { - inherit pname version; - sha256 = "f5430577ecd30974d766ee9b8333e06dc76a947b4aae36d39612a0787865a121"; - }; - - patchPhase = '' - substituteInPlace tests/test_ydiff.py \ - --replace /bin/rm ${coreutils}/bin/rm \ - --replace /bin/sh ${stdenv.shell} - substituteInPlace Makefile \ - --replace "pep8 --ignore" "# pep8 --ignore" \ - --replace "python3 \`which coverage\`" "${python3Packages.coverage}/bin/coverage3" \ - --replace /bin/sh ${stdenv.shell} \ - --replace tests/regression.sh "${stdenv.shell} tests/regression.sh" - patchShebangs tests/*.sh - ''; - - buildInputs = [ docutils pygments ]; - propagatedBuildInputs = [ less patchutils ]; - checkInputs = [ coverage coreutils git subversion which ]; - - checkTarget = if isPy3k then "test3" else "test"; - - meta = { - homepage = "https://github.com/ymattw/ydiff"; - description = "View colored, incremental diff in workspace or from stdin"; - longDescription = '' - Term based tool to view colored, incremental diff in a version - controlled workspace (supports Git, Mercurial, Perforce and Svn - so far) or from stdin, with side by side (similar to diff -y) - and auto pager support. - ''; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ leenaars ]; - }; -} diff --git a/pkgs/development/tools/yj/default.nix b/pkgs/development/tools/yj/default.nix index 3244d7a0c84..303f325dec1 100644 --- a/pkgs/development/tools/yj/default.nix +++ b/pkgs/development/tools/yj/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "yj"; @@ -16,7 +16,7 @@ buildGoModule rec { buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version}" ]; meta = with lib; { - description = ''Convert YAML <=> TOML <=> JSON <=> HCL''; + description = "Convert YAML <=> TOML <=> JSON <=> HCL"; license = licenses.asl20; maintainers = with maintainers; [ Profpatsch ]; homepage = "https://github.com/sclevine/yj"; diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index 479494e515d..878661e74ce 100644 --- a/pkgs/development/tools/yq-go/default.nix +++ b/pkgs/development/tools/yq-go/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yq-go"; - version = "3.4.1"; + version = "4.4.1"; src = fetchFromGitHub { owner = "mikefarah"; - rev = version; + rev = "v${version}"; repo = "yq"; - sha256 = "09kcqa15assjhp3kdffa3yhc2vykinzgscjzg996qa85kjircy9b"; + sha256 = "sha256-U1nMSwWKzPvyvxUx8J50AMB251ET4s9xcSrjGGjkYus="; }; - vendorSha256 = "0l5bhbp8dfq04hb4xcpx96ksfwx4xvk0pj5ma00rk3z913ikygcd"; + vendorSha256 = "sha256-CUELy6ajaoVzomY5lMen24DFJke3IyFzqWYyF7sws5g="; doCheck = false; @@ -19,7 +19,7 @@ buildGoModule rec { postInstall = '' for shell in bash fish zsh; do - $out/bin/yq shell-completion --variation $shell > yq.$shell + $out/bin/yq shell-completion $shell > yq.$shell installShellCompletion yq.$shell done ''; diff --git a/pkgs/development/tools/yuicompressor/default.nix b/pkgs/development/tools/yuicompressor/default.nix index 549cc5046c4..05c1b62477b 100644 --- a/pkgs/development/tools/yuicompressor/default.nix +++ b/pkgs/development/tools/yuicompressor/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "yuicompressor"; version = "2.4.8"; - + src = fetchurl { url = "https://github.com/yui/yuicompressor/releases/download/v${version}/${pname}-${version}.jar"; sha256 = "1qjxlak9hbl9zd3dl5ks0w4zx5z64wjsbk7ic73r1r45fasisdrh"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { makeWrapper ${jre}/bin/java $out/bin/yuicompressor --add-flags \ "-cp $out/lib/yuicompressor.jar com.yahoo.platform.yui.compressor.YUICompressor" ''; - + meta = with lib; { description = "A JavaScript and CSS minifier"; homepage = "http://yui.github.io/yuicompressor/"; diff --git a/pkgs/development/web/cog/default.nix b/pkgs/development/web/cog/default.nix new file mode 100644 index 00000000000..a3639e559f1 --- /dev/null +++ b/pkgs/development/web/cog/default.nix @@ -0,0 +1,70 @@ +{ stdenv +, lib +, fetchpatch +, fetchFromGitHub +, cmake +, pkg-config +, wayland +, wayland-protocols +, libwpe +, libwpe-fdo +, glib +, glib-networking +, webkitgtk +, makeWrapper +, wrapGAppsHook +, gnome3 +, gdk-pixbuf +}: + +stdenv.mkDerivation rec { + pname = "cog"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "igalia"; + repo = "cog"; + rev = "v${version}"; + sha256 = "sha256-E6rACj25rdV5dww91PzYEX1r2A9YLNgAVyiYceP1KI8="; + }; + + buildInputs = [ + wayland-protocols + wayland + libwpe + libwpe-fdo + webkitgtk + glib-networking + gdk-pixbuf + gnome3.adwaita-icon-theme + ]; + + nativeBuildInputs = [ + cmake + pkg-config + wayland + makeWrapper + wrapGAppsHook + ]; + + depsBuildsBuild = [ + pkg-config + ]; + + cmakeFlags = [ + "-DCOG_USE_WEBKITGTK=ON" + ]; + + # not ideal, see https://github.com/WebPlatformForEmbedded/libwpe/issues/59 + preFixup = '' + wrapProgram $out/bin/cog \ + --prefix LD_LIBRARY_PATH : ${libwpe-fdo}/lib + ''; + + meta = with lib; { + description = "A small single “window” launcher for the WebKit WPE port"; + license = licenses.mit; + maintainers = [ maintainers.matthewbauer ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index b669d34739e..013b365bce8 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { # Install completions post-install nativeBuildInputs = [ installShellFiles ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security CoreServices ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security CoreServices ]; # The rusty_v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem # To avoid this we pre-download the file and place it in the locations it will require it in advance diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 63d60547bec..d6c56b0193c 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.154"; + version = "0.0.163"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "0hf33jm0ph4a79jg9irz0ynvdyah942cm5hb6j04hmg24x1037jm"; + sha256 = "sha256-cotv0EQKnrUgpBF7ibOHm8gKg6zXS2i19PTi29PajWc="; }; preBuild = '' @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "." ]; - vendorSha256 = "0fmbwk0j2aayvi3cx8cfp4b3h89v88qm4kslbmhlj8mny9rd7lys"; + vendorSha256 = "sha256-KLqfP5XxR/ObnWZK4qACr0XRpCpa6CW7GLhV34i3CNY="; doCheck = false; diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix index 0668c5107b4..944520b47e2 100644 --- a/pkgs/development/web/grails/default.nix +++ b/pkgs/development/web/grails/default.nix @@ -6,8 +6,8 @@ }: let - binpath = stdenv.lib.makeBinPath - ([ coreutils ncurses gnused gnugrep ] ++ stdenv.lib.optional (jdk != null) jdk); + binpath = lib.makeBinPath + ([ coreutils ncurses gnused gnugrep ] ++ lib.optional (jdk != null) jdk); in stdenv.mkDerivation rec { pname = "grails"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { rm -f "$out"/bin/*.bat # Improve purity sed -i -e '2iPATH=${binpath}:\$PATH' "$out"/bin/grails - '' + stdenv.lib.optionalString (jdk != null) '' + '' + lib.optionalString (jdk != null) '' # Inject JDK path into grails sed -i -e '2iJAVA_HOME=${jdk.home}' "$out"/bin/grails ''; diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix index 3311253e202..b3a9ac0ce71 100644 --- a/pkgs/development/web/insomnia/default.nix +++ b/pkgs/development/web/insomnia/default.nix @@ -6,7 +6,7 @@ , libudev0-shim, glibc, curl, openssl, autoPatchelfHook }: let - runtimeLibs = stdenv.lib.makeLibraryPath [ + runtimeLibs = lib.makeLibraryPath [ curl glibc libudev0-shim diff --git a/pkgs/development/web/kcgi/default.nix b/pkgs/development/web/kcgi/default.nix index 152094b4498..95765be46fd 100644 --- a/pkgs/development/web/kcgi/default.nix +++ b/pkgs/development/web/kcgi/default.nix @@ -1,9 +1,9 @@ -{ lib, stdenv, pkgconfig, fetchFromGitHub, libbsd }: +{ lib, stdenv, pkg-config, fetchFromGitHub, libbsd }: stdenv.mkDerivation rec { pname = "kcgi"; version = "0.10.8"; - underscoreVersion = stdenv.lib.replaceChars ["."] ["_"] version; + underscoreVersion = lib.replaceChars ["."] ["_"] version; src = fetchFromGitHub { owner = "kristapsdz"; @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { patchPhase = ''substituteInPlace configure \ --replace /usr/local / ''; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ] ++ stdenv.lib.optionals stdenv.isLinux [ libbsd ] ; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ ] ++ lib.optionals stdenv.isLinux [ libbsd ] ; dontAddPrefix = true; diff --git a/pkgs/development/web/kore/default.nix b/pkgs/development/web/kore/default.nix index d3efdc53ca4..bc8113fc6a1 100644 --- a/pkgs/development/web/kore/default.nix +++ b/pkgs/development/web/kore/default.nix @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { ''; # added to fix build w/gcc7 and clang5 - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-error=pointer-compare" - + stdenv.lib.optionalString stdenv.cc.isClang " -Wno-error=unknown-warning-option"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=pointer-compare" + + lib.optionalString stdenv.cc.isClang " -Wno-error=unknown-warning-option"; enableParallelBuilding = true; diff --git a/pkgs/development/web/mailcatcher/gemset.nix b/pkgs/development/web/mailcatcher/gemset.nix index 7603e8ff2ef..96d07e2dfce 100644 --- a/pkgs/development/web/mailcatcher/gemset.nix +++ b/pkgs/development/web/mailcatcher/gemset.nix @@ -125,4 +125,4 @@ }; version = "2.0.9"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/web/newman/node-composition.nix b/pkgs/development/web/newman/node-composition.nix index 17879f381d5..0769168a78f 100644 --- a/pkgs/development/web/newman/node-composition.nix +++ b/pkgs/development/web/newman/node-composition.nix @@ -6,7 +6,7 @@ let nodeEnv = import ./node-env.nix { - inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile; + inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile; inherit nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; @@ -14,4 +14,4 @@ in import ./node-packages.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} \ No newline at end of file +} diff --git a/pkgs/development/web/newman/node-env.nix b/pkgs/development/web/newman/node-env.nix index 04e3ee097fa..262df27e464 100644 --- a/pkgs/development/web/newman/node-env.nix +++ b/pkgs/development/web/newman/node-env.nix @@ -1,6 +1,6 @@ # This file originates from node2nix -{stdenv, nodejs, python2, util-linux, libtool, runCommand, writeTextFile}: +{lib, stdenv, nodejs, python2, util-linux, libtool, runCommand, writeTextFile}: let python = if nodejs ? python then nodejs.python else python2; @@ -38,8 +38,8 @@ let }; includeDependencies = {dependencies}: - stdenv.lib.optionalString (dependencies != []) - (stdenv.lib.concatMapStrings (dependency: + lib.optionalString (dependencies != []) + (lib.concatMapStrings (dependency: '' # Bundle the dependencies of the package mkdir -p node_modules @@ -100,7 +100,7 @@ let cd "$DIR/${packageName}" ${includeDependencies { inherit dependencies; }} cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} ''; pinpointDependencies = {dependencies, production}: @@ -161,12 +161,12 @@ let '' node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"} - ${stdenv.lib.optionalString (dependencies != []) + ${lib.optionalString (dependencies != []) '' if [ -d node_modules ] then cd node_modules - ${stdenv.lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} + ${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} cd .. fi ''} @@ -183,7 +183,7 @@ let cd "${packageName}" ${pinpointDependencies { inherit dependencies production; }} cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} fi ''; @@ -344,8 +344,8 @@ let cd "${packageName}" runHook preRebuild - ${stdenv.lib.optionalString bypassCache '' - ${stdenv.lib.optionalString reconstructLock '' + ${lib.optionalString bypassCache '' + ${lib.optionalString reconstructLock '' if [ -f package-lock.json ] then echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!" @@ -361,14 +361,14 @@ let node ${addIntegrityFieldsScript} ''} - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild if [ "''${dontNpmInstall-}" != "1" ] then # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. rm -f npm-shrinkwrap.json - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} install fi ''; @@ -396,8 +396,8 @@ let stdenv.mkDerivation ({ name = "node_${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] - ++ stdenv.lib.optional (stdenv.isLinux) util-linux - ++ stdenv.lib.optional (stdenv.isDarwin) libtool + ++ lib.optional (stdenv.isLinux) util-linux + ++ lib.optional (stdenv.isDarwin) libtool ++ buildInputs; inherit nodejs; @@ -470,8 +470,8 @@ let name = "node-dependencies-${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] - ++ stdenv.lib.optional (stdenv.isLinux) util-linux - ++ stdenv.lib.optional (stdenv.isDarwin) libtool + ++ lib.optional (stdenv.isLinux) util-linux + ++ lib.optional (stdenv.isDarwin) libtool ++ buildInputs; inherit dontStrip; # Stripping may fail a build for some package deployments @@ -491,7 +491,7 @@ let # Create fake package.json to make the npm commands work properly cp ${src}/package.json . chmod 644 package.json - ${stdenv.lib.optionalString bypassCache '' + ${lib.optionalString bypassCache '' if [ -f ${src}/package-lock.json ] then cp ${src}/package-lock.json . @@ -500,13 +500,13 @@ let # Go to the parent folder to make sure that all packages are pinpointed cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} # Expose the executables that were installed cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} mv ${packageName} lib ln -s $out/lib/node_modules/.bin $out/bin @@ -516,7 +516,7 @@ let stdenv.mkDerivation { name = "node-shell-${name}-${version}"; - buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) util-linux ++ buildInputs; + buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) util-linux ++ buildInputs; buildCommand = '' mkdir -p $out/bin cat > $out/bin/shell <<EOF @@ -529,14 +529,14 @@ let # Provide the dependencies in a development shell through the NODE_PATH environment variable inherit nodeDependencies; - shellHook = stdenv.lib.optionalString (dependencies != []) '' + shellHook = lib.optionalString (dependencies != []) '' export NODE_PATH=${nodeDependencies}/lib/node_modules export PATH="${nodeDependencies}/bin:$PATH" ''; }; in { - buildNodeSourceDist = stdenv.lib.makeOverridable buildNodeSourceDist; - buildNodePackage = stdenv.lib.makeOverridable buildNodePackage; - buildNodeShell = stdenv.lib.makeOverridable buildNodeShell; + buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist; + buildNodePackage = lib.makeOverridable buildNodePackage; + buildNodeShell = lib.makeOverridable buildNodeShell; } diff --git a/pkgs/development/web/newman/node-packages.nix b/pkgs/development/web/newman/node-packages.nix index a7c29ca49c7..680be3d499c 100644 --- a/pkgs/development/web/newman/node-packages.nix +++ b/pkgs/development/web/newman/node-packages.nix @@ -5727,4 +5727,4 @@ in bypassCache = true; reconstructLock = true; }; -} \ No newline at end of file +} diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index 4358d6134e8..68232088fa9 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, openssl, python, zlib, libuv, util-linux, http-parser -, pkgconfig, which +{ lib, stdenv, fetchurl, openssl, python, zlib, libuv, util-linux, http-parser +, pkg-config, which # Updater dependencies , writeScript, coreutils, gnugrep, jq, curl, common-updater-scripts, nix, runtimeShell , gnupg @@ -7,7 +7,7 @@ , procps, icu }: -with stdenv.lib; +with lib; { enableNpm ? true, version, sha256, patches ? [] } @args: @@ -28,7 +28,7 @@ let "--shared-${name}-libpath=${getLib sharedLibDeps.${name}}/lib" /** Closure notes: we explicitly avoid specifying --shared-*-includes, * as that would put the paths into bin/nodejs. - * Including pkgconfig in build inputs would also have the same effect! + * Including pkg-config in build inputs would also have the same effect! */ ]) (builtins.attrNames sharedLibDeps) ++ [ "--with-intl=system-icu" @@ -55,23 +55,22 @@ in buildInputs = optionals stdenv.isDarwin [ CoreServices ApplicationServices ] ++ [ zlib libuv openssl http-parser icu ]; - nativeBuildInputs = [ which util-linux pkgconfig python ] + nativeBuildInputs = [ which util-linux pkg-config python ] ++ optionals stdenv.isDarwin [ xcbuild ]; configureFlags = let isCross = stdenv.hostPlatform != stdenv.buildPlatform; - host = stdenv.hostPlatform.platform; - isAarch32 = stdenv.hostPlatform.isAarch32; + inherit (stdenv.hostPlatform) gcc isArch32; in sharedConfigureFlags ++ [ "--without-dtrace" ] ++ (optionals isCross [ "--cross-compiling" "--without-intl" "--without-snapshot" - ]) ++ (optionals (isCross && isAarch32 && hasAttr "fpu" host.gcc) [ - "--with-arm-fpu=${host.gcc.fpu}" - ]) ++ (optionals (isCross && isAarch32 && hasAttr "float-abi" host.gcc) [ - "--with-arm-float-abi=${host.gcc.float-abi}" + ]) ++ (optionals (isCross && isAarch32 && hasAttr "fpu" gcc) [ + "--with-arm-fpu=${gcc.fpu}" + ]) ++ (optionals (isCross && isAarch32 && hasAttr "float-abi" gcc) [ + "--with-arm-float-abi=${gcc.float-abi}" ]) ++ (optionals (isCross && isAarch32) [ "--dest-cpu=arm" ]) ++ extraConfigFlags; @@ -133,7 +132,7 @@ in passthru.updateScript = import ./update.nix { inherit writeScript coreutils gnugrep jq curl common-updater-scripts gnupg nix runtimeShell; - inherit (stdenv) lib; + inherit lib; inherit majorVersion; }; diff --git a/pkgs/development/web/nodejs/v10.nix b/pkgs/development/web/nodejs/v10.nix index fa383e8f0c3..cef9cd92877 100644 --- a/pkgs/development/web/nodejs/v10.nix +++ b/pkgs/development/web/nodejs/v10.nix @@ -1,4 +1,4 @@ -{ callPackage, openssl, icu, python2, stdenv, enableNpm ? true }: +{ callPackage, openssl, icu, python2, lib, stdenv, enableNpm ? true }: let buildNodejs = callPackage ./nodejs.nix { @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "10.23.1"; - sha256 = "1ypddif8jc8qrw9n1f8zbpknjcbnjc9xhpm57hc5nqbrmzsidal8"; - patches = stdenv.lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; + version = "10.23.2"; + sha256 = "1iyvs56x5zvvqmpr6kkamgpfj70n2rj1fh7afc7q8hj3bq7f1985"; + patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix index ab082612c9d..7afa3bfb6b5 100644 --- a/pkgs/development/web/nodejs/v12.nix +++ b/pkgs/development/web/nodejs/v12.nix @@ -1,4 +1,4 @@ -{ callPackage, openssl, icu, python2, stdenv, enableNpm ? true }: +{ callPackage, openssl, icu, python2, lib, stdenv, enableNpm ? true }: let buildNodejs = callPackage ./nodejs.nix { @@ -10,5 +10,5 @@ in inherit enableNpm; version = "12.20.1"; sha256 = "0lqq6a2byw4qmig98j45gqnl0593xdhx1dr9k7x2nnvhblrfw3p0"; - patches = stdenv.lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; + patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix index 64439688c16..410be6a2495 100644 --- a/pkgs/development/web/nodejs/v14.nix +++ b/pkgs/development/web/nodejs/v14.nix @@ -1,4 +1,4 @@ -{ callPackage, openssl, python3, stdenv, enableNpm ? true }: +{ callPackage, openssl, python3, lib, stdenv, enableNpm ? true }: let buildNodejs = callPackage ./nodejs.nix { @@ -10,5 +10,5 @@ in inherit enableNpm; version = "14.15.4"; sha256 = "177cxp4fhmglyx035j8smiy1bp5fz6q2phlcl0a2mdbldkvfrdxd"; - patches = stdenv.lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; + patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } diff --git a/pkgs/development/web/nodejs/v15.nix b/pkgs/development/web/nodejs/v15.nix index 8687336c138..a13fdc1a9e2 100644 --- a/pkgs/development/web/nodejs/v15.nix +++ b/pkgs/development/web/nodejs/v15.nix @@ -8,6 +8,6 @@ let in buildNodejs { inherit enableNpm; - version = "15.5.1"; - sha256 = "0qbb4dwgsy1a82ihjxl6r8bj7mwjzb21s720y1rahisd5p69l8ic"; + version = "15.7.0"; + sha256 = "1nnv5337p23mhp0s2zgv75yysgfai0px8h1kks2mc8w0xnmwwppg"; } diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix index 5ff4f7efb91..02376c0bfe7 100644 --- a/pkgs/development/web/postman/default.nix +++ b/pkgs/development/web/postman/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "postman"; - version = "7.36.0"; + version = "7.36.1"; src = fetchurl { url = "https://dl.pstmn.io/download/version/${version}/linux64"; - sha256 = "1wdbwlli9lzxxcwbc94fybfq6ipzvsv0waqcr1mjqzlfjqaqgrsb"; + sha256 = "sha256-6brThKTAQI3cu3SSqvEIT1nwlQ/jPTP+d/Q/m/Ez5nQ="; name = "${pname}.tar.gz"; }; @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { 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 + patchelf --set-rpath "${lib.makeLibraryPath buildInputs}:$ORIGIN" $file done popd ''; diff --git a/pkgs/development/web/remarkjs/default.nix b/pkgs/development/web/remarkjs/default.nix index d9cc433fd84..e3dea600b43 100644 --- a/pkgs/development/web/remarkjs/default.nix +++ b/pkgs/development/web/remarkjs/default.nix @@ -10,7 +10,7 @@ let rev = "10b9500b67983f0a9c42d8ce8bf8e8c469f7078c"; sha256 = "1yy8by15kfklw8lwh17z1swpj067q0skjjih12yawbryraig41m0"; }; - + nodePackages = import ./nodepkgs.nix { inherit pkgs; inherit (stdenv.hostPlatform) system; @@ -63,8 +63,8 @@ in stdenv.mkDerivation rec { homepage = "https://remarkjs.com"; description = "A simple, in-browser, markdown-driven slideshow tool"; maintainers = []; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.mit; + platforms = lib.platforms.linux; + license = lib.licenses.mit; broken = true; }; } diff --git a/pkgs/development/web/remarkjs/node-packages.nix b/pkgs/development/web/remarkjs/node-packages.nix index 4964056055e..e8da4a59657 100644 --- a/pkgs/development/web/remarkjs/node-packages.nix +++ b/pkgs/development/web/remarkjs/node-packages.nix @@ -3871,7 +3871,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Static analysis tool for JavaScript"; - homepage = "http://jshint.com/"; + homepage = "https://jshint.com/"; license = "(MIT AND JSON)"; }; production = true; diff --git a/pkgs/development/web/remarkjs/nodepkgs.nix b/pkgs/development/web/remarkjs/nodepkgs.nix index be260edb643..e21d6a0308b 100644 --- a/pkgs/development/web/remarkjs/nodepkgs.nix +++ b/pkgs/development/web/remarkjs/nodepkgs.nix @@ -6,7 +6,7 @@ let nodeEnv = import ../../node-packages/node-env.nix { - inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile; + inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile; inherit nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; @@ -14,4 +14,4 @@ in import ./node-packages.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} \ No newline at end of file +} diff --git a/pkgs/development/web/shopify-themekit/default.nix b/pkgs/development/web/shopify-themekit/default.nix index 60a3d330ab8..bf0a8c6d816 100644 --- a/pkgs/development/web/shopify-themekit/default.nix +++ b/pkgs/development/web/shopify-themekit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "shopify-themekit"; diff --git a/pkgs/development/web/twitter-bootstrap/default.nix b/pkgs/development/web/twitter-bootstrap/default.nix index 14fd9a219ec..ca211ccf2d9 100644 --- a/pkgs/development/web/twitter-bootstrap/default.nix +++ b/pkgs/development/web/twitter-bootstrap/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { pname = "bootstrap"; - version = "4.5.3"; + version = "4.6.0"; src = fetchurl { url = "https://github.com/twbs/bootstrap/releases/download/v${version}/${pname}-${version}-dist.zip"; - sha256 = "0w87b0vbwsdb4ag359y5pppxjvqnxk1949mszzn8ay2i5h47mjq6"; + sha256 = "sha256-CiEUUa0mCrUSp+XCoWNs8plJxhWHZZD+K+UBJSDu1CM="; }; buildInputs = [ unzip ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "Front-end framework for faster and easier web development"; homepage = "https://getbootstrap.com/"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; } diff --git a/pkgs/development/web/valum/default.nix b/pkgs/development/web/valum/default.nix index 59db90741d3..847943d83bc 100644 --- a/pkgs/development/web/valum/default.nix +++ b/pkgs/development/web/valum/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, meson, ninja, pkgconfig, fetchFromGitHub, glib, vala, ctpl +{ lib, stdenv, meson, ninja, pkg-config, fetchFromGitHub, glib, vala, ctpl , libgee, libsoup, fcgi }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "15lnk91gykm60rv31x3r1swp2bhzl3gwp12mf39smzi4bmf7h38f"; }; - nativeBuildInputs = [ meson ninja pkgconfig ]; + nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ glib vala ctpl libgee libsoup fcgi ]; meta = with lib; { diff --git a/pkgs/development/web/wml/default.nix b/pkgs/development/web/wml/default.nix index 2b882ccc841..a6ffe6e84e3 100644 --- a/pkgs/development/web/wml/default.nix +++ b/pkgs/development/web/wml/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perlPackages, ncurses, lynx, makeWrapper }: +{ lib, fetchurl, perlPackages, ncurses, lynx, makeWrapper }: perlPackages.buildPerlPackage { pname = "wml"; diff --git a/pkgs/development/web/woff2/default.nix b/pkgs/development/web/woff2/default.nix index fd296d37f87..2f186344498 100644 --- a/pkgs/development/web/woff2/default.nix +++ b/pkgs/development/web/woff2/default.nix @@ -1,4 +1,4 @@ -{ brotli, cmake, pkgconfig, fetchFromGitHub, lib, stdenv +{ brotli, cmake, pkg-config, fetchFromGitHub, lib, stdenv , static ? stdenv.hostPlatform.isStatic }: @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "lib" ]; # Need to explicitly link to brotlicommon - patches = stdenv.lib.optional static ./brotli-static.patch; + patches = lib.optional static ./brotli-static.patch; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; cmakeFlags = [ "-DCANONICAL_PREFIXES=ON" "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" - ] ++ stdenv.lib.optional static "-DCMAKE_SKIP_RPATH:BOOL=TRUE"; + ] ++ lib.optional static "-DCMAKE_SKIP_RPATH:BOOL=TRUE"; propagatedBuildInputs = [ brotli ]; diff --git a/pkgs/development/web/xmlindent/default.nix b/pkgs/development/web/xmlindent/default.nix index b093a8008da..f6df21d5766 100644 --- a/pkgs/development/web/xmlindent/default.nix +++ b/pkgs/development/web/xmlindent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, flex }: +{ lib, stdenv, fetchurl, flex }: stdenv.mkDerivation rec { pname = "xmlindent"; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { meta = { description = "XML stream reformatter"; homepage = "http://xmlindent.sourceforge.net/"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; maintainers = [ ]; }; } diff --git a/pkgs/games/0ad/default.nix b/pkgs/games/0ad/default.nix index d53942766bb..860db7c6d5a 100644 --- a/pkgs/games/0ad/default.nix +++ b/pkgs/games/0ad/default.nix @@ -1,14 +1,14 @@ -{ wxGTK, newScope }: - +{ wxGTK, stdenv, newScope }: let callPackage = newScope self; self = { - zeroad-unwrapped = callPackage ./game.nix { inherit wxGTK; }; + zeroad-unwrapped = callPackage ./game.nix { inherit wxGTK stdenv; }; - zeroad-data = callPackage ./data.nix { }; + zeroad-data = callPackage ./data.nix { inherit stdenv; }; zeroad = callPackage ./wrapper.nix { }; }; -in self +in +self diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix index 558c69c14d6..1ba975aa885 100644 --- a/pkgs/games/0ad/game.nix +++ b/pkgs/games/0ad/game.nix @@ -1,5 +1,5 @@ { stdenv, lib, perl, fetchurl, python2 -, pkgconfig, spidermonkey_38, boost, icu, libxml2, libpng, libsodium +, pkg-config, spidermonkey_38, boost, icu, libxml2, libpng, libsodium , libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc , openal, libGLU, libGL, xorgproto, libX11, libXcursor, nspr, SDL2 , gloox, nvidia-texture-tools @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "0draa53xg69i5qhqym85658m45xhwkbiimaldj4sr3703rjgggq1"; }; - nativeBuildInputs = [ python2 perl pkgconfig ]; + nativeBuildInputs = [ python2 perl pkg-config ]; buildInputs = [ spidermonkey_38 boost icu libxml2 libpng libjpeg @@ -47,10 +47,10 @@ stdenv.mkDerivation rec { # Delete shipped libraries which we don't need. rm -rf libraries/source/{enet,miniupnpc,nvtt,spidermonkey} - # Workaround invalid pkgconfig name for mozjs - mkdir pkgconfig - ln -s ${spidermonkey_38}/lib/pkgconfig/* pkgconfig/mozjs-38.pc - PKG_CONFIG_PATH="$PWD/pkgconfig:$PKG_CONFIG_PATH" + # Workaround invalid pkg-config name for mozjs + mkdir pkg-config + ln -s ${spidermonkey_38}/lib/pkgconfig/* pkg-config/mozjs-38.pc + PKG_CONFIG_PATH="$PWD/pkg-config:$PKG_CONFIG_PATH" # Update Makefiles pushd build/workspaces diff --git a/pkgs/games/20kly/default.nix b/pkgs/games/20kly/default.nix index e8778d7bebc..092e0e4eac2 100644 --- a/pkgs/games/20kly/default.nix +++ b/pkgs/games/20kly/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchurl , python }: diff --git a/pkgs/games/abbaye-des-morts/default.nix b/pkgs/games/abbaye-des-morts/default.nix index 5e536d2b18d..3091c8feff2 100644 --- a/pkgs/games/abbaye-des-morts/default.nix +++ b/pkgs/games/abbaye-des-morts/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" "DESTDIR=" ]; - preBuild = stdenv.lib.optionalString stdenv.cc.isClang + preBuild = lib.optionalString stdenv.cc.isClang '' substituteInPlace Makefile \ --replace -fpredictive-commoning "" diff --git a/pkgs/games/adom/default.nix b/pkgs/games/adom/default.nix index c5ffe950983..dc4f1f47f7b 100644 --- a/pkgs/games/adom/default.nix +++ b/pkgs/games/adom/default.nix @@ -5,7 +5,7 @@ let inherit (xorg) libXext libX11; - lpath = "${stdenv.cc.cc.lib}/lib64:" + stdenv.lib.makeLibraryPath [ + lpath = "${stdenv.cc.cc.lib}/lib64:" + lib.makeLibraryPath [ zlib libmad libpng12 libcaca libXext libX11 libGLU libGL alsaLib libpulseaudio]; in diff --git a/pkgs/games/alephone/default.nix b/pkgs/games/alephone/default.nix index 7691001edac..efd26d1c4f0 100644 --- a/pkgs/games/alephone/default.nix +++ b/pkgs/games/alephone/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, boost, curl, ffmpeg, icoutils, libGLU, libmad, libogg -, libpng, libsndfile, libvorbis, lua, pkgconfig, SDL2, SDL2_image, SDL2_net +, libpng, libsndfile, libvorbis, lua, pkg-config, SDL2, SDL2_image, SDL2_net , SDL2_ttf, smpeg, speex, zziplib, zlib, makeWrapper, makeDesktopItem, unzip , alephone }: @@ -15,7 +15,7 @@ let sha256 = "13ck3mp9qd5pkiq6zwvr744bwvmnqkgj5vpf325sz1mcvnv7l8lh"; }; - nativeBuildInputs = [ pkgconfig icoutils ]; + nativeBuildInputs = [ pkg-config icoutils ]; buildInputs = [ boost @@ -93,7 +93,7 @@ in self // { ''; meta = alephone.meta // { - license = stdenv.lib.licenses.free; + license = lib.licenses.free; hydraPlatforms = [ ]; } // meta; }); diff --git a/pkgs/games/alephone/marathon/default.nix b/pkgs/games/alephone/marathon/default.nix index 1d0787067af..4518215a337 100644 --- a/pkgs/games/alephone/marathon/default.nix +++ b/pkgs/games/alephone/marathon/default.nix @@ -3,13 +3,13 @@ alephone.makeWrapper rec { pname = "marathon"; desktopName = "Marathon"; - version = "20190331"; + version = "20200904"; icon = alephone.icons + "/marathon.png"; zip = fetchurl { url = "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/Marathon-${version}-Data.zip"; - sha256 = "1d18a7hn8s50rqcs9i72ak5fq5a76hwk7nylfinrxjb134c9vlpz"; + sha256 = "sha256-x5M8RkxH+Rn8hUJIIq/AFC5Ibn0zF95BqZIDEwM6wVg="; }; meta = { diff --git a/pkgs/games/alienarena/default.nix b/pkgs/games/alienarena/default.nix index 5e9fd54e4ff..84badc8d853 100644 --- a/pkgs/games/alienarena/default.nix +++ b/pkgs/games/alienarena/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libjpeg, libX11, libXxf86vm, curl, libogg +{ lib, stdenv, fetchurl, pkg-config, libjpeg, libX11, libXxf86vm, curl, libogg , libvorbis, freetype, openal, libGL }: stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "03nnv4m2xmswr0020hssajncdb8sy95jp5yccsm53sgxga4r8igg"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libjpeg libX11 curl libogg libvorbis freetype openal libGL libXxf86vm ]; diff --git a/pkgs/games/amoeba/default.nix b/pkgs/games/amoeba/default.nix index 071a81bcb92..d648ac85c60 100644 --- a/pkgs/games/amoeba/default.nix +++ b/pkgs/games/amoeba/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, amoeba-data, alsaLib, expat, freetype, gtk2, libvorbis, libGLU, xorg, pkgconfig }: +{ lib, stdenv, fetchurl, amoeba-data, alsaLib, expat, freetype, gtk2, libvorbis, libGLU, xorg, pkg-config }: stdenv.mkDerivation rec { name = "amoeba-${version}-${debver}"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { sed -i main/linux-config/linux-config.cpp -e 's|libgtk-x11-2.0.so.0|${gtk2}/lib/&|' ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ alsaLib expat freetype gtk2 libvorbis libGLU xorg.libXxf86vm ]; installPhase = '' diff --git a/pkgs/games/andyetitmoves/default.nix b/pkgs/games/andyetitmoves/default.nix index 84c1f545a38..f939f5b2bac 100644 --- a/pkgs/games/andyetitmoves/default.nix +++ b/pkgs/games/andyetitmoves/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libvorbis, libogg, libtheora, SDL, libXft, SDL_image, zlib, libX11, libpng, openal, runtimeShell, requireFile, commercialVersion ? false }: +{ lib, stdenv, fetchurl, libvorbis, libogg, libtheora, SDL, libXft, SDL_image, zlib, libX11, libpng, openal, runtimeShell, requireFile, commercialVersion ? false }: let plainName = "andyetitmoves"; version = "1.2.2"; @@ -68,8 +68,8 @@ stdenv.mkDerivation { homepage = "http://www.andyetitmoves.net/"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; - maintainers = with stdenv.lib.maintainers; [bluescreen303]; + maintainers = with lib.maintainers; [bluescreen303]; }; } diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index 14e9704a432..6edddfeed5c 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -4,8 +4,9 @@ , python , fetchurl , fetchFromGitHub +, fetchpatch , lame -, mplayer +, mpv-unwrapped , libpulseaudio , pyqtwebengine , decorator @@ -105,11 +106,16 @@ buildPythonApplication rec { checkInputs = [ pytest glibcLocales nose ]; nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; - buildInputs = [ lame mplayer libpulseaudio ]; + buildInputs = [ lame mpv-unwrapped libpulseaudio ]; patches = [ # Disable updated version check. ./no-version-check.patch + (fetchpatch { + name = "fix-mpv-args.patch"; + url = "https://sources.debian.org/data/main/a/anki/2.1.15+dfsg-3/debian/patches/fix-mpv-args.patch"; + sha256 = "1dimnnawk64m5bbdbjrxw5k08q95l728n94cgkrrwxwavmmywaj2"; + }) ]; # Anki does not use setup.py @@ -173,7 +179,7 @@ buildPythonApplication rec { preFixup = '' makeWrapperArgs+=( "''${qtWrapperArgs[@]}" - --prefix PATH ':' "${lame}/bin:${mplayer}/bin" + --prefix PATH ':' "${lame}/bin:${mpv-unwrapped}/bin" ) ''; @@ -197,7 +203,6 @@ buildPythonApplication rec { or even practicing guitar chords! ''; license = licenses.agpl3Plus; - broken = stdenv.hostPlatform.isAarch64; platforms = platforms.mesaPlatforms; maintainers = with maintainers; [ oxij Profpatsch ]; }; diff --git a/pkgs/games/arena/default.nix b/pkgs/games/arena/default.nix index beba98b6316..7320a405bb1 100644 --- a/pkgs/games/arena/default.nix +++ b/pkgs/games/arena/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk2-x11, glib, pango, cairo, atk, gdk-pixbuf, libX11 }: +{ lib, stdenv, fetchurl, gtk2-x11, glib, pango, cairo, atk, gdk-pixbuf, libX11 }: # Arena is free software in the sense of "free beer" but not as in "free # speech". We can install it as we please, but we cannot re-distribute it in @@ -7,7 +7,7 @@ let - inherit (stdenv.lib) makeLibraryPath; + inherit (lib) makeLibraryPath; libDir = "lib64"; in @@ -66,9 +66,9 @@ stdenv.mkDerivation rec { UCI protocol I, II. Furthermore, compatible to Chess960, DGT electronic chess board & DGT clocks and much more. ''; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; platforms = ["x86_64-linux"]; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }; } diff --git a/pkgs/games/arx-libertatis/default.nix b/pkgs/games/arx-libertatis/default.nix index b82ee2a3a99..945ebf7b785 100644 --- a/pkgs/games/arx-libertatis/default.nix +++ b/pkgs/games/arx-libertatis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, zlib, boost +{ lib, stdenv, fetchFromGitHub, cmake, zlib, boost , openal, glm, freetype, libGLU, SDL2, epoxy , dejavu_fonts, inkscape, optipng, imagemagick , withCrashReporter ? !stdenv.isDarwin @@ -8,7 +8,7 @@ , gdb ? null }: -with stdenv.lib; +with lib; stdenv.mkDerivation { pname = "arx-libertatis"; diff --git a/pkgs/games/asc/default.nix b/pkgs/games/asc/default.nix index 1b7feda4ebb..9e9f188bf1b 100644 --- a/pkgs/games/asc/default.nix +++ b/pkgs/games/asc/default.nix @@ -1,5 +1,5 @@ { fetchurl, lib, stdenv, SDL, SDL_image, SDL_mixer, SDL_sound, libsigcxx, physfs -, boost, expat, freetype, libjpeg, wxGTK, lua, perl, pkgconfig, zlib, zip, bzip2 +, boost, expat, freetype, libjpeg, wxGTK, lua, perl, pkg-config, zlib, zip, bzip2 , libpng, libtiff, fluidsynth, libmikmod, libvorbis, flac, libogg }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ SDL SDL_image SDL_mixer SDL_sound libsigcxx physfs boost expat - freetype libjpeg wxGTK lua perl pkgconfig zlib zip bzip2 libpng + freetype libjpeg wxGTK lua perl pkg-config zlib zip bzip2 libpng libtiff fluidsynth libmikmod flac libvorbis libogg ]; diff --git a/pkgs/games/assaultcube/default.nix b/pkgs/games/assaultcube/default.nix index 423130a5356..0206821f387 100644 --- a/pkgs/games/assaultcube/default.nix +++ b/pkgs/games/assaultcube/default.nix @@ -1,8 +1,8 @@ -{ fetchFromGitHub, stdenv, makeDesktopItem, openal, pkgconfig, libogg, +{ fetchFromGitHub, lib, stdenv, makeDesktopItem, openal, pkg-config, libogg, libvorbis, SDL, SDL_image, makeWrapper, zlib, file, client ? true, server ? true }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "1vfn3d55vmmipdykrcfvgk6dddi9y95vlclsliirm7jdp20f15hd"; }; - nativeBuildInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = [ file zlib ] ++ optionals client [ openal SDL SDL_image libogg libvorbis ]; @@ -67,6 +67,6 @@ stdenv.mkDerivation rec { homepage = "https://assault.cubers.net"; maintainers = [ ]; platforms = platforms.linux; # should work on darwin with a little effort. - license = stdenv.lib.licenses.zlib; + license = lib.licenses.zlib; }; } diff --git a/pkgs/games/astromenace/default.nix b/pkgs/games/astromenace/default.nix index 1882f5a9b68..cbe2385ea12 100644 --- a/pkgs/games/astromenace/default.nix +++ b/pkgs/games/astromenace/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, cmake, xlibsWrapper, libGLU, libGL, SDL, openal, freealut, libogg, libvorbis, runtimeShell }: +{ fetchurl, lib, stdenv, cmake, xlibsWrapper, libGLU, libGL, SDL, openal, freealut, libogg, libvorbis, runtimeShell }: stdenv.mkDerivation rec { version = "1.3.2"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = { description = "Hardcore 3D space shooter with spaceship upgrade possibilities"; homepage = "https://www.viewizard.com/"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/azimuth/default.nix b/pkgs/games/azimuth/default.nix index 67bbd8558c3..dcc67533fac 100644 --- a/pkgs/games/azimuth/default.nix +++ b/pkgs/games/azimuth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, SDL, which, installTool ? false }: +{ lib, stdenv, fetchFromGitHub, SDL, which, installTool ? false }: stdenv.mkDerivation rec { pname = "azimuth"; @@ -41,10 +41,10 @@ stdenv.mkDerivation rec { bosses to tangle with. ''; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; homepage = "https://mdsteele.games/azimuth/index.html"; - maintainers = with stdenv.lib.maintainers; [ marius851000 ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with lib.maintainers; [ marius851000 ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/ball-and-paddle/default.nix b/pkgs/games/ball-and-paddle/default.nix index 862905efd3b..7fe74dc47d9 100644 --- a/pkgs/games/ball-and-paddle/default.nix +++ b/pkgs/games/ball-and-paddle/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, SDL, SDL_image, SDL_mixer, SDL_ttf, guile, gettext }: +{ fetchurl, lib, stdenv, SDL, SDL_image, SDL_mixer, SDL_ttf, guile, gettext }: stdenv.mkDerivation rec { name = "ballandpaddle-0.8.1"; @@ -31,14 +31,14 @@ stdenv.mkDerivation rec { with Guile. Follow the example level sets and the documentation. ''; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; homepage = "https://www.gnu.org/software/ballandpaddle/"; maintainers = [ ]; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; - hydraPlatforms = stdenv.lib.platforms.linux; # sdl-config times out on darwin + hydraPlatforms = lib.platforms.linux; # sdl-config times out on darwin }; } diff --git a/pkgs/games/beret/default.nix b/pkgs/games/beret/default.nix index db9e6b96902..e59fc7eb274 100644 --- a/pkgs/games/beret/default.nix +++ b/pkgs/games/beret/default.nix @@ -6,8 +6,8 @@ stdenv.mkDerivation { buildInputs = [ SDL SDL_image SDL_ttf SDL_mixer ]; NIX_CFLAGS_COMPILE = "-I${SDL.dev}/include/SDL"; - NIX_CFLAGS_LINK = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin + NIX_CFLAGS_LINK = lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; + NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework CoreFoundation -framework OpenGL -framework Cocoa"; patches = [ ./use-home-dir.patch ]; diff --git a/pkgs/games/bitsnbots/default.nix b/pkgs/games/bitsnbots/default.nix index 52286b32f90..a3bd399a5ff 100644 --- a/pkgs/games/bitsnbots/default.nix +++ b/pkgs/games/bitsnbots/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, lua, libGLU, libGL }: +{ lib, stdenv, fetchurl, SDL, lua, libGLU, libGL }: stdenv.mkDerivation rec { name = "bitsnbots-20111230"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { description = "Simple puzzle game with moving robots"; homepage = "http://moikmellah.org/blog/?page_id=19"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl3Plus; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/games/blackshades/default.nix b/pkgs/games/blackshades/default.nix index e47e430d84c..7fe4a6087f7 100644 --- a/pkgs/games/blackshades/default.nix +++ b/pkgs/games/blackshades/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchsvn, SDL, libGLU, libGL, openal, libvorbis, freealut, SDL_image}: +{lib, stdenv, fetchsvn, SDL, libGLU, libGL, openal, libvorbis, freealut, SDL_image}: stdenv.mkDerivation { name = "blackshades-svn-110"; @@ -27,8 +27,8 @@ stdenv.mkDerivation { meta = { homepage = "http://icculus.org/blackshades/"; description = "Protect the VIP"; - license = stdenv.lib.licenses.free; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.free; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/games/blobby/default.nix b/pkgs/games/blobby/default.nix index 98c31f4e9fe..9dad0b84d1e 100644 --- a/pkgs/games/blobby/default.nix +++ b/pkgs/games/blobby/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL2, SDL2_image, libGLU, libGL, cmake, physfs, boost, zip, zlib, pkg-config }: +{ lib, stdenv, fetchurl, SDL2, SDL2_image, libGLU, libGL, cmake, physfs, boost, zip, zlib, pkg-config }: stdenv.mkDerivation rec { pname = "blobby-volley"; @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { chmod a+x "$out/bin/blobby" ''; - meta = with stdenv.lib; { - description = ''A blobby volleyball game''; + meta = with lib; { + description = "A blobby volleyball game"; license = licenses.bsd3; platforms = platforms.linux; maintainers = with maintainers; [ raskin ]; diff --git a/pkgs/games/boohu/default.nix b/pkgs/games/boohu/default.nix index 9b46420d5ff..83189353645 100644 --- a/pkgs/games/boohu/default.nix +++ b/pkgs/games/boohu/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, buildGoPackage}: +{lib, fetchurl, buildGoPackage}: buildGoPackage rec { diff --git a/pkgs/games/bsdgames/default.nix b/pkgs/games/bsdgames/default.nix index 41414a573a6..04a86c0b83c 100644 --- a/pkgs/games/bsdgames/default.nix +++ b/pkgs/games/bsdgames/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, openssl, flex, bison, less, miscfiles }: +{ lib, stdenv, fetchurl, ncurses, openssl, flex, bison, less, miscfiles }: stdenv.mkDerivation { name = "bsd-games-2.17"; @@ -60,8 +60,8 @@ stdenv.mkDerivation { meta = { homepage = "http://www.t2-project.org/packages/bsd-games.html"; description = "Ports of all the games from NetBSD-current that are free"; - license = stdenv.lib.licenses.free; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.free; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/games/btanks/default.nix b/pkgs/games/btanks/default.nix index cb6078026dc..202bab0df66 100644 --- a/pkgs/games/btanks/default.nix +++ b/pkgs/games/btanks/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, sconsPackages, pkgconfig, SDL, libGL, zlib, smpeg +{ lib, stdenv, fetchurl, fetchpatch, sconsPackages, pkg-config, SDL, libGL, zlib, smpeg , SDL_image, libvorbis, expat, zip, lua }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0ha35kxc8xlbg74wsrbapfgxvcrwy6psjkqi7c6adxs55dmcxliz"; }; - nativeBuildInputs = [ sconsPackages.scons_3_0_1 pkgconfig ]; + nativeBuildInputs = [ sconsPackages.scons_3_0_1 pkg-config ]; buildInputs = [ SDL libGL zlib smpeg SDL_image libvorbis expat zip lua ]; diff --git a/pkgs/games/bzflag/default.nix b/pkgs/games/bzflag/default.nix index 1ec24e02be0..dfddc2e859f 100644 --- a/pkgs/games/bzflag/default.nix +++ b/pkgs/games/bzflag/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig +{ stdenv, lib, fetchurl, pkg-config , curl, SDL2, libGLU, libGL, glew, ncurses, c-ares , Carbon, CoreServices }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "16brxqmfiyz4j4lb8ihzjcbwqmpsms6vm3ijbp34lnw0blbwdjb2"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ curl SDL2 libGLU libGL glew ncurses c-ares ] ++ lib.optionals stdenv.isDarwin [ Carbon CoreServices ]; diff --git a/pkgs/games/cataclysm-dda/common.nix b/pkgs/games/cataclysm-dda/common.nix index c41b0df5a80..d975a60c1fd 100644 --- a/pkgs/games/cataclysm-dda/common.nix +++ b/pkgs/games/cataclysm-dda/common.nix @@ -1,11 +1,11 @@ -{ lib, stdenv, runtimeShell, pkgconfig, gettext, ncurses, CoreFoundation +{ lib, stdenv, runtimeShell, pkg-config, gettext, ncurses, CoreFoundation , tiles, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, freetype, Cocoa , debug , useXdgDir }: let - inherit (stdenv.lib) optionals optionalString; + inherit (lib) optionals optionalString; cursesDeps = [ gettext ncurses ] ++ optionals stdenv.isDarwin [ CoreFoundation ]; @@ -37,7 +37,7 @@ in stdenv.mkDerivation { pname = "cataclysm-dda"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = cursesDeps ++ optionals tiles tilesDeps; diff --git a/pkgs/games/chessdb/default.nix b/pkgs/games/chessdb/default.nix index 76862c4bffe..656e4ab6add 100644 --- a/pkgs/games/chessdb/default.nix +++ b/pkgs/games/chessdb/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, tcl, tk, libX11, makeWrapper }: +{ lib, stdenv, fetchurl, tcl, tk, libX11, makeWrapper }: stdenv.mkDerivation { name = "chessdb-3.6.19-beta-1"; - + src = fetchurl { url = "mirror://sourceforge/chessdb/ChessDB-3.6.19-beta-1.tar.gz"; sha256 = "0brc3wln3bxp979iqj2w1zxpfd0pch8zzazhdmwf7acww4hrsz62"; @@ -25,6 +25,6 @@ stdenv.mkDerivation { meta = { homepage = "http://chessdb.sourceforge.net/"; description = "A free chess database"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/chessx/default.nix b/pkgs/games/chessx/default.nix index 9f8e4c6cc5a..fb7c7fddf09 100644 --- a/pkgs/games/chessx/default.nix +++ b/pkgs/games/chessx/default.nix @@ -1,6 +1,6 @@ { mkDerivation -, lib, stdenv -, pkgconfig +, lib +, pkg-config , zlib , qtbase , qtsvg @@ -20,7 +20,7 @@ mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config qmake ]; diff --git a/pkgs/games/chiaki/default.nix b/pkgs/games/chiaki/default.nix index e3a2560ac10..ef454e50006 100644 --- a/pkgs/games/chiaki/default.nix +++ b/pkgs/games/chiaki/default.nix @@ -18,13 +18,13 @@ mkDerivation rec { pname = "chiaki"; - version = "2.0.1"; + version = "2.1.0"; src = fetchgit { url = "https://git.sr.ht/~thestr4ng3r/chiaki"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "0l532i9j6wmzbxqx7fg69kgfd1zy1r1wlw6f756vpxpgswivi892"; + sha256 = "1hgh2j71rch53cnpm3f195gpfgrb4hd0yqa810k3ikar8zl4h7sd"; }; nativeBuildInputs = [ @@ -43,10 +43,10 @@ mkDerivation rec { qtsvg protobuf SDL2 - ] ++ stdenv.lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ libevdev udev - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ qtmacextras ]; @@ -57,7 +57,7 @@ mkDerivation rec { meta = with lib; { homepage = "https://git.sr.ht/~thestr4ng3r/chiaki"; description = "Free and Open Source PlayStation Remote Play Client"; - license = licenses.gpl3Plus; + license = licenses.agpl3Only; maintainers = with maintainers; [ delroth ]; platforms = platforms.all; }; diff --git a/pkgs/games/chocolate-doom/default.nix b/pkgs/games/chocolate-doom/default.nix index 1b77a72f8d0..28ef9b6417e 100644 --- a/pkgs/games/chocolate-doom/default.nix +++ b/pkgs/games/chocolate-doom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoreconfHook, pkgconfig, SDL2, SDL2_mixer, SDL2_net, fetchFromGitHub }: +{ lib, stdenv, autoreconfHook, pkg-config, SDL2, SDL2_mixer, SDL2_net, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "chocolate-doom"; @@ -15,16 +15,16 @@ stdenv.mkDerivation rec { sed -e 's#/games#/bin#g' -i src{,/setup}/Makefile.am ''; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ SDL2 SDL2_mixer SDL2_net ]; enableParallelBuilding = true; meta = { homepage = "http://chocolate-doom.org/"; description = "A Doom source port that accurately reproduces the experience of Doom as it was played in the 1990s"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; - hydraPlatforms = stdenv.lib.platforms.linux; # darwin times out - maintainers = with stdenv.lib.maintainers; [ MP2E ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + hydraPlatforms = lib.platforms.linux; # darwin times out + maintainers = with lib.maintainers; [ MP2E ]; }; } diff --git a/pkgs/games/ckan/default.nix b/pkgs/games/ckan/default.nix index b0a509ce4db..052982bf15d 100644 --- a/pkgs/games/ckan/default.nix +++ b/pkgs/games/ckan/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper mono ]; - libraries = stdenv.lib.makeLibraryPath [ gtk2 curl ]; + libraries = lib.makeLibraryPath [ gtk2 curl ]; buildPhase = "true"; diff --git a/pkgs/games/cockatrice/default.nix b/pkgs/games/cockatrice/default.nix index f8b90f87a72..a657913aad7 100644 --- a/pkgs/games/cockatrice/default.nix +++ b/pkgs/games/cockatrice/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, mkDerivation, cmake, protobuf +{ lib, fetchFromGitHub, mkDerivation, cmake, protobuf , qtbase, qtmultimedia, qttools, qtwebsockets, wrapQtAppsHook }: @@ -22,8 +22,8 @@ mkDerivation rec { meta = { homepage = "https://github.com/Cockatrice/Cockatrice"; description = "A cross-platform virtual tabletop for multiplayer card games"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ evanjs ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ evanjs ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/games/commandergenius/default.nix b/pkgs/games/commandergenius/default.nix index c375668c222..725cc5231c7 100644 --- a/pkgs/games/commandergenius/default.nix +++ b/pkgs/games/commandergenius/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, SDL2, SDL2_image, pkgconfig +{ lib, stdenv, fetchFromGitLab, SDL2, SDL2_image, pkg-config , libvorbis, libGL, boost, cmake, zlib, curl, SDL2_mixer, python3 }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { export makeFlags="$makeFlags DESTDIR=$(out)" ''; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; postPatch = '' NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(sdl2-config --cflags)" diff --git a/pkgs/games/construo/default.nix b/pkgs/games/construo/default.nix index 815c2f3fab4..2565d8599a5 100644 --- a/pkgs/games/construo/default.nix +++ b/pkgs/games/construo/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , libX11 , zlib @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { }; buildInputs = [ libX11 zlib xorgproto ] - ++ stdenv.lib.optional (libGL != null) libGL - ++ stdenv.lib.optional (libGLU != null) libGLU - ++ stdenv.lib.optional (freeglut != null) freeglut; + ++ lib.optional (libGL != null) libGL + ++ lib.optional (libGLU != null) libGLU + ++ lib.optional (freeglut != null) freeglut; preConfigure = '' substituteInPlace src/Makefile.in \ @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { meta = { description = "Masses and springs simulation game"; homepage = "http://fs.fsf.org/construo/"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }; } diff --git a/pkgs/games/crack-attack/default.nix b/pkgs/games/crack-attack/default.nix index 05c829441ad..f5296e8ce6b 100644 --- a/pkgs/games/crack-attack/default.nix +++ b/pkgs/games/crack-attack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, freeglut, SDL, SDL_mixer, libGLU, libGL, libXi, libXmu }: +{ lib, stdenv, fetchurl, pkg-config, gtk2, freeglut, SDL, SDL_mixer, libGLU, libGL, libXi, libXmu }: stdenv.mkDerivation { name = "crack-attack-1.1.14"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { "--datadir=${placeholder "out"}/share" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 freeglut SDL SDL_mixer libGLU libGL libXi libXmu ]; hardeningDisable = [ "format" ]; @@ -28,8 +28,8 @@ stdenv.mkDerivation { meta = { description = "A fast-paced puzzle game inspired by the classic Super NES title Tetris Attack!"; homepage = "https://www.nongnu.org/crack-attack/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.piotr ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.piotr ]; }; } diff --git a/pkgs/games/crafty/default.nix b/pkgs/games/crafty/default.nix index 191baa7e592..1328488dde3 100644 --- a/pkgs/games/crafty/default.nix +++ b/pkgs/games/crafty/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { pname = "crafty"; @@ -66,8 +66,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.craftychess.com/"; description = "Chess program developed by Dr. Robert M. Hyatt"; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.jwiegley ]; + license = lib.licenses.unfree; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.jwiegley ]; }; } diff --git a/pkgs/games/crawl/crawl_purify.patch b/pkgs/games/crawl/crawl_purify.patch index dda55b09f32..8650141744d 100644 --- a/pkgs/games/crawl/crawl_purify.patch +++ b/pkgs/games/crawl/crawl_purify.patch @@ -1,20 +1,5 @@ -diff --git a/crawl-ref/source/Makefile b/crawl-ref/source/Makefile ---- a/crawl-ref/source/Makefile -+++ b/crawl-ref/source/Makefile -@@ -248,9 +248,9 @@ ifeq ($(uname_S),Darwin) - STRIP := strip -x - NEED_APPKIT = YesPlease - LIBNCURSES_IS_UNICODE = Yes -- NO_PKGCONFIG = Yes -- BUILD_SQLITE = YesPlease -- BUILD_ZLIB = YesPlease -+ #NO_PKGCONFIG = Yes -+ #BUILD_SQLITE = YesPlease -+ #BUILD_ZLIB = YesPlease - ifdef TILES - EXTRA_LIBS += -framework AppKit -framework AudioUnit -framework CoreAudio -framework ForceFeedback -framework Carbon -framework IOKit -framework OpenGL -framework AudioToolbox -framework CoreVideo contrib/install/$(ARCH)/lib/libSDL2main.a - BUILD_FREETYPE = YesPlease diff --git a/crawl-ref/source/util/find_font b/crawl-ref/source/util/find_font +index f8b576fd63..b95c21c0a1 100755 --- a/crawl-ref/source/util/find_font +++ b/crawl-ref/source/util/find_font @@ -1,6 +1,6 @@ @@ -25,7 +10,7 @@ diff --git a/crawl-ref/source/util/find_font b/crawl-ref/source/util/find_font name=$1 [ "$name" ] || { echo "Usage: $0 <fontname.ttf>" >&2; exit 100; } -@@ -11,6 +11,6 @@ +@@ -11,6 +11,6 @@ name=$1 for dir in $FONTDIRS; do [ -d "$dir" ] && echo "$dir" done @@ -34,6 +19,7 @@ diff --git a/crawl-ref/source/util/find_font b/crawl-ref/source/util/find_font | head -n1 } 2>/dev/null diff --git a/crawl-ref/source/windowmanager-sdl.cc b/crawl-ref/source/windowmanager-sdl.cc +index e29ccff507..9bf01e040a 100644 --- a/crawl-ref/source/windowmanager-sdl.cc +++ b/crawl-ref/source/windowmanager-sdl.cc @@ -20,7 +20,7 @@ diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index 353a7b029cf..8d16b2fe59c 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, which, sqlite, lua5_1, perl, python3, zlib, pkgconfig, ncurses +{ stdenv, lib, fetchFromGitHub, fetchpatch, which, sqlite, lua5_1, perl, python3, zlib, pkg-config, ncurses , dejavu_fonts, libpng, SDL2, SDL2_image, SDL2_mixer, libGLU, libGL, freetype, pngcrush, advancecomp , tileMode ? false, enableSound ? tileMode @@ -8,19 +8,19 @@ stdenv.mkDerivation rec { name = "crawl-${version}${lib.optionalString tileMode "-tiles"}"; - version = "0.25.1"; + version = "0.26.0"; src = fetchFromGitHub { owner = "crawl"; repo = "crawl"; rev = version; - sha256 = "0i1cvwzwmcb07ynz1nk2svprfhsgcqmagvj5jfzayvcb1a2ww23b"; + sha256 = "0g0icmhppb6f5amf5r2ksfylrlipz2cd8gd85pmd05k463nrmwqi"; }; # Patch hard-coded paths and remove force library builds patches = [ ./crawl_purify.patch ]; - nativeBuildInputs = [ pkgconfig which perl pngcrush advancecomp ]; + nativeBuildInputs = [ pkg-config which perl pngcrush advancecomp ]; # Still unstable with luajit buildInputs = [ lua5_1 zlib sqlite ncurses ] @@ -45,6 +45,7 @@ stdenv.mkDerivation rec { fontsPath = lib.optionalString tileMode dejavu_fonts; makeFlags = [ "prefix=${placeholder "out"}" "FORCE_CC=cc" "FORCE_CXX=c++" "HOSTCXX=c++" + "FORCE_PKGCONFIG=y" "SAVEDIR=~/.crawl" "sqlite=${sqlite.dev}" "DATADIR=${placeholder "out"}" ] ++ lib.optional tileMode "TILES=y" diff --git a/pkgs/games/crispy-doom/default.nix b/pkgs/games/crispy-doom/default.nix index 70e191fe887..432600e879f 100644 --- a/pkgs/games/crispy-doom/default.nix +++ b/pkgs/games/crispy-doom/default.nix @@ -1,14 +1,14 @@ -{ stdenv, autoreconfHook, pkgconfig, SDL2, SDL2_mixer, SDL2_net, fetchFromGitHub, python }: +{ lib, stdenv, autoreconfHook, pkg-config, SDL2, SDL2_mixer, SDL2_net, fetchFromGitHub, python }: stdenv.mkDerivation rec { pname = "crispy-doom"; - version = "5.9.2"; + version = "5.10.0"; src = fetchFromGitHub { owner = "fabiangreffrath"; repo = pname; rev = "${pname}-${version}"; - sha256 = "0fkw9z66sjcz7k528wyla6mgi4impqimn93yhqmc194ycrjirraa"; + sha256 = "sha256-hRdd5ZrcVBU7tn1juvrLdbenULzu6OsXefG0oLjjFIg="; }; postPatch = '' @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { for script in $(grep -lr '^#!/usr/bin/env python$'); do patchShebangs $script; done ''; - nativeBuildInputs = [ autoreconfHook pkgconfig python ]; + nativeBuildInputs = [ autoreconfHook pkg-config python ]; buildInputs = [ SDL2 SDL2_mixer SDL2_net ]; enableParallelBuilding = true; @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { Crispy Doom is a limit-removing enhanced-resolution Doom source port based on Chocolate Doom. Its name means that 640x400 looks \"crisp\" and is also a slight reference to its origin. ''; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ neonfuz ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ neonfuz ]; }; } diff --git a/pkgs/games/crrcsim/default.nix b/pkgs/games/crrcsim/default.nix index e57d6bcab06..741f402870a 100644 --- a/pkgs/games/crrcsim/default.nix +++ b/pkgs/games/crrcsim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libGLU, libGL, SDL, SDL_mixer, plib, libjpeg }: +{ lib, stdenv, fetchurl, libGLU, libGL, SDL, SDL_mixer, plib, libjpeg }: let version = "0.9.13"; in @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { meta = { description = "A model-airplane flight simulator"; - maintainers = with stdenv.lib.maintainers; [ raskin ]; + maintainers = with lib.maintainers; [ raskin ]; platforms = [ "i686-linux" "x86_64-linux" ]; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/games/cutemaze/default.nix b/pkgs/games/cutemaze/default.nix index 89fdc7e9d87..0cd16e433df 100644 --- a/pkgs/games/cutemaze/default.nix +++ b/pkgs/games/cutemaze/default.nix @@ -13,7 +13,7 @@ mkDerivation rec { buildInputs = [ qtsvg ]; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.isDarwin '' mkdir -p $out/Applications mv CuteMaze.app $out/Applications ''; diff --git a/pkgs/games/cuyo/default.nix b/pkgs/games/cuyo/default.nix index 72c55fc1811..871812e097a 100644 --- a/pkgs/games/cuyo/default.nix +++ b/pkgs/games/cuyo/default.nix @@ -1,21 +1,21 @@ -{ stdenv, fetchurl, SDL, SDL_mixer, zlib }: +{ lib, stdenv, fetchurl, SDL, SDL_mixer, zlib }: stdenv.mkDerivation { pname = "cuyo"; version = "2.1.0"; - + src = fetchurl { url = "https://download.savannah.gnu.org/releases/cuyo/cuyo-2.1.0.tar.gz"; sha256 = "17yqv924x7yvwix7yz9jdhgyar8lzdhqvmpvv0any8rdkajhj23c"; }; buildInputs = [ SDL SDL_mixer zlib ]; - + meta = { homepage = "http://karimmi.de/cuyo"; description = "Stacking blocks game, with different rules for each level"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; - + } diff --git a/pkgs/games/dhewm3/default.nix b/pkgs/games/dhewm3/default.nix index edec85a1c65..b5caa603eaf 100644 --- a/pkgs/games/dhewm3/default.nix +++ b/pkgs/games/dhewm3/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/dhewm/dhewm3"; description = "Doom 3 port to SDL"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; maintainers = with maintainers; [ MP2E ]; platforms = with platforms; linux; }; diff --git a/pkgs/games/domination/default.nix b/pkgs/games/domination/default.nix index 37c7d37741b..2fc4f8d36cb 100644 --- a/pkgs/games/domination/default.nix +++ b/pkgs/games/domination/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchsvn # jdk8 is needed for building, but the game runs on newer jres as well , jdk8 @@ -76,7 +76,7 @@ in stdenv.mkDerivation { install -Dm644 build/game/resources/icon.png $out/share/pixmaps/domination.png ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://domination.sourceforge.net/"; downloadPage = "http://domination.sourceforge.net/download.shtml"; description = "A game that is a bit like the board game Risk or RisiKo"; diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix index 83e181c85e6..bd8825582c4 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { cp -r DwarfTherapist.app $out/Applications '' else null; + dontWrapQtApps = true; + meta = with lib; { description = "Tool to manage dwarves in a running game of Dwarf Fortress"; maintainers = with maintainers; [ abbradar bendlas numinit jonringer ]; diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix index 6871a611784..bd75a66b487 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix @@ -6,10 +6,10 @@ let inifile = "linux/v0.${dwarf-fortress.baseVersion}.${dwarf-fortress.patchVersion}_${platformSlug}.ini"; in - + stdenv.mkDerivation { name = "dwarf-therapist-${dwarf-therapist.version}"; - + wrapper = ./dwarf-therapist.in; paths = [ dwarf-therapist ]; diff --git a/pkgs/games/dwarf-fortress/lazy-pack.nix b/pkgs/games/dwarf-fortress/lazy-pack.nix index 03aa5d54304..41620dd66f1 100644 --- a/pkgs/games/dwarf-fortress/lazy-pack.nix +++ b/pkgs/games/dwarf-fortress/lazy-pack.nix @@ -38,7 +38,7 @@ buildEnv { ++ lib.optional enableDwarfTherapist dwarf-therapist ++ lib.optional enableLegendsBrowser legends-browser; - meta = with stdenvNoCC.lib; { + meta = with lib; { description = "An opinionated wrapper for Dwarf Fortress"; maintainers = with maintainers; [ Baughn numinit ]; license = licenses.mit; diff --git a/pkgs/games/dwarf-fortress/legends-browser/default.nix b/pkgs/games/dwarf-fortress/legends-browser/default.nix index b1106002515..1efae4d2802 100644 --- a/pkgs/games/dwarf-fortress/legends-browser/default.nix +++ b/pkgs/games/dwarf-fortress/legends-browser/default.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, buildEnv, writeShellScriptBin, fetchurl, jre }: +{ lib, stdenvNoCC, buildEnv, writeShellScriptBin, fetchurl, jre }: let name = "legends-browser-${version}"; @@ -8,7 +8,7 @@ let url = "https://github.com/robertjanetzko/LegendsBrowser/releases/download/${version}/legendsbrowser-${version}.jar"; sha256 = "05b4ksbl4481rh3ykfirbp6wvxhppcd5mvclhn9995gsrcaj8gx9"; }; - + script = writeShellScriptBin "legends-browser" '' set -eu BASE="$HOME/.local/share/df_linux/legends-browser/" @@ -26,7 +26,7 @@ buildEnv { inherit name; paths = [ script ]; - meta = with stdenvNoCC.lib; { + meta = with lib; { description = "A multi-platform, open source, java-based legends viewer for dwarf fortress"; maintainers = with maintainers; [ Baughn ]; license = licenses.mit; diff --git a/pkgs/games/dwarf-fortress/twbt/default.nix b/pkgs/games/dwarf-fortress/twbt/default.nix index a0990e04f93..48826ca9160 100644 --- a/pkgs/games/dwarf-fortress/twbt/default.nix +++ b/pkgs/games/dwarf-fortress/twbt/default.nix @@ -80,7 +80,7 @@ stdenvNoCC.mkDerivation rec { cp -a *.png $art/data/art/ ''; - meta = with stdenvNoCC.lib; { + meta = with lib; { description = "A plugin for Dwarf Fortress / DFHack that improves various aspects the game interface."; maintainers = with maintainers; [ Baughn numinit ]; license = licenses.mit; diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix index 79b63e3ce9e..73288ab659f 100644 --- a/pkgs/games/dwarf-fortress/wrapper/default.nix +++ b/pkgs/games/dwarf-fortress/wrapper/default.nix @@ -60,7 +60,7 @@ let '' + lib.optionalString enableTWBT '' substituteInPlace $out/data/init/init.txt \ --replace '[PRINT_MODE:2D]' '[PRINT_MODE:TWBT]' - '' + + '' + lib.optionalString enableTextMode '' substituteInPlace $out/data/init/init.txt \ --replace '[PRINT_MODE:2D]' '[PRINT_MODE:TEXT]' diff --git a/pkgs/games/dxx-rebirth/default.nix b/pkgs/games/dxx-rebirth/default.nix index 43c3fd00a02..c2e3fac7e15 100644 --- a/pkgs/games/dxx-rebirth/default.nix +++ b/pkgs/games/dxx-rebirth/default.nix @@ -3,7 +3,7 @@ , fetchurl , fetchpatch , scons -, pkgconfig +, pkg-config , SDL , SDL_mixer , libGLU @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { sha256 = "1lsrlp47aby2m9hh7i3nv5rb0srlkmnq1w2ca6vyvlga9m9h7jrk"; }; - nativeBuildInputs = [ pkgconfig scons ]; + nativeBuildInputs = [ pkg-config scons ]; buildInputs = [ libGLU libGL libpng physfs SDL SDL_mixer ]; diff --git a/pkgs/games/easyrpg-player/default.nix b/pkgs/games/easyrpg-player/default.nix index 7ebba6c3d72..81968d25e3d 100644 --- a/pkgs/games/easyrpg-player/default.nix +++ b/pkgs/games/easyrpg-player/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, doxygen ? null, pkgconfig, freetype ? null, glib, harfbuzz ? null +{ lib, stdenv, fetchFromGitHub, cmake, doxygen ? null, pkg-config, freetype ? null, glib, harfbuzz ? null , liblcf, libpng, libsndfile ? null, libvorbis ? null, libxmp ? null , libXcursor, libXext, libXi, libXinerama, libXrandr, libXScrnSaver, libXxf86vm , mpg123 ? null, opusfile ? null, pcre, pixman, SDL2_mixer, speexdsp ? null, wildmidi ? null, zlib }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "103ywad12dcfjpf97kyx22smilqrw1f20xcfvjjr4mm3walc2mdp"; }; - nativeBuildInputs = [ cmake doxygen pkgconfig ]; + nativeBuildInputs = [ cmake doxygen pkg-config ]; buildInputs = [ freetype diff --git a/pkgs/games/eboard/default.nix b/pkgs/games/eboard/default.nix index b11cc90d11f..67d7d38018e 100644 --- a/pkgs/games/eboard/default.nix +++ b/pkgs/games/eboard/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, pkgconfig, gtk2 }: +{ lib, stdenv, fetchurl, perl, pkg-config, gtk2 }: stdenv.mkDerivation { name = "eboard-1.1.1"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { patches = [ ./eboard.patch ]; buildInputs = [ gtk2 ]; - nativeBuildInputs = [ perl pkgconfig ]; + nativeBuildInputs = [ perl pkg-config ]; hardeningDisable = [ "format" ]; @@ -25,6 +25,6 @@ stdenv.mkDerivation { meta = { homepage = "http://www.bergo.eng.br/eboard/"; description = "Chess interface for Unix-like systems"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index f264fd0b9e3..a5796f697ef 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, pkgconfig, nasm, makeDesktopItem +{ lib, stdenv, fetchurl, makeWrapper, pkg-config, nasm, makeDesktopItem , alsaLib, flac, gtk2, libvorbis, libvpx, libGLU, libGL , SDL2, SDL2_mixer }: @@ -29,8 +29,8 @@ in stdenv.mkDerivation { buildInputs = [ alsaLib flac gtk2 libvorbis libvpx libGL libGLU SDL2 SDL2_mixer ]; - nativeBuildInputs = [ makeWrapper pkgconfig ] - ++ stdenv.lib.optional (stdenv.hostPlatform.system == "i686-linux") nasm; + nativeBuildInputs = [ makeWrapper pkg-config ] + ++ lib.optional (stdenv.hostPlatform.system == "i686-linux") nasm; postPatch = '' substituteInPlace source/build/src/glbuild.cpp \ diff --git a/pkgs/games/egoboo/default.nix b/pkgs/games/egoboo/default.nix index 138ad8a757f..56ebcb1444e 100644 --- a/pkgs/games/egoboo/default.nix +++ b/pkgs/games/egoboo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libGLU, libGL, SDL, SDL_mixer, SDL_image, SDL_ttf }: +{ lib, stdenv, fetchurl, libGLU, libGL, SDL, SDL_mixer, SDL_image, SDL_ttf }: stdenv.mkDerivation rec { # pf5234 (a developer?) at freenode #egoboo told me that I better use 2.7.3 until @@ -50,10 +50,10 @@ stdenv.mkDerivation rec { description = "3D dungeon crawling adventure"; homepage = "http://www.freedink.org/"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; # I take it out of hydra as it does not work as well as I'd like - # maintainers = [ stdenv.lib.maintainers.bjg ]; - # platforms = stdenv.lib.platforms.all; + # maintainers = [ lib.maintainers.bjg ]; + # platforms = lib.platforms.all; }; } diff --git a/pkgs/games/eidolon/default.nix b/pkgs/games/eidolon/default.nix index bb7f7a68bcf..dcb72d53b32 100644 --- a/pkgs/games/eidolon/default.nix +++ b/pkgs/games/eidolon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, rustPlatform, pkgconfig, openssl }: +{ lib, fetchgit, rustPlatform, pkg-config, openssl }: rustPlatform.buildRustPackage rec { pname = "eidolon"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1i8qfphynwi42pkhhgllxq42dnw9f0dd6f829z94a3g91czyqvsw"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; meta = with lib; { diff --git a/pkgs/games/endgame-singularity/default.nix b/pkgs/games/endgame-singularity/default.nix index 4e855dbd053..d6b15301872 100644 --- a/pkgs/games/endgame-singularity/default.nix +++ b/pkgs/games/endgame-singularity/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib , fetchurl , fetchFromGitHub , unzip @@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec { rev = "v${version}"; sha256 = "0ndrnxwii8lag6vrjpwpf5n36hhv223bb46d431l9gsigbizv0hl"; }) - ] ++ stdenv.lib.optional enableDefaultMusicPack ( + ] ++ lib.optional enableDefaultMusicPack ( fetchurl { url = "http://www.emhsoft.com/singularity/endgame-singularity-music-007.zip"; sha256 = "0vf2qaf66jh56728pq1zbnw50yckjz6pf6c6qw6dl7vk60kkqnpb"; @@ -29,7 +29,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ pygame numpy polib ]; # Add the music - postInstall = stdenv.lib.optionalString enableDefaultMusicPack '' + postInstall = lib.optionalString enableDefaultMusicPack '' cp -R "../endgame-singularity-music-007" \ "$(echo $out/lib/python*/site-packages/singularity)/music" # ↑ we cannot glob on [...]/music, it doesn't exist yet @@ -42,7 +42,7 @@ python3.pkgs.buildPythonApplication rec { A simulation of a true AI. Go from computer to computer, pursued by the entire world. Keep hidden, and you might have a chance ''; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ fgaz ]; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ fgaz ]; }; } diff --git a/pkgs/games/enyo-doom/default.nix b/pkgs/games/enyo-doom/default.nix index bcb98fc8cca..eeb4086f924 100644 --- a/pkgs/games/enyo-doom/default.nix +++ b/pkgs/games/enyo-doom/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, stdenv, fetchFromGitLab, cmake, qtbase }: +{ mkDerivation, lib, fetchFromGitLab, cmake, qtbase }: mkDerivation rec { pname = "enyo-doom"; @@ -18,8 +18,8 @@ mkDerivation rec { meta = { homepage = "https://gitlab.com/sdcofer70/enyo-doom"; description = "Frontend for Doom engines"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.tadfisher ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.tadfisher ]; }; } diff --git a/pkgs/games/eternity-engine/default.nix b/pkgs/games/eternity-engine/default.nix index 72e2af9025d..42111556105 100644 --- a/pkgs/games/eternity-engine/default.nix +++ b/pkgs/games/eternity-engine/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, libGL, SDL, SDL_mixer, SDL_net, fetchFromGitHub, makeWrapper }: +{ lib, stdenv, cmake, libGL, SDL, SDL_mixer, SDL_net, fetchFromGitHub, makeWrapper }: stdenv.mkDerivation rec { pname = "eternity-engine"; @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://doomworld.com/eternity"; description = "New school Doom port by James Haley"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ MP2E ]; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ MP2E ]; }; } diff --git a/pkgs/games/extremetuxracer/default.nix b/pkgs/games/extremetuxracer/default.nix index 1c0a47e4b61..88d8598e133 100644 --- a/pkgs/games/extremetuxracer/default.nix +++ b/pkgs/games/extremetuxracer/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, libGLU, libGL, libX11, xorgproto, tcl, freeglut, freetype +{ lib, stdenv, fetchurl, libGLU, libGL, libX11, xorgproto, tcl, freeglut, freetype , sfml, libXi , libXmu, libXext, libXt, libSM, libICE -, libpng, pkgconfig, gettext, intltool +, libpng, pkg-config, gettext, intltool }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { libGLU libGL libX11 xorgproto tcl freeglut freetype sfml libXi libXmu libXext libXt libSM libICE - libpng pkgconfig gettext intltool + libpng pkg-config gettext intltool ]; configureFlags = [ "--with-tcl=${tcl}/lib" ]; @@ -31,9 +31,9 @@ stdenv.mkDerivation rec { longDescription = '' ExtremeTuxRacer - Tux lies on his belly and accelerates down ice slopes. ''; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; homepage = "https://sourceforge.net/projects/extremetuxracer/"; - maintainers = with stdenv.lib.maintainers; [ ]; - platforms = with stdenv.lib.platforms; linux; + maintainers = with lib.maintainers; [ ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/games/exult/default.nix b/pkgs/games/exult/default.nix index adbf4dd0702..e16e62f82fb 100644 --- a/pkgs/games/exult/default.nix +++ b/pkgs/games/exult/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, SDL2, libogg, libvorbis, zlib, unzip }: +{ lib, stdenv, fetchurl, pkg-config, SDL2, libogg, libvorbis, zlib, unzip }: let @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-tools" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ SDL2 libogg libvorbis zlib unzip ]; enableParallelBuilding = true; @@ -38,9 +38,9 @@ stdenv.mkDerivation rec { meta = { homepage = "http://exult.sourceforge.net/"; description = "A reimplementation of the Ultima VII game engine"; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.unix; - hydraPlatforms = stdenv.lib.platforms.linux; # darwin times out - license = stdenv.lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.eelco ]; + platforms = lib.platforms.unix; + hydraPlatforms = lib.platforms.linux; # darwin times out + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/ezquake/default.nix b/pkgs/games/ezquake/default.nix index 143a7d94015..7089c81ee35 100644 --- a/pkgs/games/ezquake/default.nix +++ b/pkgs/games/ezquake/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, curl, expat , jansson, libpng, libjpeg, libGLU, libGL, libXxf86vm, pcre -, pkgconfig, SDL2, vim, speex }: +, pkg-config, SDL2, vim, speex }: stdenv.mkDerivation rec { pname = "ezquake"; @@ -13,12 +13,12 @@ stdenv.mkDerivation rec { sha256 = "1rfp816gnp7jfd27cg1la5n1q6z2wgd9qljnlmnx7v2jixql8brf"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ expat curl jansson libpng libjpeg libGLU libGL libXxf86vm pcre SDL2 vim speex ]; - installPhase = with stdenv.lib; let + installPhase = with lib; let sys = last (splitString "-" stdenv.hostPlatform.system); arch = head (splitString "-" stdenv.hostPlatform.system); in '' diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index 4535f31f262..9db8a95746d 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, makeDesktopItem +{ lib, stdenv, fetchurl, makeWrapper, makeDesktopItem , alsaLib, libpulseaudio, libX11, libXcursor, libXinerama, libXrandr, libXi, libGL , libSM, libICE, libXext, factorio-utils , releaseType @@ -13,7 +13,7 @@ assert releaseType == "alpha" let - inherit (stdenv.lib) importJSON; + inherit (lib) importJSON; helpMsg = '' @@ -83,7 +83,7 @@ let if !needsAuth then fetchurl { inherit name url sha256; } else - (stdenv.lib.overrideDerivation + (lib.overrideDerivation (fetchurl { inherit name url sha256; curlOpts = [ @@ -168,8 +168,8 @@ let version 1.0 in mid 2020. ''; homepage = "https://www.factorio.com/"; - license = stdenv.lib.licenses.unfree; - maintainers = with stdenv.lib.maintainers; [ Baughn elitak erictapen priegger lukegb ]; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ Baughn elitak erictapen priegger lukegb ]; platforms = [ "x86_64-linux" ]; }; }; @@ -180,7 +180,7 @@ let buildInputs = [ makeWrapper libpulseaudio ]; - libPath = stdenv.lib.makeLibraryPath [ + libPath = lib.makeLibraryPath [ alsaLib libpulseaudio libX11 diff --git a/pkgs/games/factorio/mods.nix b/pkgs/games/factorio/mods.nix index 5c9b4f0628a..7327b9e2287 100644 --- a/pkgs/games/factorio/mods.nix +++ b/pkgs/games/factorio/mods.nix @@ -2,12 +2,12 @@ # mods. It will eventually be replaced by a nixos-channel that will provide # derivations for most or all of the mods tracked through the official mod # manager site. -{ stdenv, fetchurl +{ lib, fetchurl , factorio-utils , allRecommendedMods ? true , allOptionalMods ? false }: -with stdenv.lib; +with lib; let modDrv = factorio-utils.modDrv { inherit allRecommendedMods allOptionalMods; }; in diff --git a/pkgs/games/factorio/utils.nix b/pkgs/games/factorio/utils.nix index 2764592a324..be5b7fd5ecc 100644 --- a/pkgs/games/factorio/utils.nix +++ b/pkgs/games/factorio/utils.nix @@ -1,7 +1,7 @@ # This file provides a top-level function that will be used by both nixpkgs and nixos # to generate mod directories for use at runtime by factorio. -{ stdenv }: -with stdenv.lib; +{ lib, stdenv }: +with lib; { mkModDirDrv = mods: # a list of mod derivations let diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index f484d3304cb..4208df3acd0 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -2,56 +2,56 @@ "x86_64-linux": { "alpha": { "experimental": { - "name": "factorio_alpha_x64-1.1.8.tar.xz", + "name": "factorio_alpha_x64-1.1.19.tar.xz", "needsAuth": true, - "sha256": "1zvjmdmvp05yr8lln4hsa184hl115sv9xz1dwxa3cb827f5ndd6m", + "sha256": "1ip855iaw2pzgijpnp7bazj7qm3zqr2599xzaf7wx8gcdviq1k5r", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.8/alpha/linux64", - "version": "1.1.8" + "url": "https://factorio.com/get-download/1.1.19/alpha/linux64", + "version": "1.1.19" }, "stable": { - "name": "factorio_alpha_x64-1.0.0.tar.xz", + "name": "factorio_alpha_x64-1.1.19.tar.xz", "needsAuth": true, - "sha256": "0zixscff0svpb0yg8nzczp2z4filqqxi1k0z0nrpzn2hhzhf1464", + "sha256": "1ip855iaw2pzgijpnp7bazj7qm3zqr2599xzaf7wx8gcdviq1k5r", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.0.0/alpha/linux64", - "version": "1.0.0" + "url": "https://factorio.com/get-download/1.1.19/alpha/linux64", + "version": "1.1.19" } }, "demo": { "experimental": { - "name": "factorio_demo_x64-1.0.0.tar.xz", + "name": "factorio_demo_x64-1.1.19.tar.xz", "needsAuth": false, - "sha256": "0h9cqbp143w47zcl4qg4skns4cngq0k40s5jwbk0wi5asjz8whqn", + "sha256": "1p9avwkdqpaw9insji9v711rylqn9kxg0gzd8s7hdrmci3ah0ifr", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.0.0/demo/linux64", - "version": "1.0.0" + "url": "https://factorio.com/get-download/1.1.19/demo/linux64", + "version": "1.1.19" }, "stable": { - "name": "factorio_demo_x64-1.0.0.tar.xz", + "name": "factorio_demo_x64-1.1.19.tar.xz", "needsAuth": false, - "sha256": "0h9cqbp143w47zcl4qg4skns4cngq0k40s5jwbk0wi5asjz8whqn", + "sha256": "1p9avwkdqpaw9insji9v711rylqn9kxg0gzd8s7hdrmci3ah0ifr", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.0.0/demo/linux64", - "version": "1.0.0" + "url": "https://factorio.com/get-download/1.1.19/demo/linux64", + "version": "1.1.19" } }, "headless": { "experimental": { - "name": "factorio_headless_x64-1.1.8.tar.xz", + "name": "factorio_headless_x64-1.1.19.tar.xz", "needsAuth": false, - "sha256": "1j2nmm61c99qis8fkc1gp5i3fj3vmc2mfds7lw4gfr9kr956cjhf", + "sha256": "0w0ir1dzx39vq1w09ikgw956q1ilq6n0cyi50arjhgcqcg44w1ks", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.8/headless/linux64", - "version": "1.1.8" + "url": "https://factorio.com/get-download/1.1.19/headless/linux64", + "version": "1.1.19" }, "stable": { - "name": "factorio_headless_x64-1.0.0.tar.xz", + "name": "factorio_headless_x64-1.1.19.tar.xz", "needsAuth": false, - "sha256": "0r0lplns8nxna2viv8qyx9mp4cckdvx6k20w2g2fwnj3jjmf3nc1", + "sha256": "0w0ir1dzx39vq1w09ikgw956q1ilq6n0cyi50arjhgcqcg44w1ks", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.0.0/headless/linux64", - "version": "1.0.0" + "url": "https://factorio.com/get-download/1.1.19/headless/linux64", + "version": "1.1.19" } } } diff --git a/pkgs/games/fairymax/default.nix b/pkgs/games/fairymax/default.nix index b5e3afa9e3b..5c7cad879d1 100644 --- a/pkgs/games/fairymax/default.nix +++ b/pkgs/games/fairymax/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { pname = "fairymax"; version = "4.8"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = { inherit version; - description = ''A small chess engine supporting fairy pieces''; + description = "A small chess engine supporting fairy pieces"; longDescription = '' A version of micro-Max that reads the piece description from a file fmax.ini, so that arbitrary fairy pieces can be @@ -32,9 +32,9 @@ stdenv.mkDerivation rec { and board sizes up to 12x8. A Linux port exists in the format of a debian package. ''; - license = stdenv.lib.licenses.free ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.free ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; homepage = "http://home.hccnet.nl/h.g.muller/dwnldpage.html"; }; } diff --git a/pkgs/games/fish-fillets-ng/default.nix b/pkgs/games/fish-fillets-ng/default.nix index 638bf59fc78..aa93633906f 100644 --- a/pkgs/games/fish-fillets-ng/default.nix +++ b/pkgs/games/fish-fillets-ng/default.nix @@ -1,7 +1,9 @@ -{stdenv, fetchurl, SDL, lua5_1, pkgconfig, SDL_mixer, SDL_image, SDL_ttf}: +{ lib, stdenv, fetchurl, makeDesktopItem, copyDesktopItems, SDL, lua5_1, pkg-config, SDL_mixer, SDL_image, SDL_ttf }: + stdenv.mkDerivation rec { pname = "fish-fillets-ng"; version = "1.0.1"; + src = fetchurl { url = "mirror://sourceforge/fillets/fillets-ng-${version}.tar.gz"; sha256 = "1nljp75aqqb35qq3x7abhs2kp69vjcj0h1vxcpdyn2yn2nalv6ij"; @@ -10,18 +12,31 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/fillets/fillets-ng-data-${version}.tar.gz"; sha256 = "169p0yqh2gxvhdilvjc2ld8aap7lv2nhkhkg4i1hlmgc6pxpkjgh"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [SDL lua5_1 SDL_mixer SDL_image SDL_ttf]; - postInstall='' - mkdir -p "$out/share/games/fillets-ng/" - tar -xf ${data} -C "$out/share/games/fillets-ng/" --strip-components=1 + + nativeBuildInputs = [ pkg-config copyDesktopItems ]; + buildInputs = [ SDL lua5_1 SDL_mixer SDL_image SDL_ttf ]; + + desktopItems = [ (makeDesktopItem { + name = "fish-fillets-ng"; + exec = "fillets"; + icon = "fish-fillets-ng"; + desktopName = "Fish Fillets"; + comment = "Puzzle game about witty fish saving the world sokoban-style"; + categories = "Game;LogicGame;"; + }) ]; + + postInstall = '' + mkdir -p $out/share/games/fillets-ng + tar -xf ${data} -C $out/share/games/fillets-ng --strip-components=1 + install -Dm644 ${./icon.xpm} $out/share/pixmaps/fish-fillets-ng.xpm ''; - meta = { + + meta = with lib; { inherit version; - description = ''A puzzle game''; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + description = "A puzzle game"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ raskin ]; + platforms = platforms.linux; homepage = "http://fillets.sourceforge.net/"; }; } diff --git a/pkgs/games/fish-fillets-ng/icon.xpm b/pkgs/games/fish-fillets-ng/icon.xpm new file mode 100644 index 00000000000..9947c54e7e5 --- /dev/null +++ b/pkgs/games/fish-fillets-ng/icon.xpm @@ -0,0 +1,39 @@ +/* XPM */ +static char * fillets_ng_xpm[] = { +"32 32 4 1", +" c None", +". c #000000", +"+ c #808000", +"@ c #FFFF00", +" .......... ", +" ...+@@@@@@+... ", +" ...@@@@@@@@@@@@... ", +" ..+@@@+......+@@@+.. ", +" ..@@@+..........+@@@.. ", +" ..@@@..............@@@.. ", +" ..@@@................@@@.. ", +" ..@@@..................@@@.. ", +" .+@@....................@@+. ", +" ..@@......................@@.. ", +" .@@+......................+@@. ", +"..@@.....@@@@@.........@@...@@..", +".+@+...@@@@@@@@@.....@@@@...+@+.", +".@@...@@@.....@@@...@@+@@....@@.", +".@@...@@.+@....+@@+@@+.@@....@@.", +".@@..@@..@@.....+@@@+..@@....@@.", +".@@..@@.........+@@@+..@@....@@.", +".@@...@@.......+@@+@@+.@@....@@.", +".@@...@@@.....@@@...@@+@@....@@.", +".+@+...@@@@@@@@@.....@@@@...+@+.", +"..@@.....@@@@@.........@@...@@..", +" .@@+......................+@@. ", +" ..@@......................@@.. ", +" .+@@....................@@+. ", +" ..@@@..................@@@.. ", +" ..@@@................@@@.. ", +" ..@@@..............@@@.. ", +" ..@@@+..........+@@@.. ", +" ..+@@@+......+@@@+.. ", +" ...@@@@@@@@@@@@... ", +" ...+@@@@@@+... ", +" .......... "}; diff --git a/pkgs/games/flare/engine.nix b/pkgs/games/flare/engine.nix index 22a12fda054..2b2738b4108 100644 --- a/pkgs/games/flare/engine.nix +++ b/pkgs/games/flare/engine.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_ttf ] - ++ stdenv.lib.optional stdenv.isDarwin Cocoa; + ++ lib.optional stdenv.isDarwin Cocoa; meta = with lib; { description = "Free/Libre Action Roleplaying Engine"; diff --git a/pkgs/games/freecell-solver/default.nix b/pkgs/games/freecell-solver/default.nix index 1845ba825eb..065e82a0e47 100644 --- a/pkgs/games/freecell-solver/default.nix +++ b/pkgs/games/freecell-solver/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, pkgconfig, cmake +{ lib, stdenv, fetchurl, pkg-config, cmake , perl, gmp, libtap, gperf , perlPackages, python3 }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "freecell-solver"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - cmake perl pkgconfig + cmake perl pkg-config ] ++ (with perlPackages; TaskFreecellSolverTesting.buildInputs ++ [ GamesSolitaireVerify StringShellQuote TaskFreecellSolverTesting TemplateToolkit ]); diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix index 31532a6c2e2..665122c05bc 100644 --- a/pkgs/games/freeciv/default.nix +++ b/pkgs/games/freeciv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, lua5_3, pkgconfig, python3 +{ lib, stdenv, fetchFromGitHub, autoreconfHook, lua5_3, pkg-config, python3 , zlib, bzip2, curl, lzma, gettext, libiconv , sdlClient ? true, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, freetype, fluidsynth , gtkClient ? false, gtk3 @@ -8,7 +8,7 @@ }: let - inherit (stdenv.lib) optional optionals; + inherit (lib) optional optionals; in stdenv.mkDerivation rec { pname = "freeciv"; @@ -28,7 +28,8 @@ in stdenv.mkDerivation rec { done ''; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ] + ++ optional qtClient [ qt5.wrapQtAppsHook ]; buildInputs = [ lua5_3 zlib bzip2 curl lzma gettext libiconv ] ++ optionals sdlClient [ SDL SDL_mixer SDL_image SDL_ttf SDL_gfx freetype fluidsynth ] @@ -37,6 +38,8 @@ in stdenv.mkDerivation rec { ++ optional server readline ++ optional enableSqlite sqlite; + dontWrapQtApps = true; + configureFlags = [ "--enable-shared" ] ++ optional sdlClient "--enable-client=sdl" ++ optionals qtClient [ diff --git a/pkgs/games/freedink/default.nix b/pkgs/games/freedink/default.nix index 735a49bee62..c80dc2b0703 100644 --- a/pkgs/games/freedink/default.nix +++ b/pkgs/games/freedink/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx -, pkgconfig, intltool, fontconfig, libzip, zip, zlib }: +{ lib, stdenv, fetchurl, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx +, pkg-config, intltool, fontconfig, libzip, zip, zlib }: let version = "1.08.20121209"; @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { buildInputs = [ SDL SDL_mixer SDL_image SDL_ttf SDL_gfx - pkgconfig intltool fontconfig libzip zip zlib + pkg-config intltool fontconfig libzip zip zlib ]; preConfigure = '' @@ -52,10 +52,10 @@ in stdenv.mkDerivation rec { ''; homepage = "http://www.freedink.org/"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; - maintainers = [ stdenv.lib.maintainers.bjg ]; - platforms = stdenv.lib.platforms.all; - hydraPlatforms = stdenv.lib.platforms.linux; # sdl-config times out on darwin + maintainers = [ lib.maintainers.bjg ]; + platforms = lib.platforms.all; + hydraPlatforms = lib.platforms.linux; # sdl-config times out on darwin }; } diff --git a/pkgs/games/freedroid/default.nix b/pkgs/games/freedroid/default.nix new file mode 100644 index 00000000000..266407d17db --- /dev/null +++ b/pkgs/games/freedroid/default.nix @@ -0,0 +1,53 @@ +{ lib, stdenv +, fetchFromGitHub +, makeDesktopItem, copyDesktopItems +, imagemagick +, autoreconfHook +, SDL, SDL_mixer, SDL_image, SDL_gfx +, libvorbis +, libjpeg, libpng +, zlib +}: + +stdenv.mkDerivation rec { + pname = "freedroid"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "ReinhardPrix"; + repo = "FreedroidClassic"; + rev = "release-${version}"; + sha256 = "027wns25nyyc8afyhyp5a8wn13x9nlzmnqzqyyma1055xjy5imis"; + }; + + nativeBuildInputs = [ copyDesktopItems imagemagick autoreconfHook ]; + buildInputs = [ SDL SDL_image SDL_gfx SDL_mixer libjpeg libpng libvorbis zlib ]; + + postPatch = '' + touch NEWS + ''; + + postInstall = '' + mkdir -p $out/share/icons/hicolor/32x32/apps + convert graphics/paraicon.bmp $out/share/icons/hicolor/32x32/apps/freedroid.png + ''; + + desktopItems = [ (makeDesktopItem { + name = pname; + exec = pname; + icon = pname; + desktopName = "Freedroid Classic"; + comment = "A clone of the classic game 'Paradroid' on Commodore 64"; + categories = "Game;ArcadeGame;"; + }) ]; + + meta = with lib; { + description = "A clone of the classic game 'Paradroid' on Commodore 64"; + homepage = "https://github.com/ReinhardPrix/FreedroidClassic"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ iblech ]; + platforms = platforms.unix; + # Builds but fails to render to the screen at runtime. + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/games/freedroidrpg/default.nix b/pkgs/games/freedroidrpg/default.nix index aab2b748d1a..53b008d11dd 100644 --- a/pkgs/games/freedroidrpg/default.nix +++ b/pkgs/games/freedroidrpg/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, pkgconfig, gettext, python3, SDL, SDL_image, SDL_gfx, SDL_mixer, libogg, libvorbis, lua5_3, libjpeg, libpng, zlib, libiconv }: +{ fetchurl, lib, stdenv, pkg-config, gettext, python3, SDL, SDL_image, SDL_gfx, SDL_mixer, libogg, libvorbis, lua5_3, libjpeg, libpng, zlib, libiconv }: let version = "0.16.1"; @@ -7,15 +7,15 @@ in stdenv.mkDerivation { inherit version; src = fetchurl { - url = "ftp://ftp.osuosl.org/pub/freedroid/freedroidRPG-${stdenv.lib.versions.majorMinor version}/freedroidRPG-${version}.tar.gz"; + url = "ftp://ftp.osuosl.org/pub/freedroid/freedroidRPG-${lib.versions.majorMinor version}/freedroidRPG-${version}.tar.gz"; sha256 = "0n4kn38ncmcy3lrxmq8fjry6c1z50z4q1zcqfig0j4jb0dsz2va2"; }; - nativeBuildInputs = [ pkgconfig gettext python3 ]; + nativeBuildInputs = [ pkg-config gettext python3 ]; buildInputs = [ SDL SDL_image SDL_gfx SDL_mixer libogg libvorbis lua5_3 libjpeg libpng zlib - ] ++ stdenv.lib.optional stdenv.isDarwin libiconv; + ] ++ lib.optional stdenv.isDarwin libiconv; meta = with lib; { description = "Isometric 3D RPG similar to game Diablo"; diff --git a/pkgs/games/frogatto/data.nix b/pkgs/games/frogatto/data.nix index a077d01f3b6..e911709dffc 100644 --- a/pkgs/games/frogatto/data.nix +++ b/pkgs/games/frogatto/data.nix @@ -1,9 +1,9 @@ { lib, stdenv, fetchFromGitHub }: - + stdenv.mkDerivation { pname = "frogatto-data"; version = "unstable-2018-12-18"; - + src = fetchFromGitHub { owner = "frogatto"; repo = "frogatto"; diff --git a/pkgs/games/frogatto/default.nix b/pkgs/games/frogatto/default.nix index fb09847908d..69d5282aedc 100644 --- a/pkgs/games/frogatto/default.nix +++ b/pkgs/games/frogatto/default.nix @@ -1,4 +1,4 @@ -{ buildEnv, lib, stdenv, callPackage, makeWrapper, makeDesktopItem }: +{ buildEnv, lib, callPackage, makeWrapper, makeDesktopItem }: let description = "Action-adventure game, starring a certain quixotic frog"; diff --git a/pkgs/games/frogatto/engine.nix b/pkgs/games/frogatto/engine.nix index 74499263650..4ebf22b46b0 100644 --- a/pkgs/games/frogatto/engine.nix +++ b/pkgs/games/frogatto/engine.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, which , boost, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf -, glew, zlib, icu, pkgconfig, cairo, libvpx }: +, glew, zlib, icu, pkg-config, cairo, libvpx }: stdenv.mkDerivation { pname = "anura-engine"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ - which pkgconfig + which pkg-config ]; buildInputs = [ diff --git a/pkgs/games/frozen-bubble/default.nix b/pkgs/games/frozen-bubble/default.nix index 3b562ee44f2..6883acb6014 100644 --- a/pkgs/games/frozen-bubble/default.nix +++ b/pkgs/games/frozen-bubble/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perlPackages, pkgconfig, SDL, SDL_mixer, SDL_Pango, glib }: +{ lib, fetchurl, perlPackages, pkg-config, SDL, SDL_mixer, SDL_Pango, glib }: perlPackages.buildPerlModule { pname = "frozen-bubble"; @@ -10,7 +10,7 @@ perlPackages.buildPerlModule { }; patches = [ ./fix-compilation.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib SDL SDL_mixer SDL_Pango perlPackages.SDL perlPackages.FileSlurp ]; propagatedBuildInputs = with perlPackages; [ AlienSDL CompressBzip2 FileShareDir FileWhich IPCSystemSimple LocaleMaketextLexicon ]; @@ -19,7 +19,7 @@ perlPackages.buildPerlModule { meta = { description = "Puzzle with Bubbles"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ puckipedia ]; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ puckipedia ]; }; } diff --git a/pkgs/games/fsg/default.nix b/pkgs/games/fsg/default.nix index b8a0d5ff3c7..dd6d46ec6a2 100644 --- a/pkgs/games/fsg/default.nix +++ b/pkgs/games/fsg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk2, glib, pkgconfig, libGLU, libGL, wxGTK, libX11, xorgproto +{ lib, stdenv, fetchurl, gtk2, glib, pkg-config, libGLU, libGL, wxGTK, libX11, xorgproto , runtimeShell }: stdenv.mkDerivation { @@ -12,7 +12,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 glib libGLU libGL wxGTK libX11 xorgproto ]; preBuild = '' @@ -31,7 +31,7 @@ stdenv.mkDerivation { meta = { description = "Cellular automata engine tuned towards the likes of Falling Sand"; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/galaxis/default.nix b/pkgs/games/galaxis/default.nix index 19df8db78a0..a3847e73c8d 100644 --- a/pkgs/games/galaxis/default.nix +++ b/pkgs/games/galaxis/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, ncurses, xmlto }: +{ lib, stdenv, fetchurl, ncurses, xmlto }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "galaxis"; diff --git a/pkgs/games/gargoyle/default.nix b/pkgs/games/gargoyle/default.nix index 78bffaf16af..bd592dbc55d 100644 --- a/pkgs/games/gargoyle/default.nix +++ b/pkgs/games/gargoyle/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, substituteAll, jam, cctools, pkgconfig +{ lib, stdenv, fetchFromGitHub, substituteAll, jam, cctools, pkg-config , SDL, SDL_mixer, SDL_sound, gtk2, libvorbis, smpeg }: let @@ -30,10 +30,10 @@ stdenv.mkDerivation rec { sha256 = "0w54avmbp4i4zps2rb4acmpa641s6wvwbrln4vbdhcz97fx48nzz"; }; - nativeBuildInputs = [ jam pkgconfig ] ++ stdenv.lib.optional stdenv.isDarwin cctools; + nativeBuildInputs = [ jam pkg-config ] ++ lib.optional stdenv.isDarwin cctools; buildInputs = [ SDL SDL_mixer SDL_sound gtk2 ] - ++ stdenv.lib.optionals stdenv.isDarwin [ smpeg libvorbis ]; + ++ lib.optionals stdenv.isDarwin [ smpeg libvorbis ]; buildPhase = jamenv + "jam -j$NIX_BUILD_CORES"; diff --git a/pkgs/games/gav/default.nix b/pkgs/games/gav/default.nix index e42afefb830..b8390455377 100644 --- a/pkgs/games/gav/default.nix +++ b/pkgs/games/gav/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, SDL, SDL_image, SDL_mixer, SDL_net} : +{lib, stdenv, fetchurl, SDL, SDL_image, SDL_mixer, SDL_net} : stdenv.mkDerivation { name = "gav-0.9.0"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "Remake of AV Arcade Volleyball"; homepage = "http://gav.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/gimx/default.nix b/pkgs/games/gimx/default.nix new file mode 100644 index 00000000000..727945ff2b4 --- /dev/null +++ b/pkgs/games/gimx/default.nix @@ -0,0 +1,72 @@ +{ stdenv, lib, fetchFromGitHub, makeWrapper, curl, libusb1, xorg, libxml2 +, ncurses5, bluez, libmhash, gimxAuth ? "" }: + +let + gimx-config = fetchFromGitHub { + owner = "matlo"; + repo = "GIMX-configurations"; + rev = "f31bba7d3be57519540be290cd69ba6a8dc4e4d4"; + sha256 = "0wpxx2qxyiiblz2qrl5swg00ls1aq7i5vzlk0qlnqdq8ss8jssax"; + }; + +in stdenv.mkDerivation rec { + pname = "gimx"; + version = "8.0"; + + src = fetchFromGitHub { + owner = "matlo"; + repo = "GIMX"; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "0265gg6q7ymg76fb4pjrfdwjd280b3zzry96qy92w0h411slph85"; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ + curl libusb1 bluez libxml2 ncurses5 libmhash + xorg.libX11 xorg.libXi xorg.libXext + ]; + + patches = [ ./env.patch ]; + prePatch = (if gimxAuth == "afterglow" then (import ./variant.nix).afterglow + else ""); + + makeFlags = "build-core"; + installPhase = '' + runHook preInstall + + mkdir -p $out + substituteInPlace ./core/Makefile --replace "chmod ug+s" "echo" + + export DESTDIR="$out" + make install-shared install-core + mv $out/usr/lib $out/lib + mv $out/usr/bin $out/bin + rmdir $out/usr + + runHook postInstall + ''; + + postInstall = '' + mkdir -p $out/share + cp -r ./loader/firmware $out/share/firmware + cp -r ${gimx-config}/Linux $out/share/config + patch ${gimx-config}/Linux/Dualshock4.xml ${./ds4.patch} -o $out/share/DS4_noff.xml + + makeWrapper $out/bin/gimx $out/bin/gimx-with-confs \ + --set GIMXCONF $out/share + + makeWrapper $out/bin/gimx $out/bin/gimx-test-ds4 \ + --set GIMXCONF $out/share \ + --add-flags "--nograb" --add-flags "--curses" \ + --add-flags "-p /dev/ttyUSB0" --add-flags "-c DS4_noff.xml" + ''; + + meta = with lib; { + homepage = "https://github.com/matlo/GIMX"; + description = "Game Input Multiplexer"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [ bb2020 ]; + }; +} diff --git a/pkgs/games/gimx/ds4.patch b/pkgs/games/gimx/ds4.patch new file mode 100644 index 00000000000..86b36adda23 --- /dev/null +++ b/pkgs/games/gimx/ds4.patch @@ -0,0 +1,16 @@ +diff --git a/Linux/Dualshock4.xml b/Linux/Dualshock4.xml +index 5e53ed3..45ee5ed 100644 +--- a/Linux/Dualshock4.xml ++++ b/Linux/Dualshock4.xml +@@ -94,6 +94,11 @@ + </axis> + </axis_map> + <joystick_corrections_list/> ++ <force_feedback> ++ <device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/> ++ <inversion enable="no"/> ++ <gain rumble="0" constant="0" spring="0" damper="0"/> ++ </force_feedback> + </configuration> + </controller> + </root> diff --git a/pkgs/games/gimx/env.patch b/pkgs/games/gimx/env.patch new file mode 100644 index 00000000000..e1f8ed8bb6f --- /dev/null +++ b/pkgs/games/gimx/env.patch @@ -0,0 +1,30 @@ +--- a/core/config_reader.c ++++ b/core/config_reader.c +@@ -1353,8 +1353,10 @@ static int read_file(char* file_path) + int read_config_file(const char* file) + { + char file_path[PATH_MAX]; +- +- snprintf(file_path, sizeof(file_path), "%s%s%s%s", gimx_params.homedir, GIMX_DIR, CONFIG_DIR, file); ++ char* e = getenv("GIMXCONF"); if (e) { snprintf(file_path, sizeof(file_path), "%s/%s", e, file); } ++ else { ++ snprintf(file_path, sizeof(file_path), "%s%s%s%s", gimx_params.homedir, GIMX_DIR, CONFIG_DIR, file); ++ } + + if(read_file(file_path) == -1) + { +--- a/core/gimx.c ++++ b/core/gimx.c +@@ -190,8 +190,10 @@ void show_config() + } + + char file_path[PATH_MAX]; +- +- snprintf(file_path, sizeof(file_path), "%s%s%s%s", gimx_params.homedir, GIMX_DIR, CONFIG_DIR, gimx_params.config_file); ++ char* e = getenv("GIMXCONF"); if (e) { snprintf(file_path, sizeof(file_path), "%s/%s", e, gimx_params.config_file); } ++ else { ++ snprintf(file_path, sizeof(file_path), "%s%s%s%s", gimx_params.homedir, GIMX_DIR, CONFIG_DIR, gimx_params.config_file); ++ } + + FILE * fp = gfile_fopen(file_path, "r"); + if (fp == NULL) diff --git a/pkgs/games/gimx/variant.nix b/pkgs/games/gimx/variant.nix new file mode 100644 index 00000000000..8396f72b4e7 --- /dev/null +++ b/pkgs/games/gimx/variant.nix @@ -0,0 +1,14 @@ +{ + afterglow = '' + substituteInPlace ./shared/gimxcontroller/include/x360.h \ + --replace "0x045e" "0x0e6f" --replace "0x028e" "0x0213" + + HEX="./loader/firmware/EMU360.hex" + sed -i '34s|1B2100|1B2110|' "$HEX" + sed -i '38s|092100|092110|' "$HEX" + sed -i '40s|5E048E021001|6F0E13020001|' "$HEX" + sed -i '34s|1C\r|0C\r|' "$HEX" + sed -i '38s|FE\r|EE\r|' "$HEX" + sed -i '40s|6D\r|DD\r|' "$HEX" + ''; +} diff --git a/pkgs/games/globulation/default.nix b/pkgs/games/globulation/default.nix index f25b1084b85..9150541afd0 100644 --- a/pkgs/games/globulation/default.nix +++ b/pkgs/games/globulation/default.nix @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { patches = [ ./header-order.patch ./public-buildproject.patch (fetchpatch { - url = "https://bitbucket.org/giszmo/glob2/commits/c9dc715624318e4fea4abb24e04f0ebdd9cd8d2a/raw"; - sha256 = "0017xg5agj3dy0hx71ijdcrxb72bjqv7x6aq7c9zxzyyw0mkxj0k"; - }) + url = "https://bitbucket.org/giszmo/glob2/commits/c9dc715624318e4fea4abb24e04f0ebdd9cd8d2a/raw"; + sha256 = "0017xg5agj3dy0hx71ijdcrxb72bjqv7x6aq7c9zxzyyw0mkxj0k"; + }) ]; postPatch = '' diff --git a/pkgs/games/gltron/default.nix b/pkgs/games/gltron/default.nix index f6d74b6e9b7..45267579c9b 100644 --- a/pkgs/games/gltron/default.nix +++ b/pkgs/games/gltron/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, SDL, libGLU, libGL, zlib, libpng, libvorbis, libmikmod, SDL_sound } : +{lib, stdenv, fetchurl, SDL, libGLU, libGL, zlib, libpng, libvorbis, libmikmod, SDL_sound } : stdenv.mkDerivation rec { name = "gltron-0.70"; @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.gltron.org/"; description = "Game based on the movie Tron"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/games/gmad/default.nix b/pkgs/games/gmad/default.nix index aad53a7915a..eb893882ff5 100644 --- a/pkgs/games/gmad/default.nix +++ b/pkgs/games/gmad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, premake4, bootil }: +{ lib, stdenv, fetchFromGitHub, premake4, bootil }: stdenv.mkDerivation rec { name = "gmad-unstable-2015-04-16"; @@ -6,9 +6,9 @@ stdenv.mkDerivation rec { meta = { description = "Garry's Mod Addon Creator and Extractor"; homepage = "https://github.com/garrynewman/gmad"; - license = stdenv.lib.licenses.unfree; - maintainers = [ stdenv.lib.maintainers.abigailbuccaneer ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.abigailbuccaneer ]; + platforms = lib.platforms.all; }; src = fetchFromGitHub { diff --git a/pkgs/games/gnubg/default.nix b/pkgs/games/gnubg/default.nix index edfde5ea3e9..feff18e9bb6 100644 --- a/pkgs/games/gnubg/default.nix +++ b/pkgs/games/gnubg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, python, gtk2, readline }: +{ lib, stdenv, fetchurl, pkg-config, glib, python, gtk2, readline }: let version = "1.06.002"; in stdenv.mkDerivation { @@ -9,12 +9,12 @@ stdenv.mkDerivation { sha256 = "11xwhcli1h12k6rnhhyq4jphzrhfik7i8ah3k32pqw803460n6yf"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ python glib gtk2 readline ]; configureFlags = [ "--with-gtk" "--with--board3d" ]; - meta = with stdenv.lib; + meta = with lib; { description = "World class backgammon application"; homepage = "http://www.gnubg.org/"; license = licenses.gpl3; diff --git a/pkgs/games/gnuchess/default.nix b/pkgs/games/gnuchess/default.nix index a7b27933496..69ec574a644 100644 --- a/pkgs/games/gnuchess/default.nix +++ b/pkgs/games/gnuchess/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, flex, makeWrapper}: +{lib, stdenv, fetchurl, flex, makeWrapper}: let s = # Generated upstream information rec { @@ -28,8 +28,8 @@ stdenv.mkDerivation { meta = { inherit (s) version; description = "GNU Chess engine"; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.gpl3Plus; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.unix; + license = lib.licenses.gpl3Plus; }; } diff --git a/pkgs/games/gnugo/default.nix b/pkgs/games/gnugo/default.nix index 069d14756e3..e33c27bf9eb 100644 --- a/pkgs/games/gnugo/default.nix +++ b/pkgs/games/gnugo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "gnugo"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "GNU Go - A computer go player"; homepage = "https://www.gnu.org/software/gnugo/"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl3; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/games/gnujump/default.nix b/pkgs/games/gnujump/default.nix index 240481b7bba..6f91b103458 100644 --- a/pkgs/games/gnujump/default.nix +++ b/pkgs/games/gnujump/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, SDL, SDL_image, SDL_mixer }: +{ lib, stdenv, makeDesktopItem, copyDesktopItems, fetchurl, SDL, SDL_image, SDL_mixer }: stdenv.mkDerivation rec { pname = "gnujump"; @@ -7,10 +7,25 @@ stdenv.mkDerivation rec { url = "mirror://gnu/gnujump/${pname}-${version}.tar.gz"; sha256 = "05syy9mzbyqcfnm0hrswlmhwlwx54f0l6zhcaq8c1c0f8dgzxhqk"; }; + + nativeBuildInputs = [ copyDesktopItems ]; buildInputs = [ SDL SDL_image SDL_mixer ]; NIX_LDFLAGS = "-lm"; + desktopItems = [ (makeDesktopItem { + name = "gnujump"; + exec = "gnujump"; + icon = "gnujump"; + desktopName = "GNUjump"; + comment = "Jump up the tower to survive"; + categories = "Game;ArcadeGame;"; + }) ]; + + postInstall = '' + install -Dm644 ${./gnujump.xpm} $out/share/pixmaps/gnujump.xpm + ''; + meta = with lib; { homepage = "https://jump.gnu.sinusoid.es/index.php?title=Main_Page"; description = "A clone of the simple yet addictive game Xjump"; diff --git a/pkgs/games/gnujump/gnujump.xpm b/pkgs/games/gnujump/gnujump.xpm new file mode 100644 index 00000000000..d8b6bcb4c8c --- /dev/null +++ b/pkgs/games/gnujump/gnujump.xpm @@ -0,0 +1,64 @@ +/* XPM */ +static char *gnujump[] = { +/* columns rows colors chars-per-pixel */ +"32 32 26 1 ", +" c black", +". c #D10000", +"X c #E80000", +"o c #E90000", +"O c #F90000", +"+ c red", +"@ c #00C500", +"# c #00DC00", +"$ c #00DD00", +"% c #00EF00", +"& c #00FA00", +"* c #00FB00", +"= c green", +"- c #FFC882", +"; c #FFC982", +": c #FFD298", +"> c #FFD299", +", c #FFD399", +"< c #FFDAAB", +"1 c #FFDBAB", +"2 c #FFDBAC", +"3 c #FFE1BA", +"4 c #FFE5C3", +"5 c #FFE5C4", +"6 c #FFE7C7", +"7 c None", +/* pixels */ +"77777777777777777777777777777777", +"77777777777777777777777777777777", +"7777777777777 77777777777777", +"77777777777 777777777777", +"7777777777 77777777777", +"777777777 7777777777", +"777777777 ;;;-- 7777777777", +"77777777 ::>>,>1: 777777777", +"77777777 :<1<1:>2: 777777777", +"77777777 :1331: :: 7777 7777", +"77777777 :<3431: :, 777 o 777", +"777 777 ->236531>:2: 77 oo 777", +"77 .o 77 -,145443<1, 77 oOo 777", +"77 .ooo 7 -:13333312: 7 oOo 7777", +"777 oOOo :,11<<<:: oOOo 7777", +"7777 XOOooo :::>: XooO+Oo 7777", +"77777 oOOOOoo ooOOO+Oo 77777", +"777777 oOO+OOoooooOO++OOo 777777", +"7777777 XoOOOOOOOOOOOOoo 7777777", +"77777777 oooooooooooo 77777777", +"7777777777 7777777777", +"777777777 @@@@@@@@@@@@ 7777777", +"77777777 #######$$##$#### 777777", +"7777777 #%%%%%%%%%%%%%%%%# 77777", +"7777777 #%*&*&*%%%%%%*&*%# 77777", +"777777 #%*=**%%#####$%%&*%# 7777", +"777777 #%&*%%## ##%&%# 7777", +"77777 #%*%%## 777777 #%%# 7777", +"77777 #%%#$ 777777777 #%%# 777", +"7777 @%## 777777777777 #%# 777", +"7777 ## 7777777777777777 $# 777", +"77777 7777777777777777777 7777" +}; diff --git a/pkgs/games/gogui/default.nix b/pkgs/games/gogui/default.nix index b13a145ff5e..8eb989a8f47 100644 --- a/pkgs/games/gogui/default.nix +++ b/pkgs/games/gogui/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, openjdk, unzip, makeWrapper }: +{ fetchurl, lib, stdenv, openjdk, unzip, makeWrapper }: let version = "1.4.9"; @@ -20,10 +20,10 @@ in stdenv.mkDerivation { done ''; meta = { - maintainers = [ stdenv.lib.maintainers.cleverca22 ]; + maintainers = [ lib.maintainers.cleverca22 ]; description = "A graphical user interface to programs that play the board game Go and support the Go Text Protocol such as GNU Go"; homepage = "http://gogui.sourceforge.net/"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.gpl3; + platforms = lib.platforms.unix; + license = lib.licenses.gpl3; }; } diff --git a/pkgs/games/gscrabble/default.nix b/pkgs/games/gscrabble/default.nix index 7d63510aa99..74411d63d3e 100644 --- a/pkgs/games/gscrabble/default.nix +++ b/pkgs/games/gscrabble/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, fetchFromGitHub +{ lib, buildPythonApplication, fetchFromGitHub , gtk3, wrapGAppsHook, gst_all_1, gobject-introspection , python3Packages, gnome3 }: diff --git a/pkgs/games/gshogi/default.nix b/pkgs/games/gshogi/default.nix index 5ed4bf5a376..c3479f6758a 100644 --- a/pkgs/games/gshogi/default.nix +++ b/pkgs/games/gshogi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, fetchFromGitHub +{ lib, buildPythonApplication, fetchFromGitHub , gtk3, gobject-introspection , wrapGAppsHook, python3Packages }: diff --git a/pkgs/games/gtetrinet/default.nix b/pkgs/games/gtetrinet/default.nix index f3cc9ab0006..32ee954408d 100644 --- a/pkgs/games/gtetrinet/default.nix +++ b/pkgs/games/gtetrinet/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, autoreconfHook, intltool, pkgconfig, libgnome, libgnomeui, GConf }: +{ fetchFromGitHub, lib, stdenv, autoreconfHook, intltool, pkg-config, libgnome, libgnomeui, GConf }: stdenv.mkDerivation { name = "gtetrinet-0.7.11"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "1y05x8lfyxvkjg6c87cfd0xxmb22c88scx8fq3gah7hjy5i42v93"; }; - nativeBuildInputs = [ autoreconfHook intltool pkgconfig ]; + nativeBuildInputs = [ autoreconfHook intltool pkg-config ]; buildInputs = [ libgnome libgnomeui ]; @@ -37,8 +37,8 @@ stdenv.mkDerivation { that is played over the internet. ''; homepage = "http://gtetrinet.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.chris-martin ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.chris-martin ]; }; } diff --git a/pkgs/games/gtypist/default.nix b/pkgs/games/gtypist/default.nix index 52794ca3218..d0ddf43fe2a 100644 --- a/pkgs/games/gtypist/default.nix +++ b/pkgs/games/gtypist/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ makeWrapper ncurses perl fortune ] - ++ stdenv.lib.optional stdenv.isDarwin libiconv; + ++ lib.optional stdenv.isDarwin libiconv; preFixup = '' wrapProgram "$out/bin/typefortune" \ diff --git a/pkgs/games/gweled/default.nix b/pkgs/games/gweled/default.nix index faa6a225ed7..b15bb43a451 100644 --- a/pkgs/games/gweled/default.nix +++ b/pkgs/games/gweled/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchbzr, intltool -, gtk2, wrapGAppsHook, autoreconfHook, pkgconfig +, gtk2, wrapGAppsHook, autoreconfHook, pkg-config , libmikmod, librsvg, libcanberra-gtk2, hicolor-icon-theme }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { doCheck = false; - nativeBuildInputs = [ wrapGAppsHook intltool autoreconfHook pkgconfig ]; + nativeBuildInputs = [ wrapGAppsHook intltool autoreconfHook pkg-config ]; buildInputs = [ gtk2 libmikmod librsvg hicolor-icon-theme libcanberra-gtk2 ]; diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix index edfe13c9821..8ab54468c00 100644 --- a/pkgs/games/gzdoom/default.nix +++ b/pkgs/games/gzdoom/default.nix @@ -1,21 +1,21 @@ { lib, stdenv, fetchFromGitHub, cmake, makeWrapper, openal, fluidsynth_1 , soundfont-fluid, libGL, SDL2, bzip2, zlib, libjpeg, libsndfile, mpg123 -, game-music-emu, pkgconfig }: +, game-music-emu, pkg-config }: let zmusic-src = fetchFromGitHub { owner = "coelckers"; repo = "zmusic"; - rev = "2d0ea861174f9e2031400ab29f5bcc8425521cc6"; - sha256 = "1ac7lhbzwfr0fsyv7n70hvb8imzngxn1qyanmv9j26j0h90hhl8a"; + rev = "bff02053bea30bd789e45f60b90db3ffc69c8cc8"; + sha256 = "0vpr79gpdbhslg5qxyd1qxlv5akgli26skm1vb94yd8v69ymdcy2"; }; zmusic = stdenv.mkDerivation { pname = "zmusic"; - version = "1.1.0"; + version = "1.1.3"; src = zmusic-src; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; preConfigure = '' sed -i \ @@ -28,17 +28,17 @@ let gzdoom = stdenv.mkDerivation rec { pname = "gzdoom"; - version = "4.4.2"; + version = "4.5.0"; src = fetchFromGitHub { owner = "coelckers"; repo = "gzdoom"; rev = "g${version}"; - sha256 = "1xkkmbsdv64wyb9r2fv5mwyqw0bjryk528jghdrh47pndmjs9a38"; + sha256 = "0kmqnyhdi5psi7zwrx9j3pz0cplypsvhg4cr8w2jbawh6jb71sk9"; fetchSubmodules = true; }; - nativeBuildInputs = [ cmake makeWrapper pkgconfig ]; + nativeBuildInputs = [ cmake makeWrapper pkg-config ]; buildInputs = [ SDL2 libGL diff --git a/pkgs/games/harmonist/default.nix b/pkgs/games/harmonist/default.nix index 0705da6bfe9..4609f7d732c 100644 --- a/pkgs/games/harmonist/default.nix +++ b/pkgs/games/harmonist/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, buildGoPackage}: +{lib, fetchurl, buildGoPackage}: buildGoPackage rec { diff --git a/pkgs/games/hawkthorne/default.nix b/pkgs/games/hawkthorne/default.nix index 81984530992..3da78349dbb 100644 --- a/pkgs/games/hawkthorne/default.nix +++ b/pkgs/games/hawkthorne/default.nix @@ -1,4 +1,4 @@ -{ fetchgit, stdenv, love, curl, zip }: +{ fetchgit, lib, stdenv, love, curl, zip }: stdenv.mkDerivation { version = "0.12.1"; @@ -32,8 +32,8 @@ stdenv.mkDerivation { Hawthorne's inheritance. ''; homepage = "https://www.reddit.com/r/hawkthorne"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ campadrenalin ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ campadrenalin ]; broken = true; }; } diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix index f31a44e97c0..ea714d8bc7c 100644 --- a/pkgs/games/hedgewars/default.nix +++ b/pkgs/games/hedgewars/default.nix @@ -1,5 +1,5 @@ { mkDerivation, SDL2_image, SDL2_ttf, SDL2_net, fpc, ghcWithPackages, ffmpeg_3, freeglut -, lib, fetchurl, cmake, pkgconfig, lua5_1, SDL2, SDL2_mixer +, lib, fetchurl, cmake, pkg-config, lua5_1, SDL2, SDL2_mixer , zlib, libpng, libGL, libGLU, physfs , qtbase, qttools , llvm @@ -23,7 +23,7 @@ mkDerivation rec { sha256 = "0nqm9w02m0xkndlsj6ys3wr0ik8zc14zgilq7k6fwjrf3zk385i1"; }; - nativeBuildInputs = [ cmake pkgconfig qttools ]; + nativeBuildInputs = [ cmake pkg-config qttools ]; buildInputs = [ SDL2_ttf SDL2_net SDL2 SDL2_mixer SDL2_image diff --git a/pkgs/games/hhexen/default.nix b/pkgs/games/hhexen/default.nix new file mode 100644 index 00000000000..0306c54ef4e --- /dev/null +++ b/pkgs/games/hhexen/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchurl, SDL, stdenv }: + +stdenv.mkDerivation rec { + name = "hhexen"; + version = "1.6.3"; + src = fetchurl { + url = "mirror://sourceforge/hhexen/hhexen-${version}-src.tgz"; + sha256 = "1jwccqawbdn0rjn5p59j21rjy460jdhps7zwn2z0gq9biggw325b"; + }; + + buildInputs = [ SDL ]; + installPhase = '' + install -Dm755 hhexen-gl -t $out/bin + ''; + + meta = with lib; { + description = "Linux port of Raven Game's Hexen"; + homepage = "http://hhexen.sourceforge.net/hhexen.html"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ djanatyn ]; + }; +} diff --git a/pkgs/games/icbm3d/default.nix b/pkgs/games/icbm3d/default.nix index 71ecfacb37e..7edf7cd477e 100644 --- a/pkgs/games/icbm3d/default.nix +++ b/pkgs/games/icbm3d/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libX11}: +{lib, stdenv, fetchurl, libX11}: stdenv.mkDerivation { name = "icbm3d-0.4"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.newbreedsoftware.com/icbm3d/"; description = "3D vector-based clone of the atari game Missile Command"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/instead/default.nix b/pkgs/games/instead/default.nix index 02a54dc7604..5c35219c19b 100644 --- a/pkgs/games/instead/default.nix +++ b/pkgs/games/instead/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, SDL2, SDL2_ttf, SDL2_image, SDL2_mixer, pkgconfig, lua, zlib, unzip }: +{ lib, stdenv, fetchurl, SDL2, SDL2_ttf, SDL2_image, SDL2_mixer, pkg-config, lua, zlib, unzip }: let version = "3.3.2"; @@ -38,7 +38,7 @@ stdenv.mkDerivation { NIX_LDFLAGS = "-llua -lgcc_s"; - nativeBuildInputs = [ pkgconfig unzip ]; + nativeBuildInputs = [ pkg-config unzip ]; buildInputs = [ SDL2 SDL2_ttf SDL2_image SDL2_mixer lua zlib ]; postPatch = '' @@ -65,8 +65,8 @@ stdenv.mkDerivation { meta = with lib; { description = "Simple text adventure interpreter for Unix and Windows"; homepage = "https://instead.syscall.ru/"; - license = stdenv.lib.licenses.gpl2; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2; + platforms = with lib.platforms; linux; maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/games/ivan/default.nix b/pkgs/games/ivan/default.nix index 459d1a69633..3ec196b7373 100644 --- a/pkgs/games/ivan/default.nix +++ b/pkgs/games/ivan/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, SDL2, SDL2_mixer, alsaLib, libpng +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, SDL2, SDL2_mixer, alsaLib, libpng , pcre, makeDesktopItem }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "04jzs8wad2b3g9hvnijr4r89iiw6b1i44zdzkg0dy447lrw6l6xc"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ SDL2 SDL2_mixer alsaLib libpng pcre ]; diff --git a/pkgs/games/julius/default.nix b/pkgs/games/julius/default.nix index c11e93670cf..84e80d7d632 100644 --- a/pkgs/games/julius/default.nix +++ b/pkgs/games/julius/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "julius"; - version = "1.5.1"; + version = "1.6.0"; src = fetchFromGitHub { owner = "bvschaik"; repo = "julius"; rev = "v${version}"; - sha256 = "10d6py1cmkq8lnb5h3w8rdpp4fmpd1wgqkgiabdghqxi7b2s0g4b"; + sha256 = "0nfdn8n6ywhm69ckz9a1chl5xxiqyaj3l337wadsbppnpscjihrc"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/games/jumpnbump/default.nix b/pkgs/games/jumpnbump/default.nix index d81aece0e82..b502b4f1396 100644 --- a/pkgs/games/jumpnbump/default.nix +++ b/pkgs/games/jumpnbump/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitLab , fetchzip , SDL2, SDL2_mixer, SDL2_net @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { wrapPythonPrograms ''; - meta = with stdenv.lib; { + meta = with lib; { description = "cute, true multiplayer platform game with bunnies"; homepage = "https://libregames.gitlab.io/jumpnbump/"; license = licenses.gpl2Plus; diff --git a/pkgs/games/katago/default.nix b/pkgs/games/katago/default.nix index 9499d47c42f..283aa70f8d0 100644 --- a/pkgs/games/katago/default.nix +++ b/pkgs/games/katago/default.nix @@ -1,43 +1,32 @@ { stdenv , gcc8Stdenv -, lib -, libzip , boost , cmake -, makeWrapper +, cudatoolkit +, cudnn +, eigen , fetchFromGitHub , fetchpatch -, cudnn ? null -, cudatoolkit ? null -, mesa ? null -, opencl-headers ? null -, ocl-icd ? null -, gperftools ? null -, eigen ? null +, gperftools +, lib +, libzip +, makeWrapper +, mesa +, ocl-icd +, opencl-headers +, openssl +, writeShellScriptBin , enableAVX2 ? stdenv.hostPlatform.avx2Support , enableBigBoards ? false , enableCuda ? false +, enableContrib ? false , enableGPU ? true , enableTcmalloc ? true }: assert !enableGPU -> ( - eigen != null && !enableCuda); -assert enableCuda -> ( - mesa != null && - cudatoolkit != null && - cudnn != null); - -assert !enableCuda -> ( - !enableGPU || ( - opencl-headers != null && - ocl-icd != null)); - -assert enableTcmalloc -> ( - gperftools != null); - let env = if enableCuda then gcc8Stdenv @@ -45,15 +34,18 @@ let in env.mkDerivation rec { pname = "katago"; - version = "1.6.1"; + version = "1.8.0"; + githash = "8ffda1fe05c69c67342365013b11225d443445e8"; src = fetchFromGitHub { owner = "lightvector"; repo = "katago"; rev = "v${version}"; - sha256 = "030ff9prnvpadgcb4x4hx6b6ggg10bwqcj8vd8nwrdz9sjq67yf7"; + sha256 = "18r75xjj6vv2gbl92k9aa5bd0cxf09zl1vxlji148y0xbvgv6p8c"; }; + fakegit = writeShellScriptBin "git" "echo ${githash}"; + nativeBuildInputs = [ cmake makeWrapper @@ -70,6 +62,8 @@ in env.mkDerivation rec { ] ++ lib.optionals (enableGPU && !enableCuda) [ opencl-headers ocl-icd + ] ++ lib.optionals enableContrib [ + openssl ] ++ lib.optionals enableTcmalloc [ gperftools ]; @@ -84,6 +78,10 @@ in env.mkDerivation rec { "-DUSE_BACKEND=CUDA" ] ++ lib.optionals (enableGPU && !enableCuda) [ "-DUSE_BACKEND=OPENCL" + ] ++ lib.optionals enableContrib [ + "-DBUILD_DISTRIBUTED=1" + "-DNO_GIT_REVISION=OFF" + "-DGIT_EXECUTABLE=${fakegit}/bin/git" ] ++ lib.optionals enableTcmalloc [ "-DUSE_TCMALLOC=ON" ] ++ lib.optionals enableBigBoards [ diff --git a/pkgs/games/keeperrl/default.nix b/pkgs/games/keeperrl/default.nix index 568a0449ac2..bd49b821f9e 100644 --- a/pkgs/games/keeperrl/default.nix +++ b/pkgs/games/keeperrl/default.nix @@ -33,9 +33,9 @@ stdenv.mkDerivation rec { sourceRoot = "source"; - srcs = [ free-src ] ++ stdenv.lib.optional unfree_assets assets; + srcs = [ free-src ] ++ lib.optional unfree_assets assets; - postUnpack = stdenv.lib.optionalString unfree_assets '' + postUnpack = lib.optionalString unfree_assets '' mv data $sourceRoot ''; @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { cp -r data_free $out/share cp -r data_contrib $out/share - ${stdenv.lib.optionalString unfree_assets "cp -r data $out/share"} + ${lib.optionalString unfree_assets "cp -r data $out/share"} ''; meta = with lib; { diff --git a/pkgs/games/klavaro/default.nix b/pkgs/games/klavaro/default.nix index a7e6eeef93c..2a8f68ddd2c 100644 --- a/pkgs/games/klavaro/default.nix +++ b/pkgs/games/klavaro/default.nix @@ -5,7 +5,7 @@ , file , gtk3 , intltool -, pkgconfig +, pkg-config }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "1rkxaqb62w4mv86fcnmr32lq6y0h4hh92wmsy5ddb9a8jnzx6r7w"; }; - nativeBuildInputs = [ intltool makeWrapper pkgconfig ]; + nativeBuildInputs = [ intltool makeWrapper pkg-config ]; buildInputs = [ curl gtk3 ]; postInstall = '' diff --git a/pkgs/games/kobodeluxe/default.nix b/pkgs/games/kobodeluxe/default.nix index 5620cee185d..cd5dc3cc2bc 100644 --- a/pkgs/games/kobodeluxe/default.nix +++ b/pkgs/games/kobodeluxe/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, SDL, SDL_image, libGLU, libGL} : +{lib, stdenv, fetchurl, SDL, SDL_image, libGLU, libGL} : stdenv.mkDerivation { name = "kobodeluxe-0.5.1"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { homepage = "http://olofson.net/kobodl/"; description = "Enhanced version of Akira Higuchi's game XKobo for Un*x systems with X11"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/koboredux/default.nix b/pkgs/games/koboredux/default.nix index 746e9d6bbef..622dd2de50e 100644 --- a/pkgs/games/koboredux/default.nix +++ b/pkgs/games/koboredux/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch , requireFile @@ -10,7 +10,7 @@ , useProprietaryAssets ? true }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "koboredux"; version = "0.7.5.1"; diff --git a/pkgs/games/lbreakout2/default.nix b/pkgs/games/lbreakout2/default.nix index 24797952d58..818cd31fa59 100644 --- a/pkgs/games/lbreakout2/default.nix +++ b/pkgs/games/lbreakout2/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.ciil ]; platforms = platforms.unix; - hydraPlatforms = stdenv.lib.platforms.linux; # sdl-config times out on darwin + hydraPlatforms = lib.platforms.linux; # sdl-config times out on darwin }; } diff --git a/pkgs/games/leela-zero/default.nix b/pkgs/games/leela-zero/default.nix index 4a71fc25c0f..13b423832e6 100644 --- a/pkgs/games/leela-zero/default.nix +++ b/pkgs/games/leela-zero/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + dontWrapQtApps = true; + meta = with lib; { description = "Go engine modeled after AlphaGo Zero"; homepage = "https://github.com/gcp/leela-zero"; diff --git a/pkgs/games/legendary-gl/default.nix b/pkgs/games/legendary-gl/default.nix index edf8b853c3c..eb2f3f38cea 100644 --- a/pkgs/games/legendary-gl/default.nix +++ b/pkgs/games/legendary-gl/default.nix @@ -7,23 +7,28 @@ buildPythonApplication rec { pname = "legendary-gl"; # Name in pypi - version = "0.20.1"; + version = "0.20.6"; src = fetchFromGitHub { owner = "derrod"; repo = "legendary"; rev = version; - sha256 = "0kdrhdvh9gxq1zinh5w852f5fjls9902pcrkhkhm2c0vvq7jfass"; + sha256 = "1v6jbnasz2ilcafs6qyl6na4a8cxy2lgwr0hqsja6d846rfqa8ad"; }; propagatedBuildInputs = [ requests ]; disabled = pythonOlder "3.8"; + # no tests + doCheck = false; + + pythonImportsCheck = [ "legendary" ]; + meta = with lib; { description = "A free and open-source Epic Games Launcher alternative"; homepage = "https://github.com/derrod/legendary"; license = licenses.gpl3; - maintainers = with maintainers; [ wchresta ]; + maintainers = with maintainers; [ equirosa ]; }; } diff --git a/pkgs/games/lgogdownloader/default.nix b/pkgs/games/lgogdownloader/default.nix index e19febe42f1..4cb9d3a6c04 100644 --- a/pkgs/games/lgogdownloader/default.nix +++ b/pkgs/games/lgogdownloader/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , curl , boost , liboauth @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-3xFlFokqdD1Nstu7TSUCaHUxvSodIb12QNVjmNgn9gs="; }; - nativeBuildInputs = [ cmake pkgconfig help2man ]; + nativeBuildInputs = [ cmake pkg-config help2man ]; buildInputs = [ boost curl htmlcxx jsoncpp liboauth rhash tinyxml-2 ]; diff --git a/pkgs/games/lincity/ng.nix b/pkgs/games/lincity/ng.nix index 4c3114a9202..1fe2223886a 100644 --- a/pkgs/games/lincity/ng.nix +++ b/pkgs/games/lincity/ng.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, jam, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, jam, pkg-config , zlib, libxml2, libxslt, xorgproto, libX11, libGLU, libGL, SDL , SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, physfs }: @@ -17,7 +17,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; nativeBuildInputs = [ - autoreconfHook jam pkgconfig + autoreconfHook jam pkg-config ]; buildInputs = [ diff --git a/pkgs/games/liquidwar/5.nix b/pkgs/games/liquidwar/5.nix index 8abb1c7d53e..e95371ec5ea 100644 --- a/pkgs/games/liquidwar/5.nix +++ b/pkgs/games/liquidwar/5.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { buildInputs = [ allegro ]; - configureFlags = stdenv.lib.optional stdenv.isx86_64 "--disable-asm"; + configureFlags = lib.optional stdenv.isx86_64 "--disable-asm"; hardeningDisable = [ "format" ]; NIX_CFLAGS_COMPILE = [ "-lm" ]; meta = with lib; { - description = ''The classic version of a quick tactics game LiquidWar''; + description = "The classic version of a quick tactics game LiquidWar"; maintainers = [ maintainers.raskin ]; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/games/lugaru/default.nix b/pkgs/games/lugaru/default.nix index 877a3880a00..9d10691fe49 100644 --- a/pkgs/games/lugaru/default.nix +++ b/pkgs/games/lugaru/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitLab, cmake, openal, pkgconfig, libogg, +{ lib, stdenv, fetchFromGitLab, cmake, openal, pkg-config, libogg, libvorbis, SDL2, makeWrapper, libpng, libjpeg_turbo, libGLU }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "089rblf8xw3c6dq96vnfla6zl8gxcpcbc1bj5jysfpq63hhdpypz"; }; - nativeBuildInputs = [ makeWrapper cmake pkgconfig ]; + nativeBuildInputs = [ makeWrapper cmake pkg-config ]; buildInputs = [ libGLU openal SDL2 libogg libvorbis libpng libjpeg_turbo ]; @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { homepage = "https://osslugaru.gitlab.io"; maintainers = [ ]; platforms = platforms.linux; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/lunar-client/default.nix b/pkgs/games/lunar-client/default.nix index f5c0e3faf77..0635ab8aed8 100644 --- a/pkgs/games/lunar-client/default.nix +++ b/pkgs/games/lunar-client/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appimageTools, lib, fetchurl, makeDesktopItem }: +{ appimageTools, lib, fetchurl, makeDesktopItem }: let name = "lunar-client"; version = "2.4.0"; diff --git a/pkgs/games/macopix/default.nix b/pkgs/games/macopix/default.nix index f88b763aaf8..bb91891a682 100644 --- a/pkgs/games/macopix/default.nix +++ b/pkgs/games/macopix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk, openssl }: +{ lib, stdenv, fetchurl, pkg-config, gtk, openssl }: stdenv.mkDerivation rec { name = "macopix-1.7.4"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0sgnr0wrw3hglcnsyvipll7icfv69ssmyw584zfhk1rgramlkzyb"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk openssl ]; preConfigure = '' @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Mascot Constructive Pilot for X"; homepage = "http://rosegray.sakura.ne.jp/macopix/index-e.html"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/megaglest/default.nix b/pkgs/games/megaglest/default.nix index 0660d196f1e..c97ea55882b 100644 --- a/pkgs/games/megaglest/default.nix +++ b/pkgs/games/megaglest/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, pkg-config, git, curl, SDL2, xercesc, openal, lua, libvlc +{ lib, stdenv, cmake, pkg-config, git, curl, SDL2, xercesc, openal, lua, libvlc , libjpeg, wxGTK, cppunit, ftgl, glew, libogg, libvorbis, buildEnv, libpng , fontconfig, freetype, xorg, makeWrapper, bash, which, gnome3, libGLU, glib , fetchFromGitHub @@ -48,7 +48,7 @@ stdenv.mkDerivation { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An entertaining free (freeware and free software) and open source cross-platform 3D real-time strategy (RTS) game"; license = licenses.gpl3; homepage = "http://megaglest.org/"; diff --git a/pkgs/games/mindustry/default.nix b/pkgs/games/mindustry/default.nix index b9969b84fb7..ca4dc3b9a17 100644 --- a/pkgs/games/mindustry/default.nix +++ b/pkgs/games/mindustry/default.nix @@ -3,7 +3,6 @@ , makeDesktopItem , copyDesktopItems , fetchFromGitHub -, fetchpatch , gradleGen , jdk , perl @@ -30,45 +29,31 @@ let # Note: when raising the version, ensure that all SNAPSHOT versions in # build.gradle are replaced by a fixed version # (the current one at the time of release) (see postPatch). - version = "122.1"; + version = "123.1"; buildVersion = makeBuildVersion version; Mindustry = fetchFromGitHub { owner = "Anuken"; repo = "Mindustry"; rev = "v${version}"; - sha256 = "18m4s81cfb2cr2fj61nf6spiln7cbvx25g42w6fypfikflv3qd8y"; + sha256 = "0qpgilb0v93zcik12idwzdd5b5lw74431iywq4d55gn5i6gb6bh1"; }; Arc = fetchFromGitHub { owner = "Anuken"; repo = "Arc"; rev = "v${version}"; - sha256 = "0inzyj01442da7794cpxlaab7di9gv1snc97cbffqsdxgin16i7d"; + sha256 = "146wvm0dahygnq327pspr62lq29irwrhc8ylgwdwwasrvlsscdp5"; }; soloud = fetchFromGitHub { owner = "Anuken"; repo = "soloud"; # this is never pinned in upstream, see https://github.com/Anuken/Arc/issues/39 - rev = "8553049c6fb0d1eaa7f57c1793b96219c84e8ba5"; - sha256 = "076vnjs2qxd65qq5i37gbmj5v5i04a1vw0kznq986gv9190jj531"; + rev = "73860909189c9c42924eb82e9b4a0eab2a4d5e1c"; + sha256 = "1gm3r16a539hm8jbc14mfxn7v88dv40vr7nzwmpifnz54qarkg3m"; }; patches = [ ./0001-fix-include-path-for-SDL2-on-linux.patch - # upstream fix for https://github.com/Anuken/Arc/issues/40, remove on next release - (fetchpatch { - url = "https://github.com/Anuken/Arc/commit/b2f3d212c1a88a62f140f5cb04f4c86e61332d1c.patch"; - sha256 = "1yjp4drv7lk3kinzy47g8jhb2qazr92b85vbc79vsqrs8sycskan"; - extraPrefix = "Arc/"; - stripLen = 1; - }) - # add resolveDependencies task, remove when and if it gets added upstream in a future release - (fetchpatch { - url = "https://github.com/Anuken/Mindustry/pull/4302.patch"; - sha256 = "0yp42sray4fxkajhpdljal0wss8jh9rvmclysw6cixsa94pw5khq"; - extraPrefix = "Mindustry/"; - stripLen = 1; - }) ]; unpackPhase = '' @@ -103,7 +88,7 @@ let ''; # The default one still uses jdk8 (#89731) - gradle_6 = (gradleGen.override (old: { java = jdk; })).gradle_6_7; + gradle_6 = (gradleGen.override (old: { java = jdk; })).gradle_6_8; # fake build to pre-download deps into fixed-output derivation deps = stdenv.mkDerivation { @@ -129,7 +114,7 @@ let ''; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "09rwyrg2yv8r499b0dk1bzvymsf98d4j5b95bwd9s4xvrz71is3l"; + outputHash = "18r2gd1y79cy571f5hvlablfwrlz10cf7ssc9ckkvkk92i0323gk"; }; in diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix index bba64fe4b4f..7d70ee9e6d3 100644 --- a/pkgs/games/minecraft-server/default.nix +++ b/pkgs/games/minecraft-server/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, nixosTests, jre_headless }: stdenv.mkDerivation { pname = "minecraft-server"; - version = "1.16.4"; + version = "1.16.5"; src = fetchurl { - url = "https://launcher.mojang.com/v1/objects/35139deedbd5182953cf1caa23835da59ca3d7cd/server.jar"; + url = "https://launcher.mojang.com/v1/objects/1b557e7b033b583cd9f66746b7a9ab1ec1673ced/server.jar"; # sha1 because that comes from mojang via api - sha1 = "35139deedbd5182953cf1caa23835da59ca3d7cd"; + sha1 = "1b557e7b033b583cd9f66746b7a9ab1ec1673ced"; }; preferLocalBuild = true; diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix index 814abd698ce..3d0b53035ed 100644 --- a/pkgs/games/minecraft/default.nix +++ b/pkgs/games/minecraft/default.nix @@ -41,7 +41,7 @@ let categories = "Game;"; }; - envLibPath = stdenv.lib.makeLibraryPath [ + envLibPath = lib.makeLibraryPath [ curl libpulseaudio systemd @@ -50,7 +50,7 @@ let libXxf86vm # needed only for versions <1.13 ]; - libPath = stdenv.lib.makeLibraryPath ([ + libPath = lib.makeLibraryPath ([ alsaLib atk cairo @@ -88,11 +88,11 @@ in stdenv.mkDerivation rec { pname = "minecraft-launcher"; - version = "2.2.909"; + version = "2.2.1441"; src = fetchurl { url = "https://launcher.mojang.com/download/linux/x86_64/minecraft-launcher_${version}.tar.gz"; - sha256 = "15x2imr8c4m2bjfs9y1l34fpvixxdf09gqls4bqb4rdvj1vhdrh2"; + sha256 = "03q579hvxnsh7d00j6lmfh53rixdpf33xb5zlz7659pvb9j5w0cm"; }; icon = fetchurl { @@ -137,8 +137,8 @@ stdenv.mkDerivation rec { # Do not create `GPUCache` in current directory makeWrapper $out/opt/minecraft-launcher/minecraft-launcher $out/bin/minecraft-launcher \ --prefix LD_LIBRARY_PATH : ${envLibPath} \ - --prefix PATH : ${stdenv.lib.makeBinPath [ jre ]} \ - --set JAVA_HOME ${stdenv.lib.getBin jre} \ + --prefix PATH : ${lib.makeBinPath [ jre ]} \ + --set JAVA_HOME ${lib.getBin jre} \ --run "cd /tmp" \ "''${gappsWrapperArgs[@]}" ''; diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index 763c7f4bd67..ddb415a6ad2 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -4,7 +4,7 @@ , leveldb, postgresql, hiredis, libiconv, OpenGL, OpenAL ? openal, Carbon, Cocoa }: -with stdenv.lib; +with lib; let boolToCMake = b: if b then "ON" else "OFF"; diff --git a/pkgs/games/moon-buggy/default.nix b/pkgs/games/moon-buggy/default.nix index 9de24c1ae9d..b623d7bd539 100644 --- a/pkgs/games/moon-buggy/default.nix +++ b/pkgs/games/moon-buggy/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ncurses}: +{lib, stdenv, fetchurl, ncurses}: stdenv.mkDerivation rec { baseName = "moon-buggy"; @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { }; meta = { - description = ''A simple character graphics game where you drive some kind of car across the moon's surface''; - license = stdenv.lib.licenses.gpl2; - maintainers = [stdenv.lib.maintainers.rybern]; - platforms = stdenv.lib.platforms.linux; + description = "A simple character graphics game where you drive some kind of car across the moon's surface"; + license = lib.licenses.gpl2; + maintainers = [lib.maintainers.rybern]; + platforms = lib.platforms.linux; homepage = "https://www.seehuhn.de/pages/moon-buggy"; }; } diff --git a/pkgs/games/mrrescue/default.nix b/pkgs/games/mrrescue/default.nix index d3caa986b85..c5b2b7d20eb 100644 --- a/pkgs/games/mrrescue/default.nix +++ b/pkgs/games/mrrescue/default.nix @@ -13,13 +13,13 @@ let name = "mrrescue"; exec = pname; icon = icon; - comment = "Arcade-style fire fighting game"; + comment = "Arcade-style fire fighting game"; desktopName = "Mr. Rescue"; genericName = "mrrescue"; categories = "Game;"; }; -in +in stdenv.mkDerivation { name = "${pname}-${version}"; diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix index 6ac2e65b577..5a1f42ee130 100644 --- a/pkgs/games/multimc/default.nix +++ b/pkgs/games/multimc/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, jdk8, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase }: +{ lib, mkDerivation, fetchFromGitHub, cmake, jdk8, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase, libGL }: let jdk = jdk8; - libpath = with xorg; stdenv.lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio ]; + libpath = with xorg; lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio libGL ]; in mkDerivation rec { pname = "multimc"; - version = "0.6.11"; + version = "unstable-2021-01-17"; src = fetchFromGitHub { owner = "MultiMC"; repo = "MultiMC5"; - rev = version; - sha256 = "1jkbmb4sgfk8d93f5l1vd9pkpvhq9sxacc61w0rvf5xmz0wnszmz"; + rev = "02887536f773643313f15442fc82cebf616da54a"; + sha256 = "1aykvavcv415lq488hx4ig2a79g5a561jg92gw14fb964r43782i"; fetchSubmodules = true; }; nativeBuildInputs = [ cmake file makeWrapper ]; @@ -34,6 +34,6 @@ in mkDerivation rec { ''; platforms = platforms.linux; license = licenses.lgpl21Plus; - maintainers = [ maintainers.cleverca22 ]; + maintainers = with maintainers; [ cleverca22 starcraft66 ]; }; } diff --git a/pkgs/games/n2048/default.nix b/pkgs/games/n2048/default.nix index f5ff0b4690e..b3d06a51fd3 100644 --- a/pkgs/games/n2048/default.nix +++ b/pkgs/games/n2048/default.nix @@ -1,6 +1,6 @@ -{stdenv, fetchurl, ncurses}: +{lib, stdenv, fetchurl, ncurses}: let - s = + s = rec { baseName = "n2048"; version = "0.1"; @@ -19,17 +19,17 @@ stdenv.mkDerivation { inherit (s) url sha256; }; makeFlags = [ - ''DESTDIR=$(out)'' + "DESTDIR=$(out)" ]; preInstall = '' mkdir -p "$out"/{share/man,bin} ''; meta = { inherit (s) version; - description = ''Console implementation of 2048 game''; - license = stdenv.lib.licenses.bsd2; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + description = "Console implementation of 2048 game"; + license = lib.licenses.bsd2; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; homepage = "http://www.dettus.net/n2048/"; }; } diff --git a/pkgs/games/naev/default.nix b/pkgs/games/naev/default.nix index c328199b377..f359b8c9d98 100644 --- a/pkgs/games/naev/default.nix +++ b/pkgs/games/naev/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, SDL, openal, SDL_mixer, libxml2, pkgconfig, libvorbis +{ lib, fetchurl, stdenv, SDL, openal, SDL_mixer, libxml2, pkg-config, libvorbis , libpng, libGLU, libGL, makeWrapper, zlib, freetype }: let @@ -21,7 +21,7 @@ stdenv.mkDerivation { buildInputs = [ SDL SDL_mixer openal libxml2 libvorbis libpng libGLU libGL zlib freetype ]; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; NIX_CFLAGS_COMPILE="-include ${zlib.dev}/include/zlib.h"; @@ -34,9 +34,9 @@ stdenv.mkDerivation { meta = { description = "2D action/rpg space game"; homepage = "http://www.naev.org"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [viric]; + platforms = lib.platforms.linux; hydraPlatforms = []; }; } diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix index a922064f78b..d6ba771de7e 100644 --- a/pkgs/games/nethack/default.nix +++ b/pkgs/games/nethack/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, coreutils, ncurses, gzip, flex, bison , less , buildPackages -, x11Mode ? false, qtMode ? false, libXaw, libXext, libXpm, bdftopcf, mkfontdir, pkgconfig, qt5 +, x11Mode ? false, qtMode ? false, libXaw, libXext, libXpm, bdftopcf, mkfontdir, pkg-config, qt5 }: let @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ flex bison ] ++ lib.optionals x11Mode [ mkfontdir bdftopcf ] ++ lib.optionals qtMode [ - pkgconfig mkfontdir qt5.qtbase.dev + pkg-config mkfontdir qt5.qtbase.dev qt5.qtmultimedia.dev qt5.wrapQtAppsHook bdftopcf ]; @@ -97,7 +97,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; - preFixup = stdenv.lib.optionalString qtMode '' + preFixup = lib.optionalString qtMode '' wrapQtApp "$out/games/nethack" ''; diff --git a/pkgs/games/neverball/default.nix b/pkgs/games/neverball/default.nix index 99ce818d04d..431dfd58a81 100644 --- a/pkgs/games/neverball/default.nix +++ b/pkgs/games/neverball/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL2, libGL, libpng, libjpeg, SDL2_ttf, libvorbis, gettext +{ lib, stdenv, fetchurl, SDL2, libGL, libpng, libjpeg, SDL2_ttf, libvorbis, gettext , physfs }: stdenv.mkDerivation rec { @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { homepage = "https://neverball.org/"; description = "Tilt the floor to roll a ball"; license = "GPL"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/games/nexuiz/default.nix b/pkgs/games/nexuiz/default.nix index e055e27d2cd..60085d5c85b 100644 --- a/pkgs/games/nexuiz/default.nix +++ b/pkgs/games/nexuiz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , # required for both unzip, zlib, curl, libjpeg, libpng, libvorbis, libtheora , libogg, libmodplug @@ -11,7 +11,7 @@ let version = "2.5.2"; - version_short = stdenv.lib.replaceChars [ "." ] [ "" ] version; + version_short = lib.replaceChars [ "." ] [ "" ] version; in stdenv.mkDerivation { pname = "nexuiz"; inherit version; @@ -71,7 +71,7 @@ in stdenv.mkDerivation { meta = { description = "A free fast-paced first-person shooter"; homepage = "http://www.alientrap.org/games/nexuiz"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/njam/default.nix b/pkgs/games/njam/default.nix index 5022a92a7cd..1833840d2e3 100644 --- a/pkgs/games/njam/default.nix +++ b/pkgs/games/njam/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, SDL, SDL_image, SDL_mixer, SDL_net }: +{lib, stdenv, fetchurl, SDL, SDL_image, SDL_mixer, SDL_net }: stdenv.mkDerivation { name = "njam-1.25"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { homepage = "http://trackballs.sourceforge.net/"; description = "Cross-platform pacman-like game"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/nudoku/default.nix b/pkgs/games/nudoku/default.nix index d10807071a9..aaa6d324809 100644 --- a/pkgs/games/nudoku/default.nix +++ b/pkgs/games/nudoku/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gettext, ncurses }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gettext, ncurses }: stdenv.mkDerivation rec { pname = "nudoku"; @@ -16,10 +16,10 @@ stdenv.mkDerivation rec { substituteInPlace configure.ac --replace 0.19 0.20 ''; - nativeBuildInputs = [ autoreconfHook pkgconfig gettext ]; + nativeBuildInputs = [ autoreconfHook pkg-config gettext ]; buildInputs = [ ncurses ]; - configureFlags = stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-nls"; + configureFlags = lib.optional stdenv.hostPlatform.isMusl "--disable-nls"; meta = with lib; { description = "An ncurses based sudoku game"; diff --git a/pkgs/games/nxengine-evo/default.nix b/pkgs/games/nxengine-evo/default.nix index 909737a6804..e3df235b757 100644 --- a/pkgs/games/nxengine-evo/default.nix +++ b/pkgs/games/nxengine-evo/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchpatch , fetchurl , cmake @@ -54,12 +54,12 @@ stdenv.mkDerivation rec { meta = { description = "A complete open-source clone/rewrite of the masterpiece jump-and-run platformer Doukutsu Monogatari (also known as Cave Story)"; - license = with stdenv.lib.licenses; [ + license = with lib.licenses; [ gpl3 # Game engine unfreeRedistributable # Game assets, freeware ]; - maintainers = [ stdenv.lib.maintainers.scubed2 ]; + maintainers = [ lib.maintainers.scubed2 ]; homepage = "https://github.com/nxengine/nxengine-evo"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/odamex/default.nix b/pkgs/games/odamex/default.nix index ba220a720cd..8b58ec67eda 100644 --- a/pkgs/games/odamex/default.nix +++ b/pkgs/games/odamex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, fetchurl, pkgconfig, SDL, SDL_mixer, SDL_net, wxGTK30 }: +{ lib, stdenv, cmake, fetchurl, pkg-config, SDL, SDL_mixer, SDL_net, wxGTK30 }: stdenv.mkDerivation rec { pname = "odamex"; @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { sha256 = "0d4v1l7kghkz1xz92jxlx50x3iy94z7ix1i3209m5j5545qzxrqq"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ SDL SDL_mixer SDL_net wxGTK30 ]; meta = { homepage = "http://odamex.net/"; description = "A client/server port for playing old-school Doom online"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ MP2E ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ MP2E ]; }; } diff --git a/pkgs/games/oilrush/default.nix b/pkgs/games/oilrush/default.nix index 6a05a566524..b78baee725d 100644 --- a/pkgs/games/oilrush/default.nix +++ b/pkgs/games/oilrush/default.nix @@ -1,7 +1,7 @@ -{ stdenv, config, fetchurl, libX11, libXext, libXinerama, libXrandr +{ lib, stdenv, config, fetchurl, libX11, libXext, libXinerama, libXrandr , libXrender, fontconfig, freetype, openal, runtimeShell }: -let inherit (stdenv.lib) makeLibraryPath; in +let inherit (lib) makeLibraryPath; in stdenv.mkDerivation { name = "oilrush"; @@ -69,9 +69,9 @@ stdenv.mkDerivation { of Tower Defense. ''; homepage = "http://oilrush-game.com/"; - license = stdenv.lib.licenses.unfree; - #maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.unfree; + #maintainers = with lib.maintainers; [ astsmtl ]; + platforms = lib.platforms.linux; hydraPlatforms = []; }; diff --git a/pkgs/games/openarena/default.nix b/pkgs/games/openarena/default.nix index 577eafb6a8c..7b1f793895e 100644 --- a/pkgs/games/openarena/default.nix +++ b/pkgs/games/openarena/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, makeWrapper, patchelf, pkgs, stdenv, SDL, libglvnd, libogg, libvorbis, curl, openal }: +{ lib, fetchurl, makeWrapper, patchelf, pkgs, stdenv, SDL, libglvnd, libogg, libvorbis, curl, openal }: stdenv.mkDerivation { pname = "openarena"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { installPhase = let gameDir = "$out/openarena-$version"; interpreter = "$(< \"$NIX_CC/nix-support/dynamic-linker\")"; - libPath = stdenv.lib.makeLibraryPath [ SDL libglvnd libogg libvorbis curl openal ]; + libPath = lib.makeLibraryPath [ SDL libglvnd libogg libvorbis curl openal ]; arch = { "x86_64-linux" = "x86_64"; "i386-linux" = "i386"; @@ -36,8 +36,8 @@ stdenv.mkDerivation { meta = { description = "Crossplatform openarena client"; homepage = "http://openarena.ws/"; - maintainers = [ stdenv.lib.maintainers.wyvie ]; + maintainers = [ lib.maintainers.wyvie ]; platforms = [ "i386-linux" "x86_64-linux" ]; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/games/openclonk/default.nix b/pkgs/games/openclonk/default.nix index db9b4760b25..9dc267032ae 100644 --- a/pkgs/games/openclonk/default.nix +++ b/pkgs/games/openclonk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, pkgconfig +{ lib, stdenv, fetchurl, cmake, pkg-config , SDL2, libvorbis, libogg, libjpeg, libpng, freetype, glew, tinyxml, openal , freealut, readline, gcc-unwrapped , enableSoundtrack ? false # Enable the "Open Clonk Soundtrack - Explorers Journey" by David Oerther @@ -20,11 +20,11 @@ in stdenv.mkDerivation rec { postInstall = '' mv -v $out/games/openclonk $out/bin/ - '' + stdenv.lib.optionalString enableSoundtrack '' + '' + lib.optionalString enableSoundtrack '' ln -sv ${soundtrack_src} $out/share/games/openclonk/Music.ocg ''; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ SDL2 libvorbis libogg libjpeg libpng freetype glew tinyxml openal freealut diff --git a/pkgs/games/opendune/default.nix b/pkgs/games/opendune/default.nix index cf15568b37d..e5ac89239a3 100644 --- a/pkgs/games/opendune/default.nix +++ b/pkgs/games/opendune/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig +{ stdenv, lib, fetchFromGitHub, pkg-config , alsaLib, libpulseaudio, SDL2, SDL2_image, SDL2_mixer }: # - set the opendune configuration at ~/.config/opendune/opendune.ini: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { "--with-pulse=${lib.getLib libpulseaudio}/lib/libpulse.so" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ alsaLib libpulseaudio SDL2 SDL2_image SDL2_mixer ]; diff --git a/pkgs/games/openlierox/default.nix b/pkgs/games/openlierox/default.nix index 7bda06b8457..fefac190b0a 100644 --- a/pkgs/games/openlierox/default.nix +++ b/pkgs/games/openlierox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, xorgproto, gd, SDL, SDL_image, SDL_mixer, zlib +{ lib, stdenv, fetchurl, libX11, xorgproto, gd, SDL, SDL_image, SDL_mixer, zlib , libxml2, pkg-config, curl, cmake, libzip }: stdenv.mkDerivation { @@ -35,7 +35,7 @@ stdenv.mkDerivation { meta = { homepage = "http://openlierox.net"; description = "Real-time game with Worms-like shooting"; - license = stdenv.lib.licenses.lgpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.lgpl2Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix index 23572998d03..cc1893a9ed3 100644 --- a/pkgs/games/openmw/default.nix +++ b/pkgs/games/openmw/default.nix @@ -30,6 +30,8 @@ stdenv.mkDerivation rec { "-DDESIRED_QT_VERSION:INT=5" ]; + dontWrapQtApps = true; + meta = with lib; { description = "An unofficial open source engine reimplementation of the game Morrowind"; homepage = "http://openmw.org"; diff --git a/pkgs/games/openmw/tes3mp.nix b/pkgs/games/openmw/tes3mp.nix index 47b383a82bd..95659e5a088 100644 --- a/pkgs/games/openmw/tes3mp.nix +++ b/pkgs/games/openmw/tes3mp.nix @@ -61,6 +61,8 @@ in openmw.overrideAttrs (oldAttrs: rec { "-DRakNet_LIBRARY_DEBUG=${rakNetLibrary}/lib/libRakNetLibStatic.a" ]; + dontWrapQtApps = true; + # https://github.com/TES3MP/openmw-tes3mp/issues/552 patches = [ ./tes3mp.patch diff --git a/pkgs/games/openra/common.nix b/pkgs/games/openra/common.nix index 51f94177177..41c903e1011 100644 --- a/pkgs/games/openra/common.nix +++ b/pkgs/games/openra/common.nix @@ -1,13 +1,13 @@ /* The reusable code, and package attributes, between OpenRA engine packages (engine.nix) and out-of-tree mod packages (mod.nix). */ -{ stdenv, makeSetupHook, curl, unzip, dos2unix, pkgconfig, makeWrapper +{ lib, makeSetupHook, curl, unzip, dos2unix, pkg-config, makeWrapper , lua, mono, dotnetPackages, python , libGL, freetype, openal, SDL2 , zenity }: -with stdenv.lib; +with lib; let path = makeBinPath ([ mono python ] ++ optional (zenity != null) zenity); @@ -62,7 +62,7 @@ in { curl unzip dos2unix - pkgconfig + pkg-config makeWrapper mkdirp mono diff --git a/pkgs/games/openra/engine.nix b/pkgs/games/openra/engine.nix index 7d2d007d075..365dc3d2679 100644 --- a/pkgs/games/openra/engine.nix +++ b/pkgs/games/openra/engine.nix @@ -7,14 +7,14 @@ This package could be seen as providing a set of in-tree mods, while the `mod.nix` pacakges provide a single out-of-tree mod. */ -{ stdenv +{ lib, stdenv , packageAttrs , patchEngine , wrapLaunchGame , engine }: -with stdenv.lib; +with lib; stdenv.mkDerivation (recursiveUpdate packageAttrs rec { name = "${pname}-${version}"; diff --git a/pkgs/games/openra/mod.nix b/pkgs/games/openra/mod.nix index 8df5922a441..4d0a18e6334 100644 --- a/pkgs/games/openra/mod.nix +++ b/pkgs/games/openra/mod.nix @@ -6,7 +6,7 @@ The engine is relatively small and quick to build, so this is not much of a problem. Building a mod will result in a wrapper script that starts the mod inside the specified engine. */ -{ stdenv +{ lib, stdenv , packageAttrs , patchEngine , wrapLaunchGame @@ -14,7 +14,7 @@ , engine }: -with stdenv.lib; +with lib; let engineSourceName = engine.src.name or "engine"; diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix index 96d79a8744e..912d0da59a0 100644 --- a/pkgs/games/openrct2/default.nix +++ b/pkgs/games/openrct2/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , SDL2, cmake, curl, duktape, fontconfig, freetype, icu, jansson, libGLU -, libiconv, libpng, libpthreadstubs, libzip, nlohmann_json, openssl, pkgconfig +, libiconv, libpng, libpthreadstubs, libzip, nlohmann_json, openssl, pkg-config , speexdsp, zlib }: @@ -36,7 +36,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/games/openrw/default.nix b/pkgs/games/openrw/default.nix index 7258ed6550c..4064023fafd 100644 --- a/pkgs/games/openrw/default.nix +++ b/pkgs/games/openrw/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { buildInputs = [ sfml libGLU libGL bullet glm libmad xlibsWrapper openal SDL2 boost ffmpeg_3 - ] ++ stdenv.lib.optionals stdenv.isDarwin [ OpenAL Cocoa ]; + ] ++ lib.optionals stdenv.isDarwin [ OpenAL Cocoa ]; meta = with lib; { description = "Unofficial open source recreation of the classic Grand Theft Auto III game executable"; diff --git a/pkgs/games/openspades/default.nix b/pkgs/games/openspades/default.nix index fdd429e376f..58ac3f8df79 100644 --- a/pkgs/games/openspades/default.nix +++ b/pkgs/games/openspades/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ freetype SDL2 SDL2_image libGL zlib curl glew opusfile openal libogg - ] ++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index 8c0755127cb..b42c7d2216e 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchzip, pkgconfig, which, SDL2, libpng, zlib, xz, freetype, fontconfig, libxdg_basedir +{ lib, stdenv, fetchurl, fetchzip, pkg-config, which, SDL2, libpng, zlib, xz, freetype, fontconfig, libxdg_basedir , withOpenGFX ? true, withOpenSFX ? true, withOpenMSX ? true , withFluidSynth ? true, audioDriver ? "alsa", fluidsynth, soundfont-fluid, procps , writeScriptBin, makeWrapper, runtimeShell @@ -36,9 +36,9 @@ stdenv.mkDerivation rec { sha256 = "0fxmfz1mm95a2x0rnzfff9wb8q57w0cvsdd0z7agdcbyakph25n1"; }; - nativeBuildInputs = [ pkgconfig which makeWrapper ]; + nativeBuildInputs = [ pkg-config which makeWrapper ]; buildInputs = [ SDL2 libpng xz zlib freetype fontconfig libxdg_basedir ] - ++ stdenv.lib.optionals withFluidSynth [ fluidsynth soundfont-fluid ]; + ++ lib.optionals withFluidSynth [ fluidsynth soundfont-fluid ]; prefixKey = "--prefix-dir="; @@ -51,23 +51,23 @@ stdenv.mkDerivation rec { postInstall = '' mv $out/games/ $out/bin - ${stdenv.lib.optionalString withOpenGFX '' + ${lib.optionalString withOpenGFX '' cp ${opengfx}/* $out/share/games/openttd/baseset ''} mkdir -p $out/share/games/openttd/data - ${stdenv.lib.optionalString withOpenSFX '' + ${lib.optionalString withOpenSFX '' cp ${opensfx}/*.{obs,cat} $out/share/games/openttd/data ''} mkdir $out/share/games/openttd/baseset/openmsx - ${stdenv.lib.optionalString withOpenMSX '' + ${lib.optionalString withOpenMSX '' cp ${openmsx}/*.{obm,mid} $out/share/games/openttd/baseset/openmsx ''} - ${stdenv.lib.optionalString withFluidSynth '' + ${lib.optionalString withFluidSynth '' wrapProgram $out/bin/openttd \ --add-flags -m \ --add-flags extmidi:cmd=${playmidi}/bin/playmidi diff --git a/pkgs/games/opentyrian/default.nix b/pkgs/games/opentyrian/default.nix index 9872a3ee05f..43c8e08c79f 100644 --- a/pkgs/games/opentyrian/default.nix +++ b/pkgs/games/opentyrian/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, fetchzip, SDL, SDL_net}: +{ lib, stdenv, fetchurl, fetchzip, SDL, SDL_net }: stdenv.mkDerivation rec { pname = "opentyrian"; @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { description = ''Open source port of the game "Tyrian"''; homepage = "https://bitbucket.org/opentyrian/opentyrian"; # This does not account of Tyrian data. - # license = stdenv.lib.licenses.gpl2; + # license = lib.licenses.gpl2; }; } diff --git a/pkgs/games/openxcom/default.nix b/pkgs/games/openxcom/default.nix index 3ec18640054..8c115e9b312 100644 --- a/pkgs/games/openxcom/default.nix +++ b/pkgs/games/openxcom/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, cmake, libGLU, libGL, zlib, openssl, libyamlcpp, boost +{lib, stdenv, fetchFromGitHub, cmake, libGLU, libGL, zlib, openssl, libyamlcpp, boost , SDL, SDL_image, SDL_mixer, SDL_gfx }: let version = "1.0.0.2019.10.18"; in @@ -19,9 +19,9 @@ stdenv.mkDerivation { description = "Open source clone of UFO: Enemy Unknown"; homepage = "https://openxcom.org"; repositories.git = "https://github.com/SupSuper/OpenXcom.git"; - maintainers = [ stdenv.lib.maintainers.cpages ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl3; + maintainers = [ lib.maintainers.cpages ]; + platforms = lib.platforms.linux; + license = lib.licenses.gpl3; }; } diff --git a/pkgs/games/papermc/default.nix b/pkgs/games/papermc/default.nix index 15b05b56d84..e32ec946b2d 100644 --- a/pkgs/games/papermc/default.nix +++ b/pkgs/games/papermc/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, bash, jre }: +{ lib, stdenv, fetchurl, bash, jre }: let - mcVersion = "1.16.4"; - buildNum = "296"; + mcVersion = "1.16.5"; + buildNum = "457"; jar = fetchurl { url = "https://papermc.io/api/v1/paper/${mcVersion}/${buildNum}/download"; - sha256 = "0885417w7qahk2fwlzvggbwrhvwgpd7xas8lzzb7ar469vyvd9dz"; + sha256 = "1xkjaj5wgm9rmzk8mz20n9vd674fynvdgqsy96c9bfifa03lsnmc"; }; in stdenv.mkDerivation { pname = "papermc"; @@ -29,8 +29,8 @@ in stdenv.mkDerivation { meta = { description = "High-performance Minecraft Server"; homepage = "https://papermc.io/"; - license = stdenv.lib.licenses.gpl3Only; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ aaronjanse ]; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ aaronjanse neonfuz ]; }; } diff --git a/pkgs/games/performous/default.nix b/pkgs/games/performous/default.nix index d5128aaec07..b0fc9483629 100644 --- a/pkgs/games/performous/default.nix +++ b/pkgs/games/performous/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, gettext +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, gettext , glibmm, libxmlxx, pango, librsvg , SDL2, glew, boost, libav, portaudio, epoxy }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { patches = [ ./performous-cmake.patch ]; - nativeBuildInputs = [ cmake pkgconfig gettext ]; + nativeBuildInputs = [ cmake pkg-config gettext ]; buildInputs = [ glibmm libxmlxx pango librsvg diff --git a/pkgs/games/pingus/default.nix b/pkgs/games/pingus/default.nix index 81e22b90e97..fd0ebddfc32 100644 --- a/pkgs/games/pingus/default.nix +++ b/pkgs/games/pingus/default.nix @@ -1,10 +1,10 @@ -{stdenv, fetchgit, cmake, SDL2, SDL2_image, boost, libpng, SDL2_mixer -, pkgconfig, libGLU, libGL, git, jsoncpp }: +{lib, stdenv, fetchgit, cmake, SDL2, SDL2_image, boost, libpng, SDL2_mixer +, pkg-config, libGLU, libGL, git, jsoncpp }: stdenv.mkDerivation rec { pname = "pingus"; version = "unstable-0.7.6.0.20191104"; - nativeBuildInputs = [ cmake pkgconfig git ]; + nativeBuildInputs = [ cmake pkg-config git ]; buildInputs = [ SDL2 SDL2_image boost libpng SDL2_mixer libGLU libGL jsoncpp ]; src = fetchgit { url = "https://gitlab.com/pingus/pingus/"; @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { }; meta = { - description = ''A puzzle game with mechanics similar to Lemmings''; - platforms = stdenv.lib.platforms.linux; - maintainers = [stdenv.lib.maintainers.raskin]; - license = stdenv.lib.licenses.gpl3; + description = "A puzzle game with mechanics similar to Lemmings"; + platforms = lib.platforms.linux; + maintainers = [lib.maintainers.raskin]; + license = lib.licenses.gpl3; }; } diff --git a/pkgs/games/pioneer/default.nix b/pkgs/games/pioneer/default.nix index d801e7c82ec..0d348e3fa9e 100644 --- a/pkgs/games/pioneer/default.nix +++ b/pkgs/games/pioneer/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, stdenv, cmake, pkgconfig, curl, libsigcxx, SDL2 +{ fetchFromGitHub, lib, stdenv, cmake, pkg-config, curl, libsigcxx, SDL2 , SDL2_image, freetype, libvorbis, libpng, assimp, libGLU, libGL , glew }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1011xsi94jhw98mhm8kryq8ajig0qfbrdx5xdasi92bd4nk7lcp8"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ curl libsigcxx SDL2 SDL2_image freetype libvorbis libpng diff --git a/pkgs/games/planetaryannihilation/default.nix b/pkgs/games/planetaryannihilation/default.nix index 768e0a1d724..7dbca783b67 100644 --- a/pkgs/games/planetaryannihilation/default.nix +++ b/pkgs/games/planetaryannihilation/default.nix @@ -34,19 +34,19 @@ stdenv.mkDerivation { ln -s ${systemd}/lib/libudev.so.1 $out/lib/libudev.so.0 patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/PA" - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib xorg.libXdamage xorg.libXfixes gtk2 glib stdenv.glibc.out "$out" xorg.libXext pango udev xorg.libX11 xorg.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome2.GConf gdk-pixbuf xorg.libXrender ]}:{stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" "$out/host/CoherentUI_Host" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib xorg.libXdamage xorg.libXfixes gtk2 glib stdenv.glibc.out "$out" xorg.libXext pango udev xorg.libX11 xorg.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome2.GConf gdk-pixbuf xorg.libXrender ]}:{stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" "$out/host/CoherentUI_Host" - wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib stdenv.glibc.out xorg.libX11 xorg.libXcursor gtk2 glib curl "$out" ]}:${stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" + wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc.lib stdenv.glibc.out xorg.libX11 xorg.libXcursor gtk2 glib curl "$out" ]}:${stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" for f in $out/lib/*; do - patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib curl xorg.libX11 stdenv.glibc.out xorg.libXcursor "$out" ]}:${stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" $f + patchelf --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib curl xorg.libX11 stdenv.glibc.out xorg.libXcursor "$out" ]}:${stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" $f done ''; meta = with lib; { homepage = "http://www.uberent.com/pa/"; description = "Next-generation RTS that takes the genre to a planetary scale"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; platforms = platforms.linux; maintainers = [ maintainers.domenkozar ]; }; diff --git a/pkgs/games/pokerth/default.nix b/pkgs/games/pokerth/default.nix index 00b1f68e137..59555a8ac24 100644 --- a/pkgs/games/pokerth/default.nix +++ b/pkgs/games/pokerth/default.nix @@ -1,10 +1,8 @@ -{ mkDerivation, stdenv, fetchFromGitHub, runCommand, fetchpatch, patchutils, qmake, qtbase +{ lib, mkDerivation, fetchFromGitHub, runCommand, fetchpatch, patchutils, qmake, qtbase , SDL, SDL_mixer, boost, curl, gsasl, libgcrypt, libircclient, protobuf, sqlite , wrapQtAppsHook , tinyxml2, target ? "client" }: -with stdenv.lib; - let hiDPI = fetchpatch { url = "https://github.com/pokerth/pokerth/commit/ad8c9cabfb85d8293720d0f14840278d38b5feeb.patch"; @@ -65,7 +63,7 @@ mkDerivation rec { enableParallelBuilding = true; - meta = { + meta = with lib; { homepage = "https://www.pokerth.net"; description = "Poker game ${target}"; license = licenses.gpl3; diff --git a/pkgs/games/pong3d/default.nix b/pkgs/games/pong3d/default.nix index c7817041f7a..3cd017e8d3b 100644 --- a/pkgs/games/pong3d/default.nix +++ b/pkgs/games/pong3d/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libX11}: +{lib, stdenv, fetchurl, libX11}: stdenv.mkDerivation { name = "3dpong-0.5"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.newbreedsoftware.com/3dpong/"; description = "One or two player 3d sports game based on Pong from Atari"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/portmod/default.nix b/pkgs/games/portmod/default.nix index 07451b8dc2a..ef535991c23 100644 --- a/pkgs/games/portmod/default.nix +++ b/pkgs/games/portmod/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, callPackage, python3Packages, fetchFromGitLab, cacert, +{ lib, callPackage, python3Packages, fetchFromGitLab, cacert, rustPlatform, bubblewrap, git, perlPackages, imagemagick7, fetchurl, fetchzip, jre, makeWrapper, tr-patcher, tes3cmd }: diff --git a/pkgs/games/prboom/default.nix b/pkgs/games/prboom/default.nix index 278aa8a93ea..4bd59c9e39d 100644 --- a/pkgs/games/prboom/default.nix +++ b/pkgs/games/prboom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, SDL_mixer, SDL_net +{ lib, stdenv, fetchurl, SDL, SDL_mixer, SDL_net , libGLU ? null , libGL ? null , useOpenGL ? stdenv.hostPlatform == stdenv.buildPlatform @@ -14,21 +14,21 @@ stdenv.mkDerivation rec { }; buildInputs = [ SDL SDL_mixer SDL_net ] - ++ stdenv.lib.optionals useOpenGL [ libGL libGLU ]; + ++ lib.optionals useOpenGL [ libGL libGLU ]; doCheck = stdenv.hostPlatform == stdenv.buildPlatform; configureFlags = [ - (stdenv.lib.enableFeature useOpenGL "gl") - (stdenv.lib.enableFeature doCheck "sdltest") - ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + (lib.enableFeature useOpenGL "gl") + (lib.enableFeature doCheck "sdltest") + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--disable-cpu-opt" "--without-x" "ac_cv_type_uid_t=yes" "ac_cv_type_gid_t=yes" ]; - postInstall = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + postInstall = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' mv $out/games/ $out/bin ''; } diff --git a/pkgs/games/pro-office-calculator/default.nix b/pkgs/games/pro-office-calculator/default.nix index dbe2db363ea..381a6e8742b 100644 --- a/pkgs/games/pro-office-calculator/default.nix +++ b/pkgs/games/pro-office-calculator/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchFromGitHub, tinyxml-2, cmake, qtbase, qtmultimedia }: +{ mkDerivation, lib, fetchFromGitHub, tinyxml-2, cmake, qtbase, qtmultimedia }: mkDerivation rec { version = "1.0.13"; pname = "pro-office-calculator"; diff --git a/pkgs/games/pysolfc/default.nix b/pkgs/games/pysolfc/default.nix index c765a1cbdf5..925532bbbf5 100644 --- a/pkgs/games/pysolfc/default.nix +++ b/pkgs/games/pysolfc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, buildPythonApplication, python3Packages +{ lib, fetchzip, buildPythonApplication, python3Packages , desktop-file-utils, freecell-solver }: buildPythonApplication rec { diff --git a/pkgs/games/qtads/default.nix b/pkgs/games/qtads/default.nix index 140cba2e9ae..f966798ce4e 100644 --- a/pkgs/games/qtads/default.nix +++ b/pkgs/games/qtads/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchFromGitHub, fetchpatch, pkgconfig, qmake +{ lib, mkDerivation, fetchFromGitHub, fetchpatch, pkg-config, qmake , SDL2, fluidsynth, libsndfile, libvorbis, mpg123, qtbase }: @@ -13,7 +13,7 @@ mkDerivation rec { sha256 = "02kk2hs20h9ffhylwms9f8zikmmlrz1nvbrm97gis9iljkyx035c"; }; - nativeBuildInputs = [ pkgconfig qmake ]; + nativeBuildInputs = [ pkg-config qmake ]; buildInputs = [ SDL2 fluidsynth libsndfile libvorbis mpg123 qtbase ]; diff --git a/pkgs/games/quake2/yquake2/wrapper.nix b/pkgs/games/quake2/yquake2/wrapper.nix index 9ab086f96a2..4850dff99dc 100644 --- a/pkgs/games/quake2/yquake2/wrapper.nix +++ b/pkgs/games/quake2/yquake2/wrapper.nix @@ -12,7 +12,7 @@ let }; in stdenv.mkDerivation { - name = "${name}-${stdenv.lib.getVersion yquake2}"; + name = "${name}-${lib.getVersion yquake2}"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/games/quake3/content/hires.nix b/pkgs/games/quake3/content/hires.nix new file mode 100644 index 00000000000..7314028d540 --- /dev/null +++ b/pkgs/games/quake3/content/hires.nix @@ -0,0 +1,26 @@ +{ stdenv, lib, fetchzip }: + +stdenv.mkDerivation { + pname = "quake3hires"; + version = "2020-01-20"; # Unknown version, used the date of web.archive.org capture. + + src = fetchzip { + url = "https://web.archive.org/web/20200120024216/http://ioquake3.org/files/xcsv_hires.zip"; + sha256 = "09vhrray8mh1ic2qgcwv0zlmsnz789y32dkkvrz1vdki4yqkf717"; + stripRoot = false; + }; + + buildCommand = '' + mkdir -p $out/baseq3 + install -Dm444 $src/xcsv_bq3hi-res.pk3 $out/baseq3/xcsv_bq3hi-res.pk3 + ''; + + preferLocalBuild = true; + + meta = with lib; { + description = "Quake 3 high-resolution textures"; + license = licenses.cc0; + platforms = platforms.all; + maintainers = with maintainers; [ rvolosatovs ]; + }; +} diff --git a/pkgs/games/quake3/wrapper/default.nix b/pkgs/games/quake3/wrapper/default.nix index 4ab53d67732..3cb64641153 100644 --- a/pkgs/games/quake3/wrapper/default.nix +++ b/pkgs/games/quake3/wrapper/default.nix @@ -1,6 +1,6 @@ { stdenv, buildEnv, lib, libGL, ioquake3, makeWrapper }: -{ paks, name ? (stdenv.lib.head paks).name, description ? "" }: +{ paks, name ? (lib.head paks).name, description ? "" }: let libPath = lib.makeLibraryPath [ libGL stdenv.cc.cc ]; diff --git a/pkgs/games/quakespasm/default.nix b/pkgs/games/quakespasm/default.nix index 1e8de1a18f0..64b7c8f7920 100644 --- a/pkgs/games/quakespasm/default.nix +++ b/pkgs/games/quakespasm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, SDL, fetchurl, gzip, libvorbis, libmad }: +{ lib, stdenv, SDL, fetchurl, gzip, libvorbis, libmad }: stdenv.mkDerivation rec { pname = "quakespasm"; majorVersion = "0.93"; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { and smoother mouse input - though no CD support. ''; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.m3tti ]; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.m3tti ]; }; } diff --git a/pkgs/games/quantumminigolf/default.nix b/pkgs/games/quantumminigolf/default.nix index 1a8cbbea5f9..61e2e1c4eb3 100644 --- a/pkgs/games/quantumminigolf/default.nix +++ b/pkgs/games/quantumminigolf/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, fftwSinglePrec, freetype, SDL, SDL_ttf}: +{lib, stdenv, fetchurl, fftwSinglePrec, freetype, SDL, SDL_ttf}: let s = # Generated upstream information rec { @@ -32,9 +32,9 @@ stdenv.mkDerivation { ''; meta = { inherit (s) version; - description = ''Quantum mechanics-based minigolf-like game''; - license = stdenv.lib.licenses.gpl2 ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + description = "Quantum mechanics-based minigolf-like game"; + license = lib.licenses.gpl2 ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/r2mod_cli/default.nix b/pkgs/games/r2mod_cli/default.nix index edf53482ac3..b81f1814ac9 100644 --- a/pkgs/games/r2mod_cli/default.nix +++ b/pkgs/games/r2mod_cli/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; postInstall = '' - wrapProgram $out/bin/r2mod --prefix PATH : "${stdenv.lib.makeBinPath [ jq p7zip ]}"; + wrapProgram $out/bin/r2mod --prefix PATH : "${lib.makeBinPath [ jq p7zip ]}"; ''; meta = with lib; { diff --git a/pkgs/games/racer/default.nix b/pkgs/games/racer/default.nix index a5d9a911afa..dfbe9bc45e1 100644 --- a/pkgs/games/racer/default.nix +++ b/pkgs/games/racer/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, allegro, libjpeg, makeWrapper }: +{ fetchurl, lib, stdenv, allegro, libjpeg, makeWrapper }: stdenv.mkDerivation { name = "racer-1.1"; @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = { description = "Car racing game"; homepage = "http://hippo.nipax.cz/download.en.php"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/redeclipse/default.nix b/pkgs/games/redeclipse/default.nix index 4b24de28c45..07c2b9e33ad 100644 --- a/pkgs/games/redeclipse/default.nix +++ b/pkgs/games/redeclipse/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchurl, fetchpatch -, curl, ed, pkgconfig, freetype, zlib, libX11 +, curl, ed, pkg-config, freetype, zlib, libX11 , SDL2, SDL2_image, SDL2_mixer }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - curl ed pkgconfig + curl ed pkg-config ]; makeFlags = [ "-C" "src/" "prefix=$(out)" ]; diff --git a/pkgs/games/residualvm/default.nix b/pkgs/games/residualvm/default.nix index da003c3190f..51dd4f90860 100644 --- a/pkgs/games/residualvm/default.nix +++ b/pkgs/games/residualvm/default.nix @@ -1,12 +1,10 @@ -{ stdenv, fetchurl, SDL, zlib, libmpeg2, libmad, libogg, libvorbis, flac, alsaLib -, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms +{ lib, stdenv, fetchurl, SDL, zlib, libmpeg2, libmad, libogg, libvorbis, flac, alsaLib +, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms , openglSupport ? libGLSupported, libGLU, libGL ? null }: assert openglSupport -> libGL != null && libGLU != null; -with stdenv.lib; - stdenv.mkDerivation rec { version = "0.1.1"; pname = "residualvm"; @@ -17,15 +15,15 @@ stdenv.mkDerivation rec { }; buildInputs = [ stdenv SDL zlib libmpeg2 libmad libogg libvorbis flac alsaLib ] - ++ optionals openglSupport [ libGL libGLU ]; + ++ lib.optionals openglSupport [ libGL libGLU ]; configureFlags = [ "--enable-all-engines" ]; - meta = { + meta = with lib; { description = "Interpreter for LucasArts' Lua-based 3D adventure games"; homepage = "http://residualvm.org/"; repositories.git = "https://github.com/residualvm/residualvm.git"; license = licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/games/rftg/default.nix b/pkgs/games/rftg/default.nix index 966f903888b..1dfeaf3c3a8 100644 --- a/pkgs/games/rftg/default.nix +++ b/pkgs/games/rftg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk2, pkgconfig }: +{ lib, stdenv, fetchurl, gtk2, pkg-config }: stdenv.mkDerivation rec { @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { sha256 = "0j2y6ggpwdlvyqhirp010aix2g6aacj3kvggvpwzxhig30x9vgq8"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2.dev ]; meta = { homepage = "http://keldon.net/rftg/"; description = "Implementation of the card game Race for the Galaxy, including an AI"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.falsifian ]; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.falsifian ]; }; } diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix index f1e1c50a596..01dd1f0c04f 100644 --- a/pkgs/games/rigsofrods/default.nix +++ b/pkgs/games/rigsofrods/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, wxGTK30, freeimage, cmake, zziplib, libGLU, libGL, boost, +{ fetchFromGitHub, lib, stdenv, wxGTK30, freeimage, cmake, zziplib, libGLU, libGL, boost, pkg-config, libuuid, openal, ogre, ois, curl, gtk2, mygui, unzip, angelscript, ogrepaged, mysocketw, libxcb }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { libuuid openal ogre ois curl gtk2 mygui unzip angelscript ogrepaged mysocketw libxcb ]; - meta = with stdenv.lib; { + meta = with lib; { description = "3D simulator game where you can drive, fly and sail various vehicles"; homepage = "http://rigsofrods.sourceforge.net/"; license = licenses.gpl3; diff --git a/pkgs/games/rili/default.nix b/pkgs/games/rili/default.nix index 0b7fa118f80..0e3fa9b8cc8 100644 --- a/pkgs/games/rili/default.nix +++ b/pkgs/games/rili/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL_mixer, SDL, autoreconfHook }: +{ lib, stdenv, fetchurl, SDL_mixer, SDL, autoreconfHook }: stdenv.mkDerivation { name = "ri_li-2.0.1"; @@ -17,14 +17,14 @@ stdenv.mkDerivation { meta = { homepage = "http://ri-li.sourceforge.net"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; description = "A children's train game"; longDescription = '' Ri-li is an arcade game licensed under the GPL (General Public License). You drive a toy wood engine in many levels and you must collect all the coaches to win. ''; - maintainers = with stdenv.lib.maintainers; [ jcumming ]; - platforms = with stdenv.lib.platforms; linux; + maintainers = with lib.maintainers; [ jcumming ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/games/rimshot/default.nix b/pkgs/games/rimshot/default.nix index 381d00bf992..e7f2f2e781a 100644 --- a/pkgs/games/rimshot/default.nix +++ b/pkgs/games/rimshot/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { unpackPhase = '' unzip -j $src - ''; + ''; installPhase = '' diff --git a/pkgs/games/robotfindskitten/default.nix b/pkgs/games/robotfindskitten/default.nix index 73beba2e34f..382c2ef71ae 100644 --- a/pkgs/games/robotfindskitten/default.nix +++ b/pkgs/games/robotfindskitten/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, ncurses }: +{ lib, stdenv, fetchurl, pkg-config, ncurses }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "robotfindskitten"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1bwrkxm83r9ajpkd6x03nqvmdfpf5vz6yfy0c97pq3v3ykj74082"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses ]; makeFlags = [ "execgamesdir=$(out)/bin" ]; diff --git a/pkgs/games/scid-vs-pc/default.nix b/pkgs/games/scid-vs-pc/default.nix index bb33faf7374..33373e0e7b1 100644 --- a/pkgs/games/scid-vs-pc/default.nix +++ b/pkgs/games/scid-vs-pc/default.nix @@ -74,9 +74,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Chess database with play and training functionality"; homepage = "http://scidvspc.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; maintainers = [ maintainers.paraseba ]; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/scid/default.nix b/pkgs/games/scid/default.nix index b3d22d4c0f9..f0fdef8e62e 100644 --- a/pkgs/games/scid/default.nix +++ b/pkgs/games/scid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, tcl, tk, libX11, zlib, makeWrapper }: +{ lib, stdenv, fetchurl, tcl, tk, libX11, zlib, makeWrapper }: stdenv.mkDerivation { pname = "scid"; @@ -52,6 +52,6 @@ stdenv.mkDerivation { meta = { description = "Chess database with play and training functionality"; homepage = "http://scid.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/games/scorched3d/default.nix b/pkgs/games/scorched3d/default.nix index 47c17ce60d7..227ab720490 100644 --- a/pkgs/games/scorched3d/default.nix +++ b/pkgs/games/scorched3d/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libGLU, libGL, glew, pkgconfig, openalSoft, freealut, wxGTK, libogg +{ lib, stdenv, fetchurl, libGLU, libGL, glew, pkg-config, openalSoft, freealut, wxGTK, libogg , freetype, libvorbis, fftwSinglePrec, SDL, SDL_net, expat, libjpeg, libpng }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { SDL SDL_net expat libjpeg libpng fftwSinglePrec ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; patches = [ ./file-existence.patch diff --git a/pkgs/games/scrolls/default.nix b/pkgs/games/scrolls/default.nix index a435a240ede..13079e15984 100644 --- a/pkgs/games/scrolls/default.nix +++ b/pkgs/games/scrolls/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gcc +{ lib, stdenv, fetchurl, gcc , libGLU, libX11, libXext, libXcursor, libpulseaudio }: stdenv.mkDerivation { @@ -11,7 +11,7 @@ stdenv.mkDerivation { platforms = [ "x86_64-linux" ]; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; }; src = fetchurl { @@ -19,7 +19,7 @@ stdenv.mkDerivation { sha256 = "ead1fd14988aa07041fedfa7f845c756cd5077a5a402d85bfb749cb669ececec"; }; - libPath = stdenv.lib.makeLibraryPath [ + libPath = lib.makeLibraryPath [ gcc libGLU libX11 diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix index 24ea62d9db8..2582161eee4 100644 --- a/pkgs/games/sgt-puzzles/default.nix +++ b/pkgs/games/sgt-puzzles/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, desktop-file-utils , gtk3, libX11 -, makeWrapper, pkgconfig, perl, autoreconfHook, wrapGAppsHook +, makeWrapper, pkg-config, perl, autoreconfHook, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook desktop-file-utils makeWrapper - pkgconfig perl wrapGAppsHook ]; + pkg-config perl wrapGAppsHook ]; buildInputs = [ gtk3 libX11 ]; diff --git a/pkgs/games/shattered-pixel-dungeon/default.nix b/pkgs/games/shattered-pixel-dungeon/default.nix index f8aa4397dda..eea8d5650be 100644 --- a/pkgs/games/shattered-pixel-dungeon/default.nix +++ b/pkgs/games/shattered-pixel-dungeon/default.nix @@ -10,13 +10,13 @@ let pname = "shattered-pixel-dungeon"; - version = "0.8.2d"; + version = "0.9.1d"; src = fetchFromGitHub { owner = "00-Evan"; repo = "shattered-pixel-dungeon"; rev = "v${version}"; - sha256 = "11lgalam1aacw01ar7nawiim4pbxqzrdrnxvj6wq9mg83hgsz65l"; + sha256 = "0f9vi1iffh477zi03hi07rmfbkb8i4chwvv43vs70mgjh4qx7247"; }; postPatch = '' @@ -34,6 +34,8 @@ let nativeBuildInputs = [ gradle_5 perl ]; buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) + # https://github.com/gradle/gradle/issues/4426 + ${lib.optionalString stdenv.isDarwin "export TERM=dumb"} gradle --no-daemon desktop:release ''; # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) @@ -54,6 +56,8 @@ in stdenv.mkDerivation rec { buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) + # https://github.com/gradle/gradle/issues/4426 + ${lib.optionalString stdenv.isDarwin "export TERM=dumb"} # point to offline repo sed -ie "s#repositories {#repositories { maven { url '${deps}' };#g" build.gradle gradle --offline --no-daemon desktop:release @@ -78,6 +82,8 @@ in stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; + # https://github.com/NixOS/nixpkgs/pull/99885#issuecomment-740065005 + broken = stdenv.isDarwin; }; } diff --git a/pkgs/games/sienna/default.nix b/pkgs/games/sienna/default.nix index 0a38723368e..1a1e82b7d64 100644 --- a/pkgs/games/sienna/default.nix +++ b/pkgs/games/sienna/default.nix @@ -13,7 +13,7 @@ let name = "sienna"; exec = pname; icon = icon; - comment = "Fast-paced one button platformer"; + comment = "Fast-paced one button platformer"; desktopName = "Sienna"; genericName = "sienna"; categories = "Game;"; diff --git a/pkgs/games/sil/default.nix b/pkgs/games/sil/default.nix index 208a14dc1c5..3128ed5358b 100644 --- a/pkgs/games/sil/default.nix +++ b/pkgs/games/sil/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchzip, ncurses, libX11, libXaw, libXt, libXext, libXmu, makeWrapper, writeScript, ... }: -let +{ lib, stdenv, fetchzip, ncurses, libX11, libXaw, libXt, libXext, libXmu, makeWrapper, writeScript, ... }: +let setup = writeScript "setup" '' mkdir -p "$ANGBAND_PATH" # Copy all the data files into place @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { prePatch = '' # Allow usage of ANGBAND_PATH - substituteInPlace config.h --replace "#define FIXED_PATHS" "" + substituteInPlace config.h --replace "#define FIXED_PATHS" "" ''; preConfigure = '' @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp sil $out/bin/sil # Wrap the program to set a user-local ANGBAND_PATH, and run the setup script to copy files into place - # We could just use the options for a user-local save and scores dir, but it tried to write to the + # We could just use the options for a user-local save and scores dir, but it tried to write to the # lib directory anyway, so we might as well give everyone a copy wrapProgram $out/bin/sil \ --run "set -u" \ @@ -49,15 +49,15 @@ stdenv.mkDerivation rec { meta = { description = "A rouge-like game set in the first age of Middle-earth"; longDescription = '' - A game of adventure set in the first age of Middle-earth, when the world still + A game of adventure set in the first age of Middle-earth, when the world still rang with elven song and gleamed with dwarven mail. - Walk the dark halls of Angband. Slay creatures black and fell. Wrest a shining + Walk the dark halls of Angband. Slay creatures black and fell. Wrest a shining Silmaril from Morgoth’s iron crown. ''; homepage = "http://www.amirrorclear.net/flowers/game/sil/index.html"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.michaelpj ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.michaelpj ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix index b45a182cc01..942c93ec043 100644 --- a/pkgs/games/simutrans/default.nix +++ b/pkgs/games/simutrans/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, unzip, zlib, libpng, bzip2, SDL, SDL_mixer +{ lib, stdenv, fetchurl, pkg-config, unzip, zlib, libpng, bzip2, SDL, SDL_mixer , buildEnv, config, runtimeShell }: @@ -6,7 +6,7 @@ let # Choose your "paksets" of objects, images, text, music, etc. paksets = config.simutrans.paksets or "pak64 pak64.japan pak128 pak128.britain pak128.german"; - result = with stdenv.lib; withPaks ( + result = with lib; withPaks ( if paksets == "*" then attrValues pakSpec # taking all else map (name: pakSpec.${name}) (splitString " " paksets) ); @@ -24,7 +24,7 @@ let # As of 2015/03, many packsets still didn't have a release for version 120. - pakSpec = stdenv.lib.mapAttrs + pakSpec = lib.mapAttrs (pakName: attrs: mkPak (attrs // {inherit pakName;})) { pak64 = { @@ -115,7 +115,7 @@ let sourceRoot = "."; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib libpng bzip2 SDL SDL_mixer unzip ]; configurePhase = let diff --git a/pkgs/games/sm64ex/default.nix b/pkgs/games/sm64ex/default.nix index 1e678a49f05..24ff2283791 100644 --- a/pkgs/games/sm64ex/default.nix +++ b/pkgs/games/sm64ex/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { buildInputs = [ audiofile SDL2 hexdump ]; makeFlags = [ "VERSION=${region}" ] ++ compileFlags - ++ stdenv.lib.optionals stdenv.isDarwin [ "OSX_BUILD=1" ]; + ++ lib.optionals stdenv.isDarwin [ "OSX_BUILD=1" ]; inherit baseRom; diff --git a/pkgs/games/snake4/default.nix b/pkgs/games/snake4/default.nix index e5419cef249..c0cad5f05d3 100644 --- a/pkgs/games/snake4/default.nix +++ b/pkgs/games/snake4/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { --replace "-o \$(OWNER) -g \$(GROUP)" "" \ --replace "4755" "755" ''; - + installFlags = [ "INSTLIBDIR=$(out)/lib" "INSTBINDIR=$(out)/bin" "INSTMANDIR=$(out)/man" ]; diff --git a/pkgs/games/soldat-unstable/default.nix b/pkgs/games/soldat-unstable/default.nix index 0278afc5e40..d48cf3048ee 100644 --- a/pkgs/games/soldat-unstable/default.nix +++ b/pkgs/games/soldat-unstable/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, fpc, zip, makeWrapper +{ lib, stdenv, fetchFromGitHub, fetchpatch, fpc, zip, makeWrapper , SDL2, freetype, physfs, openal, gamenetworkingsockets , xorg, autoPatchelfHook }: @@ -27,7 +27,7 @@ let install -Dm644 client/play-regular.ttf -t $out/share/soldat ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Soldat's base game content"; license = licenses.cc-by-40; platforms = platforms.all; @@ -109,7 +109,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Soldat is a unique 2D (side-view) multiplayer action game"; license = [ licenses.mit base.meta.license ]; inherit (src.meta) homepage; diff --git a/pkgs/games/speed-dreams/default.nix b/pkgs/games/speed-dreams/default.nix index 473409ffae9..c0bb7b67e04 100644 --- a/pkgs/games/speed-dreams/default.nix +++ b/pkgs/games/speed-dreams/default.nix @@ -1,6 +1,6 @@ -{ fetchurl, stdenv, libGLU, libGL, freeglut, libX11, plib, openal, freealut, libXrandr, xorgproto, +{ fetchurl, lib, stdenv, libGLU, libGL, freeglut, libX11, plib, openal, freealut, libXrandr, xorgproto, libXext, libSM, libICE, libXi, libXt, libXrender, libXxf86vm, openscenegraph, expat, -libpng, zlib, bash, SDL2, enet, libjpeg, cmake, pkgconfig, libvorbis, runtimeShell, curl }: +libpng, zlib, bash, SDL2, enet, libjpeg, cmake, pkg-config, libvorbis, runtimeShell, curl }: let version = "2.2.2-r6553"; @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { done ''; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ libpng libGLU libGL freeglut libX11 plib openal freealut libXrandr xorgproto libXext libSM libICE libXi libXt libXrender libXxf86vm zlib bash expat @@ -65,9 +65,9 @@ stdenv.mkDerivation rec { meta = { description = "Car racing game - TORCS fork with more experimental approach"; homepage = "http://speed-dreams.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [raskin]; + platforms = lib.platforms.linux; hydraPlatforms = []; }; } diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix index 9bc204c08d0..fe16a8a0403 100644 --- a/pkgs/games/spring/default.nix +++ b/pkgs/games/spring/default.nix @@ -44,14 +44,14 @@ stdenv.mkDerivation rec { buildInputs = [ lzma boost libdevil zlib p7zip openal libvorbis freetype SDL2 xorg.libX11 xorg.libXcursor libGLU libGL glew curl systemd libunwind which minizip ] - ++ stdenv.lib.optional withAI jdk - ++ stdenv.lib.optional withAI python; + ++ lib.optional withAI jdk + ++ lib.optional withAI python; NIX_CFLAGS_COMPILE = "-fpermissive"; # GL header minor incompatibility postInstall = '' wrapProgram "$out/bin/spring" \ - --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc systemd ]}" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc systemd ]}" ''; meta = with lib; { diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix index 2f8a9d9885b..009457a9dad 100644 --- a/pkgs/games/spring/springlobby.nix +++ b/pkgs/games/spring/springlobby.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, cmake, wxGTK30, openal, pkgconfig, curl, libtorrent-rasterbar +{ lib, stdenv, fetchurl, fetchpatch, cmake, wxGTK30, openal, pkg-config, curl, libtorrent-rasterbar , libpng, libX11, gettext, boost, libnotify, gtk2, doxygen, spring , makeWrapper, glib, minizip, alure, pcre, jsoncpp }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1r1g2hw9ipsmsmzbhsi7bxqra1za6x7j1kw12qzl5psqyq8rqbgs"; }; - nativeBuildInputs = [ cmake pkgconfig gettext doxygen makeWrapper ]; + nativeBuildInputs = [ cmake pkg-config gettext doxygen makeWrapper ]; buildInputs = [ wxGTK30 openal curl libtorrent-rasterbar pcre jsoncpp boost libpng libX11 libnotify gtk2 glib minizip alure diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index 4c57ce9aeb0..57326667cb0 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -29,7 +29,7 @@ let # Needed by gdialog, including in the steam-runtime perl # Open URLs - xdg_utils + xdg-utils iana-etc # Steam Play / Proton python3 @@ -284,12 +284,19 @@ in buildFHSUserEnv rec { # this fixes certain issues where they don't render correctly unshareIpc = false; + # Some applications such as Natron need access to MIT-SHM or other + # shared memory mechanisms. Unsharing the pid namespace + # breaks the ability for application to reference shared memory. + unsharePid = false; + passthru.run = buildFHSUserEnv { name = "steam-run"; targetPkgs = commonTargetPkgs; inherit multiPkgs extraBuildCommands; + inherit unshareIpc unsharePid; + runScript = writeScript "steam-run" '' #!${runtimeShell} run="$1" diff --git a/pkgs/games/steam/steam.nix b/pkgs/games/steam/steam.nix index f7ef287c1ff..43c1512c650 100644 --- a/pkgs/games/steam/steam.nix +++ b/pkgs/games/steam/steam.nix @@ -17,7 +17,7 @@ in stdenv.mkDerivation { postInstall = '' rm $out/bin/steamdeps - ${stdenv.lib.optionalString traceDeps '' + ${lib.optionalString traceDeps '' cat > $out/bin/steamdeps <<EOF #!${runtimeShell} echo \$1 >> ${traceLog} diff --git a/pkgs/games/supertux/default.nix b/pkgs/games/supertux/default.nix index 01048c82543..31b36efc490 100644 --- a/pkgs/games/supertux/default.nix +++ b/pkgs/games/supertux/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, pkgconfig, SDL2, SDL2_image , curl +{ lib, stdenv, fetchurl, cmake, pkg-config, SDL2, SDL2_image , curl , libogg, libvorbis, libGLU, libGL, openal, boost, glew , libpng, freetype }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "167m3z4m8n76dvbv42m1fnvabpbpsxvr28zk9641916jl9pfba96"; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ SDL2 SDL2_image curl libogg libvorbis libGLU libGL openal boost glew libpng freetype diff --git a/pkgs/games/t4kcommon/default.nix b/pkgs/games/t4kcommon/default.nix index bc820c8e8e4..74757c236c5 100644 --- a/pkgs/games/t4kcommon/default.nix +++ b/pkgs/games/t4kcommon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, cmake, pkgconfig, SDL, SDL_image, SDL_mixer, SDL_net, SDL_ttf, libpng, librsvg, libxml2 }: +{ lib, stdenv, fetchFromGitHub, fetchurl, cmake, pkg-config, SDL, SDL_image, SDL_mixer, SDL_net, SDL_ttf, libpng, librsvg, libxml2 }: stdenv.mkDerivation rec { version = "0.1.1"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ SDL SDL_image SDL_mixer SDL_net SDL_ttf libpng librsvg libxml2 ]; meta = with lib; { diff --git a/pkgs/games/taisei/default.nix b/pkgs/games/taisei/default.nix index e0d1175fce8..4bc04a336f8 100644 --- a/pkgs/games/taisei/default.nix +++ b/pkgs/games/taisei/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl # Build depends -, docutils, meson, ninja, pkgconfig, python3 +, docutils, meson, ninja, pkg-config, python3 # Runtime depends , glfw, SDL2, SDL2_mixer , freetype, libpng, libwebp, libzip, zlib @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - docutils meson ninja pkgconfig python3 + docutils meson ninja pkg-config python3 ]; buildInputs = [ diff --git a/pkgs/games/tcl2048/default.nix b/pkgs/games/tcl2048/default.nix index 765c50149ac..734e7be3666 100644 --- a/pkgs/games/tcl2048/default.nix +++ b/pkgs/games/tcl2048/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, tcl, tcllib, runtimeShell }: +{ lib, stdenv, fetchurl, tcl, tcllib, runtimeShell }: stdenv.mkDerivation { name = "tcl2048-0.4.0"; @@ -27,8 +27,8 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/dbohdan/2048.tcl"; description = "The game of 2048 implemented in Tcl"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ dbohdan ]; + license = lib.licenses.mit; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ dbohdan ]; }; } diff --git a/pkgs/games/teetertorture/default.nix b/pkgs/games/teetertorture/default.nix index a568fd79085..9df0843c5e4 100644 --- a/pkgs/games/teetertorture/default.nix +++ b/pkgs/games/teetertorture/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, SDL, SDL_image, SDL_mixer}: +{ lib, stdenv, fetchurl, SDL, SDL_image, SDL_mixer }: stdenv.mkDerivation { name = "teeter-torture-20051018"; @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.newbreedsoftware.com/teetertorture/"; description = "Simple shooting game with your cannon is sitting atop a teeter totter"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/teeworlds/default.nix b/pkgs/games/teeworlds/default.nix index 9ff50d533be..19f562d54af 100644 --- a/pkgs/games/teeworlds/default.nix +++ b/pkgs/games/teeworlds/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, cmake, pkgconfig, python3, alsaLib +{ fetchFromGitHub, lib, stdenv, cmake, pkg-config, python3, alsaLib , libX11, libGLU, SDL2, lua5_3, zlib, freetype, wavpack, icoutils , nixosTests }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { '#define DATA_DIR "${placeholder "out"}/share/teeworlds/data"' ''; - nativeBuildInputs = [ cmake pkgconfig icoutils ]; + nativeBuildInputs = [ cmake pkg-config icoutils ]; buildInputs = [ python3 alsaLib libX11 libGLU SDL2 lua5_3 zlib freetype wavpack @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { homepage = "https://teeworlds.com/"; license = "BSD-style, see `license.txt'"; - maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with lib.maintainers; [ astsmtl ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/the-butterfly-effect/default.nix b/pkgs/games/the-butterfly-effect/default.nix index c87d1bea1c7..f5330485edd 100644 --- a/pkgs/games/the-butterfly-effect/default.nix +++ b/pkgs/games/the-butterfly-effect/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, qt5, box2d, which, cmake, gettext }: +{ lib, mkDerivation, fetchFromGitHub, qt5, box2d, which, cmake, gettext }: mkDerivation rec { pname = "tbe"; diff --git a/pkgs/games/the-powder-toy/default.nix b/pkgs/games/the-powder-toy/default.nix index 084a4103bd5..5d240a9fe91 100644 --- a/pkgs/games/the-powder-toy/default.nix +++ b/pkgs/games/the-powder-toy/default.nix @@ -1,5 +1,4 @@ - -{ lib, stdenv, fetchFromGitHub, scons, pkgconfig, SDL2, lua, fftwFloat, +{ lib, stdenv, fetchFromGitHub, scons, pkg-config, SDL2, lua, fftwFloat, zlib, bzip2, curl, darwin }: stdenv.mkDerivation rec { @@ -13,9 +12,9 @@ stdenv.mkDerivation rec { sha256 = "18rp2g1mj0gklra06wm9dm57h73hmm301npndh0y8ap192i5s8sa"; }; - nativeBuildInputs = [ scons pkgconfig ]; + nativeBuildInputs = [ scons pkg-config ]; - propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin + propagatedBuildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; buildInputs = [ SDL2 lua fftwFloat zlib bzip2 curl ]; diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix index b8c2c3f3cf4..0892dc2dedd 100644 --- a/pkgs/games/tibia/default.nix +++ b/pkgs/games/tibia/default.nix @@ -1,6 +1,5 @@ -{ stdenv, fetchurl, glibc, libX11, runtimeShell, libGLU, libGL }: +{ lib, stdenv, fetchurl, glibc, libX11, runtimeShell, libGLU, libGL }: -with stdenv.lib; stdenv.mkDerivation { name = "tibia-10.90"; @@ -24,7 +23,7 @@ stdenv.mkDerivation { cp -r * $out/res patchelf --set-interpreter ${glibc.out}/lib/ld-linux.so.2 \ - --set-rpath ${stdenv.lib.makeLibraryPath [ stdenv.cc.cc libX11 libGLU libGL ]} \ + --set-rpath ${lib.makeLibraryPath [ stdenv.cc.cc libX11 libGLU libGL ]} \ "$out/res/Tibia" # We've patchelf'd the files. The main ‘Tibia’ binary is a bit @@ -50,8 +49,8 @@ stdenv.mkDerivation { meta = { description = "Top-down MMORPG set in a fantasy world"; homepage = "http://tibia.com"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; platforms = ["i686-linux"]; - maintainers = with stdenv.lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/games/tinyfugue/default.nix b/pkgs/games/tinyfugue/default.nix index fb706d38e18..763241f2909 100644 --- a/pkgs/games/tinyfugue/default.nix +++ b/pkgs/games/tinyfugue/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, ncurses, zlib +{ lib, stdenv, fetchurl, ncurses, zlib , openssl ? null , sslSupport ? true }: -with stdenv.lib; +with lib; assert sslSupport -> openssl != null; diff --git a/pkgs/games/torcs/default.nix b/pkgs/games/torcs/default.nix index 136578924a0..d1dafb85ce3 100644 --- a/pkgs/games/torcs/default.nix +++ b/pkgs/games/torcs/default.nix @@ -1,4 +1,4 @@ -{ fetchpatch, fetchurl, stdenv, libGLU, freeglut, libX11, plib, openal, freealut, libXrandr, xorgproto, +{ fetchpatch, fetchurl, lib, stdenv, libGLU, freeglut, libX11, plib, openal, freealut, libXrandr, xorgproto, libXext, libSM, libICE, libXi, libXt, libXrender, libXxf86vm, libvorbis, libpng, zlib, makeWrapper }: @@ -42,9 +42,9 @@ stdenv.mkDerivation rec { meta = { description = "Car racing game"; homepage = "http://torcs.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [viric]; + platforms = lib.platforms.linux; hydraPlatforms = []; }; } diff --git a/pkgs/games/trackballs/default.nix b/pkgs/games/trackballs/default.nix index 3eee4f17af1..8ebeab4b260 100644 --- a/pkgs/games/trackballs/default.nix +++ b/pkgs/games/trackballs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, SDL2, SDL2_ttf, gettext, zlib, SDL2_mixer, SDL2_image, guile, libGLU, libGL }: +{ lib, stdenv, fetchFromGitHub, cmake, SDL2, SDL2_ttf, gettext, zlib, SDL2_mixer, SDL2_image, guile, libGLU, libGL }: stdenv.mkDerivation rec { pname = "trackballs"; @@ -14,10 +14,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ zlib SDL2 SDL2_ttf SDL2_mixer SDL2_image guile gettext libGLU libGL ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://trackballs.github.io/"; description = "3D Marble Madness clone"; platforms = platforms.linux; - license = licenses.gpl2; + # Music is licensed under Ethymonics Free Music License. + license = licenses.gpl2Plus; }; } diff --git a/pkgs/games/trigger/default.nix b/pkgs/games/trigger/default.nix index 74a56f1fd40..cb3227f24e3 100644 --- a/pkgs/games/trigger/default.nix +++ b/pkgs/games/trigger/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, runtimeShell, SDL2, freealut, SDL2_image, openal, physfs +{ lib, fetchurl, stdenv, runtimeShell, SDL2, freealut, SDL2_image, openal, physfs , zlib, libGLU, libGL, glew, tinyxml-2 }: stdenv.mkDerivation rec { @@ -47,8 +47,8 @@ stdenv.mkDerivation rec { meta = { description = "A fast-paced single-player racing game"; homepage = "http://trigger-rally.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/games/tuxpaint/default.nix b/pkgs/games/tuxpaint/default.nix index a5bea42d04e..289b4e386be 100644 --- a/pkgs/games/tuxpaint/default.nix +++ b/pkgs/games/tuxpaint/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, SDL, SDL_image, SDL_ttf, SDL_mixer, libpng, - cairo, librsvg, gettext, libpaper, fribidi, pkgconfig, gperf, imagemagick }: +{ lib, stdenv, fetchurl, SDL, SDL_image, SDL_ttf, SDL_mixer, libpng, + cairo, librsvg, gettext, libpaper, fribidi, pkg-config, gperf, imagemagick }: stdenv.mkDerivation rec { version = "0.9.24"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ SDL SDL_image SDL_ttf SDL_mixer libpng cairo - librsvg gettext libpaper fribidi pkgconfig gperf imagemagick ]; + librsvg gettext libpaper fribidi pkg-config gperf imagemagick ]; hardeningDisable = [ "format" ]; makeFlags = [ "GPERF=${gperf}/bin/gperf" "PREFIX=$$out" @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { mkdir -p $out/share/applications cp hildon/tuxpaint.xpm $out/share/pixmaps sed -e "s+Exec=tuxpaint+Exec=$out/bin/tuxpaint+" < src/tuxpaint.desktop > $out/share/applications/tuxpaint.desktop - + # Install stamps tar xzf $stamps cd tuxpaint-stamps-2014.08.23 @@ -45,8 +45,8 @@ stdenv.mkDerivation rec { meta = { description = "Open Source Drawing Software for Children"; homepage = "http://www.tuxpaint.org/"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ woffs ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ woffs ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/tuxtype/default.nix b/pkgs/games/tuxtype/default.nix index 1032eba4bcb..0e32ebfbab9 100644 --- a/pkgs/games/tuxtype/default.nix +++ b/pkgs/games/tuxtype/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, librsvg, libxml2, SDL, SDL_image, SDL_mixer, SDL_net, SDL_ttf, t4kcommon }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, librsvg, libxml2, SDL, SDL_image, SDL_mixer, SDL_net, SDL_ttf, t4kcommon }: stdenv.mkDerivation rec { version = "1.8.3"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { --replace 'PKG_CHECK_MODULES([SDL_ttf],' 'PKG_CHECK_MODULES([SDL_TTF],' ''; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ librsvg libxml2 SDL SDL_image SDL_mixer SDL_net SDL_ttf t4kcommon ]; configureFlags = [ "--without-sdlpango" ]; diff --git a/pkgs/games/ue4/default.nix b/pkgs/games/ue4/default.nix index 643779cf5fd..95f0d64f197 100644 --- a/pkgs/games/ue4/default.nix +++ b/pkgs/games/ue4/default.nix @@ -1,8 +1,7 @@ -{ stdenv, writeScript, fetchurl, requireFile, unzip, clang, mono, which, +{ lib, stdenv, writeScript, fetchurl, requireFile, unzip, clang, mono, which, xorg, xdg-user-dirs }: let - inherit (stdenv) lib; deps = import ./cdn-deps.nix { inherit fetchurl; }; linkDeps = writeScript "link-deps.sh" (lib.concatMapStringsSep "\n" (hash: let prefix = lib.concatStrings (lib.take 2 (lib.stringToCharacters hash)); @@ -11,7 +10,7 @@ let ln -s ${lib.getAttr hash deps} .git/ue4-gitdeps/${prefix}/${hash} '' ) (lib.attrNames deps)); - libPath = stdenv.lib.makeLibraryPath [ + libPath = lib.makeLibraryPath [ xorg.libX11 xorg.libXScrnSaver xorg.libXau xorg.libXcursor xorg.libXext xorg.libXfixes xorg.libXi xorg.libXrandr xorg.libXrender xorg.libXxf86vm xorg.libxcb @@ -75,9 +74,9 @@ stdenv.mkDerivation rec { meta = { description = "A suite of integrated tools for game developers to design and build games, simulations, and visualizations"; homepage = "https://www.unrealengine.com/what-is-unreal-engine-4"; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.puffnfresh ]; + license = lib.licenses.unfree; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.puffnfresh ]; broken = true; }; } diff --git a/pkgs/games/ue4demos/default.nix b/pkgs/games/ue4demos/default.nix index 24c98f7d774..a2d114f5113 100644 --- a/pkgs/games/ue4demos/default.nix +++ b/pkgs/games/ue4demos/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, patchelf, xorg, openal }: +{ lib, stdenv, fetchurl, unzip, patchelf, xorg, openal }: let urls = file: @@ -14,9 +14,9 @@ let nativeBuildInputs = [ unzip patchelf ]; - rtdeps = stdenv.lib.makeLibraryPath + rtdeps = lib.makeLibraryPath [ xorg.libXxf86vm xorg.libXext openal ] - + ":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" [ stdenv.cc.cc ]; + + ":" + lib.makeSearchPathOutput "lib" "lib64" [ stdenv.cc.cc ]; buildCommand = '' @@ -52,7 +52,7 @@ let description = "Unreal Engine 4 Linux demos"; homepage = "https://wiki.unrealengine.com/Linux_Demos"; platforms = [ "x86_64-linux" ]; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; }; }; diff --git a/pkgs/games/ufoai/default.nix b/pkgs/games/ufoai/default.nix index 94a12774a43..7694821d44f 100644 --- a/pkgs/games/ufoai/default.nix +++ b/pkgs/games/ufoai/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libtheora, xvidcore, libGLU, libGL, SDL, SDL_ttf, SDL_mixer +{ lib, stdenv, fetchurl, libtheora, xvidcore, libGLU, libGL, SDL, SDL_ttf, SDL_mixer , curl, libjpeg, libpng, gettext, cunit, enableEditor?false }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { preConfigure = ''tar xvf "${srcData}"''; configureFlags = [ "--enable-release" "--enable-sse" ] - ++ stdenv.lib.optional enableEditor "--enable-uforadiant"; + ++ lib.optional enableEditor "--enable-uforadiant"; buildInputs = [ libtheora xvidcore libGLU libGL SDL SDL_ttf SDL_mixer @@ -28,9 +28,9 @@ stdenv.mkDerivation rec { meta = { homepage = "http://ufoai.org"; description = "A squad-based tactical strategy game in the tradition of X-Com"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [viric]; + platforms = lib.platforms.linux; hydraPlatforms = []; }; } diff --git a/pkgs/games/ultimatestunts/default.nix b/pkgs/games/ultimatestunts/default.nix index 6eb4725897f..9f38e43222c 100644 --- a/pkgs/games/ultimatestunts/default.nix +++ b/pkgs/games/ultimatestunts/default.nix @@ -1,5 +1,5 @@ -{stdenv, fetchurl, SDL, libGLU, libGL, SDL_image, freealut, openal, libvorbis, -pkgconfig}: +{lib, stdenv, fetchurl, SDL, libGLU, libGL, SDL_image, freealut, openal, libvorbis, +pkg-config}: stdenv.mkDerivation { name = "ultimate-stunts-0.7.6.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "0rd565ml6l927gyq158klhni7myw8mgllhv0xl1fg9m8hlzssgrv"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ SDL libGLU libGL SDL_image freealut openal libvorbis ]; postPatch = '' @@ -18,8 +18,8 @@ stdenv.mkDerivation { meta = { homepage = "http://www.ultimatestunts.nl/"; description = "Remake of the popular racing DOS-game Stunts"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/games/ultrastardx/default.nix b/pkgs/games/ultrastardx/default.nix index 43fd30f1d7d..63866d4bca9 100644 --- a/pkgs/games/ultrastardx/default.nix +++ b/pkgs/games/ultrastardx/default.nix @@ -2,7 +2,7 @@ , autoreconfHook , fetchFromGitHub , fetchpatch -, pkgconfig +, pkg-config , lua , fpc , pcre @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { sha256 = "0vmfv8zpyf8ymx3rjydpd7iqis080lni94vb316vfxkgvjmqbhym"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ fpc libpng ] ++ sharedLibs; patches = [ @@ -55,7 +55,7 @@ in stdenv.mkDerivation rec { --subst-var-by libpcre_LIBNAME libpcre.so.1 ''; - preBuild = with stdenv.lib; + preBuild = with lib; let items = concatMapStringsSep " " (x: "-rpath ${getLib x}/lib") sharedLibs; in '' export NIX_LDFLAGS="$NIX_LDFLAGS ${items}" diff --git a/pkgs/games/unciv/default.nix b/pkgs/games/unciv/default.nix new file mode 100644 index 00000000000..917cf328e7e --- /dev/null +++ b/pkgs/games/unciv/default.nix @@ -0,0 +1,59 @@ +{ stdenv +, lib +, fetchurl +, copyDesktopItems +, makeDesktopItem +, makeWrapper +, jre +, libpulseaudio +, libXxf86vm +}: +let + desktopItem = makeDesktopItem { + name = "unciv"; + exec = "unciv"; + comment = "An open-source Android/Desktop remake of Civ V"; + desktopName = "Unciv"; + categories = "Game;"; + }; + + envLibPath = lib.makeLibraryPath [ + libpulseaudio + libXxf86vm + ]; + +in +stdenv.mkDerivation rec { + pname = "unciv"; + version = "3.12.8"; + + src = fetchurl { + url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; + sha256 = "178lasa6ahwg2s2hamm13yysg42qm13v6a9pgs6nm66np93nskc7"; + }; + + dontUnpack = true; + + nativeBuildInputs = [ copyDesktopItems makeWrapper ]; + + installPhase = '' + runHook preInstall + + makeWrapper ${jre}/bin/java $out/bin/unciv \ + --prefix LD_LIBRARY_PATH : ${envLibPath} \ + --prefix PATH : ${lib.makeBinPath [ jre ]} \ + --add-flags "-jar ${src}" + + runHook postInstall + ''; + + desktopItems = [ desktopItem ]; + + meta = with lib; { + description = "An open-source Android/Desktop remake of Civ V"; + homepage = "https://github.com/yairm210/Unciv"; + maintainers = with maintainers; [ tex ]; + license = licenses.mpl20; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/games/uqm/3dovideo.nix b/pkgs/games/uqm/3dovideo.nix index 8d1bf2b6887..4ebbc9c4992 100644 --- a/pkgs/games/uqm/3dovideo.nix +++ b/pkgs/games/uqm/3dovideo.nix @@ -1,10 +1,8 @@ -{ stdenv, requireFile, writeText, fetchurl, haskellPackages }: - -with stdenv.lib; +{ stdenv, lib, requireFile, writeText, fetchurl, haskellPackages }: let makeSpin = num: let - padded = (optionalString (lessThan num 10) "0") + toString num; + padded = (lib.optionalString (lib.lessThan num 10) "0") + toString num; in "slides.spins.${padded} = 3DOVID:" + "addons/3dovideo/spins/ship${padded}.duk:" + "addons/3dovideo/spins/spin.aif:" + @@ -13,7 +11,7 @@ let videoRMP = writeText "3dovideo.rmp" ('' slides.ending = 3DOVID:addons/3dovideo/ending/victory.duk slides.intro = 3DOVID:addons/3dovideo/intro/intro.duk - '' + concatMapStrings makeSpin (range 0 24)); + '' + lib.concatMapStrings makeSpin (lib.range 0 24)); helper = with haskellPackages; mkDerivation { pname = "uqm3donix"; @@ -30,7 +28,7 @@ let buildDepends = [ base binary bytestring filepath tar ]; description = "Extract video files from a Star Control II 3DO image"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }; in stdenv.mkDerivation { diff --git a/pkgs/games/uqm/default.nix b/pkgs/games/uqm/default.nix index bce8fde3acd..a06c1b3b665 100644 --- a/pkgs/games/uqm/default.nix +++ b/pkgs/games/uqm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, libGLU, libGL +{ stdenv, lib, fetchurl, pkg-config, libGLU, libGL , SDL, SDL_image, libpng, libvorbis, libogg, libmikmod , use3DOVideos ? false, requireFile ? null, writeText ? null @@ -12,7 +12,7 @@ assert use3DOVideos -> requireFile != null && writeText != null let videos = import ./3dovideo.nix { - inherit stdenv requireFile writeText fetchurl haskellPackages; + inherit stdenv lib requireFile writeText fetchurl haskellPackages; }; remixPacks = lib.imap1 (num: sha256: fetchurl rec { @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { sha256 = "10nbvcrr0lc0mxivxfkcbxnibwk3vwmamabrlvwdsjxd9pk8aw65"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ SDL SDL_image libpng libvorbis libogg libmikmod libGLU libGL ]; postUnpack = '' @@ -102,7 +102,7 @@ in stdenv.mkDerivation rec { spin-offs, thereby making zillions more people happy! ''; homepage = "http://sc2.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ jcumming aszlig ]; platforms = with lib.platforms; linux; }; diff --git a/pkgs/games/vapor/default.nix b/pkgs/games/vapor/default.nix index e79c49779af..71028065263 100644 --- a/pkgs/games/vapor/default.nix +++ b/pkgs/games/vapor/default.nix @@ -14,13 +14,13 @@ let name = "Vapor"; exec = pname; icon = icon; - comment = "LÖVE Distribution Client"; + comment = "LÖVE Distribution Client"; desktopName = "Vapor"; genericName = "vapor"; categories = "Game;"; }; -in +in stdenv.mkDerivation { name = "${pname}-${version}"; diff --git a/pkgs/games/vdrift/default.nix b/pkgs/games/vdrift/default.nix index ea8b3941f8b..407603687ba 100644 --- a/pkgs/games/vdrift/default.nix +++ b/pkgs/games/vdrift/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchsvn, pkgconfig, sconsPackages, libGLU, libGL, SDL2, SDL2_image +{ lib, stdenv, fetchFromGitHub, fetchsvn, pkg-config, sconsPackages, libGLU, libGL, SDL2, SDL2_image , libvorbis, bullet, curl, gettext, writeTextFile , data ? fetchsvn { @@ -20,7 +20,7 @@ let sha256 = "001wq3c4n9wzxqfpq40b1jcl16sxbqv2zbkpy9rq2wf9h417q6hg"; }; - nativeBuildInputs = [ pkgconfig sconsPackages.scons_3_1_2 ]; + nativeBuildInputs = [ pkg-config sconsPackages.scons_3_1_2 ]; buildInputs = [ libGLU libGL SDL2 SDL2_image libvorbis bullet curl gettext ]; patches = [ ./0001-Ignore-missing-data-for-installation.patch ]; @@ -35,9 +35,9 @@ let meta = { description = "Car racing game"; homepage = "http://vdrift.net/"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [viric]; + platforms = lib.platforms.linux; }; }; wrappedName = "vdrift-${version}-with-data-${toString data.rev}"; diff --git a/pkgs/games/vectoroids/default.nix b/pkgs/games/vectoroids/default.nix index 01e787b8d91..e0b7e13c91e 100644 --- a/pkgs/games/vectoroids/default.nix +++ b/pkgs/games/vectoroids/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, SDL, SDL_image, SDL_mixer}: +{lib, stdenv, fetchurl, SDL, SDL_image, SDL_mixer}: stdenv.mkDerivation { name = "vectoroids-1.1.0"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.newbreedsoftware.com/vectoroids/"; description = "Clone of the classic arcade game Asteroids by Atari"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/vessel/default.nix b/pkgs/games/vessel/default.nix index fa5aff2b81b..a60ec15744c 100644 --- a/pkgs/games/vessel/default.nix +++ b/pkgs/games/vessel/default.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { phases = "installPhase"; ld_preload = ./isatty.c; - libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc ] - + ":" + stdenv.lib.makeLibraryPath [ SDL libpulseaudio alsaLib ] ; + libPath = lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc ] + + ":" + lib.makeLibraryPath [ SDL libpulseaudio alsaLib ] ; installPhase = '' mkdir -p $out/libexec/strangeloop/vessel/ diff --git a/pkgs/games/vms-empire/default.nix b/pkgs/games/vms-empire/default.nix index eb9108c32c9..fcfc89667af 100644 --- a/pkgs/games/vms-empire/default.nix +++ b/pkgs/games/vms-empire/default.nix @@ -1,8 +1,6 @@ -{ stdenv, fetchurl, ncurses, xmlto }: +{ lib, stdenv, fetchurl, ncurses, xmlto }: -with stdenv.lib; stdenv.mkDerivation rec { - pname = "vms-empire"; version = "1.15"; @@ -22,7 +20,7 @@ stdenv.mkDerivation rec { makeFlags = [ "DESTDIR=$(out)" ]; - meta = { + meta = with lib; { description = "The ancestor of all expand/explore/exploit/exterminate games"; longDescription = '' Empire is a simulation of a full-scale war between two emperors, the diff --git a/pkgs/games/warmux/default.nix b/pkgs/games/warmux/default.nix index 464095e714b..6b52194ffca 100644 --- a/pkgs/games/warmux/default.nix +++ b/pkgs/games/warmux/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, autoconf, automake , zlib, curl, gnutls, fribidi, libpng, SDL, SDL_gfx, SDL_image, SDL_mixer -, SDL_net, SDL_ttf, libunwind, libX11, xorgproto, libxml2, pkgconfig +, SDL_net, SDL_ttf, libunwind, libX11, xorgproto, libxml2, pkg-config , gettext, intltool, libtool, perl }: @@ -19,7 +19,7 @@ stdenv.mkDerivation { configureFlagsArray = ("CFLAGS=-include ${zlib.dev}/include/zlib.h"); nativeBuildInputs = [ - autoconf automake gettext intltool libtool pkgconfig + autoconf automake gettext intltool libtool pkg-config ]; buildInputs = [ zlib curl gnutls fribidi libpng SDL SDL_gfx SDL_image SDL_mixer diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix index 2dfb2a72d89..ce330536b75 100644 --- a/pkgs/games/warzone2100/default.nix +++ b/pkgs/games/warzone2100/default.nix @@ -1,6 +1,33 @@ -{ lib, stdenv, mkDerivation, fetchurl, autoconf, automake -, perl, unzip, zip, which, pkgconfig, qtbase, qtscript -, SDL2, libtheora, openal, glew, physfs, fribidi, libXrandr +{ lib +, mkDerivation +, fetchurl +, cmake +, ninja +, zip, unzip +, pkg-config +, asciidoctor +, gettext + +, qtbase +, qtscript +, SDL2 +, libtheora +, libvorbis +, openal +, openalSoft +, glew +, physfs +, fribidi +, libXrandr +, miniupnpc +, libsodium +, curl +, libpng +, freetype +, harfbuzz +, sqlite +, which + , withVideos ? false }: @@ -14,38 +41,61 @@ in mkDerivation rec { inherit pname; - version = "3.3.0"; + version = "3.4.1"; src = fetchurl { - url = "mirror://sourceforge/${pname}/releases/${version}/${pname}-${version}_src.tar.xz"; - sha256 = "1s0n67rh32g0bgq72p4qzkcqjlw58gc70r4r6gl9k90pil9chj6c"; + url = "mirror://sourceforge/${pname}/releases/${version}/${pname}_src.tar.xz"; + sha256 = "0savalmw1kp1sf8vg5aqrl5hc77p4jacxy5y9qj8k2hi2vqdfb7a"; }; buildInputs = [ - qtbase qtscript SDL2 libtheora openal - glew physfs fribidi libXrandr + qtbase + qtscript + SDL2 + libtheora + libvorbis + openal + openalSoft + glew + physfs + fribidi + libXrandr + miniupnpc + libsodium + curl + libpng + freetype + harfbuzz + sqlite ]; + nativeBuildInputs = [ - perl zip unzip pkgconfig autoconf automake + cmake + ninja + zip unzip + asciidoctor + gettext ]; - preConfigure = "./autogen.sh"; - postPatch = '' substituteInPlace lib/exceptionhandler/dumpinfo.cpp \ - --replace "which %s" "${which}/bin/which %s" + --replace '"which "' '"${which}/bin/which "' substituteInPlace lib/exceptionhandler/exceptionhandler.cpp \ --replace "which %s" "${which}/bin/which %s" ''; - configureFlags = [ "--with-distributor=NixOS" ]; - - hardeningDisable = [ "format" ]; - - enableParallelBuilding = true; + cmakeFlags = [ + "-DWZ_DISTRIBUTOR=NixOS" + # The cmake builder automatically sets CMAKE_INSTALL_BINDIR to an absolute + # path, but this results in an error. + # By resetting it, we let the CMakeLists set it to an accepted value + # based on prefix. + "-DCMAKE_INSTALL_BINDIR=" + ]; - postInstall = stdenv.lib.optionalString withVideos - "cp ${sequences_src} $out/share/warzone2100/sequences.wz"; + postInstall = lib.optionalString withVideos '' + cp ${sequences_src} $out/share/warzone2100/sequences.wz + ''; meta = with lib; { description = "A free RTS game, originally developed by Pumpkin Studios"; @@ -62,7 +112,7 @@ mkDerivation rec { ''; homepage = "http://wz2100.net"; license = licenses.gpl2Plus; - maintainers = [ maintainers.astsmtl ]; + maintainers = with maintainers; [ astsmtl fgaz ]; platforms = platforms.linux; }; } diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix index d5eb7495df0..205937028a7 100644 --- a/pkgs/games/wesnoth/default.nix +++ b/pkgs/games/wesnoth/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, SDL2, SDL2_image, SDL2_mixer, SDL2_net, SDL2_ttf +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, SDL2, SDL2_image, SDL2_mixer, SDL2_net, SDL2_ttf , pango, gettext, boost, libvorbis, fribidi, dbus, libpng, pcre, openssl, icu , Cocoa, Foundation , enableTools ? false @@ -6,20 +6,20 @@ stdenv.mkDerivation rec { pname = "wesnoth"; - version = "1.14.14"; + version = "1.14.15"; src = fetchFromGitHub { rev = version; owner = "wesnoth"; repo = "wesnoth"; - sha256 = "0rawcm3d1qwf4wxqcbjipl6h30sfv7z70viji28q4givi5hysvka"; + sha256 = "sha256-HbQy5yhNe6HFydipqh2wWcyLfIjbdRjcBQaqAOtBJsY="; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_net SDL2_ttf pango gettext boost libvorbis fribidi dbus libpng pcre openssl icu ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation]; + ++ lib.optionals stdenv.isDarwin [ Cocoa Foundation]; cmakeFlags = [ "-DENABLE_TOOLS=${if enableTools then "ON" else "OFF"}" ]; diff --git a/pkgs/games/worldofgoo/default.nix b/pkgs/games/worldofgoo/default.nix index 8d06b94271f..27a270fcf8f 100644 --- a/pkgs/games/worldofgoo/default.nix +++ b/pkgs/games/worldofgoo/default.nix @@ -38,11 +38,11 @@ stdenv.mkDerivation rec { sourceRoot = pname; phases = [ "unpackPhase installPhase" ]; - libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib stdenv.cc.libc SDL2 SDL2_mixer + libPath = lib.makeLibraryPath [ stdenv.cc.cc.lib stdenv.cc.libc SDL2 SDL2_mixer libogg libvorbis ]; unpackPhase = '' - # The game is distributed as a shell script, with a tar of mojosetup, and a + # The game is distributed as a shell script, with a tar of mojosetup, and a # zip archive attached to the end. Therefore a simple unzip does the job. # However, to avoid unzip errors, we need to strip those out first. tail -c +421887 ${src} > ${src}.zip diff --git a/pkgs/games/wyvern/default.nix b/pkgs/games/wyvern/default.nix index 82209a69a44..f99faa282fd 100644 --- a/pkgs/games/wyvern/default.nix +++ b/pkgs/games/wyvern/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchgit , rustPlatform , unzip @@ -6,7 +6,7 @@ , innoextract , curl , cmake -, pkgconfig +, pkg-config , openssl }: @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256:1nd5qla3p1jrssg5fqal8m3jcbxax0wsfc8cp97jdrpqlcgqfmrx"; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ openssl ]; meta = with lib; { diff --git a/pkgs/games/xbill/default.nix b/pkgs/games/xbill/default.nix index f021d9ac7a7..a20b52e7854 100644 --- a/pkgs/games/xbill/default.nix +++ b/pkgs/games/xbill/default.nix @@ -1,9 +1,10 @@ -{ stdenv, lib, fetchurl, libX11, libXpm, libXt, motif, ... }: +{ stdenv, lib, makeDesktopItem, copyDesktopItems, fetchurl, libX11, libXpm, libXt, motif, ... }: stdenv.mkDerivation rec { pname = "xbill"; version = "2.1"; + nativeBuildInputs = [ copyDesktopItems ]; buildInputs = [ libX11 libXpm libXt motif ]; NIX_CFLAGS_LINK = "-lXpm"; @@ -18,6 +19,19 @@ stdenv.mkDerivation rec { sha256 = "13b08lli2gvppmvyhy0xs8cbjbkvrn4b87302mx0pxrdrvqzzz8f"; }; + desktopItems = [ (makeDesktopItem { + name = "xbill"; + exec = "xbill"; + icon = "xbill"; + desktopName = "XBill"; + comment = "Get rid of those Wingdows viruses!"; + categories = "Game;ArcadeGame;"; + }) ]; + + postInstall = '' + install -Dm644 pixmaps/icon.xpm $out/share/pixmaps/xbill.xpm + ''; + meta = with stdenv; { description = "Protect a computer network from getting infected"; homepage = "http://www.xbill.org/"; diff --git a/pkgs/games/xboard/default.nix b/pkgs/games/xboard/default.nix index 9f3303578da..90c0f3707cd 100644 --- a/pkgs/games/xboard/default.nix +++ b/pkgs/games/xboard/default.nix @@ -1,5 +1,5 @@ -{stdenv, fetchurl, libX11, xorgproto, libXt, libXaw, libSM, libICE, libXmu -, libXext, gnuchess, texinfo, libXpm, pkgconfig, librsvg, cairo, pango +{lib, stdenv, fetchurl, libX11, xorgproto, libXt, libXaw, libSM, libICE, libXmu +, libXext, gnuchess, texinfo, libXpm, pkg-config, librsvg, cairo, pango , gtk2 }: let @@ -14,7 +14,7 @@ let }; buildInputs = [ libX11 xorgproto libXt libXaw libSM libICE libXmu - libXext gnuchess texinfo libXpm pkgconfig librsvg + libXext gnuchess texinfo libXpm pkg-config librsvg cairo pango gtk2 ]; in @@ -26,10 +26,10 @@ stdenv.mkDerivation { }; meta = { inherit (s) version; - description = ''GUI for chess engines''; + description = "GUI for chess engines"; homepage = "https://www.gnu.org/software/xboard/"; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.gpl3Plus; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.unix; + license = lib.licenses.gpl3Plus; }; } diff --git a/pkgs/games/xbomb/default.nix b/pkgs/games/xbomb/default.nix index 8ec625a0b6b..2d9f57d1e73 100644 --- a/pkgs/games/xbomb/default.nix +++ b/pkgs/games/xbomb/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 libXaw ]; makeFlags = [ - "INSTDIR=${placeholder ''out''}" + "INSTDIR=${placeholder "out"}" ]; meta = with lib; { diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix index 6f7ee6962bf..54ec25c8cf7 100644 --- a/pkgs/games/xonotic/default.nix +++ b/pkgs/games/xonotic/default.nix @@ -38,9 +38,9 @@ let aims to become the best possible open-source FPS of its kind. ''; homepage = "https://www.xonotic.org/"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ astsmtl zalakain petabyteboy ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ astsmtl zalakain petabyteboy ]; + platforms = lib.platforms.linux; }; desktopItem = makeDesktopItem { diff --git a/pkgs/games/xpilot/bloodspilot-client.nix b/pkgs/games/xpilot/bloodspilot-client.nix index 4de27b1f18d..8e603ef53f7 100644 --- a/pkgs/games/xpilot/bloodspilot-client.nix +++ b/pkgs/games/xpilot/bloodspilot-client.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, SDL, libGLU, libGL, expat, zlib, SDL_ttf, SDL_image }: +{ lib, stdenv, fetchurl, libX11, SDL, libGLU, libGL, expat, zlib, SDL_ttf, SDL_image }: stdenv.mkDerivation rec { version = "1.5.0"; @@ -16,10 +16,10 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lX11"; meta = { - description = ''A multiplayer space combat game (client part)''; + description = "A multiplayer space combat game (client part)"; homepage = "http://bloodspilot.sf.net/"; - license = stdenv.lib.licenses.gpl2Plus ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/xskat/default.nix b/pkgs/games/xskat/default.nix index 5f0f867f183..74c2be586ce 100644 --- a/pkgs/games/xskat/default.nix +++ b/pkgs/games/xskat/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libX11, imake, gccmakedep}: +{lib, stdenv, fetchurl, libX11, imake, gccmakedep}: stdenv.mkDerivation rec { pname = "xskat"; @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { installTargets = [ "install" "install.man" ]; - meta = with stdenv.lib; { - description = ''Famous german card game''; + meta = with lib; { + description = "Famous german card game"; platforms = platforms.unix; license = licenses.free; - longDescription = ''Play the german card game Skat against the AI or over IRC.''; + longDescription = "Play the german card game Skat against the AI or over IRC."; homepage = "http://www.xskat.de/"; }; } diff --git a/pkgs/games/xsnow/default.nix b/pkgs/games/xsnow/default.nix index c64d8bf568f..de07821c36a 100644 --- a/pkgs/games/xsnow/default.nix +++ b/pkgs/games/xsnow/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libXt, libXpm, libXext, imake, gccmakedep }: +{ lib, stdenv, fetchurl, libXt, libXpm, libXext, imake, gccmakedep }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "An X-windows application that will let it snow on the root, in between and on windows"; homepage = "http://janswaal.home.xs4all.nl/Xsnow/"; - license = stdenv.lib.licenses.unfree; - maintainers = [ stdenv.lib.maintainers.robberer ]; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.robberer ]; }; } diff --git a/pkgs/games/xsok/default.nix b/pkgs/games/xsok/default.nix index 30579e399b8..ddc43518de6 100644 --- a/pkgs/games/xsok/default.nix +++ b/pkgs/games/xsok/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libX11, imake, libXt, libXaw, libXpm, libXext +{lib, stdenv, fetchurl, libX11, imake, libXt, libXaw, libXpm, libXext , withNethackLevels ? true }: stdenv.mkDerivation rec { @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { makeFlags = ["BINDIR=$(out)/bin"]; - postInstall = stdenv.lib.optionalString withNethackLevels '' + postInstall = lib.optionalString withNethackLevels '' gzip < ${nethackLevels} > "$out/share/games/lib/xsok/Nethack.def.gz" echo Nethack > "$out/share/games/lib/xsok/gametypes" ''; @@ -39,9 +39,9 @@ stdenv.mkDerivation rec { meta = { inherit version; description = "A generic Sokoban game for X11"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.unix; homepage = "https://tracker.debian.org/pkg/xsok"; }; } diff --git a/pkgs/games/zandronum/default.nix b/pkgs/games/zandronum/default.nix index 25f536885d6..58aa6daeece 100644 --- a/pkgs/games/zandronum/default.nix +++ b/pkgs/games/zandronum/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchhg, cmake, pkgconfig, makeWrapper, callPackage +{ stdenv, lib, fetchhg, cmake, pkg-config, makeWrapper, callPackage , soundfont-fluid, SDL, libGL, glew, bzip2, zlib, libjpeg, fluidsynth, openssl, gtk2, python3, libgme , serverOnly ? false }: @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { buildInputs = [ openssl bzip2 zlib SDL libjpeg sqlite libgme ] ++ lib.optionals (!serverOnly) [ libGL glew fmod fluidsynth gtk2 ]; - nativeBuildInputs = [ cmake pkgconfig makeWrapper python3 ]; + nativeBuildInputs = [ cmake pkg-config makeWrapper python3 ]; preConfigure = '' ln -s ${sqlite}/* sqlite/ diff --git a/pkgs/games/zandronum/fmod.nix b/pkgs/games/zandronum/fmod.nix index 257dd3751c8..4b09cb170c0 100644 --- a/pkgs/games/zandronum/fmod.nix +++ b/pkgs/games/zandronum/fmod.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, alsaLib, libpulseaudio, undmg }: let - bits = stdenv.lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") "64"; + bits = lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") "64"; libPath = lib.makeLibraryPath [ stdenv.cc.cc alsaLib libpulseaudio ]; in diff --git a/pkgs/games/zandronum/sqlite.nix b/pkgs/games/zandronum/sqlite.nix index 7f4556c8751..48dd2be9973 100644 --- a/pkgs/games/zandronum/sqlite.nix +++ b/pkgs/games/zandronum/sqlite.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.sqlite.org/"; description = "A single C code file, named sqlite3.c, that contains all C code for the core SQLite library and the FTS3 and RTREE extensions"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; maintainers = [ lib.maintainers.lassulus ]; }; } diff --git a/pkgs/games/zangband/default.nix b/pkgs/games/zangband/default.nix index 0722e4bbbf9..e8daa9a2025 100644 --- a/pkgs/games/zangband/default.nix +++ b/pkgs/games/zangband/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, flex, bison, autoconf, automake, m4, coreutils }: +{ lib, stdenv, fetchurl, ncurses, flex, bison, autoconf, automake, m4, coreutils }: stdenv.mkDerivation rec { pname = "zangband"; @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { meta = { description = "Rogue-like game"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; broken = true; # broken in runtime, will not get pass character generation }; } diff --git a/pkgs/games/zaz/default.nix b/pkgs/games/zaz/default.nix index 00416eb1c98..edee0db2617 100644 --- a/pkgs/games/zaz/default.nix +++ b/pkgs/games/zaz/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, pkgconfig +, pkg-config , SDL , SDL_image , mesa @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config ]; buildInputs = [ SDL.dev diff --git a/pkgs/games/zod/default.nix b/pkgs/games/zod/default.nix index d50218af241..b07db62aa15 100644 --- a/pkgs/games/zod/default.nix +++ b/pkgs/games/zod/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, unrar, unzip, SDL, SDL_image, SDL_ttf, SDL_mixer +{ lib, fetchurl, stdenv, unrar, unzip, SDL, SDL_image, SDL_ttf, SDL_mixer , libmysqlclient, makeWrapper }: stdenv.mkDerivation { @@ -40,6 +40,6 @@ stdenv.mkDerivation { meta = { description = "Multiplayer remake of ZED"; homepage = "http://zod.sourceforge.net/"; - license = stdenv.lib.licenses.gpl3Plus; /* Says the web */ + license = lib.licenses.gpl3Plus; /* Says the web */ }; } diff --git a/pkgs/misc/apulse/default.nix b/pkgs/misc/apulse/default.nix index 6f13414701a..085ad7902f5 100644 --- a/pkgs/misc/apulse/default.nix +++ b/pkgs/misc/apulse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, alsaLib, cmake, pkgconfig, glib +{ lib, stdenv, fetchFromGitHub, alsaLib, cmake, pkg-config, glib , tracingSupport ? true, logToStderr ? true }: let oz = x: if x then "1" else "0"; in @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1p6fh6ah5v3qz7dxhcsixx38bxg44ypbim4m03bxk3ls5i9xslmn"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ alsaLib glib ]; diff --git a/pkgs/misc/apulse/pressureaudio.nix b/pkgs/misc/apulse/pressureaudio.nix index 710712fe508..c69fcbc6015 100644 --- a/pkgs/misc/apulse/pressureaudio.nix +++ b/pkgs/misc/apulse/pressureaudio.nix @@ -1,11 +1,11 @@ -{ stdenv, apulse, libpulseaudio, pkgconfig, intltool, autoreconfHook }: +{ stdenv, apulse, libpulseaudio, pkg-config, intltool, autoreconfHook }: stdenv.mkDerivation { name = "libpressureaudio-${apulse.version}"; src = libpulseaudio.src; - nativeBuildInputs = [ pkgconfig intltool autoreconfHook ]; + nativeBuildInputs = [ pkg-config intltool autoreconfHook ]; dontConfigure = true; diff --git a/pkgs/misc/barebox/default.nix b/pkgs/misc/barebox/default.nix index 78d4228abb3..cb77a607e01 100644 --- a/pkgs/misc/barebox/default.nix +++ b/pkgs/misc/barebox/default.nix @@ -7,7 +7,7 @@ , libusb1 , lzop , openssl -, pkgconfig +, pkg-config , buildPackages }: @@ -38,7 +38,7 @@ let openssl libusb1 lzop - pkgconfig + pkg-config ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/misc/base16-builder/node-packages-generated.nix b/pkgs/misc/base16-builder/node-packages-generated.nix index 426b6229e1c..7ccb5cab835 100644 --- a/pkgs/misc/base16-builder/node-packages-generated.nix +++ b/pkgs/misc/base16-builder/node-packages-generated.nix @@ -1634,4 +1634,4 @@ in bypassCache = true; reconstructLock = true; }; -} \ No newline at end of file +} diff --git a/pkgs/misc/base16-builder/node-packages.nix b/pkgs/misc/base16-builder/node-packages.nix index bb6ff246daa..e66b6756ffb 100644 --- a/pkgs/misc/base16-builder/node-packages.nix +++ b/pkgs/misc/base16-builder/node-packages.nix @@ -10,7 +10,7 @@ let inherit (pkgs) fetchurl fetchgit; }); nodeEnv = import ../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile; + inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile; inherit nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; @@ -18,4 +18,4 @@ in import ./node-packages-generated.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv globalBuildInputs; -} \ No newline at end of file +} diff --git a/pkgs/misc/base16-builder/supplement.nix b/pkgs/misc/base16-builder/supplement.nix index 8183eb1a1e8..3d4c43d5e70 100644 --- a/pkgs/misc/base16-builder/supplement.nix +++ b/pkgs/misc/base16-builder/supplement.nix @@ -690,4 +690,4 @@ in bypassCache = true; reconstructLock = true; }; -} \ No newline at end of file +} diff --git a/pkgs/misc/cups/cups-pk-helper.nix b/pkgs/misc/cups/cups-pk-helper.nix index 3be5bd7711f..f5edc729340 100644 --- a/pkgs/misc/cups/cups-pk-helper.nix +++ b/pkgs/misc/cups/cups-pk-helper.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, intltool, pkgconfig, glib, polkit, cups, fetchpatch }: +{ lib, stdenv, fetchurl, intltool, pkg-config, glib, polkit, cups, fetchpatch }: stdenv.mkDerivation rec { version = "0.2.6"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0a52jw6rm7lr5nbyksiia0rn7sasyb5cjqcb95z1wxm2yprgi6lm"; }; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkg-config intltool ]; buildInputs = [ glib polkit cups ]; patches = [ diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 8736edd0e61..3812ae500e5 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -1,6 +1,6 @@ -{ stdenv +{ lib, stdenv , fetchurl -, pkgconfig +, pkg-config , removeReferencesTo , zlib , libjpeg @@ -9,7 +9,7 @@ , pam , dbus , enableSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isMusl -, systemd ? null +, systemd , acl , gmp , darwin @@ -20,12 +20,10 @@ , coreutils }: -assert enableSystemd -> systemd != null; - ### IMPORTANT: before updating cups, make sure the nixos/tests/printing.nix test ### works at least for your platform. -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "cups"; @@ -48,7 +46,7 @@ stdenv.mkDerivation rec { --replace 'cupsFileFind("cat", "/bin' 'cupsFileFind("cat", "${coreutils}/bin' ''; - nativeBuildInputs = [ pkgconfig removeReferencesTo ]; + nativeBuildInputs = [ pkg-config removeReferencesTo ]; buildInputs = [ zlib libjpeg libpng libtiff libusb1 gnutls libpaper ] ++ optionals stdenv.isLinux [ avahi pam dbus ] diff --git a/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix b/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix index 5faf6a2198b..ec02e8c4f0e 100644 --- a/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, cups, perl, coreutils, gnused, gnugrep +{ lib, stdenv, fetchurl, makeWrapper, cups, perl, coreutils, gnused, gnugrep , brgenml1lpr, debugLvl ? "0"}: /* @@ -117,8 +117,8 @@ stdenv.mkDerivation rec { meta = { description = "Brother BrGenML1 CUPS wrapper driver"; homepage = "http://www.brother.com"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ jraygauthier ]; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ jraygauthier ]; }; } diff --git a/pkgs/misc/cups/drivers/brgenml1lpr/default.nix b/pkgs/misc/cups/drivers/brgenml1lpr/default.nix index 985de63637c..6cdff2c4124 100644 --- a/pkgs/misc/cups/drivers/brgenml1lpr/default.nix +++ b/pkgs/misc/cups/drivers/brgenml1lpr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cups, perl, glibc, ghostscript, which, makeWrapper}: +{ lib, stdenv, fetchurl, cups, perl, glibc, ghostscript, which, makeWrapper}: /* [Setup instructions](http://support.brother.com/g/s/id/linux/en/instruction_prn1a.html). @@ -28,7 +28,7 @@ */ let - myPatchElf = file: with stdenv.lib; '' + myPatchElf = file: with lib; '' patchelf --set-interpreter \ ${stdenv.glibc}/lib/ld-linux${optionalString stdenv.is64bit "-x86-64"}.so.2 \ ${file} @@ -86,8 +86,8 @@ stdenv.mkDerivation rec { meta = { description = "Brother BrGenML1 LPR driver"; homepage = "http://www.brother.com"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.unfreeRedistributable; - maintainers = with stdenv.lib.maintainers; [ jraygauthier ]; + platforms = lib.platforms.linux; + license = lib.licenses.unfreeRedistributable; + maintainers = with lib.maintainers; [ jraygauthier ]; }; } diff --git a/pkgs/misc/cups/drivers/brother/mfcl3770cdw/default.nix b/pkgs/misc/cups/drivers/brother/mfcl3770cdw/default.nix index de93a5a7f8b..10ed4368ce2 100644 --- a/pkgs/misc/cups/drivers/brother/mfcl3770cdw/default.nix +++ b/pkgs/misc/cups/drivers/brother/mfcl3770cdw/default.nix @@ -37,7 +37,7 @@ in rec { --replace "BR_PRT_PATH =~" "BR_PRT_PATH = \"$dir\"; #" \ --replace "PRINTER =~" "PRINTER = \"${model}\"; #" wrapProgram $dir/lpd/filter_${model} \ - --prefix PATH : ${stdenv.lib.makeBinPath [ + --prefix PATH : ${lib.makeBinPath [ coreutils ghostscript gnugrep gnused which ]} # need to use i686 glibc here, these are 32bit proprietary binaries @@ -48,9 +48,9 @@ in rec { meta = { description = "Brother ${lib.strings.toUpper model} driver"; homepage = "http://www.brother.com/"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = [ stdenv.lib.maintainers.steveej ]; + maintainers = [ lib.maintainers.steveej ]; }; }; @@ -70,7 +70,7 @@ in rec { --replace "basedir =~" "basedir = \"$basedir\"; #" \ --replace "PRINTER =~" "PRINTER = \"${model}\"; #" wrapProgram $dir/cupswrapper/brother_lpdwrapper_${model} \ - --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gnugrep gnused ]} + --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep gnused ]} mkdir -p $out/lib/cups/filter mkdir -p $out/share/cups/model ln $dir/cupswrapper/brother_lpdwrapper_${model} $out/lib/cups/filter @@ -80,9 +80,9 @@ in rec { meta = { description = "Brother ${lib.strings.toUpper model} CUPS wrapper driver"; homepage = "http://www.brother.com/"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = [ stdenv.lib.maintainers.steveej ]; + maintainers = [ lib.maintainers.steveej ]; }; }; } diff --git a/pkgs/misc/cups/drivers/carps-cups/default.nix b/pkgs/misc/cups/drivers/carps-cups/default.nix new file mode 100644 index 00000000000..32e92da1608 --- /dev/null +++ b/pkgs/misc/cups/drivers/carps-cups/default.nix @@ -0,0 +1,44 @@ +{ stdenv +, lib +, fetchFromGitHub +, cups +}: + +stdenv.mkDerivation { + pname = "carps-cups"; + version = "unstable-2018-03-05"; + + src = fetchFromGitHub { + owner = "ondrej-zary"; + repo = "carps-cups"; + rev = "18d80d1d6f473dd9132e4b6d8b5c592c74982f17"; + sha256 = "0mjj9hs5lqxi0qamgb4sxfz4fvf7ggi66bxd37bkz3fl0g9xff70"; + }; + + preBuild = '' + export CUPS_DATADIR="${cups}/share/cups" + ''; + + installPhase = '' + CUPSDIR="$out/lib/cups" + CUPSDATADIR="$out/share/cups" + + mkdir -p "$CUPSDIR/filter" "$CUPSDATADIR/drv" "$CUPSDATADIR/usb" + + install -s rastertocarps $CUPSDIR/filter + install -m 644 carps.drv $CUPSDATADIR/drv/ + install -m 644 carps.usb-quirks $CUPSDATADIR/usb/ + ''; + + buildInputs = [ cups ]; + + meta = with lib; { + description = "CUPS Linux drivers for Canon printers"; + homepage = "https://www.canon.com/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ + ewok + ]; + }; +} + diff --git a/pkgs/misc/cups/drivers/cups-bjnp/default.nix b/pkgs/misc/cups/drivers/cups-bjnp/default.nix index 9dbfdd8b803..40243bb9196 100644 --- a/pkgs/misc/cups/drivers/cups-bjnp/default.nix +++ b/pkgs/misc/cups/drivers/cups-bjnp/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cups}: +{lib, stdenv, fetchurl, cups}: stdenv.mkDerivation rec { name = "cups-bjnp-1.2.2"; @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { Canon printer. The design is based on reverse engineering of the protocol. ''; homepage = "http://cups-bjnp.sourceforge.net"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/misc/cups/drivers/dymo/default.nix b/pkgs/misc/cups/drivers/dymo/default.nix index eccbae60104..97dcbde2b8b 100644 --- a/pkgs/misc/cups/drivers/dymo/default.nix +++ b/pkgs/misc/cups/drivers/dymo/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "CUPS Linux drivers and SDK for DYMO printers"; - homepage = "http://www.dymo.com/"; + homepage = "https://www.dymo.com/"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ makefu ]; }; diff --git a/pkgs/misc/cups/drivers/hl1110/default.nix b/pkgs/misc/cups/drivers/hl1110/default.nix index 194ef6cc327..916ac32c2e9 100644 --- a/pkgs/misc/cups/drivers/hl1110/default.nix +++ b/pkgs/misc/cups/drivers/hl1110/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file, a2ps, coreutils, gawk}: +{lib, stdenv, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file, a2ps, coreutils, gawk}: let version = "3.0.1-1"; @@ -42,10 +42,10 @@ stdenv.mkDerivation { patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/HL1110/inf/braddprinter wrapProgram $out/opt/brother/Printers/HL1110/lpd/psconvert2 \ - --prefix PATH ":" ${ stdenv.lib.makeBinPath [ gnused coreutils gawk ] } + --prefix PATH ":" ${ lib.makeBinPath [ gnused coreutils gawk ] } wrapProgram $out/opt/brother/Printers/HL1110/lpd/filter_HL1110 \ - --prefix PATH ":" ${ stdenv.lib.makeBinPath [ ghostscript a2ps file gnused coreutils ] } + --prefix PATH ":" ${ lib.makeBinPath [ ghostscript a2ps file gnused coreutils ] } dpkg-deb -x ${cupsdeb} $out @@ -59,15 +59,15 @@ stdenv.mkDerivation { ln -s $out/opt/brother/Printers/HL1110/cupswrapper/brcupsconfig4 $out/lib/cups/filter/brcupsconfig4 wrapProgram $out/opt/brother/Printers/HL1110/cupswrapper/brother_lpdwrapper_HL1110 \ - --prefix PATH ":" ${ stdenv.lib.makeBinPath [ gnused coreutils gawk ] } + --prefix PATH ":" ${ lib.makeBinPath [ gnused coreutils gawk ] } ''; meta = { homepage = "http://www.brother.com/"; description = "Brother HL1110 printer driver"; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.unfree; + platforms = lib.platforms.linux; downloadPage = "http://support.brother.com/g/b/downloadlist.aspx?c=eu_ot&lang=en&prod=hl1110_us_eu_as&os=128#SelectLanguageType-561_0_1"; }; } diff --git a/pkgs/misc/cups/drivers/hl1210w/default.nix b/pkgs/misc/cups/drivers/hl1210w/default.nix index 88947ed3339..975e07aa6c3 100644 --- a/pkgs/misc/cups/drivers/hl1210w/default.nix +++ b/pkgs/misc/cups/drivers/hl1210w/default.nix @@ -1,4 +1,4 @@ -{stdenv, pkgsi686Linux, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file, a2ps, coreutils, gawk}: +{lib, stdenv, pkgsi686Linux, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file, a2ps, coreutils, gawk}: let version = "3.0.1-1"; @@ -33,9 +33,9 @@ stdenv.mkDerivation { patchelf --set-interpreter ${pkgsi686Linux.glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/HL1210W/inf/braddprinter wrapProgram $out/opt/brother/Printers/HL1210W/lpd/psconvert2 \ - --prefix PATH ":" ${ stdenv.lib.makeBinPath [ gnused coreutils gawk ] } + --prefix PATH ":" ${ lib.makeBinPath [ gnused coreutils gawk ] } wrapProgram $out/opt/brother/Printers/HL1210W/lpd/filter_HL1210W \ - --prefix PATH ":" ${ stdenv.lib.makeBinPath [ ghostscript a2ps file gnused coreutils ] } + --prefix PATH ":" ${ lib.makeBinPath [ ghostscript a2ps file gnused coreutils ] } # install cups dpkg-deb -x ${cupsdeb} $out @@ -49,14 +49,14 @@ stdenv.mkDerivation { ln -s $out/opt/brother/Printers/HL1210W/cupswrapper/brcupsconfig4 $out/lib/cups/filter/brcupsconfig4 wrapProgram $out/opt/brother/Printers/HL1210W/cupswrapper/brother_lpdwrapper_HL1210W \ - --prefix PATH ":" ${ stdenv.lib.makeBinPath [ gnused coreutils gawk ] } + --prefix PATH ":" ${ lib.makeBinPath [ gnused coreutils gawk ] } ''; meta = { homepage = "http://www.brother.com/"; description = "Brother HL1210W printer driver"; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.unfree; + platforms = lib.platforms.linux; downloadPage = "https://support.brother.com/g/b/downloadlist.aspx?c=nz&lang=en&prod=hl1210w_eu_as&os=128"; }; } diff --git a/pkgs/misc/cups/drivers/hl3140cw/default.nix b/pkgs/misc/cups/drivers/hl3140cw/default.nix index 9dabf053fd6..255fae09c7a 100644 --- a/pkgs/misc/cups/drivers/hl3140cw/default.nix +++ b/pkgs/misc/cups/drivers/hl3140cw/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file, a2ps, coreutils, gawk}: +{lib, stdenv, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file, a2ps, coreutils, gawk}: let version = "1.1.4-0"; @@ -44,10 +44,10 @@ stdenv.mkDerivation { patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/usr/bin/brprintconf_hl3140cw wrapProgram $out/opt/brother/Printers/hl3140cw/lpd/psconvertij2 \ - --prefix PATH ":" ${ stdenv.lib.makeBinPath [ gnused coreutils gawk ] } + --prefix PATH ":" ${ lib.makeBinPath [ gnused coreutils gawk ] } wrapProgram $out/opt/brother/Printers/hl3140cw/lpd/filterhl3140cw \ - --prefix PATH ":" ${ stdenv.lib.makeBinPath [ ghostscript a2ps file gnused coreutils ] } + --prefix PATH ":" ${ lib.makeBinPath [ ghostscript a2ps file gnused coreutils ] } dpkg-deb -x ${cupsdeb} $out @@ -65,14 +65,14 @@ stdenv.mkDerivation { ln -s $out/opt/brother/Printers/hl3140cw/lpd/filterhl3140cw $out/lib/cups/filter/brother_lpdwrapper_hl3140cw wrapProgram $out/opt/brother/Printers/hl3140cw/cupswrapper/cupswrapperhl3140cw \ - --prefix PATH ":" ${ stdenv.lib.makeBinPath [ gnused coreutils gawk ] } + --prefix PATH ":" ${ lib.makeBinPath [ gnused coreutils gawk ] } ''; meta = { homepage = "http://www.brother.com/"; description = "Brother hl3140cw printer driver"; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.unfree; + platforms = lib.platforms.linux; downloadPage = "https://support.brother.com/g/b/downloadlist.aspx?c=eu_ot&lang=en&prod=hl3140cw_us_eu&os=128"; }; } diff --git a/pkgs/misc/cups/drivers/hll2340dw/default.nix b/pkgs/misc/cups/drivers/hll2340dw/default.nix index a621137c8f1..35d81b3da00 100644 --- a/pkgs/misc/cups/drivers/hll2340dw/default.nix +++ b/pkgs/misc/cups/drivers/hll2340dw/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { $out/opt/brother/Printers/HLL2340D/cupswrapper/paperconfigml1 \ ; do wrapProgram $f \ - --prefix PATH : ${stdenv.lib.makeBinPath [ + --prefix PATH : ${lib.makeBinPath [ coreutils ghostscript gnugrep gnused ]} done @@ -54,7 +54,7 @@ stdenv.mkDerivation { ln -s $out/opt/brother/Printers/HLL2340D/cupswrapper/brother-HLL2340D-cups-en.ppd $out/share/cups/model/ wrapProgram $out/opt/brother/Printers/HLL2340D/lpd/filter_HLL2340D \ - --prefix PATH ":" ${ stdenv.lib.makeBinPath [ ghostscript a2ps file gnused gnugrep coreutils which ] } + --prefix PATH ":" ${ lib.makeBinPath [ ghostscript a2ps file gnused gnugrep coreutils which ] } ''; meta = with lib; { diff --git a/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix b/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix index 1e247d42ca4..04087c765e6 100644 --- a/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix +++ b/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ; do #substituteInPlace $f \ wrapProgram $f \ - --prefix PATH : ${stdenv.lib.makeBinPath [ + --prefix PATH : ${lib.makeBinPath [ coreutils ghostscript gnugrep gnused ]} done @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ln -s $out/opt/brother/Printers/HLL2390DW/cupswrapper/brother-HLL2390DW-cups-en.ppd $out/share/cups/model/ wrapProgram $out/opt/brother/Printers/HLL2390DW/lpd/lpdfilter \ - --prefix PATH ":" ${ stdenv.lib.makeBinPath [ ghostscript a2ps file gnused gnugrep coreutils which ] } + --prefix PATH ":" ${ lib.makeBinPath [ ghostscript a2ps file gnused gnugrep coreutils which ] } ''; meta = with lib; { diff --git a/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix index 23ee927a3bf..2ff073591d0 100644 --- a/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mfcj470dwlpr, makeWrapper}: +{ lib, stdenv, fetchurl, mfcj470dwlpr, makeWrapper}: stdenv.mkDerivation rec { pname = "mfcj470dw-cupswrapper"; @@ -48,9 +48,9 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.brother.com/"; description = "Brother MFC-J470DW CUPS wrapper driver"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; downloadPage = "http://support.brother.com/g/b/downloadlist.aspx?c=us&lang=en&prod=mfcj470dw_us_eu_as&os=128"; - maintainers = [ stdenv.lib.maintainers.yochai ]; + maintainers = [ lib.maintainers.yochai ]; }; } diff --git a/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix index 31b5c1dbd37..b2dbd0ca77a 100644 --- a/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cups, dpkg, ghostscript, a2ps, coreutils, gnused, gawk, file, makeWrapper }: +{ lib, stdenv, fetchurl, cups, dpkg, ghostscript, a2ps, coreutils, gnused, gawk, file, makeWrapper }: stdenv.mkDerivation rec { pname = "mfcj470dw-cupswrapper"; @@ -28,18 +28,18 @@ stdenv.mkDerivation rec { ln -s $out/opt/brother/Printers/mfcj470dw/lpd/filtermfcj470dw $out/lib/cups/filter/brother_lpdwrapper_mfcj470dw wrapProgram $out/opt/brother/Printers/mfcj470dw/lpd/psconvertij2 \ - --prefix PATH ":" ${ stdenv.lib.makeBinPath [ gnused coreutils gawk ] } + --prefix PATH ":" ${ lib.makeBinPath [ gnused coreutils gawk ] } wrapProgram $out/opt/brother/Printers/mfcj470dw/lpd/filtermfcj470dw \ - --prefix PATH ":" ${ stdenv.lib.makeBinPath [ ghostscript a2ps file gnused coreutils ] } + --prefix PATH ":" ${ lib.makeBinPath [ ghostscript a2ps file gnused coreutils ] } ''; meta = { homepage = "http://www.brother.com/"; description = "Brother MFC-J470DW LPR driver"; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.unfree; + platforms = lib.platforms.linux; downloadPage = "http://support.brother.com/g/b/downloadlist.aspx?c=us&lang=en&prod=mfcj470dw_us_eu_as&os=128"; - maintainers = [ stdenv.lib.maintainers.yochai ]; + maintainers = [ lib.maintainers.yochai ]; }; } diff --git a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix index ea06e8c104d..741abc74f26 100644 --- a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix @@ -73,9 +73,9 @@ stdenv.mkDerivation rec { ln -s $out/opt/brother/Printers/mfcj6510dw/lpd/filtermfcj6510dw $out/lib/cups/filter/brother_lpdwrapper_mfcj6510dw wrapProgram $out/opt/brother/Printers/mfcj6510dw/lpd/psconvertij2 \ - --prefix PATH ":" ${ stdenv.lib.makeBinPath [ coreutils gnused gawk ] } + --prefix PATH ":" ${ lib.makeBinPath [ coreutils gnused gawk ] } wrapProgram $out/opt/brother/Printers/mfcj6510dw/lpd/filtermfcj6510dw \ - --prefix PATH ":" ${ stdenv.lib.makeBinPath [ coreutils gnused file ghostscript a2ps ] } + --prefix PATH ":" ${ lib.makeBinPath [ coreutils gnused file ghostscript a2ps ] } ''; meta = with lib; { diff --git a/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix index 27cb40a9e4f..6eebfe64d5a 100644 --- a/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix @@ -1,4 +1,4 @@ -{ coreutils, dpkg, fetchurl, gnugrep, gnused, makeWrapper, mfcl2700dnlpr, perl, stdenv }: +{ coreutils, dpkg, fetchurl, gnugrep, gnused, makeWrapper, mfcl2700dnlpr, perl, lib, stdenv }: stdenv.mkDerivation rec { name = "mfcl2700dncupswrapper-${meta.version}"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { --replace "PRINTER =~" "PRINTER = \"MFCL2700DN\"; #" wrapProgram $dir/cupswrapper/brother_lpdwrapper_MFCL2700DN \ - --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gnugrep gnused ]} + --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep gnused ]} mkdir -p $out/lib/cups/filter mkdir -p $out/share/cups/model @@ -36,9 +36,9 @@ stdenv.mkDerivation rec { meta = { description = "Brother MFC-L2700DN CUPS wrapper driver"; homepage = "http://www.brother.com/"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.tv ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.tv ]; + platforms = lib.platforms.linux; version = "3.2.0-1"; }; } diff --git a/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix b/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix index 24d3e5cab7f..0d11579e954 100644 --- a/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix @@ -1,4 +1,4 @@ -{ coreutils, dpkg, fetchurl, ghostscript, gnugrep, gnused, makeWrapper, perl, stdenv, which }: +{ lib, stdenv, coreutils, dpkg, fetchurl, ghostscript, gnugrep, gnused, makeWrapper, perl, which }: stdenv.mkDerivation rec { pname = "mfcl2700dnlpr"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { --replace "PRINTER =~" "PRINTER = \"MFCL2700DN\"; #" wrapProgram $dir/lpd/filter_MFCL2700DN \ - --prefix PATH : ${stdenv.lib.makeBinPath [ + --prefix PATH : ${lib.makeBinPath [ coreutils ghostscript gnugrep gnused which ]} @@ -37,8 +37,8 @@ stdenv.mkDerivation rec { meta = { description = "Brother MFC-L2700DN LPR driver"; homepage = "http://www.brother.com/"; - license = stdenv.lib.licenses.unfree; - maintainers = [ stdenv.lib.maintainers.tv ]; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.tv ]; platforms = [ "i686-linux" ]; }; } diff --git a/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix index 8a2ce7edf26..5d4980da9d1 100644 --- a/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dpkg, makeWrapper, coreutils, gnugrep, gnused, perl, mfcl2720dwlpr }: +{ lib, stdenv, fetchurl, dpkg, makeWrapper, coreutils, gnugrep, gnused, perl, mfcl2720dwlpr }: stdenv.mkDerivation rec { pname = "mfcl2720dwcupswrapper"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { --replace /usr/bin/perl ${perl}/bin/perl wrapProgram $dir/cupswrapper/brother_lpdwrapper_MFCL2720DW \ - --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gnugrep gnused ]} + --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep gnused ]} mkdir -p $out/lib/cups/filter mkdir -p $out/share/cups/model @@ -40,8 +40,8 @@ stdenv.mkDerivation rec { meta = { description = "Brother MFC-L2720DW CUPS wrapper driver"; homepage = "http://www.brother.com/"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = [ stdenv.lib.maintainers.xeji ]; + maintainers = [ lib.maintainers.xeji ]; }; } diff --git a/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix index 0dc9eed2ac0..2b6c458e745 100644 --- a/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, fetchurl, dpkg, makeWrapper, coreutils, ghostscript, gnugrep, gnused, which, perl }: +{ pkgs, lib, stdenv, fetchurl, dpkg, makeWrapper, coreutils, ghostscript, gnugrep, gnused, which, perl }: stdenv.mkDerivation rec { pname = "mfcl2720dwlpr"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { --replace "PRINTER =~" "PRINTER = \"MFCL2720DW\"; #" wrapProgram $dir/lpd/filter_MFCL2720DW \ - --prefix PATH : ${stdenv.lib.makeBinPath [ + --prefix PATH : ${lib.makeBinPath [ coreutils ghostscript gnugrep gnused which ]} @@ -38,8 +38,8 @@ stdenv.mkDerivation rec { meta = { description = "Brother MFC-L2720DW lpr driver"; homepage = "http://www.brother.com/"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = [ stdenv.lib.maintainers.xeji ]; + maintainers = [ lib.maintainers.xeji ]; }; } diff --git a/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix index f2143df321c..a119c31517c 100644 --- a/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dpkg, makeWrapper, coreutils, gnugrep, gnused, perl, mfcl2740dwlpr }: +{ lib, stdenv, fetchurl, dpkg, makeWrapper, coreutils, gnugrep, gnused, perl, mfcl2740dwlpr }: stdenv.mkDerivation rec { pname = "mfcl2740dwcupswrapper"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { --replace /usr/bin/perl ${perl}/bin/perl wrapProgram $dir/cupswrapper/brother_lpdwrapper_MFCL2740DW \ - --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gnugrep gnused ]} + --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep gnused ]} mkdir -p $out/lib/cups/filter mkdir -p $out/share/cups/model @@ -38,8 +38,8 @@ stdenv.mkDerivation rec { meta = { description = "Brother MFC-L2740DW CUPS wrapper driver"; homepage = "http://www.brother.com/"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = [ stdenv.lib.maintainers.enzime ]; + maintainers = [ lib.maintainers.enzime ]; }; } diff --git a/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix index 74571611b44..38722a734a6 100644 --- a/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix @@ -1,4 +1,4 @@ -{ pkgsi686Linux, stdenv, fetchurl, dpkg, makeWrapper, coreutils, ghostscript, gnugrep, gnused, which, perl }: +{ pkgsi686Linux, lib, stdenv, fetchurl, dpkg, makeWrapper, coreutils, ghostscript, gnugrep, gnused, which, perl }: stdenv.mkDerivation rec { pname = "mfcl2740dwlpr"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { --replace "PRINTER =~" "PRINTER = \"MFCL2740DW\"; #" wrapProgram $dir/lpd/filter_MFCL2740DW \ - --prefix PATH : ${stdenv.lib.makeBinPath [ + --prefix PATH : ${lib.makeBinPath [ coreutils ghostscript gnugrep gnused which ]} @@ -36,8 +36,8 @@ stdenv.mkDerivation rec { meta = { description = "Brother MFC-L2740DW lpr driver"; homepage = "http://www.brother.com/"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = [ stdenv.lib.maintainers.enzime ]; + maintainers = [ lib.maintainers.enzime ]; }; } diff --git a/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix index d82c0ad9a86..ebb2e439298 100644 --- a/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix @@ -1,5 +1,5 @@ { coreutils, dpkg, fetchurl, gnugrep, gnused, makeWrapper, -mfcl8690cdwlpr, perl, stdenv}: +mfcl8690cdwlpr, perl, lib, stdenv}: stdenv.mkDerivation rec { pname = "mfcl8690cdwcupswrapper"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { --replace "PRINTER =~" "PRINTER = \"mfcl8690cdw\"; #" wrapProgram $dir/cupswrapper/brother_lpdwrapper_mfcl8690cdw \ - --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gnugrep gnused ]} + --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep gnused ]} mkdir -p $out/lib/cups/filter mkdir -p $out/share/cups/model @@ -38,8 +38,8 @@ stdenv.mkDerivation rec { meta = { description = "Brother MFC-L8690CDW CUPS wrapper driver"; homepage = "http://www.brother.com/"; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.fuzzy-id ]; + license = lib.licenses.unfree; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.fuzzy-id ]; }; } diff --git a/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix b/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix index 9e3c529e898..2b5dc44cead 100644 --- a/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix @@ -1,5 +1,5 @@ { coreutils, dpkg, fetchurl, file, ghostscript, gnugrep, gnused, -makeWrapper, perl, pkgs, stdenv, which }: +makeWrapper, perl, pkgs, lib, stdenv, which }: stdenv.mkDerivation rec { pname = "mfcl8690cdwlpr"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { --replace "PRINTER =~" "PRINTER = \"mfcl8690cdw\"; #" wrapProgram $filter \ - --prefix PATH : ${stdenv.lib.makeBinPath [ + --prefix PATH : ${lib.makeBinPath [ coreutils file ghostscript gnugrep gnused which ]} @@ -38,8 +38,8 @@ stdenv.mkDerivation rec { meta = { description = "Brother MFC-L8690CDW LPR printer driver"; homepage = "http://www.brother.com/"; - license = stdenv.lib.licenses.unfree; - maintainers = [ stdenv.lib.maintainers.fuzzy-id ]; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.fuzzy-id ]; platforms = [ "i686-linux" ]; }; } diff --git a/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix b/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix index f346b6e3c40..2ea0e253853 100644 --- a/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix +++ b/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix @@ -87,10 +87,10 @@ in stdenv.mkDerivation rec { preFixup = '' for bin in "$out/bin/"*; do patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$bin" - patchelf --set-rpath "$out/lib:${stdenv.lib.getLib cups}/lib" "$bin" + patchelf --set-rpath "$out/lib:${lib.getLib cups}/lib" "$bin" done - patchelf --set-rpath "$out/lib:${stdenv.lib.getLib cups}/lib" "$out/lib/libscmssc.so" + patchelf --set-rpath "$out/lib:${lib.getLib cups}/lib" "$out/lib/libscmssc.so" patchelf --set-rpath "$out/lib:${libxml2.out}/lib:${libusb-compat-0_1.out}/lib" "$out/lib/sane/libsane-smfp.so.1.0.1" ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/ diff --git a/pkgs/misc/cups/drivers/samsung/1.00.37.nix b/pkgs/misc/cups/drivers/samsung/1.00.37.nix index af022454e42..9fb26f62d76 100644 --- a/pkgs/misc/cups/drivers/samsung/1.00.37.nix +++ b/pkgs/misc/cups/drivers/samsung/1.00.37.nix @@ -70,10 +70,10 @@ in stdenv.mkDerivation rec { preFixup = '' for bin in "$out/bin/"*; do patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$bin" - patchelf --set-rpath "$out/lib:${stdenv.lib.getLib cups}/lib" "$bin" + patchelf --set-rpath "$out/lib:${lib.getLib cups}/lib" "$bin" done - patchelf --set-rpath "$out/lib:${stdenv.lib.getLib cups}/lib" "$out/lib/libscmssc.so" + patchelf --set-rpath "$out/lib:${lib.getLib cups}/lib" "$out/lib/libscmssc.so" patchelf --set-rpath "$out/lib:${libxml2.out}/lib:${libusb-compat-0_1.out}/lib" "$out/lib/sane/libsane-smfp.so.1.0.1" ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/ diff --git a/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix b/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix index 9982e7b4282..92f5fdc409c 100644 --- a/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix +++ b/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix @@ -16,7 +16,7 @@ # Do not bump lightly! Visit <http://www.bchemnet.com/suldr/supported.html> # to see what will break when upgrading. Consider a new versioned attribute. let - cups' = stdenv.lib.getLib cups; + cups' = lib.getLib cups; in stdenv.mkDerivation rec { pname = "samsung-UnifiedLinuxDriver"; version = "4.00.39"; diff --git a/pkgs/misc/cups/drivers/samsung/4.01.17.nix b/pkgs/misc/cups/drivers/samsung/4.01.17.nix index 68f2abde705..2591cf73566 100644 --- a/pkgs/misc/cups/drivers/samsung/4.01.17.nix +++ b/pkgs/misc/cups/drivers/samsung/4.01.17.nix @@ -18,7 +18,7 @@ let installationPath = if stdenv.hostPlatform.system == "x86_64-linux" then "x86_64" else "i386"; appendPath = if stdenv.hostPlatform.system == "x86_64-linux" then "64" else ""; - libPath = stdenv.lib.makeLibraryPath [ cups libusb-compat-0_1 ] + ":$out/lib:${stdenv.cc.cc.lib}/lib${appendPath}"; + libPath = lib.makeLibraryPath [ cups libusb-compat-0_1 ] + ":$out/lib:${stdenv.cc.cc.lib}/lib${appendPath}"; in stdenv.mkDerivation rec { pname = "samsung-UnifiedLinuxDriver"; version = "4.01.17"; diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index 217f0c7f0da..8b1e7fe8fc7 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, pkgconfig, cups, poppler, poppler_utils, fontconfig +{ lib, stdenv, fetchurl, pkg-config, cups, poppler, poppler_utils, fontconfig , libjpeg, libpng, perl, ijs, qpdf, dbus, avahi , makeWrapper, coreutils, gnused, bc, gawk, gnugrep, which, ghostscript , mupdf }: let - binPath = stdenv.lib.makeBinPath [ coreutils gnused bc gawk gnugrep which ]; + binPath = lib.makeBinPath [ coreutils gnused bc gawk gnugrep which ]; in stdenv.mkDerivation rec { pname = "cups-filters"; @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { sha256 = "1kv25011iyzvd33n5zmmn1z2p6pzk26hmmw6qvjjnx8p3sp7raqn"; }; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ cups poppler poppler_utils fontconfig libjpeg libpng perl @@ -65,7 +65,7 @@ in stdenv.mkDerivation rec { meta = { homepage = "http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters"; description = "Backends, filters, and other software that was once part of the core CUPS distribution but is no longer maintained by Apple Inc"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/misc/documentation-highlighter/default.nix b/pkgs/misc/documentation-highlighter/default.nix index 16b47d01f24..022cc4aa834 100644 --- a/pkgs/misc/documentation-highlighter/default.nix +++ b/pkgs/misc/documentation-highlighter/default.nix @@ -1,11 +1,11 @@ -{ stdenv, runCommand }: +{ lib, stdenv, runCommand }: runCommand "documentation-highlighter" { meta = { description = "Highlight.js sources for the Nix Ecosystem's documentation"; homepage = "https://highlightjs.org"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.grahamc ]; + license = lib.licenses.bsd3; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.grahamc ]; }; } '' cp -r ${./.} $out diff --git a/pkgs/misc/doge/default.nix b/pkgs/misc/doge/default.nix index 8334444ec4c..911917e6d2f 100644 --- a/pkgs/misc/doge/default.nix +++ b/pkgs/misc/doge/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv , python3Packages }: +{ lib, python3Packages }: python3Packages.buildPythonPackage rec { pname = "doge"; diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix index 9054c4c48f8..ae8749f0326 100644 --- a/pkgs/misc/drivers/epkowa/default.nix +++ b/pkgs/misc/drivers/epkowa/default.nix @@ -1,9 +1,9 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , makeWrapper , symlinkJoin -, pkgconfig +, pkg-config , libtool , gtk2 , libxml2 @@ -19,8 +19,8 @@ }: let common_meta = { homepage = "http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"; - license = with stdenv.lib.licenses; epson; - platforms = with stdenv.lib.platforms; linux; + license = with lib.licenses; epson; + platforms = with lib.platforms; linux; }; in ############################ @@ -261,7 +261,7 @@ let plugins = { in let fwdir = symlinkJoin { name = "esci-firmware-dir"; - paths = stdenv.lib.mapAttrsToList (name: value: value + /share/esci) plugins; + paths = lib.mapAttrsToList (name: value: value + /share/esci) plugins; }; in let iscan-data = stdenv.mkDerivation rec { @@ -295,7 +295,7 @@ stdenv.mkDerivation rec { sha256 = "1ma76jj0k3bz0fy06fiyl4di4y77rcryb0mwjmzs5ms2vq9rjysr"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 libxml2 @@ -337,7 +337,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/iscan-registry --prefix PATH : ${getopt}/bin registry=$out/bin/iscan-registry; '' + - stdenv.lib.concatStrings (stdenv.lib.mapAttrsToList + lib.concatStrings (lib.mapAttrsToList (name: value: '' plugin=${value}; ${value.passthru.registrationCommand} @@ -349,7 +349,7 @@ stdenv.mkDerivation rec { Includes gui-less iscan (aka. Image Scan! for Linux). Supported hardware: at least : '' + - stdenv.lib.concatStringsSep ", " (stdenv.lib.mapAttrsToList (name: value: value.passthru.hw) plugins); - maintainers = with stdenv.lib.maintainers; [ symphorien dominikh ]; + lib.concatStringsSep ", " (lib.mapAttrsToList (name: value: value.passthru.hw) plugins); + maintainers = with lib.maintainers; [ symphorien dominikh ]; }; } diff --git a/pkgs/misc/drivers/epson-201106w/default.nix b/pkgs/misc/drivers/epson-201106w/default.nix index 690a4e4841e..a5a32644c3a 100644 --- a/pkgs/misc/drivers/epson-201106w/default.nix +++ b/pkgs/misc/drivers/epson-201106w/default.nix @@ -13,7 +13,7 @@ in # NOTE: Don't forget to update the webarchive link too! urls = [ "https://download.ebz.epson.net/dsc/op/stable/SRPMS/epson-inkjet-printer-201106w-${version}-1lsb3.2.src.rpm" - "https://web.archive.org/web/https://download.ebz.epson.net/dsc/op/stable/SRPMS/epson-inkjet-printer-201106w-${version}-1lsb3.2.src.rpm" + "https://web.archive.org/web/https://download.ebz.epson.net/dsc/op/stable/SRPMS/epson-inkjet-printer-201106w-${version}-1lsb3.2.src.rpm" ]; sha256 = "1yig1xrh1ikblbp7sx706n5nnc237wy4mbch23ymy6akbgqg4aig"; diff --git a/pkgs/misc/drivers/epson-alc1100/default.nix b/pkgs/misc/drivers/epson-alc1100/default.nix index fc467e8a4d2..2a0fd92867e 100644 --- a/pkgs/misc/drivers/epson-alc1100/default.nix +++ b/pkgs/misc/drivers/epson-alc1100/default.nix @@ -33,12 +33,12 @@ in postFixup = '' patchelf --set-interpreter ${pkgsi686Linux.glibc}/lib/ld-linux.so.2 \ - --set-rpath "${stdenv.lib.makeLibraryPath [ + --set-rpath "${lib.makeLibraryPath [ pkgsi686Linux.glibc "$out" ]}" $out/bin/alc1100 - patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ + patchelf --set-rpath "${lib.makeLibraryPath [ pkgsi686Linux.glibc ]}" $out/lib/libstdc++.so.5.0.7 diff --git a/pkgs/misc/drivers/epson-escpr/default.nix b/pkgs/misc/drivers/epson-escpr/default.nix index 8d8951db249..bdb2839ab0b 100644 --- a/pkgs/misc/drivers/epson-escpr/default.nix +++ b/pkgs/misc/drivers/epson-escpr/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { # To find new versions, visit # http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX and search for # some printer like for instance "WF-7110" to get to the most recent - # version. + # version. # NOTE: Don't forget to update the webarchive link too! urls = [ "https://download3.ebz.epson.net/dsc/f/03/00/09/83/26/f90d0f70b33a9d7d77a2408364c47fba1ccbf943/epson-inkjet-printer-escpr-1.7.3-1lsb3.2.tar.gz" diff --git a/pkgs/misc/drivers/epson-escpr2/default.nix b/pkgs/misc/drivers/epson-escpr2/default.nix index 934f00d7492..f0289c22272 100644 --- a/pkgs/misc/drivers/epson-escpr2/default.nix +++ b/pkgs/misc/drivers/epson-escpr2/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { # To find new versions, visit # http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX and search for # some printer like for instance "WF-7210" to get to the most recent - # version. + # version. # NOTE: Don't forget to update the webarchive link too! urls = [ "https://download3.ebz.epson.net/dsc/f/03/00/12/09/63/b7d2bb6a97c9ad99a96ebc68f8abcb1254888e94/epson-inkjet-printer-escpr2-1.1.24-1lsb3.2.src.rpm" diff --git a/pkgs/misc/drivers/epson_201207w/default.nix b/pkgs/misc/drivers/epson_201207w/default.nix index 6de25dbe678..d5c57b35c32 100644 --- a/pkgs/misc/drivers/epson_201207w/default.nix +++ b/pkgs/misc/drivers/epson_201207w/default.nix @@ -63,11 +63,11 @@ in Epson L550 Series Epson L555 Series - To use the driver adjust your configuration.nix file: - services.printing = { - enable = true; - drivers = [ pkgs.epson_201207w ]; - }; + To use the driver adjust your configuration.nix file: + services.printing = { + enable = true; + drivers = [ pkgs.epson_201207w ]; + }; ''; license = with licenses; [ lgpl21 epson ]; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/misc/drivers/foomatic-filters/default.nix b/pkgs/misc/drivers/foomatic-filters/default.nix index 3ca64e0e8f8..db1da676a51 100644 --- a/pkgs/misc/drivers/foomatic-filters/default.nix +++ b/pkgs/misc/drivers/foomatic-filters/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchpatch, fetchurl, pkgconfig, perl, cups, dbus, enscript }: +{ lib, stdenv, fetchpatch, fetchurl, pkg-config, perl, cups, dbus, enscript }: stdenv.mkDerivation rec { name = "foomatic-filters-4.0.17"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1qrkgbm5jay2r7sh9qbyf0aiyrsl1mdc844hxf7fhw95a0zfbqm2"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ perl cups dbus enscript ]; patches = [ @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { meta = { description = "Foomatic printing filters"; - maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.raskin ]; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/misc/drivers/gutenprint/bin.nix b/pkgs/misc/drivers/gutenprint/bin.nix index 4adb96e1299..58b77cb9107 100644 --- a/pkgs/misc/drivers/gutenprint/bin.nix +++ b/pkgs/misc/drivers/gutenprint/bin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, rpm, cpio, zlib }: +{ lib, stdenv, fetchurl, rpm, cpio, zlib }: /* usage: (sorry, its still impure but works!) @@ -36,7 +36,7 @@ stdenv.mkDerivation { phases = "buildPhase"; - libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc zlib ]; + libPath = lib.makeLibraryPath [ stdenv.cc.cc zlib ]; buildPhase = '' ar -x $src data.tar.gz diff --git a/pkgs/misc/drivers/gutenprint/default.nix b/pkgs/misc/drivers/gutenprint/default.nix index 5957f30327f..9cd76c11cce 100644 --- a/pkgs/misc/drivers/gutenprint/default.nix +++ b/pkgs/misc/drivers/gutenprint/default.nix @@ -1,5 +1,5 @@ # this package was called gimp-print in the past -{ stdenv, lib, fetchurl, makeWrapper, pkgconfig +{ stdenv, lib, fetchurl, makeWrapper, pkg-config , ijs, zlib , gimp2Support ? false, gimp , cupsSupport ? true, cups, libusb-compat-0_1, perl @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0s0b14hjwvbxksq7af5v8z9g2rfqv9jdmxd9d81m57f5mh6rad0p"; }; - nativeBuildInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = [ ijs zlib ] ++ lib.optionals gimp2Support [ gimp.gtk gimp ] diff --git a/pkgs/misc/drivers/hplip/3.16.11.nix b/pkgs/misc/drivers/hplip/3.16.11.nix index c48c5bff4bf..37609a66c94 100644 --- a/pkgs/misc/drivers/hplip/3.16.11.nix +++ b/pkgs/misc/drivers/hplip/3.16.11.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, substituteAll -, pkgconfig +, pkg-config , cups, libjpeg, libusb1, python2Packages, sane-backends, dbus, usbutils , net-snmp, openssl, nettools , bash, coreutils, util-linux @@ -60,7 +60,7 @@ python2Packages.buildPythonApplication { ]; nativeBuildInputs = [ - pkgconfig + pkg-config ]; pythonPath = with python2Packages; [ @@ -69,7 +69,7 @@ python2Packages.buildPythonApplication { pygobject2 reportlab usbutils - ] ++ stdenv.lib.optionals qtSupport [ + ] ++ lib.optionals qtSupport [ pyqt4 ]; @@ -111,7 +111,7 @@ python2Packages.buildPythonApplication { enableParallelBuilding = true; - postInstall = stdenv.lib.optionalString withPlugin '' + postInstall = lib.optionalString withPlugin '' sh ${plugin} --noexec --keep cd plugin_tmp diff --git a/pkgs/misc/drivers/hplip/3.18.5.nix b/pkgs/misc/drivers/hplip/3.18.5.nix index c7e1f47e2e5..c62161c96f8 100644 --- a/pkgs/misc/drivers/hplip/3.18.5.nix +++ b/pkgs/misc/drivers/hplip/3.18.5.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, substituteAll -, pkgconfig +, pkg-config , cups, zlib, libjpeg, libusb1, python2Packages, sane-backends , dbus, file, ghostscript, usbutils , net-snmp, openssl, perl, nettools @@ -66,7 +66,7 @@ python2Packages.buildPythonApplication { ]; nativeBuildInputs = [ - pkgconfig + pkg-config ]; pythonPath = with python2Packages; [ @@ -76,7 +76,7 @@ python2Packages.buildPythonApplication { reportlab usbutils sip - ] ++ stdenv.lib.optionals withQt5 [ + ] ++ lib.optionals withQt5 [ pyqt5 ]; @@ -108,9 +108,9 @@ python2Packages.buildPythonApplication { --with-systraydir=$out/xdg/autostart --with-mimedir=$out/etc/cups --enable-policykit - ${stdenv.lib.optionalString withStaticPPDInstall "--enable-cups-ppd-install"} + ${lib.optionalString withStaticPPDInstall "--enable-cups-ppd-install"} --disable-qt4 - ${stdenv.lib.optionalString withQt5 "--enable-qt5"} + ${lib.optionalString withQt5 "--enable-qt5"} " export makeFlags=" @@ -136,7 +136,7 @@ python2Packages.buildPythonApplication { # Running `hp-diagnose_plugin -g` can be used to diagnose # issues with plugins. # - postInstall = stdenv.lib.optionalString withPlugin '' + postInstall = lib.optionalString withPlugin '' sh ${plugin} --noexec --keep cd plugin_tmp diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index b20797808af..6a7eb35ae52 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, substituteAll -, pkgconfig +, pkg-config , cups, zlib, libjpeg, libusb1, python3Packages, sane-backends , dbus, file, ghostscript, usbutils , net-snmp, openssl, perl, nettools, avahi @@ -69,9 +69,9 @@ python3Packages.buildPythonApplication { ]; nativeBuildInputs = [ - pkgconfig + pkg-config removeReferencesTo - ] ++ stdenv.lib.optional withQt5 qt5.wrapQtAppsHook; + ] ++ lib.optional withQt5 qt5.wrapQtAppsHook; pythonPath = with python3Packages; [ dbus @@ -81,7 +81,7 @@ python3Packages.buildPythonApplication { usbutils sip dbus-python - ] ++ stdenv.lib.optionals withQt5 [ + ] ++ lib.optionals withQt5 [ pyqt5 enum-compat ]; @@ -127,9 +127,9 @@ python3Packages.buildPythonApplication { --with-systraydir=$out/xdg/autostart --with-mimedir=$out/etc/cups --enable-policykit - ${stdenv.lib.optionalString withStaticPPDInstall "--enable-cups-ppd-install"} + ${lib.optionalString withStaticPPDInstall "--enable-cups-ppd-install"} --disable-qt4 - ${stdenv.lib.optionalString withQt5 "--enable-qt5"} + ${lib.optionalString withQt5 "--enable-qt5"} " export makeFlags=" @@ -155,7 +155,7 @@ python3Packages.buildPythonApplication { # Running `hp-diagnose_plugin -g` can be used to diagnose # issues with plugins. # - postInstall = stdenv.lib.optionalString withPlugin '' + postInstall = lib.optionalString withPlugin '' sh ${plugin} --noexec --keep cd plugin_tmp @@ -229,7 +229,7 @@ python3Packages.buildPythonApplication { --replace {,${util-linux}/bin/}logger \ --replace {/usr,$out}/bin remove-references-to -t ${stdenv.cc.cc} $(readlink -f $out/lib/*.so) - '' + stdenv.lib.optionalString withQt5 '' + '' + lib.optionalString withQt5 '' for f in $out/bin/hp-*;do wrapQtApp $f done diff --git a/pkgs/misc/drivers/steamcontroller/default.nix b/pkgs/misc/drivers/steamcontroller/default.nix index 77a2e03d161..db5c8e5d903 100644 --- a/pkgs/misc/drivers/steamcontroller/default.nix +++ b/pkgs/misc/drivers/steamcontroller/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, python3Packages, libusb1, linuxHeaders +{ lib, fetchFromGitHub, python3Packages, libusb1, linuxHeaders , GyroplotSupport ? false }: diff --git a/pkgs/misc/drivers/sundtek/default.nix b/pkgs/misc/drivers/sundtek/default.nix index b94a0978284..d52f9dd7cde 100644 --- a/pkgs/misc/drivers/sundtek/default.nix +++ b/pkgs/misc/drivers/sundtek/default.nix @@ -1,6 +1,6 @@ -{ fetchurl, stdenv }: +{ fetchurl, lib, stdenv }: -with stdenv.lib; +with lib; let version = "2016-01-26"; diff --git a/pkgs/misc/drivers/xboxdrv/default.nix b/pkgs/misc/drivers/xboxdrv/default.nix index 82678eec164..e2894802839 100644 --- a/pkgs/misc/drivers/xboxdrv/default.nix +++ b/pkgs/misc/drivers/xboxdrv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, sconsPackages, libX11, pkgconfig +{ lib, stdenv, fetchurl, sconsPackages, libX11, pkg-config , libusb1, boost, glib, dbus-glib }: let @@ -13,7 +13,7 @@ in stdenv.mkDerivation { }; makeFlags = [ "PREFIX=$(out)" ]; - nativeBuildInputs = [ pkgconfig sconsPackages.scons_3_1_2 ]; + nativeBuildInputs = [ pkg-config sconsPackages.scons_3_1_2 ]; buildInputs = [ libX11 libusb1 boost glib dbus-glib ]; dontUseSconsInstall = true; diff --git a/pkgs/misc/drivers/xow/default.nix b/pkgs/misc/drivers/xow/default.nix index 309db8908c7..b095d61d987 100644 --- a/pkgs/misc/drivers/xow/default.nix +++ b/pkgs/misc/drivers/xow/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { makeFlags = [ "BUILD=RELEASE" "VERSION=${version}" - "BINDIR=${placeholder ''out''}/bin" - "UDEVDIR=${placeholder ''out''}/lib/udev/rules.d" - "MODLDIR=${placeholder ''out''}/lib/modules-load.d" - "MODPDIR=${placeholder ''out''}/lib/modprobe.d" - "SYSDDIR=${placeholder ''out''}/lib/systemd/system" + "BINDIR=${placeholder "out"}/bin" + "UDEVDIR=${placeholder "out"}/lib/udev/rules.d" + "MODLDIR=${placeholder "out"}/lib/modules-load.d" + "MODPDIR=${placeholder "out"}/lib/modprobe.d" + "SYSDDIR=${placeholder "out"}/lib/systemd/system" ]; postUnpack = '' diff --git a/pkgs/misc/drivers/xwiimote/default.nix b/pkgs/misc/drivers/xwiimote/default.nix index 3b7b42990af..8fafd1b6ebc 100644 --- a/pkgs/misc/drivers/xwiimote/default.nix +++ b/pkgs/misc/drivers/xwiimote/default.nix @@ -1,4 +1,4 @@ -{ stdenv, udev, ncurses, pkgconfig, fetchurl, bluez }: +{ lib, stdenv, udev, ncurses, pkg-config, fetchurl, bluez }: stdenv.mkDerivation rec { name = "xwiimote-2"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { sha256 = "1g9cbhblll47l300zr999xr51x2g98y49l222f77fhswd12kjzhd"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ udev ncurses bluez ]; configureFlags = [ "--with-doxygen=no" ]; @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://dvdhrm.github.io/xwiimote"; description = "Userspace utilities to control connected Nintendo Wii Remotes"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.mit; + platforms = lib.platforms.linux; + license = lib.licenses.mit; }; postInstallPhase = '' diff --git a/pkgs/misc/emulators/atari++/default.nix b/pkgs/misc/emulators/atari++/default.nix index 4758d173e92..2019820510e 100644 --- a/pkgs/misc/emulators/atari++/default.nix +++ b/pkgs/misc/emulators/atari++/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ libSM libX11 SDL libICE alsaLib gcc-unwrapped libXext ]; postFixup = '' - patchelf --set-rpath ${stdenv.lib.makeLibraryPath buildInputs} "$out/bin/atari++" + patchelf --set-rpath ${lib.makeLibraryPath buildInputs} "$out/bin/atari++" ''; meta = with lib; { @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { ''; maintainers = [ maintainers.AndersonTorres ]; license = licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/misc/emulators/atari800/default.nix b/pkgs/misc/emulators/atari800/default.nix index 6c846e2f0ab..163b81922c2 100644 --- a/pkgs/misc/emulators/atari800/default.nix +++ b/pkgs/misc/emulators/atari800/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, autoreconfHook +{ lib, stdenv, fetchFromGitHub, autoreconfHook , unzip, zlib, SDL, readline, libGLU, libGL, libX11 }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "atari800"; version = "4.2.0"; @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { ''; maintainers = [ maintainers.AndersonTorres ]; license = licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/misc/emulators/attract-mode/default.nix b/pkgs/misc/emulators/attract-mode/default.nix index 1550f71fb40..92c42a1d394 100644 --- a/pkgs/misc/emulators/attract-mode/default.nix +++ b/pkgs/misc/emulators/attract-mode/default.nix @@ -1,5 +1,5 @@ { expat, fetchFromGitHub, ffmpeg_3, fontconfig, freetype, libarchive, libjpeg -, libGLU, libGL, openal, pkgconfig, sfml, lib, stdenv, zlib +, libGLU, libGL, openal, pkg-config, sfml, lib, stdenv, zlib }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "16p369j0hanm0l2fiy6h9d9pn0f3qblcy9l39all6h7rfxnhp9ii"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; patchPhase = '' sed -i "s|prefix=/usr/local|prefix=$out|" Makefile diff --git a/pkgs/misc/emulators/blastem/default.nix b/pkgs/misc/emulators/blastem/default.nix index f4cef93141d..eba646e2f20 100644 --- a/pkgs/misc/emulators/blastem/default.nix +++ b/pkgs/misc/emulators/blastem/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, SDL2, glew, xcftools, python, pillow, makeWrapper }: +{ lib, stdenv, fetchurl, fetchFromGitHub, pkg-config, SDL2, glew, xcftools, python, pillow, makeWrapper }: let vasm = @@ -25,7 +25,7 @@ stdenv.mkDerivation { url = "https://www.retrodev.com/repos/blastem/archive/3d48cb0c28be.tar.gz"; sha256 = "07wzbmzp0y8mh59jxg81q17gqagz3psxigxh8dmzsipgg68y6a8r"; }; - buildInputs = [ pkgconfig SDL2 glew xcftools python pillow vasm makeWrapper ]; + buildInputs = [ pkg-config SDL2 glew xcftools python pillow vasm makeWrapper ]; preBuild = '' patchShebangs img2tiles.py ''; @@ -41,9 +41,9 @@ stdenv.mkDerivation { meta = { homepage = "https://www.retrodev.com/blastem/"; description = "The fast and accurate Genesis emulator"; - maintainers = with stdenv.lib.maintainers; [ puffnfresh ]; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; + maintainers = with lib.maintainers; [ puffnfresh ]; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; # Makefile:140: *** aarch64 is not a supported architecture. Stop. badPlatforms = [ "aarch64-linux" ]; }; diff --git a/pkgs/misc/emulators/bsod/default.nix b/pkgs/misc/emulators/bsod/default.nix index 56b85227cda..872ee8571f3 100644 --- a/pkgs/misc/emulators/bsod/default.nix +++ b/pkgs/misc/emulators/bsod/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ncurses}: +{lib, stdenv, fetchurl, ncurses}: stdenv.mkDerivation { name = "bsod-0.1"; @@ -23,9 +23,9 @@ stdenv.mkDerivation { blue screen of death on the console. Errors and drivers causing the error are selected randomly from a large set of examples."; homepage = "http://www.vanheusden.com/bsod/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.antono ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.antono ]; }; } diff --git a/pkgs/misc/emulators/caprice32/default.nix b/pkgs/misc/emulators/caprice32/default.nix index 69002d00f80..3e20ba61642 100644 --- a/pkgs/misc/emulators/caprice32/default.nix +++ b/pkgs/misc/emulators/caprice32/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, desktop-file-utils, libpng -, pkgconfig, SDL, freetype, zlib }: +, pkg-config, SDL, freetype, zlib }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0hng5krwgc1h9bz1xlkp2hwnvas965nd7sb3z9mb2m6x9ghxlacz"; }; - nativeBuildInputs = [ desktop-file-utils pkgconfig ]; + nativeBuildInputs = [ desktop-file-utils pkg-config ]; buildInputs = [ libpng SDL freetype zlib ]; makeFlags = [ diff --git a/pkgs/misc/emulators/ccemux/default.nix b/pkgs/misc/emulators/ccemux/default.nix index 96cb9afaf2f..11f24d59e5c 100644 --- a/pkgs/misc/emulators/ccemux/default.nix +++ b/pkgs/misc/emulators/ccemux/default.nix @@ -6,7 +6,7 @@ let version = "1.1.1"; rev = "af12e2e4da586275ba931eae8f40a2201251bf59"; - baseUrl = "https://emux.cc/versions/${stdenv.lib.substring 0 8 rev}/CCEmuX"; + baseUrl = "https://emux.cc/versions/${lib.substring 0 8 rev}/CCEmuX"; jar = if useCCTweaked then fetchurl { diff --git a/pkgs/misc/emulators/cdemu/base.nix b/pkgs/misc/emulators/cdemu/base.nix index 51e6a6ac5c8..6db1089a37f 100644 --- a/pkgs/misc/emulators/cdemu/base.nix +++ b/pkgs/misc/emulators/cdemu/base.nix @@ -1,5 +1,5 @@ { pkgName, version, pkgSha256 }: -{ lib, stdenv, fetchurl, cmake, pkgconfig, buildInputs, drvParams ? {} }: +{ lib, stdenv, fetchurl, cmake, pkg-config, buildInputs, drvParams ? {} }: let name = "${pkgName}-${version}"; in stdenv.mkDerivation ({ inherit name buildInputs; @@ -7,7 +7,7 @@ in stdenv.mkDerivation ({ url = "mirror://sourceforge/cdemu/${name}.tar.bz2"; sha256 = pkgSha256; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; setSourceRoot = '' mkdir build cd build @@ -32,6 +32,6 @@ in stdenv.mkDerivation ({ homepage = "http://cdemu.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with stdenv.lib.maintainers; [ bendlas ]; + maintainers = with lib.maintainers; [ bendlas ]; }; } // drvParams) diff --git a/pkgs/misc/emulators/cdemu/libmirage.nix b/pkgs/misc/emulators/cdemu/libmirage.nix index e824e19347a..0b8090ce41d 100644 --- a/pkgs/misc/emulators/cdemu/libmirage.nix +++ b/pkgs/misc/emulators/cdemu/libmirage.nix @@ -1,4 +1,4 @@ -{ callPackage, gobject-introspection, cmake, pkgconfig +{ callPackage, gobject-introspection, cmake, pkg-config , glib, libsndfile, zlib, bzip2, lzma, libsamplerate, intltool , pcre, util-linux, libselinux, libsepol }: @@ -12,7 +12,7 @@ in callPackage pkg { drvParams = { PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "out"}/share/gir-1.0"; PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0"; - nativeBuildInputs = [ cmake gobject-introspection pkgconfig ]; + nativeBuildInputs = [ cmake gobject-introspection pkg-config ]; propagatedBuildInputs = [ pcre util-linux libselinux libsepol ]; }; } diff --git a/pkgs/misc/emulators/cdemu/vhba.nix b/pkgs/misc/emulators/cdemu/vhba.nix index 17d2f8f5e97..182469310c4 100644 --- a/pkgs/misc/emulators/cdemu/vhba.nix +++ b/pkgs/misc/emulators/cdemu/vhba.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { homepage = "http://cdemu.sourceforge.net/about/vhba/"; platforms = platforms.linux; license = licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ bendlas ]; + maintainers = with lib.maintainers; [ bendlas ]; }; } diff --git a/pkgs/misc/emulators/citra/default.nix b/pkgs/misc/emulators/citra/default.nix index b4afb6bbf97..ae7228c2246 100644 --- a/pkgs/misc/emulators/citra/default.nix +++ b/pkgs/misc/emulators/citra/default.nix @@ -1,19 +1,21 @@ -{ stdenv, mkDerivation, lib, fetchgit, cmake, SDL2, qtbase, qtmultimedia, boost }: +{ mkDerivation, lib, fetchgit, cmake, SDL2, qtbase, qtmultimedia, boost }: mkDerivation { pname = "citra"; - version = "2020-03-21"; + version = "2020-12-07"; # Submodules src = fetchgit { url = "https://github.com/citra-emu/citra"; - rev = "8722b970c52f2c0d8e82561477edb62a53ae9dbb"; - sha256 = "0c1zn1f84h4f6n6p0aqz905yvv5qpdmkj2z58yla6bfgbzabfyrj"; + rev = "3f13e1cc2419fac837952c44d7be9db78b054a2f"; + sha256 = "1bbg8cwrgncmcavqpj3yp4dbfkip1i491krp6dcpgvsd5yfr7f0v"; }; nativeBuildInputs = [ cmake ]; buildInputs = [ SDL2 qtbase qtmultimedia boost ]; + dontWrapQtApps = true; + preConfigure = '' # Trick configure system. sed -n 's,^ *path = \(.*\),\1,p' .gitmodules | while read path; do diff --git a/pkgs/misc/emulators/commander-x16/emulator.nix b/pkgs/misc/emulators/commander-x16/emulator.nix new file mode 100644 index 00000000000..73442215ff1 --- /dev/null +++ b/pkgs/misc/emulators/commander-x16/emulator.nix @@ -0,0 +1,42 @@ +{ stdenv +, lib +, fetchFromGitHub +, SDL2 +}: + +stdenv.mkDerivation rec { + pname = "x16-emulator"; + version = "38"; + + src = fetchFromGitHub { + owner = "commanderx16"; + repo = pname; + rev = "r${version}"; + sha256 = "WNRq/m97NpOBWIk6mtxBAKmkxCGWacWjXeOvIhBrkYE="; + }; + + dontConfigure = true; + + buildInputs = [ SDL2 ]; + + installPhase = '' + runHook preInstall + install -D --mode 755 --target-directory $out/bin/ x16emu + install -D --mode 444 --target-directory $out/share/doc/${pname} README.md + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://www.commanderx16.com/forum/index.php?/home/"; + description = "The official emulator of CommanderX16 8-bit computer"; + license = licenses.bsd2; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = SDL2.meta.platforms; + }; + + passthru = { + # upstream project recommends emulator and rom synchronized; + # passing through the version is useful to ensure this + inherit version; + }; +} diff --git a/pkgs/misc/emulators/commander-x16/rom.nix b/pkgs/misc/emulators/commander-x16/rom.nix new file mode 100644 index 00000000000..5da77ebceef --- /dev/null +++ b/pkgs/misc/emulators/commander-x16/rom.nix @@ -0,0 +1,46 @@ +{ stdenv +, lib +, fetchFromGitHub +, cc65 +}: + +stdenv.mkDerivation rec { + pname = "x16-rom"; + version = "38"; + + src = fetchFromGitHub { + owner = "commanderx16"; + repo = pname; + rev = "r${version}"; + sha256 = "xaqF0ppB7I7ST8Uh3jPbC14uRAb/WH21tHlNeTvYpoI="; + }; + + nativeBuildInputs = [ cc65 ]; + + postPatch = '' + patchShebangs scripts/ + ''; + + dontConfigure = true; + + installPhase = '' + runHook preInstall + install -D --mode 444 --target-directory $out/share/${pname} build/x16/rom.bin + install -D --mode 444 --target-directory $out/share/doc/${pname} README.md + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://www.commanderx16.com/forum/index.php?/home/"; + description = "ROM file for CommanderX16 8-bit computer"; + license = licenses.bsd2; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = cc65.meta.platforms; + }; + + passthru = { + # upstream project recommends emulator and rom synchronized; + # passing through the version is useful to ensure this + inherit version; + }; +} diff --git a/pkgs/misc/emulators/darcnes/default.nix b/pkgs/misc/emulators/darcnes/default.nix index 3ea98c571e8..7919e0a9009 100644 --- a/pkgs/misc/emulators/darcnes/default.nix +++ b/pkgs/misc/emulators/darcnes/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, libXt, libXext, libXaw }: +{ lib, stdenv, fetchurl, libX11, libXt, libXext, libXaw }: stdenv.mkDerivation rec { pname = "darcnes"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { homepage = "https://web.archive.org/web/20130502171725/http://www.dridus.com/~nyef/darcnes/"; description = "Sega Master System, Game Gear, SG-1000, NES, ColecoVision and Apple II emulator"; # Prohibited commercial use, credit required. - license = stdenv.lib.licenses.free; + license = lib.licenses.free; platforms = [ "i686-linux" ]; }; } diff --git a/pkgs/misc/emulators/desmume/default.nix b/pkgs/misc/emulators/desmume/default.nix index 27c1a2cb9c3..ff17833f690 100644 --- a/pkgs/misc/emulators/desmume/default.nix +++ b/pkgs/misc/emulators/desmume/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, fetchpatch -, pkgconfig, libtool, intltool +{ lib, stdenv, fetchurl, fetchpatch +, pkg-config, libtool, intltool , libXmu , lua , tinyxml @@ -8,7 +8,7 @@ , gtk2, gtkglext, libglade , libGLU, libpcap, SDL, zziplib }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "desmume"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { CXXFLAGS = "-fpermissive"; buildInputs = - [ pkgconfig libtool intltool libXmu lua agg alsaLib soundtouch + [ pkg-config libtool intltool libXmu lua agg alsaLib soundtouch openal desktop-file-utils gtk2 gtkglext libglade libGLU libpcap SDL zziplib tinyxml ]; diff --git a/pkgs/misc/emulators/dlx/default.nix b/pkgs/misc/emulators/dlx/default.nix index 215f2ee46f9..3360d45ccc8 100644 --- a/pkgs/misc/emulators/dlx/default.nix +++ b/pkgs/misc/emulators/dlx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation { name = "dlx-2012.07.08"; @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.davidviner.com/dlx.php"; description = "DLX Simulator"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/pkgs/misc/emulators/dolphin-emu/default.nix index 2b392074a51..9112293db58 100644 --- a/pkgs/misc/emulators/dolphin-emu/default.nix +++ b/pkgs/misc/emulators/dolphin-emu/default.nix @@ -1,7 +1,7 @@ { stdenv , lib , fetchpatch -, pkgconfig +, pkg-config , cmake , bluez , ffmpeg_3 @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config cmake ]; diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index 697492797fc..4a1fca0e7c5 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeDesktopItem, pkgconfig, cmake +{ lib, stdenv, fetchFromGitHub, makeDesktopItem, pkg-config, cmake , wrapQtAppsHook, qtbase, bluez, ffmpeg_3, libao, libGLU, libGL, pcre, gettext , libXrandr, libusb1, lzo, libpthreadstubs, libXext, libXxf86vm, libXinerama , libSM, libXdmcp, readline, openal, udev, libevdev, portaudio, curl, alsaLib @@ -21,16 +21,16 @@ let }; in stdenv.mkDerivation rec { pname = "dolphin-emu"; - version = "5.0-12716"; + version = "5.0-13178"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = "31524288e3b2450eaefff8202c6d26c4ba3f7333"; - sha256 = "0vv3ahk6zdx2hx5diq4jkhl289wjybqcr4lwinrkfiywb83hcabg"; + rev = "a34823df61df65168aa40ef5e82e44defd4a0138"; + sha256 = "0j6hnj60iai366kl0kdbn1jkwc183l02g65mp2vq4qb2yd4399l1"; }; - nativeBuildInputs = [ cmake pkgconfig ] + nativeBuildInputs = [ cmake pkg-config ] ++ lib.optional stdenv.isLinux wrapQtAppsHook; buildInputs = [ diff --git a/pkgs/misc/emulators/emulationstation/default.nix b/pkgs/misc/emulators/emulationstation/default.nix index 10c542c5a6e..458b27d3304 100644 --- a/pkgs/misc/emulators/emulationstation/default.nix +++ b/pkgs/misc/emulators/emulationstation/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, curl, boost, eigen +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, curl, boost, eigen , freeimage, freetype, libGLU, libGL, SDL2, alsaLib, libarchive , fetchpatch }: @@ -20,7 +20,7 @@ stdenv.mkDerivation { }) ]; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ alsaLib boost curl eigen freeimage freetype libarchive libGLU libGL SDL2 ]; installPhase = '' @@ -30,8 +30,8 @@ stdenv.mkDerivation { meta = { description = "A flexible emulator front-end supporting keyboardless navigation and custom system themes"; homepage = "https://emulationstation.org"; - maintainers = [ stdenv.lib.maintainers.edwtjo ]; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + maintainers = [ lib.maintainers.edwtjo ]; + license = lib.licenses.mit; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/misc/emulators/epsxe/default.nix b/pkgs/misc/emulators/epsxe/default.nix index 493cf4c2628..7cdd88d0b94 100644 --- a/pkgs/misc/emulators/epsxe/default.nix +++ b/pkgs/misc/emulators/epsxe/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, alsaLib, curl, gdk-pixbuf, glib, gtk3, libGLU, libGL, +{ lib, stdenv, fetchurl, alsaLib, curl, gdk-pixbuf, glib, gtk3, libGLU, libGL, libX11, openssl_1_0_2, ncurses5, SDL, SDL_ttf, unzip, zlib, wrapGAppsHook, autoPatchelfHook }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "epsxe"; diff --git a/pkgs/misc/emulators/fakenes/default.nix b/pkgs/misc/emulators/fakenes/default.nix index d7c8a185a09..2011d8ce037 100644 --- a/pkgs/misc/emulators/fakenes/default.nix +++ b/pkgs/misc/emulators/fakenes/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, allegro, openal, libGLU, libGL, zlib, hawknl, freeglut, libX11, +{lib, stdenv, fetchurl, allegro, openal, libGLU, libGL, zlib, hawknl, freeglut, libX11, libXxf86vm, libXcursor, libXpm }: stdenv.mkDerivation { @@ -24,9 +24,9 @@ stdenv.mkDerivation { meta = { homepage = "http://fakenes.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; description = "Portable Open Source NES Emulator"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; broken = true; }; } diff --git a/pkgs/misc/emulators/fceux/default.nix b/pkgs/misc/emulators/fceux/default.nix index 0d4b4cd3576..f76fc761abb 100644 --- a/pkgs/misc/emulators/fceux/default.nix +++ b/pkgs/misc/emulators/fceux/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, scons, zlib, SDL, lua5_1, pkgconfig}: +{lib, stdenv, fetchFromGitHub, scons, zlib, SDL, lua5_1, pkg-config}: stdenv.mkDerivation { pname = "fceux-unstable"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0gpz411dzfwx9mr34yi4zb1hphd5hha1nvwgzxki0sviwafca992"; }; - nativeBuildInputs = [ pkgconfig scons ]; + nativeBuildInputs = [ pkg-config scons ]; buildInputs = [ zlib SDL lua5_1 ]; @@ -32,9 +32,9 @@ stdenv.mkDerivation { meta = { description = "A Nintendo Entertainment System (NES) Emulator"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.scubed2 ]; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.scubed2 ]; homepage = "http://www.fceux.com/"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/misc/emulators/firebird-emu/default.nix b/pkgs/misc/emulators/firebird-emu/default.nix index 888cfea0204..c766df9e3c0 100644 --- a/pkgs/misc/emulators/firebird-emu/default.nix +++ b/pkgs/misc/emulators/firebird-emu/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, stdenv, fetchFromGitHub, qmake, qtbase, qtdeclarative }: +{ mkDerivation, lib, fetchFromGitHub, qmake, qtbase, qtdeclarative }: mkDerivation rec { pname = "firebird-emu"; @@ -30,9 +30,9 @@ mkDerivation rec { meta = { homepage = "https://github.com/nspire-emus/firebird"; description = "Third-party multi-platform emulator of the ARM-based TI-Nspire™ calculators"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ pneumaticat ]; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ pneumaticat ]; # Only tested on Linux, but likely possible to build on, e.g. macOS - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/misc/emulators/fs-uae/default.nix b/pkgs/misc/emulators/fs-uae/default.nix index 214c1e6e75b..eef8c2c3253 100644 --- a/pkgs/misc/emulators/fs-uae/default.nix +++ b/pkgs/misc/emulators/fs-uae/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , gettext, gtk2, SDL2, zlib, glib, openal, libGLU, libGL, lua, freetype, libmpeg2, zip }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "fs-uae"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1qwzhp34wy7bnd3c0plv11rg9fs5m92rh3ffnr9pn6ng0cpc8vpj"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gettext gtk2 SDL2 zlib glib openal libGLU libGL lua freetype libmpeg2 zip ]; meta = { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2Plus; homepage = "https://fs-uae.net"; - maintainers = with stdenv.lib; [ maintainers.AndersonTorres ]; + maintainers = with lib; [ maintainers.AndersonTorres ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/misc/emulators/fuse-emulator/default.nix b/pkgs/misc/emulators/fuse-emulator/default.nix index e2334a62a13..3426b47daea 100644 --- a/pkgs/misc/emulators/fuse-emulator/default.nix +++ b/pkgs/misc/emulators/fuse-emulator/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perl, pkgconfig, wrapGAppsHook +{ lib, stdenv, fetchurl, perl, pkg-config, wrapGAppsHook , SDL, bzip2, glib, gtk3, libgcrypt, libpng, libspectrum, libxml2, zlib }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0kaynjr28w42n3iha60mgr7nxm49w8j0v49plyrc7ka24qzmiqph"; }; - nativeBuildInputs = [ perl pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ perl pkg-config wrapGAppsHook ]; buildInputs = [ SDL bzip2 glib gtk3 libgcrypt libpng libspectrum libxml2 zlib ]; diff --git a/pkgs/misc/emulators/gens-gs/default.nix b/pkgs/misc/emulators/gens-gs/default.nix index 563ea5f46f8..abc676ffa63 100644 --- a/pkgs/misc/emulators/gens-gs/default.nix +++ b/pkgs/misc/emulators/gens-gs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gtk2, SDL, nasm, zlib, libpng, libGLU, libGL }: +{ lib, stdenv, fetchurl, pkg-config, gtk2, SDL, nasm, zlib, libpng, libGLU, libGL }: stdenv.mkDerivation { name = "gens-gs-7"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1ha5s6d3y7s9aq9f4zmn9p88109c3mrj36z2w68jhiw5xrxws833"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 SDL nasm zlib libpng libGLU libGL ]; # Work around build failures on recent GTK. diff --git a/pkgs/misc/emulators/hatari/default.nix b/pkgs/misc/emulators/hatari/default.nix index 267944a8bfc..de98278b832 100644 --- a/pkgs/misc/emulators/hatari/default.nix +++ b/pkgs/misc/emulators/hatari/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, zlib, SDL, cmake }: +{ lib, stdenv, fetchurl, zlib, SDL, cmake }: stdenv.mkDerivation rec { pname = "hatari"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { url = "https://download.tuxfamily.org/hatari/${version}/${pname}-${version}.tar.bz2"; - sha256 = "19dqadi32hgi78hyxxcm8v2vh28vyn9w5nd1xiq683wk0ccicj5z"; + sha256 = "sha256-RKL2LKmV442eCHSAaVbwucPMhOqJ4BaaY4SbY807ZL0="; }; # For pthread_cancel @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://hatari.tuxfamily.org/"; description = "Atari ST/STE/TT/Falcon emulator"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix index 88872dd3972..c7bc7e9f976 100644 --- a/pkgs/misc/emulators/higan/default.nix +++ b/pkgs/misc/emulators/higan/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, pkgconfig +, pkg-config , libX11, libXv , udev , libGLU, libGL, SDL2 @@ -11,7 +11,7 @@ , libicns, Carbon, Cocoa, OpenGL, OpenAL}: let - inherit (stdenv.lib) optionals; + inherit (lib) optionals; in stdenv.mkDerivation rec { @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { done ''; - nativeBuildInputs = [ pkgconfig ] + nativeBuildInputs = [ pkg-config ] ++ optionals stdenv.isDarwin [ libicns ]; buildInputs = [ SDL2 libao ] diff --git a/pkgs/misc/emulators/mame/default.nix b/pkgs/misc/emulators/mame/default.nix index ddf0a129ab8..b50181a4d98 100644 --- a/pkgs/misc/emulators/mame/default.nix +++ b/pkgs/misc/emulators/mame/default.nix @@ -1,10 +1,8 @@ -{ stdenv, mkDerivation, fetchFromGitHub, makeDesktopItem, makeWrapper -, python, pkgconfig, SDL2, SDL2_ttf, alsaLib, which, qtbase, libXinerama +{ lib, stdenv, mkDerivation, fetchFromGitHub, makeDesktopItem, makeWrapper +, python, pkg-config, SDL2, SDL2_ttf, alsaLib, which, qtbase, libXinerama , libpcap, CoreAudioKit, ForceFeedback , installShellFiles }: -with stdenv; - let majorVersion = "0"; minorVersion = "226"; @@ -46,7 +44,7 @@ in mkDerivation { ++ lib.optional stdenv.isLinux alsaLib ++ lib.optionals stdenv.isDarwin [ libpcap CoreAudioKit ForceFeedback ] ; - nativeBuildInputs = [ python pkgconfig which makeWrapper installShellFiles ]; + nativeBuildInputs = [ python pkg-config which makeWrapper installShellFiles ]; # by default MAME assumes that paths with stock resources # are relative and that you run MAME changing to @@ -61,7 +59,7 @@ in mkDerivation { ''; installPhase = '' - make -f dist.mak PTR64=${stdenv.lib.optionalString stdenv.is64bit "1"} + make -f dist.mak PTR64=${lib.optionalString stdenv.is64bit "1"} mkdir -p ${dest} mv build/release/*/Release/mame/* ${dest} diff --git a/pkgs/misc/emulators/mednafen/default.nix b/pkgs/misc/emulators/mednafen/default.nix index 693ada8d3c7..aaf736f3e5e 100644 --- a/pkgs/misc/emulators/mednafen/default.nix +++ b/pkgs/misc/emulators/mednafen/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, freeglut, libGLU, libGL, libcdio, libjack2 +{ lib, stdenv, fetchurl, pkg-config, freeglut, libGLU, libGL, libcdio, libjack2 , libsamplerate, libsndfile, libX11, SDL2, SDL2_net, zlib, alsaLib }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1x7xhxjhwsdbak8l0iyb497f043xkhibk73w96xck4j2bk10fac4"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ freeglut diff --git a/pkgs/misc/emulators/mednaffe/default.nix b/pkgs/misc/emulators/mednaffe/default.nix index 60b0bfe1223..7d0d6c6f68e 100644 --- a/pkgs/misc/emulators/mednaffe/default.nix +++ b/pkgs/misc/emulators/mednaffe/default.nix @@ -1,26 +1,39 @@ -{ stdenv, fetchFromGitHub, makeWrapper, autoreconfHook, pkgconfig, wrapGAppsHook -, gtk2 ? null, gtk3 ? null, mednafen }: - -with stdenv.lib; +{ stdenv +, lib +, fetchFromGitHub +, autoreconfHook +, pkg-config +, mednafen +, gtk2 ? null +, gtk3 ? null +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "mednaffe"; - version = "0.8.8"; + version = "0.9.0"; src = fetchFromGitHub { owner = "AmatCoder"; repo = "mednaffe"; rev = version; - sha256 = "15qk3a3l1phr8bap2ayh3c0vyvw2jwhny1iz1ajq2adyjpm9fhr7"; + sha256 = "sha256-BS/GNnRYj9klc4RRj7LwNikgApNttv4IyWPL694j+gM="; }; - nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ]; buildInputs = [ gtk2 gtk3 mednafen ]; - configureFlags = [ (enableFeature (gtk3 != null) "gtk3") ]; - postInstall = "wrapProgram $out/bin/mednaffe --set PATH ${mednafen}/bin"; + configureFlags = [ (lib.enableFeature (gtk3 != null) "gtk3") ]; + + dontWrapGApps = true; + + postInstall = '' + wrapProgram $out/bin/mednaffe \ + --prefix PATH ':' "${mednafen}/bin" \ + "''${gappsWrapperArgs[@]}" + ''; - meta = { + meta = with lib; { description = "GTK-based frontend for mednafen emulator"; homepage = "https://github.com/AmatCoder/mednaffe"; license = licenses.gpl3Plus; diff --git a/pkgs/misc/emulators/melonDS/default.nix b/pkgs/misc/emulators/melonDS/default.nix index 98754de8d4f..a53d2bfc339 100644 --- a/pkgs/misc/emulators/melonDS/default.nix +++ b/pkgs/misc/emulators/melonDS/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , mkDerivation , cmake -, pkgconfig +, pkg-config , SDL2 , qtbase , libpcap @@ -12,16 +12,16 @@ mkDerivation rec { pname = "melonDS"; - version = "0.9"; + version = "0.9.1"; src = fetchFromGitHub { owner = "Arisotura"; repo = pname; rev = version; - sha256 = "0m45m1ch0az8l3d3grjbqvi5vvydbffxwka9w3k3qiia50m7fnph"; + sha256 = "sha256-bvi0Y+zwfEcsZMNxoH85hxwIGn0UIYlg/ZaE6yJ7vlo="; }; - nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ]; buildInputs = [ SDL2 qtbase diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/misc/emulators/mgba/default.nix index a6f59122b64..03269017518 100644 --- a/pkgs/misc/emulators/mgba/default.nix +++ b/pkgs/misc/emulators/mgba/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeDesktopItem, wrapQtAppsHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, makeDesktopItem, wrapQtAppsHook, pkg-config , cmake, epoxy, libzip, libelf, libedit, ffmpeg_3, SDL2, imagemagick , qtbase, qtmultimedia, qttools, minizip }: @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { sha256 = "0nqj4bnn5c2z1bq4bnbw1wznc0wpmq4sy3w8pipd6n6620b9m4qq"; }; - nativeBuildInputs = [ wrapQtAppsHook pkgconfig cmake ]; + nativeBuildInputs = [ wrapQtAppsHook pkg-config cmake ]; buildInputs = [ epoxy libzip libelf libedit ffmpeg_3 SDL2 imagemagick diff --git a/pkgs/misc/emulators/mupen64plus/default.nix b/pkgs/misc/emulators/mupen64plus/default.nix index 49681aaee94..f5d17d9d395 100644 --- a/pkgs/misc/emulators/mupen64plus/default.nix +++ b/pkgs/misc/emulators/mupen64plus/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, boost, dash, freetype, libpng, pkgconfig, SDL, which, zlib, nasm }: +{lib, stdenv, fetchurl, boost, dash, freetype, libpng, pkg-config, SDL, which, zlib, nasm }: stdenv.mkDerivation rec { pname = "mupen64plus"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1a21n4gqdvag6krwcjm5bnyw5phrlxw6m0mk73jy53iq03f3s96m"; }; - nativeBuildInputs = [ pkgconfig nasm ]; + nativeBuildInputs = [ pkg-config nasm ]; buildInputs = [ boost dash freetype libpng SDL which zlib ]; buildPhase = '' diff --git a/pkgs/misc/emulators/nestopia/default.nix b/pkgs/misc/emulators/nestopia/default.nix index 5050df007f6..d1b18f12a84 100644 --- a/pkgs/misc/emulators/nestopia/default.nix +++ b/pkgs/misc/emulators/nestopia/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, pkgconfig, SDL2, alsaLib, gtk3 -, makeWrapper, libGLU, libGL, libarchive, libao, unzip, xdg_utils +{ lib, stdenv, fetchFromGitHub, pkg-config, SDL2, alsaLib, gtk3 +, makeWrapper, libGLU, libGL, libarchive, libao, unzip, xdg-utils , epoxy, gdk-pixbuf, gnome3, wrapGAppsHook }: @@ -29,12 +29,12 @@ stdenv.mkDerivation rec { libarchive libao unzip - xdg_utils + xdg-utils gnome3.adwaita-icon-theme ]; nativeBuildInputs = [ - pkgconfig + pkg-config makeWrapper wrapGAppsHook ]; @@ -64,9 +64,9 @@ stdenv.mkDerivation rec { meta = { homepage = "http://0ldsk00l.ca/nestopia/"; description = "NES emulator with a focus on accuracy"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ MP2E ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ MP2E ]; }; } diff --git a/pkgs/misc/emulators/oberon-risc-emu/default.nix b/pkgs/misc/emulators/oberon-risc-emu/default.nix index 14c213fcc0a..749e3549bf8 100644 --- a/pkgs/misc/emulators/oberon-risc-emu/default.nix +++ b/pkgs/misc/emulators/oberon-risc-emu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, SDL2 }: +{ lib, stdenv, fetchFromGitHub, SDL2 }: stdenv.mkDerivation { pname = "oberon-risc-emu"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { mv risc $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/pdewacht/oberon-risc-emu/"; description = "Emulator for the Oberon RISC machine"; license = licenses.isc; diff --git a/pkgs/misc/emulators/openmsx/default.nix b/pkgs/misc/emulators/openmsx/default.nix index dc533c4f17c..d34a921e177 100644 --- a/pkgs/misc/emulators/openmsx/default.nix +++ b/pkgs/misc/emulators/openmsx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig +{ lib, stdenv, fetchFromGitHub, pkg-config , python , alsaLib, glew, libGL, libpng , libogg, libtheora, libvorbis @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ pkgconfig python ]; + nativeBuildInputs = [ pkg-config python ]; buildInputs = [ alsaLib glew libGL libpng libogg libtheora libvorbis freetype @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { # for providing support to Nixpkgs :) TCL_CONFIG="${tcl}/lib/"; - meta = with stdenv.lib;{ + meta = with lib;{ description = "The MSX emulator that aims for perfection"; longDescription = '' OpenMSX is an emulator for the MSX home computer system. Its goal is diff --git a/pkgs/misc/emulators/pcsx2/default.nix b/pkgs/misc/emulators/pcsx2/default.nix index a71ccb46b99..7f46d9a0034 100644 --- a/pkgs/misc/emulators/pcsx2/default.nix +++ b/pkgs/misc/emulators/pcsx2/default.nix @@ -15,7 +15,7 @@ , libxml2 , makeWrapper , perl -, pkgconfig +, pkg-config , portaudio , SDL2 , soundtouch @@ -68,7 +68,7 @@ stdenv.mkDerivation { --set __GL_THREADED_OPTIMIZATIONS 1 ''; - nativeBuildInputs = [ cmake makeWrapper perl pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ cmake makeWrapper perl pkg-config wrapGAppsHook ]; buildInputs = [ alsaLib diff --git a/pkgs/misc/emulators/pcsxr/default.nix b/pkgs/misc/emulators/pcsxr/default.nix index 47a87dcca0b..e6f0ec47744 100644 --- a/pkgs/misc/emulators/pcsxr/default.nix +++ b/pkgs/misc/emulators/pcsxr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, intltool, pkgconfig, gtk3, SDL2, xorg +{ lib, stdenv, fetchurl, autoreconfHook, intltool, pkg-config, gtk3, SDL2, xorg , wrapGAppsHook, libcdio, nasm, ffmpeg, file , fetchpatch }: @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { ./uncompress2.patch ]; - nativeBuildInputs = [ autoreconfHook intltool pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ autoreconfHook intltool pkg-config wrapGAppsHook ]; buildInputs = [ gtk3 SDL2 xorg.libXv xorg.libXtst libcdio nasm ffmpeg file ]; diff --git a/pkgs/misc/emulators/ppsspp/default.nix b/pkgs/misc/emulators/ppsspp/default.nix index effc34accf2..87dacd46d57 100644 --- a/pkgs/misc/emulators/ppsspp/default.nix +++ b/pkgs/misc/emulators/ppsspp/default.nix @@ -6,7 +6,7 @@ , lib , libzip , mkDerivation -, pkgconfig +, pkg-config , python3 , qtbase , qtmultimedia @@ -31,7 +31,7 @@ mkDerivation rec { substituteInPlace UI/NativeApp.cpp --replace /usr/share $out/share ''; - nativeBuildInputs = [ cmake pkgconfig python3 ]; + nativeBuildInputs = [ cmake pkg-config python3 ]; buildInputs = [ SDL2 diff --git a/pkgs/misc/emulators/qmc2/default.nix b/pkgs/misc/emulators/qmc2/default.nix index b38692de263..6c6a52fc65c 100644 --- a/pkgs/misc/emulators/qmc2/default.nix +++ b/pkgs/misc/emulators/qmc2/default.nix @@ -1,5 +1,5 @@ { lib, stdenv -, fetchurl, qttools, pkgconfig +, fetchurl, qttools, pkg-config , minizip, zlib , qtbase, qtsvg, qtmultimedia, qtwebkit, qttranslations, qtxmlpatterns , rsync, SDL2, xwininfo @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { patchShebangs scripts ''; - nativeBuildInputs = [ qttools pkgconfig ]; + nativeBuildInputs = [ qttools pkg-config ]; buildInputs = [ minizip qtbase qtsvg qtmultimedia qtwebkit qttranslations qtxmlpatterns rsync SDL2 xwininfo zlib util-linux xorg.libxcb ]; diff --git a/pkgs/misc/emulators/resim/default.nix b/pkgs/misc/emulators/resim/default.nix index ba7ac621257..6e759bd7552 100644 --- a/pkgs/misc/emulators/resim/default.nix +++ b/pkgs/misc/emulators/resim/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, cmake, qt4 }: +{ fetchFromGitHub, lib, stdenv, cmake, qt4 }: stdenv.mkDerivation { name = "resim"; @@ -16,5 +16,5 @@ stdenv.mkDerivation { cp -v vc4emul/vc4emul $out/bin/vc4emul ''; - meta.license = stdenv.lib.licenses.mit; + meta.license = lib.licenses.mit; } diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index 65771577896..c1b60ad63b2 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, fetchFromGitHub, fetchFromGitLab, fetchpatch, cmake, pkgconfig, makeWrapper, python27, python37, retroarch +{ lib, stdenv, fetchgit, fetchFromGitHub, fetchFromGitLab, fetchpatch, cmake, pkg-config, makeWrapper, python27, python37, retroarch , alsaLib, fluidsynth, curl, hidapi, libGLU, gettext, glib, gtk2, portaudio, SDL, SDL_net, SDL2, SDL2_image, libGL , ffmpeg_3, pcre, libevdev, libpng, libjpeg, libzip, udev, libvorbis, snappy, which, hexdump , miniupnpc, sfml, xorg, zlib, nasm, libpcap, boost, icu, openssl @@ -6,10 +6,10 @@ let - d2u = stdenv.lib.replaceChars ["-"] ["_"]; + d2u = lib.replaceChars ["-"] ["_"]; mkLibRetroCore = { core, src, description, license, broken ? false, ... }@a: - stdenv.lib.makeOverridable stdenv.mkDerivation ((rec { + lib.makeOverridable stdenv.mkDerivation ((rec { name = "libretro-${a.core}-${version}"; version = "2020-03-06"; @@ -62,7 +62,7 @@ let fetchSubmodules = true; }; -in with stdenv.lib.licenses; +in with lib.licenses; { @@ -288,7 +288,7 @@ in with stdenv.lib.licenses; }; description = "Port of Citra to libretro"; license = gpl2Plus; - extraNativeBuildInputs = [ cmake pkgconfig ]; + extraNativeBuildInputs = [ cmake pkg-config ]; extraBuildInputs = [ libGLU libGL boost ]; makefile = "Makefile"; cmakeFlags = [ @@ -313,8 +313,8 @@ in with stdenv.lib.licenses; license = gpl2; extraBuildInputs = [ libpcap libGLU libGL xorg.libX11 ]; preBuild = "cd desmume/src/frontend/libretro"; - makeFlags = stdenv.lib.optional stdenv.hostPlatform.isAarch32 "platform=armv-unix" - ++ stdenv.lib.optional (!stdenv.hostPlatform.isx86) "DESMUME_JIT=0"; + makeFlags = lib.optional stdenv.hostPlatform.isAarch32 "platform=armv-unix" + ++ lib.optional (!stdenv.hostPlatform.isx86) "DESMUME_JIT=0"; }; desmume2015 = mkLibRetroCore rec { @@ -327,8 +327,8 @@ in with stdenv.lib.licenses; description = "libretro wrapper for desmume NDS emulator from 2015"; license = gpl2; extraBuildInputs = [ libpcap libGLU libGL xorg.libX11 ]; - makeFlags = stdenv.lib.optional stdenv.hostPlatform.isAarch32 "platform=armv-unix" - ++ stdenv.lib.optional (!stdenv.hostPlatform.isx86) "DESMUME_JIT=0"; + makeFlags = lib.optional stdenv.hostPlatform.isAarch32 "platform=armv-unix" + ++ lib.optional (!stdenv.hostPlatform.isx86) "DESMUME_JIT=0"; preBuild = "cd desmume"; }; @@ -342,7 +342,7 @@ in with stdenv.lib.licenses; description = "Port of Dolphin to libretro"; license = gpl2Plus; - extraNativeBuildInputs = [ cmake curl pkgconfig ]; + extraNativeBuildInputs = [ cmake curl pkg-config ]; extraBuildInputs = [ libGLU libGL pcre sfml gettext hidapi @@ -435,7 +435,7 @@ in with stdenv.lib.licenses; license = gpl2; extraBuildInputs = [ libGL libGLU ]; makefile = "Makefile"; - makeFlags = stdenv.lib.optional stdenv.hostPlatform.isAarch64 [ "platform=arm64" ]; + makeFlags = lib.optional stdenv.hostPlatform.isAarch64 [ "platform=arm64" ]; meta.platforms = [ "aarch64-linux" "x86_64-linux" ]; }; @@ -505,7 +505,7 @@ in with stdenv.lib.licenses; sha256 = "1jhgfys8hiipvbwq3gc48d7v6wq645d10rbr4w5m6px0fk6csshk"; }; description = "Port of Game and Watch to libretro"; - license = stdenv.lib.licenses.zlib; + license = lib.licenses.zlib; makefile = "Makefile"; }; @@ -567,7 +567,7 @@ in with stdenv.lib.licenses; description = "Port of MAME ~2000 to libretro"; license = gpl2Plus; makefile = "Makefile"; - makeFlags = stdenv.lib.optional (!stdenv.hostPlatform.isx86) "IS_X86=0"; + makeFlags = lib.optional (!stdenv.hostPlatform.isx86) "IS_X86=0"; }; mame2003 = mkLibRetroCore rec { @@ -604,7 +604,7 @@ in with stdenv.lib.licenses; description = "Port of MAME ~2010 to libretro"; license = gpl2Plus; makefile = "Makefile"; - makeFlags = stdenv.lib.optionals stdenv.hostPlatform.isAarch64 [ "PTR64=1" "ARM_ENABLED=1" "X86_SH2DRC=0" "FORCE_DRC_C_BACKEND=1" ]; + makeFlags = lib.optionals stdenv.hostPlatform.isAarch64 [ "PTR64=1" "ARM_ENABLED=1" "X86_SH2DRC=0" "FORCE_DRC_C_BACKEND=1" ]; }; mame2015 = mkLibRetroCore rec { @@ -778,7 +778,7 @@ in with stdenv.lib.licenses; license = gpl2; extraBuildInputs = [ libGLU libGL libpng ]; makefile = "Makefile"; - postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isAarch64 '' + postPatch = lib.optionalString stdenv.hostPlatform.isAarch64 '' sed -i -e '1 i\CPUFLAGS += -DARM_FIX -DNO_ASM -DARM_ASM -DDONT_WANT_ARM_OPTIMIZATIONS -DARM64' Makefile \ && sed -i -e 's,CPUFLAGS :=,,g' Makefile ''; @@ -810,7 +810,7 @@ in with stdenv.lib.licenses; SDL_CONFIG = "${SDL.dev}/bin/sdl-config"; dontAddPrefix = true; configurePlatforms = []; - makeFlags = stdenv.lib.optional stdenv.hostPlatform.isAarch64 [ "platform=aarch64" ]; + makeFlags = lib.optional stdenv.hostPlatform.isAarch64 [ "platform=aarch64" ]; }; play = mkLibRetroCore { @@ -838,7 +838,7 @@ in with stdenv.lib.licenses; }; description = "ppsspp libretro port"; license = gpl2; - extraNativeBuildInputs = [ cmake pkgconfig ]; + extraNativeBuildInputs = [ cmake pkg-config ]; extraBuildInputs = [ libGLU libGL libzip ffmpeg_3 python37 snappy xorg.libX11 ]; makefile = "Makefile"; cmakeFlags = [ "-DLIBRETRO=ON -DUSE_SYSTEM_FFMPEG=ON -DUSE_SYSTEM_SNAPPY=ON -DUSE_SYSTEM_LIBZIP=ON -DOpenGL_GL_PREFERENCE=GLVND" ]; @@ -981,7 +981,7 @@ in with stdenv.lib.licenses; }; description = "Port of Stella to libretro"; license = gpl2; - extraBuildInputs = [ libpng pkgconfig SDL ]; + extraBuildInputs = [ libpng pkg-config SDL ]; makefile = "Makefile"; preBuild = "cd src/libretro"; dontConfigure = true; @@ -1020,7 +1020,7 @@ in with stdenv.lib.licenses; }; description = "Port of TIC-80 to libretro"; license = mit; - extraNativeBuildInputs = [ cmake pkgconfig ]; + extraNativeBuildInputs = [ cmake pkg-config ]; makefile = "Makefile"; cmakeFlags = [ "-DBUILD_LIBRETRO=ON" @@ -1091,7 +1091,7 @@ in with stdenv.lib.licenses; license = gpl2; makefile = "Makefile"; # Disable SSE for non-x86. DYNAREC doesn't build on either Aarch64 or x86_64. - makeFlags = stdenv.lib.optional (!stdenv.hostPlatform.isx86) "HAVE_SSE=0"; + makeFlags = lib.optional (!stdenv.hostPlatform.isx86) "HAVE_SSE=0"; preBuild = "cd yabause/src/libretro"; }; diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix index bfc2c338769..a6ada570a50 100644 --- a/pkgs/misc/emulators/retroarch/default.nix +++ b/pkgs/misc/emulators/retroarch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, which, pkgconfig, makeWrapper +{ lib, stdenv, fetchFromGitHub, which, pkg-config, makeWrapper , ffmpeg_3, libGLU, libGL, freetype, libxml2, python3 , libobjc, AppKit, Foundation , alsaLib ? null @@ -19,7 +19,7 @@ , libxkbcommon }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "retroarch-bare"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { rev = "v${version}"; }; - nativeBuildInputs = [ pkgconfig wayland ] + nativeBuildInputs = [ pkg-config wayland ] ++ optional withVulkan makeWrapper; buildInputs = [ ffmpeg_3 freetype libxml2 libGLU libGL python3 SDL2 which ] @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - configureFlags = stdenv.lib.optionals stdenv.isLinux [ "--enable-kms" "--enable-egl" ]; + configureFlags = lib.optionals stdenv.isLinux [ "--enable-kms" "--enable-egl" ]; postInstall = optionalString withVulkan '' wrapProgram $out/bin/retroarch --prefix LD_LIBRARY_PATH ':' ${vulkan-loader}/lib diff --git a/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix b/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix index d751c4f7fc4..79dd025cf94 100644 --- a/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix +++ b/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { buildCommand = '' mkdir -p $out/bin - ${stdenv.lib.concatMapStrings (exec: "ln -s ${scriptSh exec} $out/bin/kodi-${exec.name};") execs} + ${lib.concatMapStrings (exec: "ln -s ${scriptSh exec} $out/bin/kodi-${exec.name};") execs} ''; meta = { @@ -35,6 +35,6 @@ stdenv.mkDerivation { advanced (emulation) launcher for Kodi since device input is otherwise caught by both Kodi and the retroarch process. ''; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }; } diff --git a/pkgs/misc/emulators/retrofe/default.nix b/pkgs/misc/emulators/retrofe/default.nix index f69505b65f1..558b5ca6337 100644 --- a/pkgs/misc/emulators/retrofe/default.nix +++ b/pkgs/misc/emulators/retrofe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchhg, cmake, glib, gst_all_1, makeWrapper, pkgconfig +{ lib, stdenv, fetchhg, cmake, glib, gst_all_1, makeWrapper, pkg-config , python, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, sqlite, zlib, runtimeShell }: @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "0cvsg07ff0fdqh5zgiv2fs7s6c98hn150kpxmpw5fn6jilaszwkm"; }; - nativeBuildInputs = [ cmake makeWrapper pkgconfig python ]; + nativeBuildInputs = [ cmake makeWrapper pkg-config python ]; buildInputs = [ glib gst_all_1.gstreamer SDL2 SDL2_image SDL2_mixer SDL2_ttf sqlite zlib diff --git a/pkgs/misc/emulators/rpcs3/default.nix b/pkgs/misc/emulators/rpcs3/default.nix index 4b0d698905f..ecda439e7ab 100644 --- a/pkgs/misc/emulators/rpcs3/default.nix +++ b/pkgs/misc/emulators/rpcs3/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchgit, cmake, pkgconfig, git +{ mkDerivation, lib, fetchgit, cmake, pkg-config, git , qtbase, qtquickcontrols, openal, glew, vulkan-headers, vulkan-loader, libpng , ffmpeg, libevdev, python3 , pulseaudioSupport ? true, libpulseaudio @@ -35,7 +35,7 @@ mkDerivation { "-DUSE_NATIVE_INSTRUCTIONS=OFF" ]; - nativeBuildInputs = [ cmake pkgconfig git ]; + nativeBuildInputs = [ cmake pkg-config git ]; buildInputs = [ qtbase qtquickcontrols openal glew vulkan-headers vulkan-loader libpng ffmpeg @@ -47,7 +47,7 @@ mkDerivation { meta = with lib; { description = "PS3 emulator/debugger"; homepage = "https://rpcs3.net/"; - maintainers = with maintainers; [ abbradar neonfuz nocent ]; + maintainers = with maintainers; [ abbradar neonfuz ilian ]; license = licenses.gpl2; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/misc/emulators/ruffle/default.nix b/pkgs/misc/emulators/ruffle/default.nix index b817716075c..9e1f986341f 100644 --- a/pkgs/misc/emulators/ruffle/default.nix +++ b/pkgs/misc/emulators/ruffle/default.nix @@ -1,26 +1,29 @@ { alsaLib , fetchFromGitHub +, makeWrapper , openssl , pkg-config , python3 , rustPlatform -, lib, stdenv +, lib , wayland , xorg +, vulkan-loader }: rustPlatform.buildRustPackage rec { pname = "ruffle"; - version = "nightly-2020-11-30"; + version = "nightly-2021-01-12"; src = fetchFromGitHub { owner = "ruffle-rs"; repo = pname; rev = version; - sha256 = "0z54swzy47laq3smficd3dyrs2zdi3cj2kb0b4hppjxpkkhiw4x0"; + sha256 = "1lywxn61w0b3pb8vjpavd9f3v58gq35ypwp41b7rjkc4rjxmf3cd"; }; nativeBuildInputs = [ + makeWrapper pkg-config python3 ]; @@ -35,9 +38,14 @@ rustPlatform.buildRustPackage rec { xorg.libXi xorg.libxcb xorg.libXrender + vulkan-loader ]; - cargoSha256 = "05kwfcbzjyyfhiqklhhlv06pinzw9bry4j8l9lk3k04c1q30gzkw"; + postInstall = '' + wrapProgram $out/bin/ruffle_desktop --prefix LD_LIBRARY_PATH ':' ${vulkan-loader}/lib + ''; + + cargoSha256 = "113gh8nf2fs9shfvnzpwlc7zaq1l9l9jhlybcc4dq0wr4r8qpff5"; meta = with lib; { description = "An Adobe Flash Player emulator written in the Rust programming language."; diff --git a/pkgs/misc/emulators/ryujinx/default.nix b/pkgs/misc/emulators/ryujinx/default.nix index b7259a3deb3..db6e75b9d4e 100644 --- a/pkgs/misc/emulators/ryujinx/default.nix +++ b/pkgs/misc/emulators/ryujinx/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, fetchurl, makeWrapper, makeDesktopItem, linkFarmFromDrvs -, dotnet-sdk_3, dotnetPackages, dotnetCorePackages -, SDL2, libX11, openal -, gtk3, gobject-introspection, wrapGAppsHook +, dotnet-sdk_5, dotnetPackages, dotnetCorePackages +, SDL2, libX11, ffmpeg, openal, libsoundio +, gtk3, gobject-introspection, gdk-pixbuf, wrapGAppsHook }: let @@ -9,20 +9,22 @@ let SDL2 gtk3 libX11 + ffmpeg openal + libsoundio ]; in stdenv.mkDerivation rec { pname = "ryujinx"; - version = "1.0.5551"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx + version = "1.0.6448"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "2dcc6333f8cbb959293832f52857bdaeab1918bf"; - sha256 = "1hfa498fr9mdxas9s02y25ncb982wa1sqhl06jpnkhqsiicbkgcf"; + rev = "9eb0ab05c6e820e113b3c61cbacd9b085b2819c4"; + sha256 = "168nm7p6lqswmsya6gf3296ligyjabqmbrdzginkcviii643yslz"; }; - nativeBuildInputs = [ dotnet-sdk_3 dotnetPackages.Nuget makeWrapper wrapGAppsHook gobject-introspection ]; + nativeBuildInputs = [ dotnet-sdk_5 dotnetPackages.Nuget makeWrapper wrapGAppsHook gobject-introspection gdk-pixbuf ]; nugetDeps = linkFarmFromDrvs "${pname}-nuget-deps" (import ./deps.nix { fetchNuGet = { name, version, sha256 }: fetchurl { @@ -32,7 +34,10 @@ in stdenv.mkDerivation rec { }; }); - patches = [ ./log.patch ]; # Without this, Ryujinx tries to write logs to the nix store. This patch makes it write to "~/.config/Ryujinx/Logs" on Linux. + patches = [ + ./log.patch # Without this, Ryujinx attempts to write logs to the nix store. This patch makes it write to "~/.config/Ryujinx/Logs" on Linux. + ./disable-updater.patch # This disables the auto-updater, which does not work as it attempts to modify the nix store. + ]; configurePhase = '' runHook preConfigure @@ -73,12 +78,12 @@ in stdenv.mkDerivation rec { shopt -s extglob makeWrapper $out/lib/ryujinx/Ryujinx $out/bin/Ryujinx \ - --set DOTNET_ROOT "${dotnetCorePackages.netcore_3_1}" \ - --suffix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath runtimeDeps}" \ + --set DOTNET_ROOT "${dotnetCorePackages.net_5_0}" \ + --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDeps}" \ ''${gappsWrapperArgs[@]} for i in 16 32 48 64 96 128 256 512 1024; do - install -D ${src}/Ryujinx/Ui/assets/Icon.png $out/share/icons/hicolor/''${i}x$i/apps/ryujinx.png + install -D ${src}/Ryujinx/Ui/Resources/Logo_Ryujinx.png $out/share/icons/hicolor/''${i}x$i/apps/ryujinx.png done cp -r ${makeDesktopItem { desktopName = "Ryujinx"; diff --git a/pkgs/misc/emulators/ryujinx/deps.nix b/pkgs/misc/emulators/ryujinx/deps.nix index 4f30b159a28..737bd876e13 100644 --- a/pkgs/misc/emulators/ryujinx/deps.nix +++ b/pkgs/misc/emulators/ryujinx/deps.nix @@ -1,13 +1,13 @@ { fetchNuGet }: [ (fetchNuGet { name = "AtkSharp"; - version = "3.22.25.56"; - sha256 = "069fm4wplxb4s1i6mdj00b22zqpz6pg9miglcj8mkf1b4lnn09g0"; + version = "3.22.25.128"; + sha256 = "0fg01zi7v6127043jzxzihirsdp187pyj83gfa6p79cx763l7z94"; }) (fetchNuGet { name = "CairoSharp"; - version = "3.22.25.56"; - sha256 = "0b7p4yj88wgayh464j3rkbc4js8z57wxy3mprgvx86i3rc2v5jd9"; + version = "3.22.25.128"; + sha256 = "1rjdxd4fq5z3n51qx8vrcaf4i277ccc62jxk88xzbsxapdmjjdf9"; }) (fetchNuGet { name = "Concentus"; @@ -21,8 +21,8 @@ }) (fetchNuGet { name = "DiscordRichPresence"; - version = "1.0.150"; - sha256 = "0qmbi4sccia3w80q8xfvj3bw62nvz047wq198n2b2aflkf47bq79"; + version = "1.0.166"; + sha256 = "019rz0br8hamydmdrgzcc6280jfhm4i4ix27jh66a7h37alvdi3a"; }) (fetchNuGet { name = "FFmpeg.AutoGen"; @@ -31,18 +31,18 @@ }) (fetchNuGet { name = "GdkSharp"; - version = "3.22.25.56"; - sha256 = "0f708dwy6i9hghxs711scwkww28lvfjd6gykk7xv921vich5xvy6"; + version = "3.22.25.128"; + sha256 = "0bmn0ddaw8797pnhpyl03h2zl8i5ha67yv38gly4ydy50az2xhj7"; }) (fetchNuGet { name = "GioSharp"; - version = "3.22.25.56"; - sha256 = "1i7x1bakv5sq27ppl6w79c1wbvnfhf1713plc9ixaznh1fclcnwr"; + version = "3.22.25.128"; + sha256 = "0syfa1f2hg7wsxln5lh86n8m1lihhprc51b6km91gkl25l5hw5bv"; }) (fetchNuGet { name = "GLibSharp"; - version = "3.22.25.56"; - sha256 = "12czfm0lgjcy9hgqsiycwfv124dq619svrnsi036246i5hycj37w"; + version = "3.22.25.128"; + sha256 = "1j8i5izk97ga30z1qpd765zqd2q5w71y8bhnkqq4bj59768fyxp5"; }) (fetchNuGet { name = "GLWidget"; @@ -51,8 +51,8 @@ }) (fetchNuGet { name = "GtkSharp"; - version = "3.22.25.56"; - sha256 = "18dbn834wimdmxmgsqd81hyvjyyzgbnayzvz9f714cgw4yjkjyqs"; + version = "3.22.25.128"; + sha256 = "0z0wx0p3gc02r8d7y88k1rw307sb2vapbr1k1yc5qdc38fxz5jsy"; }) (fetchNuGet { name = "GtkSharp.Dependencies"; @@ -66,23 +66,23 @@ }) (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; - version = "3.1.8"; - sha256 = "140zr3nwkmf6xc52gq4iz6ycyh95fxy0jpgn637pkd9z423z8135"; + version = "5.0.0"; + sha256 = "14njzl0907wzcbsnxl62m4y6mv9pdirm68bj8qbbip0q5a6xgidw"; }) (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.osx-x64"; - version = "3.1.8"; - sha256 = "0dkib4r4v5wqxsi6zca6x3zin1x4lha53dqbgsaiah961h1yhpp4"; + version = "5.0.0"; + sha256 = "1mmklq1fwq4km9y9jgk63wmwjlarx4npkpvjaiwdzv83vdv104ja"; }) (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.win-x64"; - version = "3.1.8"; - sha256 = "05sv39b6sc8fhh3m8kwq0lp58n8mrv5ivxa60rfqk6v6i7gs8b0f"; + version = "5.0.0"; + sha256 = "0k7q89w3nky4m0j5jsk95c8gczlyp5jl9982gf1hli3gqpl2q4jr"; }) (fetchNuGet { name = "Microsoft.CodeCoverage"; - version = "16.7.0"; - sha256 = "10f6y1q8w61vc8ffqd7jsndwfskkfqbdzfqswyxnrr0qkkqx29v1"; + version = "16.8.0"; + sha256 = "1y05sjk7wgd29a47v1yhn2s1lrd8wgazkilvmjbvivmrrm3fqjs8"; }) (fetchNuGet { name = "Microsoft.CSharp"; @@ -96,28 +96,28 @@ }) (fetchNuGet { name = "Microsoft.NETCore.App.Host.osx-x64"; - version = "3.1.8"; - sha256 = "1ip8pgra9z6ha3yc4xqkb85cl9kx2jbwhwzdi3dp8bkqbvlirvkb"; + version = "5.0.0"; + sha256 = "1nirb155gzn2ws1ayaqspjmjaizw87jq2684mzkn18jv4si0hbpf"; }) (fetchNuGet { name = "Microsoft.NETCore.App.Host.win-x64"; - version = "3.1.8"; - sha256 = "1d7wlnibf9fgq57hwnjqhlh33hxg417ljf1djb9yan4xik1wl4hb"; + version = "5.0.0"; + sha256 = "0nghghcapc28ixg21wb30ccjirc9wz83h0y3bn5zyfanxv2m2ypx"; }) (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-x64"; - version = "3.1.8"; - sha256 = "1bv9n9wzsqf9g8h6z10p61xkcx8ad4nnip83qv8yyfvhr4kdmbsa"; + version = "5.0.0"; + sha256 = "1k9yxklzdnjfkqysg54dz0mr75yg29fhlls9alh5qlfpsfpk32yq"; }) (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.osx-x64"; - version = "3.1.8"; - sha256 = "1iabp5czrz9wmsqcl0gi8r580vlhky3aak5ndz9fw065wlsqpv7w"; + version = "5.0.0"; + sha256 = "0lvpf4zz617y94zz3zsmzrg6zcdd6z3z9gz2bd5kq1l8y1pmq77y"; }) (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.win-x64"; - version = "3.1.8"; - sha256 = "010c514ls1q9gdnyj0kvknx7a0z034lfbbcxqa8cjiv0snax4pqz"; + version = "5.0.0"; + sha256 = "1486654z369857h45v73jz8pwr8ibb97fiw5mfm7f01kdbyjdsdd"; }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; @@ -140,6 +140,11 @@ sha256 = "1gc1x8f95wk8yhgznkwsg80adk1lc65v9n5rx4yaa4bc5dva0z3j"; }) (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "5.0.0"; + sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; + }) + (fetchNuGet { name = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; @@ -151,18 +156,18 @@ }) (fetchNuGet { name = "Microsoft.NET.Test.Sdk"; - version = "16.7.0"; - sha256 = "1vkp6b82566z2pxn9035wrh4339kz3ki17g5qlwmwdbn4br6lcfy"; + version = "16.8.0"; + sha256 = "1ln2mva7j2mpsj9rdhpk8vhm3pgd8wn563xqdcwd38avnhp74rm9"; }) (fetchNuGet { name = "Microsoft.TestPlatform.ObjectModel"; - version = "16.7.0"; - sha256 = "0nmw80ap2rn9h4i1x7qb15n763sh3wy8hjp1i5n0av7100g0yjqz"; + version = "16.8.0"; + sha256 = "0ii9d88py6mjsxzj9v3zx4izh6rb9ma6s9kj85xmc0xrw7jc2g3m"; }) (fetchNuGet { name = "Microsoft.TestPlatform.TestHost"; - version = "16.7.0"; - sha256 = "0485nv0wcwdwjhif5a7d1i0znaf9acqyawhpqcwschw827chqzrs"; + version = "16.8.0"; + sha256 = "1rh8cga1km3jfafkwfjr0dwqrxb4306hf7fipwba9h02w7vlhb9a"; }) (fetchNuGet { name = "Microsoft.Win32.Primitives"; @@ -190,6 +195,11 @@ sha256 = "0bx21jjbs7l5ydyw4p6cn07chryxpmchq2nl5pirzz4l3b0q4dgs"; }) (fetchNuGet { + name = "Microsoft.Win32.Registry"; + version = "5.0.0"; + sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; + }) + (fetchNuGet { name = "Microsoft.Win32.SystemEvents"; version = "4.5.0"; sha256 = "0fnkv3ky12227zqg4zshx4kw2mvysq2ppxjibfw02cc3iprv4njq"; @@ -241,13 +251,13 @@ }) (fetchNuGet { name = "OpenTK.NetStandard"; - version = "1.0.5.22"; - sha256 = "10bdhc4qbffac862zg03ab5j3iqrr33bydxmnmrxn82brldahm23"; + version = "1.0.5.32"; + sha256 = "12y8kg73llmq3zibcp6j3hhiw04g7mqlm1nslmb74gfkzx0b4m9f"; }) (fetchNuGet { name = "PangoSharp"; - version = "3.22.25.56"; - sha256 = "12b0761nfsci4rvzcba4hrh5rcn6q24qaxwwz66myb82c999qj8w"; + version = "3.22.25.128"; + sha256 = "0dkl9j0yd65s5ds9xj5z6yb7yca7wlycqz25m8dng20d13sqr1zp"; }) (fetchNuGet { name = "runtime.any.System.Collections"; @@ -490,14 +500,19 @@ sha256 = "1700famsxndccfbcdz9q14qb20p49lax67mqwpgy4gx3vja1yczr"; }) (fetchNuGet { + name = "Ryujinx.Audio.OpenAL.Dependencies"; + version = "1.21.0.1"; + sha256 = "0z5k42h252nr60d02p2ww9190d7k1kzrb26vil4ydfhxqqqv6w9l"; + }) + (fetchNuGet { name = "Ryujinx.Graphics.Nvdec.Dependencies"; version = "4.3.0"; sha256 = "0szgbdhyhvzpw8nb9k2ww37p5qipab1pdll8idkk57y5xnl2f7ll"; }) (fetchNuGet { name = "SharpZipLib"; - version = "1.2.0"; - sha256 = "0ynhx1qkjm723bwjwsrdviw1d2s9azndpa12dagrjshhma3igqm5"; + version = "1.3.0"; + sha256 = "1pizj82wisch28nfdaszwqm9bz19lnl0s5mq8c0zybm2vhnrhvk4"; }) (fetchNuGet { name = "System.AppContext"; @@ -521,8 +536,8 @@ }) (fetchNuGet { name = "System.CodeDom"; - version = "4.7.0"; - sha256 = "1lch8gwmw420wsvbv9ir4v5g1ij2ag23cbgi3c9gramj1h4vhlz2"; + version = "5.0.0"; + sha256 = "14zs2wqkmdlxzj8ikx19n321lsbarx5vl2a8wrachymxn8zb5njh"; }) (fetchNuGet { name = "System.Collections"; @@ -701,8 +716,8 @@ }) (fetchNuGet { name = "System.Management"; - version = "4.7.0"; - sha256 = "0aw61jl6l78liiq04afxplz0ad5qbyg6vmyjaqrlnrv7whb58n66"; + version = "5.0.0"; + sha256 = "09hyv3p0zd549577clydlb2szl84m4gvdjnsry73n8b12ja7d75s"; }) (fetchNuGet { name = "System.Net.Http"; @@ -831,11 +846,6 @@ }) (fetchNuGet { name = "System.Runtime.CompilerServices.Unsafe"; - version = "4.6.0"; - sha256 = "0xmzi2gpbmgyfr75p24rqqsba3cmrqgmcv45lsqp5amgrdwd0f0m"; - }) - (fetchNuGet { - name = "System.Runtime.CompilerServices.Unsafe"; version = "5.0.0-preview.7.20364.11"; sha256 = "19sl184f6rjhfsizq0vapysazd6yd66lf638rszvrdhqlsxssz2m"; }) @@ -900,6 +910,11 @@ sha256 = "0n0k0w44flkd8j0xw7g3g3vhw7dijfm51f75xkm1qxnbh4y45mpz"; }) (fetchNuGet { + name = "System.Security.AccessControl"; + version = "5.0.0"; + sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; + }) + (fetchNuGet { name = "System.Security.Claims"; version = "4.3.0"; sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; @@ -960,6 +975,11 @@ sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d"; }) (fetchNuGet { + name = "System.Security.Principal.Windows"; + version = "5.0.0"; + sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; + }) + (fetchNuGet { name = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; diff --git a/pkgs/misc/emulators/ryujinx/disable-updater.patch b/pkgs/misc/emulators/ryujinx/disable-updater.patch new file mode 100644 index 00000000000..e233aec7ca1 --- /dev/null +++ b/pkgs/misc/emulators/ryujinx/disable-updater.patch @@ -0,0 +1,33 @@ +diff --git a/Ryujinx/Program.cs b/Ryujinx/Program.cs +index 29043bb8..d3973c7c 100644 +--- a/Ryujinx/Program.cs ++++ b/Ryujinx/Program.cs +@@ -54,9 +54,6 @@ namespace Ryujinx + } + } + +- // Delete backup files after updating. +- Task.Run(Updater.CleanupUpdate); +- + Toolkit.Init(new ToolkitOptions + { + Backend = PlatformBackend.PreferNative +@@ -146,11 +143,6 @@ namespace Ryujinx + mainWindow.LoadApplication(launchPathArg); + } + +- if (ConfigurationState.Instance.CheckUpdatesOnStart.Value && Updater.CanUpdate(false)) +- { +- _ = Updater.BeginParse(mainWindow, false); +- } +- + Application.Run(); + } + +@@ -200,4 +192,4 @@ namespace Ryujinx + Logger.Shutdown(); + } + } +-} +\ No newline at end of file ++} diff --git a/pkgs/misc/emulators/ryujinx/fetch-deps.sh b/pkgs/misc/emulators/ryujinx/fetch-deps.sh index ce9873a1692..d5c9b0eb934 100755 --- a/pkgs/misc/emulators/ryujinx/fetch-deps.sh +++ b/pkgs/misc/emulators/ryujinx/fetch-deps.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl jq common-updater-scripts dotnet-sdk_3 +#!nix-shell -i bash -p curl jq common-updater-scripts dotnet-sdk_5 set -eo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" diff --git a/pkgs/misc/emulators/snes9x-gtk/default.nix b/pkgs/misc/emulators/snes9x-gtk/default.nix index 254c4a329e5..6698d0a5b48 100644 --- a/pkgs/misc/emulators/snes9x-gtk/default.nix +++ b/pkgs/misc/emulators/snes9x-gtk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig, wrapGAppsHook +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wrapGAppsHook , SDL2, zlib, gtk3, libxml2, libXv, epoxy, minizip, pulseaudio, portaudio }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; enableParallelBuilding = true; - nativeBuildInputs = [ meson ninja pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ meson ninja pkg-config wrapGAppsHook ]; buildInputs = [ SDL2 zlib gtk3 libxml2 libXv epoxy minizip pulseaudio portaudio ]; preConfigure = "cd gtk"; diff --git a/pkgs/misc/emulators/stella/default.nix b/pkgs/misc/emulators/stella/default.nix index ece734ef4bc..458922bdc1d 100644 --- a/pkgs/misc/emulators/stella/default.nix +++ b/pkgs/misc/emulators/stella/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkg-config, SDL2 }: +{ lib, stdenv, fetchFromGitHub, pkg-config, SDL2 }: stdenv.mkDerivation rec { pname = "stella"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib;{ + meta = with lib;{ description = "An open-source Atari 2600 VCS emulator"; longDescription = '' Stella is a multi-platform Atari 2600 VCS emulator released under diff --git a/pkgs/misc/emulators/termtekst/default.nix b/pkgs/misc/emulators/termtekst/default.nix index 8186aba1ee5..56f56cffad9 100644 --- a/pkgs/misc/emulators/termtekst/default.nix +++ b/pkgs/misc/emulators/termtekst/default.nix @@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec { ''; meta = with lib; { - description = ''Console NOS Teletekst viewer in Python''; + description = "Console NOS Teletekst viewer in Python"; longDescription = '' Small Python app using curses to display Dutch NOS Teletekst on the Linux console. The original Teletekst font includes 2x6 diff --git a/pkgs/misc/emulators/tilem/default.nix b/pkgs/misc/emulators/tilem/default.nix index 4c51759e71e..d2252563d0a 100644 --- a/pkgs/misc/emulators/tilem/default.nix +++ b/pkgs/misc/emulators/tilem/default.nix @@ -1,63 +1,15 @@ { stdenv , fetchurl , lib -, libarchive -, autoreconfHook -, pkgconfig +, pkg-config , glib -, libusb1 -, darwin -, acl -, lzma -, bzip2 , gnome2 +, libticonv +, libtifiles2 +, libticables2 +, libticalcs2 }: -let - libticonv = stdenv.mkDerivation rec { - pname = "libticonv"; - version = "1.1.5"; - src = fetchurl { - url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2"; - sha256 = "0y080v12bm81wgjm6fnw7q0yg7scphm8hhrls9njcszj7fkscv9i"; - }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ glib ]; - configureFlags = [ "--enable-iconv" ]; - }; - libticables2 = stdenv.mkDerivation rec { - pname = "libticables2"; - version = "1.3.5"; - src = fetchurl { - url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2"; - sha256 = "08j5di0cgix9vcpdv7b8xhxdjkk9zz7fqfnv3l4apk3jdr8vcvqc"; - }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ glib libusb1 ]; - configureFlags = [ "--enable-libusb10" ]; - }; - libticalcs2 = stdenv.mkDerivation rec { - pname = "libticalcs2"; - version = "1.1.9"; - src = fetchurl { - url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2"; - sha256 = "08c9wgrdnyqcs45mx1bjb8riqq81bzfkhgaijxzn96rhpj40fy3n"; - }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ glib libticables2 libticonv libtifiles2 lzma bzip2 ] - ++ lib.optionals stdenv.isLinux [ acl ] - ++ lib.optionals stdenv.isDarwin [ darwin.libobjc ]; - }; - libtifiles2 = stdenv.mkDerivation rec { - pname = "libtifiles2"; - version = "1.1.7"; - src = fetchurl { - url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2"; - sha256 = "10n9mhlabmaw3ha5ckllxfy6fygs2pmlmj5v6w5v62bvx54kpils"; - }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ glib libticonv libarchive lzma bzip2 ]; - }; -in + stdenv.mkDerivation rec { pname = "tilem"; version = "2.0"; @@ -65,14 +17,14 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; sha256 = "1ba38xzhp3yf21ip3cgql6jzy49jc34sfnjsl4syxyrd81d269zw"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib gnome2.gtk libticonv libtifiles2 libticables2 libticalcs2 ]; NIX_CFLAGS_COMPILE = [ "-lm" ]; meta = with lib; { homepage = "http://lpg.ticalc.org/prj_tilem/"; description = "Emulator and debugger for Texas Instruments Z80-based graphing calculators"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ siraben ]; + maintainers = with maintainers; [ siraben luc65r ]; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/misc/emulators/uae/default.nix b/pkgs/misc/emulators/uae/default.nix index 7b52430aa01..75b86eaeebd 100644 --- a/pkgs/misc/emulators/uae/default.nix +++ b/pkgs/misc/emulators/uae/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, gtk2, alsaLib, SDL}: +{lib, stdenv, fetchurl, pkg-config, gtk2, alsaLib, SDL}: stdenv.mkDerivation rec { name = "uae-0.8.29"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-sdl" "--with-sdl-sound" "--with-sdl-gfx" "--with-alsa" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 alsaLib SDL ]; hardeningDisable = [ "format" ]; @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { meta = { description = "Ultimate/Unix/Unusable Amiga Emulator"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; homepage = "http://web.archive.org/web/20130901222855/http://www.amigaemulator.org/"; - maintainers = [ stdenv.lib.maintainers.sander ]; - platforms = stdenv.lib.platforms.linux; + maintainers = [ lib.maintainers.sander ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/misc/emulators/vbam/default.nix b/pkgs/misc/emulators/vbam/default.nix index 2aae72b3e20..c21f67845db 100644 --- a/pkgs/misc/emulators/vbam/default.nix +++ b/pkgs/misc/emulators/vbam/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , cairo , cmake , fetchFromGitHub @@ -6,7 +6,7 @@ , gettext , libGLU, libGL , openal -, pkgconfig +, pkg-config , SDL2 , sfml , zip @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { sha256 = "1kgpbvng3c12ws0dy92zc0azd94h0i3j4vm7b67zc8mi3pqsppdg"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ cairo @@ -46,12 +46,12 @@ stdenv.mkDerivation rec { "-DENABLE_SDL='true'" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A merge of the original Visual Boy Advance forks"; license = licenses.gpl2; maintainers = with maintainers; [ lassulus ]; homepage = "https://vba-m.com/"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; badPlatforms = [ "aarch64-linux" ]; }; } diff --git a/pkgs/misc/emulators/vice/default.nix b/pkgs/misc/emulators/vice/default.nix index c80d820059f..7d63927e33f 100644 --- a/pkgs/misc/emulators/vice/default.nix +++ b/pkgs/misc/emulators/vice/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, bison, flex, perl, libpng, giflib, libjpeg, alsaLib, readline, libGLU, libGL, libXaw -, pkgconfig, gtk2, SDL, autoreconfHook, makeDesktopItem +{ lib, stdenv, fetchurl, bison, flex, perl, libpng, giflib, libjpeg, alsaLib, readline, libGLU, libGL, libXaw +, pkg-config, gtk2, SDL, autoreconfHook, makeDesktopItem }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ bison flex perl libpng giflib libjpeg alsaLib readline libGLU libGL - pkgconfig gtk2 SDL autoreconfHook libXaw ]; + pkg-config gtk2 SDL autoreconfHook libXaw ]; dontDisableStatic = true; configureFlags = [ "--enable-fullscreen --enable-gnomeui" ]; @@ -46,8 +46,8 @@ stdenv.mkDerivation rec { meta = { description = "Commodore 64, 128 and other emulators"; homepage = "http://www.viceteam.org"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.sander ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.sander ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 6d164fd27bf..6d7c2543d80 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -148,8 +148,8 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { meta = { inherit version platforms; homepage = "https://www.winehq.org/"; - license = with stdenv.lib.licenses; [ lgpl21Plus ]; + license = with lib.licenses; [ lgpl21Plus ]; description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix"; - maintainers = with stdenv.lib.maintainers; [ avnik raskin bendlas ]; + maintainers = with lib.maintainers; [ avnik raskin bendlas ]; }; }) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index afa17282385..3a5abe18d75 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -44,32 +44,24 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "5.22"; - url = "https://dl.winehq.org/wine/source/5.x/wine-${version}.tar.xz"; - sha256 = "sha256-Cb0GyHyMl05q00UHzsh11yF+tW/Anfg41UU+DrvOTSE="; + version = "6.0-rc4"; + url = "https://dl.winehq.org/wine/source/6.0/wine-${version}.tar.xz"; + sha256 = "sha256-ndeBORgnfYmtPbvZEesaetocknePF8cnyjqfulkcfsU="; inherit (stable) mono gecko32 gecko64; patches = [ # Also look for root certificates at $NIX_SSL_CERT_FILE ./cert-path.patch - - # Hotfix picked from master for https://bugs.winehq.org/show_bug.cgi?id=50163 - (pkgs.fetchpatch { - url = "https://bugs.winehq.org/attachment.cgi?id=68680"; - sha256 = "sha256-GTPQhRWeu6DPadqgFiuVUjI6MzJPaTN4l//8DSG6hpo="; - }) ]; }; staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "sha256-HzAKLPlybO1lrkHo4Q1Y9H0vmjiqo9HiT05TcX08Ubk="; + sha256 = "sha256-GdFiCGnGSDOxGERlfsPMJdSrQTvnx8gf4z4joqIKT7c="; owner = "wine-staging"; repo = "wine-staging"; - #rev = "v${version}"; # revert back to this statement on next release - # Include hotfix for https://bugs.winehq.org/show_bug.cgi?id=50162 - rev = "f257f37b92041fc718de04aa83ec3139b748ffa2"; + rev = "v${version}"; # Just keep list empty, if current release haven't broken patchsets disabledPatchsets = [ ]; diff --git a/pkgs/misc/emulators/wine/staging.nix b/pkgs/misc/emulators/wine/staging.nix index a628f5ded58..abfc4f832a3 100644 --- a/pkgs/misc/emulators/wine/staging.nix +++ b/pkgs/misc/emulators/wine/staging.nix @@ -1,13 +1,13 @@ -{ stdenv, callPackage, wineUnstable }: +{ lib, callPackage, wineUnstable }: with callPackage ./util.nix {}; let patch = (callPackage ./sources.nix {}).staging; build-inputs = pkgNames: extra: (mkBuildInputs wineUnstable.pkgArches pkgNames) ++ extra; -in assert stdenv.lib.getVersion wineUnstable == patch.version; +in assert lib.getVersion wineUnstable == patch.version; -(stdenv.lib.overrideDerivation wineUnstable (self: { +(lib.overrideDerivation wineUnstable (self: { buildInputs = build-inputs [ "perl" "util-linux" "autoconf" "gitMinimal" ] self.buildInputs; name = "${self.name}-staging"; @@ -18,7 +18,7 @@ in assert stdenv.lib.getVersion wineUnstable == patch.version; chmod +w patches cd patches patchShebangs gitapply.sh - ./patchinstall.sh DESTDIR="$PWD/.." --all ${stdenv.lib.concatMapStringsSep " " (ps: "-W ${ps}") patch.disabledPatchsets} + ./patchinstall.sh DESTDIR="$PWD/.." --all ${lib.concatMapStringsSep " " (ps: "-W ${ps}") patch.disabledPatchsets} cd .. ''; })) // { diff --git a/pkgs/misc/emulators/wine/util.nix b/pkgs/misc/emulators/wine/util.nix index b90a68e72df..cd5bd03130b 100644 --- a/pkgs/misc/emulators/wine/util.nix +++ b/pkgs/misc/emulators/wine/util.nix @@ -3,7 +3,7 @@ rec { toPackages = pkgNames: pkgs: map (pn: lib.getAttr pn pkgs) pkgNames; toBuildInputs = pkgArches: archPkgs: - lib.concatLists (map archPkgs pkgArches); + lib.concatLists (map archPkgs pkgArches); mkBuildInputs = pkgArches: pkgNames: toBuildInputs pkgArches (toPackages pkgNames); } diff --git a/pkgs/misc/emulators/wine/winetricks.nix b/pkgs/misc/emulators/wine/winetricks.nix index cfb35a9f996..cfde64fc33a 100644 --- a/pkgs/misc/emulators/wine/winetricks.nix +++ b/pkgs/misc/emulators/wine/winetricks.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, wine, perl, which, coreutils, zenity, curl +{ lib, stdenv, callPackage, wine, perl, which, coreutils, zenity, curl , cabextract, unzip, p7zip, gnused, gnugrep, bash } : stdenv.mkDerivation rec { @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { buildInputs = [ perl which ]; # coreutils is for sha1sum - pathAdd = stdenv.lib.concatMapStringsSep ":" (x: x + "/bin") - (stdenv.lib.filter (x: x != null) + pathAdd = lib.concatMapStringsSep ":" (x: x + "/bin") + (lib.filter (x: x != null) [ wine perl which coreutils zenity curl cabextract unzip p7zip gnused gnugrep bash ]); makeFlags = [ "PREFIX=$(out)" ]; @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { meta = { description = "A script to install DLLs needed to work around problems in Wine"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; homepage = "https://github.com/Winetricks/winetricks"; - platforms = with stdenv.lib.platforms; linux; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/misc/emulators/wxmupen64plus/default.nix b/pkgs/misc/emulators/wxmupen64plus/default.nix index 4e90a524aa7..8621d213b79 100644 --- a/pkgs/misc/emulators/wxmupen64plus/default.nix +++ b/pkgs/misc/emulators/wxmupen64plus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, wxGTK29, mupen64plus, SDL, libX11, libGLU, libGL +{ lib, stdenv, fetchurl, python, wxGTK29, mupen64plus, SDL, libX11, libGLU, libGL , wafHook }: stdenv.mkDerivation { @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { description = "GUI for the Mupen64Plus 2.0 emulator"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; homepage = "https://bitbucket.org/auria/wxmupen64plus/wiki/Home"; }; } diff --git a/pkgs/misc/emulators/xcpc/default.nix b/pkgs/misc/emulators/xcpc/default.nix index 75c30280e21..633d44bb5ae 100644 --- a/pkgs/misc/emulators/xcpc/default.nix +++ b/pkgs/misc/emulators/xcpc/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, pkgconfig, glib, libXaw, libX11, libXext +{ lib, stdenv, fetchurl, pkg-config, glib, libXaw, libX11, libXext , libDSKSupport ? true, libdsk , motifSupport ? false, lesstif }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { version = "20070122"; pname = "xcpc"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0hxsbhmyzyyrlidgg0q8izw55q0z40xrynw5a1c3frdnihj9jf7n"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib libdsk libXaw libX11 libXext ] ++ optional libDSKSupport libdsk diff --git a/pkgs/misc/emulators/yabause/default.nix b/pkgs/misc/emulators/yabause/default.nix index 80ddc32ac6c..17b7b563c15 100644 --- a/pkgs/misc/emulators/yabause/default.nix +++ b/pkgs/misc/emulators/yabause/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchurl, cmake, pkgconfig, qtbase, qt5, libGLU, libGL +{ mkDerivation, lib, fetchurl, cmake, pkg-config, qtbase, qt5, libGLU, libGL , freeglut ? null, openal ? null, SDL2 ? null }: mkDerivation rec { @@ -10,7 +10,7 @@ mkDerivation rec { sha256 = "1cn2rjjb7d9pkr4g5bqz55vd4pzyb7hg94cfmixjkzzkw0zw8d23"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ qtbase qt5.qtmultimedia libGLU libGL freeglut openal SDL2 ]; patches = [ diff --git a/pkgs/misc/emulators/yuzu/base.nix b/pkgs/misc/emulators/yuzu/base.nix new file mode 100644 index 00000000000..89c8f2cd947 --- /dev/null +++ b/pkgs/misc/emulators/yuzu/base.nix @@ -0,0 +1,72 @@ +{ pname, version, src, branchName +, stdenv, lib, fetchFromGitHub, wrapQtAppsHook +, cmake, pkg-config +, libpulseaudio, libjack2, alsaLib, sndio, ecasound +, vulkan-loader, vulkan-headers +, qtbase, qtwebengine, qttools +, nlohmann_json, rapidjson +, zlib, zstd, libzip, lz4 +, glslang +, boost173 +, catch2 +, fmt +, SDL2 +, udev +, libusb1 +, ffmpeg +}: + +stdenv.mkDerivation rec { + inherit pname version src; + + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; + buildInputs = [ + libpulseaudio libjack2 alsaLib sndio ecasound + vulkan-loader vulkan-headers + qtbase qtwebengine qttools + nlohmann_json rapidjson + zlib zstd libzip lz4 + glslang + boost173 + catch2 + fmt + SDL2 + udev + libusb1 + ffmpeg + ]; + + cmakeFlags = [ + "-DENABLE_QT_TRANSLATION=ON" + "-DYUZU_USE_QT_WEB_ENGINE=ON" + "-DUSE_DISCORD_PRESENCE=ON" + ]; + + # Trick the configure system. This prevents a check for submodule directories. + preConfigure = '' + rm -f .gitmodules + ''; + + # Fix vulkan detection + postFixup = '' + wrapProgram $out/bin/yuzu --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib + wrapProgram $out/bin/yuzu-cmd --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib + ''; + + meta = with lib; { + homepage = "https://yuzu-emu.org"; + description = "The ${branchName} branch of an experimental Nintendo Switch emulator written in C++"; + longDescription = '' + An experimental Nintendo Switch emulator written in C++. + Using the mainline branch is recommanded for general usage. + Using the early-access branch is recommanded if you would like to try out experimental features, with a cost of stability. + ''; + license = with licenses; [ + gpl2Plus + # Icons + cc-by-nd-30 cc0 + ]; + maintainers = with maintainers; [ ivar joshuafern ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/misc/emulators/yuzu/default.nix b/pkgs/misc/emulators/yuzu/default.nix index ae151f96ed3..89a500bb313 100644 --- a/pkgs/misc/emulators/yuzu/default.nix +++ b/pkgs/misc/emulators/yuzu/default.nix @@ -1,47 +1,28 @@ -{ lib, stdenv, fetchFromGitHub -, cmake, pkgconfig, wrapQtAppsHook -, boost173, catch2, fmt, lz4, nlohmann_json, rapidjson, zlib, zstd, SDL2 -, udev, libusb1, libzip, qtbase, qtwebengine, qttools, ffmpeg -, libpulseaudio, libjack2, alsaLib, sndio, ecasound -, useVulkan ? true, vulkan-loader, vulkan-headers -}: - -stdenv.mkDerivation rec { - pname = "yuzu"; - version = "482"; - - src = fetchFromGitHub { - owner = "yuzu-emu"; - repo = "yuzu-mainline"; # They use a separate repo for mainline “branch” - rev = "mainline-0-${version}"; - sha256 = "1bhkdbhj1dv33qv0np26gzsw65p4z88whjmd6bc7mh2b5lvrjwxm"; - fetchSubmodules = true; +{ branch ? "mainline", libsForQt5, fetchFromGitHub }: +let + inherit libsForQt5 fetchFromGitHub; +in { + mainline = libsForQt5.callPackage ./base.nix rec { + pname = "yuzu-mainline"; + version = "517"; + branchName = branch; + src = fetchFromGitHub { + owner = "yuzu-emu"; + repo = "yuzu-mainline"; + rev = "mainline-0-${version}"; + sha256 = "0i73yl2ycs8p9cqn25rw35cll0l6l68605f1mc1qvf4zy82jggbb"; + fetchSubmodules = true; + }; }; - - nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; - buildInputs = [ qtbase qtwebengine qttools boost173 catch2 fmt lz4 nlohmann_json rapidjson zlib zstd SDL2 udev libusb1 libpulseaudio alsaLib sndio ecasound libjack2 libzip ffmpeg ] - ++ stdenv.lib.optionals useVulkan [ vulkan-loader vulkan-headers ]; - cmakeFlags = [ "-DENABLE_QT_TRANSLATION=ON" "-DYUZU_USE_QT_WEB_ENGINE=ON" "-DUSE_DISCORD_PRESENCE=ON" ] - ++ stdenv.lib.optionals (!useVulkan) [ "-DENABLE_VULKAN=No" ]; - - # Trick the configure system. This prevents a check for submodule directories. - preConfigure = "rm .gitmodules"; - - # Fix vulkan detection - postFixup = stdenv.lib.optionals useVulkan '' - wrapProgram $out/bin/yuzu --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib - wrapProgram $out/bin/yuzu-cmd --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib - ''; - - meta = with lib; { - homepage = "https://yuzu-emu.org"; - description = "An experimental Nintendo Switch emulator written in C++"; - license = with licenses; [ - gpl2Plus - # Icons - cc-by-nd-30 cc0 - ]; - maintainers = with maintainers; [ ivar joshuafern ]; - platforms = platforms.linux; + early-access = libsForQt5.callPackage ./base.nix rec { + pname = "yuzu-ea"; + version = "1377"; + branchName = branch; + src = fetchFromGitHub { + owner = "pineappleEA"; + repo = "pineapple-src"; + rev = "EA-${version}"; + sha256 = "0jjddmcqbkns5iqjwqh51hpjviw5j12n49jwfq7xwrsns6vbpqkf"; + }; }; -} +}.${branch} diff --git a/pkgs/misc/emulators/zsnes/default.nix b/pkgs/misc/emulators/zsnes/default.nix index 142a49b8d18..4a6b1fbda27 100644 --- a/pkgs/misc/emulators/zsnes/default.nix +++ b/pkgs/misc/emulators/zsnes/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, nasm, SDL, zlib, libpng, ncurses, libGLU, libGL +{ lib, stdenv, fetchFromGitHub, nasm, SDL, zlib, libpng, ncurses, libGLU, libGL , makeDesktopItem }: let @@ -55,8 +55,8 @@ in stdenv.mkDerivation { meta = { description = "A Super Nintendo Entertainment System Emulator"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.sander ]; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.sander ]; homepage = "http://www.zsnes.com"; platforms = [ "i686-linux" "x86_64-linux" ]; }; diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 6f113bcd99c..760ec2bc053 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { cp -r Resource "$out/share/ghostscript/${version}" ln -s "${fonts}" "$out/share/ghostscript/fonts" - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' for file in $out/lib/*.dylib* ; do install_name_tool -id "$file" $file done @@ -132,9 +132,9 @@ stdenv.mkDerivation rec { of output drivers for various file formats and printers. ''; - license = stdenv.lib.licenses.agpl3; + license = lib.licenses.agpl3; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.viric ]; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.viric ]; }; } diff --git a/pkgs/misc/gnash/default.nix b/pkgs/misc/gnash/default.nix index 5a4eb1e7f33..9f5f022b853 100644 --- a/pkgs/misc/gnash/default.nix +++ b/pkgs/misc/gnash/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchgit, fetchpatch, autoreconfHook -, pkgconfig, libtool, boost, SDL +{ lib, stdenv, fetchgit, fetchpatch, autoreconfHook +, pkg-config, libtool, boost, SDL , glib, pango, gettext, curl, xorg , libpng, libjpeg, giflib, speex, atk @@ -24,7 +24,7 @@ , enablePlugins ? false, xulrunner ? null, npapi_sdk ? null }: -with stdenv.lib; +with lib; let available = x: x != null; @@ -80,7 +80,7 @@ stdenv.mkDerivation { sed -i 's|jemalloc.h|jemalloc/jemalloc.h|' libbase/jemalloc_gnash.c ''; - nativeBuildInputs = [ autoreconfHook pkgconfig libtool ]; + nativeBuildInputs = [ autoreconfHook pkg-config libtool ]; buildInputs = [ glib gettext boost curl SDL speex xorg.libXmu xorg.libSM xorg.libXt @@ -109,7 +109,7 @@ stdenv.mkDerivation { }) ]; - configureFlags = with stdenv.lib; [ + configureFlags = with lib; [ "--with-boost-incl=${boost.dev}/include" "--with-boost-lib=${boost.out}/lib" "--enable-renderer=${concatStringsSep "," renderers}" diff --git a/pkgs/misc/hdt/default.nix b/pkgs/misc/hdt/default.nix index a01668e138f..9e1efd5f836 100644 --- a/pkgs/misc/hdt/default.nix +++ b/pkgs/misc/hdt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, libtool, pkgconfig, zlib, serd }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, libtool, pkg-config, zlib, serd }: stdenv.mkDerivation rec { pname = "hdt"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib serd ]; - nativeBuildInputs = [ autoreconfHook libtool pkgconfig ]; + nativeBuildInputs = [ autoreconfHook libtool pkg-config ]; enableParallelBuilding = true; diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 556bb6a7408..24d2b5e135c 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, python3Packages, makeWrapper +{ lib, stdenv, fetchFromGitHub, pkg-config, python3Packages, makeWrapper , bash, libsamplerate, libsndfile, readline, eigen, celt , wafHook # Darwin Dependencies @@ -12,10 +12,10 @@ , prefix ? "" }: -with stdenv.lib; +with lib; let inherit (python3Packages) python dbus-python; - shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null; + shouldUsePkg = pkg: if pkg != null && lib.any (lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null; libOnly = prefix == "lib"; @@ -27,16 +27,16 @@ let in stdenv.mkDerivation rec { name = "${prefix}jack2-${version}"; - version = "1.9.16"; + version = "1.9.17"; src = fetchFromGitHub { owner = "jackaudio"; repo = "jack2"; rev = "v${version}"; - sha256 = "0pzgrjy5fi2nif2j442fs3j2bbshxpnmq9kzwcqz54wx1w8fzdfr"; + sha256 = "sha256-T6UJpLsXrsIL3HaChfVP52w0v9DCs/sJqty2/kAWNfE="; }; - nativeBuildInputs = [ pkgconfig python makeWrapper wafHook ]; + nativeBuildInputs = [ pkg-config python makeWrapper wafHook ]; buildInputs = [ libsamplerate libsndfile readline eigen celt optDbus optPythonDBus optLibffado optAlsaLib optLibopus ] ++ optionals stdenv.isDarwin [ diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix index 2a5bf806d0f..ea7356b32e9 100644 --- a/pkgs/misc/jackaudio/jack1.nix +++ b/pkgs/misc/jackaudio/jack1.nix @@ -1,11 +1,11 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config # Optional Dependencies , alsaLib ? null, db ? null, libuuid ? null, libffado ? null, celt ? null }: let - shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null; + shouldUsePkg = pkg: if pkg != null && lib.any (lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null; optAlsaLib = shouldUsePkg alsaLib; optDb = shouldUsePkg db; @@ -23,10 +23,10 @@ stdenv.mkDerivation rec { }; configureFlags = [ - (stdenv.lib.enableFeature (optLibffado != null) "firewire") + (lib.enableFeature (optLibffado != null) "firewire") ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ optAlsaLib optDb optLibffado optCelt ]; propagatedBuildInputs = [ optLibuuid ]; diff --git a/pkgs/misc/libcardiacarrest/default.nix b/pkgs/misc/libcardiacarrest/default.nix index 0c3370814bc..4139c5b0f13 100644 --- a/pkgs/misc/libcardiacarrest/default.nix +++ b/pkgs/misc/libcardiacarrest/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, pkgconfig, glib, libpulseaudio }: +{ lib, stdenv, fetchFromGitHub, pkg-config, glib, libpulseaudio }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "libcardiacarrest"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib ]; diff --git a/pkgs/misc/lightspark/default.nix b/pkgs/misc/lightspark/default.nix index bd33997d09a..fae02cdbcd9 100644 --- a/pkgs/misc/lightspark/default.nix +++ b/pkgs/misc/lightspark/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, cmake, curl, zlib, ffmpeg_3, glew, pcre +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, curl, zlib, ffmpeg_3, glew, pcre , rtmpdump, cairo, boost, SDL2, SDL2_mixer, libjpeg, pango, lzma, nasm , llvm, glibmm }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sed -i 's/SET(ETCDIR "\/etc")/SET(ETCDIR "etc")/g' CMakeLists.txt ''; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ curl zlib ffmpeg_3 glew pcre rtmpdump cairo boost SDL2 SDL2_mixer libjpeg diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix index 44dbf086ca5..f005a59dbfa 100644 --- a/pkgs/misc/lilypond/default.nix +++ b/pkgs/misc/lilypond/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, ghostscript, gyre-fonts, texinfo, imagemagick, texi2html, guile -, python2, gettext, flex, perl, bison, pkgconfig, autoreconfHook, dblatex +, python2, gettext, flex, perl, bison, pkg-config, autoreconfHook, dblatex , fontconfig, freetype, pango, fontforge, help2man, zip, netpbm, groff , makeWrapper, t1utils , texlive, tex ? texlive.combine { @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { export HOME=$TMPDIR/home ''; - nativeBuildInputs = [ autoreconfHook bison flex makeWrapper pkgconfig ]; + nativeBuildInputs = [ autoreconfHook bison flex makeWrapper pkg-config ]; buildInputs = [ ghostscript texinfo imagemagick texi2html guile dblatex tex zip netpbm diff --git a/pkgs/misc/lilypond/with-fonts.nix b/pkgs/misc/lilypond/with-fonts.nix index 1036f474b14..2f3a95a3302 100644 --- a/pkgs/misc/lilypond/with-fonts.nix +++ b/pkgs/misc/lilypond/with-fonts.nix @@ -1,8 +1,8 @@ -{ stdenv, lndir, symlinkJoin, makeWrapper +{ lib, lndir, symlinkJoin, makeWrapper , lilypond, openlilylib-fonts }: -stdenv.lib.appendToName "with-fonts" (symlinkJoin { +lib.appendToName "with-fonts" (symlinkJoin { inherit (lilypond) meta name version ; paths = [ lilypond ] ++ openlilylib-fonts.all; diff --git a/pkgs/misc/logging/beats/6.x.nix b/pkgs/misc/logging/beats/6.x.nix index 7196202dba4..ce80b174d32 100644 --- a/pkgs/misc/logging/beats/6.x.nix +++ b/pkgs/misc/logging/beats/6.x.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, elk6Version, buildGoPackage, libpcap, systemd }: +{ lib, fetchFromGitHub, elk6Version, buildGoPackage, libpcap, systemd }: let beat = package : extraArgs : buildGoPackage (rec { name = "${package}-${version}"; @@ -46,7 +46,7 @@ in { journal entries from Linuxes with systemd. ''; buildInputs = [ systemd.dev ]; - postFixup = let libPath = stdenv.lib.makeLibraryPath [ (lib.getLib systemd) ]; in '' + postFixup = let libPath = lib.makeLibraryPath [ (lib.getLib systemd) ]; in '' patchelf --set-rpath ${libPath} "$out/bin/journalbeat" ''; }; diff --git a/pkgs/misc/logging/beats/7.x.nix b/pkgs/misc/logging/beats/7.x.nix index 9e524e6a5e6..43ea85508c6 100644 --- a/pkgs/misc/logging/beats/7.x.nix +++ b/pkgs/misc/logging/beats/7.x.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, elk7Version, buildGoPackage, libpcap, systemd }: +{ lib, fetchFromGitHub, elk7Version, buildGoPackage, libpcap, systemd }: let beat = package : extraArgs : buildGoPackage (rec { name = "${package}-${version}"; @@ -45,7 +45,7 @@ in { journal entries from Linuxes with systemd. ''; buildInputs = [ systemd.dev ]; - postFixup = let libPath = stdenv.lib.makeLibraryPath [ (lib.getLib systemd) ]; in '' + postFixup = let libPath = lib.makeLibraryPath [ (lib.getLib systemd) ]; in '' patchelf --set-rpath ${libPath} "$out/bin/journalbeat" ''; }; diff --git a/pkgs/misc/long-shebang/default.nix b/pkgs/misc/long-shebang/default.nix index 753e1f490bb..6ad7c8496ed 100644 --- a/pkgs/misc/long-shebang/default.nix +++ b/pkgs/misc/long-shebang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: let +{ lib, stdenv, fetchurl }: let version = "1.2.0"; in stdenv.mkDerivation { pname = "long-shebang"; @@ -14,8 +14,8 @@ in stdenv.mkDerivation { homepage = "https://github.com/shlevy/long-shebang"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/misc/riscv-pk/default.nix b/pkgs/misc/riscv-pk/default.nix index 6ef50a33a5b..4dd2626b568 100644 --- a/pkgs/misc/riscv-pk/default.nix +++ b/pkgs/misc/riscv-pk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, payload ? null }: let +{ lib, stdenv, fetchFromGitHub, autoreconfHook, payload ? null }: let rev = "e5846a2bc707eaa58dc8ab6a8d20a090c6ee8570"; sha256 = "1clynpp70fnbgsjgxx7xi0vrdrj1v0h8zpv0x26i324kp2gwylf4"; revCount = "438"; @@ -21,7 +21,7 @@ in stdenv.mkDerivation { configureScript = "../configure"; - configureFlags = stdenv.lib.optional (payload != null) + configureFlags = lib.optional (payload != null) "--with-payload=${payload}"; hardeningDisable = [ "all" ]; @@ -35,8 +35,8 @@ in stdenv.mkDerivation { meta = { description = "RISC-V Proxy Kernel and Bootloader"; homepage = "https://github.com/riscv/riscv-pk"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.riscv; - maintainers = [ stdenv.lib.maintainers.shlevy ]; + license = lib.licenses.bsd3; + platforms = lib.platforms.riscv; + maintainers = [ lib.maintainers.shlevy ]; }; } diff --git a/pkgs/misc/rkdeveloptool/default.nix b/pkgs/misc/rkdeveloptool/default.nix index f149072a7bb..9ef7013fbfd 100644 --- a/pkgs/misc/rkdeveloptool/default.nix +++ b/pkgs/misc/rkdeveloptool/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libusb1 }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libusb1 }: stdenv.mkDerivation { pname = "rkdeveloptool"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0zwrkqfxd671iy69v3q0844gfdpm1yk51i9qh2rqc969bd8glxga"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libusb1 ]; diff --git a/pkgs/misc/sailsd/default.nix b/pkgs/misc/sailsd/default.nix index 2c67853ae31..d2f91c42638 100644 --- a/pkgs/misc/sailsd/default.nix +++ b/pkgs/misc/sailsd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, jansson }: +{ lib, stdenv, fetchFromGitHub, pkg-config, jansson }: let libsailing = fetchFromGitHub { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "1s4nlffp683binbdxwwzbsci61kbjylbcr1jf44sv1h1r5d5js05"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ jansson libsailing ]; INSTALL_PATH = "$(out)"; diff --git a/pkgs/misc/scrcpy/default.nix b/pkgs/misc/scrcpy/default.nix index 0e0769f35de..50383fd005d 100644 --- a/pkgs/misc/scrcpy/default.nix +++ b/pkgs/misc/scrcpy/default.nix @@ -10,10 +10,10 @@ }: let - version = "1.15.1"; + version = "1.17"; prebuilt_server = fetchurl { url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}"; - sha256 = "1hrp2rfwl06ff2b2i12ccka58l1brvn6xqgm1f38k36s61mbs1py"; + sha256 = "sha256-EbWtLRvJuXMPtyVKeO/XGo/0axk4/0aOR6IbZTobZyU="; }; in stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "Genymobile"; repo = pname; rev = "v${version}"; - sha256 = "0ijar1cycj42p39cgpnwdwr6nz5pyr6vacr1gvc0f6k92pl8vr13"; + sha256 = "sha256-xCzrbWhMve0bJerFNHiUdSzp5O1pSaKRkcJSs/0nHpk="; }; # postPatch: diff --git a/pkgs/misc/screensavers/alock/default.nix b/pkgs/misc/screensavers/alock/default.nix index 34574545750..d10082a71e3 100644 --- a/pkgs/misc/screensavers/alock/default.nix +++ b/pkgs/misc/screensavers/alock/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, pkgconfig, autoreconfHook +{ lib, stdenv, fetchgit, pkg-config, autoreconfHook , libX11, pam, libgcrypt, libXrender, imlib2 }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { "--enable-imlib2" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoreconfHook libX11 pam libgcrypt libXrender imlib2 diff --git a/pkgs/misc/screensavers/betterlockscreen/default.nix b/pkgs/misc/screensavers/betterlockscreen/default.nix index a62aeda9f50..8d40df14616 100644 --- a/pkgs/misc/screensavers/betterlockscreen/default.nix +++ b/pkgs/misc/screensavers/betterlockscreen/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { installPhase = let PATH = - stdenv.lib.makeBinPath + lib.makeBinPath [imagemagick i3lock-color xdpyinfo xrandr bc feh procps xrdb]; in '' mkdir -p $out/bin diff --git a/pkgs/misc/screensavers/electricsheep/default.nix b/pkgs/misc/screensavers/electricsheep/default.nix index b9aa0872839..ea68e147ba7 100644 --- a/pkgs/misc/screensavers/electricsheep/default.nix +++ b/pkgs/misc/screensavers/electricsheep/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, wxGTK30, libav, lua5_1, curl -, libpng, xorg, pkgconfig, flam3, libgtop, boost, tinyxml, freeglut, libGLU, libGL +, libpng, xorg, pkg-config, flam3, libgtop, boost, tinyxml, freeglut, libGLU, libGL , glee }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1z49l53j1lhk7ahdy96lm9r0pklwpf2i5s6y2l2rn6l4z8dxkjmk"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ wxGTK30 libav lua5_1 curl libpng xorg.libXrender diff --git a/pkgs/misc/screensavers/light-locker/default.nix b/pkgs/misc/screensavers/light-locker/default.nix index 0853a25a3eb..ef1143f4143 100644 --- a/pkgs/misc/screensavers/light-locker/default.nix +++ b/pkgs/misc/screensavers/light-locker/default.nix @@ -3,7 +3,7 @@ , nix-update-script , meson , ninja -, pkgconfig +, pkg-config , gtk3 , glib , intltool @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { intltool meson ninja - pkgconfig + pkg-config wrapGAppsHook ]; diff --git a/pkgs/misc/screensavers/multilockscreen/default.nix b/pkgs/misc/screensavers/multilockscreen/default.nix index 4d4e7609d93..56f5c82fe30 100644 --- a/pkgs/misc/screensavers/multilockscreen/default.nix +++ b/pkgs/misc/screensavers/multilockscreen/default.nix @@ -7,7 +7,7 @@ let i3lock = writeShellScriptBin "i3lock" '' ${i3lock-color}/bin/i3lock-color "$@" ''; - binPath = stdenv.lib.makeBinPath [ + binPath = lib.makeBinPath [ imagemagick i3lock xdpyinfo xrandr xset bc feh procps xrdb diff --git a/pkgs/misc/screensavers/pipes/default.nix b/pkgs/misc/screensavers/pipes/default.nix index a4e40fd77ef..11d85e59776 100644 --- a/pkgs/misc/screensavers/pipes/default.nix +++ b/pkgs/misc/screensavers/pipes/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { make PREFIX=$out/ install wrapProgram $out/bin/pipes.sh \ - --set PATH "${stdenv.lib.makeBinPath [ coreutils ncurses ]}" + --set PATH "${lib.makeBinPath [ coreutils ncurses ]}" ''; meta = with lib; { diff --git a/pkgs/misc/screensavers/rss-glx/default.nix b/pkgs/misc/screensavers/rss-glx/default.nix index 467f762de86..f3e5ae251ae 100644 --- a/pkgs/misc/screensavers/rss-glx/default.nix +++ b/pkgs/misc/screensavers/rss-glx/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, xlibsWrapper, libXext, libGLU, libGL, imagemagick, libtiff, bzip2}: +{lib, stdenv, fetchurl, pkg-config, xlibsWrapper, libXext, libGLU, libGL, imagemagick, libtiff, bzip2}: stdenv.mkDerivation rec { version = "0.9.1"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1aikafjqrfmv23jnrrm5d56dg6injh4l67zjdxzdapv9chw7g3cg"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libGLU libGL xlibsWrapper imagemagick libtiff bzip2 ]; NIX_CFLAGS_COMPILE = "-I${imagemagick.dev}/include/ImageMagick"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { This package currently contains all of the screensavers from the original collection, plus a few others. ''; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/misc/screensavers/slock/default.nix b/pkgs/misc/screensavers/slock/default.nix index 7df635c10c7..800a81d2ffc 100644 --- a/pkgs/misc/screensavers/slock/default.nix +++ b/pkgs/misc/screensavers/slock/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, writeText +{ lib, stdenv, fetchurl, writeText , xorgproto, libX11, libXext, libXrandr # default header can be obtained from # https://git.suckless.org/slock/tree/config.def.h , conf ? null }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { name = "slock-1.4"; diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix index 71108c9c689..5f41090d05f 100644 --- a/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/pkgs/misc/screensavers/xscreensaver/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, bc, perl, perlPackages, pam, libXext, libXScrnSaver, libX11 +{ lib, stdenv, fetchurl, pkg-config, bc, perl, perlPackages, pam, libXext, libXScrnSaver, libX11 , libXrandr, libXmu, libXxf86vm, libXrender, libXxf86misc, libjpeg, libGLU, libGL, gtk2 , libxml2, libglade, intltool, xorg, makeWrapper, gle, gdk-pixbuf, gdk-pixbuf-xlib , forceInstallAllHacks ? false @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ pkgconfig bc perl libjpeg libGLU libGL gtk2 libxml2 libglade pam + [ pkg-config bc perl libjpeg libGLU libGL gtk2 libxml2 libglade pam libXext libXScrnSaver libX11 libXrandr libXmu libXxf86vm libXrender libXxf86misc intltool xorg.appres makeWrapper gle gdk-pixbuf gdk-pixbuf-xlib @@ -37,14 +37,14 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/xscreensaver-text \ - --prefix PATH : ${stdenv.lib.makeBinPath [xorg.appres]} + --prefix PATH : ${lib.makeBinPath [xorg.appres]} wrapProgram $out/bin/xscreensaver-getimage-file \ --set PERL5LIB "$out/${perlPackages.perl.libPrefix}:${with perlPackages; makePerlPath [ EncodeLocale HTTPDate HTTPMessage IOSocketSSL LWP LWPProtocolHttps MozillaCA NetHTTP NetSSLeay TryTiny URI ]}" '' - + stdenv.lib.optionalString forceInstallAllHacks '' + + lib.optionalString forceInstallAllHacks '' make -C hacks/glx dnalogo cat hacks/Makefile.in | grep -E '([a-z0-9]+):[[:space:]]*\1[.]o' | cut -d : -f 1 | xargs make -C hacks cat hacks/glx/Makefile.in | grep -E '([a-z0-9]+):[[:space:]]*\1[.]o' | cut -d : -f 1 | xargs make -C hacks/glx @@ -55,8 +55,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.jwz.org/xscreensaver/"; description = "A set of screensavers"; - maintainers = with stdenv.lib.maintainers; [ raskin ]; - platforms = stdenv.lib.platforms.unix; # Once had cygwin problems + maintainers = with lib.maintainers; [ raskin ]; + platforms = lib.platforms.unix; # Once had cygwin problems inherit version; downloadPage = "https://www.jwz.org/xscreensaver/download.html"; updateWalker = true; diff --git a/pkgs/misc/screensavers/xssproxy/default.nix b/pkgs/misc/screensavers/xssproxy/default.nix index cff03f3bed0..5e1c4208413 100644 --- a/pkgs/misc/screensavers/xssproxy/default.nix +++ b/pkgs/misc/screensavers/xssproxy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, glib, pkgconfig, xorg, dbus }: +{ lib, stdenv, fetchFromGitHub, glib, pkg-config, xorg, dbus }: let rev = "1.0.0"; in @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "0c83wmipnsdnbihc5niyczs7jrkss2s8n6iwwjdia7hkjzbd0hl7"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib xorg.libX11 xorg.libXScrnSaver dbus ]; makeFlags = [ @@ -23,8 +23,8 @@ stdenv.mkDerivation { meta = { description = "Forward freedesktop.org Idle Inhibition Service calls to Xss"; homepage = "https://github.com/timakro/xssproxy"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ benley ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ benley ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/misc/screensavers/xtrlock-pam/default.nix b/pkgs/misc/screensavers/xtrlock-pam/default.nix index ca4623e3068..c563cca05ef 100644 --- a/pkgs/misc/screensavers/xtrlock-pam/default.nix +++ b/pkgs/misc/screensavers/xtrlock-pam/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, python, pkgconfig, xlibsWrapper, pam }: +{ lib, stdenv, fetchgit, python, pkg-config, xlibsWrapper, pam }: stdenv.mkDerivation { name = "xtrlock-pam-3.4-post-20150909"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1z2wlhi5d05b18pvwz146kp0lkcc6z2mnilk01mk19hzbziyqmsc"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ python xlibsWrapper pam ]; configurePhase = '' @@ -22,7 +22,7 @@ stdenv.mkDerivation { homepage = "https://github.com/aanatoly/xtrlock-pam"; description = "PAM based X11 screen locker"; license = "unknown"; - maintainers = with stdenv.lib.maintainers; [ tstrobel ]; - platforms = with stdenv.lib.platforms; linux; + maintainers = with lib.maintainers; [ tstrobel ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/misc/sndio/default.nix b/pkgs/misc/sndio/default.nix index 179148ac3fc..c86198a6985 100644 --- a/pkgs/misc/sndio/default.nix +++ b/pkgs/misc/sndio/default.nix @@ -4,8 +4,8 @@ stdenv.mkDerivation rec { pname = "sndio"; version = "1.7.0"; enableParallelBuilding = true; - nativeBuildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = stdenv.lib.optional stdenv.hostPlatform.isLinux alsaLib; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + buildInputs = lib.optional stdenv.hostPlatform.isLinux alsaLib; src = fetchurl { url = "http://www.sndio.org/sndio-${version}.tar.gz"; diff --git a/pkgs/misc/solfege/default.nix b/pkgs/misc/solfege/default.nix index 71d9d682be4..af2ce3f53cf 100644 --- a/pkgs/misc/solfege/default.nix +++ b/pkgs/misc/solfege/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, gettext, pkgconfig, texinfo, wrapGAppsHook +{ lib, fetchurl, gettext, pkg-config, texinfo, wrapGAppsHook , buildPythonApplication, pycairo, pygobject3 , gobject-introspection, gtk3, librsvg , alsaUtils, timidity, mpg123, vorbis-tools, csound, lilypond @@ -19,7 +19,7 @@ buildPythonApplication rec { ./webbrowser.patch ]; - nativeBuildInputs = [ gettext pkgconfig texinfo wrapGAppsHook ]; + nativeBuildInputs = [ gettext pkg-config texinfo wrapGAppsHook ]; buildInputs = [ gobject-introspection gtk3 librsvg ]; propagatedBuildInputs = [ pycairo pygobject3 ]; diff --git a/pkgs/misc/source-and-tags/default.nix b/pkgs/misc/source-and-tags/default.nix index 7c082cbbbb0..c82b96b82f9 100644 --- a/pkgs/misc/source-and-tags/default.nix +++ b/pkgs/misc/source-and-tags/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, glibcLocales, unzip, hasktags, ctags } : { # optional srcDir - annotatedWithSourceAndTagInfo = x : (x ? passthru && x.passthru ? sourceWithTags + annotatedWithSourceAndTagInfo = x : (x ? passthru && x.passthru ? sourceWithTags || x ? meta && x.meta ? sourceWithTags ); # hack because passthru doesn't work the way I'd expect. Don't have time to spend on this right now # that's why I'm abusing meta for the same purpose in ghcsAndLibs @@ -10,7 +10,7 @@ # createTagFiles = [ { name = "my_tag_name_without_suffix", tagCmd = "ctags -R . -o \$TAG_FILE"; } ] # tag command must create file named $TAG_FILE - sourceWithTagsDerivation = {name, src, srcDir ? ".", tagSuffix ? "_tags", createTagFiles ? []} : + sourceWithTagsDerivation = {name, src, srcDir ? ".", tagSuffix ? "_tags", createTagFiles ? []} : stdenv.mkDerivation { phases = "unpackPhase buildPhase"; inherit src srcDir tagSuffix; @@ -72,7 +72,7 @@ addCTaggingInfo = deriv : - deriv // { + deriv // { passthru = { sourceWithTags = { inherit (deriv) src; diff --git a/pkgs/misc/stabber/default.nix b/pkgs/misc/stabber/default.nix index 2c63bf40d36..eb0d6a4109d 100644 --- a/pkgs/misc/stabber/default.nix +++ b/pkgs/misc/stabber/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, expat +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib, expat , libmicrohttpd }: -with stdenv.lib; +with lib; stdenv.mkDerivation { pname = "stabber-unstable"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { mkdir m4 ''; - buildInputs = [ autoreconfHook pkgconfig glib expat libmicrohttpd ]; + buildInputs = [ autoreconfHook pkg-config glib expat libmicrohttpd ]; meta = { description = "Stubbed XMPP Server"; diff --git a/pkgs/misc/talkfilters/default.nix b/pkgs/misc/talkfilters/default.nix index a622eca7795..0f265f7e259 100644 --- a/pkgs/misc/talkfilters/default.nix +++ b/pkgs/misc/talkfilters/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: let pname = "talkfilters"; @@ -18,9 +18,9 @@ stdenv.mkDerivation { meta = { description = "Converts English text into text that mimics a stereotyped or humorous dialect"; homepage = "http://www.hyperrealm.com/talkfilters/talkfilters.html"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ ikervagyok ]; - platforms = with stdenv.lib.platforms; unix; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ ikervagyok ]; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index 93e58516610..0d3a954b9b4 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -88,9 +88,9 @@ in rec { computer or server restarts, if the machine is on, tmux will be there how you left it off the last time it was used. ''; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ ronanmacf ]; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ ronanmacf ]; }; }; @@ -379,9 +379,9 @@ in rec { * restoring vim and neovim sessions * restoring pane contents ''; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ ronanmacf ]; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ ronanmacf ]; }; }; @@ -464,11 +464,12 @@ in rec { tmux-fzf = mkDerivation { pluginName = "tmux-fzf"; - version = "unstable-2020-11-23"; + rtpFilePath = "main.tmux"; + version = "unstable-2020-12-07"; src = fetchFromGitHub { owner = "sainnhe"; repo = "tmux-fzf"; - rev = "312685b2a7747b61f1f4a96bd807819f1450479d"; + rev = "5efeb91086040a3becf5372fb38258acd0579954"; sha256 = "1z0zmsf8asxs9wbwvkiyd81h93wb2ikl8nxxc26sdpi6l333q5s9"; }; postInstall = '' @@ -491,9 +492,9 @@ in rec { * User menu. * Popup window support. ''; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ kyleondy ]; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ kyleondy ]; }; }; diff --git a/pkgs/misc/tpm2-pkcs11/default.nix b/pkgs/misc/tpm2-pkcs11/default.nix index 610a8e06385..232b86b1e7a 100644 --- a/pkgs/misc/tpm2-pkcs11/default.nix +++ b/pkgs/misc/tpm2-pkcs11/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, substituteAll -, pkgconfig, autoreconfHook, autoconf-archive, makeWrapper, patchelf +, pkg-config, autoreconfHook, autoconf-archive, makeWrapper, patchelf , tpm2-tss, tpm2-tools, opensc, openssl, sqlite, python37, glibc, libyaml , abrmdSupport ? true, tpm2-abrmd ? null }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - pkgconfig autoreconfHook autoconf-archive makeWrapper patchelf + pkg-config autoreconfHook autoconf-archive makeWrapper patchelf ]; buildInputs = [ tpm2-tss tpm2-tools opensc openssl sqlite libyaml diff --git a/pkgs/misc/urbit/default.nix b/pkgs/misc/urbit/default.nix index 97f5edd94b3..9ea1fc64c3f 100644 --- a/pkgs/misc/urbit/default.nix +++ b/pkgs/misc/urbit/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, curl, git, gmp, libsigsegv, meson, ncurses, ninja -, openssl, pkgconfig, re2c, zlib +, openssl, pkg-config, re2c, zlib }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ pkgconfig ninja meson ]; + nativeBuildInputs = [ pkg-config ninja meson ]; buildInputs = [ curl git gmp libsigsegv ncurses openssl re2c zlib ]; postPatch = '' diff --git a/pkgs/misc/vim-plugins/build-vim-plugin.nix b/pkgs/misc/vim-plugins/build-vim-plugin.nix index 4ca99b09af5..6960b790539 100644 --- a/pkgs/misc/vim-plugins/build-vim-plugin.nix +++ b/pkgs/misc/vim-plugins/build-vim-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , rtpPath ? "share/vim-plugins" , vim }: @@ -18,7 +18,7 @@ rec { buildPhase ? "", preInstall ? "", postInstall ? "", - path ? stdenv.lib.getName name, + path ? lib.getName name, addonInfo ? null, ... }: diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index fc75216384c..6f0f6ffc24a 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -65,12 +65,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2021-01-08"; + version = "2021-02-02"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "54dd731cf14c809ebcc9c21b41084a17c5411744"; - sha256 = "1j3jndx2cl7dxw7ilai7dxi1vkgjzh24k2vl43adai87gl6jqqs5"; + rev = "9b5c09047361f3ec2cf18afbb6d1e03047a59778"; + sha256 = "0bdqr1k3cllgqclshxsmcd16ba63bw0ig3sqj46an3mgpvd6v4xd"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -89,12 +89,12 @@ let aniseed = buildVimPluginFrom2Nix { pname = "aniseed"; - version = "2020-12-21"; + version = "2021-01-28"; src = fetchFromGitHub { owner = "Olical"; repo = "aniseed"; - rev = "50adbc5ed5bb97b73b0b0c3241d9e62621ca59f9"; - sha256 = "1wy5jd86273q7sxa50kv88flqdgmg9z2m4b6phpw3xnl5d1sj9f7"; + rev = "16d201f8a789a5591ae980ac707a31241062ed52"; + sha256 = "18fbqqjb0cn89wkm4dfhwh3xzpf6gdnav78lrs59kzfggppkpn8l"; }; meta.homepage = "https://github.com/Olical/aniseed/"; }; @@ -161,12 +161,12 @@ let asyncomplete-vim = buildVimPluginFrom2Nix { pname = "asyncomplete-vim"; - version = "2020-12-23"; + version = "2021-01-28"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "asyncomplete.vim"; - rev = "e546095e4ac7a20d06bcf16d207275dd4d6b4115"; - sha256 = "0jq5qrlijlqpfgi89249whvpmm140smflpprlq8as0pfyhpjn1d1"; + rev = "4be3c16b33c27fce5372bf8bc74e42126c76fe61"; + sha256 = "1y5xlisby7a41naas7r09ins3k9arn5xc5bb6w8k7am6xz3vc3r6"; }; meta.homepage = "https://github.com/prabirshrestha/asyncomplete.vim/"; }; @@ -221,12 +221,12 @@ let awesome-vim-colorschemes = buildVimPluginFrom2Nix { pname = "awesome-vim-colorschemes"; - version = "2021-01-05"; + version = "2021-01-29"; src = fetchFromGitHub { owner = "rafi"; repo = "awesome-vim-colorschemes"; - rev = "ae48abdd39e24e187dac904c14caf6458b76838c"; - sha256 = "12a31l2ggzihl1m1bjgmpmvw8zlqgvql01ryz1zrrhwmgzk8jk1h"; + rev = "8f437c8960abbd4b29c05a19eaad8c3e792ace05"; + sha256 = "039xln6bwxa6mbwvzdfk32b3v8p4glghb3104nydscy9zbsmpick"; }; meta.homepage = "https://github.com/rafi/awesome-vim-colorschemes/"; }; @@ -245,12 +245,12 @@ let barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar-nvim"; - version = "2021-01-05"; + version = "2021-01-16"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "e0b4935d5956025ab595195d935a5bac00f1a973"; - sha256 = "0h723j5zhj8mzwghykd84rxdr0l4ngvyy692d6sl2zz940mvwlkw"; + rev = "80860e972cdf78e0e0b8dc7f16e07142966f73cf"; + sha256 = "009gnamainla5z2q98p6mi4gifmlbx5im7d2gx2d0da62cbdrcsl"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -305,12 +305,12 @@ let brainfuck-vim = buildVimPluginFrom2Nix { pname = "brainfuck-vim"; - version = "2021-01-08"; + version = "2021-01-28"; src = fetchFromGitHub { owner = "fruit-in"; repo = "brainfuck-vim"; - rev = "4e5344436f480d65d99c89d623e5564d71cdd0f7"; - sha256 = "1p5kyy6z2nrnxdvwnpcvbd1xk9r0pqr3hayz3p7c2zi30rj0fdx5"; + rev = "721bbe54df26906f79ed481069435596741f67f3"; + sha256 = "130njfiwbgd6gpy52xm5ayadh9q11ahsin1a60y54a99qd8jz6wi"; }; meta.homepage = "https://github.com/fruit-in/brainfuck-vim/"; }; @@ -341,12 +341,12 @@ let calendar-vim = buildVimPluginFrom2Nix { pname = "calendar-vim"; - version = "2020-12-30"; + version = "2021-01-30"; src = fetchFromGitHub { owner = "itchyny"; repo = "calendar.vim"; - rev = "1d352606aa4f9cf3116514669533b314f6e800a0"; - sha256 = "16m7zpw5i2bjxj771856wahfk4y6rhk3qb0jifblma219gnqmhz4"; + rev = "4e454c2ca9a489f2631df24845615744bd594b61"; + sha256 = "12vmysyvavvf1173i0m7jfzh2jsfqx5p7mdm3iafg4iv0209rz66"; }; meta.homepage = "https://github.com/itchyny/calendar.vim/"; }; @@ -365,16 +365,28 @@ let caw-vim = buildVimPluginFrom2Nix { pname = "caw-vim"; - version = "2020-12-01"; + version = "2021-01-25"; src = fetchFromGitHub { owner = "tyru"; repo = "caw.vim"; - rev = "27be5a97a3971f185a23cfbea91d1651cbb4f388"; - sha256 = "0aahsx4i1c5025didi9ajqdwbx534lpafcsdd2169zhqxgzqlhds"; + rev = "26b91ddfcebaee954a3cd2aec1769a5b16779bdd"; + sha256 = "0yiic0a1l9ggwh3f5y150j74hxj7v783j4y3wnn5j1n7ljvqvhqc"; }; meta.homepage = "https://github.com/tyru/caw.vim/"; }; + chadtree = buildVimPluginFrom2Nix { + pname = "chadtree"; + version = "2021-02-02"; + src = fetchFromGitHub { + owner = "ms-jpq"; + repo = "chadtree"; + rev = "addb3b3f9963b86b1d3626e4b1920b129148625b"; + sha256 = "1fpws70lxa9vs4yv6wpgnvw0khxhavq23plnsil29j4xlfm3ivw9"; + }; + meta.homepage = "https://github.com/ms-jpq/chadtree/"; + }; + changeColorScheme-vim = buildVimPluginFrom2Nix { pname = "changeColorScheme-vim"; version = "2010-10-18"; @@ -401,12 +413,12 @@ let ci_dark = buildVimPluginFrom2Nix { pname = "ci_dark"; - version = "2020-12-25"; + version = "2021-01-31"; src = fetchFromGitHub { owner = "chuling"; repo = "ci_dark"; - rev = "9e683226bb2b73f234cd8feb7367514553d23d32"; - sha256 = "1jdpnljgf7bnqsfiqy7qfjhwcx4727gc9h0mrcn0xcfl19ppa6xs"; + rev = "c7537d81a796b4559e03309aeec9cb8d6d7bda21"; + sha256 = "05p8viz5q7rknzyh7zp3k2qhl14nlamik5gvqy86bfgwmhbac350"; }; meta.homepage = "https://github.com/chuling/ci_dark/"; }; @@ -449,24 +461,24 @@ let coc-denite = buildVimPluginFrom2Nix { pname = "coc-denite"; - version = "2020-11-26"; + version = "2021-01-14"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-denite"; - rev = "ea22e4462f9ac77f9c0cf3b1413bcd4d3b86a135"; - sha256 = "15rx4ws7hvssi7z1fkh7mzadc9xifi4hzb9g91lbinds12v19gg9"; + rev = "819b0e334431a9e914d69f3fedf68122799fcab9"; + sha256 = "02zy4ip7m1jivqzs67c8bzc8lis8wxkm38nvk6nngz2790xpfywc"; }; meta.homepage = "https://github.com/neoclide/coc-denite/"; }; coc-explorer = buildVimPluginFrom2Nix { pname = "coc-explorer"; - version = "2021-01-04"; + version = "2021-02-02"; src = fetchFromGitHub { owner = "weirongxu"; repo = "coc-explorer"; - rev = "1b88de2322b2f9adad4d5c1739289ed861afc8d0"; - sha256 = "1xcc2zdgkc72vvnl83c97cyx12mx93ryik9wlyw48clsi02kw6aq"; + rev = "ee76911b1fa4a12833e53a1f56b03ada4fc3b6cf"; + sha256 = "0n2za8f43gj9mjcjvwdrd2q17qn72fl1d7invnhrcyq44452y0z5"; }; meta.homepage = "https://github.com/weirongxu/coc-explorer/"; }; @@ -483,6 +495,18 @@ let meta.homepage = "https://github.com/antoinemadec/coc-fzf/"; }; + coc-lua = buildVimPluginFrom2Nix { + pname = "coc-lua"; + version = "2021-01-29"; + src = fetchFromGitHub { + owner = "josa42"; + repo = "coc-lua"; + rev = "9de6e72dca845727c1ef53a71a6cb07f7da4802c"; + sha256 = "0csiisfwjn8rr4a9hi7law2fn1wp1fms9nf3h6f9ynqi2p63yxch"; + }; + meta.homepage = "https://github.com/josa42/coc-lua/"; + }; + coc-neco = buildVimPluginFrom2Nix { pname = "coc-neco"; version = "2020-04-07"; @@ -509,24 +533,24 @@ let coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2021-01-07"; + version = "2021-01-28"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "5b8af3eaee714f2c390f2f8e83ea47b78d24eab8"; - sha256 = "1x088m180wk6b0gk1xdw8crmrhp7s05yshj8nigqyhafm589a7vf"; + rev = "a336a8bc251702d9526a6818ae56e86d92fafc0c"; + sha256 = "0jh5ik1w6qyp9scr9qxi47n7b8xgznknhsriwcpw2axs9ff00zz8"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; codi-vim = buildVimPluginFrom2Nix { pname = "codi-vim"; - version = "2020-07-25"; + version = "2021-01-11"; src = fetchFromGitHub { owner = "metakirby5"; repo = "codi.vim"; - rev = "08e26f4dc4bdb0cbc790474beb29a48e7a9c8ceb"; - sha256 = "1qwacymipshfvvg7ya7gsfz1r65q44qjjsgya6wm81n04q9rpxfx"; + rev = "cf62681a4962ce1873e4b2a5e0bf401dcd42890f"; + sha256 = "15j08qa7sklm0pilfn3ljgq75hrv8y9h8xzj8ibrafp29640gkfl"; }; meta.homepage = "https://github.com/metakirby5/codi.vim/"; }; @@ -582,24 +606,24 @@ let completion-buffers = buildVimPluginFrom2Nix { pname = "completion-buffers"; - version = "2020-09-26"; + version = "2021-01-17"; src = fetchFromGitHub { owner = "steelsojka"; repo = "completion-buffers"; - rev = "441a58b77c04409e8ccb35fd4970598ae551462f"; - sha256 = "14q5n7h5kaqf71cfd9mlhwb0xsihm6d3kizrxhlfnzxk6zkn8p0s"; + rev = "c36871b2a44b59761387f4972c617b44dcec5e75"; + sha256 = "14rxmy3cjrl7lr4yvrk7nkhc5h8rlpj7xjixzgr0vmnbsl885kyh"; }; meta.homepage = "https://github.com/steelsojka/completion-buffers/"; }; completion-nvim = buildVimPluginFrom2Nix { pname = "completion-nvim"; - version = "2021-01-09"; + version = "2021-01-15"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "completion-nvim"; - rev = "25dac52c4eb37bf28cc1b8fd6283b151db85e764"; - sha256 = "1ljzva5zy1d5d5yfvpf57rjpfzp194rkf98arslns8i0as30kbmd"; + rev = "fc9b2fd2d47bea6a8954de1b1b19f2330545b354"; + sha256 = "0dip8z6cfhjbz5lvf6f75382lg7d819djrpygbc12lf1s4i66i3z"; }; meta.homepage = "https://github.com/nvim-lua/completion-nvim/"; }; @@ -642,12 +666,12 @@ let conjure = buildVimPluginFrom2Nix { pname = "conjure"; - version = "2021-01-03"; + version = "2021-01-28"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "e966ef58720fa0a2739aa33e9307809925b36597"; - sha256 = "1baf3r6fmdwn1pbn5sfrrmzi4dxp9a298bajr4sqds05avk4z2dc"; + rev = "0aa1e8f78e8e0746a6026260f4d9a64a0bdfbf7a"; + sha256 = "163hgvc64bjc18kf6biwy5slhkfg8rw7pvrjsq4kfmcszvkbhgap"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -678,12 +702,12 @@ let Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2021-01-03"; + version = "2021-01-26"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "8c3cced82a5ea8051fbbe2ade25fac557ca976f0"; - sha256 = "1ayzpwc9bi6x5l5yhmhlfqifizpya9z57f0qdm64diwqvr8lvyb2"; + rev = "c4d5c58771dd854671bd26b94693ecc1ffa21e39"; + sha256 = "1r66h030f1952cl1bgynwb3r80zjh5imxwm87gnyjk6rg9kpjqnd"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -822,12 +846,12 @@ let defx-nvim = buildVimPluginFrom2Nix { pname = "defx-nvim"; - version = "2021-01-08"; + version = "2021-02-02"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "a9259687391457c71fa8bcbf609ca83742b6d277"; - sha256 = "0smlfvxdily3vz9i3vr0b5r3410zp5asf13cbjxxv219fqa3z22a"; + rev = "fe855a14eaf4ede5c040704770202fe954addbda"; + sha256 = "1f7gg77q8h227kbbf73d697v1x8w42szfckxmyskwb5wrvsxinpc"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -858,36 +882,36 @@ let denite-git = buildVimPluginFrom2Nix { pname = "denite-git"; - version = "2020-11-21"; + version = "2021-01-25"; src = fetchFromGitHub { owner = "neoclide"; repo = "denite-git"; - rev = "df995dae2ea31a2af5df12e1d405d9f1cf702ab1"; - sha256 = "14fcr2i3nq1x6rcjw3bqd4qdxdns7z67q92pj4w349qnqzr8pd0m"; + rev = "031c2db8fd7ff68078ba3e4f05d21a7950353433"; + sha256 = "0h5a0cmrv1w7zvzxj8gdddhyiqi1qa91qsyl2axhcrdishpc0hnn"; }; meta.homepage = "https://github.com/neoclide/denite-git/"; }; denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2021-01-08"; + version = "2021-02-02"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "f7667ec03c4cdef1b4d9a95521d1ee5866f3f2de"; - sha256 = "19s3809kasiybv18q6q7c36bf43cq9ndq7z5zpqrxgg6kf3my2d8"; + rev = "b3c400c1d71a7451ce4c181e81d33373100ac4ac"; + sha256 = "1k4qgdmpn5r8h8d3arq9zis6m0h8fagikrjb0v8lfhsz83zl1293"; }; meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; deol-nvim = buildVimPluginFrom2Nix { pname = "deol-nvim"; - version = "2021-01-05"; + version = "2021-01-27"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "9582a7dc191f3569644092fb0d3b2ad7bf608bca"; - sha256 = "0kpnzzg1pigjrw8g58iajw8apb7dczapm7jwdh8q5ixhmh31xn6v"; + rev = "0c6e1653f0d0a904efa8da01e470ffe0bd1bf594"; + sha256 = "1jfwzvblcfx7yx0lhwps0smgsblrc0azncv1bzliyx27in3gn59s"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -1018,12 +1042,12 @@ let pname = "deoplete-lsp"; version = "2020-12-26"; src = fetchFromGitHub { - owner = "Shougo"; + owner = "deoplete-plugins"; repo = "deoplete-lsp"; rev = "760eb2f647a518144ca1dc1091cc449c0dbee71e"; sha256 = "0dcq79xqfb5qnjinwni0bi3vn2sfsri8wmc75wgvw2114vyf2k9a"; }; - meta.homepage = "https://github.com/Shougo/deoplete-lsp/"; + meta.homepage = "https://github.com/deoplete-plugins/deoplete-lsp/"; }; deoplete-notmuch = buildVimPluginFrom2Nix { @@ -1064,12 +1088,12 @@ let deoplete-tabnine = buildVimPluginFrom2Nix { pname = "deoplete-tabnine"; - version = "2020-11-30"; + version = "2021-01-15"; src = fetchFromGitHub { owner = "tbodt"; repo = "deoplete-tabnine"; - rev = "a9bc7ffddbcae9c90be2c56f06842890e07126ce"; - sha256 = "1ar0ccr09m76arjcz4n5q7l9k8l1klc4sdxl5g0v87jjmiiazzvg"; + rev = "80a329eca215f48de8a4e575af55607700ddc93e"; + sha256 = "1i23ajbkx3yrll4mnqzf17g66c9x5g6ih3hk3acjq7h3m6ifgfyi"; }; meta.homepage = "https://github.com/tbodt/deoplete-tabnine/"; }; @@ -1112,12 +1136,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2021-01-08"; + version = "2021-01-25"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "0901b1886208a32880b92f22bf8f38a17e95045a"; - sha256 = "0r66sjkgbbhgdalqnfyzy3ym3jiikyd10pi5236aqga75vysvk0s"; + rev = "2e3f5b5c24152d9aa4a0299ce6d1b7a6b76327eb"; + sha256 = "0yf35ak46pnknas6isvi4gpyc9n757a46kjvwwyh32pznfqpl41p"; }; meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; @@ -1196,12 +1220,12 @@ let echodoc-vim = buildVimPluginFrom2Nix { pname = "echodoc-vim"; - version = "2020-10-13"; + version = "2021-01-28"; src = fetchFromGitHub { owner = "Shougo"; repo = "echodoc.vim"; - rev = "2a6d6bd6255fbfe152da6bb7f2404afa29479941"; - sha256 = "18nm20ivkcjlh0rgf3c1wdxf1wsc4r95znm2dhgmw1ym4wmh0v4s"; + rev = "c805de7e9811cd298861c7bc6ef455093dcdfaf5"; + sha256 = "1jhhscldckydzzjnl1jki3025brmlbmr7czhw1s30jx5wr00zc5w"; }; meta.homepage = "https://github.com/Shougo/echodoc.vim/"; }; @@ -1282,24 +1306,24 @@ let falcon = buildVimPluginFrom2Nix { pname = "falcon"; - version = "2020-04-16"; + version = "2021-02-01"; src = fetchFromGitHub { owner = "fenetikm"; repo = "falcon"; - rev = "da3468536410eb1ea59a0dd3054edf28d4577d8c"; - sha256 = "1cvw3n8ysxnm3w0rvk1rks815ha5grca1p3c7bkas6klrplfhlsc"; + rev = "e2efdb0d0827f7ec417583b25142f19714ece2ea"; + sha256 = "1s4i9rv1kcpry1zldpml908xv1r5hn0darip701y14njbmk9fff8"; }; meta.homepage = "https://github.com/fenetikm/falcon/"; }; far-vim = buildVimPluginFrom2Nix { pname = "far-vim"; - version = "2020-12-12"; + version = "2021-01-21"; src = fetchFromGitHub { owner = "brooth"; repo = "far.vim"; - rev = "f92a9ef537c195815ddc12ce919dae607f3d887b"; - sha256 = "1i6mzbfylq3212saipq79s5yb00y9083wsi7dax37bcfb8ryl841"; + rev = "b3e7b62ef6820ccdcbdc6070f3573b658aafba43"; + sha256 = "0lf2vlsyk4ymhyscnpla417hvh6qdi8cablammnc5vsk1hmqvc3i"; }; meta.homepage = "https://github.com/brooth/far.vim/"; }; @@ -1316,21 +1340,9 @@ let meta.homepage = "https://github.com/konfekt/fastfold/"; }; - fern-vim = buildVimPluginFrom2Nix { - pname = "fern-vim"; - version = "2021-01-08"; - src = fetchFromGitHub { - owner = "lambdalisue"; - repo = "fern.vim"; - rev = "100764195f8cea2edf8a8c6a69a3cb707e35cf6d"; - sha256 = "099mk22287zjgc0sy0v9vsw8l9ssa2rr56jasxpd6yswppafdrs7"; - }; - meta.homepage = "https://github.com/lambdalisue/fern.vim/"; - }; - fennel-vim = buildVimPluginFrom2Nix { - pname = "fennel.vim"; - version = "2021-01-08"; + pname = "fennel-vim"; + version = "2020-11-15"; src = fetchFromGitHub { owner = "bakpakin"; repo = "fennel.vim"; @@ -1340,6 +1352,18 @@ let meta.homepage = "https://github.com/bakpakin/fennel.vim/"; }; + fern-vim = buildVimPluginFrom2Nix { + pname = "fern-vim"; + version = "2021-01-31"; + src = fetchFromGitHub { + owner = "lambdalisue"; + repo = "fern.vim"; + rev = "fa8a10607a39f41a16071561901b963836cd8706"; + sha256 = "0cg0ri14jmgx063j950m5kfvsy81qwzvxibar8fq9bkpk63xrip3"; + }; + meta.homepage = "https://github.com/lambdalisue/fern.vim/"; + }; + ferret = buildVimPluginFrom2Nix { pname = "ferret"; version = "2020-12-08"; @@ -1439,28 +1463,40 @@ let fzf-lsp-nvim = buildVimPluginFrom2Nix { pname = "fzf-lsp-nvim"; - version = "2020-12-24"; + version = "2021-01-19"; src = fetchFromGitHub { owner = "gfanto"; repo = "fzf-lsp.nvim"; - rev = "de69b03c9feaa4b574e4a3e053a9a33467848227"; - sha256 = "09kpcmnvzgsdbwd5nsnkm93khqhncb8bjl67519wjgx39g73pq50"; + rev = "5b12d8de47608570b404270c00742e3977ed3103"; + sha256 = "0y23i1gj4y517qs4ff43fi3ivkz4gmidrvcf6n314nwjgzikff6w"; }; meta.homepage = "https://github.com/gfanto/fzf-lsp.nvim/"; }; fzf-vim = buildVimPluginFrom2Nix { pname = "fzf-vim"; - version = "2021-01-07"; + version = "2021-02-02"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "d43df0ea2f099836c2e3499756101e87bcbd3e25"; - sha256 = "1hclx6c476i523qa5r27r2jbdfdrlbgan1j7aczzwgj3lahbdlvx"; + rev = "02a192ea0bed22a015e005b281e55e0da2a8e496"; + sha256 = "0znlzjni031vagj83d60nararb67cli5fpp2lc37k9p8xnff1mjv"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; + galaxyline-nvim = buildVimPluginFrom2Nix { + pname = "galaxyline-nvim"; + version = "2021-01-31"; + src = fetchFromGitHub { + owner = "glepnir"; + repo = "galaxyline.nvim"; + rev = "fd3f069c6fb5eabc5dbad030b3c729bb0c6346ec"; + sha256 = "1wpx2wsq7fqabyv2cfgiqs835b6da0y1i4ajx1iyi727q39vm5qj"; + }; + meta.homepage = "https://github.com/glepnir/galaxyline.nvim/"; + }; + gen_tags-vim = buildVimPluginFrom2Nix { pname = "gen_tags-vim"; version = "2020-10-12"; @@ -1487,12 +1523,12 @@ let ghcid = buildVimPluginFrom2Nix { pname = "ghcid"; - version = "2020-12-30"; + version = "2021-01-31"; src = fetchFromGitHub { owner = "ndmitchell"; repo = "ghcid"; - rev = "fb4a1610d830806311595ad5b314eed5ec6b1893"; - sha256 = "17a663rx6x7mmls3i8ix4njfqdvqsbcj5avhdk07y8icdyiwbrp0"; + rev = "3f4a7cc9f50a179158cd8a9ea10ba56cae73514b"; + sha256 = "1afgq5kj98qhgsvpf556zs478s3776i0kjq3zr6zwxr36dp8455n"; }; meta.homepage = "https://github.com/ndmitchell/ghcid/"; }; @@ -1533,6 +1569,18 @@ let meta.homepage = "https://github.com/vim-scripts/gitignore.vim/"; }; + gitsigns-nvim = buildVimPluginFrom2Nix { + pname = "gitsigns-nvim"; + version = "2021-01-31"; + src = fetchFromGitHub { + owner = "lewis6991"; + repo = "gitsigns.nvim"; + rev = "24f0bc9d4ebedad374be608c10cd9b08e079c338"; + sha256 = "0jb4kfz49a1q0lcc7kkg29y1mjga5i1iqglvb1jq9yrm1gvrk4yq"; + }; + meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; + }; + gitv = buildVimPluginFrom2Nix { pname = "gitv"; version = "2019-08-22"; @@ -1607,12 +1655,12 @@ let gruvbox-community = buildVimPluginFrom2Nix { pname = "gruvbox-community"; - version = "2020-11-13"; + version = "2021-01-17"; src = fetchFromGitHub { owner = "gruvbox-community"; repo = "gruvbox"; - rev = "2636a0344d3fbacc62d9d914a456fcfdba8ca4cb"; - sha256 = "1w9j97g3dzadwnqyal1zw12ia61b512hz8mhywqy5xq6v9f6zkw6"; + rev = "c73e63203f76ab8e39b2b05369c0a8877a981435"; + sha256 = "0lwvv5chxq0fb9k1y73g5zr8v54xghlqnq64k0vx2v2ravp3313r"; }; meta.homepage = "https://github.com/gruvbox-community/gruvbox/"; }; @@ -1643,12 +1691,12 @@ let haskell-vim = buildVimPluginFrom2Nix { pname = "haskell-vim"; - version = "2018-05-22"; + version = "2021-01-19"; src = fetchFromGitHub { owner = "neovimhaskell"; repo = "haskell-vim"; - rev = "b1ac46807835423c4a4dd063df6d5b613d89c731"; - sha256 = "1vqj3r2v8skffywwgv4093ww7fm540437j5qz7n8q8787bs5w0br"; + rev = "f35d02204b4813d1dbe8b0e98cc39701a4b8e15e"; + sha256 = "1q3hf0vr5gpmymmvm208sl0r8nb69m7f3bdrkqrp7fwc2v1ylnz0"; }; meta.homepage = "https://github.com/neovimhaskell/haskell-vim/"; }; @@ -1785,14 +1833,26 @@ let meta.homepage = "https://github.com/haya14busa/incsearch.vim/"; }; + indent-blankline-nvim = buildVimPluginFrom2Nix { + pname = "indent-blankline-nvim"; + version = "2021-01-22"; + src = fetchFromGitHub { + owner = "lukas-reineke"; + repo = "indent-blankline.nvim"; + rev = "207e001be64b39b72f8661e4a723d5bab698b5cd"; + sha256 = "0vnnfm319y3n0vvwbwls40fb6s73rqc8yyi31g0f0hdwd6ahsafm"; + }; + meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; + }; + indentLine = buildVimPluginFrom2Nix { pname = "indentLine"; - version = "2020-11-27"; + version = "2021-01-28"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "indentLine"; - rev = "a03953d4e89ebc372674f88303c5d4933709fea6"; - sha256 = "0yxx925wrxf3hyllvqnbyiy39bw075vmzzys9jx0aimk7dmf1w9l"; + rev = "5617a1cf7d315e6e6f84d825c85e3b669d220bfa"; + sha256 = "1ns3v4r5m6ckchmkaqkpk8dymh7hwj22d7x23hagmk4zv4hc2mhq"; }; meta.homepage = "https://github.com/Yggdroot/indentLine/"; }; @@ -1871,12 +1931,12 @@ let jedi-vim = buildVimPluginFrom2Nix { pname = "jedi-vim"; - version = "2021-01-03"; + version = "2021-01-30"; src = fetchFromGitHub { owner = "davidhalter"; repo = "jedi-vim"; - rev = "960eaa8053e5516195966321e06568750b2feb28"; - sha256 = "1ap9h7a6ybv6yvvszizyhzmgjhxd5xzaw2f6x7wn8dcsk7isy0a5"; + rev = "5d4615707fc7bce8a4f1fdaa5f7f07c11637bc30"; + sha256 = "0m8dafwz76glmgi7jvc3sxsxill5a3prf5qi0r9266swdw4v8ah3"; fetchSubmodules = true; }; meta.homepage = "https://github.com/davidhalter/jedi-vim/"; @@ -1896,12 +1956,12 @@ let Jenkinsfile-vim-syntax = buildVimPluginFrom2Nix { pname = "Jenkinsfile-vim-syntax"; - version = "2020-06-05"; + version = "2021-01-26"; src = fetchFromGitHub { owner = "martinda"; repo = "Jenkinsfile-vim-syntax"; - rev = "a701341879c6db93f5dffa37f4589eef3c4ded85"; - sha256 = "0nm3lf37l1g8lpa4yz1va0s6vw0vw99zghy3dzq933j0kqmspgvp"; + rev = "0d05729168ea44d60862f17cffa80024ab30bcc9"; + sha256 = "05z30frs4f5z0l4qgxk08r7mb19bzhqs36hi213yin78cz62b9gy"; }; meta.homepage = "https://github.com/martinda/Jenkinsfile-vim-syntax/"; }; @@ -2064,12 +2124,12 @@ let lh-brackets = buildVimPluginFrom2Nix { pname = "lh-brackets"; - version = "2021-01-06"; + version = "2021-01-15"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-brackets"; - rev = "547fc9ab14ecf6ecc0d81e8bbb1cc1fec314b6aa"; - sha256 = "0344ap5fkp1d0g91rv9pn0p28xqz8as48d3m6kxc99w229sj6p2q"; + rev = "7e0e38857de5558de04c251cf6ddc350724562d9"; + sha256 = "105dgm80946jvx9qxs10vscgrplwpg89nwd6cmpm47wzj8999r8b"; }; meta.homepage = "https://github.com/LucHermitte/lh-brackets/"; }; @@ -2088,36 +2148,36 @@ let lightline-ale = buildVimPluginFrom2Nix { pname = "lightline-ale"; - version = "2020-04-30"; + version = "2021-01-19"; src = fetchFromGitHub { owner = "maximbaz"; repo = "lightline-ale"; - rev = "23352556fdaa067209fa22df424f1b88ab370f6a"; - sha256 = "1cz1pcz6qxddpalymj2p19clnwsj568zlvbyg7mai0vxx6cv7a9w"; + rev = "932ea5b9287b8ddfd7b7f0218bb28de52d013140"; + sha256 = "1b3xbhd32jk43z8baj1djls294whbq2qls01l90k4ihsq97jplb9"; }; meta.homepage = "https://github.com/maximbaz/lightline-ale/"; }; lightline-bufferline = buildVimPluginFrom2Nix { pname = "lightline-bufferline"; - version = "2020-12-28"; + version = "2021-01-31"; src = fetchFromGitHub { owner = "mengelbrecht"; repo = "lightline-bufferline"; - rev = "510c8be3d78bb58f25976ff9e7415c8cdc2a3054"; - sha256 = "0bd44jkz07pdzzs1vh0lkkms1vw8cd96wlsh8sa37mkx8bk5js5n"; + rev = "936598633d19a2f171347494c3240e72da6db78a"; + sha256 = "0j0swcbvhhy5gajl42z6g1dwr62b68l4c913fdfvdhjngq26wbyw"; }; meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/"; }; lightline-vim = buildVimPluginFrom2Nix { pname = "lightline-vim"; - version = "2020-11-21"; + version = "2021-01-11"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "709b2d8dc88fa622d6c076f34b05b58fcccf393f"; - sha256 = "08v68ymwj6rralfmjpjggd29sc2pvan4yg1y7sysylwlmwl7nhlp"; + rev = "8e013f32f524157bf14ccaa87d97be3d3a7201e2"; + sha256 = "0yl5r1dv91wzkgflh37fd52dinwsm4rcf4kfizn4xg5lbzdafkmn"; }; meta.homepage = "https://github.com/itchyny/lightline.vim/"; }; @@ -2134,6 +2194,18 @@ let meta.homepage = "https://github.com/junegunn/limelight.vim/"; }; + lispdocs-nvim = buildVimPluginFrom2Nix { + pname = "lispdocs-nvim"; + version = "2021-01-27"; + src = fetchFromGitHub { + owner = "tami5"; + repo = "lispdocs.nvim"; + rev = "0c45512ffabc6997f74c26b9c87d4b3cb021ab19"; + sha256 = "0m4iscxwdglvlkxhzs9gzx1iqvnvgknqxgss5k00wr0nrax8q3pl"; + }; + meta.homepage = "https://github.com/tami5/lispdocs.nvim/"; + }; + lsp-status-nvim = buildVimPluginFrom2Nix { pname = "lsp-status-nvim"; version = "2021-01-05"; @@ -2158,14 +2230,26 @@ let meta.homepage = "https://github.com/nvim-lua/lsp_extensions.nvim/"; }; + lspsaga-nvim = buildVimPluginFrom2Nix { + pname = "lspsaga-nvim"; + version = "2021-02-02"; + src = fetchFromGitHub { + owner = "glepnir"; + repo = "lspsaga.nvim"; + rev = "1a39791278d1ce53ffdbb9b455e5150d44b0b600"; + sha256 = "0x0kanhpb1q4bzwsvv0288rh1gqgbq1j9r8a2f9q22nlppqr1by0"; + }; + meta.homepage = "https://github.com/glepnir/lspsaga.nvim/"; + }; + lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine-nvim"; - version = "2021-01-09"; + version = "2021-01-31"; src = fetchFromGitHub { owner = "hoob3rt"; repo = "lualine.nvim"; - rev = "8742b6e466dff01657b1cd4187f2f25aa57d2916"; - sha256 = "00i0mx18apx48lhzmc4fik0mbqm3vsfdp4pbl2z8d0fnmldhqx75"; + rev = "8c09fc82283961169c37250f639117d729d038d5"; + sha256 = "0k6pfns8cfjzy0rckmp249kk644y0nk8rfk4163xx3mi4p46741p"; }; meta.homepage = "https://github.com/hoob3rt/lualine.nvim/"; }; @@ -2230,14 +2314,26 @@ let meta.homepage = "https://github.com/vim-scripts/mayansmoke/"; }; + minimap-vim = buildVimPluginFrom2Nix { + pname = "minimap-vim"; + version = "2021-01-04"; + src = fetchFromGitHub { + owner = "wfxr"; + repo = "minimap.vim"; + rev = "3e9ba8aae59441ed82b50b186f608e03aecb4f0e"; + sha256 = "1z264hr0vbsdc0ffaiflzq952xv4h1g55i08dnlifvpizhqbalv6"; + }; + meta.homepage = "https://github.com/wfxr/minimap.vim/"; + }; + mkdx = buildVimPluginFrom2Nix { pname = "mkdx"; - version = "2020-12-10"; + version = "2021-01-28"; src = fetchFromGitHub { owner = "SidOfc"; repo = "mkdx"; - rev = "c977b1feff1dd53fc876f107d5c1128354e3cfb5"; - sha256 = "15b0w9wabrp4mb4hj1zi3bf5ma0p2qkb7b93c9hzrqbimkzdy1db"; + rev = "602a78430aee47881f8c57f73ba96fdded9a3ace"; + sha256 = "1j4icyp3p20rlb8apyp7ixwxv59q2pdzjg7krh1mc6spr6m779jv"; }; meta.homepage = "https://github.com/SidOfc/mkdx/"; }; @@ -2294,12 +2390,12 @@ let pname = "ncm2-dictionary"; version = "2018-11-15"; src = fetchFromGitHub { - owner = "yuki-ycino"; + owner = "yuki-yano"; repo = "ncm2-dictionary"; rev = "c93b52ab0cd1a9ebe5711414c3134f4bba9be6af"; sha256 = "096l8prqm7zb2s27j2cpnydggszicaji7xjlmhrav7dzc51avafy"; }; - meta.homepage = "https://github.com/yuki-ycino/ncm2-dictionary/"; + meta.homepage = "https://github.com/yuki-yano/ncm2-dictionary/"; }; ncm2-github = buildVimPluginFrom2Nix { @@ -2520,16 +2616,28 @@ let neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2020-12-02"; + version = "2021-01-20"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "7e458dafae64b7f14f8c2eaecb886b7a85b8f66d"; - sha256 = "00x6yx4y4m45p3silwz084scs1a602d4xazyr39lgc0ssv6d9jhv"; + rev = "c1d63f047c2fc1dba638a80c24d9b9b44ceb9f50"; + sha256 = "1q92lxdy8mgiv3ffp2gxsf0acp98hk3yh3lkvsaj6crdwbrq1ss9"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; + neogit = buildVimPluginFrom2Nix { + pname = "neogit"; + version = "2021-02-02"; + src = fetchFromGitHub { + owner = "TimUntersberger"; + repo = "neogit"; + rev = "c3c3d2aa860f2b4acbdb334ce0777e3ec25259d9"; + sha256 = "1mxbpv9vv2mb0dgdyb97gw1c5nfjvzkbn7fkwvcvg996xhvap9cs"; + }; + meta.homepage = "https://github.com/TimUntersberger/neogit/"; + }; + neoinclude-vim = buildVimPluginFrom2Nix { pname = "neoinclude-vim"; version = "2020-09-13"; @@ -2568,12 +2676,12 @@ let neosnippet-snippets = buildVimPluginFrom2Nix { pname = "neosnippet-snippets"; - version = "2020-12-23"; + version = "2021-01-20"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet-snippets"; - rev = "901b9ba8f2eea6222649282a58d7b86b8719334f"; - sha256 = "0k08057fbs4pmx9w6mwnjvms6sn694h6n255ff6n40sf4yy8w4mh"; + rev = "b10b14873fc0fd46a7daab251e83eaad6c17e1e3"; + sha256 = "1y5bp92dvz356nzl14bcqhdvfwc59ckc45nw0m4lh43q2h0lvdg1"; }; meta.homepage = "https://github.com/Shougo/neosnippet-snippets/"; }; @@ -2652,24 +2760,24 @@ let nerdcommenter = buildVimPluginFrom2Nix { pname = "nerdcommenter"; - version = "2020-12-11"; + version = "2021-02-02"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdcommenter"; - rev = "119b99d1662113a588734e3666213d246e50900d"; - sha256 = "1dci0a5hcpvx567vqns7csn7p24i2m2l3ra8jmcvwrhlk72kvgrf"; + rev = "b83e9cdf835161b398e04e4c462103fd21801ee3"; + sha256 = "15x4qw0l9j228rrfqnwzg13j7cr0k69xd46rcsa4886lw8nmpsak"; }; meta.homepage = "https://github.com/preservim/nerdcommenter/"; }; nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2020-12-20"; + version = "2021-01-31"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdtree"; - rev = "aaa946fb6bd79b9af86fbaf4b6b63fd81d839bd9"; - sha256 = "1fhwfwqlvz0pm5qdpjbmjx4dqlnchbp170jw63dc5fxin90h4ivh"; + rev = "1b19089917cc3e0a81d3294fead2424c419d545c"; + sha256 = "0zm60spnz4nsn0g9zsdiapygr2nwnkrqcz0w2pr37sp9i91nxxvb"; }; meta.homepage = "https://github.com/preservim/nerdtree/"; }; @@ -2748,12 +2856,12 @@ let nvcode-color-schemes-vim = buildVimPluginFrom2Nix { pname = "nvcode-color-schemes-vim"; - version = "2020-11-25"; + version = "2021-01-10"; src = fetchFromGitHub { owner = "ChristianChiarulli"; repo = "nvcode-color-schemes.vim"; - rev = "f94ec5a9259b4fd2deb495ead0341a38c19c2799"; - sha256 = "1f7z23dn7vnldc82d6x1j8wqvj9vsi169rbcg0scfphh79fq61pc"; + rev = "7ed43362582c7c202f9a3edc2293dbb87d96e5fc"; + sha256 = "1bcl2cdsvafvlsh5d4a2cr3v1nzpdlh9whaasq2ac192a6hs0c3x"; }; meta.homepage = "https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/"; }; @@ -2770,6 +2878,18 @@ let meta.homepage = "https://github.com/roxma/nvim-cm-racer/"; }; + nvim-compe = buildVimPluginFrom2Nix { + pname = "nvim-compe"; + version = "2021-02-02"; + src = fetchFromGitHub { + owner = "hrsh7th"; + repo = "nvim-compe"; + rev = "f2573c9dd52be7e7ced176a6375766758cf646be"; + sha256 = "1c2xib3vqjc8z1z1v1b11iywimxrbawma3zn5kl5fzihnc67mxkd"; + }; + meta.homepage = "https://github.com/hrsh7th/nvim-compe/"; + }; + nvim-completion-manager = buildVimPluginFrom2Nix { pname = "nvim-completion-manager"; version = "2018-07-27"; @@ -2784,52 +2904,64 @@ let nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2021-01-01"; + version = "2021-01-26"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "97f0ef219241ec8379feada8ab46c7da8c69f9ca"; - sha256 = "10q0fdib4mcbih13f7wknfs99wjqf1flhrj13qwlw0p5sswjz0z3"; + rev = "1461a3bacb22143e04039cf1a29024dad8876949"; + sha256 = "12ay8gjxp94v365an45a6bv034gnmdkirrvw0jvbpymky0pznmgj"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; nvim-dap-virtual-text = buildVimPluginFrom2Nix { pname = "nvim-dap-virtual-text"; - version = "2020-12-06"; + version = "2021-01-31"; src = fetchFromGitHub { owner = "theHamsta"; repo = "nvim-dap-virtual-text"; - rev = "5257a5a7b759ba5d4fe695b02569526cdd32ad43"; - sha256 = "0ghf6g5wdxdzja9i2d1r4s4p828safw6vx8636yx798lqqlvp8i7"; + rev = "3da747bbbaf3291838d984a26a423cc704794eca"; + sha256 = "1lmcjclvdhd4jq0lsgrzv7y7ry9yiqh6bsinwrla5fbh63rfwkzc"; }; meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/"; }; nvim-gdb = buildVimPluginFrom2Nix { pname = "nvim-gdb"; - version = "2021-01-08"; + version = "2021-01-24"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "81930348bbb1398635cc0ecbbc88e3defd8aaa0f"; - sha256 = "106g7pxa9rwwq45hmsb55b3dy0px2lr5lb25yy8n6jx6a70z9hf7"; + rev = "531a575d1768be4531246950e55a784739b5d0a7"; + sha256 = "03hd7bq09gz23619b19cz29hafhia5r28xm8bqnj03d2m6b2xlyh"; }; meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; }; nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2020-12-31"; + version = "2021-01-26"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "2fb6dc1b2a702a2f7ddd3dedff04b7fdfe66d9be"; - sha256 = "0sxyk1g82ycgx5mi21s1jyrqg3qd4cyjrzy6hbwil04kcadqkkc1"; + rev = "b0bca9edd3d4430f7a07387b72ea2ecaf370d808"; + sha256 = "1j0gfszx92m3v7wzaxfmxbi93qsnfc8zg4kvjnbvpwfgvyvbizgs"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; + nvim-hlslens = buildVimPluginFrom2Nix { + pname = "nvim-hlslens"; + version = "2021-01-21"; + src = fetchFromGitHub { + owner = "kevinhwang91"; + repo = "nvim-hlslens"; + rev = "492c61ccef4562687d319bba48f824426b4613d6"; + sha256 = "1587mms2qr8n6igsln54vanpzhhm1s7mhrvr4iyszh47dlhjkvdi"; + }; + meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; + }; + nvim-hs-vim = buildVimPluginFrom2Nix { pname = "nvim-hs-vim"; version = "2020-08-29"; @@ -2842,26 +2974,50 @@ let meta.homepage = "https://github.com/neovimhaskell/nvim-hs.vim/"; }; + nvim-jdtls = buildVimPluginFrom2Nix { + pname = "nvim-jdtls"; + version = "2021-01-30"; + src = fetchFromGitHub { + owner = "mfussenegger"; + repo = "nvim-jdtls"; + rev = "a35ce80f0e618da0eceb0d5f6874608d58d3ec26"; + sha256 = "1m87v27721zdplpfk0dd8mag416dxmnqja2smwb7z29n18qh81sn"; + }; + meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; + }; + + nvim-lightbulb = buildVimPluginFrom2Nix { + pname = "nvim-lightbulb"; + version = "2021-02-02"; + src = fetchFromGitHub { + owner = "kosayoda"; + repo = "nvim-lightbulb"; + rev = "3437cc5696f6c6f1a46b1ad1445d9c917d3fa4bc"; + sha256 = "1i53c7wrbx52ybm9v1m6p8n8894gyb2hylv7iac063nkhnhl7v6h"; + }; + meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/"; + }; + nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-01-09"; + version = "2021-02-01"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "8c68dc78d00fc9b55312108d48c4191ec3851f6a"; - sha256 = "09mzkn7psfv4iaq3myi7mq5qymxz0jnisr0d0k927z64ca3vzjbq"; + rev = "0fb71129de54577254a3ae143850d11b6902a279"; + sha256 = "0w5q4xwa22smgvfmba0j2k1bzihvvmqhpdlnjaap0g0jp69vcq99"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; nvim-lsputils = buildVimPluginFrom2Nix { pname = "nvim-lsputils"; - version = "2021-01-08"; + version = "2021-01-12"; src = fetchFromGitHub { owner = "RishabhRD"; repo = "nvim-lsputils"; - rev = "7f393053d303750868d17c8743c350a5503c3139"; - sha256 = "0r17l5g8fpx7bax3sriawj0f7pkzj33vjr27i5yxa5934gxawv0q"; + rev = "fae88180b573e935f4a0827eb096208a7c76b215"; + sha256 = "1i7gmh3zb2i8jig0j6drvknsx5p4dxm1v8b6bdrnjgs4pyrpy7si"; }; meta.homepage = "https://github.com/RishabhRD/nvim-lsputils/"; }; @@ -2892,24 +3048,24 @@ let nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree-lua"; - version = "2020-12-28"; + version = "2021-01-22"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "86944b51c0e0a8fed5a02ab44640b2b215cebe93"; - sha256 = "1mmpzhsj17rc88hfsn86y2w97a1mz3fjix9p61wnhq1sf0finkhr"; + rev = "b2852578769b53430af678ae7a99482f2a4be0da"; + sha256 = "057w9nqn0xc207s7y7fcl84xi14251yhyjd6xsajv9hlh4zcgarv"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2021-01-08"; + version = "2021-02-01"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "00ea65199e316aec5934cc2666ec9738e410b711"; - sha256 = "1q37hd8cggx863d91ld9r4s51wld73pqgq93zwlg22i7qyl2v423"; + rev = "d3901e583389ef0c356203f056bad37ec81a888c"; + sha256 = "033w6x6yg4p6dfqs753vbwyl22aar24jn87ya9l07nm4wkm7w7d9"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -2952,12 +3108,12 @@ let nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2021-01-05"; + version = "2021-01-27"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "68eee9b031432de6a1964315235d3cf265243a77"; - sha256 = "0zjhyd02sj17i0yrmffzzja2s0y9fa37v1nvqa17kap9vmcgyh7h"; + rev = "adad3ea7eb820b7e0cc926438605e7637ee1f5e6"; + sha256 = "0vbd0a3kblbx28s2p7ljsalb1hymr2qjhjqgr03sg1a6hmxib1i0"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; @@ -2998,18 +3154,42 @@ let meta.homepage = "https://github.com/neovim/nvimdev.nvim/"; }; + oceanic-material = buildVimPluginFrom2Nix { + pname = "oceanic-material"; + version = "2020-11-02"; + src = fetchFromGitHub { + owner = "glepnir"; + repo = "oceanic-material"; + rev = "900f487a1e8229a12f247a0cb7a533fe258945ae"; + sha256 = "1i6k2p11bsvjrkn9sdkql0im8ys8l9y0l6i850n9hdzvq919cfxv"; + }; + meta.homepage = "https://github.com/glepnir/oceanic-material/"; + }; + oceanic-next = buildVimPluginFrom2Nix { pname = "oceanic-next"; - version = "2020-11-19"; + version = "2021-01-26"; src = fetchFromGitHub { owner = "mhartington"; repo = "oceanic-next"; - rev = "29d694b9f6323c90fb0f3f54239090370caa99fb"; - sha256 = "0lwwzfayv7ql1qpydqgyr0g024shzck2m8d04dn5g0vf5qqf3qi6"; + rev = "f47fa3d4f63f1ce60bba13af81d97ee98ec31ceb"; + sha256 = "064d2ip2fvkkqh0z8x0mykycbcwmdajflr5qz0pl4f5q0rlsnbb8"; }; meta.homepage = "https://github.com/mhartington/oceanic-next/"; }; + one-nvim = buildVimPluginFrom2Nix { + pname = "one-nvim"; + version = "2021-01-30"; + src = fetchFromGitHub { + owner = "Th3Whit3Wolf"; + repo = "one-nvim"; + rev = "88916fbb81530a25f9a3f8bc02e1b4c91ff7be10"; + sha256 = "0glp8z6v53sff7vff6h6cxix40zwp1m305jsd50ji1i4913m08lw"; + }; + meta.homepage = "https://github.com/Th3Whit3Wolf/one-nvim/"; + }; + onedark-vim = buildVimPluginFrom2Nix { pname = "onedark-vim"; version = "2020-12-14"; @@ -3024,12 +3204,12 @@ let onehalf = buildVimPluginFrom2Nix { pname = "onehalf"; - version = "2020-10-14"; + version = "2021-01-31"; src = fetchFromGitHub { owner = "sonph"; repo = "onehalf"; - rev = "89923117bc49dd1e0c6b7fdd34bc6dc4d425fe1f"; - sha256 = "0d3d9sp88b41j8yhkn99b0g1y3jbcm3hhf8dw6kq50scrb84g5y3"; + rev = "141c775ace6b71992305f144a8ab68e9a8ca4a25"; + sha256 = "1p3kxf9abj0xpxwb8hrpy4h0457rvkfkv3zv7czh322vhma4hhd8"; }; meta.homepage = "https://github.com/sonph/onehalf/"; }; @@ -3058,6 +3238,18 @@ let meta.homepage = "https://github.com/tyru/open-browser.vim/"; }; + packer-nvim = buildVimPluginFrom2Nix { + pname = "packer-nvim"; + version = "2021-02-02"; + src = fetchFromGitHub { + owner = "wbthomason"; + repo = "packer.nvim"; + rev = "8262aa68acb1b3e95f96bc66d70e92578fd82a6d"; + sha256 = "1j0w71igl2icdmprl0krbv9ndda52dmmq9ijbz747x1g421d4rgn"; + }; + meta.homepage = "https://github.com/wbthomason/packer.nvim/"; + }; + palenight-vim = buildVimPluginFrom2Nix { pname = "palenight-vim"; version = "2020-10-20"; @@ -3132,24 +3324,24 @@ let playground = buildVimPluginFrom2Nix { pname = "playground"; - version = "2020-12-17"; + version = "2021-01-21"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "playground"; - rev = "0cba1b99cd6cfcd0379e57c317ea1df0c1c82b3a"; - sha256 = "1xs2g7inlmcjchzzmsa4qh1mf61xz6gdn96mzfkr8fs65g78861b"; + rev = "7e373e5706a2df71fd3a96b50d1f7b0c3e7a0b36"; + sha256 = "1vrfjv22whdmwna4xlvpsajx69fs8dkfwk0ji1jnvbyxmhki8mik"; }; meta.homepage = "https://github.com/nvim-treesitter/playground/"; }; plenary-nvim = buildVimPluginFrom2Nix { pname = "plenary-nvim"; - version = "2020-12-30"; + version = "2021-01-31"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "08c0eabcb1fdcc5b72f60c3a328ae8eeb7ad374e"; - sha256 = "1qn1cj9jiq33nldi5s7mrwxxi1y4wibygq3ii2a18x3v5xmw83zy"; + rev = "54ce65bc00d36c112b449db829ee36da9778f347"; + sha256 = "1h1z8daqycscdp1p1bmix1ifsgs725flly1pijn575ri6fd44n41"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -3517,12 +3709,12 @@ let sideways-vim = buildVimPluginFrom2Nix { pname = "sideways-vim"; - version = "2020-09-21"; + version = "2021-01-31"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "sideways.vim"; - rev = "19c5a21206b6c9f999004256a10e7381450ea83f"; - sha256 = "14h8lf70wccafapifzf9c6cjprik9n1a1wmv5gpajyqqbvzh1yv6"; + rev = "6aae3517c612a96c59b5417984889bff388210b2"; + sha256 = "13d0jzzn7gr6c0zkpa5bkfp06246hbpfb6y7mmsw2waybw3hij9s"; }; meta.homepage = "https://github.com/AndrewRadev/sideways.vim/"; }; @@ -3672,6 +3864,18 @@ let meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; }; + sql-nvim = buildVimPluginFrom2Nix { + pname = "sql-nvim"; + version = "2021-02-01"; + src = fetchFromGitHub { + owner = "tami5"; + repo = "sql.nvim"; + rev = "b9fcca9444861b013c4de20f9e732f0bcd88a570"; + sha256 = "03kmxargbsyasimgq6mq5i6795gjbxxdj237gvzfx4vjgaifm55c"; + }; + meta.homepage = "https://github.com/tami5/sql.nvim/"; + }; + srcery-vim = buildVimPluginFrom2Nix { pname = "srcery-vim"; version = "2020-12-22"; @@ -3794,12 +3998,12 @@ let tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2021-01-07"; + version = "2021-02-01"; src = fetchFromGitHub { owner = "preservim"; repo = "tagbar"; - rev = "978e1fe761de8be1f4d6c8469deba74a3cc0872f"; - sha256 = "0y9bd1y23z9w7ibn761yx5wq02liazv5dgxfqyy6xfxr17zvd514"; + rev = "7e8aeb69709b73cdbdaf50f4d26ab45d7920b7f0"; + sha256 = "02mlr9aw4ppi4cs6r1v3d39j3l85sy7q2xm1dxg1ld6k1p5imk94"; }; meta.homepage = "https://github.com/preservim/tagbar/"; }; @@ -3840,14 +4044,51 @@ let meta.homepage = "https://github.com/tomtom/tcomment_vim/"; }; + telescope-frecency-nvim = buildVimPluginFrom2Nix { + pname = "telescope-frecency-nvim"; + version = "2021-02-02"; + src = fetchFromGitHub { + owner = "nvim-telescope"; + repo = "telescope-frecency.nvim"; + rev = "93904dd90fd474e846d823901a1880e43e7177aa"; + sha256 = "189a5jlirgzvx7pgij6jil2kl0qhgg2kzl9sqn5ay98gcvcl6adk"; + }; + meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; + }; + + telescope-fzf-writer-nvim = buildVimPluginFrom2Nix { + pname = "telescope-fzf-writer-nvim"; + version = "2021-01-10"; + src = fetchFromGitHub { + owner = "nvim-telescope"; + repo = "telescope-fzf-writer.nvim"; + rev = "9535863f519be3d5e57fd50916f96594241bfe16"; + sha256 = "0jmkzjqlcz47hzp44407xwkmirgprzkwrz6x8ax771gpk8cghfrx"; + }; + meta.homepage = "https://github.com/nvim-telescope/telescope-fzf-writer.nvim/"; + }; + + telescope-fzy-native-nvim = buildVimPluginFrom2Nix { + pname = "telescope-fzy-native-nvim"; + version = "2020-12-31"; + src = fetchFromGitHub { + owner = "nvim-telescope"; + repo = "telescope-fzy-native.nvim"; + rev = "654dffd924b29fb9a9252dcbd63528b1498ac9fb"; + sha256 = "01x9z3n03qharjw778cxb16gw1dsxzmsxph4xsbfy1avf21c6x9g"; + fetchSubmodules = true; + }; + meta.homepage = "https://github.com/nvim-telescope/telescope-fzy-native.nvim/"; + }; + telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2021-01-09"; + version = "2021-02-01"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "de80a9837cd1d207981c1f6dbf504436f8bfee13"; - sha256 = "1zasdfn982akcgyyxvwwyp9vvh4p7kyi1gfkc57rj6jqkygwicsm"; + rev = "9e76b1613a25cc6f63d17eb73432523924662619"; + sha256 = "1yr7a7z48nfm5c7mmblbpdp42kfyp14b2d1fg03pkb792dkcqk2a"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -3890,12 +4131,12 @@ let thumbnail-vim = buildVimPluginFrom2Nix { pname = "thumbnail-vim"; - version = "2020-08-15"; + version = "2021-01-11"; src = fetchFromGitHub { owner = "itchyny"; repo = "thumbnail.vim"; - rev = "161ff743cb031eff376780108b018735d92160b0"; - sha256 = "105a1a9kahfdicw1gkdhc88w41pyhmhv6yw2kh1flkaikzqlxbc8"; + rev = "bfd408a3210c305aaf51e6ce31ac99497e6ab1ec"; + sha256 = "1kh12d0dg932j9drby27fhg8vbjm8rwih33rm4yjba0316i8wcyv"; }; meta.homepage = "https://github.com/itchyny/thumbnail.vim/"; }; @@ -3939,16 +4180,28 @@ let traces-vim = buildVimPluginFrom2Nix { pname = "traces-vim"; - version = "2020-10-13"; + version = "2021-01-23"; src = fetchFromGitHub { owner = "markonm"; repo = "traces.vim"; - rev = "1fb8738cf1e4db06423396dd3576592a94255935"; - sha256 = "0jl7m04rly8y1kslmcmi9f83a87qb3fbk6isqqqd5xgrxxmcj753"; + rev = "0f29f8e53503b8ce0bb43467064b2401cf34acd1"; + sha256 = "1xx2b59wcnbh5662j7b68maz5ccxj5xpfpnjn2r669aiv0a5snhw"; }; meta.homepage = "https://github.com/markonm/traces.vim/"; }; + train-nvim = buildVimPluginFrom2Nix { + pname = "train-nvim"; + version = "2020-09-10"; + src = fetchFromGitHub { + owner = "tjdevries"; + repo = "train.nvim"; + rev = "7b2e9a59af58385d88bf39c5311c08f839e2b1ce"; + sha256 = "1pbv8c2wb6b2h9czx7c0c8v0q7v0wc4w9s6qgw7hcbqdl3jv1svh"; + }; + meta.homepage = "https://github.com/tjdevries/train.nvim/"; + }; + tslime-vim = buildVimPluginFrom2Nix { pname = "tslime-vim"; version = "2020-09-09"; @@ -3987,12 +4240,12 @@ let ultisnips = buildVimPluginFrom2Nix { pname = "ultisnips"; - version = "2020-12-14"; + version = "2021-02-02"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "c270950492d71bac0317d47d42cd0884eefe6490"; - sha256 = "1k58wp6y6i0xr4pnp2h7r31229ngp3zadyi374c5nlf2pa3zc1d8"; + rev = "0e84f61b8184981012a32642f78ad88aafcf4258"; + sha256 = "183y7bzc9lix536wla1p6niyl1w17jpjm2ild6pc593pl194qjm5"; }; meta.homepage = "https://github.com/SirVer/ultisnips/"; }; @@ -4011,12 +4264,12 @@ let unicode-vim = buildVimPluginFrom2Nix { pname = "unicode-vim"; - version = "2020-11-19"; + version = "2021-02-01"; src = fetchFromGitHub { owner = "chrisbra"; repo = "unicode.vim"; - rev = "631c0850dd0fa36d29c9cd20169735a60b41bd71"; - sha256 = "0ql1w6q8w48jxqf1fs1aphcjjfvh8br7sv26nk6kgsm9h4xamnp5"; + rev = "afb8db4f81580771c39967e89bc5772e72b9018e"; + sha256 = "05d15yr5r8265j3yr8yz1dxl8p4p4nack4ldn663rmp29wm1q5pi"; }; meta.homepage = "https://github.com/chrisbra/unicode.vim/"; }; @@ -4071,12 +4324,12 @@ let verilog_systemverilog-vim = buildVimPluginFrom2Nix { pname = "verilog_systemverilog-vim"; - version = "2020-06-12"; + version = "2021-01-16"; src = fetchFromGitHub { owner = "vhda"; repo = "verilog_systemverilog.vim"; - rev = "c37bcf010fcb73599d690d8da6ac966dac02a07e"; - sha256 = "1f4kicgr7wv0dprvr91wi4lmk0d9bb9f4wcng4rfkq1cdwfkqdw4"; + rev = "0b88f2ccf81983944bf00d15ec810dd807053d19"; + sha256 = "0zaxz1j2v8nvhd9x6bx3sj95i7h7c7029hmccls777ikyp6ynf0r"; }; meta.homepage = "https://github.com/vhda/verilog_systemverilog.vim/"; }; @@ -4335,12 +4588,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2021-01-08"; + version = "2021-02-02"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "fdfc11f53adce1bd6644a5dac6002106ef08db95"; - sha256 = "1bas31zkrkz6pxsxnh5s4kph861z85gxg0fik0psd698yg9zzgc1"; + rev = "bffa7a4d23addaedc64075b06c00f1cbb5dec667"; + sha256 = "0ghf7z6ras1jslirf9dxq8xxjksyaj6nlr0js385g5z8n9xv1chp"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -4393,6 +4646,18 @@ let meta.homepage = "https://github.com/osyo-manga/vim-anzu/"; }; + vim-apm = buildVimPluginFrom2Nix { + pname = "vim-apm"; + version = "2020-09-28"; + src = fetchFromGitHub { + owner = "ThePrimeagen"; + repo = "vim-apm"; + rev = "2da35c35febbe98a6704495cd4e0b9526a0651e3"; + sha256 = "09amrb7bzrnwga8cm21fm4ylp2l0jd7cyfsf43fcym3f1k0bycwb"; + }; + meta.homepage = "https://github.com/ThePrimeagen/vim-apm/"; + }; + vim-asterisk = buildVimPluginFrom2Nix { pname = "vim-asterisk"; version = "2020-02-03"; @@ -4441,14 +4706,26 @@ let meta.homepage = "https://github.com/benizi/vim-automkdir/"; }; + vim-autoswap = buildVimPluginFrom2Nix { + pname = "vim-autoswap"; + version = "2019-01-09"; + src = fetchFromGitHub { + owner = "gioele"; + repo = "vim-autoswap"; + rev = "e587e4b14a605d8921942ba65a37583813289272"; + sha256 = "0l0ijbdl2s9p5i3cxfkq8jncncz38qprp51whbjcda485d1knk9n"; + }; + meta.homepage = "https://github.com/gioele/vim-autoswap/"; + }; + vim-bazel = buildVimPluginFrom2Nix { pname = "vim-bazel"; - version = "2020-08-22"; + version = "2021-01-31"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "vim-bazel"; - rev = "85a044d854e5e48f72414726c255112be31e2cac"; - sha256 = "1hcfbl958v39w00kyfg75rcxs9xzaqnd98i4y322ayqfgrhd95n8"; + rev = "58c750d13ec2337ba3e5992f96891bbb843a9dbf"; + sha256 = "0xsgj1j8xamkri75cjnih5xzwp8y7g1i7hgbbbmknz5d8jm3p204"; }; meta.homepage = "https://github.com/bazelbuild/vim-bazel/"; }; @@ -4575,12 +4852,12 @@ let vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2021-01-08"; + version = "2021-02-01"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "284ef9a0b7776ab34d387fb403d500371a65cbda"; - sha256 = "06jc831kcbpdh4k3890sh2srisbgljr0azx8g1g9fq0328qqnpbs"; + rev = "01d0a16456a5a3daeb88a66b12e160d4b8aec8e8"; + sha256 = "1xmsp2rf5av9vfn8ynzm5kgxz0cv2wnnjmsmp4m2p5yjdwjxn669"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -4609,6 +4886,18 @@ let meta.homepage = "https://github.com/guns/vim-clojure-static/"; }; + vim-closer = buildVimPluginFrom2Nix { + pname = "vim-closer"; + version = "2020-10-24"; + src = fetchFromGitHub { + owner = "rstacruz"; + repo = "vim-closer"; + rev = "c61667d27280df171a285b1274dd3cf04cbf78d4"; + sha256 = "1dgcag4dibckpvsm8hr28yw10z81ic52sdm5narcwr1k6hjidxpn"; + }; + meta.homepage = "https://github.com/rstacruz/vim-closer/"; + }; + vim-closetag = buildVimPluginFrom2Nix { pname = "vim-closetag"; version = "2020-10-09"; @@ -4755,12 +5044,12 @@ let vim-css-color = buildVimPluginFrom2Nix { pname = "vim-css-color"; - version = "2020-08-16"; + version = "2021-02-02"; src = fetchFromGitHub { owner = "ap"; repo = "vim-css-color"; - rev = "4694c6ea03a065a3f6ddbebce56797a21e8241ef"; - sha256 = "12bzxrdvb9s0d8llkq6h63g86qxs0gv9x7401apl6qrs79prrb4a"; + rev = "8dd7f1bf25acee493a5114e627ea90a9850c5fa8"; + sha256 = "0pjq14i7w2snlbzsqhfdn0fkribjsyngg6fcmpgacm4jvx3iviql"; }; meta.homepage = "https://github.com/ap/vim-css-color/"; }; @@ -4803,12 +5092,12 @@ let vim-dadbod = buildVimPluginFrom2Nix { pname = "vim-dadbod"; - version = "2020-12-08"; + version = "2021-01-25"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dadbod"; - rev = "4a2a8bc6dca50bc58885bdf2c0a153d0990d7872"; - sha256 = "0algcf02i273wmkg9yqhrxy10vi3j6vf08v0rnxnhima70gr1m1c"; + rev = "fb543e602de2fe74a7928c78e152bb964abb7a9a"; + sha256 = "05fwa2v0fz1rgfyp2f47hcr7vzgwfrw14flr43d7a88d8qka9lqs"; }; meta.homepage = "https://github.com/tpope/vim-dadbod/"; }; @@ -4839,12 +5128,12 @@ let vim-devicons = buildVimPluginFrom2Nix { pname = "vim-devicons"; - version = "2020-12-10"; + version = "2021-02-02"; src = fetchFromGitHub { owner = "ryanoasis"; repo = "vim-devicons"; - rev = "0d0bd57246b3285caec4737dc0f1c6b17ebb2787"; - sha256 = "1kkc3hgfz0qr84r873gjmjhgwph0nhyan6v69b55ph5qqsksrl42"; + rev = "0329d89c5114dc285939050fd5777dbcc450ddd7"; + sha256 = "0g8pipayg643xjs3dmpbwp91ycyg8b20qgr0mnmxzll0nan8zjny"; }; meta.homepage = "https://github.com/ryanoasis/vim-devicons/"; }; @@ -5029,6 +5318,54 @@ let meta.homepage = "https://github.com/tpope/vim-endwise/"; }; + vim-erlang-compiler = buildVimPluginFrom2Nix { + pname = "vim-erlang-compiler"; + version = "2021-01-16"; + src = fetchFromGitHub { + owner = "vim-erlang"; + repo = "vim-erlang-compiler"; + rev = "a99e75f792650c8dae86d9a44c7af2411ea2ead7"; + sha256 = "13400kjf90sxlpx1pqs379ihdn65i3gpck3dwkjnf1xiv1p9rzvz"; + }; + meta.homepage = "https://github.com/vim-erlang/vim-erlang-compiler/"; + }; + + vim-erlang-omnicomplete = buildVimPluginFrom2Nix { + pname = "vim-erlang-omnicomplete"; + version = "2021-01-16"; + src = fetchFromGitHub { + owner = "vim-erlang"; + repo = "vim-erlang-omnicomplete"; + rev = "924a50ed0ad93141063d0f27c9f62b1bea991baf"; + sha256 = "0zh730wsb0n9nk1x5qdbx78zgzhamd2a6fa5gxl4milvr5ddvdy9"; + }; + meta.homepage = "https://github.com/vim-erlang/vim-erlang-omnicomplete/"; + }; + + vim-erlang-runtime = buildVimPluginFrom2Nix { + pname = "vim-erlang-runtime"; + version = "2021-01-08"; + src = fetchFromGitHub { + owner = "vim-erlang"; + repo = "vim-erlang-runtime"; + rev = "47c643f51e4480541fc81e352ec5b2a361544d0b"; + sha256 = "0xlxkdqjq8fp9fpkhqv5nd2ipiq8nw1bdzd7hqibizwcdsisf91s"; + }; + meta.homepage = "https://github.com/vim-erlang/vim-erlang-runtime/"; + }; + + vim-erlang-tags = buildVimPluginFrom2Nix { + pname = "vim-erlang-tags"; + version = "2021-01-30"; + src = fetchFromGitHub { + owner = "vim-erlang"; + repo = "vim-erlang-tags"; + rev = "d9f2b8bd1f8478cce21084fde8b6b34f2564a54e"; + sha256 = "1w689p5ywf5ik074611ka5cd3iznmr87vpykp1y86k5628lcq2yh"; + }; + meta.homepage = "https://github.com/vim-erlang/vim-erlang-tags/"; + }; + vim-eunuch = buildVimPluginFrom2Nix { pname = "vim-eunuch"; version = "2020-08-07"; @@ -5151,12 +5488,12 @@ let vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2021-01-09"; + version = "2021-02-01"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "428a59e4ec5061cae34dacd865bd831ddee7a446"; - sha256 = "0jfdbaxjizb127s8rhx2ilhz48cg5xahv77rhm9sa4v9lky8zgrr"; + rev = "671f2aa87731ddeefe6573e4596c9f0d806e3b11"; + sha256 = "1lla4wb3jrp14hbcb03va7ikigy05rncw30wy9zsq93hm2zazbsj"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; @@ -5199,12 +5536,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2020-12-17"; + version = "2021-01-26"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "bebe504e38d0a20c30d6dd666c4c793b3cc66104"; - sha256 = "03w28pll83sj7g7ngif27mj81zmwik0iw8yc50yc3szk0lv816yc"; + rev = "8cf0cf5bfb2b858faecf4e0f6c1b8d0948805e5e"; + sha256 = "1ka4bbmzpdzaflnywl4pknd0xy1n6mqw3qk4krk92dd6bcya0b1d"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -5271,12 +5608,12 @@ let vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2020-12-11"; + version = "2021-01-26"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "512e2999ed7ff367580e0d6bc4d2daa81663221f"; - sha256 = "0229x71prknra1k2val78qpddy6w7wmla2j6cjk8fjvp1h2jvwxz"; + rev = "ff9d134f0c69e25d391138036051b2c5e6bac864"; + sha256 = "1xpqhhvxf13nk4hd7jn0ydkkdk7r14w72h8hmpxzhhji1d0pcy43"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -5319,12 +5656,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2021-01-09"; + version = "2021-01-22"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "9ac9a4337e4e71ca434f97a7678f301eca7266f7"; - sha256 = "06lzyakavb89k7pwhicqd2zc5rd12cjd6p8pb4m3xzw9kff6gzy1"; + rev = "007d9bc7786d703dc778de7b69895b8c1907dde7"; + sha256 = "1r7jv3cbawh9n2d6nd3iwga6bgj8z0nx94c3dhn5286si1s3857c"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -5425,6 +5762,18 @@ let meta.homepage = "https://github.com/enomsg/vim-haskellConcealPlus/"; }; + vim-hcl = buildVimPluginFrom2Nix { + pname = "vim-hcl"; + version = "2020-09-07"; + src = fetchFromGitHub { + owner = "jvirtanen"; + repo = "vim-hcl"; + rev = "94fbd199c8a947ede62f98509f91d637d7967454"; + sha256 = "0n2dmgfajji8nxxirb9q9jmqnzc1mjqnic5igs84pxmbc6r57zqq"; + }; + meta.homepage = "https://github.com/jvirtanen/vim-hcl/"; + }; + vim-hdevtools = buildVimPluginFrom2Nix { pname = "vim-hdevtools"; version = "2018-11-19"; @@ -5439,12 +5788,12 @@ let vim-hexokinase = buildVimPluginFrom2Nix { pname = "vim-hexokinase"; - version = "2020-12-31"; + version = "2021-01-31"; src = fetchFromGitHub { owner = "RRethy"; repo = "vim-hexokinase"; - rev = "a7468f62a70d1da85b3fbe7f540a6dbd7a199536"; - sha256 = "1vx48gq0skjmcjrxc8qkvjbqdsap50jrh1gyiqmm9s9rqxzsi4hs"; + rev = "9f7f4bad24f23d5284543a02349a5114e8b8f032"; + sha256 = "1i435avz23mclf1ag7v273xmpbgp66msvmi7mljkbs8k6xxygaks"; fetchSubmodules = true; }; meta.homepage = "https://github.com/RRethy/vim-hexokinase/"; @@ -5572,12 +5921,12 @@ let vim-illuminate = buildVimPluginFrom2Nix { pname = "vim-illuminate"; - version = "2021-01-07"; + version = "2021-02-01"; src = fetchFromGitHub { owner = "RRethy"; repo = "vim-illuminate"; - rev = "f8d01ab7417be5e3878678acd46e4d17e8d8d9b6"; - sha256 = "1vnhvnxw7a4v583pw80lqcc9bb9lmcfzm1vhnskxrfxhz01r9ina"; + rev = "17cdf0311271b017e66c66c56c253b63db3a20d0"; + sha256 = "1aivrwf7vhdsqcz4qbx3plqfw50myaphmidak1nb4zch1niqyypp"; }; meta.homepage = "https://github.com/RRethy/vim-illuminate/"; }; @@ -5668,12 +6017,12 @@ let vim-javacomplete2 = buildVimPluginFrom2Nix { pname = "vim-javacomplete2"; - version = "2021-01-04"; + version = "2021-01-31"; src = fetchFromGitHub { owner = "artur-shaik"; repo = "vim-javacomplete2"; - rev = "c59ac683bd2fd6164e8ab772ab16c1f4c82130a5"; - sha256 = "04mk200wbgg007qm3qxzckcz1nxrmvr6da31bf82ilzjf5vwhr52"; + rev = "fb39c1e6ab815270b9d1ba07f7d34059710b5035"; + sha256 = "1n541shva0c7frihgv0ngg3vqm3d549wbqa15n2n6j1cfpsasbyd"; }; meta.homepage = "https://github.com/artur-shaik/vim-javacomplete2/"; }; @@ -5765,12 +6114,12 @@ let vim-jsx-pretty = buildVimPluginFrom2Nix { pname = "vim-jsx-pretty"; - version = "2020-11-07"; + version = "2021-01-12"; src = fetchFromGitHub { owner = "MaxMEllon"; repo = "vim-jsx-pretty"; - rev = "8059c9269ab62ffc4ccca587e2a2a894806fa5e6"; - sha256 = "04jmmyz79mrq7mpl9kqrc8v28gn50jl93lzkyyhzp7dyhixgbgkm"; + rev = "6989f1663cc03d7da72b5ef1c03f87e6ddb70b41"; + sha256 = "16d76jvfb1cq591i06fnmgzv0q16g89zz7cmvgvj24vap2wgkbp8"; }; meta.homepage = "https://github.com/MaxMEllon/vim-jsx-pretty/"; }; @@ -5801,12 +6150,12 @@ let vim-LanguageTool = buildVimPluginFrom2Nix { pname = "vim-LanguageTool"; - version = "2020-10-29"; + version = "2021-01-24"; src = fetchFromGitHub { owner = "dpelle"; repo = "vim-LanguageTool"; - rev = "d1f94ef917dddfd8c82589957b7aa6a55f382964"; - sha256 = "1y2y3rkhnj6xhzkm0snfkb08h6jmyjiicmk4j8lw2vhszsfgz6ns"; + rev = "f92e2577ab937f437c06d91639100952b540365b"; + sha256 = "09jw26mmbyvjlz5fw1gj9q0dwmv0aqwbl288h4hcliyx56snijhl"; }; meta.homepage = "https://github.com/dpelle/vim-LanguageTool/"; }; @@ -5945,24 +6294,24 @@ let vim-lsc = buildVimPluginFrom2Nix { pname = "vim-lsc"; - version = "2021-01-05"; + version = "2021-01-28"; src = fetchFromGitHub { owner = "natebosch"; repo = "vim-lsc"; - rev = "9f914a4859d911d8a152ff828ad093198fee8763"; - sha256 = "0xvzwnfmgix6cz3xzzl9v9aslassnp6jkjpv5q2qngfrf33z8j9j"; + rev = "53530bf2b53b8af7299aa6499ca30e74c90480ec"; + sha256 = "1464jk1mlmpz9chs5hc6nx718r981z7rc68fyxzksfsn3gmk5isq"; }; meta.homepage = "https://github.com/natebosch/vim-lsc/"; }; vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2021-01-09"; + version = "2021-02-02"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "678c0592382c7073505650d30e71e9f9cbc3353c"; - sha256 = "0s7yhgajjqavj0lfzwassrk0n83dckf41bca54p5833ds85vwnsz"; + rev = "21a29936ed74b2212e1904cca6c22bff4e27b637"; + sha256 = "11jlqri1fyh1mbxrkihg1jj7g8mllh9w6gy64ah8gvpw505fws4c"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -6042,12 +6391,12 @@ let vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2020-12-09"; + version = "2021-01-29"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "24407e21e0a977e67774f70e0065dd3fea8d7595"; - sha256 = "03bmlvvfsyr5ccfjfrnl1r5wzkvarmdbm735abal02pifni05k1r"; + rev = "52b3ec1ee8d0f78c69bae6cc32f3c2d1a023a8c8"; + sha256 = "1hn3w4hzx444cz5z7g2lkpzr90r9ngjpy5jirgs3c947njc24kr7"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -6174,12 +6523,12 @@ let vim-nerdtree-syntax-highlight = buildVimPluginFrom2Nix { pname = "vim-nerdtree-syntax-highlight"; - version = "2020-07-19"; + version = "2021-01-11"; src = fetchFromGitHub { owner = "tiagofumo"; repo = "vim-nerdtree-syntax-highlight"; - rev = "1acc12aa7f773ede38538293332905f1ba3fea6a"; - sha256 = "0zm023mhi1si9g5r46md1v4rlls6z2m6kyn1jcfxjqyrgba67899"; + rev = "5178ee4d7f4e7761187df30bb709f703d91df18a"; + sha256 = "0i690a9sd3a9193mdm150q5yx43mihpzkm0k5glllsmnwpngrq1a"; }; meta.homepage = "https://github.com/tiagofumo/vim-nerdtree-syntax-highlight/"; }; @@ -6258,12 +6607,12 @@ let vim-numbertoggle = buildVimPluginFrom2Nix { pname = "vim-numbertoggle"; - version = "2020-12-30"; + version = "2021-01-12"; src = fetchFromGitHub { owner = "jeffkreeftmeijer"; repo = "vim-numbertoggle"; - rev = "4e4fda05db27e698c8ad4dff7c17bec54bb10a0c"; - sha256 = "0crrgdz5wyriylj28sn0sil732wfnhnz35zaydqgp2csqi9s9xcb"; + rev = "df9b1fe616507340718716204ba7f434125bdf7a"; + sha256 = "02zgzkwv2fk4zyg6agvski054nwkrm1m9dw0jpva57ksbf8rvqrg"; }; meta.homepage = "https://github.com/jeffkreeftmeijer/vim-numbertoggle/"; }; @@ -6282,12 +6631,12 @@ let vim-ocaml = buildVimPluginFrom2Nix { pname = "vim-ocaml"; - version = "2021-01-01"; + version = "2021-01-10"; src = fetchFromGitHub { owner = "ocaml"; repo = "vim-ocaml"; - rev = "2a18135901b312e5159f30e26786d657919281a4"; - sha256 = "00xyj3bzd76cdc60wiw42b4d35nlxshr9xh4n4c6jf1wavm1clfj"; + rev = "f51b69f46d5eb0ebbdfcd39b5aa36bfd9454eafd"; + sha256 = "0fs5pn2hhi0mnjz0xpjl0sh4032s4n4afzjrnhygw9l9a5m51dm4"; }; meta.homepage = "https://github.com/ocaml/vim-ocaml/"; }; @@ -6342,12 +6691,12 @@ let vim-orgmode = buildVimPluginFrom2Nix { pname = "vim-orgmode"; - version = "2020-10-15"; + version = "2021-01-20"; src = fetchFromGitHub { owner = "jceb"; repo = "vim-orgmode"; - rev = "b7bce17005cf114b0961d0b5576bf584a2574774"; - sha256 = "1kpg858qazv465k2w8343hkiz9lzclkcx91vcysip77diandn523"; + rev = "3aeea0648f485f002cfcaf1b3e6a25ef43a12a66"; + sha256 = "0jx5vw72p8s5np31g0macwx3iqghfgzvx30akyk5fspfayjivaxl"; }; meta.homepage = "https://github.com/jceb/vim-orgmode/"; }; @@ -6366,12 +6715,12 @@ let vim-oscyank = buildVimPluginFrom2Nix { pname = "vim-oscyank"; - version = "2021-01-05"; + version = "2021-01-29"; src = fetchFromGitHub { owner = "ojroques"; repo = "vim-oscyank"; - rev = "755561cd3e4532009dc75c997f8cb0e5f50c9ed7"; - sha256 = "18vgmmnds5zfnn1v285g4s0yq7zpj9nwkdm1l5rcnx986rdrbgyw"; + rev = "4980c987647523defbc20b3377993d34526f3911"; + sha256 = "089gp0abfqipz8rrh5jdcgrzg1a65cxchq1cadkxncmb8vcymh0r"; }; meta.homepage = "https://github.com/ojroques/vim-oscyank/"; }; @@ -6558,12 +6907,12 @@ let vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2021-01-03"; + version = "2021-01-14"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "7bde552a463999897320a1899a6ca4f8806041ea"; - sha256 = "1rc9dfpl7x2fmqcm954x1syfcl392vsrcgid2pm6p91j3drm78nq"; + rev = "4c10562d2cc9b084518284c49a158558da5180a7"; + sha256 = "0avrjy1mxzkpsrbblzqx81ml08gm7n4bd4ihxm4qbvcdbg8n5chx"; }; meta.homepage = "https://github.com/sheerun/vim-polyglot/"; }; @@ -6606,12 +6955,12 @@ let vim-projectionist = buildVimPluginFrom2Nix { pname = "vim-projectionist"; - version = "2020-10-31"; + version = "2021-01-22"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-projectionist"; - rev = "0c6967d3a8c3bd3d3b42013531c3f12c843aff80"; - sha256 = "1s6yxnlwxlblj5m9gxlc8699g2a1d7cbjacp4fk4fa9mrkga7bv8"; + rev = "348e070867d02bd471df486bfbe25e2e2ce13061"; + sha256 = "0fyp1zikw16kzjcs7a6g3kjk74xr46bdhwrwfi9ppfqlhb936kgr"; }; meta.homepage = "https://github.com/tpope/vim-projectionist/"; }; @@ -6666,12 +7015,12 @@ let vim-puppet = buildVimPluginFrom2Nix { pname = "vim-puppet"; - version = "2021-01-09"; + version = "2021-01-30"; src = fetchFromGitHub { owner = "rodjek"; repo = "vim-puppet"; - rev = "d2cfbfe7b6a810f0be4de1f024a75ce6e9d9a260"; - sha256 = "049fimc3mvn6c6cfwg8i1kzjn81arx60gyid39wsi2h0gb1sxv12"; + rev = "b282072eb145c7719319bee1963c33ad876b0cea"; + sha256 = "1m6zbyg5hh3rhwq36836ldwhgcsmh4bl0lz5g4nzpc2ch83crrn8"; }; meta.homepage = "https://github.com/rodjek/vim-puppet/"; }; @@ -6690,12 +7039,12 @@ let vim-qf = buildVimPluginFrom2Nix { pname = "vim-qf"; - version = "2020-11-18"; + version = "2021-02-01"; src = fetchFromGitHub { owner = "romainl"; repo = "vim-qf"; - rev = "23c9d67cdd0739c9d74ac9e4a494b7cb7351170c"; - sha256 = "15kj1wvd3wlmn982l2v8sv2lc3q39bz3jw94jvmkh7nz51xvmfqc"; + rev = "0da85ff4270c2be10e24729dd42fb749ad1b69b7"; + sha256 = "0f8qnxy18qskbr3m8hn4vqv7bcvr2b0xqi64bxx078an5x8lbgx2"; }; meta.homepage = "https://github.com/romainl/vim-qf/"; }; @@ -6714,12 +7063,12 @@ let vim-quickrun = buildVimPluginFrom2Nix { pname = "vim-quickrun"; - version = "2020-08-25"; + version = "2021-01-27"; src = fetchFromGitHub { owner = "thinca"; repo = "vim-quickrun"; - rev = "c688f336a4aeb002319994f4fb4a8873f204f0ab"; - sha256 = "1wzcvshwn4gvjbcmni1r473001m5ipamggkcpwsa7xr74sj4rn73"; + rev = "c980977f1d77b3285937b9d7b5baa964fc9ed7f5"; + sha256 = "00f1slgrjnh8m59sm3xmias3jvjlvw26yigv9fmy6zwcynlivc5x"; }; meta.homepage = "https://github.com/thinca/vim-quickrun/"; }; @@ -6774,12 +7123,12 @@ let vim-repeat = buildVimPluginFrom2Nix { pname = "vim-repeat"; - version = "2019-11-13"; + version = "2021-01-25"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-repeat"; - rev = "c947ad2b6a16983724a0153bdf7f66d7a80a32ca"; - sha256 = "00hhbqcx21j0738ad5xh92lsykpa0qxhdy1s7wnwc8d3jndmyjwb"; + rev = "24afe922e6a05891756ecf331f39a1f6743d3d5a"; + sha256 = "0y18cy5wvkb4pv5qjsfndrpcvz0dg9v0r6ia8k9isp4agdmxkdzj"; }; meta.homepage = "https://github.com/tpope/vim-repeat/"; }; @@ -6810,12 +7159,12 @@ let vim-rsi = buildVimPluginFrom2Nix { pname = "vim-rsi"; - version = "2019-11-15"; + version = "2021-01-16"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rsi"; - rev = "ad8ba6beae8e82339479104b914214a868c9f1fe"; - sha256 = "1ycjwnbs6rks78yxh0k0ywpvic0663mv7kydy3kjpa4f5bnkgbvc"; + rev = "e181883a0932d9315cceb96b5fffb5e2ec67068e"; + sha256 = "1pfg3y1hf840pr7f6vcwldbraj2w4c2pnf7ampbgyric0q3f4708"; }; meta.homepage = "https://github.com/tpope/vim-rsi/"; }; @@ -6954,12 +7303,12 @@ let vim-signify = buildVimPluginFrom2Nix { pname = "vim-signify"; - version = "2020-08-13"; + version = "2021-01-28"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-signify"; - rev = "98c693f7a1a91b73d9232d868765b4d20af892fe"; - sha256 = "05ppj7sqp8i7qhaf6vz427nnwsnkgf9nlq3lhyhbl14cjkrhqny9"; + rev = "b2a0450e23c63b75bbeabf4f0c28f9b4b2480689"; + sha256 = "0fj9dwvkpg69v6ps56hrm0k2y4f9rvnj7hwic6ysxfx96wngfzcm"; }; meta.homepage = "https://github.com/mhinz/vim-signify/"; }; @@ -7014,12 +7363,12 @@ let vim-smoothie = buildVimPluginFrom2Nix { pname = "vim-smoothie"; - version = "2020-12-25"; + version = "2021-01-17"; src = fetchFromGitHub { owner = "psliwka"; repo = "vim-smoothie"; - rev = "1f5ee84b789384a273b3e27b6a5a7e2f54dbc30e"; - sha256 = "0977qb31hgss38g01m7ikx3qdqial3c7zw9cv72k7rnmcgy761wz"; + rev = "f83a157552a3bf393a7c034df1d21e3555123a4c"; + sha256 = "090rl4mfww5rmv04v25f58jfv3yx23bwi0pijkwxr442yhbg3rg2"; }; meta.homepage = "https://github.com/psliwka/vim-smoothie/"; }; @@ -7050,24 +7399,24 @@ let vim-snipmate = buildVimPluginFrom2Nix { pname = "vim-snipmate"; - version = "2021-01-06"; + version = "2021-01-22"; src = fetchFromGitHub { owner = "garbas"; repo = "vim-snipmate"; - rev = "51168d7dc184c8234e692cd66e89bc7f95e35d72"; - sha256 = "1psxnv6y690nx6g3msyxw8gm6z16gxdn92rlngpjirgs513kigin"; + rev = "cbec960ab558b20281c0634b9b1a45fb16aaf638"; + sha256 = "1k35rh5gq8lv67qx3l31xvl4iz7rlpybls7pwhsbmz4m598w03bm"; }; meta.homepage = "https://github.com/garbas/vim-snipmate/"; }; vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2021-01-07"; + version = "2021-01-30"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "d43498c949a3acf297fd74397a3bc165033f2028"; - sha256 = "1q0b3xsr1br172n6mj5bfza2lcacznlnwk2sgasxz8bkdq1rk6mi"; + rev = "adff0bf675e17d5b94ec7d10b5cd8a0dd74a61b0"; + sha256 = "0yvk6d147rvp8gwsbls39dp3qblmkk0wz5prrx3k5j3dlh5l7fcp"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -7206,12 +7555,12 @@ let vim-SyntaxRange = buildVimPluginFrom2Nix { pname = "vim-SyntaxRange"; - version = "2020-08-18"; + version = "2021-01-16"; src = fetchFromGitHub { owner = "inkarkat"; repo = "vim-SyntaxRange"; - rev = "602316468bc044e047db88f50157b61fa00b65cb"; - sha256 = "0zrrvd9xrivx61fiz799mdbwdzl7damdgm6i9h0sl1v95hclhi3i"; + rev = "3a7fd9ff50fabafe61df12522ed2f275c8e2f45e"; + sha256 = "1b5xyacbn87z8wkacjpnjk82xmxzivlb111427kwb5kxxdh4w7gq"; }; meta.homepage = "https://github.com/inkarkat/vim-SyntaxRange/"; }; @@ -7279,12 +7628,12 @@ let vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2021-01-03"; + version = "2021-01-28"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "d170b48bd167ff06ac83d71834135f42bf4dad4a"; - sha256 = "0pqh5zqn11fv0653zdkiad066clw29amhdqnm5nz1rcx8vmpparq"; + rev = "77d0b89fe5648d0881e8506d1949a9412201772b"; + sha256 = "14ny5gap1bij5fdwnxgwjpmjnw0xpydnjvvsf6525hbipxp258fr"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -7519,12 +7868,12 @@ let vim-vinegar = buildVimPluginFrom2Nix { pname = "vim-vinegar"; - version = "2020-06-27"; + version = "2021-01-25"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-vinegar"; - rev = "5fee9d230ec4a6a16c45f2c71482595e4d9a67bd"; - sha256 = "14n0mnj1lmk3bmhm0knipsw120dlxpsd98fimmchw0kd80vpph41"; + rev = "5f48edf4dcc130ae4a658541c0d6f72a558bc70d"; + sha256 = "195l6ly7ry8721rlkcp9103czvfcmqifbgbibdqdi3pjmaafrb9l"; }; meta.homepage = "https://github.com/tpope/vim-vinegar/"; }; @@ -7543,12 +7892,12 @@ let vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2021-01-06"; + version = "2021-01-29"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "d95d4c31a7919f58e9bb89bfc0c3a272461d782d"; - sha256 = "1xnixwq6rddvs0za76sic3sf5fk0v10cdrsyaz3d6y0g0qmv9cz0"; + rev = "4ca5978e327a8bc021ffd28fd2328ca8ce353305"; + sha256 = "1a2p5ij2gpkcn5jjwg6bna9gxmrdpg49ch6c52grzwzyw2lz2fjw"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -7567,12 +7916,12 @@ let vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2021-01-07"; + version = "2021-01-29"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "5917d944b259baab85c9c249a8be33a82cd033d3"; - sha256 = "0gj5qjrb31j93vv8wpqlhdpsgrnkwaxvhvslkjj9m3fnx34gqvdv"; + rev = "3e79f6333c045c39588293664cc77f89d18a62e8"; + sha256 = "053vp6mnj2daipfwy68168iadvng7w0xj1rg1mfsp83dws3x6g8y"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; @@ -7675,12 +8024,12 @@ let vim-yaml = buildVimPluginFrom2Nix { pname = "vim-yaml"; - version = "2020-01-30"; + version = "2021-01-14"; src = fetchFromGitHub { owner = "stephpy"; repo = "vim-yaml"; - rev = "8fc9136a9c3f64b3e65bb6170391f9daf2c23056"; - sha256 = "08bg7mxvgrl070m0kk4rmain7h3rv712jj6lk9l808cfjzaw9343"; + rev = "dce19542d5ec1663183b0f6844ec663b5d1f3d24"; + sha256 = "18xpdl86zsnmrc1w8wccx9acwjvgij2wpsg7f6dpnxx70c07g3ig"; }; meta.homepage = "https://github.com/stephpy/vim-yaml/"; }; @@ -7831,12 +8180,12 @@ let vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2021-01-09"; + version = "2021-01-10"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "5303de81954b854161dffb76da37f8508c9c1476"; - sha256 = "0xkgirbb2rw4b0h4qdv8f2lsvadqcyqrclxd8a3i8r2dc4xdgp3p"; + rev = "52eff3265181bbbe5338818dc5bc196e234cea45"; + sha256 = "1j4f3762zpw4qvqiyrq1ym4lk78w3r93ya70id7g6w4pviaqcv1j"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -7844,12 +8193,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-01-08"; + version = "2021-02-01"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "7806f0f5e1615d4ce9cef6b7edfb6ec6b1b7e666"; - sha256 = "0j1b1lf8y58jqp4r9vjw266nxlf38gz509qzaxp3n0sb4svg93pw"; + rev = "0bc7c9c5f8376978ea2667f9fb54c293921183cc"; + sha256 = "10k7265iwn7pr567g0kl159xwi7zjkjhal62c0n0d98akzdi4wbi"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -7892,12 +8241,12 @@ let vista-vim = buildVimPluginFrom2Nix { pname = "vista-vim"; - version = "2021-01-01"; + version = "2021-02-02"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "691fbce5fa1473c64035fba6e3c7b3876a99cb58"; - sha256 = "0xx06s8syqs3a5b5711zgbjbzqz17pk66vzcazhq08bqgys21alr"; + rev = "5e5f89f1c02579f1587475e0671cf0fe4b1bfeaf"; + sha256 = "11h27vm0gi4lxf68dwnsr86ch6f0kyglfzg5a0i6av9mlsw7fj9z"; }; meta.homepage = "https://github.com/liuchengxu/vista.vim/"; }; @@ -8012,12 +8361,12 @@ let yats-vim = buildVimPluginFrom2Nix { pname = "yats-vim"; - version = "2021-01-02"; + version = "2021-01-21"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; repo = "yats.vim"; - rev = "9039d2421b8fe4c70b743d2c28df935290026dca"; - sha256 = "1yv46b041340jq4s0471w5l1ryikkczp09rsnxh0piyp7fqmb0qh"; + rev = "6104b30b32732e367266f06ecf6e817df32ac1b9"; + sha256 = "0r8asbc387mmdiignr862gz4xd590c6rhp3ff78v7z7rn94dnamd"; fetchSubmodules = true; }; meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/"; @@ -8072,14 +8421,26 @@ let meta.homepage = "https://github.com/jnurmine/zenburn/"; }; + zephyr-nvim = buildVimPluginFrom2Nix { + pname = "zephyr-nvim"; + version = "2021-01-13"; + src = fetchFromGitHub { + owner = "glepnir"; + repo = "zephyr-nvim"; + rev = "bc1a7584b435b9921e245c3621ab7524be370b2d"; + sha256 = "0fvgky7i6m5n4h4l73xdisxhpcc8cv9pq8jrvz571gmyjsh1rrrv"; + }; + meta.homepage = "https://github.com/glepnir/zephyr-nvim/"; + }; + zig-vim = buildVimPluginFrom2Nix { pname = "zig-vim"; - version = "2020-12-31"; + version = "2021-01-19"; src = fetchFromGitHub { owner = "ziglang"; repo = "zig.vim"; - rev = "ef331a76f0d660a67504e1cd0d981c345db3607f"; - sha256 = "0976539h1zsxrnihp5x5lvra12iwvjbbrl5nw6f914yh09jqbgjf"; + rev = "17170fd1c31f00132a91fb1598d0f3df5927e28d"; + sha256 = "0k8s5via1frpgdb94kgsk29g7h6fjq3cazyfa8zww7vra418acsh"; }; meta.homepage = "https://github.com/ziglang/zig.vim/"; }; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 48c86ed5b48..a7ee9d2db1f 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -2,7 +2,7 @@ , python, cmake, meson, vim, ruby , which, fetchFromGitHub, fetchgit, fetchurl, fetchzip, fetchpatch , llvmPackages, rustPlatform, buildGoModule -, pkgconfig, curl, openssl, libgit2, libiconv +, pkg-config, curl, openssl, libgit2, libiconv , xkb-switch, fzf, skim, stylish-haskell , python3, boost, icu, ncurses , ycmd, rake @@ -14,6 +14,8 @@ , buildVimPluginFrom2Nix , nodePackages , dasht +, sqlite +, code-minimap # deoplete-khard dependency , khard @@ -73,11 +75,11 @@ self: super: { src = LanguageClient-neovim-src; cargoSha256 = "0mf94j85awdcqa6cyb89bipny9xg13ldkznjf002fq747f55my2a"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; # FIXME: Use impure version of CoreFoundation because of missing symbols. # Undefined symbols for architecture x86_64: "_CFURLResourceIsReachable" - preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.isDarwin '' export NIX_LDFLAGS="-F${CoreFoundation}/Library/Frameworks -framework CoreFoundation $NIX_LDFLAGS" ''; }; @@ -180,8 +182,8 @@ self: super: { meta = { description = "Address-completion for khard via deoplete"; homepage = "https://github.com/nicoe/deoplete-khard"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ jorsn ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jorsn ]; }; }); @@ -234,7 +236,7 @@ self: super: { meta = with lib; { description = "Discord rich presence for Vim"; homepage = "https://github.com/hugolgst/vimsence"; - maintainers = with stdenv.lib.maintainers; [ hugolgst ]; + maintainers = with lib.maintainers; [ hugolgst ]; }; }); @@ -242,10 +244,19 @@ self: super: { dependencies = with super; [ webapi-vim ]; }); + minimap-vim = super.minimap-vim.overrideAttrs(old: { + preFixup = '' + substituteInPlace $out/share/vim-plugins/minimap-vim/plugin/minimap.vim \ + --replace "code-minimap" "${code-minimap}/bin/code-minimap" + substituteInPlace $out/share/vim-plugins/minimap-vim/bin/minimap_generator.sh \ + --replace "code-minimap" "${code-minimap}/bin/code-minimap" + ''; + }); + meson = buildVimPluginFrom2Nix { inherit (meson) pname version src; preInstall = "cd data/syntax-highlighting/vim"; - meta.maintainers = with stdenv.lib.maintainers; [ vcunat ]; + meta.maintainers = with lib.maintainers; [ vcunat ]; }; ncm2 = super.ncm2.overrideAttrs(old: { @@ -285,6 +296,13 @@ self: super: { dependencies = [ self.skim ]; }); + sql-nvim = super.sql-nvim.overrideAttrs(old: { + postPatch = '' + substituteInPlace lua/sql/defs.lua \ + --replace "vim.g.sql_clib_path or" "vim.g.sql_clib_path or '${sqlite.out}/lib/libsqlite3.so' or" + ''; + }); + sved = let # we put the script in its own derivation to benefit the magic of wrapGAppsHook svedbackend = stdenv.mkDerivation { @@ -325,7 +343,7 @@ self: super: { description = "Vim-Improved eMACS: Emacs emulation plugin for Vim"; homepage = "http://algorithm.com.au/code/vimacs"; license = licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ millerjason ]; + maintainers = with lib.maintainers; [ millerjason ]; }; }); @@ -334,7 +352,7 @@ self: super: { }); vim-addon-manager = super.vim-addon-manager.overrideAttrs(old: { - buildInputs = stdenv.lib.optional stdenv.isDarwin Cocoa; + buildInputs = lib.optional stdenv.isDarwin Cocoa; }); vim-addon-actions = super.vim-addon-actions.overrideAttrs(old: { @@ -395,6 +413,16 @@ self: super: { passthru.python3Dependencies = ps: with ps; [ beancount ]; }); + vim-closer = super.vim-closer.overrideAttrs(old: { + patches = [ + # Fix duplicate tag in doc + (fetchpatch { + url = "https://github.com/rstacruz/vim-closer/commit/a504be8c7050e41b7dfc50c2362948e2cf7c5422.patch"; + sha256 = "065q30d913fm3pc7r5y53wmnb7q7bhv21qxavm65bkb91242d409"; + }) + ]; + }); + vim-codefmt = super.vim-codefmt.overrideAttrs(old: { dependencies = with super; [ vim-maktaba ]; }); @@ -571,7 +599,7 @@ self: super: { buildInputs = [ python3.pkgs.jedi ]; meta = { description = "code-completion for python using python-jedi"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }); @@ -592,7 +620,7 @@ self: super: { propagatedBuildInputs = [ gnome3.zenity ]; meta = { description = "Simple color selector/picker plugin"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }; }); @@ -622,7 +650,7 @@ self: super: { ln -s ${hexokinase}/bin/hexokinase $target/hexokinase/hexokinase ''; - meta.platforms = stdenv.lib.platforms.all; + meta.platforms = lib.platforms.all; }); vim-clap = super.vim-clap.overrideAttrs(old: { @@ -632,25 +660,25 @@ self: super: { src = old.src; nativeBuildInputs = [ - pkgconfig + pkg-config ]; buildInputs = [ openssl - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ CoreServices curl libgit2 libiconv ]; - cargoSha256 = "1738hvqzwr4h1bigsqffc6alkzvir8s6f7mr0xyp21qbf5qkxmq2"; + cargoSha256 = "mq5q+cIWXDMeoZfumX1benulrP/AWKZnd8aI0OzY55c="; }; in '' ln -s ${maple-bin}/bin/maple $target/bin/maple ''; - meta.platforms = stdenv.lib.platforms.all; + meta.platforms = lib.platforms.all; }); completion-tabnine = super.completion-tabnine.overrideAttrs(old: { @@ -661,6 +689,35 @@ self: super: { ln -s ${tabnine}/bin/TabNine $target/binaries/TabNine_$(uname -s) ''; }); + + telescope-frecency-nvim = super.telescope-frecency-nvim.overrideAttrs(old: { + dependencies = [ self.sql-nvim ]; + }); + + telescope-fzy-native-nvim = super.telescope-fzy-native-nvim.overrideAttrs (old: { + preFixup = + let + fzy-lua-native-path = "deps/fzy-lua-native"; + fzy-lua-native = + stdenv.mkDerivation { + name = "fzy-lua-native"; + src = "${old.src}/${fzy-lua-native-path}"; + # remove pre-compiled binaries + preBuild = "rm -rf static/*"; + installPhase = '' + install -Dm 444 -t $out/static static/* + install -Dm 444 -t $out/lua lua/* + ''; + }; + in + '' + rm -rf $target/${fzy-lua-native-path}/* + ln -s ${fzy-lua-native}/static $target/${fzy-lua-native-path}/static + ln -s ${fzy-lua-native}/lua $target/${fzy-lua-native-path}/lua + ''; + meta.platforms = lib.platforms.all; + }); + } // ( let nodePackageNames = [ diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 2d670568ef2..cded72abf29 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -11,8 +11,8 @@ alx741/vim-stylishask amiorin/ctrlp-z andrep/vimacs andreshazard/vim-logreview -AndrewRadev/sideways.vim -AndrewRadev/splitjoin.vim +AndrewRadev/sideways.vim@main +AndrewRadev/splitjoin.vim@main andsild/peskcolor.vim andviro/flake8-vim andymass/vim-matchup @@ -79,6 +79,7 @@ deoplete-plugins/deoplete-clang deoplete-plugins/deoplete-dictionary deoplete-plugins/deoplete-go deoplete-plugins/deoplete-jedi +deoplete-plugins/deoplete-lsp deoplete-plugins/deoplete-zsh derekelkins/agda-vim derekwyatt/vim-scala @@ -132,6 +133,11 @@ gentoo/gentoo-syntax GEverding/vim-hocon gfanto/fzf-lsp.nvim@main gibiansky/vim-textobj-haskell +gioele/vim-autoswap +glepnir/galaxyline.nvim@main +glepnir/lspsaga.nvim@main +glepnir/oceanic-material +glepnir/zephyr-nvim@main glts/vim-textobj-comment godlygeek/csapprox godlygeek/tabular @@ -162,6 +168,7 @@ HerringtonDarkholme/yats.vim honza/vim-snippets hoob3rt/lualine.nvim hotwatermorning/auto-git-diff +hrsh7th/nvim-compe hrsh7th/vim-vsnip hrsh7th/vim-vsnip-integ hsanson/vim-android @@ -206,6 +213,7 @@ jnurmine/zenburn jonbri/vim-colorstepper jonsmithers/vim-html-template-literals joonty/vim-xdebug +josa42/coc-lua josa42/vim-lightline-coc joshdick/onedark.vim jpalardy/vim-slime@main @@ -233,6 +241,7 @@ justincampbell/vim-eighties justinj/vim-pico8-syntax justinmk/vim-dirvish justinmk/vim-sneak +jvirtanen/vim-hcl jvoorhis/coq.vim KabbAmine/vCoolor.vim KabbAmine/zeavim.vim @@ -249,10 +258,12 @@ kchmck/vim-coffee-script KeitaNakamura/neodark.vim keith/investigate.vim keith/swift.vim +kevinhwang91/nvim-hlslens@main kien/rainbow_parentheses.vim knubie/vim-kitty-navigator konfekt/fastfold konfekt/vim-DetectSpellLang +kosayoda/nvim-lightbulb kristijanhusak/defx-git kristijanhusak/defx-icons kristijanhusak/deoplete-phpactor @@ -272,6 +283,7 @@ leanprover/lean.vim ledger/vim-ledger lepture/vim-jinja lervag/vimtex +lewis6991/gitsigns.nvim@main lfilho/cosco.vim lifepillar/vim-mucomplete lighttiger2505/deoplete-vim-lsp @@ -285,6 +297,7 @@ LucHermitte/lh-brackets LucHermitte/lh-vim-lib ludovicchabant/vim-gutentags ludovicchabant/vim-lawrencium +lukas-reineke/indent-blankline.nvim lukaszkorecki/workflowish lumiliet/vim-twig luochen1990/rainbow @@ -329,6 +342,7 @@ mengelbrecht/lightline-bufferline metakirby5/codi.vim mfukar/robotframework-vim mfussenegger/nvim-dap +mfussenegger/nvim-jdtls mg979/vim-visual-multi mhartington/oceanic-next mhinz/vim-crates @@ -347,6 +361,7 @@ mopp/sky-color-clock.vim morhetz/gruvbox motus/pig.vim mpickering/hlint-refactor-vim +ms-jpq/chadtree@chad mtikekar/vim-bsv nanotech/jellybeans.vim natebosch/vim-lsc @@ -400,6 +415,9 @@ nvim-lua/lsp-status.nvim nvim-lua/lsp_extensions.nvim nvim-lua/plenary.nvim nvim-lua/popup.nvim +nvim-telescope/telescope-frecency.nvim +nvim-telescope/telescope-fzf-writer.nvim +nvim-telescope/telescope-fzy-native.nvim nvim-telescope/telescope.nvim nvim-treesitter/completion-treesitter nvim-treesitter/nvim-treesitter @@ -476,6 +494,7 @@ roxma/nvim-yarp roxma/vim-tmux-clipboard RRethy/vim-hexokinase RRethy/vim-illuminate +rstacruz/vim-closer rust-lang/rust.vim ryanoasis/vim-devicons ryvnf/readline.vim @@ -490,7 +509,6 @@ Shougo/context_filetype.vim Shougo/defx.nvim Shougo/denite.nvim Shougo/deol.nvim -Shougo/deoplete-lsp Shougo/deoplete.nvim Shougo/echodoc.vim Shougo/neco-syntax @@ -527,12 +545,16 @@ svermeulen/vim-subversive t9md/vim-choosewin t9md/vim-smalls takac/vim-hardtime +tami5/lispdocs.nvim +tami5/sql.nvim tbodt/deoplete-tabnine ternjs/tern_for_vim terryma/vim-expand-region terryma/vim-multiple-cursors tex/vimpreviewpandoc +Th3Whit3Wolf/one-nvim@main theHamsta/nvim-dap-virtual-text +ThePrimeagen/vim-apm thinca/vim-ft-diff_fold thinca/vim-prettyprint thinca/vim-quickrun @@ -543,7 +565,9 @@ thirtythreeforty/lessspace.vim thosakwe/vim-flutter tiagofumo/vim-nerdtree-syntax-highlight tikhomirov/vim-glsl +TimUntersberger/neogit tjdevries/nlua.nvim +tjdevries/train.nvim tmhedberg/SimpylFold tmsvg/pear-tree tmux-plugins/vim-tmux @@ -605,6 +629,10 @@ vhda/verilog_systemverilog.vim vigoux/LanguageTool.nvim vim-airline/vim-airline vim-airline/vim-airline-themes +vim-erlang/vim-erlang-compiler +vim-erlang/vim-erlang-omnicomplete +vim-erlang/vim-erlang-runtime +vim-erlang/vim-erlang-tags vim-pandoc/vim-pandoc vim-pandoc/vim-pandoc-after vim-pandoc/vim-pandoc-syntax @@ -651,9 +679,11 @@ VundleVim/Vundle.vim w0ng/vim-hybrid wakatime/vim-wakatime wannesm/wmgraphviz.vim +wbthomason/packer.nvim weirongxu/coc-explorer wellle/targets.vim wellle/tmux-complete.vim +wfxr/minimap.vim whonore/Coqtail will133/vim-dirdiff wincent/command-t @@ -668,6 +698,6 @@ Xuyuanp/nerdtree-git-plugin ycm-core/YouCompleteMe Yggdroot/indentLine Yilin-Yang/vim-markbar -yuki-ycino/ncm2-dictionary +yuki-yano/ncm2-dictionary zah/nim.vim ziglang/zig.vim diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index ee77599a3ba..fd66c48ecb2 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -1,4 +1,4 @@ -{ stdenv, vim, vimPlugins, vim_configurable, neovim, buildEnv, writeText, writeScriptBin +{ lib, stdenv, vim, vimPlugins, vim_configurable, neovim, buildEnv, writeText, writeScriptBin , nix-prefetch-hg, nix-prefetch-git , fetchFromGitHub, runtimeShell }: @@ -150,7 +150,7 @@ vim_with_plugins can be installed like any other application within Nix. let - inherit (stdenv) lib; + inherit lib; # make sure a plugin is a derivation and its dependencies are derivations. If # plugin already is a derivation, this is a no-op. If it is a string, it is @@ -373,7 +373,7 @@ rec { gvimExecutableName, }: let - rcOption = o: file: stdenv.lib.optionalString (file != null) "-${o} ${file}"; + rcOption = o: file: lib.optionalString (file != null) "-${o} ${file}"; vimWrapperScript = writeScriptBin vimExecutableName '' #!${runtimeShell} exec ${vimExecutable} ${rcOption "u" vimrcFile} ${rcOption "U" gvimrcFile} "$@" @@ -450,7 +450,7 @@ rec { vim_with_vim2nix = vim_configurable.customize { name = "vim"; vimrcConfig.vam.pluginDictionaries = [ "vim-addon-vim2nix" ]; }; - inherit (import ./build-vim-plugin.nix { inherit stdenv rtpPath vim; }) buildVimPlugin buildVimPluginFrom2Nix; + inherit (import ./build-vim-plugin.nix { inherit lib stdenv rtpPath vim; }) buildVimPlugin buildVimPluginFrom2Nix; # used to figure out which python dependencies etc. neovim needs requiredPlugins = { diff --git a/pkgs/misc/vscode-extensions/cpptools/default.nix b/pkgs/misc/vscode-extensions/cpptools/default.nix index bb547b3d34d..188da860530 100644 --- a/pkgs/misc/vscode-extensions/cpptools/default.nix +++ b/pkgs/misc/vscode-extensions/cpptools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, vscode-utils +{ lib, vscode-utils , fetchurl, unzip , mono, writeScript, runtimeShell , jq, clang-tools diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 1e151db481a..604a47e1ed4 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1,4 +1,4 @@ -{ stdenv, config, lib, callPackage, vscode-utils, nodePackages,llvmPackages_8, llvmPackages_latest }: +{ config, lib, callPackage, vscode-utils, nodePackages,llvmPackages_8, llvmPackages_latest }: let inherit (vscode-utils) buildVscodeMarketplaceExtension; @@ -10,7 +10,7 @@ let # So an extension's attribute name should be of the form: # "${mktplcRef.publisher}.${mktplcRef.name}". # - baseExtensions = self: stdenv.lib.mapAttrs (_n: stdenv.lib.recurseIntoAttrs) + baseExtensions = self: lib.mapAttrs (_n: lib.recurseIntoAttrs) { a5huynh.vscode-ron = buildVscodeMarketplaceExtension { mktplcRef = { @@ -20,7 +20,7 @@ let sha256 = "0d3p50mhqp550fmj662d3xklj14gvzvhszm2hlqvx4h28v222z97"; }; meta = { - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -32,7 +32,7 @@ let sha256 = "1mz0h5zd295i73hbji9ivla8hx02i4yhqcv6l4r23w3f07ql3i8h"; }; meta = { - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -59,7 +59,7 @@ let buildInputs = [ nodePackages.pyright ]; meta = { - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; }; }; @@ -99,6 +99,23 @@ let }; }; + CoenraadS.bracket-pair-colorizer = buildVscodeMarketplaceExtension { + meta = with lib; { + changelog = "https://marketplace.visualstudio.com/items/CoenraadS.bracket-pair-colorizer/changelog"; + description = "A customizable extension for colorizing matching brackets"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=CoenraadS.bracket-pair-colorizer"; + homepage = "https://github.com/CoenraadS/BracketPair"; + license = licenses.mit; + maintainers = with maintainers; [ superherointj ]; + }; + mktplcRef = { + name = "bracket-pair-colorizer"; + publisher = "CoenraadS"; + version = "1.0.61"; + sha256 = "0r3bfp8kvhf9zpbiil7acx7zain26grk133f0r0syxqgml12i652"; + }; + }; + coenraads.bracket-pair-colorizer-2 = buildVscodeMarketplaceExtension { mktplcRef = { name = "bracket-pair-colorizer-2"; @@ -111,6 +128,18 @@ let }; }; + davidanson.vscode-markdownlint = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-markdownlint"; + publisher = "DavidAnson"; + version = "0.38.0"; + sha256 = "0d6hbsjrx1j8wrmfnvdwsa7sci1brplgxwkmy6sp74va7zxfjnqv"; + }; + meta = with lib; { + license = licenses.mit; + }; + }; + dhall.dhall-lang = buildVscodeMarketplaceExtension { mktplcRef = { name = "dhall-lang"; @@ -118,7 +147,7 @@ let version = "0.0.4"; sha256 = "0sa04srhqmngmw71slnrapi2xay0arj42j4gkan8i11n7bfi1xpf"; }; - meta = { license = stdenv.lib.licenses.mit; }; + meta = { license = lib.licenses.mit; }; }; dhall.vscode-dhall-lsp-server = buildVscodeMarketplaceExtension { @@ -128,7 +157,87 @@ let version = "0.0.4"; sha256 = "1zin7s827bpf9yvzpxpr5n6mv0b5rhh3civsqzmj52mdq365d2js"; }; - meta = { license = stdenv.lib.licenses.mit; }; + meta = { license = lib.licenses.mit; }; + }; + + donjayamanne.githistory = buildVscodeMarketplaceExtension { + meta = with lib; { + changelog = "https://marketplace.visualstudio.com/items/donjayamanne.githistory/changelog"; + description = "View git log, file history, compare branches or commits"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=donjayamanne.githistory"; + homepage = "https://github.com/DonJayamanne/gitHistoryVSCode/"; + license = licenses.mit; + maintainers = with maintainers; [ superherointj ]; + }; + mktplcRef = { + name = "githistory"; + publisher = "donjayamanne"; + version = "0.6.14"; + sha256 = "11x116hzqnhgbryp2kqpki1z5mlnwxb0ly9r1513m5vgbisrsn0i"; + }; + }; + + eamodio.gitlens = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "gitlens"; + publisher = "eamodio"; + version = "11.1.3"; + sha256 = "sha256-hqJg3jP4bbXU4qSJOjeKfjkPx61yPDMsQdSUVZObK/U="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + + elmtooling.elm-ls-vscode = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "elm-ls-vscode"; + publisher = "Elmtooling"; + version = "2.0.1"; + sha256 = "06x5ld2r1hzns2s052mvhmfiaawjzcn0jf5lkfprhmrkxnmfdd43"; + }; + meta = with lib; { + changelog = "https://marketplace.visualstudio.com/items/Elmtooling.elm-ls-vscode/changelog"; + description = "Elm language server"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=Elmtooling.elm-ls-vscode"; + homepage = "https://github.com/elm-tooling/elm-language-client-vscode"; + license = licenses.mit; + maintainers = with maintainers; [ mcwitt ]; + }; + }; + + esbenp.prettier-vscode = buildVscodeMarketplaceExtension { + meta = with lib; { + changelog = "https://marketplace.visualstudio.com/items/esbenp.prettier-vscode/changelog"; + description = "Code formatter using prettier"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode"; + homepage = "https://github.com/prettier/prettier-vscode"; + license = licenses.mit; + maintainers = with maintainers; [ superherointj ]; + }; + mktplcRef = { + name = "prettier-vscode"; + publisher = "esbenp"; + version = "5.8.0"; + sha256 = "0h7wc4pffyq1i8vpj4a5az02g2x04y7y1chilmcfmzg2w42xpby7"; + }; + }; + + file-icons.file-icons = buildVscodeMarketplaceExtension { + meta = with lib; { + changelog = "https://marketplace.visualstudio.com/items/file-icons.file-icons/changelog"; + description = "File-specific icons in VSCode for improved visual grepping."; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=file-icons.file-icons"; + homepage = "https://github.com/file-icons/vscode"; + license = licenses.mit; + maintainers = with maintainers; [ superherointj ]; + }; + mktplcRef = { + name = "file-icons"; + publisher = "file-icons"; + version = "1.0.28"; + sha256 = "1lyx0l42xhi2f3rdnjddc3mw7m913kjnchawi98i6vqsx3dv7091"; + }; }; formulahendry.auto-close-tag = buildVscodeMarketplaceExtension { @@ -139,7 +248,7 @@ let sha256 = "058jgmllqb0j6gg5anghdp35nkykii28igfcwqgh4bp10pyvspg0"; }; meta = { - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -151,7 +260,40 @@ let sha256 = "0cqg9mxkyf41brjq2c764w42lzyn6ffphw6ciw7xnqk1h1x8wwbs"; }; meta = { - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; + }; + }; + + freebroccolo.reasonml = buildVscodeMarketplaceExtension { + meta = with lib; { + changelog = "https://marketplace.visualstudio.com/items/freebroccolo.reasonml/changelog"; + description = "Reason support for Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=freebroccolo.reasonml"; + homepage = "https://github.com/reasonml-editor/vscode-reasonml"; + license = licenses.asl20; + maintainers = with maintainers; [ superherointj ]; + }; + mktplcRef = { + name = "reasonml"; + publisher = "freebroccolo"; + version = "1.0.38"; + sha256 = "1nay6qs9vcxd85ra4bv93gg3aqg3r2wmcnqmcsy9n8pg1ds1vngd"; + }; + }; + + github.github-vscode-theme = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "github-vscode-theme"; + publisher = "github"; + version = "1.1.5"; + sha256 = "10f0098cce026d1f0c855fb7a66ea60b5d8acd2b76126ea94fe7361e49cd9ed2"; + }; + meta = with lib; { + description = "GitHub theme for VS Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=GitHub.github-vscode-theme"; + homepage = "https://github.com/primer/github-vscode-theme"; + license = licenses.mit; + maintainers = with maintainers; [ hugolgst ]; }; }; @@ -163,7 +305,31 @@ let sha256 = "sha256-b2Wa3TULQQnBm1/xnDCB9SZjE+Wxz5wBttjDEtf8qlE="; }; meta = { - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; + }; + }; + + graphql.vscode-graphql = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-graphql"; + publisher = "GraphQL"; + version = "0.3.13"; + sha256 = "sha256-JjEefVHQUYidUsr8Ce/dh7hLDm21WkyS+2RwsXHoY04="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + + gruntfuggly.todo-tree = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "todo-tree"; + publisher = "Gruntfuggly"; + version = "0.0.196"; + sha256 = "1l4f290018f2p76q6hn2b2injps6wz65as7dm537wrsvsivyg2qz"; + }; + meta = with lib; { + license = licenses.mit; }; }; @@ -179,6 +345,18 @@ let }; }; + hookyqr.beautify = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "beautify"; + publisher = "HookyQR"; + version = "1.5.0"; + sha256 = "1c0kfavdwgwham92xrh0gnyxkrl9qlkpv39l1yhrldn8vd10fj5i"; + }; + meta = with lib; { + license = licenses.mit; + }; + }; + ibm.output-colorizer = buildVscodeMarketplaceExtension { mktplcRef = { name = "output-colorizer"; @@ -204,14 +382,43 @@ let }; jnoortheen.nix-ide = buildVscodeMarketplaceExtension { + meta = with lib; { + changelog = "https://marketplace.visualstudio.com/items/jnoortheen.nix-ide/changelog"; + description = "Nix language support with formatting and error report"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=jnoortheen.nix-ide"; + homepage = "https://github.com/jnoortheen/vscode-nix-ide"; + license = licenses.mit; + maintainers = with maintainers; [ superherointj ]; + }; mktplcRef = { name = "nix-ide"; publisher = "jnoortheen"; version = "0.1.7"; sha256 = "1bw4wyq9abimxbhl7q9g8grvj2ax9qqq6mmqbiqlbsi2arvk0wrm"; }; - meta = { - license = stdenv.lib.licenses.mit; + }; + + jock.svg = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "svg"; + publisher = "jock"; + version = "1.4.4"; + sha256 = "0kn2ic7pgbd4rbvzpsxfwyiwxa1iy92l0h3jsppxc8gk8xbqm2nc"; + }; + meta = with lib; { + license = licenses.mit; + }; + }; + + jpoissonnier.vscode-styled-components = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-styled-components"; + publisher = "jpoissonnier"; + version = "1.4.1"; + sha256 = "sha256-ojbeuYBCS+DjF5R0aLuBImzoSOb8mXw1s0Uh0CzggzE="; + }; + meta = { + license = lib.licenses.mit; }; }; @@ -223,7 +430,19 @@ let sha256 = "0lxp8xz17ciy93nj4lzxqvz71vw1zdyamrnh2n792yair8890rr6"; }; meta = { - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; + }; + }; + + mikestead.dotenv = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "dotenv"; + publisher = "mikestead"; + version = "1.0.1"; + sha256 = "sha256-dieCzNOIcZiTGu4Mv5zYlG7jLhaEsJR05qbzzzQ7RWc="; + }; + meta = { + license = lib.licenses.mit; }; }; @@ -235,7 +454,7 @@ let sha256 = "1ks6z8wsxmlfhiwa51f7d6digvw11dlxc7mja3hankgxcf5dyj31"; }; meta = { - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -247,7 +466,7 @@ let sha256 = "0w5mijs4ll5qjkpyw7qpn1k40pq8spm0b3q72x150ydbcini5hxw"; }; meta = { - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -259,7 +478,7 @@ let sha256 = "0n59whmcrx8946xix6skvc50f2vsc85ckvn8cs06w9mqmymm1q0s"; }; meta = { - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -271,7 +490,7 @@ let sha256 = "12a4phl1pddsajy3n0ld6rp607iy0pif6pqrs6ljbg2x97fyra28"; }; meta = { - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -283,6 +502,18 @@ let extractNuGet = callPackage ./python/extract-nuget.nix { }; }; + msjsdiag.debugger-for-chrome = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "debugger-for-chrome"; + publisher = "msjsdiag"; + version = "4.12.11"; + sha256 = "sha256-9i3TgCFThnFF5ccwzS4ATj5c2Xoe/4tDFGv75jJxeQ4="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + naumovs.color-highlight = buildVscodeMarketplaceExtension { mktplcRef = { name = "color-highlight"; @@ -291,7 +522,7 @@ let sha256 = "1syzf43ws343z911fnhrlbzbx70gdn930q67yqkf6g0mj8lf2za2"; }; meta = { - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -303,12 +534,41 @@ let sha256 = "046kdk73a5xbrwq16ff0l64271c6q6ygjvxaph58z29gyiszfkig"; }; meta = { - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; + }; + }; + + rubymaniac.vscode-paste-and-indent = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-paste-and-indent"; + publisher = "Rubymaniac"; + version = "0.0.8"; + sha256 = "0fqwcvwq37ndms6vky8jjv0zliy6fpfkh8d9raq8hkinfxq6klgl"; + }; + meta = with lib; { + license = licenses.mit; }; }; matklad.rust-analyzer = callPackage ./rust-analyzer {}; + ocamllabs.ocaml-platform = buildVscodeMarketplaceExtension { + meta = with lib; { + changelog = "https://marketplace.visualstudio.com/items/ocamllabs.ocaml-platform/changelog"; + description = "Official OCaml Support from OCamlLabs"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ocamllabs.ocaml-platform"; + homepage = "https://github.com/ocamllabs/vscode-ocaml-platform"; + license = licenses.isc; + maintainers = with maintainers; [ superherointj ]; + }; + mktplcRef = { + name = "ocaml-platform"; + publisher = "ocamllabs"; + version = "1.5.1"; + sha256 = "0jkxpcrbr8xmwfl8jphmarjz2jk54hvmc24ww89d4bgx1awayqfh"; + }; + }; + pkief.material-icon-theme = buildVscodeMarketplaceExtension { mktplcRef = { name = "material-icon-theme"; @@ -317,7 +577,7 @@ let sha256 = "1m9mis59j9xnf1zvh67p5rhayaa9qxjiw9iw847nyl9vsy73w8ya"; }; meta = { - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -329,7 +589,7 @@ let sha256 = "1r4kg4slgxncdppr4fn7i5vfhvzcg26ljia2r97n6wvwn8534vs9"; }; meta = { - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -341,7 +601,7 @@ let sha256 = "0nrj32a7a86vwc9gfh748xs3mmfwbc304dp7nks61f0lx8b4wzxw"; }; meta = { - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -349,11 +609,11 @@ let mktplcRef = { name = "metals"; publisher = "scalameta"; - version = "1.9.7"; - sha256 = "0v599yssvk358gxfxnyzzkyk0y5krsbp8n4rkp9wb2ncxqsqladr"; + version = "1.9.10"; + sha256 = "1afmqzlw3bl9bv59l9b2jrljhbq8djb7vl8rjv58c5wi7nvm2qab"; }; meta = { - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }; }; @@ -365,7 +625,7 @@ let sha256 = "1xk7ayv590hsm3scqpyh6962kvgdlinnpkx0vapr7vs4y08dx72f"; }; meta = { - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -381,6 +641,30 @@ let }; }; + spywhere.guides = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "guides"; + publisher = "spywhere"; + version = "0.9.3"; + sha256 = "1kvsj085w1xax6fg0kvsj1cizqh86i0pkzpwi0sbfvmcq21i6ghn"; + }; + meta = with lib; { + license = licenses.mit; + }; + }; + + streetsidesoftware.code-spell-checker = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "code-spell-checker"; + publisher = "streetsidesoftware"; + version = "1.10.2"; + sha256 = "1ll046rf5dyc7294nbxqk5ya56g2bzqnmxyciqpz2w5x7j75rjib"; + }; + meta = with lib; { + license = licenses.mit; + }; + }; + tamasfe.even-better-toml = buildVscodeMarketplaceExtension { mktplcRef = { name = "even-better-toml"; @@ -389,7 +673,7 @@ let sha256 = "16x2y58hkankazpwm93j8lqdn3mala7iayck548kki9zx4qrhhck"; }; meta = { - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -401,7 +685,7 @@ let sha256 = "0l4wibsjnlbzbrl1wcj18vnm1q4ygvxmh347jvzziv8f1l790qjl"; }; meta = { - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -417,7 +701,7 @@ let sha256 = "1albwz3lc9i20if77inm1ipwws8apigvx24rbag3d1h3p4vwda49"; }; meta = { - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -431,7 +715,7 @@ let sha256 = "1smzsgcrkhghbnpy51gp28kh74l7y4s2m8pfxabb4ffb751254j0"; }; meta = { - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; diff --git a/pkgs/misc/vscode-extensions/remote-ssh/default.nix b/pkgs/misc/vscode-extensions/remote-ssh/default.nix index 575b9ed490c..746bb4608ab 100644 --- a/pkgs/misc/vscode-extensions/remote-ssh/default.nix +++ b/pkgs/misc/vscode-extensions/remote-ssh/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , vscode-utils , useLocalExtensions ? false}: # Note that useLocalExtensions requires that vscode-server is not running @@ -21,7 +21,7 @@ let ln -s ''$localNodePath ''$f fi fi - ${stdenv.lib.optionalString useLocalExtensions '' + ${lib.optionalString useLocalExtensions '' # Use local extensions if [ -d ~/.vscode/extensions ]; then if ! test -L "~/.vscode-server/extensions"; then diff --git a/pkgs/misc/vscode-extensions/rust-analyzer/default.nix b/pkgs/misc/vscode-extensions/rust-analyzer/default.nix index d19027fa576..0136bf4e5b1 100644 --- a/pkgs/misc/vscode-extensions/rust-analyzer/default.nix +++ b/pkgs/misc/vscode-extensions/rust-analyzer/default.nix @@ -1,5 +1,5 @@ # Update script: pkgs/development/tools/rust/rust-analyzer/update.sh -{ lib, stdenv, vscode-utils, jq, rust-analyzer, nodePackages +{ lib, vscode-utils, jq, rust-analyzer, nodePackages , setDefaultServerPath ? true }: diff --git a/pkgs/misc/vscode-extensions/update_installed_exts.sh b/pkgs/misc/vscode-extensions/update_installed_exts.sh index fdbc14fb264..659ed8da791 100755 --- a/pkgs/misc/vscode-extensions/update_installed_exts.sh +++ b/pkgs/misc/vscode-extensions/update_installed_exts.sh @@ -8,7 +8,7 @@ function fail() { exit 1 } -# Helper to clean up after ourself if we're killed by SIGINT +# Helper to clean up after ourselves if we're killed by SIGINT. function clean_up() { TDIR="${TMPDIR:-/tmp}" echo "Script killed, cleaning up tmpdirs: $TDIR/vscode_exts_*" >&2 @@ -18,7 +18,7 @@ function clean_up() { function get_vsixpkg() { N="$1.$2" - # Create a tempdir for the extension download + # Create a tempdir for the extension download. EXTTMP=$(mktemp -d -t vscode_exts_XXXXXXXX) URL="https://$1.gallery.vsassets.io/_apis/public/gallery/publisher/$1/extension/$2/latest/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage" @@ -32,7 +32,7 @@ function get_vsixpkg() { # Clean up. rm -Rf "$EXTTMP" - # I don't like 'rm -Rf' lurking in my scripts but this seems appropriate + # I don't like 'rm -Rf' lurking in my scripts but this seems appropriate. cat <<-EOF { @@ -44,7 +44,7 @@ function get_vsixpkg() { EOF } -# See if can find our code binary somewhere. +# See if we can find our `code` binary somewhere. if [ $# -ne 0 ]; then CODE=$1 else diff --git a/pkgs/misc/vscode-extensions/vscodeExts2nix.nix b/pkgs/misc/vscode-extensions/vscodeExts2nix.nix index 58ad5866c93..58cbe663c90 100644 --- a/pkgs/misc/vscode-extensions/vscodeExts2nix.nix +++ b/pkgs/misc/vscode-extensions/vscodeExts2nix.nix @@ -18,7 +18,7 @@ writeShellScriptBin "vscodeExts2nix" '' for line in $(${vscode}/bin/code --list-extensions --show-versions \ ${lib.optionalString (extensionsToIgnore != []) '' - | grep -v -i '^\(${lib.concatMapStringsSep "\\|" (e : ''${e.publisher}.${e.name}'') extensionsToIgnore}\)' + | grep -v -i '^\(${lib.concatMapStringsSep "\\|" (e : "${e.publisher}.${e.name}") extensionsToIgnore}\)' ''} ) ; do [[ $line =~ ([^.]*)\.([^@]*)@(.*) ]] @@ -26,7 +26,7 @@ writeShellScriptBin "vscodeExts2nix" '' publisher=''${BASH_REMATCH[1]} version=''${BASH_REMATCH[3]} - extensions="${lib.concatMapStringsSep "." (e : ''${e.publisher}${e.name}@${e.sha256}'') extensions}" + extensions="${lib.concatMapStringsSep "." (e : "${e.publisher}${e.name}@${e.sha256}") extensions}" reCurrentExt=$publisher$name"@([^.]*)" if [[ $extensions =~ $reCurrentExt ]]; then sha256=''${BASH_REMATCH[1]} diff --git a/pkgs/misc/vscode-extensions/vscodeWithConfiguration.nix b/pkgs/misc/vscode-extensions/vscodeWithConfiguration.nix index e20c631f8c0..39479d7c2f2 100644 --- a/pkgs/misc/vscode-extensions/vscodeWithConfiguration.nix +++ b/pkgs/misc/vscode-extensions/vscodeWithConfiguration.nix @@ -18,22 +18,22 @@ let mutExtsDrvs = extensionsFromVscodeMarketplace mutableExtensions; mutableExtsPaths = lib.forEach mutExtsDrvs ( e: { - origin = ''${e}/share/vscode/extensions/${e.vscodeExtUniqueId}''; - target = ''${vscodeExtsFolderName}/${e.vscodeExtUniqueId}-${(lib.findSingle (ext: ''${ext.publisher}.${ext.name}'' == e.vscodeExtUniqueId) "" "m" mutableExtensions ).version}''; + origin = "${e}/share/vscode/extensions/${e.vscodeExtUniqueId}"; + target = ''${vscodeExtsFolderName}/${e.vscodeExtUniqueId}-${(lib.findSingle (ext: "${ext.publisher}.${ext.name}" == e.vscodeExtUniqueId) "" "m" mutableExtensions ).version}''; } ); #removed not defined extensions rmExtensions = lib.optionalString (nixExtensions++mutableExtensions != []) '' find ${vscodeExtsFolderName} -mindepth 1 -maxdepth 1 ${ - lib.concatMapStringsSep " " (e : ''! -iname ${e.publisher}.${e.name} '') nixExtensions + lib.concatMapStringsSep " " (e : "! -iname ${e.publisher}.${e.name} ") nixExtensions + - lib.concatMapStringsSep " " (e : ''! -iname ${e.publisher}.${e.name}-${e.version} '') mutableExtensions + lib.concatMapStringsSep " " (e : "! -iname ${e.publisher}.${e.name}-${e.version} ") mutableExtensions } -exec rm -rf {} \; ''; #copy mutable extension out of the nix store cpExtensions = '' - ${lib.concatMapStringsSep "\n" (e : ''ln -sfn ${e}/share/vscode/extensions/* ${vscodeExtsFolderName}/'') nixExtsDrvs} + ${lib.concatMapStringsSep "\n" (e : "ln -sfn ${e}/share/vscode/extensions/* ${vscodeExtsFolderName}/") nixExtsDrvs} ${lib.concatMapStringsSep "\n" (ePath : '' if [ ! -d ${ePath.target} ]; then cp -a ${ePath.origin} ${ePath.target} @@ -49,6 +49,6 @@ in ${cpExtensions} fi ${vscode}/bin/code --extensions-dir "${vscodeExtsFolderName}" ${ - lib.optionalString (user-data-dir != "") ''--user-data-dir ${user-data-dir }'' + lib.optionalString (user-data-dir != "") "--user-data-dir ${user-data-dir}" } "$@" '' diff --git a/pkgs/misc/vscode-extensions/wakatime/default.nix b/pkgs/misc/vscode-extensions/wakatime/default.nix index 336cd059f57..86453b960cb 100644 --- a/pkgs/misc/vscode-extensions/wakatime/default.nix +++ b/pkgs/misc/vscode-extensions/wakatime/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , wakatime, vscode-utils }: let diff --git a/pkgs/os-specific/darwin/DarwinTools/default.nix b/pkgs/os-specific/darwin/DarwinTools/default.nix index 174f9478633..5badf2434d6 100644 --- a/pkgs/os-specific/darwin/DarwinTools/default.nix +++ b/pkgs/os-specific/darwin/DarwinTools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "DarwinTools-1"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = { - maintainers = [ stdenv.lib.maintainers.matthewbauer ]; - platforms = stdenv.lib.platforms.darwin; + maintainers = [ lib.maintainers.matthewbauer ]; + platforms = lib.platforms.darwin; }; } diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix index a768accdbcb..8a814e9558d 100644 --- a/pkgs/os-specific/darwin/apple-sdk/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk/default.nix @@ -1,15 +1,10 @@ { stdenv, fetchurl, xar, cpio, pkgs, python3, pbzx, lib, darwin-stubs, print-reexports }: -let version = "10.12"; in - -# Ensure appleSdkVersion is up to date. -assert stdenv.isDarwin -> stdenv.appleSdkVersion == version; - let # sadly needs to be exported because security_tool needs it sdk = stdenv.mkDerivation rec { pname = "MacOS_SDK"; - inherit version; + version = "10.12"; # This URL comes from https://swscan.apple.com/content/catalogs/others/index-10.12.merged-1.sucatalog, which we found by: # 1. Google: site:swscan.apple.com and look for a name that seems appropriate for your version @@ -176,7 +171,7 @@ let setupHook = ./framework-setup-hook.sh; # Not going to be more specific than this for now - __propagatedImpureHostDeps = stdenv.lib.optionals (name != "Kernel") [ + __propagatedImpureHostDeps = lib.optionals (name != "Kernel") [ # The setup-hook ensures that everyone uses the impure CoreFoundation who uses these SDK frameworks, so let's expose it "/System/Library/Frameworks/CoreFoundation.framework" "/System/Library/Frameworks/${name}.framework" @@ -249,42 +244,42 @@ in rec { }; overrides = super: { - AppKit = stdenv.lib.overrideDerivation super.AppKit (drv: { + AppKit = lib.overrideDerivation super.AppKit (drv: { __propagatedImpureHostDeps = drv.__propagatedImpureHostDeps ++ [ "/System/Library/PrivateFrameworks/" ]; }); - Carbon = stdenv.lib.overrideDerivation super.Carbon (drv: { + Carbon = lib.overrideDerivation super.Carbon (drv: { extraTBDFiles = [ "Versions/A/Frameworks/HTMLRendering.framework/Versions/A/HTMLRendering.tbd" ]; }); - CoreFoundation = stdenv.lib.overrideDerivation super.CoreFoundation (drv: { + CoreFoundation = lib.overrideDerivation super.CoreFoundation (drv: { setupHook = ./cf-setup-hook.sh; }); - CoreMedia = stdenv.lib.overrideDerivation super.CoreMedia (drv: { + CoreMedia = lib.overrideDerivation super.CoreMedia (drv: { __propagatedImpureHostDeps = drv.__propagatedImpureHostDeps ++ [ "/System/Library/Frameworks/CoreImage.framework" ]; }); - CoreMIDI = stdenv.lib.overrideDerivation super.CoreMIDI (drv: { + CoreMIDI = lib.overrideDerivation super.CoreMIDI (drv: { __propagatedImpureHostDeps = drv.__propagatedImpureHostDeps ++ [ "/System/Library/PrivateFrameworks/" ]; setupHook = ./private-frameworks-setup-hook.sh; }); - IMServicePlugIn = stdenv.lib.overrideDerivation super.IMServicePlugIn (drv: { + IMServicePlugIn = lib.overrideDerivation super.IMServicePlugIn (drv: { extraTBDFiles = [ "Versions/A/Frameworks/IMServicePlugInSupport.framework/Versions/A/IMServicePlugInSupport.tbd" ]; }); - Security = stdenv.lib.overrideDerivation super.Security (drv: { + Security = lib.overrideDerivation super.Security (drv: { setupHook = ./security-setup-hook.sh; }); - QuartzCore = stdenv.lib.overrideDerivation super.QuartzCore (drv: { + QuartzCore = lib.overrideDerivation super.QuartzCore (drv: { installPhase = drv.installPhase + '' f="$out/Library/Frameworks/QuartzCore.framework/Headers/CoreImage.h" substituteInPlace "$f" \ @@ -292,14 +287,14 @@ in rec { ''; }); - MetalKit = stdenv.lib.overrideDerivation super.MetalKit (drv: { + MetalKit = lib.overrideDerivation super.MetalKit (drv: { installPhase = drv.installPhase + '' mkdir -p $out/include/simd cp ${lib.getDev sdk}/include/simd/*.h $out/include/simd/ ''; }); - WebKit = stdenv.lib.overrideDerivation super.WebKit (drv: { + WebKit = lib.overrideDerivation super.WebKit (drv: { extraTBDFiles = [ "Versions/A/Frameworks/WebCore.framework/Versions/A/WebCore.tbd" "Versions/A/Frameworks/WebKitLegacy.framework/Versions/A/WebKitLegacy.tbd" @@ -307,7 +302,7 @@ in rec { }); } // lib.genAttrs [ "ContactsPersistence" "UIFoundation" "GameCenter" ] (x: tbdOnlyFramework x {}); - bareFrameworks = stdenv.lib.mapAttrs framework (import ./frameworks.nix { + bareFrameworks = lib.mapAttrs framework (import ./frameworks.nix { inherit frameworks libs; inherit (pkgs.darwin) libobjc; }); diff --git a/pkgs/os-specific/darwin/apple-sdk/print-reexports/default.nix b/pkgs/os-specific/darwin/apple-sdk/print-reexports/default.nix index 85e11096f06..a548d8da753 100644 --- a/pkgs/os-specific/darwin/apple-sdk/print-reexports/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk/print-reexports/default.nix @@ -1,8 +1,8 @@ -{ stdenv, libyaml }: +{ lib, stdenv, libyaml }: stdenv.mkDerivation { name = "print-reexports"; - src = stdenv.lib.sourceFilesBySuffices ./. [".c"]; + src = lib.sourceFilesBySuffices ./. [".c"]; buildInputs = [ libyaml ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/CarbonHeaders/default.nix b/pkgs/os-specific/darwin/apple-source-releases/CarbonHeaders/default.nix index 9afd4b475de..b53c5985a21 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/CarbonHeaders/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/CarbonHeaders/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, appleDerivation }: +{ lib, appleDerivation }: appleDerivation { dontBuild = true; diff --git a/pkgs/os-specific/darwin/apple-source-releases/CommonCrypto/default.nix b/pkgs/os-specific/darwin/apple-source-releases/CommonCrypto/default.nix index 3e5399dbb35..476a77c59d7 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/CommonCrypto/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/CommonCrypto/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, appleDerivation }: +{ lib, appleDerivation }: appleDerivation { installPhase = '' @@ -6,6 +6,34 @@ appleDerivation { cp include/* $out/include/CommonCrypto ''; + appleHeaders = '' + CommonCrypto/CommonBaseXX.h + CommonCrypto/CommonBigNum.h + CommonCrypto/CommonCMACSPI.h + CommonCrypto/CommonCRC.h + CommonCrypto/CommonCrypto.h + CommonCrypto/CommonCryptoError.h + CommonCrypto/CommonCryptoPriv.h + CommonCrypto/CommonCryptor.h + CommonCrypto/CommonCryptorSPI.h + CommonCrypto/CommonDH.h + CommonCrypto/CommonDigest.h + CommonCrypto/CommonDigestSPI.h + CommonCrypto/CommonECCryptor.h + CommonCrypto/CommonHMAC.h + CommonCrypto/CommonHMacSPI.h + CommonCrypto/CommonKeyDerivation.h + CommonCrypto/CommonKeyDerivationSPI.h + CommonCrypto/CommonNumerics.h + CommonCrypto/CommonRSACryptor.h + CommonCrypto/CommonRandom.h + CommonCrypto/CommonRandomSPI.h + CommonCrypto/CommonSymmetricKeywrap.h + CommonCrypto/aes.h + CommonCrypto/lionCompat.h + CommonCrypto/module.modulemap + ''; + meta = with lib; { maintainers = with maintainers; [ copumpkin ]; platforms = platforms.darwin; diff --git a/pkgs/os-specific/darwin/apple-source-releases/Csu/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Csu/default.nix index 2f6c8319b1c..e3b3179d4a3 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Csu/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Csu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, appleDerivation }: +{ lib, appleDerivation }: appleDerivation { prePatch = '' diff --git a/pkgs/os-specific/darwin/apple-source-releases/ICU/clang-5.patch b/pkgs/os-specific/darwin/apple-source-releases/ICU/clang-5.patch deleted file mode 100644 index fd9df812940..00000000000 --- a/pkgs/os-specific/darwin/apple-source-releases/ICU/clang-5.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/icuSources/i18n/ucoleitr.cpp b/icuSources/i18n/ucoleitr.cpp -index ecc94c9..936452f 100644 ---- a/icuSources/i18n/ucoleitr.cpp -+++ b/icuSources/i18n/ucoleitr.cpp -@@ -320,7 +320,7 @@ ucol_nextProcessed(UCollationElements *elems, - int32_t *ixHigh, - UErrorCode *status) - { -- return (UCollationPCE::UCollationPCE(elems)).nextProcessed(ixLow, ixHigh, status); -+ return (UCollationPCE(elems)).nextProcessed(ixLow, ixHigh, status); - } - - -@@ -384,7 +384,7 @@ ucol_previousProcessed(UCollationElements *elems, - int32_t *ixHigh, - UErrorCode *status) - { -- return (UCollationPCE::UCollationPCE(elems)).previousProcessed(ixLow, ixHigh, status); -+ return (UCollationPCE(elems)).previousProcessed(ixLow, ixHigh, status); - } - - U_NAMESPACE_BEGIN diff --git a/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix b/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix index 761ff3ea925..032b1447463 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix @@ -1,23 +1,56 @@ -{ appleDerivation }: +{ appleDerivation, python3 }: appleDerivation { - patches = [ ./clang-5.patch ]; + nativeBuildInputs = [ python3 ]; postPatch = '' substituteInPlace makefile \ - --replace /usr/bin/ "" \ - --replace '$(ISYSROOT)' "" \ - --replace 'shell xcodebuild -version -sdk' 'shell true' \ - --replace 'shell xcrun -sdk $(SDKPATH) -find' 'shell echo' \ - --replace '-install_name $(libdir)' "-install_name $out/lib/" \ - --replace /usr/local/bin/ /bin/ \ - --replace /usr/lib/ /lib/ \ + --replace "/usr/bin/" "" \ + --replace "xcrun --sdk macosx --find" "echo -n" \ + --replace "xcrun --sdk macosx.internal --show-sdk-path" "echo -n /dev/null" \ + --replace "-install_name " "-install_name $out" + + substituteInPlace icuSources/config/mh-darwin \ + --replace "-install_name " "-install_name $out/" + + # drop using impure /var/db/timezone/icutz + substituteInPlace makefile \ + --replace '-DU_TIMEZONE_FILES_DIR=\"\\\"$(TZDATA_LOOKUP_DIR)\\\"\" -DU_TIMEZONE_PACKAGE=\"\\\"$(TZDATA_PACKAGE)\\\"\"' "" + + # FIXME: This will cause `ld: warning: OS version (12.0) too small, changing to 13.0.0`, APPLE should fix it. + substituteInPlace makefile \ + --replace "ZIPPERING_LDFLAGS=-Wl,-iosmac_version_min,12.0" "ZIPPERING_LDFLAGS=" + + # skip test for missing encodingSamples data + substituteInPlace icuSources/test/cintltst/ucsdetst.c \ + --replace "&TestMailFilterCSS" "NULL" + + patchShebangs icuSources ''; - makeFlags = [ "DSTROOT=$(out)" ]; + # APPLE is using makefile to save its default configuration and call ./configure, so we hack makeFlags + # instead of configuring ourself, trying to stay abreast of APPLE. + dontConfigure = true; + makeFlags = [ + "DSTROOT=$(out)" + + # remove /usr prefix on include and lib + "PRIVATE_HDR_PREFIX=" + "libdir=/lib/" + + "DATA_INSTALL_DIR=/share/icu/" + "DATA_LOOKUP_DIR=$(DSTROOT)$(DATA_INSTALL_DIR)" + + # hack to use our lower macos version + "MAC_OS_X_VERSION_MIN_REQUIRED=__MAC_OS_X_VERSION_MIN_REQUIRED" + "OSX_HOST_VERSION_MIN_STRING=$(MACOSX_DEPLOYMENT_TARGET)" + ]; + + doCheck = true; + checkTarget = "check"; postInstall = '' - mv $out/usr/local/include $out/include + # we don't need all those in usr/local rm -rf $out/usr ''; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/IOKit/default.nix b/pkgs/os-specific/darwin/apple-source-releases/IOKit/default.nix index 976b977e602..0ba61ccb491 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/IOKit/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/IOKit/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, appleDerivation, IOKitSrcs, xnu, darwin-stubs }: +{ lib, appleDerivation, IOKitSrcs, xnu, darwin-stubs }: # Someday it'll make sense to split these out into their own packages, but today is not that day. appleDerivation { - srcs = stdenv.lib.attrValues IOKitSrcs; + srcs = lib.attrValues IOKitSrcs; sourceRoot = "."; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix index 6ebb470145d..3554a2e15b0 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix @@ -29,4 +29,6 @@ appleDerivation { cp ${Libc_old}/include/libkern/OSAtomic.h $out/include/libkern cp ${Libc_old}/include/libkern/OSCacheControl.h $out/include/libkern ''; + + appleHeaders = builtins.readFile ./headers.txt; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libc/headers.txt b/pkgs/os-specific/darwin/apple-source-releases/Libc/headers.txt new file mode 100644 index 00000000000..ea62e31dc78 --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/Libc/headers.txt @@ -0,0 +1,138 @@ +CrashReporterClient.h +NSSystemDirectories.h +_locale.h +_types.h +_types/_intmax_t.h +_types/_nl_item.h +_types/_uint16_t.h +_types/_uint32_t.h +_types/_uint64_t.h +_types/_uint8_t.h +_types/_uintmax_t.h +_types/_wctrans_t.h +_types/_wctype_t.h +_wctype.h +_xlocale.h +aio.h +alloca.h +ar.h +arpa/ftp.h +arpa/inet.h +arpa/nameser_compat.h +arpa/telnet.h +arpa/tftp.h +asl.h +assert.h +bitstring.h +cpio.h +crt_externs.h +ctype.h +db.h +dirent.h +disktab.h +err.h +errno.h +execinfo.h +fcntl.h +fmtmsg.h +fnmatch.h +fsproperties.h +fstab.h +fts.h +ftw.h +get_compat.h +getopt.h +glob.h +inttypes.h +iso646.h +langinfo.h +libc.h +libc_private.h +libgen.h +libkern/OSAtomic.h +libkern/OSCacheControl.h +libproc.h +limits.h +locale.h +malloc/malloc.h +memory.h +monetary.h +monitor.h +mpool.h +msgcat.h +ndbm.h +nl_types.h +nlist.h +os/assumes.h +os/debug_private.h +paths.h +poll.h +printf.h +protocols/routed.h +protocols/rwhod.h +protocols/talkd.h +protocols/timed.h +pthread.h +pthread_impl.h +pthread_spis.h +pthread_workqueue.h +ranlib.h +readpassphrase.h +regex.h +runetype.h +sched.h +search.h +secure/_common.h +secure/_stdio.h +secure/_string.h +semaphore.h +setjmp.h +sgtty.h +signal.h +spawn.h +stab.h +standards.h +stddef.h +stdint.h +stdio.h +stdlib.h +strhash.h +string.h +stringlist.h +strings.h +struct.h +sys/acl.h +sys/rbtree.h +sys/statvfs.h +sysexits.h +syslog.h +tar.h +termios.h +time.h +timeconv.h +ttyent.h +tzfile.h +ucontext.h +ulimit.h +unistd.h +util.h +utime.h +utmpx.h +utmpx_thread.h +vis.h +wchar.h +wctype.h +wordexp.h +xlocale.h +xlocale/__wctype.h +xlocale/_ctype.h +xlocale/_inttypes.h +xlocale/_langinfo.h +xlocale/_monetary.h +xlocale/_regex.h +xlocale/_stdio.h +xlocale/_stdlib.h +xlocale/_string.h +xlocale/_time.h +xlocale/_wchar.h +xlocale/_wctype.h diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libinfo/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libinfo/default.nix index add51a61d3d..5481ae74d38 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libinfo/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libinfo/default.nix @@ -11,4 +11,40 @@ appleDerivation { export DSTROOT=$out sh xcodescripts/install_files.sh ''; + + appleHeaders = '' + aliasdb.h + bootparams.h + configuration_profile.h + grp.h + ifaddrs.h + ils.h + kvbuf.h + libinfo.h + libinfo_muser.h + membership.h + membershipPriv.h + netdb.h + netdb_async.h + ntsid.h + printerdb.h + pwd.h + rpc/auth.h + rpc/auth_unix.h + rpc/clnt.h + rpc/pmap_clnt.h + rpc/pmap_prot.h + rpc/pmap_rmt.h + rpc/rpc.h + rpc/rpc_msg.h + rpc/svc.h + rpc/svc_auth.h + rpc/types.h + rpc/xdr.h + rpcsvc/yp_prot.h + rpcsvc/ypclnt.h + si_data.h + si_module.h + thread_data.h + ''; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix index 7f93a87837a..1bf6396d47f 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, appleDerivation, developer_cmds }: +{ lib, appleDerivation, developer_cmds }: appleDerivation { buildInputs = [ developer_cmds ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix index a5508b5ec12..2c98dd35e39 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, appleDerivation, cpio, xnu, Libc, Libm, libdispatch, cctools, Libinfo +{ lib, appleDerivation, cpio, xnu, Libc, Libm, libdispatch, cctools, Libinfo , dyld, Csu, architecture, libclosure, CarbonHeaders, ncurses, CommonCrypto , copyfile, removefile, libresolv, Libnotify, libplatform, libpthread , mDNSResponder, launchd, libutil, hfs, darling, darwin-stubs }: @@ -115,6 +115,8 @@ appleDerivation { ln -s libresolv.9.dylib $out/lib/libresolv.dylib ''; + appleHeaders = builtins.readFile ./headers.txt; + meta = with lib; { description = "The Mac OS libc/libSystem (tapi library with pure headers)"; maintainers = with maintainers; [ copumpkin gridaphobe ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/headers.txt b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/headers.txt new file mode 100644 index 00000000000..09b0ab41045 --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/headers.txt @@ -0,0 +1,1727 @@ +AssertMacros.h +Availability.h +AvailabilityInternal.h +AvailabilityMacros.h +Block.h +Block_private.h +CommonCrypto/CommonBaseXX.h +CommonCrypto/CommonBigNum.h +CommonCrypto/CommonCMACSPI.h +CommonCrypto/CommonCRC.h +CommonCrypto/CommonCrypto.h +CommonCrypto/CommonCryptoError.h +CommonCrypto/CommonCryptoPriv.h +CommonCrypto/CommonCryptor.h +CommonCrypto/CommonCryptorSPI.h +CommonCrypto/CommonDH.h +CommonCrypto/CommonDigest.h +CommonCrypto/CommonDigestSPI.h +CommonCrypto/CommonECCryptor.h +CommonCrypto/CommonHMAC.h +CommonCrypto/CommonHMacSPI.h +CommonCrypto/CommonKeyDerivation.h +CommonCrypto/CommonKeyDerivationSPI.h +CommonCrypto/CommonNumerics.h +CommonCrypto/CommonRSACryptor.h +CommonCrypto/CommonRandom.h +CommonCrypto/CommonRandomSPI.h +CommonCrypto/CommonSymmetricKeywrap.h +CommonCrypto/aes.h +CommonCrypto/lionCompat.h +ConditionalMacros.h +CrashReporterClient.h +ExtentManager.h +MacTypes.h +NSSystemDirectories.h +TargetConditionals.h +_errno.h +_libkernel_init.h +_locale.h +_simple.h +_types.h +_types/_intmax_t.h +_types/_nl_item.h +_types/_uint16_t.h +_types/_uint32_t.h +_types/_uint64_t.h +_types/_uint8_t.h +_types/_uintmax_t.h +_types/_wctrans_t.h +_types/_wctype_t.h +_wctype.h +_xlocale.h +aio.h +aliasdb.h +alloca.h +ar.h +architecture/alignment.h +architecture/byte_order.h +architecture/i386/alignment.h +architecture/i386/asm_help.h +architecture/i386/byte_order.h +architecture/i386/cpu.h +architecture/i386/desc.h +architecture/i386/fpu.h +architecture/i386/frame.h +architecture/i386/io.h +architecture/i386/pio.h +architecture/i386/reg_help.h +architecture/i386/sel.h +architecture/i386/table.h +architecture/i386/tss.h +arpa/ftp.h +arpa/inet.h +arpa/nameser_compat.h +arpa/telnet.h +arpa/tftp.h +asl.h +assert.h +atm/atm_notification.defs +atm/atm_types.defs +atm/atm_types.h +bank/bank_types.h +bitstring.h +bootparams.h +bootstrap.h +bootstrap_priv.h +bsd/bsm/audit.h +bsd/dev/random/randomdev.h +bsd/i386/_limits.h +bsd/i386/_mcontext.h +bsd/i386/_param.h +bsd/i386/_types.h +bsd/i386/endian.h +bsd/i386/limits.h +bsd/i386/param.h +bsd/i386/profile.h +bsd/i386/signal.h +bsd/i386/types.h +bsd/i386/vmparam.h +bsd/libkern/libkern.h +bsd/machine/_limits.h +bsd/machine/_mcontext.h +bsd/machine/_param.h +bsd/machine/_types.h +bsd/machine/byte_order.h +bsd/machine/disklabel.h +bsd/machine/endian.h +bsd/machine/limits.h +bsd/machine/param.h +bsd/machine/profile.h +bsd/machine/signal.h +bsd/machine/spl.h +bsd/machine/types.h +bsd/machine/vmparam.h +bsd/miscfs/devfs/devfs.h +bsd/miscfs/devfs/devfs_proto.h +bsd/miscfs/devfs/devfsdefs.h +bsd/miscfs/devfs/fdesc.h +bsd/miscfs/fifofs/fifo.h +bsd/miscfs/specfs/specdev.h +bsd/miscfs/union/union.h +bsd/net/bpf.h +bsd/net/dlil.h +bsd/net/ethernet.h +bsd/net/if.h +bsd/net/if_arp.h +bsd/net/if_dl.h +bsd/net/if_ether.h +bsd/net/if_llc.h +bsd/net/if_media.h +bsd/net/if_mib.h +bsd/net/if_types.h +bsd/net/if_utun.h +bsd/net/if_var.h +bsd/net/init.h +bsd/net/kext_net.h +bsd/net/kpi_interface.h +bsd/net/kpi_interfacefilter.h +bsd/net/kpi_protocol.h +bsd/net/ndrv.h +bsd/net/net_kev.h +bsd/net/pfkeyv2.h +bsd/net/radix.h +bsd/net/route.h +bsd/netinet/bootp.h +bsd/netinet/icmp6.h +bsd/netinet/icmp_var.h +bsd/netinet/if_ether.h +bsd/netinet/igmp.h +bsd/netinet/igmp_var.h +bsd/netinet/in.h +bsd/netinet/in_arp.h +bsd/netinet/in_pcb.h +bsd/netinet/in_systm.h +bsd/netinet/in_var.h +bsd/netinet/ip.h +bsd/netinet/ip6.h +bsd/netinet/ip_icmp.h +bsd/netinet/ip_var.h +bsd/netinet/kpi_ipfilter.h +bsd/netinet/tcp.h +bsd/netinet/tcp_fsm.h +bsd/netinet/tcp_seq.h +bsd/netinet/tcp_timer.h +bsd/netinet/tcp_var.h +bsd/netinet/tcpip.h +bsd/netinet/udp.h +bsd/netinet/udp_var.h +bsd/netinet6/ah.h +bsd/netinet6/esp.h +bsd/netinet6/in6.h +bsd/netinet6/in6_var.h +bsd/netinet6/ipcomp.h +bsd/netinet6/ipsec.h +bsd/netinet6/nd6.h +bsd/netinet6/raw_ip6.h +bsd/netinet6/scope6_var.h +bsd/netkey/keysock.h +bsd/security/audit/audit.h +bsd/security/audit/audit_bsd.h +bsd/security/audit/audit_ioctl.h +bsd/security/audit/audit_private.h +bsd/sys/_endian.h +bsd/sys/_select.h +bsd/sys/_structs.h +bsd/sys/_types.h +bsd/sys/_types/_blkcnt_t.h +bsd/sys/_types/_blksize_t.h +bsd/sys/_types/_clock_t.h +bsd/sys/_types/_ct_rune_t.h +bsd/sys/_types/_dev_t.h +bsd/sys/_types/_errno_t.h +bsd/sys/_types/_fd_clr.h +bsd/sys/_types/_fd_copy.h +bsd/sys/_types/_fd_def.h +bsd/sys/_types/_fd_isset.h +bsd/sys/_types/_fd_set.h +bsd/sys/_types/_fd_setsize.h +bsd/sys/_types/_fd_zero.h +bsd/sys/_types/_filesec_t.h +bsd/sys/_types/_fsblkcnt_t.h +bsd/sys/_types/_fsfilcnt_t.h +bsd/sys/_types/_fsid_t.h +bsd/sys/_types/_fsobj_id_t.h +bsd/sys/_types/_gid_t.h +bsd/sys/_types/_guid_t.h +bsd/sys/_types/_id_t.h +bsd/sys/_types/_in_addr_t.h +bsd/sys/_types/_in_port_t.h +bsd/sys/_types/_ino64_t.h +bsd/sys/_types/_ino_t.h +bsd/sys/_types/_int16_t.h +bsd/sys/_types/_int32_t.h +bsd/sys/_types/_int64_t.h +bsd/sys/_types/_int8_t.h +bsd/sys/_types/_intptr_t.h +bsd/sys/_types/_iovec_t.h +bsd/sys/_types/_key_t.h +bsd/sys/_types/_mach_port_t.h +bsd/sys/_types/_mbstate_t.h +bsd/sys/_types/_mode_t.h +bsd/sys/_types/_nlink_t.h +bsd/sys/_types/_null.h +bsd/sys/_types/_o_dsync.h +bsd/sys/_types/_o_sync.h +bsd/sys/_types/_off_t.h +bsd/sys/_types/_offsetof.h +bsd/sys/_types/_os_inline.h +bsd/sys/_types/_pid_t.h +bsd/sys/_types/_posix_vdisable.h +bsd/sys/_types/_ptrdiff_t.h +bsd/sys/_types/_rsize_t.h +bsd/sys/_types/_rune_t.h +bsd/sys/_types/_s_ifmt.h +bsd/sys/_types/_sa_family_t.h +bsd/sys/_types/_seek_set.h +bsd/sys/_types/_sigaltstack.h +bsd/sys/_types/_sigset_t.h +bsd/sys/_types/_size_t.h +bsd/sys/_types/_socklen_t.h +bsd/sys/_types/_ssize_t.h +bsd/sys/_types/_suseconds_t.h +bsd/sys/_types/_time_t.h +bsd/sys/_types/_timespec.h +bsd/sys/_types/_timeval.h +bsd/sys/_types/_timeval32.h +bsd/sys/_types/_timeval64.h +bsd/sys/_types/_u_int16_t.h +bsd/sys/_types/_u_int32_t.h +bsd/sys/_types/_u_int64_t.h +bsd/sys/_types/_u_int8_t.h +bsd/sys/_types/_ucontext.h +bsd/sys/_types/_ucontext64.h +bsd/sys/_types/_uid_t.h +bsd/sys/_types/_uintptr_t.h +bsd/sys/_types/_useconds_t.h +bsd/sys/_types/_user32_itimerval.h +bsd/sys/_types/_user32_timespec.h +bsd/sys/_types/_user32_timeval.h +bsd/sys/_types/_user64_itimerval.h +bsd/sys/_types/_user64_timespec.h +bsd/sys/_types/_user64_timeval.h +bsd/sys/_types/_user_timespec.h +bsd/sys/_types/_user_timeval.h +bsd/sys/_types/_uuid_t.h +bsd/sys/_types/_va_list.h +bsd/sys/_types/_wchar_t.h +bsd/sys/_types/_wint_t.h +bsd/sys/appleapiopts.h +bsd/sys/attr.h +bsd/sys/bsdtask_info.h +bsd/sys/buf.h +bsd/sys/cdefs.h +bsd/sys/codesign.h +bsd/sys/conf.h +bsd/sys/content_protection.h +bsd/sys/cprotect.h +bsd/sys/csr.h +bsd/sys/decmpfs.h +bsd/sys/dir.h +bsd/sys/dirent.h +bsd/sys/disk.h +bsd/sys/disklabel.h +bsd/sys/disktab.h +bsd/sys/dkstat.h +bsd/sys/doc_tombstone.h +bsd/sys/domain.h +bsd/sys/errno.h +bsd/sys/ev.h +bsd/sys/event.h +bsd/sys/eventvar.h +bsd/sys/fbt.h +bsd/sys/fcntl.h +bsd/sys/file.h +bsd/sys/file_internal.h +bsd/sys/filedesc.h +bsd/sys/fileport.h +bsd/sys/filio.h +bsd/sys/fsctl.h +bsd/sys/fsevents.h +bsd/sys/fslog.h +bsd/sys/guarded.h +bsd/sys/imgact.h +bsd/sys/ioccom.h +bsd/sys/ioctl.h +bsd/sys/ioctl_compat.h +bsd/sys/ipc.h +bsd/sys/kasl.h +bsd/sys/kauth.h +bsd/sys/kdebug.h +bsd/sys/kdebugevents.h +bsd/sys/kern_control.h +bsd/sys/kern_event.h +bsd/sys/kern_memorystatus.h +bsd/sys/kernel.h +bsd/sys/kernel_types.h +bsd/sys/kpi_mbuf.h +bsd/sys/kpi_private.h +bsd/sys/kpi_socket.h +bsd/sys/kpi_socketfilter.h +bsd/sys/ktrace.h +bsd/sys/linker_set.h +bsd/sys/lock.h +bsd/sys/lockf.h +bsd/sys/mach_swapon.h +bsd/sys/malloc.h +bsd/sys/mbuf.h +bsd/sys/md5.h +bsd/sys/memory_maintenance.h +bsd/sys/mman.h +bsd/sys/mount.h +bsd/sys/mount_internal.h +bsd/sys/msg.h +bsd/sys/msgbuf.h +bsd/sys/munge.h +bsd/sys/namei.h +bsd/sys/netport.h +bsd/sys/param.h +bsd/sys/paths.h +bsd/sys/persona.h +bsd/sys/pgo.h +bsd/sys/pipe.h +bsd/sys/posix_sem.h +bsd/sys/posix_shm.h +bsd/sys/priv.h +bsd/sys/proc.h +bsd/sys/proc_info.h +bsd/sys/proc_internal.h +bsd/sys/protosw.h +bsd/sys/pthread_internal.h +bsd/sys/pthread_shims.h +bsd/sys/queue.h +bsd/sys/quota.h +bsd/sys/random.h +bsd/sys/reason.h +bsd/sys/resource.h +bsd/sys/resourcevar.h +bsd/sys/sbuf.h +bsd/sys/select.h +bsd/sys/sem.h +bsd/sys/sem_internal.h +bsd/sys/semaphore.h +bsd/sys/shm.h +bsd/sys/shm_internal.h +bsd/sys/signal.h +bsd/sys/signalvar.h +bsd/sys/socket.h +bsd/sys/socketvar.h +bsd/sys/sockio.h +bsd/sys/spawn.h +bsd/sys/spawn_internal.h +bsd/sys/stackshot.h +bsd/sys/stat.h +bsd/sys/stdio.h +bsd/sys/sys_domain.h +bsd/sys/syscall.h +bsd/sys/sysctl.h +bsd/sys/syslimits.h +bsd/sys/syslog.h +bsd/sys/sysproto.h +bsd/sys/systm.h +bsd/sys/termios.h +bsd/sys/time.h +bsd/sys/tree.h +bsd/sys/tty.h +bsd/sys/ttychars.h +bsd/sys/ttycom.h +bsd/sys/ttydefaults.h +bsd/sys/ttydev.h +bsd/sys/types.h +bsd/sys/ubc.h +bsd/sys/ucontext.h +bsd/sys/ucred.h +bsd/sys/uio.h +bsd/sys/uio_internal.h +bsd/sys/ulock.h +bsd/sys/un.h +bsd/sys/unistd.h +bsd/sys/unpcb.h +bsd/sys/user.h +bsd/sys/utfconv.h +bsd/sys/vfs_context.h +bsd/sys/vm.h +bsd/sys/vmmeter.h +bsd/sys/vmparam.h +bsd/sys/vnode.h +bsd/sys/vnode_if.h +bsd/sys/vnode_internal.h +bsd/sys/wait.h +bsd/sys/xattr.h +bsd/uuid/uuid.h +bsd/vfs/vfs_support.h +bsd/vm/vnode_pager.h +bsm/audit.h +bsm/audit_domain.h +bsm/audit_errno.h +bsm/audit_fcntl.h +bsm/audit_internal.h +bsm/audit_kevents.h +bsm/audit_record.h +bsm/audit_socket_type.h +checkint.h +complex.h +configuration_profile.h +copyfile.h +corecrypto/cc.h +corecrypto/cc_config.h +corecrypto/cc_debug.h +corecrypto/cc_macros.h +corecrypto/cc_priv.h +corecrypto/ccaes.h +corecrypto/ccasn1.h +corecrypto/cccmac.h +corecrypto/ccder.h +corecrypto/ccdes.h +corecrypto/ccdigest.h +corecrypto/ccdigest_priv.h +corecrypto/ccdrbg.h +corecrypto/ccdrbg_impl.h +corecrypto/cchmac.h +corecrypto/ccmd5.h +corecrypto/ccmode.h +corecrypto/ccmode_factory.h +corecrypto/ccmode_impl.h +corecrypto/ccmode_siv.h +corecrypto/ccn.h +corecrypto/ccpad.h +corecrypto/ccpbkdf2.h +corecrypto/ccrc4.h +corecrypto/ccrng.h +corecrypto/ccrng_system.h +corecrypto/ccrsa.h +corecrypto/ccsha1.h +corecrypto/ccsha2.h +corecrypto/cczp.h +corpses/task_corpse.h +cpio.h +crt_externs.h +ctype.h +curses.h +cursesapp.h +cursesf.h +cursesm.h +cursesp.h +cursesw.h +cursslk.h +db.h +default_pager/default_pager_types.h +device/device.defs +device/device_port.h +device/device_types.defs +device/device_types.h +dirent.h +disktab.h +dispatch/base.h +dispatch/benchmark.h +dispatch/block.h +dispatch/data.h +dispatch/data_private.h +dispatch/dispatch.h +dispatch/group.h +dispatch/introspection.h +dispatch/introspection_private.h +dispatch/io.h +dispatch/io_private.h +dispatch/layout_private.h +dispatch/mach_private.h +dispatch/object.h +dispatch/once.h +dispatch/private.h +dispatch/queue.h +dispatch/queue_private.h +dispatch/semaphore.h +dispatch/source.h +dispatch/source_private.h +dispatch/time.h +dlfcn.h +dns.h +dns_sd.h +dns_util.h +err.h +errno.h +eti.h +etip.h +execinfo.h +fcntl.h +fenv.h +fmtmsg.h +fnmatch.h +form.h +fsproperties.h +fstab.h +fts.h +ftw.h +get_compat.h +gethostuuid.h +gethostuuid_private.h +getopt.h +glob.h +grp.h +hfs/BTreeScanner.h +hfs/BTreesInternal.h +hfs/BTreesPrivate.h +hfs/CatalogPrivate.h +hfs/FileMgrInternal.h +hfs/HFSUnicodeWrappers.h +hfs/UCStringCompareData.h +hfs/hfs.h +hfs/hfs_alloc_trace.h +hfs/hfs_attrlist.h +hfs/hfs_btreeio.h +hfs/hfs_catalog.h +hfs/hfs_cnode.h +hfs/hfs_cprotect.h +hfs/hfs_dbg.h +hfs/hfs_endian.h +hfs/hfs_extents.h +hfs/hfs_format.h +hfs/hfs_fsctl.h +hfs/hfs_hotfiles.h +hfs/hfs_iokit.h +hfs/hfs_journal.h +hfs/hfs_kdebug.h +hfs/hfs_key_roll.h +hfs/hfs_macos_defs.h +hfs/hfs_mount.h +hfs/hfs_quota.h +hfs/hfs_unistr.h +hfs/kext-config.h +hfs/rangelist.h +i386/_limits.h +i386/_mcontext.h +i386/_param.h +i386/_types.h +i386/eflags.h +i386/endian.h +i386/fasttrap_isa.h +i386/limits.h +i386/param.h +i386/profile.h +i386/signal.h +i386/types.h +i386/user_ldt.h +i386/vmparam.h +ifaddrs.h +ils.h +inttypes.h +iokit/IOKit/AppleKeyStoreInterface.h +iokit/IOKit/IOBSD.h +iokit/IOKit/IOBufferMemoryDescriptor.h +iokit/IOKit/IOCPU.h +iokit/IOKit/IOCatalogue.h +iokit/IOKit/IOCommand.h +iokit/IOKit/IOCommandGate.h +iokit/IOKit/IOCommandPool.h +iokit/IOKit/IOCommandQueue.h +iokit/IOKit/IOConditionLock.h +iokit/IOKit/IODMACommand.h +iokit/IOKit/IODMAController.h +iokit/IOKit/IODMAEventSource.h +iokit/IOKit/IODataQueue.h +iokit/IOKit/IODataQueueShared.h +iokit/IOKit/IODeviceMemory.h +iokit/IOKit/IODeviceTreeSupport.h +iokit/IOKit/IOEventSource.h +iokit/IOKit/IOFilterInterruptEventSource.h +iokit/IOKit/IOHibernatePrivate.h +iokit/IOKit/IOInterleavedMemoryDescriptor.h +iokit/IOKit/IOInterruptAccounting.h +iokit/IOKit/IOInterruptController.h +iokit/IOKit/IOInterruptEventSource.h +iokit/IOKit/IOInterrupts.h +iokit/IOKit/IOKernelReportStructs.h +iokit/IOKit/IOKernelReporters.h +iokit/IOKit/IOKitDebug.h +iokit/IOKit/IOKitDiagnosticsUserClient.h +iokit/IOKit/IOKitKeys.h +iokit/IOKit/IOKitKeysPrivate.h +iokit/IOKit/IOKitServer.h +iokit/IOKit/IOLib.h +iokit/IOKit/IOLocks.h +iokit/IOKit/IOLocksPrivate.h +iokit/IOKit/IOMapper.h +iokit/IOKit/IOMemoryCursor.h +iokit/IOKit/IOMemoryDescriptor.h +iokit/IOKit/IOMessage.h +iokit/IOKit/IOMultiMemoryDescriptor.h +iokit/IOKit/IONVRAM.h +iokit/IOKit/IONotifier.h +iokit/IOKit/IOPlatformExpert.h +iokit/IOKit/IOPolledInterface.h +iokit/IOKit/IORangeAllocator.h +iokit/IOKit/IORegistryEntry.h +iokit/IOKit/IOReportMacros.h +iokit/IOKit/IOReportTypes.h +iokit/IOKit/IOReturn.h +iokit/IOKit/IOService.h +iokit/IOKit/IOServicePM.h +iokit/IOKit/IOSharedDataQueue.h +iokit/IOKit/IOSharedLock.h +iokit/IOKit/IOStatistics.h +iokit/IOKit/IOStatisticsPrivate.h +iokit/IOKit/IOSubMemoryDescriptor.h +iokit/IOKit/IOSyncer.h +iokit/IOKit/IOTimeStamp.h +iokit/IOKit/IOTimerEventSource.h +iokit/IOKit/IOTypes.h +iokit/IOKit/IOUserClient.h +iokit/IOKit/IOWorkLoop.h +iokit/IOKit/OSMessageNotification.h +iokit/IOKit/assert.h +iokit/IOKit/nvram/IONVRAMController.h +iokit/IOKit/platform/AppleMacIO.h +iokit/IOKit/platform/AppleMacIODevice.h +iokit/IOKit/platform/AppleNMI.h +iokit/IOKit/platform/ApplePlatformExpert.h +iokit/IOKit/power/IOPwrController.h +iokit/IOKit/pwr_mgt/IOPM.h +iokit/IOKit/pwr_mgt/IOPMLibDefs.h +iokit/IOKit/pwr_mgt/IOPMPowerSource.h +iokit/IOKit/pwr_mgt/IOPMPowerSourceList.h +iokit/IOKit/pwr_mgt/IOPMpowerState.h +iokit/IOKit/pwr_mgt/IOPowerConnection.h +iokit/IOKit/pwr_mgt/RootDomain.h +iokit/IOKit/rtc/IORTCController.h +iokit/IOKit/system.h +iokit/IOKit/system_management/IOWatchDogTimer.h +iso646.h +kern/exc_resource.h +kern/kcdata.h +kern/kern_cdata.h +kvbuf.h +langinfo.h +launch.h +launch_internal.h +launch_priv.h +libc.h +libc_private.h +libgen.h +libinfo.h +libinfo_muser.h +libkern/OSAtomic.h +libkern/OSAtomicDeprecated.h +libkern/OSAtomicQueue.h +libkern/OSByteOrder.h +libkern/OSCacheControl.h +libkern/OSDebug.h +libkern/OSKextLib.h +libkern/OSReturn.h +libkern/OSSpinLockDeprecated.h +libkern/OSTypes.h +libkern/_OSByteOrder.h +libkern/firehose/chunk_private.h +libkern/firehose/firehose_types_private.h +libkern/firehose/ioctl_private.h +libkern/firehose/tracepoint_private.h +libkern/i386/OSByteOrder.h +libkern/i386/_OSByteOrder.h +libkern/libkern/OSAtomic.h +libkern/libkern/OSBase.h +libkern/libkern/OSByteOrder.h +libkern/libkern/OSDebug.h +libkern/libkern/OSKextLib.h +libkern/libkern/OSKextLibPrivate.h +libkern/libkern/OSMalloc.h +libkern/libkern/OSReturn.h +libkern/libkern/OSSerializeBinary.h +libkern/libkern/OSTypes.h +libkern/libkern/_OSByteOrder.h +libkern/libkern/c++/OSArray.h +libkern/libkern/c++/OSBoolean.h +libkern/libkern/c++/OSCPPDebug.h +libkern/libkern/c++/OSCollection.h +libkern/libkern/c++/OSCollectionIterator.h +libkern/libkern/c++/OSContainers.h +libkern/libkern/c++/OSData.h +libkern/libkern/c++/OSDictionary.h +libkern/libkern/c++/OSEndianTypes.h +libkern/libkern/c++/OSIterator.h +libkern/libkern/c++/OSKext.h +libkern/libkern/c++/OSLib.h +libkern/libkern/c++/OSMetaClass.h +libkern/libkern/c++/OSNumber.h +libkern/libkern/c++/OSObject.h +libkern/libkern/c++/OSOrderedSet.h +libkern/libkern/c++/OSSerialize.h +libkern/libkern/c++/OSSet.h +libkern/libkern/c++/OSString.h +libkern/libkern/c++/OSSymbol.h +libkern/libkern/c++/OSUnserialize.h +libkern/libkern/crypto/aes.h +libkern/libkern/crypto/aesxts.h +libkern/libkern/crypto/crypto_internal.h +libkern/libkern/crypto/des.h +libkern/libkern/crypto/md5.h +libkern/libkern/crypto/rand.h +libkern/libkern/crypto/register_crypto.h +libkern/libkern/crypto/rsa.h +libkern/libkern/crypto/sha1.h +libkern/libkern/crypto/sha2.h +libkern/libkern/i386/OSByteOrder.h +libkern/libkern/i386/_OSByteOrder.h +libkern/libkern/kernel_mach_header.h +libkern/libkern/kext_request_keys.h +libkern/libkern/kxld.h +libkern/libkern/kxld_types.h +libkern/libkern/locks.h +libkern/libkern/machine/OSByteOrder.h +libkern/libkern/mkext.h +libkern/libkern/prelink.h +libkern/libkern/section_keywords.h +libkern/libkern/stack_protector.h +libkern/libkern/sysctl.h +libkern/libkern/tree.h +libkern/libkern/version.h +libkern/libkern/zconf.h +libkern/libkern/zlib.h +libkern/machine/OSByteOrder.h +libkern/os/base.h +libkern/os/log.h +libkern/os/log_private.h +libkern/os/object.h +libkern/os/object_private.h +libkern/os/overflow.h +libkern/os/trace.h +libproc.h +libutil.h +limits.h +locale.h +mach-o/arch.h +mach-o/arm/reloc.h +mach-o/arm64/reloc.h +mach-o/dyld-interposing.h +mach-o/dyld.h +mach-o/dyld_gdb.h +mach-o/dyld_images.h +mach-o/dyld_priv.h +mach-o/dyld_process_info.h +mach-o/fat.h +mach-o/getsect.h +mach-o/hppa/reloc.h +mach-o/hppa/swap.h +mach-o/i386/swap.h +mach-o/i860/reloc.h +mach-o/i860/swap.h +mach-o/ldsyms.h +mach-o/loader.h +mach-o/m68k/swap.h +mach-o/m88k/reloc.h +mach-o/m88k/swap.h +mach-o/nlist.h +mach-o/ppc/reloc.h +mach-o/ppc/swap.h +mach-o/ranlib.h +mach-o/reloc.h +mach-o/sparc/reloc.h +mach-o/sparc/swap.h +mach-o/stab.h +mach-o/swap.h +mach-o/x86_64/reloc.h +mach/audit_triggers.defs +mach/boolean.h +mach/bootstrap.h +mach/clock.defs +mach/clock.h +mach/clock_priv.defs +mach/clock_priv.h +mach/clock_reply.defs +mach/clock_reply.h +mach/clock_types.defs +mach/clock_types.h +mach/dyld_kernel.h +mach/error.h +mach/exc.defs +mach/exc.h +mach/exception.h +mach/exception_types.h +mach/host_info.h +mach/host_notify.h +mach/host_notify_reply.defs +mach/host_priv.defs +mach/host_priv.h +mach/host_reboot.h +mach/host_security.defs +mach/host_security.h +mach/host_special_ports.h +mach/i386/_structs.h +mach/i386/asm.h +mach/i386/boolean.h +mach/i386/exception.h +mach/i386/fp_reg.h +mach/i386/kern_return.h +mach/i386/ndr_def.h +mach/i386/processor_info.h +mach/i386/rpc.h +mach/i386/sdt_isa.h +mach/i386/thread_state.h +mach/i386/thread_status.h +mach/i386/vm_param.h +mach/i386/vm_types.h +mach/kern_return.h +mach/kmod.h +mach/lock_set.defs +mach/lock_set.h +mach/mach.h +mach/mach_error.h +mach/mach_exc.defs +mach/mach_host.defs +mach/mach_host.h +mach/mach_init.h +mach/mach_interface.h +mach/mach_param.h +mach/mach_port.defs +mach/mach_port.h +mach/mach_port_internal.h +mach/mach_syscalls.h +mach/mach_time.h +mach/mach_traps.h +mach/mach_types.defs +mach/mach_types.h +mach/mach_vm.defs +mach/mach_vm.h +mach/mach_vm_internal.h +mach/mach_voucher.defs +mach/mach_voucher.h +mach/mach_voucher_attr_control.defs +mach/mach_voucher_types.h +mach/machine.h +mach/machine/asm.h +mach/machine/boolean.h +mach/machine/exception.h +mach/machine/kern_return.h +mach/machine/machine_types.defs +mach/machine/ndr_def.h +mach/machine/processor_info.h +mach/machine/rpc.h +mach/machine/sdt.h +mach/machine/sdt_isa.h +mach/machine/thread_state.h +mach/machine/thread_status.h +mach/machine/vm_param.h +mach/machine/vm_types.h +mach/memory_object_types.h +mach/message.h +mach/mig.h +mach/mig_errors.h +mach/mig_strncpy_zerofill_support.h +mach/mig_voucher_support.h +mach/ndr.h +mach/notify.defs +mach/notify.h +mach/policy.h +mach/port.h +mach/port_obj.h +mach/processor.defs +mach/processor.h +mach/processor_info.h +mach/processor_set.defs +mach/processor_set.h +mach/rpc.h +mach/sdt.h +mach/semaphore.h +mach/shared_memory_server.h +mach/shared_region.h +mach/std_types.defs +mach/std_types.h +mach/sync.h +mach/sync_policy.h +mach/task.defs +mach/task.h +mach/task_access.defs +mach/task_info.h +mach/task_policy.h +mach/task_special_ports.h +mach/telemetry_notification.defs +mach/thread_act.defs +mach/thread_act.h +mach/thread_act_internal.h +mach/thread_info.h +mach/thread_policy.h +mach/thread_special_ports.h +mach/thread_state.h +mach/thread_status.h +mach/thread_switch.h +mach/time_value.h +mach/vm_attributes.h +mach/vm_behavior.h +mach/vm_inherit.h +mach/vm_map.defs +mach/vm_map.h +mach/vm_map_internal.h +mach/vm_page_size.h +mach/vm_param.h +mach/vm_prot.h +mach/vm_purgable.h +mach/vm_region.h +mach/vm_statistics.h +mach/vm_sync.h +mach/vm_task.h +mach/vm_types.h +mach_debug/hash_info.h +mach_debug/ipc_info.h +mach_debug/lockgroup_info.h +mach_debug/mach_debug.h +mach_debug/mach_debug_types.defs +mach_debug/mach_debug_types.h +mach_debug/page_info.h +mach_debug/vm_info.h +mach_debug/zone_info.h +machine/_limits.h +machine/_mcontext.h +machine/_param.h +machine/_types.h +machine/byte_order.h +machine/endian.h +machine/fasttrap_isa.h +machine/limits.h +machine/param.h +machine/profile.h +machine/signal.h +machine/types.h +machine/vmparam.h +malloc/malloc.h +math.h +membership.h +membershipPriv.h +memory.h +menu.h +miscfs/devfs/devfs.h +miscfs/specfs/specdev.h +miscfs/union/union.h +mntopts.h +monetary.h +monitor.h +mpool.h +msgcat.h +nameser.h +nc_tparm.h +ncurses_dll.h +ndbm.h +net/bpf.h +net/dlil.h +net/ethernet.h +net/if.h +net/if_arp.h +net/if_dl.h +net/if_llc.h +net/if_media.h +net/if_mib.h +net/if_types.h +net/if_utun.h +net/if_var.h +net/kext_net.h +net/ndrv.h +net/net_kev.h +net/pfkeyv2.h +net/route.h +netdb.h +netdb_async.h +netinet/bootp.h +netinet/icmp6.h +netinet/icmp_var.h +netinet/if_ether.h +netinet/igmp.h +netinet/igmp_var.h +netinet/in.h +netinet/in_pcb.h +netinet/in_systm.h +netinet/in_var.h +netinet/ip.h +netinet/ip6.h +netinet/ip_icmp.h +netinet/ip_var.h +netinet/tcp.h +netinet/tcp_fsm.h +netinet/tcp_seq.h +netinet/tcp_timer.h +netinet/tcp_var.h +netinet/tcpip.h +netinet/udp.h +netinet/udp_var.h +netinet6/ah.h +netinet6/esp.h +netinet6/in6.h +netinet6/in6_var.h +netinet6/ipcomp.h +netinet6/ipsec.h +netinet6/nd6.h +netinet6/raw_ip6.h +netinet6/scope6_var.h +netkey/keysock.h +nfs/krpc.h +nfs/nfs.h +nfs/nfs_gss.h +nfs/nfs_ioctl.h +nfs/nfs_lock.h +nfs/nfsdiskless.h +nfs/nfsm_subs.h +nfs/nfsmount.h +nfs/nfsnode.h +nfs/nfsproto.h +nfs/nfsrvcache.h +nfs/rpcv2.h +nfs/xdr_subs.h +nl_types.h +nlist.h +notify.h +notify_keys.h +ntsid.h +objc-shared-cache.h +os/activity.h +os/alloc_once_impl.h +os/assumes.h +os/availability.h +os/base.h +os/base_private.h +os/debug_private.h +os/internal/atomic.h +os/internal/crashlog.h +os/internal/internal_shared.h +os/lock.h +os/lock_private.h +os/log.h +os/object.h +os/object_private.h +os/once_private.h +os/overflow.h +os/semaphore_private.h +os/trace.h +os/tsd.h +os/voucher_activity_private.h +os/voucher_private.h +osfmk/UserNotification/KUNCUserNotifications.h +osfmk/UserNotification/UNDReply.defs +osfmk/UserNotification/UNDRequest.defs +osfmk/UserNotification/UNDTypes.defs +osfmk/UserNotification/UNDTypes.h +osfmk/atm/atm_internal.h +osfmk/atm/atm_notification.defs +osfmk/atm/atm_types.defs +osfmk/atm/atm_types.h +osfmk/bank/bank_types.h +osfmk/console/video_console.h +osfmk/corpses/task_corpse.h +osfmk/default_pager/default_pager_types.h +osfmk/device/device.defs +osfmk/device/device_port.h +osfmk/device/device_types.defs +osfmk/device/device_types.h +osfmk/gssd/gssd_mach.defs +osfmk/gssd/gssd_mach.h +osfmk/gssd/gssd_mach_types.h +osfmk/i386/apic.h +osfmk/i386/asm.h +osfmk/i386/atomic.h +osfmk/i386/bit_routines.h +osfmk/i386/cpu_capabilities.h +osfmk/i386/cpu_data.h +osfmk/i386/cpu_number.h +osfmk/i386/cpu_topology.h +osfmk/i386/cpuid.h +osfmk/i386/eflags.h +osfmk/i386/io_map_entries.h +osfmk/i386/lapic.h +osfmk/i386/lock.h +osfmk/i386/locks.h +osfmk/i386/machine_cpu.h +osfmk/i386/machine_routines.h +osfmk/i386/mp.h +osfmk/i386/mp_desc.h +osfmk/i386/mp_events.h +osfmk/i386/mtrr.h +osfmk/i386/pal_hibernate.h +osfmk/i386/pal_native.h +osfmk/i386/pal_routines.h +osfmk/i386/panic_hooks.h +osfmk/i386/pmCPU.h +osfmk/i386/pmap.h +osfmk/i386/proc_reg.h +osfmk/i386/rtclock_protos.h +osfmk/i386/seg.h +osfmk/i386/simple_lock.h +osfmk/i386/smp.h +osfmk/i386/tsc.h +osfmk/i386/tss.h +osfmk/i386/ucode.h +osfmk/i386/vmx.h +osfmk/ipc/ipc_types.h +osfmk/kdp/kdp_callout.h +osfmk/kdp/kdp_dyld.h +osfmk/kdp/kdp_en_debugger.h +osfmk/kern/affinity.h +osfmk/kern/assert.h +osfmk/kern/audit_sessionport.h +osfmk/kern/backtrace.h +osfmk/kern/bits.h +osfmk/kern/block_hint.h +osfmk/kern/call_entry.h +osfmk/kern/clock.h +osfmk/kern/coalition.h +osfmk/kern/cpu_data.h +osfmk/kern/cpu_number.h +osfmk/kern/debug.h +osfmk/kern/ecc.h +osfmk/kern/energy_perf.h +osfmk/kern/exc_resource.h +osfmk/kern/extmod_statistics.h +osfmk/kern/host.h +osfmk/kern/hv_support.h +osfmk/kern/ipc_mig.h +osfmk/kern/ipc_misc.h +osfmk/kern/kalloc.h +osfmk/kern/kcdata.h +osfmk/kern/kern_cdata.h +osfmk/kern/kern_types.h +osfmk/kern/kext_alloc.h +osfmk/kern/kpc.h +osfmk/kern/ledger.h +osfmk/kern/lock.h +osfmk/kern/locks.h +osfmk/kern/mach_param.h +osfmk/kern/macro_help.h +osfmk/kern/page_decrypt.h +osfmk/kern/pms.h +osfmk/kern/policy_internal.h +osfmk/kern/processor.h +osfmk/kern/queue.h +osfmk/kern/sched_prim.h +osfmk/kern/sfi.h +osfmk/kern/simple_lock.h +osfmk/kern/startup.h +osfmk/kern/task.h +osfmk/kern/telemetry.h +osfmk/kern/thread.h +osfmk/kern/thread_call.h +osfmk/kern/timer_call.h +osfmk/kern/waitq.h +osfmk/kern/zalloc.h +osfmk/kextd/kextd_mach.defs +osfmk/kextd/kextd_mach.h +osfmk/kperf/action.h +osfmk/kperf/context.h +osfmk/kperf/kdebug_trigger.h +osfmk/kperf/kperf.h +osfmk/kperf/kperf_timer.h +osfmk/kperf/kperfbsd.h +osfmk/kperf/pet.h +osfmk/lockd/lockd_mach.defs +osfmk/lockd/lockd_mach.h +osfmk/lockd/lockd_mach_types.h +osfmk/mach/audit_triggers.defs +osfmk/mach/audit_triggers_server.h +osfmk/mach/boolean.h +osfmk/mach/branch_predicates.h +osfmk/mach/clock.defs +osfmk/mach/clock.h +osfmk/mach/clock_priv.defs +osfmk/mach/clock_priv.h +osfmk/mach/clock_reply.defs +osfmk/mach/clock_reply_server.h +osfmk/mach/clock_types.defs +osfmk/mach/clock_types.h +osfmk/mach/coalition.h +osfmk/mach/coalition_notification_server.h +osfmk/mach/dyld_kernel.h +osfmk/mach/error.h +osfmk/mach/exc.defs +osfmk/mach/exc_server.h +osfmk/mach/exception.h +osfmk/mach/exception_types.h +osfmk/mach/host_info.h +osfmk/mach/host_notify.h +osfmk/mach/host_notify_reply.defs +osfmk/mach/host_priv.defs +osfmk/mach/host_priv.h +osfmk/mach/host_reboot.h +osfmk/mach/host_security.defs +osfmk/mach/host_security.h +osfmk/mach/host_special_ports.h +osfmk/mach/i386/_structs.h +osfmk/mach/i386/asm.h +osfmk/mach/i386/boolean.h +osfmk/mach/i386/exception.h +osfmk/mach/i386/fp_reg.h +osfmk/mach/i386/kern_return.h +osfmk/mach/i386/ndr_def.h +osfmk/mach/i386/processor_info.h +osfmk/mach/i386/rpc.h +osfmk/mach/i386/sdt_isa.h +osfmk/mach/i386/syscall_sw.h +osfmk/mach/i386/thread_state.h +osfmk/mach/i386/thread_status.h +osfmk/mach/i386/vm_param.h +osfmk/mach/i386/vm_types.h +osfmk/mach/kern_return.h +osfmk/mach/kmod.h +osfmk/mach/ktrace_background.h +osfmk/mach/lock_set.defs +osfmk/mach/lock_set.h +osfmk/mach/mach_exc.defs +osfmk/mach/mach_exc_server.h +osfmk/mach/mach_host.defs +osfmk/mach/mach_host.h +osfmk/mach/mach_interface.h +osfmk/mach/mach_param.h +osfmk/mach/mach_port.defs +osfmk/mach/mach_port.h +osfmk/mach/mach_syscalls.h +osfmk/mach/mach_time.h +osfmk/mach/mach_traps.h +osfmk/mach/mach_types.defs +osfmk/mach/mach_types.h +osfmk/mach/mach_vm.defs +osfmk/mach/mach_vm.h +osfmk/mach/mach_voucher.defs +osfmk/mach/mach_voucher.h +osfmk/mach/mach_voucher_attr_control.defs +osfmk/mach/mach_voucher_attr_control.h +osfmk/mach/mach_voucher_types.h +osfmk/mach/machine.h +osfmk/mach/machine/asm.h +osfmk/mach/machine/boolean.h +osfmk/mach/machine/exception.h +osfmk/mach/machine/kern_return.h +osfmk/mach/machine/machine_types.defs +osfmk/mach/machine/ndr_def.h +osfmk/mach/machine/processor_info.h +osfmk/mach/machine/rpc.h +osfmk/mach/machine/sdt.h +osfmk/mach/machine/sdt_isa.h +osfmk/mach/machine/syscall_sw.h +osfmk/mach/machine/thread_state.h +osfmk/mach/machine/thread_status.h +osfmk/mach/machine/vm_param.h +osfmk/mach/machine/vm_types.h +osfmk/mach/memory_object_control.h +osfmk/mach/memory_object_default_server.h +osfmk/mach/memory_object_types.h +osfmk/mach/message.h +osfmk/mach/mig.h +osfmk/mach/mig_errors.h +osfmk/mach/mig_strncpy_zerofill_support.h +osfmk/mach/mig_voucher_support.h +osfmk/mach/ndr.h +osfmk/mach/notify.defs +osfmk/mach/notify.h +osfmk/mach/notify_server.h +osfmk/mach/policy.h +osfmk/mach/port.h +osfmk/mach/processor.defs +osfmk/mach/processor.h +osfmk/mach/processor_info.h +osfmk/mach/processor_set.defs +osfmk/mach/processor_set.h +osfmk/mach/resource_monitors.h +osfmk/mach/rpc.h +osfmk/mach/sdt.h +osfmk/mach/semaphore.h +osfmk/mach/sfi_class.h +osfmk/mach/shared_memory_server.h +osfmk/mach/shared_region.h +osfmk/mach/std_types.defs +osfmk/mach/std_types.h +osfmk/mach/sync_policy.h +osfmk/mach/syscall_sw.h +osfmk/mach/sysdiagnose_notification_server.h +osfmk/mach/task.defs +osfmk/mach/task.h +osfmk/mach/task_access.defs +osfmk/mach/task_access.h +osfmk/mach/task_access_server.h +osfmk/mach/task_info.h +osfmk/mach/task_policy.h +osfmk/mach/task_special_ports.h +osfmk/mach/telemetry_notification.defs +osfmk/mach/telemetry_notification_server.h +osfmk/mach/thread_act.defs +osfmk/mach/thread_act.h +osfmk/mach/thread_info.h +osfmk/mach/thread_policy.h +osfmk/mach/thread_special_ports.h +osfmk/mach/thread_status.h +osfmk/mach/thread_switch.h +osfmk/mach/time_value.h +osfmk/mach/upl.h +osfmk/mach/vm_attributes.h +osfmk/mach/vm_behavior.h +osfmk/mach/vm_inherit.h +osfmk/mach/vm_map.defs +osfmk/mach/vm_map.h +osfmk/mach/vm_param.h +osfmk/mach/vm_prot.h +osfmk/mach/vm_purgable.h +osfmk/mach/vm_region.h +osfmk/mach/vm_statistics.h +osfmk/mach/vm_sync.h +osfmk/mach/vm_types.h +osfmk/mach_debug/hash_info.h +osfmk/mach_debug/ipc_info.h +osfmk/mach_debug/lockgroup_info.h +osfmk/mach_debug/mach_debug.h +osfmk/mach_debug/mach_debug_types.defs +osfmk/mach_debug/mach_debug_types.h +osfmk/mach_debug/page_info.h +osfmk/mach_debug/vm_info.h +osfmk/mach_debug/zone_info.h +osfmk/machine/atomic.h +osfmk/machine/cpu_capabilities.h +osfmk/machine/cpu_number.h +osfmk/machine/io_map_entries.h +osfmk/machine/lock.h +osfmk/machine/locks.h +osfmk/machine/machine_cpuid.h +osfmk/machine/machine_kpc.h +osfmk/machine/machine_routines.h +osfmk/machine/pal_hibernate.h +osfmk/machine/pal_routines.h +osfmk/machine/simple_lock.h +osfmk/prng/random.h +osfmk/string.h +osfmk/vm/WKdm_new.h +osfmk/vm/pmap.h +osfmk/vm/vm_compressor_algorithms.h +osfmk/vm/vm_fault.h +osfmk/vm/vm_kern.h +osfmk/vm/vm_map.h +osfmk/vm/vm_options.h +osfmk/vm/vm_pageout.h +osfmk/vm/vm_protos.h +osfmk/vm/vm_shared_region.h +osfmk/voucher/ipc_pthread_priority_types.h +osfmk/x86_64/machine_kpc.h +panel.h +paths.h +pexpert/boot.h +pexpert/i386/boot.h +pexpert/i386/efi.h +pexpert/i386/protos.h +pexpert/machine/boot.h +pexpert/machine/protos.h +pexpert/pexpert.h +pexpert/pexpert/boot.h +pexpert/pexpert/device_tree.h +pexpert/pexpert/i386/boot.h +pexpert/pexpert/i386/efi.h +pexpert/pexpert/i386/protos.h +pexpert/pexpert/machine/boot.h +pexpert/pexpert/machine/protos.h +pexpert/pexpert/pexpert.h +pexpert/pexpert/protos.h +pexpert/protos.h +platform/compat.h +platform/introspection_private.h +platform/string.h +poll.h +printerdb.h +printf.h +protocols/routed.h +protocols/rwhod.h +protocols/talkd.h +protocols/timed.h +pthread.h +pthread/introspection.h +pthread/pthread.h +pthread/pthread_impl.h +pthread/pthread_spis.h +pthread/qos.h +pthread/sched.h +pthread/spawn.h +pthread_impl.h +pthread_spis.h +pthread_workqueue.h +pwd.h +ranlib.h +readpassphrase.h +reboot2.h +regex.h +removefile.h +resolv.h +rpc/auth.h +rpc/auth_unix.h +rpc/clnt.h +rpc/pmap_clnt.h +rpc/pmap_prot.h +rpc/pmap_rmt.h +rpc/rpc.h +rpc/rpc_msg.h +rpc/svc.h +rpc/svc_auth.h +rpc/types.h +rpc/xdr.h +rpcsvc/yp_prot.h +rpcsvc/ypclnt.h +runetype.h +sched.h +search.h +secure/_common.h +secure/_stdio.h +secure/_string.h +security/audit/audit_ioctl.h +security/mac.h +security/mac_policy.h +security/security/_label.h +security/security/mac.h +security/security/mac_alloc.h +security/security/mac_data.h +security/security/mac_framework.h +security/security/mac_internal.h +security/security/mac_mach_internal.h +security/security/mac_policy.h +semaphore.h +servers/bootstrap.h +servers/bootstrap_defs.h +servers/key_defs.h +servers/ls_defs.h +servers/netname.h +servers/netname_defs.h +servers/nm_defs.h +setjmp.h +sgtty.h +si_data.h +si_module.h +signal.h +spawn.h +stab.h +standards.h +stdarg.h +stddef.h +stdint.h +stdio.h +stdlib.h +strhash.h +string.h +stringlist.h +strings.h +struct.h +sys/_endian.h +sys/_posix_availability.h +sys/_pthread/_pthread_attr_t.h +sys/_pthread/_pthread_cond_t.h +sys/_pthread/_pthread_condattr_t.h +sys/_pthread/_pthread_key_t.h +sys/_pthread/_pthread_mutex_t.h +sys/_pthread/_pthread_mutexattr_t.h +sys/_pthread/_pthread_once_t.h +sys/_pthread/_pthread_rwlock_t.h +sys/_pthread/_pthread_rwlockattr_t.h +sys/_pthread/_pthread_t.h +sys/_pthread/_pthread_types.h +sys/_select.h +sys/_structs.h +sys/_symbol_aliasing.h +sys/_types.h +sys/_types/_blkcnt_t.h +sys/_types/_blksize_t.h +sys/_types/_clock_t.h +sys/_types/_ct_rune_t.h +sys/_types/_dev_t.h +sys/_types/_errno_t.h +sys/_types/_fd_clr.h +sys/_types/_fd_copy.h +sys/_types/_fd_def.h +sys/_types/_fd_isset.h +sys/_types/_fd_set.h +sys/_types/_fd_setsize.h +sys/_types/_fd_zero.h +sys/_types/_filesec_t.h +sys/_types/_fsblkcnt_t.h +sys/_types/_fsfilcnt_t.h +sys/_types/_fsid_t.h +sys/_types/_fsobj_id_t.h +sys/_types/_gid_t.h +sys/_types/_guid_t.h +sys/_types/_id_t.h +sys/_types/_in_addr_t.h +sys/_types/_in_port_t.h +sys/_types/_ino64_t.h +sys/_types/_ino_t.h +sys/_types/_int16_t.h +sys/_types/_int32_t.h +sys/_types/_int64_t.h +sys/_types/_int8_t.h +sys/_types/_intptr_t.h +sys/_types/_iovec_t.h +sys/_types/_key_t.h +sys/_types/_mach_port_t.h +sys/_types/_mbstate_t.h +sys/_types/_mode_t.h +sys/_types/_nlink_t.h +sys/_types/_null.h +sys/_types/_o_dsync.h +sys/_types/_o_sync.h +sys/_types/_off_t.h +sys/_types/_offsetof.h +sys/_types/_os_inline.h +sys/_types/_pid_t.h +sys/_types/_posix_vdisable.h +sys/_types/_pthread_attr_t.h +sys/_types/_pthread_cond_t.h +sys/_types/_pthread_condattr_t.h +sys/_types/_pthread_key_t.h +sys/_types/_pthread_mutex_t.h +sys/_types/_pthread_mutexattr_t.h +sys/_types/_pthread_once_t.h +sys/_types/_pthread_rwlock_t.h +sys/_types/_pthread_rwlockattr_t.h +sys/_types/_pthread_t.h +sys/_types/_pthread_types.h +sys/_types/_ptrdiff_t.h +sys/_types/_rsize_t.h +sys/_types/_rune_t.h +sys/_types/_s_ifmt.h +sys/_types/_sa_family_t.h +sys/_types/_seek_set.h +sys/_types/_sigaltstack.h +sys/_types/_sigset_t.h +sys/_types/_size_t.h +sys/_types/_socklen_t.h +sys/_types/_ssize_t.h +sys/_types/_suseconds_t.h +sys/_types/_time_t.h +sys/_types/_timespec.h +sys/_types/_timeval.h +sys/_types/_timeval32.h +sys/_types/_timeval64.h +sys/_types/_u_int16_t.h +sys/_types/_u_int32_t.h +sys/_types/_u_int64_t.h +sys/_types/_u_int8_t.h +sys/_types/_ucontext.h +sys/_types/_ucontext64.h +sys/_types/_uid_t.h +sys/_types/_uintptr_t.h +sys/_types/_useconds_t.h +sys/_types/_uuid_t.h +sys/_types/_va_list.h +sys/_types/_wchar_t.h +sys/_types/_wint_t.h +sys/acct.h +sys/acl.h +sys/aio.h +sys/appleapiopts.h +sys/attr.h +sys/buf.h +sys/cdefs.h +sys/clonefile.h +sys/conf.h +sys/dir.h +sys/dirent.h +sys/disk.h +sys/dkstat.h +sys/domain.h +sys/dtrace.h +sys/dtrace_glue.h +sys/dtrace_impl.h +sys/errno.h +sys/ev.h +sys/event.h +sys/fasttrap.h +sys/fasttrap_isa.h +sys/fcntl.h +sys/file.h +sys/filedesc.h +sys/filio.h +sys/gmon.h +sys/ioccom.h +sys/ioctl.h +sys/ioctl_compat.h +sys/ipc.h +sys/kauth.h +sys/kdebug.h +sys/kdebug_signpost.h +sys/kern_control.h +sys/kern_event.h +sys/kernel.h +sys/kernel_types.h +sys/lctx.h +sys/loadable_fs.h +sys/lock.h +sys/lockf.h +sys/lockstat.h +sys/malloc.h +sys/mbuf.h +sys/mman.h +sys/mount.h +sys/msg.h +sys/msgbuf.h +sys/netport.h +sys/param.h +sys/paths.h +sys/pipe.h +sys/poll.h +sys/posix_sem.h +sys/posix_shm.h +sys/proc.h +sys/proc_info.h +sys/protosw.h +sys/ptrace.h +sys/qos.h +sys/qos_private.h +sys/queue.h +sys/quota.h +sys/random.h +sys/rbtree.h +sys/reboot.h +sys/resource.h +sys/resourcevar.h +sys/sbuf.h +sys/sdt.h +sys/select.h +sys/sem.h +sys/semaphore.h +sys/shm.h +sys/signal.h +sys/signalvar.h +sys/socket.h +sys/socketvar.h +sys/sockio.h +sys/spawn.h +sys/stat.h +sys/statvfs.h +sys/stdio.h +sys/sys_domain.h +sys/syscall.h +sys/sysctl.h +sys/syslimits.h +sys/syslog.h +sys/termios.h +sys/time.h +sys/timeb.h +sys/times.h +sys/tprintf.h +sys/trace.h +sys/tty.h +sys/ttychars.h +sys/ttycom.h +sys/ttydefaults.h +sys/ttydev.h +sys/types.h +sys/ubc.h +sys/ucontext.h +sys/ucred.h +sys/uio.h +sys/un.h +sys/unistd.h +sys/unpcb.h +sys/user.h +sys/utfconv.h +sys/utsname.h +sys/vadvise.h +sys/vcmd.h +sys/vm.h +sys/vmmeter.h +sys/vmparam.h +sys/vnioctl.h +sys/vnode.h +sys/vnode_if.h +sys/vstat.h +sys/wait.h +sys/xattr.h +sysexits.h +syslog.h +tar.h +term.h +term_entry.h +termcap.h +termios.h +thread_data.h +tic.h +time.h +timeconv.h +ttyent.h +tzfile.h +tzlink.h +tzlink_internal.h +ucontext.h +ulimit.h +unctrl.h +unistd.h +util.h +utime.h +utmpx.h +utmpx_thread.h +uuid/uuid.h +vfs/vfs_support.h +vis.h +voucher/ipc_pthread_priority_types.h +vproc.h +vproc_internal.h +vproc_priv.h +wchar.h +wctype.h +wipefs.h +wordexp.h +xlocale.h +xlocale/__wctype.h +xlocale/_ctype.h +xlocale/_inttypes.h +xlocale/_langinfo.h +xlocale/_monetary.h +xlocale/_regex.h +xlocale/_stdio.h +xlocale/_stdlib.h +xlocale/_string.h +xlocale/_time.h +xlocale/_wchar.h +xlocale/_wctype.h diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/boot.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/boot.nix index 2a2d4cbe493..4855c532acb 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/boot.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/boot.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, fetchzip, bsdmake, perl, flex, yacc +{ lib, appleDerivation, fetchzip, bsdmake, perl, flex, yacc }: # this derivation sucks @@ -85,7 +85,7 @@ in appleDerivation { setOutputFlags = false; meta = { - platforms = stdenv.lib.platforms.darwin; - maintainers = with stdenv.lib.maintainers; [ gridaphobe ]; + platforms = lib.platforms.darwin; + maintainers = with lib.maintainers; [ gridaphobe ]; }; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix index 6113eed007e..6e659df4d62 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, xcbuild, ncurses, libutil }: +{ lib, appleDerivation, xcbuild, ncurses, libutil }: appleDerivation { # We can't just run the root build, because https://github.com/facebook/xcbuild/issues/264 @@ -45,7 +45,7 @@ appleDerivation { buildInputs = [ ncurses libutil ]; meta = { - platforms = stdenv.lib.platforms.darwin; - maintainers = with stdenv.lib.maintainers; [ matthewbauer ]; + platforms = lib.platforms.darwin; + maintainers = with lib.maintainers; [ matthewbauer ]; }; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix b/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix index f7503dbb953..74327bc4c42 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, appleDerivation }: +{ lib, appleDerivation }: appleDerivation { dontBuild = true; @@ -13,6 +13,24 @@ appleDerivation { DSTROOT = "$(out)"; + appleHeaders = '' + architecture/alignment.h + architecture/byte_order.h + architecture/i386/alignment.h + architecture/i386/asm_help.h + architecture/i386/byte_order.h + architecture/i386/cpu.h + architecture/i386/desc.h + architecture/i386/fpu.h + architecture/i386/frame.h + architecture/i386/io.h + architecture/i386/pio.h + architecture/i386/reg_help.h + architecture/i386/sel.h + architecture/i386/table.h + architecture/i386/tss.h + ''; + meta = with lib; { maintainers = with maintainers; [ copumpkin ]; platforms = platforms.darwin; diff --git a/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix index eadf18e028e..7d011d2d8cc 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, xcbuildHook }: +{ lib, appleDerivation, xcbuildHook }: appleDerivation { nativeBuildInputs = [ xcbuildHook ]; @@ -26,7 +26,7 @@ appleDerivation { ''; meta = { - platforms = stdenv.lib.platforms.darwin; - maintainers = with stdenv.lib.maintainers; [ matthewbauer ]; + platforms = lib.platforms.darwin; + maintainers = with lib.maintainers; [ matthewbauer ]; }; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix index 256781f61b1..002709ce2df 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix @@ -1,29 +1,18 @@ -{ stdenv, appleDerivation, yacc, flex }: +{ lib, appleDerivation, yacc, flex }: appleDerivation { nativeBuildInputs = [ yacc flex ]; buildPhase = '' cd migcom.tproj + + # redundant file, don't know why apple not removing it. + rm handler.c + yacc -d parser.y flex --header-file=lexxer.yy.h -o lexxer.yy.c lexxer.l - cc -Os -pipe -DMIG_VERSION="" -Wall -mdynamic-no-pic -I. -c -o error.o error.c - cc -Os -pipe -DMIG_VERSION="" -Wall -mdynamic-no-pic -I. -c -o global.o global.c - cc -Os -pipe -DMIG_VERSION="" -Wall -mdynamic-no-pic -I. -c -o handler.o header.c - cc -Os -pipe -DMIG_VERSION="" -Wall -mdynamic-no-pic -I. -c -o header.o header.c - cc -Os -pipe -DMIG_VERSION="" -Wall -mdynamic-no-pic -I. -c -o mig.o mig.c - cc -Os -pipe -DMIG_VERSION="" -Wall -mdynamic-no-pic -I. -c -o routine.o routine.c - cc -Os -pipe -DMIG_VERSION="" -Wall -mdynamic-no-pic -I. -c -o server.o server.c - cc -Os -pipe -DMIG_VERSION="" -Wall -mdynamic-no-pic -I. -c -o statement.o statement.c - cc -Os -pipe -DMIG_VERSION="" -Wall -mdynamic-no-pic -I. -c -o string.o string.c - cc -Os -pipe -DMIG_VERSION="" -Wall -mdynamic-no-pic -I. -c -o type.o type.c - cc -Os -pipe -DMIG_VERSION="" -Wall -mdynamic-no-pic -I. -c -o user.o user.c - cc -Os -pipe -DMIG_VERSION="" -Wall -mdynamic-no-pic -I. -c -o utils.o utils.c - cc -Os -pipe -DMIG_VERSION="" -Wall -mdynamic-no-pic -I. -c -o lexxer.yy.o lexxer.yy.c - cc -Os -pipe -DMIG_VERSION="" -Wall -mdynamic-no-pic -I. -c -o y.tab.o y.tab.c - - cc -dead_strip -o migcom error.o global.o header.o mig.o routine.o server.o statement.o string.o type.o user.o utils.o lexxer.yy.o y.tab.o + cc -std=gnu99 -Os -dead_strip -DMIG_VERSION=\"$pname-$version\" -I. -o migcom *.c ''; installPhase = '' @@ -42,8 +31,4 @@ appleDerivation { --replace '/bin/rmdir' "rmdir" \ --replace 'C=''${MIGCC}' "C=cc" ''; - - meta = { - platforms = stdenv.lib.platforms.darwin; - }; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix b/pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix index 043c7b0bc70..6f666019c3b 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, makeWrapper }: +{ lib, appleDerivation, makeWrapper }: appleDerivation { nativeBuildInputs = [ makeWrapper ]; @@ -44,6 +44,6 @@ appleDerivation { ''; meta = { - platforms = stdenv.lib.platforms.darwin; + platforms = lib.platforms.darwin; }; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index 14c69b84eb4..23434931542 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -1,6 +1,9 @@ -{ stdenv, fetchurl, fetchzip, pkgs }: +{ lib, stdenv, fetchurl, fetchzip, pkgs }: let + macosPackages_11_0_1 = import ./macos-11.0.1.nix { inherit applePackage'; }; + developerToolsPackages_11_3_1 = import ./developer-tools-11.3.1.nix { inherit applePackage'; }; + # This attrset can in theory be computed automatically, but for that to work nicely we need # import-from-derivation to work properly. Currently it's rather ugly when we try to bootstrap # a stdenv out of something like this. With some care we can probably get rid of this, but for @@ -57,6 +60,9 @@ let libplatform = "125"; mDNSResponder = "625.41.2"; + # IOKit contains a set of packages with different versions, so we don't have a general version + IOKit = ""; + libutil = "43"; libunwind = "35.3"; Librpcsvc = "26"; @@ -135,35 +141,65 @@ let }; }; - fetchApple = version: sha256: name: let + fetchApple' = pname: version: sha256: let # When cross-compiling, fetchurl depends on libiconv, resulting # in an infinite recursion without this. It's not clear why this # worked fine when not cross-compiling - fetch = if name == "libiconv" + fetch = if pname == "libiconv" then stdenv.fetchurlBoot else fetchurl; in fetch { - url = "http://www.opensource.apple.com/tarballs/${name}/${name}-${versions.${version}.${name}}.tar.gz"; + url = "http://www.opensource.apple.com/tarballs/${pname}/${pname}-${version}.tar.gz"; inherit sha256; }; - appleDerivation_ = name: version: sha256: attrs: stdenv.mkDerivation ({ - inherit version; - name = "${name}-${version}"; + fetchApple = sdkName: sha256: pname: let + version = versions.${sdkName}.${pname}; + in fetchApple' pname version sha256; + + appleDerivation' = pname: version: sdkName: sha256: attrs: stdenv.mkDerivation ({ + inherit pname version; + + src = if attrs ? srcs then null else (fetchApple' pname version sha256); + enableParallelBuilding = true; - meta = { - platforms = stdenv.lib.platforms.darwin; - }; - } // (if attrs ? srcs then {} else { - src = fetchApple version sha256 name; - }) // attrs); - applePackage = namePath: version: sha256: - let - name = builtins.elemAt (stdenv.lib.splitString "/" namePath) 0; - appleDerivation = appleDerivation_ name version sha256; - callPackage = pkgs.newScope (packages // pkgs.darwin // { inherit appleDerivation name version; }); - in callPackage (./. + "/${namePath}"); + # In rare cases, APPLE may drop some headers quietly on new release. + doInstallCheck = attrs ? appleHeaders; + passAsFile = [ "appleHeaders" ]; + installCheckPhase = '' + cd $out/include + + result=$(diff -u "$appleHeadersPath" <(find * -type f | sort) --label "Listed in appleHeaders" --label "Found in \$out/include" || true) + + if [ -z "$result" ]; then + echo "Apple header list is matched." + else + echo >&2 "\ + Apple header list is inconsistent, please ensure no header file is unexpectedly dropped. + $result + " + exit 1 + fi + ''; + + } // attrs // { + meta = (with lib; { + platforms = platforms.darwin; + license = licenses.apsl20; + }) // (attrs.meta or {}); + }); + + applePackage' = namePath: version: sdkName: sha256: let + pname = builtins.head (lib.splitString "/" namePath); + appleDerivation = appleDerivation' pname version sdkName sha256; + callPackage = pkgs.newScope (packages // pkgs.darwin // { inherit appleDerivation; }); + in callPackage (./. + "/${namePath}"); + + applePackage = namePath: sdkName: sha256: let + pname = builtins.head (lib.splitString "/" namePath); + version = versions.${sdkName}.${pname}; + in applePackage' namePath version sdkName sha256; IOKitSpecs = { IOAudioFamily = fetchApple "osx-10.10.5" "0ggq7za3iq8g02j16rj67prqhrw828jsw3ah3bxq8a1cvr55aqnq"; @@ -187,15 +223,15 @@ let # There should be an IOVideo here, but they haven't released it :( }; - IOKitSrcs = stdenv.lib.mapAttrs (name: value: if stdenv.lib.isFunction value then value name else value) IOKitSpecs; + IOKitSrcs = lib.mapAttrs (name: value: if lib.isFunction value then value name else value) IOKitSpecs; # Only used for bootstrapping. It’s convenient because it was the last version to come with a real makefile. adv_cmds-boot = applePackage "adv_cmds/boot.nix" "osx-10.5.8" "102ssayxbg9wb35mdmhswbnw0bg7js3pfd8fcbic83c5q3bqa6c6" {}; - packages = { + # TODO: shorten this list, we should cut down to a minimum set of bootstrap or necessary packages here. + stubPackages = { inherit (adv_cmds-boot) ps locale; architecture = applePackage "architecture" "osx-10.11.6" "1pbpjcd7is69hn8y29i98ci0byik826if8gnp824ha92h90w0fq3" {}; - bootstrap_cmds = applePackage "bootstrap_cmds" "dev-tools-7.0" "1v5dv2q3af1xwj5kz0a5g54fd5dm6j4c9dd2g66n4kc44ixyrhp3" {}; bsdmake = applePackage "bsdmake" "dev-tools-3.2.6" "11a9kkhz5bfgi1i8kpdkis78lhc6b5vxmhd598fcdgra1jw4iac2" {}; CarbonHeaders = applePackage "CarbonHeaders" "osx-10.6.2" "1zam29847cxr6y9rnl76zqmkbac53nx0szmqm9w5p469a6wzjqar" {}; CommonCrypto = applePackage "CommonCrypto" "osx-10.12.6" "0sgsqjcxbdm2g2zfpc50mzmk4b4ldyw7xvvkwiayhpczg1fga4ff" {}; @@ -207,7 +243,6 @@ let dtrace = applePackage "dtrace" "osx-10.12.6" "0hpd6348av463yqf70n3xkygwmf1i5zza8kps4zys52sviqz3a0l" {}; dyld = applePackage "dyld" "osx-10.12.6" "0q4jmk78b5ajn33blh4agyq6v2a63lpb3fln78az0dy12bnp1qqk" {}; eap8021x = applePackage "eap8021x" "osx-10.11.6" "0iw0qdib59hihyx2275rwq507bq2a06gaj8db4a8z1rkaj1frskh" {}; - ICU = applePackage "ICU" "osx-10.10.5" "1qihlp42n5g4dl0sn0f9pc0bkxy1452dxzf0vr6y5gqpshlzy03p" {}; IOKit = applePackage "IOKit" "osx-10.11.6" "0kcbrlyxcyirvg5p95hjd9k8a01k161zg0bsfgfhkb90kh2s8x00" { inherit IOKitSrcs; }; launchd = applePackage "launchd" "osx-10.9.5" "0w30hvwqq8j5n90s3qyp0fccxflvrmmjnicjri4i1vd2g196jdgj" {}; libauto = applePackage "libauto" "osx-10.9.5" "17z27yq5d7zfkwr49r7f0vn9pxvj95884sd2k6lq6rfaz9gxqhy3" {}; @@ -254,6 +289,8 @@ let # TODO(matthewbauer): # To be removed, once I figure out how to build a newer Security version. - Security = applePackage "Security/boot.nix" "osx-10.9.5" "1nv0dczf67dhk17hscx52izgdcyacgyy12ag0jh6nl5hmfzsn8yy" {}; + Security = applePackage "Security/boot.nix" "osx-10.9.5" "1nv0dczf67dhk17hscx52izgdcyacgyy12ag0jh6nl5hmfzsn8yy" {}; }; + + packages = developerToolsPackages_11_3_1 // macosPackages_11_0_1 // stubPackages; in packages diff --git a/pkgs/os-specific/darwin/apple-source-releases/developer-tools-11.3.1.nix b/pkgs/os-specific/darwin/apple-source-releases/developer-tools-11.3.1.nix new file mode 100644 index 00000000000..f57d224615f --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/developer-tools-11.3.1.nix @@ -0,0 +1,8 @@ +# Generated using: ./generate-sdk-packages.sh developer-tools 11.3.1 + +{ applePackage' }: + +{ +bootstrap_cmds = applePackage' "bootstrap_cmds" "116" "developer-tools-11.3.1" "148xpqkf5xzpslqxch5l8h6vsz7sys8sdzk4ghbg9mkcivp8qa03" {}; +developer_cmds = applePackage' "developer_cmds" "66" "developer-tools-11.3.1" "0q08m4cxxwph7gxqravmx13l418p1i050bd46zwksn9j9zpw9mlr" {}; +} diff --git a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix index cfd13b1b049..77de079e2f0 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, xcbuildHook, llvmPackages }: +{ lib, appleDerivation, xcbuildHook, llvmPackages }: appleDerivation { nativeBuildInputs = [ xcbuildHook ]; @@ -30,7 +30,7 @@ appleDerivation { ''; meta = { - platforms = stdenv.lib.platforms.darwin; - maintainers = with stdenv.lib.maintainers; [ matthewbauer ]; + platforms = lib.platforms.darwin; + maintainers = with lib.maintainers; [ matthewbauer ]; }; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix index 6d3bd103811..1daa4929610 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, xcbuildHook +{ lib, appleDerivation, xcbuildHook , Libc, xnu, libutil }: appleDerivation { @@ -32,7 +32,7 @@ appleDerivation { ''; meta = { - platforms = stdenv.lib.platforms.darwin; - maintainers = with stdenv.lib.maintainers; [ matthewbauer ]; + platforms = lib.platforms.darwin; + maintainers = with lib.maintainers; [ matthewbauer ]; }; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/dyld/default.nix b/pkgs/os-specific/darwin/apple-source-releases/dyld/default.nix index 4a72ea337eb..01d44d22f5e 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/dyld/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/dyld/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, appleDerivation }: +{ lib, appleDerivation }: appleDerivation { installPhase = '' diff --git a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix index 5de84d2a6e5..258d9785e70 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, xcbuildHook, zlib, bzip2, lzma, ncurses, libutil }: +{ lib, appleDerivation, xcbuildHook, zlib, bzip2, lzma, ncurses, libutil }: appleDerivation { nativeBuildInputs = [ xcbuildHook ]; @@ -32,7 +32,7 @@ appleDerivation { ''; meta = { - platforms = stdenv.lib.platforms.darwin; - maintainers = with stdenv.lib.maintainers; [ matthewbauer ]; + platforms = lib.platforms.darwin; + maintainers = with lib.maintainers; [ matthewbauer ]; }; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/generate-sdk-packages.sh b/pkgs/os-specific/darwin/apple-source-releases/generate-sdk-packages.sh new file mode 100755 index 00000000000..d7c3fc89c52 --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/generate-sdk-packages.sh @@ -0,0 +1,29 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl + +# usage: +# generate-sdk-packages.sh macos 11.0.1 + +cd $(dirname "$0") + +sdkName="$1-$2" +outfile="$sdkName.nix" + +>$outfile echo "# Generated using: ./$(basename "$0") $1 $2 + +{ applePackage' }: + +{" + +parse_line() { + readarray -t -d$'\t' package <<<$2 + local pname=${package[0]} version=${package[1]} + + if [ -d $pname ]; then + sha256=$(nix-prefetch-url "https://opensource.apple.com/tarballs/$pname/$pname-$version.tar.gz") + >>$outfile echo "$pname = applePackage' \"$pname\" \"$version\" \"$sdkName\" \"$sha256\" {};" + fi +} +readarray -s1 -c1 -C parse_line < <(curl -sS "https://opensource.apple.com/text/${sdkName//./}.txt") + +>>$outfile echo '}' diff --git a/pkgs/os-specific/darwin/apple-source-releases/hfs/default.nix b/pkgs/os-specific/darwin/apple-source-releases/hfs/default.nix index ab294b143d3..58bac765a95 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/hfs/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/hfs/default.nix @@ -1,8 +1,47 @@ -{ appleDerivation, lib, headersOnly ? false }: +{ appleDerivation, lib, headersOnly ? true }: appleDerivation { installPhase = lib.optionalString headersOnly '' mkdir -p $out/include/hfs cp core/*.h $out/include/hfs ''; + + appleHeaders = '' + hfs/BTreeScanner.h + hfs/BTreesInternal.h + hfs/BTreesPrivate.h + hfs/CatalogPrivate.h + hfs/FileMgrInternal.h + hfs/HFSUnicodeWrappers.h + hfs/UCStringCompareData.h + hfs/hfs.h + hfs/hfs_alloc_trace.h + hfs/hfs_attrlist.h + hfs/hfs_btreeio.h + hfs/hfs_catalog.h + hfs/hfs_cnode.h + hfs/hfs_cprotect.h + hfs/hfs_dbg.h + hfs/hfs_endian.h + hfs/hfs_extents.h + hfs/hfs_format.h + hfs/hfs_fsctl.h + hfs/hfs_hotfiles.h + hfs/hfs_iokit.h + hfs/hfs_journal.h + hfs/hfs_kdebug.h + hfs/hfs_key_roll.h + hfs/hfs_macos_defs.h + hfs/hfs_mount.h + hfs/hfs_quota.h + hfs/hfs_unistr.h + hfs/kext-config.h + hfs/rangelist.h + ''; + + meta = { + # Seems nobody wants its binary, so we didn't implement building. + broken = !headersOnly; + platforms = lib.platforms.darwin; + }; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/launchd/default.nix b/pkgs/os-specific/darwin/apple-source-releases/launchd/default.nix index eed7982e9d8..c882b83d0a3 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/launchd/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/launchd/default.nix @@ -9,4 +9,18 @@ appleDerivation { cp liblaunch/bootstrap.h $out/include/servers cp liblaunch/bootstrap.h $out/include/servers/bootstrap_defs.h ''; + + appleHeaders = '' + bootstrap.h + bootstrap_priv.h + launch.h + launch_internal.h + launch_priv.h + reboot2.h + servers/bootstrap.h + servers/bootstrap_defs.h + vproc.h + vproc_internal.h + vproc_priv.h + ''; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/libauto/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libauto/default.nix index b2ef3374ca2..8a551dcc892 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libauto/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libauto/default.nix @@ -1,8 +1,8 @@ -{ stdenv, appleDerivation, libdispatch, Libsystem }: +{ lib, stdenv, appleDerivation, libdispatch, Libsystem }: appleDerivation { # these are included in the pure libc - buildInputs = stdenv.lib.optionals stdenv.cc.nativeLibc [ libdispatch Libsystem ]; + buildInputs = lib.optionals stdenv.cc.nativeLibc [ libdispatch Libsystem ]; buildPhase = '' cp ${./auto_dtrace.h} ./auto_dtrace.h @@ -79,6 +79,8 @@ appleDerivation { ''; meta = { - platforms = stdenv.lib.platforms.darwin; + # libauto is only used by objc4/pure.nix , but objc4 is now using the impure approach, so we don't bother to fix this. + broken = true; + platforms = lib.platforms.darwin; }; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/libclosure/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libclosure/default.nix index ac33a24a8b4..d42a288208c 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libclosure/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libclosure/default.nix @@ -5,4 +5,9 @@ appleDerivation { mkdir -p $out/include cp *.h $out/include/ ''; + + appleHeaders = '' + Block.h + Block_private.h + ''; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix index e7aa47bdb6b..3b9d4a34cc6 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix @@ -22,4 +22,33 @@ appleDerivation { typedef void* dispatch_block_t; #endif' ''; + + appleHeaders = '' + dispatch/base.h + dispatch/benchmark.h + dispatch/block.h + dispatch/data.h + dispatch/data_private.h + dispatch/dispatch.h + dispatch/group.h + dispatch/introspection.h + dispatch/introspection_private.h + dispatch/io.h + dispatch/io_private.h + dispatch/layout_private.h + dispatch/mach_private.h + dispatch/object.h + dispatch/once.h + dispatch/private.h + dispatch/queue.h + dispatch/queue_private.h + dispatch/semaphore.h + dispatch/source.h + dispatch/source_private.h + dispatch/time.h + os/object.h + os/object_private.h + os/voucher_activity_private.h + os/voucher_private.h + ''; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix index 4fd0ab8a7fb..9acbcb212e4 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix @@ -5,4 +5,28 @@ appleDerivation { mkdir $out cp -r include $out/include ''; + + appleHeaders = '' + _simple.h + libkern/OSAtomic.h + libkern/OSAtomicDeprecated.h + libkern/OSAtomicQueue.h + libkern/OSCacheControl.h + libkern/OSSpinLockDeprecated.h + os/alloc_once_impl.h + os/base.h + os/base_private.h + os/internal/atomic.h + os/internal/crashlog.h + os/internal/internal_shared.h + os/lock.h + os/lock_private.h + os/once_private.h + os/semaphore_private.h + platform/compat.h + platform/introspection_private.h + platform/string.h + setjmp.h + ucontext.h + ''; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix index 650c6415def..20eccd82059 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, libdispatch, xnu }: +{ lib, appleDerivation, libdispatch, xnu }: appleDerivation { propagatedBuildInputs = [ libdispatch xnu ]; @@ -15,7 +15,41 @@ appleDerivation { cp -r sys/_pthread/*.h $out/include/sys/_types/ ''; + appleHeaders = '' + pthread/introspection.h + pthread/pthread.h + pthread/pthread_impl.h + pthread/pthread_spis.h + pthread/qos.h + pthread/sched.h + pthread/spawn.h + sys/_pthread/_pthread_attr_t.h + sys/_pthread/_pthread_cond_t.h + sys/_pthread/_pthread_condattr_t.h + sys/_pthread/_pthread_key_t.h + sys/_pthread/_pthread_mutex_t.h + sys/_pthread/_pthread_mutexattr_t.h + sys/_pthread/_pthread_once_t.h + sys/_pthread/_pthread_rwlock_t.h + sys/_pthread/_pthread_rwlockattr_t.h + sys/_pthread/_pthread_t.h + sys/_pthread/_pthread_types.h + sys/_types/_pthread_attr_t.h + sys/_types/_pthread_cond_t.h + sys/_types/_pthread_condattr_t.h + sys/_types/_pthread_key_t.h + sys/_types/_pthread_mutex_t.h + sys/_types/_pthread_mutexattr_t.h + sys/_types/_pthread_once_t.h + sys/_types/_pthread_rwlock_t.h + sys/_types/_pthread_rwlockattr_t.h + sys/_types/_pthread_t.h + sys/_types/_pthread_types.h + sys/qos.h + sys/qos_private.h + ''; + meta = { - platforms = stdenv.lib.platforms.darwin; + platforms = lib.platforms.darwin; }; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/libunwind/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libunwind/default.nix index 24986e28852..5021d3cd7fe 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libunwind/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libunwind/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, appleDerivation }: +{ lib, appleDerivation }: appleDerivation { buildPhase = ":"; diff --git a/pkgs/os-specific/darwin/apple-source-releases/libutil/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libutil/default.nix index 2b196e46ef4..ea9ca75e7e5 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libutil/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libutil/default.nix @@ -27,6 +27,14 @@ appleDerivation { install_name_tool -id $out/lib/libutil.dylib $out/lib/libutil.dylib ''; + # FIXME: headers are different against headersOnly. And all the headers are NOT in macos, do we really want them? + # appleHeaders = '' + # libutil.h + # mntopts.h + # tzlink.h + # wipefs.h + # ''; + meta = with lib; { maintainers = with maintainers; [ copumpkin ]; platforms = platforms.darwin; diff --git a/pkgs/os-specific/darwin/apple-source-releases/macos-11.0.1.nix b/pkgs/os-specific/darwin/apple-source-releases/macos-11.0.1.nix new file mode 100644 index 00000000000..517f53e9435 --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/macos-11.0.1.nix @@ -0,0 +1,46 @@ +# Generated using: ./generate-sdk-packages.sh macos 11.0.1 + +{ applePackage' }: + +{ +adv_cmds = applePackage' "adv_cmds" "176" "macos-11.0.1" "0x8c25rh6fnzndbc26vcb65vcxilvqyfvm2klfyci1wr4bh3ixgk" {}; +architecture = applePackage' "architecture" "279" "macos-11.0.1" "1cgp33ywa30max6cyp69kvii299hx2vgwvmy3ms8n4gaq2mkpaky" {}; +basic_cmds = applePackage' "basic_cmds" "55" "macos-11.0.1" "0hvab4b1v5q2x134hdkal0rmz5gsdqyki1vb0dbw4py1bqf0yaw9" {}; +bootstrap_cmds = applePackage' "bootstrap_cmds" "121" "macos-11.0.1" "09bwclws6adxb1ky9q35f4ikddk4mbalmgds0cmqaf7j23qxl3fv" {}; +CommonCrypto = applePackage' "CommonCrypto" "60178.40.2" "macos-11.0.1" "0r3b1mlfmbdzpwn6pbsbfaga3k63gpwcwbhkbi4r09aq82skl02v" {}; +configd = applePackage' "configd" "1109.40.9" "macos-11.0.1" "173i55wfzli9pg2x2rw437hs68h6l4ngss5jfgf18g26zjkjzv5v" {}; +copyfile = applePackage' "copyfile" "173.40.2" "macos-11.0.1" "0qyp15qj3fdb7yx033n57l7s61d70mv17f43yiwcbhx09mmlrp07" {}; +Csu = applePackage' "Csu" "88" "macos-11.0.1" "029lgcyj0i16036h2lcx6fd6r1yf1bkj5dnvz905rh6ncl8skgdr" {}; +diskdev_cmds = applePackage' "diskdev_cmds" "667.40.1" "macos-11.0.1" "1bqwkwkwd556rba5000ap77xrhaf4xnmy83mszd7a0yvl2xlma7j" {}; +dtrace = applePackage' "dtrace" "370.40.1" "macos-11.0.1" "1941yczmn94ng5zlnhf0i5mjw2f4g7znisgvhkhn5f86gxmd98wl" {}; +dyld = applePackage' "dyld" "832.7.1" "macos-11.0.1" "1s77ca6jg20z91qlph59da8j61m97y23vrw48xs4rywdzh4915n0" {}; +eap8021x = applePackage' "eap8021x" "304.40.1" "macos-11.0.1" "1ph3kcpf527s0jqsi60j2sgg3m8h128spf292d8kyc08siz9mf9c" {}; +file_cmds = applePackage' "file_cmds" "321.40.3" "macos-11.0.1" "04789vn1wghclfr3ma3ncg716xdsxfj66hrcxi5h3h1ryag2ycfz" {}; +hfs = applePackage' "hfs" "556.41.1" "macos-11.0.1" "1rhkmn2yj5p4wmi4aajy5hj2h0gxk63s8j4qz4ziy4g4bjpdgwmy" {}; +ICU = applePackage' "ICU" "66108" "macos-11.0.1" "1d76cyyqpwkzjlxfajm4nsglxmfrcafbnjwnjxc3j5w3nw67pqhx" {}; +Libc = applePackage' "Libc" "1439.40.11" "macos-11.0.1" "0d5xlnks4lc9391wg31c9126vflb40lc5ffkgxmf2kpyglac1280" {}; +libclosure = applePackage' "libclosure" "78" "macos-11.0.1" "089i2bl4agpnfplrg23xbzma1674g0w05988nxdps6ghxl4kz66f" {}; +libdispatch = applePackage' "libdispatch" "1271.40.12" "macos-11.0.1" "0z7r42zfb8y48f0nrw0qw7fanfvimycimgnrg3jig101kjvjar98" {}; +libiconv = applePackage' "libiconv" "59" "macos-11.0.1" "0hqbsqggjrr0sv6h70lcr3gabgk9inyc8aq1b30wibgjm6crjwpp" {}; +Libinfo = applePackage' "Libinfo" "542.40.3" "macos-11.0.1" "0y5x6wxd3mwn6my1jdp8qrak3y7x7sgjdmwyw9cvvbn3kg9v6z1p" {}; +Libnotify = applePackage' "Libnotify" "279.40.4" "macos-11.0.1" "0aswflxki877izp6sacv35sydn6a3639cflv3zhs3i7vkfbsvbf5" {}; +libplatform = applePackage' "libplatform" "254.40.4" "macos-11.0.1" "1mhi8n66864y98dr3n0pkqad3aqim800kn9bxzp6h5jf2jni3aql" {}; +libpthread = applePackage' "libpthread" "454.40.3" "macos-11.0.1" "18rb4dqjdf3krzi4hdj5i310gy49ipf01klbkp9g51i02a55gphq" {}; +libresolv = applePackage' "libresolv" "68" "macos-11.0.1" "1ysvg6d28xyaky9sn7giglnsflhjsbj17h3h3i6knlzxnzznpkql" {}; +Librpcsvc = applePackage' "Librpcsvc" "26" "macos-11.0.1" "1zwfwcl9irxl1dlnf2b4v30vdybp0p0r6n6g1pd14zbdci1jcg2k" {}; +Libsystem = applePackage' "Libsystem" "1292.50.1" "macos-11.0.1" "0w16zaigq18jfsnw15pfyz2mkfqdkn0cc16q617kmgw2khld8j7j" {}; +libunwind = applePackage' "libunwind" "200.10" "macos-11.0.1" "1pmymcqpfk7lfxh6zqch429vfpvmd2m1dlg898170pkx5zhxisl2" {}; +libutil = applePackage' "libutil" "58.40.2" "macos-11.0.1" "1hhgashfj9g4vjv02070c5pn818a5n0bh5l81l2pflmvb2rrqs3f" {}; +mDNSResponder = applePackage' "mDNSResponder" "1310.40.42" "macos-11.0.1" "0d0b9wwah9rg7rwrr29dxd6iy0y4rlmss3wcz2wcqmnd2qb9x8my" {}; +network_cmds = applePackage' "network_cmds" "606.40.2" "macos-11.0.1" "1dlslk67npvmxx5m50385kmn3ysxih2iv220hhzkin11f8abdjv7" {}; +objc4 = applePackage' "objc4" "818.2" "macos-11.0.1" "177gmh9m9ajy6mvcd2sf7gqydgljy44n3iih0yqsn1b13j784azx" {}; +PowerManagement = applePackage' "PowerManagement" "1132.50.3" "macos-11.0.1" "1n5yn6sc8w67g8iism6ilkyl33j46gcnlqcaq6k16zkngx6lprba" {}; +ppp = applePackage' "ppp" "877.40.2" "macos-11.0.1" "1z506z8ndvb1lfr4pypfy2bnig6qimhmq3yhjvqwfnliv91965iq" {}; +removefile = applePackage' "removefile" "49.40.3" "macos-11.0.1" "1fhp47awi15f02385r25qgw1ag5z0kr1v3kvgqm3r8i8yysfqvwp" {}; +Security = applePackage' "Security" "59754.41.1" "macos-11.0.1" "00kqgg7k80ba70ar2c02f0q9yrdgqcb56nb9z5g0bxwkvi40ryph" {}; +shell_cmds = applePackage' "shell_cmds" "216.40.4" "macos-11.0.1" "1mvp1fp34kkm4mi85fdn3i0l0gig4c0w09zg2mvkpxcf68cq2f69" {}; +system_cmds = applePackage' "system_cmds" "880.40.5" "macos-11.0.1" "1kys4vwfz4559sspdsfhmxc238nd8qgylqypza3zdzaqhfh7lx2x" {}; +text_cmds = applePackage' "text_cmds" "106" "macos-11.0.1" "0cpnfpllwpx20hbxzg5i5488gcjyi9adnbac1sd5hpv3bq6z1hs5" {}; +top = applePackage' "top" "129" "macos-11.0.1" "1nyz5mvq7js3zhsi3dwxl5fslg6m7nhlgc6p2hr889xgyl5prw8f" {}; +xnu = applePackage' "xnu" "7195.50.7.100.1" "macos-11.0.1" "14wqkqp3lcxgpm1sjnsysybrc4ppzkghwv3mb5nr5v8ml37prkib" {}; +} diff --git a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix index 82be7dc860e..dd3cf030952 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, xcbuildHook +{ lib, appleDerivation, xcbuildHook , openssl_1_0_2, Librpcsvc, xnu, libpcap, developer_cmds }: appleDerivation { @@ -44,7 +44,7 @@ appleDerivation { ''; meta = { - platforms = stdenv.lib.platforms.darwin; - maintainers = with stdenv.lib.maintainers; [ matthewbauer ]; + platforms = lib.platforms.darwin; + maintainers = with lib.maintainers; [ matthewbauer ]; }; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/removefile/default.nix b/pkgs/os-specific/darwin/apple-source-releases/removefile/default.nix index 2b45fbdb45e..0b2c1c9c7dc 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/removefile/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/removefile/default.nix @@ -5,4 +5,9 @@ appleDerivation { mkdir -p $out/include/ cp removefile.h checkint.h $out/include/ ''; + + appleHeaders = '' + checkint.h + removefile.h + ''; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix index b87dadd391d..e2e13a168f0 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, xcbuildHook }: +{ lib, appleDerivation, xcbuildHook }: appleDerivation { nativeBuildInputs = [ xcbuildHook ]; @@ -44,7 +44,7 @@ appleDerivation { ''; meta = { - platforms = stdenv.lib.platforms.darwin; - maintainers = with stdenv.lib.maintainers; [ matthewbauer ]; + platforms = lib.platforms.darwin; + maintainers = with lib.maintainers; [ matthewbauer ]; }; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix index 16454cbc1a5..34d093b7cc0 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix @@ -98,7 +98,7 @@ appleDerivation { ''; meta = { - platforms = stdenv.lib.platforms.darwin; - maintainers = with stdenv.lib.maintainers; [ shlevy matthewbauer ]; + platforms = lib.platforms.darwin; + maintainers = with lib.maintainers; [ shlevy matthewbauer ]; }; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix index 14d7a5e3b32..3f0c91db91c 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, xcbuildHook, ncurses, bzip2, zlib, lzma }: +{ lib, appleDerivation, xcbuildHook, ncurses, bzip2, zlib, lzma }: appleDerivation { nativeBuildInputs = [ xcbuildHook ]; @@ -21,7 +21,7 @@ appleDerivation { ''; meta = { - platforms = stdenv.lib.platforms.darwin; - maintainers = with stdenv.lib.maintainers; [ matthewbauer ]; + platforms = lib.platforms.darwin; + maintainers = with lib.maintainers; [ matthewbauer ]; }; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix b/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix index da2d0c5dc7b..9892814468e 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix @@ -127,6 +127,8 @@ appleDerivation ({ mkdir $out/Library/PrivateFrameworks mv $out/Library/Frameworks/IOKit.framework $out/Library/PrivateFrameworks ''; + + appleHeaders = builtins.readFile ./headers.txt; } // lib.optionalAttrs headersOnly { HOST_CODESIGN = "echo"; HOST_CODESIGN_ALLOCATE = "echo"; diff --git a/pkgs/os-specific/darwin/apple-source-releases/xnu/headers.txt b/pkgs/os-specific/darwin/apple-source-releases/xnu/headers.txt new file mode 100644 index 00000000000..93c0dbb18bf --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/xnu/headers.txt @@ -0,0 +1,1318 @@ +AssertMacros.h +_errno.h +_libkernel_init.h +atm/atm_notification.defs +atm/atm_types.defs +atm/atm_types.h +bank/bank_types.h +bsd/bsm/audit.h +bsd/dev/random/randomdev.h +bsd/i386/_limits.h +bsd/i386/_mcontext.h +bsd/i386/_param.h +bsd/i386/_types.h +bsd/i386/endian.h +bsd/i386/limits.h +bsd/i386/param.h +bsd/i386/profile.h +bsd/i386/signal.h +bsd/i386/types.h +bsd/i386/vmparam.h +bsd/libkern/libkern.h +bsd/machine/_limits.h +bsd/machine/_mcontext.h +bsd/machine/_param.h +bsd/machine/_types.h +bsd/machine/byte_order.h +bsd/machine/disklabel.h +bsd/machine/endian.h +bsd/machine/limits.h +bsd/machine/param.h +bsd/machine/profile.h +bsd/machine/signal.h +bsd/machine/spl.h +bsd/machine/types.h +bsd/machine/vmparam.h +bsd/miscfs/devfs/devfs.h +bsd/miscfs/devfs/devfs_proto.h +bsd/miscfs/devfs/devfsdefs.h +bsd/miscfs/devfs/fdesc.h +bsd/miscfs/fifofs/fifo.h +bsd/miscfs/specfs/specdev.h +bsd/miscfs/union/union.h +bsd/net/bpf.h +bsd/net/dlil.h +bsd/net/ethernet.h +bsd/net/if.h +bsd/net/if_arp.h +bsd/net/if_dl.h +bsd/net/if_ether.h +bsd/net/if_llc.h +bsd/net/if_media.h +bsd/net/if_mib.h +bsd/net/if_types.h +bsd/net/if_utun.h +bsd/net/if_var.h +bsd/net/init.h +bsd/net/kext_net.h +bsd/net/kpi_interface.h +bsd/net/kpi_interfacefilter.h +bsd/net/kpi_protocol.h +bsd/net/ndrv.h +bsd/net/net_kev.h +bsd/net/pfkeyv2.h +bsd/net/radix.h +bsd/net/route.h +bsd/netinet/bootp.h +bsd/netinet/icmp6.h +bsd/netinet/icmp_var.h +bsd/netinet/if_ether.h +bsd/netinet/igmp.h +bsd/netinet/igmp_var.h +bsd/netinet/in.h +bsd/netinet/in_arp.h +bsd/netinet/in_pcb.h +bsd/netinet/in_systm.h +bsd/netinet/in_var.h +bsd/netinet/ip.h +bsd/netinet/ip6.h +bsd/netinet/ip_icmp.h +bsd/netinet/ip_var.h +bsd/netinet/kpi_ipfilter.h +bsd/netinet/tcp.h +bsd/netinet/tcp_fsm.h +bsd/netinet/tcp_seq.h +bsd/netinet/tcp_timer.h +bsd/netinet/tcp_var.h +bsd/netinet/tcpip.h +bsd/netinet/udp.h +bsd/netinet/udp_var.h +bsd/netinet6/ah.h +bsd/netinet6/esp.h +bsd/netinet6/in6.h +bsd/netinet6/in6_var.h +bsd/netinet6/ipcomp.h +bsd/netinet6/ipsec.h +bsd/netinet6/nd6.h +bsd/netinet6/raw_ip6.h +bsd/netinet6/scope6_var.h +bsd/netkey/keysock.h +bsd/security/audit/audit.h +bsd/security/audit/audit_bsd.h +bsd/security/audit/audit_ioctl.h +bsd/security/audit/audit_private.h +bsd/sys/_endian.h +bsd/sys/_select.h +bsd/sys/_structs.h +bsd/sys/_types.h +bsd/sys/_types/_blkcnt_t.h +bsd/sys/_types/_blksize_t.h +bsd/sys/_types/_clock_t.h +bsd/sys/_types/_ct_rune_t.h +bsd/sys/_types/_dev_t.h +bsd/sys/_types/_errno_t.h +bsd/sys/_types/_fd_clr.h +bsd/sys/_types/_fd_copy.h +bsd/sys/_types/_fd_def.h +bsd/sys/_types/_fd_isset.h +bsd/sys/_types/_fd_set.h +bsd/sys/_types/_fd_setsize.h +bsd/sys/_types/_fd_zero.h +bsd/sys/_types/_filesec_t.h +bsd/sys/_types/_fsblkcnt_t.h +bsd/sys/_types/_fsfilcnt_t.h +bsd/sys/_types/_fsid_t.h +bsd/sys/_types/_fsobj_id_t.h +bsd/sys/_types/_gid_t.h +bsd/sys/_types/_guid_t.h +bsd/sys/_types/_id_t.h +bsd/sys/_types/_in_addr_t.h +bsd/sys/_types/_in_port_t.h +bsd/sys/_types/_ino64_t.h +bsd/sys/_types/_ino_t.h +bsd/sys/_types/_int16_t.h +bsd/sys/_types/_int32_t.h +bsd/sys/_types/_int64_t.h +bsd/sys/_types/_int8_t.h +bsd/sys/_types/_intptr_t.h +bsd/sys/_types/_iovec_t.h +bsd/sys/_types/_key_t.h +bsd/sys/_types/_mach_port_t.h +bsd/sys/_types/_mbstate_t.h +bsd/sys/_types/_mode_t.h +bsd/sys/_types/_nlink_t.h +bsd/sys/_types/_null.h +bsd/sys/_types/_o_dsync.h +bsd/sys/_types/_o_sync.h +bsd/sys/_types/_off_t.h +bsd/sys/_types/_offsetof.h +bsd/sys/_types/_os_inline.h +bsd/sys/_types/_pid_t.h +bsd/sys/_types/_posix_vdisable.h +bsd/sys/_types/_ptrdiff_t.h +bsd/sys/_types/_rsize_t.h +bsd/sys/_types/_rune_t.h +bsd/sys/_types/_s_ifmt.h +bsd/sys/_types/_sa_family_t.h +bsd/sys/_types/_seek_set.h +bsd/sys/_types/_sigaltstack.h +bsd/sys/_types/_sigset_t.h +bsd/sys/_types/_size_t.h +bsd/sys/_types/_socklen_t.h +bsd/sys/_types/_ssize_t.h +bsd/sys/_types/_suseconds_t.h +bsd/sys/_types/_time_t.h +bsd/sys/_types/_timespec.h +bsd/sys/_types/_timeval.h +bsd/sys/_types/_timeval32.h +bsd/sys/_types/_timeval64.h +bsd/sys/_types/_u_int16_t.h +bsd/sys/_types/_u_int32_t.h +bsd/sys/_types/_u_int64_t.h +bsd/sys/_types/_u_int8_t.h +bsd/sys/_types/_ucontext.h +bsd/sys/_types/_ucontext64.h +bsd/sys/_types/_uid_t.h +bsd/sys/_types/_uintptr_t.h +bsd/sys/_types/_useconds_t.h +bsd/sys/_types/_user32_itimerval.h +bsd/sys/_types/_user32_timespec.h +bsd/sys/_types/_user32_timeval.h +bsd/sys/_types/_user64_itimerval.h +bsd/sys/_types/_user64_timespec.h +bsd/sys/_types/_user64_timeval.h +bsd/sys/_types/_user_timespec.h +bsd/sys/_types/_user_timeval.h +bsd/sys/_types/_uuid_t.h +bsd/sys/_types/_va_list.h +bsd/sys/_types/_wchar_t.h +bsd/sys/_types/_wint_t.h +bsd/sys/appleapiopts.h +bsd/sys/attr.h +bsd/sys/bsdtask_info.h +bsd/sys/buf.h +bsd/sys/cdefs.h +bsd/sys/codesign.h +bsd/sys/conf.h +bsd/sys/content_protection.h +bsd/sys/cprotect.h +bsd/sys/csr.h +bsd/sys/decmpfs.h +bsd/sys/dir.h +bsd/sys/dirent.h +bsd/sys/disk.h +bsd/sys/disklabel.h +bsd/sys/disktab.h +bsd/sys/dkstat.h +bsd/sys/doc_tombstone.h +bsd/sys/domain.h +bsd/sys/errno.h +bsd/sys/ev.h +bsd/sys/event.h +bsd/sys/eventvar.h +bsd/sys/fbt.h +bsd/sys/fcntl.h +bsd/sys/file.h +bsd/sys/file_internal.h +bsd/sys/filedesc.h +bsd/sys/fileport.h +bsd/sys/filio.h +bsd/sys/fsctl.h +bsd/sys/fsevents.h +bsd/sys/fslog.h +bsd/sys/guarded.h +bsd/sys/imgact.h +bsd/sys/ioccom.h +bsd/sys/ioctl.h +bsd/sys/ioctl_compat.h +bsd/sys/ipc.h +bsd/sys/kasl.h +bsd/sys/kauth.h +bsd/sys/kdebug.h +bsd/sys/kdebugevents.h +bsd/sys/kern_control.h +bsd/sys/kern_event.h +bsd/sys/kern_memorystatus.h +bsd/sys/kernel.h +bsd/sys/kernel_types.h +bsd/sys/kpi_mbuf.h +bsd/sys/kpi_private.h +bsd/sys/kpi_socket.h +bsd/sys/kpi_socketfilter.h +bsd/sys/ktrace.h +bsd/sys/linker_set.h +bsd/sys/lock.h +bsd/sys/lockf.h +bsd/sys/mach_swapon.h +bsd/sys/malloc.h +bsd/sys/mbuf.h +bsd/sys/md5.h +bsd/sys/memory_maintenance.h +bsd/sys/mman.h +bsd/sys/mount.h +bsd/sys/mount_internal.h +bsd/sys/msg.h +bsd/sys/msgbuf.h +bsd/sys/munge.h +bsd/sys/namei.h +bsd/sys/netport.h +bsd/sys/param.h +bsd/sys/paths.h +bsd/sys/persona.h +bsd/sys/pgo.h +bsd/sys/pipe.h +bsd/sys/posix_sem.h +bsd/sys/posix_shm.h +bsd/sys/priv.h +bsd/sys/proc.h +bsd/sys/proc_info.h +bsd/sys/proc_internal.h +bsd/sys/protosw.h +bsd/sys/pthread_internal.h +bsd/sys/pthread_shims.h +bsd/sys/queue.h +bsd/sys/quota.h +bsd/sys/random.h +bsd/sys/reason.h +bsd/sys/resource.h +bsd/sys/resourcevar.h +bsd/sys/sbuf.h +bsd/sys/select.h +bsd/sys/sem.h +bsd/sys/sem_internal.h +bsd/sys/semaphore.h +bsd/sys/shm.h +bsd/sys/shm_internal.h +bsd/sys/signal.h +bsd/sys/signalvar.h +bsd/sys/socket.h +bsd/sys/socketvar.h +bsd/sys/sockio.h +bsd/sys/spawn.h +bsd/sys/spawn_internal.h +bsd/sys/stackshot.h +bsd/sys/stat.h +bsd/sys/stdio.h +bsd/sys/sys_domain.h +bsd/sys/syscall.h +bsd/sys/sysctl.h +bsd/sys/syslimits.h +bsd/sys/syslog.h +bsd/sys/sysproto.h +bsd/sys/systm.h +bsd/sys/termios.h +bsd/sys/time.h +bsd/sys/tree.h +bsd/sys/tty.h +bsd/sys/ttychars.h +bsd/sys/ttycom.h +bsd/sys/ttydefaults.h +bsd/sys/ttydev.h +bsd/sys/types.h +bsd/sys/ubc.h +bsd/sys/ucontext.h +bsd/sys/ucred.h +bsd/sys/uio.h +bsd/sys/uio_internal.h +bsd/sys/ulock.h +bsd/sys/un.h +bsd/sys/unistd.h +bsd/sys/unpcb.h +bsd/sys/user.h +bsd/sys/utfconv.h +bsd/sys/vfs_context.h +bsd/sys/vm.h +bsd/sys/vmmeter.h +bsd/sys/vmparam.h +bsd/sys/vnode.h +bsd/sys/vnode_if.h +bsd/sys/vnode_internal.h +bsd/sys/wait.h +bsd/sys/xattr.h +bsd/uuid/uuid.h +bsd/vfs/vfs_support.h +bsd/vm/vnode_pager.h +bsm/audit.h +bsm/audit_domain.h +bsm/audit_errno.h +bsm/audit_fcntl.h +bsm/audit_internal.h +bsm/audit_kevents.h +bsm/audit_record.h +bsm/audit_socket_type.h +corecrypto/cc.h +corecrypto/cc_config.h +corecrypto/cc_debug.h +corecrypto/cc_macros.h +corecrypto/cc_priv.h +corecrypto/ccaes.h +corecrypto/ccasn1.h +corecrypto/cccmac.h +corecrypto/ccder.h +corecrypto/ccdes.h +corecrypto/ccdigest.h +corecrypto/ccdigest_priv.h +corecrypto/ccdrbg.h +corecrypto/ccdrbg_impl.h +corecrypto/cchmac.h +corecrypto/ccmd5.h +corecrypto/ccmode.h +corecrypto/ccmode_factory.h +corecrypto/ccmode_impl.h +corecrypto/ccmode_siv.h +corecrypto/ccn.h +corecrypto/ccpad.h +corecrypto/ccpbkdf2.h +corecrypto/ccrc4.h +corecrypto/ccrng.h +corecrypto/ccrng_system.h +corecrypto/ccrsa.h +corecrypto/ccsha1.h +corecrypto/ccsha2.h +corecrypto/cczp.h +corpses/task_corpse.h +default_pager/default_pager_types.h +device/device.defs +device/device_port.h +device/device_types.defs +device/device_types.h +gethostuuid.h +gethostuuid_private.h +i386/_limits.h +i386/_mcontext.h +i386/_param.h +i386/_types.h +i386/eflags.h +i386/endian.h +i386/fasttrap_isa.h +i386/limits.h +i386/param.h +i386/profile.h +i386/signal.h +i386/types.h +i386/user_ldt.h +i386/vmparam.h +iokit/IOKit/AppleKeyStoreInterface.h +iokit/IOKit/IOBSD.h +iokit/IOKit/IOBufferMemoryDescriptor.h +iokit/IOKit/IOCPU.h +iokit/IOKit/IOCatalogue.h +iokit/IOKit/IOCommand.h +iokit/IOKit/IOCommandGate.h +iokit/IOKit/IOCommandPool.h +iokit/IOKit/IOCommandQueue.h +iokit/IOKit/IOConditionLock.h +iokit/IOKit/IODMACommand.h +iokit/IOKit/IODMAController.h +iokit/IOKit/IODMAEventSource.h +iokit/IOKit/IODataQueue.h +iokit/IOKit/IODataQueueShared.h +iokit/IOKit/IODeviceMemory.h +iokit/IOKit/IODeviceTreeSupport.h +iokit/IOKit/IOEventSource.h +iokit/IOKit/IOFilterInterruptEventSource.h +iokit/IOKit/IOHibernatePrivate.h +iokit/IOKit/IOInterleavedMemoryDescriptor.h +iokit/IOKit/IOInterruptAccounting.h +iokit/IOKit/IOInterruptController.h +iokit/IOKit/IOInterruptEventSource.h +iokit/IOKit/IOInterrupts.h +iokit/IOKit/IOKernelReportStructs.h +iokit/IOKit/IOKernelReporters.h +iokit/IOKit/IOKitDebug.h +iokit/IOKit/IOKitDiagnosticsUserClient.h +iokit/IOKit/IOKitKeys.h +iokit/IOKit/IOKitKeysPrivate.h +iokit/IOKit/IOKitServer.h +iokit/IOKit/IOLib.h +iokit/IOKit/IOLocks.h +iokit/IOKit/IOLocksPrivate.h +iokit/IOKit/IOMapper.h +iokit/IOKit/IOMemoryCursor.h +iokit/IOKit/IOMemoryDescriptor.h +iokit/IOKit/IOMessage.h +iokit/IOKit/IOMultiMemoryDescriptor.h +iokit/IOKit/IONVRAM.h +iokit/IOKit/IONotifier.h +iokit/IOKit/IOPlatformExpert.h +iokit/IOKit/IOPolledInterface.h +iokit/IOKit/IORangeAllocator.h +iokit/IOKit/IORegistryEntry.h +iokit/IOKit/IOReportMacros.h +iokit/IOKit/IOReportTypes.h +iokit/IOKit/IOReturn.h +iokit/IOKit/IOService.h +iokit/IOKit/IOServicePM.h +iokit/IOKit/IOSharedDataQueue.h +iokit/IOKit/IOSharedLock.h +iokit/IOKit/IOStatistics.h +iokit/IOKit/IOStatisticsPrivate.h +iokit/IOKit/IOSubMemoryDescriptor.h +iokit/IOKit/IOSyncer.h +iokit/IOKit/IOTimeStamp.h +iokit/IOKit/IOTimerEventSource.h +iokit/IOKit/IOTypes.h +iokit/IOKit/IOUserClient.h +iokit/IOKit/IOWorkLoop.h +iokit/IOKit/OSMessageNotification.h +iokit/IOKit/assert.h +iokit/IOKit/nvram/IONVRAMController.h +iokit/IOKit/platform/AppleMacIO.h +iokit/IOKit/platform/AppleMacIODevice.h +iokit/IOKit/platform/AppleNMI.h +iokit/IOKit/platform/ApplePlatformExpert.h +iokit/IOKit/power/IOPwrController.h +iokit/IOKit/pwr_mgt/IOPM.h +iokit/IOKit/pwr_mgt/IOPMLibDefs.h +iokit/IOKit/pwr_mgt/IOPMPowerSource.h +iokit/IOKit/pwr_mgt/IOPMPowerSourceList.h +iokit/IOKit/pwr_mgt/IOPMpowerState.h +iokit/IOKit/pwr_mgt/IOPowerConnection.h +iokit/IOKit/pwr_mgt/RootDomain.h +iokit/IOKit/rtc/IORTCController.h +iokit/IOKit/system.h +iokit/IOKit/system_management/IOWatchDogTimer.h +kern/exc_resource.h +kern/kcdata.h +kern/kern_cdata.h +libkern/OSByteOrder.h +libkern/OSDebug.h +libkern/OSKextLib.h +libkern/OSReturn.h +libkern/OSTypes.h +libkern/_OSByteOrder.h +libkern/firehose/chunk_private.h +libkern/firehose/firehose_types_private.h +libkern/firehose/ioctl_private.h +libkern/firehose/tracepoint_private.h +libkern/i386/OSByteOrder.h +libkern/i386/_OSByteOrder.h +libkern/libkern/OSAtomic.h +libkern/libkern/OSBase.h +libkern/libkern/OSByteOrder.h +libkern/libkern/OSDebug.h +libkern/libkern/OSKextLib.h +libkern/libkern/OSKextLibPrivate.h +libkern/libkern/OSMalloc.h +libkern/libkern/OSReturn.h +libkern/libkern/OSSerializeBinary.h +libkern/libkern/OSTypes.h +libkern/libkern/_OSByteOrder.h +libkern/libkern/c++/OSArray.h +libkern/libkern/c++/OSBoolean.h +libkern/libkern/c++/OSCPPDebug.h +libkern/libkern/c++/OSCollection.h +libkern/libkern/c++/OSCollectionIterator.h +libkern/libkern/c++/OSContainers.h +libkern/libkern/c++/OSData.h +libkern/libkern/c++/OSDictionary.h +libkern/libkern/c++/OSEndianTypes.h +libkern/libkern/c++/OSIterator.h +libkern/libkern/c++/OSKext.h +libkern/libkern/c++/OSLib.h +libkern/libkern/c++/OSMetaClass.h +libkern/libkern/c++/OSNumber.h +libkern/libkern/c++/OSObject.h +libkern/libkern/c++/OSOrderedSet.h +libkern/libkern/c++/OSSerialize.h +libkern/libkern/c++/OSSet.h +libkern/libkern/c++/OSString.h +libkern/libkern/c++/OSSymbol.h +libkern/libkern/c++/OSUnserialize.h +libkern/libkern/crypto/aes.h +libkern/libkern/crypto/aesxts.h +libkern/libkern/crypto/crypto_internal.h +libkern/libkern/crypto/des.h +libkern/libkern/crypto/md5.h +libkern/libkern/crypto/rand.h +libkern/libkern/crypto/register_crypto.h +libkern/libkern/crypto/rsa.h +libkern/libkern/crypto/sha1.h +libkern/libkern/crypto/sha2.h +libkern/libkern/i386/OSByteOrder.h +libkern/libkern/i386/_OSByteOrder.h +libkern/libkern/kernel_mach_header.h +libkern/libkern/kext_request_keys.h +libkern/libkern/kxld.h +libkern/libkern/kxld_types.h +libkern/libkern/locks.h +libkern/libkern/machine/OSByteOrder.h +libkern/libkern/mkext.h +libkern/libkern/prelink.h +libkern/libkern/section_keywords.h +libkern/libkern/stack_protector.h +libkern/libkern/sysctl.h +libkern/libkern/tree.h +libkern/libkern/version.h +libkern/libkern/zconf.h +libkern/libkern/zlib.h +libkern/machine/OSByteOrder.h +libkern/os/base.h +libkern/os/log.h +libkern/os/log_private.h +libkern/os/object.h +libkern/os/object_private.h +libkern/os/overflow.h +libkern/os/trace.h +mach/audit_triggers.defs +mach/boolean.h +mach/bootstrap.h +mach/clock.defs +mach/clock.h +mach/clock_priv.defs +mach/clock_priv.h +mach/clock_reply.defs +mach/clock_reply.h +mach/clock_types.defs +mach/clock_types.h +mach/dyld_kernel.h +mach/error.h +mach/exc.defs +mach/exc.h +mach/exception.h +mach/exception_types.h +mach/host_info.h +mach/host_notify.h +mach/host_notify_reply.defs +mach/host_priv.defs +mach/host_priv.h +mach/host_reboot.h +mach/host_security.defs +mach/host_security.h +mach/host_special_ports.h +mach/i386/_structs.h +mach/i386/asm.h +mach/i386/boolean.h +mach/i386/exception.h +mach/i386/fp_reg.h +mach/i386/kern_return.h +mach/i386/ndr_def.h +mach/i386/processor_info.h +mach/i386/rpc.h +mach/i386/sdt_isa.h +mach/i386/thread_state.h +mach/i386/thread_status.h +mach/i386/vm_param.h +mach/i386/vm_types.h +mach/kern_return.h +mach/kmod.h +mach/lock_set.defs +mach/lock_set.h +mach/mach.h +mach/mach_error.h +mach/mach_exc.defs +mach/mach_host.defs +mach/mach_host.h +mach/mach_init.h +mach/mach_interface.h +mach/mach_param.h +mach/mach_port.defs +mach/mach_port.h +mach/mach_port_internal.h +mach/mach_syscalls.h +mach/mach_time.h +mach/mach_traps.h +mach/mach_types.defs +mach/mach_types.h +mach/mach_vm.defs +mach/mach_vm.h +mach/mach_vm_internal.h +mach/mach_voucher.defs +mach/mach_voucher.h +mach/mach_voucher_attr_control.defs +mach/mach_voucher_types.h +mach/machine.h +mach/machine/asm.h +mach/machine/boolean.h +mach/machine/exception.h +mach/machine/kern_return.h +mach/machine/machine_types.defs +mach/machine/ndr_def.h +mach/machine/processor_info.h +mach/machine/rpc.h +mach/machine/sdt.h +mach/machine/sdt_isa.h +mach/machine/thread_state.h +mach/machine/thread_status.h +mach/machine/vm_param.h +mach/machine/vm_types.h +mach/memory_object_types.h +mach/message.h +mach/mig.h +mach/mig_errors.h +mach/mig_strncpy_zerofill_support.h +mach/mig_voucher_support.h +mach/ndr.h +mach/notify.defs +mach/notify.h +mach/policy.h +mach/port.h +mach/port_obj.h +mach/processor.defs +mach/processor.h +mach/processor_info.h +mach/processor_set.defs +mach/processor_set.h +mach/rpc.h +mach/sdt.h +mach/semaphore.h +mach/shared_memory_server.h +mach/shared_region.h +mach/std_types.defs +mach/std_types.h +mach/sync.h +mach/sync_policy.h +mach/task.defs +mach/task.h +mach/task_access.defs +mach/task_info.h +mach/task_policy.h +mach/task_special_ports.h +mach/telemetry_notification.defs +mach/thread_act.defs +mach/thread_act.h +mach/thread_act_internal.h +mach/thread_info.h +mach/thread_policy.h +mach/thread_special_ports.h +mach/thread_state.h +mach/thread_status.h +mach/thread_switch.h +mach/time_value.h +mach/vm_attributes.h +mach/vm_behavior.h +mach/vm_inherit.h +mach/vm_map.defs +mach/vm_map.h +mach/vm_map_internal.h +mach/vm_page_size.h +mach/vm_param.h +mach/vm_prot.h +mach/vm_purgable.h +mach/vm_region.h +mach/vm_statistics.h +mach/vm_sync.h +mach/vm_task.h +mach/vm_types.h +mach_debug/hash_info.h +mach_debug/ipc_info.h +mach_debug/lockgroup_info.h +mach_debug/mach_debug.h +mach_debug/mach_debug_types.defs +mach_debug/mach_debug_types.h +mach_debug/page_info.h +mach_debug/vm_info.h +mach_debug/zone_info.h +machine/_limits.h +machine/_mcontext.h +machine/_param.h +machine/_types.h +machine/byte_order.h +machine/endian.h +machine/fasttrap_isa.h +machine/limits.h +machine/param.h +machine/profile.h +machine/signal.h +machine/types.h +machine/vmparam.h +miscfs/devfs/devfs.h +miscfs/specfs/specdev.h +miscfs/union/union.h +net/bpf.h +net/dlil.h +net/ethernet.h +net/if.h +net/if_arp.h +net/if_dl.h +net/if_llc.h +net/if_media.h +net/if_mib.h +net/if_types.h +net/if_utun.h +net/if_var.h +net/kext_net.h +net/ndrv.h +net/net_kev.h +net/pfkeyv2.h +net/route.h +netinet/bootp.h +netinet/icmp6.h +netinet/icmp_var.h +netinet/if_ether.h +netinet/igmp.h +netinet/igmp_var.h +netinet/in.h +netinet/in_pcb.h +netinet/in_systm.h +netinet/in_var.h +netinet/ip.h +netinet/ip6.h +netinet/ip_icmp.h +netinet/ip_var.h +netinet/tcp.h +netinet/tcp_fsm.h +netinet/tcp_seq.h +netinet/tcp_timer.h +netinet/tcp_var.h +netinet/tcpip.h +netinet/udp.h +netinet/udp_var.h +netinet6/ah.h +netinet6/esp.h +netinet6/in6.h +netinet6/in6_var.h +netinet6/ipcomp.h +netinet6/ipsec.h +netinet6/nd6.h +netinet6/raw_ip6.h +netinet6/scope6_var.h +netkey/keysock.h +nfs/krpc.h +nfs/nfs.h +nfs/nfs_gss.h +nfs/nfs_ioctl.h +nfs/nfs_lock.h +nfs/nfsdiskless.h +nfs/nfsm_subs.h +nfs/nfsmount.h +nfs/nfsnode.h +nfs/nfsproto.h +nfs/nfsrvcache.h +nfs/rpcv2.h +nfs/xdr_subs.h +os/overflow.h +os/tsd.h +osfmk/UserNotification/KUNCUserNotifications.h +osfmk/UserNotification/UNDReply.defs +osfmk/UserNotification/UNDRequest.defs +osfmk/UserNotification/UNDTypes.defs +osfmk/UserNotification/UNDTypes.h +osfmk/atm/atm_internal.h +osfmk/atm/atm_notification.defs +osfmk/atm/atm_types.defs +osfmk/atm/atm_types.h +osfmk/bank/bank_types.h +osfmk/console/video_console.h +osfmk/corpses/task_corpse.h +osfmk/default_pager/default_pager_types.h +osfmk/device/device.defs +osfmk/device/device_port.h +osfmk/device/device_types.defs +osfmk/device/device_types.h +osfmk/gssd/gssd_mach.defs +osfmk/gssd/gssd_mach.h +osfmk/gssd/gssd_mach_types.h +osfmk/i386/apic.h +osfmk/i386/asm.h +osfmk/i386/atomic.h +osfmk/i386/bit_routines.h +osfmk/i386/cpu_capabilities.h +osfmk/i386/cpu_data.h +osfmk/i386/cpu_number.h +osfmk/i386/cpu_topology.h +osfmk/i386/cpuid.h +osfmk/i386/eflags.h +osfmk/i386/io_map_entries.h +osfmk/i386/lapic.h +osfmk/i386/lock.h +osfmk/i386/locks.h +osfmk/i386/machine_cpu.h +osfmk/i386/machine_routines.h +osfmk/i386/mp.h +osfmk/i386/mp_desc.h +osfmk/i386/mp_events.h +osfmk/i386/mtrr.h +osfmk/i386/pal_hibernate.h +osfmk/i386/pal_native.h +osfmk/i386/pal_routines.h +osfmk/i386/panic_hooks.h +osfmk/i386/pmCPU.h +osfmk/i386/pmap.h +osfmk/i386/proc_reg.h +osfmk/i386/rtclock_protos.h +osfmk/i386/seg.h +osfmk/i386/simple_lock.h +osfmk/i386/smp.h +osfmk/i386/tsc.h +osfmk/i386/tss.h +osfmk/i386/ucode.h +osfmk/i386/vmx.h +osfmk/ipc/ipc_types.h +osfmk/kdp/kdp_callout.h +osfmk/kdp/kdp_dyld.h +osfmk/kdp/kdp_en_debugger.h +osfmk/kern/affinity.h +osfmk/kern/assert.h +osfmk/kern/audit_sessionport.h +osfmk/kern/backtrace.h +osfmk/kern/bits.h +osfmk/kern/block_hint.h +osfmk/kern/call_entry.h +osfmk/kern/clock.h +osfmk/kern/coalition.h +osfmk/kern/cpu_data.h +osfmk/kern/cpu_number.h +osfmk/kern/debug.h +osfmk/kern/ecc.h +osfmk/kern/energy_perf.h +osfmk/kern/exc_resource.h +osfmk/kern/extmod_statistics.h +osfmk/kern/host.h +osfmk/kern/hv_support.h +osfmk/kern/ipc_mig.h +osfmk/kern/ipc_misc.h +osfmk/kern/kalloc.h +osfmk/kern/kcdata.h +osfmk/kern/kern_cdata.h +osfmk/kern/kern_types.h +osfmk/kern/kext_alloc.h +osfmk/kern/kpc.h +osfmk/kern/ledger.h +osfmk/kern/lock.h +osfmk/kern/locks.h +osfmk/kern/mach_param.h +osfmk/kern/macro_help.h +osfmk/kern/page_decrypt.h +osfmk/kern/pms.h +osfmk/kern/policy_internal.h +osfmk/kern/processor.h +osfmk/kern/queue.h +osfmk/kern/sched_prim.h +osfmk/kern/sfi.h +osfmk/kern/simple_lock.h +osfmk/kern/startup.h +osfmk/kern/task.h +osfmk/kern/telemetry.h +osfmk/kern/thread.h +osfmk/kern/thread_call.h +osfmk/kern/timer_call.h +osfmk/kern/waitq.h +osfmk/kern/zalloc.h +osfmk/kextd/kextd_mach.defs +osfmk/kextd/kextd_mach.h +osfmk/kperf/action.h +osfmk/kperf/context.h +osfmk/kperf/kdebug_trigger.h +osfmk/kperf/kperf.h +osfmk/kperf/kperf_timer.h +osfmk/kperf/kperfbsd.h +osfmk/kperf/pet.h +osfmk/lockd/lockd_mach.defs +osfmk/lockd/lockd_mach.h +osfmk/lockd/lockd_mach_types.h +osfmk/mach/audit_triggers.defs +osfmk/mach/audit_triggers_server.h +osfmk/mach/boolean.h +osfmk/mach/branch_predicates.h +osfmk/mach/clock.defs +osfmk/mach/clock.h +osfmk/mach/clock_priv.defs +osfmk/mach/clock_priv.h +osfmk/mach/clock_reply.defs +osfmk/mach/clock_reply_server.h +osfmk/mach/clock_types.defs +osfmk/mach/clock_types.h +osfmk/mach/coalition.h +osfmk/mach/coalition_notification_server.h +osfmk/mach/dyld_kernel.h +osfmk/mach/error.h +osfmk/mach/exc.defs +osfmk/mach/exc_server.h +osfmk/mach/exception.h +osfmk/mach/exception_types.h +osfmk/mach/host_info.h +osfmk/mach/host_notify.h +osfmk/mach/host_notify_reply.defs +osfmk/mach/host_priv.defs +osfmk/mach/host_priv.h +osfmk/mach/host_reboot.h +osfmk/mach/host_security.defs +osfmk/mach/host_security.h +osfmk/mach/host_special_ports.h +osfmk/mach/i386/_structs.h +osfmk/mach/i386/asm.h +osfmk/mach/i386/boolean.h +osfmk/mach/i386/exception.h +osfmk/mach/i386/fp_reg.h +osfmk/mach/i386/kern_return.h +osfmk/mach/i386/ndr_def.h +osfmk/mach/i386/processor_info.h +osfmk/mach/i386/rpc.h +osfmk/mach/i386/sdt_isa.h +osfmk/mach/i386/syscall_sw.h +osfmk/mach/i386/thread_state.h +osfmk/mach/i386/thread_status.h +osfmk/mach/i386/vm_param.h +osfmk/mach/i386/vm_types.h +osfmk/mach/kern_return.h +osfmk/mach/kmod.h +osfmk/mach/ktrace_background.h +osfmk/mach/lock_set.defs +osfmk/mach/lock_set.h +osfmk/mach/mach_exc.defs +osfmk/mach/mach_exc_server.h +osfmk/mach/mach_host.defs +osfmk/mach/mach_host.h +osfmk/mach/mach_interface.h +osfmk/mach/mach_param.h +osfmk/mach/mach_port.defs +osfmk/mach/mach_port.h +osfmk/mach/mach_syscalls.h +osfmk/mach/mach_time.h +osfmk/mach/mach_traps.h +osfmk/mach/mach_types.defs +osfmk/mach/mach_types.h +osfmk/mach/mach_vm.defs +osfmk/mach/mach_vm.h +osfmk/mach/mach_voucher.defs +osfmk/mach/mach_voucher.h +osfmk/mach/mach_voucher_attr_control.defs +osfmk/mach/mach_voucher_attr_control.h +osfmk/mach/mach_voucher_types.h +osfmk/mach/machine.h +osfmk/mach/machine/asm.h +osfmk/mach/machine/boolean.h +osfmk/mach/machine/exception.h +osfmk/mach/machine/kern_return.h +osfmk/mach/machine/machine_types.defs +osfmk/mach/machine/ndr_def.h +osfmk/mach/machine/processor_info.h +osfmk/mach/machine/rpc.h +osfmk/mach/machine/sdt.h +osfmk/mach/machine/sdt_isa.h +osfmk/mach/machine/syscall_sw.h +osfmk/mach/machine/thread_state.h +osfmk/mach/machine/thread_status.h +osfmk/mach/machine/vm_param.h +osfmk/mach/machine/vm_types.h +osfmk/mach/memory_object_control.h +osfmk/mach/memory_object_default_server.h +osfmk/mach/memory_object_types.h +osfmk/mach/message.h +osfmk/mach/mig.h +osfmk/mach/mig_errors.h +osfmk/mach/mig_strncpy_zerofill_support.h +osfmk/mach/mig_voucher_support.h +osfmk/mach/ndr.h +osfmk/mach/notify.defs +osfmk/mach/notify.h +osfmk/mach/notify_server.h +osfmk/mach/policy.h +osfmk/mach/port.h +osfmk/mach/processor.defs +osfmk/mach/processor.h +osfmk/mach/processor_info.h +osfmk/mach/processor_set.defs +osfmk/mach/processor_set.h +osfmk/mach/resource_monitors.h +osfmk/mach/rpc.h +osfmk/mach/sdt.h +osfmk/mach/semaphore.h +osfmk/mach/sfi_class.h +osfmk/mach/shared_memory_server.h +osfmk/mach/shared_region.h +osfmk/mach/std_types.defs +osfmk/mach/std_types.h +osfmk/mach/sync_policy.h +osfmk/mach/syscall_sw.h +osfmk/mach/sysdiagnose_notification_server.h +osfmk/mach/task.defs +osfmk/mach/task.h +osfmk/mach/task_access.defs +osfmk/mach/task_access.h +osfmk/mach/task_access_server.h +osfmk/mach/task_info.h +osfmk/mach/task_policy.h +osfmk/mach/task_special_ports.h +osfmk/mach/telemetry_notification.defs +osfmk/mach/telemetry_notification_server.h +osfmk/mach/thread_act.defs +osfmk/mach/thread_act.h +osfmk/mach/thread_info.h +osfmk/mach/thread_policy.h +osfmk/mach/thread_special_ports.h +osfmk/mach/thread_status.h +osfmk/mach/thread_switch.h +osfmk/mach/time_value.h +osfmk/mach/upl.h +osfmk/mach/vm_attributes.h +osfmk/mach/vm_behavior.h +osfmk/mach/vm_inherit.h +osfmk/mach/vm_map.defs +osfmk/mach/vm_map.h +osfmk/mach/vm_param.h +osfmk/mach/vm_prot.h +osfmk/mach/vm_purgable.h +osfmk/mach/vm_region.h +osfmk/mach/vm_statistics.h +osfmk/mach/vm_sync.h +osfmk/mach/vm_types.h +osfmk/mach_debug/hash_info.h +osfmk/mach_debug/ipc_info.h +osfmk/mach_debug/lockgroup_info.h +osfmk/mach_debug/mach_debug.h +osfmk/mach_debug/mach_debug_types.defs +osfmk/mach_debug/mach_debug_types.h +osfmk/mach_debug/page_info.h +osfmk/mach_debug/vm_info.h +osfmk/mach_debug/zone_info.h +osfmk/machine/atomic.h +osfmk/machine/cpu_capabilities.h +osfmk/machine/cpu_number.h +osfmk/machine/io_map_entries.h +osfmk/machine/lock.h +osfmk/machine/locks.h +osfmk/machine/machine_cpuid.h +osfmk/machine/machine_kpc.h +osfmk/machine/machine_routines.h +osfmk/machine/pal_hibernate.h +osfmk/machine/pal_routines.h +osfmk/machine/simple_lock.h +osfmk/prng/random.h +osfmk/string.h +osfmk/vm/WKdm_new.h +osfmk/vm/pmap.h +osfmk/vm/vm_compressor_algorithms.h +osfmk/vm/vm_fault.h +osfmk/vm/vm_kern.h +osfmk/vm/vm_map.h +osfmk/vm/vm_options.h +osfmk/vm/vm_pageout.h +osfmk/vm/vm_protos.h +osfmk/vm/vm_shared_region.h +osfmk/voucher/ipc_pthread_priority_types.h +osfmk/x86_64/machine_kpc.h +pexpert/boot.h +pexpert/i386/boot.h +pexpert/i386/efi.h +pexpert/i386/protos.h +pexpert/machine/boot.h +pexpert/machine/protos.h +pexpert/pexpert.h +pexpert/pexpert/boot.h +pexpert/pexpert/device_tree.h +pexpert/pexpert/i386/boot.h +pexpert/pexpert/i386/efi.h +pexpert/pexpert/i386/protos.h +pexpert/pexpert/machine/boot.h +pexpert/pexpert/machine/protos.h +pexpert/pexpert/pexpert.h +pexpert/pexpert/protos.h +pexpert/protos.h +security/audit/audit_ioctl.h +security/mac.h +security/mac_policy.h +security/security/_label.h +security/security/mac.h +security/security/mac_alloc.h +security/security/mac_data.h +security/security/mac_framework.h +security/security/mac_internal.h +security/security/mac_mach_internal.h +security/security/mac_policy.h +servers/key_defs.h +servers/ls_defs.h +servers/netname.h +servers/netname_defs.h +servers/nm_defs.h +sys/_endian.h +sys/_posix_availability.h +sys/_select.h +sys/_structs.h +sys/_symbol_aliasing.h +sys/_types.h +sys/_types/_blkcnt_t.h +sys/_types/_blksize_t.h +sys/_types/_clock_t.h +sys/_types/_ct_rune_t.h +sys/_types/_dev_t.h +sys/_types/_errno_t.h +sys/_types/_fd_clr.h +sys/_types/_fd_copy.h +sys/_types/_fd_def.h +sys/_types/_fd_isset.h +sys/_types/_fd_set.h +sys/_types/_fd_setsize.h +sys/_types/_fd_zero.h +sys/_types/_filesec_t.h +sys/_types/_fsblkcnt_t.h +sys/_types/_fsfilcnt_t.h +sys/_types/_fsid_t.h +sys/_types/_fsobj_id_t.h +sys/_types/_gid_t.h +sys/_types/_guid_t.h +sys/_types/_id_t.h +sys/_types/_in_addr_t.h +sys/_types/_in_port_t.h +sys/_types/_ino64_t.h +sys/_types/_ino_t.h +sys/_types/_int16_t.h +sys/_types/_int32_t.h +sys/_types/_int64_t.h +sys/_types/_int8_t.h +sys/_types/_intptr_t.h +sys/_types/_iovec_t.h +sys/_types/_key_t.h +sys/_types/_mach_port_t.h +sys/_types/_mbstate_t.h +sys/_types/_mode_t.h +sys/_types/_nlink_t.h +sys/_types/_null.h +sys/_types/_o_dsync.h +sys/_types/_o_sync.h +sys/_types/_off_t.h +sys/_types/_offsetof.h +sys/_types/_os_inline.h +sys/_types/_pid_t.h +sys/_types/_posix_vdisable.h +sys/_types/_ptrdiff_t.h +sys/_types/_rsize_t.h +sys/_types/_rune_t.h +sys/_types/_s_ifmt.h +sys/_types/_sa_family_t.h +sys/_types/_seek_set.h +sys/_types/_sigaltstack.h +sys/_types/_sigset_t.h +sys/_types/_size_t.h +sys/_types/_socklen_t.h +sys/_types/_ssize_t.h +sys/_types/_suseconds_t.h +sys/_types/_time_t.h +sys/_types/_timespec.h +sys/_types/_timeval.h +sys/_types/_timeval32.h +sys/_types/_timeval64.h +sys/_types/_u_int16_t.h +sys/_types/_u_int32_t.h +sys/_types/_u_int64_t.h +sys/_types/_u_int8_t.h +sys/_types/_ucontext.h +sys/_types/_ucontext64.h +sys/_types/_uid_t.h +sys/_types/_uintptr_t.h +sys/_types/_useconds_t.h +sys/_types/_uuid_t.h +sys/_types/_va_list.h +sys/_types/_wchar_t.h +sys/_types/_wint_t.h +sys/acct.h +sys/aio.h +sys/appleapiopts.h +sys/attr.h +sys/buf.h +sys/cdefs.h +sys/clonefile.h +sys/conf.h +sys/dir.h +sys/dirent.h +sys/disk.h +sys/dkstat.h +sys/domain.h +sys/dtrace.h +sys/dtrace_glue.h +sys/dtrace_impl.h +sys/errno.h +sys/ev.h +sys/event.h +sys/fasttrap.h +sys/fasttrap_isa.h +sys/fcntl.h +sys/file.h +sys/filedesc.h +sys/filio.h +sys/gmon.h +sys/ioccom.h +sys/ioctl.h +sys/ioctl_compat.h +sys/ipc.h +sys/kauth.h +sys/kdebug.h +sys/kdebug_signpost.h +sys/kern_control.h +sys/kern_event.h +sys/kernel.h +sys/kernel_types.h +sys/lctx.h +sys/loadable_fs.h +sys/lock.h +sys/lockf.h +sys/lockstat.h +sys/malloc.h +sys/mbuf.h +sys/mman.h +sys/mount.h +sys/msg.h +sys/msgbuf.h +sys/netport.h +sys/param.h +sys/paths.h +sys/pipe.h +sys/poll.h +sys/posix_sem.h +sys/posix_shm.h +sys/proc.h +sys/proc_info.h +sys/protosw.h +sys/ptrace.h +sys/queue.h +sys/quota.h +sys/random.h +sys/reboot.h +sys/resource.h +sys/resourcevar.h +sys/sbuf.h +sys/sdt.h +sys/select.h +sys/sem.h +sys/semaphore.h +sys/shm.h +sys/signal.h +sys/signalvar.h +sys/socket.h +sys/socketvar.h +sys/sockio.h +sys/spawn.h +sys/stat.h +sys/stdio.h +sys/sys_domain.h +sys/syscall.h +sys/sysctl.h +sys/syslimits.h +sys/syslog.h +sys/termios.h +sys/time.h +sys/timeb.h +sys/times.h +sys/tprintf.h +sys/trace.h +sys/tty.h +sys/ttychars.h +sys/ttycom.h +sys/ttydefaults.h +sys/ttydev.h +sys/types.h +sys/ubc.h +sys/ucontext.h +sys/ucred.h +sys/uio.h +sys/un.h +sys/unistd.h +sys/unpcb.h +sys/user.h +sys/utfconv.h +sys/utsname.h +sys/vadvise.h +sys/vcmd.h +sys/vm.h +sys/vmmeter.h +sys/vmparam.h +sys/vnioctl.h +sys/vnode.h +sys/vnode_if.h +sys/vstat.h +sys/wait.h +sys/xattr.h +uuid/uuid.h +vfs/vfs_support.h +voucher/ipc_pthread_priority_types.h diff --git a/pkgs/os-specific/darwin/binutils/default.nix b/pkgs/os-specific/darwin/binutils/default.nix index fad33b21d04..e9aa706da2d 100644 --- a/pkgs/os-specific/darwin/binutils/default.nix +++ b/pkgs/os-specific/darwin/binutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, binutils-unwrapped, cctools, llvm }: +{ lib, stdenv, binutils-unwrapped, cctools, llvm }: # Make sure both underlying packages claim to have prepended their binaries # with the same targetPrefix. @@ -32,7 +32,7 @@ stdenv.mkDerivation { # - strip: the binutils one seems to break mach-o files # - lipo: gcc build assumes it exists # - nm: the gnu one doesn't understand many new load commands - for i in ${stdenv.lib.concatStringsSep " " (builtins.map (e: targetPrefix + e) cmds)}; do + for i in ${lib.concatStringsSep " " (builtins.map (e: targetPrefix + e) cmds)}; do ln -sf "${cctools}/bin/$i" "$out/bin/$i" done @@ -56,7 +56,7 @@ stdenv.mkDerivation { }; meta = { - maintainers = with stdenv.lib.maintainers; [ matthewbauer ]; + maintainers = with lib.maintainers; [ matthewbauer ]; priority = 10; }; } diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix index 64f1490a7a7..50e0a2eb3fb 100644 --- a/pkgs/os-specific/darwin/cctools/port.nix +++ b/pkgs/os-specific/darwin/cctools/port.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, autoreconfHook +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, autoreconfHook , installShellFiles , libcxxabi, libuuid , libobjc ? null, maloader ? null @@ -9,7 +9,7 @@ let # The targetPrefix prepended to binary names to allow multiple binuntils on the # PATH to both be usable. - targetPrefix = stdenv.lib.optionalString + targetPrefix = lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) "${stdenv.targetPlatform.config}-"; in @@ -32,8 +32,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoconf automake libtool autoreconfHook installShellFiles ]; buildInputs = [ libuuid ] - ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi libobjc ] - ++ stdenv.lib.optional enableTapiSupport libtapi; + ++ lib.optionals stdenv.isDarwin [ libcxxabi libobjc ] + ++ lib.optional enableTapiSupport libtapi; patches = [ ./ld-ignore-rpath-link.patch ./ld-rpath-nonfinal.patch ]; @@ -47,14 +47,14 @@ stdenv.mkDerivation { # TODO(@Ericson2314): Always pass "--target" and always targetPrefix. configurePlatforms = [ "build" "host" ] - ++ stdenv.lib.optional (stdenv.targetPlatform != stdenv.hostPlatform) "target"; + ++ lib.optional (stdenv.targetPlatform != stdenv.hostPlatform) "target"; configureFlags = [ "--disable-clang-as" ] - ++ stdenv.lib.optionals enableTapiSupport [ + ++ lib.optionals enableTapiSupport [ "--enable-tapi-support" "--with-libtapi=${libtapi}" ]; - postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace cctools/Makefile.am --replace libobjc2 "" '' + '' sed -i -e 's/addStandardLibraryDirectories = true/addStandardLibraryDirectories = false/' cctools/ld64/src/ld/Options.cpp @@ -100,7 +100,7 @@ stdenv.mkDerivation { broken = !stdenv.targetPlatform.isDarwin; # Only supports darwin targets homepage = "http://www.opensource.apple.com/source/cctools/"; description = "MacOS Compiler Tools (cross-platform port)"; - license = stdenv.lib.licenses.apsl20; - maintainers = with stdenv.lib.maintainers; [ matthewbauer ]; + license = lib.licenses.apsl20; + maintainers = with lib.maintainers; [ matthewbauer ]; }; } diff --git a/pkgs/os-specific/darwin/duti/default.nix b/pkgs/os-specific/darwin/duti/default.nix index 5c63b8e0dfb..9daed151ce4 100644 --- a/pkgs/os-specific/darwin/duti/default.nix +++ b/pkgs/os-specific/darwin/duti/default.nix @@ -1,17 +1,25 @@ -{stdenv, lib, fetchFromGitHub, autoreconfHook, darwin}: +{stdenv, lib, fetchFromGitHub, autoreconfHook, ApplicationServices}: stdenv.mkDerivation rec { pname = "duti"; - version = "1.5.4pre"; + version = "1.5.5pre"; src = fetchFromGitHub { owner = "moretension"; repo = pname; - rev = "7dbcae86f99fedef5a6c4311f032a0f1ca0539cc"; - sha256 = "1z9sa0yk87vs57d5338y6lvm1v1vvynxb7dy1x5aqzkcr0imhljl"; + rev = "fe3d3dc411bcea6af7a8cbe53c0e08ed5ecacdb2"; + sha256 = "1pg4i6ghpib2gy1sqpml7dbnhr1vbr43fs2pqkd09i4w3nmgpic9"; }; + nativeBuildInputs = [autoreconfHook]; - buildInputs = [darwin.apple_sdk.frameworks.ApplicationServices]; - configureFlags = ["--with-macosx-sdk=/homeless-shelter"]; + buildInputs = [ApplicationServices]; + configureFlags = [ + "--with-macosx-sdk=/homeless-shelter" + + # needed to prevent duti from trying to guess our sdk + # NOTE: this is different than stdenv.hostPlatform.config! + "--host=x86_64-apple-darwin18" + ]; + meta = with lib; { description = "A command-line tool to select default applications for document types and URL schemes on Mac OS X"; longDescription = '' diff --git a/pkgs/os-specific/darwin/insert_dylib/default.nix b/pkgs/os-specific/darwin/insert_dylib/default.nix index 0ab6a415707..07e8886e3e6 100644 --- a/pkgs/os-specific/darwin/insert_dylib/default.nix +++ b/pkgs/os-specific/darwin/insert_dylib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, xcbuildHook }: +{ lib, stdenv, fetchFromGitHub, xcbuildHook }: stdenv.mkDerivation { name = "insert_dylib-2016.08.28"; @@ -14,5 +14,5 @@ stdenv.mkDerivation mkdir -p $out/bin install -m755 Products/Release/insert_dylib $out/bin ''; - meta.platforms = stdenv.lib.platforms.darwin; + meta.platforms = lib.platforms.darwin; } diff --git a/pkgs/os-specific/darwin/lsusb/default.nix b/pkgs/os-specific/darwin/lsusb/default.nix index 799a4761fbd..712e32f16fe 100644 --- a/pkgs/os-specific/darwin/lsusb/default.nix +++ b/pkgs/os-specific/darwin/lsusb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { version = "1.0"; @@ -21,8 +21,8 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/jlhonora/lsusb"; description = "lsusb command for Mac OS X"; - platforms = stdenv.lib.platforms.darwin; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.varunpatro ]; + platforms = lib.platforms.darwin; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.varunpatro ]; }; } diff --git a/pkgs/os-specific/darwin/maloader/default.nix b/pkgs/os-specific/darwin/maloader/default.nix index 0de94c92388..3943092bcf0 100644 --- a/pkgs/os-specific/darwin/maloader/default.nix +++ b/pkgs/os-specific/darwin/maloader/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, opencflite, clang, libcxx }: +{ lib, stdenv, fetchgit, opencflite, clang, libcxx }: stdenv.mkDerivation { name = "maloader-0git"; @@ -31,8 +31,8 @@ stdenv.mkDerivation { meta = { description = "Mach-O loader for Linux"; homepage = "https://github.com/shinh/maloader"; - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.bsd2; + platforms = lib.platforms.linux; broken = true; # 2018-09-08, no succesful build since 2017-08-21 }; } diff --git a/pkgs/os-specific/darwin/opencflite/default.nix b/pkgs/os-specific/darwin/opencflite/default.nix index 26af46a171f..937d0763fef 100644 --- a/pkgs/os-specific/darwin/opencflite/default.nix +++ b/pkgs/os-specific/darwin/opencflite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, icu, libuuid, tzdata }: +{ lib, stdenv, fetchurl, icu, libuuid, tzdata }: stdenv.mkDerivation rec { pname = "opencflite"; @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { meta = { description = "Cross platform port of the macOS CoreFoundation"; homepage = "https://sourceforge.net/projects/opencflite/"; - license = stdenv.lib.licenses.apsl20; + license = lib.licenses.apsl20; }; } diff --git a/pkgs/os-specific/darwin/stubs/default.nix b/pkgs/os-specific/darwin/stubs/default.nix index 6fedf0a451e..862305a069d 100644 --- a/pkgs/os-specific/darwin/stubs/default.nix +++ b/pkgs/os-specific/darwin/stubs/default.nix @@ -1,6 +1,6 @@ -{ stdenv, writeScriptBin, runtimeShell }: +{ lib, writeScriptBin, runtimeShell }: -let fake = name: stdenv.lib.overrideDerivation (writeScriptBin name '' +let fake = name: lib.overrideDerivation (writeScriptBin name '' #!${runtimeShell} echo >&2 "Faking call to ${name} with arguments:" echo >&2 "$@" diff --git a/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix b/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix index 059cb70bfbd..560be0c31ab 100644 --- a/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix +++ b/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, ninja, python3, curl, libxml2, objc4, ICU }: +{ lib, stdenv, fetchFromGitHub, fetchurl, ninja, python3, curl, libxml2, objc4, ICU }: let # 10.12 adds a new sysdir.h that our version of CF in the main derivation depends on, but @@ -23,9 +23,9 @@ stdenv.mkDerivation { nativeBuildInputs = [ ninja python3 ]; buildInputs = [ curl libxml2 objc4 ICU ]; - sourceRoot = "source/CoreFoundation"; + postPatch = '' + cd CoreFoundation - patchPhase = '' cp ${sysdir-free-system-directories} Base.subproj/CFSystemDirectories.c # In order, since I can't comment individual lines: @@ -39,6 +39,7 @@ stdenv.mkDerivation { # Fix sandbox impurities. substituteInPlace ../lib/script.py \ --replace '/bin/cp' cp + patchShebangs --build ../configure # Includes xpc for some initialization routine that they don't define anyway, so no harm here substituteInPlace PlugIn.subproj/CFBundlePriv.h \ @@ -74,7 +75,7 @@ stdenv.mkDerivation { # Based on testing this issue seems to only occur with clang_7, so # please remove this when updating the default llvm versions to 8 or # later. - buildPhase = stdenv.lib.optionalString true '' + buildPhase = lib.optionalString true '' for i in {1..512}; do if ninja -j $NIX_BUILD_CORES; then break diff --git a/pkgs/os-specific/darwin/trash/default.nix b/pkgs/os-specific/darwin/trash/default.nix index 205391a52da..a239f6607b1 100644 --- a/pkgs/os-specific/darwin/trash/default.nix +++ b/pkgs/os-specific/darwin/trash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, perl, AppKit, Cocoa, ScriptingBridge }: +{ lib, stdenv, fetchFromGitHub, perl, AppKit, Cocoa, ScriptingBridge }: stdenv.mkDerivation rec { version = "0.9.2"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { patches = [ ./trash.diff ]; - buildPhase = ''make all docs''; + buildPhase = "make all docs"; installPhase = '' mkdir -p $out/bin @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/ali-rantakari/trash"; description = "Small command-line program for OS X that moves files or folders to the trash."; - platforms = stdenv.lib.platforms.darwin; - license = stdenv.lib.licenses.mit; + platforms = lib.platforms.darwin; + license = lib.licenses.mit; }; } diff --git a/pkgs/os-specific/darwin/usr-include/default.nix b/pkgs/os-specific/darwin/usr-include/default.nix index 4fef1388764..26b60ea44f5 100644 --- a/pkgs/os-specific/darwin/usr-include/default.nix +++ b/pkgs/os-specific/darwin/usr-include/default.nix @@ -1,4 +1,4 @@ -{stdenv, darwin}: +{lib, stdenv, darwin}: /* * This is needed to build GCC on Darwin. @@ -19,5 +19,5 @@ stdenv.mkDerivation { ln -sf ${darwin.CF}/Library/Frameworks/CoreFoundation.framework/Headers/* CoreFoundation ''; - meta.platforms = stdenv.lib.platforms.darwin; + meta.platforms = lib.platforms.darwin; } diff --git a/pkgs/os-specific/darwin/wifi-password/default.nix b/pkgs/os-specific/darwin/wifi-password/default.nix index 2dfc97dec1b..f66af1ddfb5 100644 --- a/pkgs/os-specific/darwin/wifi-password/default.nix +++ b/pkgs/os-specific/darwin/wifi-password/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { version = "0.1.0"; @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/rauchg/wifi-password"; description = "Get the password of the wifi you're on"; - platforms = stdenv.lib.platforms.darwin; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.nikitavoloboev ]; + platforms = lib.platforms.darwin; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.nikitavoloboev ]; }; } diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix index 851110f7b65..2ce607896b5 100644 --- a/pkgs/os-specific/darwin/xcode/default.nix +++ b/pkgs/os-specific/darwin/xcode/default.nix @@ -1,10 +1,10 @@ -{ stdenv, requireFile, lib }: +{ buildPlatform, requireFile, targetPlatform, lib }: let requireXcode = version: sha256: let xip = "Xcode_" + version + ".xip"; # TODO(alexfmpe): Find out how to validate the .xip signature in Linux - unxip = if stdenv.isDarwin + unxip = if buildPlatform.isDarwin then '' open -W ${xip} rm -rf ${xip} @@ -53,6 +53,19 @@ in lib.makeExtensible (self: { xcode_10_2_1 = requireXcode "10.2.1" "11sdb54nr0x7kp987qq839x6k5gdx7vqdxjiy5xm5279n1n47bmg"; xcode_10_3 = requireXcode "10.3" "1i628vfn6zad81fsz3zpc6z15chhskvyp8qnajp2wnpzvrwl6ngb"; xcode_11 = requireXcode "11" "1r03j3kkp4blfp2kqpn538w3dx57ms930fj8apjkq6dk7fv3jcqh"; + xcode_11_1 = requireXcode "11.1" "1c2gzc4jhhx5a7ncg19sh1r99izhipybaqxl1ll52x5y8689awc1"; + xcode_11_2 = requireXcode "11.2" "1lm3q8zpvm184246h5j9mw4c1y9kk9sxnr3j98kfm0312n0l98gj"; + xcode_11_3 = requireXcode "11.3" "04rv6xlywy8xqfx9ma8ygsdw4yhckk2mq0qnklxnfly899iw4wza"; xcode_11_3_1 = requireXcode "11.3.1" "1p6nicj91kr6ad3rmycahd1i7z4hj7ccjs93ixsiximjzaahx3q4"; - xcode = self."xcode_${lib.replaceStrings ["."] ["_"] (if (stdenv.targetPlatform ? xcodeVer) then stdenv.targetPlatform.xcodeVer else "11.3.1")}"; + xcode_11_4 = requireXcode "11.4" "065rpb3rdk19nv3rwyf9bk32ccbd0lld12gj12l89cyg65mhpyy7"; + xcode_11_5 = requireXcode "11.5" "1dizazq9nz1vjkc5gy7dd4x760mkfjiifk1hf6d9mscchdq8rfkw"; + xcode_11_6 = requireXcode "11.6" "1y4fhw1kiphzxdb4wpv697z5r0algvaldwq5iqv266797rnfql4x"; + xcode_11_7 = requireXcode "11.7" "0422rdc4j5qwyk59anbybxyfv0p26x0xryszm0wd8i44g66smlmj"; + xcode_12 = requireXcode "12" "1w3xm268pyn5m04wv22invd5kr2k4jqllgrzapv6n1sxxynxrh8z"; + xcode_12_0_1 = requireXcode "12.0.1" "1p6vd5ai0hh3cq6aflh4h21ar0shxnz8wlkaxwq7liwsdmkwzbl0"; + xcode_12_1 = requireXcode "12.1" "1widy74dk43wx8iqgd7arzf6q4kzdmaz8pfwymzs8chnq9dqr3wp"; + xcode_12_2 = requireXcode "12.2" "17i0wf4pwrxwfgjw7rpw9mcd59nkmys1k5h2rqsw81snzyxy9j0v"; + xcode_12_3 = requireXcode "12.3" "0kwf1y4llysf1p0nsbqyzccn7d77my0ldagr5fi3by4k0xy3d189"; + xcode = self."xcode_${lib.replaceStrings ["."] ["_"] (if (targetPlatform ? xcodeVer) then targetPlatform.xcodeVer else "12.3")}"; }) + diff --git a/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix index 45e1f1eab4f..16ed52ea81e 100644 --- a/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix +++ b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix @@ -2,7 +2,7 @@ , clang-unwrapped , binutils-unwrapped , runCommand -, stdenv + , wrapBintoolsWith , wrapCCWith , buildIosSdk, targetIosSdkPkgs @@ -37,9 +37,9 @@ rec { bintools = binutils-unwrapped; extraBuildCommands = '' echo "-arch ${iosPlatformArch targetPlatform}" >> $out/nix-support/libc-ldflags - '' + stdenv.lib.optionalString (sdk.platform == "iPhoneSimulator") '' + '' + lib.optionalString (sdk.platform == "iPhoneSimulator") '' echo "-platform_version ios-sim ${minSdkVersion} ${sdk.version}" >> $out/nix-support/libc-ldflags - '' + stdenv.lib.optionalString (sdk.platform == "iPhoneOS") '' + '' + lib.optionalString (sdk.platform == "iPhoneOS") '' echo "-platform_version ios ${minSdkVersion} ${sdk.version}" >> $out/nix-support/libc-ldflags ''; }; @@ -54,9 +54,9 @@ rec { mv cc-cflags.tmp $out/nix-support/cc-cflags echo "-target ${targetPlatform.config} -arch ${iosPlatformArch targetPlatform}" >> $out/nix-support/cc-cflags echo "-isystem ${sdk}/usr/include${lib.optionalString (lib.versionAtLeast "10" sdk.version) " -isystem ${sdk}/usr/include/c++/4.2.1/ -stdlib=libstdc++"}" >> $out/nix-support/cc-cflags - '' + stdenv.lib.optionalString (sdk.platform == "iPhoneSimulator") '' + '' + lib.optionalString (sdk.platform == "iPhoneSimulator") '' echo "-mios-simulator-version-min=${minSdkVersion}" >> $out/nix-support/cc-cflags - '' + stdenv.lib.optionalString (sdk.platform == "iPhoneOS") '' + '' + lib.optionalString (sdk.platform == "iPhoneOS") '' echo "-miphoneos-version-min=${minSdkVersion}" >> $out/nix-support/cc-cflags ''; }) // { diff --git a/pkgs/os-specific/linux/acpi/default.nix b/pkgs/os-specific/linux/acpi/default.nix index 127d0c4b022..d257553299c 100644 --- a/pkgs/os-specific/linux/acpi/default.nix +++ b/pkgs/os-specific/linux/acpi/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { battery and thermal information. ''; homepage = "https://sourceforge.net/projects/acpiclient/"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ ]; }; diff --git a/pkgs/os-specific/linux/acpitool/default.nix b/pkgs/os-specific/linux/acpitool/default.nix index 9f2ad5b5c03..4a3d1a36bd7 100644 --- a/pkgs/os-specific/linux/acpitool/default.nix +++ b/pkgs/os-specific/linux/acpitool/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, fetchpatch}: +{lib, stdenv, fetchurl, fetchpatch}: let acpitool-patch-051-4 = params: fetchpatch rec { @@ -44,8 +44,8 @@ in stdenv.mkDerivation rec { meta = { description = "A small, convenient command-line ACPI client with a lot of features"; homepage = "https://sourceforge.net/projects/acpitool/"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.guibert ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.guibert ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/os-specific/linux/afuse/default.nix b/pkgs/os-specific/linux/afuse/default.nix index 758c57bb9e1..7375f45eb6d 100644 --- a/pkgs/os-specific/linux/afuse/default.nix +++ b/pkgs/os-specific/linux/afuse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, autoreconfHook, fuse }: +{ lib, stdenv, fetchurl, pkg-config, autoreconfHook, fuse }: stdenv.mkDerivation { name = "afuse-0.4.1"; @@ -8,14 +8,14 @@ stdenv.mkDerivation { sha256 = "1sfhicmxppkvdd4z9klfn63snb71gr9hff6xij1gzk94xg6m0ycc"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ fuse ]; meta = { description = "Automounter in userspace"; homepage = "https://github.com/pcarrier/afuse"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.marcweber ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/akvcam/default.nix b/pkgs/os-specific/linux/akvcam/default.nix index 9e745077514..026ef5b0f46 100644 --- a/pkgs/os-specific/linux/akvcam/default.nix +++ b/pkgs/os-specific/linux/akvcam/default.nix @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ qmake ]; + dontWrapQtApps = true; qmakeFlags = [ "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" diff --git a/pkgs/os-specific/linux/alsa-firmware/default.nix b/pkgs/os-specific/linux/alsa-firmware/default.nix index 01955534bfc..a627a7762a8 100644 --- a/pkgs/os-specific/linux/alsa-firmware/default.nix +++ b/pkgs/os-specific/linux/alsa-firmware/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, autoreconfHook, fetchurl, fetchpatch }: +{ lib, stdenv, buildPackages, autoreconfHook, fetchurl, fetchpatch }: stdenv.mkDerivation rec { name = "alsa-firmware-1.2.1"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.alsa-project.org/"; description = "Soundcard firmwares from the alsa project"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/alsa-lib/default.nix b/pkgs/os-specific/linux/alsa-lib/default.nix index 30bb669cf4c..2511c88f3f1 100644 --- a/pkgs/os-specific/linux/alsa-lib/default.nix +++ b/pkgs/os-specific/linux/alsa-lib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsa-ucm-conf, alsa-topology-conf }: +{ lib, stdenv, fetchurl, fetchpatch, alsa-ucm-conf, alsa-topology-conf }: stdenv.mkDerivation rec { pname = "alsa-lib"; @@ -11,6 +11,14 @@ stdenv.mkDerivation rec { patches = [ ./alsa-plugin-conf-multilib.patch + (fetchpatch { + # plucked from upstream master, delete in next release + # without this patch alsa 1.2.4 fails to compile against musl-libc + # due to an overly conservative ifdef gate in a new feature + name = "fix-dlo.patch"; + url = "https://github.com/alsa-project/alsa-lib/commit/ad8c8e5503980295dd8e5e54a6285d2d7e32eb1e.patch"; + sha256 = "QQP4C1dSnJP1MNKt2el7Wn3KmtwtYzvyIHWdrHs+Jw4="; + }) ]; enableParallelBuilding = true; @@ -36,7 +44,7 @@ stdenv.mkDerivation rec { MIDI functionality to the Linux-based operating system. ''; - license = licenses.gpl3Plus; + license = licenses.lgpl21Plus; platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/alsa-plugins/default.nix b/pkgs/os-specific/linux/alsa-plugins/default.nix index 54d7ce6222a..602d4278183 100644 --- a/pkgs/os-specific/linux/alsa-plugins/default.nix +++ b/pkgs/os-specific/linux/alsa-plugins/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lib, pkgconfig, alsaLib, libogg, libpulseaudio ? null, libjack2 ? null }: +{ stdenv, fetchurl, lib, pkg-config, alsaLib, libogg, libpulseaudio ? null, libjack2 ? null }: stdenv.mkDerivation rec { pname = "alsa-plugins"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0z9k3ssbfk2ky2w13avgyf202j1drsz9sv3834bp33cj1i2hc3qw"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; # ToDo: a52, etc.? buildInputs = diff --git a/pkgs/os-specific/linux/alsa-tools/default.nix b/pkgs/os-specific/linux/alsa-tools/default.nix index 4feb99f6bef..c4fdbacf95b 100644 --- a/pkgs/os-specific/linux/alsa-tools/default.nix +++ b/pkgs/os-specific/linux/alsa-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, pkgconfig, gtk2, gtk3, fltk13 }: +{ lib, stdenv, fetchurl, alsaLib, pkg-config, gtk2, gtk3, fltk13 }: # Comes from upstream as as bundle of several tools, # some use gtk2, some gtk3 (and some even fltk13). @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0jbkjmq038zapj66a7nkppdf644v2mwj581xbmh6k4i8w6mcglxz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ alsaLib gtk2 gtk3 fltk13 ]; patchPhase = '' diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix index 40db2261007..da365fb7d99 100644 --- a/pkgs/os-specific/linux/alsa-utils/default.nix +++ b/pkgs/os-specific/linux/alsa-utils/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { installFlags = [ "ASOUND_STATE_DIR=$(TMPDIR)/dummy" ]; postFixup = '' - wrapProgram $out/bin/alsa-info.sh --prefix PATH : "${stdenv.lib.makeBinPath [ which pciutils ]}" + wrapProgram $out/bin/alsa-info.sh --prefix PATH : "${lib.makeBinPath [ which pciutils ]}" ''; meta = with lib; { diff --git a/pkgs/os-specific/linux/amdgpu-pro/default.nix b/pkgs/os-specific/linux/amdgpu-pro/default.nix index 78d0748ed3b..13dd8302b18 100644 --- a/pkgs/os-specific/linux/amdgpu-pro/default.nix +++ b/pkgs/os-specific/linux/amdgpu-pro/default.nix @@ -7,7 +7,7 @@ assert (!libsOnly) -> kernel != null; -with stdenv.lib; +with lib; let diff --git a/pkgs/os-specific/linux/anbox/default.nix b/pkgs/os-specific/linux/anbox/default.nix index cfbdb376977..d684e24db91 100644 --- a/pkgs/os-specific/linux/anbox/default.nix +++ b/pkgs/os-specific/linux/anbox/default.nix @@ -115,7 +115,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/anbox \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [libGL libglvnd]} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [libGL libglvnd]} \ --prefix PATH : ${git}/bin mkdir -p $out/share/dbus-1/services diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index 3ce310acf23..935b5e65b1f 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, fetchpatch, makeWrapper, autoreconfHook -, pkgconfig, which +, pkg-config, which , flex, bison , linuxHeaders ? stdenv.cc.libc.linuxHeaders , gawk @@ -17,7 +17,7 @@ let apparmor-patchver = "6"; apparmor-version = apparmor-series + "." + apparmor-patchver; - apparmor-meta = component: with stdenv.lib; { + apparmor-meta = component: with lib; { homepage = "https://apparmor.net/"; description = "A mandatory access control system - ${component}"; license = licenses.gpl2; @@ -39,7 +39,7 @@ let substituteInPlace ./common/Make.rules --replace "/usr/share/man" "share/man" ''; - patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [ + patches = lib.optionals stdenv.hostPlatform.isMusl [ (fetchpatch { url = "https://git.alpinelinux.org/aports/plain/testing/apparmor/0003-Added-missing-typedef-definitions-on-parser.patch?id=74b8427cc21f04e32030d047ae92caa618105b53"; name = "0003-Added-missing-typedef-definitions-on-parser.patch"; @@ -67,7 +67,7 @@ let autoreconfHook bison flex - pkgconfig + pkg-config swig ncurses which @@ -75,8 +75,8 @@ let ]; buildInputs = [] - ++ stdenv.lib.optional withPerl perl - ++ stdenv.lib.optional withPython python; + ++ lib.optional withPerl perl + ++ lib.optional withPython python; # required to build apparmor-parser dontDisableStatic = true; @@ -84,21 +84,21 @@ let prePatch = prePatchCommon + '' substituteInPlace ./libraries/libapparmor/swig/perl/Makefile.am --replace install_vendor install_site substituteInPlace ./libraries/libapparmor/swig/perl/Makefile.in --replace install_vendor install_site - substituteInPlace ./libraries/libapparmor/src/Makefile.am --replace "/usr/include/netinet/in.h" "${stdenv.lib.getDev stdenv.cc.libc}/include/netinet/in.h" - substituteInPlace ./libraries/libapparmor/src/Makefile.in --replace "/usr/include/netinet/in.h" "${stdenv.lib.getDev stdenv.cc.libc}/include/netinet/in.h" + substituteInPlace ./libraries/libapparmor/src/Makefile.am --replace "/usr/include/netinet/in.h" "${lib.getDev stdenv.cc.libc}/include/netinet/in.h" + substituteInPlace ./libraries/libapparmor/src/Makefile.in --replace "/usr/include/netinet/in.h" "${lib.getDev stdenv.cc.libc}/include/netinet/in.h" ''; inherit patches; postPatch = "cd ./libraries/libapparmor"; # https://gitlab.com/apparmor/apparmor/issues/1 configureFlags = [ - (stdenv.lib.withFeature withPerl "perl") - (stdenv.lib.withFeature withPython "python") + (lib.withFeature withPerl "perl") + (lib.withFeature withPython "python") ]; - outputs = [ "out" ] ++ stdenv.lib.optional withPython "python"; + outputs = [ "out" ] ++ lib.optional withPython "python"; - postInstall = stdenv.lib.optionalString withPython '' + postInstall = lib.optionalString withPython '' mkdir -p $python/lib mv $out/lib/python* $python/lib/ ''; @@ -154,7 +154,7 @@ let src = apparmor-sources; nativeBuildInputs = [ - pkgconfig + pkg-config libapparmor gawk which @@ -206,7 +206,7 @@ let name = "apparmor-pam-${apparmor-version}"; src = apparmor-sources; - nativeBuildInputs = [ pkgconfig which ]; + nativeBuildInputs = [ pkg-config which ]; buildInputs = [ libapparmor pam ]; @@ -237,7 +237,7 @@ let name = "apparmor-kernel-patches-${apparmor-version}"; src = apparmor-sources; - phases = ''unpackPhase installPhase''; + phases = "unpackPhase installPhase"; installPhase = '' mkdir "$out" diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix index f4378cad816..b7301837026 100644 --- a/pkgs/os-specific/linux/ati-drivers/default.nix +++ b/pkgs/os-specific/linux/ati-drivers/default.nix @@ -9,7 +9,7 @@ assert (!libsOnly) -> kernel != null; -with stdenv.lib; +with lib; # This derivation requires a maximum of gcc49, Linux kernel 4.1 and xorg.xserver 1.17 # and will not build or run using versions newer diff --git a/pkgs/os-specific/linux/atop/default.nix b/pkgs/os-specific/linux/atop/default.nix index f3df61c1510..e1b64c0a4b5 100644 --- a/pkgs/os-specific/linux/atop/default.nix +++ b/pkgs/os-specific/linux/atop/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with lib; { platforms = platforms.linux; maintainers = with maintainers; [ raskin ]; - description = ''Console system performance monitor''; + description = "Console system performance monitor"; longDescription = '' Atop is an ASCII full-screen performance monitor that is capable of reporting the activity of all processes (even if processes have finished during the interval), daily logging of system and process activity for long-term analysis, highlighting overloaded system resources by using colors, etc. At regular intervals, it shows system-level activity related to the CPU, memory, swap, disks and network layers, and for every active process it shows the CPU utilization, memory growth, disk utilization, priority, username, state, and exit code. diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix index f77d71c823b..84bc6086d12 100644 --- a/pkgs/os-specific/linux/audit/default.nix +++ b/pkgs/os-specific/linux/audit/default.nix @@ -1,5 +1,5 @@ { - stdenv, buildPackages, fetchurl, fetchpatch, + lib, stdenv, buildPackages, fetchurl, fetchpatch, runCommand, autoconf, automake, libtool, enablePython ? false, python ? null, @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = stdenv.lib.optionals stdenv.hostPlatform.isMusl + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isMusl [ autoconf automake libtool ]; - buildInputs = stdenv.lib.optional enablePython python; + buildInputs = lib.optional enablePython python; configureFlags = [ # z/OS plugin is not useful on Linux, @@ -36,7 +36,8 @@ stdenv.mkDerivation rec { # TODO: Remove the musl patches when # https://github.com/linux-audit/audit-userspace/pull/25 # is available with the next release. - patches = stdenv.lib.optional stdenv.hostPlatform.isMusl [ + patches = [ ./patches/weak-symbols.patch ] + ++ lib.optional stdenv.hostPlatform.isMusl [ ( let patch = fetchpatch { url = "https://github.com/linux-audit/audit-userspace/commit/d579a08bb1cde71f939c13ac6b2261052ae9f77e.patch"; @@ -55,12 +56,19 @@ stdenv.mkDerivation rec { prePatch = '' sed -i 's,#include <sys/poll.h>,#include <poll.h>\n#include <limits.h>,' audisp/audispd.c + '' + # According to https://stackoverflow.com/questions/13089166 + # --whole-archive linker flag is required to be sure that linker + # correctly chooses strong version of symbol regardless of order of + # object files at command line. + + lib.optionalString stdenv.targetPlatform.isStatic '' + export LDFLAGS=-Wl,--whole-archive ''; meta = { description = "Audit Library"; homepage = "https://people.redhat.com/sgrubb/audit/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/os-specific/linux/audit/patches/weak-symbols.patch b/pkgs/os-specific/linux/audit/patches/weak-symbols.patch new file mode 100644 index 00000000000..301ea9a5476 --- /dev/null +++ b/pkgs/os-specific/linux/audit/patches/weak-symbols.patch @@ -0,0 +1,147 @@ +Executables in src/ directory are built from source files in src/ +and are linked to libauparse, with both src/auditd-config.c and +auparse/auditd-config.c defining "free_config" function. + +It is known (although obscure) behaviour of shared libraries that +symbol defined in binary itself overrides symbol in shared library; +with static linkage it expectedly results in multiple definition +error. + +This set of fixes explicitly marks libauparse versions of +conflicting functions as weak to have behaviour coherent with +dynamic linkage version -- definitions in src/ overriding definition +in auparse/. + +Still, this architecture is very strange and confusing. + +diff -r -U5 audit-2.8.5-orig/auparse/auditd-config.c audit-2.8.5/auparse/auditd-config.c +--- audit-2.8.5-orig/auparse/auditd-config.c 2019-03-01 20:19:13.000000000 +0000 ++++ audit-2.8.5/auparse/auditd-config.c 2021-01-13 11:36:12.716226498 +0000 +@@ -68,10 +68,11 @@ + }; + + /* + * Set everything to its default value + */ ++#pragma weak clear_config + void clear_config(struct daemon_conf *config) + { + config->local_events = 1; + config->qos = QOS_NON_BLOCKING; + config->sender_uid = 0; +@@ -322,10 +323,11 @@ + if (config->log_file == NULL) + return 1; + return 0; + } + ++#pragma weak free_config + void free_config(struct daemon_conf *config) + { + free((void*)config->log_file); + } + +diff -r -U5 audit-2.8.5-orig/auparse/interpret.c audit-2.8.5/auparse/interpret.c +--- audit-2.8.5-orig/auparse/interpret.c 2019-03-01 20:19:13.000000000 +0000 ++++ audit-2.8.5/auparse/interpret.c 2021-01-13 11:39:42.107217224 +0000 +@@ -545,10 +545,11 @@ + else + snprintf(buf, size, "unknown(%d)", uid); + return buf; + } + ++#pragma weak aulookup_destroy_uid_list + void aulookup_destroy_uid_list(void) + { + if (uid_cache_created == 0) + return; + +@@ -2810,10 +2811,11 @@ + + /* + * This is the main entry point for the auparse library. Call chain is: + * auparse_interpret_field -> nvlist_interp_cur_val -> interpret + */ ++#pragma weak interpret + const char *interpret(const rnode *r, auparse_esc_t escape_mode) + { + const nvlist *nv = &r->nv; + int type; + idata id; +diff -r -U5 audit-2.8.5-orig/auparse/nvlist.c audit-2.8.5/auparse/nvlist.c +--- audit-2.8.5-orig/auparse/nvlist.c 2019-02-04 14:26:52.000000000 +0000 ++++ audit-2.8.5/auparse/nvlist.c 2021-01-13 11:37:37.190222757 +0000 +@@ -27,10 +27,11 @@ + #include "nvlist.h" + #include "interpret.h" + #include "auparse-idata.h" + + ++#pragma weak nvlist_create + void nvlist_create(nvlist *l) + { + l->head = NULL; + l->cur = NULL; + l->cnt = 0; +@@ -47,17 +48,19 @@ + while (node->next) + node = node->next; + l->cur = node; + } + ++#pragma weak nvlist_next + nvnode *nvlist_next(nvlist *l) + { + if (l->cur) + l->cur = l->cur->next; + return l->cur; + } + ++#pragma weak nvlist_append + void nvlist_append(nvlist *l, nvnode *node) + { + nvnode* newnode = malloc(sizeof(nvnode)); + + newnode->name = node->name; +@@ -141,10 +144,11 @@ + if (l->cur->interp_val) + return l->cur->interp_val; + return interpret(r, escape_mode); + } + ++#pragma weak nvlist_clear + void nvlist_clear(nvlist* l) + { + nvnode* nextnode; + register nvnode* current; + +diff -r -U5 audit-2.8.5-orig/auparse/strsplit.c audit-2.8.5/auparse/strsplit.c +--- audit-2.8.5-orig/auparse/strsplit.c 2019-03-01 21:15:30.000000000 +0000 ++++ audit-2.8.5/auparse/strsplit.c 2021-01-13 11:38:04.306221556 +0000 +@@ -54,10 +54,11 @@ + return NULL; + return s; + } + } + ++#pragma weak audit_strsplit + char *audit_strsplit(char *s) + { + static char *str = NULL; + char *ptr; + +diff -r -U5 audit-2.8.5-orig/lib/strsplit.c audit-2.8.5/lib/strsplit.c +--- audit-2.8.5-orig/lib/strsplit.c 2019-03-01 20:19:13.000000000 +0000 ++++ audit-2.8.5/lib/strsplit.c 2021-01-13 11:38:29.444220443 +0000 +@@ -23,10 +23,11 @@ + + #include <string.h> + #include "libaudit.h" + #include "private.h" + ++#pragma weak audit_strsplit_r + char *audit_strsplit_r(char *s, char **savedpp) + { + char *ptr; + + if (s) diff --git a/pkgs/os-specific/linux/autofs/default.nix b/pkgs/os-specific/linux/autofs/default.nix index ab78c590017..f7ca3f71d43 100644 --- a/pkgs/os-specific/linux/autofs/default.nix +++ b/pkgs/os-specific/linux/autofs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, flex, bison, linuxHeaders, libtirpc, mount, umount, nfs-utils, e2fsprogs +{ lib, stdenv, fetchurl, flex, bison, linuxHeaders, libtirpc, mount, umount, nfs-utils, e2fsprogs , libxml2, kerberos, kmod, openldap, sssd, cyrus_sasl, openssl, rpcsvc-proto }: let @@ -44,8 +44,8 @@ in stdenv.mkDerivation { meta = { description = "Kernel-based automounter"; homepage = "https://www.kernel.org/pub/linux/daemons/autofs/"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; executables = [ "automount" ]; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/batman-adv/alfred.nix b/pkgs/os-specific/linux/batman-adv/alfred.nix index 04217b8989b..96040f2828c 100644 --- a/pkgs/os-specific/linux/batman-adv/alfred.nix +++ b/pkgs/os-specific/linux/batman-adv/alfred.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gpsd, libcap, libnl }: +{ lib, stdenv, fetchurl, pkg-config, gpsd, libcap, libnl }: let cfg = import ./version.nix; in @@ -11,18 +11,18 @@ stdenv.mkDerivation rec { sha256 = cfg.sha256.${pname}; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gpsd libcap libnl ]; preBuild = '' - makeFlags="PREFIX=$out PKG_CONFIG=${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config" + makeFlags="PREFIX=$out PKG_CONFIG=${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config" ''; meta = { homepage = "https://www.open-mesh.org/projects/batman-adv/wiki/Wiki"; description = "B.A.T.M.A.N. routing protocol in a linux kernel module for layer 2, information distribution tool"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ fpletz ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ fpletz ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix index 3b1cf183e08..079624c10ad 100644 --- a/pkgs/os-specific/linux/batman-adv/batctl.nix +++ b/pkgs/os-specific/linux/batman-adv/batctl.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libnl }: +{ lib, stdenv, fetchurl, pkg-config, libnl }: let cfg = import ./version.nix; in @@ -11,18 +11,18 @@ stdenv.mkDerivation rec { sha256 = cfg.sha256.${pname}; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libnl ]; preBuild = '' - makeFlags="PREFIX=$out PKG_CONFIG=${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config" + makeFlags="PREFIX=$out PKG_CONFIG=${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config" ''; meta = { homepage = "https://www.open-mesh.org/projects/batman-adv/wiki/Wiki"; description = "B.A.T.M.A.N. routing protocol in a linux kernel module for layer 2, control tool"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ fpletz ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ fpletz ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix index 8985949a012..354f4b1bff2 100644 --- a/pkgs/os-specific/linux/batman-adv/default.nix +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kernel }: +{ lib, stdenv, fetchurl, kernel }: let cfg = import ./version.nix; in @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.open-mesh.org/projects/batman-adv/wiki/Wiki"; description = "B.A.T.M.A.N. routing protocol in a linux kernel module for layer 2"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ fpletz ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ fpletz hexa ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/os-specific/linux/batman-adv/version.nix b/pkgs/os-specific/linux/batman-adv/version.nix index d93f8a6c46e..3a6ec67519e 100644 --- a/pkgs/os-specific/linux/batman-adv/version.nix +++ b/pkgs/os-specific/linux/batman-adv/version.nix @@ -1,9 +1,9 @@ { - version = "2020.4"; + version = "2021.0"; sha256 = { - batman-adv = "1cxr0zmn9nzisawkrfk0gzd9fx0pg6261c889kz47hwp4f545v6d"; - alfred = "1ay69nifzghpbvy11fdca5cllkn852h6rg045lci4vzgqf7b2bd2"; - batctl = "05rrpfbpdhxn5zgdps849qls2ifis6a94cjryb60d4y1nc2n0d7w"; + batman-adv = "1898y0m8sgca0dmhyfkpmx2g6qc0b1xvh5nm7cvnhwl9h2jrp62s"; + alfred = "0jr4wbz81ijd03ssfxb9mqlj3zbx2k495lsl0np262hyla6w0qm0"; + batctl = "1r01a8zxivq4slwc81dgg9qknqsli8qw17csfj95321gjpqqpv4w"; }; } diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index 5338562b7e7..d994aed6d0f 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -6,13 +6,13 @@ python.pkgs.buildPythonApplication rec { pname = "bcc"; - version = "0.17.0"; + version = "0.18.0"; disabled = !stdenv.isLinux; src = fetchurl { url = "https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz"; - sha256 = "sha256-aEy8WwtKGaf7GZOTK5IHhwzenqU2U+vpWrcNWMCGvMw="; + sha256 = "sha256-0F8tppVFu7cnuSnlgcEvbEdykxYhGJnTc04I98/yIVs="; }; format = "other"; @@ -31,7 +31,7 @@ python.pkgs.buildPythonApplication rec { propagatedBuildInputs = [ python.pkgs.netaddr ]; nativeBuildInputs = [ makeWrapper cmake flex bison ] # libelf is incompatible with elfutils-libelf - ++ stdenv.lib.filter (x: x != libelf) kernel.moduleBuildDependencies; + ++ lib.filter (x: x != libelf) kernel.moduleBuildDependencies; cmakeFlags = [ "-DBCC_KERNEL_MODULES_DIR=${kernel.dev}/lib/modules" diff --git a/pkgs/os-specific/linux/beefi/default.nix b/pkgs/os-specific/linux/beefi/default.nix new file mode 100644 index 00000000000..959a43faea9 --- /dev/null +++ b/pkgs/os-specific/linux/beefi/default.nix @@ -0,0 +1,44 @@ +{ stdenv +, lib +, fetchFromGitHub +, installShellFiles +, binutils-unwrapped +, systemd }: + +stdenv.mkDerivation rec { + pname = "beefi"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "jfeick"; + repo = "beefi"; + rev = version; + sha256 = "1180avalbw414q1gnfqdgc9zg3k9y0401kw9qvcn51qph81d04v5"; + }; + + nativeBuildInputs = [ installShellFiles ]; + + buildInputs = [ + binutils-unwrapped + systemd + ]; + + patchPhase = '' + substituteInPlace beefi \ + --replace objcopy ${binutils-unwrapped}/bin/objcopy \ + --replace /usr/lib/systemd ${systemd}/lib/systemd + ''; + + installPhase = '' + install -Dm755 beefi $out/bin/beefi + installManPage beefi.1 + ''; + + meta = with lib; { + description = "A small script to create bootable EFISTUB kernel images"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ tu-maurice ]; + homepage = "https://github.com/jfeick/beefi"; + }; +} diff --git a/pkgs/os-specific/linux/blktrace/default.nix b/pkgs/os-specific/linux/blktrace/default.nix index 4ae449c19aa..fb5a5d06212 100644 --- a/pkgs/os-specific/linux/blktrace/default.nix +++ b/pkgs/os-specific/linux/blktrace/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libaio }: +{ lib, stdenv, fetchurl, libaio }: stdenv.mkDerivation { name = "blktrace-1.2.0"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { description = "Block layer IO tracing mechanism"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index be7435fb1d0..29dceecad6e 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -6,7 +6,7 @@ , glib , json_c , libical -, pkgconfig +, pkg-config , python3 , readline , systemd @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config python3.pkgs.wrapPython ]; diff --git a/pkgs/os-specific/linux/bolt/default.nix b/pkgs/os-specific/linux/bolt/default.nix index d857fa1463a..d692e30a03f 100644 --- a/pkgs/os-specific/linux/bolt/default.nix +++ b/pkgs/os-specific/linux/bolt/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , meson , ninja -, pkgconfig +, pkg-config , fetchFromGitLab , fetchpatch , python3 @@ -38,8 +38,8 @@ stdenv.mkDerivation rec { libxslt meson ninja - pkgconfig - ] ++ stdenv.lib.optional (!doCheck) python3; + pkg-config + ] ++ lib.optional (!doCheck) python3; buildInputs = [ glib diff --git a/pkgs/os-specific/linux/bpftrace/default.nix b/pkgs/os-specific/linux/bpftrace/default.nix index ce890ec578b..8edd9257fed 100644 --- a/pkgs/os-specific/linux/bpftrace/default.nix +++ b/pkgs/os-specific/linux/bpftrace/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, cmake, pkgconfig, flex, bison +, cmake, pkg-config, flex, bison , llvmPackages, kernel, elfutils , libelf, libbfd, libbpf, libopcodes, bcc }: @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { libbpf libbfd libopcodes ]; - nativeBuildInputs = [ cmake pkgconfig flex bison ] + nativeBuildInputs = [ cmake pkg-config flex bison ] # libelf is incompatible with elfutils-libelf - ++ stdenv.lib.filter (x: x != libelf) kernel.moduleBuildDependencies; + ++ lib.filter (x: x != libelf) kernel.moduleBuildDependencies; # patch the source, *then* substitute on @NIX_KERNEL_SRC@ in the result. we could # also in theory make this an environment variable around bpftrace, but this works diff --git a/pkgs/os-specific/linux/bridge-utils/default.nix b/pkgs/os-specific/linux/bridge-utils/default.nix index 1aeb4a907fb..12655c3bed6 100644 --- a/pkgs/os-specific/linux/bridge-utils/default.nix +++ b/pkgs/os-specific/linux/bridge-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook }: +{ lib, stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { name = "bridge-utils-1.5"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "https://sourceforge.net/projects/bridge/"; homepage = "https://wiki.linuxfoundation.org/networking/bridge"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix index 8e2271b9f7f..527d2253e5b 100644 --- a/pkgs/os-specific/linux/broadcom-sta/default.nix +++ b/pkgs/os-specific/linux/broadcom-sta/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kernel }: +{ lib, stdenv, fetchurl, kernel }: let version = "6.30.223.271"; @@ -7,8 +7,8 @@ let x86_64-linux = "1gj485qqr190idilacpxwgqyw21il03zph2rddizgj7fbd6pfyaz"; }; - arch = stdenv.lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") "_64"; - tarballVersion = stdenv.lib.replaceStrings ["."] ["_"] version; + arch = lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") "_64"; + tarballVersion = lib.replaceStrings ["."] ["_"] version; tarball = "hybrid-v35${arch}-nodebug-pcoem-${tarballVersion}.tar.gz"; in stdenv.mkDerivation { @@ -62,8 +62,8 @@ stdenv.mkDerivation { meta = { description = "Kernel module driver for some Broadcom's wireless cards"; homepage = "http://www.broadcom.com/support/802.11/linux_sta.php"; - license = stdenv.lib.licenses.unfreeRedistributable; - maintainers = with stdenv.lib.maintainers; [ phreedom ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.unfreeRedistributable; + maintainers = with lib.maintainers; [ phreedom ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/btfs/default.nix b/pkgs/os-specific/linux/btfs/default.nix index 8aa1bf48892..dc0b13ef59b 100644 --- a/pkgs/os-specific/linux/btfs/default.nix +++ b/pkgs/os-specific/linux/btfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config , python3, boost, fuse, libtorrent-rasterbar, curl }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1cfjhyn9cjyyxyd0f08b2ra258pzkljwvkj0iwrjpd0nrbl6wkq5"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ boost fuse libtorrent-rasterbar curl python3 ]; diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 49b07bd18e7..a4a7adeb8b7 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { patches = [ ./busybox-in-store.patch - ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./clang-cross.patch; + ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./clang-cross.patch; postPatch = "patchShebangs ."; diff --git a/pkgs/os-specific/linux/busybox/sandbox-shell.nix b/pkgs/os-specific/linux/busybox/sandbox-shell.nix index 036ea0a0f48..f5db0b25f18 100644 --- a/pkgs/os-specific/linux/busybox/sandbox-shell.nix +++ b/pkgs/os-specific/linux/busybox/sandbox-shell.nix @@ -1,4 +1,4 @@ -{ busybox, stdenv}: +{ busybox}: # Minimal shell for use as basic /bin/sh in sandbox builds busybox.override { diff --git a/pkgs/os-specific/linux/can-isotp/default.nix b/pkgs/os-specific/linux/can-isotp/default.nix index 89857a35d92..9c30aae86fe 100644 --- a/pkgs/os-specific/linux/can-isotp/default.nix +++ b/pkgs/os-specific/linux/can-isotp/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "20200910"; hardeningDisable = [ "pic" ]; - + src = fetchFromGitHub { owner = "hartkopp"; repo = "can-isotp"; @@ -25,7 +25,7 @@ stdenv.mkDerivation { ''; nativeBuildInputs = kernel.moduleBuildDependencies; - + meta = with lib; { description = "Kernel module for ISO-TP (ISO 15765-2)"; homepage = "https://github.com/hartkopp/can-isotp"; @@ -33,4 +33,4 @@ stdenv.mkDerivation { platforms = platforms.linux; maintainers = [ maintainers.evck ]; }; -} +} diff --git a/pkgs/os-specific/linux/checkpolicy/default.nix b/pkgs/os-specific/linux/checkpolicy/default.nix index fc2faa5b8f5..c3d8928c7ba 100644 --- a/pkgs/os-specific/linux/checkpolicy/default.nix +++ b/pkgs/os-specific/linux/checkpolicy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bison, flex, libsepol }: +{ lib, stdenv, fetchurl, bison, flex, libsepol }: stdenv.mkDerivation rec { pname = "checkpolicy"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" - "LIBSEPOLA=${stdenv.lib.getLib libsepol}/lib/libsepol.a" + "LIBSEPOLA=${lib.getLib libsepol}/lib/libsepol.a" ]; meta = removeAttrs libsepol.meta ["outputsToInstall"] // { diff --git a/pkgs/os-specific/linux/checksec/default.nix b/pkgs/os-specific/linux/checksec/default.nix index f5d4c44b053..e0a65589571 100644 --- a/pkgs/os-specific/linux/checksec/default.nix +++ b/pkgs/os-specific/linux/checksec/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; installPhase = let - path = stdenv.lib.makeBinPath [ + path = lib.makeBinPath [ findutils file binutils-unwrapped sysctl openssl ]; in '' @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A tool for checking security bits on executables"; - homepage = "http://www.trapkit.de/tools/checksec.html"; + homepage = "https://www.trapkit.de/tools/checksec/"; license = licenses.bsd3; platforms = platforms.linux; maintainers = with maintainers; [ thoughtpolice globin ]; diff --git a/pkgs/os-specific/linux/cifs-utils/default.nix b/pkgs/os-specific/linux/cifs-utils/default.nix index 3171c30987e..c4ed4d4fc0f 100644 --- a/pkgs/os-specific/linux/cifs-utils/default.nix +++ b/pkgs/os-specific/linux/cifs-utils/default.nix @@ -1,29 +1,27 @@ -{ stdenv, lib, fetchurl, autoreconfHook, docutils, pkgconfig -, kerberos, keyutils, pam, talloc }: +{ stdenv, lib, fetchurl, autoreconfHook, docutils, pkg-config +, kerberos, keyutils, pam, talloc, python3 }: stdenv.mkDerivation rec { pname = "cifs-utils"; - version = "6.9"; + version = "6.12"; src = fetchurl { url = "mirror://samba/pub/linux-cifs/cifs-utils/${pname}-${version}.tar.bz2"; - sha256 = "175cp509wn1zv8p8mv37hkf6sxiskrsxdnq22mhlsg61jazz3n0q"; + sha256 = "1vw570pvir73kl4y6fhd6ns936ankimkhb1ii43yh8lr0p1xqbcj"; }; - nativeBuildInputs = [ autoreconfHook docutils pkgconfig ]; + nativeBuildInputs = [ autoreconfHook docutils pkg-config ]; - buildInputs = [ kerberos keyutils pam talloc ]; + buildInputs = [ kerberos keyutils pam talloc python3 ]; - configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + configureFlags = [ "ROOTSBINDIR=$(out)/sbin" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # AC_FUNC_MALLOC is broken on cross builds. "ac_cv_func_malloc_0_nonnull=yes" "ac_cv_func_realloc_0_nonnull=yes" ]; - makeFlags = [ "root_sbindir=$(out)/sbin" ]; - meta = with lib; { - homepage = "http://www.samba.org/linux-cifs/cifs-utils/"; + homepage = "https://wiki.samba.org/index.php/LinuxCIFS_utils"; description = "Tools for managing Linux CIFS client filesystems"; platforms = platforms.linux; license = licenses.lgpl3; diff --git a/pkgs/os-specific/linux/compsize/default.nix b/pkgs/os-specific/linux/compsize/default.nix index e1979997d11..b1c6f5a8f95 100644 --- a/pkgs/os-specific/linux/compsize/default.nix +++ b/pkgs/os-specific/linux/compsize/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "compsize"; - version = "1.3"; + version = "1.4"; src = fetchFromGitHub { owner = "kilobyte"; - repo = "compsize"; + repo = pname; rev = "v${version}"; - sha256 = "1c69whla844nwis30jxbj00zkpiw3ccndhkmzjii8av5358mjn43"; + sha256 = "0gk2vibfl9fh7biznlbr3dwknrwbm5q5602q95jbjvk185g9z126"; }; buildInputs = [ btrfs-progs ]; diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index fa3aa563fb1..61b66c6c861 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -1,4 +1,4 @@ -{ config, lib, stdenv, fetchFromGitHub, pkgconfig, cmake +{ config, lib, stdenv, fetchFromGitHub, pkg-config, cmake # dependencies , glib, libXinerama @@ -64,7 +64,7 @@ assert weatherMetarSupport -> curlSupport; assert weatherXoapSupport -> curlSupport && libxml2 != null; assert journalSupport -> systemd != null; -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "conky"; @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lgcc_s"; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ glib libXinerama ] ++ optionals docsSupport [ docbook2x docbook_xsl docbook_xml_dtd_44 libxslt man less ] ++ optional ncursesSupport ncurses diff --git a/pkgs/os-specific/linux/conntrack-tools/default.nix b/pkgs/os-specific/linux/conntrack-tools/default.nix index c41f1410b01..0b14398e58f 100644 --- a/pkgs/os-specific/linux/conntrack-tools/default.nix +++ b/pkgs/os-specific/linux/conntrack-tools/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, flex, bison, pkgconfig, libmnl, libnfnetlink +{ fetchurl, lib, stdenv, flex, bison, pkg-config, libmnl, libnfnetlink , libnetfilter_conntrack, libnetfilter_queue, libnetfilter_cttimeout , libnetfilter_cthelper, systemd , libtirpc @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { libmnl libnfnetlink libnetfilter_conntrack libnetfilter_queue libnetfilter_cttimeout libnetfilter_cthelper systemd libtirpc ]; - nativeBuildInputs = [ flex bison pkgconfig ]; + nativeBuildInputs = [ flex bison pkg-config ]; meta = with lib; { homepage = "http://conntrack-tools.netfilter.org/"; diff --git a/pkgs/os-specific/linux/conspy/default.nix b/pkgs/os-specific/linux/conspy/default.nix index a52b8738570..480962024f7 100644 --- a/pkgs/os-specific/linux/conspy/default.nix +++ b/pkgs/os-specific/linux/conspy/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, autoconf, automake, ncurses}: +{lib, stdenv, fetchurl, autoconf, automake, ncurses}: let s = # Generated upstream information rec { @@ -30,8 +30,8 @@ stdenv.mkDerivation { meta = { inherit (s) version; description = "Linux text console viewer"; - license = stdenv.lib.licenses.epl10 ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.epl10 ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/cpuid/default.nix b/pkgs/os-specific/linux/cpuid/default.nix index 3f57d0c7038..ea9ae06130e 100644 --- a/pkgs/os-specific/linux/cpuid/default.nix +++ b/pkgs/os-specific/linux/cpuid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl }: +{ lib, stdenv, fetchurl, perl }: stdenv.mkDerivation rec { pname = "cpuid"; @@ -42,9 +42,9 @@ stdenv.mkDerivation rec { ''; platforms = [ "i686-linux" "x86_64-linux" ]; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; homepage = "http://etallen.com/cpuid.html"; - maintainers = with stdenv.lib.maintainers; [ blitz ]; + maintainers = with lib.maintainers; [ blitz ]; }; } diff --git a/pkgs/os-specific/linux/cpupower/default.nix b/pkgs/os-specific/linux/cpupower/default.nix index cdc76b6772e..cfc0ace8e0a 100644 --- a/pkgs/os-specific/linux/cpupower/default.nix +++ b/pkgs/os-specific/linux/cpupower/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { "LD=${stdenv.cc.targetPrefix}cc" ]; - installFlags = stdenv.lib.mapAttrsToList + installFlags = lib.mapAttrsToList (n: v: "${n}dir=${placeholder "out"}/${v}") { bin = "bin"; sbin = "sbin"; diff --git a/pkgs/os-specific/linux/cpuset/default.nix b/pkgs/os-specific/linux/cpuset/default.nix index d1a93e4247e..e82e3f5901c 100644 --- a/pkgs/os-specific/linux/cpuset/default.nix +++ b/pkgs/os-specific/linux/cpuset/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , fetchpatch , pythonPackages diff --git a/pkgs/os-specific/linux/crda/default.nix b/pkgs/os-specific/linux/crda/default.nix index a970451e0dd..c337da2fe72 100644 --- a/pkgs/os-specific/linux/crda/default.nix +++ b/pkgs/os-specific/linux/crda/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, libgcrypt, libnl, pkgconfig, python3Packages, wireless-regdb }: +{ lib, stdenv, fetchurl, fetchpatch, libgcrypt, libnl, pkg-config, python3Packages, wireless-regdb }: stdenv.mkDerivation rec { pname = "crda"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ libgcrypt libnl ]; nativeBuildInputs = [ - pkgconfig + pkg-config python3Packages.pycrypto ]; diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix index 3c46595ed87..f48ed260c76 100644 --- a/pkgs/os-specific/linux/criu/default.nix +++ b/pkgs/os-specific/linux/criu/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, protobuf, protobufc, asciidoc, iptables -, xmlto, docbook_xsl, libpaper, libnl, libcap, libnet, pkgconfig +, xmlto, docbook_xsl, libpaper, libnl, libcap, libnet, pkg-config , which, python3, makeWrapper, docbook_xml_dtd_45 }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig docbook_xsl which makeWrapper docbook_xml_dtd_45 python3 python3.pkgs.wrapPython ]; + nativeBuildInputs = [ pkg-config docbook_xsl which makeWrapper docbook_xml_dtd_45 python3 python3.pkgs.wrapPython ]; buildInputs = [ protobuf protobufc asciidoc xmlto libpaper libnl libcap libnet iptables ]; propagatedBuildInputs = with python3.pkgs; [ python python3.pkgs.protobuf ]; diff --git a/pkgs/os-specific/linux/cryptodev/default.nix b/pkgs/os-specific/linux/cryptodev/default.nix index 79132852d23..bbd8d35403b 100644 --- a/pkgs/os-specific/linux/cryptodev/default.nix +++ b/pkgs/os-specific/linux/cryptodev/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, kernel ? false }: +{ fetchFromGitHub, lib, stdenv, kernel ? false }: stdenv.mkDerivation rec { pname = "cryptodev-linux-1.11"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "Device that allows access to Linux kernel cryptographic drivers"; homepage = "http://cryptodev-linux.org/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index aa5c124ea60..d0e685cd0fa 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, lvm2, json_c -, openssl, libuuid, pkgconfig, popt }: +{ lib, stdenv, fetchurl, lvm2, json_c +, openssl, libuuid, pkg-config, popt }: stdenv.mkDerivation rec { pname = "cryptsetup"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { "--with-crypto_backend=openssl" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ lvm2 json_c openssl libuuid popt ]; doCheck = true; @@ -39,8 +39,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://gitlab.com/cryptsetup/cryptsetup/"; description = "LUKS for dm-crypt"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/os-specific/linux/dbus-broker/default.nix b/pkgs/os-specific/linux/dbus-broker/default.nix index 74b35c50de5..bffc90260c1 100644 --- a/pkgs/os-specific/linux/dbus-broker/default.nix +++ b/pkgs/os-specific/linux/dbus-broker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, docutils, meson, ninja, pkgconfig +{ lib, stdenv, fetchFromGitHub, docutils, meson, ninja, pkg-config , dbus, linuxHeaders, systemd }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ docutils meson ninja pkgconfig ]; + nativeBuildInputs = [ docutils meson ninja pkg-config ]; buildInputs = [ dbus linuxHeaders systemd ]; diff --git a/pkgs/os-specific/linux/device-tree/default.nix b/pkgs/os-specific/linux/device-tree/default.nix index 0599289ab72..13c609cdf7d 100644 --- a/pkgs/os-specific/linux/device-tree/default.nix +++ b/pkgs/os-specific/linux/device-tree/default.nix @@ -1,6 +1,6 @@ -{ stdenvNoCC, dtc, findutils }: +{ lib, stdenvNoCC, dtc, findutils }: -with stdenvNoCC.lib; { +with lib; { applyOverlays = (base: overlays': stdenvNoCC.mkDerivation { name = "device-tree-overlays"; nativeBuildInputs = [ dtc findutils ]; diff --git a/pkgs/os-specific/linux/device-tree/raspberrypi.nix b/pkgs/os-specific/linux/device-tree/raspberrypi.nix index 93dad5ef327..b4b40f8331f 100644 --- a/pkgs/os-specific/linux/device-tree/raspberrypi.nix +++ b/pkgs/os-specific/linux/device-tree/raspberrypi.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, raspberrypifw }: +{ lib, stdenvNoCC, raspberrypifw }: stdenvNoCC.mkDerivation { name = "raspberrypi-dtbs-${raspberrypifw.version}"; @@ -30,7 +30,7 @@ stdenvNoCC.mkDerivation { # Compatible overlays that may be used overlays = "${raspberrypifw}/share/raspberrypi/boot/overlays"; }; - meta = with stdenvNoCC.lib; { + meta = with lib; { inherit (raspberrypifw.meta) homepage license; description = "DTBs for the Raspberry Pi"; }; diff --git a/pkgs/os-specific/linux/digimend/default.nix b/pkgs/os-specific/linux/digimend/default.nix index d0f02097587..6b5f66f825b 100644 --- a/pkgs/os-specific/linux/digimend/default.nix +++ b/pkgs/os-specific/linux/digimend/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, kernel }: -assert stdenv.lib.versionAtLeast kernel.version "3.5"; +assert lib.versionAtLeast kernel.version "3.5"; stdenv.mkDerivation rec { pname = "digimend"; diff --git a/pkgs/os-specific/linux/directvnc/default.nix b/pkgs/os-specific/linux/directvnc/default.nix index fad9559cc63..d20b69775bf 100644 --- a/pkgs/os-specific/linux/directvnc/default.nix +++ b/pkgs/os-specific/linux/directvnc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, directfb, zlib, libjpeg, xorgproto }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, directfb, zlib, libjpeg, xorgproto }: stdenv.mkDerivation { pname = "directvnc"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "16x7mr7x728qw7nbi6rqhrwsy73zsbpiz8pbgfzfl2aqhfdiz88b"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ directfb zlib libjpeg xorgproto ]; diff --git a/pkgs/os-specific/linux/disk-indicator/default.nix b/pkgs/os-specific/linux/disk-indicator/default.nix index b2ae930f193..f754882ccd0 100644 --- a/pkgs/os-specific/linux/disk-indicator/default.nix +++ b/pkgs/os-specific/linux/disk-indicator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, libX11 }: +{ lib, stdenv, fetchgit, libX11 }: stdenv.mkDerivation { name = "disk-indicator-2014-05-19"; @@ -34,7 +34,7 @@ stdenv.mkDerivation { Small program for Linux that will turn your Scroll, Caps or Num Lock LED or LED on your ThinkPad laptop into a hard disk activity indicator. ''; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/dmraid/default.nix b/pkgs/os-specific/linux/dmraid/default.nix index 129ccb30456..c1e0dfc5ae4 100644 --- a/pkgs/os-specific/linux/dmraid/default.nix +++ b/pkgs/os-specific/linux/dmraid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, lvm2 }: +{ lib, stdenv, fetchurl, fetchpatch, lvm2 }: stdenv.mkDerivation rec { name = "dmraid-1.0.0.rc16"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; patches = [ ./hardening-format.patch ] - ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ + ++ lib.optionals stdenv.hostPlatform.isMusl [ (fetchpatch { url = "https://raw.githubusercontent.com/void-linux/void-packages/fceed4b8e96b3c1da07babf6f67b6ed1588a28b2/srcpkgs/dmraid/patches/006-musl-libc.patch"; sha256 = "1j8xda0fpz8lxjxnqdidy7qb866qrzwpbca56yjdg6vf4x21hx6w"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { postPatch = '' sed -i 's/\[\[[^]]*\]\]/[ "''$''${n##*.}" = "so" ]/' */lib/Makefile.in - '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + '' + lib.optionalString stdenv.hostPlatform.isMusl '' NIX_CFLAGS_COMPILE+=" -D_GNU_SOURCE" ''; @@ -42,8 +42,8 @@ stdenv.mkDerivation rec { its volumes. May be needed for rescuing an older system or nuking the metadata when reformatting. ''; - maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.raskin ]; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix index efe578c596b..ab183936895 100644 --- a/pkgs/os-specific/linux/dpdk/default.nix +++ b/pkgs/os-specific/linux/dpdk/default.nix @@ -1,7 +1,7 @@ { stdenv, lib , kernel , fetchurl -, pkgconfig, meson, ninja +, pkg-config, meson, ninja , libbsd, numactl, libbpf, zlib, libelf, jansson, openssl, libpcap , doxygen, python3 , shared ? false }: @@ -22,7 +22,7 @@ in stdenv.mkDerivation rec { doxygen meson ninja - pkgconfig + pkg-config python3 python3.pkgs.sphinx ]; diff --git a/pkgs/os-specific/linux/dropwatch/default.nix b/pkgs/os-specific/linux/dropwatch/default.nix index 915d79aabac..288dea85cc8 100644 --- a/pkgs/os-specific/linux/dropwatch/default.nix +++ b/pkgs/os-specific/linux/dropwatch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config , libnl, readline, libbfd, ncurses, zlib }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1qmax0l7z1qik42c949fnvjh5r6awk4gpgzdsny8iwnmwzjyp8b8"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libbfd libnl ncurses readline zlib ]; # To avoid running into https://sourceware.org/bugzilla/show_bug.cgi?id=14243 we need to define: diff --git a/pkgs/os-specific/linux/dstat/default.nix b/pkgs/os-specific/linux/dstat/default.nix index 7d0b87609b3..76abeff42db 100644 --- a/pkgs/os-specific/linux/dstat/default.nix +++ b/pkgs/os-specific/linux/dstat/default.nix @@ -1,21 +1,36 @@ -{ lib, stdenv, fetchurl, python2Packages }: +{ lib, fetchFromGitHub, fetchpatch, python3Packages }: -python2Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "dstat"; format = "other"; - version = "0.7.3"; + version = "0.7.4"; - src = fetchurl { - url = "https://github.com/dagwieers/dstat/archive/${version}.tar.gz"; - sha256 = "16286z3y2lc9nsq8njzjkv6k2vyxrj9xiixj1k3gnsbvhlhkirj6"; + src = fetchFromGitHub { + owner = "dstat-real"; + repo = "dstat"; + rev = "v${version}"; + sha256 = "1qnmkhqmjd1m3if05jj29dvr5hn6kayq9bkkkh881w472c0zhp8v"; }; - propagatedBuildInputs = with python2Packages; [ python-wifi ]; + propagatedBuildInputs = with python3Packages; [ six ]; - patches = [ ./fix_pluginpath.patch ]; + patches = [ + ./fix_pluginpath.patch + # this fixes another bug with python3 + (fetchpatch { + url = https://github.com/efexgee/dstat/commit/220a785321b13b6df92a536080aca6ef1cb644ad.patch ; + sha256 = "08kcz3yxvl35m55y7g1pr73x3bjcqnv0qlswxqyq8cqxg9zd64cn"; + }) + ]; makeFlags = [ "prefix=$(out)" ]; + # remove deprecation warnings + preFixup = '' + sed -i "s/import collections/import collections.abc/g" $out/share/dstat/dstat.py $out/bin/dstat + sed -i "s/collections.Sequence/collections.abc.Sequence/g" "$out"/bin/dstat + ''; + meta = with lib; { homepage = "http://dag.wieers.com/home-made/dstat/"; description = "Versatile resource statistics tool"; diff --git a/pkgs/os-specific/linux/e1000e/default.nix b/pkgs/os-specific/linux/e1000e/default.nix index d5d6697a01e..51bc6ada07d 100644 --- a/pkgs/os-specific/linux/e1000e/default.nix +++ b/pkgs/os-specific/linux/e1000e/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, kernel }: +{ lib, stdenv, fetchurl, kernel }: -assert stdenv.lib.versionOlder kernel.version "4.10"; +assert lib.versionOlder kernel.version "4.10"; stdenv.mkDerivation rec { name = "e1000e-${version}-${kernel.version}"; @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { meta = { description = "Linux kernel drivers for Intel Ethernet adapters and LOMs (LAN On Motherboard)"; homepage = "http://e1000.sf.net/"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/os-specific/linux/earlyoom/default.nix b/pkgs/os-specific/linux/earlyoom/default.nix index 668a3795b99..930e9381bb7 100644 --- a/pkgs/os-specific/linux/earlyoom/default.nix +++ b/pkgs/os-specific/linux/earlyoom/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "16iyn51xlrsbshc7p5xl2338yyfzknaqc538sa7mamgccqwgyvvq"; }; - nativeBuildInputs = stdenv.lib.optionals withManpage [ pandoc installShellFiles ]; + nativeBuildInputs = lib.optionals withManpage [ pandoc installShellFiles ]; patches = [ ./fix-dbus-path.patch ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { installPhase = '' install -D earlyoom $out/bin/earlyoom - '' + stdenv.lib.optionalString withManpage '' + '' + lib.optionalString withManpage '' installManPage earlyoom.1 ''; diff --git a/pkgs/os-specific/linux/ebtables/default.nix b/pkgs/os-specific/linux/ebtables/default.nix index 2045c4b112c..bca24d9c905 100644 --- a/pkgs/os-specific/linux/ebtables/default.nix +++ b/pkgs/os-specific/linux/ebtables/default.nix @@ -9,16 +9,22 @@ stdenv.mkDerivation rec { sha256 = "0apxgmkhsk3vxn9q3libxn3dgrdljrxyy4mli2gk49m7hi3na7xp"; }; - makeFlags = - [ "LIBDIR=$(out)/lib" "BINDIR=$(out)/sbin" "MANDIR=$(out)/share/man" - "ETCDIR=$(out)/etc" "INITDIR=$(TMPDIR)" "SYSCONFIGDIR=$(out)/etc/sysconfig" - "LOCALSTATEDIR=/var" - ]; + makeFlags = [ + "LIBDIR=$(out)/lib" "BINDIR=$(out)/sbin" "MANDIR=$(out)/share/man" + "ETCDIR=$(out)/etc" "INITDIR=$(TMPDIR)" "SYSCONFIGDIR=$(out)/etc/sysconfig" + "LOCALSTATEDIR=/var" + ]; NIX_CFLAGS_COMPILE = "-Wno-error"; preInstall = "mkdir -p $out/etc/sysconfig"; + postInstall = '' + ln -s $out/sbin/ebtables-legacy $out/sbin/ebtables + ln -s $out/sbin/ebtables-legacy-restore $out/sbin/ebtables-restore + ln -s $out/sbin/ebtables-legacy-save $out/sbin/ebtables-save + ''; + meta = with lib; { description = "A filtering tool for Linux-based bridging firewalls"; homepage = "http://ebtables.sourceforge.net/"; diff --git a/pkgs/os-specific/linux/edac-utils/default.nix b/pkgs/os-specific/linux/edac-utils/default.nix index 9b8b9981274..63c539602f1 100644 --- a/pkgs/os-specific/linux/edac-utils/default.nix +++ b/pkgs/os-specific/linux/edac-utils/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { postInstall = '' wrapProgram "$out/sbin/edac-ctl" \ - --set PATH ${stdenv.lib.makeBinPath [ dmidecode kmod ]} + --set PATH ${lib.makeBinPath [ dmidecode kmod ]} ''; meta = with lib; { diff --git a/pkgs/os-specific/linux/ell/0001-unit-test-dbus-pick-up-dbus-daemon-from-PATH.patch b/pkgs/os-specific/linux/ell/0001-unit-test-dbus-pick-up-dbus-daemon-from-PATH.patch deleted file mode 100644 index c2d844edecd..00000000000 --- a/pkgs/os-specific/linux/ell/0001-unit-test-dbus-pick-up-dbus-daemon-from-PATH.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 55d499f4cd5667c04c21f7201d7f10484e187907 Mon Sep 17 00:00:00 2001 -From: Florian Klink <flokli@flokli.de> -Date: Sun, 27 Dec 2020 13:03:12 +0100 -Subject: [PATCH] unit/test-dbus: pick up dbus-daemon from $PATH - -This allows running the unit tests in environments where `dbus-daemon` -isn't in /usr/bin, but in $PATH. - -Signed-off-by: Florian Klink <flokli@flokli.de> ---- - unit/test-dbus-message-fds.c | 4 ++-- - unit/test-dbus-properties.c | 4 ++-- - unit/test-dbus.c | 4 ++-- - 3 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/unit/test-dbus-message-fds.c b/unit/test-dbus-message-fds.c -index 6f68bae..4b5662e 100644 ---- a/unit/test-dbus-message-fds.c -+++ b/unit/test-dbus-message-fds.c -@@ -51,7 +51,7 @@ static bool start_dbus_daemon(void) - char *prg_envp[1]; - pid_t pid; - -- prg_argv[0] = "/usr/bin/dbus-daemon"; -+ prg_argv[0] = "dbus-daemon"; - prg_argv[1] = "--nopidfile"; - prg_argv[2] = "--nofork"; - prg_argv[3] = "--config-file=" UNITDIR "dbus.conf"; -@@ -68,7 +68,7 @@ static bool start_dbus_daemon(void) - } - - if (pid == 0) { -- execve(prg_argv[0], prg_argv, prg_envp); -+ execvpe(prg_argv[0], prg_argv, prg_envp); - exit(EXIT_SUCCESS); - } - -diff --git a/unit/test-dbus-properties.c b/unit/test-dbus-properties.c -index b435062..049f0f4 100644 ---- a/unit/test-dbus-properties.c -+++ b/unit/test-dbus-properties.c -@@ -49,7 +49,7 @@ static bool start_dbus_daemon(void) - char *prg_envp[1]; - pid_t pid; - -- prg_argv[0] = "/usr/bin/dbus-daemon"; -+ prg_argv[0] = "dbus-daemon"; - prg_argv[1] = "--nopidfile"; - prg_argv[2] = "--nofork"; - prg_argv[3] = "--config-file=" UNITDIR "dbus.conf"; -@@ -66,7 +66,7 @@ static bool start_dbus_daemon(void) - } - - if (pid == 0) { -- execve(prg_argv[0], prg_argv, prg_envp); -+ execvpe(prg_argv[0], prg_argv, prg_envp); - exit(EXIT_SUCCESS); - } - -diff --git a/unit/test-dbus.c b/unit/test-dbus.c -index 67f0a7b..582847e 100644 ---- a/unit/test-dbus.c -+++ b/unit/test-dbus.c -@@ -45,7 +45,7 @@ static void start_dbus_daemon(void) - char *prg_envp[1]; - pid_t pid; - -- prg_argv[0] = "/usr/bin/dbus-daemon"; -+ prg_argv[0] = "dbus-daemon"; - prg_argv[1] = "--nopidfile"; - prg_argv[2] = "--nofork"; - prg_argv[3] = "--config-file=" UNITDIR "dbus.conf"; -@@ -62,7 +62,7 @@ static void start_dbus_daemon(void) - } - - if (pid == 0) { -- execve(prg_argv[0], prg_argv, prg_envp); -+ execvpe(prg_argv[0], prg_argv, prg_envp); - exit(EXIT_SUCCESS); - } - --- -2.29.2 - diff --git a/pkgs/os-specific/linux/ell/default.nix b/pkgs/os-specific/linux/ell/default.nix index 183c82f467a..ced77f3fcc9 100644 --- a/pkgs/os-specific/linux/ell/default.nix +++ b/pkgs/os-specific/linux/ell/default.nix @@ -1,29 +1,24 @@ { lib, stdenv , fetchgit , autoreconfHook -, pkgconfig +, pkg-config , dbus }: stdenv.mkDerivation rec { pname = "ell"; - version = "0.35"; + version = "0.36"; outputs = [ "out" "dev" ]; src = fetchgit { url = "https://git.kernel.org/pub/scm/libs/${pname}/${pname}.git"; rev = version; - sha256 = "16z7xwlrpx1bsr2y1rgxxxixzwc84cwn2g557iqxhwsxfzy6q3dk"; + sha256 = "0w7v2hihwwmnqd56bsmbjsiw8yyadr7zbdssjamqxx0pyl3dnrda"; }; - patches = [ - # Sent upstream in https://lists.01.org/hyperkitty/list/ell@lists.01.org/thread/SQEZAIS2LZXSXGTXOW3GTAM5ZPXRLTN4/ - ./0001-unit-test-dbus-pick-up-dbus-daemon-from-PATH.patch - ]; - nativeBuildInputs = [ - pkgconfig + pkg-config autoreconfHook ]; diff --git a/pkgs/os-specific/linux/erofs-utils/default.nix b/pkgs/os-specific/linux/erofs-utils/default.nix index ffa39dc5802..73e50c5740b 100644 --- a/pkgs/os-specific/linux/erofs-utils/default.nix +++ b/pkgs/os-specific/linux/erofs-utils/default.nix @@ -1,18 +1,18 @@ -{ lib, stdenv, fetchgit, autoreconfHook, pkgconfig, fuse, libuuid, lz4 }: +{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, fuse, libuuid, lz4 }: stdenv.mkDerivation rec { pname = "erofs-utils"; - version = "1.2"; + version = "1.2.1"; outputs = [ "out" "man" ]; src = fetchgit { url = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git"; rev = "v" + version; - sha256 = "07hvijq2hsn3gg1kb8abrfk23n83j57yx8kyv4wqgwhhvd30myjc"; + sha256 = "1vb4mxsb59g29x7l22cffsqa8x743sra4j5zbmx89hjwpwm9vvcg"; }; - buildInputs = [ autoreconfHook pkgconfig fuse libuuid lz4 ]; + buildInputs = [ autoreconfHook pkg-config fuse libuuid lz4 ]; configureFlags = [ "--enable-fuse" ]; diff --git a/pkgs/os-specific/linux/eudev/default.nix b/pkgs/os-specific/linux/eudev/default.nix index 696dfd275c7..3d26fc3b005 100644 --- a/pkgs/os-specific/linux/eudev/default.nix +++ b/pkgs/os-specific/linux/eudev/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, glib, gperf, util-linux, kmod}: +{lib, stdenv, fetchurl, pkg-config, glib, gperf, util-linux, kmod}: let s = # Generated upstream information rec { @@ -9,7 +9,7 @@ let sha256 = "1z6lfhhbjs6j7pbp6ybn17ywjsdl87ql6g1p3m2y26aa10cqcqc9"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib gperf util-linux kmod ]; @@ -49,12 +49,12 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = { inherit (s) version; - description = ''An udev fork by Gentoo''; - license = stdenv.lib.licenses.gpl2Plus ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; - homepage = ''https://www.gentoo.org/proj/en/eudev/''; - downloadPage = ''http://dev.gentoo.org/~blueness/eudev/''; + description = "An udev fork by Gentoo"; + license = lib.licenses.gpl2Plus ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; + homepage = "https://www.gentoo.org/proj/en/eudev/"; + downloadPage = "http://dev.gentoo.org/~blueness/eudev/"; updateWalker = true; }; } diff --git a/pkgs/os-specific/linux/exfat/default.nix b/pkgs/os-specific/linux/exfat/default.nix index 5e212825bab..958bcdb9f16 100644 --- a/pkgs/os-specific/linux/exfat/default.nix +++ b/pkgs/os-specific/linux/exfat/default.nix @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" - "ARCH=${stdenv.hostPlatform.platform.kernelArch}" - ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ + "ARCH=${stdenv.hostPlatform.linuxArch}" + ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ "CROSS_COMPILE=${stdenv.cc.targetPrefix}" ]; diff --git a/pkgs/os-specific/linux/facetimehd/default.nix b/pkgs/os-specific/linux/facetimehd/default.nix index 80c823b31d7..163001638cd 100644 --- a/pkgs/os-specific/linux/facetimehd/default.nix +++ b/pkgs/os-specific/linux/facetimehd/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, kernel }: # facetimehd is not supported for kernels older than 3.19"; -assert stdenv.lib.versionAtLeast kernel.version "3.19"; +assert lib.versionAtLeast kernel.version "3.19"; let # Note: When updating this revision: @@ -14,7 +14,7 @@ let # e. see if the module loads back (apps using the camera won't # recover and will have to be restarted) and the camera # still works. - srcParams = if (stdenv.lib.versionAtLeast kernel.version "4.8") then + srcParams = if (lib.versionAtLeast kernel.version "4.8") then { # Use mainline branch version = "unstable-2020-04-16"; rev = "82626d4892eeb9eb704538bf0dc49a00725ff451"; diff --git a/pkgs/os-specific/linux/fbterm/default.nix b/pkgs/os-specific/linux/fbterm/default.nix index e1909eea894..72e886b91f5 100644 --- a/pkgs/os-specific/linux/fbterm/default.nix +++ b/pkgs/os-specific/linux/fbterm/default.nix @@ -1,4 +1,4 @@ -{stdenv, lib, fetchurl, gpm, freetype, fontconfig, pkgconfig, ncurses, libx86}: +{stdenv, lib, fetchurl, gpm, freetype, fontconfig, pkg-config, ncurses, libx86}: let s = # Generated upstream information { @@ -18,7 +18,7 @@ stdenv.mkDerivation { inherit (s) url sha256; }; - nativeBuildInputs = [ pkgconfig ncurses ]; + nativeBuildInputs = [ pkg-config ncurses ]; inherit buildInputs; preConfigure = '' diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix index 96ebaf178bf..e23591168f6 100644 --- a/pkgs/os-specific/linux/ffado/default.nix +++ b/pkgs/os-specific/linux/ffado/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , mkDerivation , dbus , dbus_cplusplus @@ -11,7 +11,7 @@ , libiec61883 , libraw1394 , libxmlxx3 -, pkgconfig +, pkg-config , python3 , sconsPackages , which @@ -46,7 +46,7 @@ mkDerivation rec { nativeBuildInputs = [ desktop-file-utils sconsPackages.scons_3_1_2 - pkgconfig + pkg-config which python pyqt5 diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index a3be5484a04..979f55cc351 100644 --- a/pkgs/os-specific/linux/firejail/default.nix +++ b/pkgs/os-specific/linux/firejail/default.nix @@ -1,25 +1,18 @@ -{stdenv, fetchurl, fetchpatch, which, xdg-dbus-proxy, nixosTests}: -let - s = # Generated upstream information - rec { - baseName="firejail"; - version="0.9.64"; - name="${baseName}-${version}"; - url="mirror://sourceforge/firejail/firejail/firejail-${version}.tar.xz"; - sha256="1zgjwy2k57nx0r63fzr15gijah098ig0bll66jd615vc9q3snfz5"; - }; - buildInputs = [ - which - ]; -in -stdenv.mkDerivation { - inherit (s) name version; - inherit buildInputs; - src = fetchurl { - inherit (s) url sha256; - name = "${s.name}.tar.bz2"; +{ lib, stdenv, fetchFromGitHub, fetchpatch, which, xdg-dbus-proxy, nixosTests }: + +stdenv.mkDerivation rec { + pname = "firejail"; + version = "0.9.64.2"; + + src = fetchFromGitHub { + owner = "netblue30"; + repo = "firejail"; + rev = version; + sha256 = "1adizsb7pxr101bvvd359hxympnv36rnikp78npdr5dcvwddv3dv"; }; + buildInputs = [ which ]; + patches = [ # Adds the /nix directory when using an overlay. # Required to run any programs under this mode. @@ -79,12 +72,10 @@ stdenv.mkDerivation { passthru.tests = nixosTests.firejail; meta = { - inherit (s) version; - description = ''Namespace-based sandboxing tool for Linux''; - license = stdenv.lib.licenses.gpl2Plus ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + description = "Namespace-based sandboxing tool for Linux"; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.raskin ]; + platforms = lib.platforms.linux; homepage = "https://firejail.wordpress.com/"; - downloadPage = "https://sourceforge.net/projects/firejail/files/firejail/"; }; } diff --git a/pkgs/os-specific/linux/firejail/default.upstream b/pkgs/os-specific/linux/firejail/default.upstream deleted file mode 100644 index 0e6576c44a8..00000000000 --- a/pkgs/os-specific/linux/firejail/default.upstream +++ /dev/null @@ -1,3 +0,0 @@ -url https://sourceforge.net/projects/firejail/files/firejail/ -version_link '[-][0-9.]+[.]tar[.][a-z0-9]+/download$' -SF_redirect diff --git a/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix b/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix index 7cb5d2a9a40..79de65fcb98 100644 --- a/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix +++ b/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "b43-fwcutter-019"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "Firmware extractor for cards supported by the b43 kernel module"; homepage = "http://wireless.kernel.org/en/users/Drivers/b43"; - license = stdenv.lib.licenses.free; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.free; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix b/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix index 4f03f58b11f..42444d784d5 100644 --- a/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix +++ b/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, b43FirmwareCutter }: +{ lib, stdenv, fetchurl, b43FirmwareCutter }: let version = "5.100.138"; in @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { description = "Firmware for cards supported by the b43 kernel module"; homepage = "http://wireless.kernel.org/en/users/Drivers/b43"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; }; } diff --git a/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix b/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix index f9218b688a9..a28189a9e47 100644 --- a/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix +++ b/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ zraexy ]; }; -} +} diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index caa675951e1..4fd1cf7ef1a 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation rec { outputHashAlgo = "sha256"; outputHash = "1p7vn2hfwca6w69jhw5zq70w44ji8mdnibm1z959aalax6ndy146"; - meta = with stdenvNoCC.lib; { + meta = with lib; { description = "Binary firmware collection packaged by kernel.org"; homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; license = licenses.unfreeRedistributableFirmware; diff --git a/pkgs/os-specific/linux/firmware/firmware-manager/default.nix b/pkgs/os-specific/linux/firmware/firmware-manager/default.nix index e98de6bbe9e..c4649557b11 100644 --- a/pkgs/os-specific/linux/firmware/firmware-manager/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-manager/default.nix @@ -1,4 +1,4 @@ -{ rustPlatform, lib, fetchFromGitHub, lzma, pkgconfig, openssl, dbus, glib, udev, cairo, pango, atk, gdk-pixbuf, gtk3, wrapGAppsHook }: +{ rustPlatform, lib, fetchFromGitHub, lzma, pkg-config, openssl, dbus, glib, udev, cairo, pango, atk, gdk-pixbuf, gtk3, wrapGAppsHook }: rustPlatform.buildRustPackage rec { pname = "firmware-manager"; version = "0.1.1"; @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0x9604jsflqxvbkfp139mzjicpyx8v21139jj8bp88c14ngvmdlw"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; buildInputs = [ lzma openssl dbus glib udev cairo pango atk gdk-pixbuf gtk3 ]; diff --git a/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch b/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch index dce4af69aa2..cd42f2f44e2 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch +++ b/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch @@ -1,5 +1,5 @@ diff --git a/data/meson.build b/data/meson.build -index 14454458..12a798c0 100644 +index 50154569..f8058a8e 100644 --- a/data/meson.build +++ b/data/meson.build @@ -17,7 +17,7 @@ endif @@ -73,10 +73,10 @@ index 826a3c1d..b78db663 100644 + install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'), ) diff --git a/meson.build b/meson.build -index a6fb55dd..aedb7530 100644 +index b075ca89..8d504d3c 100644 --- a/meson.build +++ b/meson.build -@@ -183,6 +183,12 @@ endif +@@ -194,6 +194,12 @@ endif mandir = join_paths(prefix, get_option('mandir')) localedir = join_paths(prefix, get_option('localedir')) @@ -90,7 +90,7 @@ index a6fb55dd..aedb7530 100644 gio = dependency('gio-2.0', version : '>= 2.45.8') giounix = dependency('gio-unix-2.0', version : '>= 2.45.8', required: false) diff --git a/meson_options.txt b/meson_options.txt -index 0a0e2853..198ae930 100644 +index bc76c0ab..8a67d012 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,3 +1,4 @@ @@ -98,19 +98,6 @@ index 0a0e2853..198ae930 100644 option('build', type : 'combo', choices : ['all', 'standalone', 'library'], value : 'all', description : 'build type') option('agent', type : 'boolean', value : true, description : 'enable the fwupd agent') option('consolekit', type : 'boolean', value : true, description : 'enable ConsoleKit support') -diff --git a/plugins/ata/meson.build b/plugins/ata/meson.build -index f32b97fe..679ccc7b 100644 ---- a/plugins/ata/meson.build -+++ b/plugins/ata/meson.build -@@ -7,7 +7,7 @@ install_data([ - ) - - install_data(['ata.conf'], -- install_dir: join_paths(sysconfdir, 'fwupd') -+ install_dir: join_paths(sysconfdir_install, 'fwupd') - ) - - shared_module('fu_plugin_ata', diff --git a/plugins/dell-esrt/meson.build b/plugins/dell-esrt/meson.build index ed4eee70..76dbdb1d 100644 --- a/plugins/dell-esrt/meson.build @@ -123,10 +110,10 @@ index ed4eee70..76dbdb1d 100644 + install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'), ) diff --git a/plugins/redfish/meson.build b/plugins/redfish/meson.build -index 92762791..08bb37ea 100644 +index 205d1394..3223f404 100644 --- a/plugins/redfish/meson.build +++ b/plugins/redfish/meson.build -@@ -26,7 +26,7 @@ shared_module('fu_plugin_redfish', +@@ -27,7 +27,7 @@ shared_module('fu_plugin_redfish', ) install_data(['redfish.conf'], @@ -148,14 +135,14 @@ index 6b2368fb..2bd06fed 100644 ) # we use functions from 2.52 in the tests if get_option('tests') and umockdev.found() and gio.version().version_compare('>= 2.52') -diff --git a/plugins/uefi/meson.build b/plugins/uefi/meson.build -index 2d1b2d22..c4217a72 100644 ---- a/plugins/uefi/meson.build -+++ b/plugins/uefi/meson.build +diff --git a/plugins/uefi-capsule/meson.build b/plugins/uefi-capsule/meson.build +index 0b793a07..ebd3e5ea 100644 +--- a/plugins/uefi-capsule/meson.build ++++ b/plugins/uefi-capsule/meson.build @@ -97,7 +97,7 @@ if get_option('man') endif - install_data(['uefi.conf'], + install_data(['uefi_capsule.conf'], - install_dir: join_paths(sysconfdir, 'fwupd') + install_dir: join_paths(sysconfdir_install, 'fwupd') ) diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index 25e0e6b0d88..453d3ab9a47 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -30,6 +30,7 @@ , docbook-xsl-nons , ninja , gcab +, gnutls , python3 , wrapGAppsHook , json-glib @@ -87,7 +88,7 @@ let self = stdenv.mkDerivation rec { pname = "fwupd"; - version = "1.5.3"; + version = "1.5.5"; # libfwupd goes to lib # daemon, plug-ins and libfwupdplugin go to out @@ -96,7 +97,7 @@ let src = fetchurl { url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz"; - sha256 = "005y5wicmm6f2v8i9m3axx7ivgj3z8mbqps4v9m71bsqmq298j86"; + sha256 = "0c2m9qz1g7zxqc6w90w9hksf8y9hvlh0vyvx06q01x893j5hzxh6"; }; patches = [ @@ -129,6 +130,7 @@ let shared-mime-info valgrind gcab + gnutls docbook_xml_dtd_43 docbook-xsl-nons help2man @@ -160,7 +162,7 @@ let pango tpm2-tss efivar - ] ++ stdenv.lib.optionals haveDell [ + ] ++ lib.optionals haveDell [ libsmbios ]; @@ -187,12 +189,12 @@ let # Our builder only adds $lib/lib to rpath but some things link # against libfwupdplugin which is in $out/lib. "-Dc_link_args=-Wl,-rpath,${placeholder "out"}/lib" - ] ++ stdenv.lib.optionals (!haveDell) [ + ] ++ lib.optionals (!haveDell) [ "-Dplugin_dell=false" "-Dplugin_synaptics=false" - ] ++ stdenv.lib.optionals (!haveRedfish) [ + ] ++ lib.optionals (!haveRedfish) [ "-Dplugin_redfish=false" - ] ++ stdenv.lib.optionals haveFlashrom [ + ] ++ lib.optionals haveFlashrom [ "-Dplugin_flashrom=true" ]; @@ -250,12 +252,12 @@ let efibootmgr bubblewrap tpm2-tools - ] ++ stdenv.lib.optional haveFlashrom flashrom; + ] ++ 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 - --prefix PATH : "${stdenv.lib.makeBinPath binPath}" + --prefix PATH : "${lib.makeBinPath binPath}" ) ''; @@ -274,7 +276,6 @@ let passthru = { filesInstalledToEtc = [ - "fwupd/ata.conf" "fwupd/daemon.conf" "fwupd/redfish.conf" "fwupd/remotes.d/lvfs-testing.conf" @@ -283,7 +284,7 @@ let "fwupd/remotes.d/vendor-directory.conf" "fwupd/thunderbolt.conf" "fwupd/upower.conf" - "fwupd/uefi.conf" + "fwupd/uefi_capsule.conf" "pki/fwupd/GPG-KEY-Hughski-Limited" "pki/fwupd/GPG-KEY-Linux-Foundation-Firmware" "pki/fwupd/GPG-KEY-Linux-Vendor-Firmware-Service" @@ -291,7 +292,7 @@ let "pki/fwupd-metadata/GPG-KEY-Linux-Foundation-Metadata" "pki/fwupd-metadata/GPG-KEY-Linux-Vendor-Firmware-Service" "pki/fwupd-metadata/LVFS-CA.pem" - ] ++ stdenv.lib.optionals haveDell [ + ] ++ lib.optionals haveDell [ "fwupd/remotes.d/dell-esrt.conf" ]; @@ -302,7 +303,7 @@ let ]; tests = let - listToPy = list: "[${stdenv.lib.concatMapStringsSep ", " (f: "'${f}'") list}]"; + listToPy = list: "[${lib.concatMapStringsSep ", " (f: "'${f}'") list}]"; in { installedTests = nixosTests.installed-tests.fwupd; diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix b/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix index 00ae9868673..52fa4266577 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config }: let - inherit (stdenv.lib) optionals; + inherit (lib) optionals; in stdenv.mkDerivation { pname = "raspberrypi-armstubs"; diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix index b5fa3909c3b..3561916fd6f 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: stdenvNoCC.mkDerivation rec { # NOTE: this should be updated with linux_rpi @@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec { dontBuild = true; dontFixup = true; - meta = with stdenvNoCC.lib; { + meta = with lib; { description = "Firmware for the Raspberry Pi board"; homepage = "https://github.com/raspberrypi/firmware"; license = licenses.unfreeRedistributableFirmware; # See https://github.com/raspberrypi/firmware/blob/master/boot/LICENCE.broadcom diff --git a/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix b/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix index 84a753ca8ea..34c2b683ea4 100644 --- a/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub }: -with stdenv.lib; +with lib; stdenv.mkDerivation { name = "rtl8192su-unstable-2016-10-05"; diff --git a/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix b/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix index 4f33f09cc78..36580d4b1b9 100644 --- a/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, linuxPackages }: -with stdenv.lib; +with lib; stdenv.mkDerivation { name = "rtl8723bs-firmware-${linuxPackages.rtl8723bs.version}"; inherit (linuxPackages.rtl8723bs) src; diff --git a/pkgs/os-specific/linux/firmware/sof-firmware/default.nix b/pkgs/os-specific/linux/firmware/sof-firmware/default.nix index c1f99bdad68..b474c48e341 100644 --- a/pkgs/os-specific/linux/firmware/sof-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/sof-firmware/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "sof-firmware"; version = "1.6"; diff --git a/pkgs/os-specific/linux/firmware/system76-firmware/default.nix b/pkgs/os-specific/linux/firmware/system76-firmware/default.nix index 3ca8f41be7c..84d9dd4f331 100644 --- a/pkgs/os-specific/linux/firmware/system76-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/system76-firmware/default.nix @@ -1,4 +1,4 @@ -{ rustPlatform, lib, fetchFromGitHub, lzma, pkgconfig, openssl, dbus, efibootmgr, makeWrapper }: +{ rustPlatform, lib, fetchFromGitHub, lzma, pkg-config, openssl, dbus, efibootmgr, makeWrapper }: rustPlatform.buildRustPackage rec { pname = "system76-firmware"; # Check Makefile when updating, make sure postInstall matches make install @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0yjv3a8r01ks91gc33rdwqmw52cqqwhq9f3rvw2xv3h8cqa5hfz0"; }; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ lzma openssl dbus ]; diff --git a/pkgs/os-specific/linux/firmware/zd1211/default.nix b/pkgs/os-specific/linux/firmware/zd1211/default.nix index d6963c8eb78..15e53557126 100644 --- a/pkgs/os-specific/linux/firmware/zd1211/default.nix +++ b/pkgs/os-specific/linux/firmware/zd1211/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, fetchzip }: let pname = "zd1211-firmware"; @@ -19,6 +19,6 @@ in fetchzip rec { description = "Firmware for the ZyDAS ZD1211(b) 802.11a/b/g USB WLAN chip"; homepage = "https://sourceforge.net/projects/zd1211/"; license = "GPL"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/forktty/default.nix b/pkgs/os-specific/linux/forktty/default.nix index 66570bac942..c2e49399582 100644 --- a/pkgs/os-specific/linux/forktty/default.nix +++ b/pkgs/os-specific/linux/forktty/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: let s = # Generated upstream information rec { @@ -28,9 +28,9 @@ stdenv.mkDerivation { makeFlags = [ "prefix=$(out)" "manprefix=$(out)/share/" ]; meta = { inherit (s) version; - description = ''Tool to detach from controlling TTY and attach to another''; - license = stdenv.lib.licenses.gpl2 ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + description = "Tool to detach from controlling TTY and attach to another"; + license = lib.licenses.gpl2 ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/fscrypt/default.nix b/pkgs/os-specific/linux/fscrypt/default.nix index db4b70037c8..b60a10c73ed 100644 --- a/pkgs/os-specific/linux/fscrypt/default.nix +++ b/pkgs/os-specific/linux/fscrypt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, gnum4, pam, fscrypt-experimental }: +{ lib, buildGoModule, fetchFromGitHub, gnum4, pam, fscrypt-experimental }: # Don't use this for anything important yet! diff --git a/pkgs/os-specific/linux/fswebcam/default.nix b/pkgs/os-specific/linux/fswebcam/default.nix index fc1a2563382..18cdc21f0b6 100644 --- a/pkgs/os-specific/linux/fswebcam/default.nix +++ b/pkgs/os-specific/linux/fswebcam/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libv4l, gd }: +{ lib, stdenv, fetchurl, libv4l, gd }: stdenv.mkDerivation rec { name = "fswebcam-20200725"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "Neat and simple webcam app"; homepage = "http://www.sanslogic.co.uk/fswebcam"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix index faef3673bb9..053ea34c82e 100644 --- a/pkgs/os-specific/linux/fuse/common.nix +++ b/pkgs/os-specific/linux/fuse/common.nix @@ -8,7 +8,7 @@ }: let - isFuse3 = stdenv.lib.hasPrefix "3" version; + isFuse3 = lib.hasPrefix "3" version; in stdenv.mkDerivation rec { pname = "fuse"; inherit version; @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { preAutoreconf = "touch config.rpath"; patches = - stdenv.lib.optional + lib.optional (!isFuse3 && stdenv.isAarch64) (fetchpatch { url = "https://github.com/libfuse/libfuse/commit/914871b20a901e3e1e981c92bc42b1c93b7ab81b.patch"; @@ -37,9 +37,9 @@ in stdenv.mkDerivation rec { then [ meson ninja pkg-config ] else [ autoreconfHook gettext ]; - outputs = [ "out" ] ++ stdenv.lib.optional isFuse3 "common"; + outputs = [ "out" ] ++ lib.optional isFuse3 "common"; - mesonFlags = stdenv.lib.optionals isFuse3 [ + mesonFlags = lib.optionals isFuse3 [ "-Dudevrulesdir=/udev/rules.d" "-Duseroot=false" ]; diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix index 857d30859b5..1b5a0e3bdff 100644 --- a/pkgs/os-specific/linux/fwts/default.nix +++ b/pkgs/os-specific/linux/fwts/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchzip, autoreconfHook, pkgconfig, glib, libtool, pcre +{ lib, stdenv, fetchzip, autoreconfHook, pkg-config, glib, libtool, pcre , json_c, flex, bison, dtc, pciutils, dmidecode, iasl, libbsd }: stdenv.mkDerivation rec { pname = "fwts"; - version = "20.09.00"; + version = "20.11.00"; src = fetchzip { url = "http://fwts.ubuntu.com/release/${pname}-V${version}.tar.gz"; - sha256 = "1vzzlb7xdrk8rhi27jdw9baskild4dmk7g5d0hhfh6z3fx4lfhgk"; + sha256 = "0s8iz6c9qhyndcsjscs3qail2mzfywpbiys1x232igm5kl089vvr"; stripRoot = false; }; - nativeBuildInputs = [ autoreconfHook pkgconfig libtool ]; + nativeBuildInputs = [ autoreconfHook pkg-config libtool ]; buildInputs = [ glib pcre json_c flex bison dtc pciutils dmidecode iasl libbsd ]; postPatch = '' diff --git a/pkgs/os-specific/linux/gfxtablet/default.nix b/pkgs/os-specific/linux/gfxtablet/default.nix index 56fa4f1d7d6..608ca8e58cc 100644 --- a/pkgs/os-specific/linux/gfxtablet/default.nix +++ b/pkgs/os-specific/linux/gfxtablet/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, linuxHeaders}: +{lib, stdenv, fetchFromGitHub, linuxHeaders}: stdenv.mkDerivation rec { version = "1.4"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "1i2m98yypfa9phshlmvjlgw7axfisxmldzrvnbzm5spvv5s4kvvb"; }; - preBuild = ''cd driver-uinput''; + preBuild = "cd driver-uinput"; installPhase = '' mkdir -p "$out/bin" @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { ''; meta = { - description = ''Uinput driver for Android GfxTablet tablet-as-input-device app''; - license = stdenv.lib.licenses.mit ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + description = "Uinput driver for Android GfxTablet tablet-as-input-device app"; + license = lib.licenses.mit ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/gradm/default.nix b/pkgs/os-specific/linux/gradm/default.nix index 90f8df63e3b..cdfc91a6837 100644 --- a/pkgs/os-specific/linux/gradm/default.nix +++ b/pkgs/os-specific/linux/gradm/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/etc/udev/rules.d" ''; - postInstall = ''rmdir $out/dev''; + postInstall = "rmdir $out/dev"; meta = with lib; { description = "grsecurity RBAC administration and policy analysis utility"; diff --git a/pkgs/os-specific/linux/guvcview/default.nix b/pkgs/os-specific/linux/guvcview/default.nix index 00e726d7222..c241ac02a64 100644 --- a/pkgs/os-specific/linux/guvcview/default.nix +++ b/pkgs/os-specific/linux/guvcview/default.nix @@ -2,7 +2,7 @@ , lib, stdenv , fetchurl , intltool -, pkgconfig +, pkg-config , portaudio , SDL2 , ffmpeg @@ -37,10 +37,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ intltool - pkgconfig + pkg-config ] - ++ stdenv.lib.optionals (useGtk) [ wrapGAppsHook ] - ++ stdenv.lib.optionals (useQt) [ wrapQtAppsHook ] + ++ lib.optionals (useGtk) [ wrapGAppsHook ] + ++ lib.optionals (useQt) [ wrapQtAppsHook ] ; buildInputs = [ @@ -55,17 +55,17 @@ stdenv.mkDerivation rec { libpng sfml ] - ++ stdenv.lib.optionals (pulseaudioSupport) [ libpulseaudio ] - ++ stdenv.lib.optionals (useGtk) [ gtk3 ] - ++ stdenv.lib.optionals (useQt) [ + ++ lib.optionals (pulseaudioSupport) [ libpulseaudio ] + ++ lib.optionals (useGtk) [ gtk3 ] + ++ lib.optionals (useQt) [ qtbase ] ; configureFlags = [ "--enable-sfml" ] - ++ stdenv.lib.optionals (useGtk) [ "--enable-gtk3" ] - ++ stdenv.lib.optionals (useQt) [ "--enable-qt5" ] + ++ lib.optionals (useGtk) [ "--enable-gtk3" ] + ++ lib.optionals (useQt) [ "--enable-qt5" ] ; meta = with lib; { diff --git a/pkgs/os-specific/linux/hal-flash/default.nix b/pkgs/os-specific/linux/hal-flash/default.nix index a24bf093f8c..70dab152c72 100644 --- a/pkgs/os-specific/linux/hal-flash/default.nix +++ b/pkgs/os-specific/linux/hal-flash/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoconf, automake, dbus, glib, libtool, pkgconfig, udisks2 }: +{ lib, stdenv, fetchurl, autoconf, automake, dbus, glib, libtool, pkg-config, udisks2 }: stdenv.mkDerivation { name = "hal-flash-0.3.3"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "0dw9bx190mrh0dycw4rfvfmwwvh2sgypffr99nfnr36b38jrd6y6"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoconf automake dbus glib libtool udisks2 ]; preConfigure = "libtoolize && aclocal && autoconf && automake --add-missing"; diff --git a/pkgs/os-specific/linux/hdapsd/default.nix b/pkgs/os-specific/linux/hdapsd/default.nix index 893eb4fdd99..39f69ef0144 100644 --- a/pkgs/os-specific/linux/hdapsd/default.nix +++ b/pkgs/os-specific/linux/hdapsd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: let version = "20141203"; in stdenv.mkDerivation { @@ -11,7 +11,7 @@ stdenv.mkDerivation { postInstall = builtins.readFile ./postInstall.sh; - meta = with stdenv.lib; + meta = with lib; { description = "Hard Drive Active Protection System Daemon"; homepage = "http://hdaps.sf.net/"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/hibernate/default.nix b/pkgs/os-specific/linux/hibernate/default.nix index 8fc6bfdbdcf..1a7dd01e977 100644 --- a/pkgs/os-specific/linux/hibernate/default.nix +++ b/pkgs/os-specific/linux/hibernate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gawk }: +{ lib, stdenv, fetchurl, gawk }: let version = "2.0"; in @@ -35,12 +35,12 @@ in description = "The `hibernate' script for swsusp and Tux-on-Ice"; longDescription = '' This package provides the `hibernate' script, a command-line utility - that saves the computer's state to disk and switches it off, turning - it into "hibernation". It works both with Linux swsusp and Tux-on-Ice. + that saves the computer's state to disk and switches it off, turning + it into "hibernation". It works both with Linux swsusp and Tux-on-Ice. ''; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; homepage = "http://www.tuxonice.net/"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix index f004a27fca1..06b23bdf1f6 100644 --- a/pkgs/os-specific/linux/hostapd/default.nix +++ b/pkgs/os-specific/linux/hostapd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libnl, openssl, sqlite ? null }: +{ lib, stdenv, fetchurl, pkg-config, libnl, openssl, sqlite ? null }: stdenv.mkDerivation rec { pname = "hostapd"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1mrbvg4v7vm7mknf0n29mf88k3s4a4qj6r4d51wq8hmjj1m7s7c8"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libnl openssl sqlite ]; patches = [ @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { CONFIG_HS20=y CONFIG_ACS=y CONFIG_GETRANDOM=y - '' + stdenv.lib.optionalString (sqlite != null) '' + '' + lib.optionalString (sqlite != null) '' CONFIG_SQLITE=y ''; diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix index 9b54f404f72..6cee603664d 100644 --- a/pkgs/os-specific/linux/hwdata/default.nix +++ b/pkgs/os-specific/linux/hwdata/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "hwdata"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/vcrhonek/hwdata"; description = "Hardware Database, including Monitors, pci.ids, usb.ids, and video cards"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/i810switch/default.nix b/pkgs/os-specific/linux/i810switch/default.nix index 5b65f2a16fd..ffca983a35e 100644 --- a/pkgs/os-specific/linux/i810switch/default.nix +++ b/pkgs/os-specific/linux/i810switch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pciutils }: +{ lib, stdenv, fetchurl, pciutils }: stdenv.mkDerivation { name = "i810switch-0.6.5"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "A utility for switching between the LCD and external VGA display on Intel graphics cards"; homepage = "http://www16.plala.or.jp/mano-a-mano/i810switch.html"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/ifenslave/default.nix b/pkgs/os-specific/linux/ifenslave/default.nix index 1b22c1eafd3..d23fc101bcc 100644 --- a/pkgs/os-specific/linux/ifenslave/default.nix +++ b/pkgs/os-specific/linux/ifenslave/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "ifenslave"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Utility for enslaving networking interfaces under a bond"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/iio-sensor-proxy/default.nix b/pkgs/os-specific/linux/iio-sensor-proxy/default.nix index 3f4a8e2348b..971a1abffdd 100644 --- a/pkgs/os-specific/linux/iio-sensor-proxy/default.nix +++ b/pkgs/os-specific/linux/iio-sensor-proxy/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoconf-archive, gettext, libtool, intltool, autoconf, automake -, glib, gtk3, gtk-doc, libgudev, pkgconfig, systemd }: +, glib, gtk3, gtk-doc, libgudev, pkg-config, systemd }: stdenv.mkDerivation rec { pname = "iio-sensor-proxy"; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { gettext intltool libtool - pkgconfig + pkg-config ]; meta = with lib; { diff --git a/pkgs/os-specific/linux/ima-evm-utils/default.nix b/pkgs/os-specific/linux/ima-evm-utils/default.nix index 246c109faf3..14ddc21bb6b 100644 --- a/pkgs/os-specific/linux/ima-evm-utils/default.nix +++ b/pkgs/os-specific/linux/ima-evm-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoreconfHook, pkgconfig, openssl, attr, keyutils, asciidoc, libxslt, docbook_xsl }: +{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, openssl, attr, keyutils, asciidoc, libxslt, docbook_xsl }: stdenv.mkDerivation rec { pname = "ima-evm-utils"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1dhfw6d9z4dv82q9zg2g025hgr179kamz9chy7v5w9b71aam8jf8"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ openssl attr keyutils asciidoc libxslt ]; patches = [ ./xattr.patch ]; @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { meta = { description = "evmctl utility to manage digital signatures of the Linux kernel integrity subsystem (IMA/EVM)"; homepage = "https://sourceforge.net/projects/linux-ima/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ tstrobel ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ tstrobel ]; }; } diff --git a/pkgs/os-specific/linux/input-utils/default.nix b/pkgs/os-specific/linux/input-utils/default.nix index 3be25867c33..36a203a47c7 100644 --- a/pkgs/os-specific/linux/input-utils/default.nix +++ b/pkgs/os-specific/linux/input-utils/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "input-utils"; version = "1.3"; - + src = fetchurl { url = "https://www.kraxel.org/releases/input/input-${version}.tar.gz"; sha256 = "11w0pp20knx6qpgzmawdbk1nj2z3fzp8yd6nag6s8bcga16w6hli"; diff --git a/pkgs/os-specific/linux/intel-compute-runtime/default.nix b/pkgs/os-specific/linux/intel-compute-runtime/default.nix index 9d69eca57f4..980b1fad0df 100644 --- a/pkgs/os-specific/linux/intel-compute-runtime/default.nix +++ b/pkgs/os-specific/linux/intel-compute-runtime/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , patchelf , cmake -, pkgconfig +, pkg-config , intel-gmmlib , intel-graphics-compiler @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { sha256 = "19scbbr6jf3yp2v7z8xyzzm01g44jym7xfkf1dz64d5nhvjw6ig5"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ intel-gmmlib intel-graphics-compiler libva ]; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ''; postFixup = '' - patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ intel-gmmlib intel-graphics-compiler libva stdenv.cc.cc.lib ]} \ + patchelf --set-rpath ${lib.makeLibraryPath [ intel-gmmlib intel-graphics-compiler libva stdenv.cc.cc.lib ]} \ $out/lib/intel-opencl/libigdrcl.so ''; diff --git a/pkgs/os-specific/linux/intel-ocl/default.nix b/pkgs/os-specific/linux/intel-ocl/default.nix index 95a2cfbd846..06cb18b2377 100644 --- a/pkgs/os-specific/linux/intel-ocl/default.nix +++ b/pkgs/os-specific/linux/intel-ocl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, rpmextract, ncurses5, numactl, zlib }: +{ lib, stdenv, fetchzip, rpmextract, ncurses5, numactl, zlib }: stdenv.mkDerivation rec { pname = "intel-ocl"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sourceRoot = "."; - libPath = stdenv.lib.makeLibraryPath [ + libPath = lib.makeLibraryPath [ stdenv.cc.cc.lib ncurses5 numactl @@ -66,8 +66,8 @@ stdenv.mkDerivation rec { meta = { description = "Official OpenCL runtime for Intel CPUs"; homepage = "https://software.intel.com/en-us/articles/opencl-drivers"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; platforms = [ "x86_64-linux" ]; - maintainers = [ stdenv.lib.maintainers.kierdavis ]; + maintainers = [ lib.maintainers.kierdavis ]; }; } diff --git a/pkgs/os-specific/linux/iotop/default.nix b/pkgs/os-specific/linux/iotop/default.nix index 1924e326c1e..a91175aa59f 100644 --- a/pkgs/os-specific/linux/iotop/default.nix +++ b/pkgs/os-specific/linux/iotop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python3Packages, fetchpatch }: +{ lib, fetchurl, python3Packages, fetchpatch }: python3Packages.buildPythonApplication rec { name = "iotop-0.6"; diff --git a/pkgs/os-specific/linux/iproute/mptcp.nix b/pkgs/os-specific/linux/iproute/mptcp.nix index 6505d1d80ee..7285e27ff36 100644 --- a/pkgs/os-specific/linux/iproute/mptcp.nix +++ b/pkgs/os-specific/linux/iproute/mptcp.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, iproute, fetchFromGitHub }: +{ lib, iproute, fetchFromGitHub }: iproute.overrideAttrs (oa: rec { pname = "iproute_mptcp"; diff --git a/pkgs/os-specific/linux/ipset/default.nix b/pkgs/os-specific/linux/ipset/default.nix index 083c9aa726c..6e64013464a 100644 --- a/pkgs/os-specific/linux/ipset/default.nix +++ b/pkgs/os-specific/linux/ipset/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv, fetchurl, pkgconfig, libmnl }: +{ lib, stdenv, fetchurl, pkg-config, libmnl }: stdenv.mkDerivation rec { pname = "ipset"; - version = "7.9"; + version = "7.10"; src = fetchurl { url = "http://ipset.netfilter.org/${pname}-${version}.tar.bz2"; - sha256 = "02mkp7vmsh609dcp02xi290sxmsgq2fsch3875dxkwfxkrl16p5p"; + sha256 = "sha256-skkGukPi/jIr1BhjR2dh10mkvd9c5MImW6BLA7x+nPY="; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libmnl ]; configureFlags = [ "--with-kmod=no" ]; diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/os-specific/linux/iptables/default.nix index a03d1aa9882..797e7a5b130 100644 --- a/pkgs/os-specific/linux/iptables/default.nix +++ b/pkgs/os-specific/linux/iptables/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, pkgconfig, pruneLibtoolFiles, flex, bison +{ lib, stdenv, fetchurl, pkg-config, pruneLibtoolFiles, flex, bison , libmnl, libnetfilter_conntrack, libnfnetlink, libnftnl, libpcap , nftablesCompat ? false }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { version = "1.8.7"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1w6qx3sxzkv80shk21f63rq41c84irpx68k62m2cv629n1mwj2f1"; }; - nativeBuildInputs = [ pkgconfig pruneLibtoolFiles flex bison ]; + nativeBuildInputs = [ pkg-config pruneLibtoolFiles flex bison ]; buildInputs = [ libmnl libnetfilter_conntrack libnfnetlink libnftnl libpcap ]; diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix index 3bb653ebcf7..0079aa79a22 100644 --- a/pkgs/os-specific/linux/iputils/default.nix +++ b/pkgs/os-specific/linux/iputils/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchFromGitHub, fetchpatch -, meson, ninja, pkgconfig, gettext, libxslt, docbook_xsl_ns +{ lib, stdenv, fetchFromGitHub, fetchpatch +, meson, ninja, pkg-config, gettext, libxslt, docbook_xsl_ns , libcap, libidn2 }: -with stdenv.lib; +with lib; let version = "20200821"; @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { # Disable idn usage w/musl (https://github.com/iputils/iputils/pull/111): ++ optional stdenv.hostPlatform.isMusl "-DUSE_IDN=false"; - nativeBuildInputs = [ meson ninja pkgconfig gettext libxslt.bin docbook_xsl_ns ]; + nativeBuildInputs = [ meson ninja pkg-config gettext libxslt.bin docbook_xsl_ns ]; buildInputs = [ libcap ] ++ optional (!stdenv.hostPlatform.isMusl) libidn2; diff --git a/pkgs/os-specific/linux/ipvsadm/default.nix b/pkgs/os-specific/linux/ipvsadm/default.nix index aab8c2c7c83..fbd4d8efdac 100644 --- a/pkgs/os-specific/linux/ipvsadm/default.nix +++ b/pkgs/os-specific/linux/ipvsadm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libnl, popt, gnugrep }: +{ lib, stdenv, fetchurl, pkg-config, libnl, popt, gnugrep }: stdenv.mkDerivation rec { pname = "ipvsadm"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace "-lnl" "$(pkg-config --libs libnl-genl-3.0)" ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libnl popt ]; preBuild = '' diff --git a/pkgs/os-specific/linux/irqbalance/default.nix b/pkgs/os-specific/linux/irqbalance/default.nix index d61d02b5598..7cb05f7fe98 100644 --- a/pkgs/os-specific/linux/irqbalance/default.nix +++ b/pkgs/os-specific/linux/irqbalance/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, ncurses, libcap_ng }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib, ncurses, libcap_ng }: stdenv.mkDerivation rec { pname = "irqbalance"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1677ap6z4hvwga0vb8hrvpc0qggyarg9mlg11pxywz7mq94vdx19"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ glib ncurses libcap_ng ]; LDFLAGS = "-lncurses"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/Irqbalance/irqbalance"; description = "A daemon to help balance the cpu load generated by interrupts across all of a systems cpus"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/iw/default.nix b/pkgs/os-specific/linux/iw/default.nix index f0097e37a99..7d526db53e9 100644 --- a/pkgs/os-specific/linux/iw/default.nix +++ b/pkgs/os-specific/linux/iw/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, libnl }: +{ lib, stdenv, fetchurl, pkg-config, libnl }: stdenv.mkDerivation rec { pname = "iw"; @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { deprecated and it's strongly recommended to switch to iw and nl80211. ''; homepage = "https://wireless.wiki.kernel.org/en/users/Documentation/iw"; - license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ viric primeos ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ viric primeos ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index 0e73dc94e5a..11886e8e9c6 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -2,7 +2,7 @@ , fetchgit , fetchpatch , autoreconfHook -, pkgconfig +, pkg-config , ell , coreutils , docutils @@ -13,21 +13,21 @@ stdenv.mkDerivation rec { pname = "iwd"; - version = "1.10"; + version = "1.11"; src = fetchgit { url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git"; rev = version; - sha256 = "0gzpdgfwzlqj2n3amf2zhi2hlpa412878yphgx79y6b5gn1y1lm2"; + sha256 = "0wnyg0f1swi7gvvgf5kzbiz44g2wscf5d5bp320iwyfwnlbqb1bn"; }; outputs = [ "out" "man" ] - ++ stdenv.lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) "test"; + ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) "test"; nativeBuildInputs = [ autoreconfHook docutils - pkgconfig + pkg-config python3Packages.wrapPython ]; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { # wrapPython wraps the scripts in $test. They pull in gobject-introspection, # which doesn't cross-compile. - pythonPath = stdenv.lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ + pythonPath = lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ python3Packages.dbus-python python3Packages.pygobject3 ]; @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { mkdir -p $out/share cp -a doc $out/share/ cp -a README AUTHORS TODO $out/share/doc/ - '' + stdenv.lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + '' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' mkdir -p $test/bin cp -a test/* $test/bin/ ''; diff --git a/pkgs/os-specific/linux/jfbview/default.nix b/pkgs/os-specific/linux/jfbview/default.nix index 8ed1d87c195..da4135d8a80 100644 --- a/pkgs/os-specific/linux/jfbview/default.nix +++ b/pkgs/os-specific/linux/jfbview/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { buildInputs = [ freetype harfbuzz jbig2dec libjpeg libX11 mupdf_1_17 ncurses openjpeg openssl - ] ++ stdenv.lib.optionals imageSupport [ + ] ++ lib.optionals imageSupport [ imlib2 ]; diff --git a/pkgs/os-specific/linux/jool/cli.nix b/pkgs/os-specific/linux/jool/cli.nix index 8572f8ebdb9..b1bce496614 100644 --- a/pkgs/os-specific/linux/jool/cli.nix +++ b/pkgs/os-specific/linux/jool/cli.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libnl, iptables }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libnl, iptables }: let sourceAttrs = (import ./source.nix) { inherit fetchFromGitHub; }; @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = sourceAttrs.src; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libnl iptables ]; makeFlags = [ "-C" "src/usr" ]; diff --git a/pkgs/os-specific/linux/jujuutils/default.nix b/pkgs/os-specific/linux/jujuutils/default.nix index 86b24fe6a5b..554898cedeb 100644 --- a/pkgs/os-specific/linux/jujuutils/default.nix +++ b/pkgs/os-specific/linux/jujuutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, linuxHeaders }: +{ lib, stdenv, fetchurl, linuxHeaders }: stdenv.mkDerivation { name = "jujuutils-0.2"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/cladisch/linux-firewire-utils"; description = "Utilities around FireWire devices connected to a Linux computer"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix index 80cb98feffe..2119c10b9cf 100644 --- a/pkgs/os-specific/linux/kbd/default.nix +++ b/pkgs/os-specific/linux/kbd/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, autoreconfHook, - gzip, bzip2, pkgconfig, flex, check, + gzip, bzip2, pkg-config, flex, check, pam, coreutils }: @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { # We get a warning in armv5tel-linux and the fuloong2f, so we # disable -Werror in it. - ${stdenv.lib.optionalString (stdenv.isAarch32 || stdenv.hostPlatform.isMips) '' + ${lib.optionalString (stdenv.isAarch32 || stdenv.hostPlatform.isMips) '' sed -i s/-Werror// src/Makefile.am ''} ''; @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { buildInputs = [ check pam ]; - nativeBuildInputs = [ autoreconfHook pkgconfig flex ]; + nativeBuildInputs = [ autoreconfHook pkg-config flex ]; makeFlags = [ "setowner=" ]; diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index cadf65a7220..7a81d9434e3 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -7,7 +7,7 @@ let pname = "linux-headers"; inherit version; - ARCH = stdenvNoCC.hostPlatform.platform.kernelArch or stdenvNoCC.hostPlatform.kernelArch; + ARCH = stdenvNoCC.hostPlatform.linuxArch; # It may look odd that we use `stdenvNoCC`, and yet explicit depend on a cc. # We do this so we have a build->build, not build->host, C compiler. @@ -69,12 +69,12 @@ let in { inherit makeLinuxHeaders; - linuxHeaders = let version = "5.10.4"; in + linuxHeaders = let version = "5.10.9"; in makeLinuxHeaders { inherit version; src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1v2nbpp21c3fkw23dgrrfznnnlvi0538kj8wrlb2m6g94rn3jklh"; + sha256 = "0la7dklpy6xd79fkzavpmlfyrc60kmmwz491msd95dmvv06kwwvz"; }; patches = [ ./no-relocs.patch # for building x86 kernel headers on non-ELF platforms diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 2f073d7a38f..8014267971a 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -10,14 +10,14 @@ # hardware problems with a new one. # Configuration -{ stdenv, version +{ lib, stdenv, version , features ? { grsecurity = false; xen_dom0 = false; } }: -with stdenv.lib; -with stdenv.lib.kernel; -with (stdenv.lib.kernel.whenHelpers version); +with lib; +with lib.kernel; +with (lib.kernel.whenHelpers version); let @@ -360,6 +360,7 @@ let F2FS_FS = module; F2FS_FS_SECURITY = option yes; F2FS_FS_ENCRYPTION = option yes; + F2FS_FS_COMPRESSION = whenAtLeast "5.6" yes; UDF_FS = module; NFSD_PNFS = whenBetween "4.0" "4.6" yes; diff --git a/pkgs/os-specific/linux/kernel/export_kernel_fpu_functions_4_14.patch b/pkgs/os-specific/linux/kernel/export_kernel_fpu_functions_4_14.patch deleted file mode 100644 index 205497aee2d..00000000000 --- a/pkgs/os-specific/linux/kernel/export_kernel_fpu_functions_4_14.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 245e0f743d814c9ff2d1c748175e321301eb16cf Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io> -Date: Thu, 2 May 2019 05:28:08 +0100 -Subject: [PATCH] x86/fpu: Export __kernel_fpu_{begin,end}() - -This partially undo commit: - -12209993 x86/fpu: Don't export __kernel_fpu_{begin,end}() - -We need this symbol in zfs for AES-NI/AVX support. ---- - arch/x86/include/asm/fpu/api.h | 2 ++ - arch/x86/kernel/fpu/core.c | 6 ++++-- - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/arch/x86/include/asm/fpu/api.h b/arch/x86/include/asm/fpu/api.h -index b56d504af6545..7d53388d266ea 100644 ---- a/arch/x86/include/asm/fpu/api.h -+++ b/arch/x86/include/asm/fpu/api.h -@@ -18,6 +18,8 @@ - * If you intend to use the FPU in softirq you need to check first with - * irq_fpu_usable() if it is possible. - */ -+extern void __kernel_fpu_begin(void); -+extern void __kernel_fpu_end(void); - extern void kernel_fpu_begin(void); - extern void kernel_fpu_end(void); - extern bool irq_fpu_usable(void); -diff --git a/arch/x86/kernel/fpu/core.c b/arch/x86/kernel/fpu/core.c -index 2e5003fef51a9..2ea85b32421a0 100644 ---- a/arch/x86/kernel/fpu/core.c -+++ b/arch/x86/kernel/fpu/core.c -@@ -93,7 +93,7 @@ bool irq_fpu_usable(void) - } - EXPORT_SYMBOL(irq_fpu_usable); - --static void __kernel_fpu_begin(void) -+void __kernel_fpu_begin(void) - { - struct fpu *fpu = ¤t->thread.fpu; - -@@ -111,8 +111,9 @@ static void __kernel_fpu_begin(void) - __cpu_invalidate_fpregs_state(); - } - } -+EXPORT_SYMBOL(__kernel_fpu_begin); - --static void __kernel_fpu_end(void) -+void __kernel_fpu_end(void) - { - struct fpu *fpu = ¤t->thread.fpu; - -@@ -121,6 +122,7 @@ static void __kernel_fpu_end(void) - - kernel_fpu_enable(); - } -+EXPORT_SYMBOL(__kernel_fpu_end); - - void kernel_fpu_begin(void) - { diff --git a/pkgs/os-specific/linux/kernel/export_kernel_fpu_functions_5_3.patch b/pkgs/os-specific/linux/kernel/export_kernel_fpu_functions_5_3.patch deleted file mode 100644 index dc9ca64bdc1..00000000000 --- a/pkgs/os-specific/linux/kernel/export_kernel_fpu_functions_5_3.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 1e010beda2896bdf3082fb37a3e49f8ce20e04d8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io> -Date: Thu, 2 May 2019 05:28:08 +0100 -Subject: [PATCH] x86/fpu: Export kernel_fpu_{begin,end}() with - EXPORT_SYMBOL_GPL -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -We need these symbols in zfs as the fpu implementation breaks userspace: - -https://github.com/zfsonlinux/zfs/issues/9346 -Signed-off-by: Jörg Thalheim <joerg@thalheim.io> ---- - arch/x86/kernel/fpu/core.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/x86/kernel/fpu/core.c b/arch/x86/kernel/fpu/core.c -index 12c70840980e..352538b3bb5d 100644 ---- a/arch/x86/kernel/fpu/core.c -+++ b/arch/x86/kernel/fpu/core.c -@@ -102,7 +102,7 @@ void kernel_fpu_begin(void) - } - __cpu_invalidate_fpregs_state(); - } --EXPORT_SYMBOL_GPL(kernel_fpu_begin); -+EXPORT_SYMBOL(kernel_fpu_begin); - - void kernel_fpu_end(void) - { -@@ -111,7 +111,7 @@ void kernel_fpu_end(void) - this_cpu_write(in_kernel_fpu, false); - preempt_enable(); - } --EXPORT_SYMBOL_GPL(kernel_fpu_end); -+EXPORT_SYMBOL(kernel_fpu_end); - - /* - * Save the FPU state (mark it for reload if necessary): --- -2.23.0 - diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index dd3050a93ee..ac9d6fbb2b5 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -6,6 +6,7 @@ , gmp ? null , libmpc ? null , mpfr ? null +, lib , stdenv , # The kernel source tarball. @@ -41,7 +42,7 @@ # symbolic name and `patch' is the actual patch. The patch may # optionally be compressed with gzip or bzip2. kernelPatches ? [] -, ignoreConfigErrors ? stdenv.hostPlatform.platform.name != "pc" || +, ignoreConfigErrors ? stdenv.hostPlatform.linux-kernel.name != "pc" || stdenv.hostPlatform != stdenv.buildPlatform , extraMeta ? {} @@ -50,10 +51,10 @@ , isLibre ? false , isHardened ? false -# easy overrides to stdenv.hostPlatform.platform members -, autoModules ? stdenv.hostPlatform.platform.kernelAutoModules -, preferBuiltin ? stdenv.hostPlatform.platform.kernelPreferBuiltin or false -, kernelArch ? stdenv.hostPlatform.platform.kernelArch +# easy overrides to stdenv.hostPlatform.linux-kernel members +, autoModules ? stdenv.hostPlatform.linux-kernel.autoModules +, preferBuiltin ? stdenv.hostPlatform.linux-kernel.preferBuiltin or false +, kernelArch ? stdenv.hostPlatform.linuxArch , ... }: @@ -66,9 +67,6 @@ assert stdenv.isLinux; let - - lib = stdenv.lib; - # Combine the `features' attribute sets of all the kernel patches. kernelFeatures = lib.fold (x: y: (x.features or {}) // y) ({ iwlwifi = true; @@ -81,7 +79,7 @@ let } // features) kernelPatches; commonStructuredConfig = import ./common-config.nix { - inherit stdenv version ; + inherit lib stdenv version; features = kernelFeatures; # Ensure we know of all extra patches, etc. }; @@ -89,7 +87,7 @@ let intermediateNixConfig = configfile.moduleStructuredConfig.intermediateNixConfig # extra config in legacy string format + extraConfig - + lib.optionalString (stdenv.hostPlatform.platform ? kernelExtraConfig) stdenv.hostPlatform.platform.kernelExtraConfig; + + stdenv.hostPlatform.linux-kernel.extraConfig or ""; structuredConfigFromPatches = map ({extraStructuredConfig ? {}, ...}: {settings=extraStructuredConfig;}) kernelPatches; @@ -113,13 +111,13 @@ let depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ perl gmp libmpc mpfr ] - ++ lib.optionals (stdenv.lib.versionAtLeast version "4.16") [ bison flex ]; + ++ lib.optionals (lib.versionAtLeast version "4.16") [ bison flex ]; - platformName = stdenv.hostPlatform.platform.name; + platformName = stdenv.hostPlatform.linux-kernel.name; # e.g. "defconfig" - kernelBaseConfig = if defconfig != null then defconfig else stdenv.hostPlatform.platform.kernelBaseConfig; + kernelBaseConfig = if defconfig != null then defconfig else stdenv.hostPlatform.linux-kernel.baseConfig; # e.g. "bzImage" - kernelTarget = stdenv.hostPlatform.platform.kernelTarget; + kernelTarget = stdenv.hostPlatform.linux-kernel.target; prePatch = kernel.prePatch + '' # Patch kconfig to print "###" after every question so that @@ -173,7 +171,7 @@ let }; # end of configfile derivation kernel = (callPackage ./manual-config.nix {}) { - inherit version modDirVersion src kernelPatches randstructSeed stdenv extraMeta configfile; + inherit version modDirVersion src kernelPatches randstructSeed lib stdenv extraMeta configfile; config = { CONFIG_MODULES = "y"; CONFIG_FW_LOADER = "m"; }; }; diff --git a/pkgs/os-specific/linux/kernel/hardened/config.nix b/pkgs/os-specific/linux/kernel/hardened/config.nix index c817f104427..bd0518650d6 100644 --- a/pkgs/os-specific/linux/kernel/hardened/config.nix +++ b/pkgs/os-specific/linux/kernel/hardened/config.nix @@ -8,11 +8,11 @@ # # See also <nixos/modules/profiles/hardened.nix> -{ stdenv, version }: +{ lib, version }: -with stdenv.lib; -with stdenv.lib.kernel; -with (stdenv.lib.kernel.whenHelpers version); +with lib; +with lib.kernel; +with (lib.kernel.whenHelpers version); assert (versionAtLeast version "4.9"); diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 91a6b42ac41..7fabee2cb88 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,32 +1,26 @@ { "4.14": { - "extra": ".a", - "name": "linux-hardened-4.14.214.a.patch", - "sha256": "14m075fnbzlshrz09vpyk9v9qbki896caj8f49am2z8dmm5hnr6b", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.214.a/linux-hardened-4.14.214.a.patch" + "extra": "-hardened1", + "name": "linux-hardened-4.14.217-hardened1.patch", + "sha256": "1hb5fa06xw9rn0f77lklrlhb6vajr1hjv64qxv5y03l7zqfsi7lx", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.217-hardened1/linux-hardened-4.14.217-hardened1.patch" }, "4.19": { - "extra": ".a", - "name": "linux-hardened-4.19.166.a.patch", - "sha256": "0wkyd8k68qy378vj3937dk0valqb4sgdz5fg3107bjcgv7a4lvis", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.166.a/linux-hardened-4.19.166.a.patch" + "extra": "-hardened1", + "name": "linux-hardened-4.19.172-hardened1.patch", + "sha256": "0c64rmlfaxj3jfjl8q3fncwmxjmbn7184d0m3vavznrl7lcy50xa", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.172-hardened1/linux-hardened-4.19.172-hardened1.patch" }, "5.10": { - "extra": ".a", - "name": "linux-hardened-5.10.6.a.patch", - "sha256": "18ryh9zhrv5mmg876wss8k5fx8abm7ay0qpanvzmf5bjw7dc6qkq", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.6.a/linux-hardened-5.10.6.a.patch" + "extra": "-hardened1", + "name": "linux-hardened-5.10.12-hardened1.patch", + "sha256": "03b6ndq4r7w1az0i8cahfm3pf3cn6a1rwra06lgdp9dk4naf4hby", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.12-hardened1/linux-hardened-5.10.12-hardened1.patch" }, "5.4": { - "extra": ".a", - "name": "linux-hardened-5.4.88.a.patch", - "sha256": "0fz44izfmcsj205l7hjmkp78f5isy96fcjsz2bvrpb4x3h98bm5i", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.88.a/linux-hardened-5.4.88.a.patch" - }, - "5.9": { - "extra": "", - "name": "linux-hardened-5.9.16.a.patch", - "sha256": "024wdzc9bwgr4nd4z0l6bazcl35jczhsmdl2lb26bvffjwg207rw", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.9.16.a/linux-hardened-5.9.16.a.patch" + "extra": "-hardened1", + "name": "linux-hardened-5.4.94-hardened1.patch", + "sha256": "08lzygjg7n9rx27r5gik360vfmaczpp14z01dc5r5hkmxkiaz8ww", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.94-hardened1/linux-hardened-5.4.94-hardened1.patch" } } diff --git a/pkgs/os-specific/linux/kernel/hardened/tag-hardened.patch b/pkgs/os-specific/linux/kernel/hardened/tag-hardened.patch deleted file mode 100644 index ff8a3a12797..00000000000 --- a/pkgs/os-specific/linux/kernel/hardened/tag-hardened.patch +++ /dev/null @@ -1,7 +0,0 @@ -diff --git a/localversion-hardened b/localversion-hardened -new file mode 100644 -index 0000000000..e578045860 ---- /dev/null -+++ b/localversion-hardened -@@ -0,0 +1 @@ -+-hardened diff --git a/pkgs/os-specific/linux/kernel/hardened/update.py b/pkgs/os-specific/linux/kernel/hardened/update.py index b831c649109..e96ac9ca855 100755 --- a/pkgs/os-specific/linux/kernel/hardened/update.py +++ b/pkgs/os-specific/linux/kernel/hardened/update.py @@ -101,7 +101,7 @@ def verify_openpgp_signature( def fetch_patch(*, name: str, release_info: ReleaseInfo) -> Optional[Patch]: release = release_info.release - extra = f'.{release_info.version[-1]}' + extra = f'-{release_info.version[-1]}' def find_asset(filename: str) -> str: try: @@ -138,7 +138,7 @@ def fetch_patch(*, name: str, release_info: ReleaseInfo) -> Optional[Patch]: def parse_version(version_str: str) -> Version: version: Version = [] - for component in version_str.split("."): + for component in re.split('\.|\-', version_str): try: version.append(int(component)) except ValueError: @@ -208,7 +208,7 @@ failures = False releases = {} for release in repo.get_releases(): version = parse_version(release.tag_name) - # needs to look like e.g. 5.6.3.a + # needs to look like e.g. 5.6.3-hardened1 if len(version) < 4: continue diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index fc876e80353..a470017199f 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -1,9 +1,9 @@ -{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: +{ lib, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: -with stdenv.lib; +with lib; buildLinux (args // rec { - version = "4.14.214"; + version = "4.14.218"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${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 = "07ir4yw7s5c6yb3gjbgjvcqqdgpbsjxrvapgh6zs22ffd8hrchpm"; + sha256 = "0l2rcpccf71amngii7vs18x4x6gb0bwxdb2gszabip03bshqdzp3"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 48c2050842b..6fd81e81d24 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -1,9 +1,9 @@ -{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: +{ lib, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: -with stdenv.lib; +with lib; buildLinux (args // rec { - version = "4.19.166"; + version = "4.19.172"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${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 = "03l86ykdjs5wa0n4wknpgy9dv2r6l92qfsyak373jkhs684z53mr"; + sha256 = "08hl7vw5r61gnzagnm8nbhlbm0h226crp4m19zh0qr2q0pmwqd2g"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 6ff11414fce..bc15817a8f6 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ -{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: +{ buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.250"; + version = "4.4.254"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "12m14j8654rawj2znkyhvcnwnf53x10zlghxd0mpl8dfzwvn2f5b"; + sha256 = "11wca1mprlcyk7r5h1c8rx3hr7l6mj4i85jaaf106s7wqcm8wamd"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index e634716d0af..e3b4024a132 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ -{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: +{ buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.250"; + version = "4.9.254"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "15vizxd2i2311skjank406ny3bc30c5rz2p9jvh5xz1yv12vzgcy"; + sha256 = "1djw5mlff73j7m1176qspdzhf6zyv4m0gkdvlxq4g4mdrbqfx6xn"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index 2e82728107c..88393811c12 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -1,9 +1,9 @@ -{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: +{ lib, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: -with stdenv.lib; +with lib; buildLinux (args // rec { - version = "5.10.6"; + version = "5.10.12"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${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 = "02v91afra3pcwfws74wxdsm8pfc57vws659b7j6jmsxm3hnd0rvp"; + sha256 = "1an460q3affd7gmd6fqv8g37j3z2fnmq19iy677k8kxb2wl4yi8x"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index a81d38b1527..c5a245cc237 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -1,9 +1,9 @@ -{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: +{ lib, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: -with stdenv.lib; +with lib; buildLinux (args // rec { - version = "5.4.88"; + version = "5.4.94"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${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 = "1ci432xanm7glgg05012kh43pfi4k771kzih0816y5674v0hg02b"; + sha256 = "0f9bml584g6jb822j7xyxx9j2g3s49p08xz4bkx9lbiinxyzagf2"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.9.nix b/pkgs/os-specific/linux/kernel/linux-5.9.nix deleted file mode 100644 index 39cc9c56c5f..00000000000 --- a/pkgs/os-specific/linux/kernel/linux-5.9.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: - -with stdenv.lib; - -buildLinux (args // rec { - version = "5.9.16"; - - # modDirVersion needs to be x.y.z, will automatically add .0 if needed - modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; - - # branchVersion needs to be x.y - extraMeta.branch = versions.majorMinor version; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "11mbnjvb5d5gwbrwlkqvzpg1ij4m19l5wr3wca9iiyg5i2papmxh"; - }; -} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix b/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix index a272bd286f3..a64520ab893 100644 --- a/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, libelf, util-linux, ... } @ args: +{ buildPackages, fetchFromGitHub, perl, buildLinux, libelf, util-linux, ... } @ args: buildLinux (args // rec { version = "4.14.165-172"; diff --git a/pkgs/os-specific/linux/kernel/linux-lqx.nix b/pkgs/os-specific/linux/kernel/linux-lqx.nix index c8f5df788b7..e466b76867c 100644 --- a/pkgs/os-specific/linux/kernel/linux-lqx.nix +++ b/pkgs/os-specific/linux/kernel/linux-lqx.nix @@ -1,24 +1,25 @@ -{ stdenv, fetchFromGitHub, buildLinux, linux_zen, ... } @ args: +{ lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args: let - version = "5.10.6"; + version = "5.10.10"; + suffix = "lqx2"; in buildLinux (args // { - modDirVersion = "${version}-lqx1"; + modDirVersion = "${version}-${suffix}"; inherit version; isZen = true; src = fetchFromGitHub { owner = "zen-kernel"; repo = "zen-kernel"; - rev = "v${version}-lqx1"; - sha256 = "0vvb00311yhf08ib3yvkjwk2j45f8r268ywg5299yjgbyl6g95kg"; + rev = "v${version}-${suffix}"; + sha256 = "1cjgx9qjfkiaalqkcdmibsrq2frwd621rwcg6w05ms4w9lnwi3af"; }; extraMeta = { branch = "5.10/master"; - maintainers = with stdenv.lib.maintainers; [ atemu ]; + maintainers = with lib.maintainers; [ atemu ]; description = linux_zen.meta.description + " (Same as linux_zen but less aggressive release schedule)"; }; diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp-95.nix b/pkgs/os-specific/linux/kernel/linux-mptcp-95.nix index ad933ff63a7..cd661be1078 100644 --- a/pkgs/os-specific/linux/kernel/linux-mptcp-95.nix +++ b/pkgs/os-specific/linux/kernel/linux-mptcp-95.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, structuredExtraConfig ? {}, ... } @ args: +{ lib, buildPackages, fetchFromGitHub, perl, buildLinux, structuredExtraConfig ? {}, ... } @ args: let mptcpVersion = "0.95"; modDirVersion = "4.19.55"; @@ -9,7 +9,7 @@ buildLinux ({ extraMeta = { branch = "4.19"; - maintainers = with stdenv.lib.maintainers; [ teto layus ]; + maintainers = with lib.maintainers; [ teto layus ]; }; src = fetchFromGitHub { @@ -19,8 +19,8 @@ buildLinux ({ sha256 = "04a66iq5vsiz8mkpszfxmqknz7y4w3lsckrcz6q1syjpk0pdyiyw"; }; - structuredExtraConfig = stdenv.lib.mkMerge [ - (import ./mptcp-config.nix { inherit stdenv; }) + structuredExtraConfig = lib.mkMerge [ + (import ./mptcp-config.nix { inherit lib; }) structuredExtraConfig ]; diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix index ed19559f95f..d733f0bdfa4 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.10.4-rt22"; # updated by ./update-rt.sh + version = "5.10.8-rt24"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -18,14 +18,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "1v2nbpp21c3fkw23dgrrfznnnlvi0538kj8wrlb2m6g94rn3jklh"; + sha256 = "1v83wm8xbhq1sgn7c84zi7l40vmd9k1gb653b686jp8n4na85z2w"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "1wnp7w3k1z10ipg8vzgyh22lpfya1p3ckabjadk9hadpa1ialma0"; + sha256 = "06fqwx9flcxzbjr9gb0d7v4hidypzz69r6p2mfzhqh7ii0p89f30"; }; }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index dd9ce3e080a..b1874bf3820 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, fetchFromGitHub, fetchpatch, perl, buildLinux, ... } @ args: +{ lib, buildPackages, fetchFromGitHub, fetchpatch, perl, buildLinux, ... } @ args: buildLinux (args // { version = "5.9.0-2020.11.20"; @@ -16,7 +16,7 @@ buildLinux (args // { extraMeta = { branch = "master"; hydraPlatforms = []; # Should the testing kernels ever be built on Hydra? - maintainers = with stdenv.lib.maintainers; [ davidak chiiruno ]; + maintainers = with lib.maintainers; [ davidak chiiruno ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index c18d75b93f2..1ed116cdfde 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,9 +1,9 @@ -{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: +{ lib, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: -with stdenv.lib; +with lib; buildLinux (args // rec { - version = "5.11-rc3"; + version = "5.11-rc5"; extraMeta.branch = "5.11"; # modDirVersion needs to be x.y.z, will always add .0 @@ -11,7 +11,7 @@ buildLinux (args // rec { src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "15dfgvicp7s9xqaa3w8lmfffzyjsqrq1fa2gs1a8awzs5rxgsn61"; + sha256 = "029nps41nrym5qz9lq832cys4rai04ig5xp9ddvrpazzh0lfnr4q"; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix index 118272d2876..b30ee996649 100644 --- a/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -1,24 +1,25 @@ -{ stdenv, fetchFromGitHub, buildLinux, ... } @ args: +{ lib, fetchFromGitHub, buildLinux, ... } @ args: let - version = "5.10.6"; + version = "5.10.10"; + suffix = "zen1"; in buildLinux (args // { - modDirVersion = "${version}-zen1"; + modDirVersion = "${version}-${suffix}"; inherit version; isZen = true; src = fetchFromGitHub { owner = "zen-kernel"; repo = "zen-kernel"; - rev = "v${version}-zen1"; - sha256 = "0asn4ysnzv845g35ca9sdi89sc7clcc88xmx64pcxmh033civ5fw"; + rev = "v${version}-${suffix}"; + sha256 = "0jsi2q8k1w5zs5l6z1brm2mxpl9arv6n6linc8yj6xc75nydw6w4"; }; extraMeta = { branch = "5.10/master"; - maintainers = with stdenv.lib.maintainers; [ atemu andresilva ]; + maintainers = with lib.maintainers; [ atemu andresilva ]; description = "Built using the best configuration and kernel sources for desktop, multimedia, and gaming workloads."; }; diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index c2f13718308..2fc63322f5b 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,4 +1,4 @@ -{ buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl +{ lib, buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl , libelf, cpio, elfutils, zstd, gawk , writeTextFile }: @@ -14,6 +14,7 @@ let echo "}" >> $out '').outPath; in { + lib, # Allow overriding stdenv on each buildLinux call stdenv, # The kernel version @@ -28,7 +29,7 @@ in { configfile, # Manually specified nixexpr representing the config # If unspecified, this will be autodetected from the .config - config ? stdenv.lib.optionalAttrs allowImportFromDerivation (readConfig configfile), + config ? lib.optionalAttrs allowImportFromDerivation (readConfig configfile), # Custom seed used for CONFIG_GCC_PLUGIN_RANDSTRUCT if enabled. This is # automatically extended with extra per-version and per-config values. randstructSeed ? "", @@ -48,11 +49,11 @@ in { }: let - inherit (stdenv.lib) + inherit (lib) hasAttr getAttr optional optionals optionalString optionalAttrs maintainers platforms; # Dependencies that are required to build kernel modules - moduleBuildDependencies = optional (stdenv.lib.versionAtLeast version "4.14") libelf; + moduleBuildDependencies = optional (lib.versionAtLeast version "4.14") libelf; installkernel = writeTextFile { name = "installkernel"; executable=true; text = '' #!${stdenv.shell} -e @@ -63,10 +64,10 @@ let commonMakeFlags = [ "O=$(buildRoot)" - ] ++ stdenv.lib.optionals (stdenv.hostPlatform.platform ? kernelMakeFlags) - stdenv.hostPlatform.platform.kernelMakeFlags; + ] ++ lib.optionals (stdenv.hostPlatform.linux-kernel ? makeFlags) + stdenv.hostPlatform.linux-kernel.makeFlags; - drvAttrs = config_: platform: kernelPatches: configfile: + drvAttrs = config_: kernelConf: kernelPatches: configfile: let config = let attrName = attr: "CONFIG_" + attr; in { isSet = attr: hasAttr (attrName attr) config; @@ -88,14 +89,14 @@ let installsFirmware = (config.isEnabled "FW_LOADER") && (isModular || (config.isDisabled "FIRMWARE_IN_KERNEL")) && - (stdenv.lib.versionOlder version "4.14"); + (lib.versionOlder version "4.14"); in (optionalAttrs isModular { outputs = [ "out" "dev" ]; }) // { passthru = { inherit version modDirVersion config kernelPatches configfile moduleBuildDependencies stdenv; inherit isXen isZen isHardened isLibre; - kernelOlder = stdenv.lib.versionOlder version; - kernelAtLeast = stdenv.lib.versionAtLeast version; + kernelOlder = lib.versionOlder version; + kernelAtLeast = lib.versionAtLeast version; }; inherit src; @@ -103,9 +104,9 @@ let patches = map (p: p.patch) kernelPatches # Required for deterministic builds along with some postPatch magic. - ++ optional (stdenv.lib.versionAtLeast version "4.13") ./randstruct-provide-seed.patch + ++ optional (lib.versionAtLeast version "4.13") ./randstruct-provide-seed.patch # Fixes determinism by normalizing metadata for the archive of kheaders - ++ optional (stdenv.lib.versionAtLeast version "5.2" && stdenv.lib.versionOlder version "5.4") ./gen-kheaders-metadata.patch; + ++ optional (lib.versionAtLeast version "5.2" && lib.versionOlder version "5.4") ./gen-kheaders-metadata.patch; prePatch = '' for mf in $(find -name Makefile -o -name Makefile.include -o -name install.sh); do @@ -170,7 +171,7 @@ let buildFlags = [ "KBUILD_BUILD_VERSION=1-NixOS" - platform.kernelTarget + kernelConf.target "vmlinux" # for "perf" and things like that ] ++ optional isModular "modules"; @@ -185,16 +186,16 @@ let ''; # Some image types need special install targets (e.g. uImage is installed with make uinstall) - installTargets = [ ( - if platform ? kernelInstallTarget then platform.kernelInstallTarget - else if platform.kernelTarget == "uImage" then "uinstall" - else if platform.kernelTarget == "zImage" || platform.kernelTarget == "Image.gz" then "zinstall" - else "install" - ) ]; + installTargets = [ + (kernelConf.installTarget or ( + /**/ if kernelConf.target == "uImage" then "uinstall" + else if kernelConf.target == "zImage" || kernelConf.target == "Image.gz" then "zinstall" + else "install")) + ]; postInstall = (optionalString installsFirmware '' mkdir -p $out/lib/firmware - '') + (if (platform ? kernelDTB && platform.kernelDTB) then '' + '') + (if (kernelConf.DTB or false) then '' make $makeFlags "''${makeFlagsArray[@]}" dtbs dtbs_install INSTALL_DTBS_PATH=$out/dtbs '' else "") + (if isModular then '' mkdir -p $dev @@ -282,9 +283,9 @@ let "The Linux kernel" + (if kernelPatches == [] then "" else " (with patches: " - + stdenv.lib.concatStringsSep ", " (map (x: x.name) kernelPatches) + + lib.concatStringsSep ", " (map (x: x.name) kernelPatches) + ")"); - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; homepage = "https://www.kernel.org/"; repositories.git = "https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git"; maintainers = [ @@ -296,10 +297,10 @@ let }; in -assert (stdenv.lib.versionAtLeast version "4.14" && stdenv.lib.versionOlder version "5.8") -> libelf != null; -assert stdenv.lib.versionAtLeast version "5.8" -> elfutils != null; +assert (lib.versionAtLeast version "4.14" && lib.versionOlder version "5.8") -> libelf != null; +assert lib.versionAtLeast version "5.8" -> elfutils != null; -stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.platform kernelPatches configfile) // { +stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.linux-kernel kernelPatches configfile) // { pname = "linux"; inherit version; @@ -307,12 +308,12 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.platform kernelPatches depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr gawk zstd ] - ++ optional (stdenv.hostPlatform.platform.kernelTarget == "uImage") buildPackages.ubootTools - ++ optional (stdenv.lib.versionAtLeast version "4.14" && stdenv.lib.versionOlder version "5.8") libelf + ++ optional (stdenv.hostPlatform.linux-kernel.target == "uImage") buildPackages.ubootTools + ++ optional (lib.versionAtLeast version "4.14" && lib.versionOlder version "5.8") libelf # Removed util-linuxMinimal since it should not be a dependency. - ++ optionals (stdenv.lib.versionAtLeast version "4.16") [ bison flex ] - ++ optional (stdenv.lib.versionAtLeast version "5.2") cpio - ++ optional (stdenv.lib.versionAtLeast version "5.8") elfutils + ++ optionals (lib.versionAtLeast version "4.16") [ bison flex ] + ++ optional (lib.versionAtLeast version "5.2") cpio + ++ optional (lib.versionAtLeast version "5.8") elfutils ; hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" "pie" ]; @@ -321,10 +322,10 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.platform kernelPatches makeFlags = commonMakeFlags ++ [ "CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" "HOSTCC=${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc" - "ARCH=${stdenv.hostPlatform.platform.kernelArch}" - ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ + "ARCH=${stdenv.hostPlatform.linuxArch}" + ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ "CROSS_COMPILE=${stdenv.cc.targetPrefix}" ]; - karch = stdenv.hostPlatform.platform.kernelArch; + karch = stdenv.hostPlatform.linuxArch; }) diff --git a/pkgs/os-specific/linux/kernel/mptcp-config.nix b/pkgs/os-specific/linux/kernel/mptcp-config.nix index 9752e63d9f9..59b11167ac2 100644 --- a/pkgs/os-specific/linux/kernel/mptcp-config.nix +++ b/pkgs/os-specific/linux/kernel/mptcp-config.nix @@ -1,5 +1,5 @@ -{ stdenv }: -with stdenv.lib.kernel; +{ lib }: +with lib.kernel; { # DRM_AMDGPU = yes; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 6b1568013b9..f41cedca0f6 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -1,6 +1,19 @@ { lib, fetchpatch, fetchurl }: { + ath_regd_optional = rec { + name = "ath_regd_optional"; + patch = fetchpatch { + name = name + ".patch"; + url = "https://github.com/openwrt/openwrt/raw/ed2015c38617ed6624471e77f27fbb0c58c8c660/package/kernel/mac80211/patches/ath/402-ath_regd_optional.patch"; + sha256 = "1ssDXSweHhF+pMZyd6kSrzeW60eb6MO6tlf0il17RC0="; + postFetch = '' + sed -i 's/CPTCFG_/CONFIG_/g' $out + sed -i '/--- a\/local-symbols/,$d' $out + ''; + }; + }; + bridge_stp_helper = { name = "bridge-stp-helper"; patch = ./bridge-stp-helper.patch; @@ -33,11 +46,6 @@ cpu-cgroup-v2 = import ./cpu-cgroup-v2-patches; - tag_hardened = { - name = "tag-hardened"; - patch = ./hardened/tag-hardened.patch; - }; - hardened = let mkPatch = kernelVersion: src: { name = lib.removeSuffix ".patch" src.name; @@ -84,17 +92,6 @@ patch = ./rtl8761b-support.patch; }; - export_kernel_fpu_functions = { - "4.14" = { - name = "export_kernel_fpu_functions"; - patch = ./export_kernel_fpu_functions_4_14.patch; - }; - "5.3" = { - name = "export_kernel_fpu_functions"; - patch = ./export_kernel_fpu_functions_5_3.patch; - }; - }; - export-rt-sched-migrate = { name = "export-rt-sched-migrate"; patch = ./export-rt-sched-migrate.patch; diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index a3558244297..b28e1659083 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -1,5 +1,5 @@ { lib, stdenv, kernel, elfutils, python2, python3, perl, newt, slang, asciidoc, xmlto, makeWrapper -, docbook_xsl, docbook_xml_dtd_45, libxslt, flex, bison, pkgconfig, libunwind, binutils +, docbook_xsl, docbook_xml_dtd_45, libxslt, flex, bison, pkg-config, libunwind, binutils , libiberty, audit, libbfd, libopcodes, openssl, systemtap, numactl , zlib, withGtk ? false, gtk2 ? null }: @@ -36,12 +36,12 @@ stdenv.mkDerivation { # perf refers both to newt and slang nativeBuildInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt - flex bison libiberty audit makeWrapper pkgconfig python3 + flex bison libiberty audit makeWrapper pkg-config python3 ]; buildInputs = [ elfutils newt slang libunwind libbfd zlib openssl systemtap.stapBuild numactl libopcodes python3 perl - ] ++ stdenv.lib.optional withGtk gtk2 + ] ++ lib.optional withGtk gtk2 ++ (if (versionAtLeast kernel.version "4.19") then [ python3 ] else [ python2 ]); # Note: we don't add elfutils to buildInputs, since it provides a @@ -72,7 +72,7 @@ stdenv.mkDerivation { meta = { homepage = "https://perf.wiki.kernel.org/"; description = "Linux tools to profile with performance counters"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/os-specific/linux/keyutils/default.nix b/pkgs/os-specific/linux/keyutils/default.nix index 81d37d14d9d..71f708e210d 100644 --- a/pkgs/os-specific/linux/keyutils/default.nix +++ b/pkgs/os-specific/linux/keyutils/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ./conf-symlink.patch ]; - makeFlags = stdenv.lib.optionals stdenv.hostPlatform.isStatic "NO_SOLIB=1"; + makeFlags = lib.optionals stdenv.hostPlatform.isStatic "NO_SOLIB=1"; BUILDDATE = "1970-01-01"; outputs = [ "out" "lib" "dev" ]; diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix index 55faa216a12..dc96f3b6a62 100644 --- a/pkgs/os-specific/linux/klibc/default.nix +++ b/pkgs/os-specific/linux/klibc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, linuxHeaders, perl }: +{ lib, stdenv, fetchurl, buildPackages, linuxHeaders, perl }: let commonMakeFlags = [ @@ -18,17 +18,19 @@ stdenv.mkDerivation rec { patches = [ ./no-reinstall-kernel-headers.patch ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ perl ]; + strictDeps = true; hardeningDisable = [ "format" "stackprotector" ]; makeFlags = commonMakeFlags ++ [ - "KLIBCARCH=${stdenv.hostPlatform.platform.kernelArch}" + "KLIBCARCH=${stdenv.hostPlatform.linuxArch}" "KLIBCKERNELSRC=${linuxHeaders}" ] # TODO(@Ericson2314): We now can get the ABI from # `stdenv.hostPlatform.parsed.abi`, is this still a good idea? - ++ stdenv.lib.optional (stdenv.hostPlatform.platform.kernelArch == "arm") "CONFIG_AEABI=y" - ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "CROSS_COMPILE=${stdenv.cc.targetPrefix}"; + ++ lib.optional (stdenv.hostPlatform.linuxArch == "arm") "CONFIG_AEABI=y" + ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "CROSS_COMPILE=${stdenv.cc.targetPrefix}"; # Install static binaries as well. postInstall = '' diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix index 9feb4fe9821..ef8296cf16f 100644 --- a/pkgs/os-specific/linux/kmod/default.nix +++ b/pkgs/os-specific/linux/kmod/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, autoreconfHook, pkgconfig +{ stdenv, lib, fetchurl, autoreconfHook, pkg-config , libxslt, xz, elf-header , withStatic ? stdenv.hostPlatform.isStatic }: @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { sha256 = "035wzfzjx4nwidk747p8n085mgkvy531ppn16krrajx2dkqzply1"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig libxslt ]; + nativeBuildInputs = [ autoreconfHook pkg-config libxslt ]; buildInputs = [ xz ] ++ lib.optional stdenv.isDarwin elf-header; configureFlags = [ diff --git a/pkgs/os-specific/linux/kmscon/default.nix b/pkgs/os-specific/linux/kmscon/default.nix index ee6a108301b..f48895fc017 100644 --- a/pkgs/os-specific/linux/kmscon/default.nix +++ b/pkgs/os-specific/linux/kmscon/default.nix @@ -8,7 +8,7 @@ , libGLU, libGL , pango , pixman -, pkgconfig +, pkg-config , docbook_xsl , libxslt }: @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook docbook_xsl - pkgconfig + pkg-config ]; configureFlags = [ diff --git a/pkgs/os-specific/linux/kmscube/default.nix b/pkgs/os-specific/linux/kmscube/default.nix index 147b82c82bf..6db3a9583ec 100644 --- a/pkgs/os-specific/linux/kmscube/default.nix +++ b/pkgs/os-specific/linux/kmscube/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, autoreconfHook, libdrm, libX11, libGL, mesa, pkgconfig }: +{ lib, stdenv, fetchgit, autoreconfHook, libdrm, libX11, libGL, mesa, pkg-config }: stdenv.mkDerivation { name = "kmscube-2018-06-17"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1q5b5yvyfj3127385mp1bfmcbnpnbdswdk8gspp7g4541xk4k933"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libdrm libX11 libGL mesa ]; meta = with lib; { diff --git a/pkgs/os-specific/linux/latencytop/default.nix b/pkgs/os-specific/linux/latencytop/default.nix index 40095e543b4..30ec6cdc7b5 100644 --- a/pkgs/os-specific/linux/latencytop/default.nix +++ b/pkgs/os-specific/linux/latencytop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, glib, pkgconfig, gtk2 }: +{ lib, stdenv, fetchurl, ncurses, glib, pkg-config, gtk2 }: stdenv.mkDerivation rec { name = "latencytop-0.5"; @@ -12,14 +12,14 @@ stdenv.mkDerivation rec { sha256 = "1vq3j9zdab6njly2wp900b3d5244mnxfm88j2bkiinbvxbxp4zwy"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses glib gtk2 ]; meta = { homepage = "http://latencytop.org"; description = "Tool to show kernel reports on latencies (LATENCYTOP option)"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.viric ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.viric ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/ldm/default.nix b/pkgs/os-specific/linux/ldm/default.nix index 352ce535337..072b53b02ec 100644 --- a/pkgs/os-specific/linux/ldm/default.nix +++ b/pkgs/os-specific/linux/ldm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, udev, util-linux, mountPath ? "/media/" }: +{ lib, stdenv, fetchgit, udev, util-linux, mountPath ? "/media/" }: assert mountPath != ""; @@ -35,9 +35,9 @@ stdenv.mkDerivation rec { meta = { description = "A lightweight device mounter, with libudev as only dependency"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; repositories.git = git; }; } diff --git a/pkgs/os-specific/linux/libaio/default.nix b/pkgs/os-specific/linux/libaio/default.nix index b9aa6b5de56..8cbc8466a91 100644 --- a/pkgs/os-specific/linux/libaio/default.nix +++ b/pkgs/os-specific/linux/libaio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch }: +{ lib, stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { version = "0.3.112"; @@ -18,18 +18,18 @@ stdenv.mkDerivation rec { ''; makeFlags = [ - "prefix=${placeholder ''out''}" + "prefix=${placeholder "out"}" ]; - hardeningDisable = stdenv.lib.optional (stdenv.isi686) "stackprotector"; + hardeningDisable = lib.optional (stdenv.isi686) "stackprotector"; checkTarget = "partcheck"; # "check" needs root meta = { description = "Library for asynchronous I/O in Linux"; homepage = "http://lse.sourceforge.net/io/aio.html"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.lgpl21; - maintainers = with stdenv.lib.maintainers; [ ]; + platforms = lib.platforms.linux; + license = lib.licenses.lgpl21; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/os-specific/linux/libatasmart/default.nix b/pkgs/os-specific/linux/libatasmart/default.nix index 5060df1638b..c422f5e01bb 100644 --- a/pkgs/os-specific/linux/libatasmart/default.nix +++ b/pkgs/os-specific/linux/libatasmart/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, udev, buildPackages }: +{ lib, stdenv, fetchurl, pkg-config, udev, buildPackages }: stdenv.mkDerivation rec { name = "libatasmart-0.19"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ udev ]; meta = with lib; { diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/pkgs/os-specific/linux/libbpf/default.nix index c454fc5f3b1..2e497584fab 100644 --- a/pkgs/os-specific/linux/libbpf/default.nix +++ b/pkgs/os-specific/linux/libbpf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig +{ lib, stdenv, fetchFromGitHub, pkg-config , libelf, zlib , fetchpatch }: @@ -31,14 +31,14 @@ stdenv.mkDerivation rec { --replace '/bin/rm' 'rm' ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libelf zlib ]; sourceRoot = "source/src"; enableParallelBuilding = true; makeFlags = [ "PREFIX=$(out)" ]; - # FIXME: Multi-output requires some fixes to the way the pkgconfig file is + # FIXME: Multi-output requires some fixes to the way the pkg-config file is # constructed (it gets put in $out instead of $dev for some reason, with # improper paths embedded). Don't enable it for now. diff --git a/pkgs/os-specific/linux/libcap-ng/default.nix b/pkgs/os-specific/linux/libcap-ng/default.nix index 27f4ddcce18..615f376d79d 100644 --- a/pkgs/os-specific/linux/libcap-ng/default.nix +++ b/pkgs/os-specific/linux/libcap-ng/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, swig ? null, python2 ? null, python3 ? null }: +{ lib, stdenv, fetchurl, swig ? null, python2 ? null, python3 ? null }: assert python2 != null || python3 != null -> swig != null; @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "libcap-ng"; # When updating make sure to test that the version with # all of the python bindings still works - version = "0.8"; + version = "0.8.2"; src = fetchurl { url = "${meta.homepage}/${pname}-${version}.tar.gz"; - sha256 = "08cy59iassiwbmfxa5v0kb374r80290vv32f5q1mnip11av26kgi"; + sha256 = "1sasp1n154aqy9fz0knlb966svm7xg1zjhg1vr4q839bgjvq7h2j"; }; nativeBuildInputs = [ swig ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { (if python3 != null then "--with-python3" else "--without-python3") ]; - meta = let inherit (stdenv.lib) platforms licenses; in { + meta = let inherit (lib) platforms licenses; in { description = "Library for working with POSIX capabilities"; homepage = "https://people.redhat.com/sgrubb/libcap-ng/"; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix index ab78a3a33d8..24e90118756 100644 --- a/pkgs/os-specific/linux/libcap/default.nix +++ b/pkgs/os-specific/linux/libcap/default.nix @@ -7,11 +7,11 @@ assert usePam -> pam != null; stdenv.mkDerivation rec { pname = "libcap"; - version = "2.44"; + version = "2.47"; src = fetchurl { url = "mirror://kernel/linux/libs/security/linux-privs/libcap2/${pname}-${version}.tar.xz"; - sha256 = "1qf80lifygbnxwvqjf8jz5j24n6fqqx4ixnkbf76xs2vrmcq664j"; + sha256 = "0jx0vjlfg1nzdjdrkrnbdkrqjx4l80vi9isf2qav7s4zbzs5s5mg"; }; patches = lib.optional isStatic ./no-shared-lib.patch; @@ -34,11 +34,8 @@ stdenv.mkDerivation rec { ]; prePatch = '' - # use relative bash path - substituteInPlace progs/capsh.c --replace "/bin/bash" "bash" - - # ensure capsh can find bash in $PATH - substituteInPlace progs/capsh.c --replace execve execvpe + # use full path to bash + substituteInPlace progs/capsh.c --replace "/bin/bash" "${stdenv.shell}" # set prefixes substituteInPlace Make.Rules \ @@ -55,7 +52,7 @@ stdenv.mkDerivation rec { ${lib.optionalString (!isStatic) ''rm "$lib"/lib/*.a''} mkdir -p "$doc/share/doc/${pname}-${version}" cp License "$doc/share/doc/${pname}-${version}/" - '' + stdenv.lib.optionalString usePam '' + '' + lib.optionalString usePam '' mkdir -p "$pam/lib/security" mv "$lib"/lib/security "$pam/lib" ''; @@ -63,7 +60,7 @@ stdenv.mkDerivation rec { meta = { description = "Library for working with POSIX capabilities"; homepage = "https://sites.google.com/site/fullycapable"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.bsd3; + platforms = lib.platforms.linux; + license = lib.licenses.bsd3; }; } diff --git a/pkgs/os-specific/linux/libcgroup/default.nix b/pkgs/os-specific/linux/libcgroup/default.nix index 4d93c3bb4fe..b43d70f21bb 100644 --- a/pkgs/os-specific/linux/libcgroup/default.nix +++ b/pkgs/os-specific/linux/libcgroup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pam, yacc, flex }: +{ lib, stdenv, fetchurl, fetchpatch, pam, yacc, flex }: stdenv.mkDerivation rec { pname = "libcgroup"; @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { meta = { description = "Library and tools to manage Linux cgroups"; homepage = "http://libcg.sourceforge.net/"; - license = stdenv.lib.licenses.lgpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = lib.licenses.lgpl2; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.thoughtpolice ]; }; } diff --git a/pkgs/os-specific/linux/libevdevc/default.nix b/pkgs/os-specific/linux/libevdevc/default.nix index cb21eeaa753..2417ef6da9d 100644 --- a/pkgs/os-specific/linux/libevdevc/default.nix +++ b/pkgs/os-specific/linux/libevdevc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, coreutils, pkgconfig, glib, jsoncpp }: +{ lib, stdenv, fetchFromGitHub, coreutils, pkg-config, glib, jsoncpp }: stdenv.mkDerivation rec { name = "libevdevc"; diff --git a/pkgs/os-specific/linux/libfabric/default.nix b/pkgs/os-specific/linux/libfabric/default.nix index f6171220fb6..b1ed0a72405 100644 --- a/pkgs/os-specific/linux/libfabric/default.nix +++ b/pkgs/os-specific/linux/libfabric/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, libpsm2 }: +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, libpsm2 }: stdenv.mkDerivation rec { pname = "libfabric"; - version = "1.11.1"; + version = "1.11.2"; enableParallelBuilding = true; @@ -10,10 +10,10 @@ stdenv.mkDerivation rec { owner = "ofiwg"; repo = pname; rev = "v${version}"; - sha256 = "17qq96mlfhbkbmsvbazhxzkjnh6x37xlh3r0ngp0rfqbl05z2pcr"; + sha256 = "sha256-Xy7A1hjz4O13bMZ0RbOuxEzVkVW5+WKC+MOH5rcGzH0="; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ] ; + nativeBuildInputs = [ pkg-config autoreconfHook ] ; buildInputs = [ libpsm2 ] ; diff --git a/pkgs/os-specific/linux/libgestures/default.nix b/pkgs/os-specific/linux/libgestures/default.nix index 9aaa1c2bce6..bface8118be 100644 --- a/pkgs/os-specific/linux/libgestures/default.nix +++ b/pkgs/os-specific/linux/libgestures/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, glib, jsoncpp }: +{ lib, stdenv, fetchFromGitHub, pkg-config, glib, jsoncpp }: stdenv.mkDerivation rec { name = "libgestures-${version}"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { --replace '$(DESTDIR)/usr/include' '$(DESTDIR)/include' ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib jsoncpp ]; diff --git a/pkgs/os-specific/linux/libnl/default.nix b/pkgs/os-specific/linux/libnl/default.nix index 551352fa46c..b7d08344e40 100644 --- a/pkgs/os-specific/linux/libnl/default.nix +++ b/pkgs/os-specific/linux/libnl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, file, lib, fetchFromGitHub, autoreconfHook, bison, flex, pkgconfig +{ stdenv, file, lib, fetchFromGitHub, autoreconfHook, bison, flex, pkg-config , pythonSupport ? false, swig ? null, python}: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ autoreconfHook bison flex pkgconfig file ] + nativeBuildInputs = [ autoreconfHook bison flex pkg-config file ] ++ lib.optional pythonSupport swig; postBuild = lib.optionalString (pythonSupport) '' diff --git a/pkgs/os-specific/linux/libpsm2/default.nix b/pkgs/os-specific/linux/libpsm2/default.nix index b7163617ce5..1ac4580b13f 100644 --- a/pkgs/os-specific/linux/libpsm2/default.nix +++ b/pkgs/os-specific/linux/libpsm2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, numactl, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, numactl, pkg-config }: stdenv.mkDerivation rec { pname = "libpsm2"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ numactl pkgconfig ]; + buildInputs = [ numactl pkg-config ]; installFlags = [ "DESTDIR=$(out)" diff --git a/pkgs/os-specific/linux/libratbag/default.nix b/pkgs/os-specific/linux/libratbag/default.nix index 2a52e72cc91..14773d69440 100644 --- a/pkgs/os-specific/linux/libratbag/default.nix +++ b/pkgs/os-specific/linux/libratbag/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config , glib, systemd, udev, libevdev, gitMinimal, check, valgrind, swig, python3 , json-glib, libunistring }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - meson ninja pkgconfig gitMinimal swig check valgrind + meson ninja pkg-config gitMinimal swig check valgrind ]; buildInputs = [ diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix index 4dfd6a3f2cd..6582c6d8e8d 100644 --- a/pkgs/os-specific/linux/libselinux/default.nix +++ b/pkgs/os-specific/linux/libselinux/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, pcre, pkgconfig, libsepol +{ lib, stdenv, fetchurl, pcre, pkg-config, libsepol , enablePython ? true, swig ? null, python3 ? null , fts }: assert enablePython -> swig != null && python3 != null; -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "libselinux"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "0cr4p0qkr4qd5z1x677vwhz6mlz55kxyijwi2dmrvbhxcw7v78if"; }; - nativeBuildInputs = [ pkgconfig ] ++ optionals enablePython [ swig python3 ]; + nativeBuildInputs = [ pkg-config ] ++ optionals enablePython [ swig python3 ]; buildInputs = [ libsepol pcre fts ] ++ optionals enablePython [ python3 ]; # drop fortify here since package uses it by default, leading to compile error: @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { "SBINDIR=$(bin)/sbin" "SHLIBDIR=$(out)/lib" - "LIBSEPOLA=${stdenv.lib.getLib libsepol}/lib/libsepol.a" + "LIBSEPOLA=${lib.getLib libsepol}/lib/libsepol.a" ]; preInstall = '' diff --git a/pkgs/os-specific/linux/libsemanage/default.nix b/pkgs/os-specific/linux/libsemanage/default.nix index 70b2508451b..d7255ac4587 100644 --- a/pkgs/os-specific/linux/libsemanage/default.nix +++ b/pkgs/os-specific/linux/libsemanage/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, pkgconfig, bison, flex, libsepol, libselinux, bzip2, audit +{ lib, stdenv, fetchurl, pkg-config, bison, flex, libsepol, libselinux, bzip2, audit , enablePython ? true, swig ? null, python ? null }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "libsemanage"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" ] ++ optional enablePython "py"; - nativeBuildInputs = [ bison flex pkgconfig ]; + nativeBuildInputs = [ bison flex pkg-config ]; buildInputs = [ libsepol libselinux bzip2 audit ] ++ optionals enablePython [ swig python ]; @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { meta = removeAttrs libsepol.meta ["outputsToInstall"] // { description = "Policy management tools for SELinux"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; }; } diff --git a/pkgs/os-specific/linux/libsepol/default.nix b/pkgs/os-specific/linux/libsepol/default.nix index f5a190718bf..12a94d6fc42 100644 --- a/pkgs/os-specific/linux/libsepol/default.nix +++ b/pkgs/os-specific/linux/libsepol/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { homepage = "http://userspace.selinuxproject.org"; platforms = platforms.linux; maintainers = [ maintainers.phreedom ]; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/os-specific/linux/libsmbios/default.nix b/pkgs/os-specific/linux/libsmbios/default.nix index 108568d0b51..46d0e94bb14 100644 --- a/pkgs/os-specific/linux/libsmbios/default.nix +++ b/pkgs/os-specific/linux/libsmbios/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, help2man, gettext +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, help2man, gettext , libxml2, perl, python3, doxygen }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0krwwydyvb9224r884y1mlmzyxhlfrcqw73vi1j8787rl0gl5a2i"; }; - nativeBuildInputs = [ autoreconfHook doxygen gettext libxml2 help2man perl pkgconfig ]; + nativeBuildInputs = [ autoreconfHook doxygen gettext libxml2 help2man perl pkg-config ]; buildInputs = [ python3 ]; diff --git a/pkgs/os-specific/linux/light/default.nix b/pkgs/os-specific/linux/light/default.nix index b465b2243e1..995381c5340 100644 --- a/pkgs/os-specific/linux/light/default.nix +++ b/pkgs/os-specific/linux/light/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, coreutils }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, coreutils }: stdenv.mkDerivation rec { version = "1.2.2"; @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { meta = { description = "GNU/Linux application to control backlights"; homepage = "https://haikarainen.github.io/light/"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ puffnfresh dtzWill ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ puffnfresh dtzWill ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/lightum/default.nix b/pkgs/os-specific/linux/lightum/default.nix index 3c37b66d231..ec56a89ce88 100644 --- a/pkgs/os-specific/linux/lightum/default.nix +++ b/pkgs/os-specific/linux/lightum/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, libX11, libXScrnSaver, libXext, glib, dbus, pkgconfig, systemd }: +{ lib, stdenv, fetchgit, libX11, libXScrnSaver, libXext, glib, dbus, pkg-config, systemd }: stdenv.mkDerivation { name = "lightum-2014-06-07"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { libX11 libXScrnSaver libXext - pkgconfig + pkg-config systemd ]; @@ -31,8 +31,8 @@ stdenv.mkDerivation { meta = { description = "MacBook automatic light sensor daemon"; homepage = "https://github.com/poliva/lightum"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ puffnfresh ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ puffnfresh ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/linuxptp/default.nix b/pkgs/os-specific/linux/linuxptp/default.nix index c9de5f874a3..4f58c9f3f2a 100644 --- a/pkgs/os-specific/linux/linuxptp/default.nix +++ b/pkgs/os-specific/linux/linuxptp/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { description = "Implementation of the Precision Time Protocol (PTP) according to IEEE standard 1588 for Linux"; homepage = "http://linuxptp.sourceforge.net/"; maintainers = [ maintainers.markuskowa ]; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/lm-sensors/default.nix b/pkgs/os-specific/linux/lm-sensors/default.nix index 7bde5bd84a7..915609e8868 100644 --- a/pkgs/os-specific/linux/lm-sensors/default.nix +++ b/pkgs/os-specific/linux/lm-sensors/default.nix @@ -7,7 +7,7 @@ assert sensord -> rrdtool != null; stdenv.mkDerivation rec { pname = "lm-sensors"; version = "3.6.0"; - dashedVersion = stdenv.lib.replaceStrings ["."] ["-"] version; + dashedVersion = lib.replaceStrings ["."] ["-"] version; src = fetchzip { url = "https://github.com/lm-sensors/lm-sensors/archive/V${dashedVersion}.tar.gz"; @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ bison flex which ]; buildInputs = [ perl ] - ++ stdenv.lib.optional sensord rrdtool; + ++ lib.optional sensord rrdtool; makeFlags = [ "PREFIX=${placeholder "out"}" "ETCDIR=${placeholder "out"}/etc" "CC=${stdenv.cc.targetPrefix}cc" "AR=${stdenv.cc.targetPrefix}ar" - ] ++ stdenv.lib.optional sensord "PROG_EXTRA=sensord"; + ] ++ lib.optional sensord "PROG_EXTRA=sensord"; meta = with lib; { homepage = "https://hwmon.wiki.kernel.org/lm_sensors"; diff --git a/pkgs/os-specific/linux/lockdep/default.nix b/pkgs/os-specific/linux/lockdep/default.nix index 2e9003c3f92..190941b1633 100644 --- a/pkgs/os-specific/linux/lockdep/default.nix +++ b/pkgs/os-specific/linux/lockdep/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bash, flex, bison, valgrind }: +{ lib, stdenv, fetchurl, bash, flex, bison, valgrind }: stdenv.mkDerivation rec { pname = "lockdep"; @@ -54,8 +54,8 @@ stdenv.mkDerivation rec { meta = { description = "Userspace locking validation tool built on the Linux kernel"; homepage = "https://kernel.org/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.thoughtpolice ]; }; } diff --git a/pkgs/os-specific/linux/lsiutil/default.nix b/pkgs/os-specific/linux/lsiutil/default.nix index da45e202c02..4cb70faee96 100644 --- a/pkgs/os-specific/linux/lsiutil/default.nix +++ b/pkgs/os-specific/linux/lsiutil/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: let @@ -8,14 +8,14 @@ let name = "lsiutil-${version}.zip"; url = "http://www.lsi.com/DistributionSystem/AssetDocument/support/downloads/hbas/fibre_channel/hardware_drivers/LSIUtil%20Kit_${version}.zip"; sha256 = "1d4337faa56e24f7d98db87b9de94d6e2c17ab671f4e301b93833eea08b9e426"; - }; + }; in stdenv.mkDerivation { pname = "lsiutils"; inherit version; - + srcs = [ src "Source/lsiutil.tar.gz" ]; buildInputs = [ unzip ]; @@ -32,10 +32,10 @@ stdenv.mkDerivation { ''; installPhase = "true"; - + meta = { homepage = "http://www.lsi.com/"; description = "LSI Logic Fusion MPT command line management tool"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; }; } diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index a7666cc6a7f..3db9c5e9eb6 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchpatch , fetchurl -, pkgconfig +, pkg-config , util-linux , libuuid , thin-provisioning-tools, libaio @@ -15,15 +15,15 @@ assert enableDmeventd -> enableCmdlib; stdenv.mkDerivation rec { - pname = "lvm2" + stdenv.lib.optionalString enableDmeventd "with-dmeventd"; - version = "2.03.10"; + pname = "lvm2" + lib.optionalString enableDmeventd "with-dmeventd"; + version = "2.03.11"; src = fetchurl { url = "https://mirrors.kernel.org/sourceware/lvm2/LVM2.${version}.tgz"; - sha256 = "1l0fkn9abrgk5mfn6jfh9qhdr86b59l1c5pk6lp8jh0491d69las"; + sha256 = "1m4xpda8vbyd89ca0w8nacvnl4j34yzsa625gn990fb5sh84ab44"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ udev libuuid thin-provisioning-tools libaio ]; configureFlags = [ @@ -32,20 +32,20 @@ stdenv.mkDerivation rec { "--with-default-locking-dir=/run/lock/lvm" "--with-default-run-dir=/run/lvm" "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" - ] ++ stdenv.lib.optionals (!enableCmdlib) [ + ] ++ lib.optionals (!enableCmdlib) [ "--bindir=${placeholder "bin"}/bin" "--sbindir=${placeholder "bin"}/bin" "--libdir=${placeholder "lib"}/lib" - ] ++ stdenv.lib.optional enableCmdlib "--enable-cmdlib" - ++ stdenv.lib.optionals enableDmeventd [ + ] ++ lib.optional enableCmdlib "--enable-cmdlib" + ++ lib.optionals enableDmeventd [ "--enable-dmeventd" "--with-dmeventd-pidfile=/run/dmeventd/pid" "--with-default-dm-run-dir=/run/dmeventd" - ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "ac_cv_func_malloc_0_nonnull=yes" "ac_cv_func_realloc_0_nonnull=yes" ] ++ - stdenv.lib.optionals (udev != null) [ + lib.optionals (udev != null) [ "--enable-udev_rules" "--enable-udev_sync" ]; @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { ''; - patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [ + patches = lib.optionals stdenv.hostPlatform.isMusl [ (fetchpatch { name = "fix-stdio-usage.patch"; url = "https://git.alpinelinux.org/aports/plain/main/lvm2/fix-stdio-usage.patch?h=3.7-stable&id=31bd4a8c2dc00ae79a821f6fe0ad2f23e1534f50"; @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { doCheck = false; # requires root - makeFlags = stdenv.lib.optionals (udev != null) [ + makeFlags = lib.optionals (udev != null) [ "SYSTEMD_GENERATOR_DIR=$(out)/lib/systemd/system-generators" ]; @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { installFlags = [ "OWNER=" "GROUP=" "confdir=$(out)/etc" ]; # Install systemd stuff. - installTargets = [ "install" ] ++ stdenv.lib.optionals (udev != null) [ + installTargets = [ "install" ] ++ lib.optionals (udev != null) [ "install_systemd_generators" "install_systemd_units" "install_tmpfiles_configuration" @@ -107,12 +107,12 @@ stdenv.mkDerivation rec { "out" "dev" "man" - ] ++ stdenv.lib.optionals (enableCmdlib != true) [ + ] ++ lib.optionals (enableCmdlib != true) [ "bin" "lib" ]; - postInstall = stdenv.lib.optionalString (enableCmdlib != true) '' + postInstall = lib.optionalString (enableCmdlib != true) '' moveToOutput lib/libdevmapper.so $lib ''; diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index ade4299eaa7..e6bdd70b915 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, perl, docbook2x +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, perl, docbook2x , docbook_xml_dtd_45, python3Packages, pam # Optional Dependencies @@ -6,18 +6,18 @@ , libcap ? null, systemd ? null }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "lxc"; - version = "4.0.5"; + version = "4.0.6"; src = fetchurl { url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz"; - sha256 = "1976l9308rx1ria1gazasypk5rmmf5jiqdh54dfrws5bslbdcb5g"; + sha256 = "0qz4l7mlhq7hx53q606qgvkyzyr01glsw290v8ppzvxn1fydlrci"; }; nativeBuildInputs = [ - autoreconfHook pkgconfig perl docbook2x python3Packages.wrapPython + autoreconfHook pkg-config perl docbook2x python3Packages.wrapPython ]; buildInputs = [ pam libapparmor gnutls libselinux libseccomp libcap diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/os-specific/linux/lxcfs/default.nix index 8fdb72e060f..ab148af72f2 100644 --- a/pkgs/os-specific/linux/lxcfs/default.nix +++ b/pkgs/os-specific/linux/lxcfs/default.nix @@ -1,23 +1,23 @@ -{ config, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, help2man, fuse +{ config, lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, help2man, fuse , util-linux, makeWrapper , enableDebugBuild ? config.lxcfs.enableDebugBuild or false }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "lxcfs"; - version = "4.0.6"; + version = "4.0.7"; src = fetchFromGitHub { owner = "lxc"; repo = "lxcfs"; rev = "lxcfs-${version}"; - sha256 = "1fp2q4y3ql4xd2lp4bpcl8s6xryr5xbb56da9d20w2cdr2d0lwyv"; + sha256 = "sha256-gC1Q+kG/oKfYvuHVKstpRWfL/thsemULrimPrV/eeaI="; }; - nativeBuildInputs = [ pkgconfig help2man autoreconfHook ]; + nativeBuildInputs = [ pkg-config help2man autoreconfHook ]; buildInputs = [ fuse makeWrapper ]; - preConfigure = stdenv.lib.optionalString enableDebugBuild '' + preConfigure = lib.optionalString enableDebugBuild '' sed -i 's,#AM_CFLAGS += -DDEBUG,AM_CFLAGS += -DDEBUG,' Makefile.am ''; diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix index 6a319572cbe..935ded63709 100644 --- a/pkgs/os-specific/linux/mdadm/default.nix +++ b/pkgs/os-specific/linux/mdadm/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { "SYSTEMD_DIR=$(out)/lib/systemd/system" "MANDIR=$(out)/share/man" "RUN_DIR=/dev/.mdadm" "STRIP=" - ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "CROSS_COMPILE=${stdenv.cc.targetPrefix}" ]; diff --git a/pkgs/os-specific/linux/miraclecast/default.nix b/pkgs/os-specific/linux/miraclecast/default.nix index e2230da3d2c..8545d31c71a 100644 --- a/pkgs/os-specific/linux/miraclecast/default.nix +++ b/pkgs/os-specific/linux/miraclecast/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config , glib, readline, pcre, systemd, udev }: stdenv.mkDerivation { @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "05afqi33rv7k6pbkkw4mynj6p97vkzhhh13y5nh0yxkyhcgf45pm"; }; - nativeBuildInputs = [ meson ninja pkgconfig ]; + nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ glib pcre readline systemd udev ]; diff --git a/pkgs/os-specific/linux/multipath-tools/default.nix b/pkgs/os-specific/linux/multipath-tools/default.nix index 57c75210568..4784abc6c28 100644 --- a/pkgs/os-specific/linux/multipath-tools/default.nix +++ b/pkgs/os-specific/linux/multipath-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, perl, lvm2, libaio, gzip, readline, systemd, liburcu, json_c }: +{ lib, stdenv, fetchurl, pkg-config, perl, lvm2, libaio, gzip, readline, systemd, liburcu, json_c }: stdenv.mkDerivation rec { pname = "multipath-tools"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ]; postPatch = '' - substituteInPlace libmultipath/Makefile --replace /usr/include/libdevmapper.h ${stdenv.lib.getDev lvm2}/include/libdevmapper.h + substituteInPlace libmultipath/Makefile --replace /usr/include/libdevmapper.h ${lib.getDev lvm2}/include/libdevmapper.h sed -i -re ' s,^( *#define +DEFAULT_MULTIPATHDIR\>).*,\1 "'"$out/lib/multipath"'", ' libmultipath/defaults.h @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { $(find * -name Makefile\*) ''; - nativeBuildInputs = [ gzip pkgconfig perl ]; + nativeBuildInputs = [ gzip pkg-config perl ]; buildInputs = [ systemd lvm2 libaio readline liburcu json_c ]; makeFlags = [ diff --git a/pkgs/os-specific/linux/musl-fts/default.nix b/pkgs/os-specific/linux/musl-fts/default.nix new file mode 100644 index 00000000000..cdb1cca47c6 --- /dev/null +++ b/pkgs/os-specific/linux/musl-fts/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config }: + +stdenv.mkDerivation rec { + pname = "musl-fts"; + version = "1.2.7"; + + src = fetchFromGitHub { + owner = "void-linux"; + repo = "musl-fts"; + rev = "v${version}"; + sha256 = "Azw5qrz6OKDcpYydE6jXzVxSM5A8oYWAztrHr+O/DOE="; + }; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "https://github.com/void-linux/musl-fts"; + description = "An implementation of fts(3) for musl-libc"; + platforms = platforms.linux; + license = licenses.bsd3; + maintainers = [ maintainers.pjjw ]; + }; +} diff --git a/pkgs/os-specific/linux/musl-obstack/default.nix b/pkgs/os-specific/linux/musl-obstack/default.nix new file mode 100644 index 00000000000..f7682d37efd --- /dev/null +++ b/pkgs/os-specific/linux/musl-obstack/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config }: + +stdenv.mkDerivation rec { + pname = "musl-obstack"; + version = "1.2.2"; + + src = fetchFromGitHub { + owner = "void-linux"; + repo = "musl-obstack"; + rev = "v${version}"; + sha256 = "v0RTnrqAmJfOeGsJFc04lqFR8QZhYiLyvy8oRYiuC80="; + }; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "https://github.com/void-linux/musl-obstack"; + description = + "An extraction of the obstack functions and macros from GNU libiberty for use with musl-libc"; + platforms = platforms.linux; + license = licenses.lgpl21Plus; + maintainers = [ maintainers.pjjw ]; + }; +} diff --git a/pkgs/os-specific/linux/mwprocapture/default.nix b/pkgs/os-specific/linux/mwprocapture/default.nix index c5f293011db..c21cf2bb648 100644 --- a/pkgs/os-specific/linux/mwprocapture/default.nix +++ b/pkgs/os-specific/linux/mwprocapture/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, kernel, alsaLib }: +{ lib, stdenv, fetchurl, kernel, alsaLib }: -with stdenv.lib; +with lib; # The Magewell Pro Capture drivers are not supported for kernels older than 3.2 assert versionAtLeast kernel.version "3.2.0"; diff --git a/pkgs/os-specific/linux/mxu11x0/default.nix b/pkgs/os-specific/linux/mxu11x0/default.nix index 730b03e93fe..ac9f27e2e6b 100644 --- a/pkgs/os-specific/linux/mxu11x0/default.nix +++ b/pkgs/os-specific/linux/mxu11x0/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { sed -i -e 's|/lib/modules|${kernel.dev}/lib/modules|' driver/mxconf sed -i -e 's|/lib/modules|${kernel.dev}/lib/modules|' driver/Makefile ''; - + installPhase = '' install -v -D -m 644 ./driver/mxu11x0.ko "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/usb/serial/mxu11x0.ko" install -v -D -m 644 ./driver/mxu11x0.ko "$out/lib/modules/${kernel.modDirVersion}/misc/mxu11x0.ko" diff --git a/pkgs/os-specific/linux/ndiswrapper/default.nix b/pkgs/os-specific/linux/ndiswrapper/default.nix index 92da7f6fb82..2db046e6392 100644 --- a/pkgs/os-specific/linux/ndiswrapper/default.nix +++ b/pkgs/os-specific/linux/ndiswrapper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kernel, perl, kmod, libelf }: +{ lib, stdenv, fetchurl, kernel, perl, kmod, libelf }: let version = "1.63"; in @@ -41,6 +41,6 @@ stdenv.mkDerivation { homepage = "https://sourceforge.net/projects/ndiswrapper"; license = "GPL"; platforms = [ "i686-linux" "x86_64-linux" ]; - broken = stdenv.lib.versionAtLeast kernel.version "5.8"; + broken = lib.versionAtLeast kernel.version "5.8"; }; } diff --git a/pkgs/os-specific/linux/net-tools/default.nix b/pkgs/os-specific/linux/net-tools/default.nix index 9095b652b42..461a65c007b 100644 --- a/pkgs/os-specific/linux/net-tools/default.nix +++ b/pkgs/os-specific/linux/net-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "net-tools"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://net-tools.sourceforge.net/"; description = "A set of tools for controlling the network subsystem in Linux"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/net-tools/mptcp.nix b/pkgs/os-specific/linux/net-tools/mptcp.nix index a9f99874367..577b7c25311 100644 --- a/pkgs/os-specific/linux/net-tools/mptcp.nix +++ b/pkgs/os-specific/linux/net-tools/mptcp.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, nettools, fetchFromGitHub }: +{ lib, nettools, fetchFromGitHub }: nettools.overrideAttrs(oa: rec { name = "net-tools-mptcp"; diff --git a/pkgs/os-specific/linux/netatop/default.nix b/pkgs/os-specific/linux/netatop/default.nix index e433fd1e9f3..fb0a4eb7188 100644 --- a/pkgs/os-specific/linux/netatop/default.nix +++ b/pkgs/os-specific/linux/netatop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kernel, zlib }: +{ lib, stdenv, fetchurl, kernel, zlib }: let version = "3.1"; @@ -36,8 +36,8 @@ stdenv.mkDerivation { meta = { description = "Network monitoring module for atop"; homepage = "https://www.atoptool.nl/downloadnetatop.php"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [viric]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [viric]; }; } diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index 708430da397..c2d2996c54d 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, lib, pkgconfig, util-linux, libcap, libtirpc, libevent +{ stdenv, fetchurl, fetchpatch, lib, pkg-config, util-linux, libcap, libtirpc, libevent , sqlite, kerberos, kmod, libuuid, keyutils, lvm2, systemd, coreutils, tcp_wrappers , python3, buildPackages, nixosTests, rpcsvc-proto , enablePython ? true @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { # put it in the "lib" output, and the headers in "dev" outputs = [ "out" "dev" "lib" "man" ]; - nativeBuildInputs = [ pkgconfig buildPackages.stdenv.cc rpcsvc-proto ]; + nativeBuildInputs = [ pkg-config buildPackages.stdenv.cc rpcsvc-proto ]; buildInputs = [ libtirpc libcap libevent sqlite lvm2 diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix index b3625c22bec..bb5e3f51964 100644 --- a/pkgs/os-specific/linux/nftables/default.nix +++ b/pkgs/os-specific/linux/nftables/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, bison, file, flex +{ lib, stdenv, fetchurl, pkg-config, bison, file, flex , asciidoc, libxslt, findXMLCatalogs, docbook_xml_dtd_45, docbook_xsl , libmnl, libnftnl, libpcap , gmp, jansson, readline @@ -7,7 +7,7 @@ , withXtables ? false , iptables }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { version = "0.9.8"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig bison file flex + pkg-config bison file flex asciidoc docbook_xml_dtd_45 docbook_xsl findXMLCatalogs libxslt ]; diff --git a/pkgs/os-specific/linux/nixos-rebuild/default.nix b/pkgs/os-specific/linux/nixos-rebuild/default.nix new file mode 100644 index 00000000000..9fb7e366465 --- /dev/null +++ b/pkgs/os-specific/linux/nixos-rebuild/default.nix @@ -0,0 +1,22 @@ +{ substituteAll +, runtimeShell +, coreutils +, gnused +, gnugrep +, jq +, nix +, lib +}: +let + fallback = import ./../../../../nixos/modules/installer/tools/nix-fallback-paths.nix; +in +substituteAll { + name = "nixos-rebuild"; + src = ./nixos-rebuild.sh; + dir = "bin"; + isExecutable = true; + inherit runtimeShell nix; + nix_x86_64_linux = fallback.x86_64-linux; + nix_i686_linux = fallback.i686-linux; + path = lib.makeBinPath [ coreutils jq gnused gnugrep ]; +} diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index e452e24d263..e452e24d263 100644 --- a/nixos/modules/installer/tools/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh diff --git a/pkgs/os-specific/linux/numatop/default.nix b/pkgs/os-specific/linux/numatop/default.nix index a534ebaaac3..ba972bb6916 100644 --- a/pkgs/os-specific/linux/numatop/default.nix +++ b/pkgs/os-specific/linux/numatop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, numactl, ncurses, check }: +{ lib, stdenv, fetchurl, pkg-config, numactl, ncurses, check }: stdenv.mkDerivation rec { pname = "numatop"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1s7psq1xyswj0lpx10zg5lnppav2xy9safkfx3rssrs9c2fp5d76"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ numactl ncurses ]; checkInputs = [ check ]; diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index 5baa4aa51e5..70fc5126a93 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -20,7 +20,7 @@ buildPhase() { sysSrc=$(echo $kernel/lib/modules/$kernelVersion/source) sysOut=$(echo $kernel/lib/modules/$kernelVersion/build) unset src # used by the nv makefile - make SYSSRC=$sysSrc SYSOUT=$sysOut module -j$NIX_BUILD_CORES + make IGNORE_PREEMPT_RT_PRESENCE=1 SYSSRC=$sysSrc SYSOUT=$sysOut module -j$NIX_BUILD_CORES cd .. fi diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 4b0c060f9ce..73799a421ff 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -1,11 +1,17 @@ -{ lib, callPackage, fetchpatch, fetchurl, stdenv }: +{ lib, callPackage, fetchpatch, fetchurl, stdenv, pkgsi686Linux }: let - -generic = args: -if ((!lib.versionOlder args.version "391") + generic = args: let + imported = import ./generic.nix args; + in if ((!lib.versionOlder args.version "391") && stdenv.hostPlatform.system != "x86_64-linux") then null - else callPackage (import ./generic.nix args) { }; + else callPackage imported { + lib32 = (pkgsi686Linux.callPackage imported { + libsOnly = true; + kernel = null; + }).out; + }; + kernel = callPackage # a hacky way of extracting parameters from callPackage ({ kernel, libsOnly ? false }: if libsOnly then { } else kernel) { }; @@ -22,11 +28,10 @@ rec { # Policy: use the highest stable version as the default (on our master). stable = if stdenv.hostPlatform.system == "x86_64-linux" then generic { - version = "460.32.03"; - sha256_64bit = "0qb0f8djys55b7qgvpbwafw5lkwvmcslqz3i2kr3jm354gy248ag"; - settingsVersion = "460.27.04"; - settingsSha256 = "1z9ibkhyjqzhhzi3gj88f5jlpc1d76jsncsy6wxpnbdbak8ljkw5"; - persistencedSha256 = "1zrnmwlwqg3pgy1jvldy9iv994wr823rl7vjr1kqnngdmn7bflxl"; + version = "460.39"; + sha256_64bit = "0zx3v4xas9z18yv1z3irp626h8kvcg8aw344sqpacfh1g106dw0b"; + settingsSha256 = "15fa6lmfmgg02gya47ynx5d7cqsb73w4rbg4ly7lc1pnwl5f9qhm"; + persistencedSha256 = "1dj3w03fa1i32c9c7w9392bg3nr2dk8mm4qm0wv12cv587zml0gx"; } else legacy_390; @@ -94,6 +99,6 @@ rec { ''; in applyPatches [ "fix-typos" ]; patches = maybePatch_drm_legacy; - broken = stdenv.lib.versionAtLeast kernel.version "4.18"; + broken = lib.versionAtLeast kernel.version "4.18"; }; } diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index 1587ad06bc3..75453d955ad 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -25,9 +25,11 @@ , # don't include the bundled 32-bit libraries on 64-bit platforms, # even if it’s in downloaded binary disable32Bit ? false + # 32 bit libs only version of this package +, lib32 ? null }: -with stdenv.lib; +with lib; assert !libsOnly -> kernel != null; assert versionOlder version "391" -> sha256_32bit != null; @@ -93,6 +95,8 @@ let }; persistenced = mapNullable (hash: callPackage (import ./persistenced.nix self hash) { }) persistencedSha256; inherit persistencedVersion settingsVersion; + } // optionalAttrs (!i686bundled) { + inherit lib32; }; meta = with lib; { diff --git a/pkgs/os-specific/linux/nvidia-x11/nvidia-setttings-parallel-build.patch b/pkgs/os-specific/linux/nvidia-x11/nvidia-setttings-parallel-build.patch new file mode 100644 index 00000000000..ed3fe7b6d6d --- /dev/null +++ b/pkgs/os-specific/linux/nvidia-x11/nvidia-setttings-parallel-build.patch @@ -0,0 +1,12 @@ +diff --git a/src/Makefile b/src/Makefile +index acbb1b8..fe97103 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -242,6 +242,7 @@ endif + + define BINARY_DATA_HEADER_RULE + $$(OUTPUTDIR)/$(notdir $(1)).h: ++ $(at_if_quiet)$(MKDIR) $$(OUTPUTDIR) + $(at_if_quiet){ \ + $$(PRINTF) "extern const char _binary_$(subst .,_,$(notdir $(1)))_start[];\n"; \ + $$(PRINTF) "extern const char _binary_$(subst .,_,$(notdir $(1)))_end[];\n"; \ diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix index 4076a27ffc2..f75e3aff173 100644 --- a/pkgs/os-specific/linux/nvidia-x11/settings.nix +++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix @@ -1,6 +1,6 @@ nvidia_x11: sha256: -{ stdenv, lib, fetchFromGitHub, pkgconfig, m4, jansson, gtk2, dbus, gtk3, libXv, libXrandr, libXext, libXxf86vm, libvdpau +{ stdenv, lib, fetchFromGitHub, pkg-config, m4, jansson, gtk2, dbus, gtk3, libXv, libXrandr, libXext, libXxf86vm, libvdpau , librsvg, wrapGAppsHook , withGtk2 ? false, withGtk3 ? true }: @@ -45,7 +45,13 @@ stdenv.mkDerivation { version = nvidia_x11.settingsVersion; inherit src; - nativeBuildInputs = [ pkgconfig m4 ]; + patches = [ + # Fix a race condition in parallel builds. + # https://github.com/NVIDIA/nvidia-settings/issues/59#issuecomment-770302032 + ./nvidia-setttings-parallel-build.patch + ]; + + nativeBuildInputs = [ pkg-config m4 ]; buildInputs = [ jansson libXv libXrandr libXext libXxf86vm libvdpau nvidia_x11 gtk2 dbus ] ++ lib.optionals withGtk3 [ gtk3 librsvg wrapGAppsHook ]; diff --git a/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix b/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix index c74810d24d5..cb5719c31a2 100644 --- a/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix +++ b/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildGoModule , fetchFromGitHub , go-md2man @@ -10,15 +10,14 @@ buildGoModule rec { pname = "oci-seccomp-bpf-hook"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "containers"; repo = "oci-seccomp-bpf-hook"; rev = "v${version}"; - sha256 = "143x4daixzhhhpli1l14r7dr7dn3q42w8dddr16jzhhwighsirqw"; + sha256 = "0zbrpv6j4gd4l36zl2dljazdm85qlqwchf0xvmnaywcj8c8b49xw"; }; vendorSha256 = null; - doCheck = false; outputs = [ "out" "man" ]; nativeBuildInputs = [ @@ -31,6 +30,10 @@ buildGoModule rec { libseccomp ]; + checkPhase = '' + go test -v ./... + ''; + buildPhase = '' make ''; diff --git a/pkgs/os-specific/linux/odp-dpdk/default.nix b/pkgs/os-specific/linux/odp-dpdk/default.nix index 621e6d1f54c..b5610d35dde 100644 --- a/pkgs/os-specific/linux/odp-dpdk/default.nix +++ b/pkgs/os-specific/linux/odp-dpdk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkgconfig +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config , dpdk, libconfig, libpcap, numactl, openssl, zlib, libbsd, libelf, jansson }: let dpdk_18_11 = dpdk.overrideAttrs (old: rec { @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config ]; buildInputs = [ dpdk_18_11 diff --git a/pkgs/os-specific/linux/ofp/default.nix b/pkgs/os-specific/linux/ofp/default.nix index b392bf6f0ea..5defafeba80 100644 --- a/pkgs/os-specific/linux/ofp/default.nix +++ b/pkgs/os-specific/linux/ofp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook , openssl, libpcap, odp-dpdk, dpdk }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "05902593fycgkwzk5g7wzgk0k40nrrgybplkdka3rqnlj6aydhqf"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ openssl libpcap odp-dpdk dpdk ]; dontDisableStatic = true; diff --git a/pkgs/os-specific/linux/open-iscsi/default.nix b/pkgs/os-specific/linux/open-iscsi/default.nix index 5894d4f506e..f510c03d999 100644 --- a/pkgs/os-specific/linux/open-iscsi/default.nix +++ b/pkgs/os-specific/linux/open-iscsi/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, automake, autoconf, libtool, gettext -, util-linux, openisns, openssl, kmod, perl, systemd, pkgconf +, util-linux, open-isns, openssl, kmod, perl, systemd, pkgconf }: stdenv.mkDerivation rec { @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "2.1.3"; nativeBuildInputs = [ autoconf automake gettext libtool perl pkgconf ]; - buildInputs = [ kmod openisns.lib openssl systemd util-linux ]; + buildInputs = [ kmod open-isns.lib openssl systemd util-linux ]; src = fetchFromGitHub { owner = "open-iscsi"; diff --git a/pkgs/os-specific/linux/open-isns/default.nix b/pkgs/os-specific/linux/open-isns/default.nix index 1617696e00e..3f939024a48 100644 --- a/pkgs/os-specific/linux/open-isns/default.nix +++ b/pkgs/os-specific/linux/open-isns/default.nix @@ -1,14 +1,14 @@ -{ stdenv, openssl, fetchFromGitHub }: +{ lib, stdenv, openssl, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "open-isns"; - version = "0.99"; + version = "0.101"; src = fetchFromGitHub { - owner = "gonzoleeman"; + owner = "open-iscsi"; repo = "open-isns"; rev = "v${version}"; - sha256 = "0m294aiv80rkihacw5094093pc0kd5bkbxqgs6i32jsglxy33hvf"; + sha256 = "1g7kp1j2f8afsach6sbl4k05ybz1yz2s8yg073bv4gnv48gyxb2p"; }; propagatedBuildInputs = [ openssl ]; @@ -20,10 +20,11 @@ stdenv.mkDerivation rec { installFlags = [ "etcdir=$(out)/etc" "vardir=$(out)/var/lib/isns" ]; installTargets = [ "install" "install_hdrs" "install_lib" ]; - meta = { + meta = with lib; { description = "iSNS server and client for Linux"; - license = stdenv.lib.licenses.lgpl21; - homepage = "https://github.com/gonzoleeman/open-isns"; - platforms = stdenv.lib.platforms.linux; + license = licenses.lgpl21Only; + homepage = "https://github.com/open-iscsi/open-isns"; + platforms = platforms.linux; + maintainers = [ maintainers.markuskowa ]; }; } diff --git a/pkgs/os-specific/linux/opengl/xorg-sys/default.nix b/pkgs/os-specific/linux/opengl/xorg-sys/default.nix index f4043f70030..33df8c0cc34 100644 --- a/pkgs/os-specific/linux/opengl/xorg-sys/default.nix +++ b/pkgs/os-specific/linux/opengl/xorg-sys/default.nix @@ -6,7 +6,7 @@ # Of course, use of the driver in /usr/lib is highly impure. But it # might actually work ;-) -{stdenv, xorg, expat, libdrm}: +{lib, stdenv, xorg, expat, libdrm}: stdenv.mkDerivation { name = "xorg-sys-opengl-3"; @@ -15,6 +15,6 @@ stdenv.mkDerivation { [xorg.libXxf86vm xorg.libXext expat libdrm stdenv.cc.cc]; meta = { - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/openrazer/driver.nix b/pkgs/os-specific/linux/openrazer/driver.nix index 32c99a8be13..4745ba818a9 100644 --- a/pkgs/os-specific/linux/openrazer/driver.nix +++ b/pkgs/os-specific/linux/openrazer/driver.nix @@ -7,7 +7,7 @@ }: let - common = import ../../../development/python-modules/openrazer/common.nix { inherit lib stdenv fetchFromGitHub; }; + common = import ../../../development/python-modules/openrazer/common.nix { inherit lib fetchFromGitHub; }; in stdenv.mkDerivation (common // { name = "openrazer-${common.version}-${kernel.version}"; diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix index ab7e7cf62e2..f90c7966190 100644 --- a/pkgs/os-specific/linux/openvswitch/default.nix +++ b/pkgs/os-specific/linux/openvswitch/default.nix @@ -1,24 +1,24 @@ -{ lib, stdenv, fetchurl, makeWrapper, pkgconfig, util-linux, which +{ lib, stdenv, fetchurl, makeWrapper, pkg-config, util-linux, which , procps, libcap_ng, openssl, python3 , perl , kernel ? null }: -with stdenv.lib; +with lib; let _kernel = kernel; pythonEnv = python3.withPackages (ps: with ps; [ six ]); in stdenv.mkDerivation rec { - version = "2.14.0"; + version = "2.14.1"; pname = "openvswitch"; src = fetchurl { url = "https://www.openvswitch.org/releases/${pname}-${version}.tar.gz"; - sha256 = "0q52k6mq1jfsv0ix55mjd5ljlalhklhqfrma3l61dzhgihmfawa1"; + sha256 = "sha256-GAttQsCrSybyH1i4vzszdiA9dHWqeo7xUTZVFMNQiP4="; }; kernel = optional (_kernel != null) _kernel.dev; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ makeWrapper util-linux openssl libcap_ng pythonEnv perl procps which ]; diff --git a/pkgs/os-specific/linux/openvswitch/lts.nix b/pkgs/os-specific/linux/openvswitch/lts.nix index d0588d4b441..ddb5eff9723 100644 --- a/pkgs/os-specific/linux/openvswitch/lts.nix +++ b/pkgs/os-specific/linux/openvswitch/lts.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, fetchurl, makeWrapper, pkgconfig, util-linux, which +{ lib, stdenv, fetchurl, makeWrapper, pkg-config, util-linux, which , procps, libcap_ng, openssl, python2, iproute , perl , automake, autoconf, libtool, kernel ? null }: -with stdenv.lib; +with lib; let _kernel = kernel; @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { kernel = optional (_kernel != null) _kernel.dev; - nativeBuildInputs = [ autoconf libtool automake pkgconfig ]; + nativeBuildInputs = [ autoconf libtool automake pkg-config ]; buildInputs = [ makeWrapper util-linux openssl libcap_ng python2 perl procps which ]; diff --git a/pkgs/os-specific/linux/otpw/default.nix b/pkgs/os-specific/linux/otpw/default.nix index c9597ab0fe4..fed7930bf14 100644 --- a/pkgs/os-specific/linux/otpw/default.nix +++ b/pkgs/os-specific/linux/otpw/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pam }: +{ lib, stdenv, fetchurl, pam }: stdenv.mkDerivation rec { name = "otpw-1.3"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.cl.cam.ac.uk/~mgk25/otpw.html"; description = "A one-time password login package"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index d42ced5ad55..42b7ea91092 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-IB1AcwsRNbGzzeoJ8sKKxjTXMYHM0Bcs7d7jZJxXkvw="; }; - patches = stdenv.lib.optionals (stdenv.hostPlatform.libc == "musl") [ + patches = lib.optionals (stdenv.hostPlatform.libc == "musl") [ (fetchpatch { url = "https://git.alpinelinux.org/aports/plain/main/linux-pam/fix-compat.patch?id=05a62bda8ec255d7049a2bd4cf0fdc4b32bdb2cc"; sha256 = "1h5yp5h2mqp1fcwiwwklyfpa69a3i03ya32pivs60fd7g5bqa7sf"; @@ -20,9 +20,6 @@ stdenv.mkDerivation rec { url = "https://git.alpinelinux.org/aports/plain/main/linux-pam/libpam-fix-build-with-eglibc-2.16.patch?id=05a62bda8ec255d7049a2bd4cf0fdc4b32bdb2cc"; sha256 = "1ib6shhvgzinjsc603k2x1lxh9dic6qq449fnk110gc359m23j81"; }) - # From adelie's package repo, using local copy since it seems to be currently offline. - # (we previously used similar patch from void, but stopped working with update to 1.3.1) - ./musl-fix-pam_exec.patch ]; outputs = [ "out" "doc" "man" /* "modules" */ ]; @@ -46,7 +43,7 @@ stdenv.mkDerivation rec { # which is done by dlopening $out/lib/security/pam_foo.so # $out/etc was also missed: pam_env(login:session): Unable to open config file - preConfigure = stdenv.lib.optionalString (stdenv.hostPlatform.libc == "musl") '' + preConfigure = lib.optionalString (stdenv.hostPlatform.libc == "musl") '' # export ac_cv_search_crypt=no # (taken from Alpine linux, apparently insecure but also doesn't build O:)) # disable insecure modules diff --git a/pkgs/os-specific/linux/pam/musl-fix-pam_exec.patch b/pkgs/os-specific/linux/pam/musl-fix-pam_exec.patch deleted file mode 100644 index 194e47b9e5b..00000000000 --- a/pkgs/os-specific/linux/pam/musl-fix-pam_exec.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- ./modules/pam_exec/pam_exec.c.orig -+++ ./modules/pam_exec/pam_exec.c -@@ -103,11 +103,14 @@ - int optargc; - const char *logfile = NULL; - const char *authtok = NULL; -+ char authtok_buf[PAM_MAX_RESP_SIZE+1]; -+ - pid_t pid; - int fds[2]; - int stdout_fds[2]; - FILE *stdout_file = NULL; - -+ memset(authtok_buf, 0, sizeof(authtok_buf)); - if (argc < 1) { - pam_syslog (pamh, LOG_ERR, - "This module needs at least one argument"); -@@ -180,12 +183,12 @@ - if (resp) - { - pam_set_item (pamh, PAM_AUTHTOK, resp); -- authtok = strndupa (resp, PAM_MAX_RESP_SIZE); -+ authtok = strncpy(authtok_buf, resp, sizeof(authtok_buf)); - _pam_drop (resp); - } - } - else -- authtok = strndupa (void_pass, PAM_MAX_RESP_SIZE); -+ authtok = strncpy(authtok_buf, void_pass, sizeof(authtok_buf)); - - if (pipe(fds) != 0) - { - diff --git a/pkgs/os-specific/linux/pam_mount/default.nix b/pkgs/os-specific/linux/pam_mount/default.nix index 464a2b04b2b..7f26ae80ed6 100644 --- a/pkgs/os-specific/linux/pam_mount/default.nix +++ b/pkgs/os-specific/linux/pam_mount/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkgconfig, libtool, pam, libHX, libxml2, pcre, perl, openssl, cryptsetup, util-linux }: +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libtool, pam, libHX, libxml2, pcre, perl, openssl, cryptsetup, util-linux }: stdenv.mkDerivation rec { pname = "pam_mount"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { --replace @@NIX_UTILLINUX@@ ${util-linux}/bin ''; - nativeBuildInputs = [ autoreconfHook libtool pkgconfig ]; + nativeBuildInputs = [ autoreconfHook libtool pkg-config ]; buildInputs = [ pam libHX util-linux libxml2 pcre perl openssl cryptsetup ]; diff --git a/pkgs/os-specific/linux/pam_pgsql/default.nix b/pkgs/os-specific/linux/pam_pgsql/default.nix index eece7b84c3d..bca02c17066 100644 --- a/pkgs/os-specific/linux/pam_pgsql/default.nix +++ b/pkgs/os-specific/linux/pam_pgsql/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, postgresql, libgcrypt, pam }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, postgresql, libgcrypt, pam }: stdenv.mkDerivation rec { pname = "pam_pgsql"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1a68krq5m07zspdxwl1wmkr5j98zr9bdg4776kvplrsdcg97h4jk"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libgcrypt pam postgresql ]; meta = with lib; { diff --git a/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix b/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix index 167363e60a8..f28cb28ef37 100644 --- a/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix +++ b/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchpatch, fetchFromGitHub, pam, openssl, perl }: +{ lib, stdenv, fetchpatch, fetchFromGitHub, pam, openssl, perl }: stdenv.mkDerivation rec { pname = "pam_ssh_agent_auth"; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/jbeverly/pam_ssh_agent_auth"; description = "PAM module for authentication through the SSH agent"; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.linux; + maintainers = [ lib.maintainers.eelco ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/pam_u2f/default.nix b/pkgs/os-specific/linux/pam_u2f/default.nix index 852fb2d73ef..760af73fecd 100644 --- a/pkgs/os-specific/linux/pam_u2f/default.nix +++ b/pkgs/os-specific/linux/pam_u2f/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libfido2, pam, openssl }: +{ lib, stdenv, fetchurl, pkg-config, libfido2, pam, openssl }: stdenv.mkDerivation rec { pname = "pam_u2f"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "01fwbrfnjkv93vvqm54jywdcxa1p7d4r32azicwnx75nxfbbzhqd"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libfido2 pam openssl ]; preConfigure = '' diff --git a/pkgs/os-specific/linux/pam_usb/default.nix b/pkgs/os-specific/linux/pam_usb/default.nix index 3e01b1bd455..1a66e986d8b 100644 --- a/pkgs/os-specific/linux/pam_usb/default.nix +++ b/pkgs/os-specific/linux/pam_usb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, dbus, libxml2, pam, pkgconfig, pmount, pythonPackages, writeScript, runtimeShell }: +{ lib, stdenv, fetchurl, makeWrapper, dbus, libxml2, pam, pkg-config, pmount, pythonPackages, writeScript, runtimeShell }: let @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper # pam_usb dependencies - dbus libxml2 pam pmount pkgconfig + dbus libxml2 pam pmount pkg-config # pam_usb's tools dependencies python # cElementTree is included with python 2.5 and later. @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://pamusb.org/"; description = "Authentication using USB Flash Drives"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/pcmciautils/default.nix b/pkgs/os-specific/linux/pcmciautils/default.nix index 820ef7f9612..ff3100cbb22 100644 --- a/pkgs/os-specific/linux/pcmciautils/default.nix +++ b/pkgs/os-specific/linux/pcmciautils/default.nix @@ -27,8 +27,7 @@ stdenv.mkDerivation rec { " src/{startup.c,pcmcia-check-broken-cis.c} # fix-color */ '' + (if firmware == [] then ''sed -i "s,STARTUP = true,STARTUP = false," Makefile'' else "") - + (if configOpts == null then "" else '' - ln -sf ${configOpts} ./config/config.opts'') + + (if configOpts == null then "" else "ln -sf ${configOpts} ./config/config.opts") ; makeFlags = [ "LEX=flex" ]; @@ -49,7 +48,7 @@ stdenv.mkDerivation rec { the PCMCIA subsystem to behave (almost) as every other hotpluggable bus system. "; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/phc-intel/default.nix b/pkgs/os-specific/linux/phc-intel/default.nix index 4b4c86aa916..34693564e0a 100644 --- a/pkgs/os-specific/linux/phc-intel/default.nix +++ b/pkgs/os-specific/linux/phc-intel/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, kernel, which }: # Don't bother with older versions, though some might even work: -assert stdenv.lib.versionAtLeast kernel.version "4.10"; +assert lib.versionAtLeast kernel.version "4.10"; let release = "0.4.0"; @@ -48,6 +48,6 @@ in stdenv.mkDerivation rec { downloadPage = "http://www.linux-phc.org/forum/viewtopic.php?f=7&t=267"; license = licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; - broken = stdenv.lib.versionAtLeast kernel.version "4.18"; + broken = lib.versionAtLeast kernel.version "4.18"; }; } diff --git a/pkgs/os-specific/linux/piper/default.nix b/pkgs/os-specific/linux/piper/default.nix index caa6b1848e7..839b3f1b78f 100644 --- a/pkgs/os-specific/linux/piper/default.nix +++ b/pkgs/os-specific/linux/piper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, meson, ninja, pkgconfig, gettext, fetchFromGitHub, python3 +{ lib, meson, ninja, pkg-config, gettext, fetchFromGitHub, python3 , wrapGAppsHook, gtk3, glib, desktop-file-utils, appstream-glib, gnome3 , gobject-introspection }: @@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec { sha256 = "1nfjnsiwg2rs6gkjsxzhr2708i6di149dgwq3cf6l12rxqpb8arj"; }; - nativeBuildInputs = [ meson ninja gettext pkgconfig wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ]; + nativeBuildInputs = [ meson ninja gettext pkg-config wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ]; buildInputs = [ gtk3 glib gnome3.adwaita-icon-theme python3 ]; diff --git a/pkgs/os-specific/linux/pktgen/default.nix b/pkgs/os-specific/linux/pktgen/default.nix index 23b9b9426df..47ca709c44b 100644 --- a/pkgs/os-specific/linux/pktgen/default.nix +++ b/pkgs/os-specific/linux/pktgen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, meson, ninja, pkgconfig +{ stdenv, lib, fetchurl, meson, ninja, pkg-config , dpdk, libbsd, libpcap, lua5_3, numactl, util-linux , gtk2, which, withGtk ? false }: @@ -12,14 +12,14 @@ stdenv.mkDerivation rec { sha256 = "1clfviz1qa4hysslcg6i29vsxwl9f6j1y7zf9wwx9br3yq08x956"; }; - nativeBuildInputs = [ meson ninja pkgconfig ]; + nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ dpdk libbsd libpcap lua5_3 numactl which ] - ++ stdenv.lib.optionals withGtk [gtk2]; + ++ lib.optionals withGtk [gtk2]; RTE_SDK = dpdk; - GUI = stdenv.lib.optionalString withGtk "true"; + GUI = lib.optionalString withGtk "true"; NIX_CFLAGS_COMPILE = "-msse3"; diff --git a/pkgs/os-specific/linux/ply/default.nix b/pkgs/os-specific/linux/ply/default.nix index 0433a7a0718..2844badc730 100644 --- a/pkgs/os-specific/linux/ply/default.nix +++ b/pkgs/os-specific/linux/ply/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, kernel, fetchFromGitHub, autoreconfHook, yacc, flex, p7zip, rsync }: -assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "4.0"; +assert kernel != null -> lib.versionAtLeast kernel.version "4.0"; let version = "1.0.beta1-9e810b1"; diff --git a/pkgs/os-specific/linux/plymouth/default.nix b/pkgs/os-specific/linux/plymouth/default.nix index 88575580e2a..c167b202c8d 100644 --- a/pkgs/os-specific/linux/plymouth/default.nix +++ b/pkgs/os-specific/linux/plymouth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, libxslt, docbook_xsl +{ stdenv, fetchurl, autoreconfHook, pkg-config, libxslt, docbook_xsl , gtk3, udev, systemd, lib }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - autoreconfHook pkgconfig libxslt docbook_xsl + autoreconfHook pkg-config libxslt docbook_xsl ]; buildInputs = [ diff --git a/pkgs/os-specific/linux/pm-utils/default.nix b/pkgs/os-specific/linux/pm-utils/default.nix index e685402d473..17723983c69 100644 --- a/pkgs/os-specific/linux/pm-utils/default.nix +++ b/pkgs/os-specific/linux/pm-utils/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, coreutils, gnugrep, util-linux, kmod +{ lib, stdenv, fetchurl, coreutils, gnugrep, util-linux, kmod , procps, kbd, dbus }: let - binPath = stdenv.lib.makeBinPath + binPath = lib.makeBinPath [ coreutils gnugrep util-linux kmod procps kbd dbus ]; - sbinPath = stdenv.lib.makeSearchPathOutput "bin" "sbin" + sbinPath = lib.makeSearchPathOutput "bin" "sbin" [ procps ]; in @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://pm-utils.freedesktop.org/wiki/"; description = "A small collection of scripts that handle suspend and resume on behalf of HAL"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/pmount/default.nix b/pkgs/os-specific/linux/pmount/default.nix index 01624bff535..0f65e0278ca 100644 --- a/pkgs/os-specific/linux/pmount/default.nix +++ b/pkgs/os-specific/linux/pmount/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, intltool, ntfs3g, util-linux +{ lib, stdenv, fetchurl, intltool, ntfs3g, util-linux , mediaDir ? "/media/" , lockDir ? "/var/lock/pmount" , whiteList ? "/etc/pmount.allow" }: # constraint mention in the configure.ac -assert stdenv.lib.hasSuffix "/" mediaDir; +assert lib.hasSuffix "/" mediaDir; stdenv.mkDerivation rec { pname = "pmount"; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://bazaar.launchpad.net/~fourmond/pmount/main/files"; description = "Mount removable devices as normal user"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/pommed-light/default.nix b/pkgs/os-specific/linux/pommed-light/default.nix index 31697823e52..9e9cf149fef 100644 --- a/pkgs/os-specific/linux/pommed-light/default.nix +++ b/pkgs/os-specific/linux/pommed-light/default.nix @@ -1,10 +1,10 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , pciutils , libconfuse , alsaLib , audiofile -, pkgconfig +, pkg-config , zlib , eject }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { substituteInPlace pommed/cd_eject.c --replace /usr/bin/eject ${eject}/bin/eject ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pciutils libconfuse @@ -60,6 +60,6 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/bytbox/pommed-light"; platforms = [ "x86_64-linux" ]; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/os-specific/linux/powerstat/default.nix b/pkgs/os-specific/linux/powerstat/default.nix index 6020139ad4b..12a92c36c69 100644 --- a/pkgs/os-specific/linux/powerstat/default.nix +++ b/pkgs/os-specific/linux/powerstat/default.nix @@ -3,19 +3,19 @@ stdenv.mkDerivation rec { pname = "powerstat"; version = "0.02.24"; - + src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.gz"; sha256 = "0yrc1xi9flxn2mvmzp0b0vd0md5z4p8fd4y8bszc67xy12qiqy0j"; }; - + installFlags = [ "DESTDIR=${placeholder "out"}" ]; - + postInstall = '' mv $out/usr/* $out rm -r $out/usr ''; - + meta = with lib; { description = "Laptop power measuring tool"; homepage = "https://kernel.ubuntu.com/~cking/powerstat/"; diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix index a8733ac1f8a..bbcf6e390f0 100644 --- a/pkgs/os-specific/linux/powertop/default.nix +++ b/pkgs/os-specific/linux/powertop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, gettext, libnl, ncurses, pciutils, pkgconfig, zlib }: +{ lib, stdenv, fetchurl, fetchpatch, gettext, libnl, ncurses, pciutils, pkg-config, zlib }: stdenv.mkDerivation rec { pname = "powertop"; @@ -11,10 +11,10 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gettext libnl ncurses pciutils zlib ]; - patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ( + patches = lib.optional stdenv.hostPlatform.isMusl ( fetchpatch { name = "strerror_r.patch"; url = "https://git.alpinelinux.org/aports/plain/main/powertop/strerror_r.patch?id=3b9214d436f1611f297b01f72469d66bfe729d6e"; diff --git a/pkgs/os-specific/linux/pps-tools/default.nix b/pkgs/os-specific/linux/pps-tools/default.nix index fd5225c5cfe..146c9457ed3 100644 --- a/pkgs/os-specific/linux/pps-tools/default.nix +++ b/pkgs/os-specific/linux/pps-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { baseName = "pps-tools"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { rm -rf $out/usr/ ''; - meta = with stdenv.lib;{ + meta = with lib;{ description = "User-space tools for LinuxPPS"; homepage = "http://linuxpps.org/"; license = licenses.gpl2Plus; diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix index 14e43b09e30..431e0ed58b1 100644 --- a/pkgs/os-specific/linux/prl-tools/default.nix +++ b/pkgs/os-specific/linux/prl-tools/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { ''; libPath = with xorg; - stdenv.lib.makeLibraryPath ([ stdenv.cc.cc libXrandr libXext libX11 libXcomposite libXinerama ] + lib.makeLibraryPath ([ stdenv.cc.cc libXrandr libXext libX11 libXcomposite libXinerama ] ++ lib.optionals (!libsOnly) [ libXi glib dbus-glib zlib ]); diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix index 4942710f755..9f12ab69539 100644 --- a/pkgs/os-specific/linux/procps-ng/default.nix +++ b/pkgs/os-specific/linux/procps-ng/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, ncurses, pkgconfig +{ lib, stdenv, fetchurl, fetchpatch, ncurses, pkg-config # `ps` with systemd support is able to properly report different # attributes like unit name, so we want to have it on linux. @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ] ++ lib.optional withSystemd systemd; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; makeFlags = [ "usrbin_execdir=$(out)/bin" ] ++ lib.optionals watchOnly [ "watch" "PKG_LDFLAGS="]; diff --git a/pkgs/os-specific/linux/pscircle/default.nix b/pkgs/os-specific/linux/pscircle/default.nix index f6ee22ee0fc..ef7dbc55a9a 100644 --- a/pkgs/os-specific/linux/pscircle/default.nix +++ b/pkgs/os-specific/linux/pscircle/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, meson, pkgconfig, ninja, cairo }: +{ lib, stdenv, fetchFromGitLab, meson, pkg-config, ninja, cairo }: stdenv.mkDerivation rec { pname = "pscircle"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ meson - pkgconfig + pkg-config cairo ninja ]; diff --git a/pkgs/os-specific/linux/psmisc/default.nix b/pkgs/os-specific/linux/psmisc/default.nix index 3e03ec4ea67..0902ce3d612 100644 --- a/pkgs/os-specific/linux/psmisc/default.nix +++ b/pkgs/os-specific/linux/psmisc/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake gettext ]; buildInputs = [ ncurses ]; - preConfigure = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + preConfigure = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' # Goes past the rpl_malloc linking failure export ac_cv_func_malloc_0_nonnull=yes export ac_cv_func_realloc_0_nonnull=yes diff --git a/pkgs/os-specific/linux/r8125/default.nix b/pkgs/os-specific/linux/r8125/default.nix index 8cdf11f80ad..30f8da7d5f4 100644 --- a/pkgs/os-specific/linux/r8125/default.nix +++ b/pkgs/os-specific/linux/r8125/default.nix @@ -4,16 +4,16 @@ stdenv.mkDerivation rec { pname = "r8125"; # On update please verify (using `diff -r`) that the source matches the # realtek version. - version = "9.003.05"; + version = "9.004.01"; # This is a mirror. The original website[1] doesn't allow non-interactive # downloads, instead emailing you a download link. # [1] https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software src = fetchFromGitHub { - owner = "ibmibmibm"; + owner = "louistakepillz"; repo = "r8125"; rev = version; - sha256 = "016vh997xjs01si0zzs572vgflq3czxd0v4m7h1m3qxcv2cvq7i0"; + sha256 = "0h2y4mzydhc7var5281bk2jj1knig6i64k11ii4b94az3g9dbq24"; }; hardeningDisable = [ "pic" ]; @@ -32,12 +32,14 @@ stdenv.mkDerivation rec { buildFlags = [ "modules" ]; meta = with lib; { - homepage = "https://github.com/ibmibmibm/r8125"; + homepage = "https://github.com/louistakepillz/r8125"; downloadPage = "https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software"; description = "Realtek r8125 driver"; longDescription = '' A kernel module for Realtek 8125 2.5G network cards. ''; + # r8125 has been integrated into the kernel as of v5.9.1 + broken = lib.versionAtLeast kernel.version "5.9.1"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ peelz ]; diff --git a/pkgs/os-specific/linux/radeontools/default.nix b/pkgs/os-specific/linux/radeontools/default.nix index 0d50c6b41d8..01b83f87911 100644 --- a/pkgs/os-specific/linux/radeontools/default.nix +++ b/pkgs/os-specific/linux/radeontools/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl , autoreconfHook , pciutils -, pkgconfig +, pkg-config , xorg }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0mjk9wr9rsb17yy92j6yi16hfpa6v5r1dbyiy60zp4r125wr63za"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ xorg.libpciaccess ]; meta = with lib; { diff --git a/pkgs/os-specific/linux/radeontop/default.nix b/pkgs/os-specific/linux/radeontop/default.nix index f1655c94b84..e6aa07e6cd1 100644 --- a/pkgs/os-specific/linux/radeontop/default.nix +++ b/pkgs/os-specific/linux/radeontop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, gettext, makeWrapper +{ lib, stdenv, fetchFromGitHub, pkg-config, gettext, makeWrapper , ncurses, libdrm, libpciaccess, libxcb }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ ncurses libdrm libpciaccess libxcb ]; - nativeBuildInputs = [ pkgconfig gettext makeWrapper ]; + nativeBuildInputs = [ pkg-config gettext makeWrapper ]; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix index fd7148b7eb6..ad9deeb7a8c 100644 --- a/pkgs/os-specific/linux/rdma-core/default.nix +++ b/pkgs/os-specific/linux/rdma-core/default.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, docutils +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, docutils , pandoc, ethtool, iproute, libnl, udev, python, perl , makeWrapper } : let - version = "33.0"; + version = "33.1"; in stdenv.mkDerivation { pname = "rdma-core"; @@ -14,10 +14,10 @@ in stdenv.mkDerivation { owner = "linux-rdma"; repo = "rdma-core"; rev = "v${version}"; - sha256 = "04q4z95nxxxjc674qnbwn19bv18nl3x7xwp6aql17h1cw3gdmhw4"; + sha256 = "1p97r8ngfx1d9aq8p3f027323m7kgmk30kfrikf3jlkpr30rksbv"; }; - nativeBuildInputs = [ cmake pkgconfig pandoc docutils makeWrapper ]; + nativeBuildInputs = [ cmake pkg-config pandoc docutils makeWrapper ]; buildInputs = [ libnl ethtool iproute udev python perl ]; cmakeFlags = [ @@ -46,7 +46,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "RDMA Core Userspace Libraries and Daemons"; homepage = "https://github.com/linux-rdma/rdma-core"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = with maintainers; [ markuskowa ]; }; diff --git a/pkgs/os-specific/linux/rewritefs/default.nix b/pkgs/os-specific/linux/rewritefs/default.nix index 2c50c491d43..161db99114b 100644 --- a/pkgs/os-specific/linux/rewritefs/default.nix +++ b/pkgs/os-specific/linux/rewritefs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, fuse, pcre }: +{ lib, stdenv, fetchFromGitHub, pkg-config, fuse, pcre }: stdenv.mkDerivation { pname = "rewritefs"; @@ -10,8 +10,8 @@ stdenv.mkDerivation { rev = "33fb844d8e8ff441a3fc80d2715e8c64f8563d81"; sha256 = "15bcxprkxf0xqxljsqhb0jpi7p1vwqcb00sjs7nzrj7vh2p7mqla"; }; - - nativeBuildInputs = [ pkgconfig ]; + + nativeBuildInputs = [ pkg-config ]; buildInputs = [ fuse pcre ]; prePatch = '' diff --git a/pkgs/os-specific/linux/roccat-tools/default.nix b/pkgs/os-specific/linux/roccat-tools/default.nix index 766216f07d9..1eba2511b98 100644 --- a/pkgs/os-specific/linux/roccat-tools/default.nix +++ b/pkgs/os-specific/linux/roccat-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, gettext +{ lib, stdenv, fetchurl, cmake, pkg-config, gettext , dbus, dbus-glib, libgaminggear, libgudev, lua , harfbuzz }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }' libroccat/roccat_helper.c ''; - nativeBuildInputs = [ cmake pkgconfig gettext ]; + nativeBuildInputs = [ cmake pkg-config gettext ]; buildInputs = [ dbus dbus-glib libgaminggear libgudev lua ]; cmakeFlags = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { description = "Tools to configure ROCCAT devices"; homepage = "http://roccat.sourceforge.net/"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/os-specific/linux/rtkit/default.nix b/pkgs/os-specific/linux/rtkit/default.nix index 8138fb9c346..fb41863c431 100644 --- a/pkgs/os-specific/linux/rtkit/default.nix +++ b/pkgs/os-specific/linux/rtkit/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchpatch -, meson, ninja, pkgconfig, unixtools +, meson, ninja, pkg-config, unixtools , dbus, libcap, polkit, systemd }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ meson ninja pkgconfig unixtools.xxd ]; + nativeBuildInputs = [ meson ninja pkg-config unixtools.xxd ]; buildInputs = [ dbus libcap polkit systemd ]; mesonFlags = [ diff --git a/pkgs/os-specific/linux/rtl8192eu/default.nix b/pkgs/os-specific/linux/rtl8192eu/default.nix index c6527ac285d..d921eb71b0e 100644 --- a/pkgs/os-specific/linux/rtl8192eu/default.nix +++ b/pkgs/os-specific/linux/rtl8192eu/default.nix @@ -34,8 +34,8 @@ in stdenv.mkDerivation rec { meta = { description = "Realtek rtl8192eu driver"; homepage = "https://github.com/Mange/rtl8192eu-linux-driver"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; maintainers = with maintainers; [ troydm ]; }; } diff --git a/pkgs/os-specific/linux/rtl8723bs/default.nix b/pkgs/os-specific/linux/rtl8723bs/default.nix index 323d6a82073..a862b351716 100644 --- a/pkgs/os-specific/linux/rtl8723bs/default.nix +++ b/pkgs/os-specific/linux/rtl8723bs/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, nukeReferences, kernel }: -with stdenv.lib; +{ lib, stdenv, fetchFromGitHub, nukeReferences, kernel }: +with lib; stdenv.mkDerivation rec { name = "rtl8723bs-${kernel.version}-${version}"; version = "2017-04-06"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ nukeReferences ]; makeFlags = [ - "ARCH=${stdenv.hostPlatform.platform.kernelArch}" # Normally not needed, but the Makefile sets ARCH in a broken way. + "ARCH=${stdenv.hostPlatform.linuxArch}" # Normally not needed, but the Makefile sets ARCH in a broken way. "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" # Makefile uses $(uname -r); breaks us. ]; @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { meta = { description = "Realtek SDIO Wi-Fi driver"; homepage = "https://github.com/hadess/rtl8723bs"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; broken = (! versionOlder kernel.version "4.12"); # Now in kernel staging drivers maintainers = with maintainers; [ elitak ]; }; diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix index 0051e689794..68a88fb6778 100644 --- a/pkgs/os-specific/linux/rtl8812au/default.nix +++ b/pkgs/os-specific/linux/rtl8812au/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { ''; makeFlags = [ - "ARCH=${stdenv.hostPlatform.platform.kernelArch}" + "ARCH=${stdenv.hostPlatform.linuxArch}" "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ("CONFIG_PLATFORM_I386_PC=" + (if (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64) then "y" else "n")) ("CONFIG_PLATFORM_ARM_RPI=" + (if (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) then "y" else "n")) - ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ "CROSS_COMPILE=${stdenv.cc.targetPrefix}" ]; diff --git a/pkgs/os-specific/linux/rtlwifi_new/default.nix b/pkgs/os-specific/linux/rtlwifi_new/default.nix index 78e5510ad17..ef71cd82541 100644 --- a/pkgs/os-specific/linux/rtlwifi_new/default.nix +++ b/pkgs/os-specific/linux/rtlwifi_new/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { meta = { description = "The newest Realtek rtlwifi codes"; inherit (src.meta) homepage; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; platforms = with platforms; linux; maintainers = with maintainers; [ tvorog ]; priority = -1; diff --git a/pkgs/os-specific/linux/s6-linux-init/default.nix b/pkgs/os-specific/linux/s6-linux-init/default.nix new file mode 100644 index 00000000000..87cc098d07d --- /dev/null +++ b/pkgs/os-specific/linux/s6-linux-init/default.nix @@ -0,0 +1,39 @@ +{ lib, skawarePackages }: + +with skawarePackages; + +buildPackage { + pname = "s6-linux-init"; + version = "1.0.6.0"; + sha256 = "0kzif3dqhm7h4h7c6npzdbcy7w756222g8ysw116fgb8j385dr6w"; + + description = "A set of minimalistic tools used to create a s6-based init system, including a /sbin/init binary, on a Linux kernel"; + platforms = lib.platforms.linux; + + outputs = [ "bin" "dev" "doc" "out" ]; + + configureFlags = [ + "--bindir=\${bin}/bin" + "--includedir=\${dev}/include" + "--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps" + "--with-include=${skalibs.dev}/include" + "--with-include=${execline.dev}/include" + "--with-include=${s6.dev}/include" + "--with-lib=${skalibs.lib}/lib" + "--with-lib=${s6.out}/lib" + "--with-lib=${execline.lib}/lib" + "--with-dynlib=${skalibs.lib}/lib" + "--with-dynlib=${execline.lib}/lib" + "--with-dynlib=${s6.out}/lib" + ]; + + postInstall = '' + # remove all s6 executables from build directory + rm $(find -name "s6-*" -type f -mindepth 1 -maxdepth 1 -executable) + rm libs6_linux_init.* libhpr.* + rm -rf skel + + mv doc $doc/share/doc/s6-linux-init/html + ''; + +} diff --git a/pkgs/os-specific/linux/s6-linux-utils/default.nix b/pkgs/os-specific/linux/s6-linux-utils/default.nix index 5c4fc762245..132a0b49574 100644 --- a/pkgs/os-specific/linux/s6-linux-utils/default.nix +++ b/pkgs/os-specific/linux/s6-linux-utils/default.nix @@ -1,14 +1,14 @@ -{ stdenv, skawarePackages }: +{ lib, skawarePackages }: with skawarePackages; buildPackage { pname = "s6-linux-utils"; - version = "2.5.1.3"; - sha256 = "0wbv02zxaami88xbj2zg63kspz05bbplswg0c6ncb5g9khf52wa4"; + version = "2.5.1.4"; + sha256 = "02gxzc9igid2kf2rvm3v6kc9806mpjmdq7cpanv4cml0ip68vbfq"; description = "A set of minimalistic Linux-specific system utilities"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; outputs = [ "bin" "dev" "doc" "out" ]; diff --git a/pkgs/os-specific/linux/sch_cake/default.nix b/pkgs/os-specific/linux/sch_cake/default.nix index ef2ebaa0362..851a903cf07 100644 --- a/pkgs/os-specific/linux/sch_cake/default.nix +++ b/pkgs/os-specific/linux/sch_cake/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, kernel }: -assert stdenv.lib.versionAtLeast kernel.version "4.4"; +assert lib.versionAtLeast kernel.version "4.4"; stdenv.mkDerivation { name = "sch_cake-2017-07-16"; @@ -30,6 +30,6 @@ stdenv.mkDerivation { license = with licenses; [ bsd3 gpl2 ]; maintainers = with maintainers; [ fpletz ]; platforms = platforms.linux; - broken = !stdenv.lib.versionOlder kernel.version "4.13"; + broken = !lib.versionOlder kernel.version "4.13"; }; } diff --git a/pkgs/os-specific/linux/sd-switch/default.nix b/pkgs/os-specific/linux/sd-switch/default.nix index 026488a24de..a58b7efa7b3 100644 --- a/pkgs/os-specific/linux/sd-switch/default.nix +++ b/pkgs/os-specific/linux/sd-switch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, rustPlatform, pkg-config, dbus }: +{ lib, fetchFromGitLab, rustPlatform, pkg-config, dbus }: rustPlatform.buildRustPackage rec { pname = "sd-switch"; diff --git a/pkgs/os-specific/linux/sdnotify-wrapper/sdnotify-wrapper.c b/pkgs/os-specific/linux/sdnotify-wrapper/sdnotify-wrapper.c index 0d1ae96068a..bb71a732bf9 100644 --- a/pkgs/os-specific/linux/sdnotify-wrapper/sdnotify-wrapper.c +++ b/pkgs/os-specific/linux/sdnotify-wrapper/sdnotify-wrapper.c @@ -1,5 +1,5 @@ /* - Copyright: (C)2015-2017 Laurent Bercot. http://skarnet.org/ + Copyright: (C)2015-2020 Laurent Bercot. http://skarnet.org/ ISC license. See http://opensource.org/licenses/ISC Build-time requirements: skalibs. http://skarnet.org/software/skalibs/ @@ -53,20 +53,24 @@ #include <sys/types.h> #include <string.h> #include <unistd.h> +#include <stdlib.h> #include <errno.h> #include <sys/socket.h> #include <sys/un.h> + #include <skalibs/uint64.h> #include <skalibs/types.h> #include <skalibs/bytestr.h> #include <skalibs/sgetopt.h> #include <skalibs/strerr2.h> -#include <skalibs/env.h> #include <skalibs/allreadwrite.h> #include <skalibs/tai.h> #include <skalibs/iopause.h> #include <skalibs/djbunix.h> -#include <skalibs/webipc.h> +//#include <skalibs/webipc.h> +// svanderburg: This header no longer exists, but socket.h provides the functions this module needs +#include <skalibs/socket.h> +#include <skalibs/exec.h> #define USAGE "sdnotify-wrapper [ -d fd ] [ -f ] [ -t timeout ] [ -k ] prog..." #define dieusage() strerr_dieusage(100, USAGE) @@ -123,9 +127,9 @@ static inline int run_child (int fd, unsigned int timeout, pid_t pid, char const return 0 ; } -int main (int argc, char const *const *argv, char const *const *envp) +int main (int argc, char const *const *argv) { - char const *s = env_get2(envp, VAR) ; + char const *s = getenv(VAR) ; unsigned int fd = 1 ; unsigned int timeout = 0 ; int df = 1, keep = 0 ; @@ -134,7 +138,7 @@ int main (int argc, char const *const *argv, char const *const *envp) subgetopt_t l = SUBGETOPT_ZERO ; for (;;) { - register int opt = subgetopt_r(argc, argv, "d:ft:k", &l) ; + int opt = subgetopt_r(argc, argv, "d:ft:k", &l) ; if (opt == -1) break ; switch (opt) { @@ -149,7 +153,7 @@ int main (int argc, char const *const *argv, char const *const *envp) } if (!argc) dieusage() ; - if (!s) xpathexec_run(argv[0], argv, envp) ; + if (!s) xexec(argv) ; else { pid_t parent = getpid() ; @@ -166,7 +170,7 @@ int main (int argc, char const *const *argv, char const *const *envp) } close(p[0]) ; if (fd_move((int)fd, p[1]) < 0) strerr_diefu1sys(111, "move descriptor") ; - if (keep) xpathexec_run(argv[0], argv, envp) ; - else xpathexec_r(argv, envp, env_len(envp), VAR, sizeof(VAR)) ; + if (keep) xexec(argv) ; + else xmexec_m(argv, VAR, sizeof(VAR)) ; } } diff --git a/pkgs/os-specific/linux/selinux-python/default.nix b/pkgs/os-specific/linux/selinux-python/default.nix index 57aa5d49fac..32ed5bc2e7d 100644 --- a/pkgs/os-specific/linux/selinux-python/default.nix +++ b/pkgs/os-specific/linux/selinux-python/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, python3 +{ lib, stdenv, fetchurl, python3 , libselinux, libsemanage, libsepol, setools }: # this is python3 only because setools only supports python3 -with stdenv.lib; +with lib; with python3.pkgs; stdenv.mkDerivation rec { @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { "BASHCOMPLETIONDIR=$(out)/share/bash-completion/completions" "PYTHON=python" "PYTHONLIBDIR=$(out)/${python.sitePackages}" - "LIBSEPOLA=${stdenv.lib.getLib libsepol}/lib/libsepol.a" + "LIBSEPOLA=${lib.getLib libsepol}/lib/libsepol.a" ]; diff --git a/pkgs/os-specific/linux/selinux-sandbox/default.nix b/pkgs/os-specific/linux/selinux-sandbox/default.nix index 387db08e1d6..a10588bacf1 100644 --- a/pkgs/os-specific/linux/selinux-sandbox/default.nix +++ b/pkgs/os-specific/linux/selinux-sandbox/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, bash, coreutils, python3 +{ lib, stdenv, fetchurl, bash, coreutils, python3 , libcap_ng, policycoreutils, selinux-python, dbus , xorgserver, openbox, xmodmap }: # this is python3 only as it depends on selinux-python -with stdenv.lib; +with lib; with python3.pkgs; stdenv.mkDerivation rec { @@ -58,4 +58,3 @@ stdenv.mkDerivation rec { platforms = platforms.linux; }; } - diff --git a/pkgs/os-specific/linux/semodule-utils/default.nix b/pkgs/os-specific/linux/semodule-utils/default.nix index c1243582a51..b76e715dbc2 100644 --- a/pkgs/os-specific/linux/semodule-utils/default.nix +++ b/pkgs/os-specific/linux/semodule-utils/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" - "LIBSEPOLA=${stdenv.lib.getLib libsepol}/lib/libsepol.a" + "LIBSEPOLA=${lib.getLib libsepol}/lib/libsepol.a" ]; meta = with lib; { diff --git a/pkgs/os-specific/linux/setools/default.nix b/pkgs/os-specific/linux/setools/default.nix index c0ed4102aaf..0da84ab1cef 100644 --- a/pkgs/os-specific/linux/setools/default.nix +++ b/pkgs/os-specific/linux/setools/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchFromGitHub, python3 +{ lib, fetchFromGitHub, python3 , libsepol, libselinux, checkpolicy , withGraphics ? false }: -with stdenv.lib; +with lib; with python3.pkgs; buildPythonApplication rec { @@ -30,7 +30,7 @@ buildPythonApplication rec { setupPyBuildFlags = [ "-i" ]; preBuild = '' - export SEPOL="${stdenv.lib.getLib libsepol}/lib/libsepol.a" + export SEPOL="${lib.getLib libsepol}/lib/libsepol.a" ''; meta = { diff --git a/pkgs/os-specific/linux/seturgent/default.nix b/pkgs/os-specific/linux/seturgent/default.nix index 8cfc9d35940..a2ffcae3d6b 100644 --- a/pkgs/os-specific/linux/seturgent/default.nix +++ b/pkgs/os-specific/linux/seturgent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, xorgproto, unzip }: +{ lib, stdenv, fetchurl, libX11, xorgproto, unzip }: stdenv.mkDerivation { name = "seturgent-2012-08-17"; @@ -18,10 +18,10 @@ stdenv.mkDerivation { ''; meta = { - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; description = "Set an application's urgency hint (or not)"; - maintainers = [ stdenv.lib.maintainers.yarr ]; + maintainers = [ lib.maintainers.yarr ]; homepage = "https://github.com/hiltjo/seturgent"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; } diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix index a6d288e0e72..0ff6fa1f341 100644 --- a/pkgs/os-specific/linux/shadow/default.nix +++ b/pkgs/os-specific/linux/shadow/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { sha256 = "13407r6qwss00504qy740jghb2dzd561la7dhp47rg8w3g8jarpn"; }; - buildInputs = stdenv.lib.optional (pam != null && stdenv.isLinux) pam; + buildInputs = lib.optional (pam != null && stdenv.isLinux) pam; nativeBuildInputs = [autoreconfHook libxslt libxml2 docbook_xml_dtd_45 docbook_xsl flex bison itstool ]; @@ -59,9 +59,9 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-man" "--with-group-name-max-length=32" - ] ++ stdenv.lib.optional (stdenv.hostPlatform.libc != "glibc") "--disable-nscd"; + ] ++ lib.optional (stdenv.hostPlatform.libc != "glibc") "--disable-nscd"; - preBuild = stdenv.lib.optionalString (stdenv.hostPlatform.libc == "glibc") + preBuild = lib.optionalString (stdenv.hostPlatform.libc == "glibc") '' substituteInPlace lib/nscd.c --replace /usr/sbin/nscd ${glibc.bin}/bin/nscd ''; diff --git a/pkgs/os-specific/linux/sinit/default.nix b/pkgs/os-specific/linux/sinit/default.nix index 71bd887535b..830087013fe 100644 --- a/pkgs/os-specific/linux/sinit/default.nix +++ b/pkgs/os-specific/linux/sinit/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchgit, rcinit ? null, rcshutdown ? null, rcreboot ? null}: +{lib, stdenv, fetchgit, rcinit ? null, rcshutdown ? null, rcreboot ? null}: let s = # Generated upstream information rec { @@ -10,7 +10,7 @@ let rev = "refs/tags/v${version}"; }; buildInputs = [ - (stdenv.lib.getOutput "static" stdenv.cc.libc) + (lib.getOutput "static" stdenv.cc.libc) ]; in stdenv.mkDerivation { @@ -21,16 +21,16 @@ stdenv.mkDerivation { }; makeFlags = ["PREFIX=$(out)"]; preConfigure = "" - + (stdenv.lib.optionalString (rcinit != null) ''sed -re 's@(rcinitcmd[^"]*")[^"]*"@\1${rcinit}"@' -i config.def.h; '') - + (stdenv.lib.optionalString (rcshutdown != null) ''sed -re 's@(rc(reboot|poweroff)cmd[^"]*")[^"]*"@\1${rcshutdown}"@' -i config.def.h; '') - + (stdenv.lib.optionalString (rcreboot != null) ''sed -re 's@(rc(reboot)cmd[^"]*")[^"]*"@\1${rcreboot}"@' -i config.def.h; '') + + (lib.optionalString (rcinit != null) ''sed -re 's@(rcinitcmd[^"]*")[^"]*"@\1${rcinit}"@' -i config.def.h; '') + + (lib.optionalString (rcshutdown != null) ''sed -re 's@(rc(reboot|poweroff)cmd[^"]*")[^"]*"@\1${rcshutdown}"@' -i config.def.h; '') + + (lib.optionalString (rcreboot != null) ''sed -re 's@(rc(reboot)cmd[^"]*")[^"]*"@\1${rcreboot}"@' -i config.def.h; '') ; meta = { inherit (s) version; - description = ''A very minimal Linux init implementation from suckless.org''; - license = stdenv.lib.licenses.mit ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + description = "A very minimal Linux init implementation from suckless.org"; + license = lib.licenses.mit ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; homepage = "https://tools.suckless.org/sinit"; downloadPage = "https://git.suckless.org/sinit"; }; diff --git a/pkgs/os-specific/linux/speedometer/default.nix b/pkgs/os-specific/linux/speedometer/default.nix index e4d374b0c41..2801334688b 100644 --- a/pkgs/os-specific/linux/speedometer/default.nix +++ b/pkgs/os-specific/linux/speedometer/default.nix @@ -5,7 +5,7 @@ pythonPackages.buildPythonApplication rec { version = "2.8"; src = fetchurl { - url = "http://excess.org/speedometer/speedometer-${version}.tar.gz"; + url = "https://excess.org/speedometer/speedometer-${version}.tar.gz"; sha256 = "060bikv3gwr203jbdmvawsfhc0yq0bg1m42dk8czx1nqvwvgv6fm"; }; @@ -18,7 +18,7 @@ pythonPackages.buildPythonApplication rec { meta = with lib; { description = "Measure and display the rate of data across a network connection or data being stored in a file"; - homepage = "http://excess.org/speedometer/"; + homepage = "https://excess.org/speedometer/"; license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ Baughn ]; diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix index 0398757c57e..2973b87210b 100644 --- a/pkgs/os-specific/linux/sssd/default.nix +++ b/pkgs/os-specific/linux/sssd/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, fetchpatch, glibc, augeas, dnsutils, c-ares, curl, cyrus_sasl, ding-libs, libnl, libunistring, nss, samba, nfs-utils, doxygen, - python, python3, pam, popt, talloc, tdb, tevent, pkgconfig, ldb, openldap, + python, python3, pam, popt, talloc, tdb, tevent, pkg-config, ldb, openldap, pcre, kerberos, cifs-utils, glib, keyutils, dbus, fakeroot, libxslt, libxml2, libuuid, ldap, systemd, nspr, check, cmocka, uid_wrapper, nss_wrapper, ncurses, Po4a, http-parser, jansson, @@ -55,14 +55,14 @@ stdenv.mkDerivation rec { --with-ldb-lib-dir=$out/modules/ldb --with-nscd=${glibc.bin}/sbin/nscd ) - '' + stdenv.lib.optionalString withSudo '' + '' + lib.optionalString withSudo '' configureFlagsArray+=("--with-sudo") ''; enableParallelBuilding = true; buildInputs = [ augeas dnsutils c-ares curl cyrus_sasl ding-libs libnl libunistring nss samba nfs-utils doxygen python python3 popt - talloc tdb tevent pkgconfig ldb pam openldap pcre kerberos + talloc tdb tevent pkg-config ldb pam openldap pcre kerberos cifs-utils glib keyutils dbus fakeroot libxslt libxml2 libuuid ldap systemd nspr check cmocka uid_wrapper nss_wrapper ncurses Po4a http-parser jansson ]; diff --git a/pkgs/os-specific/linux/statifier/default.nix b/pkgs/os-specific/linux/statifier/default.nix index 376ae47ffbe..5afb399fc16 100644 --- a/pkgs/os-specific/linux/statifier/default.nix +++ b/pkgs/os-specific/linux/statifier/default.nix @@ -1,4 +1,4 @@ -{ multiStdenv, fetchurl }: +{ lib, multiStdenv, fetchurl }: let version = "1.7.4"; in multiStdenv.mkDerivation { @@ -16,7 +16,7 @@ multiStdenv.mkDerivation { sed -e s@/bin/bash@"${multiStdenv.shell}"@g -i src/*.sh ''; - meta = with multiStdenv.lib; { + meta = with lib; { description = "Tool for creating static Linux binaries"; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 0f8702eb6e0..ecbd23e117f 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, cmake, kernel, installShellFiles +{ lib, stdenv, fetchFromGitHub, cmake, kernel, installShellFiles , luajit, zlib, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc, elfutils, tbb, c-ares, protobuf, grpc }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "sysdig"; version = "0.27.1"; diff --git a/pkgs/os-specific/linux/sysfsutils/default.nix b/pkgs/os-specific/linux/sysfsutils/default.nix index 3b2d54bc83a..4daac076e58 100644 --- a/pkgs/os-specific/linux/sysfsutils/default.nix +++ b/pkgs/os-specific/linux/sysfsutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "sysfsutils-2.1.0"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { filesystem in Linux kernel versions 2.5+ that exposes a system's device tree. ''; - license = with stdenv.lib.licenses; [ gpl2 lgpl21 ]; - platforms = stdenv.lib.platforms.linux; + license = with lib.licenses; [ gpl2 lgpl21 ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/sysklogd/default.nix b/pkgs/os-specific/linux/sysklogd/default.nix index 454527321fb..af180b5e524 100644 --- a/pkgs/os-specific/linux/sysklogd/default.nix +++ b/pkgs/os-specific/linux/sysklogd/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "00f2wy6f0qng7qzga4iicyzl9j8b7mp6mrpfky5jxj93ms2w2rji"; }; - patches = [ ./systemd.patch ./union-wait.patch ]; + patches = [ ./systemd.patch ./union-wait.patch ./fix-includes-for-musl.patch ]; NIX_CFLAGS_COMPILE = "-DSYSV"; diff --git a/pkgs/os-specific/linux/sysklogd/fix-includes-for-musl.patch b/pkgs/os-specific/linux/sysklogd/fix-includes-for-musl.patch new file mode 100644 index 00000000000..87e56a10db8 --- /dev/null +++ b/pkgs/os-specific/linux/sysklogd/fix-includes-for-musl.patch @@ -0,0 +1,120 @@ +# this patch both fixes some include paths as well as removes glibc +# gates around defines that musl-libc also depends on. +diff -u sysklogd-1.5.1.orig/klogd.c sysklogd-1.5.1/klogd.c +--- sysklogd-1.5.1.orig/klogd.c 2014-10-04 15:47:18.000000000 -0400 ++++ sysklogd-1.5.1/klogd.c 2021-01-18 23:09:23.000000000 -0500 +@@ -260,11 +260,8 @@ + #include <unistd.h> + #include <signal.h> + #include <errno.h> +-#include <sys/fcntl.h> ++#include <fcntl.h> + #include <sys/stat.h> +-#if !defined(__GLIBC__) +-#include <linux/time.h> +-#endif /* __GLIBC__ */ + #include <stdarg.h> + #include <paths.h> + #include <stdlib.h> +@@ -277,13 +274,8 @@ + + #define __LIBRARY__ + #include <linux/unistd.h> +-#if !defined(__GLIBC__) +-# define __NR_ksyslog __NR_syslog +-_syscall3(int,ksyslog,int, type, char *, buf, int, len); +-#else + #include <sys/klog.h> + #define ksyslog klogctl +-#endif + + #define LOG_BUFFER_SIZE 4096 + #define LOG_LINE_LENGTH 1000 +diff -u sysklogd-1.5.1.orig/ksym_mod.c sysklogd-1.5.1/ksym_mod.c +--- sysklogd-1.5.1.orig/ksym_mod.c 2014-10-04 15:47:18.000000000 -0400 ++++ sysklogd-1.5.1/ksym_mod.c 2021-01-18 23:09:57.000000000 -0500 +@@ -113,12 +113,9 @@ + #include <unistd.h> + #include <signal.h> + #include <errno.h> +-#include <sys/fcntl.h> ++#include <fcntl.h> + #include <sys/stat.h> + #include "module.h" +-#if !defined(__GLIBC__) +-#include <linux/time.h> +-#endif /* __GLIBC__ */ + #include <stdarg.h> + #include <paths.h> + #include <linux/version.h> +diff -u sysklogd-1.5.1.orig/pidfile.c sysklogd-1.5.1/pidfile.c +--- sysklogd-1.5.1.orig/pidfile.c 2014-10-04 15:47:18.000000000 -0400 ++++ sysklogd-1.5.1/pidfile.c 2021-01-18 23:23:55.000000000 -0500 +@@ -25,6 +25,7 @@ + */ + + #include <stdio.h> ++#include <fcntl.h> + #include <unistd.h> + #include <sys/stat.h> + #include <sys/file.h> +diff -u sysklogd-1.5.1.orig/syslog.c sysklogd-1.5.1/syslog.c +--- sysklogd-1.5.1.orig/syslog.c 2014-10-04 15:47:18.000000000 -0400 ++++ sysklogd-1.5.1/syslog.c 2021-01-18 23:11:45.000000000 -0500 +@@ -55,7 +55,6 @@ + #include <sys/types.h> + #include <sys/socket.h> + #include <sys/file.h> +-#include <sys/signal.h> + #include <sys/syslog.h> + #if 0 + #include "syslog.h" +@@ -64,6 +63,8 @@ + + #include <sys/uio.h> + #include <sys/wait.h> ++#include <signal.h> ++#include <fcntl.h> + #include <netdb.h> + #include <string.h> + #include <time.h> +diff -u sysklogd-1.5.1.orig/syslogd.c sysklogd-1.5.1/syslogd.c +--- sysklogd-1.5.1.orig/syslogd.c 2014-10-04 15:47:18.000000000 -0400 ++++ sysklogd-1.5.1/syslogd.c 2021-01-18 23:13:25.000000000 -0500 +@@ -519,9 +519,9 @@ + #include <time.h> + + #define SYSLOG_NAMES ++#include <errno.h> + #include <sys/syslog.h> + #include <sys/param.h> +-#include <sys/errno.h> + #include <sys/ioctl.h> + #include <sys/stat.h> + #include <sys/wait.h> +@@ -818,9 +818,7 @@ + void init(); + void cfline(char *line, register struct filed *f); + int decode(char *name, struct code *codetab); +-#if defined(__GLIBC__) + #define dprintf mydprintf +-#endif /* __GLIBC__ */ + static void dprintf(char *, ...); + static void allocate_log(void); + void sighup_handler(); +@@ -840,15 +838,9 @@ + register char *p; + #ifndef TESTING + ssize_t msglen; +-#endif +-#if !defined(__GLIBC__) +- int len, num_fds; +-#else /* __GLIBC__ */ +-#ifndef TESTING + socklen_t len; + #endif + int num_fds; +-#endif /* __GLIBC__ */ + /* + * It took me quite some time to figure out how this is + * supposed to work so I guess I should better write it down. diff --git a/pkgs/os-specific/linux/sysklogd/systemd.patch b/pkgs/os-specific/linux/sysklogd/systemd.patch index 0a7fb166bd7..a170f67cadb 100644 --- a/pkgs/os-specific/linux/sysklogd/systemd.patch +++ b/pkgs/os-specific/linux/sysklogd/systemd.patch @@ -71,9 +71,9 @@ diff -ruN -x '*~' sysklogd-1.5-old/sd-daemon.c sysklogd-1.5/sd-daemon.c +#include <sys/stat.h> +#include <sys/socket.h> +#include <sys/un.h> -+#include <sys/fcntl.h> +#include <netinet/in.h> +#include <stdlib.h> ++#include <fcntl.h> +#include <errno.h> +#include <unistd.h> +#include <string.h> diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix index cf263281da2..1b2415dd805 100644 --- a/pkgs/os-specific/linux/syslinux/default.nix +++ b/pkgs/os-specific/linux/syslinux/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation { "PERL=perl" "HEXDATE=0x00000000" ] - ++ stdenv.lib.optionals stdenv.hostPlatform.isi686 [ "bios" "efi32" ]; + ++ lib.optionals stdenv.hostPlatform.isi686 [ "bios" "efi32" ]; doCheck = false; # fails. some fail in a sandbox, others require qemu diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix index 258da07c40b..2d54223edb5 100644 --- a/pkgs/os-specific/linux/sysstat/default.nix +++ b/pkgs/os-specific/linux/sysstat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gettext, bzip2 }: +{ lib, stdenv, fetchurl, gettext, bzip2 }: stdenv.mkDerivation rec { name = "sysstat-12.3.2"; @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://sebastien.godard.pagesperso-orange.fr/"; description = "A collection of performance monitoring tools for Linux (such as sar, iostat and pidstat)"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.eelco ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.eelco ]; }; } diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 2822bffdb51..421fc5986af 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -6,7 +6,7 @@ , ninja , meson , m4 -, pkgconfig +, pkg-config , coreutils , gperf , getent @@ -250,7 +250,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ - pkgconfig + pkg-config gperf ninja meson @@ -320,7 +320,7 @@ stdenv.mkDerivation { "-Dgcrypt=${lib.boolToString (libgcrypt != null)}" "-Dimportd=${lib.boolToString withImportd}" "-Dlz4=${lib.boolToString withCompression}" - "-Dhomed=${stdenv.lib.boolToString withHomed}" + "-Dhomed=${lib.boolToString withHomed}" "-Dlogind=${lib.boolToString withLogind}" "-Dlocaled=${lib.boolToString withLocaled}" "-Dhostnamed=${lib.boolToString withHostnamed}" diff --git a/pkgs/os-specific/linux/sysvinit/default.nix b/pkgs/os-specific/linux/sysvinit/default.nix index 5d081f2db82..8f9acdf0662 100644 --- a/pkgs/os-specific/linux/sysvinit/default.nix +++ b/pkgs/os-specific/linux/sysvinit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, withoutInitTools ? false }: +{ lib, stdenv, fetchurl, withoutInitTools ? false }: let version = "2.97"; in @@ -26,7 +26,7 @@ stdenv.mkDerivation { mv $out/sbin/killall5 $out/bin ln -sf killall5 $out/bin/pidof '' - + stdenv.lib.optionalString withoutInitTools + + lib.optionalString withoutInitTools '' shopt -s extglob rm -rf $out/sbin/!(sulogin) @@ -39,7 +39,7 @@ stdenv.mkDerivation { meta = { homepage = "https://www.nongnu.org/sysvinit/"; description = "Utilities related to booting and shutdown"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/os-specific/linux/target-isns/default.nix b/pkgs/os-specific/linux/target-isns/default.nix new file mode 100644 index 00000000000..fdc0c52a0bf --- /dev/null +++ b/pkgs/os-specific/linux/target-isns/default.nix @@ -0,0 +1,36 @@ +{ lib, stdenv, cmake, fetchFromGitHub, fetchpatch } : + +stdenv.mkDerivation rec { + pname = "target-isns"; + version = "0.6.8"; + + src = fetchFromGitHub { + owner = "open-iscsi"; + repo = pname; + rev = "v${version}"; + sha256 = "1b6jjalvvkkjyjbg1pcgk8vmvc6xzzksyjnh2pfi45bbpya4zxim"; + }; + + patches = [ + # fix absoulute paths + ./install_prefix_path.patch + + # fix gcc 10 compiler warning, remove with next update + (fetchpatch { + url = "https://github.com/open-iscsi/target-isns/commit/3d0c47dd89bcf83d828bcc22ecaaa5f58d78b58e.patch"; + sha256 = "1x2bkc1ff15621svhpq1r11m0q4ajv0j4fng6hm7wkkbr2s6d1vx"; + }) + ]; + + cmakeFlags = [ "-DSUPPORT_SYSTEMD=ON" ]; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "iSNS client for the Linux LIO iSCSI target"; + homepage = "https://github.com/open-iscsi/target-isns"; + maintainers = [ maintainers.markuskowa ]; + license = licenses.gpl2Only; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/target-isns/install_prefix_path.patch b/pkgs/os-specific/linux/target-isns/install_prefix_path.patch new file mode 100644 index 00000000000..f98fc21b7a2 --- /dev/null +++ b/pkgs/os-specific/linux/target-isns/install_prefix_path.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f46144d..aeac3e4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -14,10 +14,10 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror") + option(SUPPORT_SYSTEMD "Support service control via systemd" OFF) + + add_subdirectory(src) +-install(FILES target-isns.conf DESTINATION /etc/) ++install(FILES target-isns.conf DESTINATION ${CMAKE_INSTALL_PREFIX}/etc/) + install(FILES target-isns.8 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man8/) + if (SUPPORT_SYSTEMD) +- install(FILES target-isns.service DESTINATION /usr/lib/systemd/system/) ++ install(FILES target-isns.service DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/systemd/system/) + endif (SUPPORT_SYSTEMD) + + add_subdirectory(tests) diff --git a/pkgs/os-specific/linux/targetcli/default.nix b/pkgs/os-specific/linux/targetcli/default.nix index ba1c063cc05..4d3446d5a5d 100644 --- a/pkgs/os-specific/linux/targetcli/default.nix +++ b/pkgs/os-specific/linux/targetcli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3, fetchFromGitHub }: +{ lib, python3, fetchFromGitHub }: python3.pkgs.buildPythonApplication rec { pname = "targetcli"; diff --git a/pkgs/os-specific/linux/tbs/default.nix b/pkgs/os-specific/linux/tbs/default.nix index 6502cc9c38e..d2b0bc08071 100644 --- a/pkgs/os-specific/linux/tbs/default.nix +++ b/pkgs/os-specific/linux/tbs/default.nix @@ -58,6 +58,6 @@ in stdenv.mkDerivation { license = licenses.gpl2; maintainers = with maintainers; [ ck3d ]; priority = -1; - broken = stdenv.lib.versionAtLeast kernel.version "4.18"; + broken = lib.versionAtLeast kernel.version "4.18"; }; } diff --git a/pkgs/os-specific/linux/tcp-wrappers/default.nix b/pkgs/os-specific/linux/tcp-wrappers/default.nix index b3d59cf5a6a..92a6b328b2c 100644 --- a/pkgs/os-specific/linux/tcp-wrappers/default.nix +++ b/pkgs/os-specific/linux/tcp-wrappers/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, libnsl }: +{ fetchurl, lib, stdenv, libnsl }: let vanillaVersion = "7.6.q"; @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { # Fix __BEGIN_DECLS usage (even if it wasn't non-standard, this doesn't include sys/cdefs.h) patches = [ ./cdecls.patch ]; - postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + postPatch = lib.optionalString stdenv.hostPlatform.isMusl '' substituteInPlace Makefile \ --replace '-DNETGROUP' '-DUSE_GETDOMAIN' ''; @@ -70,6 +70,6 @@ in stdenv.mkDerivation rec { homepage = "ftp://ftp.porcupine.org/pub/security/index.html"; license = "BSD-style"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/thunderbolt/default.nix b/pkgs/os-specific/linux/thunderbolt/default.nix index d9817a6c04b..e532f9965aa 100644 --- a/pkgs/os-specific/linux/thunderbolt/default.nix +++ b/pkgs/os-specific/linux/thunderbolt/default.nix @@ -1,8 +1,8 @@ -{ stdenv +{ lib, stdenv , boost , cmake , fetchFromGitHub -, pkgconfig +, pkg-config , txt2tags }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "02w1bfm7xvq0dzkhwqiq0camkzz9kvciyhnsis61c8vzp39cwx0x"; }; - nativeBuildInputs = [ cmake pkgconfig txt2tags ]; + nativeBuildInputs = [ cmake pkg-config txt2tags ]; buildInputs = [ boost ]; cmakeFlags = [ @@ -26,9 +26,9 @@ stdenv.mkDerivation rec { meta = { description = "Thunderbolt(TM) user-space components"; - license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.ryantrinkle ]; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.ryantrinkle ]; homepage = "https://01.org/thunderbolt-sw"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/tomb/default.nix b/pkgs/os-specific/linux/tomb/default.nix index 438934f07d5..af04476aa1d 100644 --- a/pkgs/os-specific/linux/tomb/default.nix +++ b/pkgs/os-specific/linux/tomb/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "tomb"; - version = "2.8.1"; + version = "2.9"; src = fetchFromGitHub { owner = "dyne"; repo = "Tomb"; rev = "v${version}"; - sha256 = "03zj9az5626kjg96rkqr5sjydqwlrzhz0gq35r62sajv6mn2qm6s"; + sha256 = "0d6vmfcf4kd0p2bcljmdnyc2fmbwvar81cc472zx86r7yc3ih102"; }; buildInputs = [ sudo zsh pinentry ]; diff --git a/pkgs/os-specific/linux/tp_smapi/default.nix b/pkgs/os-specific/linux/tp_smapi/default.nix index 5e0e9c539ea..d9b4333d249 100644 --- a/pkgs/os-specific/linux/tp_smapi/default.nix +++ b/pkgs/os-specific/linux/tp_smapi/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = { description = "IBM ThinkPad hardware functions driver"; homepage = "https://github.com/evgeni/tp_smapi"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; maintainers = [ ]; # driver is only ment for linux thinkpads i think bellow platforms should cover it. platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/os-specific/linux/tpacpi-bat/default.nix b/pkgs/os-specific/linux/tpacpi-bat/default.nix index bb6d51669e6..5512eed63ab 100644 --- a/pkgs/os-specific/linux/tpacpi-bat/default.nix +++ b/pkgs/os-specific/linux/tpacpi-bat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, perl, kmod, coreutils }: +{ lib, stdenv, fetchFromGitHub, perl, kmod, coreutils }: # Requires the acpi_call kernel module in order to run. stdenv.mkDerivation rec { @@ -26,9 +26,9 @@ stdenv.mkDerivation rec { ''; meta = { - maintainers = [stdenv.lib.maintainers.orbekk]; - platforms = stdenv.lib.platforms.linux; + maintainers = [lib.maintainers.orbekk]; + platforms = lib.platforms.linux; description = "Tool to set battery charging thesholds on Lenovo Thinkpad"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; }; } diff --git a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix index 4db4d64bc93..594cf6bfc42 100644 --- a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix +++ b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchgit, qtbase, cmake, asciidoc, docbook_xsl, json_c, mesa_glu, freeglut, trace-cmd, pkg-config }: +{ lib, mkDerivation, fetchgit, qtbase, cmake, asciidoc, docbook_xsl, json_c, mesa_glu, freeglut, trace-cmd, pkg-config }: mkDerivation { pname = "kernelshark"; version = "1.1.0"; diff --git a/pkgs/os-specific/linux/tunctl/default.nix b/pkgs/os-specific/linux/tunctl/default.nix index c20c3e98f55..549a607b152 100644 --- a/pkgs/os-specific/linux/tunctl/default.nix +++ b/pkgs/os-specific/linux/tunctl/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation { name = "tunctl-1.5"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { homepage = "http://tunctl.sourceforge.net/"; description = "Utility to set up and maintain TUN/TAP network interfaces"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix index 03798b9fe5c..7508e1faf15 100644 --- a/pkgs/os-specific/linux/uclibc/default.nix +++ b/pkgs/os-specific/linux/uclibc/default.nix @@ -39,7 +39,7 @@ let UCLIBC_SUSV4_LEGACY y UCLIBC_HAS_THREADS_NATIVE y KERNEL_HEADERS "${linuxHeaders}/include" - '' + stdenv.lib.optionalString (stdenv.isAarch32 && stdenv.buildPlatform != stdenv.hostPlatform) '' + '' + lib.optionalString (stdenv.isAarch32 && stdenv.buildPlatform != stdenv.hostPlatform) '' CONFIG_ARM_EABI y ARCH_WANTS_BIG_ENDIAN n ARCH_BIG_ENDIAN n @@ -68,7 +68,7 @@ stdenv.mkDerivation { cat << EOF | parseconfig ${nixConfig} ${extraConfig} - ${stdenv.hostPlatform.platform.uclibc.extraConfig or ""} + ${stdenv.hostPlatform.uclibc.extraConfig or ""} EOF ( set +o pipefail; yes "" | make oldconfig ) ''; @@ -83,7 +83,7 @@ stdenv.mkDerivation { makeFlags = [ "ARCH=${stdenv.hostPlatform.parsed.cpu.name}" "VERBOSE=1" - ] ++ stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "CROSS=${stdenv.cc.targetPrefix}" ]; diff --git a/pkgs/os-specific/linux/udisks-glue/default.nix b/pkgs/os-specific/linux/udisks-glue/default.nix index 60a1f8a619d..453df94f8fb 100644 --- a/pkgs/os-specific/linux/udisks-glue/default.nix +++ b/pkgs/os-specific/linux/udisks-glue/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, automake, autoconf, udisks1, dbus-glib, glib, libconfuse }: +{ lib, stdenv, fetchurl, pkg-config, automake, autoconf, udisks1, dbus-glib, glib, libconfuse }: stdenv.mkDerivation { name = "udisks-glue-1.3.5"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "317d25bf249278dc8f6a5dcf18f760512427c772b9afe3cfe34e6e1baa258176"; }; - nativeBuildInputs = [ pkgconfig automake autoconf ]; + nativeBuildInputs = [ pkg-config automake autoconf ]; buildInputs = [ udisks1 dbus-glib glib libconfuse ]; preConfigure = "sh autogen.sh"; @@ -16,9 +16,9 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/fernandotcl/udisks-glue"; description = "A tool to associate udisks events to user-defined actions"; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [pSub]; - license = stdenv.lib.licenses.bsd2; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [pSub]; + license = lib.licenses.bsd2; broken = true; hydraPlatforms = []; }; diff --git a/pkgs/os-specific/linux/udisks/1-default.nix b/pkgs/os-specific/linux/udisks/1-default.nix index 8f48ae017f0..f20dc6b6076 100644 --- a/pkgs/os-specific/linux/udisks/1-default.nix +++ b/pkgs/os-specific/linux/udisks/1-default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, sg3_utils, udev, glib, dbus, dbus-glib +{ lib, stdenv, fetchurl, pkg-config, sg3_utils, udev, glib, dbus, dbus-glib , polkit, parted, lvm2, libatasmart, intltool, libuuid, mdadm , libxslt, docbook_xsl, util-linux, libgudev }: @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { lvm2 libatasmart intltool libuuid libxslt docbook_xsl ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; configureFlags = [ "--localstatedir=/var" "--enable-lvm2" ]; diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix index 1152ab7ca1e..7be729f4ac8 100644 --- a/pkgs/os-specific/linux/udisks/2-default.nix +++ b/pkgs/os-specific/linux/udisks/2-default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, substituteAll, libtool, pkgconfig, gettext, gnused +{ lib, stdenv, fetchFromGitHub, fetchpatch, substituteAll, libtool, pkg-config, gettext, gnused , gtk-doc, acl, systemd, glib, libatasmart, polkit, coreutils, bash, which , expat, libxslt, docbook_xsl, util-linux, mdadm, libgudev, libblockdev, parted , gobject-introspection, docbook_xml_dtd_412, docbook_xml_dtd_43, autoconf, automake @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "01wx2x8xyal595dhdih7rva2bz7gqzgwdp56gi0ikjdzayx17wcf"; }; - outputs = [ "out" "man" "dev" ] ++ stdenv.lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) "devdoc"; + outputs = [ "out" "man" "dev" ] ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) "devdoc"; patches = [ (substituteAll { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { }) (substituteAll { src = ./force-path.patch; - path = stdenv.lib.makeBinPath [ + path = lib.makeBinPath [ btrfs-progs coreutils dosfstools e2fsprogs exfat f2fs-tools nilfs-utils xfsprogs ntfs3g parted util-linux ]; @@ -46,11 +46,11 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - autoconf automake pkgconfig libtool gettext which gobject-introspection + autoconf automake pkg-config libtool gettext which gobject-introspection gtk-doc libxslt docbook_xml_dtd_412 docbook_xml_dtd_43 docbook_xsl ]; - postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + postPatch = lib.optionalString stdenv.hostPlatform.isMusl '' substituteInPlace udisks/udisksclient.c \ --replace 'defined( __GNUC_PREREQ)' 1 \ --replace '__GNUC_PREREQ(4,6)' 1 @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { preConfigure = "NOCONFIGURE=1 ./autogen.sh"; configureFlags = [ - (stdenv.lib.enableFeature (stdenv.buildPlatform == stdenv.hostPlatform) "gtk-doc") + (lib.enableFeature (stdenv.buildPlatform == stdenv.hostPlatform) "gtk-doc") "--localstatedir=/var" "--with-systemdsystemunitdir=$(out)/etc/systemd/system" "--with-udevdir=$(out)/lib/udev" diff --git a/pkgs/os-specific/linux/undervolt/default.nix b/pkgs/os-specific/linux/undervolt/default.nix index 5f4ffb50c07..cc9fb737465 100644 --- a/pkgs/os-specific/linux/undervolt/default.nix +++ b/pkgs/os-specific/linux/undervolt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { version = "0.3.0"; diff --git a/pkgs/os-specific/linux/unstick/default.nix b/pkgs/os-specific/linux/unstick/default.nix index cca6e6210cb..7d839f8acdb 100644 --- a/pkgs/os-specific/linux/unstick/default.nix +++ b/pkgs/os-specific/linux/unstick/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, meson, ninja, pkgconfig, libseccomp }: +{ stdenv, lib, fetchFromGitHub, meson, ninja, pkg-config, libseccomp }: stdenv.mkDerivation rec { name = "unstick"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sourceRoot = "source/src"; - nativeBuildInputs = [ meson ninja pkgconfig ]; + nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ libseccomp ]; meta = { diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index 3a5fb4fa261..08bebefed13 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, pkgconfig +, pkg-config , libxslt , docbook_xsl , udev @@ -30,7 +30,7 @@ stdenv.mkDerivation { gettext gobject-introspection libxslt - pkgconfig + pkg-config ]; buildInputs = [ @@ -39,7 +39,7 @@ stdenv.mkDerivation { udev systemd ] - ++ stdenv.lib.optional useIMobileDevice libimobiledevice + ++ lib.optional useIMobileDevice libimobiledevice ; propagatedBuildInputs = [ diff --git a/pkgs/os-specific/linux/usbguard/default.nix b/pkgs/os-specific/linux/usbguard/default.nix index e2746c7a1e7..7d4563baee4 100644 --- a/pkgs/os-specific/linux/usbguard/default.nix +++ b/pkgs/os-specific/linux/usbguard/default.nix @@ -1,30 +1,45 @@ -{ - stdenv, fetchurl, lib, - pkgconfig, libxslt, libxml2, docbook_xml_dtd_45, docbook_xsl, asciidoc, - dbus-glib, libcap_ng, libqb, libseccomp, polkit, protobuf, - audit, - libgcrypt ? null, - libsodium ? null +{ stdenv +, lib +, fetchFromGitHub +, autoreconfHook +, installShellFiles +, nixosTests +, asciidoc +, pkg-config +, libxslt +, libxml2 +, docbook_xml_dtd_45 +, docbook_xsl +, dbus-glib +, libcap_ng +, libqb +, libseccomp +, polkit +, protobuf +, audit +, libgcrypt +, libsodium }: -with stdenv.lib; - assert libgcrypt != null -> libsodium == null; stdenv.mkDerivation rec { - version = "0.7.8"; + version = "1.0.0"; pname = "usbguard"; - repo = "https://github.com/USBGuard/usbguard"; - - src = fetchurl { - url = "${repo}/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "1il5immqfxh2cj8wn1bfk7l42inflzgjf07yqprpz7r3lalbxc25"; + src = fetchFromGitHub { + owner = "USBGuard"; + repo = pname; + rev = "usbguard-${version}"; + sha256 = "sha256-CPuBQmDOpXWn0jPo4HRyDCZUpDy5NmbvUHxXoVbMd/I="; + fetchSubmodules = true; }; nativeBuildInputs = [ + autoreconfHook + installShellFiles asciidoc - pkgconfig + pkg-config libxslt # xsltproc libxml2 # xmllint docbook_xml_dtd_45 @@ -54,8 +69,21 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { + postInstall = '' + installShellCompletion --bash --name usbguard.bash scripts/bash_completion/usbguard + installShellCompletion --zsh --name _usbguard scripts/usbguard-zsh-completion + ''; + + passthru.tests = nixosTests.usbguard; + + meta = with lib; { description = "The USBGuard software framework helps to protect your computer against BadUSB"; + longDescription = '' + USBGuard is a software framework for implementing USB device authorization + policies (what kind of USB devices are authorized) as well as method of + use policies (how a USB device may interact with the system). Simply put, + it is a USB device whitelisting tool. + ''; homepage = "https://usbguard.github.io/"; license = licenses.gpl2Plus; maintainers = [ maintainers.tnias ]; diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix index a723c18e842..9e298697d4b 100644 --- a/pkgs/os-specific/linux/usbutils/default.nix +++ b/pkgs/os-specific/linux/usbutils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, substituteAll, autoreconfHook, pkgconfig, libusb1, hwdata , python3 }: +{ lib, stdenv, fetchurl, substituteAll, autoreconfHook, pkg-config, libusb1, hwdata , python3 }: stdenv.mkDerivation rec { name = "usbutils-012"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libusb1 python3 ]; outputs = [ "out" "man" "python" ]; diff --git a/pkgs/os-specific/linux/usermount/default.nix b/pkgs/os-specific/linux/usermount/default.nix index 85f769d9dba..d0c690a9527 100644 --- a/pkgs/os-specific/linux/usermount/default.nix +++ b/pkgs/os-specific/linux/usermount/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, pkgconfig, dbus, libnotify, udisks2, gdk-pixbuf }: +{ lib, stdenv, fetchgit, pkg-config, dbus, libnotify, udisks2, gdk-pixbuf }: stdenv.mkDerivation { name = "usermount-0.1"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "0gpp0vwiwr7kgbhh26jspv3255662mnvnav6g8i2h0qxar8hf8w2"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ dbus libnotify udisks2 gdk-pixbuf ]; NIX_CFLAGS_COMPILE = "-DENABLE_NOTIFICATIONS"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/tom5760/usermount"; description = "A simple tool to automatically mount removable drives using UDisks2 and D-Bus"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mit; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index 600d10888c5..d7629f0df04 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, zlib, shadow +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, zlib, shadow , ncurses ? null, perl ? null, pam, systemd ? null, minimal ? false }: stdenv.mkDerivation rec { @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { "usrsbin_execdir=${placeholder "bin"}/sbin" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib pam ] ++ lib.filter (p: p != null) [ ncurses systemd perl ]; diff --git a/pkgs/os-specific/linux/uvcdynctrl/default.nix b/pkgs/os-specific/linux/uvcdynctrl/default.nix index 3d7fe1f5e15..d5f3a729978 100644 --- a/pkgs/os-specific/linux/uvcdynctrl/default.nix +++ b/pkgs/os-specific/linux/uvcdynctrl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, libxml2 }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libxml2 }: stdenv.mkDerivation { version = "0.3.0"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0s15xxgdx8lnka7vi8llbf6b0j4rhbjl6yp0qxaihysf890xj73s"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libxml2 ]; prePatch = '' diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix index b9cbd48944c..81a5f74c42f 100644 --- a/pkgs/os-specific/linux/v4l-utils/default.nix +++ b/pkgs/os-specific/linux/v4l-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, perl +{ stdenv, lib, fetchurl, pkg-config, perl , libjpeg, udev , withUtils ? true , withGUI ? true, alsaLib, libX11, qtbase, libGLU, wrapQtAppsHook @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { ln -s "$dev/include/libv4l1-videodev.h" "$dev/include/videodev.h" ''; - nativeBuildInputs = [ pkgconfig perl ] ++ lib.optional withQt wrapQtAppsHook; + nativeBuildInputs = [ pkg-config perl ] ++ lib.optional withQt wrapQtAppsHook; buildInputs = [ udev ] ++ lib.optionals withQt [ alsaLib libX11 qtbase libGLU ]; diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index 590e16f7993..41ab1a0f539 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -1,9 +1,9 @@ { lib, stdenv, fetchzip, kernel, perl, wireguard-tools, bc }: # module requires Linux >= 3.10 https://www.wireguard.io/install/#kernel-requirements -assert stdenv.lib.versionAtLeast kernel.version "3.10"; +assert lib.versionAtLeast kernel.version "3.10"; # wireguard upstreamed since 5.6 https://lists.zx2c4.com/pipermail/wireguard/2019-December/004704.html -assert stdenv.lib.versionOlder kernel.version "5.6"; +assert lib.versionOlder kernel.version "5.6"; stdenv.mkDerivation rec { pname = "wireguard"; diff --git a/pkgs/os-specific/linux/wireless-tools/default.nix b/pkgs/os-specific/linux/wireless-tools/default.nix index 687bb7647cf..fbe5d95e2a6 100644 --- a/pkgs/os-specific/linux/wireless-tools/default.nix +++ b/pkgs/os-specific/linux/wireless-tools/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { pname = "wireless-tools"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ]; meta = { - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 7703ffc0e4f..c90407ec6e6 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, fetchurl, openssl, pkgconfig, libnl +{ lib, stdenv, fetchurl, fetchpatch, openssl, pkg-config, libnl , dbus, readline ? null, pcsclite ? null }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { version = "2.9"; @@ -19,6 +19,12 @@ stdenv.mkDerivation rec { url = "https://w1.fi/security/2019-7/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch"; sha256 = "15xjyy7crb557wxpx898b5lnyblxghlij0xby5lmj9hpwwss34dz"; }) + (fetchpatch { + # Expose OWE key management capability over DBus, remove >= 2.10 + name = "dbus-Export-OWE-capability-and-OWE-BSS-key_mgmt.patch"; + url = "https://w1.fi/cgit/hostap/patch/?id=7800725afb27397f7d6033d4969e2aeb61af4737"; + sha256 = "0c1la7inf4m5y9gzdjjdnhpkx32pm8vi6m5knih8p77q4mbrdgg8"; + }) ]; # TODO: Patch epoll so that the dbus actually responds @@ -32,6 +38,7 @@ stdenv.mkDerivation rec { CONFIG_EAP_SAKE=y CONFIG_EAP_GPSK=y CONFIG_EAP_GPSK_SHA256=y + CONFIG_OWE=y CONFIG_WPS=y CONFIG_WPS_ER=y CONFIG_WPS_NFS=y @@ -81,13 +88,13 @@ stdenv.mkDerivation rec { cat -n .config substituteInPlace Makefile --replace /usr/local $out export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE \ - -I$(echo "${stdenv.lib.getDev libnl}"/include/libnl*/) \ - -I${stdenv.lib.getDev pcsclite}/include/PCSC/" + -I$(echo "${lib.getDev libnl}"/include/libnl*/) \ + -I${lib.getDev pcsclite}/include/PCSC/" ''; buildInputs = [ openssl libnl dbus readline pcsclite ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; postInstall = '' mkdir -p $out/share/man/man5 $out/share/man/man8 diff --git a/pkgs/os-specific/linux/wpa_supplicant/gui.nix b/pkgs/os-specific/linux/wpa_supplicant/gui.nix index ab1cece0f33..d2d59ba21a5 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/gui.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/gui.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchpatch, qtbase, qmake, inkscape, imagemagick, wpa_supplicant }: +{ lib, mkDerivation, fetchpatch, qtbase, qmake, inkscape, imagemagick, wpa_supplicant }: mkDerivation { name = "wpa_gui-${wpa_supplicant.version}"; diff --git a/pkgs/os-specific/linux/x86info/default.nix b/pkgs/os-specific/linux/x86info/default.nix index 9b745315b1c..dbda35670f6 100644 --- a/pkgs/os-specific/linux/x86info/default.nix +++ b/pkgs/os-specific/linux/x86info/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pciutils, python}: +{lib, stdenv, fetchurl, pciutils, python}: stdenv.mkDerivation rec { version = "1.30"; @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { x86info will identify all Intel/AMD/Centaur/Cyrix/VIA CPUs. It leverages the cpuid kernel module where possible. it supports parsing model specific registers (MSRs) via the msr kernel module. it will approximate processor - frequency, and identify the cache sizes and layout. + frequency, and identify the cache sizes and layout. ''; platforms = [ "i686-linux" "x86_64-linux" ]; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; homepage = "http://codemonkey.org.uk/projects/x86info/"; - maintainers = with stdenv.lib.maintainers; [jcumming]; + maintainers = with lib.maintainers; [jcumming]; }; } diff --git a/pkgs/os-specific/linux/xf86-input-cmt/default.nix b/pkgs/os-specific/linux/xf86-input-cmt/default.nix index e3ac4df2fd7..a973f844fd4 100644 --- a/pkgs/os-specific/linux/xf86-input-cmt/default.nix +++ b/pkgs/os-specific/linux/xf86-input-cmt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, xorgserver, xorgproto, +{ lib, stdenv, fetchFromGitHub, pkg-config, xorgserver, xorgproto, utilmacros, libgestures, libevdevc }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ./apply_patches.sh ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgserver xorgproto utilmacros libgestures libevdevc diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix index bea1871b0eb..e404ac72f5c 100644 --- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix +++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl , xorgproto, libX11, libXext, libXi, libXrandr, libXrender -, ncurses, pkgconfig, xorgserver, udev, libXinerama, pixman }: +, ncurses, pkg-config, xorgserver, udev, libXinerama, pixman }: stdenv.mkDerivation rec { name = "xf86-input-wacom-0.36.0"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ xorgproto libX11 libXext libXi libXrandr libXrender - ncurses pkgconfig xorgserver udev libXinerama pixman ]; + ncurses pkg-config xorgserver udev libXinerama pixman ]; preConfigure = '' mkdir -p $out/share/X11/xorg.conf.d diff --git a/pkgs/os-specific/linux/xf86-video-nested/default.nix b/pkgs/os-specific/linux/xf86-video-nested/default.nix index dbd59d530ce..7c93fa91854 100644 --- a/pkgs/os-specific/linux/xf86-video-nested/default.nix +++ b/pkgs/os-specific/linux/xf86-video-nested/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchgit, autoreconfHook, xorgproto, libX11, libXext -, pixman, pkgconfig, utilmacros, xorgserver +, pixman, pkg-config, utilmacros, xorgserver }: stdenv.mkDerivation { @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [ autoreconfHook xorgproto libX11 libXext pixman - pkgconfig utilmacros xorgserver + pkg-config utilmacros xorgserver ]; hardeningDisable = [ "fortify" ]; diff --git a/pkgs/os-specific/linux/xsensors/default.nix b/pkgs/os-specific/linux/xsensors/default.nix index 440a797a723..02ce560d8a9 100644 --- a/pkgs/os-specific/linux/xsensors/default.nix +++ b/pkgs/os-specific/linux/xsensors/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, gtk2, pkgconfig, lm_sensors }: +{ stdenv, lib, fetchurl, gtk2, pkg-config, lm_sensors }: stdenv.mkDerivation rec { pname = "xsensors"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { url = "http://www.linuxhardware.org/xsensors/xsensors-${version}.tar.gz"; sha256 = "1siplsfgvcxamyqf44h71jx6jdfmvhfm7mh0y1q8ps4zs6pj2zwh"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 lm_sensors ]; diff --git a/pkgs/os-specific/linux/zenmonitor/default.nix b/pkgs/os-specific/linux/zenmonitor/default.nix index 4fc2a11a65f..43cfd87cba5 100644 --- a/pkgs/os-specific/linux/zenmonitor/default.nix +++ b/pkgs/os-specific/linux/zenmonitor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, gtk3, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitHub, pkg-config, gtk3, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "zenmonitor"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ gtk3 ]; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; makeFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 59719922987..d61c0931e20 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub, fetchpatch , autoreconfHook269, util-linux, nukeReferences, coreutils , perl, buildPackages , configFile ? "all" @@ -9,32 +9,32 @@ , nfs-utils , gawk, gnugrep, gnused, systemd , smartmontools, sysstat, sudo -, pkgconfig +, pkg-config # Kernel dependencies , kernel ? null , enablePython ? true }: -with stdenv.lib; +with lib; let buildKernel = any (n: n == configFile) [ "kernel" "all" ]; buildUser = any (n: n == configFile) [ "user" "all" ]; + # remove this patch at the next ZFS release (> 2.0.1) + reapplyPathSanitizerPatch = fetchpatch { + url = "https://github.com/openzfs/zfs/commit/03f036cbccdd8699f5fe8540ef317595a35bceb8.patch"; + sha256 = "c157bbb6551a4e720c3faba005e1b72e4692d304c6ff5e0e685691bd47197dca"; + }; + common = { version , sha256 , extraPatches ? [] , rev ? "zfs-${version}" , isUnstable ? false , incompatibleKernelVersion ? null }: - if buildKernel && - (incompatibleKernelVersion != null) && - versionAtLeast kernel.version incompatibleKernelVersion then - throw '' - 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 { + + stdenv.mkDerivation { name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}"; src = fetchFromGitHub { @@ -91,7 +91,7 @@ let nativeBuildInputs = [ autoreconfHook269 nukeReferences ] ++ optionals buildKernel (kernel.moduleBuildDependencies ++ [ perl ]) - ++ optional buildUser pkgconfig; + ++ optional buildUser pkg-config; buildInputs = optionals buildUser [ zlib libuuid attr libtirpc ] ++ optional buildUser openssl ++ optional (buildUser && enablePython) python3; @@ -174,6 +174,13 @@ let license = licenses.cddl; platforms = platforms.linux; maintainers = with maintainers; [ hmenke jcumming jonringer wizeman fpletz globin mic92 ]; + broken = if + buildKernel && (incompatibleKernelVersion != null) && versionAtLeast kernel.version incompatibleKernelVersion + then builtins.trace '' + Linux v${kernel.version} is not yet supported by zfsonlinux v${version}. + ${lib.optionalString (!isUnstable) "Try zfsUnstable or set the NixOS option boot.zfs.enableUnstable."} + '' true + else false; }; }; in { @@ -189,7 +196,7 @@ in { sha256 = "0wmw823ildwm9rcfyk22pvzg100yhps3y9hfjlrpspfd1hhkbp0d"; - extraPatches = [ ]; + extraPatches = [ reapplyPathSanitizerPatch ]; }; zfsUnstable = common { @@ -201,6 +208,6 @@ in { sha256 = "0wmw823ildwm9rcfyk22pvzg100yhps3y9hfjlrpspfd1hhkbp0d"; - extraPatches = [ ]; + extraPatches = [ reapplyPathSanitizerPatch ]; }; } diff --git a/pkgs/os-specific/solo5/default.nix b/pkgs/os-specific/solo5/default.nix index 283cceb1240..19d1aa3b5eb 100644 --- a/pkgs/os-specific/solo5/default.nix +++ b/pkgs/os-specific/solo5/default.nix @@ -1,11 +1,11 @@ -{ lib, stdenv, fetchurl, pkgconfig, libseccomp }: +{ lib, stdenv, fetchurl, pkg-config, libseccomp, util-linux, qemu }: let version = "0.6.7"; in stdenv.mkDerivation { pname = "solo5"; inherit version; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = lib.optional (stdenv.hostPlatform.isLinux) libseccomp; src = fetchurl { @@ -36,6 +36,7 @@ in stdenv.mkDerivation { ''; doCheck = true; + checkInputs = [ util-linux qemu ]; checkPhase = if stdenv.hostPlatform.isLinux then '' patchShebangs tests @@ -49,10 +50,11 @@ in stdenv.mkDerivation { homepage = "https://github.com/solo5/solo5"; license = licenses.isc; maintainers = [ maintainers.ehmry ]; - platforms = lib.crossLists (arch: os: "${arch}-${os}") [ - [ "aarch64" "x86_64" ] - [ "freebsd" "genode" "linux" "openbsd" ] - ]; + platforms = builtins.map ({arch, os}: "${arch}-${os}") + (cartesianProductOfSets { + arch = [ "aarch64" "x86_64" ]; + os = [ "freebsd" "genode" "linux" "openbsd" ]; + }); }; } diff --git a/pkgs/os-specific/windows/cygwin-setup/default.nix b/pkgs/os-specific/windows/cygwin-setup/default.nix index 16b07507695..c51cafa9ace 100644 --- a/pkgs/os-specific/windows/cygwin-setup/default.nix +++ b/pkgs/os-specific/windows/cygwin-setup/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchcvs, autoconf, automake, libtool, flex, bison, pkgconfig +{ lib, stdenv, fetchcvs, autoconf, automake, libtool, flex, bison, pkg-config , zlib, bzip2, lzma, libgcrypt }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "cygwin-setup"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "024wxaaxkf7p1i78bh5xrsqmfz7ss2amigbfl2r5w9h87zqn9aq3"; }; - nativeBuildInputs = [ autoconf automake libtool flex bison pkgconfig ]; + nativeBuildInputs = [ autoconf automake libtool flex bison pkg-config ]; buildInputs = let mkStatic = flip overrideDerivation (o: { diff --git a/pkgs/os-specific/windows/default.nix b/pkgs/os-specific/windows/default.nix index 7f1634d5c0b..7c8041206ca 100644 --- a/pkgs/os-specific/windows/default.nix +++ b/pkgs/os-specific/windows/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildPackages +{ lib, stdenv, buildPackages , newScope, overrideCC, crossLibcStdenv, libcCross }: -stdenv.lib.makeScope newScope (self: with self; { +lib.makeScope newScope (self: with self; { cygwinSetup = callPackage ./cygwin-setup { }; diff --git a/pkgs/os-specific/windows/jom/default.nix b/pkgs/os-specific/windows/jom/default.nix index 1f42330be35..a2fbdde95aa 100644 --- a/pkgs/os-specific/windows/jom/default.nix +++ b/pkgs/os-specific/windows/jom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, qt48, qmake4Hook, flex }: +{ lib, stdenv, fetchgit, qt48, qmake4Hook, flex }: # At the time of committing this, the expression fails for me to cross-build in # both mingw32 and mingw64. @@ -19,13 +19,13 @@ stdenv.mkDerivation { # cmakeFlags = [ "-DWIN32=1" "-DCMAKE_SYSTEM_NAME=Windows" "-DCMAKE_RC_COMPILER=${stdenv.cc.targetPrefix}windres" ]; - preBuild = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + preBuild = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' export NIX_CROSS_CFLAGS_COMPILE=-fpermissive ''; meta = { homepage = "http://qt-project.org/wiki/jom"; description = "Clone of nmake supporting multiple independent commands in parallel"; - license = stdenv.lib.licenses.gpl2Plus; # Explicitly, GPLv2 or GPLv3, but not later. + license = lib.licenses.gpl2Plus; # Explicitly, GPLv2 or GPLv3, but not later. }; } diff --git a/pkgs/os-specific/windows/libgnurx/default.nix b/pkgs/os-specific/windows/libgnurx/default.nix index fedfea15ccb..85a3c463a28 100644 --- a/pkgs/os-specific/windows/libgnurx/default.nix +++ b/pkgs/os-specific/windows/libgnurx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: let version = "2.5.1"; @@ -11,6 +11,6 @@ in stdenv.mkDerivation rec { }; meta = { - platforms = stdenv.lib.platforms.windows; + platforms = lib.platforms.windows; }; } diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix index 6c17e0718bb..0a342997530 100644 --- a/pkgs/os-specific/windows/mingw-w64/default.nix +++ b/pkgs/os-specific/windows/mingw-w64/default.nix @@ -1,4 +1,4 @@ -{ stdenv, windows, fetchurl }: +{ lib, stdenv, windows, fetchurl }: let version = "6.0.0"; @@ -25,6 +25,6 @@ in stdenv.mkDerivation { hardeningDisable = [ "stackprotector" "fortify" ]; meta = { - platforms = stdenv.lib.platforms.windows; + platforms = lib.platforms.windows; }; } diff --git a/pkgs/os-specific/windows/wxMSW-2.8/default.nix b/pkgs/os-specific/windows/wxMSW-2.8/default.nix index 4dc886915b7..c4fb7993343 100644 --- a/pkgs/os-specific/windows/wxMSW-2.8/default.nix +++ b/pkgs/os-specific/windows/wxMSW-2.8/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, compat24 ? false, compat26 ? true, unicode ? true }: +{ lib, stdenv, fetchurl, compat24 ? false, compat26 ? true, unicode ? true }: stdenv.mkDerivation { name = "wxMSW-2.8.11"; @@ -30,7 +30,7 @@ stdenv.mkDerivation { passthru = {inherit compat24 compat26 unicode;}; meta = { - platforms = stdenv.lib.platforms.windows; + platforms = lib.platforms.windows; broken = true; }; diff --git a/pkgs/servers/adguardhome/default.nix b/pkgs/servers/adguardhome/default.nix index 58996a6e85a..b62de105702 100644 --- a/pkgs/servers/adguardhome/default.nix +++ b/pkgs/servers/adguardhome/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "adguardhome"; - version = "0.102.0"; + version = "0.104.3"; src = fetchurl { url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v${version}/AdGuardHome_linux_amd64.tar.gz"; - sha256 = "192v3k0q8qdr52a34bf48i8rvm41wgi6an8a4rcsgyq5j8l7v76i"; + sha256 = "0p660d1nvaigyjc39xq5ar775davcbdgf0dh1z6gl3v4gx1h7bkn"; }; installPhase = '' diff --git a/pkgs/servers/amqp/qpid-cpp/default.nix b/pkgs/servers/amqp/qpid-cpp/default.nix index d65ad130113..04e63d9173f 100644 --- a/pkgs/servers/amqp/qpid-cpp/default.nix +++ b/pkgs/servers/amqp/qpid-cpp/default.nix @@ -41,7 +41,7 @@ let "-Wno-error=unused-function" "-Wno-error=ignored-qualifiers" "-Wno-error=catch-value" - ] ++ stdenv.lib.optionals stdenv.cc.isGNU [ + ] ++ lib.optionals stdenv.cc.isGNU [ "-Wno-error=deprecated-copy" ]); }; diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index 2d55e0da85c..6100498f9bf 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, erlang, elixir, python, libxml2, libxslt, xmlto +{ lib, stdenv, fetchurl, erlang, elixir, python, libxml2, libxslt, xmlto , docbook_xml_dtd_45, docbook_xsl, zip, unzip, rsync, getconf, socat , procps, coreutils, gnused, systemd, glibcLocales , AppKit, Carbon, Cocoa @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ erlang elixir python libxml2 libxslt xmlto docbook_xml_dtd_45 docbook_xsl zip unzip rsync glibcLocales ] - ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Carbon Cocoa ]; + ++ lib.optionals stdenv.isDarwin [ AppKit Carbon Cocoa ]; outputs = [ "out" "man" "doc" ]; @@ -29,12 +29,12 @@ stdenv.mkDerivation rec { export LANG=C.UTF-8 # fix elixir locale warning ''; - runtimePath = stdenv.lib.makeBinPath ([ + runtimePath = lib.makeBinPath ([ erlang getconf # for getting memory limits socat procps gnused coreutils # used by helper scripts - ] ++ stdenv.lib.optionals stdenv.isLinux [ systemd ]); # for systemd unit activation check + ] ++ lib.optionals stdenv.isLinux [ systemd ]); # for systemd unit activation check postInstall = '' # rabbitmq-env calls to sed/coreutils, so provide everything early sed -i $out/sbin/rabbitmq-env -e '2s|^|PATH=${runtimePath}\''${PATH:+:}\$PATH/\n|' @@ -62,9 +62,9 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.rabbitmq.com/"; description = "An implementation of the AMQP messaging protocol"; - license = stdenv.lib.licenses.mpl20; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ Profpatsch ]; + license = lib.licenses.mpl20; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ Profpatsch ]; }; passthru.tests = { diff --git a/pkgs/servers/apcupsd/default.nix b/pkgs/servers/apcupsd/default.nix index 07bfcfd2673..f2193d67ff5 100644 --- a/pkgs/servers/apcupsd/default.nix +++ b/pkgs/servers/apcupsd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, systemd, util-linux, coreutils, wall, hostname, man +{ lib, stdenv, fetchurl, pkg-config, systemd, util-linux, coreutils, wall, hostname, man , enableCgiScripts ? true, gd }: @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { sha256 = "0rwqiyzlg9p0szf3x6q1ppvrw6f6dbpn2rc5z623fk3bkdalhxyv"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ util-linux man ] ++ stdenv.lib.optional enableCgiScripts gd; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ util-linux man ] ++ lib.optional enableCgiScripts gd; prePatch = '' sed -e "s,\$(INSTALL_PROGRAM) \$(STRIP),\$(INSTALL_PROGRAM)," \ @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { --with-lock-dir=/run/lock \ --with-pid-dir=/run \ --enable-usb \ - ${stdenv.lib.optionalString enableCgiScripts "--enable-cgi --with-cgi-bin=$out/libexec/cgi-bin"} + ${lib.optionalString enableCgiScripts "--enable-cgi --with-cgi-bin=$out/libexec/cgi-bin"} " ''; diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix index 26d361e97c2..86017314ae7 100644 --- a/pkgs/servers/asterisk/default.nix +++ b/pkgs/servers/asterisk/default.nix @@ -2,7 +2,7 @@ jansson, libedit, libxml2, libxslt, ncurses, openssl, sqlite, util-linux, dmidecode, libuuid, newt, lua, speex, - srtp, wget, curl, iksemel, pkgconfig + srtp, wget, curl, iksemel, pkg-config }: let @@ -14,7 +14,7 @@ let dmidecode libuuid newt lua speex srtp wget curl iksemel ]; - nativeBuildInputs = [ util-linux pkgconfig ]; + nativeBuildInputs = [ util-linux pkg-config ]; patches = [ # We want the Makefile to install the default /var skeleton diff --git a/pkgs/servers/asterisk/sccp/default.nix b/pkgs/servers/asterisk/sccp/default.nix index a830c5bdbd4..10b238f8877 100644 --- a/pkgs/servers/asterisk/sccp/default.nix +++ b/pkgs/servers/asterisk/sccp/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { postFixup = '' p="$out/lib/asterisk/modules/chan_sccp.so" - patchelf --set-rpath "$p:${stdenv.lib.makeLibraryPath [ binutils-unwrapped ]}" "$p" + patchelf --set-rpath "$p:${lib.makeLibraryPath [ binutils-unwrapped ]}" "$p" ''; meta = with lib; { diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix index a3a59906437..a7c9464fcae 100644 --- a/pkgs/servers/atlassian/confluence.nix +++ b/pkgs/servers/atlassian/confluence.nix @@ -8,11 +8,11 @@ assert withMysql -> (mysql_jdbc != null); stdenvNoCC.mkDerivation rec { pname = "atlassian-confluence"; - version = "7.9.0"; + version = "7.10.1"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz"; - sha256 = "0y21ivvzzs6mq2p96csmhbvz1jzwp1x4zrw26qrwavf84l2v7nlh"; + sha256 = "sha256-ScE0UXmoxHb7HOJhSfOLXj3Wb3/XitFuOR36Iktmgxk="; }; buildPhase = '' diff --git a/pkgs/servers/atlassian/crowd.nix b/pkgs/servers/atlassian/crowd.nix index 6fec1b5960e..f4c257314a8 100644 --- a/pkgs/servers/atlassian/crowd.nix +++ b/pkgs/servers/atlassian/crowd.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { "http://localhost:${toString port}/" sed -r -i crowd-openidserver-webapp/WEB-INF/classes/crowd.properties \ -e 's,application.password\s+password,application.password ${openidPassword},' - '' + stdenv.lib.optionalString (proxyUrl != null) '' + '' + lib.optionalString (proxyUrl != null) '' sed -i crowd-openidserver-webapp/WEB-INF/classes/crowd.properties \ -e 's,http://localhost:${toString port}/openidserver,${proxyUrl}/openidserver,' ''; diff --git a/pkgs/servers/blockbook/default.nix b/pkgs/servers/blockbook/default.nix index ceff2139414..2394ef258a9 100644 --- a/pkgs/servers/blockbook/default.nix +++ b/pkgs/servers/blockbook/default.nix @@ -39,7 +39,7 @@ buildGoModule rec { -X github.com/trezor/blockbook/common.buildDate=unknown ''; - preBuild = stdenv.lib.optionalString stdenv.isDarwin '' + preBuild = lib.optionalString stdenv.isDarwin '' ulimit -n 8192 '' + '' export CGO_LDFLAGS="-L${stdenv.cc.cc.lib}/lib -lrocksdb -lz -lbz2 -lsnappy -llz4 -lm -lstdc++" diff --git a/pkgs/servers/brickd/default.nix b/pkgs/servers/brickd/default.nix index 4b18e73284f..b29f9ca9e8e 100644 --- a/pkgs/servers/brickd/default.nix +++ b/pkgs/servers/brickd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, libusb1, pkgconfig, pmutils, udev} : +{ lib, stdenv, fetchgit, libusb1, pkg-config, pmutils, udev} : let @@ -21,7 +21,7 @@ stdenv.mkDerivation { sha256 = "0m2q01sbgf8z4559jpr6k3jivb8x98vxv1fhgx8nfcjbwz1q83gb"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 pmutils udev ]; # shell thing didn't work so i replaced it using nix @@ -55,8 +55,8 @@ stdenv.mkDerivation { meta = { homepage = "https://www.tinkerforge.com/"; description = "A daemon (or service on Windows) that acts as a bridge between the Bricks/Bricklets and the API bindings for the different programming languages"; - maintainers = [ stdenv.lib.maintainers.qknight ]; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.all; + maintainers = [ lib.maintainers.qknight ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.all; }; } diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index d48bcad1794..3e6641b8d26 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "caddy"; diff --git a/pkgs/servers/cayley/default.nix b/pkgs/servers/cayley/default.nix index 0d89d2f1165..c9d06d49771 100644 --- a/pkgs/servers/cayley/default.nix +++ b/pkgs/servers/cayley/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "cayley"; @@ -23,8 +23,8 @@ buildGoPackage rec { meta = { homepage = "https://cayley.io/"; description = "A graph database inspired by Freebase and Knowledge Graph"; - maintainers = with stdenv.lib.maintainers; [ sigma ]; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.unix; + maintainers = with lib.maintainers; [ sigma ]; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/cayley/deps.nix b/pkgs/servers/cayley/deps.nix index eb3dce827bd..d4ec2670365 100644 --- a/pkgs/servers/cayley/deps.nix +++ b/pkgs/servers/cayley/deps.nix @@ -468,4 +468,4 @@ sha256 = "1hj2ag9knxflpjibck0n90jrhsrqz7qvad4qnif7jddyapi9bqzl"; }; } -] \ No newline at end of file +] diff --git a/pkgs/servers/cloud-print-connector/default.nix b/pkgs/servers/cloud-print-connector/default.nix index 8e1ef831269..f6f6a0fbd71 100644 --- a/pkgs/servers/cloud-print-connector/default.nix +++ b/pkgs/servers/cloud-print-connector/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, avahi, cups, fetchpatch }: +{ lib, buildGoPackage, fetchFromGitHub, avahi, cups, fetchpatch }: # TODO: Add a service for gcp-cups-connector and perhaps some other # kind of configuration for the same thing that gcp-connector-util diff --git a/pkgs/servers/code-server/darwin-fsevents.patch b/pkgs/servers/code-server/darwin-fsevents.patch new file mode 100644 index 00000000000..ec8fc68d5f6 --- /dev/null +++ b/pkgs/servers/code-server/darwin-fsevents.patch @@ -0,0 +1,11 @@ +--- ./lib/vscode/node_modules/fsevents/install.js ++++ ./lib/vscode/node_modules/fsevents/install.js +@@ -1,7 +1,3 @@ + if (process.platform === 'darwin') { +- var spawn = require('child_process').spawn; +- var args = ['install', '--fallback-to-build']; +- var options = {stdio: 'inherit'}; +- var child = spawn(require.resolve('node-pre-gyp/bin/node-pre-gyp'), args, options); +- child.on('close', process.exit); ++ process.stdout.write('fsevents disabled on Darwin by Nix build script\n') + } diff --git a/pkgs/servers/code-server/default.nix b/pkgs/servers/code-server/default.nix index 60b4d57c647..c5c27f53004 100644 --- a/pkgs/servers/code-server/default.nix +++ b/pkgs/servers/code-server/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchFromGitHub, buildGoModule, makeWrapper, runCommand -, moreutils, jq, git, zip, rsync, pkgconfig, yarn, python2 -, nodejs-12_x, libsecret, xorg, ripgrep, nettools }: +, moreutils, jq, git, zip, rsync, pkg-config, yarn, python2 +, nodejs-12_x, libsecret, xorg, ripgrep +, AppKit, Cocoa, Security, cctools }: let system = stdenv.hostPlatform.system; @@ -12,29 +13,34 @@ let in stdenv.mkDerivation rec { pname = "code-server"; - version = "3.6.0"; - commit = "a4a03c14922ccaec2a9ff8d1b7b2af8522a4214d"; + version = "3.8.0"; + commit = "c4610f7829701aadb045d450013b84491c30580d"; src = fetchFromGitHub { owner = "cdr"; repo = "code-server"; rev = "v${version}"; - sha256 = "1c0p1s0bl3az5ysl97mz3gbynyndz6jd2jj7lx2snz6jqqd43y9p"; - fetchSubmodules = true; + sha256 = "1snc7dbqfz53337h6av2zhkrn54ypanxljs5by4jqczq96c2v6yk"; }; cloudAgent = buildGoModule rec { pname = "cloud-agent"; - version = "0.1.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "cdr"; repo = "cloud-agent"; - rev = version; - sha256 = "1p20cvgvs38604km9ixylz0r3k7blkd80lncmma3z05y5n5fqps1"; + rev = "v${version}"; + sha256 = "06fpiwxjz2cgzw4ks9sk3376rprkd02khfnb10hg7dhn3y9gp7x8"; }; - vendorSha256 = "0yky1v1ak3ysykjf3gm1hd7qyj5rm4fw7amga81sb31x0357jlzr"; + vendorSha256 = "0k9v10wkzx53r5syf6bmm81gr4s5dalyaa07y9zvx6vv5r2h0661"; + + postPatch = '' + # the cloud-agent release tag has an empty version string, so add it back in + substituteInPlace internal/version/version.go \ + --replace 'var Version string' 'var Version string = "v${version}"' + ''; }; yarnCache = stdenv.mkDerivation { @@ -45,11 +51,6 @@ in stdenv.mkDerivation rec { buildPhase = '' export HOME=$PWD - patchShebangs ./ci - - # apply code-server patches as code-server has patched vscode yarn.lock - yarn vscode:patch - yarn config set yarn-offline-mirror $out find "$PWD" -name "yarn.lock" -printf "%h\n" | \ xargs -I {} yarn --cwd {} \ @@ -61,8 +62,9 @@ in stdenv.mkDerivation rec { # to get hash values use nix-build -A code-server.prefetchYarnCache outputHash = { - x86_64-linux = "1443qwkllb714s4qw3b9y1mcc6p2ykgc02pw2k3z2gczvvr0g8qv"; - aarch64-linux = "1443qwkllb714s4qw3b9y1mcc6p2ykgc02pw2k3z2gczvvr0g8qv"; + x86_64-linux = "0xc1yjz53ydg1mwyc2rp4hq20hg6i4aiirfwsnykjw1zm79qgrgb"; + aarch64-linux = "0xc1yjz53ydg1mwyc2rp4hq20hg6i4aiirfwsnykjw1zm79qgrgb"; + x86_64-darwin = "0xc1yjz53ydg1mwyc2rp4hq20hg6i4aiirfwsnykjw1zm79qgrgb"; }.${system} or (throw "Unsupported system ${system}"); }; @@ -74,22 +76,24 @@ in stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - nodejs yarn' python pkgconfig zip makeWrapper git rsync jq moreutils + nodejs yarn' python pkg-config zip makeWrapper git rsync jq moreutils + ]; + buildInputs = lib.optionals (!stdenv.isDarwin) [ libsecret ] + ++ (with xorg; [ libX11 libxkbfile ]) + ++ lib.optionals stdenv.isDarwin [ + AppKit Cocoa Security cctools + ]; + + patches = [ + # remove download of coder-cloud agent + ./remove-cloud-agent-download.patch ]; - buildInputs = [ libsecret xorg.libX11 xorg.libxkbfile ]; postPatch = '' export HOME=$PWD patchShebangs ./ci - # apply code-server vscode patches - yarn vscode:patch - - # allow offline install for vscode - substituteInPlace lib/vscode/build/npm/postinstall.js \ - --replace '--ignore-optional' '--offline' - # remove unnecessary git config command substituteInPlace lib/vscode/build/npm/postinstall.js \ --replace "cp.execSync('git config pull.rebase true');" "" @@ -98,17 +102,13 @@ in stdenv.mkDerivation rec { grep -rl "yarn install" --include package.json lib/vscode/extensions \ | xargs sed -i 's/yarn install/yarn install --offline/g' - # remove download of coder-cloud agent - sed -i ':a;N;$!ba;s/OS=.*agent//' ci/build/npm-postinstall.sh + substituteInPlace ci/dev/postinstall.sh \ + --replace 'yarn' 'yarn --ignore-scripts' # use offline cache when installing release packages substituteInPlace ci/build/npm-postinstall.sh \ --replace 'yarn --production' 'yarn --production --offline' - # fix path to ifconfig, so vscode can get mac address - substituteInPlace lib/vscode/src/vs/base/node/macAddress.ts \ - --replace '/sbin/ifconfig' '${nettools}/bin/ifconfig' - # disable automatic updates sed -i '/update.mode/,/\}/{s/default:.*/default: "none",/g}' \ lib/vscode/src/vs/platform/update/common/update.config.contribution.ts @@ -129,25 +129,25 @@ in stdenv.mkDerivation rec { ''; configurePhase = '' + # run yarn offline by default + echo '--install.offline true' >> .yarnrc + # set default yarn opts - ${stdenv.lib.concatMapStrings (option: '' + ${lib.concatMapStrings (option: '' yarn --offline config set ${option} '') defaultYarnOpts} # set offline mirror to yarn cache we created in previous steps yarn --offline config set yarn-offline-mirror "${yarnCache}" - # set nodedir, so we can build binaries later - npm config set nodedir "${nodeSources}" - # link coder-cloud agent from nix store ln -s "${cloudAgent}/bin/cloud-agent" ./lib/coder-cloud-agent - # skip browser downloads for playwright - export PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD="true" - # skip unnecessary electron download export ELECTRON_SKIP_BINARY_DOWNLOAD=1 + '' + lib.optionalString stdenv.isLinux '' + # set nodedir, so we can build binaries later + npm config set nodedir "${nodeSources}" ''; buildPhase = '' @@ -166,11 +166,20 @@ in stdenv.mkDerivation rec { -execdir ln -s ${ripgrep}/bin/rg {}/bin/rg \; # patch shebangs of everything, also cached files, as otherwise postinstall - # will not be able to find /usr/bin/env, as it does not exists in sandbox + # will not be able to find /usr/bin/env, as it does not exist in sandbox patchShebangs . - # rebuild binaries, we use npm here, as yarn does not provider alternative - # that would not atempt to try to reinstall everything and break out + # Playwright is only needed for tests, we can disable it for builds. + # There's an environment variable to disable downloads, but the package makes a breaking call to + # sw_vers before that variable is checked. + patch -p1 -i ${./playwright.patch} + '' + lib.optionalString stdenv.isDarwin '' + # fsevents build fails on Darwin. It's an optional package that's only installed as part of Darwin + # builds, so the patch will fail if run on non-Darwin systems. + patch -p1 -i ${./darwin-fsevents.patch} + '' + '' + # rebuild binaries, we use npm here, as yarn does not provide an alternative + # that would not attempt to try to reinstall everything and break our # patching attempts npm rebuild --prefix lib/vscode --update-binary @@ -206,8 +215,8 @@ in stdenv.mkDerivation rec { ''; passthru = { - prefetchYarnCache = stdenv.lib.overrideDerivation yarnCache (d: { - outputHash = stdenv.lib.fakeSha256; + prefetchYarnCache = lib.overrideDerivation yarnCache (d: { + outputHash = lib.fakeSha256; }); }; @@ -220,6 +229,6 @@ in stdenv.mkDerivation rec { homepage = "https://github.com/cdr/code-server"; license = licenses.mit; maintainers = with maintainers; [ offline ]; - platforms = ["x86_64-linux"]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/servers/code-server/playwright.patch b/pkgs/servers/code-server/playwright.patch new file mode 100644 index 00000000000..e247950173f --- /dev/null +++ b/pkgs/servers/code-server/playwright.patch @@ -0,0 +1,10 @@ +--- ./lib/vscode/node_modules/playwright/install.js ++++ ./lib/vscode/node_modules/playwright/install.js +@@ -14,6 +14,4 @@ + * limitations under the License. + */ + +-const { installBrowsersWithProgressBar } = require('./lib/install/installer'); +- +-installBrowsersWithProgressBar(__dirname); ++process.stdout.write('Browser install disabled by Nix build script\n'); diff --git a/pkgs/servers/code-server/remove-cloud-agent-download.patch b/pkgs/servers/code-server/remove-cloud-agent-download.patch new file mode 100644 index 00000000000..76e9c4b8b91 --- /dev/null +++ b/pkgs/servers/code-server/remove-cloud-agent-download.patch @@ -0,0 +1,16 @@ +--- ./ci/build/npm-postinstall.sh ++++ ./ci/build/npm-postinstall.sh +@@ -24,13 +24,6 @@ main() { + ;; + esac + +- OS="$(uname | tr '[:upper:]' '[:lower:]')" +- if curl -fsSL "https://storage.googleapis.com/coder-cloud-releases/agent/latest/$OS/cloud-agent" -o ./lib/coder-cloud-agent; then +- chmod +x ./lib/coder-cloud-agent +- else +- echo "Failed to download cloud agent; --link will not work" +- fi +- + if ! vscode_yarn; then + echo "You may not have the required dependencies to build the native modules." + echo "Please see https://github.com/cdr/code-server/blob/master/doc/npm.md" diff --git a/pkgs/servers/computing/slurm-spank-x11/default.nix b/pkgs/servers/computing/slurm-spank-x11/default.nix index 8e64185e71c..454cdbb57e3 100644 --- a/pkgs/servers/computing/slurm-spank-x11/default.nix +++ b/pkgs/servers/computing/slurm-spank-x11/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { homepage = "https://github.com/hautreux/slurm-spank-x11"; description = "Plugin for SLURM to allow for interactive X11 sessions"; platforms = platforms.linux; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = with maintainers; [ markuskowa ]; }; } diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index d5a2c030c11..d9b237a6062 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, libtool, curl +{ lib, stdenv, fetchFromGitHub, pkg-config, libtool, curl , python3, munge, perl, pam, zlib, shadow, coreutils , ncurses, libmysqlclient, gtk2, lua, hwloc, numactl , readline, freeipmi, xorg, lz4, rdma-core, nixosTests @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "slurm"; - version = "20.11.2.1"; + version = "20.11.3.1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}"; - sha256 = "02vz386ix28yr2lrn9z0hycqmw1d0npvwvx51fhp2mav66rrx79p"; + sha256 = "1601h7gid7fyvgmvrmz0h0xkxd7whp06rmj03822bv1szqr20xyy"; }; outputs = [ "out" "dev" ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { prePatch = '' substituteInPlace src/common/env.c \ --replace "/bin/echo" "${coreutils}/bin/echo" - '' + (stdenv.lib.optionalString enableX11 '' + '' + (lib.optionalString enableX11 '' substituteInPlace src/common/x11_util.c \ --replace '"/usr/bin/xauth"' '"${xorg.xauth}/bin/xauth"' ''); @@ -44,15 +44,15 @@ stdenv.mkDerivation rec { # this doesn't fix tests completely at least makes slurmd to launch hardeningDisable = [ "bindnow" ]; - nativeBuildInputs = [ pkgconfig libtool python3 ]; + nativeBuildInputs = [ pkg-config libtool python3 ]; buildInputs = [ curl python3 munge perl pam zlib libmysqlclient ncurses gtk2 lz4 rdma-core lua hwloc numactl readline freeipmi shadow.su pmix - ] ++ stdenv.lib.optionals enableX11 [ xorg.xauth ]; + ] ++ lib.optionals enableX11 [ xorg.xauth ]; - configureFlags = with stdenv.lib; + configureFlags = with lib; [ "--with-freeipmi=${freeipmi}" "--with-hwloc=${hwloc.dev}" "--with-lz4=${lz4.dev}" @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { homepage = "http://www.schedmd.com/"; description = "Simple Linux Utility for Resource Management"; platforms = platforms.linux; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ jagajaga markuskowa ]; }; } diff --git a/pkgs/servers/computing/storm/default.nix b/pkgs/servers/computing/storm/default.nix index e961e1cf2c9..daebf174faf 100644 --- a/pkgs/servers/computing/storm/default.nix +++ b/pkgs/servers/computing/storm/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { -e 's|java.library.path: .*|java.library.path: "${lib.concatStringsSep ":" extraLibraryPaths}"|' \ -e 's|storm.log4j2.conf.dir: .*|storm.log4j2.conf.dir: "conf/log4j2"|' \ defaults.yaml - ${if confFile != "" then ''cat ${confFile} >> defaults.yaml'' else ""} + ${if confFile != "" then "cat ${confFile} >> defaults.yaml" else ""} mv defaults.yaml $out/conf; # Link to extra jars diff --git a/pkgs/servers/computing/torque/default.nix b/pkgs/servers/computing/torque/default.nix index 28651752dd1..ccb57f55bb2 100644 --- a/pkgs/servers/computing/torque/default.nix +++ b/pkgs/servers/computing/torque/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, openssl, flex, bison, pkgconfig, groff, libxml2, util-linux +{ lib, stdenv, fetchFromGitHub, openssl, flex, bison, pkg-config, groff, libxml2, util-linux , coreutils, file, libtool, which, boost, autoreconfHook }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; strictDeps = true; - nativeBuildInputs = [ autoreconfHook pkgconfig flex bison libxml2 ]; + nativeBuildInputs = [ autoreconfHook pkg-config flex bison libxml2 ]; buildInputs = [ openssl groff libxml2 util-linux libtool which boost diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index f319c5f3db1..9dc723417d6 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "consul"; - version = "1.9.1"; + version = "1.9.2"; rev = "v${version}"; # Note: Currently only release tags are supported, because they have the Consul UI @@ -17,7 +17,7 @@ buildGoModule rec { owner = "hashicorp"; repo = pname; inherit rev; - sha256 = "06nw27crcrmz9p0hdc6g8ycq8p0kpbgf1g3i879f6h4jp4ca6zi3"; + sha256 = "sha256-e4pE30MvJ/9wrYA1oolBF+5C1IHTm+4xhDb88Il9E7o="; }; passthru.tests.consul = nixosTests.consul; @@ -26,7 +26,7 @@ buildGoModule rec { # has a split module structure in one repo subPackages = ["." "connect/certgen"]; - vendorSha256 = "01fwbgdr4kxq4li83xxadl33ry1lkb3zhmcf2yrimfk042zabpck"; + vendorSha256 = "sha256-bTwm6F1Y0LFTfUJ5zIsmGcNztwC2aTJIDd+bDPqnzcA="; doCheck = false; diff --git a/pkgs/servers/corosync/default.nix b/pkgs/servers/corosync/default.nix index 693ab0042f3..5b4270a0a1c 100644 --- a/pkgs/servers/corosync/default.nix +++ b/pkgs/servers/corosync/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, pkgconfig, nss, nspr, libqb +{ lib, stdenv, fetchurl, makeWrapper, pkg-config, nss, nspr, libqb , dbus, rdma-core, libstatgrab, net-snmp , enableDbus ? false , enableInfiniBandRdma ? false @@ -6,7 +6,7 @@ , enableSnmp ? false }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "corosync"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "0pxs18vci9kq3qnqsg5i1h35jrxxiccwbm0mzja3g8j3izdsyvmb"; }; - nativeBuildInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = [ nss nspr libqb diff --git a/pkgs/servers/coturn/default.nix b/pkgs/servers/coturn/default.nix index 91ecfc113cd..73b1ba01844 100644 --- a/pkgs/servers/coturn/default.nix +++ b/pkgs/servers/coturn/default.nix @@ -1,17 +1,34 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, openssl, libevent }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, openssl +, libevent +, pkg-config +, libprom +, libpromhttp +, libmicrohttpd +}: stdenv.mkDerivation rec { pname = "coturn"; - version = "4.5.1.3"; + version = "4.5.2"; src = fetchFromGitHub { owner = "coturn"; repo = "coturn"; rev = version; - sha256 = "1801931k4qdvc7jvaqxvjyhbh1xsvjz0pjajf6xc222n4ggar1q5"; + sha256 = "1s7ncc82ny4bb3qkn3fqr0144xsr7h2y8xmzsf5037h6j8f7j3v8"; }; - buildInputs = [ openssl libevent ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + openssl + libevent + libprom + libpromhttp + libmicrohttpd + ]; patches = [ ./pure-configure.patch @@ -23,6 +40,6 @@ stdenv.mkDerivation rec { description = "A TURN server"; platforms = platforms.all; broken = stdenv.isDarwin; # 2018-10-21 - maintainers = [ maintainers.ralith ]; + maintainers = with maintainers; [ ralith _0x4A6F ]; }; } diff --git a/pkgs/servers/demoit/default.nix b/pkgs/servers/demoit/default.nix index 0c6fe818775..4a499e7f878 100644 --- a/pkgs/servers/demoit/default.nix +++ b/pkgs/servers/demoit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildGoModule , fetchFromGitHub }: diff --git a/pkgs/servers/dex/default.nix b/pkgs/servers/dex/default.nix index 5886a2ae73a..677c50010a3 100644 --- a/pkgs/servers/dex/default.nix +++ b/pkgs/servers/dex/default.nix @@ -1,24 +1,24 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "dex"; - version = "2.23.0"; + version = "2.27.0"; src = fetchFromGitHub { owner = "dexidp"; repo = pname; rev = "v${version}"; - sha256 = "1fr5r7d0xwj0b69jhszyyif4yc4kiy7zpfcpf83zdy12mh8f96c8"; + sha256 = "0n66nm91qcmm00mz8f8x39xqr3y05qxk34fvka53s6xax1gxvxxi"; }; - goPackagePath = "github.com/dexidp/dex"; + vendorSha256 = "1k87q3ic02n2b632y3lmnclac1iaidmsl3f9py61myi5r02p03lp"; subPackages = [ "cmd/dex" ]; buildFlagsArray = [ - "-ldflags=-w -X github.com/dexidp/dex/version.Version=${src.rev}" + "-ldflags=-w -s -X github.com/dexidp/dex/version.Version=${src.rev}" ]; postInstall = '' diff --git a/pkgs/servers/dgraph/default.nix b/pkgs/servers/dgraph/default.nix index 02c19e22e74..3aa7b074848 100644 --- a/pkgs/servers/dgraph/default.nix +++ b/pkgs/servers/dgraph/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dgraph"; - version = "20.07.2"; + version = "20.07.3"; src = fetchFromGitHub { owner = "dgraph-io"; repo = "dgraph"; rev = "v${version}"; - sha256 = "0cx2qqn8b7v0qvhrwzjqghymm8r2a0v86pyfgqxmmyfghjhykax4"; + sha256 = "sha256-yuKXcxewt64T0ToDPid37WUEhwLu+yt4tjhDQobj/Ls="; }; - vendorSha256 = "111lixpqp8p2q4kg9342220i00dcp2lwp2j3hasdvwdrrf0971by"; + vendorSha256 = "sha256-2Ub0qdEaVSHHE5K0bNSXJFukGeSSXNpIBoUldF8jGpI="; doCheck = false; diff --git a/pkgs/servers/dict/dictd-db.nix b/pkgs/servers/dict/dictd-db.nix index 3ff36d4c62e..584c35bf7f8 100644 --- a/pkgs/servers/dict/dictd-db.nix +++ b/pkgs/servers/dict/dictd-db.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, callPackage }: +{ lib, stdenv, fetchurl, callPackage }: let # Probably a bug in some FreeDict release files, but easier to trivially @@ -24,7 +24,7 @@ let meta = { description = "dictd-db dictionary for dictd"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; }; in rec { diff --git a/pkgs/servers/dict/dictd-wiktionary.nix b/pkgs/servers/dict/dictd-wiktionary.nix index 2207f2c36df..f591064a3c1 100644 --- a/pkgs/servers/dict/dictd-wiktionary.nix +++ b/pkgs/servers/dict/dictd-wiktionary.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, python, dict, glibcLocales, writeScript}: +{lib, stdenv, fetchurl, python, dict, glibcLocales, writeScript}: stdenv.mkDerivation rec { version = "20161001"; @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { description = "DICT version of English Wiktionary"; homepage = "http://en.wiktionary.org/"; maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/servers/dict/dictd-wordnet.nix b/pkgs/servers/dict/dictd-wordnet.nix index 0afdf442d23..3f76d60233c 100644 --- a/pkgs/servers/dict/dictd-wordnet.nix +++ b/pkgs/servers/dict/dictd-wordnet.nix @@ -1,4 +1,4 @@ -{stdenv, python, wordnet, writeScript}: +{lib, stdenv, python, wordnet, writeScript}: stdenv.mkDerivation rec { version = "542"; @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { homepage = "https://wordnet.princeton.edu/"; maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 55bc638d2f4..3d78f4b4cdf 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -10,11 +10,11 @@ assert enablePython -> python3 != null; stdenv.mkDerivation rec { pname = "bind"; - version = "9.16.10"; + version = "9.16.11"; src = fetchurl { url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-vEf8AZxiBeamv7g5xUShRyMh3wU3upBbhGpMv/4zYrM="; + sha256 = "sha256-ARH2TdfY9RXPoSnhgczpb/ggcNGyfxGiH2hWEQ0GmcE="; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; diff --git a/pkgs/servers/dns/coredns/default.nix b/pkgs/servers/dns/coredns/default.nix index 6973e46412b..cdfc78d6222 100644 --- a/pkgs/servers/dns/coredns/default.nix +++ b/pkgs/servers/dns/coredns/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "coredns"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "coredns"; repo = "coredns"; rev = "v${version}"; - sha256 = "04hkz70s5i7ndwyg39za3k83amvmi90rkjm8qp3w3a8fbmq4q4y6"; + sha256 = "sha256-F4YiLjWrAjCNorR5dHQ2nzEBVWvJVuDDmAbUXruaPYQ="; }; - vendorSha256 = "1zwrf2pshb9r3yvp7mqali47163nqhvs9ghflczfpigqswd1m0p0"; + vendorSha256 = "sha256-QvT1vnvF+gvABh2SzR6vUsj3KCD8ABqZwXQUm3NldM0="; doCheck = false; diff --git a/pkgs/servers/dns/dnsdist/default.nix b/pkgs/servers/dns/dnsdist/default.nix index 4bb012d7297..a6a365c13da 100644 --- a/pkgs/servers/dns/dnsdist/default.nix +++ b/pkgs/servers/dns/dnsdist/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, systemd +{ lib, stdenv, fetchurl, pkg-config, systemd , boost, libsodium, libedit, re2 , net-snmp, lua, protobuf, openssl, zlib, h2o }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1wgv19b6y4fp5x1z54psaaialji2rckl5vdh156kyw47k9r5krya"; }; - nativeBuildInputs = [ pkgconfig protobuf ]; + nativeBuildInputs = [ pkg-config protobuf ]; buildInputs = [ systemd boost libsodium libedit re2 net-snmp lua openssl zlib h2o ]; configureFlags = [ diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index e1bd2bb2fff..2a9e00b266b 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchurl, pkgconfig, gnutls, liburcu, lmdb, libcap_ng, libidn2, libunistring +{ lib, stdenv, fetchurl, pkg-config, gnutls, liburcu, lmdb, libcap_ng, libidn2, libunistring , systemd, nettle, libedit, zlib, libiconv, libintl, libmaxminddb, libbpf, nghttp2 , autoreconfHook }: -let inherit (stdenv.lib) optional optionals; in +let inherit (lib) optional optionals; in stdenv.mkDerivation rec { pname = "knot-dns"; - version = "3.0.3"; + version = "3.0.4"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "fbc51897ef0ed0639ebad59b988a91382b9544288a2db8254f0b1de433140e38"; + sha256 = "451d8913a769b7e4bcb3e250a3181b448e28a82cfc58cea6f2509475d7327983"; }; outputs = [ "bin" "out" "dev" ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ./runtime-deps.patch ]; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ gnutls liburcu libidn2 libunistring nettle libedit diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 1f495622f28..8954c9fcd89 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, fetchpatch # native deps. -, runCommand, pkgconfig, meson, ninja, makeWrapper +, runCommand, pkg-config, meson, ninja, makeWrapper # build+runtime deps. , knot-dns, luajitPackages, libuv, gnutls, lmdb , systemd, libcap_ng, dns-root-data, nghttp2 # optionals, in principle @@ -12,7 +12,7 @@ let # un-indented, over the whole file result = if extraFeatures then wrapped-full else unwrapped; -inherit (stdenv.lib) optional optionals optionalString; +inherit (lib) optional optionals optionalString; lua = luajitPackages; unwrapped = stdenv.mkDerivation rec { @@ -50,7 +50,7 @@ unwrapped = stdenv.mkDerivation rec { patchShebangs scripts/ ''; - nativeBuildInputs = [ pkgconfig meson ninja ]; + nativeBuildInputs = [ pkg-config meson ninja ]; # http://knot-resolver.readthedocs.io/en/latest/build.html#requirements buildInputs = [ knot-dns lua.lua libuv gnutls lmdb ] diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix index 02a460219ec..ddded73391d 100644 --- a/pkgs/servers/dns/nsd/default.nix +++ b/pkgs/servers/dns/nsd/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "nsd"; - version = "4.3.4"; + version = "4.3.5"; src = fetchurl { url = "https://www.nlnetlabs.nl/downloads/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0l4ba80ihwg3s2ifhnkmk7rjabrcy5zw6sz4hn0vm9sif6lk9s1v"; + sha256 = "sha256-faK0PjCz1/MHcixgj3Gb+xafDZhcdko0+gZp3DNIRHI="; }; prePatch = '' diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index f23aa6b02c1..972b92e7de9 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, pkgconfig, boost, nixosTests +{ lib, stdenv, fetchurl, pkg-config, boost, nixosTests , openssl, systemd, lua, luajit, protobuf , enableProtoBuf ? false }: assert enableProtoBuf -> protobuf != null; -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "pdns-recursor"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "1kzmliim2pwh04y3y6bpai9fm0qmdicrmff09fv5h5wahi4pzfdh"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ boost openssl systemd lua luajit diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/powerdns/default.nix index 990386f06ce..cc7bb3317fd 100644 --- a/pkgs/servers/dns/powerdns/default.nix +++ b/pkgs/servers/dns/powerdns/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, nixosTests +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, nixosTests , boost, libyamlcpp, libsodium, sqlite, protobuf, openssl, systemd , mysql57, postgresql, lua, openldap, geoip, curl, unixODBC }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ boost mysql57.connector-c postgresql lua openldap sqlite protobuf geoip libyamlcpp libsodium curl unixODBC openssl systemd diff --git a/pkgs/servers/elasticmq/default.nix b/pkgs/servers/elasticmq/default.nix deleted file mode 100644 index 1ea669f573f..00000000000 --- a/pkgs/servers/elasticmq/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchurl, jre, makeWrapper, which }: - -stdenv.mkDerivation rec { - name = "elasticmq-0.5"; - - src = fetchurl { - url = "https://github.com/downloads/adamw/elasticmq/${name}.tar.gz"; - sha256 = "1zpv3vzairprh4x9fia82qqr14kf5hpxq1r90mn4ww7ighbv9pf1"; - }; - - buildInputs = [ makeWrapper ]; - - installPhase = - '' - mkdir -p $out/bin - cp -prd lib conf $out/ - - cp bin/run.sh $out/bin/elasticmq - substituteInPlace $out/bin/elasticmq --replace '-DBASEDIR=$BASEDIR' '-DBASEDIR=''${ELASTICMQ_DATA_PREFIX:-.}' - - wrapProgram $out/bin/elasticmq --prefix PATH : "${stdenv.lib.makeBinPath [ which jre ]}" - ''; - - meta = { - homepage = "https://github.com/adamw/elasticmq"; - description = "Message queueing system with Java, Scala and Amazon SQS-compatible interfaces"; - longDescription = - '' - ElasticMQ is a message queueing system with Java, Scala and - Amazon SQS-compatible interfaces. You should set the - environment ELASTICMQ_DATA_PREFIX to a writable directory - where ElasticMQ will store its data and log files. It also - looks for its configuration file in - $ELASTICMQ_DATA_PREFIX/conf/Default.scala. You can use the - Default.scala included in the distribution as a template. - ''; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/servers/exhibitor/default.nix b/pkgs/servers/exhibitor/default.nix index b4869b162db..0b92aca74c7 100644 --- a/pkgs/servers/exhibitor/default.nix +++ b/pkgs/servers/exhibitor/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin mkdir -p $out/share/java mv target/$name.jar $out/share/java/ - makeWrapper ${jdk}/bin/java $out/bin/startExhibitor.sh --add-flags "-jar $out/share/java/$name.jar" --suffix PATH : ${stdenv.lib.makeBinPath [ jdk ]} + makeWrapper ${jdk}/bin/java $out/bin/startExhibitor.sh --add-flags "-jar $out/share/java/$name.jar" --suffix PATH : ${lib.makeBinPath [ jdk ]} ''; } diff --git a/pkgs/servers/fcgiwrap/default.nix b/pkgs/servers/fcgiwrap/default.nix index 54b699e8a6d..ee3f02d0425 100644 --- a/pkgs/servers/fcgiwrap/default.nix +++ b/pkgs/servers/fcgiwrap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, systemd, fcgi, autoreconfHook, pkgconfig }: +{ lib, stdenv, fetchurl, systemd, fcgi, autoreconfHook, pkg-config }: stdenv.mkDerivation rec { pname = "fcgiwrap"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error=implicit-fallthrough"; configureFlags = [ "--with-systemd" "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ systemd fcgi ]; # systemd 230 no longer has libsystemd-daemon as a separate entity from libsystemd diff --git a/pkgs/servers/fiche/default.nix b/pkgs/servers/fiche/default.nix new file mode 100644 index 00000000000..2875f274dc0 --- /dev/null +++ b/pkgs/servers/fiche/default.nix @@ -0,0 +1,37 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "fiche"; + version = "0.9.1"; + + src = fetchFromGitHub { + owner = "solusipse"; + repo = "fiche"; + rev = version; + sha256 = "1102r39xw17kip7mjp987jy8na333gw9vxv31f7v8q05cr7d7kfb"; + }; + + installPhase = '' + install -Dm755 fiche -t $out/bin + ''; + + doCheck = true; + + meta = with lib; { + description = "Command line pastebin for sharing terminal output"; + longDescription = '' + Fiche is a command line pastebin server for sharing terminal output. + It can be used without any graphical tools from a TTY and has minimal requirements. + A live instance can be found at https://termbin.com. + + Example usage: + echo just testing! | nc termbin.com 9999 + ''; + + homepage = "https://github.com/solusipse/fiche"; + changelog = "https://github.com/solusipse/fiche/releases/tag/${version}"; + license = licenses.mit; + maintainers = [ maintainers.pinpox ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/servers/fileshare/default.nix b/pkgs/servers/fileshare/default.nix index e626019f09b..88c14a220d9 100644 --- a/pkgs/servers/fileshare/default.nix +++ b/pkgs/servers/fileshare/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchgit, pkgconfig, git, libmicrohttpd_0_9_70 }: +{ stdenv, lib, fetchgit, pkg-config, git, libmicrohttpd_0_9_70 }: stdenv.mkDerivation rec { pname = "fileshare"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sed -i 's,$(shell git rev-parse --short HEAD),/${version},g' Makefile ''; - nativeBuildInputs = [ pkgconfig git ]; + nativeBuildInputs = [ pkg-config git ]; buildInputs = [ libmicrohttpd_0_9_70 ]; makeFlags = [ "BUILD=release" ]; diff --git a/pkgs/servers/fingerd/bsd-fingerd/default.nix b/pkgs/servers/fingerd/bsd-fingerd/default.nix index eac51beadcb..d03cd1c915a 100644 --- a/pkgs/servers/fingerd/bsd-fingerd/default.nix +++ b/pkgs/servers/fingerd/bsd-fingerd/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { preBuild = "cd fingerd"; - preInstall = '' mkdir -p $out/man/man8 $out/sbin ''; + preInstall = "mkdir -p $out/man/man8 $out/sbin "; meta = with lib; { platforms = platforms.linux; diff --git a/pkgs/servers/firebird/default.nix b/pkgs/servers/firebird/default.nix index 063eaec7ded..2d4e22ba244 100644 --- a/pkgs/servers/firebird/default.nix +++ b/pkgs/servers/firebird/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libedit, automake, autoconf, libtool +{lib, stdenv, fetchurl, libedit, automake, autoconf, libtool , # icu = null: use icu which comes with firebird @@ -56,8 +56,8 @@ stdenv.mkDerivation rec { "--with-fbconf=/etc/firebird" "--with-fbsecure-db=/var/db/firebird/system" ] - ++ (stdenv.lib.optional (icu != null) "--with-system-icu") - ++ (stdenv.lib.optional superServer "--enable-superserver"); + ++ (lib.optional (icu != null) "--with-system-icu") + ++ (lib.optional superServer "--enable-superserver"); src = fetchurl { url = "mirror://sourceforge/firebird/Firebird-${version}.tar.bz2"; @@ -77,14 +77,14 @@ stdenv.mkDerivation rec { # dosen't work. Copying the files manually which can be found # in ubuntu -dev -classic, -example packages: # maybe some of those files can be removed again - installPhase = ''cp -r gen/firebird $out''; + installPhase = "cp -r gen/firebird $out"; meta = { description = "SQL relational database management system"; homepage = "https://www.firebirdnews.org"; license = ["IDPL" "Interbase-1.0"]; - maintainers = [stdenv.lib.maintainers.marcweber]; - platforms = stdenv.lib.platforms.linux; + maintainers = [lib.maintainers.marcweber]; + platforms = lib.platforms.linux; broken = true; }; diff --git a/pkgs/servers/fishnet/assets.nix b/pkgs/servers/fishnet/assets.nix new file mode 100644 index 00000000000..6844db1b810 --- /dev/null +++ b/pkgs/servers/fishnet/assets.nix @@ -0,0 +1,57 @@ +{ lib +, stdenv +, fetchFromGitHub +, xz +, autoPatchelfHook }: + +# Assets for fishnet: A collection of pre-built compressed stockfish binaries. +# We have to decompress them, patch them using auto-patchelf and compress them +# again so that a selection of them can be embedded into the fishnet binary. +stdenv.mkDerivation rec { + pname = "fishnet-assets"; + version = "unstable-2020-01-30"; + + src = fetchFromGitHub { + owner = "niklasf"; + repo = pname; + rev = "b4fa30e57ec8976fb1c10bd36737bc784351b93e"; + sha256 = "0gfs9lm4ih3h3fmgqylw05ii1h0d6mpjfxadnw3wymnjsspfb0m4"; + }; + + relAssetsPath = "share/${pname}"; + + nativeBuildInputs = [ xz autoPatchelfHook ]; + + postPatch = '' + # Delete packed .exe files and all non .xz files (documentation and readme) + rm *.exe.xz + find \! -name "*.xz" -delete + # Extract .xz files, except *.nnue.xz + # We don't have to unpack the latter and it takes ages to repack + find -name "*.xz" \! -name "*.nnue.xz" | xargs unxz -v + ''; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/${relAssetsPath} + cp ./* $out/${relAssetsPath} + ''; + + preFixup = '' + gatherLibraries '${stdenv.cc.cc.lib}' + ''; + + doDist = true; + distPhase = '' + # repack assets + find $out/${relAssetsPath} -type f \! -name "*.xz" | xargs xz -v + ''; + + meta = with lib; { + description = "Assets for fishnet, only required during build"; + homepage = "https://github.com/niklasf/fishnet-assets"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ tu-maurice ]; + }; +} diff --git a/pkgs/servers/fishnet/default.nix b/pkgs/servers/fishnet/default.nix new file mode 100644 index 00000000000..2aa46b7d825 --- /dev/null +++ b/pkgs/servers/fishnet/default.nix @@ -0,0 +1,37 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, xz +, autoPatchelfHook }: + +let + assets = import ./assets.nix { + inherit lib stdenv fetchFromGitHub xz autoPatchelfHook; + }; +in +rustPlatform.buildRustPackage rec { + pname = "fishnet"; + version = "2.2.3"; + + src = fetchFromGitHub { + owner = "niklasf"; + repo = pname; + rev = "v${version}"; + sha256 = "159fwjy70n6lvnhdwv65azgi03r5qcc2m2zpzgz0k3r6cy06faxj"; + }; + + cargoSha256 = "1bfs8dy08799r6d63sb33zwcxas3gzp7jvcxv3w8n64gffan8f2n"; + + preBuild = '' + rmdir ./assets + ln -snf ${assets}/${assets.relAssetsPath} ./assets + ''; + + meta = with lib; { + description = "Distributed Stockfish analysis for lichess.org"; + homepage = "https://github.com/niklasf/fishnet"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ tu-maurice ]; + }; +} diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix index 0e608051a9e..10d517179c2 100644 --- a/pkgs/servers/foundationdb/default.nix +++ b/pkgs/servers/foundationdb/default.nix @@ -1,4 +1,4 @@ -{ gcc6Stdenv, stdenv, gccStdenv, llvmPackages +{ gcc6Stdenv, gccStdenv, llvmPackages , lib, fetchurl, fetchpatch, fetchFromGitHub , cmake, ninja, which, findutils, m4, gawk diff --git a/pkgs/servers/foundationdb/vsmake.nix b/pkgs/servers/foundationdb/vsmake.nix index 262ea39ca5b..aac9ab07c0f 100644 --- a/pkgs/servers/foundationdb/vsmake.nix +++ b/pkgs/servers/foundationdb/vsmake.nix @@ -139,7 +139,7 @@ let outputs = [ "out" "lib" "dev" "pythonsrc" ]; - meta = with gcc6Stdenv.lib; { + meta = with lib; { description = "Open source, distributed, transactional key-value store"; homepage = "https://www.foundationdb.org"; license = licenses.asl20; diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix index 6f932208f3c..06ce536b18d 100644 --- a/pkgs/servers/freeradius/default.nix +++ b/pkgs/servers/freeradius/default.nix @@ -40,7 +40,7 @@ assert withRest -> curl != null && withJson; ## TODO: include oracle optionally ## TODO: include ykclient optionally -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "freeradius"; version = "3.0.21"; @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { "--localstatedir=/var" ] ++ optional (!linkOpenssl) "--with-openssl=no"; - patches = stdenv.lib.optional withRest (fetchpatch { + patches = lib.optional withRest (fetchpatch { # Fix HTTP/2 in rest url = "https://github.com/FreeRADIUS/freeradius-server/commit/6286520698a3cc4053b4d49eb0a61d9ba77632aa.patch"; sha256 = "1ycvr3ql1mfkvzydnn4aiygnidicv2hgllppv37nb1p2pk02159g"; diff --git a/pkgs/servers/gerbera/default.nix b/pkgs/servers/gerbera/default.nix index 965e1d1b082..f81cc6600f1 100644 --- a/pkgs/servers/gerbera/default.nix +++ b/pkgs/servers/gerbera/default.nix @@ -16,7 +16,7 @@ , enableInotifyTools ? true }: -with stdenv.lib; +with lib; let optionOnOff = option: if option then "on" else "off"; in stdenv.mkDerivation rec { diff --git a/pkgs/servers/gopher/gofish/default.nix b/pkgs/servers/gopher/gofish/default.nix index 6468f6a9fcc..db3bcb47ecc 100644 --- a/pkgs/servers/gopher/gofish/default.nix +++ b/pkgs/servers/gopher/gofish/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/project/gofish/gofish/${version}/${pname}-${version}.tar.gz"; sha256 = "0br5nvlna86k4ya4q13gz0i7nlmk225lqmpfiqlkldxkr473kf0s"; }; - + meta = with lib; { description = "A lightweight Gopher server"; homepage = "http://gofish.sourceforge.net/"; diff --git a/pkgs/servers/gotify/default.nix b/pkgs/servers/gotify/default.nix index 7b9b8124366..d0a3d9c10a2 100644 --- a/pkgs/servers/gotify/default.nix +++ b/pkgs/servers/gotify/default.nix @@ -1,6 +1,5 @@ -{ stdenv +{ lib , buildGoPackage -, lib , fetchFromGitHub , buildGoModule , sqlite diff --git a/pkgs/servers/gotty/default.nix b/pkgs/servers/gotty/default.nix index c4881baeac0..7bd09569248 100644 --- a/pkgs/servers/gotty/default.nix +++ b/pkgs/servers/gotty/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gotty"; diff --git a/pkgs/servers/h2/default.nix b/pkgs/servers/h2/default.nix index cdcd802916b..be28578bcb0 100644 --- a/pkgs/servers/h2/default.nix +++ b/pkgs/servers/h2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "h2"; - version = "1.4.193"; + version = "1.4.199"; src = fetchzip { - url = "https://www.h2database.com/h2-2016-10-31.zip"; - sha256 = "1da1qcfwi5gvh68i6w6y0qpcqp3rbgakizagkajmjxk2ryc4b3z9"; + url = "https://h2database.com/h2-2019-03-13.zip"; + sha256 = "0pdvbnx7nqfqs7x1zkwz2q34331l55jknpk6arf6dksvnd71hinj"; }; buildInputs = [ makeWrapper ]; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { description = "The Java SQL database"; homepage = "http://www.h2database.com/html/main.html"; license = licenses.mpl20; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; maintainers = with maintainers; [ mahe ]; }; } diff --git a/pkgs/servers/hbase/default.nix b/pkgs/servers/hbase/default.nix index 5e1d8c85a3f..09600082633 100644 --- a/pkgs/servers/hbase/default.nix +++ b/pkgs/servers/hbase/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { description = "A distributed, scalable, big data store"; homepage = "https://hbase.apache.org"; license = licenses.asl20; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/servers/headphones/default.nix b/pkgs/servers/headphones/default.nix index 0ae4bbcb1fd..67b328d661a 100644 --- a/pkgs/servers/headphones/default.nix +++ b/pkgs/servers/headphones/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python2, makeWrapper }: +{ lib, fetchFromGitHub, python2, makeWrapper }: python2.pkgs.buildPythonApplication rec { pname = "headphones"; @@ -28,6 +28,6 @@ python2.pkgs.buildPythonApplication rec { description = "Automatic music downloader for SABnzbd"; license = licenses.gpl3; homepage = "https://github.com/rembo10/headphones"; - maintainers = with stdenv.lib.maintainers; [ rembo10 ]; + maintainers = with lib.maintainers; [ rembo10 ]; }; } diff --git a/pkgs/servers/hitch/default.nix b/pkgs/servers/hitch/default.nix index 497cdb4fcf4..91b4e1d283e 100644 --- a/pkgs/servers/hitch/default.nix +++ b/pkgs/servers/hitch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, docutils, libev, openssl, pkgconfig, nixosTests }: +{ lib, stdenv, fetchurl, docutils, libev, openssl, pkg-config, nixosTests }: stdenv.mkDerivation rec { version = "1.7.0"; pname = "hitch"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1i75giwyr66ip8xsvk3gg5xdbxnmcabgxz8dqi06c58mw7qzhzn9"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ docutils libev openssl ]; outputs = [ "out" "doc" "man" ]; diff --git a/pkgs/servers/holochain-go/default.nix b/pkgs/servers/holochain-go/default.nix index 95ec267dba2..0d138e1f648 100644 --- a/pkgs/servers/holochain-go/default.nix +++ b/pkgs/servers/holochain-go/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "holochain-go${version}"; @@ -22,8 +22,8 @@ buildGoPackage rec { longDescription = "Holographic storage for distributed applications -- a validating monotonic DHT backed by authoritative hashchains for data provenance"; homepage = "https://holochain.org/"; downloadPage = "https://developer.holochain.org/"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ gavin ]; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ gavin ]; }; } diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index d2b8aec6c0d..fc01fee85b8 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2021.1.1"; + version = "2021.1.5"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; @@ -13,13 +13,13 @@ "ads" = ps: with ps; [ pyads ]; "advantage_air" = ps: with ps; [ advantage-air ]; "aftership" = ps: with ps; [ pyaftership ]; - "agent_dvr" = ps: with ps; [ ]; # missing inputs: agent-py + "agent_dvr" = ps: with ps; [ agent-py ]; "air_quality" = ps: with ps; [ ]; "airly" = ps: with ps; [ airly ]; "airvisual" = ps: with ps; [ pyairvisual ]; "aladdin_connect" = ps: with ps; [ ]; # missing inputs: aladdin_connect "alarm_control_panel" = ps: with ps; [ ]; - "alarmdecoder" = ps: with ps; [ ]; # missing inputs: adext + "alarmdecoder" = ps: with ps; [ adext ]; "alert" = ps: with ps; [ ]; "alexa" = ps: with ps; [ aiohttp-cors ]; "almond" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pyalmond @@ -27,7 +27,7 @@ "amazon_polly" = ps: with ps; [ boto3 ]; "ambiclimate" = ps: with ps; [ aiohttp-cors ambiclimate ]; "ambient_station" = ps: with ps; [ ]; # missing inputs: aioambient - "amcrest" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: amcrest + "amcrest" = ps: with ps; [ amcrest ha-ffmpeg ]; "ampio" = ps: with ps; [ ]; # missing inputs: asmog "android_ip_webcam" = ps: with ps; [ ]; # missing inputs: pydroid-ipcam "androidtv" = ps: with ps; [ adb-shell androidtv pure-python-adb ]; @@ -39,7 +39,7 @@ "apns" = ps: with ps; [ ]; # missing inputs: apns2 "apple_tv" = ps: with ps; [ aiohttp-cors netdisco pyatv zeroconf ]; "apprise" = ps: with ps; [ apprise ]; - "aprs" = ps: with ps; [ ]; # missing inputs: aprslib geopy + "aprs" = ps: with ps; [ geopy ]; # missing inputs: aprslib "aqualogic" = ps: with ps; [ ]; # missing inputs: aqualogic "aquostv" = ps: with ps; [ ]; # missing inputs: sharp_aquos_rc "arcam_fmj" = ps: with ps; [ ]; # missing inputs: arcam-fmj @@ -53,7 +53,7 @@ "asterisk_mbox" = ps: with ps; [ ]; # missing inputs: asterisk_mbox "asuswrt" = ps: with ps; [ ]; # missing inputs: aioasuswrt "atag" = ps: with ps; [ ]; # missing inputs: pyatag - "aten_pe" = ps: with ps; [ ]; # missing inputs: atenpdu + "aten_pe" = ps: with ps; [ atenpdu ]; "atome" = ps: with ps; [ ]; # missing inputs: pyatome "august" = ps: with ps; [ ]; # missing inputs: py-august "aurora" = ps: with ps; [ ]; # missing inputs: auroranoaa @@ -61,10 +61,10 @@ "auth" = ps: with ps; [ aiohttp-cors ]; "automation" = ps: with ps; [ aiohttp-cors ]; "avea" = ps: with ps; [ avea ]; - "avion" = ps: with ps; [ ]; # missing inputs: avion + "avion" = ps: with ps; [ avion ]; "awair" = ps: with ps; [ ]; # missing inputs: python_awair "aws" = ps: with ps; [ aiobotocore ]; - "axis" = ps: with ps; [ aiohttp-cors paho-mqtt ]; # missing inputs: axis + "axis" = ps: with ps; [ aiohttp-cors axis paho-mqtt ]; "azure_devops" = ps: with ps; [ ]; # missing inputs: aioazuredevops "azure_event_hub" = ps: with ps; [ ]; # missing inputs: azure-eventhub "azure_service_bus" = ps: with ps; [ azure-servicebus ]; @@ -77,7 +77,7 @@ "binary_sensor" = ps: with ps; [ ]; "bitcoin" = ps: with ps; [ blockchain ]; "bizkaibus" = ps: with ps; [ ]; # missing inputs: bizkaibus - "blackbird" = ps: with ps; [ ]; # missing inputs: pyblackbird + "blackbird" = ps: with ps; [ pyblackbird ]; "blebox" = ps: with ps; [ ]; # missing inputs: blebox_uniapi "blink" = ps: with ps; [ ]; # missing inputs: blinkpy "blinksticklight" = ps: with ps; [ BlinkStick ]; @@ -96,10 +96,10 @@ "braviatv" = ps: with ps; [ bravia-tv ]; "broadlink" = ps: with ps; [ broadlink ]; "brother" = ps: with ps; [ brother ]; - "brottsplatskartan" = ps: with ps; [ ]; # missing inputs: brottsplatskartan + "brottsplatskartan" = ps: with ps; [ brottsplatskartan ]; "browser" = ps: with ps; [ ]; "brunt" = ps: with ps; [ ]; # missing inputs: brunt - "bsblan" = ps: with ps; [ ]; # missing inputs: bsblan + "bsblan" = ps: with ps; [ bsblan ]; "bt_home_hub_5" = ps: with ps; [ ]; # missing inputs: bthomehub5-devicelist "bt_smarthub" = ps: with ps; [ ]; # missing inputs: btsmarthub_devicelist "buienradar" = ps: with ps; [ ]; # missing inputs: buienradar @@ -121,7 +121,7 @@ "clicksend_tts" = ps: with ps; [ ]; "climate" = ps: with ps; [ ]; "cloud" = ps: with ps; [ aiohttp-cors hass-nabucasa ]; - "cloudflare" = ps: with ps; [ ]; # missing inputs: pycfdns + "cloudflare" = ps: with ps; [ pycfdns ]; "cmus" = ps: with ps; [ ]; # missing inputs: pycmus "co2signal" = ps: with ps; [ ]; # missing inputs: co2signal "coinbase" = ps: with ps; [ ]; # missing inputs: coinbase @@ -153,7 +153,7 @@ "deconz" = ps: with ps; [ ]; # missing inputs: pydeconz "decora" = ps: with ps; [ bluepy ]; # missing inputs: decora "decora_wifi" = ps: with ps; [ ]; # missing inputs: decora_wifi - "default_config" = ps: with ps; [ pynacl aiohttp-cors defusedxml distro emoji hass-nabucasa netdisco pillow sqlalchemy zeroconf ]; # missing inputs: home-assistant-frontend + "default_config" = ps: with ps; [ pynacl aiohttp-cors defusedxml distro emoji hass-nabucasa netdisco pillow sqlalchemy zeroconf ]; "delijn" = ps: with ps; [ ]; # missing inputs: pydelijn "deluge" = ps: with ps; [ deluge-client ]; "demo" = ps: with ps; [ aiohttp-cors ]; @@ -164,7 +164,7 @@ "device_automation" = ps: with ps; [ ]; "device_sun_light_trigger" = ps: with ps; [ aiohttp-cors pillow ]; "device_tracker" = ps: with ps; [ ]; - "devolo_home_control" = ps: with ps; [ aiohttp-cors zeroconf ]; # missing inputs: devolo-home-control-api + "devolo_home_control" = ps: with ps; [ aiohttp-cors devolo-home-control-api zeroconf ]; "dexcom" = ps: with ps; [ pydexcom ]; "dht" = ps: with ps; [ ]; # missing inputs: Adafruit-DHT "dialogflow" = ps: with ps; [ aiohttp-cors ]; @@ -194,7 +194,7 @@ "dweet" = ps: with ps; [ ]; # missing inputs: dweepy "dynalite" = ps: with ps; [ ]; # missing inputs: dynalite_devices "dyson" = ps: with ps; [ aiohttp-cors zeroconf ]; # missing inputs: libpurecool - "eafm" = ps: with ps; [ ]; # missing inputs: aioeafm + "eafm" = ps: with ps; [ aioeafm ]; "ebox" = ps: with ps; [ ]; # missing inputs: pyebox "ebusd" = ps: with ps; [ ]; # missing inputs: ebusdpy "ecoal_boiler" = ps: with ps; [ ]; # missing inputs: ecoaliface @@ -202,7 +202,7 @@ "econet" = ps: with ps; [ ]; # missing inputs: pyeconet "ecovacs" = ps: with ps; [ ]; # missing inputs: sucks "eddystone_temperature" = ps: with ps; [ construct ]; # missing inputs: beacontools[scan] - "edimax" = ps: with ps; [ ]; # missing inputs: pyedimax + "edimax" = ps: with ps; [ pyedimax ]; "edl21" = ps: with ps; [ ]; # missing inputs: pysml "ee_brightbox" = ps: with ps; [ ]; # missing inputs: eebrightbox "efergy" = ps: with ps; [ ]; @@ -247,20 +247,20 @@ "ffmpeg_motion" = ps: with ps; [ ha-ffmpeg ]; "ffmpeg_noise" = ps: with ps; [ ha-ffmpeg ]; "fibaro" = ps: with ps; [ ]; # missing inputs: fiblary3 - "fido" = ps: with ps; [ ]; # missing inputs: pyfido + "fido" = ps: with ps; [ pyfido ]; "file" = ps: with ps; [ ]; "filesize" = ps: with ps; [ ]; "filter" = ps: with ps; [ aiohttp-cors sqlalchemy ]; "fints" = ps: with ps; [ fints ]; "fireservicerota" = ps: with ps; [ ]; # missing inputs: pyfireservicerota - "firmata" = ps: with ps; [ ]; # missing inputs: pymata-express + "firmata" = ps: with ps; [ pymata-express ]; "fitbit" = ps: with ps; [ aiohttp-cors fitbit ]; "fixer" = ps: with ps; [ fixerio ]; "fleetgo" = ps: with ps; [ ]; # missing inputs: ritassist "flexit" = ps: with ps; [ pymodbus ]; # missing inputs: pyflexit "flic" = ps: with ps; [ ]; # missing inputs: pyflic-homeassistant "flick_electric" = ps: with ps; [ ]; # missing inputs: PyFlick - "flo" = ps: with ps; [ ]; # missing inputs: aioflo + "flo" = ps: with ps; [ aioflo ]; "flock" = ps: with ps; [ ]; "flume" = ps: with ps; [ ]; # missing inputs: pyflume "flunearyou" = ps: with ps; [ ]; # missing inputs: pyflunearyou @@ -270,7 +270,7 @@ "folder_watcher" = ps: with ps; [ watchdog ]; "foobot" = ps: with ps; [ ]; # missing inputs: foobot_async "forked_daapd" = ps: with ps; [ ]; # missing inputs: pyforked-daapd pylibrespot-java - "fortios" = ps: with ps; [ ]; # missing inputs: fortiosapi + "fortios" = ps: with ps; [ fortiosapi ]; "foscam" = ps: with ps; [ ]; # missing inputs: libpyfoscam "foursquare" = ps: with ps; [ aiohttp-cors ]; "free_mobile" = ps: with ps; [ ]; # missing inputs: freesms @@ -281,9 +281,9 @@ "fritzbox_callmonitor" = ps: with ps; [ fritzconnection ]; "fritzbox_netmonitor" = ps: with ps; [ fritzconnection ]; "fronius" = ps: with ps; [ ]; # missing inputs: pyfronius - "frontend" = ps: with ps; [ aiohttp-cors pillow ]; # missing inputs: home-assistant-frontend + "frontend" = ps: with ps; [ aiohttp-cors pillow ]; "frontier_silicon" = ps: with ps; [ ]; # missing inputs: afsapi - "futurenow" = ps: with ps; [ ]; # missing inputs: pyfnip + "futurenow" = ps: with ps; [ pyfnip ]; "garadget" = ps: with ps; [ ]; "garmin_connect" = ps: with ps; [ ]; # missing inputs: garminconnect "gc100" = ps: with ps; [ ]; # missing inputs: python-gc100 @@ -292,7 +292,7 @@ "generic" = ps: with ps; [ ]; "generic_thermostat" = ps: with ps; [ ]; "geniushub" = ps: with ps; [ ]; # missing inputs: geniushub-client - "geo_json_events" = ps: with ps; [ ]; # missing inputs: geojson_client + "geo_json_events" = ps: with ps; [ geojson-client ]; "geo_location" = ps: with ps; [ ]; "geo_rss_events" = ps: with ps; [ ]; # missing inputs: georss_generic_client "geofency" = ps: with ps; [ aiohttp-cors ]; @@ -317,7 +317,7 @@ "google_travel_time" = ps: with ps; [ googlemaps ]; "google_wifi" = ps: with ps; [ ]; "gpmdp" = ps: with ps; [ websocket_client ]; - "gpsd" = ps: with ps; [ ]; # missing inputs: gps3 + "gpsd" = ps: with ps; [ gps3 ]; "gpslogger" = ps: with ps; [ aiohttp-cors ]; "graphite" = ps: with ps; [ ]; "gree" = ps: with ps; [ ]; # missing inputs: greeclimate @@ -333,7 +333,7 @@ "hangouts" = ps: with ps; [ ]; # missing inputs: hangups "harman_kardon_avr" = ps: with ps; [ ]; # missing inputs: hkavr "harmony" = ps: with ps; [ aioharmony ]; - "hassio" = ps: with ps; [ aiohttp-cors pillow ]; # missing inputs: home-assistant-frontend + "hassio" = ps: with ps; [ aiohttp-cors pillow ]; "haveibeenpwned" = ps: with ps; [ ]; "hddtemp" = ps: with ps; [ ]; "hdmi_cec" = ps: with ps; [ ]; # missing inputs: pyCEC @@ -350,24 +350,24 @@ "hlk_sw16" = ps: with ps; [ ]; # missing inputs: hlk-sw16 "home_connect" = ps: with ps; [ aiohttp-cors ]; # missing inputs: homeconnect "homeassistant" = ps: with ps; [ ]; - "homekit" = ps: with ps; [ HAP-python pyqrcode aiohttp-cors ha-ffmpeg zeroconf ]; # missing inputs: PyTurboJPEG base36 fnvhash - "homekit_controller" = ps: with ps; [ aiohttp-cors zeroconf ]; # missing inputs: aiohomekit + "homekit" = ps: with ps; [ HAP-python pyqrcode aiohttp-cors base36 fnvhash ha-ffmpeg zeroconf ]; # missing inputs: PyTurboJPEG + "homekit_controller" = ps: with ps; [ aiohomekit aiohttp-cors zeroconf ]; "homematic" = ps: with ps; [ pyhomematic ]; "homematicip_cloud" = ps: with ps; [ ]; # missing inputs: homematicip "homeworks" = ps: with ps; [ ]; # missing inputs: pyhomeworks "honeywell" = ps: with ps; [ ]; # missing inputs: somecomfort "horizon" = ps: with ps; [ ]; # missing inputs: horimote - "hp_ilo" = ps: with ps; [ ]; # missing inputs: python-hpilo + "hp_ilo" = ps: with ps; [ python-hpilo ]; "html5" = ps: with ps; [ aiohttp-cors pywebpush ]; "http" = ps: with ps; [ aiohttp-cors ]; "htu21d" = ps: with ps; [ smbus-cffi ]; # missing inputs: i2csense - "huawei_lte" = ps: with ps; [ getmac stringcase ]; # missing inputs: huawei-lte-api url-normalize + "huawei_lte" = ps: with ps; [ getmac stringcase url-normalize ]; # missing inputs: huawei-lte-api "huawei_router" = ps: with ps; [ ]; "hue" = ps: with ps; [ aiohue ]; "humidifier" = ps: with ps; [ ]; "hunterdouglas_powerview" = ps: with ps; [ ]; # missing inputs: aiopvapi "hvv_departures" = ps: with ps; [ ]; # missing inputs: pygti - "hydrawise" = ps: with ps; [ ]; # missing inputs: hydrawiser + "hydrawise" = ps: with ps; [ hydrawiser ]; "hyperion" = ps: with ps; [ ]; # missing inputs: hyperion-py "iammeter" = ps: with ps; [ ]; # missing inputs: iammeter "iaqualink" = ps: with ps; [ ]; # missing inputs: iaqualink @@ -388,7 +388,7 @@ "input_number" = ps: with ps; [ ]; "input_select" = ps: with ps; [ ]; "input_text" = ps: with ps; [ ]; - "insteon" = ps: with ps; [ ]; # missing inputs: pyinsteon + "insteon" = ps: with ps; [ pyinsteon ]; "integration" = ps: with ps; [ ]; "intent" = ps: with ps; [ aiohttp-cors ]; "intent_script" = ps: with ps; [ ]; @@ -413,12 +413,12 @@ "kankun" = ps: with ps; [ ]; "keba" = ps: with ps; [ ]; # missing inputs: keba-kecontact "keenetic_ndms2" = ps: with ps; [ ]; # missing inputs: ndms2_client - "kef" = ps: with ps; [ getmac ]; # missing inputs: aiokef + "kef" = ps: with ps; [ aiokef getmac ]; "keyboard" = ps: with ps; [ ]; # missing inputs: pyuserinput "keyboard_remote" = ps: with ps; [ aionotify evdev ]; - "kira" = ps: with ps; [ ]; # missing inputs: pykira + "kira" = ps: with ps; [ pykira ]; "kiwi" = ps: with ps; [ ]; # missing inputs: kiwiki-client - "knx" = ps: with ps; [ ]; # missing inputs: xknx + "knx" = ps: with ps; [ xknx ]; "kodi" = ps: with ps; [ ]; # missing inputs: pykodi "konnected" = ps: with ps; [ aiohttp-cors ]; # missing inputs: konnected "kulersky" = ps: with ps; [ ]; # missing inputs: pykulersky @@ -448,7 +448,7 @@ "local_ip" = ps: with ps; [ ]; "locative" = ps: with ps; [ aiohttp-cors ]; "lock" = ps: with ps; [ ]; - "logbook" = ps: with ps; [ aiohttp-cors pillow sqlalchemy ]; # missing inputs: home-assistant-frontend + "logbook" = ps: with ps; [ aiohttp-cors pillow sqlalchemy ]; "logentries" = ps: with ps; [ ]; "logger" = ps: with ps; [ ]; "logi_circle" = ps: with ps; [ aiohttp-cors ha-ffmpeg ]; # missing inputs: logi_circle @@ -459,7 +459,7 @@ "luci" = ps: with ps; [ openwrt-luci-rpc ]; "luftdaten" = ps: with ps; [ luftdaten ]; "lupusec" = ps: with ps; [ ]; # missing inputs: lupupy - "lutron" = ps: with ps; [ ]; # missing inputs: pylutron + "lutron" = ps: with ps; [ pylutron ]; "lutron_caseta" = ps: with ps; [ ]; # missing inputs: pylutron-caseta "lw12wifi" = ps: with ps; [ ]; # missing inputs: lw12 "lyft" = ps: with ps; [ ]; # missing inputs: lyft_rides @@ -468,7 +468,7 @@ "mailgun" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pymailgunner "manual" = ps: with ps; [ ]; "manual_mqtt" = ps: with ps; [ aiohttp-cors paho-mqtt ]; - "map" = ps: with ps; [ aiohttp-cors pillow ]; # missing inputs: home-assistant-frontend + "map" = ps: with ps; [ aiohttp-cors pillow ]; "marytts" = ps: with ps; [ ]; # missing inputs: speak2mary "mastodon" = ps: with ps; [ ]; # missing inputs: Mastodon.py "matrix" = ps: with ps; [ matrix-client ]; @@ -519,7 +519,7 @@ "mvglive" = ps: with ps; [ PyMVGLive ]; "mychevy" = ps: with ps; [ ]; # missing inputs: mychevy "mycroft" = ps: with ps; [ ]; # missing inputs: mycroftapi - "myq" = ps: with ps; [ ]; # missing inputs: pymyq + "myq" = ps: with ps; [ pymyq ]; "mysensors" = ps: with ps; [ aiohttp-cors paho-mqtt ]; # missing inputs: pymysensors "mystrom" = ps: with ps; [ aiohttp-cors python-mystrom ]; "mythicbeastsdns" = ps: with ps; [ ]; # missing inputs: mbddns @@ -572,7 +572,7 @@ "ohmconnect" = ps: with ps; [ defusedxml ]; "ombi" = ps: with ps; [ ]; # missing inputs: pyombi "omnilogic" = ps: with ps; [ ]; # missing inputs: omnilogic - "onboarding" = ps: with ps; [ aiohttp-cors pillow ]; # missing inputs: home-assistant-frontend + "onboarding" = ps: with ps; [ aiohttp-cors pillow ]; "onewire" = ps: with ps; [ ]; # missing inputs: pi1wire pyownet "onkyo" = ps: with ps; [ onkyo-eiscp ]; "onvif" = ps: with ps; [ ha-ffmpeg zeep ]; # missing inputs: WSDiscovery onvif-zeep-async @@ -590,11 +590,11 @@ "opentherm_gw" = ps: with ps; [ ]; # missing inputs: pyotgw "openuv" = ps: with ps; [ ]; # missing inputs: pyopenuv "openweathermap" = ps: with ps; [ pyowm ]; - "opnsense" = ps: with ps; [ ]; # missing inputs: pyopnsense + "opnsense" = ps: with ps; [ pyopnsense ]; "opple" = ps: with ps; [ ]; # missing inputs: pyoppleio "orangepi_gpio" = ps: with ps; [ ]; # missing inputs: OPi.GPIO "oru" = ps: with ps; [ ]; # missing inputs: oru - "orvibo" = ps: with ps; [ ]; # missing inputs: orvibo + "orvibo" = ps: with ps; [ orvibo ]; "osramlightify" = ps: with ps; [ ]; # missing inputs: lightify "otp" = ps: with ps; [ pyotp ]; "ovo_energy" = ps: with ps; [ ]; # missing inputs: ovoenergy @@ -603,8 +603,8 @@ "panasonic_bluray" = ps: with ps; [ ]; # missing inputs: panacotta "panasonic_viera" = ps: with ps; [ ]; # missing inputs: panasonic_viera "pandora" = ps: with ps; [ pexpect ]; - "panel_custom" = ps: with ps; [ aiohttp-cors pillow ]; # missing inputs: home-assistant-frontend - "panel_iframe" = ps: with ps; [ aiohttp-cors pillow ]; # missing inputs: home-assistant-frontend + "panel_custom" = ps: with ps; [ aiohttp-cors pillow ]; + "panel_iframe" = ps: with ps; [ aiohttp-cors pillow ]; "pcal9535a" = ps: with ps; [ ]; # missing inputs: pcal9535a "pencom" = ps: with ps; [ ]; # missing inputs: pencompy "persistent_notification" = ps: with ps; [ ]; @@ -615,17 +615,17 @@ "picotts" = ps: with ps; [ ]; "piglow" = ps: with ps; [ ]; # missing inputs: piglow "pilight" = ps: with ps; [ ]; # missing inputs: pilight - "ping" = ps: with ps; [ ]; # missing inputs: icmplib + "ping" = ps: with ps; [ icmplib ]; "pioneer" = ps: with ps; [ ]; "pjlink" = ps: with ps; [ ]; # missing inputs: pypjlink2 "plaato" = ps: with ps; [ aiohttp-cors ]; "plant" = ps: with ps; [ sqlalchemy ]; "plex" = ps: with ps; [ aiohttp-cors plexapi plexauth plexwebsocket pysonos ]; - "plugwise" = ps: with ps; [ ]; # missing inputs: plugwise + "plugwise" = ps: with ps; [ plugwise ]; "plum_lightpad" = ps: with ps; [ ]; # missing inputs: plumlightpad "pocketcasts" = ps: with ps; [ ]; # missing inputs: pycketcasts "point" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pypoint - "poolsense" = ps: with ps; [ ]; # missing inputs: poolsense + "poolsense" = ps: with ps; [ poolsense ]; "powerwall" = ps: with ps; [ ]; # missing inputs: tesla-powerwall "profiler" = ps: with ps; [ objgraph pyprof2calltree ]; # missing inputs: guppy3 "progettihwsw" = ps: with ps; [ ]; # missing inputs: progettihwsw @@ -653,13 +653,13 @@ "quantum_gateway" = ps: with ps; [ ]; # missing inputs: quantum-gateway "qvr_pro" = ps: with ps; [ ]; # missing inputs: pyqvrpro "qwikswitch" = ps: with ps; [ ]; # missing inputs: pyqwikswitch - "rachio" = ps: with ps; [ aiohttp-cors hass-nabucasa ]; # missing inputs: rachiopy + "rachio" = ps: with ps; [ aiohttp-cors hass-nabucasa rachiopy ]; "radarr" = ps: with ps; [ ]; "radiotherm" = ps: with ps; [ ]; # missing inputs: radiotherm "rainbird" = ps: with ps; [ ]; # missing inputs: pyrainbird "raincloud" = ps: with ps; [ ]; # missing inputs: raincloudy "rainforest_eagle" = ps: with ps; [ ]; # missing inputs: eagle200_reader uEagle - "rainmachine" = ps: with ps; [ ]; # missing inputs: regenmaschine + "rainmachine" = ps: with ps; [ regenmaschine ]; "random" = ps: with ps; [ ]; "raspihats" = ps: with ps; [ smbus-cffi ]; # missing inputs: raspihats "raspyrfm" = ps: with ps; [ ]; # missing inputs: raspyrfm-client @@ -682,7 +682,7 @@ "rmvtransport" = ps: with ps; [ PyRMVtransport ]; "rocketchat" = ps: with ps; [ ]; # missing inputs: rocketchat-API "roku" = ps: with ps; [ ]; # missing inputs: rokuecp - "roomba" = ps: with ps; [ ]; # missing inputs: roombapy + "roomba" = ps: with ps; [ roombapy ]; "roon" = ps: with ps; [ ]; # missing inputs: roonapi "route53" = ps: with ps; [ boto3 ]; "rova" = ps: with ps; [ ]; # missing inputs: rova @@ -698,7 +698,7 @@ "russound_rio" = ps: with ps; [ ]; # missing inputs: russound_rio "russound_rnet" = ps: with ps; [ ]; # missing inputs: russound "sabnzbd" = ps: with ps; [ aiohttp-cors netdisco zeroconf ]; # missing inputs: pysabnzbd - "safe_mode" = ps: with ps; [ aiohttp-cors hass-nabucasa pillow ]; # missing inputs: home-assistant-frontend + "safe_mode" = ps: with ps; [ aiohttp-cors hass-nabucasa pillow ]; "saj" = ps: with ps; [ ]; # missing inputs: pysaj "samsungtv" = ps: with ps; [ samsungctl samsungtvws ]; "satel_integra" = ps: with ps; [ ]; # missing inputs: satel_integra @@ -709,7 +709,7 @@ "scsgate" = ps: with ps; [ ]; # missing inputs: scsgate "search" = ps: with ps; [ aiohttp-cors ]; "season" = ps: with ps; [ ephem ]; - "sendgrid" = ps: with ps; [ ]; # missing inputs: sendgrid + "sendgrid" = ps: with ps; [ sendgrid ]; "sense" = ps: with ps; [ ]; # missing inputs: sense_energy "sensehat" = ps: with ps; [ ]; # missing inputs: sense-hat "sensibo" = ps: with ps; [ ]; # missing inputs: pysensibo @@ -722,7 +722,7 @@ "seventeentrack" = ps: with ps; [ ]; # missing inputs: py17track "sharkiq" = ps: with ps; [ ]; # missing inputs: sharkiqpy "shell_command" = ps: with ps; [ ]; - "shelly" = ps: with ps; [ ]; # missing inputs: aioshelly + "shelly" = ps: with ps; [ aioshelly ]; "shiftr" = ps: with ps; [ paho-mqtt ]; "shodan" = ps: with ps; [ shodan ]; "shopping_list" = ps: with ps; [ aiohttp-cors ]; @@ -759,7 +759,7 @@ "solaredge_local" = ps: with ps; [ ]; # missing inputs: solaredge-local "solarlog" = ps: with ps; [ ]; # missing inputs: sunwatcher "solax" = ps: with ps; [ ]; # missing inputs: solax - "soma" = ps: with ps; [ ]; # missing inputs: pysoma + "soma" = ps: with ps; [ pysoma ]; "somfy" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pymfy "somfy_mylink" = ps: with ps; [ ]; # missing inputs: somfy-mylink-synergy "sonarr" = ps: with ps; [ ]; # missing inputs: sonarr @@ -794,14 +794,14 @@ "supervisord" = ps: with ps; [ ]; "supla" = ps: with ps; [ ]; # missing inputs: asyncpysupla "surepetcare" = ps: with ps; [ ]; # missing inputs: surepy - "swiss_hydrological_data" = ps: with ps; [ ]; # missing inputs: swisshydrodata + "swiss_hydrological_data" = ps: with ps; [ swisshydrodata ]; "swiss_public_transport" = ps: with ps; [ python-opendata-transport ]; "swisscom" = ps: with ps; [ ]; "switch" = ps: with ps; [ ]; "switchbot" = ps: with ps; [ ]; # missing inputs: PySwitchbot - "switcher_kis" = ps: with ps; [ ]; # missing inputs: aioswitcher + "switcher_kis" = ps: with ps; [ aioswitcher ]; "switchmate" = ps: with ps; [ ]; # missing inputs: pySwitchmate - "syncthru" = ps: with ps; [ ]; # missing inputs: pysyncthru url-normalize + "syncthru" = ps: with ps; [ url-normalize ]; # missing inputs: pysyncthru "synology" = ps: with ps; [ ]; # missing inputs: py-synology "synology_chat" = ps: with ps; [ ]; "synology_dsm" = ps: with ps; [ ]; # missing inputs: synologydsm-api @@ -816,7 +816,7 @@ "tank_utility" = ps: with ps; [ ]; # missing inputs: tank_utility "tankerkoenig" = ps: with ps; [ ]; # missing inputs: pytankerkoenig "tapsaff" = ps: with ps; [ ]; # missing inputs: tapsaff - "tasmota" = ps: with ps; [ aiohttp-cors paho-mqtt ]; # missing inputs: hatasmota + "tasmota" = ps: with ps; [ aiohttp-cors hatasmota paho-mqtt ]; "tautulli" = ps: with ps; [ ]; # missing inputs: pytautulli "tcp" = ps: with ps; [ ]; "ted5000" = ps: with ps; [ xmltodict ]; @@ -841,12 +841,12 @@ "tile" = ps: with ps; [ pytile ]; "time_date" = ps: with ps; [ ]; "timer" = ps: with ps; [ ]; - "tmb" = ps: with ps; [ ]; # missing inputs: tmb + "tmb" = ps: with ps; [ tmb ]; "tod" = ps: with ps; [ ]; "todoist" = ps: with ps; [ todoist ]; "tof" = ps: with ps; [ ]; # missing inputs: RPi.GPIO VL53L1X2 "tomato" = ps: with ps; [ ]; - "toon" = ps: with ps; [ aiohttp-cors hass-nabucasa ]; # missing inputs: toonapi + "toon" = ps: with ps; [ aiohttp-cors hass-nabucasa toonapi ]; "torque" = ps: with ps; [ aiohttp-cors ]; "totalconnect" = ps: with ps; [ ]; # missing inputs: total_connect_client "touchline" = ps: with ps; [ ]; # missing inputs: pytouchline @@ -885,17 +885,17 @@ "uptime" = ps: with ps; [ ]; "uptimerobot" = ps: with ps; [ ]; # missing inputs: pyuptimerobot "uscis" = ps: with ps; [ ]; # missing inputs: uscisstatus - "usgs_earthquakes_feed" = ps: with ps; [ ]; # missing inputs: geojson_client + "usgs_earthquakes_feed" = ps: with ps; [ geojson-client ]; "utility_meter" = ps: with ps; [ ]; "uvc" = ps: with ps; [ uvcclient ]; "vacuum" = ps: with ps; [ ]; "vallox" = ps: with ps; [ ]; # missing inputs: vallox-websocket-api "vasttrafik" = ps: with ps; [ ]; # missing inputs: vtjp "velbus" = ps: with ps; [ ]; # missing inputs: python-velbus - "velux" = ps: with ps; [ ]; # missing inputs: pyvlx + "velux" = ps: with ps; [ pyvlx ]; "venstar" = ps: with ps; [ ]; # missing inputs: venstarcolortouch - "vera" = ps: with ps; [ ]; # missing inputs: pyvera - "verisure" = ps: with ps; [ jsonpath ]; # missing inputs: vsure + "vera" = ps: with ps; [ pyvera ]; + "verisure" = ps: with ps; [ jsonpath vsure ]; "versasense" = ps: with ps; [ ]; # missing inputs: pyversasense "version" = ps: with ps; [ pyhaversion ]; "vesync" = ps: with ps; [ ]; # missing inputs: pyvesync @@ -913,9 +913,9 @@ "vultr" = ps: with ps; [ vultr ]; "w800rf32" = ps: with ps; [ ]; # missing inputs: pyW800rf32 "wake_on_lan" = ps: with ps; [ wakeonlan ]; - "waqi" = ps: with ps; [ ]; # missing inputs: waqiasync + "waqi" = ps: with ps; [ waqiasync ]; "water_heater" = ps: with ps; [ ]; - "waterfurnace" = ps: with ps; [ ]; # missing inputs: waterfurnace + "waterfurnace" = ps: with ps; [ waterfurnace ]; "watson_iot" = ps: with ps; [ ]; # missing inputs: ibmiotf "watson_tts" = ps: with ps; [ ]; # missing inputs: ibm-watson "waze_travel_time" = ps: with ps; [ WazeRouteCalculator ]; @@ -927,7 +927,7 @@ "whois" = ps: with ps; [ python-whois ]; "wiffi" = ps: with ps; [ ]; # missing inputs: wiffi "wilight" = ps: with ps; [ pywilight ]; - "wink" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pubnubsub-handler python-wink + "wink" = ps: with ps; [ aiohttp-cors pubnubsub-handler python-wink ]; "wirelesstag" = ps: with ps; [ ]; # missing inputs: wirelesstagpy "withings" = ps: with ps; [ aiohttp-cors ]; # missing inputs: withings-api "wled" = ps: with ps; [ wled ]; @@ -942,7 +942,7 @@ "xbee" = ps: with ps; [ ]; # missing inputs: xbee-helper "xbox" = ps: with ps; [ aiohttp-cors ]; # missing inputs: xbox-webapi "xbox_live" = ps: with ps; [ ]; # missing inputs: xboxapi - "xeoma" = ps: with ps; [ ]; # missing inputs: pyxeoma + "xeoma" = ps: with ps; [ pyxeoma ]; "xfinity" = ps: with ps; [ ]; # missing inputs: xfinity-gateway "xiaomi" = ps: with ps; [ ha-ffmpeg ]; "xiaomi_aqara" = ps: with ps; [ aiohttp-cors netdisco zeroconf ]; # missing inputs: PyXiaomiGateway diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 2275f8c14b5..84c5038b041 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -24,11 +24,6 @@ let (mkOverride "astral" "1.10.1" "d2a67243c4503131c856cafb1b1276de52a86e5b8a1d507b7e08bee51cb67bf1") - # Pinned, because v1.5.0 broke the google_translate integration - # https://github.com/home-assistant/core/pull/38428 - (mkOverride "yarl" "1.4.2" - "0jzpgrdl6415zzl8js7095q8ks14555lhgxah76mimffkr39rkaq") - # hass-frontend does not exist in python3.pkgs (self: super: { hass-frontend = self.callPackage ./frontend.nix { }; @@ -62,7 +57,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.1.1"; + hassVersion = "2021.1.5"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -81,7 +76,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "1linjv1hryqsh8y1rql1i95b4lz4h8siw847gm78m1z8niacz7ss"; + sha256 = "sha256-xi5rHZlhwgEHll3TFlRu7D963tdcQNMmWcoXVjEFLXo="; }; # leave this in, so users don't have to constantly update their downstream patch handling @@ -89,11 +84,11 @@ in with py.pkgs; buildPythonApplication rec { postPatch = '' substituteInPlace setup.py \ - --replace "aiohttp==3.7.1" "aiohttp>=3.6.3" \ --replace "attrs==19.3.0" "attrs>=19.3.0" \ --replace "bcrypt==3.1.7" "bcrypt>=3.1.7" \ --replace "cryptography==3.2" "cryptography" \ --replace "pip>=8.0.3,<20.3" "pip" \ + --replace "pyyaml==5.3.1" "pyyaml>=5.3.1" \ --replace "requests==2.25.0" "requests>=2.24.0" \ --replace "ruamel.yaml==0.15.100" "ruamel.yaml>=0.15.100" substituteInPlace tests/test_config.py --replace '"/usr"' '"/build/media"' @@ -184,6 +179,8 @@ in with py.pkgs; buildPythonApplication rec { # keyring.errors.NoKeyringError: No recommended backend was available. "test_secrets_from_unrelated_fails" "test_secrets_credstash" + # RuntimeError: Event loop is closed + "test_remove_older_logs" ]; preCheck = '' diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py index fc0e790bd6f..55e58d7a017 100755 --- a/pkgs/servers/home-assistant/parse-requirements.py +++ b/pkgs/servers/home-assistant/parse-requirements.py @@ -161,7 +161,8 @@ def main() -> None: if attr_path is not None: # Add attribute path without "python3Packages." prefix attr_paths.append(attr_path[len(PKG_SET + ".") :]) - else: + # home-assistant-frontend is always in propagatedBuildInputs + elif name != 'home-assistant-frontend': missing_reqs.append(name) else: build_inputs[component] = (attr_paths, missing_reqs) diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index e0c906fe9f1..46e1d7643d5 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -8,7 +8,7 @@ , luaSupport ? false, lua5 }: -let inherit (stdenv.lib) optional; +let inherit (lib) optional; in assert sslSupport -> aprutil.sslSupport && openssl != null; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ''; # Required for ‘pthread_cancel’. - NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; + NIX_LDFLAGS = lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; configureFlags = [ "--with-apr=${apr.dev}" @@ -57,19 +57,19 @@ stdenv.mkDerivation rec { "--enable-imagemap" "--enable-cgi" "--includedir=${placeholder "dev"}/include" - (stdenv.lib.enableFeature proxySupport "proxy") - (stdenv.lib.enableFeature sslSupport "ssl") - (stdenv.lib.withFeatureAs libxml2Support "libxml2" "${libxml2.dev}/include/libxml2") + (lib.enableFeature proxySupport "proxy") + (lib.enableFeature sslSupport "ssl") + (lib.withFeatureAs libxml2Support "libxml2" "${libxml2.dev}/include/libxml2") "--docdir=$(doc)/share/doc" - (stdenv.lib.enableFeature brotliSupport "brotli") - (stdenv.lib.withFeatureAs brotliSupport "brotli" brotli) + (lib.enableFeature brotliSupport "brotli") + (lib.withFeatureAs brotliSupport "brotli" brotli) - (stdenv.lib.enableFeature http2Support "http2") - (stdenv.lib.withFeature http2Support "nghttp2") + (lib.enableFeature http2Support "http2") + (lib.withFeature http2Support "nghttp2") - (stdenv.lib.enableFeature luaSupport "lua") - (stdenv.lib.withFeatureAs luaSupport "lua" lua5) + (lib.enableFeature luaSupport "lua") + (lib.withFeatureAs luaSupport "lua" lua5) ]; enableParallelBuilding = true; @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { description = "Apache HTTPD, the world's most popular web server"; homepage = "http://httpd.apache.org/"; license = licenses.asl20; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with maintainers; [ lovek323 peti ]; }; } diff --git a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix index 498d3bc0424..23a8d34a632 100644 --- a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix +++ b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, apacheHttpd, autoconf, automake, autoreconfHook, curl, fetchFromGitHub, glib, lasso, libtool, libxml2, libxslt, openssl, pkgconfig, xmlsec }: +{ lib, stdenv, apacheHttpd, autoconf, automake, autoreconfHook, curl, fetchFromGitHub, glib, lasso, libtool, libxml2, libxslt, openssl, pkg-config, xmlsec }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ./fixdeps.patch ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ apacheHttpd autoconf automake curl glib lasso libtool libxml2 libxslt openssl xmlsec ]; configureFlags = ["--with-apxs2=${apacheHttpd.dev}/bin/apxs" "--exec-prefix=$out"]; diff --git a/pkgs/servers/http/apache-modules/mod_ca/default.nix b/pkgs/servers/http/apache-modules/mod_ca/default.nix index 04440666f29..a357f0291ce 100644 --- a/pkgs/servers/http/apache-modules/mod_ca/default.nix +++ b/pkgs/servers/http/apache-modules/mod_ca/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, apacheHttpd, openssl, openldap, apr, aprutil }: +{ lib, stdenv, fetchurl, pkg-config, apacheHttpd, openssl, openldap, apr, aprutil }: stdenv.mkDerivation rec { pname = "mod_ca"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0gs66br3aig749rzifxn6j1rz2kps4hc4jppscly48lypgyygy8s"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ apacheHttpd openssl openldap apr aprutil ]; # Note that configureFlags and installFlags are inherited by @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { ]; installFlags = [ - "INCLUDEDIR=${placeholder ''out''}/include" - "LIBEXECDIR=${placeholder ''out''}/modules" + "INCLUDEDIR=${placeholder "out"}/include" + "LIBEXECDIR=${placeholder "out"}/modules" ]; meta = with lib; { diff --git a/pkgs/servers/http/apache-modules/mod_crl/default.nix b/pkgs/servers/http/apache-modules/mod_crl/default.nix index a5f06a58ad5..a8025c153e0 100644 --- a/pkgs/servers/http/apache-modules/mod_crl/default.nix +++ b/pkgs/servers/http/apache-modules/mod_crl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }: +{ lib, stdenv, fetchurl, pkg-config, mod_ca, apr, aprutil }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1x186kp6fr8nwg0jlv5phagxndvw4rjqfga9mkibmn6dx252p61d"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ mod_ca apr aprutil ]; inherit (mod_ca) configureFlags installFlags; diff --git a/pkgs/servers/http/apache-modules/mod_csr/default.nix b/pkgs/servers/http/apache-modules/mod_csr/default.nix index e83ef99a2f0..c334939a1c5 100644 --- a/pkgs/servers/http/apache-modules/mod_csr/default.nix +++ b/pkgs/servers/http/apache-modules/mod_csr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }: +{ lib, stdenv, fetchurl, pkg-config, mod_ca, apr, aprutil }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1p4jc0q40453wpvwqgnr1n007b4jxpkizzy3r4jygsxxgg4x9w7x"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ mod_ca apr aprutil ]; inherit (mod_ca) configureFlags installFlags; diff --git a/pkgs/servers/http/apache-modules/mod_dnssd/default.nix b/pkgs/servers/http/apache-modules/mod_dnssd/default.nix index 783f7bfb4b2..da1b4e456b7 100644 --- a/pkgs/servers/http/apache-modules/mod_dnssd/default.nix +++ b/pkgs/servers/http/apache-modules/mod_dnssd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, apacheHttpd, apr, avahi }: +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, apacheHttpd, apr, avahi }: stdenv.mkDerivation rec { name = "mod_dnssd-0.6"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-lynx" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ apacheHttpd avahi apr ]; patches = [ (fetchpatch { diff --git a/pkgs/servers/http/apache-modules/mod_evasive/default.nix b/pkgs/servers/http/apache-modules/mod_evasive/default.nix index 9abd08baa09..daac4839853 100644 --- a/pkgs/servers/http/apache-modules/mod_evasive/default.nix +++ b/pkgs/servers/http/apache-modules/mod_evasive/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation { meta = { homepage = "http://www.zdziarski.com/blog/?page_id=442"; description = "Evasive maneuvers module for Apache to provide evasive action in the event of an HTTP DoS or DDoS attack or brute force attack"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix index 4922076266b..0e5a5fed31c 100644 --- a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix +++ b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, apacheHttpd }: +{ lib, stdenv, fetchurl, apacheHttpd }: let version = "2.4.7.1"; @@ -42,7 +42,7 @@ stdenv.mkDerivation { more scalable. ''; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.peti ]; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.peti ]; }; } diff --git a/pkgs/servers/http/apache-modules/mod_ocsp/default.nix b/pkgs/servers/http/apache-modules/mod_ocsp/default.nix index fa9309fc472..116a9822291 100644 --- a/pkgs/servers/http/apache-modules/mod_ocsp/default.nix +++ b/pkgs/servers/http/apache-modules/mod_ocsp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }: +{ lib, stdenv, fetchurl, pkg-config, mod_ca, apr, aprutil }: stdenv.mkDerivation rec { pname = "mod_ocsp"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0wy5363m4gq1w08iny2b3sh925bnznlln88pr9lgj9vgbn8pqnrn"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ mod_ca apr aprutil ]; inherit (mod_ca) configureFlags installFlags; diff --git a/pkgs/servers/http/apache-modules/mod_pkcs12/default.nix b/pkgs/servers/http/apache-modules/mod_pkcs12/default.nix index 711443230e6..1632ed381b0 100644 --- a/pkgs/servers/http/apache-modules/mod_pkcs12/default.nix +++ b/pkgs/servers/http/apache-modules/mod_pkcs12/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }: +{ lib, stdenv, fetchurl, pkg-config, mod_ca, apr, aprutil }: stdenv.mkDerivation rec { pname = "mod_pkcs12"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1jfyax3qrw9rpf2n0pn6iw4dpn2nl4j0i2a998n5p1mdmjx9ch73"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ mod_ca apr aprutil ]; inherit (mod_ca) configureFlags installFlags; diff --git a/pkgs/servers/http/apache-modules/mod_python/default.nix b/pkgs/servers/http/apache-modules/mod_python/default.nix index 39c568d1d49..3d9d4b21c40 100644 --- a/pkgs/servers/http/apache-modules/mod_python/default.nix +++ b/pkgs/servers/http/apache-modules/mod_python/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, apacheHttpd, python2 }: +{ lib, stdenv, fetchurl, apacheHttpd, python2 }: stdenv.mkDerivation rec { name = "mod_python-3.5.0"; @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://modpython.org/"; description = "An Apache module that embeds the Python interpreter within the server"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/http/apache-modules/mod_scep/default.nix b/pkgs/servers/http/apache-modules/mod_scep/default.nix index e56fa6987e1..68aeded93d0 100644 --- a/pkgs/servers/http/apache-modules/mod_scep/default.nix +++ b/pkgs/servers/http/apache-modules/mod_scep/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }: +{ lib, stdenv, fetchurl, pkg-config, mod_ca, apr, aprutil }: stdenv.mkDerivation rec { pname = "mod_scep"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1imddqyi81l90valvndx9r0ywn32ggijrdfrjmbx8j1abaccagrc"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ mod_ca apr aprutil ]; inherit (mod_ca) configureFlags installFlags; diff --git a/pkgs/servers/http/apache-modules/mod_spkac/default.nix b/pkgs/servers/http/apache-modules/mod_spkac/default.nix index dba56765538..01ecae55b2e 100644 --- a/pkgs/servers/http/apache-modules/mod_spkac/default.nix +++ b/pkgs/servers/http/apache-modules/mod_spkac/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }: +{ lib, stdenv, fetchurl, pkg-config, mod_ca, apr, aprutil }: stdenv.mkDerivation rec { pname = "mod_spkac"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0hpr58yazbi21m0sjn22a8ns4h81s4jlab9szcdw7j9w9jdc7j0h"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ mod_ca apr aprutil ]; inherit (mod_ca) configureFlags installFlags; diff --git a/pkgs/servers/http/apache-modules/mod_timestamp/default.nix b/pkgs/servers/http/apache-modules/mod_timestamp/default.nix index 5e315fe956f..d1d254c30b4 100644 --- a/pkgs/servers/http/apache-modules/mod_timestamp/default.nix +++ b/pkgs/servers/http/apache-modules/mod_timestamp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }: +{ lib, stdenv, fetchurl, pkg-config, mod_ca, apr, aprutil }: stdenv.mkDerivation rec { pname = "mod_timestamp"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1p18mgxx2ainfrc2wm27rl3lh6yl0ihx6snib60jnp694587bfwg"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ mod_ca apr aprutil ]; inherit (mod_ca) configureFlags installFlags; diff --git a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix index c8f95e685ab..7f28abe8840 100644 --- a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix +++ b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, apacheHttpd, python, ncurses }: +{ lib, stdenv, fetchurl, apacheHttpd, python, ncurses }: stdenv.mkDerivation rec { pname = "mod_wsgi"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/GrahamDumpleton/mod_wsgi"; description = "Host Python applications in Apache through the WSGI interface"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.asl20; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/servers/http/apt-cacher-ng/default.nix b/pkgs/servers/http/apt-cacher-ng/default.nix index 1f5e861e60c..de3f58fc06f 100644 --- a/pkgs/servers/http/apt-cacher-ng/default.nix +++ b/pkgs/servers/http/apt-cacher-ng/default.nix @@ -7,7 +7,7 @@ , libevent , lzma , openssl -, pkgconfig +, pkg-config , systemd , tcp_wrappers , zlib @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { sha256 = "0h76n02nnpg7ir9247qrxb8p4d4p282nh13zrv5bb9sfm12pril2"; }; - nativeBuildInputs = [ cmake doxygen pkgconfig ]; + nativeBuildInputs = [ cmake doxygen pkg-config ]; buildInputs = [ bzip2 fuse libevent lzma openssl systemd tcp_wrappers zlib ]; meta = with lib; { diff --git a/pkgs/servers/http/couchdb/default.nix b/pkgs/servers/http/couchdb/default.nix index 91b636cfdde..45023e800af 100644 --- a/pkgs/servers/http/couchdb/default.nix +++ b/pkgs/servers/http/couchdb/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, erlang, icu, openssl, spidermonkey_1_8_5, curl, help2man -, sphinx, which, file, pkgconfig, getopt }: +, sphinx, which, file, pkg-config, getopt }: stdenv.mkDerivation rec { pname = "couchdb"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1b9cbdrmh1i71mrwvhm17v4cf7lckpil1vvq7lpmxyn6zfk0l84i"; }; - nativeBuildInputs = [ help2man which file pkgconfig sphinx ]; + nativeBuildInputs = [ help2man which file pkg-config sphinx ]; buildInputs = [ erlang icu openssl spidermonkey_1_8_5 curl ]; postInstall = '' diff --git a/pkgs/servers/http/darkhttpd/default.nix b/pkgs/servers/http/darkhttpd/default.nix index 84adea1f4dc..49097fe2bfa 100644 --- a/pkgs/servers/http/darkhttpd/default.nix +++ b/pkgs/servers/http/darkhttpd/default.nix @@ -12,19 +12,16 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; installPhase = '' - # install darkhttpd - install -Dm755 "darkhttpd" "$out/bin/darkhttpd" - - # install license - install -d "$out/share/licenses/darkhttpd" - head -n 18 darkhttpd.c > "$out/share/licenses/darkhttpd/LICENSE" + install -Dm555 -t $out/bin darkhttpd + install -Dm444 -t $out/share/doc/${pname} README + head -n 18 darkhttpd.c > $out/share/doc/${pname}/LICENSE ''; meta = with lib; { description = "Small and secure static webserver"; - homepage = "https://unix4lyfe.org/darkhttpd/"; - license = licenses.bsd3; + homepage = "https://unix4lyfe.org/darkhttpd/"; + license = licenses.bsd3; maintainers = with maintainers; [ bobvanderlinden ]; - platforms = platforms.all; + platforms = platforms.all; }; } diff --git a/pkgs/servers/http/envoy/0001-quiche-update-QUICHE-tar-13949.patch b/pkgs/servers/http/envoy/0001-quiche-update-QUICHE-tar-13949.patch new file mode 100644 index 00000000000..4bf0a0d0e95 --- /dev/null +++ b/pkgs/servers/http/envoy/0001-quiche-update-QUICHE-tar-13949.patch @@ -0,0 +1,2980 @@ +From 97d7c456e03d4a11157fac17c7b8cbcee1d8a657 Mon Sep 17 00:00:00 2001 +From: danzh <danzh2010@users.noreply.github.com> +Date: Mon, 16 Nov 2020 14:27:13 -0500 +Subject: [PATCH] quiche: update QUICHE tar (#13949) + +Signed-off-by: Dan Zhang <danzh@google.com> +--- + bazel/envoy_internal.bzl | 2 + + bazel/external/quiche.BUILD | 85 +-- + bazel/repository_locations.bzl | 6 +- + source/extensions/quic_listeners/quiche/BUILD | 1 + + .../quiche/active_quic_listener.cc | 2 +- + .../quiche/envoy_quic_client_connection.cc | 2 +- + .../quiche/envoy_quic_client_stream.cc | 1 + + .../quiche/envoy_quic_connection.cc | 6 +- + .../quiche/envoy_quic_connection.h | 1 + + .../quiche/envoy_quic_dispatcher.cc | 6 +- + .../quiche/envoy_quic_dispatcher.h | 2 +- + .../quiche/envoy_quic_proof_source.cc | 2 +- + .../quiche/envoy_quic_proof_source.h | 2 +- + .../quiche/envoy_quic_proof_source_base.cc | 7 +- + .../quiche/envoy_quic_proof_source_base.h | 6 +- + .../quiche/envoy_quic_proof_verifier_base.cc | 4 +- + .../quiche/envoy_quic_server_connection.cc | 10 +- + .../quiche/envoy_quic_server_connection.h | 1 + + .../quic_listeners/quiche/platform/BUILD | 42 +- + .../quiche/platform/flags_impl.cc | 108 +++- + .../quiche/platform/flags_impl.h | 46 +- + .../quiche/platform/flags_list.h | 502 ------------------ + .../quiche/platform/http2_flags_impl.h | 4 +- + .../quiche/platform/quic_aligned_impl.h | 18 - + .../quiche/platform/quic_cert_utils_impl.cc | 38 +- + .../quiche/platform/quic_cert_utils_impl.h | 9 +- + .../quiche/platform/quic_fallthrough_impl.h | 11 - + .../quiche/platform/quic_file_utils_impl.cc | 4 +- + .../quiche/platform/quic_file_utils_impl.h | 6 +- + .../quiche/platform/quic_flags_impl.h | 6 +- + .../platform/quic_hostname_utils_impl.cc | 6 +- + .../platform/quic_hostname_utils_impl.h | 8 +- + .../quiche/platform/quic_macros_impl.h | 13 - + .../platform/quic_mem_slice_span_impl.cc | 3 +- + .../platform/quic_mem_slice_span_impl.h | 9 +- + ..._ptr_util_impl.h => quic_testvalue_impl.h} | 11 +- + .../platform/quic_udp_socket_platform_impl.h | 3 + + .../quiche/platform/quiche_arraysize_impl.h | 11 - + .../quiche/platform/quiche_optional_impl.h | 17 - + .../quiche/platform/quiche_text_utils_impl.h | 63 +-- + .../quiche/platform/quiche_time_utils_impl.cc | 4 +- + .../quiche/platform/quiche_time_utils_impl.h | 4 +- + .../platform/spdy_endianness_util_impl.h | 29 - + .../quiche/platform/spdy_flags_impl.h | 4 +- + .../quiche/platform/spdy_string_utils_impl.h | 2 +- + .../spdy_server_push_utils_for_envoy.cc | 10 +- + .../quiche/envoy_quic_client_session_test.cc | 2 +- + .../quiche/envoy_quic_client_stream_test.cc | 44 +- + .../quiche/envoy_quic_proof_source_test.cc | 6 +- + .../quiche/envoy_quic_proof_verifier_test.cc | 8 +- + .../quiche/envoy_quic_server_session_test.cc | 3 +- + .../quiche/envoy_quic_server_stream_test.cc | 53 +- + .../quic_listeners/quiche/platform/BUILD | 22 - + .../quiche/platform/http2_platform_test.cc | 22 +- + .../quiche/platform/quic_platform_test.cc | 61 +-- + .../quiche/platform/quic_test_output_impl.cc | 15 +- + .../quiche/platform/quic_test_output_impl.h | 12 +- + .../quiche/platform/quiche_platform_test.cc | 39 -- + .../quiche/platform/spdy_platform_test.cc | 20 +- + .../quic_listeners/quiche/test_proof_source.h | 2 +- + .../quic_listeners/quiche/test_utils.h | 4 +- + 61 files changed, 396 insertions(+), 1054 deletions(-) + delete mode 100644 source/extensions/quic_listeners/quiche/platform/flags_list.h + delete mode 100644 source/extensions/quic_listeners/quiche/platform/quic_aligned_impl.h + delete mode 100644 source/extensions/quic_listeners/quiche/platform/quic_fallthrough_impl.h + delete mode 100644 source/extensions/quic_listeners/quiche/platform/quic_macros_impl.h + rename source/extensions/quic_listeners/quiche/platform/{quiche_ptr_util_impl.h => quic_testvalue_impl.h} (52%) + delete mode 100644 source/extensions/quic_listeners/quiche/platform/quiche_arraysize_impl.h + delete mode 100644 source/extensions/quic_listeners/quiche/platform/quiche_optional_impl.h + delete mode 100644 source/extensions/quic_listeners/quiche/platform/spdy_endianness_util_impl.h + delete mode 100644 test/extensions/quic_listeners/quiche/platform/quiche_platform_test.cc + +diff --git a/bazel/envoy_internal.bzl b/bazel/envoy_internal.bzl +index 5ad86609a..3f9ddfd23 100644 +--- a/bazel/envoy_internal.bzl ++++ b/bazel/envoy_internal.bzl +@@ -54,6 +54,8 @@ def envoy_copts(repository, test = False): + }) + select({ + repository + "//bazel:clang_build": ["-fno-limit-debug-info", "-Wgnu-conditional-omitted-operand", "-Wc++2a-extensions", "-Wrange-loop-analysis"], + repository + "//bazel:gcc_build": ["-Wno-maybe-uninitialized"], ++ # TODO: Replace with /Zc:preprocessor for cl.exe versions >= 16.5 ++ repository + "//bazel:windows_x86_64": ["-experimental:preprocessor", "-Wv:19.4"], + "//conditions:default": [], + }) + select({ + repository + "//bazel:no_debug_info": ["-g0"], +diff --git a/bazel/external/quiche.BUILD b/bazel/external/quiche.BUILD +index 7541909aa..b6b208fc5 100644 +--- a/bazel/external/quiche.BUILD ++++ b/bazel/external/quiche.BUILD +@@ -57,16 +57,12 @@ quiche_common_copts = [ + "-Wno-unused-function", + # quic_inlined_frame.h uses offsetof() to optimize memory usage in frames. + "-Wno-invalid-offsetof", +- "-Wno-range-loop-analysis", + ] + + quiche_copts = select({ + # Ignore unguarded #pragma GCC statements in QUICHE sources + "@envoy//bazel:windows_x86_64": ["-wd4068"], + # Remove these after upstream fix. +- "@envoy//bazel:gcc_build": [ +- "-Wno-sign-compare", +- ] + quiche_common_copts, + "//conditions:default": quiche_common_copts, + }) + +@@ -737,7 +733,6 @@ envoy_cc_library( + hdrs = [ + "quiche/spdy/platform/api/spdy_bug_tracker.h", + "quiche/spdy/platform/api/spdy_containers.h", +- "quiche/spdy/platform/api/spdy_endianness_util.h", + "quiche/spdy/platform/api/spdy_estimate_memory_usage.h", + "quiche/spdy/platform/api/spdy_flags.h", + "quiche/spdy/platform/api/spdy_logging.h", +@@ -935,6 +930,7 @@ envoy_cc_library( + copts = quiche_copts, + repository = "@envoy", + deps = [ ++ ":http2_hpack_huffman_hpack_huffman_encoder_lib", + ":spdy_core_protocol_lib", + ":spdy_platform", + ], +@@ -1049,19 +1045,16 @@ envoy_cc_library( + envoy_cc_library( + name = "quic_platform_base", + hdrs = [ +- "quiche/quic/platform/api/quic_aligned.h", + "quiche/quic/platform/api/quic_bug_tracker.h", + "quiche/quic/platform/api/quic_client_stats.h", + "quiche/quic/platform/api/quic_containers.h", + "quiche/quic/platform/api/quic_error_code_wrappers.h", + "quiche/quic/platform/api/quic_estimate_memory_usage.h", + "quiche/quic/platform/api/quic_exported_stats.h", +- "quiche/quic/platform/api/quic_fallthrough.h", + "quiche/quic/platform/api/quic_flag_utils.h", + "quiche/quic/platform/api/quic_flags.h", + "quiche/quic/platform/api/quic_iovec.h", + "quiche/quic/platform/api/quic_logging.h", +- "quiche/quic/platform/api/quic_macros.h", + "quiche/quic/platform/api/quic_map_util.h", + "quiche/quic/platform/api/quic_mem_slice.h", + "quiche/quic/platform/api/quic_prefetch.h", +@@ -1072,6 +1065,7 @@ envoy_cc_library( + "quiche/quic/platform/api/quic_stream_buffer_allocator.h", + "quiche/quic/platform/api/quic_string_utils.h", + "quiche/quic/platform/api/quic_uint128.h", ++ "quiche/quic/platform/api/quic_testvalue.h", + # TODO: uncomment the following files as implementations are added. + # "quiche/quic/platform/api/quic_fuzzed_data_provider.h", + # "quiche/quic/platform/api/quic_test_loopback.h", +@@ -1147,7 +1141,6 @@ envoy_cc_test_library( + hdrs = ["quiche/quic/platform/api/quic_port_utils.h"], + repository = "@envoy", + tags = ["nofips"], +- deps = ["@envoy//test/extensions/quic_listeners/quiche/platform:quic_platform_port_utils_impl_lib"], + ) + + envoy_cc_library( +@@ -1216,15 +1209,14 @@ envoy_cc_test_library( + ) + + envoy_cc_library( +- name = "quiche_common_platform_endian", +- hdrs = ["quiche/common/platform/api/quiche_endian.h"], ++ name = "quiche_common_endian_lib", ++ hdrs = ["quiche/common/quiche_endian.h"], + repository = "@envoy", + tags = ["nofips"], + visibility = ["//visibility:public"], + deps = + [ + ":quiche_common_platform_export", +- "@envoy//source/extensions/quic_listeners/quiche/platform:quiche_common_platform_endian_impl_lib", + ], + ) + +@@ -1932,6 +1924,7 @@ envoy_cc_library( + visibility = ["//visibility:public"], + deps = [ + ":quic_core_clock_lib", ++ ":quic_core_crypto_certificate_view_lib", + ":quic_core_crypto_encryption_lib", + ":quic_core_crypto_hkdf_lib", + ":quic_core_crypto_proof_source_interface_lib", +@@ -2167,6 +2160,15 @@ envoy_cc_library( + ], + ) + ++envoy_cc_library( ++ name = "quic_core_flags_list_lib", ++ hdrs = ["quiche/quic/core/quic_flags_list.h"], ++ copts = quiche_copts, ++ repository = "@envoy", ++ tags = ["nofips"], ++ visibility = ["//visibility:public"], ++) ++ + envoy_cc_library( + name = "quic_core_framer_lib", + srcs = ["quiche/quic/core/quic_framer.cc"], +@@ -2339,6 +2341,7 @@ envoy_cc_library( + repository = "@envoy", + tags = ["nofips"], + deps = [ ++ ":http2_constants_lib", + ":quic_core_data_lib", + ":quic_core_error_codes_lib", + ":quic_core_http_http_frames_lib", +@@ -2723,6 +2726,27 @@ envoy_cc_library( + ], + ) + ++envoy_cc_library( ++ name = "quic_core_path_validator_lib", ++ srcs = ["quiche/quic/core/quic_path_validator.cc"], ++ hdrs = ["quiche/quic/core/quic_path_validator.h"], ++ copts = quiche_copts, ++ repository = "@envoy", ++ tags = ["nofips"], ++ deps = [ ++ ":quic_core_alarm_factory_interface_lib", ++ ":quic_core_alarm_interface_lib", ++ ":quic_core_arena_scoped_ptr_lib", ++ ":quic_core_clock_lib", ++ ":quic_core_constants_lib", ++ ":quic_core_crypto_random_lib", ++ ":quic_core_one_block_arena_lib", ++ ":quic_core_packet_writer_interface_lib", ++ ":quic_core_types_lib", ++ ":quic_platform", ++ ], ++) ++ + envoy_cc_library( + name = "quic_core_process_packet_interface_lib", + hdrs = ["quiche/quic/core/quic_process_packet_interface.h"], +@@ -2735,6 +2759,15 @@ envoy_cc_library( + ], + ) + ++envoy_cc_library( ++ name = "quic_core_protocol_flags_list_lib", ++ hdrs = ["quiche/quic/core/quic_protocol_flags_list.h"], ++ copts = quiche_copts, ++ repository = "@envoy", ++ tags = ["nofips"], ++ visibility = ["//visibility:public"], ++) ++ + envoy_cc_library( + name = "quic_core_qpack_blocking_manager_lib", + srcs = ["quiche/quic/core/qpack/qpack_blocking_manager.cc"], +@@ -2896,6 +2929,7 @@ envoy_cc_library( + deps = [ + ":http2_decoder_decode_buffer_lib", + ":http2_decoder_decode_status_lib", ++ ":quic_core_error_codes_lib", + ":quic_core_qpack_qpack_instruction_decoder_lib", + ":quic_core_qpack_qpack_instructions_lib", + ":quic_core_qpack_qpack_stream_receiver_lib", +@@ -3368,7 +3402,7 @@ envoy_cc_library( + ":quic_core_error_codes_lib", + ":quic_core_time_lib", + ":quic_platform_base", +- ":quiche_common_platform_endian", ++ ":quiche_common_endian_lib", + ], + ) + +@@ -3420,6 +3454,7 @@ envoy_cc_library( + repository = "@envoy", + tags = ["nofips"], + deps = [ ++ ":quic_core_circular_deque_lib", + ":quic_core_connection_stats_lib", + ":quic_core_packets_lib", + ":quic_core_session_notifier_interface_lib", +@@ -3459,6 +3494,7 @@ envoy_cc_library( + deps = [ + ":quic_core_versions_lib", + ":quic_platform_base", ++ ":quiche_common_endian_lib", + ], + ) + +@@ -3475,7 +3511,6 @@ envoy_cc_library( + ":quic_core_tag_lib", + ":quic_core_types_lib", + ":quic_platform_base", +- ":quiche_common_platform_endian", + ], + ) + +@@ -3746,6 +3781,7 @@ envoy_cc_test_library( + ":quic_core_packet_creator_lib", + ":quic_core_packet_writer_interface_lib", + ":quic_core_packets_lib", ++ ":quic_core_path_validator_lib", + ":quic_core_received_packet_manager_lib", + ":quic_core_sent_packet_manager_lib", + ":quic_core_server_id_lib", +@@ -3836,25 +3872,10 @@ envoy_cc_test_library( + deps = [":epoll_server_platform"], + ) + +-envoy_cc_library( +- name = "quiche_common_platform_optional", +- hdrs = ["quiche/common/platform/api/quiche_optional.h"], +- repository = "@envoy", +- tags = ["nofips"], +- visibility = ["//visibility:public"], +- deps = [ +- ":quiche_common_platform_export", +- "@envoy//source/extensions/quic_listeners/quiche/platform:quiche_common_platform_optional_impl_lib", +- ], +-) +- + envoy_cc_library( + name = "quiche_common_platform", + hdrs = [ +- "quiche/common/platform/api/quiche_arraysize.h", + "quiche/common/platform/api/quiche_logging.h", +- "quiche/common/platform/api/quiche_optional.h", +- "quiche/common/platform/api/quiche_ptr_util.h", + "quiche/common/platform/api/quiche_str_cat.h", + "quiche/common/platform/api/quiche_string_piece.h", + "quiche/common/platform/api/quiche_text_utils.h", +@@ -3866,7 +3887,6 @@ envoy_cc_library( + visibility = ["//visibility:public"], + deps = [ + ":quiche_common_platform_export", +- ":quiche_common_platform_optional", + "@envoy//source/extensions/quic_listeners/quiche/platform:quiche_common_platform_impl_lib", + ], + ) +@@ -3874,7 +3894,6 @@ envoy_cc_library( + envoy_cc_test_library( + name = "quiche_common_platform_test", + srcs = [ +- "quiche/common/platform/api/quiche_endian_test.cc", + "quiche/common/platform/api/quiche_str_cat_test.cc", + "quiche/common/platform/api/quiche_text_utils_test.cc", + "quiche/common/platform/api/quiche_time_utils_test.cc", +@@ -3884,7 +3903,6 @@ envoy_cc_test_library( + tags = ["nofips"], + deps = [ + ":quiche_common_platform", +- ":quiche_common_platform_endian", + "@envoy//test/extensions/quic_listeners/quiche/platform:quiche_common_platform_test_impl_lib", + ], + ) +@@ -3904,8 +3922,8 @@ envoy_cc_library( + tags = ["nofips"], + visibility = ["//visibility:public"], + deps = [ ++ ":quiche_common_endian_lib", + ":quiche_common_platform", +- ":quiche_common_platform_endian", + ], + ) + +@@ -3944,6 +3962,7 @@ envoy_cc_test( + deps = [ + ":http2_platform", + ":http2_test_tools_random", ++ ":quiche_common_test_tools_test_utils_lib", + ], + ) + +diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl +index 6eba5a821..19ddc76e8 100644 +--- a/bazel/repository_locations.bzl ++++ b/bazel/repository_locations.bzl +@@ -671,9 +671,9 @@ DEPENDENCY_REPOSITORIES_SPEC = dict( + project_name = "QUICHE", + project_desc = "QUICHE (QUIC, HTTP/2, Etc) is Google‘s implementation of QUIC and related protocols", + project_url = "https://quiche.googlesource.com/quiche", +- # Static snapshot of https://quiche.googlesource.com/quiche/+archive/f555d99a084cdd086a349548c70fb558ac5847cf.tar.gz +- version = "f555d99a084cdd086a349548c70fb558ac5847cf", +- sha256 = "1833f08e7b0f18b49d7498b029b7f3e6559a82113ec82a98a9e945553756e351", ++ # Static snapshot of https://quiche.googlesource.com/quiche/+archive/ecc28c0d7428f3323ea26eb1ddb98a5e06b23dea.tar.gz ++ version = "ecc28c0d7428f3323ea26eb1ddb98a5e06b23dea", ++ sha256 = "52680dea984dbe899c27176155578b97276e1f1516b7c3a63fb16ba593061859", + urls = ["https://storage.googleapis.com/quiche-envoy-integration/{version}.tar.gz"], + use_category = ["dataplane_ext"], + extensions = ["envoy.transport_sockets.quic"], +diff --git a/source/extensions/quic_listeners/quiche/BUILD b/source/extensions/quic_listeners/quiche/BUILD +index 29eb78d15..a90cfde6d 100644 +--- a/source/extensions/quic_listeners/quiche/BUILD ++++ b/source/extensions/quic_listeners/quiche/BUILD +@@ -212,6 +212,7 @@ envoy_cc_library( + "//source/common/buffer:buffer_lib", + "//source/common/common:assert_lib", + "//source/common/http:header_map_lib", ++ "//source/common/http:header_utility_lib", + "//source/extensions/quic_listeners/quiche/platform:quic_platform_mem_slice_storage_impl_lib", + "@com_googlesource_quiche//:quic_core_http_client_lib", + ], +diff --git a/source/extensions/quic_listeners/quiche/active_quic_listener.cc b/source/extensions/quic_listeners/quiche/active_quic_listener.cc +index f4808adc5..86912292a 100644 +--- a/source/extensions/quic_listeners/quiche/active_quic_listener.cc ++++ b/source/extensions/quic_listeners/quiche/active_quic_listener.cc +@@ -55,7 +55,7 @@ ActiveQuicListener::ActiveQuicListener( + quic::QuicRandom* const random = quic::QuicRandom::GetInstance(); + random->RandBytes(random_seed_, sizeof(random_seed_)); + crypto_config_ = std::make_unique<quic::QuicCryptoServerConfig>( +- quiche::QuicheStringPiece(reinterpret_cast<char*>(random_seed_), sizeof(random_seed_)), ++ absl::string_view(reinterpret_cast<char*>(random_seed_), sizeof(random_seed_)), + quic::QuicRandom::GetInstance(), + std::make_unique<EnvoyQuicProofSource>(listen_socket_, listener_config.filterChainManager(), + stats_), +diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_client_connection.cc b/source/extensions/quic_listeners/quiche/envoy_quic_client_connection.cc +index e79b08ad9..95d63729d 100644 +--- a/source/extensions/quic_listeners/quiche/envoy_quic_client_connection.cc ++++ b/source/extensions/quic_listeners/quiche/envoy_quic_client_connection.cc +@@ -43,7 +43,7 @@ EnvoyQuicClientConnection::EnvoyQuicClientConnection( + const quic::ParsedQuicVersionVector& supported_versions, Event::Dispatcher& dispatcher, + Network::ConnectionSocketPtr&& connection_socket) + : EnvoyQuicConnection( +- server_connection_id, ++ server_connection_id, quic::QuicSocketAddress(), + envoyIpAddressToQuicSocketAddress(connection_socket->remoteAddress()->ip()), helper, + alarm_factory, writer, owns_writer, quic::Perspective::IS_CLIENT, supported_versions, + std::move(connection_socket)), +diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_client_stream.cc b/source/extensions/quic_listeners/quiche/envoy_quic_client_stream.cc +index 866e35416..a759b26b1 100644 +--- a/source/extensions/quic_listeners/quiche/envoy_quic_client_stream.cc ++++ b/source/extensions/quic_listeners/quiche/envoy_quic_client_stream.cc +@@ -20,6 +20,7 @@ + + #include "common/buffer/buffer_impl.h" + #include "common/http/header_map_impl.h" ++#include "common/http/header_utility.h" + #include "common/common/assert.h" + + namespace Envoy { +diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_connection.cc b/source/extensions/quic_listeners/quiche/envoy_quic_connection.cc +index dcc311a6e..d813dfe4b 100644 +--- a/source/extensions/quic_listeners/quiche/envoy_quic_connection.cc ++++ b/source/extensions/quic_listeners/quiche/envoy_quic_connection.cc +@@ -6,6 +6,7 @@ namespace Envoy { + namespace Quic { + + EnvoyQuicConnection::EnvoyQuicConnection(const quic::QuicConnectionId& server_connection_id, ++ quic::QuicSocketAddress initial_self_address, + quic::QuicSocketAddress initial_peer_address, + quic::QuicConnectionHelperInterface& helper, + quic::QuicAlarmFactory& alarm_factory, +@@ -13,8 +14,9 @@ EnvoyQuicConnection::EnvoyQuicConnection(const quic::QuicConnectionId& server_co + quic::Perspective perspective, + const quic::ParsedQuicVersionVector& supported_versions, + Network::ConnectionSocketPtr&& connection_socket) +- : quic::QuicConnection(server_connection_id, initial_peer_address, &helper, &alarm_factory, +- writer, owns_writer, perspective, supported_versions), ++ : quic::QuicConnection(server_connection_id, initial_self_address, initial_peer_address, ++ &helper, &alarm_factory, writer, owns_writer, perspective, ++ supported_versions), + connection_socket_(std::move(connection_socket)) {} + + EnvoyQuicConnection::~EnvoyQuicConnection() { connection_socket_->close(); } +diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_connection.h b/source/extensions/quic_listeners/quiche/envoy_quic_connection.h +index f4c8589d7..f8543bc93 100644 +--- a/source/extensions/quic_listeners/quiche/envoy_quic_connection.h ++++ b/source/extensions/quic_listeners/quiche/envoy_quic_connection.h +@@ -26,6 +26,7 @@ class EnvoyQuicConnection : public quic::QuicConnection, + protected Logger::Loggable<Logger::Id::connection> { + public: + EnvoyQuicConnection(const quic::QuicConnectionId& server_connection_id, ++ quic::QuicSocketAddress initial_self_address, + quic::QuicSocketAddress initial_peer_address, + quic::QuicConnectionHelperInterface& helper, + quic::QuicAlarmFactory& alarm_factory, quic::QuicPacketWriter* writer, +diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_dispatcher.cc b/source/extensions/quic_listeners/quiche/envoy_quic_dispatcher.cc +index ba8f7f3a8..e6351f643 100644 +--- a/source/extensions/quic_listeners/quiche/envoy_quic_dispatcher.cc ++++ b/source/extensions/quic_listeners/quiche/envoy_quic_dispatcher.cc +@@ -48,11 +48,11 @@ void EnvoyQuicDispatcher::OnConnectionClosed(quic::QuicConnectionId connection_i + } + + std::unique_ptr<quic::QuicSession> EnvoyQuicDispatcher::CreateQuicSession( +- quic::QuicConnectionId server_connection_id, const quic::QuicSocketAddress& /*self_address*/, +- const quic::QuicSocketAddress& peer_address, quiche::QuicheStringPiece /*alpn*/, ++ quic::QuicConnectionId server_connection_id, const quic::QuicSocketAddress& self_address, ++ const quic::QuicSocketAddress& peer_address, absl::string_view /*alpn*/, + const quic::ParsedQuicVersion& version) { + auto quic_connection = std::make_unique<EnvoyQuicServerConnection>( +- server_connection_id, peer_address, *helper(), *alarm_factory(), writer(), ++ server_connection_id, self_address, peer_address, *helper(), *alarm_factory(), writer(), + /*owns_writer=*/false, quic::ParsedQuicVersionVector{version}, listen_socket_); + auto quic_session = std::make_unique<EnvoyQuicServerSession>( + config(), quic::ParsedQuicVersionVector{version}, std::move(quic_connection), this, +diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_dispatcher.h b/source/extensions/quic_listeners/quiche/envoy_quic_dispatcher.h +index 589ff5327..d59307f41 100644 +--- a/source/extensions/quic_listeners/quiche/envoy_quic_dispatcher.h ++++ b/source/extensions/quic_listeners/quiche/envoy_quic_dispatcher.h +@@ -62,7 +62,7 @@ protected: + std::unique_ptr<quic::QuicSession> + CreateQuicSession(quic::QuicConnectionId server_connection_id, + const quic::QuicSocketAddress& self_address, +- const quic::QuicSocketAddress& peer_address, quiche::QuicheStringPiece alpn, ++ const quic::QuicSocketAddress& peer_address, absl::string_view alpn, + const quic::ParsedQuicVersion& version) override; + + private: +diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_proof_source.cc b/source/extensions/quic_listeners/quiche/envoy_quic_proof_source.cc +index 1f65e4e7e..967765829 100644 +--- a/source/extensions/quic_listeners/quiche/envoy_quic_proof_source.cc ++++ b/source/extensions/quic_listeners/quiche/envoy_quic_proof_source.cc +@@ -36,7 +36,7 @@ EnvoyQuicProofSource::GetCertChain(const quic::QuicSocketAddress& server_address + + void EnvoyQuicProofSource::signPayload( + const quic::QuicSocketAddress& server_address, const quic::QuicSocketAddress& client_address, +- const std::string& hostname, uint16_t signature_algorithm, quiche::QuicheStringPiece in, ++ const std::string& hostname, uint16_t signature_algorithm, absl::string_view in, + std::unique_ptr<quic::ProofSource::SignatureCallback> callback) { + CertConfigWithFilterChain res = + getTlsCertConfigAndFilterChain(server_address, client_address, hostname); +diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_proof_source.h b/source/extensions/quic_listeners/quiche/envoy_quic_proof_source.h +index 6e1c74c92..e22bf3465 100644 +--- a/source/extensions/quic_listeners/quiche/envoy_quic_proof_source.h ++++ b/source/extensions/quic_listeners/quiche/envoy_quic_proof_source.h +@@ -28,7 +28,7 @@ protected: + // quic::ProofSource + void signPayload(const quic::QuicSocketAddress& server_address, + const quic::QuicSocketAddress& client_address, const std::string& hostname, +- uint16_t signature_algorithm, quiche::QuicheStringPiece in, ++ uint16_t signature_algorithm, absl::string_view in, + std::unique_ptr<quic::ProofSource::SignatureCallback> callback) override; + + private: +diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_proof_source_base.cc b/source/extensions/quic_listeners/quiche/envoy_quic_proof_source_base.cc +index 2c82c04d9..9ad3cb07f 100644 +--- a/source/extensions/quic_listeners/quiche/envoy_quic_proof_source_base.cc ++++ b/source/extensions/quic_listeners/quiche/envoy_quic_proof_source_base.cc +@@ -21,7 +21,7 @@ void EnvoyQuicProofSourceBase::GetProof(const quic::QuicSocketAddress& server_ad + const std::string& hostname, + const std::string& server_config, + quic::QuicTransportVersion /*transport_version*/, +- quiche::QuicheStringPiece chlo_hash, ++ absl::string_view chlo_hash, + std::unique_ptr<quic::ProofSource::Callback> callback) { + quic::QuicReferenceCountedPointer<quic::ProofSource::Chain> chain = + GetCertChain(server_address, client_address, hostname); +@@ -68,13 +68,12 @@ void EnvoyQuicProofSourceBase::GetProof(const quic::QuicSocketAddress& server_ad + auto signature_callback = std::make_unique<SignatureCallback>(std::move(callback), chain); + + signPayload(server_address, client_address, hostname, sign_alg, +- quiche::QuicheStringPiece(payload.get(), payload_size), +- std::move(signature_callback)); ++ absl::string_view(payload.get(), payload_size), std::move(signature_callback)); + } + + void EnvoyQuicProofSourceBase::ComputeTlsSignature( + const quic::QuicSocketAddress& server_address, const quic::QuicSocketAddress& client_address, +- const std::string& hostname, uint16_t signature_algorithm, quiche::QuicheStringPiece in, ++ const std::string& hostname, uint16_t signature_algorithm, absl::string_view in, + std::unique_ptr<quic::ProofSource::SignatureCallback> callback) { + signPayload(server_address, client_address, hostname, signature_algorithm, in, + std::move(callback)); +diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_proof_source_base.h b/source/extensions/quic_listeners/quiche/envoy_quic_proof_source_base.h +index b7d76981e..a9e7e8c3f 100644 +--- a/source/extensions/quic_listeners/quiche/envoy_quic_proof_source_base.h ++++ b/source/extensions/quic_listeners/quiche/envoy_quic_proof_source_base.h +@@ -57,7 +57,7 @@ public: + void GetProof(const quic::QuicSocketAddress& server_address, + const quic::QuicSocketAddress& client_address, const std::string& hostname, + const std::string& server_config, quic::QuicTransportVersion /*transport_version*/, +- quiche::QuicheStringPiece chlo_hash, ++ absl::string_view chlo_hash, + std::unique_ptr<quic::ProofSource::Callback> callback) override; + + TicketCrypter* GetTicketCrypter() override { return nullptr; } +@@ -65,14 +65,14 @@ public: + void ComputeTlsSignature(const quic::QuicSocketAddress& server_address, + const quic::QuicSocketAddress& client_address, + const std::string& hostname, uint16_t signature_algorithm, +- quiche::QuicheStringPiece in, ++ absl::string_view in, + std::unique_ptr<quic::ProofSource::SignatureCallback> callback) override; + + protected: + virtual void signPayload(const quic::QuicSocketAddress& server_address, + const quic::QuicSocketAddress& client_address, + const std::string& hostname, uint16_t signature_algorithm, +- quiche::QuicheStringPiece in, ++ absl::string_view in, + std::unique_ptr<quic::ProofSource::SignatureCallback> callback) PURE; + + private: +diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_proof_verifier_base.cc b/source/extensions/quic_listeners/quiche/envoy_quic_proof_verifier_base.cc +index 229b3ab36..e37590529 100644 +--- a/source/extensions/quic_listeners/quiche/envoy_quic_proof_verifier_base.cc ++++ b/source/extensions/quic_listeners/quiche/envoy_quic_proof_verifier_base.cc +@@ -58,8 +58,8 @@ bool EnvoyQuicProofVerifierBase::verifySignature(const std::string& server_confi + *error_details = "QuicPacketWriter error."; + return false; + } +- bool valid = cert_view->VerifySignature(quiche::QuicheStringPiece(payload.get(), payload_size), +- signature, sign_alg); ++ bool valid = cert_view->VerifySignature(absl::string_view(payload.get(), payload_size), signature, ++ sign_alg); + if (!valid) { + *error_details = "Signature is not valid."; + } +diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_server_connection.cc b/source/extensions/quic_listeners/quiche/envoy_quic_server_connection.cc +index b8fa94221..974c6c8eb 100644 +--- a/source/extensions/quic_listeners/quiche/envoy_quic_server_connection.cc ++++ b/source/extensions/quic_listeners/quiche/envoy_quic_server_connection.cc +@@ -11,11 +11,13 @@ namespace Quic { + + EnvoyQuicServerConnection::EnvoyQuicServerConnection( + const quic::QuicConnectionId& server_connection_id, +- quic::QuicSocketAddress initial_peer_address, quic::QuicConnectionHelperInterface& helper, +- quic::QuicAlarmFactory& alarm_factory, quic::QuicPacketWriter* writer, bool owns_writer, ++ quic::QuicSocketAddress initial_self_address, quic::QuicSocketAddress initial_peer_address, ++ quic::QuicConnectionHelperInterface& helper, quic::QuicAlarmFactory& alarm_factory, ++ quic::QuicPacketWriter* writer, bool owns_writer, + const quic::ParsedQuicVersionVector& supported_versions, Network::Socket& listen_socket) +- : EnvoyQuicConnection(server_connection_id, initial_peer_address, helper, alarm_factory, writer, +- owns_writer, quic::Perspective::IS_SERVER, supported_versions, ++ : EnvoyQuicConnection(server_connection_id, initial_self_address, initial_peer_address, helper, ++ alarm_factory, writer, owns_writer, quic::Perspective::IS_SERVER, ++ supported_versions, + std::make_unique<Network::ConnectionSocketImpl>( + // Wraps the real IoHandle instance so that if the connection socket + // gets closed, the real IoHandle won't be affected. +diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_server_connection.h b/source/extensions/quic_listeners/quiche/envoy_quic_server_connection.h +index 7b7fac05e..7625fad02 100644 +--- a/source/extensions/quic_listeners/quiche/envoy_quic_server_connection.h ++++ b/source/extensions/quic_listeners/quiche/envoy_quic_server_connection.h +@@ -10,6 +10,7 @@ namespace Quic { + class EnvoyQuicServerConnection : public EnvoyQuicConnection { + public: + EnvoyQuicServerConnection(const quic::QuicConnectionId& server_connection_id, ++ quic::QuicSocketAddress initial_self_address, + quic::QuicSocketAddress initial_peer_address, + quic::QuicConnectionHelperInterface& helper, + quic::QuicAlarmFactory& alarm_factory, quic::QuicPacketWriter* writer, +diff --git a/source/extensions/quic_listeners/quiche/platform/BUILD b/source/extensions/quic_listeners/quiche/platform/BUILD +index f53e07b58..839664d52 100644 +--- a/source/extensions/quic_listeners/quiche/platform/BUILD ++++ b/source/extensions/quic_listeners/quiche/platform/BUILD +@@ -36,15 +36,16 @@ envoy_extension_package() + envoy_cc_library( + name = "flags_impl_lib", + srcs = ["flags_impl.cc"], +- hdrs = [ +- "flags_impl.h", +- "flags_list.h", +- ], ++ hdrs = ["flags_impl.h"], + external_deps = [ + "abseil_base", + "abseil_synchronization", + ], + visibility = ["//visibility:public"], ++ deps = [ ++ "@com_googlesource_quiche//:quic_core_flags_list_lib", ++ "@com_googlesource_quiche//:quic_core_protocol_flags_list_lib", ++ ], + ) + + envoy_cc_library( +@@ -62,7 +63,6 @@ envoy_cc_library( + envoy_cc_library( + name = "http2_platform_impl_lib", + hdrs = [ +- "http2_arraysize_impl.h", + "http2_bug_tracker_impl.h", + "http2_containers_impl.h", + "http2_estimate_memory_usage_impl.h", +@@ -74,7 +74,6 @@ envoy_cc_library( + ], + external_deps = [ + "abseil_base", +- "abseil_optional", + "abseil_str_format", + ], + visibility = ["//visibility:public"], +@@ -114,16 +113,13 @@ envoy_cc_library( + "quic_mem_slice_impl.cc", + ], + hdrs = [ +- "quic_aligned_impl.h", + "quic_client_stats_impl.h", + "quic_containers_impl.h", + "quic_error_code_wrappers_impl.h", + "quic_estimate_memory_usage_impl.h", +- "quic_fallthrough_impl.h", + "quic_flag_utils_impl.h", + "quic_flags_impl.h", + "quic_iovec_impl.h", +- "quic_macros_impl.h", + "quic_map_util_impl.h", + "quic_mem_slice_impl.h", + "quic_prefetch_impl.h", +@@ -132,6 +128,7 @@ envoy_cc_library( + "quic_server_stats_impl.h", + "quic_stack_trace_impl.h", + "quic_stream_buffer_allocator_impl.h", ++ "quic_testvalue_impl.h", + "quic_uint128_impl.h", + ], + external_deps = [ +@@ -141,7 +138,6 @@ envoy_cc_library( + "abseil_memory", + "abseil_node_hash_map", + "abseil_node_hash_set", +- "abseil_optional", + ], + tags = ["nofips"], + visibility = ["//visibility:public"], +@@ -236,6 +232,7 @@ envoy_cc_library( + }), + repository = "@envoy", + tags = ["nofips"], ++ visibility = ["//visibility:public"], + ) + + envoy_cc_library( +@@ -250,23 +247,12 @@ envoy_cc_library( + ], + ) + +-envoy_cc_library( +- name = "quiche_common_platform_optional_impl_lib", +- hdrs = ["quiche_optional_impl.h"], +- external_deps = [ +- "abseil_node_hash_map", +- ], +- visibility = ["//visibility:public"], +-) +- + envoy_cc_library( + name = "quiche_common_platform_impl_lib", + srcs = ["quiche_time_utils_impl.cc"], + hdrs = [ +- "quiche_arraysize_impl.h", + "quiche_logging_impl.h", + "quiche_map_util_impl.h", +- "quiche_ptr_util_impl.h", + "quiche_str_cat_impl.h", + "quiche_string_piece_impl.h", + "quiche_text_utils_impl.h", +@@ -281,17 +267,14 @@ envoy_cc_library( + deps = [ + ":quic_platform_logging_impl_lib", + ":string_utils_lib", +- "@com_googlesource_quiche//:quiche_common_platform_optional", + ], + ) + + envoy_cc_library( + name = "spdy_platform_impl_lib", + hdrs = [ +- "spdy_arraysize_impl.h", + "spdy_bug_tracker_impl.h", + "spdy_containers_impl.h", +- "spdy_endianness_util_impl.h", + "spdy_estimate_memory_usage_impl.h", + "spdy_flags_impl.h", + "spdy_logging_impl.h", +@@ -331,14 +314,3 @@ envoy_cc_library( + tags = ["nofips"], + visibility = ["//visibility:public"], + ) +- +-envoy_cc_library( +- name = "quiche_common_platform_endian_impl_lib", +- hdrs = ["quiche_endian_impl.h"], +- tags = ["nofips"], +- visibility = ["//visibility:public"], +- deps = [ +- "quiche_common_platform_export_impl_lib", +- "//source/common/common:byte_order_lib", +- ], +-) +diff --git a/source/extensions/quic_listeners/quiche/platform/flags_impl.cc b/source/extensions/quic_listeners/quiche/platform/flags_impl.cc +index 70fb182d6..9d4ea89ce 100644 +--- a/source/extensions/quic_listeners/quiche/platform/flags_impl.cc ++++ b/source/extensions/quic_listeners/quiche/platform/flags_impl.cc +@@ -15,12 +15,24 @@ namespace quiche { + + namespace { + +-absl::flat_hash_map<std::string, Flag*> MakeFlagMap() { ++absl::flat_hash_map<std::string, Flag*> makeFlagMap() { + absl::flat_hash_map<std::string, Flag*> flags; + +-#define QUICHE_FLAG(type, flag, value, help) flags.emplace(FLAGS_##flag->name(), FLAGS_##flag); +-#include "extensions/quic_listeners/quiche/platform/flags_list.h" +-#undef QUICHE_FLAG ++#define QUIC_FLAG(flag, ...) flags.emplace(flag->name(), flag); ++#include "quiche/quic/core/quic_flags_list.h" ++ QUIC_FLAG(FLAGS_quic_reloadable_flag_spdy_testonly_default_false, false) ++ QUIC_FLAG(FLAGS_quic_reloadable_flag_spdy_testonly_default_true, true) ++ QUIC_FLAG(FLAGS_quic_restart_flag_spdy_testonly_default_false, false) ++ QUIC_FLAG(FLAGS_quic_restart_flag_spdy_testonly_default_true, true) ++ QUIC_FLAG(FLAGS_quic_reloadable_flag_http2_testonly_default_false, false) ++ QUIC_FLAG(FLAGS_quic_reloadable_flag_http2_testonly_default_true, true) ++ QUIC_FLAG(FLAGS_quic_restart_flag_http2_testonly_default_false, false) ++ QUIC_FLAG(FLAGS_quic_restart_flag_http2_testonly_default_true, true) ++#undef QUIC_FLAG ++ ++#define QUIC_PROTOCOL_FLAG(type, flag, ...) flags.emplace(FLAGS_##flag->name(), FLAGS_##flag); ++#include "quiche/quic/core/quic_protocol_flags_list.h" ++#undef QUIC_PROTOCOL_FLAG + + return flags; + } +@@ -28,75 +40,123 @@ absl::flat_hash_map<std::string, Flag*> MakeFlagMap() { + } // namespace + + // static +-FlagRegistry& FlagRegistry::GetInstance() { ++FlagRegistry& FlagRegistry::getInstance() { + static auto* instance = new FlagRegistry(); + return *instance; + } + +-FlagRegistry::FlagRegistry() : flags_(MakeFlagMap()) {} ++FlagRegistry::FlagRegistry() : flags_(makeFlagMap()) {} + +-void FlagRegistry::ResetFlags() const { ++void FlagRegistry::resetFlags() const { + for (auto& kv : flags_) { +- kv.second->ResetValue(); ++ kv.second->resetValue(); + } + } + +-Flag* FlagRegistry::FindFlag(const std::string& name) const { ++Flag* FlagRegistry::findFlag(const std::string& name) const { + auto it = flags_.find(name); + return (it != flags_.end()) ? it->second : nullptr; + } + +-template <> bool TypedFlag<bool>::SetValueFromString(const std::string& value_str) { ++template <> bool TypedFlag<bool>::setValueFromString(const std::string& value_str) { + static const auto* kTrueValues = new std::set<std::string>({"1", "t", "true", "y", "yes"}); + static const auto* kFalseValues = new std::set<std::string>({"0", "f", "false", "n", "no"}); + auto lower = absl::AsciiStrToLower(value_str); + if (kTrueValues->find(lower) != kTrueValues->end()) { +- SetValue(true); ++ setValue(true); + return true; + } + if (kFalseValues->find(lower) != kFalseValues->end()) { +- SetValue(false); ++ setValue(false); + return true; + } + return false; + } + +-template <> bool TypedFlag<int32_t>::SetValueFromString(const std::string& value_str) { ++template <> bool TypedFlag<int32_t>::setValueFromString(const std::string& value_str) { + int32_t value; + if (absl::SimpleAtoi(value_str, &value)) { +- SetValue(value); ++ setValue(value); + return true; + } + return false; + } + +-template <> bool TypedFlag<int64_t>::SetValueFromString(const std::string& value_str) { ++template <> bool TypedFlag<int64_t>::setValueFromString(const std::string& value_str) { + int64_t value; + if (absl::SimpleAtoi(value_str, &value)) { +- SetValue(value); ++ setValue(value); + return true; + } + return false; + } + +-template <> bool TypedFlag<double>::SetValueFromString(const std::string& value_str) { ++template <> bool TypedFlag<double>::setValueFromString(const std::string& value_str) { + double value; + if (absl::SimpleAtod(value_str, &value)) { +- SetValue(value); ++ setValue(value); + return true; + } + return false; + } + +-template <> bool TypedFlag<std::string>::SetValueFromString(const std::string& value_str) { +- SetValue(value_str); ++template <> bool TypedFlag<std::string>::setValueFromString(const std::string& value_str) { ++ setValue(value_str); + return true; + } + ++template <> bool TypedFlag<unsigned long>::setValueFromString(const std::string& value_str) { ++ unsigned long value; ++ if (absl::SimpleAtoi(value_str, &value)) { ++ setValue(value); ++ return true; ++ } ++ return false; ++} ++ ++template <> bool TypedFlag<unsigned long long>::setValueFromString(const std::string& value_str) { ++ unsigned long long value; ++ if (absl::SimpleAtoi(value_str, &value)) { ++ setValue(value); ++ return true; ++ } ++ return false; ++} ++ + // Flag definitions +-#define QUICHE_FLAG(type, flag, value, help) \ +- TypedFlag<type>* FLAGS_##flag = new TypedFlag<type>(#flag, value, help); +-#include "extensions/quic_listeners/quiche/platform/flags_list.h" +-#undef QUICHE_FLAG ++#define QUIC_FLAG(flag, value) TypedFlag<bool>* flag = new TypedFlag<bool>(#flag, value, ""); ++#include "quiche/quic/core/quic_flags_list.h" ++QUIC_FLAG(FLAGS_quic_reloadable_flag_spdy_testonly_default_false, false) ++QUIC_FLAG(FLAGS_quic_reloadable_flag_spdy_testonly_default_true, true) ++QUIC_FLAG(FLAGS_quic_restart_flag_spdy_testonly_default_false, false) ++QUIC_FLAG(FLAGS_quic_restart_flag_spdy_testonly_default_true, true) ++QUIC_FLAG(FLAGS_quic_reloadable_flag_http2_testonly_default_false, false) ++QUIC_FLAG(FLAGS_quic_reloadable_flag_http2_testonly_default_true, true) ++QUIC_FLAG(FLAGS_quic_restart_flag_http2_testonly_default_false, false) ++QUIC_FLAG(FLAGS_quic_restart_flag_http2_testonly_default_true, true) ++ ++#undef QUIC_FLAG ++ ++#define STRINGIFY(X) #X ++ ++#define DEFINE_QUIC_PROTOCOL_FLAG_IMPL(type, flag, value, help) \ ++ TypedFlag<type>* FLAGS_##flag = new TypedFlag<type>(STRINGIFY(FLAGS_##flag), value, help); ++ ++#define DEFINE_QUIC_PROTOCOL_FLAG_SINGLE_VALUE(type, flag, value, doc) \ ++ DEFINE_QUIC_PROTOCOL_FLAG_IMPL(type, flag, value, doc) ++ ++#define DEFINE_QUIC_PROTOCOL_FLAG_TWO_VALUES(type, flag, internal_value, external_value, doc) \ ++ DEFINE_QUIC_PROTOCOL_FLAG_IMPL(type, flag, external_value, doc) ++ ++// Select the right macro based on the number of arguments. ++#define GET_6TH_ARG(arg1, arg2, arg3, arg4, arg5, arg6, ...) arg6 ++ ++#define QUIC_PROTOCOL_FLAG_MACRO_CHOOSER(...) \ ++ GET_6TH_ARG(__VA_ARGS__, DEFINE_QUIC_PROTOCOL_FLAG_TWO_VALUES, \ ++ DEFINE_QUIC_PROTOCOL_FLAG_SINGLE_VALUE) ++ ++#define QUIC_PROTOCOL_FLAG(...) QUIC_PROTOCOL_FLAG_MACRO_CHOOSER(__VA_ARGS__)(__VA_ARGS__) ++#include "quiche/quic/core/quic_protocol_flags_list.h" ++#undef QUIC_PROTOCOL_FLAG + + } // namespace quiche +diff --git a/source/extensions/quic_listeners/quiche/platform/flags_impl.h b/source/extensions/quic_listeners/quiche/platform/flags_impl.h +index 5db939925..83ed8430c 100644 +--- a/source/extensions/quic_listeners/quiche/platform/flags_impl.h ++++ b/source/extensions/quic_listeners/quiche/platform/flags_impl.h +@@ -26,13 +26,13 @@ public: + ~FlagRegistry() = default; + + // Return singleton instance. +- static FlagRegistry& GetInstance(); ++ static FlagRegistry& getInstance(); + + // Reset all registered flags to their default values. +- void ResetFlags() const; ++ void resetFlags() const; + + // Look up a flag by name. +- Flag* FindFlag(const std::string& name) const; ++ Flag* findFlag(const std::string& name) const; + + private: + FlagRegistry(); +@@ -48,10 +48,10 @@ public: + virtual ~Flag() = default; + + // Set flag value from given string, returning true iff successful. +- virtual bool SetValueFromString(const std::string& value_str) = 0; ++ virtual bool setValueFromString(const std::string& value_str) = 0; + + // Reset flag to default value. +- virtual void ResetValue() = 0; ++ virtual void resetValue() = 0; + + // Return flag name. + std::string name() const { return name_; } +@@ -70,15 +70,15 @@ public: + TypedFlag(const char* name, T default_value, const char* help) + : Flag(name, help), value_(default_value), default_value_(default_value) {} + +- bool SetValueFromString(const std::string& value_str) override; ++ bool setValueFromString(const std::string& value_str) override; + +- void ResetValue() override { ++ void resetValue() override { + absl::MutexLock lock(&mutex_); + value_ = default_value_; + } + + // Set flag value. +- void SetValue(T value) { ++ void setValue(T value) { + absl::MutexLock lock(&mutex_); + value_ = value; + } +@@ -96,15 +96,29 @@ private: + }; + + // SetValueFromString specializations +-template <> bool TypedFlag<bool>::SetValueFromString(const std::string& value_str); +-template <> bool TypedFlag<int32_t>::SetValueFromString(const std::string& value_str); +-template <> bool TypedFlag<int64_t>::SetValueFromString(const std::string& value_str); +-template <> bool TypedFlag<double>::SetValueFromString(const std::string& value_str); +-template <> bool TypedFlag<std::string>::SetValueFromString(const std::string& value_str); ++template <> bool TypedFlag<bool>::setValueFromString(const std::string& value_str); ++template <> bool TypedFlag<int32_t>::setValueFromString(const std::string& value_str); ++template <> bool TypedFlag<int64_t>::setValueFromString(const std::string& value_str); ++template <> bool TypedFlag<double>::setValueFromString(const std::string& value_str); ++template <> bool TypedFlag<std::string>::setValueFromString(const std::string& value_str); ++template <> bool TypedFlag<unsigned long>::setValueFromString(const std::string& value_str); ++template <> bool TypedFlag<unsigned long long>::setValueFromString(const std::string& value_str); + + // Flag declarations +-#define QUICHE_FLAG(type, flag, value, help) extern TypedFlag<type>* FLAGS_##flag; +-#include "extensions/quic_listeners/quiche/platform/flags_list.h" +-#undef QUICHE_FLAG ++#define QUIC_FLAG(flag, ...) extern TypedFlag<bool>* flag; ++#include "quiche/quic/core/quic_flags_list.h" ++QUIC_FLAG(FLAGS_quic_reloadable_flag_spdy_testonly_default_false, false) ++QUIC_FLAG(FLAGS_quic_reloadable_flag_spdy_testonly_default_true, true) ++QUIC_FLAG(FLAGS_quic_restart_flag_spdy_testonly_default_false, false) ++QUIC_FLAG(FLAGS_quic_restart_flag_spdy_testonly_default_true, true) ++QUIC_FLAG(FLAGS_quic_reloadable_flag_http2_testonly_default_false, false) ++QUIC_FLAG(FLAGS_quic_reloadable_flag_http2_testonly_default_true, true) ++QUIC_FLAG(FLAGS_quic_restart_flag_http2_testonly_default_false, false) ++QUIC_FLAG(FLAGS_quic_restart_flag_http2_testonly_default_true, true) ++#undef QUIC_FLAG ++ ++#define QUIC_PROTOCOL_FLAG(type, flag, ...) extern TypedFlag<type>* FLAGS_##flag; ++#include "quiche/quic/core/quic_protocol_flags_list.h" ++#undef QUIC_PROTOCOL_FLAG + + } // namespace quiche +diff --git a/source/extensions/quic_listeners/quiche/platform/flags_list.h b/source/extensions/quic_listeners/quiche/platform/flags_list.h +deleted file mode 100644 +index 7e9e20a7c..000000000 +--- a/source/extensions/quic_listeners/quiche/platform/flags_list.h ++++ /dev/null +@@ -1,502 +0,0 @@ +-// This file intentionally does not have header guards. It is intended to be +-// included multiple times, each time with a different definition of +-// QUICHE_FLAG. +- +-// NOLINT(namespace-envoy) +- +-// This file is part of the QUICHE platform implementation, and is not to be +-// consumed or referenced directly by other Envoy code. It serves purely as a +-// porting layer for QUICHE. +- +-// This file is generated by //third_party/quic/tools:quic_flags_list in +-// Google3. +- +-#if defined(QUICHE_FLAG) +- +-QUICHE_FLAG( +- bool, http2_reloadable_flag_http2_backend_alpn_failure_error_code, false, +- "If true, the GFE will return a new ResponseCodeDetails error when ALPN to the backend fails.") +- +-QUICHE_FLAG(bool, http2_reloadable_flag_http2_ip_based_cwnd_exp, true, +- "If true, enable IP address based CWND bootstrapping experiment with different " +- "bandwidth models and priorities in HTTP2.") +- +-QUICHE_FLAG( +- bool, http2_reloadable_flag_http2_load_based_goaway_warning, false, +- "If true, load-based connection closures will send a warning GOAWAY before the actual GOAWAY.") +- +-QUICHE_FLAG(bool, http2_reloadable_flag_http2_security_requirement_for_client3, false, +- "If true, check whether client meets security requirements during SSL handshake. If " +- "flag is true and client does not meet security requirements, do not negotiate HTTP/2 " +- "with client or terminate the session with SPDY_INADEQUATE_SECURITY if HTTP/2 is " +- "already negotiated. The spec contains both cipher and TLS version requirements.") +- +-QUICHE_FLAG(bool, http2_reloadable_flag_http2_websocket_detection, false, +- "If true, uses a HTTP/2-specific method of detecting websocket upgrade requests.") +- +-QUICHE_FLAG(bool, http2_reloadable_flag_permissive_http2_switch, false, +- "If true, the GFE allows both HTTP/1.0 and HTTP/1.1 versions in HTTP/2 upgrade " +- "requests/responses.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_advertise_quic_for_https_for_debugips, false, "") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_advertise_quic_for_https_for_external_users, false, "") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_gclb_quic_allow_alia, true, +- "If gfe2_reloadable_flag_gclb_use_alia is also true, use Alia for GCLB QUIC " +- "handshakes. To be used as a big red button if there's a problem with Alia/QUIC.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_abort_qpack_on_stream_close, false, +- "If true, abort async QPACK header decompression in QuicSpdyStream::OnClose().") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_ack_delay_alarm_granularity, false, +- "When true, ensure the ACK delay is never less than the alarm granularity when ACK " +- "decimation is enabled.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_add_missing_connected_checks, false, +- "If true, add missing connected checks.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_add_silent_idle_timeout, true, +- "If true, when server is silently closing connections due to idle timeout, serialize " +- "the connection close packets which will be added to time wait list.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_add_stream_info_to_idle_close_detail, false, +- "If true, include stream information in idle timeout connection close detail.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_allow_backend_set_stream_ttl, false, +- "If true, check backend response header for X-Response-Ttl. If it is provided, the " +- "stream TTL is set. A QUIC stream will be immediately canceled when tries to write " +- "data if this TTL expired.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_allow_client_enabled_bbr_v2, true, +- "If true, allow client to enable BBRv2 on server via connection option 'B2ON'.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_alpn_dispatch, false, +- "Support different QUIC sessions, as indicated by ALPN. Used for QBONE.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_bbr2_avoid_too_low_probe_bw_cwnd, false, +- "If true, QUIC BBRv2's PROBE_BW mode will not reduce cwnd below BDP+ack_height.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_bbr2_fewer_startup_round_trips, false, +- "When true, the 1RTT and 2RTT connection options decrease the number of round trips in " +- "BBRv2 STARTUP without a 25% bandwidth increase to 1 or 2 round trips respectively.") +- +-QUICHE_FLAG( +- bool, quic_reloadable_flag_quic_bbr2_limit_inflight_hi, false, +- "When true, the B2HI connection option limits reduction of inflight_hi to (1-Beta)*CWND.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_bbr2_use_post_inflight_to_detect_queuing, false, +- "If true, QUIC BBRv2 will use inflight byte after congestion event to detect queuing " +- "during PROBE_UP.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_bbr_no_bytes_acked_in_startup_recovery, false, +- "When in STARTUP and recovery, do not add bytes_acked to QUIC BBR's CWND in " +- "CalculateCongestionWindow()") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_bootstrap_cwnd_by_spdy_priority, true, +- "If true, bootstrap initial QUIC cwnd by SPDY priorities.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_cap_large_client_initial_rtt, true, +- "If true, cap client suggested initial RTT to 1s if it is longer than 1s.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_clean_up_spdy_session_destructor, false, +- "If true, QuicSpdySession's destructor won't need to do cleanup.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_close_connection_in_on_can_write_with_blocked_writer, +- false, +- "If true, close connection if writer is still blocked while OnCanWrite is called.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_close_connection_on_serialization_failure, false, +- "If true, close connection on packet serialization failures.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_conservative_bursts, false, +- "If true, set burst token to 2 in cwnd bootstrapping experiment.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_conservative_cwnd_and_pacing_gains, false, +- "If true, uses conservative cwnd gain and pacing gain when cwnd gets bootstrapped.") +- +-QUICHE_FLAG( +- bool, quic_reloadable_flag_quic_copy_bbr_cwnd_to_bbr2, false, +- "If true, when switching from BBR to BBRv2, BBRv2 will use BBR's cwnd as its initial cwnd.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_default_enable_5rto_blackhole_detection2, true, +- "If true, default-enable 5RTO blachole detection.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_default_on_pto, false, +- "If true, default on PTO which unifies TLP + RTO loss recovery.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_default_to_bbr, true, +- "When true, defaults to BBR congestion control instead of Cubic.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_default_to_bbr_v2, false, +- "If true, use BBRv2 as the default congestion controller. Takes precedence over " +- "--quic_default_to_bbr.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_disable_server_blackhole_detection, false, +- "If true, disable blackhole detection on server side.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_disable_version_draft_27, false, +- "If true, disable QUIC version h3-27.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_disable_version_draft_29, false, +- "If true, disable QUIC version h3-29.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_disable_version_q043, false, +- "If true, disable QUIC version Q043.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_disable_version_q046, false, +- "If true, disable QUIC version Q046.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_disable_version_q050, false, +- "If true, disable QUIC version Q050.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_disable_version_t050, false, +- "If true, disable QUIC version h3-T050.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_disable_version_t051, false, +- "If true, disable QUIC version h3-T051.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_discard_initial_packet_with_key_dropped, false, +- "If true, discard INITIAL packet if the key has been dropped.") +- +-QUICHE_FLAG( +- bool, quic_reloadable_flag_quic_do_not_accept_stop_waiting, false, +- "In v44 and above, where STOP_WAITING is never sent, close the connection if it's received.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_donot_reset_ideal_next_packet_send_time, false, +- "If true, stop resetting ideal_next_packet_send_time_ in pacing sender.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_enable_loss_detection_experiment_at_gfe, false, +- "If ture, enable GFE-picked loss detection experiment.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_enable_loss_detection_tuner, false, +- "If true, allow QUIC loss detection tuning to be enabled by connection option ELDT.") +- +-QUICHE_FLAG( +- bool, quic_reloadable_flag_quic_enable_mtu_discovery_at_server, false, +- "If true, QUIC will default enable MTU discovery at server, with a target of 1450 bytes.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_enabled, false, "") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_fix_arm_pto_for_application_data, false, +- "If true, do not arm PTO for application data until handshake confirmed.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_fix_bytes_left_for_batch_write, false, +- "If true, convert bytes_left_for_batch_write_ to unsigned int.") +- +-QUICHE_FLAG( +- bool, quic_reloadable_flag_quic_fix_http3_goaway_stream_id, false, +- "If true, send the lowest stream ID that can be retried by the client in a GOAWAY frame. If " +- "false, send the highest received stream ID, which actually should not be retried.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_fix_out_of_order_sending, false, +- "If true, fix a potential out of order sending caused by handshake gets confirmed " +- "while the coalescer is not empty.") +- +-QUICHE_FLAG( +- bool, quic_reloadable_flag_quic_fix_pto_pending_timer_count, false, +- "If true, make sure there is pending timer credit when trying to PTO retransmit any packets.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_fix_undecryptable_packets2, false, +- "If true, remove processed undecryptable packets.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_get_stream_information_from_stream_map, true, +- "If true, gQUIC will only consult stream_map in QuicSession::GetNumActiveStreams().") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_give_sent_packet_to_debug_visitor_after_sent, false, +- "If true, QUIC connection will pass sent packet information to the debug visitor after " +- "a packet is recorded as sent in sent packet manager.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_http3_new_default_urgency_value, false, +- "If true, QuicStream::kDefaultUrgency is 3, otherwise 1.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_ip_based_cwnd_exp, true, +- "If true, enable IP address based CWND bootstrapping experiment with different " +- "bandwidth models and priorities. ") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_listener_never_fake_epollout, false, +- "If true, QuicListener::OnSocketIsWritable will always return false, which means there " +- "will never be a fake EPOLLOUT event in the next epoll iteration.") +- +-QUICHE_FLAG(bool, +- quic_reloadable_flag_quic_neuter_initial_packet_in_coalescer_with_initial_key_discarded, +- false, "If true, neuter initial packet in the coalescer when discarding initial keys.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_no_dup_experiment_id_2, false, +- "If true, transport connection stats doesn't report duplicated experiments for same " +- "connection.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_no_silent_close_for_idle_timeout, true, +- "If true, always send connection close for idle timeout if NSLC is received.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_only_set_uaid_in_tcs_visitor, false, +- "If true, QuicTransportConnectionStatsVisitor::PopulateTransportConnectionStats will " +- "be the only place where TCS's uaid field is set.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_only_truncate_long_cids, true, +- "In IETF QUIC, only truncate long CIDs from the client's Initial, don't modify them.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_preferred_altsvc_version, false, +- "When true, we will send a preferred QUIC version at the start of our Alt-Svc list.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_proxy_write_packed_strings, false, +- "If true, QuicProxyDispatcher will write packed_client_address and packed_server_vip " +- "in TcpProxyHeaderProto.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_record_frontend_service_vip_mapping, true, +- "If true, for L1 GFE, as requests come in, record frontend service to VIP mapping " +- "which is used to announce VIP in SHLO for proxied sessions. ") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_record_received_min_ack_delay, false, +- "If true, record the received min_ack_delay in transport parameters to QUIC config.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_reject_all_traffic, false, "") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_remove_zombie_streams, true, +- "If true, QuicSession doesn't keep a separate zombie_streams. Instead, all streams are " +- "stored in stream_map_.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_require_handshake_confirmation, false, +- "If true, require handshake confirmation for QUIC connections, functionally disabling " +- "0-rtt handshakes.") +- +-QUICHE_FLAG( +- bool, quic_reloadable_flag_quic_send_key_update_not_yet_supported, false, +- "When true, QUIC+TLS versions will send the key_update_not_yet_supported transport parameter.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_send_path_response, false, +- "If true, send PATH_RESPONSE upon receiving PATH_CHALLENGE regardless of perspective. " +- "--gfe2_reloadable_flag_quic_start_peer_migration_earlier has to be true before turn " +- "on this flag.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_send_timestamps, false, +- "When the STMP connection option is sent by the client, timestamps in the QUIC ACK " +- "frame are sent and processed.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_server_push, false, +- "If true, enable server push feature on QUIC.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_set_resumed_ssl_session_early, false, +- "If true, set resumed_ssl_session if this is a 0-RTT connection.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_start_peer_migration_earlier, false, +- "If true, while reading an IETF quic packet, start peer migration immediately when " +- "detecting the existence of any non-probing frame instead of at the end of the packet.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_stop_sending_uses_ietf_error_code, false, +- "If true, use IETF QUIC application error codes in STOP_SENDING frames. If false, use " +- "QuicRstStreamErrorCodes.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_testonly_default_false, false, +- "A testonly reloadable flag that will always default to false.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_testonly_default_true, true, +- "A testonly reloadable flag that will always default to true.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_unified_iw_options, false, +- "When true, set the initial congestion control window from connection options in " +- "QuicSentPacketManager rather than TcpCubicSenderBytes.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_use_header_stage_idle_list2, false, +- "If true, use header stage idle list for QUIC connections in GFE.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_use_leto_key_exchange, false, +- "If true, QUIC will attempt to use the Leto key exchange service and only fall back to " +- "local key exchange if that fails.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_send_quic_fallback_server_config_on_leto_error, false, +- "If true and using Leto for QUIC shared-key calculations, GFE will react to a failure " +- "to contact Leto by sending a REJ containing a fallback ServerConfig, allowing the " +- "client to continue the handshake.") +- +-QUICHE_FLAG( +- bool, quic_restart_flag_dont_fetch_quic_private_keys_from_leto, false, +- "If true, GFE will not request private keys when fetching QUIC ServerConfigs from Leto.") +- +-QUICHE_FLAG(bool, quic_restart_flag_quic_adjust_initial_cwnd_by_gws, true, +- "If true, GFE informs backend that a client request is the first one on the connection " +- "via frontline header \"first_request=1\". Also, adjust initial cwnd based on " +- "X-Google-Gws-Initial-Cwnd-Mode sent by GWS.") +- +-QUICHE_FLAG( +- bool, quic_restart_flag_quic_allow_loas_multipacket_chlo, false, +- "If true, inspects QUIC CHLOs for kLOAS and early creates sessions to allow multi-packet CHLOs") +- +-QUICHE_FLAG( +- bool, quic_restart_flag_quic_disable_gws_cwnd_experiment, false, +- "If true, X-Google-Gws-Initial-Cwnd-Mode related header sent by GWS becomes no-op for QUIC.") +- +-QUICHE_FLAG(bool, quic_restart_flag_quic_enable_tls_resumption_v4, true, +- "If true, enables support for TLS resumption in QUIC.") +- +-QUICHE_FLAG(bool, quic_restart_flag_quic_enable_zero_rtt_for_tls_v2, true, +- "If true, support for IETF QUIC 0-rtt is enabled.") +- +-QUICHE_FLAG(bool, quic_restart_flag_quic_offload_pacing_to_usps2, false, +- "If true, QUIC offload pacing when using USPS as egress method.") +- +-QUICHE_FLAG(bool, quic_restart_flag_quic_rx_ring_use_tpacket_v3, false, +- "If true, use TPACKET_V3 for QuicRxRing instead of TPACKET_V2.") +- +-QUICHE_FLAG(bool, quic_restart_flag_quic_should_accept_new_connection, false, +- "If true, reject QUIC CHLO packets when dispatcher is asked to do so.") +- +-QUICHE_FLAG(bool, quic_restart_flag_quic_support_release_time_for_gso, false, +- "If true, QuicGsoBatchWriter will support release time if it is available and the " +- "process has the permission to do so.") +- +-QUICHE_FLAG(bool, quic_restart_flag_quic_testonly_default_false, false, +- "A testonly restart flag that will always default to false.") +- +-QUICHE_FLAG(bool, quic_restart_flag_quic_testonly_default_true, true, +- "A testonly restart flag that will always default to true.") +- +-QUICHE_FLAG( +- bool, quic_restart_flag_quic_use_leto_for_quic_configs, false, +- "If true, use Leto to fetch QUIC server configs instead of using the seeds from Memento.") +- +-QUICHE_FLAG(bool, quic_restart_flag_quic_use_pigeon_socket_to_backend, false, +- "If true, create a shared pigeon socket for all quic to backend connections and switch " +- "to use it after successful handshake.") +- +-QUICHE_FLAG(bool, spdy_reloadable_flag_quic_bootstrap_cwnd_by_spdy_priority, true, +- "If true, bootstrap initial QUIC cwnd by SPDY priorities.") +- +-QUICHE_FLAG(bool, spdy_reloadable_flag_quic_clean_up_spdy_session_destructor, false, +- "If true, QuicSpdySession's destructor won't need to do cleanup.") +- +-QUICHE_FLAG( +- bool, spdy_reloadable_flag_spdy_discard_response_body_if_disallowed, false, +- "If true, SPDY will discard all response body bytes when response code indicates no response " +- "body should exist. Previously, we only discard partial bytes on the first response processing " +- "and the rest of the response bytes would still be delivered even though the response code " +- "said there should not be any body associated with the response code.") +- +-QUICHE_FLAG(bool, quic_allow_chlo_buffering, true, +- "If true, allows packets to be buffered in anticipation of a " +- "future CHLO, and allow CHLO packets to be buffered until next " +- "iteration of the event loop.") +- +-QUICHE_FLAG(bool, quic_disable_pacing_for_perf_tests, false, "If true, disable pacing in QUIC") +- +-QUICHE_FLAG(bool, quic_enforce_single_packet_chlo, true, +- "If true, enforce that QUIC CHLOs fit in one packet") +- +-QUICHE_FLAG(int64_t, quic_time_wait_list_max_connections, 600000, +- "Maximum number of connections on the time-wait list. " +- "A negative value implies no configured limit.") +- +-QUICHE_FLAG(int64_t, quic_time_wait_list_seconds, 200, +- "Time period for which a given connection_id should live in " +- "the time-wait state.") +- +-QUICHE_FLAG(double, quic_bbr_cwnd_gain, 2.0f, +- "Congestion window gain for QUIC BBR during PROBE_BW phase.") +- +-QUICHE_FLAG(int32_t, quic_buffered_data_threshold, 8 * 1024, +- "If buffered data in QUIC stream is less than this " +- "threshold, buffers all provided data or asks upper layer for more data") +- +-QUICHE_FLAG(int32_t, quic_send_buffer_max_data_slice_size, 4 * 1024, +- "Max size of data slice in bytes for QUIC stream send buffer.") +- +-QUICHE_FLAG(int32_t, quic_lumpy_pacing_size, 2, +- "Number of packets that the pacing sender allows in bursts during " +- "pacing. This flag is ignored if a flow's estimated bandwidth is " +- "lower than 1200 kbps.") +- +-QUICHE_FLAG(double, quic_lumpy_pacing_cwnd_fraction, 0.25f, +- "Congestion window fraction that the pacing sender allows in bursts " +- "during pacing.") +- +-QUICHE_FLAG(int32_t, quic_max_pace_time_into_future_ms, 10, +- "Max time that QUIC can pace packets into the future in ms.") +- +-QUICHE_FLAG(double, quic_pace_time_into_future_srtt_fraction, 0.125f, +- "Smoothed RTT fraction that a connection can pace packets into the future.") +- +-QUICHE_FLAG(bool, quic_export_server_num_packets_per_write_histogram, false, +- "If true, export number of packets written per write operation histogram.") +- +-QUICHE_FLAG(bool, quic_disable_version_negotiation_grease_randomness, false, +- "If true, use predictable version negotiation versions.") +- +-QUICHE_FLAG(bool, quic_enable_http3_grease_randomness, true, +- "If true, use random greased settings and frames.") +- +-QUICHE_FLAG(int64_t, quic_max_tracked_packet_count, 10000, "Maximum number of tracked packets.") +- +-QUICHE_FLAG(bool, quic_prober_uses_length_prefixed_connection_ids, false, +- "If true, QuicFramer::WriteClientVersionNegotiationProbePacket uses " +- "length-prefixed connection IDs.") +- +-QUICHE_FLAG(bool, quic_client_convert_http_header_name_to_lowercase, true, +- "If true, HTTP request header names sent from QuicSpdyClientBase(and " +- "descendents) will be automatically converted to lower case.") +- +-QUICHE_FLAG(bool, quic_enable_http3_server_push, false, +- "If true, server push will be allowed in QUIC versions that use HTTP/3.") +- +-QUICHE_FLAG(int32_t, quic_bbr2_default_probe_bw_base_duration_ms, 2000, +- "The default minimum duration for BBRv2-native probes, in milliseconds.") +- +-QUICHE_FLAG(int32_t, quic_bbr2_default_probe_bw_max_rand_duration_ms, 1000, +- "The default upper bound of the random amount of BBRv2-native " +- "probes, in milliseconds.") +- +-QUICHE_FLAG(int32_t, quic_bbr2_default_probe_rtt_period_ms, 10000, +- "The default period for entering PROBE_RTT, in milliseconds.") +- +-QUICHE_FLAG(double, quic_bbr2_default_loss_threshold, 0.02, +- "The default loss threshold for QUIC BBRv2, should be a value " +- "between 0 and 1.") +- +-QUICHE_FLAG(int32_t, quic_bbr2_default_startup_full_loss_count, 8, +- "The default minimum number of loss marking events to exit STARTUP.") +- +-QUICHE_FLAG(int32_t, quic_bbr2_default_probe_bw_full_loss_count, 2, +- "The default minimum number of loss marking events to exit PROBE_UP phase.") +- +-QUICHE_FLAG(double, quic_bbr2_default_inflight_hi_headroom, 0.01, +- "The default fraction of unutilized headroom to try to leave in path " +- "upon high loss.") +- +-QUICHE_FLAG(int32_t, quic_bbr2_default_initial_ack_height_filter_window, 10, +- "The default initial value of the max ack height filter's window length.") +- +-QUICHE_FLAG(double, quic_ack_aggregation_bandwidth_threshold, 1.0, +- "If the bandwidth during ack aggregation is smaller than (estimated " +- "bandwidth * this flag), consider the current aggregation completed " +- "and starts a new one.") +- +-QUICHE_FLAG(int32_t, quic_anti_amplification_factor, 5, +- "Anti-amplification factor. Before address validation, server will " +- "send no more than factor times bytes received.") +- +-QUICHE_FLAG(int32_t, quic_max_buffered_crypto_bytes, 16 * 1024, +- "The maximum amount of CRYPTO frame data that can be buffered.") +- +-QUICHE_FLAG(int32_t, quic_max_aggressive_retransmittable_on_wire_ping_count, 0, +- "If set to non-zero, the maximum number of consecutive pings that " +- "can be sent with aggressive initial retransmittable on wire timeout " +- "if there is no new data received. After which, the timeout will be " +- "exponentially back off until exceeds the default ping timeout.") +- +-QUICHE_FLAG(int32_t, quic_max_congestion_window, 2000, "The maximum congestion window in packets.") +- +-QUICHE_FLAG(int32_t, quic_max_streams_window_divisor, 2, +- "The divisor that controls how often MAX_STREAMS frame is sent.") +- +-QUICHE_FLAG(bool, http2_reloadable_flag_http2_testonly_default_false, false, +- "A testonly reloadable flag that will always default to false.") +- +-QUICHE_FLAG(bool, http2_restart_flag_http2_testonly_default_false, false, +- "A testonly restart flag that will always default to false.") +- +-QUICHE_FLAG(bool, spdy_reloadable_flag_spdy_testonly_default_false, false, +- "A testonly reloadable flag that will always default to false.") +- +-QUICHE_FLAG(bool, spdy_restart_flag_spdy_testonly_default_false, false, +- "A testonly restart flag that will always default to false.") +- +-#endif +diff --git a/source/extensions/quic_listeners/quiche/platform/http2_flags_impl.h b/source/extensions/quic_listeners/quiche/platform/http2_flags_impl.h +index 7d2561469..dc6fe5429 100644 +--- a/source/extensions/quic_listeners/quiche/platform/http2_flags_impl.h ++++ b/source/extensions/quic_listeners/quiche/platform/http2_flags_impl.h +@@ -8,10 +8,10 @@ + + #include "extensions/quic_listeners/quiche/platform/flags_impl.h" + +-#define GetHttp2ReloadableFlagImpl(flag) quiche::FLAGS_http2_reloadable_flag_##flag->value() ++#define GetHttp2ReloadableFlagImpl(flag) quiche::FLAGS_quic_reloadable_flag_##flag->value() + + #define SetHttp2ReloadableFlagImpl(flag, value) \ +- quiche::FLAGS_http2_reloadable_flag_##flag->SetValue(value) ++ quiche::FLAGS_quic_reloadable_flag_##flag->setValue(value) + + #define HTTP2_CODE_COUNT_N_IMPL(flag, instance, total) \ + do { \ +diff --git a/source/extensions/quic_listeners/quiche/platform/quic_aligned_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_aligned_impl.h +deleted file mode 100644 +index 3f595380b..000000000 +--- a/source/extensions/quic_listeners/quiche/platform/quic_aligned_impl.h ++++ /dev/null +@@ -1,18 +0,0 @@ +-#pragma once +- +-#include "absl/base/optimization.h" +- +-// NOLINT(namespace-envoy) +- +-// This file is part of the QUICHE platform implementation, and is not to be +-// consumed or referenced directly by other Envoy code. It serves purely as a +-// porting layer for QUICHE. +- +-#define QUIC_ALIGN_OF_IMPL alignof +-#ifdef _MSC_VER +-#define QUIC_ALIGNED_IMPL(X) __declspec(align(X)) +-#else +-#define QUIC_ALIGNED_IMPL(X) __attribute__((aligned(X))) +-#endif +-#define QUIC_CACHELINE_ALIGNED_IMPL ABSL_CACHELINE_ALIGNED +-#define QUIC_CACHELINE_SIZE_IMPL ABSL_CACHELINE_SIZE +diff --git a/source/extensions/quic_listeners/quiche/platform/quic_cert_utils_impl.cc b/source/extensions/quic_listeners/quiche/platform/quic_cert_utils_impl.cc +index 2a886a12c..27b977908 100644 +--- a/source/extensions/quic_listeners/quiche/platform/quic_cert_utils_impl.cc ++++ b/source/extensions/quic_listeners/quiche/platform/quic_cert_utils_impl.cc +@@ -10,25 +10,7 @@ + + namespace quic { + +-// static +-bool QuicCertUtilsImpl::ExtractSubjectNameFromDERCert(quiche::QuicheStringPiece cert, +- quiche::QuicheStringPiece* subject_out) { +- CBS tbs_certificate; +- if (!SeekToSubject(cert, &tbs_certificate)) { +- return false; +- } +- +- CBS subject; +- if (!CBS_get_asn1_element(&tbs_certificate, &subject, CBS_ASN1_SEQUENCE)) { +- return false; +- } +- *subject_out = +- absl::string_view(reinterpret_cast<const char*>(CBS_data(&subject)), CBS_len(&subject)); +- return true; +-} +- +-// static +-bool QuicCertUtilsImpl::SeekToSubject(quiche::QuicheStringPiece cert, CBS* tbs_certificate) { ++bool seekToSubject(absl::string_view cert, CBS* tbs_certificate) { + CBS der; + CBS_init(&der, reinterpret_cast<const uint8_t*>(cert.data()), cert.size()); + CBS certificate; +@@ -65,4 +47,22 @@ bool QuicCertUtilsImpl::SeekToSubject(quiche::QuicheStringPiece cert, CBS* tbs_c + return true; + } + ++// static ++// NOLINTNEXTLINE(readability-identifier-naming) ++bool QuicCertUtilsImpl::ExtractSubjectNameFromDERCert(absl::string_view cert, ++ absl::string_view* subject_out) { ++ CBS tbs_certificate; ++ if (!seekToSubject(cert, &tbs_certificate)) { ++ return false; ++ } ++ ++ CBS subject; ++ if (!CBS_get_asn1_element(&tbs_certificate, &subject, CBS_ASN1_SEQUENCE)) { ++ return false; ++ } ++ *subject_out = ++ absl::string_view(reinterpret_cast<const char*>(CBS_data(&subject)), CBS_len(&subject)); ++ return true; ++} ++ + } // namespace quic +diff --git a/source/extensions/quic_listeners/quiche/platform/quic_cert_utils_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_cert_utils_impl.h +index 0c41b9dbc..29b882b7d 100644 +--- a/source/extensions/quic_listeners/quiche/platform/quic_cert_utils_impl.h ++++ b/source/extensions/quic_listeners/quiche/platform/quic_cert_utils_impl.h +@@ -6,18 +6,15 @@ + // consumed or referenced directly by other Envoy code. It serves purely as a + // porting layer for QUICHE. + ++#include "absl/strings/string_view.h" + #include "openssl/base.h" +-#include "quiche/common/platform/api/quiche_string_piece.h" + + namespace quic { + + class QuicCertUtilsImpl { + public: +- static bool ExtractSubjectNameFromDERCert(quiche::QuicheStringPiece cert, +- quiche::QuicheStringPiece* subject_out); +- +-private: +- static bool SeekToSubject(quiche::QuicheStringPiece cert, CBS* tbs_certificate); ++ // NOLINTNEXTLINE(readability-identifier-naming) ++ static bool ExtractSubjectNameFromDERCert(absl::string_view cert, absl::string_view* subject_out); + }; + + } // namespace quic +diff --git a/source/extensions/quic_listeners/quiche/platform/quic_fallthrough_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_fallthrough_impl.h +deleted file mode 100644 +index aa9d6bc36..000000000 +--- a/source/extensions/quic_listeners/quiche/platform/quic_fallthrough_impl.h ++++ /dev/null +@@ -1,11 +0,0 @@ +-#pragma once +- +-// NOLINT(namespace-envoy) +- +-// This file is part of the QUICHE platform implementation, and is not to be +-// consumed or referenced directly by other Envoy code. It serves purely as a +-// porting layer for QUICHE. +- +-#include "absl/base/macros.h" +- +-#define QUIC_FALLTHROUGH_INTENDED_IMPL ABSL_FALLTHROUGH_INTENDED +diff --git a/source/extensions/quic_listeners/quiche/platform/quic_file_utils_impl.cc b/source/extensions/quic_listeners/quiche/platform/quic_file_utils_impl.cc +index 91d52c44a..b2e396fab 100644 +--- a/source/extensions/quic_listeners/quiche/platform/quic_file_utils_impl.cc ++++ b/source/extensions/quic_listeners/quiche/platform/quic_file_utils_impl.cc +@@ -36,6 +36,7 @@ void depthFirstTraverseDirectory(const std::string& dirname, std::vector<std::st + } // namespace + + // Traverses the directory |dirname| and returns all of the files it contains. ++// NOLINTNEXTLINE(readability-identifier-naming) + std::vector<std::string> ReadFileContentsImpl(const std::string& dirname) { + std::vector<std::string> files; + depthFirstTraverseDirectory(dirname, files); +@@ -43,7 +44,8 @@ std::vector<std::string> ReadFileContentsImpl(const std::string& dirname) { + } + + // Reads the contents of |filename| as a string into |contents|. +-void ReadFileContentsImpl(quiche::QuicheStringPiece filename, std::string* contents) { ++// NOLINTNEXTLINE(readability-identifier-naming) ++void ReadFileContentsImpl(absl::string_view filename, std::string* contents) { + #ifdef WIN32 + Envoy::Filesystem::InstanceImplWin32 fs; + #else +diff --git a/source/extensions/quic_listeners/quiche/platform/quic_file_utils_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_file_utils_impl.h +index 654c1ad18..25c31e9de 100644 +--- a/source/extensions/quic_listeners/quiche/platform/quic_file_utils_impl.h ++++ b/source/extensions/quic_listeners/quiche/platform/quic_file_utils_impl.h +@@ -8,7 +8,7 @@ + + #include <vector> + +-#include "quiche/common/platform/api/quiche_string_piece.h" ++#include "absl/strings/string_view.h" + + namespace quic { + +@@ -16,6 +16,7 @@ namespace quic { + * Traverses the directory |dirname| and returns all of the files it contains. + * @param dirname full path without trailing '/'. + */ ++// NOLINTNEXTLINE(readability-identifier-naming)` + std::vector<std::string> ReadFileContentsImpl(const std::string& dirname); + + /** +@@ -23,6 +24,7 @@ std::vector<std::string> ReadFileContentsImpl(const std::string& dirname); + * @param filename the full path to the file. + * @param contents output location of the file content. + */ +-void ReadFileContentsImpl(quiche::QuicheStringPiece filename, std::string* contents); ++// NOLINTNEXTLINE(readability-identifier-naming) ++void ReadFileContentsImpl(absl::string_view filename, std::string* contents); + + } // namespace quic +diff --git a/source/extensions/quic_listeners/quiche/platform/quic_flags_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_flags_impl.h +index 872495f2d..d562bb1a4 100644 +--- a/source/extensions/quic_listeners/quiche/platform/quic_flags_impl.h ++++ b/source/extensions/quic_listeners/quiche/platform/quic_flags_impl.h +@@ -15,16 +15,16 @@ + #define GetQuicFlagImpl(flag) (quiche::flag)->value() + + // |flag| is the global flag variable, which is a pointer to TypedFlag<type>. +-#define SetQuicFlagImpl(flag, value) (quiche::flag)->SetValue(value) ++#define SetQuicFlagImpl(flag, value) (quiche::flag)->setValue(value) + + #define GetQuicReloadableFlagImpl(flag) quiche::FLAGS_quic_reloadable_flag_##flag->value() + + #define SetQuicReloadableFlagImpl(flag, value) \ +- quiche::FLAGS_quic_reloadable_flag_##flag->SetValue(value) ++ quiche::FLAGS_quic_reloadable_flag_##flag->setValue(value) + + #define GetQuicRestartFlagImpl(flag) quiche::FLAGS_quic_restart_flag_##flag->value() + +-#define SetQuicRestartFlagImpl(flag, value) quiche::FLAGS_quic_restart_flag_##flag->SetValue(value) ++#define SetQuicRestartFlagImpl(flag, value) quiche::FLAGS_quic_restart_flag_##flag->setValue(value) + + // Not wired into command-line parsing. + #define DEFINE_QUIC_COMMAND_LINE_FLAG_IMPL(type, flag, value, help) \ +diff --git a/source/extensions/quic_listeners/quiche/platform/quic_hostname_utils_impl.cc b/source/extensions/quic_listeners/quiche/platform/quic_hostname_utils_impl.cc +index bcbafb566..75849611d 100644 +--- a/source/extensions/quic_listeners/quiche/platform/quic_hostname_utils_impl.cc ++++ b/source/extensions/quic_listeners/quiche/platform/quic_hostname_utils_impl.cc +@@ -19,7 +19,8 @@ + namespace quic { + + // static +-bool QuicHostnameUtilsImpl::IsValidSNI(quiche::QuicheStringPiece sni) { ++// NOLINTNEXTLINE(readability-identifier-naming) ++bool QuicHostnameUtilsImpl::IsValidSNI(absl::string_view sni) { + // TODO(wub): Implement it on top of GoogleUrl, once it is available. + + return sni.find_last_of('.') != std::string::npos && +@@ -27,7 +28,8 @@ bool QuicHostnameUtilsImpl::IsValidSNI(quiche::QuicheStringPiece sni) { + } + + // static +-std::string QuicHostnameUtilsImpl::NormalizeHostname(quiche::QuicheStringPiece hostname) { ++// NOLINTNEXTLINE(readability-identifier-naming) ++std::string QuicHostnameUtilsImpl::NormalizeHostname(absl::string_view hostname) { + // TODO(wub): Implement it on top of GoogleUrl, once it is available. + std::string host = absl::AsciiStrToLower(hostname); + +diff --git a/source/extensions/quic_listeners/quiche/platform/quic_hostname_utils_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_hostname_utils_impl.h +index 2b7ed4357..67cd787d0 100644 +--- a/source/extensions/quic_listeners/quiche/platform/quic_hostname_utils_impl.h ++++ b/source/extensions/quic_listeners/quiche/platform/quic_hostname_utils_impl.h +@@ -6,7 +6,7 @@ + // consumed or referenced directly by other Envoy code. It serves purely as a + // porting layer for QUICHE. + +-#include "quiche/common/platform/api/quiche_string_piece.h" ++#include "absl/strings/string_view.h" + #include "quiche/quic/platform/api/quic_export.h" + + namespace quic { +@@ -18,7 +18,8 @@ public: + // (2) check that the hostname contains valid characters only; and + // (3) contains at least one dot. + // NOTE(wub): Only (3) is implemented for now. +- static bool IsValidSNI(quiche::QuicheStringPiece sni); ++ // NOLINTNEXTLINE(readability-identifier-naming) ++ static bool IsValidSNI(absl::string_view sni); + + // Normalize a hostname: + // (1) Canonicalize it, similar to what Chromium does in +@@ -27,7 +28,8 @@ public: + // (3) Remove the trailing '.'. + // WARNING: May mutate |hostname| in place. + // NOTE(wub): Only (2) and (3) are implemented for now. +- static std::string NormalizeHostname(quiche::QuicheStringPiece hostname); ++ // NOLINTNEXTLINE(readability-identifier-naming) ++ static std::string NormalizeHostname(absl::string_view hostname); + + private: + QuicHostnameUtilsImpl() = delete; +diff --git a/source/extensions/quic_listeners/quiche/platform/quic_macros_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_macros_impl.h +deleted file mode 100644 +index b8b70a042..000000000 +--- a/source/extensions/quic_listeners/quiche/platform/quic_macros_impl.h ++++ /dev/null +@@ -1,13 +0,0 @@ +-#pragma once +- +-// NOLINT(namespace-envoy) +- +-// This file is part of the QUICHE platform implementation, and is not to be +-// consumed or referenced directly by other Envoy code. It serves purely as a +-// porting layer for QUICHE. +- +-#include "absl/base/attributes.h" +- +-#define QUIC_MUST_USE_RESULT_IMPL ABSL_MUST_USE_RESULT +-#define QUIC_UNUSED_IMPL ABSL_ATTRIBUTE_UNUSED +-#define QUIC_CONST_INIT_IMPL ABSL_CONST_INIT +diff --git a/source/extensions/quic_listeners/quiche/platform/quic_mem_slice_span_impl.cc b/source/extensions/quic_listeners/quiche/platform/quic_mem_slice_span_impl.cc +index c2eb527d6..9e46c37df 100644 +--- a/source/extensions/quic_listeners/quiche/platform/quic_mem_slice_span_impl.cc ++++ b/source/extensions/quic_listeners/quiche/platform/quic_mem_slice_span_impl.cc +@@ -10,7 +10,8 @@ + + namespace quic { + +-quiche::QuicheStringPiece QuicMemSliceSpanImpl::GetData(size_t index) { ++// NOLINTNEXTLINE(readability-identifier-naming) ++absl::string_view QuicMemSliceSpanImpl::GetData(size_t index) { + Envoy::Buffer::RawSliceVector slices = buffer_->getRawSlices(/*max_slices=*/index + 1); + ASSERT(slices.size() > index); + return {reinterpret_cast<char*>(slices[index].mem_), slices[index].len_}; +diff --git a/source/extensions/quic_listeners/quiche/platform/quic_mem_slice_span_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_mem_slice_span_impl.h +index 1824fb8d1..ef40e6387 100644 +--- a/source/extensions/quic_listeners/quiche/platform/quic_mem_slice_span_impl.h ++++ b/source/extensions/quic_listeners/quiche/platform/quic_mem_slice_span_impl.h +@@ -9,7 +9,7 @@ + #include "envoy/buffer/buffer.h" + + #include "absl/container/fixed_array.h" +-#include "quiche/common/platform/api/quiche_string_piece.h" ++#include "absl/strings/string_view.h" + #include "quiche/quic/core/quic_types.h" + #include "quiche/quic/platform/api/quic_mem_slice.h" + +@@ -43,9 +43,13 @@ public: + } + + // QuicMemSliceSpan +- quiche::QuicheStringPiece GetData(size_t index); ++ // NOLINTNEXTLINE(readability-identifier-naming) ++ absl::string_view GetData(size_t index); ++ // NOLINTNEXTLINE(readability-identifier-naming) + QuicByteCount total_length() { return buffer_->length(); }; ++ // NOLINTNEXTLINE(readability-identifier-naming) + size_t NumSlices() { return buffer_->getRawSlices().size(); } ++ // NOLINTNEXTLINE(readability-identifier-naming) + template <typename ConsumeFunction> QuicByteCount ConsumeAll(ConsumeFunction consume); + bool empty() const { return buffer_->length() == 0; } + +@@ -54,6 +58,7 @@ private: + }; + + template <typename ConsumeFunction> ++// NOLINTNEXTLINE(readability-identifier-naming) + QuicByteCount QuicMemSliceSpanImpl::ConsumeAll(ConsumeFunction consume) { + size_t saved_length = 0; + for (auto& slice : buffer_->getRawSlices()) { +diff --git a/source/extensions/quic_listeners/quiche/platform/quiche_ptr_util_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_testvalue_impl.h +similarity index 52% +rename from source/extensions/quic_listeners/quiche/platform/quiche_ptr_util_impl.h +rename to source/extensions/quic_listeners/quiche/platform/quic_testvalue_impl.h +index aaebe5d5c..4b0201c35 100644 +--- a/source/extensions/quic_listeners/quiche/platform/quiche_ptr_util_impl.h ++++ b/source/extensions/quic_listeners/quiche/platform/quic_testvalue_impl.h +@@ -6,12 +6,11 @@ + // consumed or referenced directly by other Envoy code. It serves purely as a + // porting layer for QUICHE. + +-#include "absl/memory/memory.h" ++#include "absl/strings/string_view.h" + +-namespace quiche { ++namespace quic { + +-template <typename T> std::unique_ptr<T> QuicheWrapUniqueImpl(T* ptr) { +- return absl::WrapUnique<T>(ptr); +-} ++// NOLINTNEXTLINE(readability-identifier-naming) ++template <class T> void AdjustTestValueImpl(absl::string_view /*label*/, T* /*var*/) {} + +-} // namespace quiche ++} // namespace quic +diff --git a/source/extensions/quic_listeners/quiche/platform/quic_udp_socket_platform_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_udp_socket_platform_impl.h +index 248cfc193..1e88abe46 100644 +--- a/source/extensions/quic_listeners/quiche/platform/quic_udp_socket_platform_impl.h ++++ b/source/extensions/quic_listeners/quiche/platform/quic_udp_socket_platform_impl.h +@@ -19,4 +19,7 @@ inline bool GetGooglePacketHeadersFromControlMessageImpl(struct ::cmsghdr* /*cms + return false; + } + ++// NOLINTNEXTLINE(readability-identifier-naming) ++inline void SetGoogleSocketOptionsImpl(int /*fd*/) {} ++ + } // namespace quic +diff --git a/source/extensions/quic_listeners/quiche/platform/quiche_arraysize_impl.h b/source/extensions/quic_listeners/quiche/platform/quiche_arraysize_impl.h +deleted file mode 100644 +index 7a23b53da..000000000 +--- a/source/extensions/quic_listeners/quiche/platform/quiche_arraysize_impl.h ++++ /dev/null +@@ -1,11 +0,0 @@ +-#pragma once +- +-#include "absl/base/macros.h" +- +-// NOLINT(namespace-envoy) +- +-// This file is part of the QUICHE platform implementation, and is not to be +-// consumed or referenced directly by other Envoy code. It serves purely as a +-// porting layer for QUICHE. +- +-#define QUICHE_ARRAYSIZE_IMPL(array) ABSL_ARRAYSIZE(array) +diff --git a/source/extensions/quic_listeners/quiche/platform/quiche_optional_impl.h b/source/extensions/quic_listeners/quiche/platform/quiche_optional_impl.h +deleted file mode 100644 +index f8b2b6c08..000000000 +--- a/source/extensions/quic_listeners/quiche/platform/quiche_optional_impl.h ++++ /dev/null +@@ -1,17 +0,0 @@ +-#pragma once +- +-#include "absl/types/optional.h" +- +-// NOLINT(namespace-envoy) +- +-// This file is part of the QUICHE platform implementation, and is not to be +-// consumed or referenced directly by other Envoy code. It serves purely as a +-// porting layer for QUICHE. +- +-namespace quiche { +- +-template <typename T> using QuicheOptionalImpl = absl::optional<T>; +- +-#define QUICHE_NULLOPT_IMPL absl::nullopt +- +-} // namespace quiche +diff --git a/source/extensions/quic_listeners/quiche/platform/quiche_text_utils_impl.h b/source/extensions/quic_listeners/quiche/platform/quiche_text_utils_impl.h +index 3a6d1a393..7b87c1cd6 100644 +--- a/source/extensions/quic_listeners/quiche/platform/quiche_text_utils_impl.h ++++ b/source/extensions/quic_listeners/quiche/platform/quiche_text_utils_impl.h +@@ -2,7 +2,6 @@ + + #include "common/common/base64.h" + +-#include "extensions/quic_listeners/quiche/platform/quiche_optional_impl.h" + #include "extensions/quic_listeners/quiche/platform/quiche_string_piece_impl.h" + #include "extensions/quic_listeners/quiche/platform/string_utils.h" + +@@ -13,6 +12,7 @@ + #include "absl/strings/str_cat.h" + #include "absl/strings/str_format.h" + #include "absl/strings/str_split.h" ++#include "absl/types/optional.h" + + // NOLINT(namespace-envoy) + +@@ -25,58 +25,16 @@ namespace quiche { + class QuicheTextUtilsImpl { + public: + // NOLINTNEXTLINE(readability-identifier-naming) +- static bool StartsWith(QuicheStringPieceImpl data, QuicheStringPieceImpl prefix) { +- return absl::StartsWith(data, prefix); +- } +- +- // NOLINTNEXTLINE(readability-identifier-naming) +- static bool EndsWith(QuicheStringPieceImpl data, QuicheStringPieceImpl suffix) { +- return absl::EndsWith(data, suffix); +- } +- +- // NOLINTNEXTLINE(readability-identifier-naming) +- static bool EndsWithIgnoreCase(QuicheStringPieceImpl data, QuicheStringPieceImpl suffix) { +- return absl::EndsWithIgnoreCase(data, suffix); +- } +- +- // NOLINTNEXTLINE(readability-identifier-naming) +- static std::string ToLower(QuicheStringPieceImpl data) { return absl::AsciiStrToLower(data); } ++ static std::string ToLower(absl::string_view data) { return absl::AsciiStrToLower(data); } + + // NOLINTNEXTLINE(readability-identifier-naming) +- static void RemoveLeadingAndTrailingWhitespace(QuicheStringPieceImpl* data) { ++ static void RemoveLeadingAndTrailingWhitespace(absl::string_view* data) { + *data = absl::StripAsciiWhitespace(*data); + } + +- // NOLINTNEXTLINE(readability-identifier-naming) +- static bool StringToUint64(QuicheStringPieceImpl in, uint64_t* out) { +- return absl::SimpleAtoi(in, out); +- } +- +- // NOLINTNEXTLINE(readability-identifier-naming) +- static bool StringToInt(QuicheStringPieceImpl in, int* out) { return absl::SimpleAtoi(in, out); } +- +- // NOLINTNEXTLINE(readability-identifier-naming) +- static bool StringToUint32(QuicheStringPieceImpl in, uint32_t* out) { +- return absl::SimpleAtoi(in, out); +- } +- +- // NOLINTNEXTLINE(readability-identifier-naming) +- static bool StringToSizeT(QuicheStringPieceImpl in, size_t* out) { +- return absl::SimpleAtoi(in, out); +- } +- +- // NOLINTNEXTLINE(readability-identifier-naming) +- static std::string Uint64ToString(uint64_t in) { return absl::StrCat(in); } +- +- // NOLINTNEXTLINE(readability-identifier-naming) +- static std::string HexEncode(QuicheStringPieceImpl data) { return absl::BytesToHexString(data); } +- + // NOLINTNEXTLINE(readability-identifier-naming) + static std::string Hex(uint32_t v) { return absl::StrCat(absl::Hex(v)); } + +- // NOLINTNEXTLINE(readability-identifier-naming) +- static std::string HexDecode(QuicheStringPieceImpl data) { return absl::HexStringToBytes(data); } +- + // NOLINTNEXTLINE(readability-identifier-naming) + static void Base64Encode(const uint8_t* data, size_t data_len, std::string* output) { + *output = +@@ -84,27 +42,28 @@ public: + } + + // NOLINTNEXTLINE(readability-identifier-naming) +- static QuicheOptionalImpl<std::string> Base64Decode(QuicheStringPieceImpl input) { ++ static absl::optional<std::string> Base64Decode(absl::string_view input) { + return Envoy::Base64::decodeWithoutPadding(input); + } + + // NOLINTNEXTLINE(readability-identifier-naming) +- static std::string HexDump(QuicheStringPieceImpl binary_data) { +- return quiche::HexDump(binary_data); +- } ++ static std::string Uint64ToString(uint64_t in) { return absl::StrCat(in); } ++ ++ // NOLINTNEXTLINE(readability-identifier-naming) ++ static std::string HexDump(absl::string_view binary_data) { return quiche::HexDump(binary_data); } + + // NOLINTNEXTLINE(readability-identifier-naming) +- static bool ContainsUpperCase(QuicheStringPieceImpl data) { ++ static bool ContainsUpperCase(absl::string_view data) { + return std::any_of(data.begin(), data.end(), absl::ascii_isupper); + } + + // NOLINTNEXTLINE(readability-identifier-naming) +- static bool IsAllDigits(QuicheStringPieceImpl data) { ++ static bool IsAllDigits(absl::string_view data) { + return std::all_of(data.begin(), data.end(), absl::ascii_isdigit); + } + + // NOLINTNEXTLINE(readability-identifier-naming) +- static std::vector<QuicheStringPieceImpl> Split(QuicheStringPieceImpl data, char delim) { ++ static std::vector<absl::string_view> Split(absl::string_view data, char delim) { + return absl::StrSplit(data, delim); + } + }; +diff --git a/source/extensions/quic_listeners/quiche/platform/quiche_time_utils_impl.cc b/source/extensions/quic_listeners/quiche/platform/quiche_time_utils_impl.cc +index 3260eafee..5387e0598 100644 +--- a/source/extensions/quic_listeners/quiche/platform/quiche_time_utils_impl.cc ++++ b/source/extensions/quic_listeners/quiche/platform/quiche_time_utils_impl.cc +@@ -9,7 +9,7 @@ + namespace quiche { + + namespace { +-QuicheOptional<int64_t> quicheUtcDateTimeToUnixSecondsInner(int year, int month, int day, int hour, ++absl::optional<int64_t> quicheUtcDateTimeToUnixSecondsInner(int year, int month, int day, int hour, + int minute, int second) { + const absl::CivilSecond civil_time(year, month, day, hour, minute, second); + if (second != 60 && (civil_time.year() != year || civil_time.month() != month || +@@ -24,7 +24,7 @@ QuicheOptional<int64_t> quicheUtcDateTimeToUnixSecondsInner(int year, int month, + } // namespace + + // NOLINTNEXTLINE(readability-identifier-naming) +-QuicheOptional<int64_t> QuicheUtcDateTimeToUnixSecondsImpl(int year, int month, int day, int hour, ++absl::optional<int64_t> QuicheUtcDateTimeToUnixSecondsImpl(int year, int month, int day, int hour, + int minute, int second) { + // Handle leap seconds without letting any other irregularities happen. + if (second == 60) { +diff --git a/source/extensions/quic_listeners/quiche/platform/quiche_time_utils_impl.h b/source/extensions/quic_listeners/quiche/platform/quiche_time_utils_impl.h +index a1b70b70a..5e2ef7956 100644 +--- a/source/extensions/quic_listeners/quiche/platform/quiche_time_utils_impl.h ++++ b/source/extensions/quic_listeners/quiche/platform/quiche_time_utils_impl.h +@@ -10,12 +10,12 @@ + + #include "absl/time/civil_time.h" + #include "absl/time/time.h" +-#include "quiche/common/platform/api/quiche_optional.h" ++#include "absl/types/optional.h" + + namespace quiche { + + // NOLINTNEXTLINE(readability-identifier-naming) +-QuicheOptional<int64_t> QuicheUtcDateTimeToUnixSecondsImpl(int year, int month, int day, int hour, ++absl::optional<int64_t> QuicheUtcDateTimeToUnixSecondsImpl(int year, int month, int day, int hour, + int minute, int second); + + } // namespace quiche +diff --git a/source/extensions/quic_listeners/quiche/platform/spdy_endianness_util_impl.h b/source/extensions/quic_listeners/quiche/platform/spdy_endianness_util_impl.h +deleted file mode 100644 +index 737b81ee2..000000000 +--- a/source/extensions/quic_listeners/quiche/platform/spdy_endianness_util_impl.h ++++ /dev/null +@@ -1,29 +0,0 @@ +-#pragma once +- +-#include <cstdint> +- +-#include "envoy/common/platform.h" +- +-// NOLINT(namespace-envoy) +- +-// This file is part of the QUICHE platform implementation, and is not to be +-// consumed or referenced directly by other Envoy code. It serves purely as a +-// porting layer for QUICHE. +- +-namespace spdy { +- +-inline uint16_t SpdyNetToHost16Impl(uint16_t x) { return ntohs(x); } +- +-inline uint32_t SpdyNetToHost32Impl(uint32_t x) { return ntohl(x); } +- +-// TODO: implement +-inline uint64_t SpdyNetToHost64Impl(uint64_t /*x*/) { return 0; } +- +-inline uint16_t SpdyHostToNet16Impl(uint16_t x) { return htons(x); } +- +-inline uint32_t SpdyHostToNet32Impl(uint32_t x) { return htonl(x); } +- +-// TODO: implement +-inline uint64_t SpdyHostToNet64Impl(uint64_t /*x*/) { return 0; } +- +-} // namespace spdy +diff --git a/source/extensions/quic_listeners/quiche/platform/spdy_flags_impl.h b/source/extensions/quic_listeners/quiche/platform/spdy_flags_impl.h +index a3cbd680f..833562fab 100644 +--- a/source/extensions/quic_listeners/quiche/platform/spdy_flags_impl.h ++++ b/source/extensions/quic_listeners/quiche/platform/spdy_flags_impl.h +@@ -8,9 +8,9 @@ + + #include "extensions/quic_listeners/quiche/platform/flags_impl.h" + +-#define GetSpdyReloadableFlagImpl(flag) quiche::FLAGS_spdy_reloadable_flag_##flag->value() ++#define GetSpdyReloadableFlagImpl(flag) quiche::FLAGS_quic_reloadable_flag_##flag->value() + +-#define GetSpdyRestartFlagImpl(flag) quiche::FLAGS_spdy_restart_flag_##flag->value() ++#define GetSpdyRestartFlagImpl(flag) quiche::FLAGS_quic_restart_flag_##flag->value() + + #define SPDY_CODE_COUNT_N_IMPL(flag, instance, total) \ + do { \ +diff --git a/source/extensions/quic_listeners/quiche/platform/spdy_string_utils_impl.h b/source/extensions/quic_listeners/quiche/platform/spdy_string_utils_impl.h +index 41fa3cad8..4b01b2dbd 100644 +--- a/source/extensions/quic_listeners/quiche/platform/spdy_string_utils_impl.h ++++ b/source/extensions/quic_listeners/quiche/platform/spdy_string_utils_impl.h +@@ -50,7 +50,7 @@ inline std::string SpdyHexEncodeUInt32AndTrimImpl(uint32_t data) { + inline std::string SpdyHexDumpImpl(absl::string_view data) { return quiche::HexDump(data); } + + struct SpdyStringPieceCaseHashImpl { +- size_t operator()(quiche::QuicheStringPiece data) const { ++ size_t operator()(absl::string_view data) const { + std::string lower = absl::AsciiStrToLower(data); + return absl::Hash<std::string>()(lower); + } +diff --git a/source/extensions/quic_listeners/quiche/spdy_server_push_utils_for_envoy.cc b/source/extensions/quic_listeners/quiche/spdy_server_push_utils_for_envoy.cc +index 3bd0bc295..5ac5738c4 100644 +--- a/source/extensions/quic_listeners/quiche/spdy_server_push_utils_for_envoy.cc ++++ b/source/extensions/quic_listeners/quiche/spdy_server_push_utils_for_envoy.cc +@@ -12,25 +12,29 @@ using spdy::SpdyHeaderBlock; + namespace quic { + + // static ++// NOLINTNEXTLINE(readability-identifier-naming) + std::string SpdyServerPushUtils::GetPromisedUrlFromHeaders(const SpdyHeaderBlock& /*headers*/) { + NOT_IMPLEMENTED_GCOVR_EXCL_LINE; + } + + // static + std::string ++// NOLINTNEXTLINE(readability-identifier-naming) + SpdyServerPushUtils::GetPromisedHostNameFromHeaders(const SpdyHeaderBlock& /*headers*/) { + NOT_IMPLEMENTED_GCOVR_EXCL_LINE; + } + + // static ++// NOLINTNEXTLINE(readability-identifier-naming) + bool SpdyServerPushUtils::PromisedUrlIsValid(const SpdyHeaderBlock& /*headers*/) { + NOT_IMPLEMENTED_GCOVR_EXCL_LINE; + } + + // static +-std::string SpdyServerPushUtils::GetPushPromiseUrl(quiche::QuicheStringPiece /*scheme*/, +- quiche::QuicheStringPiece /*authority*/, +- quiche::QuicheStringPiece /*path*/) { ++// NOLINTNEXTLINE(readability-identifier-naming) ++std::string SpdyServerPushUtils::GetPushPromiseUrl(absl::string_view /*scheme*/, ++ absl::string_view /*authority*/, ++ absl::string_view /*path*/) { + NOT_IMPLEMENTED_GCOVR_EXCL_LINE; + } + +diff --git a/test/extensions/quic_listeners/quiche/envoy_quic_client_session_test.cc b/test/extensions/quic_listeners/quiche/envoy_quic_client_session_test.cc +index e2d90d916..8fa7d9fe9 100644 +--- a/test/extensions/quic_listeners/quiche/envoy_quic_client_session_test.cc ++++ b/test/extensions/quic_listeners/quiche/envoy_quic_client_session_test.cc +@@ -49,9 +49,9 @@ public: + Network::ConnectionSocketPtr&& connection_socket) + : EnvoyQuicClientConnection(server_connection_id, helper, alarm_factory, &writer, false, + supported_versions, dispatcher, std::move(connection_socket)) { +- SetDefaultEncryptionLevel(quic::ENCRYPTION_FORWARD_SECURE); + SetEncrypter(quic::ENCRYPTION_FORWARD_SECURE, + std::make_unique<quic::NullEncrypter>(quic::Perspective::IS_CLIENT)); ++ SetDefaultEncryptionLevel(quic::ENCRYPTION_FORWARD_SECURE); + } + + MOCK_METHOD(void, SendConnectionClosePacket, (quic::QuicErrorCode, const std::string&)); +diff --git a/test/extensions/quic_listeners/quiche/envoy_quic_client_stream_test.cc b/test/extensions/quic_listeners/quiche/envoy_quic_client_stream_test.cc +index 98359c618..f3b02f4cc 100644 +--- a/test/extensions/quic_listeners/quiche/envoy_quic_client_stream_test.cc ++++ b/test/extensions/quic_listeners/quiche/envoy_quic_client_stream_test.cc +@@ -48,11 +48,11 @@ public: + quic_session_.ActivateStream(std::unique_ptr<EnvoyQuicClientStream>(quic_stream_)); + EXPECT_CALL(quic_session_, ShouldYield(_)).WillRepeatedly(testing::Return(false)); + EXPECT_CALL(quic_session_, WritevData(_, _, _, _, _, _)) +- .WillRepeatedly(Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, +- quic::StreamSendingState state, bool, +- quiche::QuicheOptional<quic::EncryptionLevel>) { +- return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; +- })); ++ .WillRepeatedly( ++ Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, ++ quic::StreamSendingState state, bool, absl::optional<quic::EncryptionLevel>) { ++ return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; ++ })); + EXPECT_CALL(writer_, WritePacket(_, _, _, _, _)) + .WillRepeatedly(Invoke([](const char*, size_t buf_len, const quic::QuicIpAddress&, + const quic::QuicSocketAddress&, quic::PerPacketOptions*) { +@@ -146,7 +146,7 @@ TEST_P(EnvoyQuicClientStreamTest, PostRequestAndResponse) { + std::unique_ptr<char[]> data_buffer; + quic::QuicByteCount data_frame_header_length = + quic::HttpEncoder::SerializeDataFrameHeader(response_body_.length(), &data_buffer); +- quiche::QuicheStringPiece data_frame_header(data_buffer.get(), data_frame_header_length); ++ absl::string_view data_frame_header(data_buffer.get(), data_frame_header_length); + data = absl::StrCat(data_frame_header, response_body_); + } + quic::QuicStreamFrame frame(stream_id_, false, 0, data); +@@ -184,7 +184,7 @@ TEST_P(EnvoyQuicClientStreamTest, OutOfOrderTrailers) { + std::unique_ptr<char[]> data_buffer; + quic::QuicByteCount data_frame_header_length = + quic::HttpEncoder::SerializeDataFrameHeader(response_body_.length(), &data_buffer); +- quiche::QuicheStringPiece data_frame_header(data_buffer.get(), data_frame_header_length); ++ absl::string_view data_frame_header(data_buffer.get(), data_frame_header_length); + data = absl::StrCat(data_frame_header, response_body_); + } + quic::QuicStreamFrame frame(stream_id_, false, 0, data); +@@ -301,11 +301,11 @@ TEST_P(EnvoyQuicClientStreamTest, HeadersContributeToWatermarkIquic) { + // Unblock writing now, and this will write out 16kB data and cause stream to + // be blocked by the flow control limit. + EXPECT_CALL(quic_session_, WritevData(_, _, _, _, _, _)) +- .WillOnce(Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, +- quic::StreamSendingState state, bool, +- quiche::QuicheOptional<quic::EncryptionLevel>) { +- return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; +- })); ++ .WillOnce( ++ Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, ++ quic::StreamSendingState state, bool, absl::optional<quic::EncryptionLevel>) { ++ return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; ++ })); + EXPECT_CALL(stream_callbacks_, onBelowWriteBufferLowWatermark()); + quic_session_.OnCanWrite(); + EXPECT_TRUE(quic_stream_->IsFlowControlBlocked()); +@@ -315,20 +315,20 @@ TEST_P(EnvoyQuicClientStreamTest, HeadersContributeToWatermarkIquic) { + 32 * 1024); + quic_stream_->OnWindowUpdateFrame(window_update1); + EXPECT_CALL(quic_session_, WritevData(_, _, _, _, _, _)) +- .WillOnce(Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, +- quic::StreamSendingState state, bool, +- quiche::QuicheOptional<quic::EncryptionLevel>) { +- return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; +- })); ++ .WillOnce( ++ Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, ++ quic::StreamSendingState state, bool, absl::optional<quic::EncryptionLevel>) { ++ return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; ++ })); + quic_session_.OnCanWrite(); + // No data should be buffered at this point. + + EXPECT_CALL(quic_session_, WritevData(_, _, _, _, _, _)) +- .WillOnce(Invoke([](quic::QuicStreamId, size_t, quic::QuicStreamOffset, +- quic::StreamSendingState state, bool, +- quiche::QuicheOptional<quic::EncryptionLevel>) { +- return quic::QuicConsumedData{0u, state != quic::NO_FIN}; +- })); ++ .WillOnce( ++ Invoke([](quic::QuicStreamId, size_t, quic::QuicStreamOffset, ++ quic::StreamSendingState state, bool, absl::optional<quic::EncryptionLevel>) { ++ return quic::QuicConsumedData{0u, state != quic::NO_FIN}; ++ })); + // Send more data. If watermark bytes counting were not cleared in previous + // OnCanWrite, this write would have caused the stream to exceed its high watermark. + std::string request1(16 * 1024 - 3, 'a'); +diff --git a/test/extensions/quic_listeners/quiche/envoy_quic_proof_source_test.cc b/test/extensions/quic_listeners/quiche/envoy_quic_proof_source_test.cc +index cbf66f511..8a493a8e8 100644 +--- a/test/extensions/quic_listeners/quiche/envoy_quic_proof_source_test.cc ++++ b/test/extensions/quic_listeners/quiche/envoy_quic_proof_source_test.cc +@@ -25,7 +25,7 @@ namespace Quic { + class TestGetProofCallback : public quic::ProofSource::Callback { + public: + TestGetProofCallback(bool& called, bool should_succeed, const std::string& server_config, +- quic::QuicTransportVersion& version, quiche::QuicheStringPiece chlo_hash, ++ quic::QuicTransportVersion& version, absl::string_view chlo_hash, + Network::FilterChain& filter_chain) + : called_(called), should_succeed_(should_succeed), server_config_(server_config), + version_(version), chlo_hash_(chlo_hash), expected_filter_chain_(filter_chain) { +@@ -100,7 +100,7 @@ private: + bool should_succeed_; + const std::string& server_config_; + const quic::QuicTransportVersion& version_; +- quiche::QuicheStringPiece chlo_hash_; ++ absl::string_view chlo_hash_; + Network::FilterChain& expected_filter_chain_; + NiceMock<Stats::MockStore> store_; + Event::GlobalTimeSystem time_system_; +@@ -178,7 +178,7 @@ protected: + quic::QuicSocketAddress server_address_; + quic::QuicSocketAddress client_address_; + quic::QuicTransportVersion version_{quic::QUIC_VERSION_UNSUPPORTED}; +- quiche::QuicheStringPiece chlo_hash_{"aaaaa"}; ++ absl::string_view chlo_hash_{"aaaaa"}; + std::string server_config_{"Server Config"}; + std::string expected_certs_{quic::test::kTestCertificateChainPem}; + std::string pkey_{quic::test::kTestCertificatePrivateKeyPem}; +diff --git a/test/extensions/quic_listeners/quiche/envoy_quic_proof_verifier_test.cc b/test/extensions/quic_listeners/quiche/envoy_quic_proof_verifier_test.cc +index 4a1dfe144..9cdc169cd 100644 +--- a/test/extensions/quic_listeners/quiche/envoy_quic_proof_verifier_test.cc ++++ b/test/extensions/quic_listeners/quiche/envoy_quic_proof_verifier_test.cc +@@ -163,7 +163,7 @@ TEST_F(EnvoyQuicProofVerifierTest, VerifyProofFailureEmptyCertChain) { + std::unique_ptr<quic::CertificateView> cert_view = + quic::CertificateView::ParseSingleCertificate(leaf_cert_); + quic::QuicTransportVersion version{quic::QUIC_VERSION_UNSUPPORTED}; +- quiche::QuicheStringPiece chlo_hash{"aaaaa"}; ++ absl::string_view chlo_hash{"aaaaa"}; + std::string server_config{"Server Config"}; + const std::string ocsp_response; + const std::string cert_sct; +@@ -181,7 +181,7 @@ TEST_F(EnvoyQuicProofVerifierTest, VerifyProofFailureInvalidLeafCert) { + std::unique_ptr<quic::CertificateView> cert_view = + quic::CertificateView::ParseSingleCertificate(leaf_cert_); + quic::QuicTransportVersion version{quic::QUIC_VERSION_UNSUPPORTED}; +- quiche::QuicheStringPiece chlo_hash{"aaaaa"}; ++ absl::string_view chlo_hash{"aaaaa"}; + std::string server_config{"Server Config"}; + const std::string ocsp_response; + const std::string cert_sct; +@@ -197,7 +197,7 @@ TEST_F(EnvoyQuicProofVerifierTest, VerifyProofFailureInvalidLeafCert) { + TEST_F(EnvoyQuicProofVerifierTest, VerifyProofFailureUnsupportedECKey) { + configCertVerificationDetails(true); + quic::QuicTransportVersion version{quic::QUIC_VERSION_UNSUPPORTED}; +- quiche::QuicheStringPiece chlo_hash{"aaaaa"}; ++ absl::string_view chlo_hash{"aaaaa"}; + std::string server_config{"Server Config"}; + const std::string ocsp_response; + const std::string cert_sct; +@@ -236,7 +236,7 @@ TEST_F(EnvoyQuicProofVerifierTest, VerifyProofFailureInvalidSignature) { + std::unique_ptr<quic::CertificateView> cert_view = + quic::CertificateView::ParseSingleCertificate(leaf_cert_); + quic::QuicTransportVersion version{quic::QUIC_VERSION_UNSUPPORTED}; +- quiche::QuicheStringPiece chlo_hash{"aaaaa"}; ++ absl::string_view chlo_hash{"aaaaa"}; + std::string server_config{"Server Config"}; + const std::string ocsp_response; + const std::string cert_sct; +diff --git a/test/extensions/quic_listeners/quiche/envoy_quic_server_session_test.cc b/test/extensions/quic_listeners/quiche/envoy_quic_server_session_test.cc +index 05307c6b9..4fc376857 100644 +--- a/test/extensions/quic_listeners/quiche/envoy_quic_server_session_test.cc ++++ b/test/extensions/quic_listeners/quiche/envoy_quic_server_session_test.cc +@@ -61,6 +61,7 @@ public: + const quic::ParsedQuicVersionVector& supported_versions, + Network::Socket& listen_socket) + : EnvoyQuicServerConnection(quic::test::TestConnectionId(), ++ quic::QuicSocketAddress(quic::QuicIpAddress::Any4(), 12345), + quic::QuicSocketAddress(quic::QuicIpAddress::Loopback4(), 12345), + helper, alarm_factory, &writer, /*owns_writer=*/false, + supported_versions, listen_socket) {} +@@ -201,10 +202,10 @@ public: + crypto_stream_ = test_crypto_stream; + } + quic::test::QuicServerSessionBasePeer::SetCryptoStream(&envoy_quic_session_, crypto_stream); +- quic_connection_->SetDefaultEncryptionLevel(quic::ENCRYPTION_FORWARD_SECURE); + quic_connection_->SetEncrypter( + quic::ENCRYPTION_FORWARD_SECURE, + std::make_unique<quic::NullEncrypter>(quic::Perspective::IS_SERVER)); ++ quic_connection_->SetDefaultEncryptionLevel(quic::ENCRYPTION_FORWARD_SECURE); + } + + bool installReadFilter() { +diff --git a/test/extensions/quic_listeners/quiche/envoy_quic_server_stream_test.cc b/test/extensions/quic_listeners/quiche/envoy_quic_server_stream_test.cc +index c2fd31c6f..f602e2c9a 100644 +--- a/test/extensions/quic_listeners/quiche/envoy_quic_server_stream_test.cc ++++ b/test/extensions/quic_listeners/quiche/envoy_quic_server_stream_test.cc +@@ -51,6 +51,7 @@ public: + POOL_GAUGE(listener_config_.listenerScope()), + POOL_HISTOGRAM(listener_config_.listenerScope()))}), + quic_connection_(quic::test::TestConnectionId(), ++ quic::QuicSocketAddress(quic::QuicIpAddress::Any6(), 123), + quic::QuicSocketAddress(quic::QuicIpAddress::Any6(), 12345), + connection_helper_, alarm_factory_, &writer_, + /*owns_writer=*/false, {quic_version_}, *listener_config_.socket_), +@@ -66,11 +67,11 @@ public: + quic_session_.ActivateStream(std::unique_ptr<EnvoyQuicServerStream>(quic_stream_)); + EXPECT_CALL(quic_session_, ShouldYield(_)).WillRepeatedly(testing::Return(false)); + EXPECT_CALL(quic_session_, WritevData(_, _, _, _, _, _)) +- .WillRepeatedly(Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, +- quic::StreamSendingState state, bool, +- quiche::QuicheOptional<quic::EncryptionLevel>) { +- return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; +- })); ++ .WillRepeatedly( ++ Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, ++ quic::StreamSendingState state, bool, absl::optional<quic::EncryptionLevel>) { ++ return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; ++ })); + EXPECT_CALL(writer_, WritePacket(_, _, _, _, _)) + .WillRepeatedly(Invoke([](const char*, size_t buf_len, const quic::QuicIpAddress&, + const quic::QuicSocketAddress&, quic::PerPacketOptions*) { +@@ -110,7 +111,7 @@ public: + std::unique_ptr<char[]> data_buffer; + quic::QuicByteCount data_frame_header_length = + quic::HttpEncoder::SerializeDataFrameHeader(body.length(), &data_buffer); +- quiche::QuicheStringPiece data_frame_header(data_buffer.get(), data_frame_header_length); ++ absl::string_view data_frame_header(data_buffer.get(), data_frame_header_length); + data = absl::StrCat(data_frame_header, body); + } + return data; +@@ -397,11 +398,11 @@ TEST_P(EnvoyQuicServerStreamTest, HeadersContributeToWatermarkIquic) { + + // Make the stream blocked by congestion control. + EXPECT_CALL(quic_session_, WritevData(_, _, _, _, _, _)) +- .WillOnce(Invoke([](quic::QuicStreamId, size_t /*write_length*/, quic::QuicStreamOffset, +- quic::StreamSendingState state, bool, +- quiche::QuicheOptional<quic::EncryptionLevel>) { +- return quic::QuicConsumedData{0u, state != quic::NO_FIN}; +- })); ++ .WillOnce( ++ Invoke([](quic::QuicStreamId, size_t /*write_length*/, quic::QuicStreamOffset, ++ quic::StreamSendingState state, bool, absl::optional<quic::EncryptionLevel>) { ++ return quic::QuicConsumedData{0u, state != quic::NO_FIN}; ++ })); + quic_stream_->encodeHeaders(response_headers_, /*end_stream=*/false); + + // Encode 16kB -10 bytes request body. Because the high watermark is 16KB, with previously +@@ -415,11 +416,11 @@ TEST_P(EnvoyQuicServerStreamTest, HeadersContributeToWatermarkIquic) { + // Unblock writing now, and this will write out 16kB data and cause stream to + // be blocked by the flow control limit. + EXPECT_CALL(quic_session_, WritevData(_, _, _, _, _, _)) +- .WillOnce(Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, +- quic::StreamSendingState state, bool, +- quiche::QuicheOptional<quic::EncryptionLevel>) { +- return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; +- })); ++ .WillOnce( ++ Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, ++ quic::StreamSendingState state, bool, absl::optional<quic::EncryptionLevel>) { ++ return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; ++ })); + EXPECT_CALL(stream_callbacks_, onBelowWriteBufferLowWatermark()); + quic_session_.OnCanWrite(); + EXPECT_TRUE(quic_stream_->IsFlowControlBlocked()); +@@ -429,20 +430,20 @@ TEST_P(EnvoyQuicServerStreamTest, HeadersContributeToWatermarkIquic) { + 32 * 1024); + quic_stream_->OnWindowUpdateFrame(window_update1); + EXPECT_CALL(quic_session_, WritevData(_, _, _, _, _, _)) +- .WillOnce(Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, +- quic::StreamSendingState state, bool, +- quiche::QuicheOptional<quic::EncryptionLevel>) { +- return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; +- })); ++ .WillOnce( ++ Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, ++ quic::StreamSendingState state, bool, absl::optional<quic::EncryptionLevel>) { ++ return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; ++ })); + quic_session_.OnCanWrite(); + // No data should be buffered at this point. + + EXPECT_CALL(quic_session_, WritevData(_, _, _, _, _, _)) +- .WillRepeatedly(Invoke([](quic::QuicStreamId, size_t, quic::QuicStreamOffset, +- quic::StreamSendingState state, bool, +- quiche::QuicheOptional<quic::EncryptionLevel>) { +- return quic::QuicConsumedData{0u, state != quic::NO_FIN}; +- })); ++ .WillRepeatedly( ++ Invoke([](quic::QuicStreamId, size_t, quic::QuicStreamOffset, ++ quic::StreamSendingState state, bool, absl::optional<quic::EncryptionLevel>) { ++ return quic::QuicConsumedData{0u, state != quic::NO_FIN}; ++ })); + // Send more data. If watermark bytes counting were not cleared in previous + // OnCanWrite, this write would have caused the stream to exceed its high watermark. + std::string response1(16 * 1024 - 3, 'a'); +diff --git a/test/extensions/quic_listeners/quiche/platform/BUILD b/test/extensions/quic_listeners/quiche/platform/BUILD +index 420e812b8..7dbb08d82 100644 +--- a/test/extensions/quic_listeners/quiche/platform/BUILD ++++ b/test/extensions/quic_listeners/quiche/platform/BUILD +@@ -9,16 +9,6 @@ licenses(["notice"]) # Apache 2 + + envoy_package() + +-envoy_cc_test( +- name = "quiche_platform_test", +- srcs = ["quiche_platform_test.cc"], +- external_deps = ["quiche_common_platform"], +- deps = [ +- "@com_googlesource_quiche//:quiche_common_platform", +- "@com_googlesource_quiche//:quiche_common_platform_endian", +- ], +-) +- + envoy_cc_test( + name = "http2_platform_test", + srcs = ["http2_platform_test.cc"], +@@ -63,7 +53,6 @@ envoy_cc_test( + "@com_googlesource_quiche//:quic_platform_mem_slice_span", + "@com_googlesource_quiche//:quic_platform_mem_slice_storage", + "@com_googlesource_quiche//:quic_platform_mock_log", +- "@com_googlesource_quiche//:quic_platform_port_utils", + "@com_googlesource_quiche//:quic_platform_sleep", + "@com_googlesource_quiche//:quic_platform_system_event_loop", + "@com_googlesource_quiche//:quic_platform_test", +@@ -150,17 +139,6 @@ envoy_cc_test_library( + deps = ["@com_googlesource_quiche//:quic_platform_base"], + ) + +-envoy_cc_test_library( +- name = "quic_platform_port_utils_impl_lib", +- srcs = ["quic_port_utils_impl.cc"], +- hdrs = ["quic_port_utils_impl.h"], +- tags = ["nofips"], +- deps = [ +- "//source/common/network:utility_lib", +- "//test/test_common:environment_lib", +- ], +-) +- + envoy_cc_test_library( + name = "quic_platform_test_mem_slice_vector_impl_lib", + hdrs = ["quic_test_mem_slice_vector_impl.h"], +diff --git a/test/extensions/quic_listeners/quiche/platform/http2_platform_test.cc b/test/extensions/quic_listeners/quiche/platform/http2_platform_test.cc +index 069a79eab..35aee5d27 100644 +--- a/test/extensions/quic_listeners/quiche/platform/http2_platform_test.cc ++++ b/test/extensions/quic_listeners/quiche/platform/http2_platform_test.cc +@@ -72,20 +72,14 @@ TEST(Http2PlatformTest, Http2Log) { + HTTP2_DLOG_EVERY_N(ERROR, 2) << "DLOG_EVERY_N(ERROR, 2)"; + } + +-TEST(Http2PlatformTest, Http2StringPiece) { +- std::string s = "bar"; +- quiche::QuicheStringPiece sp(s); +- EXPECT_EQ('b', sp[0]); +-} +- + TEST(Http2PlatformTest, Http2Macro) { + EXPECT_DEBUG_DEATH(HTTP2_UNREACHABLE(), ""); + EXPECT_DEATH(HTTP2_DIE_IF_NULL(nullptr), ""); + } + + TEST(Http2PlatformTest, Http2Flags) { +- auto& flag_registry = quiche::FlagRegistry::GetInstance(); +- flag_registry.ResetFlags(); ++ auto& flag_registry = quiche::FlagRegistry::getInstance(); ++ flag_registry.resetFlags(); + EXPECT_FALSE(GetHttp2ReloadableFlag(http2_testonly_default_false)); + SetHttp2ReloadableFlag(http2_testonly_default_false, true); + EXPECT_TRUE(GetHttp2ReloadableFlag(http2_testonly_default_false)); +@@ -93,22 +87,22 @@ TEST(Http2PlatformTest, Http2Flags) { + for (std::string s : {"1", "t", "true", "TRUE", "y", "yes", "Yes"}) { + SetHttp2ReloadableFlag(http2_testonly_default_false, false); + EXPECT_FALSE(GetHttp2ReloadableFlag(http2_testonly_default_false)); +- EXPECT_TRUE(flag_registry.FindFlag("http2_reloadable_flag_http2_testonly_default_false") +- ->SetValueFromString(s)); ++ EXPECT_TRUE(flag_registry.findFlag("FLAGS_quic_reloadable_flag_http2_testonly_default_false") ++ ->setValueFromString(s)); + EXPECT_TRUE(GetHttp2ReloadableFlag(http2_testonly_default_false)); + } + for (std::string s : {"0", "f", "false", "FALSE", "n", "no", "No"}) { + SetHttp2ReloadableFlag(http2_testonly_default_false, true); + EXPECT_TRUE(GetHttp2ReloadableFlag(http2_testonly_default_false)); +- EXPECT_TRUE(flag_registry.FindFlag("http2_reloadable_flag_http2_testonly_default_false") +- ->SetValueFromString(s)); ++ EXPECT_TRUE(flag_registry.findFlag("FLAGS_quic_reloadable_flag_http2_testonly_default_false") ++ ->setValueFromString(s)); + EXPECT_FALSE(GetHttp2ReloadableFlag(http2_testonly_default_false)); + } + for (std::string s : {"some", "invalid", "values", ""}) { + SetHttp2ReloadableFlag(http2_testonly_default_false, false); + EXPECT_FALSE(GetHttp2ReloadableFlag(http2_testonly_default_false)); +- EXPECT_FALSE(flag_registry.FindFlag("http2_reloadable_flag_http2_testonly_default_false") +- ->SetValueFromString(s)); ++ EXPECT_FALSE(flag_registry.findFlag("FLAGS_quic_reloadable_flag_http2_testonly_default_false") ++ ->setValueFromString(s)); + EXPECT_FALSE(GetHttp2ReloadableFlag(http2_testonly_default_false)); + } + } +diff --git a/test/extensions/quic_listeners/quiche/platform/quic_platform_test.cc b/test/extensions/quic_listeners/quiche/platform/quic_platform_test.cc +index 68141aa94..902ad1a9e 100644 +--- a/test/extensions/quic_listeners/quiche/platform/quic_platform_test.cc ++++ b/test/extensions/quic_listeners/quiche/platform/quic_platform_test.cc +@@ -30,7 +30,6 @@ + #include "gtest/gtest.h" + #include "quiche/common/platform/api/quiche_string_piece.h" + #include "quiche/epoll_server/fake_simple_epoll_server.h" +-#include "quiche/quic/platform/api/quic_aligned.h" + #include "quiche/quic/platform/api/quic_bug_tracker.h" + #include "quiche/quic/platform/api/quic_cert_utils.h" + #include "quiche/quic/platform/api/quic_client_stats.h" +@@ -42,7 +41,6 @@ + #include "quiche/quic/platform/api/quic_flags.h" + #include "quiche/quic/platform/api/quic_hostname_utils.h" + #include "quiche/quic/platform/api/quic_logging.h" +-#include "quiche/quic/platform/api/quic_macros.h" + #include "quiche/quic/platform/api/quic_map_util.h" + #include "quiche/quic/platform/api/quic_mem_slice.h" + #include "quiche/quic/platform/api/quic_mem_slice_span.h" +@@ -50,7 +48,6 @@ + #include "quiche/quic/platform/api/quic_mock_log.h" + #include "quiche/quic/platform/api/quic_mutex.h" + #include "quiche/quic/platform/api/quic_pcc_sender.h" +-#include "quiche/quic/platform/api/quic_port_utils.h" + #include "quiche/quic/platform/api/quic_ptr_util.h" + #include "quiche/quic/platform/api/quic_server_stats.h" + #include "quiche/quic/platform/api/quic_sleep.h" +@@ -92,8 +89,6 @@ protected: + const int verbosity_log_threshold_; + }; + +-TEST_F(QuicPlatformTest, QuicAlignOf) { EXPECT_LT(0, QUIC_ALIGN_OF(int)); } +- + enum class TestEnum { ZERO = 0, ONE, TWO, COUNT }; + + TEST_F(QuicPlatformTest, QuicBugTracker) { +@@ -468,9 +463,9 @@ TEST_F(QuicPlatformTest, QuicCertUtils) { + unsigned char* der = nullptr; + int len = i2d_X509(x509_cert.get(), &der); + ASSERT_GT(len, 0); +- quiche::QuicheStringPiece out; ++ absl::string_view out; + QuicCertUtils::ExtractSubjectNameFromDERCert( +- quiche::QuicheStringPiece(reinterpret_cast<const char*>(der), len), &out); ++ absl::string_view(reinterpret_cast<const char*>(der), len), &out); + EXPECT_EQ("0z1\v0\t\x6\x3U\x4\x6\x13\x2US1\x13" + "0\x11\x6\x3U\x4\b\f\nCalifornia1\x16" + "0\x14\x6\x3U\x4\a\f\rSan Francisco1\r" +@@ -566,8 +561,8 @@ TEST_F(QuicPlatformTest, MonotonicityWithFakeEpollClock) { + } + + TEST_F(QuicPlatformTest, QuicFlags) { +- auto& flag_registry = quiche::FlagRegistry::GetInstance(); +- flag_registry.ResetFlags(); ++ auto& flag_registry = quiche::FlagRegistry::getInstance(); ++ flag_registry.resetFlags(); + + EXPECT_FALSE(GetQuicReloadableFlag(quic_testonly_default_false)); + EXPECT_TRUE(GetQuicReloadableFlag(quic_testonly_default_true)); +@@ -583,14 +578,15 @@ TEST_F(QuicPlatformTest, QuicFlags) { + SetQuicFlag(FLAGS_quic_time_wait_list_seconds, 100); + EXPECT_EQ(100, GetQuicFlag(FLAGS_quic_time_wait_list_seconds)); + +- flag_registry.ResetFlags(); ++ flag_registry.resetFlags(); + EXPECT_FALSE(GetQuicReloadableFlag(quic_testonly_default_false)); + EXPECT_TRUE(GetQuicRestartFlag(quic_testonly_default_true)); + EXPECT_EQ(200, GetQuicFlag(FLAGS_quic_time_wait_list_seconds)); +- flag_registry.FindFlag("quic_reloadable_flag_quic_testonly_default_false") +- ->SetValueFromString("true"); +- flag_registry.FindFlag("quic_restart_flag_quic_testonly_default_true")->SetValueFromString("0"); +- flag_registry.FindFlag("quic_time_wait_list_seconds")->SetValueFromString("100"); ++ flag_registry.findFlag("FLAGS_quic_reloadable_flag_quic_testonly_default_false") ++ ->setValueFromString("true"); ++ flag_registry.findFlag("FLAGS_quic_restart_flag_quic_testonly_default_true") ++ ->setValueFromString("0"); ++ flag_registry.findFlag("FLAGS_quic_time_wait_list_seconds")->setValueFromString("100"); + EXPECT_TRUE(GetQuicReloadableFlag(quic_testonly_default_false)); + EXPECT_FALSE(GetQuicRestartFlag(quic_testonly_default_true)); + EXPECT_EQ(100, GetQuicFlag(FLAGS_quic_time_wait_list_seconds)); +@@ -661,35 +657,6 @@ TEST_F(FileUtilsTest, ReadFileContents) { + EXPECT_EQ(data, output); + } + +-TEST_F(QuicPlatformTest, PickUnsedPort) { +- int port = QuicPickServerPortForTestsOrDie(); +- std::vector<Envoy::Network::Address::IpVersion> supported_versions = +- Envoy::TestEnvironment::getIpVersionsForTest(); +- for (auto ip_version : supported_versions) { +- Envoy::Network::Address::InstanceConstSharedPtr addr = +- Envoy::Network::Test::getCanonicalLoopbackAddress(ip_version); +- Envoy::Network::Address::InstanceConstSharedPtr addr_with_port = +- Envoy::Network::Utility::getAddressWithPort(*addr, port); +- Envoy::Network::SocketImpl sock(Envoy::Network::Socket::Type::Datagram, addr_with_port); +- // binding of given port should success. +- EXPECT_EQ(0, sock.bind(addr_with_port).rc_); +- } +-} +- +-TEST_F(QuicPlatformTest, FailToPickUnsedPort) { +- Envoy::Api::MockOsSysCalls os_sys_calls; +- Envoy::TestThreadsafeSingletonInjector<Envoy::Api::OsSysCallsImpl> os_calls(&os_sys_calls); +- // Actually create sockets. +- EXPECT_CALL(os_sys_calls, socket(_, _, _)).WillRepeatedly([](int domain, int type, int protocol) { +- os_fd_t fd = ::socket(domain, type, protocol); +- return Envoy::Api::SysCallSocketResult{fd, errno}; +- }); +- // Fail bind call's to mimic port exhaustion. +- EXPECT_CALL(os_sys_calls, bind(_, _, _)) +- .WillRepeatedly(Return(Envoy::Api::SysCallIntResult{-1, SOCKET_ERROR_ADDR_IN_USE})); +- EXPECT_DEATH(QuicPickServerPortForTestsOrDie(), "Failed to pick a port for test."); +-} +- + TEST_F(QuicPlatformTest, TestEnvoyQuicBufferAllocator) { + QuicStreamBufferAllocator allocator; + Envoy::Stats::TestUtil::MemoryTest memory_test; +@@ -711,14 +678,6 @@ TEST_F(QuicPlatformTest, TestSystemEventLoop) { + QuicSystemEventLoop("dummy"); + } + +-QUIC_MUST_USE_RESULT bool dummyTestFunction() { return false; } +- +-TEST_F(QuicPlatformTest, TestQuicMacros) { +- // Just make sure it compiles. +- EXPECT_FALSE(dummyTestFunction()); +- int a QUIC_UNUSED; +-} +- + TEST(EnvoyQuicMemSliceTest, ConstructMemSliceFromBuffer) { + std::string str(512, 'b'); + // Fragment needs to out-live buffer. +diff --git a/test/extensions/quic_listeners/quiche/platform/quic_test_output_impl.cc b/test/extensions/quic_listeners/quiche/platform/quic_test_output_impl.cc +index 556f6cd3e..9eaf8532a 100644 +--- a/test/extensions/quic_listeners/quiche/platform/quic_test_output_impl.cc ++++ b/test/extensions/quic_listeners/quiche/platform/quic_test_output_impl.cc +@@ -19,7 +19,7 @@ + namespace quic { + namespace { + +-void QuicRecordTestOutputToFile(const std::string& filename, quiche::QuicheStringPiece data) { ++void quicRecordTestOutputToFile(const std::string& filename, absl::string_view data) { + const char* output_dir_env = std::getenv("QUIC_TEST_OUTPUT_DIR"); + if (output_dir_env == nullptr) { + QUIC_LOG(WARNING) << "Could not save test output since QUIC_TEST_OUTPUT_DIR is not set"; +@@ -64,11 +64,13 @@ void QuicRecordTestOutputToFile(const std::string& filename, quiche::QuicheStrin + } + } // namespace + +-void QuicSaveTestOutputImpl(quiche::QuicheStringPiece filename, quiche::QuicheStringPiece data) { +- QuicRecordTestOutputToFile(filename.data(), data); ++// NOLINTNEXTLINE(readability-identifier-naming) ++void QuicSaveTestOutputImpl(absl::string_view filename, absl::string_view data) { ++ quicRecordTestOutputToFile(filename.data(), data); + } + +-bool QuicLoadTestOutputImpl(quiche::QuicheStringPiece filename, std::string* data) { ++// NOLINTNEXTLINE(readability-identifier-naming) ++bool QuicLoadTestOutputImpl(absl::string_view filename, std::string* data) { + const char* read_dir_env = std::getenv("QUIC_TEST_OUTPUT_DIR"); + if (read_dir_env == nullptr) { + QUIC_LOG(WARNING) << "Could not load test output since QUIC_TEST_OUTPUT_DIR is not set"; +@@ -96,7 +98,8 @@ bool QuicLoadTestOutputImpl(quiche::QuicheStringPiece filename, std::string* dat + return true; + } + +-void QuicRecordTraceImpl(quiche::QuicheStringPiece identifier, quiche::QuicheStringPiece data) { ++// NOLINTNEXTLINE(readability-identifier-naming) ++void QuicRecordTraceImpl(absl::string_view identifier, absl::string_view data) { + const testing::TestInfo* test_info = testing::UnitTest::GetInstance()->current_test_info(); + + std::string timestamp = absl::FormatTime("%Y%m%d%H%M%S", absl::Now(), absl::LocalTimeZone()); +@@ -104,7 +107,7 @@ void QuicRecordTraceImpl(quiche::QuicheStringPiece identifier, quiche::QuicheStr + std::string filename = fmt::sprintf("%s.%s.%s.%s.qtr", test_info->name(), + test_info->test_case_name(), identifier.data(), timestamp); + +- QuicRecordTestOutputToFile(filename, data); ++ quicRecordTestOutputToFile(filename, data); + } + + } // namespace quic +diff --git a/test/extensions/quic_listeners/quiche/platform/quic_test_output_impl.h b/test/extensions/quic_listeners/quiche/platform/quic_test_output_impl.h +index a1c6c7305..fcf0c47b3 100644 +--- a/test/extensions/quic_listeners/quiche/platform/quic_test_output_impl.h ++++ b/test/extensions/quic_listeners/quiche/platform/quic_test_output_impl.h +@@ -6,14 +6,16 @@ + // consumed or referenced directly by other Envoy code. It serves purely as a + // porting layer for QUICHE. + +-#include "quiche/common/platform/api/quiche_string_piece.h" ++#include "absl/strings/string_view.h" + + namespace quic { ++// NOLINTNEXTLINE(readability-identifier-naming) ++void QuicSaveTestOutputImpl(absl::string_view filename, absl::string_view data); + +-void QuicSaveTestOutputImpl(quiche::QuicheStringPiece filename, quiche::QuicheStringPiece data); ++// NOLINTNEXTLINE(readability-identifier-naming) ++bool QuicLoadTestOutputImpl(absl::string_view filename, std::string* data); + +-bool QuicLoadTestOutputImpl(quiche::QuicheStringPiece filename, std::string* data); +- +-void QuicRecordTraceImpl(quiche::QuicheStringPiece identifier, quiche::QuicheStringPiece data); ++// NOLINTNEXTLINE(readability-identifier-naming) ++void QuicRecordTraceImpl(absl::string_view identifier, absl::string_view data); + + } // namespace quic +diff --git a/test/extensions/quic_listeners/quiche/platform/quiche_platform_test.cc b/test/extensions/quic_listeners/quiche/platform/quiche_platform_test.cc +deleted file mode 100644 +index a733894b5..000000000 +--- a/test/extensions/quic_listeners/quiche/platform/quiche_platform_test.cc ++++ /dev/null +@@ -1,39 +0,0 @@ +-// NOLINT(namespace-envoy) +- +-// This file is part of the QUICHE platform implementation, and is not to be +-// consumed or referenced directly by other Envoy code. It serves purely as a +-// porting layer for QUICHE. +- +-#include "gtest/gtest.h" +-#include "quiche/common/platform/api/quiche_arraysize.h" +-#include "quiche/common/platform/api/quiche_endian.h" +-#include "quiche/common/platform/api/quiche_optional.h" +-#include "quiche/common/platform/api/quiche_ptr_util.h" +-#include "quiche/common/platform/api/quiche_string_piece.h" +- +-namespace quiche { +- +-TEST(QuichePlatformTest, Arraysize) { +- int array[] = {0, 1, 2, 3, 4}; +- EXPECT_EQ(5, QUICHE_ARRAYSIZE(array)); +-} +- +-TEST(QuichePlatformTest, StringPiece) { +- std::string s = "bar"; +- QuicheStringPiece sp(s); +- EXPECT_EQ('b', sp[0]); +-} +- +-TEST(QuichePlatformTest, WrapUnique) { +- auto p = QuicheWrapUnique(new int(6)); +- EXPECT_EQ(6, *p); +-} +- +-TEST(QuichePlatformTest, TestQuicheOptional) { +- QuicheOptional<int32_t> maybe_a; +- EXPECT_FALSE(maybe_a.has_value()); +- maybe_a = 1; +- EXPECT_EQ(1, *maybe_a); +-} +- +-} // namespace quiche +diff --git a/test/extensions/quic_listeners/quiche/platform/spdy_platform_test.cc b/test/extensions/quic_listeners/quiche/platform/spdy_platform_test.cc +index 56453e232..eeae58c0a 100644 +--- a/test/extensions/quic_listeners/quiche/platform/spdy_platform_test.cc ++++ b/test/extensions/quic_listeners/quiche/platform/spdy_platform_test.cc +@@ -8,7 +8,6 @@ + #include "gtest/gtest.h" + #include "quiche/spdy/platform/api/spdy_bug_tracker.h" + #include "quiche/spdy/platform/api/spdy_containers.h" +-#include "quiche/spdy/platform/api/spdy_endianness_util.h" + #include "quiche/spdy/platform/api/spdy_estimate_memory_usage.h" + #include "quiche/spdy/platform/api/spdy_flags.h" + #include "quiche/spdy/platform/api/spdy_logging.h" +@@ -47,11 +46,6 @@ TEST(SpdyPlatformTest, SpdyHashSet) { + EXPECT_EQ(0, hset.count("qux")); + } + +-TEST(SpdyPlatformTest, SpdyEndianness) { +- EXPECT_EQ(0x1234, spdy::SpdyNetToHost16(spdy::SpdyHostToNet16(0x1234))); +- EXPECT_EQ(0x12345678, spdy::SpdyNetToHost32(spdy::SpdyHostToNet32(0x12345678))); +-} +- + TEST(SpdyPlatformTest, SpdyEstimateMemoryUsage) { + std::string s = "foo"; + // Stubbed out to always return 0. +@@ -92,19 +86,19 @@ TEST(SpdyPlatformTest, SpdyTestHelpers) { + } + + TEST(SpdyPlatformTest, SpdyFlags) { +- auto& flag_registry = quiche::FlagRegistry::GetInstance(); +- flag_registry.ResetFlags(); ++ auto& flag_registry = quiche::FlagRegistry::getInstance(); ++ flag_registry.resetFlags(); + EXPECT_FALSE(GetSpdyReloadableFlag(spdy_testonly_default_false)); + EXPECT_FALSE(GetSpdyRestartFlag(spdy_testonly_default_false)); + +- flag_registry.FindFlag("spdy_reloadable_flag_spdy_testonly_default_false") +- ->SetValueFromString("true"); ++ flag_registry.findFlag("FLAGS_quic_reloadable_flag_spdy_testonly_default_false") ++ ->setValueFromString("true"); + EXPECT_TRUE(GetSpdyReloadableFlag(spdy_testonly_default_false)); + EXPECT_FALSE(GetSpdyRestartFlag(spdy_testonly_default_false)); + +- flag_registry.ResetFlags(); +- flag_registry.FindFlag("spdy_restart_flag_spdy_testonly_default_false") +- ->SetValueFromString("yes"); ++ flag_registry.resetFlags(); ++ flag_registry.findFlag("FLAGS_quic_restart_flag_spdy_testonly_default_false") ++ ->setValueFromString("yes"); + EXPECT_FALSE(GetSpdyReloadableFlag(spdy_testonly_default_false)); + EXPECT_TRUE(GetSpdyRestartFlag(spdy_testonly_default_false)); + } +diff --git a/test/extensions/quic_listeners/quiche/test_proof_source.h b/test/extensions/quic_listeners/quiche/test_proof_source.h +index a249b4314..bbedfd6c7 100644 +--- a/test/extensions/quic_listeners/quiche/test_proof_source.h ++++ b/test/extensions/quic_listeners/quiche/test_proof_source.h +@@ -36,7 +36,7 @@ protected: + void signPayload(const quic::QuicSocketAddress& /*server_address*/, + const quic::QuicSocketAddress& /*client_address*/, + const std::string& /*hostname*/, uint16_t /*signature_algorithm*/, +- quiche::QuicheStringPiece in, ++ absl::string_view in, + std::unique_ptr<quic::ProofSource::SignatureCallback> callback) override { + callback->Run(true, absl::StrCat("Fake signature for { ", in, " }"), + std::make_unique<EnvoyQuicProofSourceDetails>(filter_chain_)); +diff --git a/test/extensions/quic_listeners/quiche/test_utils.h b/test/extensions/quic_listeners/quiche/test_utils.h +index 102f7608e..7f0ea78e8 100644 +--- a/test/extensions/quic_listeners/quiche/test_utils.h ++++ b/test/extensions/quic_listeners/quiche/test_utils.h +@@ -46,7 +46,7 @@ public: + MOCK_METHOD(quic::QuicConsumedData, WritevData, + (quic::QuicStreamId id, size_t write_length, quic::QuicStreamOffset offset, + quic::StreamSendingState state, quic::TransmissionType type, +- quiche::QuicheOptional<quic::EncryptionLevel> level)); ++ absl::optional<quic::EncryptionLevel> level)); + MOCK_METHOD(bool, ShouldYield, (quic::QuicStreamId id)); + + absl::string_view requestedServerName() const override { +@@ -90,7 +90,7 @@ public: + MOCK_METHOD(quic::QuicConsumedData, WritevData, + (quic::QuicStreamId id, size_t write_length, quic::QuicStreamOffset offset, + quic::StreamSendingState state, quic::TransmissionType type, +- quiche::QuicheOptional<quic::EncryptionLevel> level)); ++ absl::optional<quic::EncryptionLevel> level)); + MOCK_METHOD(bool, ShouldYield, (quic::QuicStreamId id)); + + absl::string_view requestedServerName() const override { +-- +2.29.2 + diff --git a/pkgs/servers/http/envoy/0002-Add-upb-patch-to-make-it-compile-under-GCC10.patch b/pkgs/servers/http/envoy/0002-Add-upb-patch-to-make-it-compile-under-GCC10.patch new file mode 100644 index 00000000000..370682efaa3 --- /dev/null +++ b/pkgs/servers/http/envoy/0002-Add-upb-patch-to-make-it-compile-under-GCC10.patch @@ -0,0 +1,91 @@ +From 8b531c41f956b27e4be32b430db2e7a44e0cdd3e Mon Sep 17 00:00:00 2001 +From: Luke Granger-Brown <git@lukegb.com> +Date: Thu, 7 Jan 2021 11:09:18 +0000 +Subject: [PATCH] Add upb patch to make it compile under GCC10 + +--- + bazel/repositories.bzl | 5 +++- + bazel/upb2.patch | 55 ++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 59 insertions(+), 1 deletion(-) + create mode 100644 bazel/upb2.patch + +diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl +index 64d61ea49..c6cadc9df 100644 +--- a/bazel/repositories.bzl ++++ b/bazel/repositories.bzl +@@ -811,7 +811,10 @@ def _com_github_grpc_grpc(): + def _upb(): + _repository_impl( + name = "upb", +- patches = ["@envoy//bazel:upb.patch"], ++ patches = [ ++ "@envoy//bazel:upb.patch", ++ "@envoy//bazel:upb2.patch", ++ ], + patch_args = ["-p1"], + ) + +diff --git a/bazel/upb2.patch b/bazel/upb2.patch +new file mode 100644 +index 000000000..6e436c61b +--- /dev/null ++++ b/bazel/upb2.patch +@@ -0,0 +1,55 @@ ++From 9bd23dab4240b015321a53c45b3c9e4847fbf020 Mon Sep 17 00:00:00 2001 ++From: Joshua Haberman <jhaberman@gmail.com> ++Date: Tue, 7 Apr 2020 15:22:11 -0700 ++Subject: [PATCH] Changed upb status to suit GCC10's warning about strncpy(). ++ (#268) ++ ++Added tests for all cases. Also removed ellipses from truncated ++messages, they were more trouble than they are worth. ++--- ++ tests/test_generated_code.c | 33 +++++++++++++++++++++++++++++++++ ++ upb/upb.c | 17 +++-------------- ++ 2 files changed, 36 insertions(+), 14 deletions(-) ++ ++diff --git a/upb/upb.c b/upb/upb.c ++index cb2cdfd9d..258192d79 100644 ++--- a/upb/upb.c +++++ b/upb/upb.c ++@@ -11,17 +11,6 @@ ++ ++ #include "upb/port_def.inc" ++ ++-/* Guarantee null-termination and provide ellipsis truncation. ++- * It may be tempting to "optimize" this by initializing these final ++- * four bytes up-front and then being careful never to overwrite them, ++- * this is safer and simpler. */ ++-static void nullz(upb_status *status) { ++- const char *ellipsis = "..."; ++- size_t len = strlen(ellipsis); ++- UPB_ASSERT(sizeof(status->msg) > len); ++- memcpy(status->msg + sizeof(status->msg) - len, ellipsis, len); ++-} ++- ++ /* upb_status *****************************************************************/ ++ ++ void upb_status_clear(upb_status *status) { ++@@ -37,8 +26,8 @@ const char *upb_status_errmsg(const upb_status *status) { return status->msg; } ++ void upb_status_seterrmsg(upb_status *status, const char *msg) { ++ if (!status) return; ++ status->ok = false; ++- strncpy(status->msg, msg, sizeof(status->msg)); ++- nullz(status); +++ strncpy(status->msg, msg, UPB_STATUS_MAX_MESSAGE - 1); +++ status->msg[UPB_STATUS_MAX_MESSAGE - 1] = '\0'; ++ } ++ ++ void upb_status_seterrf(upb_status *status, const char *fmt, ...) { ++@@ -52,7 +41,7 @@ void upb_status_vseterrf(upb_status *status, const char *fmt, va_list args) { ++ if (!status) return; ++ status->ok = false; ++ _upb_vsnprintf(status->msg, sizeof(status->msg), fmt, args); ++- nullz(status); +++ status->msg[UPB_STATUS_MAX_MESSAGE - 1] = '\0'; ++ } ++ ++ /* upb_alloc ******************************************************************/ +-- +2.29.2 + diff --git a/pkgs/servers/http/envoy/default.nix b/pkgs/servers/http/envoy/default.nix new file mode 100644 index 00000000000..c297ea38245 --- /dev/null +++ b/pkgs/servers/http/envoy/default.nix @@ -0,0 +1,120 @@ +{ lib +, buildBazelPackage +, fetchFromGitHub +, stdenv +, cmake +, go +, ninja +, python3 +}: + +let + srcVer = { + # We need the commit hash, since Bazel stamps the build with it. + # However, the version string is more useful for end-users. + # These are contained in a attrset of their own to make it obvious that + # people should update both. + version = "1.16.2"; + commit = "e98e41a8e168af7acae8079fc0cd68155f699aa3"; + }; +in +buildBazelPackage rec { + pname = "envoy"; + version = srcVer.version; + src = fetchFromGitHub { + owner = "envoyproxy"; + repo = "envoy"; + rev = srcVer.commit; + hash = "sha256-aWVMRKFCZzf9/96NRPCP4jiW38DJhXyi0gEqW7uIpnQ="; + + extraPostFetch = '' + chmod -R +w $out + rm $out/.bazelversion + echo ${srcVer.commit} > $out/SOURCE_VERSION + sed -i 's/GO_VERSION = ".*"/GO_VERSION = "host"/g' $out/bazel/dependency_imports.bzl + ''; + }; + + patches = [ + # Quiche needs to be updated to compile under newer GCC. + # This is a manual backport of http://github.com/envoyproxy/envoy/pull/13949. + ./0001-quiche-update-QUICHE-tar-13949.patch + + # upb needs to be updated to compile under newer GCC. + # This is a manual backport of https://github.com/protocolbuffers/upb/commit/9bd23dab4240b015321a53c45b3c9e4847fbf020. + ./0002-Add-upb-patch-to-make-it-compile-under-GCC10.patch + ]; + postPatch = '' + sed -i 's,#!/usr/bin/env python3,#!${python3}/bin/python,' bazel/foreign_cc/luajit.patch + ''; + + nativeBuildInputs = [ + cmake + python3 + go + ninja + ]; + + fetchAttrs = { + sha256 = "sha256-mct7anzErY9eSujZyGORfRJqzAO9XuFAv04DS8VRZKM="; + dontUseCmakeConfigure = true; + preInstall = '' + # Strip out the path to the build location (by deleting the comment line). + find $bazelOut/external -name requirements.bzl | while read requirements; do + sed -i '/# Generated from /d' "$requirements" + done + + # Remove references to paths in the Nix store. + sed -i \ + -e 's,${python3},__NIXPYTHON__,' \ + -e 's,${stdenv.shellPackage},__NIXSHELL__,' \ + $bazelOut/external/com_github_luajit_luajit/build.py \ + $bazelOut/external/local_config_sh/BUILD + rm -r $bazelOut/external/go_sdk + + # Replace some wheels which are only used for tests with empty files; + # they're nondeterministically built and packed. + >$bazelOut/external/config_validation_pip3/PyYAML-5.3.1-cp38-cp38-linux_x86_64.whl + >$bazelOut/external/protodoc_pip3/PyYAML-5.3.1-cp38-cp38-linux_x86_64.whl + >$bazelOut/external/thrift_pip3/thrift-0.13.0-cp38-cp38-linux_x86_64.whl + ''; + }; + buildAttrs = { + dontUseCmakeConfigure = true; + dontUseNinjaInstall = true; + preConfigure = '' + sed -i 's,#!/usr/bin/env bash,#!${stdenv.shell},' $bazelOut/external/rules_foreign_cc/tools/build_defs/framework.bzl + + # Add paths to Nix store back. + sed -i \ + -e 's,__NIXPYTHON__,${python3},' \ + -e 's,__NIXSHELL__,${stdenv.shellPackage},' \ + $bazelOut/external/com_github_luajit_luajit/build.py \ + $bazelOut/external/local_config_sh/BUILD + ''; + installPhase = '' + install -Dm0755 bazel-bin/source/exe/envoy-static $out/bin/envoy + ''; + }; + + fetchConfigured = true; + removeRulesCC = false; + removeLocalConfigCc = true; + removeLocal = false; + bazelTarget = "//source/exe:envoy-static"; + bazelBuildFlags = [ + "-c opt" + "--spawn_strategy=standalone" + "--noexperimental_strict_action_env" + "--cxxopt=-Wno-maybe-uninitialized" + "--cxxopt=-Wno-uninitialized" + ]; + + meta = with lib; { + homepage = "https://envoyproxy.io"; + description = "Cloud-native edge and service proxy"; + license = licenses.asl20; + maintainers = with maintainers; [ lukegb ]; + platforms = [ "x86_64-linux" ]; # Other platforms will generate different fetch hashes. + }; +} diff --git a/pkgs/servers/http/gatling/default.nix b/pkgs/servers/http/gatling/default.nix index 145a045014b..e1180121a65 100644 --- a/pkgs/servers/http/gatling/default.nix +++ b/pkgs/servers/http/gatling/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A high performance web server"; homepage = "http://www.fefe.de/gatling/"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; platforms = platforms.linux; }; } diff --git a/pkgs/servers/http/gitlab-pages/default.nix b/pkgs/servers/http/gitlab-pages/default.nix index 0174f8af43f..c5ca1bf20a7 100644 --- a/pkgs/servers/http/gitlab-pages/default.nix +++ b/pkgs/servers/http/gitlab-pages/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "1.30.0"; + version = "1.34.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - sha256 = "0gn5lwn1lk1ghv6lw0fvax0m829w09mmq8flbmcxvszfyv7x0rix"; + sha256 = "sha256-bJ9BQbAe35z5cIw0HhFjM6arWf1Tdy4gRipAHywxZZk="; }; - vendorSha256 = "08zma4b58b9132h41m6frbdi502yima9lkpab87fi0q5r6qwhf1z"; + vendorSha256 = "sha256-amPL0gzvqsacj7+UNJeZOQbeiBESUttbtPHxLpDykRI="; subPackages = [ "." ]; doCheck = false; # Broken diff --git a/pkgs/servers/http/h2o/default.nix b/pkgs/servers/http/h2o/default.nix index a53be3e2aa6..b533a908ef9 100644 --- a/pkgs/servers/http/h2o/default.nix +++ b/pkgs/servers/http/h2o/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, pkgconfig, cmake, ninja +, pkg-config, cmake, ninja , openssl, libuv, zlib }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" "dev" "lib" ]; - nativeBuildInputs = [ pkgconfig cmake ninja ]; + nativeBuildInputs = [ pkg-config cmake ninja ]; buildInputs = [ openssl libuv zlib ]; meta = with lib; { diff --git a/pkgs/servers/http/hiawatha/default.nix b/pkgs/servers/http/hiawatha/default.nix index 3a4f44ebf8c..950faf89bed 100644 --- a/pkgs/servers/http/hiawatha/default.nix +++ b/pkgs/servers/http/hiawatha/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ninja ]; - buildInputs = [ mbedtls ] ++ stdenv.lib.optionals enableXslt [ libxslt libxml2 ]; + buildInputs = [ mbedtls ] ++ lib.optionals enableXslt [ libxslt libxml2 ]; prePatch = '' substituteInPlace CMakeLists.txt --replace SETUID "" diff --git a/pkgs/servers/http/hyp/default.nix b/pkgs/servers/http/hyp/default.nix index 52f345d5477..1faa85cfc14 100644 --- a/pkgs/servers/http/hyp/default.nix +++ b/pkgs/servers/http/hyp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python3Packages }: +{ lib, fetchurl, python3Packages }: python3Packages.buildPythonPackage rec { pname = "hyp-server"; diff --git a/pkgs/servers/http/jboss/jdbc/mysql/default.nix b/pkgs/servers/http/jboss/jdbc/mysql/default.nix index fd2dec44c7f..e05bf4bfce8 100644 --- a/pkgs/servers/http/jboss/jdbc/mysql/default.nix +++ b/pkgs/servers/http/jboss/jdbc/mysql/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mysql_jdbc }: +{ lib, stdenv, mysql_jdbc }: stdenv.mkDerivation { name = "jboss-mysql-jdbc"; @@ -8,6 +8,6 @@ stdenv.mkDerivation { inherit mysql_jdbc; meta = { - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix index 72e6c00278a..d95740b6d15 100644 --- a/pkgs/servers/http/jetty/default.nix +++ b/pkgs/servers/http/jetty/default.nix @@ -1,15 +1,14 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "jetty"; - version = "9.4.35.v20201120"; + version = "9.4.36.v20210114"; src = fetchurl { url = "https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz"; - name = "jetty-distribution-${version}.tar.gz"; - sha256 = "1cpdrqz6wi7fd228lh4ijs82jq51qr5aym6vff464w3y2sd0jbav"; + sha256 = "1bsqxzjcdgdg2qdgc64pvrimkn9j2di2s3prlgdpbwi566744q54"; }; - phases = [ "unpackPhase" "installPhase" ]; + dontBuild = true; installPhase = '' mkdir -p $out @@ -19,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "A Web server and javax.servlet container"; homepage = "https://www.eclipse.org/jetty/"; - platforms = stdenv.lib.platforms.all; - license = [ stdenv.lib.licenses.asl20 stdenv.lib.licenses.epl10 ]; + platforms = lib.platforms.all; + license = [ lib.licenses.asl20 lib.licenses.epl10 ]; }; } diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index a3f0b045aa1..afc7c5c7453 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPackages, fetchurl, pkgconfig, pcre, libxml2, zlib, bzip2, which, file +{ lib, stdenv, buildPackages, fetchurl, pkg-config, pcre, libxml2, zlib, bzip2, which, file , openssl, enableMagnet ? false, lua5_1 ? null , enableMysql ? false, libmysqlclient ? null , enableLdap ? false, openldap ? null @@ -15,11 +15,11 @@ assert enableWebDAV -> libuuid != null; assert enableExtendedAttrs -> attr != null; stdenv.mkDerivation rec { - name = "lighttpd-1.4.56"; + name = "lighttpd-1.4.58"; src = fetchurl { url = "https://download.lighttpd.net/lighttpd/releases-1.4.x/${name}.tar.xz"; - sha256 = "0xyzahrkmldwskwgjgj4dc3rmfmgqiwwr9y7jfhqpbp8g76q9kp4"; + sha256 = "sha256-Jn/v/aE6GQ69znsVFy2L4W2pgAhFfzD93s1ygy0SbQ4="; }; postPatch = '' @@ -30,21 +30,21 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pcre pcre.dev libxml2 zlib bzip2 which file openssl ] - ++ stdenv.lib.optional enableMagnet lua5_1 - ++ stdenv.lib.optional enableMysql libmysqlclient - ++ stdenv.lib.optional enableLdap openldap - ++ stdenv.lib.optional enableWebDAV sqlite - ++ stdenv.lib.optional enableWebDAV libuuid; + ++ lib.optional enableMagnet lua5_1 + ++ lib.optional enableMysql libmysqlclient + ++ lib.optional enableLdap openldap + ++ lib.optional enableWebDAV sqlite + ++ lib.optional enableWebDAV libuuid; configureFlags = [ "--with-openssl" ] - ++ stdenv.lib.optional enableMagnet "--with-lua" - ++ stdenv.lib.optional enableMysql "--with-mysql" - ++ stdenv.lib.optional enableLdap "--with-ldap" - ++ stdenv.lib.optional enableWebDAV "--with-webdav-props" - ++ stdenv.lib.optional enableWebDAV "--with-webdav-locks" - ++ stdenv.lib.optional enableExtendedAttrs "--with-attr"; + ++ lib.optional enableMagnet "--with-lua" + ++ lib.optional enableMysql "--with-mysql" + ++ lib.optional enableLdap "--with-ldap" + ++ lib.optional enableWebDAV "--with-webdav-props" + ++ lib.optional enableWebDAV "--with-webdav-locks" + ++ lib.optional enableExtendedAttrs "--with-attr"; preConfigure = '' export PATH=$PATH:${pcre.dev}/bin @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Lightweight high-performance web server"; homepage = "http://www.lighttpd.net/"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.bjornfor ]; }; diff --git a/pkgs/servers/http/lwan/default.nix b/pkgs/servers/http/lwan/default.nix index b1764b55369..11b580ed8a0 100644 --- a/pkgs/servers/http/lwan/default.nix +++ b/pkgs/servers/http/lwan/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, zlib, cmake, jemalloc }: +{ lib, stdenv, fetchFromGitHub, pkg-config, zlib, cmake, jemalloc }: stdenv.mkDerivation rec { pname = "lwan"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1znkcsbxw3r10prqvf2x27w1wmm9kd485pj59c364wlvqdhidwqr"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ jemalloc zlib ]; diff --git a/pkgs/servers/http/mini-httpd/default.nix b/pkgs/servers/http/mini-httpd/default.nix index 98bb27221c3..113ccf10b8a 100644 --- a/pkgs/servers/http/mini-httpd/default.nix +++ b/pkgs/servers/http/mini-httpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost }: +{ lib, stdenv, fetchurl, boost }: stdenv.mkDerivation rec { name = "mini-httpd-1.7"; @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://mini-httpd.nongnu.org/"; description = "minimalistic high-performance web server"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.peti ]; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.peti ]; }; } diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index 2b2af8966e9..251f099f7d9 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, openssl, zlib, pcre, libxml2, libxslt +{ lib, stdenv, fetchurl, fetchpatch, openssl, zlib, pcre, libxml2, libxslt , nixosTests , substituteAll, gd, geoip, perl , withDebug ? false @@ -22,7 +22,7 @@ , meta ? null }: -with stdenv.lib; +with lib; let diff --git a/pkgs/servers/http/nix-binary-cache/default.nix b/pkgs/servers/http/nix-binary-cache/default.nix index bef7f43ea71..a174d4dcb1a 100644 --- a/pkgs/servers/http/nix-binary-cache/default.nix +++ b/pkgs/servers/http/nix-binary-cache/default.nix @@ -1,4 +1,4 @@ -{stdenv +{lib, stdenv , coreutils, findutils, nix, xz, bzip2, gnused, gnugrep, openssl , lighttpd, iproute }: stdenv.mkDerivation rec { @@ -45,17 +45,17 @@ stdenv.mkDerivation rec { ''; meta = { - description = ''A set of scripts to serve the Nix store as a binary cache''; + description = "A set of scripts to serve the Nix store as a binary cache"; longDescription = '' - This package installs a CGI script that serves Nix store path in the - binary cache format. It also installs a launcher called + This package installs a CGI script that serves Nix store path in the + binary cache format. It also installs a launcher called nix-binary-cache-start that can be run without any setup to launch a binary cache and get the example arguments for its usage. ''; - maintainers = [stdenv.lib.maintainers.raskin]; - license = stdenv.lib.licenses.gpl2Plus; + maintainers = [lib.maintainers.raskin]; + license = lib.licenses.gpl2Plus; inherit version; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; hydraPlatforms = []; }; } diff --git a/pkgs/servers/http/pshs/default.nix b/pkgs/servers/http/pshs/default.nix index e8ecb16c0c5..bbac8b843b1 100644 --- a/pkgs/servers/http/pshs/default.nix +++ b/pkgs/servers/http/pshs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libevent, file, qrencode, miniupnpc }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libevent, file, qrencode, miniupnpc }: stdenv.mkDerivation rec { pname = "pshs"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1j8j4r0vsmp6226q6jdgf9bzhx3qk7vdliwaw7f8kcsrkndkg6p4"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libevent file qrencode miniupnpc ]; # SSL requires libevent at 2.1 with ssl support @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "Pretty small HTTP server - a command-line tool to share files"; homepage = "https://github.com/mgorny/pshs"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.bsd3; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/servers/http/redstore/default.nix b/pkgs/servers/http/redstore/default.nix index 80f2434e529..d4e92bc3f6c 100644 --- a/pkgs/servers/http/redstore/default.nix +++ b/pkgs/servers/http/redstore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, redland, pkgconfig, gmp, zlib, librdf_raptor2 +{ lib, stdenv, fetchurl, redland, pkg-config, gmp, zlib, librdf_raptor2 , librdf_rasqal }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0hc1fjfbfvggl72zqx27v4wy84f5m7bp4dnwd8g41aw8lgynbgaq"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gmp redland zlib librdf_raptor2 librdf_rasqal ]; preConfigure = '' @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { meta = { description = "An HTTP interface to Redland RDF store"; homepage = "https://www.aelius.com/njh/redstore/"; - maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = with stdenv.lib.platforms; + maintainers = [ lib.maintainers.raskin ]; + platforms = with lib.platforms; linux ++ freebsd ++ gnu; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; }; } diff --git a/pkgs/servers/http/showoff/gemset.nix b/pkgs/servers/http/showoff/gemset.nix index 334f09e8a0d..d493a0a7975 100644 --- a/pkgs/servers/http/showoff/gemset.nix +++ b/pkgs/servers/http/showoff/gemset.nix @@ -228,4 +228,4 @@ }; version = "2.0.9"; }; -} \ No newline at end of file +} diff --git a/pkgs/servers/http/tengine/default.nix b/pkgs/servers/http/tengine/default.nix index cc6363e75d1..d7bd2eca926 100644 --- a/pkgs/servers/http/tengine/default.nix +++ b/pkgs/servers/http/tengine/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, openssl, zlib, pcre, libxml2, libxslt +{ lib, stdenv, fetchFromGitHub, openssl, zlib, pcre, libxml2, libxslt , substituteAll, gd, geoip, gperftools, jemalloc , withDebug ? false , withMail ? false @@ -7,7 +7,7 @@ , ... }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { version = "2.3.2"; diff --git a/pkgs/servers/http/thttpd/default.nix b/pkgs/servers/http/thttpd/default.nix index 6ff1026ba0c..64e7309bc9b 100644 --- a/pkgs/servers/http/thttpd/default.nix +++ b/pkgs/servers/http/thttpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "thttpd"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Tiny/turbo/throttling HTTP server"; homepage = "http://www.acme.com/software/thttpd/"; - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.bsd2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/servers/http/tomcat/axis2/default.nix b/pkgs/servers/http/tomcat/axis2/default.nix index 59a4ab6e5b4..e383d8f0d1b 100644 --- a/pkgs/servers/http/tomcat/axis2/default.nix +++ b/pkgs/servers/http/tomcat/axis2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, apacheAnt, jdk, unzip }: +{ lib, stdenv, fetchurl, apacheAnt, jdk, unzip }: stdenv.mkDerivation rec { pname = "axis2"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "Web Services / SOAP / WSDL engine, the successor to the widely used Apache Axis SOAP stack"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.asl20; + platforms = lib.platforms.unix; + license = lib.licenses.asl20; }; } diff --git a/pkgs/servers/http/tomcat/jdbc/mysql/default.nix b/pkgs/servers/http/tomcat/jdbc/mysql/default.nix index d070a9f1740..3796d5458b2 100644 --- a/pkgs/servers/http/tomcat/jdbc/mysql/default.nix +++ b/pkgs/servers/http/tomcat/jdbc/mysql/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mysql_jdbc }: +{ lib, stdenv, mysql_jdbc }: stdenv.mkDerivation { name = "tomcat-mysql-jdbc"; @@ -8,6 +8,6 @@ stdenv.mkDerivation { inherit mysql_jdbc; meta = { - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index f4379aa6fa2..a5d5e37487a 100644 --- a/pkgs/servers/http/unit/default.nix +++ b/pkgs/servers/http/unit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, nixosTests, which +{ lib, stdenv, fetchFromGitHub, nixosTests, which , pcre2 , withPython2 ? false, python2 , withPython3 ? true, python3, ncurses @@ -15,7 +15,7 @@ , withDebug ? false }: -with stdenv.lib; +with lib; let phpConfig = { diff --git a/pkgs/servers/hydron/default.nix b/pkgs/servers/hydron/default.nix index 3a67f614348..41c69bde285 100644 --- a/pkgs/servers/hydron/default.nix +++ b/pkgs/servers/hydron/default.nix @@ -1,22 +1,22 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, ffmpeg-full, graphicsmagick -, quicktemplate, go-bindata, easyjson }: +{ lib, buildGoModule, fetchFromGitHub, pkg-config, ffmpeg }: -buildGoPackage { - pname = "hydron-unstable"; - version = "2019-02-17"; - goPackagePath = "github.com/bakape/hydron"; - goDeps = ./deps.nix; +buildGoModule rec { + pname = "hydron"; + version = "3.0.4"; src = fetchFromGitHub { owner = "bakape"; repo = "hydron"; - rev = "824789fb108966432e507143db39b358dd7ff233"; - sha256 = "1xxykjf5iyavm12gd6nx4j8x2mlzzn7x8vm0j5009lsir98qr5zn"; + rev = "v${version}"; + sha256 = "BfMkKwz7ITEnAIMGUHlBH/Dn9yLjWKoqFWupPo1s2cs="; }; - nativeBuildInputs = [ pkgconfig go-bindata ]; + nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ffmpeg-full graphicsmagick quicktemplate easyjson ]; + vendorSha256 = "1ngig5zw0gf1mkjjsfvvn09rncb36rg274cbi3glp8wzfcr8aip3"; + runVend = true; + + buildInputs = [ ffmpeg ]; meta = with lib; { homepage = "https://github.com/bakape/hydron"; diff --git a/pkgs/servers/hydron/deps.nix b/pkgs/servers/hydron/deps.nix deleted file mode 100644 index 08f165af76b..00000000000 --- a/pkgs/servers/hydron/deps.nix +++ /dev/null @@ -1,138 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/Masterminds/squirrel"; - fetch = { - type = "git"; - url = "https://github.com/Masterminds/squirrel"; - rev = "d67d6a236213ef67cff454e09ea1bf742d943f6c"; - sha256 = "0gzvnws0a29c663hjk379bybvxfmkiic3spkc985hdvn5gkbrwkq"; - }; - } - { - goPackagePath = "github.com/bakape/boorufetch"; - fetch = { - type = "git"; - url = "https://github.com/bakape/boorufetch"; - rev = "90aee10269a138a08ce49cd91635500336657a82"; - sha256 = "0zaa2b3bl2hnl4lipghl6mbvpv9sq9r7skykp26c29qy77xy99nk"; - }; - } - { - goPackagePath = "github.com/bakape/thumbnailer"; - fetch = { - type = "git"; - url = "https://github.com/bakape/thumbnailer"; - rev = "3d9565548e572a385b5a1ecf3bb9840c9ccd9949"; - sha256 = "0zriks4j694y65ryf9xkiz0sc932hskjigmk83bj1069hkgzx9dk"; - }; - } - { - goPackagePath = "github.com/chai2010/webp"; - fetch = { - type = "git"; - url = "https://github.com/chai2010/webp"; - rev = "76ae9d0b5d6d590fcc9772bf9cf0526128ee6fab"; - sha256 = "0sanh0c2bvignxnrj9vlzr2sw1bd3cgw2lg0vkn63xxjj3bqmsbh"; - }; - } - { - goPackagePath = "github.com/dimfeld/httptreemux"; - fetch = { - type = "git"; - url = "https://github.com/dimfeld/httptreemux"; - rev = "a454a10de4a11f751681a0914461ab9e98c2a3ff"; - sha256 = "0qx94lij9ldzd1xl36rl8blbgzjz9b4rkpydi44d9lik7qkdi5gp"; - }; - } - { - goPackagePath = "github.com/gorilla/handlers"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/handlers"; - rev = "ac6d24f88de4584385a0cb3a88f953d08a2f7a05"; - sha256 = "166p7yw2sy6lbxgyk722phkskmxzv3v21vf0l145zicrn30m9zli"; - }; - } - { - goPackagePath = "github.com/lann/builder"; - fetch = { - type = "git"; - url = "https://github.com/lann/builder"; - rev = "47ae307949d02aa1f1069fdafc00ca08e1dbabac"; - sha256 = "1kg9jy1rciznj627hafpq2mi7hr5d3ssgqcpwrm3bnlk9sqnydil"; - }; - } - { - goPackagePath = "github.com/lann/ps"; - fetch = { - type = "git"; - url = "https://github.com/lann/ps"; - rev = "62de8c46ede02a7675c4c79c84883eb164cb71e3"; - sha256 = "10yhcyymypvdiiipchsp80jbglk8c4r7lq7h54v9f4mxmvz6xgf7"; - }; - } - { - goPackagePath = "github.com/lib/pq"; - fetch = { - type = "git"; - url = "https://github.com/lib/pq"; - rev = "9eb73efc1fcc404148b56765b0d3f61d9a5ef8ee"; - sha256 = "17wkjdz265iqf92gj3ljslvjcqvkfblw11jdq2scc3kp1hcsfr10"; - }; - } - { - goPackagePath = "github.com/mailru/easyjson"; - fetch = { - type = "git"; - url = "https://github.com/mailru/easyjson"; - rev = "1de009706dbeb9d05f18586f0735fcdb7c524481"; - sha256 = "0y4wq6wwj9ivqr397wcr6n0bd9m85qpk367bp65hkfi9x3mnlcb4"; - }; - } - { - goPackagePath = "github.com/mattn/go-sqlite3"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-sqlite3"; - rev = "ad30583d8387ce8118f8605eaeb3b4f7b4ae0ee1"; - sha256 = "024h09n4g41x4awzim5l0vxpj1nfwc9isf8bryrdnichpqpa6siz"; - }; - } - { - goPackagePath = "github.com/nwaples/rardecode"; - fetch = { - type = "git"; - url = "https://github.com/nwaples/rardecode"; - rev = "197ef08ef68c4454ae5970a9c2692d6056ceb8d7"; - sha256 = "0vvijw7va283dbdvnf4bgkn7bjngxqzk1rzdpy8sl343r62bmh4g"; - }; - } - { - goPackagePath = "github.com/valyala/bytebufferpool"; - fetch = { - type = "git"; - url = "https://github.com/valyala/bytebufferpool"; - rev = "cdfbe9377474227bb42120c1e22fd4433e7f69bf"; - sha256 = "0c6cixd85dvl2gvs7sdh0k2wm8r3grl4fw0jg4w7d78cp8s2k7ag"; - }; - } - { - goPackagePath = "github.com/valyala/quicktemplate"; - fetch = { - type = "git"; - url = "https://github.com/valyala/quicktemplate"; - rev = "d08324ac14fa81325830fae7eb30188ec68427f8"; - sha256 = "0gpc1kcqvcn1f9mz2dww8bhrspnsk2fgxzvx398vy7a0xhxq8vhx"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "d8887717615a059821345a5c23649351b52a1c0b"; - sha256 = "1wfm6ngxjyj7v5a2dqib6lw8bb2rdnf1kl48diykxjrsddn0s163"; - }; - } -] diff --git a/pkgs/servers/hylafaxplus/default.nix b/pkgs/servers/hylafaxplus/default.nix index 1bbaacd5844..fc75003f392 100644 --- a/pkgs/servers/hylafaxplus/default.nix +++ b/pkgs/servers/hylafaxplus/default.nix @@ -83,10 +83,10 @@ stdenv.mkDerivation { openldap # optional pam # optional ]; - postPatch = ''. ${postPatch}''; + postPatch = ". ${postPatch}"; dontAddPrefix = true; - postInstall = ''. ${postInstall}''; - postInstallCheck = ''. ${./post-install-check.sh}''; + postInstall = ". ${postInstall}"; + postInstallCheck = ". ${./post-install-check.sh}"; meta = { description = "enterprise-class system for sending and receiving facsimiles"; downloadPage = "https://hylafax.sourceforge.io/download.php"; diff --git a/pkgs/servers/icecast/default.nix b/pkgs/servers/icecast/default.nix index 52f30c7c658..15e5e81d058 100644 --- a/pkgs/servers/icecast/default.nix +++ b/pkgs/servers/icecast/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl +{lib, stdenv, fetchurl , libxml2, libxslt, curl , libvorbis, libtheora, speex, libkate, libopus }: @@ -27,9 +27,9 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.icecast.org"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ jcumming ]; - platforms = with stdenv.lib.platforms; unix; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ jcumming ]; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/servers/icingaweb2/default.nix b/pkgs/servers/icingaweb2/default.nix index eaf16e38804..e7d9b1a2847 100644 --- a/pkgs/servers/icingaweb2/default.nix +++ b/pkgs/servers/icingaweb2/default.nix @@ -1,4 +1,6 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, php }: with lib; stdenv.mkDerivation rec { +{ stdenv, lib, fetchFromGitHub, makeWrapper, php }: + +stdenv.mkDerivation rec { pname = "icingaweb2"; version = "2.8.2"; @@ -16,10 +18,10 @@ cp -ra application bin etc library modules public $out cp -ra doc $out/share - wrapProgram $out/bin/icingacli --prefix PATH : "${makeBinPath [ php ]}" + wrapProgram $out/bin/icingacli --prefix PATH : "${lib.makeBinPath [ php ]}" ''; - meta = { + meta = with lib; { description = "Webinterface for Icinga 2"; longDescription = '' A lightweight and extensible web interface to keep an eye on your environment. diff --git a/pkgs/servers/icingaweb2/theme-april/default.nix b/pkgs/servers/icingaweb2/theme-april/default.nix index 7c592fca33b..0a152a7e157 100644 --- a/pkgs/servers/icingaweb2/theme-april/default.nix +++ b/pkgs/servers/icingaweb2/theme-april/default.nix @@ -1,4 +1,9 @@ -{ stdenv, lib, fetchFromGitHub }: with lib; stdenv.mkDerivation rec { +{ lib +, stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { name = "icingaweb2-theme-april"; version = "1.0.4"; @@ -14,7 +19,7 @@ cp -r * "$out" ''; - meta = { + meta = with lib; { description = "Icingaweb2 theme for april fools"; homepage = "https://github.com/Mikesch-mp/icingaweb2-theme-april"; license = licenses.publicDomain; diff --git a/pkgs/servers/icingaweb2/theme-lsd/default.nix b/pkgs/servers/icingaweb2/theme-lsd/default.nix index 273bcf6945d..59b8df6b4d4 100644 --- a/pkgs/servers/icingaweb2/theme-lsd/default.nix +++ b/pkgs/servers/icingaweb2/theme-lsd/default.nix @@ -1,4 +1,9 @@ -{ stdenv, lib, fetchFromGitHub }: with lib; stdenv.mkDerivation rec { +{ lib +, stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { name = "icingaweb2-theme-lsd"; version = "1.0.3"; @@ -14,7 +19,7 @@ cp -r * "$out" ''; - meta = { + meta = with lib; { description = "Psychadelic theme for IcingaWeb 2"; homepage = "https://github.com/Mikesch-mp/icingaweb2-theme-lsd"; license = licenses.publicDomain; diff --git a/pkgs/servers/icingaweb2/theme-particles/default.nix b/pkgs/servers/icingaweb2/theme-particles/default.nix index 3d28481cd84..ddd363701a7 100644 --- a/pkgs/servers/icingaweb2/theme-particles/default.nix +++ b/pkgs/servers/icingaweb2/theme-particles/default.nix @@ -1,4 +1,9 @@ -{ stdenv, lib, fetchFromGitHub }: with lib; stdenv.mkDerivation rec { +{ lib +, stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { name = "icingaweb2-theme-particles"; version = "1.0.0"; @@ -14,7 +19,7 @@ cp -r * "$out" ''; - meta = { + meta = with lib; { description = "This theme adds a nice particle effect to the login screen of Icingaweb 2"; homepage = "https://github.com/Mikesch-mp/icingaweb2-theme-particles"; license = licenses.publicDomain; diff --git a/pkgs/servers/icingaweb2/theme-snow/default.nix b/pkgs/servers/icingaweb2/theme-snow/default.nix index 941138bb0a5..5650d1ccdba 100644 --- a/pkgs/servers/icingaweb2/theme-snow/default.nix +++ b/pkgs/servers/icingaweb2/theme-snow/default.nix @@ -1,4 +1,9 @@ -{ stdenv, lib, fetchFromGitHub }: with lib; stdenv.mkDerivation rec { +{ lib +, stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { name = "icingaweb2-theme-snow"; version = "1.0.0"; @@ -20,7 +25,7 @@ cp -r * "$out" ''; - meta = { + meta = with lib; { description = "Snow theme for Icingaweb 2"; homepage = "https://github.com/Mikesch-mp/icingaweb2-theme-snow"; license = licenses.publicDomain; diff --git a/pkgs/servers/icingaweb2/theme-spring/default.nix b/pkgs/servers/icingaweb2/theme-spring/default.nix index a21f6cc89a2..dda26caf6a1 100644 --- a/pkgs/servers/icingaweb2/theme-spring/default.nix +++ b/pkgs/servers/icingaweb2/theme-spring/default.nix @@ -1,4 +1,9 @@ -{ stdenv, lib, fetchFromGitHub }: with lib; stdenv.mkDerivation rec { +{ lib +, stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { name = "icingaweb2-theme-spring"; version = "1.0.0"; @@ -14,7 +19,7 @@ cp -r * "$out" ''; - meta = { + meta = with lib; { description = "Theme with some soft colors and nice background images loaded from unsplash.com"; homepage = "https://github.com/Mikesch-mp/icingaweb2-theme-spring"; license = licenses.publicDomain; diff --git a/pkgs/servers/icingaweb2/theme-unicorn/default.nix b/pkgs/servers/icingaweb2/theme-unicorn/default.nix index a43f7d7c09a..a2bb3f9e4a2 100644 --- a/pkgs/servers/icingaweb2/theme-unicorn/default.nix +++ b/pkgs/servers/icingaweb2/theme-unicorn/default.nix @@ -1,4 +1,10 @@ -{ stdenv, lib, fetchurl, fetchFromGitHub }: with lib; stdenv.mkDerivation rec { +{ lib +, stdenv +, fetchurl +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { name = "icingaweb2-theme-unicorn"; version = "1.0.2"; @@ -35,7 +41,7 @@ cp unicorn.png "$out/public/img/unicorn.png" ''; - meta = { + meta = with lib; { description = "Unicorn theme for IcingaWeb 2"; homepage = "https://github.com/Mikesch-mp/icingaweb2-theme-unicorn"; license = licenses.publicDomain; diff --git a/pkgs/servers/identd/nullidentdmod/default.nix b/pkgs/servers/identd/nullidentdmod/default.nix index b383135f2eb..ee759ac55ea 100644 --- a/pkgs/servers/identd/nullidentdmod/default.nix +++ b/pkgs/servers/identd/nullidentdmod/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec { +{ lib, stdenv, fetchFromGitHub, ... }: + +stdenv.mkDerivation rec { pname = "nullidentdmod"; version = "1.3"; diff --git a/pkgs/servers/irc/atheme/default.nix b/pkgs/servers/irc/atheme/default.nix index 95019fb939f..a95a2ad27c3 100644 --- a/pkgs/servers/irc/atheme/default.nix +++ b/pkgs/servers/irc/atheme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, libmowgli, pkgconfig, git, gettext, pcre, libidn, cracklib, openssl }: +{ lib, stdenv, fetchgit, libmowgli, pkg-config, git, gettext, pcre, libidn, cracklib, openssl }: stdenv.mkDerivation rec { pname = "atheme"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { leaveDotGit = true; }; - nativeBuildInputs = [ pkgconfig git gettext ]; + nativeBuildInputs = [ pkg-config git gettext ]; buildInputs = [ libmowgli pcre libidn cracklib openssl ]; configureFlags = [ diff --git a/pkgs/servers/irc/charybdis/default.nix b/pkgs/servers/irc/charybdis/default.nix index bf31633e41e..3b2508a7760 100644 --- a/pkgs/servers/irc/charybdis/default.nix +++ b/pkgs/servers/irc/charybdis/default.nix @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace include/defaults.h --replace 'PKGLOCALSTATEDIR "' '"/var/lib/charybdis' + substituteInPlace include/defaults.h --replace 'ETCPATH "' '"/etc/charybdis' ''; autoreconfPhase = "sh autogen.sh"; diff --git a/pkgs/servers/irc/ircd-hybrid/default.nix b/pkgs/servers/irc/ircd-hybrid/default.nix index 582bf94b0de..353e836dc66 100644 --- a/pkgs/servers/irc/ircd-hybrid/default.nix +++ b/pkgs/servers/irc/ircd-hybrid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, zlib }: +{ lib, stdenv, fetchurl, openssl, zlib }: stdenv.mkDerivation rec { name = "ircd-hybrid-8.2.35"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "An IPv6-capable IRC server"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; homepage = "https://www.ircd-hybrid.org/"; }; } diff --git a/pkgs/servers/irc/ngircd/default.nix b/pkgs/servers/irc/ngircd/default.nix index ff754a5390c..b89837e5942 100644 --- a/pkgs/servers/irc/ngircd/default.nix +++ b/pkgs/servers/irc/ngircd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, openssl, pam, libiconv }: +{ lib, stdenv, fetchurl, zlib, openssl, pam, libiconv }: stdenv.mkDerivation rec { pname = "ngircd"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Next Generation IRC Daemon"; homepage = "https://ngircd.barton.de"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl2; + platforms = lib.platforms.all; }; } diff --git a/pkgs/servers/irc/robustirc-bridge/default.nix b/pkgs/servers/irc/robustirc-bridge/default.nix index d0b192010c1..2530c72cbb9 100644 --- a/pkgs/servers/irc/robustirc-bridge/default.nix +++ b/pkgs/servers/irc/robustirc-bridge/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "robustirc-bridge"; diff --git a/pkgs/servers/irc/solanum/default.nix b/pkgs/servers/irc/solanum/default.nix index d5ee98a1804..0ae030ba59d 100644 --- a/pkgs/servers/irc/solanum/default.nix +++ b/pkgs/servers/irc/solanum/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { "--localstatedir=/var/lib/solanum" "--with-rundir=/run/solanum" "--with-logdir=/var/log/solanum" - ] ++ stdenv.lib.optionals (stdenv.isLinux) [ + ] ++ lib.optionals (stdenv.isLinux) [ "--enable-sctp=${lksctp-tools.out}/lib" ]; diff --git a/pkgs/servers/irker/default.nix b/pkgs/servers/irker/default.nix index 8f6f31bba35..7bb0900d7d3 100644 --- a/pkgs/servers/irker/default.nix +++ b/pkgs/servers/irker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, python, pkgconfig +{ lib, stdenv, fetchFromGitLab, python, pkg-config , xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_412 }: stdenv.mkDerivation { @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "1hslwqa0gqsnl3l6hd5hxpn0wlachxd51infifhlwhyhd6iwgx8p"; }; - nativeBuildInputs = [ pkgconfig xmlto docbook2x docbook_xsl docbook_xml_dtd_412 ]; + nativeBuildInputs = [ pkg-config xmlto docbook2x docbook_xsl docbook_xml_dtd_412 ]; buildInputs = [ python diff --git a/pkgs/servers/isso/default.nix b/pkgs/servers/isso/default.nix index 4680c37c85e..b9bce56d9fa 100644 --- a/pkgs/servers/isso/default.nix +++ b/pkgs/servers/isso/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub }: with python3Packages; buildPythonApplication rec { diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 9fda62a68af..11e213f0136 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { makeWrapper "${mono}/bin/mono" $out/bin/Jackett \ --add-flags "$out/share/${pname}-${version}/JackettConsole.exe" \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ curl icu60 openssl zlib ]} + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ curl icu60 openssl zlib ]} ''; meta = with lib; { diff --git a/pkgs/servers/jellyfin/10.5.x.nix b/pkgs/servers/jellyfin/10.5.x.nix index 17903871c8d..da4d2c4c1d5 100644 --- a/pkgs/servers/jellyfin/10.5.x.nix +++ b/pkgs/servers/jellyfin/10.5.x.nix @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { install -dm 755 "$out/opt/jellyfin" cp -r * "$out/opt/jellyfin" makeWrapper "${dotnetCorePackages.aspnetcore_3_1}/bin/dotnet" $out/bin/jellyfin \ - --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ sqlite fontconfig freetype stdenv.cc.cc.lib ]}:$out/opt/jellyfin/runtimes/${runtimeDir}/native/" \ --add-flags "$out/opt/jellyfin/jellyfin.dll --ffmpeg ${ffmpeg}/bin/ffmpeg" @@ -52,7 +52,7 @@ in stdenv.mkDerivation rec { smoke-test = nixosTests.jellyfin; }; - meta = with stdenv.lib; { + meta = with lib; { description = "The Free Software Media System"; homepage = "https://jellyfin.org/"; license = licenses.gpl2; diff --git a/pkgs/servers/jellyfin/default.nix b/pkgs/servers/jellyfin/default.nix index afa5375c9fd..caca89bfd0d 100644 --- a/pkgs/servers/jellyfin/default.nix +++ b/pkgs/servers/jellyfin/default.nix @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { install -dm 755 "$out/opt/jellyfin" cp -r * "$out/opt/jellyfin" makeWrapper "${dotnetCorePackages.aspnetcore_3_1}/bin/dotnet" $out/bin/jellyfin \ - --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ sqlite fontconfig freetype stdenv.cc.cc.lib ]}:$out/opt/jellyfin/runtimes/${runtimeDir}/native/" \ --add-flags "$out/opt/jellyfin/jellyfin.dll --ffmpeg ${ffmpeg}/bin/ffmpeg" @@ -52,7 +52,7 @@ in stdenv.mkDerivation rec { smoke-test = nixosTests.jellyfin; }; - meta = with stdenv.lib; { + meta = with lib; { description = "The Free Software Media System"; homepage = "https://jellyfin.org/"; license = licenses.gpl2; diff --git a/pkgs/servers/jetbrains/youtrack.nix b/pkgs/servers/jetbrains/youtrack.nix index a965a2dbfee..5aab96d1bc0 100644 --- a/pkgs/servers/jetbrains/youtrack.nix +++ b/pkgs/servers/jetbrains/youtrack.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { runHook preInstall makeWrapper ${jre}/bin/java $out/bin/youtrack \ --add-flags "\$YOUTRACK_JVM_OPTS -jar $jar" \ - --prefix PATH : "${stdenv.lib.makeBinPath [ gawk ]}" \ + --prefix PATH : "${lib.makeBinPath [ gawk ]}" \ --set JRE_HOME ${jre} runHook postInstall ''; diff --git a/pkgs/servers/kapowbang/default.nix b/pkgs/servers/kapowbang/default.nix index a0096eab026..94a1832bd8d 100644 --- a/pkgs/servers/kapowbang/default.nix +++ b/pkgs/servers/kapowbang/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "kapowbang"; - version = "0.5.4"; + version = "0.6.0"; subPackages = [ "." ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "BBVA"; repo = "kapow"; rev = "v${version}"; - sha256 = "09qr631vzlgibz6q64f35lqzz9h1g3gxqfbapkrci5i0n3h04yr4"; + sha256 = "sha256-+GZarnG+SlxynoXYTvI1f9eki3DobiDt7vUdWlC0ECk="; }; - vendorSha256 = "159s46rhg67mgglaxgddx3k8kssl0cqiq8yjdqgjhhxppf16r7dy"; + vendorSha256 = "sha256-vXu64o/MTmw9oZL4MIHB+PEfYLcKVh5A5iGZ1RW1Xd4="; doCheck = false; diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix index 91234cdb410..468904b3f0d 100644 --- a/pkgs/servers/keycloak/default.nix +++ b/pkgs/servers/keycloak/default.nix @@ -18,11 +18,11 @@ let in stdenv.mkDerivation rec { pname = "keycloak"; - version = "11.0.3"; + version = "12.0.2"; src = fetchzip { - url = "https://downloads.jboss.org/keycloak/${version}/keycloak-${version}.zip"; - sha256 = "15fw49rhnjky108hh71dkdlafd0ajr1n13vhivqcw6c18zvyan35"; + url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip"; + sha256 = "006k6ac00iz61s6hi3wzj6w71mhhv7n00vh82ak4yhwr97jffqbz"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix index 9c44dabe3df..23b44be0316 100644 --- a/pkgs/servers/klipper/default.nix +++ b/pkgs/servers/klipper/default.nix @@ -2,16 +2,17 @@ , lib , fetchFromGitHub , python2 +, unstableGitUpdater }: stdenv.mkDerivation rec { name = "klipper"; - version = "0.9.1"; + version = "unstable-2021-01-31"; src = fetchFromGitHub { owner = "KevinOConnor"; repo = "klipper"; - rev = "v${version}"; - sha256 = "1wgklngsz6xxl25qxi9fkqhbyhwy61iyyk76ycq68b3miayrkgpj"; + rev = "ef4d9c3abd30ae8a485020fd9ff2fb4529a143b3"; + sha256 = "puAkSGL0DD0JUWejPdzr7zKIW2UP2soBBtgm2msUKzA="; }; sourceRoot = "source/klippy"; @@ -39,6 +40,8 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.updateScript = unstableGitUpdater { url = meta.homepage; }; + meta = with lib; { description = "The Klipper 3D printer firmware"; homepage = "https://github.com/KevinOConnor/klipper"; diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix index 9b518bf80a3..bfa372ed069 100644 --- a/pkgs/servers/ldap/389/default.nix +++ b/pkgs/servers/ldap/389/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, doxygen, perl, pam, nspr, nss, openldap +{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, pkg-config, doxygen, perl, pam, nspr, nss, openldap , db, cyrus_sasl, svrcore, icu, net-snmp, kerberos, pcre, perlPackages, libevent, openssl, python }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "141iv1phgk1lw74sfjj3v7wy6qs0q56lvclwv2p0hqn1wg8ic4q6"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig doxygen ]; + nativeBuildInputs = [ autoreconfHook pkg-config doxygen ]; buildInputs = [ perl pam nspr nss openldap db cyrus_sasl svrcore icu net-snmp kerberos pcre libevent openssl python @@ -47,8 +47,8 @@ stdenv.mkDerivation rec { "--with-db-lib=${db.out}/lib" "--with-sasl=${cyrus_sasl.dev}" "--with-netsnmp=yes" - "--with-netsnmp-inc=${stdenv.lib.getDev net-snmp}/include" - "--with-netsnmp-lib=${stdenv.lib.getLib net-snmp}/lib" + "--with-netsnmp-inc=${lib.getDev net-snmp}/include" + "--with-netsnmp-lib=${lib.getLib net-snmp}/lib" ]; enableParallelBuilding = true; diff --git a/pkgs/servers/lidarr/default.nix b/pkgs/servers/lidarr/default.nix index 46c88b95c37..60c2027e552 100644 --- a/pkgs/servers/lidarr/default.nix +++ b/pkgs/servers/lidarr/default.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { makeWrapper "${mono}/bin/mono" $out/bin/Lidarr \ --add-flags "$out/bin/Lidarr.exe" \ - --prefix PATH : ${stdenv.lib.makeBinPath [ chromaprint ]} \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ + --prefix PATH : ${lib.makeBinPath [ chromaprint ]} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ curl sqlite libmediainfo ]} ''; diff --git a/pkgs/servers/limesurvey/default.nix b/pkgs/servers/limesurvey/default.nix index 261285341c4..e71ff33e2f9 100644 --- a/pkgs/servers/limesurvey/default.nix +++ b/pkgs/servers/limesurvey/default.nix @@ -37,5 +37,10 @@ stdenv.mkDerivation rec { homepage = "https://www.limesurvey.org"; maintainers = with maintainers; [offline]; platforms = with platforms; unix; + knownVulnerabilities = [ + # https://github.com/LimeSurvey/LimeSurvey/blob/3.x-LTS/docs/release_notes.txt + "Unauthorized access to statistics of a survey with certain permission configurations" + "Persistent XSS in browse response" + ]; }; } diff --git a/pkgs/servers/livepeer/default.nix b/pkgs/servers/livepeer/default.nix index 6d5506ded88..a016c8e7f09 100644 --- a/pkgs/servers/livepeer/default.nix +++ b/pkgs/servers/livepeer/default.nix @@ -1,19 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, buildGoModule +{ lib, fetchFromGitHub, buildGoModule , pkg-config, ffmpeg, gnutls }: buildGoModule rec { pname = "livepeer"; - version = "0.5.12"; + version = "0.5.13"; runVend = true; - vendorSha256 = "13cgwpf3v4vlvb0mgdxsdybpghx1cp3fzkdwmq8b193a8dcl8s63"; + vendorSha256 = "sha256-wAjGgYDyBWqE8KCQ6TQ+LGDDZqF+5XY+NzU74RwPuRE="; src = fetchFromGitHub { owner = "livepeer"; repo = "go-livepeer"; rev = "v${version}"; - sha256 = "15gx6pd6zn40x60p07dyaf1ydxvrg372lk3djp302mph8y0ijqfg"; + sha256 = "sha256-b4O8Hc8A8TN5KFcQ7KYvFPVFgposDgPw06WowrXzpAs="; }; # livepeer_cli has a vendoring problem diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index 8d39c01478f..2c44094d0f7 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, perl, pkgconfig, systemd, openssl +{ stdenv, lib, fetchurl, perl, pkg-config, systemd, openssl , bzip2, zlib, lz4, inotify-tools, pam, libcap , clucene_core_2, icu, openldap, libsodium, libstemmer, cyrus_sasl , nixosTests @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "dovecot"; version = "2.3.13"; - nativeBuildInputs = [ perl pkgconfig ]; + nativeBuildInputs = [ perl pkg-config ]; buildInputs = [ openssl bzip2 zlib lz4 clucene_core_2 icu openldap libsodium libstemmer cyrus_sasl.dev ] ++ lib.optionals (stdenv.isLinux) [ systemd pam libcap inotify-tools ] @@ -84,8 +84,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://dovecot.org/"; description = "Open source IMAP and POP3 email server written with security primarily in mind"; - maintainers = with stdenv.lib.maintainers; [ peti fpletz globin ]; - platforms = stdenv.lib.platforms.unix; + maintainers = with lib.maintainers; [ peti fpletz globin ]; + platforms = lib.platforms.unix; }; passthru.tests = { opensmtpd-interaction = nixosTests.opensmtpd; diff --git a/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix b/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix index 0b61a779c48..eb3f8bf19cb 100644 --- a/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix +++ b/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, dovecot, libtool, xapian, icu64, sqlite }: -stdenv.mkDerivation { +{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, dovecot, libtool, xapian, icu64 }: +stdenv.mkDerivation rec { pname = "fts-xapian"; - version = "1.3.1"; + version = "1.4.7"; src = fetchFromGitHub { owner = "grosjo"; repo = "fts-xapian"; - rev = "1.3.1"; - sha256 = "10yl5fyfbx2ijqckx13vbmzj9mpm5pkh8qzichbdgplrzm738q43"; + rev = version; + sha256 = "K2d1FFAilIggNuP0e698s+9bN08x2s/0Jryp7pmeixc="; }; - buildInputs = [ dovecot xapian icu64 sqlite ]; + buildInputs = [ dovecot xapian icu64 ]; nativeBuildInputs = [ autoconf automake libtool pkg-config ]; diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix index 25e1bb02dbe..9d69b0d73c2 100644 --- a/pkgs/servers/mail/exim/default.nix +++ b/pkgs/servers/mail/exim/default.nix @@ -1,4 +1,4 @@ -{ coreutils, db, fetchurl, openssl, pcre, perl, pkgconfig, lib, stdenv +{ coreutils, db, fetchurl, openssl, pcre, perl, pkg-config, lib, stdenv , enableLDAP ? false, openldap , enableMySQL ? false, libmysqlclient, zlib , enableAuthDovecot ? false, dovecot @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { sha256 = "1nsb2i5mqxfz1sl1bmbxmpb2qiaf3wffhfiw4j9vfpagy3xfhzpp"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ coreutils db openssl perl pcre ] - ++ stdenv.lib.optional enableLDAP openldap - ++ stdenv.lib.optionals enableMySQL [ libmysqlclient zlib ] - ++ stdenv.lib.optional enableAuthDovecot dovecot - ++ stdenv.lib.optional enablePAM pam - ++ stdenv.lib.optional enableSPF libspf2 - ++ stdenv.lib.optional enableDMARC opendmarc; + ++ lib.optional enableLDAP openldap + ++ lib.optionals enableMySQL [ libmysqlclient zlib ] + ++ lib.optional enableAuthDovecot dovecot + ++ lib.optional enablePAM pam + ++ lib.optional enableSPF libspf2 + ++ lib.optional enableDMARC opendmarc; preBuild = '' sed ' @@ -49,32 +49,32 @@ stdenv.mkDerivation rec { s:^# \(TOUCH_COMMAND\)=.*:\1=${coreutils}/bin/touch: s:^# \(PERL_COMMAND\)=.*:\1=${perl}/bin/perl: s:^# \(LOOKUP_DSEARCH=yes\)$:\1: - ${stdenv.lib.optionalString enableLDAP '' + ${lib.optionalString enableLDAP '' s:^# \(LDAP_LIB_TYPE=OPENLDAP2\)$:\1: s:^# \(LOOKUP_LDAP=yes\)$:\1: s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lldap -llber: s:^# \(LOOKUP_LIBS\)=.*:\1=-lldap -llber: ''} - ${stdenv.lib.optionalString enableMySQL '' + ${lib.optionalString enableMySQL '' s:^# \(LOOKUP_MYSQL=yes\)$:\1: s:^# \(LOOKUP_MYSQL_PC=libmysqlclient\)$:\1: s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lmysqlclient -L${libmysqlclient}/lib/mysql -lssl -ldl -lm -lpthread -lz: s:^# \(LOOKUP_LIBS\)=.*:\1=-lmysqlclient -L${libmysqlclient}/lib/mysql -lssl -ldl -lm -lpthread -lz: s:^# \(LOOKUP_INCLUDE\)=.*:\1=-I${libmysqlclient}/include/mysql/: ''} - ${stdenv.lib.optionalString enableAuthDovecot '' + ${lib.optionalString enableAuthDovecot '' s:^# \(AUTH_DOVECOT\)=.*:\1=yes: ''} - ${stdenv.lib.optionalString enablePAM '' + ${lib.optionalString enablePAM '' s:^# \(SUPPORT_PAM\)=.*:\1=yes: s:^\(EXTRALIBS_EXIM\)=\(.*\):\1=\2 -lpam: s:^# \(EXTRALIBS_EXIM\)=.*:\1=-lpam: ''} - ${stdenv.lib.optionalString enableSPF '' + ${lib.optionalString enableSPF '' s:^# \(SUPPORT_SPF\)=.*:\1=yes: s:^# \(LDFLAGS += -lspf2\):\1: ''} - ${stdenv.lib.optionalString enableDMARC '' + ${lib.optionalString enableDMARC '' s:^# \(SUPPORT_DMARC\)=.*:\1=yes: s:^# \(LDFLAGS += -lopendmarc\):\1: ''} diff --git a/pkgs/servers/mail/mailhog/default.nix b/pkgs/servers/mail/mailhog/default.nix index f1ba497720a..674fdbabb4e 100644 --- a/pkgs/servers/mail/mailhog/default.nix +++ b/pkgs/servers/mail/mailhog/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "MailHog"; diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/servers/mail/mailman/default.nix index 8f3a382b13e..9a86cc31fdd 100644 --- a/pkgs/servers/mail/mailman/default.nix +++ b/pkgs/servers/mail/mailman/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, isPy3k, alembic, aiosmtpd, dnspython +{ lib, buildPythonPackage, fetchPypi, fetchpatch, isPy3k, alembic, aiosmtpd, dnspython , flufl_bounce, flufl_i18n, flufl_lock, lazr_config, lazr_delegates, passlib , requests, zope_configuration, click, falcon, importlib-resources , zope_component, lynx, postfix, authheaders, gunicorn @@ -53,7 +53,7 @@ buildPythonPackage rec { meta = { homepage = "https://www.gnu.org/software/mailman/"; description = "Free software for managing electronic mail discussion and newsletter lists"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ peti ]; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ peti ]; }; } diff --git a/pkgs/servers/mail/mailman/hyperkitty.nix b/pkgs/servers/mail/mailman/hyperkitty.nix index 5ed5b74d309..00cf2c1e83c 100644 --- a/pkgs/servers/mail/mailman/hyperkitty.nix +++ b/pkgs/servers/mail/mailman/hyperkitty.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k, isort, coverage, mock +{ lib, buildPythonPackage, fetchPypi, isPy3k, isort, coverage, mock , robot-detection, django_extensions, rjsmin, cssmin, django-mailman3 , django-haystack, flufl_lock, networkx, dateutil, defusedxml , django-paintstore, djangorestframework, django, django-q @@ -38,8 +38,8 @@ buildPythonPackage rec { meta = { homepage = "https://www.gnu.org/software/mailman/"; description = "Archiver for GNU Mailman v3"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ peti globin ]; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ peti globin ]; }; } diff --git a/pkgs/servers/mail/mailman/postorius.nix b/pkgs/servers/mail/mailman/postorius.nix index ae797fa6cbc..9330de3a8f3 100644 --- a/pkgs/servers/mail/mailman/postorius.nix +++ b/pkgs/servers/mail/mailman/postorius.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, beautifulsoup4, vcrpy, mock +{ lib, buildPythonPackage, fetchPypi, beautifulsoup4, vcrpy, mock , django-mailman3, mailmanclient, readme_renderer }: @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = { homepage = "https://www.gnu.org/software/mailman/"; description = "Web-based user interface for managing GNU Mailman"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ globin peti ]; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ globin peti ]; }; } diff --git a/pkgs/servers/mail/nullmailer/default.nix b/pkgs/servers/mail/nullmailer/default.nix index 6744d1ffac1..95263e435f0 100644 --- a/pkgs/servers/mail/nullmailer/default.nix +++ b/pkgs/servers/mail/nullmailer/default.nix @@ -12,12 +12,12 @@ stdenv.mkDerivation rec { sha256 = "0md8cf90fl2yf3zh9njjy42a673v4j4ygyq95xg7fzkygdigm1lq"; }; - buildInputs = stdenv.lib.optional tls gnutls; + buildInputs = lib.optional tls gnutls; configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" - ] ++ stdenv.lib.optional tls "--enable-tls"; + ] ++ lib.optional tls "--enable-tls"; installFlags = [ "DESTDIR=$(out)" ]; diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index cd6a760b9e2..ab2bdae0add 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "opensmtpd"; - version = "6.7.1p1"; + version = "6.8.0p2"; nativeBuildInputs = [ autoconf automake libtool bison ]; buildInputs = [ libasr libevent zlib libressl db pam ]; src = fetchurl { url = "https://www.opensmtpd.org/archives/${pname}-${version}.tar.gz"; - sha256 = "1jh8vxfajm1mvp1v5yh6llrhjzv0n9fgab88mlwllwqynhcfjy3l"; + sha256 = "05sd7bmq29ibnqbl2z53hiyprfxzf0qydfdaixs68rz55wqhbgsi"; }; patches = [ diff --git a/pkgs/servers/mail/opensmtpd/extras.nix b/pkgs/servers/mail/opensmtpd/extras.nix index d3084ff258d..65ff08b4539 100644 --- a/pkgs/servers/mail/opensmtpd/extras.nix +++ b/pkgs/servers/mail/opensmtpd/extras.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, openssl, libevent, libasr, - python2, pkgconfig, lua5, perl, libmysqlclient, postgresql, sqlite, hiredis, + python2, pkg-config, lua5, perl, libmysqlclient, postgresql, sqlite, hiredis, enablePython ? true, enableLua ? true, enablePerl ? true, @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "1b1mx71bvmv92lbm08wr2p60g3qhikvv3n15zsr6dcwbk9aqahzq"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl libevent libasr python2 lua5 perl libmysqlclient postgresql sqlite hiredis ]; @@ -48,37 +48,37 @@ stdenv.mkDerivation rec { "--with-scheduler-ram" "--with-scheduler-stub" - ] ++ stdenv.lib.optionals enablePython [ + ] ++ lib.optionals enablePython [ "--with-python=${python2}" "--with-filter-python" "--with-queue-python" "--with-table-python" "--with-scheduler-python" - ] ++ stdenv.lib.optionals enableLua [ - "--with-lua=${pkgconfig}" + ] ++ lib.optionals enableLua [ + "--with-lua=${pkg-config}" "--with-filter-lua" - ] ++ stdenv.lib.optionals enablePerl [ + ] ++ lib.optionals enablePerl [ "--with-perl=${perl}" "--with-filter-perl" - ] ++ stdenv.lib.optionals enableMysql [ + ] ++ lib.optionals enableMysql [ "--with-table-mysql" - ] ++ stdenv.lib.optionals enablePostgres [ + ] ++ lib.optionals enablePostgres [ "--with-table-postgres" - ] ++ stdenv.lib.optionals enableSqlite [ + ] ++ lib.optionals enableSqlite [ "--with-table-sqlite" - ] ++ stdenv.lib.optionals enableRedis [ + ] ++ lib.optionals enableRedis [ "--with-table-redis" ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString enableRedis + NIX_CFLAGS_COMPILE = lib.optionalString enableRedis "-I${hiredis}/include/hiredis -lhiredis" - + stdenv.lib.optionalString enableMysql + + lib.optionalString enableMysql " -L${libmysqlclient}/lib/mysql"; meta = with lib; { diff --git a/pkgs/servers/mail/opensmtpd/proc_path.diff b/pkgs/servers/mail/opensmtpd/proc_path.diff index 5e1cfd00429..a60bb603aac 100644 --- a/pkgs/servers/mail/opensmtpd/proc_path.diff +++ b/pkgs/servers/mail/opensmtpd/proc_path.diff @@ -1,7 +1,7 @@ -diff --git a/smtpd/smtpd.c b/smtpd/smtpd.c +diff --git a/usr.sbin/smtpd/smtpd.c b/usr.sbin/smtpd/smtpd.c index e049f07c..a1bd03a0 100644 ---- a/smtpd/smtpd.c -+++ b/smtpd/smtpd.c +--- a/usr.sbin/smtpd/smtpd.c ++++ b/usr.sbin/smtpd/smtpd.c @@ -1157,6 +1157,7 @@ fork_proc_backend(const char *key, const char *conf, const char *procname) char path[PATH_MAX]; char name[PATH_MAX]; @@ -24,10 +24,10 @@ index e049f07c..a1bd03a0 100644 (ssize_t)sizeof(path)) { log_warn("warn: %s-proc: exec path too long", key); return (-1); -diff --git a/smtpd/table.c b/smtpd/table.c +diff --git a/usr.sbin/smtpd/table.c b/usr.sbin/smtpd/table.c index 9cfdfb99..24dfcca4 100644 ---- a/smtpd/table.c -+++ b/smtpd/table.c +--- a/usr.sbin/smtpd/table.c ++++ b/usr.sbin/smtpd/table.c @@ -201,6 +201,7 @@ table_create(const char *backend, const char *name, const char *tag, struct table_backend *tb; char buf[LINE_MAX]; diff --git a/pkgs/servers/mail/petidomo/default.nix b/pkgs/servers/mail/petidomo/default.nix index 146160b79c3..169712375c1 100644 --- a/pkgs/servers/mail/petidomo/default.nix +++ b/pkgs/servers/mail/petidomo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, flex, bison, sendmailPath ? "/run/wrappers/bin/sendmail" }: +{ lib, stdenv, fetchurl, flex, bison, sendmailPath ? "/run/wrappers/bin/sendmail" }: stdenv.mkDerivation rec { name = "petidomo-4.3"; @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { meta = { homepage = "http://petidomo.sourceforge.net/"; description = "A simple and easy to administer mailing list server"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.peti ]; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.peti ]; }; } diff --git a/pkgs/servers/mail/popa3d/default.nix b/pkgs/servers/mail/popa3d/default.nix index 998dce88286..d086eb09e80 100644 --- a/pkgs/servers/mail/popa3d/default.nix +++ b/pkgs/servers/mail/popa3d/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl }: +{ lib, stdenv, fetchurl, openssl }: stdenv.mkDerivation rec { @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.openwall.com/popa3d/"; description = "Tiny POP3 daemon with security as the primary goal"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 0b6ed49737d..6862507c629 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -26,11 +26,11 @@ in stdenv.mkDerivation rec { pname = "postfix"; - version = "3.5.8"; + version = "3.5.9"; src = fetchurl { url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${pname}-${version}.tar.gz"; - sha256 = "0vs50z5p5xcrdbbkb0dnbx1sk5fx8d2z97sw2p2iip1yrwl2cn12"; + sha256 = "0avn00drmk9c9mjynfvcmir72ss9s3mckdhjm3mmnhas2sixbkji"; }; nativeBuildInputs = [ makeWrapper m4 ]; @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { ./relative-symlinks.patch ]; - postPatch = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + postPatch = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' sed -e 's!bin/postconf!${buildPackages.postfix}/bin/postconf!' -i postfix-install '' + '' sed -e '/^PATH=/d' -i postfix-install diff --git a/pkgs/servers/mail/postfix/pfixtools.nix b/pkgs/servers/mail/postfix/pfixtools.nix index 40a2d7fe092..df04ade5b45 100644 --- a/pkgs/servers/mail/postfix/pfixtools.nix +++ b/pkgs/servers/mail/postfix/pfixtools.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, git, gperf, pcre, unbound, libev, tokyocabinet, pkgconfig, bash, libsrs2 }: +{ stdenv, lib, fetchFromGitHub, git, gperf, pcre, unbound, libev, tokyocabinet, pkg-config, bash, libsrs2 }: let version = "0.9"; @@ -29,7 +29,7 @@ stdenv.mkDerivation { patches = [ ./0001-Fix-build-with-unbound-1.6.1.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [git gperf pcre unbound libev tokyocabinet bash libsrs2]; postUnpack = '' @@ -50,7 +50,7 @@ stdenv.mkDerivation { description = "A collection of postfix-related tools"; license = with lib.licenses; [ bsd3 ]; homepage = "https://github.com/Fruneau/pfixtools"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ jerith666 ]; }; } diff --git a/pkgs/servers/mail/postfix/pflogsumm.nix b/pkgs/servers/mail/postfix/pflogsumm.nix index e6451cddec6..800a69e9509 100644 --- a/pkgs/servers/mail/postfix/pflogsumm.nix +++ b/pkgs/servers/mail/postfix/pflogsumm.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perlPackages }: +{ lib, fetchurl, perlPackages }: perlPackages.buildPerlPackage rec { pname = "pflogsumm"; @@ -27,8 +27,8 @@ perlPackages.buildPerlPackage rec { meta = { homepage = "http://jimsun.linxnet.com/postfix_contrib.html"; - maintainers = with stdenv.lib.maintainers; [ schneefux ]; + maintainers = with lib.maintainers; [ schneefux ]; description = "Postfix activity overview"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/servers/mail/postgrey/default.nix b/pkgs/servers/mail/postgrey/default.nix index d0eaf40d06c..07b351bfb21 100644 --- a/pkgs/servers/mail/postgrey/default.nix +++ b/pkgs/servers/mail/postgrey/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perlPackages, lib, runCommand, postfix }: +{ fetchurl, perlPackages, lib, runCommand, postfix }: let mk-perl-flags = inputs: lib.concatStringsSep " " (map (dep: "-I ${dep}/${perlPackages.perl.libPrefix}") inputs); diff --git a/pkgs/servers/mail/postsrsd/default.nix b/pkgs/servers/mail/postsrsd/default.nix index 978a3f6216b..2ba07ee5739 100644 --- a/pkgs/servers/mail/postsrsd/default.nix +++ b/pkgs/servers/mail/postsrsd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "postsrsd"; - version = "1.9"; + version = "1.10"; src = fetchFromGitHub { owner = "roehling"; repo = "postsrsd"; rev = version; - sha256 = "0kmdm8nwb40cs4wvxv2kapjbiy4h6924zmx8h1kk7j3j9yjshl1p"; + sha256 = "sha256-AqOHHOnGqOnIw5hPPiJjUJFiwngTux7gwn8qig0t7hs="; }; cmakeFlags = [ "-DGENERATE_SRS_SECRET=OFF" "-DINIT_FLAVOR=systemd" ]; diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix index ba69e99cc8b..0740613bad7 100644 --- a/pkgs/servers/mail/rspamd/default.nix +++ b/pkgs/servers/mail/rspamd/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, cmake, perl -, glib, luajit, openssl, pcre, pkgconfig, sqlite, ragel, icu +, glib, luajit, openssl, pcre, pkg-config, sqlite, ragel, icu , hyperscan, jemalloc, blas, lapack, lua, libsodium , withBlas ? true , withHyperscan ? stdenv.isx86_64 @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { sha256 = "0vwa7k2s2bkfb8w78z5izkd6ywjbzqysb0grls898y549hm8ii70"; }; - nativeBuildInputs = [ cmake pkgconfig perl ]; + nativeBuildInputs = [ cmake pkg-config perl ]; buildInputs = [ glib openssl pcre sqlite ragel icu jemalloc libsodium ] ++ lib.optional withHyperscan hyperscan ++ lib.optionals withBlas [ blas lapack ] diff --git a/pkgs/servers/mail/spamassassin/default.nix b/pkgs/servers/mail/spamassassin/default.nix index afdd2ea860d..ff96f0e7c82 100644 --- a/pkgs/servers/mail/spamassassin/default.nix +++ b/pkgs/servers/mail/spamassassin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perlPackages, makeWrapper, gnupg }: +{ lib, fetchurl, perlPackages, makeWrapper, gnupg }: perlPackages.buildPerlPackage rec { pname = "SpamAssassin"; @@ -35,8 +35,8 @@ perlPackages.buildPerlPackage rec { meta = { homepage = "http://spamassassin.apache.org/"; description = "Open-Source Spam Filter"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ peti qknight qyliss ]; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ peti qknight qyliss ]; }; } diff --git a/pkgs/servers/mail/sympa/default.nix b/pkgs/servers/mail/sympa/default.nix index b3b7c742d71..4bc969a851c 100644 --- a/pkgs/servers/mail/sympa/default.nix +++ b/pkgs/servers/mail/sympa/default.nix @@ -63,13 +63,13 @@ let in stdenv.mkDerivation rec { pname = "sympa"; - version = "6.2.56"; + version = "6.2.60"; src = fetchFromGitHub { owner = "sympa-community"; repo = pname; rev = version; - sha256 = "13cs2azpskmp2hkfy5zqf4qb6sb9r8d4wwzc8mw74mg2kdjnvfpy"; + sha256 = "0mnpmkvxf3bmrmahkf3d0i5r6sj7xb1yca5v7xdnwnh5wh9vlx7v"; }; configureFlags = [ diff --git a/pkgs/servers/matrix-corporal/default.nix b/pkgs/servers/matrix-corporal/default.nix new file mode 100644 index 00000000000..e489e774be5 --- /dev/null +++ b/pkgs/servers/matrix-corporal/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "matrix-corporal"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "devture"; + repo = pname; + rev = version; + sha256 = "sha256-u1ppwy+t2ewAH0/+R6e0Ja5A3PQG/lUy2b6kgcMVj8E="; + }; + + buildFlagsArray = [ + "-ldflags=-s -w -X main.GitCommit=${version} -X main.GitBranch=${version} -X main.GitState=nixpkgs -X main.GitSummary=${version} -X main.Version=${version}" + ]; + + vendorSha256 = "sha256-YmUiGsg2UZfV6SHEPwnbmWPhGQ5teV+we9MBaJyrJr4="; + + meta = with lib; { + homepage = "https://github.com/devture/matrix-corporal"; + description = "Reconciliator and gateway for a managed Matrix server"; + maintainers = with maintainers; [ dandellion ]; + license = licenses.agpl3Only; + }; +} diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 6c6636b47ee..f9d26da6297 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -12,11 +12,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.24.0"; + version = "1.26.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-yxcdFd7iVXbDIUx1lW73FKLy+BZfSspz60LKw7BCtl4="; + sha256 = "1jppwqxamj3a65fw2a87brz4iqgijaa4lja51wlxh2xdkqj0sn6l"; }; patches = [ diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix b/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix index f4b89981d69..389b724a134 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix +++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix @@ -19,7 +19,7 @@ nodePackages."${packageName}".override { meta = with lib; { description = "A Matrix <--> Slack bridge"; - maintainers = with maintainers; [ kampka ]; + maintainers = with maintainers; [ ]; license = licenses.asl20; }; } diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix b/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix index 0f86a16aef5..f3a0d1a8f04 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix +++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix @@ -6,7 +6,7 @@ let nodeEnv = import ../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile; + inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile; inherit nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; @@ -14,4 +14,4 @@ in import ./node-packages.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} \ No newline at end of file +} diff --git a/pkgs/servers/matterbridge/default.nix b/pkgs/servers/matterbridge/default.nix index 7cc1c89de6d..6d12ac84d90 100644 --- a/pkgs/servers/matterbridge/default.nix +++ b/pkgs/servers/matterbridge/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, buildGoModule, fetchurl }: +{ lib, buildGoModule, fetchurl }: buildGoModule rec { pname = "matterbridge"; - version = "1.19.0"; + version = "1.21.0"; vendorSha256 = null; @@ -10,7 +10,7 @@ buildGoModule rec { src = fetchurl { url = "https://github.com/42wim/matterbridge/archive/v${version}.tar.gz"; - sha256 = "1s9y7m5xzmzcp8bphc1najrmci8rf8yvz8kwm2ggmchykw2q3jjg"; + sha256 = "sha256-ehn6KdPpDpfdyWCVfLuZLq2dDmZXc6InlnovqNsdG6Y="; }; meta = with lib; { diff --git a/pkgs/servers/mattermost/matterircd.nix b/pkgs/servers/mattermost/matterircd.nix index 36edd851f36..3abb728bec1 100644 --- a/pkgs/servers/mattermost/matterircd.nix +++ b/pkgs/servers/mattermost/matterircd.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "matterircd"; diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index eea87392927..a17d8a55acc 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, olm }: +{ lib, buildGoModule, fetchFromGitHub, olm }: buildGoModule rec { pname = "mautrix-whatsapp"; diff --git a/pkgs/servers/mediatomb/default.nix b/pkgs/servers/mediatomb/default.nix index c310e17608e..d84aa954a00 100644 --- a/pkgs/servers/mediatomb/default.nix +++ b/pkgs/servers/mediatomb/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchgit , sqlite, expat, mp4v2, flac, spidermonkey_68, taglib, libexif, curl, ffmpeg_3, file -, pkgconfig, autoreconfHook }: +, pkg-config, autoreconfHook }: stdenv.mkDerivation rec { pname = "mediatomb"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ sqlite expat spidermonkey_68 taglib libexif curl ffmpeg_3 file mp4v2 flac - pkgconfig autoreconfHook ]; + pkg-config autoreconfHook ]; meta = with lib; { homepage = "http://mediatomb.cc"; diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index 9ea84533821..f684883b8f5 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { hardeningEnable = [ "pie" ]; NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-declarations" ] - ++ stdenv.lib.optional stdenv.isDarwin "-Wno-error"; + ++ lib.optional stdenv.isDarwin "-Wno-error"; meta = with lib; { description = "A distributed memory object caching system"; diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index b63428ba7d9..0e1b207a755 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, jre }: +{ lib, stdenv, fetchurl, makeWrapper, jdk11 }: stdenv.mkDerivation rec { pname = "metabase"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { dontUnpack = true; installPhase = '' - makeWrapper ${jre}/bin/java $out/bin/metabase --add-flags "-jar $src" + makeWrapper ${jdk11}/bin/java $out/bin/metabase --add-flags "-jar $src" ''; meta = with lib; { diff --git a/pkgs/servers/microserver/default.nix b/pkgs/servers/microserver/default.nix index 4090aebc8f0..30557460077 100644 --- a/pkgs/servers/microserver/default.nix +++ b/pkgs/servers/microserver/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0cyxa200iz7knkma4zi3mzky3g0kibbxd5303psk2rl2rppir0f7"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security ]); + buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security ]); meta = with lib; { homepage = "https://github.com/robertohuertasm/microserver"; diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/servers/miniflux/default.nix index 55dd3d8afc5..08af694560b 100644 --- a/pkgs/servers/miniflux/default.nix +++ b/pkgs/servers/miniflux/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, nixosTests }: let pname = "miniflux"; - version = "2.0.23"; + version = "2.0.27"; in buildGoModule { inherit pname version; @@ -11,14 +11,16 @@ in buildGoModule { owner = pname; repo = pname; rev = version; - sha256 = "0v0n5lvrfn3ngs1s1m3hv95dvnqn8ysksb044m4ifk2cr3b77ryc"; + sha256 = "0sl1hxdybafzpa1bi22b8r4fxdzwynr012ga5jvwcn2rcxbdbd8z"; }; - vendorSha256 = "1iin5r9l8wb9gm0bwgdmpx0cp1q35ij4y7zf98lnj2kvb3jv5crp"; + vendorSha256 = "183whf29zq771rq0z4008gwaps1iipb0m9kp6xyizbnzafwm3zwm"; nativeBuildInputs = [ installShellFiles ]; - doCheck = true; + checkPhase = '' + go test $(go list ./... | grep -v client) + ''; # skip client tests as they require network access buildFlagsArray = '' -ldflags=-s -w -X miniflux.app/version.Version=${version} diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index cd7e1d4141d..9477da8a3f8 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "minio"; - version = "2020-10-18T21-54-12Z"; + version = "2021-01-16T02-19-44Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "0yva6hwfczq0apg8cl0xvm5xzyazxnic4bh2xxm1nq4iqw2p2177"; + sha256 = "sha256-eYOarXgx5+rXCw2gMzrH1vVSsIdN4WrHrAUnnCcLtN8="; }; - vendorSha256 = "185njxpaynnq8yydmkdh1sf6x924p69w7brqwl42ny1gylwv2chp"; + vendorSha256 = "sha256-6p/DBgHawsT5PjpzwjrKgZfWm5Z6v1ozMWzGpEiB2jM="; doCheck = false; diff --git a/pkgs/servers/mirrorbits/default.nix b/pkgs/servers/mirrorbits/default.nix index 653ca399fcf..759ac94e568 100644 --- a/pkgs/servers/mirrorbits/default.nix +++ b/pkgs/servers/mirrorbits/default.nix @@ -1,5 +1,5 @@ { lib, buildGoPackage, fetchFromGitHub, fetchpatch -, pkgconfig, zlib, geoip }: +, pkg-config, zlib, geoip }: buildGoPackage rec { pname = "mirrorbits"; @@ -33,7 +33,7 @@ buildGoPackage rec { deleteVendor = true; goDeps = ./deps.nix; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib geoip ]; meta = { diff --git a/pkgs/servers/misc/airsonic/default.nix b/pkgs/servers/misc/airsonic/default.nix index f20fed3e2df..bd8310bc74f 100644 --- a/pkgs/servers/misc/airsonic/default.nix +++ b/pkgs/servers/misc/airsonic/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Personal media streamer"; homepage = "https://airsonic.github.io"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ disassembler ]; }; diff --git a/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix b/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix index 39adc6b78ee..d6a25b3675f 100644 --- a/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix +++ b/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix @@ -1,4 +1,4 @@ -{ mkDerivation, fetchFromGitHub, base, bytestring, network, stdenv }: +{ mkDerivation, fetchFromGitHub, base, bytestring, network, lib }: mkDerivation { pname = "client-ip-echo"; version = "0.1.0.5"; @@ -12,5 +12,5 @@ mkDerivation { isExecutable = true; executableHaskellDepends = [ base bytestring network ]; description = "accepts TCP connections and echoes the client's IP address back to it"; - license = stdenv.lib.licenses.lgpl3; + license = lib.licenses.lgpl3; } diff --git a/pkgs/servers/misc/navidrome/default.nix b/pkgs/servers/misc/navidrome/default.nix index 9df7ad827f0..9b276afa4bc 100644 --- a/pkgs/servers/misc/navidrome/default.nix +++ b/pkgs/servers/misc/navidrome/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, ffmpeg, ffmpegSupport ? true, makeWrapper }: +{ lib, stdenv, fetchurl, ffmpeg, ffmpegSupport ? true, makeWrapper }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "navidrome"; diff --git a/pkgs/servers/misc/oven-media-engine/default.nix b/pkgs/servers/misc/oven-media-engine/default.nix index f7c97abf104..6a63292301b 100644 --- a/pkgs/servers/misc/oven-media-engine/default.nix +++ b/pkgs/servers/misc/oven-media-engine/default.nix @@ -4,7 +4,7 @@ , srt , ffmpeg_3_4 , bc -, pkgconfig +, pkg-config , perl , openssl , zlib @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { makeFlags = "release CONFIG_LIBRARY_PATHS= CONFIG_PKG_PATHS= GLOBAL_CC=$(CC) GLOBAL_CXX=$(CXX) GLOBAL_LD=$(CXX) SHELL=${stdenv.shell}"; enableParallelBuilding = true; - nativeBuildInputs = [ bc pkgconfig perl ]; + nativeBuildInputs = [ bc pkg-config perl ]; buildInputs = [ openssl srt zlib ffmpeg libvpx libopus srtp jemalloc pcre2 ]; preBuild = '' diff --git a/pkgs/servers/misc/taskserver/default.nix b/pkgs/servers/misc/taskserver/default.nix index 4cd2e13e4a5..bbd2a4a70da 100644 --- a/pkgs/servers/misc/taskserver/default.nix +++ b/pkgs/servers/misc/taskserver/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, libuuid, gnutls, makeWrapper }: +{ lib, stdenv, fetchurl, cmake, libuuid, gnutls, makeWrapper }: stdenv.mkDerivation rec { pname = "taskserver"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { echo wrapping $i makeWrapper $pkipath/$i $out/bin/taskd-pki-$i \ - --prefix PATH : ${stdenv.lib.makeBinPath [ gnutls ]} + --prefix PATH : ${lib.makeBinPath [ gnutls ]} done ''; @@ -34,8 +34,8 @@ stdenv.mkDerivation rec { meta = { description = "Server for synchronising Taskwarrior clients"; homepage = "https://taskwarrior.org"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ matthiasbeyer makefu ]; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ matthiasbeyer makefu ]; }; } diff --git a/pkgs/servers/monitoring/alertmanager-bot/default.nix b/pkgs/servers/monitoring/alertmanager-bot/default.nix index 562bd1ea815..1eaaf01578f 100644 --- a/pkgs/servers/monitoring/alertmanager-bot/default.nix +++ b/pkgs/servers/monitoring/alertmanager-bot/default.nix @@ -1,19 +1,25 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "alertmanager-bot"; - version = "0.4.0"; - - goPackagePath = "github.com/metalmatze/alertmanager-bot"; + version = "0.4.3"; src = fetchFromGitHub { owner = "metalmatze"; repo = pname; rev = version; - sha256 = "10v0fxxcs5s6zmqindr30plyw7p2yg0a64rdw1b2cj2mc1m3byx3"; + sha256 = "1hjfkksqb675gabzjc221b33h2m4s6qsanmkm382d3fyzqj71dh9"; }; - goDeps = ./deps.nix; + vendorSha256 = "1v0fgin8dn81b559zz4lqmrl7hikr46g4gb18sci4riql5qs1isj"; + + postPatch = '' + sed "s;/templates/default.tmpl;$out/share&;" -i cmd/alertmanager-bot/main.go + ''; + + postInstall = '' + install -Dm644 -t $out/share/templates $src/default.tmpl + ''; meta = with lib; { description = "Bot for Prometheus' Alertmanager"; diff --git a/pkgs/servers/monitoring/alertmanager-bot/deps.nix b/pkgs/servers/monitoring/alertmanager-bot/deps.nix deleted file mode 100644 index 51e98ccbc93..00000000000 --- a/pkgs/servers/monitoring/alertmanager-bot/deps.nix +++ /dev/null @@ -1,948 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/DataDog/datadog-go"; - fetch = { - type = "git"; - url = "https://github.com/DataDog/datadog-go"; - rev = "0ddda6bee211"; - sha256 = "07ap1qhz8vwdypmlny5gxnc191c0qbm6acacs30m1d4p22x6wxip"; - }; - } - { - goPackagePath = "github.com/OneOfOne/xxhash"; - fetch = { - type = "git"; - url = "https://github.com/OneOfOne/xxhash"; - rev = "v1.2.5"; - sha256 = "15ai4nzm8cv8nqs4xm5h6ghnms19c2sp8z0zpkc46rld6y7k0xky"; - }; - } - { - 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/armon/circbuf"; - fetch = { - type = "git"; - url = "https://github.com/armon/circbuf"; - rev = "bbbad097214e"; - sha256 = "1idpr0lzb2px2p3wgfq2276yl7jpaz43df6n91kf790404s4zmk3"; - }; - } - { - goPackagePath = "github.com/armon/go-metrics"; - fetch = { - type = "git"; - url = "https://github.com/armon/go-metrics"; - rev = "f0300d1749da"; - sha256 = "13l7c35ps0r27vxfil2w0xhhc7w5rh00awvlmn4cz0a937b9ffpv"; - }; - } - { - goPackagePath = "github.com/armon/go-radix"; - fetch = { - type = "git"; - url = "https://github.com/armon/go-radix"; - rev = "7fddfc383310"; - sha256 = "0y8chspn14n9xpsfb9gxnnf819rfpriaz64v81p7873a42kkhxb4"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "v1.0.1"; - sha256 = "17n4yygjxa6p499dj3yaqzfww2g7528165cl13haj97hlx94dgl7"; - }; - } - { - goPackagePath = "github.com/bgentry/speakeasy"; - fetch = { - type = "git"; - url = "https://github.com/bgentry/speakeasy"; - rev = "v0.1.0"; - sha256 = "02dfrj0wyphd3db9zn2mixqxwiz1ivnyc5xc7gkz58l5l27nzp8s"; - }; - } - { - goPackagePath = "github.com/boltdb/bolt"; - fetch = { - type = "git"; - url = "https://github.com/boltdb/bolt"; - rev = "v1.3.1"; - sha256 = "0z7j06lijfi4y30ggf2znak2zf2srv2m6c68ar712wd2ys44qb3r"; - }; - } - { - goPackagePath = "github.com/cenkalti/backoff"; - fetch = { - type = "git"; - url = "https://github.com/cenkalti/backoff"; - rev = "v2.1.1"; - sha256 = "1mf4lsl3rbb8kk42x0mrhzzy4ikqy0jf6nxpzhkr02rdgwh6rjk8"; - }; - } - { - goPackagePath = "github.com/cespare/xxhash"; - fetch = { - type = "git"; - url = "https://github.com/cespare/xxhash"; - rev = "v1.0.0"; - sha256 = "02aii7z46sasagw816zz3v0gzax1z5d1hkjslz7ng25386p0gzk1"; - }; - } - { - goPackagePath = "github.com/circonus-labs/circonus-gometrics"; - fetch = { - type = "git"; - url = "https://github.com/circonus-labs/circonus-gometrics"; - rev = "v2.0.0"; - sha256 = "0d6cnswq28mjak7092vf89f9l0ga2ziwyamq9kdgfc7aavpwr6l9"; - }; - } - { - goPackagePath = "github.com/circonus-labs/circonusllhist"; - fetch = { - type = "git"; - url = "https://github.com/circonus-labs/circonusllhist"; - rev = "6e85b9352cf0"; - sha256 = "182gry1clk12m34574qif7bx74qpxib2zv0mr5kv2j9hfq7f9m01"; - }; - } - { - goPackagePath = "github.com/creack/pty"; - fetch = { - type = "git"; - url = "https://github.com/creack/pty"; - rev = "v1.1.7"; - sha256 = "1plwwlk1i9b80zv8zdplvv81shfyc9gf0flydnydsh5sr3ib5vrc"; - }; - } - { - 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/docker/libkv"; - fetch = { - type = "git"; - url = "https://github.com/docker/libkv"; - rev = "v0.2.1"; - sha256 = "0blq7kxjy1bvm3j5q4i6csnc4i88c1wvj4gjvxbqfk3sny73gjkr"; - }; - } - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "v1.7.0"; - sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; - }; - } - { - goPackagePath = "github.com/fsnotify/fsnotify"; - fetch = { - type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "v1.4.7"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - 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.2"; - sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym"; - }; - } - { - 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.3.1"; - sha256 = "1caw49i0plkjxir7kdf5qhwls3krqwfmi7g4h392rdfwi3kfahx1"; - }; - } - { - goPackagePath = "github.com/google/gofuzz"; - fetch = { - type = "git"; - url = "https://github.com/google/gofuzz"; - rev = "v1.0.0"; - sha256 = "0qz439qvccm91w0mmjz4fqgx48clxdwagkvvx89cr43q1d4iry36"; - }; - } - { - goPackagePath = "github.com/hako/durafmt"; - fetch = { - type = "git"; - url = "https://github.com/hako/durafmt"; - rev = "ea3ab126a649"; - sha256 = "1niq0v6av5vsn4rizfda4zq922jvavig5b0qg9g0gyz6cj62rjzs"; - }; - } - { - goPackagePath = "github.com/hashicorp/consul"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/consul"; - rev = "v1.4.5"; - sha256 = "0gpg3cbpsmzcaab3scqhpzz57892s95hwq5z0l9bq7qqm6iqfr9d"; - }; - } - { - goPackagePath = "github.com/hashicorp/errwrap"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/errwrap"; - rev = "v1.0.0"; - sha256 = "0slfb6w3b61xz04r32bi0a1bygc82rjzhqkxj2si2074wynqnr1c"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-cleanhttp"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-cleanhttp"; - rev = "3573b8b52aa7"; - sha256 = "1pbl6p7w5wp1c70x7fp94h4ynk2ajfa76rqin3d2hq1w2fcb7byr"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-immutable-radix"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-immutable-radix"; - rev = "v1.0.0"; - sha256 = "1v3nmsnk1s8bzpclrhirz7iq0g5xxbw9q5gvrg9ss6w9crs72qr6"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-msgpack"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-msgpack"; - rev = "v0.5.5"; - sha256 = "0fqmfx3dxnvb0d23cpn2xpd067pibwlchdc58ln8w6lznzrbzaan"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-multierror"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-multierror"; - rev = "v1.0.0"; - sha256 = "00nyn8llqzbfm8aflr9kwsvpzi4kv8v45c141v88xskxp5xf6z49"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-retryablehttp"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-retryablehttp"; - rev = "794af36148bf"; - sha256 = "1686d4qav0ayj3f5881w3kd9pz4fxsmknfqwccbj9yklxm3khvp4"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-rootcerts"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-rootcerts"; - rev = "v1.0.1"; - sha256 = "0ca5h7vlvrghf24dzh8l6w5px293n173qxfkjxb9kgsl6hsrsl3y"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-sockaddr"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-sockaddr"; - rev = "v1.0.2"; - sha256 = "0y106nhd3s63lj7h7k21iq0br97h0z9qjrvx028zqcsq9407k9is"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-syslog"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-syslog"; - rev = "v1.0.0"; - sha256 = "09vccqggz212cg0jir6vv708d6mx0f9w5bxrcdah3h6chgmal6v1"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-uuid"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-uuid"; - rev = "v1.0.1"; - sha256 = "0jvb88m0rq41bwgirsadgw7mnayl27av3gd2vqa3xvxp3fy0hp5k"; - }; - } - { - goPackagePath = "github.com/hashicorp/golang-lru"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/golang-lru"; - rev = "v0.5.3"; - sha256 = "1p2igd58xkm8yaj2c2wxiplkf2hj6kxwrg6ss7mx61s5rd71v5xb"; - }; - } - { - goPackagePath = "github.com/hashicorp/logutils"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/logutils"; - rev = "v1.0.0"; - sha256 = "076wf4sh5p3f953ndqk1cc0x7jhmlqrxak9953rz79rcdw77rjvv"; - }; - } - { - goPackagePath = "github.com/hashicorp/mdns"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/mdns"; - rev = "v1.0.1"; - sha256 = "185zpyj1jf1jm7hihg73gqnspr0a359aqwv11v4a6mwd5bkdh19j"; - }; - } - { - goPackagePath = "github.com/hashicorp/memberlist"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/memberlist"; - rev = "v0.1.4"; - sha256 = "0l9qx8j7mm00ia6m41zbn39z7p77jjf95zph2nw8j2vihm56q9ql"; - }; - } - { - goPackagePath = "github.com/hashicorp/serf"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/serf"; - rev = "v0.8.3"; - sha256 = "0isaq2m08rpwvlzd72gvy3caapkrzgr9cwizl99ainsjgj2nkds9"; - }; - } - { - goPackagePath = "github.com/hashicorp/uuid"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/uuid"; - rev = "ebb0a03e909c"; - sha256 = "0bzqr8y81h96cw299lhc5nxi9203a7xpd7csjsm6rh4k1bx4hdlf"; - }; - } - { - goPackagePath = "github.com/hashicorp/yamux"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/yamux"; - rev = "f5742cb6b856"; - sha256 = "1k9b399ljsp443s1v69c1m5jqdiw1998ryz4b4lh86nkz775ws5s"; - }; - } - { - goPackagePath = "github.com/hpcloud/tail"; - fetch = { - type = "git"; - url = "https://github.com/hpcloud/tail"; - rev = "v1.0.0"; - sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0"; - }; - } - { - goPackagePath = "github.com/joho/godotenv"; - fetch = { - type = "git"; - url = "https://github.com/joho/godotenv"; - rev = "v1.3.0"; - sha256 = "0ri8if0pc3x6jg4c3i8wr58xyfpxkwmcjk3rp8gb398a1aa3gpjm"; - }; - } - { - goPackagePath = "github.com/json-iterator/go"; - fetch = { - type = "git"; - url = "https://github.com/json-iterator/go"; - rev = "v1.1.7"; - sha256 = "0n79p4s67zl5zprxv7diayw3vavnmmfqkmd6snz0i9bxp825dsyz"; - }; - } - { - 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/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.8"; - sha256 = "1vcl6f90n0f8s8b4fyh0832ilybjqcypqyj233lqj1hx62fvgdbk"; - }; - } - { - goPackagePath = "github.com/kr/text"; - fetch = { - type = "git"; - url = "https://github.com/kr/text"; - rev = "v0.1.0"; - sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; - }; - } - { - goPackagePath = "github.com/kylelemons/godebug"; - fetch = { - type = "git"; - url = "https://github.com/kylelemons/godebug"; - rev = "v1.1.0"; - sha256 = "0dkk3friykg8p6wgqryx6745ahhb9z1j740k7px9dac6v5xjp78c"; - }; - } - { - 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.9"; - sha256 = "0i3km37lajahh1y2392g4hpgvq05arcgiiv93yhzxxyv0fpqj72m"; - }; - } - { - 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/miekg/dns"; - fetch = { - type = "git"; - url = "https://github.com/miekg/dns"; - rev = "v1.0.15"; - sha256 = "051f51fyrsnj69j9ni9j72acqnrvvzqda4l831ijffy5h5jdl8f2"; - }; - } - { - goPackagePath = "github.com/mitchellh/cli"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/cli"; - rev = "v1.0.0"; - sha256 = "1i9kmr7rcf10d2hji8h4247hmc0nbairv7a0q51393aw2h1bnwg2"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-homedir"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-homedir"; - rev = "v1.1.0"; - sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-testing-interface"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-testing-interface"; - rev = "v1.0.0"; - sha256 = "1dl2js8di858bawg7dadlf1qjpkl2g3apziihjyf5imri3znyfpw"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-wordwrap"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-wordwrap"; - rev = "v1.0.0"; - sha256 = "1jffbwcr3nnq6c12c5856bwzv2nxjzqk3jwgvxkwi1xhpd2by0bf"; - }; - } - { - goPackagePath = "github.com/mitchellh/hashstructure"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/hashstructure"; - rev = "2bca23e0e452"; - sha256 = "0vpacsls26474wya360fjhzi6l4y8s8s251c4szvqxh17n5f5gk1"; - }; - } - { - goPackagePath = "github.com/mitchellh/mapstructure"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/mapstructure"; - rev = "d0303fe80992"; - sha256 = "1fjwi5ghc1ibyx93apz31n4hj6gcq1hzismpdfbg2qxwshyg0ya8"; - }; - } - { - 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/oklog/run"; - fetch = { - type = "git"; - url = "https://github.com/oklog/run"; - rev = "v1.0.0"; - sha256 = "1pbjza4claaj95fpqvvfrysvs10y7dm0pl6qr5lzh6qy1vnhmcgw"; - }; - } - { - goPackagePath = "github.com/onsi/ginkgo"; - fetch = { - type = "git"; - url = "https://github.com/onsi/ginkgo"; - rev = "v1.6.0"; - sha256 = "0x0gc89vgq38xhgmi2h22bhr73cf2gmk42g89nz89k8dgg9hhr25"; - }; - } - { - goPackagePath = "github.com/onsi/gomega"; - fetch = { - type = "git"; - url = "https://github.com/onsi/gomega"; - rev = "v1.4.3"; - sha256 = "1c8rqg5i2hz3snmq7s41yar1zjnzilb0fyiyhkg83v97afcfx79v"; - }; - } - { - goPackagePath = "github.com/pascaldekloe/goe"; - fetch = { - type = "git"; - url = "https://github.com/pascaldekloe/goe"; - rev = "v0.1.0"; - sha256 = "1dqd3mfb4z2vmv6pg6fhgvfc53vhndk24wcl9lj1rz02n6m279fq"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "v0.8.1"; - sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1"; - }; - } - { - 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/posener/complete"; - fetch = { - type = "git"; - url = "https://github.com/posener/complete"; - rev = "v1.1.2"; - sha256 = "02xrnfkk9r2jarna8jqfkksrn469jdap716037zq84waq3d5xk3l"; - }; - } - { - goPackagePath = "github.com/prometheus/alertmanager"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/alertmanager"; - rev = "v0.9.1"; - sha256 = "1lkfj63pp4jf58xmn015r7s42p1wyj6fryihpmdn0k76b0ccwqzj"; - }; - } - { - 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.3"; - sha256 = "18c4m795fwng8f8qa395f3crvamlbk5y5afk8b5rzyisnmjq774y"; - }; - } - { - goPackagePath = "github.com/ryanuber/columnize"; - fetch = { - type = "git"; - url = "https://github.com/ryanuber/columnize"; - rev = "v2.1.0"; - sha256 = "0m9jhagb1k44zfcdai76xdf9vpi3bqdl7p078ffyibmz0z9jfap6"; - }; - } - { - goPackagePath = "github.com/satori/go.uuid"; - fetch = { - type = "git"; - url = "https://github.com/satori/go.uuid"; - rev = "v1.1.0"; - sha256 = "1nbydsmjr60904kz5d46nib0zid5kcv4gk9wayi44gn5wlzz80zp"; - }; - } - { - goPackagePath = "github.com/sean-/seed"; - fetch = { - type = "git"; - url = "https://github.com/sean-/seed"; - rev = "e2103e2c3529"; - sha256 = "0glir8jxi1w7aga2jwdb63pp1h8q4whknili7xixsqzwyy716125"; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "v1.2.0"; - sha256 = "0r6334x2bls8ddznvzaldx4g88msjjns4mlks95rqrrg7h0ijigg"; - }; - } - { - goPackagePath = "github.com/spaolacci/murmur3"; - fetch = { - type = "git"; - url = "https://github.com/spaolacci/murmur3"; - rev = "v1.1.0"; - sha256 = "1lv3zyz3jy2d76bhvvs8svygx66606iygdvwy5cwc0p5z8yghq25"; - }; - } - { - 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 = "github.com/tucnak/telebot"; - fetch = { - type = "git"; - url = "https://github.com/tucnak/telebot"; - rev = "00cebf376d79"; - sha256 = "0yay3h7gp6yag8jbapbq10vhmszad7svn68nnq5yp6pl1hmykzd6"; - }; - } - { - goPackagePath = "github.com/weaveworks/mesh"; - fetch = { - type = "git"; - url = "https://github.com/weaveworks/mesh"; - rev = "f74318fb713b"; - sha256 = "093j5i7wrkq1g92xaprd0rlfv9i74381wns4941bhbp6x6ahdcz7"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "45a5f77698d3"; - sha256 = "0636jjj89wkzqchajwwzgcn4aafc334p70nawh9jzavg2mkx0ch4"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "891ebc4b82d6"; - sha256 = "1rgw5gl2lc6bkmsx0fak84s6zdc1bhzfxgqg4mg4yh5hlnhpwrki"; - }; - } - { - 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 = "fde4db37ae7a"; - sha256 = "16k4w4pzziq1kln18k5fg01qgk4hpzb5xsm7175kaky6d6gwyhg3"; - }; - } - { - 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 = "google.golang.org/appengine"; - fetch = { - type = "git"; - url = "https://github.com/golang/appengine"; - rev = "v1.1.0"; - sha256 = "1pz202zszg8f35dk5pfhwgcdi3r6dx1l4yk6x6ly7nb4j45zi96x"; - }; - } - { - goPackagePath = "gopkg.in/airbrake/gobrake.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/airbrake/gobrake.v2"; - rev = "v2.0.9"; - sha256 = "1x06f7n7qlyzqgyz0sdfcidf3w4ldn6zs6qx2mhibggk2z4whcjw"; - }; - } - { - 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/gemnasium/logrus-airbrake-hook.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/gemnasium/logrus-airbrake-hook.v2"; - rev = "v2.1.2"; - sha256 = "0sbg0dn6cysmf8f2bi209jwl4jnpiwp4rdghnxlzirw3c32ms5y5"; - }; - } - { - goPackagePath = "gopkg.in/tomb.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/tomb.v1"; - rev = "dd632973f1e7"; - sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv"; - }; - } - { - goPackagePath = "gopkg.in/vmihailenco/msgpack.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/vmihailenco/msgpack.v2"; - rev = "v2.9.1"; - sha256 = "0ah9j7i97ifyqhiscq8d43gcrhksb3bx83s2p1nyfi1bxw78jwfi"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.2"; - sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; - }; - } -] diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix index 04767d0f71c..8501aa5e02c 100644 --- a/pkgs/servers/monitoring/cadvisor/default.nix +++ b/pkgs/servers/monitoring/cadvisor/default.nix @@ -1,19 +1,19 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "cadvisor"; - version = "0.37.0"; + version = "0.38.7"; src = fetchFromGitHub { owner = "google"; repo = "cadvisor"; rev = "v${version}"; - sha256 = "15njzwvsl7jc2hgxlpsksmn7md3bqpavzaskfdlmzxnxp3biw3cj"; + sha256 = "sha256-2gwN3/sYPcDy1EUxt9mYviciN9/ZVdChIsuMt3Ueq68="; }; modRoot = "./cmd"; - vendorSha256 = "1vbydwj3xrz2gimwfasiqiwzsdiplaq7imildzr4wspkk64dprf4"; + vendorSha256 = "sha256-FMO+wNmjFFD9+/9mhNcyZftk8ryhwFXDZeEy/h5EMWc="; buildFlagsArray = [ "-ldflags=-s -w -X github.com/google/cadvisor/version.Version=${version}" ]; diff --git a/pkgs/servers/monitoring/consul-alerts/default.nix b/pkgs/servers/monitoring/consul-alerts/default.nix index 896664658cf..4cf5f6b8068 100644 --- a/pkgs/servers/monitoring/consul-alerts/default.nix +++ b/pkgs/servers/monitoring/consul-alerts/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "consul-alerts"; diff --git a/pkgs/servers/monitoring/do-agent/default.nix b/pkgs/servers/monitoring/do-agent/default.nix index 6ebcf940146..2a6c675ce1a 100644 --- a/pkgs/servers/monitoring/do-agent/default.nix +++ b/pkgs/servers/monitoring/do-agent/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "do-agent"; - version = "3.8.0"; + version = "3.9.0"; src = fetchFromGitHub { owner = "digitalocean"; repo = "do-agent"; rev = version; - sha256 = "141hmkswb65sq99ad6vg4dkrbhsmni88hlrfdxqdn89hvsz8f7b2"; + sha256 = "sha256-0m2dL7oFF45yR4Vu+AW3ROf16w1iioI5McVauOQA/XQ="; }; buildFlagsArray = '' diff --git a/pkgs/servers/monitoring/fusion-inventory/default.nix b/pkgs/servers/monitoring/fusion-inventory/default.nix index a9492873078..0034c253c77 100644 --- a/pkgs/servers/monitoring/fusion-inventory/default.nix +++ b/pkgs/servers/monitoring/fusion-inventory/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, perlPackages, nix, dmidecode, pciutils, usbutils, iproute, nettools +{ lib, perlPackages, nix, dmidecode, pciutils, usbutils, iproute, nettools , fetchFromGitHub, makeWrapper }: @@ -76,7 +76,7 @@ perlPackages.buildPerlPackage rec { meta = with lib; { homepage = "http://www.fusioninventory.org"; description = "FusionInventory unified Agent for UNIX, Linux, Windows and MacOSX"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; maintainers = [ maintainers.phile314 ]; }; } diff --git a/pkgs/servers/monitoring/grafana-agent/default.nix b/pkgs/servers/monitoring/grafana-agent/default.nix new file mode 100644 index 00000000000..520aedf2c3f --- /dev/null +++ b/pkgs/servers/monitoring/grafana-agent/default.nix @@ -0,0 +1,41 @@ +{ lib, buildGoModule, fetchFromGitHub, systemd }: + +buildGoModule rec { + pname = "grafana-agent"; + version = "0.11.0"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "grafana"; + repo = "agent"; + sha256 = "092ry9gq9fpkkgsdymfwzdxz982pp0ljf2gs6mp419ivvllzwhiv"; + }; + + vendorSha256 = null; + + # uses go-systemd, which uses libsystemd headers + # https://github.com/coreos/go-systemd/issues/351 + NIX_CFLAGS_COMPILE = [ "-I${lib.getDev systemd}/include" ]; + + # tries to access /sys: https://github.com/grafana/agent/issues/333 + preBuild = '' + rm pkg/integrations/node_exporter/node_exporter_test.go + ''; + + # go-systemd uses libsystemd under the hood, which does dlopen(libsystemd) at + # runtime. + # Add to RUNPATH so it can be found. + postFixup = '' + patchelf \ + --set-rpath "${lib.makeLibraryPath [ (lib.getLib systemd) ]}:$(patchelf --print-rpath $out/bin/agent)" \ + $out/bin/agent + ''; + + meta = with lib; { + description = "A lightweight subset of Prometheus and more, optimized for Grafana Cloud"; + license = licenses.asl20; + homepage = "https://grafana.com/products/cloud"; + maintainers = with maintainers; [ flokli ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/servers/monitoring/grafana-reporter/default.nix b/pkgs/servers/monitoring/grafana-reporter/default.nix index d6f3c28d82b..da60be64603 100644 --- a/pkgs/servers/monitoring/grafana-reporter/default.nix +++ b/pkgs/servers/monitoring/grafana-reporter/default.nix @@ -1,6 +1,6 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, tetex, makeWrapper }: +{ lib, buildGoPackage, fetchFromGitHub, tetex, makeWrapper }: -with stdenv.lib; +with lib; buildGoPackage rec { pname = "reporter"; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index c06da6fee11..9dc18936acf 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "7.3.6"; + version = "7.3.7"; excludedPackages = [ "release_publisher" ]; @@ -10,15 +10,15 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "10hm5bz2q9mccrjx1x77xckqvn2x9m7cl2dn60gvrl8m7q3afscp"; + sha256 = "134x2jqrczp5qfa2rmqc7jikv3w258kks532jp1qi65qk7w7jhb9"; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "1fl4ng39qkc01nv49cfzm19sv3yzzshl22ylkwlsb41rmaifbd1f"; + sha256 = "052r9gajggd9jlwnl82hq0jflhlz7cbdflkjapq4nx3rpnfscqgp"; }; - vendorSha256 = "0p4wwacvka5lgzwhlwnn6iiwi9x67zgqf0l4vblpfckvvb3ar41h"; + vendorSha256 = "0474d5y40q7i7k1gm1k7ac1dqhizvqql8w9nn44qxb7g2w2bfqiv"; postPatch = '' substituteInPlace pkg/cmd/grafana-server/main.go \ diff --git a/pkgs/servers/monitoring/lcdproc/default.nix b/pkgs/servers/monitoring/lcdproc/default.nix index 41247362799..551fa028811 100644 --- a/pkgs/servers/monitoring/lcdproc/default.nix +++ b/pkgs/servers/monitoring/lcdproc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, makeWrapper, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, makeWrapper, pkg-config , doxygen, freetype, libX11, libftdi, libusb-compat-0_1, libusb1, ncurses, perl }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ freetype libX11 libftdi libusb-compat-0_1 libusb1 ncurses ]; - nativeBuildInputs = [ autoreconfHook doxygen makeWrapper pkgconfig ]; + nativeBuildInputs = [ autoreconfHook doxygen makeWrapper pkg-config ]; # In 0.5.9: gcc: error: libbignum.a: No such file or directory enableParallelBuilding = false; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { postFixup = '' for f in $out/bin/*.pl ; do substituteInPlace $f \ - --replace /usr/bin/perl ${stdenv.lib.getBin perl}/bin/perl + --replace /usr/bin/perl ${lib.getBin perl}/bin/perl done # NixOS will not use this file anyway but at least we can now execute LCDd diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix index 5e630623dab..99f83e1bfbd 100644 --- a/pkgs/servers/monitoring/loki/default.nix +++ b/pkgs/servers/monitoring/loki/default.nix @@ -17,9 +17,9 @@ buildGoModule rec { subPackages = [ "..." ]; nativeBuildInputs = [ makeWrapper ]; - buildInputs = stdenv.lib.optionals stdenv.isLinux [ systemd.dev ]; + buildInputs = lib.optionals stdenv.isLinux [ systemd.dev ]; - preFixup = stdenv.lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString stdenv.isLinux '' wrapProgram $out/bin/promtail \ --prefix LD_LIBRARY_PATH : "${lib.getLib systemd}/lib" ''; diff --git a/pkgs/servers/monitoring/mackerel-agent/default.nix b/pkgs/servers/monitoring/mackerel-agent/default.nix index 6b8f01bad70..a8cf124fc7e 100644 --- a/pkgs/servers/monitoring/mackerel-agent/default.nix +++ b/pkgs/servers/monitoring/mackerel-agent/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "mackerel-agent"; - version = "0.70.3"; + version = "0.71.1"; src = fetchFromGitHub { owner = "mackerelio"; repo = pname; rev = "v${version}"; - sha256 = "1i02qmjinnwyi4aqczflj7skfsixn25id7fm760vr2dl2gmlfydg"; + sha256 = "sha256-xEUIfmQX7I+I2wi53vc1JZYDweY9OAAUd2TZJ125+iw="; }; nativeBuildInputs = [ makeWrapper ]; checkInputs = lib.optionals (!stdenv.isDarwin) [ nettools ]; buildInputs = lib.optionals (!stdenv.isDarwin) [ iproute ]; - vendorSha256 = "0kjky2mhs6dapnr4xpjpnbibp6y8r320igddplynsfsp8vwrfp7m"; + vendorSha256 = "sha256-yomxALecP+PycelOmwrteK/LoW7wsst7os+jcbF46Bs="; subPackages = [ "." ]; diff --git a/pkgs/servers/monitoring/mtail/default.nix b/pkgs/servers/monitoring/mtail/default.nix index 4c5da36f00e..b8a1c7bc50d 100644 --- a/pkgs/servers/monitoring/mtail/default.nix +++ b/pkgs/servers/monitoring/mtail/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mtail"; - version = "3.0.0-rc38"; + version = "3.0.0-rc43"; src = fetchFromGitHub { owner = "google"; repo = "mtail"; rev = "v${version}"; - sha256 = "0a9xwv8c4ivpyh1hm3nzssnqpr4c6br0qb27mz3sy6fp2p46c0ms"; + sha256 = "1lw7gz6fh3z7j4hin4q6y3wxxl4sgd4li1c0z60hmvfs671n6dg9"; }; - vendorSha256 = "03hicp3h4jrq7ihirpcmgkk5siiny3w2wnwhibaf36j9xllmf57f"; + vendorSha256 = "0zymch6xfnyzjzizrjljmscqf8m99580zxjwc2rb9hn0324shcwq"; doCheck = false; diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix index 12957f6d1bb..09af13951c9 100644 --- a/pkgs/servers/monitoring/nagios/default.nix +++ b/pkgs/servers/monitoring/nagios/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, php, gd, libpng, zlib, unzip, nixosTests }: +{ lib, stdenv, fetchurl, perl, php, gd, libpng, zlib, unzip, nixosTests }: stdenv.mkDerivation rec { pname = "nagios"; @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { meta = { description = "A host, service and network monitoring program"; homepage = "https://www.nagios.org/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ immae thoughtpolice relrod ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ immae thoughtpolice relrod ]; }; } diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix index 90ff605b733..eba2347333a 100644 --- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix +++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/check_ssl_cert \ - --prefix PATH : "${stdenv.lib.makeBinPath [ openssl file which curl ]}" + --prefix PATH : "${lib.makeBinPath [ openssl file which curl ]}" ''; meta = with lib; { diff --git a/pkgs/servers/monitoring/net-snmp/0002-autoconf-version.patch b/pkgs/servers/monitoring/net-snmp/0002-autoconf-version.patch deleted file mode 100644 index 0ebb1751d6b..00000000000 --- a/pkgs/servers/monitoring/net-snmp/0002-autoconf-version.patch +++ /dev/null @@ -1,7 +0,0 @@ -diff --git a/dist/autoconf-version b/dist/autoconf-version -index 264f2ce..5e1b8b0 100644 ---- a/dist/autoconf-version -+++ b/dist/autoconf-version -@@ -1 +1 @@ --2.68 -+2.69 diff --git a/pkgs/servers/monitoring/net-snmp/default.nix b/pkgs/servers/monitoring/net-snmp/default.nix index d2f31e4c372..8f354d4bb46 100644 --- a/pkgs/servers/monitoring/net-snmp/default.nix +++ b/pkgs/servers/monitoring/net-snmp/default.nix @@ -2,11 +2,12 @@ , file, openssl, perl, perlPackages, unzip, nettools, ncurses }: stdenv.mkDerivation rec { - name = "net-snmp-5.8"; + pname = "net-snmp"; + version = "5.9"; src = fetchurl { - url = "mirror://sourceforge/net-snmp/${name}.tar.gz"; - sha256 = "1pvajzj9gmj56dmwix0ywmkmy2pglh6nny646hkm7ghfhh03bz5j"; + url = "mirror://sourceforge/net-snmp/${pname}-${version}.tar.gz"; + sha256 = "0wb0vyafpspw3mcifkjjmf17r1r80kjvslycscb8nvaxz1k3lc04"; }; patches = @@ -17,7 +18,6 @@ stdenv.mkDerivation rec { in [ (fetchAlpinePatch "fix-includes.patch" "0zpkbb6k366qpq4dax5wknwprhwnhighcp402mlm7950d39zfa3m") (fetchAlpinePatch "netsnmp-swinst-crash.patch" "0gh164wy6zfiwiszh58fsvr25k0ns14r3099664qykgpmickkqid") - ./0002-autoconf-version.patch ]; outputs = [ "bin" "out" "dev" "lib" ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { "--with-openssl=${openssl.dev}" "--disable-embedded-perl" "--without-perl-modules" - ] ++ stdenv.lib.optional stdenv.isLinux "--with-mnttab=/proc/mounts"; + ] ++ lib.optional stdenv.isLinux "--with-mnttab=/proc/mounts"; postPatch = '' substituteInPlace testing/fulltests/support/simple_TESTCONF.sh --replace "/bin/netstat" "${nettools}/bin/netstat" diff --git a/pkgs/servers/monitoring/plugins/default.nix b/pkgs/servers/monitoring/plugins/default.nix index 8edac875a3a..15da6bc3f11 100644 --- a/pkgs/servers/monitoring/plugins/default.nix +++ b/pkgs/servers/monitoring/plugins/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, runCommand +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, runCommand , coreutils, gnugrep, gnused, lm_sensors, net-snmp, openssh, openssl, perl , dnsutils, libdbi, libmysqlclient, zlib, openldap, procps , runtimeShell }: -with stdenv.lib; +with lib; let majorVersion = "2.2"; diff --git a/pkgs/servers/monitoring/plugins/esxi.nix b/pkgs/servers/monitoring/plugins/esxi.nix index 6b609d8160d..1ca9e702e7a 100644 --- a/pkgs/servers/monitoring/plugins/esxi.nix +++ b/pkgs/servers/monitoring/plugins/esxi.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: let bName = "check_esxi_hardware"; in python3Packages.buildPythonApplication rec { - pname = stdenv.lib.replaceStrings [ "_" ] [ "-" ] bName; + pname = lib.replaceStrings [ "_" ] [ "-" ] bName; version = "20200710"; src = fetchFromGitHub { diff --git a/pkgs/servers/monitoring/plugins/labs_consol_de.nix b/pkgs/servers/monitoring/plugins/labs_consol_de.nix index ee66cde0c50..c293a4daa21 100644 --- a/pkgs/servers/monitoring/plugins/labs_consol_de.nix +++ b/pkgs/servers/monitoring/plugins/labs_consol_de.nix @@ -22,7 +22,7 @@ let nativeBuildInputs = [ autoreconfHook makeWrapper ]; - prePatch = with stdenv.lib; '' + prePatch = with lib; '' rm -rf GLPlugin ln -s ${glplugin} GLPlugin substituteInPlace plugins-scripts/Makefile.am \ diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix index a11fcf18c25..bc3cf7539ec 100644 --- a/pkgs/servers/monitoring/prometheus/alertmanager.nix +++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, go, buildGoPackage, fetchFromGitHub, installShellFiles }: +{ lib, go, buildGoPackage, fetchFromGitHub, installShellFiles }: buildGoPackage rec { pname = "alertmanager"; @@ -21,7 +21,7 @@ buildGoPackage rec { -X ${t}.Branch=unknown -X ${t}.BuildUser=nix@nixpkgs -X ${t}.BuildDate=unknown - -X ${t}.GoVersion=${stdenv.lib.getVersion go} + -X ${t}.GoVersion=${lib.getVersion go} ''; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix b/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix index 648bb59b0d2..64105c9c58f 100644 --- a/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "apcupsd-exporter"; diff --git a/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix b/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix index 2548e196837..af58a6ebe94 100644 --- a/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "aws-s3-exporter"; diff --git a/pkgs/servers/monitoring/prometheus/bind-exporter.nix b/pkgs/servers/monitoring/prometheus/bind-exporter.nix index d6f0f864dec..5cfdf615830 100644 --- a/pkgs/servers/monitoring/prometheus/bind-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/bind-exporter.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "bind_exporter"; - version = "20161221-${stdenv.lib.strings.substring 0 7 rev}"; + version = "20161221-${lib.strings.substring 0 7 rev}"; rev = "4e1717c7cd5f31c47d0c37274464cbaabdd462ba"; goPackagePath = "github.com/digitalocean/bind_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/bird-exporter.nix b/pkgs/servers/monitoring/prometheus/bird-exporter.nix index 5670233b054..3cb04304e26 100644 --- a/pkgs/servers/monitoring/prometheus/bird-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/bird-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "bird-exporter"; diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix index 3140056a269..88ef3f02602 100644 --- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "blackbox_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix index f86c3a42773..b3b61567d48 100644 --- a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "collectd-exporter"; diff --git a/pkgs/servers/monitoring/prometheus/consul-exporter.nix b/pkgs/servers/monitoring/prometheus/consul-exporter.nix index ab4b67402d3..c3cc7eff90a 100644 --- a/pkgs/servers/monitoring/prometheus/consul-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/consul-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "consul_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix index e0141718696..875db1777fb 100644 --- a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "dnsmasq_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix b/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix index c0d96b08bb6..ff7156360a9 100644 --- a/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "dovecot_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix index bc9058e36d9..cefa4579069 100644 --- a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "fritzbox-exporter"; diff --git a/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix b/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix index 718c8f2fcb1..18055f9b06a 100644 --- a/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gitlab-ci-pipelines-exporter"; diff --git a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix index e12c76e09f0..6a42297d502 100644 --- a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "haproxy_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/keylight-exporter.nix b/pkgs/servers/monitoring/prometheus/keylight-exporter.nix index e7ecffee992..a551e55b216 100644 --- a/pkgs/servers/monitoring/prometheus/keylight-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/keylight-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "keylight-exporter"; diff --git a/pkgs/servers/monitoring/prometheus/lnd-exporter.nix b/pkgs/servers/monitoring/prometheus/lnd-exporter.nix index 1f9c38922eb..34a9511d0b5 100644 --- a/pkgs/servers/monitoring/prometheus/lnd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/lnd-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "lndmon"; diff --git a/pkgs/servers/monitoring/prometheus/mail-exporter.nix b/pkgs/servers/monitoring/prometheus/mail-exporter.nix index daad5dc81cd..2d995ba5293 100644 --- a/pkgs/servers/monitoring/prometheus/mail-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mail-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, nixosTests }: buildGoModule { pname = "mailexporter"; diff --git a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix index 0fb7ee4fce3..0fa2bced125 100644 --- a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "mesos_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix b/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix index 5044db4b1c1..37f9b0c4e06 100644 --- a/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "mikrotik-exporter-unstable"; diff --git a/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix b/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix index 78642821b94..93e9bca3283 100644 --- a/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }: +{ lib, buildGoPackage, fetchFromGitHub, fetchpatch }: buildGoPackage rec { pname = "minio-exporter"; diff --git a/pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix b/pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix index c23d44dca38..e6178dd52a3 100644 --- a/pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "modemmanager-exporter"; diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix index ec181d2e110..ff32764fcde 100644 --- a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "mysqld_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/nextcloud-exporter-deps.nix b/pkgs/servers/monitoring/prometheus/nextcloud-exporter-deps.nix deleted file mode 100644 index bca32bdeccf..00000000000 --- a/pkgs/servers/monitoring/prometheus/nextcloud-exporter-deps.nix +++ /dev/null @@ -1,300 +0,0 @@ -# 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 = "v1.0.1"; - sha256 = "17n4yygjxa6p499dj3yaqzfww2g7528165cl13haj97hlx94dgl7"; - }; - } - { - 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.4.0"; - sha256 = "06smxc112xmixz78nyvk3b2hmc7wasf2sl5vxj1xz62kqcq9lzm9"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "v1.3.2"; - sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym"; - }; - } - { - goPackagePath = "github.com/google/go-cmp"; - fetch = { - type = "git"; - url = "https://github.com/google/go-cmp"; - rev = "v0.3.0"; - sha256 = "1hyxx3434zshl2m9ja78gwlkg1rx9yl6diqa7dnjb31xz5x4gbjj"; - }; - } - { - goPackagePath = "github.com/google/gofuzz"; - fetch = { - type = "git"; - url = "https://github.com/google/gofuzz"; - rev = "v1.0.0"; - sha256 = "0qz439qvccm91w0mmjz4fqgx48clxdwagkvvx89cr43q1d4iry36"; - }; - } - { - goPackagePath = "github.com/json-iterator/go"; - fetch = { - type = "git"; - url = "https://github.com/json-iterator/go"; - rev = "v1.1.7"; - sha256 = "0n79p4s67zl5zprxv7diayw3vavnmmfqkmd6snz0i9bxp825dsyz"; - }; - } - { - 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/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 = "v1.1.0"; - sha256 = "1r0irxkmfnj6ininb06w6ybknini5lz02idawrbkk2i5lq1qcvvf"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "14fe0d1b01d4"; - sha256 = "0zdmk6rbbx39cvfz0r59v2jg5sg9yd02b4pds5n5llgvivi99550"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "v0.6.0"; - sha256 = "1q16br348117ffycxdwsldb0i39p34miclfa8z93k6vjwnrqbh2l"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "v0.0.3"; - sha256 = "18c4m795fwng8f8qa395f3crvamlbk5y5afk8b5rzyisnmjq774y"; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "v1.2.0"; - sha256 = "0r6334x2bls8ddznvzaldx4g88msjjns4mlks95rqrrg7h0ijigg"; - }; - } - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "v1.0.3"; - sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd"; - }; - } - { - 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 = "4e8604ab3aff"; - sha256 = "1y4nvb8xqk3gzmkk3pc0bdphxbnphz71cld9i6f75js01pggaspc"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.0"; - sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; - }; - } - { - 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/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix b/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix index b3eb3a5cd84..e07c8a5a5c0 100644 --- a/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix @@ -1,21 +1,17 @@ -{ lib, fetchFromGitHub, buildGoPackage, nixosTests }: +{ lib, fetchFromGitHub, buildGoModule, nixosTests, fetchpatch }: -buildGoPackage rec { +buildGoModule rec { pname = "prometheus-nextcloud-exporter"; - version = "0.1.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "xperimental"; repo = "nextcloud-exporter"; rev = "v${version}"; - sha256 = "1xpc6q6zp92ckkyd24cfl65vyzjv60qwh44ys6mza4k6yrxhacv4"; + sha256 = "0kq0ka2gjlibl7vhk3s4z15ja5ai7cmwl144gj4dyhylp2xzr72a"; }; - goPackagePath = "github.com/xperimental/nextcloud-exporter"; - - goDeps = ./nextcloud-exporter-deps.nix; - - doCheck = true; + vendorSha256 = "0qs3p4jl8p0323bklrrhxzql7652pm6a1hj9ch9xyfhkwsx87l4d"; passthru.tests = { inherit (nixosTests.prometheus-exporters) nextcloud; }; diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix index 259b4f752d3..ee5bafbc7c9 100644 --- a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "nginx_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix b/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix index b15a54c6529..fad49d27575 100644 --- a/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "nginxlog_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix index e2b601f56c1..42ccb91017f 100644 --- a/pkgs/servers/monitoring/prometheus/node-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "node_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix b/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix index 8e3daa931ee..021905ba9e0 100644 --- a/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "openvpn_exporter-unstable"; diff --git a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix index c66373e9298..a24edd2fbb0 100644 --- a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix @@ -1,7 +1,7 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, makeWrapper, nixosTests +{ lib, buildGoPackage, fetchFromGitHub, makeWrapper, nixosTests , systemd, withSystemdSupport ? true }: -with stdenv.lib; +with lib; buildGoPackage rec { pname = "postfix_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/process-exporter.nix b/pkgs/servers/monitoring/prometheus/process-exporter.nix index 5a3c232ac85..a147a3c2905 100644 --- a/pkgs/servers/monitoring/prometheus/process-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/process-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "process-exporter"; diff --git a/pkgs/servers/monitoring/prometheus/prom2json.nix b/pkgs/servers/monitoring/prometheus/prom2json.nix index b333faf0bbd..a370bf1f248 100644 --- a/pkgs/servers/monitoring/prometheus/prom2json.nix +++ b/pkgs/servers/monitoring/prometheus/prom2json.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "prom2json"; diff --git a/pkgs/servers/monitoring/prometheus/promscale.nix b/pkgs/servers/monitoring/prometheus/promscale.nix index f4a9070fd84..a4ba3cee620 100644 --- a/pkgs/servers/monitoring/prometheus/promscale.nix +++ b/pkgs/servers/monitoring/prometheus/promscale.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildGoModule , fetchFromGitHub }: diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix index 29897267b6e..6eb9b4eb580 100644 --- a/pkgs/servers/monitoring/prometheus/pushgateway.nix +++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, go, buildGoPackage, fetchFromGitHub }: +{ lib, go, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "pushgateway"; - version = "1.3.0"; + version = "1.3.1"; rev = "v${version}"; goPackagePath = "github.com/prometheus/pushgateway"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "pushgateway"; - sha256 = "0ll6s8yqcx3fgn6gzmfb1bsfykl0ra6383nyw1kjbj260w200gls"; + sha256 = "sha256-z8xM9rq7wKH7bwzjSmGh+2pO5Y10szmIH82ztRrOCNs="; }; buildUser = "nix@nixpkgs"; @@ -24,7 +24,7 @@ buildGoPackage rec { -X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.Branch=${rev} -X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.BuildUser=${buildUser} -X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.BuildDate=${buildDate} - -X main.goVersion=${stdenv.lib.getVersion go} + -X main.goVersion=${lib.getVersion go} ''; doInstallCheck = true; diff --git a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix index 41069dabc6f..b7832395f62 100644 --- a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix @@ -1,17 +1,16 @@ -# This file was generated by https://github.com/kamilchm/go2nix v2.0-dev -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: -buildGoPackage { +buildGoPackage rec { pname = "rabbitmq_exporter"; - version = "0.25.2"; + version = "1.0.0-RC7.1"; goPackagePath = "github.com/kbudde/rabbitmq_exporter"; src = fetchFromGitHub { owner = "kbudde"; repo = "rabbitmq_exporter"; - rev = "8238c5d9ad509dab94e631cdecf3d75155fbdee4"; - sha256 = "1zb21jms2wlmiw5vhk1wyhv0xrv5a9y08y9q6x92hv727kjqjr6w"; + rev = "v${version}"; + sha256 = "5Agg99yHBMgpWGD6Nk+WvAorRc7j2PGD+3z7nO3N/5s="; }; goDeps = ./rabbitmq-exporter_deps.nix; diff --git a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter_deps.nix index 7a15a6a7b68..901edfaf6d9 100644 --- a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter_deps.nix +++ b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter_deps.nix @@ -1,12 +1,63 @@ -# This file was generated by https://github.com/kamilchm/go2nix v2.0-dev +# file generated from go.mod using vgo2nix (https://github.com/nix-community/vgo2nix) [ { - goPackagePath = "github.com/Sirupsen/logrus"; + goPackagePath = "bazil.org/fuse"; fetch = { type = "git"; - url = "https://github.com/Sirupsen/logrus"; - rev = "95cd2b9c79aa5e72ab0bc69b7ccc2be15bf850f6"; - sha256 = "1rkkhl68iw523bwxmp2prdrp8pk62xfp52wifzvbmqf8v1svwsqv"; + url = "https://github.com/bazil/fuse"; + rev = "371fbbdaa898"; + sha256 = "1x5p301py7mcxgwklfm6pqqkzssln0nfzllng49pnk60m03ilp4w"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/Azure/go-ansiterm"; + fetch = { + type = "git"; + url = "https://github.com/Azure/go-ansiterm"; + rev = "d6e3b3328b78"; + sha256 = "010khrkhkf9cxlvvb6ncqv4c1qcdmpbz9jn38g4fxf4xsma8xx1q"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/Microsoft/go-winio"; + fetch = { + type = "git"; + url = "https://github.com/Microsoft/go-winio"; + rev = "v0.4.14"; + sha256 = "0n34wi9l9ks2z3cz97j30ljfmqppwf1zxr16hwbnswyrk54fcxm3"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/Nvveen/Gotty"; + fetch = { + type = "git"; + url = "https://github.com/Nvveen/Gotty"; + rev = "cd527374f1e5"; + sha256 = "1ylvr1p6p036ns3g3wdz8f92f69symshkc8j54fa6gpg4hyk0k6q"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/alecthomas/template"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/template"; + rev = "fb15b899a751"; + sha256 = "1vlasv4dgycydh5wx6jdcvz40zdv90zz1h7836z7lhsi2ymvii26"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/alecthomas/units"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/units"; + rev = "c3de453c63f4"; + sha256 = "0js37zlgv37y61j4a2d46jh72xm5kxmpaiw0ya9v944bjpc386my"; + moduleDir = ""; }; } { @@ -14,26 +65,149 @@ fetch = { type = "git"; url = "https://github.com/beorn7/perks"; - rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"; - sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y"; + rev = "v1.0.1"; + sha256 = "17n4yygjxa6p499dj3yaqzfww2g7528165cl13haj97hlx94dgl7"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/cenkalti/backoff"; + fetch = { + type = "git"; + url = "https://github.com/cenkalti/backoff"; + rev = "v2.2.1"; + sha256 = "1mf4lsl3rbb8kk42x0mrhzzy4ikqy0jf6nxpzhkr02rdgwh6rjk8"; + moduleDir = ""; }; } { - goPackagePath = "github.com/cenk/backoff"; + goPackagePath = "github.com/cenkalti/backoff/v3"; fetch = { type = "git"; - url = "https://github.com/cenk/backoff"; - rev = "61153c768f31ee5f130071d08fc82b85208528de"; - sha256 = "08x77mgb9zsj047n74rx6c16jjx985lmy4s6fl58mdgxgxjv54y5"; + url = "https://github.com/cenkalti/backoff"; + rev = "v3.2.2"; + sha256 = "01h52k1sl6drabm3fgd4yy1iwbz06wcbbh16zd6v4wi7slabma9m"; + moduleDir = ""; }; } { - goPackagePath = "github.com/fsouza/go-dockerclient"; + goPackagePath = "github.com/cespare/xxhash/v2"; fetch = { type = "git"; - url = "https://github.com/fsouza/go-dockerclient"; - rev = "1d4f4ae73768d3ca16a6fb964694f58dc5eba601"; - sha256 = "1s3m8jq8z1cm5rkn7dmjacf38n6ihkkzbdfang2aa2cgs5wl28y0"; + url = "https://github.com/cespare/xxhash"; + rev = "v2.1.1"; + sha256 = "0rl5rs8546zj1vzggv38w93wx0b5dvav7yy5hzxa8kw7iikv1cgr"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/containerd/continuity"; + fetch = { + type = "git"; + url = "https://github.com/containerd/continuity"; + rev = "d3ef23f19fbb"; + sha256 = "0k5838j54ymqpg0dffr8k4vh992my9zlqrplx4syms09r9z9vap9"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "v1.1.1"; + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/docker/go-connections"; + fetch = { + type = "git"; + url = "https://github.com/docker/go-connections"; + rev = "v0.4.0"; + sha256 = "0mv6f6b5nljc17dmwmc28hc0y11pqglz7x0d2mjrwdmfxf64hwqq"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/docker/go-units"; + fetch = { + type = "git"; + url = "https://github.com/docker/go-units"; + rev = "v0.4.0"; + sha256 = "0k8gja8ql4pqg5rzmqvka42vjfs6rzablak87whcnqba6qxpimvz"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/dustin/go-humanize"; + fetch = { + type = "git"; + url = "https://github.com/dustin/go-humanize"; + rev = "bb3d318650d4"; + sha256 = "1lqd8ix3cb164j5iazjby2jpa6bdsflhy0h9mi4yldvvcvrc194c"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "v1.4.7"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/ghodss/yaml"; + fetch = { + type = "git"; + url = "https://github.com/ghodss/yaml"; + rev = "v1.0.0"; + sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/go-kit/kit"; + fetch = { + type = "git"; + url = "https://github.com/go-kit/kit"; + rev = "v0.9.0"; + sha256 = "09038mnw705h7isbjp8dzgp2i04bp5rqkmifxvwc5xkh75s00qpw"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/go-logfmt/logfmt"; + fetch = { + type = "git"; + url = "https://github.com/go-logfmt/logfmt"; + rev = "v0.4.0"; + sha256 = "06smxc112xmixz78nyvk3b2hmc7wasf2sl5vxj1xz62kqcq9lzm9"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/go-stack/stack"; + fetch = { + type = "git"; + url = "https://github.com/go-stack/stack"; + rev = "v1.8.0"; + sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "v1.1.1"; + sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2"; + moduleDir = ""; }; } { @@ -41,8 +215,79 @@ fetch = { type = "git"; url = "https://github.com/golang/protobuf"; - rev = "1e59b77b52bf8e4b449a57e6f79f21226d571845"; - sha256 = "19bkh81wnp6njg3931wky6hsnnl2d1ig20vfjxpv450sd3k6yys8"; + rev = "v1.4.0"; + sha256 = "1fjvl5n77abxz5qsd4mgyvjq19x43c5bfvmq62mq3m5plx6zksc8"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/google/go-cmp"; + fetch = { + type = "git"; + url = "https://github.com/google/go-cmp"; + rev = "v0.4.0"; + sha256 = "1x5pvl3fb5sbyng7i34431xycnhmx8xx94gq2n19g6p0vz68z2v2"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/google/gofuzz"; + fetch = { + type = "git"; + url = "https://github.com/google/gofuzz"; + rev = "v1.0.0"; + sha256 = "0qz439qvccm91w0mmjz4fqgx48clxdwagkvvx89cr43q1d4iry36"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/gotestyourself/gotestyourself"; + fetch = { + type = "git"; + url = "https://github.com/gotestyourself/gotestyourself"; + rev = "v2.2.0"; + sha256 = "0yif3gdyckmf8i54jq0xn00kflla5rhib9sarw66ngnbl7bn9kyl"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/hpcloud/tail"; + fetch = { + type = "git"; + url = "https://github.com/hpcloud/tail"; + rev = "v1.0.0"; + sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/inconshreveable/mousetrap"; + fetch = { + type = "git"; + url = "https://github.com/inconshreveable/mousetrap"; + rev = "v1.0.0"; + sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/json-iterator/go"; + fetch = { + type = "git"; + url = "https://github.com/json-iterator/go"; + rev = "v1.1.9"; + sha256 = "0pkn2maymgl9v6vmq9q1si8xr5bbl88n6981y0lx09px6qxb29qx"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/julienschmidt/httprouter"; + fetch = { + type = "git"; + url = "https://github.com/julienschmidt/httprouter"; + rev = "v1.2.0"; + sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666"; + moduleDir = ""; }; } { @@ -50,8 +295,59 @@ fetch = { type = "git"; url = "https://github.com/kbudde/gobert"; - rev = "a6daecb9ddeb548b7cfb3f5ac9deef9ded522730"; - sha256 = "06g036w4dny8wdjwvprjjcdh0vx851qphgrvilrn5lghv3jdr29z"; + rev = "77f4c9cb2e7e"; + sha256 = "1d2m4b0pxswqhkjpbql3kbb9fjvyys4b9cpmhb9iwkcmnq3n8x91"; + moduleDir = ""; + }; + } + { + 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"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/kr/logfmt"; + fetch = { + type = "git"; + url = "https://github.com/kr/logfmt"; + rev = "b84e30acd515"; + sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/kr/pretty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pretty"; + rev = "v0.1.0"; + sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/kr/pty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pty"; + rev = "v1.1.1"; + sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/kr/text"; + fetch = { + type = "git"; + url = "https://github.com/kr/text"; + rev = "v0.1.0"; + sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; + moduleDir = ""; }; } { @@ -59,8 +355,19 @@ fetch = { type = "git"; url = "https://github.com/kylelemons/godebug"; - rev = "d65d576e9348f5982d7f6d83682b694e731a45c6"; - sha256 = "0bc8j9kwkp0hrsz0sm7hav7cm5jp9d6ql8r2b3mz78xb1g65xhbc"; + rev = "v1.1.0"; + sha256 = "0dkk3friykg8p6wgqryx6745ahhb9z1j740k7px9dac6v5xjp78c"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/lib/pq"; + fetch = { + type = "git"; + url = "https://github.com/lib/pq"; + rev = "v1.0.0"; + sha256 = "1zqnnyczaf00xi6xh53vq758v5bdlf0iz7kf22l02cal4i6px47i"; + moduleDir = ""; }; } { @@ -68,8 +375,109 @@ fetch = { type = "git"; url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "3247c84500bff8d9fb6d579d800f20b3e091582c"; - sha256 = "12hcych25wf725zxdkpnyx4wa0gyxl8v4m8xmhdmmaki9bbmqd0d"; + rev = "v1.0.1"; + sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/modern-go/concurrent"; + fetch = { + type = "git"; + url = "https://github.com/modern-go/concurrent"; + rev = "bacd9c7ef1dd"; + sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/modern-go/reflect2"; + fetch = { + type = "git"; + url = "https://github.com/modern-go/reflect2"; + rev = "v1.0.1"; + sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/mwitkow/go-conntrack"; + fetch = { + type = "git"; + url = "https://github.com/mwitkow/go-conntrack"; + rev = "cc309e4a2223"; + sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/onsi/ginkgo"; + fetch = { + type = "git"; + url = "https://github.com/onsi/ginkgo"; + rev = "v1.10.1"; + sha256 = "033a42h1wzmji57p86igg9whvsbp6nvfdsypskw738ys903n3z4d"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/onsi/gomega"; + fetch = { + type = "git"; + url = "https://github.com/onsi/gomega"; + rev = "v1.7.0"; + sha256 = "09j6wq425wgzzsbwm9ckhfgl2capv3yyqbrf45qyrjwkzm49i02y"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/opencontainers/go-digest"; + fetch = { + type = "git"; + url = "https://github.com/opencontainers/go-digest"; + rev = "v1.0.0-rc1"; + sha256 = "01gc7fpn8ax429024p2fcx3yb18axwz5bjf2hqxlii1jbsgw4bh9"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/opencontainers/image-spec"; + fetch = { + type = "git"; + url = "https://github.com/opencontainers/image-spec"; + rev = "v1.0.1"; + sha256 = "03dvbj3dln8c55v9gp79mgmz2yi2ws3r08iyz2fk41y3i22iaw1q"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/opencontainers/runc"; + fetch = { + type = "git"; + url = "https://github.com/opencontainers/runc"; + rev = "v1.0.0-rc9"; + sha256 = "1ss5b46cbbckyqlwgj8dbd5l59c5y0kp679hcpc0ybaj53pmwxj7"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/ory/dockertest"; + fetch = { + type = "git"; + url = "https://github.com/ory/dockertest"; + rev = "v3.3.5"; + sha256 = "0fgj60l82sl6chd7i4s7lxqjr9hxkzmkaxnc8h6qbvn42246sy68"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/ory/dockertest/v3"; + fetch = { + type = "git"; + url = "https://github.com/ory/dockertest"; + rev = "v3.6.0"; + sha256 = "1l4czdb532rl1qjjh1ad00h1686dz9h9bg1kmmpyjfm4ggckndyw"; + moduleDir = ""; }; } { @@ -77,8 +485,19 @@ fetch = { type = "git"; url = "https://github.com/pkg/errors"; - rev = "645ef00459ed84a119197bfb8d8205042c6df63d"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; + rev = "v0.9.1"; + sha256 = "1761pybhc2kqr6v5fm8faj08x9bql8427yqg6vnfv6nhrasx1mwq"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "v1.0.0"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + moduleDir = ""; }; } { @@ -86,8 +505,9 @@ fetch = { type = "git"; url = "https://github.com/prometheus/client_golang"; - rev = "c5b7fccd204277076155f10851dad72b76a49317"; - sha256 = "1xqny3147g12n4j03kxm8s9mvdbs3ln6i56c655mybrn9jjy48kd"; + rev = "v1.5.1"; + sha256 = "0nkhjpwpqr3iz2jsqrl37qkj1g4i8jvi5smgbvhxcpyinjj00067"; + moduleDir = ""; }; } { @@ -95,8 +515,9 @@ fetch = { type = "git"; url = "https://github.com/prometheus/client_model"; - rev = "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c"; - sha256 = "19y4ywsivhpxj7ikf2j0gm9k3cmyw37qcbfi78n526jxcc7kw998"; + rev = "v0.2.0"; + sha256 = "0jffnz94d6ff39fr96b5w8i8yk26pwnrfggzz8jhi8k0yihg2c9d"; + moduleDir = ""; }; } { @@ -104,8 +525,9 @@ fetch = { type = "git"; url = "https://github.com/prometheus/common"; - rev = "2e54d0b93cba2fd133edc32211dcc32c06ef72ca"; - sha256 = "14kn5w7imcxxlfdqxl21fsnlf1ms7200g3ldy29hwamldv8qlm7j"; + rev = "v0.9.1"; + sha256 = "12pyywb02p7d30ccm41mwn69qsgqnsgv1w9jlqrrln2f1svnbqch"; + moduleDir = ""; }; } { @@ -113,8 +535,39 @@ fetch = { type = "git"; url = "https://github.com/prometheus/procfs"; - rev = "a6e9df898b1336106c743392c48ee0b71f5c4efa"; - sha256 = "0zyprdp9bnpywcb6b9dzwyiji60mgf0s9wnw98zndfg3xrgnkasz"; + rev = "v0.0.11"; + sha256 = "1msc8bfywsmrgr2ryqjdqwkxiz1ll08r3qgvaka2507z1wpcpj2c"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/sirupsen/logrus"; + rev = "v1.5.0"; + sha256 = "02s74gxzlzr982avw7vbfjkj696hyhklx1ikmmjiqp3z1l8hkghk"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/spf13/cobra"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cobra"; + rev = "2da4a54c5cee"; + sha256 = "18qbrp774fx6dyibjcy9snld705gslq6z2sql1biyjahxkm1vpfy"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "v1.0.3"; + sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd"; + moduleDir = ""; }; } { @@ -122,8 +575,39 @@ fetch = { type = "git"; url = "https://github.com/streadway/amqp"; - rev = "ff791c2d22d3f1588b4e2cc71a9fba5e1da90654"; - sha256 = "1drridn4k1n7qy82msvw9r18w4pmrah1nip36wixz098nzalz55x"; + rev = "1c71cc93ed71"; + sha256 = "0k740vmzkdv9il201x4mj0md73w30jqlmn1q7m1ng3dmi635qrlr"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "v0.1.1"; + sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "v1.4.0"; + sha256 = "187i5g88sxfy4vxpm7dw1gwv29pa2qaq475lxrdh5livh69wqfjb"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/tkanos/gonfig"; + fetch = { + type = "git"; + url = "https://github.com/tkanos/gonfig"; + rev = "896f3d81fadf"; + sha256 = "1wcyq3vlfp12zsnnv1gpycqgzvq3nk8pvcabni6wxxyk3350d43m"; + moduleDir = ""; }; } { @@ -131,8 +615,9 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "94eea52f7b742c7cbe0b03b22f0c4c8631ece122"; - sha256 = "095zyvjb0m2pz382500miqadhk7w3nis8z3j941z8cq4rdafijvi"; + rev = "c2843e01d9a2"; + sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r"; + moduleDir = ""; }; } { @@ -140,8 +625,19 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "a8b9294777976932365dabb6640cf1468d95c70f"; - sha256 = "112v83jfwd1brwaanjijvb7da4dx1iqk8b4bf9ahx0hvir56c2g8"; + rev = "d3edc9973b7e"; + sha256 = "12zbjwcsh9b0lwycqlkrnbyg5a6a9dzgj8hhgq399bdda5bd97y7"; + moduleDir = ""; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "cd5d95a43a6e"; + sha256 = "1nqkyz2y1qvqcma52ijh02s8aiqmkfb95j08f6zcjhbga3ds6hds"; + moduleDir = ""; }; } { @@ -149,8 +645,99 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "8b4580aae2a0dd0c231a45d3ccb8434ff533b840"; - sha256 = "1w66xqnpkskvj22a3f841qg4rgf0lzcrxp8678s6n07yw8qdh92p"; + rev = "1957bb5e6d1f"; + sha256 = "0imqk4l9785rw7ddvywyf8zn7k3ga6f17ky8rmf8wrri7nknr03f"; + moduleDir = ""; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "v0.3.0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; + moduleDir = ""; + }; + } + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "a101b041ded4"; + sha256 = "1pm50dybm5wixjjspvfpafjmiy81b1zp08h13gxc5cylrfgncrfl"; + moduleDir = ""; + }; + } + { + goPackagePath = "golang.org/x/xerrors"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/xerrors"; + rev = "9bdfabe68543"; + sha256 = "1yjfi1bk9xb81lqn85nnm13zz725wazvrx3b50hx19qmwg7a4b0c"; + moduleDir = ""; + }; + } + { + goPackagePath = "google.golang.org/protobuf"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/protobuf"; + rev = "v1.21.0"; + sha256 = "12bwln8z1lf9105gdp6ip0rx741i4yfz1520gxnp8861lh9wcl63"; + moduleDir = ""; + }; + } + { + goPackagePath = "gopkg.in/airbrake/gobrake.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/airbrake/gobrake.v2"; + rev = "v2.0.9"; + sha256 = "1x06f7n7qlyzqgyz0sdfcidf3w4ldn6zs6qx2mhibggk2z4whcjw"; + moduleDir = ""; + }; + } + { + goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/alecthomas/kingpin.v2"; + rev = "v2.2.6"; + sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; + moduleDir = ""; + }; + } + { + goPackagePath = "gopkg.in/check.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/check.v1"; + rev = "41f04d3bba15"; + sha256 = "0vfk9czmlxmp6wndq8k17rhnjxal764mxfhrccza7nwlia760pjy"; + moduleDir = ""; + }; + } + { + goPackagePath = "gopkg.in/fsnotify.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/fsnotify.v1"; + rev = "v1.4.7"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + moduleDir = ""; + }; + } + { + goPackagePath = "gopkg.in/gemnasium/logrus-airbrake-hook.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/gemnasium/logrus-airbrake-hook.v2"; + rev = "v2.1.2"; + sha256 = "0sbg0dn6cysmf8f2bi209jwl4jnpiwp4rdghnxlzirw3c32ms5y5"; + moduleDir = ""; }; } { @@ -158,8 +745,49 @@ fetch = { type = "git"; url = "https://gopkg.in/ory-am/dockertest.v3"; - rev = "a7951f7a8442f0e70d36e499ed4d744f00af2963"; - sha256 = "13qv0vl79m2wirhbjs0k2a3cjl6ib7sw6rg98v95xxpn8r39ijzw"; + rev = "v3.3.5"; + sha256 = "0fgj60l82sl6chd7i4s7lxqjr9hxkzmkaxnc8h6qbvn42246sy68"; + moduleDir = ""; + }; + } + { + goPackagePath = "gopkg.in/tomb.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/tomb.v1"; + rev = "dd632973f1e7"; + sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv"; + moduleDir = ""; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "v2.2.8"; + sha256 = "1inf7svydzscwv9fcjd2rm61a4xjk6jkswknybmns2n58shimapw"; + moduleDir = ""; + }; + } + { + goPackagePath = "gotest.tools"; + fetch = { + type = "git"; + url = "https://github.com/gotestyourself/gotest.tools"; + rev = "v2.2.0"; + sha256 = "0yif3gdyckmf8i54jq0xn00kflla5rhib9sarw66ngnbl7bn9kyl"; + moduleDir = ""; + }; + } + { + goPackagePath = "gotest.tools/v3"; + fetch = { + type = "git"; + url = "https://github.com/gotestyourself/gotest.tools"; + rev = "v3.0.2"; + sha256 = "0cap2aq2wphnbkkzkck5zdjxb64q3jqxfwpkgqys7279rbr8cvjm"; + moduleDir = ""; }; } ] diff --git a/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/pkgs/servers/monitoring/prometheus/redis-exporter.nix index 945f403041c..34c058d5d6c 100644 --- a/pkgs/servers/monitoring/prometheus/redis-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/redis-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "redis_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/smokeping-prober.nix b/pkgs/servers/monitoring/prometheus/smokeping-prober.nix index f440be3f57a..b1c3bc6999f 100644 --- a/pkgs/servers/monitoring/prometheus/smokeping-prober.nix +++ b/pkgs/servers/monitoring/prometheus/smokeping-prober.nix @@ -1,7 +1,6 @@ { lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: let - inherit (stdenv) lib; baseVersion = "0.3.1"; commit = "9ba85274dcc21bf8132cbe3b3dccfcb4aab57d9f"; in diff --git a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix index a71b03a2b41..ece22e496d1 100644 --- a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, net-snmp, nixosTests }: +{ lib, buildGoPackage, fetchFromGitHub, net-snmp, nixosTests }: buildGoPackage rec { pname = "snmp_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/sql-exporter.nix b/pkgs/servers/monitoring/prometheus/sql-exporter.nix index d6c69a6089b..553613a9c7e 100644 --- a/pkgs/servers/monitoring/prometheus/sql-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/sql-exporter.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "sql_exporter"; - version = "0.3.0"; + version = "0.4.0"; vendorSha256 = null; src = fetchFromGitHub { owner = "justwatchcom"; - repo = "sql_exporter"; + repo = pname; rev = "v${version}"; - sha256 = "125brlxgwhkn3z5v0522gpm0sk6v905ghh05c4c3wf1hlm7bhnrc"; + sha256 = "0dxzcd3b430xby741fdc85k4d2380jrh34xxskmdzxbf2kqdc5k8"; }; meta = with lib; { diff --git a/pkgs/servers/monitoring/prometheus/statsd-exporter.nix b/pkgs/servers/monitoring/prometheus/statsd-exporter.nix index a2b0f73904b..31bd583280c 100644 --- a/pkgs/servers/monitoring/prometheus/statsd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/statsd-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "statsd_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix b/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix index 50915bf65f8..39e475df197 100644 --- a/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "surfboard_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix b/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix index 669cf8ffaea..b9971ab7228 100644 --- a/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "unifi-exporter"; diff --git a/pkgs/servers/monitoring/riemann-dash/gemset.nix b/pkgs/servers/monitoring/riemann-dash/gemset.nix index f2446be79f6..742dbde6b17 100644 --- a/pkgs/servers/monitoring/riemann-dash/gemset.nix +++ b/pkgs/servers/monitoring/riemann-dash/gemset.nix @@ -135,4 +135,4 @@ }; version = "1.3.1"; }; -} \ No newline at end of file +} diff --git a/pkgs/servers/monitoring/sensu/gemset.nix b/pkgs/servers/monitoring/sensu/gemset.nix index 32134255711..6fcee927b70 100644 --- a/pkgs/servers/monitoring/sensu/gemset.nix +++ b/pkgs/servers/monitoring/sensu/gemset.nix @@ -630,4 +630,4 @@ }; version = "0.0.7.6"; }; -} \ No newline at end of file +} diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index 76acc2822f4..55b0ab14af7 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "telegraf"; - version = "1.17.0"; + version = "1.17.2"; excludedPackages = "test"; @@ -12,10 +12,10 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - sha256 = "1j3wi398vcvlnf1q335hhbw6bq69qclak92sg2na05cl4snw68y0"; + sha256 = "sha256-R0RYiVVS1ce2xabPBTEmOxBNlknP4iXkbVy412whrFw="; }; - vendorSha256 = "0vb1gvmj7pmz4dljyk91smkn8japmv7mc3mgb0s1imvxala8qq83"; + vendorSha256 = "sha256-3cELah9i2rY563QQOYt7ke0HEUR1By74vTgl+UbOHwc="; buildFlagsArray = [ ''-ldflags= -w -s -X main.version=${version} diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix index 9955b4a8333..755dc151775 100644 --- a/pkgs/servers/monitoring/thanos/default.nix +++ b/pkgs/servers/monitoring/thanos/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "thanos"; version = "0.17.2"; diff --git a/pkgs/servers/monitoring/unifi-poller/default.nix b/pkgs/servers/monitoring/unifi-poller/default.nix index 0343384a679..8297503b675 100644 --- a/pkgs/servers/monitoring/unifi-poller/default.nix +++ b/pkgs/servers/monitoring/unifi-poller/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "unifi-poller"; diff --git a/pkgs/servers/monitoring/zabbix/agent.nix b/pkgs/servers/monitoring/zabbix/agent.nix index aadbd879f5e..e4516f652b9 100644 --- a/pkgs/servers/monitoring/zabbix/agent.nix +++ b/pkgs/servers/monitoring/zabbix/agent.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libiconv, openssl, pcre }: +{ lib, stdenv, fetchurl, pkg-config, libiconv, openssl, pcre }: import ./versions.nix ({ version, sha256 }: stdenv.mkDerivation { @@ -6,11 +6,11 @@ import ./versions.nix ({ version, sha256 }: inherit version; src = fetchurl { - url = "https://cdn.zabbix.com/zabbix/sources/stable/${stdenv.lib.versions.majorMinor version}/zabbix-${version}.tar.gz"; + url = "https://cdn.zabbix.com/zabbix/sources/stable/${lib.versions.majorMinor version}/zabbix-${version}.tar.gz"; inherit sha256; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libiconv openssl diff --git a/pkgs/servers/monitoring/zabbix/proxy.nix b/pkgs/servers/monitoring/zabbix/proxy.nix index 190bfbcb81b..067d8883324 100644 --- a/pkgs/servers/monitoring/zabbix/proxy.nix +++ b/pkgs/servers/monitoring/zabbix/proxy.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libevent, libiconv, openssl, pcre, zlib +{ lib, stdenv, fetchurl, pkg-config, libevent, libiconv, openssl, pcre, zlib , odbcSupport ? true, unixODBC , snmpSupport ? true, net-snmp , sshSupport ? true, libssh2 @@ -13,7 +13,7 @@ assert postgresqlSupport -> !mysqlSupport && !sqliteSupport; assert sqliteSupport -> !mysqlSupport && !postgresqlSupport; let - inherit (stdenv.lib) optional optionalString; + inherit (lib) optional optionalString; in import ./versions.nix ({ version, sha256 }: stdenv.mkDerivation { @@ -21,11 +21,11 @@ in inherit version; src = fetchurl { - url = "https://cdn.zabbix.com/zabbix/sources/stable/${stdenv.lib.versions.majorMinor version}/zabbix-${version}.tar.gz"; + url = "https://cdn.zabbix.com/zabbix/sources/stable/${lib.versions.majorMinor version}/zabbix-${version}.tar.gz"; inherit sha256; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libevent libiconv diff --git a/pkgs/servers/monitoring/zabbix/server.nix b/pkgs/servers/monitoring/zabbix/server.nix index b82c3ce9ee8..03e9c1a867b 100644 --- a/pkgs/servers/monitoring/zabbix/server.nix +++ b/pkgs/servers/monitoring/zabbix/server.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkgconfig, curl, libevent, libiconv, libxml2, openssl, pcre, zlib +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, curl, libevent, libiconv, libxml2, openssl, pcre, zlib , jabberSupport ? true, iksemel , ldapSupport ? true, openldap , odbcSupport ? true, unixODBC @@ -13,7 +13,7 @@ assert mysqlSupport -> !postgresqlSupport; assert postgresqlSupport -> !mysqlSupport; let - inherit (stdenv.lib) optional optionalString; + inherit (lib) optional optionalString; in import ./versions.nix ({ version, sha256 }: stdenv.mkDerivation { @@ -21,11 +21,11 @@ in inherit version; src = fetchurl { - url = "https://cdn.zabbix.com/zabbix/sources/stable/${stdenv.lib.versions.majorMinor version}/zabbix-${version}.tar.gz"; + url = "https://cdn.zabbix.com/zabbix/sources/stable/${lib.versions.majorMinor version}/zabbix-${version}.tar.gz"; inherit sha256; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ curl libevent diff --git a/pkgs/servers/monitoring/zabbix/web.nix b/pkgs/servers/monitoring/zabbix/web.nix index 16e5be4045a..e19646e7100 100644 --- a/pkgs/servers/monitoring/zabbix/web.nix +++ b/pkgs/servers/monitoring/zabbix/web.nix @@ -6,7 +6,7 @@ import ./versions.nix ({ version, sha256 }: inherit version; src = fetchurl { - url = "https://cdn.zabbix.com/zabbix/sources/stable/${stdenv.lib.versions.majorMinor version}/zabbix-${version}.tar.gz"; + url = "https://cdn.zabbix.com/zabbix/sources/stable/${lib.versions.majorMinor version}/zabbix-${version}.tar.gz"; inherit sha256; }; @@ -18,7 +18,7 @@ import ./versions.nix ({ version, sha256 }: installPhase = '' mkdir -p $out/share/zabbix/ - cp -a ${if stdenv.lib.versionAtLeast version "5.0.0" then "ui/." else "frontends/php/."} $out/share/zabbix/ + cp -a ${if lib.versionAtLeast version "5.0.0" then "ui/." else "frontends/php/."} $out/share/zabbix/ cp ${phpConfig} $out/share/zabbix/conf/zabbix.conf.php ''; diff --git a/pkgs/servers/mpd/clientlib.nix b/pkgs/servers/mpd/clientlib.nix index b180e62ce18..e0df9458f87 100644 --- a/pkgs/servers/mpd/clientlib.nix +++ b/pkgs/servers/mpd/clientlib.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ meson ninja ] - ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; meta = with lib; { description = "Client library for MPD (music player daemon)"; diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 8c50c0b10ae..89de67c4042 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -28,7 +28,6 @@ }: let - lib = stdenv.lib; concatAttrVals = nameList: set: lib.concatMap (x: set.${x} or []) nameList; featureDependencies = { @@ -115,13 +114,13 @@ let in stdenv.mkDerivation rec { pname = "mpd"; - version = "0.22.3"; + version = "0.22.4"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "MPD"; rev = "v${version}"; - sha256 = "0323zxmgyrkbklnqm8i6napz8pva50cw14mzr9bvmyg64x404jgj"; + sha256 = "sha256-CVi+fcmFMJMv7X4okALlVsxqsuUsirHgQT61IHdrBNE="; }; buildInputs = [ diff --git a/pkgs/servers/mumsi/default.nix b/pkgs/servers/mumsi/default.nix index 3cc3f338f2f..b4d1fda4090 100644 --- a/pkgs/servers/mumsi/default.nix +++ b/pkgs/servers/mumsi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, boost +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, boost , log4cpp, pjsip, openssl, alsaLib, mumlib }: with lib; stdenv.mkDerivation { pname = "mumsi"; @@ -11,8 +11,8 @@ with lib; stdenv.mkDerivation { sha256 = "0vrivl1fiiwjsz4v26nrn8ra3k9v0mcz7zjm2z319fw8hv6n1nrk"; }; - buildInputs = [ boost log4cpp pkgconfig pjsip mumlib openssl alsaLib ]; - nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ boost log4cpp pkg-config pjsip mumlib openssl alsaLib ]; + nativeBuildInputs = [ cmake pkg-config ]; installPhase = '' install -Dm555 mumsi $out/bin/mumsi ''; diff --git a/pkgs/servers/neard/default.nix b/pkgs/servers/neard/default.nix index ad3a68b46eb..a638c063852 100644 --- a/pkgs/servers/neard/default.nix +++ b/pkgs/servers/neard/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkgconfig, systemd, glib, dbus, libnl, pythonPackages }: +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, systemd, glib, dbus, libnl, pythonPackages }: stdenv.mkDerivation rec { name = "neard-0.16"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0bpdmyxvd3z54p95apz4bjb5jp8hbc04sicjapcryjwa8mh6pbil"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ systemd glib dbus libnl pythonPackages.python pythonPackages.wrapPython ]; pythonPath = [ pythonPackages.pygobject2 pythonPackages.dbus-python pythonPackages.pygtk ]; diff --git a/pkgs/servers/news/leafnode/default.nix b/pkgs/servers/news/leafnode/default.nix index 4095b95ad96..eb6ce851c6e 100644 --- a/pkgs/servers/news/leafnode/default.nix +++ b/pkgs/servers/news/leafnode/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pcre }: +{ lib, stdenv, fetchurl, pcre }: stdenv.mkDerivation { name = "leafnode-2.0.0.alpha20121101a.12"; @@ -31,7 +31,7 @@ stdenv.mkDerivation { meta = { homepage = "http://leafnode.sourceforge.net/"; description = "Implementation of a store & forward NNTP proxy"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.mit; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 75fa1ff0824..e146adbe12c 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -58,7 +58,7 @@ in { }; nextcloud20 = generic { - version = "20.0.4"; - sha256 = "sha256-Jp8WIuMm9dEeOH04YarU4rDnkzSul+7Vp7M1K6dmFCA="; + version = "20.0.6"; + sha256 = "859167170402b876b6ef1a37fa4aaa5617b6bf847bb5d50a94f636bae65a34b9"; }; } diff --git a/pkgs/servers/nextcloud/news-updater.nix b/pkgs/servers/nextcloud/news-updater.nix index dd7e8e4879c..19147be3f5d 100644 --- a/pkgs/servers/nextcloud/news-updater.nix +++ b/pkgs/servers/nextcloud/news-updater.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3Packages, php }: +{ lib, fetchurl, python3Packages, php }: python3Packages.buildPythonApplication rec { name = "nextcloud-news-updater-${version}"; @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "Fast parallel feed updater for the Nextcloud news app"; homepage = "https://github.com/nextcloud/news-updater"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ schneefux ]; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ schneefux ]; }; } diff --git a/pkgs/servers/nginx-sso/default.nix b/pkgs/servers/nginx-sso/default.nix index 0029d9ad55e..572f4d94e72 100644 --- a/pkgs/servers/nginx-sso/default.nix +++ b/pkgs/servers/nginx-sso/default.nix @@ -1,4 +1,4 @@ -{ buildGoPackage, fetchFromGitHub, lib, stdenv, nixosTests }: +{ buildGoPackage, fetchFromGitHub, lib, nixosTests }: buildGoPackage rec { pname = "nginx-sso"; diff --git a/pkgs/servers/nosql/apache-jena/binary.nix b/pkgs/servers/nosql/apache-jena/binary.nix index bd7f9a36c9c..71c8c4a45dc 100644 --- a/pkgs/servers/nosql/apache-jena/binary.nix +++ b/pkgs/servers/nosql/apache-jena/binary.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, java, makeWrapper}: +{lib, stdenv, fetchurl, java, makeWrapper}: let s = # Generated upstream information rec { @@ -26,10 +26,10 @@ stdenv.mkDerivation { ''; meta = { inherit (s) version; - description = ''RDF database''; - license = stdenv.lib.licenses.asl20; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + description = "RDF database"; + license = lib.licenses.asl20; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; homepage = "http://jena.apache.org"; downloadPage = "http://archive.apache.org/dist/jena/binaries/"; updateWalker = true; diff --git a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix index 135fd31ea3d..7084130eaef 100644 --- a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix +++ b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, java, makeWrapper}: +{lib, stdenv, fetchurl, java, makeWrapper}: let s = # Generated upstream information rec { @@ -30,10 +30,10 @@ stdenv.mkDerivation { ''; meta = { inherit (s) version; - description = ''SPARQL server''; - license = stdenv.lib.licenses.asl20; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + description = "SPARQL server"; + license = lib.licenses.asl20; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; homepage = "http://jena.apache.org"; downloadPage = "http://archive.apache.org/dist/jena/binaries/"; downloadURLRegexp = "apache-jena-fuseki-.*[.]tar[.]gz\$"; diff --git a/pkgs/servers/nosql/cassandra/generic.nix b/pkgs/servers/nosql/cassandra/generic.nix index 696334e8561..4d9f09637e9 100644 --- a/pkgs/servers/nosql/cassandra/generic.nix +++ b/pkgs/servers/nosql/cassandra/generic.nix @@ -7,8 +7,8 @@ }: let - libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]; - binPath = with stdenv.lib; makeBinPath ([ + libPath = lib.makeLibraryPath [ stdenv.cc.cc ]; + binPath = with lib; makeBinPath ([ bash getopt gawk diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix index 239c6875c34..abec3c5f79f 100644 --- a/pkgs/servers/nosql/eventstore/default.nix +++ b/pkgs/servers/nosql/eventstore/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchurl , makeWrapper @@ -74,8 +74,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://geteventstore.com/"; description = "Event sourcing database with processing logic in JavaScript"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ puffnfresh ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ puffnfresh ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/servers/nosql/mongodb/mongodb.nix b/pkgs/servers/nosql/mongodb/mongodb.nix index f57ff746198..8a66528d81c 100644 --- a/pkgs/servers/nosql/mongodb/mongodb.nix +++ b/pkgs/servers/nosql/mongodb/mongodb.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl, sconsPackages, boost, gperftools, pcre-cpp, snappy, zlib, libyamlcpp +{ lib, stdenv, fetchurl, sconsPackages, boost, gperftools, pcre-cpp, snappy, zlib, libyamlcpp , sasl, openssl, libpcap, python27, python38, curl, Security, CoreFoundation, cctools }: # Note: # The command line tools are written in Go as part of a different package (mongodb-tools) -with stdenv.lib; +with lib; { version, sha256, patches ? [] -, license ? stdenv.lib.licenses.sspl +, license ? lib.licenses.sspl }@args: let @@ -34,7 +34,7 @@ let #"valgrind" -- mongodb only requires valgrind.h, which is vendored in the source. #"wiredtiger" ] ++ optionals stdenv.isLinux [ "tcmalloc" ]; - inherit (stdenv.lib) systems subtractLists; + inherit (lib) systems subtractLists; in stdenv.mkDerivation rec { inherit version; @@ -58,7 +58,7 @@ in stdenv.mkDerivation rec { sasl snappy zlib - ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security CoreFoundation cctools ]; + ] ++ lib.optionals stdenv.isDarwin [ Security CoreFoundation cctools ]; # MongoDB keeps track of its build parameters, which tricks nix into # keeping dependencies to build inputs in the final output. @@ -69,7 +69,7 @@ in stdenv.mkDerivation rec { # fix environment variable reading substituteInPlace SConstruct \ --replace "env = Environment(" "env = Environment(ENV = os.environ," - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' substituteInPlace src/third_party/mozjs-${variants.mozjsVersion}/extract/js/src/jsmath.cpp --replace '${variants.mozjsReplace}' 0 substituteInPlace src/third_party/s2/s1angle.cc --replace drem remainder @@ -77,14 +77,14 @@ in stdenv.mkDerivation rec { substituteInPlace src/third_party/s2/s2cap.cc --replace drem remainder substituteInPlace src/third_party/s2/s2latlng.cc --replace drem remainder substituteInPlace src/third_party/s2/s2latlngrect.cc --replace drem remainder - '' + stdenv.lib.optionalString stdenv.isi686 '' + '' + lib.optionalString stdenv.isi686 '' # don't fail by default on i686 substituteInPlace src/mongo/db/storage/storage_options.h \ --replace 'engine("wiredTiger")' 'engine("mmapv1")' ''; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument"; sconsFlags = [ diff --git a/pkgs/servers/nosql/mongodb/v3_4.nix b/pkgs/servers/nosql/mongodb/v3_4.nix index e1c71bc13f7..666a92004b4 100644 --- a/pkgs/servers/nosql/mongodb/v3_4.nix +++ b/pkgs/servers/nosql/mongodb/v3_4.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, lib, sasl, boost, Security, CoreFoundation, cctools }: +{ callPackage, lib, sasl, boost, Security, CoreFoundation, cctools }: let buildMongoDB = callPackage ./mongodb.nix { @@ -12,5 +12,5 @@ in buildMongoDB { version = "3.4.24"; sha256 = "0j6mvgv0jnsnvgkl8505bl88kbxkba66qijlpi1la0dd5pd1imfr"; patches = [ ./forget-build-dependencies-3-4.patch ]; - license = stdenv.lib.licenses.agpl3; + license = lib.licenses.agpl3; } diff --git a/pkgs/servers/nosql/mongodb/v3_6.nix b/pkgs/servers/nosql/mongodb/v3_6.nix index 68f83631c80..b55bccab779 100644 --- a/pkgs/servers/nosql/mongodb/v3_6.nix +++ b/pkgs/servers/nosql/mongodb/v3_6.nix @@ -12,5 +12,5 @@ in buildMongoDB { version = "3.6.13"; sha256 = "1mbvk4bmabrswjdm01jssxcygjpq5799zqyx901nsi12vlcymwg4"; patches = [ ./forget-build-dependencies.patch ] - ++ stdenv.lib.optionals stdenv.isDarwin [ ./asio-no-experimental-string-view.patch ]; + ++ lib.optionals stdenv.isDarwin [ ./asio-no-experimental-string-view.patch ]; } diff --git a/pkgs/servers/nosql/mongodb/v4_0.nix b/pkgs/servers/nosql/mongodb/v4_0.nix index 51ce1e25062..7d61ece8cd5 100644 --- a/pkgs/servers/nosql/mongodb/v4_0.nix +++ b/pkgs/servers/nosql/mongodb/v4_0.nix @@ -13,5 +13,5 @@ in buildMongoDB { sha256 = "1j8dqa4jr623y87jrdanyib9r7x18srrvdx952q4azcc8zrdwci1"; patches = [ ./forget-build-dependencies.patch ./mozjs-45_fix-3-byte-opcode.patch ] - ++ stdenv.lib.optionals stdenv.isDarwin [ ./asio-no-experimental-string-view.patch ]; + ++ lib.optionals stdenv.isDarwin [ ./asio-no-experimental-string-view.patch ]; } diff --git a/pkgs/servers/nosql/mongodb/v4_2.nix b/pkgs/servers/nosql/mongodb/v4_2.nix index 3ebe69daca1..43dc41acc38 100644 --- a/pkgs/servers/nosql/mongodb/v4_2.nix +++ b/pkgs/servers/nosql/mongodb/v4_2.nix @@ -13,5 +13,5 @@ in buildMongoDB { sha256 = "13yvhi1258skdni00bh6ph609whqsmhiimhyqy1gs2liwdvh5278"; patches = [ ./forget-build-dependencies-4-2.patch ] - ++ stdenv.lib.optionals stdenv.isDarwin [ ./asio-no-experimental-string-view-4-2.patch ]; + ++ lib.optionals stdenv.isDarwin [ ./asio-no-experimental-string-view-4-2.patch ]; } diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix index 74e7cd463b7..684cdbe287c 100644 --- a/pkgs/servers/nosql/neo4j/default.nix +++ b/pkgs/servers/nosql/neo4j/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, makeWrapper, jre8, which, gawk }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "neo4j"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { do makeWrapper "$out/share/neo4j/bin/$NEO4J_SCRIPT" \ "$out/bin/$NEO4J_SCRIPT" \ - --prefix PATH : "${stdenv.lib.makeBinPath [ jre8 which gawk ]}" \ + --prefix PATH : "${lib.makeBinPath [ jre8 which gawk ]}" \ --set JAVA_HOME "$jre8" done ''; @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = [ maintainers.offline ]; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 45dd26fb8f0..9eac9e2f256 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -1,38 +1,38 @@ -{ lib, stdenv, fetchurl, lua, pkgconfig, systemd, jemalloc, nixosTests +{ lib, stdenv, fetchurl, lua, pkg-config, systemd, jemalloc, nixosTests , tlsSupport ? true, openssl }: stdenv.mkDerivation rec { - version = "6.0.6"; + version = "6.0.10"; pname = "redis"; src = fetchurl { url = "http://download.redis.io/releases/${pname}-${version}.tar.gz"; - sha256 = "151x6qicmrmlxkmiwi2vdq8p50d52b9gglp8csag6pmgcfqlkb8j"; + sha256 = "1gc529nfh8frk4pynyjlnmzvwa0j9r5cmqwyd7537sywz6abifvr"; }; # Cross-compiling fixes configurePhase = '' - ${stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + ${lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' # This fixes hiredis, which has the AR awkwardly coded. # Probably a good candidate for a patch upstream. makeFlagsArray+=('STLIB_MAKE_CMD=${stdenv.cc.targetPrefix}ar rcs $(STLIBNAME)') ''} ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ lua ] - ++ stdenv.lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) systemd - ++ stdenv.lib.optionals tlsSupport [ openssl ]; + ++ lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) systemd + ++ lib.optionals tlsSupport [ openssl ]; # More cross-compiling fixes. # Note: this enables libc malloc as a temporary fix for cross-compiling. # Due to hardcoded configure flags in jemalloc, we can't cross-compile vendored jemalloc properly, and so we're forced to use libc allocator. # It's weird that the build isn't failing because of failure to compile dependencies, it's from failure to link them! makeFlags = [ "PREFIX=$(out)" ] - ++ stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "AR=${stdenv.cc.targetPrefix}ar" "RANLIB=${stdenv.cc.targetPrefix}ranlib" "MALLOC=libc" ] - ++ stdenv.lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) ["USE_SYSTEMD=yes"] - ++ stdenv.lib.optionals tlsSupport [ "BUILD_TLS=yes" ]; + ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "AR=${stdenv.cc.targetPrefix}ar" "RANLIB=${stdenv.cc.targetPrefix}ranlib" "MALLOC=libc" ] + ++ lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) ["USE_SYSTEMD=yes"] + ++ lib.optionals tlsSupport [ "BUILD_TLS=yes" ]; enableParallelBuilding = true; diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix index 40ffddd4f10..558fdad9841 100644 --- a/pkgs/servers/nosql/rethinkdb/default.nix +++ b/pkgs/servers/nosql/rethinkdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, which, m4 +{ lib, stdenv, fetchurl, which, m4 , protobuf, boost, zlib, curl, openssl, icu, jemalloc, libtool , python2Packages, makeWrapper }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "5f1786c94797a0f8973597796e22545849dc214805cf1962ef76969e0b7d495b"; }; - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.isDarwin '' sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' external/v8_3.30.33.16/build/gyp/pylib/gyp/xcode_emulation.py # very meta @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { patchShebangs . ''; - configureFlags = stdenv.lib.optionals (!stdenv.isDarwin) [ + configureFlags = lib.optionals (!stdenv.isDarwin) [ "--with-jemalloc" "--lib-path=${jemalloc}/lib" ]; @@ -32,8 +32,8 @@ stdenv.mkDerivation rec { makeFlags = [ "rethinkdb" ]; buildInputs = [ protobuf boost zlib curl openssl icu makeWrapper ] - ++ stdenv.lib.optional (!stdenv.isDarwin) jemalloc - ++ stdenv.lib.optional stdenv.isDarwin libtool; + ++ lib.optional (!stdenv.isDarwin) jemalloc + ++ lib.optional stdenv.isDarwin libtool; nativeBuildInputs = [ which m4 python2Packages.python ]; @@ -53,8 +53,8 @@ stdenv.mkDerivation rec { joins and group by, and is easy to setup and learn. ''; homepage = "http://www.rethinkdb.com"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice bluescreen303 ]; + license = lib.licenses.asl20; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ thoughtpolice bluescreen303 ]; }; } diff --git a/pkgs/servers/nosql/victoriametrics/default.nix b/pkgs/servers/nosql/victoriametrics/default.nix index a6c3e4c60d1..02fd7631518 100644 --- a/pkgs/servers/nosql/victoriametrics/default.nix +++ b/pkgs/servers/nosql/victoriametrics/default.nix @@ -1,19 +1,19 @@ -{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: -buildGoPackage rec { +buildGoModule rec { pname = "VictoriaMetrics"; - version = "1.42.0"; + version = "1.52.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "10da15i3rn11dxnh82czaa2f9a4c3vf1d8kgfayp0dl7xs1xqhsd"; + sha256 = "1sqzpr48sylgiy4zaf3f8hnwzv7imf57bxg6sin9lv291ybhxs68"; }; - goPackagePath = "github.com/VictoriaMetrics/VictoriaMetrics"; + vendorSha256 = null; - buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/lib/buildinfo.Version=${version}" ]; + buildFlagsArray = [ "-ldflags=-s -w -X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${version}" ]; passthru.tests = { inherit (nixosTests) victoriametrics; }; diff --git a/pkgs/servers/openafs/1.8/default.nix b/pkgs/servers/openafs/1.8/default.nix index de780e9fb96..f7944e6a175 100644 --- a/pkgs/servers/openafs/1.8/default.nix +++ b/pkgs/servers/openafs/1.8/default.nix @@ -8,7 +8,7 @@ with (import ./srcs.nix { inherit fetchurl; }); let - inherit (stdenv.lib) optional optionalString optionals; + inherit (lib) optional optionalString optionals; in stdenv.mkDerivation { pname = "openafs"; diff --git a/pkgs/servers/openafs/1.8/srcs.nix b/pkgs/servers/openafs/1.8/srcs.nix index 4df5bdfc388..f1fd7ff4c0f 100644 --- a/pkgs/servers/openafs/1.8/srcs.nix +++ b/pkgs/servers/openafs/1.8/srcs.nix @@ -1,14 +1,14 @@ { fetchurl }: rec { - version = "1.8.6"; + version = "1.8.7"; src = fetchurl { url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2"; - sha256 = "0i99klrw00v4bwd942n90xqfn16z6337m89xfm9dgv7ih0qrsklb"; + sha256 = "0ygsrf65w9sqji2x3jbx3h31vk6513s6nalzxi7p2ryf3xb3lm2k"; }; srcs = [ src (fetchurl { url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-doc.tar.bz2"; - sha256 = "1s91kmxfimhdqrz7l6jgjz72j9pyalghrvg4h384fsz0ks6s4kz3"; + sha256 = "0zri99pxmp4klh8ki5ycnjpf1h21lynn4049s6ywmap1vkpq84yn"; })]; } diff --git a/pkgs/servers/openafs/1.9/default.nix b/pkgs/servers/openafs/1.9/default.nix index de780e9fb96..f7944e6a175 100644 --- a/pkgs/servers/openafs/1.9/default.nix +++ b/pkgs/servers/openafs/1.9/default.nix @@ -8,7 +8,7 @@ with (import ./srcs.nix { inherit fetchurl; }); let - inherit (stdenv.lib) optional optionalString optionals; + inherit (lib) optional optionalString optionals; in stdenv.mkDerivation { pname = "openafs"; diff --git a/pkgs/servers/openxpki/default.nix b/pkgs/servers/openxpki/default.nix index 9b952938e89..bdf12a1f923 100644 --- a/pkgs/servers/openxpki/default.nix +++ b/pkgs/servers/openxpki/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, perl, openssl, perlPackages, gettext, python3Packages +{ lib, fetchgit, perl, openssl, perlPackages, gettext, python3Packages # TODO: Remove extra dependencies once it is clear that they are NOT needed somewhere. , extraDependencies1 ? false, extraDependencies2 ? false, extraDependencies3 ? false }: @@ -23,18 +23,18 @@ perlPackages.buildPerlPackage { ProcProcessTable ProcSafeExec RegexpCommon SOAPLite Switch SysSigAction TemplateToolkit TestPod TestPodCoverage TextCSV_XS Workflow XMLFilterXInclude XMLParser XMLSAX XMLSAXWriter XMLSimple XMLValidatorSchema ] - ++ stdenv.lib.optionals extraDependencies1 + ++ lib.optionals extraDependencies1 [ # dependencies from parsing through core/server ClassAccessor PathTools DataDumper DateTime DateTimeFormatStrptime DBI Encode ExceptionClass FilePath FileTemp Filter GetoptLong HTMLParser ScalarListUtils MathBigInt Memoize libnet RTClientREST Storable ] - ++ stdenv.lib.optionals extraDependencies2 + ++ lib.optionals extraDependencies2 [ # dependencies taken from Debian MooseXTypesPathClass DataStreamBulk MooseXStrictConstructor GitPurePerl ConfigGitLike DevelStackTrace TreeDAGNode ClassObservable ClassFactory TimeDate ConfigAny CGIFast ClassISA YAML YAMLLibYAML AuthenSASL TextCSV FileFindRulePerl IODigest ] - ++ stdenv.lib.optionals extraDependencies3 + ++ lib.optionals extraDependencies3 [ # dependencies taken from https://metacpan.org/pod/release/ALECH/Bundle-OpenXPKI-0.06/lib/Bundle/OpenXPKI.pm AttributeParamsValidate BC CGI CPAN CacheCache ClassClassgenclassgen ClassContainer ClassDataInheritable ClassSingleton ConvertASN1 DBDSQLite DBIxHTMLViewLATEST @@ -75,9 +75,9 @@ perlPackages.buildPerlPackage { meta = { homepage = "http://www.openxpki.org"; description = "Enterprise-grade PKI/Trustcenter software"; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ tstrobel ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ tstrobel ]; + platforms = with lib.platforms; linux; broken = true; # broken with openssl 1.1 (v2.x might fix this) }; } diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix index 54c0da642b7..c3ca8baaf7c 100644 --- a/pkgs/servers/osrm-backend/default.nix +++ b/pkgs/servers/osrm-backend/default.nix @@ -1,19 +1,18 @@ -{stdenv, fetchFromGitHub, cmake, pkgconfig, bzip2, libxml2, libzip, boost, lua, luabind, tbb, expat}: +{lib, stdenv, fetchFromGitHub, cmake, pkg-config, bzip2, libxml2, libzip, boost, lua, luabind, tbb, expat}: stdenv.mkDerivation rec { pname = "osrm-backend"; - version = "5.23.0"; + version = "5.24.0"; src = fetchFromGitHub { owner = "Project-OSRM"; repo = "osrm-backend"; rev = "v${version}"; - sha256 = "sha256-FWfrdnpdx4YPa9l7bPc6QNyqyNvrikdeADSZIixX5vE="; + sha256 = "sha256-Srqe6XIF9Fs869Dp25+63ikgO7YlyT0IUJr0qMxunao="; }; - NIX_CFLAGS_COMPILE = [ "-Wno-error=pessimizing-move" "-Wno-error=redundant-move" ]; + nativeBuildInputs = [ cmake pkg-config ]; - nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ bzip2 libxml2 libzip boost lua luabind tbb expat ]; postInstall = "mkdir -p $out/share/osrm-backend && cp -r ../profiles $out/share/osrm-backend/profiles"; @@ -21,8 +20,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/Project-OSRM/osrm-backend/wiki"; description = "Open Source Routing Machine computes shortest paths in a graph. It was designed to run well with map data from the Openstreetmap Project"; - license = stdenv.lib.licenses.bsd2; - maintainers = with stdenv.lib.maintainers;[ erictapen ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers;[ erictapen ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/servers/pg_tileserv/default.nix b/pkgs/servers/pg_tileserv/default.nix index bd8edcf4335..9f735664863 100644 --- a/pkgs/servers/pg_tileserv/default.nix +++ b/pkgs/servers/pg_tileserv/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pg_tileserv"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "CrunchyData"; repo = pname; rev = "v${version}"; - sha256 = "1vdxnh1s8r8ydsjnj70s69nifhpyicb4jmgd5j7i49cr096jg526"; + sha256 = "sha256-62cJ0j/UfPW/ujKr0iA7Be8wZYlZ68mpJX8v1tAVREc="; }; - vendorSha256 = "1wbv1wh3phd9p2hfnffsjv6f8hf9fgkwg88k9w56rx1pgps63nd9"; + vendorSha256 = "sha256-qdlh9H039GwKTxOhx+dzyUHkzJbaOeuguKnBOyAPe/E="; buildFlagsArray = [ "-ldflags=-s -w -X main.programVersion=${version}" ]; diff --git a/pkgs/servers/pies/default.nix b/pkgs/servers/pies/default.nix index 201ff3296fa..46cc9562fb1 100644 --- a/pkgs/servers/pies/default.nix +++ b/pkgs/servers/pies/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv }: +{ fetchurl, lib, stdenv }: stdenv.mkDerivation rec { name = "pies-1.3"; @@ -38,11 +38,11 @@ stdenv.mkDerivation rec { native utilities). Finally, it can replace the inetd utility! ''; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; homepage = "https://www.gnu.org/software/pies/"; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; + platforms = lib.platforms.gnu ++ lib.platforms.linux; maintainers = [ ]; }; } diff --git a/pkgs/servers/pleroma-otp/default.nix b/pkgs/servers/pleroma-otp/default.nix new file mode 100644 index 00000000000..4905acd0757 --- /dev/null +++ b/pkgs/servers/pleroma-otp/default.nix @@ -0,0 +1,71 @@ +{ lib +, stdenv +, autoPatchelfHook +, fetchurl +, file +, makeWrapper +, ncurses +, nixosTests +, openssl +, unzip +, zlib +}: +stdenv.mkDerivation { + pname = "pleroma-otp"; + version = "2.2.2"; + + # To find the latest binary release stable link, have a look at + # the CI pipeline for the latest commit of the stable branch + # https://git.pleroma.social/pleroma/pleroma/-/tree/stable + src = { + aarch64-linux = fetchurl { + url = "https://git.pleroma.social/pleroma/pleroma/-/jobs/175288/artifacts/download"; + sha256 = "107kp5zqwq1lixk1cwkx4v7zpm0h248xzlm152aj36ghb43j2snw"; + }; + x86_64-linux = fetchurl { + url = "https://git.pleroma.social/pleroma/pleroma/-/jobs/175284/artifacts/download"; + sha256 = "1c6l04gga9iigm249ywwcrjg6wzy8iiid652mws3j9dnl71w2sim"; + }; + }."${stdenv.hostPlatform.system}"; + + nativeBuildInputs = [ unzip ]; + + buildInputs = [ + autoPatchelfHook + file + makeWrapper + ncurses + openssl + zlib + ]; + + # mkDerivation fails to detect the zip nature of $src due to the + # missing .zip extension. + # Let's unpack the archive explicitely. + unpackCmd = "unzip $curSrc"; + + installPhase = '' + mkdir $out + cp -r * $out''; + + # Pleroma is using the project's root path (here the store path) + # as its TMPDIR. + # Patching it to move the tmp dir to the actual tmpdir + postFixup = '' + wrapProgram $out/bin/pleroma \ + --set-default RELEASE_TMP "/tmp" + wrapProgram $out/bin/pleroma_ctl \ + --set-default RELEASE_TMP "/tmp"''; + + passthru.tests = { + pleroma = nixosTests.pleroma; + }; + + meta = with lib; { + description = "ActivityPub microblogging server"; + homepage = https://git.pleroma.social/pleroma/pleroma; + license = licenses.agpl3; + maintainers = with maintainers; [ ninjatrappeur ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; + }; +} diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index 89158838527..b040c86c9fa 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.21.1.3842-b0c7a97d9"; + version = "1.21.1.3876-3c3adfcb4"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "0wq8q9dvdwciazidvh9plxjzngjr6ibg077yksxhy41dv14vkw7s"; + sha256 = "1xpsmk5l0f0blqp5ba9n1w0npsk692p07hp4ipkq7yz3mfag50p0"; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "14pa50kvgi4m5hbw4a0q7y3s4xn9ghvnm4vdim9g18p1khfmwmwp"; + sha256 = "0dyw84x9h295428l7r8iqfb2vxkv0f1d68z1j2ka3wsw7cj1yq78"; }; outputs = [ "out" "basedb" ]; @@ -59,12 +59,12 @@ stdenv.mkDerivation rec { passthru.updateScript = writeScript "${pname}-updater" '' #!${stdenv.shell} set -eu -o pipefail - PATH=${stdenv.lib.makeBinPath [curl jq common-updater-scripts]}:$PATH + PATH=${lib.makeBinPath [curl jq common-updater-scripts]}:$PATH plexApiJson=$(curl -sS https://plex.tv/api/downloads/5.json) latestVersion="$(echo $plexApiJson | jq .computer.Linux.version | tr -d '"\n')" - for platform in ${stdenv.lib.concatStringsSep " " meta.platforms}; do + for platform in ${lib.concatStringsSep " " meta.platforms}; do arch=$(echo $platform | cut -d '-' -f1) dlUrl="$(echo $plexApiJson | jq --arg arch "$arch" -c '.computer.Linux.releases[] | select(.distro == "debian") | select(.build | contains($arch)) .url' | tr -d '"\n')" diff --git a/pkgs/servers/prayer/default.nix b/pkgs/servers/prayer/default.nix index 8bc40cb73cc..fe3cabcf9d7 100644 --- a/pkgs/servers/prayer/default.nix +++ b/pkgs/servers/prayer/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, fetchpatch, perl, openssl, db, zlib, uwimap, html-tidy, pam}: +{ lib, stdenv, fetchurl, fetchpatch, perl, openssl, db, zlib, uwimap, html-tidy, pam}: let - ssl = stdenv.lib.optionals uwimap.withSSL + ssl = lib.optionals uwimap.withSSL "-e 's/CCLIENT_SSL_ENABLE.*= false/CCLIENT_SSL_ENABLE=true/'"; in stdenv.mkDerivation rec { @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www-uxsup.csx.cam.ac.uk/~dpc22/prayer/"; description = "Yet another Webmail interface for IMAP servers on Unix systems written in C"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/servers/ps3netsrv/default.nix b/pkgs/servers/ps3netsrv/default.nix index 2288942ebf3..6ee0e3ea366 100644 --- a/pkgs/servers/ps3netsrv/default.nix +++ b/pkgs/servers/ps3netsrv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit }: +{ lib, stdenv, fetchgit }: stdenv.mkDerivation { pname = "ps3netsrv"; @@ -22,8 +22,8 @@ stdenv.mkDerivation { meta = { description = "C++ implementation of the ps3netsrv server"; homepage = "https://github.com/dirkvdb/ps3netsrv--"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ makefu ]; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ makefu ]; }; } diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 625e2e0e8ca..bebe4801c65 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, autoreconfHook +{ lib, stdenv, fetchurl, pkg-config, autoreconfHook , libsndfile, libtool, makeWrapper, perlPackages , xorg, libcap, alsaLib, glib, dconf , avahi, libjack2, libasyncns, lirc, dbus @@ -31,16 +31,16 @@ stdenv.mkDerivation rec { name = "${if libOnly then "lib" else ""}pulseaudio-${version}"; - version = "14.0"; + version = "14.2"; src = fetchurl { url = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${version}.tar.xz"; - sha256 = "0qf20rgg0ysrnvg3359j56ndls07qmfn5rsy9r85bc42jdfpfd58"; + sha256 = "sha256-ddP3dCwa5EkEmkyIkA5FS4s1DsqoxUTzSIolYqn/ZvE="; }; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig autoreconfHook makeWrapper perlPackages.perl perlPackages.XMLParser ]; + nativeBuildInputs = [ pkg-config autoreconfHook makeWrapper perlPackages.perl perlPackages.XMLParser ]; propagatedBuildInputs = lib.optionals stdenv.isLinux [ libcap ]; diff --git a/pkgs/servers/pulseaudio/pali.nix b/pkgs/servers/pulseaudio/pali.nix index d5ae80b5e79..cc11f98a829 100644 --- a/pkgs/servers/pulseaudio/pali.nix +++ b/pkgs/servers/pulseaudio/pali.nix @@ -4,7 +4,7 @@ , fetchFromGitLab , meson , ninja -, pkgconfig +, pkg-config , libsndfile , libtool , makeWrapper @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { makeWrapper meson ninja - pkgconfig + pkg-config perlPackages.perl perlPackages.XMLParser ]; diff --git a/pkgs/servers/quagga/default.nix b/pkgs/servers/quagga/default.nix index b74950d627c..c3c69fa79b6 100644 --- a/pkgs/servers/quagga/default.nix +++ b/pkgs/servers/quagga/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, libcap, libnl, readline, net-snmp, less, perl, texinfo, - pkgconfig, c-ares }: + pkg-config, c-ares }: stdenv.mkDerivation rec { pname = "quagga"; @@ -12,9 +12,9 @@ stdenv.mkDerivation rec { buildInputs = [ readline net-snmp c-ares ] - ++ stdenv.lib.optionals stdenv.isLinux [ libcap libnl ]; + ++ lib.optionals stdenv.isLinux [ libcap libnl ]; - nativeBuildInputs = [ pkgconfig perl texinfo ]; + nativeBuildInputs = [ pkg-config perl texinfo ]; configureFlags = [ "--sysconfdir=/etc/quagga" diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix index 231b390f326..ae019515627 100644 --- a/pkgs/servers/radarr/default.nix +++ b/pkgs/servers/radarr/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { makeWrapper "${mono}/bin/mono" $out/bin/Radarr \ --add-flags "$out/share/${pname}-${version}/Radarr.exe" \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ curl sqlite libmediainfo ]} ''; diff --git a/pkgs/servers/radicale/1.x.nix b/pkgs/servers/radicale/1.x.nix index 6ca82121485..fafeda88975 100644 --- a/pkgs/servers/radicale/1.x.nix +++ b/pkgs/servers/radicale/1.x.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pythonPackages }: +{ lib, fetchurl, pythonPackages }: pythonPackages.buildPythonApplication rec { pname = "radicale"; @@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "0ay90nj6fmr2aq8imi0mbjl4m2rzq7a83ikj8qs9gxsylj71j1y0"; }; - propagatedBuildInputs = stdenv.lib.optionals (!pythonPackages.isPy3k) [ + propagatedBuildInputs = lib.optionals (!pythonPackages.isPy3k) [ pythonPackages.flup pythonPackages.ldap pythonPackages.sqlalchemy diff --git a/pkgs/servers/radicale/2.x.nix b/pkgs/servers/radicale/2.x.nix index 918dad537a5..b0902feeead 100644 --- a/pkgs/servers/radicale/2.x.nix +++ b/pkgs/servers/radicale/2.x.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3 }: +{ lib, fetchFromGitHub, python3 }: python3.pkgs.buildPythonApplication rec { pname = "Radicale"; diff --git a/pkgs/servers/radicale/3.x.nix b/pkgs/servers/radicale/3.x.nix index 4b49b1e40c8..bd781d869e9 100644 --- a/pkgs/servers/radicale/3.x.nix +++ b/pkgs/servers/radicale/3.x.nix @@ -1,15 +1,12 @@ -{ lib, python3, fetchFromGitHub }: +{ lib, python3 }: python3.pkgs.buildPythonApplication rec { - pname = "radicale"; - version = "3.0.5"; + pname = "Radicale"; + version = "3.0.6"; - # No tests in PyPI tarball - src = fetchFromGitHub { - owner = "Kozea"; - repo = "Radicale"; - rev = version; - sha256 = "0w8qkjm7b62cr49dbis41kvv3179sfmvvzlhlc0rbqss6vmwbq4p"; + src = python3.pkgs.fetchPypi { + inherit pname version; + sha256 = "a9433d3df97135d9c02cec8dde4199444daf1b73ad161ded398d67b8e629fdc6"; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/servers/rainloop/default.nix b/pkgs/servers/rainloop/default.nix index 0c149149e15..681a9dd38ca 100644 --- a/pkgs/servers/rainloop/default.nix +++ b/pkgs/servers/rainloop/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, unzip, pkgs, dataPath ? "/var/lib/rainloop" }: let common = { edition, sha256 }: stdenv.mkDerivation (rec { - pname = "rainloop${stdenv.lib.optionalString (edition != "") "-${edition}"}"; + pname = "rainloop${lib.optionalString (edition != "") "-${edition}"}"; version = "1.14.0"; buildInputs = [ unzip ]; @@ -12,7 +12,7 @@ ''; src = fetchurl { - url = "https://github.com/RainLoop/rainloop-webmail/releases/download/v${version}/rainloop-${edition}${stdenv.lib.optionalString (edition != "") "-"}${version}.zip"; + url = "https://github.com/RainLoop/rainloop-webmail/releases/download/v${version}/rainloop-${edition}${lib.optionalString (edition != "") "-"}${version}.zip"; sha256 = sha256; }; diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix index 05604e936c7..ce62b7d1fdc 100644 --- a/pkgs/servers/roundcube/default.nix +++ b/pkgs/servers/roundcube/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, buildEnv, roundcube, roundcubePlugins }: +{ fetchurl, lib, stdenv, buildEnv, roundcube, roundcubePlugins }: stdenv.mkDerivation rec { pname = "roundcube"; @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { meta = { description = "Open Source Webmail Software"; - maintainers = with stdenv.lib.maintainers; [ vskilet globin ma27 ]; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.all; + maintainers = with lib.maintainers; [ vskilet globin ma27 ]; + license = lib.licenses.gpl3; + platforms = lib.platforms.all; }; } diff --git a/pkgs/servers/routinator/default.nix b/pkgs/servers/routinator/default.nix index e62ad975380..f1e705b0693 100644 --- a/pkgs/servers/routinator/default.nix +++ b/pkgs/servers/routinator/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "routinator"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "NLnetLabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rxCgW4cuYNSJ9P+cBYWAYJsghz2bp9mpAh6AuwLoV5o="; + sha256 = "sha256-JwPAwhD+Pkx8Kx24m7z/RbEvDnI2YR8dnTgAV7TMsFE="; }; - cargoSha256 = "0fcp4b2b0mjddj4blr20gvp1ih3ldzzr04rm1m06i8d2lnl68i79"; + cargoSha256 = "sha256-lhSSyJxxHc0t43xoDMtr/lSVL0xZl6poPYiyYXNvKKQ="; meta = with lib; { description = "An RPKI Validator written in Rust"; diff --git a/pkgs/servers/rpcbind/default.nix b/pkgs/servers/rpcbind/default.nix index ad18c42858b..ec3ed346cad 100644 --- a/pkgs/servers/rpcbind/default.nix +++ b/pkgs/servers/rpcbind/default.nix @@ -1,4 +1,4 @@ -{ fetchgit, lib, stdenv, pkgconfig, libnsl, libtirpc, autoreconfHook +{ fetchgit, lib, stdenv, pkg-config, libnsl, libtirpc, autoreconfHook , useSystemd ? true, systemd }: stdenv.mkDerivation { @@ -16,7 +16,7 @@ stdenv.mkDerivation { ]; buildInputs = [ libnsl libtirpc ] - ++ stdenv.lib.optional useSystemd systemd; + ++ lib.optional useSystemd systemd; configureFlags = [ "--with-systemdsystemunitdir=${if useSystemd then "${placeholder "out"}/etc/systemd/system" else "no"}" @@ -24,7 +24,7 @@ stdenv.mkDerivation { "--with-rpcuser=rpc" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; meta = with lib; { description = "ONC RPC portmapper"; diff --git a/pkgs/servers/rt/default.nix b/pkgs/servers/rt/default.nix index 94fd1661c3f..cc192a18a61 100644 --- a/pkgs/servers/rt/default.nix +++ b/pkgs/servers/rt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildEnv, fetchurl, perl, perlPackages, makeWrapper }: +{ lib, stdenv, buildEnv, fetchurl, perl, perlPackages, makeWrapper }: # This package isn't extremely useful as it is, but is getting close. # After running: @@ -97,6 +97,6 @@ stdenv.mkDerivation rec { ''; meta = { - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/rtsp-simple-server/default.nix b/pkgs/servers/rtsp-simple-server/default.nix index d3ec7dc75ee..cfc35e8528f 100644 --- a/pkgs/servers/rtsp-simple-server/default.nix +++ b/pkgs/servers/rtsp-simple-server/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , buildGoModule }: diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix index d72caf54fc4..5f1f8e6230e 100644 --- a/pkgs/servers/sabnzbd/default.nix +++ b/pkgs/servers/sabnzbd/default.nix @@ -18,7 +18,7 @@ let feedparser sabyenc3 ]); - path = stdenv.lib.makeBinPath [ par2cmdline unrar unzip p7zip ]; + path = lib.makeBinPath [ par2cmdline unrar unzip p7zip ]; in stdenv.mkDerivation rec { version = "3.1.1"; pname = "sabnzbd"; @@ -46,6 +46,6 @@ in stdenv.mkDerivation rec { homepage = "https://sabnzbd.org"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with stdenv.lib.maintainers; [ fridh ]; + maintainers = with lib.maintainers; [ fridh ]; }; } diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index a665de00cce..c125732cafc 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchurl , python -, pkgconfig +, pkg-config , bison , flex , perl @@ -40,7 +40,7 @@ , enablePam ? (!stdenv.isDarwin), pam }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "samba"; @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config bison flex perl diff --git a/pkgs/servers/scylladb/default.nix b/pkgs/servers/scylladb/default.nix index 522d40e070a..2ae3d9f486f 100644 --- a/pkgs/servers/scylladb/default.nix +++ b/pkgs/servers/scylladb/default.nix @@ -1,8 +1,8 @@ { - lib, stdenv, + lib, fetchgit, python3Packages, - pkgconfig, + pkg-config, gcc8Stdenv, boost, git, @@ -44,7 +44,7 @@ gcc8Stdenv.mkDerivation { patches = [ ./seastar-configure-script-paths.patch ./configure-etc-osrelease.patch ]; nativeBuildInputs = [ - pkgconfig + pkg-config cmake makeWrapper ninja @@ -95,8 +95,9 @@ gcc8Stdenv.mkDerivation { description = "NoSQL data store using the seastar framework, compatible with Apache Cassandra"; homepage = "https://scylladb.com"; license = licenses.agpl3; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; hydraPlatforms = []; # It's huge ATM, about 18 GB. - maintainers = [ stdenv.lib.maintainers.farlion ]; + maintainers = [ lib.maintainers.farlion ]; + broken = true; }; } diff --git a/pkgs/servers/search/elasticsearch/6.x.nix b/pkgs/servers/search/elasticsearch/6.x.nix index 673167030dc..86230e11cb9 100644 --- a/pkgs/servers/search/elasticsearch/6.x.nix +++ b/pkgs/servers/search/elasticsearch/6.x.nix @@ -1,6 +1,6 @@ { elk6Version , enableUnfree ? true -, stdenv +, lib, stdenv , fetchurl , makeWrapper , jre_headless @@ -9,7 +9,7 @@ , zlib }: -with stdenv.lib; +with lib; stdenv.mkDerivation (rec { version = elk6Version; diff --git a/pkgs/servers/search/elasticsearch/7.x.nix b/pkgs/servers/search/elasticsearch/7.x.nix index c3d50f8fbdd..6a51e5ea62f 100644 --- a/pkgs/servers/search/elasticsearch/7.x.nix +++ b/pkgs/servers/search/elasticsearch/7.x.nix @@ -1,6 +1,6 @@ { elk7Version , enableUnfree ? true -, stdenv +, lib, stdenv , fetchurl , makeWrapper , jre_headless @@ -9,7 +9,7 @@ , zlib }: -with stdenv.lib; +with lib; let info = splitString "-" stdenv.hostPlatform.system; arch = elemAt info 0; diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index 8f7e63665b8..b5c553b116e 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, mecab, kytea, libedit, pkgconfig +{ lib, stdenv, fetchurl, mecab, kytea, libedit, pkg-config , suggestSupport ? false, zeromq, libevent, msgpack , lz4Support ? false, lz4 , zlibSupport ? false, zlib @@ -7,20 +7,20 @@ stdenv.mkDerivation rec { pname = "groonga"; - version = "10.0.9"; + version = "10.1.1"; src = fetchurl { url = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz"; - sha256 = "191saqanv8k6ijl96mw4jdhh9pkpdn651f1bg4kfb34p7vy8ld9k"; + sha256 = "sha256-9NKyY+oliGIJQaNHdHOs+1GAfdZ0sy+mbQFrRNXpjLM="; }; - buildInputs = with stdenv.lib; - [ pkgconfig mecab kytea libedit ] + buildInputs = with lib; + [ pkg-config mecab kytea libedit ] ++ optional lz4Support lz4 ++ optional zlibSupport zlib ++ optionals suggestSupport [ zeromq libevent msgpack ]; - configureFlags = with stdenv.lib; + configureFlags = with lib; optional zlibSupport "--with-zlib" ++ optional lz4Support "--with-lz4"; diff --git a/pkgs/servers/search/meilisearch/default.nix b/pkgs/servers/search/meilisearch/default.nix index 569da6b5b97..6ee90aba299 100644 --- a/pkgs/servers/search/meilisearch/default.nix +++ b/pkgs/servers/search/meilisearch/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0axjygk8a7cykpa5skk4a6mkm8rndkr76l10h3z3gjdc88b17qcz"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ IOKit Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ IOKit Security ]; meta = with lib; { description = "Ultra relevant and instant full-text search API"; diff --git a/pkgs/servers/search/solr/default.nix b/pkgs/servers/search/solr/default.nix index 52bb37a8186..2b22c38143c 100644 --- a/pkgs/servers/search/solr/default.nix +++ b/pkgs/servers/search/solr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "solr"; - version = "8.6.1"; + version = "8.6.3"; src = fetchurl { url = "mirror://apache/lucene/${pname}/${version}/${pname}-${version}.tgz"; - sha256 = "0ds6zjsnwgpcmivzi7d6yqdmyn2mhf3k8g7xp26yfpm7f12gpq4g"; + sha256 = "0mbbmamajamxzcvdlrzx9wmv26kg9nhg9bzazk176dhhx3rjajf2"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/search/sphinxsearch/default.nix b/pkgs/servers/search/sphinxsearch/default.nix index 47547f07fb4..a44f96db702 100644 --- a/pkgs/servers/search/sphinxsearch/default.nix +++ b/pkgs/servers/search/sphinxsearch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, expat, libmysqlclient, +{ lib, stdenv, fetchurl, pkg-config, expat, libmysqlclient, enableXmlpipe2 ? false, enableMysql ? true }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--program-prefix=sphinxsearch-" "--enable-id64" - ] ++ stdenv.lib.optionals (!enableMysql) [ + ] ++ lib.optionals (!enableMysql) [ "--without-mysql" ]; @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pkg-config ]; - buildInputs = stdenv.lib.optionals enableMysql [ + buildInputs = lib.optionals enableMysql [ libmysqlclient - ] ++ stdenv.lib.optionals enableXmlpipe2 [ + ] ++ lib.optionals enableXmlpipe2 [ expat ]; - CXXFLAGS = with stdenv.lib; concatStringsSep " " (optionals stdenv.isDarwin [ + CXXFLAGS = with lib; concatStringsSep " " (optionals stdenv.isDarwin [ # see upstream bug: http://sphinxsearch.com/bugs/view.php?id=2578 # workaround for "error: invalid suffix on literal "-Wno-reserved-user-defined-literal" @@ -42,8 +42,8 @@ stdenv.mkDerivation rec { meta = { description = "An open source full text search server"; homepage = "http://sphinxsearch.com"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ ederoyd46 valodim ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ ederoyd46 valodim ]; }; } diff --git a/pkgs/servers/ser2net/default.nix b/pkgs/servers/ser2net/default.nix index bbb40844ae5..a751e0872ee 100644 --- a/pkgs/servers/ser2net/default.nix +++ b/pkgs/servers/ser2net/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "ser2net"; - version = "4.3.0"; + version = "4.3.2"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - sha256 = "13zhds3zav03f1snc4bb1j07i2x606bmnqm17yx37frib2hjs4nx"; + sha256 = "sha256-fA4rtFZ2lhGAwY3KUl/Jk8gjueI761J1QRdivMtbqX4="; }; passthru = { diff --git a/pkgs/servers/serf/default.nix b/pkgs/servers/serf/default.nix index 04cd93c5306..8964796862c 100644 --- a/pkgs/servers/serf/default.nix +++ b/pkgs/servers/serf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "serf"; diff --git a/pkgs/servers/shairplay/default.nix b/pkgs/servers/shairplay/default.nix index 655e60060cb..90db957d3c0 100644 --- a/pkgs/servers/shairplay/default.nix +++ b/pkgs/servers/shairplay/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config , avahi, libao }: stdenv.mkDerivation rec { @@ -12,16 +12,16 @@ stdenv.mkDerivation rec { sha256 = "02xkd9al79pbqh8rhzz5w99vv43jg5vqkqg7kxsw8c8sz9di9wsa"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ avahi libao ]; enableParallelBuilding = true; # the build will fail without complaining about a reference to /tmp - preFixup = stdenv.lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString stdenv.isLinux '' patchelf \ - --set-rpath "${stdenv.lib.makeLibraryPath buildInputs}:$out/lib" \ + --set-rpath "${lib.makeLibraryPath buildInputs}:$out/lib" \ $out/bin/shairplay ''; diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix index 108721fceb0..bae2f3aad79 100644 --- a/pkgs/servers/shairport-sync/default.nix +++ b/pkgs/servers/shairport-sync/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, openssl, avahi, alsaLib -, libdaemon, popt, pkgconfig, libconfig, libpulseaudio, soxr }: +, libdaemon, popt, pkg-config, libconfig, libpulseaudio, soxr }: stdenv.mkDerivation rec { version = "3.3.7"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "mikebrady"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ openssl diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix index 41543c325a6..c81c7f30b31 100644 --- a/pkgs/servers/shishi/default.nix +++ b/pkgs/servers/shishi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , libgcrypt, libgpgerror, libtasn1 # Optional Dependencies @@ -9,18 +9,18 @@ let mkFlag = trueStr: falseStr: cond: name: val: "--" + (if cond then trueStr else falseStr) + name - + stdenv.lib.optionalString (val != null && cond != false) "=${val}"; + + lib.optionalString (val != null && cond != false) "=${val}"; mkEnable = mkFlag "enable-" "disable-"; mkWith = mkFlag "with-" "without-"; mkOther = mkFlag "" "" true; - shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null; + shouldUsePkg = pkg: if pkg != null && lib.any (lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null; optPam = shouldUsePkg pam; optLibidn = shouldUsePkg libidn; optGnutls = shouldUsePkg gnutls; in -with stdenv.lib; +with lib; stdenv.mkDerivation rec { name = "shishi-1.0.2"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { # Fixes support for gcrypt 1.6+ patches = [ ./gcrypt-fix.patch ./freebsd-unistd.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libgcrypt libgpgerror libtasn1 optPam optLibidn optGnutls ]; configureFlags = [ diff --git a/pkgs/servers/sickbeard/default.nix b/pkgs/servers/sickbeard/default.nix index 10a5018d781..46562a11fac 100644 --- a/pkgs/servers/sickbeard/default.nix +++ b/pkgs/servers/sickbeard/default.nix @@ -30,6 +30,6 @@ in stdenv.mkDerivation { description = "PVR & episode guide that downloads and manages all your TV shows"; license = licenses.gpl3; homepage = "https://github.com/midgetspy/Sick-Beard"; - maintainers = with stdenv.lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix index 48efe714761..afae82b4d39 100644 --- a/pkgs/servers/sickbeard/sickgear.nix +++ b/pkgs/servers/sickbeard/sickgear.nix @@ -30,6 +30,6 @@ in stdenv.mkDerivation rec { description = "The most reliable stable TV fork of the great Sick-Beard to fully automate TV enjoyment with innovation"; license = licenses.gpl3; homepage = "https://github.com/SickGear/SickGear"; - maintainers = with stdenv.lib.maintainers; [ rembo10 ]; + maintainers = with lib.maintainers; [ rembo10 ]; }; } diff --git a/pkgs/servers/sickbeard/sickrage.nix b/pkgs/servers/sickbeard/sickrage.nix index 6b7d3e7b1ca..43ba82caf76 100644 --- a/pkgs/servers/sickbeard/sickrage.nix +++ b/pkgs/servers/sickbeard/sickrage.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python2, makeWrapper }: +{ lib, fetchFromGitHub, python2, makeWrapper }: python2.pkgs.buildPythonApplication rec { pname = "sickrage"; @@ -7,7 +7,7 @@ python2.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "SickRage"; repo = "SickRage"; - rev = version; + rev = version; sha256 = "0lzklpsxqrb73inbv8almnhbnb681pmi44gzc8i4sjwmdksiiif9"; }; diff --git a/pkgs/servers/silc-server/default.nix b/pkgs/servers/silc-server/default.nix index 084d60ba6a5..48bc4395d07 100644 --- a/pkgs/servers/silc-server/default.nix +++ b/pkgs/servers/silc-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "silc-server-1.1.18"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://silcnet.org/"; description = "Secure Internet Live Conferencing server"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/servers/simplehttp2server/default.nix b/pkgs/servers/simplehttp2server/default.nix index bc56053515b..d673a201646 100644 --- a/pkgs/servers/simplehttp2server/default.nix +++ b/pkgs/servers/simplehttp2server/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "simplehttp2server"; diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix index 975ea9596b3..d7611baad14 100644 --- a/pkgs/servers/sip/freeswitch/default.nix +++ b/pkgs/servers/sip/freeswitch/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, fetchpatch, stdenv, lib, pkgconfig, autoreconfHook +{ fetchFromGitHub, fetchpatch, stdenv, lib, pkg-config, autoreconfHook , ncurses, gnutls, readline , openssl, perl, sqlite, libjpeg, speex, pcre, libuuid , ldns, libedit, yasm, which, libsndfile, libtiff @@ -117,7 +117,7 @@ stdenv.mkDerivation rec { done ''; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ openssl ncurses gnutls readline perl libjpeg sqlite pcre speex ldns libedit yasm which @@ -150,8 +150,8 @@ stdenv.mkDerivation rec { meta = { description = "Cross-Platform Scalable FREE Multi-Protocol Soft Switch"; homepage = "https://freeswitch.org/"; - license = stdenv.lib.licenses.mpl11; - maintainers = with stdenv.lib.maintainers; [ misuzu ]; - platforms = with stdenv.lib.platforms; unix; + license = lib.licenses.mpl11; + maintainers = with lib.maintainers; [ misuzu ]; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/servers/sip/sipwitch/default.nix b/pkgs/servers/sip/sipwitch/default.nix index 33c888ba35e..f5b3288c60c 100644 --- a/pkgs/servers/sip/sipwitch/default.nix +++ b/pkgs/servers/sip/sipwitch/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, ucommon, libosip, libexosip, gnutls, zlib }: +{ fetchurl, lib, stdenv, pkg-config, ucommon, libosip, libexosip, gnutls, zlib }: stdenv.mkDerivation rec { name = "sipwitch-1.9.15"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "2a7aa86a653f6810b3cd9cce6c37b3f70e937e7d14b09fd5c2a70d70588a9482"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ucommon libosip libexosip gnutls zlib ]; preConfigure = '' @@ -20,8 +20,9 @@ stdenv.mkDerivation rec { meta = { description = "Secure peer-to-peer VoIP server that uses the SIP protocol"; homepage = "https://www.gnu.org/software/sipwitch/"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ ]; + platforms = with lib.platforms; linux; + broken = true; # Require libexosip2 < 5.0.0 which is vulnerable to CVE-2014-10375. }; } diff --git a/pkgs/servers/skydns/default.nix b/pkgs/servers/skydns/default.nix index 176b41a1fe2..e6f35124a6f 100644 --- a/pkgs/servers/skydns/default.nix +++ b/pkgs/servers/skydns/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "skydns"; @@ -17,6 +17,6 @@ buildGoPackage rec { goDeps = ./deps.nix; meta = { - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; } diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix index 6b83df2496c..3e28f501049 100644 --- a/pkgs/servers/slimserver/default.nix +++ b/pkgs/servers/slimserver/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper +{ lib, fetchurl, makeWrapper , perlPackages, flac, faad2, sox, lame, monkeysAudio, wavpack }: perlPackages.buildPerlPackage rec { @@ -44,6 +44,7 @@ perlPackages.buildPerlPackage rec { perlPackages.LogLog4perl perlPackages.LWP perlPackages.NetHTTP + perlPackages.NetHTTPSNB perlPackages.ProcBackground perlPackages.SubName perlPackages.TemplateToolkit @@ -88,7 +89,7 @@ perlPackages.buildPerlPackage rec { installPhase = '' cp -r . $out wrapProgram $out/slimserver.pl \ - --prefix PATH : "${stdenv.lib.makeBinPath [ lame flac faad2 sox monkeysAudio wavpack ]}" + --prefix PATH : "${lib.makeBinPath [ lame flac faad2 sox monkeysAudio wavpack ]}" ''; outputs = [ "out" ]; diff --git a/pkgs/servers/smcroute/default.nix b/pkgs/servers/smcroute/default.nix index 3a332876ffd..0ef8a5799e2 100644 --- a/pkgs/servers/smcroute/default.nix +++ b/pkgs/servers/smcroute/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libcap }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libcap }: stdenv.mkDerivation rec { pname = "smcroute"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0mjq9cx093b0825rqbcq3z0lzy81pd8h0fz6rda6npg3604rxj81"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libcap ]; configureFlags = [ diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix index a1c854b7723..a1803abe6a8 100644 --- a/pkgs/servers/sonarr/default.nix +++ b/pkgs/servers/sonarr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper, ... }: +{ lib, stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper, ... }: stdenv.mkDerivation rec { pname = "sonarr"; @@ -17,15 +17,15 @@ stdenv.mkDerivation rec { makeWrapper "${mono}/bin/mono" $out/bin/NzbDrone \ --add-flags "$out/bin/NzbDrone.exe" \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ curl sqlite libmediainfo ]} ''; meta = { description = "Smart PVR for newsgroup and bittorrent users"; homepage = "https://sonarr.tv/"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ fadenb purcell ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ fadenb purcell ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/servers/sozu/default.nix b/pkgs/servers/sozu/default.nix index c3c839fcc29..8d3e4e1388b 100644 --- a/pkgs/servers/sozu/default.nix +++ b/pkgs/servers/sozu/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "5WOigCiQZQ5DaTd15vV8pUh8Xl3UIe9yLG1ptUtY+iA="; buildInputs = - stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; meta = with lib; { description = diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix index 05d41afa28b..63cbbf16b30 100644 --- a/pkgs/servers/sql/cockroachdb/default.nix +++ b/pkgs/servers/sql/cockroachdb/default.nix @@ -24,7 +24,7 @@ buildGoPackage rec { sha256 = "0mm3hfr778c7djza8gr1clwa8wca4d3ldh9hlg80avw4x664y5zi"; }; - NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.cc.isGNU [ "-Wno-error=deprecated-copy" "-Wno-error=redundant-move" "-Wno-error=pessimizing-move" ]; + NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ "-Wno-error=deprecated-copy" "-Wno-error=redundant-move" "-Wno-error=pessimizing-move" ]; inherit nativeBuildInputs buildInputs; diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix index c6cf5a5ad82..6f6b5c39074 100644 --- a/pkgs/servers/sql/dolt/default.nix +++ b/pkgs/servers/sql/dolt/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchFromGitHub, lib, buildGoModule }: +{ fetchFromGitHub, lib, buildGoModule }: buildGoModule rec { pname = "dolt"; - version = "0.22.6"; + version = "0.22.12"; src = fetchFromGitHub { owner = "liquidata-inc"; repo = "dolt"; rev = "v${version}"; - sha256 = "1kd7kqiic6mm974cix7m3620yzdaxpdnnq4q53pyicfq2i4pk2ml"; + sha256 = "sha256-SYgBy2WGP6ssMDohnbflnd2XpF8iwmxoTTlHQYc1+Wo="; }; modRoot = "./go"; subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ]; - vendorSha256 = "0hyp44gzmp49mv26xa9j2nc64y2v3np1x1iqc4vsryf3ajsy2720"; + vendorSha256 = "sha256-Q87cGO82EmehpuMR3SCW9oF8DtaGURp4coLec4Rv2Js="; doCheck = false; diff --git a/pkgs/servers/sql/mariadb/connector-c/default.nix b/pkgs/servers/sql/mariadb/connector-c/default.nix index 6454aa4897e..37c697f3676 100644 --- a/pkgs/servers/sql/mariadb/connector-c/default.nix +++ b/pkgs/servers/sql/mariadb/connector-c/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, cmake +{ lib, stdenv, fetchurl, cmake , curl, openssl, zlib , libiconv , version, sha256, ... }: -with stdenv.lib; +with lib; stdenv.mkDerivation { pname = "mariadb-connector-c"; diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 562b059015f..e70d43a1505 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, makeWrapper, ncurses, nixosTests +{ lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkg-config, makeWrapper, ncurses, nixosTests , libiconv, openssl, pcre2, boost, judy, bison, libxml2, libkrb5, linux-pam, curl , libaio, libevent, jemalloc, cracklib, systemd, perl , bzip2, lz4, lzo, snappy, xz, zlib, zstd @@ -8,7 +8,7 @@ , withStorageRocks ? true }: -with stdenv.lib; +with lib; let # in mariadb # spans the whole file @@ -33,7 +33,7 @@ common = rec { # attributes common to both builds name = "mariadb-${version}.tar.gz"; }; - nativeBuildInputs = [ cmake pkgconfig ] + nativeBuildInputs = [ cmake pkg-config ] ++ optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ diff --git a/pkgs/servers/sql/mariadb/galera/default.nix b/pkgs/servers/sql/mariadb/galera/default.nix index 7d1c49815e4..3c13388c460 100644 --- a/pkgs/servers/sql/mariadb/galera/default.nix +++ b/pkgs/servers/sql/mariadb/galera/default.nix @@ -10,13 +10,13 @@ let in stdenv.mkDerivation rec { pname = "mariadb-galera"; - version = "26.4.5"; + version = "26.4.7"; src = fetchFromGitHub { owner = "codership"; repo = "galera"; rev = "release_${version}"; - sha256 = "10sir0hxxglw9jsjrclfgrqm8n5zng6rwj2fgff141x9n9l55w7l"; + sha256 = "0h7s670pcasq8wzprhyxqfca2cghi62b8xz2kikb2a86wd453qil"; fetchSubmodules = true; }; @@ -47,7 +47,6 @@ in stdenv.mkDerivation rec { install -m 444 "scripts/packages/freebsd/LICENSE" "$out/$GALERA_LICENSE_DIR" install -m 444 "LICENSE" "$out/$GALERA_LICENSE_DIR/GPLv2" install -m 444 "asio/LICENSE_1_0.txt" "$out/$GALERA_LICENSE_DIR/LICENSE.asio" - install -m 444 "www.evanjones.ca/LICENSE" "$out/$GALERA_LICENSE_DIR/LICENSE.crc32c" ''; meta = with lib; { diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/servers/sql/monetdb/default.nix index ca284330b30..80033e406ee 100644 --- a/pkgs/servers/sql/monetdb/default.nix +++ b/pkgs/servers/sql/monetdb/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "monetdb"; - version = "11.39.7"; + version = "11.39.11"; src = fetchurl { url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${version}.tar.bz2"; - sha256 = "0qb2hlz42400diahmsbflfjmfnzd5slm6761xhgvh8s4rjfqm21w"; + sha256 = "1b70r4b5m0r0xpy7i76xx0xsmwagsjdcp5j6nqfjcyn1m65ydzvs"; }; postPatch = '' diff --git a/pkgs/servers/sql/mssql/jdbc/default.nix b/pkgs/servers/sql/mssql/jdbc/default.nix index f6edfe388ac..881f014f134 100644 --- a/pkgs/servers/sql/mssql/jdbc/default.nix +++ b/pkgs/servers/sql/mssql/jdbc/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { pname = "mssql-jdbc"; @@ -11,6 +11,6 @@ stdenv.mkDerivation rec { }; meta = { - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix index bfdacf3444e..98166d0b38a 100644 --- a/pkgs/servers/sql/mysql/5.7.x.nix +++ b/pkgs/servers/sql/mysql/5.7.x.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, bison, pkgconfig +{ lib, stdenv, fetchurl, cmake, bison, pkg-config , boost, libedit, libevent, lz4, ncurses, openssl, protobuf, readline, zlib, perl , cctools, CoreServices, developer_cmds , libtirpc, rpcsvc-proto @@ -16,15 +16,15 @@ self = stdenv.mkDerivation rec { sha256 = "1fhv16zr46pxm1j8vb8x8mh3nwzglg01arz8gnazbmjqldr5idpq"; }; - preConfigure = stdenv.lib.optional stdenv.isDarwin '' + preConfigure = lib.optional stdenv.isDarwin '' ln -s /bin/ps $TMPDIR/ps export PATH=$PATH:$TMPDIR ''; - nativeBuildInputs = [ cmake bison pkgconfig rpcsvc-proto ]; + nativeBuildInputs = [ cmake bison pkg-config rpcsvc-proto ]; buildInputs = [ boost libedit libevent lz4 ncurses openssl protobuf readline zlib libtirpc ] - ++ stdenv.lib.optionals stdenv.isDarwin [ perl cctools CoreServices developer_cmds ]; + ++ lib.optionals stdenv.isDarwin [ perl cctools CoreServices developer_cmds ]; outputs = [ "out" "static" ]; @@ -58,7 +58,7 @@ self = stdenv.mkDerivation rec { ]; CXXFLAGS = "-fpermissive -std=c++11"; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; + NIX_LDFLAGS = lib.optionalString stdenv.isLinux "-lgcc_s"; prePatch = '' sed -i -e "s|/usr/bin/libtool|libtool|" cmake/merge_archives.cmake.in diff --git a/pkgs/servers/sql/mysql/8.0.x.nix b/pkgs/servers/sql/mysql/8.0.x.nix index 519ef64bca8..3dbd84c2a98 100644 --- a/pkgs/servers/sql/mysql/8.0.x.nix +++ b/pkgs/servers/sql/mysql/8.0.x.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, bison, cmake, pkgconfig +{ lib, stdenv, fetchurl, bison, cmake, pkg-config , boost, icu, libedit, libevent, lz4, ncurses, openssl, protobuf, re2, readline, zlib, zstd , numactl, perl, cctools, CoreServices, developer_cmds, libtirpc, rpcsvc-proto }: @@ -17,7 +17,7 @@ self = stdenv.mkDerivation rec { ./abi-check.patch ]; - nativeBuildInputs = [ bison cmake pkgconfig rpcsvc-proto ]; + nativeBuildInputs = [ bison cmake pkg-config rpcsvc-proto ]; ## NOTE: MySQL upstream frequently twiddles the invocations of libtool. When updating, you might proactively grep for libtool references. postPatch = '' diff --git a/pkgs/servers/sql/mysql/jdbc/default.nix b/pkgs/servers/sql/mysql/jdbc/default.nix index 66e62b823d9..5aab3000f37 100644 --- a/pkgs/servers/sql/mysql/jdbc/default.nix +++ b/pkgs/servers/sql/mysql/jdbc/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ant, unzip}: +{lib, stdenv, fetchurl, ant, unzip}: stdenv.mkDerivation rec { name = "mysql-connector-java-5.1.46"; @@ -12,6 +12,6 @@ stdenv.mkDerivation rec { buildInputs = [ unzip ant ]; meta = { - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/sql/pgpool/default.nix b/pkgs/servers/sql/pgpool/default.nix index ad32904ce8a..101f8163659 100644 --- a/pkgs/servers/sql/pgpool/default.nix +++ b/pkgs/servers/sql/pgpool/default.nix @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc" "--localstatedir=/var" "--with-openssl" - ] ++ stdenv.lib.optional (pam != null) "--with-pam" - ++ stdenv.lib.optional (libmemcached != null) "--with-memcached=${libmemcached}"; + ] ++ lib.optional (pam != null) "--with-pam" + ++ lib.optional (libmemcached != null) "--with-memcached=${libmemcached}"; installFlags = [ "sysconfdir=\${out}/etc" diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 20e3637f40c..27345616f89 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -4,7 +4,7 @@ let # dependencies { stdenv, lib, fetchurl, makeWrapper , glibc, zlib, readline, openssl, icu, systemd, libossp_uuid - , pkgconfig, libxml2, tzdata + , pkg-config, libxml2, tzdata # This is important to obtain a version of `libpq` that does not depend on systemd. , enableSystemd ? (lib.versionAtLeast version "9.6" && !stdenv.isDarwin) @@ -40,7 +40,7 @@ let ++ lib.optionals enableSystemd [ systemd ] ++ lib.optionals (!stdenv.isDarwin) [ libossp_uuid ]; - nativeBuildInputs = lib.optionals icuEnabled [ pkgconfig ]; + nativeBuildInputs = lib.optionals icuEnabled [ pkg-config ]; enableParallelBuilding = !stdenv.isDarwin; diff --git a/pkgs/servers/sql/postgresql/ext/pg_partman.nix b/pkgs/servers/sql/postgresql/ext/pg_partman.nix index d0bc8435c3e..fb690e96328 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_partman.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_partman.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pg_partman"; - version = "4.4.0"; + version = "4.4.1"; buildInputs = [ postgresql ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "pgpartman"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "0wr2nivp0b8vk355rnv4bygiashq98q9zhfgdbxzhm7bgxd01rk2"; + sha256 = "sha256-jFG2Zna97FHZin2V3Cwy5JcdeFh09Yy/eoyHtcCorPA="; }; installPhase = '' diff --git a/pkgs/servers/sql/postgresql/ext/pg_similarity.nix b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix index 70cbb656e0a..e424120a390 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_similarity.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { operators (= and <>) you can use ~~~ and ~!~ (any of these operators represents a similarity function). ''; platforms = postgresql.meta.platforms; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ danbst ]; }; } diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix index 50fb383dabb..b3d0bd5e2e8 100644 --- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix +++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix @@ -1,15 +1,15 @@ -{ lib, stdenv, fetchurl, pkgconfig, postgresql, msgpack, groonga }: +{ lib, stdenv, fetchurl, pkg-config, postgresql, msgpack, groonga }: stdenv.mkDerivation rec { pname = "pgroonga"; - version = "2.2.7"; + version = "2.2.8"; src = fetchurl { url = "https://packages.groonga.org/source/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1rd3cxap9rqpg5y8y48r5bd7rki3lck6qsrb0bqdqm9xffnibw8j"; + sha256 = "sha256-YDDO3t6ARbQv72QotjA7DNxOlRo2O5CYzrH+/eEzj3w="; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ postgresql msgpack groonga ]; makeFlags = [ "HAVE_MSGPACK=1" ]; diff --git a/pkgs/servers/sql/postgresql/ext/pgrouting.nix b/pkgs/servers/sql/postgresql/ext/pgrouting.nix index c51ef153444..67e7fc5bc46 100644 --- a/pkgs/servers/sql/postgresql/ext/pgrouting.nix +++ b/pkgs/servers/sql/postgresql/ext/pgrouting.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pgrouting"; - version = "3.1.1"; + version = "3.1.3"; nativeBuildInputs = [ cmake perl ]; buildInputs = [ postgresql boost ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "pgRouting"; repo = pname; rev = "v${version}"; - sha256 = "1wj583c4iipsss75czww176aqa8sncsvcx1i0d6cb41v03iq5acf"; + sha256 = "sha256-ahDQ+nSTeIsdjID/ZwiGZCVBzOf0/oQs3SYsFYEEoxY="; }; installPhase = '' @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/pgRouting/pgrouting/releases/tag/v${version}"; maintainers = [ maintainers.steve-chavez ]; platforms = postgresql.meta.platforms; - license = licenses.gpl2; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix index 5ce32177d51..d6df5e4ba0d 100644 --- a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix +++ b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "plpgsql_check"; - version = "1.15.1"; + version = "1.15.2"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = "v${version}"; - sha256 = "0rjbzcdvwx19ql0ilccr47inilf7kh5hn7aacjqs1nxk91g3x7yf"; + sha256 = "sha256-mYFItrFC0BeRwLfZA1SAV+4rvrNrx75lTWS7w2ZDHag="; }; buildInputs = [ postgresql ]; diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index e9c9a24ae36..f3f7a4a6911 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -7,7 +7,7 @@ , proj , gdal , json_c -, pkgconfig +, pkg-config , file , protobufc , libiconv @@ -15,22 +15,22 @@ }: stdenv.mkDerivation rec { pname = "postgis"; - version = "3.1.0"; + version = "3.1.1"; outputs = [ "out" "doc" ]; src = fetchurl { url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"; - sha256 = "008280ijd6m9h35y9lcpql0fk0h9f3zkc1pfkdm0rkbnd12y41ns"; + sha256 = "0z9a39243fv37mansbbjq5mmxpnhr7xzn8pv92fr7dkdb3psz5hf"; }; buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc ] - ++ stdenv.lib.optional stdenv.isDarwin libiconv; - nativeBuildInputs = [ perl pkgconfig ]; + ++ lib.optional stdenv.isDarwin libiconv; + nativeBuildInputs = [ perl pkg-config ]; dontDisableStatic = true; # postgis config directory assumes /include /lib from the same root for json-c library - NIX_LDFLAGS = "-L${stdenv.lib.getLib json_c}/lib"; + NIX_LDFLAGS = "-L${lib.getLib json_c}/lib"; preConfigure = '' sed -i 's@/usr/bin/file@${file}/bin/file@' configure diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index abde49542f1..d10907805aa 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "timescaledb"; - version = "2.0.0"; + version = "2.0.1"; nativeBuildInputs = [ cmake ]; buildInputs = [ postgresql openssl ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "timescale"; repo = "timescaledb"; rev = "refs/tags/${version}"; - sha256 = "0id1h46490mjqp8ijhv2qswpdli2nh2z15mgh6gfc2wl3bhwhi1g"; + sha256 = "105zc5m3zvnrqr8409qdbycb4yp7znxmna76ri1m2djkdp5rh4q1"; }; # -DWARNINGS_AS_ERRORS=OFF to be removed once https://github.com/timescale/timescaledb/issues/2770 is fixed in upstream diff --git a/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix b/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix index f94bb69871c..3f3b2aa4f14 100644 --- a/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix +++ b/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, postgresql }: +{ lib, stdenv, fetchFromGitHub, pkg-config, postgresql }: stdenv.mkDerivation { pname = "tsearch-extras"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "18j0saqblg3jhrz38splk173xjwdf32c67ymm18m8n5y94h8d2ba"; }; - nativenativeBuildInputs = [ pkgconfig ]; + nativenativeBuildInputs = [ pkg-config ]; buildInputs = [ postgresql ]; installPhase = '' diff --git a/pkgs/servers/squid/default.nix b/pkgs/servers/squid/default.nix index 09507aaef2a..59da5a80a37 100644 --- a/pkgs/servers/squid/default.nix +++ b/pkgs/servers/squid/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, perl, openldap, pam, db, cyrus_sasl, libcap -, expat, libxml2, openssl, pkgconfig +, expat, libxml2, openssl, pkg-config }: stdenv.mkDerivation rec { @@ -11,10 +11,10 @@ stdenv.mkDerivation rec { sha256 = "1q1ywpic6s7dfjj3cwzcfgscc4zq0aih462gyas7j1z683ss14b8"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ perl openldap db cyrus_sasl expat libxml2 openssl - ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap pam ]; + ] ++ lib.optionals stdenv.isLinux [ libcap pam ]; configureFlags = [ "--enable-ipv6" @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { "--enable-removal-policies=lru,heap" "--enable-delay-pools" "--enable-x-accelerator-vary" - ] ++ stdenv.lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) "--enable-linux-netfilter"; + ] ++ lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) "--enable-linux-netfilter"; meta = with lib; { description = "A caching proxy for the Web supporting HTTP, HTTPS, FTP, and more"; diff --git a/pkgs/servers/swego/default.nix b/pkgs/servers/swego/default.nix new file mode 100644 index 00000000000..4c7c9d76450 --- /dev/null +++ b/pkgs/servers/swego/default.nix @@ -0,0 +1,37 @@ +{ buildGoModule +, fetchFromGitHub +, lib +, stdenv +}: + +buildGoModule rec { + pname = "swego"; + version = "0.7"; + + src = fetchFromGitHub { + owner = "nodauf"; + repo = "Swego"; + rev = "v${version}"; + sha256 = "14qww4ndvrxmrgkggr8hyvfpz2v7fw0vq6s8715mxa28f8pfi78b"; + }; + + vendorSha256 = "068drahh0aysrm8cr5pgik27jqyk28bsx5130mc2v3xd0xmk8yp1"; + + postInstall = '' + mv $out/bin/src $out/bin/$pname + ''; + + meta = with lib; { + description = "Simple Webserver in Golang"; + longDescription = '' + Swiss army knife Webserver in Golang. Similar to the Python + SimpleHTTPServer but with many features. + ''; + homepage = "https://github.com/nodauf/Swego"; + license = with licenses; [ gpl2Only ]; + maintainers = with maintainers; [ fab ]; + # darwin crashes with: + # src/controllers/parsingArgs.go:130:4: undefined: PrintEmbeddedFiles + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index 18803636a0d..66cb54f0fee 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,21 +2,21 @@ buildGoModule rec { pname = "tailscale"; - version = "1.2.10"; - tagHash = "4b3581abed6c2db79b61eb1b53e29645df12a833"; # from `git rev-parse v1.2.10` + version = "1.4.2"; + tagHash = "f40ccb086c4c3f09b3cc67b7c559bd2c5d3cf953"; # from `git rev-parse v1.4.2` src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "09m4xhnjpnkic9jy5dwnmpl40r92xa8fcx4xhpadv6hjpx9k4xx5"; + sha256 = "0jc7z6ml59a1xs3c3mskj9s34gw7hmixn8dbz3bi81qv0yi9pvnx"; }; nativeBuildInputs = [ makeWrapper ]; CGO_ENABLED = 0; - vendorSha256 = "01g3jkgl3jrygd154gmjm3dq13nkppd993iym7assdz8mr3rq31s"; + vendorSha256 = "16aa7jc2h59hnnh0mfmnd0k198dijm9j4c44j80wpzlhf4x27yjs"; doCheck = false; diff --git a/pkgs/servers/tang/default.nix b/pkgs/servers/tang/default.nix index caeb969f23b..8c5a64f2295 100644 --- a/pkgs/servers/tang/default.nix +++ b/pkgs/servers/tang/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, asciidoc +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, asciidoc , jansson, jose, http-parser, systemd }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig asciidoc ]; + nativeBuildInputs = [ autoreconfHook pkg-config asciidoc ]; buildInputs = [ jansson jose http-parser systemd ]; outputs = [ "out" "man" ]; diff --git a/pkgs/servers/tarssh/default.nix b/pkgs/servers/tarssh/default.nix index bb353dda928..9240b9c51a2 100644 --- a/pkgs/servers/tarssh/default.nix +++ b/pkgs/servers/tarssh/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, rustPlatform, lib, stdenv }: +{ fetchFromGitHub, rustPlatform, lib }: with rustPlatform; diff --git a/pkgs/servers/tautulli/default.nix b/pkgs/servers/tautulli/default.nix index c7e88eb0c46..61f9c785185 100644 --- a/pkgs/servers/tautulli/default.nix +++ b/pkgs/servers/tautulli/default.nix @@ -15,8 +15,6 @@ buildPythonApplication rec { sha256 = "QHpVIOtGFzNqAEcBCv48YWO4pYatbTe/CWwcwjbj+34="; }; - doBuild = false; - installPhase = '' mkdir -p $out/bin $out/libexec/tautulli cp -R contrib data lib plexpy Tautulli.py $out/libexec/tautulli diff --git a/pkgs/servers/tegola/default.nix b/pkgs/servers/tegola/default.nix index c18bf17a7c7..f2161d5d47e 100644 --- a/pkgs/servers/tegola/default.nix +++ b/pkgs/servers/tegola/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "tegola"; diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix index b307f7861fa..100b021d9ce 100644 --- a/pkgs/servers/teleport/default.nix +++ b/pkgs/servers/teleport/default.nix @@ -1,16 +1,24 @@ # This file was generated by https://github.com/kamilchm/go2nix v2.0-dev -{ stdenv, buildGoPackage, zip, fetchFromGitHub }: +{ lib, buildGoPackage, zip, fetchFromGitHub }: +let + webassets = fetchFromGitHub { + owner = "gravitational"; + repo = "webassets"; + rev = "2d79788dbcd005bdcfe5b5120007d0faf8f1fc82"; + sha256 = "001a3bx8yyx1hq8y5yiy1jzp122q8gcl369lj0609gaxp6dk5bdw"; + }; +in buildGoPackage rec { pname = "teleport"; - version = "4.2.11"; + version = "5.1.2"; # This repo has a private submodule "e" which fetchgit cannot handle without failing. src = fetchFromGitHub { owner = "gravitational"; repo = "teleport"; rev = "v${version}"; - sha256 = "00mkh6rmdgwwhbk3jmxgwl0aisnnqw6q6i5zl1hn69hvdny9liii"; + sha256 = "0h1hn2dpdsmhxac06gn6787z2mnfcwb3wn0c2l7l2qhw6iqpgmvh"; }; goPackagePath = "github.com/gravitational/teleport"; @@ -24,6 +32,7 @@ buildGoPackage rec { cd $NIX_BUILD_TOP/go/src/github.com/gravitational/teleport mkdir -p build echo "making webassets" + cp -r ${webassets}/* webassets/ make build/webassets.zip cat build/webassets.zip >> $NIX_BUILD_TOP/go/bin/teleport rm -fr build/webassets.zip @@ -34,11 +43,19 @@ buildGoPackage rec { dontStrip = true; + doInstallCheck = true; + + installCheckPhase = '' + $out/bin/tsh version | grep ${version} > /dev/null + $out/bin/tctl version | grep ${version} > /dev/null + $out/bin/teleport version | grep ${version} > /dev/null + ''; + meta = { description = "A SSH CA management suite"; homepage = "https://gravitational.com/teleport/"; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ sigma tomberek ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ sigma tomberek ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/tmate-ssh-server/default.nix b/pkgs/servers/tmate-ssh-server/default.nix index 6fe5bc201f9..ea564e6791d 100644 --- a/pkgs/servers/tmate-ssh-server/default.nix +++ b/pkgs/servers/tmate-ssh-server/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, cmake, libtool, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, cmake, libtool, pkg-config , zlib, openssl, libevent, ncurses, ruby, msgpack, libssh }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { dontUseCmakeConfigure = true; buildInputs = [ libtool zlib openssl libevent ncurses ruby msgpack libssh ]; - nativeBuildInputs = [ autoreconfHook cmake pkgconfig ]; + nativeBuildInputs = [ autoreconfHook cmake pkg-config ]; meta = with lib; { homepage = "https://tmate.io/"; diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index 4ef454d6b56..340bad6bdc8 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, buildGoModule, go-bindata, nixosTests }: +{ lib, fetchzip, buildGoModule, go-bindata, nixosTests }: buildGoModule rec { pname = "traefik"; diff --git a/pkgs/servers/trezord/default.nix b/pkgs/servers/trezord/default.nix index 03ff9f32fa5..cc0fb0d7421 100644 --- a/pkgs/servers/trezord/default.nix +++ b/pkgs/servers/trezord/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildGoModule , fetchFromGitHub , trezor-udev-rules diff --git a/pkgs/servers/trickster/trickster.nix b/pkgs/servers/trickster/trickster.nix index b99375dbb3d..5cf08ee6c3c 100644 --- a/pkgs/servers/trickster/trickster.nix +++ b/pkgs/servers/trickster/trickster.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "trickster"; diff --git a/pkgs/servers/tt-rss/default.nix b/pkgs/servers/tt-rss/default.nix index 95b895b281b..e91fed5ee16 100644 --- a/pkgs/servers/tt-rss/default.nix +++ b/pkgs/servers/tt-rss/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "tt-rss"; - version = "2019-01-29"; - rev = "c7c9c5fb0ab6b3d4ea3078865670d6c1dfe2ecac"; + version = "2021-01-29"; + rev = "6d8f2221b82b6a31becbeed8baf5e05ad9e053fe"; src = fetchurl { - url = "https://git.tt-rss.org/git/tt-rss/archive/${rev}.tar.gz"; - sha256 = "0k184zqrfscv17gnl106q4yzhqmxb0g1dn1wkdkrclc3qcrviyp6"; + url = "https://git.tt-rss.org/fox/tt-rss/archive/${rev}.tar.gz"; + sha256 = "124c62hck631xlq5aa1miz9rbg711ygk7z1yx92m5dfcy630l7x5"; }; installPhase = '' diff --git a/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix b/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix index 375726a4692..1accac5bf6f 100644 --- a/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix +++ b/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation { +{ lib, 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/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix b/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix index 987a6d8aaa6..7df8b717593 100644 --- a/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix +++ b/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec { +{ lib, stdenv, fetchFromGitHub, ... }: + +stdenv.mkDerivation rec { pname = "tt-rss-plugin-tumblr-gdpr"; version = "2.1"; diff --git a/pkgs/servers/tt-rss/theme-feedly/default.nix b/pkgs/servers/tt-rss/theme-feedly/default.nix index 41f47ca4a4e..f6882611a25 100644 --- a/pkgs/servers/tt-rss/theme-feedly/default.nix +++ b/pkgs/servers/tt-rss/theme-feedly/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { pname = "tt-rss-theme-feedly"; version = "2.5.0"; diff --git a/pkgs/servers/ttyd/default.nix b/pkgs/servers/ttyd/default.nix index d5e4d607f72..3ef571bc82a 100644 --- a/pkgs/servers/ttyd/default.nix +++ b/pkgs/servers/ttyd/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub -, pkgconfig, cmake, xxd +{ lib, stdenv, fetchFromGitHub +, pkg-config, cmake, xxd , openssl, libwebsockets, json_c, libuv, zlib }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "1ifgw93g8jaaa6fgfqjnn83n5ccr6l72ynwwwa97hfwjk90r14fg"; }; - nativeBuildInputs = [ pkgconfig cmake xxd ]; + nativeBuildInputs = [ pkg-config cmake xxd ]; buildInputs = [ openssl libwebsockets json_c libuv zlib ]; outputs = [ "out" "man" ]; @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { meta = { description = "Share your terminal over the web"; homepage = "https://github.com/tsl0922/ttyd"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.thoughtpolice ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix index 0276f5aca0a..98a40766d7e 100644 --- a/pkgs/servers/tvheadend/default.nix +++ b/pkgs/servers/tvheadend/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, pkgconfig +{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, pkg-config , avahi, dbus, gettext, git, gnutar, gzip, bzip2, ffmpeg_3, libiconv, openssl, python , v4l-utils, which, zlib }: @@ -33,7 +33,7 @@ in stdenv.mkDerivation { which zlib ]; - nativeBuildInputs = [ cmake makeWrapper pkgconfig ]; + nativeBuildInputs = [ cmake makeWrapper pkg-config ]; NIX_CFLAGS_COMPILE = [ "-Wno-error=format-truncation" "-Wno-error=stringop-truncation" ]; @@ -65,7 +65,7 @@ in stdenv.mkDerivation { postInstall = '' wrapProgram $out/bin/tvheadend \ - --prefix PATH : ${stdenv.lib.makeBinPath [ bzip2 ]} + --prefix PATH : ${lib.makeBinPath [ bzip2 ]} ''; meta = with lib; { diff --git a/pkgs/servers/udpt/default.nix b/pkgs/servers/udpt/default.nix index acf885ed012..b681727c08f 100644 --- a/pkgs/servers/udpt/default.nix +++ b/pkgs/servers/udpt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "udpt"; @@ -20,8 +20,8 @@ rustPlatform.buildRustPackage rec { meta = { description = "A lightweight UDP torrent tracker"; homepage = "https://naim94a.github.io/udpt"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ makefu ]; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ makefu ]; }; } diff --git a/pkgs/servers/uftp/default.nix b/pkgs/servers/uftp/default.nix index 02607155d48..2a80f5ca28d 100644 --- a/pkgs/servers/uftp/default.nix +++ b/pkgs/servers/uftp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl }: +{ lib, stdenv, fetchurl, openssl }: stdenv.mkDerivation rec { pname = "uftp"; @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { meta = { description = "Encrypted UDP based FTP with multicast"; homepage = "http://uftp-multicast.sourceforge.net/"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.fadenb ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.fadenb ]; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/servers/uhub/default.nix b/pkgs/servers/uhub/default.nix index 34e2b1bae7d..4569ee675d9 100644 --- a/pkgs/servers/uhub/default.nix +++ b/pkgs/servers/uhub/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ sqlite systemd ] ++ stdenv.lib.optional tlsSupport openssl; + buildInputs = [ sqlite systemd ] ++ lib.optional tlsSupport openssl; outputs = [ "out" "mod_example" diff --git a/pkgs/servers/ums/default.nix b/pkgs/servers/ums/default.nix index 3e58edba42f..61bb815892a 100644 --- a/pkgs/servers/ums/default.nix +++ b/pkgs/servers/ums/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper +{ lib, stdenv, fetchurl, makeWrapper , libzen, libmediainfo , jre8 }: @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { src = { i686-linux = fetchurl { - url = "mirror://sourceforge/project/unimediaserver/${version}/" + stdenv.lib.toUpper "${pname}-${version}" + "-x86.tgz"; + url = "mirror://sourceforge/project/unimediaserver/${version}/" + lib.toUpper "${pname}-${version}" + "-x86.tgz"; sha256 = "0i319g2c3z9j131nwh5m92clgnxxxs3izplzhjb30bx4lldmjs1j"; }; x86_64-linux = fetchurl { - url = "mirror://sourceforge/project/unimediaserver/${version}/" + stdenv.lib.toUpper "${pname}-${version}" + "-x86_64.tgz"; + url = "mirror://sourceforge/project/unimediaserver/${version}/" + lib.toUpper "${pname}-${version}" + "-x86_64.tgz"; sha256 = "07wc0is86fdfyz4as3f17q8pfzl8x55ci65zvpls0a9rfyyvjjw3"; }; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -29,14 +29,14 @@ stdenv.mkDerivation rec { rm -rf $out/jre makeWrapper "$out/UMS.sh" "$out/bin/ums" \ - --prefix LD_LIBRARY_PATH ":" "${stdenv.lib.makeLibraryPath [ libzen libmediainfo] }" \ + --prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath [ libzen libmediainfo] }" \ --set JAVA_HOME "${jre8}" ''; meta = { description = "Universal Media Server: a DLNA-compliant UPnP Media Server"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ thall snicket2100 ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ thall snicket2100 ]; }; } diff --git a/pkgs/servers/unfs3/default.nix b/pkgs/servers/unfs3/default.nix index c2a0fbbd1c2..257bb21b42b 100644 --- a/pkgs/servers/unfs3/default.nix +++ b/pkgs/servers/unfs3/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, flex, bison }: +{ fetchurl, lib, stdenv, flex, bison }: stdenv.mkDerivation rec { name = "unfs3-0.9.22"; @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { homepage = "http://unfs3.sourceforge.net/"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.bsd3; + platforms = lib.platforms.unix; maintainers = [ ]; }; } diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index c8b610c4d17..0bc3c3413bb 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -52,7 +52,7 @@ in rec { }; unifi6 = generic { - version = "6.0.43"; - sha256 = "1d9pw4f20pr4jb1xb43p7ycafv13ld1h40r05qg82029ml1s7jky"; + version = "6.0.45"; + sha256 = "1mph22x2p26q76gh6s714xwsvc03cciy4gx00jv4vhcm28p6nlxy"; }; } diff --git a/pkgs/servers/unpfs/default.nix b/pkgs/servers/unpfs/default.nix index 818e92f0596..07342c3edbe 100644 --- a/pkgs/servers/unpfs/default.nix +++ b/pkgs/servers/unpfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "unpfs"; diff --git a/pkgs/servers/urserver/default.nix b/pkgs/servers/urserver/default.nix index 2d2e83fe01b..eee10d05826 100644 --- a/pkgs/servers/urserver/default.nix +++ b/pkgs/servers/urserver/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { installPhase = '' install -m755 -D urserver $out/bin/urserver - wrapProgram $out/bin/urserver --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath buildInputs}" + wrapProgram $out/bin/urserver --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath buildInputs}" cp -r remotes $out/bin/remotes cp -r manager $out/bin/manager ''; diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index 14876e47df3..bd74a628877 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, nixosTests, lib, fetchurl, pkgconfig, jansson, pcre +{ stdenv, nixosTests, lib, fetchurl, pkg-config, jansson, pcre # plugins: list of strings, eg. [ "python2" "python3" ] , plugins ? [] , pam, withPAM ? stdenv.isLinux @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { ./additional-php-ldflags.patch ]; - nativeBuildInputs = [ python3 pkgconfig ]; + nativeBuildInputs = [ python3 pkg-config ]; buildInputs = [ jansson pcre ] ++ lib.optional withPAM pam diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 0326c8988f4..1fbb36257d2 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkgconfig, readline, libedit +{ lib, stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkg-config, readline, libedit , python3, makeWrapper }: let @@ -14,7 +14,7 @@ let passthru.python = python3; - nativeBuildInputs = with python3.pkgs; [ pkgconfig docutils sphinx ]; + nativeBuildInputs = with python3.pkgs; [ pkg-config docutils sphinx ]; buildInputs = [ pcre libxslt groff ncurses readline libedit makeWrapper python3 ]; @@ -22,11 +22,11 @@ let buildFlags = [ "localstatedir=/var/spool" ]; postInstall = '' - wrapProgram "$out/sbin/varnishd" --prefix PATH : "${stdenv.lib.makeBinPath [ stdenv.cc ]}" + wrapProgram "$out/sbin/varnishd" --prefix PATH : "${lib.makeBinPath [ stdenv.cc ]}" ''; # https://github.com/varnishcache/varnish-cache/issues/1875 - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isi686 "-fexcess-precision=standard"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isi686 "-fexcess-precision=standard"; outputs = [ "out" "dev" "man" ]; @@ -41,15 +41,15 @@ let in { varnish60 = common { - version = "6.0.5"; - sha256 = "11aw202s7zdp5qp66hii5nhgm2jk0d86pila7gqrnjgc7x8fs8a0"; + version = "6.0.7"; + sha256 = "0njs6xpc30nc4chjdm4d4g63bigbxhi4dc46f4az3qcz51r8zl2a"; }; varnish62 = common { - version = "6.2.2"; - sha256 = "10s3qdvb95pkwp3wxndrigb892h0109yqr8dw4smrhfi0knhnfk5"; + version = "6.2.3"; + sha256 = "02b6pqh5j1d4n362n42q42bfjzjrngd6x49b13q7wzsy6igd1jsy"; }; varnish63 = common { - version = "6.3.1"; - sha256 = "0xa14pd68zpi5hxcax3arl14rcmh5d1cdwa8gv4l5f23mmynr8ni"; + version = "6.3.2"; + sha256 = "1f5ahzdh3am6fij5jhiybv3knwl11rhc5r3ig1ybzw55ai7788q8"; }; } diff --git a/pkgs/servers/varnish/digest.nix b/pkgs/servers/varnish/digest.nix index b6ec11e4e8d..55d13ffae31 100644 --- a/pkgs/servers/varnish/digest.nix +++ b/pkgs/servers/varnish/digest.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, libmhash, docutils }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, varnish, libmhash, docutils }: stdenv.mkDerivation rec { version = "1.0.2"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0jwkqqalydn0pwfdhirl5zjhbc3hldvhh09hxrahibr72fgmgpbx"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig docutils ]; + nativeBuildInputs = [ autoreconfHook pkg-config docutils ]; buildInputs = [ varnish libmhash ]; postPatch = '' diff --git a/pkgs/servers/varnish/dynamic.nix b/pkgs/servers/varnish/dynamic.nix index a9900424b96..20f8aa91ab6 100644 --- a/pkgs/servers/varnish/dynamic.nix +++ b/pkgs/servers/varnish/dynamic.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, docutils }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, varnish, docutils }: stdenv.mkDerivation rec { version = "0.4"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1n94slrm6vn3hpymfkla03gw9603jajclg84bjhwb8kxsk3rxpmk"; }; - nativeBuildInputs = [ pkgconfig docutils autoreconfHook varnish.python ]; + nativeBuildInputs = [ pkg-config docutils autoreconfHook varnish.python ]; buildInputs = [ varnish ]; postPatch = '' substituteInPlace Makefile.am --replace "''${LIBVARNISHAPI_DATAROOTDIR}/aclocal" "${varnish.dev}/share/aclocal" diff --git a/pkgs/servers/varnish/modules.nix b/pkgs/servers/varnish/modules.nix index f39afd9c87c..0a8e97df61e 100644 --- a/pkgs/servers/varnish/modules.nix +++ b/pkgs/servers/varnish/modules.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, docutils, removeReferencesTo }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, varnish, docutils, removeReferencesTo }: stdenv.mkDerivation rec { version = "0.15.0"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook docutils - pkgconfig + pkg-config removeReferencesTo varnish.python # use same python version as varnish server ]; diff --git a/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix b/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix index 349ad59c60a..c8186e1d02c 100644 --- a/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix +++ b/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix @@ -741,4 +741,4 @@ in bypassCache = true; reconstructLock = true; }; -} \ No newline at end of file +} diff --git a/pkgs/servers/web-apps/cryptpad/node-packages.nix b/pkgs/servers/web-apps/cryptpad/node-packages.nix index 208bb3c72c7..e1a2c0edbee 100644 --- a/pkgs/servers/web-apps/cryptpad/node-packages.nix +++ b/pkgs/servers/web-apps/cryptpad/node-packages.nix @@ -6,7 +6,7 @@ let nodeEnv = import ../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile; + inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile; inherit nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; @@ -14,4 +14,4 @@ in import ./node-packages-generated.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} \ No newline at end of file +} diff --git a/pkgs/servers/web-apps/fileshelter/default.nix b/pkgs/servers/web-apps/fileshelter/default.nix index 76b468d35d7..b6abc423eb8 100644 --- a/pkgs/servers/web-apps/fileshelter/default.nix +++ b/pkgs/servers/web-apps/fileshelter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, libzip, boost, wt4, libconfig, pkgconfig } : +{ lib, stdenv, fetchFromGitHub, autoreconfHook, libzip, boost, wt4, libconfig, pkg-config } : stdenv.mkDerivation rec { pname = "fileshelter"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libzip boost wt4 libconfig ]; NIX_LDFLAGS = "-lpthread"; diff --git a/pkgs/servers/web-apps/frab/gemset.nix b/pkgs/servers/web-apps/frab/gemset.nix index c3259a2709c..cf39de25ea6 100644 --- a/pkgs/servers/web-apps/frab/gemset.nix +++ b/pkgs/servers/web-apps/frab/gemset.nix @@ -995,4 +995,4 @@ }; version = "0.9.5"; }; -} \ No newline at end of file +} diff --git a/pkgs/servers/web-apps/galene/default.nix b/pkgs/servers/web-apps/galene/default.nix new file mode 100644 index 00000000000..1c2e16f76fc --- /dev/null +++ b/pkgs/servers/web-apps/galene/default.nix @@ -0,0 +1,30 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "galene"; + version = "0.2"; + + src = fetchFromGitHub { + owner = "jech"; + repo = "galene"; + rev = "galene-${version}"; + sha256 = "0hpgqqv8mp1d3sk7dk49m3yv0cv4afa0v3vdd4w8mdnx6pcqdgy1"; + }; + + vendorSha256 = "12b7andpzsgzmd56gg4gc5ilkxvjrpwpmwbdmygfzgkd5jncmcgp"; + + outputs = [ "out" "static" ]; + + postInstall = '' + mkdir $static + cp -r ./static $static + ''; + + meta = with lib; { + description = "Videoconferencing server that is easy to deploy, written in Go"; + homepage = "https://github.com/jech/galene"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ rgrunbla ]; + }; +} diff --git a/pkgs/servers/web-apps/hedgedoc/default.nix b/pkgs/servers/web-apps/hedgedoc/default.nix index 76c0d0ce72c..1908381be00 100644 --- a/pkgs/servers/web-apps/hedgedoc/default.nix +++ b/pkgs/servers/web-apps/hedgedoc/default.nix @@ -3,13 +3,13 @@ mkYarnPackage rec { name = "hedgedoc"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "hedgedoc"; repo = "hedgedoc"; rev = version; - sha256 = "0axad5581v25pynfj6pgy0h1xp92dyllnc7mk42z6hxbs4sgkrw1"; + sha256 = "1w3si1k27c8d9yka2v91883dlz57n0wasan4agi6gw17h9dzb1l6"; }; nativeBuildInputs = [ which makeWrapper ]; diff --git a/pkgs/servers/web-apps/hedgedoc/package.json b/pkgs/servers/web-apps/hedgedoc/package.json index 3e8046bbecd..6b0f0da33f8 100644 --- a/pkgs/servers/web-apps/hedgedoc/package.json +++ b/pkgs/servers/web-apps/hedgedoc/package.json @@ -1,6 +1,6 @@ { "name": "HedgeDoc", - "version": "1.7.1", + "version": "1.7.2", "description": "The best platform to write and share markdown.", "main": "app.js", "license": "AGPL-3.0", diff --git a/pkgs/servers/web-apps/hedgedoc/yarn.lock b/pkgs/servers/web-apps/hedgedoc/yarn.lock index f228af65b5b..80246f63ad8 100644 --- a/pkgs/servers/web-apps/hedgedoc/yarn.lock +++ b/pkgs/servers/web-apps/hedgedoc/yarn.lock @@ -8,12 +8,12 @@ integrity sha512-l7z0DPCi2Hp88w12JhDTtx5d0Y3+vhfE7JKJb9O7sEz71Cwp053N8piTtTnnk/tUor9oZHgEKi/p3tQQmLPjvA== "@azure/ms-rest-js@^1.8.7": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@azure/ms-rest-js/-/ms-rest-js-1.9.0.tgz#5eb6516cf20e972a2eb4c589d6b48c3151bc801b" - integrity sha512-cB4Z2Mg7eBmet1rfbf0QSO1XbhfknRW7B+mX3IHJq0KGHaGJvCPoVTgdsJdCkazEMK1jtANFNEDDzSQacxyzbA== + version "1.9.1" + resolved "https://registry.yarnpkg.com/@azure/ms-rest-js/-/ms-rest-js-1.9.1.tgz#93aef111b00bfdcc470a6bcb4520a13b36f21788" + integrity sha512-F1crHKhmsvFLM9fsnDyCGFd2E2KR9GEZm5oBVV5D5k2EBQ7u7idtSJlSF6RDLDIrGWtc4NnFdYwsoiW8NLlBQg== dependencies: "@types/tunnel" "0.0.0" - axios "^0.19.0" + axios "^0.21.1" form-data "^2.3.2" tough-cookie "^2.4.3" tslib "^1.9.2" @@ -65,33 +65,34 @@ enabled "2.0.x" kuler "^2.0.0" -"@nodelib/fs.scandir@2.1.3": - version "2.1.3" - resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz#3a582bdb53804c6ba6d146579c46e52130cf4a3b" - integrity sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw== +"@nodelib/fs.scandir@2.1.4": + version "2.1.4" + resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz#d4b3549a5db5de2683e0c1071ab4f140904bbf69" + integrity sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA== dependencies: - "@nodelib/fs.stat" "2.0.3" + "@nodelib/fs.stat" "2.0.4" run-parallel "^1.1.9" -"@nodelib/fs.stat@2.0.3", "@nodelib/fs.stat@^2.0.2": - version "2.0.3" - resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz#34dc5f4cabbc720f4e60f75a747e7ecd6c175bd3" - integrity sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA== +"@nodelib/fs.stat@2.0.4", "@nodelib/fs.stat@^2.0.2": + version "2.0.4" + resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz#a3f2dd61bab43b8db8fa108a121cfffe4c676655" + integrity sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q== "@nodelib/fs.walk@^1.2.3": - version "1.2.4" - resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz#011b9202a70a6366e436ca5c065844528ab04976" - integrity sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ== + version "1.2.6" + resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz#cce9396b30aa5afe9e3756608f5831adcb53d063" + integrity sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow== dependencies: - "@nodelib/fs.scandir" "2.1.3" + "@nodelib/fs.scandir" "2.1.4" fastq "^1.6.0" "@npmcli/move-file@^1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.0.1.tgz#de103070dac0f48ce49cf6693c23af59c0f70464" - integrity sha512-Uv6h1sT+0DrblvIrolFtbvM1FgWm+/sy4B3pvLp67Zys+thcukzS5ekn7HsZFGpWP4Q3fYJCljbWQE/XivMRLw== + version "1.1.0" + resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.0.tgz#4ef8a53d727b9e43facf35404caf55ebf92cfec8" + integrity sha512-Iv2iq0JuyYjKeFkSR4LPaCdDZwlGK9X2cP/01nJcp3yMJ1FjNd9vpiEYvLUgzBxKPg2SFmaOhizoQsPc0LWeOQ== dependencies: mkdirp "^1.0.4" + rimraf "^2.7.1" "@passport-next/passport-openid@^1.0.0": version "1.0.0" @@ -106,7 +107,7 @@ resolved "https://registry.yarnpkg.com/@passport-next/passport-strategy/-/passport-strategy-1.1.0.tgz#4c0df069e2ec9262791b9ef1e23320c1d73bdb74" integrity sha512-2KhFjtPueJG6xVj2HnqXt9BlANOfYCVLyu+pXYjPGBDT8yk+vQwc/6tsceIj+mayKcoxMau2JimggXRPHgoc8w== -"@tokenizer/token@^0.1.0", "@tokenizer/token@^0.1.1": +"@tokenizer/token@^0.1.1": version "0.1.1" resolved "https://registry.yarnpkg.com/@tokenizer/token/-/token-0.1.1.tgz#f0d92c12f87079ddfd1b29f614758b9696bc29e3" integrity sha512-XO6INPbZCxdprl+9qa/AAbFFOMzzwqYxpjPgLICrMD6C2FCw6qfJOPcBk6JqqPLSaZ/Qx87qn4rpPmPMwaAK6w== @@ -125,9 +126,9 @@ "@types/node" "*" "@types/connect@*": - version "3.4.33" - resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.33.tgz#31610c901eca573b8713c3330abc6e6b9f588546" - integrity sha512-2+FrkXY4zllzTNfJth7jOqEHC+enpLeGslEhpnTAkg21GkRrWV4SsAtqchtT4YS9/nODBU2/ZfsBY2X4J/dX7A== + version "3.4.34" + resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.34.tgz#170a40223a6d666006d93ca128af2beb1d9b1901" + integrity sha512-ePPA/JuI+X0vb+gSWlPKOY0NdNAie/rPUqX2GUPpbZwiKTkSPhjXWuee47E4MtE54QVzGCQMQkAL6JhV2E1+cQ== dependencies: "@types/node" "*" @@ -136,22 +137,22 @@ resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.5.tgz#b14efa8852b7768d898906613c23f688713e02cd" integrity sha512-Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ== -"@types/express-serve-static-core@*": - version "4.17.13" - resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.13.tgz#d9af025e925fc8b089be37423b8d1eac781be084" - integrity sha512-RgDi5a4nuzam073lRGKTUIaL3eF2+H7LJvJ8eUnCI0wA6SNjXc44DCmWNiTLs/AZ7QlsFWZiw/gTG3nSQGL0fA== +"@types/express-serve-static-core@^4.17.18": + version "4.17.18" + resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.18.tgz#8371e260f40e0e1ca0c116a9afcd9426fa094c40" + integrity sha512-m4JTwx5RUBNZvky/JJ8swEJPKFd8si08pPF2PfizYjGZOKr/svUWPcoUmLow6MmPzhasphB7gSTINY67xn3JNA== dependencies: "@types/node" "*" "@types/qs" "*" "@types/range-parser" "*" "@types/express@*": - version "4.17.9" - resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.9.tgz#f5f2df6add703ff28428add52bdec8a1091b0a78" - integrity sha512-SDzEIZInC4sivGIFY4Sz1GG6J9UObPwCInYJjko2jzOf/Imx/dlpume6Xxwj1ORL82tBbmN4cPDIDkLbWHk9hw== + version "4.17.11" + resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.11.tgz#debe3caa6f8e5fcda96b47bd54e2f40c4ee59545" + integrity sha512-no+R6rW60JEc59977wIxreQVsIEOAYwgCqldrA/vkpCnbD7MqTefO97lmoBe4WE0F156bC4uLSP1XHDOySnChg== dependencies: "@types/body-parser" "*" - "@types/express-serve-static-core" "*" + "@types/express-serve-static-core" "^4.17.18" "@types/qs" "*" "@types/serve-static" "*" @@ -187,20 +188,15 @@ resolved "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.3.tgz#c893b73721db73699943bfc3653b1deb7faa4a3a" integrity sha512-Jus9s4CDbqwocc5pOAnh8ShfrnMcPHuJYzVcSUU7lrh8Ni5HuIqX3oilL86p3dlTrk0LzHRCgA/GQ7uNCw6l2Q== -"@types/node@*": - version "14.14.7" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.7.tgz#8ea1e8f8eae2430cf440564b98c6dfce1ec5945d" - integrity sha512-Zw1vhUSQZYw+7u5dAwNbIA9TuTotpzY/OF7sJM9FqPOF3SPjKnxrjoTktXDZgUjybf4cWVBP7O8wvKdSaGHweg== +"@types/node@*", "@types/node@^14.14.7": + version "14.14.21" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.21.tgz#d934aacc22424fe9622ebf6857370c052eae464e" + integrity sha512-cHYfKsnwllYhjOzuC5q1VpguABBeecUp24yFluHpn/BQaVxB1CuQ1FSRZCzrPxrkIfWISXV2LbeoBthLWg0+0A== "@types/node@^12.12.17": - version "12.19.4" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.4.tgz#cdfbb62e26c7435ed9aab9c941393cc3598e9b46" - integrity sha512-o3oj1bETk8kBwzz1WlO6JWL/AfAA3Vm6J1B3C9CsdxHYp7XgPiH7OEXPUbZTndHlRaIElrANkQfe6ZmfJb3H2w== - -"@types/node@^14.14.7": - version "14.14.14" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.14.tgz#f7fd5f3cc8521301119f63910f0fb965c7d761ae" - integrity sha512-UHnOPWVWV1z+VV8k6L1HhG7UbGBgIdghqF3l9Ny9ApPghbjICXkUJSd/b9gOgQfjM1r+37cipdw/HJ3F6ICEnQ== + version "12.19.14" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.14.tgz#59e5029a3c2aea34f68b717955381692fd47cafb" + integrity sha512-2U9uLN46+7dv9PiS8VQJcHhuoOjiDPZOLAt0WuA1EanEknIMae+2QbMhayF7cgGqjvRVIfNpt+6jLPczJZFiRw== "@types/node@^8.0.47": version "8.10.66" @@ -208,9 +204,9 @@ integrity sha512-tktOkFUA4kXx2hhhrB8bIFb5TbwzS4uOhKEmwiD+NoiL0qtP2OQ9mFldbgD4dV1djrlBYP6eBuQZiWjuHUpqFw== "@types/passport@^1.0.0": - version "1.0.4" - resolved "https://registry.yarnpkg.com/@types/passport/-/passport-1.0.4.tgz#1b35c4e197560d3974fa5f71711b6e9cce0711f0" - integrity sha512-h5OfAbfBBYSzjeU0GTuuqYEk9McTgWeGQql9g3gUw2/NNCfD7VgExVRYJVVeU13Twn202Mvk9BT0bUrl30sEgA== + version "1.0.5" + resolved "https://registry.yarnpkg.com/@types/passport/-/passport-1.0.5.tgz#1ff54ec3e30fa6480c5e8b8de949c6dc40ddfa2a" + integrity sha512-wNL4kT/5rnZgyGkqX7V2qH/R/te+bklv+nXcvHzyX99vNggx9DGN+F8CEOW3P/gRi7Cjm991uidRgTHsYkSuMg== dependencies: "@types/express" "*" @@ -238,9 +234,9 @@ safe-buffer "*" "@types/serve-static@*": - version "1.13.7" - resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.7.tgz#e51b51a0becda910f9fd04c718044da69d6c492e" - integrity sha512-3diZWucbR+xTmbDlU+FRRxBf+31OhFew7cJXML/zh9NmvSPTNoFecAwHB66BUqFgENJtqMiyl7JAwUE/siqdLw== + version "1.13.8" + resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.8.tgz#851129d434433c7082148574ffec263d58309c46" + integrity sha512-MoJhSQreaVoL+/hurAZzIm8wafFR6ajiTM1m4A0kv6AGeVBl4r4pOV8bGFrjjq1sGxDTnCoF8i22o0/aE5XCyA== dependencies: "@types/mime" "*" "@types/node" "*" @@ -275,18 +271,18 @@ integrity sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ== "@types/webpack-sources@*": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-2.0.0.tgz#08216ab9be2be2e1499beaebc4d469cec81e82a7" - integrity sha512-a5kPx98CNFRKQ+wqawroFunvFqv7GHm/3KOI52NY9xWADgc8smu4R6prt4EU/M4QfVjvgBkMqU4fBhw3QfMVkg== + version "2.1.0" + resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-2.1.0.tgz#8882b0bd62d1e0ce62f183d0d01b72e6e82e8c10" + integrity sha512-LXn/oYIpBeucgP1EIJbKQ2/4ZmpvRl+dlrFdX7+94SKRUV3Evy3FsfMZY318vGhkWUS5MPhtOM3w1/hCOAOXcg== dependencies: "@types/node" "*" "@types/source-list-map" "*" source-map "^0.7.3" "@types/webpack@^4.41.8": - version "4.41.25" - resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.25.tgz#4d3b5aecc4e44117b376280fbfd2dc36697968c4" - integrity sha512-cr6kZ+4m9lp86ytQc1jPOJXgINQyz3kLLunZ57jznW+WIAL0JqZbGubQk4GlD42MuQL5JGOABrxdpqqWeovlVQ== + version "4.41.26" + resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.26.tgz#27a30d7d531e16489f9c7607c747be6bc1a459ef" + integrity sha512-7ZyTfxjCRwexh+EJFwRUM+CDB2XvgHl4vfuqf1ZKrgGvcS5BrNvPQqJh3tsZ0P6h6Aa1qClVHaJZszLPzpqHeA== dependencies: "@types/anymatch" "*" "@types/node" "*" @@ -658,9 +654,9 @@ archiver-utils@^2.1.0: readable-stream "^2.0.0" archiver@^5.0.2: - version "5.1.0" - resolved "https://registry.yarnpkg.com/archiver/-/archiver-5.1.0.tgz#05b0f6f7836f3e6356a0532763d2bb91017a7e37" - integrity sha512-iKuQUP1nuKzBC2PFlGet5twENzCfyODmvkxwDV0cEFXavwcLrIW5ssTuHi9dyTPvpWr6Faweo2eQaQiLIwyXTA== + version "5.2.0" + resolved "https://registry.yarnpkg.com/archiver/-/archiver-5.2.0.tgz#25aa1b3d9febf7aec5b0f296e77e69960c26db94" + integrity sha512-QEAKlgQuAtUxKeZB9w5/ggKXh21bZS+dzzuQ0RPBC20qtDCbTyzqmisoeJP46MP39fg4B4IcyvR+yeyEBdblsQ== dependencies: archiver-utils "^2.1.0" async "^3.2.0" @@ -718,12 +714,14 @@ array-flatten@1.1.1: integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= array-includes@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz#cdd67e6852bdf9c1215460786732255ed2459348" - integrity sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ== + version "3.1.2" + resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.2.tgz#a8db03e0b88c8c6aeddc49cb132f9bcab4ebf9c8" + integrity sha512-w2GspexNQpx+PutG3QpT437/BenZBj0M/MZGn5mzv/MofYqo0xmRHzn4lFsoDlWJ+THYsGJmFlW68WlDFx7VRw== dependencies: + call-bind "^1.0.0" define-properties "^1.1.3" - es-abstract "^1.17.0" + es-abstract "^1.18.0-next.1" + get-intrinsic "^1.0.1" is-string "^1.0.5" array-union@^2.1.0: @@ -742,12 +740,13 @@ array-unique@^0.3.2: integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= array.prototype.flat@^1.2.3: - version "1.2.3" - resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz#0de82b426b0318dbfdb940089e38b043d37f6c7b" - integrity sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ== + version "1.2.4" + resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz#6ef638b43312bd401b4c6199fdec7e2dc9e9a123" + integrity sha512-4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg== dependencies: + call-bind "^1.0.0" define-properties "^1.1.3" - es-abstract "^1.17.0-next.1" + es-abstract "^1.18.0-next.1" arraybuffer.slice@~0.0.7: version "0.0.7" @@ -847,9 +846,9 @@ atob@^2.1.2: integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== aws-sdk@^2.521.0: - version "2.817.0" - resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.817.0.tgz#3a97b690b0ec494cf8ee927affb3973cf26abcc8" - integrity sha512-DZIdWpkcqbqsCz0MEskHsyFaqc6Tk9XIFqXAg1AKHbOgC8nU45bz+Y2osX77pU01JkS/G7OhGtGmlKDrOPvFwg== + version "2.828.0" + resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.828.0.tgz#6aa599c3582f219568f41fb287eb65753e4a9234" + integrity sha512-JoDujGdncSIF9ka+XFZjop/7G+fNGucwPwYj7OHYMmFIOV5p7YmqomdbVmH/vIzd988YZz8oLOinWc4jM6vvhg== dependencies: buffer "4.9.2" events "1.1.1" @@ -871,12 +870,12 @@ aws4@^1.8.0: resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59" integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA== -axios@^0.19.0: - version "0.19.2" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.19.2.tgz#3ea36c5d8818d0d5f8a8a97a6d36b86cdc00cb27" - integrity sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA== +axios@^0.21.1: + version "0.21.1" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz#22563481962f4d6bde9a76d516ef0e5d3c09b2b8" + integrity sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA== dependencies: - follow-redirects "1.5.10" + follow-redirects "^1.10.0" azure-storage@^2.7.0: version "2.10.3" @@ -1480,11 +1479,6 @@ base64-arraybuffer@0.1.4: resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz#9818c79e059b1355f97e0428a017c838e90ba812" integrity sha1-mBjHngWbE1X5fgQooBfIOOkLqBI= -base64-arraybuffer@0.1.5: - version "0.1.5" - resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz#73926771923b5a19747ad666aa5cd4bf9c6e9ce8" - integrity sha1-c5JncZI7Whl0etZmqlzUv5xunOg= - base64-js@^1.0.2, base64-js@^1.3.1: version "1.5.1" resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" @@ -1532,13 +1526,6 @@ bcryptjs@^2.4.0: resolved "https://registry.yarnpkg.com/bcryptjs/-/bcryptjs-2.4.3.tgz#9ab5627b93e60621ff7cdac5da9733027df1d0cb" integrity sha1-mrVie5PmBiH/fNrF2pczAn3x0Ms= -better-assert@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/better-assert/-/better-assert-1.0.2.tgz#40866b9e1b9e0b55b481894311e68faffaebc522" - integrity sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI= - dependencies: - callsite "1.0.0" - big.js@^5.2.2: version "5.2.2" resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" @@ -1550,9 +1537,9 @@ binary-extensions@^1.0.0: integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw== binary-extensions@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.1.0.tgz#30fa40c9e7fe07dbc895678cd287024dea241dd9" - integrity sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ== + version "2.2.0" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" + integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== bindings@^1.5.0: version "1.5.0" @@ -1772,15 +1759,15 @@ browserslist@^3.2.6: electron-to-chromium "^1.3.47" browserslist@^4.0.0: - version "4.14.7" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.7.tgz#c071c1b3622c1c2e790799a37bb09473a4351cb6" - integrity sha512-BSVRLCeG3Xt/j/1cCGj1019Wbty0H+Yvu2AOuZSuoaUWn3RatbL33Cxk+Q4jRMRAbOm0p7SLravLjpnT6s0vzQ== + version "4.16.1" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.1.tgz#bf757a2da376b3447b800a16f0f1c96358138766" + integrity sha512-UXhDrwqsNcpTYJBTZsbGATDxZbiVDsx6UjpmRUmtnP10pr8wAYr5LgFoEFw9ixriQH2mv/NX2SfGzE/o8GndLA== dependencies: - caniuse-lite "^1.0.30001157" + caniuse-lite "^1.0.30001173" colorette "^1.2.1" - electron-to-chromium "^1.3.591" + electron-to-chromium "^1.3.634" escalade "^3.1.1" - node-releases "^1.1.66" + node-releases "^1.1.69" buffer-crc32@^0.2.1, buffer-crc32@^0.2.13: version "0.2.13" @@ -1825,9 +1812,9 @@ buffer@^5.5.0: ieee754 "^1.1.13" bufferutil@^4.0.0: - version "4.0.2" - resolved "https://registry.yarnpkg.com/bufferutil/-/bufferutil-4.0.2.tgz#79f68631910f6b993d870fc77dc0a2894eb96cd5" - integrity sha512-AtnG3W6M8B2n4xDQ5R+70EXvOpnXsFYg/AK2yTZd+HQ/oxAdz+GI+DvjmhBw3L0ole+LJ0ngqY4JMbDzkfNzhA== + version "4.0.3" + resolved "https://registry.yarnpkg.com/bufferutil/-/bufferutil-4.0.3.tgz#66724b756bed23cd7c28c4d306d7994f9943cc6b" + integrity sha512-yEYTwGndELGvfXsImMBLop58eaGW+YdONi1fNjTINSY98tmMmFijBG6WXgdkfuLNt4imzQNtIE+eBp1PVpMCSw== dependencies: node-gyp-build "^4.2.0" @@ -1837,9 +1824,9 @@ builtin-status-codes@^3.0.0: integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug= bunyan@^1.8.3: - version "1.8.14" - resolved "https://registry.yarnpkg.com/bunyan/-/bunyan-1.8.14.tgz#3d8c1afea7de158a5238c7cb8a66ab6b38dd45b4" - integrity sha512-LlahJUxXzZLuw/hetUQJmRgZ1LF6+cr5TPpRj6jf327AsiIq2jhYEH4oqUUkVKTor+9w2BT3oxVwhzE5lw9tcg== + version "1.8.15" + resolved "https://registry.yarnpkg.com/bunyan/-/bunyan-1.8.15.tgz#8ce34ca908a17d0776576ca1b2f6cbd916e93b46" + integrity sha512-0tECWShh6wUysgucJcBAoYegf3JJoZWibxdqhTm7OHPeT42qdjkZ29QCMcKwbgU1kiH+auSIasNRXMLWXafXig== optionalDependencies: dtrace-provider "~0.8" moment "^2.19.3" @@ -1916,12 +1903,12 @@ cache-base@^1.0.1: unset-value "^1.0.0" call-bind@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.0.tgz#24127054bb3f9bdcb4b1fb82418186072f77b8ce" - integrity sha512-AEXsYIyyDY3MCzbwdhzG3Jx1R0J2wetQyUynn6dYHAO+bg8l1k7jwZtRv4ryryFs7EP+NDlikJlVe59jr0cM2w== + version "1.0.2" + resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" + integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA== dependencies: function-bind "^1.1.1" - get-intrinsic "^1.0.0" + get-intrinsic "^1.0.2" caller-callsite@^2.0.0: version "2.0.0" @@ -1937,11 +1924,6 @@ caller-path@^2.0.0: dependencies: caller-callsite "^2.0.0" -callsite@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz#280398e5d664bd74038b6f0905153e6e8af1bc20" - integrity sha1-KAOY5dZkvXQDi28JBRU+borxvCA= - callsites@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50" @@ -1961,12 +1943,12 @@ camel-case@^3.0.0: upper-case "^1.1.1" camel-case@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.1.tgz#1fc41c854f00e2f7d0139dfeba1542d6896fe547" - integrity sha512-7fa2WcG4fYFkclIvEmxBbTvmibwF2/agfEBc6q3lOpVu0A13ltLsA+Hr/8Hp6kp5f+G7hKi6t8lys6XxP+1K6Q== + version "4.1.2" + resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.2.tgz#9728072a954f805228225a6deea6b38461e1bd5a" + integrity sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw== dependencies: - pascal-case "^3.1.1" - tslib "^1.10.0" + pascal-case "^3.1.2" + tslib "^2.0.3" camelcase@^5.0.0, camelcase@^5.3.1: version "5.3.1" @@ -1988,10 +1970,10 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30001157: - version "1.0.30001157" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001157.tgz#2d11aaeb239b340bc1aa730eca18a37fdb07a9ab" - integrity sha512-gOerH9Wz2IRZ2ZPdMfBvyOi3cjaz4O4dgNwPGzx8EhqAs4+2IL/O+fJsbt+znSigujoZG8bVcIAUM/I/E5K3MA== +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30001173: + version "1.0.30001177" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001177.tgz#2c3b384933aafda03e29ccca7bb3d8c3389e1ece" + integrity sha512-6Ld7t3ifCL02jTj3MxPMM5wAYjbo4h/TAQGFTgv1inihP1tWnWp8mxxT4ut4JBEHLbpFXEXJJQ119JCJTBkYDw== caseless@~0.12.0: version "0.12.0" @@ -2128,9 +2110,9 @@ chokidar@^2.1.8: fsevents "^1.2.7" chokidar@^3.0.0, chokidar@^3.4.1: - version "3.4.3" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.3.tgz#c1df38231448e45ca4ac588e6c79573ba6a57d5b" - integrity sha512-DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ== + version "3.5.0" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.0.tgz#458a4816a415e9d3b3caa4faec2b96a6935a9e65" + integrity sha512-JgQM9JS92ZbFR4P90EvmzNpSGhpPBGBSj10PILeDyYFwp4h2/D9OM03wsJ4zW1fEp4ka2DGrnUeD7FuvQ2aZ2Q== dependencies: anymatch "~3.1.1" braces "~3.0.2" @@ -2140,7 +2122,7 @@ chokidar@^3.0.0, chokidar@^3.4.1: normalize-path "~3.0.0" readdirp "~3.5.0" optionalDependencies: - fsevents "~2.1.2" + fsevents "~2.3.1" chownr@^1.1.1: version "1.1.4" @@ -2526,17 +2508,12 @@ cookie-signature@1.0.6: resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw= -cookie@0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb" - integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s= - cookie@0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba" integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg== -cookie@^0.4.0: +cookie@^0.4.0, cookie@~0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1" integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA== @@ -2588,9 +2565,9 @@ copy-webpack-plugin@6.4.1: webpack-sources "^1.4.3" core-js@^2.4.0, core-js@^2.5.0: - version "2.6.11" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c" - integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg== + version "2.6.12" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec" + integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ== core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" @@ -2724,17 +2701,7 @@ css-select-base-adapter@^0.1.1: resolved "https://registry.yarnpkg.com/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz#3b2ff4972cc362ab88561507a95408a1432135d7" integrity sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w== -css-select@^1.1.0, css-select@~1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858" - integrity sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg= - dependencies: - boolbase "~1.0.0" - css-what "2.1" - domutils "1.5.1" - nth-check "~1.0.1" - -css-select@^2.0.0: +css-select@^2.0.0, css-select@^2.0.2: version "2.1.0" resolved "https://registry.yarnpkg.com/css-select/-/css-select-2.1.0.tgz#6a34653356635934a81baca68d0255432105dbef" integrity sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ== @@ -2744,6 +2711,16 @@ css-select@^2.0.0: domutils "^1.7.0" nth-check "^1.0.2" +css-select@~1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858" + integrity sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg= + dependencies: + boolbase "~1.0.0" + css-what "2.1" + domutils "1.5.1" + nth-check "~1.0.1" + css-tree@1.0.0-alpha.37: version "1.0.0-alpha.37" resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.37.tgz#98bebd62c4c1d9f960ec340cf9f7522e30709a22" @@ -2752,12 +2729,12 @@ css-tree@1.0.0-alpha.37: mdn-data "2.0.4" source-map "^0.6.1" -css-tree@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.1.tgz#7726678dfe2a57993a018d9dce519bf1760e3b6d" - integrity sha512-WroX+2MvsYcRGP8QA0p+rxzOniT/zpAoQ/DTKDSJzh5T3IQKUkFHeIIfgIapm2uaP178GWY3Mime1qbk8GO/tA== +css-tree@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.2.tgz#9ae393b5dafd7dae8a622475caec78d3d8fbd7b5" + integrity sha512-wCoWush5Aeo48GLhfHPbmvZs59Z+M7k5+B1xDnXbdWNcEF423DoFdqSWE0PM5aNk5nI5cp1q7ms36zGApY/sKQ== dependencies: - mdn-data "2.0.12" + mdn-data "2.0.14" source-map "^0.6.1" css-what@2.1: @@ -2849,11 +2826,11 @@ cssnano@^4.1.10: postcss "^7.0.0" csso@^4.0.2: - version "4.1.0" - resolved "https://registry.yarnpkg.com/csso/-/csso-4.1.0.tgz#1d31193efa99b87aa6bad6c0cef155e543d09e8b" - integrity sha512-h+6w/W1WqXaJA4tb1dk7r5tVbOm97MsKxzwnvOR04UQ6GILroryjMWu3pmCCtL2mLaEStQ0fZgeGiy99mo7iyg== + version "4.2.0" + resolved "https://registry.yarnpkg.com/csso/-/csso-4.2.0.tgz#ea3a561346e8dc9f546d6febedd50187cf389529" + integrity sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA== dependencies: - css-tree "^1.0.0" + css-tree "^1.1.2" cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0": version "0.3.8" @@ -3191,7 +3168,7 @@ debug@2, debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9: dependencies: ms "2.0.0" -debug@3.1.0, debug@=3.1.0, debug@~3.1.0: +debug@3.1.0, debug@~3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g== @@ -3199,20 +3176,13 @@ debug@3.1.0, debug@=3.1.0, debug@~3.1.0: ms "2.0.0" debug@^3.1.0, debug@^3.2.6: - version "3.2.6" - resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" - integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ== + version "3.2.7" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" + integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== dependencies: ms "^2.1.1" -debug@^4.0.0, debug@^4.0.1, debug@^4.1.1: - version "4.2.0" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz#7f150f93920e94c58f5574c2fd01a3110effe7f1" - integrity sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg== - dependencies: - ms "2.1.2" - -debug@^4.1.0: +debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1: version "4.3.1" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== @@ -3313,9 +3283,9 @@ delegates@^1.0.0: integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= denque@^1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/denque/-/denque-1.4.1.tgz#6744ff7641c148c3f8a69c307e51235c1f4a37cf" - integrity sha512-OfzPuSZKGcgr96rf1oODnfjqBFmr1DVoc/TrItj3Ohe0Ah1C5WX5Baquw/9U9KovnQ88EqmJbD66rKYUQYN1tQ== + version "1.5.0" + resolved "https://registry.yarnpkg.com/denque/-/denque-1.5.0.tgz#773de0686ff2d8ec2ff92914316a47b73b1c73de" + integrity sha512-CYiCSgIF1p6EUByQPlGkKnP1M9g0ZV3qMIrqMqZqdwazygIA/YP2vrbcyl1h/WppKJTdl1F85cXIle+394iDAQ== depd@2.0.0, depd@^2.0.0, depd@~2.0.0: version "2.0.0" @@ -3431,9 +3401,9 @@ domelementtype@1, domelementtype@^1.3.0, domelementtype@^1.3.1: integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w== domelementtype@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.0.2.tgz#f3b6e549201e46f588b59463dd77187131fe6971" - integrity sha512-wFwTwCVebUrMgGeAwRL/NhZtHAUyT9n9yg4IMDwf10+6iCMxSkVq9MGCVEH+QZWo1nNidy8kNvwmv4zWHDTqvA== + version "2.1.0" + resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.1.0.tgz#a851c080a6d1c3d94344aed151d99f669edf585e" + integrity sha512-LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w== domexception@^1.0.1: version "1.0.1" @@ -3470,13 +3440,13 @@ dont-sniff-mimetype@1.1.0: resolved "https://registry.yarnpkg.com/dont-sniff-mimetype/-/dont-sniff-mimetype-1.1.0.tgz#c7d0427f8bcb095762751252af59d148b0a623b2" integrity sha512-ZjI4zqTaxveH2/tTlzS1wFp+7ncxNZaIEWYg3lzZRHkKf5zPT/MnEG6WL0BhHMJUabkh8GeU5NL5j+rEUCb7Ug== -dot-case@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.3.tgz#21d3b52efaaba2ea5fda875bb1aa8124521cf4aa" - integrity sha512-7hwEmg6RiSQfm/GwPL4AAWXKy3YNNZA3oFv2Pdiey0mwkRCPZ9x6SZbkLcn8Ma5PYeVokzoD4Twv2n7LKp5WeA== +dot-case@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz#9b2b670d00a431667a8a75ba29cd1b98809ce751" + integrity sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w== dependencies: - no-case "^3.0.3" - tslib "^1.10.0" + no-case "^3.0.4" + tslib "^2.0.3" dot-prop@^5.2.0: version "5.3.0" @@ -3542,10 +3512,10 @@ ejs@^2.5.5: resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba" integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA== -electron-to-chromium@^1.3.47, electron-to-chromium@^1.3.591: - version "1.3.596" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.596.tgz#c7ed98512c7ff36ddcbfed9e54e6355335c35257" - integrity sha512-nLO2Wd2yU42eSoNJVQKNf89CcEGqeFZd++QsnN2XIgje1s/19AgctfjLIbPORlvcCO8sYjLwX4iUgDdusOY8Sg== +electron-to-chromium@^1.3.47, electron-to-chromium@^1.3.634: + version "1.3.639" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.639.tgz#0a27e3018ae3acf438a14a1dd4e41db4b8ab764e" + integrity sha512-bwl6/U6xb3d3CNufQU9QeO1L32ueouFwW4bWANSwdXR7LVqyLzWjNbynoKNfuC38QFB5Qn7O0l2KLqBkcXnC3Q== elliptic@^6.5.3: version "6.5.3" @@ -3597,10 +3567,10 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.1: dependencies: once "^1.4.0" -engine.io-client@~3.4.0: - version "3.4.4" - resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.4.4.tgz#77d8003f502b0782dd792b073a4d2cf7ca5ab967" - integrity sha512-iU4CRr38Fecj8HoZEnFtm2EiKGbYZcPn3cHxqNGl/tmdWRf60KhK+9vE0JeSjgnlS/0oynEfLgKbT9ALpim0sQ== +engine.io-client@~3.5.0: + version "3.5.0" + resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.5.0.tgz#fc1b4d9616288ce4f2daf06dcf612413dec941c7" + integrity sha512-12wPRfMrugVw/DNyJk34GQ5vIVArEcVMXWugQGGuw2XxUSztFNmJggZmv8IZlLyEdnpO1QB9LkcjeWewO2vxtA== dependencies: component-emitter "~1.3.0" component-inherit "0.0.3" @@ -3610,7 +3580,7 @@ engine.io-client@~3.4.0: indexof "0.0.1" parseqs "0.0.6" parseuri "0.0.6" - ws "~6.1.0" + ws "~7.4.2" xmlhttprequest-ssl "~1.5.4" yeast "0.1.2" @@ -3625,22 +3595,22 @@ engine.io-parser@~2.2.0: blob "0.0.5" has-binary2 "~1.0.2" -engine.io@~3.4.0: - version "3.4.2" - resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.4.2.tgz#8fc84ee00388e3e228645e0a7d3dfaeed5bd122c" - integrity sha512-b4Q85dFkGw+TqgytGPrGgACRUhsdKc9S9ErRAXpPGy/CXKs4tYoHDkvIRdsseAF7NjfVwjRFIn6KTnbw7LwJZg== +engine.io@~3.5.0: + version "3.5.0" + resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.5.0.tgz#9d6b985c8a39b1fe87cd91eb014de0552259821b" + integrity sha512-21HlvPUKaitDGE4GXNtQ7PLP0Sz4aWLddMPw2VTyFz1FVZqu/kZsJUO8WNpKuE/OCL7nkfRaOui2ZCJloGznGA== dependencies: accepts "~1.3.4" base64id "2.0.0" - cookie "0.3.1" + cookie "~0.4.1" debug "~4.1.0" engine.io-parser "~2.2.0" - ws "^7.1.2" + ws "~7.4.2" enhanced-resolve@^4.1.1, enhanced-resolve@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz#3b806f3bfafc1ec7de69551ef93cca46c1704126" - integrity sha512-3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ== + version "4.5.0" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz#2f3cfd84dbe3b487f18f2db2ef1e064a571ca5ec" + integrity sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg== dependencies: graceful-fs "^4.1.2" memory-fs "^0.5.0" @@ -3669,9 +3639,9 @@ entity-decode@^2.0.2: he "^1.1.1" errno@^0.1.1, errno@^0.1.3, errno@~0.1.7: - version "0.1.7" - resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618" - integrity sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg== + version "0.1.8" + resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f" + integrity sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A== dependencies: prr "~1.0.1" @@ -3682,7 +3652,7 @@ error-ex@^1.2.0, error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -es-abstract@^1.17.0, es-abstract@^1.17.0-next.1, es-abstract@^1.17.2: +es-abstract@^1.17.0-next.1, es-abstract@^1.17.2: version "1.17.7" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.7.tgz#a4de61b2f66989fc7421676c1cb9787573ace54c" integrity sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g== @@ -3726,7 +3696,7 @@ es-to-primitive@^1.2.1: is-date-object "^1.0.1" is-symbol "^1.0.2" -es5-ext@^0.10.35, es5-ext@^0.10.45, es5-ext@^0.10.46, es5-ext@^0.10.50, es5-ext@~0.10.14, es5-ext@~0.10.2, es5-ext@~0.10.46: +es5-ext@^0.10.35, es5-ext@^0.10.46, es5-ext@^0.10.50, es5-ext@^0.10.53, es5-ext@~0.10.14, es5-ext@~0.10.2, es5-ext@~0.10.46: version "0.10.53" resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.53.tgz#93c5a3acfdbef275220ad72644ad02ee18368de1" integrity sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q== @@ -3757,7 +3727,7 @@ es6-symbol@^3.1.1, es6-symbol@~3.1.3: d "^1.0.1" ext "^1.1.2" -es6-weak-map@^2.0.2: +es6-weak-map@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.3.tgz#b6da1f16cc2cc0d9be43e6bdbfc5e7dfcdf31d53" integrity sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA== @@ -4214,9 +4184,9 @@ fast-safe-stringify@^2.0.4: integrity sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA== fastq@^1.6.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.9.0.tgz#e16a72f338eaca48e91b5c23593bcc2ef66b7947" - integrity sha512-i7FVWL8HhVY+CTkwFxkN2mk3h+787ixS5S63eb78diVRc1MCssarHq3W5cj0av7YDSwmaV928RNag+U1etRQ7w== + version "1.10.0" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.10.0.tgz#74dbefccade964932cdf500473ef302719c652bb" + integrity sha512-NL2Qc5L3iQEsyYzweq7qfgy5OtXCmGzGvhElGEd/SoFWEMOEczNh5s5ocaF01HDetxz+p8ecjNPA6cZxxIHmzA== dependencies: reusify "^1.0.4" @@ -4277,9 +4247,9 @@ file-saver@^1.3.3: integrity sha512-spKHSBQIxxS81N/O21WmuXA2F6wppUCsutpzenOeZzOCCJ5gEfcbqJP983IrpLXzYmXnMUa6J03SubcNPdKrlg== file-type@^16.1.0: - version "16.1.0" - resolved "https://registry.yarnpkg.com/file-type/-/file-type-16.1.0.tgz#1c8a4458b2103e07d2b49ae7f76384abafe86529" - integrity sha512-G4Klqf6tuprtG0pC4r9kni4Wv8XhAAsfHphVqsQGA+YiOlPAO40BZduDqKfv0RFsu9q9ZbFObWfwszY/NqhEZw== + version "16.2.0" + resolved "https://registry.yarnpkg.com/file-type/-/file-type-16.2.0.tgz#d4f1da71ddda758db7f15f93adfaed09ce9e2715" + integrity sha512-1Wwww3mmZCMmLjBfslCluwt2mxH80GsAXYrvPnfQ42G1EGWag336kB1iyCgyn7UXiKY3cJrNykXPrCwA7xb5Ag== dependencies: readable-web-to-node-stream "^3.0.0" strtok3 "^6.0.3" @@ -4430,12 +4400,10 @@ fn.name@1.x.x: resolved "https://registry.yarnpkg.com/fn.name/-/fn.name-1.1.0.tgz#26cad8017967aea8731bc42961d04a3d5988accc" integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw== -follow-redirects@1.5.10: - version "1.5.10" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a" - integrity sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ== - dependencies: - debug "=3.1.0" +follow-redirects@^1.10.0: + version "1.13.1" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.1.tgz#5f69b813376cee4fd0474a3aba835df04ab763b7" + integrity sha512-SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg== for-in@^1.0.1, for-in@^1.0.2: version "1.0.2" @@ -4582,10 +4550,10 @@ fsevents@^1.0.0, fsevents@^1.2.7: bindings "^1.5.0" nan "^2.12.1" -fsevents@~2.1.2: - version "2.1.3" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e" - integrity sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ== +fsevents@~2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.1.tgz#b209ab14c61012636c8863507edf7fb68cc54e9f" + integrity sha512-YR47Eg4hChJGAB1O3yEAOkGO+rlzutoICGqGo9EZ4lKWokzZRSyIW1QmTzqjtw8MJdj9srP869CuWw/hyzSiBw== function-bind@^1.1.1: version "1.1.1" @@ -4628,10 +4596,10 @@ get-caller-file@^2.0.1: resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== -get-intrinsic@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.0.1.tgz#94a9768fcbdd0595a1c9273aacf4c89d075631be" - integrity sha512-ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg== +get-intrinsic@^1.0.1, get-intrinsic@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.0.2.tgz#6820da226e50b24894e08859469dc68361545d49" + integrity sha512-aeX0vrFm21ILl3+JpFFRNe9aUvp6VFZb2/CTbgLb8j75kOhvoNYjt9d8KA/tJG4gSo8nzEDedRl0h7vDmBYRVg== dependencies: function-bind "^1.1.1" has "^1.0.3" @@ -4766,9 +4734,9 @@ globals@^9.18.0: integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ== globby@^11.0.1: - version "11.0.1" - resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.1.tgz#9a2bf107a068f3ffeabc49ad702c79ede8cfd357" - integrity sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ== + version "11.0.2" + resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.2.tgz#1af538b766a3b540ebfb58a32b2e2d5897321d83" + integrity sha512-2ZThXDvvV8fYFRVIxnrMQBipZQDr7MxKAmQK1vujaj9/7eF0efG7BPUKJ7jP7G5SLF37xKDXvO4S/KKLj/Z0og== dependencies: array-union "^2.1.0" dir-glob "^3.0.1" @@ -5086,7 +5054,7 @@ html-webpack-plugin@4.5.0: tapable "^1.1.3" util.promisify "1.0.0" -"htmlparser2@>= 3.1.5 <4", htmlparser2@^3.3.0, htmlparser2@^3.9.1: +"htmlparser2@>= 3.1.5 <4", htmlparser2@^3.10.1, htmlparser2@^3.9.1: version "3.10.1" resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f" integrity sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ== @@ -5179,7 +5147,7 @@ ieee754@1.1.13: resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84" integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg== -ieee754@^1.1.13, ieee754@^1.1.4: +ieee754@^1.1.13, ieee754@^1.1.4, ieee754@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== @@ -5229,9 +5197,9 @@ import-fresh@^2.0.0: resolve-from "^3.0.0" import-fresh@^3.0.0: - version "3.2.2" - resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.2.tgz#fc129c160c5d68235507f4331a6baad186bdbc3e" - integrity sha512-cTPNrlvJT6twpYy+YmKUKrTSjWFs3bjYjAhCwm+z4EOCubZxAuO+hHpRN64TqjEaYSHs7tJAE0w1CKMGmsG/lw== + version "3.3.0" + resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" + integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw== dependencies: parent-module "^1.0.0" resolve-from "^4.0.0" @@ -5306,9 +5274,9 @@ inherits@2.0.3: integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= ini@^1.3.4, ini@^1.3.5, ini@~1.3.0: - version "1.3.5" - resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" - integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw== + version "1.3.8" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" + integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== inquirer@^6.2.2: version "6.5.2" @@ -5389,9 +5357,11 @@ is-alphanumerical@^1.0.0: is-decimal "^1.0.0" is-arguments@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.0.4.tgz#3faf966c7cba0ff437fb31f6250082fcf0448cf3" - integrity sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA== + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.0.tgz#62353031dfbee07ceb34656a6bde59efecae8dd9" + integrity sha512-1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg== + dependencies: + call-bind "^1.0.0" is-arrayish@^0.2.1: version "0.2.1" @@ -5591,9 +5561,9 @@ is-hexadecimal@^1.0.0: integrity sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw== is-negative-zero@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.0.tgz#9553b121b0fac28869da9ed459e20c7543788461" - integrity sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE= + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24" + integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w== is-number@^2.1.0: version "2.1.0" @@ -5651,7 +5621,7 @@ is-primitive@^2.0.0: resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575" integrity sha1-IHurkWOEmcB7Kt8kCkGochADRXU= -is-promise@^2.1: +is-promise@^2.2.2: version "2.2.2" resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1" integrity sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ== @@ -5785,9 +5755,9 @@ jquery@^3.5.1: integrity sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg== js-beautify@^1.8.8: - version "1.13.0" - resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.13.0.tgz#a056d5d3acfd4918549aae3ab039f9f3c51eebb2" - integrity sha512-/Tbp1OVzZjbwzwJQFIlYLm9eWQ+3aYbBXLSaqb1mEJzhcQAfrqMMQYtjb6io+U6KpD0ID4F+Id3/xcjH3l/sqA== + version "1.13.4" + resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.13.4.tgz#1cad80b9e89cfc455b3a14f0eaf4dc10b6ae1206" + integrity sha512-M5yEWwonlEO3kPcCZ3K3KBSpFRZAEO3FAWC6wtbIGeyg7dusStxvF0WG+HRLBoMZqREXSRSxkkqClDE865x1sg== dependencies: config-chain "^1.1.12" editorconfig "^0.15.3" @@ -5820,15 +5790,7 @@ js-tokens@^3.0.2: resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls= -js-yaml@^3.13.0, js-yaml@^3.6.1: - version "3.14.0" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz#a7a34170f26a21bb162424d8adacb4113a69e482" - integrity sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A== - dependencies: - argparse "^1.0.7" - esprima "^4.0.0" - -js-yaml@^3.13.1, js-yaml@~3.14.0: +js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.6.1, js-yaml@~3.14.0: version "3.14.1" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== @@ -6014,9 +5976,9 @@ keymaster@^1.6.2: integrity sha1-4a5U0OqUiPn2C2a2aPAumhlGxus= khroma@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/khroma/-/khroma-1.1.0.tgz#cc17723eb719c5245ea66d23dd577d5695452db5" - integrity sha512-aTO+YX22tYOLEQJYFiatAj1lc5QZ+H5sHWFRBWNCiKwc5NWNUJZyeSeiHEPeURJ2a1GEVYcmyMUwGjjLe5ec5A== + version "1.2.0" + resolved "https://registry.yarnpkg.com/khroma/-/khroma-1.2.0.tgz#46dcc9d7533923c228b51724db108f11fec108d8" + integrity sha512-DlKk5y243dujy8fOH02aRnnewLfiHJV0s8aXaVrCohgBf3s7fEAn6gc6LLQ21agODlFZS8ufrn+juu70uCA9Tw== kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: version "3.2.2" @@ -6355,12 +6317,12 @@ lower-case@^1.1.1: resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac" integrity sha1-miyr0bno4K6ZOkv31YdcOcQujqw= -lower-case@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.1.tgz#39eeb36e396115cc05e29422eaea9e692c9408c7" - integrity sha512-LiWgfDLLb1dwbFQZsSglpRj+1ctGnayXz3Uv0/WO8n558JycT5fg6zkNcnW0G68Nn0aEldTFeEfmjCfmqry/rQ== +lower-case@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28" + integrity sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg== dependencies: - tslib "^1.10.0" + tslib "^2.0.3" lru-cache@^4.1.3, lru-cache@^4.1.5: version "4.1.5" @@ -6384,7 +6346,7 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" -lru-queue@0.1: +lru-queue@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/lru-queue/-/lru-queue-0.1.0.tgz#2738bd9f0d3cf4f84490c5736c48699ac632cda3" integrity sha1-Jzi9nw089PhEkMVzbEhpmsYyzaM= @@ -6616,10 +6578,10 @@ mdast-util-to-string@^1.0.2: resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-1.1.0.tgz#27055500103f51637bd07d01da01eb1967a43527" integrity sha512-jVU0Nr2B9X3MU4tSK7JP1CMkSvOj7X5l/GboG1tKRw52lLF1x2Ju92Ms9tNetCcbfX3hzlM73zYo2NKkWSfF/A== -mdn-data@2.0.12: - version "2.0.12" - resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.12.tgz#bbb658d08b38f574bbb88f7b83703defdcc46844" - integrity sha512-ULbAlgzVb8IqZ0Hsxm6hHSlQl3Jckst2YEQS7fODu9ilNWy2LvcoSY7TRFIktABP2mdppBioc66va90T+NUs8Q== +mdn-data@2.0.14: + version "2.0.14" + resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50" + integrity sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow== mdn-data@2.0.4: version "2.0.4" @@ -6637,18 +6599,18 @@ media-typer@0.3.0: integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= memoizee@^0.4.14: - version "0.4.14" - resolved "https://registry.yarnpkg.com/memoizee/-/memoizee-0.4.14.tgz#07a00f204699f9a95c2d9e77218271c7cd610d57" - integrity sha512-/SWFvWegAIYAO4NQMpcX+gcra0yEZu4OntmUdrBaWrJncxOqAziGFlHxc7yjKVK2uu3lpPW27P27wkR82wA8mg== + version "0.4.15" + resolved "https://registry.yarnpkg.com/memoizee/-/memoizee-0.4.15.tgz#e6f3d2da863f318d02225391829a6c5956555b72" + integrity sha512-UBWmJpLZd5STPm7PMUlOw/TSy972M+z8gcyQ5veOnSDRREz/0bmpyTfKt3/51DhEBqCZQn1udM/5flcSPYhkdQ== dependencies: - d "1" - es5-ext "^0.10.45" - es6-weak-map "^2.0.2" + d "^1.0.1" + es5-ext "^0.10.53" + es6-weak-map "^2.0.3" event-emitter "^0.3.5" - is-promise "^2.1" - lru-queue "0.1" - next-tick "1" - timers-ext "^0.1.5" + is-promise "^2.2.2" + lru-queue "^0.1.0" + next-tick "^1.1.0" + timers-ext "^0.1.7" memory-fs@^0.4.1: version "0.4.1" @@ -6788,22 +6750,17 @@ miller-rabin@^4.0.0: bn.js "^4.0.0" brorand "^1.0.1" -mime-db@1.44.0: - version "1.44.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92" - integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg== - -"mime-db@>= 1.43.0 < 2": +mime-db@1.45.0, "mime-db@>= 1.43.0 < 2": version "1.45.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.45.0.tgz#cceeda21ccd7c3a745eba2decd55d4b73e7879ea" integrity sha512-CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w== mime-types@^2.1.12, mime-types@^2.1.14, mime-types@^2.1.3, mime-types@~2.1.19, mime-types@~2.1.24: - version "2.1.27" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f" - integrity sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w== + version "2.1.28" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.28.tgz#1160c4757eab2c5363888e005273ecf79d2a0ecd" + integrity sha512-0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ== dependencies: - mime-db "1.44.0" + mime-db "1.45.0" mime@1.3.4: version "1.3.4" @@ -6816,9 +6773,9 @@ mime@1.6.0, mime@^1.4.1: integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== mime@^2.4.4: - version "2.4.6" - resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.6.tgz#e5b407c90db442f2beb5b162373d07b69affa4d1" - integrity sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA== + version "2.4.7" + resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.7.tgz#962aed9be0ed19c91fd7dc2ece5d7f4e89a90d74" + integrity sha512-dhNd1uA2u397uQk3Nv5LM4lm93WYDUXFn3Fu291FJerns4jyTudqhIWe4W04YLy7Uk1tm1Ore04NpjRvQp/NPA== mimic-fn@^1.0.0: version "1.2.0" @@ -7064,15 +7021,20 @@ ms@2.1.1: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg== -ms@2.1.2, ms@^2.1.1: +ms@2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== +ms@^2.1.1: + version "2.1.3" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" + integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== + mustache@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/mustache/-/mustache-4.0.1.tgz#d99beb031701ad433338e7ea65e0489416c854a2" - integrity sha512-yL5VE97+OXn4+Er3THSmTdCFCtx5hHWzrolvH+JObZnUYwuaG7XV+Ch4fR2cIrcYI0tFHxS7iyFYl14bW8y2sA== + version "4.1.0" + resolved "https://registry.yarnpkg.com/mustache/-/mustache-4.1.0.tgz#8c1b042238a982d2eb2d30efc6c14296ae3f699d" + integrity sha512-0FsgP/WVq4mKyjolIyX+Z9Bd+3WS8GOwoUTyKXT5cTYMGeauNTi2HPCwERqseC1IHAy0Z7MDZnJBfjabd4O8GQ== mute-stream@0.0.7: version "0.0.7" @@ -7157,9 +7119,9 @@ ncp@~2.0.0: integrity sha1-GVoh1sRuNh0vsSgbo4uR6d9727M= needle@^2.2.1: - version "2.5.2" - resolved "https://registry.yarnpkg.com/needle/-/needle-2.5.2.tgz#cf1a8fce382b5a280108bba90a14993c00e4010a" - integrity sha512-LbRIwS9BfkPvNwNHlsA41Q29kL2L/6VaOJ0qisM5lLWsTV3nP15abO5ITL6L81zqFhzjRKDAYjpcBcwM0AVvLQ== + version "2.6.0" + resolved "https://registry.yarnpkg.com/needle/-/needle-2.6.0.tgz#24dbb55f2509e2324b4a99d61f413982013ccdbe" + integrity sha512-KKYdza4heMsEfSWD7VPUIz3zX2XDwOyX2d+geb4vrERZMT5RMU6ujjaD+I5Yr54uZxQ2w6XRTAhHBbSCyovZBg== dependencies: debug "^3.2.6" iconv-lite "^0.4.4" @@ -7175,7 +7137,7 @@ neo-async@^2.5.0, neo-async@^2.6.0, neo-async@^2.6.1: resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== -next-tick@1: +next-tick@1, next-tick@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.1.0.tgz#1836ee30ad56d67ef281b22bd199f709449b35eb" integrity sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ== @@ -7197,13 +7159,13 @@ no-case@^2.2.0: dependencies: lower-case "^1.1.1" -no-case@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.3.tgz#c21b434c1ffe48b39087e86cfb4d2582e9df18f8" - integrity sha512-ehY/mVQCf9BL0gKfsJBvFJen+1V//U+0HQMPrWct40ixE4jnv0bfvxDbWtAHL9EcaPEOJHVVYKoQn1TlZUB8Tw== +no-case@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz#d361fd5c9800f558551a8369fc0dcd4662b6124d" + integrity sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg== dependencies: - lower-case "^2.0.1" - tslib "^1.10.0" + lower-case "^2.0.2" + tslib "^2.0.3" nocache@2.1.0: version "2.1.0" @@ -7265,10 +7227,10 @@ node-pre-gyp@^0.11.0: semver "^5.3.0" tar "^4" -node-releases@^1.1.66: - version "1.1.66" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.66.tgz#609bd0dc069381015cd982300bae51ab4f1b1814" - integrity sha512-JHEQ1iWPGK+38VLB2H9ef2otU4l8s3yAMt9Xf934r6+ojCYDMHPMqvCc9TnzfeFSP1QEOeU6YZEd3+De0LTCgg== +node-releases@^1.1.69: + version "1.1.69" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.69.tgz#3149dbde53b781610cd8b486d62d86e26c3725f6" + integrity sha512-DGIjo79VDEyAnRlfSqYTsy+yoHd2IOjJiKUozD2MV2D85Vso6Bug56mb9tT/fY5Urt0iqk01H7x+llAruDR2zA== nomnom@^1.5.x: version "1.8.1" @@ -7398,11 +7360,6 @@ object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= -object-component@0.0.3: - version "0.0.3" - resolved "https://registry.yarnpkg.com/object-component/-/object-component-0.0.3.tgz#f0c69aa50efc95b866c186f400a33769cb2f1291" - integrity sha1-8MaapQ78lbhmwYb0AKM3acsvEpE= - object-copy@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c" @@ -7413,17 +7370,17 @@ object-copy@^0.1.0: kind-of "^3.0.3" object-inspect@^1.8.0: - version "1.8.0" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz#df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0" - integrity sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA== + version "1.9.0" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.9.0.tgz#c90521d74e1127b67266ded3394ad6116986533a" + integrity sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw== object-is@^1.0.1: - version "1.1.3" - resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.3.tgz#2e3b9e65560137455ee3bd62aec4d90a2ea1cc81" - integrity sha512-teyqLvFWzLkq5B9ki8FVWA902UER2qkxmdA4nLf+wjOLAWgxzCWZNCxpDq9MvE8MmhWNr+I8w3BN49Vx36Y6Xg== + version "1.1.4" + resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.4.tgz#63d6c83c00a43f4cbc9434eb9757c8a5b8565068" + integrity sha512-1ZvAZ4wlF7IyPVOcE1Omikt7UpaFlOQq0HlSti+ZvDH3UiD2brwGMwDbyV43jao2bKJ+4+WdPJHSd7kgzKYVqg== dependencies: + call-bind "^1.0.0" define-properties "^1.1.3" - es-abstract "^1.18.0-next.1" object-keys@^1.0.12, object-keys@^1.1.1: version "1.1.1" @@ -7448,12 +7405,13 @@ object.assign@^4.1.1: object-keys "^1.1.1" object.getownpropertydescriptors@^2.0.3, object.getownpropertydescriptors@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz#369bf1f9592d8ab89d712dced5cb81c7c5352649" - integrity sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg== + version "2.1.1" + resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.1.tgz#0dfda8d108074d9c563e80490c883b6661091544" + integrity sha512-6DtXgZ/lIZ9hqx4GtZETobXLR/ZLaa0aqV0kzbn80Rf8Z2e/XFnhA0I7p07N2wH8bBBltr2xQPi6sbKWAY2Eng== dependencies: + call-bind "^1.0.0" define-properties "^1.1.3" - es-abstract "^1.17.0-next.1" + es-abstract "^1.18.0-next.1" object.omit@^2.0.0: version "2.0.1" @@ -7471,13 +7429,13 @@ object.pick@^1.3.0: isobject "^3.0.1" object.values@^1.1.0, object.values@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz#68a99ecde356b7e9295a3c5e0ce31dc8c953de5e" - integrity sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA== + version "1.1.2" + resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.2.tgz#7a2015e06fcb0f546bd652486ce8583a4731c731" + integrity sha512-MYC0jvJopr8EK6dPBiO8Nb9mvjdypOachO5REGk6MXzujbBrAisKo3HmdEI6kZDL6fC31Mwee/5YbtMebixeag== dependencies: + call-bind "^1.0.0" define-properties "^1.1.3" - es-abstract "^1.17.0-next.1" - function-bind "^1.1.1" + es-abstract "^1.18.0-next.1" has "^1.0.3" on-finished@~2.3.0: @@ -7587,11 +7545,11 @@ p-limit@^2.0.0, p-limit@^2.2.0: p-try "^2.0.0" p-limit@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.0.2.tgz#1664e010af3cadc681baafd3e2a437be7b0fb5fe" - integrity sha512-iwqZSOoWIW+Ew4kAGUlN16J4M7OB3ysMLSZtnhmqx7njIHFPlxWBX8xo3lVTyFVq6mI/lL9qt2IsN1sHwaxJkg== + version "3.1.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" + integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== dependencies: - p-try "^2.0.0" + yocto-queue "^0.1.0" p-locate@^2.0.0: version "2.0.0" @@ -7658,12 +7616,12 @@ param-case@^2.1.1: no-case "^2.2.0" param-case@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/param-case/-/param-case-3.0.3.tgz#4be41f8399eff621c56eebb829a5e451d9801238" - integrity sha512-VWBVyimc1+QrzappRs7waeN2YmoZFCGXWASRYX1/rGHtXqEcrGEIDm+jqIwFa2fRXNgQEwrxaYuIrX0WcAguTA== + version "3.0.4" + resolved "https://registry.yarnpkg.com/param-case/-/param-case-3.0.4.tgz#7d17fe4aa12bde34d4a77d91acfb6219caad01c5" + integrity sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A== dependencies: - dot-case "^3.0.3" - tslib "^1.10.0" + dot-case "^3.0.4" + tslib "^2.0.3" parent-module@^1.0.0: version "1.0.1" @@ -7740,25 +7698,11 @@ parse5@4.0.0: resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608" integrity sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA== -parseqs@0.0.5: - version "0.0.5" - resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.5.tgz#d5208a3738e46766e291ba2ea173684921a8b89d" - integrity sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0= - dependencies: - better-assert "~1.0.0" - parseqs@0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.6.tgz#8e4bb5a19d1cdc844a08ac974d34e273afa670d5" integrity sha512-jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w== -parseuri@0.0.5: - version "0.0.5" - resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.5.tgz#80204a50d4dbb779bfdc6ebe2778d90e4bce320a" - integrity sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo= - dependencies: - better-assert "~1.0.0" - parseuri@0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.6.tgz#e1496e829e3ac2ff47f39a4dd044b32823c4a25a" @@ -7769,13 +7713,13 @@ parseurl@~1.3.2, parseurl@~1.3.3: resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== -pascal-case@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.1.tgz#5ac1975133ed619281e88920973d2cd1f279de5f" - integrity sha512-XIeHKqIrsquVTQL2crjq3NfJUxmdLasn3TYOU0VBM+UX2a6ztAWBlJQBePLGY7VHW8+2dRadeIPK5+KImwTxQA== +pascal-case@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.2.tgz#b48e0ef2b98e205e7c1dae747d0b1508237660eb" + integrity sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g== dependencies: - no-case "^3.0.3" - tslib "^1.10.0" + no-case "^3.0.4" + tslib "^2.0.3" pascalcase@^0.1.1: version "0.1.1" @@ -7982,10 +7926,10 @@ pdfobject@^2.0.201604172: resolved "https://registry.yarnpkg.com/pdfobject/-/pdfobject-2.2.4.tgz#ccb3c191129298a471e9ccb59c88a3ee0b7c7530" integrity sha512-r6Rw9CQWsrY6uqmKvlgFNoupmuRbSt9EsG0sZhSAy3cIk4WgOXyAVmebFSlLhqj6gA5NIEXL3lSEbwOOYfdUvw== -peek-readable@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/peek-readable/-/peek-readable-3.1.0.tgz#250b08b7de09db8573d7fd8ea475215bbff14348" - integrity sha512-KGuODSTV6hcgdZvDrIDBUkN0utcAVj1LL7FfGbM0viKTtCHmtZcuEJ+lGqsp0fTFkGqesdtemV2yUSMeyy3ddA== +peek-readable@^3.1.3: + version "3.1.3" + resolved "https://registry.yarnpkg.com/peek-readable/-/peek-readable-3.1.3.tgz#932480d46cf6aa553c46c68566c4fb69a82cd2b1" + integrity sha512-mpAcysyRJxmICBcBa5IXH7SZPvWkcghm6Fk8RekoS3v+BpbSzlZzuWbMx+GXrlUwESi9qHar4nVEZNMKylIHvg== performance-now@^2.1.0: version "2.1.0" @@ -8497,9 +8441,9 @@ printj@~1.1.0: integrity sha512-zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ== prismjs@^1.21.0: - version "1.22.0" - resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.22.0.tgz#73c3400afc58a823dd7eed023f8e1ce9fd8977fa" - integrity sha512-lLJ/Wt9yy0AiSYBf212kK3mM5L8ycwlyTlSxHBAneXLR0nzFMlZ5y7riFPF3E33zXOF2IH95xdY5jIyZbM9z/w== + version "1.23.0" + resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.23.0.tgz#d3b3967f7d72440690497652a9d40ff046067f33" + integrity sha512-c29LVsqOaLbBHuIbsTxaKENh1N2EQBOHaWv7gkHN4dgRbxSREqDnDbtFJYdpPauS4YCplMSNCABQ6Eeor69bAA== optionalDependencies: clipboard "^2.0.0" @@ -8803,9 +8747,9 @@ readable-stream@~2.0.0: util-deprecate "~1.0.1" readable-web-to-node-stream@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.0.tgz#4ca5408e70471069119d691934141a52de413955" - integrity sha512-HNmLb3n0SteGAs8HQlErYPGeO+y7cvL/mVUKtXeUkl0iCZ/2GIgKGrCFHyS7UXFnO8uc9U+0y3pYIzAPsjFfvA== + version "3.0.1" + resolved "https://registry.yarnpkg.com/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.1.tgz#3f619b1bc5dd73a4cfe5c5f9b4f6faba55dff845" + integrity sha512-4zDC6CvjUyusN7V0QLsXVB7pJCD9+vtrM9bYDRv6uBQ+SKfx36rp5AFNPRgh9auKRul/a1iFZJYXcCbwRL+SaA== dependencies: "@types/readable-stream" "^2.3.9" readable-stream "^3.6.0" @@ -9487,13 +9431,13 @@ remove-trailing-separator@^1.0.1: integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8= renderkid@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.4.tgz#d325e532afb28d3f8796ffee306be8ffd6fc864c" - integrity sha512-K2eXrSOJdq+HuKzlcjOlGoOarUu5SDguDEhE7+Ah4zuOWL40j8A/oHvLlLob9PSTNvVnBd+/q0Er1QfpEuem5g== + version "2.0.5" + resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.5.tgz#483b1ac59c6601ab30a7a596a5965cabccfdd0a5" + integrity sha512-ccqoLg+HLOHq1vdfYNm4TBeaCDIi1FLt3wGojTDSvdewUv65oTmI3cnT2E4hRjl1gzKZIPK+KZrXzlUYKnR+vQ== dependencies: - css-select "^1.1.0" + css-select "^2.0.2" dom-converter "^0.2" - htmlparser2 "^3.3.0" + htmlparser2 "^3.10.1" lodash "^4.17.20" strip-ansi "^3.0.0" @@ -9514,11 +9458,6 @@ repeating@^2.0.0: dependencies: is-finite "^1.0.0" -replace-ext@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb" - integrity sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs= - request-promise-core@1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.4.tgz#3eedd4223208d419867b78ce815167d10593a22f" @@ -9661,7 +9600,7 @@ rimraf@2.6.3: dependencies: glob "^7.1.3" -rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3: +rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3, rimraf@^2.7.1: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== @@ -10063,36 +10002,16 @@ socket.io-adapter@~1.1.0: resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz#ab3f0d6f66b8fc7fca3959ab5991f82221789be9" integrity sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g== -socket.io-client@2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.3.0.tgz#14d5ba2e00b9bcd145ae443ab96b3f86cbcc1bb4" - integrity sha512-cEQQf24gET3rfhxZ2jJ5xzAOo/xhZwK+mOqtGRg5IowZsMgwvHwnf/mCRapAAkadhM26y+iydgwsXGObBB5ZdA== - dependencies: - backo2 "1.0.2" - base64-arraybuffer "0.1.5" - component-bind "1.0.0" - component-emitter "1.2.1" - debug "~4.1.0" - engine.io-client "~3.4.0" - has-binary2 "~1.0.2" - has-cors "1.1.0" - indexof "0.0.1" - object-component "0.0.3" - parseqs "0.0.5" - parseuri "0.0.5" - socket.io-parser "~3.3.0" - to-array "0.1.4" - -socket.io-client@^2.1.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.3.1.tgz#91a4038ef4d03c19967bb3c646fec6e0eaa78cff" - integrity sha512-YXmXn3pA8abPOY//JtYxou95Ihvzmg8U6kQyolArkIyLd0pgVhrfor/iMsox8cn07WCOOvvuJ6XKegzIucPutQ== +socket.io-client@2.4.0, socket.io-client@^2.1.1: + version "2.4.0" + resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.4.0.tgz#aafb5d594a3c55a34355562fc8aea22ed9119a35" + integrity sha512-M6xhnKQHuuZd4Ba9vltCLT9oa+YvTsP8j9NcEiLElfIg8KeYPyhWOes6x4t+LTAC8enQbE/995AdTem2uNyKKQ== dependencies: backo2 "1.0.2" component-bind "1.0.0" component-emitter "~1.3.0" debug "~3.1.0" - engine.io-client "~3.4.0" + engine.io-client "~3.5.0" has-binary2 "~1.0.2" indexof "0.0.1" parseqs "0.0.6" @@ -10101,9 +10020,9 @@ socket.io-client@^2.1.1: to-array "0.1.4" socket.io-parser@~3.3.0: - version "3.3.1" - resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.3.1.tgz#f07d9c8cb3fb92633aa93e76d98fd3a334623199" - integrity sha512-1QLvVAe8dTz+mKmZ07Swxt+LAo4Y1ff50rlyoEx00TQmDFVQYPfcqGvIDJLGaBdhdNCecXtyKpD+EgKGcmmbuQ== + version "3.3.2" + resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.3.2.tgz#ef872009d0adcf704f2fbe830191a14752ad50b6" + integrity sha512-FJvDBuOALxdCI9qwRrO/Rfp9yfndRtc1jSgVgV8FDraihmSP/MLGD5PEuJrNfjALvcQ+vMDM/33AWOYP/JSjDg== dependencies: component-emitter "~1.3.0" debug "~3.1.0" @@ -10119,15 +10038,15 @@ socket.io-parser@~3.4.0: isarray "2.0.1" socket.io@^2.1.1: - version "2.3.0" - resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.3.0.tgz#cd762ed6a4faeca59bc1f3e243c0969311eb73fb" - integrity sha512-2A892lrj0GcgR/9Qk81EaY2gYhCBxurV0PfmmESO6p27QPrUK1J3zdns+5QPqvUYK2q657nSj0guoIil9+7eFg== + version "2.4.1" + resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.4.1.tgz#95ad861c9a52369d7f1a68acf0d4a1b16da451d2" + integrity sha512-Si18v0mMXGAqLqCVpTxBa8MGqriHGQh8ccEOhmsmNS3thNCGBwO8WGrwMibANsWtQQ5NStdZwHqZR3naJVFc3w== dependencies: debug "~4.1.0" - engine.io "~3.4.0" + engine.io "~3.5.0" has-binary2 "~1.0.2" socket.io-adapter "~1.1.0" - socket.io-client "2.3.0" + socket.io-client "2.4.0" socket.io-parser "~3.4.0" sort-keys@^1.0.0: @@ -10210,9 +10129,9 @@ spdx-expression-parse@^3.0.0: spdx-license-ids "^3.0.0" spdx-license-ids@^3.0.0: - version "3.0.6" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz#c80757383c28abf7296744998cbc106ae8b854ce" - integrity sha512-+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw== + version "3.0.7" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz#e9c18a410e5ed7e12442a549fbd8afa767038d65" + integrity sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ== spin.js@^2.3.2: version "2.3.2" @@ -10406,20 +10325,20 @@ string-width@^4.0.0: strip-ansi "^6.0.0" string.prototype.trimend@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.2.tgz#6ddd9a8796bc714b489a3ae22246a208f37bfa46" - integrity sha512-8oAG/hi14Z4nOVP0z6mdiVZ/wqjDtWSLygMigTzAb+7aPEDTleeFf+WrF+alzecxIRkckkJVn+dTlwzJXORATw== + version "1.0.3" + resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz#a22bd53cca5c7cf44d7c9d5c732118873d6cd18b" + integrity sha512-ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw== dependencies: + call-bind "^1.0.0" define-properties "^1.1.3" - es-abstract "^1.18.0-next.1" string.prototype.trimstart@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.2.tgz#22d45da81015309cd0cdd79787e8919fc5c613e7" - integrity sha512-7F6CdBTl5zyu30BJFdzSTlSlLPwODC23Od+iLoVH8X6+3fvDPPuBVVj9iaB1GOsSTSIgVfsfm27R2FGrAPznWg== + version "1.0.3" + resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz#9b4cb590e123bb36564401d59824298de50fd5aa" + integrity sha512-oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg== dependencies: + call-bind "^1.0.0" define-properties "^1.1.3" - es-abstract "^1.18.0-next.1" string@^3.3.3: version "3.3.3" @@ -10498,13 +10417,13 @@ strip-json-comments@^2.0.1, strip-json-comments@~2.0.1: integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= strtok3@^6.0.3: - version "6.0.4" - resolved "https://registry.yarnpkg.com/strtok3/-/strtok3-6.0.4.tgz#ede0d20fde5aa9fda56417c3558eaafccc724694" - integrity sha512-rqWMKwsbN9APU47bQTMEYTPcwdpKDtmf1jVhHzNW2cL1WqAxaM9iBb9t5P2fj+RV2YsErUWgQzHD5JwV0uCTEQ== + version "6.0.8" + resolved "https://registry.yarnpkg.com/strtok3/-/strtok3-6.0.8.tgz#c839157f615c10ba0f4ae35067dad9959eeca346" + integrity sha512-QLgv+oiXwXgCgp2PdPPa+Jpp4D9imK9e/0BsyfeFMr6QL6wMVqoVn9+OXQ9I7MZbmUzN6lmitTJ09uwS2OmGcw== dependencies: "@tokenizer/token" "^0.1.1" "@types/debug" "^4.1.5" - peek-readable "^3.1.0" + peek-readable "^3.1.3" stylehacks@^4.0.0: version "4.0.3" @@ -10610,9 +10529,9 @@ tapable@^1.0.0, tapable@^1.1.3: integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA== tar-stream@^2.1.4: - version "2.1.4" - resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.4.tgz#c4fb1a11eb0da29b893a5b25476397ba2d053bfa" - integrity sha512-o3pS2zlG4gxr67GmFYBLlq+dM8gyRGUOvsrHclSkvtVtQbjV0s/+ZE8OpICbaj8clrX3tjeHngYGP7rweaBnuw== + version "2.2.0" + resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287" + integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ== dependencies: bl "^4.0.3" end-of-stream "^1.4.1" @@ -10634,9 +10553,9 @@ tar@^4: yallist "^3.0.3" tar@^6.0.2: - version "6.0.5" - resolved "https://registry.yarnpkg.com/tar/-/tar-6.0.5.tgz#bde815086e10b39f1dcd298e89d596e1535e200f" - integrity sha512-0b4HOimQHj9nXNEAA7zWwMM91Zhhba3pspja6sQbgTpynOJf+bkjBnfybNYzbpLbnwXnbyB4LOREvlyXLkCHSg== + version "6.1.0" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.0.tgz#d1724e9bcc04b977b18d5c573b333a2207229a83" + integrity sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA== dependencies: chownr "^2.0.0" fs-minipass "^2.0.0" @@ -10724,7 +10643,7 @@ timers-browserify@^2.0.4: dependencies: setimmediate "^1.0.4" -timers-ext@^0.1.5: +timers-ext@^0.1.5, timers-ext@^0.1.7: version "0.1.7" resolved "https://registry.yarnpkg.com/timers-ext/-/timers-ext-0.1.7.tgz#6f57ad8578e07a3fb9f91d9387d65647555e25c6" integrity sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ== @@ -10810,12 +10729,12 @@ toidentifier@1.0.0: integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== token-types@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/token-types/-/token-types-2.0.0.tgz#b23618af744818299c6fbf125e0fdad98bab7e85" - integrity sha512-WWvu8sGK8/ZmGusekZJJ5NM6rRVTTDO7/bahz4NGiSDb/XsmdYBn6a1N/bymUHuWYTWeuLUg98wUzvE4jPdCZw== + version "2.1.1" + resolved "https://registry.yarnpkg.com/token-types/-/token-types-2.1.1.tgz#bd585d64902aaf720b8979d257b4b850b4d45c45" + integrity sha512-wnQcqlreS6VjthyHO3Y/kpK/emflxDBNhlNUPfh7wE39KnuDdOituXomIbyI79vBtF0Ninpkh72mcuRHo+RG3Q== dependencies: - "@tokenizer/token" "^0.1.0" - ieee754 "^1.1.13" + "@tokenizer/token" "^0.1.1" + ieee754 "^1.2.1" toobusy-js@^0.5.1: version "0.5.1" @@ -10892,6 +10811,11 @@ tslib@^1.10.0, tslib@^1.9.0, tslib@^1.9.2: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== +tslib@^2.0.3: + version "2.1.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a" + integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A== + tty-browserify@0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6" @@ -10963,15 +10887,10 @@ uc.micro@^1.0.1, uc.micro@^1.0.5: resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac" integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA== -uglify-js@^3.1.4: - version "3.11.6" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.11.6.tgz#144b50d3e05eadd3ad4dd047c60ca541a8cd4e9c" - integrity sha512-oASI1FOJ7BBFkSCNDZ446EgkSuHkOZBuqRFrwXIKWCoXw8ZXQETooTQjkAcBS03Acab7ubCKsXnwuV2svy061g== - -uglify-js@^3.5.1: - version "3.12.2" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.12.2.tgz#c7ae89da0ed1bb58999c7fce07190b347fdbdaba" - integrity sha512-rWYleAvfJPjduYCt+ELvzybNah/zIkRteGXIBO8X0lteRZPGladF61hFi8tU7qKTsF7u6DUQCtT9k00VlFOgkg== +uglify-js@^3.1.4, uglify-js@^3.5.1: + version "3.12.4" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.12.4.tgz#93de48bb76bb3ec0fc36563f871ba46e2ee5c7ee" + integrity sha512-L5i5jg/SHkEqzN18gQMTWsZk3KelRsfD1wUVNqtq0kzqWQqcJjyL8yc1o8hJgRrWqrAl2mUFbhfznEIoi7zi2A== uid-safe@~2.1.5: version "2.1.5" @@ -10992,11 +10911,16 @@ umzug@^2.1.0: dependencies: bluebird "^3.7.2" -underscore@1.11.x, "underscore@>= 1.3.1", underscore@^1.7.0: +underscore@1.11.x: version "1.11.0" resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.11.0.tgz#dd7c23a195db34267186044649870ff1bab5929e" integrity sha512-xY96SsN3NA461qIRKZ/+qox37YXPtSBswMGfiNptr+wrt6ds4HaMw23TP612fEyGekRE6LNRiLYr/aqbHXNedw== +"underscore@>= 1.3.1", underscore@^1.7.0: + version "1.12.0" + resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.12.0.tgz#4814940551fc80587cef7840d1ebb0f16453be97" + integrity sha512-21rQzss/XPMjolTiIezSu3JAjgagXKROtNrYFEOWK109qY1Uv2tVjPTZ1ci2HgvQDA16gHYSthQIJfB+XId/rQ== + underscore@~1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.6.0.tgz#8b38b10cacdef63337b8b24e4ff86d45aea529a8" @@ -11060,9 +10984,9 @@ unified-lint-rule@^1.0.0: wrapped "^1.0.1" unified-message-control@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/unified-message-control/-/unified-message-control-3.0.1.tgz#7018855daea9af96082cbea35970d48c9c4dbbf2" - integrity sha512-K2Kvvp1DBzeuxYLLsumZh/gDWUTl4e2z/P3VReFirC78cfHKtQifbhnfRrSBtKtd1Uc6cvYTW0/SZIUaMAEcTg== + version "3.0.2" + resolved "https://registry.yarnpkg.com/unified-message-control/-/unified-message-control-3.0.2.tgz#efa316c97f39f6f54bc74a4cf35807e615694033" + integrity sha512-lhF8fKjDo2cIPx1re5X1QinqUonl+AN6F0XfEaab8w/hjqX7FZAhzu4P8g6pmYp09ld+HSWFwdRJj+Y8xD0q7Q== dependencies: unist-util-visit "^2.0.0" vfile-location "^3.0.0" @@ -11126,9 +11050,9 @@ unist-util-inspect@^5.0.0: is-empty "^1.0.0" unist-util-is@^4.0.0: - version "4.0.3" - resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-4.0.3.tgz#e8b44db55fc20c43752b3346c116344d45d7c91d" - integrity sha512-bTofCFVx0iQM8Jqb1TBDVRIQW03YkD3p66JOd/aCWuqzlLyUtx1ZAGw/u+Zw+SttKvSVcvTiKYbfrtLoLefykw== + version "4.0.4" + resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-4.0.4.tgz#3e9e8de6af2eb0039a59f50c9b3e99698a924f50" + integrity sha512-3dF39j/u423v4BBQrk1AQ2Ve1FxY5W3JKwXxVFzBODQ6WEvccguhgp802qQLKSnxPODE6WuRZtV+ohlUg4meBA== unist-util-position@^3.0.0: version "3.1.0" @@ -11200,9 +11124,9 @@ upper-case@^1.1.1: integrity sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg= uri-js@^4.2.2: - version "4.4.0" - resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.0.tgz#aa714261de793e8a82347a7bcc9ce74e86f28602" - integrity sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g== + version "4.4.1" + resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" + integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== dependencies: punycode "^2.1.0" @@ -11247,9 +11171,9 @@ user-home@^1.1.1: integrity sha1-K1viOjK2Onyd640PKNSFcko98ZA= utf-8-validate@^5.0.1: - version "5.0.3" - resolved "https://registry.yarnpkg.com/utf-8-validate/-/utf-8-validate-5.0.3.tgz#3b64e418ad2ff829809025fdfef595eab2f03a27" - integrity sha512-jtJM6fpGv8C1SoH4PtG22pGto6x+Y8uPprW0tw3//gGFhDDTiuksgradgFN6yRayDP4SyZZa6ZMGHLIa17+M8A== + version "5.0.4" + resolved "https://registry.yarnpkg.com/utf-8-validate/-/utf-8-validate-5.0.4.tgz#72a1735983ddf7a05a43a9c6b67c5ce1c910f9b8" + integrity sha512-MEF05cPSq3AwJ2C7B7sHAA6i53vONoZbMGX8My5auEVm6W+dJ2Jd/TZPyGJ5CH42V2XtbI5FD28HeHeqlPzZ3Q== dependencies: node-gyp-build "^4.2.0" @@ -11392,9 +11316,9 @@ vfile-message@^2.0.0: unist-util-stringify-position "^2.0.0" vfile-reporter@^6.0.0: - version "6.0.1" - resolved "https://registry.yarnpkg.com/vfile-reporter/-/vfile-reporter-6.0.1.tgz#45d4dc11df2e312196ea2ceb95e42a67fc8ce814" - integrity sha512-0OppK9mo8G2XUpv+hIKLVSDsoxJrXnOy73+vIm0jQUOUFYRduqpFHX+QqAQfvRHyX9B0UFiRuNJnBOjQCIsw1g== + version "6.0.2" + resolved "https://registry.yarnpkg.com/vfile-reporter/-/vfile-reporter-6.0.2.tgz#cbddaea2eec560f27574ce7b7b269822c191a676" + integrity sha512-GN2bH2gs4eLnw/4jPSgfBjo+XCuvnX9elHICJZjVD4+NM0nsUrMTvdjGY5Sc/XG69XVTgLwj7hknQVc6M9FukA== dependencies: repeat-string "^1.5.0" string-width "^4.0.0" @@ -11414,13 +11338,12 @@ vfile-statistics@^1.1.0: integrity sha512-lXhElVO0Rq3frgPvFBwahmed3X03vjPF8OcjKMy8+F1xU/3Q3QU3tKEDp743SFtb74PdF0UWpxPvtOP0GCLheA== vfile@^4.0.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/vfile/-/vfile-4.2.0.tgz#26c78ac92eb70816b01d4565e003b7e65a2a0e01" - integrity sha512-a/alcwCvtuc8OX92rqqo7PflxiCgXRFjdyoGVuYV+qbgCb0GgZJRvIgCD4+U/Kl1yhaRsaTwksF88xbPyGsgpw== + version "4.2.1" + resolved "https://registry.yarnpkg.com/vfile/-/vfile-4.2.1.tgz#03f1dce28fc625c625bc6514350fbdb00fa9e624" + integrity sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA== dependencies: "@types/unist" "^2.0.0" is-buffer "^2.0.0" - replace-ext "1.0.0" unist-util-stringify-position "^2.0.0" vfile-message "^2.0.0" @@ -11679,17 +11602,10 @@ ws@^6.0.0: dependencies: async-limiter "~1.0.0" -ws@^7.1.2: - version "7.4.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.0.tgz#a5dd76a24197940d4a8bb9e0e152bb4503764da7" - integrity sha512-kyFwXuV/5ymf+IXhS6f0+eAFvydbaBW3zjpT6hUdAh/hbVjTIB5EHBGi0bPoCLSK2wcuz3BrEkB9LrYv1Nm4NQ== - -ws@~6.1.0: - version "6.1.4" - resolved "https://registry.yarnpkg.com/ws/-/ws-6.1.4.tgz#5b5c8800afab925e94ccb29d153c8d02c1776ef9" - integrity sha512-eqZfL+NE/YQc1/ZynhojeV8q+H050oR8AZ2uIev7RU10svA9ZnJUddHcOUZTJLinZ9yEfdA2kSATS2qZK5fhJA== - dependencies: - async-limiter "~1.0.0" +ws@~7.4.2: + version "7.4.2" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.2.tgz#782100048e54eb36fe9843363ab1c68672b261dd" + integrity sha512-T4tewALS3+qsrpGI/8dqNMLIVdq/g/85U98HPMa6F0m6xTbvhXU6RCQLqPH3+SlomNV/LdY6RXEbBpMH6EOJnA== wurl@^2.5.3: version "2.5.4" @@ -11818,9 +11734,9 @@ xtraverse@0.1.x: xmldom "0.1.x" y18n@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b" - integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w== + version "4.0.1" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz#8db2b83c31c5d75099bb890b23f3094891e247d4" + integrity sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ== yallist@^2.1.2: version "2.1.2" @@ -11866,6 +11782,11 @@ yeast@0.1.2: resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419" integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk= +yocto-queue@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" + integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== + zip-stream@^4.0.4: version "4.0.4" resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-4.0.4.tgz#3a8f100b73afaa7d1ae9338d910b321dec77ff3a" diff --git a/pkgs/servers/web-apps/hedgedoc/yarn.nix b/pkgs/servers/web-apps/hedgedoc/yarn.nix index 340341d0f1e..e5184eb04b3 100644 --- a/pkgs/servers/web-apps/hedgedoc/yarn.nix +++ b/pkgs/servers/web-apps/hedgedoc/yarn.nix @@ -10,11 +10,11 @@ }; } { - name = "_azure_ms_rest_js___ms_rest_js_1.9.0.tgz"; + name = "_azure_ms_rest_js___ms_rest_js_1.9.1.tgz"; path = fetchurl { - name = "_azure_ms_rest_js___ms_rest_js_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/@azure/ms-rest-js/-/ms-rest-js-1.9.0.tgz"; - sha1 = "5eb6516cf20e972a2eb4c589d6b48c3151bc801b"; + name = "_azure_ms_rest_js___ms_rest_js_1.9.1.tgz"; + url = "https://registry.yarnpkg.com/@azure/ms-rest-js/-/ms-rest-js-1.9.1.tgz"; + sha1 = "93aef111b00bfdcc470a6bcb4520a13b36f21788"; }; } { @@ -66,35 +66,35 @@ }; } { - name = "_nodelib_fs.scandir___fs.scandir_2.1.3.tgz"; + name = "_nodelib_fs.scandir___fs.scandir_2.1.4.tgz"; path = fetchurl { - name = "_nodelib_fs.scandir___fs.scandir_2.1.3.tgz"; - url = "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz"; - sha1 = "3a582bdb53804c6ba6d146579c46e52130cf4a3b"; + name = "_nodelib_fs.scandir___fs.scandir_2.1.4.tgz"; + url = "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz"; + sha1 = "d4b3549a5db5de2683e0c1071ab4f140904bbf69"; }; } { - name = "_nodelib_fs.stat___fs.stat_2.0.3.tgz"; + name = "_nodelib_fs.stat___fs.stat_2.0.4.tgz"; path = fetchurl { - name = "_nodelib_fs.stat___fs.stat_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz"; - sha1 = "34dc5f4cabbc720f4e60f75a747e7ecd6c175bd3"; + name = "_nodelib_fs.stat___fs.stat_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz"; + sha1 = "a3f2dd61bab43b8db8fa108a121cfffe4c676655"; }; } { - name = "_nodelib_fs.walk___fs.walk_1.2.4.tgz"; + name = "_nodelib_fs.walk___fs.walk_1.2.6.tgz"; path = fetchurl { - name = "_nodelib_fs.walk___fs.walk_1.2.4.tgz"; - url = "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz"; - sha1 = "011b9202a70a6366e436ca5c065844528ab04976"; + name = "_nodelib_fs.walk___fs.walk_1.2.6.tgz"; + url = "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz"; + sha1 = "cce9396b30aa5afe9e3756608f5831adcb53d063"; }; } { - name = "_npmcli_move_file___move_file_1.0.1.tgz"; + name = "_npmcli_move_file___move_file_1.1.0.tgz"; path = fetchurl { - name = "_npmcli_move_file___move_file_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.0.1.tgz"; - sha1 = "de103070dac0f48ce49cf6693c23af59c0f70464"; + name = "_npmcli_move_file___move_file_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.0.tgz"; + sha1 = "4ef8a53d727b9e43facf35404caf55ebf92cfec8"; }; } { @@ -138,11 +138,11 @@ }; } { - name = "_types_connect___connect_3.4.33.tgz"; + name = "_types_connect___connect_3.4.34.tgz"; path = fetchurl { - name = "_types_connect___connect_3.4.33.tgz"; - url = "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.33.tgz"; - sha1 = "31610c901eca573b8713c3330abc6e6b9f588546"; + name = "_types_connect___connect_3.4.34.tgz"; + url = "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.34.tgz"; + sha1 = "170a40223a6d666006d93ca128af2beb1d9b1901"; }; } { @@ -154,19 +154,19 @@ }; } { - name = "_types_express_serve_static_core___express_serve_static_core_4.17.13.tgz"; + name = "_types_express_serve_static_core___express_serve_static_core_4.17.18.tgz"; path = fetchurl { - name = "_types_express_serve_static_core___express_serve_static_core_4.17.13.tgz"; - url = "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.13.tgz"; - sha1 = "d9af025e925fc8b089be37423b8d1eac781be084"; + name = "_types_express_serve_static_core___express_serve_static_core_4.17.18.tgz"; + url = "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.18.tgz"; + sha1 = "8371e260f40e0e1ca0c116a9afcd9426fa094c40"; }; } { - name = "_types_express___express_4.17.9.tgz"; + name = "_types_express___express_4.17.11.tgz"; path = fetchurl { - name = "_types_express___express_4.17.9.tgz"; - url = "https://registry.yarnpkg.com/@types/express/-/express-4.17.9.tgz"; - sha1 = "f5f2df6add703ff28428add52bdec8a1091b0a78"; + name = "_types_express___express_4.17.11.tgz"; + url = "https://registry.yarnpkg.com/@types/express/-/express-4.17.11.tgz"; + sha1 = "debe3caa6f8e5fcda96b47bd54e2f40c4ee59545"; }; } { @@ -218,27 +218,19 @@ }; } { - name = "_types_node___node_14.14.7.tgz"; + name = "_types_node___node_14.14.21.tgz"; path = fetchurl { - name = "_types_node___node_14.14.7.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-14.14.7.tgz"; - sha1 = "8ea1e8f8eae2430cf440564b98c6dfce1ec5945d"; + name = "_types_node___node_14.14.21.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-14.14.21.tgz"; + sha1 = "d934aacc22424fe9622ebf6857370c052eae464e"; }; } { - name = "_types_node___node_12.19.4.tgz"; + name = "_types_node___node_12.19.14.tgz"; path = fetchurl { - name = "_types_node___node_12.19.4.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-12.19.4.tgz"; - sha1 = "cdfbb62e26c7435ed9aab9c941393cc3598e9b46"; - }; - } - { - name = "_types_node___node_14.14.14.tgz"; - path = fetchurl { - name = "_types_node___node_14.14.14.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-14.14.14.tgz"; - sha1 = "f7fd5f3cc8521301119f63910f0fb965c7d761ae"; + name = "_types_node___node_12.19.14.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-12.19.14.tgz"; + sha1 = "59e5029a3c2aea34f68b717955381692fd47cafb"; }; } { @@ -250,11 +242,11 @@ }; } { - name = "_types_passport___passport_1.0.4.tgz"; + name = "_types_passport___passport_1.0.5.tgz"; path = fetchurl { - name = "_types_passport___passport_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/@types/passport/-/passport-1.0.4.tgz"; - sha1 = "1b35c4e197560d3974fa5f71711b6e9cce0711f0"; + name = "_types_passport___passport_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/@types/passport/-/passport-1.0.5.tgz"; + sha1 = "1ff54ec3e30fa6480c5e8b8de949c6dc40ddfa2a"; }; } { @@ -290,11 +282,11 @@ }; } { - name = "_types_serve_static___serve_static_1.13.7.tgz"; + name = "_types_serve_static___serve_static_1.13.8.tgz"; path = fetchurl { - name = "_types_serve_static___serve_static_1.13.7.tgz"; - url = "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.7.tgz"; - sha1 = "e51b51a0becda910f9fd04c718044da69d6c492e"; + name = "_types_serve_static___serve_static_1.13.8.tgz"; + url = "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.8.tgz"; + sha1 = "851129d434433c7082148574ffec263d58309c46"; }; } { @@ -338,19 +330,19 @@ }; } { - name = "_types_webpack_sources___webpack_sources_2.0.0.tgz"; + name = "_types_webpack_sources___webpack_sources_2.1.0.tgz"; path = fetchurl { - name = "_types_webpack_sources___webpack_sources_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-2.0.0.tgz"; - sha1 = "08216ab9be2be2e1499beaebc4d469cec81e82a7"; + name = "_types_webpack_sources___webpack_sources_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-2.1.0.tgz"; + sha1 = "8882b0bd62d1e0ce62f183d0d01b72e6e82e8c10"; }; } { - name = "_types_webpack___webpack_4.41.25.tgz"; + name = "_types_webpack___webpack_4.41.26.tgz"; path = fetchurl { - name = "_types_webpack___webpack_4.41.25.tgz"; - url = "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.25.tgz"; - sha1 = "4d3b5aecc4e44117b376280fbfd2dc36697968c4"; + name = "_types_webpack___webpack_4.41.26.tgz"; + url = "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.26.tgz"; + sha1 = "27a30d7d531e16489f9c7607c747be6bc1a459ef"; }; } { @@ -778,11 +770,11 @@ }; } { - name = "archiver___archiver_5.1.0.tgz"; + name = "archiver___archiver_5.2.0.tgz"; path = fetchurl { - name = "archiver___archiver_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/archiver/-/archiver-5.1.0.tgz"; - sha1 = "05b0f6f7836f3e6356a0532763d2bb91017a7e37"; + name = "archiver___archiver_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/archiver/-/archiver-5.2.0.tgz"; + sha1 = "25aa1b3d9febf7aec5b0f296e77e69960c26db94"; }; } { @@ -850,11 +842,11 @@ }; } { - name = "array_includes___array_includes_3.1.1.tgz"; + name = "array_includes___array_includes_3.1.2.tgz"; path = fetchurl { - name = "array_includes___array_includes_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz"; - sha1 = "cdd67e6852bdf9c1215460786732255ed2459348"; + name = "array_includes___array_includes_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.2.tgz"; + sha1 = "a8db03e0b88c8c6aeddc49cb132f9bcab4ebf9c8"; }; } { @@ -882,11 +874,11 @@ }; } { - name = "array.prototype.flat___array.prototype.flat_1.2.3.tgz"; + name = "array.prototype.flat___array.prototype.flat_1.2.4.tgz"; path = fetchurl { - name = "array.prototype.flat___array.prototype.flat_1.2.3.tgz"; - url = "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz"; - sha1 = "0de82b426b0318dbfdb940089e38b043d37f6c7b"; + name = "array.prototype.flat___array.prototype.flat_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz"; + sha1 = "6ef638b43312bd401b4c6199fdec7e2dc9e9a123"; }; } { @@ -1026,11 +1018,11 @@ }; } { - name = "aws_sdk___aws_sdk_2.817.0.tgz"; + name = "aws_sdk___aws_sdk_2.828.0.tgz"; path = fetchurl { - name = "aws_sdk___aws_sdk_2.817.0.tgz"; - url = "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.817.0.tgz"; - sha1 = "3a97b690b0ec494cf8ee927affb3973cf26abcc8"; + name = "aws_sdk___aws_sdk_2.828.0.tgz"; + url = "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.828.0.tgz"; + sha1 = "6aa599c3582f219568f41fb287eb65753e4a9234"; }; } { @@ -1050,11 +1042,11 @@ }; } { - name = "axios___axios_0.19.2.tgz"; + name = "axios___axios_0.21.1.tgz"; path = fetchurl { - name = "axios___axios_0.19.2.tgz"; - url = "https://registry.yarnpkg.com/axios/-/axios-0.19.2.tgz"; - sha1 = "3ea36c5d8818d0d5f8a8a97a6d36b86cdc00cb27"; + name = "axios___axios_0.21.1.tgz"; + url = "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz"; + sha1 = "22563481962f4d6bde9a76d516ef0e5d3c09b2b8"; }; } { @@ -1562,14 +1554,6 @@ }; } { - name = "base64_arraybuffer___base64_arraybuffer_0.1.5.tgz"; - path = fetchurl { - name = "base64_arraybuffer___base64_arraybuffer_0.1.5.tgz"; - url = "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz"; - sha1 = "73926771923b5a19747ad666aa5cd4bf9c6e9ce8"; - }; - } - { name = "base64_js___base64_js_1.5.1.tgz"; path = fetchurl { name = "base64_js___base64_js_1.5.1.tgz"; @@ -1626,14 +1610,6 @@ }; } { - name = "better_assert___better_assert_1.0.2.tgz"; - path = fetchurl { - name = "better_assert___better_assert_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/better-assert/-/better-assert-1.0.2.tgz"; - sha1 = "40866b9e1b9e0b55b481894311e68faffaebc522"; - }; - } - { name = "big.js___big.js_5.2.2.tgz"; path = fetchurl { name = "big.js___big.js_5.2.2.tgz"; @@ -1650,11 +1626,11 @@ }; } { - name = "binary_extensions___binary_extensions_2.1.0.tgz"; + name = "binary_extensions___binary_extensions_2.2.0.tgz"; path = fetchurl { - name = "binary_extensions___binary_extensions_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.1.0.tgz"; - sha1 = "30fa40c9e7fe07dbc895678cd287024dea241dd9"; + name = "binary_extensions___binary_extensions_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz"; + sha1 = "75f502eeaf9ffde42fc98829645be4ea76bd9e2d"; }; } { @@ -1882,11 +1858,11 @@ }; } { - name = "browserslist___browserslist_4.14.7.tgz"; + name = "browserslist___browserslist_4.16.1.tgz"; path = fetchurl { - name = "browserslist___browserslist_4.14.7.tgz"; - url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.7.tgz"; - sha1 = "c071c1b3622c1c2e790799a37bb09473a4351cb6"; + name = "browserslist___browserslist_4.16.1.tgz"; + url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.1.tgz"; + sha1 = "bf757a2da376b3447b800a16f0f1c96358138766"; }; } { @@ -1946,11 +1922,11 @@ }; } { - name = "bufferutil___bufferutil_4.0.2.tgz"; + name = "bufferutil___bufferutil_4.0.3.tgz"; path = fetchurl { - name = "bufferutil___bufferutil_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/bufferutil/-/bufferutil-4.0.2.tgz"; - sha1 = "79f68631910f6b993d870fc77dc0a2894eb96cd5"; + name = "bufferutil___bufferutil_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/bufferutil/-/bufferutil-4.0.3.tgz"; + sha1 = "66724b756bed23cd7c28c4d306d7994f9943cc6b"; }; } { @@ -1962,11 +1938,11 @@ }; } { - name = "bunyan___bunyan_1.8.14.tgz"; + name = "bunyan___bunyan_1.8.15.tgz"; path = fetchurl { - name = "bunyan___bunyan_1.8.14.tgz"; - url = "https://registry.yarnpkg.com/bunyan/-/bunyan-1.8.14.tgz"; - sha1 = "3d8c1afea7de158a5238c7cb8a66ab6b38dd45b4"; + name = "bunyan___bunyan_1.8.15.tgz"; + url = "https://registry.yarnpkg.com/bunyan/-/bunyan-1.8.15.tgz"; + sha1 = "8ce34ca908a17d0776576ca1b2f6cbd916e93b46"; }; } { @@ -2010,11 +1986,11 @@ }; } { - name = "call_bind___call_bind_1.0.0.tgz"; + name = "call_bind___call_bind_1.0.2.tgz"; path = fetchurl { - name = "call_bind___call_bind_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.0.tgz"; - sha1 = "24127054bb3f9bdcb4b1fb82418186072f77b8ce"; + name = "call_bind___call_bind_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz"; + sha1 = "b1d4e89e688119c3c9a903ad30abb2f6a919be3c"; }; } { @@ -2034,14 +2010,6 @@ }; } { - name = "callsite___callsite_1.0.0.tgz"; - path = fetchurl { - name = "callsite___callsite_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz"; - sha1 = "280398e5d664bd74038b6f0905153e6e8af1bc20"; - }; - } - { name = "callsites___callsites_2.0.0.tgz"; path = fetchurl { name = "callsites___callsites_2.0.0.tgz"; @@ -2066,11 +2034,11 @@ }; } { - name = "camel_case___camel_case_4.1.1.tgz"; + name = "camel_case___camel_case_4.1.2.tgz"; path = fetchurl { - name = "camel_case___camel_case_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.1.tgz"; - sha1 = "1fc41c854f00e2f7d0139dfeba1542d6896fe547"; + name = "camel_case___camel_case_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.2.tgz"; + sha1 = "9728072a954f805228225a6deea6b38461e1bd5a"; }; } { @@ -2098,11 +2066,11 @@ }; } { - name = "caniuse_lite___caniuse_lite_1.0.30001157.tgz"; + name = "caniuse_lite___caniuse_lite_1.0.30001177.tgz"; path = fetchurl { - name = "caniuse_lite___caniuse_lite_1.0.30001157.tgz"; - url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001157.tgz"; - sha1 = "2d11aaeb239b340bc1aa730eca18a37fdb07a9ab"; + name = "caniuse_lite___caniuse_lite_1.0.30001177.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001177.tgz"; + sha1 = "2c3b384933aafda03e29ccca7bb3d8c3389e1ece"; }; } { @@ -2226,11 +2194,11 @@ }; } { - name = "chokidar___chokidar_3.4.3.tgz"; + name = "chokidar___chokidar_3.5.0.tgz"; path = fetchurl { - name = "chokidar___chokidar_3.4.3.tgz"; - url = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.3.tgz"; - sha1 = "c1df38231448e45ca4ac588e6c79573ba6a57d5b"; + name = "chokidar___chokidar_3.5.0.tgz"; + url = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.0.tgz"; + sha1 = "458a4816a415e9d3b3caa4faec2b96a6935a9e65"; }; } { @@ -2706,14 +2674,6 @@ }; } { - name = "cookie___cookie_0.3.1.tgz"; - path = fetchurl { - name = "cookie___cookie_0.3.1.tgz"; - url = "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz"; - sha1 = "e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"; - }; - } - { name = "cookie___cookie_0.4.0.tgz"; path = fetchurl { name = "cookie___cookie_0.4.0.tgz"; @@ -2770,11 +2730,11 @@ }; } { - name = "core_js___core_js_2.6.11.tgz"; + name = "core_js___core_js_2.6.12.tgz"; path = fetchurl { - name = "core_js___core_js_2.6.11.tgz"; - url = "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz"; - sha1 = "38831469f9922bded8ee21c9dc46985e0399308c"; + name = "core_js___core_js_2.6.12.tgz"; + url = "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz"; + sha1 = "d9333dfa7b065e347cc5682219d6f690859cc2ec"; }; } { @@ -2890,14 +2850,6 @@ }; } { - name = "css_select___css_select_1.2.0.tgz"; - path = fetchurl { - name = "css_select___css_select_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz"; - sha1 = "2b3a110539c5355f1cd8d314623e870b121ec858"; - }; - } - { name = "css_select___css_select_2.1.0.tgz"; path = fetchurl { name = "css_select___css_select_2.1.0.tgz"; @@ -2906,6 +2858,14 @@ }; } { + name = "css_select___css_select_1.2.0.tgz"; + path = fetchurl { + name = "css_select___css_select_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz"; + sha1 = "2b3a110539c5355f1cd8d314623e870b121ec858"; + }; + } + { name = "css_tree___css_tree_1.0.0_alpha.37.tgz"; path = fetchurl { name = "css_tree___css_tree_1.0.0_alpha.37.tgz"; @@ -2914,11 +2874,11 @@ }; } { - name = "css_tree___css_tree_1.0.1.tgz"; + name = "css_tree___css_tree_1.1.2.tgz"; path = fetchurl { - name = "css_tree___css_tree_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.1.tgz"; - sha1 = "7726678dfe2a57993a018d9dce519bf1760e3b6d"; + name = "css_tree___css_tree_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.2.tgz"; + sha1 = "9ae393b5dafd7dae8a622475caec78d3d8fbd7b5"; }; } { @@ -3002,11 +2962,11 @@ }; } { - name = "csso___csso_4.1.0.tgz"; + name = "csso___csso_4.2.0.tgz"; path = fetchurl { - name = "csso___csso_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/csso/-/csso-4.1.0.tgz"; - sha1 = "1d31193efa99b87aa6bad6c0cef155e543d09e8b"; + name = "csso___csso_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/csso/-/csso-4.2.0.tgz"; + sha1 = "ea3a561346e8dc9f546d6febedd50187cf389529"; }; } { @@ -3378,19 +3338,11 @@ }; } { - name = "debug___debug_3.2.6.tgz"; - path = fetchurl { - name = "debug___debug_3.2.6.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz"; - sha1 = "e83d17de16d8a7efb7717edbe5fb10135eee629b"; - }; - } - { - name = "debug___debug_4.2.0.tgz"; + name = "debug___debug_3.2.7.tgz"; path = fetchurl { - name = "debug___debug_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz"; - sha1 = "7f150f93920e94c58f5574c2fd01a3110effe7f1"; + name = "debug___debug_3.2.7.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz"; + sha1 = "72580b7e9145fb39b6676f9c5e5fb100b934179a"; }; } { @@ -3522,11 +3474,11 @@ }; } { - name = "denque___denque_1.4.1.tgz"; + name = "denque___denque_1.5.0.tgz"; path = fetchurl { - name = "denque___denque_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/denque/-/denque-1.4.1.tgz"; - sha1 = "6744ff7641c148c3f8a69c307e51235c1f4a37cf"; + name = "denque___denque_1.5.0.tgz"; + url = "https://registry.yarnpkg.com/denque/-/denque-1.5.0.tgz"; + sha1 = "773de0686ff2d8ec2ff92914316a47b73b1c73de"; }; } { @@ -3682,11 +3634,11 @@ }; } { - name = "domelementtype___domelementtype_2.0.2.tgz"; + name = "domelementtype___domelementtype_2.1.0.tgz"; path = fetchurl { - name = "domelementtype___domelementtype_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.0.2.tgz"; - sha1 = "f3b6e549201e46f588b59463dd77187131fe6971"; + name = "domelementtype___domelementtype_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.1.0.tgz"; + sha1 = "a851c080a6d1c3d94344aed151d99f669edf585e"; }; } { @@ -3730,11 +3682,11 @@ }; } { - name = "dot_case___dot_case_3.0.3.tgz"; + name = "dot_case___dot_case_3.0.4.tgz"; path = fetchurl { - name = "dot_case___dot_case_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.3.tgz"; - sha1 = "21d3b52efaaba2ea5fda875bb1aa8124521cf4aa"; + name = "dot_case___dot_case_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz"; + sha1 = "9b2b670d00a431667a8a75ba29cd1b98809ce751"; }; } { @@ -3810,11 +3762,11 @@ }; } { - name = "electron_to_chromium___electron_to_chromium_1.3.596.tgz"; + name = "electron_to_chromium___electron_to_chromium_1.3.639.tgz"; path = fetchurl { - name = "electron_to_chromium___electron_to_chromium_1.3.596.tgz"; - url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.596.tgz"; - sha1 = "c7ed98512c7ff36ddcbfed9e54e6355335c35257"; + name = "electron_to_chromium___electron_to_chromium_1.3.639.tgz"; + url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.639.tgz"; + sha1 = "0a27e3018ae3acf438a14a1dd4e41db4b8ab764e"; }; } { @@ -3882,11 +3834,11 @@ }; } { - name = "engine.io_client___engine.io_client_3.4.4.tgz"; + name = "engine.io_client___engine.io_client_3.5.0.tgz"; path = fetchurl { - name = "engine.io_client___engine.io_client_3.4.4.tgz"; - url = "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.4.4.tgz"; - sha1 = "77d8003f502b0782dd792b073a4d2cf7ca5ab967"; + name = "engine.io_client___engine.io_client_3.5.0.tgz"; + url = "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.5.0.tgz"; + sha1 = "fc1b4d9616288ce4f2daf06dcf612413dec941c7"; }; } { @@ -3898,19 +3850,19 @@ }; } { - name = "engine.io___engine.io_3.4.2.tgz"; + name = "engine.io___engine.io_3.5.0.tgz"; path = fetchurl { - name = "engine.io___engine.io_3.4.2.tgz"; - url = "https://registry.yarnpkg.com/engine.io/-/engine.io-3.4.2.tgz"; - sha1 = "8fc84ee00388e3e228645e0a7d3dfaeed5bd122c"; + name = "engine.io___engine.io_3.5.0.tgz"; + url = "https://registry.yarnpkg.com/engine.io/-/engine.io-3.5.0.tgz"; + sha1 = "9d6b985c8a39b1fe87cd91eb014de0552259821b"; }; } { - name = "enhanced_resolve___enhanced_resolve_4.3.0.tgz"; + name = "enhanced_resolve___enhanced_resolve_4.5.0.tgz"; path = fetchurl { - name = "enhanced_resolve___enhanced_resolve_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz"; - sha1 = "3b806f3bfafc1ec7de69551ef93cca46c1704126"; + name = "enhanced_resolve___enhanced_resolve_4.5.0.tgz"; + url = "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz"; + sha1 = "2f3cfd84dbe3b487f18f2db2ef1e064a571ca5ec"; }; } { @@ -3946,11 +3898,11 @@ }; } { - name = "errno___errno_0.1.7.tgz"; + name = "errno___errno_0.1.8.tgz"; path = fetchurl { - name = "errno___errno_0.1.7.tgz"; - url = "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz"; - sha1 = "4684d71779ad39af177e3f007996f7c67c852618"; + name = "errno___errno_0.1.8.tgz"; + url = "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz"; + sha1 = "8bb3e9c7d463be4976ff888f76b4809ebc2e811f"; }; } { @@ -4458,11 +4410,11 @@ }; } { - name = "fastq___fastq_1.9.0.tgz"; + name = "fastq___fastq_1.10.0.tgz"; path = fetchurl { - name = "fastq___fastq_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/fastq/-/fastq-1.9.0.tgz"; - sha1 = "e16a72f338eaca48e91b5c23593bcc2ef66b7947"; + name = "fastq___fastq_1.10.0.tgz"; + url = "https://registry.yarnpkg.com/fastq/-/fastq-1.10.0.tgz"; + sha1 = "74dbefccade964932cdf500473ef302719c652bb"; }; } { @@ -4538,11 +4490,11 @@ }; } { - name = "file_type___file_type_16.1.0.tgz"; + name = "file_type___file_type_16.2.0.tgz"; path = fetchurl { - name = "file_type___file_type_16.1.0.tgz"; - url = "https://registry.yarnpkg.com/file-type/-/file-type-16.1.0.tgz"; - sha1 = "1c8a4458b2103e07d2b49ae7f76384abafe86529"; + name = "file_type___file_type_16.2.0.tgz"; + url = "https://registry.yarnpkg.com/file-type/-/file-type-16.2.0.tgz"; + sha1 = "d4f1da71ddda758db7f15f93adfaed09ce9e2715"; }; } { @@ -4690,11 +4642,11 @@ }; } { - name = "follow_redirects___follow_redirects_1.5.10.tgz"; + name = "follow_redirects___follow_redirects_1.13.1.tgz"; path = fetchurl { - name = "follow_redirects___follow_redirects_1.5.10.tgz"; - url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz"; - sha1 = "7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a"; + name = "follow_redirects___follow_redirects_1.13.1.tgz"; + url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.1.tgz"; + sha1 = "5f69b813376cee4fd0474a3aba835df04ab763b7"; }; } { @@ -4874,11 +4826,11 @@ }; } { - name = "fsevents___fsevents_2.1.3.tgz"; + name = "fsevents___fsevents_2.3.1.tgz"; path = fetchurl { - name = "fsevents___fsevents_2.1.3.tgz"; - url = "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz"; - sha1 = "fb738703ae8d2f9fe900c33836ddebee8b97f23e"; + name = "fsevents___fsevents_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.1.tgz"; + sha1 = "b209ab14c61012636c8863507edf7fb68cc54e9f"; }; } { @@ -4930,11 +4882,11 @@ }; } { - name = "get_intrinsic___get_intrinsic_1.0.1.tgz"; + name = "get_intrinsic___get_intrinsic_1.0.2.tgz"; path = fetchurl { - name = "get_intrinsic___get_intrinsic_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.0.1.tgz"; - sha1 = "94a9768fcbdd0595a1c9273aacf4c89d075631be"; + name = "get_intrinsic___get_intrinsic_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.0.2.tgz"; + sha1 = "6820da226e50b24894e08859469dc68361545d49"; }; } { @@ -5066,11 +5018,11 @@ }; } { - name = "globby___globby_11.0.1.tgz"; + name = "globby___globby_11.0.2.tgz"; path = fetchurl { - name = "globby___globby_11.0.1.tgz"; - url = "https://registry.yarnpkg.com/globby/-/globby-11.0.1.tgz"; - sha1 = "9a2bf107a068f3ffeabc49ad702c79ede8cfd357"; + name = "globby___globby_11.0.2.tgz"; + url = "https://registry.yarnpkg.com/globby/-/globby-11.0.2.tgz"; + sha1 = "1af538b766a3b540ebfb58a32b2e2d5897321d83"; }; } { @@ -5578,11 +5530,11 @@ }; } { - name = "import_fresh___import_fresh_3.2.2.tgz"; + name = "import_fresh___import_fresh_3.3.0.tgz"; path = fetchurl { - name = "import_fresh___import_fresh_3.2.2.tgz"; - url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.2.tgz"; - sha1 = "fc129c160c5d68235507f4331a6baad186bdbc3e"; + name = "import_fresh___import_fresh_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz"; + sha1 = "37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"; }; } { @@ -5682,11 +5634,11 @@ }; } { - name = "ini___ini_1.3.5.tgz"; + name = "ini___ini_1.3.8.tgz"; path = fetchurl { - name = "ini___ini_1.3.5.tgz"; - url = "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz"; - sha1 = "eee25f56db1c9ec6085e0c22778083f596abf927"; + name = "ini___ini_1.3.8.tgz"; + url = "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz"; + sha1 = "a29da425b48806f34767a4efce397269af28432c"; }; } { @@ -5778,11 +5730,11 @@ }; } { - name = "is_arguments___is_arguments_1.0.4.tgz"; + name = "is_arguments___is_arguments_1.1.0.tgz"; path = fetchurl { - name = "is_arguments___is_arguments_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.0.4.tgz"; - sha1 = "3faf966c7cba0ff437fb31f6250082fcf0448cf3"; + name = "is_arguments___is_arguments_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.0.tgz"; + sha1 = "62353031dfbee07ceb34656a6bde59efecae8dd9"; }; } { @@ -6042,11 +5994,11 @@ }; } { - name = "is_negative_zero___is_negative_zero_2.0.0.tgz"; + name = "is_negative_zero___is_negative_zero_2.0.1.tgz"; path = fetchurl { - name = "is_negative_zero___is_negative_zero_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.0.tgz"; - sha1 = "9553b121b0fac28869da9ed459e20c7543788461"; + name = "is_negative_zero___is_negative_zero_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz"; + sha1 = "3de746c18dda2319241a53675908d8f766f11c24"; }; } { @@ -6330,11 +6282,11 @@ }; } { - name = "js_beautify___js_beautify_1.13.0.tgz"; + name = "js_beautify___js_beautify_1.13.4.tgz"; path = fetchurl { - name = "js_beautify___js_beautify_1.13.0.tgz"; - url = "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.13.0.tgz"; - sha1 = "a056d5d3acfd4918549aae3ab039f9f3c51eebb2"; + name = "js_beautify___js_beautify_1.13.4.tgz"; + url = "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.13.4.tgz"; + sha1 = "1cad80b9e89cfc455b3a14f0eaf4dc10b6ae1206"; }; } { @@ -6378,14 +6330,6 @@ }; } { - name = "js_yaml___js_yaml_3.14.0.tgz"; - path = fetchurl { - name = "js_yaml___js_yaml_3.14.0.tgz"; - url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz"; - sha1 = "a7a34170f26a21bb162424d8adacb4113a69e482"; - }; - } - { name = "js_yaml___js_yaml_3.14.1.tgz"; path = fetchurl { name = "js_yaml___js_yaml_3.14.1.tgz"; @@ -6586,11 +6530,11 @@ }; } { - name = "khroma___khroma_1.1.0.tgz"; + name = "khroma___khroma_1.2.0.tgz"; path = fetchurl { - name = "khroma___khroma_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/khroma/-/khroma-1.1.0.tgz"; - sha1 = "cc17723eb719c5245ea66d23dd577d5695452db5"; + name = "khroma___khroma_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/khroma/-/khroma-1.2.0.tgz"; + sha1 = "46dcc9d7533923c228b51724db108f11fec108d8"; }; } { @@ -6994,11 +6938,11 @@ }; } { - name = "lower_case___lower_case_2.0.1.tgz"; + name = "lower_case___lower_case_2.0.2.tgz"; path = fetchurl { - name = "lower_case___lower_case_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.1.tgz"; - sha1 = "39eeb36e396115cc05e29422eaea9e692c9408c7"; + name = "lower_case___lower_case_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.2.tgz"; + sha1 = "6fa237c63dbdc4a82ca0fd882e4722dc5e634e28"; }; } { @@ -7338,11 +7282,11 @@ }; } { - name = "mdn_data___mdn_data_2.0.12.tgz"; + name = "mdn_data___mdn_data_2.0.14.tgz"; path = fetchurl { - name = "mdn_data___mdn_data_2.0.12.tgz"; - url = "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.12.tgz"; - sha1 = "bbb658d08b38f574bbb88f7b83703defdcc46844"; + name = "mdn_data___mdn_data_2.0.14.tgz"; + url = "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz"; + sha1 = "7113fc4281917d63ce29b43446f701e68c25ba50"; }; } { @@ -7370,11 +7314,11 @@ }; } { - name = "memoizee___memoizee_0.4.14.tgz"; + name = "memoizee___memoizee_0.4.15.tgz"; path = fetchurl { - name = "memoizee___memoizee_0.4.14.tgz"; - url = "https://registry.yarnpkg.com/memoizee/-/memoizee-0.4.14.tgz"; - sha1 = "07a00f204699f9a95c2d9e77218271c7cd610d57"; + name = "memoizee___memoizee_0.4.15.tgz"; + url = "https://registry.yarnpkg.com/memoizee/-/memoizee-0.4.15.tgz"; + sha1 = "e6f3d2da863f318d02225391829a6c5956555b72"; }; } { @@ -7506,14 +7450,6 @@ }; } { - name = "mime_db___mime_db_1.44.0.tgz"; - path = fetchurl { - name = "mime_db___mime_db_1.44.0.tgz"; - url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz"; - sha1 = "fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"; - }; - } - { name = "mime_db___mime_db_1.45.0.tgz"; path = fetchurl { name = "mime_db___mime_db_1.45.0.tgz"; @@ -7522,11 +7458,11 @@ }; } { - name = "mime_types___mime_types_2.1.27.tgz"; + name = "mime_types___mime_types_2.1.28.tgz"; path = fetchurl { - name = "mime_types___mime_types_2.1.27.tgz"; - url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz"; - sha1 = "47949f98e279ea53119f5722e0f34e529bec009f"; + name = "mime_types___mime_types_2.1.28.tgz"; + url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.28.tgz"; + sha1 = "1160c4757eab2c5363888e005273ecf79d2a0ecd"; }; } { @@ -7546,11 +7482,11 @@ }; } { - name = "mime___mime_2.4.6.tgz"; + name = "mime___mime_2.4.7.tgz"; path = fetchurl { - name = "mime___mime_2.4.6.tgz"; - url = "https://registry.yarnpkg.com/mime/-/mime-2.4.6.tgz"; - sha1 = "e5b407c90db442f2beb5b162373d07b69affa4d1"; + name = "mime___mime_2.4.7.tgz"; + url = "https://registry.yarnpkg.com/mime/-/mime-2.4.7.tgz"; + sha1 = "962aed9be0ed19c91fd7dc2ece5d7f4e89a90d74"; }; } { @@ -7802,11 +7738,19 @@ }; } { - name = "mustache___mustache_4.0.1.tgz"; + name = "ms___ms_2.1.3.tgz"; + path = fetchurl { + name = "ms___ms_2.1.3.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz"; + sha1 = "574c8138ce1d2b5861f0b44579dbadd60c6615b2"; + }; + } + { + name = "mustache___mustache_4.1.0.tgz"; path = fetchurl { - name = "mustache___mustache_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/mustache/-/mustache-4.0.1.tgz"; - sha1 = "d99beb031701ad433338e7ea65e0489416c854a2"; + name = "mustache___mustache_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/mustache/-/mustache-4.1.0.tgz"; + sha1 = "8c1b042238a982d2eb2d30efc6c14296ae3f699d"; }; } { @@ -7898,11 +7842,11 @@ }; } { - name = "needle___needle_2.5.2.tgz"; + name = "needle___needle_2.6.0.tgz"; path = fetchurl { - name = "needle___needle_2.5.2.tgz"; - url = "https://registry.yarnpkg.com/needle/-/needle-2.5.2.tgz"; - sha1 = "cf1a8fce382b5a280108bba90a14993c00e4010a"; + name = "needle___needle_2.6.0.tgz"; + url = "https://registry.yarnpkg.com/needle/-/needle-2.6.0.tgz"; + sha1 = "24dbb55f2509e2324b4a99d61f413982013ccdbe"; }; } { @@ -7954,11 +7898,11 @@ }; } { - name = "no_case___no_case_3.0.3.tgz"; + name = "no_case___no_case_3.0.4.tgz"; path = fetchurl { - name = "no_case___no_case_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/no-case/-/no-case-3.0.3.tgz"; - sha1 = "c21b434c1ffe48b39087e86cfb4d2582e9df18f8"; + name = "no_case___no_case_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz"; + sha1 = "d361fd5c9800f558551a8369fc0dcd4662b6124d"; }; } { @@ -8002,11 +7946,11 @@ }; } { - name = "node_releases___node_releases_1.1.66.tgz"; + name = "node_releases___node_releases_1.1.69.tgz"; path = fetchurl { - name = "node_releases___node_releases_1.1.66.tgz"; - url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.66.tgz"; - sha1 = "609bd0dc069381015cd982300bae51ab4f1b1814"; + name = "node_releases___node_releases_1.1.69.tgz"; + url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.69.tgz"; + sha1 = "3149dbde53b781610cd8b486d62d86e26c3725f6"; }; } { @@ -8162,14 +8106,6 @@ }; } { - name = "object_component___object_component_0.0.3.tgz"; - path = fetchurl { - name = "object_component___object_component_0.0.3.tgz"; - url = "https://registry.yarnpkg.com/object-component/-/object-component-0.0.3.tgz"; - sha1 = "f0c69aa50efc95b866c186f400a33769cb2f1291"; - }; - } - { name = "object_copy___object_copy_0.1.0.tgz"; path = fetchurl { name = "object_copy___object_copy_0.1.0.tgz"; @@ -8178,19 +8114,19 @@ }; } { - name = "object_inspect___object_inspect_1.8.0.tgz"; + name = "object_inspect___object_inspect_1.9.0.tgz"; path = fetchurl { - name = "object_inspect___object_inspect_1.8.0.tgz"; - url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz"; - sha1 = "df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0"; + name = "object_inspect___object_inspect_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.9.0.tgz"; + sha1 = "c90521d74e1127b67266ded3394ad6116986533a"; }; } { - name = "object_is___object_is_1.1.3.tgz"; + name = "object_is___object_is_1.1.4.tgz"; path = fetchurl { - name = "object_is___object_is_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/object-is/-/object-is-1.1.3.tgz"; - sha1 = "2e3b9e65560137455ee3bd62aec4d90a2ea1cc81"; + name = "object_is___object_is_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/object-is/-/object-is-1.1.4.tgz"; + sha1 = "63d6c83c00a43f4cbc9434eb9757c8a5b8565068"; }; } { @@ -8218,11 +8154,11 @@ }; } { - name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.1.0.tgz"; + name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.1.1.tgz"; path = fetchurl { - name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz"; - sha1 = "369bf1f9592d8ab89d712dced5cb81c7c5352649"; + name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.1.tgz"; + sha1 = "0dfda8d108074d9c563e80490c883b6661091544"; }; } { @@ -8242,11 +8178,11 @@ }; } { - name = "object.values___object.values_1.1.1.tgz"; + name = "object.values___object.values_1.1.2.tgz"; path = fetchurl { - name = "object.values___object.values_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz"; - sha1 = "68a99ecde356b7e9295a3c5e0ce31dc8c953de5e"; + name = "object.values___object.values_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/object.values/-/object.values-1.1.2.tgz"; + sha1 = "7a2015e06fcb0f546bd652486ce8583a4731c731"; }; } { @@ -8370,11 +8306,11 @@ }; } { - name = "p_limit___p_limit_3.0.2.tgz"; + name = "p_limit___p_limit_3.1.0.tgz"; path = fetchurl { - name = "p_limit___p_limit_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/p-limit/-/p-limit-3.0.2.tgz"; - sha1 = "1664e010af3cadc681baafd3e2a437be7b0fb5fe"; + name = "p_limit___p_limit_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz"; + sha1 = "e1daccbe78d0d1388ca18c64fea38e3e57e3706b"; }; } { @@ -8458,11 +8394,11 @@ }; } { - name = "param_case___param_case_3.0.3.tgz"; + name = "param_case___param_case_3.0.4.tgz"; path = fetchurl { - name = "param_case___param_case_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/param-case/-/param-case-3.0.3.tgz"; - sha1 = "4be41f8399eff621c56eebb829a5e451d9801238"; + name = "param_case___param_case_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/param-case/-/param-case-3.0.4.tgz"; + sha1 = "7d17fe4aa12bde34d4a77d91acfb6219caad01c5"; }; } { @@ -8538,14 +8474,6 @@ }; } { - name = "parseqs___parseqs_0.0.5.tgz"; - path = fetchurl { - name = "parseqs___parseqs_0.0.5.tgz"; - url = "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.5.tgz"; - sha1 = "d5208a3738e46766e291ba2ea173684921a8b89d"; - }; - } - { name = "parseqs___parseqs_0.0.6.tgz"; path = fetchurl { name = "parseqs___parseqs_0.0.6.tgz"; @@ -8554,14 +8482,6 @@ }; } { - name = "parseuri___parseuri_0.0.5.tgz"; - path = fetchurl { - name = "parseuri___parseuri_0.0.5.tgz"; - url = "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.5.tgz"; - sha1 = "80204a50d4dbb779bfdc6ebe2778d90e4bce320a"; - }; - } - { name = "parseuri___parseuri_0.0.6.tgz"; path = fetchurl { name = "parseuri___parseuri_0.0.6.tgz"; @@ -8578,11 +8498,11 @@ }; } { - name = "pascal_case___pascal_case_3.1.1.tgz"; + name = "pascal_case___pascal_case_3.1.2.tgz"; path = fetchurl { - name = "pascal_case___pascal_case_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.1.tgz"; - sha1 = "5ac1975133ed619281e88920973d2cd1f279de5f"; + name = "pascal_case___pascal_case_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.2.tgz"; + sha1 = "b48e0ef2b98e205e7c1dae747d0b1508237660eb"; }; } { @@ -8826,11 +8746,11 @@ }; } { - name = "peek_readable___peek_readable_3.1.0.tgz"; + name = "peek_readable___peek_readable_3.1.3.tgz"; path = fetchurl { - name = "peek_readable___peek_readable_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/peek-readable/-/peek-readable-3.1.0.tgz"; - sha1 = "250b08b7de09db8573d7fd8ea475215bbff14348"; + name = "peek_readable___peek_readable_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/peek-readable/-/peek-readable-3.1.3.tgz"; + sha1 = "932480d46cf6aa553c46c68566c4fb69a82cd2b1"; }; } { @@ -9378,11 +9298,11 @@ }; } { - name = "prismjs___prismjs_1.22.0.tgz"; + name = "prismjs___prismjs_1.23.0.tgz"; path = fetchurl { - name = "prismjs___prismjs_1.22.0.tgz"; - url = "https://registry.yarnpkg.com/prismjs/-/prismjs-1.22.0.tgz"; - sha1 = "73c3400afc58a823dd7eed023f8e1ce9fd8977fa"; + name = "prismjs___prismjs_1.23.0.tgz"; + url = "https://registry.yarnpkg.com/prismjs/-/prismjs-1.23.0.tgz"; + sha1 = "d3b3967f7d72440690497652a9d40ff046067f33"; }; } { @@ -9730,11 +9650,11 @@ }; } { - name = "readable_web_to_node_stream___readable_web_to_node_stream_3.0.0.tgz"; + name = "readable_web_to_node_stream___readable_web_to_node_stream_3.0.1.tgz"; path = fetchurl { - name = "readable_web_to_node_stream___readable_web_to_node_stream_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.0.tgz"; - sha1 = "4ca5408e70471069119d691934141a52de413955"; + name = "readable_web_to_node_stream___readable_web_to_node_stream_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.1.tgz"; + sha1 = "3f619b1bc5dd73a4cfe5c5f9b4f6faba55dff845"; }; } { @@ -10298,11 +10218,11 @@ }; } { - name = "renderkid___renderkid_2.0.4.tgz"; + name = "renderkid___renderkid_2.0.5.tgz"; path = fetchurl { - name = "renderkid___renderkid_2.0.4.tgz"; - url = "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.4.tgz"; - sha1 = "d325e532afb28d3f8796ffee306be8ffd6fc864c"; + name = "renderkid___renderkid_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.5.tgz"; + sha1 = "483b1ac59c6601ab30a7a596a5965cabccfdd0a5"; }; } { @@ -10330,14 +10250,6 @@ }; } { - name = "replace_ext___replace_ext_1.0.0.tgz"; - path = fetchurl { - name = "replace_ext___replace_ext_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz"; - sha1 = "de63128373fcbf7c3ccfa4de5a480c45a67958eb"; - }; - } - { name = "request_promise_core___request_promise_core_1.1.4.tgz"; path = fetchurl { name = "request_promise_core___request_promise_core_1.1.4.tgz"; @@ -10962,27 +10874,19 @@ }; } { - name = "socket.io_client___socket.io_client_2.3.0.tgz"; - path = fetchurl { - name = "socket.io_client___socket.io_client_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.3.0.tgz"; - sha1 = "14d5ba2e00b9bcd145ae443ab96b3f86cbcc1bb4"; - }; - } - { - name = "socket.io_client___socket.io_client_2.3.1.tgz"; + name = "socket.io_client___socket.io_client_2.4.0.tgz"; path = fetchurl { - name = "socket.io_client___socket.io_client_2.3.1.tgz"; - url = "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.3.1.tgz"; - sha1 = "91a4038ef4d03c19967bb3c646fec6e0eaa78cff"; + name = "socket.io_client___socket.io_client_2.4.0.tgz"; + url = "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.4.0.tgz"; + sha1 = "aafb5d594a3c55a34355562fc8aea22ed9119a35"; }; } { - name = "socket.io_parser___socket.io_parser_3.3.1.tgz"; + name = "socket.io_parser___socket.io_parser_3.3.2.tgz"; path = fetchurl { - name = "socket.io_parser___socket.io_parser_3.3.1.tgz"; - url = "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.3.1.tgz"; - sha1 = "f07d9c8cb3fb92633aa93e76d98fd3a334623199"; + name = "socket.io_parser___socket.io_parser_3.3.2.tgz"; + url = "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.3.2.tgz"; + sha1 = "ef872009d0adcf704f2fbe830191a14752ad50b6"; }; } { @@ -10994,11 +10898,11 @@ }; } { - name = "socket.io___socket.io_2.3.0.tgz"; + name = "socket.io___socket.io_2.4.1.tgz"; path = fetchurl { - name = "socket.io___socket.io_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/socket.io/-/socket.io-2.3.0.tgz"; - sha1 = "cd762ed6a4faeca59bc1f3e243c0969311eb73fb"; + name = "socket.io___socket.io_2.4.1.tgz"; + url = "https://registry.yarnpkg.com/socket.io/-/socket.io-2.4.1.tgz"; + sha1 = "95ad861c9a52369d7f1a68acf0d4a1b16da451d2"; }; } { @@ -11098,11 +11002,11 @@ }; } { - name = "spdx_license_ids___spdx_license_ids_3.0.6.tgz"; + name = "spdx_license_ids___spdx_license_ids_3.0.7.tgz"; path = fetchurl { - name = "spdx_license_ids___spdx_license_ids_3.0.6.tgz"; - url = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz"; - sha1 = "c80757383c28abf7296744998cbc106ae8b854ce"; + name = "spdx_license_ids___spdx_license_ids_3.0.7.tgz"; + url = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz"; + sha1 = "e9c18a410e5ed7e12442a549fbd8afa767038d65"; }; } { @@ -11330,19 +11234,19 @@ }; } { - name = "string.prototype.trimend___string.prototype.trimend_1.0.2.tgz"; + name = "string.prototype.trimend___string.prototype.trimend_1.0.3.tgz"; path = fetchurl { - name = "string.prototype.trimend___string.prototype.trimend_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.2.tgz"; - sha1 = "6ddd9a8796bc714b489a3ae22246a208f37bfa46"; + name = "string.prototype.trimend___string.prototype.trimend_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz"; + sha1 = "a22bd53cca5c7cf44d7c9d5c732118873d6cd18b"; }; } { - name = "string.prototype.trimstart___string.prototype.trimstart_1.0.2.tgz"; + name = "string.prototype.trimstart___string.prototype.trimstart_1.0.3.tgz"; path = fetchurl { - name = "string.prototype.trimstart___string.prototype.trimstart_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.2.tgz"; - sha1 = "22d45da81015309cd0cdd79787e8919fc5c613e7"; + name = "string.prototype.trimstart___string.prototype.trimstart_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz"; + sha1 = "9b4cb590e123bb36564401d59824298de50fd5aa"; }; } { @@ -11442,11 +11346,11 @@ }; } { - name = "strtok3___strtok3_6.0.4.tgz"; + name = "strtok3___strtok3_6.0.8.tgz"; path = fetchurl { - name = "strtok3___strtok3_6.0.4.tgz"; - url = "https://registry.yarnpkg.com/strtok3/-/strtok3-6.0.4.tgz"; - sha1 = "ede0d20fde5aa9fda56417c3558eaafccc724694"; + name = "strtok3___strtok3_6.0.8.tgz"; + url = "https://registry.yarnpkg.com/strtok3/-/strtok3-6.0.8.tgz"; + sha1 = "c839157f615c10ba0f4ae35067dad9959eeca346"; }; } { @@ -11546,11 +11450,11 @@ }; } { - name = "tar_stream___tar_stream_2.1.4.tgz"; + name = "tar_stream___tar_stream_2.2.0.tgz"; path = fetchurl { - name = "tar_stream___tar_stream_2.1.4.tgz"; - url = "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.4.tgz"; - sha1 = "c4fb1a11eb0da29b893a5b25476397ba2d053bfa"; + name = "tar_stream___tar_stream_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz"; + sha1 = "acad84c284136b060dc3faa64474aa9aebd77287"; }; } { @@ -11562,11 +11466,11 @@ }; } { - name = "tar___tar_6.0.5.tgz"; + name = "tar___tar_6.1.0.tgz"; path = fetchurl { - name = "tar___tar_6.0.5.tgz"; - url = "https://registry.yarnpkg.com/tar/-/tar-6.0.5.tgz"; - sha1 = "bde815086e10b39f1dcd298e89d596e1535e200f"; + name = "tar___tar_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/tar/-/tar-6.1.0.tgz"; + sha1 = "d1724e9bcc04b977b18d5c573b333a2207229a83"; }; } { @@ -11746,11 +11650,11 @@ }; } { - name = "token_types___token_types_2.0.0.tgz"; + name = "token_types___token_types_2.1.1.tgz"; path = fetchurl { - name = "token_types___token_types_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/token-types/-/token-types-2.0.0.tgz"; - sha1 = "b23618af744818299c6fbf125e0fdad98bab7e85"; + name = "token_types___token_types_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/token-types/-/token-types-2.1.1.tgz"; + sha1 = "bd585d64902aaf720b8979d257b4b850b4d45c45"; }; } { @@ -11858,6 +11762,14 @@ }; } { + name = "tslib___tslib_2.1.0.tgz"; + path = fetchurl { + name = "tslib___tslib_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz"; + sha1 = "da60860f1c2ecaa5703ab7d39bc05b6bf988b97a"; + }; + } + { name = "tty_browserify___tty_browserify_0.0.0.tgz"; path = fetchurl { name = "tty_browserify___tty_browserify_0.0.0.tgz"; @@ -11954,19 +11866,11 @@ }; } { - name = "uglify_js___uglify_js_3.11.6.tgz"; - path = fetchurl { - name = "uglify_js___uglify_js_3.11.6.tgz"; - url = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.11.6.tgz"; - sha1 = "144b50d3e05eadd3ad4dd047c60ca541a8cd4e9c"; - }; - } - { - name = "uglify_js___uglify_js_3.12.2.tgz"; + name = "uglify_js___uglify_js_3.12.4.tgz"; path = fetchurl { - name = "uglify_js___uglify_js_3.12.2.tgz"; - url = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.12.2.tgz"; - sha1 = "c7ae89da0ed1bb58999c7fce07190b347fdbdaba"; + name = "uglify_js___uglify_js_3.12.4.tgz"; + url = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.12.4.tgz"; + sha1 = "93de48bb76bb3ec0fc36563f871ba46e2ee5c7ee"; }; } { @@ -12002,6 +11906,14 @@ }; } { + name = "underscore___underscore_1.12.0.tgz"; + path = fetchurl { + name = "underscore___underscore_1.12.0.tgz"; + url = "https://registry.yarnpkg.com/underscore/-/underscore-1.12.0.tgz"; + sha1 = "4814940551fc80587cef7840d1ebb0f16453be97"; + }; + } + { name = "underscore___underscore_1.6.0.tgz"; path = fetchurl { name = "underscore___underscore_1.6.0.tgz"; @@ -12050,11 +11962,11 @@ }; } { - name = "unified_message_control___unified_message_control_3.0.1.tgz"; + name = "unified_message_control___unified_message_control_3.0.2.tgz"; path = fetchurl { - name = "unified_message_control___unified_message_control_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/unified-message-control/-/unified-message-control-3.0.1.tgz"; - sha1 = "7018855daea9af96082cbea35970d48c9c4dbbf2"; + name = "unified_message_control___unified_message_control_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/unified-message-control/-/unified-message-control-3.0.2.tgz"; + sha1 = "efa316c97f39f6f54bc74a4cf35807e615694033"; }; } { @@ -12122,11 +12034,11 @@ }; } { - name = "unist_util_is___unist_util_is_4.0.3.tgz"; + name = "unist_util_is___unist_util_is_4.0.4.tgz"; path = fetchurl { - name = "unist_util_is___unist_util_is_4.0.3.tgz"; - url = "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-4.0.3.tgz"; - sha1 = "e8b44db55fc20c43752b3346c116344d45d7c91d"; + name = "unist_util_is___unist_util_is_4.0.4.tgz"; + url = "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-4.0.4.tgz"; + sha1 = "3e9e8de6af2eb0039a59f50c9b3e99698a924f50"; }; } { @@ -12218,11 +12130,11 @@ }; } { - name = "uri_js___uri_js_4.4.0.tgz"; + name = "uri_js___uri_js_4.4.1.tgz"; path = fetchurl { - name = "uri_js___uri_js_4.4.0.tgz"; - url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.0.tgz"; - sha1 = "aa714261de793e8a82347a7bcc9ce74e86f28602"; + name = "uri_js___uri_js_4.4.1.tgz"; + url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz"; + sha1 = "9b1a52595225859e55f669d928f88c6c57f2a77e"; }; } { @@ -12274,11 +12186,11 @@ }; } { - name = "utf_8_validate___utf_8_validate_5.0.3.tgz"; + name = "utf_8_validate___utf_8_validate_5.0.4.tgz"; path = fetchurl { - name = "utf_8_validate___utf_8_validate_5.0.3.tgz"; - url = "https://registry.yarnpkg.com/utf-8-validate/-/utf-8-validate-5.0.3.tgz"; - sha1 = "3b64e418ad2ff829809025fdfef595eab2f03a27"; + name = "utf_8_validate___utf_8_validate_5.0.4.tgz"; + url = "https://registry.yarnpkg.com/utf-8-validate/-/utf-8-validate-5.0.4.tgz"; + sha1 = "72a1735983ddf7a05a43a9c6b67c5ce1c910f9b8"; }; } { @@ -12458,11 +12370,11 @@ }; } { - name = "vfile_reporter___vfile_reporter_6.0.1.tgz"; + name = "vfile_reporter___vfile_reporter_6.0.2.tgz"; path = fetchurl { - name = "vfile_reporter___vfile_reporter_6.0.1.tgz"; - url = "https://registry.yarnpkg.com/vfile-reporter/-/vfile-reporter-6.0.1.tgz"; - sha1 = "45d4dc11df2e312196ea2ceb95e42a67fc8ce814"; + name = "vfile_reporter___vfile_reporter_6.0.2.tgz"; + url = "https://registry.yarnpkg.com/vfile-reporter/-/vfile-reporter-6.0.2.tgz"; + sha1 = "cbddaea2eec560f27574ce7b7b269822c191a676"; }; } { @@ -12482,11 +12394,11 @@ }; } { - name = "vfile___vfile_4.2.0.tgz"; + name = "vfile___vfile_4.2.1.tgz"; path = fetchurl { - name = "vfile___vfile_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/vfile/-/vfile-4.2.0.tgz"; - sha1 = "26c78ac92eb70816b01d4565e003b7e65a2a0e01"; + name = "vfile___vfile_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/vfile/-/vfile-4.2.1.tgz"; + sha1 = "03f1dce28fc625c625bc6514350fbdb00fa9e624"; }; } { @@ -12746,19 +12658,11 @@ }; } { - name = "ws___ws_7.4.0.tgz"; + name = "ws___ws_7.4.2.tgz"; path = fetchurl { - name = "ws___ws_7.4.0.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-7.4.0.tgz"; - sha1 = "a5dd76a24197940d4a8bb9e0e152bb4503764da7"; - }; - } - { - name = "ws___ws_6.1.4.tgz"; - path = fetchurl { - name = "ws___ws_6.1.4.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-6.1.4.tgz"; - sha1 = "5b5c8800afab925e94ccb29d153c8d02c1776ef9"; + name = "ws___ws_7.4.2.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-7.4.2.tgz"; + sha1 = "782100048e54eb36fe9843363ab1c68672b261dd"; }; } { @@ -12930,11 +12834,11 @@ }; } { - name = "y18n___y18n_4.0.0.tgz"; + name = "y18n___y18n_4.0.1.tgz"; path = fetchurl { - name = "y18n___y18n_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz"; - sha1 = "95ef94f85ecc81d007c264e190a120f0a3c8566b"; + name = "y18n___y18n_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz"; + sha1 = "8db2b83c31c5d75099bb890b23f3094891e247d4"; }; } { @@ -12986,6 +12890,14 @@ }; } { + name = "yocto_queue___yocto_queue_0.1.0.tgz"; + path = fetchurl { + name = "yocto_queue___yocto_queue_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz"; + sha1 = "0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"; + }; + } + { name = "zip_stream___zip_stream_4.0.4.tgz"; path = fetchurl { name = "zip_stream___zip_stream_4.0.4.tgz"; diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix index ffa4f55fa77..d2989394720 100644 --- a/pkgs/servers/web-apps/matomo/default.nix +++ b/pkgs/servers/web-apps/matomo/default.nix @@ -17,7 +17,7 @@ let }; common = pname: { version, sha256, beta ? null }: let - fullVersion = version + stdenv.lib.optionalString (beta != null) "-${toString beta}"; + fullVersion = version + lib.optionalString (beta != null) "-${toString beta}"; name = "${pname}-${fullVersion}"; in @@ -106,4 +106,4 @@ let }; }; in -stdenv.lib.mapAttrs common versions +lib.mapAttrs common versions diff --git a/pkgs/servers/web-apps/mediawiki/default.nix b/pkgs/servers/web-apps/mediawiki/default.nix index ddd2ecf8132..e05fc6d6249 100644 --- a/pkgs/servers/web-apps/mediawiki/default.nix +++ b/pkgs/servers/web-apps/mediawiki/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mediawiki"; - version = "1.35.0"; + version = "1.35.1"; - src = with stdenv.lib; fetchurl { + src = with lib; fetchurl { url = "https://releases.wikimedia.org/mediawiki/${versions.majorMinor version}/${pname}-${version}.tar.gz"; - sha256 = "1m1f7yaabmfpp3ma394j9nqhx9xv47vpbc48qrbknlq3xhfvqzrs"; + sha256 = "05g3mgyi789drhzk3wclkyw4f06mz21q90m2c0z6zshn98fscrcf"; }; prePatch = '' diff --git a/pkgs/servers/web-apps/moodle/default.nix b/pkgs/servers/web-apps/moodle/default.nix index 6b22c29c128..af565e6292d 100644 --- a/pkgs/servers/web-apps/moodle/default.nix +++ b/pkgs/servers/web-apps/moodle/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, writeText, plugins ? [ ] }: let - version = "3.10"; + version = "3.10.1"; stableVersion = lib.concatStrings (lib.take 2 (lib.splitVersion version)); in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://download.moodle.org/stable${stableVersion}/${pname}-${version}.tgz"; - sha256 = "4aYKZmXym1Tq/462PIgJb4sHGUclEkU0Ok1iQJ6u0aw="; + sha256 = "sha256-VHlz8twsp7mSwZPatJkciHaDOP0r0EudeG5i3gjPUT8="; }; phpConfig = writeText "config.php" '' diff --git a/pkgs/servers/web-apps/morty/default.nix b/pkgs/servers/web-apps/morty/default.nix index 6b17476623b..04f1e14d5cc 100644 --- a/pkgs/servers/web-apps/morty/default.nix +++ b/pkgs/servers/web-apps/morty/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "morty"; diff --git a/pkgs/servers/web-apps/searx/default.nix b/pkgs/servers/web-apps/searx/default.nix index 41654a2f0bd..bb9944ea377 100644 --- a/pkgs/servers/web-apps/searx/default.nix +++ b/pkgs/servers/web-apps/searx/default.nix @@ -4,18 +4,24 @@ with python3Packages; toPythonModule (buildPythonApplication rec { pname = "searx"; - version = "0.17.0"; + version = "0.18.0"; # Can not use PyPI because certain test files are missing. src = fetchFromGitHub { - owner = "asciimoo"; + owner = "searx"; repo = "searx"; rev = "v${version}"; - sha256 = "0pznz3wsaikl8khmzqvj05kzh5y07hjw8gqhy6x0lz1b00cn5af4"; + sha256 = "0idxspvckvsd02v42h4z4wqrfkn1l8n59i91f7pc837cxya8p6hn"; }; postPatch = '' sed -i 's/==.*$//' requirements.txt + # skip failing test + sed -i '/test_json_serial(/,+3d' tests/unit/test_standalone_searx.py + ''; + + preBuild = '' + export SEARX_DEBUG="true"; ''; propagatedBuildInputs = [ @@ -30,10 +36,6 @@ toPythonModule (buildPythonApplication rec { unittest2 zope_testrunner selenium ]; - preCheck = '' - rm tests/test_robot.py # A variable that is imported is commented out - ''; - postInstall = '' # Create a symlink for easier access to static data mkdir -p $out/share @@ -43,7 +45,7 @@ toPythonModule (buildPythonApplication rec { passthru.tests = { inherit (nixosTests) searx; }; meta = with lib; { - homepage = "https://github.com/asciimoo/searx"; + homepage = "https://github.com/searx/searx"; description = "A privacy-respecting, hackable metasearch engine"; license = licenses.agpl3Plus; maintainers = with maintainers; [ matejc fpletz globin danielfullmer ]; diff --git a/pkgs/servers/web-apps/shiori/default.nix b/pkgs/servers/web-apps/shiori/default.nix index 7100c70c0ed..b39d7a00ced 100644 --- a/pkgs/servers/web-apps/shiori/default.nix +++ b/pkgs/servers/web-apps/shiori/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "shiori"; diff --git a/pkgs/servers/web-apps/sogo/default.nix b/pkgs/servers/web-apps/sogo/default.nix index aa2a9fc9258..b3fedf9bc5d 100644 --- a/pkgs/servers/web-apps/sogo/default.nix +++ b/pkgs/servers/web-apps/sogo/default.nix @@ -1,5 +1,5 @@ { gnustep, lib, fetchFromGitHub, fetchpatch, makeWrapper, python2, lndir -, openssl_1_1, openldap, sope, libmemcached, curl, libsodium, libzip, pkgconfig }: +, openssl_1_1, openldap, sope, libmemcached, curl, libsodium, libzip, pkg-config }: with lib; gnustep.stdenv.mkDerivation rec { pname = "SOGo"; version = "5.0.1"; @@ -12,7 +12,7 @@ with lib; gnustep.stdenv.mkDerivation rec { }; nativeBuildInputs = [ gnustep.make makeWrapper python2 ]; - buildInputs = [ gnustep.base sope openssl_1_1 libmemcached (curl.override { openssl = openssl_1_1; }) libsodium libzip pkgconfig ] + buildInputs = [ gnustep.base sope openssl_1_1 libmemcached (curl.override { openssl = openssl_1_1; }) libsodium libzip pkg-config ] ++ optional (openldap != null) openldap; patches = [ diff --git a/pkgs/servers/web-apps/virtlyst/default.nix b/pkgs/servers/web-apps/virtlyst/default.nix index 69270afb76b..3ff42050eb2 100644 --- a/pkgs/servers/web-apps/virtlyst/default.nix +++ b/pkgs/servers/web-apps/virtlyst/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, autoPatchelfHook +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, autoPatchelfHook , qtbase, libvirt, cutelyst, grantlee }: stdenv.mkDerivation rec { @@ -12,9 +12,11 @@ stdenv.mkDerivation rec { sha256 = "1vgjai34hqppkpl0ryxkyhpm9dsx1chs3bii3wc3h40hl80n6dgy"; }; - nativeBuildInputs = [ cmake pkgconfig autoPatchelfHook ]; + nativeBuildInputs = [ cmake pkg-config autoPatchelfHook ]; buildInputs = [ qtbase libvirt cutelyst grantlee ]; + dontWrapQtApps = true; + installPhase = '' mkdir -p $out/lib cp src/libVirtlyst.so $out/lib diff --git a/pkgs/servers/web-apps/wallabag/default.nix b/pkgs/servers/web-apps/wallabag/default.nix index 6417064663a..c8722fbe8f7 100644 --- a/pkgs/servers/web-apps/wallabag/default.nix +++ b/pkgs/servers/web-apps/wallabag/default.nix @@ -2,25 +2,19 @@ stdenv.mkDerivation rec { pname = "wallabag"; - version = "2.3.8"; + version = "2.4.0"; # remember to rm -r var/cache/* after a rebuild or unexpected errors will occur src = fetchurl { url = "https://static.wallabag.org/releases/wallabag-release-${version}.tar.gz"; - sha256 = "1sr62hfk2f2rl5by48dg8yd1gchngjnc850as17wr3w287p1kwsq"; + sha256 = "11vda7aqq82kpr88v4hr7zg19zfq970n3z4qp25my8b1fvlgdjhi"; }; outputs = [ "out" ]; patches = [ ./wallabag-data.patch # exposes $WALLABAG_DATA - (fetchurl { - # Fixes "Uncaught RuntimeException: Setting "piwik_enabled" couldn't be found."; https://github.com/wallabag/wallabag/issues/3662 - # Remove >= 2.4.0 - url = "https://github.com/wallabag/wallabag/pull/3868.patch"; - sha256 = "0pfxsv8ncaxkjkybim3v3iswmfv1vbjlzmvj50nn9blvjwc9gxjg"; - }) ]; dontBuild = true; diff --git a/pkgs/servers/web-apps/wallabag/wallabag-data.patch b/pkgs/servers/web-apps/wallabag/wallabag-data.patch index 086e9395980..f70ffce2905 100644 --- a/pkgs/servers/web-apps/wallabag/wallabag-data.patch +++ b/pkgs/servers/web-apps/wallabag/wallabag-data.patch @@ -1,9 +1,9 @@ diff --git a/app/AppKernel.php b/app/AppKernel.php -index 40726f05..7d44e600 100644 +index 347197e..902b558 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php -@@ -58,14 +58,19 @@ class AppKernel extends Kernel - return $bundles; +@@ -69,19 +69,24 @@ class AppKernel extends Kernel + return __DIR__; } + public function getProjectDir() @@ -24,3 +24,9 @@ index 40726f05..7d44e600 100644 } public function registerContainerConfiguration(LoaderInterface $loader) + { +- $loader->load($this->getRootDir() . '/config/config_' . $this->getEnvironment() . '.yml'); ++ $loader->load($this->getProjectDir() . '/app/config/config_' . $this->getEnvironment() . '.yml'); + + $loader->load(function ($container) { + if ($container->getParameter('use_webpack_dev_server')) { diff --git a/pkgs/servers/web-apps/whitebophir/node-packages-generated.nix b/pkgs/servers/web-apps/whitebophir/node-packages-generated.nix index 78d4b9ccd77..af58cbf3f9b 100644 --- a/pkgs/servers/web-apps/whitebophir/node-packages-generated.nix +++ b/pkgs/servers/web-apps/whitebophir/node-packages-generated.nix @@ -1492,4 +1492,4 @@ in bypassCache = true; reconstructLock = true; }; -} \ No newline at end of file +} diff --git a/pkgs/servers/web-apps/whitebophir/node-packages.nix b/pkgs/servers/web-apps/whitebophir/node-packages.nix index d0273cfe1f9..e1a2c0edbee 100644 --- a/pkgs/servers/web-apps/whitebophir/node-packages.nix +++ b/pkgs/servers/web-apps/whitebophir/node-packages.nix @@ -6,7 +6,7 @@ let nodeEnv = import ../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile; + inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile; inherit nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; diff --git a/pkgs/servers/webmetro/default.nix b/pkgs/servers/webmetro/default.nix index 316e3a52497..6bda15a93e0 100644 --- a/pkgs/servers/webmetro/default.nix +++ b/pkgs/servers/webmetro/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "webmetro"; diff --git a/pkgs/servers/wsdd/default.nix b/pkgs/servers/wsdd/default.nix index 8fdd9a93a23..f1a385c6809 100644 --- a/pkgs/servers/wsdd/default.nix +++ b/pkgs/servers/wsdd/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { buildInputs = [ python3 ]; patches = [ - (fetchpatch { + (fetchpatch { # https://github.com/christgau/wsdd/issues/72 - name = "fix_send_messages_using_correct_socket.patch"; - url = "https://github.com/christgau/wsdd/commit/1ed74fe73a9fe2e2720859e2822116d65e4ffa5b.patch"; - sha256 = "1n9bqvh20nhnvnc5pxvzf9kk8nky6rmbmfryg65lfmr1hmg676zg"; + name = "fix_send_messages_using_correct_socket.patch"; + url = "https://github.com/christgau/wsdd/commit/1ed74fe73a9fe2e2720859e2822116d65e4ffa5b.patch"; + sha256 = "1n9bqvh20nhnvnc5pxvzf9kk8nky6rmbmfryg65lfmr1hmg676zg"; }) ]; diff --git a/pkgs/servers/x11/quartz-wm/default.nix b/pkgs/servers/x11/quartz-wm/default.nix index 0d7d6df87bc..9beb0553395 100644 --- a/pkgs/servers/x11/quartz-wm/default.nix +++ b/pkgs/servers/x11/quartz-wm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, xorg, pixman, pkgconfig, AppKit, Foundation, Xplugin }: +{ lib, stdenv, fetchurl, xorg, pixman, pkg-config, AppKit, Foundation, Xplugin }: let version = "1.3.1"; in stdenv.mkDerivation { @@ -19,7 +19,7 @@ in stdenv.mkDerivation { xorg.libXrandr xorg.libXext pixman - pkgconfig + pkg-config AppKit Xplugin Foundation ]; meta = with lib; { diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 88bdaeb67ae..e8b29f9bbac 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -5,7 +5,7 @@ lib.makeScope newScope (self: with self; { inherit pixman; - appres = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto, libXt }: stdenv.mkDerivation { + appres = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXt }: stdenv.mkDerivation { name = "appres-1.0.5"; builder = ./builder.sh; src = fetchurl { @@ -13,12 +13,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0a2r4sxky3k7b3kdb5pbv709q9b5zi3gxjz336wl66f828vqkbgz"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto libXt ]; meta.platforms = lib.platforms.unix; }) {}; - bdftopcf = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { + bdftopcf = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { name = "bdftopcf-1.1"; builder = ./builder.sh; src = fetchurl { @@ -26,12 +26,12 @@ lib.makeScope newScope (self: with self; { sha256 = "18hiscgljrz10zjcws25bis32nyrg3hzgmiq6scrh7izqmgz0kab"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; meta.platforms = lib.platforms.unix; }) {}; - bitmap = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, xbitmaps, libXmu, xorgproto, libXt }: stdenv.mkDerivation { + bitmap = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, xbitmaps, libXmu, xorgproto, libXt }: stdenv.mkDerivation { name = "bitmap-1.0.9"; builder = ./builder.sh; src = fetchurl { @@ -39,12 +39,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0kzbv5wh02798l77y9y8d8sjkmzm9cvsn3rjh8a86v5waj50apsb"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXaw xbitmaps libXmu xorgproto libXt ]; meta.platforms = lib.platforms.unix; }) {}; - editres = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt }: stdenv.mkDerivation { + editres = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt }: stdenv.mkDerivation { name = "editres-1.0.7"; builder = ./builder.sh; src = fetchurl { @@ -52,12 +52,12 @@ lib.makeScope newScope (self: with self; { sha256 = "04awfwmy3f9f0bchidc4ssbgrbicn5gzasg3jydpfnp5513d76h8"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXaw libXmu xorgproto libXt ]; meta.platforms = lib.platforms.unix; }) {}; - encodings = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { + encodings = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { name = "encodings-1.0.5"; builder = ./builder.sh; src = fetchurl { @@ -65,12 +65,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0caafx0yqqnqyvbalxhh3mb0r9v36xmcy5zjhygb2i508dhy35mx"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; meta.platforms = lib.platforms.unix; }) {}; - fontadobe100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + fontadobe100dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { name = "font-adobe-100dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -78,13 +78,13 @@ lib.makeScope newScope (self: with self; { sha256 = "0m60f5bd0caambrk8ksknb5dks7wzsg7g7xaf0j21jxmx8rq9h5j"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontadobe75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + fontadobe75dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { name = "font-adobe-75dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -92,13 +92,13 @@ lib.makeScope newScope (self: with self; { sha256 = "02advcv9lyxpvrjv8bjh1b797lzg6jvhipclz49z8r8y98g4l0n6"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontadobeutopia100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + fontadobeutopia100dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { name = "font-adobe-utopia-100dpi-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -106,13 +106,13 @@ lib.makeScope newScope (self: with self; { sha256 = "19dd9znam1ah72jmdh7i6ny2ss2r6m21z9v0l43xvikw48zmwvyi"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontadobeutopia75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + fontadobeutopia75dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { name = "font-adobe-utopia-75dpi-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -120,13 +120,13 @@ lib.makeScope newScope (self: with self; { sha256 = "152wigpph5wvl4k9m3l4mchxxisgsnzlx033mn5iqrpkc6f72cl7"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontadobeutopiatype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation { + fontadobeutopiatype1 = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { name = "font-adobe-utopia-type1-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -134,13 +134,13 @@ lib.makeScope newScope (self: with self; { sha256 = "0xw0pdnzj5jljsbbhakc6q9ha2qnca1jr81zk7w70yl9bw83b54p"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig mkfontscale ]; + nativeBuildInputs = [ pkg-config mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontalias = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { + fontalias = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { name = "font-alias-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -148,12 +148,12 @@ lib.makeScope newScope (self: with self; { sha256 = "16ic8wfwwr3jicaml7b5a0sk6plcgc1kg84w02881yhwmqm3nicb"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; meta.platforms = lib.platforms.unix; }) {}; - fontarabicmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontarabicmisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-arabic-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -161,13 +161,13 @@ lib.makeScope newScope (self: with self; { sha256 = "1x246dfnxnmflzf0qzy62k8jdpkb6jkgspcjgbk8jcq9lw99npah"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontbh100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + fontbh100dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { name = "font-bh-100dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -175,13 +175,13 @@ lib.makeScope newScope (self: with self; { sha256 = "10cl4gm38dw68jzln99ijix730y7cbx8np096gmpjjwff1i73h13"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontbh75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + fontbh75dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { name = "font-bh-75dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -189,13 +189,13 @@ lib.makeScope newScope (self: with self; { sha256 = "073jmhf0sr2j1l8da97pzsqj805f7mf9r2gy92j4diljmi8sm1il"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontbhlucidatypewriter100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + fontbhlucidatypewriter100dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { name = "font-bh-lucidatypewriter-100dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -203,13 +203,13 @@ lib.makeScope newScope (self: with self; { sha256 = "1fqzckxdzjv4802iad2fdrkpaxl4w0hhs9lxlkyraq2kq9ik7a32"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontbhlucidatypewriter75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + fontbhlucidatypewriter75dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { name = "font-bh-lucidatypewriter-75dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -217,13 +217,13 @@ lib.makeScope newScope (self: with self; { sha256 = "0cfbxdp5m12cm7jsh3my0lym9328cgm7fa9faz2hqj05wbxnmhaa"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontbhttf = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation { + fontbhttf = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { name = "font-bh-ttf-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -231,13 +231,13 @@ lib.makeScope newScope (self: with self; { sha256 = "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig mkfontscale ]; + nativeBuildInputs = [ pkg-config mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontbhtype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation { + fontbhtype1 = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { name = "font-bh-type1-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -245,13 +245,13 @@ lib.makeScope newScope (self: with self; { sha256 = "1hb3iav089albp4sdgnlh50k47cdjif9p4axm0kkjvs8jyi5a53n"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig mkfontscale ]; + nativeBuildInputs = [ pkg-config mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontbitstream100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontbitstream100dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-bitstream-100dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -259,13 +259,13 @@ lib.makeScope newScope (self: with self; { sha256 = "1kmn9jbck3vghz6rj3bhc3h0w6gh0qiaqm90cjkqsz1x9r2dgq7b"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontbitstream75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontbitstream75dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-bitstream-75dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -273,13 +273,13 @@ lib.makeScope newScope (self: with self; { sha256 = "13plbifkvfvdfym6gjbgy9wx2xbdxi9hfrl1k22xayy02135wgxs"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontbitstreamtype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation { + fontbitstreamtype1 = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { name = "font-bitstream-type1-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -287,13 +287,13 @@ lib.makeScope newScope (self: with self; { sha256 = "1256z0jhcf5gbh1d03593qdwnag708rxqa032izmfb5dmmlhbsn6"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig mkfontscale ]; + nativeBuildInputs = [ pkg-config mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontcronyxcyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontcronyxcyrillic = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-cronyx-cyrillic-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -301,13 +301,13 @@ lib.makeScope newScope (self: with self; { sha256 = "0ai1v4n61k8j9x2a1knvfbl2xjxk3xxmqaq3p9vpqrspc69k31kf"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontcursormisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontcursormisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-cursor-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -315,13 +315,13 @@ lib.makeScope newScope (self: with self; { sha256 = "0dd6vfiagjc4zmvlskrbjz85jfqhf060cpys8j0y1qpcbsrkwdhp"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontdaewoomisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontdaewoomisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-daewoo-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -329,13 +329,13 @@ lib.makeScope newScope (self: with self; { sha256 = "1s2bbhizzgbbbn5wqs3vw53n619cclxksljvm759h9p1prqdwrdw"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontdecmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontdecmisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-dec-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -343,13 +343,13 @@ lib.makeScope newScope (self: with self; { sha256 = "0yzza0l4zwyy7accr1s8ab7fjqkpwggqydbm2vc19scdby5xz7g1"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontibmtype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation { + fontibmtype1 = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { name = "font-ibm-type1-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -357,13 +357,13 @@ lib.makeScope newScope (self: with self; { sha256 = "1pyjll4adch3z5cg663s6vhi02k8m6488f0mrasg81ssvg9jinzx"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig mkfontscale ]; + nativeBuildInputs = [ pkg-config mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontisasmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontisasmisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-isas-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -371,13 +371,13 @@ lib.makeScope newScope (self: with self; { sha256 = "0rx8q02rkx673a7skkpnvfkg28i8gmqzgf25s9yi0lar915sn92q"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontjismisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontjismisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-jis-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -385,13 +385,13 @@ lib.makeScope newScope (self: with self; { sha256 = "0rdc3xdz12pnv951538q6wilx8mrdndpkphpbblszsv7nc8cw61b"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontmicromisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontmicromisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-micro-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -399,13 +399,13 @@ lib.makeScope newScope (self: with self; { sha256 = "1dldxlh54zq1yzfnrh83j5vm0k4ijprrs5yl18gm3n9j1z0q2cws"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontmisccyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontmisccyrillic = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-misc-cyrillic-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -413,13 +413,13 @@ lib.makeScope newScope (self: with self; { sha256 = "0q2ybxs8wvylvw95j6x9i800rismsmx4b587alwbfqiw6biy63z4"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontmiscethiopic = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation { + fontmiscethiopic = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { name = "font-misc-ethiopic-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -427,13 +427,13 @@ lib.makeScope newScope (self: with self; { sha256 = "19cq7iq0pfad0nc2v28n681fdq3fcw1l1hzaq0wpkgpx7bc1zjsk"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig mkfontscale ]; + nativeBuildInputs = [ pkg-config mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontmiscmeltho = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation { + fontmiscmeltho = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { name = "font-misc-meltho-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -441,13 +441,13 @@ lib.makeScope newScope (self: with self; { sha256 = "148793fqwzrc3bmh2vlw5fdiwjc2n7vs25cic35gfp452czk489p"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig mkfontscale ]; + nativeBuildInputs = [ pkg-config mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontmiscmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + fontmiscmisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { name = "font-misc-misc-1.1.2"; builder = ./builder.sh; src = fetchurl { @@ -455,13 +455,13 @@ lib.makeScope newScope (self: with self; { sha256 = "150pq6n8n984fah34n3k133kggn9v0c5k07igv29sxp1wi07krxq"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontmuttmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontmuttmisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-mutt-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -469,13 +469,13 @@ lib.makeScope newScope (self: with self; { sha256 = "13qghgr1zzpv64m0p42195k1kc77pksiv059fdvijz1n6kdplpxx"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontschumachermisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + fontschumachermisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { name = "font-schumacher-misc-1.1.2"; builder = ./builder.sh; src = fetchurl { @@ -483,13 +483,13 @@ lib.makeScope newScope (self: with self; { sha256 = "0nkym3n48b4v36y4s927bbkjnsmicajarnf6vlp7wxp0as304i74"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontscreencyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontscreencyrillic = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-screen-cyrillic-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -497,13 +497,13 @@ lib.makeScope newScope (self: with self; { sha256 = "0yayf1qlv7irf58nngddz2f1q04qkpr5jwp4aja2j5gyvzl32hl2"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontsonymisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontsonymisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-sony-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -511,13 +511,13 @@ lib.makeScope newScope (self: with self; { sha256 = "1xfgcx4gsgik5mkgkca31fj3w72jw9iw76qyrajrsz1lp8ka6hr0"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontsunmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontsunmisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-sun-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -525,13 +525,13 @@ lib.makeScope newScope (self: with self; { sha256 = "1q6jcqrffg9q5f5raivzwx9ffvf7r11g6g0b125na1bhpz5ly7s8"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fonttosfnt = callPackage ({ stdenv, pkgconfig, fetchurl, libfontenc, freetype, xorgproto }: stdenv.mkDerivation { + fonttosfnt = callPackage ({ stdenv, pkg-config, fetchurl, libfontenc, freetype, xorgproto }: stdenv.mkDerivation { name = "fonttosfnt-1.2.1"; builder = ./builder.sh; src = fetchurl { @@ -539,12 +539,12 @@ lib.makeScope newScope (self: with self; { sha256 = "16r51h5wfy85wnbq3q8v8a184hb25c3ksjgix0mlcywdz7qkbj07"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libfontenc freetype xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - fontutil = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { + fontutil = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { name = "font-util-1.3.1"; builder = ./builder.sh; src = fetchurl { @@ -552,12 +552,12 @@ lib.makeScope newScope (self: with self; { sha256 = "08drjb6cf84pf5ysghjpb4i7xkd2p86k3wl2a0jxs1jif6qbszma"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; meta.platforms = lib.platforms.unix; }) {}; - fontwinitzkicyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontwinitzkicyrillic = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-winitzki-cyrillic-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -565,13 +565,13 @@ lib.makeScope newScope (self: with self; { sha256 = "181n1bgq8vxfxqicmy1jpm1hnr6gwn1kdhl6hr4frjigs1ikpldb"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontxfree86type1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation { + fontxfree86type1 = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { name = "font-xfree86-type1-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -579,13 +579,13 @@ lib.makeScope newScope (self: with self; { sha256 = "0jp3zc0qfdaqfkgzrb44vi9vi0a8ygb35wp082yz7rvvxhmg9sya"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig mkfontscale ]; + nativeBuildInputs = [ pkg-config mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - gccmakedep = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { + gccmakedep = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { name = "gccmakedep-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -593,12 +593,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1r1fpy5ni8chbgx7j5sz0008fpb6vbazpy1nifgdhgijyzqxqxdj"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; meta.platforms = lib.platforms.unix; }) {}; - iceauth = callPackage ({ stdenv, pkgconfig, fetchurl, libICE, xorgproto }: stdenv.mkDerivation { + iceauth = callPackage ({ stdenv, pkg-config, fetchurl, libICE, xorgproto }: stdenv.mkDerivation { name = "iceauth-1.0.8"; builder = ./builder.sh; src = fetchurl { @@ -606,12 +606,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1ik0mdidmyvy48hn8p2hwvf3535rf3m96hhf0mvcqrbj44x23vp6"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libICE xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - ico = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { + ico = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { name = "ico-1.0.5"; builder = ./builder.sh; src = fetchurl { @@ -619,12 +619,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0gvpwfk9kvlfn631dgizc45qc2qqjn9pavdp2q7qb3drkvr64fyp"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - imake = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation { + imake = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { name = "imake-1.0.8"; builder = ./builder.sh; src = fetchurl { @@ -632,12 +632,12 @@ lib.makeScope newScope (self: with self; { sha256 = "00m7l90ws72k1qm101sd2rx92ckd50cszyng5d4dd77jncbf9lmq"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - libAppleWM = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { + libAppleWM = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { name = "libAppleWM-1.4.1"; builder = ./builder.sh; src = fetchurl { @@ -645,12 +645,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0r8x28n45q89x91mz8mv0zkkcxi8wazkac886fyvflhiv2y8ap2y"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext ]; meta.platforms = lib.platforms.unix; }) {}; - libFS = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xtrans }: stdenv.mkDerivation { + libFS = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xtrans }: stdenv.mkDerivation { name = "libFS-1.0.8"; builder = ./builder.sh; src = fetchurl { @@ -658,12 +658,12 @@ lib.makeScope newScope (self: with self; { sha256 = "03xxyvpfa3rhqcld4p2chkil482jn9cp80hj17jdybcv2hkkgqf8"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xtrans ]; meta.platforms = lib.platforms.unix; }) {}; - libICE = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xtrans }: stdenv.mkDerivation { + libICE = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xtrans }: stdenv.mkDerivation { name = "libICE-1.0.10"; builder = ./builder.sh; src = fetchurl { @@ -671,12 +671,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0j638yvmyna2k4mz465jywgdybgdchdqppfx6xfazg7l5khxr1kg"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xtrans ]; meta.platforms = lib.platforms.unix; }) {}; - libSM = callPackage ({ stdenv, pkgconfig, fetchurl, libICE, libuuid, xorgproto, xtrans }: stdenv.mkDerivation { + libSM = callPackage ({ stdenv, pkg-config, fetchurl, libICE, libuuid, xorgproto, xtrans }: stdenv.mkDerivation { name = "libSM-1.2.3"; builder = ./builder.sh; src = fetchurl { @@ -684,12 +684,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1fwwfq9v3sqmpzpscymswxn76xhxnysa24pfim1mcpxhvjcl89id"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libICE libuuid xorgproto xtrans ]; meta.platforms = lib.platforms.unix; }) {}; - libWindowsWM = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { + libWindowsWM = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { name = "libWindowsWM-1.0.1"; builder = ./builder.sh; src = fetchurl { @@ -697,12 +697,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1p0flwb67xawyv6yhri9w17m1i4lji5qnd0gq8v1vsfb8zw7rw15"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext ]; meta.platforms = lib.platforms.unix; }) {}; - libX11 = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libxcb, xtrans }: stdenv.mkDerivation { + libX11 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libxcb, xtrans }: stdenv.mkDerivation { name = "libX11-1.7.0"; builder = ./builder.sh; src = fetchurl { @@ -710,12 +710,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0m6bfwllr3pq2c00l51y62yiq15kphc8dw69zf67qhwmclxzkj1n"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libxcb xtrans ]; meta.platforms = lib.platforms.unix; }) {}; - libXScrnSaver = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { + libXScrnSaver = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { name = "libXScrnSaver-1.2.3"; builder = ./builder.sh; src = fetchurl { @@ -723,12 +723,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1y4vx1vabg7j9hamp0vrfrax5b0lmgm3h0lbgbb3hnkv3dd0f5zr"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext ]; meta.platforms = lib.platforms.unix; }) {}; - libXTrap = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext, libXt }: stdenv.mkDerivation { + libXTrap = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXt }: stdenv.mkDerivation { name = "libXTrap-1.0.1"; builder = ./builder.sh; src = fetchurl { @@ -736,12 +736,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0bi5wxj6avim61yidh9fd3j4n8czxias5m8vss9vhxjnk1aksdwg"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext libXt ]; meta.platforms = lib.platforms.unix; }) {}; - libXau = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation { + libXau = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { name = "libXau-1.0.9"; builder = ./builder.sh; src = fetchurl { @@ -749,12 +749,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1v3krc6x0zliaa66qq1bf9j60x5nqfy68v8axaiglxpnvgqcpy6c"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - libXaw = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xorgproto, libXmu, libXpm, libXt }: stdenv.mkDerivation { + libXaw = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto, libXmu, libXpm, libXt }: stdenv.mkDerivation { name = "libXaw-1.0.13"; builder = ./builder.sh; src = fetchurl { @@ -762,12 +762,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1kdhxplwrn43d9jp3v54llp05kwx210lrsdvqb6944jp29rhdy4f"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXext xorgproto libXmu libXpm libXt ]; meta.platforms = lib.platforms.unix; }) {}; - libXaw3d = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, libXmu, libXpm, xorgproto, libXt }: stdenv.mkDerivation { + libXaw3d = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, libXmu, libXpm, xorgproto, libXt }: stdenv.mkDerivation { name = "libXaw3d-1.6.3"; builder = ./builder.sh; src = fetchurl { @@ -775,12 +775,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0i653s8g25cc0mimkwid9366bqkbyhdyjhckx7bw77j20hzrkfid"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXext libXmu libXpm xorgproto libXt ]; meta.platforms = lib.platforms.unix; }) {}; - libXcomposite = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXfixes }: stdenv.mkDerivation { + libXcomposite = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXfixes }: stdenv.mkDerivation { name = "libXcomposite-0.4.5"; builder = ./builder.sh; src = fetchurl { @@ -788,12 +788,12 @@ lib.makeScope newScope (self: with self; { sha256 = "13sfcglvz87vl58hd9rszwr73z0z4nwga3c12rfh7f5s2ln8l8dk"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXfixes ]; meta.platforms = lib.platforms.unix; }) {}; - libXcursor = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXfixes, libXrender }: stdenv.mkDerivation { + libXcursor = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXfixes, libXrender }: stdenv.mkDerivation { name = "libXcursor-1.2.0"; builder = ./builder.sh; src = fetchurl { @@ -801,12 +801,12 @@ lib.makeScope newScope (self: with self; { sha256 = "10l7c9fm0jmpkm9ab9dz8r6m1pr87vvgqjnbx1psz50h4pwfklrs"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXfixes libXrender ]; meta.platforms = lib.platforms.unix; }) {}; - libXdamage = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXfixes }: stdenv.mkDerivation { + libXdamage = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXfixes }: stdenv.mkDerivation { name = "libXdamage-1.1.5"; builder = ./builder.sh; src = fetchurl { @@ -814,12 +814,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0igaw2akjf712y3rv7lx473jigxmcv9rs9y8sbrvbhya8f30cd5p"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXfixes ]; meta.platforms = lib.platforms.unix; }) {}; - libXdmcp = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation { + libXdmcp = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { name = "libXdmcp-1.1.3"; builder = ./builder.sh; src = fetchurl { @@ -827,12 +827,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0ab53h0rkq721ihk5hi469x500f3pgbkm1wy01yf24x5m923nli0"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - libXext = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { + libXext = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { name = "libXext-1.3.4"; builder = ./builder.sh; src = fetchurl { @@ -840,12 +840,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0azqxllcsfxc3ilhz6kwc6x7m8wc477p59ir9p0yrsldx766zbar"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - libXfixes = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { + libXfixes = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { name = "libXfixes-5.0.3"; builder = ./builder.sh; src = fetchurl { @@ -853,12 +853,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1miana3y4hwdqdparsccmygqr3ic3hs5jrqfzp70hvi2zwxd676y"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 ]; meta.platforms = lib.platforms.unix; }) {}; - libXfont = callPackage ({ stdenv, pkgconfig, fetchurl, libfontenc, xorgproto, freetype, xtrans, zlib }: stdenv.mkDerivation { + libXfont = callPackage ({ stdenv, pkg-config, fetchurl, libfontenc, xorgproto, freetype, xtrans, zlib }: stdenv.mkDerivation { name = "libXfont-1.5.4"; builder = ./builder.sh; src = fetchurl { @@ -866,12 +866,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0hiji1bvpl78aj3a3141hkk353aich71wv8l5l2z51scfy878zqs"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libfontenc xorgproto freetype xtrans zlib ]; meta.platforms = lib.platforms.unix; }) {}; - libXfont2 = callPackage ({ stdenv, pkgconfig, fetchurl, libfontenc, xorgproto, freetype, xtrans, zlib }: stdenv.mkDerivation { + libXfont2 = callPackage ({ stdenv, pkg-config, fetchurl, libfontenc, xorgproto, freetype, xtrans, zlib }: stdenv.mkDerivation { name = "libXfont2-2.0.4"; builder = ./builder.sh; src = fetchurl { @@ -879,12 +879,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1rk9pjxcm01lbr1dxhnvk4f2qrn6zp068qjbvvz5w0z5d0rin5bd"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libfontenc xorgproto freetype xtrans zlib ]; meta.platforms = lib.platforms.unix; }) {}; - libXft = callPackage ({ stdenv, pkgconfig, fetchurl, fontconfig, freetype, libX11, xorgproto, libXrender }: stdenv.mkDerivation { + libXft = callPackage ({ stdenv, pkg-config, fetchurl, fontconfig, freetype, libX11, xorgproto, libXrender }: stdenv.mkDerivation { name = "libXft-2.3.3"; builder = ./builder.sh; src = fetchurl { @@ -892,12 +892,12 @@ lib.makeScope newScope (self: with self; { sha256 = "05lja9s54090xwh31r0bqms4v3pimng5xr09g2rdnafx2vk6hp12"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ fontconfig freetype libX11 xorgproto libXrender ]; meta.platforms = lib.platforms.unix; }) {}; - libXi = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext, libXfixes }: stdenv.mkDerivation { + libXi = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXfixes }: stdenv.mkDerivation { name = "libXi-1.7.10"; builder = ./builder.sh; src = fetchurl { @@ -905,12 +905,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0q8hz3slga3w3ch8wp0k7ay9ilhz315qnab0w1y2x9w3cf7hv8rn"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext libXfixes ]; meta.platforms = lib.platforms.unix; }) {}; - libXinerama = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { + libXinerama = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { name = "libXinerama-1.1.4"; builder = ./builder.sh; src = fetchurl { @@ -918,12 +918,12 @@ lib.makeScope newScope (self: with self; { sha256 = "086p0axqj57nvkaqa6r00dnr9kyrn1m8blgf0zjy25zpxkbxn200"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXext xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - libXmu = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xorgproto, libXt }: stdenv.mkDerivation { + libXmu = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto, libXt }: stdenv.mkDerivation { name = "libXmu-1.1.3"; builder = ./builder.sh; src = fetchurl { @@ -931,12 +931,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0cdpqnx6258i4l6qhphvkdiyspysg0i5caqjy820kp63wwjk4d4w"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXext xorgproto libXt ]; meta.platforms = lib.platforms.unix; }) {}; - libXp = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXau, libXext }: stdenv.mkDerivation { + libXp = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXau, libXext }: stdenv.mkDerivation { name = "libXp-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -944,12 +944,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0mwc2jwmq03b1m9ihax5c6gw2ln8rc70zz4fsj3kb7440nchqdkz"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXau libXext ]; meta.platforms = lib.platforms.unix; }) {}; - libXpm = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xorgproto, libXt, gettext }: stdenv.mkDerivation { + libXpm = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto, libXt, gettext }: stdenv.mkDerivation { name = "libXpm-3.5.13"; builder = ./builder.sh; src = fetchurl { @@ -957,12 +957,12 @@ lib.makeScope newScope (self: with self; { sha256 = "09dc6nwlb2122h02vl64k9x56mxnyqz2gwpga0abfv4bb1bxmlcw"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig gettext ]; + nativeBuildInputs = [ pkg-config gettext ]; buildInputs = [ libX11 libXext xorgproto libXt ]; meta.platforms = lib.platforms.unix; }) {}; - libXpresent = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { + libXpresent = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { name = "libXpresent-1.0.0"; builder = ./builder.sh; src = fetchurl { @@ -970,12 +970,12 @@ lib.makeScope newScope (self: with self; { sha256 = "12kvvar3ihf6sw49h6ywfdiwmb8i1gh8wasg1zhzp6hs2hay06n1"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 ]; meta.platforms = lib.platforms.unix; }) {}; - libXrandr = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext, libXrender }: stdenv.mkDerivation { + libXrandr = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXrender }: stdenv.mkDerivation { name = "libXrandr-1.5.2"; builder = ./builder.sh; src = fetchurl { @@ -983,12 +983,12 @@ lib.makeScope newScope (self: with self; { sha256 = "08z0mqywrm7ij8bxlfrx0d2wy6kladdmkva1nw5k6qix82z0xsla"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext libXrender ]; meta.platforms = lib.platforms.unix; }) {}; - libXrender = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { + libXrender = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { name = "libXrender-0.9.10"; builder = ./builder.sh; src = fetchurl { @@ -996,12 +996,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0j89cnb06g8x79wmmnwzykgkkfdhin9j7hjpvsxwlr3fz1wmjvf0"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 ]; meta.platforms = lib.platforms.unix; }) {}; - libXres = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { + libXres = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { name = "libXres-1.2.0"; builder = ./builder.sh; src = fetchurl { @@ -1009,12 +1009,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1m0jr0lbz9ixpp9ihk68349q0i7ry2379lnfzdy4mrl86ijc2xgz"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext ]; meta.platforms = lib.platforms.unix; }) {}; - libXt = callPackage ({ stdenv, pkgconfig, fetchurl, libICE, xorgproto, libSM, libX11 }: stdenv.mkDerivation { + libXt = callPackage ({ stdenv, pkg-config, fetchurl, libICE, xorgproto, libSM, libX11 }: stdenv.mkDerivation { name = "libXt-1.2.0"; builder = ./builder.sh; src = fetchurl { @@ -1022,12 +1022,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0cbqlyssr8aia88c8i7z59z9d0kp3p2hp6683xhz9ndyv8qza7dk"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libICE xorgproto libSM libX11 ]; meta.platforms = lib.platforms.unix; }) {}; - libXtst = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext, libXi }: stdenv.mkDerivation { + libXtst = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXi }: stdenv.mkDerivation { name = "libXtst-1.2.3"; builder = ./builder.sh; src = fetchurl { @@ -1035,12 +1035,12 @@ lib.makeScope newScope (self: with self; { sha256 = "012jpyj7xfm653a9jcfqbzxyywdmwb2b5wr1dwylx14f3f54jma6"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext libXi ]; meta.platforms = lib.platforms.unix; }) {}; - libXv = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { + libXv = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { name = "libXv-1.0.11"; builder = ./builder.sh; src = fetchurl { @@ -1048,12 +1048,12 @@ lib.makeScope newScope (self: with self; { sha256 = "125hn06bd3d8y97hm2pbf5j55gg4r2hpd3ifad651i4sr7m16v6j"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext ]; meta.platforms = lib.platforms.unix; }) {}; - libXvMC = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext, libXv }: stdenv.mkDerivation { + libXvMC = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXv }: stdenv.mkDerivation { name = "libXvMC-1.0.12"; builder = ./builder.sh; src = fetchurl { @@ -1061,12 +1061,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1kbdjsvkm5l7axv7g477qj18sab2wnqhliy6197syzizgfbsfgbb"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext libXv ]; meta.platforms = lib.platforms.unix; }) {}; - libXxf86dga = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { + libXxf86dga = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { name = "libXxf86dga-1.1.5"; builder = ./builder.sh; src = fetchurl { @@ -1074,12 +1074,12 @@ lib.makeScope newScope (self: with self; { sha256 = "00vjvcdlc1sga251jkxn6gkxmx9h5n290ffxxpa40qbca1gvr61b"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXext xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - libXxf86misc = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { + libXxf86misc = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { name = "libXxf86misc-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -1087,12 +1087,12 @@ lib.makeScope newScope (self: with self; { sha256 = "107k593sx27vjz3v7gbb223add9i7w0bjc90gbb3jqpin3i07758"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXext xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - libXxf86vm = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { + libXxf86vm = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { name = "libXxf86vm-1.1.4"; builder = ./builder.sh; src = fetchurl { @@ -1100,12 +1100,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0mydhlyn72i7brjwypsqrpkls3nm6vxw0li8b2nw0caz7kwjgvmg"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXext xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - libdmx = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { + libdmx = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { name = "libdmx-1.1.4"; builder = ./builder.sh; src = fetchurl { @@ -1113,12 +1113,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0hvjfhrcym770cr0zpqajdy3cda30aiwbjzv16iafkqkbl090gr5"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext ]; meta.platforms = lib.platforms.unix; }) {}; - libfontenc = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, zlib }: stdenv.mkDerivation { + libfontenc = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, zlib }: stdenv.mkDerivation { name = "libfontenc-1.1.4"; builder = ./builder.sh; src = fetchurl { @@ -1126,12 +1126,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0y90170dp8wsidr1dzza0grxr1lfh30ji3b5vkjz4j6x1n0wxz1c"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto zlib ]; meta.platforms = lib.platforms.unix; }) {}; - libpciaccess = callPackage ({ stdenv, pkgconfig, fetchurl, zlib }: stdenv.mkDerivation { + libpciaccess = callPackage ({ stdenv, pkg-config, fetchurl, zlib }: stdenv.mkDerivation { name = "libpciaccess-0.16"; builder = ./builder.sh; src = fetchurl { @@ -1139,12 +1139,12 @@ lib.makeScope newScope (self: with self; { sha256 = "12glp4w1kgvmqn89lk19cgr6jccd3awxra4dxisp7pagi06rsk11"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib ]; meta.platforms = lib.platforms.unix; }) {}; - libpthreadstubs = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { + libpthreadstubs = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { name = "libpthread-stubs-0.4"; builder = ./builder.sh; src = fetchurl { @@ -1152,12 +1152,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0cz7s9w8lqgzinicd4g36rjg08zhsbyngh0w68c3np8nlc8mkl74"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; meta.platforms = lib.platforms.unix; }) {}; - libxcb = callPackage ({ stdenv, pkgconfig, fetchurl, libxslt, libpthreadstubs, libXau, xcbproto, libXdmcp, python3 }: stdenv.mkDerivation { + libxcb = callPackage ({ stdenv, pkg-config, fetchurl, libxslt, libpthreadstubs, libXau, xcbproto, libXdmcp, python3 }: stdenv.mkDerivation { name = "libxcb-1.14"; builder = ./builder.sh; src = fetchurl { @@ -1165,12 +1165,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0d2chjgyn5lr9sfhacfvqgnj9l9faz11vn322a06jd6lk3dxcpm5"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig python3 ]; + nativeBuildInputs = [ pkg-config python3 ]; buildInputs = [ libxslt libpthreadstubs libXau xcbproto libXdmcp ]; meta.platforms = lib.platforms.unix; }) {}; - libxkbfile = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { + libxkbfile = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { name = "libxkbfile-1.1.0"; builder = ./builder.sh; src = fetchurl { @@ -1178,12 +1178,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1irq9crvscd3yb8sr802dhvvfr35jdy1n2yz094xplmd42mbv3bm"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 ]; meta.platforms = lib.platforms.unix; }) {}; - libxshmfence = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation { + libxshmfence = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { name = "libxshmfence-1.3"; builder = ./builder.sh; src = fetchurl { @@ -1191,12 +1191,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1ir0j92mnd1nk37mrv9bz5swnccqldicgszvfsh62jd14q6k115q"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - listres = callPackage ({ stdenv, pkgconfig, fetchurl, libXaw, libXmu, xorgproto, libXt }: stdenv.mkDerivation { + listres = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXmu, xorgproto, libXt }: stdenv.mkDerivation { name = "listres-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -1204,12 +1204,12 @@ lib.makeScope newScope (self: with self; { sha256 = "041bxkvv6f92sm3hhm977c4gdqdv5r1jyxjqcqfi8vkrg3s2j4ka"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libXaw libXmu xorgproto libXt ]; meta.platforms = lib.platforms.unix; }) {}; - lndir = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation { + lndir = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { name = "lndir-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -1217,12 +1217,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0pdngiy8zdhsiqx2am75yfcl36l7kd7d7nl0rss8shcdvsqgmx29"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - luit = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { + luit = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { name = "luit-20190106"; builder = ./builder.sh; src = fetchurl { @@ -1230,12 +1230,12 @@ lib.makeScope newScope (self: with self; { sha256 = "081rrajj5hpgx3pvm43grqzscnq5kl320q0wq6zzhf6wrijhz41b"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; meta.platforms = lib.platforms.unix; }) {}; - makedepend = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation { + makedepend = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { name = "makedepend-1.0.6"; builder = ./builder.sh; src = fetchurl { @@ -1243,12 +1243,12 @@ lib.makeScope newScope (self: with self; { sha256 = "072h9nzh8s5vqfz35dli4fba36fnr219asjrb7p89n8ph0paan6m"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - mkfontscale = callPackage ({ stdenv, pkgconfig, fetchurl, libfontenc, freetype, xorgproto, zlib }: stdenv.mkDerivation { + mkfontscale = callPackage ({ stdenv, pkg-config, fetchurl, libfontenc, freetype, xorgproto, zlib }: stdenv.mkDerivation { name = "mkfontscale-1.2.1"; builder = ./builder.sh; src = fetchurl { @@ -1256,12 +1256,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1ixsnsm2mn0zy9ksdid0lj6irnhvasfik9mz8bbrs5sajzmra16a"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libfontenc freetype xorgproto zlib ]; meta.platforms = lib.platforms.unix; }) {}; - oclock = callPackage ({ stdenv, pkgconfig, fetchurl, libxkbfile, libX11, libXext, libXmu, libXt }: stdenv.mkDerivation { + oclock = callPackage ({ stdenv, pkg-config, fetchurl, libxkbfile, libX11, libXext, libXmu, libXt }: stdenv.mkDerivation { name = "oclock-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -1269,12 +1269,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1zmfzfmdp42nvapf0qz1bc3i3waq5sjrpkgfw64qs4nmq30wy86c"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxkbfile libX11 libXext libXmu libXt ]; meta.platforms = lib.platforms.unix; }) {}; - sessreg = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation { + sessreg = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { name = "sessreg-1.1.2"; builder = ./builder.sh; src = fetchurl { @@ -1282,12 +1282,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0crczl25zynkrslmm8sjaxszhrh4i33m7h5fg4wfdb3k8aarxjyz"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - setxkbmap = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libxkbfile }: stdenv.mkDerivation { + setxkbmap = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libxkbfile }: stdenv.mkDerivation { name = "setxkbmap-1.3.2"; builder = ./builder.sh; src = fetchurl { @@ -1295,12 +1295,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1xdrxs65v7d0rw1yaz0vsz55w4hxym99216p085ya9978j379wlg"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libxkbfile ]; meta.platforms = lib.platforms.unix; }) {}; - smproxy = callPackage ({ stdenv, pkgconfig, fetchurl, libICE, libSM, libXmu, libXt }: stdenv.mkDerivation { + smproxy = callPackage ({ stdenv, pkg-config, fetchurl, libICE, libSM, libXmu, libXt }: stdenv.mkDerivation { name = "smproxy-1.0.6"; builder = ./builder.sh; src = fetchurl { @@ -1308,12 +1308,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0rkjyzmsdqmlrkx8gy2j4q6iksk58hcc92xzdprkf8kml9ar3wbc"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libICE libSM libXmu libXt ]; meta.platforms = lib.platforms.unix; }) {}; - transset = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { + transset = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { name = "transset-1.0.2"; builder = ./builder.sh; src = fetchurl { @@ -1321,12 +1321,12 @@ lib.makeScope newScope (self: with self; { sha256 = "088v8p0yfn4r3azabp6662hqikfs2gjb9xmjjd45gnngwwp19b2b"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - twm = callPackage ({ stdenv, pkgconfig, fetchurl, libICE, libSM, libX11, libXext, libXmu, xorgproto, libXt }: stdenv.mkDerivation { + twm = callPackage ({ stdenv, pkg-config, fetchurl, libICE, libSM, libX11, libXext, libXmu, xorgproto, libXt }: stdenv.mkDerivation { name = "twm-1.0.10"; builder = ./builder.sh; src = fetchurl { @@ -1334,12 +1334,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1ms5cj1w3g26zg6bxdv1j9hl0pxr4300qnv003cz1q3cl7ffljb4"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libICE libSM libX11 libXext libXmu xorgproto libXt ]; meta.platforms = lib.platforms.unix; }) {}; - utilmacros = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { + utilmacros = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { name = "util-macros-1.19.2"; builder = ./builder.sh; src = fetchurl { @@ -1347,12 +1347,12 @@ lib.makeScope newScope (self: with self; { sha256 = "04p7ydqxgq37jklnfj18b70zsifiz4h50wvrk94i2112mmv37r6p"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; meta.platforms = lib.platforms.unix; }) {}; - viewres = callPackage ({ stdenv, pkgconfig, fetchurl, libXaw, libXmu, libXt }: stdenv.mkDerivation { + viewres = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXmu, libXt }: stdenv.mkDerivation { name = "viewres-1.0.5"; builder = ./builder.sh; src = fetchurl { @@ -1360,12 +1360,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1mz319kfmvcrdpi22dmdr91mif1j0j3ck1f8mmnz5g1r9kl1in2y"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libXaw libXmu libXt ]; meta.platforms = lib.platforms.unix; }) {}; - x11perf = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, libXft, libXmu, xorgproto, libXrender }: stdenv.mkDerivation { + x11perf = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, libXft, libXmu, xorgproto, libXrender }: stdenv.mkDerivation { name = "x11perf-1.6.1"; builder = ./builder.sh; src = fetchurl { @@ -1373,12 +1373,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0d3wh6z6znwhfdiv0zaggfj0xgish98xa10yy76b9517zj7hnzhw"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXext libXft libXmu xorgproto libXrender ]; meta.platforms = lib.platforms.unix; }) {}; - xauth = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXau, libXext, libXmu, xorgproto }: stdenv.mkDerivation { + xauth = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXau, libXext, libXmu, xorgproto }: stdenv.mkDerivation { name = "xauth-1.1"; builder = ./builder.sh; src = fetchurl { @@ -1386,12 +1386,12 @@ lib.makeScope newScope (self: with self; { sha256 = "032klzzw8r09z36x1272ssd79bcisz8j5p8gbdy111fiknvx27bd"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXau libXext libXmu xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xbacklight = callPackage ({ stdenv, pkgconfig, fetchurl, libxcb, xcbutil }: stdenv.mkDerivation { + xbacklight = callPackage ({ stdenv, pkg-config, fetchurl, libxcb, xcbutil }: stdenv.mkDerivation { name = "xbacklight-1.2.3"; builder = ./builder.sh; src = fetchurl { @@ -1399,12 +1399,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1plssg0s3pbslg6rfzxp9sx8ryvn8l32zyvc8zp9zsbsfwjg69rs"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxcb xcbutil ]; meta.platforms = lib.platforms.unix; }) {}; - xbitmaps = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { + xbitmaps = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { name = "xbitmaps-1.1.2"; builder = ./builder.sh; src = fetchurl { @@ -1412,12 +1412,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1vh73sc13s7w5r6gnc6irca56s7998bja7wgdivkfn8jccawgw5r"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; meta.platforms = lib.platforms.unix; }) {}; - xcalc = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, xorgproto, libXt }: stdenv.mkDerivation { + xcalc = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, xorgproto, libXt }: stdenv.mkDerivation { name = "xcalc-1.1.0"; builder = ./builder.sh; src = fetchurl { @@ -1425,12 +1425,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1sxmlcb0sb3h4z05kl5l0kxnhrc0h8c74p9m3zdc7bv58jaldmym"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXaw xorgproto libXt ]; meta.platforms = lib.platforms.unix; }) {}; - xcbproto = callPackage ({ stdenv, pkgconfig, fetchurl, python3 }: stdenv.mkDerivation { + xcbproto = callPackage ({ stdenv, pkg-config, fetchurl, python3 }: stdenv.mkDerivation { name = "xcb-proto-1.14.1"; builder = ./builder.sh; src = fetchurl { @@ -1438,12 +1438,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1hzwazgyywd9mz4mjj1yv8ski27qqx7ypmyr27m39hrajyddsjph"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig python3 ]; + nativeBuildInputs = [ pkg-config python3 ]; buildInputs = [ ]; meta.platforms = lib.platforms.unix; }) {}; - xcbutil = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation { + xcbutil = callPackage ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation { name = "xcb-util-0.4.0"; builder = ./builder.sh; src = fetchurl { @@ -1451,12 +1451,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1sahmrgbpyki4bb72hxym0zvxwnycmswsxiisgqlln9vrdlr9r26"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig m4 ]; + nativeBuildInputs = [ pkg-config m4 ]; buildInputs = [ gperf libxcb xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xcbutilcursor = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, libxcb, xcbutilimage, xcbutilrenderutil, xorgproto, m4 }: stdenv.mkDerivation { + xcbutilcursor = callPackage ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xcbutilimage, xcbutilrenderutil, xorgproto, m4 }: stdenv.mkDerivation { name = "xcb-util-cursor-0.1.3"; builder = ./builder.sh; src = fetchurl { @@ -1464,12 +1464,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0krr4rcw6r42cncinzvzzdqnmxk3nrgpnadyg2h8k9x10q3hm885"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig m4 ]; + nativeBuildInputs = [ pkg-config m4 ]; buildInputs = [ gperf libxcb xcbutilimage xcbutilrenderutil xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xcbutilerrors = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, libxcb, xcbproto, xorgproto, m4 }: stdenv.mkDerivation { + xcbutilerrors = callPackage ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xcbproto, xorgproto, m4 }: stdenv.mkDerivation { name = "xcb-util-errors-1.0"; builder = ./builder.sh; src = fetchurl { @@ -1477,12 +1477,12 @@ lib.makeScope newScope (self: with self; { sha256 = "158rm913dg3hxrrhyvvxr8bcm0pjy5jws70dhy2s12w1krv829k8"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig m4 ]; + nativeBuildInputs = [ pkg-config m4 ]; buildInputs = [ gperf libxcb xcbproto xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xcbutilimage = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, libxcb, xcbutil, xorgproto, m4 }: stdenv.mkDerivation { + xcbutilimage = callPackage ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xcbutil, xorgproto, m4 }: stdenv.mkDerivation { name = "xcb-util-image-0.4.0"; builder = ./builder.sh; src = fetchurl { @@ -1490,12 +1490,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1z1gxacg7q4cw6jrd26gvi5y04npsyavblcdad1xccc8swvnmf9d"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig m4 ]; + nativeBuildInputs = [ pkg-config m4 ]; buildInputs = [ gperf libxcb xcbutil xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xcbutilkeysyms = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation { + xcbutilkeysyms = callPackage ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation { name = "xcb-util-keysyms-0.4.0"; builder = ./builder.sh; src = fetchurl { @@ -1503,12 +1503,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1nbd45pzc1wm6v5drr5338j4nicbgxa5hcakvsvm5pnyy47lky0f"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig m4 ]; + nativeBuildInputs = [ pkg-config m4 ]; buildInputs = [ gperf libxcb xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xcbutilrenderutil = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation { + xcbutilrenderutil = callPackage ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation { name = "xcb-util-renderutil-0.3.9"; builder = ./builder.sh; src = fetchurl { @@ -1516,12 +1516,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0nza1csdvvxbmk8vgv8vpmq7q8h05xrw3cfx9lwxd1hjzd47xsf6"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig m4 ]; + nativeBuildInputs = [ pkg-config m4 ]; buildInputs = [ gperf libxcb xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xcbutilwm = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation { + xcbutilwm = callPackage ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation { name = "xcb-util-wm-0.4.1"; builder = ./builder.sh; src = fetchurl { @@ -1529,12 +1529,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0gra7hfyxajic4mjd63cpqvd20si53j1q3rbdlkqkahfciwq3gr8"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig m4 ]; + nativeBuildInputs = [ pkg-config m4 ]; buildInputs = [ gperf libxcb xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xclock = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, libXft, libxkbfile, libXmu, xorgproto, libXrender, libXt }: stdenv.mkDerivation { + xclock = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXft, libxkbfile, libXmu, xorgproto, libXrender, libXt }: stdenv.mkDerivation { name = "xclock-1.0.9"; builder = ./builder.sh; src = fetchurl { @@ -1542,12 +1542,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1fr3q4rszgx7x2zxy2ip592a3fgx20hfwac49p2l5b7jqsr1ying"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXaw libXft libxkbfile libXmu xorgproto libXrender libXt ]; meta.platforms = lib.platforms.unix; }) {}; - xcmsdb = callPackage ({ stdenv, pkgconfig, fetchurl, libX11 }: stdenv.mkDerivation { + xcmsdb = callPackage ({ stdenv, pkg-config, fetchurl, libX11 }: stdenv.mkDerivation { name = "xcmsdb-1.0.5"; builder = ./builder.sh; src = fetchurl { @@ -1555,12 +1555,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1ik7gzlp2igz183x70883000ygp99r20x3aah6xhaslbpdhm6n75"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 ]; meta.platforms = lib.platforms.unix; }) {}; - xcompmgr = callPackage ({ stdenv, pkgconfig, fetchurl, libXcomposite, libXdamage, libXext, libXfixes, libXrender }: stdenv.mkDerivation { + xcompmgr = callPackage ({ stdenv, pkg-config, fetchurl, libXcomposite, libXdamage, libXext, libXfixes, libXrender }: stdenv.mkDerivation { name = "xcompmgr-1.1.8"; builder = ./builder.sh; src = fetchurl { @@ -1568,12 +1568,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0hvjkanrdlvk3ln5a1jx3c9ggziism2jr1na7jl3zyk0y3sdm28b"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libXcomposite libXdamage libXext libXfixes libXrender ]; meta.platforms = lib.platforms.unix; }) {}; - xconsole = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt }: stdenv.mkDerivation { + xconsole = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt }: stdenv.mkDerivation { name = "xconsole-1.0.7"; builder = ./builder.sh; src = fetchurl { @@ -1581,12 +1581,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1q2ib1626i5da0nda09sp3vzppjrcn82fff83cw7hwr0vy14h56i"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXaw libXmu xorgproto libXt ]; meta.platforms = lib.platforms.unix; }) {}; - xcursorgen = callPackage ({ stdenv, pkgconfig, fetchurl, libpng, libX11, libXcursor }: stdenv.mkDerivation { + xcursorgen = callPackage ({ stdenv, pkg-config, fetchurl, libpng, libX11, libXcursor }: stdenv.mkDerivation { name = "xcursorgen-1.0.7"; builder = ./builder.sh; src = fetchurl { @@ -1594,12 +1594,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0ggbv084cavp52hjgcz3vdj0g018axs0m23c03lpc5sgn92gidim"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libpng libX11 libXcursor ]; meta.platforms = lib.platforms.unix; }) {}; - xcursorthemes = callPackage ({ stdenv, pkgconfig, fetchurl, libXcursor }: stdenv.mkDerivation { + xcursorthemes = callPackage ({ stdenv, pkg-config, fetchurl, libXcursor }: stdenv.mkDerivation { name = "xcursor-themes-1.0.6"; builder = ./builder.sh; src = fetchurl { @@ -1607,12 +1607,12 @@ lib.makeScope newScope (self: with self; { sha256 = "16a96li0s0ggg60v7f6ywxmsrmxdfizcw55ccv7sp4qjfisca7pf"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libXcursor ]; meta.platforms = lib.platforms.unix; }) {}; - xdm = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXau, libXaw, libXdmcp, libXext, libXft, libXinerama, libXmu, libXpm, xorgproto, libXrender, libXt }: stdenv.mkDerivation { + xdm = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXau, libXaw, libXdmcp, libXext, libXft, libXinerama, libXmu, libXpm, xorgproto, libXrender, libXt }: stdenv.mkDerivation { name = "xdm-1.1.12"; builder = ./builder.sh; src = fetchurl { @@ -1620,12 +1620,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1x17hdymf6rd8jmh4n1sd4g5a8ayr5w94nwjw84qs2fs5pvq7lhd"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm xorgproto libXrender libXt ]; meta.platforms = lib.platforms.unix; }) {}; - xdpyinfo = callPackage ({ stdenv, pkgconfig, fetchurl, libdmx, libX11, libxcb, libXcomposite, libXext, libXi, libXinerama, xorgproto, libXrender, libXtst, libXxf86dga, libXxf86misc, libXxf86vm }: stdenv.mkDerivation { + xdpyinfo = callPackage ({ stdenv, pkg-config, fetchurl, libdmx, libX11, libxcb, libXcomposite, libXext, libXi, libXinerama, xorgproto, libXrender, libXtst, libXxf86dga, libXxf86misc, libXxf86vm }: stdenv.mkDerivation { name = "xdpyinfo-1.3.2"; builder = ./builder.sh; src = fetchurl { @@ -1633,12 +1633,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0ldgrj4w2fa8jng4b3f3biaj0wyn8zvya88pnk70d7k12pcqw8rh"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libdmx libX11 libxcb libXcomposite libXext libXi libXinerama xorgproto libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ]; meta.platforms = lib.platforms.unix; }) {}; - xdriinfo = callPackage ({ stdenv, pkgconfig, fetchurl, libGL, xorgproto, libX11 }: stdenv.mkDerivation { + xdriinfo = callPackage ({ stdenv, pkg-config, fetchurl, libGL, xorgproto, libX11 }: stdenv.mkDerivation { name = "xdriinfo-1.0.6"; builder = ./builder.sh; src = fetchurl { @@ -1646,12 +1646,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0lcx8h3zd11m4w8wf7dyp89826d437iz78cyrix436bqx31x5k6r"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libGL xorgproto libX11 ]; meta.platforms = lib.platforms.unix; }) {}; - xev = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto, libXrandr }: stdenv.mkDerivation { + xev = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXrandr }: stdenv.mkDerivation { name = "xev-1.2.3"; builder = ./builder.sh; src = fetchurl { @@ -1659,12 +1659,12 @@ lib.makeScope newScope (self: with self; { sha256 = "02ddsdx138g7szhwklpbzi0cxr34871iay3k28kdcihrz8f4zg36"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto libXrandr ]; meta.platforms = lib.platforms.unix; }) {}; - xeyes = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, libXmu, xorgproto, libXrender, libXt }: stdenv.mkDerivation { + xeyes = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, libXmu, xorgproto, libXrender, libXt }: stdenv.mkDerivation { name = "xeyes-1.1.2"; builder = ./builder.sh; src = fetchurl { @@ -1672,12 +1672,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0lq5j7fryx1wn998jq6h3icz1h6pqrsbs3adskjzjyhn5l6yrg2p"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXext libXmu xorgproto libXrender libXt ]; meta.platforms = lib.platforms.unix; }) {}; - xf86inputevdev = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libevdev, udev, mtdev, xorgserver }: stdenv.mkDerivation { + xf86inputevdev = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libevdev, udev, mtdev, xorgserver }: stdenv.mkDerivation { name = "xf86-input-evdev-2.10.6"; builder = ./builder.sh; src = fetchurl { @@ -1685,12 +1685,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1h1y0fwnawlp4yc5llr1l7hwfcxxpln2fxhy6arcf6w6h4z0f9l7"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libevdev udev mtdev xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86inputjoystick = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + xf86inputjoystick = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { name = "xf86-input-joystick-1.6.3"; builder = ./builder.sh; src = fetchurl { @@ -1698,12 +1698,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1awfq496d082brgjbr60lhm6jvr9537rflwxqdfqwfzjy3n6jxly"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86inputkeyboard = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + xf86inputkeyboard = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { name = "xf86-input-keyboard-1.9.0"; builder = ./builder.sh; src = fetchurl { @@ -1711,12 +1711,12 @@ lib.makeScope newScope (self: with self; { sha256 = "12032yg412kyvnmc5fha1in7mpi651d8sa1bk4138s2j2zr01jgp"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86inputlibinput = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libinput, xorgserver }: stdenv.mkDerivation { + xf86inputlibinput = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libinput, xorgserver }: stdenv.mkDerivation { name = "xf86-input-libinput-0.30.0"; builder = ./builder.sh; src = fetchurl { @@ -1724,12 +1724,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1h4np66p87jf0c85ig524w8f5rbhl5gx8fww1qg0c55f87yzkizr"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libinput xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86inputmouse = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + xf86inputmouse = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { name = "xf86-input-mouse-1.9.3"; builder = ./builder.sh; src = fetchurl { @@ -1737,12 +1737,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1iawr1wyl2qch1mqszcs0s84i92mh4xxprflnycbw1adc18b7v4k"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86inputsynaptics = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libevdev, libX11, libXi, xorgserver, libXtst }: stdenv.mkDerivation { + xf86inputsynaptics = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libevdev, libX11, libXi, xorgserver, libXtst }: stdenv.mkDerivation { name = "xf86-input-synaptics-1.9.1"; builder = ./builder.sh; src = fetchurl { @@ -1750,12 +1750,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0xhm03qywwfgkpfl904d08lx00y28m1b6lqmks5nxizixwk3by3s"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libevdev libX11 libXi xorgserver libXtst ]; meta.platforms = lib.platforms.unix; }) {}; - xf86inputvmmouse = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, udev, xorgserver }: stdenv.mkDerivation { + xf86inputvmmouse = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, udev, xorgserver }: stdenv.mkDerivation { name = "xf86-input-vmmouse-13.1.0"; builder = ./builder.sh; src = fetchurl { @@ -1763,12 +1763,12 @@ lib.makeScope newScope (self: with self; { sha256 = "06ckn4hlkpig5vnivl0zj8a7ykcgvrsj8b3iccl1pgn1gaamix8a"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto udev xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86inputvoid = callPackage ({ stdenv, pkgconfig, fetchurl, xorgserver, xorgproto }: stdenv.mkDerivation { + xf86inputvoid = callPackage ({ stdenv, pkg-config, fetchurl, xorgserver, xorgproto }: stdenv.mkDerivation { name = "xf86-input-void-1.4.1"; builder = ./builder.sh; src = fetchurl { @@ -1776,12 +1776,12 @@ lib.makeScope newScope (self: with self; { sha256 = "171k8b8s42s3w73l7ln9jqwk88w4l7r1km2blx1vy898c854yvpr"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgserver xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videoamdgpu = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, mesa, libGL, libdrm, udev, xorgserver }: stdenv.mkDerivation { + xf86videoamdgpu = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, mesa, libGL, libdrm, udev, xorgserver }: stdenv.mkDerivation { name = "xf86-video-amdgpu-19.1.0"; builder = ./builder.sh; src = fetchurl { @@ -1789,12 +1789,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0pgy4ihnja0vm8504qw7qxh3pdpa3p9k6967nz15m6b1mvha83jg"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto mesa libGL libdrm udev xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videoapm = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videoapm = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-apm-1.3.0"; builder = ./builder.sh; src = fetchurl { @@ -1802,12 +1802,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0znwqfc8abkiha98an8hxsngnz96z6cd976bc4bsvz1km6wqk0c0"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videoark = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videoark = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-ark-0.7.5"; builder = ./builder.sh; src = fetchurl { @@ -1815,12 +1815,12 @@ lib.makeScope newScope (self: with self; { sha256 = "07p5vdsj2ckxb6wh02s61akcv4qfg6s1d5ld3jn3lfaayd3f1466"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videoast = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videoast = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-ast-1.1.5"; builder = ./builder.sh; src = fetchurl { @@ -1828,12 +1828,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1pm2cy81ma7ldsw0yfk28b33h9z2hcj5rccrxhfxfgvxsiavrnqy"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videoati = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, mesa, libGL, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videoati = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, mesa, libGL, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-ati-19.1.0"; builder = ./builder.sh; src = fetchurl { @@ -1841,12 +1841,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0j9w4axsqlycv4v14g53xyhkm9h7d27b2fcv9lrzb9gf54b5m7v5"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto mesa libGL libdrm udev libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videochips = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videochips = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-chips-1.4.0"; builder = ./builder.sh; src = fetchurl { @@ -1854,12 +1854,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1gqzy7q9v824m7hqkbbmncxg082zm0d4mafgc97c4skyiwgf9wq7"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videocirrus = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videocirrus = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-cirrus-1.5.3"; builder = ./builder.sh; src = fetchurl { @@ -1867,12 +1867,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1asifc6ld2g9kap15vfhvsvyl69lj7pw3d9ra9mi4najllh7pj7d"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videodummy = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + xf86videodummy = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { name = "xf86-video-dummy-0.3.8"; builder = ./builder.sh; src = fetchurl { @@ -1880,12 +1880,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1fcm9vwgv8wnffbvkzddk4yxrh3kc0np6w65wj8k88q7jf3bn4ip"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videofbdev = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videofbdev = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-fbdev-0.5.0"; builder = ./builder.sh; src = fetchurl { @@ -1893,12 +1893,12 @@ lib.makeScope newScope (self: with self; { sha256 = "16a66zr0l1lmssa07i3rzy07djxnb45c17ks8c71h8l06xgxihyw"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videogeode = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videogeode = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-geode-2.11.19"; builder = ./builder.sh; src = fetchurl { @@ -1906,12 +1906,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0zn9gb49grds5mcs1dlrx241k2w1sgqmx4i5x7v6159xxqhlqsf6"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videoglide = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + xf86videoglide = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { name = "xf86-video-glide-1.2.2"; builder = ./builder.sh; src = fetchurl { @@ -1919,12 +1919,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1vaav6kx4n00q4fawgqnjmbdkppl0dir2dkrj4ad372mxrvl9c4y"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videoglint = callPackage ({ stdenv, pkgconfig, fetchurl, libpciaccess, xorgproto, xorgserver }: stdenv.mkDerivation { + xf86videoglint = callPackage ({ stdenv, pkg-config, fetchurl, libpciaccess, xorgproto, xorgserver }: stdenv.mkDerivation { name = "xf86-video-glint-1.2.9"; builder = ./builder.sh; src = fetchurl { @@ -1932,12 +1932,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1lkpspvrvrp9s539bhfdjfh4andaqyk63l6zjn8m3km95smk6a45"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libpciaccess xorgproto xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videoi128 = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videoi128 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-i128-1.4.0"; builder = ./builder.sh; src = fetchurl { @@ -1945,12 +1945,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1snhpv1igrhifcls3r498kjd14ml6x2xvih7zk9xlsd1ymmhlb4g"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videoi740 = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videoi740 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-i740-1.4.0"; builder = ./builder.sh; src = fetchurl { @@ -1958,12 +1958,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0l3s1m95bdsg4gki943qipq8agswbb84dzcflpxa3vlckwhh3r26"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videointel = callPackage ({ stdenv, pkgconfig, fetchurl, cairo, xorgproto, libdrm, libpng, udev, libpciaccess, libX11, xcbutil, libxcb, libXcursor, libXdamage, libXext, libXfixes, xorgserver, libXrandr, libXrender, libxshmfence, libXtst, libXvMC }: stdenv.mkDerivation { + xf86videointel = callPackage ({ stdenv, pkg-config, fetchurl, cairo, xorgproto, libdrm, libpng, udev, libpciaccess, libX11, xcbutil, libxcb, libXcursor, libXdamage, libXext, libXfixes, xorgserver, libXrandr, libXrender, libxshmfence, libXtst, libXvMC }: stdenv.mkDerivation { name = "xf86-video-intel-2.99.917"; builder = ./builder.sh; src = fetchurl { @@ -1971,12 +1971,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1jb7jspmzidfixbc0gghyjmnmpqv85i7pi13l4h2hn2ml3p83dq0"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ cairo xorgproto libdrm libpng udev libpciaccess libX11 xcbutil libxcb libXcursor libXdamage libXext libXfixes xorgserver libXrandr libXrender libxshmfence libXtst libXvMC ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videomach64 = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videomach64 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-mach64-6.9.6"; builder = ./builder.sh; src = fetchurl { @@ -1984,12 +1984,12 @@ lib.makeScope newScope (self: with self; { sha256 = "171wg8r6py1l138s58rlapin3rlpwsg9spmvhc7l68mm3g3hf1vs"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videomga = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videomga = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-mga-2.0.0"; builder = ./builder.sh; src = fetchurl { @@ -1997,12 +1997,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0yaxpgyyj9398nzzr5vnsfxcis76z46p9814yzj8179yl7hld296"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videoneomagic = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videoneomagic = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-neomagic-1.3.0"; builder = ./builder.sh; src = fetchurl { @@ -2010,12 +2010,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0r4h673kw8fl7afc30anwbjlbhp82mg15fvaxf470xg7z983k0wk"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videonewport = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + xf86videonewport = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { name = "xf86-video-newport-0.2.4"; builder = ./builder.sh; src = fetchurl { @@ -2023,25 +2023,25 @@ lib.makeScope newScope (self: with self; { sha256 = "1yafmp23jrfdmc094i6a4dsizapsc9v0pl65cpc8w1kvn7343k4i"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videonouveau = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-nouveau-1.0.16"; + xf86videonouveau = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-nouveau-1.0.17"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-nouveau-1.0.16.tar.bz2"; - sha256 = "01mz8gnq7j6bvrqb2ljm3d1wpjhi9p2z2w8zbkdrqmqmcj060h1h"; + url = "mirror://xorg/individual/driver/xf86-video-nouveau-1.0.17.tar.bz2"; + sha256 = "0sqm1jwjg15sp8v7039y2hsbhph8gpjd2bdzcqqiij2mgbi254s9"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm udev libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videonv = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videonv = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-nv-2.1.21"; builder = ./builder.sh; src = fetchurl { @@ -2049,12 +2049,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0bdk3pc5y0n7p53q4gc2ff7bw16hy5hwdjjxkm5j3s7hdyg6960z"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videoomap = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, xorgserver }: stdenv.mkDerivation { + xf86videoomap = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, xorgserver }: stdenv.mkDerivation { name = "xf86-video-omap-0.4.5"; builder = ./builder.sh; src = fetchurl { @@ -2062,12 +2062,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0nmbrx6913dc724y8wj2p6vqfbj5zdjfmsl037v627jj0whx9rwk"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videoopenchrome = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, udev, libpciaccess, libX11, libXext, xorgserver, libXvMC }: stdenv.mkDerivation { + xf86videoopenchrome = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, udev, libpciaccess, libX11, libXext, xorgserver, libXvMC }: stdenv.mkDerivation { name = "xf86-video-openchrome-0.6.0"; builder = ./builder.sh; src = fetchurl { @@ -2075,12 +2075,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0x9gq3hw6k661k82ikd1y2kkk4dmgv310xr5q59dwn4k6z37aafs"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm udev libpciaccess libX11 libXext xorgserver libXvMC ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videoqxl = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videoqxl = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-qxl-0.1.5"; builder = ./builder.sh; src = fetchurl { @@ -2088,12 +2088,12 @@ lib.makeScope newScope (self: with self; { sha256 = "14jc24znnahhmz4kqalafmllsg8awlz0y6gpgdpk5ih38ph851mi"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm udev libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videor128 = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videor128 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-r128-6.11.0"; builder = ./builder.sh; src = fetchurl { @@ -2101,12 +2101,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0snvwmrh8dqyyaq7ggicym6yrsg4brygkx9156r0m095m7fp3rav"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videorendition = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videorendition = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-rendition-4.2.7"; builder = ./builder.sh; src = fetchurl { @@ -2114,12 +2114,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0yzqcdfrnnyaaaa76d4hpwycpq4x2j8qvg9m4q19lj4xbicwc4cm"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videos3virge = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videos3virge = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-s3virge-1.11.0"; builder = ./builder.sh; src = fetchurl { @@ -2127,12 +2127,12 @@ lib.makeScope newScope (self: with self; { sha256 = "06d1v5s7xf00y18x12cz11sk00rgn0yq95w66kmgzy465pzxvj84"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videosavage = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videosavage = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-savage-2.3.9"; builder = ./builder.sh; src = fetchurl { @@ -2140,12 +2140,12 @@ lib.makeScope newScope (self: with self; { sha256 = "11pcrsdpdrwk0mrgv83s5nsx8a9i4lhmivnal3fjbrvi3zdw94rc"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videosiliconmotion = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videosiliconmotion = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-siliconmotion-1.7.9"; builder = ./builder.sh; src = fetchurl { @@ -2153,12 +2153,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1g2r6gxqrmjdff95d42msxdw6vmkg2zn5sqv0rxd420iwy8wdwyh"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videosis = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videosis = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-sis-0.11.0"; builder = ./builder.sh; src = fetchurl { @@ -2166,12 +2166,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0srvrhydjnynfb7b1s145rgmsk4f71iz0ag4icpmb05944d90xr1"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videosisusb = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videosisusb = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-sisusb-0.9.7"; builder = ./builder.sh; src = fetchurl { @@ -2179,12 +2179,12 @@ lib.makeScope newScope (self: with self; { sha256 = "090lfs3hjz3cjd016v5dybmcsigj6ffvjdhdsqv13k90p4b08h7l"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videosuncg6 = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + xf86videosuncg6 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { name = "xf86-video-suncg6-1.1.2"; builder = ./builder.sh; src = fetchurl { @@ -2192,12 +2192,12 @@ lib.makeScope newScope (self: with self; { sha256 = "04fgwgk02m4nimlv67rrg1wnyahgymrn6rb2cjj1l8bmzkii4glr"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videosunffb = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + xf86videosunffb = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { name = "xf86-video-sunffb-1.2.2"; builder = ./builder.sh; src = fetchurl { @@ -2205,12 +2205,12 @@ lib.makeScope newScope (self: with self; { sha256 = "07z3ngifwg2d4jgq8pms47n5lr2yn0ai72g86xxjnb3k20n5ym7s"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videosunleo = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + xf86videosunleo = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { name = "xf86-video-sunleo-1.2.2"; builder = ./builder.sh; src = fetchurl { @@ -2218,12 +2218,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1gacm0s6rii4x5sx9py5bhvs50jd4vs3nnbwjdjymyf31kpdirl3"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videotdfx = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videotdfx = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-tdfx-1.5.0"; builder = ./builder.sh; src = fetchurl { @@ -2231,12 +2231,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0qc5wzwf1n65si9rc37bh224pzahh7gp67vfimbxs0b9yvhq0i9g"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videotga = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videotga = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-tga-1.2.2"; builder = ./builder.sh; src = fetchurl { @@ -2244,12 +2244,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0cb161lvdgi6qnf1sfz722qn38q7kgakcvj7b45ba3i0020828r0"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videotrident = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videotrident = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-trident-1.3.8"; builder = ./builder.sh; src = fetchurl { @@ -2257,12 +2257,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0gxcar434kx813fxdpb93126lhmkl3ikabaljhcj5qn3fkcijlcy"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videov4l = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + xf86videov4l = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { name = "xf86-video-v4l-0.3.0"; builder = ./builder.sh; src = fetchurl { @@ -2270,12 +2270,12 @@ lib.makeScope newScope (self: with self; { sha256 = "084x4p4avy72mgm2vnnvkicw3419i6pp3wxik8zqh7gmq4xv5z75"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videovboxvideo = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videovboxvideo = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-vboxvideo-1.0.0"; builder = ./builder.sh; src = fetchurl { @@ -2283,12 +2283,12 @@ lib.makeScope newScope (self: with self; { sha256 = "195z1js3i51qgxvhfw4bxb4dw3jcrrx2ynpm2y3475dypjzs7dkz"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videovesa = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videovesa = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-vesa-2.5.0"; builder = ./builder.sh; src = fetchurl { @@ -2296,12 +2296,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0nf6ai74c60xk96kgr8q9mx6lrxm5id3765ws4d801irqzrj85hz"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videovmware = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, udev, libpciaccess, libX11, libXext, xorgserver }: stdenv.mkDerivation { + xf86videovmware = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, udev, libpciaccess, libX11, libXext, xorgserver }: stdenv.mkDerivation { name = "xf86-video-vmware-13.3.0"; builder = ./builder.sh; src = fetchurl { @@ -2309,12 +2309,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0v06qhm059klq40m2yx4wypzb7h53aaassbjfmm6clcyclj1k5s7"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm udev libpciaccess libX11 libXext xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videovoodoo = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videovoodoo = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-voodoo-1.2.5"; builder = ./builder.sh; src = fetchurl { @@ -2322,12 +2322,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1s6p7yxmi12q4y05va53rljwyzd6ry492r1pgi7wwq6cznivhgly"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videowsfb = callPackage ({ stdenv, pkgconfig, fetchurl, xorgserver, xorgproto }: stdenv.mkDerivation { + xf86videowsfb = callPackage ({ stdenv, pkg-config, fetchurl, xorgserver, xorgproto }: stdenv.mkDerivation { name = "xf86-video-wsfb-0.4.0"; builder = ./builder.sh; src = fetchurl { @@ -2335,12 +2335,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0hr8397wpd0by1hc47fqqrnaw3qdqd8aqgwgzv38w5k3l3jy6p4p"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgserver xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videoxgi = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videoxgi = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-xgi-1.6.1"; builder = ./builder.sh; src = fetchurl { @@ -2348,12 +2348,12 @@ lib.makeScope newScope (self: with self; { sha256 = "10xd2vah0pnpw5spn40n4p95mpmgvdkly4i1cz51imnlfsw7g8si"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xfd = callPackage ({ stdenv, pkgconfig, fetchurl, libxkbfile, fontconfig, libXaw, libXft, libXmu, xorgproto, libXrender, libXt, gettext }: stdenv.mkDerivation { + xfd = callPackage ({ stdenv, pkg-config, fetchurl, libxkbfile, fontconfig, libXaw, libXft, libXmu, xorgproto, libXrender, libXt, gettext }: stdenv.mkDerivation { name = "xfd-1.1.3"; builder = ./builder.sh; src = fetchurl { @@ -2361,12 +2361,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0n6r1v8sm0z0ycqch035xpm46nv5v4mav3kxh36883l3ln5r6bqr"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig gettext ]; + nativeBuildInputs = [ pkg-config gettext ]; buildInputs = [ libxkbfile fontconfig libXaw libXft libXmu xorgproto libXrender libXt ]; meta.platforms = lib.platforms.unix; }) {}; - xfontsel = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, libXmu, libXt }: stdenv.mkDerivation { + xfontsel = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, libXt }: stdenv.mkDerivation { name = "xfontsel-1.0.6"; builder = ./builder.sh; src = fetchurl { @@ -2374,12 +2374,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0700lf6hx7dg88wq1yll7zjvf9gbwh06xff20yffkxb289y0pai5"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXaw libXmu libXt ]; meta.platforms = lib.platforms.unix; }) {}; - xfs = callPackage ({ stdenv, pkgconfig, fetchurl, libXfont2, xorgproto, xtrans }: stdenv.mkDerivation { + xfs = callPackage ({ stdenv, pkg-config, fetchurl, libXfont2, xorgproto, xtrans }: stdenv.mkDerivation { name = "xfs-1.2.0"; builder = ./builder.sh; src = fetchurl { @@ -2387,12 +2387,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0q4q4rbzx159sfn2n52y039fki6nc6a39qdfxa78yjc3aw8i48nv"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libXfont2 xorgproto xtrans ]; meta.platforms = lib.platforms.unix; }) {}; - xfsinfo = callPackage ({ stdenv, pkgconfig, fetchurl, libFS, xorgproto }: stdenv.mkDerivation { + xfsinfo = callPackage ({ stdenv, pkg-config, fetchurl, libFS, xorgproto }: stdenv.mkDerivation { name = "xfsinfo-1.0.6"; builder = ./builder.sh; src = fetchurl { @@ -2400,12 +2400,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1mmir5i7gm71xc0ba8vnizi4744vsd31hknhi4cmgvg6kadqngla"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libFS xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xgamma = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto, libXxf86vm }: stdenv.mkDerivation { + xgamma = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXxf86vm }: stdenv.mkDerivation { name = "xgamma-1.0.6"; builder = ./builder.sh; src = fetchurl { @@ -2413,12 +2413,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1lr2nb1fhg5fk2fchqxdxyl739602ggwhmgl2wiv5c8qbidw7w8f"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto libXxf86vm ]; meta.platforms = lib.platforms.unix; }) {}; - xgc = callPackage ({ stdenv, pkgconfig, fetchurl, libXaw, libXt }: stdenv.mkDerivation { + xgc = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXt }: stdenv.mkDerivation { name = "xgc-1.0.5"; builder = ./builder.sh; src = fetchurl { @@ -2426,12 +2426,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0pigvjd3i9fchmj1inqy151aafz3dr0vq1h2zizdb2imvadqv0hl"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libXaw libXt ]; meta.platforms = lib.platforms.unix; }) {}; - xhost = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXau, libXmu, xorgproto }: stdenv.mkDerivation { + xhost = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXau, libXmu, xorgproto }: stdenv.mkDerivation { name = "xhost-1.0.8"; builder = ./builder.sh; src = fetchurl { @@ -2439,12 +2439,12 @@ lib.makeScope newScope (self: with self; { sha256 = "15n3mnd4i5kh4z32qv11580qjgvnng0wry2y753ljrqkkrbkrp52"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXau libXmu xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xinit = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { + xinit = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { name = "xinit-1.4.1"; builder = ./builder.sh; src = fetchurl { @@ -2452,12 +2452,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1fdbakx59vyh474skjydj1bbglpby3y03nl7mxn0z9v8gdhqz6yy"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xinput = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext, libXi, libXinerama, libXrandr }: stdenv.mkDerivation { + xinput = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXi, libXinerama, libXrandr }: stdenv.mkDerivation { name = "xinput-1.6.3"; builder = ./builder.sh; src = fetchurl { @@ -2465,12 +2465,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1vb6xdd1xmk5f7pwc5zcbxfray5sf1vbnscqwf2yl8lv7gfq38im"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext libXi libXinerama libXrandr ]; meta.platforms = lib.platforms.unix; }) {}; - xkbcomp = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libxkbfile, xorgproto }: stdenv.mkDerivation { + xkbcomp = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libxkbfile, xorgproto }: stdenv.mkDerivation { name = "xkbcomp-1.4.4"; builder = ./builder.sh; src = fetchurl { @@ -2478,12 +2478,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0zpjkbap9160pdd6jpgb5f0yg5281w0rkkx1l0i7g887lq1ydk2r"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libxkbfile xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xkbevd = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libxkbfile }: stdenv.mkDerivation { + xkbevd = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libxkbfile }: stdenv.mkDerivation { name = "xkbevd-1.1.4"; builder = ./builder.sh; src = fetchurl { @@ -2491,12 +2491,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0sprjx8i86ljk0l7ldzbz2xlk8916z5zh78cafjv8k1a63js4c14"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libxkbfile ]; meta.platforms = lib.platforms.unix; }) {}; - xkbprint = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libxkbfile, xorgproto }: stdenv.mkDerivation { + xkbprint = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libxkbfile, xorgproto }: stdenv.mkDerivation { name = "xkbprint-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -2504,12 +2504,12 @@ lib.makeScope newScope (self: with self; { sha256 = "04iyv5z8aqhabv7wcpvbvq0ji0jrz1666vw6gvxkvl7szswalgqb"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libxkbfile xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xkbutils = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXaw, libXt }: stdenv.mkDerivation { + xkbutils = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXaw, libXt }: stdenv.mkDerivation { name = "xkbutils-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -2517,12 +2517,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0c412isxl65wplhl7nsk12vxlri29lk48g3p52hbrs3m0awqm8fj"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXaw libXt ]; meta.platforms = lib.platforms.unix; }) {}; - xkeyboardconfig = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto, python3 }: stdenv.mkDerivation { + xkeyboardconfig = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, python3 }: stdenv.mkDerivation { name = "xkeyboard-config-2.31"; builder = ./builder.sh; src = fetchurl { @@ -2530,12 +2530,12 @@ lib.makeScope newScope (self: with self; { sha256 = "18xddaxh83zm698syh50w983jg6b7b8zgv0dfaf7ha485hgihi6s"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig python3 ]; + nativeBuildInputs = [ pkg-config python3 ]; buildInputs = [ libX11 xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xkill = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { + xkill = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { name = "xkill-1.0.5"; builder = ./builder.sh; src = fetchurl { @@ -2543,12 +2543,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0szzd9nzn0ybkhnfyizb876irwnjsnb78rcaxx6prb71jmmbpw65"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXmu xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xload = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt, gettext }: stdenv.mkDerivation { + xload = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt, gettext }: stdenv.mkDerivation { name = "xload-1.1.3"; builder = ./builder.sh; src = fetchurl { @@ -2556,12 +2556,12 @@ lib.makeScope newScope (self: with self; { sha256 = "01sr6yd6yhyyfgn88l867w6h9dn5ikcynaz5rwji6xqxhw1lhkpk"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig gettext ]; + nativeBuildInputs = [ pkg-config gettext ]; buildInputs = [ libX11 libXaw libXmu xorgproto libXt ]; meta.platforms = lib.platforms.unix; }) {}; - xlsatoms = callPackage ({ stdenv, pkgconfig, fetchurl, libxcb }: stdenv.mkDerivation { + xlsatoms = callPackage ({ stdenv, pkg-config, fetchurl, libxcb }: stdenv.mkDerivation { name = "xlsatoms-1.1.3"; builder = ./builder.sh; src = fetchurl { @@ -2569,12 +2569,12 @@ lib.makeScope newScope (self: with self; { sha256 = "10m3a046jvaw5ywx4y65kl84lsxqan70gww1g1r7cf96ijaqz1jp"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxcb ]; meta.platforms = lib.platforms.unix; }) {}; - xlsclients = callPackage ({ stdenv, pkgconfig, fetchurl, libxcb }: stdenv.mkDerivation { + xlsclients = callPackage ({ stdenv, pkg-config, fetchurl, libxcb }: stdenv.mkDerivation { name = "xlsclients-1.1.4"; builder = ./builder.sh; src = fetchurl { @@ -2582,12 +2582,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1h8931sn34mcip6vpi4v7hdmr1r58gkbw4s2p97w98kykks2lgvp"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxcb ]; meta.platforms = lib.platforms.unix; }) {}; - xlsfonts = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { + xlsfonts = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { name = "xlsfonts-1.0.6"; builder = ./builder.sh; src = fetchurl { @@ -2595,12 +2595,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0s6kxgv78chkwsqmhw929f4pf91gq63f4yvixxnan1h00cx0pf49"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xmag = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, libXmu, libXt }: stdenv.mkDerivation { + xmag = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, libXt }: stdenv.mkDerivation { name = "xmag-1.0.6"; builder = ./builder.sh; src = fetchurl { @@ -2608,12 +2608,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0qg12ifbbk9n8fh4jmyb625cknn8ssj86chd6zwdiqjin8ivr8l7"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXaw libXmu libXt ]; meta.platforms = lib.platforms.unix; }) {}; - xmessage = callPackage ({ stdenv, pkgconfig, fetchurl, libXaw, libXt }: stdenv.mkDerivation { + xmessage = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXt }: stdenv.mkDerivation { name = "xmessage-1.0.5"; builder = ./builder.sh; src = fetchurl { @@ -2621,12 +2621,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0a90kfm0qz8cn2pbpqfyqrc5s9bfvvy14nj848ynvw56wy0zng9p"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libXaw libXt ]; meta.platforms = lib.platforms.unix; }) {}; - xmodmap = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { + xmodmap = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { name = "xmodmap-1.0.10"; builder = ./builder.sh; src = fetchurl { @@ -2634,12 +2634,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0z28331i2pm16x671fa9qwsfqdmr6a43bzwmp0dm17a3sx0hjgs7"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xmore = callPackage ({ stdenv, pkgconfig, fetchurl, libXaw, libXt }: stdenv.mkDerivation { + xmore = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXt }: stdenv.mkDerivation { name = "xmore-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -2647,12 +2647,12 @@ lib.makeScope newScope (self: with self; { sha256 = "06r514p30v87vx00ddlck9mwazaqk9bx08ip866p1mw2a46iwjk4"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libXaw libXt ]; meta.platforms = lib.platforms.unix; }) {}; - xorgcffiles = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { + xorgcffiles = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { name = "xorg-cf-files-1.0.6"; builder = ./builder.sh; src = fetchurl { @@ -2660,12 +2660,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0kckng0zs1viz0nr84rdl6dswgip7ndn4pnh5nfwnviwpsfmmksd"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; meta.platforms = lib.platforms.unix; }) {}; - xorgdocs = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { + xorgdocs = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { name = "xorg-docs-1.7.1"; builder = ./builder.sh; src = fetchurl { @@ -2673,12 +2673,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0jrc4jmb4raqawx0j9jmhgasr0k6sxv0bm2hrxjh9hb26iy6gf14"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; meta.platforms = lib.platforms.unix; }) {}; - xorgproto = callPackage ({ stdenv, pkgconfig, fetchurl, libXt }: stdenv.mkDerivation { + xorgproto = callPackage ({ stdenv, pkg-config, fetchurl, libXt }: stdenv.mkDerivation { name = "xorgproto-2020.1"; builder = ./builder.sh; src = fetchurl { @@ -2686,12 +2686,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1llrnrkq6iprgiqakmwlv89745s9h02xsiaq0xn3fnh377qm78al"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libXt ]; meta.platforms = lib.platforms.unix; }) {}; - xorgserver = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, openssl, libX11, libXau, libXaw, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, libXmu, libXpm, libXrender, libXres, libXt }: stdenv.mkDerivation { + xorgserver = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, openssl, libX11, libXau, libXaw, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, libXmu, libXpm, libXrender, libXres, libXt }: stdenv.mkDerivation { name = "xorg-server-1.20.10"; builder = ./builder.sh; src = fetchurl { @@ -2699,12 +2699,12 @@ lib.makeScope newScope (self: with self; { sha256 = "16bwrf0ag41l7jbrllbix8z6avc5yimga7ihvq4ch3a5hb020x4p"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; meta.platforms = lib.platforms.unix; }) {}; - xorgsgmldoctools = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { + xorgsgmldoctools = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { name = "xorg-sgml-doctools-1.11"; builder = ./builder.sh; src = fetchurl { @@ -2712,12 +2712,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0k5pffyi5bx8dmfn033cyhgd3gf6viqj3x769fqixifwhbgy2777"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; meta.platforms = lib.platforms.unix; }) {}; - xpr = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { + xpr = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { name = "xpr-1.0.5"; builder = ./builder.sh; src = fetchurl { @@ -2725,12 +2725,12 @@ lib.makeScope newScope (self: with self; { sha256 = "07qy9lwjvxighcmg6qvjkgagad3wwvidrfx0jz85lgynz3qy0dmr"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXmu xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xprop = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { + xprop = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { name = "xprop-1.2.5"; builder = ./builder.sh; src = fetchurl { @@ -2738,12 +2738,12 @@ lib.makeScope newScope (self: with self; { sha256 = "18ckr8g1z50zkc01hprkpm1npwbq32yqib4b3l98c95z2q1yv4lv"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xrandr = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto, libXrandr, libXrender }: stdenv.mkDerivation { + xrandr = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXrandr, libXrender }: stdenv.mkDerivation { name = "xrandr-1.5.1"; builder = ./builder.sh; src = fetchurl { @@ -2751,12 +2751,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0ql75s1n3dm2m3g1ilb9l6hqh15r0v709bgghpwazy3jknpnvivv"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto libXrandr libXrender ]; meta.platforms = lib.platforms.unix; }) {}; - xrdb = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { + xrdb = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { name = "xrdb-1.2.0"; builder = ./builder.sh; src = fetchurl { @@ -2764,12 +2764,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0ik9gh6363c47pr0dp7q22nfs8vmavjg2v4bsr0604ppl77nafpj"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXmu xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xrefresh = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { + xrefresh = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { name = "xrefresh-1.0.6"; builder = ./builder.sh; src = fetchurl { @@ -2777,12 +2777,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0lv3rlshh7s0z3aqx5ahnnf8cl082m934bk7gv881mz8nydznz98"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xset = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, libXmu, xorgproto, libXxf86misc }: stdenv.mkDerivation { + xset = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, libXmu, xorgproto, libXxf86misc }: stdenv.mkDerivation { name = "xset-1.2.4"; builder = ./builder.sh; src = fetchurl { @@ -2790,12 +2790,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0my987wjvra7l92ry6q44ky383yg3phzxhdbn3lqhapm1ll9bzg4"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXext libXmu xorgproto libXxf86misc ]; meta.platforms = lib.platforms.unix; }) {}; - xsetroot = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xbitmaps, libXcursor, libXmu, xorgproto }: stdenv.mkDerivation { + xsetroot = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xbitmaps, libXcursor, libXmu, xorgproto }: stdenv.mkDerivation { name = "xsetroot-1.1.2"; builder = ./builder.sh; src = fetchurl { @@ -2803,12 +2803,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0z21mqvmdl6rl63q77479wgkfygnll57liza1i3va7sr4fx45i0h"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xbitmaps libXcursor libXmu xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xsm = callPackage ({ stdenv, pkgconfig, fetchurl, libICE, libSM, libX11, libXaw, libXt }: stdenv.mkDerivation { + xsm = callPackage ({ stdenv, pkg-config, fetchurl, libICE, libSM, libX11, libXaw, libXt }: stdenv.mkDerivation { name = "xsm-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -2816,12 +2816,12 @@ lib.makeScope newScope (self: with self; { sha256 = "09a4ss1fnrh1sgm21r4n5pivawf34paci3rn6mscyljf7a4vcd4r"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libICE libSM libX11 libXaw libXt ]; meta.platforms = lib.platforms.unix; }) {}; - xstdcmap = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { + xstdcmap = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { name = "xstdcmap-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -2829,12 +2829,12 @@ lib.makeScope newScope (self: with self; { sha256 = "12vgzsxv4rw25frkgjyli6w6hy10lgpvsx9wzw2v5l5a3qzqp286"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXmu xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xtrans = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { + xtrans = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { name = "xtrans-1.4.0"; builder = ./builder.sh; src = fetchurl { @@ -2842,12 +2842,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0wyp0yc6gi72hwc3kjmvm3vkj9p6s407cb6dxx37jh9wb68l8z1p"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; meta.platforms = lib.platforms.unix; }) {}; - xtrap = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXt, libXTrap }: stdenv.mkDerivation { + xtrap = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXt, libXTrap }: stdenv.mkDerivation { name = "xtrap-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -2855,12 +2855,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0sqm4j1zflk1s94iq4waa70hna1xcys88v9a70w0vdw66czhvj2j"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXt libXTrap ]; meta.platforms = lib.platforms.unix; }) {}; - xvinfo = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto, libXv }: stdenv.mkDerivation { + xvinfo = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXv }: stdenv.mkDerivation { name = "xvinfo-1.1.4"; builder = ./builder.sh; src = fetchurl { @@ -2868,12 +2868,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0gz7fvxavqlrqynpfbrm2nc9yx8h0ksnbnv34fj7n1q6cq6j4lq3"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto libXv ]; meta.platforms = lib.platforms.unix; }) {}; - xwd = callPackage ({ stdenv, pkgconfig, fetchurl, libxkbfile, libX11, xorgproto }: stdenv.mkDerivation { + xwd = callPackage ({ stdenv, pkg-config, fetchurl, libxkbfile, libX11, xorgproto }: stdenv.mkDerivation { name = "xwd-1.0.7"; builder = ./builder.sh; src = fetchurl { @@ -2881,12 +2881,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1537i8q8pgf0sjklakzfvjwrq5b246qjywrx9ll8xfg0p6w1as6d"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxkbfile libX11 xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xwininfo = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libxcb, xorgproto }: stdenv.mkDerivation { + xwininfo = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libxcb, xorgproto }: stdenv.mkDerivation { name = "xwininfo-1.1.4"; builder = ./builder.sh; src = fetchurl { @@ -2894,12 +2894,12 @@ lib.makeScope newScope (self: with self; { sha256 = "00avrpw4h5mr1klp41lv2j4dmq465v6l5kb5bhm4k5ml8sm9i543"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libxcb xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xwud = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { + xwud = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { name = "xwud-1.0.5"; builder = ./builder.sh; src = fetchurl { @@ -2907,7 +2907,7 @@ lib.makeScope newScope (self: with self; { sha256 = "1a8hdgy40smvblnh3s9f0vkqckl68nmivx7d48zk34m8z18p16cr"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index a6cd8032ba7..b50f3f33a31 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -292,7 +292,7 @@ foreach my $pkg (sort (keys %pkgURLs)) { my @arguments = @buildInputs; push @arguments, @nativeBuildInputs; - unshift @arguments, "stdenv", "pkgconfig", "fetchurl"; + unshift @arguments, "stdenv", "pkg-config", "fetchurl"; my $argumentsStr = join ", ", @arguments; my $extraAttrsStr = ""; @@ -309,7 +309,7 @@ foreach my $pkg (sort (keys %pkgURLs)) { sha256 = "$pkgHashes{$pkg}"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig $nativeBuildInputsStr]; + nativeBuildInputs = [ pkg-config $nativeBuildInputsStr]; buildInputs = [ $buildInputsStr];$extraAttrsStr meta.platforms = lib.platforms.unix; }) {}; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index eeeb2d52e01..54082ce8126 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -1,18 +1,18 @@ { abiCompat ? null, - stdenv, makeWrapper, fetchurl, fetchpatch, fetchFromGitLab, buildPackages, + lib, stdenv, makeWrapper, fetchurl, fetchpatch, fetchFromGitLab, buildPackages, automake, autoconf, gettext, libiconv, libtool, intltool, freetype, tradcpp, fontconfig, meson, ninja, ed, fontforge, libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm, mesa, udev, bootstrap_cmds, bison, flex, clangStdenv, autoreconfHook, - mcpp, epoxy, openssl, pkgconfig, llvm_6, libxslt, + mcpp, epoxy, openssl, pkg-config, llvm_6, libxslt, ApplicationServices, Carbon, Cocoa, Xplugin }: let - inherit (stdenv) lib isDarwin; + inherit (stdenv) isDarwin; inherit (lib) overrideDerivation; - malloc0ReturnsNullCrossFlag = stdenv.lib.optional + malloc0ReturnsNullCrossFlag = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--enable-malloc0returnsnull"; in @@ -70,7 +70,7 @@ self: super: libxcb = super.libxcb.overrideAttrs (attrs: { configureFlags = [ "--enable-xkb" "--enable-xinput" ] - ++ stdenv.lib.optional stdenv.hostPlatform.isStatic "--disable-shared"; + ++ lib.optional stdenv.hostPlatform.isStatic "--disable-shared"; outputs = [ "out" "dev" "man" "doc" ]; }); @@ -80,7 +80,7 @@ self: super: ++ malloc0ReturnsNullCrossFlag; depsBuildBuild = [ buildPackages.stdenv.cc - ] ++ stdenv.lib.optionals stdenv.hostPlatform.isStatic [ + ] ++ lib.optionals stdenv.hostPlatform.isStatic [ (self.buildPackages.stdenv.cc.libc.static or null) ]; preConfigure = '' @@ -90,7 +90,7 @@ self: super: # Remove useless DocBook XML files. rm -rf $out/share/doc ''; - CPP = stdenv.lib.optionalString stdenv.isDarwin "clang -E -"; + CPP = lib.optionalString stdenv.isDarwin "clang -E -"; propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.xorgproto ]; }); @@ -139,7 +139,7 @@ self: super: ++ malloc0ReturnsNullCrossFlag; preConfigure = attrs.preConfigure or "" # missing transitive dependencies - + stdenv.lib.optionalString stdenv.hostPlatform.isStatic '' + + lib.optionalString stdenv.hostPlatform.isStatic '' export NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK -lXau -lXdmcp" ''; }); @@ -227,9 +227,9 @@ self: super: libXi = super.libXi.overrideAttrs (attrs: { outputs = [ "out" "dev" "man" "doc" ]; propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.libXfixes ]; - configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + configureFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "xorg_cv_malloc0_returns_null=no" - ] ++ stdenv.lib.optional stdenv.hostPlatform.isStatic "--disable-shared"; + ] ++ lib.optional stdenv.hostPlatform.isStatic "--disable-shared"; }); libXinerama = super.libXinerama.overrideAttrs (attrs: { @@ -315,7 +315,7 @@ self: super: }); libpciaccess = super.libpciaccess.overrideAttrs (attrs: { - meta = attrs.meta // { platforms = stdenv.lib.platforms.linux; }; + meta = attrs.meta // { platforms = lib.platforms.linux; }; }); setxkbmap = super.setxkbmap.overrideAttrs (attrs: { @@ -341,7 +341,7 @@ self: super: xcbutilcursor = super.xcbutilcursor.overrideAttrs (attrs: { outputs = [ "out" "dev" ]; - meta = attrs.meta // { maintainers = [ stdenv.lib.maintainers.lovek323 ]; }; + meta = attrs.meta // { maintainers = [ lib.maintainers.lovek323 ]; }; }); xcbutilimage = super.xcbutilimage.overrideAttrs (attrs: { @@ -364,42 +364,42 @@ self: super: outputs = [ "out" "dev" ]; # to get rid of xorgserver.dev; man is tiny preBuild = "sed -e '/motion_history_proc/d; /history_size/d;' -i src/*.c"; installFlags = [ - "sdkdir=${placeholder ''out''}/include/xorg" + "sdkdir=${placeholder "out"}/include/xorg" ]; }); xf86inputmouse = super.xf86inputmouse.overrideAttrs (attrs: { installFlags = [ - "sdkdir=${placeholder ''out''}/include/xorg" + "sdkdir=${placeholder "out"}/include/xorg" ]; }); xf86inputjoystick = super.xf86inputjoystick.overrideAttrs (attrs: { installFlags = [ - "sdkdir=${placeholder ''out''}/include/xorg" + "sdkdir=${placeholder "out"}/include/xorg" ]; }); xf86inputlibinput = super.xf86inputlibinput.overrideAttrs (attrs: { outputs = [ "out" "dev" ]; installFlags = [ - "sdkdir=${placeholder ''dev''}/include/xorg" + "sdkdir=${placeholder "dev"}/include/xorg" ]; }); xf86inputsynaptics = super.xf86inputsynaptics.overrideAttrs (attrs: { outputs = [ "out" "dev" ]; # *.pc pulls xorgserver.dev installFlags = [ - "sdkdir=${placeholder ''out''}/include/xorg" - "configdir=${placeholder ''out''}/share/X11/xorg.conf.d" + "sdkdir=${placeholder "out"}/include/xorg" + "configdir=${placeholder "out"}/share/X11/xorg.conf.d" ]; }); xf86inputvmmouse = super.xf86inputvmmouse.overrideAttrs (attrs: { configureFlags = [ - "--sysconfdir=${placeholder ''out''}/etc" - "--with-xorg-conf-dir=${placeholder ''out''}/share/X11/xorg.conf.d" - "--with-udev-rules-dir=${placeholder ''out''}/lib/udev/rules.d" + "--sysconfdir=${placeholder "out"}/etc" + "--with-xorg-conf-dir=${placeholder "out"}/share/X11/xorg.conf.d" + "--with-udev-rules-dir=${placeholder "out"}/lib/udev/rules.d" ]; meta = attrs.meta // { @@ -467,7 +467,7 @@ self: super: configureFlags = [ "--with-xkb-rules-symlink=xorg" ]; # 1: compatibility for X11/xkb location - # 2: I think pkgconfig/ is supposed to be in /lib/ + # 2: I think pkg-config/ is supposed to be in /lib/ postInstall = '' ln -s share "$out/etc" mkdir -p "$out/lib" && ln -s ../share/pkgconfig "$out/lib/" @@ -589,9 +589,9 @@ self: super: url = "mirror://xorg/individual/xserver/xorg-server-1.17.4.tar.bz2"; sha256 = "0mv4ilpqi5hpg182mzqn766frhi6rw48aba3xfbaj4m82v0lajqc"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; } else if (abiCompat == "1.18") then { name = "xorg-server-1.18.4"; builder = ./builder.sh; @@ -599,10 +599,10 @@ self: super: url = "mirror://xorg/individual/xserver/xorg-server-1.18.4.tar.bz2"; sha256 = "1j1i3n5xy1wawhk95kxqdc54h34kg7xp4nnramba2q8xqfr5k117"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; - postPatch = stdenv.lib.optionalString stdenv.isLinux "sed '1i#include <malloc.h>' -i include/os.h"; - meta.platforms = stdenv.lib.platforms.unix; + postPatch = lib.optionalString stdenv.isLinux "sed '1i#include <malloc.h>' -i include/os.h"; + meta.platforms = lib.platforms.unix; } else throw "unsupported xorg abiCompat ${abiCompat} for ${attrs_passed.name}"; in attrs // @@ -641,7 +641,7 @@ self: super: propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ libpciaccess epoxy ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [ udev ]; - prePatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + prePatch = lib.optionalString stdenv.hostPlatform.isMusl '' export CFLAGS+=" -D__uid_t=uid_t -D__gid_t=gid_t" ''; configureFlags = [ @@ -752,7 +752,7 @@ self: super: doCheck = false; # fails preConfigure = attrs.preConfigure or "" # missing transitive dependencies - + stdenv.lib.optionalString stdenv.hostPlatform.isStatic '' + + lib.optionalString stdenv.hostPlatform.isStatic '' export NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK -lxcb -lXau -lXdmcp" ''; }); @@ -816,7 +816,7 @@ self: super: }); xorgcffiles = super.xorgcffiles.overrideAttrs (attrs: { - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.isDarwin '' substituteInPlace $out/lib/X11/config/darwin.cf --replace "/usr/bin/" "" ''; }); diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 1544af4742d..3ee31e4c2a7 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -105,7 +105,7 @@ mirror://xorg/individual/driver/xf86-video-mach64-6.9.6.tar.bz2 mirror://xorg/individual/driver/xf86-video-mga-2.0.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-neomagic-1.3.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-newport-0.2.4.tar.bz2 -mirror://xorg/individual/driver/xf86-video-nouveau-1.0.16.tar.bz2 +mirror://xorg/individual/driver/xf86-video-nouveau-1.0.17.tar.bz2 mirror://xorg/individual/driver/xf86-video-nv-2.1.21.tar.bz2 mirror://xorg/individual/driver/xf86-video-omap-0.4.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2 diff --git a/pkgs/servers/x11/xorg/xcb-util-xrm.nix b/pkgs/servers/x11/xorg/xcb-util-xrm.nix index cc8bf7dfa10..ee870f07125 100644 --- a/pkgs/servers/x11/xorg/xcb-util-xrm.nix +++ b/pkgs/servers/x11/xorg/xcb-util-xrm.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, m4, libxcb, xcbutil, libX11 }: +{ lib, stdenv, fetchurl, pkg-config, m4, libxcb, xcbutil, libX11 }: stdenv.mkDerivation rec { version = "1.3"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "118cj1ybw86pgw0l5whn9vbg5n5b0ijcpx295mwahzi004vz671h"; }; - nativeBuildInputs = [ pkgconfig m4 ]; + nativeBuildInputs = [ pkg-config m4 ]; doCheck = true; buildInputs = [ libxcb xcbutil ]; checkInputs = [ libX11 ]; diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index e10ba1069f0..e3d2698e830 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -1,8 +1,8 @@ -{ stdenv, wayland, wayland-protocols, xorgserver, xkbcomp, xkeyboard_config +{ lib, wayland, wayland-protocols, xorgserver, xkbcomp, xkeyboard_config , epoxy, libxslt, libunwind, makeWrapper, egl-wayland , defaultFontPath ? "" }: -with stdenv.lib; +with lib; xorgserver.overrideAttrs (oldAttrs: { diff --git a/pkgs/servers/x11/xquartz/default.nix b/pkgs/servers/x11/xquartz/default.nix index 96269b1a4f3..8f3bbf61baa 100644 --- a/pkgs/servers/x11/xquartz/default.nix +++ b/pkgs/servers/x11/xquartz/default.nix @@ -95,7 +95,7 @@ let ]; }; in stdenv.mkDerivation { - name = "xquartz-${stdenv.lib.getVersion xorg.xorgserver}"; + name = "xquartz-${lib.getVersion xorg.xorgserver}"; nativeBuildInputs = [ ruby makeWrapper ]; @@ -135,7 +135,7 @@ in stdenv.mkDerivation { defaultStartX="$out/bin/startx -- $out/bin/Xquartz" ruby ${./patch_plist.rb} \ - ${stdenv.lib.escapeShellArg (builtins.toXML { + ${lib.escapeShellArg (builtins.toXML { XQUARTZ_DEFAULT_CLIENT = "${xterm}/bin/xterm"; XQUARTZ_DEFAULT_SHELL = shell; XQUARTZ_DEFAULT_STARTX = "@STARTX@"; diff --git a/pkgs/servers/xandikos/default.nix b/pkgs/servers/xandikos/default.nix index b8eb29d87b2..5241139cfa3 100644 --- a/pkgs/servers/xandikos/default.nix +++ b/pkgs/servers/xandikos/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , python3Packages , installShellFiles diff --git a/pkgs/servers/xinetd/default.nix b/pkgs/servers/xinetd/default.nix index 0ecd65ce6fa..3d130c93b78 100644 --- a/pkgs/servers/xinetd/default.nix +++ b/pkgs/servers/xinetd/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, stdenv, libtirpc }: +{ fetchurl, fetchpatch, lib, stdenv, libtirpc }: stdenv.mkDerivation rec { name = "xinetd-2.3.15"; @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { meta = { description = "Secure replacement for inetd"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; homepage = "http://xinetd.org"; - license = stdenv.lib.licenses.free; + license = lib.licenses.free; }; } diff --git a/pkgs/servers/xmpp/biboumi/default.nix b/pkgs/servers/xmpp/biboumi/default.nix index deaa7ca18f0..762154f018c 100644 --- a/pkgs/servers/xmpp/biboumi/default.nix +++ b/pkgs/servers/xmpp/biboumi/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchgit, cmake, libuuid, expat, sqlite, libidn, - libiconv, botan2, systemd, pkgconfig, udns, pandoc, coreutils } : + libiconv, botan2, systemd, pkg-config, udns, pandoc, coreutils } : stdenv.mkDerivation rec { pname = "biboumi"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { patches = [ ./catch.patch ]; - nativeBuildInputs = [ cmake pkgconfig pandoc ]; + nativeBuildInputs = [ cmake pkg-config pandoc ]; buildInputs = [ libuuid expat sqlite libiconv libidn botan2 systemd udns ]; diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index 1efadd5915e..5336df42cbe 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -24,12 +24,12 @@ let ctlpath = lib.makeBinPath [ bash gnused gnugrep coreutils util-linux procps ]; in stdenv.mkDerivation rec { - version = "20.03"; + version = "20.12"; pname = "ejabberd"; src = fetchurl { url = "https://www.process-one.net/downloads/downloads-action.php?file=/${version}/${pname}-${version}.tgz"; - sha256 = "0i013l9cygmgainfid298n6llhs3mblfklry3jw2a6irvhffym0s"; + sha256 = "sha256-nZxdYXRyv4UejPLHNT/p6CrvW22Koo7rZSi96KRjqFQ="; }; nativeBuildInputs = [ fakegit ]; @@ -76,7 +76,7 @@ in stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "0xwgi9hy6y0m8mwznl6px98kdmkcxg98k62zgqbaqd4paks5zwqa"; + outputHash = "sha256-0/hBgA+9rsDOBcvbROSpc5Xnw4JkYpuLCl2V+lJnieY="; }; configureFlags = @@ -107,7 +107,7 @@ in stdenv.mkDerivation rec { -e 's,\(^ *JOT=\).*,\1,' \ -e 's,\(^ *CONNLOCKDIR=\).*,\1/var/lock/ejabberdctl,' \ $out/sbin/ejabberdctl - wrapProgram $out/lib/eimp-*/priv/bin/eimp --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libpng libjpeg libwebp ]}" + wrapProgram $out/lib/eimp-*/priv/bin/eimp --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libpng libjpeg libwebp ]}" ''; meta = with lib; { @@ -115,7 +115,7 @@ in stdenv.mkDerivation rec { license = licenses.gpl2; homepage = "https://www.ejabberd.im"; platforms = platforms.linux; - maintainers = with maintainers; [ sander abbradar ajs124 ]; + maintainers = with maintainers; [ sander abbradar ]; broken = withElixir; }; } diff --git a/pkgs/servers/xmpp/openfire/default.nix b/pkgs/servers/xmpp/openfire/default.nix index ab377e3d53b..a655f1c348f 100644 --- a/pkgs/servers/xmpp/openfire/default.nix +++ b/pkgs/servers/xmpp/openfire/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre }: +{ lib, stdenv, fetchurl, jre }: stdenv.mkDerivation rec { pname = "openfire"; @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { mv $out/conf $out/conf.inst ln -s /var/log/openfire $out/logs ln -s /etc/openfire $out/conf - ''; + ''; meta = { description = "XMPP server in Java"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; # Some security advisories seem to apply, and each next version wants to # write into larger parts of installation directory; installation is just # unpacking, though diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix index 9b7ed2ac41d..cfa6e226955 100644 --- a/pkgs/servers/xmpp/prosody/default.nix +++ b/pkgs/servers/xmpp/prosody/default.nix @@ -11,7 +11,7 @@ assert withLibevent -> luaevent != null; assert withDBI -> luadbi != null; -with stdenv.lib; +with lib; stdenv.mkDerivation rec { diff --git a/pkgs/servers/xmpp/pyMAILt/default.nix b/pkgs/servers/xmpp/pyMAILt/default.nix index 68349214359..03ded7a5d5c 100644 --- a/pkgs/servers/xmpp/pyMAILt/default.nix +++ b/pkgs/servers/xmpp/pyMAILt/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { version = "20090101"; src = fetchcvs { - cvsRoot = ":pserver:anonymous@xmpppy.cvs.sourceforge.net:/cvsroot/xmpppy"; - module = "xmpppy/mail-transport"; - date = "2009-01-01"; - sha256 = "15301252e52b4ccb2156baefed8982a2a0cce3ae8eae3caf3cc28dfa615c8d6e"; - }; + cvsRoot = ":pserver:anonymous@xmpppy.cvs.sourceforge.net:/cvsroot/xmpppy"; + module = "xmpppy/mail-transport"; + date = "2009-01-01"; + sha256 = "15301252e52b4ccb2156baefed8982a2a0cce3ae8eae3caf3cc28dfa615c8d6e"; + }; pythonPath = [ xmpppy ]; buildInputs = [ pythonPackages.wrapPython ]; diff --git a/pkgs/servers/zigbee2mqtt/default.nix b/pkgs/servers/zigbee2mqtt/default.nix index 550e93fb5aa..85465fd7d14 100644 --- a/pkgs/servers/zigbee2mqtt/default.nix +++ b/pkgs/servers/zigbee2mqtt/default.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, system, dataDir ? "/opt/zigbee2mqtt/data", nixosTests }: +{ pkgs, system, dataDir ? "/opt/zigbee2mqtt/data", nixosTests }: let package = (import ./node.nix { inherit pkgs system; }).package; in diff --git a/pkgs/servers/zigbee2mqtt/node-packages.nix b/pkgs/servers/zigbee2mqtt/node-packages.nix index 374b97bb509..a9da40e3fe4 100644 --- a/pkgs/servers/zigbee2mqtt/node-packages.nix +++ b/pkgs/servers/zigbee2mqtt/node-packages.nix @@ -10090,4 +10090,4 @@ in tarball = nodeEnv.buildNodeSourceDist args; package = nodeEnv.buildNodePackage args; shell = nodeEnv.buildNodeShell args; -} \ No newline at end of file +} diff --git a/pkgs/servers/zigbee2mqtt/node.nix b/pkgs/servers/zigbee2mqtt/node.nix index 6080388b05e..6ea97449ad6 100644 --- a/pkgs/servers/zigbee2mqtt/node.nix +++ b/pkgs/servers/zigbee2mqtt/node.nix @@ -6,7 +6,7 @@ let nodeEnv = import ../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile; + inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile; inherit nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; @@ -14,4 +14,4 @@ in import ./node-packages.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} \ No newline at end of file +} diff --git a/pkgs/servers/zoneminder/default.nix b/pkgs/servers/zoneminder/default.nix index babcd8e6374..0ae93ed1469 100644 --- a/pkgs/servers/zoneminder/default.nix +++ b/pkgs/servers/zoneminder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchurl, fetchpatch, substituteAll, cmake, makeWrapper, pkgconfig +{ stdenv, lib, fetchFromGitHub, fetchurl, fetchpatch, substituteAll, cmake, makeWrapper, pkg-config , curl, ffmpeg_3, glib, libjpeg, libselinux, libsepol, mp4v2, libmysqlclient, mysql, pcre, perl, perlPackages , polkit, util-linuxMinimal, x264, zlib , coreutils, procps, psmisc, nixosTests }: @@ -157,7 +157,7 @@ in stdenv.mkDerivation rec { CryptEksblowfish DataEntropy # zmupdate.pl ]); - nativeBuildInputs = [ cmake makeWrapper pkgconfig ]; + nativeBuildInputs = [ cmake makeWrapper pkg-config ]; cmakeFlags = [ "-DWITH_SYSTEMD=ON" diff --git a/pkgs/shells/bash/4.4.nix b/pkgs/shells/bash/4.4.nix index afdfb816c95..bde942aff0c 100644 --- a/pkgs/shells/bash/4.4.nix +++ b/pkgs/shells/bash/4.4.nix @@ -6,7 +6,7 @@ , withDocs ? false, texinfo ? null }: -with stdenv.lib; +with lib; assert interactive -> readline70 != null; assert withDocs -> texinfo != null; diff --git a/pkgs/shells/bash/5.1.nix b/pkgs/shells/bash/5.1.nix index fd8c0c32cd6..5dd060db7ef 100644 --- a/pkgs/shells/bash/5.1.nix +++ b/pkgs/shells/bash/5.1.nix @@ -12,7 +12,7 @@ , texinfo ? null }: -with stdenv.lib; +with lib; assert interactive -> readline80 != null; assert withDocs -> texinfo != null; diff --git a/pkgs/shells/bash/bash-completion/default.nix b/pkgs/shells/bash/bash-completion/default.nix index 22a7ead545d..0ebcaa9e864 100644 --- a/pkgs/shells/bash/bash-completion/default.nix +++ b/pkgs/shells/bash/bash-completion/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { # - ignore test_screen because it assumes vt terminals exist checkPhase = '' pytest . \ - ${stdenv.lib.optionalString (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32) "--ignore=test/t/test_gcc.py"} \ + ${lib.optionalString (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32) "--ignore=test/t/test_gcc.py"} \ --ignore=test/t/test_chsh.py \ --ignore=test/t/test_ether_wake.py \ --ignore=test/t/test_ifdown.py \ @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { --ignore=test/t/test_screen.py ''; - prePatch = stdenv.lib.optionalString stdenv.isDarwin '' + prePatch = lib.optionalString stdenv.isDarwin '' sed -i -e 's/readlink -f/readlink/g' bash_completion completions/* ''; diff --git a/pkgs/shells/dash/default.nix b/pkgs/shells/dash/default.nix index 2c6e9cc0e68..24d5af7e74e 100644 --- a/pkgs/shells/dash/default.nix +++ b/pkgs/shells/dash/default.nix @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { url = "https://git.kernel.org/pub/scm/utils/dash/dash.git/patch/?id=29d6f2148f10213de4e904d515e792d2cf8c968e"; sha256 = "08q90bx36ixwlcj331dh7420qyj8i0qh1cc1gljrhd83fhl9w0y5"; }) - ] ++ stdenv.lib.optional stdenv.isDarwin ./0001-fix-dirent64-et-al-on-darwin.patch; + ] ++ lib.optional stdenv.isDarwin ./0001-fix-dirent64-et-al-on-darwin.patch; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin autoreconfHook; + nativeBuildInputs = lib.optional stdenv.isDarwin autoreconfHook; meta = with lib; { homepage = "http://gondor.apana.org.au/~herbert/dash/"; diff --git a/pkgs/shells/dgsh/default.nix b/pkgs/shells/dgsh/default.nix index 28e5b15b3e7..7a6ae67c3ae 100644 --- a/pkgs/shells/dgsh/default.nix +++ b/pkgs/shells/dgsh/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, +{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, libtool, check, bison, git, gperf, perl, texinfo, help2man, gettext, ncurses }: @@ -17,7 +17,7 @@ stdenv.mkDerivation { patches = [ ./glibc-2.26.patch ]; - nativeBuildInputs = [ autoconf automake pkgconfig libtool check + nativeBuildInputs = [ autoconf automake pkg-config libtool check bison git gettext gperf perl texinfo help2man ncurses ]; diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix index 938029e9af9..de25503e4aa 100644 --- a/pkgs/shells/elvish/default.nix +++ b/pkgs/shells/elvish/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "elvish"; - version = "0.14.1"; + version = "0.15.0"; excludedPackages = [ "website" ]; @@ -12,10 +12,10 @@ buildGoModule rec { owner = "elves"; repo = pname; rev = "v${version}"; - sha256 = "05wp3cx4s2cjf60yncdpmycs5h4z1dlin56dmljmfwz4z099079b"; + sha256 = "1jksdpf86miz1dv3vrmvpvz4k1c2m23dway6a7b1cypg03c68a75"; }; - vendorSha256 = "1f971n17h9bc0qcgs9ipiaw0x9807mz761fqm605br4ch1kp0897"; + vendorSha256 = "124m9680pl7wrh7ld7v39dfl86r6vih1pjk3bmbihy0fjgxnnq0b"; doCheck = false; diff --git a/pkgs/shells/fish/babelfish.nix b/pkgs/shells/fish/babelfish.nix index bfe01740f14..fb938b8f37d 100644 --- a/pkgs/shells/fish/babelfish.nix +++ b/pkgs/shells/fish/babelfish.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "babelfish"; - version = "0.1.3"; + version = "1.1.0"; src = fetchFromGitHub { owner = "bouk"; repo = "babelfish"; rev = "v${version}"; - sha256 = "08i4y4fw60ynamr1jz8nkfkidxj06vcyhi1v4wxpl2macn6n4skk"; + sha256 = "0b1knj9llwzwnl4w3d6akvlc57dp0fszjkq98w8wybcvkbpd3ip1"; }; - vendorSha256 = "0xjy50wciw329kq1nkd7hhaipcp4fy28hhk6cdq21qwid6g21gag"; + vendorSha256 = "0kspqwbgiqfkfj9a9pdwzc0jdi9p35abqqqjhcpvqwdxw378w5lz"; meta = with lib; { description = "Translate bash scripts to fish"; diff --git a/pkgs/shells/ion/default.nix b/pkgs/shells/ion/default.nix index d1b499a9160..77691e99b25 100644 --- a/pkgs/shells/ion/default.nix +++ b/pkgs/shells/ion/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { maintainers = with maintainers; [ dywedir ]; }; - buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin [ + buildInputs = lib.optional stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/shells/jush/default.nix b/pkgs/shells/jush/default.nix index f6d07814ce1..12cd6c935c0 100644 --- a/pkgs/shells/jush/default.nix +++ b/pkgs/shells/jush/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, editline }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, editline }: stdenv.mkDerivation rec { pname = "jush"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1azvghrh31gawd798a254ml4id642qvbva64zzg30pjszh1087n8"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ editline ]; diff --git a/pkgs/shells/mksh/default.nix b/pkgs/shells/mksh/default.nix index 7022f6b37e3..c10537959d7 100644 --- a/pkgs/shells/mksh/default.nix +++ b/pkgs/shells/mksh/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { dontConfigure = true; - buildPhase = ''sh ./Build.sh -r''; + buildPhase = "sh ./Build.sh -r"; installPhase = '' install -D -m 755 mksh $out/bin/mksh diff --git a/pkgs/shells/mrsh/default.nix b/pkgs/shells/mrsh/default.nix index c457b72953b..8efebb8f321 100644 --- a/pkgs/shells/mrsh/default.nix +++ b/pkgs/shells/mrsh/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig, readline }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, readline }: stdenv.mkDerivation rec { pname = "mrsh"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "08gak5261d4sd6b2w2kscmdwa4gwcp5drgfyb3swyrj9cl0nlcbn"; }; - nativeBuildInputs = [ meson ninja pkgconfig ]; + nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ readline ]; doCheck = true; diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index 1774a1c6677..a0a070b9266 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.24.1"; + version = "0.26.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0nza860gg9lnkld9c7is93fmfxl9yay8yf2f18h16cgjk3n686kd"; + sha256 = "sha256-v0u04xY4iEbOTeaPKmbHImNTzEgdqf1wZWV0hKOV6Vg="; }; - cargoSha256 = "1mb6ws2zw089cx475c1vpvvxkzi8by6wmw4frans5lbl3a2lldl0"; + cargoSha256 = "sha256-0Ncjy6vZqiMNB+aRzf255tsIdrnpG0a4Xoid+mAAvUk="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ]; diff --git a/pkgs/shells/oh/default.nix b/pkgs/shells/oh/default.nix index 3ae8a7c600a..33e71358b4d 100644 --- a/pkgs/shells/oh/default.nix +++ b/pkgs/shells/oh/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildGoPackage, fetchgit, lib }: +{ buildGoPackage, fetchgit, lib }: buildGoPackage rec { pname = "oh"; - version = "20160522-${stdenv.lib.strings.substring 0 7 rev}"; + version = "20160522-${lib.strings.substring 0 7 rev}"; rev = "0daaf4081475fb9d6b3801c85019bdd57b2ee9b4"; goPackagePath = "github.com/michaelmacinnis/oh"; @@ -18,6 +18,6 @@ buildGoPackage rec { meta = with lib;{ homepage = "https://github.com/michaelmacinnis/oh"; description = "A Unix shell"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; } diff --git a/pkgs/shells/pash/default.nix b/pkgs/shells/pash/default.nix index 06ca2420798..c7c6e4e5a7d 100644 --- a/pkgs/shells/pash/default.nix +++ b/pkgs/shells/pash/default.nix @@ -1,9 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, buildDotnetPackage }: +{ lib, fetchFromGitHub, buildDotnetPackage }: buildDotnetPackage { baseName = "pash"; version = "git-2016-07-06"; - + src = fetchFromGitHub { owner = "Pash-Project"; repo = "Pash"; diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix index d776e64fa49..3f9d7130811 100644 --- a/pkgs/shells/powershell/default.nix +++ b/pkgs/shells/powershell/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin makeWrapper $pslibs/pwsh $out/bin/pwsh \ - --prefix ${platformLdLibraryPath} : "${stdenv.lib.makeLibraryPath libraries}" \ + --prefix ${platformLdLibraryPath} : "${lib.makeLibraryPath libraries}" \ --set TERM xterm --set POWERSHELL_TELEMETRY_OPTOUT 1 --set DOTNET_CLI_TELEMETRY_OPTOUT 1 ''; diff --git a/pkgs/shells/rc/default.nix b/pkgs/shells/rc/default.nix index a71d5ba2897..af43c42dd4b 100644 --- a/pkgs/shells/rc/default.nix +++ b/pkgs/shells/rc/default.nix @@ -15,12 +15,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ ncurses ] - ++ stdenv.lib.optionals (readline != null) [ readline ]; + ++ lib.optionals (readline != null) [ readline ]; configureFlags = [ "--enable-def-interp=${stdenv.shell}" #183 - ] ++ stdenv.lib.optionals historySupport [ "--with-history" ] - ++ stdenv.lib.optionals (readline != null) [ "--with-edit=readline" ]; + ] ++ lib.optionals historySupport [ "--with-history" ] + ++ lib.optionals (readline != null) [ "--with-edit=readline" ]; prePatch = '' substituteInPlace configure.ac \ diff --git a/pkgs/shells/rush/default.nix b/pkgs/shells/rush/default.nix index f9e15d4a0b4..bdb8f7ce095 100644 --- a/pkgs/shells/rush/default.nix +++ b/pkgs/shells/rush/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv }: +{ fetchurl, lib, stdenv }: stdenv.mkDerivation rec { pname = "rush"; @@ -29,10 +29,10 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.gnu.org/software/rush/"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; - maintainers = [ stdenv.lib.maintainers.bjg ]; - platforms = stdenv.lib.platforms.all; + maintainers = [ lib.maintainers.bjg ]; + platforms = lib.platforms.all; }; passthru = { diff --git a/pkgs/shells/scponly/default.nix b/pkgs/shells/scponly/default.nix new file mode 100644 index 00000000000..c0c39d8e316 --- /dev/null +++ b/pkgs/shells/scponly/default.nix @@ -0,0 +1,39 @@ +{ stdenv, lib, fetchFromGitHub, openssh, debugLevel ? 0 }: + +stdenv.mkDerivation { + pname = "scponly"; + version = "4.8"; + + src = fetchFromGitHub { + owner = "scponly"; + repo = "scponly"; + rev = "d8ca58257b9905186aa5706f35813d5f80ea07c1"; + sha256 = "U0K7lOp18ytNjh3KVFmc6vL+/tG4ETnwLEPQEhM4lXE="; + }; + + patches = [ ./scponly-fix-make.patch ]; + + buildInputs = [ openssh ]; + + # Add path to sftp-server so configure finds it + preConfigure = "export PATH=$PATH:${openssh}/libexec"; + + # chroot doesn't seem to work, so not enabling + # rsync could also be optionally enabled + configureFlags = [ "--enable-winscp-compat" ]; + + postInstall = lib.optionalString (debugLevel > 0) '' + mkdir -p $out/etc/scponly && echo ${ + toString debugLevel + } > $out/etc/scponly/debuglevel + ''; + + passthru.shellPath = "/bin/scponly"; + + meta = with lib; { + description = "A shell that only permits scp and sftp-server"; + homepage = "https://github.com/scponly/scponly"; + license = with licenses; [ bsd2 ]; + maintainers = with maintainers; [ wmertens ]; + }; +} diff --git a/pkgs/shells/scponly/scponly-fix-make.patch b/pkgs/shells/scponly/scponly-fix-make.patch new file mode 100644 index 00000000000..e8522ec8e6e --- /dev/null +++ b/pkgs/shells/scponly/scponly-fix-make.patch @@ -0,0 +1,21 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -41,14 +41,14 @@ + ${INSTALL} -d ${DESTDIR}${bindir} + ${INSTALL} -d ${DESTDIR}${mandir}/man8 + ${INSTALL} -d ${DESTDIR}${CONFDIR} +- ${INSTALL} -o 0 -g 0 scponly ${DESTDIR}${bindir}/scponly +- ${INSTALL} -o 0 -g 0 -m 0644 scponly.8 ${DESTDIR}${mandir}/man8/scponly.8 +- ${INSTALL} -o 0 -g 0 -m 0644 debuglevel ${DESTDIR}${DEBUGFILE} ++ ${INSTALL} scponly ${DESTDIR}${bindir}/scponly ++ ${INSTALL} -m 0644 scponly.8 ${DESTDIR}${mandir}/man8/scponly.8 ++ ${INSTALL} -m 0644 debuglevel ${DESTDIR}${DEBUGFILE} + if test "x${CHROOTED_NAME}" != "x"; then \ + ${INSTALL} -d ${DESTDIR}${sbindir}; \ + rm -f ${DESTDIR}${sbindir}/${CHROOTED_NAME}; \ + cp scponly ${CHROOTED_NAME}; \ +- ${INSTALL} -o 0 -g 0 -m 4755 ${CHROOTED_NAME} ${DESTDIR}${sbindir}/${CHROOTED_NAME}; \ ++ ${INSTALL} ${CHROOTED_NAME} ${DESTDIR}${sbindir}/${CHROOTED_NAME}; \ + fi + + debuglevel: diff --git a/pkgs/shells/tcsh/default.nix b/pkgs/shells/tcsh/default.nix index 468d17b60b7..4d6c9556501 100644 --- a/pkgs/shells/tcsh/default.nix +++ b/pkgs/shells/tcsh/default.nix @@ -9,15 +9,18 @@ stdenv.mkDerivation rec { src = fetchurl { urls = [ "http://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/${pname}-${version}.tar.gz" + "http://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/old/${pname}-${version}.tar.gz" "ftp://ftp.astron.com/pub/tcsh/${pname}-${version}.tar.gz" + "ftp://ftp.astron.com/pub/tcsh/old/${pname}-${version}.tar.gz" "ftp://ftp.funet.fi/pub/unix/shells/tcsh/${pname}-${version}.tar.gz" + "ftp://ftp.funet.fi/pub/unix/shells/tcsh/old/${pname}-${version}.tar.gz" ]; sha256 = "sha256-viz9ZT0qDH9QbS3RTBIyS6dJvUhAN75t9Eo5c/UiYrc="; }; buildInputs = [ ncurses ]; - patches = stdenv.lib.optional stdenv.hostPlatform.isMusl + patches = lib.optional stdenv.hostPlatform.isMusl (fetchpatch { name = "sysmalloc.patch"; url = "https://git.alpinelinux.org/aports/plain/community/tcsh/001-sysmalloc.patch?id=184585c046cdd56512f1a76e426dd799b368f8cf"; diff --git a/pkgs/shells/zsh/antigen/default.nix b/pkgs/shells/zsh/antigen/default.nix index 5603e5edf59..c80471677f0 100644 --- a/pkgs/shells/zsh/antigen/default.nix +++ b/pkgs/shells/zsh/antigen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { version = "2.2.3"; @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { meta = { description = "The plugin manager for zsh"; homepage = "http://antigen.sharats.me"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; } diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index eab6d88a0b7..71f526525e4 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, pcre, buildPackages }: +{ lib, stdenv, fetchurl, ncurses, pcre, buildPackages }: let version = "5.8"; @@ -31,7 +31,7 @@ stdenv.mkDerivation { # the zsh/zpty module is not available on hydra # so skip groups Y Z - checkFlags = map (T: "TESTNUM=${T}") (stdenv.lib.stringToCharacters "ABCDEVW"); + checkFlags = map (T: "TESTNUM=${T}") (lib.stringToCharacters "ABCDEVW"); # XXX: think/discuss about this, also with respect to nixos vs nix-on-X postInstall = '' @@ -65,7 +65,7 @@ EOF ${if stdenv.hostPlatform == stdenv.buildPlatform then '' $out/bin/zsh -c "zcompile $out/etc/zprofile" '' else '' - ${stdenv.lib.getBin buildPackages.zsh}/bin/zsh -c "zcompile $out/etc/zprofile" + ${lib.getBin buildPackages.zsh}/bin/zsh -c "zcompile $out/etc/zprofile" ''} mv $out/etc/zprofile $out/etc/zprofile_zwc_is_used ''; @@ -83,8 +83,8 @@ EOF ''; license = "MIT-like"; homepage = "https://www.zsh.org/"; - maintainers = with stdenv.lib.maintainers; [ pSub ]; - platforms = stdenv.lib.platforms.unix; + maintainers = with lib.maintainers; [ pSub ]; + platforms = lib.platforms.unix; }; passthru = { diff --git a/pkgs/shells/zsh/grml-zsh-config/default.nix b/pkgs/shells/zsh/grml-zsh-config/default.nix index 20181630547..4844d3fcbf2 100644 --- a/pkgs/shells/zsh/grml-zsh-config/default.nix +++ b/pkgs/shells/zsh/grml-zsh-config/default.nix @@ -5,13 +5,13 @@ with lib; stdenv.mkDerivation rec { pname = "grml-zsh-config"; - version = "0.17.4"; + version = "0.18.0"; src = fetchFromGitHub { owner = "grml"; repo = "grml-etc-core"; rev = "v${version}"; - sha256 = "09c3f7s2r0cb8g9kgh3xhc8dhr1656g1q9s9i3s5imvknwqii6as"; + sha256 = "sha256-5QwP+dMOm6UBbQ1X1OcHawHSi3DJIciny2sV7biE18c="; }; buildInputs = [ zsh coreutils txt2tags procps ] diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 1b3a4c21cf3..bab6ebb686b 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -1,19 +1,19 @@ # This script was inspired by the ArchLinux User Repository package: # # https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=oh-my-zsh-git -{ lib, stdenv, fetchFromGitHub, nixosTests, writeScript, common-updater-scripts, git -, nix, nixfmt, jq, coreutils, gnused, curl, cacert }: +{ lib, stdenv, fetchFromGitHub, nixosTests, writeScript, common-updater-scripts +, git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }: stdenv.mkDerivation rec { - version = "2021-01-07"; + version = "2021-01-31"; pname = "oh-my-zsh"; - rev = "c9bf8b4a84d4ae392cf1bdd6a4a7c7c4f7710b92"; + rev = "c52e646bb7b109e15f6dc4047b29ca8c8e029433"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "13i4r2bhffdjcln5cml29m9gzw9m39yxcln49h3shpp7s1gl3z4a"; + sha256 = "0yfpahn9a6aby8ym1slcn8kvric26xy14fk1jjj3f07xvh7xg2y9"; }; installPhase = '' @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { #!${stdenv.shell} set -o errexit PATH=${ - stdenv.lib.makeBinPath [ + lib.makeBinPath [ common-updater-scripts curl cacert diff --git a/pkgs/shells/zsh/pure-prompt/default.nix b/pkgs/shells/zsh/pure-prompt/default.nix index ac7035045bb..a15c9b5bbb9 100644 --- a/pkgs/shells/zsh/pure-prompt/default.nix +++ b/pkgs/shells/zsh/pure-prompt/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "pure-prompt"; - version = "1.15.0"; + version = "1.16.0"; src = fetchFromGitHub { owner = "sindresorhus"; repo = "pure"; rev = "v${version}"; - sha256 = "0r4y8bglwdq85dwlxh9sm23ppzy1z7i8kmjny5mx9css0likj8qv"; + sha256 = "sha256-fnk4lLRASX7FFAovAiRd9sm4jNlnFIJ78UCzdsXYVfM="; }; installPhase = '' diff --git a/pkgs/shells/zsh/zsh-bd/default.nix b/pkgs/shells/zsh/zsh-bd/default.nix index b5b66af6ca3..f2c2dc90fb4 100644 --- a/pkgs/shells/zsh/zsh-bd/default.nix +++ b/pkgs/shells/zsh/zsh-bd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub}: +{ lib, stdenv, fetchFromGitHub}: stdenv.mkDerivation rec { pname = "zsh-bd"; @@ -23,9 +23,9 @@ stdenv.mkDerivation rec { meta = { description = "Jump back to a specific directory, without doing `cd ../../..` "; homepage = "https://github.com/Tarrasch/zsh-bd"; - license = stdenv.lib.licenses.free; + license = lib.licenses.free; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.olejorgenb ]; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.olejorgenb ]; }; } diff --git a/pkgs/shells/zsh/zsh-completions/default.nix b/pkgs/shells/zsh/zsh-completions/default.nix index 89a91ad0508..07e538610ba 100644 --- a/pkgs/shells/zsh/zsh-completions/default.nix +++ b/pkgs/shells/zsh/zsh-completions/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub}: +{ lib, stdenv, fetchFromGitHub}: stdenv.mkDerivation rec { pname = "zsh-completions"; @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { meta = { description = "Additional completion definitions for zsh"; homepage = "https://github.com/zsh-users/zsh-completions"; - license = stdenv.lib.licenses.free; + license = lib.licenses.free; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.olejorgenb ]; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.olejorgenb ]; }; } diff --git a/pkgs/shells/zsh/zsh-fzf-tab/default.nix b/pkgs/shells/zsh/zsh-fzf-tab/default.nix new file mode 100644 index 00000000000..b48eda0a728 --- /dev/null +++ b/pkgs/shells/zsh/zsh-fzf-tab/default.nix @@ -0,0 +1,45 @@ +{ stdenv, lib, fetchFromGitHub, ncurses }: + +let + INSTALL_PATH="${placeholder "out"}/share/fzf-tab"; +in stdenv.mkDerivation rec { + pname = "zsh-fzf-tab"; + version = "unstable-2021-01-24"; + + src = fetchFromGitHub { + owner = "Aloxaf"; + repo = "fzf-tab"; + rev = "78b4cefb27dc2bef5e4c9ac3bf2bd28413620fcd"; + sha256 = "1f5m7vf7wxzczis2nzvhgqaqnphhp3a0wv8b612m7g4fnvk3lnkn"; + }; + + buildInputs = [ ncurses ]; + + postConfigure = '' + pushd modules + ./configure --disable-gdbm --without-tcsetpgrp + popd + ''; + + postBuild = '' + pushd modules + make -j$NIX_BUILD_CORES + popd + ''; + + installPhase = '' + mkdir -p ${INSTALL_PATH} + cp -r lib ${INSTALL_PATH}/lib + install -D fzf-tab.zsh ${INSTALL_PATH}/fzf-tab.zsh + install -D fzf-tab.plugin.zsh ${INSTALL_PATH}/fzf-tab.plugin.zsh + install -D modules/Src/aloxaf/fzftab.so ${INSTALL_PATH}/modules/Src/aloxaf/fzftab.so + ''; + + meta = with lib; { + homepage = "https://github.com/Aloxaf/fzf-tab"; + description = "Replace zsh's default completion selection menu with fzf!"; + license = licenses.mit; + maintainers = with maintainers; [ vonfry ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/shells/zsh/zsh-git-prompt/default.nix b/pkgs/shells/zsh/zsh-git-prompt/default.nix index 6aadf3163d3..7fb2d786193 100644 --- a/pkgs/shells/zsh/zsh-git-prompt/default.nix +++ b/pkgs/shells/zsh/zsh-git-prompt/default.nix @@ -32,7 +32,7 @@ }: haskellPackages.callPackage - ({ mkDerivation, base, HUnit, parsec, process, QuickCheck, stdenv }: + ({ mkDerivation, base, HUnit, parsec, process, QuickCheck }: mkDerivation rec { pname = "zsh-git-prompt"; version = "0.4z"; # While we await a real 0.5 release. @@ -65,6 +65,6 @@ haskellPackages.callPackage testHaskellDepends = [HUnit] ++ libraryHaskellDepends; homepage = "https://github.com/olivierverdier/zsh-git-prompt#readme"; description = "Informative git prompt for zsh"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; maintainers = [lib.maintainers.league]; }) {} diff --git a/pkgs/shells/zsh/zsh-history/default.nix b/pkgs/shells/zsh/zsh-history/default.nix index 3d48467a246..333da40adbb 100644 --- a/pkgs/shells/zsh/zsh-history/default.nix +++ b/pkgs/shells/zsh/zsh-history/default.nix @@ -28,7 +28,7 @@ buildGoModule rec { license = licenses.mit; homepage = "https://github.com/b4b4r07/history"; platforms = platforms.unix; - maintainers = with maintainers; [ kampka ]; + maintainers = with maintainers; [ ]; }; passthru.tests = { diff --git a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix index 7e39e6779d1..c18a863c636 100644 --- a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix +++ b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, substituteAll, pkgs }: +{ lib, stdenv, fetchFromGitHub, substituteAll, pkgs }: # To make use of this derivation, use # `programs.zsh.promptInit = "source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme";` @@ -6,7 +6,7 @@ let # match gitstatus version with given `gitstatus_version`: # https://github.com/romkatv/powerlevel10k/blob/master/gitstatus/build.info - gitstatus = pkgs.gitAndTools.gitstatus.overrideAttrs (oldAtttrs: rec { + gitstatus = pkgs.gitstatus.overrideAttrs (oldAtttrs: rec { version = "1.3.1"; src = fetchFromGitHub { @@ -19,13 +19,13 @@ let in stdenv.mkDerivation rec { pname = "powerlevel10k"; - version = "1.14.4"; + version = "1.14.6"; src = fetchFromGitHub { owner = "romkatv"; repo = "powerlevel10k"; rev = "v${version}"; - sha256 = "1072ikklvpvx6qf0q8ydbi1qc1dxjjfs4031b4zzgjw766xnpcbk"; + sha256 = "1z6xipd7bgq7fc03x9j2dmg3yv59xyjf4ic5f1l6l6pw7w3q4sq7"; }; patches = [ @@ -45,9 +45,9 @@ stdenv.mkDerivation rec { meta = { description = "A fast reimplementation of Powerlevel9k ZSH theme"; homepage = "https://github.com/romkatv/powerlevel10k"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.hexa ]; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.hexa ]; }; } diff --git a/pkgs/shells/zsh/zsh-powerlevel9k/default.nix b/pkgs/shells/zsh/zsh-powerlevel9k/default.nix index 676f9458675..b681dc2d3a3 100644 --- a/pkgs/shells/zsh/zsh-powerlevel9k/default.nix +++ b/pkgs/shells/zsh/zsh-powerlevel9k/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: # To make use of this derivation, use # `programs.zsh.promptInit = "source ${pkgs.zsh-powerlevel9k}/share/zsh-powerlevel9k/powerlevel9k.zsh-theme";` @@ -21,9 +21,9 @@ stdenv.mkDerivation { meta = { description = "A beautiful theme for zsh"; homepage = "https://github.com/bhilburn/powerlevel9k"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.pierrechevalier83 ]; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.pierrechevalier83 ]; }; } diff --git a/pkgs/shells/zsh/zsh-prezto/default.nix b/pkgs/shells/zsh/zsh-prezto/default.nix index 138de38786b..98cbf2c80f0 100644 --- a/pkgs/shells/zsh/zsh-prezto/default.nix +++ b/pkgs/shells/zsh/zsh-prezto/default.nix @@ -1,34 +1,34 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub, unstableGitUpdater }: stdenv.mkDerivation rec { pname = "zsh-prezto"; - version = "2020-05-20"; + version = "unstable-2021-01-19"; + src = fetchFromGitHub { owner = "sorin-ionescu"; repo = "prezto"; - rev = "793f239a5e38ef2c4b76a4955bb734520303e8c4"; - sha256 = "0xhdl1g0rvlikq6qxh6cwp6wsrgmw4l1rmmq5xpc7wl6dyh35yri"; + rev = "704fc46c3f83ca1055becce65fb513a533f48982"; + sha256 = "0rkbx6hllf6w6x64mggbhvm1fvbq5sr5kvf06sarfkpz5l0a5wh3"; fetchSubmodules = true; }; - buildPhase = '' - sed -i '/\''${ZDOTDIR:\-\$HOME}\/.zpreztorc" ]]/i\ - if [[ -s "/etc/zpreztorc" ]]; then\ - source "/etc/zpreztorc"\ - fi' init.zsh - sed -i -e "s|\''${ZDOTDIR:\-\$HOME}/.zprezto/|$out/|g" init.zsh - for i in runcoms/*; do - sed -i -e "s|\''${ZDOTDIR:\-\$HOME}/.zprezto/|$out/|g" $i - done - ''; + installPhase = '' - mkdir -p $out - cp ./* $out/ -R + mkdir -p $out/share/zsh-prezto + cp -R ./ $out/share/zsh-prezto ''; + + passthru.updateScript = unstableGitUpdater {}; + meta = with lib; { - description = "Prezto is the configuration framework for Zsh; it enriches the command line interface environment with sane defaults, aliases, functions, auto completion, and prompt themes"; + description = "The configuration framework for Zsh"; + longDescription = '' + Prezto is the configuration framework for Zsh; it enriches + the command line interface environment with sane defaults, + aliases, functions, auto completion, and prompt themes. + ''; homepage = "https://github.com/sorin-ionescu/prezto"; license = licenses.mit; - maintainers = with maintainers; [ ]; - platforms = with platforms; unix; + maintainers = with maintainers; [ holymonson ]; + platforms = platforms.unix; }; } diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 03ae3cb8f0e..d8f73d5a7e3 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -110,7 +110,7 @@ rec { */ replaceMaintainersField = stdenv: pkgs: maintainers: stdenv // { mkDerivation = args: - stdenv.lib.recursiveUpdate + pkgs.lib.recursiveUpdate (stdenv.mkDerivation args) { meta.maintainers = maintainers; }; }; diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index ecec2903b5f..3e5c46709ac 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -1,7 +1,5 @@ { lib , localSystem, crossSystem, config, overlays, crossOverlays ? [] -# The version of darwin.apple_sdk used for sources provided by apple. -, appleSdkVersion ? "10.12" # Minimum required macOS version, used both for compatibility as well as reproducability. , macosVersionMin ? "10.12" # Allow passing in bootstrap files directly so we can test the stdenv bootstrap process when changing the bootstrap tools @@ -22,7 +20,7 @@ assert crossSystem == localSystem; let - inherit (localSystem) system platform; + inherit (localSystem) system; bootstrapClangVersion = "7.1.0"; @@ -82,7 +80,7 @@ in rec { mkCC = overrides: import ../../build-support/cc-wrapper ( let args = { - inherit shell; + inherit lib shell; inherit (last) stdenvNoCC; nativeTools = false; @@ -150,7 +148,7 @@ in rec { __extraImpureHostDeps = commonImpureHostDeps; extraAttrs = { - inherit macosVersionMin appleSdkVersion platform; + inherit macosVersionMin; }; overrides = self: super: (overrides self super) // { inherit ccNoLibcxx; @@ -219,6 +217,7 @@ in rec { binutils = lib.makeOverridable (import ../../build-support/bintools-wrapper) { shell = "${bootstrapTools}/bin/bash"; + inherit lib; inherit (self) stdenvNoCC; nativeTools = false; @@ -524,7 +523,7 @@ in rec { extraAttrs = { libc = pkgs.darwin.Libsystem; shellPackage = pkgs.bash; - inherit macosVersionMin appleSdkVersion platform bootstrapTools; + inherit macosVersionMin bootstrapTools; }; allowedRequisites = (with pkgs; [ diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index 9824d57dff8..1d5abdc8b4a 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -152,7 +152,7 @@ in rec { allowedReferences = []; meta = { - maintainers = [ stdenv.lib.maintainers.copumpkin ]; + maintainers = [ lib.maintainers.copumpkin ]; }; }; diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix index b0db1be5f44..d9eadf26804 100644 --- a/pkgs/stdenv/default.nix +++ b/pkgs/stdenv/default.nix @@ -54,6 +54,7 @@ in aarch64-linux = stagesLinux; mipsel-linux = stagesLinux; powerpc-linux = /* stagesLinux */ stagesNative; + powerpc64-linux = stagesLinux; powerpc64le-linux = stagesLinux; x86_64-darwin = stagesDarwin; x86_64-solaris = stagesNix; diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix index dbb4a056455..38b168c0e72 100644 --- a/pkgs/stdenv/freebsd/default.nix +++ b/pkgs/stdenv/freebsd/default.nix @@ -87,7 +87,7 @@ let inherit (localSystem) system; in isClang = true; }; - preHook = ''export NIX_NO_SELF_RPATH=1''; + preHook = "export NIX_NO_SELF_RPATH=1"; }; }) diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index c7c3bb9f3f3..52d57a6dece 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -152,9 +152,12 @@ let inherit lib config stdenv; }) mkDerivation; - # For convenience, bring in the library functions in lib/ so - # packages don't have to do that themselves. - inherit lib; + # Slated for deprecation in 21.11 + lib = builtins.trace + ( "Warning: `stdenv.lib` is deprecated and will be removed in the next release." + + " Please use `pkgs.lib` instead." + + " For more information see https://github.com/NixOS/nixpkgs/issues/108938") + lib; inherit fetchurlBoot; diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 0eb799e4525..13a7a03d6a8 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -276,10 +276,10 @@ in rec { in [ "--cross-file=${crossFile}" ] ++ mesonFlags; } // lib.optionalAttrs (attrs.enableParallelBuilding or false) { enableParallelChecking = attrs.enableParallelChecking or true; - } // lib.optionalAttrs (hardeningDisable != [] || hardeningEnable != []) { + } // lib.optionalAttrs (hardeningDisable != [] || hardeningEnable != [] || stdenv.hostPlatform.isMusl) { NIX_HARDENING_ENABLE = enabledHardeningOptions; - } // lib.optionalAttrs (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform ? platform.gcc.arch) { - requiredSystemFeatures = attrs.requiredSystemFeatures or [] ++ [ "gccarch-${stdenv.hostPlatform.platform.gcc.arch}" ]; + } // lib.optionalAttrs (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform ? gcc.arch) { + requiredSystemFeatures = attrs.requiredSystemFeatures or [] ++ [ "gccarch-${stdenv.hostPlatform.gcc.arch}" ]; } // lib.optionalAttrs (stdenv.buildPlatform.isDarwin) { inherit __darwinAllowLocalNetworking; # TODO: remove lib.unique once nix has a list canonicalization primitive diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 4ff0a6caf76..7168ce4084c 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -787,7 +787,7 @@ substituteAllInPlace() { # the environment used for building. dumpVars() { if [ "${noDumpEnvVars:-0}" != 1 ]; then - export >| "$NIX_BUILD_TOP/env-vars" || true + export 2>/dev/null >| "$NIX_BUILD_TOP/env-vars" || true fi } diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 6d6bca870bf..f753af49926 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -42,7 +42,7 @@ assert crossSystem == localSystem; let - inherit (localSystem) system platform; + inherit (localSystem) system; commonPreHook = '' @@ -107,15 +107,11 @@ let bintools = prevStage.binutils; isGNU = true; libc = getLibc prevStage; + inherit lib; inherit (prevStage) coreutils gnugrep; stdenvNoCC = prevStage.ccWrapperStdenv; }; - extraAttrs = { - # Having the proper 'platform' in all the stdenvs allows getting proper - # linuxHeaders for example. - inherit platform; - }; overrides = self: super: (overrides self super) // { fetchurl = thisStdenv.fetchurlBoot; }; }; @@ -171,6 +167,7 @@ in nativeLibc = false; buildPackages = { }; libc = getLibc self; + inherit lib; inherit (self) stdenvNoCC coreutils gnugrep; bintools = bootstrapTools; }; @@ -317,6 +314,7 @@ in cc = prevStage.gcc-unwrapped; bintools = self.binutils; libc = getLibc self; + inherit lib; inherit (self) stdenvNoCC coreutils gnugrep; shell = self.bash + "/bin/bash"; }; @@ -369,7 +367,7 @@ in # TODO: remove this! inherit (prevStage) glibc; - inherit platform bootstrapTools; + inherit bootstrapTools; shellPackage = prevStage.bash; }; diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index d1ee317a2bc..d8ab96952b7 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -17,6 +17,8 @@ in lib.mapAttrs (n: make) (with lib.systems.examples; { armv6l-musl = muslpi; aarch64-musl = aarch64-multiplatform-musl; riscv64 = riscv64; + powerpc64 = ppc64; + powerpc64-musl = ppc64-musl; powerpc64le = powernv; powerpc64le-musl = musl-power; }) diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 25cde589a92..869405a2760 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -19,7 +19,8 @@ in with pkgs; rec { tarMinimal = gnutar.override { acl = null; }; busyboxMinimal = busybox.override { - useMusl = !stdenv.targetPlatform.isRiscV; + useMusl = with stdenv.targetPlatform; !isRiscV && + (system == "powerpc64-linux" -> parsed.abi.name != "elfv1"); enableStatic = true; enableMinimal = true; extraConfig = '' @@ -258,7 +259,7 @@ in with pkgs; rec { gcc --version '' + lib.optionalString (stdenv.hostPlatform.libc == "glibc") '' - ldlinux=$(echo ${bootstrapTools}/lib/ld-linux*.so.?) + ldlinux=$(echo ${bootstrapTools}/lib/${builtins.baseNameOf binutils.dynamicLinker}) export CPP="cpp -idirafter ${bootstrapTools}/include-glibc -B${bootstrapTools}" export CC="gcc -idirafter ${bootstrapTools}/include-glibc -B${bootstrapTools} -Wl,-dynamic-linker,$ldlinux -Wl,-rpath,${bootstrapTools}/lib" export CXX="g++ -idirafter ${bootstrapTools}/include-glibc -B${bootstrapTools} -Wl,-dynamic-linker,$ldlinux -Wl,-rpath,${bootstrapTools}/lib" diff --git a/pkgs/test/cc-wrapper/default.nix b/pkgs/test/cc-wrapper/default.nix index fae3448c44c..d82ba296e2f 100644 --- a/pkgs/test/cc-wrapper/default.nix +++ b/pkgs/test/cc-wrapper/default.nix @@ -1,13 +1,13 @@ -{ stdenv, glibc }: -with stdenv.lib; +{ lib, stdenv, glibc }: + let # Sanitizers are not supported on Darwin. # Sanitizer headers aren't available in older libc++ stdenvs due to a bug sanitizersWorking = !stdenv.hostPlatform.isMusl && ( - (stdenv.cc.isClang && versionAtLeast (getVersion stdenv.cc.name) "5.0.0") + (stdenv.cc.isClang && lib.versionAtLeast (lib.getVersion stdenv.cc.name) "5.0.0") || (stdenv.cc.isGNU && stdenv.isLinux) ); - staticLibc = optionalString (stdenv.hostPlatform.libc == "glibc") "-L ${glibc.static}/lib"; + staticLibc = lib.optionalString (stdenv.hostPlatform.libc == "glibc") "-L ${glibc.static}/lib"; in stdenv.mkDerivation { name = "cc-wrapper-test"; @@ -23,7 +23,7 @@ in stdenv.mkDerivation { $CXX -o cxx-check ${./cxx-main.cc} ./cxx-check - ${optionalString (stdenv.isDarwin && stdenv.cc.isClang) '' + ${lib.optionalString (stdenv.isDarwin && stdenv.cc.isClang) '' printf "checking whether compiler can build with CoreFoundation.framework... " >&2 mkdir -p foo/lib $CC -framework CoreFoundation -o core-foundation-check ${./core-foundation-main.c} @@ -31,12 +31,12 @@ in stdenv.mkDerivation { ''} - ${optionalString (!stdenv.isDarwin) '' + ${lib.optionalString (!stdenv.isDarwin) '' printf "checking whether compiler builds valid static C binaries... " >&2 $CC ${staticLibc} -static -o cc-static ${./cc-main.c} ./cc-static # our glibc does not have pie enabled yet. - ${optionalString (stdenv.hostPlatform.isMusl && stdenv.cc.isGNU) '' + ${lib.optionalString (stdenv.hostPlatform.isMusl && stdenv.cc.isGNU) '' printf "checking whether compiler builds valid static pie C binaries... " >&2 $CC ${staticLibc} -static-pie -o cc-static-pie ${./cc-main.c} ./cc-static-pie @@ -52,7 +52,7 @@ in stdenv.mkDerivation { printf "checking whether compiler uses NIX_LDFLAGS... " >&2 mkdir -p foo/lib $CC -shared \ - ${optionalString stdenv.isDarwin "-Wl,-install_name,@rpath/libfoo.dylib"} \ + ${lib.optionalString stdenv.isDarwin "-Wl,-install_name,@rpath/libfoo.dylib"} \ -DVALUE=42 \ -o foo/lib/libfoo${stdenv.hostPlatform.extensions.sharedLibrary} \ ${./foo.c} @@ -68,7 +68,7 @@ in stdenv.mkDerivation { $CXX -I std-include -nostdinc++ -o nostdinc-main++ ${./nostdinc-main.c} ./nostdinc-main++ - ${optionalString sanitizersWorking '' + ${lib.optionalString sanitizersWorking '' printf "checking whether sanitizers are fully functional... ">&2 $CC -o sanitizers -fsanitize=address,undefined ${./sanitizers.c} ./sanitizers @@ -77,5 +77,5 @@ in stdenv.mkDerivation { touch $out ''; - meta.platforms = platforms.all; + meta.platforms = lib.platforms.all; } diff --git a/pkgs/test/cc-wrapper/multilib.nix b/pkgs/test/cc-wrapper/multilib.nix index 5ea50b5eb26..828ad67f6c8 100644 --- a/pkgs/test/cc-wrapper/multilib.nix +++ b/pkgs/test/cc-wrapper/multilib.nix @@ -1,4 +1,4 @@ -{ stdenv }: +{ lib, stdenv }: stdenv.mkDerivation { name = "cc-multilib-test"; @@ -33,5 +33,5 @@ stdenv.mkDerivation { touch $out ''; - meta.platforms = stdenv.lib.platforms.x86_64; + meta.platforms = lib.platforms.x86_64; } diff --git a/pkgs/test/haskell-shellFor/default.nix b/pkgs/test/haskell-shellFor/default.nix index 05d09d6f39c..9d13e1112cc 100644 --- a/pkgs/test/haskell-shellFor/default.nix +++ b/pkgs/test/haskell-shellFor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, haskellPackages, cabal-install }: +{ lib, haskellPackages, cabal-install }: (haskellPackages.shellFor { packages = p: [ p.database-id-class p.constraints ]; diff --git a/pkgs/test/install-shell-files/default.nix b/pkgs/test/install-shell-files/default.nix index e3729c7d250..aef5acc1de6 100644 --- a/pkgs/test/install-shell-files/default.nix +++ b/pkgs/test/install-shell-files/default.nix @@ -1,10 +1,10 @@ -{ stdenv, runCommandLocal, recurseIntoAttrs, installShellFiles }: +{ lib, runCommandLocal, recurseIntoAttrs, installShellFiles }: let runTest = name: env: buildCommand: runCommandLocal "install-shell-files--${name}" ({ nativeBuildInputs = [ installShellFiles ]; - meta.platforms = stdenv.lib.platforms.all; + meta.platforms = lib.platforms.all; } // env) buildCommand; in diff --git a/pkgs/test/ld-library-path/default.nix b/pkgs/test/ld-library-path/default.nix index bda3f0be84a..74c52cef253 100644 --- a/pkgs/test/ld-library-path/default.nix +++ b/pkgs/test/ld-library-path/default.nix @@ -1,4 +1,4 @@ -{ stdenv }: +{ lib, stdenv }: # This tests that libraries listed in LD_LIBRARY_PATH take precedence over those listed in RPATH. @@ -84,5 +84,5 @@ in stdenv.mkDerivation { touch $out ''; - meta.platforms = stdenv.lib.platforms.linux; + meta.platforms = lib.platforms.linux; } diff --git a/pkgs/test/patch-shebangs/default.nix b/pkgs/test/patch-shebangs/default.nix index 3e68d96004f..5e1d859c138 100644 --- a/pkgs/test/patch-shebangs/default.nix +++ b/pkgs/test/patch-shebangs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, runCommand }: +{ lib, stdenv, runCommand }: let bad-shebang = stdenv.mkDerivation { @@ -13,7 +13,7 @@ let }; in runCommand "patch-shebangs-test" { passthru = { inherit bad-shebang; }; - meta.platforms = stdenv.lib.platforms.all; + meta.platforms = lib.platforms.all; } '' printf "checking whether patchShebangs works properly... ">&2 if ! grep -q '^#!/bin/sh' ${bad-shebang}/bin/test; then diff --git a/pkgs/test/stdenv-inputs/default.nix b/pkgs/test/stdenv-inputs/default.nix index 4db10e75086..6a2e441d019 100644 --- a/pkgs/test/stdenv-inputs/default.nix +++ b/pkgs/test/stdenv-inputs/default.nix @@ -1,4 +1,4 @@ -{ stdenv }: +{ lib, stdenv }: let foo = stdenv.mkDerivation { @@ -12,7 +12,7 @@ let chmod +x $out/bin/foo cp ${./foo.c} $out/include/foo.h $CC -shared \ - ${stdenv.lib.optionalString stdenv.isDarwin "-Wl,-install_name,$out/lib/libfoo.dylib"} \ + ${lib.optionalString stdenv.isDarwin "-Wl,-install_name,$out/lib/libfoo.dylib"} \ -o $out/lib/libfoo${stdenv.hostPlatform.extensions.sharedLibrary} \ ${./foo.c} ''; @@ -30,7 +30,7 @@ let chmod +x $out/bin/bar cp ${./bar.c} $dev/include/bar.h $CC -shared \ - ${stdenv.lib.optionalString stdenv.isDarwin "-Wl,-install_name,$dev/lib/libbar.dylib"} \ + ${lib.optionalString stdenv.isDarwin "-Wl,-install_name,$dev/lib/libbar.dylib"} \ -o $dev/lib/libbar${stdenv.hostPlatform.extensions.sharedLibrary} \ ${./bar.c} ''; @@ -64,5 +64,5 @@ stdenv.mkDerivation { touch $out ''; - meta.platforms = stdenv.lib.platforms.all; + meta.platforms = lib.platforms.all; } diff --git a/pkgs/tools/X11/alttab/default.nix b/pkgs/tools/X11/alttab/default.nix index 4c9c0b66a50..1a4f1daad51 100644 --- a/pkgs/tools/X11/alttab/default.nix +++ b/pkgs/tools/X11/alttab/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, ronn, libpng, uthash +{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, ronn, libpng, uthash , xorg }: stdenv.mkDerivation rec { @@ -13,10 +13,10 @@ stdenv.mkDerivation rec { sha256 = "026xd1bkg10fj2q1n6xx797xk1grpby25qj1pnw2lp4f3vc19qn6"; }; - nativeBuildInputs = [ + nativeBuildInputs = [ autoconf automake - pkgconfig + pkg-config ronn ]; diff --git a/pkgs/tools/X11/arandr/default.nix b/pkgs/tools/X11/arandr/default.nix index 94e3ac36d07..e6f4b5f6ff1 100644 --- a/pkgs/tools/X11/arandr/default.nix +++ b/pkgs/tools/X11/arandr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3Packages +{ lib, fetchurl, python3Packages , gobject-introspection, gsettings-desktop-schemas, gtk3 , wrapGAppsHook, xrandr }: @@ -34,7 +34,7 @@ in buildPythonApplication rec { meta = { homepage = "http://christian.amsuess.com/tools/arandr/"; description = "A simple visual front end for XRandR"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.domenkozar ]; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.domenkozar ]; }; } diff --git a/pkgs/tools/X11/autocutsel/default.nix b/pkgs/tools/X11/autocutsel/default.nix index ece42502d81..ef03130a2df 100644 --- a/pkgs/tools/X11/autocutsel/default.nix +++ b/pkgs/tools/X11/autocutsel/default.nix @@ -1,14 +1,14 @@ -{stdenv, fetchurl, libX11, libXaw}: +{lib, stdenv, fetchurl, libX11, libXaw}: stdenv.mkDerivation rec { version = "0.10.0"; pname = "autocutsel"; - + src = fetchurl { url = "https://github.com/sigmike/autocutsel/releases/download/${version}/${pname}-${version}.tar.gz"; sha256 = "0gsys2dzh4az51ndcsabhlbbrjn2nm75lnjr45kg6r8sm8q66dx2"; }; - + buildInputs = [ libX11 libXaw ]; installPhase = '' mkdir -p $out/bin @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { inherit version; homepage = "https://www.nongnu.org/autocutsel/"; description = "Tracks changes in the server's cutbuffer and CLIPBOARD selection"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = with stdenv.lib.platforms; all; + license = lib.licenses.gpl2Plus; + platforms = with lib.platforms; all; updateWalker = true; }; } diff --git a/pkgs/tools/X11/bgs/default.nix b/pkgs/tools/X11/bgs/default.nix index 9db666672d4..fc6f7752a3a 100644 --- a/pkgs/tools/X11/bgs/default.nix +++ b/pkgs/tools/X11/bgs/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, pkgconfig, libX11, libXinerama, imlib2}: +{lib, stdenv, fetchurl, pkg-config, libX11, libXinerama, imlib2}: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1rw9ingkkpvvr2dixx126ziim67a54r8k49918h1mbph0fjj08n5"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXinerama imlib2 ]; diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix index 8bd65ec2fc2..706194cc0dd 100644 --- a/pkgs/tools/X11/bumblebee/default.nix +++ b/pkgs/tools/X11/bumblebee/default.nix @@ -16,7 +16,7 @@ # # To use at startup, see hardware.bumblebee options. -{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, help2man, makeWrapper +{ stdenv, lib, fetchurl, fetchpatch, pkg-config, help2man, makeWrapper , glib, libbsd , libX11, xorgserver, kmod, xf86videonouveau , nvidia_x11, virtualgl, libglvnd @@ -103,7 +103,7 @@ in stdenv.mkDerivation rec { # Build-time dependencies of bumblebeed and optirun. # Note that it has several runtime dependencies. buildInputs = [ libX11 glib libbsd kmod ]; - nativeBuildInputs = [ makeWrapper pkgconfig help2man automake111x autoconf ]; + nativeBuildInputs = [ makeWrapper pkg-config help2man automake111x autoconf ]; # The order of LDPATH is very specific: First X11 then the host # environment then the optional sub architecture paths. diff --git a/pkgs/tools/X11/ckbcomp/default.nix b/pkgs/tools/X11/ckbcomp/default.nix index 8bb2cddc080..471dc80979a 100644 --- a/pkgs/tools/X11/ckbcomp/default.nix +++ b/pkgs/tools/X11/ckbcomp/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { description = "Compiles a XKB keyboard description to a keymap suitable for loadkeys"; homepage = "https://salsa.debian.org/installer-team/console-setup"; license = licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ dezgeg ]; + maintainers = with lib.maintainers; [ dezgeg ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/X11/dragon-drop/default.nix b/pkgs/tools/X11/dragon-drop/default.nix index 632fc844e5e..adf43ae8c08 100644 --- a/pkgs/tools/X11/dragon-drop/default.nix +++ b/pkgs/tools/X11/dragon-drop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, gtk, pkgconfig, fetchFromGitHub }: +{ lib, stdenv, gtk, pkg-config, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "dragon-drop"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0fgzz39007fdjwq72scp0qygp2v3zc5f1xkm0sxaa8zxm25g1bra"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk ]; installPhase = '' diff --git a/pkgs/tools/X11/go-sct/default.nix b/pkgs/tools/X11/go-sct/default.nix index b52183e2dd2..8744c493b71 100644 --- a/pkgs/tools/X11/go-sct/default.nix +++ b/pkgs/tools/X11/go-sct/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, xorg, buildGoPackage, fetchFromGitHub }: +{ lib, xorg, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "go-sct"; - version = "20180605-${stdenv.lib.strings.substring 0 7 rev}"; + version = "20180605-${lib.strings.substring 0 7 rev}"; rev = "eb1e851f2d5017038d2b8e3653645c36d3a279f4"; goPackagePath = "github.com/d4l3k/go-sct"; diff --git a/pkgs/tools/X11/grobi/default.nix b/pkgs/tools/X11/grobi/default.nix index 1ebd8ccc4e4..3071ef31781 100644 --- a/pkgs/tools/X11/grobi/default.nix +++ b/pkgs/tools/X11/grobi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoModule, fetchpatch }: +{ lib, fetchFromGitHub, buildGoModule, fetchpatch }: buildGoModule rec { version = "0.6.0"; diff --git a/pkgs/tools/X11/icon-slicer/default.nix b/pkgs/tools/X11/icon-slicer/default.nix index 18d6d468af8..37b309c54b7 100644 --- a/pkgs/tools/X11/icon-slicer/default.nix +++ b/pkgs/tools/X11/icon-slicer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, gdk-pixbuf, popt }: +{ lib, stdenv, fetchurl, pkg-config, gdk-pixbuf, popt }: stdenv.mkDerivation rec { pname = "icon-slicer"; version = "0.3"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ popt pkg-config ]; buildInputs = [ gdk-pixbuf ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Utility for generating icon themes and libXcursor cursor themes"; homepage = "https://www.freedesktop.org/wiki/Software/icon-slicer/"; license = licenses.mit; diff --git a/pkgs/tools/X11/keynav/default.nix b/pkgs/tools/X11/keynav/default.nix index d737ba56ed8..75b5bc2356a 100644 --- a/pkgs/tools/X11/keynav/default.nix +++ b/pkgs/tools/X11/keynav/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, libX11, xorgproto, libXtst, libXi, libXext +{ lib, stdenv, fetchFromGitHub, pkg-config, libX11, xorgproto, libXtst, libXi, libXext , libXinerama, libXrandr, glib, cairo, xdotool }: let release = "20180821"; in @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "0hmc14fj612z5h7gjgk95zyqab3p35c4a99snnblzxfg0p3x2f1d"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto libXtst libXi libXext libXinerama libXrandr glib cairo xdotool ]; diff --git a/pkgs/tools/X11/ksuperkey/default.nix b/pkgs/tools/X11/ksuperkey/default.nix index aed85f978cd..14484120930 100644 --- a/pkgs/tools/X11/ksuperkey/default.nix +++ b/pkgs/tools/X11/ksuperkey/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libX11, libXtst, pkgconfig, xorgproto, libXi }: +{ lib, stdenv, fetchFromGitHub, libX11, libXtst, pkg-config, xorgproto, libXi }: stdenv.mkDerivation rec { pname = "ksuperkey"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXtst xorgproto libXi ]; meta = with lib; { diff --git a/pkgs/tools/X11/nitrogen/default.nix b/pkgs/tools/X11/nitrogen/default.nix index 057288fbaa3..432193950cd 100644 --- a/pkgs/tools/X11/nitrogen/default.nix +++ b/pkgs/tools/X11/nitrogen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, gtkmm2 }: +{ lib, stdenv, fetchurl, pkg-config, glib, gtkmm2 }: let version = "1.6.1"; in @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0zc3fl1mbhq0iyndy4ysmy8vv5c7xwf54rbgamzfhfvsgdq160pl"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib gtkmm2 ]; @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { and settings are stored in a human-readable config file. ''; homepage = "https://github.com/l3ib/nitrogen"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.auntie ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.auntie ]; }; } diff --git a/pkgs/tools/X11/nx-libs/default.nix b/pkgs/tools/X11/nx-libs/default.nix index 3fbb0930cab..bb763962ceb 100644 --- a/pkgs/tools/X11/nx-libs/default.nix +++ b/pkgs/tools/X11/nx-libs/default.nix @@ -1,5 +1,5 @@ -{ stdenv, autoconf, automake, fetchFromGitHub, libgcc, libjpeg_turbo -, libpng, libtool, libxml2, pkgconfig, which, xorg +{ lib, stdenv, autoconf, automake, fetchFromGitHub, libgcc, libjpeg_turbo +, libpng, libtool, libxml2, pkg-config, which, xorg , libtirpc }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "01aqdwy0i4nxdyfa24bwnrqjz93q0idihdaqals2yjqpg160nwfc"; }; - nativeBuildInputs = [ autoconf automake libtool pkgconfig which + nativeBuildInputs = [ autoconf automake libtool pkg-config which xorg.gccmakedep xorg.imake ]; buildInputs = [ libgcc libjpeg_turbo libpng libxml2 xorg.fontutil xorg.libXcomposite xorg.libXdamage xorg.libXdmcp xorg.libXext xorg.libXfont2 @@ -41,8 +41,8 @@ stdenv.mkDerivation rec { meta = { description = "NX X server based on Xnest"; homepage = "https://github.com/ArcticaProject/nx-libs"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ jD91mZM2 ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ jD91mZM2 ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/X11/obconf/default.nix b/pkgs/tools/X11/obconf/default.nix index 809e3614f0b..5cbcec63c59 100644 --- a/pkgs/tools/X11/obconf/default.nix +++ b/pkgs/tools/X11/obconf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, libglade, openbox, +{ lib, stdenv, fetchurl, pkg-config, gtk2, libglade, openbox, imlib2, libstartup_notification, makeWrapper, libSM }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1fanjdmd8727kk74x5404vi8v7s4kpq48l583d12fsi4xvsfb8vi"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 libglade libSM openbox imlib2 libstartup_notification makeWrapper @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { meta = { description = "GUI configuration tool for openbox"; homepage = "http://openbox.org/wiki/ObConf"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.lhvwb ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.lhvwb ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/X11/opentabletdriver/default.nix b/pkgs/tools/X11/opentabletdriver/default.nix index dc527f47dd3..6955f36b8f1 100644 --- a/pkgs/tools/X11/opentabletdriver/default.nix +++ b/pkgs/tools/X11/opentabletdriver/default.nix @@ -23,18 +23,18 @@ stdenv.mkDerivation rec { pname = "OpenTabletDriver"; - version = "0.4.2"; + version = "0.5.0"; src = fetchFromGitHub { owner = "InfinityGhost"; repo = "OpenTabletDriver"; rev = "v${version}"; - sha256 = "048y7gjlk2yw4vh62px1d9w0va6ap1a0cndcpbirlyj9q6b8jxax"; + sha256 = "1xi97nn5zb4fs3pyyqznvxnz07j30j3p967s7jigjmlm9321vkqp"; }; debPkg = fetchurl { url = "https://github.com/InfinityGhost/OpenTabletDriver/releases/download/v${version}/OpenTabletDriver.deb"; - sha256 = "13gg0dhvjy88h9lhcrp30fjiwgb9dzjsgk1k760pi1ki71a5vz2r"; + sha256 = "06m2g5qvc02ga9f98f2ssa7wr2b7b2qm90qwaf17fz5z8rr0qmp0"; }; nativeBuildInputs = [ @@ -134,8 +134,8 @@ stdenv.mkDerivation rec { install -Dm644 $src/OpenTabletDriver.UX/Assets/otd.png -t $out/share/pixmaps # TODO: Ideally this should be build from OpenTabletDriver/OpenTabletDriver-udev instead - dpkg-deb --fsys-tarfile ${debPkg} | tar xf - ./usr/lib/udev/rules.d/30-opentabletdriver.rules - install -Dm644 ./usr/lib/udev/rules.d/30-opentabletdriver.rules -t $out/lib/udev/rules.d + dpkg-deb --fsys-tarfile ${debPkg} | tar xf - ./usr/lib/udev/rules.d/99-opentabletdriver.rules + install -Dm644 ./usr/lib/udev/rules.d/99-opentabletdriver.rules -t $out/lib/udev/rules.d runHook postInstall ''; @@ -155,8 +155,11 @@ stdenv.mkDerivation rec { dontWrapGApps = true; dontStrip = true; - passthru.tests = { - otd-runs = nixosTests.opentabletdriver; + passthru = { + updateScript = ./update.sh; + tests = { + otd-runs = nixosTests.opentabletdriver; + }; }; meta = with lib; { diff --git a/pkgs/tools/X11/opentabletdriver/deps.nix b/pkgs/tools/X11/opentabletdriver/deps.nix index 34d2981cff5..ccb7097153b 100644 --- a/pkgs/tools/X11/opentabletdriver/deps.nix +++ b/pkgs/tools/X11/opentabletdriver/deps.nix @@ -11,13 +11,13 @@ }) (fetchNuGet { name = "Eto.Forms"; - version = "2.5.6"; - sha256 = "035ny8jlanchwq16gcq0xb6ywabjl71c7qbpv26sjwg96na8vz51"; + version = "2.5.10"; + sha256 = "1d71wglk4ixfqfbm6sxmj753x5iwbar8i9zzjy3bh64fy1dn8lz7"; }) (fetchNuGet { name = "Eto.Platform.Gtk"; - version = "2.5.6"; - sha256 = "1ijkjd3lc7x59yk369kxipzgk1zhyr9g6k319wc0n033vij26mwl"; + version = "2.5.10"; + sha256 = "1pkqvlfx7bzracnw19bl50i9jg4ym376vihmy9qq7m5z5nfdqn4g"; }) (fetchNuGet { name = "GdkSharp"; @@ -41,8 +41,8 @@ }) (fetchNuGet { name = "HidSharpCore"; - version = "1.1.0"; - sha256 = "122s5j3wrv8hcgnbxrnjqydvcfz7gdm8xq0wlwzrgwdjk44lr45a"; + version = "1.2.1"; + sha256 = "0vcw38skr9g691gxbzv3cf6y9rk11vh5pvcyjshdgii2z1z8a4g2"; }) (fetchNuGet { name = "MessagePack.Annotations"; @@ -120,9 +120,9 @@ sha256 = "0w2fbji1smd2y7x25qqibf1qrznmv4s6s0jvrbvr6alb7mfyqvh5"; }) (fetchNuGet { - name = "Newtonsoft.Json"; - version = "12.0.3"; - sha256 = "17dzl305d835mzign8r15vkmav2hq8l6g7942dfjpnzr17wwl89x"; + name = "Octokit"; + version = "0.48.0"; + sha256 = "17ria1shx04rb6knbaswpqndmwam6v3r3lsfsd486q584798ccn8"; }) (fetchNuGet { name = "PangoSharp"; @@ -205,6 +205,11 @@ sha256 = "1x0g58pbpjrmj2x2qw17rdwwnrcl0wvim2hdwz48lixvwvp22n9c"; }) (fetchNuGet { + name = "SharpZipLib"; + version = "1.3.1"; + sha256 = "09zypjfils38143da507s5fi4hzvdlz32wfav219hksnpl35y8x0"; + }) + (fetchNuGet { name = "StreamJsonRpc"; version = "2.6.121"; sha256 = "0xzvpk17w2skndzdg47j7gkrrvw6521db4mv8lc3v8hm97vs9m76"; @@ -230,11 +235,6 @@ sha256 = "16saf1fm9q80bb624fkqz0ksrwpnbw9617d7xg3jib7a2wgagm2r"; }) (fetchNuGet { - name = "System.CommandLine"; - version = "2.0.0-beta1.20303.1"; - sha256 = "0isnz8ipqlqim06hf56zlaq2vnsy5facvf5nvq6kzm5h1dm3l2vn"; - }) - (fetchNuGet { name = "System.ComponentModel.Annotations"; version = "4.7.0"; sha256 = "06x1m46ddxj0ng28d7gry9gjkqdg2kp89jyf480g5gznyybbs49z"; @@ -320,11 +320,6 @@ sha256 = "1gfj800078kggcgl0xyl00a6y5k4wwh2k2qm69rjy22wbmq7fy4p"; }) (fetchNuGet { - name = "System.Numerics.Vectors"; - version = "4.5.0"; - sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; - }) - (fetchNuGet { name = "System.Reflection.Emit.Lightweight"; version = "4.6.0"; sha256 = "0hry2k6b7kicg4zxnq0hhn0ys52711pxy7l9v5sp7gvp9cicwpgp"; diff --git a/pkgs/tools/X11/opentabletdriver/update.sh b/pkgs/tools/X11/opentabletdriver/update.sh index 04fae30c05a..715857cf8f4 100755 --- a/pkgs/tools/X11/opentabletdriver/update.sh +++ b/pkgs/tools/X11/opentabletdriver/update.sh @@ -14,6 +14,14 @@ if [[ "$new_version" == "$old_version" ]]; then [[ "${1}" != "--force" ]] && exit 0 fi +# Updating the hash of deb package manually since there seems to be no way to do it automatically +oldDebPkgUrl="https://github.com/InfinityGhost/OpenTabletDriver/releases/download/v${old_version}/OpenTabletDriver.deb"; +newDebPkgUrl="https://github.com/InfinityGhost/OpenTabletDriver/releases/download/v${new_version}/OpenTabletDriver.deb"; +oldDebSha256=$(nix-prefetch-url "$oldDebPkgUrl") +newDebSha256=$(nix-prefetch-url "$newDebPkgUrl") +echo "oldDebSha256: $oldDebSha256 newDebSha256: $newDebSha256" +sed -i ./default.nix -re "s|\"$oldDebSha256\"|\"$newDebSha256\"|" + cd ../../../.. update-source-version opentabletdriver "$new_version" store_src="$(nix-build . -A opentabletdriver.src --no-out-link)" diff --git a/pkgs/tools/X11/ratmen/default.nix b/pkgs/tools/X11/ratmen/default.nix index f6042622674..9c662a638e8 100644 --- a/pkgs/tools/X11/ratmen/default.nix +++ b/pkgs/tools/X11/ratmen/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, perl, xorgproto, libX11}: +{lib, stdenv, fetchurl, perl, xorgproto, libX11}: let s = # Generated upstream information rec { @@ -24,10 +24,10 @@ stdenv.mkDerivation { ]; meta = { inherit (s) version; - description = ''A minimalistic X11 menu creator''; - license = stdenv.lib.licenses.free ; # 9menu derivative with 9menu license - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + description = "A minimalistic X11 menu creator"; + license = lib.licenses.free ; # 9menu derivative with 9menu license + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; homepage = "http://www.update.uu.se/~zrajm/programs/"; downloadPage = "http://www.update.uu.se/~zrajm/programs/ratmen/"; updateWalker = true; diff --git a/pkgs/tools/X11/run-scaled/default.nix b/pkgs/tools/X11/run-scaled/default.nix index 6b2f400c295..bae91bbc464 100644 --- a/pkgs/tools/X11/run-scaled/default.nix +++ b/pkgs/tools/X11/run-scaled/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { mkdir -p $out/bin cp run_scaled $out/bin wrapProgram $out/bin/run_scaled --prefix PATH ":" \ - ${stdenv.lib.makeBinPath [ bc xorgserver xpra xrandr ]} + ${lib.makeBinPath [ bc xorgserver xpra xrandr ]} ''; meta = with lib; { diff --git a/pkgs/tools/X11/runningx/default.nix b/pkgs/tools/X11/runningx/default.nix index 55f99c63365..ae0e5b89a61 100644 --- a/pkgs/tools/X11/runningx/default.nix +++ b/pkgs/tools/X11/runningx/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, pkgconfig, libX11 }: +{ lib, stdenv, fetchurl, pkg-config, libX11 }: stdenv.mkDerivation { pname = "runningx"; version = "1.0"; - + src = fetchurl { url = "http://www.fiction.net/blong/programs/mutt/autoview/RunningX.c"; sha256 = "1mikkhrx6jsx716041qdy3nwjac08pxxvxyq2yablm8zg9hrip0d"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 ]; @@ -27,8 +27,8 @@ stdenv.mkDerivation { meta = { homepage = "http://www.fiction.net/blong/programs/mutt/"; description = "A program for testing if X is running"; - license = stdenv.lib.licenses.free; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.romildo ]; + license = lib.licenses.free; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.romildo ]; }; } diff --git a/pkgs/tools/X11/screen-message/default.nix b/pkgs/tools/X11/screen-message/default.nix index c57c4f82431..c1cef23a695 100644 --- a/pkgs/tools/X11/screen-message/default.nix +++ b/pkgs/tools/X11/screen-message/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, gtk3 }: +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, gtk3 }: stdenv.mkDerivation rec { pname = "screen-message"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1lw955qq5pq010lzmaf32ylj2iprgsri9ih4hx672c3f794ilab0"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ gtk3 ]; # screen-message installs its binary in $(prefix)/games per default @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.joachim-breitner.de/en/projects#screen-message"; description = "Displays a short text fullscreen in an X11 window"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.fpletz ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.fpletz ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/X11/setroot/default.nix b/pkgs/tools/X11/setroot/default.nix index a59e2a0d0db..e5a461b0e0e 100644 --- a/pkgs/tools/X11/setroot/default.nix +++ b/pkgs/tools/X11/setroot/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libX11 imlib2 ] - ++ stdenv.lib.optional enableXinerama libXinerama; + ++ lib.optional enableXinerama libXinerama; buildFlags = [ "CC=cc" (if enableXinerama then "xinerama=1" else "xinerama=0") ] ; diff --git a/pkgs/tools/X11/skippy-xd/default.nix b/pkgs/tools/X11/skippy-xd/default.nix index 4fd9678733d..adf3b3d9250 100644 --- a/pkgs/tools/X11/skippy-xd/default.nix +++ b/pkgs/tools/X11/skippy-xd/default.nix @@ -1,10 +1,10 @@ -{stdenv, fetchgit, xorgproto, libX11, libXft, libXcomposite, libXdamage -, libXext, libXinerama, libjpeg, giflib, pkgconfig +{lib, stdenv, fetchgit, xorgproto, libX11, libXft, libXcomposite, libXdamage +, libXext, libXinerama, libjpeg, giflib, pkg-config }: let buildInputs = [ xorgproto libX11 libXft libXcomposite libXdamage libXext - libXinerama libjpeg giflib pkgconfig + libXinerama libjpeg giflib pkg-config ]; in stdenv.mkDerivation rec { @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { ''; meta = { inherit version; - description = ''Expose-style compositing-based standalone window switcher''; - license = stdenv.lib.licenses.gpl2Plus ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + description = "Expose-style compositing-based standalone window switcher"; + license = lib.licenses.gpl2Plus ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/X11/sselp/default.nix b/pkgs/tools/X11/sselp/default.nix index 81893fd2be8..d22884270dd 100644 --- a/pkgs/tools/X11/sselp/default.nix +++ b/pkgs/tools/X11/sselp/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, libX11 }: +{ lib, stdenv, fetchurl, libX11 }: stdenv.mkDerivation rec { version = "0.2"; pname = "sselp"; - + src = fetchurl { url = "https://dl.suckless.org/tools/${pname}-${version}.tar.gz"; sha256 = "08mqp00lrh1chdrbs18qr0xv63h866lkmfj87kfscwdm1vn9a3yd"; }; - + buildInputs = [ libX11 ]; patchPhase = '' @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://tools.suckless.org/sselp"; description = "Prints the X selection to stdout, useful in scripts"; - license = stdenv.lib.licenses.mit; - maintainers = [stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mit; + maintainers = [lib.maintainers.magnetophon ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/X11/vdpauinfo/default.nix b/pkgs/tools/X11/vdpauinfo/default.nix index 73f94768bcd..35305d44635 100644 --- a/pkgs/tools/X11/vdpauinfo/default.nix +++ b/pkgs/tools/X11/vdpauinfo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libvdpau }: +{ lib, stdenv, fetchurl, pkg-config, libvdpau }: stdenv.mkDerivation rec { pname = "vdpauinfo"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0s6jdadnycyd1agsnfx7hrf17hmipasx1fpmppd4m1z6i9sp1i6g"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libvdpau ]; meta = with lib; { diff --git a/pkgs/tools/X11/virtualgl/default.nix b/pkgs/tools/X11/virtualgl/default.nix index aa839e6d684..fe5ac9410a6 100644 --- a/pkgs/tools/X11/virtualgl/default.nix +++ b/pkgs/tools/X11/virtualgl/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { ''; meta = { - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; inherit (virtualglLib.meta) license; }; } diff --git a/pkgs/tools/X11/wayv/default.nix b/pkgs/tools/X11/wayv/default.nix index 55f6eede0fa..4ee2c8acc25 100644 --- a/pkgs/tools/X11/wayv/default.nix +++ b/pkgs/tools/X11/wayv/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, libX11}: +{lib, stdenv, fetchFromGitHub, libX11}: stdenv.mkDerivation rec { pname = "wayv"; version = "0.3"; @@ -24,9 +24,9 @@ stdenv.mkDerivation rec { meta = { inherit version; description = "A gesture control for X11"; - license = stdenv.lib.licenses.gpl2Plus ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; homepage = "https://github.com/mikemb/wayV"; }; } diff --git a/pkgs/tools/X11/wmctrl/default.nix b/pkgs/tools/X11/wmctrl/default.nix index 64f8627a2ef..0a01a3dad5a 100644 --- a/pkgs/tools/X11/wmctrl/default.nix +++ b/pkgs/tools/X11/wmctrl/default.nix @@ -1,8 +1,8 @@ -{ stdenv +{ lib, stdenv , fetchurl , libX11 , glib -, pkgconfig +, pkg-config , libXmu }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "1afclc57b9017a73mfs9w7lbdvdipmf9q0xdk116f61gnvyix2np"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXmu glib ]; patches = [ ./64-bit-data.patch ]; @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { meta = { homepage = "https://sites.google.com/site/tstyblo/wmctrl"; description = "CLI tool to interact with EWMH/NetWM compatible X Window Managers"; - license = stdenv.lib.licenses.gpl2; - platforms = with stdenv.lib.platforms; all; - maintainers = [ stdenv.lib.maintainers.Anton-Latukha ]; + license = lib.licenses.gpl2; + platforms = with lib.platforms; all; + maintainers = [ lib.maintainers.Anton-Latukha ]; }; } diff --git a/pkgs/tools/X11/wpgtk/default.nix b/pkgs/tools/X11/wpgtk/default.nix index f2864ca2eb5..cf9bbd9bb98 100644 --- a/pkgs/tools/X11/wpgtk/default.nix +++ b/pkgs/tools/X11/wpgtk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub, libxslt, +{ lib, python3Packages, fetchFromGitHub, libxslt, gobject-introspection, gtk3, wrapGAppsHook, gnome3 }: python3Packages.buildPythonApplication rec { diff --git a/pkgs/tools/X11/x11spice/default.nix b/pkgs/tools/X11/x11spice/default.nix index 7f3bfbf75a4..4facc365c1e 100644 --- a/pkgs/tools/X11/x11spice/default.nix +++ b/pkgs/tools/X11/x11spice/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config , xorg, gtk2, spice, spice-protocol }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0va5ix14vnqch59gq8wvrhw6q0w0n27sy70xx5kvfj2cl0h1xpg8"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ xorg.libxcb xorg.xcbutil xorg.utilmacros diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/tools/X11/x11vnc/default.nix index 7264311d2dd..bd10127f729 100644 --- a/pkgs/tools/X11/x11vnc/default.nix +++ b/pkgs/tools/X11/x11vnc/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, openssl, zlib, libjpeg, xorg, coreutils, libvncserver, - autoreconfHook, pkgconfig }: + autoreconfHook, pkg-config }: stdenv.mkDerivation rec { pname = "x11vnc"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ xorg.libXfixes xorg.xorgproto openssl xorg.libXdamage diff --git a/pkgs/tools/X11/xannotate/default.nix b/pkgs/tools/X11/xannotate/default.nix index b1e070673c6..9c88a038e3e 100644 --- a/pkgs/tools/X11/xannotate/default.nix +++ b/pkgs/tools/X11/xannotate/default.nix @@ -1,8 +1,8 @@ -{stdenv, fetchFromBitbucket, libX11}: +{lib, stdenv, fetchFromBitbucket, libX11}: stdenv.mkDerivation rec { pname = "xannotate"; version = "20150301"; - + src = fetchFromBitbucket { owner = "blais"; repo = pname; @@ -15,9 +15,9 @@ stdenv.mkDerivation rec { meta = { inherit version; description = "A tool to scribble over X windows"; - license = stdenv.lib.licenses.gpl2Plus ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; homepage = "https://bitbucket.org/blais/xannotate"; }; } diff --git a/pkgs/tools/X11/xautomation/default.nix b/pkgs/tools/X11/xautomation/default.nix index 0a31d5fb865..0521b6f8b3b 100644 --- a/pkgs/tools/X11/xautomation/default.nix +++ b/pkgs/tools/X11/xautomation/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libpng, libX11, libXext, libXi, libXtst }: +{ lib, stdenv, fetchurl, pkg-config, libpng, libX11, libXext, libXi, libXtst }: let version = "1.09"; in stdenv.mkDerivation { @@ -9,14 +9,14 @@ stdenv.mkDerivation { sha256 = "03azv5wpg65h40ip2kk1kdh58vix4vy1r9bihgsq59jx2rhjr3zf"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libpng libX11 libXext libXi libXtst ]; meta = { homepage = "https://www.hoopajoo.net/projects/xautomation.html"; description = "Control X from the command line for scripts, and do \"visual scraping\" to find things on the screen"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ vaibhavsagar ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ vaibhavsagar ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/tools/X11/xbanish/default.nix b/pkgs/tools/X11/xbanish/default.nix index 6267cd1a34c..169f87a50f6 100644 --- a/pkgs/tools/X11/xbanish/default.nix +++ b/pkgs/tools/X11/xbanish/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, libX11, libXi, libXt, libXfixes, libXext}: +{lib, stdenv, fetchFromGitHub, libX11, libXi, libXt, libXfixes, libXext}: stdenv.mkDerivation rec { version = "1.7"; @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { The name comes from ratpoison's "banish" command that sends the cursor to the corner of the screen. ''; - license = stdenv.lib.licenses.bsd3; - maintainers = [stdenv.lib.maintainers.choochootrain]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.bsd3; + maintainers = [lib.maintainers.choochootrain]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/X11/xbindkeys-config/default.nix b/pkgs/tools/X11/xbindkeys-config/default.nix index 35961aff178..ec40e0b06db 100644 --- a/pkgs/tools/X11/xbindkeys-config/default.nix +++ b/pkgs/tools/X11/xbindkeys-config/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, gtk, pkgconfig, procps, makeWrapper, ... }: +{ lib, stdenv, fetchurl, gtk, pkg-config, procps, makeWrapper, ... }: stdenv.mkDerivation rec { pname = "xbindkeys-config"; version = "0.1.3"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk makeWrapper ]; src = fetchurl { @@ -17,9 +17,9 @@ stdenv.mkDerivation rec { meta = { homepage = "https://packages.debian.org/source/xbindkeys-config"; description = "Graphical interface for configuring xbindkeys"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [benley]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [benley]; + platforms = with lib.platforms; linux; }; patches = [ ./xbindkeys-config-patch1.patch ]; diff --git a/pkgs/tools/X11/xbindkeys/default.nix b/pkgs/tools/X11/xbindkeys/default.nix index 71316bdb36c..ba45442a449 100644 --- a/pkgs/tools/X11/xbindkeys/default.nix +++ b/pkgs/tools/X11/xbindkeys/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libX11, guile }: +{ lib, stdenv, fetchurl, pkg-config, libX11, guile }: let version = "1.8.7"; in stdenv.mkDerivation { @@ -9,14 +9,14 @@ stdenv.mkDerivation { sha256 = "1wl2vc5alisiwyk8m07y1ryq8w3ll9ym83j27g4apm4ixjl8d6x2"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 guile ]; meta = { homepage = "https://www.nongnu.org/xbindkeys/xbindkeys.html"; description = "Launch shell commands with your keyboard or your mouse under X Window"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/tools/X11/xbrightness/default.nix b/pkgs/tools/X11/xbrightness/default.nix index cbf4d2c9400..1bb95699f64 100644 --- a/pkgs/tools/X11/xbrightness/default.nix +++ b/pkgs/tools/X11/xbrightness/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, imake, gccmakedep +{ lib, stdenv, fetchurl, imake, gccmakedep , libX11, libXaw, libXext, libXmu, libXpm, libXxf86vm }: stdenv.mkDerivation { @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { description = "X11 brigthness and gamma software control"; homepage = "http://shallowsky.com/software"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mit; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/X11/xcape/default.nix b/pkgs/tools/X11/xcape/default.nix index ab9e0c34542..f8d4376017b 100644 --- a/pkgs/tools/X11/xcape/default.nix +++ b/pkgs/tools/X11/xcape/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, libX11, libXtst, xorgproto, +{ lib, stdenv, fetchFromGitHub, pkg-config, libX11, libXtst, xorgproto, libXi }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "04grs4w9kpfzz25mqw82zdiy51g0w355gpn5b170p7ha5972ykc8"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXtst xorgproto libXi ]; diff --git a/pkgs/tools/X11/xchainkeys/default.nix b/pkgs/tools/X11/xchainkeys/default.nix index 238b8c7b2b2..06428393b2a 100644 --- a/pkgs/tools/X11/xchainkeys/default.nix +++ b/pkgs/tools/X11/xchainkeys/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11 }: +{ lib, stdenv, fetchurl, libX11 }: stdenv.mkDerivation rec { name = "xchainkeys-0.11"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://henning-bekel.de/xchainkeys/"; description = "A standalone X11 program to create chained key bindings"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl3; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix index 5f0e0ef19d6..f10510051ed 100644 --- a/pkgs/tools/X11/xdg-utils/default.nix +++ b/pkgs/tools/X11/xdg-utils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub +{ lib, stdenv, fetchgit, fetchFromGitHub , file, libxslt, docbook_xml_dtd_412, docbook_xsl, xmlto , w3m, gnugrep, gnused, coreutils, xset, perlPackages , mimiSupport ? false, gawk ? null }: @@ -22,17 +22,18 @@ in stdenv.mkDerivation rec { pname = "xdg-utils"; - version = "1.1.3"; + version = "unstable-2020-10-21"; - src = fetchurl { - url = "https://portland.freedesktop.org/download/${pname}-${version}.tar.gz"; - sha256 = "1nai806smz3zcb2l5iny4x7li0fak0rzmjg6vlyhdqm8z25b166p"; + src = fetchgit { + url = "https://gitlab.freedesktop.org/xdg/${pname}.git"; + rev = "d11b33ec7f24cfb1546f6b459611d440013bdc72"; + sha256 = "sha256-8PtXfI8hRneEpnUvIV3M+6ACjlkx0w/NEiJFdGbbHnQ="; }; # just needed when built from git buildInputs = [ libxslt docbook_xml_dtd_412 docbook_xsl xmlto w3m ]; - postInstall = stdenv.lib.optionalString mimiSupport '' + postInstall = lib.optionalString mimiSupport '' cp ${mimisrc}/xdg-open $out/bin/xdg-open '' + '' sed '2s#.#\ diff --git a/pkgs/tools/X11/xdotool/default.nix b/pkgs/tools/X11/xdotool/default.nix index 6785d10258f..5779f5270f7 100644 --- a/pkgs/tools/X11/xdotool/default.nix +++ b/pkgs/tools/X11/xdotool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libX11, perl, libXtst, xorgproto, libXi, libXinerama, libxkbcommon }: +{ lib, stdenv, fetchurl, pkg-config, libX11, perl, libXtst, xorgproto, libXi, libXinerama, libxkbcommon }: stdenv.mkDerivation rec { pname = "xdotool"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1a6c1zr86zb53352yxv104l76l8x21gfl2bgw6h21iphxpv5zgim"; }; - nativeBuildInputs = [ pkgconfig perl ]; + nativeBuildInputs = [ pkg-config perl ]; buildInputs = [ libX11 libXtst xorgproto libXi libXinerama libxkbcommon ]; preBuild = '' @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.semicomplete.com/projects/xdotool/"; description = "Fake keyboard/mouse input, window management, and more"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/tools/X11/xidlehook/default.nix b/pkgs/tools/X11/xidlehook/default.nix index 35f0d73ea0b..08fa4f15562 100644 --- a/pkgs/tools/X11/xidlehook/default.nix +++ b/pkgs/tools/X11/xidlehook/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, rustPlatform, fetchFromGitLab, python3 -, xlibsWrapper, xorg, libpulseaudio, pkgconfig, patchelf, Security }: +, xlibsWrapper, xorg, libpulseaudio, pkg-config, patchelf, Security }: rustPlatform.buildRustPackage rec { pname = "xidlehook"; @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "050ihjhg33223x6pgvhqrjprx1clkj2x3jr6acf716vbwm3m0bmz"; buildInputs = [ xlibsWrapper xorg.libXScrnSaver libpulseaudio ] ++ lib.optional stdenv.isDarwin Security; - nativeBuildInputs = [ pkgconfig patchelf python3 ]; + nativeBuildInputs = [ pkg-config patchelf python3 ]; postFixup = lib.optionalString stdenv.isLinux '' RPATH="$(patchelf --print-rpath $out/bin/xidlehook)" diff --git a/pkgs/tools/X11/xinput_calibrator/default.nix b/pkgs/tools/X11/xinput_calibrator/default.nix index 9e11c948f40..2f74db17c37 100644 --- a/pkgs/tools/X11/xinput_calibrator/default.nix +++ b/pkgs/tools/X11/xinput_calibrator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libXi, xorgproto, autoconf, automake, libtool, m4, xlibsWrapper, pkgconfig }: +{ lib, stdenv, fetchurl, libXi, xorgproto, autoconf, automake, libtool, m4, xlibsWrapper, pkg-config }: stdenv.mkDerivation rec { pname = "xinput_calibrator"; @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh --with-gui=X11"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libXi autoconf automake libtool m4 xlibsWrapper ]; meta = { homepage = "https://github.com/tias/xinput_calibrator"; description = "A generic touchscreen calibration program for X.Org"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.flosse ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.flosse ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/X11/xloadimage/default.nix b/pkgs/tools/X11/xloadimage/default.nix index 3bd9f525683..e228c8223f4 100644 --- a/pkgs/tools/X11/xloadimage/default.nix +++ b/pkgs/tools/X11/xloadimage/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , libX11 , libXt @@ -35,11 +35,11 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 libXt - ] ++ stdenv.lib.optionals withJpegSupport [ + ] ++ lib.optionals withJpegSupport [ libjpeg - ] ++ stdenv.lib.optionals withPngSupport [ + ] ++ lib.optionals withPngSupport [ libpng - ] ++ stdenv.lib.optionals withTiffSupport [ + ] ++ lib.optionals withTiffSupport [ libtiff ]; @@ -80,9 +80,9 @@ stdenv.mkDerivation rec { zoom, brightening/darkening and merging. ''; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ andrew-d ]; - platforms = stdenv.lib.platforms.linux; # arbitrary choice + maintainers = with lib.maintainers; [ andrew-d ]; + platforms = lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/tools/X11/xmacro/default.nix b/pkgs/tools/X11/xmacro/default.nix index 13a18efccba..cf0ef6d8bf8 100644 --- a/pkgs/tools/X11/xmacro/default.nix +++ b/pkgs/tools/X11/xmacro/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, libXtst, xorgproto, libXi }: +{ lib, stdenv, fetchurl, libX11, libXtst, xorgproto, libXi }: stdenv.mkDerivation rec { pname = "xmacro"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 libXtst xorgproto libXi ]; meta = { - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/tools/X11/xmagnify/default.nix b/pkgs/tools/X11/xmagnify/default.nix index 797d624323b..b4df0f00342 100644 --- a/pkgs/tools/X11/xmagnify/default.nix +++ b/pkgs/tools/X11/xmagnify/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "1ngnp5f5zl3v35vhbdyjpymy6mwrs0476fm5nd7dzkba7n841jdh"; }; - prePatch = ''substituteInPlace ./Makefile --replace /usr $out''; + prePatch = "substituteInPlace ./Makefile --replace /usr $out"; buildInputs = [ libX11 xorgproto ]; diff --git a/pkgs/tools/X11/xmousepasteblock/default.nix b/pkgs/tools/X11/xmousepasteblock/default.nix index 7402f19c2c8..35db8a133a2 100644 --- a/pkgs/tools/X11/xmousepasteblock/default.nix +++ b/pkgs/tools/X11/xmousepasteblock/default.nix @@ -1,4 +1,4 @@ -{ xorg, lib, stdenv, libev, fetchFromGitHub, pkgconfig }: +{ xorg, lib, stdenv, libev, fetchFromGitHub, pkg-config }: stdenv.mkDerivation rec { pname = "xmousepasteblock"; @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { }; makeFlags = "PREFIX=$(out)"; buildInputs = with xorg; [ libX11 libXext libXi libev ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = with lib; { description = "Middle mouse button primary X selection/clipboard paste disabler"; homepage = "https://github.com/milaq/XMousePasteBlock"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; maintainers = [ maintainers.petercommand ]; }; } diff --git a/pkgs/tools/X11/xnee/default.nix b/pkgs/tools/X11/xnee/default.nix index ae057c76984..c3355b80263 100644 --- a/pkgs/tools/X11/xnee/default.nix +++ b/pkgs/tools/X11/xnee/default.nix @@ -1,5 +1,5 @@ -{ fetchurl, stdenv, libX11, xorgproto, libXext, libXtst -, gtk2, libXi, pkgconfig, texinfo }: +{ fetchurl, lib, stdenv, libX11, xorgproto, libXext, libXtst +, gtk2, libXi, pkg-config, texinfo }: stdenv.mkDerivation rec { version = "3.19"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 xorgproto libXext libXtst gtk2 - libXi pkgconfig + libXi pkg-config texinfo ]; @@ -45,11 +45,11 @@ stdenv.mkDerivation rec { "macros", retype a file. ''; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; homepage = "https://www.gnu.org/software/xnee/"; - maintainers = with stdenv.lib.maintainers; [ ]; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice + maintainers = with lib.maintainers; [ ]; + platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/tools/X11/xpointerbarrier/default.nix b/pkgs/tools/X11/xpointerbarrier/default.nix index 6f6d38932df..8cb36cb9141 100644 --- a/pkgs/tools/X11/xpointerbarrier/default.nix +++ b/pkgs/tools/X11/xpointerbarrier/default.nix @@ -1,4 +1,4 @@ -{ stdenv, xorg, fetchgit }: +{ lib, stdenv, xorg, fetchgit }: stdenv.mkDerivation rec { pname = "xpointerbarrier"; version = "18.06"; @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://uninformativ.de/git/xpointerbarrier"; description = "Create X11 pointer barriers around your working area"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.xzfc ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.xzfc ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 3f1bf557ae8..0dffdf7bbf7 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, callPackage, substituteAll, python3, pkgconfig, writeText +{ lib, fetchurl, callPackage, substituteAll, python3, pkg-config, writeText , xorg, gtk3, glib, pango, cairo, gdk-pixbuf, atk , wrapGAppsHook, xorgserver, getopt, xauth, util-linux, which , ffmpeg, x264, libvpx, libwebp, x265 @@ -30,11 +30,11 @@ let in buildPythonApplication rec { pname = "xpra"; - version = "4.0.2"; + version = "4.0.6"; src = fetchurl { url = "https://xpra.org/src/${pname}-${version}.tar.xz"; - sha256 = "1cs39jzi59hkl421xmhi549ndmdfzkg0ap45f4nlsn9zr9zwmp3x"; + sha256 = "nGcvbZFGYd2nQ75LL4YN+xcWb7UsViA3OAqpcrTwieg="; }; patches = [ @@ -50,7 +50,7 @@ in buildPythonApplication rec { substituteInPlace setup.py --replace '/usr/include/security' '${pam}/include/security' ''; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; buildInputs = with xorg; [ libX11 xorgproto libXrender libXi libXtst libXfixes libXcomposite libXdamage @@ -97,7 +97,7 @@ in buildPythonApplication rec { --set XPRA_INSTALL_PREFIX "$out" --set XPRA_COMMAND "$out/bin/xpra" --prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib - --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which util-linux pulseaudio ]} + --prefix PATH : ${lib.makeBinPath [ getopt xorgserver xauth which util-linux pulseaudio ]} ) ''; @@ -110,7 +110,10 @@ in buildPythonApplication rec { enableParallelBuilding = true; - passthru = { inherit xf86videodummy; }; + passthru = { + inherit xf86videodummy; + updateScript = ./update.sh; + }; meta = { homepage = "http://xpra.org/"; diff --git a/pkgs/tools/X11/xpra/update.sh b/pkgs/tools/X11/xpra/update.sh new file mode 100755 index 00000000000..c1b408a0bee --- /dev/null +++ b/pkgs/tools/X11/xpra/update.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl perl common-updater-scripts + +version=$(curl https://xpra.org/src/ | perl -ne 'print "$1\n" if /xpra-([[:digit:].]+)\./' | sort -V | tail -n1) +update-source-version xpra "$version" diff --git a/pkgs/tools/X11/xprintidle-ng/default.nix b/pkgs/tools/X11/xprintidle-ng/default.nix index c7bb2bc348b..758450d3654 100644 --- a/pkgs/tools/X11/xprintidle-ng/default.nix +++ b/pkgs/tools/X11/xprintidle-ng/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, libX11, libXScrnSaver, libXext, gnulib - , autoconf, automake, libtool, gettext, pkgconfig +{ lib, stdenv, fetchFromGitHub, libX11, libXScrnSaver, libXext, gnulib + , autoconf, automake, libtool, gettext, pkg-config , git, perl, texinfo, help2man }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake gettext git gnulib - help2man libtool perl pkgconfig texinfo + help2man libtool perl pkg-config texinfo ]; configurePhase = '' @@ -35,10 +35,10 @@ stdenv.mkDerivation rec { meta = { inherit version; - description = ''A command-line tool to print idle time from libXss''; + description = "A command-line tool to print idle time from libXss"; homepage = "http://taktoa.me/xprintidle-ng/"; - license = stdenv.lib.licenses.gpl2; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/X11/xrestop/default.nix b/pkgs/tools/X11/xrestop/default.nix index a28fc50c1e7..e2b87e7380c 100644 --- a/pkgs/tools/X11/xrestop/default.nix +++ b/pkgs/tools/X11/xrestop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xorg, pkgconfig, ncurses }: +{ lib, stdenv, fetchurl, xorg, pkg-config, ncurses }: stdenv.mkDerivation { pname = "xrestop"; @@ -9,11 +9,11 @@ stdenv.mkDerivation { sha256 = "0mz27jpij8am1s32i63mdm58znfijcpfhdqq1npbmvgclyagrhk7"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorg.libX11 xorg.libXres xorg.libXext ncurses ]; meta = { - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.gpl2; + platforms = lib.platforms.unix; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/tools/X11/xsecurelock/default.nix b/pkgs/tools/X11/xsecurelock/default.nix index 99d695df267..5c43dc6dff4 100644 --- a/pkgs/tools/X11/xsecurelock/default.nix +++ b/pkgs/tools/X11/xsecurelock/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config , libX11, libXcomposite, libXft, libXmu, libXrandr, libXext, libXScrnSaver , pam, apacheHttpd, pamtester, xscreensaver }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - autoreconfHook pkgconfig + autoreconfHook pkg-config ]; buildInputs = [ libX11 libXcomposite libXft libXmu libXrandr libXext libXScrnSaver diff --git a/pkgs/tools/X11/xsettingsd/default.nix b/pkgs/tools/X11/xsettingsd/default.nix index 55262125fad..7572e19fbf9 100644 --- a/pkgs/tools/X11/xsettingsd/default.nix +++ b/pkgs/tools/X11/xsettingsd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, scons, pkgconfig, libX11 }: +{ lib, stdenv, fetchFromGitHub, scons, pkg-config, libX11 }: stdenv.mkDerivation rec { pname = "xsettingsd"; @@ -15,14 +15,14 @@ stdenv.mkDerivation rec { ./SConstruct.patch ]; - nativeBuildInputs = [ scons pkgconfig ]; + nativeBuildInputs = [ scons pkg-config ]; buildInputs = [ libX11 ]; buildPhase = '' scons -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES ''; - + installPhase = '' install -D -t "$out"/bin xsettingsd dump_xsettings install -D -t "$out"/usr/share/man/man1 xsettingsd.1 dump_xsettings.1 diff --git a/pkgs/tools/X11/xwinmosaic/default.nix b/pkgs/tools/X11/xwinmosaic/default.nix index 7bd0c3e6dcd..311f1e42901 100644 --- a/pkgs/tools/X11/xwinmosaic/default.nix +++ b/pkgs/tools/X11/xwinmosaic/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk2, cmake, pkgconfig, libXdamage }: +{ lib, stdenv, fetchFromGitHub, gtk2, cmake, pkg-config, libXdamage }: stdenv.mkDerivation rec { version = "0.4.2"; @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { sha256 = "16qhrpgn84fz0q3nfvaz5sisc82zk6y7c0sbvbr69zfx5fwbs1rr"; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ gtk2 libXdamage ]; meta = { inherit version; - description = ''X window switcher drawing a colourful grid''; - license = stdenv.lib.licenses.bsd2 ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + description = "X window switcher drawing a colourful grid"; + license = lib.licenses.bsd2 ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/X11/xzoom/default.nix b/pkgs/tools/X11/xzoom/default.nix index ed7828f37e2..ba62704bdd3 100644 --- a/pkgs/tools/X11/xzoom/default.nix +++ b/pkgs/tools/X11/xzoom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, libXext, libXt, imake, gccmakedep}: +{ lib, stdenv, fetchurl, libX11, libXext, libXt, imake, gccmakedep}: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { meta = { inherit version; description = "An X11 screen zoom tool"; - license = stdenv.lib.licenses.free ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.free ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/admin/afterburn/default.nix b/pkgs/tools/admin/afterburn/default.nix new file mode 100644 index 00000000000..8a42a011da9 --- /dev/null +++ b/pkgs/tools/admin/afterburn/default.nix @@ -0,0 +1,37 @@ +{ lib, openssl, pkg-config, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "afterburn"; + version = "4.6.0"; + + src = fetchFromGitHub { + owner = "coreos"; + repo = "afterburn"; + rev = "v${version}"; + sha256 = "1afy9spm8g8bq2pw44dkrkfz4aimhdz4h5lg9iafby832v5dxbqj"; + }; + + cargoSha256 = "035k55l0hs39a87iq8yxx4i87829kzvvmlgph0adjfmsppz5b8k1"; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ]; + + patchPhase = '' + substituteInPlace ./systemd/afterburn-checkin.service --replace /usr/bin $out/bin + substituteInPlace ./systemd/afterburn-firstboot-checkin.service --replace /usr/bin $out/bin + substituteInPlace ./systemd/afterburn-sshkeys@.service.in --replace /usr/bin $out/bin + substituteInPlace ./systemd/afterburn.service --replace /usr/bin $out/bin + ''; + + postInstall = '' + DEFAULT_INSTANCE=root PREFIX= DESTDIR=$out make install-units + ''; + + meta = with lib; { + homepage = "https://github.com/coreos/ignition"; + description = "This is a small utility, typically used in conjunction with Ignition, which reads metadata from a given cloud-provider and applies it to the system."; + license = licenses.asl20; + maintainers = [ maintainers.arianvp ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/tools/admin/aws-mfa/default.nix b/pkgs/tools/admin/aws-mfa/default.nix new file mode 100644 index 00000000000..12f63e627e6 --- /dev/null +++ b/pkgs/tools/admin/aws-mfa/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonApplication +, fetchFromGitHub +, pkgs +, boto3 +}: + +buildPythonApplication rec { + pname = "aws-mfa"; + version = "0.0.12"; + + src = fetchFromGitHub { + owner = "broamski"; + repo = "aws-mfa"; + rev = version; + sha256 = "1blcpa13zgyac3v8inc7fh9szxq2avdllx6w5ancfmyh5spc66ay"; + }; + + propagatedBuildInputs = [ + boto3 + ]; + + doCheck = false; + + pythonImportsCheck = [ + "awsmfa" + ]; + + meta = with lib; { + description = "Manage AWS MFA Security Credentials"; + homepage = "https://github.com/broamski/aws-mfa"; + license = [ licenses.mit ]; + maintainers = [ maintainers.srapenne ]; + }; +} diff --git a/pkgs/tools/admin/aws-nuke/default.nix b/pkgs/tools/admin/aws-nuke/default.nix index 32c006d7a5f..070a9b6430c 100644 --- a/pkgs/tools/admin/aws-nuke/default.nix +++ b/pkgs/tools/admin/aws-nuke/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildGoModule , fetchFromGitHub }: diff --git a/pkgs/tools/admin/aws-rotate-key/default.nix b/pkgs/tools/admin/aws-rotate-key/default.nix index 4b26e3a7434..82b57739120 100644 --- a/pkgs/tools/admin/aws-rotate-key/default.nix +++ b/pkgs/tools/admin/aws-rotate-key/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "aws-rotate-key"; diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 772c4a2f3b9..82dbdc8620f 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -28,15 +28,19 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.18.211"; # N.B: if you change this, change botocore to a matching version too + version = "1.18.223"; # N.B: if you change this, change botocore to a matching version too src = fetchPypi { inherit pname version; - sha256 = "sha256-dkPdr0Q05CjeNg1FKbye4Ndtfakido0wKR22Afls3Mk="; + sha256 = "sha256-Myc6iT04VO2DliCiYvn4JtuoLVBWYNp8EbE4giYmrtk="; }; + # https://github.com/aws/aws-cli/issues/4837 + # https://github.com/aws/aws-cli/pull/5887 postPatch = '' - substituteInPlace setup.py --replace "docutils>=0.10,<0.16" "docutils>=0.10" + substituteInPlace setup.py \ + --replace "docutils>=0.10,<0.16" "docutils>=0.10" \ + --replace "PyYAML>=3.10,<5.4" "PyYAML>=3.10" ''; # No tests included diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index a477beac5a0..d832b00a6ee 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -8,12 +8,12 @@ let py = python3.override { packageOverrides = self: super: { botocore = super.botocore.overridePythonAttrs (oldAttrs: rec { - version = "2.0.0dev75"; + version = "2.0.0dev85"; src = fetchFromGitHub { owner = "boto"; repo = "botocore"; - rev = "1a4caa8d1c232e9463febec406a8fedc71cb065c"; - sha256 = "0z2c9i2ci3f8979si8gcgnsz44ylchjax1f3dhj7pzyb2kcw6zri"; + rev = "962bb5d356096c57e25a5579d09e4b4d928c886d"; + sha256 = "09bk8d0r3245kbi96641gvfl3q4jjhw55gjldc2cpml6mv36hhnb"; }; }); prompt_toolkit = super.prompt_toolkit.overridePythonAttrs (oldAttrs: rec { @@ -29,13 +29,13 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.1.7"; # N.B: if you change this, change botocore to a matching version too + version = "2.1.17"; # N.B: if you change this, change botocore to a matching version too src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = version; - sha256 = "0sxdbc8y5yqcvsk2bxkywdh4fsq90vlsmcm45y0sa3rpza64xs3r"; + sha256 = "1pla97sylzhvj7r5cschv4bg23hpl0ax1m5cx4291fppjnrn2yp9"; }; postPatch = '' diff --git a/pkgs/tools/admin/awslogs/default.nix b/pkgs/tools/admin/awslogs/default.nix index f71422f77a2..3e2cf150557 100644 --- a/pkgs/tools/admin/awslogs/default.nix +++ b/pkgs/tools/admin/awslogs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { pname = "awslogs"; diff --git a/pkgs/tools/admin/awsweeper/default.nix b/pkgs/tools/admin/awsweeper/default.nix index f148bd088f4..0ff42ca20fc 100644 --- a/pkgs/tools/admin/awsweeper/default.nix +++ b/pkgs/tools/admin/awsweeper/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "awsweeper"; - version = "0.10.2"; + version = "0.11.1"; src = fetchFromGitHub { owner = "jckuester"; repo = pname; rev = "v${version}"; - sha256 = "1ln4s04n1qd1wv88ahhvvvphlxf6c9krqz9lmbcx3n67sb8xngm5"; + sha256 = "sha256-fpWoLFSwSVxaiWyVMSmQTd3o/zOySUXNM2YhxMQ7nsA="; }; - vendorSha256 = "0zlhb84fmrnwq71d0h83p28aqlfclcydndl0z2j9nx2skjlxax2i"; + vendorSha256 = "sha256-1u1mzANLlWduAQF1GUX7BJSyYlSZwNQISqKwbyRlGog="; buildFlagsArray = [ "-ldflags=-s -w -X github.com/jckuester/awsweeper/internal.version=${version} -X github.com/jckuester/awsweeper/internal.commit=${src.rev} -X github.com/jckuester/awsweeper/internal.date=unknown" ]; diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index a4c34662ef3..6379fa94bd7 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -1,14 +1,15 @@ { stdenv, lib, python3, fetchFromGitHub, installShellFiles }: let - version = "2.17.1"; + version = "2.18.0"; srcName = "azure-cli-${version}-src"; + src = fetchFromGitHub { name = srcName; owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - sha256 = "sha256-RTYCsdoZx1YQa9a8ZyvwQ9yTLEB6r7/mMgfecc/vGvM="; + sha256 = "sha256-3qQKQePyLYwIS3yO3exHNd0uoPr7y4iZ12+GaiHfqz8="; }; # put packages that needs to be overriden in the py package scope diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index 743c9e197d7..8decd2f80f1 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -6,7 +6,6 @@ let prePatch = (attrs.prePatch or "") + '' rm -f azure_bdist_wheel.py tox.ini substituteInPlace setup.py \ - --replace "wheel==0.30.0" "wheel" \ --replace "cryptography>=2.3.1,<3.0.0" "cryptography" sed -i "/azure-namespace-package/c\ " setup.cfg ''; @@ -137,6 +136,9 @@ let azure-mgmt-billing = overrideAzureMgmtPackage super.azure-mgmt-billing "1.0.0" "zip" "8b55064546c8e94839d9f8c98e9ea4b021004b3804e192bf39fa65b603536ad0"; + azure-mgmt-botservice = overrideAzureMgmtPackage super.azure-mgmt-botservice "0.2.0" "zip" + "sha256-sh2IWOaaoW0luQjEARah93PBJ+xN1gLLuFQuvzmlXYM="; + azure-mgmt-policyinsights = overrideAzureMgmtPackage super.azure-mgmt-policyinsights "0.5.0" "zip" "1wxh7mgrknnhqyafdd7sbwx8plx0zga2af21vs6yhxy48lw9w8pd"; @@ -149,11 +151,11 @@ let azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "0.6.0" "zip" "13s2k4jl8570bj6jkqzm0w29z29rl7h5i7czd3kr6vqar5wj9xjd"; - azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "10.3.0" "zip" - "1bb95rlwfikfl3pgyga0v5lfgr1xyaybm1nq2498rncfcvdpkjhz"; + azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "12.0.0" "zip" + "sha256-h3nif64OgekSh4mjOSTbom8qDXVrIVNksbQ3LwILnx8="; - azure-mgmt-appconfiguration = overrideAzureMgmtPackage super.azure-mgmt-appconfiguration "0.6.0" "zip" - "0pvc8f3g12q7als0pgy26kqi2i9grykwrjyiv2vijci9wxn22vpy"; + azure-mgmt-appconfiguration = overrideAzureMgmtPackage super.azure-mgmt-appconfiguration "1.0.1" "zip" + "b58bbe82a7429ba589292024896b58d96fe9fa732c578569cac349928dc2ca5f"; azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "6.3.0" "zip" "059lhbxqx1r1717s8xz5ahpxwphq5fgy0h7k6b63cahm818rs0hx"; @@ -248,8 +250,8 @@ let azure-mgmt-synapse = overrideAzureMgmtPackage super.azure-mgmt-synapse "0.5.0" "zip" "0dr8xml9zlsnag761zx7ifvdkhsv4syzxpmdn4gbf9c5qcq65dsf"; - azure-mgmt-datamigration = overrideAzureMgmtPackage super.azure-mgmt-datamigration "0.1.0" "zip" - "1pq5rn32yvrf5kqjafnj0kc92gpfg435w2l0k7cm8gvlja4r4m77"; + azure-mgmt-datamigration = overrideAzureMgmtPackage super.azure-mgmt-datamigration "4.1.0" "zip" + "c33d1deb0ee173a15c8ec21a1e714ba544fe5f4895d3b1d8b0581f3c1b2e8ce4"; azure-mgmt-relay = overrideAzureMgmtPackage super.azure-mgmt-relay "0.1.0" "zip" "1jss6qhvif8l5s0lblqw3qzijjf0h88agciiydaa7f4q577qgyfr"; @@ -414,12 +416,12 @@ let }); knack = super.knack.overridePythonAttrs(oldAttrs: rec { - version = "0.7.2"; + version = "0.8.0rc2"; src = super.fetchPypi { inherit (oldAttrs) pname; inherit version; - sha256 = "1jh81xyri7wb7vqa049imf6dfy3nc501bq3p0miaka8ffvvaxinz"; + sha256 = "sha256-4pzgVwOVcT5UsjbyGkE30xashMASUzoQe2OGHSnK5do="; }; }); diff --git a/pkgs/tools/admin/berglas/default.nix b/pkgs/tools/admin/berglas/default.nix index ca588db01a5..8a6bb559041 100644 --- a/pkgs/tools/admin/berglas/default.nix +++ b/pkgs/tools/admin/berglas/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "berglas"; diff --git a/pkgs/tools/admin/certigo/default.nix b/pkgs/tools/admin/certigo/default.nix index ff66e926d4b..422c6da82d2 100644 --- a/pkgs/tools/admin/certigo/default.nix +++ b/pkgs/tools/admin/certigo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "certigo"; diff --git a/pkgs/tools/admin/chkcrontab/default.nix b/pkgs/tools/admin/chkcrontab/default.nix index 6404eb92a26..bbf8d7eaeb1 100644 --- a/pkgs/tools/admin/chkcrontab/default.nix +++ b/pkgs/tools/admin/chkcrontab/default.nix @@ -1,4 +1,4 @@ -{ python, lib, stdenv }: +{ python, lib }: with python.pkgs; diff --git a/pkgs/tools/admin/credhub-cli/default.nix b/pkgs/tools/admin/credhub-cli/default.nix index 2a1ceb531a5..55af1679d7a 100644 --- a/pkgs/tools/admin/credhub-cli/default.nix +++ b/pkgs/tools/admin/credhub-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "credhub-cli"; diff --git a/pkgs/tools/admin/daemontools/default.nix b/pkgs/tools/admin/daemontools/default.nix index 2bfdb9b69de..6fafc1c253a 100644 --- a/pkgs/tools/admin/daemontools/default.nix +++ b/pkgs/tools/admin/daemontools/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, bash, glibc, stdenv }: +{ fetchurl, bash, glibc, lib, stdenv }: stdenv.mkDerivation rec { name = "daemontools-0.76"; @@ -34,11 +34,11 @@ stdenv.mkDerivation rec { ''; meta = { - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; homepage = "https://cr.yp.to/daemontools.html"; description = "A collection of tools for managing UNIX services"; - maintainers = with stdenv.lib.maintainers; [ kevincox ]; - platforms = stdenv.lib.platforms.unix; + maintainers = with lib.maintainers; [ kevincox ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/admin/dehydrated/default.nix b/pkgs/tools/admin/dehydrated/default.nix index 5ec710dde43..eda7b7ace5f 100644 --- a/pkgs/tools/admin/dehydrated/default.nix +++ b/pkgs/tools/admin/dehydrated/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp -a dehydrated $out/bin - wrapProgram "$out/bin/dehydrated" --prefix PATH : "${stdenv.lib.makeBinPath [ openssl coreutils gnused gnugrep diffutils curl gawk ]}" + wrapProgram "$out/bin/dehydrated" --prefix PATH : "${lib.makeBinPath [ openssl coreutils gnused gnugrep diffutils curl gawk ]}" ''; meta = with lib; { diff --git a/pkgs/tools/admin/docker-credential-gcr/default.nix b/pkgs/tools/admin/docker-credential-gcr/default.nix index 2ca0f2c4d08..7fb128caa19 100644 --- a/pkgs/tools/admin/docker-credential-gcr/default.nix +++ b/pkgs/tools/admin/docker-credential-gcr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "docker-credential-gcr"; diff --git a/pkgs/tools/admin/docker-credential-helpers/default.nix b/pkgs/tools/admin/docker-credential-helpers/default.nix index ef8df0d4726..0d46eff98b5 100644 --- a/pkgs/tools/admin/docker-credential-helpers/default.nix +++ b/pkgs/tools/admin/docker-credential-helpers/default.nix @@ -13,9 +13,9 @@ buildGoPackage rec { sha256 = "0xgmwjva3j1s0cqkbajbamj13bgzh5jkf2ir54m9a7w8gjnsh6dx"; }; - nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; + nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; - buildInputs = stdenv.lib.optionals stdenv.isLinux [ libsecret ]; + buildInputs = lib.optionals stdenv.isLinux [ libsecret ]; buildPhase = if stdenv.isDarwin diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 54d78d8fab7..d148c337e82 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.35.0"; + version = "0.36.2"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "0l4wlg6x074slndkihvwdvw4frsyzwxfqm1pkzqwc3x8awa9nlbv"; + sha256 = "sha256-qAUJgQzC9dGeVePsLpZHt+Ogz5ty5+N8hKBtGozhRZM="; }; - vendorSha256 = "0sfx8x1iwdqwbyiid5hc9wiwjc16aig8vplpjlqxkmcvig8qlwff"; + vendorSha256 = "sha256-woEa/h6TKQD32BslmPBuILvBAObhWjT8XqnQmuweUx0="; doCheck = false; diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix index c2e6a4479ae..8913bed39d5 100644 --- a/pkgs/tools/admin/exoscale-cli/default.nix +++ b/pkgs/tools/admin/exoscale-cli/default.nix @@ -1,14 +1,14 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "exoscale-cli"; - version = "1.22.0"; + version = "1.23.0"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "1hxr5w8cd6f967cvhgqd3pvl8dlx2hb0pvjslzzbrs65djf8zh3k"; + sha256 = "sha256-LVWUfaACdDp9xsuXHysPO/8QMdaDqS+yhP2U9cc4jh4="; }; goPackagePath = "github.com/exoscale/cli"; @@ -27,7 +27,7 @@ buildGoPackage rec { meta = { description = "Command-line tool for everything at Exoscale: compute, storage, dns"; homepage = "https://github.com/exoscale/cli"; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ dramaturg ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dramaturg ]; }; } diff --git a/pkgs/tools/admin/fastlane/gemset.nix b/pkgs/tools/admin/fastlane/gemset.nix index a3c32f7c5de..e747537b241 100644 --- a/pkgs/tools/admin/fastlane/gemset.nix +++ b/pkgs/tools/admin/fastlane/gemset.nix @@ -756,4 +756,4 @@ }; version = "1.0.1"; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/admin/fbvnc/default.nix b/pkgs/tools/admin/fbvnc/default.nix index ec32b5f0a26..2bd46f27ab0 100644 --- a/pkgs/tools/admin/fbvnc/default.nix +++ b/pkgs/tools/admin/fbvnc/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub}: +{lib, stdenv, fetchFromGitHub}: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "fbvnc"; @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { meta = { description = "Framebuffer VNC client"; - license = stdenv.lib.licenses.bsd3; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.bsd3; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; homepage = "https://github.com/zohead/fbvnc/"; }; } diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index 61f41daf242..36af063c448 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -21,18 +21,18 @@ let sources = name: system: { x86_64-darwin = { url = "${baseUrl}/${name}-darwin-x86_64.tar.gz"; - sha256 = "1rfaa4b34mijlqxi9savzjplk1z83rs1z8iyx89zbw21fyry08kb"; + sha256 = "09pv1xvycgfai151z6kbsggyldcd3cx6x1p04dcim2xrawqvng6s"; }; x86_64-linux = { url = "${baseUrl}/${name}-linux-x86_64.tar.gz"; - sha256 = "15izl7bvv7m96nyrs93b60fivr7gi2i306ryq6ynxrbq0nq43iya"; + sha256 = "1iybbvxjny33mw3h2f81fdvsvp65xa62c2qrzjv8hkrqkw69ckrp"; }; }.${system}; in stdenv.mkDerivation rec { pname = "google-cloud-sdk"; - version = "322.0.0"; + version = "325.0.0"; src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system); diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix index 152025d41c9..3d662a456aa 100644 --- a/pkgs/tools/admin/gtk-vnc/default.nix +++ b/pkgs/tools/admin/gtk-vnc/default.nix @@ -7,7 +7,7 @@ , gnutls , cairo , glib -, pkgconfig +, pkg-config , cyrus_sasl , libpulseaudio , libgcrypt @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "bin" "man" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1060ws037v556rx1qhfrcg02859rscksrzr8fq11himdg4d1y6m8"; }; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gobject-introspection vala gettext diff --git a/pkgs/tools/admin/iamy/default.nix b/pkgs/tools/admin/iamy/default.nix index e7481e16948..dd35da451ad 100644 --- a/pkgs/tools/admin/iamy/default.nix +++ b/pkgs/tools/admin/iamy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "iamy"; diff --git a/pkgs/tools/admin/intecture/agent.nix b/pkgs/tools/admin/intecture/agent.nix index 1c2d84836eb..c9133b2bef6 100644 --- a/pkgs/tools/admin/intecture/agent.nix +++ b/pkgs/tools/admin/intecture/agent.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, rustPlatform -, openssl, zeromq, czmq, pkgconfig, cmake, zlib }: +, openssl, zeromq, czmq, pkg-config, cmake, zlib }: with rustPlatform; @@ -18,7 +18,7 @@ buildRustPackage rec { buildInputs = [ openssl zeromq czmq zlib ]; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; meta = with lib; { description = "Authentication client/server for Intecture components"; diff --git a/pkgs/tools/admin/intecture/auth.nix b/pkgs/tools/admin/intecture/auth.nix index 0d7443d3225..67d65f2a821 100644 --- a/pkgs/tools/admin/intecture/auth.nix +++ b/pkgs/tools/admin/intecture/auth.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, rustPlatform -, openssl, zeromq, czmq, pkgconfig, cmake, zlib }: +, openssl, zeromq, czmq, pkg-config, cmake, zlib }: with rustPlatform; @@ -18,7 +18,7 @@ buildRustPackage rec { buildInputs = [ openssl zeromq czmq zlib ]; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; meta = with lib; { description = "Authentication client/server for Intecture components"; diff --git a/pkgs/tools/admin/intecture/cli.nix b/pkgs/tools/admin/intecture/cli.nix index 5a841b92040..7aa1ec0ae44 100644 --- a/pkgs/tools/admin/intecture/cli.nix +++ b/pkgs/tools/admin/intecture/cli.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, rustPlatform -, openssl, zeromq, czmq, pkgconfig, cmake, zlib }: +, openssl, zeromq, czmq, pkg-config, cmake, zlib }: with rustPlatform; @@ -18,7 +18,7 @@ buildRustPackage rec { buildInputs = [ openssl zeromq czmq zlib ]; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; # Needed for tests USER = "$(whoami)"; diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/tools/admin/lego/default.nix index e270e7a4c43..a825908484c 100644 --- a/pkgs/tools/admin/lego/default.nix +++ b/pkgs/tools/admin/lego/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lego"; - version = "4.1.3"; + version = "4.2.0"; src = fetchFromGitHub { owner = "go-acme"; repo = pname; rev = "v${version}"; - sha256 = "05fy6826n449adlglwi8s31km4yhd8hbd9yml8k204cb81w00zyk"; + sha256 = "sha256-S9I6b9+FngX0/W5t3EHG+H1ULsZKoQw1/S4HnSITYG0="; }; - vendorSha256 = "0p2pibid2d761whfk7zgq230lyqi2f0wmfvxqkjzrd1sba40r9bp"; + vendorSha256 = "sha256-dVGSMPhAvN/kWgv3XHS+lOZdcbDNL44ELkv7fHAJWlI="; doCheck = false; diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 5c97d110f9a..1c263a1969d 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, hwdata, pkgconfig, lxc, buildGoPackage, fetchurl +{ lib, hwdata, pkg-config, lxc, buildGoPackage, fetchurl , makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq , squashfsTools, iproute, iptables, ebtables, iptables-nftables-compat, libcap , libco-canonical, dqlite, raft-canonical, sqlite-replication, udev @@ -46,7 +46,7 @@ buildGoPackage rec { # test binaries, code generation rm $out/bin/{deps,macaroon-identity,generate} - wrapProgram $out/bin/lxd --prefix PATH : ${stdenv.lib.makeBinPath ( + wrapProgram $out/bin/lxd --prefix PATH : ${lib.makeBinPath ( networkPkgs ++ [ acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute bash criu ] ++ [ (writeShellScriptBin "apparmor_parser" '' @@ -58,7 +58,7 @@ buildGoPackage rec { installShellCompletion --bash go/src/github.com/lxc/lxd/scripts/bash/lxd-client ''; - nativeBuildInputs = [ installShellFiles pkgconfig makeWrapper ]; + nativeBuildInputs = [ installShellFiles pkg-config makeWrapper ]; buildInputs = [ lxc acl libcap libco-canonical.dev dqlite.dev raft-canonical.dev sqlite-replication udev.dev ]; diff --git a/pkgs/tools/admin/mycli/default.nix b/pkgs/tools/admin/mycli/default.nix index 01b82dde4d5..47c9aa7f5f8 100644 --- a/pkgs/tools/admin/mycli/default.nix +++ b/pkgs/tools/admin/mycli/default.nix @@ -1,22 +1,30 @@ { lib , python3 , glibcLocales -, fetchpatch }: with python3.pkgs; buildPythonApplication rec { pname = "mycli"; - version = "1.22.2"; + version = "1.23.2"; src = fetchPypi { inherit pname version; - sha256 = "1lq2x95553vdmhw13cxcgsd2g2i32izhsb7hxd4m1iwf9b3msbpv"; + sha256 = "sha256-auGbFAvwLR7aDChhgeNZPZPNGJo+b9Q4TFDaOrmU2zI="; }; propagatedBuildInputs = [ - paramiko pymysql configobj sqlparse prompt_toolkit pygments click pycrypto cli-helpers + cli-helpers + click + configobj + paramiko + prompt_toolkit + pycrypto + pygments + pymysql + pyperclip + sqlparse ]; checkInputs = [ pytest mock glibcLocales ]; @@ -29,15 +37,6 @@ buildPythonApplication rec { --ignore=mycli/packages/paramiko_stub/__init__.py ''; - patches = [ - # TODO: remove with next release (v1.22.3 or v1.23) - (fetchpatch { - url = "https://github.com/dbcli/mycli/commit/17f093d7b70ab2d9f3c6eababa041bf76f029aac.patch"; - sha256 = "sha256-VwfbtzUtElV+ErH+NJb+3pRtSaF0yVK8gEWCvlzZNHI="; - excludes = [ "changelog.md" "mycli/AUTHORS" ]; - }) - ]; - postPatch = '' substituteInPlace setup.py \ --replace "sqlparse>=0.3.0,<0.4.0" "sqlparse" diff --git a/pkgs/tools/admin/nomachine-client/default.nix b/pkgs/tools/admin/nomachine-client/default.nix index 6727a897878..c419c7e834a 100644 --- a/pkgs/tools/admin/nomachine-client/default.nix +++ b/pkgs/tools/admin/nomachine-client/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, file, fetchurl, makeWrapper, autoPatchelfHook, jsoncpp, libpulseaudio }: let - versionMajor = "6.12"; - versionMinor = "3"; - versionBuild_x86_64 = "7"; - versionBuild_i686 = "8"; + versionMajor = "7.0"; + versionMinor = "211"; + versionBuild_x86_64 = "4"; + versionBuild_i686 = "4"; in stdenv.mkDerivation rec { pname = "nomachine-client"; @@ -13,23 +13,18 @@ in src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - urls = [ - "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_x86_64}_x86_64.tar.gz" - "https://web.archive.org/web/https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_x86_64}_x86_64.tar.gz" - ]; - sha256 = "1dqsqwxbd77g6gc0hvjmmg4flm3vwwv5y98m8d9wxyybp37vkmgd"; + url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_x86_64}_x86_64.tar.gz"; + sha256 = "06habqsl5gp13sym519r3qp188qwqqfw8p48wcs4zj3kcri6fjz0"; } else if stdenv.hostPlatform.system == "i686-linux" then fetchurl { - urls = [ - "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_i686}_i686.tar.gz" - "https://web.archive.org/web/https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_i686}_i686.tar.gz" - ]; - sha256 = "1q14hxjy66s5cpq19rshscsm679csb6p16c5p2agh5zd64cr4am6"; + url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_i686}_i686.tar.gz"; + sha256 = "1y4lr95mwilwr7gqsxqvygq4w3dcp4cjh8m06wdi3avwdzrjkgj9"; } else throw "NoMachine client is not supported on ${stdenv.hostPlatform.system}"; + # nxusb-legacy is only needed for kernel versions < 3 postUnpack = '' mv $(find . -type f -name nxclient.tar.gz) . mv $(find . -type f -name nxplayer.tar.gz) . @@ -37,6 +32,8 @@ in tar xf nxclient.tar.gz tar xf nxplayer.tar.gz rm $(find . -maxdepth 1 -type f) + rm -r NX/share/src/nxusb-legacy + rm NX/bin/nxusbd-legacy NX/lib/libnxusb-legacy.so ''; nativeBuildInputs = [ file makeWrapper autoPatchelfHook ]; @@ -85,8 +82,8 @@ in description = "NoMachine remote desktop client (nxplayer)"; homepage = "https://www.nomachine.com/"; license = { - fullName = "NoMachine 6 End-User License Agreement"; - url = "https://www.nomachine.com/licensing-6"; + fullName = "NoMachine 7 End-User License Agreement"; + url = "https://www.nomachine.com/licensing-7"; free = false; }; maintainers = with maintainers; [ talyz ]; diff --git a/pkgs/tools/admin/oxidized/gemset.nix b/pkgs/tools/admin/oxidized/gemset.nix index ff77102af12..f6a3aaa6780 100644 --- a/pkgs/tools/admin/oxidized/gemset.nix +++ b/pkgs/tools/admin/oxidized/gemset.nix @@ -301,4 +301,4 @@ }; version = "2.0.9"; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix index f331c137107..c4139345908 100644 --- a/pkgs/tools/admin/procs/default.nix +++ b/pkgs/tools/admin/procs/default.nix @@ -1,19 +1,28 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, Security }: rustPlatform.buildRustPackage rec { pname = "procs"; - version = "0.10.10"; + version = "0.11.1"; src = fetchFromGitHub { owner = "dalance"; repo = pname; rev = "v${version}"; - sha256 = "12p95nybsisqpji01qgkp5wfg7fwk814xdsz338q9wac8nvqw9w3"; + sha256 = "sha256-e9fdqsv/P3zZdjsdAkwO21txPS1aWd0DuqRQUdr1vX4="; }; - cargoSha256 = "13wfz0ig9dsl0h085rzlrx0dg9la957c50xyzjfxq1ybw2qr266b"; + cargoSha256 = "sha256-ilSDLbPQnmhQcNbtKCpUNmyZY0JUY/Ksg0sj/t7veT0="; - buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + for shell in bash fish zsh; do + $out/bin/procs --completion $shell > procs.$shell + installShellCompletion procs.$shell + done + ''; + + buildInputs = lib.optional stdenv.isDarwin Security; meta = with lib; { description = "A modern replacement for ps written in Rust"; diff --git a/pkgs/tools/admin/pulumi/data.nix b/pkgs/tools/admin/pulumi/data.nix index 08f61da0307..0498b56dcf5 100644 --- a/pkgs/tools/admin/pulumi/data.nix +++ b/pkgs/tools/admin/pulumi/data.nix @@ -1,178 +1,178 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "2.17.0"; + version = "2.19.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v2.17.0-linux-x64.tar.gz"; - sha256 = "0k2vdgyb75krjqb9kikkfpvd6rn90gm6dzbpgzsycrwrmbx3rk79"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v2.19.0-linux-x64.tar.gz"; + sha256 = "0641inzkbgrjarc7jdmi0iryx4swjh1ayf0j15ais3yij7jq4da2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.5.1-linux-amd64.tar.gz"; - sha256 = "0qghccr8kj21scsil4ibc19y3sgrsyzs5c04a5ppv1k62y89h7m7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.5.2-linux-amd64.tar.gz"; + sha256 = "1jrv87r55m1kzl48zs5vh83v2kh011gm4dha80ijqjhryx0a94jy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.23.0-linux-amd64.tar.gz"; - sha256 = "125jqdjn9iipnjj3xgwvcfhcq0xi8xvn8mgs17g79xwbbxpvrjiv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.25.1-linux-amd64.tar.gz"; + sha256 = "0yfrpih5q2hfj2555y26l1pqs22idh4hqn20gy310kg12r303hwk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.11.0-linux-amd64.tar.gz"; - sha256 = "14pdsvgd512qflvkc1890q9wrri2rrcjdjw5n9lf2qb2m7wvns4y"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.11.1-linux-amd64.tar.gz"; + sha256 = "18gyan0dszfvx8fhvi8r2msbf8n9lbh10pnvcaqvdk8cr79lnzl9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v2.6.2-linux-amd64.tar.gz"; - sha256 = "0xq36wh57w7b7l5skx173lj3chl4rfgbfdivsvyjlnfahh2fmfr4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v2.7.0-linux-amd64.tar.gz"; + sha256 = "05nmdjgwhm1pi5zljq33812wgkz1rpisjrvdn8lcsapwz3fchbjd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v2.14.0-linux-amd64.tar.gz"; - sha256 = "0vj9674msiadnhmcypqv3dvhkl60sms9frjzpf4hnhlimxc9fpdd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v2.15.0-linux-amd64.tar.gz"; + sha256 = "12wjh0w7i1f6rd5r4pqc98ix4mkrkqwnvpv7hkcsn90rsxrlfysk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v3.2.0-linux-amd64.tar.gz"; - sha256 = "1qipbpp74690w7n42dfsp8524gdjvm8z5665rmsy7mbdi2bd2x5v"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v3.3.0-linux-amd64.tar.gz"; + sha256 = "19cpq6hwj862wmfcfx732j66wjkfjnxjrqj4bgxpgah62hrl5lh2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.6.0-linux-amd64.tar.gz"; - sha256 = "0khbcgqbssndx8fwb34ny0wcpy3xi165lq8dq224q1f9bjbklbml"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.7.0-linux-amd64.tar.gz"; + sha256 = "0mb6ddidyk3g1ayk8y0ypb262fyv584w5cicvjc5r9670a1d2rcv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v4.6.1-linux-amd64.tar.gz"; - sha256 = "13x9yxfyx65pqgsnpdfi12z6fg3b50fzkmsffvwi80857z2389rg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v4.9.0-linux-amd64.tar.gz"; + sha256 = "1b5m2620s4bqq6zlagki3w4fzph3lc5192falv8ick4rgbv714nb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v2.4.1-linux-amd64.tar.gz"; - sha256 = "1s8g32d06dfaayjhga3skdh7vsrv5ysmhz6ygg202pqqpiy27vl5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v2.5.1-linux-amd64.tar.gz"; + sha256 = "10cmnsxpiy7bfxyrpwfqn5kgpijlkxrhfah40wd82j3j2b7wy33j"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v3.4.0-linux-amd64.tar.gz"; - sha256 = "0diylv5kbxjhwvwmwil6l8ln9lijmjnxwgf4yd0rhad118zpibnp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v3.5.0-linux-amd64.tar.gz"; + sha256 = "10d5gmhax02906jpr9nmb80xfxvy2ym8vjyj31sz2mcl9jnadk4z"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v0.4.1-linux-amd64.tar.gz"; - sha256 = "1851nx4mmgc2j4jihcqxlx5c5dx95xbc2h0kxr055zvdfg2wcp8i"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v0.5.1-linux-amd64.tar.gz"; + sha256 = "0fi8qxv6ladpapb6j0w7zqk0hxj56iy1131dsipzkkx4p1jfg27r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.7.5-linux-amd64.tar.gz"; - sha256 = "0f90v8q00hhqrnmwa17gl9sas61bzqsgblpaw1p48agnjxa76vnz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.7.8-linux-amd64.tar.gz"; + sha256 = "0ah0yhwf79dgk7biifnapz0366mm5a54rlqf8hffn13czqnc3qbq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v2.3.1-linux-amd64.tar.gz"; - sha256 = "0zrza0i73ld16szbbsz3h9p9z09ws2pf380kzb1358g70ayvzga3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v2.3.2-linux-amd64.tar.gz"; + sha256 = "1c39fk37kx093n0ldk8szblgcx0hviyyd7mxzp7nb97s4rvmf48l"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v2.3.2-linux-amd64.tar.gz"; - sha256 = "12gs049074vn5s0njza0r48bk5z8d7bfc50j2mbbylkdrlrl87ci"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v2.3.3-linux-amd64.tar.gz"; + sha256 = "0c2aypx8y6s892y2gygc8116rlarlcw1s2m39gkcdjjbfkmf8za0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v2.10.1-linux-amd64.tar.gz"; - sha256 = "16mq1ymvkql3l6f3rsinm4yfxfl9qcpwfmhc8k1vj79h6gkd29cz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v2.11.0-linux-amd64.tar.gz"; + sha256 = "0iqimhqh853jx6zd53z1r98ky0qhxfby9w519xpdlvxxq5aqb6kb"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-packet-v3.2.2-linux-amd64.tar.gz"; sha256 = "0glbjhgrb2hiyhd6kwmy7v384j8zw641pw9737g1fczv3x16a3s3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.5.2-linux-amd64.tar.gz"; - sha256 = "1xxhc5sy3z391dgzzb4s6wzad2n2j3f5g158wffcj8jss2ylbh1x"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.5.3-linux-amd64.tar.gz"; + sha256 = "1rh14rngpcbqly5i3cgwfgi90drkg6fa0gkgpfa7f9mkm4wpgla8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v3.0.0-linux-amd64.tar.gz"; - sha256 = "1q8ifm8xmny04y38bswclaa065x657sjq9b573fxrnv9gv9nx5sy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v3.0.1-linux-amd64.tar.gz"; + sha256 = "0jpv94kzsa794ds5bjj6j3pj1wxqicavpxjnycfa5cm8w71kmlsh"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v3.2.0-linux-amd64.tar.gz"; - sha256 = "047izxnmsykmk3dpm2q4zxhi575hiqlb1l7xx6sy43dh6ink16jb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v3.3.0-linux-amd64.tar.gz"; + sha256 = "069sq8lkw4n7ykh2b2fsaggxxr4731riyy9i15idffa52d1kkiq6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.11.3-linux-amd64.tar.gz"; - sha256 = "1g32kjvh7zp6f4n4qy457s45qf9ddrzyd5ncfdvpsd0dirjf4crg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.11.4-linux-amd64.tar.gz"; + sha256 = "0lyvpfmjsjxpwq1b74j2jipp36n7zczlxgy0pr6j7c027d26sym6"; } ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v2.17.0-darwin-x64.tar.gz"; - sha256 = "0pa1a4j977cn3m43zia75aj4g5bqr69n0a4hha72dbnnid4d72g8"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v2.19.0-darwin-x64.tar.gz"; + sha256 = "02wd0h5aq53zjy18xzbkv7nnl097ja0m783gsgrs1wdlqblwpqyw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.5.1-darwin-amd64.tar.gz"; - sha256 = "1q3r1a3wqzaw78abiz97364a9qgr3rr1m83kyjni3jhs5cgxbax0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.5.2-darwin-amd64.tar.gz"; + sha256 = "1rqx2dyx3anmlv74whs587rs1bgyssqxfjzrx1cfpfnnnj5rkmry"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.23.0-darwin-amd64.tar.gz"; - sha256 = "0h4g49zr6gxvyavd9pzvlmnzxjqnnzh27dhz6007c10rgn894yba"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.25.1-darwin-amd64.tar.gz"; + sha256 = "1j4czx1iqfm95y14isl1sqwvsw690h9y0xf2jpynp2ygmc3szrkr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.11.0-darwin-amd64.tar.gz"; - sha256 = "0k1azgpkrqbr4482h5v2w5qnavmgl5vnx0my2wsgzkwg5pv2i1ky"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.11.1-darwin-amd64.tar.gz"; + sha256 = "0dqyd8aywmxrsvipndwrwq5pxv7avzf8kpk6rdyip4j8hp156lbz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v2.6.2-darwin-amd64.tar.gz"; - sha256 = "09z1kn5gbgda0d4sfyd17qv1p9ldvxn8jbd049s46gvalmqbfwpd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v2.7.0-darwin-amd64.tar.gz"; + sha256 = "0xbbaphd0lypyzq262rapr42lmyz3wr14xab09qc156rjasr8w64"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v2.14.0-darwin-amd64.tar.gz"; - sha256 = "08clh3nnb32gzvnghk5w9m04jh3nn3svy4qx0hfidj3ci0dz6ncl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v2.15.0-darwin-amd64.tar.gz"; + sha256 = "10izly9m7847rsb533ch3n8rkhbfb3q6lcx80dk5ia8bfdlvc3cn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v3.2.0-darwin-amd64.tar.gz"; - sha256 = "01z8hwlw5i19rpcjk03iw12q2j9xy5in60d6y70v2n4nsmpqhlmq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v3.3.0-darwin-amd64.tar.gz"; + sha256 = "0kyw1csyzvkbzqxrgpf4d2zgydysd4mfb07igjv19m3f7gs8jhr9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.6.0-darwin-amd64.tar.gz"; - sha256 = "04d3gn89kn7q494g7j6wz3ivmqkdk12l0i2lsmwqlmn3jra44wnd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.7.0-darwin-amd64.tar.gz"; + sha256 = "122cf7v12vzv1szi9adcccakbs3hs23qsjbykjrhwmk8hw21g4kb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v4.6.1-darwin-amd64.tar.gz"; - sha256 = "1jxxm8iq1cnym45c8g2js731xz1xwgg72gfxryvy8i7faq6cxakq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v4.9.0-darwin-amd64.tar.gz"; + sha256 = "11w4ykh846byg05jxnddm6ln901pms8n5g0q5gj3ldfjrfl1cn2q"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v2.4.1-darwin-amd64.tar.gz"; - sha256 = "17pyiknkjnqlh3cyvclbzg60qf8qig4rp4b0d97vhx8njb5ia9z5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v2.5.1-darwin-amd64.tar.gz"; + sha256 = "1apaaa76dq53ppnmh4xi55zsrx1mwbnnsby63ymjw9xhdkc1sah6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v3.4.0-darwin-amd64.tar.gz"; - sha256 = "01vpfn62gnklamn2s17icdvzl25d9d97g0mdz955vwqhjsx7man3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v3.5.0-darwin-amd64.tar.gz"; + sha256 = "0xfkdmnax10zkgpipxaxfi0lgfgijnvssbwmfsaxxisdxscw2ig9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v0.4.1-darwin-amd64.tar.gz"; - sha256 = "0552wdbykypaafyacjfwqc4sfsl87pgayrnkwg1km00mb1dknzl9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v0.5.1-darwin-amd64.tar.gz"; + sha256 = "05h8adn3q7nnhn75vircrnr9nxf15pf82n9gvz5rbq0hsdivh3l2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.7.5-darwin-amd64.tar.gz"; - sha256 = "0lhvv5d2v21b0sqcy6wabjlqwg9qx9gxbysnkx3c5f5iwk1hrj8g"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.7.8-darwin-amd64.tar.gz"; + sha256 = "01xspqk3hzvrhka9nsxal8pwji3hm5qgkn49jjnk1cy01hy7s78q"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v2.3.1-darwin-amd64.tar.gz"; - sha256 = "1382c66vfkzr4hinqi45g7w9s7zv8yhj4in5wnd20s3cg5890mr1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v2.3.2-darwin-amd64.tar.gz"; + sha256 = "19v60l2djvigf60zacchfr98kfb8wxk1rmhdswyhhhz41jh30qhl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v2.3.2-darwin-amd64.tar.gz"; - sha256 = "1fb6p0nafs3s0kablwyq8v5kf5bs0fi9hkgwkz8hl0ydijzpasl4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v2.3.3-darwin-amd64.tar.gz"; + sha256 = "15w72087frbx6wyngi20bsssnr7si1bk1h94jav3d4cgm6nhpnwk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v2.10.1-darwin-amd64.tar.gz"; - sha256 = "0s6iaqn1jfm7glfnmdps6rk4iqrq2xspmbn4dmqj6q9w9ig1wab6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v2.11.0-darwin-amd64.tar.gz"; + sha256 = "05hap76yzss5bsgr20rm8sxb6r3iiwvq75lhf11laaxq2hnb7qdp"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-packet-v3.2.2-darwin-amd64.tar.gz"; sha256 = "0621njipng32x43lw8n49mapq10lnvibg8vlvgciqsfvrbpz1yp5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.5.2-darwin-amd64.tar.gz"; - sha256 = "0mf7a33ldvfx3yiprprh0cdb4bcnjcp7dhl0bifwyi644v94ffm1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.5.3-darwin-amd64.tar.gz"; + sha256 = "033262l7yylw9y8ifrag2fsdpfvqjmmrxmmhksvysjmz9slb60kg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v3.0.0-darwin-amd64.tar.gz"; - sha256 = "192a9zkc0yz44jzx3b7xcfy1xdw2blfsmqqvy7dqjhg029nfjfzp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v3.0.1-darwin-amd64.tar.gz"; + sha256 = "0d578hqkhwlhx50k9qpw7ixjyy1p2fd6cywj86s870jzgl8zh4fv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v3.2.0-darwin-amd64.tar.gz"; - sha256 = "1x5avdbfsrxs98lz20vyl1vyz2dnkz6cdix3yqm4nnyllin34pps"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v3.3.0-darwin-amd64.tar.gz"; + sha256 = "1qkh8hg7nplv0slq2xark57l547z63fy1l6zvrcblrqsqfw5zybv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.11.3-darwin-amd64.tar.gz"; - sha256 = "1hzcy1mxvcv9nm5jf6dy96ha3f29kcnbidfw01qc4smy8hc40f66"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.11.4-darwin-amd64.tar.gz"; + sha256 = "11c1d1jw0z4ybwvqfvmjcx3gkpwnvi5vcq01bc7a2wg374mkhj62"; } ]; }; diff --git a/pkgs/tools/admin/pulumi/default.nix b/pkgs/tools/admin/pulumi/default.nix index 231bdc09965..89fee3e6160 100644 --- a/pkgs/tools/admin/pulumi/default.nix +++ b/pkgs/tools/admin/pulumi/default.nix @@ -32,6 +32,7 @@ in stdenv.mkDerivation { ghuntley peterromfeldhk jlesquembre + cpcloud ]; }; } diff --git a/pkgs/tools/admin/pulumi/update.sh b/pkgs/tools/admin/pulumi/update.sh index 1dd05fe1c90..c1a0e631016 100755 --- a/pkgs/tools/admin/pulumi/update.sh +++ b/pkgs/tools/admin/pulumi/update.sh @@ -3,32 +3,32 @@ # Version of Pulumi from # https://www.pulumi.com/docs/get-started/install/versions/ -VERSION="2.17.0" +VERSION="2.19.0" # Grab latest release ${VERSION} from # https://github.com/pulumi/pulumi-${NAME}/releases plugins=( - "auth0=1.5.1" - "aws=3.23.0" - "cloudflare=2.11.0" - "consul=2.6.2" - "datadog=2.14.0" - "digitalocean=3.2.0" - "docker=2.6.0" - "gcp=4.6.1" - "github=2.4.1" - "gitlab=3.4.0" - "hcloud=0.4.1" - "kubernetes=2.7.5" - "mailgun=2.3.1" - "mysql=2.3.2" - "openstack=2.10.1" + "auth0=1.5.2" + "aws=3.25.1" + "cloudflare=2.11.1" + "consul=2.7.0" + "datadog=2.15.0" + "digitalocean=3.3.0" + "docker=2.7.0" + "gcp=4.9.0" + "github=2.5.1" + "gitlab=3.5.0" + "hcloud=0.5.1" + "kubernetes=2.7.8" + "mailgun=2.3.2" + "mysql=2.3.3" + "openstack=2.11.0" "packet=3.2.2" - "postgresql=2.5.2" - "random=3.0.0" - "vault=3.2.0" - "vsphere=2.11.3" - ); + "postgresql=2.5.3" + "random=3.0.1" + "vault=3.3.0" + "vsphere=2.11.4" +) function genMainSrc() { local url="https://get.pulumi.com/releases/sdk/pulumi-v${VERSION}-$1-x64.tar.gz" diff --git a/pkgs/tools/admin/s3bro/default.nix b/pkgs/tools/admin/s3bro/default.nix index bf807d14997..35cf7b11e64 100644 --- a/pkgs/tools/admin/s3bro/default.nix +++ b/pkgs/tools/admin/s3bro/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages }: +{ lib, python3Packages }: python3Packages.buildPythonPackage rec { pname = "s3bro"; diff --git a/pkgs/tools/admin/scaleway-cli/default.nix b/pkgs/tools/admin/scaleway-cli/default.nix index 0aeccb755a1..2a8f0d1f114 100644 --- a/pkgs/tools/admin/scaleway-cli/default.nix +++ b/pkgs/tools/admin/scaleway-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoPackage }: +{ lib, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { pname = "scaleway-cli"; diff --git a/pkgs/tools/admin/sec/default.nix b/pkgs/tools/admin/sec/default.nix index b082f61f875..fe3517c6196 100644 --- a/pkgs/tools/admin/sec/default.nix +++ b/pkgs/tools/admin/sec/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, perl, stdenv }: +{ fetchFromGitHub, perl, lib, stdenv }: stdenv.mkDerivation rec { name = "sec-${meta.version}"; @@ -23,10 +23,10 @@ stdenv.mkDerivation rec { meta = { homepage = "https://simple-evcorr.github.io"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; description = "Simple Event Correlator"; - maintainers = [ stdenv.lib.maintainers.tv ]; - platforms = stdenv.lib.platforms.all; + maintainers = [ lib.maintainers.tv ]; + platforms = lib.platforms.all; version = "2.8.3"; }; } diff --git a/pkgs/tools/admin/sewer/default.nix b/pkgs/tools/admin/sewer/default.nix index 42288bafe01..a6f511fe115 100644 --- a/pkgs/tools/admin/sewer/default.nix +++ b/pkgs/tools/admin/sewer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages }: +{ lib, python3Packages }: python3Packages.buildPythonApplication rec { pname = "sewer"; diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix index fc064641943..5bfc00ac000 100644 --- a/pkgs/tools/admin/simp_le/default.nix +++ b/pkgs/tools/admin/simp_le/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, bash }: +{ lib, python3Packages, bash }: python3Packages.buildPythonApplication rec { pname = "simp_le-client"; diff --git a/pkgs/tools/admin/ssh-import-id/default.nix b/pkgs/tools/admin/ssh-import-id/default.nix index 6c8520648ec..b6ca3135f56 100644 --- a/pkgs/tools/admin/ssh-import-id/default.nix +++ b/pkgs/tools/admin/ssh-import-id/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage -, lib, stdenv +, lib , fetchgit , requests , makeWrapper diff --git a/pkgs/tools/admin/ssl-cert-check/default.nix b/pkgs/tools/admin/ssl-cert-check/default.nix index f29ced9ebfd..aafe91dccd2 100644 --- a/pkgs/tools/admin/ssl-cert-check/default.nix +++ b/pkgs/tools/admin/ssl-cert-check/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp $pname $out/bin/$pname wrapProgram $out/bin/$pname \ - --set PATH "${stdenv.lib.makeBinPath buildInputs}" + --set PATH "${lib.makeBinPath buildInputs}" ''; meta = with lib; { diff --git a/pkgs/tools/admin/ssmsh/default.nix b/pkgs/tools/admin/ssmsh/default.nix index 6b0d0380901..8ed8b0b812b 100644 --- a/pkgs/tools/admin/ssmsh/default.nix +++ b/pkgs/tools/admin/ssmsh/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "ssmsh"; diff --git a/pkgs/tools/admin/stripe-cli/default.nix b/pkgs/tools/admin/stripe-cli/default.nix index c410bd81e89..309bf4803fb 100644 --- a/pkgs/tools/admin/stripe-cli/default.nix +++ b/pkgs/tools/admin/stripe-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "stripe-cli"; diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index 8412ffa9cad..20d17b77741 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , xorg, xkeyboard_config, zlib , libjpeg_turbo, pixman, fltk , fontDirectories @@ -9,7 +9,7 @@ , makeWrapper }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { version = "1.11.0"; @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { rm -f $out/lib/xorg/protocol.txt wrapProgram $out/bin/vncserver \ - --prefix PATH : ${stdenv.lib.makeBinPath (with xorg; [ xterm twm xsetroot xauth ]) } + --prefix PATH : ${lib.makeBinPath (with xorg; [ xterm twm xsetroot xauth ]) } ''; buildInputs = with xorg; [ @@ -100,10 +100,10 @@ stdenv.mkDerivation rec { meta = { homepage = "https://tigervnc.org/"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; description = "Fork of tightVNC, made in cooperation with VirtualGL"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; # Prevent a store collision. priority = 4; }; diff --git a/pkgs/tools/admin/tightvnc/default.nix b/pkgs/tools/admin/tightvnc/default.nix index 7dc416c8efd..1bfb3be113d 100644 --- a/pkgs/tools/admin/tightvnc/default.nix +++ b/pkgs/tools/admin/tightvnc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xlibsWrapper, zlib, libjpeg, imake, gccmakedep, libXmu +{ lib, stdenv, fetchurl, xlibsWrapper, zlib, libjpeg, imake, gccmakedep, libXmu , libXaw, libXpm, libXp , perl, xauth, fontDirectories, openssh }: stdenv.mkDerivation { @@ -68,7 +68,7 @@ stdenv.mkDerivation { ''; meta = { - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; homepage = "http://vnc-tight.sourceforge.net/"; description = "Improved version of VNC"; @@ -80,6 +80,6 @@ stdenv.mkDerivation { ''; maintainers = []; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/archivers/afio/default.nix b/pkgs/tools/archivers/afio/default.nix index 3b4eb6a5ea5..7ef374b5bfe 100644 --- a/pkgs/tools/archivers/afio/default.nix +++ b/pkgs/tools/archivers/afio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub } : +{ lib, stdenv, fetchFromGitHub } : stdenv.mkDerivation rec { version = "2.5.2"; @@ -22,12 +22,12 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/kholtman/afio"; description = "Fault tolerant cpio archiver targeting backups"; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; /* * Licensing is complicated due to the age of the code base, but * generally free. See the file ``afio_license_issues_v5.txt`` for * a comprehensive discussion. */ - license = stdenv.lib.licenses.free; + license = lib.licenses.free; }; } diff --git a/pkgs/tools/archivers/atool/default.nix b/pkgs/tools/archivers/atool/default.nix index 0d24ead456a..419a7d04ee3 100644 --- a/pkgs/tools/archivers/atool/default.nix +++ b/pkgs/tools/archivers/atool/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, perl, bash}: +{lib, stdenv, fetchurl, perl, bash}: stdenv.mkDerivation { name = "atool-0.39.0"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { homepage = "https://www.nongnu.org/atool"; description = "Archive command line helper"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.gpl3; + platforms = lib.platforms.unix; + license = lib.licenses.gpl3; }; } diff --git a/pkgs/tools/archivers/cromfs/default.nix b/pkgs/tools/archivers/cromfs/default.nix index 145a66a3131..bed0485e44a 100644 --- a/pkgs/tools/archivers/cromfs/default.nix +++ b/pkgs/tools/archivers/cromfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, fuse, perl }: +{ lib, stdenv, fetchurl, pkg-config, fuse, perl }: stdenv.mkDerivation rec { name = "cromfs-1.5.10.2"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { install util/unmkcromfs $out/bin ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ fuse perl ]; meta = with lib; { diff --git a/pkgs/tools/archivers/fsarchiver/default.nix b/pkgs/tools/archivers/fsarchiver/default.nix index 5196ccf668f..2322ad4d986 100644 --- a/pkgs/tools/archivers/fsarchiver/default.nix +++ b/pkgs/tools/archivers/fsarchiver/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config , zlib, bzip2, lzma, lzo, lz4, zstd, xz , libgcrypt, e2fsprogs, util-linux, libgpgerror }: @@ -17,7 +17,7 @@ in stdenv.mkDerivation { }; nativeBuildInputs = [ - autoreconfHook pkgconfig + autoreconfHook pkg-config ]; buildInputs = [ diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix index 672c99d80c0..844bd8de29c 100644 --- a/pkgs/tools/archivers/gnutar/default.nix +++ b/pkgs/tools/archivers/gnutar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, acl }: +{ lib, stdenv, fetchurl, autoreconfHook, acl }: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; # avoid retaining reference to CF during stdenv bootstrap - configureFlags = stdenv.lib.optionals stdenv.isDarwin [ + configureFlags = lib.optionals stdenv.isDarwin [ "gt_cv_func_CFPreferencesCopyAppValue=no" "gt_cv_func_CFLocaleCopyCurrent=no" "gt_cv_func_CFLocaleCopyPreferredLanguages=no" @@ -24,19 +24,19 @@ stdenv.mkDerivation rec { # gnutar tries to call into gettext between `fork` and `exec`, # which is not safe on darwin. # see http://article.gmane.org/gmane.os.macosx.fink.devel/21882 - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace src/system.c --replace '_(' 'N_(' ''; outputs = [ "out" "info" ]; buildInputs = [ ] - ++ stdenv.lib.optional stdenv.isLinux acl - ++ stdenv.lib.optional stdenv.isDarwin autoreconfHook; + ++ lib.optional stdenv.isLinux acl + ++ lib.optional stdenv.isDarwin autoreconfHook; # May have some issues with root compilation because the bootstrap tool # cannot be used as a login shell for now. - FORCE_UNSAFE_CONFIGURE = stdenv.lib.optionalString (stdenv.hostPlatform.system == "armv7l-linux" || stdenv.isSunOS) "1"; + FORCE_UNSAFE_CONFIGURE = lib.optionalString (stdenv.hostPlatform.system == "armv7l-linux" || stdenv.isSunOS) "1"; preConfigure = if stdenv.isCygwin then '' sed -i gnu/fpending.h -e 's,include <stdio_ext.h>,,' @@ -64,10 +64,10 @@ stdenv.mkDerivation rec { archives). ''; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; priority = 10; }; diff --git a/pkgs/tools/archivers/innoextract/default.nix b/pkgs/tools/archivers/innoextract/default.nix index d5d35a38251..701c7429d63 100644 --- a/pkgs/tools/archivers/innoextract/default.nix +++ b/pkgs/tools/archivers/innoextract/default.nix @@ -15,9 +15,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake makeWrapper ]; # we need unar to for multi-archive extraction - postFixup = stdenv.lib.optionalString withGog '' + postFixup = lib.optionalString withGog '' wrapProgram $out/bin/innoextract \ - --prefix PATH : ${stdenv.lib.makeBinPath [ unar ]} + --prefix PATH : ${lib.makeBinPath [ unar ]} ''; meta = with lib; { diff --git a/pkgs/tools/archivers/ndstool/default.nix b/pkgs/tools/archivers/ndstool/default.nix index 9a6350a8df1..de7f02ce846 100644 --- a/pkgs/tools/archivers/ndstool/default.nix +++ b/pkgs/tools/archivers/ndstool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake }: stdenv.mkDerivation rec { pname = "ndstool"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/devkitPro/ndstool"; description = "A tool to unpack and repack nds rom"; - maintainers = [ stdenv.lib.maintainers.marius851000 ]; - license = stdenv.lib.licenses.gpl3; + maintainers = [ lib.maintainers.marius851000 ]; + license = lib.licenses.gpl3; }; } diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index 610e89c2fc3..ed2340ca628 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -1,21 +1,15 @@ -{ stdenv, fetchFromGitHub, lib, enableUnfree ? false }: +{ stdenv, fetchFromGitHub, fetchpatch, lib, enableUnfree ? false }: stdenv.mkDerivation rec { pname = "p7zip"; - version = "17.01"; - + version = "17.03"; src = fetchFromGitHub { owner = "szcnick"; repo = pname; rev = "v${version}"; - sha256 = "0gczdmypwbfnxzb11rjrrndjkkb3jzxfby2cchn5j8ysny13mfps"; - } - ; - - patches = [ - ./gcc10.patch - ]; + sha256 = "0zgpa90z5p30jbpqydiig1h8hn41c76n2x26rh8cc92xw72ni33d"; + }; # Default makefile is full of impurities on Darwin. The patch doesn't hurt Linux so I'm leaving it unconditional postPatch = '' @@ -24,7 +18,7 @@ stdenv.mkDerivation rec { # I think this is a typo and should be CXX? Either way let's kill it sed -i '/XX=\/usr/d' makefile.macosx_llvm_64bits - '' + stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + '' + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' substituteInPlace makefile.machine \ --replace 'CC=gcc' 'CC=${stdenv.cc.targetPrefix}gcc' \ --replace 'CXX=g++' 'CXX=${stdenv.cc.targetPrefix}g++' @@ -35,24 +29,25 @@ stdenv.mkDerivation rec { find . -name makefile'*' -exec sed -i '/Rar/d' {} + ''; + makeFlags = [ "DEST_HOME=${placeholder "out"}" ]; + preConfigure = '' - makeFlagsArray=(DEST_HOME=$out) - buildFlags=all3 - '' + stdenv.lib.optionalString stdenv.isDarwin '' - cp makefile.macosx_llvm_64bits makefile.machine -''; + buildFlags=all3 + '' + lib.optionalString stdenv.isDarwin '' + cp makefile.macosx_llvm_64bits makefile.machine + ''; enableParallelBuilding = true; setupHook = ./setup-hook.sh; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; meta = { homepage = "https://github.com/szcnick/p7zip"; description = "A new p7zip fork with additional codecs and improvements (forked from https://sourceforge.net/projects/p7zip/)"; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.raskin ]; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.raskin ]; # RAR code is under non-free UnRAR license, but we remove it license = if enableUnfree then lib.licenses.unfree else lib.licenses.lgpl2Plus; }; diff --git a/pkgs/tools/archivers/p7zip/gcc10.patch b/pkgs/tools/archivers/p7zip/gcc10.patch deleted file mode 100644 index 9361249af93..00000000000 --- a/pkgs/tools/archivers/p7zip/gcc10.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 1b7d2c73f01b2d2b6a3d2d16840e96e92afdcd61 Mon Sep 17 00:00:00 2001 -From: jinfeihan57 <jinfeihan57@gmail.com> -Date: Tue, 9 Jun 2020 16:48:25 +0800 -Subject: [PATCH] gix gcc10 compiler error - ---- - CPP/Windows/ErrorMsg.cpp | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/CPP/Windows/ErrorMsg.cpp b/CPP/Windows/ErrorMsg.cpp -index 99684ae..90a7e20 100644 ---- a/CPP/Windows/ErrorMsg.cpp -+++ b/CPP/Windows/ErrorMsg.cpp -@@ -13,7 +13,7 @@ UString MyFormatMessage(DWORD errorCode) - const char * txt = 0; - AString msg; - -- switch(errorCode) { -+ switch(HRESULT(errorCode)) { - case ERROR_NO_MORE_FILES : txt = "No more files"; break ; - case E_NOTIMPL : txt = "E_NOTIMPL"; break ; - case E_NOINTERFACE : txt = "E_NOINTERFACE"; break ; -@@ -22,7 +22,7 @@ UString MyFormatMessage(DWORD errorCode) - case STG_E_INVALIDFUNCTION : txt = "STG_E_INVALIDFUNCTION"; break ; - case E_OUTOFMEMORY : txt = "E_OUTOFMEMORY"; break ; - case E_INVALIDARG : txt = "E_INVALIDARG"; break ; -- case ERROR_DIRECTORY : txt = "Error Directory"; break ; -+ case ERROR_DIRECTORY : txt = "Error Directory"; break ; - default: - txt = strerror(errorCode); - } -@@ -43,7 +43,7 @@ bool MyFormatMessage(DWORD messageID, CSysString &message) - const char * txt = 0; - AString msg; - -- switch(messageID) { -+ switch(HRESULT(messageID)) { - case ERROR_NO_MORE_FILES : txt = "No more files"; break ; - case E_NOTIMPL : txt = "E_NOTIMPL"; break ; - case E_NOINTERFACE : txt = "E_NOINTERFACE"; break ; diff --git a/pkgs/tools/archivers/pxattr/default.nix b/pkgs/tools/archivers/pxattr/default.nix index 74ad0669d69..79a40e6ca6b 100644 --- a/pkgs/tools/archivers/pxattr/default.nix +++ b/pkgs/tools/archivers/pxattr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gcc }: +{ lib, stdenv, fetchurl, gcc }: stdenv.mkDerivation { name = "pxattr-2.1.0"; @@ -18,8 +18,8 @@ stdenv.mkDerivation { meta = { homepage = "https://www.lesbonscomptes.com/pxattr/index.html"; description = "Provides a single interface to extended file attributes"; - maintainers = [ stdenv.lib.maintainers.vrthra ]; - license = [ stdenv.lib.licenses.mit ]; - platforms = stdenv.lib.platforms.unix; + maintainers = [ lib.maintainers.vrthra ]; + license = [ lib.licenses.mit ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/archivers/rpmextract/default.nix b/pkgs/tools/archivers/rpmextract/default.nix index d4bbbe77a2d..db768a5d14a 100644 --- a/pkgs/tools/archivers/rpmextract/default.nix +++ b/pkgs/tools/archivers/rpmextract/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { buildCommand = '' install -Dm755 $script $out/bin/rpmextract ''; - + script = substituteAll { src = ./rpmextract.sh; isExecutable = true; diff --git a/pkgs/tools/archivers/runzip/default.nix b/pkgs/tools/archivers/runzip/default.nix index b9eaf3dba65..c251cfe0dc3 100644 --- a/pkgs/tools/archivers/runzip/default.nix +++ b/pkgs/tools/archivers/runzip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libzip, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, libzip, autoreconfHook }: stdenv.mkDerivation rec { version = "1.4"; @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { meta = { description = "A tool to convert filename encoding inside a ZIP archive"; - license = stdenv.lib.licenses.bsd2 ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.bsd2 ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/archivers/s-tar/default.nix b/pkgs/tools/archivers/s-tar/default.nix index 30ff2bc36a2..dd3fb846288 100644 --- a/pkgs/tools/archivers/s-tar/default.nix +++ b/pkgs/tools/archivers/s-tar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "s-tar"; @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { Note that unpacking tar archives may be a security risk because star may overwrite existing files. ''; homepage = "http://cdrtools.sourceforge.net/private/star.html"; - license = stdenv.lib.licenses.cddl; - maintainers = [ stdenv.lib.maintainers.wucke13 ]; + license = lib.licenses.cddl; + maintainers = [ lib.maintainers.wucke13 ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/tools/archivers/snzip/default.nix b/pkgs/tools/archivers/snzip/default.nix index 1f4a0f12ff2..f3a94006873 100644 --- a/pkgs/tools/archivers/snzip/default.nix +++ b/pkgs/tools/archivers/snzip/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , autoreconfHook -, pkgconfig +, pkg-config , snappy }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ snappy ]; # We don't use a release tarball so we don't have a `./configure` script to # run. That's why we generate it. - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; meta = with lib; { description = "A compression/decompression tool based on snappy"; diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/default.nix index b3b150637d6..e74637ca25e 100644 --- a/pkgs/tools/archivers/unzip/default.nix +++ b/pkgs/tools/archivers/unzip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , bzip2 , enableNLS ? false, libnatspec }: @@ -41,7 +41,7 @@ stdenv.mkDerivation { name = "CVE-2019-13232-3.patch"; sha256 = "1jvs7dkdqs97qnsqc6hk088alhv8j4c638k65dbib9chh40jd7pf"; }) - ] ++ stdenv.lib.optional enableNLS + ] ++ lib.optional enableNLS (fetchurl { url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-arch/unzip/files/unzip-6.0-natspec.patch?revision=1.1"; name = "unzip-6.0-natspec.patch"; @@ -49,11 +49,11 @@ stdenv.mkDerivation { }); nativeBuildInputs = [ bzip2 ]; - buildInputs = [ bzip2 ] ++ stdenv.lib.optional enableNLS libnatspec; + buildInputs = [ bzip2 ] ++ lib.optional enableNLS libnatspec; makefile = "unix/Makefile"; - NIX_LDFLAGS = "-lbz2" + stdenv.lib.optionalString enableNLS " -lnatspec"; + NIX_LDFLAGS = "-lbz2" + lib.optionalString enableNLS " -lnatspec"; buildFlags = [ "generic" @@ -66,7 +66,7 @@ stdenv.mkDerivation { ''; installFlags = [ - "prefix=${placeholder ''out''}" + "prefix=${placeholder "out"}" ]; setupHook = ./setup-hook.sh; @@ -74,7 +74,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.info-zip.org"; description = "An extraction utility for archives compressed in .zip format"; - license = stdenv.lib.licenses.free; # http://www.info-zip.org/license.html - platforms = stdenv.lib.platforms.all; + license = lib.licenses.free; # http://www.info-zip.org/license.html + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/archivers/wimlib/default.nix b/pkgs/tools/archivers/wimlib/default.nix index 16e93470e89..4f397b9bf55 100644 --- a/pkgs/tools/archivers/wimlib/default.nix +++ b/pkgs/tools/archivers/wimlib/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, makeWrapper -, pkgconfig, openssl, fuse, libxml2 +, pkg-config, openssl, fuse, libxml2 , cabextract ? null , cdrkit ? null , mtools ? null @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { version = "1.13.2"; pname = "wimlib"; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ openssl fuse libxml2 ntfs3g ]; src = fetchurl { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; postInstall = let - path = stdenv.lib.makeBinPath [ cabextract cdrkit mtools ntfs3g syslinux ]; + path = lib.makeBinPath [ cabextract cdrkit mtools ntfs3g syslinux ]; in '' for prog in $out/bin/*; do wrapProgram $prog --prefix PATH : ${path} diff --git a/pkgs/tools/archivers/xarchive/default.nix b/pkgs/tools/archivers/xarchive/default.nix index 53da140b7fd..d28e9f31b1a 100644 --- a/pkgs/tools/archivers/xarchive/default.nix +++ b/pkgs/tools/archivers/xarchive/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk2, pkgconfig }: +{ lib, stdenv, fetchurl, gtk2, pkg-config }: stdenv.mkDerivation rec { version = "0.2.8-6"; @@ -9,15 +9,15 @@ stdenv.mkDerivation rec { sha256 = "0chfim7z27s00naf43a61zsngwhvim14mg1p3csbv5i3f6m50xx4"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 ]; hardeningDisable = [ "format" ]; meta = { 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; + maintainers = [ lib.maintainers.domenkozar ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/archivers/xarchiver/default.nix b/pkgs/tools/archivers/xarchiver/default.nix index 022c05a4c6f..815bf823d58 100644 --- a/pkgs/tools/archivers/xarchiver/default.nix +++ b/pkgs/tools/archivers/xarchiver/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk3, pkgconfig, intltool, libxslt, makeWrapper, +{ lib, stdenv, fetchFromGitHub, gtk3, pkg-config, intltool, libxslt, makeWrapper, coreutils, zip, unzip, p7zip, unrar, gnutar, bzip2, gzip, lhasa, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -12,19 +12,19 @@ stdenv.mkDerivation rec { sha256 = "1iklwgykgymrwcc5p1cdbh91v0ih1m58s3w9ndl5kyd44bwlb7px"; }; - nativeBuildInputs = [ pkgconfig makeWrapper wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config makeWrapper wrapGAppsHook ]; buildInputs = [ gtk3 intltool libxslt ]; postFixup = '' wrapProgram $out/bin/xarchiver \ - --prefix PATH : ${stdenv.lib.makeBinPath [ zip unzip p7zip unrar gnutar bzip2 gzip lhasa coreutils ]} + --prefix PATH : ${lib.makeBinPath [ zip unzip p7zip unrar gnutar bzip2 gzip lhasa coreutils ]} ''; meta = { 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; - platforms = stdenv.lib.platforms.all; + maintainers = [ lib.maintainers.domenkozar ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix index 74f1982a425..58c748fe4e8 100644 --- a/pkgs/tools/archivers/zip/default.nix +++ b/pkgs/tools/archivers/zip/default.nix @@ -21,14 +21,14 @@ stdenv.mkDerivation { makefile = "unix/Makefile"; buildFlags = if stdenv.isCygwin then [ "cygwin" ] else [ "generic" ]; installFlags = [ - "prefix=${placeholder ''out''}" + "prefix=${placeholder "out"}" "INSTALL=cp" ]; patches = if (enableNLS && !stdenv.isCygwin) then [ ./natspec-gentoo.patch.bz2 ] else []; - buildInputs = stdenv.lib.optional enableNLS libnatspec - ++ stdenv.lib.optional stdenv.isCygwin libiconv; + buildInputs = lib.optional enableNLS libnatspec + ++ lib.optional stdenv.isCygwin libiconv; meta = with lib; { description = "Compressor/archiver for creating and modifying zipfiles"; diff --git a/pkgs/tools/archivers/zpaq/zpaqd.nix b/pkgs/tools/archivers/zpaq/zpaqd.nix index 6abad5a17be..1ff204babc1 100644 --- a/pkgs/tools/archivers/zpaq/zpaqd.nix +++ b/pkgs/tools/archivers/zpaq/zpaqd.nix @@ -11,9 +11,9 @@ let sha256="0868lynb45lm79yvx5f10lj5h6bfv0yck8whcls2j080vmk3n7rk"; }; - compileFlags = stdenv.lib.concatStringsSep " " ([ "-O3" "-DNDEBUG" ] - ++ stdenv.lib.optional (stdenv.hostPlatform.isUnix) "-Dunix -pthread" - ++ stdenv.lib.optional (!stdenv.hostPlatform.isx86) "-DNOJIT"); + compileFlags = lib.concatStringsSep " " ([ "-O3" "-DNDEBUG" ] + ++ lib.optional (stdenv.hostPlatform.isUnix) "-Dunix -pthread" + ++ lib.optional (!stdenv.hostPlatform.isx86) "-DNOJIT"); in stdenv.mkDerivation { inherit (s) name version; diff --git a/pkgs/tools/audio/abcm2ps/default.nix b/pkgs/tools/audio/abcm2ps/default.nix index 5ecc1d1331c..08f8e03885e 100644 --- a/pkgs/tools/audio/abcm2ps/default.nix +++ b/pkgs/tools/audio/abcm2ps/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, which, docutils, freetype, pango }: +{ lib, stdenv, fetchFromGitHub, pkg-config, which, docutils, freetype, pango }: stdenv.mkDerivation rec { pname = "abcm2ps"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { "CC=${stdenv.cc}/bin/cc" ]; - nativeBuildInputs = [ which pkgconfig docutils ]; + nativeBuildInputs = [ which pkg-config docutils ]; buildInputs = [ freetype pango ]; diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index b3f45410f42..1478aa8c1e3 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2020.11.07"; + version = "2021.01.25"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - sha256 = "0zwzgqy1wa7yd2cm6spq11lw21mdn92lx8qzrxpk9kxcl03mv5jd"; + sha256 = "1c2jx03ssm9yyv6rgr5wfv88ivfgdgq3889yaghjyvllm3nv9380"; }; # There is also a file called "makefile" which seems to be preferred by the standard build phase diff --git a/pkgs/tools/audio/acoustid-fingerprinter/default.nix b/pkgs/tools/audio/acoustid-fingerprinter/default.nix index 3c8f43772b5..5703ca77bd0 100644 --- a/pkgs/tools/audio/acoustid-fingerprinter/default.nix +++ b/pkgs/tools/audio/acoustid-fingerprinter/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ qt4 taglib chromaprint ffmpeg ]; - cmakeFlags = [ "-DTAGLIB_MIN_VERSION=${stdenv.lib.getVersion taglib}" ]; + cmakeFlags = [ "-DTAGLIB_MIN_VERSION=${lib.getVersion taglib}" ]; patches = [ (fetchpatch { @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://acoustid.org/fingerprinter"; description = "Audio fingerprinting tool using chromaprint"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; maintainers = with maintainers; [ ehmry ]; platforms = with platforms; linux; }; diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index f72692c845c..d531b22738b 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -2,6 +2,7 @@ , pythonPackages, imagemagick, gobject-introspection, gst_all_1 , runtimeShell , fetchpatch +, unstableGitUpdater # Attributes needed for tests of the external plugins , callPackage, beets @@ -132,13 +133,13 @@ in pythonPackages.buildPythonApplication rec { # unstable does not require bs1770gain[2]. # [1]: https://discourse.beets.io/t/forming-a-beets-core-team/639 # [2]: https://github.com/NixOS/nixpkgs/pull/90504 - version = "unstable-2020-12-22"; + version = "unstable-2021-01-29"; src = fetchFromGitHub { owner = "beetbox"; repo = "beets"; - rev = "53dcb24d10788897f20c341774b474808ec2c0b6"; - sha256 = "sha256-P++NA13T2TRHW3Se10np8BSe/WRBYAKRte5xKoHKW50="; + rev = "04ea754d00e2873ae9aa2d9e07c5cefd790eaee2"; + sha256 = "sha256-BIa3hnOsBxThbA2WCE4q9eaFNtObr3erZBBqobVOSiQ="; }; propagatedBuildInputs = [ @@ -290,6 +291,7 @@ in pythonPackages.buildPythonApplication rec { passthru = { externalPlugins = plugins; + updateScript = unstableGitUpdater { url = "https://github.com/beetbox/beets"; }; }; meta = { diff --git a/pkgs/tools/audio/beets/plugins/alternatives.nix b/pkgs/tools/audio/beets/plugins/alternatives.nix index fdad7dd8984..793611699ec 100644 --- a/pkgs/tools/audio/beets/plugins/alternatives.nix +++ b/pkgs/tools/audio/beets/plugins/alternatives.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, beets, pythonPackages }: +{ fetchFromGitHub, beets, pythonPackages }: pythonPackages.buildPythonApplication rec { pname = "beets-alternatives"; @@ -19,7 +19,7 @@ pythonPackages.buildPythonApplication rec { meta = { description = "Beets plugin to manage external files"; homepage = "https://github.com/geigerzaehler/beets-alternatives"; - maintainers = [ stdenv.lib.maintainers.aszlig ]; - license = stdenv.lib.licenses.mit; + maintainers = [ lib.maintainers.aszlig ]; + license = lib.licenses.mit; }; } diff --git a/pkgs/tools/audio/beets/plugins/check.nix b/pkgs/tools/audio/beets/plugins/check.nix index 545e6d7cf2c..441dcfe579f 100644 --- a/pkgs/tools/audio/beets/plugins/check.nix +++ b/pkgs/tools/audio/beets/plugins/check.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, beets, pythonPackages, flac, liboggz, mp3val }: +{ lib, fetchFromGitHub, beets, pythonPackages, flac, liboggz, mp3val }: pythonPackages.buildPythonApplication rec { name = "beets-check"; diff --git a/pkgs/tools/audio/beets/plugins/copyartifacts.nix b/pkgs/tools/audio/beets/plugins/copyartifacts.nix index 9432cb9bd0b..5af52066caa 100644 --- a/pkgs/tools/audio/beets/plugins/copyartifacts.nix +++ b/pkgs/tools/audio/beets/plugins/copyartifacts.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, beets, pythonPackages, glibcLocales }: +{ fetchFromGitHub, beets, pythonPackages, glibcLocales }: pythonPackages.buildPythonApplication { name = "beets-copyartifacts"; @@ -28,6 +28,6 @@ pythonPackages.buildPythonApplication { meta = { description = "Beets plugin to move non-music files during the import process"; homepage = "https://github.com/sbarakat/beets-copyartifacts"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; } diff --git a/pkgs/tools/audio/beets/plugins/extrafiles.nix b/pkgs/tools/audio/beets/plugins/extrafiles.nix index 7d0e446ce60..0ab6b3e5414 100644 --- a/pkgs/tools/audio/beets/plugins/extrafiles.nix +++ b/pkgs/tools/audio/beets/plugins/extrafiles.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, beets, pythonPackages }: +{ lib, fetchFromGitHub, beets, pythonPackages }: pythonPackages.buildPythonApplication rec { pname = "beets-extrafiles"; @@ -25,6 +25,6 @@ pythonPackages.buildPythonApplication rec { meta = { homepage = "https://github.com/Holzhaus/beets-extrafiles"; description = "A plugin for beets that copies additional files and directories during the import process"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; } diff --git a/pkgs/tools/audio/bpm-tools/default.nix b/pkgs/tools/audio/bpm-tools/default.nix index afd5785f3cf..6e7236b1008 100644 --- a/pkgs/tools/audio/bpm-tools/default.nix +++ b/pkgs/tools/audio/bpm-tools/default.nix @@ -1,16 +1,16 @@ -{ - lib, stdenv, - fetchurl, - gnuplot, - sox, - flac, - id3v2, - vorbis-tools, - makeWrapper +{ stdenv +, lib +, fetchurl +, gnuplot +, sox +, flac +, id3v2 +, vorbis-tools +, makeWrapper }: let - path = stdenv.lib.makeBinPath [ gnuplot sox flac id3v2 vorbis-tools ]; + path = lib.makeBinPath [ gnuplot sox flac id3v2 vorbis-tools ]; in stdenv.mkDerivation rec { pname = "bpm-tools"; diff --git a/pkgs/tools/audio/darkice/default.nix b/pkgs/tools/audio/darkice/default.nix index 89b93b02865..f7d74dc615c 100644 --- a/pkgs/tools/audio/darkice/default.nix +++ b/pkgs/tools/audio/darkice/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , libjack2, alsaLib, libpulseaudio , faac, lame, libogg, libopus, libvorbis, libsamplerate }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1rlxds7ssq7nk2in4s46xws7xy9ylxsqgcz85hxjgh17lsm0y39c"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libopus libvorbis libogg libpulseaudio alsaLib libsamplerate libjack2 lame ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://darkice.org/"; description = "Live audio streamer"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ ikervagyok fpletz ]; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ ikervagyok fpletz ]; }; } diff --git a/pkgs/tools/audio/ezstream/default.nix b/pkgs/tools/audio/ezstream/default.nix index 0befbaceb01..ee85f1aabd3 100644 --- a/pkgs/tools/audio/ezstream/default.nix +++ b/pkgs/tools/audio/ezstream/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libiconv, libshout, taglib, libxml2, pkgconfig }: +{ lib, stdenv, fetchurl, libiconv, libshout, taglib, libxml2, pkg-config }: stdenv.mkDerivation rec { pname = "ezstream"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libiconv libshout taglib libxml2 ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; doCheck = true; diff --git a/pkgs/tools/audio/glyr/default.nix b/pkgs/tools/audio/glyr/default.nix index c50913eb22a..60585c3b354 100644 --- a/pkgs/tools/audio/glyr/default.nix +++ b/pkgs/tools/audio/glyr/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake -, curl, glib, sqlite, pkgconfig }: +, curl, glib, sqlite, pkg-config }: stdenv.mkDerivation rec { version = "1.0.10"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1miwbqzkhg0v3zysrwh60pj9sv6ci4lzq2vq2hhc6pc6hdyh8xyr"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ sqlite glib curl ]; meta = with lib; { diff --git a/pkgs/tools/audio/gvolicon/default.nix b/pkgs/tools/audio/gvolicon/default.nix index 5190699be08..312dc62d575 100644 --- a/pkgs/tools/audio/gvolicon/default.nix +++ b/pkgs/tools/audio/gvolicon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, alsaLib, pkgconfig, fetchgit, gtk3, gnome3, gdk-pixbuf, librsvg, wrapGAppsHook }: +{ lib, stdenv, makeWrapper, alsaLib, pkg-config, fetchgit, gtk3, gnome3, gdk-pixbuf, librsvg, wrapGAppsHook }: stdenv.mkDerivation { name = "gvolicon-2014-04-28"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1sr9wyy7w898vq63yd003yp3k66hd4vm8b0qsm9zvmwmpiz4wvln"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ makeWrapper alsaLib gtk3 gdk-pixbuf gnome3.adwaita-icon-theme librsvg wrapGAppsHook @@ -21,8 +21,8 @@ stdenv.mkDerivation { meta = { description = "A simple and lightweight volume icon that sits in your system tray"; homepage = "https://github.com/Unia/gvolicon"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = [ stdenv.lib.maintainers.bennofs ]; + platforms = lib.platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.bennofs ]; }; } diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/pkgs/tools/audio/liquidsoap/full.nix index 84750bb2358..a4411b6e0f7 100644 --- a/pkgs/tools/audio/liquidsoap/full.nix +++ b/pkgs/tools/audio/liquidsoap/full.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, makeWrapper, fetchurl, which, pkgconfig +{ lib, stdenv, makeWrapper, fetchurl, which, pkg-config , ocamlPackages , libao, portaudio, alsaLib, libpulseaudio, libjack2 , libsamplerate, libmad, taglib, lame, libogg @@ -49,7 +49,7 @@ stdenv.mkDerivation { configureFlags = [ "--localstatedir=/var" ]; - nativeBuildInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = [ which ocamlPackages.ocaml ocamlPackages.findlib libao portaudio alsaLib libpulseaudio libjack2 diff --git a/pkgs/tools/audio/mididings/default.nix b/pkgs/tools/audio/mididings/default.nix index ccaa0141231..d5f78ada91c 100644 --- a/pkgs/tools/audio/mididings/default.nix +++ b/pkgs/tools/audio/mididings/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pythonPackages, fetchFromGitHub, pkg-config, glib, alsaLib, libjack2 }: +{ lib, pythonPackages, fetchFromGitHub, pkg-config, glib, alsaLib, libjack2 }: pythonPackages.buildPythonApplication { version = "2015-11-17"; @@ -23,7 +23,7 @@ pythonPackages.buildPythonApplication { # so mididings knows where to look for config files ++ [ pyxdg ]; - preBuild = with stdenv.lib.versions; '' + preBuild = with lib.versions; '' substituteInPlace setup.py \ --replace boost_python "boost_python${major pythonPackages.python.version}${minor pythonPackages.python.version}" ''; diff --git a/pkgs/tools/audio/mpd-mpris/default.nix b/pkgs/tools/audio/mpd-mpris/default.nix index 801058e0496..af4000dfa44 100644 --- a/pkgs/tools/audio/mpd-mpris/default.nix +++ b/pkgs/tools/audio/mpd-mpris/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "mpd-mpris"; diff --git a/pkgs/tools/audio/mpdas/default.nix b/pkgs/tools/audio/mpdas/default.nix index d4be0550e18..255d28b62b1 100644 --- a/pkgs/tools/audio/mpdas/default.nix +++ b/pkgs/tools/audio/mpdas/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, mpd_clientlib, curl }: +{ lib, stdenv, fetchFromGitHub, pkg-config, mpd_clientlib, curl }: stdenv.mkDerivation rec { pname = "mpdas"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0fcqc4w6iwbi1n3cllcgj0k61zffhqkbr8668myxap21m35x8y1r"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ mpd_clientlib curl ]; diff --git a/pkgs/tools/audio/mpdcron/default.nix b/pkgs/tools/audio/mpdcron/default.nix index 13303ef58e1..1fa0d155a3d 100644 --- a/pkgs/tools/audio/mpdcron/default.nix +++ b/pkgs/tools/audio/mpdcron/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, glib, libdaemon +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, glib, libdaemon , mpd_clientlib, curl, sqlite, bundlerEnv, libnotify, pandoc }: let @@ -26,7 +26,7 @@ in stdenv.mkDerivation { }; buildInputs = - [ autoconf automake libtool pkgconfig glib libdaemon pandoc + [ autoconf automake libtool pkg-config glib libdaemon pandoc mpd_clientlib curl sqlite gemEnv.wrappedRuby libnotify ]; preConfigure = '' diff --git a/pkgs/tools/audio/mpdcron/gemset.nix b/pkgs/tools/audio/mpdcron/gemset.nix index 025eb96b065..836878c9d88 100644 --- a/pkgs/tools/audio/mpdcron/gemset.nix +++ b/pkgs/tools/audio/mpdcron/gemset.nix @@ -20,4 +20,4 @@ }; version = "1.10.3"; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/audio/mpdris2/default.nix b/pkgs/tools/audio/mpdris2/default.nix index 30b0d90f562..4cd3921fb55 100644 --- a/pkgs/tools/audio/mpdris2/default.nix +++ b/pkgs/tools/audio/mpdris2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , autoreconfHook , fetchFromGitHub , glib diff --git a/pkgs/tools/audio/mpris-scrobbler/default.nix b/pkgs/tools/audio/mpris-scrobbler/default.nix index 911dbf75202..07248213213 100644 --- a/pkgs/tools/audio/mpris-scrobbler/default.nix +++ b/pkgs/tools/audio/mpris-scrobbler/default.nix @@ -10,7 +10,7 @@ , pkg-config , scdoc , json_c -, xdg_utils +, xdg-utils }: stdenv.mkDerivation rec { @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace src/signon.c \ - --replace "/usr/bin/xdg-open" "${xdg_utils}/bin/xdg-open" + --replace "/usr/bin/xdg-open" "${xdg-utils}/bin/xdg-open" ''; nativeBuildInputs = [ diff --git a/pkgs/tools/audio/opl3bankeditor/default.nix b/pkgs/tools/audio/opl3bankeditor/default.nix index c79204cffa2..48f553d960d 100644 --- a/pkgs/tools/audio/opl3bankeditor/default.nix +++ b/pkgs/tools/audio/opl3bankeditor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, qttools, alsaLib }: +{ lib, mkDerivation, fetchFromGitHub, cmake, qttools, alsaLib }: mkDerivation rec { version = "1.5.1"; diff --git a/pkgs/tools/audio/pa-applet/default.nix b/pkgs/tools/audio/pa-applet/default.nix index 89761cd0d4b..358e662ca1e 100644 --- a/pkgs/tools/audio/pa-applet/default.nix +++ b/pkgs/tools/audio/pa-applet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, libpulseaudio, pkgconfig, gtk3, glibc, autoconf, automake, libnotify, libX11, xf86inputevdev }: +{ lib, stdenv, fetchgit, libpulseaudio, pkg-config, gtk3, glibc, autoconf, automake, libnotify, libX11, xf86inputevdev }: stdenv.mkDerivation { name = "pa-applet-2012-04-11"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1242sdri67wnm1cd0hr40mxarkh7qs7mb9n2m0g9dbz0f4axj6wa"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk3 libpulseaudio glibc automake autoconf libnotify libX11 xf86inputevdev ]; @@ -21,8 +21,7 @@ stdenv.mkDerivation { # work around a problem related to gtk3 updates NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; - postInstall = '' - ''; + postInstall = ""; meta = with lib; { description = ""; diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix index ba61c4ad9f9..4a2030d7445 100644 --- a/pkgs/tools/audio/pasystray/default.nix +++ b/pkgs/tools/audio/pasystray/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchpatch, fetchFromGitHub, pkgconfig, autoreconfHook, wrapGAppsHook +{ lib, stdenv, fetchpatch, fetchFromGitHub, pkg-config, autoreconfHook, wrapGAppsHook , gnome3, avahi, gtk3, libayatana-appindicator-gtk3, libnotify, libpulseaudio , xlibsWrapper, gsettings-desktop-schemas }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkgconfig autoreconfHook wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook wrapGAppsHook ]; buildInputs = [ gnome3.adwaita-icon-theme avahi gtk3 libayatana-appindicator-gtk3 libnotify libpulseaudio xlibsWrapper diff --git a/pkgs/tools/audio/picotts/default.nix b/pkgs/tools/audio/picotts/default.nix index 5b7ab80d860..03f446dc215 100644 --- a/pkgs/tools/audio/picotts/default.nix +++ b/pkgs/tools/audio/picotts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, popt }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, popt }: stdenv.mkDerivation { name = "picotts-unstable-2018-10-19"; @@ -15,9 +15,9 @@ stdenv.mkDerivation { meta = { description = "Text to speech voice sinthesizer from SVox"; homepage = "https://github.com/naggety/picotts"; - license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.canndrew ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.canndrew ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/audio/playerctl/default.nix b/pkgs/tools/audio/playerctl/default.nix index 7c583f4f1f9..15ebb93e4e8 100644 --- a/pkgs/tools/audio/playerctl/default.nix +++ b/pkgs/tools/audio/playerctl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, meson, ninja, fetchFromGitHub, glib, pkgconfig, gtk-doc, docbook_xsl, gobject-introspection }: +{ lib, stdenv, meson, ninja, fetchFromGitHub, glib, pkg-config, gtk-doc, docbook_xsl, gobject-introspection }: stdenv.mkDerivation rec { pname = "playerctl"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "00z5c6amlxd3q42l7x8i0ngl627dxglgg5vikbbhjp9ms34xbxdn"; }; - nativeBuildInputs = [ meson ninja pkgconfig gtk-doc docbook_xsl gobject-introspection ]; + nativeBuildInputs = [ meson ninja pkg-config gtk-doc docbook_xsl gobject-introspection ]; buildInputs = [ glib ]; mesonFlags = [ "-Dbash-completions=true" ]; diff --git a/pkgs/tools/audio/pnmixer/default.nix b/pkgs/tools/audio/pnmixer/default.nix index f16a7764e6c..3aca8e8f619 100644 --- a/pkgs/tools/audio/pnmixer/default.nix +++ b/pkgs/tools/audio/pnmixer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, gettext, alsaLib, gtk3, glib, libnotify, libX11, pcre }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, gettext, alsaLib, gtk3, glib, libnotify, libX11, pcre }: stdenv.mkDerivation rec { pname = "pnmixer"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0416pa933ddf4b7ph9zxhk5jppkk7ppcq1aqph6xsrfnka4yb148"; }; - nativeBuildInputs = [ cmake pkgconfig gettext ]; + nativeBuildInputs = [ cmake pkg-config gettext ]; buildInputs = [ alsaLib gtk3 glib libnotify libX11 pcre ]; diff --git a/pkgs/tools/audio/tts/default.nix b/pkgs/tools/audio/tts/default.nix index 770e898f2ee..325039d6865 100644 --- a/pkgs/tools/audio/tts/default.nix +++ b/pkgs/tools/audio/tts/default.nix @@ -1,42 +1,13 @@ { lib , python3Packages , fetchFromGitHub -, fetchpatch , python3 }: -# -# Tested in the following setup: -# -# TTS model: -# Tacotron2 DDC -# https://drive.google.com/drive/folders/1Y_0PcB7W6apQChXtbt6v3fAiNwVf4ER5 -# Vocoder model: -# Multi-Band MelGAN -# https://drive.google.com/drive/folders/1XeRT0q4zm5gjERJqwmX5w84pMrD00cKD -# -# Arrange /tmp/tts like this: -# scale_stats.npy -# tts -# tts/checkpoint_130000.pth.tar -# tts/checkpoint_130000_tf.pkl -# tts/checkpoint_130000_tf_2.3rc0.tflite -# tts/config.json -# tts/scale_stats.npy -# vocoder -# vocoder/checkpoint_1450000.pth.tar -# vocoder/checkpoint_2750000_tf.pkl -# vocoder/checkpoint_2750000_tf_v2.3rc.tflite -# vocoder/config.json -# vocoder/scale_stats.npy -# -# Start like this: -# cd /tmp/tts -# tts-server \ -# --vocoder_config ./tts/vocoder/config.json \ -# --vocoder_checkpoint ./tts/vocoder/checkpoint_1450000.pth.tar \ -# --tts_config ./tts/config.json \ -# --tts_checkpoint ./tts/checkpoint_130000.pth.tar +# USAGE: +# $ tts-server --list_models +# # pick your favorite vocoder/tts model +# $ tts-server --model_name tts_models/en/ljspeech/glow-tts --vocoder_name vocoder_models/universal/libri-tts/fullband-melgan # # For now, for deployment check the systemd unit in the pull request: # https://github.com/NixOS/nixpkgs/pull/103851#issue-521121136 @@ -47,35 +18,31 @@ python3Packages.buildPythonApplication rec { # until https://github.com/mozilla/TTS/issues/424 is resolved # we treat released models as released versions: # https://github.com/mozilla/TTS/wiki/Released-Models - version = "unstable-2020-06-17"; + version = "0.0.9"; src = fetchFromGitHub { owner = "mozilla"; repo = "TTS"; - rev = "72a6ac54c8cfaa407fc64b660248c6a788bdd381"; - sha256 = "1wvs264if9n5xzwi7ryxvwj1j513szp6sfj6n587xk1fphi0921f"; + rev = "df5899daf4ba4ec89544edf94f9c2e105c544461"; + sha256 = "sha256-lklG8DqG04LKJY93z2axeYhW8gtpbRG41o9ow2gJjuA="; }; - patches = [ - (fetchpatch { - url = "https://github.com/mozilla/TTS/commit/36fee428b9f3f4ec1914b090a2ec9d785314d9aa.patch"; - sha256 = "sha256-pP0NxiyrsvQ0A7GEleTdT87XO08o7WxPEpb6Bmj66dc="; - }) - ]; - preBuild = '' # numba jit tries to write to its cache directory export HOME=$TMPDIR - sed -i -e 's!tensorflow==.*!tensorflow!' requirements.txt + # we only support pytorch models right now + sed -i -e '/tensorflow/d' requirements.txt + sed -i -e 's!librosa==[^"]*!librosa!' requirements.txt setup.py sed -i -e 's!unidecode==[^"]*!unidecode!' requirements.txt setup.py sed -i -e 's!bokeh==[^"]*!bokeh!' requirements.txt setup.py sed -i -e 's!numba==[^"]*!numba!' requirements.txt setup.py # Not required for building/installation but for their development/ci workflow - sed -i -e '/pylint/d' requirements.txt setup.py + sed -i -e '/pylint/d' requirements.txt sed -i -e '/cardboardlint/d' requirements.txt setup.py ''; + nativeBuildInputs = [ python3Packages.cython ]; propagatedBuildInputs = with python3Packages; [ matplotlib @@ -88,17 +55,23 @@ python3Packages.buildPythonApplication rec { tqdm librosa unidecode + umap-learn phonemizer tensorboardx fuzzywuzzy - tensorflow_2 inflect gdown pysbd + pyworld ]; postInstall = '' cp -r TTS/server/templates/ $out/${python3.sitePackages}/TTS/server + # cython modules are not installed for some reasons + ( + cd TTS/tts/layers/glow_tts/monotonic_align + ${python3Packages.python.interpreter} setup.py install --prefix=$out + ) ''; checkInputs = with python3Packages; [ pytestCheckHook ]; @@ -114,6 +87,18 @@ python3Packages.buildPythonApplication rec { "test_parametrized_gan_dataset" ]; + preCheck = '' + # use the installed TTS in $PYTHONPATH instead of the one from source to also have cython modules. + mv TTS{,.old} + ''; + + pytestFlagsArray = [ + # requires tensorflow + "--ignore=tests/test_tacotron2_tf_model.py" + "--ignore=tests/test_vocoder_tf_melgan_generator.py" + "--ignore=tests/test_vocoder_tf_pqmf.py" + ]; + meta = with lib; { homepage = "https://github.com/mozilla/TTS"; description = "Deep learning for Text to Speech"; diff --git a/pkgs/tools/audio/video2midi/default.nix b/pkgs/tools/audio/video2midi/default.nix index 3ce76fb61fa..4eafd7f52e1 100644 --- a/pkgs/tools/audio/video2midi/default.nix +++ b/pkgs/tools/audio/video2midi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pythonPackages, opencv3 }: +{ lib, fetchFromGitHub, pythonPackages, opencv3 }: let opencv3_ = pythonPackages.toPythonModule (opencv3.override { diff --git a/pkgs/tools/audio/volctl/default.nix b/pkgs/tools/audio/volctl/default.nix index 06b6079bde2..d05257f1d08 100644 --- a/pkgs/tools/audio/volctl/default.nix +++ b/pkgs/tools/audio/volctl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub, wrapGAppsHook, gobject-introspection, libpulseaudio, glib, gtk3, pango, xorg }: +{ lib, python3Packages, fetchFromGitHub, wrapGAppsHook, gobject-introspection, libpulseaudio, glib, gtk3, pango, xorg }: python3Packages.buildPythonApplication rec { pname = "volctl"; diff --git a/pkgs/tools/audio/volumeicon/default.nix b/pkgs/tools/audio/volumeicon/default.nix index 3628433121e..79dc5a356be 100644 --- a/pkgs/tools/audio/volumeicon/default.nix +++ b/pkgs/tools/audio/volumeicon/default.nix @@ -1,4 +1,4 @@ -{ pkgs, fetchurl, lib, stdenv, gtk3, pkgconfig, intltool, alsaLib }: +{ pkgs, fetchurl, lib, stdenv, gtk3, pkg-config, intltool, alsaLib }: stdenv.mkDerivation { pname = "volumeicon"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "182xl2w8syv6ky2h2bc9imc6ap8pzh0p7rp63hh8nw0xm38c3f14"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk3 intltool alsaLib ]; meta = with lib; { diff --git a/pkgs/tools/backup/automysqlbackup/default.nix b/pkgs/tools/backup/automysqlbackup/default.nix index b3b6e40997c..169ef7309fe 100644 --- a/pkgs/tools/backup/automysqlbackup/default.nix +++ b/pkgs/tools/backup/automysqlbackup/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { cp automysqlbackup $out/bin/ cp automysqlbackup.conf $out/etc/ - wrapProgram $out/bin/automysqlbackup --prefix PATH : ${stdenv.lib.makeBinPath [ mysql mailutils pbzip2 pigz bzip2 gzip ]} + wrapProgram $out/bin/automysqlbackup --prefix PATH : ${lib.makeBinPath [ mysql mailutils pbzip2 pigz bzip2 gzip ]} ''; meta = with lib; { diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix index 23036596c97..3d9772de404 100644 --- a/pkgs/tools/backup/bacula/default.nix +++ b/pkgs/tools/backup/bacula/default.nix @@ -12,12 +12,12 @@ stdenv.mkDerivation rec { }; buildInputs = [ postgresql sqlite zlib ncurses openssl readline ] - ++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation IOKit ] # acl relies on attr, which I can't get to build on darwin - ++ stdenv.lib.optional (!stdenv.isDarwin) acl; + ++ lib.optional (!stdenv.isDarwin) acl; configureFlags = [ "--with-sqlite3=${sqlite.dev}" @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { "--with-logdir=/var/log/bacula" "--with-working-dir=/var/lib/bacula" "--mandir=\${out}/share/man" - ] ++ stdenv.lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "ac_cv_func_setpgrp_void=yes"; + ] ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "ac_cv_func_setpgrp_void=yes"; installFlags = [ "logdir=\${out}/logdir" diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix index 90fb2f4c4a4..e2ccdb132c9 100644 --- a/pkgs/tools/backup/bareos/default.nix +++ b/pkgs/tools/backup/bareos/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, nettools, gettext, flex +{ lib, stdenv, fetchFromGitHub, pkg-config, nettools, gettext, flex , readline ? null, openssl ? null, python2 ? null, ncurses ? null, rocksdb , sqlite ? null, postgresql ? null, libmysqlclient ? null, zlib ? null, lzo ? null , jansson ? null, acl ? null, glusterfs ? null, libceph ? null, libcap ? null @@ -6,7 +6,7 @@ assert sqlite != null || postgresql != null || libmysqlclient != null; -with stdenv.lib; +with lib; let withGlusterfs = "\${with_glusterfs_directory}"; in @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { sha256 = "1awf5i4mw2nfd7z0dmqnywapnx9nz6xwqv8rxp0y2mnrhzdpbrbz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ nettools gettext readline openssl python2 flex ncurses sqlite postgresql libmysqlclient zlib lzo jansson acl glusterfs libceph libcap rocksdb diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index 121900f76f5..4b8908448f6 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec { ]; buildInputs = [ libb2 lz4 zstd openssl python3.pkgs.setuptools_scm - ] ++ stdenv.lib.optionals stdenv.isLinux [ acl ]; + ] ++ lib.optionals stdenv.isLinux [ acl ]; propagatedBuildInputs = with python3.pkgs; [ cython llfuse ]; diff --git a/pkgs/tools/backup/btar/default.nix b/pkgs/tools/backup/btar/default.nix index 3727a4b7f42..af253ccd7e6 100644 --- a/pkgs/tools/backup/btar/default.nix +++ b/pkgs/tools/backup/btar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, librsync }: +{ lib, stdenv, fetchurl, librsync }: stdenv.mkDerivation rec { name = "btar-1.1.1"; @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { meta = { description = "Tar-compatible block-based archiver"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; homepage = "http://viric.name/cgi-bin/btar"; - platforms = with stdenv.lib.platforms; all; - maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with lib.platforms; all; + maintainers = with lib.maintainers; [viric]; }; } diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix index db6946e8805..cd91d51d960 100644 --- a/pkgs/tools/backup/btrbk/default.nix +++ b/pkgs/tools/backup/btrbk/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram $out/sbin/btrbk \ --set PERL5LIB $PERL5LIB \ - --prefix PATH ':' "${stdenv.lib.makeBinPath [ btrfs-progs bash mbuffer openssh ]}" + --prefix PATH ':' "${lib.makeBinPath [ btrfs-progs bash mbuffer openssh ]}" ''; meta = with lib; { diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix index 0765d8a08cd..3b81295ccf2 100644 --- a/pkgs/tools/backup/bup/default.nix +++ b/pkgs/tools/backup/bup/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchFromGitHub, makeWrapper +{ lib, stdenv, fetchFromGitHub, makeWrapper , perl, pandoc, python3Packages, git , par2cmdline ? null, par2Support ? true }: assert par2Support -> par2cmdline != null; -let version = "0.31"; in +let version = "0.32"; in -with stdenv.lib; +with lib; stdenv.mkDerivation { pname = "bup"; @@ -17,14 +17,14 @@ stdenv.mkDerivation { repo = "bup"; owner = "bup"; rev = version; - sha256 = "03kmmdlgg0p5z39bhckkf91mmq55wghb93ghqvv9f9gaby1diw4z"; + sha256 = "sha256-SWnEJ5jwu/Jr2NLsTS8ajWay0WX/gYbOc3J6w00DndI="; }; buildInputs = [ git (python3Packages.python.withPackages (p: with p; [ setuptools tornado ] - ++ stdenv.lib.optionals (!stdenv.isDarwin) [ pyxattr pylibacl fuse ])) + ++ lib.optionals (!stdenv.isDarwin) [ pyxattr pylibacl fuse ])) ]; nativeBuildInputs = [ pandoc perl makeWrapper ]; diff --git a/pkgs/tools/backup/bupstash/default.nix b/pkgs/tools/backup/bupstash/default.nix index 9801d8ded9c..9ed70491fb3 100644 --- a/pkgs/tools/backup/bupstash/default.nix +++ b/pkgs/tools/backup/bupstash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, installShellFiles, rustPlatform, ronn, pkg-config, libsodium }: +{ lib, fetchFromGitHub, installShellFiles, rustPlatform, ronn, pkg-config, libsodium }: rustPlatform.buildRustPackage rec { pname = "bupstash"; version = "0.6.4"; @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { installManPage doc/man/*.[1-9] ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Easy and efficient encrypted backups"; homepage = "https://bupstash.io"; license = licenses.mit; diff --git a/pkgs/tools/backup/burp/default.nix b/pkgs/tools/backup/burp/default.nix index 0da366b58eb..00b2c71037a 100644 --- a/pkgs/tools/backup/burp/default.nix +++ b/pkgs/tools/backup/burp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config , acl, librsync, ncurses, openssl, zlib, uthash }: stdenv.mkDerivation rec { @@ -12,9 +12,9 @@ stdenv.mkDerivation rec { sha256 = "1zhq240kz881vs2s620qp0kifmgr582caalm85ls789w9rmdkhjl"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ librsync ncurses openssl zlib uthash ] - ++ stdenv.lib.optional (!stdenv.isDarwin) acl; + ++ lib.optional (!stdenv.isDarwin) acl; configureFlags = [ "--localstatedir=/var" ]; diff --git a/pkgs/tools/backup/chunksync/default.nix b/pkgs/tools/backup/chunksync/default.nix index 6885f3f8265..2bab8d5ea22 100644 --- a/pkgs/tools/backup/chunksync/default.nix +++ b/pkgs/tools/backup/chunksync/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, perl }: +{ lib, stdenv, fetchurl, openssl, perl }: stdenv.mkDerivation rec { version = "0.4"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "Space-efficient incremental backups of large files or block devices"; homepage = "http://chunksync.florz.de/"; - license = stdenv.lib.licenses.gpl2; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/tools/backup/dar/default.nix b/pkgs/tools/backup/dar/default.nix index 593e9b34da9..709084d5108 100644 --- a/pkgs/tools/backup/dar/default.nix +++ b/pkgs/tools/backup/dar/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , attr, e2fsprogs , curl, librsync, libthreadar , gpgme, libgcrypt, openssl , bzip2, lzo, xz, zlib }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { version = "2.6.13"; diff --git a/pkgs/tools/backup/dirvish/default.nix b/pkgs/tools/backup/dirvish/default.nix index 701ac2333de..a26bdb0d9a3 100644 --- a/pkgs/tools/backup/dirvish/default.nix +++ b/pkgs/tools/backup/dirvish/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Fast, disk based, rotating network backup system"; homepage = "http://dirvish.org/"; - license = stdenv.lib.licenses.osl2; + license = lib.licenses.osl2; platforms = platforms.linux; maintainers = [ maintainers.winpat ]; }; diff --git a/pkgs/tools/backup/diskrsync/default.nix b/pkgs/tools/backup/diskrsync/default.nix index d70efa1d224..3b5d901daf0 100644 --- a/pkgs/tools/backup/diskrsync/default.nix +++ b/pkgs/tools/backup/diskrsync/default.nix @@ -1,4 +1,4 @@ -{ buildGoPackage, fetchFromGitHub, lib, stdenv, openssh, makeWrapper }: +{ buildGoPackage, fetchFromGitHub, lib, openssh, makeWrapper }: buildGoPackage rec { pname = "diskrsync"; diff --git a/pkgs/tools/backup/dump/default.nix b/pkgs/tools/backup/dump/default.nix index 8299b7653f0..a709d84a610 100644 --- a/pkgs/tools/backup/dump/default.nix +++ b/pkgs/tools/backup/dump/default.nix @@ -1,7 +1,7 @@ # Tested with simple dump and restore -i, but complains that # /nix/store/.../etc/dumpdates doesn't exist. -{ lib, stdenv, fetchurl, pkgconfig, +{ lib, stdenv, fetchurl, pkg-config, e2fsprogs, ncurses, readline }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "15rg5y15ak0ppqlhcih78layvg7cwp6hc16p3c58xs8svlkxjqc0"; }; - buildInputs = [ e2fsprogs pkgconfig ncurses readline ]; + buildInputs = [ e2fsprogs pkg-config ncurses readline ]; meta = with lib; { homepage = "https://dump.sourceforge.io/"; diff --git a/pkgs/tools/backup/duplicacy/deps.nix b/pkgs/tools/backup/duplicacy/deps.nix index e7bf7e91f89..83d69d398cb 100644 --- a/pkgs/tools/backup/duplicacy/deps.nix +++ b/pkgs/tools/backup/duplicacy/deps.nix @@ -405,4 +405,4 @@ sha256 = "17zfx4xgqjamk7rc1sivm5gppkh3j4qp3i294w9rqbv0rqi0c9pq"; }; } -] \ No newline at end of file +] diff --git a/pkgs/tools/backup/duplicati/default.nix b/pkgs/tools/backup/duplicati/default.nix index 502c8c71353..5330ca60a4d 100644 --- a/pkgs/tools/backup/duplicati/default.nix +++ b/pkgs/tools/backup/duplicati/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { cp -r * $out/share/${pname}-${version} makeWrapper "${mono}/bin/mono" $out/bin/duplicati-cli \ --add-flags "$out/share/${pname}-${version}/Duplicati.CommandLine.exe" \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ sqlite ]} makeWrapper "${mono}/bin/mono" $out/bin/duplicati-server \ --add-flags "$out/share/${pname}-${version}/Duplicati.Server.exe" \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ sqlite ]} ''; diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index 284cf50132f..399d6b9ada3 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -14,16 +14,16 @@ , gettext }: let - inherit (stdenv.lib.versions) majorMinor splitVersion; - majorMinorPatch = v: builtins.concatStringsSep "." (stdenv.lib.take 3 (splitVersion v)); + inherit (lib.versions) majorMinor splitVersion; + majorMinorPatch = v: builtins.concatStringsSep "." (lib.take 3 (splitVersion v)); in pythonPackages.buildPythonApplication rec { pname = "duplicity"; - version = "0.8.15"; + version = "0.8.17"; src = fetchurl { url = "https://code.launchpad.net/duplicity/${majorMinor version}-series/${majorMinorPatch version}/+download/duplicity-${version}.tar.gz"; - sha256 = "1kg467mxg5a97v1rlv4shk32krgv8ys4nczq4b11av4bp1lgysdc"; + sha256 = "114rwkf9b3h4fcagrx013sb7krc4hafbwl9gawjph2wd9pkv2wx2"; }; patches = [ @@ -33,7 +33,7 @@ pythonPackages.buildPythonApplication rec { # Our Python infrastructure runs test in installCheckPhase so we need # to make the testing code stop assuming it is run from the source directory. ./use-installed-scripts-in-test.patch - ] ++ stdenv.lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ ./linux-disable-timezone-test.patch ]; @@ -63,7 +63,7 @@ pythonPackages.buildPythonApplication rec { pycrypto pydrive future - ] ++ stdenv.lib.optionals (!isPy3k) [ + ] ++ lib.optionals (!isPy3k) [ enum ]; @@ -72,7 +72,7 @@ pythonPackages.buildPythonApplication rec { gnutar # Add 'tar' to PATH. librsync # Add 'rdiff' to PATH. par2cmdline # Add 'par2' to PATH. - ] ++ stdenv.lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ util-linux # Add 'setsid' to PATH. ] ++ (with pythonPackages; [ lockfile @@ -84,7 +84,7 @@ pythonPackages.buildPythonApplication rec { postInstall = '' wrapProgram $out/bin/duplicity \ - --prefix PATH : "${stdenv.lib.makeBinPath [ gnupg ncftp rsync ]}" + --prefix PATH : "${lib.makeBinPath [ gnupg ncftp rsync ]}" ''; preCheck = '' @@ -100,7 +100,7 @@ pythonPackages.buildPythonApplication rec { # Don't run developer-only checks (pep8, etc.). export RUN_CODE_TESTS=0 - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' # Work around the following error when running tests: # > Max open files of 256 is too low, should be >= 1024. # > Use 'ulimit -n 1024' or higher to correct. diff --git a/pkgs/tools/backup/duply/default.nix b/pkgs/tools/backup/duply/default.nix index 61e97b66e18..15ac5acbe84 100644 --- a/pkgs/tools/backup/duply/default.nix +++ b/pkgs/tools/backup/duply/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "duply"; - version = "2.2"; + version = "2.3"; src = fetchurl { - url = "mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/2.2.x/duply_${version}.tgz"; - sha256 = "1bd7ivswxmxg64n0fnwgz6bkgckhdhz2qnnlkqqx4ccdxx15krbr"; + url = "mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/2.3.x/duply_${version}.tgz"; + sha256 = "sha256-I1KkblFnZVOCvcWEarGsSXnzlod2+yZ4okaTpckLFbE="; }; buildInputs = [ txt2man makeWrapper ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/share/man/man1" install -vD duply "$out/bin" wrapProgram "$out/bin/duply" --set PATH \ - ${stdenv.lib.makeBinPath [ coreutils python2 duplicity gawk gnupg bash gnugrep txt2man which ]} + ${lib.makeBinPath [ coreutils python2 duplicity gawk gnupg bash gnugrep txt2man which ]} "$out/bin/duply" txt2man > "$out/share/man/man1/duply.1" ''; @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { homepage = "https://duply.net/"; license = licenses.gpl2; maintainers = [ maintainers.bjornfor ]; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/backup/grab-site/default.nix b/pkgs/tools/backup/grab-site/default.nix index 2ef3b5f5420..2f2f01356b4 100644 --- a/pkgs/tools/backup/grab-site/default.nix +++ b/pkgs/tools/backup/grab-site/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python37, fetchFromGitHub }: +{ lib, python37, fetchFromGitHub }: let python = python37.override { self = python; diff --git a/pkgs/tools/backup/hpe-ltfs/default.nix b/pkgs/tools/backup/hpe-ltfs/default.nix index 346cb6521ba..ec8e6392e9c 100644 --- a/pkgs/tools/backup/hpe-ltfs/default.nix +++ b/pkgs/tools/backup/hpe-ltfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fuse, icu, pkgconfig, libxml2, libuuid }: +{ lib, stdenv, fetchFromGitHub, fuse, icu, pkg-config, libxml2, libuuid }: stdenv.mkDerivation rec { version = "3.4.2_Z7550-02501"; @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { sourceRoot = "source/ltfs"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; - buildInputs = [ + buildInputs = [ fuse icu libxml2 libuuid ]; diff --git a/pkgs/tools/backup/httrack/default.nix b/pkgs/tools/backup/httrack/default.nix index f611a953f3a..a01565c43a0 100644 --- a/pkgs/tools/backup/httrack/default.nix +++ b/pkgs/tools/backup/httrack/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "09a0gm67nml86qby1k1gh7rdxamnrnzwr6l9r5iiq94favjs0xrl"; }; - buildInputs = [ zlib openssl ] ++ stdenv.lib.optional stdenv.isDarwin libiconv; + buildInputs = [ zlib openssl ] ++ lib.optional stdenv.isDarwin libiconv; enableParallelBuilding = true; diff --git a/pkgs/tools/backup/httrack/qt.nix b/pkgs/tools/backup/httrack/qt.nix index 000f11a5a00..2a7c4ff5176 100644 --- a/pkgs/tools/backup/httrack/qt.nix +++ b/pkgs/tools/backup/httrack/qt.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchurl, cmake, pkgconfig, makeWrapper +{ mkDerivation, lib, fetchurl, cmake, pkg-config, makeWrapper , httrack, qtbase, qtmultimedia }: mkDerivation rec { @@ -12,7 +12,7 @@ mkDerivation rec { buildInputs = [ httrack qtbase qtmultimedia ]; - nativeBuildInputs = [ cmake makeWrapper pkgconfig ]; + nativeBuildInputs = [ cmake makeWrapper pkg-config ]; prePatch = '' substituteInPlace cmake/HTTRAQTFindHttrack.cmake \ diff --git a/pkgs/tools/backup/iceshelf/default.nix b/pkgs/tools/backup/iceshelf/default.nix index 546339ca002..c066cb76695 100644 --- a/pkgs/tools/backup/iceshelf/default.nix +++ b/pkgs/tools/backup/iceshelf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, git, awscli, python3 }: +{ lib, fetchFromGitHub, git, awscli, python3 }: python3.pkgs.buildPythonApplication rec { pname = "iceshelf"; @@ -6,11 +6,11 @@ python3.pkgs.buildPythonApplication rec { format = "other"; - src = fetchFromGitHub { - owner = "mrworf"; - repo = pname; - rev = "26768dde3fc54fa412e523eb8f8552e866b4853b"; - sha256 = "08rcbd14vn7312rmk2hyvdzvhibri31c4r5lzdrwb1n1y9q761qm"; + src = fetchFromGitHub { + owner = "mrworf"; + repo = pname; + rev = "26768dde3fc54fa412e523eb8f8552e866b4853b"; + sha256 = "08rcbd14vn7312rmk2hyvdzvhibri31c4r5lzdrwb1n1y9q761qm"; }; propagatedBuildInputs = [ @@ -19,12 +19,12 @@ python3.pkgs.buildPythonApplication rec { python3.pkgs.python-gnupg ]; - installPhase = '' - mkdir -p $out/bin $out/share/doc/${pname} $out/${python3.sitePackages} + installPhase = '' + mkdir -p $out/bin $out/share/doc/${pname} $out/${python3.sitePackages} cp -v iceshelf iceshelf-restore $out/bin cp -v iceshelf.sample.conf $out/share/doc/${pname}/ cp -rv modules $out/${python3.sitePackages} - ''; + ''; meta = with lib; { description = "A simple tool to allow storage of signed, encrypted, incremental backups using Amazon's Glacier storage"; diff --git a/pkgs/tools/backup/luckybackup/default.nix b/pkgs/tools/backup/luckybackup/default.nix index 7203ba480e6..a8f88e88b0e 100644 --- a/pkgs/tools/backup/luckybackup/default.nix +++ b/pkgs/tools/backup/luckybackup/default.nix @@ -1,9 +1,9 @@ -{ mkDerivation, stdenv, fetchurl -, pkgconfig, libtool, qmake +{ mkDerivation, lib, fetchurl +, pkg-config, libtool, qmake , rsync, ssh }: -with stdenv.lib; +with lib; mkDerivation rec { pname = "luckybackup"; version = "0.5.0"; @@ -15,8 +15,8 @@ mkDerivation rec { buildInputs = [ rsync ssh ]; - nativeBuildInputs = [ pkgconfig libtool qmake ]; - + nativeBuildInputs = [ pkg-config libtool qmake ]; + prePatch = '' for File in luckybackup.pro menu/luckybackup-pkexec \ menu/luckybackup-su.desktop menu/luckybackup.desktop \ @@ -29,12 +29,12 @@ mkDerivation rec { meta = { description = "A powerful, fast and reliable backup & sync tool"; longDescription = '' - luckyBackup is an application for data back-up and synchronization + luckyBackup is an application for data back-up and synchronization powered by the rsync tool. - + It is simple to use, fast (transfers over only changes made and not all data), safe (keeps your data safe by checking all declared directories - before proceeding in any data manipulation), reliable and fully + before proceeding in any data manipulation), reliable and fully customizable. ''; homepage = "http://luckybackup.sourceforge.net/"; diff --git a/pkgs/tools/backup/lvmsync/gemset.nix b/pkgs/tools/backup/lvmsync/gemset.nix index 7f80e928660..f17aa513a1f 100644 --- a/pkgs/tools/backup/lvmsync/gemset.nix +++ b/pkgs/tools/backup/lvmsync/gemset.nix @@ -33,4 +33,4 @@ }; version = "1.6.9"; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/backup/monolith/default.nix b/pkgs/tools/backup/monolith/default.nix index f88ee31711f..708cd85bb29 100644 --- a/pkgs/tools/backup/monolith/default.nix +++ b/pkgs/tools/backup/monolith/default.nix @@ -8,20 +8,20 @@ rustPlatform.buildRustPackage rec { pname = "monolith"; - version = "2.3.1"; + version = "2.4.0"; src = fetchFromGitHub { owner = "Y2Z"; repo = pname; rev = "v${version}"; - sha256 = "16k5mp64a5l063rdj65hbpx414xv0bqdvhvz49k8018f2a2jj5xl"; + sha256 = "sha256-kCyfVeGTXBzdwmTTDJM1eaR6ANoIXAydj1ePmrZehqE="; }; - cargoSha256 = "0s5mv8mymycz4ga4zh9kbrhwmhgl4j01pw1sdzxy49l9waryk9p3"; + cargoSha256 = "sha256-juxaL/zjfqzFMqZe9tpevdjjVU7fPK8zalksAARWHC8="; - nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; - buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; + nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; + buildInputs = lib.optionals stdenv.isLinux [ openssl ] + ++ lib.optionals stdenv.isDarwin [ Security ]; checkFlagsArray = [ "--skip=tests::cli" ]; diff --git a/pkgs/tools/backup/mt-st/default.nix b/pkgs/tools/backup/mt-st/default.nix index 57201d69dba..804c50830ce 100644 --- a/pkgs/tools/backup/mt-st/default.nix +++ b/pkgs/tools/backup/mt-st/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "mt-st-1.3"; @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { Fork of the standard "mt" tool with additional Linux-specific IOCTLs. ''; homepage = "https://github.com/iustin/mt-st"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.redvers ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.redvers ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/backup/mtx/default.nix b/pkgs/tools/backup/mtx/default.nix index 2a2dd80c566..aa72b02afbb 100644 --- a/pkgs/tools/backup/mtx/default.nix +++ b/pkgs/tools/backup/mtx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "mtx-1.3.12"; @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { specification. ''; homepage = "https://sourceforge.net/projects/mtx/"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.redvers ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.redvers ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/backup/mydumper/default.nix b/pkgs/tools/backup/mydumper/default.nix index 7549ac73292..a923724419d 100644 --- a/pkgs/tools/backup/mydumper/default.nix +++ b/pkgs/tools/backup/mydumper/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config , glib, zlib, pcre, libmysqlclient, libressl }: -let inherit (stdenv.lib) getDev; in +let inherit (lib) getDev; in stdenv.mkDerivation rec { version = "0.9.5"; @@ -14,14 +14,14 @@ stdenv.mkDerivation rec { sha256 = "0vbz0ri5hm6yzkrcgnaj8px6bf59myr5dbhyy7fd4cv44hr685k6"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ glib zlib pcre libmysqlclient libressl ]; cmakeFlags = [ "-DMYSQL_INCLUDE_DIR=${getDev libmysqlclient}/include/mysql" ]; meta = with lib; { - description = ''High-perfomance MySQL backup tool''; + description = "High-perfomance MySQL backup tool"; homepage = "https://github.com/maxbube/mydumper"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/tools/backup/ori/default.nix b/pkgs/tools/backup/ori/default.nix index 79eb57c2bbe..5e6e6a95ae7 100644 --- a/pkgs/tools/backup/ori/default.nix +++ b/pkgs/tools/backup/ori/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, boost, pkgconfig, scons, util-linux, fuse, libevent, openssl, zlib }: +{ lib, stdenv, fetchurl, boost, pkg-config, scons, util-linux, fuse, libevent, openssl, zlib }: stdenv.mkDerivation { version = "0.8.1"; @@ -9,8 +9,8 @@ stdenv.mkDerivation { sha256 = "8ce1a3dfbb6d1538885e993616bdfe71be44711d48f7f6798ff6bc0a39b3deca"; }; - buildInputs = [ - boost pkgconfig scons util-linux fuse libevent openssl zlib + buildInputs = [ + boost pkg-config scons util-linux fuse libevent openssl zlib ]; buildPhase = '' diff --git a/pkgs/tools/backup/partclone/default.nix b/pkgs/tools/backup/partclone/default.nix index 2a325046123..54108a0c038 100644 --- a/pkgs/tools/backup/partclone/default.nix +++ b/pkgs/tools/backup/partclone/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, autoreconfHook -, pkgconfig, libuuid, e2fsprogs, nilfs-utils, ntfs3g +{ lib, stdenv, fetchFromGitHub, autoreconfHook +, pkg-config, libuuid, e2fsprogs, nilfs-utils, ntfs3g }: stdenv.mkDerivation rec { @@ -13,10 +13,10 @@ stdenv.mkDerivation rec { sha256 = "0bv15i0gxym4dv48rgaavh8p94waryn1l6viis6qh5zm9cd08skg"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ - e2fsprogs libuuid stdenv.cc.libc nilfs-utils ntfs3g - (stdenv.lib.getOutput "static" stdenv.cc.libc) + e2fsprogs libuuid stdenv.cc.libc nilfs-utils ntfs3g + (lib.getOutput "static" stdenv.cc.libc) ]; configureFlags = [ @@ -43,8 +43,8 @@ stdenv.mkDerivation rec { ext2 partition. ''; homepage = "https://partclone.org"; - license = stdenv.lib.licenses.gpl2; - maintainers = [stdenv.lib.maintainers.marcweber]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [lib.maintainers.marcweber]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/backup/partimage/default.nix b/pkgs/tools/backup/partimage/default.nix index cec19c39933..2477fa6e443 100644 --- a/pkgs/tools/backup/partimage/default.nix +++ b/pkgs/tools/backup/partimage/default.nix @@ -1,11 +1,11 @@ -{stdenv +{lib, stdenv , fetchurl , fetchpatch , bzip2 , zlib , newt , openssl -, pkgconfig +, pkg-config , slang , autoreconfHook }: @@ -20,7 +20,7 @@ stdenv.mkDerivation { configureFlags = [ "--with-ssl-headers=${openssl.dev}/include/openssl" ]; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ bzip2 zlib newt newt openssl slang ]; patches = [ @@ -40,8 +40,8 @@ stdenv.mkDerivation { meta = { description = "Opensource disk backup software"; homepage = "http://www.partimage.org"; - license = stdenv.lib.licenses.gpl2; - maintainers = [stdenv.lib.maintainers.marcweber]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [lib.maintainers.marcweber]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/backup/percona-xtrabackup/generic.nix b/pkgs/tools/backup/percona-xtrabackup/generic.nix index 7d8c3627f67..6d66c80585f 100644 --- a/pkgs/tools/backup/percona-xtrabackup/generic.nix +++ b/pkgs/tools/backup/percona-xtrabackup/generic.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, bison, boost, cmake, makeWrapper, pkgconfig +{ lib, stdenv, fetchFromGitHub, bison, boost, cmake, makeWrapper, pkg-config , curl, cyrus_sasl, libaio, libedit, libev, libevent, libgcrypt, libgpgerror, lz4 , ncurses, numactl, openssl, protobuf, valgrind, xxd, zlib , perlPackages @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { inherit sha256; }; - nativeBuildInputs = [ bison boost cmake makeWrapper pkgconfig ]; + nativeBuildInputs = [ bison boost cmake makeWrapper pkg-config ]; buildInputs = [ curl cyrus_sasl libaio libedit libev libevent libgcrypt libgpgerror lz4 diff --git a/pkgs/tools/backup/rdedup/default.nix b/pkgs/tools/backup/rdedup/default.nix index 05b35e004a2..94c7e711267 100644 --- a/pkgs/tools/backup/rdedup/default.nix +++ b/pkgs/tools/backup/rdedup/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, libsodium +{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, libsodium , llvmPackages, clang, lzma , Security }: @@ -19,9 +19,9 @@ rustPlatform.buildRustPackage rec { ./v3.1.1-fix-Cargo.lock.patch ]; - nativeBuildInputs = [ pkgconfig llvmPackages.libclang clang ]; + nativeBuildInputs = [ pkg-config llvmPackages.libclang clang ]; buildInputs = [ openssl libsodium lzma ] - ++ (stdenv.lib.optional stdenv.isDarwin Security); + ++ (lib.optional stdenv.isDarwin Security); configurePhase = '' export LIBCLANG_PATH="${llvmPackages.libclang}/lib" diff --git a/pkgs/tools/backup/rdiff-backup/default.nix b/pkgs/tools/backup/rdiff-backup/default.nix index 707ba8a9885..0d24e3df720 100644 --- a/pkgs/tools/backup/rdiff-backup/default.nix +++ b/pkgs/tools/backup/rdiff-backup/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, python2Packages, librsync, gnused }: +{lib, fetchurl, python2Packages, librsync, gnused }: python2Packages.buildPythonApplication { name = "rdiff-backup-1.3.3"; @@ -17,7 +17,7 @@ python2Packages.buildPythonApplication { meta = { description = "Backup system trying to combine best a mirror and an incremental backup system"; homepage = "http://rdiff-backup.nongnu.org/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl2; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/backup/rdup/default.nix b/pkgs/tools/backup/rdup/default.nix index 0df4ecda89e..f75285e9ef9 100644 --- a/pkgs/tools/backup/rdup/default.nix +++ b/pkgs/tools/backup/rdup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, glib, pcre }: +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, glib, pcre }: stdenv.mkDerivation { pname = "rdup"; @@ -11,14 +11,14 @@ stdenv.mkDerivation { sha256 = "0bzyv6qmnivxnv9nw7lnfn46k0m1dlxcjj53zcva6v8y8084l1iw"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ glib pcre ]; meta = { description = "The only backup program that doesn't make backups"; homepage = "https://github.com/miekg/rdup"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ sternenseemann ]; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ sternenseemann ]; }; } diff --git a/pkgs/tools/backup/rsnapshot/default.nix b/pkgs/tools/backup/rsnapshot/default.nix index 1f65bd6ae5a..9322e62a3dc 100644 --- a/pkgs/tools/backup/rsnapshot/default.nix +++ b/pkgs/tools/backup/rsnapshot/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A filesystem snapshot utility for making backups of local and remote systems"; homepage = "https://rsnapshot.org/"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; platforms = platforms.linux; }; } diff --git a/pkgs/tools/backup/s3ql/default.nix b/pkgs/tools/backup/s3ql/default.nix index 74b90236c4e..70394afb50e 100644 --- a/pkgs/tools/backup/s3ql/default.nix +++ b/pkgs/tools/backup/s3ql/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, sqlite, which }: +{ lib, fetchFromGitHub, python3Packages, sqlite, which }: python3Packages.buildPythonApplication rec { pname = "s3ql"; diff --git a/pkgs/tools/backup/stenc/default.nix b/pkgs/tools/backup/stenc/default.nix index af5a33c2a6e..b2a53f8ad07 100644 --- a/pkgs/tools/backup/stenc/default.nix +++ b/pkgs/tools/backup/stenc/default.nix @@ -1,21 +1,34 @@ -{ stdenv, fetchFromGitHub }: +{ lib +, stdenv +, fetchFromGitHub +, genericUpdater +, common-updater-scripts +, autoreconfHook +}: stdenv.mkDerivation rec { - version = "1.0.7"; pname = "stenc"; + version = "1.0.8"; src = fetchFromGitHub { owner = "scsitape"; repo = "stenc"; rev = version; - sha256 = "1778m1zcyzyf42k5m496yqh0gv6kqhb0sq5983dhky1fccjl905k"; + sha256 = "0dsmvr1xpwkcd9yawv4c4vna67yag7jb8jcgn2amywz7nkpzmyxd"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + passthru.updateScript = genericUpdater { + inherit pname version; + versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; }; meta = { description = "SCSI Tape Encryption Manager"; homepage = "https://github.com/scsitape/stenc"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ woffs ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ woffs ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/backup/store-backup/default.nix b/pkgs/tools/backup/store-backup/default.nix index bd1c0d802aa..d0ca5324cab 100644 --- a/pkgs/tools/backup/store-backup/default.nix +++ b/pkgs/tools/backup/store-backup/default.nix @@ -1,4 +1,4 @@ -{stdenv, which, coreutils, perl, fetchurl, perlPackages, makeWrapper, diffutils , writeScriptBin, bzip2}: +{lib, stdenv, which, coreutils, perl, fetchurl, perlPackages, makeWrapper, diffutils , writeScriptBin, bzip2}: # quick usage: # storeBackup.pl --sourceDir /home/user --backupDir /tmp/my_backup_destination @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { for p in $out/bin/* do wrapProgram "$p" \ --prefix PERL5LIB ":" "${perlPackages.DBFile}/${perlPackages.perl.libPrefix}" \ - --prefix PATH ":" "${stdenv.lib.makeBinPath [ which bzip2 ]}" + --prefix PATH ":" "${lib.makeBinPath [ which bzip2 ]}" done patchShebangs $out @@ -104,8 +104,8 @@ stdenv.mkDerivation rec { meta = { description = "A backup suite that stores files on other disks"; homepage = "https://savannah.nongnu.org/projects/storebackup"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = [stdenv.lib.maintainers.marcweber]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = [lib.maintainers.marcweber]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/backup/tarsnap/default.nix b/pkgs/tools/backup/tarsnap/default.nix index 34955a979a4..1b151ece3d9 100644 --- a/pkgs/tools/backup/tarsnap/default.nix +++ b/pkgs/tools/backup/tarsnap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, zlib, e2fsprogs }: +{ lib, stdenv, fetchurl, openssl, zlib, e2fsprogs }: let zshCompletion = fetchurl { @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { install -m 444 -D ${zshCompletion} $out/share/zsh/site-functions/_tarsnap ''; - buildInputs = [ openssl zlib ] ++ stdenv.lib.optional stdenv.isLinux e2fsprogs ; + buildInputs = [ openssl zlib ] ++ lib.optional stdenv.isLinux e2fsprogs ; meta = { description = "Online backups for the truly paranoid"; homepage = "http://www.tarsnap.com/"; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice roconnor ]; + license = lib.licenses.unfree; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ thoughtpolice roconnor ]; }; } diff --git a/pkgs/tools/backup/ugarit-manifest-maker/default.nix b/pkgs/tools/backup/ugarit-manifest-maker/default.nix index 99ddd62e6ae..8c37a7b72ac 100644 --- a/pkgs/tools/backup/ugarit-manifest-maker/default.nix +++ b/pkgs/tools/backup/ugarit-manifest-maker/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, stdenv, eggDerivation, fetchegg }: +{ pkgs, lib, eggDerivation, fetchegg }: let eggs = import ./eggs.nix { inherit eggDerivation fetchegg; }; in with pkgs; eggDerivation rec { diff --git a/pkgs/tools/backup/ugarit/default.nix b/pkgs/tools/backup/ugarit/default.nix index 938c24f38ce..39c11cc0c91 100644 --- a/pkgs/tools/backup/ugarit/default.nix +++ b/pkgs/tools/backup/ugarit/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, stdenv, eggDerivation, fetchegg }: +{ pkgs, lib, eggDerivation, fetchegg }: let eggs = import ./eggs.nix { inherit eggDerivation fetchegg; }; in with pkgs; eggDerivation rec { diff --git a/pkgs/tools/backup/wal-e/default.nix b/pkgs/tools/backup/wal-e/default.nix index b3e9bfd56c0..8e54b58e201 100644 --- a/pkgs/tools/backup/wal-e/default.nix +++ b/pkgs/tools/backup/wal-e/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3Packages, lzop, postgresql, pv }: +{ lib, fetchurl, python3Packages, lzop, postgresql, pv }: python3Packages.buildPythonApplication rec { pname = "wal-e"; @@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec { description = "A Postgres WAL-shipping disaster recovery and replication toolkit"; homepage = "https://github.com/wal-e/wal-e"; maintainers = []; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.bsd3; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/backup/zbackup/default.nix b/pkgs/tools/backup/zbackup/default.nix index 5de58c56f00..12913ed6222 100644 --- a/pkgs/tools/backup/zbackup/default.nix +++ b/pkgs/tools/backup/zbackup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, zlib, openssl, protobuf, protobufc, lzo, libunwind } : +{ lib, stdenv, fetchurl, cmake, zlib, openssl, protobuf, protobufc, lzo, libunwind } : stdenv.mkDerivation { pname = "zbackup"; version = "1.4.4"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { meta = { description = "A versatile deduplicating backup tool"; homepage = "http://zbackup.org/"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/backup/zfs-replicate/default.nix b/pkgs/tools/backup/zfs-replicate/default.nix index 02e3c19f004..c167ad1fa01 100644 --- a/pkgs/tools/backup/zfs-replicate/default.nix +++ b/pkgs/tools/backup/zfs-replicate/default.nix @@ -1,5 +1,5 @@ { buildPythonApplication, click, fetchPypi, hypothesis, mypy, pytest -, pytestcov, pytestrunner, lib, stdenv, stringcase +, pytestcov, pytestrunner, lib, stringcase }: buildPythonApplication rec { diff --git a/pkgs/tools/bluetooth/blueberry/default.nix b/pkgs/tools/bluetooth/blueberry/default.nix index e954163b9e8..71ce9060b25 100644 --- a/pkgs/tools/bluetooth/blueberry/default.nix +++ b/pkgs/tools/bluetooth/blueberry/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "blueberry"; - version = "1.4.0"; + version = "1.4.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "19kmjp686h7lwmw5n7fc9giqbqm757pkbn42nfwlmasvzqsqlnz6"; + sha256 = "sha256-YwJQryIK92/Tc1s49jM3pCs7dmO3l+RbbFBtuXvhYbQ="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index ac50f3667c4..69eeb3db711 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -1,11 +1,11 @@ -{ config, stdenv, lib, fetchurl, intltool, pkgconfig, python3Packages, bluez, gtk3 -, obex_data_server, xdg_utils, dnsmasq, dhcp, libappindicator, iproute +{ config, stdenv, lib, fetchurl, intltool, pkg-config, python3Packages, bluez, gtk3 +, obex_data_server, xdg-utils, dnsmasq, dhcp, libappindicator, iproute , gnome3, librsvg, wrapGAppsHook, gobject-introspection, autoreconfHook , networkmanager, withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio, fetchpatch }: let pythonPackages = python3Packages; - binPath = lib.makeBinPath [ xdg_utils dnsmasq dhcp iproute ]; + binPath = lib.makeBinPath [ xdg-utils dnsmasq dhcp iproute ]; in stdenv.mkDerivation rec { pname = "blueman"; @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gobject-introspection intltool pkgconfig pythonPackages.cython + gobject-introspection intltool pkg-config pythonPackages.cython pythonPackages.wrapPython wrapGAppsHook autoreconfHook # drop when below patch is removed ]; diff --git a/pkgs/tools/bluetooth/bluez-alsa/default.nix b/pkgs/tools/bluetooth/bluez-alsa/default.nix index 588049cb976..6867d7c8ce9 100644 --- a/pkgs/tools/bluetooth/bluez-alsa/default.nix +++ b/pkgs/tools/bluetooth/bluez-alsa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook , alsaLib, bluez, glib, sbc, dbus # optional, but useful utils @@ -9,7 +9,7 @@ # TODO: aptxSupport }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "bluez-alsa"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { sha256 = "1jlsgxyqfhncfhx1sy3ry0dp6p95kd4agh7g2b7g51h0c4cv74h8"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ alsaLib bluez glib sbc dbus diff --git a/pkgs/tools/bluetooth/bluez-tools/default.nix b/pkgs/tools/bluetooth/bluez-tools/default.nix index bf3d73c657a..6b87a54be63 100644 --- a/pkgs/tools/bluetooth/bluez-tools/default.nix +++ b/pkgs/tools/bluetooth/bluez-tools/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, autoreconfHook, readline -, fetchFromGitHub, glib, pkgconfig }: +, fetchFromGitHub, glib, pkg-config }: stdenv.mkDerivation rec { date = "2016-12-12"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "08xp77sf5wnq5086halmyk3vla4bfls06q1zrqdcq36hw6d409i6"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ readline glib ]; diff --git a/pkgs/tools/bluetooth/obex-data-server/default.nix b/pkgs/tools/bluetooth/obex-data-server/default.nix index 93cb3a1c844..f580080e879 100644 --- a/pkgs/tools/bluetooth/obex-data-server/default.nix +++ b/pkgs/tools/bluetooth/obex-data-server/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libusb-compat-0_1, glib, dbus-glib, bluez, openobex, dbus }: +{ lib, stdenv, fetchurl, pkg-config, libusb-compat-0_1, glib, dbus-glib, bluez, openobex, dbus }: stdenv.mkDerivation rec { name = "obex-data-server-0.4.6"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0kq940wqs9j8qjnl58d6l3zhx0jaszci356xprx23l6nvdfld6dk"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb-compat-0_1 glib dbus-glib bluez openobex dbus ]; patches = [ ./obex-data-server-0.4.6-build-fixes-1.patch ]; diff --git a/pkgs/tools/bluetooth/obexd/default.nix b/pkgs/tools/bluetooth/obexd/default.nix index dc6ced6814c..6ddbcd5652d 100644 --- a/pkgs/tools/bluetooth/obexd/default.nix +++ b/pkgs/tools/bluetooth/obexd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, glib, dbus, openobex, bluez, libical }: +{ lib, stdenv, fetchurl, pkg-config, glib, dbus, openobex, bluez, libical }: stdenv.mkDerivation rec { name = "obexd-0.48"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib dbus openobex bluez libical ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = with lib; { homepage = "http://www.bluez.org/"; diff --git a/pkgs/tools/bluetooth/obexfs/default.nix b/pkgs/tools/bluetooth/obexfs/default.nix index 914032e1ee1..b81e8c4ea55 100644 --- a/pkgs/tools/bluetooth/obexfs/default.nix +++ b/pkgs/tools/bluetooth/obexfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, bluez, fuse, obexftp }: +{ lib, stdenv, fetchurl, pkg-config, bluez, fuse, obexftp }: stdenv.mkDerivation rec { name = "obexfs-0.12"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1g3krpygk6swa47vbmp9j9s8ahqqcl9ra8r25ybgzv2d9pmjm9kj"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ fuse obexftp bluez ]; meta = with lib; { diff --git a/pkgs/tools/bluetooth/obexftp/default.nix b/pkgs/tools/bluetooth/obexftp/default.nix index d0cc7c32164..fc2ff6128f7 100644 --- a/pkgs/tools/bluetooth/obexftp/default.nix +++ b/pkgs/tools/bluetooth/obexftp/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchurl, pkgconfig, openobex, bluez, cmake }: - +{ lib, stdenv, fetchurl, pkg-config, openobex, bluez, cmake }: + stdenv.mkDerivation rec { name = "obexftp-0.24.2"; - + src = fetchurl { url = "mirror://sourceforge/openobex/${name}-Source.tar.gz"; sha256 = "18w9r78z78ri5qc8fjym4nk1jfbrkyr789sq7rxrkshf1a7b83yl"; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ bluez ]; diff --git a/pkgs/tools/bluetooth/openobex/default.nix b/pkgs/tools/bluetooth/openobex/default.nix index 27dac53e6b3..1079623cf2a 100644 --- a/pkgs/tools/bluetooth/openobex/default.nix +++ b/pkgs/tools/bluetooth/openobex/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchurl, pkgconfig, bluez, libusb-compat-0_1, cmake }: - +{ lib, stdenv, fetchurl, pkg-config, bluez, libusb-compat-0_1, cmake }: + stdenv.mkDerivation rec { name = "openobex-1.7.2"; - + src = fetchurl { url = "mirror://sourceforge/openobex/${name}-Source.tar.gz"; sha256 = "1z6l7pbwgs5pjx3861cyd3r6vq5av984bdp4r3hgrw2jxam6120m"; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ bluez libusb-compat-0_1 ]; configureFlags = [ "--enable-apps" ]; diff --git a/pkgs/tools/cd-dvd/bchunk/default.nix b/pkgs/tools/cd-dvd/bchunk/default.nix index d5c3a30e7ae..6affd3ec662 100644 --- a/pkgs/tools/cd-dvd/bchunk/default.nix +++ b/pkgs/tools/cd-dvd/bchunk/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "12dxx98kbpc5z4dgni25280088bhlsb677rp832r82zzc1drpng7"; }; - makeFlags = stdenv.lib.optionals stdenv.cc.isClang [ "CC=cc" "LD=cc" ]; + makeFlags = lib.optionals stdenv.cc.isClang [ "CC=cc" "LD=cc" ]; installPhase = '' install -Dt $out/bin bchunk diff --git a/pkgs/tools/cd-dvd/brasero/default.nix b/pkgs/tools/cd-dvd/brasero/default.nix index 727c092e3aa..ea720f4f3eb 100644 --- a/pkgs/tools/cd-dvd/brasero/default.nix +++ b/pkgs/tools/cd-dvd/brasero/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, gtk3, itstool, gst_all_1, libxml2, libnotify +{ stdenv, lib, fetchurl, pkg-config, gtk3, itstool, gst_all_1, libxml2, libnotify , libcanberra-gtk3, intltool, dvdauthor, libburn, libisofs , vcdimager, wrapGAppsHook, hicolor-icon-theme }: @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { sha256 = "0h90y674j26rvjahb8cc0w79zx477rb6zaqcj26wzvq8kmpic8k8"; }; - nativeBuildInputs = [ pkgconfig itstool intltool wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config itstool intltool wrapGAppsHook ]; buildInputs = [ gtk3 libxml2 libnotify libcanberra-gtk3 libburn libisofs hicolor-icon-theme diff --git a/pkgs/tools/cd-dvd/cdrdao/default.nix b/pkgs/tools/cd-dvd/cdrdao/default.nix index 85bebad2723..3fca8b2cd3c 100644 --- a/pkgs/tools/cd-dvd/cdrdao/default.nix +++ b/pkgs/tools/cd-dvd/cdrdao/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, libvorbis, libmad, pkgconfig, libao}: +{lib, stdenv, fetchurl, libvorbis, libmad, pkg-config, libao}: stdenv.mkDerivation { name = "cdrdao-1.2.3"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { makeFlags = [ "RM=rm" "LN=ln" "MV=mv" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libvorbis libmad libao ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/tools/cd-dvd/cdrkit/default.nix b/pkgs/tools/cd-dvd/cdrkit/default.nix index e5d7a842e6c..28ed61ebd55 100644 --- a/pkgs/tools/cd-dvd/cdrkit/default.nix +++ b/pkgs/tools/cd-dvd/cdrkit/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cmake, libcap, zlib, bzip2, perl}: +{lib, stdenv, fetchurl, cmake, libcap, zlib, bzip2, perl}: stdenv.mkDerivation rec { name = "cdrkit-1.1.11"; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://cdrkit.org/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/cd-dvd/cue2pops/default.nix b/pkgs/tools/cd-dvd/cue2pops/default.nix index 87e633c504a..e5d95e96fbc 100644 --- a/pkgs/tools/cd-dvd/cue2pops/default.nix +++ b/pkgs/tools/cd-dvd/cue2pops/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: -with stdenv.lib; +with lib; stdenv.mkDerivation { pname = "cue2pops"; version = "git-2018-01-04"; diff --git a/pkgs/tools/cd-dvd/dvdisaster/default.nix b/pkgs/tools/cd-dvd/dvdisaster/default.nix index 1087bb94b43..e6f98bdee31 100644 --- a/pkgs/tools/cd-dvd/dvdisaster/default.nix +++ b/pkgs/tools/cd-dvd/dvdisaster/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, which +{ lib, stdenv, fetchurl, pkg-config, gettext, which , glib, gtk2 , enableSoftening ? true }: @@ -12,10 +12,10 @@ stdenv.mkDerivation rec { sha256 = "0f8gjnia2fxcbmhl8b3qkr5b7idl8m855dw7xw2fnmbqwvcm6k4w"; }; - nativeBuildInputs = [ gettext pkgconfig which ]; + nativeBuildInputs = [ gettext pkg-config which ]; buildInputs = [ glib gtk2 ]; - patches = stdenv.lib.optional enableSoftening [ + patches = lib.optional enableSoftening [ ./encryption.patch ./dvdrom.patch ]; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { "--docdir=share/doc" "--with-nls=yes" "--with-embedded-src-path=no" - ] ++ stdenv.lib.optional (stdenv.hostPlatform.isx86_64) "--with-sse2=yes"; + ] ++ lib.optional (stdenv.hostPlatform.isx86_64) "--with-sse2=yes"; # fatal error: inlined-icons.h: No such file or directory enableParallelBuilding = false; diff --git a/pkgs/tools/cd-dvd/isolyzer/default.nix b/pkgs/tools/cd-dvd/isolyzer/default.nix index 477fa337da8..c175eb45aa0 100644 --- a/pkgs/tools/cd-dvd/isolyzer/default.nix +++ b/pkgs/tools/cd-dvd/isolyzer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , python3 , fetchFromGitHub }: diff --git a/pkgs/tools/cd-dvd/lsdvd/default.nix b/pkgs/tools/cd-dvd/lsdvd/default.nix index 7847720dc6d..a202ee9376b 100644 --- a/pkgs/tools/cd-dvd/lsdvd/default.nix +++ b/pkgs/tools/cd-dvd/lsdvd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libdvdread, pkgconfig }: +{ lib, stdenv, fetchurl, libdvdread, pkg-config }: let version = "0.17"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { }; buildInputs = [ libdvdread ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = with lib; { homepage = "https://sourceforge.net/projects/lsdvd/"; diff --git a/pkgs/tools/cd-dvd/uif2iso/default.nix b/pkgs/tools/cd-dvd/uif2iso/default.nix index 4e3a2daafe8..d37cc649d38 100644 --- a/pkgs/tools/cd-dvd/uif2iso/default.nix +++ b/pkgs/tools/cd-dvd/uif2iso/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, zlib }: +{ lib, stdenv, fetchurl, unzip, zlib }: stdenv.mkDerivation rec { nameNoVer = "uif2iso"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Tool for converting single/multi part UIF image files to ISO"; homepage = "http://aluigi.org/mytoolz.htm#uif2iso"; - license = stdenv.lib.licenses.gpl1Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl1Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/pkgs/tools/cd-dvd/unetbootin/default.nix index 5ccb4b49d7e..71a0a763285 100644 --- a/pkgs/tools/cd-dvd/unetbootin/default.nix +++ b/pkgs/tools/cd-dvd/unetbootin/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { install -Dm644 -t $out/share/applications unetbootin.desktop wrapProgram $out/bin/unetbootin \ - --prefix PATH : ${stdenv.lib.makeBinPath [ mtools p7zip which ]} \ + --prefix PATH : ${lib.makeBinPath [ mtools p7zip which ]} \ --set QT_X11_NO_MITSHM 1 runHook postInstall diff --git a/pkgs/tools/cd-dvd/vobcopy/default.nix b/pkgs/tools/cd-dvd/vobcopy/default.nix index 2b918c4ffeb..a31354670a0 100644 --- a/pkgs/tools/cd-dvd/vobcopy/default.nix +++ b/pkgs/tools/cd-dvd/vobcopy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libdvdread, libdvdcss }: +{ lib, stdenv, fetchurl, libdvdread, libdvdcss }: stdenv.mkDerivation rec { name = "vobcopy-1.2.0"; @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { meta = { description = "Copies DVD .vob files to harddisk, decrypting them on the way"; homepage = "http://vobcopy.org/projects/c/c.shtml"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; - platforms = stdenv.lib.platforms.all; + maintainers = [ lib.maintainers.bluescreen303 ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/cd-dvd/vobsub2srt/default.nix b/pkgs/tools/cd-dvd/vobsub2srt/default.nix index e187d49b783..5262fe06963 100644 --- a/pkgs/tools/cd-dvd/vobsub2srt/default.nix +++ b/pkgs/tools/cd-dvd/vobsub2srt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, libtiff, pkg-config, tesseract }: +{ lib, stdenv, fetchgit, cmake, libtiff, pkg-config, tesseract }: let rev = "a6abbd61127a6392d420bbbebdf7612608c943c2"; shortRev = builtins.substring 0 7 rev; @@ -19,8 +19,8 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/ruediger/VobSub2SRT"; description = "Converts VobSub subtitles into SRT subtitles"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.ttuegel ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.ttuegel ]; }; } diff --git a/pkgs/tools/cd-dvd/xorriso/default.nix b/pkgs/tools/cd-dvd/xorriso/default.nix index b40808a5a8c..34fdb8d03af 100644 --- a/pkgs/tools/cd-dvd/xorriso/default.nix +++ b/pkgs/tools/cd-dvd/xorriso/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { doCheck = true; buildInputs = [ libcdio zlib bzip2 readline libiconv ] - ++ stdenv.lib.optionals stdenv.isLinux [ acl attr ]; + ++ lib.optionals stdenv.isLinux [ acl attr ]; meta = with lib; { description = "ISO 9660 Rock Ridge file system manipulator"; diff --git a/pkgs/tools/compression/advancecomp/default.nix b/pkgs/tools/compression/advancecomp/default.nix index b0e7f9e8f6b..7f8733b9b4e 100644 --- a/pkgs/tools/compression/advancecomp/default.nix +++ b/pkgs/tools/compression/advancecomp/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = ''A set of tools to optimize deflate-compressed files''; + description = "A set of tools to optimize deflate-compressed files"; license = licenses.gpl3 ; maintainers = [ maintainers.raskin ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix index 1c80c70b7c1..af0cbc4fe22 100644 --- a/pkgs/tools/compression/brotli/default.nix +++ b/pkgs/tools/compression/brotli/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - patches = stdenv.lib.optional staticOnly (fetchpatch { + patches = lib.optional staticOnly (fetchpatch { # context from https://github.com/google/brotli/pull/655 # updated patch from https://github.com/google/brotli/pull/655 url = "https://github.com/google/brotli/commit/47a554804ceabb899ae924aaee54df806053d0d1.patch"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }); cmakeFlags = [] - ++ stdenv.lib.optional staticOnly "-DBUILD_SHARED_LIBS=OFF"; + ++ lib.optional staticOnly "-DBUILD_SHARED_LIBS=OFF"; outputs = [ "out" "dev" "lib" ]; diff --git a/pkgs/tools/compression/bsc/default.nix b/pkgs/tools/compression/bsc/default.nix index 1f15b3d2f87..ac0c0544f01 100644 --- a/pkgs/tools/compression/bsc/default.nix +++ b/pkgs/tools/compression/bsc/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = stdenv.lib.optional stdenv.isDarwin openmp; + buildInputs = lib.optional stdenv.isDarwin openmp; prePatch = '' substituteInPlace makefile \ diff --git a/pkgs/tools/compression/bsdiff/default.nix b/pkgs/tools/compression/bsdiff/default.nix index a5b527d70b7..8b5dfe919c7 100644 --- a/pkgs/tools/compression/bsdiff/default.nix +++ b/pkgs/tools/compression/bsdiff/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bzip2 }: +{ lib, stdenv, fetchurl, bzip2 }: stdenv.mkDerivation rec { pname = "bsdiff"; @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { meta = { description = "An efficient binary diff/patch tool"; homepage = "http://www.daemonology.net/bsdiff"; - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = lib.licenses.bsd2; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.thoughtpolice ]; }; } diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index 7b97c66b3b9..bfaf359522f 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" ]; configureFlags = - stdenv.lib.optionals linkStatic [ "--enable-static" "--disable-shared" ]; + lib.optionals linkStatic [ "--enable-static" "--disable-shared" ]; enableParallelBuilding = true; @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { description = "High-quality data compression program"; license = licenses.bsdOriginal; platforms = platforms.all; - maintainers = []; + maintainers = with maintainers; [ mic92 ]; }; } diff --git a/pkgs/tools/compression/dtrx/default.nix b/pkgs/tools/compression/dtrx/default.nix index 0abea9b1285..91d59a4de0f 100644 --- a/pkgs/tools/compression/dtrx/default.nix +++ b/pkgs/tools/compression/dtrx/default.nix @@ -1,4 +1,4 @@ -{stdenv, lib, fetchurl, pythonPackages +{ lib, fetchurl, pythonPackages , gnutar, unzip, lhasa, rpm, binutils, cpio, gzip, p7zip, cabextract, unrar, unshield , bzip2, xz, lzip # unzip is handled by p7zip diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index 9628e100c1c..6bcd5ae0c42 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , xz , writeText @@ -57,8 +57,8 @@ stdenv.mkDerivation rec { is just a bonus. ''; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; }; } diff --git a/pkgs/tools/compression/gzrt/default.nix b/pkgs/tools/compression/gzrt/default.nix index 4367f4b6d61..18efc1b64c2 100644 --- a/pkgs/tools/compression/gzrt/default.nix +++ b/pkgs/tools/compression/gzrt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib }: +{ lib, stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { name = "gzrt-0.8"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.urbanophile.com/arenn/hacking/gzrt/"; description = "The gzip Recovery Toolkit"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/compression/hactool/default.nix b/pkgs/tools/compression/hactool/default.nix index 2cce7bb8b92..85b95a6f769 100644 --- a/pkgs/tools/compression/hactool/default.nix +++ b/pkgs/tools/compression/hactool/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { mv config.mk.template config.mk ''; - makeFlags = stdenv.lib.optionals stdenv.isDarwin [ "CC=cc" ]; + makeFlags = lib.optionals stdenv.isDarwin [ "CC=cc" ]; installPhase = '' install -D hactool $out/bin/hactool diff --git a/pkgs/tools/compression/kzipmix/default.nix b/pkgs/tools/compression/kzipmix/default.nix index f68b0cdc751..73931f6bcae 100644 --- a/pkgs/tools/compression/kzipmix/default.nix +++ b/pkgs/tools/compression/kzipmix/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation { name = "kzipmix-20091108"; @@ -11,15 +11,15 @@ stdenv.mkDerivation { installPhase = '' mkdir -p $out/bin cp kzip zipmix $out/bin - + patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/bin/kzip patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/bin/zipmix ''; meta = { description = "A tool that aggressively optimizes the sizes of Zip archives"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; homepage = "http://advsys.net/ken/utils.htm"; - maintainers = [ stdenv.lib.maintainers.sander ]; + maintainers = [ lib.maintainers.sander ]; }; } diff --git a/pkgs/tools/compression/lhasa/default.nix b/pkgs/tools/compression/lhasa/default.nix index edf42266acd..77df84879b8 100644 --- a/pkgs/tools/compression/lhasa/default.nix +++ b/pkgs/tools/compression/lhasa/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation { name = "lhasa-0.3.1"; @@ -13,9 +13,9 @@ stdenv.mkDerivation { decompressing .lzh (LHA / LHarc) and .lzs (LArc) archives. The backend for the tool is a library, so that it can be reused for other purposes. ''; - license = stdenv.lib.licenses.isc; + license = lib.licenses.isc; homepage = "http://fragglet.github.io/lhasa"; - maintainers = with stdenv.lib; [ maintainers.sander ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + maintainers = with lib; [ maintainers.sander ]; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/tools/compression/lrzip/default.nix b/pkgs/tools/compression/lrzip/default.nix index aaddb6299c4..596ea053166 100644 --- a/pkgs/tools/compression/lrzip/default.nix +++ b/pkgs/tools/compression/lrzip/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, zlib, lzo, bzip2, nasm, perl}: +{lib, stdenv, fetchurl, zlib, lzo, bzip2, nasm, perl}: stdenv.mkDerivation rec { version = "0.631"; @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://ck.kolivas.org/apps/lrzip/"; description = "The CK LRZIP compression program (LZMA + RZIP)"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; inherit version; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix index 08050455184..e2bb98a4b80 100644 --- a/pkgs/tools/compression/lz4/default.nix +++ b/pkgs/tools/compression/lz4/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # TODO(@Ericson2314): Separate binaries and libraries outputs = [ "bin" "out" "dev" ]; - buildInputs = stdenv.lib.optional doCheck valgrind; + buildInputs = lib.optional doCheck valgrind; enableParallelBuilding = true; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { "WINDRES:=${stdenv.cc.bintools.targetPrefix}windres" ] # TODO make full dictionary - ++ stdenv.lib.optional stdenv.hostPlatform.isMinGW "TARGET_OS=MINGW" + ++ lib.optional stdenv.hostPlatform.isMinGW "TARGET_OS=MINGW" ; doCheck = false; # tests take a very long time @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { # TODO(@Ericson2314): Make resusable setup hook for this issue on Windows. postInstall = - stdenv.lib.optionalString stdenv.hostPlatform.isWindows '' + lib.optionalString stdenv.hostPlatform.isWindows '' mv $out/bin/*.dll $out/lib ln -s $out/lib/*.dll '' diff --git a/pkgs/tools/compression/lzip/default.nix b/pkgs/tools/compression/lzip/default.nix index e55af8b94ed..aa6b6d31a89 100644 --- a/pkgs/tools/compression/lzip/default.nix +++ b/pkgs/tools/compression/lzip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, texinfo }: +{ lib, stdenv, fetchurl, texinfo }: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or @@ -7,20 +7,20 @@ stdenv.mkDerivation rec { pname = "lzip"; - version = "1.21"; + version = "1.22"; nativeBuildInputs = [ texinfo ]; src = fetchurl { url = "mirror://savannah/lzip/${pname}-${version}.tar.gz"; - sha256 = "12qdcw5k1cx77brv9yxi1h4dzwibhfmdpigrj43nfk8nscwm12z4"; + sha256 = "sha256-wzQtQuZxOcFluLEo0DO1yWiToTrF8lkzGQMVIU6HqUg="; }; configureFlags = [ "CPPFLAGS=-DNDEBUG" "CFLAGS=-O3" "CXXFLAGS=-O3" - ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) + ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "CXX=${stdenv.cc.targetPrefix}c++"; setupHook = ./lzip-setup-hook.sh; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.nongnu.org/lzip/lzip.html"; description = "A lossless data compressor based on the LZMA algorithm"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/compression/mozlz4a/default.nix b/pkgs/tools/compression/mozlz4a/default.nix index 04323f8c49e..dabde674d2e 100644 --- a/pkgs/tools/compression/mozlz4a/default.nix +++ b/pkgs/tools/compression/mozlz4a/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3, runtimeShell }: +{ lib, stdenv, fetchurl, python3, runtimeShell }: stdenv.mkDerivation rec { pname = "mozlz4a"; @@ -26,9 +26,9 @@ stdenv.mkDerivation rec { meta = { inherit version; description = "A script to handle Mozilla's mozlz4 files"; - license = stdenv.lib.licenses.bsd2; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.bsd2; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; homepage = "https://gist.githubusercontent.com/Tblue/62ff47bef7f894e92ed5"; }; } diff --git a/pkgs/tools/compression/ncompress/default.nix b/pkgs/tools/compression/ncompress/default.nix index b60a23e660c..0f79811f966 100644 --- a/pkgs/tools/compression/ncompress/default.nix +++ b/pkgs/tools/compression/ncompress/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { name = "ncompress-4.2.4.5"; @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://ncompress.sourceforge.net/"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; description = "A fast, simple LZW file compressor"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/compression/pbzip2/default.nix b/pkgs/tools/compression/pbzip2/default.nix index 599c096adef..6d27b84e8c4 100644 --- a/pkgs/tools/compression/pbzip2/default.nix +++ b/pkgs/tools/compression/pbzip2/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=reserved-user-defined-literal"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=reserved-user-defined-literal"; meta = with lib; { homepage = "http://compression.ca/pbzip2/"; diff --git a/pkgs/tools/compression/pigz/default.nix b/pkgs/tools/compression/pigz/default.nix index 9178e3ad587..7517e599e73 100644 --- a/pkgs/tools/compression/pigz/default.nix +++ b/pkgs/tools/compression/pigz/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - buildInputs = [zlib] ++ stdenv.lib.optional stdenv.isLinux util-linux; + buildInputs = [zlib] ++ lib.optional stdenv.isLinux util-linux; makeFlags = [ "CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" ]; diff --git a/pkgs/tools/compression/pixz/default.nix b/pkgs/tools/compression/pixz/default.nix index c7b4b46328d..833dcae8850 100644 --- a/pkgs/tools/compression/pixz/default.nix +++ b/pkgs/tools/compression/pixz/default.nix @@ -1,5 +1,5 @@ { - stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig + lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config , asciidoc, libxslt, libxml2, docbook_xml_dtd_45, docbook_xsl , libarchive, lzma }: @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "1.0.7"; name = "${baseName}-${version}"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoconf automake libtool asciidoc libxslt libxml2 docbook_xml_dtd_45 docbook_xsl @@ -29,9 +29,9 @@ stdenv.mkDerivation rec { meta = { inherit version; - description = ''A parallel compressor/decompressor for xz format''; - license = stdenv.lib.licenses.bsd2; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; + description = "A parallel compressor/decompressor for xz format"; + license = lib.licenses.bsd2; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/compression/pxz/default.nix b/pkgs/tools/compression/pxz/default.nix index e731d91f6d6..e337ccdd4ae 100644 --- a/pkgs/tools/compression/pxz/default.nix +++ b/pkgs/tools/compression/pxz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, xz, lzma }: +{ lib, stdenv, fetchgit, xz, lzma }: let name = "pxz"; version = "4.999.9beta+git"; @@ -32,13 +32,13 @@ stdenv.mkDerivation { meta = { homepage = "https://jnovy.fedorapeople.org/pxz/"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [pashev]; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [pashev]; description = ''Parallel XZ is a compression utility that takes advantage of running LZMA compression of different parts of an input file on multiple cores and processors simultaneously. Its primary goal is to utilize all resources to speed up compression time with minimal possible influence on compression ratio''; - platforms = with stdenv.lib.platforms; linux; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/tools/compression/rzip/default.nix b/pkgs/tools/compression/rzip/default.nix index fe4ac14ad02..60364afa9f3 100644 --- a/pkgs/tools/compression/rzip/default.nix +++ b/pkgs/tools/compression/rzip/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, fetchpatch, bzip2}: +{lib, stdenv, fetchurl, fetchpatch, bzip2}: stdenv.mkDerivation { name = "rzip-2.1"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { homepage = "https://rzip.samba.org/"; description = "Compression program"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/compression/xar/default.nix b/pkgs/tools/compression/xar/default.nix index b877f78b8c3..5d7c2b09220 100644 --- a/pkgs/tools/compression/xar/default.nix +++ b/pkgs/tools/compression/xar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxml2, lzma, openssl, zlib, bzip2, fts, autoconf }: +{ lib, stdenv, fetchurl, libxml2, lzma, openssl, zlib, bzip2, fts, autoconf }: stdenv.mkDerivation rec { version = "1.6.1"; @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { of content's rich meta-data. ''; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ copumpkin ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ copumpkin ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/compression/xdelta/default.nix b/pkgs/tools/compression/xdelta/default.nix index b599ee2920f..ee52f35c979 100644 --- a/pkgs/tools/compression/xdelta/default.nix +++ b/pkgs/tools/compression/xdelta/default.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [] - ++ stdenv.lib.optionals lzmaSupport [ xz ]; + ++ lib.optionals lzmaSupport [ xz ]; postPatch = '' cd xdelta3 diff --git a/pkgs/tools/compression/xdelta/unstable.nix b/pkgs/tools/compression/xdelta/unstable.nix index 25cd3ed311a..03366e5b1ce 100644 --- a/pkgs/tools/compression/xdelta/unstable.nix +++ b/pkgs/tools/compression/xdelta/unstable.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [] - ++ stdenv.lib.optionals lzmaSupport [ xz ]; + ++ lib.optionals lzmaSupport [ xz ]; postPatch = '' cd xdelta3 diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix index fa4a0124333..cc021a1ef05 100644 --- a/pkgs/tools/compression/xz/default.nix +++ b/pkgs/tools/compression/xz/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" "doc" ]; - configureFlags = stdenv.lib.optional enableStatic "--disable-shared"; + configureFlags = lib.optional enableStatic "--disable-shared"; doCheck = true; diff --git a/pkgs/tools/compression/zdelta/default.nix b/pkgs/tools/compression/zdelta/default.nix index b3932ec3da8..46760c91306 100644 --- a/pkgs/tools/compression/zdelta/default.nix +++ b/pkgs/tools/compression/zdelta/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "http://cis.poly.edu/zdelta"; + homepage = "http://cis.poly.edu/zdelta"; platforms = platforms.linux; license = licenses.zlib; }; diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index eb4144443ae..e1437e3843d 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -17,22 +17,22 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ] - ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; - buildInputs = stdenv.lib.optional stdenv.hostPlatform.isUnix bash; + ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + buildInputs = lib.optional stdenv.hostPlatform.isUnix bash; patches = [ ./playtests-darwin.patch ] # This I didn't upstream because if you use posix threads with MinGW it will # work fine, and I'm not sure how to write the condition. - ++ stdenv.lib.optional stdenv.hostPlatform.isWindows ./mcfgthreads-no-pthread.patch; + ++ lib.optional stdenv.hostPlatform.isWindows ./mcfgthreads-no-pthread.patch; - postPatch = stdenv.lib.optionalString (!static) '' + postPatch = lib.optionalString (!static) '' substituteInPlace build/cmake/CMakeLists.txt \ --replace 'message(SEND_ERROR "You need to build static library to build tests")' "" substituteInPlace build/cmake/tests/CMakeLists.txt \ --replace 'libzstd_static' 'libzstd_shared' sed -i \ - "1aexport ${stdenv.lib.optionalString stdenv.isDarwin "DY"}LD_LIBRARY_PATH=$PWD/build_/lib" \ + "1aexport ${lib.optionalString stdenv.isDarwin "DY"}LD_LIBRARY_PATH=$PWD/build_/lib" \ tests/playTests.sh ''; @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { ''; outputs = [ "bin" "dev" ] - ++ stdenv.lib.optional stdenv.hostPlatform.isUnix "man" + ++ lib.optional stdenv.hostPlatform.isUnix "man" ++ [ "out" ]; meta = with lib; { diff --git a/pkgs/tools/compression/zsync/default.nix b/pkgs/tools/compression/zsync/default.nix index 7984e2bd589..94921397e30 100644 --- a/pkgs/tools/compression/zsync/default.nix +++ b/pkgs/tools/compression/zsync/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { name = "zsync-0.6.2"; @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://zsync.moria.org.uk/"; description = "File distribution system using the rsync algorithm"; - license = stdenv.lib.licenses.free; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; all; + license = lib.licenses.free; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; all; }; } diff --git a/pkgs/tools/filesystems/android-file-transfer/default.nix b/pkgs/tools/filesystems/android-file-transfer/default.nix index 59add4b4c21..f0efaaa3231 100644 --- a/pkgs/tools/filesystems/android-file-transfer/default.nix +++ b/pkgs/tools/filesystems/android-file-transfer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, fuse, readline, pkgconfig, qtbase, qttools }: +{ lib, mkDerivation, fetchFromGitHub, cmake, fuse, readline, pkg-config, qtbase, qttools }: mkDerivation rec { pname = "android-file-transfer"; @@ -11,7 +11,7 @@ mkDerivation rec { sha256 = "125rq8ji83nw6chfw43i0h9c38hjqh1qjibb0gnf9wrigar9zc8b"; }; - nativeBuildInputs = [ cmake readline pkgconfig ]; + nativeBuildInputs = [ cmake readline pkg-config ]; buildInputs = [ fuse qtbase qttools ]; meta = with lib; { diff --git a/pkgs/tools/filesystems/archivemount/default.nix b/pkgs/tools/filesystems/archivemount/default.nix index d1d4ba6adf1..e3f9d8505fc 100644 --- a/pkgs/tools/filesystems/archivemount/default.nix +++ b/pkgs/tools/filesystems/archivemount/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, fuse, libarchive }: +{ lib, stdenv, fetchurl, pkg-config, fuse, libarchive }: let name = "archivemount-0.9.1"; @@ -11,12 +11,12 @@ stdenv.mkDerivation { sha256 = "1cy5b6qril9c3ry6fv7ir87s8iyy5vxxmbyx90dm86fbra0vjaf5"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ fuse libarchive ]; meta = { description = "Gateway between FUSE and libarchive: allows mounting of cpio, .tar.gz, .tar.bz2 archives"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/filesystems/avfs/default.nix b/pkgs/tools/filesystems/avfs/default.nix index edfcaa0d8f8..e89828dd750 100644 --- a/pkgs/tools/filesystems/avfs/default.nix +++ b/pkgs/tools/filesystems/avfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, fuse, xz }: +{ lib, stdenv, fetchurl, pkg-config, fuse, xz }: stdenv.mkDerivation rec { pname = "avfs"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1psh8k7g7rb0gn7aygbjv86kxyi9xq07barxksa99nnmq3lc2kjg"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ fuse xz ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://avf.sourceforge.net/"; description = "Virtual filesystem that allows browsing of compressed files"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/tools/filesystems/bcache-tools/default.nix b/pkgs/tools/filesystems/bcache-tools/default.nix index f9c2b470026..ba6cb79fbd5 100644 --- a/pkgs/tools/filesystems/bcache-tools/default.nix +++ b/pkgs/tools/filesystems/bcache-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, util-linux, bash }: +{ lib, stdenv, fetchurl, pkg-config, util-linux, bash }: stdenv.mkDerivation rec { pname = "bcache-tools"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1gbsh2qw0a7kgck6w0apydiy37nnz5xvdgipa0yqrfmghl86vmv4"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ util-linux ]; # * Remove broken install rules (they ignore $PREFIX) for stuff we don't need @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { Bcache is a Linux kernel block layer cache. It allows one or more fast disk drives such as flash-based solid state drives (SSDs) to act as a cache for one or more slower hard disk drives. - + This package contains the required user-space tools. User documentation is in Documentation/bcache.txt in the Linux kernel diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index 869d2782855..8ab82b67226 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, attr, libuuid, libscrypt, libsodium, keyutils +{ lib, stdenv, fetchFromGitHub, pkg-config, attr, libuuid, libscrypt, libsodium, keyutils , liburcu, zlib, libaio, udev, zstd, lz4, valgrind, python3Packages , fuseSupport ? false, fuse3 ? null }: @@ -22,18 +22,18 @@ stdenv.mkDerivation { "INITRAMFS_DIR=${placeholder "out"}/etc/initramfs-tools" ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libuuid libscrypt libsodium keyutils liburcu zlib libaio zstd lz4 python3Packages.pytest udev valgrind - ] ++ stdenv.lib.optional fuseSupport fuse3; + ] ++ lib.optional fuseSupport fuse3; doCheck = false; # needs bcachefs module loaded on builder checkFlags = [ "BCACHEFS_TEST_USE_VALGRIND=no" ]; checkInputs = [ valgrind ]; - preCheck = stdenv.lib.optionalString fuseSupport '' + preCheck = lib.optionalString fuseSupport '' rm tests/test_fuse.py ''; diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix index e69f76e1630..cc6916869b6 100644 --- a/pkgs/tools/filesystems/bindfs/default.nix +++ b/pkgs/tools/filesystems/bindfs/default.nix @@ -1,17 +1,15 @@ -{ stdenv, fetchurl, fuse, pkgconfig }: +{ lib, stdenv, fetchurl, fuse, pkg-config }: stdenv.mkDerivation rec { - version = "1.14.8"; + version = "1.14.9"; pname = "bindfs"; src = fetchurl { url = "https://bindfs.org/downloads/${pname}-${version}.tar.gz"; - sha256 = "15y4brlcrqhxl6z73785m0dr1vp2q3wc6xss08x9jjr0apzmmjp5"; + sha256 = "0fnij365dn4ihkpfc92x63inxxwpminzffyj55krp1w02canpl5n"; }; - dontStrip = true; - - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ fuse ]; postFixup = '' ln -s $out/bin/bindfs $out/bin/mount.fuse.bindfs @@ -20,8 +18,8 @@ stdenv.mkDerivation rec { meta = { description = "A FUSE filesystem for mounting a directory to another location"; homepage = "https://bindfs.org"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ lovek323 ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ lovek323 ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/filesystems/blobfuse/default.nix b/pkgs/tools/filesystems/blobfuse/default.nix index 2156758f68e..651e93f4213 100644 --- a/pkgs/tools/filesystems/blobfuse/default.nix +++ b/pkgs/tools/filesystems/blobfuse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, curl, gnutls, libgcrypt, libuuid, fuse }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, curl, gnutls, libgcrypt, libuuid, fuse }: stdenv.mkDerivation rec { pname = "blobfuse"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error=catch-value"; buildInputs = [ curl gnutls libgcrypt libuuid fuse ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; meta = with lib; { description = "Mount an Azure Blob storage as filesystem through FUSE"; diff --git a/pkgs/tools/filesystems/bonnie/default.nix b/pkgs/tools/filesystems/bonnie/default.nix index ab49ce02225..e34e5289ad6 100644 --- a/pkgs/tools/filesystems/bonnie/default.nix +++ b/pkgs/tools/filesystems/bonnie/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl }: +{ lib, stdenv, fetchurl, perl }: stdenv.mkDerivation rec { name = "bonnie++-1.98"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.coker.com.au/bonnie++/"; description = "Hard drive and file system benchmark suite"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/tools/filesystems/boxfs/default.nix b/pkgs/tools/filesystems/boxfs/default.nix index 4ccec06050d..5637b9af291 100644 --- a/pkgs/tools/filesystems/boxfs/default.nix +++ b/pkgs/tools/filesystems/boxfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, curl, fuse, libxml2, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, curl, fuse, libxml2, pkg-config }: let srcs = { @@ -35,7 +35,7 @@ in stdenv.mkDerivation { patches = [ ./work-around-API-borkage.patch ]; buildInputs = [ curl fuse libxml2 ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildFlags = [ "static" ]; diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 469a499b554..ec9cd7ca61a 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -1,18 +1,18 @@ -{ lib, stdenv, fetchurl, pkgconfig, attr, acl, zlib, libuuid, e2fsprogs, lzo +{ lib, stdenv, fetchurl, pkg-config, attr, acl, zlib, libuuid, e2fsprogs, lzo , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt, zstd, python3 }: stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "5.9"; + version = "5.10"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "14d7hz07kfczfgmy1ixkgccjn393gpkjn7givz5kwxddcnk5i4xq"; + sha256 = "sha256-5xoNbdUE86XZV/zpowKB62Hs+ZHIrzFf4AYaG5eh0CE="; }; nativeBuildInputs = [ - pkgconfig asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt + pkg-config asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt python3 python3.pkgs.setuptools ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { install -v -m 444 -D btrfs-completion $out/share/bash-completion/completions/btrfs ''; - configureFlags = stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-backtrace"; + configureFlags = lib.optional stdenv.hostPlatform.isMusl "--disable-backtrace"; meta = with lib; { description = "Utilities for the btrfs filesystem"; diff --git a/pkgs/tools/filesystems/catcli/default.nix b/pkgs/tools/filesystems/catcli/default.nix index f5dbabaf583..2f179a151d1 100644 --- a/pkgs/tools/filesystems/catcli/default.nix +++ b/pkgs/tools/filesystems/catcli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , buildPythonApplication , docopt, anytree @@ -18,7 +18,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ docopt anytree ]; - postPatch = '' patchShebangs . ''; + postPatch = "patchShebangs . "; meta = with lib; { description = "The command line catalog tool for your offline data"; diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 7f6acca3970..61cc4573693 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -1,7 +1,7 @@ -{ stdenv, runCommand, fetchurl +{ lib, stdenv, runCommand, fetchurl , fetchpatch , ensureNewerSourcesHook -, cmake, pkgconfig +, cmake, pkg-config , which, git , boost, python3Packages , libxml2, zlib, lz4 @@ -36,7 +36,6 @@ # 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; @@ -76,7 +75,7 @@ let none = [ ]; }; - getMeta = description: { + getMeta = description: with lib; { homepage = "https://ceph.com/"; inherit description; license = with licenses; [ lgpl21 gpl2 bsd3 mit publicDomain ]; @@ -122,10 +121,10 @@ let ]); sitePackages = ceph-python-env.python.sitePackages; - version = "15.2.7"; + version = "15.2.8"; src = fetchurl { url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz"; - sha256 = "082lpx1rsifjh636zypxy6ccs6nfkcm9azxp5ghvr5mvx9chmyrj"; + sha256 = "1nmrras3g2zapcd06qr5m7y4zkymnr0r53jkpicjw2g4q7wfmib4"; }; in rec { ceph = stdenv.mkDerivation { @@ -139,7 +138,7 @@ in rec { nativeBuildInputs = [ cmake - pkgconfig which git python3Packages.wrapPython makeWrapper + pkg-config which git python3Packages.wrapPython makeWrapper python3Packages.python # for the toPythonPath function (ensureNewerSourcesHook { year = "1980"; }) ]; @@ -148,11 +147,11 @@ in rec { boost ceph-python-env libxml2 optYasm optLibatomic_ops optLibs3 malloc zlib openldap lttng-ust babeltrace gperf gtest cunit snappy rocksdb lz4 oathToolkit leveldb libnl libcap_ng rdkafka - ] ++ optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ linuxHeaders util-linux libuuid udev keyutils optLibaio optLibxfs optZfs # ceph 14 rdma-core rabbitmq-c - ] ++ optionals hasRadosgw [ + ] ++ lib.optionals hasRadosgw [ optFcgi optExpat optCurl optFuse optLibedit ]; diff --git a/pkgs/tools/filesystems/chunkfs/default.nix b/pkgs/tools/filesystems/chunkfs/default.nix index c18bbe5a455..e4a20e3da5a 100644 --- a/pkgs/tools/filesystems/chunkfs/default.nix +++ b/pkgs/tools/filesystems/chunkfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, fuse }: +{ lib, stdenv, fetchurl, perl, fuse }: stdenv.mkDerivation rec { version = "0.7"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "FUSE filesystems for viewing chunksync-style directory trees as a block device and vice versa"; homepage = "http://chunkfs.florz.de/"; - license = stdenv.lib.licenses.gpl2; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/tools/filesystems/ciopfs/default.nix b/pkgs/tools/filesystems/ciopfs/default.nix index 8b633ecbe0f..cfe80cfce65 100644 --- a/pkgs/tools/filesystems/ciopfs/default.nix +++ b/pkgs/tools/filesystems/ciopfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, fuse, glib, attr }: +{ lib, stdenv, fetchurl, pkg-config, fuse, glib, attr }: stdenv.mkDerivation rec { name = "ciopfs-0.4"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0sr9i9b3qfwbfvzvk00yrrg3x2xqk1njadbldkvn7hwwa4z5bm9l"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ fuse glib attr ]; makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.brain-dump.org/projects/ciopfs/"; description = "A case-insensitive filesystem layered on top of any other filesystem"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/filesystems/convoy/default.nix b/pkgs/tools/filesystems/convoy/default.nix index 4c493ea2252..774568fdde1 100644 --- a/pkgs/tools/filesystems/convoy/default.nix +++ b/pkgs/tools/filesystems/convoy/default.nix @@ -1,5 +1,5 @@ # This file was generated by go2nix. -{ lib, stdenv, buildGoPackage, fetchFromGitHub, lvm2 }: +{ lib, buildGoPackage, fetchFromGitHub, lvm2 }: buildGoPackage rec { pname = "convoy"; diff --git a/pkgs/tools/filesystems/cryfs/default.nix b/pkgs/tools/filesystems/cryfs/default.nix index 5573acc1a8c..3777c4e7cb1 100644 --- a/pkgs/tools/filesystems/cryfs/default.nix +++ b/pkgs/tools/filesystems/cryfs/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchpatch -, cmake, pkgconfig, python, gtest +, cmake, pkg-config, python, gtest , boost, cryptopp, curl, fuse, openssl }: @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { --replace "(4.5L*1024*1024*1024)" "(0.5L*1024*1024*1024)" ''; - nativeBuildInputs = [ cmake gtest pkgconfig python ]; + nativeBuildInputs = [ cmake gtest pkg-config python ]; buildInputs = [ boost cryptopp curl fuse openssl ]; diff --git a/pkgs/tools/filesystems/curlftpfs/default.nix b/pkgs/tools/filesystems/curlftpfs/default.nix index 3e59a286be3..4bfa22838ad 100644 --- a/pkgs/tools/filesystems/curlftpfs/default.nix +++ b/pkgs/tools/filesystems/curlftpfs/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, fuse, curl, pkgconfig, glib, zlib}: +{lib, stdenv, fetchurl, fuse, curl, pkg-config, glib, zlib}: stdenv.mkDerivation { name = "curlftpfs-0.9.2"; @@ -6,7 +6,7 @@ stdenv.mkDerivation { url = "mirror://sourceforge/curlftpfs/curlftpfs-0.9.2.tar.gz"; sha256 = "0n397hmv21jsr1j7zx3m21i7ryscdhkdsyqpvvns12q7qwwlgd2f"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [fuse curl glib zlib]; doCheck = false; # fails, doesn't work well too, btw diff --git a/pkgs/tools/filesystems/davfs2/default.nix b/pkgs/tools/filesystems/davfs2/default.nix index 02536a13d15..7652cc97878 100644 --- a/pkgs/tools/filesystems/davfs2/default.nix +++ b/pkgs/tools/filesystems/davfs2/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , neon @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://savannah.nongnu.org/projects/davfs2"; description = "Mount WebDAV shares like a typical filesystem"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; longDescription = '' Web Distributed Authoring and Versioning (WebDAV), an extension to @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { with no built-in support for WebDAV. ''; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/filesystems/disorderfs/default.nix b/pkgs/tools/filesystems/disorderfs/default.nix index 849360f5374..27dc55fb926 100644 --- a/pkgs/tools/filesystems/disorderfs/default.nix +++ b/pkgs/tools/filesystems/disorderfs/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv, fetchurl, pkgconfig, fuse, attr, asciidoc }: +{ lib, stdenv, fetchurl, pkg-config, fuse, attr, asciidoc }: stdenv.mkDerivation rec { pname = "disorderfs"; - version = "0.5.6"; + version = "0.5.11"; src = fetchurl { url = "http://http.debian.net/debian/pool/main/d/disorderfs/disorderfs_${version}.orig.tar.bz2"; - sha256 = "0xlsl6cw1p0d92crknrcf4iabgig0185dzp80qxh9iyjy42d27gk"; + sha256 = "sha256-KqAMKVUykCgVdNyjacZjpVXqVdeob76v0iOuSd4TNIY="; }; - nativeBuildInputs = [ pkgconfig asciidoc ]; + nativeBuildInputs = [ pkg-config asciidoc ]; buildInputs = [ fuse attr ]; diff --git a/pkgs/tools/filesystems/djmount/default.nix b/pkgs/tools/filesystems/djmount/default.nix index 15086d28c98..f5b0a0315df 100644 --- a/pkgs/tools/filesystems/djmount/default.nix +++ b/pkgs/tools/filesystems/djmount/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, fuse }: +{ lib, stdenv, fetchurl, pkg-config, fuse }: stdenv.mkDerivation rec { pname = "djmount"; @@ -8,14 +8,14 @@ stdenv.mkDerivation rec { sha256 = "0kqf0cy3h4cfiy5a2sigmisx0lvvsi1n0fbyb9ll5gacmy1b8nxa"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ fuse]; meta = { homepage = "http://djmount.sourceforge.net/"; description = "UPnP AV client, mounts as a Linux filesystem the media content of compatible UPnP AV devices"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.jagajaga ]; - license = stdenv.lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.jagajaga ]; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix index 5af1580d0a5..14d054364fd 100644 --- a/pkgs/tools/filesystems/dosfstools/default.nix +++ b/pkgs/tools/filesystems/dosfstools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libiconv }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libiconv }: stdenv.mkDerivation rec { pname = "dosfstools"; @@ -11,15 +11,15 @@ stdenv.mkDerivation rec { sha256 = "1a2zn1655d5f1m6jp9vpn3bp8yfxhcmxx3mx23ai9hmxiydiykr1"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ] - ++ stdenv.lib.optional stdenv.isDarwin libiconv; + nativeBuildInputs = [ autoreconfHook pkg-config ] + ++ lib.optional stdenv.isDarwin libiconv; configureFlags = [ "--enable-compat-symlinks" ]; meta = { description = "Utilities for creating and checking FAT and VFAT file systems"; homepage = "https://github.com/dosfstools/dosfstools"; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - license = stdenv.lib.licenses.gpl3; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + license = lib.licenses.gpl3; }; } diff --git a/pkgs/tools/filesystems/duperemove/default.nix b/pkgs/tools/filesystems/duperemove/default.nix index 62df5ee07c6..bbc346d46f7 100644 --- a/pkgs/tools/filesystems/duperemove/default.nix +++ b/pkgs/tools/filesystems/duperemove/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, libgcrypt -, pkgconfig, glib, linuxHeaders ? stdenv.cc.libc.linuxHeaders, sqlite }: +, pkg-config, glib, linuxHeaders ? stdenv.cc.libc.linuxHeaders, sqlite }: stdenv.mkDerivation rec { pname = "duperemove"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1a87mka2sfzhbch2jip6wlvvs0glxq9lqwmyrp359d1rmwwmqiw9"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libgcrypt glib linuxHeaders sqlite ]; makeFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index d48c92ebfc3..ffe716dceea 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPackages, fetchurl, fetchpatch, pkgconfig, libuuid, gettext, texinfo +{ lib, stdenv, buildPackages, fetchurl, fetchpatch, pkg-config, libuuid, gettext, texinfo , shared ? !stdenv.hostPlatform.isStatic }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" "info" ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ pkgconfig texinfo ]; + nativeBuildInputs = [ pkg-config texinfo ]; buildInputs = [ libuuid gettext ]; # Only use glibc's __GNUC_PREREQ(X,Y) (checks if compiler is gcc version >= X.Y) when using glibc diff --git a/pkgs/tools/filesystems/e2tools/default.nix b/pkgs/tools/filesystems/e2tools/default.nix index 9c86ced90f7..8621298275e 100644 --- a/pkgs/tools/filesystems/e2tools/default.nix +++ b/pkgs/tools/filesystems/e2tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, e2fsprogs }: +{ lib, stdenv, fetchurl, pkg-config, e2fsprogs }: stdenv.mkDerivation rec { pname = "e2tools"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "16wlc54abqz06dpipjdkw58bncpkxlj5f55lkzy07k3cg0bqwg2f"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ e2fsprogs ]; enableParallelBuilding = true; @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://home.earthlink.net/~k_sheff/sw/e2tools/"; description = "Utilities to read/write/manipulate files in an ext2/ext3 filesystem"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.leenaars ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.leenaars ]; }; } diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix index 4d28fc6a9e8..2b88dde1531 100644 --- a/pkgs/tools/filesystems/encfs/default.nix +++ b/pkgs/tools/filesystems/encfs/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, cmake, pkgconfig, perl +, cmake, pkg-config, perl , gettext, fuse, openssl, tinyxml2 }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ gettext fuse openssl tinyxml2 ]; - nativeBuildInputs = [ cmake pkgconfig perl ]; + nativeBuildInputs = [ cmake pkg-config perl ]; cmakeFlags = [ "-DUSE_INTERNAL_TINYXML=OFF" diff --git a/pkgs/tools/filesystems/exfat/default.nix b/pkgs/tools/filesystems/exfat/default.nix index 2d6eaf8e978..8cb552cdc70 100644 --- a/pkgs/tools/filesystems/exfat/default.nix +++ b/pkgs/tools/filesystems/exfat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, fuse }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, fuse }: stdenv.mkDerivation rec { pname = "exfat"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1q29pcysv747y6dis07953dkax8k9x50b5gg99gpz6rr46xwgkgb"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ fuse ]; meta = with lib; { diff --git a/pkgs/tools/filesystems/ext4magic/default.nix b/pkgs/tools/filesystems/ext4magic/default.nix index a5f15c5fb2e..9917bf8d965 100644 --- a/pkgs/tools/filesystems/ext4magic/default.nix +++ b/pkgs/tools/filesystems/ext4magic/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { If the information in the journal are sufficient, ext4magic can recover the most file types, with original filename, owner and group, - file mode bits and also the old atime/mtime stamps. + file mode bits and also the old atime/mtime stamps. It's much more effective and works much better than extundelete. ''; diff --git a/pkgs/tools/filesystems/f2fs-tools/default.nix b/pkgs/tools/filesystems/f2fs-tools/default.nix index 35a087dbd7b..4b3d5c9ac1e 100644 --- a/pkgs/tools/filesystems/f2fs-tools/default.nix +++ b/pkgs/tools/filesystems/f2fs-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, autoreconfHook, libselinux, libuuid, pkgconfig }: +{ lib, stdenv, fetchgit, autoreconfHook, libselinux, libuuid, pkg-config }: stdenv.mkDerivation rec { pname = "f2fs-tools"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "06ss05n87i1c3149qb3n7j1qp2scv3g2adx0v6ljkl59ab9b5saj"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libselinux libuuid ]; patches = [ ./f2fs-tools-cross-fix.patch ]; diff --git a/pkgs/tools/filesystems/fsfs/default.nix b/pkgs/tools/filesystems/fsfs/default.nix index 3e76653dd3e..114c83e84f4 100644 --- a/pkgs/tools/filesystems/fsfs/default.nix +++ b/pkgs/tools/filesystems/fsfs/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, openssl, fuse}: +{lib, stdenv, fetchurl, openssl, fuse}: throw "It still does not build" @@ -25,6 +25,6 @@ stdenv.mkDerivation { meta = { homepage = "http://fsfs.sourceforge.net/"; description = "Secure distributed file system in user space"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/filesystems/fuse-7z-ng/default.nix b/pkgs/tools/filesystems/fuse-7z-ng/default.nix index b9edd4799bc..aaffc70e10d 100644 --- a/pkgs/tools/filesystems/fuse-7z-ng/default.nix +++ b/pkgs/tools/filesystems/fuse-7z-ng/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fuse, p7zip, autoconf, automake, pkgconfig, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, fuse, p7zip, autoconf, automake, pkg-config, makeWrapper }: stdenv.mkDerivation rec { pname = "fuse-7z-ng"; @@ -11,12 +11,12 @@ stdenv.mkDerivation rec { sha256 = "17v1gcmg5q661b047zxjar735i4d3508dimw1x3z1pk4d1zjhp3x"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ fuse autoconf automake makeWrapper ]; preConfigure = "./autogen.sh"; - libs = stdenv.lib.makeLibraryPath [ p7zip ]; # 'cause 7z.so is loaded manually + libs = lib.makeLibraryPath [ p7zip ]; # 'cause 7z.so is loaded manually postInstall = '' wrapProgram $out/bin/${pname} --suffix LD_LIBRARY_PATH : "${libs}/p7zip" diff --git a/pkgs/tools/filesystems/fuse-overlayfs/default.nix b/pkgs/tools/filesystems/fuse-overlayfs/default.nix index 25e2cc29bd7..5522b63922a 100644 --- a/pkgs/tools/filesystems/fuse-overlayfs/default.nix +++ b/pkgs/tools/filesystems/fuse-overlayfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fuse-overlayfs"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "00pzwxn5a7dwz9ngl98198lx1c3nlhalzajyqazw9ydjkxibfpay"; + sha256 = "sha256-lus+1hkc4GxrTxtdfDJ0XqJp37dcjKp4/sI3CEh8cYA="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/tools/filesystems/fuseiso/default.nix b/pkgs/tools/filesystems/fuseiso/default.nix index f8c4ead50f2..7e44e7c15f9 100644 --- a/pkgs/tools/filesystems/fuseiso/default.nix +++ b/pkgs/tools/filesystems/fuseiso/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, fuse, glib, zlib }: +{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, pkg-config, fuse, glib, zlib }: stdenv.mkDerivation rec { pname = "fuseiso"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ fuse glib zlib ]; diff --git a/pkgs/tools/filesystems/genext2fs/default.nix b/pkgs/tools/filesystems/genext2fs/default.nix index b4980e83bee..ccc048f7572 100644 --- a/pkgs/tools/filesystems/genext2fs/default.nix +++ b/pkgs/tools/filesystems/genext2fs/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { name = "genext2fs-1.4.1"; - + src = fetchurl { url = "mirror://sourceforge/genext2fs/genext2fs-1.4.1.tar.gz"; sha256 = "1z7czvsf3ircvz2cw1cf53yifsq29ljxmj15hbgc79l6gbxbnka0"; diff --git a/pkgs/tools/filesystems/genimage/default.nix b/pkgs/tools/filesystems/genimage/default.nix index 23c38e6a6d3..b3ca1ae8394 100644 --- a/pkgs/tools/filesystems/genimage/default.nix +++ b/pkgs/tools/filesystems/genimage/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libconfuse, gettext }: +{ lib, stdenv, fetchurl, pkg-config, libconfuse, gettext }: stdenv.mkDerivation rec { pname = "genimage"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0y4h8x8lqxam8m90rdfq8cg5137kvilxr3d1qzddpx7nxpvmmwv9"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libconfuse gettext ]; postInstall = '' diff --git a/pkgs/tools/filesystems/gitfs/default.nix b/pkgs/tools/filesystems/gitfs/default.nix index 0f66955360f..e4a120264fd 100644 --- a/pkgs/tools/filesystems/gitfs/default.nix +++ b/pkgs/tools/filesystems/gitfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { pname = "gitfs"; @@ -30,8 +30,8 @@ python3Packages.buildPythonApplication rec { automatically committed to the remote. ''; homepage = "https://github.com/PressLabs/gitfs"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.robbinch ]; + license = lib.licenses.asl20; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.robbinch ]; }; } diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index d23faf16886..4e8a3a991f5 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -1,5 +1,5 @@ {lib, stdenv, fetchFromGitHub, fuse, bison, flex_2_5_35, openssl, python3, ncurses, readline, - autoconf, automake, libtool, pkgconfig, zlib, libaio, libxml2, acl, sqlite, + autoconf, automake, libtool, pkg-config, zlib, libaio, libxml2, acl, sqlite, liburcu, attr, makeWrapper, coreutils, gnused, gnugrep, which, openssh, gawk, findutils, util-linux, lvm2, btrfs-progs, e2fsprogs, xfsprogs, systemd, rsync, glibc, rpcsvc-proto, libtirpc @@ -15,7 +15,7 @@ let buildInputs = [ fuse bison flex_2_5_35 openssl ncurses readline - autoconf automake libtool pkgconfig zlib libaio libxml2 + autoconf automake libtool pkg-config zlib libaio libxml2 acl sqlite liburcu attr makeWrapper util-linux libtirpc (python3.withPackages (pkgs: [ pkgs.flask @@ -54,13 +54,13 @@ let ]; in stdenv.mkDerivation rec { pname = "glusterfs"; - version = "8.3"; + version = "9.0"; src = fetchFromGitHub { owner = "gluster"; repo = pname; rev = "v${version}"; - sha256 = "09vvbymiacz2pzwnq6f2dd7g2zszzsivdncz45sh977v3z0n84az"; + sha256 = "sha256-pjJQAFEb44yNqvNAOclZsiEDZBgcfIxliD3La1IsKPs="; }; inherit buildInputs propagatedBuildInputs; @@ -90,7 +90,7 @@ in stdenv.mkDerivation rec { ''; configureFlags = [ - ''--localstatedir=/var'' + "--localstatedir=/var" ]; nativeBuildInputs = [ rpcsvc-proto ]; @@ -111,7 +111,7 @@ in stdenv.mkDerivation rec { # It also invokes executable Python scripts in `$out/libexec/glusterfs`, which is why we set up PYTHONPATH accordingly. # We set up the paths for the main entry point executables. - GLUSTER_PATH="${stdenv.lib.makeBinPath runtimePATHdeps}:$out/bin" + GLUSTER_PATH="${lib.makeBinPath runtimePATHdeps}:$out/bin" GLUSTER_PYTHONPATH="$(toPythonPath $out):$out/libexec/glusterfs" GLUSTER_LD_LIBRARY_PATH="$out/lib" diff --git a/pkgs/tools/filesystems/go-mtpfs/default.nix b/pkgs/tools/filesystems/go-mtpfs/default.nix index 605e341c4d7..bd6e0fe67fc 100644 --- a/pkgs/tools/filesystems/go-mtpfs/default.nix +++ b/pkgs/tools/filesystems/go-mtpfs/default.nix @@ -1,4 +1,4 @@ -{ pkgconfig, libusb1, buildGoPackage, fetchgit }: +{ pkg-config, libusb1, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "go-mtpfs"; @@ -7,7 +7,7 @@ buildGoPackage rec { goPackagePath = "github.com/hanwen/go-mtpfs"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 ]; src = fetchgit { diff --git a/pkgs/tools/filesystems/gocryptfs/default.nix b/pkgs/tools/filesystems/gocryptfs/default.nix index 318e39e8322..b8b330c129a 100644 --- a/pkgs/tools/filesystems/gocryptfs/default.nix +++ b/pkgs/tools/filesystems/gocryptfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildGoModule , fetchFromGitHub , openssl diff --git a/pkgs/tools/filesystems/grive2/default.nix b/pkgs/tools/filesystems/grive2/default.nix index 7392b474840..68475b9e290 100644 --- a/pkgs/tools/filesystems/grive2/default.nix +++ b/pkgs/tools/filesystems/grive2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, yajl, cmake, libgcrypt, curl, expat, boost, libiberty }: +{ lib, stdenv, fetchFromGitHub, pkg-config, yajl, cmake, libgcrypt, curl, expat, boost, libiberty }: stdenv.mkDerivation rec { version = "0.5.1"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1kv34ys8qarjsxpb1kd8dp7b3b4ycyiwjzd6mg97d3jk7405g6nm"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libgcrypt yajl curl expat stdenv boost libiberty ]; diff --git a/pkgs/tools/filesystems/hfsprogs/default.nix b/pkgs/tools/filesystems/hfsprogs/default.nix index e08835fc35d..8a2a8572b5c 100644 --- a/pkgs/tools/filesystems/hfsprogs/default.nix +++ b/pkgs/tools/filesystems/hfsprogs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, libbsd }: +{ lib, stdenv, fetchurl, openssl, libbsd }: let version = "332.25"; package_name = "hfsprogs"; in @@ -43,7 +43,7 @@ stdenv.mkDerivation { meta = { description = "HFS/HFS+ user space utils"; - license = stdenv.lib.licenses.apsl20; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.apsl20; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/filesystems/httpfs/default.nix b/pkgs/tools/filesystems/httpfs/default.nix index 23edb817579..c62703c7b52 100644 --- a/pkgs/tools/filesystems/httpfs/default.nix +++ b/pkgs/tools/filesystems/httpfs/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, fuse, openssl, asciidoc +{ fetchurl, lib, stdenv, pkg-config, fuse, openssl, asciidoc , docbook_xml_dtd_45, docbook_xsl , libxml2, libxslt }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ pkgconfig fuse openssl + [ pkg-config fuse openssl asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt ]; @@ -27,9 +27,9 @@ stdenv.mkDerivation rec { homepage = "http://httpfs.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; maintainers = [ ]; }; } diff --git a/pkgs/tools/filesystems/hubicfuse/default.nix b/pkgs/tools/filesystems/hubicfuse/default.nix index 5bd140e6cdf..4f40bd37abe 100644 --- a/pkgs/tools/filesystems/hubicfuse/default.nix +++ b/pkgs/tools/filesystems/hubicfuse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, curl, openssl, fuse, libxml2, json_c, file }: +{ lib, stdenv, fetchFromGitHub, pkg-config, curl, openssl, fuse, libxml2, json_c, file }: stdenv.mkDerivation rec { pname = "hubicfuse"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1x988hfffxgvqxh083pv3lj5031fz03sbgiiwrjpaiywfbhm8ffr"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ curl openssl fuse libxml2 json_c file ]; postInstall = '' install hubic_token $out/bin diff --git a/pkgs/tools/filesystems/ifuse/default.nix b/pkgs/tools/filesystems/ifuse/default.nix index b262080d182..4abb50b8bd7 100644 --- a/pkgs/tools/filesystems/ifuse/default.nix +++ b/pkgs/tools/filesystems/ifuse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, usbmuxd, fuse, libimobiledevice }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, usbmuxd, fuse, libimobiledevice }: stdenv.mkDerivation rec { pname = "ifuse"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1r12y3h1j7ikkwk874h9969kr4ksyamvrwywx19ml6rsr01arw84"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig fuse usbmuxd libimobiledevice ]; + nativeBuildInputs = [ autoreconfHook pkg-config fuse usbmuxd libimobiledevice ]; meta = with lib; { homepage = "https://github.com/libimobiledevice/ifuse"; diff --git a/pkgs/tools/filesystems/irods/common.nix b/pkgs/tools/filesystems/irods/common.nix index 2062a8442e6..7b7eb7ba05a 100644 --- a/pkgs/tools/filesystems/irods/common.nix +++ b/pkgs/tools/filesystems/irods/common.nix @@ -1,9 +1,7 @@ -{ stdenv, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp, boost, jansson, zeromq, openssl, pam, libiodbc, kerberos, gcc, libcxx, which, catch2 }: +{ lib, stdenv, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp, boost, jansson, zeromq, openssl, pam, libiodbc, kerberos, gcc, libcxx, which, catch2 }: # Common attributes of irods packages -with stdenv; - { nativeBuildInputs = [ autoconf automake cmake gnumake help2man texinfo which gcc ]; buildInputs = [ bzip2 zlib libtool cppzmq libarchive avro-cpp jansson zeromq openssl pam libiodbc kerberos boost libcxx catch2 ]; @@ -35,7 +33,7 @@ with stdenv; " ''; - meta = { + meta = with lib; { description = "Integrated Rule-Oriented Data System (iRODS)"; longDescription = '' The Integrated Rule-Oriented Data System (iRODS) is open source data management @@ -48,8 +46,8 @@ with stdenv; testing on supported platforms; plug-in support for microservices, storage resources, drivers, and databases; and extensive documentation, training and support services.''; homepage = "https://irods.org"; - license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.bzizou ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.bzizou ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/filesystems/irods/default.nix b/pkgs/tools/filesystems/irods/default.nix index 8dfdd96dbeb..fe7a0d73f67 100644 --- a/pkgs/tools/filesystems/irods/default.nix +++ b/pkgs/tools/filesystems/irods/default.nix @@ -1,13 +1,11 @@ -{ stdenv, fetchFromGitHub, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp_llvm, boost, jansson, zeromq, openssl , pam, libiodbc, kerberos, gcc, libcxx, which, catch2 }: - -with stdenv; +{ lib, stdenv, fetchFromGitHub, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp_llvm, boost, jansson, zeromq, openssl , pam, libiodbc, kerberos, gcc, libcxx, which, catch2 }: let avro-cpp=avro-cpp_llvm; in let common = import ./common.nix { - inherit stdenv bzip2 zlib autoconf automake cmake gnumake + inherit lib stdenv bzip2 zlib autoconf automake cmake gnumake help2man texinfo libtool cppzmq libarchive jansson zeromq openssl pam libiodbc kerberos gcc libcxx boost avro-cpp which catch2; @@ -57,8 +55,7 @@ in rec { ''; meta = common.meta // { - longDescription = common.meta.longDescription + '' - This package provides the servers and libraries.''; + longDescription = common.meta.longDescription + "This package provides the servers and libraries."; }; }); @@ -84,7 +81,7 @@ in rec { ''; cmakeFlags = common.cmakeFlags ++ [ - "-DCMAKE_INSTALL_PREFIX=${out}" + "-DCMAKE_INSTALL_PREFIX=${stdenv.out}" "-DIRODS_DIR=${irods}/lib/irods/cmake" "-DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath,${irods}/lib" "-DCMAKE_MODULE_LINKER_FLAGS=-Wl,-rpath,${irods}/lib" @@ -93,8 +90,7 @@ in rec { meta = common.meta // { description = common.meta.description + " CLI clients"; - longDescription = common.meta.longDescription + '' - This package provides the CLI clients, called 'icommands'.''; + longDescription = common.meta.longDescription + "This package provides the CLI clients, called 'icommands'."; }; }); } diff --git a/pkgs/tools/filesystems/jmtpfs/default.nix b/pkgs/tools/filesystems/jmtpfs/default.nix index fe45c953988..a9d3c40aae3 100644 --- a/pkgs/tools/filesystems/jmtpfs/default.nix +++ b/pkgs/tools/filesystems/jmtpfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, file, fuse, libmtp }: +{ lib, stdenv, fetchFromGitHub, pkg-config, file, fuse, libmtp }: let version = "0.5"; in stdenv.mkDerivation { @@ -12,7 +12,7 @@ stdenv.mkDerivation { owner = "JasonFerrara"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ file fuse libmtp ]; meta = with lib; { diff --git a/pkgs/tools/filesystems/lizardfs/default.nix b/pkgs/tools/filesystems/lizardfs/default.nix index 785a9225cf3..766ac1f82ea 100644 --- a/pkgs/tools/filesystems/lizardfs/default.nix +++ b/pkgs/tools/filesystems/lizardfs/default.nix @@ -12,7 +12,7 @@ , docbook_xml_dtd_412 , docbook_xsl , boost -, pkgconfig +, pkg-config , judy , pam , spdlog @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-rgaFhJvmA1RVDL4+vQLMC0GrdlgUlvJeZ5/JJ67C20Q="; }; - nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; + nativeBuildInputs = [ cmake pkg-config makeWrapper ]; buildInputs = [ db fuse asciidoc libxml2 libxslt docbook_xml_dtd_412 docbook_xsl diff --git a/pkgs/tools/filesystems/mergerfs/default.nix b/pkgs/tools/filesystems/mergerfs/default.nix index 60670708f4b..368f62f2196 100644 --- a/pkgs/tools/filesystems/mergerfs/default.nix +++ b/pkgs/tools/filesystems/mergerfs/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchFromGitHub, automake, autoconf, pkgconfig, gettext, libtool, pandoc, which, attr, libiconv }: +{ lib, stdenv, fetchFromGitHub, automake, autoconf, pkg-config, gettext, libtool, pandoc, which, attr, libiconv }: stdenv.mkDerivation rec { pname = "mergerfs"; - version = "2.32.0"; + version = "2.32.2"; src = fetchFromGitHub { owner = "trapexit"; repo = pname; rev = version; - sha256 = "1qmhwkl2ws0hwd7s1mzrdiw4h7jpilzcr0w8dgx465mdzb5d2jad"; + sha256 = "sha256-ybDVBcPkjsW2OxNxUmn5hG/qLEjxF9vqR8pZdb9tIBs="; }; nativeBuildInputs = [ - automake autoconf pkgconfig gettext libtool pandoc which + automake autoconf pkg-config gettext libtool pandoc which ]; prePatch = '' sed -i -e '/chown/d' -e '/chmod/d' libfuse/Makefile @@ -34,8 +34,8 @@ stdenv.mkDerivation rec { meta = { description = "A FUSE based union filesystem"; homepage = "https://github.com/trapexit/mergerfs"; - license = stdenv.lib.licenses.isc; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ jfrankenau makefu ]; + license = lib.licenses.isc; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ jfrankenau makefu ]; }; } diff --git a/pkgs/tools/filesystems/mergerfs/tools.nix b/pkgs/tools/filesystems/mergerfs/tools.nix index 2b3f6a8b3cb..e559fd9d4cd 100644 --- a/pkgs/tools/filesystems/mergerfs/tools.nix +++ b/pkgs/tools/filesystems/mergerfs/tools.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { "PREFIX=${placeholder "out"}" ]; - postInstall = with stdenv.lib; '' + postInstall = with lib; '' wrapProgram $out/bin/mergerfs.balance --prefix PATH : ${makeBinPath [ rsync ]} wrapProgram $out/bin/mergerfs.dup --prefix PATH : ${makeBinPath [ rsync ]} wrapProgram $out/bin/mergerfs.mktrash --prefix PATH : ${makeBinPath [ pythonPackages.xattr ]} diff --git a/pkgs/tools/filesystems/mhddfs/default.nix b/pkgs/tools/filesystems/mhddfs/default.nix index 94aa07b1043..3a0d0ab2f65 100644 --- a/pkgs/tools/filesystems/mhddfs/default.nix +++ b/pkgs/tools/filesystems/mhddfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fuse, pkgconfig, attr, uthash }: +{ lib, stdenv, fetchurl, fuse, pkg-config, attr, uthash }: stdenv.mkDerivation rec { pname = "mhddfs"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "14ggmh91vv69fp2qpz0nxp0hprlw2wsijss2k2485hb0ci4cabvh"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ fuse attr uthash ]; patches = [ @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://mhddfs.uvw.ru/"; description = "Combines a several mount points into the single one"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.makefu ]; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.makefu ]; }; } diff --git a/pkgs/tools/filesystems/moosefs/default.nix b/pkgs/tools/filesystems/moosefs/default.nix index 0d0f13b7c2b..e38b040ec0d 100644 --- a/pkgs/tools/filesystems/moosefs/default.nix +++ b/pkgs/tools/filesystems/moosefs/default.nix @@ -3,7 +3,7 @@ , makeWrapper , python , fuse -, pkgconfig +, pkg-config , libpcap , zlib }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "0dap9dqwwx8adma6arxg015riqc86cmjv2m44hk0kz7s24h79ipq"; }; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ fuse libpcap zlib python ]; diff --git a/pkgs/tools/filesystems/mp3fs/default.nix b/pkgs/tools/filesystems/mp3fs/default.nix index 12b64573c40..8b241e9026e 100644 --- a/pkgs/tools/filesystems/mp3fs/default.nix +++ b/pkgs/tools/filesystems/mp3fs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, flac, fuse, lame, libid3tag, pkgconfig }: +{ lib, stdenv, fetchurl, flac, fuse, lame, libid3tag, pkg-config }: stdenv.mkDerivation rec { pname = "mp3fs"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { patches = [ ./fix-statfs-operation.patch ]; buildInputs = [ flac fuse lame libid3tag ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; enableParallelBuilding = true; diff --git a/pkgs/tools/filesystems/mtdutils/default.nix b/pkgs/tools/filesystems/mtdutils/default.nix index 3b355c92226..d753e7c5204 100644 --- a/pkgs/tools/filesystems/mtdutils/default.nix +++ b/pkgs/tools/filesystems/mtdutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, cmocka, acl, libuuid, lzo, zlib, zstd }: +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, cmocka, acl, libuuid, lzo, zlib, zstd }: stdenv.mkDerivation rec { pname = "mtd-utils"; @@ -9,12 +9,12 @@ stdenv.mkDerivation rec { sha256 = "1lijl89l7hljx8xx70vrz9srd3h41v5gh4b0lvqnlv831yvyh5cd"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ] ++ stdenv.lib.optional doCheck cmocka; + nativeBuildInputs = [ autoreconfHook pkg-config ] ++ lib.optional doCheck cmocka; buildInputs = [ acl libuuid lzo zlib zstd ]; configureFlags = [ - (stdenv.lib.enableFeature doCheck "unit-tests") - (stdenv.lib.enableFeature doCheck "tests") + (lib.enableFeature doCheck "unit-tests") + (lib.enableFeature doCheck "tests") ]; enableParallelBuilding = true; @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { meta = { description = "Tools for MTD filesystems"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; homepage = "http://www.linux-mtd.infradead.org/"; - maintainers = with stdenv.lib.maintainers; [ viric ]; - platforms = with stdenv.lib.platforms; linux; + maintainers = with lib.maintainers; [ viric ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/tools/filesystems/mtools/default.nix b/pkgs/tools/filesystems/mtools/default.nix index b2cac0f7590..4316e0ee426 100644 --- a/pkgs/tools/filesystems/mtools/default.nix +++ b/pkgs/tools/filesystems/mtools/default.nix @@ -9,10 +9,10 @@ stdenv.mkDerivation rec { sha256 = "06pabnjc4r2vv3dzfm6q97g6jbp2k5bhmcdwv2cf25ka8y5ir7sk"; }; - patches = stdenv.lib.optional stdenv.isDarwin ./UNUSED-darwin.patch; + patches = lib.optional stdenv.isDarwin ./UNUSED-darwin.patch; # fails to find X on darwin - configureFlags = stdenv.lib.optional stdenv.isDarwin "--without-x"; + configureFlags = lib.optional stdenv.isDarwin "--without-x"; doCheck = true; diff --git a/pkgs/tools/filesystems/mtpfs/default.nix b/pkgs/tools/filesystems/mtpfs/default.nix index 295b7a0e5e5..e0b1cffe4dd 100644 --- a/pkgs/tools/filesystems/mtpfs/default.nix +++ b/pkgs/tools/filesystems/mtpfs/default.nix @@ -1,9 +1,9 @@ -{ lib, stdenv, fetchurl, pkgconfig, fuse, libmtp, glib, libmad, libid3tag }: +{ lib, stdenv, fetchurl, pkg-config, fuse, libmtp, glib, libmad, libid3tag }: stdenv.mkDerivation rec { name = "mtpfs-1.1"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ fuse libmtp glib libid3tag libmad ]; # adding LIBS is a hack, duno why it does not find libid3tag.so by adding buildInputs diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/pkgs/tools/filesystems/netatalk/default.nix index 6abad445517..486963f44b9 100644 --- a/pkgs/tools/filesystems/netatalk/default.nix +++ b/pkgs/tools/filesystems/netatalk/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, autoreconfHook, pkgconfig, perl, python +{ fetchurl, lib, stdenv, autoreconfHook, pkg-config, perl, python , db, libgcrypt, avahi, libiconv, pam, openssl, acl , ed, libtirpc, libevent }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ./omitLocalstatedirCreation.patch ]; - nativeBuildInputs = [ autoreconfHook pkgconfig perl python python.pkgs.wrapPython ]; + nativeBuildInputs = [ autoreconfHook pkg-config perl python python.pkgs.wrapPython ]; buildInputs = [ db libgcrypt avahi libiconv pam openssl acl libevent ]; @@ -54,8 +54,8 @@ stdenv.mkDerivation rec { meta = { description = "Apple Filing Protocol Server"; homepage = "http://netatalk.sourceforge.net/"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ jcumming ]; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ jcumming ]; }; } diff --git a/pkgs/tools/filesystems/nilfs-utils/default.nix b/pkgs/tools/filesystems/nilfs-utils/default.nix index 72d07ed1922..0639c6a6f21 100644 --- a/pkgs/tools/filesystems/nilfs-utils/default.nix +++ b/pkgs/tools/filesystems/nilfs-utils/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { configureFlags = [ "--with-libmount" - ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # AC_FUNC_MALLOC is broken on cross builds. "ac_cv_func_malloc_0_nonnull=yes" "ac_cv_func_realloc_0_nonnull=yes" diff --git a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix index 17a324525f8..94ed258d332 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix @@ -1,6 +1,6 @@ # FIXME: Unify with pkgs/development/python-modules/blivet/default.nix. -{ lib, stdenv, fetchurl, buildPythonApplication, pykickstart, pyparted, pyblock +{ lib, fetchurl, buildPythonApplication, pykickstart, pyparted, pyblock , libselinux, cryptsetup, multipath_tools, lsof, util-linux , useNixUdev ? true, systemd ? null # useNixUdev is here for bw compatibility @@ -30,13 +30,13 @@ buildPythonApplication rec { sed -i -e 's|"lsof"|"${lsof}/bin/lsof"|' blivet/formats/fs.py sed -i -r -e 's|"(u?mount)"|"${util-linux.bin}/bin/\1"|' blivet/util.py sed -i -e '/find_library/,/find_library/ { - c libudev = "${stdenv.lib.getLib systemd}/lib/libudev.so.1" + c libudev = "${lib.getLib systemd}/lib/libudev.so.1" }' blivet/pyudev.py ''; propagatedBuildInputs = [ pykickstart pyparted pyblock libselinux cryptsetup - ] ++ stdenv.lib.optional useNixUdev systemd; + ] ++ lib.optional useNixUdev systemd; # tests are currently _heavily_ broken upstream doCheck = false; diff --git a/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix b/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix index 88a1716a0e1..6e372b75a7d 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, lvm2, libgcrypt, libuuid, pkgconfig, popt +{ lib, stdenv, fetchurl, fetchpatch, lvm2, libgcrypt, libuuid, pkg-config, popt , enablePython ? true, python ? null }: @@ -22,17 +22,17 @@ stdenv.mkDerivation rec { ]; configureFlags = [ "--enable-cryptsetup-reencrypt" ] - ++ stdenv.lib.optional enablePython "--enable-python"; + ++ lib.optional enablePython "--enable-python"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ lvm2 libgcrypt libuuid popt ] - ++ stdenv.lib.optional enablePython python; + ++ lib.optional enablePython python; - meta = { + meta = with lib; { homepage = "http://code.google.com/p/cryptsetup/"; description = "LUKS for dm-crypt"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ ]; - platforms = with stdenv.lib.platforms; linux; + license = licenses.gpl2; + maintainers = with maintainers; [ ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/tools/filesystems/nixpart/0.4/default.nix b/pkgs/tools/filesystems/nixpart/0.4/default.nix index 3ad9de468b4..7b773a61a5f 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/default.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/default.nix @@ -10,47 +10,47 @@ let blivet = import ./blivet.nix { - inherit stdenv fetchurl buildPythonApplication; + inherit lib fetchurl buildPythonApplication; inherit pykickstart pyparted pyblock cryptsetup libselinux multipath_tools; inherit useNixUdev; inherit (pkgs) lsof util-linux systemd; }; cryptsetup = import ./cryptsetup.nix { - inherit stdenv fetchurl python; - inherit (pkgs) fetchpatch pkgconfig libgcrypt libuuid popt lvm2; + inherit lib stdenv fetchurl python; + inherit (pkgs) fetchpatch pkg-config libgcrypt libuuid popt lvm2; }; dmraid = import ./dmraid.nix { - inherit stdenv fetchurl lvm2; + inherit lib stdenv fetchurl lvm2; }; lvm2 = import ./lvm2.nix { - inherit stdenv fetchurl; - inherit (pkgs) fetchpatch pkgconfig util-linux systemd coreutils; + inherit lib stdenv fetchurl; + inherit (pkgs) fetchpatch pkg-config util-linux systemd coreutils; }; multipath_tools = import ./multipath-tools.nix { - inherit stdenv fetchurl lvm2; + inherit lib stdenv fetchurl lvm2; inherit (pkgs) fetchpatch readline systemd libaio gzip; }; parted = import ./parted.nix { - inherit stdenv fetchurl; + inherit lib stdenv fetchurl; inherit (pkgs) fetchpatch util-linux readline libuuid gettext check lvm2; }; pyblock = import ./pyblock.nix { - inherit stdenv fetchurl python lvm2 dmraid; + inherit lib stdenv fetchurl python lvm2 dmraid; }; pykickstart = import ./pykickstart.nix { - inherit stdenv fetchurl python buildPythonApplication urlgrabber; + inherit lib fetchurl python buildPythonApplication urlgrabber; }; pyparted = import ./pyparted.nix { - inherit stdenv fetchurl python buildPythonApplication parted; - inherit (pkgs) pkgconfig e2fsprogs; + inherit lib stdenv fetchurl python buildPythonApplication parted; + inherit (pkgs) pkg-config e2fsprogs; }; in buildPythonApplication rec { diff --git a/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix b/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix index fd608889102..c5d8eebc47c 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lvm2 }: +{ lib, stdenv, fetchurl, lvm2 }: stdenv.mkDerivation rec { name = "dmraid-1.0.0.rc15"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ lvm2 ]; - meta = { + meta = with lib; { description = "Old-style RAID configuration utility"; longDescription = '' Old RAID configuration utility (still under development, though). @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { its volumes. May be needed for rescuing an older system or nuking the metadata when reformatting. ''; - maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = stdenv.lib.platforms.linux; + maintainers = [ maintainers.raskin ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix b/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix index 4369d659034..ca349c7f42e 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, systemd, util-linux, coreutils }: +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, systemd, util-linux, coreutils }: let v = "2.02.106"; @@ -28,11 +28,11 @@ stdenv.mkDerivation { "--disable-readline" "--enable-udev_rules" "--enable-udev_sync" - "--enable-pkgconfig" + "--enable-pkg-config" "--enable-applib" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ systemd ]; preConfigure = @@ -68,9 +68,9 @@ stdenv.mkDerivation { cp scripts/lvm2_activation_generator_systemd_red_hat $out/lib/systemd/system-generators ''; - meta = { + meta = with lib; { homepage = "http://sourceware.org/lvm2/"; description = "Tools to support Logical Volume Management (LVM) on Linux"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix b/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix index 36525e6fa3c..976a3ce2567 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix @@ -1,6 +1,6 @@ # FIXME: unify with pkgs/os-specific/linux/multipath-tools/default.nix. -{ stdenv, fetchurl, fetchpatch, lvm2, libaio, gzip, readline, systemd }: +{ lib, stdenv, fetchurl, fetchpatch, lvm2, libaio, gzip, readline, systemd }: stdenv.mkDerivation rec { name = "multipath-tools-0.4.9"; @@ -36,8 +36,8 @@ stdenv.mkDerivation rec { substituteInPlace kpartx/kpartx.rules --replace /sbin/kpartx $out/sbin/kpartx substituteInPlace kpartx/kpartx_id --replace /sbin/dmsetup ${lvm2}/sbin/dmsetup - substituteInPlace libmultipath/defaults.h --replace /lib/udev/scsi_id ${stdenv.lib.getLib systemd}/lib/udev/scsi_id - substituteInPlace libmultipath/hwtable.c --replace /lib/udev/scsi_id ${stdenv.lib.getLib systemd}/lib/udev/scsi_id + substituteInPlace libmultipath/defaults.h --replace /lib/udev/scsi_id ${lib.getLib systemd}/lib/udev/scsi_id + substituteInPlace libmultipath/hwtable.c --replace /lib/udev/scsi_id ${lib.getLib systemd}/lib/udev/scsi_id sed -i -re ' s,^( *#define +DEFAULT_MULTIPATHDIR\>).*,\1 "'"$out/lib/multipath"'", @@ -45,9 +45,9 @@ stdenv.mkDerivation rec { ''; - meta = { + meta = with lib; { description = "Tools for the Linux multipathing driver"; homepage = "http://christophe.varoqui.free.fr/"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/filesystems/nixpart/0.4/parted.nix b/pkgs/tools/filesystems/nixpart/0.4/parted.nix index d3fc9ce96f5..2891f990afb 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/parted.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/parted.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, lvm2, libuuid, gettext, readline +{ lib,stdenv, fetchurl, fetchpatch, lvm2, libuuid, gettext, readline , util-linux, check , enableStatic ? stdenv.hostPlatform.isStatic }: @@ -21,21 +21,21 @@ stdenv.mkDerivation rec { ]; buildInputs = [ libuuid ] - ++ stdenv.lib.optional (readline != null) readline - ++ stdenv.lib.optional (gettext != null) gettext - ++ stdenv.lib.optional (lvm2 != null) lvm2; + ++ lib.optional (readline != null) readline + ++ lib.optional (gettext != null) gettext + ++ lib.optional (lvm2 != null) lvm2; configureFlags = (if (readline != null) then [ "--with-readline" ] else [ "--without-readline" ]) - ++ stdenv.lib.optional (lvm2 == null) "--disable-device-mapper" - ++ stdenv.lib.optional enableStatic "--enable-static"; + ++ lib.optional (lvm2 == null) "--disable-device-mapper" + ++ lib.optional enableStatic "--enable-static"; doCheck = true; checkInputs = [ check util-linux ]; - meta = { + meta = with lib; { description = "Create, destroy, resize, check, and copy partitions"; longDescription = '' @@ -49,13 +49,13 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.gnu.org/software/parted/"; - license = stdenv.lib.licenses.gpl3Plus; + license = licenses.gpl3Plus; maintainers = [ # Add your name here! ]; # GNU Parted requires libuuid, which is part of util-linux-ng. - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix b/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix index f087edd853d..ddf260300fb 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, lvm2, dmraid }: +{ lib, stdenv, fetchurl, python, lvm2, dmraid }: stdenv.mkDerivation rec { pname = "pyblock"; @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { "SITELIB=$(out)/lib/${python.libPrefix}/site-packages" ]; - meta = { + meta = with lib; { description = "Interface for working with block devices"; - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix b/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix index 0698dcd9ecb..092db8ee7c4 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix @@ -1,4 +1,4 @@ -{ stdenv, python, buildPythonApplication, fetchurl, urlgrabber }: +{ lib, python, buildPythonApplication, fetchurl, urlgrabber }: buildPythonApplication rec { pname = "pykickstart"; @@ -22,9 +22,9 @@ buildPythonApplication rec { ${python}/bin/${python.executable} tests/baseclass.py -vv ''; - meta = { + meta = with lib; { homepage = "http://fedoraproject.org/wiki/Pykickstart"; description = "Read and write Fedora kickstart files"; - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix b/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix index f71e7c3a06d..9d1eff2bab7 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, python, buildPythonApplication, parted, e2fsprogs }: +{ lib, stdenv, fetchurl, pkg-config, python, buildPythonApplication, parted, e2fsprogs }: buildPythonApplication rec { pname = "pyparted"; @@ -14,7 +14,7 @@ buildPythonApplication rec { sed -i -e ' s|e\.path\.startswith("/tmp/temp-device-")|"temp-device-" in e.path| ' tests/test__ped_ped.py - '' + stdenv.lib.optionalString stdenv.isi686 '' + '' + lib.optionalString stdenv.isi686 '' # remove some integers in this test case which overflow on 32bit systems sed -i -r -e '/class *UnitGetSizeTestCase/,/^$/{/[0-9]{11}/d}' \ tests/test__ped_ped.py @@ -24,7 +24,7 @@ buildPythonApplication rec { PATH="${parted}/sbin:$PATH" ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ parted ]; @@ -33,10 +33,10 @@ buildPythonApplication rec { make test PYTHON=${python.executable} ''; - meta = { + meta = with lib; { homepage = "https://fedorahosted.org/pyparted/"; description = "Python interface for libparted"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2Plus; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/filesystems/nixpart/default.nix b/pkgs/tools/filesystems/nixpart/default.nix index 809c5256873..80ae8ca2b3c 100644 --- a/pkgs/tools/filesystems/nixpart/default.nix +++ b/pkgs/tools/filesystems/nixpart/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPythonApplication, blivet }: +{ lib, fetchurl, buildPythonApplication, blivet }: buildPythonApplication rec { pname = "nixpart"; @@ -13,8 +13,8 @@ buildPythonApplication rec { meta = { description = "NixOS storage manager/partitioner"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.aszlig ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.aszlig ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix index 30c7aa7ba36..7039584ea90 100644 --- a/pkgs/tools/filesystems/ntfs-3g/default.nix +++ b/pkgs/tools/filesystems/ntfs-3g/default.nix @@ -1,5 +1,5 @@ {lib, stdenv, fetchurl, util-linux, libuuid -, crypto ? false, libgcrypt, gnutls, pkgconfig}: +, crypto ? false, libgcrypt, gnutls, pkg-config}: stdenv.mkDerivation rec { pname = "ntfs3g"; @@ -7,8 +7,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" "doc" ]; - buildInputs = [ libuuid ] ++ stdenv.lib.optionals crypto [ gnutls libgcrypt ]; - nativeBuildInputs = stdenv.lib.optional crypto pkgconfig; + buildInputs = [ libuuid ] ++ lib.optionals crypto [ gnutls libgcrypt ]; + nativeBuildInputs = lib.optional crypto pkg-config; src = fetchurl { url = "https://tuxera.com/opensource/ntfs-3g_ntfsprogs-${version}.tgz"; diff --git a/pkgs/tools/filesystems/orangefs/default.nix b/pkgs/tools/filesystems/orangefs/default.nix index 1b10941f139..f6a35437fb9 100644 --- a/pkgs/tools/filesystems/orangefs/default.nix +++ b/pkgs/tools/filesystems/orangefs/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc/orangefs" "--enable-shared" "--enable-fast" - "--with-ssl=${stdenv.lib.getDev openssl}" + "--with-ssl=${lib.getDev openssl}" ]; diff --git a/pkgs/tools/filesystems/rdfind/default.nix b/pkgs/tools/filesystems/rdfind/default.nix index 62d602f0680..08562aed363 100644 --- a/pkgs/tools/filesystems/rdfind/default.nix +++ b/pkgs/tools/filesystems/rdfind/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://rdfind.pauldreik.se/"; description = "Removes or hardlinks duplicate files very swiftly"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; maintainers = [ maintainers.wmertens ]; platforms = platforms.all; }; diff --git a/pkgs/tools/filesystems/reiserfsprogs/default.nix b/pkgs/tools/filesystems/reiserfsprogs/default.nix index daafdbf231f..dc97cdb652e 100644 --- a/pkgs/tools/filesystems/reiserfsprogs/default.nix +++ b/pkgs/tools/filesystems/reiserfsprogs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libuuid, autoreconfHook }: +{ lib, stdenv, fetchurl, libuuid, autoreconfHook }: let version = "3.6.24"; in stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { inherit version; homepage = "http://www.namesys.com/"; description = "ReiserFS utilities"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/filesystems/rmount/default.nix b/pkgs/tools/filesystems/rmount/default.nix index fb1e1a5539a..96d950e74ff 100644 --- a/pkgs/tools/filesystems/rmount/default.nix +++ b/pkgs/tools/filesystems/rmount/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { install -D ${src}/rmount.bash $out/bin/rmount install -D ${src}/config.json $out/share/config.json - wrapProgram $out/bin/rmount --prefix PATH : ${stdenv.lib.makeBinPath [ nmap jq cifs-utils sshfs ]} + wrapProgram $out/bin/rmount --prefix PATH : ${lib.makeBinPath [ nmap jq cifs-utils sshfs ]} ''; meta = with lib; { diff --git a/pkgs/tools/filesystems/romdirfs/default.nix b/pkgs/tools/filesystems/romdirfs/default.nix index 12b6978af62..b4fa173706e 100644 --- a/pkgs/tools/filesystems/romdirfs/default.nix +++ b/pkgs/tools/filesystems/romdirfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, fuse }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, fuse }: stdenv.mkDerivation rec { pname = "romdirfs"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1jbsmpklrycz5q86qmzvbz4iz2g5fvd7p9nca160aw2izwpws0g7"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ fuse ]; meta = with lib; { diff --git a/pkgs/tools/filesystems/s3backer/default.nix b/pkgs/tools/filesystems/s3backer/default.nix index b617414aac8..650fd713a0e 100644 --- a/pkgs/tools/filesystems/s3backer/default.nix +++ b/pkgs/tools/filesystems/s3backer/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, autoreconfHook, pkgconfig +, autoreconfHook, pkg-config , fuse, curl, expat }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "archiecobbs"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ fuse curl expat ]; autoreconfPhase = '' diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/pkgs/tools/filesystems/s3fs/default.nix index 487ecf63c93..4ff36e3b1d8 100644 --- a/pkgs/tools/filesystems/s3fs/default.nix +++ b/pkgs/tools/filesystems/s3fs/default.nix @@ -1,20 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, curl, openssl, libxml2, fuse, osxfuse }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, curl, openssl, libxml2, fuse, osxfuse }: stdenv.mkDerivation rec { pname = "s3fs-fuse"; - version = "1.87"; + version = "1.88"; src = fetchFromGitHub { owner = "s3fs-fuse"; repo = "s3fs-fuse"; rev = "v${version}"; - sha256 = "09ib3sh6vg3z7cpccj3ysgpdyf84a98lf6nz15a61r4l27h111f2"; + sha256 = "sha256-LxqTKu9F8FqHnjp1a9E/+WbH1Ol6if/OpY7LGsVE9Bw="; }; buildInputs = [ curl openssl libxml2 ] - ++ stdenv.lib.optionals stdenv.isLinux [ fuse ] - ++ stdenv.lib.optionals stdenv.isDarwin [ osxfuse ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + ++ lib.optionals stdenv.isLinux [ fuse ] + ++ lib.optionals stdenv.isDarwin [ osxfuse ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; configureFlags = [ "--with-openssl" diff --git a/pkgs/tools/filesystems/sandboxfs/default.nix b/pkgs/tools/filesystems/sandboxfs/default.nix index 8777fa50a5d..32d186344dd 100644 --- a/pkgs/tools/filesystems/sandboxfs/default.nix +++ b/pkgs/tools/filesystems/sandboxfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , rustPlatform , fuse diff --git a/pkgs/tools/filesystems/sasquatch/default.nix b/pkgs/tools/filesystems/sasquatch/default.nix index 011387e7a4d..7f92da6a224 100644 --- a/pkgs/tools/filesystems/sasquatch/default.nix +++ b/pkgs/tools/filesystems/sasquatch/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ lzma lzo xz zlib ] - ++ stdenv.lib.optional lz4Support lz4; + ++ lib.optional lz4Support lz4; patches = [ patch ]; patchFlags = [ "-p0" ]; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { installFlags = [ "INSTALL_DIR=\${out}/bin" ]; makeFlags = [ "XZ_SUPPORT=1" ] - ++ stdenv.lib.optional lz4Support "LZ4_SUPPORT=1"; + ++ lib.optional lz4Support "LZ4_SUPPORT=1"; meta = with lib; { homepage = "https://github.com/devttys0/sasquatch"; diff --git a/pkgs/tools/filesystems/smbnetfs/default.nix b/pkgs/tools/filesystems/smbnetfs/default.nix index 7967be70106..05d7189fbaa 100644 --- a/pkgs/tools/filesystems/smbnetfs/default.nix +++ b/pkgs/tools/filesystems/smbnetfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fuse, samba, pkgconfig, glib, autoconf, attr, libsecret }: +{ lib, stdenv, fetchurl, fuse, samba, pkg-config, glib, autoconf, attr, libsecret }: stdenv.mkDerivation rec { pname = "smbnetfs"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "19x9978k90w9a65lrpsphk7swsq8zkws9jc27q4zbndrm0r2snr0"; }; - nativeBuildInputs = [ pkgconfig autoconf ]; + nativeBuildInputs = [ pkg-config autoconf ]; buildInputs = [ fuse samba glib attr libsecret ]; postPatch = '' diff --git a/pkgs/tools/filesystems/snapraid/default.nix b/pkgs/tools/filesystems/snapraid/default.nix index de6d25e128a..d854558b792 100644 --- a/pkgs/tools/filesystems/snapraid/default.nix +++ b/pkgs/tools/filesystems/snapraid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "snapraid"; @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.snapraid.it/"; description = "A backup program for disk arrays"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.makefu ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.makefu ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/filesystems/squashfs-tools-ng/default.nix b/pkgs/tools/filesystems/squashfs-tools-ng/default.nix index 0c977799db8..593004d552c 100644 --- a/pkgs/tools/filesystems/squashfs-tools-ng/default.nix +++ b/pkgs/tools/filesystems/squashfs-tools-ng/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, doxygen, graphviz, perl, pkgconfig +{ stdenv, lib, fetchurl, doxygen, graphviz, perl, pkg-config , lz4, lzo, xz, zlib, zstd }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "120x2hlbhpm90bzxz70z764552ffrjpidmp1y6gafx70zp0hrks4"; }; - nativeBuildInputs = [ doxygen graphviz pkgconfig perl ]; + nativeBuildInputs = [ doxygen graphviz pkg-config perl ]; buildInputs = [ zlib xz lz4 lzo zstd ]; meta = with lib; { diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix index 16390cba238..c833cfe10ad 100644 --- a/pkgs/tools/filesystems/squashfs/default.nix +++ b/pkgs/tools/filesystems/squashfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, zlib, xz +{ lib, stdenv, fetchFromGitHub, zlib, xz , lz4 , zstd }: @@ -19,7 +19,7 @@ stdenv.mkDerivation { # This patch adds an option to pad filesystems (increasing size) in # exchange for better chunking / binary diff calculation. ./4k-align.patch - ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin.patch; + ] ++ lib.optional stdenv.isDarwin ./darwin.patch; buildInputs = [ zlib xz zstd lz4 ]; @@ -32,8 +32,8 @@ stdenv.mkDerivation { meta = { homepage = "http://squashfs.sourceforge.net/"; description = "Tool for creating and unpacking squashfs filesystems"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ ruuda ]; + platforms = lib.platforms.unix; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ ruuda ]; }; } diff --git a/pkgs/tools/filesystems/squashfuse/default.nix b/pkgs/tools/filesystems/squashfuse/default.nix index 9f9c4a605c6..a2e930f9155 100644 --- a/pkgs/tools/filesystems/squashfuse/default.nix +++ b/pkgs/tools/filesystems/squashfuse/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, libtool, fuse, - pkgconfig, lz4, xz, zlib, lzo, zstd }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, libtool, fuse, + pkg-config, lz4, xz, zlib, lzo, zstd }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "062s77y32p80vc24a79z31g90b9wxzvws1xvicgx5fn1pd0xa0q6"; }; - nativeBuildInputs = [ autoreconfHook libtool pkgconfig ]; + nativeBuildInputs = [ autoreconfHook libtool pkg-config ]; buildInputs = [ lz4 xz zlib lzo zstd fuse ]; meta = { diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix index bec84b3810e..69826941d00 100644 --- a/pkgs/tools/filesystems/sshfs-fuse/default.nix +++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ fuse3 glib ]; checkInputs = [ which python3Packages.pytest ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString + NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.hostPlatform.system == "i686-linux") "-D_FILE_OFFSET_BITS=64"; diff --git a/pkgs/tools/filesystems/svnfs/default.nix b/pkgs/tools/filesystems/svnfs/default.nix index 4ae4ebb6f19..bef4d6b5cea 100644 --- a/pkgs/tools/filesystems/svnfs/default.nix +++ b/pkgs/tools/filesystems/svnfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, automake, autoconf, subversion, fuse, apr, perl }: +{ lib, stdenv, fetchurl, automake, autoconf, subversion, fuse, apr, perl }: stdenv.mkDerivation { name = "svnfs-0.4"; @@ -21,8 +21,8 @@ stdenv.mkDerivation { meta = { description = "FUSE filesystem for accessing Subversion repositories"; homepage = "http://www.jmadden.eu/index.php/svnfs/"; - license = stdenv.lib.licenses.gpl2; - maintainers = [stdenv.lib.maintainers.marcweber]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [lib.maintainers.marcweber]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/filesystems/tmsu/default.nix b/pkgs/tools/filesystems/tmsu/default.nix index 7129de95013..1eac3e03ec9 100644 --- a/pkgs/tools/filesystems/tmsu/default.nix +++ b/pkgs/tools/filesystems/tmsu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, fuse, installShellFiles }: +{ lib, buildGoPackage, fetchFromGitHub, fuse, installShellFiles }: buildGoPackage rec { pname = "tmsu"; diff --git a/pkgs/tools/filesystems/ubidump/default.nix b/pkgs/tools/filesystems/ubidump/default.nix index 2787b87964f..6a6409ad325 100644 --- a/pkgs/tools/filesystems/ubidump/default.nix +++ b/pkgs/tools/filesystems/ubidump/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3, makeWrapper }: +{ lib, fetchFromGitHub, python3, makeWrapper }: python3.pkgs.buildPythonApplication rec { diff --git a/pkgs/tools/filesystems/vmfs-tools/default.nix b/pkgs/tools/filesystems/vmfs-tools/default.nix index 2d4f3b22a77..b60dccc4e68 100644 --- a/pkgs/tools/filesystems/vmfs-tools/default.nix +++ b/pkgs/tools/filesystems/vmfs-tools/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchFromGitHub -, pkgconfig +, pkg-config , asciidoc , docbook_xsl , fuse @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "14y412ww5hxk336ils62s3fwykfh6mx1j0iiaa5cwc615pi6qvi4"; }; - nativeBuildInputs = [ asciidoc docbook_xsl libxslt pkgconfig ]; + nativeBuildInputs = [ asciidoc docbook_xsl libxslt pkg-config ]; buildInputs = [ fuse libuuid ]; diff --git a/pkgs/tools/filesystems/wdfs/default.nix b/pkgs/tools/filesystems/wdfs/default.nix index d32138f184b..98377365738 100644 --- a/pkgs/tools/filesystems/wdfs/default.nix +++ b/pkgs/tools/filesystems/wdfs/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, glib, neon, fuse, pkgconfig}: +{lib, stdenv, fetchurl, glib, neon, fuse, pkg-config}: stdenv.mkDerivation { name = "wdfs-fuse-1.4.2"; @@ -6,7 +6,7 @@ stdenv.mkDerivation { url = "http://noedler.de/projekte/wdfs/wdfs-1.4.2.tar.gz"; sha256 = "fcf2e1584568b07c7f3683a983a9be26fae6534b8109e09167e5dff9114ba2e5"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [fuse glib neon]; meta = with lib; { diff --git a/pkgs/tools/filesystems/xfsprogs/default.nix b/pkgs/tools/filesystems/xfsprogs/default.nix index 3e3c26329c4..009c5e05d5d 100644 --- a/pkgs/tools/filesystems/xfsprogs/default.nix +++ b/pkgs/tools/filesystems/xfsprogs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPackages, fetchpatch, fetchurl, autoconf, automake, gettext, libtool, pkgconfig +{ lib, stdenv, buildPackages, fetchpatch, fetchurl, autoconf, automake, gettext, libtool, pkg-config , icu, libuuid, readline, inih }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ - autoconf automake libtool gettext pkgconfig + autoconf automake libtool gettext pkg-config libuuid # codegen tool uses libuuid ]; buildInputs = [ readline icu inih ]; diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix index 152fd1d7a71..d2779e2b4c5 100644 --- a/pkgs/tools/filesystems/yandex-disk/default.nix +++ b/pkgs/tools/filesystems/yandex-disk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, writeText, zlib, rpmextract, patchelf, which }: +{ lib, stdenv, fetchurl, writeText, zlib, rpmextract, patchelf, which }: let p = if stdenv.is64bit then { @@ -49,9 +49,9 @@ stdenv.mkDerivation rec { meta = { homepage = "https://help.yandex.com/disk/cli-clients.xml"; description = "A free cloud file storage service"; - maintainers = with stdenv.lib.maintainers; [ smironov jagajaga ]; + maintainers = with lib.maintainers; [ smironov jagajaga ]; platforms = ["i686-linux" "x86_64-linux"]; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; longDescription = '' Yandex.Disk console client for Linux lets you manage files on Disk without using a window interface or programs that support WebDAV. The advantages diff --git a/pkgs/tools/filesystems/zerofree/default.nix b/pkgs/tools/filesystems/zerofree/default.nix index f9fd8a3c7f3..2489357f73f 100644 --- a/pkgs/tools/filesystems/zerofree/default.nix +++ b/pkgs/tools/filesystems/zerofree/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, e2fsprogs }: +{ lib, stdenv, fetchurl, e2fsprogs }: stdenv.mkDerivation rec { pname = "zerofree"; @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://frippery.org/uml/"; description = "Zero free blocks from ext2, ext3 and ext4 file-systems"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.theuni ]; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.theuni ]; }; } diff --git a/pkgs/tools/games/ajour/default.nix b/pkgs/tools/games/ajour/default.nix new file mode 100644 index 00000000000..291c783c914 --- /dev/null +++ b/pkgs/tools/games/ajour/default.nix @@ -0,0 +1,81 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, autoPatchelfHook +, cmake +, makeWrapper +, pkg-config +, python3 +, expat +, freetype +, kdialog +, zenity +, openssl +, libX11 +, libxcb +, libXcursor +, libXi +, libxkbcommon +, libXrandr +, vulkan-loader +, wayland +}: + +let + rpathLibs = [ + libXcursor + libXi + libxkbcommon + libXrandr + libX11 + vulkan-loader + wayland + ]; + +in rustPlatform.buildRustPackage rec { + pname = "Ajour"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "casperstorm"; + repo = "ajour"; + rev = version; + sha256 = "1lwwj16q24k3d3vaj64zkai4cb15hxp6bzicp004q5az4gbriwih"; + }; + + cargoSha256 = "17j6v796ahfn07yjj9xd9kygy0sllz93ac4gky8w0hcixdwjp3i5"; + + nativeBuildInputs = [ + autoPatchelfHook + cmake + makeWrapper + pkg-config + python3 + ]; + + buildInputs = [ + expat + freetype + openssl + libxcb + libX11 + ]; + + fixupPhase = '' + patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}:$(patchelf --print-rpath $out/bin/ajour)" $out/bin/ajour + wrapProgram $out/bin/ajour --prefix PATH ":" ${lib.makeBinPath [ zenity kdialog ]} + ''; + + meta = with lib; { + description = "World of Warcraft addon manager written in Rust"; + longDescription = '' + Ajour is a World of Warcraft addon manager written in Rust with a + strong focus on performance and simplicity. The project is + completely advertisement free, privacy respecting and open source. + ''; + homepage = "https://github.com/casperstorm/ajour"; + changelog = "https://github.com/casperstorm/ajour/blob/master/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix index 727aa1dc56e..9dc2ad4d5f5 100644 --- a/pkgs/tools/graphics/argyllcms/default.nix +++ b/pkgs/tools/graphics/argyllcms/default.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { buildFlags = [ "all" ]; makeFlags = [ - "PREFIX=${placeholder ''out''}" + "PREFIX=${placeholder "out"}" ]; # Install udev rules, but remove lines that set up the udev-acl diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index a7c6d6eb439..34bb1b8cc3a 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }; patches = - (stdenv.lib.optional (stdenv.lib.versionOlder version "2.68") + (lib.optional (lib.versionOlder version "2.68") (fetchpatch { url = "https://github.com/vectorgraphics/asymptote/commit/3361214340d58235f4dbb8f24017d0cd5d94da72.patch"; sha256 = "sha256:1z2b41x8v7683myd45lq6niixpdjy0b185x0xl61130vrijhq5nm"; @@ -47,9 +47,9 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glm - ] ++ stdenv.lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ freeglut libGLU libGL mesa.osmesa - ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ OpenGL GLUT Cocoa ]); diff --git a/pkgs/tools/graphics/blockhash/default.nix b/pkgs/tools/graphics/blockhash/default.nix index 3ea88053d9e..a0ecdde3826 100644 --- a/pkgs/tools/graphics/blockhash/default.nix +++ b/pkgs/tools/graphics/blockhash/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python, pkgconfig, imagemagick, wafHook }: +{ lib, stdenv, fetchFromGitHub, python, pkg-config, imagemagick, wafHook }: stdenv.mkDerivation rec { pname = "blockhash"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0m7ikppl42iicgmwsb7baajmag7v0p1ab06xckifvrr0zm21bq9p"; }; - nativeBuildInputs = [ python pkgconfig wafHook ]; + nativeBuildInputs = [ python pkg-config wafHook ]; buildInputs = [ imagemagick ]; meta = with lib; { diff --git a/pkgs/tools/graphics/blur-effect/default.nix b/pkgs/tools/graphics/blur-effect/default.nix index 7ccda815e1c..e393da50832 100644 --- a/pkgs/tools/graphics/blur-effect/default.nix +++ b/pkgs/tools/graphics/blur-effect/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, cmake, gdk-pixbuf, libGL, mesa }: +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, gdk-pixbuf, libGL, mesa }: stdenv.mkDerivation rec { pname = "blur-effect"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config cmake ]; diff --git a/pkgs/tools/graphics/briss/default.nix b/pkgs/tools/graphics/briss/default.nix index 3ac49b690d7..b554ac9b3c0 100644 --- a/pkgs/tools/graphics/briss/default.nix +++ b/pkgs/tools/graphics/briss/default.nix @@ -1,6 +1,6 @@ # The releases of this project are apparently precompiled to .jar files. -{ stdenv, fetchurl, jre, makeWrapper }: +{ lib, stdenv, fetchurl, jre, makeWrapper }: let @@ -27,7 +27,7 @@ in stdenv.mkDerivation { meta = { homepage = "https://sourceforge.net/projects/briss/"; description = "Java application for cropping PDF files"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl3; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/graphics/cfdg/src-for-default.nix b/pkgs/tools/graphics/cfdg/src-for-default.nix index 6d98ea240de..7ff076a5b0a 100644 --- a/pkgs/tools/graphics/cfdg/src-for-default.nix +++ b/pkgs/tools/graphics/cfdg/src-for-default.nix @@ -4,6 +4,6 @@ hash="1pd1hjippbhad8l4s4lsglykh22i24qfrgmnxrsx71bvcqbr356p"; url="http://www.contextfreeart.org/download/ContextFreeSource3.0.2.tgz"; advertisedUrl="http://www.contextfreeart.org/download/ContextFreeSource3.0.2.tgz"; - - + + } diff --git a/pkgs/tools/graphics/cfdg/src-info-for-default.nix b/pkgs/tools/graphics/cfdg/src-info-for-default.nix index 0e2018b6bfd..b84376e9882 100644 --- a/pkgs/tools/graphics/cfdg/src-info-for-default.nix +++ b/pkgs/tools/graphics/cfdg/src-info-for-default.nix @@ -1,6 +1,6 @@ { downloadPage = "https://contextfreeart.org/mediawiki/index.php/Download_page"; baseName = "cfdg"; - sourceRegexp = ''.*[.]tgz''; + sourceRegexp = ".*[.]tgz"; versionExtractorSedScript = ''s/[^0-9]*([0-9.]*)[.]tgz/\1/''; } diff --git a/pkgs/tools/graphics/convchain/default.nix b/pkgs/tools/graphics/convchain/default.nix index b1ce3082d25..714cdd656df 100644 --- a/pkgs/tools/graphics/convchain/default.nix +++ b/pkgs/tools/graphics/convchain/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, mono}: +{lib, stdenv, fetchFromGitHub, mono}: stdenv.mkDerivation rec { pname = "convchain"; version = "0.0pre20160901"; @@ -32,9 +32,9 @@ stdenv.mkDerivation rec { buildInputs = [mono]; meta = { inherit version; - description = ''Bitmap generation from a single example with convolutions and MCMC''; - license = stdenv.lib.licenses.mit; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + description = "Bitmap generation from a single example with convolutions and MCMC"; + license = lib.licenses.mit; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/graphics/dcraw/default.nix b/pkgs/tools/graphics/dcraw/default.nix index a43c7a16d97..488fdb2b267 100644 --- a/pkgs/tools/graphics/dcraw/default.nix +++ b/pkgs/tools/graphics/dcraw/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libjpeg, lcms2, gettext, libiconv }: +{lib, stdenv, fetchurl, libjpeg, lcms2, gettext, libiconv }: stdenv.mkDerivation rec { name = "dcraw-9.28.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1fdl3xa1fbm71xzc3760rsjkvf0x5jdjrvdzyg2l9ka24vdc7418"; }; - nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin libiconv; + nativeBuildInputs = lib.optional stdenv.isDarwin libiconv; buildInputs = [ libjpeg lcms2 gettext ]; # Jasper is disabled because the library is abandoned and has many @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.dechifro.org/dcraw/"; description = "Decoder for many camera raw picture formats"; - license = stdenv.lib.licenses.free; - platforms = stdenv.lib.platforms.unix; # Once had cygwin problems + license = lib.licenses.free; + platforms = lib.platforms.unix; # Once had cygwin problems maintainers = [ ]; knownVulnerabilities = [ "CVE-2018-19655" diff --git a/pkgs/tools/graphics/diagrams-builder/default.nix b/pkgs/tools/graphics/diagrams-builder/default.nix index 24e43044697..3422b9a53bd 100644 --- a/pkgs/tools/graphics/diagrams-builder/default.nix +++ b/pkgs/tools/graphics/diagrams-builder/default.nix @@ -10,7 +10,7 @@ ~~~ */ -{ stdenv, ghcWithPackages, makeWrapper, diagrams-builder, extraPackages ? (self: []) }: +{ lib, stdenv, ghcWithPackages, makeWrapper, diagrams-builder, extraPackages ? (self: []) }: let @@ -35,7 +35,7 @@ stdenv.mkDerivation { buildInputs = [ makeWrapper ]; - buildCommand = with stdenv.lib; + buildCommand = with lib; concatStrings (intersperse "\n" (map exeWrapper backends)); # Will be faster to build the wrapper locally then to fetch it from a binary cache. diff --git a/pkgs/tools/graphics/dmtx-utils/default.nix b/pkgs/tools/graphics/dmtx-utils/default.nix index 776ce333da6..a22f0bc60d4 100644 --- a/pkgs/tools/graphics/dmtx-utils/default.nix +++ b/pkgs/tools/graphics/dmtx-utils/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libdmtx, pkgconfig, imagemagick}: +{lib, stdenv, fetchurl, libdmtx, pkg-config, imagemagick}: let s = # Generated upstream information rec { @@ -9,7 +9,7 @@ let url="mirror://sourceforge/project/libdmtx/libdmtx/0.7.4/dmtx-utils-0.7.4.tar.gz"; sha256="1di8ymlziy9856abd6rb72z0zqzmrff4r3vql0q9r5sk5ax4s417"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libdmtx imagemagick ]; @@ -23,8 +23,8 @@ stdenv.mkDerivation { meta = { inherit (s) version; description = "Data matrix command-line utilities"; - license = stdenv.lib.licenses.lgpl2 ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.lgpl2 ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/graphics/dpic/default.nix b/pkgs/tools/graphics/dpic/default.nix index c0dc7661715..fa6880f6f91 100644 --- a/pkgs/tools/graphics/dpic/default.nix +++ b/pkgs/tools/graphics/dpic/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "dpic"; - version = "2020.09.15"; + version = "2021.01.01"; src = fetchurl { url = "https://ece.uwaterloo.ca/~aplevich/dpic/${pname}-${version}.tar.gz"; - sha256 = "0gmmp4dlir3bn892nm55a3q8cfsj8yg7fp1dixmhsdhsrgmg1b83"; + sha256 = "sha256-vrBiTQqdaIslDd/WWMbdgornRkZmC2m+RF2J78F5Pm8="; }; # The prefix passed to configure is not used. diff --git a/pkgs/tools/graphics/editres/default.nix b/pkgs/tools/graphics/editres/default.nix index 2c9eadea8bf..3a55524dc00 100644 --- a/pkgs/tools/graphics/editres/default.nix +++ b/pkgs/tools/graphics/editres/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libXt, libXaw, libXres, utilmacros }: +{ lib, stdenv, fetchurl, pkg-config, libXt, libXaw, libXres, utilmacros }: stdenv.mkDerivation rec { name = "editres-1.0.7"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "10mbgijb6ac6wqb2grpy9mrazzw68jxjkxr9cbdf1111pa64yj19"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libXt libXaw libXres utilmacros ]; configureFlags = [ "--with-appdefaultdir=$(out)/share/X11/app-defaults/editres" ]; diff --git a/pkgs/tools/graphics/enblend-enfuse/default.nix b/pkgs/tools/graphics/enblend-enfuse/default.nix index d071b244167..5ca9704eee3 100644 --- a/pkgs/tools/graphics/enblend-enfuse/default.nix +++ b/pkgs/tools/graphics/enblend-enfuse/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl , boost, freeglut, glew, gsl, lcms2, libpng, libtiff, libGLU, libGL, vigra -, help2man, pkgconfig, perl, texlive }: +, help2man, pkg-config, perl, texlive }: stdenv.mkDerivation rec { pname = "enblend-enfuse"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost freeglut glew gsl lcms2 libpng libtiff libGLU libGL vigra ]; - nativeBuildInputs = [ help2man perl pkgconfig texlive.combined.scheme-small ]; + nativeBuildInputs = [ help2man perl pkg-config texlive.combined.scheme-small ]; preConfigure = '' patchShebangs src/embrace diff --git a/pkgs/tools/graphics/exif/default.nix b/pkgs/tools/graphics/exif/default.nix index 33a085724ec..59c74811126 100644 --- a/pkgs/tools/graphics/exif/default.nix +++ b/pkgs/tools/graphics/exif/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libexif, popt, libintl }: +{ lib, stdenv, fetchurl, pkg-config, libexif, popt, libintl }: stdenv.mkDerivation rec { name = "exif-0.6.21"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1zb9hwdl783d4vd2s2rw642hg8hd6n0mfp6lrbiqmp9jmhlq5rsr"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libexif popt libintl ]; meta = with lib; { diff --git a/pkgs/tools/graphics/exiftags/default.nix b/pkgs/tools/graphics/exiftags/default.nix index 3ca748aa956..afe8a5ecbcc 100644 --- a/pkgs/tools/graphics/exiftags/default.nix +++ b/pkgs/tools/graphics/exiftags/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation { name = "exiftags-1.01"; @@ -19,8 +19,8 @@ stdenv.mkDerivation { meta = { homepage = "http://johnst.org/sw/exiftags/"; description = "Displays EXIF data from JPEG files"; - license = stdenv.lib.licenses.free; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; unix; + license = lib.licenses.free; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/tools/graphics/feedgnuplot/default.nix b/pkgs/tools/graphics/feedgnuplot/default.nix index 1fe254d7785..02bb022dfb4 100644 --- a/pkgs/tools/graphics/feedgnuplot/default.nix +++ b/pkgs/tools/graphics/feedgnuplot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, gawk +{ lib, fetchFromGitHub, makeWrapper, gawk , makeFontsConf, freefont_ttf, gnuplot, perl, perlPackages }: diff --git a/pkgs/tools/graphics/fgallery/default.nix b/pkgs/tools/graphics/fgallery/default.nix index 9694fb728f8..40308ffa1a9 100644 --- a/pkgs/tools/graphics/fgallery/default.nix +++ b/pkgs/tools/graphics/fgallery/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { wrapProgram "$out/share/fgallery/fgallery" \ --set PERL5LIB "$PERL5LIB" \ - --set PATH "${stdenv.lib.makeBinPath + --set PATH "${lib.makeBinPath [ coreutils zip imagemagick pngcrush lcms2 facedetect fbida ]}" ''; diff --git a/pkgs/tools/graphics/fim/default.nix b/pkgs/tools/graphics/fim/default.nix index 9a3163951d2..252510f8059 100644 --- a/pkgs/tools/graphics/fim/default.nix +++ b/pkgs/tools/graphics/fim/default.nix @@ -1,4 +1,4 @@ -{ gcc9Stdenv, fetchurl, autoconf, automake, pkgconfig, lib +{ gcc9Stdenv, fetchurl, autoconf, automake, pkg-config, lib , perl, flex, bison, readline, libexif , x11Support ? true, SDL , svgSupport ? true, inkscape @@ -23,7 +23,7 @@ gcc9Stdenv.mkDerivation rec { --replace /usr/bin/perl ${perl}/bin/perl ''; - nativeBuildInputs = [ autoconf automake pkgconfig ]; + nativeBuildInputs = [ autoconf automake pkg-config ]; buildInputs = with lib; [ perl flex bison readline libexif ] diff --git a/pkgs/tools/graphics/flam3/default.nix b/pkgs/tools/graphics/flam3/default.nix index 58aefd1d585..2015de607d2 100644 --- a/pkgs/tools/graphics/flam3/default.nix +++ b/pkgs/tools/graphics/flam3/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "flam3"; - version = "3.1.1-${stdenv.lib.strings.substring 0 7 rev}"; + version = "3.1.1-${lib.strings.substring 0 7 rev}"; rev = "e0801543538451234d7a8a240ba3b417cbda5b21"; src = fetchFromGitHub { diff --git a/pkgs/tools/graphics/ggobi/default.nix b/pkgs/tools/graphics/ggobi/default.nix index bce1564946c..4e1b851735f 100644 --- a/pkgs/tools/graphics/ggobi/default.nix +++ b/pkgs/tools/graphics/ggobi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libxml2, gtk2 }: +{ lib, stdenv, fetchurl, pkg-config, libxml2, gtk2 }: stdenv.mkDerivation rec { version = "2.1.11"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "2c4ddc3ab71877ba184523e47b0637526e6f3701bd9afb6472e6dfc25646aed7"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxml2 gtk2 ]; configureFlags = [ "--with-all-plugins" ]; diff --git a/pkgs/tools/graphics/gifsicle/default.nix b/pkgs/tools/graphics/gifsicle/default.nix index 72220fab480..c05a552f205 100644 --- a/pkgs/tools/graphics/gifsicle/default.nix +++ b/pkgs/tools/graphics/gifsicle/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, xorgproto, libXt, libX11 +{ lib, stdenv, fetchurl, xorgproto, libXt, libX11 , gifview ? false , static ? stdenv.hostPlatform.isStatic }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "gifsicle"; @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { meta = { description = "Command-line tool for creating, editing, and getting information about GIF images and animations"; homepage = "https://www.lcdf.org/gifsicle/"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; platforms = platforms.all; - maintainers = with stdenv.lib.maintainers; [ zimbatm ]; + maintainers = with lib.maintainers; [ zimbatm ]; }; } diff --git a/pkgs/tools/graphics/gifski/default.nix b/pkgs/tools/graphics/gifski/default.nix index 38f83c076ff..526300f2dd8 100644 --- a/pkgs/tools/graphics/gifski/default.nix +++ b/pkgs/tools/graphics/gifski/default.nix @@ -1,19 +1,19 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, pkgconfig }: +{ lib, rustPlatform, fetchFromGitHub, pkg-config }: rustPlatform.buildRustPackage rec { pname = "gifski"; - version = "1.2.4"; + version = "1.3.1"; src = fetchFromGitHub { owner = "ImageOptim"; repo = "gifski"; rev = version; - sha256 = "0mr4ni75klmzfjivfv5xmcdw03y1gjvkz1d297gwh46zq1q7blf3"; + sha256 = "sha256-sB8W5n3FvRAB9ygFg63NecSZgUw8FGk4pzviIbRF2vk="; }; - cargoSha256 = "0wm139lik6w2hwg72j8hcphp0z89bbabfxjmfyqrih6akyzb0l01"; + cargoSha256 = "sha256-0cFk1GnEJxMfY9GvQTdI5tkgtxGkH3ZQFTloo4/C+sY="; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = with lib; { description = "GIF encoder based on libimagequant (pngquant)"; diff --git a/pkgs/tools/graphics/glee/default.nix b/pkgs/tools/graphics/glee/default.nix index fad37d1e08e..136e805e793 100644 --- a/pkgs/tools/graphics/glee/default.nix +++ b/pkgs/tools/graphics/glee/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "glee"; rev = "f727ec7463d514b6279981d12833f2e11d62b33d"; - version = "20170205-${stdenv.lib.strings.substring 0 7 rev}"; + version = "20170205-${lib.strings.substring 0 7 rev}"; src = fetchgit { inherit rev; diff --git a/pkgs/tools/graphics/glmark2/default.nix b/pkgs/tools/graphics/glmark2/default.nix index e2acd81b9b0..806b03061c7 100644 --- a/pkgs/tools/graphics/glmark2/default.nix +++ b/pkgs/tools/graphics/glmark2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, libjpeg, libpng, xorg, libX11, libGL, libdrm, +{ lib, stdenv, fetchFromGitHub, pkg-config, libjpeg, libpng, xorg, libX11, libGL, libdrm, python27, wayland, udev, mesa, wafHook }: stdenv.mkDerivation { @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "076l75rfl6pnp1wgiwlaihy1vg2advg1z8bi0x84kk259kldgvwn"; }; - nativeBuildInputs = [ pkgconfig wafHook ]; + nativeBuildInputs = [ pkg-config wafHook ]; buildInputs = [ libjpeg libpng xorg.libxcb libX11 libGL libdrm python27 wayland udev mesa ]; diff --git a/pkgs/tools/graphics/gmic-qt/default.nix b/pkgs/tools/graphics/gmic-qt/default.nix index b7650b22080..1d26379c396 100644 --- a/pkgs/tools/graphics/gmic-qt/default.nix +++ b/pkgs/tools/graphics/gmic-qt/default.nix @@ -6,7 +6,7 @@ , fetchFromGitHub , fetchFromGitLab , cmake -, pkgconfig +, pkg-config , opencv3 , openexr , graphicsmagick @@ -51,7 +51,7 @@ assert lib.assertMsg (builtins.hasAttr variant variants) "gmic-qt variant “${v assert lib.assertMsg (builtins.all (d: d != null) variants.${variant}.extraDeps or []) "gmic-qt variant “${variant}” is missing one of its dependencies."; mkDerivation rec { - pname = "gmic-qt${lib.optionalString (variant != "standalone") ''-${variant}''}"; + pname = "gmic-qt${lib.optionalString (variant != "standalone") "-${variant}"}"; version = "2.7.1"; gmic-community = fetchFromGitHub { @@ -109,7 +109,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index 26dec6d42c8..2ad99c727d9 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, pkgconfig, texinfo +{ lib, stdenv, fetchurl, makeWrapper, pkg-config, texinfo , cairo, gd, libcerf, pango, readline, zlib , withTeXLive ? false, texlive , withLua ? false, lua @@ -27,7 +27,7 @@ in sha256 = "03jrqs5lvxmbbz2c4g17dn2hrxqwd3hfadk9q8wbkbkyas2h8sbb"; }; - nativeBuildInputs = [ makeWrapper pkgconfig texinfo ] ++ lib.optional withQt qttools; + nativeBuildInputs = [ makeWrapper pkg-config texinfo ] ++ lib.optional withQt qttools; buildInputs = [ cairo gd libcerf pango readline zlib ] diff --git a/pkgs/tools/graphics/graph-cli/default.nix b/pkgs/tools/graphics/graph-cli/default.nix new file mode 100644 index 00000000000..4da4f50cef8 --- /dev/null +++ b/pkgs/tools/graphics/graph-cli/default.nix @@ -0,0 +1,31 @@ +{ lib +, python3Packages +}: + +python3Packages.buildPythonApplication rec { + pname = "graph-cli"; + version = "0.1.7"; + + src = python3Packages.fetchPypi { + inherit version; + pname = "graph_cli"; + sha256 = "sha256-/v9COgAjuunJ06HHl55J0moV1p4uO+N+w2QwE8tgebQ="; + }; + + propagatedBuildInputs = with python3Packages; [ + numpy + pandas + matplotlib + ]; + + # does not contain tests despite reference in Makefile + doCheck = false; + pythonImportsCheck = [ "graph_cli" ]; + + meta = with lib; { + description = "CLI to create graphs from CSV files"; + homepage = "https://github.com/mcastorina/graph-cli/"; + license = with licenses; [ gpl3Only ]; + maintainers = with maintainers; [ leungbk ]; + }; +} diff --git a/pkgs/tools/graphics/graph-easy/default.nix b/pkgs/tools/graphics/graph-easy/default.nix index 4ae68207aae..341d6dea90a 100644 --- a/pkgs/tools/graphics/graph-easy/default.nix +++ b/pkgs/tools/graphics/graph-easy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, perlPackages, fetchurl }: +{ lib, perlPackages, fetchurl }: perlPackages.buildPerlPackage { pname = "Graph-Easy"; diff --git a/pkgs/tools/graphics/graphviz/base.nix b/pkgs/tools/graphics/graphviz/base.nix index a3cdf9c6fc8..6c9a8471051 100644 --- a/pkgs/tools/graphics/graphviz/base.nix +++ b/pkgs/tools/graphics/graphviz/base.nix @@ -1,13 +1,13 @@ { rev, sha256, version }: -{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkgconfig, cairo, expat, flex +{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, cairo, expat, flex , fontconfig, gd, gettext, gts, libdevil, libjpeg, libpng, libtool, pango , yacc, fetchpatch, xorg ? null, ApplicationServices ? null }: assert stdenv.isDarwin -> ApplicationServices != null; let - inherit (stdenv.lib) optional optionals optionalString; + inherit (lib) optional optionals optionalString; raw_patch = # https://gitlab.com/graphviz/graphviz/issues/1367 CVE-2018-10196 fetchpatch { @@ -17,13 +17,13 @@ let excludes = ["tests/*"]; # we don't run them and they don't apply }; # the patch needs a small adaption for older versions - patchToUse = if stdenv.lib.versionAtLeast version "2.37" then raw_patch else + patchToUse = if lib.versionAtLeast version "2.37" then raw_patch else stdenv.mkDerivation { inherit (raw_patch) name; buildCommand = "sed s/dot_root/agroot/g ${raw_patch} > $out"; }; # 2.42 has the patch included - patches = optional (stdenv.lib.versionOlder version "2.42") patchToUse; + patches = optional (lib.versionOlder version "2.42") patchToUse; in stdenv.mkDerivation { @@ -36,7 +36,7 @@ stdenv.mkDerivation { inherit sha256 rev; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libpng libjpeg expat yacc libtool fontconfig gd gts libdevil flex pango @@ -46,13 +46,13 @@ stdenv.mkDerivation { hardeningDisable = [ "fortify" ]; - CPPFLAGS = stdenv.lib.optionalString (xorg != null && stdenv.isDarwin) + CPPFLAGS = lib.optionalString (xorg != null && stdenv.isDarwin) "-I${cairo.dev}/include/cairo"; configureFlags = [ "--with-ltdl-lib=${libtool.lib}/lib" "--with-ltdl-include=${libtool}/include" - ] ++ stdenv.lib.optional (xorg == null) "--without-x"; + ] ++ lib.optional (xorg == null) "--without-x"; inherit patches; diff --git a/pkgs/tools/graphics/grim/default.nix b/pkgs/tools/graphics/grim/default.nix index cca74cea569..1dddd7959b0 100644 --- a/pkgs/tools/graphics/grim/default.nix +++ b/pkgs/tools/graphics/grim/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cairo, libjpeg, meson, ninja, wayland, pkgconfig, scdoc, wayland-protocols }: +{ lib, stdenv, fetchFromGitHub, cairo, libjpeg, meson, ninja, wayland, pkg-config, scdoc, wayland-protocols }: stdenv.mkDerivation rec { pname = "grim"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config scdoc ]; diff --git a/pkgs/tools/graphics/guff/default.nix b/pkgs/tools/graphics/guff/default.nix index f03adb7bff0..daca6f4344e 100644 --- a/pkgs/tools/graphics/guff/default.nix +++ b/pkgs/tools/graphics/guff/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "guff"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A plot device"; homepage = "https://github.com/silentbicycle/guff"; license = licenses.isc; diff --git a/pkgs/tools/graphics/icoutils/default.nix b/pkgs/tools/graphics/icoutils/default.nix index 0689c9cc248..704c3a2db52 100644 --- a/pkgs/tools/graphics/icoutils/default.nix +++ b/pkgs/tools/graphics/icoutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libpng, perl, perlPackages, makeWrapper }: +{ lib, stdenv, fetchurl, libpng, perl, perlPackages, makeWrapper }: stdenv.mkDerivation rec { name = "icoutils-0.32.3"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.nongnu.org/icoutils/"; description = "Set of programs to deal with Microsoft Windows(R) icon and cursor files"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = lib.licenses.gpl3Plus; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/tools/graphics/imgur-screenshot/default.nix b/pkgs/tools/graphics/imgur-screenshot/default.nix index db96299abe1..885638c28b8 100644 --- a/pkgs/tools/graphics/imgur-screenshot/default.nix +++ b/pkgs/tools/graphics/imgur-screenshot/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, makeWrapper, curl, jq, gnugrep, libnotify, scrot, which, xclip }: -let deps = stdenv.lib.makeBinPath [ curl jq gnugrep libnotify scrot which xclip ]; +let deps = lib.makeBinPath [ curl jq gnugrep libnotify scrot which xclip ]; in stdenv.mkDerivation rec { version = "2.0.0"; pname = "imgur-screenshot"; diff --git a/pkgs/tools/graphics/imgurbash2/default.nix b/pkgs/tools/graphics/imgurbash2/default.nix index 84e25150fab..8b79e3373a6 100644 --- a/pkgs/tools/graphics/imgurbash2/default.nix +++ b/pkgs/tools/graphics/imgurbash2/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cat <<EOF >$out/bin/imgurbash2 #!${bash}/bin/bash - PATH=${stdenv.lib.makeBinPath [curl xsel]}:\$PATH + PATH=${lib.makeBinPath [curl xsel]}:\$PATH EOF cat imgurbash2 >> $out/bin/imgurbash2 chmod +x $out/bin/imgurbash2 diff --git a/pkgs/tools/graphics/jbig2enc/default.nix b/pkgs/tools/graphics/jbig2enc/default.nix index 05818bf8dda..a4b396c3d23 100644 --- a/pkgs/tools/graphics/jbig2enc/default.nix +++ b/pkgs/tools/graphics/jbig2enc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, leptonica, zlib, libwebp, giflib, libjpeg, libpng, libtiff }: +{ lib, stdenv, fetchurl, leptonica, zlib, libwebp, giflib, libjpeg, libpng, libtiff }: stdenv.mkDerivation { name = "jbig2enc-0.28"; @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = { description = "Encoder for the JBIG2 image compression format"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.asl20; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/graphics/ldgallery/compiler/default.nix b/pkgs/tools/graphics/ldgallery/compiler/default.nix index 37aa2983b49..9316e9d38e0 100644 --- a/pkgs/tools/graphics/ldgallery/compiler/default.nix +++ b/pkgs/tools/graphics/ldgallery/compiler/default.nix @@ -1,7 +1,7 @@ # generated with cabal2nix by ./generate.sh { mkDerivation, aeson, base, cmdargs, containers, data-ordlist , directory, fetchgit, filepath, Glob, hpack, parallel-io, process -, safe, stdenv, text, time, yaml +, safe, lib, text, time, yaml }: mkDerivation { pname = "ldgallery-compiler"; @@ -32,6 +32,6 @@ mkDerivation { prePatch = "hpack"; homepage = "https://ldgallery.pacien.org"; description = "A static generator which turns a collection of tagged pictures into a searchable web gallery"; - license = stdenv.lib.licenses.agpl3; - maintainers = with stdenv.lib.maintainers; [ pacien ]; + license = lib.licenses.agpl3; + maintainers = with lib.maintainers; [ pacien ]; } diff --git a/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix b/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix index f6c53f6c58d..4b10352ab0d 100644 --- a/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix +++ b/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix @@ -6,7 +6,7 @@ let nodeEnv = import ../../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile; + inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile; inherit nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; @@ -14,4 +14,4 @@ in import ./node-packages.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} \ No newline at end of file +} diff --git a/pkgs/tools/graphics/ldgallery/viewer/node-packages.nix b/pkgs/tools/graphics/ldgallery/viewer/node-packages.nix index 14691f64065..9946ce0e63c 100644 --- a/pkgs/tools/graphics/ldgallery/viewer/node-packages.nix +++ b/pkgs/tools/graphics/ldgallery/viewer/node-packages.nix @@ -13266,4 +13266,4 @@ in tarball = nodeEnv.buildNodeSourceDist args; package = nodeEnv.buildNodePackage args; shell = nodeEnv.buildNodeShell args; -} \ No newline at end of file +} diff --git a/pkgs/tools/graphics/leela/default.nix b/pkgs/tools/graphics/leela/default.nix index 0c56f385983..cf10c92286c 100644 --- a/pkgs/tools/graphics/leela/default.nix +++ b/pkgs/tools/graphics/leela/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, poppler }: +{ lib, stdenv, fetchFromGitHub, pkg-config, poppler }: stdenv.mkDerivation { name = "leela-12.fe7a35a"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "1k6n758r9dhjmc1pnpk6qzpg0q7pkq2hf18z3b0s2z198jpkg9s3"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ poppler ]; installFlags = [ "PREFIX=$(out)" "MANDIR=$(out)/share/man" ]; @@ -18,8 +18,8 @@ stdenv.mkDerivation { meta = { description = "CLI frontend to the poppler-glib libary of PDF tools"; homepage = "https://github.com/TrilbyWhite/Leela"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.puffnfresh ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.puffnfresh ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/graphics/lepton/default.nix b/pkgs/tools/graphics/lepton/default.nix index 1835b9fec21..eb313503221 100644 --- a/pkgs/tools/graphics/lepton/default.nix +++ b/pkgs/tools/graphics/lepton/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake git ]; - buildInputs = stdenv.lib.optionals stdenv.isLinux [ glibc.static ]; + buildInputs = lib.optionals stdenv.isLinux [ glibc.static ]; meta = with lib; { homepage = "https://github.com/dropbox/lepton"; diff --git a/pkgs/tools/graphics/logstalgia/default.nix b/pkgs/tools/graphics/logstalgia/default.nix index d4abee146b8..8edde6e3f42 100644 --- a/pkgs/tools/graphics/logstalgia/default.nix +++ b/pkgs/tools/graphics/logstalgia/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, SDL2, ftgl, pkgconfig, libpng, libjpeg, pcre, SDL2_image, glew +{ lib, stdenv, fetchurl, SDL2, ftgl, pkg-config, libpng, libjpeg, pcre, SDL2_image, glew , libGLU, libGL, boost, glm, freetype }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1agwjlwzp1c86hqb1p7rmzqzhd3wpnyh8whsfq4sbx01wj0l0gzd"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glew SDL2 ftgl libpng libjpeg pcre SDL2_image libGLU libGL boost glm freetype ]; diff --git a/pkgs/tools/graphics/lprof/default.nix b/pkgs/tools/graphics/lprof/default.nix index 9c666462ef7..a1c81f16f2b 100644 --- a/pkgs/tools/graphics/lprof/default.nix +++ b/pkgs/tools/graphics/lprof/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, sconsPackages, qt3, lcms1, libtiff, vigra }: +{ lib, stdenv, fetchurl, sconsPackages, qt3, lcms1, libtiff, vigra }: /* how to calibrate your monitor: Eg see https://wiki.archlinux.org/index.php/ICC_Profiles#Loading_ICC_Profiles @@ -31,7 +31,8 @@ stdenv.mkDerivation { meta = { description = "Little CMS ICC profile construction set"; homepage = "https://sourceforge.net/projects/lprof"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + broken = true; # Broken since 2020-07-28 (https://hydra.nixos.org/build/135234622) }; } diff --git a/pkgs/tools/graphics/luxcorerender/default.nix b/pkgs/tools/graphics/luxcorerender/default.nix index af71990e459..c4b8622f479 100644 --- a/pkgs/tools/graphics/luxcorerender/default.nix +++ b/pkgs/tools/graphics/luxcorerender/default.nix @@ -41,8 +41,8 @@ in stdenv.mkDerivation { gsettings-desktop-schemas glib gtk3 # needed for XDG_ICON_DIRS gnome3.adwaita-icon-theme - (stdenv.lib.getLib dconf) - ] ++ stdenv.lib.optionals withOpenCL [ opencl-headers ocl-icd opencl-clhpp rocm-opencl-runtime ]; + (lib.getLib dconf) + ] ++ lib.optionals withOpenCL [ opencl-headers ocl-icd opencl-clhpp rocm-opencl-runtime ]; cmakeFlags = [ "-DOpenEXR_Iex_INCLUDE_DIR=${openexr.dev}/include/OpenEXR" @@ -54,7 +54,7 @@ in stdenv.mkDerivation { "-DEMBREE_INCLUDE_PATH=${embree2}/include" "-DEMBREE_LIBRARY=${embree2}/lib/libembree.so" "-DBoost_PYTHON_LIBRARY_RELEASE=${boost_static}/lib/libboost_python3-mt.so" - ] ++ stdenv.lib.optional withOpenCL + ] ++ lib.optional withOpenCL "-DOPENCL_INCLUDE_DIR=${opencl-headers}/include"; preConfigure = '' @@ -73,7 +73,7 @@ in stdenv.mkDerivation { wrapProgram "$out/bin/luxcoreui" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ --suffix XDG_DATA_DIRS : '${gnome3.adwaita-icon-theme}/share' \ - --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" + --prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules" ''; meta = with lib; { diff --git a/pkgs/tools/graphics/maim/default.nix b/pkgs/tools/graphics/maim/default.nix index 99bbd4b13da..6cfa77c8cec 100644 --- a/pkgs/tools/graphics/maim/default.nix +++ b/pkgs/tools/graphics/maim/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config , zlib, libpng, libjpeg, libGLU, libGL, glm , libX11, libXext, libXfixes, libXrandr, libXcomposite, slop, icu }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "181mjjrjb9fs1ficcv9miqbk94v95j1yli7fjp2dj514g7nj9l3x"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ zlib libpng libjpeg libGLU libGL glm libX11 libXext libXfixes libXrandr libXcomposite slop icu ]; @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { supposed to be an improved scrot. ''; changelog = "https://github.com/naelstrof/maim/releases/tag/v${version}"; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.gpl3Plus; + platforms = lib.platforms.all; + license = lib.licenses.gpl3Plus; maintainers = with maintainers; [ primeos mbakke ]; }; } diff --git a/pkgs/tools/graphics/metapixel/default.nix b/pkgs/tools/graphics/metapixel/default.nix new file mode 100644 index 00000000000..8c9fef0cd48 --- /dev/null +++ b/pkgs/tools/graphics/metapixel/default.nix @@ -0,0 +1,33 @@ +{ lib, stdenv, fetchFromGitHub, libpng, libjpeg, giflib, perl, pkg-config }: + +stdenv.mkDerivation rec { + pname = "metapixel"; + version = "1.0.2"; + + src = fetchFromGitHub { + owner = "schani"; + repo = pname; + rev = "98ee9daa093b6c334941242e63f90b1c2876eb4f"; + fetchSubmodules = true; + sha256 = "0r7n3a6bvcxkbpda4mwmrpicii09iql5z69nkjqygkwxw7ny3309"; + }; + + makeFlags = [ "metapixel" ]; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libpng libjpeg giflib perl ]; + + installPhase = '' + mkdir -p $out/bin + cp metapixel $out/bin/metapixel + cp metapixel-prepare $out/bin/metapixel-prepare + cp metapixel-sizesort $out/bin/metapixel-sizesort + ''; + + meta = with lib; { + homepage = "https://github.com/schani/metapixel"; + description = "Tool for generating photomosaics"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/pkgs/tools/graphics/mscgen/default.nix b/pkgs/tools/graphics/mscgen/default.nix index f6bec5983c2..6cd8777f525 100644 --- a/pkgs/tools/graphics/mscgen/default.nix +++ b/pkgs/tools/graphics/mscgen/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , bison , fetchurl , flex @@ -36,7 +36,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.mcternan.me.uk/mscgen/"; description = "Convert Message Sequence Chart descriptions into PNG, SVG, or EPS images"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; longDescription = '' Mscgen is a small program that parses Message Sequence Chart @@ -51,7 +51,7 @@ stdenv.mkDerivation { printing. ''; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.peti ]; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.peti ]; }; } diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index 948b590249f..30b69c862c3 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; # Environment variables - STRIPPROG = "${stdenv.lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}strip"; + STRIPPROG = "${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}strip"; postPatch = '' # Install libnetpbm.so symlink to correct destination @@ -68,12 +68,12 @@ stdenv.mkDerivation { echo "STATICLIB_TOO = N" >> config.mk # Enable cross-compilation - echo 'AR = ${stdenv.lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar' >> config.mk + echo 'AR = ${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar' >> config.mk echo 'CC = ${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc' >> config.mk echo 'CC_FOR_BUILD = ${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc' >> config.mk echo 'LD_FOR_BUILD = $(CC_FOR_BUILD)' >> config.mk - echo 'PKG_CONFIG = ${buildPackages.pkgconfig}/bin/${buildPackages.pkgconfig.targetPrefix}pkg-config' >> config.mk - echo 'RANLIB = ${stdenv.lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib' >> config.mk + echo 'PKG_CONFIG = ${buildPackages.pkg-config}/bin/${buildPackages.pkg-config.targetPrefix}pkg-config' >> config.mk + echo 'RANLIB = ${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib' >> config.mk # Use libraries from Nixpkgs echo "TIFFLIB = libtiff.so" >> config.mk @@ -86,7 +86,7 @@ stdenv.mkDerivation { # Fix path to rgb.txt echo "RGB_DB_PATH = $out/share/netpbm/misc/rgb.txt" >> config.mk - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' echo "LDSHLIB=-dynamiclib -install_name $out/lib/libnetpbm.\$(MAJ).dylib" >> config.mk echo "NETPBMLIBTYPE = dylib" >> config.mk echo "NETPBMLIBSUFFIX = dylib" >> config.mk @@ -120,6 +120,6 @@ stdenv.mkDerivation { homepage = "http://netpbm.sourceforge.net/"; description = "Toolkit for manipulation of graphic images"; license = lib.licenses.free; # http://netpbm.svn.code.sourceforge.net/p/netpbm/code/trunk/doc/copyright_summary - platforms = with stdenv.lib.platforms; linux ++ darwin; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/tools/graphics/nifskope/default.nix b/pkgs/tools/graphics/nifskope/default.nix index d91f163c50b..0a053a3ad32 100644 --- a/pkgs/tools/graphics/nifskope/default.nix +++ b/pkgs/tools/graphics/nifskope/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { url = "https://github.com/niftools/nifskope/commit/30954e7f01f3d779a2a1fd37d363e8a6ad560bd3.patch"; sha256 = "0d6xjj2mjjhdd7w1aig5f75jksjni16jyj0lxsz51pys6xqb6fpj"; }) - ] ++ (stdenv.lib.optional stdenv.isAarch64 ./no-sse-on-arm.patch); + ] ++ (lib.optional stdenv.isAarch64 ./no-sse-on-arm.patch); buildInputs = [ qtbase qttools libGLU.dev ]; nativeBuildInputs = [ qmake wrapQtAppsHook ]; diff --git a/pkgs/tools/graphics/nip2/default.nix b/pkgs/tools/graphics/nip2/default.nix index 42173525650..ae07d0ced2d 100644 --- a/pkgs/tools/graphics/nip2/default.nix +++ b/pkgs/tools/graphics/nip2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, glib, libxml2, flex, bison, vips, gnome2, +{ lib, stdenv, fetchurl, pkg-config, glib, libxml2, flex, bison, vips, gnome2, fftw, gsl, goffice, libgsf }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ pkgconfig glib libxml2 flex bison vips + [ pkg-config glib libxml2 flex bison vips gnome2.gtk fftw gsl goffice libgsf ]; diff --git a/pkgs/tools/graphics/optar/default.nix b/pkgs/tools/graphics/optar/default.nix index 688d1c49629..320acaba420 100644 --- a/pkgs/tools/graphics/optar/default.nix +++ b/pkgs/tools/graphics/optar/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { --replace /usr/local $out substituteInPlace pgm2ps \ - --replace 'convert ' "${stdenv.lib.getBin imagemagick}/bin/convert " + --replace 'convert ' "${lib.getBin imagemagick}/bin/convert " ''; preInstall = '' diff --git a/pkgs/tools/graphics/optipng/default.nix b/pkgs/tools/graphics/optipng/default.nix index 772e7d192d1..72caf6f86ae 100644 --- a/pkgs/tools/graphics/optipng/default.nix +++ b/pkgs/tools/graphics/optipng/default.nix @@ -4,7 +4,7 @@ # This package comes with its own copy of zlib, libpng and pngxtern -with stdenv.lib; +with lib; stdenv.mkDerivation rec { name = "optipng-0.7.7"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-system-zlib" "--with-system-libpng" - ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ #"-prefix=$out" ]; diff --git a/pkgs/tools/graphics/oxipng/default.nix b/pkgs/tools/graphics/oxipng/default.nix index 98ece65eb16..6f91ee26007 100644 --- a/pkgs/tools/graphics/oxipng/default.nix +++ b/pkgs/tools/graphics/oxipng/default.nix @@ -1,15 +1,15 @@ { lib, stdenv, fetchCrate, rustPlatform }: rustPlatform.buildRustPackage rec { - version = "4.0.2"; + version = "4.0.3"; pname = "oxipng"; src = fetchCrate { inherit version pname; - sha256 = "0m36af9w1l6pc71fjbgyzcsszizwayvcv5d750zz2bnj23c77m69"; + sha256 = "sha256-lvVgoAZMIqmbS6yMul9Hf9PtneEVy+jDs3kU1jSBL2w="; }; - cargoSha256 = "16fby8ncdq0dyg9r0glrqwi04sja34br306c5sj22cq1dm3bb64q"; + cargoSha256 = "sha256-v0A8/b/OPAtnaNlMX7QNXTGGH6kg67WBo/2ChOPDZdQ="; doCheck = !stdenv.isAarch64 && !stdenv.isDarwin; diff --git a/pkgs/tools/graphics/pdf2svg/default.nix b/pkgs/tools/graphics/pdf2svg/default.nix index f96f690a1cc..c6d2eab4537 100644 --- a/pkgs/tools/graphics/pdf2svg/default.nix +++ b/pkgs/tools/graphics/pdf2svg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config , cairo, gtk2, poppler }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "14ffdm4y26imq99wjhkrhy9lp33165xci1l5ndwfia8hz53bl02k"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ cairo poppler gtk2 ]; meta = with lib; { diff --git a/pkgs/tools/graphics/pdfread/default.nix b/pkgs/tools/graphics/pdfread/default.nix index 912aa07ea8d..abe560c81fe 100644 --- a/pkgs/tools/graphics/pdfread/default.nix +++ b/pkgs/tools/graphics/pdfread/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { cp -R *.py pylrs $PYDIR wrapProgram $out/bin/pdfread.py --prefix PYTHONPATH : $PYTHONPATH:${pillow}/$LIBSUFFIX/PIL:$PYDIR \ - --prefix PATH : ${stdenv.lib.makeBinPath [ ghostscript pngnq djvulibre unrar optipng ]} + --prefix PATH : ${lib.makeBinPath [ ghostscript pngnq djvulibre unrar optipng ]} ''; meta = with lib; { diff --git a/pkgs/tools/graphics/pdfredacttools/default.nix b/pkgs/tools/graphics/pdfredacttools/default.nix index 31a327331d7..0a1cc111b54 100644 --- a/pkgs/tools/graphics/pdfredacttools/default.nix +++ b/pkgs/tools/graphics/pdfredacttools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python2Packages, imagemagick, exiftool, file, ghostscript }: +{ lib, fetchFromGitHub, python2Packages, imagemagick, exiftool, file, ghostscript }: python2Packages.buildPythonApplication rec { pname = "pdf-redact-tools"; @@ -22,8 +22,8 @@ python2Packages.buildPythonApplication rec { meta = with lib; { description = "Redact and strip metadata from documents before publishing"; longDescription = '' - PDF Redact Tools helps with securely redacting and stripping metadata - from documents before publishing. Note that this is not a security tool. + PDF Redact Tools helps with securely redacting and stripping metadata + from documents before publishing. Note that this is not a security tool. It uses ImageMagick to parse PDFs. While ImageMagick is a versatile tool, it has a history of several security bugs. A malicious PDF could exploit a bug in ImageMagick to take over your computer. If you're working with potentially diff --git a/pkgs/tools/graphics/pdftag/default.nix b/pkgs/tools/graphics/pdftag/default.nix index 2d2fe74d784..c10412c976c 100644 --- a/pkgs/tools/graphics/pdftag/default.nix +++ b/pkgs/tools/graphics/pdftag/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, meson, vala, ninja +{ lib, stdenv, fetchFromGitHub, pkg-config, meson, vala, ninja , gtk3, poppler, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1paj8hs27akzsivn01a30fl3zx5gfn1h89wxg2m72fd806hk0hql"; }; - nativeBuildInputs = [ pkgconfig meson ninja wrapGAppsHook vala ]; + nativeBuildInputs = [ pkg-config meson ninja wrapGAppsHook vala ]; buildInputs = [ gtk3 poppler ]; meta = with lib; { diff --git a/pkgs/tools/graphics/pfstools/default.nix b/pkgs/tools/graphics/pfstools/default.nix index c22746c5214..ded99674186 100644 --- a/pkgs/tools/graphics/pfstools/default.nix +++ b/pkgs/tools/graphics/pfstools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchurl, cmake, pkgconfig, darwin +{ lib, stdenv, mkDerivation, fetchurl, cmake, pkg-config, darwin , openexr, zlib, imagemagick, libGLU, libGL, freeglut, fftwFloat , fftw, gsl, libexif, perl, opencv2, qtbase, netpbm }: @@ -18,14 +18,14 @@ mkDerivation rec { preConfigure = '' rm cmake/FindNETPBM.cmake - echo "SET(NETPBM_LIBRARY `find ${stdenv.lib.getLib netpbm} -name "*.${stdenv.hostPlatform.extensions.sharedLibrary}*" -type f`)" >> cmake/FindNETPBM.cmake - echo "SET(NETPBM_LIBRARIES `find ${stdenv.lib.getLib netpbm} -name "*.${stdenv.hostPlatform.extensions.sharedLibrary}*" -type f`)" >> cmake/FindNETPBM.cmake - echo "SET(NETPBM_INCLUDE_DIR ${stdenv.lib.getDev netpbm}/include/netpbm)" >> cmake/FindNETPBM.cmake + echo "SET(NETPBM_LIBRARY `find ${lib.getLib netpbm} -name "*.${stdenv.hostPlatform.extensions.sharedLibrary}*" -type f`)" >> cmake/FindNETPBM.cmake + echo "SET(NETPBM_LIBRARIES `find ${lib.getLib netpbm} -name "*.${stdenv.hostPlatform.extensions.sharedLibrary}*" -type f`)" >> cmake/FindNETPBM.cmake + echo "SET(NETPBM_INCLUDE_DIR ${lib.getDev netpbm}/include/netpbm)" >> cmake/FindNETPBM.cmake echo "INCLUDE(FindPackageHandleStandardArgs)" >> cmake/FindNETPBM.cmake echo "FIND_PACKAGE_HANDLE_STANDARD_ARGS(NETPBM DEFAULT_MSG NETPBM_LIBRARY NETPBM_INCLUDE_DIR)" >> cmake/FindNETPBM.cmake ''; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ openexr zlib imagemagick fftwFloat fftw gsl libexif perl opencv2 qtbase netpbm diff --git a/pkgs/tools/graphics/pgf/default.nix b/pkgs/tools/graphics/pgf/default.nix index d3f01fa7d1f..14cd83c3fcf 100644 --- a/pkgs/tools/graphics/pgf/default.nix +++ b/pkgs/tools/graphics/pgf/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, dos2unix, libpgf, freeimage, doxygen }: +{ lib, stdenv, fetchurl, autoconf, automake, libtool, dos2unix, libpgf, freeimage, doxygen }: -with stdenv.lib; +with lib; let version = "6.14.12"; @@ -29,7 +29,7 @@ stdenv.mkDerivation { meta = { homepage = "https://www.libpgf.org/"; description = "Progressive Graphics Format command line program"; - license = stdenv.lib.licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.lgpl21Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/graphics/piglit/default.nix b/pkgs/tools/graphics/piglit/default.nix index e2c2b6e6e97..0a4dfc4bafc 100644 --- a/pkgs/tools/graphics/piglit/default.nix +++ b/pkgs/tools/graphics/piglit/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/piglit \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libGL libglvnd ]} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL libglvnd ]} \ --prefix PATH : "${waffle}/bin" ''; diff --git a/pkgs/tools/graphics/plotutils/default.nix b/pkgs/tools/graphics/plotutils/default.nix index 7292b2ac37b..001b4cd174b 100644 --- a/pkgs/tools/graphics/plotutils/default.nix +++ b/pkgs/tools/graphics/plotutils/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, libpng, autoreconfHook }: +{ fetchurl, lib, stdenv, libpng, autoreconfHook }: # debian splits this package into plotutils and libplot2c2 @@ -51,8 +51,8 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/plotutils/"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.marcweber ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/graphics/pngcheck/default.nix b/pkgs/tools/graphics/pngcheck/default.nix index ba5082ac304..7fba539977f 100644 --- a/pkgs/tools/graphics/pngcheck/default.nix +++ b/pkgs/tools/graphics/pngcheck/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib }: +{ lib, stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { name = "pngcheck-2.3.0"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://pmt.sourceforge.net/pngcrush"; description = "Verifies the integrity of PNG, JNG and MNG files"; - license = stdenv.lib.licenses.free; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.free; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/tools/graphics/pngcrush/default.nix index 5bc52b92f0d..e4a8b705a16 100644 --- a/pkgs/tools/graphics/pngcrush/default.nix +++ b/pkgs/tools/graphics/pngcrush/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libpng }: +{ lib, stdenv, fetchurl, libpng }: stdenv.mkDerivation rec { name = "pngcrush-1.8.13"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://pmt.sourceforge.net/pngcrush"; description = "A PNG optimizer"; - license = stdenv.lib.licenses.free; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = lib.licenses.free; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/tools/graphics/pngnq/default.nix b/pkgs/tools/graphics/pngnq/default.nix index 462dd2bf7e4..bec86e20ce3 100644 --- a/pkgs/tools/graphics/pngnq/default.nix +++ b/pkgs/tools/graphics/pngnq/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libpng, zlib }: +{ lib, stdenv, fetchurl, pkg-config, libpng, zlib }: stdenv.mkDerivation rec { name = "pngnq-1.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1qmnnl846agg55i7h4vmrn11lgb8kg6gvs8byqz34bdkjh5gwiy1"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libpng zlib ]; patchPhase = '' diff --git a/pkgs/tools/graphics/pngout/default.nix b/pkgs/tools/graphics/pngout/default.nix index 33a62478a4b..d1d069c7ff7 100644 --- a/pkgs/tools/graphics/pngout/default.nix +++ b/pkgs/tools/graphics/pngout/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: let folder = if stdenv.hostPlatform.system == "i686-linux" then "i686" @@ -16,7 +16,7 @@ stdenv.mkDerivation { installPhase = '' mkdir -p $out/bin cp ${folder}/pngout $out/bin - + ${if stdenv.hostPlatform.system == "i686-linux" then '' patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/bin/pngout '' else if stdenv.hostPlatform.system == "x86_64-linux" then '' @@ -26,8 +26,8 @@ stdenv.mkDerivation { meta = { description = "A tool that aggressively optimizes the sizes of PNG images"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; homepage = "http://advsys.net/ken/utils.htm"; - maintainers = [ stdenv.lib.maintainers.sander ]; + maintainers = [ lib.maintainers.sander ]; }; } diff --git a/pkgs/tools/graphics/pngquant/default.nix b/pkgs/tools/graphics/pngquant/default.nix index 64e6077062e..b3b1773faf1 100644 --- a/pkgs/tools/graphics/pngquant/default.nix +++ b/pkgs/tools/graphics/pngquant/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, libpng, zlib, lcms2 }: +{ lib, stdenv, fetchFromGitHub, pkg-config, libpng, zlib, lcms2 }: stdenv.mkDerivation rec { pname = "pngquant"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { preConfigure = "patchShebangs ."; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libpng zlib lcms2 ]; meta = with lib; { diff --git a/pkgs/tools/graphics/pngtoico/default.nix b/pkgs/tools/graphics/pngtoico/default.nix index 2300c65f24b..7eabfb89d5a 100644 --- a/pkgs/tools/graphics/pngtoico/default.nix +++ b/pkgs/tools/graphics/pngtoico/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libpng }: +{ lib, stdenv, fetchurl, libpng }: stdenv.mkDerivation { name = "pngtoico-1.0"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { homepage = "https://www.kernel.org/pub/software/graphics/pngtoico/"; description = "Small utility to convert a set of PNG images to Microsoft ICO format"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2Plus; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/tools/graphics/pstoedit/default.nix b/pkgs/tools/graphics/pstoedit/default.nix index 47c3bc25b2e..57e16a4925a 100644 --- a/pkgs/tools/graphics/pstoedit/default.nix +++ b/pkgs/tools/graphics/pstoedit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, darwin, lib +{ stdenv, fetchurl, pkg-config, darwin, lib , zlib, ghostscript, imagemagick, plotutils, gd , libjpeg, libwebp, libiconv }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { patches = [ ./pstoedit-gs-9.22-compat.patch ]; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib ghostscript imagemagick plotutils gd libjpeg libwebp ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ libiconv ApplicationServices diff --git a/pkgs/tools/graphics/puppeteer-cli/default.nix b/pkgs/tools/graphics/puppeteer-cli/default.nix new file mode 100644 index 00000000000..20dab27ddf0 --- /dev/null +++ b/pkgs/tools/graphics/puppeteer-cli/default.nix @@ -0,0 +1,21 @@ +{ fetchFromGitHub, makeWrapper, chromium, mkYarnPackage +}: + +mkYarnPackage rec { + pname = "puppeteer-cli"; + version = "1.5.1"; + src = fetchFromGitHub { + owner = "JarvusInnovations"; + repo = "puppeteer-cli"; + rev = "v${version}"; + sha256 = "0xrb8r4qc9ds7wmfd30nslnkqylxqfwr4gqf7b30v651sjyds29x"; + }; + packageJSON = ./package.json; + yarnLock = ./yarn.lock; + yarnNix = ./yarn.nix; + nativeBuildInputs = [ makeWrapper ]; + postInstall = '' + wrapProgram $out/bin/puppeteer \ + --set PUPPETEER_EXECUTABLE_PATH ${chromium}/bin/chromium + ''; +} diff --git a/pkgs/tools/graphics/puppeteer-cli/package.json b/pkgs/tools/graphics/puppeteer-cli/package.json new file mode 100644 index 00000000000..993d5122bbb --- /dev/null +++ b/pkgs/tools/graphics/puppeteer-cli/package.json @@ -0,0 +1,18 @@ +{ + "name": "puppeteer-cli", + "version": "1.5.1", + "description": "A command-line wrapper for generating PDF prints and PNG screenshots with Puppeteer. Aims to be a easy replacement for the deprecated wkhtmltopdf.", + "bin": { + "puppeteer": "./index.js" + }, + "author": "Chris Alfano <chris@jarv.us>", + "license": "MIT", + "repository": "JarvusInnovations/puppeteer-cli", + "dependencies": { + "file-url": "^3.0.0", + "is-url": "^1.2.4", + "puppeteer": "^2.0.0", + "url-parse": "^1.4.7", + "yargs": "^13.3.0" + } +} diff --git a/pkgs/tools/graphics/puppeteer-cli/yarn.lock b/pkgs/tools/graphics/puppeteer-cli/yarn.lock new file mode 100644 index 00000000000..2e462f69abb --- /dev/null +++ b/pkgs/tools/graphics/puppeteer-cli/yarn.lock @@ -0,0 +1,490 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +"@types/mime-types@^2.1.0": + version "2.1.0" + resolved "https://registry.yarnpkg.com/@types/mime-types/-/mime-types-2.1.0.tgz#9ca52cda363f699c69466c2a6ccdaad913ea7a73" + integrity sha1-nKUs2jY/aZxpRmwqbM2q2RPqenM= + +agent-base@5: + version "5.1.1" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-5.1.1.tgz#e8fb3f242959db44d63be665db7a8e739537a32c" + integrity sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g== + +ansi-regex@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" + integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== + +ansi-styles@^3.2.0: + version "3.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" + integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== + dependencies: + color-convert "^1.9.0" + +async-limiter@~1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd" + integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ== + +balanced-match@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" + integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= + +brace-expansion@^1.1.7: + version "1.1.11" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" + integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== + dependencies: + balanced-match "^1.0.0" + concat-map "0.0.1" + +buffer-crc32@~0.2.3: + version "0.2.13" + resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" + integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI= + +buffer-from@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" + integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== + +camelcase@^5.0.0: + version "5.3.1" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" + integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== + +cliui@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5" + integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA== + dependencies: + string-width "^3.1.0" + strip-ansi "^5.2.0" + wrap-ansi "^5.1.0" + +color-convert@^1.9.0: + version "1.9.3" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" + integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== + dependencies: + color-name "1.1.3" + +color-name@1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" + integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= + +concat-map@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= + +concat-stream@^1.6.2: + version "1.6.2" + resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" + integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw== + dependencies: + buffer-from "^1.0.0" + inherits "^2.0.3" + readable-stream "^2.2.2" + typedarray "^0.0.6" + +core-util-is@~1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" + integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= + +debug@4, debug@^4.1.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791" + integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw== + dependencies: + ms "^2.1.1" + +debug@^2.6.9: + version "2.6.9" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" + integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== + dependencies: + ms "2.0.0" + +decamelize@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" + integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= + +emoji-regex@^7.0.1: + version "7.0.3" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" + integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA== + +extract-zip@^1.6.6: + version "1.7.0" + resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.7.0.tgz#556cc3ae9df7f452c493a0cfb51cc30277940927" + integrity sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA== + dependencies: + concat-stream "^1.6.2" + debug "^2.6.9" + mkdirp "^0.5.4" + yauzl "^2.10.0" + +fd-slicer@~1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e" + integrity sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4= + dependencies: + pend "~1.2.0" + +file-url@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/file-url/-/file-url-3.0.0.tgz#247a586a746ce9f7a8ed05560290968afc262a77" + integrity sha512-g872QGsHexznxkIAdK8UiZRe7SkE6kvylShU4Nsj8NvfvZag7S0QuQ4IgvPDkk75HxgjIVDwycFTDAgIiO4nDA== + +find-up@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" + integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg== + dependencies: + locate-path "^3.0.0" + +fs.realpath@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" + integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= + +get-caller-file@^2.0.1: + version "2.0.5" + resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" + integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== + +glob@^7.1.3: + version "7.1.6" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" + integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + +https-proxy-agent@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz#702b71fb5520a132a66de1f67541d9e62154d82b" + integrity sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg== + dependencies: + agent-base "5" + debug "4" + +inflight@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" + integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= + dependencies: + once "^1.3.0" + wrappy "1" + +inherits@2, inherits@^2.0.3, inherits@~2.0.3: + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== + +is-fullwidth-code-point@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" + integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= + +is-url@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/is-url/-/is-url-1.2.4.tgz#04a4df46d28c4cff3d73d01ff06abeb318a1aa52" + integrity sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww== + +isarray@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" + integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= + +locate-path@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" + integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A== + dependencies: + p-locate "^3.0.0" + path-exists "^3.0.0" + +mime-db@1.44.0: + version "1.44.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92" + integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg== + +mime-types@^2.1.25: + version "2.1.27" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f" + integrity sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w== + dependencies: + mime-db "1.44.0" + +mime@^2.0.3: + version "2.4.6" + resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.6.tgz#e5b407c90db442f2beb5b162373d07b69affa4d1" + integrity sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA== + +minimatch@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" + integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== + dependencies: + brace-expansion "^1.1.7" + +minimist@^1.2.5: + version "1.2.5" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" + integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== + +mkdirp@^0.5.4: + version "0.5.5" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" + integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== + dependencies: + minimist "^1.2.5" + +ms@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" + integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= + +ms@^2.1.1: + version "2.1.2" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" + integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== + +once@^1.3.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= + dependencies: + wrappy "1" + +p-limit@^2.0.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" + integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== + dependencies: + p-try "^2.0.0" + +p-locate@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" + integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ== + dependencies: + p-limit "^2.0.0" + +p-try@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" + integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== + +path-exists@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" + integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU= + +path-is-absolute@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= + +pend@~1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" + integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA= + +process-nextick-args@~2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" + integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== + +progress@^2.0.1: + version "2.0.3" + resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" + integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== + +proxy-from-env@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" + integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== + +puppeteer@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-2.1.1.tgz#ccde47c2a688f131883b50f2d697bd25189da27e" + integrity sha512-LWzaDVQkk1EPiuYeTOj+CZRIjda4k2s5w4MK4xoH2+kgWV/SDlkYHmxatDdtYrciHUKSXTsGgPgPP8ILVdBsxg== + dependencies: + "@types/mime-types" "^2.1.0" + debug "^4.1.0" + extract-zip "^1.6.6" + https-proxy-agent "^4.0.0" + mime "^2.0.3" + mime-types "^2.1.25" + progress "^2.0.1" + proxy-from-env "^1.0.0" + rimraf "^2.6.1" + ws "^6.1.0" + +querystringify@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.1.tgz#60e5a5fd64a7f8bfa4d2ab2ed6fdf4c85bad154e" + integrity sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA== + +readable-stream@^2.2.2: + version "2.3.7" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" + integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.3" + isarray "~1.0.0" + process-nextick-args "~2.0.0" + safe-buffer "~5.1.1" + string_decoder "~1.1.1" + util-deprecate "~1.0.1" + +require-directory@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" + integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= + +require-main-filename@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b" + integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg== + +requires-port@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" + integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8= + +rimraf@^2.6.1: + version "2.7.1" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" + integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== + dependencies: + glob "^7.1.3" + +safe-buffer@~5.1.0, safe-buffer@~5.1.1: + version "5.1.2" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" + integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== + +set-blocking@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" + integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= + +string-width@^3.0.0, string-width@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" + integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w== + dependencies: + emoji-regex "^7.0.1" + is-fullwidth-code-point "^2.0.0" + strip-ansi "^5.1.0" + +string_decoder@~1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" + integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== + dependencies: + safe-buffer "~5.1.0" + +strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" + integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA== + dependencies: + ansi-regex "^4.1.0" + +typedarray@^0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" + integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= + +url-parse@^1.4.7: + version "1.4.7" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz#a8a83535e8c00a316e403a5db4ac1b9b853ae278" + integrity sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg== + dependencies: + querystringify "^2.1.1" + requires-port "^1.0.0" + +util-deprecate@~1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" + integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= + +which-module@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" + integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= + +wrap-ansi@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09" + integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q== + dependencies: + ansi-styles "^3.2.0" + string-width "^3.0.0" + strip-ansi "^5.0.0" + +wrappy@1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= + +ws@^6.1.0: + version "6.2.1" + resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb" + integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA== + dependencies: + async-limiter "~1.0.0" + +y18n@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b" + integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w== + +yargs-parser@^13.1.2: + version "13.1.2" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38" + integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg== + dependencies: + camelcase "^5.0.0" + decamelize "^1.2.0" + +yargs@^13.3.0: + version "13.3.2" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd" + integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw== + dependencies: + cliui "^5.0.0" + find-up "^3.0.0" + get-caller-file "^2.0.1" + require-directory "^2.1.1" + require-main-filename "^2.0.0" + set-blocking "^2.0.0" + string-width "^3.0.0" + which-module "^2.0.0" + y18n "^4.0.0" + yargs-parser "^13.1.2" + +yauzl@^2.10.0: + version "2.10.0" + resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" + integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk= + dependencies: + buffer-crc32 "~0.2.3" + fd-slicer "~1.1.0" diff --git a/pkgs/tools/graphics/puppeteer-cli/yarn.nix b/pkgs/tools/graphics/puppeteer-cli/yarn.nix new file mode 100644 index 00000000000..773acc84f35 --- /dev/null +++ b/pkgs/tools/graphics/puppeteer-cli/yarn.nix @@ -0,0 +1,605 @@ +{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { + offline_cache = linkFarm "offline" packages; + packages = [ + { + name = "_types_mime_types___mime_types_2.1.0.tgz"; + path = fetchurl { + name = "_types_mime_types___mime_types_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/@types/mime-types/-/mime-types-2.1.0.tgz"; + sha1 = "9ca52cda363f699c69466c2a6ccdaad913ea7a73"; + }; + } + { + name = "agent_base___agent_base_5.1.1.tgz"; + path = fetchurl { + name = "agent_base___agent_base_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/agent-base/-/agent-base-5.1.1.tgz"; + sha1 = "e8fb3f242959db44d63be665db7a8e739537a32c"; + }; + } + { + name = "ansi_regex___ansi_regex_4.1.0.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz"; + sha1 = "8b9f8f08cf1acb843756a839ca8c7e3168c51997"; + }; + } + { + name = "ansi_styles___ansi_styles_3.2.1.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz"; + sha1 = "41fbb20243e50b12be0f04b8dedbf07520ce841d"; + }; + } + { + name = "async_limiter___async_limiter_1.0.1.tgz"; + path = fetchurl { + name = "async_limiter___async_limiter_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz"; + sha1 = "dd379e94f0db8310b08291f9d64c3209766617fd"; + }; + } + { + name = "balanced_match___balanced_match_1.0.0.tgz"; + path = fetchurl { + name = "balanced_match___balanced_match_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz"; + sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; + }; + } + { + name = "brace_expansion___brace_expansion_1.1.11.tgz"; + path = fetchurl { + name = "brace_expansion___brace_expansion_1.1.11.tgz"; + url = "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz"; + sha1 = "3c7fcbf529d87226f3d2f52b966ff5271eb441dd"; + }; + } + { + name = "buffer_crc32___buffer_crc32_0.2.13.tgz"; + path = fetchurl { + name = "buffer_crc32___buffer_crc32_0.2.13.tgz"; + url = "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz"; + sha1 = "0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"; + }; + } + { + name = "buffer_from___buffer_from_1.1.1.tgz"; + path = fetchurl { + name = "buffer_from___buffer_from_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz"; + sha1 = "32713bc028f75c02fdb710d7c7bcec1f2c6070ef"; + }; + } + { + name = "camelcase___camelcase_5.3.1.tgz"; + path = fetchurl { + name = "camelcase___camelcase_5.3.1.tgz"; + url = "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz"; + sha1 = "e3c9b31569e106811df242f715725a1f4c494320"; + }; + } + { + name = "cliui___cliui_5.0.0.tgz"; + path = fetchurl { + name = "cliui___cliui_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz"; + sha1 = "deefcfdb2e800784aa34f46fa08e06851c7bbbc5"; + }; + } + { + name = "color_convert___color_convert_1.9.3.tgz"; + path = fetchurl { + name = "color_convert___color_convert_1.9.3.tgz"; + url = "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz"; + sha1 = "bb71850690e1f136567de629d2d5471deda4c1e8"; + }; + } + { + name = "color_name___color_name_1.1.3.tgz"; + path = fetchurl { + name = "color_name___color_name_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz"; + sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; + }; + } + { + name = "concat_map___concat_map_0.0.1.tgz"; + path = fetchurl { + name = "concat_map___concat_map_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }; + } + { + name = "concat_stream___concat_stream_1.6.2.tgz"; + path = fetchurl { + name = "concat_stream___concat_stream_1.6.2.tgz"; + url = "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz"; + sha1 = "904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"; + }; + } + { + name = "core_util_is___core_util_is_1.0.2.tgz"; + path = fetchurl { + name = "core_util_is___core_util_is_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz"; + sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + }; + } + { + name = "debug___debug_4.1.1.tgz"; + path = fetchurl { + name = "debug___debug_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz"; + sha1 = "3b72260255109c6b589cee050f1d516139664791"; + }; + } + { + name = "debug___debug_2.6.9.tgz"; + path = fetchurl { + name = "debug___debug_2.6.9.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz"; + sha1 = "5d128515df134ff327e90a4c93f4e077a536341f"; + }; + } + { + name = "decamelize___decamelize_1.2.0.tgz"; + path = fetchurl { + name = "decamelize___decamelize_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz"; + sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; + }; + } + { + name = "emoji_regex___emoji_regex_7.0.3.tgz"; + path = fetchurl { + name = "emoji_regex___emoji_regex_7.0.3.tgz"; + url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz"; + sha1 = "933a04052860c85e83c122479c4748a8e4c72156"; + }; + } + { + name = "extract_zip___extract_zip_1.7.0.tgz"; + path = fetchurl { + name = "extract_zip___extract_zip_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.7.0.tgz"; + sha1 = "556cc3ae9df7f452c493a0cfb51cc30277940927"; + }; + } + { + name = "fd_slicer___fd_slicer_1.1.0.tgz"; + path = fetchurl { + name = "fd_slicer___fd_slicer_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz"; + sha1 = "25c7c89cb1f9077f8891bbe61d8f390eae256f1e"; + }; + } + { + name = "file_url___file_url_3.0.0.tgz"; + path = fetchurl { + name = "file_url___file_url_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/file-url/-/file-url-3.0.0.tgz"; + sha1 = "247a586a746ce9f7a8ed05560290968afc262a77"; + }; + } + { + name = "find_up___find_up_3.0.0.tgz"; + path = fetchurl { + name = "find_up___find_up_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz"; + sha1 = "49169f1d7993430646da61ecc5ae355c21c97b73"; + }; + } + { + name = "fs.realpath___fs.realpath_1.0.0.tgz"; + path = fetchurl { + name = "fs.realpath___fs.realpath_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz"; + sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + }; + } + { + name = "get_caller_file___get_caller_file_2.0.5.tgz"; + path = fetchurl { + name = "get_caller_file___get_caller_file_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz"; + sha1 = "4f94412a82db32f36e3b0b9741f8a97feb031f7e"; + }; + } + { + name = "glob___glob_7.1.6.tgz"; + path = fetchurl { + name = "glob___glob_7.1.6.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz"; + sha1 = "141f33b81a7c2492e125594307480c46679278a6"; + }; + } + { + name = "https_proxy_agent___https_proxy_agent_4.0.0.tgz"; + path = fetchurl { + name = "https_proxy_agent___https_proxy_agent_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz"; + sha1 = "702b71fb5520a132a66de1f67541d9e62154d82b"; + }; + } + { + name = "inflight___inflight_1.0.6.tgz"; + path = fetchurl { + name = "inflight___inflight_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz"; + sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + }; + } + { + name = "inherits___inherits_2.0.4.tgz"; + path = fetchurl { + name = "inherits___inherits_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz"; + sha1 = "0fa2c64f932917c3433a0ded55363aae37416b7c"; + }; + } + { + name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; + path = fetchurl { + name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; + sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; + }; + } + { + name = "is_url___is_url_1.2.4.tgz"; + path = fetchurl { + name = "is_url___is_url_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/is-url/-/is-url-1.2.4.tgz"; + sha1 = "04a4df46d28c4cff3d73d01ff06abeb318a1aa52"; + }; + } + { + name = "isarray___isarray_1.0.0.tgz"; + path = fetchurl { + name = "isarray___isarray_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz"; + sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + }; + } + { + name = "locate_path___locate_path_3.0.0.tgz"; + path = fetchurl { + name = "locate_path___locate_path_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz"; + sha1 = "dbec3b3ab759758071b58fe59fc41871af21400e"; + }; + } + { + name = "mime_db___mime_db_1.44.0.tgz"; + path = fetchurl { + name = "mime_db___mime_db_1.44.0.tgz"; + url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz"; + sha1 = "fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"; + }; + } + { + name = "mime_types___mime_types_2.1.27.tgz"; + path = fetchurl { + name = "mime_types___mime_types_2.1.27.tgz"; + url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz"; + sha1 = "47949f98e279ea53119f5722e0f34e529bec009f"; + }; + } + { + name = "mime___mime_2.4.6.tgz"; + path = fetchurl { + name = "mime___mime_2.4.6.tgz"; + url = "https://registry.yarnpkg.com/mime/-/mime-2.4.6.tgz"; + sha1 = "e5b407c90db442f2beb5b162373d07b69affa4d1"; + }; + } + { + name = "minimatch___minimatch_3.0.4.tgz"; + path = fetchurl { + name = "minimatch___minimatch_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz"; + sha1 = "5166e286457f03306064be5497e8dbb0c3d32083"; + }; + } + { + name = "minimist___minimist_1.2.5.tgz"; + path = fetchurl { + name = "minimist___minimist_1.2.5.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz"; + sha1 = "67d66014b66a6a8aaa0c083c5fd58df4e4e97602"; + }; + } + { + name = "mkdirp___mkdirp_0.5.5.tgz"; + path = fetchurl { + name = "mkdirp___mkdirp_0.5.5.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz"; + sha1 = "d91cefd62d1436ca0f41620e251288d420099def"; + }; + } + { + name = "ms___ms_2.0.0.tgz"; + path = fetchurl { + name = "ms___ms_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz"; + sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + }; + } + { + name = "ms___ms_2.1.2.tgz"; + path = fetchurl { + name = "ms___ms_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz"; + sha1 = "d09d1f357b443f493382a8eb3ccd183872ae6009"; + }; + } + { + name = "once___once_1.4.0.tgz"; + path = fetchurl { + name = "once___once_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz"; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + }; + } + { + name = "p_limit___p_limit_2.3.0.tgz"; + path = fetchurl { + name = "p_limit___p_limit_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz"; + sha1 = "3dd33c647a214fdfffd835933eb086da0dc21db1"; + }; + } + { + name = "p_locate___p_locate_3.0.0.tgz"; + path = fetchurl { + name = "p_locate___p_locate_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz"; + sha1 = "322d69a05c0264b25997d9f40cd8a891ab0064a4"; + }; + } + { + name = "p_try___p_try_2.2.0.tgz"; + path = fetchurl { + name = "p_try___p_try_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz"; + sha1 = "cb2868540e313d61de58fafbe35ce9004d5540e6"; + }; + } + { + name = "path_exists___path_exists_3.0.0.tgz"; + path = fetchurl { + name = "path_exists___path_exists_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz"; + sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"; + }; + } + { + name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; + path = fetchurl { + name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + }; + } + { + name = "pend___pend_1.2.0.tgz"; + path = fetchurl { + name = "pend___pend_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz"; + sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50"; + }; + } + { + name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; + path = fetchurl { + name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; + sha1 = "7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"; + }; + } + { + name = "progress___progress_2.0.3.tgz"; + path = fetchurl { + name = "progress___progress_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz"; + sha1 = "7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"; + }; + } + { + name = "proxy_from_env___proxy_from_env_1.1.0.tgz"; + path = fetchurl { + name = "proxy_from_env___proxy_from_env_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz"; + sha1 = "e102f16ca355424865755d2c9e8ea4f24d58c3e2"; + }; + } + { + name = "puppeteer___puppeteer_2.1.1.tgz"; + path = fetchurl { + name = "puppeteer___puppeteer_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/puppeteer/-/puppeteer-2.1.1.tgz"; + sha1 = "ccde47c2a688f131883b50f2d697bd25189da27e"; + }; + } + { + name = "querystringify___querystringify_2.1.1.tgz"; + path = fetchurl { + name = "querystringify___querystringify_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.1.tgz"; + sha1 = "60e5a5fd64a7f8bfa4d2ab2ed6fdf4c85bad154e"; + }; + } + { + name = "readable_stream___readable_stream_2.3.7.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_2.3.7.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz"; + sha1 = "1eca1cf711aef814c04f62252a36a62f6cb23b57"; + }; + } + { + name = "require_directory___require_directory_2.1.1.tgz"; + path = fetchurl { + name = "require_directory___require_directory_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz"; + sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; + }; + } + { + name = "require_main_filename___require_main_filename_2.0.0.tgz"; + path = fetchurl { + name = "require_main_filename___require_main_filename_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz"; + sha1 = "d0b329ecc7cc0f61649f62215be69af54aa8989b"; + }; + } + { + name = "requires_port___requires_port_1.0.0.tgz"; + path = fetchurl { + name = "requires_port___requires_port_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz"; + sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff"; + }; + } + { + name = "rimraf___rimraf_2.7.1.tgz"; + path = fetchurl { + name = "rimraf___rimraf_2.7.1.tgz"; + url = "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz"; + sha1 = "35797f13a7fdadc566142c29d4f07ccad483e3ec"; + }; + } + { + name = "safe_buffer___safe_buffer_5.1.2.tgz"; + path = fetchurl { + name = "safe_buffer___safe_buffer_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz"; + sha1 = "991ec69d296e0313747d59bdfd2b745c35f8828d"; + }; + } + { + name = "set_blocking___set_blocking_2.0.0.tgz"; + path = fetchurl { + name = "set_blocking___set_blocking_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz"; + sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; + }; + } + { + name = "string_width___string_width_3.1.0.tgz"; + path = fetchurl { + name = "string_width___string_width_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz"; + sha1 = "22767be21b62af1081574306f69ac51b62203961"; + }; + } + { + name = "string_decoder___string_decoder_1.1.1.tgz"; + path = fetchurl { + name = "string_decoder___string_decoder_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz"; + sha1 = "9cf1611ba62685d7030ae9e4ba34149c3af03fc8"; + }; + } + { + name = "strip_ansi___strip_ansi_5.2.0.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz"; + sha1 = "8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"; + }; + } + { + name = "typedarray___typedarray_0.0.6.tgz"; + path = fetchurl { + name = "typedarray___typedarray_0.0.6.tgz"; + url = "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz"; + sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; + }; + } + { + name = "url_parse___url_parse_1.4.7.tgz"; + path = fetchurl { + name = "url_parse___url_parse_1.4.7.tgz"; + url = "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz"; + sha1 = "a8a83535e8c00a316e403a5db4ac1b9b853ae278"; + }; + } + { + name = "util_deprecate___util_deprecate_1.0.2.tgz"; + path = fetchurl { + name = "util_deprecate___util_deprecate_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + }; + } + { + name = "which_module___which_module_2.0.0.tgz"; + path = fetchurl { + name = "which_module___which_module_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz"; + sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"; + }; + } + { + name = "wrap_ansi___wrap_ansi_5.1.0.tgz"; + path = fetchurl { + name = "wrap_ansi___wrap_ansi_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz"; + sha1 = "1fd1f67235d5b6d0fee781056001bfb694c03b09"; + }; + } + { + name = "wrappy___wrappy_1.0.2.tgz"; + path = fetchurl { + name = "wrappy___wrappy_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz"; + sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + }; + } + { + name = "ws___ws_6.2.1.tgz"; + path = fetchurl { + name = "ws___ws_6.2.1.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz"; + sha1 = "442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"; + }; + } + { + name = "y18n___y18n_4.0.0.tgz"; + path = fetchurl { + name = "y18n___y18n_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz"; + sha1 = "95ef94f85ecc81d007c264e190a120f0a3c8566b"; + }; + } + { + name = "yargs_parser___yargs_parser_13.1.2.tgz"; + path = fetchurl { + name = "yargs_parser___yargs_parser_13.1.2.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz"; + sha1 = "130f09702ebaeef2650d54ce6e3e5706f7a4fb38"; + }; + } + { + name = "yargs___yargs_13.3.2.tgz"; + path = fetchurl { + name = "yargs___yargs_13.3.2.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz"; + sha1 = "ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"; + }; + } + { + name = "yauzl___yauzl_2.10.0.tgz"; + path = fetchurl { + name = "yauzl___yauzl_2.10.0.tgz"; + url = "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz"; + sha1 = "c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"; + }; + } + ]; +} diff --git a/pkgs/tools/graphics/qrcode/default.nix b/pkgs/tools/graphics/qrcode/default.nix index 82c0332689b..93a620b5779 100644 --- a/pkgs/tools/graphics/qrcode/default.nix +++ b/pkgs/tools/graphics/qrcode/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-Wno-error=unused-result"; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; + installPhase = '' mkdir -p "$out"/{bin,share/doc/qrcode} cp qrcode "$out/bin" @@ -20,9 +22,9 @@ stdenv.mkDerivation { ''; meta = with lib; { - description = ''A small QR-code tool''; + description = "A small QR-code tool"; license = licenses.gpl3Plus; maintainers = with maintainers; [ raskin ]; - platforms = with platforms; linux; + platforms = with platforms; unix; }; } diff --git a/pkgs/tools/graphics/quirc/default.nix b/pkgs/tools/graphics/quirc/default.nix index 4b610ebbfef..8ca8ecf2c89 100644 --- a/pkgs/tools/graphics/quirc/default.nix +++ b/pkgs/tools/graphics/quirc/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchgit, SDL_gfx, SDL, libjpeg, libpng, pkgconfig}: +{lib, stdenv, fetchgit, SDL_gfx, SDL, libjpeg, libpng, pkg-config}: let s = rec { @@ -13,7 +13,7 @@ let in stdenv.mkDerivation { inherit (s) name version; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ SDL SDL_gfx libjpeg libpng ]; @@ -31,9 +31,9 @@ stdenv.mkDerivation { makeFlags = [ "PREFIX=$(out)" ]; meta = { inherit (s) version; - description = ''A small QR code decoding library''; - license = stdenv.lib.licenses.isc; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + description = "A small QR code decoding library"; + license = lib.licenses.isc; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/graphics/rocket/default.nix b/pkgs/tools/graphics/rocket/default.nix index ec32d6c7140..070e359fe1c 100644 --- a/pkgs/tools/graphics/rocket/default.nix +++ b/pkgs/tools/graphics/rocket/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchFromGitHub, qmake, qtbase }: +{ mkDerivation, lib, fetchFromGitHub, qmake, qtbase }: mkDerivation { pname = "rocket"; diff --git a/pkgs/tools/graphics/s2png/default.nix b/pkgs/tools/graphics/s2png/default.nix index 745a032b068..c1124880944 100644 --- a/pkgs/tools/graphics/s2png/default.nix +++ b/pkgs/tools/graphics/s2png/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, diffutils, gd, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, diffutils, gd, pkg-config }: stdenv.mkDerivation rec { pname = "s2png"; @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { sha256 = "0y3crfm0jqprgxamlly713cka2x1bp6z63p1lw9wh4wc37kpira6"; }; - buildInputs = [ diffutils gd pkgconfig ]; + buildInputs = [ diffutils gd pkg-config ]; installFlags = [ "prefix=" "DESTDIR=$(out)" ]; meta = { homepage = "https://github.com/dbohdan/s2png/"; description = "Store any data in PNG images"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.dbohdan ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.dbohdan ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/graphics/scanbd/default.nix b/pkgs/tools/graphics/scanbd/default.nix index 0ad03e23b39..2f2d0523469 100644 --- a/pkgs/tools/graphics/scanbd/default.nix +++ b/pkgs/tools/graphics/scanbd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , dbus, libconfuse, libjpeg, sane-backends, systemd }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/scanbd/${pname}-${version}.tgz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ dbus libconfuse libjpeg sane-backends systemd ]; configureFlags = [ @@ -35,18 +35,18 @@ stdenv.mkDerivation rec { scanbd polls a scanner's buttons, looking for button presses, function knob changes, or other scanner events such as paper inserts and removals, while at the same time allowing scan-applications to access the scanner. - + Various actions can be submitted (scan, copy, email, ...) via action scripts. The function knob values are passed to the action scripts as well. Scan actions are also signaled via dbus. This can be useful for foreign applications. Scans can also be triggered via dbus from foreign applications. - + On platforms which support signaling of dynamic device insertion/removal (libudev, dbus, hal), scanbd supports this as well. scanbd can use all sane-backends or some special backends from the (old) - scanbuttond project. + scanbuttond project. ''; homepage = "http://scanbd.sourceforge.net/"; downloadPage = "https://sourceforge.net/projects/scanbd/"; diff --git a/pkgs/tools/graphics/shotgun/default.nix b/pkgs/tools/graphics/shotgun/default.nix index 3c96584029e..79ddd39ea79 100644 --- a/pkgs/tools/graphics/shotgun/default.nix +++ b/pkgs/tools/graphics/shotgun/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, libXrandr, libX11 }: +{ lib, fetchFromGitHub, rustPlatform, pkg-config, libXrandr, libX11 }: rustPlatform.buildRustPackage rec { pname = "shotgun"; diff --git a/pkgs/tools/graphics/spirv-cross/default.nix b/pkgs/tools/graphics/spirv-cross/default.nix index 95e4d83645e..cb5a37527bf 100644 --- a/pkgs/tools/graphics/spirv-cross/default.nix +++ b/pkgs/tools/graphics/spirv-cross/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "spirv-cross"; - version = "2020-06-29"; + version = "2021-01-15"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Cross"; rev = version; - sha256 = "0mnccmhlqmpdx92v495z39i07hbvjwdr5n4zbarlrr1d7rm99lx4"; + sha256 = "/9/Owt7XcdOjujWZnaG1Q7FlywvsRo8/l8/CouS48Vk="; }; nativeBuildInputs = [ cmake python3 ]; @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A tool designed for parsing and converting SPIR-V to other shader languages"; homepage = "https://github.com/KhronosGroup/SPIRV-Cross"; + changelog = "https://github.com/KhronosGroup/SPIRV-Cross/releases/tag/${version}"; platforms = platforms.linux; license = licenses.asl20; maintainers = with maintainers; [ Flakebi ]; diff --git a/pkgs/tools/graphics/svgcleaner/default.nix b/pkgs/tools/graphics/svgcleaner/default.nix index 653e585c6ed..6c5e8569e85 100644 --- a/pkgs/tools/graphics/svgcleaner/default.nix +++ b/pkgs/tools/graphics/svgcleaner/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "svgcleaner"; diff --git a/pkgs/tools/graphics/syntex/default.nix b/pkgs/tools/graphics/syntex/default.nix index 693f116a6e8..a076e97d056 100644 --- a/pkgs/tools/graphics/syntex/default.nix +++ b/pkgs/tools/graphics/syntex/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, mono}: +{lib, stdenv, fetchFromGitHub, mono}: stdenv.mkDerivation rec { pname = "syntex"; version = "0.0pre20160915"; @@ -26,9 +26,9 @@ stdenv.mkDerivation rec { buildInputs = [mono]; meta = { inherit version; - description = ''Texture synthesis from examples''; - license = stdenv.lib.licenses.mit; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + description = "Texture synthesis from examples"; + license = lib.licenses.mit; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/graphics/transfig/default.nix b/pkgs/tools/graphics/transfig/default.nix index 9226809c5c5..a6c9cd988c0 100644 --- a/pkgs/tools/graphics/transfig/default.nix +++ b/pkgs/tools/graphics/transfig/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, libjpeg, libpng, imake, gccmakedep }: +{ lib, stdenv, fetchurl, zlib, libjpeg, libpng, imake, gccmakedep }: stdenv.mkDerivation { name = "transfig-3.2.4"; @@ -56,6 +56,6 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; meta = { - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/graphics/unpaper/default.nix b/pkgs/tools/graphics/unpaper/default.nix index a42f8bb45ee..dd6ecb473e9 100644 --- a/pkgs/tools/graphics/unpaper/default.nix +++ b/pkgs/tools/graphics/unpaper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libav, libxslt }: +{ lib, stdenv, fetchurl, pkg-config, libav, libxslt }: stdenv.mkDerivation rec { pname = "unpaper"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0c5rbkxbmy9k8vxjh4cv0bgnqd3wqc99yzw215vkyjslvbsq8z13"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libav libxslt ]; meta = with lib; { diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index 4ea4e49cdbe..9b29e114b88 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -1,5 +1,5 @@ { lib, stdenv -, pkgconfig +, pkg-config , glib , libxml2 , expat @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config autoreconfHook gtk-doc gobject-introspection @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { python27 libpng expat - ] ++ stdenv.lib.optional stdenv.isDarwin ApplicationServices; + ] ++ lib.optional stdenv.isDarwin ApplicationServices; # Required by .pc file propagatedBuildInputs = [ diff --git a/pkgs/tools/graphics/vkBasalt/default.nix b/pkgs/tools/graphics/vkBasalt/default.nix new file mode 100644 index 00000000000..50cbe048131 --- /dev/null +++ b/pkgs/tools/graphics/vkBasalt/default.nix @@ -0,0 +1,42 @@ +{ lib +, stdenv +, fetchFromGitHub +, glslang +, meson +, ninja +, pkg-config +, libX11 +, spirv-headers +, vulkan-headers +, vkBasalt32 +}: + +stdenv.mkDerivation rec { + pname = "vkBasalt"; + version = "0.3.2.4"; + + src = fetchFromGitHub { + owner = "DadSchoorse"; + repo = pname; + rev = "v${version}"; + sha256 = "01iplj6dlw2vl35hyci5m5yp8jmzcwng6c3jk3wn97jpv6m3hjqz"; + }; + + nativeBuildInputs = [ glslang meson ninja pkg-config ]; + buildInputs = [ libX11 spirv-headers vulkan-headers ]; + mesonFlags = [ "-Dappend_libdir_vkbasalt=true" ]; + + # Include 32bit layer in 64bit build + postInstall = lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") '' + ln -s ${vkBasalt32}/share/vulkan/implicit_layer.d/vkBasalt.json \ + "$out/share/vulkan/implicit_layer.d/vkBasalt32.json" + ''; + + meta = with lib; { + description = "A Vulkan post processing layer for Linux"; + homepage = "https://github.com/DadSchoorse/vkBasalt"; + license = licenses.zlib; + maintainers = with maintainers; [ metadark ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix index 389fae9a639..1d0f920a4ba 100644 --- a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix +++ b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix @@ -1,5 +1,5 @@ { stdenv, cmake, expat, fetchFromGitHub, jq, lib, libXdmcp, libXrandr, libffi -, libxcb, pkgconfig, python3, symlinkJoin, vulkan-headers, vulkan-loader +, libxcb, pkg-config, python3, symlinkJoin, vulkan-headers, vulkan-loader , vulkan-validation-layers, wayland, writeText, xcbutilkeysyms, xcbutilwm , xlibsWrapper }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }); - nativeBuildInputs = [ cmake pkgconfig python3 jq ]; + nativeBuildInputs = [ cmake pkg-config python3 jq ]; buildInputs = [ expat diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix index 87e7b861554..907404ec7f4 100644 --- a/pkgs/tools/graphics/vulkan-tools/default.nix +++ b/pkgs/tools/graphics/vulkan-tools/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, cmake, python3, vulkan-loader, - vulkan-headers, glslang, pkgconfig, xlibsWrapper, libxcb, + vulkan-headers, glslang, pkg-config, xlibsWrapper, libxcb, libXrandr, wayland }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "088vqh956zma3p1qc3p6rsygf5s395b6cv8b1x0whp2a0a1y81xz"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ python3 vulkan-headers vulkan-loader xlibsWrapper libxcb libXrandr wayland ]; libraryPath = lib.strings.makeLibraryPath [ vulkan-loader ]; diff --git a/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix b/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix index fa2088ca297..bffd9ea0378 100644 --- a/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix +++ b/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix @@ -1,16 +1,16 @@ -{ cmake, fetchFromGitHub, makeWrapper, opencv3, stdenv, ocl-icd, opencl-headers +{ cmake, fetchFromGitHub, makeWrapper, opencv3, lib, stdenv, ocl-icd, opencl-headers , cudaSupport ? false, cudatoolkit ? null }: stdenv.mkDerivation rec { pname = "waifu2x-converter-cpp"; - version = "5.3.3"; + version = "5.3.4"; src = fetchFromGitHub { owner = "DeadSix27"; repo = pname; rev = "v${version}"; - sha256 = "04r0xyjknvcwk70ilj1p3qwlcz3i6sqgcp0qbc9qwxnsgrrgz09w"; + sha256 = "0rv8bnyxz89za6gwk9gmdbaf3j7c1j52mip7h81rir288j35m84x"; }; patchPhase = '' @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ ocl-icd opencv3 opencl-headers - ] ++ stdenv.lib.optional cudaSupport cudatoolkit; + ] ++ lib.optional cudaSupport cudatoolkit; nativeBuildInputs = [ cmake makeWrapper ]; @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { meta = { description = "Improved fork of Waifu2X C++ using OpenCL and OpenCV"; homepage = "https://github.com/DeadSix27/waifu2x-converter-cpp"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.xzfc ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.xzfc ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/graphics/wavefunctioncollapse/default.nix b/pkgs/tools/graphics/wavefunctioncollapse/default.nix index 65fe38937df..f761e2bbde6 100644 --- a/pkgs/tools/graphics/wavefunctioncollapse/default.nix +++ b/pkgs/tools/graphics/wavefunctioncollapse/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, mono}: +{lib, stdenv, fetchFromGitHub, mono}: stdenv.mkDerivation rec { pname = "wavefunctioncollapse"; version = "0.0pre20170130"; @@ -26,9 +26,9 @@ stdenv.mkDerivation rec { buildInputs = [mono]; meta = { inherit version; - description = ''A generator of bitmaps that are locally similar to the input bitmap''; - license = stdenv.lib.licenses.mit; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + description = "A generator of bitmaps that are locally similar to the input bitmap"; + license = lib.licenses.mit; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/graphics/wdisplays/default.nix b/pkgs/tools/graphics/wdisplays/default.nix index eb7598dce20..2640769d186 100644 --- a/pkgs/tools/graphics/wdisplays/default.nix +++ b/pkgs/tools/graphics/wdisplays/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, gtk3, epoxy, wayland, wrapGAppsHook +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, gtk3, epoxy, wayland, wrapGAppsHook , fetchpatch }: @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "wdisplays"; version = "1.0"; - nativeBuildInputs = [ meson ninja pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ meson ninja pkg-config wrapGAppsHook ]; buildInputs = [ gtk3 epoxy wayland ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }) ]; - meta = let inherit (stdenv) lib; in { + meta = with lib; { description = "A graphical application for configuring displays in Wayland compositors"; homepage = "https://github.com/cyclopsian/wdisplays"; maintainers = with lib.maintainers; [ lheckemann ma27 ]; diff --git a/pkgs/tools/graphics/welkin/default.nix b/pkgs/tools/graphics/welkin/default.nix index be4ba53319a..53e7378bd3b 100644 --- a/pkgs/tools/graphics/welkin/default.nix +++ b/pkgs/tools/graphics/welkin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, jre, makeWrapper }: +{ lib, stdenv, fetchsvn, jre, makeWrapper }: stdenv.mkDerivation rec { pname = "welkin"; @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { meta = { description = "An RDF visualizer"; - maintainers = with stdenv.lib.maintainers; [ + maintainers = with lib.maintainers; [ raskin ]; hydraPlatforms = []; - license = stdenv.lib.licenses.free; - platforms = with stdenv.lib.platforms; unix; + license = lib.licenses.free; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/tools/graphics/xcftools/default.nix b/pkgs/tools/graphics/xcftools/default.nix index a8b0b406aa4..c1b12ca5fe7 100644 --- a/pkgs/tools/graphics/xcftools/default.nix +++ b/pkgs/tools/graphics/xcftools/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libpng, perl, gettext }: +{lib, stdenv, fetchurl, libpng, perl, gettext }: stdenv.mkDerivation { name = "xcftools-1.0.7"; @@ -34,7 +34,7 @@ stdenv.mkDerivation { These tools work independently of the Gimp engine and do not require the Gimp to even be installed. ''; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/graphics/xcur2png/default.nix b/pkgs/tools/graphics/xcur2png/default.nix index 694dba09176..e8d761c6d84 100644 --- a/pkgs/tools/graphics/xcur2png/default.nix +++ b/pkgs/tools/graphics/xcur2png/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, libpng, xorg }: +{ lib, stdenv, fetchFromGitHub, pkg-config, libpng, xorg }: stdenv.mkDerivation rec { pname = "xcur2png"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/tools/graphics/yafaray-core/default.nix b/pkgs/tools/graphics/yafaray-core/default.nix index f0dd183dc2c..cd9faa85ab1 100644 --- a/pkgs/tools/graphics/yafaray-core/default.nix +++ b/pkgs/tools/graphics/yafaray-core/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost165 opencv zlib libxml2 freetype libjpeg libtiff swig openexr ilmbase - ] ++ stdenv.lib.optional withPython python3; + ] ++ lib.optional withPython python3; meta = with lib; { description = "A free, open source raytracer"; diff --git a/pkgs/tools/graphics/yaxg/default.nix b/pkgs/tools/graphics/yaxg/default.nix index ff7e26064ae..349303346f4 100644 --- a/pkgs/tools/graphics/yaxg/default.nix +++ b/pkgs/tools/graphics/yaxg/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin/ mv yaxg $out/bin/ chmod +x $out/bin/yaxg - wrapProgram $out/bin/yaxg --prefix PATH : ${ stdenv.lib.makeBinPath [ maim slop ffmpeg_3 byzanz libnotify xdpyinfo ]} + wrapProgram $out/bin/yaxg --prefix PATH : ${ lib.makeBinPath [ maim slop ffmpeg_3 byzanz libnotify xdpyinfo ]} ''; meta = with lib; { diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix index 8e5d687d2ad..301e760cb56 100644 --- a/pkgs/tools/graphics/zbar/default.nix +++ b/pkgs/tools/graphics/zbar/default.nix @@ -2,7 +2,7 @@ , lib , fetchFromGitHub , imagemagickBig -, pkgconfig +, pkg-config , libX11 , libv4l , qtbase @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config xmlto autoreconfHook docbook_xsl diff --git a/pkgs/tools/graphics/zxing/default.nix b/pkgs/tools/graphics/zxing/default.nix index d295a5899c5..f4eeb50fc03 100644 --- a/pkgs/tools/graphics/zxing/default.nix +++ b/pkgs/tools/graphics/zxing/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre }: +{ lib, stdenv, fetchurl, jre }: stdenv.mkDerivation rec { pname = "zxing"; version = "3.1.0"; @@ -25,10 +25,10 @@ stdenv.mkDerivation rec { ''; meta = { inherit version; - description = ''1D and 2D code reading library''; - license = stdenv.lib.licenses.asl20; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + description = "1D and 2D code reading library"; + license = lib.licenses.asl20; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; homepage = "https://github.com/zxing/zxing"; }; } diff --git a/pkgs/tools/inputmethods/evdevremapkeys/default.nix b/pkgs/tools/inputmethods/evdevremapkeys/default.nix index 99f7231c58a..73344ca2690 100644 --- a/pkgs/tools/inputmethods/evdevremapkeys/default.nix +++ b/pkgs/tools/inputmethods/evdevremapkeys/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonPackage rec { pname = "evdevremapkeys"; diff --git a/pkgs/tools/inputmethods/evscript/default.nix b/pkgs/tools/inputmethods/evscript/default.nix index 95f322ed8c6..66f264bc7a3 100644 --- a/pkgs/tools/inputmethods/evscript/default.nix +++ b/pkgs/tools/inputmethods/evscript/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "evscript"; @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1dcyhxfyq0nrjl05g1s9pjkg7vqw63wbdhlskrdcvxncmci3s7rp"; verifyCargoDeps = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/myfreeweb/${pname}"; description = "A tiny sandboxed Dyon scripting environment for evdev input devices"; license = licenses.unlicense; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix index 2af4061ae04..2767b4c7c0e 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix @@ -42,6 +42,8 @@ stdenv.mkDerivation rec { cp -rv ${store_path} $NIX_BUILD_TOP/$name/data/${ZHUYIN_DATA_FILE_NAME} ''; + dontWrapQtApps = true; + meta = with lib; { isFcitxEngine = true; description = "Fcitx Wrapper for libpinyin, Library to deal with pinyin"; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix index 69ff9c1fe53..94a7d2444bf 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix @@ -1,5 +1,5 @@ -{ clangStdenv, fetchFromGitHub, fetchurl, fetchpatch, gyp, which, ninja, - python, pkgconfig, protobuf, gtk2, zinnia, qt5, libxcb, tegaki-zinnia-japanese, +{ lib, clangStdenv, fetchFromGitHub, fetchurl, fetchpatch, gyp, which, ninja, + python, pkg-config, protobuf, gtk2, zinnia, qt5, libxcb, tegaki-zinnia-japanese, fcitx, gettext }: let japanese_usage_dictionary = fetchFromGitHub { @@ -23,7 +23,7 @@ in clangStdenv.mkDerivation rec { sha256 = "0w2dy2j9x5nc7x3g95j17r3m60vbfyn5j617h7js9xryv33yzpgx"; }; - nativeBuildInputs = [ gyp which ninja python pkgconfig qt5.wrapQtAppsHook ]; + nativeBuildInputs = [ gyp which ninja python pkg-config qt5.wrapQtAppsHook ]; buildInputs = [ protobuf gtk2 zinnia qt5.qtbase libxcb fcitx gettext ]; postUnpack = '' @@ -100,7 +100,7 @@ in clangStdenv.mkDerivation rec { install -m 644 fcitx-mozc-icons/*.png $out/share/fcitx/mozc/icon/ ''; - meta = with clangStdenv.lib; { + meta = with lib; { isFcitxEngine = true; description = "Fcitx engine for Google japanese input method"; homepage = "https://github.com/google/mozc"; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-skk/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-skk/default.nix index 5bbcf83cb48..c1a1994a907 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-skk/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-skk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, fcitx, libskk, skk-dicts }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, fcitx, libskk, skk-dicts }: stdenv.mkDerivation { pname = "fcitx-skk"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "1yl2syqrk212h26vzzkwl19fyp71inqmsli9411h4n2hbcp6m916"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ fcitx libskk skk-dicts ]; cmakeFlags = [ "-DSKK_DEFAULT_PATH=${skk-dicts}/share/SKK-JISYO.combined" diff --git a/pkgs/tools/inputmethods/fcitx/default.nix b/pkgs/tools/inputmethods/fcitx/default.nix index 69e4425d8c3..fc28a08b4b7 100644 --- a/pkgs/tools/inputmethods/fcitx/default.nix +++ b/pkgs/tools/inputmethods/fcitx/default.nix @@ -1,11 +1,11 @@ { callPackage, plugins ? [] }: -let +let unwrapped = callPackage ./unwrapped.nix { }; wrapped = callPackage ./wrapper.nix { plugins = plugins; fcitx = unwrapped; }; -in if plugins == [] +in if plugins == [] then unwrapped else wrapped diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix index 3fd1efcc343..391c2c7add2 100644 --- a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix +++ b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix @@ -2,7 +2,7 @@ , cmake , extra-cmake-modules , fcitx -, pkgconfig +, pkg-config , qtbase }: @@ -17,7 +17,7 @@ mkDerivation rec { sha256 = "0860v3rxsh054wkkbawvyin5mk0flp4cwfcpmcpq147lvdm5lq2i"; }; - nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig ]; + nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ]; buildInputs = [ fcitx qtbase ]; diff --git a/pkgs/tools/inputmethods/fcitx/unwrapped.nix b/pkgs/tools/inputmethods/fcitx/unwrapped.nix index 180dc302ca0..35683101918 100644 --- a/pkgs/tools/inputmethods/fcitx/unwrapped.nix +++ b/pkgs/tools/inputmethods/fcitx/unwrapped.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, cmake, intltool, gettext +{ lib, stdenv, fetchurl, pkg-config, cmake, intltool, gettext , libxml2, enchant2, isocodes, icu, libpthreadstubs , pango, cairo, libxkbfile, libXau, libXdmcp, libxkbcommon , dbus, gtk2, gtk3, qt4, extra-cmake-modules @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { cp ${dicts} src/module/spell/dict/$(stripHash ${dicts}) cp ${table} src/im/table/data/$(stripHash ${table}) '' - + stdenv.lib.optionalString withPinyin '' + + lib.optionalString withPinyin '' cp ${pystroke-data} src/module/pinyin-enhance/data/$(stripHash ${pystroke-data}) cp ${pytable-data} src/module/pinyin-enhance/data/$(stripHash ${pytable-data}) cp ${pinyin-data} src/im/pinyin/data/$(stripHash ${pinyin-data}) @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { patchShebangs cmake/ ''; - nativeBuildInputs = [ cmake extra-cmake-modules intltool pkgconfig pcre ]; + nativeBuildInputs = [ cmake extra-cmake-modules intltool pkg-config pcre ]; buildInputs = [ xkeyboard_config enchant2 gettext isocodes icu libpthreadstubs libXau libXdmcp libxkbfile diff --git a/pkgs/tools/inputmethods/fcitx5/default.nix b/pkgs/tools/inputmethods/fcitx5/default.nix index 5fa85064fa3..e578fbf1443 100644 --- a/pkgs/tools/inputmethods/fcitx5/default.nix +++ b/pkgs/tools/inputmethods/fcitx5/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchFromGitHub , pkg-config @@ -41,13 +41,13 @@ let in stdenv.mkDerivation rec { pname = "fcitx5"; - version = "5.0.3"; + version = "5.0.4"; src = fetchFromGitHub { owner = "fcitx"; repo = "fcitx5"; rev = version; - sha256 = "QYMH0WbhHqDKUvpj1VOB8U5sbBD89H6moLFkQBJijZA="; + sha256 = "sha256-2KGdR1m70Qatidzf/DZuFK3lc1t8z7sxjyhaxuc0Tqg="; }; prePatch = '' @@ -90,7 +90,9 @@ stdenv.mkDerivation rec { libxkbfile ]; - meta = with stdenv.lib; { + passthru.updateScript = ./update.py; + + meta = with lib; { description = "Next generation of fcitx"; homepage = "https://github.com/fcitx/fcitx5"; license = licenses.lgpl21Plus; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix index 2b8a07537b0..6d3952c9c22 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib , mkDerivation , fetchurl , fetchFromGitHub @@ -31,13 +31,13 @@ in mkDerivation rec { pname = "fcitx5-chinese-addons"; - version = "5.0.2"; + version = "5.0.3"; src = fetchFromGitHub { owner = "fcitx"; repo = "fcitx5-chinese-addons"; rev = version; - sha256 = "11UIMrwzZqO8nrQx5oubeoQN8hspL1mvHw5Dc9sVOqQ="; + sha256 = "sha256-kCihpRUtUXrqqf7FPQp8ZRexiygOuDVOdQwVx7tSn+c="; }; cmakeFlags = [ @@ -64,9 +64,9 @@ mkDerivation rec { opencc qtwebengine fmt - ] ++ stdenv.lib.optional luaSupport fcitx5-lua; + ] ++ lib.optional luaSupport fcitx5-lua; - meta = with stdenv.lib; { + meta = with lib; { description = "Addons related to Chinese, including IME previous bundled inside fcitx4"; homepage = "https://github.com/fcitx/fcitx5-chinese-addons"; license = with licenses; [ gpl2Plus lgpl21Plus ]; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix index e5b55c26cd4..b133d576c6c 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib , mkDerivation , fetchFromGitHub , cmake @@ -6,6 +6,7 @@ , fcitx5 , fcitx5-qt , qtx11extras +, qtquickcontrols2 , kwidgetsaddons , kdeclarative , kirigami2 @@ -18,13 +19,13 @@ mkDerivation rec { pname = "fcitx5-configtool"; - version = "5.0.1"; + version = "5.0.2"; src = fetchFromGitHub { owner = "fcitx"; repo = "fcitx5-configtool"; rev = version; - sha256 = "npSqd0R6bqKc+JxYCGcfVzgNLpuLtnHq6zM58smZ8/I="; + sha256 = "sha256-kw0KIbS5SVMf6kR/9xsYiChHXQBM0enSVXyh0QfiiPY="; }; cmakeFlags = [ @@ -40,17 +41,18 @@ mkDerivation rec { fcitx5 fcitx5-qt qtx11extras + qtquickcontrols2 kirigami2 isocodes xkeyboardconfig libxkbfile libXdmcp - ] ++ stdenv.lib.optionals kcmSupport [ + ] ++ lib.optionals kcmSupport [ kdeclarative kwidgetsaddons ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Configuration Tool for Fcitx5"; homepage = "https://github.com/fcitx/fcitx5-configtool"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix index ce157f79253..3f42894ef9f 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchFromGitHub , cmake @@ -24,19 +24,21 @@ stdenv.mkDerivation rec { pname = "fcitx5-gtk"; - version = "5.0.1"; + version = "5.0.3"; src = fetchFromGitHub { owner = "fcitx"; repo = "fcitx5-gtk"; rev = version; - sha256 = "rkusIqMRQMTjcpJR335as1xUQrzD9dLVB/wrLstPXPY="; + sha256 = "sha256-+BzXbZyzC3fvLqysufblk0zK9fAg5jslVdm/v3jz4B4="; }; cmakeFlags = [ "-DGOBJECT_INTROSPECTION_GIRDIR=share/gir-1.0" "-DGOBJECT_INTROSPECTION_TYPELIBDIR=lib/girepository-1.0" - ] ++ stdenv.lib.optional (! withGTK2) "-DENABLE_GTK2_IM_MODULE=off"; + # disabled since we currently don't have gtk4 in nixpkgs + "-DENABLE_GTK4_IM_MODULE=off" + ] ++ lib.optional (! withGTK2) "-DENABLE_GTK2_IM_MODULE=off"; buildInputs = [ gtk3 @@ -54,14 +56,14 @@ stdenv.mkDerivation rec { dbus at-spi2-core libXtst - ] ++ stdenv.lib.optional withGTK2 gtk2; + ] ++ lib.optional withGTK2 gtk2; nativeBuildInputs = [ cmake extra-cmake-modules ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Fcitx5 gtk im module and glib based dbus client library"; homepage = "https://github.com/fcitx/fcitx5-gtk"; license = licenses.lgpl21Plus; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix index 310cae035ba..6184ea36549 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , extra-cmake-modules @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-lua"; - version = "5.0.1"; + version = "5.0.2"; src = fetchFromGitHub { owner = "fcitx"; repo = "fcitx5-lua"; - rev = "${version}"; - sha256 = "OiTk9ldqBqF7WT1KY71hacLD6OQQNO05F7+cSXlli40="; + rev = version; + sha256 = "sha256-lFlHn2q/kpq1EIKKhYVdJofXqtOHnpLz7PoWuNAhmhE="; }; nativeBuildInputs = [ @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { gettext ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Lua support for Fcitx 5"; homepage = "https://github.com/fcitx/fcitx5-lua"; license = licenses.lgpl21Plus; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-mozc.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-mozc.nix new file mode 100644 index 00000000000..08f43b87cfe --- /dev/null +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-mozc.nix @@ -0,0 +1,117 @@ +{ lib, clangStdenv, fetchFromGitHub, fetchurl, fetchpatch, fetchgit +, python3Packages, mesa, ninja, pkg-config, protobuf, zinnia, qt5, fcitx5 +, jsoncpp, gtest, which, gtk2, unzip, abseil-cpp, breakpad }: +let + inherit (python3Packages) python gyp six; + japanese_usage_dictionary = fetchFromGitHub { + owner = "hiroyuki-komatsu"; + repo = "japanese-usage-dictionary"; + rev = "e5b3425575734c323e1d947009dd74709437b684"; + sha256 = "0pyrpz9c8nxccwpgyr36w314mi8h132cis8ijvlqmmhqxwsi30hm"; + }; + # abseil-cpp in nixpkgs is too old + abseil-cpp_2020923 = abseil-cpp.overrideAttrs (old: rec { + version = "20200923.2"; + src = fetchFromGitHub { + owner = "abseil"; + repo = "abseil-cpp"; + rev = version; + sha256 = "G+wkaC4IPtyc/xCUyVFJOcHppPFU7KkhIHjv6uhVKGU="; + }; + cmakeFlags = [ "-DCMAKE_CXX_STANDARD=17" "-DBUILD_SHARED_LIBS=ON" ]; + }); + zipcode_rel = "202011"; + jigyosyo = fetchurl { + url = "https://osdn.net/projects/ponsfoot-aur/storage/mozc/jigyosyo-${zipcode_rel}.zip"; + sha256 = "j7MkNtd4+QTi91EreVig4/OV0o5y1+KIjEJBEmLK/mY="; + }; + x-ken-all = fetchurl { + url = + "https://osdn.net/projects/ponsfoot-aur/storage/mozc/x-ken-all-${zipcode_rel}.zip"; + sha256 = "ExS0Cg3rs0I9IOVbZHLt8UEfk8/LmY9oAHPVVlYuTPw="; + }; + +in clangStdenv.mkDerivation rec { + pname = "fcitx5-mozc"; + version = "2.26.4220.102"; + + src = fetchFromGitHub { + owner = "fcitx"; + repo = "mozc"; + rev = "1882e33b61673b66d63277f82b4c80ae4e506c10"; + sha256 = "R+w0slVFpqtt7PIr1pyupJjRoQsABVZiMdZ9fKGKAqw="; + }; + + nativeBuildInputs = [ gyp ninja mesa python pkg-config qt5.wrapQtAppsHook six which unzip ]; + + buildInputs = [ protobuf zinnia qt5.qtbase fcitx5 abseil-cpp_2020923 jsoncpp gtest gtk2 ]; + + patches = [ + # Support linking system abseil-cpp + (fetchpatch { + url = "https://salsa.debian.org/debian/mozc/-/raw/debian/sid/debian/patches/0007-Update-src-base-absl.gyp.patch"; + sha256 = "UiS0UScDKyAusXOhc7Bg8dF8ARQQiVTylEhAOxqaZt8="; + }) + + ]; + + postUnpack = '' + unzip ${x-ken-all} -d $sourceRoot/src/ + unzip ${jigyosyo} -d $sourceRoot/src/ + + rmdir $sourceRoot/src/third_party/breakpad/ + ln -s ${breakpad} $sourceRoot/src/third_party/breakpad + rmdir $sourceRoot/src/third_party/gtest/ + ln -s ${gtest} $sourceRoot/src/third_party/gtest + rmdir $sourceRoot/src/third_party/gyp/ + ln -s ${gyp} $sourceRoot/src/third_party/gyp + rmdir $sourceRoot/src/third_party/japanese_usage_dictionary/ + ln -s ${japanese_usage_dictionary} $sourceRoot/src/third_party/japanese_usage_dictionary + ''; + + # Copied from https://github.com/archlinux/svntogit-community/blob/packages/fcitx5-mozc/trunk/PKGBUILD + configurePhase = '' + cd src + export GYP_DEFINES="document_dir=$out/share/doc/mozc use_libzinnia=1 use_libprotobuf=1 use_libabseil=1" + + # disable fcitx4 + rm unix/fcitx/fcitx.gyp + + # gen zip code seed + PYTHONPATH="$PWD:$PYTHONPATH" python dictionary/gen_zip_code_seed.py --zip_code="x-ken-all.csv" --jigyosyo="JIGYOSYO.CSV" >> data/dictionary_oss/dictionary09.txt + + # use libstdc++ instead of libc++ + sed "/stdlib=libc++/d;/-lc++/d" -i gyp/common.gypi + + # run gyp + python build_mozc.py gyp --gypdir=${gyp}/bin --server_dir=$out/lib/mozc + ''; + + buildPhase = '' + python build_mozc.py build -c Release \ + server/server.gyp:mozc_server \ + gui/gui.gyp:mozc_tool \ + unix/fcitx5/fcitx5.gyp:fcitx5-mozc + ''; + + installPhase = '' + export PREFIX=$out + export _bldtype=Release + ../scripts/install_server + install -d $out/share/licenses/fcitx5-mozc + head -n 29 server/mozc_server.cc > $out/share/licenses/fcitx5-mozc/LICENSE + install -m644 data/installer/*.html $out/share/licenses/fcitx5-mozc/ + install -d $out/share/fcitx5/addon + install -d $out/share/fcitx5/inputmethod + install -d $out/lib/fcitx5 + ../scripts/install_fcitx5 + ''; + + meta = with lib; { + description = "Fcitx5 Module of A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input)"; + homepage = "https://github.com/fcitx/mozc"; + license = licenses.bsd3; + maintainers = with maintainers; [ berberman ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix index 580082096ec..bfb06a98e8f 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib , mkDerivation , fetchFromGitHub , cmake @@ -7,21 +7,28 @@ , qtx11extras , libxcb , libXdmcp +, qtbase }: mkDerivation rec { pname = "fcitx5-qt"; - version = "5.0.1"; + version = "5.0.2"; src = fetchFromGitHub { owner = "fcitx"; repo = "fcitx5-qt"; rev = version; - sha256 = "BVOumk2xj3vmwmm4KwiktQhWyTuUA2OFwYXNR6HgwyM="; + sha256 = "sha256-QylvjhjiIujYGKFtL4bKVXpobkN5t6Q2MGf16dsL24A="; }; + preConfigure = '' + substituteInPlace qt5/platforminputcontext/CMakeLists.txt \ + --replace \$"{CMAKE_INSTALL_QT5PLUGINDIR}" $out/${qtbase.qtPluginPrefix} + ''; + cmakeFlags = [ "-DENABLE_QT4=0" + "-DENABLE_QT6=0" ]; nativeBuildInputs = [ @@ -36,7 +43,7 @@ mkDerivation rec { libXdmcp ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Fcitx5 Qt Library"; homepage = "https://github.com/fcitx/fcitx5-qt"; license = with licenses; [ lgpl21Plus bsd3 ]; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix index 9992e198758..8e5254b75c4 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix @@ -1,7 +1,7 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchFromGitHub -, pkgconfig +, pkg-config , cmake , extra-cmake-modules , gettext @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-rime"; - version = "5.0.2"; + version = "5.0.3"; src = fetchFromGitHub { owner = "fcitx"; repo = "fcitx5-rime"; rev = version; - sha256 = "cVCTsD1Iw6OtyYFpxff3ix2CubRTnDaBevAYA4I9Ai8="; + sha256 = "sha256-mPNZ/B5bpxua+E1T+oz9v2QKAzGraA2cfT8oJacC35U="; }; cmakeFlags = [ @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules - pkgconfig + pkg-config gettext ]; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { librime ]; - meta = with stdenv.lib; { + meta = with lib; { description = "RIME support for Fcitx5"; homepage = "https://github.com/fcitx/fcitx5-rime"; license = licenses.lgpl21Plus; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix index 7dcca7e130d..355ac97d8a1 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , extra-cmake-modules @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-table-extra"; - version = "5.0.1"; + version = "5.0.2"; src = fetchFromGitHub { owner = "fcitx"; repo = "fcitx5-table-extra"; rev = version; - sha256 = "UHhiWm2Khh6JBB9jz0ZKFofkAJPlqn6SqHeK9etoaxs="; + sha256 = "sha256-Bqxdi/rjiTKqHLvVFVcQMjz/I0xxTiBgUIRkZjLuK+M="; }; nativeBuildInputs = [ @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { fcitx5 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Extra table for Fcitx, including Boshiamy, Zhengma, Cangjie, and Quick"; homepage = "https://github.com/fcitx/fcitx5-table-extra"; license = licenses.gpl2Only; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix index eb9d93d6e7c..4feae0d4acc 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , extra-cmake-modules @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-table-other"; - version = "5.0.1"; + version = "5.0.2"; src = fetchFromGitHub { owner = "fcitx"; repo = "fcitx5-table-other"; rev = version; - sha256 = "hQlrjDPImDof2+3/uOtTdJ27cInevbxH9B+lNwquKbs="; + sha256 = "sha256-P+KaUmjAHe1CZ5rNMQAxwKSW5ZMVgQcwkgdlungXTLM="; }; nativeBuildInputs = [ @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { fcitx5 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Some other tables for Fcitx"; homepage = "https://github.com/fcitx/fcitx5-table-other"; license = licenses.gpl3Only; diff --git a/pkgs/tools/inputmethods/fcitx5/update.py b/pkgs/tools/inputmethods/fcitx5/update.py new file mode 100755 index 00000000000..e3513c747fc --- /dev/null +++ b/pkgs/tools/inputmethods/fcitx5/update.py @@ -0,0 +1,29 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i python3 -p nix-prefetch-github python3Packages.requests + +from nix_prefetch_github import * +import json +import requests +import subprocess + +REPOS = [ "libime", "xcb-imdkit", "fcitx5", "fcitx5-gtk", "fcitx5-qt", "fcitx5-configtool", "fcitx5-lua", + "fcitx5-rime", "fcitx5-chinese-addons", "fcitx5-table-extra", "fcitx5-table-other" ] + +OWNER = "fcitx" + +def get_latest_tag(repo, owner=OWNER): + r = requests.get( 'https://api.github.com/repos/{}/{}/tags'.format(owner,repo) + , auth=('poscat', 'db5e6fd16d0eb8c36385d3d944e058a1178b4265')) + return r.json()[0].get("name") + +def main(): + sources = dict() + for repo in REPOS: + rev = get_latest_tag(repo) + if repo == "fcitx5-qt": + subprocess.run(["nix-update", "--commit", "--version", rev, "libsForQt5.{}".format(repo)]) + else: + subprocess.run(["nix-update", "--commit", "--version", rev, repo]) + +if __name__ == "__main__": + main () diff --git a/pkgs/tools/inputmethods/fcitx5/with-addons.nix b/pkgs/tools/inputmethods/fcitx5/with-addons.nix index 854020effea..17501d5f362 100644 --- a/pkgs/tools/inputmethods/fcitx5/with-addons.nix +++ b/pkgs/tools/inputmethods/fcitx5/with-addons.nix @@ -12,6 +12,14 @@ symlinkJoin { --prefix FCITX_ADDON_DIRS : "$out/lib/fcitx5" \ --suffix XDG_DATA_DIRS : "$out/share" \ --suffix PATH : "$out/bin" + + desktop=share/applications/org.fcitx.Fcitx5.desktop + autostart=etc/xdg/autostart/org.fcitx.Fcitx5.desktop + rm $out/$desktop + rm $out/$autostart + cp ${fcitx5}/$desktop $out/$desktop + sed -i $out/$desktop -e "s|^Exec=.*|Exec=$out/bin/fcitx5|g" + ln -s $out/$desktop $out/$autostart ''; meta = fcitx5.meta; diff --git a/pkgs/tools/inputmethods/fusuma/gemset.nix b/pkgs/tools/inputmethods/fusuma/gemset.nix index 2dd9af421ba..87e0ae14da8 100644 --- a/pkgs/tools/inputmethods/fusuma/gemset.nix +++ b/pkgs/tools/inputmethods/fusuma/gemset.nix @@ -9,4 +9,4 @@ }; version = "1.3.0"; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/inputmethods/gebaar-libinput/default.nix b/pkgs/tools/inputmethods/gebaar-libinput/default.nix index 6d4947e517e..7506493ee7c 100644 --- a/pkgs/tools/inputmethods/gebaar-libinput/default.nix +++ b/pkgs/tools/inputmethods/gebaar-libinput/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake, libinput, zlib }: +{ stdenv, lib, fetchFromGitHub, pkg-config, cmake, libinput, zlib }: stdenv.mkDerivation rec { pname = "gebaar-libinput"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ libinput zlib ]; meta = with lib; { diff --git a/pkgs/tools/inputmethods/hime/default.nix b/pkgs/tools/inputmethods/hime/default.nix index 894e8768c28..988f8941d14 100644 --- a/pkgs/tools/inputmethods/hime/default.nix +++ b/pkgs/tools/inputmethods/hime/default.nix @@ -1,5 +1,5 @@ { -stdenv, fetchFromGitHub, pkgconfig, which, gtk2, gtk3, qt4, qt5, libXtst, lib, +stdenv, fetchFromGitHub, pkg-config, which, gtk2, gtk3, qt4, qt5, libXtst, lib, }: # chewing and anthy do not work well @@ -16,12 +16,12 @@ stdenv.mkDerivation { sha256 = "024w67q0clzxigsrvqbxpiy8firjvrqi7wbkkcapzzhzapv3nm8x"; }; - nativeBuildInputs = [ which pkgconfig ]; + nativeBuildInputs = [ which pkg-config ]; buildInputs = [ libXtst gtk2 gtk3 qt4 qt5.qtbase ]; preConfigure = "patchShebangs configure"; configureFlags = [ "--disable-lib64" "--disable-qt5-immodule" ]; - + dontWrapQtApps = true; meta = with lib; { homepage = "http://hime-ime.github.io/"; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix index ecc142ac16c..60b5d6778b4 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchurl , gettext -, pkgconfig +, pkg-config , wrapGAppsHook , anthy , ibus @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gettext gobject-introspection - pkgconfig + pkg-config wrapGAppsHook ]; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix index 61ea12ff59b..9f5f9956b0e 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , gettext , xorg -, pkgconfig +, pkg-config , wrapGAppsHook , ibus , gtk3 @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gettext - pkgconfig + pkg-config wrapGAppsHook go ]; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix index 531aeb3d664..af3e1edd639 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix @@ -3,7 +3,7 @@ , substituteAll , appstream-glib , gettext -, pkgconfig +, pkg-config , wrapGAppsHook , gtk3 , ibus @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ appstream-glib gettext - pkgconfig + pkg-config wrapGAppsHook ]; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix index cdebf64d862..00ce8df1936 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl -, vala, intltool, pkgconfig +, vala, intltool, pkg-config , libkkc, ibus, skk-dicts , gtk3 }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - vala intltool pkgconfig + vala intltool pkg-config ]; buildInputs = [ libkkc ibus skk-dicts gtk3 ]; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix index 18cd2ec4ed8..8b530921940 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , autoreconfHook , gettext -, pkgconfig +, pkg-config , wrapGAppsHook , sqlite , libpinyin @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook gettext - pkgconfig + pkg-config wrapGAppsHook ]; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix index 252fc2b286b..07ab09b8e6c 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchFromGitHub , autoreconfHook -, pkgconfig +, pkg-config , ibus , gtk3 , m17n_lib @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook gettext - pkgconfig + pkg-config wrapGAppsHook ]; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix index 8964b180989..1949f3f0da0 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, which, ninja, python, pkgconfig, protobuf +{ lib, stdenv, fetchFromGitHub, which, ninja, python, pkg-config, protobuf , ibus, gtk2, zinnia, qt5, libxcb, tegaki-zinnia-japanese, python3Packages }: let @@ -22,7 +22,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ which ninja python3Packages.python python3Packages.six - python3Packages.gyp pkgconfig qt5.wrapQtAppsHook ]; + python3Packages.gyp pkg-config qt5.wrapQtAppsHook ]; buildInputs = [ protobuf ibus gtk2 zinnia qt5.qtbase libxcb ]; src = fetchFromGitHub { @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { postUnpack = '' rm -rf $sourceRoot/src/third_party/japanese_usage_dictionary/ ln -s ${japanese_usage_dictionary} $sourceRoot/src/third_party/japanese_usage_dictionary - '' + stdenv.lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.isLinux '' sed -i 's/-lc++/-lstdc++/g' $sourceRoot/src/gyp/common.gypi ''; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix index 0c7670fd250..258ab93689b 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, ibus, ibus-table, pkgconfig, python3 }: +{ lib, stdenv, fetchurl, ibus, ibus-table, pkg-config, python3 }: stdenv.mkDerivation rec { pname = "ibus-table-others"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0763wnlklcs3d8fk21nkp7dgn4qzqgxh1s24q3kl8gzgng2a88jj"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ibus ibus-table python3 ]; preBuild = '' diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix index f923c630d17..a7a640b2c6e 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, autoreconfHook, docbook2x, pkgconfig +, autoreconfHook, docbook2x, pkg-config , gtk3, dconf, gobject-introspection , ibus, python3, wrapGAppsHook }: @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook docbook2x - pkgconfig + pkg-config gobject-introspection wrapGAppsHook ]; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix index a8336e1d795..1ce947361df 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, python3, ibus, pkgconfig, gtk3, m17n_lib +{ lib, stdenv, fetchFromGitHub, autoreconfHook, python3, ibus, pkg-config, gtk3, m17n_lib , wrapGAppsHook, gobject-introspection }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { patches = [ ./hunspell-dirs.patch ]; - nativeBuildInputs = [ autoreconfHook pkgconfig wrapGAppsHook gobject-introspection ]; + nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook gobject-introspection ]; buildInputs = [ python ibus gtk3 m17n_lib ]; preFixup = '' diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix index 38f746e3cee..f78d52f5b67 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix @@ -42,8 +42,8 @@ in stdenv.mkDerivation rec { ]; makeFlags = [ - "PREFIX=${placeholder ''out''}" - "SYSCONFDIR=${placeholder ''out''}/etc" + "PREFIX=${placeholder "out"}" + "SYSCONFDIR=${placeholder "out"}/etc" "PYTHON=${python.interpreter}" ]; diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index 32db4850391..c555c507d7b 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -1,11 +1,11 @@ -{ stdenv +{ lib, stdenv , substituteAll , fetchurl , fetchFromGitHub , autoreconfHook , gettext , makeWrapper -, pkgconfig +, pkg-config , vala , wrapGAppsHook , dbus @@ -36,7 +36,7 @@ assert withWayland -> wayland != null && libxkbcommon != null; -with stdenv.lib; +with lib; let python3Runtime = python3.withPackages (ps: with ps; [ pygobject3 ]); @@ -101,8 +101,8 @@ stdenv.mkDerivation rec { ]; makeFlags = [ - "test_execsdir=${placeholder ''installedTests''}/libexec/installed-tests/ibus" - "test_sourcesdir=${placeholder ''installedTests''}/share/installed-tests/ibus" + "test_execsdir=${placeholder "installedTests"}/libexec/installed-tests/ibus" + "test_sourcesdir=${placeholder "installedTests"}/share/installed-tests/ibus" ]; nativeBuildInputs = [ @@ -110,7 +110,7 @@ stdenv.mkDerivation rec { gtk-doc gettext makeWrapper - pkgconfig + pkg-config python3BuildEnv vala wrapGAppsHook diff --git a/pkgs/tools/inputmethods/ibus/wrapper.nix b/pkgs/tools/inputmethods/ibus/wrapper.nix index 1b14629d283..93078325a0d 100644 --- a/pkgs/tools/inputmethods/ibus/wrapper.nix +++ b/pkgs/tools/inputmethods/ibus/wrapper.nix @@ -1,9 +1,9 @@ -{ stdenv, runCommand, makeWrapper, lndir +{ lib, runCommand, makeWrapper, lndir , dconf, hicolor-icon-theme, ibus, librsvg, plugins ? [] }: let - name = "ibus-with-plugins-" + stdenv.lib.getVersion ibus; + name = "ibus-with-plugins-" + lib.getVersion ibus; env = { buildInputs = [ ibus ] ++ plugins; nativeBuildInputs = [ lndir makeWrapper ]; @@ -25,7 +25,7 @@ let wrapProgram "$out/bin/$prog" \ --set GDK_PIXBUF_MODULE_FILE ${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH:$out/lib/girepository-1.0" \ - --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules" \ --set IBUS_COMPONENT_PATH "$out/share/ibus/component/" \ --set IBUS_DATAROOTDIR "$out/share" \ --set IBUS_LIBEXECDIR "$out/libexec" \ @@ -44,7 +44,7 @@ let wrapProgram "$out/bin/$prog" \ --set GDK_PIXBUF_MODULE_FILE ${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH:$out/lib/girepository-1.0" \ - --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules" \ --set IBUS_COMPONENT_PATH "$out/share/ibus/component/" \ --set IBUS_DATAROOTDIR "$out/share" \ --set IBUS_LIBEXECDIR "$out/libexec" \ diff --git a/pkgs/tools/inputmethods/interception-tools/default.nix b/pkgs/tools/inputmethods/interception-tools/default.nix index 39a28214fe2..21636ea8d8e 100644 --- a/pkgs/tools/inputmethods/interception-tools/default.nix +++ b/pkgs/tools/inputmethods/interception-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, cmake, libyamlcpp, +{ lib, stdenv, fetchurl, pkg-config, cmake, libyamlcpp, libevdev, udev }: let @@ -12,7 +12,7 @@ in stdenv.mkDerivation { sha256 = "0lqz89wsf9r5xdgflincysxg4l8fpgg5z8zczhhrg9s5787srfzi"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libevdev udev libyamlcpp ]; prePatch = '' @@ -26,8 +26,8 @@ in stdenv.mkDerivation { meta = { description = "A minimal composable infrastructure on top of libudev and libevdev"; homepage = "https://gitlab.com/interception/linux/tools"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.vyp ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.vyp ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/inputmethods/interception-tools/dual-function-keys.nix b/pkgs/tools/inputmethods/interception-tools/dual-function-keys.nix new file mode 100644 index 00000000000..730135e4a7d --- /dev/null +++ b/pkgs/tools/inputmethods/interception-tools/dual-function-keys.nix @@ -0,0 +1,32 @@ +{ stdenv, lib, fetchFromGitLab, pkg-config, libyamlcpp, libevdev }: + +stdenv.mkDerivation rec { + pname = "dual-function-keys"; + version = "1.1.0"; + + src = fetchFromGitLab { + owner = "interception/linux/plugins"; + repo = pname; + rev = version; + sha256 = "07hksca4g7v4zsvhmhc9j725j3n63fzrkx9sb4a0wrd7rwgr25rz"; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libevdev libyamlcpp ]; + + prePatch = '' + substituteInPlace config.mk --replace \ + '/usr/include/libevdev-1.0' \ + "$(pkg-config --cflags libevdev | cut -c 3-)" + ''; + + installFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; + + meta = with lib; { + homepage = "https://gitlab.com/interception/linux/plugins/dual-function-keys"; + description = "Tap for one key, hold for another."; + license = licenses.mit; + maintainers = with maintainers; [ svend ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/inputmethods/libkkc/default.nix b/pkgs/tools/inputmethods/libkkc/default.nix index c8cb927b6ab..0252efa3cda 100644 --- a/pkgs/tools/inputmethods/libkkc/default.nix +++ b/pkgs/tools/inputmethods/libkkc/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl , vala, gobject-introspection, intltool, python2Packages, glib -, pkgconfig +, pkg-config , libgee, json-glib, marisa, libkkc-data }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ vala gobject-introspection python2Packages.python python2Packages.marisa - intltool glib pkgconfig + intltool glib pkg-config ]; buildInputs = [ marisa libkkc-data ]; diff --git a/pkgs/tools/inputmethods/m17n-db/default.nix b/pkgs/tools/inputmethods/m17n-db/default.nix index 1abd8460845..7feb14080e9 100644 --- a/pkgs/tools/inputmethods/m17n-db/default.nix +++ b/pkgs/tools/inputmethods/m17n-db/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gettext }: +{ lib, stdenv, fetchurl, gettext }: stdenv.mkDerivation rec { name = "m17n-db-1.8.0"; @@ -10,15 +10,15 @@ stdenv.mkDerivation rec { buildInputs = [ gettext ]; - configureFlags = stdenv.lib.optional (stdenv ? glibc) + configureFlags = lib.optional (stdenv ? glibc) "--with-charmaps=${stdenv.glibc.out}/share/i18n/charmaps" ; meta = { homepage = "https://www.nongnu.org/m17n/"; description = "Multilingual text processing library (database)"; - license = stdenv.lib.licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ astsmtl ]; + license = lib.licenses.lgpl21Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ astsmtl ]; }; } diff --git a/pkgs/tools/inputmethods/m17n-lib/default.nix b/pkgs/tools/inputmethods/m17n-lib/default.nix index f7bff509205..51e52ce4e95 100644 --- a/pkgs/tools/inputmethods/m17n-lib/default.nix +++ b/pkgs/tools/inputmethods/m17n-lib/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, m17n_db}: +{lib, stdenv, fetchurl, m17n_db}: stdenv.mkDerivation rec { name = "m17n-lib-1.8.0"; @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.nongnu.org/m17n/"; description = "Multilingual text processing library (runtime)"; - license = stdenv.lib.licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ astsmtl ]; + license = lib.licenses.lgpl21Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ astsmtl ]; }; } diff --git a/pkgs/tools/inputmethods/m17n-lib/otf.nix b/pkgs/tools/inputmethods/m17n-lib/otf.nix index 7703de95716..f4d276e0a61 100644 --- a/pkgs/tools/inputmethods/m17n-lib/otf.nix +++ b/pkgs/tools/inputmethods/m17n-lib/otf.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libXaw, freetype }: +{ lib, stdenv, fetchurl, libXaw, freetype }: stdenv.mkDerivation rec { name = "libotf-0.9.16"; @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.nongnu.org/m17n/"; description = "Multilingual text processing library (libotf)"; - license = stdenv.lib.licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ bendlas ]; + license = lib.licenses.lgpl21Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ bendlas ]; }; } diff --git a/pkgs/tools/inputmethods/nabi/default.nix b/pkgs/tools/inputmethods/nabi/default.nix index 167dd7b030d..5b6b0223a01 100644 --- a/pkgs/tools/inputmethods/nabi/default.nix +++ b/pkgs/tools/inputmethods/nabi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gtk2, libhangul }: +{ lib, stdenv, fetchurl, pkg-config, gtk2, libhangul }: stdenv.mkDerivation { name = "nabi-1.0.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "0craa24pw7b70sh253arv9bg9sy4q3mhsjwfss3bnv5nf0xwnncw"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 libhangul ]; meta = with lib; { diff --git a/pkgs/tools/inputmethods/skk/skk-dicts/default.nix b/pkgs/tools/inputmethods/skk/skk-dicts/default.nix index 4d2f37b865d..bc9aa73c2fc 100644 --- a/pkgs/tools/inputmethods/skk/skk-dicts/default.nix +++ b/pkgs/tools/inputmethods/skk/skk-dicts/default.nix @@ -1,37 +1,37 @@ -{ stdenv, fetchurl, libiconv, skktools }: +{ lib, stdenv, fetchurl, libiconv, skktools }: let # kana to kanji small = fetchurl { - url = "https://raw.githubusercontent.com/skk-dev/dict/f61be71246602a49e9f05ded6ac4f9f82031a521/SKK-JISYO.S"; - sha256 = "15kp4iwz58fp1zg0i13x7w9wwm15v8n2hhm0nf2zsl7az5mn5yi4"; + url = "https://raw.githubusercontent.com/skk-dev/dict/8b35d07a7d2044d48b063d2774d9f9d00bb7cb48/SKK-JISYO.S"; + sha256 = "11cjrc8m99hj4xpl2nvzxanlswpapi92vmgk9d6yimdz0jidb6cq"; }; medium = fetchurl { - url = "https://raw.githubusercontent.com/skk-dev/dict/f61be71246602a49e9f05ded6ac4f9f82031a521/SKK-JISYO.M"; - sha256 = "1vhagixhrp9lq5x7dldxcanhznawazp00xivpp1z52kx10lnkmv0"; + url = "https://raw.githubusercontent.com/skk-dev/dict/8b35d07a7d2044d48b063d2774d9f9d00bb7cb48/SKK-JISYO.M"; + sha256 = "0pwjp9qjmn9sq6zc0k6632l7dc2dbjn45585ibckvvl9iwfqqxdp"; }; large = fetchurl { - url = "https://raw.githubusercontent.com/skk-dev/dict/f61be71246602a49e9f05ded6ac4f9f82031a521/SKK-JISYO.L"; - sha256 = "07cv0j95iajkr48j4ln411vnhl3z93yx96zjc03bgs10dbpagaaz"; + url = "https://raw.githubusercontent.com/skk-dev/dict/8b35d07a7d2044d48b063d2774d9f9d00bb7cb48/SKK-JISYO.L"; + sha256 = "0ps0a7sbkryd6hxvphq14i7g5wci4gvr0vraac8ia2ww67a2xbyc"; }; # english to japanese edict = fetchurl { - url = "https://raw.githubusercontent.com/skk-dev/dict/f61be71246602a49e9f05ded6ac4f9f82031a521/SKK-JISYO.edict"; - sha256 = "18k8z1wkgwgfwbs6sylf39h1nc1p5l2b00h7mfjlb8p91plkb45w"; + url = "https://raw.githubusercontent.com/skk-dev/dict/8b35d07a7d2044d48b063d2774d9f9d00bb7cb48/SKK-JISYO.edict"; + sha256 = "1vrwnq0vvjn61nijbln6wfinqg93802d2a8d4ad82n692v83b1li"; }; # misc assoc = fetchurl { - url = "https://raw.githubusercontent.com/skk-dev/dict/f61be71246602a49e9f05ded6ac4f9f82031a521/SKK-JISYO.assoc"; - sha256 = "12d6xpp1bfin9nwl35ydl5yc6vx0qpwhxss0khi19n1nsbyqnixm"; + url = "https://raw.githubusercontent.com/skk-dev/dict/8b35d07a7d2044d48b063d2774d9f9d00bb7cb48/SKK-JISYO.assoc"; + sha256 = "1smcbyv6srrhnpl7ic9nqds9nz3g2dgqngmhzkrdlwmvcpvakp1v"; }; in stdenv.mkDerivation { pname = "skk-dicts-unstable"; - version = "2017-10-26"; + version = "2020-03-24"; srcs = [ small medium large edict assoc ]; - nativeBuildInputs = [ skktools ] ++ stdenv.lib.optional stdenv.isDarwin libiconv; + nativeBuildInputs = [ skktools ] ++ lib.optional stdenv.isDarwin libiconv; phases = [ "installPhase" ]; installPhase = '' @@ -66,8 +66,8 @@ stdenv.mkDerivation { dictionaries for the SKK Japanese input method. ''; homepage = "https://github.com/skk-dev/dict"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ yuriaisaka ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ yuriaisaka ]; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/tools/inputmethods/skk/skktools/default.nix b/pkgs/tools/inputmethods/skk/skktools/default.nix index b150521396c..130c27090a4 100644 --- a/pkgs/tools/inputmethods/skk/skktools/default.nix +++ b/pkgs/tools/inputmethods/skk/skktools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, gdbm, glib }: +{ lib, stdenv, fetchFromGitHub, pkg-config, gdbm, glib }: # Note (2017-10-24, yuriaisaka): # - Version 1.3.3 dates from Jul. 19, 2013. @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "skk-dev"; repo = "skktools"; - rev = "skktools-${stdenv.lib.replaceStrings ["."] ["_"] version}"; + rev = "skktools-${lib.replaceStrings ["."] ["_"] version}"; sha256 = "1zway8jsm18279xq8zlpr84iqiw373x3v0ysay74n9bjqxbl234a"; }; # # See "12.2. Package naming" @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { # sha256 = "1k9zxqybl1l5h0a8px2awc920qrdyp1qls50h3kfrj3g65d08aq2"; # }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gdbm glib ]; meta = { @@ -38,8 +38,8 @@ stdenv.mkDerivation rec { input method. ''; homepage = "https://github.com/skk-dev/skktools"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ yuriaisaka ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ yuriaisaka ]; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/tools/inputmethods/touchegg/default.nix b/pkgs/tools/inputmethods/touchegg/default.nix index 6bda390dc4a..d2bd7a14663 100644 --- a/pkgs/tools/inputmethods/touchegg/default.nix +++ b/pkgs/tools/inputmethods/touchegg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xorg, xorgserver, qt4, libGLU, libGL, geis, qmake4Hook }: +{ lib, stdenv, fetchurl, xorg, xorgserver, qt4, libGLU, libGL, geis, qmake4Hook }: stdenv.mkDerivation rec { pname = "touchegg"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/JoseExposito/touchegg"; description = "Macro binding for touch surfaces"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/inputmethods/triggerhappy/default.nix b/pkgs/tools/inputmethods/triggerhappy/default.nix index b89f205a064..e7ef0f8accf 100644 --- a/pkgs/tools/inputmethods/triggerhappy/default.nix +++ b/pkgs/tools/inputmethods/triggerhappy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, perl, systemd }: +{ lib, stdenv, fetchFromGitHub, pkg-config, perl, systemd }: stdenv.mkDerivation rec { pname = "triggerhappy"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0gb1qhrxwq7i5abd408d01a2dpf28nr1fph1fg7w7n0i5i1nnk90"; }; - nativeBuildInputs = [ pkgconfig perl ]; + nativeBuildInputs = [ pkg-config perl ]; buildInputs = [ systemd ]; makeFlags = [ "PREFIX=$(out)" "BINDIR=$(out)/bin" ]; diff --git a/pkgs/tools/inputmethods/uim/default.nix b/pkgs/tools/inputmethods/uim/default.nix index f7ee905b9ee..9336d5429c1 100644 --- a/pkgs/tools/inputmethods/uim/default.nix +++ b/pkgs/tools/inputmethods/uim/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, shared-mime-info -, autoconf, automake, intltool, libtool, pkgconfig, cmake +, autoconf, automake, intltool, libtool, pkg-config, cmake , ruby, librsvg , ncurses, m17n_lib, m17n_db, expat , withAnthy ? true, anthy ? null @@ -18,7 +18,7 @@ , withMisc ? false, libeb ? null }: -with stdenv.lib; +with lib; assert withGtk2 -> gtk2 != null; assert withGtk3 -> gtk3 != null; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - autoconf automake intltool libtool pkgconfig cmake + autoconf automake intltool libtool pkg-config cmake ruby # used by sigscheme build to generate function tables librsvg # used by uim build to generate png pixmaps from svg diff --git a/pkgs/tools/misc/0x0/default.nix b/pkgs/tools/misc/0x0/default.nix index 1fc081d71ab..e0f84329b89 100644 --- a/pkgs/tools/misc/0x0/default.nix +++ b/pkgs/tools/misc/0x0/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { patchShebangs $out/bin/0x0 wrapProgram $out/bin/0x0 \ - --prefix PATH : '${stdenv.lib.makeBinPath [ curl xsel ]}' + --prefix PATH : '${lib.makeBinPath [ curl xsel ]}' ''; meta = with lib; { diff --git a/pkgs/tools/misc/3llo/gemset.nix b/pkgs/tools/misc/3llo/gemset.nix index 5c50ea9b212..c6e60d4b668 100644 --- a/pkgs/tools/misc/3llo/gemset.nix +++ b/pkgs/tools/misc/3llo/gemset.nix @@ -82,4 +82,4 @@ }; version = "1.6.1"; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/misc/3mux/default.nix b/pkgs/tools/misc/3mux/default.nix index 3f1e981fd0e..3c51210edc7 100644 --- a/pkgs/tools/misc/3mux/default.nix +++ b/pkgs/tools/misc/3mux/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "3mux"; diff --git a/pkgs/tools/misc/abduco/default.nix b/pkgs/tools/misc/abduco/default.nix index a0868344d4c..dbba2193b14 100644 --- a/pkgs/tools/misc/abduco/default.nix +++ b/pkgs/tools/misc/abduco/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, writeText, conf ? null }: +{ lib, stdenv, fetchFromGitHub, writeText, conf ? null }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { name = "abduco-2018-05-16"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { configFile = optionalString (conf!=null) (writeText "config.def.h" conf); preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h"; - CFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-D_DARWIN_C_SOURCE"; + CFLAGS = lib.optionalString stdenv.isDarwin "-D_DARWIN_C_SOURCE"; meta = { homepage = "http://brain-dump.org/projects/abduco"; diff --git a/pkgs/tools/misc/adafruit-ampy/default.nix b/pkgs/tools/misc/adafruit-ampy/default.nix index f5149737639..c9466f54a62 100644 --- a/pkgs/tools/misc/adafruit-ampy/default.nix +++ b/pkgs/tools/misc/adafruit-ampy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3 }: +{ lib, python3 }: with python3.pkgs; diff --git a/pkgs/tools/misc/aescrypt/default.nix b/pkgs/tools/misc/aescrypt/default.nix index 05ee0145636..2a8b8b0b024 100644 --- a/pkgs/tools/misc/aescrypt/default.nix +++ b/pkgs/tools/misc/aescrypt/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1iziymcbpc64d44djgqfifpblsly4sr5bxsp5g29jgxz552kjlah"; }; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-liconv"; + NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-liconv"; preBuild = '' substituteInPlace src/Makefile --replace "CC=gcc" "CC?=gcc" @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { homepage = "https://www.aescrypt.com/"; license = licenses.gpl2; maintainers = with maintainers; [ lovek323 qknight ]; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; hydraPlatforms = with platforms; unix; }; } diff --git a/pkgs/tools/misc/alarm-clock-applet/default.nix b/pkgs/tools/misc/alarm-clock-applet/default.nix index 6ad9341b85e..5585b6901dc 100644 --- a/pkgs/tools/misc/alarm-clock-applet/default.nix +++ b/pkgs/tools/misc/alarm-clock-applet/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, pkgconfig +, pkg-config , autoconf , automake111x , libtool @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config intltool automake111x autoconf diff --git a/pkgs/tools/misc/antimicroX/default.nix b/pkgs/tools/misc/antimicroX/default.nix index cb5496d450c..452906a1cf8 100644 --- a/pkgs/tools/misc/antimicroX/default.nix +++ b/pkgs/tools/misc/antimicroX/default.nix @@ -2,7 +2,7 @@ , lib , cmake , extra-cmake-modules -, pkgconfig +, pkg-config , SDL2 , qtbase , qttools @@ -23,7 +23,7 @@ mkDerivation rec { sha256 = "05asxlkgb4cgvpcyksw1cx8cz8nzi8hmw8b91lw92892j7a2r7wj"; }; - nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig itstool ]; + nativeBuildInputs = [ cmake extra-cmake-modules pkg-config itstool ]; buildInputs = [ SDL2 qtbase diff --git a/pkgs/tools/misc/apt-offline/default.nix b/pkgs/tools/misc/apt-offline/default.nix index 5c17b7f2d13..9c952cc7c30 100644 --- a/pkgs/tools/misc/apt-offline/default.nix +++ b/pkgs/tools/misc/apt-offline/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { version = "1.8.1"; diff --git a/pkgs/tools/misc/aptly/default.nix b/pkgs/tools/misc/aptly/default.nix index 2ee81460b28..7f82aebabe4 100644 --- a/pkgs/tools/misc/aptly/default.nix +++ b/pkgs/tools/misc/aptly/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, installShellFiles, makeWrapper, gnupg, bzip2, xz, graphviz }: +{ lib, buildGoPackage, fetchFromGitHub, installShellFiles, makeWrapper, gnupg, bzip2, xz, graphviz }: let @@ -34,7 +34,7 @@ buildGoPackage { postInstall = '' installShellCompletion --bash ${aptlyCompletionSrc}/aptly wrapProgram "$out/bin/aptly" \ - --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg bzip2 xz graphviz ]}" + --prefix PATH ":" "${lib.makeBinPath [ gnupg bzip2 xz graphviz ]}" ''; meta = with lib; { diff --git a/pkgs/tools/misc/archi/default.nix b/pkgs/tools/misc/archi/default.nix index 554700dad93..d0beb7d40d7 100644 --- a/pkgs/tools/misc/archi/default.nix +++ b/pkgs/tools/misc/archi/default.nix @@ -2,6 +2,8 @@ , fetchurl , fetchzip , autoPatchelfHook +, makeWrapper +, jdk , libsecret }: @@ -29,17 +31,20 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook + makeWrapper ]; installPhase = if stdenv.hostPlatform.system == "x86_64-linux" then '' - mkdir -p $out/bin - for f in configuration features p2 plugins Archi.ini Archi; do - cp $f $out/bin/ + mkdir -p $out/bin $out/libexec + for f in configuration features p2 plugins Archi.ini; do + cp -r $f $out/libexec done - install -D -m755 Archi $out/bin/Archi + install -D -m755 Archi $out/libexec/Archi + makeWrapper $out/libexec/Archi $out/bin/Archi \ + --prefix PATH : ${jdk}/bin '' else '' diff --git a/pkgs/tools/misc/arp-scan/default.nix b/pkgs/tools/misc/arp-scan/default.nix index f4786a57bd7..e25543b5145 100644 --- a/pkgs/tools/misc/arp-scan/default.nix +++ b/pkgs/tools/misc/arp-scan/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://www.nta-monitor.com/wiki/index.php/Arp-scan_Documentation"; license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ bjornfor mikoim ]; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ bjornfor mikoim r-burns ]; }; } diff --git a/pkgs/tools/misc/asciinema-scenario/default.nix b/pkgs/tools/misc/asciinema-scenario/default.nix index 25bac976843..f6991662114 100644 --- a/pkgs/tools/misc/asciinema-scenario/default.nix +++ b/pkgs/tools/misc/asciinema-scenario/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , rustPlatform , fetchCrate }: diff --git a/pkgs/tools/misc/autorevision/default.nix b/pkgs/tools/misc/autorevision/default.nix index 61bd5b5fc65..ab7add1261a 100644 --- a/pkgs/tools/misc/autorevision/default.nix +++ b/pkgs/tools/misc/autorevision/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "autorevision"; - version = "1.21"; + version = "1.22"; src = fetchurl { url = "https://github.com/Autorevision/autorevision/releases/download/v%2F${version}/autorevision-${version}.tgz"; - sha256 = "07ssirjy2mgbqxr792n3rqa408hm7qnhwfjzd73rqfwvjcahy1q8"; + sha256 = "sha256-3ktLVC73m2xddq5BhxVKw/FJd6pZ5RVb7fv29dxUoRE="; }; buildInputs = [ diff --git a/pkgs/tools/misc/aws-mturk-clt/default.nix b/pkgs/tools/misc/aws-mturk-clt/default.nix index c5f4b0f5670..7e60d498842 100644 --- a/pkgs/tools/misc/aws-mturk-clt/default.nix +++ b/pkgs/tools/misc/aws-mturk-clt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre }: +{ lib, stdenv, fetchurl, jre }: stdenv.mkDerivation rec { name = "aws-mturk-clt-1.3.0"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://requester.mturk.com/developer"; description = "Command line tools for interacting with the Amazon Mechanical Turk"; - license = stdenv.lib.licenses.amazonsl; + license = lib.licenses.amazonsl; longDescription = '' diff --git a/pkgs/tools/misc/azure-vhd-utils/default.nix b/pkgs/tools/misc/azure-vhd-utils/default.nix index cb38f2705b1..ad48eae7a87 100644 --- a/pkgs/tools/misc/azure-vhd-utils/default.nix +++ b/pkgs/tools/misc/azure-vhd-utils/default.nix @@ -1,9 +1,9 @@ # This file was generated by go2nix. -{ lib, stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "azure-vhd-utils"; - version = "20160614-${stdenv.lib.strings.substring 0 7 rev}"; + version = "20160614-${lib.strings.substring 0 7 rev}"; rev = "070db2d701a462ca2edcf89d677ed3cac309d8e8"; goPackagePath = "github.com/Microsoft/azure-vhd-utils"; diff --git a/pkgs/tools/misc/bashplotlib/default.nix b/pkgs/tools/misc/bashplotlib/default.nix index cc3476f598b..44d7e93355b 100644 --- a/pkgs/tools/misc/bashplotlib/default.nix +++ b/pkgs/tools/misc/bashplotlib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub }: python3Packages.buildPythonApplication { pname = "bashplotlib"; diff --git a/pkgs/tools/misc/bat-extras/default.nix b/pkgs/tools/misc/bat-extras/default.nix index a2ec5afd965..7d3f1dc0a36 100644 --- a/pkgs/tools/misc/bat-extras/default.nix +++ b/pkgs/tools/misc/bat-extras/default.nix @@ -13,7 +13,7 @@ , withEntr ? entr != null, entr ? null # batdiff , gitMinimal -, withDelta ? gitAndTools?delta, gitAndTools ? null +, withDelta ? delta != null, delta ? null }: let @@ -116,9 +116,9 @@ let runHook preInstall mkdir -p $out/bin cp -p bin/${name} $out/bin/${name} - '' + stdenv.lib.optionalString (dependencies != []) '' + '' + lib.optionalString (dependencies != []) '' wrapProgram $out/bin/${name} \ - --prefix PATH : ${stdenv.lib.makeBinPath dependencies} + --prefix PATH : ${lib.makeBinPath dependencies} '' + '' runHook postInstall ''; @@ -130,10 +130,10 @@ let }; optionalDep = cond: dep: assert cond -> dep != null; - stdenv.lib.optional cond dep; + lib.optional cond dep; in { - batdiff = script "batdiff" ([ less coreutils gitMinimal ] ++ optionalDep withDelta gitAndTools.delta); + batdiff = script "batdiff" ([ less coreutils gitMinimal ] ++ optionalDep withDelta delta); batgrep = script "batgrep" [ less coreutils ripgrep ]; batman = script "batman" []; batwatch = script "batwatch" ([ less coreutils ] ++ optionalDep withEntr entr); diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix index ac043ca7fea..d6e1e9e5d77 100644 --- a/pkgs/tools/misc/bat/default.nix +++ b/pkgs/tools/misc/bat/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config installShellFiles makeWrapper ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security libiconv ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ]; postInstall = '' installManPage $releaseDir/build/bat-*/out/assets/manual/bat.1 @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { # expected with certain flag combinations. postFixup = '' wrapProgram "$out/bin/bat" \ - --prefix PATH : "${stdenv.lib.makeBinPath [ less ]}" + --prefix PATH : "${lib.makeBinPath [ less ]}" ''; passthru.tests = { inherit (nixosTests) bat; }; diff --git a/pkgs/tools/misc/bc/default.nix b/pkgs/tools/misc/bc/default.nix index d065732a299..96c2d00ffa8 100644 --- a/pkgs/tools/misc/bc/default.nix +++ b/pkgs/tools/misc/bc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoreconfHook, buildPackages +{ lib, stdenv, autoreconfHook, buildPackages , fetchurl, flex, readline, ed, texinfo }: @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "GNU software calculator"; homepage = "https://www.gnu.org/software/bc/"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl3; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/misc/bfr/default.nix b/pkgs/tools/misc/bfr/default.nix index 2b84412f3b2..80ec398ef8c 100644 --- a/pkgs/tools/misc/bfr/default.nix +++ b/pkgs/tools/misc/bfr/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A general-purpose command-line pipe buffer"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; maintainers = with maintainers; [ pSub ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/misc/birdfont/default.nix b/pkgs/tools/misc/birdfont/default.nix index cdce76a324c..609899bbe30 100644 --- a/pkgs/tools/misc/birdfont/default.nix +++ b/pkgs/tools/misc/birdfont/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, python3, xmlbird, +{ lib, stdenv, fetchurl, pkg-config, python3, xmlbird, cairo, gdk-pixbuf, libgee, glib, gtk3, webkitgtk, libnotify, sqlite, vala_0_44, gobject-introspection, gsettings-desktop-schemas, wrapGAppsHook }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0620bppcbm9pb8l0d4sc56gfwkr97gw4zjirjz5ikk5lj0m801yi"; }; - nativeBuildInputs = [ python3 pkgconfig vala_0_44 gobject-introspection wrapGAppsHook ]; + nativeBuildInputs = [ python3 pkg-config vala_0_44 gobject-introspection wrapGAppsHook ]; buildInputs = [ xmlbird libgee cairo gdk-pixbuf glib gtk3 webkitgtk libnotify sqlite gsettings-desktop-schemas ]; postPatch = '' diff --git a/pkgs/tools/misc/birdfont/xmlbird.nix b/pkgs/tools/misc/birdfont/xmlbird.nix index 3f103024d89..cacebb93995 100644 --- a/pkgs/tools/misc/birdfont/xmlbird.nix +++ b/pkgs/tools/misc/birdfont/xmlbird.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python3, pkgconfig, vala, glib, gobject-introspection }: +{ lib, stdenv, fetchurl, python3, pkg-config, vala, glib, gobject-introspection }: stdenv.mkDerivation rec { pname = "xmlbird"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "15z4rvii3p54g2hasibjnf83c1702d84367fnl8pbisjqqrdcl04"; }; - nativeBuildInputs = [ python3 pkgconfig vala gobject-introspection ]; + nativeBuildInputs = [ python3 pkg-config vala gobject-introspection ]; buildInputs = [ glib ]; diff --git a/pkgs/tools/misc/blink1-tool/default.nix b/pkgs/tools/misc/blink1-tool/default.nix index 5bf38f1b0e7..23096bb2eaf 100644 --- a/pkgs/tools/misc/blink1-tool/default.nix +++ b/pkgs/tools/misc/blink1-tool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libusb1, pkgconfig, ... }: +{ lib, stdenv, fetchurl, libusb1, pkg-config, ... }: stdenv.mkDerivation rec { pname = "blink1"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1waci6hccv5i50v5d3z7lx4h224fbkj66ywfynnsgn46w0jm6imv"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 ]; configurePhase = '' @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { meta = { description = "Command line client for the blink(1) notification light"; homepage = "https://blink1.thingm.com/"; - license = stdenv.lib.licenses.cc-by-sa-30; - maintainers = [ stdenv.lib.maintainers.cransom ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.cc-by-sa-30; + maintainers = [ lib.maintainers.cransom ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/bmap-tools/default.nix b/pkgs/tools/misc/bmap-tools/default.nix index ed42f31f26b..79094dc9540 100644 --- a/pkgs/tools/misc/bmap-tools/default.nix +++ b/pkgs/tools/misc/bmap-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python2Packages }: +{ lib, fetchFromGitHub, python2Packages }: python2Packages.buildPythonApplication rec { pname = "bmap-tools"; diff --git a/pkgs/tools/misc/bmon/default.nix b/pkgs/tools/misc/bmon/default.nix index af7e3a3d642..ca5f99f3b62 100644 --- a/pkgs/tools/misc/bmon/default.nix +++ b/pkgs/tools/misc/bmon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, ncurses, libconfuse +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, ncurses, libconfuse , libnl }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1ilba872c09mnlvylslv4hqv6c9cz36l76q74rr99jvis1dg69gf"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ ncurses libconfuse libnl ]; diff --git a/pkgs/tools/misc/bogofilter/default.nix b/pkgs/tools/misc/bogofilter/default.nix index 1924968f2d3..30a17bf188a 100644 --- a/pkgs/tools/misc/bogofilter/default.nix +++ b/pkgs/tools/misc/bogofilter/default.nix @@ -1,4 +1,4 @@ -{fetchurl, stdenv, flex, db}: +{fetchurl, lib, stdenv, flex, db}: stdenv.mkDerivation rec { name = "bogofilter-1.2.4"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { classifications and corrections. It is based on a Bayesian filter. ''; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/bonfire/default.nix b/pkgs/tools/misc/bonfire/default.nix index cda58e80d87..a3f1608c3ad 100644 --- a/pkgs/tools/misc/bonfire/default.nix +++ b/pkgs/tools/misc/bonfire/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub }: with python3Packages; diff --git a/pkgs/tools/misc/brltty/default.nix b/pkgs/tools/misc/brltty/default.nix index 1320f28ede2..b71740c325a 100644 --- a/pkgs/tools/misc/brltty/default.nix +++ b/pkgs/tools/misc/brltty/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, python3, bluez +{ lib, stdenv, fetchurl, pkg-config, python3, bluez , alsaSupport ? stdenv.isLinux, alsaLib ? null , systemdSupport ? stdenv.isLinux, systemd ? null }: @@ -13,10 +13,10 @@ stdenv.mkDerivation rec { sha256 = "0nk54chr7z2w579vyiak9xk2avhnvrx7x2l5sk8nyw2zplchkx9q"; }; - nativeBuildInputs = [ pkgconfig python3.pkgs.cython ]; + nativeBuildInputs = [ pkg-config python3.pkgs.cython ]; buildInputs = [ bluez ] - ++ stdenv.lib.optional alsaSupport alsaLib - ++ stdenv.lib.optional systemdSupport systemd; + ++ lib.optional alsaSupport alsaLib + ++ lib.optional systemdSupport systemd; meta = { description = "Access software for a blind person using a braille display"; @@ -27,9 +27,9 @@ stdenv.mkDerivation rec { Some speech capability has also been incorporated. ''; homepage = "http://www.brltty.com/"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.bramd ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.bramd ]; + platforms = lib.platforms.all; }; makeFlags = [ "PYTHON_PREFIX=$(out)" ]; diff --git a/pkgs/tools/misc/broadlink-cli/default.nix b/pkgs/tools/misc/broadlink-cli/default.nix index 53925b87591..cb5f582d2de 100644 --- a/pkgs/tools/misc/broadlink-cli/default.nix +++ b/pkgs/tools/misc/broadlink-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub }: python3Packages.buildPythonApplication { pname = "broadlink-cli"; diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index afda7dd7abc..a3299b42744 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -11,21 +11,21 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.1.10"; + version = "1.2.0"; src = fetchCrate { inherit pname version; - sha256 = "04nidx43w4nnccgbrw30wg9ai8p7hbklxpn1gc6gr2325yhqvwhl"; + sha256 = "1mqaynrqaas82f5957lx31x80v74zwmwmjxxlbywajb61vh00d38"; }; - cargoHash = "sha256-4F9HIQ1BQx4EikyH0DwlDAkYIeUJJbMsj7ZX23QD+K8="; + cargoHash = "sha256-ffFS1myFjoQ6768D4zUytN6F9paWeJJFPFugCrfh4iU="; nativeBuildInputs = [ makeWrapper installShellFiles ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security zlib diff --git a/pkgs/tools/misc/byobu/default.nix b/pkgs/tools/misc/byobu/default.nix index 2008cf7b207..c647d3b3902 100644 --- a/pkgs/tools/misc/byobu/default.nix +++ b/pkgs/tools/misc/byobu/default.nix @@ -3,7 +3,6 @@ , gettext, vim, bc, screen }: let - inherit (stdenv) lib; pythonEnv = python3.withPackages (ps: with ps; [ snack ]); in stdenv.mkDerivation rec { diff --git a/pkgs/tools/misc/capture/default.nix b/pkgs/tools/misc/capture/default.nix index f6762af11aa..d0e6c167349 100644 --- a/pkgs/tools/misc/capture/default.nix +++ b/pkgs/tools/misc/capture/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { patchShebangs $out/bin/capture wrapProgram $out/bin/capture \ - --prefix PATH : '${stdenv.lib.makeBinPath [ slop ffmpeg_3 ]}' + --prefix PATH : '${lib.makeBinPath [ slop ffmpeg_3 ]}' ''; meta = with lib; { diff --git a/pkgs/tools/misc/catimg/default.nix b/pkgs/tools/misc/catimg/default.nix index 30845759a28..3f94a559e61 100644 --- a/pkgs/tools/misc/catimg/default.nix +++ b/pkgs/tools/misc/catimg/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, cmake } : +{ lib, stdenv, fetchFromGitHub, cmake } : -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "catimg"; diff --git a/pkgs/tools/misc/ccze/default.nix b/pkgs/tools/misc/ccze/default.nix index 140e09c010a..af37d7a33c1 100644 --- a/pkgs/tools/misc/ccze/default.nix +++ b/pkgs/tools/misc/ccze/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ autoconf ncurses pcre ]; - preConfigure = '' autoheader && autoconf ''; + preConfigure = "autoheader && autoconf "; meta = with lib; { description = "Fast, modular log colorizer"; diff --git a/pkgs/tools/misc/chafa/default.nix b/pkgs/tools/misc/chafa/default.nix index 8097744692b..f196bb5af03 100644 --- a/pkgs/tools/misc/chafa/default.nix +++ b/pkgs/tools/misc/chafa/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, which, libxslt, libxml2, docbook_xml_dtd_412, docbook_xsl, glib, imagemagick, darwin }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, which, libxslt, libxml2, docbook_xml_dtd_412, docbook_xsl, glib, imagemagick, darwin }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake libtool - pkgconfig + pkg-config which libxslt libxml2 @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { docbook_xsl ]; - buildInputs = [ glib imagemagick ] ++ stdenv.lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.ApplicationServices ]; + buildInputs = [ glib imagemagick ] ++ lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.ApplicationServices ]; patches = [ ./xmlcatalog_patch.patch ]; diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index 6fab09aaeaf..48d8b7c8930 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "chezmoi"; - version = "1.8.9"; + version = "1.8.10"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "07jsakihci98ww1hgppilq942raz05c5xi2pzq632vq5i11fi0nj"; + sha256 = "sha256-S1bnzuOZGQLdVJUH+A29KxF84dj2OeLJ4XajfTDdjUY="; }; - vendorSha256 = "0adva7crl6dachbf76920aniki3zcq9chdjjrzssasm89zqgwicf"; + vendorSha256 = "sha256-X1h0EcUf8MWt929huNjt0WnhFqhVZu07JGi7c5hdXoY="; doCheck = false; diff --git a/pkgs/tools/misc/cht.sh/default.nix b/pkgs/tools/misc/cht.sh/default.nix index 12730d26223..3f2218ac871 100644 --- a/pkgs/tools/misc/cht.sh/default.nix +++ b/pkgs/tools/misc/cht.sh/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { cp share/zsh.txt $out/share/zsh/site-functions/_cht wrapProgram "$out/bin/cht.sh" \ - --prefix PATH : "${stdenv.lib.makeBinPath [ curl rlwrap ncurses xsel ]}" + --prefix PATH : "${lib.makeBinPath [ curl rlwrap ncurses xsel ]}" ''; passthru.updateScript = unstableGitUpdater { }; diff --git a/pkgs/tools/misc/ckb-next/default.nix b/pkgs/tools/misc/ckb-next/default.nix index fefb797dbd0..9c6909d445d 100644 --- a/pkgs/tools/misc/ckb-next/default.nix +++ b/pkgs/tools/misc/ckb-next/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, substituteAll, udev -, pkgconfig, qtbase, cmake, zlib, kmod }: +{ lib, mkDerivation, fetchFromGitHub, substituteAll, udev +, pkg-config, qtbase, cmake, zlib, kmod }: mkDerivation rec { version = "0.4.2"; @@ -19,7 +19,7 @@ mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config cmake ]; diff --git a/pkgs/tools/misc/claws/default.nix b/pkgs/tools/misc/claws/default.nix index 20c8cc7af8f..c28272e8bfa 100644 --- a/pkgs/tools/misc/claws/default.nix +++ b/pkgs/tools/misc/claws/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "claws"; diff --git a/pkgs/tools/misc/cloc/default.nix b/pkgs/tools/misc/cloc/default.nix index 2b9cbfe1030..f518c1b8e3f 100644 --- a/pkgs/tools/misc/cloc/default.nix +++ b/pkgs/tools/misc/cloc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, perlPackages }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, perlPackages }: stdenv.mkDerivation rec { pname = "cloc"; @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { meta = { description = "A program that counts lines of source code"; homepage = "https://github.com/AlDanial/cloc"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ rycee ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ rycee ]; }; } diff --git a/pkgs/tools/misc/cloud-sql-proxy/default.nix b/pkgs/tools/misc/cloud-sql-proxy/default.nix index 11bfdc508eb..552ea140d60 100644 --- a/pkgs/tools/misc/cloud-sql-proxy/default.nix +++ b/pkgs/tools/misc/cloud-sql-proxy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "cloud-sql-proxy"; diff --git a/pkgs/tools/misc/cloud-utils/default.nix b/pkgs/tools/misc/cloud-utils/default.nix index 290bb92faa1..b10259f24fc 100644 --- a/pkgs/tools/misc/cloud-utils/default.nix +++ b/pkgs/tools/misc/cloud-utils/default.nix @@ -37,11 +37,11 @@ in stdenv.mkDerivation rec { moveToOutput bin/vcs-run $guest for i in $out/bin/*; do - wrapProgram $i --prefix PATH : "${stdenv.lib.makeBinPath binDeps}:$out/bin" + wrapProgram $i --prefix PATH : "${lib.makeBinPath binDeps}:$out/bin" done for i in $guest/bin/*; do - wrapProgram $i --prefix PATH : "${stdenv.lib.makeBinPath guestDeps}:$guest/bin" + wrapProgram $i --prefix PATH : "${lib.makeBinPath guestDeps}:$guest/bin" ln -s $i $out/bin done ''; diff --git a/pkgs/tools/misc/code-minimap/default.nix b/pkgs/tools/misc/code-minimap/default.nix index 0ccfe424645..4808fe3ef56 100644 --- a/pkgs/tools/misc/code-minimap/default.nix +++ b/pkgs/tools/misc/code-minimap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , rustPlatform , fetchFromGitHub }: diff --git a/pkgs/tools/misc/codebraid/default.nix b/pkgs/tools/misc/codebraid/default.nix index a855dac5f12..0ecde80c238 100644 --- a/pkgs/tools/misc/codebraid/default.nix +++ b/pkgs/tools/misc/codebraid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub }: python3Packages.buildPythonApplication rec { pname = "codebraid"; diff --git a/pkgs/tools/misc/colord-gtk/default.nix b/pkgs/tools/misc/colord-gtk/default.nix index 403b3df0753..d77204836b2 100644 --- a/pkgs/tools/misc/colord-gtk/default.nix +++ b/pkgs/tools/misc/colord-gtk/default.nix @@ -12,7 +12,7 @@ , libxslt , glib , gtk3 -, pkgconfig +, pkg-config , lcms2 }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config gettext meson ninja diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix index 8a8d110f4e9..89435332c9c 100644 --- a/pkgs/tools/misc/colord/default.nix +++ b/pkgs/tools/misc/colord/default.nix @@ -4,7 +4,7 @@ , bash-completion , glib , polkit -, pkgconfig +, pkg-config , gettext , gusb , lcms2 @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { libxslt meson ninja - pkgconfig + pkg-config shared-mime-info vala wrapGAppsHook diff --git a/pkgs/tools/misc/contacts/default.nix b/pkgs/tools/misc/contacts/default.nix index 40b8289e68b..7b652f36a19 100644 --- a/pkgs/tools/misc/contacts/default.nix +++ b/pkgs/tools/misc/contacts/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { homepage = "http://www.gnufoo.org/contacts/contacts.html"; license = licenses.gpl2; maintainers = with maintainers; [ jwiegley ]; - platforms = stdenv.lib.platforms.darwin; - hydraPlatforms = stdenv.lib.platforms.darwin; + platforms = lib.platforms.darwin; + hydraPlatforms = lib.platforms.darwin; }; } diff --git a/pkgs/tools/misc/coreboot-utils/default.nix b/pkgs/tools/misc/coreboot-utils/default.nix index 84a5d3b3255..c05d50cdbc1 100644 --- a/pkgs/tools/misc/coreboot-utils/default.nix +++ b/pkgs/tools/misc/coreboot-utils/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, zlib, pciutils, coreutils, acpica-tools, iasl, makeWrapper, gnugrep, gnused, file, buildEnv }: +{ lib, stdenv, fetchurl, zlib, pciutils, coreutils, acpica-tools, iasl, makeWrapper, gnugrep, gnused, file, buildEnv }: let version = "4.13"; - commonMeta = with stdenv.lib; { + commonMeta = with lib; { description = "Various coreboot-related tools"; homepage = "https://www.coreboot.org"; license = licenses.gpl2; @@ -91,14 +91,14 @@ let 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 "wrapProgram $out/bin/acpidump-all --set PATH ${lib.makeBinPath binPath}"; }; }; in utils // { coreboot-utils = (buildEnv { name = "coreboot-utils-${version}"; - paths = stdenv.lib.attrValues utils; + paths = lib.attrValues utils; postBuild = "rm -rf $out/sbin"; }) // { inherit version; diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 1a0c9b2e10c..131ce2774d1 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -29,9 +29,8 @@ stdenv.mkDerivation (rec { sha256 = "sha256-RFjY3nhJ30TMqxXhaxVIsoUiTbul8I+sBwwcDgvMTPo="; }; - patches = optional stdenv.hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch - # included on coreutils master; TODO: apply unconditionally, I guess - ++ optional stdenv.hostPlatform.isAarch64 ./sys-getdents-undeclared.patch + patches = [ ./sys-getdents-undeclared.patch ] + ++ optional stdenv.hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch # fix gnulib tests on 32-bit ARM. Included on coreutils master. # https://lists.gnu.org/r/bug-gnulib/2020-08/msg00225.html ++ optional stdenv.hostPlatform.isAarch32 ./fix-gnulib-tests-arm.patch; @@ -154,6 +153,6 @@ stdenv.mkDerivation (rec { } // optionalAttrs stdenv.hostPlatform.isMusl { # Work around a bogus warning in conjunction with musl. NIX_CFLAGS_COMPILE = "-Wno-error"; -} // stdenv.lib.optionalAttrs stdenv.hostPlatform.isAndroid { +} // lib.optionalAttrs stdenv.hostPlatform.isAndroid { NIX_CFLAGS_COMPILE = "-D__USE_FORTIFY_LEVEL=0"; }) diff --git a/pkgs/tools/misc/cpuminer-multi/default.nix b/pkgs/tools/misc/cpuminer-multi/default.nix index d99662d8ff3..a23675fe911 100644 --- a/pkgs/tools/misc/cpuminer-multi/default.nix +++ b/pkgs/tools/misc/cpuminer-multi/default.nix @@ -6,7 +6,7 @@ let date = "20160316"; in stdenv.mkDerivation { - name = "cpuminer-multi-${date}-${stdenv.lib.strings.substring 0 7 rev}"; + name = "cpuminer-multi-${date}-${lib.strings.substring 0 7 rev}"; src = fetchFromGitHub { owner = "hyc"; diff --git a/pkgs/tools/misc/crudini/default.nix b/pkgs/tools/misc/crudini/default.nix index a4b499a6323..6527a01e43b 100644 --- a/pkgs/tools/misc/crudini/default.nix +++ b/pkgs/tools/misc/crudini/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, help2man, installShellFiles }: +{ lib, fetchFromGitHub, python3Packages, help2man, installShellFiles }: python3Packages.buildPythonApplication rec { pname = "crudini"; diff --git a/pkgs/tools/misc/cunit/default.nix b/pkgs/tools/misc/cunit/default.nix index 305084b900d..0322f3b708f 100644 --- a/pkgs/tools/misc/cunit/default.nix +++ b/pkgs/tools/misc/cunit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, autoreconfHook}: +{ lib, stdenv, fetchurl, autoconf, automake, libtool, autoreconfHook}: stdenv.mkDerivation rec { pname = "CUnit"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { homepage = "http://cunit.sourceforge.net/"; - license = stdenv.lib.licenses.lgpl2; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.lgpl2; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/dashing/default.nix b/pkgs/tools/misc/dashing/default.nix index 546daef5ecb..496639ec07a 100644 --- a/pkgs/tools/misc/dashing/default.nix +++ b/pkgs/tools/misc/dashing/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "dashing"; diff --git a/pkgs/tools/misc/dasht/default.nix b/pkgs/tools/misc/dasht/default.nix index 7c2ff354836..4ab9cfdd0e0 100644 --- a/pkgs/tools/misc/dasht/default.nix +++ b/pkgs/tools/misc/dasht/default.nix @@ -58,8 +58,8 @@ stdenv.mkDerivation rec { meta = { description = "Search API docs offline, in terminal or browser"; homepage = "https://sunaku.github.io/dasht/man"; - license = stdenv.lib.licenses.isc; - platforms = stdenv.lib.platforms.unix; #cannot test other - maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; + license = lib.licenses.isc; + platforms = lib.platforms.unix; #cannot test other + maintainers = with lib.maintainers; [ matthiasbeyer ]; }; } diff --git a/pkgs/tools/misc/dbacl/default.nix b/pkgs/tools/misc/dbacl/default.nix index a6bc0111ad4..d8510975915 100644 --- a/pkgs/tools/misc/dbacl/default.nix +++ b/pkgs/tools/misc/dbacl/default.nix @@ -1,4 +1,4 @@ -{fetchurl, stdenv}: +{fetchurl, lib, stdenv}: stdenv.mkDerivation rec { name = "dbacl-1.14"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { homepage = "http://dbacl.sourceforge.net/"; longDescription = "a digramic Bayesian classifier for text recognition."; maintainers = []; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl3; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/dbus-map/default.nix b/pkgs/tools/misc/dbus-map/default.nix index c311de3a779..5960ba5c573 100644 --- a/pkgs/tools/misc/dbus-map/default.nix +++ b/pkgs/tools/misc/dbus-map/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, glib, procps, libxml2 }: +{ stdenv, lib, fetchFromGitHub, pkg-config, glib, procps, libxml2 }: stdenv.mkDerivation { pname = "dbus-map"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { rev = "43703fc5e15743309b67131b5ba457b0d6ea7667"; sha256 = "1pjqn6w29ci8hfxkn1aynzfc8nvy3pqv3hixbxwr7qx20g4rwvdc"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib procps libxml2 ]; diff --git a/pkgs/tools/misc/ddate/default.nix b/pkgs/tools/misc/ddate/default.nix index 024572eaa7a..4de50693b74 100644 --- a/pkgs/tools/misc/ddate/default.nix +++ b/pkgs/tools/misc/ddate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "ddate"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/bo0ts/ddate"; description = "Discordian version of the date program"; license = licenses.publicDomain; diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix index c57f0570d1e..604ba0cbf75 100644 --- a/pkgs/tools/misc/ddccontrol/default.nix +++ b/pkgs/tools/misc/ddccontrol/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, intltool, libxml2 -, pciutils, pkgconfig, gtk2, ddccontrol-db +, pciutils, pkg-config, gtk2, ddccontrol-db , makeDesktopItem }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "09npy6z2j3jrvpvlr46vih31y2mbrh7wsqlbrjprxjv1j0kkz5q2"; }; - nativeBuildInputs = [ autoreconfHook intltool pkgconfig ]; + nativeBuildInputs = [ autoreconfHook intltool pkg-config ]; buildInputs = [ libxml2 @@ -60,6 +60,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/ddccontrol/ddccontrol"; license = licenses.gpl2; platforms = [ "i686-linux" "x86_64-linux" ]; - maintainers = [ stdenv.lib.maintainers.pakhfn ]; + maintainers = [ lib.maintainers.pakhfn ]; }; } diff --git a/pkgs/tools/misc/ddcutil/default.nix b/pkgs/tools/misc/ddcutil/default.nix index 4a3e8aa9e34..4f519d6858d 100644 --- a/pkgs/tools/misc/ddcutil/default.nix +++ b/pkgs/tools/misc/ddcutil/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config , glib, i2c-tools, udev, libgudev, libusb1, libdrm, xorg }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1ppiddnrvkbb9iir28kl9hzpww0hpgb05jfxzf07xsqkdfb4qv71"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ i2c-tools udev libgudev glib libusb1 libdrm xorg.libXrandr diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix index 9b97886682f..8de7cc99336 100644 --- a/pkgs/tools/misc/debian-devscripts/default.nix +++ b/pkgs/tools/misc/debian-devscripts/default.nix @@ -58,7 +58,7 @@ in stdenv.mkDerivation rec { ''; meta = with lib; { - description = ''Debian package maintenance scripts''; + description = "Debian package maintenance scripts"; license = licenses.free; # Mix of public domain, Artistic+GPL, GPL1+, GPL2+, GPL3+, and GPL2-only... TODO maintainers = with maintainers; [raskin]; platforms = with platforms; linux; diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index f0e6a8ec405..ea60887ebfa 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -2,7 +2,7 @@ , gnugrep, gnutar, gnused, gzip, makeWrapper }: # USAGE like this: debootstrap sid /tmp/target-chroot-directory # There is also cdebootstrap now. Is that easier to maintain? -let binPath = stdenv.lib.makeBinPath [ +let binPath = lib.makeBinPath [ coreutils dpkg gawk diff --git a/pkgs/tools/misc/desktop-file-utils/default.nix b/pkgs/tools/misc/desktop-file-utils/default.nix index 045e199e3ae..09c0e0d25c6 100644 --- a/pkgs/tools/misc/desktop-file-utils/default.nix +++ b/pkgs/tools/misc/desktop-file-utils/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, glib, libintl }: +{ lib, stdenv, fetchurl, pkg-config, glib, libintl }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "desktop-file-utils"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1nc3bwjdrpcrkbdmzvhckq0yngbcxspwj2n1r7jr3gmx1jk5vpm1"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib libintl ]; setupHook = ./setup-hook.sh; diff --git a/pkgs/tools/misc/dijo/default.nix b/pkgs/tools/misc/dijo/default.nix index 2a3fa242699..b8dc950773b 100644 --- a/pkgs/tools/misc/dijo/default.nix +++ b/pkgs/tools/misc/dijo/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, rustPlatform, fetchFromGitHub, ncurses, CoreServices }: -let version = "0.2.3"; in +let version = "0.2.5"; in rustPlatform.buildRustPackage { pname = "dijo"; inherit version; @@ -8,9 +8,9 @@ rustPlatform.buildRustPackage { owner = "NerdyPepper"; repo = "dijo"; rev = "v${version}"; - sha256 = "1lcvj0pri5v64zygkf2p24vr72y39agrq1r3kb8dfgz8yy3vcz0a"; + sha256 = "sha256-DdK9qdF+rFtAhemPwMpiZrtUdgD0iFqjgiZ3Yp/vLAI="; }; - cargoSha256 = "0pm048xf8hkva8q8fjmhrdnk7h2im28ix7xy784xwkkdnilm4j7f"; + cargoSha256 = "sha256-bdSXyxiHwGtdyce2YyPKq+3RfZIL425RvwRfKi59RVI="; meta = with lib; { description = "Scriptable, curses-based, digital habit tracker"; diff --git a/pkgs/tools/misc/ding-libs/default.nix b/pkgs/tools/misc/ding-libs/default.nix index deb70d082d9..8bb2c287268 100644 --- a/pkgs/tools/misc/ding-libs/default.nix +++ b/pkgs/tools/misc/ding-libs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, check }: +{ lib, stdenv, fetchurl, check }: stdenv.mkDerivation rec { pname = "ding-libs"; @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { meta = { description = "'D is not GLib' utility libraries"; homepage = "https://fedorahosted.org/sssd/"; - platforms = with stdenv.lib.platforms; linux; - maintainers = with stdenv.lib.maintainers; [ e-user ]; - license = [ stdenv.lib.licenses.gpl3 stdenv.lib.licenses.lgpl3 ]; + platforms = with lib.platforms; linux; + maintainers = with lib.maintainers; [ e-user ]; + license = [ lib.licenses.gpl3 lib.licenses.lgpl3 ]; }; } diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index c3317ec0b30..ee068450344 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { # we have no bash at the moment for windows BASH_PATH = - stdenv.lib.optionalString (!stdenv.hostPlatform.isWindows) + lib.optionalString (!stdenv.hostPlatform.isWindows) "${bash}/bin/bash"; # replace the build phase to use the GNUMakefile instead diff --git a/pkgs/tools/misc/disfetch/default.nix b/pkgs/tools/misc/disfetch/default.nix index d80247801f0..afce1429e69 100644 --- a/pkgs/tools/misc/disfetch/default.nix +++ b/pkgs/tools/misc/disfetch/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "disfetch"; - version = "1.12"; + version = "1.14"; src = fetchFromGitHub { owner = "llathasa-veleth"; repo = "disfetch"; rev = version; - sha256 = "1zm8q0fx695x28zg8ihzk3w41439v47n68cw6k551x31mls939yn"; + sha256 = "0p5pj8d761gz95ar35s8q6lrybrg9jik33kwnsxvb14n990kya0p"; }; dontBuild = true; diff --git a/pkgs/tools/misc/diskonaut/default.nix b/pkgs/tools/misc/diskonaut/default.nix index 6c295eb00e8..0fb31685170 100644 --- a/pkgs/tools/misc/diskonaut/default.nix +++ b/pkgs/tools/misc/diskonaut/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "diskonaut"; diff --git a/pkgs/tools/misc/diskus/default.nix b/pkgs/tools/misc/diskus/default.nix index bf61a844196..ff5ade2e67a 100644 --- a/pkgs/tools/misc/diskus/default.nix +++ b/pkgs/tools/misc/diskus/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "087w58q5kd3r23a9qnhqgvq4vhv69b5a6a7n3kh09g5cjszy8s05"; }; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; cargoSha256 = "0bivmjn7h4lfp5azbc6q0xiqq3fk68jdd4kwrwgbxiljg4xd2qy8"; diff --git a/pkgs/tools/misc/disper/default.nix b/pkgs/tools/misc/disper/default.nix index 6ba446d7bc0..ecbf298132f 100644 --- a/pkgs/tools/misc/disper/default.nix +++ b/pkgs/tools/misc/disper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python, xorg, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, python, xorg, makeWrapper }: stdenv.mkDerivation rec { pname = "disper"; @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/disper \ - --prefix "LD_LIBRARY_PATH" : "${stdenv.lib.makeLibraryPath [ xorg.libXrandr xorg.libX11 ]}" + --prefix "LD_LIBRARY_PATH" : "${lib.makeLibraryPath [ xorg.libXrandr xorg.libX11 ]}" ''; meta = { description = "On-the-fly display switch utility"; - homepage = "http://willem.engen.nl/projects/disper/"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.gpl3; + homepage = "https://willem.engen.nl/projects/disper/"; + platforms = lib.platforms.unix; + license = lib.licenses.gpl3; }; } diff --git a/pkgs/tools/misc/dmg2img/default.nix b/pkgs/tools/misc/dmg2img/default.nix index b132079a28e..a3f023e2ad5 100644 --- a/pkgs/tools/misc/dmg2img/default.nix +++ b/pkgs/tools/misc/dmg2img/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, bzip2, openssl, fetchpatch }: +{ lib, stdenv, fetchurl, zlib, bzip2, openssl, fetchpatch }: stdenv.mkDerivation rec { name = "dmg2img-1.6.7"; @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { ''; meta = { - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; description = "An Apple's compressed dmg to standard (hfsplus) image disk file convert tool"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }; } diff --git a/pkgs/tools/misc/docker-ls/default.nix b/pkgs/tools/misc/docker-ls/default.nix index df9755f863d..b8483068117 100644 --- a/pkgs/tools/misc/docker-ls/default.nix +++ b/pkgs/tools/misc/docker-ls/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib, stdenv, docker }: +{ buildGoModule, fetchFromGitHub, lib, docker }: buildGoModule rec { pname = "docker-ls"; diff --git a/pkgs/tools/misc/docker-sync/gemset.nix b/pkgs/tools/misc/docker-sync/gemset.nix index 739d11c7b5a..aef4d9928ab 100644 --- a/pkgs/tools/misc/docker-sync/gemset.nix +++ b/pkgs/tools/misc/docker-sync/gemset.nix @@ -73,4 +73,4 @@ }; version = "0.20.3"; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/misc/docui/default.nix b/pkgs/tools/misc/docui/default.nix index e4934853e82..a1b2ad662bc 100644 --- a/pkgs/tools/misc/docui/default.nix +++ b/pkgs/tools/misc/docui/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "docui"; diff --git a/pkgs/tools/misc/doitlive/default.nix b/pkgs/tools/misc/doitlive/default.nix index 313dc9935fa..9edc078d9f9 100644 --- a/pkgs/tools/misc/doitlive/default.nix +++ b/pkgs/tools/misc/doitlive/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages }: +{ lib, python3Packages }: python3Packages.buildPythonApplication rec { pname = "doitlive"; diff --git a/pkgs/tools/misc/dtach/default.nix b/pkgs/tools/misc/dtach/default.nix index 9973eddc7ef..f036ba9ea3e 100644 --- a/pkgs/tools/misc/dtach/default.nix +++ b/pkgs/tools/misc/dtach/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "dtach"; @@ -27,9 +27,9 @@ stdenv.mkDerivation rec { themselves. ''; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; maintainers = [ ]; }; } diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix index a2f3938adec..063442b75f2 100644 --- a/pkgs/tools/misc/dua/default.nix +++ b/pkgs/tools/misc/dua/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.10.5"; + version = "2.10.10"; src = fetchFromGitHub { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - sha256 = "0imf9ngmyhyj5jdr99g1xc3vqzr61fnz32bxhmy63n1szylig5zq"; + sha256 = "sha256-Rt+60j1+uwL6g4HGc+xdUzGK6nanGfRYbekO54iKsPE="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "1czc0jma5k6idv463kn5qrirq8apgfrcxwv2yjk0pxy6vkji6154"; + cargoSha256 = "sha256-6L1J5RHI657Z03rMmhwEzgpQ0//dykqGi8bI2Enc3N8="; doCheck = false; diff --git a/pkgs/tools/misc/duc/default.nix b/pkgs/tools/misc/duc/default.nix index f24f62cb5f4..570535f80e4 100644 --- a/pkgs/tools/misc/duc/default.nix +++ b/pkgs/tools/misc/duc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config , tokyocabinet, ncurses , cairo ? null, pango ? null , enableCairo ? stdenv.isLinux @@ -17,12 +17,12 @@ stdenv.mkDerivation rec { sha256 = "1i7ry25xzy027g6ysv6qlf09ax04q4vy0kikl8h0aq5jbxsl9q52"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ tokyocabinet ncurses ] ++ - stdenv.lib.optionals enableCairo [ cairo pango ]; + lib.optionals enableCairo [ cairo pango ]; configureFlags = - stdenv.lib.optionals (!enableCairo) [ "--disable-x11" "--disable-cairo" ]; + lib.optionals (!enableCairo) [ "--disable-x11" "--disable-cairo" ]; meta = with lib; { homepage = "http://duc.zevv.nl/"; diff --git a/pkgs/tools/misc/dumptorrent/default.nix b/pkgs/tools/misc/dumptorrent/default.nix index 73dac5280bf..12232c414fd 100644 --- a/pkgs/tools/misc/dumptorrent/default.nix +++ b/pkgs/tools/misc/dumptorrent/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "dumptorrent"; version = "1.2"; - + src = fetchurl { url = "mirror://sourceforge/dumptorrent/dumptorrent-${version}.tar.gz"; sha256 = "073h03bmpfdy15qh37lvppayld2747i4acpyk0pm5nf2raiak0zm"; diff --git a/pkgs/tools/misc/dust/default.nix b/pkgs/tools/misc/dust/default.nix index d8c828c2228..7997f2119a2 100644 --- a/pkgs/tools/misc/dust/default.nix +++ b/pkgs/tools/misc/dust/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "du-dust"; - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitHub { owner = "bootandy"; repo = "dust"; rev = "v${version}"; - sha256 = "1rcbxqcxr8v5faa52psjsjjlnkia5cwc3b1cwka9f5cxwhdwg7hr"; + sha256 = "sha256-JwGa1icwV1yqxy90Psd9bzM7VzM7HPA6kONkI3Y745Q="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "1q15xy15hk6r3sai9wry2jm57dhinx6r84yxg9fwvq354613k645"; + cargoSha256 = "sha256-DVcjczH7i+R2xs9pEaek4zHYHO90G7fVF7yFUPCWLmU="; doCheck = false; diff --git a/pkgs/tools/misc/dvtm/default.nix b/pkgs/tools/misc/dvtm/default.nix index bedfebd9681..695187b3e84 100644 --- a/pkgs/tools/misc/dvtm/default.nix +++ b/pkgs/tools/misc/dvtm/default.nix @@ -16,4 +16,4 @@ callPackage ./dvtm.nix rec { }) ]; } - + diff --git a/pkgs/tools/misc/dvtm/dvtm.nix b/pkgs/tools/misc/dvtm/dvtm.nix index d8bb54cb4cb..9a42655b737 100644 --- a/pkgs/tools/misc/dvtm/dvtm.nix +++ b/pkgs/tools/misc/dvtm/dvtm.nix @@ -3,9 +3,9 @@ stdenv.mkDerivation { inherit name src patches; - CFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-D_DARWIN_C_SOURCE"; + CFLAGS = lib.optionalString stdenv.isDarwin "-D_DARWIN_C_SOURCE"; - postPatch = stdenv.lib.optionalString (customConfig != null) '' + postPatch = lib.optionalString (customConfig != null) '' cp ${builtins.toFile "config.h" customConfig} ./config.h ''; diff --git a/pkgs/tools/misc/edid-decode/default.nix b/pkgs/tools/misc/edid-decode/default.nix index c755f73b118..99a21e28b07 100644 --- a/pkgs/tools/misc/edid-decode/default.nix +++ b/pkgs/tools/misc/edid-decode/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit }: +{ lib, stdenv, fetchgit }: let version = "2018-12-06"; in stdenv.mkDerivation { @@ -19,9 +19,9 @@ in stdenv.mkDerivation { meta = { description = "EDID decoder and conformance tester"; homepage = "https://cgit.freedesktop.org/xorg/app/edid-decode/"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.chiiruno ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.chiiruno ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/misc/edid-generator/default.nix b/pkgs/tools/misc/edid-generator/default.nix index 49b6277faef..89ac21db5f5 100644 --- a/pkgs/tools/misc/edid-generator/default.nix +++ b/pkgs/tools/misc/edid-generator/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , dos2unix , edid-decode @@ -25,7 +25,7 @@ in stdenv.mkDerivation { patchShebangs modeline2edid ''; - configurePhase = (stdenv.lib.concatMapStringsSep "\n" (m: "echo \"${m}\" | ./modeline2edid -") modelines); + configurePhase = (lib.concatMapStringsSep "\n" (m: "echo \"${m}\" | ./modeline2edid -") modelines); installPhase = '' install -Dm 444 *.bin -t "$out/lib/firmware/edid" @@ -34,8 +34,8 @@ in stdenv.mkDerivation { meta = { description = "Hackerswork to generate an EDID blob from given Xorg Modelines"; homepage = "https://github.com/akatrevorjay/edid-generator"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.flokli ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.flokli ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/misc/emv/default.nix b/pkgs/tools/misc/emv/default.nix index 76ea8ceba0d..1dbb5199f75 100644 --- a/pkgs/tools/misc/emv/default.nix +++ b/pkgs/tools/misc/emv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { pname = "emv"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.i0i0.de/toolchest/emv"; description = "Editor Move: Rename files with your favourite text editor"; - license = stdenv.lib.licenses.publicDomain; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.publicDomain; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/ent/default.nix b/pkgs/tools/misc/ent/default.nix index 0fa265c2db6..05dcd36c40c 100644 --- a/pkgs/tools/misc/ent/default.nix +++ b/pkgs/tools/misc/ent/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [ unzip ]; - buildFlags = stdenv.lib.optional stdenv.cc.isClang "CC=clang"; + buildFlags = lib.optional stdenv.cc.isClang "CC=clang"; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/tools/misc/envchain/default.nix b/pkgs/tools/misc/envchain/default.nix index 54ae0155b31..938beff3353 100644 --- a/pkgs/tools/misc/envchain/default.nix +++ b/pkgs/tools/misc/envchain/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsecret readline ] - ++ stdenv.lib.optionals stdenv.isDarwin [ libedit ncurses Security ]; + ++ lib.optionals stdenv.isDarwin [ libedit ncurses Security ]; makeFlags = [ "DESTDIR=$(out)" ]; diff --git a/pkgs/tools/misc/envdir-go/default.nix b/pkgs/tools/misc/envdir-go/default.nix index 957f5941cb6..eafc71030ac 100644 --- a/pkgs/tools/misc/envdir-go/default.nix +++ b/pkgs/tools/misc/envdir-go/default.nix @@ -1,5 +1,5 @@ # This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { version = "1.0.0"; @@ -16,12 +16,12 @@ buildGoPackage rec { preBuild = '' # TODO: is there a way to get the commit ref so we can set main.buildCommit? - buildFlagsArray+=("-ldflags" "-X main.buildDate=1970-01-01T00:00:00+0000 -X main.buildVersion=${version}") + buildFlagsArray+=("-ldflags" "-X main.buildDate=1970-01-01T00:00:00+0000 -X main.buildVersion=${version}") ''; meta = { description = "A go rewrite of envdir"; homepage = "https://github.com/d10n/envdir"; - maintainers = with stdenv.lib.maintainers; [ edude03 ]; + maintainers = with lib.maintainers; [ edude03 ]; }; } diff --git a/pkgs/tools/misc/eot-utilities/default.nix b/pkgs/tools/misc/eot-utilities/default.nix index 546ad8d3d7d..516c9e42617 100644 --- a/pkgs/tools/misc/eot-utilities/default.nix +++ b/pkgs/tools/misc/eot-utilities/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig }: +{lib, stdenv, fetchurl, pkg-config }: stdenv.mkDerivation rec { pname = "eot_utilities"; @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { sha256 = "0cb41riabss23hgfg7vxhky09d6zqwjy1nxdvr3l2bh5qzd4kvaf"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = { homepage = "http://www.w3.org/Tools/eot-utils/"; description = "Create Embedded Open Type from OpenType or TrueType font"; - license = stdenv.lib.licenses.w3c; - maintainers = with stdenv.lib.maintainers; [ leenaars ]; - platforms = with stdenv.lib.platforms; unix; + license = lib.licenses.w3c; + maintainers = with lib.maintainers; [ leenaars ]; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 74eccc029ac..de06a60fbf2 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -11,11 +11,11 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "1.15.2"; + version = "1.15.3"; src = python.pkgs.fetchPypi { inherit pname version; - sha256 = "1wnmgn0q4n2vp2cdwsc36acsy7c7w5vyxdglii3432mr5drrgcsx"; + sha256 = "a75b53e76fb8b4b394eca18fe74f622ca740bc13b7cbc02e6af5f50126b7aa0b"; }; ESPHOME_USE_SUBPROCESS = ""; diff --git a/pkgs/tools/misc/esptool/default.nix b/pkgs/tools/misc/esptool/default.nix index 89be1da8cc9..7c7f91621b8 100644 --- a/pkgs/tools/misc/esptool/default.nix +++ b/pkgs/tools/misc/esptool/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3, openssl }: +{ lib, fetchFromGitHub, python3, openssl }: python3.pkgs.buildPythonApplication rec { pname = "esptool"; diff --git a/pkgs/tools/misc/etcher/default.nix b/pkgs/tools/misc/etcher/default.nix index 8e5c5d918cc..0f68137066e 100644 --- a/pkgs/tools/misc/etcher/default.nix +++ b/pkgs/tools/misc/etcher/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { postFixup = '' makeWrapper ${electron}/bin/electron $out/bin/${pname} \ --add-flags $out/share/${pname}/resources/app.asar \ - --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ gcc-unwrapped.lib ]}" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gcc-unwrapped.lib ]}" ''; meta = with lib; { diff --git a/pkgs/tools/misc/eva/default.nix b/pkgs/tools/misc/eva/default.nix index 65da084f841..253e815008a 100644 --- a/pkgs/tools/misc/eva/default.nix +++ b/pkgs/tools/misc/eva/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, fetchpatch }: +{ lib, fetchFromGitHub, rustPlatform, fetchpatch }: rustPlatform.buildRustPackage rec { pname = "eva"; diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index 44c821f542d..83aa6c505d3 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, rustPlatform, cmake, perl, pkgconfig, zlib +{ lib, stdenv, fetchFromGitHub, fetchpatch, rustPlatform, cmake, perl, pkg-config, zlib , darwin, libiconv, installShellFiles }: @@ -26,9 +26,9 @@ buildRustPackage rec { }) ]; - nativeBuildInputs = [ cmake pkgconfig perl installShellFiles ]; + nativeBuildInputs = [ cmake pkg-config perl installShellFiles ]; buildInputs = [ zlib ] - ++ stdenv.lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ] ; diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix index bf7853c1173..887671b4899 100644 --- a/pkgs/tools/misc/execline/default.nix +++ b/pkgs/tools/misc/execline/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "execline"; - version = "2.6.1.1"; - sha256 = "0mmsnai3bkyhng0cxdz6bf7d6b7kbsxs4p39m63215lz6kq0hhrr"; + version = "2.7.0.0"; + sha256 = "0kl74yix60msgw8k3shhp9ymm80n91yxxqckixj5qbbhmylpnpqd"; description = "A small scripting language, to be used in place of a shell in non-interactive scripts"; diff --git a/pkgs/tools/misc/execline/execlineb-wrapper.c b/pkgs/tools/misc/execline/execlineb-wrapper.c index d31a76ca26e..c8e91813b77 100644 --- a/pkgs/tools/misc/execline/execlineb-wrapper.c +++ b/pkgs/tools/misc/execline/execlineb-wrapper.c @@ -12,6 +12,7 @@ #include <skalibs/djbunix.h> #include <skalibs/strerr2.h> #include <skalibs/env.h> +#include <skalibs/exec.h> #define dienomem() strerr_diefu1sys(111, "stralloc_catb") @@ -41,10 +42,10 @@ int main(int argc, char const* argv[], char const *const *envp) } // exec into execlineb and append path_modif to the environment - xpathexec_r_name( + xmexec_aem( EXECLINEB_PATH(), argv, - envp, env_len(envp), + envp, path_modif.s, path_modif.len ); } diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix index 2c5548abd83..6e8bb7fd96c 100644 --- a/pkgs/tools/misc/expect/default.nix +++ b/pkgs/tools/misc/expect/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { wrapProgram $i \ --prefix PATH : "${tcl}/bin" \ --prefix TCLLIBPATH ' ' $out/lib/* \ - ${stdenv.lib.optionalString stdenv.isDarwin "--prefix DYLD_LIBRARY_PATH : $out/lib/expect${version}"} + ${lib.optionalString stdenv.isDarwin "--prefix DYLD_LIBRARY_PATH : $out/lib/expect${version}"} done ''; diff --git a/pkgs/tools/misc/fasd/default.nix b/pkgs/tools/misc/fasd/default.nix index 6c2cbd25744..a3cdc388cdf 100644 --- a/pkgs/tools/misc/fasd/default.nix +++ b/pkgs/tools/misc/fasd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub } : +{ lib, stdenv, fetchFromGitHub } : stdenv.mkDerivation rec { pname = "fasd"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/clvv/${pname}"; description = "Quick command-line access to files and directories for POSIX shells"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; longDescription = '' Fasd is a command-line productivity booster. @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { command line. ''; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/misc/fdtools/default.nix b/pkgs/tools/misc/fdtools/default.nix index 6e0cb66749f..d096f903bd1 100644 --- a/pkgs/tools/misc/fdtools/default.nix +++ b/pkgs/tools/misc/fdtools/default.nix @@ -13,6 +13,7 @@ in stdenv.mkDerivation { inherit sha256; }; + patches = [ ./new-skalibs.patch ]; outputs = [ "bin" "lib" "dev" "doc" "out" ]; buildInputs = [ skawarePackages.skalibs ]; diff --git a/pkgs/tools/misc/fdtools/new-skalibs.patch b/pkgs/tools/misc/fdtools/new-skalibs.patch new file mode 100644 index 00000000000..76c5396f8a8 --- /dev/null +++ b/pkgs/tools/misc/fdtools/new-skalibs.patch @@ -0,0 +1,223 @@ +diff -Naur misc/fdtools-2020.05.04/src/check_exit_exec.c misc-new/fdtools-2020.05.04/src/check_exit_exec.c +--- misc/fdtools-2020.05.04/src/check_exit_exec.c 2015-03-16 04:55:56.000000000 +0100 ++++ misc-new/fdtools-2020.05.04/src/check_exit_exec.c 2021-01-22 10:50:25.529955213 +0100 +@@ -2,6 +2,7 @@ + #include <unistd.h> + #include <errno.h> + ++#include <skalibs/exec.h> + #include <skalibs/stddjb.h> + #include "prjlibs-c/constants.h" + #include "prjlibs-c/diewarn.h" +@@ -14,7 +15,7 @@ + + if (str_equal(arg, ":")) { + ++argv; +- pathexec0((char const**)argv); ++ mexec0((char const**)argv); + DIE1(exec, argv[0]); + } + } +diff -Naur misc/fdtools-2020.05.04/src/grabconsole.c misc-new/fdtools-2020.05.04/src/grabconsole.c +--- misc/fdtools-2020.05.04/src/grabconsole.c 2020-04-24 06:01:22.000000000 +0200 ++++ misc-new/fdtools-2020.05.04/src/grabconsole.c 2021-01-22 10:43:27.887754936 +0100 +@@ -4,6 +4,7 @@ + #include <errno.h> + + #include <skalibs/stddjb.h> ++#include <skalibs/exec.h> + #include "prjlibs-c/constants.h" + #include "prjlibs-c/diewarn.h" + #include "prjlibs-c/types.h" +@@ -26,6 +27,6 @@ + if (fd_grabconsole(fd)!=0) DIE0(tioccons); + + argv+=2; +- pathexec0((char const**)argv); ++ mexec0((char const**)argv); + DIE1(exec, argv[0]); + } +diff -Naur misc/fdtools-2020.05.04/src/pipecycle.c misc-new/fdtools-2020.05.04/src/pipecycle.c +--- misc/fdtools-2020.05.04/src/pipecycle.c 2015-03-16 04:55:56.000000000 +0100 ++++ misc-new/fdtools-2020.05.04/src/pipecycle.c 2021-01-22 10:47:58.033220790 +0100 +@@ -4,6 +4,7 @@ + #include <unistd.h> + #include <signal.h> + ++#include <skalibs/exec.h> + #include <skalibs/stddjb.h> + #include "prjlibs-c/diewarn.h" + #include "prjlibs-c/types.h" +@@ -56,7 +57,7 @@ + if (fd_shuffle(2, current, wanted)!=0) DIE0(dup); + } + read(start[0], &j, 1); +- pathexec(args); ++ mexec(args); + DIE1(exec, args[0]); + } + +diff -Naur misc/fdtools-2020.05.04/src/recvfd.c misc-new/fdtools-2020.05.04/src/recvfd.c +--- misc/fdtools-2020.05.04/src/recvfd.c 2020-04-28 09:35:05.000000000 +0200 ++++ misc-new/fdtools-2020.05.04/src/recvfd.c 2021-01-22 10:47:14.180994779 +0100 +@@ -7,6 +7,7 @@ + #include <limits.h> + + #include <skalibs/stddjb.h> ++#include <skalibs/exec.h> + #include "prjlibs-c/diewarn.h" + #include "prjlibs-c/types.h" + #include "fdtools.h" +@@ -69,9 +70,9 @@ + named_fd=duped; + } + buf[int_fmt(buf, named_fd)]='\0'; +- if (pathexec_env(argv[i]+1, buf)==0) DIE0(alloc); ++ if (env_mexec(argv[i]+1, buf)==0) DIE0(alloc); + } + argv+=nfds+1; +- pathexec0((char const**)argv); ++ mexec0((char const**)argv); + DIE1(exec, argv[0]); + } +diff -Naur misc/fdtools-2020.05.04/src/sendfd.c misc-new/fdtools-2020.05.04/src/sendfd.c +--- misc/fdtools-2020.05.04/src/sendfd.c 2015-03-16 06:48:39.000000000 +0100 ++++ misc-new/fdtools-2020.05.04/src/sendfd.c 2021-01-22 10:43:07.207634214 +0100 +@@ -7,6 +7,7 @@ + #include <limits.h> + + #include <skalibs/stddjb.h> ++#include <skalibs/exec.h> + #include "prjlibs-c/diewarn.h" + #include "prjlibs-c/types.h" + #include "fdtools.h" +@@ -40,6 +41,6 @@ + argv+=nfds; + if (*argv==NULL) _exit(0); + ++argv; +- pathexec0((char const**)argv); ++ mexec0((char const**)argv); + DIE1(exec, argv[0]); + } +diff -Naur misc/fdtools-2020.05.04/src/setstate.c misc-new/fdtools-2020.05.04/src/setstate.c +--- misc/fdtools-2020.05.04/src/setstate.c 2020-05-04 10:04:21.000000000 +0200 ++++ misc-new/fdtools-2020.05.04/src/setstate.c 2021-01-22 10:45:05.084304318 +0100 +@@ -8,6 +8,7 @@ + #include <errno.h> + + #include <skalibs/stddjb.h> ++#include <skalibs/exec.h> + #include "prjlibs-c/constants.h" + #include "prjlibs-c/intattr.h" + #include "prjlibs-c/diewarn.h" +@@ -167,6 +168,6 @@ + } + + argv+=2; +- pathexec_run(argv[0], (char const**)argv, (char const**)environ); ++ mexec_ae(argv[0], (char const**)argv, (char const**)environ); + DIE1(exec, argv[0]); + } +diff -Naur misc/fdtools-2020.05.04/src/statfile.c misc-new/fdtools-2020.05.04/src/statfile.c +--- misc/fdtools-2020.05.04/src/statfile.c 2015-03-22 00:33:44.000000000 +0100 ++++ misc-new/fdtools-2020.05.04/src/statfile.c 2021-01-22 10:48:23.673351183 +0100 +@@ -6,6 +6,7 @@ + #include <errno.h> + + #include <skalibs/stddjb.h> ++#include <skalibs/exec.h> + #include "prjlibs-c/constants.h" + #include "prjlibs-c/diewarn.h" + #include "prjlibs-c/warn.h" +@@ -15,7 +16,7 @@ + char const* PROG="statfile"; + + static void set(char const* const var, char const* const val) { +- if (pathexec_env(var, val)==0) DIE0(alloc); ++ if (env_mexec(var, val)==0) DIE0(alloc); + } + + static void set64n(char const* const var, time_t t, unsigned int nsec) { +@@ -178,6 +179,6 @@ + } + + argv+=3; +- pathexec((char const**)argv); ++ mexec((char const**)argv); + DIE1(exec, argv[0]); + } +diff -Naur misc/fdtools-2020.05.04/src/vc-get-linux.c misc-new/fdtools-2020.05.04/src/vc-get-linux.c +--- misc/fdtools-2020.05.04/src/vc-get-linux.c 2020-04-28 07:04:49.000000000 +0200 ++++ misc-new/fdtools-2020.05.04/src/vc-get-linux.c 2021-01-22 10:47:34.649100757 +0100 +@@ -10,6 +10,7 @@ + #include <sys/sysmacros.h> + + #include <skalibs/stddjb.h> ++#include <skalibs/exec.h> + #include "prjlibs-c/constants.h" + #include "prjlibs-c/diewarn.h" + #include "prjlibs-c/types.h" +@@ -38,7 +39,7 @@ + errno=0; + if (ioctl(fd, VT_OPENQRY, &vtnum)<0 || vtnum==-1) DIE0(vt_qry); + bufnum[ulong_fmt(bufnum, vtnum)]='\0'; +- if (pathexec_env("TTY", buf)==0) DIE0(alloc); ++ if (env_mexec("TTY", buf)==0) DIE0(alloc); + } + fd_close(fd); + +@@ -50,12 +51,12 @@ + if (fstat(fd, &statbuf)!=0) DIE1(stat, buf); + buf[ulong_fmt(buf, minor(statbuf.st_rdev))]='\0'; + } +- if (pathexec_env("VCNUM", buf)==0) DIE0(alloc); ++ if (env_mexec("VCNUM", buf)==0) DIE0(alloc); + + buf[ulong_fmt(buf, fd)]='\0'; +- if (pathexec_env("VCFD", buf)==0) DIE0(alloc); ++ if (env_mexec("VCFD", buf)==0) DIE0(alloc); + } + +- pathexec((char const**)argv+2); ++ mexec((char const**)argv+2); + DIE1(exec, argv[2]); + } +diff -Naur misc/fdtools-2020.05.04/src/vc-lock-linux.c misc-new/fdtools-2020.05.04/src/vc-lock-linux.c +--- misc/fdtools-2020.05.04/src/vc-lock-linux.c 2015-03-20 05:59:42.000000000 +0100 ++++ misc-new/fdtools-2020.05.04/src/vc-lock-linux.c 2021-01-22 10:48:36.857417751 +0100 +@@ -8,6 +8,7 @@ + #include <sys/ioctl.h> + #include <sys/vt.h> + ++#include <skalibs/exec.h> + #include <skalibs/stddjb.h> + #include "prjlibs-c/constants.h" + #include "prjlibs-c/diewarn.h" +@@ -79,7 +80,7 @@ + WARN0(fork); + } else if (pid==0) { + sigprocmask(SIG_SETMASK, &old_set, NULLP); +- pathexec((char const**)argv); ++ mexec((char const**)argv); + DIE1(exec, *argv); + } else { + int status; +diff -Naur misc/fdtools-2020.05.04/src/vc-switch-linux.c misc-new/fdtools-2020.05.04/src/vc-switch-linux.c +--- misc/fdtools-2020.05.04/src/vc-switch-linux.c 2020-04-28 07:14:04.000000000 +0200 ++++ misc-new/fdtools-2020.05.04/src/vc-switch-linux.c 2021-01-22 10:42:41.259480648 +0100 +@@ -10,6 +10,7 @@ + #include <sys/sysmacros.h> + + #include <skalibs/stddjb.h> ++#include <skalibs/exec.h> + #include "prjlibs-c/constants.h" + #include "prjlibs-c/diewarn.h" + #include "prjlibs-c/types.h" +@@ -36,6 +37,6 @@ + if (ioctl(fd, VT_ACTIVATE, ttyno)<0) DIE0(vt_act); + if (!scan) fd_close(fd); + +- pathexec0((char const**)argv+3); ++ mexec0((char const**)argv+3); + DIE1(exec, argv[3]); + } diff --git a/pkgs/tools/misc/fend/default.nix b/pkgs/tools/misc/fend/default.nix index 8813ec5a14e..0ca5f42f74d 100644 --- a/pkgs/tools/misc/fend/default.nix +++ b/pkgs/tools/misc/fend/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fend"; - version = "0.1.11"; + version = "0.1.13"; src = fetchFromGitHub { owner = "printfn"; repo = pname; rev = "v${version}"; - sha256 = "0g9zr2afi103cwv6ikpmmyh5v055dh47l3wj9a1kbxgms0953iwh"; + sha256 = "sha256-dz6vGRsWc7ubc/drj2Qw/of8AciPgVzc4++Eozg0Luo="; }; - cargoSha256 = "0hydlaibanw2vjyxymfbzgwwk2qjv7jsz15gn66ga5vknsqihcrx"; + cargoSha256 = "sha256-/HBTmLZLhv89mvIVLocw9XbfOgxh9KsjA6KT60IuJeA="; meta = with lib; { description = "Arbitrary-precision unit-aware calculator"; diff --git a/pkgs/tools/misc/ffsend/default.nix b/pkgs/tools/misc/ffsend/default.nix index f3f7afd30f6..4c92a0be792 100644 --- a/pkgs/tools/misc/ffsend/default.nix +++ b/pkgs/tools/misc/ffsend/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, rustPlatform, cmake, pkgconfig, openssl +{ lib, stdenv, fetchFromGitLab, rustPlatform, cmake, pkg-config, openssl , darwin, installShellFiles , x11Support ? stdenv.isLinux || stdenv.hostPlatform.isBSD @@ -27,12 +27,12 @@ buildRustPackage rec { cargoSha256 = "1n9pf29xid6jcas5yx94k4cpmqgx0kpqq7gwf83jisjywxzygh6w"; - nativeBuildInputs = [ cmake pkgconfig installShellFiles ]; + nativeBuildInputs = [ cmake pkg-config installShellFiles ]; buildInputs = if stdenv.isDarwin then (with darwin.apple_sdk.frameworks; [ CoreFoundation CoreServices Security AppKit ]) else [ openssl ]; - preBuild = stdenv.lib.optionalString (x11Support && usesX11) ( + preBuild = lib.optionalString (x11Support && usesX11) ( if preferXsel && xsel != null then '' export XSEL_PATH="${xsel}/bin/xsel" '' else '' diff --git a/pkgs/tools/misc/figlet/default.nix b/pkgs/tools/misc/figlet/default.nix index 90fb0981fbd..01ff40b2b74 100644 --- a/pkgs/tools/misc/figlet/default.nix +++ b/pkgs/tools/misc/figlet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch }: +{ lib, stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation { name = "figlet-2.2.5"; @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { description = "Program for making large letters out of ordinary text"; homepage = "http://www.figlet.org/"; - license = stdenv.lib.licenses.afl21; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.afl21; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix index 6867038c645..4a9dc7ee774 100644 --- a/pkgs/tools/misc/file/default.nix +++ b/pkgs/tools/misc/file/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { ./webassembly-format-fix.patch ]; - nativeBuildInputs = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file; + nativeBuildInputs = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file; buildInputs = [ zlib ] - ++ stdenv.lib.optional stdenv.hostPlatform.isWindows libgnurx; + ++ lib.optional stdenv.hostPlatform.isWindows libgnurx; doCheck = true; - makeFlags = stdenv.lib.optional stdenv.hostPlatform.isWindows "FILE_COMPILE=file"; + makeFlags = lib.optional stdenv.hostPlatform.isWindows "FILE_COMPILE=file"; meta = with lib; { homepage = "https://darwinsys.com/file"; diff --git a/pkgs/tools/misc/fileschanged/default.nix b/pkgs/tools/misc/fileschanged/default.nix index 056943e96d7..2c64c4c1edc 100644 --- a/pkgs/tools/misc/fileschanged/default.nix +++ b/pkgs/tools/misc/fileschanged/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gamin }: +{ lib, stdenv, fetchurl, gamin }: stdenv.mkDerivation rec { name = "fileschanged-0.6.9"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.nongnu.org/fileschanged/"; description = "A command-line utility that reports when files have been altered"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; longDescription = '' This utility is a client to FAM (File Alteration Monitor) servers @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { standard-output or executes a given command. ''; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index 6e07125ab72..18881ef181d 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , coreutils }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { patches = [ ./no-install-statedir.patch ] # fix gnulib tests on 32-bit ARM. Included on findutils master. # https://lists.gnu.org/r/bug-gnulib/2020-08/msg00225.html - ++ stdenv.lib.optional stdenv.hostPlatform.isAarch32 ./fix-gnulib-tests-arm.patch; + ++ lib.optional stdenv.hostPlatform.isAarch32 ./fix-gnulib-tests-arm.patch; buildInputs = [ coreutils ]; # bin/updatedb script needs to call sort @@ -64,8 +64,8 @@ stdenv.mkDerivation rec { * xargs - build and execute command lines from standard input. ''; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; }; } diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix index 47d4fd12757..8fcfa9acb1f 100644 --- a/pkgs/tools/misc/flashrom/default.nix +++ b/pkgs/tools/misc/flashrom/default.nix @@ -3,7 +3,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , libftdi1 , libusb1 , pciutils @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }; mesonFlags = lib.optionals stdenv.isAarch64 [ "-Dpciutils=false" ]; - nativeBuildInputs = [ meson pkgconfig ninja ]; + nativeBuildInputs = [ meson pkg-config ninja ]; buildInputs = [ libftdi1 libusb1 pciutils ]; meta = with lib; { diff --git a/pkgs/tools/misc/fluentd/gemset.nix b/pkgs/tools/misc/fluentd/gemset.nix index a4b488597c7..67b72d634bc 100644 --- a/pkgs/tools/misc/fluentd/gemset.nix +++ b/pkgs/tools/misc/fluentd/gemset.nix @@ -540,4 +540,4 @@ }; version = "1.4.1"; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/misc/fondu/default.nix b/pkgs/tools/misc/fondu/default.nix index 772ae236764..092d33b2e81 100644 --- a/pkgs/tools/misc/fondu/default.nix +++ b/pkgs/tools/misc/fondu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { version = "060102"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "fortify" ]; meta = { - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.gpl3; + platforms = lib.platforms.unix; + license = lib.licenses.gpl3; }; } diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix index 8da5c871652..ffee232172c 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/tools/misc/fontforge/default.nix @@ -1,6 +1,5 @@ -{ stdenv, fetchurl, lib -, fetchpatch -, cmake, perl, uthash, pkgconfig, gettext +{ stdenv, fetchFromGitHub, lib +, cmake, perl, uthash, pkg-config, gettext , python, freetype, zlib, glib, libungif, libpng, libjpeg, libtiff, libxml2, cairo, pango , readline, woff2, zeromq, libuninameslist , withSpiro ? false, libspiro @@ -15,25 +14,15 @@ assert withGTK -> withGUI; stdenv.mkDerivation rec { pname = "fontforge"; - version = "20200314"; + version = "20201107"; - src = fetchurl { - url = "https://github.com/${pname}/${pname}/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "0qf88wd6riycq56d24brybyc93ns74s0nyyavm43zp2kfcihn6fd"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = version; + sha256 = "sha256-Rl/5lbXaPgIndANaD0IakaDus6T53FjiBb45FIuGrvc="; }; - patches = [ - # Unreleased fix for https://github.com/fontforge/fontforge/issues/4229 - # which is required to fix an uninterposated `${CMAKE_INSTALL_PREFIX}/lib`, see - # see https://github.com/nh2/static-haskell-nix/pull/98#issuecomment-665395399 - # TODO: Remove https://github.com/fontforge/fontforge/pull/4232 is in a release. - (fetchpatch { - name = "fontforge-cmake-set-rpath-to-the-configure-time-CMAKE_INSTALL_PREFIX"; - url = "https://github.com/fontforge/fontforge/commit/297ee9b5d6db5970ca17ebe5305189e79a1520a1.patch"; - sha256 = "14qfp8pwh0vzzib4hq2nc6xhn8lc1cal1sb0lqwb2q5dijqx5kqk"; - }) - ]; - # use $SOURCE_DATE_EPOCH instead of non-deterministic timestamps postPatch = '' find . -type f -name '*.c' -exec sed -r -i 's#\btime\(&(.+)\)#if (getenv("SOURCE_DATE_EPOCH")) \1=atol(getenv("SOURCE_DATE_EPOCH")); else &#g' {} \; @@ -46,7 +35,7 @@ stdenv.mkDerivation rec { # do not use x87's 80-bit arithmetic, rouding errors result in very different font binaries NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isi686 "-msse2 -mfpmath=sse"; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ readline uthash woff2 zeromq libuninameslist python freetype zlib glib libungif libpng libjpeg libtiff libxml2 @@ -76,8 +65,8 @@ stdenv.mkDerivation rec { meta = { description = "A font editor"; homepage = "http://fontforge.github.io"; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.erictapen ]; + platforms = lib.platforms.all; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.erictapen ]; }; } diff --git a/pkgs/tools/misc/fpp/default.nix b/pkgs/tools/misc/fpp/default.nix index b00f2198dbc..6c2abbf6c64 100644 --- a/pkgs/tools/misc/fpp/default.nix +++ b/pkgs/tools/misc/fpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3 }: +{ lib, stdenv, fetchFromGitHub, python3 }: stdenv.mkDerivation rec { pname = "fpp"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "CLI program that accepts piped input and presents files for selection"; homepage = "https://facebook.github.io/PathPicker/"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.bsd3; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/misc/fselect/default.nix b/pkgs/tools/misc/fselect/default.nix index 1076c44a1bb..7416961e84e 100644 --- a/pkgs/tools/misc/fselect/default.nix +++ b/pkgs/tools/misc/fselect/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles }: +{ lib, fetchFromGitHub, rustPlatform, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "fselect"; diff --git a/pkgs/tools/misc/fsql/default.nix b/pkgs/tools/misc/fsql/default.nix index 8e113ee871a..100e7023232 100644 --- a/pkgs/tools/misc/fsql/default.nix +++ b/pkgs/tools/misc/fsql/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "fsql"; diff --git a/pkgs/tools/misc/fwup/default.nix b/pkgs/tools/misc/fwup/default.nix index b3864aff44b..4d072e6d2bf 100644 --- a/pkgs/tools/misc/fwup/default.nix +++ b/pkgs/tools/misc/fwup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, makeWrapper, pkgconfig +{ stdenv, lib, fetchFromGitHub, autoreconfHook, makeWrapper, pkg-config , zlib, lzma, bzip2, mtools, dosfstools, zip, unzip, libconfuse, libsodium , libarchive, darwin, coreutils }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { doCheck = true; patches = lib.optional stdenv.isDarwin [ ./fix-testrunner-darwin.patch ]; - nativeBuildInputs = [ pkgconfig autoreconfHook makeWrapper ]; + nativeBuildInputs = [ pkg-config autoreconfHook makeWrapper ]; buildInputs = [ zlib lzma bzip2 libconfuse libsodium libarchive ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.DiskArbitration diff --git a/pkgs/tools/misc/fx_cast/default.nix b/pkgs/tools/misc/fx_cast/default.nix index 581ef0aa838..4fcb5a65573 100644 --- a/pkgs/tools/misc/fx_cast/default.nix +++ b/pkgs/tools/misc/fx_cast/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { # See now-cli/default.nix dontStrip = true; preFixup = let - libPath = stdenv.lib.makeLibraryPath [stdenv.cc.cc stdenv.cc.libc]; + libPath = lib.makeLibraryPath [stdenv.cc.cc stdenv.cc.libc]; bin = "$out/bin/${pname}"; in '' diff --git a/pkgs/tools/misc/g933-utils/default.nix b/pkgs/tools/misc/g933-utils/default.nix index 67e3b3b6ea3..7fbfadfac76 100644 --- a/pkgs/tools/misc/g933-utils/default.nix +++ b/pkgs/tools/misc/g933-utils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, udev, pkgconfig }: +{ lib, fetchFromGitHub, rustPlatform, udev, pkg-config }: rustPlatform.buildRustPackage rec { pname = "g933-utils"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "16xgk4rc36d6lylh2dzv63ryq9s7fli3h2qva1m1p6f0gpasnk7w"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ udev ]; meta = with lib; { diff --git a/pkgs/tools/misc/gammy/default.nix b/pkgs/tools/misc/gammy/default.nix index cb8f491069a..9f9a73a989e 100644 --- a/pkgs/tools/misc/gammy/default.nix +++ b/pkgs/tools/misc/gammy/default.nix @@ -2,7 +2,7 @@ let pname = "gammy"; - version = "0.9.59"; + version = "0.9.62"; in stdenv.mkDerivation { @@ -12,7 +12,7 @@ stdenv.mkDerivation { owner = "Fushko"; repo = pname; rev = "v${version}"; - sha256 = "1iz41larqr6ss5kar1pds6zgcrch6ch34cr0ngd71gcaxal0rb72"; + sha256 = "sha256-fyr+khLgaX5xbKCW3pqt6fFvZBHGEVs1BsMireZDxP0="; }; nativeBuildInputs = [ qmake wrapQtAppsHook ]; diff --git a/pkgs/tools/misc/gams/default.nix b/pkgs/tools/misc/gams/default.nix index 0723735228a..f91acbf264a 100644 --- a/pkgs/tools/misc/gams/default.nix +++ b/pkgs/tools/misc/gams/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, file, licenseFile ? null, optgamsFile ? null}: +{ lib, stdenv, fetchurl, unzip, file, licenseFile ? null, optgamsFile ? null}: assert licenseFile != null; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cp -a * "$out/share/gams" cp ${licenseFile} $out/share/gams/gamslice.txt - '' + stdenv.lib.optionalString (optgamsFile != null) '' + '' + lib.optionalString (optgamsFile != null) '' cp ${optgamsFile} $out/share/gams/optgams.def ln -s $out/share/gams/optgams.def $out/bin/optgams.def ''; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib;{ + meta = with lib;{ description = "General Algebraic Modeling System"; longDescription = '' The General Algebraic Modeling System is a high-level modeling system for mathematical optimization. diff --git a/pkgs/tools/misc/gawp/default.nix b/pkgs/tools/misc/gawp/default.nix index 2856dd48559..5c7953a766e 100644 --- a/pkgs/tools/misc/gawp/default.nix +++ b/pkgs/tools/misc/gawp/default.nix @@ -1,10 +1,10 @@ -{ stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: with builtins; buildGoPackage rec { pname = "gawp"; - version = "20160121-${stdenv.lib.strings.substring 0 7 rev}"; + version = "20160121-${lib.strings.substring 0 7 rev}"; rev = "5db2d8faa220e8d6eaf8677354bd197bf621ff7f"; goPackagePath = "github.com/martingallagher/gawp"; @@ -20,6 +20,6 @@ buildGoPackage rec { meta = { homepage = "https://github.com/martingallagher/gawp"; description = "A simple, configurable, file watching, job execution tool"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }; } diff --git a/pkgs/tools/misc/gbdfed/default.nix b/pkgs/tools/misc/gbdfed/default.nix index e5dc243ede1..ded2864dbc6 100644 --- a/pkgs/tools/misc/gbdfed/default.nix +++ b/pkgs/tools/misc/gbdfed/default.nix @@ -1,4 +1,4 @@ - { stdenv, fetchurl, pkgconfig, freetype, gtk }: + { lib, stdenv, fetchurl, pkg-config, freetype, gtk }: stdenv.mkDerivation rec { version = "1.6"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0g09k6wim58hngxncq2brr7mwjm92j3famp0vs4b3p48wr65vcjx"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ freetype gtk ]; patches = [ ./Makefile.patch ]; @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { description = "Bitmap Font Editor"; longDescription = '' gbdfed lets you interactively create new bitmap font files or modify existing ones. - It allows editing multiple fonts and multiple glyphs, + It allows editing multiple fonts and multiple glyphs, it allows cut and paste operations between fonts and glyphs and editing font properties. - The editor works natively with BDF fonts. + The editor works natively with BDF fonts. ''; homepage = "http://sofia.nmsu.edu/~mleisher/Software/gbdfed/"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.linquize ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.linquize ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/misc/geekbench/default.nix b/pkgs/tools/misc/geekbench/default.nix index 1e1c06a3a02..d6b0c84b61f 100644 --- a/pkgs/tools/misc/geekbench/default.nix +++ b/pkgs/tools/misc/geekbench/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { for f in geekbench5 geekbench_x86_64 ; do patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) $out/bin/$f - wrapProgram $out/bin/$f --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:$out/lib/" + wrapProgram $out/bin/$f --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:$out/lib/" done ''; diff --git a/pkgs/tools/misc/getopt/default.nix b/pkgs/tools/misc/getopt/default.nix index f94d6eeff4e..c3b94465aea 100644 --- a/pkgs/tools/misc/getopt/default.nix +++ b/pkgs/tools/misc/getopt/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { pname = "getopt"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ]; meta = { - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; homepage = "http://frodo.looijaard.name/project/getopt"; description = "Parses command-line arguments from shell scripts"; }; diff --git a/pkgs/tools/misc/gh-ost/default.nix b/pkgs/tools/misc/gh-ost/default.nix index 6096dac9622..dd28ddfaff5 100644 --- a/pkgs/tools/misc/gh-ost/default.nix +++ b/pkgs/tools/misc/gh-ost/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gh-ost"; diff --git a/pkgs/tools/misc/gibo/default.nix b/pkgs/tools/misc/gibo/default.nix index 1357ab5196d..70d0eb19ca8 100644 --- a/pkgs/tools/misc/gibo/default.nix +++ b/pkgs/tools/misc/gibo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, coreutils, findutils, git }: +{ lib, stdenv, fetchFromGitHub, coreutils, findutils, git }: stdenv.mkDerivation rec { pname = "gibo"; @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/simonwhitaker/gibo"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; description = "A shell script for easily accessing gitignore boilerplates"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/gif-for-cli/default.nix b/pkgs/tools/misc/gif-for-cli/default.nix index e82cafdd64c..bbb1b8b9640 100644 --- a/pkgs/tools/misc/gif-for-cli/default.nix +++ b/pkgs/tools/misc/gif-for-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, ffmpeg, zlib, libjpeg }: +{ lib, fetchFromGitHub, python3Packages, ffmpeg, zlib, libjpeg }: python3Packages.buildPythonApplication { pname = "gif-for-cli"; diff --git a/pkgs/tools/misc/git-town/default.nix b/pkgs/tools/misc/git-town/default.nix index cf3a6aba19f..56f9452db7b 100644 --- a/pkgs/tools/misc/git-town/default.nix +++ b/pkgs/tools/misc/git-town/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "git-town"; diff --git a/pkgs/tools/misc/gnokii/default.nix b/pkgs/tools/misc/gnokii/default.nix index 25c31666191..9803e8db016 100644 --- a/pkgs/tools/misc/gnokii/default.nix +++ b/pkgs/tools/misc/gnokii/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, perl, gettext, libusb-compat-0_1, pkgconfig, bluez +{ lib, stdenv, fetchurl, intltool, perl, gettext, libusb-compat-0_1, pkg-config, bluez , readline, pcsclite, libical, gtk2, glib, libXpm }: stdenv.mkDerivation rec { @@ -12,15 +12,15 @@ stdenv.mkDerivation rec { buildInputs = [ perl intltool gettext libusb-compat-0_1 - glib gtk2 pkgconfig bluez readline + glib gtk2 pkg-config bluez readline libXpm pcsclite libical ]; meta = { description = "Cellphone tool"; homepage = "http://www.gnokii.org"; - maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = stdenv.lib.platforms.linux; + maintainers = [ lib.maintainers.raskin ]; + platforms = lib.platforms.linux; broken = true; # 2018-04-10 }; } diff --git a/pkgs/tools/misc/gnuvd/default.nix b/pkgs/tools/misc/gnuvd/default.nix deleted file mode 100644 index eef1533587b..00000000000 --- a/pkgs/tools/misc/gnuvd/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{lib, stdenv, fetchurl}: - -stdenv.mkDerivation { - name = "gnuvd-1.0.12"; - - src = fetchurl { - url = "https://www.djcbsoftware.nl/code/gnuvd/gnuvd-1.0.12.tar.gz"; - sha256 = "0mpy76a0pxy62zjiihlzmvl4752hiwxhfs8rm1v5zgdr78acxyxz"; - }; - - meta = with lib; { - description = "Command-line dutch dictionary application"; - homepage = "https://www.djcbsoftware.nl/code/gnuvd/"; - license = licenses.gpl2; - platforms = platforms.unix; - }; -} diff --git a/pkgs/tools/misc/go.rice/default.nix b/pkgs/tools/misc/go.rice/default.nix index 26b082e43b3..295bf010279 100644 --- a/pkgs/tools/misc/go.rice/default.nix +++ b/pkgs/tools/misc/go.rice/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "go.rice"; diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix index d14ef9d526a..4a02e921f47 100644 --- a/pkgs/tools/misc/goaccess/default.nix +++ b/pkgs/tools/misc/goaccess/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, ncurses, glib, libmaxminddb, fetchpatch }: +{ lib, stdenv, fetchurl, pkg-config, ncurses, glib, libmaxminddb, fetchpatch }: stdenv.mkDerivation rec { version = "1.4"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "--enable-utf8" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libmaxminddb ncurses @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { meta = { description = "Real-time web log analyzer and interactive viewer that runs in a terminal in *nix systems"; homepage = "https://goaccess.io"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - maintainers = with stdenv.lib.maintainers; [ ederoyd46 ]; + license = lib.licenses.mit; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + maintainers = with lib.maintainers; [ ederoyd46 ]; }; } diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix index 58a7ce619c5..6611b3e9210 100644 --- a/pkgs/tools/misc/goreleaser/default.nix +++ b/pkgs/tools/misc/goreleaser/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "goreleaser"; - version = "0.149.0"; + version = "0.155.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "14yvxnl2ap1hizpk3pfzlh36399df1z2zgsc63qdh1h4ixyav6cy"; + sha256 = "sha256-wVHBcxbrU6WvBAegQYDRDvLbuoU49/Cm19ujghNyi2A="; }; - vendorSha256 = "17l15z2wyxzh7h7hvb1fysdnyg8wr8ww827vvmki73s1plfgr80d"; + vendorSha256 = "sha256-k4TphR8z3DtoqJm6o6QILvQ1rHIldi1BpQJbEyWKv9U="; buildFlagsArray = [ "-ldflags=" diff --git a/pkgs/tools/misc/gosu/default.nix b/pkgs/tools/misc/gosu/default.nix index bd53529a5d2..033883ab1c8 100644 --- a/pkgs/tools/misc/gosu/default.nix +++ b/pkgs/tools/misc/gosu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "gosu"; @@ -18,7 +18,7 @@ buildGoPackage rec { meta = { description= "Tool that avoids TTY and signal-forwarding behavior of sudo and su"; homepage = "https://github.com/tianon/gosu"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index b8d227df5e0..3b63d7c0203 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchurl, intltool, gettext, makeWrapper, coreutils, gnused, gnome3 -, gnugrep, parted, glib, libuuid, pkgconfig, gtkmm3, libxml2 +, gnugrep, parted, glib, libuuid, pkg-config, gtkmm3, libxml2 , gpart, hdparm, procps, util-linux, polkit, wrapGAppsHook, substituteAll }: stdenv.mkDerivation rec { - name = "gparted-1.1.0"; + name = "gparted-1.2.0"; src = fetchurl { url = "mirror://sourceforge/gparted/${name}.tar.gz"; - sha256 = "092rgwjh1825fal6v3yafq2wr0i61hh0a2n0j4296zn0zdx7pzp2"; + sha256 = "sha256-bJBxXSVNen7AIIspAHtkFg3Z+330xKp/jsLJ0jEUxxk="; }; # Tries to run `pkexec --version` to get version. @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-doc" ]; buildInputs = [ parted glib libuuid gtkmm3 libxml2 polkit.bin gnome3.adwaita-icon-theme ]; - nativeBuildInputs = [ intltool gettext pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ intltool gettext pkg-config wrapGAppsHook ]; preFixup = '' gappsWrapperArgs+=( - --prefix PATH : "${stdenv.lib.makeBinPath [ gpart hdparm util-linux procps coreutils gnused gnugrep ]}" + --prefix PATH : "${lib.makeBinPath [ gpart hdparm util-linux procps coreutils gnused gnugrep ]}" ) ''; diff --git a/pkgs/tools/misc/graylog/plugins.nix b/pkgs/tools/misc/graylog/plugins.nix index 5a9b692b1b8..0355fe58f48 100644 --- a/pkgs/tools/misc/graylog/plugins.nix +++ b/pkgs/tools/misc/graylog/plugins.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, fetchurl, unzip, graylog }: +{ pkgs, lib, stdenv, fetchurl, unzip, graylog }: with pkgs.lib; @@ -77,7 +77,7 @@ in { meta = { homepage = "https://docs.graylog.org/en/3.3/pages/integrations.html#enterprise"; description = "Integrations are tools that help Graylog work with external systems (unfree enterprise integrations)"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; }; }; filter-messagesize = glPlugin rec { diff --git a/pkgs/tools/misc/grc/default.nix b/pkgs/tools/misc/grc/default.nix index 3188dcdafbf..8fe35012090 100644 --- a/pkgs/tools/misc/grc/default.nix +++ b/pkgs/tools/misc/grc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { pname = "grc"; diff --git a/pkgs/tools/misc/grex/default.nix b/pkgs/tools/misc/grex/default.nix index 31306fd7aa4..fca9cecc01c 100644 --- a/pkgs/tools/misc/grex/default.nix +++ b/pkgs/tools/misc/grex/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1viph7ki6f2akc5mpbgycacndmxnv088ybfji2bfdbi5jnpyavvs"; }; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; doInstallCheck = true; installCheckPhase = '' diff --git a/pkgs/tools/misc/gringo/default.nix b/pkgs/tools/misc/gringo/default.nix index 9df59b1c127..ae161af488d 100644 --- a/pkgs/tools/misc/gringo/default.nix +++ b/pkgs/tools/misc/gringo/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { ./gringo-4.5.4-to_string.patch ]; - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace ./SConstruct \ --replace \ "env['CXX'] = 'g++'" \ diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 207396fb089..bc933312afc 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchgit, flex, bison, python3, autoconf, automake, gnulib, libtool -, gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2, unifont, pkgconfig +, gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2, unifont, pkg-config , fuse # only needed for grub-mount , zfs ? null , efiSupport ? false -, zfsSupport ? true +, zfsSupport ? false , xenSupport ? false }: -with stdenv.lib; +with lib; let pcSystems = { i686-linux.target = "i386"; @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ./fix-bash-completion.patch ]; - nativeBuildInputs = [ bison flex python3 pkgconfig autoconf automake ]; + nativeBuildInputs = [ bison flex python3 pkg-config autoconf automake ]; buildInputs = [ ncurses libusb-compat-0_1 freetype gettext lvm2 fuse libtool ] ++ optional doCheck qemu ++ optional zfsSupport zfs; diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix index a7233d5c4b1..6d747bf8c6e 100644 --- a/pkgs/tools/misc/grub/default.nix +++ b/pkgs/tools/misc/grub/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { # grub-install isn't smart enough. ./symlink.patch ] - ++ (stdenv.lib.optional buggyBiosCDSupport ./buggybios.patch) + ++ (lib.optional buggyBiosCDSupport ./buggybios.patch) ++ map fetchurl (import ./grub1.patches.nix) ; diff --git a/pkgs/tools/misc/grub/pvgrub_image/default.nix b/pkgs/tools/misc/grub/pvgrub_image/default.nix index ec5d0ff1295..d6aba812405 100644 --- a/pkgs/tools/misc/grub/pvgrub_image/default.nix +++ b/pkgs/tools/misc/grub/pvgrub_image/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, grub2_xen }: -with stdenv.lib; +with lib; let efiSystemsBuild = { i686-linux.target = "i386"; diff --git a/pkgs/tools/misc/grub/trusted.nix b/pkgs/tools/misc/grub/trusted.nix index 7a2454cd7b5..b0a8c9e1033 100644 --- a/pkgs/tools/misc/grub/trusted.nix +++ b/pkgs/tools/misc/grub/trusted.nix @@ -3,7 +3,7 @@ , for_HP_laptop ? false }: -with stdenv.lib; +with lib; let pcSystems = { i686-linux.target = "i386"; diff --git a/pkgs/tools/misc/gsmartcontrol/default.nix b/pkgs/tools/misc/gsmartcontrol/default.nix index 2e85448bde8..2dffada9fe7 100644 --- a/pkgs/tools/misc/gsmartcontrol/default.nix +++ b/pkgs/tools/misc/gsmartcontrol/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, smartmontools, autoreconfHook, gettext, gtkmm3, pkgconfig, wrapGAppsHook, pcre-cpp, gnome3 }: +{ fetchurl, lib, stdenv, smartmontools, autoreconfHook, gettext, gtkmm3, pkg-config, wrapGAppsHook, pcre-cpp, gnome3 }: stdenv.mkDerivation rec { version="1.1.3"; @@ -13,14 +13,14 @@ stdenv.mkDerivation rec { ./fix-paths.patch ]; - nativeBuildInputs = [ autoreconfHook gettext pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ autoreconfHook gettext pkg-config wrapGAppsHook ]; buildInputs = [ gtkmm3 pcre-cpp gnome3.adwaita-icon-theme ]; enableParallelBuilding = true; preFixup = '' gappsWrapperArgs+=( - --prefix PATH : "${stdenv.lib.makeBinPath [ smartmontools ]}" + --prefix PATH : "${lib.makeBinPath [ smartmontools ]}" ) ''; @@ -36,8 +36,8 @@ stdenv.mkDerivation rec { as well as run various tests on it. ''; homepage = "https://gsmartcontrol.sourceforge.io/"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [qknight]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [qknight]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/tools/misc/hacksaw/default.nix b/pkgs/tools/misc/hacksaw/default.nix index a0e884e82d9..419cff20087 100644 --- a/pkgs/tools/misc/hacksaw/default.nix +++ b/pkgs/tools/misc/hacksaw/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchCrate, rustPlatform, pkg-config, libXrandr, libX11, python3 }: +{ lib, fetchCrate, rustPlatform, pkg-config, libXrandr, libX11, python3 }: rustPlatform.buildRustPackage rec { pname = "hacksaw"; diff --git a/pkgs/tools/misc/hashit/default.nix b/pkgs/tools/misc/hashit/default.nix index 36b1770791b..edda48bdc92 100644 --- a/pkgs/tools/misc/hashit/default.nix +++ b/pkgs/tools/misc/hashit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, nix-update-script, meson, ninja, pkgconfig, vala, pantheon, python3, libgee, gtk3, desktop-file-utils, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitHub, nix-update-script, meson, ninja, pkg-config, vala, pantheon, python3, libgee, gtk3, desktop-file-utils, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "hashit"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meson ninja vala - pkgconfig + pkg-config python3 wrapGAppsHook ]; diff --git a/pkgs/tools/misc/haste-client/Gemfile b/pkgs/tools/misc/haste-client/Gemfile new file mode 100644 index 00000000000..06dd69c0179 --- /dev/null +++ b/pkgs/tools/misc/haste-client/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'haste' diff --git a/pkgs/tools/misc/haste-client/Gemfile.lock b/pkgs/tools/misc/haste-client/Gemfile.lock new file mode 100644 index 00000000000..3f395ed9ef8 --- /dev/null +++ b/pkgs/tools/misc/haste-client/Gemfile.lock @@ -0,0 +1,19 @@ +GEM + remote: https://rubygems.org/ + specs: + faraday (0.17.3) + multipart-post (>= 1.2, < 3) + haste (0.2.3) + faraday (~> 0.9) + json + json (2.5.1) + multipart-post (2.1.1) + +PLATFORMS + ruby + +DEPENDENCIES + haste + +BUNDLED WITH + 2.1.4 diff --git a/pkgs/tools/misc/haste-client/default.nix b/pkgs/tools/misc/haste-client/default.nix new file mode 100644 index 00000000000..0005e94fe05 --- /dev/null +++ b/pkgs/tools/misc/haste-client/default.nix @@ -0,0 +1,19 @@ +{ lib +, bundlerApp +, buildRubyGem +, ruby +}: + +bundlerApp rec { + pname = "haste"; + gemdir = ./.; + exes = [ "haste" ]; + + meta = with lib; { + description = "Command line interface to the AnyStyle Parser and Finder"; + homepage = "https://rubygems.org/gems/haste"; + license = licenses.mit; + maintainers = with maintainers; [ shamilton ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/misc/haste-client/gemset.nix b/pkgs/tools/misc/haste-client/gemset.nix new file mode 100644 index 00000000000..e6cbbff11aa --- /dev/null +++ b/pkgs/tools/misc/haste-client/gemset.nix @@ -0,0 +1,491 @@ +{ + faraday = { + dependencies = ["multipart-post"]; + groups = ["default"]; + platforms = [{ + engine = "maglev"; + } { + engine = "maglev"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "rbx"; + } { + engine = "rbx"; + } { + engine = "rbx"; + version = "1.8"; + } { + engine = "rbx"; + version = "1.9"; + } { + engine = "rbx"; + version = "2.0"; + } { + engine = "rbx"; + version = "2.1"; + } { + engine = "rbx"; + version = "2.2"; + } { + engine = "rbx"; + version = "2.3"; + } { + engine = "rbx"; + version = "2.4"; + } { + engine = "rbx"; + version = "2.5"; + } { + engine = "rbx"; + version = "2.6"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.6"; + } { + engine = "ruby"; + version = "2.6"; + }]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13aghksmni2sl15y7wfpx6k5l3lfd8j9gdyqi6cbw6jgc7bqyyn2"; + type = "gem"; + }; + version = "0.17.3"; + }; + haste = { + dependencies = ["faraday" "json"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jaq0kvlxwvd0jq9pl707saqnaaal3dis13mqwfjbj121gr4hq4q"; + type = "gem"; + }; + version = "0.2.3"; + }; + json = { + groups = ["default"]; + platforms = [{ + engine = "maglev"; + } { + engine = "maglev"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "rbx"; + } { + engine = "rbx"; + } { + engine = "rbx"; + version = "1.8"; + } { + engine = "rbx"; + version = "1.9"; + } { + engine = "rbx"; + version = "2.0"; + } { + engine = "rbx"; + version = "2.1"; + } { + engine = "rbx"; + version = "2.2"; + } { + engine = "rbx"; + version = "2.3"; + } { + engine = "rbx"; + version = "2.4"; + } { + engine = "rbx"; + version = "2.5"; + } { + engine = "rbx"; + version = "2.6"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.6"; + } { + engine = "ruby"; + version = "2.6"; + }]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci"; + type = "gem"; + }; + version = "2.5.1"; + }; + multipart-post = { + groups = ["default"]; + platforms = [{ + engine = "maglev"; + } { + engine = "maglev"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "rbx"; + } { + engine = "rbx"; + } { + engine = "rbx"; + version = "1.8"; + } { + engine = "rbx"; + version = "1.9"; + } { + engine = "rbx"; + version = "2.0"; + } { + engine = "rbx"; + version = "2.1"; + } { + engine = "rbx"; + version = "2.2"; + } { + engine = "rbx"; + version = "2.3"; + } { + engine = "rbx"; + version = "2.4"; + } { + engine = "rbx"; + version = "2.5"; + } { + engine = "rbx"; + version = "2.6"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.6"; + } { + engine = "ruby"; + version = "2.6"; + }]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj"; + type = "gem"; + }; + version = "2.1.1"; + }; +} diff --git a/pkgs/tools/misc/hddtemp/default.nix b/pkgs/tools/misc/hddtemp/default.nix index de57b253990..3939d60144d 100644 --- a/pkgs/tools/misc/hddtemp/default.nix +++ b/pkgs/tools/misc/hddtemp/default.nix @@ -1,32 +1,38 @@ { lib, stdenv, fetchurl }: - -stdenv.mkDerivation { - name = "hddtemp-0.3_beta15"; - - db = fetchurl{ +let + db = fetchurl { url = "mirror://savannah/hddtemp/hddtemp.db"; sha256 = "1fr6qgns6qv7cr40lic5yqwkkc7yjmmgx8j0z6d93csg3smzhhya"; }; +in +stdenv.mkDerivation rec { + pname = "hddtemp"; + version = "0.3-beta15"; + src = fetchurl { - url = "mirror://savannah/hddtemp/hddtemp-0.3-beta15.tar.bz2"; - sha256 = "0nzgg4nl8zm9023wp4dg007z6x3ir60rwbcapr9ks2al81c431b1"; + url = "mirror://savannah/hddtemp/hddtemp-${version}.tar.bz2"; + sha256 = "sha256-YYVBWEBUCT1TvootnoHJcXTzDwCvkcuHAKl+RC1571s="; }; # from Gentoo patches = [ ./byteswap.patch ./dontwake.patch ./execinfo.patch ./satacmds.patch ]; - configurePhase = - '' - mkdir -p $out/nix-support - cp $db $out/nix-support/hddtemp.db - ./configure --prefix=$out --with-db-path=$out/nix-support/hddtemp.db - ''; + configureFlags = [ + "--with-db-path=${placeholder "out"}/share/${pname}/hddtemp.db" + ]; + + postInstall = '' + install -Dm444 ${db} $out/share/${pname}/hddtemp.db + ''; + + enableParallelBuilding = true; meta = with lib; { description = "Tool for displaying hard disk temperature"; homepage = "https://savannah.nongnu.org/projects/hddtemp/"; license = licenses.gpl2Plus; + maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/hdf4/default.nix b/pkgs/tools/misc/hdf4/default.nix index caf7ceb49ee..d127bc25c3c 100644 --- a/pkgs/tools/misc/hdf4/default.nix +++ b/pkgs/tools/misc/hdf4/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; @@ -52,16 +52,16 @@ stdenv.mkDerivation rec { libjpeg szip zlib - ] ++ stdenv.lib.optionals uselibtirpc [ + ] ++ lib.optionals uselibtirpc [ libtirpc ]; - preConfigure = stdenv.lib.optionalString uselibtirpc '' + preConfigure = lib.optionalString uselibtirpc '' # Make tirpc discovery work with CMAKE_PREFIX_PATH substituteInPlace config/cmake/FindXDR.cmake \ --replace 'find_path(XDR_INCLUDE_DIR NAMES rpc/types.h PATHS "/usr/include" "/usr/include/tirpc")' \ 'find_path(XDR_INCLUDE_DIR NAMES rpc/types.h PATH_SUFFIXES include/tirpc)' - '' + stdenv.lib.optionalString (szip != null) '' + '' + lib.optionalString (szip != null) '' export SZIP_INSTALL=${szip} ''; @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { "-DHDF4_ENABLE_Z_LIB_SUPPORT=ON" "-DHDF4_BUILD_FORTRAN=OFF" "-DJPEG_DIR=${libjpeg}" - ] ++ stdenv.lib.optionals (szip != null) [ + ] ++ lib.optionals (szip != null) [ "-DHDF4_ENABLE_SZIP_ENCODING=ON" "-DHDF4_ENABLE_SZIP_SUPPORT=ON" ]; @@ -84,11 +84,11 @@ stdenv.mkDerivation rec { preCheck = '' export LD_LIBRARY_PATH=$(pwd)/bin - '' + stdenv.lib.optionalString (stdenv.isDarwin) '' + '' + lib.optionalString (stdenv.isDarwin) '' export DYLD_LIBRARY_PATH=$(pwd)/bin ''; - excludedTests = stdenv.lib.optionals stdenv.isDarwin [ + excludedTests = lib.optionals stdenv.isDarwin [ "MFHDF_TEST-hdftest" "MFHDF_TEST-hdftest-shared" "HDP-dumpsds-18" @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { ]; checkPhase = let excludedTestsRegex = if (excludedTests != []) - then "(" + (stdenv.lib.concatStringsSep "|" excludedTests) + ")" + then "(" + (lib.concatStringsSep "|" excludedTests) + ")" else ""; in '' runHook preCheck ctest -E "${excludedTestsRegex}" --output-on-failure diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index 891fadac12a..fc7bb635040 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -1,19 +1,20 @@ -{ stdenv +{ lib, stdenv , fetchurl , removeReferencesTo , cpp ? false , gfortran ? null , zlib ? null , szip ? null -, mpi ? null +, mpiSupport ? false +, mpi , enableShared ? !stdenv.hostPlatform.isStatic }: # cpp and mpi options are mutually exclusive # (--enable-unsupported could be used to force the build) -assert !cpp || mpi == null; +assert !cpp || !mpiSupport; -let inherit (stdenv.lib) optional optionals; in +let inherit (lib) optional optionals; in stdenv.mkDerivation rec { version = "1.10.6"; @@ -24,7 +25,7 @@ stdenv.mkDerivation rec { }; passthru = { - mpiSupport = (mpi != null); + inherit mpiSupport; inherit mpi; }; @@ -38,13 +39,13 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [] ++ optional (zlib != null) zlib - ++ optional (mpi != null) mpi; + ++ optional mpiSupport mpi; configureFlags = [] ++ optional cpp "--enable-cxx" ++ optional (gfortran != null) "--enable-fortran" ++ optional (szip != null) "--with-szlib=${szip}" - ++ optionals (mpi != null) ["--enable-parallel" "CC=${mpi}/bin/mpicc"] + ++ optionals mpiSupport ["--enable-parallel" "CC=${mpi}/bin/mpicc"] ++ optional enableShared "--enable-shared"; patches = [ @@ -67,8 +68,8 @@ stdenv.mkDerivation rec { applications to evolve in their use of HDF5. The HDF5 Technology suite includes tools and applications for managing, manipulating, viewing, and analyzing data in the HDF5 format. ''; - license = stdenv.lib.licenses.bsd3; # Lawrence Berkeley National Labs BSD 3-Clause variant + license = lib.licenses.bsd3; # Lawrence Berkeley National Labs BSD 3-Clause variant homepage = "https://www.hdfgroup.org/HDF5/"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/hdfjava/default.nix b/pkgs/tools/misc/hdfjava/default.nix index 7ee84399831..70a2f091116 100644 --- a/pkgs/tools/misc/hdfjava/default.nix +++ b/pkgs/tools/misc/hdfjava/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, javac }: +{ lib, stdenv, fetchurl, cmake, javac }: stdenv.mkDerivation rec { pname = "hdf-java"; @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { meta = { description = "A Java package that implements HDF4 and HDF5 data objects in an object-oriented form"; - license = stdenv.lib.licenses.free; # BSD-like + license = lib.licenses.free; # BSD-like homepage = "https://support.hdfgroup.org/products/java/index.html"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/hdfview/default.nix b/pkgs/tools/misc/hdfview/default.nix index 0125bfa7369..dc13bb52791 100644 --- a/pkgs/tools/misc/hdfview/default.nix +++ b/pkgs/tools/misc/hdfview/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ant, javac, hdf_java }: +{ lib, stdenv, fetchurl, ant, javac, hdf_java }: stdenv.mkDerivation rec { pname = "hdfview"; @@ -32,8 +32,8 @@ stdenv.mkDerivation rec { meta = { description = "A visual tool for browsing and editing HDF4 and HDF5 files"; - license = stdenv.lib.licenses.free; # BSD-like + license = lib.licenses.free; # BSD-like homepage = "https://support.hdfgroup.org/products/java/index.html"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/heatseeker/default.nix b/pkgs/tools/misc/heatseeker/default.nix index 13933c6c28a..9d50530df47 100644 --- a/pkgs/tools/misc/heatseeker/default.nix +++ b/pkgs/tools/misc/heatseeker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, coreutils }: +{ lib, fetchFromGitHub, rustPlatform, coreutils }: rustPlatform.buildRustPackage rec { pname = "heatseeker"; diff --git a/pkgs/tools/misc/hebcal/default.nix b/pkgs/tools/misc/hebcal/default.nix index e7a9ccd6358..050cc63f6a5 100644 --- a/pkgs/tools/misc/hebcal/default.nix +++ b/pkgs/tools/misc/hebcal/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - version = "4.22"; + version = "4.24"; pname = "hebcal"; src = fetchFromGitHub { owner = "hebcal"; repo = "hebcal"; rev = "v${version}"; - sha256 = "0bm29n51qi9q4vx4qsz3l9l1wvpvsk138zixfl5f5yz4kngzbx24"; + sha256 = "sha256-iWp2S3s8z/y4dZ66Ogqu7Yf4gTUvSS1J5F7d0ifRbcY="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/misc/heimdall/default.nix b/pkgs/tools/misc/heimdall/default.nix index bbc07141e1a..41b6adb7bfa 100644 --- a/pkgs/tools/misc/heimdall/default.nix +++ b/pkgs/tools/misc/heimdall/default.nix @@ -16,7 +16,7 @@ mkDerivation { buildInputs = [ zlib libusb1 - ] ++ stdenv.lib.optional enableGUI qtbase; + ] ++ lib.optional enableGUI qtbase; nativeBuildInputs = [ cmake ]; cmakeFlags = [ @@ -27,7 +27,7 @@ mkDerivation { preConfigure = '' # Give ownership of the Galaxy S USB device to the logged in user. substituteInPlace heimdall/60-heimdall.rules --replace 'MODE="0666"' 'TAG+="uaccess"' - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' substituteInPlace libpit/CMakeLists.txt --replace "-std=gnu++11" "" ''; diff --git a/pkgs/tools/misc/hexd/default.nix b/pkgs/tools/misc/hexd/default.nix index 0c0c56c5271..467e85128b8 100644 --- a/pkgs/tools/misc/hexd/default.nix +++ b/pkgs/tools/misc/hexd/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "hexd"; diff --git a/pkgs/tools/misc/hexyl/default.nix b/pkgs/tools/misc/hexyl/default.nix index e75d0105731..d825368cb97 100644 --- a/pkgs/tools/misc/hexyl/default.nix +++ b/pkgs/tools/misc/hexyl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "hexyl"; diff --git a/pkgs/tools/misc/hhpc/default.nix b/pkgs/tools/misc/hhpc/default.nix index 78e45aa4cd0..5f02121e59f 100644 --- a/pkgs/tools/misc/hhpc/default.nix +++ b/pkgs/tools/misc/hhpc/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchFromGitHub, xorg, pkgconfig}: +{lib, stdenv, fetchFromGitHub, xorg, pkg-config}: stdenv.mkDerivation rec { pname = "hhpc"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1djsw1r38mh6zx0rbyn2cfa931hyddib4fl3i27c4z7xinl709ss"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorg.libX11 ]; installPhase = '' @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { description = "Hides the mouse pointer in X11"; maintainers = with maintainers; [ nico202 ]; platforms = platforms.unix; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }; } diff --git a/pkgs/tools/misc/homesick/gemset.nix b/pkgs/tools/misc/homesick/gemset.nix index f5144827680..4a01696c2c7 100644 --- a/pkgs/tools/misc/homesick/gemset.nix +++ b/pkgs/tools/misc/homesick/gemset.nix @@ -16,4 +16,4 @@ }; version = "0.20.0"; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/misc/hpcg/default.nix b/pkgs/tools/misc/hpcg/default.nix index 29799641880..d6896527ad2 100644 --- a/pkgs/tools/misc/hpcg/default.nix +++ b/pkgs/tools/misc/hpcg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openmpi } : +{ lib, stdenv, fetchurl, mpi } : stdenv.mkDerivation rec { pname = "hpcg"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ openmpi ]; + buildInputs = [ mpi ]; makeFlags = [ "arch=Linux_MPI" ]; diff --git a/pkgs/tools/misc/html-proofer/gemset.nix b/pkgs/tools/misc/html-proofer/gemset.nix index d6801512ca4..92ce4b8bf82 100644 --- a/pkgs/tools/misc/html-proofer/gemset.nix +++ b/pkgs/tools/misc/html-proofer/gemset.nix @@ -135,4 +135,4 @@ }; version = "2.2.2"; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/misc/hyperfine/default.nix b/pkgs/tools/misc/hyperfine/default.nix index fe39230a214..39999677b11 100644 --- a/pkgs/tools/misc/hyperfine/default.nix +++ b/pkgs/tools/misc/hyperfine/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "12qdllhydd29xh20l5gir6qpj4a1nkzp8ics344rcwj8wsj7g5zw"; nativeBuildInputs = [ installShellFiles ]; - buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.isDarwin Security; postInstall = '' installManPage doc/hyperfine.1 diff --git a/pkgs/tools/misc/hyperledger-fabric/default.nix b/pkgs/tools/misc/hyperledger-fabric/default.nix index 13a88dcba30..9f7fa31d3f2 100644 --- a/pkgs/tools/misc/hyperledger-fabric/default.nix +++ b/pkgs/tools/misc/hyperledger-fabric/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "hyperledger-fabric"; diff --git a/pkgs/tools/misc/i3cat/default.nix b/pkgs/tools/misc/i3cat/default.nix index bc934c424f3..e91b17856ed 100644 --- a/pkgs/tools/misc/i3cat/default.nix +++ b/pkgs/tools/misc/i3cat/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "i3cat"; - version = "20150321-${stdenv.lib.strings.substring 0 7 rev}"; + version = "20150321-${lib.strings.substring 0 7 rev}"; rev = "b9ba886a7c769994ccd8d4627978ef4b51fcf576"; goPackagePath = "github.com/vincent-petithory/i3cat"; diff --git a/pkgs/tools/misc/i3minator/default.nix b/pkgs/tools/misc/i3minator/default.nix index f749ea677bc..6e207ce6916 100644 --- a/pkgs/tools/misc/i3minator/default.nix +++ b/pkgs/tools/misc/i3minator/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pythonPackages, glibcLocales }: +{ lib, fetchFromGitHub, pythonPackages, glibcLocales }: pythonPackages.buildPythonApplication rec { pname = "i3minator"; @@ -26,9 +26,9 @@ pythonPackages.buildPythonApplication rec { project is inspired by tmuxinator and uses i3-py. ''; homepage = "https://github.com/carlesso/i3minator"; - license = stdenv.lib.licenses.wtfpl; + license = lib.licenses.wtfpl; maintainers = with maintainers; [ domenkozar ]; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/i3nator/default.nix b/pkgs/tools/misc/i3nator/default.nix new file mode 100644 index 00000000000..a6d78d3c4c9 --- /dev/null +++ b/pkgs/tools/misc/i3nator/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "i3nator"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "pitkley"; + repo = pname; + rev = version; + sha256 = "10rxvxq48dhzlw5p9fsj6x0ci4pap85s9b192zakgvk4h97ifp2p"; + }; + + cargoSha256 = "1i58ix414klm72562scqhb0lmy4wgpiksriz5qs4ss7lzvqdsizy"; + + meta = with lib; { + description = "Tmuxinator for the i3 window manager"; + homepage = "https://github.com/pitkley/i3nator"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ mpoquet ]; + }; +} diff --git a/pkgs/tools/misc/ical2org/default.nix b/pkgs/tools/misc/ical2org/default.nix index 58afffcd706..78f40974ace 100644 --- a/pkgs/tools/misc/ical2org/default.nix +++ b/pkgs/tools/misc/ical2org/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoPackage}: +{ lib, fetchFromGitHub, buildGoPackage}: buildGoPackage rec { pname = "ical2org"; diff --git a/pkgs/tools/misc/ideviceinstaller/default.nix b/pkgs/tools/misc/ideviceinstaller/default.nix index 9d1857c1136..f25c2eb62f6 100644 --- a/pkgs/tools/misc/ideviceinstaller/default.nix +++ b/pkgs/tools/misc/ideviceinstaller/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, usbmuxd, libzip, libimobiledevice }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, usbmuxd, libzip, libimobiledevice }: stdenv.mkDerivation rec { pname = "ideviceinstaller"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1xp0sjgfx2z19x9mxihn18ybsmrnrcfc55zbh5a44g3vrmagmlzz"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig usbmuxd libimobiledevice libzip ]; + nativeBuildInputs = [ autoreconfHook pkg-config usbmuxd libimobiledevice libzip ]; meta = with lib; { homepage = "https://github.com/libimobiledevice/ideviceinstaller"; diff --git a/pkgs/tools/misc/idevicerestore/default.nix b/pkgs/tools/misc/idevicerestore/default.nix index 5072d2d9b98..3e4739ee032 100644 --- a/pkgs/tools/misc/idevicerestore/default.nix +++ b/pkgs/tools/misc/idevicerestore/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config , curl , libimobiledevice , libirecovery @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config ]; buildInputs = [ @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { # Not listing other dependencies specified in # https://github.com/libimobiledevice/idevicerestore/blob/8a882038b2b1e022fbd19eaf8bea51006a373c06/README#L20 # because they are inherited `libimobiledevice`. - ] ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit ]; + ] ++ lib.optionals stdenv.isDarwin [ IOKit ]; meta = with lib; { homepage = "https://github.com/libimobiledevice/idevicerestore"; diff --git a/pkgs/tools/misc/idutils/default.nix b/pkgs/tools/misc/idutils/default.nix index 9afb9279134..ac64fe9e8bc 100644 --- a/pkgs/tools/misc/idutils/default.nix +++ b/pkgs/tools/misc/idutils/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, emacs }: +{ fetchurl, lib, stdenv, emacs }: stdenv.mkDerivation rec { name = "idutils-4.6"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sed -i '/gets is a security hole/d' lib/stdio.in.h ''; - buildInputs = stdenv.lib.optional stdenv.isLinux emacs; + buildInputs = lib.optional stdenv.isLinux emacs; doCheck = !stdenv.isDarwin; @@ -46,10 +46,10 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.gnu.org/software/idutils/"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; broken = true; }; } diff --git a/pkgs/tools/misc/intermodal/default.nix b/pkgs/tools/misc/intermodal/default.nix index ca1c58d465a..2b187b65760 100644 --- a/pkgs/tools/misc/intermodal/default.nix +++ b/pkgs/tools/misc/intermodal/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0kf5afarfwcl47b40pwnslfvxmxllmb995vc5ls2lpz4cx0jwahn"; # include_hidden test tries to use `chflags` on darwin - checkFlagsArray = stdenv.lib.optionals stdenv.isDarwin [ "--skip=subcommand::torrent::create::tests::include_hidden" ]; + checkFlagsArray = lib.optionals stdenv.isDarwin [ "--skip=subcommand::torrent::create::tests::include_hidden" ]; meta = with lib; { description = "User-friendly and featureful command-line BitTorrent metainfo utility"; diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix index beb6f0e708b..641e86c22c4 100644 --- a/pkgs/tools/misc/ipxe/default.nix +++ b/pkgs/tools/misc/ipxe/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; + meta = with lib; { description = "Network boot firmware"; homepage = "https://ipxe.org/"; license = licenses.gpl2; diff --git a/pkgs/tools/misc/ised/default.nix b/pkgs/tools/misc/ised/default.nix index 3529324b30a..9032a2d2451 100644 --- a/pkgs/tools/misc/ised/default.nix +++ b/pkgs/tools/misc/ised/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "ised"; @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { meta = { description = "A numeric sequence editor"; - maintainers = with stdenv.lib.maintainers; [ raskin ]; - platforms = with stdenv.lib.platforms; linux; - license = stdenv.lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ raskin ]; + platforms = with lib.platforms; linux; + license = lib.licenses.gpl3Plus; }; } diff --git a/pkgs/tools/misc/ix/default.nix b/pkgs/tools/misc/ix/default.nix index bf298090f3f..ed47e477854 100644 --- a/pkgs/tools/misc/ix/default.nix +++ b/pkgs/tools/misc/ix/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { ''; postFixup = '' - wrapProgram $out/bin/ix --prefix PATH : "${stdenv.lib.makeBinPath [ curl ]}" + wrapProgram $out/bin/ix --prefix PATH : "${lib.makeBinPath [ curl ]}" ''; meta = with lib; { diff --git a/pkgs/tools/misc/jdupes/default.nix b/pkgs/tools/misc/jdupes/default.nix index c55c0879e5d..4f13d0a17af 100644 --- a/pkgs/tools/misc/jdupes/default.nix +++ b/pkgs/tools/misc/jdupes/default.nix @@ -19,10 +19,10 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" - ] ++ stdenv.lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ "ENABLE_DEDUPE=1" "STATIC_DEDUPE_H=1" - ] ++ stdenv.lib.optionals stdenv.cc.isGNU [ + ] ++ lib.optionals stdenv.cc.isGNU [ "HARDEN=1" ]; diff --git a/pkgs/tools/misc/journaldriver/default.nix b/pkgs/tools/misc/journaldriver/default.nix index 77df7ab6908..70460d86fc9 100644 --- a/pkgs/tools/misc/journaldriver/default.nix +++ b/pkgs/tools/misc/journaldriver/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rustPlatform, pkgconfig, openssl, systemd }: +{ lib, fetchFromGitHub, rustPlatform, pkg-config, openssl, systemd }: rustPlatform.buildRustPackage rec { pname = "journaldriver"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { }; buildInputs = [ openssl systemd ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = with lib; { description = "Log forwarder from journald to Stackdriver Logging"; diff --git a/pkgs/tools/misc/kargo/default.nix b/pkgs/tools/misc/kargo/default.nix index 00bf9403427..8c24848f4b5 100644 --- a/pkgs/tools/misc/kargo/default.nix +++ b/pkgs/tools/misc/kargo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python3Packages }: +{ lib, fetchurl, python3Packages }: with python3Packages; diff --git a/pkgs/tools/misc/kcollectd/default.nix b/pkgs/tools/misc/kcollectd/default.nix index ffc64b1455a..e38cb6f5a79 100644 --- a/pkgs/tools/misc/kcollectd/default.nix +++ b/pkgs/tools/misc/kcollectd/default.nix @@ -18,12 +18,12 @@ mkDerivation rec { pname = "kcollectd"; - version = "0.11.99.0"; + version = "0.12.0"; src = fetchFromGitLab { owner = "aerusso"; repo = pname; rev = "v${version}"; - sha256 = "0h4ymvzihzbmyv3z0bp28g94wxc6c7lgi3my0xbka3advxr811gn"; + sha256 = "sha256-Ihd4Ps4t9+sNB3joO3vTxDR/25t7Ecl6yvHQ15QiUdY="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/keychain/default.nix b/pkgs/tools/misc/keychain/default.nix index a65d408fa6b..49b3ffbb7dd 100644 --- a/pkgs/tools/misc/keychain/default.nix +++ b/pkgs/tools/misc/keychain/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, coreutils, openssh, gnupg +{ lib, stdenv, fetchFromGitHub, makeWrapper, coreutils, openssh, gnupg , perl, procps, gnugrep, gawk, findutils, gnused }: stdenv.mkDerivation rec { @@ -32,23 +32,23 @@ stdenv.mkDerivation rec { meta = { description = "Keychain management tool"; homepage = "https://www.funtoo.org/Keychain"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; # other platforms are untested (AFAIK) platforms = - with stdenv.lib; + with lib; platforms.linux ++ platforms.darwin; - maintainers = with stdenv.lib.maintainers; [ sigma ]; + maintainers = with lib.maintainers; [ sigma ]; longDescription = '' - Keychain helps you to manage SSH and GPG keys in a convenient and secure - manner. It acts as a frontend to ssh-agent and ssh-add, but allows you - to easily have one long running ssh-agent process per system, rather - than the norm of one ssh-agent per login session. + Keychain helps you to manage SSH and GPG keys in a convenient and secure + manner. It acts as a frontend to ssh-agent and ssh-add, but allows you + to easily have one long running ssh-agent process per system, rather + than the norm of one ssh-agent per login session. - This dramatically reduces the number of times you need to enter your - passphrase. With keychain, you only need to enter a passphrase once - every time your local machine is rebooted. Keychain also makes it easy - for remote cron jobs to securely "hook in" to a long-running ssh-agent - process, allowing your scripts to take advantage of key-based logins. + This dramatically reduces the number of times you need to enter your + passphrase. With keychain, you only need to enter a passphrase once + every time your local machine is rebooted. Keychain also makes it easy + for remote cron jobs to securely "hook in" to a long-running ssh-agent + process, allowing your scripts to take advantage of key-based logins. ''; }; } diff --git a/pkgs/tools/misc/kisslicer/default.nix b/pkgs/tools/misc/kisslicer/default.nix index bd112e4b876..fb69610e4ef 100644 --- a/pkgs/tools/misc/kisslicer/default.nix +++ b/pkgs/tools/misc/kisslicer/default.nix @@ -7,7 +7,7 @@ let - libPath = stdenv.lib.makeLibraryPath [ + libPath = lib.makeLibraryPath [ libGLU libGL stdenv.cc.cc libX11 diff --git a/pkgs/tools/misc/kodi-cli/default.nix b/pkgs/tools/misc/kodi-cli/default.nix index 517e195040f..56795e7c93f 100644 --- a/pkgs/tools/misc/kodi-cli/default.nix +++ b/pkgs/tools/misc/kodi-cli/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "kodi-cli"; version = "1.1.1"; - + src = fetchFromGitHub { owner = "nawar"; repo = pname; @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin cp -a kodi-cli $out/bin - wrapProgram $out/bin/kodi-cli --prefix PATH : ${stdenv.lib.makeBinPath [ curl bash ]} + wrapProgram $out/bin/kodi-cli --prefix PATH : ${lib.makeBinPath [ curl bash ]} cp -a playlist_to_kodi $out/bin - wrapProgram $out/bin/playlist_to_kodi --prefix PATH : ${stdenv.lib.makeBinPath [ curl bash gnome3.zenity jq youtube-dl ]} + wrapProgram $out/bin/playlist_to_kodi --prefix PATH : ${lib.makeBinPath [ curl bash gnome3.zenity jq youtube-dl ]} ''; - + meta = with lib; { homepage = "https://github.com/nawar/kodi-cli"; description = "Kodi/XBMC bash script to send Kodi commands using JSON RPC. It also allows sending YouTube videos to Kodi"; diff --git a/pkgs/tools/misc/kt/default.nix b/pkgs/tools/misc/kt/default.nix index 8d70b35584e..e4713890ac4 100644 --- a/pkgs/tools/misc/kt/default.nix +++ b/pkgs/tools/misc/kt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoPackage }: +{ lib, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { pname = "kt"; diff --git a/pkgs/tools/misc/latex2html/default.nix b/pkgs/tools/misc/latex2html/default.nix index 6f532533f99..5bb4f41a5de 100644 --- a/pkgs/tools/misc/latex2html/default.nix +++ b/pkgs/tools/misc/latex2html/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "latex2html"; - version = "2020.2"; + version = "2021"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1icyl6kl60wh7cavprgbd8q6lpjwr7wn24m34kpiif7ahknhcbcm"; + sha256 = "sha256-n7VbK/S9EkWxb4fbIXp3tIfX7N+9bvZ/odBylqTuzUU="; }; buildInputs = [ ghostscript netpbm perl ]; diff --git a/pkgs/tools/misc/lazydocker/default.nix b/pkgs/tools/misc/lazydocker/default.nix index ea66a04a40d..ed186772ab7 100644 --- a/pkgs/tools/misc/lazydocker/default.nix +++ b/pkgs/tools/misc/lazydocker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "lazydocker"; diff --git a/pkgs/tools/misc/lbdb/default.nix b/pkgs/tools/misc/lbdb/default.nix index 976e87ba2d8..d33cdbacb15 100644 --- a/pkgs/tools/misc/lbdb/default.nix +++ b/pkgs/tools/misc/lbdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, perl, perlPackages, finger_bsd, makeWrapper +{ lib, stdenv, fetchurl, fetchpatch, perl, perlPackages, finger_bsd, makeWrapper , abook ? null , gnupg ? null , goobook ? null @@ -9,7 +9,7 @@ let version = "0.48.1"; in -with stdenv.lib; +with lib; with perlPackages; stdenv.mkDerivation { pname = "lbdb"; diff --git a/pkgs/tools/misc/ldapvi/default.nix b/pkgs/tools/misc/ldapvi/default.nix index 9c062cf418d..9b57a295de0 100644 --- a/pkgs/tools/misc/ldapvi/default.nix +++ b/pkgs/tools/misc/ldapvi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, openldap, openssl, popt, glib, ncurses, readline, pkgconfig, cyrus_sasl, autoconf, automake }: +{ lib, stdenv, fetchgit, openldap, openssl, popt, glib, ncurses, readline, pkg-config, cyrus_sasl, autoconf, automake }: stdenv.mkDerivation { pname = "ldapvi"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "3ef3103030ecb04d7fe80180e3fd490377cf81fb2af96782323fddabc3225030"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openldap openssl popt glib ncurses readline cyrus_sasl autoconf automake ]; preConfigure = '' @@ -27,6 +27,6 @@ stdenv.mkDerivation { homepage = "http://www.lichteblau.com/ldapvi/"; license = licenses.gpl2; maintainers = with maintainers; [ domenkozar ]; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/ldmtool/default.nix b/pkgs/tools/misc/ldmtool/default.nix index 4a965cbe165..a826f3a0de5 100644 --- a/pkgs/tools/misc/ldmtool/default.nix +++ b/pkgs/tools/misc/ldmtool/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, gtk-doc, pkgconfig, libuuid, +{ lib, stdenv, fetchFromGitHub, autoconf, automake, gtk-doc, pkg-config, libuuid, libtool, readline, gobject-introspection, json-glib, lvm2, libxslt, docbook_xsl , fetchpatch }: @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { configureScript = "sh autogen.sh"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoconf automake gtk-doc lvm2 libxslt.bin libtool readline gobject-introspection json-glib libuuid ]; diff --git a/pkgs/tools/misc/less/default.nix b/pkgs/tools/misc/less/default.nix index 5fa4b339b1e..157fc6607b0 100644 --- a/pkgs/tools/misc/less/default.nix +++ b/pkgs/tools/misc/less/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; configureFlags = [ "--sysconfdir=/etc" ] # Look for ‘sysless’ in /etc. - ++ stdenv.lib.optional lessSecure [ "--with-secure" ]; + ++ lib.optional lessSecure [ "--with-secure" ]; buildInputs = [ ncurses ]; diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index c3cb3200e06..ec002ae4232 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lf"; - version = "18"; + version = "20"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; rev = "r${version}"; - sha256 = "1xzy85lz99kwzvpkkaqlylynn57nhn76dff3cxy304d23y3r26w6"; + sha256 = "056g2g503ppbqqbq5nk90sl8ki1q4fixdc25a6wv15gm1inxrb4b"; }; vendorSha256 = "12njqs39ympi2mqal1cdn0smp80yzcs8xmca1iih8pbmxv51r2gg"; diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix index 71a9233fab5..6f9c07209cf 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook , boost, libbitcoin, libbitcoin-protocol }: let @@ -15,7 +15,7 @@ in stdenv.mkDerivation { sha256 = "0a9c00f1pfi8wczbfd1djkvr7di3iw1ynak6if910w01dkhbm6v4"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; propagatedBuildInputs = [ libbitcoin libbitcoin-protocol ]; enableParallelBuilding = true; diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix index fe7290f801b..dd0ed857314 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook , boost, libbitcoin-client, libbitcoin-network }: let @@ -15,7 +15,7 @@ in stdenv.mkDerivation { sha256 = "033nrdzrha4kypxk4biixjsbjd16r4m2mjvpid4gdj5hzbbj1p93"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libbitcoin-client libbitcoin-network ]; enableParallelBuilding = true; diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix index 42f3669cad0..48dab31e9a8 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook , boost, libbitcoin, zeromq }: let @@ -15,7 +15,7 @@ in stdenv.mkDerivation { sha256 = "0vqg3i40kwmbys4lyp82xvg2nx3ik4qhc66gcm8k66a86wpj9ji6"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libbitcoin zeromq ]; enableParallelBuilding = true; diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix index 469e7e83085..1d8af4a336b 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook , boost, libbitcoin, secp256k1, zeromq }: let @@ -15,7 +15,7 @@ in stdenv.mkDerivation { sha256 = "1ln9r04hlnc7qmv17rakyhrnzw1a541pg5jc1sw3ccn90a5x6cfv"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libbitcoin secp256k1 ]; propagatedBuildInputs = [ zeromq ]; diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin.nix b/pkgs/tools/misc/libbitcoin/libbitcoin.nix index 5198676cb75..122aed696fc 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook , boost, secp256k1 }: let @@ -15,7 +15,7 @@ in stdenv.mkDerivation { sha256 = "1rppyp3zpb6ymwangjpblwf6qh4y3d1hczrjx8aavmrq7hznnrhq"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; propagatedBuildInputs = [ secp256k1 ]; diff --git a/pkgs/tools/misc/lice/default.nix b/pkgs/tools/misc/lice/default.nix index f7a8c68ed06..3322196d6ed 100644 --- a/pkgs/tools/misc/lice/default.nix +++ b/pkgs/tools/misc/lice/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonPackage rec { diff --git a/pkgs/tools/misc/linuxquota/default.nix b/pkgs/tools/misc/linuxquota/default.nix index 58c6c1d5351..729dc41a107 100644 --- a/pkgs/tools/misc/linuxquota/default.nix +++ b/pkgs/tools/misc/linuxquota/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, e2fsprogs, openldap, pkgconfig }: +{ lib, stdenv, fetchurl, e2fsprogs, openldap, pkg-config }: stdenv.mkDerivation rec { version = "4.05"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" "man" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ e2fsprogs openldap ]; meta = with lib; { diff --git a/pkgs/tools/misc/lnch/default.nix b/pkgs/tools/misc/lnch/default.nix index 377ba05eba6..8f41499ca06 100644 --- a/pkgs/tools/misc/lnch/default.nix +++ b/pkgs/tools/misc/lnch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoPackage }: +{ lib, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { pname = "lnch"; diff --git a/pkgs/tools/misc/loadlibrary/default.nix b/pkgs/tools/misc/loadlibrary/default.nix index d33f6d8610a..e6d19fc6d40 100644 --- a/pkgs/tools/misc/loadlibrary/default.nix +++ b/pkgs/tools/misc/loadlibrary/default.nix @@ -1,11 +1,11 @@ -{ cabextract, fetchFromGitHub, readline, stdenv_32bit }: +{ lib, cabextract, fetchFromGitHub, readline, stdenv_32bit }: # stdenv_32bit is needed because the program depends upon 32-bit libraries and does not have # support for 64-bit yet: it requires libc6-dev:i386, libreadline-dev:i386. stdenv_32bit.mkDerivation rec { name = "loadlibrary-${version}"; - version = "20170525-${stdenv_32bit.lib.strings.substring 0 7 rev}"; + version = "20170525-${lib.strings.substring 0 7 rev}"; rev = "721b084c088d779075405b7f20c77c2578e2a961"; src = fetchFromGitHub { inherit rev; @@ -21,7 +21,7 @@ stdenv_32bit.mkDerivation rec { cp mpclient $out/bin/ ''; - meta = with stdenv_32bit.lib; { + meta = with lib; { homepage = "https://github.com/taviso/loadlibrary"; description = "Porting Windows Dynamic Link Libraries to Linux"; platforms = platforms.linux; diff --git a/pkgs/tools/misc/lockfile-progs/default.nix b/pkgs/tools/misc/lockfile-progs/default.nix index e30b36919b7..68c2fb781f8 100644 --- a/pkgs/tools/misc/lockfile-progs/default.nix +++ b/pkgs/tools/misc/lockfile-progs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, liblockfile }: +{ lib, stdenv, fetchurl, liblockfile }: stdenv.mkDerivation rec { _name = "lockfile-progs"; @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { meta = { description = "Programs for locking and unlocking files and mailboxes"; homepage = "http://packages.debian.org/sid/lockfile-progs"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; - platforms = stdenv.lib.platforms.all; + maintainers = [ lib.maintainers.bluescreen303 ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/misc/logstash/6.x.nix b/pkgs/tools/misc/logstash/6.x.nix index 6735b5fd096..97ee5b2ed3f 100644 --- a/pkgs/tools/misc/logstash/6.x.nix +++ b/pkgs/tools/misc/logstash/6.x.nix @@ -6,7 +6,7 @@ , jre }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { version = elk6Version; diff --git a/pkgs/tools/misc/logstash/7.x.nix b/pkgs/tools/misc/logstash/7.x.nix index df661988877..0817a7ab087 100644 --- a/pkgs/tools/misc/logstash/7.x.nix +++ b/pkgs/tools/misc/logstash/7.x.nix @@ -6,7 +6,7 @@ , jre }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { version = elk7Version; diff --git a/pkgs/tools/misc/logstash/contrib.nix b/pkgs/tools/misc/logstash/contrib.nix index d4fb6532ef5..d4c88dc32ed 100644 --- a/pkgs/tools/misc/logstash/contrib.nix +++ b/pkgs/tools/misc/logstash/contrib.nix @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Community-maintained logstash plugins"; homepage = "https://github.com/elasticsearch/logstash-contrib"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; maintainers = with maintainers; [ cstrahan ]; }; } diff --git a/pkgs/tools/misc/lokalise2-cli/default.nix b/pkgs/tools/misc/lokalise2-cli/default.nix index 1b2fa9bda86..0cbf43a8790 100644 --- a/pkgs/tools/misc/lokalise2-cli/default.nix +++ b/pkgs/tools/misc/lokalise2-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "lokalise2-cli"; diff --git a/pkgs/tools/misc/lolcat/gemset.nix b/pkgs/tools/misc/lolcat/gemset.nix index 421e1874db7..9d71d400a69 100644 --- a/pkgs/tools/misc/lolcat/gemset.nix +++ b/pkgs/tools/misc/lolcat/gemset.nix @@ -40,4 +40,4 @@ }; version = "2.2.0"; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/misc/loop/default.nix b/pkgs/tools/misc/loop/default.nix index b7bd7678535..0c3e206a9f2 100644 --- a/pkgs/tools/misc/loop/default.nix +++ b/pkgs/tools/misc/loop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage { pname = "loop"; diff --git a/pkgs/tools/misc/lorri/default.nix b/pkgs/tools/misc/lorri/default.nix index d191a82853f..951cb8b5caa 100644 --- a/pkgs/tools/misc/lorri/default.nix +++ b/pkgs/tools/misc/lorri/default.nix @@ -47,7 +47,7 @@ in (rustPlatform.buildRustPackage rec { nativeBuildInputs = with pkgs; [ rustPackages.rustfmt ]; buildInputs = - stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; + lib.optionals stdenv.isDarwin [ CoreServices Security ]; # copy the docs to the $man and $doc outputs postInstall = '' diff --git a/pkgs/tools/misc/lsd/default.nix b/pkgs/tools/misc/lsd/default.nix index 239c9651b86..c3c9fab8c1e 100644 --- a/pkgs/tools/misc/lsd/default.nix +++ b/pkgs/tools/misc/lsd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , nixosTests , fetchFromGitHub , rustPlatform diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix index 2816392e18c..44cb6962b8e 100644 --- a/pkgs/tools/misc/man-db/default.nix +++ b/pkgs/tools/misc/man-db/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libpipeline, db, groff, libiconv, makeWrapper, buildPackages }: +{ lib, stdenv, fetchurl, pkg-config, libpipeline, db, groff, libiconv, makeWrapper, buildPackages }: stdenv.mkDerivation rec { name = "man-db-2.9.3"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "doc" ]; outputMan = "out"; # users will want `man man` to work - nativeBuildInputs = [ pkgconfig makeWrapper groff ]; + nativeBuildInputs = [ pkg-config makeWrapper groff ]; buildInputs = [ libpipeline db groff ]; # (Yes, 'groff' is both native and build input) checkInputs = [ libiconv /* for 'iconv' binary */ ]; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { "--with-systemdtmpfilesdir=${placeholder "out"}/lib/tmpfiles.d" "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" "--with-pager=less" - ] ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin [ + ] ++ lib.optional stdenv.hostPlatform.isDarwin [ "ac_cv_func__set_invalid_parameter_handler=no" "ac_cv_func_posix_fadvise=no" "ac_cv_func_mempcpy=no" @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { done ''; - postFixup = stdenv.lib.optionalString (buildPackages.groff != groff) '' + postFixup = lib.optionalString (buildPackages.groff != groff) '' # Check to make sure none of the outputs depend on build-time-only groff: for outName in $outputs; do out=''${!outName} @@ -76,6 +76,6 @@ stdenv.mkDerivation rec { homepage = "http://man-db.nongnu.org"; description = "An implementation of the standard Unix documentation system accessed using the man command"; license = licenses.gpl2; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/mbuffer/default.nix b/pkgs/tools/misc/mbuffer/default.nix index 4007a3f7738..6fdd4a69ebc 100644 --- a/pkgs/tools/misc/mbuffer/default.nix +++ b/pkgs/tools/misc/mbuffer/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, - openssl, +{ lib, stdenv, fetchurl, + openssl, } : stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # objdump binary during cross-building for foreign platforms. # The correct objdump is exposed via the environment variable # $OBJDUMP, which should be used in such cases. - preConfigure = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' substituteInPlace configure --replace "OBJDUMP=$ac_cv_path_OBJDUMP" 'OBJDUMP=''${OBJDUMP}' ''; doCheck = true; @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.maier-komor.de/mbuffer.html"; description = "A tool for buffering data streams with a large set of unique features"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ tokudan ]; - platforms = stdenv.lib.platforms.linux; # Maybe other non-darwin Unix + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ tokudan ]; + platforms = lib.platforms.linux; # Maybe other non-darwin Unix }; } diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix index 8dd6bd0195b..d2456a08cbd 100644 --- a/pkgs/tools/misc/mc/default.nix +++ b/pkgs/tools/misc/mc/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, pkgconfig +, pkg-config , glib , gpm , file @@ -20,14 +20,14 @@ stdenv.mkDerivation rec { pname = "mc"; - version = "4.8.25"; + version = "4.8.26"; src = fetchurl { url = "https://www.midnight-commander.org/downloads/${pname}-${version}.tar.xz"; - sha256 = "12jlnabnc91xsm35g99g2wnh96jmznvrhffd18rj7fqfy8brdhgz"; + sha256 = "sha256-xt6txQWV8tmiLcbCmanyizk+NYNG6/bKREqEadwWbCc="; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ file @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { slang unzip zip - ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ]; + ] ++ lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ]; enableParallelBuilding = true; @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { --replace /bin/rm ${coreutils}/bin/rm ''; - postFixup = '' + preFixup = '' # remove unwanted build-dependency references sed -i -e "s!PKG_CONFIG_PATH=''${PKG_CONFIG_PATH}!PKG_CONFIG_PATH=$(echo "$PKG_CONFIG_PATH" | sed -e 's/./0/g')!" $out/bin/mc ''; diff --git a/pkgs/tools/misc/mcfly/default.nix b/pkgs/tools/misc/mcfly/default.nix index 4fee29216fd..616ee822eba 100644 --- a/pkgs/tools/misc/mcfly/default.nix +++ b/pkgs/tools/misc/mcfly/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "mcfly"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "cantino"; repo = "mcfly"; rev = "v${version}"; - sha256 = "0a2jff72l5my00pg9lhjdmnwkqfv4hmnl0a9cfbnzsqh39lbklqy"; + sha256 = "1p51wdv47cyg6dmb81fm0d92x1kp7bwwpgax6vlh669nkddiwvmm"; }; postInstall = '' @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { install -Dm644 -t $out/share/mcfly mcfly.fish ''; - cargoSha256 = "1c8qjkpc8wi095zzmgd05721kdf1knh9la91l081mvwa3inwk6ax"; + cargoSha256 = "0gcdgca8w8i978b067rwm5zrc81rxb704006k9pbcwizkq2281yy"; meta = with lib; { homepage = "https://github.com/cantino/mcfly"; diff --git a/pkgs/tools/misc/mcrypt/default.nix b/pkgs/tools/misc/mcrypt/default.nix index b2237ce0483..8349e0fd4d7 100644 --- a/pkgs/tools/misc/mcrypt/default.nix +++ b/pkgs/tools/misc/mcrypt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libmcrypt, libmhash }: +{ lib, stdenv, fetchurl, libmcrypt, libmhash }: stdenv.mkDerivation rec { version = "2.6.8"; @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { ever-wider range of algorithms and modes. ''; homepage = "http://mcrypt.sourceforge.net"; - license = stdenv.lib.licenses.gpl3Only; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.qknight ]; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.qknight ]; }; } diff --git a/pkgs/tools/misc/mdbtools/default.nix b/pkgs/tools/misc/mdbtools/default.nix index aedaa364888..1c327365916 100644 --- a/pkgs/tools/misc/mdbtools/default.nix +++ b/pkgs/tools/misc/mdbtools/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, glib, readline -, bison, flex, pkgconfig, autoreconfHook, libxslt, makeWrapper +, bison, flex, pkg-config, autoreconfHook, libxslt, makeWrapper , txt2man, which # withUi currently doesn't work. It compiles but fails to run. , withUi ? false, gtk2, gnome2 @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-scrollkeeper" ]; nativeBuildInputs = [ - pkgconfig bison flex autoreconfHook txt2man which + pkg-config bison flex autoreconfHook txt2man which ] ++ lib.optional withUi libxslt; buildInputs = [ glib readline ] ++ lib.optionals withUi uiDeps; diff --git a/pkgs/tools/misc/me_cleaner/default.nix b/pkgs/tools/misc/me_cleaner/default.nix index 19f43f2c8c5..5335624467d 100644 --- a/pkgs/tools/misc/me_cleaner/default.nix +++ b/pkgs/tools/misc/me_cleaner/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub }: +{ lib, buildPythonPackage, fetchFromGitHub }: buildPythonPackage rec { pname = "me_cleaner"; diff --git a/pkgs/tools/misc/megacli/default.nix b/pkgs/tools/misc/megacli/default.nix index e202cc7ae46..7cf1e14dc18 100644 --- a/pkgs/tools/misc/megacli/default.nix +++ b/pkgs/tools/misc/megacli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rpmextract, ncurses5, patchelf, fetchurl, unzip }: +{ lib, stdenv, rpmextract, ncurses5, patchelf, fetchurl, unzip }: stdenv.mkDerivation rec { pname = "megacli"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [rpmextract ncurses5 unzip]; libPath = - stdenv.lib.makeLibraryPath + lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc ncurses5 ]; buildCommand = '' @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "CLI program for LSI MegaRAID cards, which also works with some Dell PERC RAID cards"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/tools/misc/memtest86+/default.nix b/pkgs/tools/misc/memtest86+/default.nix index 57cf5bb97e2..0db6f9f7287 100644 --- a/pkgs/tools/misc/memtest86+/default.nix +++ b/pkgs/tools/misc/memtest86+/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit }: +{ lib, stdenv, fetchgit }: stdenv.mkDerivation { pname = "memtest86+"; @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.memtest.org/"; description = "A tool to detect memory errors"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; }; } diff --git a/pkgs/tools/misc/microplane/default.nix b/pkgs/tools/misc/microplane/default.nix index a0ac411f98e..131367cf9f2 100644 --- a/pkgs/tools/misc/microplane/default.nix +++ b/pkgs/tools/misc/microplane/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "microplane"; diff --git a/pkgs/tools/misc/microplane/deps.nix b/pkgs/tools/misc/microplane/deps.nix index f415bae4507..defbd0d573c 100644 --- a/pkgs/tools/misc/microplane/deps.nix +++ b/pkgs/tools/misc/microplane/deps.nix @@ -225,4 +225,4 @@ sha256 = "1srhvcaa9db3a6xj29mkjr5kg33y71pclrlx4vcwz5m1lgb5c7q6"; }; } -] \ No newline at end of file +] diff --git a/pkgs/tools/misc/mimeo/default.nix b/pkgs/tools/misc/mimeo/default.nix index 6c332198fa7..ea79b8d2f0f 100644 --- a/pkgs/tools/misc/mimeo/default.nix +++ b/pkgs/tools/misc/mimeo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, desktop-file-utils, file, python3Packages }: +{ lib, fetchurl, desktop-file-utils, file, python3Packages }: python3Packages.buildPythonApplication rec { pname = "mimeo"; @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Open files by MIME-type or file name using regular expressions"; - homepage = "http://xyne.archlinux.ca/projects/mimeo/"; + homepage = "https://xyne.archlinux.ca/projects/mimeo/"; license = [ licenses.gpl2 ]; maintainers = [ maintainers.rycee ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/minicom/default.nix b/pkgs/tools/misc/minicom/default.nix index b52d2d26baa..d237c3b7fdd 100644 --- a/pkgs/tools/misc/minicom/default.nix +++ b/pkgs/tools/misc/minicom/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, autoreconfHook, makeWrapper, pkgconfig +{ lib, stdenv, fetchgit, autoreconfHook, makeWrapper, pkg-config , lrzsz, ncurses, libiconv }: stdenv.mkDerivation { @@ -12,9 +12,9 @@ stdenv.mkDerivation { sha256 = "0j95727xni4r122dalp09963gvc1nqa18l1d4wzz8746kw5s2rrb"; }; - buildInputs = [ ncurses ] ++ stdenv.lib.optional stdenv.isDarwin libiconv; + buildInputs = [ ncurses ] ++ lib.optional stdenv.isDarwin libiconv; - nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig ]; + nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config ]; enableParallelBuilding = true; @@ -34,7 +34,7 @@ stdenv.mkDerivation { postInstall = '' for f in $out/bin/*minicom ; do wrapProgram $f \ - --prefix PATH : ${stdenv.lib.makeBinPath [ lrzsz ]}:$out/bin + --prefix PATH : ${lib.makeBinPath [ lrzsz ]}:$out/bin done ''; diff --git a/pkgs/tools/misc/miniserve/default.nix b/pkgs/tools/misc/miniserve/default.nix index aa549f5691a..7fb66e22e98 100644 --- a/pkgs/tools/misc/miniserve/default.nix +++ b/pkgs/tools/misc/miniserve/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0s1gdngpf6gxz2lyapblxxmc6aydg2i9kmrfvngkbmqh4as1a2vl"; nativeBuildInputs = [ pkg-config zlib ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; meta = with lib; { description = "For when you really just want to serve some files over HTTP right now!"; diff --git a/pkgs/tools/misc/mktorrent/default.nix b/pkgs/tools/misc/mktorrent/default.nix index 485c3403cff..194a0c62721 100644 --- a/pkgs/tools/misc/mktorrent/default.nix +++ b/pkgs/tools/misc/mktorrent/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, openssl}: +{lib, stdenv, fetchFromGitHub, openssl}: stdenv.mkDerivation rec { pname = "mktorrent"; @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { }; makeFlags = [ "USE_PTHREADS=1" "USE_OPENSSL=1" "USE_LONG_OPTIONS=1" ] - ++ stdenv.lib.optional stdenv.isi686 "USE_LARGE_FILES=1" - ++ stdenv.lib.optional stdenv.isLinux "CFLAGS=-lgcc_s"; + ++ lib.optional stdenv.isi686 "USE_LARGE_FILES=1" + ++ lib.optional stdenv.isLinux "CFLAGS=-lgcc_s"; installFlags = [ "PREFIX=${placeholder "out"}" ]; @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://mktorrent.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; description = "Command line utility to create BitTorrent metainfo files"; - maintainers = with stdenv.lib.maintainers; [Profpatsch]; + maintainers = with lib.maintainers; [Profpatsch]; }; } diff --git a/pkgs/tools/misc/mlocate/default.nix b/pkgs/tools/misc/mlocate/default.nix index d28828f2a4f..12d9f5622cc 100644 --- a/pkgs/tools/misc/mlocate/default.nix +++ b/pkgs/tools/misc/mlocate/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, config }: let - dbfile = stdenv.lib.attrByPath [ "locate" "dbfile" ] "/var/cache/locatedb" config; + dbfile = lib.attrByPath [ "locate" "dbfile" ] "/var/cache/locatedb" config; in stdenv.mkDerivation rec { pname = "mlocate"; version = "0.26"; diff --git a/pkgs/tools/misc/mmake/default.nix b/pkgs/tools/misc/mmake/default.nix index 5dcbcb065ec..564e1989aee 100644 --- a/pkgs/tools/misc/mmake/default.nix +++ b/pkgs/tools/misc/mmake/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "mmake"; diff --git a/pkgs/tools/misc/mmv/default.nix b/pkgs/tools/misc/mmv/default.nix index 48c3b393262..ed45c268203 100644 --- a/pkgs/tools/misc/mmv/default.nix +++ b/pkgs/tools/misc/mmv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "mmv"; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://linux.maruhn.com/sec/mmv.html"; description = "Utility for wildcard renaming, copying, etc"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/mongodb-compass/default.nix b/pkgs/tools/misc/mongodb-compass/default.nix index 3774a77f5a4..26056364b77 100644 --- a/pkgs/tools/misc/mongodb-compass/default.nix +++ b/pkgs/tools/misc/mongodb-compass/default.nix @@ -5,7 +5,7 @@ let version = "1.23.0"; - rpath = stdenv.lib.makeLibraryPath [ + rpath = lib.makeLibraryPath [ alsaLib at-spi2-atk at-spi2-core diff --git a/pkgs/tools/misc/mongodb-tools/default.nix b/pkgs/tools/misc/mongodb-tools/default.nix index c3e9a0dc2ff..7949a82edc4 100644 --- a/pkgs/tools/misc/mongodb-tools/default.nix +++ b/pkgs/tools/misc/mongodb-tools/default.nix @@ -1,9 +1,8 @@ -{ stdenv -, lib +{ lib , buildGoPackage , fetchFromGitHub , openssl -, pkgconfig +, pkg-config , libpcap }: @@ -35,7 +34,7 @@ in buildGoPackage { sha256 = "0mjwvx0cxvb6zam6jyr3753xjnwcygxcjzqhhlsq0b3xnwws9yh7"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl libpcap ]; # Mongodb incorrectly names all of their binaries main @@ -44,7 +43,7 @@ in buildGoPackage { # move vendored codes so nixpkgs go builder could find it runHook preBuild - ${stdenv.lib.concatMapStrings (t: '' + ${lib.concatMapStrings (t: '' go build -o "$out/bin/${t}" -tags ssl -ldflags "-s -w" $goPackagePath/${t}/main '') tools} diff --git a/pkgs/tools/misc/moreutils/default.nix b/pkgs/tools/misc/moreutils/default.nix index 92402797d11..ad2d0127ab0 100644 --- a/pkgs/tools/misc/moreutils/default.nix +++ b/pkgs/tools/misc/moreutils/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchgit, libxml2, libxslt, docbook-xsl, docbook_xml_dtd_44, perlPackages, makeWrapper, darwin }: +{ lib, stdenv, fetchgit, libxml2, libxslt, docbook-xsl, docbook_xml_dtd_44, perlPackages, makeWrapper, darwin }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "moreutils"; - version = "0.63"; + version = "0.65"; src = fetchgit { url = "git://git.joeyh.name/moreutils"; rev = "refs/tags/${version}"; - sha256 = "17sszmcdck4w01hgcq7vd25p2iw3yzvjwx1yf20jg85gzs1dplrd"; + sha256 = "17r80xs756c5vv4ghh901c8abraqqfp7ncagv9ys4il3jngfqbrb"; }; preBuild = '' diff --git a/pkgs/tools/misc/mpdscribble/default.nix b/pkgs/tools/misc/mpdscribble/default.nix index 4e033a44cfd..182e844eb84 100644 --- a/pkgs/tools/misc/mpdscribble/default.nix +++ b/pkgs/tools/misc/mpdscribble/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkgconfig, boost, libgcrypt, systemd, mpd_clientlib, curl }: +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, boost, libgcrypt, systemd, mpd_clientlib, curl }: stdenv.mkDerivation rec { pname = "mpdscribble"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0s66zqscb44p88cl3kcv5jkjcqsskcnrv7xgrjhzrchf2kcpwf53"; }; - nativeBuildInputs = [ meson ninja pkgconfig ]; + nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ mpd_clientlib curl boost libgcrypt systemd ]; meta = with lib; { diff --git a/pkgs/tools/misc/mrtg/default.nix b/pkgs/tools/misc/mrtg/default.nix index 047cd87308f..e8ebde4ad4d 100644 --- a/pkgs/tools/misc/mrtg/default.nix +++ b/pkgs/tools/misc/mrtg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, gd, rrdtool }: +{ lib, stdenv, fetchurl, perl, gd, rrdtool }: stdenv.mkDerivation rec { @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { meta = { description = "The Multi Router Traffic Grapher"; homepage = "https://oss.oetiker.ch/mrtg/"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.robberer ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.robberer ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/multitail/default.nix b/pkgs/tools/misc/multitail/default.nix index eef53769f06..3304d3c1912 100644 --- a/pkgs/tools/misc/multitail/default.nix +++ b/pkgs/tools/misc/multitail/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, pkg-config }: +{ lib, stdenv, fetchurl, ncurses, pkg-config }: stdenv.mkDerivation rec { version = "6.5.0"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ]; - makeFlags = stdenv.lib.optionals stdenv.isDarwin [ "-f" "makefile.macosx" ]; + makeFlags = lib.optionals stdenv.isDarwin [ "-f" "makefile.macosx" ]; installPhase = '' mkdir -p $out/bin @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.vanheusden.com/multitail/"; description = "tail on Steroids"; - maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ matthiasbeyer ]; + platforms = lib.platforms.unix; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/misc/multitime/default.nix b/pkgs/tools/misc/multitime/default.nix index a46ee2b7c9c..015f50fa57f 100644 --- a/pkgs/tools/misc/multitime/default.nix +++ b/pkgs/tools/misc/multitime/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "multitime"; @@ -32,8 +32,8 @@ stdenv.mkDerivation rec { performance. ''; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; homepage = "https://tratt.net/laurie/src/multitime/"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/mysql2pgsql/default.nix b/pkgs/tools/misc/mysql2pgsql/default.nix index e3f05e1a761..f0556b69f23 100644 --- a/pkgs/tools/misc/mysql2pgsql/default.nix +++ b/pkgs/tools/misc/mysql2pgsql/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl }: +{ lib, stdenv, fetchurl, perl }: # The homepage says this script is mature.. stdenv.mkDerivation { @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "Convert MySQL dump files to PostgreSQL-loadable files"; homepage = "https://pgfoundry.org/projects/mysql2pgsql/"; - license = stdenv.lib.licenses.bsdOriginal; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.bsdOriginal; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/nagstamon/default.nix b/pkgs/tools/misc/nagstamon/default.nix index 3bd297628b2..e9f76dbf22d 100644 --- a/pkgs/tools/misc/nagstamon/default.nix +++ b/pkgs/tools/misc/nagstamon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pythonPackages }: +{ lib, fetchurl, pythonPackages }: pythonPackages.buildPythonApplication rec { pname = "nagstamon"; diff --git a/pkgs/tools/misc/nbench/default.nix b/pkgs/tools/misc/nbench/default.nix index adca412daf8..dc9dcb1e5be 100644 --- a/pkgs/tools/misc/nbench/default.nix +++ b/pkgs/tools/misc/nbench/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { homepage = "https://www.math.utah.edu/~mayer/linux/bmark.html"; description = "A synthetic computing benchmark program"; platforms = platforms.linux; - maintainers = with stdenv.lib.maintainers; [ bennofs ]; + maintainers = with lib.maintainers; [ bennofs ]; }; } diff --git a/pkgs/tools/misc/nix-direnv/default.nix b/pkgs/tools/misc/nix-direnv/default.nix index 95175f81c8e..efacd87d9a4 100644 --- a/pkgs/tools/misc/nix-direnv/default.nix +++ b/pkgs/tools/misc/nix-direnv/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nix-direnv"; - version = "1.2"; + version = "1.2.1"; src = fetchFromGitHub { owner = "nix-community"; repo = "nix-direnv"; rev = version; - sha256 = "sha256-/mlM1EeUlr1nTUJ5rB41idzk3Mfy/htjjPUARYDFpb0="; + sha256 = "sha256-D31ORVdS8P1OkPShsfjEFLVCcv8Bff9OyexUKKHdguQ="; }; # Substitute instead of wrapping because the resulting file is diff --git a/pkgs/tools/misc/noteshrink/default.nix b/pkgs/tools/misc/noteshrink/default.nix index 2d6f23de468..67c49c3ad0d 100644 --- a/pkgs/tools/misc/noteshrink/default.nix +++ b/pkgs/tools/misc/noteshrink/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3, imagemagick }: +{ lib, fetchFromGitHub, python3, imagemagick }: with python3.pkgs; diff --git a/pkgs/tools/misc/notify-desktop/default.nix b/pkgs/tools/misc/notify-desktop/default.nix index 03e7fbb5c02..c906443b07c 100644 --- a/pkgs/tools/misc/notify-desktop/default.nix +++ b/pkgs/tools/misc/notify-desktop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, dbus, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, dbus, pkg-config }: stdenv.mkDerivation { pname = "notify-desktop"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "1brcvl2fx0yzxj9mc8hzfl32zdka1f1bxpzsclcsjplyakyinr1a"; }; - buildInputs = [ dbus pkgconfig ]; + buildInputs = [ dbus pkg-config ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/tools/misc/ntfy/default.nix b/pkgs/tools/misc/ntfy/default.nix index 9f28d99ba0f..23d4fd57f62 100644 --- a/pkgs/tools/misc/ntfy/default.nix +++ b/pkgs/tools/misc/ntfy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub }: python3Packages.buildPythonApplication rec { pname = "ntfy"; diff --git a/pkgs/tools/misc/ocz-ssd-guru/default.nix b/pkgs/tools/misc/ocz-ssd-guru/default.nix index 00926663a6c..c5ac32af3be 100644 --- a/pkgs/tools/misc/ocz-ssd-guru/default.nix +++ b/pkgs/tools/misc/ocz-ssd-guru/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, xorg, freetype, fontconfig, libGLU, libGL, glibc, makeWrapper }: +{ fetchurl, lib, stdenv, xorg, freetype, fontconfig, libGLU, libGL, glibc, makeWrapper }: let system = if stdenv.hostPlatform.system == "x86_64-linux" then "linux64" else "linux32"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper ]; - libPath = stdenv.lib.makeLibraryPath [ + libPath = lib.makeLibraryPath [ xorg.libX11 xorg.libxcb freetype @@ -45,9 +45,9 @@ stdenv.mkDerivation rec { meta = { homepage = "http://ocz.com/ssd-guru"; description = "SSD Management Tool for OCZ disks"; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ jagajaga ]; + license = lib.licenses.unfree; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ jagajaga ]; }; } diff --git a/pkgs/tools/misc/onefetch/default.nix b/pkgs/tools/misc/onefetch/default.nix index 7a010eb5e68..12cd9990779 100644 --- a/pkgs/tools/misc/onefetch/default.nix +++ b/pkgs/tools/misc/onefetch/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "onefetch"; - version = "2.7.3"; + version = "2.9.1"; src = fetchFromGitHub { owner = "o2sh"; repo = pname; rev = "v${version}"; - sha256 = "0c56na9s3g7rdb4cc6ccsnfby2ihf5zrfs3lg9qxiqsfr7mcn4w9"; + sha256 = "sha256-owa+HmzMXpLR7H1FssW4gQiVAQGJRXhcitgJj6pxJRc="; }; - cargoSha256 = "05rrww53g3k2c8mpxvyc067qsgs7w9sxnzdlvmca1idbqa0k9060"; + cargoSha256 = "sha256-TqWe4eARQmmWcwnvb6BIZrzGeKMpiIObPv0cW1JvWj4="; buildInputs = with stdenv; lib.optionals isDarwin [ CoreFoundation libiconv libresolv Security ]; diff --git a/pkgs/tools/misc/opencorsairlink/default.nix b/pkgs/tools/misc/opencorsairlink/default.nix index 62772021bac..14f955be1cd 100644 --- a/pkgs/tools/misc/opencorsairlink/default.nix +++ b/pkgs/tools/misc/opencorsairlink/default.nix @@ -1,11 +1,11 @@ -{ lib, stdenv, fetchFromGitHub, libusb1, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, libusb1, pkg-config }: stdenv.mkDerivation rec { name = "OpenCorsairLink-${version}"; version = "2019-12-23"; buildInputs = [ libusb1 ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; makeFlags = [ "PREFIX=${placeholder "out"}" ]; @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/audiohacked/OpenCorsairLink"; license = licenses.gpl2; platforms = platforms.all; - maintainers = [ stdenv.lib.maintainers.expipiplus1 ]; + maintainers = [ lib.maintainers.expipiplus1 ]; }; } diff --git a/pkgs/tools/misc/opentsdb/default.nix b/pkgs/tools/misc/opentsdb/default.nix index bbfecd58686..168eda1cf3d 100644 --- a/pkgs/tools/misc/opentsdb/default.nix +++ b/pkgs/tools/misc/opentsdb/default.nix @@ -30,7 +30,10 @@ stdenv.mkDerivation rec { description = "Time series database with millisecond precision"; homepage = "http://opentsdb.net"; license = licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; maintainers = [ ]; + knownVulnerabilities = [ + "CVE-2020-35476" # https://github.com/OpenTSDB/opentsdb/issues/2051 + ]; }; } diff --git a/pkgs/tools/misc/os-prober/default.nix b/pkgs/tools/misc/os-prober/default.nix index 4914572f156..07279400fc4 100644 --- a/pkgs/tools/misc/os-prober/default.nix +++ b/pkgs/tools/misc/os-prober/default.nix @@ -11,14 +11,14 @@ lvm2 # lvs }: stdenv.mkDerivation rec { - version = "1.77"; + version = "1.78"; pname = "os-prober"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "installer-team"; repo = pname; rev = version; - sha256 = "05sji756xdl67pp2sf7rk0ih9h6f6kgk9nvxlyv1bzbmcizlh2d2"; + sha256 = "sha256-mfv1b40n/opXdyj6IXWVf/32sWlS+/DbXIRwE1zX4KM="; }; buildInputs = [ makeWrapper ]; @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { done; for file in $out/bin/*; do wrapProgram $file \ - --suffix PATH : ${stdenv.lib.makeBinPath [ grub2 udev coreutils cryptsetup libuuid ntfs3g lvm2 dmraid ]} \ + --suffix PATH : ${lib.makeBinPath [ grub2 udev coreutils cryptsetup libuuid ntfs3g lvm2 dmraid ]} \ --run "[ -d /var/lib/os-prober ] || mkdir /var/lib/os-prober" done; ''; diff --git a/pkgs/tools/misc/osinfo-db-tools/default.nix b/pkgs/tools/misc/osinfo-db-tools/default.nix index 298a7da6e2a..e7a5d38a916 100644 --- a/pkgs/tools/misc/osinfo-db-tools/default.nix +++ b/pkgs/tools/misc/osinfo-db-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, meson, ninja, gettext, glib, libxml2, perl, python3 +{ lib, stdenv, fetchurl, pkg-config, meson, ninja, gettext, glib, libxml2, perl, python3 , libxslt, libarchive, bzip2, lzma, json-glib, libsoup }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "038q3gzdbkfkhpicj0755mw1q4gbvn57pslpw8n2dp3lds9im0g9"; }; - nativeBuildInputs = [ meson ninja pkgconfig gettext perl python3 ]; + nativeBuildInputs = [ meson ninja pkg-config gettext perl python3 ]; buildInputs = [ glib json-glib libxml2 libxslt libarchive bzip2 lzma libsoup ]; meta = with lib; { diff --git a/pkgs/tools/misc/osm2pgsql/default.nix b/pkgs/tools/misc/osm2pgsql/default.nix index 184ebc19bf2..b3f4971a55a 100644 --- a/pkgs/tools/misc/osm2pgsql/default.nix +++ b/pkgs/tools/misc/osm2pgsql/default.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ expat proj bzip2 zlib boost postgresql libosmium protozero ] - ++ stdenv.lib.optional withLuaJIT luajit - ++ stdenv.lib.optional (!withLuaJIT) lua; + ++ lib.optional withLuaJIT luajit + ++ lib.optional (!withLuaJIT) lua; cmakeFlags = [ "-DEXTERNAL_LIBOSMIUM=ON" "-DEXTERNAL_PROTOZERO=ON" ] - ++ stdenv.lib.optional withLuaJIT "-DWITH_LUAJIT:BOOL=ON"; + ++ lib.optional withLuaJIT "-DWITH_LUAJIT:BOOL=ON"; NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"; diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index c1716fef5db..dc013cfe197 100644 --- a/pkgs/tools/misc/ostree/default.nix +++ b/pkgs/tools/misc/ostree/default.nix @@ -119,7 +119,7 @@ in stdenv.mkDerivation rec { ''; postFixup = let - typelibPath = stdenv.lib.makeSearchPath "/lib/girepository-1.0" [ + typelibPath = lib.makeSearchPath "/lib/girepository-1.0" [ (placeholder "out") gobject-introspection ]; diff --git a/pkgs/tools/misc/otfcc/default.nix b/pkgs/tools/misc/otfcc/default.nix index c4a9c5a278e..a363b875895 100644 --- a/pkgs/tools/misc/otfcc/default.nix +++ b/pkgs/tools/misc/otfcc/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ./move-makefiles.patch ]; - buildFlags = stdenv.lib.optional stdenv.isAarch64 [ "config=release_arm" ]; + buildFlags = lib.optional stdenv.isAarch64 [ "config=release_arm" ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/tools/misc/pal/default.nix b/pkgs/tools/misc/pal/default.nix index c285dc2463b..635c6e0b524 100644 --- a/pkgs/tools/misc/pal/default.nix +++ b/pkgs/tools/misc/pal/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, glib, gettext, readline, pkgconfig }: +{lib, stdenv, fetchurl, glib, gettext, readline, pkg-config }: stdenv.mkDerivation rec { name = "pal-0.4.3"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib gettext readline ]; hardeningDisable = [ "format" ]; @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://palcal.sourceforge.net/"; description = "Command-line calendar program that can keep track of events"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/tools/misc/paps/default.nix b/pkgs/tools/misc/paps/default.nix index 3a8040bd5f1..ca6607b2f18 100644 --- a/pkgs/tools/misc/paps/default.nix +++ b/pkgs/tools/misc/paps/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, autoconf, automake, pkgconfig, intltool, pango }: +, autoconf, automake, pkg-config, intltool, pango }: stdenv.mkDerivation rec { pname = "paps"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "129wpm2ayxs6qfh2761d4x9c034ivb2bcmmcnl56qs4448qb9495"; }; - nativeBuildInputs = [ autoconf automake pkgconfig intltool ]; + nativeBuildInputs = [ autoconf automake pkg-config intltool ]; buildInputs = [ pango ]; preConfigure = '' diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 9cc4926443b..720b73f3fe2 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/parallel \ - --prefix PATH : "${stdenv.lib.makeBinPath [ procps perl ]}" + --prefix PATH : "${lib.makeBinPath [ procps perl ]}" ''; doCheck = true; diff --git a/pkgs/tools/misc/parcellite/default.nix b/pkgs/tools/misc/parcellite/default.nix index 861d83bcfce..615e9e528d7 100644 --- a/pkgs/tools/misc/parcellite/default.nix +++ b/pkgs/tools/misc/parcellite/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook -, gtk2, hicolor-icon-theme, intltool, pkgconfig +, gtk2, hicolor-icon-theme, intltool, pkg-config , which, wrapGAppsHook, xdotool }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "19q4x6x984s6gxk1wpzaxawgvly5vnihivrhmja2kcxhzqrnfhiy"; }; - nativeBuildInputs = [ autoreconfHook intltool pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ autoreconfHook intltool pkg-config wrapGAppsHook ]; buildInputs = [ gtk2 hicolor-icon-theme ]; NIX_LDFLAGS = "-lgio-2.0"; diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix index 2b21b2f1427..7c7a611b97c 100644 --- a/pkgs/tools/misc/parted/default.nix +++ b/pkgs/tools/misc/parted/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , lvm2 @@ -29,16 +29,16 @@ stdenv.mkDerivation rec { ''; buildInputs = [ libuuid ] - ++ stdenv.lib.optional (readline != null) readline - ++ stdenv.lib.optional (gettext != null) gettext - ++ stdenv.lib.optional (lvm2 != null) lvm2; + ++ lib.optional (readline != null) readline + ++ lib.optional (gettext != null) gettext + ++ lib.optional (lvm2 != null) lvm2; configureFlags = (if (readline != null) then [ "--with-readline" ] else [ "--without-readline" ]) - ++ stdenv.lib.optional (lvm2 == null) "--disable-device-mapper" - ++ stdenv.lib.optional enableStatic "--enable-static"; + ++ lib.optional (lvm2 == null) "--disable-device-mapper" + ++ lib.optional enableStatic "--enable-static"; # Tests were previously failing due to Hydra running builds as uid 0. # That should hopefully be fixed now. @@ -59,13 +59,13 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.gnu.org/software/parted/"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; maintainers = [ # Add your name here! ]; # GNU Parted requires libuuid, which is part of util-linux-ng. - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/pazi/default.nix b/pkgs/tools/misc/pazi/default.nix index 0375b8e1484..81590e1dd45 100644 --- a/pkgs/tools/misc/pazi/default.nix +++ b/pkgs/tools/misc/pazi/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0z8x70mwg0mvz6iap92gil37d4kpg5dizlyfx3zk7984ynycgap8"; }; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; cargoSha256 = "0sja0q9i0b1zb3a0a6z561yg9lqykylwr3iwin4r6cmi7j2sw5j6"; diff --git a/pkgs/tools/misc/pb_cli/default.nix b/pkgs/tools/misc/pb_cli/default.nix index 9d33f088af0..eacbc0d6bd2 100644 --- a/pkgs/tools/misc/pb_cli/default.nix +++ b/pkgs/tools/misc/pb_cli/default.nix @@ -18,16 +18,16 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper ]; - liveDeps = [ jq curl ] ++ stdenv.lib.optional screenshots maim - ++ stdenv.lib.optional video capture - ++ stdenv.lib.optional clipboard xclip; + liveDeps = [ jq curl ] ++ lib.optional screenshots maim + ++ lib.optional video capture + ++ lib.optional clipboard xclip; installPhase = '' install -Dm755 src/pb.sh $out/bin/pb patchShebangs $out/bin/pb wrapProgram $out/bin/pb \ - --prefix PATH : '${stdenv.lib.makeBinPath liveDeps}' + --prefix PATH : '${lib.makeBinPath liveDeps}' ''; meta = with lib; { diff --git a/pkgs/tools/misc/pcb2gcode/default.nix b/pkgs/tools/misc/pcb2gcode/default.nix new file mode 100644 index 00000000000..b5675f8287d --- /dev/null +++ b/pkgs/tools/misc/pcb2gcode/default.nix @@ -0,0 +1,46 @@ +{ stdenv +, lib +, fetchFromGitHub +, autoreconfHook +, pkg-config +, boost +, glibmm +, gtkmm2 +, gerbv +, librsvg +, bash +}: + +stdenv.mkDerivation rec { + pname = "pcb2gcode"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "pcb2gcode"; + repo = "pcb2gcode"; + rev = "v${version}"; + sha256 = "0nzglcyh6ban27cc73j4l7w7r9k38qivq0jz8iwnci02pfalw4ry"; + }; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + + buildInputs = [ boost glibmm gtkmm2 gerbv librsvg ]; + + postPatch = '' + substituteInPlace ./Makefile.am \ + --replace '`git describe --dirty --always --tags`' '${version}' + ''; + + meta = with lib; { + description = "Command-line tool for isolation, routing and drilling of PCBs "; + longDescription = '' + pcb2gcode is a command-line software for the isolation, routing and drilling of PCBs. + It takes Gerber files as input and it outputs gcode files, suitable for the milling of PCBs. + It also includes an Autoleveller, useful for the automatic dynamic calibration of the milling depth. + ''; + homepage = "https://github.com/pcb2gcode/pcb2gcode"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ kritnich ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/pdd/default.nix b/pkgs/tools/misc/pdd/default.nix index b339f94deb1..916f15c94c6 100644 --- a/pkgs/tools/misc/pdd/default.nix +++ b/pkgs/tools/misc/pdd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonApplication, dateutil }: +{ lib, fetchFromGitHub, buildPythonApplication, dateutil }: buildPythonApplication rec { pname = "pdd"; diff --git a/pkgs/tools/misc/pdf-parser/default.nix b/pkgs/tools/misc/pdf-parser/default.nix index ceb8b4d68d9..f4572d0e5bc 100644 --- a/pkgs/tools/misc/pdf-parser/default.nix +++ b/pkgs/tools/misc/pdf-parser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, fetchzip }: +{ lib, python3Packages, fetchzip }: python3Packages.buildPythonApplication { pname = "pdf-parser"; diff --git a/pkgs/tools/misc/pg_top/default.nix b/pkgs/tools/misc/pg_top/default.nix index a5d1baf1fd1..f5d42431e4f 100644 --- a/pkgs/tools/misc/pg_top/default.nix +++ b/pkgs/tools/misc/pg_top/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A 'top' like tool for PostgreSQL"; - longDescription = '' - pg_top allows you to: + longDescription = '' + pg_top allows you to: * View currently running SQL statement of a process. * View query plan of a currently running SQL statement. * View locks held by a process. diff --git a/pkgs/tools/misc/pgcenter/default.nix b/pkgs/tools/misc/pgcenter/default.nix index 5a59e3030e6..8afaa61e35b 100644 --- a/pkgs/tools/misc/pgcenter/default.nix +++ b/pkgs/tools/misc/pgcenter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "pgcenter"; diff --git a/pkgs/tools/misc/pgmetrics/default.nix b/pkgs/tools/misc/pgmetrics/default.nix index 377c0eed24b..54e7093747b 100644 --- a/pkgs/tools/misc/pgmetrics/default.nix +++ b/pkgs/tools/misc/pgmetrics/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "pgmetrics"; - version = "1.10.3"; + version = "1.10.5"; src = fetchFromGitHub { owner = "rapidloop"; repo = pname; rev = "v${version}"; - sha256 = "1acdak3m9782hr5bn26ck3dnnv1jxwz5yrkyv8kivavjww88m9h2"; + sha256 = "sha256-rqaK94Rw0K1+r7+7jHI2bzBupCGTkokeC4heJ3Yu6pQ="; }; - vendorSha256 = "16x33fmh4q993rw0jr65337yimska4fwgyyw3kmq84q0x28a3zg5"; + vendorSha256 = "sha256-5f2hkOgAE4TrHNz7xx1RU9fozxjFZAl4HilhAqsbo5s="; doCheck = false; diff --git a/pkgs/tools/misc/phoronix-test-suite/default.nix b/pkgs/tools/misc/phoronix-test-suite/default.nix index 8cb8d67c733..da69d5a8b93 100644 --- a/pkgs/tools/misc/phoronix-test-suite/default.nix +++ b/pkgs/tools/misc/phoronix-test-suite/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "phoronix-test-suite"; - version = "10.0.1"; + version = "10.2.0"; src = fetchurl { url = "https://phoronix-test-suite.com/releases/${pname}-${version}.tar.gz"; - sha256 = "09wrrcxfvh7pwv0jqpyzjsr0rd7askfr0s2xr1wv9v40znxmsmzz"; + sha256 = "sha256-eoKHgbSyOEkwzki5wWuZlOAmZljxOMXcztA/g8TtutQ="; }; buildInputs = [ php ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ./install-sh $out wrapProgram $out/bin/phoronix-test-suite \ --set PHP_BIN ${php}/bin/php \ - --prefix PATH : ${stdenv.lib.makeBinPath [ gnumake gcc ]} + --prefix PATH : ${lib.makeBinPath [ gnumake gcc ]} ''; passthru.tests = { diff --git a/pkgs/tools/misc/phraseapp-client/default.nix b/pkgs/tools/misc/phraseapp-client/default.nix index 27c486f4bea..12b11cf20d0 100644 --- a/pkgs/tools/misc/phraseapp-client/default.nix +++ b/pkgs/tools/misc/phraseapp-client/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "phraseapp-client"; diff --git a/pkgs/tools/misc/pick/default.nix b/pkgs/tools/misc/pick/default.nix index ac446e7f341..a8203978fee 100644 --- a/pkgs/tools/misc/pick/default.nix +++ b/pkgs/tools/misc/pick/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, ncurses, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, ncurses, pkg-config }: stdenv.mkDerivation rec { pname = "pick"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; meta = with lib; { inherit (src.meta) homepage; diff --git a/pkgs/tools/misc/picocom/default.nix b/pkgs/tools/misc/picocom/default.nix index 47126bac304..e9ec3c38994 100644 --- a/pkgs/tools/misc/picocom/default.nix +++ b/pkgs/tools/misc/picocom/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = stdenv.lib.optional stdenv.isDarwin IOKit; + buildInputs = lib.optional stdenv.isDarwin IOKit; installPhase = '' install -Dm555 -t $out/bin picocom diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix index fe16406256f..96027677fa8 100644 --- a/pkgs/tools/misc/pipelight/default.nix +++ b/pkgs/tools/misc/pipelight/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bash, cabextract, curl, gnupg, libX11, libGLU, libGL, wine-staging }: +{ lib, stdenv, fetchurl, bash, cabextract, curl, gnupg, libX11, libGLU, libGL, wine-staging }: let wine_custom = wine-staging; @@ -53,9 +53,9 @@ in stdenv.mkDerivation rec { meta = { homepage = "http://pipelight.net/"; - license = with stdenv.lib.licenses; [ mpl11 gpl2 lgpl21 ]; + license = with lib.licenses; [ mpl11 gpl2 lgpl21 ]; description = "A wrapper for using Windows plugins in Linux browsers"; - maintainers = with stdenv.lib.maintainers; [ skeidel ]; + maintainers = with lib.maintainers; [ skeidel ]; platforms = [ "x86_64-linux" "i686-linux" ]; }; } diff --git a/pkgs/tools/misc/pistol/default.nix b/pkgs/tools/misc/pistol/default.nix index 874bbdbaf70..6eec45db011 100644 --- a/pkgs/tools/misc/pistol/default.nix +++ b/pkgs/tools/misc/pistol/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildGoModule , fetchFromGitHub , file diff --git a/pkgs/tools/misc/pixd/default.nix b/pkgs/tools/misc/pixd/default.nix index a2dc84ed6a9..8152849d9b5 100644 --- a/pkgs/tools/misc/pixd/default.nix +++ b/pkgs/tools/misc/pixd/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "pixd"; diff --git a/pkgs/tools/misc/pk2cmd/default.nix b/pkgs/tools/misc/pk2cmd/default.nix index 8c7e5b8bcf2..7ffbd8ded1c 100644 --- a/pkgs/tools/misc/pk2cmd/default.nix +++ b/pkgs/tools/misc/pk2cmd/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libusb-compat-0_1, makeWrapper}: +{lib, stdenv, fetchurl, libusb-compat-0_1, makeWrapper}: stdenv.mkDerivation { name = "pk2cmd-1.20"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { homepage = "https://www.microchip.com/pickit2"; - license = stdenv.lib.licenses.unfree; #MicroChip-PK2 + license = lib.licenses.unfree; #MicroChip-PK2 description = "Microchip PIC programming software for the PICKit2 programmer"; }; } diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index e366673d773..0355c65ac6c 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2020.22"; + version = "1.2021.0"; pname = "plantuml"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; - sha256 = "10s2a5z903k1nhq6zdvj4wfms5ma4ldhq9330nnnkdzhbxdp14yx"; + sha256 = "sha256-QERrsTB8GO+B8DZkl1Ruru9Bw+uL9ojQbJ321sbqIws="; }; nativeBuildInputs = [ makeWrapper ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { homepage = "http://plantuml.sourceforge.net/"; # "plantuml -license" says GPLv3 or later license = licenses.gpl3Plus; - maintainers = with maintainers; [ bjornfor ]; + maintainers = with maintainers; [ bjornfor Mogria ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/plotinus/default.nix b/pkgs/tools/misc/plotinus/default.nix index c7aff75dca5..112010c8008 100644 --- a/pkgs/tools/misc/plotinus/default.nix +++ b/pkgs/tools/misc/plotinus/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , gettext , libxml2 -, pkgconfig +, pkg-config , gtk3 , cmake , ninja @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config wrapGAppsHook vala cmake diff --git a/pkgs/tools/misc/plowshare/default.nix b/pkgs/tools/misc/plowshare/default.nix index 662710388d3..d9c208510fc 100644 --- a/pkgs/tools/misc/plowshare/default.nix +++ b/pkgs/tools/misc/plowshare/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, curl, recode, spidermonkey_38 }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, curl, recode, spidermonkey_38 }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { make PREFIX="$out" install for fn in plow{del,down,list,mod,probe,up}; do - wrapProgram "$out/bin/$fn" --prefix PATH : "${stdenv.lib.makeBinPath [ curl recode spidermonkey_38 ]}" + wrapProgram "$out/bin/$fn" --prefix PATH : "${lib.makeBinPath [ curl recode spidermonkey_38 ]}" done ''; @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { description = '' A command-line download/upload tool for popular file sharing websites ''; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ aforemny jfrankenau ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ aforemny jfrankenau ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/ponysay/default.nix b/pkgs/tools/misc/ponysay/default.nix index 3fc3efa0eda..b94ca6cfea3 100644 --- a/pkgs/tools/misc/ponysay/default.nix +++ b/pkgs/tools/misc/ponysay/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3, texinfo, makeWrapper }: +{ lib, stdenv, fetchurl, python3, texinfo, makeWrapper }: stdenv.mkDerivation { name = "ponysay-3.0.3"; @@ -27,8 +27,8 @@ stdenv.mkDerivation { meta = { description = "Cowsay reimplemention for ponies"; homepage = "https://github.com/erkin/ponysay"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ bodil ]; - platforms = with stdenv.lib.platforms; unix; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ bodil ]; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/tools/misc/powerline-go/default.nix b/pkgs/tools/misc/powerline-go/default.nix index 2b46e25c67e..a4ee216288f 100644 --- a/pkgs/tools/misc/powerline-go/default.nix +++ b/pkgs/tools/misc/powerline-go/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "powerline-go"; - version = "1.18.0"; + version = "1.20.0"; src = fetchFromGitHub { owner = "justjanne"; repo = pname; rev = "v${version}"; - sha256 = "0dni842xzc8r6wbdfax25940jvxp69zk8xklczkjmyxqawvsxnjh"; + sha256 = "sha256-Pge57OXNE0MY2rlspVsqxdoe1r/XWjrq/q9ygdns2c8="; }; - vendorSha256 = "0dkgp9vlb76la0j439w0rb548qg5v8648zryk3rqgfhd4qywlk11"; + vendorSha256 = "sha256-HYF6aKz+P241EKmupEoretadlrh9FBRx6nIER66jofg="; doCheck = false; diff --git a/pkgs/tools/misc/powerline-rs/default.nix b/pkgs/tools/misc/powerline-rs/default.nix index 6df48f0effb..4e5a3476f53 100644 --- a/pkgs/tools/misc/powerline-rs/default.nix +++ b/pkgs/tools/misc/powerline-rs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, rustPlatform, fetchFromGitLab, pkgconfig, file, perl, curl, cmake, openssl, libssh2, libgit2, libzip, Security }: +{ stdenv, lib, rustPlatform, fetchFromGitLab, pkg-config, file, perl, curl, cmake, openssl, libssh2, libgit2, libzip, Security }: rustPlatform.buildRustPackage rec { pname = "powerline-rs"; @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0a41a6kgwgz4040c2369jldvk6xy6s6fkgayca0qy7hdwc4bcxdp"; - nativeBuildInputs = [ pkgconfig file perl cmake curl ]; + nativeBuildInputs = [ pkg-config file perl cmake curl ]; buildInputs = [ openssl libssh2 libgit2 libzip ] ++ lib.optional stdenv.isDarwin Security; COMPLETION_OUT = "out"; diff --git a/pkgs/tools/misc/profile-cleaner/default.nix b/pkgs/tools/misc/profile-cleaner/default.nix index b8a747d4222..c8a2b338817 100644 --- a/pkgs/tools/misc/profile-cleaner/default.nix +++ b/pkgs/tools/misc/profile-cleaner/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, parallel, sqlite, bc, file }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, parallel, sqlite, bc, file }: stdenv.mkDerivation rec { version = "2.41"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installPhase = '' PREFIX=\"\" DESTDIR=$out make install wrapProgram $out/bin/profile-cleaner \ - --prefix PATH : "${stdenv.lib.makeBinPath [ parallel sqlite bc file ]}" + --prefix PATH : "${lib.makeBinPath [ parallel sqlite bc file ]}" ''; meta = { @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { some email clients and newsreaders too. ''; homepage = "https://github.com/graysky2/profile-cleaner"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.devhell ]; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.devhell ]; }; } diff --git a/pkgs/tools/misc/progress/default.nix b/pkgs/tools/misc/progress/default.nix index dbf844a4f9d..4f27cd239d1 100644 --- a/pkgs/tools/misc/progress/default.nix +++ b/pkgs/tools/misc/progress/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, ncurses, which }: +{ lib, stdenv, fetchFromGitHub, pkg-config, ncurses, which }: stdenv.mkDerivation rec { pname = "progress"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1cnb4ixlhshn139mj5sr42k5m6gjjbyqvkn1324c47niwrgp7dqm"; }; - nativeBuildInputs = [ pkgconfig which ]; + nativeBuildInputs = [ pkg-config which ]; buildInputs = [ ncurses ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/tools/misc/proxytunnel/default.nix b/pkgs/tools/misc/proxytunnel/default.nix index 74c04905994..7743793143a 100644 --- a/pkgs/tools/misc/proxytunnel/default.nix +++ b/pkgs/tools/misc/proxytunnel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl }: +{ lib, stdenv, fetchurl, openssl }: stdenv.mkDerivation { name = "proxytunnel-1.9.0"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { description = "Program that connects stdin and stdout to a server somewhere on the network, through a standard HTTPS proxy"; homepage = "http://proxytunnel.sourceforge.net/download.php"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix index 1ec6864fe6c..04f1c5ec33e 100644 --- a/pkgs/tools/misc/pspg/default.nix +++ b/pkgs/tools/misc/pspg/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, gnugrep, ncurses, pkgconfig, readline, postgresql }: +{ lib, stdenv, fetchFromGitHub, gnugrep, ncurses, pkg-config, readline, postgresql }: stdenv.mkDerivation rec { pname = "pspg"; - version = "3.1.5"; + version = "4.0.1"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = version; - sha256 = "000h4yiaym7i5bcm268rvsjbs2brz2is9lhm6vm3dx0q7k1pcx45"; + sha256 = "sha256-YQrANrCd0nFdn98LfHH/Ishm+fDb12cUAkxlwtZ1ng8="; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gnugrep ncurses readline postgresql ]; makeFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/tools/misc/psw/default.nix b/pkgs/tools/misc/psw/default.nix index 56281031301..09b9010bed6 100644 --- a/pkgs/tools/misc/psw/default.nix +++ b/pkgs/tools/misc/psw/default.nix @@ -5,22 +5,21 @@ rustPlatform.buildRustPackage rec { pname = "psw"; - version = "0.1.2"; + version = "0.2.0"; src = fetchFromGitHub { owner = "Wulfsta"; repo = pname; rev = version; - sha256 = "10raj4899i01f5v13w0wxdnjjicql2wjblkq1zcagrfv3ly3d0fy"; + sha256 = "1nwmps3zw99lrz6k1j14w4rcm7yj8vhf4cs9wjfc3c1zfjibz9iz"; }; - cargoSha256 = "1w18rym0xnjk7vhrb2dc4cvhg659zbq5d2153gw2snxcbs7gh7r1"; + cargoSha256 = "0a6hhangbx62nsyrfzbxjv7cg5c9d8wh83f02ay72gkf48sqy75h"; meta = with lib; { description = "A command line tool to write random bytes to stdout"; homepage = "https://github.com/Wulfsta/psw"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ wulfsta ]; - platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/pubs/default.nix b/pkgs/tools/misc/pubs/default.nix index 24367189ff0..be5fd6d499c 100644 --- a/pkgs/tools/misc/pubs/default.nix +++ b/pkgs/tools/misc/pubs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, python3Packages }: +{ lib, fetchFromGitHub, fetchpatch, python3Packages }: python3Packages.buildPythonApplication rec { pname = "pubs"; @@ -12,14 +12,14 @@ python3Packages.buildPythonApplication rec { }; propagatedBuildInputs = with python3Packages; [ - argcomplete dateutil configobj feedparser bibtexparser pyyaml requests six + argcomplete dateutil configobj feedparser bibtexparser pyyaml requests six beautifulsoup4 ]; checkInputs = with python3Packages; [ pyfakefs mock ddt ]; # Disabling git tests because they expect git to be preconfigured - # with the user's details. See + # with the user's details. See # https://github.com/NixOS/nixpkgs/issues/94663 preCheck = '' rm tests/test_git.py diff --git a/pkgs/tools/misc/pv/default.nix b/pkgs/tools/misc/pv/default.nix index dd64366679c..013ddb8e3da 100644 --- a/pkgs/tools/misc/pv/default.nix +++ b/pkgs/tools/misc/pv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl } : +{ lib, stdenv, fetchurl } : stdenv.mkDerivation rec { name = "pv-1.6.6"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.ivarch.com/programs/pv"; description = "Tool for monitoring the progress of data through a pipeline"; - license = stdenv.lib.licenses.artistic2; - maintainers = with stdenv.lib.maintainers; [ ]; - platforms = with stdenv.lib.platforms; all; + license = lib.licenses.artistic2; + maintainers = with lib.maintainers; [ ]; + platforms = with lib.platforms; all; }; } diff --git a/pkgs/tools/misc/pws/gemset.nix b/pkgs/tools/misc/pws/gemset.nix index 2aa26f9a020..e0b263e86a5 100644 --- a/pkgs/tools/misc/pws/gemset.nix +++ b/pkgs/tools/misc/pws/gemset.nix @@ -31,4 +31,4 @@ }; version = "1.0.6"; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/misc/qjoypad/default.nix b/pkgs/tools/misc/qjoypad/default.nix index 2b8a2fb02be..7fc578ec857 100644 --- a/pkgs/tools/misc/qjoypad/default.nix +++ b/pkgs/tools/misc/qjoypad/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, pkgconfig, libX11, libXtst, qt4 }: +{ lib, stdenv, fetchurl, pkg-config, libX11, libXtst, qt4 }: stdenv.mkDerivation rec { name = "qjoypad-4.1.0"; src = fetchurl { url = "mirror://sourceforge/qjoypad/${name}.tar.gz"; sha256 = "1jlm7i26nfp185xrl41kz5z6fgvyj51bjpz48cg27xx64y40iamm"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXtst qt4 ]; NIX_LDFLAGS = "-lX11"; patchPhase = '' @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { experience just a little bit nicer. ''; homepage = "http://qjoypad.sourceforge.net"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ astsmtl ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/tools/misc/rargs/default.nix b/pkgs/tools/misc/rargs/default.nix index c8eea974750..dc07e3dd4f4 100644 --- a/pkgs/tools/misc/rargs/default.nix +++ b/pkgs/tools/misc/rargs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "rargs"; @@ -19,6 +19,6 @@ rustPlatform.buildRustPackage rec { description = "xargs + awk with pattern matching support"; homepage = "https://github.com/lolabout/rargs"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ pblkt ]; + maintainers = with maintainers; [ pblkt ]; }; } diff --git a/pkgs/tools/misc/rauc/default.nix b/pkgs/tools/misc/rauc/default.nix new file mode 100644 index 00000000000..663768c1507 --- /dev/null +++ b/pkgs/tools/misc/rauc/default.nix @@ -0,0 +1,50 @@ +{ autoreconfHook +, curl +, dbus +, fetchFromGitHub +, glib +, json-glib +, lib +, nix-update-script +, openssl +, pkg-config +, stdenv +}: + +stdenv.mkDerivation rec { + pname = "rauc"; + version = "1.5.1"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-AIizbD2jaZ5SY0K/hwpHdGE20KEhWC53LWUiVYs9Oiw="; + }; + + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ pkg-config autoreconfHook ]; + + buildInputs = [ curl dbus glib json-glib openssl ]; + + configureFlags = [ + "--with-dbusinterfacesdir=${placeholder "out"}/share/dbus-1/interfaces" + "--with-dbuspolicydir=${placeholder "out"}/share/dbus-1/systemd.d" + "--with-dbussystemservicedir=${placeholder "out"}/share/dbus-1/system-services" + ]; + + meta = with lib; { + description = "Safe and secure software updates for embedded Linux"; + homepage = "https://rauc.io"; + license = licenses.lgpl21; + maintainers = with maintainers; [ emantor ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/tools/misc/rcm/default.nix b/pkgs/tools/misc/rcm/default.nix index dc166f3d0b4..6eea6fe7beb 100644 --- a/pkgs/tools/misc/rcm/default.nix +++ b/pkgs/tools/misc/rcm/default.nix @@ -1,12 +1,15 @@ -{ lib, stdenv, fetchurl }: +{ lib +, stdenv +, fetchurl +}: stdenv.mkDerivation rec { pname = "rcm"; - version = "1.3.3"; + version = "1.3.4"; src = fetchurl { url = "https://thoughtbot.github.io/rcm/dist/rcm-${version}.tar.gz"; - sha256 = "1bqk7rrp1ckzvsvl9wghsr77m8xl3a7yc5gqdsisz492dx2j8mck"; + sha256 = "sha256-mxGuN0Sc9NI07G0TSEeb/tMlPauhH36ed0BZhltmwko="; }; patches = [ ./fix-rcmlib-path.patch ]; @@ -18,10 +21,10 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Management Suite for Dotfiles"; homepage = "https://github.com/thoughtbot/rcm"; + description = "Management Suite for Dotfiles"; license = licenses.bsd3; - maintainers = with maintainers; [ malyn ]; + maintainers = with maintainers; [ malyn AndersonTorres ]; platforms = with platforms; unix; }; } diff --git a/pkgs/tools/misc/recoverjpeg/default.nix b/pkgs/tools/misc/recoverjpeg/default.nix index c71bd42c94c..4b8ea50cd4e 100644 --- a/pkgs/tools/misc/recoverjpeg/default.nix +++ b/pkgs/tools/misc/recoverjpeg/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { postFixup = '' wrapProgram $out/bin/sort-pictures \ - --prefix PATH : ${stdenv.lib.makeBinPath [ exif imagemagick ]} + --prefix PATH : ${lib.makeBinPath [ exif imagemagick ]} ''; meta = with lib; { diff --git a/pkgs/tools/misc/recutils/default.nix b/pkgs/tools/misc/recutils/default.nix index 416fa23f453..5453ab75a4a 100644 --- a/pkgs/tools/misc/recutils/default.nix +++ b/pkgs/tools/misc/recutils/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, emacs, curl, check, bc }: +{ fetchurl, lib, stdenv, emacs, curl, check, bc }: stdenv.mkDerivation rec { name = "recutils-1.8"; @@ -27,9 +27,9 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/recutils/"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; maintainers = [ ]; }; } diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix index 5c7fa9d4c24..ef684aebe3c 100644 --- a/pkgs/tools/misc/remind/default.nix +++ b/pkgs/tools/misc/remind/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, tk, tcllib, makeWrapper +{lib, stdenv, fetchurl, tk, tcllib, makeWrapper , tkremind ? true } : @@ -7,9 +7,9 @@ assert tkremind -> tcllib != null; assert tkremind -> makeWrapper != null; let - inherit (stdenv.lib) optional optionalString; - tclLibraries = stdenv.lib.optionals tkremind [ tcllib tk ]; - tclLibPaths = stdenv.lib.concatStringsSep " " + inherit (lib) optional optionalString; + tclLibraries = lib.optionals tkremind [ tcllib tk ]; + tclLibPaths = lib.concatStringsSep " " (map (p: "${p}/lib/${p.libPrefix}") tclLibraries); tkremindPatch = optionalString tkremind '' substituteInPlace scripts/tkremind --replace "exec wish" "exec ${tk}/bin/wish" @@ -42,8 +42,8 @@ in stdenv.mkDerivation rec { meta = { homepage = "https://dianne.skoll.ca/projects/remind/"; description = "Sophisticated calendar and alarm program for the console"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [raskin kovirobi]; - platforms = with stdenv.lib.platforms; unix; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [raskin kovirobi]; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/tools/misc/rename/default.nix b/pkgs/tools/misc/rename/default.nix index 63ceca8d934..a9f42d1139e 100644 --- a/pkgs/tools/misc/rename/default.nix +++ b/pkgs/tools/misc/rename/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, perlPackages }: +{ lib, fetchFromGitHub, perlPackages }: perlPackages.buildPerlPackage { pname = "rename"; diff --git a/pkgs/tools/misc/renameutils/default.nix b/pkgs/tools/misc/renameutils/default.nix index 73146f09792..e730b583d7c 100644 --- a/pkgs/tools/misc/renameutils/default.nix +++ b/pkgs/tools/misc/renameutils/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, readline}: +{lib, stdenv, fetchurl, readline}: stdenv.mkDerivation { name = "renameutils-0.12.0"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { homepage = "https://www.nongnu.org/renameutils/"; description = "A set of programs to make renaming of files faster"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/misc/riemann-c-client/default.nix b/pkgs/tools/misc/riemann-c-client/default.nix index ca8fe489c16..c60dd9f7c7a 100644 --- a/pkgs/tools/misc/riemann-c-client/default.nix +++ b/pkgs/tools/misc/riemann-c-client/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, file , protobufc }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file , protobufc }: stdenv.mkDerivation rec { name = "riemann-c-client-1.10.4"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "01gzqxqm1xvki2vd78c7my2kgp4fyhkcf5j5fmy8z0l93lgj82rr"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ file protobufc ]; preBuild = '' diff --git a/pkgs/tools/misc/riemann-tools/gemset.nix b/pkgs/tools/misc/riemann-tools/gemset.nix index e775de987d6..57acb5ac901 100644 --- a/pkgs/tools/misc/riemann-tools/gemset.nix +++ b/pkgs/tools/misc/riemann-tools/gemset.nix @@ -71,4 +71,4 @@ }; version = "2.9.9"; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/misc/rig/default.nix b/pkgs/tools/misc/rig/default.nix index 7e1d9307a16..9fa28264eed 100644 --- a/pkgs/tools/misc/rig/default.nix +++ b/pkgs/tools/misc/rig/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl } : +{ lib, stdenv, fetchurl } : stdenv.mkDerivation rec { version = "1.11"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { patches = [ ./rig_1.11-1.diff ]; meta = { - homepage = "http://rig.sourceforge.net/"; + homepage = "http://rig.sourceforge.net/"; description = "Random identity generator"; longDescription = '' RIG (Random Identity Generator) is a free replacement for a shareware @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { if the Web site/BBS/person you are giving the information to tries to cross-check the city, state, zip, or area code, it will check out. ''; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ tomberek ]; - platforms = with stdenv.lib.platforms; all; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ tomberek ]; + platforms = with lib.platforms; all; }; } diff --git a/pkgs/tools/misc/rlwrap/default.nix b/pkgs/tools/misc/rlwrap/default.nix index c19b0f1f9ac..ac1431d3a1b 100644 --- a/pkgs/tools/misc/rlwrap/default.nix +++ b/pkgs/tools/misc/rlwrap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, readline }: +{ lib, stdenv, fetchurl, readline }: stdenv.mkDerivation rec { pname = "rlwrap"; @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { meta = { description = "Readline wrapper for console programs"; homepage = "https://github.com/hanslub42/rlwrap"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix index 36da8d0a463..09ebbe33a34 100644 --- a/pkgs/tools/misc/rmlint/default.nix +++ b/pkgs/tools/misc/rmlint/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , cairo , fetchFromGitHub , gettext @@ -9,7 +9,7 @@ , libelf , makeWrapper , pango -, pkgconfig +, pkg-config , polkit , python3 , scons @@ -18,7 +18,7 @@ , wrapGAppsHook , withGui ? false }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "rmlint"; version = "2.10.1"; @@ -30,14 +30,14 @@ stdenv.mkDerivation rec { sha256 = "15xfkcw1bkfyf3z8kl23k3rlv702m0h7ghqxvhniynvlwbgh6j2x"; }; - CFLAGS="-I${stdenv.lib.getDev util-linux}/include"; + CFLAGS="-I${lib.getDev util-linux}/include"; nativeBuildInputs = [ - pkgconfig + pkg-config sphinx gettext scons - ] ++ stdenv.lib.optionals withGui [ + ] ++ lib.optionals withGui [ makeWrapper wrapGAppsHook ]; @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { json-glib libelf util-linux - ] ++ stdenv.lib.optionals withGui [ + ] ++ lib.optionals withGui [ cairo gobject-introspection gtksourceview3 @@ -59,10 +59,10 @@ stdenv.mkDerivation rec { # this doesn't seem to support configureFlags, and appends $out afterwards, # so add the --without-gui in front of it - prefixKey = stdenv.lib.optionalString (!withGui) " --without-gui " + "--prefix="; + prefixKey = lib.optionalString (!withGui) " --without-gui " + "--prefix="; # in GUI mode, this shells out to itself, and tries to import python modules - postInstall = stdenv.lib.optionalString withGui '' + postInstall = lib.optionalString withGui '' gappsWrapperArgs+=(--prefix PATH : "$out/bin") gappsWrapperArgs+=(--prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${python3.pkgs.pygobject3}):$(toPythonPath ${python3.pkgs.pycairo})") ''; diff --git a/pkgs/tools/misc/rockbox-utility/default.nix b/pkgs/tools/misc/rockbox-utility/default.nix index 1a13a1d2ed9..a75b90d6f54 100644 --- a/pkgs/tools/misc/rockbox-utility/default.nix +++ b/pkgs/tools/misc/rockbox-utility/default.nix @@ -1,9 +1,9 @@ -{ lib, stdenv, fetchurl, pkgconfig, cryptopp +{ lib, stdenv, fetchurl, pkg-config, cryptopp , libusb1, qtbase, qttools, makeWrapper , qmake, withEspeak ? false, espeak ? null , qt5 }: -let inherit (stdenv.lib) getDev; in +let inherit (lib) getDev; in stdenv.mkDerivation rec { pname = "rockbox-utility"; @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ cryptopp libusb1 qtbase qttools ] - ++ stdenv.lib.optional withEspeak espeak; - nativeBuildInputs = [ makeWrapper pkgconfig qmake qt5.wrapQtAppsHook ]; + ++ lib.optional withEspeak espeak; + nativeBuildInputs = [ makeWrapper pkg-config qmake qt5.wrapQtAppsHook ]; postPatch = '' sed -i rbutil/rbutilqt/rbutilqt.pro \ @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { install -Dm755 RockboxUtility $out/bin/rockboxutility ln -s $out/bin/rockboxutility $out/bin/RockboxUtility wrapProgram $out/bin/rockboxutility \ - ${stdenv.lib.optionalString withEspeak '' + ${lib.optionalString withEspeak '' --prefix PATH : ${espeak}/bin ''} diff --git a/pkgs/tools/misc/routino/default.nix b/pkgs/tools/misc/routino/default.nix index d75e51d4ed8..0205209d491 100644 --- a/pkgs/tools/misc/routino/default.nix +++ b/pkgs/tools/misc/routino/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { pname = "routino"; - version = "3.3.2"; + version = "3.3.3"; src = fetchurl { url = "https://routino.org/download/${pname}-${version}.tgz"; - sha256 = "1ccx3s99j8syxc1gqkzsaqkmyf44l7h3adildnc5iq2md7bp8wab"; + sha256 = "1xa7l2bjn832nk6bc7b481nv8hd2gj41jwhg0d2qy10lqdvjpn5b"; }; patchFlags = [ "-p0" ]; - patches = stdenv.lib.optionals stdenv.isDarwin [ + patches = lib.optionals stdenv.isDarwin [ (fetchpatch { url = "https://raw.githubusercontent.com/macports/macports-ports/18fd229516a46e7272003acbe555735b2a902db7/gis/routino/files/patch-Makefile_conf.diff"; sha256 = "1b7hpa4sizansnwwxq1c031nxwdwh71pg08jl9z9apiab8pjsn53"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "doc" ]; - CLANG = stdenv.lib.optionalString stdenv.cc.isClang "1"; + CLANG = lib.optionalString stdenv.cc.isClang "1"; makeFlags = [ "prefix=$(out)" ]; diff --git a/pkgs/tools/misc/rpi-imager/default.nix b/pkgs/tools/misc/rpi-imager/default.nix new file mode 100644 index 00000000000..a18a8d6d38d --- /dev/null +++ b/pkgs/tools/misc/rpi-imager/default.nix @@ -0,0 +1,55 @@ +{ mkDerivation, + stdenv, + lib, + fetchFromGitHub, + cmake, + curl, + libarchive, + util-linux, + qtbase, + qtdeclarative, + qtsvg, + qttools, + qtquickcontrols2, + qtgraphicaleffects +}: + +mkDerivation rec { + pname = "rpi-imager"; + version = "1.5"; + + src = fetchFromGitHub { + owner = "raspberrypi"; + repo = pname; + rev = "v${version}"; + sha256 = "0596c7rpkykmjr3gsz9yczqsj7fzq04kc97s0rqkygjnwiqh2rwz"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ + curl + libarchive + util-linux + qtbase + qtdeclarative + qtsvg + qttools + qtquickcontrols2 + qtgraphicaleffects + ]; + + /* By default, the builder checks for JSON support in lsblk by running "lsblk --json", + but that throws an error, as /sys/dev doesn't exist in the sandbox. + This patch removes the check. */ + patches = [ ./lsblkCheckFix.patch ]; + + meta = with lib; { + description = "Raspberry Pi Imaging Utility"; + homepage = "https://www.raspberrypi.org/software/"; + license = licenses.asl20; + maintainers = with maintainers; [ ymarkus ]; + platforms = platforms.all; + # does not build on darwin + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/tools/misc/rpi-imager/lsblkCheckFix.patch b/pkgs/tools/misc/rpi-imager/lsblkCheckFix.patch new file mode 100644 index 00000000000..98fd2a659dc --- /dev/null +++ b/pkgs/tools/misc/rpi-imager/lsblkCheckFix.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3d7fc79..8ce72b9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -229,11 +229,6 @@ else() + if (NOT LSBLK) + message(FATAL_ERROR "Unable to locate lsblk (used for disk enumeration)") + endif() +- +- execute_process(COMMAND "${LSBLK}" "--json" RESULT_VARIABLE ret) +- if (ret EQUAL "1") +- message(FATAL_ERROR "util-linux package too old. lsblk does not support --json (used for disk enumeration)") +- endif() + endif() + + configure_file( diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix index 63c0f90079b..9d95085296f 100644 --- a/pkgs/tools/misc/rpm-ostree/default.nix +++ b/pkgs/tools/misc/rpm-ostree/default.nix @@ -6,7 +6,7 @@ , autoconf , automake , libtool -, pkgconfig +, pkg-config , cargo , rustc , gobject-introspection @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config which autoconf automake diff --git a/pkgs/tools/misc/rrdtool/default.nix b/pkgs/tools/misc/rrdtool/default.nix index 88db9409316..225ed2e7824 100644 --- a/pkgs/tools/misc/rrdtool/default.nix +++ b/pkgs/tools/misc/rrdtool/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, gettext, perl, pkgconfig, libxml2, pango, cairo, groff +{ fetchurl, lib, stdenv, gettext, perl, pkg-config, libxml2, pango, cairo, groff , tcl-8_5, darwin }: stdenv.mkDerivation rec { @@ -9,10 +9,10 @@ stdenv.mkDerivation rec { sha256 = "1nsqra0g2nja19akmf9x5y9hhgc35ml3w9dcdz2ayz7zgvmzm6d1"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gettext perl libxml2 pango cairo groff ] - ++ stdenv.lib.optionals stdenv.isDarwin [ tcl-8_5 darwin.apple_sdk.frameworks.ApplicationServices ]; + ++ lib.optionals stdenv.isDarwin [ tcl-8_5 darwin.apple_sdk.frameworks.ApplicationServices ]; postInstall = '' # for munin and rrdtool support diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix index fee6ae14bbd..731f6c48785 100644 --- a/pkgs/tools/misc/s6-portable-utils/default.nix +++ b/pkgs/tools/misc/s6-portable-utils/default.nix @@ -7,8 +7,8 @@ let in buildPackage { pname = pname; - version = "2.2.3.0"; - sha256 = "063zwifigg2b3wsixdcz4h9yvr6fkqssvx0iyfsprjfmm1yapfi9"; + version = "2.2.3.1"; + sha256 = "1ks1ch5v3p2z8y8wp5fmzzgjrqn2l5sj1sgfp8vv6wy8psd8mrj3"; description = "A set of tiny general Unix utilities optimized for simplicity and small size"; diff --git a/pkgs/tools/misc/sam-ba/default.nix b/pkgs/tools/misc/sam-ba/default.nix index 5d27af2050f..60853d2cf7e 100644 --- a/pkgs/tools/misc/sam-ba/default.nix +++ b/pkgs/tools/misc/sam-ba/default.nix @@ -4,7 +4,7 @@ let maybe64 = if stdenv.isx86_64 then "_64" else ""; - libPath = stdenv.lib.makeLibraryPath + libPath = lib.makeLibraryPath [ stdenv.cc.cc.lib libX11 libXScrnSaver libXext libXft libXrender freetype zlib fontconfig ]; diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index aef209022ff..0443deae077 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -16,21 +16,21 @@ stdenv.mkDerivation rec { "--enable-colors256" ]; - patches = stdenv.lib.optional stdenv.hostPlatform.isMusl + patches = lib.optional stdenv.hostPlatform.isMusl (fetchpatch { url = "https://gist.githubusercontent.com/yujinakayama/4608863/raw/76b9f89af5e5a2e97d9a0f36aac989fb56cf1447/gistfile1.diff"; sha256 = "0f9bf83p8zdxaa1pr75jyf5g8xr3r8kv7cyzzbpraa1q4j15ss1p"; stripLen = 1; }); - postPatch = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) + postPatch = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) # XXX: Awful hack to allow cross-compilation. '' sed -i ./configure \ -e 's/^as_fn_error .. \("cannot run test program while cross compiling\)/$as_echo \1/g' ''; # " - buildInputs = [ ncurses ] ++ stdenv.lib.optional stdenv.isLinux pam - ++ stdenv.lib.optional stdenv.isDarwin utmp; + buildInputs = [ ncurses ] ++ lib.optional stdenv.isLinux pam + ++ lib.optional stdenv.isDarwin utmp; doCheck = true; diff --git a/pkgs/tools/misc/sd-mux-ctrl/default.nix b/pkgs/tools/misc/sd-mux-ctrl/default.nix index 487307d3224..d42909a5c77 100644 --- a/pkgs/tools/misc/sd-mux-ctrl/default.nix +++ b/pkgs/tools/misc/sd-mux-ctrl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, cmake, pkgconfig, libftdi1, popt}: +{ lib, stdenv, fetchgit, cmake, pkg-config, libftdi1, popt}: stdenv.mkDerivation rec { pname = "sd-mux-ctrl-unstable"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0fxl8m1zkkyxkc2zi8930m0njfgnd04a22acny6vljnzag2shjvg"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libftdi1 popt ]; diff --git a/pkgs/tools/misc/sdate/default.nix b/pkgs/tools/misc/sdate/default.nix index 06b5360086c..69c9d726713 100644 --- a/pkgs/tools/misc/sdate/default.nix +++ b/pkgs/tools/misc/sdate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook }: +{ lib, stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { pname = "sdate"; version = "0.7"; @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.df7cb.de/projects/sdate"; description = "Eternal september version of the date program"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ edef ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ edef ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/misc/sfeed/default.nix b/pkgs/tools/misc/sfeed/default.nix new file mode 100644 index 00000000000..6f205db432f --- /dev/null +++ b/pkgs/tools/misc/sfeed/default.nix @@ -0,0 +1,32 @@ +{ stdenv, lib, fetchgit }: + +stdenv.mkDerivation rec { + pname = "sfeed"; + version = "0.9.20"; + + src = fetchgit { + url = "git://git.codemadness.org/sfeed"; + rev = version; + sha256 = "17bs31wns71fx7s06rdzqkghkgv86r9d9i3814rznyzi9484c7aq"; + }; + + installPhase = '' + mkdir $out + make install PREFIX=$out + ''; + + meta = with lib; { + homepage = "https://codemadness.org/sfeed-simple-feed-parser.html"; + description = "A RSS and Atom parser (and some format programs)"; + longDescription = '' + It converts RSS or Atom feeds from XML to a TAB-separated file. There are + formatting programs included to convert this TAB-separated format to + various other formats. There are also some programs and scripts included + to import and export OPML and to fetch, filter, merge and order feed + items. + ''; + license = licenses.isc; + maintainers = [ maintainers.matthiasbeyer ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/shadowenv/default.nix b/pkgs/tools/misc/shadowenv/default.nix index b3ab2002ca6..88f4840e2f0 100644 --- a/pkgs/tools/misc/shadowenv/default.nix +++ b/pkgs/tools/misc/shadowenv/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; postInstall = '' installManPage man/man1/shadowenv.1 diff --git a/pkgs/tools/misc/shallot/default.nix b/pkgs/tools/misc/shallot/default.nix index 84e241b7a2c..c3c88a6baf0 100644 --- a/pkgs/tools/misc/shallot/default.nix +++ b/pkgs/tools/misc/shallot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub, fetchpatch , openssl }: @@ -38,8 +38,8 @@ stdenv.mkDerivation rec { meta = { description = "Allows you to create customized .onion addresses for your hidden service"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; homepage = "https://github.com/katmagic/Shallot"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/shelldap/default.nix b/pkgs/tools/misc/shelldap/default.nix index 41e4207d6c9..18c5aea3dfd 100644 --- a/pkgs/tools/misc/shelldap/default.nix +++ b/pkgs/tools/misc/shelldap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perlPackages }: +{ lib, fetchurl, perlPackages }: perlPackages.buildPerlPackage rec { pname = "shelldap"; version = "1.4.0"; diff --git a/pkgs/tools/misc/silicon/default.nix b/pkgs/tools/misc/silicon/default.nix index 56c9541c2e0..1ff73492401 100644 --- a/pkgs/tools/misc/silicon/default.nix +++ b/pkgs/tools/misc/silicon/default.nix @@ -2,7 +2,7 @@ , stdenv , rustPlatform , fetchFromGitHub -, pkgconfig +, pkg-config , cmake , llvmPackages , expat @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals stdenv.isLinux [ libxcb ] ++ lib.optionals stdenv.isDarwin [ AppKit CoreText Security ]; - nativeBuildInputs = [ cmake pkgconfig ] + nativeBuildInputs = [ cmake pkg-config ] ++ lib.optionals stdenv.isLinux [ python3 ]; LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; diff --git a/pkgs/tools/misc/sixpair/default.nix b/pkgs/tools/misc/sixpair/default.nix index f738ed71ec7..52c61d917b1 100644 --- a/pkgs/tools/misc/sixpair/default.nix +++ b/pkgs/tools/misc/sixpair/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libusb-compat-0_1 }: +{ lib, stdenv, fetchurl, libusb-compat-0_1 }: stdenv.mkDerivation { name = "sixpair-2007-04-18"; @@ -31,8 +31,8 @@ stdenv.mkDerivation { This command-line utility searches USB buses for SIXAXIS controllers and tells them to connect to a new Bluetooth master. ''; homepage = "http://www.pabr.org/sixlinux/"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.tomsmeets ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.tomsmeets ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/slop/default.nix b/pkgs/tools/misc/slop/default.nix index 32d55a3733c..a4a65e37e4e 100644 --- a/pkgs/tools/misc/slop/default.nix +++ b/pkgs/tools/misc/slop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config , glew, glm, libGLU, libGL, libX11, libXext, libXrender, icu , cppcheck }: @@ -14,17 +14,17 @@ stdenv.mkDerivation rec { sha256 = "1k8xxb4rj2fylr4vj16yvsf73cyywliz9cy78pl4ibmi03jhg837"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ glew glm libGLU libGL libX11 libXext libXrender icu ] - ++ stdenv.lib.optional doCheck cppcheck; + ++ lib.optional doCheck cppcheck; doCheck = false; meta = with lib; { inherit (src.meta) homepage; description = "Queries a selection from the user and prints to stdout"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + license = lib.licenses.gpl3Plus; maintainers = with maintainers; [ primeos mbakke ]; }; } diff --git a/pkgs/tools/misc/slsnif/default.nix b/pkgs/tools/misc/slsnif/default.nix index 8078ee51eb2..7f6f9fa40c2 100644 --- a/pkgs/tools/misc/slsnif/default.nix +++ b/pkgs/tools/misc/slsnif/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "slsnif-0.4.4"; @@ -8,10 +8,10 @@ stdenv.mkDerivation { sha256 = "0gn8c5hj8m3sywpwdgn6w5xl4rzsvg0z7d2w8dxi6p152j5b0pii"; }; - meta = { + meta = { description = "Serial line sniffer"; homepage = "http://slsnif.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/slurp/default.nix b/pkgs/tools/misc/slurp/default.nix index 190f637936d..ed4bb0037fb 100644 --- a/pkgs/tools/misc/slurp/default.nix +++ b/pkgs/tools/misc/slurp/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config - ] ++ stdenv.lib.optional buildDocs scdoc; + ] ++ lib.optional buildDocs scdoc; buildInputs = [ cairo @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { wayland-protocols ]; - mesonFlags = stdenv.lib.optional buildDocs "-Dman-pages=enabled"; + mesonFlags = lib.optional buildDocs "-Dman-pages=enabled"; meta = with lib; { description = "Select a region in a Wayland compositor"; diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix index c249419d589..03f24c16aab 100644 --- a/pkgs/tools/misc/snapper/default.nix +++ b/pkgs/tools/misc/snapper/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, autoreconfHook, pkgconfig, docbook_xsl, libxslt, docbook_xml_dtd_45 +, autoreconfHook, pkg-config, docbook_xsl, libxslt, docbook_xml_dtd_45 , acl, attr, boost, btrfs-progs, dbus, diffutils, e2fsprogs, libxml2 , lvm2, pam, python, util-linux, fetchpatch, json_c, nixosTests , ncurses }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - autoreconfHook pkgconfig + autoreconfHook pkg-config docbook_xsl libxslt docbook_xml_dtd_45 ]; buildInputs = [ @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tool for Linux filesystem snapshot management"; homepage = "http://snapper.io"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = with maintainers; [ tstrobel markuskowa ]; }; diff --git a/pkgs/tools/misc/somafm-cli/default.nix b/pkgs/tools/misc/somafm-cli/default.nix index b0aebd6224e..abead39d348 100644 --- a/pkgs/tools/misc/somafm-cli/default.nix +++ b/pkgs/tools/misc/somafm-cli/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { installPhase = '' install -m0755 -D src/somafm $out/bin/somafm - wrapProgram $out/bin/somafm --prefix PATH ":" "${stdenv.lib.makeBinPath [ curl jq mpv ]}"; + wrapProgram $out/bin/somafm --prefix PATH ":" "${lib.makeBinPath [ curl jq mpv ]}"; ''; meta = with lib; { diff --git a/pkgs/tools/misc/spigot/default.nix b/pkgs/tools/misc/spigot/default.nix index 8321d03a48f..a088705036d 100644 --- a/pkgs/tools/misc/spigot/default.nix +++ b/pkgs/tools/misc/spigot/default.nix @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A command-line exact real calculator"; homepage = "https://www.chiark.greenend.org.uk/~sgtatham/spigot/"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.mit; + platforms = lib.platforms.all; maintainers = with maintainers; [ mcbeth ]; }; } diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 50d99db5322..7f58e357091 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , rustPlatform , pkg-config @@ -10,19 +11,19 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "0.48.0"; + version = "0.49.0"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - sha256 = "1p37cfkcpqv74gp7g099alkqxanfc002kaq1cim6zkinx50gxjxw"; + sha256 = "0mchjxlhrw73846acj99s6pig93infkbdgrmym6yzk8dg0ynx5gw"; }; - nativeBuildInputs = [ installShellFiles ] ++ stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; + nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ pkg-config ]; - buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ] - ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = lib.optionals stdenv.isLinux [ openssl ] + ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; postInstall = '' for shell in bash fish zsh; do @@ -31,18 +32,11 @@ rustPlatform.buildRustPackage rec { done ''; - cargoSha256 = "02djpwvwrrp7f0ifiypx1cr1v4bkqxrhqfhy0abfjszza95fjasv"; - - checkFlags = [ - "--skip=directory_in_home" - "--skip=home_directory" - "--skip=directory_in_root" - "--skip=truncation_symbol_not_truncated_home" - "--skip=truncation_symbol_truncated_home" - "--skip=folder_with_glide_yaml" - "--skip=shows_multiple_tfms" - "--skip=shows_pinned_in_project_below_root_with_global_json" - ]; + cargoSha256 = "0w17nv3zgczaznf1pkpj26ppxzv1arlva8zdg6b3l7m8qkkz8jn2"; + + preCheck = '' + HOME=$TMPDIR + ''; meta = with lib; { description = "A minimal, blazing fast, and extremely customizable prompt for any shell"; diff --git a/pkgs/tools/misc/staruml/default.nix b/pkgs/tools/misc/staruml/default.nix index b6a78f85a35..db3a065fdf4 100644 --- a/pkgs/tools/misc/staruml/default.nix +++ b/pkgs/tools/misc/staruml/default.nix @@ -4,7 +4,6 @@ , libXdamage, expat }: let - inherit (stdenv) lib; LD_LIBRARY_PATH = lib.makeLibraryPath [ glib gtk2 gdk-pixbuf alsaLib nss nspr GConf cups libgcrypt dbus libXdamage expat ]; in diff --git a/pkgs/tools/misc/stow/default.nix b/pkgs/tools/misc/stow/default.nix index 80741f0543c..05a8fab58d1 100644 --- a/pkgs/tools/misc/stow/default.nix +++ b/pkgs/tools/misc/stow/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, perlPackages }: +{ lib, stdenv, fetchurl, perl, perlPackages }: let pname = "stow"; @@ -29,8 +29,8 @@ stdenv.mkDerivation { as .../share, .../man, and so on. ''; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; homepage = "https://www.gnu.org/software/stow/"; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/misc/subberthehut/default.nix b/pkgs/tools/misc/subberthehut/default.nix index 86b2941eed1..b9698e1e536 100644 --- a/pkgs/tools/misc/subberthehut/default.nix +++ b/pkgs/tools/misc/subberthehut/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, xmlrpc_c, glib, zlib }: +{ lib, stdenv, fetchFromGitHub, pkg-config, xmlrpc_c, glib, zlib }: stdenv.mkDerivation rec { pname = "subberthehut"; version = "20"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "19prdqbk19h0wak318g2jn1mnfm7l7f83a633bh0rhskysmqrsj1"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xmlrpc_c glib zlib ]; installPhase = '' diff --git a/pkgs/tools/misc/sutils/default.nix b/pkgs/tools/misc/sutils/default.nix index c94b8f646a9..78172c5ef75 100644 --- a/pkgs/tools/misc/sutils/default.nix +++ b/pkgs/tools/misc/sutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, alsaLib }: +{ lib, stdenv, fetchFromGitHub, alsaLib }: stdenv.mkDerivation rec { version = "0.2"; @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { meta = { description = "Small command-line utilities"; homepage = "https://github.com/baskerville/sutils"; - maintainers = [ stdenv.lib.maintainers.meisternu ]; + maintainers = [ lib.maintainers.meisternu ]; license = "Custom"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index ae8679c03ad..423135d53fd 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { homepage = "https://github.com/spaam/svtplay-dl"; description = "Command-line tool to download videos from svtplay.se and other sites"; license = licenses.mit; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; maintainers = [ maintainers.rycee ]; }; } diff --git a/pkgs/tools/misc/swaglyrics/default.nix b/pkgs/tools/misc/swaglyrics/default.nix index 6831a05a3ed..4bc5c28b559 100644 --- a/pkgs/tools/misc/swaglyrics/default.nix +++ b/pkgs/tools/misc/swaglyrics/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, python3, fetchFromGitHub, ncurses }: +{ lib, python3, fetchFromGitHub, ncurses }: python3.pkgs.buildPythonApplication rec { pname = "swaglyrics"; @@ -17,7 +17,9 @@ python3.pkgs.buildPythonApplication rec { preConfigure = '' substituteInPlace setup.py \ - --replace 'requests>=2.24.0' 'requests~=2.23' + --replace 'requests>=2.24.0' 'requests~=2.23' \ + --replace 'beautifulsoup4==4.9.1' 'beautifulsoup4~=4.9' \ + --replace 'colorama==0.4.3' 'colorama~=0.4' ''; preBuild = "export HOME=$NIX_BUILD_TOP"; diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index 8a0c881a277..1781187481f 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, udev, intltool, pkgconfig, glib, xmlto, wrapGAppsHook +{ lib, stdenv, fetchFromGitHub, fetchpatch, udev, intltool, pkg-config, glib, xmlto, wrapGAppsHook , docbook_xml_dtd_412, docbook_xsl , libxml2, desktop-file-utils, libusb1, cups, gdk-pixbuf, pango, atk, libnotify , gobject-introspection, libsecret, packagekit @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - intltool pkgconfig + intltool pkg-config xmlto libxml2 docbook_xml_dtd_412 docbook_xsl desktop-file-utils python3Packages.wrapPython wrapGAppsHook autoreconfHook @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/openprinting/system-config-printer"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/tools/misc/systrayhelper/default.nix b/pkgs/tools/misc/systrayhelper/default.nix index d7d699d2ba4..03d8e58f8b0 100644 --- a/pkgs/tools/misc/systrayhelper/default.nix +++ b/pkgs/tools/misc/systrayhelper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkgconfig, libappindicator-gtk3, buildGoPackage, fetchFromGitHub }: +{ lib, pkg-config, libappindicator-gtk3, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "systrayhelper"; @@ -24,7 +24,7 @@ buildGoPackage rec { -w '' ]; - nativeBuildInputs = [ pkgconfig libappindicator-gtk3 ]; + nativeBuildInputs = [ pkg-config libappindicator-gtk3 ]; buildInputs = [ libappindicator-gtk3 ]; meta = with lib; { diff --git a/pkgs/tools/misc/t/gemset.nix b/pkgs/tools/misc/t/gemset.nix index f3627e8d6e9..a61eb81b1da 100644 --- a/pkgs/tools/misc/t/gemset.nix +++ b/pkgs/tools/misc/t/gemset.nix @@ -259,4 +259,4 @@ }; version = "0.0.7.6"; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/misc/tab-rs/default.nix b/pkgs/tools/misc/tab-rs/default.nix index b3d2e1a77a7..b6c9b35ac87 100644 --- a/pkgs/tools/misc/tab-rs/default.nix +++ b/pkgs/tools/misc/tab-rs/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "tab-rs"; - version = "0.5.5"; + version = "0.5.6"; src = fetchFromGitHub { owner = "austinjones"; repo = pname; rev = "v${version}"; - sha256 = "06nip7g5y7jslqj8anvn2z7w1c8yr0gl32bpnzv26xschan4gc2h"; + sha256 = "1gyl2dxyhh4d2lpxg9s5cx734sfs1kys5z5hjqfgbiny28hp9sw6"; }; - cargoSha256 = "1clpl9fi07lms0din8f9m4y6br5jg8k5xsklsqmvgdwf83wyn321"; + cargoSha256 = "1apjzn164kakb2snrq1wfl7grm72hkddi3am6d01h5kkngkp68qm"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ IOKit ]; + buildInputs = lib.optionals stdenv.isDarwin [ IOKit ]; # many tests are failing doCheck = false; diff --git a/pkgs/tools/misc/tagref/default.nix b/pkgs/tools/misc/tagref/default.nix index 43a91eaca52..ba63ec290d4 100644 --- a/pkgs/tools/misc/tagref/default.nix +++ b/pkgs/tools/misc/tagref/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "tagref"; version = "1.4.1"; diff --git a/pkgs/tools/misc/td/gemset.nix b/pkgs/tools/misc/td/gemset.nix index e4680640ae2..53d9df0502d 100644 --- a/pkgs/tools/misc/td/gemset.nix +++ b/pkgs/tools/misc/td/gemset.nix @@ -100,4 +100,4 @@ }; version = "0.3"; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/misc/teamocil/default.nix b/pkgs/tools/misc/teamocil/default.nix index b1f6c7cdcab..5218453d15e 100644 --- a/pkgs/tools/misc/teamocil/default.nix +++ b/pkgs/tools/misc/teamocil/default.nix @@ -13,7 +13,7 @@ bundlerEnv { license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ - zachcoyle + zachcoyle nicknovitski ]; }; diff --git a/pkgs/tools/misc/teamocil/gemset.nix b/pkgs/tools/misc/teamocil/gemset.nix index f363d62b6d6..2c522b096c8 100644 --- a/pkgs/tools/misc/teamocil/gemset.nix +++ b/pkgs/tools/misc/teamocil/gemset.nix @@ -7,4 +7,4 @@ }; version = "1.4.2"; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/misc/tensorman/default.nix b/pkgs/tools/misc/tensorman/default.nix index 835409be657..0e724059e99 100644 --- a/pkgs/tools/misc/tensorman/default.nix +++ b/pkgs/tools/misc/tensorman/default.nix @@ -1,4 +1,4 @@ -{ pkgconfig, lib, stdenv, rustPlatform, rustc, cargo, docker, openssl, fetchFromGitHub }: +{ pkg-config, lib, rustPlatform, rustc, cargo, docker, openssl, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "tensorman"; @@ -11,14 +11,14 @@ rustPlatform.buildRustPackage rec { sha256 = "0ywb53snvymmwh10hm6whckz7dwmpqa4rxiggd24y178jdfrm2ns"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; cargoSha256 = "0vckay4jhg02xg68mvh7ys0yjj0p30m6wsjriqc8k24wjsrhiw9k"; meta = with lib; { description = "Utility for easy management of Tensorflow containers"; homepage = "https://github.com/pop-os/tensorman/"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ thefenriswolf ]; }; diff --git a/pkgs/tools/misc/tewisay/default.nix b/pkgs/tools/misc/tewisay/default.nix index b63ffb1cd10..3434ac110b3 100644 --- a/pkgs/tools/misc/tewisay/default.nix +++ b/pkgs/tools/misc/tewisay/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper }: +{ lib, buildGoPackage, fetchFromGitHub, makeWrapper }: buildGoPackage rec { pname = "tewisay-unstable"; @@ -29,7 +29,7 @@ buildGoPackage rec { meta = { homepage = "https://github.com/lucy/tewisay"; description = "Cowsay replacement with unicode and partial ansi escape support"; - license = stdenv.lib.licenses.cc0; - maintainers = [ stdenv.lib.maintainers.chiiruno ]; + license = lib.licenses.cc0; + maintainers = [ lib.maintainers.chiiruno ]; }; } diff --git a/pkgs/tools/misc/thefuck/default.nix b/pkgs/tools/misc/thefuck/default.nix index bf87505ab13..d26c750a0c7 100644 --- a/pkgs/tools/misc/thefuck/default.nix +++ b/pkgs/tools/misc/thefuck/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonApplication +{ lib, fetchFromGitHub, buildPythonApplication , colorama, decorator, psutil, pyte, six , pytest, pytest-mock }: diff --git a/pkgs/tools/misc/time/default.nix b/pkgs/tools/misc/time/default.nix index 89af4f693d3..8707309937b 100644 --- a/pkgs/tools/misc/time/default.nix +++ b/pkgs/tools/misc/time/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { pname = "time"; @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { `time' reports unavailable information as zero values. ''; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; homepage = "https://www.gnu.org/software/time/"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/timidity/default.nix b/pkgs/tools/misc/timidity/default.nix index c6c4886a3b4..63c4fd36ff6 100644 --- a/pkgs/tools/misc/timidity/default.nix +++ b/pkgs/tools/misc/timidity/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, libjack2, ncurses, pkgconfig }: +{ lib, stdenv, fetchurl, alsaLib, libjack2, ncurses, pkg-config }: stdenv.mkDerivation { name = "timidity-2.15.0"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { patches = [ ./timidity-iA-Oj.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ alsaLib libjack2 ncurses ]; configureFlags = [ "--enable-audio=oss,alsa,jack" "--enable-alsaseq" "--with-default-output=alsa" "--enable-ncurses" ]; diff --git a/pkgs/tools/misc/tldr/default.nix b/pkgs/tools/misc/tldr/default.nix index e4f43b5007c..25eee1c7b83 100644 --- a/pkgs/tools/misc/tldr/default.nix +++ b/pkgs/tools/misc/tldr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, curl, libzip, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, curl, libzip, pkg-config }: stdenv.mkDerivation rec { pname = "tldr"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ curl libzip ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; makeFlags = ["CC=cc" "LD=cc" "CFLAGS="]; diff --git a/pkgs/tools/misc/tmate/default.nix b/pkgs/tools/misc/tmate/default.nix index 5f1b8d23646..d43d94cc8ed 100644 --- a/pkgs/tools/misc/tmate/default.nix +++ b/pkgs/tools/misc/tmate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, cmake, libtool, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, cmake, libtool, pkg-config , zlib, openssl, libevent, ncurses, ruby, msgpack, libssh }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { dontUseCmakeConfigure = true; buildInputs = [ libtool zlib openssl libevent ncurses ruby msgpack libssh ]; - nativeBuildInputs = [ autoreconfHook cmake pkgconfig ]; + nativeBuildInputs = [ autoreconfHook cmake pkg-config ]; meta = with lib; { homepage = "https://tmate.io/"; diff --git a/pkgs/tools/misc/tmux-cssh/default.nix b/pkgs/tools/misc/tmux-cssh/default.nix index c38769f448f..f3f53627956 100644 --- a/pkgs/tools/misc/tmux-cssh/default.nix +++ b/pkgs/tools/misc/tmux-cssh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, tmux }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, tmux }: stdenv.mkDerivation { name = "tmux-cssh-20151015"; @@ -33,9 +33,9 @@ stdenv.mkDerivation { like most server do. ''; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ zimbatm ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ zimbatm ]; }; } diff --git a/pkgs/tools/misc/tmux-mem-cpu-load/default.nix b/pkgs/tools/misc/tmux-mem-cpu-load/default.nix new file mode 100644 index 00000000000..2f9f436a149 --- /dev/null +++ b/pkgs/tools/misc/tmux-mem-cpu-load/default.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "tmux-mem-cpu-load"; + version = "3.4.0"; + + src = fetchFromGitHub { + owner = "thewtex"; + repo = "tmux-mem-cpu-load"; + rev = "v${version}"; + sha256 = "1ybj513l4953jhayrzb47dlh4yv9bkvs0q1lfvky17v9fdkxgn2j"; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "CPU, RAM, and load monitor for use with tmux"; + homepage = https://github.com/thewtex/tmux-mem-cpu-load; + license = licenses.asl20; + maintainers = with maintainers; [ thomasjm ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index 7fa33ed82f2..4e5ca70b955 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -1,7 +1,7 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook -, pkgconfig +, pkg-config , makeWrapper , bison , ncurses @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config autoreconfHook bison ]; @@ -72,9 +72,9 @@ stdenv.mkDerivation rec { * A clean, easily extended, BSD-licensed codebase, under active development. ''; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ thammers fpletz ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ thammers fpletz ]; }; } diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix index 940ae130c84..57d320fd790 100644 --- a/pkgs/tools/misc/tmuxp/default.nix +++ b/pkgs/tools/misc/tmuxp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python }: +{ lib, python }: with python.pkgs; diff --git a/pkgs/tools/misc/togglesg-download/default.nix b/pkgs/tools/misc/togglesg-download/default.nix index c4d8b20ffdd..812ad7900d0 100644 --- a/pkgs/tools/misc/togglesg-download/default.nix +++ b/pkgs/tools/misc/togglesg-download/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pythonPackages, makeWrapper, ffmpeg_3 }: +{ lib, fetchFromGitHub, pythonPackages, makeWrapper, ffmpeg_3 }: pythonPackages.buildPythonApplication { diff --git a/pkgs/tools/misc/toilet/default.nix b/pkgs/tools/misc/toilet/default.nix index 3dba479f039..41eaa6b03bf 100644 --- a/pkgs/tools/misc/toilet/default.nix +++ b/pkgs/tools/misc/toilet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libcaca }: +{ lib, stdenv, fetchurl, pkg-config, libcaca }: stdenv.mkDerivation rec { pname = "toilet"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1pl118qb7g0frpgl9ps43w4sd0psjirpmq54yg1kqcclqcqbbm49"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libcaca ]; meta = with lib; { diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/tools/misc/trash-cli/default.nix index 1da49a153b8..d199fd7fda3 100644 --- a/pkgs/tools/misc/trash-cli/default.nix +++ b/pkgs/tools/misc/trash-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { pname = "trash-cli"; diff --git a/pkgs/tools/misc/trillian/default.nix b/pkgs/tools/misc/trillian/default.nix index 07b4d834978..8a96248e718 100644 --- a/pkgs/tools/misc/trillian/default.nix +++ b/pkgs/tools/misc/trillian/default.nix @@ -1,15 +1,11 @@ -{ stdenv -, lib +{ lib , buildGoModule , fetchFromGitHub }: -let + +buildGoModule rec { pname = "trillian"; version = "1.3.11"; - -in -buildGoModule { - inherit pname version; vendorSha256 = "0zxp1gjzcc3z6vkpc2bchbs1shwm1b28ks0jh4gf6zxpp4361j4l"; src = fetchFromGitHub { @@ -34,10 +30,10 @@ buildGoModule { "cmd/updatetree" ]; - meta = { + meta = with lib; { homepage = "https://github.com/google/trillian"; description = "A transparent, highly scalable and cryptographically verifiable data store."; - license = [ lib.licenses.asl20 ]; - maintainers = [ lib.maintainers.adisbladis ]; + license = [ licenses.asl20 ]; + maintainers = [ maintainers.adisbladis ]; }; } diff --git a/pkgs/tools/misc/ttf2pt1/default.nix b/pkgs/tools/misc/ttf2pt1/default.nix index b7888f0884b..fcab21eb92b 100644 --- a/pkgs/tools/misc/ttf2pt1/default.nix +++ b/pkgs/tools/misc/ttf2pt1/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, freetype }: +{ lib, stdenv, fetchurl, perl, freetype }: stdenv.mkDerivation { name = "ttf2pt1-3.4.4"; @@ -20,13 +20,13 @@ stdenv.mkDerivation { buildInputs = [ freetype ]; nativeBuildInputs = [ perl ]; - + patches = ./gentoo-makefile.patch; # also contains the freetype patch - meta = { + meta = { description = "True Type to Postscript Type 3 converter, fpdf"; homepage = "http://ttf2pt1.sourceforge.net/index.html"; license = "ttf2pt1"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/ttfautohint/default.nix b/pkgs/tools/misc/ttfautohint/default.nix index 1e73f716a7a..fe121c2d51c 100644 --- a/pkgs/tools/misc/ttfautohint/default.nix +++ b/pkgs/tools/misc/ttfautohint/default.nix @@ -1,5 +1,5 @@ { - stdenv, lib, fetchurl, pkgconfig, autoreconfHook + stdenv, lib, fetchurl, pkg-config, autoreconfHook , freetype, harfbuzz, libiconv, qtbase , enableGUI ? true }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { substituteInPlace configure --replace "macx-g++" "macx-clang" ''; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ freetype harfbuzz libiconv ] ++ lib.optional enableGUI qtbase; @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + dontWrapQtApps = true; + meta = with lib; { description = "An automatic hinter for TrueType fonts"; longDescription = '' diff --git a/pkgs/tools/misc/ttmkfdir/default.nix b/pkgs/tools/misc/ttmkfdir/default.nix index d75011ea6f4..bc1279a7dec 100644 --- a/pkgs/tools/misc/ttmkfdir/default.nix +++ b/pkgs/tools/misc/ttmkfdir/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, freetype, fontconfig, libunwind, libtool, flex, bison }: +{ lib, stdenv, fetchurl, freetype, fontconfig, libunwind, libtool, flex, bison }: stdenv.mkDerivation { name = "ttf-mkfontdir-3.0.9-6"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { url = "http://mirror.fsf.org/trisquel/pool/main/t/ttmkfdir/ttmkfdir_3.0.9.orig.tar.gz"; sha256 = "0n6bmmndmp4c1myisvv7cby559gzgvwsw4rfw065a3f92m87jxiq"; }; - + # all the patches up from ttmkfdir-3.0.9/Makefile should be reviewed by someone # who knows more about C/C++ .. patches = @@ -15,7 +15,7 @@ stdenv.mkDerivation { url = "http://mirror.fsf.org/trisquel/pool/main/t/ttmkfdir/ttmkfdir_3.0.9-6.diff.gz"; sha256 = "141kxaf2by8nf87hqyszaxi0n7nnmswr1nh2i5r5bsvxxmaj9633"; }) - + ./cstring.patch # also fixes some other compilation issues (freetype includes) ]; @@ -27,6 +27,6 @@ stdenv.mkDerivation { meta = { description = "Create fonts.dir for TTF font directory"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/ttwatch/default.nix b/pkgs/tools/misc/ttwatch/default.nix index acebd4f92e8..5e541345410 100644 --- a/pkgs/tools/misc/ttwatch/default.nix +++ b/pkgs/tools/misc/ttwatch/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, cmake, perl, pkgconfig +, cmake, perl, pkg-config , openssl, curl, libusb1, protobufc , enableUnsafe ? false }: @@ -14,10 +14,10 @@ stdenv.mkDerivation { sha256 = "07nd4dbkchxy8js1h1f6pzn63pls2afww97wyiiw6zid43mpqyg4"; }; - nativeBuildInputs = [ cmake perl pkgconfig ]; + nativeBuildInputs = [ cmake perl pkg-config ]; buildInputs = [ openssl curl libusb1 protobufc ]; - cmakeFlags = stdenv.lib.optional enableUnsafe [ "-Dunsafe=on" ]; + cmakeFlags = lib.optional enableUnsafe [ "-Dunsafe=on" ]; preFixup = '' chmod +x $out/bin/ttbin2mysports diff --git a/pkgs/tools/misc/tty-clock/default.nix b/pkgs/tools/misc/tty-clock/default.nix index bc253a1d23b..b6cca5fe5c3 100644 --- a/pkgs/tools/misc/tty-clock/default.nix +++ b/pkgs/tools/misc/tty-clock/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, ncurses, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, ncurses, pkg-config }: stdenv.mkDerivation rec { pname = "tty-clock"; @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "16v3pmva13skpfjja96zacjpxrwzs1nb1iqmrp2qzvdbcm9061pp"; }; - - nativeBuildInputs = [ pkgconfig ]; + + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/tools/misc/ttygif/default.nix b/pkgs/tools/misc/ttygif/default.nix index 045448f0302..226109ab20c 100644 --- a/pkgs/tools/misc/ttygif/default.nix +++ b/pkgs/tools/misc/ttygif/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; postInstall = '' wrapProgram $out/bin/ttygif \ - --prefix PATH : ${stdenv.lib.makeBinPath [ imagemagick xorg.xwd ]} + --prefix PATH : ${lib.makeBinPath [ imagemagick xorg.xwd ]} ''; meta = with lib; { diff --git a/pkgs/tools/misc/txr/default.nix b/pkgs/tools/misc/txr/default.nix index 9c200f1030e..d5a37e2e67f 100644 --- a/pkgs/tools/misc/txr/default.nix +++ b/pkgs/tools/misc/txr/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { description = "Programming language for convenient data munging"; license = licenses.bsd2; homepage = "http://nongnu.org/txr"; - maintainers = with stdenv.lib.maintainers; [ dtzWill ]; + maintainers = with lib.maintainers; [ dtzWill ]; platforms = platforms.linux; # Darwin fails although it should work AFAIK }; } diff --git a/pkgs/tools/misc/txt2man/default.nix b/pkgs/tools/misc/txt2man/default.nix index ded409754bc..27ff219a6e1 100644 --- a/pkgs/tools/misc/txt2man/default.nix +++ b/pkgs/tools/misc/txt2man/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, coreutils, gawk }: +{ lib, stdenv, fetchurl, coreutils, gawk }: stdenv.mkDerivation rec { pname = "txt2man"; @@ -36,8 +36,8 @@ stdenv.mkDerivation rec { meta = { description = "Convert flat ASCII text to man page format"; homepage = "http://mvertes.free.fr/"; - license = stdenv.lib.licenses.gpl2; - platforms = with stdenv.lib.platforms; linux ++ darwin; - maintainers = with stdenv.lib.maintainers; [ bjornfor ]; + license = lib.licenses.gpl2; + platforms = with lib.platforms; linux ++ darwin; + maintainers = with lib.maintainers; [ bjornfor ]; }; } diff --git a/pkgs/tools/misc/tydra/default.nix b/pkgs/tools/misc/tydra/default.nix index 6714ee489f5..00c8aa2a2c3 100644 --- a/pkgs/tools/misc/tydra/default.nix +++ b/pkgs/tools/misc/tydra/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, installShellFiles }: +{ lib, rustPlatform, fetchFromGitHub, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "tydra"; diff --git a/pkgs/tools/misc/ultrastar-creator/default.nix b/pkgs/tools/misc/ultrastar-creator/default.nix index 923f6e7a3a4..990547291f6 100644 --- a/pkgs/tools/misc/ultrastar-creator/default.nix +++ b/pkgs/tools/misc/ultrastar-creator/default.nix @@ -1,5 +1,5 @@ { lib, mkDerivation, fetchFromGitHub -, qmake, qtbase, pkgconfig, taglib, libbass, libbass_fx }: +, qmake, qtbase, pkg-config, taglib, libbass, libbass_fx }: # TODO: get rid of (unfree) libbass # issue:https://github.com/UltraStar-Deluxe/UltraStar-Creator/issues/3 @@ -33,7 +33,7 @@ mkDerivation { cd src ''; - nativeBuildInputs = [ qmake pkgconfig ]; + nativeBuildInputs = [ qmake pkg-config ]; buildInputs = [ qtbase taglib libbass libbass_fx ]; meta = with lib; { diff --git a/pkgs/tools/misc/ultrastar-manager/default.nix b/pkgs/tools/misc/ultrastar-manager/default.nix index 64221a92139..f69955020c7 100644 --- a/pkgs/tools/misc/ultrastar-manager/default.nix +++ b/pkgs/tools/misc/ultrastar-manager/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchFromGitHub, pkgconfig, symlinkJoin, qmake, diffPlugins +{ lib, mkDerivation, fetchFromGitHub, pkg-config, symlinkJoin, qmake, diffPlugins , qtbase, qtmultimedia, taglib, libmediainfo, libzen, libbass }: let @@ -109,7 +109,7 @@ in mkDerivation { make install ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; inherit buildInputs; meta = with lib; { diff --git a/pkgs/tools/misc/unclutter-xfixes/default.nix b/pkgs/tools/misc/unclutter-xfixes/default.nix index 612ace92f5b..464183cf579 100644 --- a/pkgs/tools/misc/unclutter-xfixes/default.nix +++ b/pkgs/tools/misc/unclutter-xfixes/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, xlibsWrapper, libev, libXi, libXfixes, - pkgconfig, asciidoc, libxslt, docbook_xsl }: + pkg-config, asciidoc, libxslt, docbook_xsl }: stdenv.mkDerivation rec { pname = "unclutter-xfixes"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "148m4wx8v57s3l2wb69y9imb00y8ca2li27hsxibwnl1wrkb7z4b"; }; - nativeBuildInputs = [ pkgconfig asciidoc libxslt docbook_xsl ]; + nativeBuildInputs = [ pkg-config asciidoc libxslt docbook_xsl ]; buildInputs = [ xlibsWrapper libev libXi libXfixes ]; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Rewrite of unclutter using the X11 Xfixes extension"; platforms = platforms.unix; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; inherit version; maintainers = [ maintainers.globin ]; }; diff --git a/pkgs/tools/misc/unclutter/default.nix b/pkgs/tools/misc/unclutter/default.nix index a7470fae689..1b760298191 100644 --- a/pkgs/tools/misc/unclutter/default.nix +++ b/pkgs/tools/misc/unclutter/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation { ''; maintainers = with maintainers; [ domenkozar ]; platforms = platforms.unix; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }; } diff --git a/pkgs/tools/misc/unicode/default.nix b/pkgs/tools/misc/unicode/default.nix index c8e1a0f7ca4..a2bc615ed86 100644 --- a/pkgs/tools/misc/unicode/default.nix +++ b/pkgs/tools/misc/unicode/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, python3Packages, installShellFiles }: +{ lib, fetchFromGitHub, fetchurl, python3Packages, installShellFiles }: python3Packages.buildPythonApplication rec { pname = "unicode"; diff --git a/pkgs/tools/misc/upower-notify/default.nix b/pkgs/tools/misc/upower-notify/default.nix index 2258f31fd31..79460f3a5b7 100644 --- a/pkgs/tools/misc/upower-notify/default.nix +++ b/pkgs/tools/misc/upower-notify/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: # To use upower-notify, the maintainer suggests adding something like this to your configuration.nix: # @@ -8,7 +8,7 @@ # ''; buildGoPackage rec { pname = "upower-notify"; - version = "20160310-${stdenv.lib.strings.substring 0 7 rev}"; + version = "20160310-${lib.strings.substring 0 7 rev}"; rev = "14c581e683a7e90ec9fa6d409413c16599a5323c"; goPackagePath = "github.com/omeid/upower-notify"; diff --git a/pkgs/tools/misc/urjtag/default.nix b/pkgs/tools/misc/urjtag/default.nix index f058f2cb8dd..d75d462fc8e 100644 --- a/pkgs/tools/misc/urjtag/default.nix +++ b/pkgs/tools/misc/urjtag/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoconf, automake, pkgconfig, gettext, libtool, bison +{ lib, stdenv, autoconf, automake, pkg-config, gettext, libtool, bison , flex, which, subversion, fetchurl, makeWrapper, libftdi1, libusb-compat-0_1, readline , python3 , svfSupport ? true @@ -16,23 +16,23 @@ stdenv.mkDerivation rec { sha256 = "1k2vmvvarik0q3llbfbk8ad35mcns7w1ln9gla1mn7z9c6x6x90r"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gettext autoconf automake libtool bison flex which subversion makeWrapper readline libftdi1 libusb-compat-0_1 python3 ]; configureFlags = [ - (stdenv.lib.enableFeature svfSupport "svf") - (stdenv.lib.enableFeature bsdlSupport "bsdl") - (stdenv.lib.enableFeature staplSupport "stapl") - (stdenv.lib.enableFeature jedecSupport "jedec-exp") + (lib.enableFeature svfSupport "svf") + (lib.enableFeature bsdlSupport "bsdl") + (lib.enableFeature staplSupport "stapl") + (lib.enableFeature jedecSupport "jedec-exp") ]; meta = { description = "Enhanced, modern tool for communicating over JTAG with flash chips, CPUs,and many more"; homepage = "http://urjtag.org/"; - license = with stdenv.lib.licenses; [ gpl2Plus lgpl21Plus ]; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice - maintainers = with stdenv.lib.maintainers; [ lowfatcomputing ]; + license = with lib.licenses; [ gpl2Plus lgpl21Plus ]; + platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice + maintainers = with lib.maintainers; [ lowfatcomputing ]; }; } diff --git a/pkgs/tools/misc/urn-timer/default.nix b/pkgs/tools/misc/urn-timer/default.nix index a6871526f18..83dad9ebe7f 100644 --- a/pkgs/tools/misc/urn-timer/default.nix +++ b/pkgs/tools/misc/urn-timer/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch , unstableGitUpdater @@ -57,7 +57,7 @@ stdenv.mkDerivation { url = "https://github.com/3snowp7im/urn.git"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/3snowp7im/urn"; description = "Split tracker / timer for speedrunning with GTK+ frontend"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/misc/usbmuxd/default.nix b/pkgs/tools/misc/usbmuxd/default.nix index 68d972e5968..d001db4d3cb 100644 --- a/pkgs/tools/misc/usbmuxd/default.nix +++ b/pkgs/tools/misc/usbmuxd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libusb1, libimobiledevice }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libusb1, libimobiledevice }: stdenv.mkDerivation rec { pname = "usbmuxd"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0a2xgrb4b3ndam448z74wh1267nmrz1wcbpx4xz86pwbdc93snab"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; propagatedBuildInputs = [ libimobiledevice libusb1 ]; preConfigure = '' diff --git a/pkgs/tools/misc/uucp/default.nix b/pkgs/tools/misc/uucp/default.nix index 1516e9dba33..42084fa6296 100644 --- a/pkgs/tools/misc/uucp/default.nix +++ b/pkgs/tools/misc/uucp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "uucp-1.07"; @@ -29,9 +29,9 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/uucp/uucp.html"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; maintainers = [ ]; }; } diff --git a/pkgs/tools/misc/uudeview/default.nix b/pkgs/tools/misc/uudeview/default.nix index a8495d7767c..47bc916ceb5 100644 --- a/pkgs/tools/misc/uudeview/default.nix +++ b/pkgs/tools/misc/uudeview/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, tcl, tk }: +{ lib, stdenv, fetchurl, tcl, tk }: stdenv.mkDerivation rec { name = "uudeview-0.5.20"; @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { meta = { description = "The Nice and Friendly Decoder"; homepage = "http://www.fpx.de/fp/Software/UUDeview/"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ woffs ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ woffs ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index 1d0b5d84f77..f207eda0de8 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "Y/vDYXWQ65zZ86vTwP4aCZYCMZuqbz6tpfv4uRkFAzc="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl protobuf rdkafka ] - ++ stdenv.lib.optional stdenv.isDarwin [ Security libiconv coreutils CoreServices ]; + ++ lib.optional stdenv.isDarwin [ Security libiconv coreutils CoreServices ]; # needed for internal protobuf c wrapper library PROTOC="${protobuf}/bin/protoc"; diff --git a/pkgs/tools/misc/venus/default.nix b/pkgs/tools/misc/venus/default.nix index 944b6e4ef64..28c4508525e 100644 --- a/pkgs/tools/misc/venus/default.nix +++ b/pkgs/tools/misc/venus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python, pythonPackages, libxslt, libxml2, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, python, pythonPackages, libxslt, libxml2, makeWrapper }: stdenv.mkDerivation rec { pname = "venus"; @@ -46,8 +46,8 @@ stdenv.mkDerivation rec { single combined feed, latest news first. ''; homepage = "http://intertwingly.net/code/venus/docs/index.html"; - license = stdenv.lib.licenses.psfl; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.psfl; + platforms = lib.platforms.all; maintainers = []; }; } diff --git a/pkgs/tools/misc/vimwiki-markdown/default.nix b/pkgs/tools/misc/vimwiki-markdown/default.nix index c1b1fce7abd..18adf99b9c9 100644 --- a/pkgs/tools/misc/vimwiki-markdown/default.nix +++ b/pkgs/tools/misc/vimwiki-markdown/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonApplication , fetchPypi , markdown diff --git a/pkgs/tools/misc/vivid/default.nix b/pkgs/tools/misc/vivid/default.nix index dad352cc657..e131d8bd4e7 100644 --- a/pkgs/tools/misc/vivid/default.nix +++ b/pkgs/tools/misc/vivid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "vivid"; diff --git a/pkgs/tools/misc/vmtouch/default.nix b/pkgs/tools/misc/vmtouch/default.nix index 0f46d8141f1..276389205f0 100644 --- a/pkgs/tools/misc/vmtouch/default.nix +++ b/pkgs/tools/misc/vmtouch/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, perl}: +{lib, stdenv, fetchFromGitHub, perl}: stdenv.mkDerivation rec { pname = "vmtouch"; @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { description = "Portable file system cache diagnostics and control"; longDescription = "vmtouch is a tool for learning about and controlling the file system cache of unix and unix-like systems."; homepage = "https://hoytech.com/vmtouch/"; - license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.garrison ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.garrison ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/misc/void/default.nix b/pkgs/tools/misc/void/default.nix index e6d36155732..18699e5911d 100644 --- a/pkgs/tools/misc/void/default.nix +++ b/pkgs/tools/misc/void/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "void"; diff --git a/pkgs/tools/misc/vsh/default.nix b/pkgs/tools/misc/vsh/default.nix index 1ad9ddd4deb..2220c026c49 100644 --- a/pkgs/tools/misc/vsh/default.nix +++ b/pkgs/tools/misc/vsh/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vsh"; - version = "0.7.2"; + version = "0.8.0"; src = fetchFromGitHub { owner = "fishi0x01"; repo = "vsh"; rev = "v${version}"; - sha256 = "0k9bbfzqhijzimng8plk2xx9h37h7d2wj8g3plvvs3wrf7pmwxs7"; + sha256 = "0s4i4x8kd9s2igdshgsbs6n3k670h7r6g1mn1pzlj0kpmggnhfik"; }; # vendor dir is already part of repository diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix index 75f46106209..e8bd12d567b 100644 --- a/pkgs/tools/misc/wakatime/default.nix +++ b/pkgs/tools/misc/wakatime/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub, glibcLocales }: +{ lib, python3Packages, fetchFromGitHub, glibcLocales }: with python3Packages; buildPythonApplication rec { diff --git a/pkgs/tools/misc/watchexec/default.nix b/pkgs/tools/misc/watchexec/default.nix index 8a68bef264c..5f80dad854e 100644 --- a/pkgs/tools/misc/watchexec/default.nix +++ b/pkgs/tools/misc/watchexec/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; postInstall = '' installManPage doc/watchexec.1 diff --git a/pkgs/tools/misc/websocat/default.nix b/pkgs/tools/misc/websocat/default.nix index 0d4bfacfa27..d5f09d9f9fa 100644 --- a/pkgs/tools/misc/websocat/default.nix +++ b/pkgs/tools/misc/websocat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, openssl, rustPlatform, Security, makeWrapper, bash }: +{ lib, stdenv, fetchFromGitHub, pkg-config, openssl, rustPlatform, Security, makeWrapper, bash }: rustPlatform.buildRustPackage rec { pname = "websocat"; @@ -14,15 +14,15 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--features=ssl" ]; cargoSha256 = "1hsms8rlnds8npr8m0dm21h04ci5ljda09pqb598v7ny3j2dldiq"; - nativeBuildInputs = [ pkgconfig makeWrapper ]; - buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security; + nativeBuildInputs = [ pkg-config makeWrapper ]; + buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; # The wrapping is required so that the "sh-c" option of websocat works even # if sh is not in the PATH (as can happen, for instance, when websocat is # started as a systemd service). postInstall = '' wrapProgram $out/bin/websocat \ - --prefix PATH : ${stdenv.lib.makeBinPath [ bash ]} + --prefix PATH : ${lib.makeBinPath [ bash ]} ''; meta = with lib; { diff --git a/pkgs/tools/misc/wimboot/default.nix b/pkgs/tools/misc/wimboot/default.nix index b25e0b55379..04dbca9ed63 100644 --- a/pkgs/tools/misc/wimboot/default.nix +++ b/pkgs/tools/misc/wimboot/default.nix @@ -14,12 +14,17 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-address-of-packed-member"; # Fails on gcc9 patches = [ - # Fix for newer binutils + # Fixes for newer binutils + # Add R_X86_64_PLT32 as known reloc target (fetchpatch { - url = - "https://github.com/ipxe/wimboot/commit/91be50c17d4d9f463109d5baafd70f9fdadd86db.patch"; + url = "https://github.com/ipxe/wimboot/commit/91be50c17d4d9f463109d5baafd70f9fdadd86db.patch"; sha256 = "113448n49hmk8nz1dxbhxiciwl281zwalvb8z5p9xfnjvibj8274"; }) + # Fix building with binutils 2.34 (bfd_get_section_* removed in favour of bfd_section_*) + (fetchpatch { + url = "https://github.com/ipxe/wimboot/commit/2f97e681703d30b33a4d5032a8025ab8b9f2de75.patch"; + sha256 = "0476mp74jaq3k099b654al6yi2yhgn37d9biz0wv3ln2q1gy94yf"; + }) ]; # We cannot use sourceRoot because the patch wouldn't apply @@ -40,7 +45,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://ipxe.org/wimboot"; description = "Windows Imaging Format bootloader"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ das_j ajs124 ]; platforms = platforms.x86; # Fails on aarch64 }; diff --git a/pkgs/tools/misc/wl-clipboard/default.nix b/pkgs/tools/misc/wl-clipboard/default.nix index 3904a1a03bc..676ff03ad9b 100644 --- a/pkgs/tools/misc/wl-clipboard/default.nix +++ b/pkgs/tools/misc/wl-clipboard/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config , wayland, wayland-protocols }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0c4w87ipsw09aii34szj9p0xfy0m00wyjpll0gb0aqmwa60p0c5d"; }; - nativeBuildInputs = [ meson ninja pkgconfig wayland-protocols ]; + nativeBuildInputs = [ meson ninja pkg-config wayland-protocols ]; buildInputs = [ wayland ]; meta = with lib; { diff --git a/pkgs/tools/misc/wlr-randr/default.nix b/pkgs/tools/misc/wlr-randr/default.nix index 5f0fec9fe61..85011baacae 100644 --- a/pkgs/tools/misc/wlr-randr/default.nix +++ b/pkgs/tools/misc/wlr-randr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, cmake, pkgconfig, wayland }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, cmake, pkg-config, wayland }: stdenv.mkDerivation rec { pname = "wlr-randr"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "10c8zzp78s5bw34vvjhilipa28bsdx3jbyhnxgp8f8kawh3cvgsc"; }; - nativeBuildInputs = [ meson ninja cmake pkgconfig ]; + nativeBuildInputs = [ meson ninja cmake pkg-config ]; buildInputs = [ wayland ]; meta = with lib; { diff --git a/pkgs/tools/misc/wob/default.nix b/pkgs/tools/misc/wob/default.nix index 8ddc7960cbb..cbc09b0ce64 100644 --- a/pkgs/tools/misc/wob/default.nix +++ b/pkgs/tools/misc/wob/default.nix @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config scdoc wayland ]; buildInputs = [ wayland-protocols ] - ++ stdenv.lib.optional stdenv.isLinux libseccomp; + ++ lib.optional stdenv.isLinux libseccomp; - mesonFlags = stdenv.lib.optional stdenv.isLinux "-Dseccomp=enabled"; + mesonFlags = lib.optional stdenv.isLinux "-Dseccomp=enabled"; meta = with lib; { description = "A lightweight overlay bar for Wayland"; diff --git a/pkgs/tools/misc/woeusb/default.nix b/pkgs/tools/misc/woeusb/default.nix index 63c2d017868..8cbd1ad0697 100644 --- a/pkgs/tools/misc/woeusb/default.nix +++ b/pkgs/tools/misc/woeusb/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { # should be patched with a less useless default PATH, but for now # we add everything we need manually. wrapProgram "$out/bin/woeusb" \ - --set PATH '${stdenv.lib.makeBinPath [ coreutils dosfstools findutils gawk gnugrep grub2_light ncurses ntfs3g parted util-linux wget p7zip ]}' + --set PATH '${lib.makeBinPath [ coreutils dosfstools findutils gawk gnugrep grub2_light ncurses ntfs3g parted util-linux wget p7zip ]}' ''; doInstallCheck = true; diff --git a/pkgs/tools/misc/woof/default.nix b/pkgs/tools/misc/woof/default.nix index 5c48a3cb275..3f13cd496c5 100644 --- a/pkgs/tools/misc/woof/default.nix +++ b/pkgs/tools/misc/woof/default.nix @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.home.unix-ag.org/simon/woof.html"; description = "Web Offer One File - Command-line utility to easily exchange files over a local network"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; maintainers = with maintainers; [ matthiasbeyer ]; }; } diff --git a/pkgs/tools/misc/wv/default.nix b/pkgs/tools/misc/wv/default.nix index 78affe34b58..32cdeaa2886 100644 --- a/pkgs/tools/misc/wv/default.nix +++ b/pkgs/tools/misc/wv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, imagemagick, libpng, glib, pkgconfig, libgsf +{ lib, stdenv, fetchurl, zlib, imagemagick, libpng, glib, pkg-config, libgsf , libxml2, bzip2 }: stdenv.mkDerivation rec { @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { sha256 = "17f16lkdv1c3amaz2hagiicih59ynpp4786k1m2qa1sw68xhswsc"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib imagemagick libpng glib libgsf libxml2 bzip2 ]; hardeningDisable = [ "format" ]; meta = { description = "Converter from Microsoft Word formats to human-editable ones"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.gpl2; + platforms = lib.platforms.unix; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/tools/misc/wv2/default.nix b/pkgs/tools/misc/wv2/default.nix index 8ed0455a33e..c0f85b4b8de 100644 --- a/pkgs/tools/misc/wv2/default.nix +++ b/pkgs/tools/misc/wv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, cmake, libgsf, glib, libxml2 }: +{ lib, stdenv, fetchurl, pkg-config, cmake, libgsf, glib, libxml2 }: stdenv.mkDerivation rec { name = "wv2-0.4.2"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Excellent MS Word filter lib, used in most Office suites"; - license = stdenv.lib.licenses.lgpl2; + license = lib.licenses.lgpl2; homepage = "http://wvware.sourceforge.net"; }; } diff --git a/pkgs/tools/misc/xburst-tools/default.nix b/pkgs/tools/misc/xburst-tools/default.nix index 12acbcfbe1c..f3fdc7e2227 100644 --- a/pkgs/tools/misc/xburst-tools/default.nix +++ b/pkgs/tools/misc/xburst-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, libusb-compat-0_1, libusb1, autoconf, automake, libconfuse, pkgconfig +{ lib, stdenv, fetchgit, libusb-compat-0_1, libusb1, autoconf, automake, libconfuse, pkg-config , gccCross ? null }: @@ -19,7 +19,7 @@ stdenv.mkDerivation { sh autogen.sh ''; - configureFlags = stdenv.lib.optionals (gccCross != null) [ + configureFlags = lib.optionals (gccCross != null) [ "--enable-firmware" "CROSS_COMPILE=${gccCross.targetPrefix}" ]; @@ -29,15 +29,15 @@ stdenv.mkDerivation { # Not to strip cross build binaries (this is for the gcc-cross-wrapper) dontCrossStrip = true; - nativeBuildInputs = [ autoconf automake pkgconfig ]; + nativeBuildInputs = [ autoconf automake pkg-config ]; buildInputs = [ libusb-compat-0_1 libusb1 libconfuse ] ++ - stdenv.lib.optional (gccCross != null) gccCross; + lib.optional (gccCross != null) gccCross; meta = { description = "Qi tools to access the Ben Nanonote USB_BOOT mode"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; homepage = "http://www.linux-mtd.infradead.org/"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = stdenv.lib.platforms.x86_64; + maintainers = with lib.maintainers; [viric]; + platforms = lib.platforms.x86_64; }; } diff --git a/pkgs/tools/misc/xclip/default.nix b/pkgs/tools/misc/xclip/default.nix index c1a015d3c09..6c5857f1c9a 100644 --- a/pkgs/tools/misc/xclip/default.nix +++ b/pkgs/tools/misc/xclip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, libXmu }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, libXmu }: stdenv.mkDerivation rec { pname = "xclip"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Tool to access the X clipboard from a console application"; homepage = "https://github.com/astrand/xclip"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl2; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/misc/xdxf2slob/default.nix b/pkgs/tools/misc/xdxf2slob/default.nix index 8d4998a9ff9..b898aa2fc24 100644 --- a/pkgs/tools/misc/xdxf2slob/default.nix +++ b/pkgs/tools/misc/xdxf2slob/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication { name = "xdxf2slob-unstable-2015-06-30"; diff --git a/pkgs/tools/misc/xflux/default.nix b/pkgs/tools/misc/xflux/default.nix index adc3b87ffa7..92c00d7e44d 100644 --- a/pkgs/tools/misc/xflux/default.nix +++ b/pkgs/tools/misc/xflux/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libXxf86vm, libXext, libX11, libXrandr, gcc}: +{lib, stdenv, fetchurl, libXxf86vm, libXext, libX11, libXrandr, gcc}: stdenv.mkDerivation { name = "xflux-2013-09-01"; src = fetchurl { @@ -6,7 +6,7 @@ stdenv.mkDerivation { sha256 = "cc50158fabaeee58c331f006cc1c08fd2940a126e99d37b76c8e878ef20c2021"; }; - libPath = stdenv.lib.makeLibraryPath [ + libPath = lib.makeLibraryPath [ gcc.cc libXxf86vm libXext @@ -32,8 +32,8 @@ stdenv.mkDerivation { when the sun rises. ''; homepage = "https://justgetflux.com/"; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.paholg ]; + license = lib.licenses.unfree; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.paholg ]; }; } diff --git a/pkgs/tools/misc/xflux/gui.nix b/pkgs/tools/misc/xflux/gui.nix index 03a458e818d..16379820653 100644 --- a/pkgs/tools/misc/xflux/gui.nix +++ b/pkgs/tools/misc/xflux/gui.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildPythonApplication, python3Packages, wrapGAppsHook +{ lib, fetchFromGitHub, buildPythonApplication, python3Packages, wrapGAppsHook , xflux, librsvg, gtk3, gobject-introspection, pango, gdk-pixbuf, atk , pexpect, pyGtkGlade, pygobject3, pyxdg, libappindicator-gtk3 }: @@ -42,8 +42,8 @@ buildPythonApplication rec { meta = { description = "Better lighting for Linux. Open source GUI for xflux"; homepage = "https://justgetflux.com/linux.html"; - license = stdenv.lib.licenses.unfree; # marked as unfree since the source code contains a copy of the unfree xflux binary - maintainers = [ stdenv.lib.maintainers.sheenobu ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.unfree; # marked as unfree since the source code contains a copy of the unfree xflux binary + maintainers = [ lib.maintainers.sheenobu ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/xiccd/default.nix b/pkgs/tools/misc/xiccd/default.nix index 8b9b30d56d4..7569045fa4f 100644 --- a/pkgs/tools/misc/xiccd/default.nix +++ b/pkgs/tools/misc/xiccd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libX11, libXrandr, glib, colord }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libX11, libXrandr, glib, colord }: stdenv.mkDerivation rec { pname = "xiccd"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "159fyz5535lcabi5bzmxgmjdgxlqcjaiqgzr00mi3ax0i5fdldwn"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libX11 libXrandr glib colord ]; meta = with lib; { diff --git a/pkgs/tools/misc/xmonad-log/default.nix b/pkgs/tools/misc/xmonad-log/default.nix index b8dd369cd6a..acd4a9e1d46 100644 --- a/pkgs/tools/misc/xmonad-log/default.nix +++ b/pkgs/tools/misc/xmonad-log/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "xmonad-log"; diff --git a/pkgs/tools/misc/xprite-editor/default.nix b/pkgs/tools/misc/xprite-editor/default.nix index 553863dda1a..b130de94975 100644 --- a/pkgs/tools/misc/xprite-editor/default.nix +++ b/pkgs/tools/misc/xprite-editor/default.nix @@ -24,10 +24,10 @@ rustPlatform.buildRustPackage rec { ''; }; - buildInputs = stdenv.lib.optionals stdenv.isLinux [ gtk3 ] - ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit ]; + buildInputs = lib.optionals stdenv.isLinux [ gtk3 ] + ++ lib.optionals stdenv.isDarwin [ AppKit ]; - nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config python3 ]; + nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config python3 ]; cargoSha256 = "1a0zy8gfc1gdk8nnv5qr4yspqy1jsip5nql3w74rl6h46cplpf5y"; diff --git a/pkgs/tools/misc/xtitle/default.nix b/pkgs/tools/misc/xtitle/default.nix index 2c24e627b63..5199977e587 100644 --- a/pkgs/tools/misc/xtitle/default.nix +++ b/pkgs/tools/misc/xtitle/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxcb, xcbutil, xcbutilwm, git }: +{ lib, stdenv, fetchurl, libxcb, xcbutil, xcbutilwm, git }: stdenv.mkDerivation { name = "xtitle-0.4.4"; @@ -16,8 +16,8 @@ stdenv.mkDerivation { meta = { description = "Outputs X window titles"; homepage = "https://github.com/baskerville/xtitle"; - maintainers = [ stdenv.lib.maintainers.meisternu ]; + maintainers = [ lib.maintainers.meisternu ]; license = "Custom"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/xvfb-run/default.nix b/pkgs/tools/misc/xvfb-run/default.nix index 8717d901239..a0392bf4754 100644 --- a/pkgs/tools/misc/xvfb-run/default.nix +++ b/pkgs/tools/misc/xvfb-run/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { patchShebangs $out/bin/xvfb-run wrapProgram $out/bin/xvfb-run \ --set FONTCONFIG_FILE "${fontsConf}" \ - --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which util-linux gawk coreutils ]} + --prefix PATH : ${lib.makeBinPath [ getopt xorgserver xauth which util-linux gawk coreutils ]} ''; meta = with lib; { diff --git a/pkgs/tools/misc/yad/default.nix b/pkgs/tools/misc/yad/default.nix index b28b5397e62..84d4833d63e 100644 --- a/pkgs/tools/misc/yad/default.nix +++ b/pkgs/tools/misc/yad/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, intltool, autoreconfHook, wrapGAppsHook +{ lib, stdenv, fetchFromGitHub, pkg-config, intltool, autoreconfHook, wrapGAppsHook , gtk3, hicolor-icon-theme, netpbm }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 hicolor-icon-theme ]; - nativeBuildInputs = [ autoreconfHook pkgconfig intltool wrapGAppsHook ]; + nativeBuildInputs = [ autoreconfHook pkg-config intltool wrapGAppsHook ]; postPatch = '' sed -i src/file.c -e '21i#include <glib/gprintf.h>' diff --git a/pkgs/tools/misc/yle-dl/default.nix b/pkgs/tools/misc/yle-dl/default.nix index 64568ca46b0..9ee81cd1b15 100644 --- a/pkgs/tools/misc/yle-dl/default.nix +++ b/pkgs/tools/misc/yle-dl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rtmpdump, php, wget, python3Packages, ffmpeg_3 }: +{ lib, fetchFromGitHub, rtmpdump, php, wget, python3Packages, ffmpeg_3 }: python3Packages.buildPythonApplication rec { pname = "yle-dl"; diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix index 54443083996..f58fb349c95 100644 --- a/pkgs/tools/misc/you-get/default.nix +++ b/pkgs/tools/misc/you-get/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, fetchPypi }: +{ lib, buildPythonApplication, fetchPypi }: buildPythonApplication rec { pname = "you-get"; diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index eb75ed2d6ba..fea9de8caca 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2021.01.08"; + version = "2021.01.24.1"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "1k870v9xc7g16nvixa272sdjnmc7pl49ymmnn6rdz0mcj2548h3k"; + sha256 = "001hs73fpm4nxcgn60n9wlsdmiv40f4b1k6hkl4g4wyywv9ic9fy"; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; diff --git a/pkgs/tools/misc/yubico-piv-tool/default.nix b/pkgs/tools/misc/yubico-piv-tool/default.nix index 188b7fa6b28..827eaec048f 100644 --- a/pkgs/tools/misc/yubico-piv-tool/default.nix +++ b/pkgs/tools/misc/yubico-piv-tool/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, openssl, check, pcsclite, PCSC +{ lib, stdenv, fetchurl, pkg-config, openssl, check, pcsclite, PCSC , withApplePCSC ? stdenv.isDarwin }: @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "124lhlim05gw32ydjh1yawqbnx6wdllz1ir9j00j09wji3m11rfs"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl check ] ++ (if withApplePCSC then [ PCSC ] else [ pcsclite ]); diff --git a/pkgs/tools/misc/yubikey-manager-qt/default.nix b/pkgs/tools/misc/yubikey-manager-qt/default.nix index 5b5fb66be30..0f81f132abd 100644 --- a/pkgs/tools/misc/yubikey-manager-qt/default.nix +++ b/pkgs/tools/misc/yubikey-manager-qt/default.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , fetchurl , wrapQtAppsHook , pcsclite @@ -16,8 +17,6 @@ , yubikey-personalization }: -let inherit (stdenv) lib; in - stdenv.mkDerivation rec { pname = "yubikey-manager-qt"; version = "1.1.5"; @@ -44,7 +43,7 @@ stdenv.mkDerivation rec { buildPythonPath "$pythonPath" wrapQtApp $out/bin/ykman-gui \ - --prefix LD_LIBRARY_PATH : "${stdenv.lib.getLib pcsclite}/lib:${yubikey-personalization}/lib" \ + --prefix LD_LIBRARY_PATH : "${lib.getLib pcsclite}/lib:${yubikey-personalization}/lib" \ --prefix PYTHONPATH : "$program_PYTHONPATH" mkdir -p $out/share/applications diff --git a/pkgs/tools/misc/yubikey-manager/default.nix b/pkgs/tools/misc/yubikey-manager/default.nix index 505d26bb582..07218d054df 100644 --- a/pkgs/tools/misc/yubikey-manager/default.nix +++ b/pkgs/tools/misc/yubikey-manager/default.nix @@ -3,11 +3,11 @@ python3Packages.buildPythonPackage rec { pname = "yubikey-manager"; - version = "3.1.1"; + version = "3.1.2"; srcs = fetchurl { url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz"; - sha256 = "1yhc8j67phrj5xgx09b5h7c67pgc4wj4jnkmkq0r3s6j7jn43vv8"; + hash = "sha256-dwnIOuu0QyWRl6RSdyQw7dGsAZ4xpXpx6jOpCkp4efE="; }; propagatedBuildInputs = diff --git a/pkgs/tools/misc/yubikey-neo-manager/default.nix b/pkgs/tools/misc/yubikey-neo-manager/default.nix index eeb4f5c1bd5..3991b99fcdc 100644 --- a/pkgs/tools/misc/yubikey-neo-manager/default.nix +++ b/pkgs/tools/misc/yubikey-neo-manager/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python27Packages +{ lib, fetchurl, python27Packages , libykneomgr, yubikey-personalization, libu2f-host }: python27Packages.buildPythonPackage rec { diff --git a/pkgs/tools/misc/yubikey-personalization-gui/default.nix b/pkgs/tools/misc/yubikey-personalization-gui/default.nix index 99187ef548f..af6843e3820 100644 --- a/pkgs/tools/misc/yubikey-personalization-gui/default.nix +++ b/pkgs/tools/misc/yubikey-personalization-gui/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, mkDerivation, pkgconfig, qtbase, qmake, imagemagick +{ lib, fetchurl, mkDerivation, pkg-config, qtbase, qmake, imagemagick , libyubikey, yubikey-personalization }: mkDerivation rec { @@ -9,7 +9,7 @@ mkDerivation rec { sha256 = "1knyv5yss8lhzaff6jpfqv12fjf1b8b21mfxzx3qi0hw4nl8n2v8"; }; - nativeBuildInputs = [ pkgconfig qmake imagemagick ]; + nativeBuildInputs = [ pkg-config qmake imagemagick ]; buildInputs = [ yubikey-personalization qtbase libyubikey ]; installPhase = '' diff --git a/pkgs/tools/misc/yubikey-personalization/default.nix b/pkgs/tools/misc/yubikey-personalization/default.nix index 1830af6a9bc..59739e06aa0 100644 --- a/pkgs/tools/misc/yubikey-personalization/default.nix +++ b/pkgs/tools/misc/yubikey-personalization/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, libusb1, libyubikey, json_c }: +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, libusb1, libyubikey, json_c }: stdenv.mkDerivation rec { pname = "yubikey-personalization"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 libyubikey json_c ]; configureFlags = [ diff --git a/pkgs/tools/misc/zabbixctl/default.nix b/pkgs/tools/misc/zabbixctl/default.nix index 15add8ed191..81d81b6794e 100644 --- a/pkgs/tools/misc/zabbixctl/default.nix +++ b/pkgs/tools/misc/zabbixctl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "zabbixctl"; diff --git a/pkgs/tools/misc/zsh-autoenv/default.nix b/pkgs/tools/misc/zsh-autoenv/default.nix index 72aa2d77bc3..61589345d70 100644 --- a/pkgs/tools/misc/zsh-autoenv/default.nix +++ b/pkgs/tools/misc/zsh-autoenv/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation { variables (overwriting and restoring). ''; homepage = "https://github.com/Tarrasch/zsh-autoenv"; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/networking/acme-client/default.nix b/pkgs/tools/networking/acme-client/default.nix index 00f8778cafd..6de95b34e62 100644 --- a/pkgs/tools/networking/acme-client/default.nix +++ b/pkgs/tools/networking/acme-client/default.nix @@ -1,23 +1,23 @@ -{ stdenv +{ lib, stdenv , fetchurl , apple_sdk ? null , libbsd , libressl -, pkgconfig +, pkg-config }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "acme-client"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { url = "https://data.wolfsden.cz/sources/acme-client-${version}.tar.xz"; - sha256 = "0gmdvmyw8a61w08hrxllypf7rpnqg0fxipbk3zmvsxj7m5i6iysj"; + sha256 = "sha256-AYI7WfRTb5R0/hDX5Iqkq5nrLZ4gQecAGObSajSA+vw="; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libbsd libressl ] ++ optional stdenv.isDarwin apple_sdk.sdk; makeFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/tools/networking/ahcpd/default.nix b/pkgs/tools/networking/ahcpd/default.nix index 0789b37c65a..75a7fc83858 100644 --- a/pkgs/tools/networking/ahcpd/default.nix +++ b/pkgs/tools/networking/ahcpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "ahcpd-0.53"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.pps.univ-paris-diderot.fr/~jch/software/ahcp/"; description = "Autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 networks"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mit; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix index 76c1de651e0..eda64978c63 100644 --- a/pkgs/tools/networking/aircrack-ng/default.nix +++ b/pkgs/tools/networking/aircrack-ng/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, libpcap, openssl, zlib, wirelesstools -, iw, ethtool, pciutils, libnl, pkgconfig, makeWrapper +, iw, ethtool, pciutils, libnl, pkg-config, makeWrapper , autoreconfHook, usbutils }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0ix2k64qg7x3w0bzdsbk1m50kcpq1ws59g3zkwiafvpwdr4gs2sg"; }; - nativeBuildInputs = [ pkgconfig makeWrapper autoreconfHook ]; + nativeBuildInputs = [ pkg-config makeWrapper autoreconfHook ]; buildInputs = [ libpcap openssl zlib libnl iw ethtool pciutils ]; patchPhase = '' @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; postFixup = '' - wrapProgram $out/bin/airmon-ng --prefix PATH : ${stdenv.lib.makeBinPath [ + wrapProgram $out/bin/airmon-ng --prefix PATH : ${lib.makeBinPath [ ethtool iw pciutils usbutils ]} ''; diff --git a/pkgs/tools/networking/airfield/node.nix b/pkgs/tools/networking/airfield/node.nix index 055fc5267c3..c98d9b58e6e 100644 --- a/pkgs/tools/networking/airfield/node.nix +++ b/pkgs/tools/networking/airfield/node.nix @@ -6,7 +6,7 @@ let nodeEnv = import ../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile; + inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile; inherit nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; @@ -14,4 +14,4 @@ in import ./node-packages.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} \ No newline at end of file +} diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix index 6277c158f24..67dce4c2e8b 100644 --- a/pkgs/tools/networking/amass/default.nix +++ b/pkgs/tools/networking/amass/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "amass"; - version = "3.10.5"; + version = "3.11.2"; src = fetchFromGitHub { owner = "OWASP"; repo = "Amass"; rev = "v${version}"; - sha256 = "0zxjgg9z45cs116wa643dfh12skz8zydb85vn03ss150hdlgspda"; + sha256 = "sha256-3J4yT7GTuVzkxMb+fCD3S9u0XBHa4Y0W+BnkDJ4PhWI="; }; - vendorSha256 = "1l7y2h7kpvj6lh3dki5sw0ziyzwihfy0scdk8jqf108ca23g8zv8"; + vendorSha256 = "sha256-8GzzihKhrf71lLKgb2i3NnmSctvKb95V5pOGoWAgclk="; outputs = [ "out" "wordlists" ]; diff --git a/pkgs/tools/networking/argus-clients/default.nix b/pkgs/tools/networking/argus-clients/default.nix index 6da6f927eca..ead19b17926 100644 --- a/pkgs/tools/networking/argus-clients/default.nix +++ b/pkgs/tools/networking/argus-clients/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libpcap, bison, flex, cyrus_sasl, tcp_wrappers, pkgconfig, perl }: +{ lib, stdenv, fetchurl, libpcap, bison, flex, cyrus_sasl, tcp_wrappers, pkg-config, perl }: stdenv.mkDerivation rec { pname = "argus-clients"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-perl=${perl}/bin/perl" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libpcap bison cyrus_sasl tcp_wrappers flex ]; meta = with lib; { diff --git a/pkgs/tools/networking/argus/default.nix b/pkgs/tools/networking/argus/default.nix index fb3f7228c8d..bbb9d220144 100644 --- a/pkgs/tools/networking/argus/default.nix +++ b/pkgs/tools/networking/argus/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, libpcap, bison, flex, cyrus_sasl, tcp_wrappers, - pkgconfig, procps, which, wget, lsof, net-snmp, perl }: + pkg-config, procps, which, wget, lsof, net-snmp, perl }: stdenv.mkDerivation rec { pname = "argus"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1zzf688dbbcb5z2r9v1p28rddns6znzx35nc05ygza6lp7aknkna"; }; - nativeBuildInputs = [ pkgconfig bison flex ]; + nativeBuildInputs = [ pkg-config bison flex ]; buildInputs = [ libpcap cyrus_sasl tcp_wrappers ]; propagatedBuildInputs = [ procps which wget lsof net-snmp ]; @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { substituteInPlace events/argus-vmstat.sh \ --replace vm_stat ${procps}/bin/vmstat substituteInPlace events/argus-snmp.sh \ - --replace /usr/bin/snmpget ${stdenv.lib.getBin net-snmp}/bin/snmpget \ - --replace /usr/bin/snmpwalk ${stdenv.lib.getBin net-snmp}/bin/snmpwalk + --replace /usr/bin/snmpget ${lib.getBin net-snmp}/bin/snmpget \ + --replace /usr/bin/snmpwalk ${lib.getBin net-snmp}/bin/snmpwalk ''; meta = with lib; { diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix index 428e8a2e112..7e4f06302f2 100644 --- a/pkgs/tools/networking/aria2/default.nix +++ b/pkgs/tools/networking/aria2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchpatch, fetchFromGitHub, pkgconfig, autoreconfHook +{ lib, stdenv, fetchpatch, fetchFromGitHub, pkg-config, autoreconfHook , openssl, c-ares, libxml2, sqlite, zlib, libssh2 , cppunit, sphinx , Security @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { sha256 = "195r3711ly3drf9jkygwdc2m7q99hiqlfrig3ip1127b837gzsf9"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook sphinx ]; + nativeBuildInputs = [ pkg-config autoreconfHook sphinx ]; buildInputs = [ openssl c-ares libxml2 sqlite zlib libssh2 ] ++ - stdenv.lib.optional stdenv.isDarwin Security; + lib.optional stdenv.isDarwin Security; outputs = [ "bin" "dev" "out" "doc" "man" ]; diff --git a/pkgs/tools/networking/assh/default.nix b/pkgs/tools/networking/assh/default.nix index e8b93adcd64..3995fc295d1 100644 --- a/pkgs/tools/networking/assh/default.nix +++ b/pkgs/tools/networking/assh/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, openssh, makeWrapper }: +{ lib, buildGoModule, fetchFromGitHub, openssh, makeWrapper }: buildGoModule rec { pname = "assh"; - version = "2.10.0"; + version = "2.11.0"; src = fetchFromGitHub { repo = "advanced-ssh-config"; owner = "moul"; rev = "v${version}"; - sha256 = "0qsb5p52v961akshgs1yla2d7lhcbwixv2skqaappdmhj18a23q2"; + sha256 = "sha256-/StB5yee9sbkebuJt6JDI+bp52NG0bBhprzmdepL+ek="; }; - vendorSha256 = "03ycjhal4g7bs9fhzrq01ijj48czvs272qcqkd9farsha5gf0q0b"; + vendorSha256 = "sha256-6OAsO7zWAgPfQWD9k+nYH7hnDDUlKIjTB61ivvoubn0="; doCheck = false; diff --git a/pkgs/tools/networking/autossh/default.nix b/pkgs/tools/networking/autossh/default.nix index 49fb4d52e0b..9b8e7f712fd 100644 --- a/pkgs/tools/networking/autossh/default.nix +++ b/pkgs/tools/networking/autossh/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, openssh}: stdenv.mkDerivation rec { - name = "autossh-1.4g"; + pname = "autossh"; + version = "1.4g"; src = fetchurl { - url = "http://www.harding.motd.ca/autossh/${name}.tgz"; + url = "http://www.harding.motd.ca/autossh/${pname}-${version}.tgz"; sha256 = "0xqjw8df68f4kzkns5gcah61s5wk0m44qdk2z1d6388w6viwxhsz"; }; @@ -15,8 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ openssh ]; - installPhase = - '' + installPhase = '' install -D -m755 autossh $out/bin/autossh || return 1 install -D -m644 CHANGES $out/share/doc/autossh/CHANGES || return 1 install -D -m644 README $out/share/doc/autossh/README || return 1 @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.harding.motd.ca/autossh/"; description = "Automatically restart SSH sessions and tunnels"; + license = licenses.bsd1; platforms = platforms.unix; maintainers = with maintainers; [ pSub ]; }; diff --git a/pkgs/tools/networking/axel/default.nix b/pkgs/tools/networking/axel/default.nix index 333009226c1..f7e761ac0fd 100644 --- a/pkgs/tools/networking/axel/default.nix +++ b/pkgs/tools/networking/axel/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, autoconf-archive -, pkgconfig, gettext, libssl, txt2man }: +, pkg-config, gettext, libssl, txt2man }: stdenv.mkDerivation rec { pname = "axel"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "01mpfkz98r2fx4n0gyi3b4zvlyfd5bxydp2wh431lnj0ahrsiikp"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig autoconf-archive txt2man ]; + nativeBuildInputs = [ autoreconfHook pkg-config autoconf-archive txt2man ]; buildInputs = [ gettext libssl ]; diff --git a/pkgs/tools/networking/babeld/default.nix b/pkgs/tools/networking/babeld/default.nix index debd918eb39..a889821c947 100644 --- a/pkgs/tools/networking/babeld/default.nix +++ b/pkgs/tools/networking/babeld/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, nixosTests }: +{ lib, stdenv, fetchurl, nixosTests }: stdenv.mkDerivation rec { pname = "babeld"; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.pps.univ-paris-diderot.fr/~jch/software/babel/"; description = "Loop-avoiding distance-vector routing protocol"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ fpletz ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fpletz ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/tools/networking/badvpn/default.nix b/pkgs/tools/networking/badvpn/default.nix index ab898a86936..fd7c3b23adf 100644 --- a/pkgs/tools/networking/badvpn/default.nix +++ b/pkgs/tools/networking/badvpn/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cmake, openssl, nss, pkg-config, nspr, bash, debug ? false}: +{lib, stdenv, fetchurl, cmake, openssl, nss, pkg-config, nspr, bash, debug ? false}: let s = # Generated upstream information rec { @@ -11,7 +11,7 @@ let }; - compileFlags = "-O3 ${stdenv.lib.optionalString (!debug) "-DNDEBUG"}"; + compileFlags = "-O3 ${lib.optionalString (!debug) "-DNDEBUG"}"; in stdenv.mkDerivation { inherit (s) name version; @@ -31,9 +31,9 @@ stdenv.mkDerivation { meta = { inherit (s) version; - description = ''A set of network-related (mostly VPN-related) tools''; - license = stdenv.lib.licenses.bsd3 ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + description = "A set of network-related (mostly VPN-related) tools"; + license = lib.licenses.bsd3 ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/bandwhich/default.nix b/pkgs/tools/networking/bandwhich/default.nix index a9bf8c5189b..e3ef0f62ef0 100644 --- a/pkgs/tools/networking/bandwhich/default.nix +++ b/pkgs/tools/networking/bandwhich/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0b5pqsdggdjq9sl54rmh2gaq31va6b2crdv7ihh3198ixwasaf02"; - buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.isDarwin Security; meta = with lib; { description = "A CLI utility for displaying current network utilization"; diff --git a/pkgs/tools/networking/bgpdump/default.nix b/pkgs/tools/networking/bgpdump/default.nix index a6f66ea10fc..18d72daa009 100644 --- a/pkgs/tools/networking/bgpdump/default.nix +++ b/pkgs/tools/networking/bgpdump/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, zlib, bzip2 }: +{ lib, stdenv, fetchurl, autoreconfHook, zlib, bzip2 }: stdenv.mkDerivation rec { pname = "bgpdump"; @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { meta = { homepage = "https://bitbucket.org/ripencc/bgpdump/"; - description = ''Analyze dump files produced by Zebra/Quagga or MRT''; - license = stdenv.lib.licenses.hpnd; - maintainers = with stdenv.lib.maintainers; [ lewo ]; - platforms = with stdenv.lib.platforms; linux; + description = "Analyze dump files produced by Zebra/Quagga or MRT"; + license = lib.licenses.hpnd; + maintainers = with lib.maintainers; [ lewo ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/tools/networking/boringtun/default.nix b/pkgs/tools/networking/boringtun/default.nix index b2d41bf8019..00b35dc4192 100644 --- a/pkgs/tools/networking/boringtun/default.nix +++ b/pkgs/tools/networking/boringtun/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0bms93xg75b23ls2hb8dv26y4al4nr67pqcm57rp9d4rbsfafg8c"; - buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; # Testing this project requires sudo, Docker and network access, etc. doCheck = false; diff --git a/pkgs/tools/networking/boundary/default.nix b/pkgs/tools/networking/boundary/default.nix new file mode 100644 index 00000000000..6c653125c33 --- /dev/null +++ b/pkgs/tools/networking/boundary/default.nix @@ -0,0 +1,54 @@ +{ stdenv, lib, fetchzip }: + +let + inherit (stdenv.hostPlatform) system; + suffix = { + x86_64-linux = "linux_amd64"; + aarch64-linux = "linux_arm64"; + x86_64-darwin = "darwin_amd64"; + }."${system}" or (throw "Unsupported system: ${system}"); + fetchsrc = version: sha256: fetchzip { + url = "https://releases.hashicorp.com/boundary/${version}/boundary_${version}_${suffix}.zip"; + sha256 = sha256."${system}"; + }; +in +stdenv.mkDerivation rec { + pname = "boundary"; + version = "0.1.5"; + + src = fetchsrc version { + x86_64-linux = "sha256-A8dfmFjvOHDwotCyRq9QQ9uHJIkq1JkIwtHsqDqTSNo="; + aarch64-linux = "sha256-i2qc4bmoSzUwNCQmnXLFQ+W4VZjVwXzEBSF3NeTju3M="; + x86_64-darwin = "sha256-lKGTpS2TmgxFdjUsBXKg8Mu6oJA0VidHc/noWWEuUVo="; + }; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + install -D boundary $out/bin/boundary + ''; + + dontPatchELF = true; + dontPatchShebangs = true; + + passthru.updateScript = ./update.sh; + + meta = with lib; { + homepage = "https://boundaryproject.io/"; + changelog = "https://github.com/hashicorp/boundary/blob/v${version}/CHANGELOG.md"; + description = "Enables identity-based access management for dynamic infrastructure"; + longDescription = '' + Boundary provides a secure way to access hosts and critical systems + without having to manage credentials or expose your network, and is + entirely open source. + + Boundary is designed to be straightforward to understand, highly scalable, + and resilient. It can run in clouds, on-prem, secure enclaves and more, + and does not require an agent to be installed on every end host. + ''; + license = licenses.mpl20; + maintainers = with maintainers; [ jk ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; + }; +} diff --git a/pkgs/tools/networking/boundary/update.sh b/pkgs/tools/networking/boundary/update.sh new file mode 100755 index 00000000000..43733930710 --- /dev/null +++ b/pkgs/tools/networking/boundary/update.sh @@ -0,0 +1,39 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnused gawk nix-prefetch + +set -euo pipefail + +ROOT="$(dirname "$(readlink -f "$0")")" +NIX_DRV="$ROOT/default.nix" +if [ ! -f "$NIX_DRV" ]; then + echo "ERROR: cannot find default.nix in $ROOT" + exit 1 +fi + +fetch_arch() { + VER="$1"; ARCH="$2" + URL="https://releases.hashicorp.com/boundary/${VER}/boundary_${VER}_${ARCH}.zip" + nix-prefetch "{ stdenv, fetchzip }: +stdenv.mkDerivation rec { + pname = \"boundary\"; version = \"${VER}\"; + src = fetchzip { url = \"$URL\"; }; +} +" +} + +replace_sha() { + sed -i "s#$1 = \"sha256-.\{44\}\"#$1 = \"$2\"#" "$NIX_DRV" +} + +# https://releases.hashicorp.com/boundary/0.1.4/boundary_0.1.4_linux_amd64.zip +BOUNDARY_VER=$(curl -Ls -w "%{url_effective}" -o /dev/null https://github.com/hashicorp/boundary/releases/latest | awk -F'/' '{print $NF}' | sed 's/v//') + +BOUNDARY_LINUX_X64_SHA256=$(fetch_arch "$BOUNDARY_VER" "linux_amd64") +BOUNDARY_DARWIN_X64_SHA256=$(fetch_arch "$BOUNDARY_VER" "darwin_amd64") +BOUNDARY_LINUX_AARCH64_SHA256=$(fetch_arch "$BOUNDARY_VER" "linux_arm64") + +sed -i "s/version = \".*\"/version = \"$BOUNDARY_VER\"/" "$NIX_DRV" + +replace_sha "x86_64-linux" "$BOUNDARY_LINUX_X64_SHA256" +replace_sha "x86_64-darwin" "$BOUNDARY_DARWIN_X64_SHA256" +replace_sha "aarch64-linux" "$BOUNDARY_LINUX_AARCH64_SHA256" diff --git a/pkgs/tools/networking/brook/default.nix b/pkgs/tools/networking/brook/default.nix index f84176495aa..b6f7cb1869a 100644 --- a/pkgs/tools/networking/brook/default.nix +++ b/pkgs/tools/networking/brook/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "brook"; diff --git a/pkgs/tools/networking/bsd-finger/default.nix b/pkgs/tools/networking/bsd-finger/default.nix index f3ecf7a9702..189f636cd1f 100644 --- a/pkgs/tools/networking/bsd-finger/default.nix +++ b/pkgs/tools/networking/bsd-finger/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { preBuild = "cd finger"; - preInstall = '' mkdir -p $out/man/man1 $out/bin ''; + preInstall = "mkdir -p $out/man/man1 $out/bin "; meta = with lib; { platforms = platforms.linux; diff --git a/pkgs/tools/networking/bukubrow/default.nix b/pkgs/tools/networking/bukubrow/default.nix index 5188954b763..157720651f4 100644 --- a/pkgs/tools/networking/bukubrow/default.nix +++ b/pkgs/tools/networking/bukubrow/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, sqlite }: let +{ lib, rustPlatform, fetchFromGitHub, sqlite }: let manifest = { description = "Bukubrow extension host application"; diff --git a/pkgs/tools/networking/burpsuite/default.nix b/pkgs/tools/networking/burpsuite/default.nix index e8caddcbe29..55bd5910054 100644 --- a/pkgs/tools/networking/burpsuite/default.nix +++ b/pkgs/tools/networking/burpsuite/default.nix @@ -1,28 +1,34 @@ -{ stdenv, fetchurl, jre, runtimeShell }: +{ lib, stdenv, fetchurl, jdk11, runtimeShell, unzip, chromium }: -let - version = "2020.1"; - jar = fetchurl { +stdenv.mkDerivation rec { + pname = "burpsuite"; + version = "2020.12.1"; + + src = fetchurl { name = "burpsuite.jar"; url = "https://portswigger.net/Burp/Releases/Download?productId=100&version=${version}&type=Jar"; - sha256 = "12awfy0f8fyqjc0kza1gkmdx1g8bniw1xqaps2dhjimi6s0lq5jx"; + sha256 = "AcoPyVXUf2YGfX2/GbtGZeQ4P7zSsYFb9L57trXive0="; }; - launcher = '' - #!${runtimeShell} - exec ${jre}/bin/java -jar ${jar} "$@" - ''; -in stdenv.mkDerivation { - pname = "burpsuite"; - inherit version; - buildCommand = '' + + dontUnpack = true; + dontBuild = true; + installPhase = '' + runHook preInstall + mkdir -p $out/bin - echo "${launcher}" > $out/bin/burpsuite + echo '#!${runtimeShell} + eval "$(${unzip}/bin/unzip -p ${src} chromium.properties)" + mkdir -p "$HOME/.BurpSuite/burpbrowser/$linux64" + ln -sf "${chromium}/bin/chromium" "$HOME/.BurpSuite/burpbrowser/$linux64/chrome" + exec ${jdk11}/bin/java -jar ${src} "$@"' > $out/bin/burpsuite chmod +x $out/bin/burpsuite + + runHook postInstall ''; preferLocalBuild = true; - meta = { + meta = with lib; { description = "An integrated platform for performing security testing of web applications"; longDescription = '' Burp Suite is an integrated platform for performing security testing of web applications. @@ -32,9 +38,9 @@ in stdenv.mkDerivation { ''; homepage = "https://portswigger.net/burp/"; downloadPage = "https://portswigger.net/burp/freedownload"; - license = [ stdenv.lib.licenses.unfree ]; - platforms = jre.meta.platforms; + license = licenses.unfree; + platforms = jdk11.meta.platforms; hydraPlatforms = []; - maintainers = with stdenv.lib.maintainers; [ bennofs ]; + maintainers = with maintainers; [ bennofs ]; }; } diff --git a/pkgs/tools/networking/bwm-ng/default.nix b/pkgs/tools/networking/bwm-ng/default.nix index 229b4a636c4..26cdfe7c0db 100644 --- a/pkgs/tools/networking/bwm-ng/default.nix +++ b/pkgs/tools/networking/bwm-ng/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { # This code uses inline in the gnu89 sense: see http://clang.llvm.org/compatibility.html#inline - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-std=gnu89"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-std=gnu89"; meta = with lib; { description = "A small and simple console-based live network and disk io bandwidth monitor"; diff --git a/pkgs/tools/networking/cantoolz/default.nix b/pkgs/tools/networking/cantoolz/default.nix new file mode 100644 index 00000000000..11a0315184c --- /dev/null +++ b/pkgs/tools/networking/cantoolz/default.nix @@ -0,0 +1,62 @@ +{ lib +, bitstring +, buildPythonApplication +, fetchFromGitHub +, fetchpatch +, flask +, mido +, numpy +, pyserial +, pytestCheckHook +, pythonOlder +}: + +buildPythonApplication rec { + pname = "cantoolz"; + version = "3.7.0"; + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "CANToolz"; + repo = "CANToolz"; + rev = "v${version}"; + sha256 = "0xkj7zyx6pz866q61c84mdagpgdyd633v85hk7qxhamca33rc4yi"; + }; + + patches = [ + (fetchpatch { + # Replace time.clock() which was removed, https://github.com/CANToolz/CANToolz/pull/30 + url = "https://github.com/CANToolz/CANToolz/pull/30/commits/d75574523d3b273c40fb714532c4de27f9e6dd3e.patch"; + sha256 = "0g91hywg5q6f2qk1awgklywigclrbhh6a6mwd0kpbkk1wawiiwbc"; + }) + ]; + + propagatedBuildInputs = [ + flask + pyserial + mido + numpy + bitstring + ]; + + checkInputs = [ pytestCheckHook ]; + disabledTests = [ "test_process" ]; + pythonImportsCheck = [ "cantoolz" ]; + + meta = with lib; { + description = "Black-box CAN network analysis framework"; + longDescription = '' + CANToolz is a framework for analysing CAN networks and devices. It + provides multiple modules that can be chained using CANToolz's pipe + system and used by security researchers, automotive/OEM security + testers in black-box analysis. + + CANToolz can be used for ECU discovery, MitM testing, fuzzing, brute + forcing, scanning or R&D, testing and validation. More can easily be + implemented with a new module. + ''; + homepage = "https://github.com/CANToolz/CANToolz"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/networking/cassowary/default.nix b/pkgs/tools/networking/cassowary/default.nix index 962a46cb27f..7d9a07badbb 100644 --- a/pkgs/tools/networking/cassowary/default.nix +++ b/pkgs/tools/networking/cassowary/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cassowary"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "rogerwelin"; repo = pname; rev = "v${version}"; - sha256 = "161wzcdq7kpny6fzxsqk2ivnah0xwmh2knv37jn0x18lclga1k9s"; + sha256 = "sha256-HRshuMnRPMzatOYYI//yEtjC46kORGXaAWJJjLHW2+k="; }; - vendorSha256 = "1qgilmkai9isbbg4pzqic6i8v5z8cay0ilw1gb69z4a6f2q4zhkp"; + vendorSha256 = "sha256-d8JPsHBGkZ/MeoHTCLxi6JeNomER/0veWjqmqGal8eE="; doCheck = false; diff --git a/pkgs/tools/networking/ccnet/default.nix b/pkgs/tools/networking/ccnet/default.nix index e277f7fd6af..b8fd0679892 100644 --- a/pkgs/tools/networking/ccnet/default.nix +++ b/pkgs/tools/networking/ccnet/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, which, autoreconfHook, pkgconfig, vala, python, libsearpc, libzdb, libuuid, libevent, sqlite, openssl}: +{lib, stdenv, fetchurl, which, autoreconfHook, pkg-config, vala, python, libsearpc, libzdb, libuuid, libevent, sqlite, openssl}: stdenv.mkDerivation rec { version = "6.1.8"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0qlpnrz30ldrqnvbj59d54qdghxpxc5lsq6kf3dw2b93jnzkcmmm"; }; - nativeBuildInputs = [ pkgconfig which autoreconfHook vala python ]; + nativeBuildInputs = [ pkg-config which autoreconfHook vala python ]; propagatedBuildInputs = [ libsearpc libzdb libuuid libevent sqlite openssl ]; configureFlags = [ "--enable-server" ]; diff --git a/pkgs/tools/networking/chisel/default.nix b/pkgs/tools/networking/chisel/default.nix new file mode 100644 index 00000000000..56868e07688 --- /dev/null +++ b/pkgs/tools/networking/chisel/default.nix @@ -0,0 +1,37 @@ +{ buildGoModule +, fetchFromGitHub +, lib +, stdenv +}: + +buildGoModule rec { + pname = "chisel"; + version = "1.7.4"; + + src = fetchFromGitHub { + owner = "jpillora"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-1vg9tJLYbW8pfPpw3gQ15c9Kwj2lFfblMRhOK4yWKb8="; + }; + + vendorSha256 = "sha256-GzsQ6LXxe9UQc13XbsYFOWPe0EzlyHechchKc6xDkAc="; + + buildFlagsArray = [ "-ldflags=-s -w -X github.com/jpillora/chisel/share.BuildVersion=${version}" ]; + + # tests require access to the network + doCheck = false; + + meta = with lib; { + description = "TCP/UDP tunnel over HTTP"; + longDescription = '' + Chisel is a fast TCP/UDP tunnel, transported over HTTP, secured via + SSH. Single executable including both client and server. Chisel is + mainly useful for passing through firewalls, though it can also be + used to provide a secure endpoint into your network. + ''; + homepage = "https://github.com/jpillora/chisel"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix index e11674f5b1b..333a28dd390 100644 --- a/pkgs/tools/networking/chrony/default.nix +++ b/pkgs/tools/networking/chrony/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libcap, readline, texinfo, nss, nspr +{ lib, stdenv, fetchurl, pkg-config, libcap, readline, texinfo, nss, nspr , libseccomp, pps-tools, gnutls }: assert stdenv.isLinux -> libcap != null; @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { ''; buildInputs = [ readline texinfo nss nspr gnutls ] - ++ stdenv.lib.optionals stdenv.isLinux [ libcap libseccomp pps-tools ]; - nativeBuildInputs = [ pkgconfig ]; + ++ lib.optionals stdenv.isLinux [ libcap libseccomp pps-tools ]; + nativeBuildInputs = [ pkg-config ]; hardeningEnable = [ "pie" ]; configureFlags = [ "--chronyvardir=$(out)/var/lib/chrony" ] - ++ stdenv.lib.optional stdenv.isLinux "--enable-scfilter"; + ++ lib.optional stdenv.isLinux "--enable-scfilter"; meta = with lib; { description = "Sets your computer's clock from time servers on the Net"; diff --git a/pkgs/tools/networking/circus/default.nix b/pkgs/tools/networking/circus/default.nix index 891eb19c835..f24c0e629cb 100644 --- a/pkgs/tools/networking/circus/default.nix +++ b/pkgs/tools/networking/circus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3 }: +{ lib, python3 }: let python = python3.override { diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix index cfc591cb2ef..474c9d59c9e 100644 --- a/pkgs/tools/networking/cjdns/default.nix +++ b/pkgs/tools/networking/cjdns/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { buildInputs = [ which python27 nodejs ] ++ # for flock - stdenv.lib.optional stdenv.isLinux util-linux; + lib.optional stdenv.isLinux util-linux; CFLAGS = "-O2 -Wno-error=stringop-truncation"; buildPhase = - stdenv.lib.optionalString stdenv.isAarch32 "Seccomp_NO=1 " + lib.optionalString stdenv.isAarch32 "Seccomp_NO=1 " + "bash do"; installPhase = '' install -Dt "$out/bin/" cjdroute makekeys privatetopublic publictoip6 diff --git a/pkgs/tools/networking/clash/default.nix b/pkgs/tools/networking/clash/default.nix index 2044aeb3554..543c86db307 100644 --- a/pkgs/tools/networking/clash/default.nix +++ b/pkgs/tools/networking/clash/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "clash"; - version = "1.3.0"; + version = "1.3.5"; src = fetchFromGitHub { owner = "Dreamacro"; repo = pname; rev = "v${version}"; - sha256 = "1y0im2xs6pibbfri2k7g9jqbzm90jd9a5lghrzasxmkzjfcimrnf"; + sha256 = "sha256-yTkUGsVwK6nwHUQpYhkPYF/Cf4URrr5ThB67sxq7Ecs="; }; - vendorSha256 = "0lljm594xgcv7ylz7qn170r9526k9d1lh77m9f9zcnhdd2qw4rw1"; + vendorSha256 = "sha256-J7VGYxX1bH5CeDhpqK9mIbHUekXslImZ+O3wN5Q7kYk="; doCheck = false; diff --git a/pkgs/tools/networking/cntlm/default.nix b/pkgs/tools/networking/cntlm/default.nix index a12ceb1d448..fdfac8fdcbc 100644 --- a/pkgs/tools/networking/cntlm/default.nix +++ b/pkgs/tools/networking/cntlm/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ which ]; - preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.isDarwin '' substituteInPlace configure --replace "xlc_r gcc" "xlc_r gcc $CC" substitute Makefile Makefile.$CC --replace "CC=gcc" "CC=$CC" ''; diff --git a/pkgs/tools/networking/connect/default.nix b/pkgs/tools/networking/connect/default.nix index 2fbd8ddf4a3..1f0831fb890 100644 --- a/pkgs/tools/networking/connect/default.nix +++ b/pkgs/tools/networking/connect/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "connect"; @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { description = "Make network connection via SOCKS and https proxy"; longDescription = '' This proxy traversal tool is intended to assist OpenSSH (via ProxyCommand - in ~/.ssh/config) and GIT (via $GIT_PROXY_COMMAND) utilize SOCKS and https proxies. + in ~/.ssh/config) and GIT (via $GIT_PROXY_COMMAND) utilize SOCKS and https proxies. ''; homepage = "https://bitbucket.org/gotoh/connect/wiki/Home"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - maintainers = with stdenv.lib.maintainers; [ jcumming ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.gnu ++ lib.platforms.linux ++ lib.platforms.darwin; + maintainers = with lib.maintainers; [ jcumming ]; }; } diff --git a/pkgs/tools/networking/connman/connman-gtk/default.nix b/pkgs/tools/networking/connman/connman-gtk/default.nix index 03606aabfe3..c75254a27b1 100644 --- a/pkgs/tools/networking/connman/connman-gtk/default.nix +++ b/pkgs/tools/networking/connman/connman-gtk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, intltool, pkgconfig, +{ lib, stdenv, fetchFromGitHub, autoconf, automake, intltool, pkg-config, gtk3, connman, openconnect, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { autoconf automake intltool - pkgconfig + pkg-config wrapGAppsHook ]; diff --git a/pkgs/tools/networking/connman/connman-ncurses/default.nix b/pkgs/tools/networking/connman/connman-ncurses/default.nix index 22cb9ccab88..976708c038c 100644 --- a/pkgs/tools/networking/connman/connman-ncurses/default.nix +++ b/pkgs/tools/networking/connman/connman-ncurses/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchpatch, fetchFromGitHub, autoreconfHook, pkgconfig, dbus, json_c, ncurses, connman }: +{ lib, stdenv, fetchpatch, fetchFromGitHub, autoreconfHook, pkg-config, dbus, json_c, ncurses, connman }: stdenv.mkDerivation { pname = "connman-ncurses"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { }) ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ dbus ncurses json_c connman ]; diff --git a/pkgs/tools/networking/connman/connman-notify/default.nix b/pkgs/tools/networking/connman/connman-notify/default.nix index 9f0c9873e2a..cbf50091303 100644 --- a/pkgs/tools/networking/connman/connman-notify/default.nix +++ b/pkgs/tools/networking/connman/connman-notify/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, python3Packages, glib, gobject-introspection, wrapGAppsHook }: +{ lib, fetchFromGitLab, python3Packages, glib, gobject-introspection, wrapGAppsHook }: python3Packages.buildPythonApplication { pname = "connman-notify"; diff --git a/pkgs/tools/networking/connman/connman.nix b/pkgs/tools/networking/connman/connman.nix index 7f2552d1141..21fa038707c 100644 --- a/pkgs/tools/networking/connman/connman.nix +++ b/pkgs/tools/networking/connman/connman.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, pkgconfig +, pkg-config , file , glib # always required runtime dependencies @@ -48,10 +48,10 @@ , enableTist ? false }: -assert stdenv.lib.asserts.assertOneOf "firewallType" firewallType [ "iptables" "nftables" ]; -assert stdenv.lib.asserts.assertOneOf "dnsType" dnsType [ "internal" "systemd-resolved" ]; +assert lib.asserts.assertOneOf "firewallType" firewallType [ "iptables" "nftables" ]; +assert lib.asserts.assertOneOf "dnsType" dnsType [ "internal" "systemd-resolved" ]; -let inherit (stdenv.lib) optionals; in +let inherit (lib) optionals; in stdenv.mkDerivation rec { pname = "connman"; @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config file ] ++ optionals (enablePolkit) [ polkit ] diff --git a/pkgs/tools/networking/connman/connman_dmenu/default.nix b/pkgs/tools/networking/connman/connman_dmenu/default.nix index 8bc1b47e198..3ac730f471f 100644 --- a/pkgs/tools/networking/connman/connman_dmenu/default.nix +++ b/pkgs/tools/networking/connman/connman_dmenu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, connman, dmenu }: +{ lib, stdenv, fetchFromGitHub, connman, dmenu }: stdenv.mkDerivation { pname = "connman_dmenu"; @@ -28,8 +28,8 @@ stdenv.mkDerivation { meta = { description = "A dmenu wrapper for connmann"; homepage = "https://github.com/march-linux/connman_dmenu"; - license = stdenv.lib.licenses.free; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.free; + maintainers = [ lib.maintainers.magnetophon ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/networking/corerad/default.nix b/pkgs/tools/networking/corerad/default.nix index 64e8e09467d..a7e5026d83a 100644 --- a/pkgs/tools/networking/corerad/default.nix +++ b/pkgs/tools/networking/corerad/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "corerad"; diff --git a/pkgs/tools/networking/corkscrew/default.nix b/pkgs/tools/networking/corkscrew/default.nix index d5756cefdaf..58a43c30a93 100644 --- a/pkgs/tools/networking/corkscrew/default.nix +++ b/pkgs/tools/networking/corkscrew/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://agroman.net/corkscrew/"; description = "A tool for tunneling SSH through HTTP proxies"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; platforms = platforms.unix; }; } diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix index 115f2f32160..4a4578a7356 100644 --- a/pkgs/tools/networking/croc/default.nix +++ b/pkgs/tools/networking/croc/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, callPackage}: +{ lib, buildGoModule, fetchFromGitHub, callPackage}: buildGoModule rec { pname = "croc"; - version = "8.6.6"; + version = "8.6.7"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "0bd7q3j2i0r3v4liv2xpqlvx4nrixpdhr1yy1c579bls7y4myv61"; + sha256 = "sha256-+Hsxu/gqMKRWBJT7JqOw8Ck+5fQG0D3wSJBb9fgkPsw="; }; - vendorSha256 = "06hqb5r9p67zh0v5whdsb3rvax6461y2n6jkhjwmn6zzswpgkg7y"; + vendorSha256 = "sha256-ULXC8lVu/TTSzYJ4EpAQvDwntRV0+Vmr8VPaEe54qdA="; doCheck = false; diff --git a/pkgs/tools/networking/curl-unix-socket/default.nix b/pkgs/tools/networking/curl-unix-socket/default.nix index 84b5c1861cd..ab4c3292ea5 100644 --- a/pkgs/tools/networking/curl-unix-socket/default.nix +++ b/pkgs/tools/networking/curl-unix-socket/default.nix @@ -1,4 +1,4 @@ -{ buildGoPackage, lib, stdenv, fetchFromGitHub }: +{ buildGoPackage, lib, fetchFromGitHub }: buildGoPackage rec { name = "curl-unix-socket-2015-04-10"; diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index a08ec75bfaa..89f44e8bb7b 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, perl +{ stdenv, lib, fetchurl, pkg-config, perl , http2Support ? true, nghttp2 , idnSupport ? false, libidn ? null , ldapSupport ? false, openldap ? null @@ -50,12 +50,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig perl ]; + nativeBuildInputs = [ pkg-config perl ]; # Zlib and OpenSSL must be propagated because `libcurl.la' contains # "-lz -lssl", which aren't necessary direct build inputs of # applications that use Curl. - propagatedBuildInputs = with stdenv.lib; + propagatedBuildInputs = with lib; optional http2Support nghttp2 ++ optional idnSupport libidn ++ optional ldapSupport openldap ++ @@ -90,13 +90,13 @@ stdenv.mkDerivation rec { ( if idnSupport then "--with-libidn=${libidn.dev}" else "--without-libidn" ) ( if brotliSupport then "--with-brotli" else "--without-brotli" ) ] - ++ stdenv.lib.optional wolfsslSupport "--with-wolfssl=${wolfssl.dev}" - ++ stdenv.lib.optional c-aresSupport "--enable-ares=${c-ares}" - ++ stdenv.lib.optional gssSupport "--with-gssapi=${libkrb5.dev}" + ++ lib.optional wolfsslSupport "--with-wolfssl=${wolfssl.dev}" + ++ lib.optional c-aresSupport "--enable-ares=${c-ares}" + ++ lib.optional gssSupport "--with-gssapi=${libkrb5.dev}" # For the 'urandom', maybe it should be a cross-system option - ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) + ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--with-random=/dev/urandom" - ++ stdenv.lib.optionals stdenv.hostPlatform.isWindows [ + ++ lib.optionals stdenv.hostPlatform.isWindows [ "--disable-shared" "--enable-static" ]; @@ -111,9 +111,9 @@ stdenv.mkDerivation rec { # Install completions make -C scripts install - '' + stdenv.lib.optionalString scpSupport '' + '' + lib.optionalString scpSupport '' sed '/^dependency_libs/s|${libssh2.dev}|${libssh2.out}|' -i "$out"/lib/*.la - '' + stdenv.lib.optionalString gnutlsSupport '' + '' + lib.optionalString gnutlsSupport '' ln $out/lib/libcurl.so $out/lib/libcurl-gnutls.so ln $out/lib/libcurl.so $out/lib/libcurl-gnutls.so.4 ln $out/lib/libcurl.so $out/lib/libcurl-gnutls.so.4.4.0 diff --git a/pkgs/tools/networking/davix/default.nix b/pkgs/tools/networking/davix/default.nix index 8c882465779..d9f36845559 100644 --- a/pkgs/tools/networking/davix/default.nix +++ b/pkgs/tools/networking/davix/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, fetchurl, cmake, pkgconfig, openssl, libxml2, boost, python3, libuuid }: +{ lib, stdenv, fetchurl, cmake, pkg-config, openssl, libxml2, boost, python3, libuuid }: stdenv.mkDerivation rec { version = "0.7.6"; pname = "davix"; - nativeBuildInputs = [ cmake pkgconfig python3 ]; + nativeBuildInputs = [ cmake pkg-config python3 ]; buildInputs = [ openssl libxml2 boost libuuid ]; # using the url below since the github release page states # "please ignore the GitHub-generated tarballs, as they are incomplete" # https://github.com/cern-fts/davix/releases/tag/R_0_7_6 src = fetchurl { - url = "https://github.com/cern-fts/${pname}/releases/download/R_${stdenv.lib.replaceStrings ["."] ["_"] version}/${pname}-${version}.tar.gz"; + url = "https://github.com/cern-fts/${pname}/releases/download/R_${lib.replaceStrings ["."] ["_"] version}/${pname}-${version}.tar.gz"; sha256 = "0wq66spnr616cns72f9dvr2xfvkdvfqqmc6d7dx29fpp57zzvrx2"; }; diff --git a/pkgs/tools/networking/dd-agent/5.nix b/pkgs/tools/networking/dd-agent/5.nix index dd206eb8c97..c220f24046f 100644 --- a/pkgs/tools/networking/dd-agent/5.nix +++ b/pkgs/tools/networking/dd-agent/5.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python +{ lib, stdenv, fetchFromGitHub, python , unzip, makeWrapper }: let python' = python.override { @@ -105,8 +105,8 @@ in stdenv.mkDerivation rec { -- v5 Python implementation ''; homepage = "https://www.datadoghq.com"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice domenkozar ]; + license = lib.licenses.bsd3; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ thoughtpolice domenkozar ]; }; } diff --git a/pkgs/tools/networking/dd-agent/datadog-agent-deps.nix b/pkgs/tools/networking/dd-agent/datadog-agent-deps.nix index 1121ec0405c..fb6f66b5a4e 100644 --- a/pkgs/tools/networking/dd-agent/datadog-agent-deps.nix +++ b/pkgs/tools/networking/dd-agent/datadog-agent-deps.nix @@ -1350,4 +1350,4 @@ sha256 = "1wpqijsvf8s4iqjrrzgbxi3gay6vaglscyq14vxma4iacg8fx1jk"; }; } -] \ No newline at end of file +] diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix index 34e6395ca6d..ad37245d57c 100644 --- a/pkgs/tools/networking/dd-agent/datadog-agent.nix +++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoPackage, makeWrapper, pythonPackages, pkgconfig, systemd, hostname, extraTags ? [] }: +{ lib, fetchFromGitHub, buildGoPackage, makeWrapper, pythonPackages, pkg-config, systemd, hostname, extraTags ? [] }: let # keep this in sync with github.com/DataDog/agent-payload dependency @@ -28,13 +28,13 @@ in buildGoPackage rec { goPackagePath = "github.com/${owner}/${repo}"; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ systemd ]; PKG_CONFIG_PATH = "${python}/lib/pkgconfig"; preBuild = let - ldFlags = stdenv.lib.concatStringsSep " " [ + ldFlags = lib.concatStringsSep " " [ "-X ${goPackagePath}/pkg/version.Commit=${src.rev}" "-X ${goPackagePath}/pkg/version.AgentVersion=${version}" "-X ${goPackagePath}/pkg/serializer.AgentPayloadVersion=${payloadVersion}" diff --git a/pkgs/tools/networking/dd-agent/datadog-process-agent-deps.nix b/pkgs/tools/networking/dd-agent/datadog-process-agent-deps.nix index 2a81702feee..4533b31dd23 100644 --- a/pkgs/tools/networking/dd-agent/datadog-process-agent-deps.nix +++ b/pkgs/tools/networking/dd-agent/datadog-process-agent-deps.nix @@ -666,4 +666,4 @@ sha256 = "0bcsb7s4wlmrja35zvz4s10cf3w7dfn2ckjv6apxd1ykdjxnsk71"; }; } -] \ No newline at end of file +] diff --git a/pkgs/tools/networking/dd-agent/datadog-process-agent.nix b/pkgs/tools/networking/dd-agent/datadog-process-agent.nix index a77030bba93..e2c497dad40 100644 --- a/pkgs/tools/networking/dd-agent/datadog-process-agent.nix +++ b/pkgs/tools/networking/dd-agent/datadog-process-agent.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoPackage }: +{ lib, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { pname = "datadog-process-agent"; diff --git a/pkgs/tools/networking/ddclient/default.nix b/pkgs/tools/networking/ddclient/default.nix index 3b52c2be252..51454ac1197 100644 --- a/pkgs/tools/networking/ddclient/default.nix +++ b/pkgs/tools/networking/ddclient/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perlPackages, iproute, perl }: +{ lib, fetchurl, perlPackages, iproute, perl }: perlPackages.buildPerlPackage rec { pname = "ddclient"; diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix index 55feb29af1d..c56ba5a4a66 100644 --- a/pkgs/tools/networking/dhcp/default.nix +++ b/pkgs/tools/networking/dhcp/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc" "--localstatedir=/var" ] ++ lib.optional stdenv.isLinux "--with-randomdev=/dev/random" - ++ stdenv.lib.optionals (openldap != null) [ "--with-ldap" "--with-ldapcrypto" ]; + ++ lib.optionals (openldap != null) [ "--with-ldap" "--with-ldapcrypto" ]; NIX_CFLAGS_COMPILE = builtins.toString [ "-Wno-error=pointer-compare" diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index 3b55687ddd9..5bc56b9e03e 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, udev, runtimeShellPackage, +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, udev, runtimeShellPackage, runtimeShell }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0gf1qif25wy5lffzw39pi4sshmpxz1f4a1m9sglj7am1gaix3817"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ udev runtimeShellPackage # So patchShebangs finds a bash suitable for the installed scripts @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { installFlags = [ "DBDIR=$(TMPDIR)/db" "SYSCONFDIR=${placeholder "out"}/etc" ]; # Check that the udev plugin got built. - postInstall = stdenv.lib.optional (udev != null) "[ -e ${placeholder "out"}/lib/dhcpcd/dev/udev.so ]"; + postInstall = lib.optional (udev != null) "[ -e ${placeholder "out"}/lib/dhcpcd/dev/udev.so ]"; meta = with lib; { description = "A client for the Dynamic Host Configuration Protocol (DHCP)"; diff --git a/pkgs/tools/networking/dibbler/default.nix b/pkgs/tools/networking/dibbler/default.nix index b8b40635a96..1633505763c 100644 --- a/pkgs/tools/networking/dibbler/default.nix +++ b/pkgs/tools/networking/dibbler/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { "--enable-resolvconf" ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-D__APPLE_USE_RFC_2292=1"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-D__APPLE_USE_RFC_2292=1"; meta = with lib; { description = "Portable DHCPv6 implementation"; diff --git a/pkgs/tools/networking/dirb/default.nix b/pkgs/tools/networking/dirb/default.nix index 1f9516ccacc..09f1fbc2f9f 100644 --- a/pkgs/tools/networking/dirb/default.nix +++ b/pkgs/tools/networking/dirb/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, autoreconfHook, curl }: +{ fetchurl, lib, stdenv, autoreconfHook, curl }: let major = "2"; @@ -33,8 +33,8 @@ in stdenv.mkDerivation rec { meta = { description = "A web content scanner"; homepage = "http://dirb.sourceforge.net/"; - maintainers = with stdenv.lib.maintainers; [ bennofs ]; - license = with stdenv.lib.licenses; [ gpl2 ]; - platforms = stdenv.lib.platforms.unix; + maintainers = with lib.maintainers; [ bennofs ]; + license = with lib.licenses; [ gpl2 ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/dnscrypt-proxy2/default.nix b/pkgs/tools/networking/dnscrypt-proxy2/default.nix index 978b82c77fb..8aedb403260 100644 --- a/pkgs/tools/networking/dnscrypt-proxy2/default.nix +++ b/pkgs/tools/networking/dnscrypt-proxy2/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "dnscrypt-proxy2"; - version = "2.0.44"; + version = "2.0.45"; vendorSha256 = null; @@ -12,7 +12,7 @@ buildGoModule rec { owner = "DNSCrypt"; repo = "dnscrypt-proxy"; rev = version; - sha256 = "08bg60j5z349blj5sip1f8f793q12ix3zmqkayym5nf69s1pfm7l"; + sha256 = "sha256-BvCxrFMRWPVVjK2sDlVbJKC/YK/bi4lBquIsdwOFXkw="; }; meta = with lib; { diff --git a/pkgs/tools/networking/dnscrypt-wrapper/default.nix b/pkgs/tools/networking/dnscrypt-wrapper/default.nix index fdab2ff3003..88d753baf5b 100644 --- a/pkgs/tools/networking/dnscrypt-wrapper/default.nix +++ b/pkgs/tools/networking/dnscrypt-wrapper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libsodium, libevent }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libsodium, libevent }: stdenv.mkDerivation rec { pname = "dnscrypt-wrapper"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ libsodium libevent ]; meta = with lib; { diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index 19dbd00c1ee..d92408b3669 100644 --- a/pkgs/tools/networking/dnsmasq/default.nix +++ b/pkgs/tools/networking/dnsmasq/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, pkgconfig, dbus, nettle, fetchpatch +{ lib, stdenv, fetchurl, pkg-config, dbus, nettle, fetchpatch , libidn, libnetfilter_conntrack }: -with stdenv.lib; +with lib; let copts = concatStringsSep " " ([ "-DHAVE_IDN" @@ -12,14 +12,15 @@ let ]); in stdenv.mkDerivation rec { - name = "dnsmasq-2.82"; + pname = "dnsmasq"; + version = "2.83"; src = fetchurl { - url = "http://www.thekelleys.org.uk/dnsmasq/${name}.tar.xz"; - sha256 = "0cn1xd1s6xs78jmrmwjnh9m6w3q38pk6dyqy2phvasqiyd33cll4"; + url = "http://www.thekelleys.org.uk/dnsmasq/${pname}-${version}.tar.xz"; + sha256 = "1sjamz1v588qf35m8z6wcqkjk5w12bqhj7d7p48dj8jyn3lgghgz"; }; - postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isLinux '' + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' sed '1i#include <linux/sockios.h>' -i src/dhcp.c ''; @@ -65,7 +66,7 @@ stdenv.mkDerivation rec { END ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ nettle libidn ] ++ optionals stdenv.isLinux [ dbus libnetfilter_conntrack ]; diff --git a/pkgs/tools/networking/dnsperf/default.nix b/pkgs/tools/networking/dnsperf/default.nix index 5aba2af865f..e4405670363 100644 --- a/pkgs/tools/networking/dnsperf/default.nix +++ b/pkgs/tools/networking/dnsperf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchurl, fetchFromGitHub, autoreconfHook, pkg-config , openssl, ldns }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" "doc" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ openssl diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index 3c51073570f..d43c121bbf5 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "dnsproxy"; - version = "0.33.3"; + version = "0.33.9"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "0c7hqsb53711032svicr069gh7faacnsj2v36pj7srng266vk78p"; + sha256 = "sha256-1q3w2wv4lTIYPTO3weuZ0C2KeXcFWVV5KRJw2YRNWSE="; }; vendorSha256 = null; diff --git a/pkgs/tools/networking/dnstop/default.nix b/pkgs/tools/networking/dnstop/default.nix index 705888568d9..cee24f1976f 100644 --- a/pkgs/tools/networking/dnstop/default.nix +++ b/pkgs/tools/networking/dnstop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libpcap, ncurses }: +{ lib, stdenv, fetchurl, libpcap, ncurses }: stdenv.mkDerivation rec { name = "dnstop-20140915"; @@ -14,10 +14,10 @@ stdenv.mkDerivation rec { mkdir -p $out/share/man/man8 $out/bin ''; - meta = { + meta = { description = "libpcap application that displays DNS traffic on your network"; homepage = "http://dns.measurement-factory.com/tools/dnstop"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.bsd3; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/dnstracer/default.nix b/pkgs/tools/networking/dnstracer/default.nix index 53a3e32aa6c..597592b4d7c 100644 --- a/pkgs/tools/networking/dnstracer/default.nix +++ b/pkgs/tools/networking/dnstracer/default.nix @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { install -Dm755 -t $man/share/man/man8 dnstracer.8 ''; - buildInputs = [] ++ stdenv.lib.optionals stdenv.isDarwin [ libresolv ]; + buildInputs = [] ++ lib.optionals stdenv.isDarwin [ libresolv ]; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lresolv"; + NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lresolv"; meta = with lib; { description = "Determines where a given Domain Name Server (DNS) gets its information from, and follows the chain of DNS servers back to the servers which know the data"; diff --git a/pkgs/tools/networking/dogdns/default.nix b/pkgs/tools/networking/dogdns/default.nix index 4e3b255fc55..4fe57eb4990 100644 --- a/pkgs/tools/networking/dogdns/default.nix +++ b/pkgs/tools/networking/dogdns/default.nix @@ -19,9 +19,9 @@ rustPlatform.buildRustPackage rec { }; nativeBuildInputs = [ installShellFiles ] - ++ stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; - buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; + ++ lib.optionals stdenv.isLinux [ pkg-config ]; + buildInputs = lib.optionals stdenv.isLinux [ openssl ] + ++ lib.optionals stdenv.isDarwin [ Security ]; cargoSha256 = "08scc6vh703245rg3xkffhalrk5pisd0wg54fd49d7gdbyjivgi6"; diff --git a/pkgs/tools/networking/driftnet/default.nix b/pkgs/tools/networking/driftnet/default.nix index 7a5ceda9669..042f29d3ca3 100644 --- a/pkgs/tools/networking/driftnet/default.nix +++ b/pkgs/tools/networking/driftnet/default.nix @@ -1,31 +1,64 @@ -{ stdenv, lib, fetchFromGitHub, libpcap, libjpeg , libungif, libpng -, giflib, glib, gtk2, cairo, pango, gdk-pixbuf, atk -, pkgconfig, autoreconfHook }: +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, autoreconfHook +, cairo +, giflib +, glib +, gtk2-x11 +, libjpeg +, libpcap +, libpng +, libwebsockets +, pkg-config +, libuv +, openssl +}: -with lib; - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "driftnet"; - version = "1.1.5"; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - libpcap libjpeg libungif libpng giflib - glib gtk2 glib cairo pango gdk-pixbuf atk autoreconfHook - ]; + version = "1.3.0"; src = fetchFromGitHub { owner = "deiv"; repo = "driftnet"; - rev = "0ae4a91"; - sha256 = "1sagpx0mw68ggvqd9c3crjhghqmj7391mf2cb6cjw1cpd2hcddsj"; + rev = "v${version}"; + sha256 = "0kd22aqb25kf54jjv3ml8wy8xm7lmbf0xz1wfp31m08cbzsbizib"; }; - meta = { + # https://github.com/deiv/driftnet/pull/33 + # remove on version bump from 1.3.0 + patches = [ + (fetchpatch { + name = "fix-darwin-build"; + url = "https://github.com/deiv/driftnet/pull/33/commits/bef5f3509ab5710161e9e21ea960a997eada534f.patch"; + sha256 = "1b7p9fkgp7dxv965l7q7y632s80h3nnrkaqnak2h0hakwv0i4pvm"; + }) + ]; + + enableParallelBuilding = true; + + nativeBuildInputs = [ pkg-config autoreconfHook ]; + + buildInputs = [ + cairo + giflib + glib + gtk2-x11 + libjpeg + libpcap + libpng + libwebsockets + openssl + libuv + ]; + + meta = with lib; { description = "Watches network traffic, and picks out and displays JPEG and GIF images for display"; homepage = "https://github.com/deiv/driftnet"; maintainers = with maintainers; [ offline ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; license = licenses.gpl2; }; } diff --git a/pkgs/tools/networking/driftnet/fix-darwin-build.patch b/pkgs/tools/networking/driftnet/fix-darwin-build.patch new file mode 100644 index 00000000000..d1bde0f2e60 --- /dev/null +++ b/pkgs/tools/networking/driftnet/fix-darwin-build.patch @@ -0,0 +1,61 @@ +diff --git a/src/compat/compat.h b/src/compat/compat.h +index 6add422..ea80406 100644 +--- a/src/compat/compat.h ++++ b/src/compat/compat.h +@@ -17,7 +17,7 @@ + #include <config.h> + #endif + +-#ifdef __FreeBSD__ ++#if defined(__FreeBSD__) || defined(__APPLE__) + #include <sys/types.h> + #endif + +diff --git a/src/network/layer2.c b/src/network/layer2.c +index 763f0ac..2497b72 100644 +--- a/src/network/layer2.c ++++ b/src/network/layer2.c +@@ -14,7 +14,7 @@ + + #include <string.h> + +-#ifdef __FreeBSD__ ++#if defined(__FreeBSD__) || defined(__APPLE__) + #include <netinet/in_systm.h> + #include <netinet/in.h> + #else +@@ -29,7 +29,7 @@ + /* + * Freebsd and Cygwin doesn't define 'ethhdr' + */ +-#if defined(__FreeBSD__) || defined(__CYGWIN__) ++#if defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__APPLE__) + + #define ETH_ALEN 6 /* Octets in one ethernet addr */ + #define ETH_P_IP 0x0800 /* Internet Protocol packet */ +diff --git a/src/network/layer3.c b/src/network/layer3.c +index 7864126..aae2041 100644 +--- a/src/network/layer3.c ++++ b/src/network/layer3.c +@@ -15,7 +15,7 @@ + #include <string.h> + #include <assert.h> + +-#ifdef __FreeBSD__ ++#if defined(__FreeBSD__) || defined(__APPLE__) + #include <netinet/in_systm.h> + #include <netinet/in.h> + #include <sys/socket.h> +diff --git a/src/pid.c b/src/pid.c +index 621834e..94e7dcc 100644 +--- a/src/pid.c ++++ b/src/pid.c +@@ -14,7 +14,7 @@ + + #include "compat/compat.h" + +-#ifdef __FreeBSD__ ++#if defined(__FreeBSD__) || defined(__APPLE__) + #include <sys/stat.h> + #endif + #include <fcntl.h> diff --git a/pkgs/tools/networking/drill/default.nix b/pkgs/tools/networking/drill/default.nix index 7c1ba1928ec..3be4707a529 100644 --- a/pkgs/tools/networking/drill/default.nix +++ b/pkgs/tools/networking/drill/default.nix @@ -19,10 +19,10 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1nbfbmm9v1yp7380zdzz7qrc7x6krwlvgn5x5yzb8yn1rc99jzx4"; - nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; + nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; buildInputs = [ ] - ++ stdenv.lib.optionals stdenv.isLinux [ openssl ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; + ++ lib.optionals stdenv.isLinux [ openssl ] + ++ lib.optionals stdenv.isDarwin [ Security ]; meta = with lib; { description = "HTTP load testing application inspired by Ansible syntax"; diff --git a/pkgs/tools/networking/email/default.nix b/pkgs/tools/networking/email/default.nix index b61503b1b3f..5c24acb912f 100644 --- a/pkgs/tools/networking/email/default.nix +++ b/pkgs/tools/networking/email/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation { description = "Command line SMTP client"; license = with lib.licenses; [ gpl2 ]; homepage = "https://deanproxy.com/code"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/evillimiter/default.nix b/pkgs/tools/networking/evillimiter/default.nix new file mode 100644 index 00000000000..20cc10728d6 --- /dev/null +++ b/pkgs/tools/networking/evillimiter/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonApplication +, fetchFromGitHub +, colorama +, iproute2 +, iptables +, netaddr +, netifaces +, scapy +, terminaltables +, tqdm +}: + +buildPythonApplication rec { + pname = "evillimiter"; + version = "1.5.0"; + + src = fetchFromGitHub { + owner = "bitbrute"; + repo = pname; + rev = "v${version}"; + sha256 = "1l0acd4a36wzz1gyc6mcw3zpagyi2mc425c6d4c6anq3jxwm3847"; + }; + + propagatedBuildInputs = [ + colorama + iproute2 + iptables + netaddr + netifaces + scapy + terminaltables + tqdm + ]; + + # no tests present + doCheck = false; + + pythonImportsCheck = [ "evillimiter.evillimiter" ]; + + meta = with lib; { + description = "Tool that monitors, analyzes and limits the bandwidth"; + longDescription = '' + A tool to monitor, analyze and limit the bandwidth (upload/download) of + devices on your local network without physical or administrative access. + evillimiter employs ARP spoofing and traffic shaping to throttle the + bandwidth of hosts on the network. + ''; + homepage = "https://github.com/bitbrute/evillimiter"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/networking/fastd/default.nix b/pkgs/tools/networking/fastd/default.nix index d57d9fc635b..ed7bb0b01d3 100644 --- a/pkgs/tools/networking/fastd/default.nix +++ b/pkgs/tools/networking/fastd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, bison, meson, ninja, pkgconfig +{ lib, stdenv, fetchFromGitHub, bison, meson, ninja, pkg-config , libuecc, libsodium, libcap, json_c, openssl }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1p4k50dk8byrghbr0fwmgwps8df6rlkgcd603r14i71m5g27z5gw"; }; - nativeBuildInputs = [ pkgconfig bison meson ninja ]; + nativeBuildInputs = [ pkg-config bison meson ninja ]; buildInputs = [ libuecc libsodium libcap json_c openssl ]; enableParallelBuilding = true; diff --git a/pkgs/tools/networking/ferm/default.nix b/pkgs/tools/networking/ferm/default.nix index 855a57b7720..f344dec6186 100644 --- a/pkgs/tools/networking/ferm/default.nix +++ b/pkgs/tools/networking/ferm/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, makeWrapper, perl, ebtables, ipset, iptables, nixosTests }: +{ lib, stdenv, fetchurl, makeWrapper, perl, ebtables, ipset, iptables, nixosTests }: let - inherit (stdenv.lib.versions) majorMinor; + inherit (lib.versions) majorMinor; in stdenv.mkDerivation rec { version = "2.5.1"; pname = "ferm"; @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { postInstall = '' rm -r $out/lib/systemd for i in "$out/sbin/"*; do - wrapProgram "$i" --prefix PATH : "${stdenv.lib.makeBinPath [ iptables ipset ebtables ]}" + wrapProgram "$i" --prefix PATH : "${lib.makeBinPath [ iptables ipset ebtables ]}" done ''; @@ -39,8 +39,8 @@ in stdenv.mkDerivation rec { command. The firewall configuration resembles structured programming-like language, which can contain levels and lists. ''; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [mic92]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [mic92]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/filegive/default.nix b/pkgs/tools/networking/filegive/default.nix index 3ed250ca4bc..1d7bf884edd 100644 --- a/pkgs/tools/networking/filegive/default.nix +++ b/pkgs/tools/networking/filegive/default.nix @@ -1,4 +1,4 @@ -{ buildGoPackage, lib, stdenv, fetchurl }: +{ buildGoPackage, lib, fetchurl }: buildGoPackage rec { name = "filegive-0.7.4"; diff --git a/pkgs/tools/networking/findomain/default.nix b/pkgs/tools/networking/findomain/default.nix index 761e9eb4619..480a64127ca 100644 --- a/pkgs/tools/networking/findomain/default.nix +++ b/pkgs/tools/networking/findomain/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "findomain"; - version = "2.1.4"; + version = "3.0.1"; src = fetchFromGitHub { owner = "Edu4rdSHL"; repo = pname; rev = version; - sha256 = "0g0kw1b18kk9jhvw88hcxc04ccj8k22fdzky7l2dv3r37vndd91w"; + sha256 = "sha256-eM3XTZ/Y0Kk5bdC+xskS/btGEVrC50342YBYJdXAlDg="; }; - cargoSha256 = "0cmp4w86qnzd2b2w4s3w019857pxysgikkl1g7ldkiylrsm5vlpn"; + cargoSha256 = "sha256-U3WXb6qGGshaWJ3GIC+c3W9Y8Cz0O23J7mVojCwitlk="; nativeBuildInputs = [ installShellFiles perl ]; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/networking/flvstreamer/default.nix b/pkgs/tools/networking/flvstreamer/default.nix index 57f29b275e3..869cd46b330 100644 --- a/pkgs/tools/networking/flvstreamer/default.nix +++ b/pkgs/tools/networking/flvstreamer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { @@ -25,15 +25,15 @@ stdenv.mkDerivation rec { description = "Command-line RTMP client"; longDescription = - '' flvstreamer is an open source command-line RTMP client intended to + '' flvstreamer is an open source command-line RTMP client intended to stream audio or video content from all types of flash or rtmp servers. ''; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; homepage = "https://savannah.nongnu.org/projects/flvstreamer"; - maintainers = [ stdenv.lib.maintainers.thammers ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + maintainers = [ lib.maintainers.thammers ]; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/tools/networking/frp/default.nix b/pkgs/tools/networking/frp/default.nix index 7ba943e338d..bc92d465699 100644 --- a/pkgs/tools/networking/frp/default.nix +++ b/pkgs/tools/networking/frp/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "frp"; - version = "0.34.3"; + version = "0.35.1"; src = fetchFromGitHub { owner = "fatedier"; repo = pname; rev = "v${version}"; - sha256 = "1c5337yv7m4ad1mr73a38lbxg6b7sk8pxqkzws01jxrry2jahb35"; + sha256 = "sha256-QnD8Yo1GLlOuCnYgzAIGW8JQ5yihmAZGqDFJ412L+W0="; }; - vendorSha256 = "0srkvd1kvjabf3r391n6spv5n77r7dw4y982ynqsv5grp5f4zmm1"; + vendorSha256 = "sha256-odZPXLn5la2x9QIlT3g7+Rxb9tXGhjTycEvJPUPbM2s="; doCheck = false; diff --git a/pkgs/tools/networking/gandi-cli/default.nix b/pkgs/tools/networking/gandi-cli/default.nix index e66d5b7c2a5..d7394ac94d8 100644 --- a/pkgs/tools/networking/gandi-cli/default.nix +++ b/pkgs/tools/networking/gandi-cli/default.nix @@ -1,26 +1,38 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub }: - -with python3Packages; +{ lib +, buildPythonApplication +, click +, fetchFromGitHub +, ipy +, pyyaml +, requests +}: buildPythonApplication rec { pname = "gandi-cli"; - version = "1.5"; + version = "1.6"; src = fetchFromGitHub { owner = "Gandi"; repo = "gandi.cli"; rev = version; - sha256 = "1jcabpphlm6qajw8dz0h4gynm03g1mxi0cn900i3v7wdfww1gfab"; + sha256 = "sha256-KLeEbbzgqpmBjeTc5RYsFScym8xtMqVjU+H0lyDM0+o="; }; - propagatedBuildInputs = [ click ipy pyyaml requests ]; + propagatedBuildInputs = [ + click + ipy + pyyaml + requests + ]; - doCheck = false; # Tests try to contact the actual remote API + # Tests try to contact the actual remote API + doCheck = false; + pythonImportsCheck = [ "gandi" ]; meta = with lib; { description = "Command-line interface to the public Gandi.net API"; homepage = "https://cli.gandi.net/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ kampka ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix index 0bf0ebb07b3..4e20cbe7441 100644 --- a/pkgs/tools/networking/getmail/default.nix +++ b/pkgs/tools/networking/getmail/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python2Packages }: +{ lib, fetchurl, python2Packages }: python2Packages.buildPythonApplication rec { pname = "getmail"; @@ -19,12 +19,12 @@ python2Packages.buildPythonApplication rec { meta = { description = "A program for retrieving mail"; - maintainers = [ stdenv.lib.maintainers.raskin stdenv.lib.maintainers.domenkozar ]; - platforms = stdenv.lib.platforms.linux; + maintainers = [ lib.maintainers.raskin lib.maintainers.domenkozar ]; + platforms = lib.platforms.linux; homepage = "http://pyropus.ca/software/getmail/"; inherit version; updateWalker = true; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/getmail6/default.nix b/pkgs/tools/networking/getmail6/default.nix new file mode 100644 index 00000000000..40be3d2944a --- /dev/null +++ b/pkgs/tools/networking/getmail6/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, python3Packages, lib }: + +python3Packages.buildPythonApplication rec { + pname = "getmail6"; + version = "6.14"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "1a3bw4wwdapd9n051dgwqldd8gwiipb5shaz08qwp1jndpvylm7d"; + }; + + doCheck = false; + + pythonImportsCheck = [ "getmailcore" ]; + + postPatch = '' + # getmail spends a lot of effort to build an absolute path for + # documentation installation; too bad it is counterproductive now + sed -e '/datadir or prefix,/d' -i setup.py + ''; + + meta = with lib; { + description = "A program for retrieving mail"; + homepage = "https://getmail6.org"; + updateWalker = true; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ abbe ]; + }; +} diff --git a/pkgs/tools/networking/gftp/default.nix b/pkgs/tools/networking/gftp/default.nix index f6aa4c061ce..b228967a73b 100644 --- a/pkgs/tools/networking/gftp/default.nix +++ b/pkgs/tools/networking/gftp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk2, readline, ncurses, gettext, openssl, pkgconfig }: +{ lib, stdenv, fetchurl, gtk2, readline, ncurses, gettext, openssl, pkg-config }: stdenv.mkDerivation { name = "gftp-2.0.19"; @@ -12,13 +12,13 @@ stdenv.mkDerivation { sed -i -e '/<stropts.h>/d' lib/pty.c ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 readline ncurses gettext openssl ]; meta = { description = "GTK-based FTP client"; homepage = "http://www.gftp.org"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/gmrender-resurrect/default.nix b/pkgs/tools/networking/gmrender-resurrect/default.nix index 843c53a7ad5..acaeb3bc4cc 100644 --- a/pkgs/tools/networking/gmrender-resurrect/default.nix +++ b/pkgs/tools/networking/gmrender-resurrect/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig, makeWrapper, gstreamer +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, makeWrapper, gstreamer , gst-plugins-base, gst-plugins-good, gst-plugins-bad, gst-plugins-ugly, gst-libav, libupnp }: let @@ -28,7 +28,7 @@ in ]; buildInputs = [ gstreamer libupnp ]; - nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ]; + nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper ]; postInstall = '' for prog in "$out/bin/"*; do diff --git a/pkgs/tools/networking/go-shadowsocks2/default.nix b/pkgs/tools/networking/go-shadowsocks2/default.nix index fe2285df22c..c989f36da3d 100644 --- a/pkgs/tools/networking/go-shadowsocks2/default.nix +++ b/pkgs/tools/networking/go-shadowsocks2/default.nix @@ -1,19 +1,17 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "go-shadowsocks2"; - version = "0.0.11"; - - goPackagePath = "github.com/shadowsocks/go-shadowsocks2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "shadowsocks"; repo = "go-shadowsocks2"; rev = "v${version}"; - sha256 = "1dprz84gmcp6xcsk873lhj32wm8b55vnqn0s984ggvwf1rjqw00c"; + sha256 = "1wzy3ml4ld83iawcl6p313bskzs6zjhz8vlg8kpwgn71cnbv4pvi"; }; - goDeps = ./deps.nix; + vendorSha256 = "0iyak8af708h3rdrslndladbcjrix35j3rlhpsb8ljchqp09lksg"; meta = with lib; { description = "Fresh implementation of Shadowsocks in Go"; diff --git a/pkgs/tools/networking/go-shadowsocks2/deps.nix b/pkgs/tools/networking/go-shadowsocks2/deps.nix deleted file mode 100644 index 7fe0c2b6985..00000000000 --- a/pkgs/tools/networking/go-shadowsocks2/deps.nix +++ /dev/null @@ -1,30 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/aead/chacha20"; - fetch = { - type = "git"; - url = "https://github.com/aead/chacha20"; - rev = "8b13a72661dae6e9e5dea04f344f0dc95ea29547"; - sha256 = "0gbmgq5kbqmbyrsav57ql4jzbvqvp1q7yvcd5fl3wf5g94iyv56r"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "60c769a6c58655dab1b9adac0d58967dd517cfba"; - sha256 = "1wy2pg38dz29vf1h48yfqf8m3jqvwnbdw8vkk3ldlj5d8fbbbmv8"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "fb81701db80f1745f51259b1f286de3fe2ec80c8"; - sha256 = "1cgvyzkmsbvgyp75nxp10fpnpy08scz6ak60s9w0mkgibw7irhz3"; - }; - } -] diff --git a/pkgs/tools/networking/gobgp/default.nix b/pkgs/tools/networking/gobgp/default.nix new file mode 100644 index 00000000000..8c0e093f9dd --- /dev/null +++ b/pkgs/tools/networking/gobgp/default.nix @@ -0,0 +1,33 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "gobgp"; + version = "2.23.0"; + + src = fetchFromGitHub { + owner = "osrg"; + repo = "gobgp"; + rev = "v${version}"; + sha256 = "0r7w1c3rh0wnsrhdpzr2fp1aqdqafrb42f2hra6xwwspr092ixq0"; + }; + + vendorSha256 = "0dmd4r6x76jn8pyvp47x4llzc2wij5m9lchgyaagcb5sfdgbns9x"; + + postConfigure = '' + export CGO_ENABLED=0 + ''; + + buildFlagsArray = '' + -ldflags= + -s -w -extldflags '-static' + ''; + + subPackages = [ "cmd/gobgp" ]; + + meta = with lib; { + description = "A CLI tool for GoBGP"; + homepage = "https://osrg.github.io/gobgp/"; + license = licenses.asl20; + maintainers = with maintainers; [ higebu ]; + }; +} diff --git a/pkgs/tools/networking/goklp/default.nix b/pkgs/tools/networking/goklp/default.nix index 78117a700bd..10c5c8ea64f 100644 --- a/pkgs/tools/networking/goklp/default.nix +++ b/pkgs/tools/networking/goklp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "goklp"; diff --git a/pkgs/tools/networking/goreplay/default.nix b/pkgs/tools/networking/goreplay/default.nix index 0859472a446..14d0a16366b 100644 --- a/pkgs/tools/networking/goreplay/default.nix +++ b/pkgs/tools/networking/goreplay/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, libpcap }: +{ lib, buildGoPackage, fetchFromGitHub, libpcap }: buildGoPackage rec { pname = "goreplay"; @@ -18,9 +18,9 @@ buildGoPackage rec { meta = { homepage = "https://github.com/buger/goreplay"; - license = stdenv.lib.licenses.lgpl3Only; + license = lib.licenses.lgpl3Only; description = "Open-source tool for capturing and replaying live HTTP traffic"; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ lovek323 ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ lovek323 ]; }; } diff --git a/pkgs/tools/networking/grpcurl/default.nix b/pkgs/tools/networking/grpcurl/default.nix index fccd4b8dace..3f9d31b508b 100644 --- a/pkgs/tools/networking/grpcurl/default.nix +++ b/pkgs/tools/networking/grpcurl/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "grpcurl"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "fullstorydev"; repo = "grpcurl"; rev = "v${version}"; - sha256 = "11wjyg5008mkpzdp6q6k6yxwxx5byas8kbp57kdi1r38pya38hna"; + sha256 = "sha256-ZrL23eqA56BApwUtBwL5nSAd2LZbQxthyiFBnkJ5+Zg="; }; subPackages = [ "cmd/grpcurl" ]; - vendorSha256 = "0pc62dndca13jyk3bq6mp53w1ay7sfzf487m0cswvkijcsw8wk9q"; + vendorSha256 = "sha256-Tx00zRlzxCgyYdcYjzCxnFe8HyiitaKLcXJjYWhYSic="; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; diff --git a/pkgs/tools/networking/guardian-agent/default.nix b/pkgs/tools/networking/guardian-agent/default.nix index a736aa4df18..57080d223fa 100644 --- a/pkgs/tools/networking/guardian-agent/default.nix +++ b/pkgs/tools/networking/guardian-agent/default.nix @@ -30,9 +30,9 @@ buildGoPackage rec { ''; postFixup = '' - wrapProgram $out/bin/sga-guard \ - --prefix PATH : "$out/bin" \ - --prefix PATH : "${autossh}/bin" + wrapProgram $out/bin/sga-guard \ + --prefix PATH : "$out/bin" \ + --prefix PATH : "${autossh}/bin" ''; meta = with lib; { diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/tools/networking/gupnp-tools/default.nix index bace27f3d8d..655cf118302 100644 --- a/pkgs/tools/networking/gupnp-tools/default.nix +++ b/pkgs/tools/networking/gupnp-tools/default.nix @@ -4,7 +4,7 @@ , ninja , gupnp , gssdp -, pkgconfig +, pkg-config , gtk3 , libuuid , gettext @@ -19,14 +19,14 @@ stdenv.mkDerivation rec { version = "0.10.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "13d1qr1avz9r76989nvgxhhclmqzr025xjk4rfnja94fpbspznj1"; }; nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gettext wrapGAppsHook ]; diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 9f01962250d..5e09ddd430b 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -11,11 +11,11 @@ assert usePcre -> pcre != null; stdenv.mkDerivation rec { pname = "haproxy"; - version = "2.3.2"; + version = "2.3.4"; src = fetchurl { - url = "https://www.haproxy.org/download/${stdenv.lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz"; - sha256 = "1mcg0d6qiwl3xps65ir2sv5sc868zla5wnfhk24d2b0sg6xp7jwr"; + url = "https://www.haproxy.org/download/${lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz"; + sha256 = "sha256-YBSM3+3WsZxAHbzXXM12pTwgvHbEkDK6Mq+YoKXEle0="; }; buildInputs = [ openssl zlib ] diff --git a/pkgs/tools/networking/horst/default.nix b/pkgs/tools/networking/horst/default.nix index 66cb883f5aa..194365130bf 100644 --- a/pkgs/tools/networking/horst/default.nix +++ b/pkgs/tools/networking/horst/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchFromGitHub, pkgconfig, ncurses, libnl }: +{lib, stdenv, fetchFromGitHub, pkg-config, ncurses, libnl }: stdenv.mkDerivation rec { pname = "horst"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "140pyv6rlsh4c745w4b59pz3hrarr39qq3mz9z1lsd3avc12nx1a"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses libnl ]; installFlags = [ "DESTDIR=${placeholder "out"}" ]; diff --git a/pkgs/tools/networking/hping/default.nix b/pkgs/tools/networking/hping/default.nix index 5d8b6ab37e8..97b45c64ee2 100644 --- a/pkgs/tools/networking/hping/default.nix +++ b/pkgs/tools/networking/hping/default.nix @@ -11,12 +11,12 @@ stdenv.mkDerivation rec { sha256 = "0y0n1ybij3yg9lfgzcwfmjz1sjg913zcqrv391xx83dm0j80sdpb"; }; - buildInputs = [ libpcap ] ++ stdenv.lib.optional withTcl tcl; + buildInputs = [ libpcap ] ++ lib.optional withTcl tcl; postPatch = '' substituteInPlace Makefile.in --replace "gcc" "$CC" substituteInPlace version.c --replace "RELEASE_DATE" "\"$version\"" - '' + stdenv.lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.isLinux '' sed -i -e 's|#include <net/bpf.h>|#include <pcap/bpf.h>|' \ libpcap_stuff.c script.c ''; diff --git a/pkgs/tools/networking/http-prompt/default.nix b/pkgs/tools/networking/http-prompt/default.nix index 59a3bffdc6d..3732fbd879f 100644 --- a/pkgs/tools/networking/http-prompt/default.nix +++ b/pkgs/tools/networking/http-prompt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, httpie }: +{ lib, fetchFromGitHub, python3Packages, httpie }: python3Packages.buildPythonApplication rec { pname = "http-prompt"; diff --git a/pkgs/tools/networking/httpie/default.nix b/pkgs/tools/networking/httpie/default.nix index bf80cd48ffa..c5e12317fd7 100644 --- a/pkgs/tools/networking/httpie/default.nix +++ b/pkgs/tools/networking/httpie/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages, docutils, fetchpatch }: +{ lib, fetchFromGitHub, python3Packages, docutils, fetchpatch }: python3Packages.buildPythonApplication rec { pname = "httpie"; @@ -97,7 +97,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "A command line HTTP client whose goal is to make CLI human-friendly"; homepage = "https://httpie.org/"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ antono relrod schneefux ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ antono relrod schneefux ]; }; } diff --git a/pkgs/tools/networking/httplab/default.nix b/pkgs/tools/networking/httplab/default.nix index 22dc500fd4c..40851d370c7 100644 --- a/pkgs/tools/networking/httplab/default.nix +++ b/pkgs/tools/networking/httplab/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "httplab"; diff --git a/pkgs/tools/networking/httplz/default.nix b/pkgs/tools/networking/httplz/default.nix index 3932bbd08cf..eacb598674d 100644 --- a/pkgs/tools/networking/httplz/default.nix +++ b/pkgs/tools/networking/httplz/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, rustPlatform -, openssl, pkgconfig, darwin, libiconv }: +, openssl, pkg-config, darwin, libiconv }: rustPlatform.buildRustPackage rec { pname = "httplz"; @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { sha256 = "154alxxclz78r29m656c8yahnzq0vd64s4sp19h0ca92dfw4s46y"; }; - nativeBuildInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; @@ -30,6 +30,6 @@ rustPlatform.buildRustPackage rec { description = "A basic http server for hosting a folder fast and simply"; homepage = "https://github.com/thecoshman/http"; license = licenses.mit; - maintainers = with maintainers; [ bbigras ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/networking/httpstat/default.nix b/pkgs/tools/networking/httpstat/default.nix index f404090e5e3..27c2a145a65 100644 --- a/pkgs/tools/networking/httpstat/default.nix +++ b/pkgs/tools/networking/httpstat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, curl, pythonPackages, glibcLocales }: +{ lib, fetchFromGitHub, curl, pythonPackages, glibcLocales }: pythonPackages.buildPythonApplication rec { pname = "httpstat"; @@ -18,7 +18,7 @@ pythonPackages.buildPythonApplication rec { meta = { description = "curl statistics made simple"; homepage = "https://github.com/reorx/httpstat"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ nequissimus ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ nequissimus ]; }; } diff --git a/pkgs/tools/networking/hue-cli/gemset.nix b/pkgs/tools/networking/hue-cli/gemset.nix index 69d12f25a80..08fd67c3885 100644 --- a/pkgs/tools/networking/hue-cli/gemset.nix +++ b/pkgs/tools/networking/hue-cli/gemset.nix @@ -31,4 +31,4 @@ }; version = "2.2.0"; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/networking/hyenae/default.nix b/pkgs/tools/networking/hyenae/default.nix index 2ec22f2bab6..5007a69fb9b 100644 --- a/pkgs/tools/networking/hyenae/default.nix +++ b/pkgs/tools/networking/hyenae/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libdnet, pkgconfig, libpcap}: +{lib, stdenv, fetchurl, libdnet, pkg-config, libpcap}: stdenv.mkDerivation { name = "hyenae-0.36-1"; @@ -10,14 +10,14 @@ stdenv.mkDerivation { sha256 = "1f3x4yn9a9p4f4wk4l8pv7hxfjc8q7cv20xzf7ky735sq1hj0xcg"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [libdnet libpcap]; meta = { description = ""; homepage = "https://sourceforge.net/projects/hyenae/"; - license = stdenv.lib.licenses.gpl3; - maintainers = [stdenv.lib.maintainers.marcweber]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + maintainers = [lib.maintainers.marcweber]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index 873ecf03bbb..ab215952091 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "0bpkgq7srwpjmadsz3nsd14jpr19b1zfrpc074lzjaq15icxxgxc"; }; - buildInputs = with stdenv.lib; [ boost zlib openssl ] + buildInputs = with lib; [ boost zlib openssl ] ++ optional upnpSupport miniupnpc; makeFlags = let ynf = a: b: a + "=" + (if b then "yes" else "no"); in diff --git a/pkgs/tools/networking/iftop/default.nix b/pkgs/tools/networking/iftop/default.nix index 900a740c724..c3e71e6132d 100644 --- a/pkgs/tools/networking/iftop/default.nix +++ b/pkgs/tools/networking/iftop/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { # Explicitly link against libgcc_s, to work around the infamous # "libgcc_s.so.1 must be installed for pthread_cancel to work". - LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; + LDFLAGS = lib.optionalString stdenv.isLinux "-lgcc_s"; preConfigure = '' cp ${automake}/share/automake*/config.{sub,guess} config diff --git a/pkgs/tools/networking/igmpproxy/default.nix b/pkgs/tools/networking/igmpproxy/default.nix index 0c4279b6f64..9f924964907 100644 --- a/pkgs/tools/networking/igmpproxy/default.nix +++ b/pkgs/tools/networking/igmpproxy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "igmpproxy"; - version = "0.2.1"; + version = "0.3"; src = fetchFromGitHub { owner = "pali"; repo = "igmpproxy"; rev = version; - sha256 = "13zn4q24drbhpqmcmqh1jg7ind5iqn11wj3xvczlc8w35vyqssyf"; + sha256 = "sha256-B7mq+5pKWMO4dJeFPB7tiyjDQjj90g/kmYB2ApBE3Ic="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/networking/imapproxy/default.nix b/pkgs/tools/networking/imapproxy/default.nix index 01480056a2a..dd149f57432 100644 --- a/pkgs/tools/networking/imapproxy/default.nix +++ b/pkgs/tools/networking/imapproxy/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, openssl, ncurses}: +{lib, stdenv, fetchurl, openssl, ncurses}: stdenv.mkDerivation { name = "imapproxy-1.2.7"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { homepage = "http://imapproxy.org/"; description = "It proxies IMAP transactions caching server connections"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/tools/networking/inadyn/default.nix index 2cb04c1b210..47d86615026 100644 --- a/pkgs/tools/networking/inadyn/default.nix +++ b/pkgs/tools/networking/inadyn/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config , gnutls, libite, libconfuse }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "00jhayx0hfl9dw78d58bdxa5390bvxq73lz26q9h1gg1xw76adan"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ gnutls libite libconfuse ]; diff --git a/pkgs/tools/networking/iodine/default.nix b/pkgs/tools/networking/iodine/default.nix index 2703ca0fc64..226cfb9ce8e 100644 --- a/pkgs/tools/networking/iodine/default.nix +++ b/pkgs/tools/networking/iodine/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, zlib, nettools, nixosTests }: +{ lib, stdenv, fetchFromGitHub, zlib, nettools, nixosTests }: stdenv.mkDerivation rec { pname = "iodine"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://code.kryo.se/iodine/"; description = "Tool to tunnel IPv4 data through a DNS server"; - license = stdenv.lib.licenses.isc; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.isc; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/ip2unix/default.nix b/pkgs/tools/networking/ip2unix/default.nix index 269dd0f1f34..992ee324cc5 100644 --- a/pkgs/tools/networking/ip2unix/default.nix +++ b/pkgs/tools/networking/ip2unix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, libyamlcpp, systemd +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, libyamlcpp, systemd , python3Packages, asciidoc, libxslt, docbook_xml_dtd_45, docbook_xsl , libxml2, docbook5 }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - meson ninja pkgconfig asciidoc libxslt.bin docbook_xml_dtd_45 docbook_xsl + meson ninja pkg-config asciidoc libxslt.bin docbook_xml_dtd_45 docbook_xsl libxml2.bin docbook5 python3Packages.pytest python3Packages.pytest-timeout systemd ]; @@ -39,8 +39,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/nixcloud/ip2unix"; description = "Turn IP sockets into Unix domain sockets"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.lgpl3; - maintainers = [ stdenv.lib.maintainers.aszlig ]; + platforms = lib.platforms.linux; + license = lib.licenses.lgpl3; + maintainers = [ lib.maintainers.aszlig ]; }; } diff --git a/pkgs/tools/networking/ipcalc/default.nix b/pkgs/tools/networking/ipcalc/default.nix index 7f118193a3a..5fec55899e4 100644 --- a/pkgs/tools/networking/ipcalc/default.nix +++ b/pkgs/tools/networking/ipcalc/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, perl}: +{lib, stdenv, fetchurl, perl}: stdenv.mkDerivation rec { pname = "ipcalc"; version = "0.41"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "Simple IP network calculator"; homepage = "http://jodies.de/ipcalc"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/networking/iperf/3.nix b/pkgs/tools/networking/iperf/3.nix index aa9316642dd..5ab3f7f30fb 100644 --- a/pkgs/tools/networking/iperf/3.nix +++ b/pkgs/tools/networking/iperf/3.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" ]; - patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [ + patches = lib.optionals stdenv.hostPlatform.isMusl [ (fetchpatch { url = "https://git.alpinelinux.org/aports/plain/main/iperf3/remove-pg-flags.patch?id=7f979fc51ae31d5c695d8481ba84a4afc5080efb"; name = "remove-pg-flags.patch"; diff --git a/pkgs/tools/networking/ipgrep/default.nix b/pkgs/tools/networking/ipgrep/default.nix index dd85a5dcb61..d1f5316c27b 100644 --- a/pkgs/tools/networking/ipgrep/default.nix +++ b/pkgs/tools/networking/ipgrep/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { version = "1.0.1"; diff --git a/pkgs/tools/networking/ipv6calc/default.nix b/pkgs/tools/networking/ipv6calc/default.nix index 47b8abe54d3..158a979fb40 100644 --- a/pkgs/tools/networking/ipv6calc/default.nix +++ b/pkgs/tools/networking/ipv6calc/default.nix @@ -30,9 +30,9 @@ stdenv.mkDerivation rec { "--disable-bundled-md5" "--disable-dynamic-load" "--enable-shared" - ] ++ stdenv.lib.optional (libmaxminddb != null) "--enable-mmdb" - ++ stdenv.lib.optional (geolite-legacy != null) "--with-geoip-db=${geolite-legacy}/share/GeoIP" - ++ stdenv.lib.optional (ip2location-c != null) "--enable-ip2location"; + ] ++ lib.optional (libmaxminddb != null) "--enable-mmdb" + ++ lib.optional (geolite-legacy != null) "--with-geoip-db=${geolite-legacy}/share/GeoIP" + ++ lib.optional (ip2location-c != null) "--enable-ip2location"; enableParallelBuilding = true; diff --git a/pkgs/tools/networking/jnettop/default.nix b/pkgs/tools/networking/jnettop/default.nix index 2d23ff1f1fd..bd31235b6f9 100644 --- a/pkgs/tools/networking/jnettop/default.nix +++ b/pkgs/tools/networking/jnettop/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, stdenv, autoconf, libpcap, ncurses, pkgconfig, glib }: +{ fetchurl, fetchpatch, lib, stdenv, autoconf, libpcap, ncurses, pkg-config, glib }: stdenv.mkDerivation { name = "jnettop-0.13.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1855np7c4b0bqzhf1l1dyzxb90fpnvrirdisajhci5am6als31z9"; }; - nativeBuildInputs = [ pkgconfig autoconf ]; + nativeBuildInputs = [ pkg-config autoconf ]; buildInputs = [ libpcap ncurses glib ]; patches = [ @@ -19,7 +19,7 @@ stdenv.mkDerivation { }) ]; - preConfigure = '' autoconf ''; + preConfigure = "autoconf "; meta = { description = "Network traffic visualizer"; @@ -31,7 +31,7 @@ stdenv.mkDerivation { ''; homepage = "http://jnettop.kubs.info/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/junkie/default.nix b/pkgs/tools/networking/junkie/default.nix index 29fe71c9365..58b35f2f53f 100644 --- a/pkgs/tools/networking/junkie/default.nix +++ b/pkgs/tools/networking/junkie/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, libpcap, guile, openssl }: +{ lib, stdenv, fetchFromGitHub, pkg-config, libpcap, guile, openssl }: stdenv.mkDerivation rec { pname = "junkie"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0kfdjgch667gfb3qpiadd2dj3fxc7r19nr620gffb1ahca02wq31"; }; buildInputs = [ libpcap guile openssl ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; configureFlags = [ "GUILELIBDIR=\${out}/share/guile/site" "GUILECACHEDIR=\${out}/lib/guile/ccache" @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { meta = { description = "Deep packet inspection swiss-army knife"; homepage = "https://github.com/rixed/junkie"; - license = stdenv.lib.licenses.agpl3Plus; - maintainers = [ stdenv.lib.maintainers.rixed ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.agpl3Plus; + maintainers = [ lib.maintainers.rixed ]; + platforms = lib.platforms.unix; longDescription = '' Junkie is a network sniffer like Tcpdump or Wireshark, but designed to be easy to program and extend. diff --git a/pkgs/tools/networking/jwhois/default.nix b/pkgs/tools/networking/jwhois/default.nix index 0a9ac99e236..6eb26de82fc 100644 --- a/pkgs/tools/networking/jwhois/default.nix +++ b/pkgs/tools/networking/jwhois/default.nix @@ -1,4 +1,4 @@ -{stdenv, lynx, fetchurl}: +{lib, stdenv, lynx, fetchurl}: stdenv.mkDerivation { name = "jwhois-4.0"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "A client for the WHOIS protocol allowing you to query the owner of a domain name"; homepage = "https://www.gnu.org/software/jwhois/"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl3; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/kail/default.nix b/pkgs/tools/networking/kail/default.nix index 2ddcd6c7d4b..ae431b329ea 100644 --- a/pkgs/tools/networking/kail/default.nix +++ b/pkgs/tools/networking/kail/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "kail"; diff --git a/pkgs/tools/networking/kail/deps.nix b/pkgs/tools/networking/kail/deps.nix index ee5d2fb8271..b6d9c3e9cf3 100644 --- a/pkgs/tools/networking/kail/deps.nix +++ b/pkgs/tools/networking/kail/deps.nix @@ -405,4 +405,4 @@ sha256 = "1vkcjg80l49hxiadqmkkd031kj6kc10m8mwcnla3k1ml8fv4qna9"; }; } -] \ No newline at end of file +] diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix index 6b364091946..d32c2f5cc57 100644 --- a/pkgs/tools/networking/kea/default.nix +++ b/pkgs/tools/networking/kea/default.nix @@ -1,15 +1,22 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkgconfig, openssl, botan2, log4cplus -, boost, python3, postgresql, libmysqlclient, gmp, bzip2 }: - -let inherit (stdenv) lib; in +{ stdenv +, lib +, fetchurl +, autoreconfHook +, pkg-config +, boost +, botan2 +, libmysqlclient +, log4cplus +, postgresql +, python3 }: stdenv.mkDerivation rec { pname = "kea"; - version = "1.5.0-P1"; + version = "1.8.2"; src = fetchurl { url = "https://ftp.isc.org/isc/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "0bqxzp3f7cmraa5davj2az1hx1gbbchqzlz3ai26c802agzafyhz"; + sha256 = "0f8x1blfmbcak0cd21jm1zpz4w8iimldhjilwkwgvmmrxnmsfv28"; }; patches = [ ./dont-create-var.patch ]; @@ -20,15 +27,24 @@ stdenv.mkDerivation rec { ''; configureFlags = [ + "--enable-perfdhcp" + "--enable-shell" "--localstatedir=/var" - "--with-pgsql=${postgresql}/bin/pg_config" "--with-mysql=${lib.getDev libmysqlclient}/bin/mysql_config" + "--with-pgsql=${postgresql}/bin/pg_config" + ]; + + nativeBuildInputs = [ + autoreconfHook + pkg-config ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ - openssl log4cplus boost python3 libmysqlclient - botan2 gmp bzip2 + boost + botan2 + libmysqlclient + log4cplus + python3 ]; enableParallelBuilding = true; diff --git a/pkgs/tools/networking/kea/dont-create-var.patch b/pkgs/tools/networking/kea/dont-create-var.patch index 385113d160f..53e05b5b62b 100644 --- a/pkgs/tools/networking/kea/dont-create-var.patch +++ b/pkgs/tools/networking/kea/dont-create-var.patch @@ -1,26 +1,28 @@ diff --git a/Makefile.am b/Makefile.am -index 2c0733c..974bb5e 100644 +index 10708e7..d4efd73 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -135,11 +135,6 @@ cppcheck: - --template '{file}:{line}: check_fail: {message} ({severity},{id})' \ - src +@@ -150,13 +150,6 @@ cppcheck: + docs: + $(MAKE) -C doc/sphinx +- -# These steps are necessary during installation -install-exec-hook: - mkdir -p $(DESTDIR)${localstatedir}/log/ -- mkdir -p $(DESTDIR)${localstatedir}/run/${PACKAGE_NAME} +- mkdir -p $(DESTDIR)${localstatedir}/lib/${PACKAGE_NAME} +- mkdir -p $(DESTDIR)${runstatedir}/${PACKAGE_NAME} - EXTRA_DIST = tools/path_replacer.sh EXTRA_DIST += tools/mk_cfgrpt.sh diff --git a/src/lib/dhcpsrv/Makefile.am b/src/lib/dhcpsrv/Makefile.am -index 564f623..7cea9f2 100644 +index a0a0289..ba42f8a 100644 --- a/src/lib/dhcpsrv/Makefile.am +++ b/src/lib/dhcpsrv/Makefile.am -@@ -352,5 +352,3 @@ libkea_dhcpsrv_parsers_include_HEADERS = \ +@@ -408,5 +408,3 @@ libkea_dhcpsrv_parsers_include_HEADERS = \ + parsers/simple_parser4.h \ parsers/simple_parser6.h - -install-data-local: - $(mkinstalldirs) $(DESTDIR)$(dhcp_data_dir) diff --git a/pkgs/tools/networking/keepalived/default.nix b/pkgs/tools/networking/keepalived/default.nix index 604a30a0ba7..7ce5e0ccbf0 100644 --- a/pkgs/tools/networking/keepalived/default.nix +++ b/pkgs/tools/networking/keepalived/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, nixosTests , libnfnetlink, libnl, net-snmp, openssl -, pkgconfig, autoreconfHook }: +, pkg-config, autoreconfHook }: stdenv.mkDerivation rec { pname = "keepalived"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { passthru.tests.keepalived = nixosTests.keepalived; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; configureFlags = [ "--enable-sha1" diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix index d356601a934..f51c6f034dd 100644 --- a/pkgs/tools/networking/lftp/default.nix +++ b/pkgs/tools/networking/lftp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gnutls, pkgconfig, readline, zlib, libidn2, gmp, libiconv, libunistring, gettext }: +{ lib, stdenv, fetchurl, gnutls, pkg-config, readline, zlib, libidn2, gmp, libiconv, libunistring, gettext }: stdenv.mkDerivation rec { pname = "lftp"; @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { sha256 = "03b7y0h3mf4jfq5y8zw6hv9v44z3n6i8hc1iswax96y3z7sc85y5"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gnutls readline zlib libidn2 gmp libiconv libunistring gettext ]; - hardeningDisable = stdenv.lib.optional stdenv.isDarwin "format"; + hardeningDisable = lib.optional stdenv.isDarwin "format"; configureFlags = [ "--with-readline=${readline.dev}" diff --git a/pkgs/tools/networking/libnids/default.nix b/pkgs/tools/networking/libnids/default.nix index aff451ab44a..a2cf239b56b 100644 --- a/pkgs/tools/networking/libnids/default.nix +++ b/pkgs/tools/networking/libnids/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, libpcap, glib, pkgconfig, libnet }: +{ lib, stdenv, fetchzip, libpcap, glib, pkg-config, libnet }: stdenv.mkDerivation { pname = "libnids"; version = "1.24"; @@ -6,7 +6,7 @@ stdenv.mkDerivation { url = "mirror://sourceforge/libnids/libnids-1.24.tar.gz"; sha256 = "1cblklfdfxcmy0an6xyyzx4l877xdawhjd28daqfsvrh81mb07k1"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libpcap glib libnet ]; /* diff --git a/pkgs/tools/networking/libreswan/default.nix b/pkgs/tools/networking/libreswan/default.nix index 1281f1b2129..3546e1aa119 100644 --- a/pkgs/tools/networking/libreswan/default.nix +++ b/pkgs/tools/networking/libreswan/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, makeWrapper, - pkgconfig, systemd, gmp, unbound, bison, flex, pam, libevent, libcap_ng, curl, nspr, + pkg-config, systemd, gmp, unbound, bison, flex, pam, libevent, libcap_ng, curl, nspr, bash, iproute, iptables, procps, coreutils, gnused, gawk, nss, which, python, docs ? false, xmlto, libselinux, ldns }: let - binPath = stdenv.lib.makeBinPath [ + binPath = lib.makeBinPath [ bash iproute iptables procps coreutils gnused gawk nss.tools which python ]; in @@ -35,11 +35,11 @@ stdenv.mkDerivation rec { "-DNSS_PKCS11_2_0_COMPAT=1" ]; - nativeBuildInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = [ bash iproute iptables systemd coreutils gnused gawk gmp unbound bison flex pam libevent libcap_ng curl nspr nss python ldns ] - ++ stdenv.lib.optional docs xmlto - ++ stdenv.lib.optional stdenv.isLinux libselinux; + ++ lib.optional docs xmlto + ++ lib.optional stdenv.isLinux libselinux; prePatch = '' # Correct bash path diff --git a/pkgs/tools/networking/linkchecker/default.nix b/pkgs/tools/networking/linkchecker/default.nix index 746a99ede59..ea96ab94037 100644 --- a/pkgs/tools/networking/linkchecker/default.nix +++ b/pkgs/tools/networking/linkchecker/default.nix @@ -4,13 +4,13 @@ with python3Packages; buildPythonApplication rec { pname = "linkchecker"; - version = "unstable-2020-08-15"; + version = "10.0.0"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "0086c28b3a419faa60562f2713346996062c03c2"; - sha256 = "0am5id8vqlqn1gb9jri0vjgiq5ffgrjq8yzdk1zc98gn2n0397wl"; + rev = "v" + version; + sha256 = "sha256-gcaamRxGn124LZ8rU+WzjRookU3akDO0ZyzI7/S6kFA="; }; nativeBuildInputs = [ gettext ]; diff --git a/pkgs/tools/networking/lldpd/default.nix b/pkgs/tools/networking/lldpd/default.nix index 229f261c8c3..18ae090f211 100644 --- a/pkgs/tools/networking/lldpd/default.nix +++ b/pkgs/tools/networking/lldpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, removeReferencesTo +{ stdenv, lib, fetchurl, pkg-config, removeReferencesTo , libevent, readline, net-snmp, openssl }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { "--with-systemdsystemunitdir=\${out}/lib/systemd/system" ]; - nativeBuildInputs = [ pkgconfig removeReferencesTo ]; + nativeBuildInputs = [ pkg-config removeReferencesTo ]; buildInputs = [ libevent readline net-snmp openssl ]; enableParallelBuilding = true; diff --git a/pkgs/tools/networking/logmein-hamachi/default.nix b/pkgs/tools/networking/logmein-hamachi/default.nix index 82cd9ec3f12..4512e1dc625 100644 --- a/pkgs/tools/networking/logmein-hamachi/default.nix +++ b/pkgs/tools/networking/logmein-hamachi/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl }: -with stdenv.lib; +with lib; let arch = @@ -12,7 +12,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then "0zy0jzvdqccfsg42m2lq1rj8r2c4iypd1h9vxl9824cbl92yim37" else if stdenv.hostPlatform.system == "i686-linux" then "03ml9xv19km99f0z7fpr21b1zkxvw7q39kjzd8wpb2pds51wnc62" else throwSystem; - libraries = stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]; + libraries = lib.makeLibraryPath [ stdenv.cc.cc ]; in stdenv.mkDerivation rec { pname = "logmein-hamachi"; diff --git a/pkgs/tools/networking/lsh/default.nix b/pkgs/tools/networking/lsh/default.nix index 56ed33ea36a..b03098d540a 100644 --- a/pkgs/tools/networking/lsh/default.nix +++ b/pkgs/tools/networking/lsh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gperf, guile, gmp, zlib, liboop, readline, gnum4, pam +{ lib, stdenv, fetchurl, gperf, guile, gmp, zlib, liboop, readline, gnum4, pam , nettools, lsof, procps }: stdenv.mkDerivation rec { @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://www.lysator.liu.se/~nisse/lsh/"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; maintainers = [ ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/tools/networking/lxi-tools/default.nix b/pkgs/tools/networking/lxi-tools/default.nix new file mode 100644 index 00000000000..92ef7f688a5 --- /dev/null +++ b/pkgs/tools/networking/lxi-tools/default.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, fetchFromGitHub +, autoreconfHook, pkg-config +, liblxi, readline, lua +}: + +stdenv.mkDerivation rec { + pname = "lxi-tools"; + version = "1.21"; + + src = fetchFromGitHub { + owner = "lxi-tools"; + repo = "lxi-tools"; + rev = "v${version}"; + sha256 = "0rkp6ywsw2zv7hpbr12kba79wkcwqin7xagxxhd968rbfkfdxlwc"; + }; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + + buildInputs = [ liblxi readline lua ]; + + meta = with lib; { + description = "Tool for communicating with LXI compatible instruments"; + longDescription = '' + lxi-tools is a collection of open source software tools + that enables control of LXI compatible instruments such + as modern oscilloscopes, power supplies, + spectrum analyzers etc. + ''; + homepage = "https://lxi-tools.github.io/"; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = [ maintainers.vq ]; + }; +} diff --git a/pkgs/tools/networking/maildrop/default.nix b/pkgs/tools/networking/maildrop/default.nix index d9fb58685b6..b258c638df5 100644 --- a/pkgs/tools/networking/maildrop/default.nix +++ b/pkgs/tools/networking/maildrop/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, pkgconfig, pcre, perl }: +{ fetchurl, lib, stdenv, pkg-config, pcre, perl }: stdenv.mkDerivation { name = "maildrop-2.6.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1a94p2b41iy334cwfwmzi19557dn5j61abh0cp2rfc9dkc8ibhdg"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pcre perl ]; patches = [ ./maildrop.configure.hack.patch ]; # for building in chroot diff --git a/pkgs/tools/networking/mailsend/default.nix b/pkgs/tools/networking/mailsend/default.nix index 6b9a0caacb9..9856634116e 100644 --- a/pkgs/tools/networking/mailsend/default.nix +++ b/pkgs/tools/networking/mailsend/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, openssl}: +{lib, stdenv, fetchurl, openssl}: let s = # Generated upstream information rec { @@ -31,10 +31,10 @@ stdenv.mkDerivation { ]; meta = { inherit (s) version; - description = ''CLI email sending tool''; - license = stdenv.lib.licenses.bsd3 ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + description = "CLI email sending tool"; + license = lib.licenses.bsd3 ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; homepage = "https://github.com/muquit/mailsend"; downloadPage = "https://github.com/muquit/mailsend/releases"; }; diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix index 0cc289d0149..4194605df53 100644 --- a/pkgs/tools/networking/mailutils/default.nix +++ b/pkgs/tools/networking/mailutils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, dejagnu, gettext, pkgconfig +{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, dejagnu, gettext, pkg-config , gdbm, pam, readline, ncurses, gnutls, guile, texinfo, gnum4, sasl, fribidi, nettools , python3, gss, libmysqlclient, system-sendmail }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - autoreconfHook gettext pkgconfig + autoreconfHook gettext pkg-config ]; buildInputs = [ diff --git a/pkgs/tools/networking/maphosts/gemset.nix b/pkgs/tools/networking/maphosts/gemset.nix index 3469d76ea65..b50653bc96d 100644 --- a/pkgs/tools/networking/maphosts/gemset.nix +++ b/pkgs/tools/networking/maphosts/gemset.nix @@ -31,4 +31,4 @@ }; version = "1.1.1"; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/networking/maxscale/default.nix b/pkgs/tools/networking/maxscale/default.nix index 38ac35c342d..c4e16ef8b1c 100644 --- a/pkgs/tools/networking/maxscale/default.nix +++ b/pkgs/tools/networking/maxscale/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, glibc +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, glibc , bison, curl, flex, gperftools, jansson, jemalloc, kerberos, lua, libmysqlclient , ncurses, openssl, pcre, pcre2, perl, rabbitmq-c, sqlite, tcl , libaio, libedit, libtool, libui, libuuid, zlib @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "161kc6aqqj3z509q4qwvsd86h06hlyzdask4gawn2ij0h3ca58q6"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ bison curl flex gperftools jansson jemalloc kerberos lua libmysqlclient diff --git a/pkgs/tools/networking/mcrcon/default.nix b/pkgs/tools/networking/mcrcon/default.nix index 7a5e8b8c5ac..ed2596bc88b 100644 --- a/pkgs/tools/networking/mcrcon/default.nix +++ b/pkgs/tools/networking/mcrcon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "mcrcon"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { It is well suited for remote administration and to be used as part of automated server maintenance scripts. It does not trigger "IO: Broken pipe" or "IO: Connection reset" spam bugs on the server side. ''; - maintainers = with stdenv.lib.maintainers; [ dermetfan ]; - license = with stdenv.lib.licenses; [ zlib libpng ]; + maintainers = with lib.maintainers; [ dermetfan ]; + license = with lib.licenses; [ zlib libpng ]; }; } diff --git a/pkgs/tools/networking/megatools/default.nix b/pkgs/tools/networking/megatools/default.nix index 829ba028fd5..ac37e93c736 100644 --- a/pkgs/tools/networking/megatools/default.nix +++ b/pkgs/tools/networking/megatools/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { docbook_xsl docbook_xml_dtd_45 libxslt ]; buildInputs = [ glib glib-networking curl ] - ++ stdenv.lib.optionals stdenv.isLinux [ fuse ]; + ++ lib.optionals stdenv.isLinux [ fuse ]; enableParallelBuilding = true; diff --git a/pkgs/tools/networking/memtier-benchmark/default.nix b/pkgs/tools/networking/memtier-benchmark/default.nix index a45c3a2e33a..0fe128ad13c 100644 --- a/pkgs/tools/networking/memtier-benchmark/default.nix +++ b/pkgs/tools/networking/memtier-benchmark/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, autoreconfHook -, pkgconfig, libevent, pcre, zlib, openssl +{ lib, stdenv, fetchFromGitHub, autoreconfHook +, pkg-config, libevent, pcre, zlib, openssl }: stdenv.mkDerivation rec { @@ -18,14 +18,14 @@ stdenv.mkDerivation rec { --replace '1.2.8' '${version}' ''; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libevent pcre zlib openssl ]; meta = { description = "Redis and Memcached traffic generation and benchmarking tool"; homepage = "https://github.com/redislabs/memtier_benchmark"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ thoughtpolice ]; }; } diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index 51ea6e1a0b3..9d667d0ee1d 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "minio-client"; - version = "2020-11-25T23-04-07Z"; + version = "2021-01-16T02-45-34Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "0r4za7jnwmh2wna5l4iv5pz6s5c62f7v4hmbv7misff9qbk4p4k7"; + sha256 = "sha256-1JUCoeLFMDvzT5KdQw+ZdYWPgdWKIL3kJ/LCIsqc6xE="; }; - vendorSha256 = "0zracgqwhqs3gabrqqm8fm3hyicaadcinsjp5qgprjwd9a3c1zfv"; + vendorSha256 = "sha256-3wWUIFpNXom2MuUEDgAAEHlWRXhUzId+shZW/i5Rw4A="; doCheck = false; diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix index 152a0b0df66..9fe476906bc 100644 --- a/pkgs/tools/networking/miniupnpc/default.nix +++ b/pkgs/tools/networking/miniupnpc/default.nix @@ -11,9 +11,9 @@ let inherit sha256; }; - nativeBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ which cctools ]; + nativeBuildInputs = lib.optionals stdenv.isDarwin [ which cctools ]; - patches = stdenv.lib.optional stdenv.isFreeBSD ./freebsd.patch; + patches = lib.optional stdenv.isFreeBSD ./freebsd.patch; doCheck = !stdenv.isFreeBSD; diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix index fe15d8bd328..9642f254838 100644 --- a/pkgs/tools/networking/miniupnpd/default.nix +++ b/pkgs/tools/networking/miniupnpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, iptables, libuuid, pkgconfig +{ stdenv, lib, fetchurl, iptables, libuuid, pkg-config , which, iproute, gnused, coreutils, gawk, makeWrapper }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ iptables libuuid ]; - nativeBuildInputs= [ pkgconfig makeWrapper ]; + nativeBuildInputs= [ pkg-config makeWrapper ]; makefile = "Makefile.linux"; diff --git a/pkgs/tools/networking/mmsd/default.nix b/pkgs/tools/networking/mmsd/default.nix index ccc99457d9b..f102995a3cc 100644 --- a/pkgs/tools/networking/mmsd/default.nix +++ b/pkgs/tools/networking/mmsd/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchgit , autoreconfHook -, pkgconfig +, pkg-config , glib , dbus }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/tools/networking/modem-manager/default.nix b/pkgs/tools/networking/modem-manager/default.nix index 248cd59fe12..06102ac2d90 100644 --- a/pkgs/tools/networking/modem-manager/default.nix +++ b/pkgs/tools/networking/modem-manager/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchurl, glib, udev, libgudev, polkit, ppp, gettext, pkgconfig +{ lib, stdenv, fetchurl, glib, udev, libgudev, polkit, ppp, gettext, pkg-config , libmbim, libqmi, systemd, vala, gobject-introspection, dbus }: stdenv.mkDerivation rec { pname = "modem-manager"; - version = "1.14.8"; + version = "1.14.10"; package = "ModemManager"; src = fetchurl { url = "https://www.freedesktop.org/software/${package}/${package}-${version}.tar.xz"; - sha256 = "15cjy7zzsxagx649vz0990avin47vpgdmm4ss2msggdla6x2c6py"; + sha256 = "sha256-TqYLN1p2HhfnuwlbyolFee0OjjOyc9xpi1y+A5R/NX8="; }; - nativeBuildInputs = [ vala gobject-introspection gettext pkgconfig ]; + nativeBuildInputs = [ vala gobject-introspection gettext pkg-config ]; buildInputs = [ glib udev libgudev polkit ppp libmbim libqmi systemd ]; diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix index dba75400f6f..b03678858ad 100644 --- a/pkgs/tools/networking/mosh/default.nix +++ b/pkgs/tools/networking/mosh/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, zlib, protobuf, ncurses, pkgconfig +{ lib, stdenv, fetchurl, fetchpatch, zlib, protobuf, ncurses, pkg-config , makeWrapper, perlPackages, openssl, autoreconfHook, openssh, bash-completion , libutempter ? null, withUtempter ? stdenv.isLinux }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "05hjhlp6lk8yjcy59zywpf0r6s0h0b9zxq0lw66dh9x8vxrhaq6s"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ protobuf ncurses zlib makeWrapper openssl bash-completion ] ++ (with perlPackages; [ perl IOTty ]) ++ lib.optional withUtempter libutempter; @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { patches = [ ./ssh_path.patch + ./mosh-client_path.patch ./utempter_path.patch # Fix w/c++17, ::bind vs std::bind (fetchpatch { @@ -32,6 +33,8 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace scripts/mosh.pl \ --subst-var-by ssh "${openssh}/bin/ssh" + substituteInPlace scripts/mosh.pl \ + --subst-var-by mosh-client "$out/bin/mosh-client" ''; configureFlags = [ "--enable-completion" ] ++ lib.optional withUtempter "--with-utempter"; @@ -40,7 +43,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/mosh --prefix PERL5LIB : $PERL5LIB ''; - CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11"; + CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11"; meta = { homepage = "https://mosh.org/"; @@ -53,8 +56,8 @@ stdenv.mkDerivation rec { Mosh is a replacement for SSH. It's more robust and responsive, especially over Wi-Fi, cellular, and long-distance links. ''; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [viric]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/mosh/mosh-client_path.patch b/pkgs/tools/networking/mosh/mosh-client_path.patch new file mode 100644 index 00000000000..327fb7af926 --- /dev/null +++ b/pkgs/tools/networking/mosh/mosh-client_path.patch @@ -0,0 +1,22 @@ +diff --git a/scripts/mosh.pl b/scripts/mosh.pl +index 56e96d7..2a2177e 100755 +--- a/scripts/mosh.pl ++++ b/scripts/mosh.pl +@@ -61,7 +61,7 @@ my $have_ipv6 = eval { + + $|=1; + +-my $client = 'mosh-client'; ++my $client = '@mosh-client@'; + my $server = 'mosh-server'; + + my $predict = undef; +@@ -91,7 +91,7 @@ my @cmdline = @ARGV; + my $usage = + qq{Usage: $0 [options] [--] [user@]host [command...] + --client=PATH mosh client on local machine +- (default: "mosh-client") ++ (default: "@mosh-client@") + --server=COMMAND mosh server on remote machine + (default: "mosh-server") + diff --git a/pkgs/tools/networking/mozwire/default.nix b/pkgs/tools/networking/mozwire/default.nix index 532d69c3f4e..360c3572139 100644 --- a/pkgs/tools/networking/mozwire/default.nix +++ b/pkgs/tools/networking/mozwire/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "01bj3c34x9ywxygsz4rdyw5gc9cz8x6zzl5fd7db8qy8bx2lhlr9"; }; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; cargoSha256 = "0yxnpnxwis46wz4j5rjzyyzrvh94hn8vzxmmrcmrdz3gkakg77hg"; diff --git a/pkgs/tools/networking/mtr/default.nix b/pkgs/tools/networking/mtr/default.nix index 0ebeb8410a6..8296bc47919 100644 --- a/pkgs/tools/networking/mtr/default.nix +++ b/pkgs/tools/networking/mtr/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { --replace ' install-exec-hook' "" ''; - configureFlags = stdenv.lib.optional (!withGtk) "--without-gtk"; + configureFlags = lib.optional (!withGtk) "--without-gtk"; nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ ncurses ] - ++ stdenv.lib.optional withGtk gtk3 - ++ stdenv.lib.optional stdenv.isLinux libcap; + ++ lib.optional withGtk gtk3 + ++ lib.optional stdenv.isLinux libcap; enableParallelBuilding = true; diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index 3b505d34f2a..03e19d5cb7a 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, sqlite, pkgconfig, autoreconfHook, pmccabe +{ lib, stdenv, fetchFromGitHub, sqlite, pkg-config, autoreconfHook, pmccabe , xapian, glib, gmime3, texinfo , emacs, guile , gtk3, webkitgtk, libsoup, icu , withMug ? false @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "03cp2ppj07xpb0c43d3cr8m9jps07mfm8clmlk03sjbxg1widsh0"; }; - postPatch = stdenv.lib.optionalString (batchSize != null) '' + postPatch = lib.optionalString (batchSize != null) '' sed -i lib/mu-store.cc --regexp-extended \ -e 's@(constexpr auto BatchSize).*@\1 = ${toString batchSize};@' ''; @@ -24,10 +24,10 @@ stdenv.mkDerivation rec { sqlite xapian glib gmime3 texinfo emacs libsoup icu ] # Workaround for https://github.com/djcb/mu/issues/1641 - ++ stdenv.lib.optional (!stdenv.isDarwin) guile - ++ stdenv.lib.optionals withMug [ gtk3 webkitgtk ]; + ++ lib.optional (!stdenv.isDarwin) guile + ++ lib.optionals withMug [ gtk3 webkitgtk ]; - nativeBuildInputs = [ pkgconfig autoreconfHook pmccabe ]; + nativeBuildInputs = [ pkg-config autoreconfHook pmccabe ]; enableParallelBuilding = true; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ''; # Install mug - postInstall = stdenv.lib.optionalString withMug '' + postInstall = lib.optionalString withMug '' for f in mug ; do install -m755 toys/$f/$f $out/bin/$f done diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index d634c37b123..6478a15aa1a 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, pkgconfig, glib, which }: +{ lib, stdenv, fetchurl, pkg-config, glib, which }: stdenv.mkDerivation rec { - name = "nbd-3.20"; + name = "nbd-3.21"; src = fetchurl { url = "mirror://sourceforge/nbd/${name}.tar.xz"; - sha256 = "1kfnyx52nna2mnw264njk1dl2zc8m78sz031yp65mbmpi99v7qg0"; + sha256 = "sha256-52iK852Rczu80tsIBixE/lA9AE5RUodAE5xEr/amvvk="; }; buildInputs = [ glib ] - ++ stdenv.lib.optional (stdenv ? glibc) stdenv.glibc.linuxHeaders; + ++ lib.optional (stdenv ? glibc) stdenv.glibc.linuxHeaders; - nativeBuildInputs = [ pkgconfig which ]; + nativeBuildInputs = [ pkg-config which ]; postInstall = '' mkdir -p "$out/share/doc/${name}" @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { # Glib calls `clock_gettime', which is in librt. Linking that library # here ensures that a proper rpath is added to the executable so that # it can be loaded at run-time. - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lrt -lpthread"; + NIX_LDFLAGS = lib.optionalString stdenv.isLinux "-lrt -lpthread"; meta = { homepage = "http://nbd.sourceforge.net"; description = "Map arbitrary files as block devices over the network"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.peti ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.peti ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/ndjbdns/default.nix b/pkgs/tools/networking/ndjbdns/default.nix index 3edfe9b7e5d..651cbab86d9 100644 --- a/pkgs/tools/networking/ndjbdns/default.nix +++ b/pkgs/tools/networking/ndjbdns/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, systemd, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, systemd, pkg-config }: -with stdenv.lib; +with lib; stdenv.mkDerivation { version = "1.06"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { sha256 = "0gjyvn8r66kp49gasd6sqfvg2pj0c6v67hnq7cqwl04kj69rfy86"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ ] ++ optional stdenv.isLinux systemd; diff --git a/pkgs/tools/networking/netboot/default.nix b/pkgs/tools/networking/netboot/default.nix index 28d9f2c5b32..a4737d6baac 100644 --- a/pkgs/tools/networking/netboot/default.nix +++ b/pkgs/tools/networking/netboot/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { description = "Mini PXE server"; maintainers = [ maintainers.raskin ]; platforms = ["x86_64-linux"]; - license = stdenv.lib.licenses.free; + license = lib.licenses.free; }; } diff --git a/pkgs/tools/networking/netifd/default.nix b/pkgs/tools/networking/netifd/default.nix index bfa64601ebf..efa05591f52 100644 --- a/pkgs/tools/networking/netifd/default.nix +++ b/pkgs/tools/networking/netifd/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { preBuild = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE \ - -I$(echo "${stdenv.lib.getDev libnl}"/include/libnl*/)" + -I$(echo "${lib.getDev libnl}"/include/libnl*/)" ''; meta = with lib; { diff --git a/pkgs/tools/networking/netkit/tftp/default.nix b/pkgs/tools/networking/netkit/tftp/default.nix index 847d8cbcf89..3a7a3a1deb4 100644 --- a/pkgs/tools/networking/netkit/tftp/default.nix +++ b/pkgs/tools/networking/netkit/tftp/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { name = "netkit-tftp-0.17"; @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { meta = { description = "Netkit TFTP client and server"; homepage = "ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"; - license = stdenv.lib.licenses.bsdOriginal; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.bsdOriginal; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/tools/networking/netrw/default.nix b/pkgs/tools/networking/netrw/default.nix index f7d73283d48..c5e54ab8f43 100644 --- a/pkgs/tools/networking/netrw/default.nix +++ b/pkgs/tools/networking/netrw/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , checksumType ? "built-in" , libmhash ? null , openssl ? null @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { "--with-checksum=${checksumType}" ]; - buildInputs = stdenv.lib.optional (checksumType == "mhash") libmhash - ++ stdenv.lib.optional (checksumType == "openssl") openssl; + buildInputs = lib.optional (checksumType == "mhash") libmhash + ++ lib.optional (checksumType == "openssl") openssl; src = fetchurl { urls = [ @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { meta = { description = "Simple tool for transporting data over the network"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; homepage = "https://mamuti.net/netrw/index.en.html"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/nettee/default.nix b/pkgs/tools/networking/nettee/default.nix index d95171807df..c5cbcb19a97 100644 --- a/pkgs/tools/networking/nettee/default.nix +++ b/pkgs/tools/networking/nettee/default.nix @@ -16,7 +16,7 @@ in stdenv.mkDerivation { meta = { homepage = "http://saf.bio.caltech.edu/nettee.html"; description = ''Network "tee" program''; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ Profpatsch ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/tools/networking/network-manager/0.9.8/default.nix b/pkgs/tools/networking/network-manager/0.9.8/default.nix index 6252d776886..d7dd99b58fa 100644 --- a/pkgs/tools/networking/network-manager/0.9.8/default.nix +++ b/pkgs/tools/networking/network-manager/0.9.8/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, intltool, pkgconfig, dbus-glib +{ lib, stdenv, fetchurl, intltool, pkg-config, dbus-glib , udev, libnl, libuuid, gnutls, dhcp , libgcrypt, perl, libgudev, avahi, ppp, kmod }: @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ dbus-glib ]; - nativeBuildInputs = [ intltool pkgconfig ]; + nativeBuildInputs = [ intltool pkg-config ]; patches = [ ./libnl-3.2.25.patch diff --git a/pkgs/tools/networking/network-manager/applet/default.nix b/pkgs/tools/networking/network-manager/applet/default.nix index 0eb5045ba2c..45839eabb0b 100644 --- a/pkgs/tools/networking/network-manager/applet/default.nix +++ b/pkgs/tools/networking/network-manager/applet/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { version = "1.18.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "12xiy8g8qk18jvxvn78mvq03zvzp06bww49na765jjw0rq541fyx"; }; diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index c5f59e3606f..88e50579dcc 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, substituteAll, intltool, pkgconfig, fetchpatch, dbus +{ lib, stdenv, fetchurl, substituteAll, intltool, pkg-config, fetchpatch, dbus , gnome3, systemd, libuuid, polkit, gnutls, ppp, dhcp, iptables, python3, vala , libgcrypt, dnsmasq, bluez5, readline, libselinux, audit , gobject-introspection, modemmanager, openresolv, libndp, newt, libsoup @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { version = "1.26.0"; src = fetchurl { - url = "mirror://gnome/sources/NetworkManager/${stdenv.lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz"; + url = "mirror://gnome/sources/NetworkManager/${lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz"; sha256 = "0isdqwp58d7r92sqsk7l2vlqwy518n8b7c7z94jk9gc1bdmjf8sj"; }; @@ -79,7 +79,7 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ gnutls libgcrypt ]; nativeBuildInputs = [ - meson ninja intltool pkgconfig + meson ninja intltool pkg-config vala gobject-introspection dbus # Docs gtk-doc libxslt docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_42 docbook_xml_dtd_43 pythonForDocs diff --git a/pkgs/tools/networking/network-manager/dmenu/default.nix b/pkgs/tools/networking/network-manager/dmenu/default.nix index 0e07f2cda80..9ea3dde19ab 100644 --- a/pkgs/tools/networking/network-manager/dmenu/default.nix +++ b/pkgs/tools/networking/network-manager/dmenu/default.nix @@ -33,8 +33,8 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Small script to manage NetworkManager connections with dmenu instead of nm-applet"; homepage = "https://github.com/firecat53/networkmanager-dmenu"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.jensbin ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.jensbin ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix b/pkgs/tools/networking/network-manager/fortisslvpn/default.nix index 0488f23481e..20388f242ea 100644 --- a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix +++ b/pkgs/tools/networking/network-manager/fortisslvpn/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1sw66cxgs4in4cjp1cm95c5ijsk8xbbmq4ykg2jwqwgz6cf2lr3s"; }; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { networkmanager ppp glib - ] ++ stdenv.lib.optionals withGnome [ + ] ++ lib.optionals withGnome [ gtk3 libsecret libnma diff --git a/pkgs/tools/networking/network-manager/iodine/default.nix b/pkgs/tools/networking/network-manager/iodine/default.nix index 2ead084d51e..87069d3c3c8 100644 --- a/pkgs/tools/networking/network-manager/iodine/default.nix +++ b/pkgs/tools/networking/network-manager/iodine/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, substituteAll, autoreconfHook, iodine, intltool, pkgconfig, networkmanager, libsecret, gtk3 +{ lib, stdenv, fetchFromGitLab, substituteAll, autoreconfHook, iodine, intltool, pkg-config, networkmanager, libsecret, gtk3 , withGnome ? true, gnome3, fetchpatch, libnma, glib }: let @@ -28,9 +28,9 @@ in stdenv.mkDerivation { ]; buildInputs = [ iodine networkmanager glib ] - ++ stdenv.lib.optionals withGnome [ gtk3 libsecret libnma ]; + ++ lib.optionals withGnome [ gtk3 libsecret libnma ]; - nativeBuildInputs = [ intltool autoreconfHook pkgconfig ]; + nativeBuildInputs = [ intltool autoreconfHook pkg-config ]; # glib-2.62 deprecations NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; diff --git a/pkgs/tools/networking/network-manager/l2tp/default.nix b/pkgs/tools/networking/network-manager/l2tp/default.nix index cd79a612bf9..bfcc2d8ae86 100644 --- a/pkgs/tools/networking/network-manager/l2tp/default.nix +++ b/pkgs/tools/networking/network-manager/l2tp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, substituteAll, fetchFromGitHub, autoreconfHook, libtool, intltool, pkgconfig +{ lib, stdenv, substituteAll, fetchFromGitHub, autoreconfHook, libtool, intltool, pkg-config , file, findutils , gtk3, networkmanager, ppp, xl2tpd, strongswan, libsecret , withGnome ? true, libnma }: @@ -23,9 +23,9 @@ stdenv.mkDerivation rec { ]; buildInputs = [ networkmanager ppp ] - ++ stdenv.lib.optionals withGnome [ gtk3 libsecret libnma ]; + ++ lib.optionals withGnome [ gtk3 libsecret libnma ]; - nativeBuildInputs = [ autoreconfHook libtool intltool pkgconfig file findutils ]; + nativeBuildInputs = [ autoreconfHook libtool intltool pkg-config file findutils ]; preConfigure = '' intltoolize -f diff --git a/pkgs/tools/networking/network-manager/libnma/default.nix b/pkgs/tools/networking/network-manager/libnma/default.nix index 9e8bd915dee..3d974933225 100644 --- a/pkgs/tools/networking/network-manager/libnma/default.nix +++ b/pkgs/tools/networking/network-manager/libnma/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1d5gzn7ss5vi0bhc8s4i5gsrck1ajslajam5jxfqazg094mffcys"; }; @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { networkmanager isocodes mobile-broadband-provider-info - ] ++ stdenv.lib.optionals withGnome [ + ] ++ lib.optionals withGnome [ # advanced certificate chooser gcr ]; diff --git a/pkgs/tools/networking/network-manager/openconnect/default.nix b/pkgs/tools/networking/network-manager/openconnect/default.nix index cc267aec68a..462eb3793d8 100644 --- a/pkgs/tools/networking/network-manager/openconnect/default.nix +++ b/pkgs/tools/networking/network-manager/openconnect/default.nix @@ -5,7 +5,7 @@ , libxml2 , openconnect , intltool -, pkgconfig +, pkg-config , autoreconfHook , networkmanager , gcr @@ -25,7 +25,7 @@ in stdenv.mkDerivation { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0nlp290nkawc4wqm978n4vhzg3xdqi8kpjjx19l855vab41rh44m"; }; @@ -47,7 +47,7 @@ in stdenv.mkDerivation { libxml2 openconnect networkmanager - ] ++ stdenv.lib.optionals withGnome [ + ] ++ lib.optionals withGnome [ gtk3 gcr libsecret @@ -55,7 +55,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ intltool - pkgconfig + pkg-config file ]; diff --git a/pkgs/tools/networking/network-manager/openvpn/default.nix b/pkgs/tools/networking/network-manager/openvpn/default.nix index 31b86bd2b00..4a9e508fcdc 100644 --- a/pkgs/tools/networking/network-manager/openvpn/default.nix +++ b/pkgs/tools/networking/network-manager/openvpn/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, substituteAll, openvpn, intltool, libxml2, pkgconfig, file, networkmanager, libsecret +{ lib, stdenv, fetchurl, substituteAll, openvpn, intltool, libxml2, pkg-config, file, networkmanager, libsecret , gtk3, withGnome ? true, gnome3, kmod, libnma }: let @@ -8,7 +8,7 @@ in stdenv.mkDerivation { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "062kh4zj7jfbwy4zzcwpq2m457bzbpm3l18s0ysnw3mgia3siz8f"; }; @@ -20,9 +20,9 @@ in stdenv.mkDerivation { ]; buildInputs = [ openvpn networkmanager ] - ++ stdenv.lib.optionals withGnome [ gtk3 libsecret libnma ]; + ++ lib.optionals withGnome [ gtk3 libsecret libnma ]; - nativeBuildInputs = [ intltool pkgconfig file libxml2 ]; + nativeBuildInputs = [ intltool pkg-config file libxml2 ]; configureFlags = [ "--with-gnome=${if withGnome then "yes" else "no"}" diff --git a/pkgs/tools/networking/network-manager/sstp/default.nix b/pkgs/tools/networking/network-manager/sstp/default.nix index bca53f8d9cd..d00c0e3e55f 100644 --- a/pkgs/tools/networking/network-manager/sstp/default.nix +++ b/pkgs/tools/networking/network-manager/sstp/default.nix @@ -10,7 +10,7 @@ , libnma , libsecret , networkmanager -, pkgconfig +, pkg-config , ppp , sstp , substituteAll @@ -30,9 +30,9 @@ in stdenv.mkDerivation { }; buildInputs = [ sstp networkmanager glib ppp ] - ++ stdenv.lib.optionals withGnome [ gtk3 libsecret libnma ]; + ++ lib.optionals withGnome [ gtk3 libsecret libnma ]; - nativeBuildInputs = [ file intltool autoreconfHook pkgconfig ]; + nativeBuildInputs = [ file intltool autoreconfHook pkg-config ]; postPatch = '' sed -i 's#/sbin/pppd#${ppp}/bin/pppd#' src/nm-sstp-service.c diff --git a/pkgs/tools/networking/network-manager/strongswan/default.nix b/pkgs/tools/networking/network-manager/strongswan/default.nix index 6f37ca296bb..c4cb79b4c8c 100644 --- a/pkgs/tools/networking/network-manager/strongswan/default.nix +++ b/pkgs/tools/networking/network-manager/strongswan/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, intltool, pkgconfig, networkmanager, strongswanNM +{ lib, stdenv, fetchurl, intltool, pkg-config, networkmanager, strongswanNM , gtk3, gnome3, libsecret, libnma }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ networkmanager strongswanNM libsecret gtk3 libnma ]; - nativeBuildInputs = [ intltool pkgconfig ]; + nativeBuildInputs = [ intltool pkg-config ]; # glib-2.62 deprecations NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; diff --git a/pkgs/tools/networking/network-manager/vpnc/default.nix b/pkgs/tools/networking/network-manager/vpnc/default.nix index f5f3d82d6c0..6ac71efc260 100644 --- a/pkgs/tools/networking/network-manager/vpnc/default.nix +++ b/pkgs/tools/networking/network-manager/vpnc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, substituteAll, vpnc, intltool, pkgconfig, networkmanager, libsecret +{ lib, stdenv, fetchurl, substituteAll, vpnc, intltool, pkg-config, networkmanager, libsecret , gtk3, withGnome ? true, gnome3, glib, kmod, file, fetchpatch, libnma }: let pname = "NetworkManager-vpnc"; @@ -7,7 +7,7 @@ in stdenv.mkDerivation { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1js5lwcsqws4klgypfxl4ikmakv7v7xgddij1fj6b0y0qicx0kyy"; }; @@ -24,9 +24,9 @@ in stdenv.mkDerivation { ]; buildInputs = [ vpnc networkmanager glib ] - ++ stdenv.lib.optionals withGnome [ gtk3 libsecret libnma ]; + ++ lib.optionals withGnome [ gtk3 libsecret libnma ]; - nativeBuildInputs = [ intltool pkgconfig file ]; + nativeBuildInputs = [ intltool pkg-config file ]; configureFlags = [ "--without-libnm-glib" diff --git a/pkgs/tools/networking/ngrok-2/default.nix b/pkgs/tools/networking/ngrok-2/default.nix index 3c1e0f498fb..0d9dbd19117 100644 --- a/pkgs/tools/networking/ngrok-2/default.nix +++ b/pkgs/tools/networking/ngrok-2/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: -with stdenv.lib; +with lib; let versions = builtins.fromJSON (builtins.readFile ./versions.json); arch = if stdenv.isi686 then "386" diff --git a/pkgs/tools/networking/nikto/NIKTODIR-nix-wrapper-fix.patch b/pkgs/tools/networking/nikto/NIKTODIR-nix-wrapper-fix.patch new file mode 100644 index 00000000000..d3caea1b26f --- /dev/null +++ b/pkgs/tools/networking/nikto/NIKTODIR-nix-wrapper-fix.patch @@ -0,0 +1,26 @@ +diff --color -ur a/program/nikto.pl b/program/nikto.pl +--- a/program/nikto.pl 2021-01-30 12:05:54.915072538 +0100 ++++ b/program/nikto.pl 2021-01-30 12:36:42.877729231 +0100 +@@ -223,7 +223,8 @@ + # Guess Nikto current directory + my $NIKTODIR = abs_path($0); + chomp($NIKTODIR); +- $NIKTODIR =~ s#[\\/]nikto.pl$##; ++ $NIKTODIR =~ s#[\\/]bin[\\/]\.nikto-wrapped$##; ++ + + # Guess user's home directory -- to support Windows + foreach my $var (split(/ /, "HOME USERPROFILE")) { +@@ -231,10 +232,10 @@ + } + + # Read the conf files in order (previous values are over-written with each, if multiple found) +- push(@CF,"$NIKTODIR/nikto.conf.default"); ++ push(@CF,"$NIKTODIR/etc/nikto.conf.default"); + push(@CF,"/etc/nikto.conf"); + push(@CF,"$home/nikto.conf"); +- push(@CF,"$NIKTODIR/nikto.conf"); ++ push(@CF,"$NIKTODIR/etc/nikto.conf"); + push(@CF,"nikto.conf"); + push(@CF,"$VARIABLES{'configfile'}"); + diff --git a/pkgs/tools/networking/nikto/default.nix b/pkgs/tools/networking/nikto/default.nix new file mode 100644 index 00000000000..e1abcb6c140 --- /dev/null +++ b/pkgs/tools/networking/nikto/default.nix @@ -0,0 +1,64 @@ +{ lib +, stdenv +, fetchFromGitHub +, perlPackages +, makeWrapper +, installShellFiles +}: + +stdenv.mkDerivation rec { + pname = "nikto"; + version = "2.2.0"; + + src = fetchFromGitHub { + owner = "sullo"; + repo = "nikto"; + rev = "c83d0461edd75c02677dea53da2896644f35ecab"; + sha256 = "0vwq2zdxir67cn78ls11qf1smd54nppy266v7ajm5rqdc47q7fy2"; + }; + + # Nikto searches its configuration file based on its current path + # This fixes the current path regex for the wrapped executable. + patches = [ ./NIKTODIR-nix-wrapper-fix.patch ]; + + postPatch = '' + # EXECDIR needs to be changed to the path where we copy the programs stuff + # Forcing SSLeay is needed for SSL support (the auto mode doesn't seem to work otherwise) + substituteInPlace program/nikto.conf.default \ + --replace "# EXECDIR=/opt/nikto" "EXECDIR=$out/share" \ + --replace "LW_SSL_ENGINE=auto" "LW_SSL_ENGINE=SSLeay" + ''; + + nativeBuildInputs = [ makeWrapper installShellFiles ]; + + propagatedBuildInputs = [ perlPackages.NetSSLeay ]; + + buildInputs = [ + perlPackages.perl + ]; + + installPhase = '' + runHook preInstall + install -d "$out/share" + cp -a program/* "$out/share" + install -Dm 755 "program/nikto.pl" "$out/bin/nikto" + install -Dm 644 program/nikto.conf.default "$out/etc/nikto.conf" + installManPage documentation/nikto.1 + install -Dm 644 program/docs/nikto_manual.html "$out/share/doc/${pname}/manual.html" + install -Dm 644 README.md "$out/share/doc/${pname}/README" + runHook postInstall + ''; + + postInstall = '' + wrapProgram $out/bin/nikto \ + --prefix PERL5LIB : $PERL5LIB + ''; + + meta = with lib; { + description = "Web server scanner"; + license = licenses.gpl2Plus; + homepage = "https://cirt.net/Nikto2"; + maintainers = with maintainers; [ shamilton ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/networking/noip/default.nix b/pkgs/tools/networking/noip/default.nix index 309607941af..3425d1e3a82 100644 --- a/pkgs/tools/networking/noip/default.nix +++ b/pkgs/tools/networking/noip/default.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation { meta = with lib; { description = "Dynamic DNS daemon for no-ip accounts"; homepage = "http://noip.com/download?page=linux"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.iand675 ]; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.iand675 ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/nss-mdns/default.nix b/pkgs/tools/networking/nss-mdns/default.nix index 1aaead46f6a..212f7bfc287 100644 --- a/pkgs/tools/networking/nss-mdns/default.nix +++ b/pkgs/tools/networking/nss-mdns/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, fetchpatch }: +{ fetchurl, lib, stdenv, fetchpatch }: stdenv.mkDerivation rec { name = "nss-mdns-0.10"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { "--localstatedir=/var" ]; - patches = stdenv.lib.optional stdenv.hostPlatform.isMusl + patches = lib.optional stdenv.hostPlatform.isMusl ( fetchpatch { @@ -41,10 +41,10 @@ stdenv.mkDerivation rec { ''; homepage = "http://0pointer.de/lennart/projects/nss-mdns/"; - license = stdenv.lib.licenses.lgpl2Plus; + license = lib.licenses.lgpl2Plus; # Supports both the GNU and FreeBSD NSS. - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux ++ stdenv.lib.platforms.freebsd; + platforms = lib.platforms.gnu ++ lib.platforms.linux ++ lib.platforms.freebsd; maintainers = [ ]; }; diff --git a/pkgs/tools/networking/nss-pam-ldapd/default.nix b/pkgs/tools/networking/nss-pam-ldapd/default.nix index 9f2c071c408..e112b8c1df1 100644 --- a/pkgs/tools/networking/nss-pam-ldapd/default.nix +++ b/pkgs/tools/networking/nss-pam-ldapd/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl -, pkgconfig, makeWrapper, autoreconfHook +, pkg-config, makeWrapper, autoreconfHook , openldap, python, pam }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1dna3r0q6sjhhlkhcp8x2zkslrd4y7701kk6fl5r940sdph1pmyh"; }; - nativeBuildInputs = [ pkgconfig makeWrapper autoreconfHook ]; + nativeBuildInputs = [ pkg-config makeWrapper autoreconfHook ]; buildInputs = [ openldap pam python ]; preConfigure = '' diff --git a/pkgs/tools/networking/ntopng/default.nix b/pkgs/tools/networking/ntopng/default.nix index 7606cb06d90..2ba373a2c61 100644 --- a/pkgs/tools/networking/ntopng/default.nix +++ b/pkgs/tools/networking/ntopng/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, libpcap,/* gnutls, libgcrypt,*/ libxml2, glib , geoip, geolite-legacy, sqlite, which, autoreconfHook, git -, pkgconfig, groff, curl, json_c, luajit, zeromq, rrdtool +, pkg-config, groff, curl, json_c, luajit, zeromq, rrdtool }: # ntopng includes LuaJIT, mongoose, rrdtool and zeromq in its third-party/ @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ libpcap/* gnutls libgcrypt*/ libxml2 glib geoip geolite-legacy - sqlite which autoreconfHook git pkgconfig groff curl json_c luajit zeromq + sqlite which autoreconfHook git pkg-config groff curl json_c luajit zeromq rrdtool ]; @@ -50,12 +50,12 @@ stdenv.mkDerivation rec { rm -rf httpdocs/geoip ln -s ${geolite-legacy}/share/GeoIP httpdocs/geoip - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' sed 's|LIBS += -lstdc++.6||' -i Makefile ''; NIX_CFLAGS_COMPILE = "-fpermissive" - + stdenv.lib.optionalString stdenv.cc.isClang " -Wno-error=reserved-user-defined-literal"; + + lib.optionalString stdenv.cc.isClang " -Wno-error=reserved-user-defined-literal"; meta = with lib; { description = "High-speed web-based traffic analysis and flow collection tool"; diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix index b2f8d8a2107..28144104932 100644 --- a/pkgs/tools/networking/ntp/default.nix +++ b/pkgs/tools/networking/ntp/default.nix @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { "--with-openssl-incdir=${openssl.dev}/include" "--enable-ignore-dns-errors" "--with-yielding-select=yes" - ] ++ stdenv.lib.optional stdenv.isLinux "--enable-linuxcaps" - ++ stdenv.lib.optional withSeccomp "--enable-libseccomp"; + ] ++ lib.optional stdenv.isLinux "--enable-linuxcaps" + ++ lib.optional withSeccomp "--enable-libseccomp"; buildInputs = [ libcap openssl perl ] ++ lib.optional withSeccomp libseccomp diff --git a/pkgs/tools/networking/nzbget/default.nix b/pkgs/tools/networking/nzbget/default.nix index 224474f1b38..375896258bc 100644 --- a/pkgs/tools/networking/nzbget/default.nix +++ b/pkgs/tools/networking/nzbget/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libxml2, ncurses, libsigcxx, libpar2 +{ lib, stdenv, fetchurl, pkg-config, libxml2, ncurses, libsigcxx, libpar2 , gnutls, libgcrypt, zlib, openssl }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0lwd0pfrs4a5ms193hgz2qiyf7grrc925dw6y0nfc0gkp27db9b5"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxml2 ncurses libsigcxx libpar2 gnutls libgcrypt zlib openssl ]; diff --git a/pkgs/tools/networking/ocserv/default.nix b/pkgs/tools/networking/ocserv/default.nix index 587379bde89..2f5dd14757b 100644 --- a/pkgs/tools/networking/ocserv/default.nix +++ b/pkgs/tools/networking/ocserv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkgconfig, nettle, gnutls +{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, nettle, gnutls , libev, protobufc, guile, geoip, libseccomp, gperf, readline , lz4, libgssglue, ronn, pam }: @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { src = fetchFromGitLab { owner = "openconnect"; repo = "ocserv"; - rev = "ocserv_${stdenv.lib.replaceStrings [ "." ] [ "_" ] version}"; + rev = "ocserv_${lib.replaceStrings [ "." ] [ "_" ] version}"; sha256 = "0k7sx9sg8akxwfdl51cvdqkdrx9qganqddgri2yhcgznc3f3pz5b"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ nettle gnutls libev protobufc guile geoip libseccomp gperf readline lz4 libgssglue ronn pam ]; meta = with lib; { diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index 73e2e6b60f5..0de96169769 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python2Packages, +{ lib, fetchFromGitHub, python2Packages, asciidoc, cacert, libxml2, libxslt, docbook_xsl }: python2Packages.buildPythonApplication rec { @@ -34,7 +34,7 @@ python2Packages.buildPythonApplication rec { meta = { description = "Synchronize emails between two repositories, so that you can read the same mailbox from multiple computers"; homepage = "http://offlineimap.org"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ endocrimes ]; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ endocrimes ]; }; } diff --git a/pkgs/tools/networking/ofono/default.nix b/pkgs/tools/networking/ofono/default.nix index 5dafb1e5639..8113f842438 100644 --- a/pkgs/tools/networking/ofono/default.nix +++ b/pkgs/tools/networking/ofono/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchgit , autoreconfHook -, pkgconfig +, pkg-config , glib , dbus , ell @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/tools/networking/olsrd/default.nix b/pkgs/tools/networking/olsrd/default.nix index 3f83081df5d..4fb8892ec02 100644 --- a/pkgs/tools/networking/olsrd/default.nix +++ b/pkgs/tools/networking/olsrd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, bison, flex }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, bison, flex }: stdenv.mkDerivation rec { pname = "olsrd"; @@ -28,9 +28,9 @@ stdenv.mkDerivation rec { meta = { description = "An adhoc wireless mesh routing daemon"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; homepage = "http://olsr.org/"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/tools/networking/openapi-generator-cli/default.nix b/pkgs/tools/networking/openapi-generator-cli/default.nix index a5271bf410f..787067881a2 100644 --- a/pkgs/tools/networking/openapi-generator-cli/default.nix +++ b/pkgs/tools/networking/openapi-generator-cli/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - version = "4.3.1"; + version = "5.0.0"; pname = "openapi-generator-cli"; jarfilename = "${pname}-${version}.jar"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://maven/org/openapitools/${pname}/${version}/${jarfilename}"; - sha256 = "1h9infspwbij9ahb376vc4ijakrqb7xww573ccrqvchxphbcsf7l"; + sha256 = "13kgc84kyrypr0xy4xifrzqcy4qlvcxc7f0jy3n1xkjl3vhav7w3"; }; phases = [ "installPhase" ]; diff --git a/pkgs/tools/networking/openapi-generator-cli/unstable.nix b/pkgs/tools/networking/openapi-generator-cli/unstable.nix index a0af97b2ea9..1384f35a3f2 100644 --- a/pkgs/tools/networking/openapi-generator-cli/unstable.nix +++ b/pkgs/tools/networking/openapi-generator-cli/unstable.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - version = "5.0.0-2020-02-04"; + version = "6.0.0-2021-01-18"; # Also update the fetchurl link pname = "openapi-generator-cli"; jarfilename = "${pname}-${version}.jar"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/5.0.0-SNAPSHOT/openapi-generator-cli-5.0.0-20200204.091421-37.jar"; - sha256 = "0swv976fcr2z8g53avr0r706c31xacb2dlnl8b4c8mzmi49byy7k"; + url = "https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/6.0.0-SNAPSHOT/openapi-generator-cli-6.0.0-20210118.082537-4.jar"; + sha256 = "1ji3yw9dp4srlgqxvb21vrcp2bzj4himxsmp8l8zid9nxsc1m71x"; }; phases = [ "installPhase" ]; diff --git a/pkgs/tools/networking/openconnect/default.nix b/pkgs/tools/networking/openconnect/default.nix index a36330add4d..da4dab4980c 100644 --- a/pkgs/tools/networking/openconnect/default.nix +++ b/pkgs/tools/networking/openconnect/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, openssl ? null, gnutls ? null, gmp, libxml2, stoken, zlib, fetchgit, darwin } : +{ lib, stdenv, fetchurl, pkg-config, openssl ? null, gnutls ? null, gmp, libxml2, stoken, zlib, fetchgit, darwin } : assert (openssl != null) == (gnutls == null); @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { }; outputs = [ "out" "dev" ]; - + configureFlags = [ "--with-vpnc-script=${vpnc}/vpnc-script" "--disable-nls" @@ -28,14 +28,14 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ openssl gnutls gmp libxml2 stoken zlib ] - ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.PCSC; - nativeBuildInputs = [ pkgconfig ]; + ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.PCSC; + nativeBuildInputs = [ pkg-config ]; meta = with lib; { description = "VPN Client for Cisco's AnyConnect SSL VPN"; homepage = "http://www.infradead.org/openconnect/"; license = licenses.lgpl21; maintainers = with maintainers; [ pradeepchhetri tricktron ]; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/tools/networking/openconnect_pa/default.nix b/pkgs/tools/networking/openconnect_pa/default.nix index 3bbc474aa60..0f7a37e8831 100644 --- a/pkgs/tools/networking/openconnect_pa/default.nix +++ b/pkgs/tools/networking/openconnect_pa/default.nix @@ -1,22 +1,22 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, vpnc, openssl ? null, gnutls ? null, gmp, libxml2, stoken, zlib, autoreconfHook } : +{ lib, stdenv, fetchFromGitHub, pkg-config, vpnc, openssl ? null, gnutls ? null, gmp, libxml2, stoken, zlib, autoreconfHook } : assert (openssl != null) == (gnutls == null); stdenv.mkDerivation { version = "unstable-2018-10-08"; pname = "openconnect_pa"; - + outputs = [ "out" "dev" ]; src = fetchFromGitHub { owner = "dlenski"; repo = "openconnect"; rev = "e5fe063a087385c5b157ad7a9a3fa874181f6e3b"; - sha256 = "0ywacqs3nncr2gpjjcz2yc9c6v4ifjssh0vb07h0qff06whqhdax"; + sha256 = "0ywacqs3nncr2gpjjcz2yc9c6v4ifjssh0vb07h0qff06whqhdax"; }; preConfigure = '' - export PKG_CONFIG=${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config + export PKG_CONFIG=${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config export LIBXML2_CFLAGS="-I ${libxml2.dev}/include/libxml2" export LIBXML2_LIBS="-L${libxml2.out}/lib -lxml2" ''; @@ -27,9 +27,9 @@ stdenv.mkDerivation { "--without-openssl-version-check" ]; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; propagatedBuildInputs = [ vpnc openssl gnutls gmp libxml2 stoken zlib ]; - + meta = with lib; { description = "OpenConnect client extended to support Palo Alto Networks' GlobalProtect VPN"; homepage = "https://github.com/dlenski/openconnect/"; diff --git a/pkgs/tools/networking/openfortivpn/default.nix b/pkgs/tools/networking/openfortivpn/default.nix index 56ae2590576..6b132fd4b0b 100644 --- a/pkgs/tools/networking/openfortivpn/default.nix +++ b/pkgs/tools/networking/openfortivpn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig +{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkg-config , openssl, ppp , systemd ? null }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { --replace '$(DESTDIR)$(confdir)' /tmp ''; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ openssl ppp diff --git a/pkgs/tools/networking/openresolv/default.nix b/pkgs/tools/networking/openresolv/default.nix index 58985f73f30..bc7db4fc6f3 100644 --- a/pkgs/tools/networking/openresolv/default.nix +++ b/pkgs/tools/networking/openresolv/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, makeWrapper, coreutils }: +{ lib, stdenv, fetchurl, makeWrapper, coreutils }: stdenv.mkDerivation rec { pname = "openresolv"; - version = "3.11.0"; + version = "3.12.0"; src = fetchurl { url = "mirror://roy/openresolv/${pname}-${version}.tar.xz"; - sha256 = "0g7wb2880hbr0x99n73m7fgjm7lcdbpxfy2i620zxcq73qfrvspa"; + sha256 = "sha256-QrMFCOhXoihTXGMeqsk2hi2G7KaMFLXAvzh7oXa5G5c="; }; buildInputs = [ makeWrapper ]; @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { meta = { description = "A program to manage /etc/resolv.conf"; homepage = "https://roy.marples.name/projects/openresolv"; - license = stdenv.lib.licenses.bsd2; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.eelco ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index ef98f482140..17a227c496a 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -1,11 +1,11 @@ -{ stdenv +{ lib, stdenv , pkgs , fetchurl , fetchpatch , zlib , openssl , libedit -, pkgconfig +, pkg-config , pam , autoreconfHook , etcDir ? null @@ -30,7 +30,7 @@ let }; in -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "openssh"; inherit version; @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { substituteInPlace Makefile.in --replace '$(INSTALL) -m 4711' '$(INSTALL) -m 0711' ''; - nativeBuildInputs = [ pkgconfig ] + nativeBuildInputs = [ pkg-config ] ++ optional (hpnSupport || withGssapiPatches) autoreconfHook ++ optional withKerberos pkgs.kerberos.dev; buildInputs = [ zlib openssl libedit pam ] @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { # Upstream build system does not support static build, so we fall back # on fragile patching of configure script. # - # libedit is found by pkgconfig, but without --static flag, required + # libedit is found by pkg-config, but without --static flag, required # to get also transitive dependencies for static linkage, hence sed # expression. # @@ -134,7 +134,7 @@ stdenv.mkDerivation rec { description = "An implementation of the SSH protocol"; homepage = "https://www.openssh.com/"; changelog = "https://www.openssh.com/releasenotes.html"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; platforms = platforms.unix ++ platforms.windows; maintainers = with maintainers; [ eelco aneeshusa ]; }; diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index 09495ded954..3337a5bbb7d 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -17,7 +17,7 @@ assert useSystemd -> (systemd != null); assert pkcs11Support -> (pkcs11helper != null); -with stdenv.lib; +with lib; let # Check if the script needs to have other binaries wrapped when changing this. update-resolved = fetchurl { diff --git a/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix b/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix index f50d17eaf7d..16e97bab214 100644 --- a/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix +++ b/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, makeWrapper, coreutils, gawk, util-linux }: +{ lib, stdenv, fetchgit, makeWrapper, coreutils, gawk, util-linux }: stdenv.mkDerivation { name = "openvpn-learnaddress-19b03c3"; @@ -15,13 +15,13 @@ stdenv.mkDerivation { install -Dm555 ovpn-learnaddress $out/libexec/openvpn/openvpn-learnaddress wrapProgram $out/libexec/openvpn/openvpn-learnaddress \ - --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gawk util-linux ]} + --prefix PATH : ${lib.makeBinPath [ coreutils gawk util-linux ]} ''; meta = { description = "Openvpn learn-address script to manage a hosts-like file"; homepage = "https://gist.github.com/offlinehacker/4058733/"; - maintainers = [ stdenv.lib.maintainers.offline ]; - platforms = stdenv.lib.platforms.unix; + maintainers = [ lib.maintainers.offline ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/p2p/amule/default.nix b/pkgs/tools/networking/p2p/amule/default.nix index 6ecc9f7ba12..4ab93b7574a 100644 --- a/pkgs/tools/networking/p2p/amule/default.nix +++ b/pkgs/tools/networking/p2p/amule/default.nix @@ -3,7 +3,7 @@ , httpServer ? false # build web interface for the daemon , client ? false # build amule remote gui , fetchFromGitHub, fetchpatch, stdenv, lib, zlib, wxGTK, perl, cryptopp, libupnp, gettext, libpng ? null -, autoreconfHook, pkgconfig, makeWrapper, libX11 ? null }: +, autoreconfHook, pkg-config, makeWrapper, libX11 ? null }: assert httpServer -> libpng != null; assert client -> libX11 != null; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { popd >/dev/null ''; - nativeBuildInputs = [ autoreconfHook gettext makeWrapper pkgconfig ]; + nativeBuildInputs = [ autoreconfHook gettext makeWrapper pkg-config ]; buildInputs = [ zlib wxGTK perl cryptopp libupnp diff --git a/pkgs/tools/networking/p2p/azureus/default.nix b/pkgs/tools/networking/p2p/azureus/default.nix index 03737f9af27..6453b2fbb16 100644 --- a/pkgs/tools/networking/p2p/azureus/default.nix +++ b/pkgs/tools/networking/p2p/azureus/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, jdk, swt}: +{lib, stdenv, fetchurl, jdk, swt}: stdenv.mkDerivation { name = "azureus-2.3.0.6"; @@ -11,6 +11,6 @@ stdenv.mkDerivation { inherit jdk swt; meta = { - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix index 06b247b28bf..0c0bc370526 100644 --- a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix +++ b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , fetchpatch , bison -, pkgconfig +, pkg-config , gettext , desktop-file-utils , glib @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { bison desktop-file-utils gettext - pkgconfig + pkg-config ]; buildInputs = [ glib @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { zlib ] ++ - stdenv.lib.optionals (enableGui) [ gtk2 ] + lib.optionals (enableGui) [ gtk2 ] ; configureScript = "./build.sh"; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { # See https://sourceforge.net/p/gtk-gnutella/bugs/555/ "--disable-malloc" ] - ++ stdenv.lib.optionals (!enableGui) [ "--topless" ] + ++ lib.optionals (!enableGui) [ "--topless" ] ; hardeningDisable = [ "bindnow" "fortify" "pic" "relro" ]; diff --git a/pkgs/tools/networking/p2p/libtorrent/default.nix b/pkgs/tools/networking/p2p/libtorrent/default.nix index cbb1ae03113..4d3ccf5fc15 100644 --- a/pkgs/tools/networking/p2p/libtorrent/default.nix +++ b/pkgs/tools/networking/p2p/libtorrent/default.nix @@ -1,6 +1,6 @@ # NOTE: this is rakshava's version of libtorrent, used mainly by rtorrent # This is NOT libtorrent-rasterbar, used by Deluge, qbitttorent, and others -{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook , cppunit, openssl, libsigcxx, zlib }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "1h5y6ab3gs20yyprdfwcw8fh1c6czs4yrdj0kf54d2vp9qwz685r"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ cppunit openssl libsigcxx zlib ]; meta = with lib; { diff --git a/pkgs/tools/networking/p2p/rtorrent/default.nix b/pkgs/tools/networking/p2p/rtorrent/default.nix index f9ad9773d4d..20f9cec6f5f 100644 --- a/pkgs/tools/networking/p2p/rtorrent/default.nix +++ b/pkgs/tools/networking/p2p/rtorrent/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, pkgconfig +{ lib, stdenv, fetchurl, fetchFromGitHub, pkg-config , libtool, autoconf, automake, cppunit , libtorrent, ncurses, libsigcxx, curl , zlib, openssl, xmlrpc_c @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "0hcaf1brk402caa7hhlb2r1c93mjzxkm8gb19xfl33gkp3jpf372"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libtool autoconf automake cppunit libtorrent ncurses libsigcxx curl zlib openssl xmlrpc_c @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { # Optional patch adds support for custom configurable colors # https://github.com/Chlorm/chlorm_overlay/blob/master/net-p2p/rtorrent/README.md - patches = stdenv.lib.optional colorSupport (fetchurl { + patches = lib.optional colorSupport (fetchurl { url = "https://gist.githubusercontent.com/codyopel/a816c2993f8013b5f4d6/raw/b952b32da1dcf14c61820dfcf7df00bc8918fec4/rtorrent-color.patch"; sha256 = "00gcl7yq6261rrfzpz2k8bd7mffwya0ifji1xqcvhfw50syk8965"; }); diff --git a/pkgs/tools/networking/packetdrill/default.nix b/pkgs/tools/networking/packetdrill/default.nix index 2b1467cd348..861e9c0383b 100644 --- a/pkgs/tools/networking/packetdrill/default.nix +++ b/pkgs/tools/networking/packetdrill/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, bison, flex, cmake, libpcap }: +{ lib, stdenv, fetchFromGitHub, bison, flex, cmake, libpcap }: stdenv.mkDerivation rec { pname = "packetdrill"; version = "unstable-2020-08-22"; @@ -34,8 +34,8 @@ stdenv.mkDerivation rec { meta = { description = "Quick, precise tests for entire TCP/UDP/IPv4/IPv6 network stacks"; homepage = "https://github.com/google/packetdrill"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ dmjio cleverca22 ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ dmjio cleverca22 ]; }; } diff --git a/pkgs/tools/networking/pdsh/default.nix b/pkgs/tools/networking/pdsh/default.nix index 3f00964bfd3..87601b0ddf3 100644 --- a/pkgs/tools/networking/pdsh/default.nix +++ b/pkgs/tools/networking/pdsh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, readline, rsh, ssh, slurm, slurmSupport ? false }: +{ lib, stdenv, fetchurl, perl, readline, rsh, ssh, slurm, slurmSupport ? false }: stdenv.mkDerivation rec { name = "pdsh-2.34"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ perl readline ssh ] - ++ (stdenv.lib.optional slurmSupport slurm); + ++ (lib.optional slurmSupport slurm); preConfigure = '' configureFlagsArray=( @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/chaos/pdsh"; description = "High-performance, parallel remote shell utility"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; longDescription = '' Pdsh is a high-performance, parallel remote shell utility. It has @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { while timeouts occur on some connections. ''; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.peti ]; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.peti ]; }; } diff --git a/pkgs/tools/networking/persepolis/default.nix b/pkgs/tools/networking/persepolis/default.nix index fd36680c992..5e4f0542d36 100644 --- a/pkgs/tools/networking/persepolis/default.nix +++ b/pkgs/tools/networking/persepolis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonApplication, fetchFromGitHub, makeWrapper +{ lib, buildPythonApplication, fetchFromGitHub, makeWrapper , aria , libnotify , pulseaudio @@ -47,7 +47,7 @@ buildPythonApplication rec { # feed args to wrapPythonApp makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [aria libnotify ]}" - ''''${qtWrapperArgs[@]}'' + "\${qtWrapperArgs[@]}" ]; propagatedBuildInputs = [ diff --git a/pkgs/tools/networking/phodav/default.nix b/pkgs/tools/networking/phodav/default.nix index a7405abacb4..dfaad9c1e97 100644 --- a/pkgs/tools/networking/phodav/default.nix +++ b/pkgs/tools/networking/phodav/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl -, pkgconfig, libsoup, meson, ninja }: +, pkg-config, libsoup, meson, ninja }: let version = "2.5"; @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { "-Dudev=disabled" ]; - nativeBuildInputs = [ libsoup pkgconfig meson ninja ]; + nativeBuildInputs = [ libsoup pkg-config meson ninja ]; outputs = [ "out" "dev" "lib" ]; diff --git a/pkgs/tools/networking/photon/default.nix b/pkgs/tools/networking/photon/default.nix index 55dedc09bea..d3f153e44ae 100644 --- a/pkgs/tools/networking/photon/default.nix +++ b/pkgs/tools/networking/photon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub }: python3Packages.buildPythonApplication rec { pname = "photon"; diff --git a/pkgs/tools/networking/pirate-get/default.nix b/pkgs/tools/networking/pirate-get/default.nix index 76b77da1764..dc9133229af 100644 --- a/pkgs/tools/networking/pirate-get/default.nix +++ b/pkgs/tools/networking/pirate-get/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages }: +{ lib, python3Packages }: with python3Packages; diff --git a/pkgs/tools/networking/pixiecore/default.nix b/pkgs/tools/networking/pixiecore/default.nix index d0e76832ea9..6155d411e13 100644 --- a/pkgs/tools/networking/pixiecore/default.nix +++ b/pkgs/tools/networking/pixiecore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "pixiecore"; @@ -21,8 +21,8 @@ buildGoModule rec { meta = { description = "A tool to manage network booting of machines"; homepage = "https://github.com/danderson/netboot/tree/master/pixiecore"; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ bbigras danderson ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ bbigras danderson ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/pixiewps/default.nix b/pkgs/tools/networking/pixiewps/default.nix index 98a780a1704..ad9bfcfb1d1 100644 --- a/pkgs/tools/networking/pixiewps/default.nix +++ b/pkgs/tools/networking/pixiewps/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "pixiewps"; @@ -15,12 +15,12 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace "\$(DESTDIR)/usr" "$out" substituteInPlace Makefile --replace "/local" "" ''; - + meta = { description = "An offline WPS bruteforce utility"; homepage = "https://github.com/wiire/pixiewps"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.nico202 ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.nico202 ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/pmacct/default.nix b/pkgs/tools/networking/pmacct/default.nix index 12c6eeaf470..9cb8c0b88f7 100644 --- a/pkgs/tools/networking/pmacct/default.nix +++ b/pkgs/tools/networking/pmacct/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchFromGitHub -, pkgconfig +, pkg-config , autoreconfHook , libtool , libpcap @@ -19,7 +19,7 @@ assert withSQLite -> sqlite != null; assert withPgSQL -> postgresql != null; assert withMysql -> libmysqlclient != null; -let inherit (stdenv.lib) getDev optional optionalString; in +let inherit (lib) getDev optional optionalString; in stdenv.mkDerivation rec { version = "1.7.5"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { sha256 = "17p5isrq5w58hvmzhc6akbd37ins3c95g0rvhhdm0v33khzxmran"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig libtool ]; + nativeBuildInputs = [ autoreconfHook pkg-config libtool ]; buildInputs = [ libpcap ] ++ optional withJansson jansson ++ optional withNflog libnetfilter_log diff --git a/pkgs/tools/networking/polysh/default.nix b/pkgs/tools/networking/polysh/default.nix index 68cb8fed57a..69e5d0427e5 100644 --- a/pkgs/tools/networking/polysh/default.nix +++ b/pkgs/tools/networking/polysh/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python2Packages }: +{ lib, fetchurl, python2Packages }: let inherit (python2Packages) buildPythonApplication; diff --git a/pkgs/tools/networking/privoxy/default.nix b/pkgs/tools/networking/privoxy/default.nix index 2963f2aff52..0b5a0d96ae5 100644 --- a/pkgs/tools/networking/privoxy/default.nix +++ b/pkgs/tools/networking/privoxy/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "privoxy"; - version = "3.0.29"; + version = "3.0.30"; src = fetchurl { url = "mirror://sourceforge/ijbswa/Sources/${version}%20%28stable%29/${pname}-${version}-stable-src.tar.gz"; - sha256 = "17a8fbdyb0ixc0wwq68fg7xn7l6n7jq67njpq93psmxgzng0dii5"; + sha256 = "sha256-pP4kHF2nAQsoS/ienp4xoyHx8+scx5ZVnT+6ublBXuE="; }; hardeningEnable = [ "pie" ]; diff --git a/pkgs/tools/networking/proxify/default.nix b/pkgs/tools/networking/proxify/default.nix index 7f45d53d41d..6a0bfcc6ee2 100644 --- a/pkgs/tools/networking/proxify/default.nix +++ b/pkgs/tools/networking/proxify/default.nix @@ -1,6 +1,6 @@ { buildGoModule , fetchFromGitHub -, lib, stdenv +, lib }: buildGoModule rec { diff --git a/pkgs/tools/networking/proxychains/default.nix b/pkgs/tools/networking/proxychains/default.nix index 6ace8e139e1..8eb20538ea9 100644 --- a/pkgs/tools/networking/proxychains/default.nix +++ b/pkgs/tools/networking/proxychains/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub } : +{ lib, stdenv, fetchFromGitHub } : stdenv.mkDerivation rec { pname = "proxychains"; version = "4.2.0"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "Proxifier for SOCKS proxies"; homepage = "http://proxychains.sourceforge.net"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/pssh/default.nix b/pkgs/tools/networking/pssh/default.nix index b2b08cea844..a17701644c8 100644 --- a/pkgs/tools/networking/pssh/default.nix +++ b/pkgs/tools/networking/pssh/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pythonPackages, openssh, rsync }: +{ lib, fetchFromGitHub, pythonPackages, openssh, rsync }: pythonPackages.buildPythonApplication rec { pname = "pssh"; diff --git a/pkgs/tools/networking/pwnat/default.nix b/pkgs/tools/networking/pwnat/default.nix index b710b6601d1..780477af2fc 100644 --- a/pkgs/tools/networking/pwnat/default.nix +++ b/pkgs/tools/networking/pwnat/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://samy.pl/pwnat/"; description = "ICMP NAT to NAT client-server communication"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; maintainers = with maintainers; [viric]; platforms = with platforms; linux; }; diff --git a/pkgs/tools/networking/pykms/default.nix b/pkgs/tools/networking/pykms/default.nix index f7ddd2ef3f9..0d001e7aeef 100644 --- a/pkgs/tools/networking/pykms/default.nix +++ b/pkgs/tools/networking/pykms/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, runtimeShell, fetchFromGitHub, python3, writeText, writeScript +{ lib, runtimeShell, fetchFromGitHub, python3, writeText, writeScript , coreutils, sqlite }: with python3.pkgs; @@ -17,7 +17,7 @@ let ); ''; - dbScript = writeScript "create_pykms_db.sh" (with stdenv.lib; '' + dbScript = writeScript "create_pykms_db.sh" (with lib; '' #!${runtimeShell} set -eEuo pipefail diff --git a/pkgs/tools/networking/radvd/default.nix b/pkgs/tools/networking/radvd/default.nix index 116b1de83ec..ddd196ebe56 100644 --- a/pkgs/tools/networking/radvd/default.nix +++ b/pkgs/tools/networking/radvd/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv, fetchurl, pkgconfig, libdaemon, bison, flex, check }: +{ lib, stdenv, fetchurl, pkg-config, libdaemon, bison, flex, check }: stdenv.mkDerivation rec { pname = "radvd"; - version = "2.18"; + version = "2.19"; src = fetchurl { url = "http://www.litech.org/radvd/dist/${pname}-${version}.tar.xz"; - sha256 = "1p2wlv3djvla0r84hdncc3wfa530xigs7z9ssc2v5r1pcpzgxgz1"; + sha256 = "0h722f17h7cra1sjgrxhrrvx54mm47fs039909yhbabigxch8kjn"; }; - nativeBuildInputs = [ pkgconfig bison flex check ]; + nativeBuildInputs = [ pkg-config bison flex check ]; buildInputs = [ libdaemon ]; meta = with lib; { diff --git a/pkgs/tools/networking/redir/default.nix b/pkgs/tools/networking/redir/default.nix index 7f69dacedf3..af2dfe8040a 100644 --- a/pkgs/tools/networking/redir/default.nix +++ b/pkgs/tools/networking/redir/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "redir"; @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { meta = { description = "A TCP port redirector for UNIX"; homepage = "https://github.com/troglobit/redir"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/redsocks/default.nix b/pkgs/tools/networking/redsocks/default.nix index d389221eabb..b609cce90bc 100644 --- a/pkgs/tools/networking/redsocks/default.nix +++ b/pkgs/tools/networking/redsocks/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libevent }: +{ lib, stdenv, fetchFromGitHub, libevent }: let pkg = "redsocks"; @@ -26,8 +26,8 @@ stdenv.mkDerivation { meta = { description = "Transparent redirector of any TCP connection to proxy"; homepage = "http://darkk.net.ru/redsocks/"; - license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.ekleog ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.ekleog ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/s3cmd/default.nix b/pkgs/tools/networking/s3cmd/default.nix index 06f51b0c506..15f6ff3dfa0 100644 --- a/pkgs/tools/networking/s3cmd/default.nix +++ b/pkgs/tools/networking/s3cmd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, fetchFromGitHub, python_magic, dateutil }: +{ lib, buildPythonApplication, fetchFromGitHub, python_magic, dateutil }: buildPythonApplication rec { pname = "s3cmd"; diff --git a/pkgs/tools/networking/s3gof3r/default.nix b/pkgs/tools/networking/s3gof3r/default.nix index 0930be914cf..4623b68ad4c 100644 --- a/pkgs/tools/networking/s3gof3r/default.nix +++ b/pkgs/tools/networking/s3gof3r/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "s3gof3r"; - version = "20151109-${stdenv.lib.strings.substring 0 7 rev}"; + version = "20151109-${lib.strings.substring 0 7 rev}"; rev = "31603a0dc94aefb822bfe2ceea75a6be6013b445"; goPackagePath = "github.com/rlmcpherson/s3gof3r"; diff --git a/pkgs/tools/networking/s4cmd/default.nix b/pkgs/tools/networking/s4cmd/default.nix index 80874649072..95dc02cb5cd 100644 --- a/pkgs/tools/networking/s4cmd/default.nix +++ b/pkgs/tools/networking/s4cmd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages }: +{ lib, python3Packages }: python3Packages.buildPythonApplication rec { pname = "s4cmd"; diff --git a/pkgs/tools/networking/s6-dns/default.nix b/pkgs/tools/networking/s6-dns/default.nix index 739fdc2e2fc..5036b1a87ea 100644 --- a/pkgs/tools/networking/s6-dns/default.nix +++ b/pkgs/tools/networking/s6-dns/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "s6-dns"; - version = "2.3.2.0"; - sha256 = "09hyb1xv9glqq0yy7wy8hiwvlr78kwv552pags8ancgamag15di7"; + version = "2.3.5.0"; + sha256 = "0h5p5dbkkdadahrp4pqhc3x9ds758i6djy49k5zrn7mm5k4722wz"; description = "A suite of DNS client programs and libraries for Unix systems"; diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/tools/networking/s6-networking/default.nix index f8c479d5ce2..e7dd075df13 100644 --- a/pkgs/tools/networking/s6-networking/default.nix +++ b/pkgs/tools/networking/s6-networking/default.nix @@ -1,4 +1,4 @@ -{ stdenv, skawarePackages +{ lib, stdenv, skawarePackages # Whether to build the TLS/SSL tools and what library to use # acceptable values: "libressl", false @@ -8,7 +8,6 @@ with skawarePackages; let - inherit (stdenv) lib; sslSupportEnabled = sslSupport != false; sslLibs = { libressl = libressl; @@ -20,8 +19,8 @@ assert sslSupportEnabled -> sslLibs ? ${sslSupport}; buildPackage { pname = "s6-networking"; - version = "2.3.1.2"; - sha256 = "1029bgwfmv903y5ji93j75m7p2jgchdxya1khxzb42q2z7yxnlyr"; + version = "2.4.0.0"; + sha256 = "1yqykwfl5jnkxgr6skfj5kzd896pknij0hi5m7lj0r18jpfs5zgq"; description = "A suite of small networking utilities for Unix systems"; @@ -59,7 +58,7 @@ buildPackage { # remove all s6 executables from build directory rm $(find -name "s6-*" -type f -mindepth 1 -maxdepth 1 -executable) rm minidentd - rm libs6net.* libstls.* + rm libs6net.* libstls.* libs6tls.* mv doc $doc/share/doc/s6-networking/html ''; diff --git a/pkgs/tools/networking/saldl/default.nix b/pkgs/tools/networking/saldl/default.nix index b697f4c3b3d..e772a74f099 100644 --- a/pkgs/tools/networking/saldl/default.nix +++ b/pkgs/tools/networking/saldl/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchFromGitHub -, pkgconfig +, pkg-config , wafHook , python3 , asciidoc @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config wafHook python3 asciidoc diff --git a/pkgs/tools/networking/samplicator/default.nix b/pkgs/tools/networking/samplicator/default.nix index 0cc446edd9c..44546465d9e 100644 --- a/pkgs/tools/networking/samplicator/default.nix +++ b/pkgs/tools/networking/samplicator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "samplicator"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Send copies of (UDP) datagrams to multiple receivers"; homepage = "https://github.com/sleinen/samplicator/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/shadowfox/default.nix b/pkgs/tools/networking/shadowfox/default.nix index c7507925f5f..e6b1c823eb8 100644 --- a/pkgs/tools/networking/shadowfox/default.nix +++ b/pkgs/tools/networking/shadowfox/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "shadowfox"; diff --git a/pkgs/tools/networking/shadowsocks-rust/default.nix b/pkgs/tools/networking/shadowsocks-rust/default.nix index 4f927a684c0..06d081b745c 100644 --- a/pkgs/tools/networking/shadowsocks-rust/default.nix +++ b/pkgs/tools/networking/shadowsocks-rust/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, libsodium, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, libsodium, Security }: rustPlatform.buildRustPackage rec { pname = "shadowsocks-rust"; @@ -16,8 +16,8 @@ rustPlatform.buildRustPackage rec { SODIUM_USE_PKG_CONFIG = 1; buildInputs = [ openssl libsodium ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; - nativeBuildInputs = [ pkgconfig ]; + ++ lib.optionals stdenv.isDarwin [ Security ]; + nativeBuildInputs = [ pkg-config ]; meta = with lib; { homepage = "https://github.com/shadowsocks/shadowsocks-rust"; diff --git a/pkgs/tools/networking/shorewall/default.nix b/pkgs/tools/networking/shorewall/default.nix index c56f0eac7ff..2456a760721 100644 --- a/pkgs/tools/networking/shorewall/default.nix +++ b/pkgs/tools/networking/shorewall/default.nix @@ -8,12 +8,12 @@ , iptables , perl , perlPackages -, stdenv +, lib, stdenv , tree , util-linux }: let - PATH = stdenv.lib.concatStringsSep ":" + PATH = lib.concatStringsSep ":" [ "${coreutils}/bin" "${iproute}/bin" "${iptables}/bin" @@ -124,7 +124,7 @@ stdenv.mkDerivation rec { not use Netfilter's ipchains compatibility mode and can thus take advantage of Netfilter's connection state tracking capabilities. ''; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/siege/default.nix b/pkgs/tools/networking/siege/default.nix index 125b66b36a5..92e46b451b8 100644 --- a/pkgs/tools/networking/siege/default.nix +++ b/pkgs/tools/networking/siege/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1y3dnl1ziw0c0d4nw30aj0sdmjvarn4xfxgfkswffwnkm8z5p9xz"; }; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; + NIX_LDFLAGS = lib.optionalString stdenv.isLinux "-lgcc_s"; buildInputs = [ openssl zlib ]; diff --git a/pkgs/tools/networking/sipsak/default.nix b/pkgs/tools/networking/sipsak/default.nix index 320a856437b..55620497286 100644 --- a/pkgs/tools/networking/sipsak/default.nix +++ b/pkgs/tools/networking/sipsak/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/sipwise/sipsak"; description = "SIP Swiss army knife"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; maintainers = with maintainers; [ sheenobu ]; platforms = with platforms; unix; }; diff --git a/pkgs/tools/networking/smokeping/default.nix b/pkgs/tools/networking/smokeping/default.nix index 80f8b49a0cc..6d0d5227111 100644 --- a/pkgs/tools/networking/smokeping/default.nix +++ b/pkgs/tools/networking/smokeping/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fping, rrdtool, perlPackages }: +{ lib, stdenv, fetchurl, fping, rrdtool, perlPackages }: stdenv.mkDerivation rec { pname = "smokeping"; @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { meta = { description = "Network latency collector"; homepage = "http://oss.oetiker.ch/smokeping"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.erictapen ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.erictapen ]; }; } diff --git a/pkgs/tools/networking/snabb/default.nix b/pkgs/tools/networking/snabb/default.nix index 52ad14c1d11..f65f97ed91d 100644 --- a/pkgs/tools/networking/snabb/default.nix +++ b/pkgs/tools/networking/snabb/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, bash, makeWrapper, git, mysql, diffutils, which, coreutils, procps, nettools +{ lib, stdenv, fetchFromGitHub, bash, makeWrapper, git, mysql, diffutils, which, coreutils, procps, nettools ,supportOpenstack ? true }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "snabb"; diff --git a/pkgs/tools/networking/sniffglue/default.nix b/pkgs/tools/networking/sniffglue/default.nix index ec57e851f4b..452718ebc9c 100644 --- a/pkgs/tools/networking/sniffglue/default.nix +++ b/pkgs/tools/networking/sniffglue/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rustPlatform, libpcap, libseccomp, pkgconfig }: +{ lib, fetchFromGitHub, rustPlatform, libpcap, libseccomp, pkg-config }: rustPlatform.buildRustPackage rec { pname = "sniffglue"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "01ya9535whi2kviw57f25n8h05ckpb4bq1h7qav6srai97rm937s"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libpcap libseccomp ]; diff --git a/pkgs/tools/networking/socat/2.x.nix b/pkgs/tools/networking/socat/2.x.nix index 0f36b83e165..0105fa322c1 100644 --- a/pkgs/tools/networking/socat/2.x.nix +++ b/pkgs/tools/networking/socat/2.x.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl ]; - patches = stdenv.lib.singleton ./libressl-fixes.patch ; + patches = lib.singleton ./libressl-fixes.patch ; meta = with lib; { description = "A utility for bidirectional data transfer between two independent data channels"; diff --git a/pkgs/tools/networking/socat/default.nix b/pkgs/tools/networking/socat/default.nix index c50b2236c9e..7a24ccf33b7 100644 --- a/pkgs/tools/networking/socat/default.nix +++ b/pkgs/tools/networking/socat/default.nix @@ -1,11 +1,19 @@ -{ stdenv, fetchurl, openssl, readline, which, nettools }: +{ lib +, fetchurl +, nettools +, openssl +, readline +, stdenv +, which +}: stdenv.mkDerivation rec { - name = "socat-1.7.3.4"; + pname = "socat"; + version = "1.7.4.1"; src = fetchurl { - url = "http://www.dest-unreach.org/socat/download/${name}.tar.bz2"; - sha256 = "1z7xgnwiqpcv1j6aghhj9nqbx7cg3gpc4n9j7vi9hm7nhv5788wp"; + url = "http://www.dest-unreach.org/socat/download/${pname}-${version}.tar.bz2"; + sha256 = "1sbmqqvni3ss9wyay6ik5v81kxffkra80mh4ypgj74g82iba5b1z"; }; postPatch = '' @@ -22,12 +30,12 @@ stdenv.mkDerivation rec { checkInputs = [ which nettools ]; doCheck = false; # fails a bunch, hangs - meta = { - description = "A utility for bidirectional data transfer between two independent data channels"; + meta = with lib; { + description = "Utility for bidirectional data transfer between two independent data channels"; homepage = "http://www.dest-unreach.org/socat/"; repositories.git = "git://repo.or.cz/socat.git"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = platforms.unix; + license = with licenses; [ gpl2Only ]; + maintainers = with maintainers; [ eelco ]; }; } diff --git a/pkgs/tools/networking/spiped/default.nix b/pkgs/tools/networking/spiped/default.nix index 9cc3370c0a1..67ee51d6610 100644 --- a/pkgs/tools/networking/spiped/default.nix +++ b/pkgs/tools/networking/spiped/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, coreutils }: +{ lib, stdenv, fetchurl, openssl, coreutils }: stdenv.mkDerivation rec { pname = "spiped"; @@ -34,8 +34,8 @@ stdenv.mkDerivation rec { meta = { description = "Utility for secure encrypted channels between sockets"; homepage = "https://www.tarsnap.com/spiped.html"; - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = lib.licenses.bsd2; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.thoughtpolice ]; }; } diff --git a/pkgs/tools/networking/spoofer/default.nix b/pkgs/tools/networking/spoofer/default.nix index b0aefa9ef11..a983ef9c42c 100644 --- a/pkgs/tools/networking/spoofer/default.nix +++ b/pkgs/tools/networking/spoofer/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, fetchurl, pkgconfig, protobuf, openssl, libpcap, traceroute +{ lib, stdenv, fetchurl, pkg-config, protobuf, openssl, libpcap, traceroute , withGUI ? false, qt5 }: -let inherit (stdenv.lib) optional; +let inherit (lib) optional; in stdenv.mkDerivation rec { @@ -13,10 +13,12 @@ stdenv.mkDerivation rec { sha256 = "0pnim3xyfsmv6alsvhwjs4v9lp39wwiyj63rxsqyz4wx4vkmn12z"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl protobuf libpcap traceroute ] ++ optional withGUI qt5.qtbase ; + dontWrapQtApps = true; + meta = with lib; { homepage = "https://www.caida.org/projects/spoofer"; description = "Assess and report on deployment of source address validation"; @@ -34,6 +36,6 @@ stdenv.mkDerivation rec { ''; platforms = platforms.all; license = licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ leenaars]; + maintainers = with lib.maintainers; [ leenaars]; }; } diff --git a/pkgs/tools/networking/srelay/default.nix b/pkgs/tools/networking/srelay/default.nix index 1e7486dd305..9ff25d6a17c 100644 --- a/pkgs/tools/networking/srelay/default.nix +++ b/pkgs/tools/networking/srelay/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "srelay-0.4.8"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { description = "A SOCKS proxy and relay"; homepage = "http://socks-relay.sourceforge.net/"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.bsd3; + platforms = lib.platforms.unix; + license = lib.licenses.bsd3; }; } diff --git a/pkgs/tools/networking/ssh-ident/default.nix b/pkgs/tools/networking/ssh-ident/default.nix index 33211fb0723..1822eda2627 100644 --- a/pkgs/tools/networking/ssh-ident/default.nix +++ b/pkgs/tools/networking/ssh-ident/default.nix @@ -1,6 +1,6 @@ -{ stdenv, lib, fetchFromGitHub, python3, makeWrapper, openssh }: +{ stdenvNoCC, lib, fetchFromGitHub, python3, openssh}: -stdenv.mkDerivation { +stdenvNoCC.mkDerivation { pname = "ssh-ident"; version = "2016-04-21"; src = fetchFromGitHub { @@ -10,19 +10,22 @@ stdenv.mkDerivation { sha256 = "1jf19lz1gwn7cyp57j8d4zs5bq13iw3kw31m8nvr8h6sib2pf815"; }; - buildInputs = [ python3 makeWrapper ]; + postPatch = '' + substituteInPlace ssh-ident \ + --replace 'ssh-agent >' '${openssh}/bin/ssh-agent >' + ''; + buildInputs = [ python3 ]; + installPhase = '' mkdir -p $out/bin install -m 755 ssh-ident $out/bin/ssh-ident - wrapProgram $out/bin/ssh-ident \ - --prefix PATH : ${lib.makeBinPath [ openssh ]} ''; - meta = { + meta = with lib; { homepage = "https://github.com/ccontavalli/ssh-ident"; description = "Start and use ssh-agent and load identities as necessary"; - license = stdenv.lib.licenses.bsd2; - maintainers = with stdenv.lib.maintainers; [ telotortium ]; - platforms = with stdenv.lib.platforms; unix; + license = licenses.bsd2; + maintainers = with maintainers; [ telotortium ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/tools/networking/sshoogr/default.nix b/pkgs/tools/networking/sshoogr/default.nix index 9539c15f5ed..f3c9c1a31fb 100644 --- a/pkgs/tools/networking/sshoogr/default.nix +++ b/pkgs/tools/networking/sshoogr/default.nix @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { ''; longDescription = '' The sshoogr (pronounced [ʃʊgə]) is a Groovy-based DSL library for working - with remote servers through SSH. The DSL allows: connecting, executing - remote commands, copying files and directories, creating tunnels in a + with remote servers through SSH. The DSL allows: connecting, executing + remote commands, copying files and directories, creating tunnels in a simple and concise way. ''; homepage = "https://github.com/aestasit/sshoogr"; @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; maintainers = with maintainers; [ moaxcp ]; }; -} +} diff --git a/pkgs/tools/networking/ssldump/default.nix b/pkgs/tools/networking/ssldump/default.nix index d7578c4adda..fc92f43981b 100644 --- a/pkgs/tools/networking/ssldump/default.nix +++ b/pkgs/tools/networking/ssldump/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, openssl, libpcap }: +{ lib, stdenv, fetchFromGitHub, openssl, libpcap }: stdenv.mkDerivation { pname = "ssldump"; @@ -24,7 +24,7 @@ stdenv.mkDerivation { description = "An SSLv3/TLS network protocol analyzer"; homepage = "http://ssldump.sourceforge.net"; license = "BSD-style"; - maintainers = with stdenv.lib.maintainers; [ aycanirican ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with lib.maintainers; [ aycanirican ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/ssmtp/default.nix b/pkgs/tools/networking/ssmtp/default.nix index 0e624631d47..6957d43e791 100644 --- a/pkgs/tools/networking/ssmtp/default.nix +++ b/pkgs/tools/networking/ssmtp/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { configureFlags = [ "--sysconfdir=/etc" - (stdenv.lib.enableFeature tlsSupport "ssl") + (lib.enableFeature tlsSupport "ssl") ]; postConfigure = @@ -34,9 +34,9 @@ stdenv.mkDerivation { installTargets = [ "install" "install-sendmail" ]; - buildInputs = stdenv.lib.optional tlsSupport openssl; + buildInputs = lib.optional tlsSupport openssl; - NIX_LDFLAGS = stdenv.lib.optionalString tlsSupport "-lcrypto"; + NIX_LDFLAGS = lib.optionalString tlsSupport "-lcrypto"; meta = with lib; { platforms = platforms.linux; diff --git a/pkgs/tools/networking/sstp/default.nix b/pkgs/tools/networking/sstp/default.nix index 22ef9102ef8..97e35949b15 100644 --- a/pkgs/tools/networking/sstp/default.nix +++ b/pkgs/tools/networking/sstp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, ppp, libevent, openssl }: +{ lib, stdenv, fetchurl, pkg-config, ppp, libevent, openssl }: stdenv.mkDerivation rec { pname = "sstp-client"; @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { "--with-pppd-plugin-dir=$(out)/lib/pppd" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libevent openssl ppp ]; meta = { description = "SSTP client for Linux"; homepage = "http://sstp-client.sourceforge.net/"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.ktosiek ]; - license = stdenv.lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.ktosiek ]; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index 6ff141e099c..67df00b8e69 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, fetchpatch -, pkgconfig, autoreconfHook +{ lib, stdenv, fetchurl, fetchpatch +, pkg-config, autoreconfHook , gmp, python3, iptables, ldns, unbound, openssl, pcsclite, glib , openresolv , systemd, pam @@ -13,7 +13,7 @@ # strongswan curl plugin may break. # See https://wiki.strongswan.org/projects/strongswan/wiki/Curl for more info. -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "strongswan"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { dontPatchELF = true; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ curl gmp python3 ldns unbound openssl pcsclite ] ++ optionals enableTNC [ trousers sqlite libxml2 ] diff --git a/pkgs/tools/networking/stubby/default.nix b/pkgs/tools/networking/stubby/default.nix index a87204ff0c6..abe11b7bcb9 100644 --- a/pkgs/tools/networking/stubby/default.nix +++ b/pkgs/tools/networking/stubby/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake libyaml ]; buildInputs = [ doxygen getdns systemd ] - ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.Security ]; + ++ lib.optionals stdenv.isDarwin [ darwin.Security ]; meta = with lib; { description = "A local DNS Privacy stub resolver (using DNS-over-TLS)"; diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index eaa05bfdbad..6104a4d2b50 100644 --- a/pkgs/tools/networking/stunnel/default.nix +++ b/pkgs/tools/networking/stunnel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl }: +{ lib, stdenv, fetchurl, openssl }: stdenv.mkDerivation rec { pname = "stunnel"; @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { meta = { description = "Universal tls/ssl wrapper"; homepage = "https://www.stunnel.org/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.thoughtpolice ]; }; } diff --git a/pkgs/tools/networking/subfinder/default.nix b/pkgs/tools/networking/subfinder/default.nix index 4474cba6aee..2844cc2dac0 100644 --- a/pkgs/tools/networking/subfinder/default.nix +++ b/pkgs/tools/networking/subfinder/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "subfinder"; diff --git a/pkgs/tools/networking/surfraw/default.nix b/pkgs/tools/networking/surfraw/default.nix index d26bdbbb771..d9bf06e825e 100644 --- a/pkgs/tools/networking/surfraw/default.nix +++ b/pkgs/tools/networking/surfraw/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, perl}: +{lib, stdenv, fetchurl, perl}: stdenv.mkDerivation { name = "surfraw-2.3.0"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { description = "Provides a fast unix command line interface to a variety of popular WWW search engines and other artifacts of power"; homepage = "https://gitlab.com/surfraw/Surfraw"; maintainers = []; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.publicDomain; + platforms = lib.platforms.linux; + license = lib.licenses.publicDomain; }; } diff --git a/pkgs/tools/networking/swec/default.nix b/pkgs/tools/networking/swec/default.nix index e65bc5e208f..71fea1c2e83 100644 --- a/pkgs/tools/networking/swec/default.nix +++ b/pkgs/tools/networking/swec/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, makeWrapper, perlPackages }: +{ fetchurl, lib, stdenv, makeWrapper, perlPackages }: stdenv.mkDerivation rec { name = "swec-0.4"; @@ -64,9 +64,9 @@ stdenv.mkDerivation rec { (well, not exactly true, SWEC will ignore robots.txt). ''; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix index fa555ad4f99..71c435df0c5 100644 --- a/pkgs/tools/networking/tcpdump/default.nix +++ b/pkgs/tools/networking/tcpdump/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libpcap, perl, fetchpatch }: +{ lib, stdenv, fetchurl, libpcap, perl, fetchpatch }: stdenv.mkDerivation rec { pname = "tcpdump"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ libpcap ]; - configureFlags = stdenv.lib.optional + configureFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "ac_cv_linux_vers=2"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { description = "Network sniffer"; homepage = "http://www.tcpdump.org/"; license = "BSD-style"; - maintainers = with stdenv.lib.maintainers; [ globin ]; - platforms = stdenv.lib.platforms.unix; + maintainers = with lib.maintainers; [ globin ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/tcpreplay/default.nix b/pkgs/tools/networking/tcpreplay/default.nix index 2875d13671a..0c322fe9f63 100644 --- a/pkgs/tools/networking/tcpreplay/default.nix +++ b/pkgs/tools/networking/tcpreplay/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libpcap ] - ++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon CoreServices ]; diff --git a/pkgs/tools/networking/tcptraceroute/default.nix b/pkgs/tools/networking/tcptraceroute/default.nix index e1e711ef16a..1eacd685463 100644 --- a/pkgs/tools/networking/tcptraceroute/default.nix +++ b/pkgs/tools/networking/tcptraceroute/default.nix @@ -1,4 +1,4 @@ -{ stdenv , fetchurl, libpcap, libnet +{ lib, stdenv , fetchurl, libpcap, libnet }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "A traceroute implementation using TCP packets"; homepage = "https://github.com/mct/tcptraceroute"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; maintainers = [ ]; }; } diff --git a/pkgs/tools/networking/tdns-cli/default.nix b/pkgs/tools/networking/tdns-cli/default.nix index 0ed7922874d..9d786d60b12 100644 --- a/pkgs/tools/networking/tdns-cli/default.nix +++ b/pkgs/tools/networking/tdns-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { name = "tdns-cli"; diff --git a/pkgs/tools/networking/tendermint/default.nix b/pkgs/tools/networking/tendermint/default.nix index bd280e75379..36269327e81 100644 --- a/pkgs/tools/networking/tendermint/default.nix +++ b/pkgs/tools/networking/tendermint/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "tendermint"; diff --git a/pkgs/tools/networking/termshark/default.nix b/pkgs/tools/networking/termshark/default.nix index 43b7702a818..65ba8d17bcb 100644 --- a/pkgs/tools/networking/termshark/default.nix +++ b/pkgs/tools/networking/termshark/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, buildGoModule, wireshark-cli }: +{ lib, fetchFromGitHub, makeWrapper, buildGoModule, wireshark-cli }: buildGoModule rec { pname = "termshark"; @@ -19,7 +19,7 @@ buildGoModule rec { doCheck = false; postFixup = '' - wrapProgram $out/bin/termshark --prefix PATH : ${stdenv.lib.makeBinPath [ wireshark-cli ]} + wrapProgram $out/bin/termshark --prefix PATH : ${lib.makeBinPath [ wireshark-cli ]} ''; buildFlagsArray = '' diff --git a/pkgs/tools/networking/tinc/default.nix b/pkgs/tools/networking/tinc/default.nix index e331916626e..2387c903a9b 100644 --- a/pkgs/tools/networking/tinc/default.nix +++ b/pkgs/tools/networking/tinc/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, lzo, openssl, zlib}: +{lib, stdenv, fetchurl, lzo, openssl, zlib}: stdenv.mkDerivation rec { version = "1.0.36"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { authentication, compression and ethernet bridging. ''; homepage="http://www.tinc-vpn.org/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/tinyfecvpn/default.nix b/pkgs/tools/networking/tinyfecvpn/default.nix index 0873b9a541a..190950e37ec 100644 --- a/pkgs/tools/networking/tinyfecvpn/default.nix +++ b/pkgs/tools/networking/tinyfecvpn/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, pkg-config }: stdenv.mkDerivation rec { pname = "tinyfecvpn"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; patchPhase = '' runHook prePatch diff --git a/pkgs/tools/networking/tinyproxy/default.nix b/pkgs/tools/networking/tinyproxy/default.nix index 610322b23da..2c6315b37c9 100644 --- a/pkgs/tools/networking/tinyproxy/default.nix +++ b/pkgs/tools/networking/tinyproxy/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook asciidoc libxml2 libxslt docbook_xsl ]; # -z flag is not supported in darwin - preAutoreconf = stdenv.lib.optionalString stdenv.isDarwin '' + preAutoreconf = lib.optionalString stdenv.isDarwin '' substituteInPlace configure.ac --replace \ 'LDFLAGS="-Wl,-z,defs $LDFLAGS"' \ 'LDFLAGS="-Wl, $LDFLAGS"' @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { "--enable-reverse" # Enable reverse proxying. ] ++ # See: https://github.com/tinyproxy/tinyproxy/issues/1 - stdenv.lib.optional stdenv.isDarwin "--disable-regexcheck"; + lib.optional stdenv.isDarwin "--disable-regexcheck"; meta = with lib; { homepage = "https://tinyproxy.github.io/"; diff --git a/pkgs/tools/networking/tlspool/default.nix b/pkgs/tools/networking/tlspool/default.nix index d3415a88b86..01eced9a566 100644 --- a/pkgs/tools/networking/tlspool/default.nix +++ b/pkgs/tools/networking/tlspool/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, cmake, pkgconfig, arpa2cm +, cmake, pkg-config, arpa2cm , openldap, p11-kit, unbound, libtasn1, db, openssl, quickder, libkrb5, ldns, gnutls-kdh , softhsm }: @@ -19,7 +19,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ - cmake pkgconfig arpa2cm + cmake pkg-config arpa2cm ]; buildInputs = [ diff --git a/pkgs/tools/networking/toss/default.nix b/pkgs/tools/networking/toss/default.nix index 9752dcc4f64..3c8f7296181 100644 --- a/pkgs/tools/networking/toss/default.nix +++ b/pkgs/tools/networking/toss/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "toss"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "05ql0d8wbdhnmh3dw8ch5bi6clfb9h8v21lq2a74iy02slya2y0r"; }; preInstall = "export DESTDIR=$out/bin"; - meta = with stdenv.lib; + meta = with lib; src.meta // { description = "Dead simple LAN file transfers from the command line"; license = with licenses; [ mit ]; diff --git a/pkgs/tools/networking/tox-node/default.nix b/pkgs/tools/networking/tox-node/default.nix index be949d60067..3ef125382b6 100644 --- a/pkgs/tools/networking/tox-node/default.nix +++ b/pkgs/tools/networking/tox-node/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub +{ lib, rustPlatform, fetchFromGitHub , libsodium, openssl -, pkgconfig +, pkg-config }: with rustPlatform; @@ -17,7 +17,7 @@ buildRustPackage rec { }; buildInputs = [ libsodium openssl ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; SODIUM_USE_PKG_CONFIG = "yes"; diff --git a/pkgs/tools/networking/toxvpn/default.nix b/pkgs/tools/networking/toxvpn/default.nix index 887200fa2aa..c433d7d0a66 100644 --- a/pkgs/tools/networking/toxvpn/default.nix +++ b/pkgs/tools/networking/toxvpn/default.nix @@ -2,7 +2,7 @@ libtoxcore, libsodium, libcap, zeromq, systemd ? null }: -with stdenv.lib; +with lib; stdenv.mkDerivation { name = "toxvpn-2019-09-09"; diff --git a/pkgs/tools/networking/tracebox/default.nix b/pkgs/tools/networking/tracebox/default.nix index 7ac4c88325c..a5486252a8a 100644 --- a/pkgs/tools/networking/tracebox/default.nix +++ b/pkgs/tools/networking/tracebox/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.tracebox.org/"; description = "A middlebox detection tool"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; maintainers = [ maintainers.lethalman ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/networking/traceroute/default.nix b/pkgs/tools/networking/traceroute/default.nix index 04e66f29fcc..c941aad258c 100644 --- a/pkgs/tools/networking/traceroute/default.nix +++ b/pkgs/tools/networking/traceroute/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://traceroute.sourceforge.net/"; description = "Tracks the route taken by packets over an IP network"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; maintainers = [ maintainers.koral ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/networking/trickle/default.nix b/pkgs/tools/networking/trickle/default.nix index fc32d34ad31..8a5143d1e3b 100644 --- a/pkgs/tools/networking/trickle/default.nix +++ b/pkgs/tools/networking/trickle/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libevent, libtirpc }: +{ lib, stdenv, fetchurl, libevent, libtirpc }: stdenv.mkDerivation rec { name = "trickle-1.07"; @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { meta = { description = "Lightweight userspace bandwidth shaper"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; homepage = "https://monkey.org/~marius/pages/?page=trickle"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/tridactyl-native/default.nix b/pkgs/tools/networking/tridactyl-native/default.nix index 2e17f753a5b..ce7325975fb 100644 --- a/pkgs/tools/networking/tridactyl-native/default.nix +++ b/pkgs/tools/networking/tridactyl-native/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "tridactyl-native"; # this is actually the version of tridactyl itself; the native messenger will # probably not change with every tridactyl version - version = "1.20.3"; + version = "1.20.4"; src = fetchFromGitHub { owner = "tridactyl"; repo = "tridactyl"; rev = version; - sha256 = "064cl9m4hdv69q1af0xjcf2rf30n3pvz6ym2l53w90aq3217amps"; + sha256 = "sha256-BjjRB9VadQ/MSwNK2QLbcTDoRs6Ua+5MONHtmfq4xz0="; }; sourceRoot = "source/native"; diff --git a/pkgs/tools/networking/tunnelto/default.nix b/pkgs/tools/networking/tunnelto/default.nix index a91a82b9d5d..c1824334789 100644 --- a/pkgs/tools/networking/tunnelto/default.nix +++ b/pkgs/tools/networking/tunnelto/default.nix @@ -19,10 +19,10 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0k0ig3dynj46kh8g7d6bljcaalmp40pvdbhbjmlxrmwnjq6bhzcq"; - nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; + nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; buildInputs = [ ] - ++ stdenv.lib.optionals stdenv.isLinux [ openssl ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; + ++ lib.optionals stdenv.isLinux [ openssl ] + ++ lib.optionals stdenv.isDarwin [ Security ]; meta = with lib; { description = "Expose your local web server to the internet with a public URL"; diff --git a/pkgs/tools/networking/twa/default.nix b/pkgs/tools/networking/twa/default.nix index 21cbd2dfefb..b6038aa5435 100644 --- a/pkgs/tools/networking/twa/default.nix +++ b/pkgs/tools/networking/twa/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { install -Dm 0644 README.md "$out/share/doc/twa/README.md" wrapProgram "$out/bin/twa" \ - --prefix PATH : ${stdenv.lib.makeBinPath [ curl + --prefix PATH : ${lib.makeBinPath [ curl host.dnsutils jq ncurses diff --git a/pkgs/tools/networking/ua/default.nix b/pkgs/tools/networking/ua/default.nix index 9ce7f5df247..feb17b283de 100644 --- a/pkgs/tools/networking/ua/default.nix +++ b/pkgs/tools/networking/ua/default.nix @@ -1,5 +1,5 @@ -{ stdenv, buildGoPackage, fetchgit -, pkgconfig +{ lib, buildGoPackage, fetchgit +, pkg-config , glib, libxml2 }: @@ -18,14 +18,14 @@ buildGoPackage rec { goDeps = ./deps.nix; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib libxml2 ]; meta = { homepage = "https://github.com/sloonz/ua"; - license = stdenv.lib.licenses.isc; + license = lib.licenses.isc; description = "Universal Aggregator"; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ ttuegel ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ ttuegel ]; }; } diff --git a/pkgs/tools/networking/udptunnel/default.nix b/pkgs/tools/networking/udptunnel/default.nix index 08fb7cd62e0..6063cb38b56 100644 --- a/pkgs/tools/networking/udptunnel/default.nix +++ b/pkgs/tools/networking/udptunnel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "udptunnel-19"; @@ -17,8 +17,8 @@ stdenv.mkDerivation { meta = { homepage = "https://code.google.com/archive/p/udptunnel/"; description = "Tunnels TCP over UDP packets"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/tools/networking/uget-integrator/default.nix b/pkgs/tools/networking/uget-integrator/default.nix index f89b168b84c..2d069ea07f0 100644 --- a/pkgs/tools/networking/uget-integrator/default.nix +++ b/pkgs/tools/networking/uget-integrator/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { substituteInPlace $f --replace "/usr" "$out" done - install -D -t $out/bin bin/uget-integrator - install -D -t $out/etc/opt/chrome/native-messaging-hosts conf/com.ugetdm.chrome.json - install -D -t $out/etc/chromium/native-messaging-hosts conf/com.ugetdm.chrome.json - install -D -t $out/etc/opera/native-messaging-hosts conf/com.ugetdm.chrome.json - install -D -t $out/lib/mozilla/native-messaging-hosts conf/com.ugetdm.firefox.json + install -D -t $out/bin bin/uget-integrator + install -D -t $out/etc/opt/chrome/native-messaging-hosts conf/com.ugetdm.chrome.json + install -D -t $out/etc/chromium/native-messaging-hosts conf/com.ugetdm.chrome.json + install -D -t $out/etc/opera/native-messaging-hosts conf/com.ugetdm.chrome.json + install -D -t $out/lib/mozilla/native-messaging-hosts conf/com.ugetdm.firefox.json wrapPythonPrograms ''; diff --git a/pkgs/tools/networking/uget/default.nix b/pkgs/tools/networking/uget/default.nix index 5267eda9bf2..2bece5e30dd 100644 --- a/pkgs/tools/networking/uget/default.nix +++ b/pkgs/tools/networking/uget/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, intltool, openssl, curl, libnotify, +{ lib, stdenv, fetchurl, pkg-config, intltool, openssl, curl, libnotify, libappindicator-gtk3, gst_all_1, gtk3, dconf, wrapGAppsHook, aria2 ? null }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config intltool wrapGAppsHook ]; @@ -23,14 +23,14 @@ stdenv.mkDerivation rec { libnotify libappindicator-gtk3 gtk3 - (stdenv.lib.getLib dconf) + (lib.getLib dconf) ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good ]) - ++ (stdenv.lib.optional (aria2 != null) aria2); + ++ (lib.optional (aria2 != null) aria2); enableParallelBuilding = true; - preFixup = stdenv.lib.optionalString (aria2 != null) + preFixup = lib.optionalString (aria2 != null) ''gappsWrapperArgs+=(--suffix PATH : "${aria2}/bin")''; meta = with lib; { diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index ce27f111377..24b17af3d3e 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { "--with-rootkey-file=${dns-root-data}/root.key" "--enable-pie" "--enable-relro-now" - ] ++ stdenv.lib.optional stdenv.hostPlatform.isStatic [ + ] ++ lib.optional stdenv.hostPlatform.isStatic [ "--disable-flto" ] ++ lib.optionals withSystemd [ "--enable-systemd" diff --git a/pkgs/tools/networking/unbound/python.nix b/pkgs/tools/networking/unbound/python.nix index 71ff3b954f4..fcfd93be4d6 100644 --- a/pkgs/tools/networking/unbound/python.nix +++ b/pkgs/tools/networking/unbound/python.nix @@ -59,7 +59,7 @@ in stdenv.mkDerivation rec { license = licenses.bsd3; homepage = "http://www.unbound.net"; maintainers = with maintainers; [ leenaars ]; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; broken = true; }; } diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix index 10bbc963a28..1cea3989ed2 100644 --- a/pkgs/tools/networking/urlwatch/default.nix +++ b/pkgs/tools/networking/urlwatch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { pname = "urlwatch"; diff --git a/pkgs/tools/networking/uwimap/default.nix b/pkgs/tools/networking/uwimap/default.nix index bd38a1cfa2f..e675268163a 100644 --- a/pkgs/tools/networking/uwimap/default.nix +++ b/pkgs/tools/networking/uwimap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pam, openssl }: +{ lib, stdenv, fetchurl, fetchpatch, pam, openssl }: stdenv.mkDerivation ({ name = "uw-imap-2007f"; @@ -12,13 +12,13 @@ stdenv.mkDerivation ({ then "osx" else "lnp") ] # Linux with PAM modules; # -fPIC is required to compile php with imap on x86_64 systems - ++ stdenv.lib.optional stdenv.isx86_64 "EXTRACFLAGS=-fPIC" - ++ stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "CC=${stdenv.hostPlatform.config}-gcc" "RANLIB=${stdenv.hostPlatform.config}-ranlib" ]; + ++ lib.optional stdenv.isx86_64 "EXTRACFLAGS=-fPIC" + ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "CC=${stdenv.hostPlatform.config}-gcc" "RANLIB=${stdenv.hostPlatform.config}-ranlib" ]; hardeningDisable = [ "format" ]; buildInputs = [ openssl ] - ++ stdenv.lib.optional (!stdenv.isDarwin) pam; + ++ lib.optional (!stdenv.isDarwin) pam; patches = [ (fetchpatch { url = "https://salsa.debian.org/holmgren/uw-imap/raw/dcb42981201ea14c2d71c01ebb4a61691b6f68b3/debian/patches/1006_openssl1.1_autoverify.patch"; @@ -31,7 +31,7 @@ stdenv.mkDerivation ({ sed -i src/osdep/unix/Makefile -e 's,^SSLLIB=.*,SSLLIB=${openssl.out}/lib,' ''; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${openssl.dev}/include/openssl"; installPhase = '' @@ -45,14 +45,14 @@ stdenv.mkDerivation ({ meta = { homepage = "https://www.washington.edu/imap/"; description = "UW IMAP toolkit - IMAP-supporting software developed by the UW"; - license = stdenv.lib.licenses.asl20; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.asl20; + platforms = with lib.platforms; linux; }; passthru = { withSSL = true; }; -} // stdenv.lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) { +} // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) { # This is set here to prevent rebuilds on native compilation. # Configure phase is a no-op there, because this package doesn't use ./configure scripts. configurePhase = '' diff --git a/pkgs/tools/networking/vde2/default.nix b/pkgs/tools/networking/vde2/default.nix index 98a52174240..babbd88fd16 100644 --- a/pkgs/tools/networking/vde2/default.nix +++ b/pkgs/tools/networking/vde2/default.nix @@ -15,17 +15,17 @@ stdenv.mkDerivation rec { url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/vde_cryptcab-compile-against-openssl-1.1.0.patch?h=packages/vde2&id=15b11be49997fa94b603e366064690b7cc6bce61"; sha256 = "07z1yabwigq35mkwzqa934n7vjnjlqz5xfzq8cfj87lgyjjp00qi"; }) - ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl [ + ] ++ lib.optional stdenv.hostPlatform.isMusl [ (fetchpatch { url = "https://git.alpinelinux.org/aports/plain/main/vde2/musl-build-fix.patch?id=ddee2f86a48e087867d4a2c12849b2e3baccc238"; sha256 = "0b5382v541bkxhqylilcy34bh83ag96g71f39m070jzvi84kx8af"; }) ]; - configureFlags = stdenv.lib.optional (!withPython) "--disable-python"; + configureFlags = lib.optional (!withPython) "--disable-python"; buildInputs = [ openssl libpcap ] - ++ stdenv.lib.optional withPython python2; + ++ lib.optional withPython python2; hardeningDisable = [ "format" ]; diff --git a/pkgs/tools/networking/vpnc/default.nix b/pkgs/tools/networking/vpnc/default.nix index 7a52112e65f..a754e7e9937 100644 --- a/pkgs/tools/networking/vpnc/default.nix +++ b/pkgs/tools/networking/vpnc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, nettools, libgcrypt, openssl, openresolv, perl, gawk, makeWrapper }: +{ lib, stdenv, fetchsvn, nettools, libgcrypt, openssl, openresolv, perl, gawk, makeWrapper }: stdenv.mkDerivation { name = "vpnc-0.5.3-post-r550"; @@ -50,8 +50,8 @@ stdenv.mkDerivation { meta = { homepage = "https://www.unix-ag.uni-kl.de/~massar/vpnc/"; description = "Virtual private network (VPN) client for Cisco's VPN concentrators"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/waitron/default.nix b/pkgs/tools/networking/waitron/default.nix index cc28455d06a..8364cd5763d 100644 --- a/pkgs/tools/networking/waitron/default.nix +++ b/pkgs/tools/networking/waitron/default.nix @@ -1,5 +1,5 @@ # This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: buildGoPackage rec { name = "waitron-unstable-${version}"; @@ -23,8 +23,8 @@ buildGoPackage rec { meta = { description = "A tool to manage network booting of machines"; homepage = "https://github.com/ns1/waitron"; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ guibert ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ guibert ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/wakelan/default.nix b/pkgs/tools/networking/wakelan/default.nix index ff96509e15c..96e01141c18 100644 --- a/pkgs/tools/networking/wakelan/default.nix +++ b/pkgs/tools/networking/wakelan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "wakelan-1.1"; @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { power on. ''; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.viric ]; - platforms = stdenv.lib.platforms.unix; + maintainers = [ lib.maintainers.viric ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/wavemon/default.nix b/pkgs/tools/networking/wavemon/default.nix index 4b265e12fbf..19bfd6ae454 100644 --- a/pkgs/tools/networking/wavemon/default.nix +++ b/pkgs/tools/networking/wavemon/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/uoaerg/wavemon"; license = licenses.gpl3Plus; maintainers = with maintainers; [ raskin fpletz ]; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/wbox/default.nix b/pkgs/tools/networking/wbox/default.nix index 8b10bb599c4..3a5fce6808f 100644 --- a/pkgs/tools/networking/wbox/default.nix +++ b/pkgs/tools/networking/wbox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "wbox"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "A simple HTTP benchmarking tool"; homepage = "http://www.hping.org/wbox/"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.bsd3; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/weighttp/default.nix b/pkgs/tools/networking/weighttp/default.nix index efcb8d8cf42..72bd29247ab 100644 --- a/pkgs/tools/networking/weighttp/default.nix +++ b/pkgs/tools/networking/weighttp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, python, libev, wafHook }: +{ lib, stdenv, fetchgit, python, libev, wafHook }: stdenv.mkDerivation rec { pname = "weighttp"; version = "0.4"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ python libev ]; meta = { - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; homepage = "https://redmine.lighttpd.net/projects/weighttp/wiki"; description = "A lightweight and simple webserver benchmarking tool"; }; diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index ca70126782d..3ac71ca37e5 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gettext, pkgconfig, perlPackages +{ lib, stdenv, fetchurl, gettext, pkg-config, perlPackages , libidn2, zlib, pcre, libuuid, libiconv, libintl , python3, lzip , libpsl ? null @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { preConfigure = '' patchShebangs doc - '' + stdenv.lib.optionalString doCheck '' + '' + lib.optionalString doCheck '' # Work around lack of DNS resolution in chroots. for i in "tests/"*.pm "tests/"*.px do @@ -28,15 +28,15 @@ stdenv.mkDerivation rec { done ''; - nativeBuildInputs = [ gettext pkgconfig perlPackages.perl lzip libiconv libintl ]; + nativeBuildInputs = [ gettext pkg-config perlPackages.perl lzip libiconv libintl ]; buildInputs = [ libidn2 zlib pcre libuuid ] - ++ stdenv.lib.optionals doCheck [ perlPackages.IOSocketSSL perlPackages.LWP python3 ] - ++ stdenv.lib.optional (openssl != null) openssl - ++ stdenv.lib.optional (libpsl != null) libpsl - ++ stdenv.lib.optional stdenv.isDarwin perlPackages.perl; + ++ lib.optionals doCheck [ perlPackages.IOSocketSSL perlPackages.LWP python3 ] + ++ lib.optional (openssl != null) openssl + ++ lib.optional (libpsl != null) libpsl + ++ lib.optional stdenv.isDarwin perlPackages.perl; configureFlags = [ - (stdenv.lib.withFeatureAs (openssl != null) "ssl" "openssl") + (lib.withFeatureAs (openssl != null) "ssl" "openssl") ]; doCheck = false; diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix index e2dd3a4c4fd..f8613beb936 100644 --- a/pkgs/tools/networking/whois/default.nix +++ b/pkgs/tools/networking/whois/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, perl, gettext, pkgconfig, libidn2, libiconv }: +{ lib, stdenv, fetchFromGitHub, perl, gettext, pkg-config, libidn2, libiconv }: stdenv.mkDerivation rec { version = "5.5.6"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0iqbn2ky9j7qdpv5hycy56knnfhl8nz4l4905rnr0p703lvxxx8d"; }; - nativeBuildInputs = [ perl gettext pkgconfig ]; + nativeBuildInputs = [ perl gettext pkg-config ]; buildInputs = [ libidn2 libiconv ]; preConfigure = '' diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix index 40550b48abb..7e702c0559b 100644 --- a/pkgs/tools/networking/wicd/default.nix +++ b/pkgs/tools/networking/wicd/default.nix @@ -7,7 +7,7 @@ let in stdenv.mkDerivation rec { pname = "wicd"; version = "1.7.2.4"; - + src = fetchurl { url = "https://launchpad.net/wicd/1.7/${version}/+download/${pname}-${version}.tar.gz"; sha256 = "15ywgh60xzmp5z8l1kzics7yi95isrjg1paz42dvp7dlpdfzpzfw"; @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { ./no-var-install.patch ./pygtk.patch ./no-optimization.patch - ./dhclient.patch + ./dhclient.patch ./fix-app-icon.patch ./fix-gtk-issues.patch ./urwid-api-update.patch @@ -33,10 +33,10 @@ in stdenv.mkDerivation rec { postPatch = '' # We don't have "python2". substituteInPlace wicd/wicd-daemon.py --replace 'misc.find_path("python2")' "'${python.interpreter}'" - + substituteInPlace in/scripts=wicd.in --subst-var-by TEMPLATE-DEFAULT $out/share/other/dhclient.conf.template.default - sed -i "2iexport PATH=${stdenv.lib.makeBinPath [ python wpa_supplicant dhcpcd dhcp wirelesstools nettools nettools iputils openresolv iproute ]}\$\{PATH:+:\}\$PATH" in/scripts=wicd.in + sed -i "2iexport PATH=${lib.makeBinPath [ python wpa_supplicant dhcpcd dhcp wirelesstools nettools nettools iputils openresolv iproute ]}\$\{PATH:+:\}\$PATH" in/scripts=wicd.in sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pygobject2}):$(toPythonPath ${dbus-python})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd.in sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-client.in sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject2}):$(toPythonPath ${pygobject2})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-client.in diff --git a/pkgs/tools/networking/wifish/default.nix b/pkgs/tools/networking/wifish/default.nix index f502a2fb0d5..a9e30710c1a 100644 --- a/pkgs/tools/networking/wifish/default.nix +++ b/pkgs/tools/networking/wifish/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , dialog , gawk , wpa_supplicant @@ -34,10 +34,10 @@ stdenv.mkDerivation rec { postFixup = '' wrapProgram ${placeholder "out"}/bin/wifish \ - --prefix PATH ":" ${stdenv.lib.makeBinPath [ dialog gawk wpa_supplicant ]} + --prefix PATH ":" ${lib.makeBinPath [ dialog gawk wpa_supplicant ]} ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/bougyman/wifish"; description = "Simple wifi shell script for linux"; license = licenses.wtfpl; diff --git a/pkgs/tools/networking/wifite2/default.nix b/pkgs/tools/networking/wifite2/default.nix index 3b1c3f14ac5..054b77f8c9b 100644 --- a/pkgs/tools/networking/wifite2/default.nix +++ b/pkgs/tools/networking/wifite2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, python3, wirelesstools +{ lib, fetchFromGitHub, fetchpatch, python3, wirelesstools , aircrack-ng, wireshark-cli, reaverwps-t6x, cowpatty, hashcat, hcxtools , hcxdumptool, pyrit, which }: diff --git a/pkgs/tools/networking/wireguard-go/default.nix b/pkgs/tools/networking/wireguard-go/default.nix index 100de62683d..35c5371113c 100644 --- a/pkgs/tools/networking/wireguard-go/default.nix +++ b/pkgs/tools/networking/wireguard-go/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchzip }: +{ lib, buildGoPackage, fetchzip }: buildGoPackage rec { pname = "wireguard-go"; diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index a9f0d7e77d6..1e401deaa26 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchzip , nixosTests , iptables ? null @@ -9,7 +9,7 @@ , wireguard-go ? null }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "wireguard-tools"; diff --git a/pkgs/tools/networking/wolfebin/default.nix b/pkgs/tools/networking/wolfebin/default.nix index 23458f2a396..2a07ada114d 100644 --- a/pkgs/tools/networking/wolfebin/default.nix +++ b/pkgs/tools/networking/wolfebin/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "5.4"; pname = "wolfebin"; - + src = fetchFromGitHub { owner = "thejoshwolfe"; repo = "wolfebin"; diff --git a/pkgs/tools/networking/wormhole-william/default.nix b/pkgs/tools/networking/wormhole-william/default.nix index 6476d4f43b1..48f842f60ce 100644 --- a/pkgs/tools/networking/wormhole-william/default.nix +++ b/pkgs/tools/networking/wormhole-william/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "wormhole-william"; diff --git a/pkgs/tools/networking/wrk2/default.nix b/pkgs/tools/networking/wrk2/default.nix index 2a5e8e3a5dc..0cf40b87f5a 100644 --- a/pkgs/tools/networking/wrk2/default.nix +++ b/pkgs/tools/networking/wrk2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, luajit, openssl, zlib }: +{ lib, stdenv, fetchFromGitHub, luajit, openssl, zlib }: stdenv.mkDerivation rec { pname = "wrk2"; @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { meta = { description = "Constant throughput, correct latency recording variant of wrk"; homepage = "https://github.com/giltene/wrk2"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; + license = lib.licenses.bsd3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ thoughtpolice ]; }; } diff --git a/pkgs/tools/networking/wstunnel/default.nix b/pkgs/tools/networking/wstunnel/default.nix index 161b08a7d39..a851dcd4ead 100644 --- a/pkgs/tools/networking/wstunnel/default.nix +++ b/pkgs/tools/networking/wstunnel/default.nix @@ -1,6 +1,6 @@ { mkDerivation, async, base, base64-bytestring, binary, bytestring , classy-prelude, cmdargs, connection, hslogger, mtl, network -, network-conduit-tls, stdenv, streaming-commons, text +, network-conduit-tls, streaming-commons, text , unordered-containers, websockets , hspec, iproute , lib, fetchFromGitHub, fetchpatch diff --git a/pkgs/tools/networking/wuzz/default.nix b/pkgs/tools/networking/wuzz/default.nix index 73db27f1a94..156841be334 100644 --- a/pkgs/tools/networking/wuzz/default.nix +++ b/pkgs/tools/networking/wuzz/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "wuzz"; diff --git a/pkgs/tools/networking/xnbd/default.nix b/pkgs/tools/networking/xnbd/default.nix index 79a968f806e..0488fb9fa18 100644 --- a/pkgs/tools/networking/xnbd/default.nix +++ b/pkgs/tools/networking/xnbd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, autoreconfHook, glib, jansson }: +{ lib, stdenv, fetchurl, pkg-config, autoreconfHook, glib, jansson }: stdenv.mkDerivation rec { name = "xnbd-0.4.0"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { patches = [ ./0001-Fix-build-for-glibc-2.28.patch ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ glib jansson ]; @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://bitbucket.org/hirofuchi/xnbd"; description = "Yet another NBD (Network Block Device) server program"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.volth ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.volth ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/yrd/default.nix b/pkgs/tools/networking/yrd/default.nix index 7f946718588..75a89b859fe 100644 --- a/pkgs/tools/networking/yrd/default.nix +++ b/pkgs/tools/networking/yrd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pythonPackages }: +{ lib, fetchFromGitHub, pythonPackages }: let pname = "yrd"; diff --git a/pkgs/tools/networking/zssh/default.nix b/pkgs/tools/networking/zssh/default.nix index 945c96ae851..07b7a8441b8 100644 --- a/pkgs/tools/networking/zssh/default.nix +++ b/pkgs/tools/networking/zssh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, readline }: +{ lib, stdenv, fetchurl, readline }: let version = "1.5c"; @@ -32,8 +32,8 @@ in stdenv.mkDerivation rec { meta = { description = "SSH and Telnet client with ZMODEM file transfer capability"; homepage = "http://zssh.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; maintainers = [ ]; # required by deepin-terminal - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/nix/cached-nix-shell/default.nix b/pkgs/tools/nix/cached-nix-shell/default.nix index 9acf9ed11c5..853bf87346f 100644 --- a/pkgs/tools/nix/cached-nix-shell/default.nix +++ b/pkgs/tools/nix/cached-nix-shell/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, openssl, pkgconfig, ronn, rustPlatform }: +{ lib, fetchFromGitHub, openssl, pkg-config, ronn, rustPlatform }: let blake3-src = fetchFromGitHub { diff --git a/pkgs/tools/nix/manix/default.nix b/pkgs/tools/nix/manix/default.nix index f93e25efae7..6c9f02f0e4f 100644 --- a/pkgs/tools/nix/manix/default.nix +++ b/pkgs/tools/nix/manix/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0fv3sgzwjsgq2h1177r8r1cl5zrfja4ll801sd0bzj3nzmkyww7p"; }; - buildInputs = stdenv.lib.optional stdenv.isDarwin [ darwin.Security ]; + buildInputs = lib.optional stdenv.isDarwin [ darwin.Security ]; cargoSha256 = "0f2q3bj1cmpbma0fjhc2lc92j4al78fhrx3yc37kmbgzaza0yan5"; diff --git a/pkgs/tools/nix/nar-serve/default.nix b/pkgs/tools/nix/nar-serve/default.nix index 4b0239a2fa2..146165d880d 100644 --- a/pkgs/tools/nix/nar-serve/default.nix +++ b/pkgs/tools/nix/nar-serve/default.nix @@ -1,7 +1,7 @@ { buildGoModule , fetchFromGitHub , lib -, stdenv + }: let pname = "nar-serve"; diff --git a/pkgs/tools/nix/nix-output-monitor/default.nix b/pkgs/tools/nix/nix-output-monitor/default.nix index 1c35e0ccd51..b177b9a233a 100644 --- a/pkgs/tools/nix/nix-output-monitor/default.nix +++ b/pkgs/tools/nix/nix-output-monitor/default.nix @@ -1,5 +1,5 @@ { mkDerivation, ansi-terminal, async, attoparsec, base, containers -, directory, HUnit, mtl, nix-derivation, process, relude, stdenv +, directory, HUnit, mtl, nix-derivation, process, relude, lib , stm, text, time, unix, fetchFromGitHub }: mkDerivation { @@ -27,6 +27,6 @@ mkDerivation { ]; homepage = "https://github.com/maralorn/nix-output-monitor"; description = "Parses output of nix-build to show additional information"; - license = stdenv.lib.licenses.agpl3Plus; - maintainers = [ stdenv.lib.maintainers.maralorn ]; + license = lib.licenses.agpl3Plus; + maintainers = [ lib.maintainers.maralorn ]; } diff --git a/pkgs/tools/nix/nix-query-tree-viewer/default.nix b/pkgs/tools/nix/nix-query-tree-viewer/default.nix index f820f36e49f..353aafa2a7e 100644 --- a/pkgs/tools/nix/nix-query-tree-viewer/default.nix +++ b/pkgs/tools/nix/nix-query-tree-viewer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, glib, gtk3, wrapGAppsHook }: +{ lib, fetchFromGitHub, rustPlatform, glib, gtk3, wrapGAppsHook }: rustPlatform.buildRustPackage rec { pname = "nix-query-tree-viewer"; diff --git a/pkgs/tools/nix/nixdoc/default.nix b/pkgs/tools/nix/nixdoc/default.nix index 3d2e434912f..d97a3d5bae3 100644 --- a/pkgs/tools/nix/nixdoc/default.nix +++ b/pkgs/tools/nix/nixdoc/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "14d4dq06jdqazxvv7fq5872zy0capxyb0fdkp8qg06gxl1iw201s"; }; - buildInputs = stdenv.lib.optional stdenv.isDarwin [ darwin.Security ]; + buildInputs = lib.optional stdenv.isDarwin [ darwin.Security ]; cargoSha256 = "1vamwynkbnffs8ryr2zb1a41cymjvr8zzh1bifyh9hpkx2k11rs3"; diff --git a/pkgs/tools/package-management/appimage-run/default.nix b/pkgs/tools/package-management/appimage-run/default.nix index 3bc59f2ad14..98a04dff8f8 100644 --- a/pkgs/tools/package-management/appimage-run/default.nix +++ b/pkgs/tools/package-management/appimage-run/default.nix @@ -1,4 +1,4 @@ -{ appimageTools, buildFHSUserEnv, extraPkgs ? pkgs: [] }: +{ appimageTools, buildFHSUserEnv, extraPkgs ? pkgs: [], appimage-run-tests ? null }: let fhsArgs = appimageTools.defaultFhsEnvArgs; @@ -8,4 +8,6 @@ in buildFHSUserEnv (fhsArgs // { targetPkgs = pkgs: [ appimageTools.appimage-exec ] ++ fhsArgs.targetPkgs pkgs ++ extraPkgs pkgs; runScript = "appimage-exec.sh"; + + passthru.tests.appimage-run = appimage-run-tests; }) diff --git a/pkgs/tools/package-management/appimage-run/test.nix b/pkgs/tools/package-management/appimage-run/test.nix new file mode 100644 index 00000000000..c9bc63c08a8 --- /dev/null +++ b/pkgs/tools/package-management/appimage-run/test.nix @@ -0,0 +1,24 @@ +{ runCommand, fetchurl, appimage-run, glibcLocales, file }: +let + # any AppImage usable on cli, really + sample-appImage = fetchurl { + url = "https://github.com/AppImage/AppImageKit/releases/download/12/appimagetool-x86_64.AppImage"; + sha256 = "04ws94q71bwskmhizhwmaf41ma4wabvfgjgkagr8wf3vakgv866r"; + }; +in + runCommand "appimage-run-tests" { + buildInputs = [ appimage-run glibcLocales file ]; + meta.platforms = [ "x86_64-linux" ]; + } + '' + export HOME=$(mktemp -d) + set -x + # regression test for #101137, must come first + LANG=fr_FR appimage-run ${sample-appImage} --list ${sample-appImage} + # regression test for #108426 + cp ${sample-appImage} foo.appImage + LANG=fr_FR appimage-run ${sample-appImage} --list foo.appImage + set +x + touch $out + '' + diff --git a/pkgs/tools/package-management/appimagekit/default.nix b/pkgs/tools/package-management/appimagekit/default.nix index e392d8c4a70..524f912cf04 100644 --- a/pkgs/tools/package-management/appimagekit/default.nix +++ b/pkgs/tools/package-management/appimagekit/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, pkgconfig, cmake, autoconf, automake, libtool, makeWrapper +, pkg-config, cmake, autoconf, automake, libtool, makeWrapper , wget, xxd, desktop-file-utils, file , gnupg, glib, zlib, cairo, openssl, fuse, xz, squashfuse, inotify-tools, libarchive , squashfsTools @@ -65,7 +65,7 @@ in stdenv.mkDerivation rec { patches = [ ./nix.patch ]; nativeBuildInputs = [ - pkgconfig cmake autoconf automake libtool wget xxd + pkg-config cmake autoconf automake libtool wget xxd desktop-file-utils ]; @@ -98,7 +98,7 @@ in stdenv.mkDerivation rec { cp "${desktop-file-utils}/bin/desktop-file-validate" "$out/bin" wrapProgram "$out/bin/appimagetool" \ - --prefix PATH : "${stdenv.lib.makeBinPath [ file gnupg ]}" + --prefix PATH : "${lib.makeBinPath [ file gnupg ]}" ''; checkInputs = [ gtest ]; diff --git a/pkgs/tools/package-management/apt-dater/default.nix b/pkgs/tools/package-management/apt-dater/default.nix index 296012cc68f..a15ec7e9c16 100644 --- a/pkgs/tools/package-management/apt-dater/default.nix +++ b/pkgs/tools/package-management/apt-dater/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, autoreconfHook, pkgconfig, gettext +, autoreconfHook, pkg-config, gettext , vim, glib, libxml2, ncurses, popt, screen }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig autoreconfHook gettext + pkg-config autoreconfHook gettext ]; buildInputs = [ diff --git a/pkgs/tools/package-management/apt/default.nix b/pkgs/tools/package-management/apt/default.nix index 66b16ecc046..178103cdb38 100644 --- a/pkgs/tools/package-management/apt/default.nix +++ b/pkgs/tools/package-management/apt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, cmake, perlPackages, curl, gtest +{ stdenv, lib, fetchurl, pkg-config, cmake, perlPackages, curl, gtest , gnutls, libtasn1, lzma, bzip2, lz4, zstd, libseccomp, udev , db, dpkg, libxslt, docbook_xsl, docbook_xml_dtd_45 @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { sha256 = "0gn4srqaaym85gc8nldqkv01477kdwr136an2nlpbdrsbx3y83zl"; }; - nativeBuildInputs = [ pkgconfig cmake gtest libxslt.bin ]; + nativeBuildInputs = [ pkg-config cmake gtest libxslt.bin ]; buildInputs = [ perlPackages.perl curl gnutls libtasn1 lzma bzip2 lz4 zstd libseccomp udev db dpkg diff --git a/pkgs/tools/package-management/cargo-kcov/default.nix b/pkgs/tools/package-management/cargo-kcov/default.nix index 6b825919b60..8b2dbe3e489 100644 --- a/pkgs/tools/package-management/cargo-kcov/default.nix +++ b/pkgs/tools/package-management/cargo-kcov/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , rustPlatform , fetchFromGitHub }: diff --git a/pkgs/tools/package-management/cargo-outdated/default.nix b/pkgs/tools/package-management/cargo-outdated/default.nix index a12271f5a99..80c69d74abf 100644 --- a/pkgs/tools/package-management/cargo-outdated/default.nix +++ b/pkgs/tools/package-management/cargo-outdated/default.nix @@ -2,20 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "cargo-outdated"; - version = "0.9.13"; + version = "0.9.14"; src = fetchFromGitHub { owner = "kbknapp"; repo = pname; rev = "v${version}"; - sha256 = "1dbhaaw1c3ww0s33r7z8kxks00f9gxv1ppcbmk2fbflhp7caf7fy"; + sha256 = "sha256-80H0yblEcxP6TTil0dJPZhvMivDLuyvoV0Rmcrykgjs="; }; - cargoSha256 = "0nlfn9g7hrzz72lya2p5qb8wwj66300d33hjhnw2ambpj4347rh4"; + cargoSha256 = "sha256-RACdzaCWfm5rrIX0wrvKSmhLQt1a+2MQqrjTx+etpGo="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ stdenv.lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security libiconv curl diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix index 64092ac2bb1..7a900860110 100644 --- a/pkgs/tools/package-management/cargo-release/default.nix +++ b/pkgs/tools/package-management/cargo-release/default.nix @@ -2,20 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "cargo-release"; - version = "0.13.8"; + version = "0.13.10"; src = fetchFromGitHub { owner = "sunng87"; repo = "cargo-release"; rev = "v${version}"; - sha256 = "16v93k8d1aq0as4ab1i972bjw410k07gb3s6xdzb1r019gxg2i2h"; + sha256 = "sha256-WWU+aNMNOOstHiGRE5nj2biWCL3uwyqJKgt0xCAfS0s="; }; - cargoSha256 = "1jbp8jbpxnchzinjzv36crszdipxp1myknmrxn7r0ijfjdpigk9r"; + cargoSha256 = "sha256-G3UgcFW0WxvCYRvHCTuRpSCOT3XdvdZCN53HhpWQxS4="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; + ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; meta = with lib; { description = ''Cargo subcommand "release": everything about releasing a rust crate''; diff --git a/pkgs/tools/package-management/cargo-update/default.nix b/pkgs/tools/package-management/cargo-update/default.nix index 4e376757999..892de0ade27 100644 --- a/pkgs/tools/package-management/cargo-update/default.nix +++ b/pkgs/tools/package-management/cargo-update/default.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ cmake installShellFiles pkg-config ronn ]; buildInputs = [ libgit2 libssh2 openssl zlib ] - ++ stdenv.lib.optionals stdenv.isDarwin [ curl Security ]; + ++ lib.optionals stdenv.isDarwin [ curl Security ]; postBuild = '' # Man pages contain non-ASCII, so explicitly set encoding to UTF-8. diff --git a/pkgs/tools/package-management/checkinstall/default.nix b/pkgs/tools/package-management/checkinstall/default.nix index bd23da8efb5..3a1aa5e464e 100644 --- a/pkgs/tools/package-management/checkinstall/default.nix +++ b/pkgs/tools/package-management/checkinstall/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gettext}: +{lib, stdenv, fetchurl, gettext}: assert stdenv.isLinux && stdenv ? glibc; @@ -37,7 +37,7 @@ stdenv.mkDerivation { ./set-buildroot.patch ] - ++ stdenv.lib.optional (stdenv.hostPlatform.system == "x86_64-linux") + ++ lib.optional (stdenv.hostPlatform.system == "x86_64-linux") # Force use of old memcpy so that installwatch works on Glibc < # 2.14. ./use-old-memcpy.patch; @@ -67,8 +67,8 @@ stdenv.mkDerivation { meta = { homepage = "http://checkinstall.izto.org/"; description = "A tool for automatically generating Slackware, RPM or Debian packages when doing `make install'"; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2; + maintainers = [ lib.maintainers.eelco ]; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/tools/package-management/createrepo_c/default.nix b/pkgs/tools/package-management/createrepo_c/default.nix index cc671d7329c..ed181d2484e 100644 --- a/pkgs/tools/package-management/createrepo_c/default.nix +++ b/pkgs/tools/package-management/createrepo_c/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, bzip2, expat, glib, curl, libxml2, python3, rpm, openssl, sqlite, file, xz, pcre, bash-completion }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, bzip2, expat, glib, curl, libxml2, python3, rpm, openssl, sqlite, file, xz, pcre, bash-completion }: stdenv.mkDerivation rec { pname = "createrepo_c"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { --replace "@PYTHON_INSTALL_DIR@" "$out/${python3.sitePackages}" ''; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ bzip2 expat glib curl libxml2 python3 rpm openssl sqlite file xz pcre bash-completion ]; diff --git a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix deleted file mode 100644 index b4cb6d03041..00000000000 --- a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java }: - -stdenv.mkDerivation { - name = "DisnixWebService-0.10"; - src = fetchurl { - url = "https://github.com/svanderburg/DisnixWebService/releases/download/DisnixWebService-0.10/DisnixWebService-0.10.tar.gz"; - sha256 = "0m451msd127ay09yb8rbflg68szm8s4hh65j99f7s3mz375vc114"; - }; - buildInputs = [ apacheAnt jdk ]; - PREFIX = ''''${env.out}''; - AXIS2_LIB = "${axis2}/lib"; - AXIS2_WEBAPP = "${axis2}/webapps/axis2"; - DBUS_JAVA_LIB = "${dbus_java}/share/java"; - prePatch = '' - sed -i -e "s|#JAVA_HOME=|JAVA_HOME=${jdk}|" \ - -e "s|#AXIS2_LIB=|AXIS2_LIB=${axis2}/lib|" \ - scripts/disnix-soap-client - ''; - buildPhase = "ant"; - installPhase = "ant install"; - - meta = { - description = "A SOAP interface and client for Disnix"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.sander ]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix deleted file mode 100644 index f63c7dd737c..00000000000 --- a/pkgs/tools/package-management/disnix/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, libxml2, libxslt, getopt, gettext, nixUnstable, dysnomia, libintl, libiconv, help2man, doclifter, docbook5, dblatex, doxygen, libnixxml, autoreconfHook }: - -stdenv.mkDerivation { - name = "disnix-0.10"; - - src = fetchurl { - url = "https://github.com/svanderburg/disnix/releases/download/disnix-0.10/disnix-0.10.tar.gz"; - sha256 = "0mciqbc2h60nc0i6pd36w0m2yr96v97ybrzrqzh5f67ac1f0gqwg"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib libxml2 libxslt getopt nixUnstable libintl libiconv dysnomia ]; - - meta = { - description = "A Nix-based distributed service deployment tool"; - license = stdenv.lib.licenses.lgpl21Plus; - maintainers = with stdenv.lib.maintainers; [ sander tomberek ]; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix deleted file mode 100644 index 2fa7d3ed9d7..00000000000 --- a/pkgs/tools/package-management/disnix/disnixos/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, dysnomia, disnix, socat, pkgconfig, getopt }: - -stdenv.mkDerivation { - name = "disnixos-0.9"; - - src = fetchurl { - url = "https://github.com/svanderburg/disnixos/releases/download/disnixos-0.9/disnixos-0.9.tar.gz"; - sha256 = "0vllm5a8d9dvz5cjiq1mmkc4r4vnljabq42ng0ml85sjn0w7xvm7"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ socat dysnomia disnix getopt ]; - - meta = { - description = "Provides complementary NixOS infrastructure deployment to Disnix"; - license = stdenv.lib.licenses.lgpl21Plus; - maintainers = [ stdenv.lib.maintainers.sander ]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/tools/package-management/disnix/dydisnix/default.nix b/pkgs/tools/package-management/disnix/dydisnix/default.nix deleted file mode 100644 index 552d2a106fb..00000000000 --- a/pkgs/tools/package-management/disnix/dydisnix/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool , pkgconfig, glib, libxml2, libxslt, getopt, libiconv, gettext, nix, disnix, libnixxml }: - -stdenv.mkDerivation rec { - version="2020-07-04"; - name = "dydisnix-${version}"; - - src = fetchFromGitHub { - owner = "svanderburg"; - repo = "dydisnix"; - rev = "e99091f1c2329d562097e35faedee80622d387f0"; - sha256 = "sha256-XKab2hNGtWDkIEMxE1vMvqQBTP9BvHTabBVfzpH57h0="; - }; - - nativeBuildInputs = [ pkgconfig autoconf automake libtool ]; - buildInputs = [ glib libxml2 libxslt getopt nix disnix libiconv gettext libnixxml ]; - preConfigure = '' - ./bootstrap - ''; - - meta = { - description = "A toolset enabling self-adaptive redeployment on top of Disnix"; - longDescription = "Dynamic Disnix is a (very experimental!) prototype extension framework for Disnix supporting dynamic (re)deployment of service-oriented systems."; - license = stdenv.lib.licenses.lgpl21Plus; - maintainers = [ stdenv.lib.maintainers.tomberek ]; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix deleted file mode 100644 index 031e926e78a..00000000000 --- a/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ stdenv, fetchurl, netcat -, systemd ? null, ejabberd ? null, mysql ? null, postgresql ? null, subversion ? null, mongodb ? null, mongodb-tools ? null, influxdb ? null, supervisor ? null, docker ? null -, enableApacheWebApplication ? false -, enableAxis2WebService ? false -, enableEjabberdDump ? false -, enableMySQLDatabase ? false -, enablePostgreSQLDatabase ? false -, enableSubversionRepository ? false -, enableTomcatWebApplication ? false -, enableMongoDatabase ? false -, enableInfluxDatabase ? false -, enableSupervisordProgram ? false -, enableDockerContainer ? true -, enableLegacy ? false -, catalinaBaseDir ? "/var/tomcat" -, jobTemplate ? "systemd" -, getopt -}: - -assert enableMySQLDatabase -> mysql != null; -assert enablePostgreSQLDatabase -> postgresql != null; -assert enableSubversionRepository -> subversion != null; -assert enableEjabberdDump -> ejabberd != null; -assert enableMongoDatabase -> (mongodb != null && mongodb-tools != null); -assert enableInfluxDatabase -> influxdb != null; -assert enableSupervisordProgram -> supervisor != null; -assert enableDockerContainer -> docker != null; - -stdenv.mkDerivation { - name = "dysnomia-0.10"; - src = fetchurl { - url = "https://github.com/svanderburg/dysnomia/releases/download/dysnomia-0.10/dysnomia-0.10.tar.gz"; - sha256 = "19zg4nhn0f9v4i7c9hhan1i4xv3ljfpl2d0s84ph8byiscvhyrna"; - }; - - preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else ""; - - configureFlags = [ - (if enableApacheWebApplication then "--with-apache" else "--without-apache") - (if enableAxis2WebService then "--with-axis2" else "--without-axis2") - (if enableEjabberdDump then "--with-ejabberd" else "--without-ejabberd") - (if enableMySQLDatabase then "--with-mysql" else "--without-mysql") - (if enablePostgreSQLDatabase then "--with-postgresql" else "--without-postgresql") - (if enableSubversionRepository then "--with-subversion" else "--without-subversion") - (if enableTomcatWebApplication then "--with-tomcat=${catalinaBaseDir}" else "--without-tomcat") - (if enableMongoDatabase then "--with-mongodb" else "--without-mongodb") - (if enableInfluxDatabase then "--with-influxdb" else "--without-influxdb") - (if enableSupervisordProgram then "--with-supervisord" else "--without-supervisord") - (if enableDockerContainer then "--with-docker" else "--without-docker") - "--with-job-template=${jobTemplate}" - ] ++ stdenv.lib.optional enableLegacy "--enable-legacy"; - - buildInputs = [ getopt netcat ] - ++ stdenv.lib.optional stdenv.isLinux systemd - ++ stdenv.lib.optional enableEjabberdDump ejabberd - ++ stdenv.lib.optional enableMySQLDatabase mysql.out - ++ stdenv.lib.optional enablePostgreSQLDatabase postgresql - ++ stdenv.lib.optional enableSubversionRepository subversion - ++ stdenv.lib.optional enableMongoDatabase mongodb - ++ stdenv.lib.optional enableMongoDatabase mongodb-tools - ++ stdenv.lib.optional enableInfluxDatabase influxdb - ++ stdenv.lib.optional enableSupervisordProgram supervisor - ++ stdenv.lib.optional enableDockerContainer docker; - - meta = { - description = "Automated deployment of mutable components and services for Disnix"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.sander ]; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index 96032bc0a69..459b9550b7c 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -2,19 +2,19 @@ stdenv.mkDerivation rec { pname = "dpkg"; - version = "1.20.5"; + version = "1.20.7.1"; src = fetchurl { url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz"; - sha256 = "1pg0yd1q9l5cx7pr0853yds1n3mh5b28zkw79gjqjzcmjwqkzwpj"; + sha256 = "sha256-Cq0t5of3l++OvavHuv0W3BSX8c4jvZFG+apz85alY28="; }; configureFlags = [ "--disable-dselect" "--with-admindir=/var/lib/dpkg" "PERL_LIBDIR=$(out)/${perl.libPrefix}" - (stdenv.lib.optionalString stdenv.isDarwin "--disable-linker-optimisations") - (stdenv.lib.optionalString stdenv.isDarwin "--disable-start-stop-daemon") + (lib.optionalString stdenv.isDarwin "--disable-linker-optimisations") + (lib.optionalString stdenv.isDarwin "--disable-start-stop-daemon") ]; preConfigure = '' diff --git a/pkgs/tools/package-management/elm-github-install/gemset.nix b/pkgs/tools/package-management/elm-github-install/gemset.nix index d310b41d7aa..de7f8e20b64 100644 --- a/pkgs/tools/package-management/elm-github-install/gemset.nix +++ b/pkgs/tools/package-management/elm-github-install/gemset.nix @@ -111,4 +111,4 @@ }; version = "2.0.0"; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/package-management/emplace/default.nix b/pkgs/tools/package-management/emplace/default.nix index b0015502865..1497d09734f 100644 --- a/pkgs/tools/package-management/emplace/default.nix +++ b/pkgs/tools/package-management/emplace/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "emplace"; - version = "0.3.9"; + version = "0.4.3"; src = fetchFromGitHub { owner = "tversteeg"; repo = pname; rev = "v${version}"; - sha256 = "173nj6fx2l15shy7s4dngnfqsa10m7qwhi2ia2rr421l7b24ixqq"; + sha256 = "sha256-Qx989u2893Jv4/ZUdSqZk+q/FUjo0GDoVzeS63AO2HA="; }; - cargoSha256 = "0bjw3fvc430b1jxla25clr75c94p2ms7d94j72d8mirxsiklgsp9"; + cargoSha256 = "sha256-s0RIEZw8FOdKqMXgDPNXmqp7V6flzE8eF1J/rSK+qKs="; meta = with lib; { description = "Mirror installed software on multiple machines"; diff --git a/pkgs/tools/package-management/fpm/gemset.nix b/pkgs/tools/package-management/fpm/gemset.nix index 13d1669e540..654a640c6ec 100644 --- a/pkgs/tools/package-management/fpm/gemset.nix +++ b/pkgs/tools/package-management/fpm/gemset.nix @@ -154,4 +154,4 @@ }; version = "0.0.23"; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/package-management/gx/default.nix b/pkgs/tools/package-management/gx/default.nix index 920b23f36ab..60fbdd4941f 100644 --- a/pkgs/tools/package-management/gx/default.nix +++ b/pkgs/tools/package-management/gx/default.nix @@ -1,5 +1,5 @@ # This file was generated by go2nix. -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gx"; diff --git a/pkgs/tools/package-management/gx/go/default.nix b/pkgs/tools/package-management/gx/go/default.nix index dd14976e633..ad4435c9e2d 100644 --- a/pkgs/tools/package-management/gx/go/default.nix +++ b/pkgs/tools/package-management/gx/go/default.nix @@ -1,5 +1,5 @@ # This file was generated by go2nix. -{ lib, stdenv, buildGoPackage, fetchFromGitHub +{ lib, buildGoPackage, fetchFromGitHub , gx }: diff --git a/pkgs/tools/package-management/home-manager/default.nix b/pkgs/tools/package-management/home-manager/default.nix index b8b4de36eb4..8897a313e8d 100644 --- a/pkgs/tools/package-management/home-manager/default.nix +++ b/pkgs/tools/package-management/home-manager/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "home-manager"; - version = "2020-09-06"; + version = "2021-01-16"; src = fetchFromGitHub { owner = "nix-community"; repo = "home-manager"; - rev = "249650a07ee2d949fa599f3177a8c234adbd1bee"; - sha256 = "0x858b7i15kx74aqwgi2n5ls7zjhcky95z9vbxfdlawmaz371dma"; + rev = "8127799f79ee96129b295d78294f40a54078131f"; + sha256 = "0iji8nxa66s409pvjwi370ycsw4m74w6b3ywnjpfkl2filpapjns"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/package-management/libdnf/default.nix b/pkgs/tools/package-management/libdnf/default.nix index c93f3031e82..08702e8bf6b 100644 --- a/pkgs/tools/package-management/libdnf/default.nix +++ b/pkgs/tools/package-management/libdnf/default.nix @@ -12,7 +12,7 @@ gcc9Stdenv.mkDerivation rec { sha256 = "0hiydwfa90nsrqk5ffa6ks1g73wnsgjgq7z7gwq9jj76a7gpfbfq"; }; - patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin.patch ]; + patches = lib.optionals stdenv.isDarwin [ ./darwin.patch ]; nativeBuildInputs = [ cmake diff --git a/pkgs/tools/package-management/librepo/default.nix b/pkgs/tools/package-management/librepo/default.nix index 64a5bc32b5c..9ec5c3c13b3 100644 --- a/pkgs/tools/package-management/librepo/default.nix +++ b/pkgs/tools/package-management/librepo/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , cmake , python -, pkgconfig +, pkg-config , libxml2 , glib , openssl @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config ]; buildInputs = [ @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { libxml2 ]; - cmakeFlags = [ "-DPYTHON_DESIRED=${stdenv.lib.substring 0 1 python.pythonVersion}" ]; + cmakeFlags = [ "-DPYTHON_DESIRED=${lib.substring 0 1 python.pythonVersion}" ]; postFixup = '' moveToOutput "lib/${python.libPrefix}" "$py" diff --git a/pkgs/tools/package-management/licensee/gemset.nix b/pkgs/tools/package-management/licensee/gemset.nix index 2ec00c621ca..281f9376e17 100644 --- a/pkgs/tools/package-management/licensee/gemset.nix +++ b/pkgs/tools/package-management/licensee/gemset.nix @@ -136,4 +136,4 @@ }; version = "1.0.1"; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/package-management/microdnf/default.nix b/pkgs/tools/package-management/microdnf/default.nix index af5d50460c1..8e866abb3cc 100644 --- a/pkgs/tools/package-management/microdnf/default.nix +++ b/pkgs/tools/package-management/microdnf/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "Lightweight implementation of dnf in C"; homepage = "https://github.com/rpm-software-management/microdnf"; license = licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ rb2k ]; + maintainers = with lib.maintainers; [ rb2k ]; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/tools/package-management/morph/deps.nix b/pkgs/tools/package-management/morph/deps.nix index 4da6f0278b7..fdae5ef39ee 100644 --- a/pkgs/tools/package-management/morph/deps.nix +++ b/pkgs/tools/package-management/morph/deps.nix @@ -63,4 +63,4 @@ sha256 = "06xrp05njwam4sn031fkmd4gym5wfsw5q0v24nqhs4883lsx9dwq"; }; } -] \ No newline at end of file +] diff --git a/pkgs/tools/package-management/mynewt-newt/default.nix b/pkgs/tools/package-management/mynewt-newt/default.nix index 2390c33ca03..dd5c36019f2 100644 --- a/pkgs/tools/package-management/mynewt-newt/default.nix +++ b/pkgs/tools/package-management/mynewt-newt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, fetchpatch }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: buildGoModule rec { pname = "mynewt-newt"; diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix index fff774d2aef..d22b4216ea9 100644 --- a/pkgs/tools/package-management/nfpm/default.nix +++ b/pkgs/tools/package-management/nfpm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nfpm"; - version = "2.2.2"; + version = "2.2.3"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "0qv7xw74hf4fzi7v40fpgjyf01dyz6665dmd2pacpd9n6klnr1h3"; + sha256 = "sha256-F3SDcO5E0d5/aEJLdy0fJqB6brwf4C9Imtk1R5zOT5A="; }; - vendorSha256 = "0mdh4qrafdxlqqh0kl7wil7w3g5p499qi3yiw8znjkd49g85ws3w"; + vendorSha256 = "sha256-fGhe0EukTWk/4tGPiFMit7zBD4380AkgxrQ3pzImsFU="; doCheck = false; diff --git a/pkgs/tools/package-management/niff/default.nix b/pkgs/tools/package-management/niff/default.nix index 9d3736f6faa..93406095df2 100644 --- a/pkgs/tools/package-management/niff/default.nix +++ b/pkgs/tools/package-management/niff/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , python3 , fetchFromGitHub }: @@ -28,7 +28,7 @@ in stdenv.mkDerivation { meta = { description = "A program that compares two Nix expressions and determines which attributes changed"; homepage = "https://github.com/FRidh/niff"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.fridh ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.fridh ]; }; } diff --git a/pkgs/tools/package-management/nix-doc/default.nix b/pkgs/tools/package-management/nix-doc/default.nix index 66691d9f5c5..695cd2976d8 100644 --- a/pkgs/tools/package-management/nix-doc/default.nix +++ b/pkgs/tools/package-management/nix-doc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, boost, nix, pkg-config }: +{ lib, rustPlatform, fetchFromGitHub, boost, nix, pkg-config }: rustPlatform.buildRustPackage rec { pname = "nix-doc"; diff --git a/pkgs/tools/package-management/nix-du/default.nix b/pkgs/tools/package-management/nix-du/default.nix index 0e4ad412e67..2b07827c4ab 100644 --- a/pkgs/tools/package-management/nix-du/default.nix +++ b/pkgs/tools/package-management/nix-du/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ boost nix - ] ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; meta = with lib; { description = "A tool to determine which gc-roots take space in your nix store"; diff --git a/pkgs/tools/package-management/nix-index/default.nix b/pkgs/tools/package-management/nix-index/default.nix index af46c51235e..07d0e9f3a9d 100644 --- a/pkgs/tools/package-management/nix-index/default.nix +++ b/pkgs/tools/package-management/nix-index/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, pkgconfig, makeWrapper, openssl, curl +{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, makeWrapper, openssl, curl , nix, Security }: @@ -15,9 +15,9 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0apdr9z18p6m4lfjv8k9zv2mqc7vssd2d536zfv1pns0pdqsfw50"; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ openssl curl ] - ++ stdenv.lib.optional stdenv.isDarwin Security; + ++ lib.optional stdenv.isDarwin Security; doCheck = !stdenv.isDarwin; @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { substituteInPlace $out/etc/profile.d/command-not-found.sh \ --replace "@out@" "$out" wrapProgram $out/bin/nix-index \ - --prefix PATH : "${stdenv.lib.makeBinPath [ nix ]}" + --prefix PATH : "${lib.makeBinPath [ nix ]}" ''; meta = with lib; { diff --git a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix index 1b4ecc8afec..8b318306873 100644 --- a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix +++ b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix @@ -13,7 +13,7 @@ let mkPrefetchScript = tool: src: deps: installPhase = '' install -vD ${src} $out/bin/$name; wrapProgram $out/bin/$name \ - --prefix PATH : ${stdenv.lib.makeBinPath (deps ++ [ gnused nix ])} \ + --prefix PATH : ${lib.makeBinPath (deps ++ [ gnused nix ])} \ --set HOME /homeless-shelter ''; @@ -22,7 +22,7 @@ let mkPrefetchScript = tool: src: deps: meta = with lib; { description = "Script used to obtain source hashes for fetch${tool}"; maintainers = with maintainers; [ bennofs ]; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; }; in rec { @@ -40,7 +40,7 @@ in rec { meta = with lib; { description = "Collection of all the nix-prefetch-* scripts which may be used to obtain source hashes"; maintainers = with maintainers; [ bennofs ]; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; }; } diff --git a/pkgs/tools/package-management/nix-prefetch/default.nix b/pkgs/tools/package-management/nix-prefetch/default.nix index fb19d3dac6a..320d41068cc 100644 --- a/pkgs/tools/package-management/nix-prefetch/default.nix +++ b/pkgs/tools/package-management/nix-prefetch/default.nix @@ -1,39 +1,25 @@ { lib, stdenv, fetchFromGitHub, installShellFiles, makeWrapper, asciidoc , docbook_xml_dtd_45, git, docbook_xsl, libxml2, libxslt, coreutils, gawk -, gnugrep, gnused, jq, nix, fetchpatch }: +, gnugrep, gnused, jq, nix }: let - binPath = stdenv.lib.makeBinPath [ coreutils gawk git gnugrep gnused jq nix ]; + binPath = lib.makeBinPath [ coreutils gawk git gnugrep gnused jq nix ]; in stdenv.mkDerivation rec { pname = "nix-prefetch"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "msteen"; repo = "nix-prefetch"; rev = version; - sha256 = "15h6f743nn6sdq8l771sjxh92cyzqznkcs7szrc7nm066xvx8rd4"; + sha256 = "11792677zyi06jw641xi9aywwgh9002b8406w6qids212c14va6n"; # the stat call has to be in a subshell or we get the current date extraPostFetch = '' echo $(stat -c %Y $out) > $out/.timestamp ''; }; - patches = [ - # Fix compatibility with nixUnstable - # https://github.com/msteen/nix-prefetch/pull/9 - (fetchpatch { - url = "https://github.com/msteen/nix-prefetch/commit/2722cda48ab3f4795105578599b29fc99518eff4.patch"; - sha256 = "037m388sbl72kyqnk86mw7lhjhj9gzfglw3ri398ncfmmkq8b7r4"; - }) - # https://github.com/msteen/nix-prefetch/pull/12 - (fetchpatch { - url = "https://github.com/msteen/nix-prefetch/commit/de96564e9f28df82bccd0584953094e7dbe87e20.patch"; - sha256 = "0mxai6w8cfs7k8wfbsrpg5hwkyb0fj143nm0v142am0ky8ahn0d9"; - }) - ]; - postPatch = '' lib=$out/lib/${pname} diff --git a/pkgs/tools/package-management/nix-serve/default.nix b/pkgs/tools/package-management/nix-serve/default.nix index fccfbe98f78..d468b2d2ade 100644 --- a/pkgs/tools/package-management/nix-serve/default.nix +++ b/pkgs/tools/package-management/nix-serve/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, +{ lib, stdenv, fetchFromGitHub, bzip2, nix, perl, perlPackages, }: -with stdenv.lib; +with lib; let rev = "e4675e38ab54942e351c7686e40fabec822120b9"; diff --git a/pkgs/tools/package-management/nix-simple-deploy/default.nix b/pkgs/tools/package-management/nix-simple-deploy/default.nix index 47734f73fd6..91f9a39514b 100644 --- a/pkgs/tools/package-management/nix-simple-deploy/default.nix +++ b/pkgs/tools/package-management/nix-simple-deploy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "nix-simple-deploy"; diff --git a/pkgs/tools/package-management/nix-top/default.nix b/pkgs/tools/package-management/nix-top/default.nix index 0a003ba6b6b..da64ec138a6 100644 --- a/pkgs/tools/package-management/nix-top/default.nix +++ b/pkgs/tools/package-management/nix-top/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { install -D -m755 ./nix-top $out/bin/nix-top wrapProgram $out/bin/nix-top \ --prefix PATH : "$out/libexec/nix-top:${additionalPath}" - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' ln -s /bin/stty $out/libexec/nix-top ''; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index d997a0a87d6..9ab08007ec7 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -3,6 +3,7 @@ , stateDir ? "/nix/var" , confDir ? "/etc" , boehmgc +, Security }: let @@ -10,7 +11,7 @@ let common = { lib, stdenv, perl, curl, bzip2, sqlite, openssl ? null, xz , bash, coreutils, gzip, gnutar - , pkgconfig, boehmgc, perlPackages, libsodium, brotli, boost, editline, nlohmann_json + , pkg-config, boehmgc, perlPackages, libsodium, brotli, boost, editline, nlohmann_json , autoreconfHook, autoconf-archive, bison, flex , jq, libarchive , lowdown, mdbook @@ -39,12 +40,12 @@ common = outputs = [ "out" "dev" "man" "doc" ]; nativeBuildInputs = - [ pkgconfig ] + [ pkg-config ] ++ lib.optionals is24 [ autoreconfHook autoconf-archive bison flex - lowdown mdbook + (lib.getBin lowdown) mdbook jq ]; @@ -52,8 +53,9 @@ common = [ curl openssl sqlite xz bzip2 nlohmann_json brotli boost editline ] + ++ lib.optionals stdenv.isDarwin [ Security ] ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium - ++ lib.optionals is24 [ libarchive gmock ] + ++ lib.optionals is24 [ libarchive gmock lowdown ] ++ lib.optional withLibseccomp libseccomp ++ lib.optional withAWS ((aws-sdk-cpp.override { @@ -124,7 +126,7 @@ common = ] ++ lib.optional ( stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform ? nix && stdenv.hostPlatform.nix ? system - ) ''--with-system=${stdenv.hostPlatform.nix.system}'' + ) "--with-system=${stdenv.hostPlatform.nix.system}" # RISC-V support in progress https://github.com/seccomp/libseccomp/pull/50 ++ lib.optional (!withLibseccomp) "--disable-seccomp-sandboxing"; @@ -154,9 +156,9 @@ common = environments. ''; homepage = "https://nixos.org/"; - license = stdenv.lib.licenses.lgpl2Plus; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.lgpl2Plus; + maintainers = [ lib.maintainers.eelco ]; + platforms = lib.platforms.unix; outputsToInstall = [ "out" "man" ]; }; @@ -172,7 +174,7 @@ common = # This is not cross-compile safe, don't have time to fix right now # but noting for future travellers. nativeBuildInputs = - [ perl pkgconfig curl nix libsodium boost autoreconfHook autoconf-archive nlohmann_json ]; + [ perl pkg-config curl nix libsodium boost autoreconfHook autoconf-archive nlohmann_json ]; configureFlags = [ "--with-dbi=${perlPackages.DBI}/${perl.libPrefix}" @@ -224,6 +226,12 @@ in rec { url = "https://github.com/NixOS/nix/commit/d4870462f8f539adeaa6dca476aff6f1f31e1981.patch"; sha256 = "mTvLvuxb2QVybRDgntKMq+b6da/s3YgM/ll2rWBeY/Y="; }) + # Fix the ETag bug. PR merged. Remove when updating to >= 20210125 + # https://github.com/NixOS/nixpkgs/pull/109309#issuecomment-768331750 + (fetchpatch { + url = "https://github.com/NixOS/nix/commit/c5b42c5a42138329c6d02da0d8a53cb59c6077f4.patch"; + sha256 = "sha256-d4RNOKMxa4NMbFgYcqWRv2ByHt8F/XUWV+6P9qHz7S4="; + }) ]; inherit storeDir stateDir confDir boehmgc; diff --git a/pkgs/tools/package-management/nixpkgs-review/default.nix b/pkgs/tools/package-management/nixpkgs-review/default.nix index b1a86f3137e..d3fcac6277f 100644 --- a/pkgs/tools/package-management/nixpkgs-review/default.nix +++ b/pkgs/tools/package-management/nixpkgs-review/default.nix @@ -1,9 +1,8 @@ -{ stdenv +{ lib , python3 , fetchFromGitHub , nixFlakes , git -, lib }: python3.pkgs.buildPythonApplication rec { diff --git a/pkgs/tools/package-management/nixui/default.nix b/pkgs/tools/package-management/nixui/default.nix index 12bf229580f..0e6ff9ec705 100644 --- a/pkgs/tools/package-management/nixui/default.nix +++ b/pkgs/tools/package-management/nixui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, fetchgit, nix, node_webkit, makeDesktopItem +{ lib, stdenv, pkgs, fetchgit, nix, node_webkit, makeDesktopItem , writeScript }: let version = "0.2.1"; @@ -37,8 +37,8 @@ stdenv.mkDerivation { meta = { description = "NodeWebkit user interface for Nix"; homepage = "https://github.com/matejc/nixui"; - license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.matejc ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.matejc ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/package-management/nixui/nixui.nix b/pkgs/tools/package-management/nixui/nixui.nix index 055fc5267c3..c98d9b58e6e 100644 --- a/pkgs/tools/package-management/nixui/nixui.nix +++ b/pkgs/tools/package-management/nixui/nixui.nix @@ -6,7 +6,7 @@ let nodeEnv = import ../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile; + inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile; inherit nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; @@ -14,4 +14,4 @@ in import ./node-packages.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} \ No newline at end of file +} diff --git a/pkgs/tools/package-management/opkg/default.nix b/pkgs/tools/package-management/opkg/default.nix index 4178e7d9707..c4fc804b80f 100644 --- a/pkgs/tools/package-management/opkg/default.nix +++ b/pkgs/tools/package-management/opkg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, curl, gpgme, libarchive, bzip2, lzma, attr, acl, libxml2 +{ lib, stdenv, fetchurl, pkg-config, curl, gpgme, libarchive, bzip2, lzma, attr, acl, libxml2 , autoreconfHook }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "06278gmb26b9nl8l328cc2c2mhfi0dhac65syws17kf09f2m596x"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ curl gpgme libarchive bzip2 lzma attr acl libxml2 ]; meta = with lib; { diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix index 05877979e9c..b62597e7e50 100644 --- a/pkgs/tools/package-management/packagekit/default.nix +++ b/pkgs/tools/package-management/packagekit/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, lib -, intltool, glib, pkgconfig, polkit, python3, sqlite +, intltool, glib, pkg-config, polkit, python3, sqlite , gobject-introspection, vala, gtk-doc, autoreconfHook, autoconf-archive , nix, enableNixBackend ? false, boost , enableCommandNotFound ? false @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ sqlite boost ] ++ lib.optional enableNixBackend nix; - nativeBuildInputs = [ vala intltool pkgconfig autoreconfHook autoconf-archive gtk-doc ]; + nativeBuildInputs = [ vala intltool pkg-config autoreconfHook autoconf-archive gtk-doc ]; preAutoreconf = '' gtkdocize diff --git a/pkgs/tools/package-management/packagekit/qt.nix b/pkgs/tools/package-management/packagekit/qt.nix index f95a37ae723..d1d135c1579 100644 --- a/pkgs/tools/package-management/packagekit/qt.nix +++ b/pkgs/tools/package-management/packagekit/qt.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig +{ stdenv, fetchFromGitHub, cmake, pkg-config , qttools, packagekit }: stdenv.mkDerivation rec { @@ -14,7 +14,9 @@ stdenv.mkDerivation rec { buildInputs = [ packagekit ]; - nativeBuildInputs = [ cmake pkgconfig qttools ]; + nativeBuildInputs = [ cmake pkg-config qttools ]; + + dontWrapQtApps = true; meta = packagekit.meta // { description = "System to facilitate installing and updating packages - Qt"; diff --git a/pkgs/tools/package-management/pacman/default.nix b/pkgs/tools/package-management/pacman/default.nix index 980f0d1e0c9..771454cd409 100644 --- a/pkgs/tools/package-management/pacman/default.nix +++ b/pkgs/tools/package-management/pacman/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, m4, perl, libarchive, openssl, zlib, bzip2, +{ stdenv, lib, fetchurl, pkg-config, m4, perl, libarchive, openssl, zlib, bzip2, lzma, curl, runtimeShell }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { installFlags = [ "sysconfdir=${placeholder "out"}/etc" ]; - nativeBuildInputs = [ pkgconfig m4 ]; + nativeBuildInputs = [ pkg-config m4 ]; buildInputs = [ curl perl libarchive openssl zlib bzip2 lzma ]; postFixup = '' diff --git a/pkgs/tools/package-management/python2nix/default.nix b/pkgs/tools/package-management/python2nix/default.nix index ceb919ecb82..b6ffe9abc02 100644 --- a/pkgs/tools/package-management/python2nix/default.nix +++ b/pkgs/tools/package-management/python2nix/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, fetchFromGitHub, pythonPackages }: +{ lib, fetchFromGitHub, pythonPackages }: pythonPackages.buildPythonApplication { name = "python2nix-20140927"; - + src = fetchFromGitHub { owner = "proger"; repo = "python2nix"; diff --git a/pkgs/tools/package-management/reuse/default.nix b/pkgs/tools/package-management/reuse/default.nix index 01a1bf4a933..af072de3e14 100644 --- a/pkgs/tools/package-management/reuse/default.nix +++ b/pkgs/tools/package-management/reuse/default.nix @@ -1,19 +1,17 @@ { lib, python3Packages, fetchFromGitHub }: -with python3Packages; - -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "reuse"; - version = "0.11.1"; + version = "0.12.1"; src = fetchFromGitHub { owner = "fsfe"; repo = "reuse-tool"; rev = "v${version}"; - sha256 = "0wkk107s0bpvbknapns0qdzf8csrzc2j6gliy6pa8z208fcfzyy3"; + sha256 = "0ql0krnz0fmq405r2qrm9ysm3cvmqfw14j06pny6na7qshibj78z"; }; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3Packages; [ binaryornot boolean-py debian @@ -24,7 +22,7 @@ buildPythonApplication rec { setuptools_scm ]; - checkInputs = [ pytest ]; + checkInputs = with python3Packages; [ pytestCheckHook ]; meta = with lib; { description = "A tool for compliance with the REUSE Initiative recommendations"; diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index 2f2080358e5..5c72dc07152 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchpatch -, pkgconfig, autoreconfHook +, pkg-config, autoreconfHook , fetchurl, cpio, zlib, bzip2, file, elfutils, libbfd, libgcrypt, libarchive, nspr, nss, popt, db, xz, python, lua, llvmPackages -, sqlite +, sqlite, zstd }: stdenv.mkDerivation rec { @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ cpio zlib bzip2 file libarchive libgcrypt nspr nss db xz python lua sqlite ] + nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ cpio zlib zstd bzip2 file libarchive libgcrypt nspr nss db xz python lua sqlite ] ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]; # rpm/rpmlib.h includes popt.h, and then the pkg-config file mentions these as linkage requirements propagatedBuildInputs = [ popt nss db bzip2 libarchive libbfd ] - ++ stdenv.lib.optional stdenv.isLinux elfutils; + ++ lib.optional stdenv.isLinux elfutils; NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss"; @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { "--enable-python" "--enable-ndb" "--enable-sqlite" + "--enable-zstd" "--localstatedir=/var" "--sharedstatedir=/com" ]; diff --git a/pkgs/tools/package-management/xbps/default.nix b/pkgs/tools/package-management/xbps/default.nix index 19fbe8ae43d..46aaf4a94d6 100644 --- a/pkgs/tools/package-management/xbps/default.nix +++ b/pkgs/tools/package-management/xbps/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, which, zlib, openssl, libarchive }: +{ lib, stdenv, fetchFromGitHub, pkg-config, which, zlib, openssl, libarchive }: stdenv.mkDerivation rec { pname = "xbps"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0pab3xf97y4wqlyrb92zxd3cfsrbnlx6pssbw4brgwcxccw9jrhy"; }; - nativeBuildInputs = [ pkgconfig which ]; + nativeBuildInputs = [ pkg-config which ]; buildInputs = [ zlib openssl libarchive ]; diff --git a/pkgs/tools/security/1password-gui/default.nix b/pkgs/tools/security/1password-gui/default.nix index d9f7a7c7d33..7c3495e608e 100644 --- a/pkgs/tools/security/1password-gui/default.nix +++ b/pkgs/tools/security/1password-gui/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "1password"; - version = "0.9.7"; + version = "0.9.11-3"; src = fetchurl { url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage"; - hash = "sha256-JaYFJL24Pgwh5CrsKjJPL8u0fx1x0beFTK+EGNT1iqA="; + hash = "sha256-vkW0LphgJsIVsdI7CjA2hOvxnjO77GA5eEKElIR4PkU="; }; nativeBuildInputs = [ makeWrapper ]; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { # Wrap the application with Electron. makeWrapper "${electron_11}/bin/electron" "$out/bin/${pname}" \ --add-flags "$out/share/${pname}/resources/app.asar" \ - --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath runtimeLibs}" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeLibs}" ''; passthru.updateScript = ./update.sh; diff --git a/pkgs/tools/security/2fa/default.nix b/pkgs/tools/security/2fa/default.nix index 41e4439eeb3..b06454e736c 100644 --- a/pkgs/tools/security/2fa/default.nix +++ b/pkgs/tools/security/2fa/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - version = "1.1.0"; + version = "1.2.0"; pname = "2fa"; goPackagePath = "rsc.io/2fa"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "rsc"; repo = "2fa"; rev = "v${version}"; - sha256 = "0827vl2bxd6m2rbj00x7857cs7cic3mlg5nlhqzd0n73dm5vk2za"; + sha256 = "sha256-cB5iADZwvJQwwK1GockE2uicFlqFMEAY6xyeXF5lnUY="; }; meta = with lib; { diff --git a/pkgs/tools/security/acsccid/default.nix b/pkgs/tools/security/acsccid/default.nix index df30d18edfc..da461a96957 100644 --- a/pkgs/tools/security/acsccid/default.nix +++ b/pkgs/tools/security/acsccid/default.nix @@ -6,7 +6,7 @@ , gettext , flex , perl -, pkgconfig +, pkg-config , pcsclite , libusb1 , libiconv @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config autoconf automake libtool @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { buildInputs = [ pcsclite libusb1 - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; diff --git a/pkgs/tools/security/aespipe/default.nix b/pkgs/tools/security/aespipe/default.nix index f0a1dbbf7ac..f2244f98d54 100644 --- a/pkgs/tools/security/aespipe/default.nix +++ b/pkgs/tools/security/aespipe/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { postInstall = '' cp bz2aespipe $out/bin wrapProgram $out/bin/bz2aespipe \ - --prefix PATH : $out/bin:${stdenv.lib.makeBinPath [ sharutils ]} + --prefix PATH : $out/bin:${lib.makeBinPath [ sharutils ]} ''; meta = with lib; { diff --git a/pkgs/tools/security/afl/default.nix b/pkgs/tools/security/afl/default.nix index 091b52bfcf0..056aa3b07fd 100644 --- a/pkgs/tools/security/afl/default.nix +++ b/pkgs/tools/security/afl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, callPackage, makeWrapper +{ lib, stdenv, fetchFromGitHub, callPackage, makeWrapper , clang, llvm, which, libcgroup }: @@ -74,9 +74,9 @@ let testing regimes down the road. ''; homepage = "https://lcamtuf.coredump.cx/afl/"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; platforms = ["x86_64-linux" "i686-linux"]; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice ris ]; + maintainers = with lib.maintainers; [ thoughtpolice ris ]; }; }; in afl diff --git a/pkgs/tools/security/afl/libdislocator.nix b/pkgs/tools/security/afl/libdislocator.nix index 1c22c7d1d24..400464c0056 100644 --- a/pkgs/tools/security/afl/libdislocator.nix +++ b/pkgs/tools/security/afl/libdislocator.nix @@ -1,7 +1,7 @@ { lib, stdenv, afl}: stdenv.mkDerivation { - version = stdenv.lib.getVersion afl; + version = lib.getVersion afl; pname = "libdislocator"; src = afl.src; @@ -28,7 +28,7 @@ stdenv.mkDerivation { the odds of bumping into heap-related security bugs in several ways. ''; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; maintainers = with maintainers; [ ris ]; }; } diff --git a/pkgs/tools/security/afl/qemu.nix b/pkgs/tools/security/afl/qemu.nix index 31aac2430b8..b88da7599d1 100644 --- a/pkgs/tools/security/afl/qemu.nix +++ b/pkgs/tools/security/afl/qemu.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, fetchurl, afl, python2, zlib, pkgconfig, glib, perl +{ lib, stdenv, fetchurl, afl, python2, zlib, pkg-config, glib, perl , texinfo, libuuid, flex, bison, pixman, autoconf }: -with stdenv.lib; +with lib; let qemuName = "qemu-2.10.0"; @@ -34,7 +34,7 @@ stdenv.mkDerivation { ''; nativeBuildInputs = [ - python2 perl pkgconfig flex bison autoconf texinfo + python2 perl pkg-config flex bison autoconf texinfo ]; buildInputs = [ diff --git a/pkgs/tools/security/aflplusplus/default.nix b/pkgs/tools/security/aflplusplus/default.nix index 8e5db3cd22c..79a0779e60a 100644 --- a/pkgs/tools/security/aflplusplus/default.nix +++ b/pkgs/tools/security/aflplusplus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, stdenvNoCC, fetchFromGitHub, callPackage, makeWrapper +{ lib, stdenv, stdenvNoCC, fetchFromGitHub, callPackage, makeWrapper , clang, llvm, gcc, which, libcgroup, python, perl, gmp , file, wine ? null, fetchpatch }: @@ -31,7 +31,7 @@ let # script. nativeBuildInputs = [ makeWrapper which clang gcc ]; buildInputs = [ llvm python gmp ] - ++ stdenv.lib.optional (wine != null) python.pkgs.wrapPython; + ++ lib.optional (wine != null) python.pkgs.wrapPython; postPatch = '' @@ -91,7 +91,7 @@ let patchShebangs $out/bin - '' + stdenv.lib.optionalString (wine != null) '' + '' + lib.optionalString (wine != null) '' substitute afl-wine-trace $out/bin/afl-wine-trace \ --replace "qemu_mode/unsigaction" "$out/lib/afl" chmod +x $out/bin/afl-wine-trace @@ -128,9 +128,9 @@ let and improvements from the community ''; homepage = "https://aflplus.plus"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; platforms = ["x86_64-linux" "i686-linux"]; - maintainers = with stdenv.lib.maintainers; [ ris mindavi ]; + maintainers = with lib.maintainers; [ ris mindavi ]; }; }; in aflplusplus diff --git a/pkgs/tools/security/aflplusplus/libdislocator.nix b/pkgs/tools/security/aflplusplus/libdislocator.nix index 99f9d51ea7e..ed695a7a702 100644 --- a/pkgs/tools/security/aflplusplus/libdislocator.nix +++ b/pkgs/tools/security/aflplusplus/libdislocator.nix @@ -1,7 +1,7 @@ { lib, stdenv, aflplusplus}: stdenv.mkDerivation { - version = stdenv.lib.getVersion aflplusplus; + version = lib.getVersion aflplusplus; pname = "libdislocator"; src = aflplusplus.src; @@ -31,7 +31,7 @@ stdenv.mkDerivation { the odds of bumping into heap-related security bugs in several ways. ''; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; maintainers = with maintainers; [ ris ]; }; } diff --git a/pkgs/tools/security/aflplusplus/libtokencap.nix b/pkgs/tools/security/aflplusplus/libtokencap.nix index 87e06ed9aeb..f3ea5d4ec6b 100644 --- a/pkgs/tools/security/aflplusplus/libtokencap.nix +++ b/pkgs/tools/security/aflplusplus/libtokencap.nix @@ -1,7 +1,7 @@ { lib, stdenv, aflplusplus}: stdenv.mkDerivation { - version = stdenv.lib.getVersion aflplusplus; + version = lib.getVersion aflplusplus; pname = "libtokencap"; src = aflplusplus.src; @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://github.com/vanhauser-thc/AFLplusplus"; description = "strcmp & memcmp token capture library"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; maintainers = with maintainers; [ ris ]; }; } diff --git a/pkgs/tools/security/aflplusplus/qemu.nix b/pkgs/tools/security/aflplusplus/qemu.nix index cc6bf3a83ef..0a98f27182b 100644 --- a/pkgs/tools/security/aflplusplus/qemu.nix +++ b/pkgs/tools/security/aflplusplus/qemu.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, fetchurl, aflplusplus, python2, zlib, pkgconfig, glib, perl +{ lib, stdenv, fetchurl, aflplusplus, python2, zlib, pkg-config, glib, perl , texinfo, libuuid, flex, bison, pixman, autoconf }: -with stdenv.lib; +with lib; let qemuName = "qemu-3.1.0"; @@ -44,7 +44,7 @@ stdenv.mkDerivation { ''; nativeBuildInputs = [ - python2 perl pkgconfig flex bison autoconf texinfo + python2 perl pkg-config flex bison autoconf texinfo ]; buildInputs = [ diff --git a/pkgs/tools/security/age/default.nix b/pkgs/tools/security/age/default.nix index 4eb88211d6d..74a2bb7a620 100644 --- a/pkgs/tools/security/age/default.nix +++ b/pkgs/tools/security/age/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "age"; - version = "1.0.0-beta5"; - vendorSha256 = "0km7a2826j3fk2nrkmgc990chrkcfz006wfw14yilsa4p2hmfl7m"; + version = "1.0.0-beta6"; + vendorSha256 = "sha256-FTByNpLkWWHAWe5wVDRBGtKap/5+XGHeBMQAIdlPCkA="; src = fetchFromGitHub { owner = "FiloSottile"; repo = "age"; rev = "v${version}"; - sha256 = "1hdbxd359z8zvnz7h8c4pa16nc7r8db36lx3gpks38lpi0r8hzqk"; + sha256 = "sha256-1LCcCEf2/R0am0jpA8yKl44+AoUFkbepxp9V6/nZkBQ="; }; meta = with lib; { diff --git a/pkgs/tools/security/aide/default.nix b/pkgs/tools/security/aide/default.nix index 49291775e37..8993208e16e 100644 --- a/pkgs/tools/security/aide/default.nix +++ b/pkgs/tools/security/aide/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "aide"; - version = "0.16.2"; + version = "0.17"; src = fetchurl { url = "https://github.com/aide/aide/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "15xp47sz7kk1ciffw3f5xw2jg2mb2lqrbr3q6p4bkbz5dap9iy8p"; + sha256 = "sha256-T9iNHV3ccMaYxlGeu8BcjTLD9tgTe7/e/q66r9bbhns="; }; buildInputs = [ flex bison libmhash zlib acl attr libselinux pcre ]; diff --git a/pkgs/tools/security/aiodnsbrute/default.nix b/pkgs/tools/security/aiodnsbrute/default.nix new file mode 100644 index 00000000000..77f03e4174f --- /dev/null +++ b/pkgs/tools/security/aiodnsbrute/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonApplication +, fetchFromGitHub +, aiodns +, click +, tqdm +, uvloop +}: + +buildPythonApplication rec { + pname = "aiodnsbrute"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "blark"; + repo = pname; + rev = "v${version}"; + sha256 = "0fs8544kx7vwvc97zpg4rs3lmvnb4vwika5g952rv3bfx4rv3bpg"; + }; + + # https://github.com/blark/aiodnsbrute/pull/8 + prePatch = '' + substituteInPlace setup.py --replace " 'asyncio', " "" + ''; + + propagatedBuildInputs = [ + aiodns + click + tqdm + uvloop + ]; + + # no tests present + doCheck = false; + + pythonImportsCheck = [ "aiodnsbrute.cli" ]; + + meta = with lib; { + description = "DNS brute force utility"; + homepage = "https://github.com/blark/aiodnsbrute"; + # https://github.com/blark/aiodnsbrute/issues/5 + license = with licenses; [ gpl3Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/apg/default.nix b/pkgs/tools/security/apg/default.nix index 1dcdeae832d..579026f07ca 100644 --- a/pkgs/tools/security/apg/default.nix +++ b/pkgs/tools/security/apg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl }: +{ lib, stdenv, fetchurl, openssl }: stdenv.mkDerivation rec { name = "apg-2.3.0b"; src = fetchurl { @@ -8,14 +8,14 @@ stdenv.mkDerivation rec { configurePhase = '' substituteInPlace Makefile --replace /usr/local "$out" ''; - makeFlags = stdenv.lib.optionals stdenv.isDarwin ["CC=cc"]; + makeFlags = lib.optionals stdenv.isDarwin ["CC=cc"]; patches = [ ./apg.patch ./phony-install-target.patch ]; - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.isDarwin '' sed -i -e 's|APG_CLIBS += -lcrypt|APG_CLIBS += -L${openssl.out}/lib -lcrypto|' Makefile ''; @@ -65,8 +65,8 @@ stdenv.mkDerivation rec { password generation ''; homepage = "http://www.adel.nursat.kz/apg/"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ astsmtl ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix b/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix index b0e3a644959..3256b5431a7 100644 --- a/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix +++ b/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix @@ -23,12 +23,12 @@ stdenv.mkDerivation { substitutions = [ ''--replace "convert" "${imagemagick}/bin/convert"'' ''--replace "qrencode" "${qrencode.bin}/bin/qrencode"'' - ] ++ stdenv.lib.optional testQR [ + ] ++ lib.optional testQR [ ''--replace "hash zbarimg" "true"'' # hash does not work on NixOS ''--replace "$(zbarimg --raw" "$(${zbar.out}/bin/zbarimg --raw"'' ]; in '' - substituteInPlace asc-to-gif.sh ${stdenv.lib.concatStringsSep " " substitutions} + substituteInPlace asc-to-gif.sh ${lib.concatStringsSep " " substitutions} ''; installPhase = '' diff --git a/pkgs/tools/security/aws-iam-authenticator/default.nix b/pkgs/tools/security/aws-iam-authenticator/default.nix index 851eed43ade..e0499681848 100644 --- a/pkgs/tools/security/aws-iam-authenticator/default.nix +++ b/pkgs/tools/security/aws-iam-authenticator/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "aws-iam-authenticator"; diff --git a/pkgs/tools/security/aws-okta/default.nix b/pkgs/tools/security/aws-okta/default.nix index de84e43b5aa..08508dd157a 100644 --- a/pkgs/tools/security/aws-okta/default.nix +++ b/pkgs/tools/security/aws-okta/default.nix @@ -1,8 +1,8 @@ -{ buildGoPackage, fetchFromGitHub, libusb1, pkgconfig, lib, stdenv, libiconv }: +{ buildGoPackage, fetchFromGitHub, libusb1, pkg-config, lib, libiconv }: buildGoPackage rec { pname = "aws-okta"; - version = "1.0.8"; + version = "1.0.11"; goPackagePath = "github.com/segmentio/aws-okta"; @@ -10,14 +10,14 @@ buildGoPackage rec { owner = "segmentio"; repo = "aws-okta"; rev = "v${version}"; - sha256 = "14bg9rdfxkpw00phc8faz4ghiyb0j7a9qai74lidrzplzl139bzf"; + sha256 = "sha256-1cprKpIFgM3+lUEHNvda34nJTH4Ch3LtTRq/Dp6QBQ8="; }; buildFlags = [ "--tags" "release" ]; buildFlagsArray = [ "-ldflags=-X main.Version=${version}" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 libiconv ]; meta = with lib; { diff --git a/pkgs/tools/security/b2sum/default.nix b/pkgs/tools/security/b2sum/default.nix index fdd4f2c73fd..393043df675 100644 --- a/pkgs/tools/security/b2sum/default.nix +++ b/pkgs/tools/security/b2sum/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchzip, openmp ? null }: +{ lib, stdenv, fetchzip, openmp ? null }: -with stdenv.lib; +with lib; stdenv.mkDerivation { pname = "b2sum"; diff --git a/pkgs/tools/security/bash-supergenpass/default.nix b/pkgs/tools/security/bash-supergenpass/default.nix index cbacf8b33a4..9276c9b1167 100644 --- a/pkgs/tools/security/bash-supergenpass/default.nix +++ b/pkgs/tools/security/bash-supergenpass/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { installPhase = '' install -m755 -D supergenpass.sh "$out/bin/supergenpass" - wrapProgram "$out/bin/supergenpass" --prefix PATH : "${stdenv.lib.makeBinPath [ openssl coreutils gnugrep ]}" + wrapProgram "$out/bin/supergenpass" --prefix PATH : "${lib.makeBinPath [ openssl coreutils gnugrep ]}" ''; passthru.updateScript = unstableGitUpdater { }; diff --git a/pkgs/tools/security/bettercap/default.nix b/pkgs/tools/security/bettercap/default.nix index 3b0a6ca6264..f2df464a907 100644 --- a/pkgs/tools/security/bettercap/default.nix +++ b/pkgs/tools/security/bettercap/default.nix @@ -10,22 +10,22 @@ buildGoModule rec { pname = "bettercap"; - version = "2.28"; + version = "2.29"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0aihinn3i3jj350l2rqph7nv3wy4nh4f8syidf77zybjcp9nmcys"; + sha256 = "sha256-hXYsFRYSyYKYJM4gS0Dyiia9aPA07GWSsp9doA0vYGI="; }; - vendorSha256 = "0yfs1f18d8frbkrshsajzzbj4wh2azd89g2h35wm6wqknvlipwr0"; + vendorSha256 = "sha256-yIvwYUK+4cnHFwvJS2seDa9vJ/2cQ10Q46hR8U0aSRE="; doCheck = false; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libpcap libusb1 ] - ++ stdenv.lib.optionals stdenv.isLinux [ libnfnetlink libnetfilter_queue ]; + ++ lib.optionals stdenv.isLinux [ libnfnetlink libnetfilter_queue ]; meta = with lib; { description = "A man in the middle tool"; diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix index 9bbcdab6bf7..8f264ef942e 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/pkgs/tools/security/bitwarden/default.nix @@ -17,11 +17,11 @@ let pname = "bitwarden"; version = { - x86_64-linux = "1.23.0"; + x86_64-linux = "1.24.6"; }.${system} or ""; sha256 = { - x86_64-linux = "1z1r8327xymqf2h98wb2fb02s41pxc6fh5w4bxmdgpx7k1jx5kvg"; + x86_64-linux = "sha256-PaquU2CrtIJS1s9TKshmKxfs0L3Jhvs/sgO4ZrlJFzA="; }.${system} or ""; meta = with lib; { @@ -78,7 +78,7 @@ let postFixup = '' makeWrapper $out/opt/Bitwarden/bitwarden $out/bin/bitwarden \ - --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libsecret stdenv.cc.cc ] }" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libsecret stdenv.cc.cc ] }" \ "''${gappsWrapperArgs[@]}" ''; }; diff --git a/pkgs/tools/security/bitwarden_rs/default.nix b/pkgs/tools/security/bitwarden_rs/default.nix index 482ba400e63..3b623cefd0d 100644 --- a/pkgs/tools/security/bitwarden_rs/default.nix +++ b/pkgs/tools/security/bitwarden_rs/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, rustPlatform, fetchFromGitHub, nixosTests -, pkgconfig, openssl +, pkg-config, openssl , Security, CoreServices , dbBackend ? "sqlite", libmysqlclient, postgresql }: @@ -17,8 +17,8 @@ in rustPlatform.buildRustPackage rec { sha256 = "0hi29vy23a5r23pgzdssd2gvim8vw2vmykck5cl5phq11a3az31p"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = with stdenv.lib; [ openssl ] + nativeBuildInputs = [ pkg-config ]; + buildInputs = with lib; [ openssl ] ++ optionals stdenv.isDarwin [ Security CoreServices ] ++ optional (dbBackend == "mysql") libmysqlclient ++ optional (dbBackend == "postgresql") postgresql; diff --git a/pkgs/tools/security/bitwarden_rs/vault.nix b/pkgs/tools/security/bitwarden_rs/vault.nix index a6e238f9085..bef7fc8d6be 100644 --- a/pkgs/tools/security/bitwarden_rs/vault.nix +++ b/pkgs/tools/security/bitwarden_rs/vault.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bitwarden_rs-vault"; - version = "2.16.1"; + version = "2.17.1"; src = fetchurl { url = "https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz"; - sha256 = "1c4fcf8jzgd6636wv903r5msc9z5l56l2i4k93kvb2zvg7qj014w"; + sha256 = "1kd21higniszk1na5ag7q4g0l7h6ddl91gpbjbwym28hsbjvxla7"; }; buildCommand = '' diff --git a/pkgs/tools/security/brutespray/default.nix b/pkgs/tools/security/brutespray/default.nix index 69d8dbc9623..25b9aecb8e0 100644 --- a/pkgs/tools/security/brutespray/default.nix +++ b/pkgs/tools/security/brutespray/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { patchShebangs $out/bin patchPythonScript $out/bin/brutespray wrapProgram $out/bin/brutespray \ - --prefix PATH : ${stdenv.lib.makeBinPath [ medusa ]} + --prefix PATH : ${lib.makeBinPath [ medusa ]} mkdir -p $out/share/brutespray cp -r wordlist/ $out/share/brutespray/wordlist diff --git a/pkgs/tools/security/bundler-audit/gemset.nix b/pkgs/tools/security/bundler-audit/gemset.nix index 2121a3c08e5..c543920549f 100644 --- a/pkgs/tools/security/bundler-audit/gemset.nix +++ b/pkgs/tools/security/bundler-audit/gemset.nix @@ -20,4 +20,4 @@ }; version = "1.0.1"; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/security/bypass403/default.nix b/pkgs/tools/security/bypass403/default.nix new file mode 100644 index 00000000000..5bf40766883 --- /dev/null +++ b/pkgs/tools/security/bypass403/default.nix @@ -0,0 +1,25 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "bypass403"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "drsigned"; + repo = pname; + rev = "v${version}"; + sha256 = "1x3a4lnxjxbv80kaydy57809n9r7vzci9ki4f98smf3w04s86rcl"; + }; + + vendorSha256 = "1bp6bf99rxlyg91pn1y228q18lawpykmvkl22cydmclms0q0n238"; + + meta = with lib; { + description = "Tool to bypass 403 Forbidden responses"; + homepage = "https://github.com/drsigned/bypass403"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix index 1be561dae54..e715cf50418 100644 --- a/pkgs/tools/security/ccid/default.nix +++ b/pkgs/tools/security/ccid/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, pcsclite, pkgconfig, libusb1, perl }: +{ lib, stdenv, fetchurl, pcsclite, pkg-config, libusb1, perl }: stdenv.mkDerivation rec { pname = "ccid"; - version = "1.4.33"; + version = "1.4.34"; src = fetchurl { url = "https://ccid.apdu.fr/files/${pname}-${version}.tar.bz2"; - sha256 = "0974h2v9wq0j0ajw3c7yckaw8wqcppb2npfhfhmv9phijy9xlmjj"; + sha256 = "sha256-5vdkW1mpooROtLGn7/USlg1/BKRlSvAvf9L4re1dtAo="; }; postPatch = '' @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { configureFlagsArray+=("--enable-usbdropdir=$out/pcsc/drivers") ''; - nativeBuildInputs = [ pkgconfig perl ]; + nativeBuildInputs = [ pkg-config perl ]; buildInputs = [ pcsclite libusb1 ]; meta = with lib; { diff --git a/pkgs/tools/security/ccrypt/default.nix b/pkgs/tools/security/ccrypt/default.nix index a3210b2a598..bf5f26f7044 100644 --- a/pkgs/tools/security/ccrypt/default.nix +++ b/pkgs/tools/security/ccrypt/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, perl}: +{lib, stdenv, fetchurl, perl}: stdenv.mkDerivation { name = "ccrypt-1.11"; @@ -15,8 +15,8 @@ stdenv.mkDerivation { meta = { homepage = "http://ccrypt.sourceforge.net/"; description = "Utility for encrypting and decrypting files and streams with AES-256"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; all; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; all; }; } diff --git a/pkgs/tools/security/certmgr/default.nix b/pkgs/tools/security/certmgr/default.nix index 47848b25b43..e2318c853f1 100644 --- a/pkgs/tools/security/certmgr/default.nix +++ b/pkgs/tools/security/certmgr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }: +{ lib, buildGoPackage, fetchFromGitHub, fetchpatch }: let generic = { patches ? [] }: diff --git a/pkgs/tools/security/certstrap/default.nix b/pkgs/tools/security/certstrap/default.nix index f0c756f54f9..ff6522f1d35 100644 --- a/pkgs/tools/security/certstrap/default.nix +++ b/pkgs/tools/security/certstrap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "certstrap"; diff --git a/pkgs/tools/security/cfssl/default.nix b/pkgs/tools/security/cfssl/default.nix index 835c5daa72c..e92fe7b951f 100644 --- a/pkgs/tools/security/cfssl/default.nix +++ b/pkgs/tools/security/cfssl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, go-rice }: +{ lib, buildGoModule, fetchFromGitHub, go-rice }: buildGoModule rec { pname = "cfssl"; diff --git a/pkgs/tools/security/chaps/default.nix b/pkgs/tools/security/chaps/default.nix index 0200fca8ff3..2f89c3ea585 100644 --- a/pkgs/tools/security/chaps/default.nix +++ b/pkgs/tools/security/chaps/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitiles, fetchFromGitHub, fetchurl, trousers, leveldb, unzip -, scons, pkgconfig, glib, dbus_cplusplus, dbus, protobuf, openssl, snappy, pam +, scons, pkg-config, glib, dbus_cplusplus, dbus, protobuf, openssl, snappy, pam }: let @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { substituteInPlace makefile --replace @@NIXOS_LEVELDB@@ ${leveldb} ''; - nativeBuildInputs = [ unzip scons pkgconfig ]; + nativeBuildInputs = [ unzip scons pkg-config ]; buildInputs = [ trousers glib dbus_cplusplus dbus protobuf openssl snappy leveldb pam ]; diff --git a/pkgs/tools/security/chkrootkit/default.nix b/pkgs/tools/security/chkrootkit/default.nix index 5753784542d..f9f0dd96a11 100644 --- a/pkgs/tools/security/chkrootkit/default.nix +++ b/pkgs/tools/security/chkrootkit/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "chkrootkit-0.53"; + name = "chkrootkit-0.54"; src = fetchurl { url = "ftp://ftp.pangeia.com.br/pub/seg/pac/${name}.tar.gz"; - sha256 = "1da5ry3p7jb6xs6xlfml1ly09q2rs5q6n5axif17d29k7gixlqkj"; + sha256 = "sha256-FUySaSH1PbYHKKfLyXyohli2lMFLfSiO/jg+CEmRVgc="; }; # TODO: a lazy work-around for linux build failure ... diff --git a/pkgs/tools/security/chntpw/default.nix b/pkgs/tools/security/chntpw/default.nix index d0b75bdd42b..ef462f5bf2d 100644 --- a/pkgs/tools/security/chntpw/default.nix +++ b/pkgs/tools/security/chntpw/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ unzip ] - ++ stdenv.lib.optionals stdenv.isLinux [ stdenv.glibc.out stdenv.glibc.static ]; + ++ lib.optionals stdenv.isLinux [ stdenv.glibc.out stdenv.glibc.static ]; patches = [ ./00-chntpw-build-arch-autodetect.patch @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://pogostick.net/~pnh/ntpasswd/"; description = "An utility to reset the password of any user that has a valid local account on a Windows system"; - maintainers = with stdenv.lib.maintainers; [ deepfire ]; + maintainers = with lib.maintainers; [ deepfire ]; license = licenses.gpl2; - platforms = with stdenv.lib.platforms; linux; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/tools/security/chrome-token-signing/default.nix b/pkgs/tools/security/chrome-token-signing/default.nix index 134f916f043..5c2e6b4de15 100644 --- a/pkgs/tools/security/chrome-token-signing/default.nix +++ b/pkgs/tools/security/chrome-token-signing/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, pcsclite, pkgconfig, opensc }: +{ lib, mkDerivation, fetchFromGitHub, qmake, pcsclite, pkg-config, opensc }: mkDerivation rec { pname = "chrome-token-signing"; @@ -11,7 +11,7 @@ mkDerivation rec { sha256 = "1vbghy12fjmq4m5l7hisq1ylnzy0rdnnd920xwamjamlx38jj3ln"; }; - buildInputs = [ qmake pcsclite pkgconfig ]; + buildInputs = [ qmake pcsclite pkg-config ]; dontUseQmakeConfigure = true; patchPhase = '' diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index 4b3048223f7..eb9fc8e7b95 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib bzip2 libxml2 openssl ncurses curl libiconv libmilter pcre2 libmspack json_c check - ] ++ stdenv.lib.optional stdenv.isLinux systemd - ++ stdenv.lib.optional stdenv.isDarwin Foundation; + ] ++ lib.optional stdenv.isLinux systemd + ++ lib.optional stdenv.isDarwin Foundation; configureFlags = [ "--libdir=$(out)/lib" @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { "--enable-milter" "--disable-unrar" # disable unrar because it's non-free and requires some extra patching to work properly "--enable-check" - ] ++ stdenv.lib.optional stdenv.isLinux + ] ++ lib.optional stdenv.isLinux "--with-systemdsystemunitdir=$(out)/lib/systemd"; postInstall = '' diff --git a/pkgs/tools/security/clevis/default.nix b/pkgs/tools/security/clevis/default.nix index 0b8f50c1190..36b5ab47304 100644 --- a/pkgs/tools/security/clevis/default.nix +++ b/pkgs/tools/security/clevis/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig, asciidoc +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, asciidoc , jansson, jose, cryptsetup, curl, libpwquality, luksmeta }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0wfgd2v1r47ckh5qp60b903191fx0fa27zyadxlsb8riqszhmwvz"; }; - nativeBuildInputs = [ meson ninja pkgconfig asciidoc ]; + nativeBuildInputs = [ meson ninja pkg-config asciidoc ]; buildInputs = [ jansson jose cryptsetup curl libpwquality luksmeta ]; outputs = [ "out" "man" ]; diff --git a/pkgs/tools/security/cloudbrute/default.nix b/pkgs/tools/security/cloudbrute/default.nix index 06f0dd413a5..84a59ec495f 100644 --- a/pkgs/tools/security/cloudbrute/default.nix +++ b/pkgs/tools/security/cloudbrute/default.nix @@ -1,6 +1,6 @@ { buildGoModule , fetchFromGitHub -, lib, stdenv +, lib }: buildGoModule rec { diff --git a/pkgs/tools/security/corsmisc/default.nix b/pkgs/tools/security/corsmisc/default.nix new file mode 100644 index 00000000000..4c64677f324 --- /dev/null +++ b/pkgs/tools/security/corsmisc/default.nix @@ -0,0 +1,25 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "corsmisc"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "drsigned"; + repo = pname; + rev = "v${version}"; + sha256 = "18a70v093jl85vnih80i50wvac8hsg3f2gmcws9jyhj2brndq2qj"; + }; + + vendorSha256 = "1bp6bf99rxlyg91pn1y228q18lawpykmvkl22cydmclms0q0n238"; + + meta = with lib; { + description = "Tool to discover CORS misconfigurations vulnerabilities"; + homepage = "https://github.com/drsigned/corsmisc"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/cowpatty/default.nix b/pkgs/tools/security/cowpatty/default.nix index 7d58de8553b..4cd420650f3 100644 --- a/pkgs/tools/security/cowpatty/default.nix +++ b/pkgs/tools/security/cowpatty/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, openssl, libpcap +{ lib, stdenv, fetchurl, openssl, libpcap }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "cowpatty"; diff --git a/pkgs/tools/security/crackxls/default.nix b/pkgs/tools/security/crackxls/default.nix index 33a219e8621..748bfdcb2ca 100644 --- a/pkgs/tools/security/crackxls/default.nix +++ b/pkgs/tools/security/crackxls/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, autoconf, automake, openssl, libgsf, gmp }: +{ lib, stdenv, fetchFromGitHub, pkg-config, autoconf, automake, openssl, libgsf, gmp }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0q5jl7hcds3f0rhly3iy4fhhbyh9cdrfaw7zdrazzf1wswwhyssz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoconf automake openssl libgsf gmp ]; installPhase = diff --git a/pkgs/tools/security/creddump/default.nix b/pkgs/tools/security/creddump/default.nix index 7a936408433..e9e5685acf4 100644 --- a/pkgs/tools/security/creddump/default.nix +++ b/pkgs/tools/security/creddump/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, python2, python2Packages }: +{ lib, fetchFromGitLab, python2, python2Packages }: python2Packages.buildPythonApplication rec { pname = "creddump"; diff --git a/pkgs/tools/security/crlfuzz/default.nix b/pkgs/tools/security/crlfuzz/default.nix index 2e4b17170c6..88bd45bb5e1 100644 --- a/pkgs/tools/security/crlfuzz/default.nix +++ b/pkgs/tools/security/crlfuzz/default.nix @@ -1,6 +1,6 @@ { buildGoModule , fetchFromGitHub -, stdenv +, lib }: buildGoModule rec { @@ -18,7 +18,7 @@ buildGoModule rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool to scan for CRLF vulnerability"; homepage = "https://github.com/dwisiswant0/crlfuzz"; license = with licenses; [ mit ]; diff --git a/pkgs/tools/security/crowbar/default.nix b/pkgs/tools/security/crowbar/default.nix index 2f197421e1f..e58f77457de 100644 --- a/pkgs/tools/security/crowbar/default.nix +++ b/pkgs/tools/security/crowbar/default.nix @@ -3,7 +3,7 @@ , nmap , openvpn , python3Packages -, lib, stdenv +, lib , tigervnc }: diff --git a/pkgs/tools/security/deepsea/default.nix b/pkgs/tools/security/deepsea/default.nix index 855549bb0c8..e351eb7a79d 100644 --- a/pkgs/tools/security/deepsea/default.nix +++ b/pkgs/tools/security/deepsea/default.nix @@ -1,6 +1,6 @@ { buildGoModule , fetchFromGitHub -, lib, stdenv +, lib }: buildGoModule rec { diff --git a/pkgs/tools/security/dirmngr/default.nix b/pkgs/tools/security/dirmngr/default.nix index ee97bda1906..cab059ca33e 100644 --- a/pkgs/tools/security/dirmngr/default.nix +++ b/pkgs/tools/security/dirmngr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libgpgerror, libgcrypt, libassuan, libksba, pth, openldap +{ lib, stdenv, fetchurl, libgpgerror, libgcrypt, libassuan, libksba, pth, openldap , libiconv}: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pth openldap libiconv ]; meta = { - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/security/dnsrecon/default.nix b/pkgs/tools/security/dnsrecon/default.nix index 65b18c5c822..5eda4e75f94 100644 --- a/pkgs/tools/security/dnsrecon/default.nix +++ b/pkgs/tools/security/dnsrecon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3 }: +{ lib, fetchFromGitHub, python3 }: python3.pkgs.buildPythonApplication rec { pname = "dnsrecon"; diff --git a/pkgs/tools/security/dnsx/default.nix b/pkgs/tools/security/dnsx/default.nix index 1a82467201d..35f033cb983 100644 --- a/pkgs/tools/security/dnsx/default.nix +++ b/pkgs/tools/security/dnsx/default.nix @@ -1,6 +1,6 @@ { buildGoModule , fetchFromGitHub -, lib, stdenv +, lib }: buildGoModule rec { diff --git a/pkgs/tools/security/doas/default.nix b/pkgs/tools/security/doas/default.nix index 6867256ea90..7da3b8e9f06 100644 --- a/pkgs/tools/security/doas/default.nix +++ b/pkgs/tools/security/doas/default.nix @@ -1,5 +1,5 @@ -{ stdenv -, lib +{ lib +, stdenv , fetchFromGitHub , bison , pam @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "doas"; - version = "6.8"; + version = "6.8.1"; src = fetchFromGitHub { owner = "Duncaen"; repo = "OpenDoas"; rev = "v${version}"; - sha256 = "1dlwnvy8r6slxcy260gfkximp1ms510wdslpfq9y6xvd2qi5izcb"; + sha256 = "sha256-F0FVVspGDZmzxy4nsb/wsEoCw4eHscymea7tIKrWzD0="; }; # otherwise confuses ./configure diff --git a/pkgs/tools/security/doppler/default.nix b/pkgs/tools/security/doppler/default.nix index 0822828eb90..08a83f8c9b2 100644 --- a/pkgs/tools/security/doppler/default.nix +++ b/pkgs/tools/security/doppler/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "doppler"; - version = "3.19.0"; + version = "3.21.0"; src = fetchFromGitHub { owner = "dopplerhq"; repo = "cli"; rev = version; - sha256 = "049x8y7zjvpd1gvkrld69dffnf4pawjwm7by71r6z408hwvfqjpa"; + sha256 = "sha256-ll4PabDy5xnyi+cZdjvSySizRCxthRY7uHLzdYP6U5M="; }; - vendorSha256 = "1s8zwjfk9kcddn8cywr7llh9v5m140kvmi5lmy2glvwh3rwccgxf"; + vendorSha256 = "sha256-rQrlnIYYnRc+cqyiyJoh1YqxD61doyjte7ehrX4RDTI="; buildFlagsArray = "-ldflags=-X github.com/DopplerHQ/cli/pkg/version.ProgramVersion=v${version}"; diff --git a/pkgs/tools/security/duo-unix/default.nix b/pkgs/tools/security/duo-unix/default.nix index 2c3a7a441af..40645ce089d 100644 --- a/pkgs/tools/security/duo-unix/default.nix +++ b/pkgs/tools/security/duo-unix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pam, openssl, zlib }: +{ lib, stdenv, fetchurl, pam, openssl, zlib }: stdenv.mkDerivation rec { pname = "duo-unix"; @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { meta = { description = "Duo Security Unix login integration"; homepage = "https://duosecurity.com"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.thoughtpolice ]; }; } diff --git a/pkgs/tools/security/ecdsautils/default.nix b/pkgs/tools/security/ecdsautils/default.nix index adf1a74f42a..6c126673259 100644 --- a/pkgs/tools/security/ecdsautils/default.nix +++ b/pkgs/tools/security/ecdsautils/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "18sr8x3qiw8s9l5pfi7r9i3ayplz4jqdml75ga9y933vj7vs0k4d"; }; - nativeBuildInputs = with pkgs; [ cmake pkgconfig doxygen ]; + nativeBuildInputs = with pkgs; [ cmake pkg-config doxygen ]; buildInputs = with pkgs; [ libuecc ]; meta = with lib; { diff --git a/pkgs/tools/security/ecryptfs/default.nix b/pkgs/tools/security/ecryptfs/default.nix index dbec36cb12b..569b83feb9a 100644 --- a/pkgs/tools/security/ecryptfs/default.nix +++ b/pkgs/tools/security/ecryptfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, perl, util-linux, keyutils, nss, nspr, python2, pam, enablePython ? false +{ lib, stdenv, fetchurl, pkg-config, perl, util-linux, keyutils, nss, nspr, python2, pam, enablePython ? false , intltool, makeWrapper, coreutils, bash, gettext, cryptsetup, lvm2, rsync, which, lsof }: stdenv.mkDerivation rec { @@ -33,14 +33,14 @@ stdenv.mkDerivation rec { done ''; - configureFlags = stdenv.lib.optionals (!enablePython) [ "--disable-pywrap" ]; + configureFlags = lib.optionals (!enablePython) [ "--disable-pywrap" ]; - nativeBuildInputs = [ pkgconfig ] + nativeBuildInputs = [ pkg-config ] # if python2 support is requested, it is needed at builtime as well as runtime. - ++ stdenv.lib.optionals (enablePython) [ python2 ] + ++ lib.optionals (enablePython) [ python2 ] ; buildInputs = [ perl nss nspr pam intltool makeWrapper ] - ++ stdenv.lib.optionals (enablePython) [ python2 ] + ++ lib.optionals (enablePython) [ python2 ] ; propagatedBuildInputs = [ coreutils gettext cryptsetup lvm2 rsync keyutils which ]; diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index 116add24314..cbe56694da1 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, autoreconfHook, pkgconfig +, autoreconfHook, pkg-config , gtk3, nssTools, pcsclite , libxml2, libproxy , openssl, curl @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "Fedict"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ]; + nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper ]; buildInputs = [ gtk3 pcsclite libxml2 libproxy curl openssl ]; preConfigure = '' mkdir openssl diff --git a/pkgs/tools/security/enchive/default.nix b/pkgs/tools/security/enchive/default.nix index 3c7d3144d3b..960ef251b1c 100644 --- a/pkgs/tools/security/enchive/default.nix +++ b/pkgs/tools/security/enchive/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "enchive"; @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { meta = { description = "Encrypted personal archives"; homepage = "https://github.com/skeeto/enchive"; - license = stdenv.lib.licenses.unlicense; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.nico202 ]; + license = lib.licenses.unlicense; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.nico202 ]; }; } diff --git a/pkgs/tools/security/encryptr/default.nix b/pkgs/tools/security/encryptr/default.nix index 0cbfd79296d..e1a5de7754e 100644 --- a/pkgs/tools/security/encryptr/default.nix +++ b/pkgs/tools/security/encryptr/default.nix @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { dontBuild = true; - rpath = stdenv.lib.makeLibraryPath [ + rpath = lib.makeLibraryPath [ glib nss nspr gconf fontconfig freetype pango cairo libX11 libXi libXcursor libXext libXfixes libXrender libXcomposite alsaLib libXdamage libXtst libXrandr expat libcap dbus gtk2 gdk-pixbuf diff --git a/pkgs/tools/security/enpass/default.nix b/pkgs/tools/security/enpass/default.nix index 3b25dd58b34..7e2c0fcdb33 100644 --- a/pkgs/tools/security/enpass/default.nix +++ b/pkgs/tools/security/enpass/default.nix @@ -79,7 +79,9 @@ let # lsof must be in PATH for proper operation wrapProgram $out/bin/Enpass \ --set LD_LIBRARY_PATH "${libPath}" \ - --prefix PATH : ${lsof}/bin + --prefix PATH : ${lsof}/bin \ + --unset QML2_IMPORT_PATH \ + --unset QT_PLUGIN_PATH ''; }; updater = { diff --git a/pkgs/tools/security/enum4linux-ng/default.nix b/pkgs/tools/security/enum4linux-ng/default.nix new file mode 100644 index 00000000000..33694ad79ae --- /dev/null +++ b/pkgs/tools/security/enum4linux-ng/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonApplication +, fetchFromGitHub +, impacket +, ldap3 +, pyyaml +, samba +}: + +buildPythonApplication rec { + pname = "enum4linux-ng"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "cddmp"; + repo = pname; + rev = "v${version}"; + sha256 = "0dhg8cwbdn0vlnchhscx31ay4mgj5p6rf73wzgs8nvqg0shsawmy"; + }; + + propagatedBuildInputs = [ + impacket + ldap3 + pyyaml + samba + ]; + + # It's only a script and not a Python module. Project has no tests + doCheck = false; + + meta = with lib; { + description = "Windows/Samba enumeration tool"; + longDescription = '' + enum4linux-ng.py is a rewrite of Mark Lowe's enum4linux.pl, a tool for + enumerating information from Windows and Samba systems. + ''; + homepage = "https://github.com/cddmp/enum4linux-ng"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/enum4linux/default.nix b/pkgs/tools/security/enum4linux/default.nix index 4fe567d1ed0..9a9f2039ac2 100644 --- a/pkgs/tools/security/enum4linux/default.nix +++ b/pkgs/tools/security/enum4linux/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { cp enum4linux.pl $out/bin/enum4linux wrapProgram $out/bin/enum4linux \ - --prefix PATH : ${stdenv.lib.makeBinPath [ samba openldap ]} + --prefix PATH : ${lib.makeBinPath [ samba openldap ]} ''; meta = with lib; { diff --git a/pkgs/tools/security/eschalot/default.nix b/pkgs/tools/security/eschalot/default.nix index 04675061615..0c984c5d35e 100644 --- a/pkgs/tools/security/eschalot/default.nix +++ b/pkgs/tools/security/eschalot/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "eschalot"; - version = "2018-01-19"; + version = "1.2.0.20191006"; src = fetchFromGitHub { owner = "ReclaimYourPrivacy"; repo = pname; - rev = "56a967b62631cfd3c7ef68541263dbd54cbbc2c4"; - sha256 = "1iw1jrydasm9dmgpcdimd8dy9n281ys9krvf3fd3dlymkgsj604d"; + rev = "a45bad5b9a3e4939340ddd8a751ceffa3c0db76a"; + sha256 = "1wbi0azc2b57nmmx6c1wmvng70d9ph1s83yhnl5lxaaqaj85h22g"; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index 45bea0ae99f..922fb412cad 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/pkgs/tools/security/fail2ban/default.nix @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication { }; pythonPath = with python3.pkgs; - stdenv.lib.optionals stdenv.isLinux [ + lib.optionals stdenv.isLinux [ systemd ]; diff --git a/pkgs/tools/security/ffuf/default.nix b/pkgs/tools/security/ffuf/default.nix index 084601a4122..6af8b6fcba9 100644 --- a/pkgs/tools/security/ffuf/default.nix +++ b/pkgs/tools/security/ffuf/default.nix @@ -1,20 +1,20 @@ { buildGoModule , fetchFromGitHub -, lib, stdenv +, lib }: buildGoModule rec { pname = "ffuf"; - version = "1.1.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1jb2x0ybcb9zkqm7flpmr0hd3171xvnn6kxmfcgds4x8l9fbmxnr"; + sha256 = "sha256-XSdFLfSYDdKI7BYo9emYanvZeSFGxiNLYxuw5QKAyRc="; }; - vendorSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; + vendorSha256 = "sha256-szT08rIozAuliOmge5RFX4NeVrJ2pCVyfotrHuvc0UU="; # tests don't pass due to an issue with the memory addresses # https://github.com/ffuf/ffuf/issues/367 diff --git a/pkgs/tools/security/fido2luks/default.nix b/pkgs/tools/security/fido2luks/default.nix index e0dcdadb7b0..f8c5b4a9f12 100644 --- a/pkgs/tools/security/fido2luks/default.nix +++ b/pkgs/tools/security/fido2luks/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , rustPlatform , fetchFromGitHub , cryptsetup diff --git a/pkgs/tools/security/fierce/default.nix b/pkgs/tools/security/fierce/default.nix index 3d6472cbb44..797a2db211b 100644 --- a/pkgs/tools/security/fierce/default.nix +++ b/pkgs/tools/security/fierce/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3 }: +{ lib, fetchFromGitHub, python3 }: python3.pkgs.buildPythonApplication rec { pname = "fierce"; diff --git a/pkgs/tools/security/fpm2/default.nix b/pkgs/tools/security/fpm2/default.nix index 2f297ffd6b7..0ca45957d69 100644 --- a/pkgs/tools/security/fpm2/default.nix +++ b/pkgs/tools/security/fpm2/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, pkgconfig, gnupg, gtk2 +{ lib, stdenv, fetchurl, pkg-config, gnupg, gtk2 , libxml2, intltool }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "fpm2"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "d55e9ce6be38a44fc1053d82db2d117cf3991a51898bd86d7913bae769f04da7"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gnupg gtk2 libxml2 intltool ]; meta = { diff --git a/pkgs/tools/security/fprintd/default.nix b/pkgs/tools/security/fprintd/default.nix index 368f49d944d..72c0bc204f8 100644 --- a/pkgs/tools/security/fprintd/default.nix +++ b/pkgs/tools/security/fprintd/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchFromGitLab , fetchpatch -, pkgconfig +, pkg-config , meson , ninja , perl @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config meson ninja perl @@ -98,7 +98,7 @@ stdenv.mkDerivation rec { PKG_CONFIG_DBUS_1_DATADIR = "${placeholder "out"}/share"; # FIXME: Ugly hack for tests to find libpam_wrapper.so - LIBRARY_PATH = stdenv.lib.makeLibraryPath [ python3.pkgs.pypamtest ]; + LIBRARY_PATH = lib.makeLibraryPath [ python3.pkgs.pypamtest ]; doCheck = true; diff --git a/pkgs/tools/security/fwknop/default.nix b/pkgs/tools/security/fwknop/default.nix index d3787f834d0..b56ba93dc7b 100644 --- a/pkgs/tools/security/fwknop/default.nix +++ b/pkgs/tools/security/fwknop/default.nix @@ -19,17 +19,17 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ libpcap texinfo ] - ++ stdenv.lib.optionals gnupgSupport [ gnupg gpgme.dev ] - ++ stdenv.lib.optionals wgetSupport [ wget ]; + ++ lib.optionals gnupgSupport [ gnupg gpgme.dev ] + ++ lib.optionals wgetSupport [ wget ]; configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/run" "--with-iptables=${iptables}/sbin/iptables" - (stdenv.lib.enableFeature buildServer "server") - (stdenv.lib.enableFeature buildClient "client") - (stdenv.lib.withFeatureAs wgetSupport "wget" "${wget}/bin/wget") - ] ++ stdenv.lib.optionalString gnupgSupport [ + (lib.enableFeature buildServer "server") + (lib.enableFeature buildClient "client") + (lib.withFeatureAs wgetSupport "wget" "${wget}/bin/wget") + ] ++ lib.optionalString gnupgSupport [ "--with-gpgme" "--with-gpgme-prefix=${gpgme.dev}" "--with-gpg=${gnupg}" diff --git a/pkgs/tools/security/gau/default.nix b/pkgs/tools/security/gau/default.nix index 98045a107e5..46498e49cff 100644 --- a/pkgs/tools/security/gau/default.nix +++ b/pkgs/tools/security/gau/default.nix @@ -1,6 +1,6 @@ { buildGoModule , fetchFromGitHub -, lib, stdenv +, lib }: buildGoModule rec { diff --git a/pkgs/tools/security/gen-oath-safe/default.nix b/pkgs/tools/security/gen-oath-safe/default.nix index 670b9631f21..51ff5b0e81e 100644 --- a/pkgs/tools/security/gen-oath-safe/default.nix +++ b/pkgs/tools/security/gen-oath-safe/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installPhase = let - path = stdenv.lib.makeBinPath [ + path = lib.makeBinPath [ coreutils file libcaca.bin diff --git a/pkgs/tools/security/gencfsm/default.nix b/pkgs/tools/security/gencfsm/default.nix index a41c995ab40..53127173f79 100644 --- a/pkgs/tools/security/gencfsm/default.nix +++ b/pkgs/tools/security/gencfsm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoconf, automake, intltool, libtool, pkgconfig, encfs +{ lib, stdenv, fetchurl, autoconf, automake, intltool, libtool, pkg-config, encfs , glib , gnome3, gtk3, libgnome-keyring, vala, wrapGAppsHook, xorg, gobject-introspection }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1h6x8dyp1fvxvr8fwki98ppf4sa20qf7g59jc9797b2vrgm60h1i"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoconf automake intltool libtool vala glib encfs gtk3 libgnome-keyring gnome3.libgee xorg.libSM xorg.libICE wrapGAppsHook gobject-introspection ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-appindicator" ]; - preFixup = ''gappsWrapperArgs+=(--prefix PATH : ${encfs}/bin)''; + preFixup = "gappsWrapperArgs+=(--prefix PATH : ${encfs}/bin)"; enableParallelBuilding = true; diff --git a/pkgs/tools/security/genpass/default.nix b/pkgs/tools/security/genpass/default.nix index 88d6604be83..29703ee1fc8 100644 --- a/pkgs/tools/security/genpass/default.nix +++ b/pkgs/tools/security/genpass/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1cwxpc3xkw673wiamr4v7clrzwxl8ma1vdr6bw0hixm37gxdxz7x"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation libiconv Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation libiconv Security ]; meta = with lib; { description = "A simple yet robust commandline random password generator"; diff --git a/pkgs/tools/security/git-hound/default.nix b/pkgs/tools/security/git-hound/default.nix new file mode 100644 index 00000000000..56fa2ce4763 --- /dev/null +++ b/pkgs/tools/security/git-hound/default.nix @@ -0,0 +1,30 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "git-hound"; + version = "1.3"; + + src = fetchFromGitHub { + owner = "tillson"; + repo = pname; + rev = "v${version}"; + sha256 = "1l2bif7qpc1yl93ih01g9jci7ba47rsnpq9js88rz216q93dzmsf"; + }; + + vendorSha256 = "055hpfjbqng513c9rscb8jhnlxj7p82sr8cbsvwnzk569n71qwma"; + + meta = with lib; { + description = "Reconnaissance tool for GitHub code search"; + longDescription = '' + GitHound pinpoints exposed API keys and other sensitive information + across all of GitHub using pattern matching, commit history searching, + and a unique result scoring system. + ''; + homepage = "https://github.com/tillson/git-hound"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/gitjacker/default.nix b/pkgs/tools/security/gitjacker/default.nix new file mode 100644 index 00000000000..0b8c087eccd --- /dev/null +++ b/pkgs/tools/security/gitjacker/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, git +, stdenv +}: + +buildGoModule rec { + pname = "gitjacker"; + version = "0.0.2"; + + src = fetchFromGitHub { + owner = "liamg"; + repo = "gitjacker"; + rev = "v${version}"; + sha256 = "0fg95i2y8sj7dsvqj8mx0k5pps7d0h1i4a3lk85l8jjab4kxx8h9"; + }; + + vendorSha256 = null; + + propagatedBuildInputs = [ git ]; + + checkInputs = [ git ]; + + doCheck = !stdenv.isDarwin; + + preCheck = '' + export PATH=$TMPDIR/usr/bin:$PATH + ''; + + meta = with lib; { + description = "Leak git repositories from misconfigured websites"; + longDescription = '' + Gitjacker downloads git repositories and extracts their contents + from sites where the .git directory has been mistakenly uploaded. + It will still manage to recover a significant portion of a repository + even where directory listings are disabled. + ''; + homepage = "https://github.com/liamg/gitjacker"; + license = with licenses; [ unlicense ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/gitleaks/default.nix b/pkgs/tools/security/gitleaks/default.nix new file mode 100644 index 00000000000..98277461275 --- /dev/null +++ b/pkgs/tools/security/gitleaks/default.nix @@ -0,0 +1,29 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "gitleaks"; + version = "7.2.0"; + + src = fetchFromGitHub { + owner = "zricethezav"; + repo = pname; + rev = "v${version}"; + sha256 = "1pdbkjx8h6ijypsxyv34lykymaqf8wnfyjk3ldp49apbx01bl34y"; + }; + + vendorSha256 = "0kk8ci7vprqw4v7cigspshfd13k2wyy4pdkxf11pqc2fz8j07kh9"; + + meta = with lib; { + description = "Scan git repos (or files) for secrets"; + longDescription = '' + Gitleaks is a SAST tool for detecting hardcoded secrets like passwords, + API keys, and tokens in git repos. + ''; + homepage = "https://github.com/zricethezav/gitleaks"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/gnome-keysign/default.nix b/pkgs/tools/security/gnome-keysign/default.nix index db0e88a805b..a94be8295ea 100644 --- a/pkgs/tools/security/gnome-keysign/default.nix +++ b/pkgs/tools/security/gnome-keysign/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitLab , fetchpatch , python3 diff --git a/pkgs/tools/security/gnu-pw-mgr/default.nix b/pkgs/tools/security/gnu-pw-mgr/default.nix index af6893b26e8..8478c374836 100644 --- a/pkgs/tools/security/gnu-pw-mgr/default.nix +++ b/pkgs/tools/security/gnu-pw-mgr/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/gnu-pw-mgr/"; description = "A password manager designed to make it easy to reconstruct difficult passwords"; license = with licenses; [ gpl3Plus lgpl3Plus ]; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; maintainers = with maintainers; [ qoelet ]; }; } diff --git a/pkgs/tools/security/gnupg-pkcs11-scd/default.nix b/pkgs/tools/security/gnupg-pkcs11-scd/default.nix index eb0553ed083..c8accce7d40 100644 --- a/pkgs/tools/security/gnupg-pkcs11-scd/default.nix +++ b/pkgs/tools/security/gnupg-pkcs11-scd/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, libgpgerror, libassuan, libgcrypt, pkcs11helper, - pkgconfig, openssl }: + pkg-config, openssl }: stdenv.mkDerivation rec { pname = "gnupg-pkcs11-scd"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1mfh9zjbahjd788rq1mzx009pd7p1sq62sbz586rd7szif7pkpgx"; }; - buildInputs = [ pkcs11helper pkgconfig openssl ]; + buildInputs = [ pkcs11helper pkg-config openssl ]; configureFlags = [ "--with-libgpg-error-prefix=${libgpgerror.dev}" diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index a6b0d43aae2..90ae4300fa6 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, lib, stdenv, pkgconfig, libgcrypt, libassuan, libksba +{ fetchurl, fetchpatch, lib, stdenv, pkg-config, libgcrypt, libassuan, libksba , libgpgerror, libiconv, npth, gettext, texinfo, buildPackages # Each of the dependencies below are optional. @@ -9,7 +9,7 @@ null }: -with stdenv.lib; +with lib; assert guiSupport -> pinentry != null && enableMinimal == false; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { }; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ pkgconfig texinfo ]; + nativeBuildInputs = [ pkg-config texinfo ]; buildInputs = [ libgcrypt libassuan libksba libiconv npth gettext readline libusb1 gnutls adns openldap zlib bzip2 sqlite @@ -42,8 +42,8 @@ stdenv.mkDerivation rec { # Fix broken SOURCE_DATE_EPOCH usage - remove on the next upstream update sed -i 's/$SOURCE_DATE_EPOCH/''${SOURCE_DATE_EPOCH}/' doc/Makefile.am sed -i 's/$SOURCE_DATE_EPOCH/''${SOURCE_DATE_EPOCH}/' doc/Makefile.in - '' + stdenv.lib.optionalString ( stdenv.isLinux && pcsclite != null) '' - sed -i 's,"libpcsclite\.so[^"]*","${stdenv.lib.getLib pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c + '' + lib.optionalString ( stdenv.isLinux && pcsclite != null) '' + sed -i 's,"libpcsclite\.so[^"]*","${lib.getLib pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c ''; #" fix Emacs syntax highlighting :-( pinentryBinaryPath = pinentry.binaryPath or "bin/pinentry"; diff --git a/pkgs/tools/security/go-cve-search/default.nix b/pkgs/tools/security/go-cve-search/default.nix new file mode 100644 index 00000000000..e68970b0b26 --- /dev/null +++ b/pkgs/tools/security/go-cve-search/default.nix @@ -0,0 +1,32 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "go-cve-search"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "s-index"; + repo = pname; + rev = "v${version}"; + sha256 = "0hbv829daviskwsyp9xjcvl52m22986b2cylf2rldnxw5x8zqdvd"; + }; + + vendorSha256 = "0bhxk39ivbkhwjvq6415lax1pzn208b7px1id0d1nry93bk2zynd"; + + # Tests requires network access + doCheck = false; + + meta = with lib; { + description = "A lightweight CVE search tool"; + longDescription = '' + go-cve-search is a lightweight tool to search CVE (Common Vulnerabilities + and Exposures). + ''; + homepage = "https://github.com/s-index/go-cve-search"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index 943bebf41c7..d85c6ca2869 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { pname = "gopass"; - version = "1.10.1"; + version = "1.11.0"; nativeBuildInputs = [ installShellFiles makeWrapper ]; @@ -20,21 +20,21 @@ buildGoModule rec { owner = "gopasspw"; repo = pname; rev = "v${version}"; - sha256 = "0dhh64mxfhk610wr7bpakzgmc4a4iyhfkkl3qhjp6a46g9iygana"; + sha256 = "0plg3hck6yqxcazjczx9m5palzz5h3qs5minzmmq8yzvfwi0shic"; }; - vendorSha256 = "07wv6yahx4yzr3h1x93x4r5rvw8wbfk836f04b4r9xjbnpq7lb2a"; + vendorSha256 = "1sycbcld5qyriqb771l52drxy4vhzm4nh9q5s6kn70nq1s2a3h7x"; doCheck = false; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev}" ]; - wrapperPath = stdenv.lib.makeBinPath ( + wrapperPath = lib.makeBinPath ( [ git gnupg xclip - ] ++ stdenv.lib.optional stdenv.isLinux wl-clipboard + ] ++ lib.optional stdenv.isLinux wl-clipboard ); postInstall = '' @@ -42,16 +42,13 @@ buildGoModule rec { $out/bin/gopass completion $shell > gopass.$shell installShellCompletion gopass.$shell done - '' + stdenv.lib.optionalString passAlias '' + '' + lib.optionalString passAlias '' ln -s $out/bin/gopass $out/bin/pass ''; - # --run to work around WONTFIX in https://github.com/gopasspw/gopass/issues/1662 postFixup = '' for bin in $out/bin/*; do - wrapProgram $bin \ - --prefix PATH : "${wrapperPath}" \ - --run 'rm -f "''${XDG_CONFIG_HOME:-~/.config}/gopass/gpg-binary.loc"' + wrapProgram $bin --prefix PATH : "${wrapperPath}" done ''; diff --git a/pkgs/tools/security/gorilla-bin/default.nix b/pkgs/tools/security/gorilla-bin/default.nix index 975976c6a3c..68aa7c48819 100644 --- a/pkgs/tools/security/gorilla-bin/default.nix +++ b/pkgs/tools/security/gorilla-bin/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, makeWrapper, patchelf, stdenv, libXft, libX11, freetype, fontconfig, libXrender, libXScrnSaver, libXext }: +{ fetchurl, makeWrapper, patchelf, lib, stdenv, libXft, libX11, freetype, fontconfig, libXrender, libXScrnSaver, libXext }: stdenv.mkDerivation rec { pname = "gorilla-bin"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { installPhase = let interpreter = "$(< \"$NIX_CC/nix-support/dynamic-linker\")"; - libPath = stdenv.lib.makeLibraryPath [ libXft libX11 freetype fontconfig libXrender libXScrnSaver libXext ]; + libPath = lib.makeLibraryPath [ libXft libX11 freetype fontconfig libXrender libXScrnSaver libXext ]; in '' mkdir -p $out/opt/password-gorilla mkdir -p $out/bin @@ -34,8 +34,8 @@ stdenv.mkDerivation rec { meta = { description = "Password Gorilla is a Tk based password manager"; homepage = "https://github.com/zdia/gorilla/wiki"; - maintainers = [ stdenv.lib.maintainers.namore ]; + maintainers = [ lib.maintainers.namore ]; platforms = [ "x86_64-linux" ]; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/tools/security/gospider/default.nix b/pkgs/tools/security/gospider/default.nix index ef3184a0422..f4b750d394a 100644 --- a/pkgs/tools/security/gospider/default.nix +++ b/pkgs/tools/security/gospider/default.nix @@ -1,20 +1,20 @@ { buildGoModule , fetchFromGitHub -, lib, stdenv +, lib }: buildGoModule rec { pname = "gospider"; - version = "1.1.4"; + version = "1.1.5"; src = fetchFromGitHub { owner = "jaeles-project"; repo = pname; rev = version; - sha256 = "03gl8y2047iwa6bhmayyds3li21wy3sw1x4hpp9zgqgi95039q86"; + sha256 = "sha256-yfW94sQzT1u6O0s1sqpeANlukC5y8fNvHNL2c77+dxU="; }; - vendorSha256 = "0dc4ddi26i38c5rvy9zbal27a7qvn17h64w1yhbig4iyb79b18ym"; + vendorSha256 = "sha256-1aOw0lk+khcX9IETA0+wGx91BFXrJ79zYWhEI2JrhDU="; # tests require internet access and API keys doCheck = false; diff --git a/pkgs/tools/security/gpgstats/default.nix b/pkgs/tools/security/gpgstats/default.nix index c9a178cff42..f6f6d367810 100644 --- a/pkgs/tools/security/gpgstats/default.nix +++ b/pkgs/tools/security/gpgstats/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cp gpgstats $out/bin ''; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!stdenv.is64bit) + NIX_CFLAGS_COMPILE = lib.optionalString (!stdenv.is64bit) "-D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1"; meta = with lib; { diff --git a/pkgs/tools/security/grype/default.nix b/pkgs/tools/security/grype/default.nix index 49530213985..dc4b487747c 100644 --- a/pkgs/tools/security/grype/default.nix +++ b/pkgs/tools/security/grype/default.nix @@ -1,21 +1,21 @@ { buildGoModule , docker , fetchFromGitHub -, lib, stdenv +, lib }: buildGoModule rec { pname = "grype"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "0schq11vckvdj538mnkdzhxl452nrssqrfapab9qc44yxdi1wf8k"; + sha256 = "sha256-co00Ye/QVNSG4h67m56+37JLilBVzHxUwMs1vS3wYX4="; }; - vendorSha256 = "0lna7zhsj3wnw83nv0dp93aj869pplb51gqzrkka7vnqp0rjcw50"; + vendorSha256 = "sha256-q7n8WLw/A2wr3z5h7zaFERY7lO5UIsmTD2mrcH/vpNs="; propagatedBuildInputs = [ docker ]; diff --git a/pkgs/tools/security/haka/default.nix b/pkgs/tools/security/haka/default.nix index bc57849dcd5..809902e8897 100644 --- a/pkgs/tools/security/haka/default.nix +++ b/pkgs/tools/security/haka/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, swig, wireshark, check, rsync, libpcap, gawk, libedit, pcre }: +{ lib, stdenv, fetchurl, cmake, swig, wireshark, check, rsync, libpcap, gawk, libedit, pcre }: let version = "0.3.0"; in @@ -27,8 +27,8 @@ stdenv.mkDerivation { meta = { description = "A collection of tools that allows capturing TCP/IP packets and filtering them based on Lua policy files"; homepage = "http://www.haka-security.org/"; - license = stdenv.lib.licenses.mpl20; - maintainers = [ stdenv.lib.maintainers.tvestelind ]; + license = lib.licenses.mpl20; + maintainers = [ lib.maintainers.tvestelind ]; platforms = [ "x86_64-linux" "i686-linux" ]; # fails on aarch64 }; } diff --git a/pkgs/tools/security/hakrawler/default.nix b/pkgs/tools/security/hakrawler/default.nix new file mode 100644 index 00000000000..fc5ee32bcba --- /dev/null +++ b/pkgs/tools/security/hakrawler/default.nix @@ -0,0 +1,30 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "hakrawler"; + version = "20201224-${lib.strings.substring 0 7 rev}"; + rev = "e39a514d0e179d33362ee244c017fb65cc2c12a5"; + + src = fetchFromGitHub { + owner = "hakluke"; + repo = "hakrawler"; + inherit rev; + sha256 = "0wpqfbpgnr94q5n7i4zh806k8n0phyg0ncnz43hqh4bbdh7l1y8a"; + }; + + vendorSha256 = "18zs2l77ds0a3wxfqcd91h269g0agnwhginrx3j6gj30dbfls8a1"; + + meta = with lib; { + description = "Web crawler for the discovery of endpoints and assets"; + homepage = "https://github.com/hakluke/hakrawler"; + longDescription = '' + Simple, fast web crawler designed for easy, quick discovery of endpoints + and assets within a web application. + ''; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/hash-slinger/default.nix b/pkgs/tools/security/hash-slinger/default.nix index 4fa0499f1dd..b8759d3571b 100644 --- a/pkgs/tools/security/hash-slinger/default.nix +++ b/pkgs/tools/security/hash-slinger/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pythonPackages, unbound, libreswan }: +{ lib, stdenv, fetchFromGitHub, pythonPackages, unbound, libreswan }: let inherit (pythonPackages) python; @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { meta = { description = "Various tools to generate special DNS records"; homepage = "https://github.com/letoams/hash-slinger"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.leenaars ]; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.leenaars ]; }; } diff --git a/pkgs/tools/security/hashcash/default.nix b/pkgs/tools/security/hashcash/default.nix index b13425b7205..f86684178fc 100644 --- a/pkgs/tools/security/hashcash/default.nix +++ b/pkgs/tools/security/hashcash/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "hashcash"; version = "1.22"; - + buildInputs = [ openssl ]; src = fetchurl { url = "http://www.hashcash.org/source/hashcash-${version}.tgz"; sha256 = "15kqaimwb2y8wvzpn73021bvay9mz1gqqfc40gk4hj6f84nz34h1"; }; - + makeFlags = [ "generic-openssl" "LIBCRYPTO=-lcrypto" @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "MAN_INSTALL_PATH=${placeholder "out"}/share/man/man1" "DOC_INSTALL_PATH=${placeholder "out"}/share/doc/hashcash-$(version)" ]; - + meta = with lib; { description = "Proof-of-work algorithm used as spam and denial-of-service counter measure"; homepage = "http://hashcash.org"; diff --git a/pkgs/tools/security/hashdeep/default.nix b/pkgs/tools/security/hashdeep/default.nix index 2f0a40dfc5e..4841dc5e07f 100644 --- a/pkgs/tools/security/hashdeep/default.nix +++ b/pkgs/tools/security/hashdeep/default.nix @@ -18,6 +18,6 @@ in stdenv.mkDerivation { homepage = "https://github.com/jessek/hashdeep"; license = licenses.gpl2; platforms = with platforms; linux ++ freebsd ++ openbsd; - maintainers = [ stdenv.lib.maintainers.karantan ]; + maintainers = [ lib.maintainers.karantan ]; }; } diff --git a/pkgs/tools/security/haveged/default.nix b/pkgs/tools/security/haveged/default.nix index c676a173092..b088f07c6e3 100644 --- a/pkgs/tools/security/haveged/default.nix +++ b/pkgs/tools/security/haveged/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "haveged"; @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { the barriers to using haveged for other tasks. ''; homepage = "http://www.issihosts.com/haveged/"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.domenkozar ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.domenkozar ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/security/hologram/default.nix b/pkgs/tools/security/hologram/default.nix index 6ec4d7776e1..9c1c896d889 100644 --- a/pkgs/tools/security/hologram/default.nix +++ b/pkgs/tools/security/hologram/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "hologram-2018-03-19"; diff --git a/pkgs/tools/security/honggfuzz/default.nix b/pkgs/tools/security/honggfuzz/default.nix index a46acef81d7..081e26e34ab 100644 --- a/pkgs/tools/security/honggfuzz/default.nix +++ b/pkgs/tools/security/honggfuzz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, callPackage, makeWrapper +{ lib, stdenv, fetchFromGitHub, callPackage, makeWrapper , clang, llvm, libbfd, libopcodes, libunwind, libblocksruntime }: @@ -43,9 +43,9 @@ let feedback-based coverage metrics. ''; homepage = "https://honggfuzz.dev/"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; platforms = ["x86_64-linux"]; - maintainers = with stdenv.lib.maintainers; [ cpu ]; + maintainers = with lib.maintainers; [ cpu ]; }; }; in honggfuzz diff --git a/pkgs/tools/security/httpdump/default.nix b/pkgs/tools/security/httpdump/default.nix new file mode 100644 index 00000000000..c2e5a62969b --- /dev/null +++ b/pkgs/tools/security/httpdump/default.nix @@ -0,0 +1,29 @@ +{ buildGoModule +, fetchFromGitHub +, lib +, libpcap +}: + +buildGoModule rec { + pname = "httpdump"; + version = "20210126-${lib.strings.substring 0 7 rev}"; + rev = "d2e0deadca5f9ec2544cb252da3c450966d1860e"; + + src = fetchFromGitHub { + owner = "hsiafan"; + repo = pname; + inherit rev; + sha256 = "0yh8kxy1k23lln09b614limwk9y59r7cn5qhbnzc06ga4mxfczv2"; + }; + + vendorSha256 = "0lb1p63lzn1ngj54bar9add7w0azvgcq3azhv9c5glk3ykv9c3iy"; + + propagatedBuildInputs = [ libpcap ]; + + meta = with lib; { + description = "Parse and display HTTP traffic from network device or pcap file"; + homepage = "https://github.com/hsiafan/httpdump"; + license = with licenses; [ bsd2 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/httpx/default.nix b/pkgs/tools/security/httpx/default.nix index 7135baab375..bff9e03bc6f 100644 --- a/pkgs/tools/security/httpx/default.nix +++ b/pkgs/tools/security/httpx/default.nix @@ -1,6 +1,6 @@ { buildGoModule , fetchFromGitHub -, lib, stdenv +, lib }: buildGoModule rec { diff --git a/pkgs/tools/security/ifdnfc/default.nix b/pkgs/tools/security/ifdnfc/default.nix index 648774c5867..34c140023ac 100644 --- a/pkgs/tools/security/ifdnfc/default.nix +++ b/pkgs/tools/security/ifdnfc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub , pkgconfig +{ lib, stdenv, fetchFromGitHub , pkg-config , pcsclite , autoreconfHook , libnfc @@ -14,7 +14,7 @@ stdenv.mkDerivation { rev = "0e48e8e"; sha256 = "1cxnvhhlcbm8h49rlw5racspb85fmwqqhd3gzzpzy68vrs0b37vg"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ pcsclite libnfc ]; configureFlags = [ "--prefix=$(out)" ]; diff --git a/pkgs/tools/security/ike-scan/default.nix b/pkgs/tools/security/ike-scan/default.nix new file mode 100644 index 00000000000..5d54e36585d --- /dev/null +++ b/pkgs/tools/security/ike-scan/default.nix @@ -0,0 +1,54 @@ +{ lib +, autoconf +, automake +, autoreconfHook +, fetchFromGitHub +, fetchpatch +, openssl +, stdenv +}: + +stdenv.mkDerivation rec { + pname = "ike-scan"; + version = "1.9.4"; + + src = fetchFromGitHub { + owner = "royhills"; + repo = pname; + rev = version; + sha256 = "01a39bk9ma2lm59q320m9g11909if5gc3qynd8pzn6slqiq5r8kw"; + }; + + nativeBuildInputs = [ + autoreconfHook + openssl + ]; + + configureFlags = [ "--with-openssl=${openssl.dev}" ]; + + patches = [ + # Using the same patches as for the Fedora RPM + (fetchpatch { + # Memory leaks, https://github.com/royhills/ike-scan/pull/15 + url = "https://github.com/royhills/ike-scan/pull/15/commits/d864811de08dcddd65ac9b8d0f2acf5d7ddb9dea.patch"; + sha256 = "0wbrq89dl8js7cdivd0c45hckmflan33cpgc3qm5s3az6r4mjljm"; + }) + (fetchpatch { + # Unknown vendor IDs, https://github.com/royhills/ike-scan/pull/18, was merged but not released + url = "https://github.com/royhills/ike-scan/pull/18/commits/e065ddbe471880275dc7975e7da235e7a2097c22.patch"; + sha256 = "13ly01c96nnd5yh7rxrhv636csm264m5xf2a1inprrzxkkri5sls"; + }) + ]; + + meta = with lib; { + description = "Tool to discover, fingerprint and test IPsec VPN servers"; + longDescription = '' + ike-scan is a command-line tool that uses the IKE protocol to discover, + fingerprint and test IPsec VPN servers. + ''; + homepage = "https://github.com/royhills/ike-scan"; + license = with licenses; [ gpl3Plus ]; + platforms = platforms.linux; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/ipscan/default.nix b/pkgs/tools/security/ipscan/default.nix index 8440b0b6ec9..a5b0fe8d928 100644 --- a/pkgs/tools/security/ipscan/default.nix +++ b/pkgs/tools/security/ipscan/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { cp usr/lib/ipscan/ipscan-any-${version}.jar $out/share/${pname}-${version}.jar makeWrapper ${jre}/bin/java $out/bin/ipscan \ - --prefix LD_LIBRARY_PATH : "$out/lib/:${stdenv.lib.makeLibraryPath [ swt xorg.libXtst ]}" \ + --prefix LD_LIBRARY_PATH : "$out/lib/:${lib.makeLibraryPath [ swt xorg.libXtst ]}" \ --add-flags "-Xmx256m -cp $out/share/${pname}-${version}.jar:${swt}/jars/swt.jar net.azib.ipscan.Main" mkdir -p $out/share/applications diff --git a/pkgs/tools/security/john/default.nix b/pkgs/tools/security/john/default.nix index 2fedec48c70..b243e10d353 100644 --- a/pkgs/tools/security/john/default.nix +++ b/pkgs/tools/security/john/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, openssl, nss, nspr, kerberos, gmp, zlib, libpcap, re2 +{ lib, stdenv, fetchurl, openssl, nss, nspr, kerberos, gmp, zlib, libpcap, re2 , gcc, python3Packages, perl, perlPackages, makeWrapper }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "john"; diff --git a/pkgs/tools/security/jwt-cli/default.nix b/pkgs/tools/security/jwt-cli/default.nix index b607cabf916..6b4639a5307 100644 --- a/pkgs/tools/security/jwt-cli/default.nix +++ b/pkgs/tools/security/jwt-cli/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1k13pw202fr5mvd0ys39n3dxwcl3sd01j6izfb28k06b6pav3wc8"; - buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.isDarwin Security; doInstallCheck = true; installCheckPhase = "$out/bin/jwt --version"; diff --git a/pkgs/tools/security/kbs2/default.nix b/pkgs/tools/security/kbs2/default.nix index e7b1c95126a..80e6e25518e 100644 --- a/pkgs/tools/security/kbs2/default.nix +++ b/pkgs/tools/security/kbs2/default.nix @@ -14,18 +14,18 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1gvvmfavaq29p40p5mq1phpp2a1nw04dz4975pzm1b6z89p0jlzl"; nativeBuildInputs = [ installShellFiles ] - ++ stdenv.lib.optionals stdenv.isLinux [ python3 ]; + ++ lib.optionals stdenv.isLinux [ python3 ]; buildInputs = [ ] - ++ stdenv.lib.optionals stdenv.isLinux [ libxcb ] - ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit ]; + ++ lib.optionals stdenv.isLinux [ libxcb ] + ++ lib.optionals stdenv.isDarwin [ AppKit ]; preCheck = '' export HOME=$TMPDIR ''; checkFlags = [ "--skip=kbs2::config::tests::test_find_config_dir" ] - ++ stdenv.lib.optionals stdenv.isDarwin [ "--skip=test_ragelib_rewrap_keyfile" ]; + ++ lib.optionals stdenv.isDarwin [ "--skip=test_ragelib_rewrap_keyfile" ]; postInstall = '' mkdir -p $out/share/kbs2 diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index ba9649f36ab..f1268717a91 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -6,7 +6,7 @@ buildGoPackage rec { pname = "keybase"; - version = "5.5.2"; + version = "5.6.1"; goPackagePath = "github.com/keybase/client"; subPackages = [ "go/kbnm" "go/keybase" ]; @@ -17,7 +17,7 @@ buildGoPackage rec { owner = "keybase"; repo = "client"; rev = "v${version}"; - sha256 = "01k50mank6cdc7q3yd8m7xi8vmyklsqlmz7hw17a35lqcsjzy9zj"; + sha256 = "12b0jdwhnvxb51x3pq0g0f23grv9yjbxmpsz36n8ab3j0fvmfg0g"; }; patches = [ @@ -28,7 +28,7 @@ buildGoPackage rec { }) ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ AVFoundation AudioToolbox ImageIO CoreMedia Foundation CoreGraphics MediaToolbox ]; + buildInputs = lib.optionals stdenv.isDarwin [ AVFoundation AudioToolbox ImageIO CoreMedia Foundation CoreGraphics MediaToolbox ]; buildFlags = [ "-tags production" ]; meta = with lib; { diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index 54be692b007..cfc282c303c 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -4,17 +4,17 @@ , runtimeShell, gsettings-desktop-schemas }: let - versionSuffix = "20201016183637.d4ebf7d999"; + versionSuffix = "20210125164223.f3b21527b9"; in stdenv.mkDerivation rec { pname = "keybase-gui"; - version = "5.5.2"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages + version = "5.6.1"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages src = fetchurl { url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version + "-" + versionSuffix}_amd64.deb"; - sha256 = "0qwbqnc6dhfnx3gdwl1lyhdsbclaxpkv3zr3dmxfx1242s64v0c1"; + sha256 = "12ckfd02j0f3p3pdlwc640f61z1wzblf2414h6fkf5vzd289h35p"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/keybase/kbfs.nix b/pkgs/tools/security/keybase/kbfs.nix index 6916d6b99bd..67abb57394c 100644 --- a/pkgs/tools/security/keybase/kbfs.nix +++ b/pkgs/tools/security/keybase/kbfs.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, keybase }: +{ lib, buildGoPackage, fetchFromGitHub, keybase }: buildGoPackage { pname = "kbfs"; diff --git a/pkgs/tools/security/keycard-cli/default.nix b/pkgs/tools/security/keycard-cli/default.nix index 73eab6c3dec..6e67358b675 100644 --- a/pkgs/tools/security/keycard-cli/default.nix +++ b/pkgs/tools/security/keycard-cli/default.nix @@ -1,20 +1,20 @@ -{ lib, buildGoPackage, fetchFromGitHub, pkgconfig, pcsclite }: +{ lib, buildGoPackage, fetchFromGitHub, pkg-config, pcsclite }: buildGoPackage rec { pname = "keycard-cli"; - version = "0.4.0"; + version = "0.6.0"; goPackagePath = "github.com/status-im/keycard-cli"; subPackages = [ "." ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pcsclite ]; src = fetchFromGitHub { owner = "status-im"; repo = pname; rev = version; - sha256 = "0917vl5lw8wgvyn5l8q6xa8bqh342fibaa38syr8hmz8b09qkh38"; + sha256 = "sha256-ejFvduZs3eWc6efr9o4pXb6qw2QWWQTtkTxF80vOGNU="; }; buildFlagsArray = [ diff --git a/pkgs/tools/security/knockknock/default.nix b/pkgs/tools/security/knockknock/default.nix index 7a00f183f15..960667e72de 100644 --- a/pkgs/tools/security/knockknock/default.nix +++ b/pkgs/tools/security/knockknock/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python2Packages, hping }: +{ lib, fetchFromGitHub, python2Packages, hping }: let rev = "bf14bbff"; in python2Packages.buildPythonApplication rec { diff --git a/pkgs/tools/security/kpcli/default.nix b/pkgs/tools/security/kpcli/default.nix index a0dd8c7fc8b..d0e260bb677 100644 --- a/pkgs/tools/security/kpcli/default.nix +++ b/pkgs/tools/security/kpcli/default.nix @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { makeWrapper $out/share/kpcli.pl $out/bin/kpcli --set PERL5LIB \ "${with perlPackages; makePerlPath ([ CaptureTiny Clipboard Clone CryptRijndael SortNaturally TermReadKey TermShellUI FileKeePass TermReadLineGnu XMLParser - ] ++ stdenv.lib.optional stdenv.isDarwin MacPasteboard)}" + ] ++ lib.optional stdenv.isDarwin MacPasteboard)}" ''; meta = with lib; { description = "KeePass Command Line Interface"; longDescription = '' - KeePass Command Line Interface (CLI) / interactive shell. + KeePass Command Line Interface (CLI) / interactive shell. Use this program to access and manage your KeePass 1.x or 2.x databases from a Unix-like command line. ''; license = licenses.artistic1; diff --git a/pkgs/tools/security/kwalletcli/default.nix b/pkgs/tools/security/kwalletcli/default.nix index d03de5f7cfc..c1849bdca39 100644 --- a/pkgs/tools/security/kwalletcli/default.nix +++ b/pkgs/tools/security/kwalletcli/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, fetchFromGitHub, lib, makeWrapper, pkgconfig +{ mkDerivation, fetchFromGitHub, lib, makeWrapper, pkg-config , kcoreaddons, ki18n, kwallet, mksh, pinentry-qt }: mkDerivation rec { @@ -26,7 +26,7 @@ mkDerivation rec { makeFlags = [ "KDE_VER=5" ]; - nativeBuildInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkg-config ]; # if using just kwallet, cmake will be added as a buildInput and fail the build propagatedBuildInputs = [ kcoreaddons ki18n (lib.getLib kwallet) ]; diff --git a/pkgs/tools/security/lastpass-cli/default.nix b/pkgs/tools/security/lastpass-cli/default.nix index 7ec902bcb99..8d2074f9835 100644 --- a/pkgs/tools/security/lastpass-cli/default.nix +++ b/pkgs/tools/security/lastpass-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, asciidoc, cmake, docbook_xsl, pkgconfig +{ stdenv, lib, fetchFromGitHub, asciidoc, cmake, docbook_xsl, pkg-config , bash-completion, openssl, curl, libxml2, libxslt }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "168jg8kjbylfgalhicn0llbykd7kdc9id2989gg0nxlgmnvzl58a"; }; - nativeBuildInputs = [ asciidoc cmake docbook_xsl pkgconfig ]; + nativeBuildInputs = [ asciidoc cmake docbook_xsl pkg-config ]; buildInputs = [ bash-completion curl openssl libxml2 libxslt diff --git a/pkgs/tools/security/lesspass-cli/default.nix b/pkgs/tools/security/lesspass-cli/default.nix index 20473d1003e..ce64b6847fe 100644 --- a/pkgs/tools/security/lesspass-cli/default.nix +++ b/pkgs/tools/security/lesspass-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3, fetchFromGitHub }: +{ lib, python3, fetchFromGitHub }: let inherit (python3.pkgs) buildPythonApplication pytest mock pexpect; diff --git a/pkgs/tools/security/libacr38u/default.nix b/pkgs/tools/security/libacr38u/default.nix index 126cfedd157..314abba853d 100644 --- a/pkgs/tools/security/libacr38u/default.nix +++ b/pkgs/tools/security/libacr38u/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, pcsclite , libusb-compat-0_1 }: +{ lib, stdenv, fetchurl, pkg-config, pcsclite , libusb-compat-0_1 }: stdenv.mkDerivation { version = "1.7.11"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { doCheck = true; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pcsclite libusb-compat-0_1 ]; preBuild = '' @@ -38,4 +38,4 @@ stdenv.mkDerivation { maintainers = with maintainers; [ berce ]; platforms = with platforms; unix; }; -} +} diff --git a/pkgs/tools/security/libmodsecurity/default.nix b/pkgs/tools/security/libmodsecurity/default.nix index 5735263206e..2222316a742 100644 --- a/pkgs/tools/security/libmodsecurity/default.nix +++ b/pkgs/tools/security/libmodsecurity/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config , doxygen, perl, valgrind , curl, geoip, libxml2, lmdb, lua, pcre, yajl }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "00g2407g2679zv73q67zd50z0f1g1ij734ssv2pp77z4chn5dzib"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig doxygen ]; + nativeBuildInputs = [ autoreconfHook pkg-config doxygen ]; buildInputs = [ perl valgrind curl geoip libxml2 lmdb lua pcre yajl ]; diff --git a/pkgs/tools/security/lynis/default.nix b/pkgs/tools/security/lynis/default.nix index 6533c9e96fd..27dc6504e8b 100644 --- a/pkgs/tools/security/lynis/default.nix +++ b/pkgs/tools/security/lynis/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lynis"; - version = "3.0.1"; + version = "3.0.3"; src = fetchFromGitHub { owner = "CISOfy"; repo = pname; rev = version; - sha256 = "0lsb455rimr1cjxqcgy819xjxf1faas8wlx2x0pxhn5yha9w9sfs"; + sha256 = "sha256-+RkzsBcQhHrfY8gEiJK3ptDeulJzA3IuVXiYEpyAsmk="; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { install -d $out/bin $out/share/lynis/plugins cp -r include db default.prf $out/share/lynis/ cp -a lynis $out/bin - wrapProgram "$out/bin/lynis" --prefix PATH : ${stdenv.lib.makeBinPath [ gawk ]} + wrapProgram "$out/bin/lynis" --prefix PATH : ${lib.makeBinPath [ gawk ]} installManPage lynis.8 installShellCompletion --bash --name lynis.bash \ diff --git a/pkgs/tools/security/masscan/default.nix b/pkgs/tools/security/masscan/default.nix index 0f45edcff6c..b58163630c6 100644 --- a/pkgs/tools/security/masscan/default.nix +++ b/pkgs/tools/security/masscan/default.nix @@ -1,17 +1,23 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, libpcap }: +{ lib +, stdenv +, fetchFromGitHub +, installShellFiles +, makeWrapper +, libpcap +}: stdenv.mkDerivation rec { pname = "masscan"; - version = "1.3.0"; + version = "1.3.2"; src = fetchFromGitHub { - owner = "robertdavidgraham"; - repo = "masscan"; - rev = version; - sha256 = "04nlnficybgxa16kq9fwrrfjsbyiaps4mikfqgdr206fkqk9i05y"; + owner = "robertdavidgraham"; + repo = "masscan"; + rev = version; + sha256 = "sha256-mnGC/moQANloR5ODwRjzJzBa55OEZ9QU+9WpAHxQE/g="; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper installShellFiles ]; makeFlags = [ "PREFIX=$(out)" "GITVER=${version}" "CC=cc" ]; @@ -20,13 +26,13 @@ stdenv.mkDerivation rec { ''; postInstall = '' - mkdir -p $out/share/man/man8 + installManPage doc/masscan.8 + mkdir -p $out/share/{doc,licenses}/masscan mkdir -p $out/etc/masscan cp data/exclude.conf $out/etc/masscan cp -t $out/share/doc/masscan doc/algorithm.js doc/howto-afl.md doc/bot.html - cp doc/masscan.8 $out/share/man/man8/masscan.8 cp LICENSE $out/share/licenses/masscan/LICENSE wrapProgram $out/bin/masscan --prefix LD_LIBRARY_PATH : "${libpcap}/lib" @@ -34,9 +40,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Fast scan of the Internet"; - homepage = "https://github.com/robertdavidgraham/masscan"; - license = licenses.agpl3; - platforms = platforms.unix; + homepage = "https://github.com/robertdavidgraham/masscan"; + changelog = "https://github.com/robertdavidgraham/masscan/releases/tag/${version}"; + license = licenses.agpl3Only; + platforms = platforms.unix; maintainers = with maintainers; [ rnhmjoj ]; }; } diff --git a/pkgs/tools/security/mbox/default.nix b/pkgs/tools/security/mbox/default.nix index 7292ac6785f..dd73e1624c7 100644 --- a/pkgs/tools/security/mbox/default.nix +++ b/pkgs/tools/security/mbox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, openssl, which }: +{ lib, stdenv, fetchFromGitHub, openssl, which }: stdenv.mkDerivation { name = "mbox-20140526"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { cd src cp {.,}configsbox.h ''; - + doCheck = true; checkPhase = '' rm tests/test-*vim.sh tests/test-pip.sh @@ -27,7 +27,7 @@ stdenv.mkDerivation { ./testall.sh ''; - meta = with stdenv.lib; + meta = with lib; { description = "Lightweight sandboxing mechanism that any user can use without special privileges"; homepage = "http://pdos.csail.mit.edu/mbox/"; maintainers = with maintainers; [ ehmry ]; diff --git a/pkgs/tools/security/meo/default.nix b/pkgs/tools/security/meo/default.nix index 54b96917623..05aa8323cc9 100644 --- a/pkgs/tools/security/meo/default.nix +++ b/pkgs/tools/security/meo/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchhg, openssl, pcre-cpp, qt4, boost, pkcs11helper }: +{ lib, stdenv, fetchhg, openssl, pcre-cpp, qt4, boost, pkcs11helper }: stdenv.mkDerivation { name = "meo-20121113"; - + src = fetchhg { url = "http://oss.stamfest.net/hg/meo"; rev = "b48e5f16cff8"; @@ -27,9 +27,9 @@ stdenv.mkDerivation { meta = { homepage = "http://oss.stamfest.net/wordpress/meo-multiple-eyepairs-only"; description = "Tools to use cryptography for things like four-eyes principles"; - license = stdenv.lib.licenses.agpl3Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; broken = true; }; } diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 4df0d2235a0..71f6b1a4c6d 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/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/6.0.12" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.28" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 8ef6d3b3148..a42529d4efc 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 8ba313ed85b03ef54bec32086c2a8708a7e1df58 - ref: refs/tags/6.0.12 + revision: 84ecddbbed1f1957b8684c2027bb8a3e5eb163a0 + ref: refs/tags/6.0.28 specs: - metasploit-framework (6.0.12) + metasploit-framework (6.0.28) actionpack (~> 5.2.2) activerecord (~> 5.2.2) activesupport (~> 5.2.2) @@ -31,9 +31,9 @@ GIT metasploit-concern metasploit-credential metasploit-model - metasploit-payloads (= 2.0.22) + metasploit-payloads (= 2.0.27) metasploit_data_models - metasploit_payloads-mettle (= 1.0.2) + metasploit_payloads-mettle (= 1.0.5) mqtt msgpack nessus_rest @@ -50,6 +50,7 @@ GIT pcaprub pdf-reader pg + puma railties rb-readline recog @@ -86,11 +87,12 @@ GIT windows_error xdr xmlrpc + zeitwerk GEM remote: https://rubygems.org/ specs: - Ascii85 (1.0.3) + Ascii85 (1.1.0) actionpack (5.2.4.4) actionview (= 5.2.4.4) activesupport (= 5.2.4.4) @@ -119,41 +121,41 @@ GEM public_suffix (>= 2.0.2, < 5.0) afm (0.2.2) arel (9.0.0) - arel-helpers (2.11.0) + arel-helpers (2.12.0) activerecord (>= 3.1.0, < 7) aws-eventstream (1.1.0) - aws-partitions (1.385.0) - aws-sdk-core (3.109.1) + aws-partitions (1.422.0) + aws-sdk-core (3.111.2) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.202.0) + aws-sdk-ec2 (1.221.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) aws-sdk-iam (1.46.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.39.0) + aws-sdk-kms (1.41.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.83.1) + aws-sdk-s3 (1.87.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) aws-sigv4 (1.2.2) aws-eventstream (~> 1, >= 1.0.2) bcrypt (3.1.16) - bcrypt_pbkdf (1.0.1) + bcrypt_pbkdf (1.1.0) bindata (2.4.8) bit-struct (0.16) - bson (4.11.0) + bson (4.11.1) builder (3.2.4) concurrent-ruby (1.0.5) cookiejar (0.3.3) crass (1.0.6) daemons (1.3.1) - dnsruby (1.61.4) + dnsruby (1.61.5) simpleidn (~> 0.1) ed25519 (1.2.4) em-http-request (1.1.7) @@ -164,13 +166,15 @@ GEM http_parser.rb (>= 0.6.0) em-socksify (0.3.2) eventmachine (>= 1.0.0.beta.4) - erubi (1.9.0) + erubi (1.10.0) eventmachine (1.2.7) - faker (2.14.0) + faker (2.15.1) i18n (>= 1.6, < 2) - faraday (1.1.0) + faraday (1.3.0) + faraday-net_http (~> 1.0) multipart-post (>= 1.2, < 3) ruby2_keywords + faraday-net_http (1.0.1) faye-websocket (0.11.0) eventmachine (>= 0.12.0) websocket-driver (>= 0.5.1) @@ -179,24 +183,24 @@ GEM hrr_rb_ssh (0.3.0.pre2) ed25519 (~> 1.2) http_parser.rb (0.6.0) - i18n (1.8.5) + i18n (1.8.7) concurrent-ruby (~> 1.0) - io-console (0.5.6) - irb (1.2.7) + io-console (0.5.7) + irb (1.3.2) reline (>= 0.1.5) jmespath (1.4.0) jsobfu (0.4.2) rkelly-remix - json (2.3.1) - loofah (2.7.0) + json (2.5.1) + loofah (2.9.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) metasm (1.0.4) - metasploit-concern (3.0.0) + metasploit-concern (3.0.1) activemodel (~> 5.2.2) activesupport (~> 5.2.2) railties (~> 5.2.2) - metasploit-credential (4.0.2) + metasploit-credential (4.0.3) metasploit-concern metasploit-model metasploit_data_models (>= 3.0.0) @@ -206,12 +210,12 @@ GEM rex-socket rubyntlm rubyzip - metasploit-model (3.1.2) + metasploit-model (3.1.3) activemodel (~> 5.2.2) activesupport (~> 5.2.2) railties (~> 5.2.2) - metasploit-payloads (2.0.22) - metasploit_data_models (4.1.0) + metasploit-payloads (2.0.27) + metasploit_data_models (4.1.1) activerecord (~> 5.2.2) activesupport (~> 5.2.2) arel-helpers @@ -220,23 +224,25 @@ GEM pg railties (~> 5.2.2) recog (~> 2.0) - metasploit_payloads-mettle (1.0.2) + metasploit_payloads-mettle (1.0.5) method_source (1.0.0) - mini_portile2 (2.4.0) - minitest (5.14.2) + mini_portile2 (2.5.0) + minitest (5.14.3) mqtt (0.5.0) - msgpack (1.3.3) + msgpack (1.4.2) multipart-post (2.1.1) mustermann (1.1.1) ruby2_keywords (~> 0.0.1) nessus_rest (0.1.6) - net-ldap (0.16.3) + net-ldap (0.17.0) net-ssh (6.1.0) network_interface (0.0.2) nexpose (7.2.1) - nokogiri (1.10.10) - mini_portile2 (~> 2.4.0) - octokit (4.19.0) + nio4r (2.5.4) + nokogiri (1.11.1) + mini_portile2 (~> 2.5.0) + racc (~> 1.4) + octokit (4.20.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) openssl-ccm (1.2.2) @@ -246,14 +252,17 @@ GEM pcaprub patch_finder (1.0.2) pcaprub (0.13.0) - pdf-reader (2.4.1) - Ascii85 (~> 1.0.0) + pdf-reader (2.4.2) + Ascii85 (~> 1.0) afm (~> 0.2.1) hashery (~> 2.0) ruby-rc4 ttfunk pg (1.2.3) public_suffix (4.0.6) + puma (5.2.0) + nio4r (~> 2.0) + racc (1.5.2) rack (2.2.3) rack-protection (2.1.0) rack @@ -270,76 +279,76 @@ GEM method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) - rake (13.0.1) + rake (13.0.3) rb-readline (0.5.5) - recog (2.3.15) + recog (2.3.18) nokogiri - redcarpet (3.5.0) - reline (0.1.6) + redcarpet (3.5.1) + reline (0.2.2) io-console (~> 0.5) - rex-arch (0.1.13) + rex-arch (0.1.14) rex-text - rex-bin_tools (0.1.6) + rex-bin_tools (0.1.7) metasm rex-arch rex-core rex-struct2 rex-text - rex-core (0.1.13) - rex-encoder (0.1.4) + rex-core (0.1.14) + rex-encoder (0.1.5) metasm rex-arch rex-text - rex-exploitation (0.1.24) + rex-exploitation (0.1.26) jsobfu metasm rex-arch rex-encoder rex-text - rex-java (0.1.5) - rex-mime (0.1.5) + rex-java (0.1.6) + rex-mime (0.1.6) rex-text - rex-nop (0.1.1) + rex-nop (0.1.2) rex-arch - rex-ole (0.1.6) + rex-ole (0.1.7) rex-text - rex-powershell (0.1.87) + rex-powershell (0.1.89) rex-random_identifier rex-text ruby-rc4 - rex-random_identifier (0.1.4) + rex-random_identifier (0.1.5) rex-text - rex-registry (0.1.3) - rex-rop_builder (0.1.3) + rex-registry (0.1.4) + rex-rop_builder (0.1.4) metasm rex-core rex-text - rex-socket (0.1.24) + rex-socket (0.1.25) rex-core rex-sslscan (0.1.5) rex-core rex-socket rex-text - rex-struct2 (0.1.2) - rex-text (0.2.28) - rex-zip (0.1.3) + rex-struct2 (0.1.3) + rex-text (0.2.31) + rex-zip (0.1.4) rex-text rkelly-remix (0.0.7) - ruby-macho (2.3.0) + ruby-macho (2.5.0) ruby-rc4 (0.1.5) - ruby2_keywords (0.0.2) - ruby_smb (2.0.6) + ruby2_keywords (0.0.4) + ruby_smb (2.0.7) bindata openssl-ccm openssl-cmac rubyntlm windows_error - rubyntlm (0.6.2) + rubyntlm (0.6.3) rubyzip (2.3.0) sawyer (0.8.2) addressable (>= 2.3.5) faraday (> 0.8, < 2.0) - simpleidn (0.1.1) + simpleidn (0.2.1) unf (~> 0.1.4) sinatra (2.1.0) mustermann (~> 1.0) @@ -348,17 +357,17 @@ GEM tilt (~> 2.0) sqlite3 (1.4.2) sshkey (2.0.0) - thin (1.7.2) + thin (1.8.0) daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) - thor (1.0.1) + thor (1.1.0) thread_safe (0.3.6) tilt (2.0.10) - ttfunk (1.6.2.1) - tzinfo (1.2.7) + ttfunk (1.7.0) + tzinfo (1.2.9) thread_safe (~> 0.1) - tzinfo-data (1.2020.4) + tzinfo-data (1.2021.1) tzinfo (>= 1.0.0) unf (0.1.4) unf_ext @@ -372,7 +381,8 @@ GEM xdr (3.0.2) activemodel (>= 4.2, < 7.0) activesupport (>= 4.2, < 7.0) - xmlrpc (0.3.0) + xmlrpc (0.3.1) + zeitwerk (2.4.2) PLATFORMS ruby diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 1260584a3a7..f50c29aebb7 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -8,13 +8,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.0.12"; + version = "6.0.28"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "1kh5alvw68lxnm1wcwbka983b5ww7bqvbkih831mrf6sfmv4wkxs"; + sha256 = "sha256-EX3rwg8aMEb1opw/y1+Dai/1SmrfmZye5TWM3w9YiuM="; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 4879eb92284..e8d8e01b6d5 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -84,20 +84,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16irs6rai9pasv36yy31glijs3p2pvgry5g1lh03vnzg8xpb1msp"; + sha256 = "12wgkhajfsm3fgk43zf7xyxrx7q2kc4ggq459p1az6p0b9jscarx"; type = "gem"; }; - version = "2.11.0"; + version = "2.12.0"; }; Ascii85 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0658m37jjjn6drzqg1gk4p6c205mgp7g1jh2d00n4ngghgmz5qvs"; + sha256 = "1ds4v9xgsyvijnlflak4dzf1qwmda9yd5bv8jwsb56nngd399rlw"; type = "gem"; }; - version = "1.0.3"; + version = "1.1.0"; }; aws-eventstream = { groups = ["default"]; @@ -114,30 +114,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04i4bry59c3g1anbjpsz9g1pz7yy23kh4vvhg7z611amlcr48zvb"; + sha256 = "01j13abaxzi32gbdrm1v292kh331rlgcr6w1jl78hpcw6hp74r99"; type = "gem"; }; - version = "1.385.0"; + version = "1.422.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xmppcxq7jm8lffqibkhq257hfwfbv82zm2y1fbhwm3icgxzwlfx"; + sha256 = "0bfj1cnpp0ljr9jc44kljdwl5399cbqlvlqkz6fxq5i4r6ckggi4"; type = "gem"; }; - version = "3.109.1"; + version = "3.111.2"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fsf9qhlxczz8cz755xlcdpfqn384d4kr3ybx2p54n377wamdq08"; + sha256 = "0mwd98gmnakz9bkn5kqn5wbk5q2iz7hsbd1xi8256f6ppw07wzi3"; type = "gem"; }; - version = "1.202.0"; + version = "1.221.0"; }; aws-sdk-iam = { groups = ["default"]; @@ -154,20 +154,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ly1m631qm2ciif7sysbzrgczjvz95ga3g6w6vrzvfdv31jjnl9a"; + sha256 = "02f70a4rr5h2na7navjhaf3n15ifq95zdl1avsryyxdvqzm5gzwm"; type = "gem"; }; - version = "1.39.0"; + version = "1.41.0"; }; aws-sdk-s3 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "021yqghdb1i980vn249hv44jajr0v3hq4ik4r6fqh9kwp04fsbqv"; + sha256 = "0capqhvm08ngq74n33ym0khixkdj342jpikssw57avdmd8g6kaq7"; type = "gem"; }; - version = "1.83.1"; + version = "1.87.0"; }; aws-sigv4 = { groups = ["default"]; @@ -194,10 +194,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02vssr285m7kpsr47jdmzbar1h1d0mnkmyrpr1zg828isfmwii35"; + sha256 = "0ndamfaivnkhc6hy0yqyk2gkwr6f3bz6216lh74hsiiyk3axz445"; type = "gem"; }; - version = "1.0.1"; + version = "1.1.0"; }; bindata = { groups = ["default"]; @@ -224,10 +224,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bm64q413wrrm3pda6ha2kn1yipyl0qp5240fwsdw1hkqhbjdnjm"; + sha256 = "12v95l3v7n7lh3mk8k1jdrkpn2vjnkb8k636hcygaczzv4jdsdfp"; type = "gem"; }; - version = "4.11.0"; + version = "4.11.1"; }; builder = { groups = ["default"]; @@ -284,10 +284,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i4mq4zm8bqd0ik908gnn8nm3kph268af7q173wlq4krg3nw562x"; + sha256 = "0q7k7wn8flcdr0kzgknq40cjddd0zn3g3n4gwwwdz0kq30pinzxx"; type = "gem"; }; - version = "1.61.4"; + version = "1.61.5"; }; ed25519 = { groups = ["default"]; @@ -324,10 +324,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nwzxnqhr31fn7nbqmffcysvxjdfl3bhxi0bld5qqhcnfc1xd13x"; + sha256 = "09l8lz3j00m898li0yfsnb6ihc63rdvhw3k5xczna5zrjk104f2l"; type = "gem"; }; - version = "1.9.0"; + version = "1.10.0"; }; eventmachine = { groups = ["default"]; @@ -344,20 +344,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06sh8492k03p9lsfzv5zifzn51ilb4734vrvwl30vzmzg1apzml6"; + sha256 = "1l0dvswigzxaz9558wmfix3v8cmwwkgdvrx1fmpd3qnr5hky1qrk"; type = "gem"; }; - version = "2.14.0"; + version = "2.15.1"; }; faraday = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16dapwi5pivrl25r4lkr1mxjrzkznj4wlcb08fzkmxnj4g5c6y35"; + sha256 = "1hmssd8pj4n7yq4kz834ylkla8ryyvhaap6q9nzymp93m1xq21kz"; type = "gem"; }; - version = "1.1.0"; + version = "1.3.0"; + }; + faraday-net_http = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j"; + type = "gem"; + }; + version = "1.0.1"; }; faye-websocket = { groups = ["default"]; @@ -414,30 +424,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "153sx77p16vawrs4qpkv7qlzf9v5fks4g7xqcj1dwk40i6g7rfzk"; + sha256 = "1kr0bx9323fv5ys6nlhsy05kmwcbs94h6ac7ka9qqywy0vbdvrrv"; type = "gem"; }; - version = "1.8.5"; + version = "1.8.7"; }; io-console = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vbn4nvnr1pcmjsn0gghc3bz2md89njxq4801zi5dv5niypdxlsp"; + sha256 = "1gp1xx2g1x81wsh929x7rzsm0c8qgkhr2mkjn79fbdwyfnk4s04l"; type = "gem"; }; - version = "0.5.6"; + version = "0.5.7"; }; irb = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10d9xr1hdpkqhljxhvdm44c2qbxdjfqm5x00d4v6aw0fym1w7r2g"; + sha256 = "166xravh6r82w46d8hcjrg55gnyjdf0501g16lb48i2h06k363l2"; type = "gem"; }; - version = "1.2.7"; + version = "1.3.2"; }; jmespath = { groups = ["default"]; @@ -464,20 +474,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "158fawfwmv2sq4whqqaksfykkiad2xxrrj0nmpnc6vnlzi1bp7iz"; + sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci"; type = "gem"; }; - version = "2.3.1"; + version = "2.5.1"; }; loofah = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1alz1x6rkhbw10qpszr384299rf52rcyasn0619a9p50vzs8vczq"; + sha256 = "0bzwvxvilx7w1p3pg028ks38925y9i0xm870lm7s12w7598hiyck"; type = "gem"; }; - version = "2.7.0"; + version = "2.9.0"; }; metasm = { groups = ["default"]; @@ -494,72 +504,72 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10a9dr0pi25vsnk7x1bavx2ja62lqswdkym0hvhjsds6awvx1cf2"; + sha256 = "19cz0g463wl35gpdy1630n88a9m7fhhlcylspvvwc0m01sipc33g"; type = "gem"; }; - version = "3.0.0"; + version = "3.0.1"; }; metasploit-credential = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03339i3v6lgz0cymn2i7y0sylpw2nihsc8h75c4yn3bq9p6wk6sx"; + sha256 = "1f6cjvk68yypciycp8vdvhc5hrwmc8qi4y06s1cd77zj4m2skkmn"; type = "gem"; }; - version = "4.0.2"; + version = "4.0.3"; }; metasploit-framework = { groups = ["default"]; platforms = []; source = { fetchSubmodules = false; - rev = "8ba313ed85b03ef54bec32086c2a8708a7e1df58"; - sha256 = "1kh5alvw68lxnm1wcwbka983b5ww7bqvbkih831mrf6sfmv4wkxs"; + rev = "84ecddbbed1f1957b8684c2027bb8a3e5eb163a0"; + sha256 = "1qwab07xz31mwng9r6fzd95gabvahdgwngwwlbslcc0s1z1fnz8i"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.0.12"; + version = "6.0.28"; }; metasploit-model = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0szwqs6djh882alpnmnnkx46s548jg3vb0ya61hibw3kqcw3i1ig"; + sha256 = "0gmh23c3hc4my244m5lpd4kiysrsprag4rn6kvnnphxiflxvi4f7"; type = "gem"; }; - version = "3.1.2"; + version = "3.1.3"; }; metasploit-payloads = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yiwwyc12f9jln58l4j26yjbixij1v5h3spp4ci3ik4dxyk2r4zb"; + sha256 = "1c3jn9gjy1bknyd7wrwwfbcjwlmijd6nnsjzyqc7yszjjy0yqca2"; type = "gem"; }; - version = "2.0.22"; + version = "2.0.27"; }; metasploit_data_models = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n7vb6pg446jadjsgrc29kxnc9b6ga29hw8pg52dnrzhp7rwhiyl"; + sha256 = "1czqg49b7n9n2iqp6r4f1cxh8kd39gbjvydq09hzmzdmkwxh3x1f"; type = "gem"; }; - version = "4.1.0"; + version = "4.1.1"; }; metasploit_payloads-mettle = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "147s4jd2hckls76binsskb6rvnh1crd2agmf1lk7fsj1n55dhkvk"; + sha256 = "0z6gnidpcpdm80vvl0yw1h10kchkaw9whcsv2kwy7ih6247l7nbq"; type = "gem"; }; - version = "1.0.2"; + version = "1.0.5"; }; method_source = { groups = ["default"]; @@ -576,20 +586,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; + sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7"; type = "gem"; }; - version = "2.4.0"; + version = "2.5.0"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "170y2cvx51gm3cm3nhdf7j36sxnkh6vv8ls36p90ric7w8w16h4v"; + sha256 = "0ipjhdw8ds6q9h7bs3iw28bjrwkwp215hr4l3xf6215fsl80ky5j"; type = "gem"; }; - version = "5.14.2"; + version = "5.14.3"; }; mqtt = { groups = ["default"]; @@ -606,10 +616,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lva6bkvb4mfa0m3bqn4lm4s4gi81c40jvdcsrxr6vng49q9daih"; + sha256 = "06iajjyhx0rvpn4yr3h1hc4w4w3k59bdmfhxnjzzh76wsrdxxrc6"; type = "gem"; }; - version = "1.3.3"; + version = "1.4.2"; }; multipart-post = { groups = ["default"]; @@ -646,10 +656,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13lh6qizxi8fza8py73b2dvjp9p010dvbaq7diagir9nh8plsinv"; + sha256 = "1j19yxrz7h3hj7kiiln13c7bz7hvpdqr31bwi88dj64zifr7896n"; type = "gem"; }; - version = "0.16.3"; + version = "0.17.0"; }; net-ssh = { groups = ["default"]; @@ -681,25 +691,35 @@ }; version = "7.2.1"; }; + nio4r = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1cbwp1kbv6b2qfxv8sarv0d0ilb257jihlvdqj8f5pdm0ksq1sgk"; + type = "gem"; + }; + version = "2.5.4"; + }; nokogiri = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xmf60nj5kg9vaj5bysy308687sgmkasgx06vbbnf94p52ih7si2"; + sha256 = "1ajwkqr28hwqbyl1l3czx4a34c88acxywyqp8cjyy0zgsd6sbhj2"; type = "gem"; }; - version = "1.10.10"; + version = "1.11.1"; }; octokit = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dz8na8fk445yqrwpkl31fimnap7p4xf9m9qm9i7cpvaxxgk2n24"; + sha256 = "1fl517ld5vj0llyshp3f9kb7xyl9iqy28cbz3k999fkbwcxzhlyq"; type = "gem"; }; - version = "4.19.0"; + version = "4.20.0"; }; openssl-ccm = { groups = ["default"]; @@ -766,10 +786,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0987glcd02mqglplmp1camivqx61jsyik21n99vrmi8s2p7h4mbh"; + sha256 = "1cxladxy18dhk4a3b263crq8hyxb3q0c7ifxrb5nr1bs6y0pk8i6"; type = "gem"; }; - version = "2.4.1"; + version = "2.4.2"; }; pg = { groups = ["default"]; @@ -791,6 +811,26 @@ }; version = "4.0.6"; }; + puma = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fmcz4dp7ggkv1h4n51vn1gq0r4zbkw7sr2ssl4ws1khb86grkv5"; + type = "gem"; + }; + version = "5.2.0"; + }; + racc = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g"; + type = "gem"; + }; + version = "1.5.2"; + }; rack = { groups = ["default"]; platforms = []; @@ -856,10 +896,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w6qza25bq1s825faaglkx1k6d59aiyjjk3yw3ip5sb463mhhai9"; + sha256 = "1iik52mf9ky4cgs38fp2m8r6skdkq1yz23vh18lk95fhbcxb6a67"; type = "gem"; }; - version = "13.0.1"; + version = "13.0.3"; }; rb-readline = { groups = ["default"]; @@ -876,170 +916,170 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vxnm9ld3rn8xxccq9jyhzz6558bqfxdb3sd4na20frg9f5pflb7"; + sha256 = "0inz904fbsjscjs71lxxj4070lm1klm27m9prmrhqybc0hr95l69"; type = "gem"; }; - version = "2.3.15"; + version = "2.3.18"; }; redcarpet = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0skcyx1h8b5ms0rp2zm3ql6g322b8c1adnkwkqyv7z3kypb4bm7k"; + sha256 = "0bvk8yyns5s1ls437z719y5sdv9fr8kfs8dmr6g8s761dv5n8zvi"; type = "gem"; }; - version = "3.5.0"; + version = "3.5.1"; }; reline = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sspfd5x8aq80pmkdj0dzd20iclhrdjan1ibkrivgk7j8af23hbk"; + sha256 = "0zinl7l63gzy6y477j8w1azfm5655h2026hxl49w4c73qcfdjj3x"; type = "gem"; }; - version = "0.1.6"; + version = "0.2.2"; }; rex-arch = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cvdy2ysiphdig258lkicbxqq2y47bkl69kgj4kkj8w338rb5kwa"; + sha256 = "1gi9641869pg30ij7ba3r2z89flvdqsma4spbpww6c8ph62iy4bp"; type = "gem"; }; - version = "0.1.13"; + version = "0.1.14"; }; rex-bin_tools = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19q4cj7cis29k3zx9j2gp4h3ib0zig2fa4rs56c1gjr32f192zzk"; + sha256 = "16w219ashxrgrgb5via9k45h7whrib77rmwy0f7akqf409pzjdp7"; type = "gem"; }; - version = "0.1.6"; + version = "0.1.7"; }; rex-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b9pf7f8m2zjck65dpp8h8v4n0a05kfas6cn9adv0w8d9z58aqvv"; + sha256 = "0mmsckkrds6jvg1b4sdq4cv9s1q0idjiy1k8kjfvgylz96ap0vlw"; type = "gem"; }; - version = "0.1.13"; + version = "0.1.14"; }; rex-encoder = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zm5jdxgyyp8pkfqwin34izpxdrmglx6vmk20ifnvcsm55c9m70z"; + sha256 = "0lnrlii8d3r35927wp42bpdzh37dx3jqgdxk6lk5d6xvz6h14kp7"; type = "gem"; }; - version = "0.1.4"; + version = "0.1.5"; }; rex-exploitation = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0inrf2vahmpxhjf84i8ak2b7gcirsrjrmb1rnvvqqr9kl0xw5xm3"; + sha256 = "0z4dn579mxl22qdxcnbmxp0diia6kr7c20giv0bn4r0viavz49gc"; type = "gem"; }; - version = "0.1.24"; + version = "0.1.26"; }; rex-java = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j58k02p5g9snkpak64sb4aymkrvrh9xpqh8wsnya4w7b86w2y6i"; + sha256 = "0g8xdj7ij4y51wgh6l29al6i107bqn6pwql6za7ahms75m8s9dys"; type = "gem"; }; - version = "0.1.5"; + version = "0.1.6"; }; rex-mime = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15a14kz429h7pn81ysa6av3qijxjmxagjff6dyss5v394fxzxf4a"; + sha256 = "0wzw1qcdgbn3iyskppy5038mcdrzplyai45pilm5qjj4fwvjdl6m"; type = "gem"; }; - version = "0.1.5"; + version = "0.1.6"; }; rex-nop = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0aigf9qsqsmiraa6zvfy1a7cyvf7zc3iyhzxi6fjv5sb8f64d6ny"; + sha256 = "0yjlmgmaaa65lkd6jrm71g8yfn8xy91jl07nd1v90xp9jrzrrl92"; type = "gem"; }; - version = "0.1.1"; + version = "0.1.2"; }; rex-ole = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pnzbqfnvbs0vc0z0ryszk3fxhgxrjd6gzwqa937rhlphwp5jpww"; + sha256 = "0rlsy1a4lig7iqvb4zn60fpf125v8k4bjrjzakks74prjb2qmqnp"; type = "gem"; }; - version = "0.1.6"; + version = "0.1.7"; }; rex-powershell = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11wi8dpb2s8bvkqhbf80g16nyj2hscs3vz31ffzl1g0g6imcs0dl"; + sha256 = "1wza4g3kkscc17kaw44hnq8qs2nmvppb9awaf27lp4v1c1kdxixs"; type = "gem"; }; - version = "0.1.87"; + version = "0.1.89"; }; rex-random_identifier = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fg94sczff5c2rlvqqgw2dndlqyzjil5rjk3p9f46ss2hc8zxlbk"; + sha256 = "0pqd8pfcxqd44ql8dawk59k9s5jnhx7inc8wnpjhkbx0y0sldq8q"; type = "gem"; }; - version = "0.1.4"; + version = "0.1.5"; }; rex-registry = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wv812ghnz143vx10ixmv32ypj1xrzr4rh4kgam8d8wwjwxsgw1q"; + sha256 = "09b6jhcih4srrh0j52v49vbffqz8ngki6qpmq9b2wdabqnw63d1v"; type = "gem"; }; - version = "0.1.3"; + version = "0.1.4"; }; rex-rop_builder = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xjd3d6wnbq4ym0d0m268md8fb16f2hbwrahvxnl14q63fj9i3wy"; + sha256 = "0ssynxq3kc86v3xnc6jx8pg5zh13q61wl2klqbi9hzn2n8lhdgvj"; type = "gem"; }; - version = "0.1.3"; + version = "0.1.4"; }; rex-socket = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y6p1sw0wiw4x4dk89lwhf7vzsb0cjgpbr8hf7m119lg2kzm5g8y"; + sha256 = "1601b7vhp56sif21lk7mqcn3bbkhdrp6zz0vag8yzma3ji707pqg"; type = "gem"; }; - version = "0.1.24"; + version = "0.1.25"; }; rex-sslscan = { groups = ["default"]; @@ -1056,30 +1096,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nbdn53264a20cr2m2nq2v4mg0n33dvrd1jj1sixl37qjzw2k452"; + sha256 = "1hp8yv55j995dl587hismwa7ydyprs03c75gia6rwp7v5bhshy4n"; type = "gem"; }; - version = "0.1.2"; + version = "0.1.3"; }; rex-text = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wx8pncrk7yb2zxxqaycm4ikvb577zj7rma8jdfi74a0c5119c44"; + sha256 = "078bdybz7cw3zd0mr59qgr1x6pifnn352636s74i1ncqzrzni46b"; type = "gem"; }; - version = "0.2.28"; + version = "0.2.31"; }; rex-zip = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mbfryyhcw47i7jb8cs8vilbyqgyiyjkfl1ngl6wdbf7d87dwdw7"; + sha256 = "0azm4g4dm9k6vrav769vn0gffrv7pgxknlj4dr9yav632920cvqj"; type = "gem"; }; - version = "0.1.3"; + version = "0.1.4"; }; rkelly-remix = { groups = ["default"]; @@ -1096,10 +1136,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12khgv5hx90a4dxqca2hzbksalx9czb51bsz0bhq0czsql9pwby8"; + sha256 = "05nfdv5isk3g13qhzm6axg70bghg1z5nbsl04dwqqhaifjys0dhf"; type = "gem"; }; - version = "2.3.0"; + version = "2.5.0"; }; ruby-rc4 = { groups = ["default"]; @@ -1116,30 +1156,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17pcc0wgvh3ikrkr7bm3nx0qhyiqwidd13ij0fa50k7gsbnr2p0l"; + sha256 = "15wfcqxyfgka05v2a7kpg64x57gl1y4xzvnc9lh60bqx5sf1iqrs"; type = "gem"; }; - version = "0.0.2"; + version = "0.0.4"; }; ruby_smb = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fsdnvisswchk27knii6ijq8sjsc7qm9jiffdsf71q195ga2qi66"; + sha256 = "0px84i3d9kqb40ff7nk3k7hb3w3kk80w5zsgi61svgddp1dbzh1n"; type = "gem"; }; - version = "2.0.6"; + version = "2.0.7"; }; rubyntlm = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p6bxsklkbcqni4bcq6jajc2n57g0w5rzn4r49c3lb04wz5xg0dy"; + sha256 = "0b8hczk8hysv53ncsqzx4q6kma5gy5lqc7s5yx8h64x3vdb18cjv"; type = "gem"; }; - version = "0.6.2"; + version = "0.6.3"; }; rubyzip = { groups = ["default"]; @@ -1166,10 +1206,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b9v0xs4ksd68zckamv6rbrrqllpa9am0p29bycq9fxvlkqd7w2w"; + sha256 = "06f7w6ph3bzzqk212yylfp4jfx275shgp9zg3xszbpv1ny2skp9m"; type = "gem"; }; - version = "0.1.1"; + version = "0.2.1"; }; sinatra = { groups = ["default"]; @@ -1206,20 +1246,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nagbf9pwy1vg09k6j4xqhbjjzrg5dwzvkn4ffvlj76fsn6vv61f"; + sha256 = "0g5p3r47qxxfmfagdf8wb68pd24938cgzdfn6pmpysrn296pg5m5"; type = "gem"; }; - version = "1.7.2"; + version = "1.8.0"; }; thor = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xbhkmyhlxwzshaqa7swy2bx6vd64mm0wrr8g3jywvxy7hg0cwkm"; + sha256 = "18yhlvmfya23cs3pvhr1qy38y41b6mhr5q9vwv5lrgk16wmf3jna"; type = "gem"; }; - version = "1.0.1"; + version = "1.1.0"; }; thread_safe = { groups = ["default"]; @@ -1246,30 +1286,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w0bjn6k38xv46mr02p3038gwk5jj5hl398bv5kr625msxkdhqzn"; + sha256 = "15iaxz9iak5643bq2bc0jkbjv8w2zn649lxgvh5wg48q9d4blw13"; type = "gem"; }; - version = "1.6.2.1"; + version = "1.7.0"; }; tzinfo = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r"; + sha256 = "0zwqqh6138s8b321fwvfbywxy00lw1azw4ql3zr0xh1aqxf8cnvj"; type = "gem"; }; - version = "1.2.7"; + version = "1.2.9"; }; tzinfo-data = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02anabncgfjwsqn07ra9jdqvmi0a4yngzp6dfiz2yxb1m9qpdm4a"; + sha256 = "0ik16lnsyr2739jzwl4r5sz8q639lqw8f9s68iszwhm2pcq8p4w2"; type = "gem"; }; - version = "1.2020.4"; + version = "1.2021.1"; }; unf = { groups = ["default"]; @@ -1346,9 +1386,19 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s744iwblw262gj357pky3d9fcx9hisvla7rnw29ysn5zsb6i683"; + sha256 = "0yihlrbipgiivgpkbx06qx8wgbic0jm26by6jymdwxb01zsd0yj1"; + type = "gem"; + }; + version = "0.3.1"; + }; + zeitwerk = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1746czsjarixq0x05f7p3hpzi38ldg6wxnxxw74kbjzh1sdjgmpl"; type = "gem"; }; - version = "0.3.0"; + version = "2.4.2"; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/security/mfcuk/default.nix b/pkgs/tools/security/mfcuk/default.nix index 006e89871c7..3128a787807 100644 --- a/pkgs/tools/security/mfcuk/default.nix +++ b/pkgs/tools/security/mfcuk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libnfc }: +{ lib, stdenv, fetchurl, pkg-config, libnfc }: stdenv.mkDerivation { pname = "mfcuk"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "0m9sy61rsbw63xk05jrrmnyc3xda0c3m1s8pg3sf8ijbbdv9axcp"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libnfc ]; meta = with lib; { diff --git a/pkgs/tools/security/mfoc/default.nix b/pkgs/tools/security/mfoc/default.nix index 1d2478b6bae..ca1f4a5e4f2 100644 --- a/pkgs/tools/security/mfoc/default.nix +++ b/pkgs/tools/security/mfoc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig, libnfc }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, libnfc }: stdenv.mkDerivation rec { pname = "mfoc"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libnfc ]; meta = with lib; { diff --git a/pkgs/tools/security/mkrand/default.nix b/pkgs/tools/security/mkrand/default.nix index 54934b7111a..59b48f1881d 100644 --- a/pkgs/tools/security/mkrand/default.nix +++ b/pkgs/tools/security/mkrand/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "mkrand-0.1.0"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { description = "A Digital Random Bit Generator"; longDescription = "MKRAND is a utility for generating random information."; homepage = "https://github.com/mknight-tag/MKRAND/"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.mit; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/security/modsecurity/default.nix b/pkgs/tools/security/modsecurity/default.nix index b9b696c17be..1bbefd1342c 100644 --- a/pkgs/tools/security/modsecurity/default.nix +++ b/pkgs/tools/security/modsecurity/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig +{ stdenv, lib, fetchurl, pkg-config , curl, apacheHttpd, pcre, apr, aprutil, libxml2 , luaSupport ? false, lua5 }: @@ -6,7 +6,7 @@ with lib; let luaValue = if luaSupport then lua5 else "no"; - optional = stdenv.lib.optional; + optional = lib.optional; in stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "0611nskd2y6yagrciqafxdn4rxbdk2v4swf45kc1sgwx2sfh34j1"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ curl apacheHttpd pcre apr aprutil libxml2 ] ++ optional luaSupport lua5; @@ -49,6 +49,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; homepage = "https://www.modsecurity.org/"; maintainers = with maintainers; [offline]; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/tools/security/monkeysphere/default.nix b/pkgs/tools/security/monkeysphere/default.nix index e5dca7721ac..bc267a9a770 100644 --- a/pkgs/tools/security/monkeysphere/default.nix +++ b/pkgs/tools/security/monkeysphere/default.nix @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ perl libassuan libgcrypt ] - ++ stdenv.lib.optional doCheck + ++ lib.optional doCheck ([ gnupg opensshUnsafe which socat cpio hexdump procps lockfileProgs ] ++ (with perlPackages; [ CryptOpenSSLRSA CryptOpenSSLBignum ])); @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { # but they aren't enabled by default because they "drain" entropy (GnuPG # still uses /dev/random). doCheck = false; - preCheck = stdenv.lib.optionalString doCheck '' + preCheck = lib.optionalString doCheck '' patchShebangs tests/ patchShebangs src/ sed -i \ @@ -64,12 +64,12 @@ in stdenv.mkDerivation rec { CryptOpenSSLRSA CryptOpenSSLBignum ]) - + stdenv.lib.optionalString + + lib.optionalString (builtins.length runtimeDeps > 0) - " --prefix PATH : ${stdenv.lib.makeBinPath runtimeDeps}"; + " --prefix PATH : ${lib.makeBinPath runtimeDeps}"; wrapMonkeysphere = runtimeDeps: program: "wrapProgram $out/bin/${program} ${wrapperArgs runtimeDeps}\n"; - wrapPrograms = runtimeDeps: programs: stdenv.lib.concatMapStrings + wrapPrograms = runtimeDeps: programs: lib.concatMapStrings (wrapMonkeysphere runtimeDeps) programs; in wrapPrograms [ gnupg ] [ "monkeysphere-authentication" "monkeysphere-host" ] diff --git a/pkgs/tools/security/monsoon/default.nix b/pkgs/tools/security/monsoon/default.nix index c2a5aa1debf..3f414081500 100644 --- a/pkgs/tools/security/monsoon/default.nix +++ b/pkgs/tools/security/monsoon/default.nix @@ -1,6 +1,6 @@ { buildGoModule , fetchFromGitHub -, stdenv +, lib, stdenv }: buildGoModule rec { @@ -19,7 +19,7 @@ buildGoModule rec { # tests fails on darwin doCheck = !stdenv.isDarwin; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast HTTP enumerator"; longDescription = '' A fast HTTP enumerator that allows you to execute a large number of HTTP diff --git a/pkgs/tools/security/neopg/default.nix b/pkgs/tools/security/neopg/default.nix index 93c12c15828..e39be14475e 100644 --- a/pkgs/tools/security/neopg/default.nix +++ b/pkgs/tools/security/neopg/default.nix @@ -6,7 +6,7 @@ , boost , curl , gettext -, pkgconfig +, pkg-config , libusb1 , gnutls }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ cmake gettext pkgconfig ]; + nativeBuildInputs = [ cmake gettext pkg-config ]; buildInputs = [ sqlite botan2 boost curl libusb1 gnutls ]; diff --git a/pkgs/tools/security/nitrokey-app/default.nix b/pkgs/tools/security/nitrokey-app/default.nix index 1da54526a61..bc7731a0a7a 100644 --- a/pkgs/tools/security/nitrokey-app/default.nix +++ b/pkgs/tools/security/nitrokey-app/default.nix @@ -1,23 +1,18 @@ -{ lib, stdenv, bash-completion, cmake, fetchFromGitHub, hidapi, libusb1, pkgconfig +{ lib, stdenv, bash-completion, cmake, fetchFromGitHub, hidapi, libusb1, pkg-config , qtbase, qttranslations, qtsvg, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "nitrokey-app"; - version = "1.3.2"; + version = "1.4.2"; src = fetchFromGitHub { owner = "Nitrokey"; repo = "nitrokey-app"; rev = "v${version}"; - sha256 = "193kzlz3qn9il56h78faiqkgv749hdils1nn1iw6g3wphgx5fjs2"; + sha256 = "1k0w921hfrya4q2r7bqn7kgmwvwb7c15k9ymlbnksmfc9yyjyfcv"; fetchSubmodules = true; }; - postPatch = '' - substituteInPlace libnitrokey/CMakeLists.txt \ - --replace '/data/41-nitrokey.rules' '/libnitrokey/data/41-nitrokey.rules' - ''; - buildInputs = [ bash-completion hidapi @@ -28,7 +23,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake - pkgconfig + pkg-config wrapQtAppsHook ]; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; diff --git a/pkgs/tools/security/nitrokey-app/udev-rules.nix b/pkgs/tools/security/nitrokey-app/udev-rules.nix index a89fa723826..11dcd63d776 100644 --- a/pkgs/tools/security/nitrokey-app/udev-rules.nix +++ b/pkgs/tools/security/nitrokey-app/udev-rules.nix @@ -1,18 +1,13 @@ -{ stdenv, nitrokey-app -, group ? "nitrokey" -}: +{ lib, stdenv, nitrokey-app }: + stdenv.mkDerivation { - name = "nitrokey-udev-rules-${stdenv.lib.getVersion nitrokey-app}"; + name = "nitrokey-udev-rules-${lib.getVersion nitrokey-app}"; inherit (nitrokey-app) src; dontBuild = true; - patchPhase = '' - substituteInPlace libnitrokey/data/41-nitrokey.rules --replace plugdev "${group}" - ''; - installPhase = '' mkdir -p $out/etc/udev/rules.d cp libnitrokey/data/41-nitrokey.rules $out/etc/udev/rules.d diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index bd543154494..531eb6eae4a 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, libpcap, pkgconfig, openssl, lua5_3 +{ lib, stdenv, fetchurl, fetchpatch, libpcap, pkg-config, openssl, lua5_3 , pcre, liblinear, libssh2 , graphicalSupport ? false , libX11 ? null @@ -8,7 +8,7 @@ , withLua ? true }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { name = "nmap${optionalString graphicalSupport "-graphical"}-${version}"; @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { pygtk pysqlite pygobject2 pycairo ]; - nativeBuildInputs = [ pkgconfig ] ++ optionals graphicalSupport [ python2.pkgs.wrapPython ]; + nativeBuildInputs = [ pkg-config ] ++ optionals graphicalSupport [ python2.pkgs.wrapPython ]; buildInputs = [ pcre liblinear libssh2 libpcap openssl ] ++ optionals graphicalSupport (with python2.pkgs; [ python2 libX11 gtk2 ]); diff --git a/pkgs/tools/security/nmap/qt.nix b/pkgs/tools/security/nmap/qt.nix index 39026c400d0..b4e406a0035 100644 --- a/pkgs/tools/security/nmap/qt.nix +++ b/pkgs/tools/security/nmap/qt.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , wrapQtAppsHook , dnsutils , nmap @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-q3XfwJ4TGK4E58haN0Q0xRH4GDpKD8VZzyxHe/VwBqY="; }; - nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; buildInputs = [ qtbase qtscript qtwebengine ]; diff --git a/pkgs/tools/security/notary/default.nix b/pkgs/tools/security/notary/default.nix index fa3db0c3623..ab6ec0b1681 100644 --- a/pkgs/tools/security/notary/default.nix +++ b/pkgs/tools/security/notary/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoPackage, libtool }: +{ lib, fetchFromGitHub, buildGoPackage, libtool }: buildGoPackage rec { pname = "notary"; diff --git a/pkgs/tools/security/nsjail/default.nix b/pkgs/tools/security/nsjail/default.nix index deab1b929c9..d48564ce95b 100644 --- a/pkgs/tools/security/nsjail/default.nix +++ b/pkgs/tools/security/nsjail/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, bison, flex, libtool, pkgconfig, which +{ lib, stdenv, fetchFromGitHub, autoconf, bison, flex, libtool, pkg-config, which , libnl, protobuf, protobufc, shadow }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1w6x8xcrs0i1y3q41gyq8z3cq9x24qablklc4jiydf855lhqn4dh"; }; - nativeBuildInputs = [ autoconf bison flex libtool pkgconfig which ]; + nativeBuildInputs = [ autoconf bison flex libtool pkg-config which ]; buildInputs = [ libnl protobuf protobufc ]; enableParallelBuilding = true; diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index 7e9d3d52e56..2df24e63d89 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -1,6 +1,6 @@ { buildGoModule , fetchFromGitHub -, lib, stdenv +, lib }: buildGoModule rec { diff --git a/pkgs/tools/security/nwipe/default.nix b/pkgs/tools/security/nwipe/default.nix index 53d8abc6100..d87be0c2974 100644 --- a/pkgs/tools/security/nwipe/default.nix +++ b/pkgs/tools/security/nwipe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, ncurses, parted, automake, autoconf, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, ncurses, parted, automake, autoconf, pkg-config }: stdenv.mkDerivation rec { version = "0.28"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "1aw905lmn1vm6klqn3q7445dwmwbjhcmwnkygpq9rddacgig1gdx"; }; - nativeBuildInputs = [ automake autoconf pkgconfig ]; + nativeBuildInputs = [ automake autoconf pkg-config ]; buildInputs = [ ncurses parted ]; preConfigure = "sh init.sh || :"; meta = with lib; { diff --git a/pkgs/tools/security/oath-toolkit/default.nix b/pkgs/tools/security/oath-toolkit/default.nix index 5fb7fadbc5c..ba49da102fb 100644 --- a/pkgs/tools/security/oath-toolkit/default.nix +++ b/pkgs/tools/security/oath-toolkit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, fetchpatch, pam, xmlsec, autoreconfHook, pkgconfig, libxml2, gtk-doc, perl, gengetopt, bison, help2man }: +{ lib, stdenv, fetchFromGitLab, fetchpatch, pam, xmlsec, autoreconfHook, pkg-config, libxml2, gtk-doc, perl, gengetopt, bison, help2man }: let securityDependency = @@ -26,7 +26,7 @@ in stdenv.mkDerivation { buildInputs = [ securityDependency libxml2 perl gengetopt bison ]; - nativeBuildInputs = [ autoreconfHook gtk-doc help2man pkgconfig ]; + nativeBuildInputs = [ autoreconfHook gtk-doc help2man pkg-config ]; # man file generation fails when true enableParallelBuilding = false; diff --git a/pkgs/tools/security/onioncircuits/default.nix b/pkgs/tools/security/onioncircuits/default.nix index bdaf087004a..8c5083ee8af 100644 --- a/pkgs/tools/security/onioncircuits/default.nix +++ b/pkgs/tools/security/onioncircuits/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, python3, intltool, gtk3, gobject-introspection, gnome3 }: +{ lib, fetchgit, python3, intltool, gtk3, gobject-introspection, gnome3 }: python3.pkgs.buildPythonApplication rec { pname = "onioncircuits"; diff --git a/pkgs/tools/security/open-ecard/default.nix b/pkgs/tools/security/open-ecard/default.nix index 0dfdba804c0..c46d5b65cd8 100644 --- a/pkgs/tools/security/open-ecard/default.nix +++ b/pkgs/tools/security/open-ecard/default.nix @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { makeWrapper ${jre}/bin/java $out/bin/${appName} \ --add-flags "-cp $out/share/java/cifs-${version}.jar" \ --add-flags "-jar $out/share/java/richclient-${version}.jar" \ - --suffix LD_LIBRARY_PATH ':' ${stdenv.lib.getLib pcsclite}/lib + --suffix LD_LIBRARY_PATH ':' ${lib.getLib pcsclite}/lib ''; meta = with lib; { diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix index f623e3a2f6f..51e0c1f58f9 100644 --- a/pkgs/tools/security/opensc/default.nix +++ b/pkgs/tools/security/opensc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, zlib, readline, openssl +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, zlib, readline, openssl , libiconv, pcsclite, libassuan, libXt , docbook_xsl, libxslt, docbook_xml_dtd_412 , Carbon, PCSC, buildPackages @@ -16,12 +16,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-OjOfA1pIu8NeN+hPuow5UVMKsg0PrsLojw5h05/Qm+o="; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ zlib readline openssl libassuan libXt libxslt libiconv docbook_xml_dtd_412 ] - ++ stdenv.lib.optional stdenv.isDarwin Carbon + ++ lib.optional stdenv.isDarwin Carbon ++ (if withApplePCSC then [ PCSC ] else [ pcsclite ]); NIX_CFLAGS_COMPILE = "-Wno-error"; @@ -41,13 +41,13 @@ stdenv.mkDerivation rec { if withApplePCSC then "${PCSC}/Library/Frameworks/PCSC.framework/PCSC" else - "${stdenv.lib.getLib pcsclite}/lib/libpcsclite${stdenv.hostPlatform.extensions.sharedLibrary}" + "${lib.getLib pcsclite}/lib/libpcsclite${stdenv.hostPlatform.extensions.sharedLibrary}" }" - (stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) + (lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "XSLTPROC=${buildPackages.libxslt}/bin/xsltproc") ]; - PCSC_CFLAGS = stdenv.lib.optionalString withApplePCSC + PCSC_CFLAGS = lib.optionalString withApplePCSC "-I${PCSC}/Library/Frameworks/PCSC.framework/Headers"; installFlags = [ diff --git a/pkgs/tools/security/ossec/default.nix b/pkgs/tools/security/ossec/default.nix index 285e275a81f..22374e1d302 100644 --- a/pkgs/tools/security/ossec/default.nix +++ b/pkgs/tools/security/ossec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, which }: +{ lib, stdenv, fetchurl, which }: stdenv.mkDerivation { name = "ossec-client-2.6"; @@ -33,8 +33,8 @@ yes meta = { description = "Open source host-based instrusion detection system"; homepage = "https://www.ossec.net"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/security/p0f/default.nix b/pkgs/tools/security/p0f/default.nix index 02d888b725f..84221fbd566 100644 --- a/pkgs/tools/security/p0f/default.nix +++ b/pkgs/tools/security/p0f/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libpcap, bash }: +{ lib, stdenv, fetchurl, libpcap, bash }: stdenv.mkDerivation rec { pname = "p0f"; @@ -34,8 +34,8 @@ stdenv.mkDerivation rec { meta = { description = "Passive network reconnaissance and fingerprinting tool"; homepage = "https://lcamtuf.coredump.cx/p0f3/"; - license = stdenv.lib.licenses.lgpl21; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = lib.licenses.lgpl21; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.thoughtpolice ]; }; } diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index e2b163445ce..a7872c50fb3 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -26,7 +26,7 @@ let env = extensions: let selected = [ pass ] ++ extensions passExtensions - ++ stdenv.lib.optional tombPluginSupport passExtensions.tomb; + ++ lib.optional tombPluginSupport passExtensions.tomb; in buildEnv { name = "pass-extensions-env"; paths = selected; @@ -63,10 +63,10 @@ stdenv.mkDerivation rec { patches = [ ./set-correct-program-name-for-sleep.patch ./extension-dir.patch - ] ++ stdenv.lib.optional stdenv.isDarwin ./no-darwin-getopt.patch + ] ++ lib.optional stdenv.isDarwin ./no-darwin-getopt.patch # TODO (@Ma27) this patch adds support for wl-clipboard and can be removed during the next # version bump. - ++ stdenv.lib.optional waylandSupport ./clip-wayland-support.patch; + ++ lib.optional waylandSupport ./clip-wayland-support.patch; nativeBuildInputs = [ makeWrapper ]; @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { cp "contrib/dmenu/passmenu" "$out/bin/" ''; - wrapperPath = with stdenv.lib; makeBinPath ([ + wrapperPath = with lib; makeBinPath ([ coreutils findutils getopt @@ -107,7 +107,7 @@ stdenv.mkDerivation rec { # Ensure all dependencies are in PATH wrapProgram $out/bin/pass \ --prefix PATH : "${wrapperPath}" - '' + stdenv.lib.optionalString dmenuSupport '' + '' + lib.optionalString dmenuSupport '' # We just wrap passmenu with the same PATH as pass. It doesn't # need all the tools in there but it doesn't hurt either. wrapProgram $out/bin/passmenu \ @@ -127,7 +127,7 @@ stdenv.mkDerivation rec { -e 's@^GPGS=.*''$@GPG=${gnupg}/bin/gpg2@' \ -e '/which gpg/ d' \ tests/setup.sh - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' # 'pass edit' uses hdid, which is not available from the sandbox. rm -f tests/t0200-edit-tests.sh rm -f tests/t0010-generate-tests.sh diff --git a/pkgs/tools/security/pass/rofi-pass.nix b/pkgs/tools/security/pass/rofi-pass.nix index d46aac93e86..b6547deb560 100644 --- a/pkgs/tools/security/pass/rofi-pass.nix +++ b/pkgs/tools/security/pass/rofi-pass.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pass, rofi, coreutils, util-linux, xdotool, gnugrep +{ lib, stdenv, fetchFromGitHub, pass, rofi, coreutils, util-linux, xdotool, gnugrep , libnotify, pwgen, findutils, gawk, gnused, xclip, makeWrapper }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { cp -a config.example $out/share/doc/rofi-pass/config.example ''; - wrapperPath = with stdenv.lib; makeBinPath [ + wrapperPath = with lib; makeBinPath [ coreutils findutils gawk @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = { description = "A script to make rofi work with password-store"; homepage = "https://github.com/carnager/rofi-pass"; - license = stdenv.lib.licenses.gpl3; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl3; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/tools/security/pbis/default.nix b/pkgs/tools/security/pbis/default.nix index 25e945a082d..7561b1fae98 100644 --- a/pkgs/tools/security/pbis/default.nix +++ b/pkgs/tools/security/pbis/default.nix @@ -33,9 +33,9 @@ stdenv.mkDerivation rec { if [ $CC = gcc ]; then NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error=format-overflow -Wno-error=address-of-packed-member" fi - NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${stdenv.lib.getDev libxml2}/include/libxml2 -Wno-error=array-bounds -Wno-error=pointer-sign -Wno-error=deprecated-declarations -Wno-error=unused-variable" + NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${lib.getDev libxml2}/include/libxml2 -Wno-error=array-bounds -Wno-error=pointer-sign -Wno-error=deprecated-declarations -Wno-error=unused-variable" ''; - configureScript = ''../configure''; + configureScript = "../configure"; configureFlags = [ "CFLAGS=-O" "--docdir=${placeholder "prefix"}/share/doc" diff --git a/pkgs/tools/security/pcsc-cyberjack/default.nix b/pkgs/tools/security/pcsc-cyberjack/default.nix index 65446e6fc44..40736cdc86b 100644 --- a/pkgs/tools/security/pcsc-cyberjack/default.nix +++ b/pkgs/tools/security/pcsc-cyberjack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkgconfig, libusb1, pcsclite }: +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libusb1, pcsclite }: let version = "3.99.5"; @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { outputs = [ "out" "tools" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libusb1 pcsclite ]; diff --git a/pkgs/tools/security/pcsc-safenet/default.nix b/pkgs/tools/security/pcsc-safenet/default.nix new file mode 100644 index 00000000000..3610343fc27 --- /dev/null +++ b/pkgs/tools/security/pcsc-safenet/default.nix @@ -0,0 +1,96 @@ +{ stdenv +, lib +, fetchurl +, autoPatchelfHook +, dpkg +, gtk2 +, openssl +, pcsclite +}: + +stdenv.mkDerivation rec { + pname = "pcsc-safenet"; + version = "10.0.37-0"; + + # https://aur.archlinux.org/packages/sac-core/ + src = fetchurl { + url = "https://storage.spidlas.cz/public/soft/safenet/SafenetAuthenticationClient-core-${version}_amd64.deb"; + sha256 = "1r9739bhal7ramj1rpawaqvik45xbs1c756l1da96din638gzy5l"; + }; + + dontBuild = true; + dontConfigure = true; + + unpackPhase = '' + dpkg-deb -x $src . + ''; + + buildInputs = [ + gtk2 + openssl + pcsclite + ]; + + runtimeDependencies = [ + openssl + ]; + + nativeBuildInputs = [ + autoPatchelfHook + dpkg + ]; + + installPhase = '' + # Set up for pcsc drivers + mkdir -p pcsc/drivers + mv usr/share/eToken/drivers/* pcsc/drivers/ + rm -r usr/share/eToken/drivers + + # Move binaries out + mv usr/bin bin + + # Move UI to bin + mv usr/share/SAC/SACUIProcess bin/ + rm -r usr/share/SAC + + mkdir $out + cp -r {bin,etc,lib,pcsc,usr,var} $out/ + + cd "$out/lib/" + ln -sf libeToken.so.10.0.37 libeTPkcs11.so + ln -sf libeToken.so.10.0.37 libeToken.so.10.0 + ln -sf libeToken.so.10.0.37 libeToken.so.10 + ln -sf libeToken.so.10.0.37 libeToken.so + ln -sf libcardosTokenEngine.so.10.0.37 libcardosTokenEngine.so.10.0 + ln -sf libcardosTokenEngine.so.10.0.37 libcardosTokenEngine.so.10 + ln -sf libcardosTokenEngine.so.10.0.37 libcardosTokenEngine.so + + cd $out/pcsc/drivers/aks-ifdh.bundle/Contents/Linux/ + ln -sf libAksIfdh.so.10.0 libAksIfdh.so + ln -sf libAksIfdh.so.10.0 libAksIfdh.so.10 + + ln -sf ${openssl.out}/lib/libcrypto.so $out/lib/libcrypto.so.1.0.0 + ''; + + dontAutoPatchelf = true; + + # Patch DYN shared libraries (autoPatchElfHook only patches EXEC | INTERP). + postFixup = '' + autoPatchelf "$out" + + runtime_rpath="${lib.makeLibraryPath runtimeDependencies}" + + for mod in $(find "$out" -type f -name '*.so.*'); do + mod_rpath="$(patchelf --print-rpath "$mod")" + patchelf --set-rpath "$runtime_rpath:$mod_rpath" "$mod" + done; + ''; + + meta = with lib; { + homepage = "https://safenet.gemalto.com/multi-factor-authentication/security-applications/authentication-client-token-management"; + description = "Safenet Authentication Client"; + platforms = [ "x86_64-linux" ]; + license = licenses.unfree; + maintainers = with maintainers; [ wldhx ]; + }; +} diff --git a/pkgs/tools/security/pcsc-scm-scl011/default.nix b/pkgs/tools/security/pcsc-scm-scl011/default.nix index a9697718e3c..b7c4319fa05 100644 --- a/pkgs/tools/security/pcsc-scm-scl011/default.nix +++ b/pkgs/tools/security/pcsc-scm-scl011/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { cp -r proprietary/*.bundle $out/pcsc/drivers ''; - libPath = stdenv.lib.makeLibraryPath [ libusb-compat-0_1 ]; + libPath = lib.makeLibraryPath [ libusb-compat-0_1 ]; fixupPhase = '' patchelf --set-rpath $libPath \ diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix index 8a4ae089440..1d874a16da6 100644 --- a/pkgs/tools/security/pcsclite/default.nix +++ b/pkgs/tools/security/pcsclite/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, udev, dbus, perl, python3 +{ lib, stdenv, fetchurl, pkg-config, udev, dbus, perl, python3 , IOKit ? null }: stdenv.mkDerivation rec { @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { # The OS should care on preparing the drivers into this location "--enable-usbdropdir=/var/lib/pcsc/drivers" "--enable-confdir=/etc" - ] ++ stdenv.lib.optional stdenv.isLinux + ] ++ lib.optional stdenv.isLinux "--with-systemdsystemunitdir=\${out}/etc/systemd/system" - ++ stdenv.lib.optional (!stdenv.isLinux) + ++ lib.optional (!stdenv.isLinux) "--disable-libsystemd"; postConfigure = '' @@ -34,9 +34,9 @@ stdenv.mkDerivation rec { moveToOutput bin/pcsc-spy "$dev" ''; - nativeBuildInputs = [ pkgconfig perl ]; - buildInputs = [ python3 ] ++ stdenv.lib.optionals stdenv.isLinux [ udev dbus ] - ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit ]; + nativeBuildInputs = [ pkg-config perl ]; + buildInputs = [ python3 ] ++ lib.optionals stdenv.isLinux [ udev dbus ] + ++ lib.optionals stdenv.isDarwin [ IOKit ]; meta = with lib; { description = "Middleware to access a smart card using SCard API (PC/SC)"; diff --git a/pkgs/tools/security/pcsctools/default.nix b/pkgs/tools/security/pcsctools/default.nix index b2ef4e7e030..613388fc6a3 100644 --- a/pkgs/tools/security/pcsctools/default.nix +++ b/pkgs/tools/security/pcsctools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, makeWrapper, pkgconfig, udev, dbus, pcsclite +{ stdenv, lib, fetchurl, makeWrapper, pkg-config, udev, dbus, pcsclite , wget, coreutils, perlPackages }: @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { buildInputs = [ udev dbus perlPackages.perl pcsclite ]; - nativeBuildInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkg-config ]; postInstall = '' wrapProgram $out/bin/scriptor \ diff --git a/pkgs/tools/security/pgpdump/default.nix b/pkgs/tools/security/pgpdump/default.nix index 89ee6a9eab2..c0f496438a4 100644 --- a/pkgs/tools/security/pgpdump/default.nix +++ b/pkgs/tools/security/pgpdump/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0pi9qdbmcmi58gmljin51ylbi3zkknl8fm26jm67cpl55hvfsn23"; }; - buildInputs = stdenv.lib.optionals supportCompressedPackets [ zlib bzip2 ]; + buildInputs = lib.optionals supportCompressedPackets [ zlib bzip2 ]; meta = with lib; { description = "A PGP packet visualizer"; diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index cac245bb256..909bbbaed16 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -1,11 +1,11 @@ -{ fetchurl, mkDerivation, fetchpatch, stdenv, lib, pkgconfig, autoreconfHook, wrapGAppsHook +{ fetchurl, mkDerivation, fetchpatch, stdenv, lib, pkg-config, autoreconfHook, wrapGAppsHook , libgpgerror, libassuan, qtbase, wrapQtAppsHook , ncurses, gtk2, gcr , libcap ? null, libsecret ? null , enabledFlavors ? [ "curses" "tty" "gtk2" "qt" "emacs" ] ++ lib.optionals stdenv.isLinux [ "gnome3" ] }: -with stdenv.lib; +with lib; assert isList enabledFlavors && enabledFlavors != []; @@ -48,7 +48,7 @@ pinentryMkDerivation rec { sha256 = "0w35ypl960pczg5kp6km3dyr000m1hf0vpwwlh72jjkjza36c1v8"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ] + nativeBuildInputs = [ pkg-config autoreconfHook ] ++ concatMap(f: flavorInfo.${f}.nativeBuildInputs or []) enabledFlavors; buildInputs = [ libgpgerror libassuan libcap libsecret ] ++ concatMap(f: flavorInfo.${f}.buildInputs or []) enabledFlavors; diff --git a/pkgs/tools/security/pinentry/mac.nix b/pkgs/tools/security/pinentry/mac.nix index 1c3b87cd9f0..f208576561e 100644 --- a/pkgs/tools/security/pinentry/mac.nix +++ b/pkgs/tools/security/pinentry/mac.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, xcbuildHook, libiconv, ncurses, Cocoa }: +{ lib, stdenv, fetchFromGitHub, xcbuildHook, libiconv, ncurses, Cocoa }: stdenv.mkDerivation { name = "pinentry-mac-0.9.4"; @@ -24,8 +24,8 @@ stdenv.mkDerivation { meta = { description = "Pinentry for GPG on Mac"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; homepage = "https://github.com/GPGTools/pinentry-mac"; - platforms = stdenv.lib.platforms.darwin; + platforms = lib.platforms.darwin; }; } diff --git a/pkgs/tools/security/pius/default.nix b/pkgs/tools/security/pius/default.nix index f1b4d80a355..3612caa196c 100644 --- a/pkgs/tools/security/pius/default.nix +++ b/pkgs/tools/security/pius/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, python3Packages, gnupg, perl }: +{ fetchFromGitHub, lib, python3Packages, gnupg, perl }: let version = "3.0.0"; in python3Packages.buildPythonApplication { @@ -33,9 +33,9 @@ python3Packages.buildPythonApplication { to the process. ''; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ kierdavis ]; + platforms = lib.platforms.gnu ++ lib.platforms.linux; + maintainers = with lib.maintainers; [ kierdavis ]; }; } diff --git a/pkgs/tools/security/polkit-gnome/default.nix b/pkgs/tools/security/polkit-gnome/default.nix index 55991169968..c4c9e9929d5 100644 --- a/pkgs/tools/security/polkit-gnome/default.nix +++ b/pkgs/tools/security/polkit-gnome/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, polkit, gtk3, pkgconfig, intltool }: +{ lib, stdenv, fetchurl, polkit, gtk3, pkg-config, intltool }: stdenv.mkDerivation rec { pname = "polkit-gnome"; version = "0.105"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ polkit gtk3 ]; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkg-config intltool ]; configureFlags = [ "--disable-introspection" ]; @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://gitlab.gnome.org/Archive/policykit-gnome"; description = "A dbus session bus service that is used to bring up authentication dialogs"; - license = stdenv.lib.licenses.lgpl2Plus; - maintainers = with stdenv.lib.maintainers; [ phreedom ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.lgpl2Plus; + maintainers = with lib.maintainers; [ phreedom ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/security/proxmark3/default.nix b/pkgs/tools/security/proxmark3/default.nix index 4cc831eda39..b52e7279fa9 100644 --- a/pkgs/tools/security/proxmark3/default.nix +++ b/pkgs/tools/security/proxmark3/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, ncurses, readline, pcsclite, qt5 +{ lib, stdenv, fetchFromGitHub, pkg-config, ncurses, readline, pcsclite, qt5 , gcc-arm-embedded }: let @@ -12,9 +12,11 @@ let inherit rev sha256; }; - nativeBuildInputs = [ pkgconfig gcc-arm-embedded ]; + nativeBuildInputs = [ pkg-config gcc-arm-embedded ]; buildInputs = [ ncurses readline pcsclite qt5.qtbase ]; + dontWrapQtApps = true; + postPatch = '' substituteInPlace client/Makefile --replace '-ltermcap' ' ' substituteInPlace liblua/Makefile --replace '-ltermcap' ' ' diff --git a/pkgs/tools/security/proxmark3/proxmark3-rrg.nix b/pkgs/tools/security/proxmark3/proxmark3-rrg.nix new file mode 100644 index 00000000000..04def66d03c --- /dev/null +++ b/pkgs/tools/security/proxmark3/proxmark3-rrg.nix @@ -0,0 +1,38 @@ +{ lib, stdenv, mkDerivation, fetchFromGitHub, pkg-config, gcc-arm-embedded, bluez5 +, readline + +, hardwarePlatform ? "PM3RDV4" + +, hardwarePlatformExtras ? "" }: + +mkDerivation rec { + pname = "proxmark3-rrg"; + version = "4.9237"; + + src = fetchFromGitHub { + owner = "RfidResearchGroup"; + repo = "proxmark3"; + rev = "v${version}"; + sha256 = "13xrhvrsm73rfgqpgca6a37c3jixdkxvfggmacnnx5fdfb393bfx"; + }; + + nativeBuildInputs = [ pkg-config gcc-arm-embedded ]; + buildInputs = [ bluez5 readline ]; + + makeFlags = [ + "PLATFORM=${hardwarePlatform}" + "PLATFORM_EXTRAS=${hardwarePlatformExtras}" + ]; + + installPhase = '' + install -Dt $out/bin client/proxmark3 + install -Dt $out/firmware bootrom/obj/bootrom.elf armsrc/obj/fullimage.elf + ''; + + meta = with lib; { + description = "Client for proxmark3, powerful general purpose RFID tool"; + homepage = "https://rfidresearchgroup.com/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ nyanotech ]; + }; +} diff --git a/pkgs/tools/security/pwdsafety/default.nix b/pkgs/tools/security/pwdsafety/default.nix new file mode 100644 index 00000000000..2a6ed328e49 --- /dev/null +++ b/pkgs/tools/security/pwdsafety/default.nix @@ -0,0 +1,25 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "pwdsafety"; + version = "0.1.4"; + + src = fetchFromGitHub { + owner = "edoardottt"; + repo = pname; + rev = "v${version}"; + sha256 = "1qnkabgc2924qg9x1ij51jq7lnxzcj1ygdp3x4mzi9gl532i191w"; + }; + + vendorSha256 = "0avm4zwwqv476yrraaf5xkc1lac0mwnmzav5wckifws6r4x3xrsb"; + + meta = with lib; { + description = "Command line tool checking password safety"; + homepage = "https://github.com/edoardottt/pwdsafety"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/pwgen/default.nix b/pkgs/tools/security/pwgen/default.nix index a63e40b744e..c84b9472e96 100644 --- a/pkgs/tools/security/pwgen/default.nix +++ b/pkgs/tools/security/pwgen/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, autoreconfHook}: +{lib, stdenv, fetchurl, autoreconfHook}: stdenv.mkDerivation { name = "pwgen-2.08"; @@ -11,6 +11,6 @@ stdenv.mkDerivation { meta = { description = "Password generator which creates passwords which can be easily memorized by a human"; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/security/pyrit/default.nix b/pkgs/tools/security/pyrit/default.nix index ead55036425..dc1d0b97f87 100644 --- a/pkgs/tools/security/pyrit/default.nix +++ b/pkgs/tools/security/pyrit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, python2Packages, openssl, zlib, libpcap, opencl-headers, ocl-icd }: +{ lib, fetchFromGitHub, python2Packages, openssl, zlib, libpcap, opencl-headers, ocl-icd }: let version = "2019-12-13"; diff --git a/pkgs/tools/security/qdigidoc/default.nix b/pkgs/tools/security/qdigidoc/default.nix index 51ddad0634f..8ba6937c448 100644 --- a/pkgs/tools/security/qdigidoc/default.nix +++ b/pkgs/tools/security/qdigidoc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchgit, fetchurl, cmake, darkhttpd, gettext, makeWrapper, pkgconfig +{ lib, mkDerivation, fetchgit, fetchurl, cmake, darkhttpd, gettext, makeWrapper, pkg-config , libdigidocpp, opensc, openldap, openssl, pcsclite, qtbase, qttranslations, qtsvg }: mkDerivation rec { @@ -17,7 +17,7 @@ mkDerivation rec { sha256 = "0llr2fj8vd097hcr1d0xmzdy4jydv0b5j5qlksbjffs22rqgal14"; }; - nativeBuildInputs = [ cmake darkhttpd gettext makeWrapper pkgconfig ]; + nativeBuildInputs = [ cmake darkhttpd gettext makeWrapper pkg-config ]; postPatch = '' substituteInPlace client/CMakeLists.txt \ diff --git a/pkgs/tools/security/radamsa/default.nix b/pkgs/tools/security/radamsa/default.nix index b1d6400f2d0..2ddbc403492 100644 --- a/pkgs/tools/security/radamsa/default.nix +++ b/pkgs/tools/security/radamsa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitLab, bash }: +{ lib, stdenv, fetchurl, fetchFromGitLab, bash }: let # Fetch explicitly, otherwise build will try to do so @@ -32,12 +32,12 @@ stdenv.mkDerivation rec { checkInputs = [ bash ]; doCheck = true; - + meta = { description = "A general purpose fuzzer"; longDescription = "Radamsa is a general purpose data fuzzer. It reads data from given sample files, or standard input if none are given, and outputs modified data. It is usually used to generate malformed data for testing programs."; homepage = "https://gitlab.com/akihe/radamsa"; - maintainers = [ stdenv.lib.maintainers.markWot ]; - platforms = stdenv.lib.platforms.all; + maintainers = [ lib.maintainers.markWot ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/security/rage/default.nix b/pkgs/tools/security/rage/default.nix index 5cf38cb756d..3724637c604 100644 --- a/pkgs/tools/security/rage/default.nix +++ b/pkgs/tools/security/rage/default.nix @@ -16,11 +16,14 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.isDarwin [ Foundation Security ]; + # cargo test has an x86-only dependency + doCheck = stdenv.hostPlatform.isx86; + postBuild = '' cargo run --example generate-docs cargo run --example generate-completions diff --git a/pkgs/tools/security/rarcrack/default.nix b/pkgs/tools/security/rarcrack/default.nix index e5bbb7e8421..94800ca8c04 100644 --- a/pkgs/tools/security/rarcrack/default.nix +++ b/pkgs/tools/security/rarcrack/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { }; buildInputs = [ libxml2 file p7zip unrar unzip ]; - buildFlags = stdenv.lib.optional stdenv.cc.isClang "CC=clang"; + buildFlags = lib.optional stdenv.cc.isClang "CC=clang"; installFlags = [ "PREFIX=\${out}" ]; patchPhase = '' diff --git a/pkgs/tools/security/rbw/default.nix b/pkgs/tools/security/rbw/default.nix index bd5e8866374..6ea2f45b806 100644 --- a/pkgs/tools/security/rbw/default.nix +++ b/pkgs/tools/security/rbw/default.nix @@ -4,7 +4,7 @@ , fetchCrate , pinentry , openssl -, pkgconfig +, pkg-config , makeWrapper , Security @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "19gznam64s17kha3accgjks5rmd9kpqqgxg3dfrk7fg5v4431007"; nativeBuildInputs = [ - pkgconfig + pkg-config makeWrapper ]; diff --git a/pkgs/tools/security/ripasso/cursive.nix b/pkgs/tools/security/ripasso/cursive.nix index 24e11463464..4cdc3f6d89e 100644 --- a/pkgs/tools/security/ripasso/cursive.nix +++ b/pkgs/tools/security/ripasso/cursive.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, rustPlatform, fetchFromGitHub, pkgconfig, ncurses, python3, openssl, libgpgerror, gpgme, xorg, AppKit, Security }: +{ stdenv, lib, rustPlatform, fetchFromGitHub, pkg-config, ncurses, python3, openssl, libgpgerror, gpgme, xorg, AppKit, Security }: with rustPlatform; buildRustPackage rec { @@ -18,10 +18,10 @@ buildRustPackage rec { cargoBuildFlags = [ "-p ripasso-cursive -p ripasso-man" ]; - nativeBuildInputs = [ pkgconfig gpgme python3 ]; + nativeBuildInputs = [ pkg-config gpgme python3 ]; buildInputs = [ ncurses openssl libgpgerror gpgme xorg.libxcb - ] ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Security ]; + ] ++ lib.optionals stdenv.isDarwin [ AppKit Security ]; preFixup = '' mkdir -p "$out/man/man1" diff --git a/pkgs/tools/security/rng-tools/default.nix b/pkgs/tools/security/rng-tools/default.nix index 16952e6dabb..617224a6af3 100644 --- a/pkgs/tools/security/rng-tools/default.nix +++ b/pkgs/tools/security/rng-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libtool, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, libtool, autoreconfHook, pkg-config , sysfsutils , argp-standalone # WARNING: DO NOT USE BEACON GENERATED VALUES AS SECRET CRYPTOGRAPHIC KEYS @@ -10,7 +10,7 @@ , libp11 ? null, opensc ? null, withPkcs11 ? true }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "rng-tools"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''} ''; - nativeBuildInputs = [ autoreconfHook libtool pkgconfig ]; + nativeBuildInputs = [ autoreconfHook libtool pkg-config ]; configureFlags = [ (withFeature withGcrypt "libgcrypt") diff --git a/pkgs/tools/security/rustscan/default.nix b/pkgs/tools/security/rustscan/default.nix index 3d84900f18e..80cc8c8cc1f 100644 --- a/pkgs/tools/security/rustscan/default.nix +++ b/pkgs/tools/security/rustscan/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { --replace 'Command::new("nmap")' 'Command::new("${nmap}/bin/nmap")' ''; - buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.isDarwin Security; checkFlags = [ "--skip=infer_ulimit_lowering_no_panic" diff --git a/pkgs/tools/security/safe/default.nix b/pkgs/tools/security/safe/default.nix index 2f0f4501fd2..503cfbd9e86 100644 --- a/pkgs/tools/security/safe/default.nix +++ b/pkgs/tools/security/safe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildGoPackage , fetchFromGitHub }: diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix index 2e617a8de8a..57a92ef4b99 100644 --- a/pkgs/tools/security/saml2aws/default.nix +++ b/pkgs/tools/security/saml2aws/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "saml2aws"; @@ -26,7 +26,7 @@ buildGoModule rec { description = "CLI tool which enables you to login and retrieve AWS temporary credentials using a SAML IDP"; homepage = "https://github.com/Versent/saml2aws"; license = licenses.mit; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.pmyjavec ]; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.pmyjavec ]; }; } diff --git a/pkgs/tools/security/sbsigntool/default.nix b/pkgs/tools/security/sbsigntool/default.nix index 36e75094c59..7a0bb37d4a4 100644 --- a/pkgs/tools/security/sbsigntool/default.nix +++ b/pkgs/tools/security/sbsigntool/default.nix @@ -1,5 +1,5 @@ { lib, stdenv -, fetchgit, autoconf, automake, pkgconfig, help2man +, fetchgit, autoconf, automake, pkg-config, help2man , openssl, libuuid, gnu-efi, libbfd }: @@ -17,7 +17,7 @@ stdenv.mkDerivation { prePatch = "patchShebangs ."; - nativeBuildInputs = [ autoconf automake pkgconfig help2man ]; + nativeBuildInputs = [ autoconf automake pkg-config help2man ]; buildInputs = [ openssl libuuid libbfd gnu-efi ]; configurePhase = '' diff --git a/pkgs/tools/security/scallion/default.nix b/pkgs/tools/security/scallion/default.nix index 91b92071fe7..6f0dcd1bb01 100644 --- a/pkgs/tools/security/scallion/default.nix +++ b/pkgs/tools/security/scallion/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { mkdir -p $out/share cp scallion/bin/Debug/* $out/share/ makeWrapper ${mono}/bin/mono $out/bin/scallion \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ openssl_1_0_2 ocl-icd ]} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ openssl_1_0_2 ocl-icd ]} \ --add-flags $out/share/scallion.exe ''; diff --git a/pkgs/tools/security/scilla/default.nix b/pkgs/tools/security/scilla/default.nix new file mode 100644 index 00000000000..1983aef1726 --- /dev/null +++ b/pkgs/tools/security/scilla/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "scilla"; + version = "20210118-${lib.strings.substring 0 7 rev}"; + rev = "74dd81492fef92b95765df1d0f629276a146a5a4"; + + src = fetchFromGitHub { + owner = "edoardottt"; + repo = pname; + inherit rev; + sha256 = "10qvaigfarljydfb9vx2fb9nk293j4g9w2h9mr8xw6adbvl0qr9q"; + }; + + vendorSha256 = "04wqsl4269gc3r6l9srqhcq19zarnyyab8k1shj3w6lkfcc61z25"; + + meta = with lib; { + description = "Information gathering tool for DNS, ports and more"; + homepage = "https://github.com/edoardottt/scilla"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/seccure/default.nix b/pkgs/tools/security/seccure/default.nix index e0f01f4f2c4..07c8d0382ca 100644 --- a/pkgs/tools/security/seccure/default.nix +++ b/pkgs/tools/security/seccure/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, libgcrypt }: +{ lib, stdenv, fetchurl, libgcrypt }: stdenv.mkDerivation rec { pname = "seccure"; version = "0.5"; - + src = fetchurl { url = "http://point-at-infinity.org/seccure/${pname}-${version}.tar.gz"; sha256 = "0nwnk3hfhgvf5xr0xipbh6smfnya22wphc5rj0vgi5d0zr5cwrk5"; }; buildInputs = [ libgcrypt ]; - + preConfigure = '' sed -e s@/usr/@$out/@g -i Makefile sed -e 's@ln -f@ln -sf@g' -i Makefile @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://point-at-infinity.org/seccure/"; description = "Zero-configuration elliptic curve cryptography utility"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.lgpl3; + platforms = lib.platforms.unix; + license = lib.licenses.lgpl3; }; } diff --git a/pkgs/tools/security/secp256k1/default.nix b/pkgs/tools/security/secp256k1/default.nix index 55b02d7a8c3..a8acf3586c9 100644 --- a/pkgs/tools/security/secp256k1/default.nix +++ b/pkgs/tools/security/secp256k1/default.nix @@ -13,7 +13,7 @@ }: -let inherit (stdenv.lib) optionals; in +let inherit (lib) optionals; in stdenv.mkDerivation { pname = "secp256k1"; diff --git a/pkgs/tools/security/shc/default.nix b/pkgs/tools/security/shc/default.nix index f9bdf66ed86..4cbedb23218 100644 --- a/pkgs/tools/security/shc/default.nix +++ b/pkgs/tools/security/shc/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://neurobin.org/projects/softwares/unix/shc/"; description = "Shell Script Compiler"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; license = licenses.gpl3; }; } diff --git a/pkgs/tools/security/signify/default.nix b/pkgs/tools/security/signify/default.nix index 1b59db540a2..fb3df51167b 100644 --- a/pkgs/tools/security/signify/default.nix +++ b/pkgs/tools/security/signify/default.nix @@ -1,19 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, libbsd, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, libbsd, pkg-config }: stdenv.mkDerivation rec { pname = "signify"; - version = "25"; + version = "30"; src = fetchFromGitHub { owner = "aperezdc"; repo = "signify"; rev = "v${version}"; - sha256 = "0zg0rffxwj2a71s1bllhrn491xsmirg9sshpq8f3vl25lv4c2cnq"; + sha256 = "02xh6x6rszkvk3rf6zai7n3ivchmw0d8mwllpinjxc7k6sd415c3"; }; doCheck = true; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libbsd ]; preInstall = '' diff --git a/pkgs/tools/security/signing-party/default.nix b/pkgs/tools/security/signing-party/default.nix index c2a51f3bdf5..ee099b704aa 100644 --- a/pkgs/tools/security/signing-party/default.nix +++ b/pkgs/tools/security/signing-party/default.nix @@ -127,62 +127,62 @@ in stdenv.mkDerivation rec { TextTemplate MIMETools MailTools TimeDate NetIDNEncode ] ++ GnuPGInterfaceRuntimeDependencies)} \ --prefix PATH ":" \ - "${stdenv.lib.makeBinPath [ nettools gnupg ]}" + "${lib.makeBinPath [ nettools gnupg ]}" wrapProgram $out/bin/gpg-key2latex --set PERL5LIB \ ${perlPackages.makePerlPath GnuPGInterfaceRuntimeDependencies} \ --prefix PATH ":" \ - "${stdenv.lib.makeBinPath [ gnupg libpaper ]}" + "${lib.makeBinPath [ gnupg libpaper ]}" wrapProgram $out/bin/gpg-key2ps --prefix PATH ":" \ - "${stdenv.lib.makeBinPath [ which gnupg libpaper ]}" + "${lib.makeBinPath [ which gnupg libpaper ]}" wrapProgram $out/bin/gpg-mailkeys --prefix PATH ":" \ - "${stdenv.lib.makeBinPath [ gnupg qprint ]}" + "${lib.makeBinPath [ gnupg qprint ]}" wrapProgram $out/bin/gpgdir --set PERL5LIB \ ${with perlPackages; makePerlPath ([ TermReadKey ] ++ GnuPGInterfaceRuntimeDependencies)} \ --prefix PATH ":" \ - "${stdenv.lib.makeBinPath [ gnupg ]}" + "${lib.makeBinPath [ gnupg ]}" wrapProgram $out/bin/gpglist --prefix PATH ":" \ - "${stdenv.lib.makeBinPath [ gnupg ]}" + "${lib.makeBinPath [ gnupg ]}" wrapProgram $out/bin/gpgparticipants --prefix PATH ":" \ - "${stdenv.lib.makeBinPath [ getopt gnupg ]}" + "${lib.makeBinPath [ getopt gnupg ]}" # wrapProgram $out/bin/gpgparticipants-prefill wrapProgram $out/bin/gpgparticipants-filter --prefix PATH ":" \ - "${stdenv.lib.makeBinPath [ gnupg ]}" + "${lib.makeBinPath [ gnupg ]}" wrapProgram $out/bin/gpgsigs --set PERL5LIB \ ${perlPackages.makePerlPath GnuPGInterfaceRuntimeDependencies} \ --prefix PATH ":" \ - "${stdenv.lib.makeBinPath [ gnupg ]}" + "${lib.makeBinPath [ gnupg ]}" wrapProgram $out/bin/gpgwrap --prefix PATH ":" \ - "${stdenv.lib.makeBinPath [ gnupg ]}" + "${lib.makeBinPath [ gnupg ]}" # wrapProgram $out/bin/keyanalyze --set PERL5LIB \ wrapProgram $out/bin/keyart --prefix PATH ":" \ - "${stdenv.lib.makeBinPath [ gnupg ]}" + "${lib.makeBinPath [ gnupg ]}" wrapProgram $out/bin/keylookup --prefix PATH ":" \ - "${stdenv.lib.makeBinPath [ gnupg ]}" + "${lib.makeBinPath [ gnupg ]}" wrapProgram $out/bin/pgp-clean --set PERL5LIB \ ${perlPackages.makePerlPath GnuPGInterfaceRuntimeDependencies} \ --prefix PATH ":" \ - "${stdenv.lib.makeBinPath [ gnupg ]}" + "${lib.makeBinPath [ gnupg ]}" wrapProgram $out/bin/pgp-fixkey --set PERL5LIB \ ${perlPackages.makePerlPath GnuPGInterfaceRuntimeDependencies} \ --prefix PATH ":" \ - "${stdenv.lib.makeBinPath [ gnupg ]}" + "${lib.makeBinPath [ gnupg ]}" # wrapProgram $out/bin/pgpring diff --git a/pkgs/tools/security/sigurlx/default.nix b/pkgs/tools/security/sigurlx/default.nix new file mode 100644 index 00000000000..b6908c27422 --- /dev/null +++ b/pkgs/tools/security/sigurlx/default.nix @@ -0,0 +1,25 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "sigurlx"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "drsigned"; + repo = pname; + rev = "v${version}"; + sha256 = "1q5vy05387qx7h4xcccvn2z2ks1kiff3mfbd2w3w0l0a4qgz74xs"; + }; + + vendorSha256 = "1bp6bf99rxlyg91pn1y228q18lawpykmvkl22cydmclms0q0n238"; + + meta = with lib; { + description = "Tool to map the attack surface of web applications"; + homepage = "https://github.com/drsigned/sigurlx"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/sn0int/default.nix b/pkgs/tools/security/sn0int/default.nix index ef2f97cfa11..7cc343b7823 100644 --- a/pkgs/tools/security/sn0int/default.nix +++ b/pkgs/tools/security/sn0int/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rustPlatform, libsodium, libseccomp, sqlite, pkgconfig +{ lib, fetchFromGitHub, rustPlatform, libsodium, libseccomp, sqlite, pkg-config }: rustPlatform.buildRustPackage rec { @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1jvaavhjyalnh10vfhrdyqg1jnl8b4a3gnp8a31bgi3mb0v466k3"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsodium libseccomp sqlite ]; diff --git a/pkgs/tools/security/softhsm/default.nix b/pkgs/tools/security/softhsm/default.nix index 5ba0bd11f82..873cfdbbb05 100644 --- a/pkgs/tools/security/softhsm/default.nix +++ b/pkgs/tools/security/softhsm/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = - stdenv.lib.optionals stdenv.isDarwin [ libobjc Security ]; + lib.optionals stdenv.isDarwin [ libobjc Security ]; buildInputs = [ botan2 ]; diff --git a/pkgs/tools/security/sops/default.nix b/pkgs/tools/security/sops/default.nix index 9eddc308a4f..ae6f000fe3f 100644 --- a/pkgs/tools/security/sops/default.nix +++ b/pkgs/tools/security/sops/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "sops"; diff --git a/pkgs/tools/security/spectre-meltdown-checker/default.nix b/pkgs/tools/security/spectre-meltdown-checker/default.nix index 53797ef9851..49aa4a2a4ca 100644 --- a/pkgs/tools/security/spectre-meltdown-checker/default.nix +++ b/pkgs/tools/security/spectre-meltdown-checker/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; - installPhase = with stdenv.lib; '' + installPhase = with lib; '' runHook preInstall install -Dm755 spectre-meltdown-checker.sh $out/bin/spectre-meltdown-checker diff --git a/pkgs/tools/security/ssdeep/default.nix b/pkgs/tools/security/ssdeep/default.nix index 33ab4c373bc..acc617103d7 100644 --- a/pkgs/tools/security/ssdeep/default.nix +++ b/pkgs/tools/security/ssdeep/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "ssdeep"; @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { meta = { description = "A program for calculating fuzzy hashes"; homepage = "http://www.ssdeep.sf.net"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.thoughtpolice ]; }; } diff --git a/pkgs/tools/security/ssh-to-pgp/default.nix b/pkgs/tools/security/ssh-to-pgp/default.nix new file mode 100644 index 00000000000..487cc44cdd7 --- /dev/null +++ b/pkgs/tools/security/ssh-to-pgp/default.nix @@ -0,0 +1,29 @@ +{ lib, fetchFromGitHub, buildGoModule, gnupg }: + +buildGoModule rec { + pname = "ssh-to-pgp"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "Mic92"; + repo = "ssh-to-pgp"; + rev = version; + sha256 = "sha256-TDrpnWAez8muysMdmKFBDZfK8CyhGn1VqHB8+zD6jSk="; + }; + + vendorSha256 = "sha256-ZF/WsmqmGHZIAGTPKJ70UhtmssNhiInEZfzrKxQLw9I="; + + checkInputs = [ gnupg ]; + checkPhase = '' + HOME=$TMPDIR go test . + ''; + + doCheck = true; + + meta = with lib; { + description = "Convert ssh private keys to PGP"; + homepage = "https://github.com/Mic92/ssh-to-pgp"; + license = licenses.mit; + maintainers = with maintainers; [ mic92 ]; + }; +} diff --git a/pkgs/tools/security/sshchecker/default.nix b/pkgs/tools/security/sshchecker/default.nix new file mode 100644 index 00000000000..5dfc37dcf6c --- /dev/null +++ b/pkgs/tools/security/sshchecker/default.nix @@ -0,0 +1,29 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "sshchecker"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "lazytools"; + repo = pname; + rev = "v${version}"; + sha256 = "139b850h1w0392k8jcgj22jscsl2l60b5kk0n8378b6g57ikmis0"; + }; + + vendorSha256 = "19hdaf7d6lvwrl5rc1srrjsjx57g25cy4lvw0vvs6j52impdk6ak"; + + meta = with lib; { + description = "Dedicated SSH brute-forcing tool"; + longDescription = '' + sshchecker is a fast dedicated SSH brute-forcing tool to check + SSH login on the giving IP list. + ''; + homepage = "https://github.com/lazytools/sshchecker"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix index 4a24e459697..dbdd94a3d5c 100644 --- a/pkgs/tools/security/sshuttle/default.nix +++ b/pkgs/tools/security/sshuttle/default.nix @@ -23,11 +23,11 @@ python3Packages.buildPythonApplication rec { checkInputs = with python3Packages; [ mock pytest pytestcov pytestrunner flake8 ]; - runtimeDeps = [ coreutils openssh procps ] ++ stdenv.lib.optionals stdenv.isLinux [ iptables nettools ]; + runtimeDeps = [ coreutils openssh procps ] ++ lib.optionals stdenv.isLinux [ iptables nettools ]; postInstall = '' wrapProgram $out/bin/sshuttle \ - --prefix PATH : "${stdenv.lib.makeBinPath runtimeDeps}" \ + --prefix PATH : "${lib.makeBinPath runtimeDeps}" \ ''; meta = with lib; { diff --git a/pkgs/tools/security/ssss/default.nix b/pkgs/tools/security/ssss/default.nix index bd7de72e6be..34407f5f5ad 100644 --- a/pkgs/tools/security/ssss/default.nix +++ b/pkgs/tools/security/ssss/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gmp }: +{ lib, stdenv, fetchurl, gmp }: stdenv.mkDerivation { name = "ssss-0.5"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { description = "Shamir Secret Sharing Scheme"; homepage = "http://point-at-infinity.org/ssss/"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.gpl2; + platforms = lib.platforms.unix; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/tools/security/stoken/default.nix b/pkgs/tools/security/stoken/default.nix index 497d3816a76..f5f733d70b9 100644 --- a/pkgs/tools/security/stoken/default.nix +++ b/pkgs/tools/security/stoken/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config , libxml2, nettle , withGTK3 ? true, gtk3 }: @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { autoconf ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoconf automake libtool libxml2 nettle - ] ++ stdenv.lib.optional withGTK3 gtk3; + ] ++ lib.optional withGTK3 gtk3; meta = with lib; { description = "Software Token for Linux/UNIX"; diff --git a/pkgs/tools/security/stricat/default.nix b/pkgs/tools/security/stricat/default.nix index 28c462cbb0a..460838965a0 100644 --- a/pkgs/tools/security/stricat/default.nix +++ b/pkgs/tools/security/stricat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "stricat"; @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { meta = { description = "Multi-use cryptographic tool based on the STRIBOB algorithm"; homepage = "https://www.stribob.com/stricat/"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = lib.licenses.bsd3; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.thoughtpolice ]; }; } diff --git a/pkgs/tools/security/subjs/default.nix b/pkgs/tools/security/subjs/default.nix index 5b9a237d49c..1b7986c0a77 100644 --- a/pkgs/tools/security/subjs/default.nix +++ b/pkgs/tools/security/subjs/default.nix @@ -1,6 +1,6 @@ { buildGoModule , fetchFromGitHub -, lib, stdenv +, lib }: buildGoModule rec { diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index 776823a6a28..0f969288a24 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, coreutils, pam, groff, sssd, nixosTests +{ lib, stdenv, fetchurl, coreutils, pam, groff, sssd, nixosTests , sendmailPath ? "/run/wrappers/bin/sendmail" , withInsults ? false , withSssd ? false @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "sudo"; - version = "1.9.4p2"; + version = "1.9.5p2"; src = fetchurl { url = "https://www.sudo.ws/dist/${pname}-${version}.tar.gz"; - sha256 = "0r0g8z289ipw0zpkhmm33cpfm42j01jds2q1wilhh3flg7xg2jn3"; + sha256 = "0y093z4f3822rc88g9asdch12nljdamp817vjxk04mca7ks2x7jk"; }; prePatch = '' @@ -27,10 +27,10 @@ stdenv.mkDerivation rec { "--with-iologdir=/var/log/sudo-io" "--with-sendmail=${sendmailPath}" "--enable-tmpfiles.d=no" - ] ++ stdenv.lib.optional withInsults [ + ] ++ lib.optional withInsults [ "--with-insults" "--with-all-insults" - ] ++ stdenv.lib.optional withSssd [ + ] ++ lib.optional withSssd [ "--with-sssd" "--with-sssd-lib=${sssd}/lib" ]; @@ -78,8 +78,8 @@ stdenv.mkDerivation rec { license = "https://www.sudo.ws/sudo/license.html"; - maintainers = with stdenv.lib.maintainers; [ eelco delroth ]; + maintainers = with lib.maintainers; [ eelco delroth ]; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/security/sudolikeaboss/default.nix b/pkgs/tools/security/sudolikeaboss/default.nix index a1376463823..53f99636b45 100644 --- a/pkgs/tools/security/sudolikeaboss/default.nix +++ b/pkgs/tools/security/sudolikeaboss/default.nix @@ -1,9 +1,9 @@ # This file was generated by go2nix, then modified by hand for Darwin support. -{ lib, stdenv, buildGoPackage, fetchFromGitHub, darwin }: +{ lib, buildGoPackage, fetchFromGitHub, darwin }: buildGoPackage rec { pname = "sudolikeaboss-unstable"; - version = "20161127-${stdenv.lib.strings.substring 0 7 rev}"; + version = "20161127-${lib.strings.substring 0 7 rev}"; rev = "2d9afe19f872c9f433d476e57ee86169781b164c"; goPackagePath = "github.com/ravenac95/sudolikeaboss"; diff --git a/pkgs/tools/security/super/default.nix b/pkgs/tools/security/super/default.nix index 79a7cd839e5..f8e78c66979 100644 --- a/pkgs/tools/security/super/default.nix +++ b/pkgs/tools/security/super/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch }: +{ lib, stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { name = "super-3.30.0"; @@ -44,6 +44,6 @@ stdenv.mkDerivation rec { in /etc/super.tab); and 2) “setuid”, which allows root to execute a command under a different uid. ''; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/security/tcpcrypt/default.nix b/pkgs/tools/security/tcpcrypt/default.nix index a6eb09fd2c5..eb889cfef16 100644 --- a/pkgs/tools/security/tcpcrypt/default.nix +++ b/pkgs/tools/security/tcpcrypt/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchFromGitHub, autoreconfHook +{ lib, stdenv, fetchFromGitHub, autoreconfHook , openssl , libcap, libpcap, libnfnetlink, libnetfilter_conntrack, libnetfilter_queue }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "tcpcrypt"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "0a015rlyvagz714pgwr85f8gjq1fkc0il7d7l39qcgxrsp15b96w"; }; - postUnpack = ''mkdir -vp $sourceRoot/m4''; + postUnpack = "mkdir -vp $sourceRoot/m4"; outputs = [ "bin" "dev" "out" ]; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/security/teler/default.nix b/pkgs/tools/security/teler/default.nix index 1acb9e5609e..4a971243ad1 100644 --- a/pkgs/tools/security/teler/default.nix +++ b/pkgs/tools/security/teler/default.nix @@ -1,6 +1,6 @@ { buildGoModule , fetchFromGitHub -, lib, stdenv +, lib }: buildGoModule rec { diff --git a/pkgs/tools/security/terrascan/default.nix b/pkgs/tools/security/terrascan/default.nix new file mode 100644 index 00000000000..fddd10da618 --- /dev/null +++ b/pkgs/tools/security/terrascan/default.nix @@ -0,0 +1,33 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "terrascan"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "accurics"; + repo = pname; + rev = "v${version}"; + sha256 = "1kjis0ylvmv1gvzp5qvi9a7x4611bjv8yx5mb6nkc0a8lscwb4c3"; + }; + + vendorSha256 = "0yfybzwjvnan4qf5w25k22iwh5hp9v8si93p4jv9bx25rw91swws"; + + # tests want to download a vulnerable Terraform project + doCheck = false; + + meta = with lib; { + description = "Detect compliance and security violations across Infrastructure"; + longDescription = '' + Detect compliance and security violations across Infrastructure as Code to + mitigate risk before provisioning cloud native infrastructure. It contains + 500+ polices and support for Terraform and Kubernetes. + ''; + homepage = "https://github.com/accurics/terrascan"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/thc-hydra/default.nix b/pkgs/tools/security/thc-hydra/default.nix index 81086e77483..88ea30088f5 100644 --- a/pkgs/tools/security/thc-hydra/default.nix +++ b/pkgs/tools/security/thc-hydra/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, zlib, openssl, ncurses, libidn, pcre, libssh, libmysqlclient, postgresql -, withGUI ? false, makeWrapper, pkgconfig, gtk2 }: +, withGUI ? false, makeWrapper, pkg-config, gtk2 }: stdenv.mkDerivation rec { pname = "thc-hydra"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { --replace "-lcurses" "-lncurses" ''; - nativeBuildInputs = lib.optionals withGUI [ pkgconfig makeWrapper ]; + nativeBuildInputs = lib.optionals withGUI [ pkg-config makeWrapper ]; buildInputs = [ zlib openssl ncurses libidn pcre libssh libmysqlclient postgresql diff --git a/pkgs/tools/security/theharvester/default.nix b/pkgs/tools/security/theharvester/default.nix index 4153ddafbf4..7a03649859e 100644 --- a/pkgs/tools/security/theharvester/default.nix +++ b/pkgs/tools/security/theharvester/default.nix @@ -1,8 +1,11 @@ -{ lib, fetchFromGitHub, python3 }: +{ lib +, fetchFromGitHub +, python3 +}: python3.pkgs.buildPythonApplication rec { pname = "theHarvester"; - version = "3.1"; + version = "3.2.2"; src = fetchFromGitHub { owner = "laramies"; @@ -11,9 +14,27 @@ python3.pkgs.buildPythonApplication rec { sha256 = "0lxzxfa9wbzim50d2jmd27i57szd0grm1dfayhnym86jn01qpvn3"; }; - propagatedBuildInputs = with python3.pkgs; [ - aiodns beautifulsoup4 dns grequests netaddr - plotly pyyaml requests retrying shodan texttable + propagatedBuildInputs = with python3.pkgs; [ + aiodns + aiohttp + aiomultiprocess + aiosqlite + beautifulsoup4 + censys + certifi + dns + gevent + grequests + lxml + netaddr + plotly + pyppeteer + pyyaml + requests + retrying + shodan + texttable + uvloop ]; checkInputs = [ python3.pkgs.pytest ]; @@ -31,6 +52,6 @@ python3.pkgs.buildPythonApplication rec { ''; homepage = "https://github.com/laramies/theHarvester"; maintainers = with maintainers; [ c0bw3b treemo ]; - license = licenses.gpl2; + license = licenses.gpl2Only; }; } diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 038f4040d31..ca68f8b71fc 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libevent, openssl, zlib, torsocks +{ lib, stdenv, fetchurl, pkg-config, libevent, openssl, zlib, torsocks , libseccomp, systemd, libcap, lzma, zstd, scrypt, nixosTests , writeShellScript @@ -15,7 +15,7 @@ }: let tor-client-auth-gen = writeShellScript "tor-client-auth-gen" '' - PATH="${stdenv.lib.makeBinPath [coreutils gnugrep openssl]}" + PATH="${lib.makeBinPath [coreutils gnugrep openssl]}" pem="$(openssl genpkey -algorithm x25519)" printf private_key=descriptor:x25519: @@ -39,17 +39,17 @@ stdenv.mkDerivation rec { outputs = [ "out" "geoip" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libevent openssl zlib lzma zstd scrypt ] ++ - stdenv.lib.optionals stdenv.isLinux [ libseccomp systemd libcap ]; + lib.optionals stdenv.isLinux [ libseccomp systemd libcap ]; patches = [ ./disable-monotonic-timer-tests.patch ]; # cross compiles correctly but needs the following - configureFlags = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) + configureFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--disable-tool-name-check"; - NIX_CFLAGS_LINK = stdenv.lib.optionalString stdenv.cc.isGNU "-lgcc_s"; + NIX_CFLAGS_LINK = lib.optionalString stdenv.cc.isGNU "-lgcc_s"; postPatch = '' substituteInPlace contrib/client-tools/torify \ @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { passthru = { tests.tor = nixosTests.tor; updateScript = import ./update.nix { - inherit (stdenv) lib; + inherit lib; inherit writeScript common-updater-scripts diff --git a/pkgs/tools/security/tor/tor-arm.nix b/pkgs/tools/security/tor/tor-arm.nix index 896ab50562d..fcdb628e0f4 100644 --- a/pkgs/tools/security/tor/tor-arm.nix +++ b/pkgs/tools/security/tor/tor-arm.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper +{ lib, stdenv, fetchurl, makeWrapper , python2Packages, ncurses, lsof, nettools }: @@ -48,8 +48,8 @@ stdenv.mkDerivation rec { meta = { description = "A terminal status monitor for Tor relays"; homepage = "https://www.atagar.com/arm/"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = lib.licenses.gpl3; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.thoughtpolice ]; }; } diff --git a/pkgs/tools/security/tor/torsocks.nix b/pkgs/tools/security/tor/torsocks.nix index 381377032d6..22cfa51d4e5 100644 --- a/pkgs/tools/security/tor/torsocks.nix +++ b/pkgs/tools/security/tor/torsocks.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, fetchurl, autoreconfHook, libcap }: +{ lib, stdenv, fetchgit, fetchurl, autoreconfHook, libcap }: stdenv.mkDerivation rec { pname = "torsocks"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - patches = stdenv.lib.optional stdenv.isDarwin + patches = lib.optional stdenv.isDarwin (fetchurl { url = "https://trac.torproject.org/projects/tor/raw-attachment/ticket/28538/0001-Fix-macros-for-accept4-2.patch"; sha256 = "97881f0b59b3512acc4acb58a0d6dfc840d7633ead2f400fad70dda9b2ba30b0"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { sed -i \ -e 's,\(local app_path\)=`which $1`,\1=`type -P $1`,' \ src/bin/torsocks.in - '' + stdenv.lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.isLinux '' sed -i \ -e 's,\(local getcap\)=.*,\1=${libcap}/bin/getcap,' \ src/bin/torsocks.in @@ -36,8 +36,8 @@ stdenv.mkDerivation rec { description = "Wrapper to safely torify applications"; homepage = "https://github.com/dgoulet/torsocks"; repositories.git = "https://git.torproject.org/torsocks.git"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ phreedom thoughtpolice ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ phreedom thoughtpolice ]; }; } diff --git a/pkgs/tools/security/tpm-luks/default.nix b/pkgs/tools/security/tpm-luks/default.nix index 25e28f15831..2af4a742208 100644 --- a/pkgs/tools/security/tpm-luks/default.nix +++ b/pkgs/tools/security/tpm-luks/default.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation { description = "LUKS key storage in TPM NVRAM"; homepage = "https://github.com/shpedoikal/tpm-luks/"; maintainers = [ maintainers.tstrobel ]; + license = with licenses; [ gpl2Only ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/security/tpm-quote-tools/default.nix b/pkgs/tools/security/tpm-quote-tools/default.nix index 94da17fabec..938d0a6f294 100644 --- a/pkgs/tools/security/tpm-quote-tools/default.nix +++ b/pkgs/tools/security/tpm-quote-tools/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl, trousers, openssl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "tpm-quote-tools"; version = "1.0.4"; - src = fetchurl { + src = fetchurl { url = "mirror://sourceforge/project/tpmquotetools/${version}/${pname}-${version}.tar.gz"; sha256 = "1qjs83xb4np4yn1bhbjfhvkiika410v8icwnjix5ad96w2nlxp0h"; }; @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { postFixup = '' patchelf \ - --set-rpath "${stdenv.lib.makeLibraryPath [ openssl ]}:$(patchelf --print-rpath $out/bin/tpm_mkaik)" \ + --set-rpath "${lib.makeLibraryPath [ openssl ]}:$(patchelf --print-rpath $out/bin/tpm_mkaik)" \ $out/bin/tpm_mkaik ''; - meta = with lib; { + meta = with lib; { description = "A collection of programs that provide support for TPM based attestation using the TPM quote mechanism"; longDescription = '' The TPM Quote Tools is a collection of programs that provide support diff --git a/pkgs/tools/security/tpm2-tools/default.nix b/pkgs/tools/security/tpm2-tools/default.nix index e6a7621d987..6b33d1d4d59 100644 --- a/pkgs/tools/security/tpm2-tools/default.nix +++ b/pkgs/tools/security/tpm2-tools/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, lib -, pandoc, pkgconfig, makeWrapper, curl, openssl, tpm2-tss +, pandoc, pkg-config, makeWrapper, curl, openssl, tpm2-tss , abrmdSupport ? true, tpm2-abrmd ? null }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0117r0zzdnblkibv81y71v3limixsw5m7g9xwf7lcx8fc8836pdv"; }; - nativeBuildInputs = [ pandoc pkgconfig makeWrapper ]; + nativeBuildInputs = [ pandoc pkg-config makeWrapper ]; buildInputs = [ curl openssl tpm2-tss ]; diff --git a/pkgs/tools/security/trousers/default.nix b/pkgs/tools/security/trousers/default.nix index 76a3443d076..c7a11e16f39 100644 --- a/pkgs/tools/security/trousers/default.nix +++ b/pkgs/tools/security/trousers/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openssl, pkgconfig }: +{ lib, stdenv, fetchurl, openssl, pkg-config }: stdenv.mkDerivation rec { pname = "trousers"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sourceRoot = "."; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; patches = [ ./allow-non-tss-config-file-owner.patch ]; diff --git a/pkgs/tools/security/urlhunter/default.nix b/pkgs/tools/security/urlhunter/default.nix index 3364b622ad6..ebc628e563c 100644 --- a/pkgs/tools/security/urlhunter/default.nix +++ b/pkgs/tools/security/urlhunter/default.nix @@ -1,6 +1,6 @@ { buildGoModule , fetchFromGitHub -, lib, stdenv +, lib }: buildGoModule rec { diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 3af00b9a22b..4d9893e103f 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoPackage, installShellFiles, nixosTests }: +{ lib, fetchFromGitHub, buildGoPackage, installShellFiles, nixosTests }: buildGoPackage rec { pname = "vault"; diff --git a/pkgs/tools/security/volatility/default.nix b/pkgs/tools/security/volatility/default.nix index 8ffdfc4e2b0..6cc5ddbfb4c 100644 --- a/pkgs/tools/security/volatility/default.nix +++ b/pkgs/tools/security/volatility/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pythonPackages }: +{ lib, fetchFromGitHub, pythonPackages }: pythonPackages.buildPythonApplication rec { pname = "volatility"; @@ -19,6 +19,6 @@ pythonPackages.buildPythonApplication rec { homepage = "https://www.volatilityfoundation.org/"; description = "Advanced memory forensics framework"; maintainers = with maintainers; [ bosu ]; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/tools/security/vulnix/default.nix index e95adf3e1e6..a7ce0fb4b6e 100644 --- a/pkgs/tools/security/vulnix/default.nix +++ b/pkgs/tools/security/vulnix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , python3Packages , nix , ronn diff --git a/pkgs/tools/security/xortool/default.nix b/pkgs/tools/security/xortool/default.nix new file mode 100644 index 00000000000..1e8b6aee5d3 --- /dev/null +++ b/pkgs/tools/security/xortool/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonApplication +, docopt +, fetchFromGitHub +, importlib-metadata +, poetry-core +}: + +buildPythonApplication rec { + pname = "xortool"; + version = "1.0.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "hellman"; + repo = pname; + rev = "v${version}"; + sha256 = "19lfadi28r89bl5q8fhrxgjgs3nx3kgjd4rdg7wbvzi1cn29c5n7"; + }; + + nativeBuildInputs = [ poetry-core ]; + + propagatedBuildInputs = [ docopt importlib-metadata ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "xortool" ]; + + meta = with lib; { + description = "Tool to analyze multi-byte XOR cipher"; + homepage = "https://github.com/hellman/xortool"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/yara/default.nix b/pkgs/tools/security/yara/default.nix index 19d409e03ee..f11e772390d 100644 --- a/pkgs/tools/security/yara/default.nix +++ b/pkgs/tools/security/yara/default.nix @@ -23,17 +23,17 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ pcre protobufc ] - ++ stdenv.lib.optionals withCrypto [ openssl ] - ++ stdenv.lib.optionals enableMagic [ file ] - ++ stdenv.lib.optionals enableCuckoo [ jansson ] + ++ lib.optionals withCrypto [ openssl ] + ++ lib.optionals enableMagic [ file ] + ++ lib.optionals enableCuckoo [ jansson ] ; preConfigure = "./bootstrap.sh"; configureFlags = [ - (stdenv.lib.withFeature withCrypto "crypto") - (stdenv.lib.enableFeature enableMagic "magic") - (stdenv.lib.enableFeature enableCuckoo "cuckoo") + (lib.withFeature withCrypto "crypto") + (lib.enableFeature enableMagic "magic") + (lib.enableFeature enableCuckoo "cuckoo") ]; meta = with lib; { diff --git a/pkgs/tools/security/yubikey-agent/default.nix b/pkgs/tools/security/yubikey-agent/default.nix index 5860fb3a03e..d4f3e1567ca 100644 --- a/pkgs/tools/security/yubikey-agent/default.nix +++ b/pkgs/tools/security/yubikey-agent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, buildGoModule, libnotify, makeWrapper, pcsclite, pinentry_mac, pkgconfig, darwin }: +{ stdenv, lib, fetchFromGitHub, buildGoModule, libnotify, makeWrapper, pcsclite, pinentry_mac, pkg-config, darwin }: buildGoModule rec { pname = "yubikey-agent"; @@ -15,7 +15,7 @@ buildGoModule rec { lib.optional stdenv.isLinux (lib.getDev pcsclite) ++ lib.optional stdenv.isDarwin (darwin.apple_sdk.frameworks.PCSC); - nativeBuildInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkg-config ]; # pull in go-piv/piv-go#75 # once go-piv/piv-go#75 is merged and released, we should diff --git a/pkgs/tools/security/zmap/default.nix b/pkgs/tools/security/zmap/default.nix index fdcb5ed5ce9..0e37b725db4 100644 --- a/pkgs/tools/security/zmap/default.nix +++ b/pkgs/tools/security/zmap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, libjson, json_c, gengetopt, flex, byacc, gmp +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libjson, json_c, gengetopt, flex, byacc, gmp , libpcap }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DRESPECT_INSTALL_PREFIX_CONFIG=ON" ]; dontUseCmakeBuildDir = true; - nativeBuildInputs = [ cmake pkgconfig gengetopt flex byacc ]; + nativeBuildInputs = [ cmake pkg-config gengetopt flex byacc ]; buildInputs = [ libjson json_c gmp libpcap ]; outputs = [ "out" "man" ]; diff --git a/pkgs/tools/security/zzuf/default.nix b/pkgs/tools/security/zzuf/default.nix index e7d12d8a68e..f8f7bece3a5 100644 --- a/pkgs/tools/security/zzuf/default.nix +++ b/pkgs/tools/security/zzuf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config }: stdenv.mkDerivation rec { pname = "zzuf"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0li1s11xf32dafxq1jbnc8c63313hy9ry09dja2rymk9mza4x2n9"; }; - buildInputs = [ autoconf automake libtool pkgconfig ]; + buildInputs = [ autoconf automake libtool pkg-config ]; preConfigure = "./bootstrap"; diff --git a/pkgs/tools/system/amtterm/default.nix b/pkgs/tools/system/amtterm/default.nix index 9050111fc17..4ceb1aea72b 100644 --- a/pkgs/tools/system/amtterm/default.nix +++ b/pkgs/tools/system/amtterm/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, makeWrapper, perl, perlPackages }: +{ fetchurl, lib, stdenv, makeWrapper, perl, perlPackages }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { postInstall = "wrapProgram $out/bin/amttool --prefix PERL5LIB : $PERL5LIB"; - meta = with stdenv.lib; + meta = with lib; { description = "Intel AMT® SoL client + tools"; homepage = "https://www.kraxel.org/cgit/amtterm/"; license = licenses.gpl2; diff --git a/pkgs/tools/system/at/default.nix b/pkgs/tools/system/at/default.nix index 278b14cd199..11a45fbe391 100644 --- a/pkgs/tools/system/at/default.nix +++ b/pkgs/tools/system/at/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, bison, flex, pam, perl +{ lib, stdenv, fetchurl, fetchpatch, bison, flex, pam, perl , sendmailPath ? "/run/wrappers/bin/sendmail" , atWrapperPath ? "/run/wrappers/bin/at" }: @@ -51,9 +51,9 @@ stdenv.mkDerivation rec { ''; meta = { - description = ''The classical Unix `at' job scheduling command''; - license = stdenv.lib.licenses.gpl2Plus; + description = "The classical Unix `at' job scheduling command"; + license = lib.licenses.gpl2Plus; homepage = "https://packages.qa.debian.org/at"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/system/augeas/default.nix b/pkgs/tools/system/augeas/default.nix index 6a8c50c6095..3b3d2864d71 100644 --- a/pkgs/tools/system/augeas/default.nix +++ b/pkgs/tools/system/augeas/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, readline, libxml2 }: +{ lib, stdenv, fetchurl, pkg-config, readline, libxml2 }: stdenv.mkDerivation rec { pname = "augeas"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { url = "http://download.augeas.net/${pname}-${version}.tar.gz"; sha256 = "11ybhb13wkkilsn7b416a1dn61m1xrq0lbdpkhp5w61jrk4l469j"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ readline libxml2 ]; meta = with lib; { diff --git a/pkgs/tools/system/autocpu-freq/default.nix b/pkgs/tools/system/auto-cpufreq/default.nix index 7e23b8b5b0f..b4bef5fc5e3 100644 --- a/pkgs/tools/system/autocpu-freq/default.nix +++ b/pkgs/tools/system/auto-cpufreq/default.nix @@ -1,27 +1,32 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub }: python3Packages.buildPythonPackage rec { pname = "auto-cpufreq"; - version = "1.5.1"; + version = "1.5.3"; src = fetchFromGitHub { owner = "AdnanHodzic"; repo = pname; rev = "v${version}"; - sha256 = "uVhftO6AqFnZ0uaEYRAPvVskkouNOXPtNVYXx7WJKyw="; + sha256 = "sha256-NDIdQ4gUN2jG+VWXsv3fdUogZxOOiNtnbekD30+jx6M="; }; propagatedBuildInputs = with python3Packages; [ click distro psutil ]; doCheck = false; - pythonImportsCheck = [ "source" ]; + pythonImportsCheck = [ "auto_cpufreq" ]; # patch to prevent script copying and to disable install patches = [ ./prevent-install-and-copy.patch ]; postInstall = '' # copy script manually - cp ${src}/scripts/cpufreqctl.sh $out/bin/cpufreqctl + cp ${src}/scripts/cpufreqctl.sh $out/bin/cpufreqctl.auto-cpufreq + + # systemd service + mkdir -p $out/lib/systemd/system + cp ${src}/scripts/auto-cpufreq.service $out/lib/systemd/system + substituteInPlace $out/lib/systemd/system/auto-cpufreq.service --replace "/usr/local" $out ''; meta = with lib; { diff --git a/pkgs/tools/system/autocpu-freq/prevent-install-and-copy.patch b/pkgs/tools/system/auto-cpufreq/prevent-install-and-copy.patch index 28c524e1497..232ac780341 100644 --- a/pkgs/tools/system/autocpu-freq/prevent-install-and-copy.patch +++ b/pkgs/tools/system/auto-cpufreq/prevent-install-and-copy.patch @@ -1,100 +1,44 @@ -diff --git a/scripts/cpufreqctl.sh b/scripts/cpufreqctl.sh -index 63a2b5b..e157efe 100755 ---- a/scripts/cpufreqctl.sh -+++ b/scripts/cpufreqctl.sh -@@ -467,35 +467,21 @@ fi +diff --git a/auto_cpufreq/core.py b/auto_cpufreq/core.py +index 482a544..d142013 100644 +--- a/auto_cpufreq/core.py ++++ b/auto_cpufreq/core.py +@@ -163,31 +163,13 @@ def get_current_gov(): + return print("Currently using:", getoutput("cpufreqctl.auto-cpufreq --governor").strip().split(" ")[0], "governor") - if [ $OPTION = "--install" ] - then -- echo 'installing helpers...' -- cp $0 /usr/bin/ -- echo 'installing policy...' -- cp $(dirname "$(readlink -f "$0")")/konkor.cpufreq.policy /usr/share/polkit-1/actions/ -- echo 'installing fonts...' -- mkdir -p /usr/share/fonts/truetype/cpufreq -- cp $(dirname "$(readlink -f "$0")")/fonts/cpufreq.ttf /usr/share/fonts/truetype/cpufreq/ -- echo "done" -+ echo "install is disabled in the nix package" - exit - fi - if [ $OPTION = "--update-fonts" ] - then -- fc-cache -f -+ echo "update-fonts is disabled in the nix package" - exit - fi - if [ $OPTION = "--uninstall" ] - then -- echo 'uninstalling cpufreqctl helper...' -- rm /usr/bin/cpufreqctl -- echo 'uninstalling policy...' -- rm /usr/share/polkit-1/actions/konkor.cpufreq.policy -- echo 'uninstalling fonts...' -- rm -rf /usr/share/fonts/truetype/cpufreq -- echo "done" -+ echo "uninstall is disabled in the nix package" - exit - fi - if [ $OPTION = "--reset" ] - then -- echo 'reset to default values...' -- dconf reset -f "/org/gnome/shell/extensions/cpufreq/" -+ echo "reset is disabled in the nix package" - exit - fi -diff --git a/source/core.py b/source/core.py -index 531c0c4..2e27e65 100644 ---- a/source/core.py -+++ b/source/core.py -@@ -24,8 +24,6 @@ warnings.filterwarnings("ignore") - # - re-enable CPU fan speed display and make more generic and not only for thinkpad - # - replace get system/CPU load from: psutil.getloadavg() | available in 5.6.2) - --SCRIPTS_DIR = Path("/usr/local/share/auto-cpufreq/scripts/") -- - # from the highest performance to the lowest - ALL_GOVERNORS = ("performance", "ondemand", "conservative", "schedutil", "userspace", "powersave") - CPUS = os.cpu_count() -@@ -156,34 +154,16 @@ def cpufreqctl(): - """ - deploy cpufreqctl script - """ + def cpufreqctl(): +- """ +- deploy cpufreqctl script +- """ - - # detect if running on a SNAP - if os.getenv('PKG_MARKER') == "SNAP": - pass - else: -- # deploy cpufreqctl script (if missing) +- # deploy cpufreqctl.auto-cpufreq script - if os.path.isfile("/usr/bin/cpufreqctl"): -- shutil.copy("/usr/bin/cpufreqctl", "/usr/bin/cpufreqctl.auto-cpufreq.bak") -- shutil.copy(SCRIPTS_DIR / "cpufreqctl.sh", "/usr/bin/cpufreqctl") +- shutil.copy(SCRIPTS_DIR / "cpufreqctl.sh", "/usr/bin/cpufreqctl.auto-cpufreq") - else: -- shutil.copy(SCRIPTS_DIR / "cpufreqctl.sh", "/usr/bin/cpufreqctl") +- shutil.copy(SCRIPTS_DIR / "cpufreqctl.sh", "/usr/bin/cpufreqctl.auto-cpufreq") + # scripts are already in the correct place + pass def cpufreqctl_restore(): - """ - restore original cpufreqctl script - """ +- """ +- remove cpufreqctl.auto-cpufreq script +- """ - # detect if running on a SNAP - if os.getenv('PKG_MARKER') == "SNAP": - pass - else: -- # restore original cpufreqctl script -- if os.path.isfile("/usr/bin/cpufreqctl.auto-cpufreq.bak"): -- os.system("cp /usr/bin/cpufreqctl.auto-cpufreq.bak /usr/bin/cpufreqctl") -- os.remove("/usr/bin/cpufreqctl.auto-cpufreq.bak") -- # ToDo: implement mechanism to make sure cpufreqctl (auto-cpufreq) file is -- # restored if overwritten by system. But during tool removal to also remove it -- # in def cpufreqctl +- if os.path.isfile("/usr/bin/cpufreqctl.auto-cpufreq"): +- os.remove("/usr/bin/cpufreqctl.auto-cpufreq") + # no need to restore + pass - def footer(l=79): -@@ -209,71 +189,13 @@ def remove_complete_msg(): + print("\n" + "-" * l + "\n") +@@ -212,74 +194,12 @@ def remove_complete_msg(): def deploy_daemon(): @@ -116,7 +60,7 @@ index 531c0c4..2e27e65 100644 - except: - print("\nERROR:\nWas unable to turn off bluetooth on boot") - -- auto_cpufreq_log_file.touch(exist_ok=True) +- auto_cpufreq_log_path.touch(exist_ok=True) - - print("\n* Deploy auto-cpufreq install script") - shutil.copy(SCRIPTS_DIR / "auto-cpufreq-install.sh", "/usr/bin/auto-cpufreq-install") @@ -125,10 +69,10 @@ index 531c0c4..2e27e65 100644 - shutil.copy(SCRIPTS_DIR / "auto-cpufreq-remove.sh", "/usr/bin/auto-cpufreq-remove") - - call("/usr/bin/auto-cpufreq-install", shell=True) +- + # prevent needless copying and system changes + pass - # remove auto-cpufreq daemon def remove(): - @@ -136,7 +80,7 @@ index 531c0c4..2e27e65 100644 - if not os.path.exists("/usr/bin/auto-cpufreq-remove"): - print("\nauto-cpufreq daemon is not installed.\n") - sys.exit(1) -- +- - print("\n" + "-" * 21 + " Removing auto-cpufreq daemon " + "-" * 22 + "\n") - - print("* Turn on bluetooth on boot") @@ -159,8 +103,11 @@ index 531c0c4..2e27e65 100644 - os.remove("/usr/bin/auto-cpufreq-remove") - - # delete log file -- if auto_cpufreq_log_file.exists(): -- auto_cpufreq_log_file.unlink() +- if auto_cpufreq_log_path.exists(): +- if auto_cpufreq_log_file is not None: +- auto_cpufreq_log_file.close() +- +- auto_cpufreq_log_path.unlink() - - # restore original cpufrectl script - cpufreqctl_restore() @@ -169,10 +116,47 @@ index 531c0c4..2e27e65 100644 def gov_check(): for gov in get_avail_gov(): -@@ -798,4 +720,4 @@ def running_daemon(): - exit(1) - elif os.getenv("PKG_MARKER") == "SNAP" and dcheck == "enabled": - deploy_complete_msg() -- exit(1) -\ No newline at end of file -+ exit(1) +diff --git a/scripts/cpufreqctl.sh b/scripts/cpufreqctl.sh +index 63a2b5b..e157efe 100755 +--- a/scripts/cpufreqctl.sh ++++ b/scripts/cpufreqctl.sh +@@ -467,35 +467,21 @@ fi + + if [ $OPTION = "--install" ] + then +- echo 'installing helpers...' +- cp $0 /usr/bin/ +- echo 'installing policy...' +- cp $(dirname "$(readlink -f "$0")")/konkor.cpufreq.policy /usr/share/polkit-1/actions/ +- echo 'installing fonts...' +- mkdir -p /usr/share/fonts/truetype/cpufreq +- cp $(dirname "$(readlink -f "$0")")/fonts/cpufreq.ttf /usr/share/fonts/truetype/cpufreq/ +- echo "done" ++ echo "install is disabled in the nix package" + exit + fi + if [ $OPTION = "--update-fonts" ] + then +- fc-cache -f ++ echo "update-fonts is disabled in the nix package" + exit + fi + if [ $OPTION = "--uninstall" ] + then +- echo 'uninstalling cpufreqctl helper...' +- rm /usr/bin/cpufreqctl +- echo 'uninstalling policy...' +- rm /usr/share/polkit-1/actions/konkor.cpufreq.policy +- echo 'uninstalling fonts...' +- rm -rf /usr/share/fonts/truetype/cpufreq +- echo "done" ++ echo "uninstall is disabled in the nix package" + exit + fi + if [ $OPTION = "--reset" ] + then +- echo 'reset to default values...' +- dconf reset -f "/org/gnome/shell/extensions/cpufreq/" ++ echo "reset is disabled in the nix package" + exit + fi diff --git a/pkgs/tools/system/awstats/default.nix b/pkgs/tools/system/awstats/default.nix index b04532d842f..88162780cb7 100644 --- a/pkgs/tools/system/awstats/default.nix +++ b/pkgs/tools/system/awstats/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perlPackages, jdk }: +{ lib, fetchurl, perlPackages, jdk }: perlPackages.buildPerlPackage rec { pname = "awstats"; diff --git a/pkgs/tools/system/bar/default.nix b/pkgs/tools/system/bar/default.nix index 32945a24bb1..79bb3f79a99 100644 --- a/pkgs/tools/system/bar/default.nix +++ b/pkgs/tools/system/bar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "bar-1.11.1"; @@ -11,8 +11,8 @@ stdenv.mkDerivation { meta = { description = "Console progress bar"; homepage = "http://clpbar.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.rdnetto ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.rdnetto ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/system/bfs/default.nix b/pkgs/tools/system/bfs/default.nix index c49f033c42a..7ea7430e95d 100644 --- a/pkgs/tools/system/bfs/default.nix +++ b/pkgs/tools/system/bfs/default.nix @@ -11,10 +11,10 @@ stdenv.mkDerivation rec { sha256 = "1iricyigm0rsc8fr91vk3krvyafbnp0y3ww1rjv94l6jbdl7rrlb"; }; - buildInputs = stdenv.lib.optionals stdenv.isLinux [ libcap acl ]; + buildInputs = lib.optionals stdenv.isLinux [ libcap acl ]; # Disable LTO on darwin. See https://github.com/NixOS/nixpkgs/issues/19098 - preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.isDarwin '' substituteInPlace Makefile --replace "-flto -DNDEBUG" "-DNDEBUG" ''; diff --git a/pkgs/tools/system/bottom/default.nix b/pkgs/tools/system/bottom/default.nix index a79e8bdcebf..29c1d6376fe 100644 --- a/pkgs/tools/system/bottom/default.nix +++ b/pkgs/tools/system/bottom/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "bottom"; - version = "0.5.6"; + version = "0.5.7"; src = fetchFromGitHub { owner = "ClementTsang"; repo = pname; rev = version; - sha256 = "sha256-88uEEsb+coX8PTKrem+0t5AkamCmqJsFYsENFTZSsys="; + sha256 = "sha256-9L7FtYIaWSOwNQ8zOLvxjt51o8A5MqqfF/iIyJs2TJA="; }; prePatch = '' @@ -17,9 +17,9 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.IOKit; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.IOKit; - cargoSha256 = "sha256-qnh4Tl6JRgxBJbu+t9IJX/XChIR15rTRLvsl+/ZvPxY="; + cargoSha256 = "sha256-4oH1A88Qn0c6hkE/1b6mTrEIph8xT98j+DkP9/5JALs="; doCheck = false; diff --git a/pkgs/tools/system/bpytop/default.nix b/pkgs/tools/system/bpytop/default.nix index abcc1593988..6754d0806b6 100644 --- a/pkgs/tools/system/bpytop/default.nix +++ b/pkgs/tools/system/bpytop/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bpytop"; - version = "1.0.50"; + version = "1.0.61"; src = fetchFromGitHub { owner = "aristocratos"; repo = pname; rev = "v${version}"; - sha256 = "10j2g19sh2hl5lzbcllr862hkzr0mc1z8n24afzaycn1sphri8fc"; + sha256 = "sha256-E6blMhDkZa3Wbdbsw7f8jdHwHFINOQ48XC5pQdkVPtQ="; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/system/chase/default.nix b/pkgs/tools/system/chase/default.nix index c4396aad9ca..ff4885b088d 100644 --- a/pkgs/tools/system/chase/default.nix +++ b/pkgs/tools/system/chase/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl ,pkgconfig, libatomic_ops , boehmgc }: +{ lib, stdenv, fetchurl ,pkg-config, libatomic_ops , boehmgc }: stdenv.mkDerivation rec { pname = "chase"; version = "0.5.2"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libatomic_ops boehmgc ] ; src = fetchurl { url = "mirror://debian/pool/main/c/chase/chase_${version}.orig.tar.gz"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { makeFlags = [ "-e" ]; makeFlagsArray="LIBS=-lgc"; - meta = with stdenv.lib ; { + meta = with lib ; { description = "Follow a symlink and print out its target file"; longDescription = '' A commandline program that chases symbolic filesystems links to the original file diff --git a/pkgs/tools/system/cm-rgb/default.nix b/pkgs/tools/system/cm-rgb/default.nix index a50fa60197a..47fdba50c5e 100644 --- a/pkgs/tools/system/cm-rgb/default.nix +++ b/pkgs/tools/system/cm-rgb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonApplication , fetchFromGitHub , atk @@ -38,7 +38,7 @@ buildPythonApplication rec { postInstall = '' # Remove this line when/if this PR gets merged: - # https://github.com/gfduszynski/cm-rgb/pull/43 + # https://github.com/gfduszynski/cm-rgb/pull/43 install -m0755 scripts/cm-rgb-gui $out/bin/cm-rgb-gui mkdir -p $out/etc/udev/rules.d diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index eb64a09a22b..600c5cbfecd 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, fetchpatch, darwin, callPackage , autoreconfHook -, pkgconfig +, pkg-config , libtool , ... }@args: @@ -16,10 +16,10 @@ stdenv.mkDerivation rec { sha256 = "1mh97afgq6qgmpvpr84zngh58m0sl1b4wimqgvvk376188q09bjv"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ libtool - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.ApplicationServices ] ++ plugins.buildInputs; diff --git a/pkgs/tools/system/collectd/plugins.nix b/pkgs/tools/system/collectd/plugins.nix index defeed4c892..dd578cd6393 100644 --- a/pkgs/tools/system/collectd/plugins.nix +++ b/pkgs/tools/system/collectd/plugins.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , curl , darwin , hiredis @@ -49,7 +49,7 @@ let aggregation = {}; amqp = { buildInputs = [ yajl ] ++ - stdenv.lib.optionals stdenv.isLinux [ rabbitmq-c ]; + lib.optionals stdenv.isLinux [ rabbitmq-c ]; }; apache = { buildInputs = [ curl ]; @@ -62,7 +62,7 @@ let }; barometer = {}; battery = { - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.IOKit ]; }; @@ -94,9 +94,9 @@ let }; df = {}; disk = { - buildInputs = stdenv.lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.isLinux [ udev - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.IOKit ]; }; @@ -126,7 +126,7 @@ let iptables = { buildInputs = [ libpcap - ] ++ stdenv.lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ iptables libmnl ]; }; @@ -161,14 +161,14 @@ let memory = {}; mic = {}; modbus = { - buildInputs = stdenv.lib.optionals stdenv.isLinux [ libmodbus ]; + buildInputs = lib.optionals stdenv.isLinux [ libmodbus ]; }; mqtt = { buildInputs = [ mosquitto ]; }; multimeter = {}; mysql = { - buildInputs = stdenv.lib.optionals (libmysqlclient != null) [ + buildInputs = lib.optionals (libmysqlclient != null) [ libmysqlclient ]; }; @@ -176,7 +176,7 @@ let netlink = { buildInputs = [ libpcap - ] ++ stdenv.lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ libmnl ]; }; @@ -236,20 +236,20 @@ let buildInputs = [ rrdtool libxml2 ]; }; sensors = { - buildInputs = stdenv.lib.optionals stdenv.isLinux [ lm_sensors ]; + buildInputs = lib.optionals stdenv.isLinux [ lm_sensors ]; }; serial = {}; sigrok = { - buildInputs = stdenv.lib.optionals stdenv.isLinux [ libsigrok udev ]; + buildInputs = lib.optionals stdenv.isLinux [ libsigrok udev ]; }; smart = { - buildInputs = stdenv.lib.optionals stdenv.isLinux [ libatasmart udev ]; + buildInputs = lib.optionals stdenv.isLinux [ libatasmart udev ]; }; snmp = { - buildInputs = stdenv.lib.optionals stdenv.isLinux [ net-snmp ]; + buildInputs = lib.optionals stdenv.isLinux [ net-snmp ]; }; snmp_agent = { - buildInputs = stdenv.lib.optionals stdenv.isLinux [ net-snmp ]; + buildInputs = lib.optionals stdenv.isLinux [ net-snmp ]; }; statsd = {}; swap = {}; @@ -280,7 +280,7 @@ let }; virt = { buildInputs = [ libvirt libxml2 yajl ] ++ - stdenv.lib.optionals stdenv.isLinux [ lvm2 udev + lib.optionals stdenv.isLinux [ lvm2 udev # those might be no longer required when https://github.com/NixOS/nixpkgs/pull/51767 # is merged libapparmor numactl libcap_ng diff --git a/pkgs/tools/system/colorls/gemset.nix b/pkgs/tools/system/colorls/gemset.nix index 850aae35684..b978a4762ac 100644 --- a/pkgs/tools/system/colorls/gemset.nix +++ b/pkgs/tools/system/colorls/gemset.nix @@ -60,4 +60,4 @@ }; version = "1.7.0"; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/system/consul-template/default.nix b/pkgs/tools/system/consul-template/default.nix index 7604584e167..a285c720eaa 100644 --- a/pkgs/tools/system/consul-template/default.nix +++ b/pkgs/tools/system/consul-template/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "consul-template"; diff --git a/pkgs/tools/system/das_watchdog/default.nix b/pkgs/tools/system/das_watchdog/default.nix index b9c25aef7a7..d9332acc898 100644 --- a/pkgs/tools/system/das_watchdog/default.nix +++ b/pkgs/tools/system/das_watchdog/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, libgtop, xmessage, which, pkgconfig }: +{ lib, stdenv, fetchgit, libgtop, xmessage, which, pkg-config }: stdenv.mkDerivation { pname = "das_watchdog"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "02y1vfb3wh4908xjj1kpyf8kgxk29x8dw7yl3pnl220qz2gi99vr"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libgtop xmessage which ]; installPhase = '' diff --git a/pkgs/tools/system/dfc/default.nix b/pkgs/tools/system/dfc/default.nix index 415b647befa..6478e699539 100644 --- a/pkgs/tools/system/dfc/default.nix +++ b/pkgs/tools/system/dfc/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cmake, gettext}: +{lib, stdenv, fetchurl, cmake, gettext}: stdenv.mkDerivation rec { pname = "dfc"; @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://projects.gw-computing.net/projects/dfc"; description = "Displays file system space usage using graphs and colors"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [qknight]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [qknight]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/system/efibootmgr/default.nix b/pkgs/tools/system/efibootmgr/default.nix index 773127fa187..0c678dd9c51 100644 --- a/pkgs/tools/system/efibootmgr/default.nix +++ b/pkgs/tools/system/efibootmgr/default.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, efivar, popt }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, efivar, popt }: stdenv.mkDerivation rec { pname = "efibootmgr"; version = "17"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ efivar popt ]; diff --git a/pkgs/tools/system/efivar/default.nix b/pkgs/tools/system/efivar/default.nix index 46741c1408a..c92b28e7f5e 100644 --- a/pkgs/tools/system/efivar/default.nix +++ b/pkgs/tools/system/efivar/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPackages, fetchFromGitHub, fetchurl, pkgconfig, popt }: +{ lib, stdenv, buildPackages, fetchFromGitHub, fetchurl, pkg-config, popt }: stdenv.mkDerivation rec { pname = "efivar"; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { postPatch = "sed '/^OPTIMIZE /s/-flto//' -i Make.defaults"; NIX_CFLAGS_COMPILE = "-Wno-error=stringop-truncation"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ popt ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/tools/system/envconsul/default.nix b/pkgs/tools/system/envconsul/default.nix index 1706b32449e..9e8180b318a 100644 --- a/pkgs/tools/system/envconsul/default.nix +++ b/pkgs/tools/system/envconsul/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "envconsul"; diff --git a/pkgs/tools/system/evemu/default.nix b/pkgs/tools/system/evemu/default.nix index 4bb5fce1875..5b3a584bd24 100644 --- a/pkgs/tools/system/evemu/default.nix +++ b/pkgs/tools/system/evemu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, autoreconfHook, pkgconfig, pythonPackages +{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, pythonPackages , libevdev }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1m38fxwy2s82vb2qm9aqxinws12akmqqq7q66is931lc3awqkbah"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ pythonPackages.python pythonPackages.evdev libevdev ]; diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix index a67b975ec92..1ece53203b1 100644 --- a/pkgs/tools/system/facter/default.nix +++ b/pkgs/tools/system/facter/default.nix @@ -2,17 +2,17 @@ stdenv.mkDerivation rec { pname = "facter"; - version = "3.14.14"; + version = "3.14.15"; src = fetchFromGitHub { - sha256 = "07pfa11i3nn2dk5g3c1qj3g7d2s8gd2fr0lmfijndaqxm7gjrn1a"; + sha256 = "sha256-vRtDctiulR5YmcwNCZtSU/tsRjs1+DP07NFVSL1TSuI="; rev = version; repo = pname; owner = "puppetlabs"; }; - CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isGNU "-fpermissive -Wno-error=catch-value"; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lblkid"; + CXXFLAGS = lib.optionalString stdenv.cc.isGNU "-fpermissive -Wno-error=catch-value"; + NIX_LDFLAGS = lib.optionalString stdenv.isLinux "-lblkid"; cmakeFlags = [ "-DFACTER_RUBY=${ruby}/lib/libruby${stdenv.hostPlatform.extensions.sharedLibrary}" diff --git a/pkgs/tools/system/fakeroot/default.nix b/pkgs/tools/system/fakeroot/default.nix index c5765609a27..57a986e3da9 100644 --- a/pkgs/tools/system/fakeroot/default.nix +++ b/pkgs/tools/system/fakeroot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, getopt, libcap, gnused }: +{ lib, stdenv, fetchurl, fetchpatch, getopt, libcap, gnused }: stdenv.mkDerivation rec { version = "1.23"; @@ -9,9 +9,9 @@ stdenv.mkDerivation rec { sha256 = "1xpl0s2yjyjwlf832b6kbkaa5921liybaar13k7n45ckd9lxd700"; }; - patches = stdenv.lib.optional stdenv.isLinux ./einval.patch + patches = lib.optional stdenv.isLinux ./einval.patch # patchset from brew - ++ stdenv.lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.isDarwin [ (fetchpatch { name = "0001-Implement-openat-2-wrapper-which-handles-optional-ar.patch"; url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=5;filename=0001-Implement-openat-2-wrapper-which-handles-optional-ar.patch;att=1;bug=766649"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ getopt gnused ] - ++ stdenv.lib.optional (!stdenv.isDarwin) libcap + ++ lib.optional (!stdenv.isDarwin) libcap ; postUnpack = '' @@ -40,9 +40,9 @@ stdenv.mkDerivation rec { meta = { homepage = "https://salsa.debian.org/clint/fakeroot"; description = "Give a fake root environment through LD_PRELOAD"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [viric]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/system/fcron/default.nix b/pkgs/tools/system/fcron/default.nix index d6f764b9ea6..9e3b3c2c16d 100644 --- a/pkgs/tools/system/fcron/default.nix +++ b/pkgs/tools/system/fcron/default.nix @@ -56,6 +56,6 @@ stdenv.mkDerivation rec { description="A command scheduler with extended capabilities over cron and anacron"; homepage = "http://fcron.free.fr"; license = licenses.gpl2; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/system/fdisk/default.nix b/pkgs/tools/system/fdisk/default.nix index 423b00bd543..4ad654783df 100644 --- a/pkgs/tools/system/fdisk/default.nix +++ b/pkgs/tools/system/fdisk/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, parted, libuuid, gettext, guile }: +{ fetchurl, lib, stdenv, parted, libuuid, gettext, guile }: stdenv.mkDerivation rec { name = "gnufdisk-2.0.0a"; # .0a1 seems broken, see https://lists.gnu.org/archive/html/bug-fdisk/2012-09/msg00000.html @@ -20,10 +20,10 @@ stdenv.mkDerivation rec { cfdisk. It uses GNU Parted. ''; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; homepage = "https://www.gnu.org/software/fdisk/"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix index 6efa107ef32..a71bef4809c 100644 --- a/pkgs/tools/system/fio/default.nix +++ b/pkgs/tools/system/fio/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ python zlib ] - ++ stdenv.lib.optional (!stdenv.isDarwin) libaio; + ++ lib.optional (!stdenv.isDarwin) libaio; nativeBuildInputs = [ makeWrapper ]; @@ -27,9 +27,9 @@ stdenv.mkDerivation rec { substituteInPlace tools/plot/fio2gnuplot --replace /usr/share/fio $out/share/fio ''; - postInstall = stdenv.lib.optionalString withGnuplot '' + postInstall = lib.optionalString withGnuplot '' wrapProgram $out/bin/fio2gnuplot \ - --prefix PATH : ${stdenv.lib.makeBinPath [ gnuplot ]} + --prefix PATH : ${lib.makeBinPath [ gnuplot ]} ''; meta = with lib; { diff --git a/pkgs/tools/system/foreman/gemset.nix b/pkgs/tools/system/foreman/gemset.nix index b35bd15c974..f747a2b0634 100644 --- a/pkgs/tools/system/foreman/gemset.nix +++ b/pkgs/tools/system/foreman/gemset.nix @@ -15,4 +15,4 @@ sha256 = "1caz8mi7gq1hs4l1flcyyw1iw1bdvdbhppsvy12akr01k3s17xaq"; }; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix index 76654d14539..9529ccad399 100644 --- a/pkgs/tools/system/freeipmi/default.nix +++ b/pkgs/tools/system/freeipmi/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, libgcrypt, readline, libgpgerror }: +{ fetchurl, lib, stdenv, libgcrypt, readline, libgpgerror }: stdenv.mkDerivation rec { version = "1.6.6"; @@ -33,10 +33,10 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/freeipmi/"; downloadPage = "https://www.gnu.org/software/freeipmi/download.html"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ raskin ]; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice + maintainers = with lib.maintainers; [ raskin ]; + platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice updateWalker = true; inherit version; diff --git a/pkgs/tools/system/gdmap/default.nix b/pkgs/tools/system/gdmap/default.nix index da1925152bf..d9c639ab1c4 100644 --- a/pkgs/tools/system/gdmap/default.nix +++ b/pkgs/tools/system/gdmap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gtk2, pkgconfig, libxml2, intltool, gettext }: +{ lib, stdenv, fetchurl, gtk2, pkg-config, libxml2, intltool, gettext }: stdenv.mkDerivation rec { name = "gdmap-0.8.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0nr8l88cg19zj585hczj8v73yh21k7j13xivhlzl8jdk0j0cj052"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 libxml2 intltool gettext ]; patches = [ ./get_sensitive.patch ./set_flags.patch ]; diff --git a/pkgs/tools/system/gdu/default.nix b/pkgs/tools/system/gdu/default.nix index 6fb65e0c3a2..0c63bf651ba 100644 --- a/pkgs/tools/system/gdu/default.nix +++ b/pkgs/tools/system/gdu/default.nix @@ -1,26 +1,32 @@ { lib -, stdenv , buildGoModule , fetchFromGitHub +, installShellFiles }: buildGoModule rec { pname = "gdu"; - version = "2.2.0"; + version = "4.3.2"; src = fetchFromGitHub { owner = "dundee"; repo = pname; rev = "v${version}"; - sha256 = "0ajkc0vbzyl56d6z03s5vb17frjrg5wl145x60asnrmh7lg8adsj"; + sha256 = "sha256-m4J797bmQzKuyA01JgDLVlf+PbXDVXWtYbID/0QVLxE="; }; - vendorSha256 = "1jqbsda9bch3awdq816w4jybv7wz9mfflmvs5y2wsa2qnhn9nbyp"; + vendorSha256 = "sha256-kIMd0xzQ+c+jCpX2+qdD/GcFEirR15PMInbEV184EBU="; - buildFlagsArray = [ "-ldflags=-s -w -X main.AppVersion=${version}" ]; + buildFlagsArray = [ "-ldflags=-s -w -X github.com/dundee/gdu/build.Version=${version}" ]; - # analyze/dev_test.go: undefined: processMounts - doCheck = !stdenv.isDarwin; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installManPage gdu.1 + ''; + + # tests fail if the version is set + doCheck = false; meta = with lib; { description = "Disk usage analyzer with console interface"; diff --git a/pkgs/tools/system/go-audit/default.nix b/pkgs/tools/system/go-audit/default.nix new file mode 100644 index 00000000000..9670a4d0684 --- /dev/null +++ b/pkgs/tools/system/go-audit/default.nix @@ -0,0 +1,29 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "go-audit"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "slackhq"; + repo = pname; + rev = "v${version}"; + sha256 = "02iwjzaz2ks0zmwijaijwzc3gn9mhn7xpx369ylgaz68arlapfjg"; + }; + + vendorSha256 = "11kb7xm82s0d8d06b2jknwn3dfh4i0a1dv0740y47vk62sf6f05i"; + + # Tests need network access + doCheck = false; + + meta = with lib; { + description = "An alternative to the auditd daemon"; + homepage = "https://github.com/slackhq/go-audit"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/system/gotop/default.nix b/pkgs/tools/system/gotop/default.nix index b49307f500f..0c27e9e4e71 100644 --- a/pkgs/tools/system/gotop/default.nix +++ b/pkgs/tools/system/gotop/default.nix @@ -1,18 +1,18 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "gotop"; - version = "4.0.1"; + version = "4.1.0"; src = fetchFromGitHub { owner = "xxxserxxx"; repo = pname; rev = "v${version}"; - sha256 = "10qfzmq1wdgpvv319khzicalix1x4fqava0wry3bzz84k5c9dabs"; + sha256 = "09cs97fjjxcjxzsl2kh8j607cs5zy2hnrh1pb21pggzhg7dzsz0w"; }; runVend = true; - vendorSha256 = "09vdhdgj74ifdhl6rmxddkvk7ls26jn8gswzcxf9389zkjzi7822"; + vendorSha256 = "1mbjl7b49naaqkr2j658j17z9ryf5g3x6q34gvmrm7n9y082ggnz"; preCheck = '' export HOME=$(mktemp -d) @@ -21,7 +21,8 @@ buildGoModule rec { meta = with lib; { description = "A terminal based graphical activity monitor inspired by gtop and vtop"; homepage = "https://github.com/xxxserxxx/gotop"; - license = licenses.agpl3; + changelog = "https://github.com/xxxserxxx/gotop/blob/v${version}/CHANGELOG.md"; + license = licenses.mit; maintainers = [ maintainers.magnetophon ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix index 5e2f047674e..b3b084fbe71 100644 --- a/pkgs/tools/system/gptfdisk/default.nix +++ b/pkgs/tools/system/gptfdisk/default.nix @@ -2,18 +2,18 @@ stdenv.mkDerivation rec { pname = "gptfdisk"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { # https://www.rodsbooks.com/gdisk/${name}.tar.gz also works, but the home # page clearly implies a preference for using SourceForge's bandwidth: url = "mirror://sourceforge/gptfdisk/${pname}-${version}.tar.gz"; - sha256 = "0bybgp30pqxb6x5krxazkq4drca0gz4inxj89fpyr204rn3kjz8f"; + sha256 = "sha256-3cVR1kOlPwvURANF064yxJsEp5fpwBA26kYLa7QWjKg="; }; postPatch = '' patchShebangs gdisk_test.sh - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' substituteInPlace Makefile.mac --replace \ "-mmacosx-version-min=10.4" "-mmacosx-version-min=10.6" substituteInPlace Makefile.mac --replace \ @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { "/opt/local/lib/libncurses.a" "${ncurses.out}/lib/libncurses.dylib" ''; - buildPhase = stdenv.lib.optionalString stdenv.isDarwin "make -f Makefile.mac"; + buildPhase = lib.optionalString stdenv.isDarwin "make -f Makefile.mac"; buildInputs = [ libuuid popt icu ncurses ]; installPhase = '' diff --git a/pkgs/tools/system/gt5/default.nix b/pkgs/tools/system/gt5/default.nix index 61d25f414bb..3e904e6c0ad 100644 --- a/pkgs/tools/system/gt5/default.nix +++ b/pkgs/tools/system/gt5/default.nix @@ -1,8 +1,8 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { name = "gt5-1.4.0"; - + src = fetchurl { url = "mirror://sourceforge/gt5/${name}.tar.gz"; sha256 = "0gm0gzyp4d9rxqddbaskbz5zvmlhyr4nyb5x9g7x4abyyxqjlnkq"; @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { meta = { description = "A diff-capable 'du' browser"; homepage = "http://gt5.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/tools/system/hardinfo/default.nix b/pkgs/tools/system/hardinfo/default.nix index 2dd1d96ee64..15c8cbd12f0 100644 --- a/pkgs/tools/system/hardinfo/default.nix +++ b/pkgs/tools/system/hardinfo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, which, pkgconfig, gtk2, pcre, glib, libxml2 +{ lib, stdenv, fetchurl, which, pkg-config, gtk2, pcre, glib, libxml2 , libsoup ? null }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { # Not adding 'hostname' command, the build shouldn't depend on what the build # host is called. - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ which gtk2 pcre glib libxml2 libsoup ]; # Fixes '#error You must compile this program without "-O"' diff --git a/pkgs/tools/system/hiera-eyaml/gemset.nix b/pkgs/tools/system/hiera-eyaml/gemset.nix index d5aa722e5fc..cf7d8d6905d 100644 --- a/pkgs/tools/system/hiera-eyaml/gemset.nix +++ b/pkgs/tools/system/hiera-eyaml/gemset.nix @@ -28,4 +28,4 @@ }; version = "3.0.0"; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/system/honcho/default.nix b/pkgs/tools/system/honcho/default.nix index f39c7dd793c..b653f240724 100644 --- a/pkgs/tools/system/honcho/default.nix +++ b/pkgs/tools/system/honcho/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pythonPackages }: +{ lib, fetchFromGitHub, pythonPackages }: let inherit (pythonPackages) python; diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix index 02a3c7991d2..5f3cc2f6fcf 100644 --- a/pkgs/tools/system/htop/default.nix +++ b/pkgs/tools/system/htop/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "htop"; - version = "3.0.4"; + version = "3.0.5"; src = fetchFromGitHub { owner = "htop-dev"; repo = pname; rev = version; - sha256 = "1fckfv96vzqjs3lzy0cgwsqv5vh1sxca3fhvgskmnkvr5bq6cia9"; + sha256 = "sha256-9zecDd3oZ24RyOLnKdJmR29Chx6S24Kvuf/F7RYzl4I="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/system/idle3tools/default.nix b/pkgs/tools/system/idle3tools/default.nix index fa5234d8cbc..5e9796396a9 100644 --- a/pkgs/tools/system/idle3tools/default.nix +++ b/pkgs/tools/system/idle3tools/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation { name = "idle3-tools-0.9.1"; @@ -15,8 +15,8 @@ stdenv.mkDerivation { meta = { homepage = "http://idle3-tools.sourceforge.net/"; description = "Tool to get/set the infamous idle3 timer in WD HDDs"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/tools/system/illum/default.nix b/pkgs/tools/system/illum/default.nix index 41fce9b9b91..42aae9d81a2 100644 --- a/pkgs/tools/system/illum/default.nix +++ b/pkgs/tools/system/illum/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, pkgconfig, ninja, libevdev, libev }: +{ lib, stdenv, fetchgit, pkg-config, ninja, libevdev, libev }: stdenv.mkDerivation { version = "0.4"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "05v3hz7n6b1mlhc6zqijblh1vpl0ja1y8y0lafw7mjdz03wxhfdb"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ninja libevdev libev ]; configurePhase = '' @@ -26,8 +26,8 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/jmesmon/illum"; description = "Daemon that wires button presses to screen backlight level"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.dancek ]; - license = stdenv.lib.licenses.agpl3; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.dancek ]; + license = lib.licenses.agpl3; }; } diff --git a/pkgs/tools/system/inxi/default.nix b/pkgs/tools/system/inxi/default.nix index 9de9d0b7368..7f24be893bf 100644 --- a/pkgs/tools/system/inxi/default.nix +++ b/pkgs/tools/system/inxi/default.nix @@ -9,7 +9,7 @@ let prefixPath = programs: - "--prefix PATH ':' '${stdenv.lib.makeBinPath programs}'"; + "--prefix PATH ':' '${lib.makeBinPath programs}'"; recommendedSystemPrograms = lib.optionals withRecommendedSystemPrograms [ util-linuxMinimal dmidecode file hddtemp iproute ipmitool usbutils kmod lm_sensors smartmontools binutils tree upower pciutils @@ -22,13 +22,13 @@ let ++ recommendedDisplayInformationPrograms; in stdenv.mkDerivation rec { pname = "inxi"; - version = "3.2.02-1"; + version = "3.3.00-1"; src = fetchFromGitHub { owner = "smxi"; repo = "inxi"; rev = version; - hash = "sha256-+6EURaeN1kJ4X+xdhN8ojuCbcBtxqNksGFEqPhIwCc4="; + sha256 = "sha256-P1AYo4Ao9lDxJXyZd64wBxNgQIvEcT00ThjtcB2v52I="; }; buildInputs = [ perl makeWrapper ]; diff --git a/pkgs/tools/system/ior/default.nix b/pkgs/tools/system/ior/default.nix index 330bf35e553..c2616797da3 100644 --- a/pkgs/tools/system/ior/default.nix +++ b/pkgs/tools/system/ior/default.nix @@ -1,18 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, openmpi, perl, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, mpi, perl, autoreconfHook }: stdenv.mkDerivation rec { pname = "ior"; - version = "3.2.1"; + version = "3.3.0"; src = fetchFromGitHub { owner = "hpc"; repo = pname; rev = version; - sha256 = "036cg75c5vq6kijfv8f918vpm9sf1h7lyg6xr9fba7n0dwbbmycv"; + sha256 = "sha256-pSjptDfiPlaToXe1yHyk9MQMC9PqcVSjqAmWLD11iOM="; }; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ openmpi perl ]; + buildInputs = [ mpi perl ]; enableParallelBuilding = true; diff --git a/pkgs/tools/system/ipmitool/default.nix b/pkgs/tools/system/ipmitool/default.nix index 196e59953fe..2f0e2c600d0 100644 --- a/pkgs/tools/system/ipmitool/default.nix +++ b/pkgs/tools/system/ipmitool/default.nix @@ -29,19 +29,19 @@ stdenv.mkDerivation { configureFlags = [ "--infodir=${placeholder "out"}/share/info" "--mandir=${placeholder "out"}/share/man" - ] ++ stdenv.lib.optionals static [ + ] ++ lib.optionals static [ "LDFLAGS=-static" "--enable-static" "--disable-shared" - ] ++ stdenv.lib.optionals (!static) [ + ] ++ lib.optionals (!static) [ "--enable-shared" ]; - makeFlags = stdenv.lib.optional static "AM_LDFLAGS=-all-static"; + makeFlags = lib.optional static "AM_LDFLAGS=-all-static"; dontDisableStatic = static; meta = with lib; { - description = ''Command-line interface to IPMI-enabled devices''; + description = "Command-line interface to IPMI-enabled devices"; license = licenses.bsd3; homepage = "https://sourceforge.net/projects/ipmitool/"; platforms = platforms.unix; diff --git a/pkgs/tools/system/java-service-wrapper/default.nix b/pkgs/tools/system/java-service-wrapper/default.nix index 8c87f64d745..4d1417b4b83 100644 --- a/pkgs/tools/system/java-service-wrapper/default.nix +++ b/pkgs/tools/system/java-service-wrapper/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "java-service-wrapper"; - version = "3.5.43"; + version = "3.5.45"; src = fetchurl { url = "https://wrapper.tanukisoftware.com/download/${version}/wrapper_${version}_src.tar.gz"; - sha256 = "19cx3854rk7b2056z8pvxnf4simsg5js7czsy2bys7jl6vh2x02b"; + sha256 = "sha256-rnlloa0DicWT1RlP2szDvBINvT5/RZ17GOarUzvX1AI="; }; buildInputs = [ jdk ]; diff --git a/pkgs/tools/system/journalwatch/default.nix b/pkgs/tools/system/journalwatch/default.nix index 0ec7ef36623..3d85d13149c 100644 --- a/pkgs/tools/system/journalwatch/default.nix +++ b/pkgs/tools/system/journalwatch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, systemd, pytest }: +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, systemd, pytest }: buildPythonPackage rec { pname = "journalwatch"; diff --git a/pkgs/tools/system/jump/default.nix b/pkgs/tools/system/jump/default.nix index d91df3232c8..fa0c2f73922 100644 --- a/pkgs/tools/system/jump/default.nix +++ b/pkgs/tools/system/jump/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "jump"; - version = "0.30.1"; + version = "0.40.0"; src = fetchFromGitHub { owner = "gsamokovarov"; repo = pname; rev = "v${version}"; - sha256 = "0mph3bqfjnw3yf0a6ml3ccmkr1shviwvvq4d04ky4gppfy6z51jy"; + sha256 = "sha256-8Lfta4qDXYVSHG3UI8iUA6vIjBe5OIX7n0LC4OW1qMU="; }; - vendorSha256 = "1500vim2lmkkls758pwhlx3piqbw6ap0nnhdwz9pcxih4s4as2nk"; + vendorSha256 = null; doCheck = false; diff --git a/pkgs/tools/system/kmon/default.nix b/pkgs/tools/system/kmon/default.nix index 502579bb931..cb48a48ff49 100644 --- a/pkgs/tools/system/kmon/default.nix +++ b/pkgs/tools/system/kmon/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "kmon"; - version = "1.5.1"; + version = "1.5.3"; src = fetchFromGitHub { owner = "orhun"; repo = pname; rev = "v${version}"; - sha256 = "0j6w4rg2gybcy1cv812qixravy0z0xpp33snrng11q802zq3mkmq"; + sha256 = "sha256-2cP3kZnjlMmN3nWRPh1M+hk+dyssGNpJjlluDsm702g="; }; - cargoSha256 = "0x5s3yi5bv3h1k54lrgcvkpdkmfphvwhnrmk5lmk6xd9pxfh218p"; + cargoSha256 = "sha256-JFDtmi10iCK66/2ovg8tGAgGDW8Y4b5IYkSbDqu0PmQ="; nativeBuildInputs = [ python3 ]; diff --git a/pkgs/tools/system/ledmon/default.nix b/pkgs/tools/system/ledmon/default.nix index ee9ba6c7346..0ca1aa441db 100644 --- a/pkgs/tools/system/ledmon/default.nix +++ b/pkgs/tools/system/ledmon/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { description = "Enclosure LED Utilities"; platforms = platforms.linux; license = with licenses; [ gpl2 ]; - maintainers = with stdenv.lib.maintainers; [ sorki ]; + maintainers = with lib.maintainers; [ sorki ]; }; } diff --git a/pkgs/tools/system/localtime/default.nix b/pkgs/tools/system/localtime/default.nix index 99e0674016b..798e3b3e883 100644 --- a/pkgs/tools/system/localtime/default.nix +++ b/pkgs/tools/system/localtime/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoPackage, m4 }: +{ lib, fetchFromGitHub, buildGoPackage, m4 }: buildGoPackage rec { name = "localtime-2017-11-07"; diff --git a/pkgs/tools/system/logrotate/default.nix b/pkgs/tools/system/logrotate/default.nix index 4c891e3e5b3..513b48c6630 100644 --- a/pkgs/tools/system/logrotate/default.nix +++ b/pkgs/tools/system/logrotate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gzip, popt, autoreconfHook +{ lib, stdenv, fetchFromGitHub, gzip, popt, autoreconfHook , mailutils ? null }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sed -i -e 's,[a-z/]\+gzip,${gzip}/bin/gzip,' \ -e 's,[a-z/]\+gunzip,${gzip}/bin/gunzip,' configure.ac - ${stdenv.lib.optionalString (mailutils != null) '' + ${lib.optionalString (mailutils != null) '' sed -i -e 's,[a-z/]\+mail,${mailutils}/bin/mail,' configure.ac ''} ''; @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://fedorahosted.org/releases/l/o/logrotate/"; description = "Rotates and compresses system logs"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.viric ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.viric ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/system/lshw/default.nix b/pkgs/tools/system/lshw/default.nix index 18fe6ca43b1..040f065acd7 100644 --- a/pkgs/tools/system/lshw/default.nix +++ b/pkgs/tools/system/lshw/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, fetchpatch -, withGUI ? false, gtk2, pkgconfig, sqlite # compile GUI +, withGUI ? false, gtk2, pkg-config, sqlite # compile GUI }: let numVersion = "02.18"; # :( @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = lib.optionals withGUI [ gtk2 sqlite ]; diff --git a/pkgs/tools/system/mcron/default.nix b/pkgs/tools/system/mcron/default.nix index ca515cbdfd8..b8175b51483 100644 --- a/pkgs/tools/system/mcron/default.nix +++ b/pkgs/tools/system/mcron/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, guile, which, ed, libtool }: +{ fetchurl, lib, stdenv, guile, which, ed, libtool }: stdenv.mkDerivation rec { name = "mcron-1.0.6"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/mcron/"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/system/monit/default.nix b/pkgs/tools/system/monit/default.nix index 3349749d62e..3460020618f 100644 --- a/pkgs/tools/system/monit/default.nix +++ b/pkgs/tools/system/monit/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl, bison, flex , zlib , usePAM ? stdenv.hostPlatform.isLinux, pam @@ -6,26 +6,26 @@ }: stdenv.mkDerivation rec { - name = "monit-5.27.1"; + name = "monit-5.27.2"; src = fetchurl { url = "${meta.homepage}dist/${name}.tar.gz"; - sha256 = "0lgdhif6x11fcpli0qn138rpdvrfnwmkzsy4lc9pas45c78hhx7m"; + sha256 = "sha256-2ICceNXcHtenujKlpVxRFIVRMsxNpIBfjTqvjPRuqkw="; }; nativeBuildInputs = [ bison flex ]; buildInputs = [ zlib.dev ] ++ - stdenv.lib.optionals useSSL [ openssl ] ++ - stdenv.lib.optionals usePAM [ pam ]; + lib.optionals useSSL [ openssl ] ++ + lib.optionals usePAM [ pam ]; configureFlags = [ - (stdenv.lib.withFeature usePAM "pam") + (lib.withFeature usePAM "pam") ] ++ (if useSSL then [ "--with-ssl-incl-dir=${openssl.dev}/include" "--with-ssl-lib-dir=${openssl.out}/lib" ] else [ "--without-ssl" - ]) ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + ]) ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # will need to check both these are true for musl "libmonit_cv_setjmp_available=yes" "libmonit_cv_vsnprintf_c99_conformant=yes" @@ -34,8 +34,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://mmonit.com/monit/"; description = "Monitoring system"; - license = stdenv.lib.licenses.agpl3; - maintainers = with stdenv.lib.maintainers; [ raskin wmertens ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.agpl3; + maintainers = with lib.maintainers; [ raskin wmertens ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 3c1fe75b581..44c5e42a490 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, callPackage, fetchFromGitHub, autoreconfHook, pkg-config , CoreFoundation, IOKit, libossp_uuid , curl, libcap, libuuid, lm_sensors, zlib, fetchpatch , nixosTests @@ -10,7 +10,7 @@ , withDebug ? false }: -with stdenv.lib; +with lib; let go-d-plugin = callPackage ./go.d.plugin.nix {}; @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { sha256 = "1266jbfw55r1zh00xi6c90j2fs9hw8hmsb7686rh04l8mffny9f4"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ curl.dev zlib.dev ] ++ optionals stdenv.isDarwin [ CoreFoundation IOKit libossp_uuid ] ++ optionals (!stdenv.isDarwin) [ libcap.dev libuuid.dev ] diff --git a/pkgs/tools/system/nq/default.nix b/pkgs/tools/system/nq/default.nix index 9e6522b2028..551d18618a7 100644 --- a/pkgs/tools/system/nq/default.nix +++ b/pkgs/tools/system/nq/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { description = "Unix command line queue utility"; homepage = "https://github.com/chneukirchen/nq"; license = licenses.publicDomain; - platforms = platforms.linux; + platforms = platforms.all; maintainers = with maintainers; [ cstrahan ]; }; } diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix index 226f55f00dc..a89de032abd 100644 --- a/pkgs/tools/system/pciutils/default.nix +++ b/pkgs/tools/system/pciutils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, zlib, kmod, which +{ lib, stdenv, fetchurl, pkg-config, zlib, kmod, which , static ? stdenv.hostPlatform.isStatic , darwin ? null }: @@ -11,9 +11,9 @@ stdenv.mkDerivation rec { sha256 = "1ss0rnfsx8gvqjxaji4mvbhf9xyih4cadmgadbwwv8mnx1xvjh4x"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib kmod which ] ++ - stdenv.lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.IOKit; + lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.IOKit; preConfigure = if stdenv.cc.isGNU then null else '' substituteInPlace Makefile --replace 'CC=$(CROSS_COMPILE)gcc' "" diff --git a/pkgs/tools/system/pcstat/default.nix b/pkgs/tools/system/pcstat/default.nix index 9e0f6fe147e..d01b08a1434 100644 --- a/pkgs/tools/system/pcstat/default.nix +++ b/pkgs/tools/system/pcstat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage { pname = "pcstat-unstable"; diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index c7c2ff60a7d..2b0df3c893e 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/pkgs/tools/system/plan9port/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { substituteInPlace bin/9c \ --replace 'which uniq' '${which}/bin/which uniq' - '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.isDarwin) '' #add missing ctrl+c\z\x\v keybind for non-Darwin substituteInPlace src/cmd/acme/text.c \ --replace "case Kcmd+'c':" "case 0x03: case Kcmd+'c':" \ @@ -48,10 +48,10 @@ stdenv.mkDerivation { buildInputs = [ perl - ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.isDarwin) [ xorgproto libX11 libXext libXt fontconfig freetype # fontsrv wants ft2build.h provides system fonts for acme and sam. - ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Carbon Cocoa IOKit Metal QuartzCore ]); diff --git a/pkgs/tools/system/procodile/gemset.nix b/pkgs/tools/system/procodile/gemset.nix index 36ec2a9cf18..f5b73b617bb 100644 --- a/pkgs/tools/system/procodile/gemset.nix +++ b/pkgs/tools/system/procodile/gemset.nix @@ -20,4 +20,4 @@ }; version = "1.0.23"; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/tools/system/proot/default.nix index e1871eeb733..daf543d7f75 100644 --- a/pkgs/tools/system/proot/default.nix +++ b/pkgs/tools/system/proot/default.nix @@ -19,8 +19,8 @@ stdenv.mkDerivation { sed -i /CROSS_COMPILE/d src/GNUmakefile ''; - buildInputs = [ talloc ] ++ stdenv.lib.optional enablePython python; - nativeBuildInputs = [ docutils ] ++ stdenv.lib.optional enablePython swig; + buildInputs = [ talloc ] ++ lib.optional enablePython python; + nativeBuildInputs = [ docutils ] ++ lib.optional enablePython swig; enableParallelBuilding = true; diff --git a/pkgs/tools/system/ps_mem/default.nix b/pkgs/tools/system/ps_mem/default.nix index dcca1a86da7..152bb1150e5 100644 --- a/pkgs/tools/system/ps_mem/default.nix +++ b/pkgs/tools/system/ps_mem/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pythonPackages, fetchFromGitHub }: +{ lib, pythonPackages, fetchFromGitHub }: let version = "3.13"; diff --git a/pkgs/tools/system/psensor/default.nix b/pkgs/tools/system/psensor/default.nix index afbab363443..079055bd3ba 100644 --- a/pkgs/tools/system/psensor/default.nix +++ b/pkgs/tools/system/psensor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, lm_sensors, libgtop, libatasmart, gtk3 +{ stdenv, lib, fetchurl, pkg-config, lm_sensors, libgtop, libatasmart, gtk3 , libnotify, udisks2, libXNVCtrl, wrapGAppsHook }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1ark901va79gfq5p8h8dqypjgm3f8crmj37520q3slwz2rfphkq8"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; buildInputs = [ lm_sensors libgtop libatasmart gtk3 libnotify udisks2 diff --git a/pkgs/tools/system/psstop/default.nix b/pkgs/tools/system/psstop/default.nix index dd2b30ada12..1d4fff918ec 100644 --- a/pkgs/tools/system/psstop/default.nix +++ b/pkgs/tools/system/psstop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib }: stdenv.mkDerivation rec { pname = "psstop"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "03ir3jjpzm7q8n1qc5jr99hqarr9r529w1zb6f7q4wak2vfj7w9h"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ glib ]; diff --git a/pkgs/tools/system/r10k/gemset.nix b/pkgs/tools/system/r10k/gemset.nix index d0e955d4cea..9b46cce00da 100644 --- a/pkgs/tools/system/r10k/gemset.nix +++ b/pkgs/tools/system/r10k/gemset.nix @@ -165,4 +165,4 @@ }; version = "1.3.1"; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/system/rofi-systemd/default.nix b/pkgs/tools/system/rofi-systemd/default.nix index 5078adbf3b7..4a2e14edc91 100644 --- a/pkgs/tools/system/rofi-systemd/default.nix +++ b/pkgs/tools/system/rofi-systemd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rofi, systemd, coreutils, util-linux, gawk, makeWrapper, jq +{ lib, stdenv, fetchFromGitHub, rofi, systemd, coreutils, util-linux, gawk, makeWrapper, jq }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { cp -a rofi-systemd $out/bin/rofi-systemd ''; - wrapperPath = with stdenv.lib; makeBinPath [ + wrapperPath = with lib; makeBinPath [ coreutils gawk jq @@ -39,8 +39,8 @@ stdenv.mkDerivation rec { meta = { description = "Control your systemd units using rofi"; homepage = "https://github.com/IvanMalison/rofi-systemd"; - maintainers = with stdenv.lib.maintainers; [ imalison ]; - license = stdenv.lib.licenses.gpl3; - platforms = with stdenv.lib.platforms; linux; + maintainers = with lib.maintainers; [ imalison ]; + license = lib.licenses.gpl3; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/tools/system/rowhammer-test/default.nix b/pkgs/tools/system/rowhammer-test/default.nix index e2d736477ee..9afb1933e17 100644 --- a/pkgs/tools/system/rowhammer-test/default.nix +++ b/pkgs/tools/system/rowhammer-test/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "1fbfcnm5gjish47wdvikcsgzlb5vnlfqlzzm6mwiw2j5qkq0914i"; }; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isi686 "-Wno-error=format"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isi686 "-Wno-error=format"; buildPhase = "sh -e make.sh"; diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index 7be7e5b3d37..7fc11d49d7c 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, autoreconfHook, libestr, json_c, zlib, pythonPackages, fastJson +{ lib, stdenv, fetchurl, pkg-config, autoreconfHook, libestr, json_c, zlib, pythonPackages, fastJson , libkrb5 ? null, systemd ? null, jemalloc ? null, libmysqlclient ? null, postgresql ? null , libdbi ? null, net-snmp ? null, libuuid ? null, curl ? null, gnutls ? null , libgcrypt ? null, liblognorm ? null, openssl ? null, librelp ? null, libksi ? null @@ -8,7 +8,7 @@ , nixosTests ? null }: -with stdenv.lib; +with lib; let mkFlag = cond: name: if cond then "--enable-${name}" else "--disable-${name}"; in @@ -23,14 +23,14 @@ stdenv.mkDerivation rec { #patches = [ ./fix-gnutls-detection.patch ]; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ fastJson libestr json_c zlib pythonPackages.docutils libkrb5 jemalloc postgresql libdbi net-snmp libuuid curl gnutls libgcrypt liblognorm openssl librelp libksi liblogging libnet hadoop rdkafka libmongo-client czmq rabbitmq-c hiredis mongoc libmaxminddb - ] ++ stdenv.lib.optional (libmysqlclient != null) libmysqlclient - ++ stdenv.lib.optional stdenv.isLinux systemd; + ] ++ lib.optional (libmysqlclient != null) libmysqlclient + ++ lib.optional stdenv.isLinux systemd; configureFlags = [ "--sysconfdir=/etc" diff --git a/pkgs/tools/system/runit/default.nix b/pkgs/tools/system/runit/default.nix index 977550837df..2553c07cd6b 100644 --- a/pkgs/tools/system/runit/default.nix +++ b/pkgs/tools/system/runit/default.nix @@ -23,15 +23,15 @@ stdenv.mkDerivation rec { doCheck = true; - buildInputs = stdenv.lib.optionals static [ stdenv.cc.libc stdenv.cc.libc.static ] ++ - stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.libs.utmp; + buildInputs = lib.optionals static [ stdenv.cc.libc stdenv.cc.libc.static ] ++ + lib.optional stdenv.isDarwin darwin.apple_sdk.libs.utmp; postPatch = '' sed -i "s,\(#define RUNIT\) .*,\1 \"$out/bin/runit\"," src/runit.h # usernamespace sandbox of nix seems to conflict with runit's assumptions # about unix users. Therefor skip the check sed -i '/.\/chkshsgr/d' src/Makefile - '' + stdenv.lib.optionalString (!static) '' + '' + lib.optionalString (!static) '' sed -i 's,-static,,g' src/Makefile ''; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { # Both of these are originally hard-coded to gcc echo ${stdenv.cc.targetPrefix}cc > conf-cc - echo ${stdenv.cc.targetPrefix}cc ${stdenv.lib.optionalString stdenv.isDarwin "-Xlinker -x "}> conf-ld + echo ${stdenv.cc.targetPrefix}cc ${lib.optionalString stdenv.isDarwin "-Xlinker -x "}> conf-ld ''; installPhase = '' diff --git a/pkgs/tools/system/s-tui/default.nix b/pkgs/tools/system/s-tui/default.nix index 51c47ab1050..3943a8f4eef 100644 --- a/pkgs/tools/system/s-tui/default.nix +++ b/pkgs/tools/system/s-tui/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages }: +{ lib, python3Packages }: python3Packages.buildPythonPackage rec { pname = "s-tui"; diff --git a/pkgs/tools/system/s6-rc/default.nix b/pkgs/tools/system/s6-rc/default.nix index 328dd3242d8..20c23e15051 100644 --- a/pkgs/tools/system/s6-rc/default.nix +++ b/pkgs/tools/system/s6-rc/default.nix @@ -1,14 +1,14 @@ -{ stdenv, skawarePackages }: +{ lib, skawarePackages }: with skawarePackages; buildPackage { pname = "s6-rc"; - version = "0.5.2.0"; - sha256 = "1qpygkajalaziszhwfv5rr6hc27q05z8dayyv7im06z6vndimchs"; + version = "0.5.2.1"; + sha256 = "02pszbi440wagx2qp8aqj9mv5wm2qisw9lkq7mbnbnxxw9azlhi8"; description = "A service manager for s6-based systems"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; outputs = [ "bin" "lib" "dev" "doc" "out" ]; diff --git a/pkgs/tools/system/s6/default.nix b/pkgs/tools/system/s6/default.nix index a0419c2d2ad..75aadbeda8d 100644 --- a/pkgs/tools/system/s6/default.nix +++ b/pkgs/tools/system/s6/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "s6"; - version = "2.9.2.0"; - sha256 = "1pfxx50shncg2s47ic4kp02jh1cxfjq75j3mnxjagyzzz0mbfg9n"; + version = "2.10.0.0"; + sha256 = "0xzqrd0m3wjklmw1w3gjw5dcdxnhgvxv2r5wd6m2ismw2jprr9k0"; description = "skarnet.org's small & secure supervision software suite"; diff --git a/pkgs/tools/system/safecopy/default.nix b/pkgs/tools/system/safecopy/default.nix index e8db6a2fd39..5533c9a57ff 100644 --- a/pkgs/tools/system/safecopy/default.nix +++ b/pkgs/tools/system/safecopy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "safecopy-1.7"; @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { homepage = "http://safecopy.sourceforge.net"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.bluescreen303 ]; }; } diff --git a/pkgs/tools/system/setserial/default.nix b/pkgs/tools/system/setserial/default.nix index 68ea32e1e8a..da5d3b2a0d1 100644 --- a/pkgs/tools/system/setserial/default.nix +++ b/pkgs/tools/system/setserial/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, groff }: +{ lib, stdenv, fetchurl, groff }: stdenv.mkDerivation rec { pname = "setserial"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "Serial port configuration utility"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/tools/system/sleuthkit/default.nix b/pkgs/tools/system/sleuthkit/default.nix index 8dbc28d3a31..ae4ee9efa6e 100644 --- a/pkgs/tools/system/sleuthkit/default.nix +++ b/pkgs/tools/system/sleuthkit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, libewf, afflib, openssl, zlib }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, libewf, afflib, openssl, zlib }: stdenv.mkDerivation rec { version = "4.6.5"; @@ -26,9 +26,9 @@ stdenv.mkDerivation rec { meta = { description = "A forensic/data recovery tool"; homepage = "https://www.sleuthkit.org/"; - maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.ipl10; + maintainers = [ lib.maintainers.raskin ]; + platforms = lib.platforms.linux; + license = lib.licenses.ipl10; inherit version; }; } diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix index 093fd7b5bd5..9eaf00b537a 100644 --- a/pkgs/tools/system/smartmontools/default.nix +++ b/pkgs/tools/system/smartmontools/default.nix @@ -1,15 +1,15 @@ { lib, stdenv, fetchurl, autoreconfHook , mailutils, inetutils -, IOKit ? null , ApplicationServices ? null }: +, IOKit, ApplicationServices }: let - version = "7.1"; + version = "7.2"; - dbrev = "5062"; - drivedbBranch = "RELEASE_7_0_DRIVEDB"; + dbrev = "5164"; + drivedbBranch = "RELEASE_7_2_DRIVEDB"; driverdb = fetchurl { url = "https://sourceforge.net/p/smartmontools/code/${dbrev}/tree/branches/${drivedbBranch}/smartmontools/drivedb.h?format=raw"; - sha256 = "0gggl55h9gq0z846ndhyd7xrpxh8lqfbidblx0598q2wlh9rvlww"; + sha256 = "1vj0sv3bgcd0lwk5x450brfyxksa5fn1mjgvmj994ab8spmicc43"; name = "smartmontools-drivedb.h"; }; @@ -19,18 +19,18 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/smartmontools/${pname}-${version}.tar.gz"; - sha256 = "0imqb7ka4ia5573w8rnpck571pjjc9698pdjcapy9cfyk4n4swrz"; + sha256 = "1mlc25sd5rgj5xmzcllci47inmfdw7cp185fday6hc9rwqkqmnaw"; }; patches = [ ./smartmontools.patch ]; postPatch = "cp -v ${driverdb} drivedb.h"; configureFlags = [ - "--with-scriptpath=${stdenv.lib.makeBinPath [ mailutils inetutils ]}" + "--with-scriptpath=${lib.makeBinPath [ mailutils inetutils ]}" ]; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [] ++ stdenv.lib.optionals stdenv.isDarwin [IOKit ApplicationServices]; + buildInputs = [] ++ lib.optionals stdenv.isDarwin [IOKit ApplicationServices]; enableParallelBuilding = true; meta = with lib; { diff --git a/pkgs/tools/system/socklog/default.nix b/pkgs/tools/system/socklog/default.nix index cf7fbe5e9a1..a87beb14a84 100644 --- a/pkgs/tools/system/socklog/default.nix +++ b/pkgs/tools/system/socklog/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "socklog"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { echo "$NIX_CC/bin/cc -s" >src/conf-ld ''; - buildPhase = ''package/compile''; + buildPhase = "package/compile"; installPhase = '' mkdir -p $out/bin @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { mv doc/*.html $doc/share/doc/socklog/html/ ''; - checkPhase = ''package/check''; + checkPhase = "package/check"; doCheck = true; diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index f033b038267..6eae792fa4d 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # All platforms inputs then Linux-only ones buildInputs = [ judy libbsd libgcrypt zlib ] - ++ stdenv.lib.optionals stdenv.hostPlatform.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ attr keyutils libaio libapparmor libcap lksctp-tools ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { "BASHDIR=${placeholder "out"}/share/bash-completion/completions" ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.hostPlatform.isMusl "-D_LINUX_SYSINFO_H=1"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isMusl "-D_LINUX_SYSINFO_H=1"; # Won't build on i686 because the binary will be linked again in the # install phase without checking the dependencies. This will prevent diff --git a/pkgs/tools/system/stress/default.nix b/pkgs/tools/system/stress/default.nix index 2b9923eb571..33fbd15c5e6 100644 --- a/pkgs/tools/system/stress/default.nix +++ b/pkgs/tools/system/stress/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "stress-1.0.4"; - + src = fetchurl { url = "https://people.seas.harvard.edu/~apw/stress/${name}.tar.gz"; sha256 = "0nw210jajk38m3y7h8s130ps2qsbz7j75wab07hi2r3hlz14yzh5"; diff --git a/pkgs/tools/system/supervise/default.nix b/pkgs/tools/system/supervise/default.nix index 2776d28fa38..3d69faf7bd4 100644 --- a/pkgs/tools/system/supervise/default.nix +++ b/pkgs/tools/system/supervise/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { description = "A minimal unprivileged process supervisor making use of modern Linux features"; platforms = platforms.linux; license = licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ catern ]; + maintainers = with lib.maintainers; [ catern ]; }; } diff --git a/pkgs/tools/system/syslog-ng-incubator/default.nix b/pkgs/tools/system/syslog-ng-incubator/default.nix index 51d79d267dd..892920657d2 100644 --- a/pkgs/tools/system/syslog-ng-incubator/default.nix +++ b/pkgs/tools/system/syslog-ng-incubator/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, syslogng +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib, syslogng , eventlog, perl, python, yacc, protobufc, libivykis, libcap, czmq }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "17y85cqcyfbp882gaii731cvz5bg1s8rgda271jh6kgnrz5rbd4s"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook yacc ]; + nativeBuildInputs = [ pkg-config autoreconfHook yacc ]; buildInputs = [ glib syslogng eventlog perl python protobufc libivykis libcap czmq diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index 527e82e8cf1..41da0b99fd9 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, openssl, libcap, curl, which -, eventlog, pkgconfig, glib, python, systemd, perl +, eventlog, pkg-config, glib, python, systemd, perl , riemann_c_client, protobufc, pcre, libnet , json_c, libuuid, libivykis, mongoc, rabbitmq-c , libesmtp @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1s56q8k69sdrqsh3y9lr4di01fqw7xb49wr0dz75jmz084yg8kmg"; }; - nativeBuildInputs = [ pkgconfig which ]; + nativeBuildInputs = [ pkg-config which ]; buildInputs = [ libcap diff --git a/pkgs/tools/system/systemd-journal2gelf/default.nix b/pkgs/tools/system/systemd-journal2gelf/default.nix index 7ac5d7cf210..62a7c9d8aea 100644 --- a/pkgs/tools/system/systemd-journal2gelf/default.nix +++ b/pkgs/tools/system/systemd-journal2gelf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "SystemdJournal2Gelf-unstable"; diff --git a/pkgs/tools/system/testdisk/default.nix b/pkgs/tools/system/testdisk/default.nix index 032b2061744..10cbed47068 100644 --- a/pkgs/tools/system/testdisk/default.nix +++ b/pkgs/tools/system/testdisk/default.nix @@ -3,7 +3,7 @@ , fetchurl , ncurses , libuuid -, pkgconfig +, pkg-config , libjpeg , zlib , libewf @@ -35,11 +35,11 @@ assert enableQt -> qwt != null; zlib libewf ] - ++ stdenv.lib.optional enableNtfs ntfs3g - ++ stdenv.lib.optional enableExtFs e2fsprogs - ++ stdenv.lib.optionals enableQt [ qtbase qttools qwt ]; + ++ lib.optional enableNtfs ntfs3g + ++ lib.optional enableExtFs e2fsprogs + ++ lib.optionals enableQt [ qtbase qttools qwt ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; NIX_CFLAGS_COMPILE="-Wno-unused"; @@ -61,8 +61,8 @@ assert enableQt -> qwt != null; it will still work even if your media's file system has been severely damaged or reformatted. ''; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.all; maintainers = with maintainers; [ fgaz eelco ]; }; } diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix index 16259f3b9ff..fb622d7ff4e 100644 --- a/pkgs/tools/system/thermald/default.nix +++ b/pkgs/tools/system/thermald/default.nix @@ -11,7 +11,7 @@ , libtool , libxml2 , lzma -, pkgconfig +, pkg-config , lib, stdenv , upower }: @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { docbook_xml_dtd_412 gtk-doc libtool - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/tools/system/thinkfan/default.nix b/pkgs/tools/system/thinkfan/default.nix index 48d5d5fc08b..c9af119fb73 100644 --- a/pkgs/tools/system/thinkfan/default.nix +++ b/pkgs/tools/system/thinkfan/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libyamlcpp, pkgconfig +{ lib, stdenv, fetchFromGitHub, cmake, libyamlcpp, pkg-config , smartSupport ? false, libatasmart }: stdenv.mkDerivation rec { @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_INSTALL_DOCDIR=share/doc/${pname}" "-DUSE_NVML=OFF" - ] ++ stdenv.lib.optional smartSupport "-DUSE_ATASMART=ON"; + ] ++ lib.optional smartSupport "-DUSE_ATASMART=ON"; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ libyamlcpp ] ++ stdenv.lib.optional smartSupport libatasmart; + buildInputs = [ libyamlcpp ] ++ lib.optional smartSupport libatasmart; installPhase = '' runHook preInstall diff --git a/pkgs/tools/system/throttled/default.nix b/pkgs/tools/system/throttled/default.nix index d0458660c20..9b92635d1d7 100644 --- a/pkgs/tools/system/throttled/default.nix +++ b/pkgs/tools/system/throttled/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - postFixup = ''wrapPythonPrograms''; + postFixup = "wrapPythonPrograms"; meta = with lib; { description = "Fix for Intel CPU throttling issues"; diff --git a/pkgs/tools/system/tre-command/default.nix b/pkgs/tools/system/tre-command/default.nix index 5a2ad41c744..638caa3c62b 100644 --- a/pkgs/tools/system/tre-command/default.nix +++ b/pkgs/tools/system/tre-command/default.nix @@ -1,4 +1,4 @@ -{ rustPlatform, fetchFromGitHub, lib, stdenv, installShellFiles }: +{ rustPlatform, fetchFromGitHub, lib, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "tre-command"; diff --git a/pkgs/tools/system/tree/default.nix b/pkgs/tools/system/tree/default.nix index 24d11a9c0ee..dea7fd2e2b6 100644 --- a/pkgs/tools/system/tree/default.nix +++ b/pkgs/tools/system/tree/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: let version = "1.8.0"; @@ -45,7 +45,7 @@ stdenv.mkDerivation { meta = { homepage = "http://mama.indstate.edu/users/ice/tree/"; description = "Command to produce a depth indented directory listing"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; longDescription = '' Tree is a recursive directory listing command that produces a @@ -53,7 +53,7 @@ stdenv.mkDerivation { the LS_COLORS environment variable is set and output is to tty. ''; - platforms = stdenv.lib.platforms.all; - maintainers = [stdenv.lib.maintainers.peti]; + platforms = lib.platforms.all; + maintainers = [lib.maintainers.peti]; }; } diff --git a/pkgs/tools/system/tuptime/default.nix b/pkgs/tools/system/tuptime/default.nix index c0c0ef1b213..92878c5386b 100644 --- a/pkgs/tools/system/tuptime/default.nix +++ b/pkgs/tools/system/tuptime/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram $out/share/tuptime/db-tuptime-migrate-4.0-to-5.0.sh \ - --prefix PATH : "${stdenv.lib.makeBinPath [ sqlite ]}" + --prefix PATH : "${lib.makeBinPath [ sqlite ]}" ''; meta = with lib; { diff --git a/pkgs/tools/system/undaemonize/default.nix b/pkgs/tools/system/undaemonize/default.nix index e82ee18b831..45e7a8d6d62 100644 --- a/pkgs/tools/system/undaemonize/default.nix +++ b/pkgs/tools/system/undaemonize/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { name = "undaemonize-2017-07-11"; @@ -14,9 +14,9 @@ stdenv.mkDerivation { meta = { description = "Tiny helper utility to force programs which insist on daemonizing themselves to run in the foreground"; homepage = "https://github.com/nickstenning/undaemonize"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.canndrew ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.canndrew ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/system/vbetool/default.nix b/pkgs/tools/system/vbetool/default.nix index ed0cf5f13c6..ebdeae60c38 100644 --- a/pkgs/tools/system/vbetool/default.nix +++ b/pkgs/tools/system/vbetool/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Video BIOS execution tool"; - homepage = "http://www.codon.org.uk/~mjg59/vbetool/"; + homepage = "https://www.codon.org.uk/~mjg59/vbetool/"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/tools/system/vboot_reference/default.nix b/pkgs/tools/system/vboot_reference/default.nix index 13a1fd37d9c..6f8ba2b07eb 100644 --- a/pkgs/tools/system/vboot_reference/default.nix +++ b/pkgs/tools/system/vboot_reference/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitiles, pkgconfig, libuuid, openssl, libyaml, lzma }: +{ lib, stdenv, fetchFromGitiles, pkg-config, libuuid, openssl, libyaml, lzma }: stdenv.mkDerivation rec { version = "20180311"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1zja4ma6flch08h5j2l1hqnxmw2xwylidnddxxd5y2x05dai9ddj"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl libuuid libyaml lzma ]; enableParallelBuilding = true; diff --git a/pkgs/tools/system/wsmancli/default.nix b/pkgs/tools/system/wsmancli/default.nix index a0b7fae4d2a..bb7a206ced8 100644 --- a/pkgs/tools/system/wsmancli/default.nix +++ b/pkgs/tools/system/wsmancli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config , openssl, openwsman }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0a67fz9lj7xkyfqim6ai9kj7v6hzx94r1bg0g0l5dymgng648b9j"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ openwsman openssl ]; diff --git a/pkgs/tools/system/zenith/default.nix b/pkgs/tools/system/zenith/default.nix index 430b4db2577..3a7f8a55a12 100644 --- a/pkgs/tools/system/zenith/default.nix +++ b/pkgs/tools/system/zenith/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "zenith"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "bvaisvil"; repo = pname; rev = version; - sha256 = "1cxmgpq07q6vfasnkx3grpx1y0f0dg6irb9kdn17nwrypy44l92d"; + sha256 = "1bn364rmp0q86rd7vgv4n7x09cdf9m4njcaq92jnk85ni6h147ax"; }; - cargoSha256 = "1kgjj11fwvlk700yp9046b3kiq9ay47fiwqpqfhmlbxw3lsh8qvq"; + cargoSha256 = "16s7swv2sp15gry1j1pcyz29cspvafczaf4v02x4fd2jbn2y3f6r"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ IOKit ]; + buildInputs = lib.optionals stdenv.isDarwin [ IOKit ]; meta = with lib; { description = "Sort of like top or htop but with zoom-able charts, network, and disk usage"; diff --git a/pkgs/tools/text/agrep/default.nix b/pkgs/tools/text/agrep/default.nix index c5028b28128..9fe158b426a 100644 --- a/pkgs/tools/text/agrep/default.nix +++ b/pkgs/tools/text/agrep/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; # Related: https://github.com/Wikinaut/agrep/pull/11 - prePatch = stdenv.lib.optionalString (stdenv.hostPlatform.isMusl || stdenv.isDarwin) '' + prePatch = lib.optionalString (stdenv.hostPlatform.isMusl || stdenv.isDarwin) '' sed -i '1i#include <sys/stat.h>' checkfil.c newmgrep.c recursiv.c ''; installPhase = '' diff --git a/pkgs/tools/text/amber/default.nix b/pkgs/tools/text/amber/default.nix index 0f7a0eb5f84..e9ceaffa734 100644 --- a/pkgs/tools/text/amber/default.nix +++ b/pkgs/tools/text/amber/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0h47xqqq8f8m28rl1s6r305cf3dvk94aa86j6m0rk535i2jqfvhp"; - buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.isDarwin Security; meta = with lib; { description = "A code search-and-replace tool"; diff --git a/pkgs/tools/text/angle-grinder/default.nix b/pkgs/tools/text/angle-grinder/default.nix index e04530b8110..66441d73713 100644 --- a/pkgs/tools/text/angle-grinder/default.nix +++ b/pkgs/tools/text/angle-grinder/default.nix @@ -1,20 +1,20 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , rustPlatform }: rustPlatform.buildRustPackage rec { pname = "angle-grinder"; - version = "0.15.0"; + version = "0.16"; src = fetchFromGitHub { owner = "rcoh"; repo = pname; rev = "v${version}"; - sha256 = "1m5yj9412kjlnqi1nwh44i627ip0kqcbhvwgh87gl5vgd2a0m091"; + sha256 = "sha256-cGYhGcNalmc/Gr7mY1Fycs8cZYaIy622DFIL64LT+gE="; }; - cargoSha256 = "0y4c1gja0i3h2whjpm74yf3z1y85pkwmpmrl2fjsyy0mn493hzv8"; + cargoSha256 = "sha256-NkghuZHNT3Rq2wqiyKzjP+u9ZpeHU5H6oBLS0oQ7LcU="; meta = with lib; { description = "Slice and dice logs on the command line"; diff --git a/pkgs/tools/text/ansifilter/default.nix b/pkgs/tools/text/ansifilter/default.nix index 6928c959dfd..5b03f6e89a6 100644 --- a/pkgs/tools/text/ansifilter/default.nix +++ b/pkgs/tools/text/ansifilter/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, pkgconfig, boost, lua }: +{ fetchurl, lib, stdenv, pkg-config, boost, lua }: stdenv.mkDerivation rec { pname = "ansifilter"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0by4rhy30l7jgxvq6mwf8p43s1472q96l3g7n2skq2lnkjrvx1ar"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ boost lua ]; postPatch = '' diff --git a/pkgs/tools/text/bcat/gemset.nix b/pkgs/tools/text/bcat/gemset.nix index 75de0e5cf38..9471ffae8dd 100644 --- a/pkgs/tools/text/bcat/gemset.nix +++ b/pkgs/tools/text/bcat/gemset.nix @@ -20,4 +20,4 @@ }; version = "1.6.11"; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/text/boxes/default.nix b/pkgs/tools/text/boxes/default.nix index 407b2c67a8f..3c58eda6501 100644 --- a/pkgs/tools/text/boxes/default.nix +++ b/pkgs/tools/text/boxes/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { "GLOBALCONF=${placeholder "out"}/share/boxes/boxes-config" ''; - makeFlags = stdenv.lib.optionals stdenv.isDarwin [ "CC=cc" ]; + makeFlags = lib.optionals stdenv.isDarwin [ "CC=cc" ]; installPhase = '' install -Dm755 -t $out/bin src/boxes diff --git a/pkgs/tools/text/cconv/default.nix b/pkgs/tools/text/cconv/default.nix index de16854927b..9c5796c0b1d 100644 --- a/pkgs/tools/text/cconv/default.nix +++ b/pkgs/tools/text/cconv/default.nix @@ -3,14 +3,14 @@ let version = "0.6.3"; in stdenv.mkDerivation { pname = "cconv"; inherit version; - + src = fetchurl { url = "https://github.com/xiaoyjy/cconv/archive/v${version}.tar.gz"; sha256 = "82f46a94829f5a8157d6f686e302ff5710108931973e133d6e19593061b81d84"; }; nativeBuildInputs = [ autoreconfHook ]; - + meta = with lib; { description = "A iconv based simplified-traditional chinese conversion tool"; homepage = "https://github.com/xiaoyjy/cconv"; diff --git a/pkgs/tools/text/chars/default.nix b/pkgs/tools/text/chars/default.nix index a6550615477..e5a1bc9c2a0 100644 --- a/pkgs/tools/text/chars/default.nix +++ b/pkgs/tools/text/chars/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1ampmw0l2wk2xp4q13aj5shxncqfh4dc3rsmpk2scaivanrsikn5"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; meta = with lib; { description = "Commandline tool to display information about unicode characters"; diff --git a/pkgs/tools/text/choose/default.nix b/pkgs/tools/text/choose/default.nix index 20d651df008..7816f79649c 100644 --- a/pkgs/tools/text/choose/default.nix +++ b/pkgs/tools/text/choose/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , rustPlatform }: diff --git a/pkgs/tools/text/codesearch/default.nix b/pkgs/tools/text/codesearch/default.nix index 37336e63efe..9c3e9fbd840 100644 --- a/pkgs/tools/text/codesearch/default.nix +++ b/pkgs/tools/text/codesearch/default.nix @@ -1,9 +1,9 @@ # This file was generated by go2nix. -{ stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "codesearch"; - version = "20150717-${stdenv.lib.strings.substring 0 7 rev}"; + version = "20150717-${lib.strings.substring 0 7 rev}"; rev = "a45d81b686e85d01f2838439deaf72126ccd5a96"; goPackagePath = "github.com/google/codesearch"; @@ -17,8 +17,8 @@ buildGoPackage rec { meta = { description = "Fast, indexed regexp search over large file trees"; homepage = "https://github.com/google/codesearch"; - license = [ stdenv.lib.licenses.bsd3 ]; - maintainers = [ stdenv.lib.maintainers.bennofs ]; - platforms = stdenv.lib.platforms.unix; + license = [ lib.licenses.bsd3 ]; + maintainers = [ lib.maintainers.bennofs ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/text/coloursum/default.nix b/pkgs/tools/text/coloursum/default.nix index 0a87e9b3905..5dcf6f3da47 100644 --- a/pkgs/tools/text/coloursum/default.nix +++ b/pkgs/tools/text/coloursum/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1w0q5w0bf1682jvzcml8cgmr9mrgi4if0p63wzchyjav330dp6pk"; - buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.isDarwin Security; meta = with lib; { description = "Colourise your checksum output"; diff --git a/pkgs/tools/text/convertlit/default.nix b/pkgs/tools/text/convertlit/default.nix index a947ef98a68..18dc01c01d0 100644 --- a/pkgs/tools/text/convertlit/default.nix +++ b/pkgs/tools/text/convertlit/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchzip, libtommath}: +{lib, stdenv, fetchzip, libtommath}: stdenv.mkDerivation { name = "convertlit-1.8"; @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.convertlit.com/"; description = "A tool for converting Microsoft Reader ebooks to more open formats"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/text/diction/default.nix b/pkgs/tools/text/diction/default.nix index f43cd94a83e..be486cccf54 100644 --- a/pkgs/tools/text/diction/default.nix +++ b/pkgs/tools/text/diction/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "diction"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { characteristics of a document, including sentence length and other readability measures. ''; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/text/diffr/default.nix b/pkgs/tools/text/diffr/default.nix index e2dcf4122b1..78baa32630b 100644 --- a/pkgs/tools/text/diffr/default.nix +++ b/pkgs/tools/text/diffr/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "09yn02985yv40n9y0ipz0jmj7iqhz7l8hd3ry9ib3fyw9pyklnfa"; - buildInputs = (stdenv.lib.optional stdenv.isDarwin Security); + buildInputs = (lib.optional stdenv.isDarwin Security); preCheck = '' export DIFFR_TESTS_BINARY_PATH=$releaseDir/diffr diff --git a/pkgs/tools/text/diffstat/default.nix b/pkgs/tools/text/diffstat/default.nix index b558386536e..c8ff1e973a5 100644 --- a/pkgs/tools/text/diffstat/default.nix +++ b/pkgs/tools/text/diffstat/default.nix @@ -1,14 +1,14 @@ { fetchurl, lib, stdenv }: stdenv.mkDerivation rec { - name = "diffstat-1.63"; + name = "diffstat-1.64"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/diffstat/${name}.tgz" "https://invisible-mirror.net/archives/diffstat/${name}.tgz" ]; - sha256 = "0vyw200s5dv1257pmrh6c6fdkmw3slyz5szpqfx916xr04sdbpby"; + sha256 = "sha256-uK7jjZ0uHQWSbmtVgQqdLC3UB/JNaiZzh1Y6RDbj9/w="; }; meta = with lib; { diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix index 8fd36211e2e..bcb7fad58da 100644 --- a/pkgs/tools/text/diffutils/default.nix +++ b/pkgs/tools/text/diffutils/default.nix @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { configureFlags = # "pr" need not be on the PATH as a run-time dep, so we need to tell # configure where it is. Covers the cross and native case alike. - stdenv.lib.optional (coreutils != null) "PR_PROGRAM=${coreutils}/bin/pr" - ++ stdenv.lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "gl_cv_func_getopt_gnu=yes"; + lib.optional (coreutils != null) "PR_PROGRAM=${coreutils}/bin/pr" + ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "gl_cv_func_getopt_gnu=yes"; meta = with lib; { homepage = "https://www.gnu.org/software/diffutils/diffutils.html"; diff --git a/pkgs/tools/text/ebook-tools/default.nix b/pkgs/tools/text/ebook-tools/default.nix index b69ae66e1e2..bb93b217ea2 100644 --- a/pkgs/tools/text/ebook-tools/default.nix +++ b/pkgs/tools/text/ebook-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkg-config, libxml2, libzip }: +{ lib, stdenv, fetchurl, cmake, pkg-config, libxml2, libzip }: stdenv.mkDerivation rec { name = "ebook-tools-0.2.2"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags libzip)" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://ebook-tools.sourceforge.net"; description = "Tools and library for dealing with various ebook file formats"; maintainers = [ ]; diff --git a/pkgs/tools/text/enca/default.nix b/pkgs/tools/text/enca/default.nix index 6c23acb86b4..7015bd4453c 100644 --- a/pkgs/tools/text/enca/default.nix +++ b/pkgs/tools/text/enca/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2; - + }; } diff --git a/pkgs/tools/text/enscript/default.nix b/pkgs/tools/text/enscript/default.nix index 670e052772e..1918029317a 100644 --- a/pkgs/tools/text/enscript/default.nix +++ b/pkgs/tools/text/enscript/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gettext }: +{ lib, stdenv, fetchurl, gettext }: stdenv.mkDerivation rec { name = "enscript-1.6.6"; @@ -33,11 +33,11 @@ stdenv.mkDerivation rec { it has many options that can be used to customize printouts. ''; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; homepage = "https://www.gnu.org/software/enscript/"; maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix index ad92ffa9350..e1db7d3d39c 100644 --- a/pkgs/tools/text/fanficfare/default.nix +++ b/pkgs/tools/text/fanficfare/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages }: +{ lib, python3Packages }: python3Packages.buildPythonApplication rec { pname = "FanFicFare"; diff --git a/pkgs/tools/text/fastmod/default.nix b/pkgs/tools/text/fastmod/default.nix index d2a865335c1..ba2bedd5eac 100644 --- a/pkgs/tools/text/fastmod/default.nix +++ b/pkgs/tools/text/fastmod/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "18bspi59vfnqijxgipmv2h6h5iy7qynpk1ph46yhjsnndjlxxcba"; - buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.isDarwin Security; meta = with lib; { description = "A utility that makes sweeping changes to large, shared code bases"; diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index bcc66cf93da..b7eb00ee594 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -16,7 +16,7 @@ assert (doCheck && stdenv.isLinux) -> glibcLocales != null; let - inherit (stdenv.lib) optional; + inherit (lib) optional; in stdenv.mkDerivation rec { name = "gawk-5.1.0"; diff --git a/pkgs/tools/text/gawk/gawkextlib.nix b/pkgs/tools/text/gawk/gawkextlib.nix index 058712df409..1d3f14ea336 100644 --- a/pkgs/tools/text/gawk/gawkextlib.nix +++ b/pkgs/tools/text/gawk/gawkextlib.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, recurseIntoAttrs, fetchgit, writeText, pkgconfig, autoreconfHook +{ lib, stdenv, recurseIntoAttrs, fetchgit, writeText, pkg-config, autoreconfHook , autoconf, automake, libiconv, libtool, texinfo, gettext, gawk, rapidjson, gd , shapelib, libharu, lmdb, gmp, glibcLocales, mpfr, more, postgresql, hiredis , expat, tre, makeWrapper }: let - buildExtension = stdenv.lib.makeOverridable + buildExtension = lib.makeOverridable ({ name, gawkextlib, extraBuildInputs ? [ ], doCheck ? true }: let is_extension = !isNull gawkextlib; in stdenv.mkDerivation rec { @@ -26,13 +26,13 @@ let automake libtool autoreconfHook - pkgconfig + pkg-config texinfo gettext ]; buildInputs = [ gawk ] ++ extraBuildInputs; - propagatedBuildInputs = stdenv.lib.optional is_extension gawkextlib; + propagatedBuildInputs = lib.optional is_extension gawkextlib; setupHook = if is_extension then ./setup-hook.sh else null; inherit gawk; diff --git a/pkgs/tools/text/gjo/default.nix b/pkgs/tools/text/gjo/default.nix index 27dcf633fe7..0ab9a54c47b 100644 --- a/pkgs/tools/text/gjo/default.nix +++ b/pkgs/tools/text/gjo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildGoModule , fetchFromGitHub }: diff --git a/pkgs/tools/text/glogg/default.nix b/pkgs/tools/text/glogg/default.nix index ceddda11c09..6bdd6dea029 100644 --- a/pkgs/tools/text/glogg/default.nix +++ b/pkgs/tools/text/glogg/default.nix @@ -11,7 +11,7 @@ mkDerivation rec { sha256 = "0hf1c2m8n88frmxmyn0ndr8129p7iky49nq565sw1asaydm5z6pb"; }; - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace glogg.pro \ --replace "boost_program_options-mt" "boost_program_options" ''; @@ -22,7 +22,7 @@ mkDerivation rec { qmakeFlags = [ "VERSION=${version}" ]; enableParallelBuilding = true; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.isDarwin '' mkdir -p $out/Applications mv $out/bin/glogg.app $out/Applications/glogg.app rm -fr $out/{bin,share} diff --git a/pkgs/tools/text/gnupatch/default.nix b/pkgs/tools/text/gnupatch/default.nix index 8cca7f15962..97d3136e7e7 100644 --- a/pkgs/tools/text/gnupatch/default.nix +++ b/pkgs/tools/text/gnupatch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , ed, autoreconfHook }: @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + configureFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "ac_cv_func_strnlen_working=yes" ]; @@ -50,9 +50,9 @@ stdenv.mkDerivation rec { homepage = "https://savannah.gnu.org/projects/patch"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/text/gnused/422.nix b/pkgs/tools/text/gnused/422.nix index 7ea637dc8c9..80aa9f654a6 100644 --- a/pkgs/tools/text/gnused/422.nix +++ b/pkgs/tools/text/gnused/422.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "gnused-4.2.2"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "f048d1838da284c8bc9753e4506b85a1e0cc1ea8999d36f6995bcb9460cddbd7"; }; - configureFlags = stdenv.lib.optional stdenv.hostPlatform.isMinGW "ac_cv_func__set_invalid_parameter_handler=no"; + configureFlags = lib.optional stdenv.hostPlatform.isMinGW "ac_cv_func__set_invalid_parameter_handler=no"; outputs = [ "out" "info" ]; @@ -25,9 +25,9 @@ stdenv.mkDerivation { multiple occurrences of a string within a file. ''; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; maintainers = [ ]; }; } diff --git a/pkgs/tools/text/gnused/default.nix b/pkgs/tools/text/gnused/default.nix index d4da6f2c8ce..23b2794bf13 100644 --- a/pkgs/tools/text/gnused/default.nix +++ b/pkgs/tools/text/gnused/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl }: +{ lib, stdenv, fetchurl, perl }: stdenv.mkDerivation rec { pname = "gnused"; @@ -30,9 +30,9 @@ stdenv.mkDerivation rec { multiple occurrences of a string within a file. ''; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.unix; - maintainers = [ ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ mic92 ]; }; } diff --git a/pkgs/tools/text/grin/default.nix b/pkgs/tools/text/grin/default.nix index 611507da75c..5d89619001b 100644 --- a/pkgs/tools/text/grin/default.nix +++ b/pkgs/tools/text/grin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python2Packages }: +{ lib, fetchFromGitHub, python2Packages }: python2Packages.buildPythonApplication rec { program = "grin"; @@ -18,7 +18,7 @@ python2Packages.buildPythonApplication rec { meta = { homepage = "https://github.com/rkern/grin"; description = "A grep program configured the way I like it"; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.sjagoe ]; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.sjagoe ]; }; } diff --git a/pkgs/tools/text/grip-search/default.nix b/pkgs/tools/text/grip-search/default.nix index 34644e431d9..57f0139dbc9 100644 --- a/pkgs/tools/text/grip-search/default.nix +++ b/pkgs/tools/text/grip-search/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, boost, pkgconfig, cmake, catch2 }: +{ lib, stdenv, fetchFromGitHub, boost, pkg-config, cmake, catch2 }: stdenv.mkDerivation rec { pname = "grip-search"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0bkqarylgzhis6fpj48qbifcd6a26cgnq8784hgnm707rq9kb0rx"; }; - nativeBuildInputs = [ pkgconfig cmake catch2 ]; + nativeBuildInputs = [ pkg-config cmake catch2 ]; doCheck = true; diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix index d6f1c051de9..892aeb463f8 100644 --- a/pkgs/tools/text/groff/default.nix +++ b/pkgs/tools/text/groff/default.nix @@ -3,7 +3,7 @@ , psutils, netpbm #for html output , buildPackages , autoreconfHook -, pkgconfig +, pkg-config , texinfo }: @@ -24,22 +24,22 @@ stdenv.mkDerivation rec { ./0001-Fix-cross-compilation-by-looking-for-ar.patch ]; - postPatch = stdenv.lib.optionalString (psutils != null) '' + postPatch = lib.optionalString (psutils != null) '' substituteInPlace src/preproc/html/pre-html.cpp \ --replace "psselect" "${psutils}/bin/psselect" - '' + stdenv.lib.optionalString (netpbm != null) '' + '' + lib.optionalString (netpbm != null) '' substituteInPlace src/preproc/html/pre-html.cpp \ - --replace "pnmcut" "${stdenv.lib.getBin netpbm}/bin/pnmcut" \ - --replace "pnmcrop" "${stdenv.lib.getBin netpbm}/bin/pnmcrop" \ - --replace "pnmtopng" "${stdenv.lib.getBin netpbm}/bin/pnmtopng" + --replace "pnmcut" "${lib.getBin netpbm}/bin/pnmcut" \ + --replace "pnmcrop" "${lib.getBin netpbm}/bin/pnmcrop" \ + --replace "pnmtopng" "${lib.getBin netpbm}/bin/pnmtopng" substituteInPlace tmac/www.tmac \ - --replace "pnmcrop" "${stdenv.lib.getBin netpbm}/bin/pnmcrop" \ - --replace "pngtopnm" "${stdenv.lib.getBin netpbm}/bin/pngtopnm" \ - --replace "@PNMTOPS_NOSETPAGE@" "${stdenv.lib.getBin netpbm}/bin/pnmtops -nosetpage" + --replace "pnmcrop" "${lib.getBin netpbm}/bin/pnmcrop" \ + --replace "pngtopnm" "${lib.getBin netpbm}/bin/pngtopnm" \ + --replace "@PNMTOPS_NOSETPAGE@" "${lib.getBin netpbm}/bin/pnmtops -nosetpage" ''; buildInputs = [ ghostscript psutils netpbm perl ]; - nativeBuildInputs = [ autoreconfHook pkgconfig texinfo ]; + nativeBuildInputs = [ autoreconfHook pkg-config texinfo ]; # Builds running without a chroot environment may detect the presence # of /usr/X11 in the host system, leading to an impure build of the @@ -48,14 +48,14 @@ stdenv.mkDerivation rec { # have to pass "--with-appresdir", too. configureFlags = [ "--without-x" - ] ++ stdenv.lib.optionals (ghostscript != null) [ + ] ++ lib.optionals (ghostscript != null) [ "--with-gs=${ghostscript}/bin/gs" - ] ++ stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "ac_cv_path_PERL=${buildPackages.perl}/bin/perl" "gl_cv_func_signbit=yes" ]; - makeFlags = stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + makeFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ # Trick to get the build system find the proper 'native' groff # http://www.mail-archive.com/bug-groff@gnu.org/msg01335.html "GROFF_BIN_PATH=${buildPackages.groff}/bin" @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { substituteInPlace $perl/bin/grog \ --replace $out/lib/groff/grog $perl/lib/groff/grog - '' + stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + '' + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' find $perl/ -type f -print0 | xargs --null sed -i 's|${buildPackages.perl}|${perl}|' ''; diff --git a/pkgs/tools/text/gtranslator/default.nix b/pkgs/tools/text/gtranslator/default.nix index d8b2df1fc0b..bf825a55059 100644 --- a/pkgs/tools/text/gtranslator/default.nix +++ b/pkgs/tools/text/gtranslator/default.nix @@ -2,7 +2,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , itstool , gettext , python3 @@ -25,14 +25,14 @@ stdenv.mkDerivation rec { version = "3.38.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "282puBoi2SM74Y6Z/VxEj2qwV1nR6UwQWAu4McotdjU="; }; nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config itstool gettext python3 diff --git a/pkgs/tools/text/gucci/default.nix b/pkgs/tools/text/gucci/default.nix index 4e938787ff4..943b86d3b05 100644 --- a/pkgs/tools/text/gucci/default.nix +++ b/pkgs/tools/text/gucci/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gucci"; diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix index 62b449ff9c4..56d0a234527 100644 --- a/pkgs/tools/text/highlight/default.nix +++ b/pkgs/tools/text/highlight/default.nix @@ -1,26 +1,26 @@ -{ lib, stdenv, fetchFromGitLab, getopt, lua, boost, pkgconfig, swig, perl, gcc }: +{ lib, stdenv, fetchFromGitLab, getopt, lua, boost, pkg-config, swig, perl, gcc }: -with stdenv.lib; +with lib; let self = stdenv.mkDerivation rec { pname = "highlight"; - version = "3.59"; + version = "3.60"; src = fetchFromGitLab { owner = "saalen"; repo = "highlight"; rev = "v${version}"; - sha256 = "0sqdzivnak3gcinvkf6rkgp1p5gjx5my6cb2790nh0v53y67v2pb"; + sha256 = "sha256-1EBdtORd9P5DJUmbZa9KjR3UUoHOKLbjqbxpFi5WFvQ="; }; enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig swig perl ] ++ optional stdenv.isDarwin gcc; + nativeBuildInputs = [ pkg-config swig perl ] ++ optional stdenv.isDarwin gcc; buildInputs = [ getopt lua boost ]; - prePatch = stdenv.lib.optionalString stdenv.cc.isClang '' + prePatch = lib.optionalString stdenv.cc.isClang '' substituteInPlace src/makefile \ --replace 'CXX=g++' 'CXX=clang++' ''; diff --git a/pkgs/tools/text/html2text/default.nix b/pkgs/tools/text/html2text/default.nix index 7cf276f2da3..ae92f3ba9d9 100644 --- a/pkgs/tools/text/html2text/default.nix +++ b/pkgs/tools/text/html2text/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "html2text-1.3.2a"; @@ -25,8 +25,8 @@ stdenv.mkDerivation { meta = { description = "Convert HTML to plain text"; homepage = "http://www.mbayer.de/html2text/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.eikek ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.eikek ]; }; } diff --git a/pkgs/tools/text/icdiff/default.nix b/pkgs/tools/text/icdiff/default.nix index 07082c4c56f..3ead56298cf 100644 --- a/pkgs/tools/text/icdiff/default.nix +++ b/pkgs/tools/text/icdiff/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pythonPackages }: +{ lib, fetchFromGitHub, pythonPackages }: pythonPackages.buildPythonApplication rec { pname = "icdiff"; diff --git a/pkgs/tools/text/invoice2data/default.nix b/pkgs/tools/text/invoice2data/default.nix index 2ed3005ee77..8007724f4a5 100644 --- a/pkgs/tools/text/invoice2data/default.nix +++ b/pkgs/tools/text/invoice2data/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, xpdf, imagemagick, tesseract }: +{ lib, python3Packages, xpdf, imagemagick, tesseract }: python3Packages.buildPythonPackage rec { pname = "invoice2data"; @@ -9,7 +9,7 @@ python3Packages.buildPythonPackage rec { sha256 = "1phz0a8jxg074k0im7shrrdfvdps7bn1fa4zwcf8q3sa2iig26l4"; }; - makeWrapperArgs = ["--prefix" "PATH" ":" (stdenv.lib.makeBinPath [ imagemagick xpdf tesseract ]) ]; + makeWrapperArgs = ["--prefix" "PATH" ":" (lib.makeBinPath [ imagemagick xpdf tesseract ]) ]; propagatedBuildInputs = with python3Packages; [ unidecode dateparser pyyaml pillow chardet pdfminer ]; diff --git a/pkgs/tools/text/ispell/default.nix b/pkgs/tools/text/ispell/default.nix index 9b78b8dad7c..f4403f4991f 100644 --- a/pkgs/tools/text/ispell/default.nix +++ b/pkgs/tools/text/ispell/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { postPatch = '' cat >> local.h <<EOF - ${stdenv.lib.optionalString (!stdenv.isDarwin) "#define USG"} + ${lib.optionalString (!stdenv.isDarwin) "#define USG"} #define TERMLIB "-lncurses" #define LANGUAGES "{american,MASTERDICTS=american.med,HASHFILES=americanmed.hash}" #define MASTERHASH "americanmed.hash" diff --git a/pkgs/tools/text/jsawk/default.nix b/pkgs/tools/text/jsawk/default.nix index a9b9e788402..e700d7c486e 100644 --- a/pkgs/tools/text/jsawk/default.nix +++ b/pkgs/tools/text/jsawk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, spidermonkey_38 }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, spidermonkey_38 }: stdenv.mkDerivation { pname = "jsawk"; @@ -21,8 +21,8 @@ stdenv.mkDerivation { meta = { description = "Like awk, but for JSON"; homepage = "https://github.com/micha/jsawk"; - license = stdenv.lib.licenses.publicDomain; - maintainers = with stdenv.lib.maintainers; [ puffnfresh ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.publicDomain; + maintainers = with lib.maintainers; [ puffnfresh ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/text/kakasi/default.nix b/pkgs/tools/text/kakasi/default.nix index 79b26e6fb56..609b8aff9b5 100644 --- a/pkgs/tools/text/kakasi/default.nix +++ b/pkgs/tools/text/kakasi/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "kakasi-2.3.6"; - buildInputs = stdenv.lib.optional stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optional stdenv.isDarwin [ libiconv ]; meta = with lib; { description = "Kanji Kana Simple Inverter"; diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix index 862faadea3f..c230278c0a0 100644 --- a/pkgs/tools/text/kdiff3/default.nix +++ b/pkgs/tools/text/kdiff3/default.nix @@ -6,11 +6,11 @@ mkDerivation rec { pname = "kdiff3"; - version = "1.8.4"; + version = "1.8.5"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1f1vyhvc31yfxspv5lzw8qjd2w8x74s2fmij1921m307g84qxqbn"; + sha256 = "sha256-vJL30E6xI/nFbb4wR69nv3FSQPqZSHrB0czypF4IVME="; }; nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; diff --git a/pkgs/tools/text/kramdown-rfc2629/gemset.nix b/pkgs/tools/text/kramdown-rfc2629/gemset.nix index 65d1c234de2..bf0cf130c42 100644 --- a/pkgs/tools/text/kramdown-rfc2629/gemset.nix +++ b/pkgs/tools/text/kramdown-rfc2629/gemset.nix @@ -30,4 +30,4 @@ }; version = "1.2.13"; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/text/kytea/default.nix b/pkgs/tools/text/kytea/default.nix index 8ef7b276a38..9cbc2c030a4 100644 --- a/pkgs/tools/text/kytea/default.nix +++ b/pkgs/tools/text/kytea/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { patches = [ ./gcc-O3.patch ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; meta = with lib; { homepage = "http://www.phontron.com/kytea/"; diff --git a/pkgs/tools/text/ledger2beancount/default.nix b/pkgs/tools/text/ledger2beancount/default.nix index 8a521b751d4..fe2078222d2 100644 --- a/pkgs/tools/text/ledger2beancount/default.nix +++ b/pkgs/tools/text/ledger2beancount/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, makeWrapper, perlPackages, beancount }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, perlPackages, beancount }: -with stdenv.lib; +with lib; let perlDeps = with perlPackages; [ diff --git a/pkgs/tools/text/link-grammar/default.nix b/pkgs/tools/text/link-grammar/default.nix index ce58f4dbd58..b5cfdcbfc0c 100644 --- a/pkgs/tools/text/link-grammar/default.nix +++ b/pkgs/tools/text/link-grammar/default.nix @@ -1,28 +1,49 @@ -{ lib, stdenv, fetchurl, pkgconfig, python3, sqlite, libedit, zlib }: +{ lib, stdenv, fetchurl, pkg-config, python3, sqlite, libedit, zlib, runCommand, dieHook }: -stdenv.mkDerivation rec { - version = "5.8.0"; +let + +link-grammar = stdenv.mkDerivation rec { + version = "5.8.1"; pname = "link-grammar"; outputs = [ "bin" "out" "dev" "man" ]; src = fetchurl { url = "http://www.abisource.com/downloads/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "1v8ngx77nachxln68xpvyw2lh7z59pzsi99h8j0mnrm0gjsacrdd"; + sha256 = "sha256-EcT/VR+lFpJX2sxXUIDGOwdceQ7awpmEqUZBoJk7UFs="; }; - nativeBuildInputs = [ pkgconfig python3 ]; + nativeBuildInputs = [ pkg-config python3 ]; buildInputs = [ sqlite libedit zlib ]; configureFlags = [ "--disable-java-bindings" ]; + doCheck = true; + + passthru.tests = { + quick = runCommand "link-grammar-quick-test" { + buildInputs = [ + link-grammar + dieHook + ]; + } '' + echo "Furiously sleep ideas green colorless." | link-parser en | grep "No complete linkages found." || die "Grammaticaly invalid sentence was parsed." + echo "Colorless green ideas sleep furiously." | link-parser en | grep "Found .* linkages." || die "Grammaticaly valid sentence was not parsed." + touch $out + ''; + }; + meta = with lib; { description = "A Grammar Checking library"; homepage = "https://www.abisource.com/projects/link-grammar/"; - license = licenses.lgpl21; + changelog = "https://github.com/opencog/link-grammar/blob/link-grammar-${version}/ChangeLog"; + license = licenses.lgpl21Only; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; }; -} +}; + +in + link-grammar diff --git a/pkgs/tools/text/mairix/default.nix b/pkgs/tools/text/mairix/default.nix index a2ae91e974b..57e05bf19f6 100644 --- a/pkgs/tools/text/mairix/default.nix +++ b/pkgs/tools/text/mairix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, bzip2, bison, flex }: +{ lib, stdenv, fetchurl, zlib, bzip2, bison, flex }: stdenv.mkDerivation rec { name = "mairix-0.24"; @@ -17,9 +17,9 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.rc0.org.uk/mairix"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; description = "Program for indexing and searching email messages stored in maildir, MH or mbox"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; all; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; all; }; } diff --git a/pkgs/tools/text/mark/default.nix b/pkgs/tools/text/mark/default.nix new file mode 100644 index 00000000000..36ca24ebf3e --- /dev/null +++ b/pkgs/tools/text/mark/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "mark"; + version = "3.5"; + + src = fetchFromGitHub { + owner = "kovetskiy"; + repo = "mark"; + rev = version; + sha256 = "0za4n2caqr3gflfxr1hdd328g7r52h7x0ws7r9mjvdnmwjgc0b2b"; + }; + + vendorSha256 = "1hvizcg5b3y2qgjiw77rb795xz9w1dzr3b8q2ji48ihll27g9f0m"; + + buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + + meta = with lib; { + description = "A tool for syncing your markdown documentation with Atlassian Confluence pages"; + homepage = "https://github.com/kovetskiy/mark"; + license = licenses.asl20; + maintainers = with maintainers; [ rguevara84 ]; + }; +} diff --git a/pkgs/tools/text/markdown-pp/default.nix b/pkgs/tools/text/markdown-pp/default.nix index 55febe11729..50ef560f6c3 100644 --- a/pkgs/tools/text/markdown-pp/default.nix +++ b/pkgs/tools/text/markdown-pp/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, pythonPackages, lib, stdenv }: +{ fetchFromGitHub, pythonPackages, lib }: with pythonPackages; buildPythonApplication rec { diff --git a/pkgs/tools/text/mdbook/default.nix b/pkgs/tools/text/mdbook/default.nix index 69b9b8b12cf..98fb6e69be5 100644 --- a/pkgs/tools/text/mdbook/default.nix +++ b/pkgs/tools/text/mdbook/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "mdbook"; - version = "0.4.5"; + version = "0.4.6"; src = fetchFromGitHub { owner = "rust-lang-nursery"; repo = "mdBook"; rev = "v${version}"; - sha256 = "11v2x0q8pn7hbmznqy872ksr7szyiki9cfhapymjhkf5nwfvcdbb"; + sha256 = "sha256-cS2fME3X8bFmEz6czoL+2ZFbflJP58+lIeC5SVleCNg="; }; - cargoSha256 = "1psgqj04hzv7p18h4phsahxg4rj9yz38b8mh111k6l8m4r83kd75"; + cargoSha256 = "sha256-iuJyprLp6HofcdH0NgNK2Vl+1FtdAvZPcltPUb5B2XU="; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; meta = with lib; { description = "Create books from MarkDown"; diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix index 5f5a331daca..f6752938d46 100644 --- a/pkgs/tools/text/mdcat/default.nix +++ b/pkgs/tools/text/mdcat/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchFromGitHub , rustPlatform -, pkgconfig +, pkg-config , asciidoctor , openssl , Security @@ -20,8 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-i36MYTMkbSuWxxlWUDsyYMay/4Mg7M5jEFhHM60UrkM="; }; - nativeBuildInputs = [ pkgconfig asciidoctor installShellFiles ]; - buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security; + nativeBuildInputs = [ pkg-config asciidoctor installShellFiles ]; + buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; cargoSha256 = "sha256-mnDUIJhEGNoh3eq2Vhww1T/tpZh9RP+RxbRsBNrpOzw="; diff --git a/pkgs/tools/text/mpage/default.nix b/pkgs/tools/text/mpage/default.nix index e86c9f2ad26..9bde7f388dc 100644 --- a/pkgs/tools/text/mpage/default.nix +++ b/pkgs/tools/text/mpage/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv }: +{ fetchurl, lib, stdenv }: stdenv.mkDerivation rec { name = "mpage-2.5.7"; @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { license = "liberal"; # a non-copyleft license, see `Copyright' file homepage = "http://www.mesa.nl/pub/mpage/"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/text/multitran/data/default.nix b/pkgs/tools/text/multitran/data/default.nix index 9b431f5b30b..a94f5bc9688 100644 --- a/pkgs/tools/text/multitran/data/default.nix +++ b/pkgs/tools/text/multitran/data/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl} : +{lib, stdenv, fetchurl} : # This package requires a locale ru_RU.cp1251 locale entry. # Waiting for a better idea, I created it modifying a store file using: @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { homepage = "http://multitran.sourceforge.net/"; description = "Multitran data english-russian"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/text/multitran/libbtree/default.nix b/pkgs/tools/text/multitran/libbtree/default.nix index 9a7e0fdbd07..893c1e1d931 100644 --- a/pkgs/tools/text/multitran/libbtree/default.nix +++ b/pkgs/tools/text/multitran/libbtree/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl} : +{lib, stdenv, fetchurl} : stdenv.mkDerivation { name = "libbtree-0.0.1alpha2"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { homepage = "http://multitran.sourceforge.net/"; description = "Multitran lib: library for reading Multitran's BTREE database format"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/text/multitran/libfacet/default.nix b/pkgs/tools/text/multitran/libfacet/default.nix index f359819aa73..3895f3a922c 100644 --- a/pkgs/tools/text/multitran/libfacet/default.nix +++ b/pkgs/tools/text/multitran/libfacet/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, libmtsupport }: +{ lib, stdenv, fetchurl, libmtsupport }: stdenv.mkDerivation { name = "libfacet-0.0.1alpha2"; - + src = fetchurl { url = "mirror://sourceforge/multitran/libfacet-0.0.1alpha2.tar.bz2"; sha256 = "dc53351c4035a3c27dc6c1d0410e808346fbc107e7e7c112ec65c59d0df7a144"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { homepage = "http://multitran.sourceforge.net/"; description = "Multitran lib: enchanced locale facets"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/text/multitran/libmtquery/default.nix b/pkgs/tools/text/multitran/libmtquery/default.nix index 2c03de6ede8..3b7dd681e8a 100644 --- a/pkgs/tools/text/multitran/libmtquery/default.nix +++ b/pkgs/tools/text/multitran/libmtquery/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libmtsupport, libfacet, libbtree, multitrandata } : +{lib, stdenv, fetchurl, libmtsupport, libfacet, libbtree, multitrandata } : stdenv.mkDerivation { name = "libmtquery-0.0.1alpha3"; @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { homepage = "http://multitran.sourceforge.net/"; description = "Multitran lib: main engine to query translations"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/text/multitran/libmtsupport/default.nix b/pkgs/tools/text/multitran/libmtsupport/default.nix index bc5a77be4fb..eebc88189f2 100644 --- a/pkgs/tools/text/multitran/libmtsupport/default.nix +++ b/pkgs/tools/text/multitran/libmtsupport/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl} : +{lib, stdenv, fetchurl} : stdenv.mkDerivation { name = "libmtsupport-0.0.1alpha2"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { homepage = "http://multitran.sourceforge.net/"; description = "Multitran lib: basic useful functions"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/text/multitran/mtutils/default.nix b/pkgs/tools/text/multitran/mtutils/default.nix index 9d701421d11..00325276fdb 100644 --- a/pkgs/tools/text/multitran/mtutils/default.nix +++ b/pkgs/tools/text/multitran/mtutils/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libmtsupport, libfacet, libbtree, libmtquery, help2man} : +{lib, stdenv, fetchurl, libmtsupport, libfacet, libbtree, libmtquery, help2man} : stdenv.mkDerivation { name = "mt-utils-0.0.1alpha3"; @@ -25,8 +25,8 @@ stdenv.mkDerivation { meta = { homepage = "http://multitran.sourceforge.net/"; description = "Multitran: simple command line utilities for dictionary maintenance"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/tools/text/namazu/default.nix b/pkgs/tools/text/namazu/default.nix index 93fc9dc75de..e5b3f59db8c 100644 --- a/pkgs/tools/text/namazu/default.nix +++ b/pkgs/tools/text/namazu/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, perl }: +{ fetchurl, lib, stdenv, perl }: stdenv.mkDerivation rec { name = "namazu-2.0.21"; @@ -34,10 +34,10 @@ stdenv.mkDerivation rec { but also as a personal search system for email or other files. ''; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; homepage = "http://namazu.org/"; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice + platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice maintainers = [ ]; broken = true; # File-MMagic is not compatible with our Perl version }; diff --git a/pkgs/tools/text/nawk/default.nix b/pkgs/tools/text/nawk/default.nix index aafce117ee4..3c16421bd97 100644 --- a/pkgs/tools/text/nawk/default.nix +++ b/pkgs/tools/text/nawk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, yacc }: +{ lib, stdenv, fetchFromGitHub, yacc }: stdenv.mkDerivation rec { pname = "nawk"; @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { (Addison-Wesley, 1988, ISBN 0-201-07981-X). ''; homepage = "https://www.cs.princeton.edu/~bwk/btl.mirror/"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.konimex ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.konimex ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/text/nkf/default.nix b/pkgs/tools/text/nkf/default.nix index 8a314d44843..a2b5f66a6e9 100644 --- a/pkgs/tools/text/nkf/default.nix +++ b/pkgs/tools/text/nkf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "nkf"; @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { meta = { description = "Tool for converting encoding of Japanese text"; homepage = "https://nkf.osdn.jp/"; - license = stdenv.lib.licenses.zlib; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.auntie ]; + license = lib.licenses.zlib; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.auntie ]; }; } diff --git a/pkgs/tools/text/ocrmypdf/default.nix b/pkgs/tools/text/ocrmypdf/default.nix index 2ba34d42270..f68e1558139 100644 --- a/pkgs/tools/text/ocrmypdf/default.nix +++ b/pkgs/tools/text/ocrmypdf/default.nix @@ -74,11 +74,11 @@ buildPythonApplication rec { patches = [ (substituteAll { src = ./liblept.patch; - liblept = "${stdenv.lib.getLib leptonica}/lib/liblept${stdenv.hostPlatform.extensions.sharedLibrary}"; + liblept = "${lib.getLib leptonica}/lib/liblept${stdenv.hostPlatform.extensions.sharedLibrary}"; }) ]; - makeWrapperArgs = [ "--prefix PATH : ${stdenv.lib.makeBinPath [ ghostscript jbig2enc pngquant qpdf tesseract4 unpaper ]}" ]; + makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ ghostscript jbig2enc pngquant qpdf tesseract4 unpaper ]}" ]; meta = with lib; { homepage = "https://github.com/jbarlow83/OCRmyPDF"; diff --git a/pkgs/tools/text/odt2txt/default.nix b/pkgs/tools/text/odt2txt/default.nix index 2a64533a459..0eb18e8435d 100644 --- a/pkgs/tools/text/odt2txt/default.nix +++ b/pkgs/tools/text/odt2txt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, libiconv }: +{ lib, stdenv, fetchurl, zlib, libiconv }: stdenv.mkDerivation rec { pname = "odt2txt"; @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { meta = { description = "Simple .odt to .txt converter"; homepage = "https://github.com/dstosberg/odt2txt"; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.gpl2; + platforms = lib.platforms.all; + license = lib.licenses.gpl2; maintainers = [ ]; }; } diff --git a/pkgs/tools/text/opencc/default.nix b/pkgs/tools/text/opencc/default.nix index 32c82341d7b..7893968d9ee 100644 --- a/pkgs/tools/text/opencc/default.nix +++ b/pkgs/tools/text/opencc/default.nix @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python ]; # let intermediate tools find intermediate library - preBuild = stdenv.lib.optionalString stdenv.isLinux '' + preBuild = lib.optionalString stdenv.isLinux '' export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$(pwd)/src - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$(pwd)/src ''; diff --git a/pkgs/tools/text/papertrail/gemset.nix b/pkgs/tools/text/papertrail/gemset.nix index 91bfe319896..dcdfcdf7ea5 100644 --- a/pkgs/tools/text/papertrail/gemset.nix +++ b/pkgs/tools/text/papertrail/gemset.nix @@ -23,4 +23,4 @@ }; version = "0.10.1"; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/text/par/default.nix b/pkgs/tools/text/par/default.nix index 321421a6b80..e4c6c5d0c08 100644 --- a/pkgs/tools/text/par/default.nix +++ b/pkgs/tools/text/par/default.nix @@ -18,7 +18,10 @@ stdenv.mkDerivation { }) ]; - buildPhase = ''make -f protoMakefile''; + makefile = "protoMakefile"; + preBuild = '' + makeFlagsArray+=(CC="${stdenv.cc.targetPrefix}cc -c" LINK1=${stdenv.cc.targetPrefix}cc) + ''; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/tools/text/pbgopy/default.nix b/pkgs/tools/text/pbgopy/default.nix index cb8b981b265..d4ed4eb0f03 100644 --- a/pkgs/tools/text/pbgopy/default.nix +++ b/pkgs/tools/text/pbgopy/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "pbgopy"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "nakabonne"; repo = pname; rev = "v${version}"; - sha256 = "0impgx9w9lk93b7p1vhjnbslr04655fn6csx7hj04kffzhyb3p1q"; + sha256 = "sha256-P/MFDFMsqSTVErTM9izJJSMIbiOcbQ9Ya10/w6NRcYw="; }; - vendorSha256 = "09hn92bi2rmixpsgckbi8f70widls40fwqqm7y7rqglyjqi7rdmw"; + vendorSha256 = "sha256-S2X74My6wyDZOsEYTDilCFaYgV2vQzU0jOAY9cEkJ6A="; meta = with lib; { description = "Copy and paste between devices"; diff --git a/pkgs/tools/text/peco/default.nix b/pkgs/tools/text/peco/default.nix index 03d3580dded..2928d532207 100644 --- a/pkgs/tools/text/peco/default.nix +++ b/pkgs/tools/text/peco/default.nix @@ -1,28 +1,25 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "peco"; - version = "0.5.3"; + version = "0.5.8"; - goPackagePath = "github.com/peco/peco"; subPackages = [ "cmd/peco" ]; src = fetchFromGitHub { owner = "peco"; repo = "peco"; rev = "v${version}"; - sha256 = "1m3s1jrrhqccgg3frfnq6iprwwi97j13wksckpcyrg51z6y5q041"; + sha256 = "12xbqisk7bcy38fmjxcs069a0600gncbqzscqw6x37lgw6hlw52x"; }; - goDeps = ./deps.nix; + vendorSha256 = "1p8pc50ql2vqnn0crx0y558i3m0d6vcdaj3995h3f0908pnk6x7q"; meta = with lib; { description = "Simplistic interactive filtering tool"; homepage = "https://github.com/peco/peco"; + changelog = "https://github.com/peco/peco/blob/v${version}/Changes"; license = licenses.mit; - # peco should work on Windows or other POSIX platforms, but the go package - # declares only linux and darwin. - platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/tools/text/peco/deps.nix b/pkgs/tools/text/peco/deps.nix deleted file mode 100644 index 29bae2de5b5..00000000000 --- a/pkgs/tools/text/peco/deps.nix +++ /dev/null @@ -1,57 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -[ - { - goPackagePath = "github.com/google/btree"; - fetch = { - type = "git"; - url = "https://github.com/google/btree"; - rev = "0c3044bc8bada22db67b93f5760fe3f05d6a5c25"; - sha256 = "05rdnf2c9r0yicg17zsq58i0sm32p0lk8zdnb7nhr0v5hqldvps4"; - }; - } - { - goPackagePath = "github.com/jessevdk/go-flags"; - fetch = { - type = "git"; - url = "https://github.com/jessevdk/go-flags"; - rev = "8bc97d602c3bfeb5fc6fc9b5a9c898f245495637"; - sha256 = "1h3il3ycgd54flbyqys4hm4gzx1lyn5ja1k79f2y7zbs6y0mf1lz"; - }; - } - { - goPackagePath = "github.com/lestrrat/go-pdebug"; - fetch = { - type = "git"; - url = "https://github.com/lestrrat/go-pdebug"; - rev = "2e6eaaa5717f81bda41d27070d3c966f40a1e75f"; - sha256 = "05dx1f1yln47nazyi50zix82xbnyva3hily4gh5gaz021h01npax"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "737072b4e32b7a5018b4a7125da8d12de90e8045"; - sha256 = "09ni8bmj6p2b774bdh6mfcxl03bh5sqk860z03xpb6hv6yfxqkjm"; - }; - } - { - goPackagePath = "github.com/nsf/termbox-go"; - fetch = { - type = "git"; - url = "https://github.com/nsf/termbox-go"; - rev = "e2050e41c8847748ec5288741c0b19a8cb26d084"; - sha256 = "181b1df2b6fcn5wizq2qqxl1kwqbih5k15n08rx3bcz36q34n23s"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "248dadf4e9068a0b3e79f02ed0a610d935de5302"; - sha256 = "03l80r0i9bxl0vz363w62k4a8apzglgbrz6viwym3044sxkl1qks"; - }; - } -] diff --git a/pkgs/tools/text/platinum-searcher/default.nix b/pkgs/tools/text/platinum-searcher/default.nix index 30e7e58345d..ca89b7dc2d8 100644 --- a/pkgs/tools/text/platinum-searcher/default.nix +++ b/pkgs/tools/text/platinum-searcher/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "the_platinum_searcher"; diff --git a/pkgs/tools/text/poedit/default.nix b/pkgs/tools/text/poedit/default.nix index 54c3da224d8..63d0c05e543 100644 --- a/pkgs/tools/text/poedit/default.nix +++ b/pkgs/tools/text/poedit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoconf, automake, libtool, gettext, pkgconfig, wxGTK30-gtk3, +{ lib, stdenv, fetchurl, autoconf, automake, libtool, gettext, pkg-config, wxGTK30-gtk3, boost, icu, lucenepp, asciidoc, libxslt, xmlto, gtk3, gtkspell3, pugixml, nlohmann_json, hicolor-icon-theme, wrapGAppsHook }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoconf automake asciidoc wrapGAppsHook - libxslt xmlto boost libtool pkgconfig ]; + libxslt xmlto boost libtool pkg-config ]; buildInputs = [ lucenepp nlohmann_json wxGTK30-gtk3 icu pugixml gtk3 gtkspell3 hicolor-icon-theme ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ]; preFixup = '' - gappsWrapperArgs+=(--prefix PATH : "${stdenv.lib.makeBinPath [ gettext ]}") + gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ gettext ]}") ''; enableParallelBuilding = true; diff --git a/pkgs/tools/text/popfile/default.nix b/pkgs/tools/text/popfile/default.nix index b7134ba7356..ef945235a90 100644 --- a/pkgs/tools/text/popfile/default.nix +++ b/pkgs/tools/text/popfile/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, makeWrapper, perlPackages, +{ lib, stdenv, fetchzip, makeWrapper, perlPackages, ... }: stdenv.mkDerivation rec { @@ -49,11 +49,11 @@ stdenv.mkDerivation rec { meta = { description = "An email classification system that automatically sorts messages and fights spam"; homepage = "http://getpopfile.org"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; # Should work on macOS, but havent tested it. # Windows support is more complicated. # http://getpopfile.org/docs/faq:systemrequirements - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/text/proselint/default.nix b/pkgs/tools/text/proselint/default.nix index ea72468dc69..143c43f660d 100644 --- a/pkgs/tools/text/proselint/default.nix +++ b/pkgs/tools/text/proselint/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, buildPythonApplication, click, future, six }: +{ lib, fetchurl, buildPythonApplication, click, future, six }: buildPythonApplication rec { pname = "proselint"; diff --git a/pkgs/tools/text/qgrep/default.nix b/pkgs/tools/text/qgrep/default.nix index a3e18c6bba3..032e9474128 100644 --- a/pkgs/tools/text/qgrep/default.nix +++ b/pkgs/tools/text/qgrep/default.nix @@ -12,21 +12,21 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - patches = stdenv.lib.optionals stdenv.isDarwin [ + patches = lib.optionals stdenv.isDarwin [ (fetchpatch { url = "https://github.com/zeux/qgrep/commit/21c4d1a5ab0f0bdaa0b5ca993c1315c041418cc6.patch"; sha256 = "0wpxzrd9pmhgbgby17vb8279xwvkxfdd99gvv7r74indgdxqg7v8"; }) ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices CoreFoundation ]; + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices CoreFoundation ]; - postPatch = stdenv.lib.optionalString stdenv.isAarch64 '' + postPatch = lib.optionalString stdenv.isAarch64 '' substituteInPlace Makefile \ --replace "-msse2" "" --replace "-DUSE_SSE2" "" ''; - installPhase = '' + installPhase = '' install -Dm755 qgrep $out/bin/qgrep ''; diff --git a/pkgs/tools/text/qprint/default.nix b/pkgs/tools/text/qprint/default.nix index d616d15ad75..e2621ab1876 100644 --- a/pkgs/tools/text/qprint/default.nix +++ b/pkgs/tools/text/qprint/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv }: +{ fetchurl, lib, stdenv }: stdenv.mkDerivation rec { name = "qprint-1.1"; @@ -19,10 +19,10 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.fourmilab.ch/webtools/qprint/"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; description = "Encode and decode Quoted-Printable files"; - maintainers = [ stdenv.lib.maintainers.tv ]; - platforms = stdenv.lib.platforms.all; + maintainers = [ lib.maintainers.tv ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/text/qshowdiff/default.nix b/pkgs/tools/text/qshowdiff/default.nix index bb2eeee8a9e..251427f03c5 100644 --- a/pkgs/tools/text/qshowdiff/default.nix +++ b/pkgs/tools/text/qshowdiff/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, qt4, perl, pkgconfig }: +{lib, stdenv, fetchurl, qt4, perl, pkg-config }: stdenv.mkDerivation rec { pname = "qshowdiff"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "027959xbzvi5c2w9y1x122sr5i26k9mvp43banz2wln6gd860n1a"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ qt4 perl ]; configurePhase = '' @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://qshowdiff.danfis.cz/"; description = "Colourful diff viewer"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; }; } diff --git a/pkgs/tools/text/reckon/Gemfile.lock b/pkgs/tools/text/reckon/Gemfile.lock index 94f0f8f506c..6c3ce51c6ac 100644 --- a/pkgs/tools/text/reckon/Gemfile.lock +++ b/pkgs/tools/text/reckon/Gemfile.lock @@ -2,14 +2,12 @@ GEM remote: https://rubygems.org/ specs: chronic (0.10.2) - fastercsv (1.5.5) - highline (1.7.8) - reckon (0.4.4) + highline (2.0.3) + rchardet (1.8.0) + reckon (0.6.0) chronic (>= 0.3.0) - fastercsv (>= 1.5.1) highline (>= 1.5.2) - terminal-table (>= 1.4.2) - terminal-table (1.6.0) + rchardet (>= 1.8.0) PLATFORMS ruby diff --git a/pkgs/tools/text/reckon/gemset.nix b/pkgs/tools/text/reckon/gemset.nix index e1e4a43188d..50802ccd805 100644 --- a/pkgs/tools/text/reckon/gemset.nix +++ b/pkgs/tools/text/reckon/gemset.nix @@ -7,36 +7,35 @@ }; version = "0.10.2"; }; - fastercsv = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1df3vfgw5wg0s405z0pj0rfcvnl9q6wak7ka8gn0xqg4cag1k66h"; - type = "gem"; - }; - version = "1.5.5"; - }; highline = { + groups = ["default"]; + platforms = []; source = { - remotes = ["https://rubygems.org"]; - sha256 = "1nf5lgdn6ni2lpfdn4gk3gi47fmnca2bdirabbjbz1fk9w4p8lkr"; + remotes = ["http://rubygems.org"]; + sha256 = "0yclf57n2j3cw8144ania99h1zinf8q3f5zrhqa754j6gl95rp9d"; type = "gem"; }; - version = "1.7.8"; + version = "2.0.3"; }; - reckon = { + rchardet = { + groups = ["default"]; + platforms = []; source = { - remotes = ["https://rubygems.org"]; - sha256 = "1p6w8w7vpl8fq4yfggrxbv6ph76psg7l5b4q29a8zvfbzzx6a0xw"; + remotes = ["http://rubygems.org"]; + sha256 = "1isj1b3ywgg2m1vdlnr41lpvpm3dbyarf1lla4dfibfmad9csfk9"; type = "gem"; }; - version = "0.4.4"; + version = "1.8.0"; }; - terminal-table = { + reckon = { + dependencies = ["chronic" "highline" "rchardet"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hbmzfr17ji5ws5x5z3kypmb5irwwss7q7kkad0gs005ibqrxv0a"; + sha256 = "0zkbmwx5bp2dr54bwhkn831918ijwh022rq45qg38wz2skih7izp"; type = "gem"; }; - version = "1.6.0"; + version = "0.6.0"; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/text/recode/default.nix b/pkgs/tools/text/recode/default.nix index e8dd5c8bbf7..9b77c9d8b70 100644 --- a/pkgs/tools/text/recode/default.nix +++ b/pkgs/tools/text/recode/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3, perl, intltool, flex, texinfo, libiconv, libintl }: +{ lib, stdenv, fetchurl, python3, perl, intltool, flex, texinfo, libiconv, libintl }: stdenv.mkDerivation rec { pname = "recode"; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/rrthomas/recode"; description = "Converts files between various character sets and usages"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ jcumming ]; + platforms = lib.platforms.unix; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ jcumming ]; }; } diff --git a/pkgs/tools/text/replace/default.nix b/pkgs/tools/text/replace/default.nix index 009c3dcd8c5..117fb737aa0 100644 --- a/pkgs/tools/text/replace/default.nix +++ b/pkgs/tools/text/replace/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "replace-2.24"; @@ -24,6 +24,6 @@ stdenv.mkDerivation { meta = { homepage = "https://replace.richardlloyd.org.uk/"; description = "A tool to replace verbatim strings"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix index 3bea0bdf8fb..61e534fa732 100644 --- a/pkgs/tools/text/ripgrep/default.nix +++ b/pkgs/tools/text/ripgrep/default.nix @@ -22,11 +22,11 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "03wf9r2csi6jpa7v5sw5lpxkrk4wfzwmzx7k3991q3bdjzcwnnwp"; - cargoBuildFlags = stdenv.lib.optional withPCRE2 "--features pcre2"; + cargoBuildFlags = lib.optional withPCRE2 "--features pcre2"; nativeBuildInputs = [ asciidoctor installShellFiles ]; - buildInputs = (stdenv.lib.optional withPCRE2 pcre2) - ++ (stdenv.lib.optional stdenv.isDarwin Security); + buildInputs = (lib.optional withPCRE2 pcre2) + ++ (lib.optional stdenv.isDarwin Security); preFixup = '' installManPage $releaseDir/build/ripgrep-*/out/rg.1 diff --git a/pkgs/tools/text/rpl/default.nix b/pkgs/tools/text/rpl/default.nix index f53a1d79080..97a30211621 100644 --- a/pkgs/tools/text/rpl/default.nix +++ b/pkgs/tools/text/rpl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pythonPackages }: +{ lib, fetchFromGitHub, pythonPackages }: pythonPackages.buildPythonApplication rec { pname = "rpl"; diff --git a/pkgs/tools/text/ruby-zoom/gemset.nix b/pkgs/tools/text/ruby-zoom/gemset.nix index f4c637aadf8..19584787d90 100644 --- a/pkgs/tools/text/ruby-zoom/gemset.nix +++ b/pkgs/tools/text/ruby-zoom/gemset.nix @@ -61,4 +61,4 @@ }; version = "1.0.0"; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/text/ruplacer/default.nix b/pkgs/tools/text/ruplacer/default.nix index 33a95c365e6..3af039ccdae 100644 --- a/pkgs/tools/text/ruplacer/default.nix +++ b/pkgs/tools/text/ruplacer/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0wrv4k63pc1v0apmxmmci9qaykcv9ig3nfxy6id5caqrckp73cr4"; - buildInputs = (stdenv.lib.optional stdenv.isDarwin Security); + buildInputs = (lib.optional stdenv.isDarwin Security); meta = with lib; { description = "Find and replace text in source files"; diff --git a/pkgs/tools/text/schema2ldif/default.nix b/pkgs/tools/text/schema2ldif/default.nix index 409bbc16a93..84196ae1119 100644 --- a/pkgs/tools/text/schema2ldif/default.nix +++ b/pkgs/tools/text/schema2ldif/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchurl, makeWrapper, perlPackages }: stdenv.mkDerivation rec { +{ lib, stdenv, fetchurl, makeWrapper, perlPackages }: + +stdenv.mkDerivation rec { pname = "schema2ldif"; version = "1.3"; diff --git a/pkgs/tools/text/sd/default.nix b/pkgs/tools/text/sd/default.nix index c986150b26c..a3290aff211 100644 --- a/pkgs/tools/text/sd/default.nix +++ b/pkgs/tools/text/sd/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1mksmdp1wnsjd8gw1g3l16a24fk05xa9mxygc0qklr41bqf8kw8b"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; meta = with lib; { description = "Intuitive find & replace CLI (sed alternative)"; diff --git a/pkgs/tools/text/sgml/jade/default.nix b/pkgs/tools/text/sgml/jade/default.nix index f4110ed2105..338520b4df2 100644 --- a/pkgs/tools/text/sgml/jade/default.nix +++ b/pkgs/tools/text/sgml/jade/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gnum4 }: +{ lib, stdenv, fetchurl, gnum4 }: stdenv.mkDerivation rec { name = "jade-${version}-${debpatch}"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { description = "James Clark's DSSSL Engine"; license = "custom"; homepage = "http://www.jclark.com/jade/"; - platforms = with stdenv.lib.platforms; linux; - maintainers = with stdenv.lib.maintainers; [ e-user ]; + platforms = with lib.platforms; linux; + maintainers = with lib.maintainers; [ e-user ]; }; } diff --git a/pkgs/tools/text/sgml/openjade/default.nix b/pkgs/tools/text/sgml/openjade/default.nix index eee5d005c05..785ef320596 100644 --- a/pkgs/tools/text/sgml/openjade/default.nix +++ b/pkgs/tools/text/sgml/openjade/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, opensp, perl }: +{ lib, stdenv, fetchurl, opensp, perl }: stdenv.mkDerivation rec { name = "openjade-1.3.2"; @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { meta = { description = "An implementation of DSSSL, an ISO standard for formatting SGML (and XML) documents"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; homepage = "http://openjade.sourceforge.net/"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/text/sgml/opensp/default.nix b/pkgs/tools/text/sgml/opensp/default.nix index 9880564d969..1c9131d29dc 100644 --- a/pkgs/tools/text/sgml/opensp/default.nix +++ b/pkgs/tools/text/sgml/opensp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, xmlto, docbook_xml_dtd_412 +{ lib, stdenv, fetchurl, fetchpatch, xmlto, docbook_xml_dtd_412 , libxslt, docbook_xsl, autoconf, automake, gettext, libiconv, libtool}: stdenv.mkDerivation { @@ -20,7 +20,7 @@ stdenv.mkDerivation { sha256 = "04q14s8qsad0bkjmj067dn831i0r6v7742rafdlnbfm5y249m2q6"; }) ]; - + setupHook = ./setup-hook.sh; postFixup = '' @@ -32,7 +32,7 @@ stdenv.mkDerivation { preConfigure = if stdenv.isCygwin then "autoreconf -fi" else null; # need autoconf, automake, gettext, and libtool for reconfigure - nativeBuildInputs = stdenv.lib.optionals stdenv.isCygwin [ autoconf automake libtool ]; + nativeBuildInputs = lib.optionals stdenv.isCygwin [ autoconf automake libtool ]; buildInputs = [ xmlto docbook_xml_dtd_412 libxslt docbook_xsl gettext libiconv ]; @@ -40,8 +40,8 @@ stdenv.mkDerivation { meta = { description = "A suite of SGML/XML processing tools"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; homepage = "http://openjade.sourceforge.net/"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/text/shfmt/default.nix b/pkgs/tools/text/shfmt/default.nix index 70599963905..cb5bb8a28e8 100644 --- a/pkgs/tools/text/shfmt/default.nix +++ b/pkgs/tools/text/shfmt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "shfmt"; - version = "3.2.1"; + version = "3.2.2"; src = fetchFromGitHub { owner = "mvdan"; repo = "sh"; rev = "v${version}"; - sha256 = "1kp4ib0a64cc9qylny48ff5q9ciklzx93yhv7fgqhl1v2c7fm1jp"; + sha256 = "sha256-ZeyHidw8iHboo/LHTR9E3Sqj8euaRvDaYbPQMdecsrk="; }; vendorSha256 = "1ma7nvyn6ylbi8bd7x900i94pzs877kfy9xh0nf1bbify1vcpd29"; diff --git a/pkgs/tools/text/silver-searcher/default.nix b/pkgs/tools/text/silver-searcher/default.nix index 99e0e0a2ac2..177c556a337 100644 --- a/pkgs/tools/text/silver-searcher/default.nix +++ b/pkgs/tools/text/silver-searcher/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, pcre, zlib, lzma}: +{lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, pcre, zlib, lzma}: stdenv.mkDerivation rec { pname = "silver-searcher"; @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { patches = [ ./bash-completion.patch ]; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; + NIX_LDFLAGS = lib.optionalString stdenv.isLinux "-lgcc_s"; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ pcre zlib lzma ]; meta = with lib; { diff --git a/pkgs/tools/text/snippetpixie/default.nix b/pkgs/tools/text/snippetpixie/default.nix index fe8ce9657b5..bfbfd899316 100644 --- a/pkgs/tools/text/snippetpixie/default.nix +++ b/pkgs/tools/text/snippetpixie/default.nix @@ -4,7 +4,7 @@ , meson , ninja , vala -, pkgconfig +, pkg-config , wrapGAppsHook , appstream , desktop-file-utils @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meson ninja vala - pkgconfig + pkg-config wrapGAppsHook appstream desktop-file-utils diff --git a/pkgs/tools/text/source-highlight/default.nix b/pkgs/tools/text/source-highlight/default.nix index 7052d9e5a44..2e60d2a31c0 100644 --- a/pkgs/tools/text/source-highlight/default.nix +++ b/pkgs/tools/text/source-highlight/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost }: +{ lib, stdenv, fetchurl, boost }: let name = "source-highlight"; @@ -12,6 +12,14 @@ stdenv.mkDerivation { sha256 = "148w47k3zswbxvhg83z38ifi85f9dqcpg7icvvw1cm6bg21x4zrs"; }; + # source-highlight uses it's own binary to generate documentation. + # During cross-compilation, that binary was built for the target + # platform architecture, so it can't run on the build host. + patchPhase = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + substituteInPlace Makefile.in --replace "src doc tests" "src tests" + ''; + + strictDeps = true; buildInputs = [ boost ]; configureFlags = [ "--with-boost=${boost.out}" ]; @@ -21,8 +29,8 @@ stdenv.mkDerivation { meta = { description = "Source code renderer with syntax highlighting"; homepage = "https://www.gnu.org/software/src-highlite/"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = lib.licenses.gpl3Plus; + platforms = with lib.platforms; linux ++ darwin; longDescription = '' GNU Source-highlight, given a source file, produces a document diff --git a/pkgs/tools/text/transifex-client/default.nix b/pkgs/tools/text/transifex-client/default.nix index 411c9cb9899..a0f3ad1c5e3 100644 --- a/pkgs/tools/text/transifex-client/default.nix +++ b/pkgs/tools/text/transifex-client/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, fetchPypi +{ lib, buildPythonApplication, fetchPypi , python-slugify, requests, urllib3, six, setuptools }: buildPythonApplication rec { diff --git a/pkgs/tools/text/txt2tags/default.nix b/pkgs/tools/text/txt2tags/default.nix index f70ad1710e2..eb299caade9 100644 --- a/pkgs/tools/text/txt2tags/default.nix +++ b/pkgs/tools/text/txt2tags/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python }: +{ lib, stdenv, fetchurl, python }: stdenv.mkDerivation rec { version = "2.6"; @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://txt2tags.org/"; description = "A KISS markup language"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ kovirobi ]; - platforms = with stdenv.lib.platforms; unix; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ kovirobi ]; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/tools/text/uni2ascii/default.nix b/pkgs/tools/text/uni2ascii/default.nix index d6b1215caf3..19c95dcec63 100644 --- a/pkgs/tools/text/uni2ascii/default.nix +++ b/pkgs/tools/text/uni2ascii/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "uni2ascii-4.18"; @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { }; meta = { - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; homepage = "http://billposer.org/Software/uni2ascii.html"; description = "Converts between UTF-8 and many 7-bit ASCII equivalents and back"; - longDescription = '' + longDescription = '' This package provides conversion in both directions between UTF-8 Unicode and more than thirty 7-bit ASCII equivalents, including RFC 2396 URI format and RFC 2045 Quoted Printable format, the @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { It also provides ways of converting non-ASCII characters to similar ASCII characters, e.g. by stripping diacritics. ''; - maintainers = with stdenv.lib.maintainers; [ goibhniu ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with lib.maintainers; [ goibhniu ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index 2b6307ed009..bc7c43ca6ec 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "vale"; - version = "2.6.8"; + version = "2.8.1"; - subPackages = [ "." ]; + subPackages = [ "cmd/vale" ]; outputs = [ "out" "data" ]; src = fetchFromGitHub { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - sha256 = "sha256-evvnIM8sd/eHpI2FYOlgjvGn8awTVc1f5QDIYAvhqmk="; + sha256 = "0xvsg5j0nv6p6wskxg4gz79di6p495c78xbwl3xmh0wyk7g78lkx"; }; vendorSha256 = null; diff --git a/pkgs/tools/text/wdiff/default.nix b/pkgs/tools/text/wdiff/default.nix index bec7ba8825d..afcb649d921 100644 --- a/pkgs/tools/text/wdiff/default.nix +++ b/pkgs/tools/text/wdiff/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, texinfo, which }: +{ lib, stdenv, fetchurl, texinfo, which }: stdenv.mkDerivation rec { name = "wdiff-1.2.2"; @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.gnu.org/software/wdiff/"; description = "Comparing files on a word by word basis"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.eelco ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/text/wgetpaste/default.nix b/pkgs/tools/text/wgetpaste/default.nix index 852175c4f21..a3a7a8bd54a 100644 --- a/pkgs/tools/text/wgetpaste/default.nix +++ b/pkgs/tools/text/wgetpaste/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, wget, bash }: +{ lib, stdenv, fetchurl, wget, bash }: stdenv.mkDerivation rec { version = "2.30"; @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { meta = { description = "Command-line interface to various pastebins"; homepage = "http://wgetpaste.zlin.dk/"; - license = stdenv.lib.licenses.publicDomain; - maintainers = with stdenv.lib.maintainers; [ qknight domenkozar ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.publicDomain; + maintainers = with lib.maintainers; [ qknight domenkozar ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/text/xml/rxp/default.nix b/pkgs/tools/text/xml/rxp/default.nix index c0e2ea1c4e2..5940bc6d60f 100644 --- a/pkgs/tools/text/xml/rxp/default.nix +++ b/pkgs/tools/text/xml/rxp/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl} : +{lib, stdenv, fetchurl} : stdenv.mkDerivation rec { pname = "rxp"; @@ -10,9 +10,9 @@ stdenv.mkDerivation rec { }; meta = { - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; description = "A validating XML parser written in C"; homepage = "http://www.cogsci.ed.ac.uk/~richard/rxp.html"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/text/xml/xml2/default.nix b/pkgs/tools/text/xml/xml2/default.nix index 8ae8ea48bf3..4c312250bf6 100644 --- a/pkgs/tools/text/xml/xml2/default.nix +++ b/pkgs/tools/text/xml/xml2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libxml2 }: +{ lib, stdenv, fetchurl, pkg-config, libxml2 }: stdenv.mkDerivation { name = "xml2-0.5"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "01cps980m99y99cnmvydihga9zh3pvdsqag2fi1n6k2x7rfkl873"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxml2 ]; meta = with lib; { diff --git a/pkgs/tools/text/xml/xmlformat/default.nix b/pkgs/tools/text/xml/xmlformat/default.nix index 8dfec26e811..380baa906c2 100644 --- a/pkgs/tools/text/xml/xmlformat/default.nix +++ b/pkgs/tools/text/xml/xmlformat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl }: +{ lib, stdenv, fetchurl, perl }: stdenv.mkDerivation rec { pname = "xmlformat"; version = "1.04"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "a configurable formatter (or 'pretty-printer') for XML documents"; homepage = "http://www.kitebird.com/software/xmlformat/"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.bsd3; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/text/xml/xmlstarlet/default.nix b/pkgs/tools/text/xml/xmlstarlet/default.nix index 7d3471f9561..e179c3153e1 100644 --- a/pkgs/tools/text/xml/xmlstarlet/default.nix +++ b/pkgs/tools/text/xml/xmlstarlet/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, libxslt }: +{ lib, stdenv, fetchurl, pkg-config, libxml2, libxslt }: stdenv.mkDerivation rec { name = "xmlstarlet-1.6.1"; - + src = fetchurl { url = "mirror://sourceforge/xmlstar/${name}.tar.gz"; sha256 = "1jp737nvfcf6wyb54fla868yrr39kcbijijmjpyk4lrpyg23in0m"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxml2 libxslt ]; preConfigure = @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "A command line tool for manipulating and querying XML data"; homepage = "http://xmlstar.sourceforge.net/"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.mit; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/text/xml/xpf/default.nix b/pkgs/tools/text/xml/xpf/default.nix index 6999a4a64d0..29170394d1e 100644 --- a/pkgs/tools/text/xml/xpf/default.nix +++ b/pkgs/tools/text/xml/xpf/default.nix @@ -1,20 +1,20 @@ -{stdenv, fetchurl, python2, libxml2}: +{lib, stdenv, fetchurl, python2, libxml2}: assert libxml2.pythonSupport == true; stdenv.mkDerivation { name = "xpf-0.2"; - + src = fetchurl { url = "http://tarballs.nixos.org/xpf-0.2.tar.gz"; sha256 = "0ljx91w68rnh4871c0xlq2whlmhqz8dr39wcdczfjjpniqz1fmpz"; }; - + buildInputs = [ python2 libxml2 ]; meta = { description = "XML Pipes and Filters - command line tools for manipulating and querying XML data"; homepage = "http://www.cs.uu.nl/wiki/bin/view/Martin/XmlPipesAndFilters"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/text/xsv/default.nix b/pkgs/tools/text/xsv/default.nix index c71221ccd76..026218b00e1 100644 --- a/pkgs/tools/text/xsv/default.nix +++ b/pkgs/tools/text/xsv/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1q59nvklh5r2mrsz656z6js3j2l6rqyhfz6l0yq28df5kyahk91b"; - buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.isDarwin Security; meta = with lib; { description = "A fast CSV toolkit written in Rust"; diff --git a/pkgs/tools/text/xurls/default.nix b/pkgs/tools/text/xurls/default.nix index b1fd02ca75b..fa5418b4581 100644 --- a/pkgs/tools/text/xurls/default.nix +++ b/pkgs/tools/text/xurls/default.nix @@ -1,4 +1,4 @@ -{ buildGoPackage, lib, stdenv, fetchFromGitHub }: +{ buildGoPackage, lib, fetchFromGitHub }: buildGoPackage rec { version = "2.2.0"; diff --git a/pkgs/tools/text/zimreader/default.nix b/pkgs/tools/text/zimreader/default.nix index 0b947ee5db3..64e6bf60e35 100644 --- a/pkgs/tools/text/zimreader/default.nix +++ b/pkgs/tools/text/zimreader/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, automake, autoconf, libtool +{ lib, stdenv, fetchFromGitHub, fetchpatch, automake, autoconf, libtool , zimlib, cxxtools, tntnet }: @@ -31,8 +31,8 @@ stdenv.mkDerivation { meta = { description = "A tool to serve ZIM files using HTTP"; homepage = "http://git.wikimedia.org/log/openzim"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ robbinch juliendehos ]; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ robbinch juliendehos ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/tools/text/zimwriterfs/default.nix b/pkgs/tools/text/zimwriterfs/default.nix index 8362280c2fa..c2600ec46f6 100644 --- a/pkgs/tools/text/zimwriterfs/default.nix +++ b/pkgs/tools/text/zimwriterfs/default.nix @@ -1,10 +1,10 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoconf , automake , libtool -, pkgconfig +, pkg-config , file , icu @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { sha256 = "1vkrrq929a8s3m5rri1lg0l2vd0mc9n2fsb2z1g88k4n4j2l6f19"; }; - nativeBuildInputs = [ automake autoconf libtool pkgconfig ]; + nativeBuildInputs = [ automake autoconf libtool pkg-config ]; buildInputs = [ file icu gumbo lzma zimlib zlib xapian ]; setSourceRoot = '' sourceRoot=$(echo */zimwriterfs) @@ -36,8 +36,8 @@ stdenv.mkDerivation rec { meta = { description = "A console tool to create ZIM files"; homepage = "http://git.wikimedia.org/log/openzim"; - maintainers = with stdenv.lib.maintainers; [ robbinch ]; - license = stdenv.lib.licenses.gpl3; - platforms = with stdenv.lib.platforms; [ linux ]; + maintainers = with lib.maintainers; [ robbinch ]; + license = lib.licenses.gpl3; + platforms = with lib.platforms; [ linux ]; }; } diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix index 1bcd07aceb5..61af8102f51 100644 --- a/pkgs/tools/typesetting/asciidoc/default.nix +++ b/pkgs/tools/typesetting/asciidoc/default.nix @@ -1,5 +1,5 @@ -{ fetchurl, lib, stdenv, python2 - +{ fetchurl, lib, stdenv, python3 +, fetchFromGitHub, autoreconfHook , enableStandardFeatures ? false , sourceHighlight ? null , highlight ? null @@ -144,17 +144,20 @@ let in stdenv.mkDerivation rec { - name = "asciidoc-8.6.9"; + pname = "asciidoc"; + version = "9.0.4"; - src = fetchurl { - url = "mirror://sourceforge/asciidoc/${name}.tar.gz"; - sha256 = "1w71nk527lq504njmaf0vzr93pgahkgzzxzglrq6bay8cw2rvnvq"; + src = fetchFromGitHub { + owner = "asciidoc"; + repo = "asciidoc-py3"; + rev = version; + sha256 = "1gspxw5i0axymxdjzj5rmhf10gyl2gqr666gz141nv042l9dm5vi"; }; - buildInputs = [ python2 unzip ]; + nativeBuildInputs = [ python3 unzip autoreconfHook ]; # install filters early, so their shebangs are patched too - patchPhase = with stdenv.lib; '' + patchPhase = with lib; '' mkdir -p "$out/etc/asciidoc/filters" mkdir -p "$out/etc/asciidoc/backends" '' + optionalString _enableDitaaFilter '' @@ -212,7 +215,7 @@ stdenv.mkDerivation rec { # the odp backend already has that fix. Copy it here until fixed upstream. sed -i "s|'/etc/asciidoc/backends/odt/asciidoc.ott'|os.path.dirname(__file__),'asciidoc.ott'|" \ "$out/etc/asciidoc/backends/odt/a2x-backend.py" - '' + optionalString enableStandardFeatures '' + '' + (if enableStandardFeatures then '' sed -e "s|dot|${graphviz}/bin/dot|g" \ -e "s|neato|${graphviz}/bin/neato|g" \ -e "s|twopi|${graphviz}/bin/twopi|g" \ @@ -222,7 +225,8 @@ stdenv.mkDerivation rec { sed -e "s|run('latex|run('${texlive}/bin/latex|g" \ -e "s|cmd = 'dvipng'|cmd = '${texlive}/bin/dvipng'|g" \ - -i "filters/latex/latex2png.py" + -e "s|cmd = 'dvisvgm'|cmd = '${texlive}/bin/dvisvgm'|g" \ + -i "filters/latex/latex2img.py" sed -e "s|run('abc2ly|run('${lilypond}/bin/abc2ly|g" \ -e "s|run('lilypond|run('${lilypond}/bin/lilypond|g" \ @@ -239,7 +243,7 @@ stdenv.mkDerivation rec { # cannot find their neighbours (e.g. pdflatex doesn't find mktextfm). # We can remove PATH= when those impurities are fixed. # TODO: Is this still necessary when using texlive? - sed -e "s|^ENV =.*|ENV = dict(XML_CATALOG_FILES='${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook_xsl_ns}/xml/xsl/docbook/catalog.xml ${docbook_xsl}/xml/xsl/docbook/catalog.xml', PATH='${stdenv.lib.makeBinPath [ texlive coreutils gnused ]}')|" \ + sed -e "s|^ENV =.*|ENV = dict(XML_CATALOG_FILES='${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook_xsl_ns}/xml/xsl/docbook/catalog.xml ${docbook_xsl}/xml/xsl/docbook/catalog.xml', PATH='${lib.makeBinPath [ texlive coreutils gnused ]}')|" \ -e "s|^ASCIIDOC =.*|ASCIIDOC = '$out/bin/asciidoc'|" \ -e "s|^XSLTPROC =.*|XSLTPROC = '${libxslt.bin}/bin/xsltproc'|" \ -e "s|^DBLATEX =.*|DBLATEX = '${dblatexFull}/bin/dblatex'|" \ @@ -249,17 +253,19 @@ stdenv.mkDerivation rec { -e "s|^XMLLINT =.*|XMLLINT = '${libxml2.bin}/bin/xmllint'|" \ -e "s|^EPUBCHECK =.*|EPUBCHECK = 'nixpkgs_is_missing_epubcheck'|" \ -i a2x.py - '' + '' - for n in $(find "$out" . -name \*.py); do - sed -i -e "s,^#![[:space:]]*.*/bin/env python,#!${python2}/bin/python,g" "$n" - chmod +x "$n" - done + '' else '' + sed -e "s|^ENV =.*|ENV = dict(XML_CATALOG_FILES='${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook_xsl_ns}/xml/xsl/docbook/catalog.xml ${docbook_xsl}/xml/xsl/docbook/catalog.xml')|" \ + -e "s|^XSLTPROC =.*|XSLTPROC = '${libxslt.bin}/bin/xsltproc'|" \ + -e "s|^XMLLINT =.*|XMLLINT = '${libxml2.bin}/bin/xmllint'|" \ + -i a2x.py + '') + '' + patchShebangs . sed -i -e "s,/etc/vim,,g" Makefile.in ''; preInstall = "mkdir -p $out/etc/vim"; - makeFlags = stdenv.lib.optional stdenv.isCygwin "DESTDIR=/."; + makeFlags = lib.optional stdenv.isCygwin "DESTDIR=/."; meta = with lib; { description = "Text-based document generation system"; diff --git a/pkgs/tools/typesetting/asciidoctor/gemset.nix b/pkgs/tools/typesetting/asciidoctor/gemset.nix index db47fbf2285..db0f67d3a58 100644 --- a/pkgs/tools/typesetting/asciidoctor/gemset.nix +++ b/pkgs/tools/typesetting/asciidoctor/gemset.nix @@ -420,4 +420,4 @@ }; version = "1.5.1"; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/typesetting/biber/default.nix b/pkgs/tools/typesetting/biber/default.nix index ac0220cf561..992da3578e5 100644 --- a/pkgs/tools/typesetting/biber/default.nix +++ b/pkgs/tools/typesetting/biber/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, fetchpatch, perlPackages, shortenPerlShebang, texlive }: let - biberSource = stdenv.lib.head (builtins.filter (p: p.tlType == "source") texlive.biber.pkgs); + biberSource = lib.head (builtins.filter (p: p.tlType == "source") texlive.biber.pkgs); # perl 5.32.0 ships with U:C 1.27 UnicodeCollate_1_29 = perlPackages.buildPerlPackage rec { @@ -35,9 +35,9 @@ perlPackages.buildPerlModule { TestDifferences PerlIOutf8_strict ]; - nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.isDarwin '' shortenPerlShebang $out/bin/biber ''; diff --git a/pkgs/tools/typesetting/djvu2pdf/default.nix b/pkgs/tools/typesetting/djvu2pdf/default.nix index 4e76fb87a6b..e6c8f80f9d2 100644 --- a/pkgs/tools/typesetting/djvu2pdf/default.nix +++ b/pkgs/tools/typesetting/djvu2pdf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, fetchurl, djvulibre, ghostscript, which }: +{ lib, stdenv, makeWrapper, fetchurl, djvulibre, ghostscript, which }: stdenv.mkDerivation rec { version = "0.9.2"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin cp -p djvu2pdf $out/bin - wrapProgram $out/bin/djvu2pdf --prefix PATH : ${stdenv.lib.makeBinPath [ ghostscript djvulibre which ]} + wrapProgram $out/bin/djvu2pdf --prefix PATH : ${lib.makeBinPath [ ghostscript djvulibre which ]} mkdir -p $out/man/man1 cp -p djvu2pdf.1.gz $out/man/man1 @@ -22,9 +22,8 @@ stdenv.mkDerivation rec { meta = { description = "Convert DjVu files to PDF files"; - homepage = "https://0x2a.at/s/projects/djvu2pdf"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.all; - inherit version; + homepage = "https://0x2a.at/site/projects/djvu2pdf/"; + license = lib.licenses.gpl1Only; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/typesetting/docbook2odf/default.nix b/pkgs/tools/typesetting/docbook2odf/default.nix index b6b56e83688..91d8f6f8d32 100644 --- a/pkgs/tools/typesetting/docbook2odf/default.nix +++ b/pkgs/tools/typesetting/docbook2odf/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { sed -i "s|/usr/share/docbook2odf|$out/share/docbook2odf|" "$out/bin/docbook2odf" wrapProgram "$out/bin/docbook2odf" \ - --prefix PATH : "${stdenv.lib.makeBinPath [ zip libxslt ]}" \ + --prefix PATH : "${lib.makeBinPath [ zip libxslt ]}" \ --prefix PERL5PATH : "${perlPackages.makePerlPath [ perlPackages.PerlMagick ]}" ''; diff --git a/pkgs/tools/typesetting/docbookrx/gemset.nix b/pkgs/tools/typesetting/docbookrx/gemset.nix index 33a58845b22..bd756b996bb 100644 --- a/pkgs/tools/typesetting/docbookrx/gemset.nix +++ b/pkgs/tools/typesetting/docbookrx/gemset.nix @@ -20,4 +20,4 @@ }; version = "1.8.5"; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/typesetting/hevea/default.nix b/pkgs/tools/typesetting/hevea/default.nix index 97b020d3e21..ad6427e5622 100644 --- a/pkgs/tools/typesetting/hevea/default.nix +++ b/pkgs/tools/typesetting/hevea/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, ocamlPackages }: stdenv.mkDerivation rec { - name = "hevea-2.34"; + name = "hevea-2.35"; src = fetchurl { url = "http://pauillac.inria.fr/~maranget/hevea/distri/${name}.tar.gz"; - sha256 = "1pzyszxw90klpcmhjqrjfc8cw6c0gm4w2blim8ydyxb6rq6qml1s"; + sha256 = "sha256-8Ym62l0+WzWFXf39tbJwyZT8eiNmsBJQ12E1mtZsnss="; }; buildInputs = with ocamlPackages; [ ocaml ocamlbuild ]; diff --git a/pkgs/tools/typesetting/kindlegen/default.nix b/pkgs/tools/typesetting/kindlegen/default.nix index 60f58a361df..6afa246f818 100644 --- a/pkgs/tools/typesetting/kindlegen/default.nix +++ b/pkgs/tools/typesetting/kindlegen/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation { sourceRoot = "."; - nativeBuildInputs = stdenv.lib.optional (stdenv.lib.hasSuffix ".zip" url) unzip; + nativeBuildInputs = lib.optional (lib.hasSuffix ".zip" url) unzip; installPhase = '' mkdir -p $out/bin $out/share/kindlegen/doc diff --git a/pkgs/tools/typesetting/kramdown-asciidoc/gemset.nix b/pkgs/tools/typesetting/kramdown-asciidoc/gemset.nix index 8a0ffda9e78..0ade973304d 100644 --- a/pkgs/tools/typesetting/kramdown-asciidoc/gemset.nix +++ b/pkgs/tools/typesetting/kramdown-asciidoc/gemset.nix @@ -20,4 +20,4 @@ }; version = "1.0.1"; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/typesetting/lout/CVE-2019-19917-and-CVE-2019-19918.patch b/pkgs/tools/typesetting/lout/CVE-2019-19917-and-CVE-2019-19918.patch new file mode 100644 index 00000000000..b146822c9c5 --- /dev/null +++ b/pkgs/tools/typesetting/lout/CVE-2019-19917-and-CVE-2019-19918.patch @@ -0,0 +1,95 @@ +--- a/externs.h ++++ b/externs.h +@@ -260,6 +260,9 @@ If you're compiling this, you've got the + /* that can appear correctly on one page. Can be */ + /* increased to any small positive integer. */ + /* */ ++/* MAX_FORMAT The maximum number of characters for sscanf formats */ ++/* for splitting strings with tab-delimited fields. */ ++/* */ + /*****************************************************************************/ + + #define MAX_FULL_LENGTH 8388607 /* 2**23 - 1, about 148 metres */ +@@ -275,6 +278,7 @@ If you're compiling this, you've got the + #define MAX_LEX_STACK 20 + #define MAX_CHARS 256 + #define MAX_HCOPIES 3 ++#define MAX_FORMAT 100 + + /*****************************************************************************/ + /* */ +--- a/z02.c ++++ b/z02.c +@@ -378,7 +378,7 @@ static void srcnext(void) + if( blksize != 0 && chpt < limit ) + { debugcond0(DLA, DD, stack_free <= 1, "srcnext: transferring."); + col = buf; +- while( chtbl[(*--col = *--limit)] != NEWLINE ); ++ while( col > mem_block && chtbl[(*--col = *--limit)] != NEWLINE ); + frst = col + 1; limit++; blksize = 0; + } + +--- a/z33.c ++++ b/z33.c +@@ -847,6 +847,7 @@ BOOLEAN DbRetrieve(OBJECT db, BOOLEAN ga + BOOLEAN DbRetrieveNext(OBJECT db, BOOLEAN *gall, OBJECT *sym, FULL_CHAR *tag, + FULL_CHAR *seq, FILE_NUM *dfnum, long *dfpos, int *dlnum, long *cont) + { FULL_CHAR line[MAX_BUFF], *cline, fname[MAX_BUFF]; int symnum; ++ char format[MAX_FORMAT]; + ifdebug(DPP, D, ProfileOn("DbRetrieveNext")); + debug2(DBS, DD, "DbRetrieveNext( %s, %ld )", string(db), *cont); + assert(reading(db), "DbRetrieveNext: not reading"); +@@ -858,6 +859,8 @@ BOOLEAN DbRetrieveNext(OBJECT db, BOOLEA + return FALSE; + } + ++ sprintf(format, "%%d&%%%d[^\t]\t%%%d[^\t]\t%%*[^\t]\t%%ld\t%%d\t%%%d[^\n\f]", MAX_BUFF-1, MAX_BUFF-1, MAX_BUFF-1); ++ + if( in_memory(db) ) + { + /* get next entry from internal database */ +@@ -868,7 +871,7 @@ BOOLEAN DbRetrieveNext(OBJECT db, BOOLEA + } + cline = (FULL_CHAR *) db_lines(db)[*cont]; + *gall = (cline[0] == '0' ? 1 : 0); +- sscanf((char *)&cline[*gall], "%d&%[^\t]\t%[^\t]\t%*[^\t]\t%ld\t%d\t%[^\n\f]", ++ sscanf((char *)&cline[*gall], format, + &symnum, tag, seq, dfpos, dlnum, fname); + *cont = *cont + 1; + } +@@ -882,7 +885,7 @@ BOOLEAN DbRetrieveNext(OBJECT db, BOOLEA + return FALSE; + } + *gall = (line[0] == '0' ? 1 : 0); +- sscanf((char *)&line[*gall], "%d&%[^\t]\t%[^\t]\t%*[^\t]\t%ld\t%d\t%[^\n\f]", ++ sscanf((char *)&line[*gall], format, + &symnum, tag, seq, dfpos, dlnum, fname); + *cont = ftell(db_filep(db)); + } +--- a/z39.c ++++ b/z39.c +@@ -79,11 +79,13 @@ int strcollcmp(char *a, char *b) + int strcollcmp(char *a, char *b) + { char a1[MAX_BUFF], a2[MAX_BUFF], a3[MAX_BUFF]; + char b1[MAX_BUFF], b2[MAX_BUFF], b3[MAX_BUFF]; ++ char format[MAX_FORMAT]; + int order; ++ sprintf(format, "%%%d[^\t]\t%%%d[^\t]\t%%%d[^\t]", MAX_BUFF-1, MAX_BUFF-1, MAX_BUFF-1); + a1[0] = a2[0] = a3[0] = '\0'; +- sscanf(a, "%[^\t]\t%[^\t]\t%[^\t]", a1, a2, a3); ++ sscanf(a, format, a1, a2, a3); + b1[0] = b2[0] = b3[0] = '\0'; +- sscanf(b, "%[^\t]\t%[^\t]\t%[^\t]", b1, b2, b3); ++ sscanf(b, format, b1, b2, b3); + order = strcoll(a1, b1); + if( order == 0 ) + { +@@ -251,7 +253,7 @@ FULL_CHAR *StringQuotedWord(OBJECT x) + *q++ = CH_QUOTE; + for( p = string(x); *p != '\0'; p++ ) + { +- for( r = (FULL_CHAR *) quoted_string[*p]; *r != '\0'; *q++ = *r++ ); ++ for( r = (FULL_CHAR *) quoted_string[*p]; *r != '\0' && q < &buff[MAX_BUFF-2]; *q++ = *r++ ); + } + *q++ = CH_QUOTE; + *q++ = '\0'; diff --git a/pkgs/tools/typesetting/lout/default.nix b/pkgs/tools/typesetting/lout/default.nix index d86c4908f21..4737c5d7409 100644 --- a/pkgs/tools/typesetting/lout/default.nix +++ b/pkgs/tools/typesetting/lout/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ghostscript}: +{lib, stdenv, fetchurl, ghostscript}: stdenv.mkDerivation rec { name = "lout-3.40"; @@ -14,6 +14,11 @@ stdenv.mkDerivation rec { sha256 = "1gb8vb1wl7ikn269dd1c7ihqhkyrwk19jwx5kd0rdvbk6g7g25ix"; }; + patches = [ + # https://build.opensuse.org/request/show/843612 + ./CVE-2019-19917-and-CVE-2019-19918.patch + ]; + buildInputs = [ ghostscript ]; builder = ./builder.sh; @@ -44,9 +49,9 @@ stdenv.mkDerivation rec { # Wiki: https://sourceforge.net/p/lout/wiki/ homepage = "https://savannah.nongnu.org/projects/lout/"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; maintainers = [ ]; }; } diff --git a/pkgs/tools/typesetting/lowdown/default.nix b/pkgs/tools/typesetting/lowdown/default.nix index d6b92991340..40606199b83 100644 --- a/pkgs/tools/typesetting/lowdown/default.nix +++ b/pkgs/tools/typesetting/lowdown/default.nix @@ -1,24 +1,33 @@ -{ lib, stdenv, fetchurl, which }: +{ lib, stdenv, fetchurl, fixDarwinDylibNames, which }: stdenv.mkDerivation rec { pname = "lowdown"; - version = "0.7.5"; + version = "0.7.9"; - outputs = [ "out" "dev" ]; + outputs = [ "out" "lib" "dev" "man" ]; src = fetchurl { url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"; - sha512 = "1wfbrydbk0f0blhg5my3m5gw8bspwh3rdg4w4mcalnrwpypzd4zrggc4aj3zm72c5jikx6pnjb2k9w1s075k84f6q8p8chlzb3s4qd2"; + sha512 = "18q8i8lh8w127vzw697n0bzv4mchhna1p4s672hjvy39l3ls8rlj5nwq5npr5fry06yil62sjmq4652vw29r8l49wwk5j82a8l2nr7c"; }; - nativeBuildInputs = [ which ]; + nativeBuildInputs = [ which ] + ++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; configurePhase = '' ./configure PREFIX=''${!outputDev} \ BINDIR=''${!outputBin}/bin \ - MANDIR=''${!outputBin}/share/man + LIBDIR=''${!outputLib}/lib \ + MANDIR=''${!outputMan}/share/man ''; + # Fix lib extension so that fixDarwinDylibNames detects it + postInstall = lib.optionalString stdenv.isDarwin '' + mv $lib/lib/liblowdown.{so,dylib} + ''; + + patches = lib.optional (!stdenv.hostPlatform.isStatic) ./shared.patch; + meta = with lib; { homepage = "https://kristaps.bsd.lv/lowdown/"; description = "Simple markdown translator"; diff --git a/pkgs/tools/typesetting/lowdown/shared.patch b/pkgs/tools/typesetting/lowdown/shared.patch new file mode 100644 index 00000000000..ed9f266b3f9 --- /dev/null +++ b/pkgs/tools/typesetting/lowdown/shared.patch @@ -0,0 +1,41 @@ +diff --git a/Makefile b/Makefile +index 955f737..2c9532c 100644 +--- a/Makefile ++++ b/Makefile +@@ -80,7 +80,7 @@ REGRESS_ARGS += "--parse-no-autolink" + REGRESS_ARGS += "--parse-no-cmark" + REGRESS_ARGS += "--parse-no-deflists" + +-all: lowdown lowdown-diff lowdown.pc ++all: lowdown lowdown-diff liblowdown.so lowdown.pc + + www: $(HTMLS) $(PDFS) $(THUMBS) lowdown.tar.gz lowdown.tar.gz.sha512 + +@@ -101,6 +101,9 @@ lowdown-diff: lowdown + liblowdown.a: $(OBJS) $(COMPAT_OBJS) + $(AR) rs $@ $(OBJS) $(COMPAT_OBJS) + ++liblowdown.so: $(OBJS) $(COMPAT_OBJS) ++ $(CC) -shared -o $@ $(OBJS) $(COMPAT_OBJS) $(LDFLAGS) ++ + install: all + mkdir -p $(DESTDIR)$(BINDIR) + mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig +@@ -111,7 +114,7 @@ install: all + $(INSTALL_DATA) lowdown.pc $(DESTDIR)$(LIBDIR)/pkgconfig + $(INSTALL_PROGRAM) lowdown $(DESTDIR)$(BINDIR) + $(INSTALL_PROGRAM) lowdown-diff $(DESTDIR)$(BINDIR) +- $(INSTALL_LIB) liblowdown.a $(DESTDIR)$(LIBDIR) ++ $(INSTALL_LIB) liblowdown.so $(DESTDIR)$(LIBDIR) + $(INSTALL_DATA) lowdown.h $(DESTDIR)$(INCLUDEDIR) + for f in $(MANS) ; do \ + name=`basename $$f .html` ; \ +@@ -199,7 +202,7 @@ main.o: lowdown.h + + clean: + rm -f $(OBJS) $(COMPAT_OBJS) main.o +- rm -f lowdown lowdown-diff liblowdown.a lowdown.pc ++ rm -f lowdown lowdown-diff liblowdown.so lowdown.pc + rm -f index.xml diff.xml diff.diff.xml README.xml lowdown.tar.gz.sha512 lowdown.tar.gz + rm -f $(PDFS) $(HTMLS) $(THUMBS) + diff --git a/pkgs/tools/typesetting/mmark/default.nix b/pkgs/tools/typesetting/mmark/default.nix index be7d4c95833..bc5ddcc9d75 100644 --- a/pkgs/tools/typesetting/mmark/default.nix +++ b/pkgs/tools/typesetting/mmark/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "mmark"; @@ -19,8 +19,8 @@ buildGoPackage rec { meta = { description = "A powerful markdown processor in Go geared towards the IETF"; homepage = "https://github.com/miekg/mmark"; - license = with stdenv.lib.licenses; bsd2; - maintainers = with stdenv.lib.maintainers; [ yrashk ]; - platforms = stdenv.lib.platforms.unix; + license = with lib.licenses; bsd2; + maintainers = with lib.maintainers; [ yrashk ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/typesetting/multimarkdown/default.nix b/pkgs/tools/typesetting/multimarkdown/default.nix index 67c995f6c26..45be0709322 100644 --- a/pkgs/tools/typesetting/multimarkdown/default.nix +++ b/pkgs/tools/typesetting/multimarkdown/default.nix @@ -45,8 +45,8 @@ stdenv.mkDerivation { homepage = "https://fletcherpenney.net/multimarkdown/"; # licensed under GPLv2+ or MIT: # https://raw.githubusercontent.com/fletcher/MultiMarkdown-4/master/LICENSE - license = with stdenv.lib.licenses; [ gpl2Plus mit ]; + license = with lib.licenses; [ gpl2Plus mit ]; platforms = platforms.all; - maintainers = with stdenv.lib.maintainers; [ lowfatcomputing ]; + maintainers = with lib.maintainers; [ lowfatcomputing ]; }; } diff --git a/pkgs/tools/typesetting/odpdown/default.nix b/pkgs/tools/typesetting/odpdown/default.nix index 989f61f4592..7b20d230b9f 100644 --- a/pkgs/tools/typesetting/odpdown/default.nix +++ b/pkgs/tools/typesetting/odpdown/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pythonPackages, libreoffice }: +{ lib, fetchurl, pythonPackages, libreoffice }: pythonPackages.buildPythonApplication rec { diff --git a/pkgs/tools/typesetting/pdf2djvu/default.nix b/pkgs/tools/typesetting/pdf2djvu/default.nix index eb605ef8fab..370d54adde9 100644 --- a/pkgs/tools/typesetting/pdf2djvu/default.nix +++ b/pkgs/tools/typesetting/pdf2djvu/default.nix @@ -4,7 +4,7 @@ , autoreconfHook , gettext , libtool -, pkgconfig +, pkg-config , djvulibre , exiv2 , fontconfig @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { sha256 = "1igabfy3fd7qndihmkfk9incc15pjxpxh2cn5pfw5fxfwrpjrarn"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ djvulibre diff --git a/pkgs/tools/typesetting/pdfgrep/default.nix b/pkgs/tools/typesetting/pdfgrep/default.nix index e445cf78d7a..3c1fca9a7c9 100644 --- a/pkgs/tools/typesetting/pdfgrep/default.nix +++ b/pkgs/tools/typesetting/pdfgrep/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, poppler, libgcrypt, pcre, asciidoc }: +{ lib, stdenv, fetchurl, pkg-config, poppler, libgcrypt, pcre, asciidoc }: stdenv.mkDerivation rec { pname = "pdfgrep"; @@ -15,14 +15,14 @@ stdenv.mkDerivation rec { done ''; - nativeBuildInputs = [ pkgconfig asciidoc ]; + nativeBuildInputs = [ pkg-config asciidoc ]; buildInputs = [ poppler libgcrypt pcre ]; meta = { description = "Commandline utility to search text in PDF files"; homepage = "https://pdfgrep.org/"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ qknight fpletz ]; - platforms = with stdenv.lib.platforms; unix; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ qknight fpletz ]; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/tools/typesetting/pdfsandwich/default.nix b/pkgs/tools/typesetting/pdfsandwich/default.nix index de3cc7f64e8..10f8525da08 100644 --- a/pkgs/tools/typesetting/pdfsandwich/default.nix +++ b/pkgs/tools/typesetting/pdfsandwich/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { installPhase = '' mkdir -p $out/bin cp -p pdfsandwich $out/bin - wrapProgram $out/bin/pdfsandwich --prefix PATH : ${stdenv.lib.makeBinPath [ imagemagick ghostscript poppler_utils unpaper tesseract ]} + wrapProgram $out/bin/pdfsandwich --prefix PATH : ${lib.makeBinPath [ imagemagick ghostscript poppler_utils unpaper tesseract ]} mkdir -p $out/man/man1 cp -p pdfsandwich.1.gz $out/man/man1 diff --git a/pkgs/tools/typesetting/pdftk/legacy.nix b/pkgs/tools/typesetting/pdftk/legacy.nix index 5caafa054cf..3c4d042097f 100644 --- a/pkgs/tools/typesetting/pdftk/legacy.nix +++ b/pkgs/tools/typesetting/pdftk/legacy.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, gcj, unzip }: +{ fetchurl, lib, stdenv, gcj, unzip }: stdenv.mkDerivation { name = "pdftk-2.02"; @@ -35,9 +35,9 @@ stdenv.mkDerivation { meta = { description = "Simple tool for doing everyday things with PDF documents"; homepage = "https://www.pdflabs.com/tools/pdftk-server/"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [raskin]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [raskin]; + platforms = with lib.platforms; linux; broken = true; # Broken on Hydra since 2020-08-24 }; } diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix index e28fd9a7eaf..db4fb9d0f72 100644 --- a/pkgs/tools/typesetting/sile/default.nix +++ b/pkgs/tools/typesetting/sile/default.nix @@ -63,17 +63,17 @@ stdenv.mkDerivation rec { libiconv luaEnv ] - ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.AppKit + ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.AppKit ; checkInputs = [ poppler_utils ]; - preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.isDarwin '' sed -i -e 's|@import AppKit;|#import <AppKit/AppKit.h>|' src/macfonts.m ''; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-framework AppKit"; + NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework AppKit"; FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - preBuild = stdenv.lib.optionalString stdenv.cc.isClang '' + preBuild = lib.optionalString stdenv.cc.isClang '' substituteInPlace libtexpdf/dpxutil.c \ --replace "ASSERT(ht && ht->table && iter);" "ASSERT(ht && iter);" ''; diff --git a/pkgs/tools/typesetting/skribilo/default.nix b/pkgs/tools/typesetting/skribilo/default.nix index 0e90e1cf614..755909f2b33 100644 --- a/pkgs/tools/typesetting/skribilo/default.nix +++ b/pkgs/tools/typesetting/skribilo/default.nix @@ -1,6 +1,6 @@ -{ stdenv +{ lib, stdenv , fetchurl -, pkgconfig +, pkg-config , gettext , guile , guile-reader @@ -18,7 +18,7 @@ let pname = "skribilo"; version = "0.9.5"; - inherit (stdenv.lib) optional; + inherit (lib) optional; in stdenv.mkDerivation { inherit pname version; @@ -27,7 +27,7 @@ in stdenv.mkDerivation { sha256 = "sha256-AIJqIcRjT7C0EO6J60gGjERdgAglh0ZU49U9XKPwvwk="; }; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ gettext guile ploticus imagemagick ghostscript transfig ] ++ optional enableEmacs emacs @@ -42,7 +42,7 @@ in stdenv.mkDerivation { --prefix GUILE_LOAD_COMPILED_PATH : "$out/share/guile/site:${guile-lib}/share/guile/site:${guile-reader}/share/guile/site" ''; - meta = with stdenv.lib;{ + meta = with lib;{ description = "The Ultimate Document Programming Framework"; longDescription = '' Skribilo is a free document production tool that takes a diff --git a/pkgs/tools/typesetting/sshlatex/default.nix b/pkgs/tools/typesetting/sshlatex/default.nix index 663f12611b1..07c972420ab 100644 --- a/pkgs/tools/typesetting/sshlatex/default.nix +++ b/pkgs/tools/typesetting/sshlatex/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper ]; installPhase = let - binPath = stdenv.lib.makeBinPath [ openssh perl gnutar bash inotify-tools ]; + binPath = lib.makeBinPath [ openssh perl gnutar bash inotify-tools ]; in '' mkdir -p $out/bin cp sshlatex $out/bin @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { purely local setting. ''; homepage = "https://github.com/iblech/sshlatex"; - license = stdenv.lib.licenses.gpl3Plus; # actually dual-licensed gpl3Plus | lppl13cplus - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl3Plus; # actually dual-licensed gpl3Plus | lppl13cplus + platforms = lib.platforms.all; maintainers = [ maintainers.iblech ]; }; } diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix index f22840e2d86..75874d21e87 100644 --- a/pkgs/tools/typesetting/tectonic/default.nix +++ b/pkgs/tools/typesetting/tectonic/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, rustPlatform -, darwin, fontconfig, harfbuzz, openssl, pkgconfig }: +, darwin, fontconfig, harfbuzz, openssl, pkg-config }: rustPlatform.buildRustPackage rec { pname = "tectonic"; @@ -14,12 +14,12 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0jzngl1iwrq20cx3l0mwdrrddvyw977rwb75nz1k4hkxjnicc1ga"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ fontconfig harfbuzz openssl ] - ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Cocoa Foundation ]); + ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Cocoa Foundation ]); - postInstall = stdenv.lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.isLinux '' install -D dist/appimage/tectonic.desktop -t $out/share/applications/ install -D dist/appimage/tectonic.svg -t $out/share/icons/hicolor/scalable/apps/ ''; diff --git a/pkgs/tools/typesetting/ted/default.nix b/pkgs/tools/typesetting/ted/default.nix index 0fc2427588f..937e3ffd7d7 100644 --- a/pkgs/tools/typesetting/ted/default.nix +++ b/pkgs/tools/typesetting/ted/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, zlib, pcre, xorg, libjpeg, libtiff, libpng, gtk2, libpaper, makeWrapper, ghostscript }: +{ lib, stdenv, fetchurl, pkg-config, zlib, pcre, xorg, libjpeg, libtiff, libpng, gtk2, libpaper, makeWrapper, ghostscript }: stdenv.mkDerivation rec { pname = "ted"; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { pushd $out/share/Ted/examples for f in rtf2*.sh do - makeWrapper "$PWD/$f" "$out/bin/$f" --prefix PATH : $out/bin:${stdenv.lib.makeBinPath [ ghostscript ]} + makeWrapper "$PWD/$f" "$out/bin/$f" --prefix PATH : $out/bin:${lib.makeBinPath [ ghostscript ]} done popd @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - buildInputs = [ pkgconfig zlib pcre xorg.xlibsWrapper xorg.libXpm libjpeg libtiff libpng gtk2 libpaper makeWrapper ]; + buildInputs = [ pkg-config zlib pcre xorg.xlibsWrapper xorg.libXpm libjpeg libtiff libpng gtk2 libpaper makeWrapper ]; meta = with lib; { description = "An easy rich text processor"; diff --git a/pkgs/tools/typesetting/tex/auctex/default.nix b/pkgs/tools/typesetting/tex/auctex/default.nix index 38a33313249..6a9a2cb464c 100644 --- a/pkgs/tools/typesetting/tex/auctex/default.nix +++ b/pkgs/tools/typesetting/tex/auctex/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, emacs, texlive, ghostscript }: - +{ lib, stdenv, fetchurl, emacs, texlive, ghostscript }: + let auctex = stdenv.mkDerivation ( rec { version = "12.3"; @@ -30,8 +30,8 @@ let auctex = stdenv.mkDerivation ( rec { meta = { description = "Extensible package for writing and formatting TeX files in GNU Emacs and XEmacs"; homepage = "https://www.gnu.org/software/auctex"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.gpl3; + platforms = lib.platforms.unix; + license = lib.licenses.gpl3; }; }); diff --git a/pkgs/tools/typesetting/tex/dblatex/default.nix b/pkgs/tools/typesetting/tex/dblatex/default.nix index 1f6939e1b11..989f49b6d9a 100644 --- a/pkgs/tools/typesetting/tex/dblatex/default.nix +++ b/pkgs/tools/typesetting/tex/dblatex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python2, libxslt, texlive +{ lib, stdenv, fetchurl, python2, libxslt, texlive , enableAllFeatures ? false, imagemagick ? null, transfig ? null, inkscape ? null, fontconfig ? null, ghostscript ? null , tex ? texlive.combine { # satisfy all packages that ./configure mentions @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { }; buildInputs = [ python2 libxslt tex ] - ++ stdenv.lib.optionals enableAllFeatures [ imagemagick transfig ]; + ++ lib.optionals enableAllFeatures [ imagemagick transfig ]; # TODO: dblatex tries to execute texindy command, but nixpkgs doesn't have # that yet. In Ubuntu, texindy is a part of the xindy package. preConfigure = '' sed -i 's|self.install_layout == "deb"|False|' setup.py - '' + stdenv.lib.optionalString enableAllFeatures '' + '' + lib.optionalString enableAllFeatures '' for file in $(find -name "*.py"); do sed -e 's|cmd = \["xsltproc|cmd = \["${libxslt.bin}/bin/xsltproc|g' \ -e 's|Popen(\["xsltproc|Popen(\["${libxslt.bin}/bin/xsltproc|g' \ @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { meta = { description = "A program to convert DocBook to DVI, PostScript or PDF via LaTeX or ConTeXt"; homepage = "http://dblatex.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/typesetting/tex/latexrun/default.nix b/pkgs/tools/typesetting/tex/latexrun/default.nix index 392edfc3a2f..3a163a5682d 100644 --- a/pkgs/tools/typesetting/tex/latexrun/default.nix +++ b/pkgs/tools/typesetting/tex/latexrun/default.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, fetchFromGitHub, python3 }: +{ lib, stdenvNoCC, fetchFromGitHub, python3 }: stdenvNoCC.mkDerivation { pname = "latexrun"; @@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation { chmod +x $out/bin/latexrun ''; - meta = with stdenvNoCC.lib; { + meta = with lib; { description = "A 21st century LaTeX wrapper"; homepage = "https://github.com/aclements/latexrun"; license = licenses.mit; diff --git a/pkgs/tools/typesetting/tex/pplatex/default.nix b/pkgs/tools/typesetting/tex/pplatex/default.nix index d59ab8a2a90..1a0293255d8 100644 --- a/pkgs/tools/typesetting/tex/pplatex/default.nix +++ b/pkgs/tools/typesetting/tex/pplatex/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, pcre }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, pcre }: stdenv.mkDerivation { pname = "pplatex"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0wrkkbz6b6x91650nm8gccz7xghlp7b1i31fxwalz9xw3py9xygb"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ pcre ]; diff --git a/pkgs/tools/typesetting/tex/tetex/default.nix b/pkgs/tools/typesetting/tex/tetex/default.nix index db0a4c01602..0f6bf5d0d55 100644 --- a/pkgs/tools/typesetting/tex/tetex/default.nix +++ b/pkgs/tools/typesetting/tex/tetex/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; # fixes "error: conflicting types for 'calloc'", etc. - preBuild = stdenv.lib.optionalString stdenv.isDarwin '' + preBuild = lib.optionalString stdenv.isDarwin '' sed -i 57d texk/kpathsea/c-std.h ''; @@ -35,7 +35,7 @@ stdenv.mkDerivation { "--without-oxdvik" "--without-texinfo" "--without-texi2html" "--with-system-zlib" "--with-system-pnglib" "--with-system-ncurses" ] # couldn't get gsftopk working on darwin - ++ stdenv.lib.optional stdenv.isDarwin "--without-gsftopk"; + ++ lib.optional stdenv.isDarwin "--without-gsftopk"; postUnpack = '' mkdir -p $out/share/texmf diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index 3b09bc4a55a..fd1815efa94 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -2,7 +2,7 @@ , texlive , zlib, libiconv, libpng, libX11 , freetype, gd, libXaw, icu, ghostscript, libXpm, libXmu, libXext -, perl, perlPackages, python2Packages, pkgconfig +, perl, perlPackages, python3Packages, pkg-config , poppler, libpaper, graphite2, zziplib, harfbuzz, potrace, gmp, mpfr , brotli, cairo, pixman, xorg, clisp, biber, woff2, xxHash , makeWrapper, shortenPerlShebang @@ -71,7 +71,7 @@ core = stdenv.mkDerivation rec { outputs = [ "out" "doc" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ /*teckit*/ zziplib poppler mpfr gmp pixman gd freetype libpng libpaper zlib @@ -145,7 +145,7 @@ core = stdenv.mkDerivation rec { meta = with lib; { description = "Basic binaries for TeX Live"; homepage = "http://www.tug.org/texlive"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; maintainers = with maintainers; [ vcunat veprbl lovek323 raskin jwiegley ]; platforms = platforms.all; }; @@ -169,13 +169,13 @@ core-big = stdenv.mkDerivation { #TODO: upmendex ++ map (prog: "--disable-${prog}") # don't build things we already have ([ "tex" "ptex" "eptex" "uptex" "euptex" "aleph" "pdftex" "web-progs" "synctex" - ] ++ stdenv.lib.optionals (!withLuaJIT) [ "luajittex" "luajithbtex" "mfluajit" ]); + ] ++ lib.optionals (!withLuaJIT) [ "luajittex" "luajithbtex" "mfluajit" ]); configureScript = ":"; # we use static libtexlua, because it's only used by a single binary postConfigure = let - luajit = stdenv.lib.optionalString withLuaJIT ",luajit"; + luajit = lib.optionalString withLuaJIT ",luajit"; in '' mkdir ./WorkDir && cd ./WorkDir for path in libs/{teckit,lua53${luajit}} texk/web2c; do @@ -220,7 +220,7 @@ core-big = stdenv.mkDerivation { #TODO: upmendex mv "$out/bin"/{luatex,texlua,texluac} "$luatex/bin/" mv "$out/bin"/luahbtex "$luahbtex/bin/" mv "$out/bin"/xetex "$xetex/bin/" - '' + stdenv.lib.optionalString withLuaJIT '' + '' + lib.optionalString withLuaJIT '' mv "$out/bin"/mfluajit{,-nowin} "$mflua/bin/" mv "$out/bin"/{luajittex,luajithbtex,texluajit,texluajitc} "$luajittex/bin/" '' ; @@ -233,7 +233,7 @@ chktex = stdenv.mkDerivation { inherit (common) src; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ core/*kpathsea*/ ]; preConfigure = "cd texk/chktex"; @@ -257,7 +257,7 @@ dvisvgm = stdenv.mkDerivation rec { sha256 = "12b6h0h8rc487yjh3sq9zsdabm9cs2vqcrb0znnfi8277f87zf3j"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ core/*kpathsea*/ brotli ghostscript zlib freetype woff2 potrace xxHash ]; enableParallelBuilding = true; @@ -270,7 +270,7 @@ dvipng = stdenv.mkDerivation { inherit (common) src; - nativeBuildInputs = [ perl pkgconfig ]; + nativeBuildInputs = [ perl pkg-config ]; buildInputs = [ core/*kpathsea*/ zlib libpng freetype gd ghostscript makeWrapper ]; preConfigure = '' @@ -294,11 +294,11 @@ latexindent = perlPackages.buildPerlPackage rec { pname = "latexindent"; inherit (src) version; - src = stdenv.lib.head (builtins.filter (p: p.tlType == "run") texlive.latexindent.pkgs); + src = lib.head (builtins.filter (p: p.tlType == "run") texlive.latexindent.pkgs); outputs = [ "out" ]; - nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; propagatedBuildInputs = with perlPackages; [ FileHomeDir LogDispatch LogLog4perl UnicodeLineBreak YAMLTiny ]; postPatch = '' @@ -315,19 +315,19 @@ latexindent = perlPackages.buildPerlPackage rec { install -D ./scripts/latexindent/latexindent.pl "$out"/bin/latexindent mkdir -p "$out"/${perl.libPrefix} cp -r ./scripts/latexindent/LatexIndent "$out"/${perl.libPrefix}/ - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' shortenPerlShebang "$out"/bin/latexindent ''; }; -pygmentex = python2Packages.buildPythonApplication rec { +pygmentex = python3Packages.buildPythonApplication rec { pname = "pygmentex"; inherit (src) version; - src = stdenv.lib.head (builtins.filter (p: p.tlType == "run") texlive.pygmentex.pkgs); + src = lib.head (builtins.filter (p: p.tlType == "run") texlive.pygmentex.pkgs); - propagatedBuildInputs = with python2Packages; [ pygments chardet ]; + propagatedBuildInputs = with python3Packages; [ pygments chardet ]; dontBuild = true; @@ -361,7 +361,7 @@ pygmentex = python2Packages.buildPythonApplication rec { texlinks = stdenv.mkDerivation rec { name = "texlinks.sh"; - src = stdenv.lib.head (builtins.filter (p: p.tlType == "run") texlive.texlive-scripts-extra.pkgs); + src = lib.head (builtins.filter (p: p.tlType == "run") texlive.texlive-scripts-extra.pkgs); dontBuild = true; doCheck = false; @@ -387,7 +387,7 @@ bibtex8 = stdenv.mkDerivation { inherit (common) src; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ core/*kpathsea*/ icu ]; preConfigure = "cd texk/bibtex-x"; @@ -405,7 +405,7 @@ xdvi = stdenv.mkDerivation { inherit (common) src; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ core/*kpathsea*/ freetype ghostscript ] ++ (with xorg; [ libX11 libXaw libXi libXpm libXmu libXaw libXext libXfixes ]); @@ -425,7 +425,7 @@ xdvi = stdenv.mkDerivation { } # un-indented -// stdenv.lib.optionalAttrs (!clisp.meta.broken) # broken on aarch64 and darwin (#20062) +// lib.optionalAttrs (!clisp.meta.broken) # broken on aarch64 and darwin (#20062) { xindy = stdenv.mkDerivation { @@ -446,7 +446,7 @@ xindy = stdenv.mkDerivation { ''; nativeBuildInputs = [ - pkgconfig perl + pkg-config perl (texlive.combine { inherit (texlive) scheme-basic cyrillic ec; }) ]; buildInputs = [ clisp libiconv ]; diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix index bf7b7952f51..9993263c1f6 100644 --- a/pkgs/tools/typesetting/tex/texlive/combine.nix +++ b/pkgs/tools/typesetting/tex/texlive/combine.nix @@ -29,7 +29,7 @@ let [ "de-macro" "pythontex" "dviasm" "texliveonfly" ]; pkgNeedsRuby = pkg: pkg.tlType == "run" && pkg.pname == "match-parens"; extraInputs = - lib.optional (lib.any pkgNeedsPython splitBin.wrong) python + lib.optional (lib.any pkgNeedsPython splitBin.wrong) python3 ++ lib.optional (lib.any pkgNeedsRuby splitBin.wrong) ruby; }; diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index cc30024ca0f..72b54f5ebef 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -4,7 +4,7 @@ */ { stdenv, lib, fetchurl, runCommand, writeText, buildEnv , callPackage, ghostscriptX, harfbuzz, poppler_min -, makeWrapper, python, ruby, perl +, makeWrapper, python3, ruby, perl , useFixedHashes ? true , recurseIntoAttrs }: @@ -25,7 +25,7 @@ let # function for creating a working environment from a set of TL packages combine = import ./combine.nix { inherit bin combinePkgs buildEnv lib makeWrapper writeText - stdenv python ruby perl; + stdenv python3 ruby perl; ghostscript = ghostscriptX; # could be without X, probably, but we use X above }; diff --git a/pkgs/tools/typesetting/tikzit/default.nix b/pkgs/tools/typesetting/tikzit/default.nix index 29fd21ed31f..2f6d169d0cb 100644 --- a/pkgs/tools/typesetting/tikzit/default.nix +++ b/pkgs/tools/typesetting/tikzit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, qttools, qtbase, poppler, flex, bison }: +{ lib, mkDerivation, fetchFromGitHub, qmake, qttools, qtbase, poppler, flex, bison }: mkDerivation { pname = "tikzit"; diff --git a/pkgs/tools/typesetting/xmlroff/default.nix b/pkgs/tools/typesetting/xmlroff/default.nix index d214b24b80b..61355910d59 100644 --- a/pkgs/tools/typesetting/xmlroff/default.nix +++ b/pkgs/tools/typesetting/xmlroff/default.nix @@ -6,7 +6,7 @@ , pango , pangoxsl , perl -, pkgconfig +, pkg-config , popt }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { sha256 = "0dgp72094lx9i9gvg21pp8ak7bg39707rdf6wz011p9s6n6lrq5g"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libxml2 libxslt diff --git a/pkgs/tools/typesetting/xmlto/default.nix b/pkgs/tools/typesetting/xmlto/default.nix index 31b260d846c..73007b13719 100644 --- a/pkgs/tools/typesetting/xmlto/default.nix +++ b/pkgs/tools/typesetting/xmlto/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, libxml2, libxslt +{ fetchurl, lib, stdenv, libxml2, libxslt , docbook_xml_dtd_45, docbook_xsl, w3m , bash, getopt, makeWrapper }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram "$out/bin/xmlto" \ - --prefix PATH : "${stdenv.lib.makeBinPath [ libxslt libxml2 getopt ]}" + --prefix PATH : "${lib.makeBinPath [ libxslt libxml2 getopt ]}" # `w3m' is needed for HTML to text conversions. substituteInPlace "$out/share/xmlto/format/docbook/txt" \ @@ -45,8 +45,8 @@ stdenv.mkDerivation rec { necessary post-processing. ''; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; homepage = "https://fedorahosted.org/xmlto/"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/video/atomicparsley/default.nix b/pkgs/tools/video/atomicparsley/default.nix index 7f3bdcb1bd6..41d4dd63d58 100644 --- a/pkgs/tools/video/atomicparsley/default.nix +++ b/pkgs/tools/video/atomicparsley/default.nix @@ -2,19 +2,19 @@ stdenv.mkDerivation rec { pname = "atomicparsley"; - version = "20200701.154658.b0d6223"; + version = "20210114.184825.1dbe1be"; src = fetchFromGitHub { owner = "wez"; repo = pname; rev = version; - sha256 = "sha256-EHO4WkxoAXUhuJKMNYmBbGfOgtO9uklzXtWS4QsV1c8="; + sha256 = "sha256-dyrfr3bsRzEWaAr9K+7SchFVl63cZawyIjmstOI9e5I="; }; nativeBuildInputs = [ cmake ]; buildInputs = [ zlib ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ]; + ++ lib.optionals stdenv.isDarwin [ Cocoa ]; installPhase = '' runHook preInstall diff --git a/pkgs/tools/video/dvgrab/default.nix b/pkgs/tools/video/dvgrab/default.nix index 7f9be8bb616..18088eb6c30 100644 --- a/pkgs/tools/video/dvgrab/default.nix +++ b/pkgs/tools/video/dvgrab/default.nix @@ -1,5 +1,5 @@ { fetchFromGitHub, lib, stdenv, libunwind, libraw1394, libjpeg, libiec61883, libdv -, libavc1394, pkgconfig, autoreconfHook }: +, libavc1394, pkg-config, autoreconfHook }: stdenv.mkDerivation { name = "dvgrab-2016-05-16"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { ]; nativeBuildInputs = [ - autoreconfHook pkgconfig + autoreconfHook pkg-config ]; meta = with lib; { diff --git a/pkgs/tools/video/gopro/default.nix b/pkgs/tools/video/gopro/default.nix index 9aa20a786dd..ff2889b9b91 100644 --- a/pkgs/tools/video/gopro/default.nix +++ b/pkgs/tools/video/gopro/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { install -Dm755 gopro -t $out/bin wrapProgram $out/bin/gopro \ - --prefix PATH ":" "${stdenv.lib.makeBinPath [ ffmpeg_3 imagemagick mplayer ]}" + --prefix PATH ":" "${lib.makeBinPath [ ffmpeg_3 imagemagick mplayer ]}" runHook postInstall ''; diff --git a/pkgs/tools/video/mjpegtools/default.nix b/pkgs/tools/video/mjpegtools/default.nix index 801d8c564c1..45f63dc7727 100644 --- a/pkgs/tools/video/mjpegtools/default.nix +++ b/pkgs/tools/video/mjpegtools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, gtk2, libdv, libjpeg, libpng, libX11, pkgconfig, SDL, SDL_gfx +{ stdenv, lib, fetchurl, gtk2, libdv, libjpeg, libpng, libX11, pkg-config, SDL, SDL_gfx , withMinimal ? true }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libdv libjpeg libpng ] ++ lib.optionals (!withMinimal) [ gtk2 libX11 SDL SDL_gfx ]; diff --git a/pkgs/tools/video/rav1e/default.nix b/pkgs/tools/video/rav1e/default.nix index ae300f47b19..ca3fd72e878 100644 --- a/pkgs/tools/video/rav1e/default.nix +++ b/pkgs/tools/video/rav1e/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "rav1e"; - version = "0.4.0-alpha"; + version = "0.4.0"; src = stdenv.mkDerivation rec { name = "${pname}-${version}-source"; @@ -11,12 +11,12 @@ rustPlatform.buildRustPackage rec { owner = "xiph"; repo = "rav1e"; rev = "v${version}"; - sha256 = "1fw1gxi8330kfhl9hfzpn0lcmyn5604lc74d6g6iadzz2hmv4mb9"; + sha256 = "09w4476x6bdmh9pv4lchrzvfvbjvxxraa9f4dlbwgli89lcg9fcf"; }; cargoLock = fetchurl { - url = "https://github.com/xiph/rav1e/releases/download/v0.4.0-alpha/Cargo.lock"; - sha256 = "002s2wlzpifn5p2ahdrjdkjl48c1wr6fslg0if4gf9qpl8qj05fl"; + url = "https://github.com/xiph/rav1e/releases/download/v${version}/Cargo.lock"; + sha256 = "0rkyi010z6qmwdpvzlzyrrhs8na929g11lszhbqx5y0gh3y5nyik"; }; installPhase = '' @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "1i5ldqb77rrhfxxf9krp7f6yj3h6rsqak6hf23fd2znhgmi7psb1"; + cargoSha256 = "1iza2cws28hd4a3q90mc90l8ql4bsgapdznfr6bl65cjam43i5sg"; nativeBuildInputs = [ nasm cargo-c ]; postBuild = '' diff --git a/pkgs/tools/video/rtmpdump/default.nix b/pkgs/tools/video/rtmpdump/default.nix index 06c035552e5..3f71f8abc5a 100644 --- a/pkgs/tools/video/rtmpdump/default.nix +++ b/pkgs/tools/video/rtmpdump/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, fetchpatch, zlib +{ lib, stdenv, fetchgit, fetchpatch, zlib , gnutlsSupport ? false, gnutls ? null, nettle ? null , opensslSupport ? true, openssl ? null }: @@ -8,7 +8,7 @@ assert (gnutlsSupport || opensslSupport); assert gnutlsSupport -> gnutlsSupport != null && nettle != null && !opensslSupport; assert opensslSupport -> openssl != null && !gnutlsSupport; -with stdenv.lib; +with lib; stdenv.mkDerivation { pname = "rtmpdump"; version = "2019-03-30"; @@ -28,7 +28,7 @@ stdenv.mkDerivation { }) ]; - makeFlags = [ ''prefix=$(out)'' ] + makeFlags = [ "prefix=$(out)" ] ++ optional gnutlsSupport "CRYPTO=GNUTLS" ++ optional opensslSupport "CRYPTO=OPENSSL" ++ optional stdenv.isDarwin "SYS=darwin" diff --git a/pkgs/tools/video/svt-av1/default.nix b/pkgs/tools/video/svt-av1/default.nix index 38c16fadcb8..69ded2307de 100644 --- a/pkgs/tools/video/svt-av1/default.nix +++ b/pkgs/tools/video/svt-av1/default.nix @@ -15,8 +15,23 @@ stdenv.mkDerivation rec { meta = with lib; { description = "AV1-compliant encoder/decoder library core"; - homepage = "https://github.com/AOMediaCodec/SVT-AV1"; - license = licenses.bsd2; + longDescription = '' + The Scalable Video Technology for AV1 (SVT-AV1 Encoder and Decoder) is an + AV1-compliant encoder/decoder library core. The SVT-AV1 encoder + development is a work-in-progress targeting performance levels applicable + to both VOD and Live encoding / transcoding video applications. The + SVT-AV1 decoder implementation is targeting future codec research + activities. + ''; + inherit (src.meta) homepage; + changelog = "https://github.com/AOMediaCodec/SVT-AV1/blob/v${version}/CHANGELOG.md"; + license = with licenses; [ + bsd2 + { + fullName = "Alliance for Open Media Patent License 1.0"; + url = "https://aomedia.org/license/patent-license/"; + } + ]; platforms = platforms.unix; broken = stdenv.isAarch64; # undefined reference to `cpuinfo_arm_linux_init' maintainers = with maintainers; [ chiiruno ]; diff --git a/pkgs/tools/video/swfmill/default.nix b/pkgs/tools/video/swfmill/default.nix index b675c1a57c2..c5e777f7531 100644 --- a/pkgs/tools/video/swfmill/default.nix +++ b/pkgs/tools/video/swfmill/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl -, pkgconfig, libxslt, freetype, libpng, libxml2 +{ lib, stdenv, fetchurl +, pkg-config, libxslt, freetype, libpng, libxml2 }: stdenv.mkDerivation rec { @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { # Fixes build with GCC 6 NIX_CFLAGS_COMPILE = "-std=c++03"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxslt freetype libpng libxml2 ]; meta = { description = "An xml2swf and swf2xml processor with import functionalities"; homepage = "http://swfmill.org"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/video/swftools/default.nix b/pkgs/tools/video/swftools/default.nix index a37f58937b8..cd3af661840 100644 --- a/pkgs/tools/video/swftools/default.nix +++ b/pkgs/tools/video/swftools/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, freetype, libjpeg, libungif, zlib }: +{ lib, stdenv, fetchurl, freetype, libjpeg, libungif, zlib }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "swftools"; version = "0.9.2"; @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { homepage = "http://www.swftools.org/about.html"; license = licenses.gpl2; maintainers = [ maintainers.koral ]; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/video/untrunc-anthwlock/default.nix b/pkgs/tools/video/untrunc-anthwlock/default.nix index 632f8c41463..4b950fd0f22 100644 --- a/pkgs/tools/video/untrunc-anthwlock/default.nix +++ b/pkgs/tools/video/untrunc-anthwlock/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "14i2lq68q990hnm2kkfamlsi67bcml85zl8yjsyxc5h8ncc2f3dp"; }; - + buildInputs = [ ffmpeg libui ]; postBuild = '' diff --git a/pkgs/tools/video/vnc2flv/default.nix b/pkgs/tools/video/vnc2flv/default.nix index ed2d872b874..88ec2f22b89 100644 --- a/pkgs/tools/video/vnc2flv/default.nix +++ b/pkgs/tools/video/vnc2flv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pythonPackages }: +{ lib, fetchurl, pythonPackages }: pythonPackages.buildPythonApplication rec { pname = "vnc2flv"; @@ -15,6 +15,6 @@ pythonPackages.buildPythonApplication rec { meta = { description = "Tool to record VNC sessions to Flash Video"; homepage = "http://www.unixuser.org/~euske/python/vnc2flv/"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; } diff --git a/pkgs/tools/video/vncrec/default.nix b/pkgs/tools/video/vncrec/default.nix index 98b644a633c..5a60fc4c5d2 100644 --- a/pkgs/tools/video/vncrec/default.nix +++ b/pkgs/tools/video/vncrec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, xorgproto, imake, gccmakedep, libXt, libXmu +{ lib, stdenv, fetchurl, libX11, xorgproto, imake, gccmakedep, libXt, libXmu , libXaw, libXext, libSM, libICE, libXpm, libXp }: @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = { description = "VNC recorder"; homepage = "http://ronja.twibright.com/utils/vncrec/"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/tools/virtualization/awless/default.nix b/pkgs/tools/virtualization/awless/default.nix index 3faf90ab4ac..061dd486e0d 100644 --- a/pkgs/tools/virtualization/awless/default.nix +++ b/pkgs/tools/virtualization/awless/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "awless"; diff --git a/pkgs/tools/virtualization/aws/default.nix b/pkgs/tools/virtualization/aws/default.nix index 57aae0c695f..4766be90a6d 100644 --- a/pkgs/tools/virtualization/aws/default.nix +++ b/pkgs/tools/virtualization/aws/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, curl }: +{ lib, stdenv, fetchurl, perl, curl }: stdenv.mkDerivation { name = "aws-1.75"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { homepage = "https://www.timkay.com/aws/"; description = "Command-line utility for working with Amazon EC2, S3, SQS, ELB, IAM and SDB"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix index fa8e96def24..796ea36eacf 100644 --- a/pkgs/tools/virtualization/awsebcli/default.nix +++ b/pkgs/tools/virtualization/awsebcli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3, glibcLocales }: +{ lib, python3, glibcLocales }: let localPython = python3.override { diff --git a/pkgs/tools/virtualization/cri-tools/default.nix b/pkgs/tools/virtualization/cri-tools/default.nix index cdb156f3121..a70eb45b067 100644 --- a/pkgs/tools/virtualization/cri-tools/default.nix +++ b/pkgs/tools/virtualization/cri-tools/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "cri-tools"; - version = "1.19.0"; + version = "1.20.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; rev = "v${version}"; - sha256 = "0dx21ws4nzzizzjb0g172fzvjgwck88ikr5c2av08ii06rys1567"; + sha256 = "sha256-fU3g0m2drUsa2Jyz+QYXi4xWTOLINGsDw3dKcesAkkE="; }; vendorSha256 = null; diff --git a/pkgs/tools/virtualization/distrobuilder/default.nix b/pkgs/tools/virtualization/distrobuilder/default.nix index ccdd80fb37c..d06a2b4a17e 100644 --- a/pkgs/tools/virtualization/distrobuilder/default.nix +++ b/pkgs/tools/virtualization/distrobuilder/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, pkgconfig, buildGoPackage, fetchFromGitHub +{ lib, pkg-config, buildGoPackage, fetchFromGitHub , makeWrapper, coreutils, gnupg, gnutar, squashfsTools, debootstrap }: -let binPath = stdenv.lib.makeBinPath [ +let binPath = lib.makeBinPath [ coreutils gnupg gnutar squashfsTools debootstrap ]; in @@ -25,7 +25,7 @@ buildGoPackage rec { postInstall = '' wrapProgram $out/bin/distrobuilder --prefix PATH ":" ${binPath} ''; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; meta = with lib; { description = "System container image builder for LXC and LXD"; diff --git a/pkgs/tools/virtualization/ec2-ami-tools/default.nix b/pkgs/tools/virtualization/ec2-ami-tools/default.nix index f8359e6286c..eafd740b065 100644 --- a/pkgs/tools/virtualization/ec2-ami-tools/default.nix +++ b/pkgs/tools/virtualization/ec2-ami-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, ruby, openssl, makeWrapper }: +{ lib, stdenv, fetchurl, unzip, ruby, openssl, makeWrapper }: stdenv.mkDerivation rec { pname = "ec2-ami-tools"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { for i in $out/bin/*; do wrapProgram $i \ --set EC2_HOME $out \ - --prefix PATH : ${stdenv.lib.makeBinPath [ ruby openssl ]} + --prefix PATH : ${lib.makeBinPath [ ruby openssl ]} done sed -i 's|/bin/bash|${stdenv.shell}|' $out/lib/ec2/platform/base/pipeline.rb @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://aws.amazon.com/developertools/Amazon-EC2/368"; description = "Command-line tools to create and manage Amazon EC2 virtual machine images"; - license = stdenv.lib.licenses.amazonsl; + license = lib.licenses.amazonsl; }; } diff --git a/pkgs/tools/virtualization/ec2-api-tools/default.nix b/pkgs/tools/virtualization/ec2-api-tools/default.nix index 409b2ba8f41..8e3ab0d9f28 100644 --- a/pkgs/tools/virtualization/ec2-api-tools/default.nix +++ b/pkgs/tools/virtualization/ec2-api-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, makeWrapper, jre }: +{ lib, stdenv, fetchurl, unzip, makeWrapper, jre }: stdenv.mkDerivation rec { name = "ec2-api-tools-1.7.5.1"; @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://developer.amazonwebservices.com/connect/entry.jspa?externalID=351"; description = "Command-line tools to create and manage Amazon EC2 virtual machines"; - license = stdenv.lib.licenses.amazonsl; + license = lib.licenses.amazonsl; }; } diff --git a/pkgs/tools/virtualization/ec2instanceconnectcli/default.nix b/pkgs/tools/virtualization/ec2instanceconnectcli/default.nix new file mode 100644 index 00000000000..4068d71383c --- /dev/null +++ b/pkgs/tools/virtualization/ec2instanceconnectcli/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, boto3 }: + +buildPythonPackage rec { + pname = "ec2instanceconnectcli"; + version = "1.0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-VaCyCnEhSx1I3bNo57p0IXf92+tO1tT7KSUXzO1IyIU="; + }; + + propagatedBuildInputs = [ boto3 ]; + + # has no tests + doCheck = false; + + pythonImportsCheck = [ "ec2instanceconnectcli" ]; + + meta = with lib; { + description = "Command Line Interface for AWS EC2 Instance Connect"; + homepage = "https://github.com/aws/aws-ec2-instance-connect-cli"; + license = licenses.apsl20; + maintainers = with maintainers; [ yurrriq ]; + }; +} diff --git a/pkgs/tools/virtualization/euca2ools/default.nix b/pkgs/tools/virtualization/euca2ools/default.nix index 3d7b62777aa..88e83f42733 100644 --- a/pkgs/tools/virtualization/euca2ools/default.nix +++ b/pkgs/tools/virtualization/euca2ools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, python2Packages }: +{ lib, fetchgit, python2Packages }: let inherit (python2Packages) buildPythonApplication boto m2crypto; @@ -17,7 +17,7 @@ in buildPythonApplication { meta = { homepage = "https://github.com/eucalyptus/euca2ools"; description = "Tools for interacting with Amazon EC2/S3-compatible cloud computing services"; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.linux; + maintainers = [ lib.maintainers.eelco ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/virtualization/govc/default.nix b/pkgs/tools/virtualization/govc/default.nix index 30cf09d2942..bfe11127a92 100644 --- a/pkgs/tools/virtualization/govc/default.nix +++ b/pkgs/tools/virtualization/govc/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "govc"; - version = "0.23.1"; + version = "0.24.0"; goPackagePath = "github.com/vmware/govmomi"; @@ -12,7 +12,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "vmware"; repo = "govmomi"; - sha256 = "05f6i7v8v9g3w3cmz8c952djl652mj6qcwjx9iyl23h6knd1d9b1"; + sha256 = "sha256-Urfrkeqbl0+GB2Vr2IfekiilRvGcG0vGO5MGeZcP4C8="; }; meta = { diff --git a/pkgs/tools/virtualization/marathonctl/default.nix b/pkgs/tools/virtualization/marathonctl/default.nix index 6f036795e72..fe31c64952a 100644 --- a/pkgs/tools/virtualization/marathonctl/default.nix +++ b/pkgs/tools/virtualization/marathonctl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage { pname = "marathonctl-unstable"; diff --git a/pkgs/tools/virtualization/nixos-shell/default.nix b/pkgs/tools/virtualization/nixos-shell/default.nix index f0657f4638b..458996704a8 100644 --- a/pkgs/tools/virtualization/nixos-shell/default.nix +++ b/pkgs/tools/virtualization/nixos-shell/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/nixos-shell \ - --prefix PATH : ${stdenv.lib.makeBinPath [ nix ]} + --prefix PATH : ${lib.makeBinPath [ nix ]} ''; installFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/tools/virtualization/udocker/default.nix b/pkgs/tools/virtualization/udocker/default.nix index c971dfcb1bd..fb067de8212 100644 --- a/pkgs/tools/virtualization/udocker/default.nix +++ b/pkgs/tools/virtualization/udocker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, proot, patchelf, fakechroot, runc, simplejson, pycurl, coreutils, nose, mock, buildPythonApplication }: +{ lib, fetchFromGitHub, proot, patchelf, fakechroot, runc, simplejson, pycurl, coreutils, nose, mock, buildPythonApplication }: buildPythonApplication rec { diff --git a/pkgs/tools/virtualization/vpsfree-client/gemset.nix b/pkgs/tools/virtualization/vpsfree-client/gemset.nix index 366c5836bd3..a1b4376f948 100644 --- a/pkgs/tools/virtualization/vpsfree-client/gemset.nix +++ b/pkgs/tools/virtualization/vpsfree-client/gemset.nix @@ -313,4 +313,4 @@ }; version = "2.3.0"; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/virtualization/xe-guest-utilities/default.nix b/pkgs/tools/virtualization/xe-guest-utilities/default.nix index e5c5b0978af..ab3c9b1e71c 100644 --- a/pkgs/tools/virtualization/xe-guest-utilities/default.nix +++ b/pkgs/tools/virtualization/xe-guest-utilities/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bzip2, lzo, zlib, xz, bash, python, gnutar, gnused, gnugrep, which }: +{ lib, stdenv, fetchurl, bzip2, lzo, zlib, xz, bash, python, gnutar, gnused, gnugrep, which }: stdenv.mkDerivation (rec { pname = "xe-guest-utilities"; @@ -6,9 +6,9 @@ stdenv.mkDerivation (rec { meta = { description = "Citrix XenServer Tools"; homepage = "http://citrix.com/English/ps2/products/product.asp?contentID=683148&ntref=hp_nav_US"; - maintainers = with stdenv.lib.maintainers; [ benwbooth ]; - platforms = stdenv.lib.platforms.linux; - license = [ stdenv.lib.licenses.gpl2 stdenv.lib.licenses.lgpl21 ]; + maintainers = with lib.maintainers; [ benwbooth ]; + platforms = lib.platforms.linux; + license = [ lib.licenses.gpl2 lib.licenses.lgpl21 ]; }; src = fetchurl { url = "https://sources.archlinux.org/other/community/xe-guest-utilities/xe-guest-utilities_${version}-1120.tar.gz"; diff --git a/pkgs/tools/wayland/ydotool/default.nix b/pkgs/tools/wayland/ydotool/default.nix index eaa93daf3cf..76ebd225006 100644 --- a/pkgs/tools/wayland/ydotool/default.nix +++ b/pkgs/tools/wayland/ydotool/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, cmake, boost, libevdevplus, libuinputplus }: +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, boost, libevdevplus, libuinputplus }: stdenv.mkDerivation rec { pname = "ydotool"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { "" ''; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ boost libevdevplus libuinputplus ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f99e4e75162..bb2fb36bb5b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -70,6 +70,7 @@ mapAliases ({ bazaarTools = throw "bazaar has been deprecated by breezy."; # added 2020-04-19 beegfs = throw "beegfs has been removed."; # added 2019-11-24 bluezFull = bluez; # Added 2019-12-03 + brackets = throw "brackets has been removed, it was unmaintained and had open vulnerabilities"; # added 2021-01-24 bridge_utils = bridge-utils; # added 2015-02-20 bro = zeek; # added 2019-09-29 bootchart = throw "bootchart has been removed from nixpkgs, as it is without a maintainer"; # added 2019-12-10 @@ -84,9 +85,9 @@ mapAliases ({ buildGo112Package = throw "buildGo112Package has been removed"; # added 2020-04-26 buildGo112Module = throw "buildGo112Module has been removed"; # added 2020-04-26 bundler_HEAD = bundler; # added 2015-11-15 + calibre-py2 = throw "calibre-py2 has been removed from nixpkgs, as calibre has upgraded to python 3. Please use calibre as replacement."; # added 2021-01-13 + calibre-py3 = throw "calibre-py3 has been removed from nixpkgs, as calibre's default python version is now 3. Please use calibre as replacement."; # added 2021-01-13 caddy1 = throw "caddy 1.x has been removed from nixpkgs, as it's unmaintained: https://github.com/caddyserver/caddy/blob/master/.github/SECURITY.md#supported-versions"; # added 2020-10-02 - calibre-py2 = throw "calibre-py2 has been removed from nixpkgs, as calibre has upgraded to python 3. Please use calibre as replacement."; # added 2021-01-12 - calibre-py3 = throw "calibre-py3 has been removed from nixpkgs, as calibre's default python version is now 3. Please use calibre as replacement."; # added 2021-01-12 cantarell_fonts = cantarell-fonts; # added 2018-03-03 cargo-tree = throw "cargo-tree has been removed, use the builtin `cargo tree` command instead."; # added 2020-08-20 casperjs = throw "casperjs has been removed, it was abandoned by upstream and broken."; @@ -118,12 +119,18 @@ mapAliases ({ cv = progress; # added 2015-09-06 d1x_rebirth = dxx-rebirth; # added 2018-04-25 d2x_rebirth = dxx-rebirth; # added 2018-04-25 + dart_dev = throw "Non-stable versions of Dart have been removed."; # added 2020-01-15 + dart_old = throw "Non-stable versions of Dart have been removed."; # added 2020-01-15 + dart_stable = dart; # added 2020-01-15 dat = nodePackages.dat; dbvisualizer = throw "dbvisualizer has been removed from nixpkgs, as it's unmaintained"; # added 2020-09-20 dbus_daemon = dbus.daemon; # added 2018-04-25 dbus_glib = dbus-glib; # added 2018-02-25 dbus_libs = dbus; # added 2018-04-25 diffuse = throw "diffuse has been removed from nixpkgs, as it's unmaintained"; # added 2019-12-10 + disnix = throw "disnix has been removed."; # added 2021-01-27 + disnixos = throw "disnixos has been removed."; # added 2021-01-27 + DisnixWebService = throw "DisnixWebService has been removed."; # added 2021-01-27 dbus_tools = dbus.out; # added 2018-04-25 deadbeef-mpris2-plugin = deadbeefPlugins.mpris2; # added 2018-02-23 deadpixi-sam = deadpixi-sam-unstable; @@ -140,11 +147,20 @@ mapAliases ({ docker_compose = docker-compose; # 2018-11-10 draftsight = throw "draftsight has been removed, no longer available as freeware"; # added 2020-08-14 dvb_apps = throw "dvb_apps has been removed."; # added 2020-11-03 + dydisnix = throw "dydisnix has been removed."; # added 2021-01-27 + dysnomia = throw "dysnomia has been removed."; # added 2021-01-27 dwarf_fortress = dwarf-fortress; # added 2016-01-23 + elasticmq = throw "elasticmq has been removed in favour of elasticmq-server-bin"; # added 2021-01-17 emacsPackagesGen = emacsPackagesFor; # added 2018-08-18 emacsPackagesNgGen = emacsPackagesFor; # added 2018-08-18 emacsPackagesNgFor = emacsPackagesFor; # added 2019-08-07 - emacsPackagesNg = emacsPackages; # added 2019-08-07 + emacsPackagesNg = emacs.pkgs; # added 2019-08-07 + emacs26Packages = emacs26.pkgs; # added 2020-12-18 + emacs27Packages = emacs27.pkgs; # added 2020-12-18 + emacs26WithPackages = emacs26.pkgs.withPackages; # added 2020-12-18 + emacs27WithPackages = emacs27.pkgs.withPackages; # added 2020-12-18 + emacsWithPackages = emacs.pkgs.withPackages; # added 2020-12-18 + emacsPackages = emacs.pkgs; # added 2020-12-18 emby = throw "The Emby derivation has been removed, see jellyfin instead for a free software fork."; # added 2019-05-01 enblendenfuse = enblend-enfuse; # 2015-09-30 evolution_data_server = evolution-data-server; # added 2018-02-25 @@ -162,6 +178,9 @@ mapAliases ({ firestr = throw "firestr has been removed."; # added 2019-12-08 fish-foreign-env = throw "fish-foreign-env has been replaced with fishPlugins.foreign-env"; # added 2020-12-29, modified 2021-01-10 flameGraph = flamegraph; # added 2018-04-25 + flink_1_5 = throw "flink_1_5 was removed, use flink instead"; # added 2021-01-25 + flutter-beta = throw "Non-stable versions of Flutter have been removed. You can use flutterPackages.mkFlutter to generate a package for other Flutter versions."; # added 2020-01-15 + flutter-dev = throw "Non-stable versions of Flutter have been removed. You can use flutterPackages.mkFlutter to generate a package for other Flutter versions."; # added 2020-01-15 flvtool2 = throw "flvtool2 has been removed."; # added 2020-11-03 foldingathome = fahclient; # added 2020-09-03 font-awesome-ttf = font-awesome; # 2018-02-25 @@ -190,7 +209,15 @@ mapAliases ({ gdb-multitarget = gdb; # added 2017-11-13 gdk_pixbuf = gdk-pixbuf; # added 2019-05-22 gettextWithExpat = gettext; # 2016-02-19 - git-hub = gitAndTools.git-hub; # added 2016-04-29 + gitAndTools = self // { # added 2021-01-14 + darcsToGit = darcs-to-git; + gitAnnex = git-annex; + gitBrunch = git-brunch; + gitFastExport = git-fast-export; + gitRemoteGcrypt = git-remote-gcrypt; + svn_all_fast_export = svn-all-fast-export; + topGit = top-git; + }; glib_networking = glib-networking; # added 2018-02-25 gmailieer = lieer; # added 2020-04-19 gnome-mpv = celluloid; # added 2019-08-22 @@ -212,8 +239,10 @@ mapAliases ({ }; gnustep-make = gnustep.make; # added 2016-7-6 gnupg20 = throw "gnupg20 has been removed from nixpkgs as upstream dropped support on 2017-12-31";# added 2020-07-12 + gnuvd = throw "gnuvd was removed because the backend service is missing"; # added 2020-01-14 go_1_12 = throw "go_1_12 has been removed"; # added 2020-04-26 go-pup = pup; # added 2017-12-19 + gobby5 = gobby; # added 2021-02-01 gobjectIntrospection = gobject-introspection; # added 2018-12-02 goimports = gotools; # added 2018-09-16 gometalinter = throw "gometalinter was abandoned by upstream. Consider switching to golangci-lint instead"; # added 2020-04-23 @@ -244,6 +273,8 @@ mapAliases ({ inboxer = throw "inboxer has been removed as it is no longer maintained and no longer works as Google shut down the inbox service this package wrapped."; infiniband-diags = rdma-core; # added 2019-08-09 inotifyTools = inotify-tools; + i-score = throw "i-score has been removed: abandoned upstream."; # added 2020-11-21 + jamomacore = throw "jamomacore has been removed: abandoned upstream."; # added 2020-11-21 jasper = throw "jasper has been removed: abandoned upstream with many vulnerabilities"; jbuilder = dune; # added 2018-09-09 jikes = throw "jikes was deprecated on 2019-10-07: abandoned by upstream"; @@ -305,7 +336,6 @@ mapAliases ({ libstdcxxHook = throw "libstdcxx hook has been removed because cc-wrapper is now directly aware of the c++ standard library intended to be used."; # 2020-06-22 libqmatrixclient = throw "libqmatrixclient was renamed to libquotient"; # added 2020-04-09 links = links2; # added 2016-01-31 - linux_mptcp_5_9 = linux_5_9; # added 2020-01-07 linux_rpi0 = linux_rpi1; linuxPackages_rpi0 = linuxPackages_rpi1; @@ -385,7 +415,9 @@ mapAliases ({ oblogout = throw "oblogout has been removed from nixpkgs, as it's archived upstream."; # added 2019-12-10 opencl-icd = ocl-icd; # added 2017-01-20 openexr_ctl = ctl; # added 2018-04-25 - openjpeg_2_1 = openjpeg_2; # added 2018-10-25 + openisns = open-isns; # added 2020-01-28 + openjpeg_1 = throw "openjpeg_1 has been removed, use openjpeg_2 instead"; # added 2021-01-24 + openjpeg_2 = openjpeg; # added 2021-01-25 opensans-ttf = open-sans; # added 2018-12-04 openssh_with_kerberos = openssh; # added 2018-01-28 onnxruntime = throw "onnxruntime has been removed due to poor maintainability"; # added 2020-12-04 @@ -457,6 +489,9 @@ mapAliases ({ pidginsipe = pidgin-sipe; # added 2018-01-08 pidginwindowmerge = pidgin-window-merge; # added 2018-01-08 piwik = matomo; # added 2018-01-16 + pkgconfig = pkg-config; # added 2018-02-02, moved to aliases.nix 2021-01-18 + pkgconfigUpstream = pkg-configUpstream; # added 2018-02-02 + planner = throw "planner has been removed from nixpkgs, as it is no longer developed and still uses python2/PyGTK."; # added 2021-02-02 pltScheme = racket; # just to be sure plexpy = tautulli; # plexpy got renamed to tautulli, added 2019-02-22 pmtools = acpica-tools; # added 2018-11-01 @@ -578,6 +613,7 @@ mapAliases ({ smugline = throw "smugline has been removed from nixpkgs, as it's unmaintained and depends on deprecated libraries."; # added 2020-11-04 slim = throw "slim has been removed. Please use a different display-manager"; # added 2019-11-11 slimThemes = throw "slimThemes has been removed because slim has been also"; # added 2019-11-11 + solr_8 = solr; # added 2021-01-30 spectral = neochat; # added 2020-12-27 sundials_3 = throw "sundials_3 was removed in 2020-02. outdated and no longer needed"; @@ -669,6 +705,7 @@ mapAliases ({ uberwriter = apostrophe; # added 2020-04-23 ubootBeagleboneBlack = ubootAmx335xEVM; # added 2020-01-21 ucsFonts = ucs-fonts; # added 2016-07-15 + ufraw = throw "ufraw is unmaintained and has been removed from nixpkgs. Its successor, nufraw, doesn't seem to be stable enough. Consider using Darktable for now."; # 2020-01-11 ultrastardx-beta = ultrastardx; # added 2017-08-12 unicorn-emu = unicorn; # added 2020-10-29 unifiStable = unifi6; # added 2020-12-28 @@ -698,6 +735,7 @@ mapAliases ({ wireguard = wireguard-tools; # added 2018-05-19 morituri = whipper; # added 2018-09-13 xp-pen-g430 = pentablet-driver; # added 2020-05-03 + xdg_utils = xdg-utils; # added 2021-02-01 xfceUnstable = xfce4-14; # added 2019-09-17 xfce4-14 = xfce; xfce4-12 = throw "xfce4-12 has been replaced by xfce4-14"; # added 2020-03-14 @@ -716,6 +754,7 @@ mapAliases ({ xv = xxv; # added 2020-02-22 youtubeDL = youtube-dl; # added 2014-10-26 ytop = throw "ytop has been abandoned by upstream. Consider switching to bottom instead"; + yuzu = yuzu-mainline; # added 2021-01-25 zdfmediathk = mediathekview; # added 2019-01-19 gnome_user_docs = gnome-user-docs; # added 2019-11-20 # spidermonkey is not ABI upwards-ompatible, so only allow this for nix-shell @@ -797,6 +836,8 @@ mapAliases ({ gcc-snapshot = throw "gcc-snapshot: Marked as broken for >2 years, additionally this 'snapshot' pointed to a fairly old one from gcc7."; + todolist = throw "todolist is now ultralist."; # added 2020-12-27 + /* Cleanup before 21.03 */ riot-desktop = throw "riot-desktop is now element-desktop!"; riot-web = throw "riot-web is now element-web"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 91ef92afd65..534055d07bd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -112,17 +112,21 @@ in { name = "auto-blas-hook"; deps = [ blas lapack ]; } ../build-support/setup-hooks/audit-blas.sh; - autoreconfHook = makeSetupHook - { deps = [ autoconf automake gettext libtool ]; } - ../build-support/setup-hooks/autoreconf.sh; - - autoreconfHook264 = makeSetupHook - { deps = [ autoconf264 automake111x gettext libtool ]; } - ../build-support/setup-hooks/autoreconf.sh; + autoreconfHook = callPackage ( + { makeSetupHook, autoconf, automake, gettext, libtool }: + makeSetupHook + { deps = [ autoconf automake gettext libtool ]; } + ../build-support/setup-hooks/autoreconf.sh + ) { }; + + autoreconfHook264 = autoreconfHook.override { + autoconf = autoconf264; + automake = automake111x; + }; - autoreconfHook269 = makeSetupHook - { deps = [ autoconf269 automake gettext libtool ]; } - ../build-support/setup-hooks/autoreconf.sh; + autoreconfHook269 = autoreconfHook.override { + autoconf = autoconf269; + }; autoPatchelfHook = makeSetupHook { name = "auto-patchelf-hook"; } ../build-support/setup-hooks/auto-patchelf.sh; @@ -150,10 +154,16 @@ in ankisyncd = callPackage ../servers/ankisyncd { }; + fiche = callPackage ../servers/fiche { }; + + fishnet = callPackage ../servers/fishnet { }; + avro-tools = callPackage ../development/tools/avro-tools { }; bacnet-stack = callPackage ../tools/networking/bacnet-stack {}; + breakpad = callPackage ../development/misc/breakpad { }; + # Zip file format only allows times after year 1980, which makes e.g. Python wheel building fail with: # ValueError: ZIP does not support timestamps before 1980 ensureNewerSourcesForZipFilesHook = ensureNewerSourcesHook { year = "1980"; }; @@ -182,6 +192,8 @@ in cereal = callPackage ../development/libraries/cereal { }; + checkov = callPackage ../development/tools/analysis/checkov {}; + chrysalis = callPackage ../applications/misc/chrysalis { }; clj-kondo = callPackage ../development/tools/clj-kondo { }; @@ -204,6 +216,8 @@ in comedilib = callPackage ../development/libraries/comedilib { }; + containerpilot = callPackage ../applications/networking/cluster/containerpilot { }; + cp437 = callPackage ../tools/misc/cp437 { }; cpu-x = callPackage ../applications/misc/cpu-x { }; @@ -238,6 +252,8 @@ in enum4linux = callPackage ../tools/security/enum4linux {}; + enum4linux-ng = python3Packages.callPackage ../tools/security/enum4linux-ng { }; + onesixtyone = callPackage ../tools/security/onesixtyone {}; creddump = callPackage ../tools/security/creddump {}; @@ -394,7 +410,7 @@ in # break dependency cycles fetchurl = stdenv.fetchurlBoot; zlib = buildPackages.zlib.override { fetchurl = stdenv.fetchurlBoot; }; - pkgconfig = buildPackages.pkgconfig.override (old: { + pkg-config = buildPackages.pkg-config.override (old: { pkg-config = old.pkg-config.override { fetchurl = stdenv.fetchurlBoot; }; @@ -427,12 +443,12 @@ in else old.gssSupport or true; # `? true` is the default libkrb5 = buildPackages.libkrb5.override { fetchurl = stdenv.fetchurlBoot; - inherit pkgconfig perl openssl; + inherit pkg-config perl openssl; keyutils = buildPackages.keyutils.override { fetchurl = stdenv.fetchurlBoot; }; }; nghttp2 = buildPackages.nghttp2.override { fetchurl = stdenv.fetchurlBoot; - inherit zlib pkgconfig openssl; + inherit zlib pkg-config openssl; c-ares = buildPackages.c-ares.override { fetchurl = stdenv.fetchurlBoot; }; libev = buildPackages.libev.override { fetchurl = stdenv.fetchurlBoot; }; }; @@ -500,7 +516,7 @@ in mkShell = callPackage ../build-support/mkshell { }; - nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit (pkgs) lib writeText; inherit (emacsPackages) inherit-local; }; + nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit (pkgs) lib writeText; inherit (emacs.pkgs) inherit-local; }; nix-gitignore = callPackage ../build-support/nix-gitignore { }; @@ -576,7 +592,7 @@ in iconConvTools = callPackage ../build-support/icon-conv-tools {}; validatePkgConfig = makeSetupHook - { name = "validate-pkg-config"; deps = [ findutils pkgconfig ]; } + { name = "validate-pkg-config"; deps = [ findutils pkg-config ]; } ../build-support/setup-hooks/validate-pkg-config.sh; #package writers @@ -695,6 +711,8 @@ in aide = callPackage ../tools/security/aide { }; + aiodnsbrute = python3Packages.callPackage ../tools/security/aiodnsbrute { }; + aircrack-ng = callPackage ../tools/networking/aircrack-ng { }; airfield = callPackage ../tools/networking/airfield { }; @@ -709,8 +727,17 @@ in aj-snapshot = callPackage ../applications/audio/aj-snapshot { }; + ajour = callPackage ../tools/games/ajour { + inherit (gnome3) zenity; + inherit (plasma5Packages) kdialog; + }; + albert = libsForQt5.callPackage ../applications/misc/albert {}; + gobgp = callPackage ../tools/networking/gobgp { }; + + metapixel = callPackage ../tools/graphics/metapixel { }; + ### APPLICATIONS/TERMINAL-EMULATORS alacritty = callPackage ../applications/terminal-emulators/alacritty { @@ -870,7 +897,12 @@ in inherit (androidenv.androidPkgs_9_0) build-tools; }; - appimage-run = callPackage ../tools/package-management/appimage-run {}; + appimage-run = callPackage ../tools/package-management/appimage-run { }; + appimage-run-tests = callPackage ../tools/package-management/appimage-run/test.nix { + appimage-run = appimage-run.override { + appimage-run-tests = null; /* break boostrap cycle for passthru.tests */ + }; + }; appimagekit = callPackage ../tools/package-management/appimagekit {}; @@ -975,6 +1007,8 @@ in aws-google-auth = python3Packages.callPackage ../tools/admin/aws-google-auth { }; + aws-mfa = python3Packages.callPackage ../tools/admin/aws-mfa { }; + aws-nuke = callPackage ../tools/admin/aws-nuke { }; aws-okta = callPackage ../tools/security/aws-okta { }; @@ -1005,6 +1039,8 @@ in boxes = callPackage ../tools/text/boxes { }; + boundary = callPackage ../tools/networking/boundary { }; + chamber = callPackage ../tools/admin/chamber { }; charm = callPackage ../applications/misc/charm { }; @@ -1087,6 +1123,8 @@ in bunny = callPackage ../tools/package-management/bunny { }; + callaudiod = callPackage ../applications/audio/callaudiod { }; + calls = callPackage ../applications/networking/calls { }; inherit (nodePackages) castnow; @@ -1122,6 +1160,8 @@ in go-check = callPackage ../development/tools/check { }; + go-cve-search = callPackage ../tools/security/go-cve-search { }; + chkcrontab = callPackage ../tools/admin/chkcrontab { }; claws = callPackage ../tools/misc/claws { }; @@ -1136,6 +1176,8 @@ in coolreader = libsForQt5.callPackage ../applications/misc/coolreader {}; + corsmisc = callPackage ../tools/security/corsmisc { }; + cozy = callPackage ../applications/audio/cozy-audiobooks { }; cpuid = callPackage ../os-specific/linux/cpuid { }; @@ -1229,6 +1271,8 @@ in gaia = callPackage ../development/libraries/gaia { }; + galene = callPackage ../servers/web-apps/galene {}; + gamecube-tools = callPackage ../development/tools/gamecube-tools { }; gammy = qt5.callPackage ../tools/misc/gammy { }; @@ -1287,6 +1331,8 @@ in google-amber = callPackage ../tools/graphics/amber { }; + hakrawler = callPackage ../tools/security/hakrawler { }; + hime = callPackage ../tools/inputmethods/hime {}; hostctl = callPackage ../tools/system/hostctl { }; @@ -1315,6 +1361,8 @@ in pass = callPackage ../tools/security/pass { }; + pass-git-helper = python3Packages.callPackage ../applications/version-management/git-and-tools/pass-git-helper { }; + pass-nodmenu = callPackage ../tools/security/pass { dmenuSupport = false; pass = pass-nodmenu; @@ -1329,6 +1377,8 @@ in asc-key-to-qr-code-gif = callPackage ../tools/security/asc-key-to-qr-code-gif { }; + go-audit = callPackage ../tools/system/go-audit { }; + gopass = callPackage ../tools/security/gopass { }; gospider = callPackage ../tools/security/gospider { }; @@ -1383,6 +1433,8 @@ in ssh-import-id = python3Packages.callPackage ../tools/admin/ssh-import-id { }; + sshchecker = callPackage ../tools/security/sshchecker { }; + titaniumenv = callPackage ../development/mobile/titaniumenv { }; abootimg = callPackage ../development/mobile/abootimg {}; @@ -1564,6 +1616,8 @@ in bitbucket-cli = python2Packages.bitbucket-cli; + bitbucket-server-cli = callPackage ../applications/version-management/git-and-tools/bitbucket-server-cli { }; + blink = libsForQt5.callPackage ../applications/networking/instant-messengers/blink { }; blockbook = callPackage ../servers/blockbook { }; @@ -1696,6 +1750,8 @@ in textual-window-manager = tmux; }; + bypass403 = callPackage ../tools/security/bypass403 { }; + bsh = fetchurl { url = "http://www.beanshell.org/bsh-2.0b5.jar"; sha256 = "0p2sxrpzd0vsk11zf3kb5h12yl1nq4yypb5mpjrm8ww0cfaijck2"; @@ -1812,6 +1868,8 @@ in chelf = callPackage ../tools/misc/chelf { }; + chisel = callPackage ../tools/networking/chisel { }; + cht-sh = callPackage ../tools/misc/cht.sh { }; ckbcomp = callPackage ../tools/X11/ckbcomp { }; @@ -2185,6 +2243,8 @@ in fast-cli = nodePackages.fast-cli; + fast-cpp-csv-parser = callPackage ../development/libraries/fast-cpp-csv-parser { }; + faudio = callPackage ../development/libraries/faudio { }; fd = callPackage ../tools/misc/fd { }; @@ -2283,6 +2343,8 @@ in gist = callPackage ../tools/text/gist { }; + gitjacker = callPackage ../tools/security/gitjacker { }; + gixy = callPackage ../tools/admin/gixy { }; glpaper = callPackage ../development/tools/glpaper { }; @@ -2410,6 +2472,8 @@ in klipper = callPackage ../servers/klipper { }; + klog = qt5.callPackage ../applications/radio/klog { }; + lcdproc = callPackage ../servers/monitoring/lcdproc { }; languagetool = callPackage ../tools/text/languagetool { }; @@ -2536,6 +2600,8 @@ in nextdns = callPackage ../applications/networking/nextdns { }; + ngadmin = callPackage ../applications/networking/ngadmin { }; + nfdump = callPackage ../tools/networking/nfdump { }; nfstrace = callPackage ../tools/networking/nfstrace { }; @@ -2594,6 +2660,8 @@ in pbzx = callPackage ../tools/compression/pbzx { }; + pcb2gcode = callPackage ../tools/misc/pcb2gcode { }; + persepolis = python3Packages.callPackage ../tools/networking/persepolis { wrapQtAppsHook = qt5.wrapQtAppsHook; }; @@ -2636,6 +2704,8 @@ in rmapi = callPackage ../applications/misc/remarkable/rmapi { }; + rmview = libsForQt5.callPackage ../applications/misc/remarkable/rmview { }; + remarkable-mouse = python3Packages.callPackage ../applications/misc/remarkable/remarkable-mouse { }; ryujinx = callPackage ../misc/emulators/ryujinx { }; @@ -2690,6 +2760,8 @@ in sweep-visualizer = callPackage ../tools/misc/sweep-visualizer { }; + swego = callPackage ../servers/swego { }; + syscall_limiter = callPackage ../os-specific/linux/syscall_limiter {}; syslogng = callPackage ../tools/system/syslog-ng { }; @@ -2785,25 +2857,28 @@ in appleseed = callPackage ../tools/graphics/appleseed { }; + apple-music-electron = callPackage ../applications/audio/apple-music-electron { }; + arping = callPackage ../tools/networking/arping { }; arpoison = callPackage ../tools/networking/arpoison { }; asciidoc = callPackage ../tools/typesetting/asciidoc { - inherit (python2Packages) matplotlib numpy aafigure recursivePthLoader; - w3m = w3m-batch; + inherit (python3.pkgs) matplotlib numpy aafigure recursivePthLoader; enableStandardFeatures = false; }; asciidoc-full = appendToName "full" (asciidoc.override { - inherit (python2Packages) pygments; + inherit (python3.pkgs) pygments; texlive = texlive.combine { inherit (texlive) scheme-minimal dvipng; }; + w3m = w3m-batch; enableStandardFeatures = true; }); asciidoc-full-with-plugins = appendToName "full-with-plugins" (asciidoc.override { - inherit (python2Packages) pygments; + inherit (python3.pkgs) pygments; texlive = texlive.combine { inherit (texlive) scheme-minimal dvipng; }; + w3m = w3m-batch; enableStandardFeatures = true; enableExtraPlugins = true; }); @@ -2843,6 +2918,16 @@ in beanstalkd = callPackage ../servers/beanstalkd { }; + bee = callPackage ../applications/networking/bee/bee.nix { + version = "release"; + }; + + bee-unstable = bee.override { + version = "unstable"; + }; + + bee-clef = callPackage ../applications/networking/bee/bee-clef.nix { }; + beets = callPackage ../tools/audio/beets { pythonPackages = python3Packages; }; @@ -2853,7 +2938,7 @@ in bettercap = callPackage ../tools/security/bettercap { }; - bfg-repo-cleaner = gitAndTools.bfg-repo-cleaner; + bfg-repo-cleaner = callPackage ../applications/version-management/git-and-tools/bfg-repo-cleaner { }; bfs = callPackage ../tools/system/bfs { }; @@ -2894,6 +2979,8 @@ in inherit (pythonPackages) gyp; }; + bump2version = python37Packages.callPackage ../applications/version-management/git-and-tools/bump2version { }; + bumpver = callPackage ../applications/version-management/bumpver { }; bup = callPackage ../tools/backup/bup { }; @@ -2932,6 +3019,8 @@ in cantata = libsForQt5.callPackage ../applications/audio/cantata { }; + cantoolz = python3Packages.callPackage ../tools/networking/cantoolz { }; + can-utils = callPackage ../os-specific/linux/can-utils { }; caudec = callPackage ../applications/audio/caudec { }; @@ -2970,7 +3059,7 @@ in libceph = ceph.lib; inherit (callPackages ../tools/filesystems/ceph { - boost = boost16x.override { enablePython = true; python = python38; }; + boost = boost172.override { enablePython = true; python = python38; }; }) ceph ceph-client; @@ -3001,6 +3090,8 @@ in cjdns = callPackage ../tools/networking/cjdns { }; + cjson = callPackage ../development/libraries/cjson { }; + cksfv = callPackage ../tools/networking/cksfv { }; clementine = libsForQt514.callPackage ../applications/audio/clementine { @@ -3183,6 +3274,7 @@ in interception-tools = callPackage ../tools/inputmethods/interception-tools { }; interception-tools-plugins = { caps2esc = callPackage ../tools/inputmethods/interception-tools/caps2esc.nix { }; + dual-function-keys = callPackage ../tools/inputmethods/interception-tools/dual-function-keys.nix { }; }; age = callPackage ../tools/security/age { }; @@ -3191,6 +3283,8 @@ in biosdevname = callPackage ../tools/networking/biosdevname { }; + bluetooth_battery = python3Packages.callPackage ../applications/misc/bluetooth_battery { }; + code-browser-qt = libsForQt5.callPackage ../applications/editors/code-browser { withQt = true; }; code-browser-gtk = callPackage ../applications/editors/code-browser { withGtk = true; @@ -3380,6 +3474,10 @@ in deer = callPackage ../shells/zsh/zsh-deer { }; + delta = callPackage ../applications/version-management/git-and-tools/delta { + inherit (darwin.apple_sdk.frameworks) Security; + }; + deno = callPackage ../development/web/deno { inherit (darwin.apple_sdk.frameworks) Security CoreServices; }; @@ -3462,6 +3560,8 @@ in diction = callPackage ../tools/text/diction { }; + diff-so-fancy = callPackage ../applications/version-management/git-and-tools/diff-so-fancy { }; + diffoscope = callPackage ../tools/misc/diffoscope { inherit (androidenv.androidPkgs_9_0) build-tools; jdk = jdk8; @@ -3714,7 +3814,7 @@ in volctl = callPackage ../tools/audio/volctl { }; - vorta = python3Packages.callPackage ../applications/backup/vorta { }; + vorta = libsForQt5.callPackage ../applications/backup/vorta { }; utahfs = callPackage ../applications/networking/utahfs { }; @@ -3738,7 +3838,7 @@ in wsl-open = callPackage ../tools/misc/wsl-open { }; - xkcdpass = with pythonPackages; toPythonApplication xkcdpass; + xkcdpass = with python3Packages; toPythonApplication xkcdpass; xob = callPackage ../tools/X11/xob { }; @@ -3869,6 +3969,8 @@ in eventstat = callPackage ../os-specific/linux/eventstat { }; + evillimiter = python3Packages.callPackage ../tools/networking/evillimiter { }; + evtest = callPackage ../applications/misc/evtest { }; evtest-qt = libsForQt5.callPackage ../applications/misc/evtest-qt { }; @@ -3966,6 +4068,8 @@ in fcitx5-chinese-addons = libsForQt5.callPackage ../tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix { }; + fcitx5-mozc = libsForQt5.callPackage ../tools/inputmethods/fcitx5/fcitx5-mozc.nix { }; + fcitx5-configtool = libsForQt5.callPackage ../tools/inputmethods/fcitx5/fcitx5-configtool.nix { }; fcitx5-lua = callPackage ../tools/inputmethods/fcitx5/fcitx5-lua.nix { }; @@ -4158,6 +4262,8 @@ in mkFranzDerivation = callPackage ../applications/networking/instant-messengers/franz/generic.nix { }; }; + freedroid = callPackage ../games/freedroid { }; + freedroidrpg = callPackage ../games/freedroidrpg { }; freenukum = callPackage ../games/freenukum { }; @@ -4238,7 +4344,7 @@ in gallery-dl = python3Packages.callPackage ../applications/misc/gallery-dl { }; - gandi-cli = callPackage ../tools/networking/gandi-cli { }; + gandi-cli = python3Packages.callPackage ../tools/networking/gandi-cli { }; gandom-fonts = callPackage ../data/fonts/gandom-fonts { }; @@ -4288,6 +4394,8 @@ in getmail = callPackage ../tools/networking/getmail { }; + getmail6 = callPackage ../tools/networking/getmail6 { }; + getopt = callPackage ../tools/misc/getopt { }; gexiv2 = callPackage ../development/libraries/gexiv2 { }; @@ -4298,36 +4406,186 @@ in ggobi = callPackage ../tools/graphics/ggobi { }; + gh = callPackage ../applications/version-management/git-and-tools/gh { }; + + ghorg = callPackage ../applications/version-management/git-and-tools/ghorg { }; + + ghq = callPackage ../applications/version-management/git-and-tools/ghq { }; + + ghr = callPackage ../applications/version-management/git-and-tools/ghr { }; + gibo = callPackage ../tools/misc/gibo { }; gifsicle = callPackage ../tools/graphics/gifsicle { }; gifski = callPackage ../tools/graphics/gifski { }; + git-absorb = callPackage ../applications/version-management/git-and-tools/git-absorb { + inherit (darwin.apple_sdk.frameworks) Security; + }; + + inherit (haskellPackages) git-annex; + + git-annex-metadata-gui = libsForQt5.callPackage ../applications/version-management/git-and-tools/git-annex-metadata-gui { + inherit (python3Packages) buildPythonApplication pyqt5 git-annex-adapter; + }; + + git-annex-remote-b2 = callPackage ../applications/version-management/git-and-tools/git-annex-remote-b2 { }; + + git-annex-remote-dbx = callPackage ../applications/version-management/git-and-tools/git-annex-remote-dbx { + inherit (python3Packages) + buildPythonApplication + fetchPypi + dropbox + annexremote + humanfriendly; + }; + + git-annex-remote-rclone = callPackage ../applications/version-management/git-and-tools/git-annex-remote-rclone { }; + + git-annex-utils = callPackage ../applications/version-management/git-and-tools/git-annex-utils { }; + + git-appraise = callPackage ../applications/version-management/git-and-tools/git-appraise {}; + git-backup = callPackage ../applications/version-management/git-backup { inherit (darwin.apple_sdk.frameworks) Security; }; git-big-picture = callPackage ../applications/version-management/git-and-tools/git-big-picture { }; + inherit (haskellPackages) git-brunch; + + git-bug = callPackage ../applications/version-management/git-and-tools/git-bug { }; + + # support for bugzilla + git-bz = callPackage ../applications/version-management/git-and-tools/git-bz { }; + + git-chglog = callPackage ../applications/version-management/git-and-tools/git-chglog { }; + + git-cinnabar = callPackage ../applications/version-management/git-and-tools/git-cinnabar { }; + + git-codeowners = callPackage ../applications/version-management/git-and-tools/git-codeowners { }; + + git-codereview = callPackage ../applications/version-management/git-and-tools/git-codereview { }; + + git-cola = callPackage ../applications/version-management/git-and-tools/git-cola { }; + git-crecord = callPackage ../applications/version-management/git-crecord { }; + git-crypt = callPackage ../applications/version-management/git-and-tools/git-crypt { }; + + git-delete-merged-branches = callPackage ../applications/version-management/git-and-tools/git-delete-merged-branches { }; + + git-dit = callPackage ../applications/version-management/git-and-tools/git-dit { + inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; + }; + + git-extras = callPackage ../applications/version-management/git-and-tools/git-extras { }; + + git-fame = callPackage ../applications/version-management/git-and-tools/git-fame {}; + + git-fast-export = callPackage ../applications/version-management/git-and-tools/fast-export { mercurial = mercurial_4; }; + + git-filter-repo = callPackage ../applications/version-management/git-and-tools/git-filter-repo { + pythonPackages = python3Packages; + }; + + git-gone = callPackage ../applications/version-management/git-and-tools/git-gone { + inherit (darwin.apple_sdk.frameworks) Security; + }; + + git-hound = callPackage ../tools/security/git-hound { }; + + git-hub = callPackage ../applications/version-management/git-and-tools/git-hub { }; + + git-ignore = callPackage ../applications/version-management/git-and-tools/git-ignore { }; + + git-imerge = python3Packages.callPackage ../applications/version-management/git-and-tools/git-imerge { }; + + git-interactive-rebase-tool = callPackage ../applications/version-management/git-and-tools/git-interactive-rebase-tool { + inherit (darwin.apple_sdk.frameworks) Security; + }; + git-lfs = lowPrio (callPackage ../applications/version-management/git-lfs { }); git-lfs1 = callPackage ../applications/version-management/git-lfs/1.nix { }; git-ftp = callPackage ../development/tools/git-ftp { }; + git-machete = python3Packages.callPackage ../applications/version-management/git-and-tools/git-machete { }; + + git-my = callPackage ../applications/version-management/git-and-tools/git-my { }; + + git-octopus = callPackage ../applications/version-management/git-and-tools/git-octopus { }; + + git-open = callPackage ../applications/version-management/git-and-tools/git-open { }; + + git-radar = callPackage ../applications/version-management/git-and-tools/git-radar { }; + + git-recent = callPackage ../applications/version-management/git-and-tools/git-recent { + util-linux = if stdenv.isLinux then util-linuxMinimal else util-linux; + }; + + git-remote-codecommit = python3Packages.callPackage ../applications/version-management/git-and-tools/git-remote-codecommit { }; + + git-remote-gcrypt = callPackage ../applications/version-management/git-and-tools/git-remote-gcrypt { }; + + git-remote-hg = callPackage ../applications/version-management/git-and-tools/git-remote-hg { }; + + git-reparent = callPackage ../applications/version-management/git-and-tools/git-reparent { }; + + git-secret = callPackage ../applications/version-management/git-and-tools/git-secret { }; + + git-secrets = callPackage ../applications/version-management/git-and-tools/git-secrets { }; + git-series = callPackage ../development/tools/git-series { }; git-sizer = callPackage ../applications/version-management/git-sizer { }; + git-standup = callPackage ../applications/version-management/git-and-tools/git-standup { }; + + git-stree = callPackage ../applications/version-management/git-and-tools/git-stree { }; + + git-subrepo = callPackage ../applications/version-management/git-and-tools/git-subrepo { }; + + git-subset = callPackage ../applications/version-management/git-and-tools/git-subset { + inherit (darwin.apple_sdk.frameworks) Security; + }; + + git-subtrac = callPackage ../applications/version-management/git-and-tools/git-subtrac { }; + + git-sync = callPackage ../applications/version-management/git-and-tools/git-sync { }; + + git-test = callPackage ../applications/version-management/git-and-tools/git-test { }; + + git-trim = callPackage ../applications/version-management/git-and-tools/git-trim { + inherit (darwin.apple_sdk.frameworks) Security; + }; + git-up = callPackage ../applications/version-management/git-up { pythonPackages = python3Packages; }; + git-vanity-hash = callPackage ../applications/version-management/git-and-tools/git-vanity-hash { }; + + git-when-merged = callPackage ../applications/version-management/git-and-tools/git-when-merged { }; + + git-workspace = callPackage ../applications/version-management/git-and-tools/git-workspace { + inherit (darwin.apple_sdk.frameworks) Security; + }; + + git2cl = callPackage ../applications/version-management/git-and-tools/git2cl { }; + + gita = python3Packages.callPackage ../applications/version-management/git-and-tools/gita { }; + + gitbatch = callPackage ../applications/version-management/git-and-tools/gitbatch { }; + + gitflow = callPackage ../applications/version-management/git-and-tools/gitflow { }; + gitfs = callPackage ../tools/filesystems/gitfs { }; + gitin = callPackage ../applications/version-management/git-and-tools/gitin { }; + gitinspector = callPackage ../applications/version-management/gitinspector { }; gitkraken = callPackage ../applications/version-management/gitkraken { }; @@ -4350,12 +4608,21 @@ in gitlab-workhorse = callPackage ../applications/version-management/gitlab/gitlab-workhorse { }; + gitleaks = callPackage ../tools/security/gitleaks { }; + gitaly = callPackage ../applications/version-management/gitlab/gitaly { ruby = ruby_2_7; }; gitstats = callPackage ../applications/version-management/gitstats { }; + gitstatus = callPackage ../applications/version-management/git-and-tools/gitstatus { }; + + gitui = callPackage ../applications/version-management/git-and-tools/gitui { + inherit (darwin.apple_sdk.frameworks) Security AppKit; + inherit (pkgs) openssl perl; + }; + gogs = callPackage ../applications/version-management/gogs { }; git-latexdiff = callPackage ../tools/typesetting/git-latexdiff { }; @@ -4364,6 +4631,8 @@ in gl2ps = callPackage ../development/libraries/gl2ps { }; + glab = callPackage ../applications/version-management/git-and-tools/glab { }; + glusterfs = callPackage ../tools/filesystems/glusterfs { }; glmark2 = callPackage ../tools/graphics/glmark2 { }; @@ -4443,8 +4712,6 @@ in gnutar = callPackage ../tools/archivers/gnutar { }; - gnuvd = callPackage ../tools/misc/gnuvd { }; - goaccess = callPackage ../tools/misc/goaccess { }; gocryptfs = callPackage ../tools/filesystems/gocryptfs { }; @@ -4577,10 +4844,14 @@ in grpcui = callPackage ../tools/networking/grpcui { }; + grpc-tools = callPackage ../development/tools/misc/grpc-tools { }; + grub = pkgsi686Linux.callPackage ../tools/misc/grub ({ stdenv = overrideCC stdenv buildPackages.pkgsi686Linux.gcc6; } // (config.grub or {})); + grv = callPackage ../applications/version-management/git-and-tools/grv { }; + trustedGrub = pkgsi686Linux.callPackage ../tools/misc/grub/trusted.nix { }; trustedGrub-for-HP = pkgsi686Linux.callPackage ../tools/misc/grub/trusted.nix { for_HP_laptop = true; }; @@ -4730,6 +5001,8 @@ in hasmail = callPackage ../applications/networking/mailreaders/hasmail { }; + haste-client = callPackage ../tools/misc/haste-client { }; + hal-flash = callPackage ../os-specific/linux/hal-flash { }; hal-hardware-analyzer = libsForQt5.callPackage ../applications/science/electronics/hal-hardware-analyzer { }; @@ -4763,12 +5036,11 @@ in hdf5 = callPackage ../tools/misc/hdf5 { gfortran = null; szip = null; - mpi = null; }; hdf5-mpi = appendToName "mpi" (hdf5.override { szip = null; - mpi = pkgs.openmpi; + mpiSupport = true; }); hdf5-cpp = appendToName "cpp" (hdf5.override { @@ -4786,6 +5058,8 @@ in configureFlags = oldAttrs.configureFlags ++ ["--enable-threadsafe" "--disable-hl" ]; })); + hdf5-blosc = callPackage ../development/libraries/hdf5-blosc { }; + hdfview = callPackage ../tools/misc/hdfview { javac = jdk8; # TODO: https://github.com/NixOS/nixpkgs/pull/89731 }; @@ -4847,6 +5121,8 @@ in http-getter = callPackage ../applications/networking/flent/http-getter.nix { }; + httpdump = callPackage ../tools/security/httpdump { }; + httpie = callPackage ../tools/networking/httpie { }; httping = callPackage ../tools/networking/httping {}; @@ -4861,6 +5137,8 @@ in httpx = callPackage ../tools/security/httpx { }; + hub = callPackage ../applications/version-management/git-and-tools/hub { }; + hubicfuse = callPackage ../tools/filesystems/hubicfuse { }; humanfriendly = with python3Packages; toPythonApplication humanfriendly; @@ -4884,11 +5162,9 @@ in i2pd = callPackage ../tools/networking/i2pd { }; - i-score = libsForQt514.callPackage ../applications/audio/i-score { }; - iasl = callPackage ../development/compilers/iasl { }; - iannix = libsForQt514.callPackage ../applications/audio/iannix { }; + iannix = libsForQt5.callPackage ../applications/audio/iannix { }; jamulus = libsForQt5.callPackage ../applications/audio/jamulus { }; @@ -4941,8 +5217,12 @@ in packages = config.ihaskell.packages or (self: []); }; + ijq = callPackage ../development/tools/ijq { }; + iruby = callPackage ../applications/editors/jupyter-kernels/iruby { }; + ike-scan = callPackage ../tools/security/ike-scan { }; + imapproxy = callPackage ../tools/networking/imapproxy { openssl = openssl_1_0_2; }; @@ -5271,6 +5551,8 @@ in k6 = callPackage ../development/tools/k6 { }; + lab = callPackage ../applications/version-management/git-and-tools/lab { }; + lalezar-fonts = callPackage ../data/fonts/lalezar-fonts { }; ldc = callPackage ../development/compilers/ldc { }; @@ -5279,7 +5561,11 @@ in lbreakout2 = callPackage ../games/lbreakout2 { }; - lefthook = gitAndTools.lefthook; + lefthook = callPackage ../applications/version-management/git-and-tools/lefthook { + # Please use empty attrset once upstream bugs have been fixed + # https://github.com/Arkweid/lefthook/issues/151 + buildGoModule = buildGo114Module; + }; lego = callPackage ../tools/admin/lego { }; @@ -5373,6 +5659,10 @@ in kristall = libsForQt5.callPackage ../applications/networking/browsers/kristall { }; + lagrange = callPackage ../applications/networking/browsers/lagrange { + inherit (darwin.apple_sdk.frameworks) AppKit; + }; + kzipmix = pkgsi686Linux.callPackage ../tools/compression/kzipmix { }; ma1sd = callPackage ../servers/ma1sd { }; @@ -5397,6 +5687,8 @@ in matrix-appservice-discord = callPackage ../servers/matrix-appservice-discord { }; + matrix-corporal = callPackage ../servers/matrix-corporal { }; + mautrix-telegram = recurseIntoAttrs (callPackage ../servers/mautrix-telegram { }); mautrix-whatsapp = callPackage ../servers/mautrix-whatsapp { }; @@ -5603,6 +5895,8 @@ in libircclient = callPackage ../development/libraries/libircclient { }; + libiscsi = callPackage ../development/libraries/libiscsi { }; + libisds = callPackage ../development/libraries/libisds { }; libite = callPackage ../development/libraries/libite { }; @@ -5684,7 +5978,8 @@ in inherit (callPackages ../development/libraries/libwebsockets { }) libwebsockets_3_1 libwebsockets_3_2 - libwebsockets_4_0; + libwebsockets_4_0 + libwebsockets_4_1; libwebsockets = libwebsockets_3_2; licensee = callPackage ../tools/package-management/licensee { }; @@ -6098,6 +6393,8 @@ in netcdffortran = callPackage ../development/libraries/netcdf-fortran { }; + networking-ts-cxx = callPackage ../development/libraries/networking-ts-cxx { }; + nco = callPackage ../development/libraries/nco { }; ncftp = callPackage ../tools/networking/ncftp { }; @@ -6213,6 +6510,8 @@ in nvidiaGpuSupport = config.cudaSupport or false; }; + nomad-driver-podman = callPackage ../applications/networking/cluster/nomad-driver-podman { }; + notable = callPackage ../applications/misc/notable { }; nvchecker = with python3Packages; toPythonApplication nvchecker; @@ -6546,6 +6845,8 @@ in ovh-ttyrec = callPackage ../tools/misc/ovh-ttyrec { }; + ovito = libsForQt5.callPackage ../applications/graphics/ovito { }; + owncloud-client = libsForQt514.callPackage ../applications/networking/owncloud-client { }; oxidized = callPackage ../tools/admin/oxidized { }; @@ -6665,6 +6966,8 @@ in pcsc-cyberjack = callPackage ../tools/security/pcsc-cyberjack { }; + pcsc-safenet = callPackage ../tools/security/pcsc-safenet { }; + pcsc-scm-scl011 = callPackage ../tools/security/pcsc-scm-scl011 { }; ifdnfc = callPackage ../tools/security/ifdnfc { }; @@ -6794,6 +7097,8 @@ in tautulli = python3Packages.callPackage ../servers/tautulli { }; + pleroma-otp = callPackage ../servers/pleroma-otp { }; + ploticus = callPackage ../tools/graphics/ploticus { libpng = libpng12; }; @@ -6866,7 +7171,7 @@ in pptpd = callPackage ../tools/networking/pptpd {}; - pre-commit = gitAndTools.pre-commit; + pre-commit = with python3Packages; toPythonApplication pre-commit; pretty-simple = callPackage ../development/tools/pretty-simple { }; @@ -6890,6 +7195,8 @@ in inherit (callPackages ../tools/security/proxmark3 { gcc-arm-embedded = gcc-arm-embedded-8; }) proxmark3 proxmark3-unstable; + proxmark3-rrg = libsForQt5.callPackage ../tools/security/proxmark3/proxmark3-rrg.nix { }; + proxychains = callPackage ../tools/networking/proxychains { }; proxify = callPackage ../tools/networking/proxify { }; @@ -6906,6 +7213,8 @@ in pastebinit = callPackage ../tools/misc/pastebinit { }; + pifi = callPackage ../applications/audio/pifi { }; + pmacct = callPackage ../tools/networking/pmacct { }; pmix = callPackage ../development/libraries/pmix { }; @@ -6954,6 +7263,10 @@ in pympress = callPackage ../applications/office/pympress { }; + pyspread = python3Packages.callPackage ../applications/office/pyspread { + inherit (qt5) qtsvg wrapQtAppsHook; + }; + pythonIRClib = pythonPackages.pythonIRClib; pyditz = callPackage ../applications/misc/pyditz { @@ -6986,6 +7299,8 @@ in openmpi = callPackage ../development/libraries/openmpi { }; + mpi = openmpi; # this attribute should used to build MPI applications + ucx = callPackage ../development/libraries/ucx {}; openmodelica = callPackage ../applications/science/misc/openmodelica { @@ -7008,6 +7323,8 @@ in qdigidoc = libsForQt5.callPackage ../tools/security/qdigidoc { } ; + qgit = qt5.callPackage ../applications/version-management/git-and-tools/qgit { }; + qgrep = callPackage ../tools/text/qgrep { inherit (darwin.apple_sdk.frameworks) CoreServices CoreFoundation; }; @@ -7032,6 +7349,8 @@ in qtikz = libsForQt5.callPackage ../applications/graphics/ktikz { }; + quickfix = callPackage ../development/libraries/quickfix { }; + quickjs = callPackage ../development/interpreters/quickjs { }; quickserve = callPackage ../tools/networking/quickserve { }; @@ -7218,6 +7537,8 @@ in inherit (darwin) libiconv; }; + rs-git-fsmonitor = callPackage ../applications/version-management/git-and-tools/rs-git-fsmonitor { }; + rsnapshot = callPackage ../tools/backup/rsnapshot { }; rlwrap = callPackage ../tools/misc/rlwrap { }; @@ -7232,6 +7553,8 @@ in rpPPPoE = callPackage ../tools/networking/rp-pppoe { }; + rpi-imager = libsForQt5.callPackage ../tools/misc/rpi-imager { }; + rpiboot-unstable = callPackage ../development/misc/rpiboot/unstable.nix { }; rpm = callPackage ../tools/package-management/rpm { @@ -7304,6 +7627,8 @@ in s6-dns = skawarePackages.s6-dns; + s6-linux-init = skawarePackages.s6-linux-init; + s6-linux-utils = skawarePackages.s6-linux-utils; s6-networking = skawarePackages.s6-networking; @@ -7348,6 +7673,8 @@ in scdoc = callPackage ../tools/typesetting/scdoc { }; + scmpuff = callPackage ../applications/version-management/git-and-tools/scmpuff { }; + scream-receivers = callPackage ../misc/scream-receivers { pulseSupport = config.pulseaudio or false; }; @@ -7422,6 +7749,8 @@ in sewer = callPackage ../tools/admin/sewer { }; + sfeed = callPackage ../tools/misc/sfeed { }; + sftpman = callPackage ../tools/filesystems/sftpman { }; screenfetch = callPackage ../tools/misc/screenfetch { }; @@ -7432,6 +7761,8 @@ in shadowsocks-libev = callPackage ../tools/networking/shadowsocks-libev { }; + shadered = callPackage ../development/tools/shadered { }; + go-shadowsocks2 = callPackage ../tools/networking/go-shadowsocks2 { }; shabnam-fonts = callPackage ../data/fonts/shabnam-fonts { }; @@ -7585,6 +7916,8 @@ in soapui = callPackage ../applications/networking/soapui { }; + spglib = callPackage ../development/libraries/spglib { }; + ssh-askpass-fullscreen = callPackage ../tools/networking/ssh-askpass-fullscreen { }; sshguard = callPackage ../tools/security/sshguard {}; @@ -7593,6 +7926,8 @@ in ssh-chat = callPackage ../applications/networking/instant-messengers/ssh-chat { }; + ssh-to-pgp = callPackage ../tools/security/ssh-to-pgp { }; + suricata = callPackage ../applications/networking/ids/suricata { python = python3; }; @@ -7607,8 +7942,6 @@ in sonar-scanner-cli = callPackage ../tools/security/sonar-scanner-cli { }; solr = callPackage ../servers/search/solr { }; - solr_7 = solr; - solr_8 = solr; solvespace = callPackage ../applications/graphics/solvespace { }; @@ -7690,6 +8023,8 @@ in sstp = callPackage ../tools/networking/sstp {}; + stgit = callPackage ../applications/version-management/git-and-tools/stgit { }; + strip-nondeterminism = perlPackages.strip-nondeterminism; structure-synth = callPackage ../tools/graphics/structure-synth { }; @@ -7698,6 +8033,8 @@ in subberthehut = callPackage ../tools/misc/subberthehut { }; + subgit = callPackage ../applications/version-management/git-and-tools/subgit { }; + subsurface = libsForQt514.callPackage ../applications/misc/subsurface { }; sudo = callPackage ../tools/security/sudo { }; @@ -7787,8 +8124,14 @@ in swec = callPackage ../tools/networking/swec { }; + svn2git = callPackage ../applications/version-management/git-and-tools/svn2git { + git = gitSVN; + }; + svnfs = callPackage ../tools/filesystems/svnfs { }; + svn-all-fast-export = libsForQt5.callPackage ../applications/version-management/git-and-tools/svn-all-fast-export { }; + svtplay-dl = callPackage ../tools/misc/svtplay-dl { }; sycl-info = callPackage ../development/libraries/sycl-info { }; @@ -7830,6 +8173,8 @@ in inherit (darwin.apple_sdk.frameworks) IOKit; }; + tangram = callPackage ../applications/networking/instant-messengers/tangram { }; + t1utils = callPackage ../tools/misc/t1utils { }; talkfilters = callPackage ../misc/talkfilters {}; @@ -7838,6 +8183,8 @@ in targetcli = callPackage ../os-specific/linux/targetcli { }; + target-isns = callPackage ../os-specific/linux/target-isns { }; + tarsnap = callPackage ../tools/backup/tarsnap { }; tarsnapper = callPackage ../tools/backup/tarsnapper { }; @@ -7918,6 +8265,8 @@ in thefuck = python3Packages.callPackage ../tools/misc/thefuck { }; + thicket = callPackage ../applications/version-management/git-and-tools/thicket { }; + thin-provisioning-tools = callPackage ../tools/misc/thin-provisioning-tools { }; thinkpad-scripts = python3.pkgs.callPackage ../tools/misc/thinkpad-scripts { }; @@ -7928,6 +8277,8 @@ in tilem = callPackage ../misc/emulators/tilem { }; + tilp2 = callPackage ../applications/science/math/tilp2 { }; + timemachine = callPackage ../applications/audio/timemachine { }; timelapse-deflicker = callPackage ../applications/graphics/timelapse-deflicker { }; @@ -7988,6 +8339,8 @@ in tmuxinator = callPackage ../tools/misc/tmuxinator { }; + tmux-mem-cpu-load = callPackage ../tools/misc/tmux-mem-cpu-load { }; + tmux-xpanes = callPackage ../tools/misc/tmux-xpanes { }; tmuxPlugins = recurseIntoAttrs (callPackage ../misc/tmux-plugins { }); @@ -8004,6 +8357,8 @@ in inherit (darwin.apple_sdk.frameworks) Foundation; }; + top-git = callPackage ../applications/version-management/git-and-tools/topgit { }; + tor = callPackage ../tools/security/tor { }; tor-arm = callPackage ../tools/security/tor/tor-arm.nix { }; @@ -8058,6 +8413,8 @@ in tracefilesim = callPackage ../development/tools/analysis/garcosim/tracefilesim { }; + transcrypt = callPackage ../applications/version-management/git-and-tools/transcrypt { }; + transifex-client = python3.pkgs.callPackage ../tools/text/transifex-client { }; translate-shell = callPackage ../applications/misc/translate-shell { }; @@ -8156,10 +8513,6 @@ in udptunnel = callPackage ../tools/networking/udptunnel { }; - ufraw = callPackage ../applications/graphics/ufraw { - stdenv = gcc6Stdenv; # doesn't build with gcc7 - }; - uftrace = callPackage ../development/tools/uftrace { }; uget = callPackage ../tools/networking/uget { }; @@ -8295,6 +8648,10 @@ in vix = callPackage ../tools/misc/vix { }; + vkBasalt = callPackage ../tools/graphics/vkBasalt { + vkBasalt32 = pkgsi686Linux.vkBasalt; + }; + vnc2flv = callPackage ../tools/video/vnc2flv {}; vncrec = callPackage ../tools/video/vncrec { }; @@ -8443,6 +8800,8 @@ in inherit (darwin.apple_sdk.frameworks) SystemConfiguration Foundation; }; + htmltest = callPackage ../development/tools/htmltest { }; + rcm = callPackage ../tools/misc/rcm {}; td = callPackage ../tools/misc/td { }; @@ -8878,6 +9237,8 @@ in zsh-fast-syntax-highlighting = callPackage ../shells/zsh/zsh-fast-syntax-highlighting { }; + zsh-fzf-tab = callPackage ../shells/zsh/zsh-fzf-tab { }; + zsh-autosuggestions = callPackage ../shells/zsh/zsh-autosuggestions { }; zsh-powerlevel10k = callPackage ../shells/zsh/zsh-powerlevel10k { }; @@ -8961,6 +9322,8 @@ in pash = callPackage ../shells/pash { }; + scponly = callPackage ../shells/scponly { }; + tcsh = callPackage ../shells/tcsh { }; rush = callPackage ../shells/rush { }; @@ -9219,8 +9582,6 @@ in mkdir -p "$rsrc/lib" ln -s "${cc}/lib" "$rsrc/include" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - '' + lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) '' - echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags ''; }; @@ -9234,13 +9595,14 @@ in crystal_0_33 crystal_0_34 crystal_0_35 + crystal_0_36 crystal; crystal2nix = callPackage ../development/compilers/crystal2nix { }; icr = callPackage ../development/tools/icr { }; - scry = callPackage ../development/tools/scry {}; + scry = callPackage ../development/tools/scry { }; dasm = callPackage ../development/compilers/dasm/default.nix { }; @@ -9261,7 +9623,9 @@ in elm2nix = haskell.lib.justStaticExecutables haskellPackages.elm2nix; - elmPackages = recurseIntoAttrs (callPackage ../development/compilers/elm { }); + elmPackages = recurseIntoAttrs (callPackage ../development/compilers/elm { + inherit (darwin.apple_sdk.frameworks) Security; + }); apache-flex-sdk = callPackage ../development/compilers/apache-flex-sdk { }; @@ -9279,8 +9643,6 @@ in flutterPackages = recurseIntoAttrs (callPackage ../development/compilers/flutter { }); flutter = flutterPackages.stable; - flutter-beta = flutterPackages.beta; - flutter-dev = flutterPackages.dev; fpc = callPackage ../development/compilers/fpc { }; @@ -9569,7 +9931,7 @@ in langCC = false; langC = false; profiledCompiler = false; - inherit zip unzip zlib boehmgc gettext pkgconfig perl; + inherit zip unzip zlib boehmgc gettext pkg-config perl; inherit (gnome2) libart_lgpl; }); @@ -9691,6 +10053,8 @@ in remarkable-toolchain = callPackage ../development/tools/misc/remarkable/remarkable-toolchain { }; + remarkable2-toolchain = callPackage ../development/tools/misc/remarkable/remarkable2-toolchain { }; + tacacsplus = callPackage ../servers/tacacsplus { }; tamarin-prover = @@ -9790,7 +10154,7 @@ in # package. Wishing we could merge it into one irony package, to avoid this issue, # but its emacs-side expression is autogenerated, and we can't hook into it (other # than peek into its version). - inherit (emacsPackages.melpaStablePackages) irony; + inherit (emacs.pkgs.melpaStablePackages) irony; }; hugs = callPackage ../development/interpreters/hugs { }; @@ -9863,6 +10227,7 @@ in headless = true; inherit (gnome2) GConf gnome_vfs; openjdk13-bootstrap = callPackage ../development/compilers/openjdk/12.nix { + stdenv = gcc8Stdenv; /* build segfaults with gcc9 or newer, so use gcc8 like Debian does */ openjfx = openjfx11; /* need this despite next line :-( */ enableJavaFX = false; headless = true; @@ -9920,9 +10285,9 @@ in inherit (darwin) libiconv libobjc libresolv; }) mx jvmci8 graalvm8; - inherit (callPackages ../development/compilers/graalvm/community-edition.nix { }) - graalvm8-ce - graalvm11-ce; + inherit (callPackages ../development/compilers/graalvm/community-edition.nix { + inherit (darwin.apple_sdk.frameworks) Foundation; + }) graalvm8-ce graalvm11-ce; inherit (callPackages ../development/compilers/graalvm/enterprise-edition.nix { }) graalvm8-ee @@ -10231,7 +10596,8 @@ in inherit (callPackage ../development/tools/ocaml/ocamlformat { }) ocamlformat # latest version ocamlformat_0_11_0 ocamlformat_0_12 ocamlformat_0_13_0 ocamlformat_0_14_0 - ocamlformat_0_14_1 ocamlformat_0_14_2 ocamlformat_0_14_3 ocamlformat_0_15_0; + ocamlformat_0_14_1 ocamlformat_0_14_2 ocamlformat_0_14_3 ocamlformat_0_15_0 + ocamlformat_0_15_1 ocamlformat_0_16_0; orc = callPackage ../development/compilers/orc { }; @@ -10258,6 +10624,8 @@ in inherit (ocaml-ng.ocamlPackages_4_05) ocaml; }; + opam-installer = callPackage ../development/tools/ocaml/opam/installer.nix { }; + open-watcom-bin = callPackage ../development/compilers/open-watcom-bin { }; pforth = callPackage ../development/compilers/pforth {}; @@ -10383,6 +10751,7 @@ in cargo-asm = callPackage ../development/tools/rust/cargo-asm { inherit (darwin.apple_sdk.frameworks) Security; }; + cargo-binutils = callPackage ../development/tools/rust/cargo-binutils { }; cargo-bloat = callPackage ../development/tools/rust/cargo-bloat { }; cargo-cache = callPackage ../development/tools/rust/cargo-cache { inherit (darwin.apple_sdk.frameworks) Security; @@ -10408,17 +10777,20 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; cargo-insta = callPackage ../development/tools/rust/cargo-insta { }; + cargo-limit = callPackage ../development/tools/rust/cargo-limit { }; cargo-make = callPackage ../development/tools/rust/cargo-make { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; cargo-raze = callPackage ../development/tools/rust/cargo-raze { inherit (darwin.apple_sdk.frameworks) Security; }; + cargo-readme = callPackage ../development/tools/rust/cargo-readme {}; cargo-sweep = callPackage ../development/tools/rust/cargo-sweep { }; cargo-sync-readme = callPackage ../development/tools/rust/cargo-sync-readme {}; cargo-udeps = callPackage ../development/tools/rust/cargo-udeps { inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; + cargo-valgrind = callPackage ../development/tools/rust/cargo-valgrind { }; cargo-watch = callPackage ../development/tools/rust/cargo-watch { inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -10430,6 +10802,10 @@ in crate2nix = callPackage ../development/tools/rust/crate2nix { }; + convco = callPackage ../development/tools/convco { + inherit (darwin.apple_sdk.frameworks) Security; + }; + maturin = callPackage ../development/tools/rust/maturin { }; inherit (rustPackages) rls; rustfmt = rustPackages.rustfmt; @@ -10497,6 +10873,8 @@ in jdk = oraclejdk; }; + sqlx-cli = callPackage ../development/tools/rust/sqlx-cli { }; + squeak = callPackage ../development/compilers/squeak { }; squirrel-sql = callPackage ../development/tools/database/squirrel-sql { @@ -10511,12 +10889,6 @@ in swift = callPackage ../development/compilers/swift { }; - symbiflow-vtr = callPackage ../development/compilers/symbiflow-vtr { }; - - symbiflow-yosys = callPackage ../development/compilers/symbiflow-yosys { }; - - symbiflow-yosys-plugins = callPackage ../development/compilers/symbiflow-yosys-plugins { }; - swiProlog = callPackage ../development/compilers/swi-prolog { inherit (darwin.apple_sdk.frameworks) Security; jdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 @@ -10629,6 +11001,8 @@ in yasm = callPackage ../development/compilers/yasm { }; yosys = callPackage ../development/compilers/yosys { }; + yosys-bluespec = callPackage ../development/compilers/yosys/plugins/bluespec.nix { }; + yosys-ghdl = callPackage ../development/compilers/yosys/plugins/ghdl.nix { }; z88dk = callPackage ../development/compilers/z88dk { }; @@ -10773,6 +11147,8 @@ in lxrandr = callPackage ../desktops/lxde/core/lxrandr { }; + lxsession = callPackage ../desktops/lxde/core/lxsession { }; + kona = callPackage ../development/interpreters/kona {}; lolcode = callPackage ../development/interpreters/lolcode { }; @@ -10887,8 +11263,6 @@ in polyml56 = callPackage ../development/compilers/polyml/5.6.nix { }; polyml57 = callPackage ../development/compilers/polyml/5.7.nix { }; - prjxray-tools = callPackage ../development/compilers/prjxray-tools { }; - pure = callPackage ../development/interpreters/pure { /*llvm = llvm_35;*/ }; @@ -11372,6 +11746,7 @@ in bingrep = callPackage ../development/tools/analysis/bingrep { }; binutils-unwrapped = callPackage ../development/tools/misc/binutils { + autoreconfHook = if targetPlatform.isiOS then autoreconfHook269 else autoreconfHook; # FHS sys dirs presumably only have stuff for the build platform noSysDirs = (stdenv.targetPlatform != stdenv.hostPlatform) || noSysDirs; }; @@ -11516,7 +11891,7 @@ in cloudcompare = libsForQt5.callPackage ../applications/graphics/cloudcompare {}; - cloudfoundry-cli = callPackage ../development/tools/cloudfoundry-cli { }; + cloudfoundry-cli = callPackage ../applications/networking/cluster/cloudfoundry-cli { }; clpm = callPackage ../development/tools/clpm {}; @@ -11692,7 +12067,7 @@ in doctl = callPackage ../development/tools/doctl { }; - doit = callPackage ../development/tools/build-managers/doit { }; + doit = with python3Packages; toPythonApplication doit; dolt = callPackage ../servers/sql/dolt { }; @@ -11864,7 +12239,7 @@ in gradle_4_10 = res.gradleGen.gradle_4_10; gradle_4 = gradle_4_10; gradle_5 = res.gradleGen.gradle_5_6; - gradle_6 = res.gradleGen.gradle_6_7; + gradle_6 = res.gradleGen.gradle_6_8; gperf = callPackage ../development/tools/misc/gperf { }; # 3.1 changed some parameters from int to size_t, leading to mismatches. @@ -11942,7 +12317,9 @@ in jam = callPackage ../development/tools/build-managers/jam { }; - jamomacore = callPackage ../development/libraries/audio/jamomacore { }; + javacc = callPackage ../development/tools/parsing/javacc { + jdk = jdk8; + }; jbake = callPackage ../development/tools/jbake { }; @@ -12186,14 +12563,12 @@ in pkg-config = callPackage ../build-support/pkg-config-wrapper { pkg-config = pkg-config-unwrapped; }; - pkgconfig = pkg-config; # added 2018-02-02 pkg-configUpstream = lowPrio (pkg-config.override (old: { pkg-config = old.pkg-config.override { vanilla = true; }; })); - pkgconfigUpstream = pkg-configUpstream; # added 2018-02-02 inherit (nodePackages) postcss-cli; @@ -12225,6 +12600,8 @@ in puppet-lint = callPackage ../development/tools/puppet/puppet-lint { }; + puppeteer-cli = callPackage ../tools/graphics/puppeteer-cli {}; + pyrseas = callPackage ../development/tools/database/pyrseas { }; qtcreator = libsForQt514.callPackage ../development/tools/qtcreator { }; @@ -12446,6 +12823,8 @@ in terraformer = callPackage ../development/tools/misc/terraformer { }; + terrascan = callPackage ../tools/security/terrascan { }; + texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { }; texinfo4 = texinfo413; texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { }; @@ -12472,8 +12851,6 @@ in todoist-electron = callPackage ../applications/misc/todoist-electron { }; - todolist = callPackage ../applications/misc/todolist { }; - travis = callPackage ../development/tools/misc/travis { }; tree-sitter = callPackage ../development/tools/parsing/tree-sitter { @@ -12595,6 +12972,8 @@ in ytt = callPackage ../development/tools/ytt {}; + zydis = callPackage ../development/libraries/zydis { }; + winpdb = callPackage ../development/tools/winpdb { }; grabserial = callPackage ../development/tools/grabserial { }; @@ -12733,6 +13112,8 @@ in bamf = callPackage ../development/libraries/bamf { }; + inherit (callPackages ../development/libraries/bashup-events { }) bashup-events32 bashup-events44; + bcg729 = callPackage ../development/libraries/bcg729 { }; bctoolbox = callPackage ../development/libraries/bctoolbox { }; @@ -12793,8 +13174,14 @@ in boost_process = callPackage ../development/libraries/boost-process { }; - botan = callPackage ../development/libraries/botan { openssl = openssl_1_0_2; }; - botan2 = callPackage ../development/libraries/botan/2.0.nix { }; + botan = callPackage ../development/libraries/botan { + openssl = openssl_1_0_2; + inherit (darwin.apple_sdk.frameworks) CoreServices Security; + }; + + botan2 = callPackage ../development/libraries/botan/2.0.nix { + inherit (darwin.apple_sdk.frameworks) CoreServices Security; + }; box2d = callPackage ../development/libraries/box2d { }; @@ -12823,6 +13210,8 @@ in capnproto = callPackage ../development/libraries/capnproto { }; + capnproto-java = callPackage ../development/tools/capnproto-java { }; + captive-browser = callPackage ../applications/networking/browsers/captive-browser { }; ndn-cxx = callPackage ../development/libraries/ndn-cxx { }; @@ -12923,6 +13312,8 @@ in cointop = callPackage ../applications/misc/cointop { }; + cog = callPackage ../development/web/cog { }; + ctl = callPackage ../development/libraries/ctl { }; ctpp2 = callPackage ../development/libraries/ctpp2 { }; @@ -12979,6 +13370,8 @@ in cxx-prettyprint = callPackage ../development/libraries/cxx-prettyprint { }; + cxxopts = callPackage ../development/libraries/cxxopts { }; + cxxtest = python2Packages.callPackage ../development/libraries/cxxtest { }; cypress = callPackage ../development/web/cypress { }; @@ -13160,6 +13553,7 @@ in ffmpeg-full = callPackage ../development/libraries/ffmpeg-full { svt-av1 = if stdenv.isAarch64 then null else svt-av1; + rav1e = null; # We already have SVT-AV1 for faster encoding # The following need to be fixed on Darwin libjack2 = if stdenv.isDarwin then null else libjack2; libmodplug = if stdenv.isDarwin then null else libmodplug; @@ -13331,7 +13725,7 @@ in gdal_1_11 = callPackage ../development/libraries/gdal/gdal-1_11.nix { }; - gdal_2 = callPackage ../development/libraries/gdal/2.4.0.nix { }; + gdal_2 = callPackage ../development/libraries/gdal/2.4.nix { }; gdcm = callPackage ../development/libraries/gdcm { }; @@ -13514,6 +13908,8 @@ in gflags = callPackage ../development/libraries/gflags { }; + gfm = callPackage ../applications/science/math/gfm { }; + gperftools = callPackage ../development/libraries/gperftools { }; grab-site = callPackage ../tools/backup/grab-site { }; @@ -13662,6 +14058,11 @@ in inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; }; + gtk4 = callPackage ../development/libraries/gtk/4.x.nix { + inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; + }; + + # On darwin gtk uses cocoa by default instead of x11. gtk3-x11 = gtk3.override { cairo = cairo.override { x11Support = true; }; @@ -14366,6 +14767,8 @@ in libgda = callPackage ../development/libraries/libgda { }; + libgda6 = callPackage ../development/libraries/libgda/6.x.nix { }; + libgdamm = callPackage ../development/libraries/libgdamm { }; libgdata = callPackage ../development/libraries/libgdata { }; @@ -14576,6 +14979,8 @@ in libltc = callPackage ../development/libraries/libltc { }; + liblxi = callPackage ../development/libraries/liblxi { }; + libmaxminddb = callPackage ../development/libraries/libmaxminddb { }; libmcrypt = callPackage ../development/libraries/libmcrypt {}; @@ -14991,6 +15396,16 @@ in libthreadar = callPackage ../development/libraries/libthreadar { }; + libticables2 = callPackage ../development/libraries/libticables2 { }; + + libticalcs2 = callPackage ../development/libraries/libticalcs2 { + inherit (darwin) libobjc; + }; + + libticonv = callPackage ../development/libraries/libticonv { }; + + libtifiles2 = callPackage ../development/libraries/libtifiles2 { }; + libtiff = callPackage ../development/libraries/libtiff { }; libtiger = callPackage ../development/libraries/libtiger { }; @@ -15184,14 +15599,16 @@ in libxmp = callPackage ../development/libraries/libxmp { }; - libxslt = callPackage ../development/libraries/libxslt { - python = if stdenv.isDarwin then python2 else python3; - }; + libxslt = callPackage ../development/libraries/libxslt { }; libxsmm = callPackage ../development/libraries/libxsmm { }; libixp_hg = callPackage ../development/libraries/libixp-hg { }; + libwpe = callPackage ../development/libraries/libwpe { }; + + libwpe-fdo = callPackage ../development/libraries/libwpe/fdo.nix { }; + libyaml = callPackage ../development/libraries/libyaml { }; libyamlcpp = callPackage ../development/libraries/libyaml-cpp { }; @@ -15458,6 +15875,8 @@ in nika-fonts = callPackage ../data/fonts/nika-fonts { }; + nikto = callPackage ../tools/networking/nikto { }; + nlohmann_json = callPackage ../development/libraries/nlohmann_json { }; nntp-proxy = callPackage ../applications/networking/nntp-proxy { }; @@ -15494,7 +15913,34 @@ in nv-codec-headers = callPackage ../development/libraries/nv-codec-headers { }; - nvidia-docker = callPackage ../applications/virtualization/nvidia-docker { }; + mkNvidiaContainerPkg = { name, containerRuntimePath, configTemplate, additionalPaths ? [] }: + let + nvidia-container-runtime = callPackage ../applications/virtualization/nvidia-container-runtime { + inherit containerRuntimePath configTemplate; + }; + in symlinkJoin { + inherit name; + paths = [ + (callPackage ../applications/virtualization/libnvidia-container { }) + nvidia-container-runtime + (callPackage ../applications/virtualization/nvidia-container-toolkit { + inherit nvidia-container-runtime; + }) + ] ++ additionalPaths; + }; + + nvidia-docker = mkNvidiaContainerPkg { + name = "nvidia-docker"; + containerRuntimePath = "${docker}/libexec/docker/runc"; + configTemplate = ../applications/virtualization/nvidia-docker/config.toml; + additionalPaths = [ (callPackage ../applications/virtualization/nvidia-docker { }) ]; + }; + + nvidia-podman = mkNvidiaContainerPkg { + name = "nvidia-podman"; + containerRuntimePath = "${runc}/bin/runc"; + configTemplate = ../applications/virtualization/nvidia-podman/config.toml; + }; nvidia-texture-tools = callPackage ../development/libraries/nvidia-texture-tools { }; @@ -15533,7 +15979,11 @@ in }; openal = openalSoft; - openbabel = callPackage ../development/libraries/openbabel { }; + openbabel = openbabel3; + + openbabel2 = callPackage ../development/libraries/openbabel/2.nix { }; + + openbabel3 = callPackages ../development/libraries/openbabel { }; opencascade = callPackage ../development/libraries/opencascade { inherit (darwin.apple_sdk.frameworks) OpenCL Cocoa; @@ -15589,9 +16039,7 @@ in openh264 = callPackage ../development/libraries/openh264 { }; - openjpeg_1 = callPackage ../development/libraries/openjpeg/1.x.nix { }; - openjpeg_2 = callPackage ../development/libraries/openjpeg/2.x.nix { }; - openjpeg = openjpeg_2; + openjpeg = callPackage ../development/libraries/openjpeg { }; openpa = callPackage ../development/libraries/openpa { }; @@ -15674,6 +16122,8 @@ in pdf2xml = callPackage ../development/libraries/pdf2xml {} ; + pe-parse = callPackage ../development/libraries/pe-parse { }; + inherit (callPackage ../development/libraries/physfs { }) physfs_2 physfs; @@ -15836,7 +16286,7 @@ in qt512 = recurseIntoAttrs (makeOverridable (import ../development/libraries/qt-5/5.12) { inherit newScope; - inherit stdenv fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper; + inherit lib stdenv fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper; inherit bison; inherit cups; inherit dconf; @@ -15851,7 +16301,7 @@ in qt514 = recurseIntoAttrs (makeOverridable (import ../development/libraries/qt-5/5.14) { inherit newScope; - inherit stdenv fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper; + inherit lib stdenv fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper; inherit bison; inherit cups; inherit dconf; @@ -15866,7 +16316,7 @@ in qt515 = recurseIntoAttrs (makeOverridable (import ../development/libraries/qt-5/5.15) { inherit newScope; - inherit stdenv fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper; + inherit lib stdenv fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper; inherit bison; inherit cups; inherit dconf; @@ -16153,6 +16603,7 @@ in s6 = callPackage ../tools/system/s6 { }; s6-dns = callPackage ../tools/networking/s6-dns { }; + s6-linux-init = callPackage ../os-specific/linux/s6-linux-init { }; s6-linux-utils = callPackage ../os-specific/linux/s6-linux-utils { }; s6-networking = callPackage ../tools/networking/s6-networking { }; s6-portable-utils = callPackage ../tools/misc/s6-portable-utils { }; @@ -16378,6 +16829,8 @@ in inherit (darwin.apple_sdk.frameworks) Carbon; }; + tageditor = libsForQt5.callPackage ../applications/audio/tageditor { }; + taglib = callPackage ../development/libraries/taglib { }; taglib_extras = callPackage ../development/libraries/taglib-extras { }; @@ -16386,6 +16839,8 @@ in talloc = callPackage ../development/libraries/talloc { }; + tagparser = callPackage ../development/libraries/tagparser { }; + tclap = callPackage ../development/libraries/tclap {}; tcllib = callPackage ../development/libraries/tcllib { }; @@ -16451,6 +16906,8 @@ in tk-8_6 = callPackage ../development/libraries/tk/8.6.nix { }; tk-8_5 = callPackage ../development/libraries/tk/8.5.nix { tcl = tcl-8_5; }; + tkrzw = callPackage ../development/libraries/tkrzw { }; + tl-expected = callPackage ../development/libraries/tl-expected { }; tnt = callPackage ../development/libraries/tnt { }; @@ -16503,6 +16960,8 @@ in uthash = callPackage ../development/libraries/uthash { }; + uthenticode = callPackage ../development/libraries/uthenticode { }; + utmps = skawarePackages.utmps; ucommon = ucommon_openssl; @@ -16684,7 +17143,7 @@ in }; wxmac = callPackage ../development/libraries/wxwidgets/3.0/mac.nix { - inherit (darwin.apple_sdk.frameworks) AGL Cocoa Kernel; + inherit (darwin.apple_sdk.frameworks) AGL Cocoa Kernel WebKit; inherit (darwin.stubs) setfile rez derez; }; @@ -17208,6 +17667,8 @@ in engelsystem = callPackage ../servers/web-apps/engelsystem { }; + envoy = callPackage ../servers/http/envoy { }; + etcd = callPackage ../servers/etcd { }; etcd_3_4 = callPackage ../servers/etcd/3.4.nix { }; @@ -17226,10 +17687,6 @@ in biboumi = callPackage ../servers/xmpp/biboumi { }; - elasticmq = callPackage ../servers/elasticmq { - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; - elasticmq-server-bin = callPackage ../servers/elasticmq-server-bin { jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 @@ -17273,6 +17730,8 @@ in grafana = callPackage ../servers/monitoring/grafana { }; grafanaPlugins = dontRecurseIntoAttrs (callPackage ../servers/monitoring/grafana/plugins { }); + grafana-agent = callPackage ../servers/monitoring/grafana-agent { }; + grafana-loki = callPackage ../servers/monitoring/loki { }; grafana_reporter = callPackage ../servers/monitoring/grafana-reporter { }; @@ -17283,6 +17742,8 @@ in gobetween = callPackage ../servers/gobetween { }; + graph-cli = callPackage ../tools/graphics/graph-cli { }; + h2o = callPackage ../servers/http/h2o { }; haka = callPackage ../tools/security/haka { }; @@ -17931,6 +18392,8 @@ in sickrage = callPackage ../servers/sickbeard/sickrage.nix { }; + sigurlx = callPackage ../tools/security/sigurlx { }; + sipwitch = callPackage ../servers/sip/sipwitch { }; slimserver = callPackage ../servers/slimserver { }; @@ -18165,6 +18628,8 @@ in batctl = callPackage ../os-specific/linux/batman-adv/batctl.nix { }; + beefi = callPackage ../os-specific/linux/beefi { }; + blktrace = callPackage ../os-specific/linux/blktrace { }; bluez5 = callPackage ../os-specific/linux/bluez { }; @@ -18445,7 +18910,7 @@ in openiscsi = callPackage ../os-specific/linux/open-iscsi { }; - openisns = callPackage ../os-specific/linux/open-isns { }; + open-isns = callPackage ../os-specific/linux/open-isns { }; osx-cpu-temp = callPackage ../os-specific/darwin/osx-cpu-temp { inherit (pkgs.darwin.apple_sdk.frameworks) IOKit; @@ -18540,7 +19005,6 @@ in # when adding a new linux version kernelPatches.cpu-cgroup-v2."4.11" kernelPatches.modinst_arg_list_too_long - kernelPatches.export_kernel_fpu_functions."4.14" ]; }; @@ -18549,7 +19013,6 @@ in [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper kernelPatches.modinst_arg_list_too_long - kernelPatches.export_kernel_fpu_functions."4.14" ]; }; @@ -18558,7 +19021,6 @@ in kernelPatches.bridge_stp_helper kernelPatches.request_key_helper kernelPatches.rtl8761b_support - kernelPatches.export_kernel_fpu_functions."5.3" ]; }; @@ -18566,7 +19028,6 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper - kernelPatches.export_kernel_fpu_functions."5.3" ]; }; @@ -18574,15 +19035,6 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper - kernelPatches.export_kernel_fpu_functions."5.3" - ]; - }; - - linux_5_9 = callPackage ../os-specific/linux/kernel/linux-5.9.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - kernelPatches.export_kernel_fpu_functions."5.3" ]; }; @@ -18590,7 +19042,6 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper - kernelPatches.export_kernel_fpu_functions."5.3" ]; }; @@ -18598,7 +19049,6 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper - kernelPatches.export_kernel_fpu_functions."5.3" kernelPatches.export-rt-sched-migrate ]; }; @@ -18629,7 +19079,6 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper - kernelPatches.export_kernel_fpu_functions."5.3" ]; }; @@ -18637,7 +19086,6 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper - kernelPatches.export_kernel_fpu_functions."5.3" ]; }; @@ -18878,7 +19326,6 @@ in linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14); linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19); linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4); - linuxPackages_5_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_9); linuxPackages_5_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_10); # When adding to the list above: @@ -18890,7 +19337,7 @@ in linuxPackages_custom = { version, src, configfile, allowImportFromDerivation ? true }: recurseIntoAttrs (linuxPackagesFor (pkgs.linuxManualConfig { - inherit version src configfile stdenv allowImportFromDerivation; + inherit version src configfile lib stdenv allowImportFromDerivation; })); # This serves as a test for linuxPackages_custom @@ -18921,14 +19368,13 @@ in kernel = (if kernel' == pkgs.linux_latest then linux_latest_for_hardened else kernel').override overrides; in linuxPackagesFor (kernel.override { structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix { - inherit stdenv; + inherit lib; inherit (kernel) version; }; kernelPatches = kernel.kernelPatches ++ [ - kernelPatches.tag_hardened kernelPatches.hardened.${kernel.meta.branch} ]; - modDirVersionArg = kernel.modDirVersion + (kernelPatches.hardened.${kernel.meta.branch}).extra + "-hardened"; + modDirVersionArg = kernel.modDirVersion + (kernelPatches.hardened.${kernel.meta.branch}).extra; isHardened = true; }); @@ -18973,7 +19419,7 @@ in buildPhase = '' set -x make \ - ARCH=${stdenv.hostPlatform.kernelArch} \ + ARCH=${stdenv.hostPlatform.linuxArch} \ HOSTCC=${buildPackages.stdenv.cc.targetPrefix}gcc \ ${makeTarget} ''; @@ -19086,6 +19532,9 @@ in musl = callPackage ../os-specific/linux/musl { }; + musl-fts = callPackage ../os-specific/linux/musl-fts { }; + musl-obstack = callPackage ../os-specific/linux/musl-obstack { }; + nushell = callPackage ../shells/nushell { inherit (darwin.apple_sdk.frameworks) AppKit Security; }; @@ -19176,6 +19625,8 @@ in go-migrate = callPackage ../development/tools/go-migrate { }; + gomacro = callPackage ../development/tools/gomacro { }; + gomodifytags = callPackage ../development/tools/gomodifytags { }; go-langserver = callPackage ../development/tools/go-langserver { }; @@ -19286,6 +19737,7 @@ in prototool = callPackage ../development/tools/prototool { }; qemu_kvm = lowPrio (qemu.override { hostCpuOnly = true; }); + qemu_full = lowPrio (qemu.override { smbdSupport = true; cephSupport = true; }); # See `xenPackages` source for explanations. # Building with `xen` instead of `xen-slim` is possible, but makes no sense. @@ -20180,14 +20632,14 @@ in powerline-fonts = callPackage ../data/fonts/powerline-fonts { }; + powerline-symbols = callPackage ../data/fonts/powerline-symbols { }; + powerline-go = callPackage ../tools/misc/powerline-go { }; powerline-rs = callPackage ../tools/misc/powerline-rs { inherit (darwin.apple_sdk.frameworks) Security; }; - prjxray-db = callPackage ../data/misc/prjxray-db { }; - profont = callPackage ../data/fonts/profont { inherit (buildPackages.xorg) mkfontscale; }; @@ -20223,8 +20675,6 @@ in sweet = callPackage ../data/themes/sweet { }; - symbiflow-arch-defs = callPackage ../data/misc/symbiflow-arch-defs { }; - mime-types = callPackage ../data/misc/mime-types { }; shared-mime-info = callPackage ../data/misc/shared-mime-info { }; @@ -20396,6 +20846,8 @@ in ultimate-oldschool-pc-font-pack = callPackage ../data/fonts/ultimate-oldschool-pc-font-pack { }; + ultralist = callPackage ../applications/misc/ultralist { }; + undefined-medium = callPackage ../data/fonts/undefined-medium { }; uni-vga = callPackage ../data/fonts/uni-vga @@ -20614,7 +21066,9 @@ in audacious = libsForQt5.callPackage ../applications/audio/audacious { }; audaciousQt5 = audacious; - audacity = callPackage ../applications/audio/audacity { }; + audacity-gtk2 = callPackage ../applications/audio/audacity { wxGTK = wxGTK31-gtk2; }; + audacity-gtk3 = callPackage ../applications/audio/audacity { wxGTK = wxGTK31-gtk3; }; + audacity = audacity-gtk2; audio-recorder = callPackage ../applications/audio/audio-recorder { }; @@ -20783,8 +21237,6 @@ in bonzomatic = callPackage ../applications/editors/bonzomatic { }; - brackets = callPackage ../applications/editors/brackets { gconf = gnome2.GConf; }; - brave = callPackage ../applications/networking/browsers/brave { }; break-time = callPackage ../applications/misc/break-time { }; @@ -20825,10 +21277,9 @@ in calculix = callPackage ../applications/science/math/calculix {}; - calibre = libsForQt5.callPackage ../applications/misc/calibre {}; + calibre = libsForQt5.callPackage ../applications/misc/calibre { }; calligra = libsForQt5.callPackage ../applications/office/calligra { - openjpeg = openjpeg_1; # Must use the same Qt version as Calligra itself: poppler = libsForQt5.poppler_0_61; }; @@ -21032,6 +21483,8 @@ in configureFlags = (lib.remove "-flibrary" drv.configureFlags or []) ++ ["-f-library"]; }); + darcs-to-git = callPackage ../applications/version-management/git-and-tools/darcs-to-git { }; + darktable = callPackage ../applications/graphics/darktable { lua = lua5_3; pugixml = pugixml.override { shared = true; }; @@ -21100,11 +21553,10 @@ in }; inherit (callPackage ../applications/virtualization/docker {}) - docker_18_09 - docker_19_03; + docker_20_10; - docker = docker_19_03; - docker-edge = docker_19_03; + docker = docker_20_10; + docker-edge = docker_20_10; docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { }; @@ -21121,6 +21573,10 @@ in docker-distribution = callPackage ../applications/virtualization/docker/distribution.nix { }; + afterburn = callPackage ../tools/admin/afterburn {}; + + docker-buildx = callPackage ../applications/virtualization/docker/buildx.nix { }; + amazon-ecr-credential-helper = callPackage ../tools/admin/amazon-ecr-credential-helper { }; docker-credential-gcr = callPackage ../tools/admin/docker-credential-gcr { }; @@ -21223,9 +21679,7 @@ in elvis = callPackage ../applications/editors/elvis { }; emacs = emacs27; - emacsPackages = emacs27Packages; emacs-nox = emacs27-nox; - emacsWithPackages = emacsPackages.emacsWithPackages; emacs27 = callPackage ../applications/editors/emacs/27.nix { # use override to enable additional features @@ -21290,17 +21744,12 @@ in inherit (haskellPackages) ghc-mod structured-haskell-mode Agda hindent; inherit - autoconf automake editorconfig-core-c git libffi libpng pkgconfig + autoconf automake editorconfig-core-c git libffi libpng pkg-config poppler rtags w3m zlib substituteAll rustPlatform cmake llvmPackages libtool zeromq openssl ott; }; }; - emacs26Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs26); - emacs27Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs27); - emacs26WithPackages = emacs26Packages.emacsWithPackages; - emacs27WithPackages = emacs27Packages.emacsWithPackages; - inherit (gnome3) empathy; enhanced-ctorrent = callPackage ../applications/networking/enhanced-ctorrent { }; @@ -21373,6 +21822,8 @@ in inherit (gnome3) evince; evolution-data-server = gnome3.evolution-data-server; evolution-ews = callPackage ../applications/networking/mailreaders/evolution/evolution-ews { }; + evolution = callPackage ../applications/networking/mailreaders/evolution/evolution { }; + evolutionWithPlugins = callPackage ../applications/networking/mailreaders/evolution/evolution/wrapper.nix { plugins = [ evolution evolution-ews ]; }; keepass = callPackage ../applications/misc/keepass { }; @@ -21400,6 +21851,8 @@ in fdr = libsForQt5.callPackage ../applications/science/programming/fdr { }; + feedbackd = callPackage ../applications/misc/feedbackd { }; + fehlstart = callPackage ../applications/misc/fehlstart { }; fetchmail = callPackage ../applications/misc/fetchmail { }; @@ -21425,7 +21878,6 @@ in fldigi = callPackage ../applications/radio/fldigi { }; flink = callPackage ../applications/networking/cluster/flink { }; - flink_1_5 = flink.override { version = "1.5"; }; fllog = callPackage ../applications/radio/fllog { }; @@ -21768,9 +22220,7 @@ in fractal = callPackage ../applications/networking/instant-messengers/fractal { }; - freecad = libsForQt5.callPackage ../applications/graphics/freecad { - mpi = openmpi; - }; + freecad = libsForQt5.callPackage ../applications/graphics/freecad { }; freemind = callPackage ../applications/misc/freemind { jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 @@ -21831,19 +22281,61 @@ in gimpPlugins = recurseIntoAttrs (callPackage ../applications/graphics/gimp/plugins {}); + glimpse = callPackage ../applications/graphics/glimpse { + autoreconfHook = buildPackages.autoreconfHook269; + gegl = gegl_0_4; + lcms = lcms2; + inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; + }; + + glimpse-with-plugins = callPackage ../applications/graphics/glimpse/wrapper.nix { + plugins = null; # All packaged plugins enabled, if not explicit plugin list supplied + }; + + glimpsePlugins = recurseIntoAttrs (callPackage ../applications/graphics/glimpse/plugins {}); + girara = callPackage ../applications/misc/girara { gtk = gtk3; }; - gitAndTools = recurseIntoAttrs (callPackage ../applications/version-management/git-and-tools {}); + git = callPackage ../applications/version-management/git-and-tools/git { + svnSupport = false; # for git-svn support + guiSupport = false; # requires tcl/tk + sendEmailSupport = false; # requires plenty of perl libraries + perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey]; + smtpPerlLibs = [ + perlPackages.libnet perlPackages.NetSMTPSSL + perlPackages.IOSocketSSL perlPackages.NetSSLeay + perlPackages.AuthenSASL perlPackages.DigestHMAC + ]; + }; + + # The full-featured Git. + gitFull = git.override { + svnSupport = true; + guiSupport = true; + sendEmailSupport = true; + withLibsecret = !stdenv.isDarwin; + }; + + # Git with SVN support, but without GUI. + gitSVN = lowPrio (appendToName "with-svn" (git.override { + svnSupport = true; + })); - inherit (gitAndTools) git gitFull gitSVN git-cola git-doc svn2git git-radar git-secret git-secrets transcrypt git-crypt ghq; + git-doc = lib.addMetaAttrs { + description = "Additional documentation for Git"; + longDescription = '' + This package contains additional documentation (HTML and text files) that + is referenced in the man pages of Git. + ''; + } gitFull.doc; - gitMinimal = git.override { + gitMinimal = appendToName "minimal" (git.override { withManual = false; pythonSupport = false; withpcre2 = false; - }; + }); gitRepo = callPackage ../applications/version-management/git-repo { }; @@ -21851,7 +22343,7 @@ in git-review = python3Packages.callPackage ../applications/version-management/git-review { }; - github-cli = gitAndTools.gh; + github-cli = gh; gitolite = callPackage ../applications/version-management/gitolite { }; @@ -21950,7 +22442,7 @@ in gocr = callPackage ../applications/graphics/gocr { }; - gobby5 = callPackage ../applications/editors/gobby { }; + gobby = callPackage ../applications/editors/gobby { }; gphoto2 = callPackage ../applications/misc/gphoto2 { }; @@ -22071,6 +22563,10 @@ in hdhomerun-config-gui = callPackage ../applications/video/hdhomerun-config-gui { }; + hdr-plus = callPackage ../applications/graphics/hdr-plus { + stdenv = clangStdenv; + }; + heimer = libsForQt5.callPackage ../applications/misc/heimer { }; hello = callPackage ../applications/misc/hello { }; @@ -22101,6 +22597,8 @@ in hipchat = callPackage ../applications/networking/instant-messengers/hipchat { }; + hivelytracker = callPackage ../applications/audio/hivelytracker { }; + hledger = haskell.lib.justStaticExecutables haskellPackages.hledger; hledger-iadd = haskell.lib.justStaticExecutables haskellPackages.hledger-iadd; hledger-interest = haskell.lib.justStaticExecutables haskellPackages.hledger-interest; @@ -22119,9 +22617,11 @@ in hdl-dump = callPackage ../tools/misc/hdl-dump { }; + hpack = haskell.lib.justStaticExecutables haskellPackages.hpack; + hpcg = callPackage ../tools/misc/hpcg/default.nix { }; - hpl = callPackage ../tools/misc/hpl { mpi = openmpi; }; + hpl = callPackage ../tools/misc/hpl { }; hpmyroom = libsForQt5.callPackage ../applications/networking/hpmyroom { }; @@ -22278,6 +22778,8 @@ in i3minator = callPackage ../tools/misc/i3minator { }; + i3nator = callPackage ../tools/misc/i3nator { }; + i3pystatus = callPackage ../applications/window-managers/i3/pystatus.nix { }; i3status = callPackage ../applications/window-managers/i3/status.nix { }; @@ -22286,6 +22788,8 @@ in i3-wk-switch = callPackage ../applications/window-managers/i3/wk-switch.nix { }; + waybox = callPackage ../applications/window-managers/waybox { }; + windowchef = callPackage ../applications/window-managers/windowchef/default.nix { }; wmfocus = callPackage ../applications/window-managers/i3/wmfocus.nix { }; @@ -22587,9 +23091,7 @@ in kpt = callPackage ../applications/networking/cluster/kpt { }; - krita = libsForQt5.callPackage ../applications/graphics/krita { - openjpeg = openjpeg_1; - }; + krita = libsForQt5.callPackage ../applications/graphics/krita { }; krusader = libsForQt5.callPackage ../applications/misc/krusader { }; @@ -22671,7 +23173,7 @@ in lemonbar-xft = callPackage ../applications/window-managers/lemonbar/xft.nix { }; - legit = gitAndTools.legit; + legit = callPackage ../applications/version-management/git-and-tools/legit { }; lens = callPackage ../applications/networking/cluster/lens { }; @@ -22833,12 +23335,16 @@ in lv2-cpp-tools = callPackage ../applications/audio/lv2-cpp-tools { }; + lxi-tools = callPackage ../tools/networking/lxi-tools { }; + lynx = callPackage ../applications/networking/browsers/lynx { }; lyrebird = callPackage ../applications/audio/lyrebird { }; lyx = libsForQt5.callPackage ../applications/misc/lyx { }; + m4acut = callPackage ../applications/audio/m4acut { }; + mac = callPackage ../development/libraries/mac { }; macdylibbundler = callPackage ../development/tools/misc/macdylibbundler { inherit (darwin) cctools; }; @@ -22872,6 +23378,8 @@ in markdown-pp = callPackage ../tools/text/markdown-pp { }; + mark = callPackage ../tools/text/mark { }; + marp = callPackage ../applications/office/marp { }; magnetico = callPackage ../applications/networking/p2p/magnetico { }; @@ -22906,6 +23414,8 @@ in mediathekview = callPackage ../applications/video/mediathekview { }; + megapixels = callPackage ../applications/graphics/megapixels { }; + meteo = callPackage ../applications/networking/weather/meteo { }; meld = callPackage ../applications/version-management/meld { }; @@ -23129,6 +23639,7 @@ in autoload = callPackage ../applications/video/mpv/scripts/autoload.nix {}; convert = callPackage ../applications/video/mpv/scripts/convert.nix {}; mpris = callPackage ../applications/video/mpv/scripts/mpris.nix {}; + mpvacious = callPackage ../applications/video/mpv/scripts/mpvacious.nix {}; simple-mpv-webui = callPackage ../applications/video/mpv/scripts/simple-mpv-webui.nix {}; sponsorblock = callPackage ../applications/video/mpv/scripts/sponsorblock.nix {}; }; @@ -23157,7 +23668,6 @@ in jackSupport = config.mumble.jackSupport or false; speechdSupport = config.mumble.speechdSupport or false; pulseSupport = config.pulseaudio or stdenv.isLinux; - qt5 = qt514; }).mumble; mumble_overlay = callPackage ../applications/networking/mumble/overlay.nix { @@ -23262,8 +23772,6 @@ in plank = callPackage ../applications/misc/plank { }; - planner = callPackage ../applications/office/planner { }; - playonlinux = callPackage ../applications/misc/playonlinux { stdenv = stdenv_32bit; }; @@ -23482,6 +23990,8 @@ in obs-wlrobs = callPackage ../applications/video/obs-studio/wlrobs.nix { }; + obs-gstreamer = callPackage ../applications/video/obs-studio/obs-gstreamer.nix { }; + obs-move-transition = callPackage ../applications/video/obs-studio/obs-move-transition.nix { }; obs-v4l2sink = libsForQt5.callPackage ../applications/video/obs-studio/v4l2sink.nix { }; @@ -23492,7 +24002,7 @@ in octoprint = callPackage ../applications/misc/octoprint { }; - octoprint-plugins = throw ''octoprint-plugins are now part of the octoprint.python.pkgs package set.''; + octoprint-plugins = throw "octoprint-plugins are now part of the octoprint.python.pkgs package set."; ocrad = callPackage ../applications/graphics/ocrad { }; @@ -23546,7 +24056,7 @@ in opera = callPackage ../applications/networking/browsers/opera {}; orca = python3Packages.callPackage ../applications/misc/orca { - inherit (pkgs) pkgconfig; + inherit (pkgs) pkg-config; }; orca-c = callPackage ../applications/audio/orca-c {}; @@ -23755,6 +24265,8 @@ in purple-facebook = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-facebook { }; + pikopixel = callPackage ../applications/graphics/pikopixel { }; + pithos = callPackage ../applications/audio/pithos { pythonPackages = python3Packages; }; @@ -23849,6 +24361,8 @@ in puremapping = callPackage ../applications/audio/pd-plugins/puremapping { }; + pwdsafety = callPackage ../tools/security/pwdsafety { }; + pybitmessage = callPackage ../applications/networking/instant-messengers/pybitmessage { }; qbittorrent = libsForQt5.callPackage ../applications/networking/p2p/qbittorrent { }; @@ -24274,6 +24788,8 @@ in insync = callPackage ../applications/networking/insync { }; + insync-v3 = libsForQt515.callPackage ../applications/networking/insync/v3.nix { }; + libstrangle = callPackage ../tools/X11/libstrangle { stdenv = stdenv_32bit; }; @@ -24338,6 +24854,7 @@ in smartdeblur = callPackage ../applications/graphics/smartdeblur { }; snapper = callPackage ../tools/misc/snapper { }; + snapper-gui = callPackage ../applications/misc/snapper-gui { }; snd = callPackage ../applications/audio/snd { }; @@ -24366,8 +24883,6 @@ in }; spotify-unwrapped = callPackage ../applications/audio/spotify { - libgcrypt = libgcrypt_1_5; - libpng = libpng12; curl = curl.override { sslSupport = false; gnutlsSupport = true; }; @@ -24625,7 +25140,7 @@ in tickrs = callPackage ../applications/misc/tickrs { }; - tig = gitAndTools.tig; + tig = callPackage ../applications/version-management/git-and-tools/tig { }; timbreid = callPackage ../applications/audio/pd-plugins/timbreid { fftw = fftwSinglePrec; @@ -24824,6 +25339,20 @@ in gtk3 = if stdenv.isDarwin then gtk3-x11 else gtk3; }); + vim-darwin = (vim_configurable.override { + config = { + vim = { + gui = "none"; + darwin = true; + }; + }; + }).overrideAttrs (oldAttrs: rec { + pname = "vim-darwin"; + meta = { + platforms = lib.platforms.darwin; + }; + }); + vimacs = callPackage ../applications/editors/vim/vimacs.nix { }; vimv = callPackage ../tools/misc/vimv/default.nix { }; @@ -24986,7 +25515,10 @@ in vscodium = callPackage ../applications/editors/vscode/vscodium.nix { }; - code-server = callPackage ../servers/code-server { }; + code-server = callPackage ../servers/code-server { + inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Security; + inherit (darwin) cctools; + }; vue = callPackage ../applications/misc/vue { }; @@ -25363,7 +25895,7 @@ in xdg-user-dirs = callPackage ../tools/X11/xdg-user-dirs { }; - xdg_utils = callPackage ../tools/X11/xdg-utils { + xdg-utils = callPackage ../tools/X11/xdg-utils { w3m = w3m-batch; }; @@ -25462,6 +25994,8 @@ in desktopSupport = "xfce4"; }; + xmountains = callPackage ../applications/graphics/xmountains { }; + xmpp-client = callPackage ../applications/networking/instant-messengers/xmpp-client { }; libxpdf = callPackage ../applications/misc/xpdf/libxpdf.nix { }; @@ -25529,7 +26063,7 @@ in yate = callPackage ../applications/misc/yate { }; - ydiff = callPackage ../development/tools/ydiff { }; + ydiff = with python3.pkgs; toPythonApplication ydiff; yed = callPackage ../applications/graphics/yed {}; @@ -26056,6 +26590,9 @@ in gemrb = callPackage ../games/gemrb { }; + gimx = callPackage ../games/gimx {}; + gimx-afterglow = lowPrio (gimx.override { gimxAuth = "afterglow"; }); + gl117 = callPackage ../games/gl-117 {}; globulation2 = callPackage ../games/globulation { @@ -26359,6 +26896,8 @@ in quake3pointrelease = callPackage ../games/quake3/content/pointrelease.nix { }; + quake3hires = callPackage ../games/quake3/content/hires.nix { }; + quakespasm = callPackage ../games/quakespasm { }; vkquake = callPackage ../games/quakespasm/vulkan.nix { }; @@ -26482,6 +27021,8 @@ in stardust = callPackage ../games/stardust {}; + starspace = callPackage ../applications/science/machine-learning/starspace { }; + stockfish = callPackage ../games/stockfish { }; steamPackages = dontRecurseIntoAttrs (callPackage ../games/steam { @@ -26584,6 +27125,8 @@ in typespeed = callPackage ../games/typespeed { }; + udig = callPackage ../applications/gis/udig { }; + ufoai = callPackage ../games/ufoai { }; ultimatestunts = callPackage ../games/ultimatestunts { }; @@ -26596,6 +27139,8 @@ in ffmpeg = ffmpeg_2; }; + unciv = callPackage ../games/unciv { }; + unnethack = callPackage ../games/unnethack { }; uqm = callPackage ../games/uqm { }; @@ -26742,6 +27287,7 @@ in zeroadPackages = dontRecurseIntoAttrs (callPackage ../games/0ad { wxGTK = wxGTK30; + stdenv = gcc9Stdenv; }); zeroad = zeroadPackages.zeroad; @@ -26767,10 +27313,12 @@ in arc-menu = callPackage ../desktops/gnome-3/extensions/arc-menu { }; caffeine = callPackage ../desktops/gnome-3/extensions/caffeine { }; clipboard-indicator = callPackage ../desktops/gnome-3/extensions/clipboard-indicator { }; + clock-override = callPackage ../desktops/gnome-3/extensions/clock-override { }; dash-to-dock = callPackage ../desktops/gnome-3/extensions/dash-to-dock { }; dash-to-panel = callPackage ../desktops/gnome-3/extensions/dash-to-panel { }; draw-on-your-screen = callPackage ../desktops/gnome-3/extensions/draw-on-your-screen { }; drop-down-terminal = callPackage ../desktops/gnome-3/extensions/drop-down-terminal { }; + dynamic-panel-transparency = callPackage ../desktops/gnome-3/extensions/dynamic-panel-transparency { }; easyScreenCast = callPackage ../desktops/gnome-3/extensions/EasyScreenCast { }; emoji-selector = callPackage ../desktops/gnome-3/extensions/emoji-selector { }; freon = callPackage ../desktops/gnome-3/extensions/freon { }; @@ -26781,6 +27329,7 @@ in mpris-indicator-button = callPackage ../desktops/gnome-3/extensions/mpris-indicator-button { }; night-theme-switcher = callPackage ../desktops/gnome-3/extensions/night-theme-switcher { }; no-title-bar = callPackage ../desktops/gnome-3/extensions/no-title-bar { }; + noannoyance = callPackage ../desktops/gnome-3/extensions/noannoyance { }; paperwm = callPackage ../desktops/gnome-3/extensions/paperwm { }; pidgin-im-integration = callPackage ../desktops/gnome-3/extensions/pidgin-im-integration { }; remove-dropdown-arrows = callPackage ../desktops/gnome-3/extensions/remove-dropdown-arrows { }; @@ -26790,19 +27339,23 @@ in tilingnome = callPackage ../desktops/gnome-3/extensions/tilingnome { }; timepp = callPackage ../desktops/gnome-3/extensions/timepp { }; topicons-plus = callPackage ../desktops/gnome-3/extensions/topicons-plus { }; - unite-shell = callPackage ../desktops/gnome-3/extensions/unite-shell { }; + unite = callPackage ../desktops/gnome-3/extensions/unite { }; window-corner-preview = callPackage ../desktops/gnome-3/extensions/window-corner-preview { }; window-is-ready-remover = callPackage ../desktops/gnome-3/extensions/window-is-ready-remover { }; workspace-matrix = callPackage ../desktops/gnome-3/extensions/workspace-matrix { }; nohotcorner = throw "gnomeExtensions.nohotcorner removed since 2019-10-09: Since 3.34, it is a part of GNOME Shell configurable through GNOME Tweaks."; mediaplayer = throw "gnomeExtensions.mediaplayer deprecated since 2019-09-23: retired upstream https://github.com/JasonLG1979/gnome-shell-extensions-mediaplayer/blob/master/README.md"; + } // lib.optionalAttrs (config.allowAliases or false) { + unite-shell = gnomeExtensions.unite; # added 2021-01-19 }; gnome-connections = callPackage ../desktops/gnome-3/apps/gnome-connections { }; gnome-tour = callPackage ../desktops/gnome-3/core/gnome-tour { }; + hhexen = callPackage ../games/hhexen { }; + hsetroot = callPackage ../tools/X11/hsetroot { }; imwheel = callPackage ../tools/X11/imwheel { }; @@ -26846,6 +27399,7 @@ in ### SCIENCE/CHEMISTY avogadro = callPackage ../applications/science/chemistry/avogadro { + openbabel = openbabel2; eigen = eigen2; }; @@ -26869,15 +27423,11 @@ in quantum-espresso = callPackage ../applications/science/chemistry/quantum-espresso { }; - quantum-espresso-mpi = callPackage ../applications/science/chemistry/quantum-espresso { - mpi = openmpi; - }; + quantum-espresso-mpi = callPackage ../applications/science/chemistry/quantum-espresso { useMpi = true; }; siesta = callPackage ../applications/science/chemistry/siesta { }; - siesta-mpi = callPackage ../applications/science/chemistry/siesta { - mpi = openmpi; - }; + siesta-mpi = callPackage ../applications/science/chemistry/siesta { useMpi = true; }; ### SCIENCE/GEOMETRY @@ -27008,7 +27558,7 @@ in }; neuron-mpi = appendToName "mpi" (neuron.override { - mpi = pkgs.openmpi; + useMpi = true; }); neuron-full = neuron-mpi.override { inherit python; }; @@ -27060,7 +27610,7 @@ in raxml = callPackage ../applications/science/biology/raxml { }; raxml-mpi = appendToName "mpi" (raxml.override { - mpi = true; + useMpi = true; }); sambamba = callPackage ../applications/science/biology/sambamba { }; @@ -27182,9 +27732,7 @@ in planarity = callPackage ../development/libraries/science/math/planarity { }; - scalapack = callPackage ../development/libraries/science/math/scalapack { - mpi = openmpi; - }; + scalapack = callPackage ../development/libraries/science/math/scalapack { }; rankwidth = callPackage ../development/libraries/science/math/rankwidth { }; @@ -27214,9 +27762,7 @@ in petsc = callPackage ../development/libraries/science/math/petsc { }; - parmetis = callPackage ../development/libraries/science/math/parmetis { - mpi = openmpi; - }; + parmetis = callPackage ../development/libraries/science/math/parmetis { }; QuadProgpp = callPackage ../development/libraries/science/math/QuadProgpp { }; @@ -27246,17 +27792,13 @@ in ### SCIENCE/MOLECULAR-DYNAMICS - dl-poly-classic-mpi = callPackage ../applications/science/molecular-dynamics/dl-poly-classic { - mpi = openmpi; - }; + dl-poly-classic-mpi = callPackage ../applications/science/molecular-dynamics/dl-poly-classic { }; lammps = callPackage ../applications/science/molecular-dynamics/lammps { fftw = fftw; }; - lammps-mpi = lowPrio (lammps.override { - mpi = openmpi; - }); + lammps-mpi = lowPrio (lammps.override { withMPI = true; }); gromacs = callPackage ../applications/science/molecular-dynamics/gromacs { singlePrec = true; @@ -27592,6 +28134,8 @@ in qucs = callPackage ../applications/science/electronics/qucs { }; + qucs-s = callPackage ../applications/science/electronics/qucs-s { }; + xcircuit = callPackage ../applications/science/electronics/xcircuit { }; xoscope = callPackage ../applications/science/electronics/xoscope { }; @@ -27682,6 +28226,8 @@ in scilab-bin = callPackage ../applications/science/math/scilab-bin {}; + scilla = callPackage ../tools/security/scilla { }; + scotch = callPackage ../applications/science/math/scotch { }; mininet = callPackage ../tools/virtualization/mininet { }; @@ -27918,6 +28464,8 @@ in gutenprintBin = callPackage ../misc/drivers/gutenprint/bin.nix { }; + carps-cups = callPackage ../misc/cups/drivers/carps-cups { }; + cups-bjnp = callPackage ../misc/cups/drivers/cups-bjnp { }; cups-brother-hl1110 = pkgsi686Linux.callPackage ../misc/cups/drivers/hl1110 { }; @@ -28183,6 +28731,7 @@ in storeDir = config.nix.storeDir or "/nix/store"; stateDir = config.nix.stateDir or "/nix/var"; boehmgc = boehmgc.override { enableLargeConfig = true; }; + inherit (darwin.apple_sdk.frameworks) Security; }) nix nixStable @@ -28411,24 +28960,14 @@ in nixos-generators = callPackage ../tools/nix/nixos-generators { }; + nixos-rebuild = callPackage ../os-specific/linux/nixos-rebuild { }; + norwester-font = callPackage ../data/fonts/norwester {}; nut = callPackage ../applications/misc/nut { }; solfege = python3Packages.callPackage ../misc/solfege { }; - disnix = callPackage ../tools/package-management/disnix { }; - - dysnomia = callPackage ../tools/package-management/disnix/dysnomia (config.disnix or { - inherit (pythonPackages) supervisor; - }); - - dydisnix = callPackage ../tools/package-management/disnix/dydisnix { }; - - disnixos = callPackage ../tools/package-management/disnix/disnixos { }; - - DisnixWebService = callPackage ../tools/package-management/disnix/DisnixWebService { }; - lkproof = callPackage ../tools/typesetting/tex/lkproof { }; lice = callPackage ../tools/misc/lice {}; @@ -28522,6 +29061,8 @@ in rargs = callPackage ../tools/misc/rargs { }; + rauc = callPackage ../tools/misc/rauc { }; + redprl = callPackage ../applications/science/logic/redprl { }; renderizer = pkgs.callPackage ../development/tools/renderizer {}; @@ -28742,7 +29283,7 @@ in ssh-audit = callPackage ../tools/security/ssh-audit { }; - autocpu-freq = callPackage ../tools/system/autocpu-freq { }; + auto-cpufreq = callPackage ../tools/system/auto-cpufreq { }; thermald = callPackage ../tools/system/thermald { }; @@ -28909,6 +29450,8 @@ in xboxdrv = callPackage ../misc/drivers/xboxdrv { }; + xortool = python3Packages.callPackage ../tools/security/xortool { }; + xow = callPackage ../misc/drivers/xow { }; xbps = callPackage ../tools/package-management/xbps { }; @@ -28979,8 +29522,13 @@ in yaxg = callPackage ../tools/graphics/yaxg {}; - yuzu = libsForQt5.callPackage ../misc/emulators/yuzu { - stdenv = gcc10Stdenv; + yuzu-mainline = import ../misc/emulators/yuzu { + branch = "mainline"; + inherit (pkgs) libsForQt5 fetchFromGitHub; + }; + yuzu-ea = import ../misc/emulators/yuzu { + branch = "early-access"; + inherit (pkgs) libsForQt5 fetchFromGitHub; }; zap = callPackage ../tools/networking/zap { }; @@ -29018,6 +29566,9 @@ in inherit (darwin.apple_sdk.frameworks) Carbon Cocoa OpenGL OpenAL; }; + x16-emulator = callPackage ../misc/emulators/commander-x16/emulator.nix { }; + x16-rom = callPackage ../misc/emulators/commander-x16/rom.nix { }; + bullet = callPackage ../development/libraries/bullet { inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; }; @@ -29032,9 +29583,6 @@ in spdlog = spdlog_1; dart = callPackage ../development/interpreters/dart { }; - dart_old = dart.override { version = "1.24.3"; }; - dart_stable = dart.override { version = "2.7.2"; }; - dart_dev = dart.override { version = "2.9.0-4.0.dev"; }; httrack = callPackage ../tools/backup/httrack { }; @@ -29079,6 +29627,8 @@ in snowsql = callPackage ../applications/misc/snowsql {}; + snowmachine = python3Packages.callPackage ../applications/misc/snowmachine {}; + sidequest = callPackage ../applications/misc/sidequest {}; maphosts = callPackage ../tools/networking/maphosts {}; @@ -29140,7 +29690,9 @@ in phonetisaurus = callPackage ../development/libraries/phonetisaurus {}; - duti = callPackage ../os-specific/darwin/duti {}; + duti = callPackage ../os-specific/darwin/duti { + inherit (darwin.apple_sdk.frameworks) ApplicationServices; + }; dnstracer = callPackage ../tools/networking/dnstracer { inherit (darwin) libresolv; @@ -29171,7 +29723,7 @@ in apeClex = callPackage ../applications/misc/ape/apeclex.nix { }; # Unix tools - unixtools = recurseIntoAttrs (callPackages ./unix-tools.nix { }); + unixtools = recurseIntoAttrs (callPackages ./unixtools.nix { }); inherit (unixtools) hexdump ps logger eject umount mount wall hostname more sysctl getconf getent locale killall xxd watch; diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 52268276a03..fb331b85eb9 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -1,17 +1,17 @@ { callPackage, wxGTK30, openssl_1_0_2, buildPackages }: rec { - lib = callPackage ../development/beam-modules/lib.nix {}; + lib = callPackage ../development/beam-modules/lib.nix { }; # Each interpreters = rec { - # R22 is the default version. - erlang = erlangR22; # The main switch to change default Erlang version. - erlang_odbc = erlangR22_odbc; - erlang_javac = erlangR22_javac; - erlang_odbc_javac = erlangR22_odbc_javac; - erlang_nox = erlangR22_nox; + # R23 is the default version. + erlang = erlangR23; # The main switch to change default Erlang version. + erlang_odbc = erlangR23_odbc; + erlang_javac = erlangR23_javac; + erlang_odbc_javac = erlangR23_odbc_javac; + erlang_nox = erlangR23_nox; # Standard Erlang versions, using the generic builder. @@ -25,7 +25,8 @@ rec { erlangR23_odbc = erlangR23.override { odbcSupport = true; }; erlangR23_javac = erlangR23.override { javacSupport = true; }; erlangR23_odbc_javac = erlangR23.override { - javacSupport = true; odbcSupport = true; + javacSupport = true; + odbcSupport = true; }; erlangR23_nox = erlangR23.override { wxSupport = false; }; @@ -39,7 +40,8 @@ rec { erlangR22_odbc = erlangR22.override { odbcSupport = true; }; erlangR22_javac = erlangR22.override { javacSupport = true; }; erlangR22_odbc_javac = erlangR22.override { - javacSupport = true; odbcSupport = true; + javacSupport = true; + odbcSupport = true; }; erlangR22_nox = erlangR22.override { wxSupport = false; }; @@ -51,7 +53,8 @@ rec { erlangR21_odbc = erlangR21.override { odbcSupport = true; }; erlangR21_javac = erlangR21.override { javacSupport = true; }; erlangR21_odbc_javac = erlangR21.override { - javacSupport = true; odbcSupport = true; + javacSupport = true; + odbcSupport = true; }; erlangR21_nox = erlangR21.override { wxSupport = false; }; @@ -63,7 +66,8 @@ rec { erlangR20_odbc = erlangR20.override { odbcSupport = true; }; erlangR20_javac = erlangR20.override { javacSupport = true; }; erlangR20_odbc_javac = erlangR20.override { - javacSupport = true; odbcSupport = true; + javacSupport = true; + odbcSupport = true; }; erlangR20_nox = erlangR20.override { wxSupport = false; }; @@ -76,7 +80,8 @@ rec { erlangR19_odbc = erlangR19.override { odbcSupport = true; }; erlangR19_javac = erlangR19.override { javacSupport = true; }; erlangR19_odbc_javac = erlangR19.override { - javacSupport = true; odbcSupport = true; + javacSupport = true; + odbcSupport = true; }; erlangR19_nox = erlangR19.override { wxSupport = false; }; @@ -89,28 +94,31 @@ rec { erlangR18_odbc = erlangR18.override { odbcSupport = true; }; erlangR18_javac = erlangR18.override { javacSupport = true; }; erlangR18_odbc_javac = erlangR18.override { - javacSupport = true; odbcSupport = true; + javacSupport = true; + odbcSupport = true; }; erlangR18_nox = erlangR18.override { wxSupport = false; }; # Basho fork, using custom builder. - erlang_basho_R16B02 = lib.callErlang ../development/interpreters/erlang/R16B02-basho.nix { - autoconf = buildPackages.autoconf269; - }; - erlang_basho_R16B02_odbc = erlang_basho_R16B02.override { - odbcSupport = true; - }; + erlang_basho_R16B02 = + lib.callErlang ../development/interpreters/erlang/R16B02-basho.nix { + autoconf = buildPackages.autoconf269; + }; + erlang_basho_R16B02_odbc = + erlang_basho_R16B02.override { odbcSupport = true; }; # Other Beam languages. These are built with `beam.interpreters.erlang`. To # access for example elixir built with different version of Erlang, use # `beam.packages.erlangR23.elixir`. - inherit (packages.erlang) elixir elixir_1_11 elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7; + inherit (packages.erlang) + elixir elixir_1_11 elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7; inherit (packages.erlang) lfe lfe_1_2 lfe_1_3; }; # Helper function to generate package set with a specific Erlang version. - packagesWith = erlang: callPackage ../development/beam-modules { inherit erlang; }; + packagesWith = erlang: + callPackage ../development/beam-modules { inherit erlang; }; # Each field in this tuple represents all Beam packages in nixpkgs built with # appropriate Erlang/OTP version. diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index c67d489de62..1ded50ce763 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -50,6 +50,7 @@ let mathcomp-solvable = self.mathcomp.solvable; mathcomp-field = self.mathcomp.field; mathcomp-character = self.mathcomp.character; + mathcomp-abel = callPackage ../development/coq-modules/mathcomp-abel {}; mathcomp-analysis = callPackage ../development/coq-modules/mathcomp-analysis {}; mathcomp-finmap = callPackage ../development/coq-modules/mathcomp-finmap {}; mathcomp-bigenough = callPackage ../development/coq-modules/mathcomp-bigenough {}; diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index dfa68ba31b8..10cf36d4d13 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -1,9 +1,8 @@ /* This function composes the Nix Packages collection. It: - 1. Applies the final stage to the given `config` if it is a function + 1. Elaborates `localSystem` and `crossSystem` with defaults as needed. - 2. Infers an appropriate `platform` based on the `system` if none is - provided + 2. Applies the final stage to the given `config` if it is a function 3. Defaults to no non-standard config and no cross-compilation target @@ -50,6 +49,14 @@ let # Rename the function arguments in let lib = import ../../lib; + localSystem = lib.systems.elaborate args.localSystem; + + # Condition preserves sharing which in turn affects equality. + crossSystem = + if crossSystem0 == null || crossSystem0 == args.localSystem + then localSystem + else lib.systems.elaborate crossSystem0; + # Allow both: # { /* the config */ } and # { pkgs, ... } : { /* the config */ } @@ -58,17 +65,6 @@ in let then config0 { inherit pkgs; } else config0; - # From a minimum of `system` or `config` (actually a target triple, *not* - # nixpkgs configuration), infer the other one and platform as needed. - localSystem = lib.systems.elaborate (if builtins.isAttrs args.localSystem then ( - # Allow setting the platform in the config file. This take precedence over - # the inferred platform, but not over an explicitly passed-in one. - builtins.intersectAttrs { platform = null; } config1 - // args.localSystem) else args.localSystem); - - crossSystem = if crossSystem0 == null then localSystem - else lib.systems.elaborate crossSystem0; - configEval = lib.evalModules { modules = [ ./config.nix diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index 91c1549a3b0..0b2b6af8038 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -6,7 +6,7 @@ , fetchFromGitHub , fetchNuGet , glib -, pkgconfig +, pkg-config , mono , fsharp , unzip @@ -860,7 +860,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { buildInputs = [ mono - pkgconfig + pkg-config ]; postInstall = '' diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 8075b7da4f5..d0bb7c56d99 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -82,5 +82,6 @@ in lib.makeScope newScope (self: lib.makeOverridable ({ // { inherit emacs melpaBuild trivialBuild; emacsWithPackages = emacsWithPackages self; + withPackages = emacsWithPackages self; }) ) {}) diff --git a/pkgs/top-level/emscripten-packages.nix b/pkgs/top-level/emscripten-packages.nix index ff636097004..9ae97cdf35a 100644 --- a/pkgs/top-level/emscripten-packages.nix +++ b/pkgs/top-level/emscripten-packages.nix @@ -10,7 +10,7 @@ rec { stdenv = pkgs.emscriptenStdenv; }).overrideDerivation (old: { - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; propagatedBuildInputs = [ zlib ]; buildInputs = old.buildInputs ++ [ automake autoconf ]; configurePhase = '' @@ -49,7 +49,7 @@ rec { }).overrideDerivation (old: { propagatedBuildInputs = [ zlib ]; - buildInputs = old.buildInputs ++ [ pkgconfig ]; + buildInputs = old.buildInputs ++ [ pkg-config ]; # just override it with nothing so it does not fail autoreconfPhase = "echo autoreconfPhase not used..."; @@ -84,8 +84,8 @@ rec { pname = "xmlmirror"; version = "unstable-2016-06-05"; - buildInputs = [ pkgconfig autoconf automake libtool gnumake libxml2 nodejs openjdk json_c ]; - nativeBuildInputs = [ pkgconfig zlib ]; + buildInputs = [ pkg-config autoconf automake libtool gnumake libxml2 nodejs openjdk json_c ]; + nativeBuildInputs = [ pkg-config zlib ]; src = pkgs.fetchgit { url = "https://gitlab.com/odfplugfest/xmlmirror.git"; @@ -136,7 +136,7 @@ rec { stdenv = pkgs.emscriptenStdenv; }).overrideDerivation (old: { - buildInputs = old.buildInputs ++ [ pkgconfig ]; + buildInputs = old.buildInputs ++ [ pkg-config ]; # we need to reset this setting! NIX_CFLAGS_COMPILE=""; configurePhase = '' diff --git a/pkgs/top-level/impure.nix b/pkgs/top-level/impure.nix index 3ba6c08a140..6f7383c8e7a 100644 --- a/pkgs/top-level/impure.nix +++ b/pkgs/top-level/impure.nix @@ -12,17 +12,15 @@ let in -{ # We combine legacy `system` and `platform` into `localSystem`, if - # `localSystem` was not passed. Strictly speaking, this is pure desugar, but - # it is most convient to do so before the impure `localSystem.system` default, - # so we do it now. - localSystem ? builtins.intersectAttrs { system = null; platform = null; } args +{ # We put legacy `system` into `localSystem`, if `localSystem` was not passed. + # If neither is passed, assume we are building packages on the current + # (build, in GNU Autotools parlance) platform. + localSystem ? { system = args.system or builtins.currentSystem; } -, # These are needed only because nix's `--arg` command-line logic doesn't work - # with unnamed parameters allowed by ... - system ? localSystem.system -, platform ? localSystem.platform -, crossSystem ? null +# These are needed only because nix's `--arg` command-line logic doesn't work +# with unnamed parameters allowed by ... +, system ? localSystem.system +, crossSystem ? localSystem , # Fallback: The contents of the configuration file found at $NIXPKGS_CONFIG or # $HOME/.config/nixpkgs/config.nix. @@ -77,15 +75,11 @@ in , ... } @ args: -# If `localSystem` was explicitly passed, legacy `system` and `platform` should -# not be passed. -assert args ? localSystem -> !(args ? system || args ? platform); +# If `localSystem` was explicitly passed, legacy `system` should +# not be passed, and vice-versa. +assert args ? localSystem -> !(args ? system); +assert args ? system -> !(args ? localSystem); -import ./. (builtins.removeAttrs args [ "system" "platform" ] // { - inherit config overlays crossSystem crossOverlays; - # Fallback: Assume we are building packages on the current (build, in GNU - # Autotools parlance) system. - localSystem = if builtins.isString localSystem then localSystem - else (if args ? localSystem then {} - else { system = builtins.currentSystem; }) // localSystem; +import ./. (builtins.removeAttrs args [ "system" ] // { + inherit config overlays localSystem; }) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 550c5bbd63b..b42f827d0df 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -5,7 +5,7 @@ for each package in a separate file: the call to the function would be almost as must code as the function itself. */ -{ fetchurl, stdenv, lua, unzip, pkgconfig +{ fetchurl, stdenv, lua, unzip, pkg-config , pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat , autoreconfHook, gnum4 , mysql, postgresql, cyrus_sasl @@ -108,7 +108,7 @@ with self; { sha256 = "1hvwslc25q7k82rxk461zr1a2041nxg7sn3sw3w0y5jxf0giz2pz"; }; - nativeBuildInputs = [ which pkgconfig ]; + nativeBuildInputs = [ which pkg-config ]; postPatch = '' patchShebangs . diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index b123658a3ff..b979599e630 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -44,6 +44,12 @@ let atdgen = callPackage ../development/ocaml-modules/atdgen { }; + awa = callPackage ../development/ocaml-modules/awa { }; + + awa-lwt = callPackage ../development/ocaml-modules/awa/lwt.nix { }; + + awa-mirage = callPackage ../development/ocaml-modules/awa/mirage.nix { }; + base64 = callPackage ../development/ocaml-modules/base64 { }; bap = callPackage ../development/ocaml-modules/bap { @@ -52,6 +58,8 @@ let batteries = callPackage ../development/ocaml-modules/batteries { }; + bheap = callPackage ../development/ocaml-modules/bheap { }; + bigarray-compat = callPackage ../development/ocaml-modules/bigarray-compat { }; bigarray-overlap = callPackage ../development/ocaml-modules/bigarray-overlap { }; @@ -122,6 +130,22 @@ let cairo2 = callPackage ../development/ocaml-modules/cairo2 { }; + caqti = callPackage ../development/ocaml-modules/caqti { }; + + caqti-async = callPackage ../development/ocaml-modules/caqti/async.nix { }; + + caqti-driver-mariadb = callPackage ../development/ocaml-modules/caqti/driver-mariadb.nix { }; + + caqti-driver-postgresql = callPackage ../development/ocaml-modules/caqti/driver-postgresql.nix { }; + + caqti-driver-sqlite3 = callPackage ../development/ocaml-modules/caqti/driver-sqlite3.nix { }; + + caqti-dynload = callPackage ../development/ocaml-modules/caqti/dynload.nix { }; + + caqti-lwt = callPackage ../development/ocaml-modules/caqti/lwt.nix { }; + + caqti-type-calendar = callPackage ../development/ocaml-modules/caqti/type-calendar.nix { }; + cfstream = callPackage ../development/ocaml-modules/cfstream { }; charInfo_width = callPackage ../development/ocaml-modules/charInfo_width { }; @@ -140,6 +164,8 @@ let cohttp-lwt-unix = callPackage ../development/ocaml-modules/cohttp/lwt-unix.nix { }; + cohttp-mirage = callPackage ../development/ocaml-modules/cohttp/mirage.nix { }; + conduit = callPackage ../development/ocaml-modules/conduit { }; conduit-async = callPackage ../development/ocaml-modules/conduit/async.nix { }; @@ -148,6 +174,8 @@ let conduit-lwt-unix = callPackage ../development/ocaml-modules/conduit/lwt-unix.nix { }; + conduit-mirage = callPackage ../development/ocaml-modules/conduit/mirage.nix { }; + config-file = callPackage ../development/ocaml-modules/config-file { }; containers = callPackage ../development/ocaml-modules/containers { }; @@ -271,6 +299,8 @@ let eigen = callPackage ../development/ocaml-modules/eigen { }; + either = callPackage ../development/ocaml-modules/either { }; + elina = callPackage ../development/ocaml-modules/elina { }; eliom = callPackage ../development/ocaml-modules/eliom { }; @@ -279,6 +309,8 @@ let encore = callPackage ../development/ocaml-modules/encore { }; + emile = callPackage ../development/ocaml-modules/emile { }; + enumerate = callPackage ../development/ocaml-modules/enumerate { }; eqaf = callPackage ../development/ocaml-modules/eqaf { }; @@ -355,6 +387,8 @@ let hmap = callPackage ../development/ocaml-modules/hmap { }; + hxd = callPackage ../development/ocaml-modules/hxd { }; + imagelib = callPackage ../development/ocaml-modules/imagelib { }; imagelib-unix = callPackage ../development/ocaml-modules/imagelib/unix.nix { }; @@ -546,6 +580,10 @@ let magick = callPackage ../development/ocaml-modules/magick { }; + mariadb = callPackage ../development/ocaml-modules/mariadb { + inherit (pkgs) mariadb; + }; + markup = callPackage ../development/ocaml-modules/markup { }; mdx = callPackage ../development/ocaml-modules/mdx { }; @@ -574,6 +612,8 @@ let mezzo = callPackage ../development/compilers/mezzo { }; + mimic = callPackage ../development/ocaml-modules/mimic { }; + minisat = callPackage ../development/ocaml-modules/minisat { }; mirage = callPackage ../development/ocaml-modules/mirage { }; @@ -837,6 +877,8 @@ let pcap-format = callPackage ../development/ocaml-modules/pcap-format { }; + pecu = callPackage ../development/ocaml-modules/pecu { }; + pgsolver = callPackage ../development/ocaml-modules/pgsolver { }; phylogenetics = callPackage ../development/ocaml-modules/phylogenetics { }; @@ -851,6 +893,10 @@ let posix-types = callPackage ../development/ocaml-modules/posix/types.nix { }; + postgresql = callPackage ../development/ocaml-modules/postgresql { + inherit (pkgs) postgresql; + }; + ppx_bitstring = callPackage ../development/ocaml-modules/bitstring/ppx.nix { }; ppxfind = callPackage ../development/ocaml-modules/ppxfind { }; @@ -865,6 +911,8 @@ let resource-pooling = callPackage ../development/ocaml-modules/resource-pooling { }; + repr = callPackage ../development/ocaml-modules/repr { }; + result = callPackage ../development/ocaml-modules/ocaml-result { }; secp256k1 = callPackage ../development/ocaml-modules/secp256k1 { @@ -889,6 +937,8 @@ let tls = callPackage ../development/ocaml-modules/tls { }; + tls-mirage = callPackage ../development/ocaml-modules/tls/mirage.nix { }; + torch = callPackage ../development/ocaml-modules/torch { inherit (pkgs.python3Packages) pytorch; }; @@ -925,14 +975,11 @@ let ppx_blob = callPackage ../development/ocaml-modules/ppx_blob { }; - ppx_cstruct = callPackage ../development/ocaml-modules/cstruct/ppx.nix {}; + ppx_cstruct = callPackage ../development/ocaml-modules/cstruct/ppx.nix { }; ppx_derivers = callPackage ../development/ocaml-modules/ppx_derivers {}; - ppx_deriving = - if lib.versionAtLeast ocaml.version "4.02" - then callPackage ../development/ocaml-modules/ppx_deriving {} - else null; + ppx_deriving = callPackage ../development/ocaml-modules/ppx_deriving {}; ppx_deriving_protobuf = callPackage ../development/ocaml-modules/ppx_deriving_protobuf {}; @@ -947,6 +994,8 @@ let ppx_irmin = callPackage ../development/ocaml-modules/irmin/ppx.nix { }; + ppx_repr = callPackage ../development/ocaml-modules/repr/ppx.nix { }; + ppx_tools = if lib.versionAtLeast ocaml.version "4.02" then callPackage ../development/ocaml-modules/ppx_tools {} @@ -962,6 +1011,8 @@ let prof_spacetime = callPackage ../development/ocaml-modules/prof_spacetime { }; + progress = callPackage ../development/ocaml-modules/progress { }; + ptmap = callPackage ../development/ocaml-modules/ptmap { }; ptset = callPackage ../development/ocaml-modules/ptset { }; @@ -1002,6 +1053,8 @@ let sedlex_2 = callPackage ../development/ocaml-modules/sedlex/2.nix { }; + semaphore-compat = callPackage ../development/ocaml-modules/semaphore-compat { }; + sodium = callPackage ../development/ocaml-modules/sodium { }; spelll = callPackage ../development/ocaml-modules/spelll { }; @@ -1022,6 +1075,8 @@ let tcslib = callPackage ../development/ocaml-modules/tcslib { }; + terminal_size = callPackage ../development/ocaml-modules/terminal_size { }; + toml = callPackage ../development/ocaml-modules/toml { }; topkg = callPackage ../development/ocaml-modules/topkg { }; @@ -1057,6 +1112,8 @@ let variantslib_p4 = callPackage ../development/ocaml-modules/variantslib { }; + vchan = callPackage ../development/ocaml-modules/vchan { }; + vg = callPackage ../development/ocaml-modules/vg { }; visitors = callPackage ../development/ocaml-modules/visitors { }; @@ -1067,10 +1124,22 @@ let webmachine = callPackage ../development/ocaml-modules/webmachine { }; + wodan = callPackage ../development/ocaml-modules/wodan { }; + + wodan-irmin = callPackage ../development/ocaml-modules/wodan/irmin.nix { }; + + wodan-unix = callPackage ../development/ocaml-modules/wodan/unix.nix { }; + wtf8 = callPackage ../development/ocaml-modules/wtf8 { }; x509 = callPackage ../development/ocaml-modules/x509 { }; + xenstore = callPackage ../development/ocaml-modules/xenstore { }; + + xenstore_transport = callPackage ../development/ocaml-modules/xenstore_transport { }; + + xenstore-tool = callPackage ../development/ocaml-modules/xenstore-tool { }; + xmlm = callPackage ../development/ocaml-modules/xmlm { }; xml-light = callPackage ../development/ocaml-modules/xml-light { }; diff --git a/pkgs/top-level/packages-config.nix b/pkgs/top-level/packages-config.nix index 52ad7aecd28..d0a71c43a96 100644 --- a/pkgs/top-level/packages-config.nix +++ b/pkgs/top-level/packages-config.nix @@ -34,8 +34,8 @@ "nvidiaPackages" "sourceHanPackages" "atomPackages" - "emacs26Packages" - "emacs27Packages" + "emacs26.pkgs" + "emacs27.pkgs" "steamPackages" "ut2004Packages" "zeroadPackages" diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6440d01b45d..f7442cc3fe7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -283,7 +283,7 @@ let url = "mirror://cpan/authors/id/M/MD/MDOOTSON/Alien-wxWidgets-0.69.tar.gz"; sha256 = "0jg2dmkzhj03f6b0vmv597yryfw9cclsdn9ynvvlrzzgpd5lw8jk"; }; - propagatedBuildInputs = [ pkgs.pkgconfig pkgs.gtk2 pkgs.wxGTK30 ModulePluggable ]; + propagatedBuildInputs = [ pkgs.pkg-config pkgs.gtk2 pkgs.wxGTK30 ModulePluggable ]; buildInputs = [ LWPProtocolHttps ]; }; @@ -7503,8 +7503,8 @@ let url = "mirror://cpan/authors/id/X/XA/XAOC/ExtUtils-PkgConfig-1.16.tar.gz"; sha256 = "bbeaced995d7d8d10cfc51a3a5a66da41ceb2bc04fedcab50e10e6300e801c6e"; }; - nativeBuildInputs = [ buildPackages.pkgconfig ]; - propagatedBuildInputs = [ pkgs.pkgconfig ]; + nativeBuildInputs = [ buildPackages.pkg-config ]; + propagatedBuildInputs = [ pkgs.pkg-config ]; doCheck = false; # expects test_glib-2.0.pc in PKG_CONFIG_PATH meta = { homepage = "http://gtk2-perl.sourceforge.net"; @@ -9005,7 +9005,7 @@ let url = "mirror://cpan/authors/id/O/OE/OESTERHOL/Gtk2-AppIndicator-0.15.tar.gz"; sha256 = "a25cb071e214fb89b4450aa4605031eae89b7961e149b0d6e8f491c19c14a90a"; }; - propagatedBuildInputs = [ pkgs.libappindicator-gtk2 pkgs.libdbusmenu-gtk2 pkgs.gtk2 pkgs.pkgconfig Gtk2 ]; + propagatedBuildInputs = [ pkgs.libappindicator-gtk2 pkgs.libdbusmenu-gtk2 pkgs.gtk2 pkgs.pkg-config Gtk2 ]; # Tests fail due to no display: # Gtk-WARNING **: cannot open display: at /nix/store/HASH-perl-Gtk2-1.2498/lib/perl5/site_perl/5.22.2/x86_64-linux-thread-multi/Gtk2.pm line 126. doCheck = false; @@ -9641,6 +9641,21 @@ let buildInputs = [ TestNoWarnings ]; }; + HTTPAcceptLanguage = buildPerlModule { + pname = "HTTP-AcceptLanguage"; + version = "0.02"; + src = fetchurl { + url = "mirror://cpan/authors/id/Y/YA/YAPPO/HTTP-AcceptLanguage-0.02.tar.gz"; + sha256 = "1bs29r72ibp0kmr3l1ypzszflpcw7z4yxxcgaijspsy99rb5yq1f"; + }; + buildInputs = [ ModuleBuildTiny ]; + meta = { + homepage = "https://github.com/yappo/p5-HTTP-AcceptLanguage"; + description = "Accept-Language header parser and find available language"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + HTTPBody = buildPerlPackage { pname = "HTTP-Body"; version = "1.22"; @@ -9688,12 +9703,11 @@ let HTTPDaemon = buildPerlPackage { pname = "HTTP-Daemon"; - version = "6.12"; + version = "6.01"; src = fetchurl { - url = "mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Daemon-6.12.tar.gz"; - sha256 = "19hz9r6f1p406fk1pqyd99h96ipxsmknh4fh1xw0qrrq1k8vwiyz"; + url = "mirror://cpan/authors/id/G/GA/GAAS/HTTP-Daemon-6.01.tar.gz"; + sha256 = "1hmd2isrkilf0q0nkxms1q64kikjmcw9imbvrjgky6kh89vqdza3"; }; - buildInputs = [ CPANMetaCheck ModuleBuildTiny TestNeeds ]; propagatedBuildInputs = [ HTTPMessage ]; meta = { description = "A simple http server class"; @@ -10149,10 +10163,10 @@ let IOAsync = buildPerlModule { pname = "IO-Async"; - version = "0.77"; + version = "0.78"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/IO-Async-0.77.tar.gz"; - sha256 = "153rfnbs2xwvx559h0ilfr0g9pg30avjad3cad659is9bdmfipri"; + url = "mirror://cpan/authors/id/P/PE/PEVANS/IO-Async-0.78.tar.gz"; + sha256 = "sha256-P7UYhZd7hiGKiepC84yvvOWCO/SPqqLRhaGGwqNYNmw="; }; preCheck = "rm t/50resolver.t"; # this test fails with "Temporary failure in name resolution" in sandbox propagatedBuildInputs = [ Future StructDumb ]; @@ -10528,11 +10542,11 @@ let ImageExifTool = buildPerlPackage { pname = "Image-ExifTool"; - version = "12.00"; + version = "12.16"; src = fetchurl { - url = "mirror://cpan/authors/id/E/EX/EXIFTOOL/Image-ExifTool-12.00.tar.gz"; - sha256 = "0nl5djf6hs6brnp7qnqvj3xwhj1qnjwcv35ih4yqp2mm9b4jqyfh"; + url = "mirror://cpan/authors/id/E/EX/EXIFTOOL/Image-ExifTool-12.16.tar.gz"; + sha256 = "0skm22b3gg1bfk0amklrprpva41m6mkrhqp0gi7z1nmcf9ypjh61"; }; nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; @@ -11137,10 +11151,10 @@ let LinkEmbedder = buildPerlPackage { pname = "LinkEmbedder"; - version = "1.15"; + version = "1.16"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/LinkEmbedder-1.15.tar.gz"; - sha256 = "0ij2jvsiqnqz3qlzw8k3q37ys05wfh1ks2n692hs3bpg7ds3n8bc"; + url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/LinkEmbedder-1.16.tar.gz"; + sha256 = "0pm5h5rlfparfvsi3ygj53mwjg8lwhql5mj0macfvsvfnfvnnp6j"; }; buildInputs = [ TestDeep ]; propagatedBuildInputs = [ Mojolicious ]; @@ -11724,7 +11738,7 @@ let url = "mirror://cpan/authors/id/L/LK/LKUNDRAK/Log-Journald-0.30.tar.gz"; sha256 = "55992cf9a1e1fb833f428300525bfa7cf7ed46b83ec414f82a091789b37d08a3"; }; - buildInputs = [ pkgs.pkgconfig pkgs.systemd ]; + buildInputs = [ pkgs.pkg-config pkgs.systemd ]; postPatch = '' substituteInPlace Build.PL \ --replace "libsystemd-journal" "libsystemd" @@ -12206,7 +12220,7 @@ let url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigInt-Lite-0.19.tar.gz"; sha256 = "06hm4vgihxr7m4jrq558phnnxy4am6ifba447j0h4p6jym5h7xih"; }; - + propagatedBuildInputs = [ MathBigInt ]; meta = { license = with lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -12326,10 +12340,10 @@ let MathPlanePath = buildPerlPackage { pname = "Math-PlanePath"; - version = "127"; + version = "129"; src = fetchurl { - url = "mirror://cpan/authors/id/K/KR/KRYDE/Math-PlanePath-127.tar.gz"; - sha256 = "1dzywpydigwyr38vz9f4yn7xkkk21vi6lyzjlyqv8iny0y0c7w20"; + url = "mirror://cpan/authors/id/K/KR/KRYDE/Math-PlanePath-129.tar.gz"; + sha256 = "0zirgq9n422wc1j95pijkr88wwmzhll5nxh3sb2vcxsh9l75v8cd"; }; propagatedBuildInputs = [ MathLibm constant-defer ]; buildInputs = [ DataFloat MathBigIntLite NumberFraction ]; @@ -13388,10 +13402,10 @@ let Mojolicious = buildPerlPackage { pname = "Mojolicious"; - version = "8.67"; + version = "8.71"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-8.67.tar.gz"; - sha256 = "0b1ajsfvpzcmy7qp1rjr2n1z263yk5bkzmal0kx72ajg1l1dd85v"; + url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-8.71.tar.gz"; + sha256 = "03bfxzq11v6k47axdwqhp2d3p1z17nwyxj0yww5z3x293p6zsnqm"; }; meta = { homepage = "https://mojolicious.org"; @@ -13498,10 +13512,10 @@ let MojoliciousPluginWebpack = buildPerlPackage { pname = "Mojolicious-Plugin-Webpack"; - version = "0.13"; + version = "0.14"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-Webpack-0.13.tar.gz"; - sha256 = "7848c0698e1b52909c71add638f7523f5affdfb8133b4ddb6f23a3bca485e761"; + url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-Webpack-0.14.tar.gz"; + sha256 = "0b1a9rm5rlpqj6skgic4qzy4b1p35r2dhkh3rwaaypf9ha70i9gc"; }; propagatedBuildInputs = [ Mojolicious ]; meta = { @@ -14674,7 +14688,7 @@ let # Makefile.PL in this package uses which to find pkg-config -- make it use path instead patchPhase = ''sed -ie 's/`which pkg-config`/"pkg-config"/' Makefile.PL''; doCheck = false; # The main test performs network access - nativeBuildInputs = [ pkgs.pkgconfig ]; + nativeBuildInputs = [ pkgs.pkg-config ]; propagatedBuildInputs = [ pkgs.libdiscid ]; }; @@ -14876,6 +14890,7 @@ let }; propagatedBuildInputs = [ IOAsync Moo NetFrameLayerIPv6 namespaceclean ]; buildInputs = [ TestFatal ]; + preCheck = "rm t/icmp_ps.t t/icmpv6_ps.t"; # ping socket tests fail meta = { description = "asyncronously check remote host for reachability"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -14967,7 +14982,7 @@ let url = "mirror://cpan/authors/id/D/DA/DANBERR/Net-DBus-1.2.0.tar.gz"; sha256 = "e7a1ac9ef4a1235b3fdbd5888f86c347182306467bd79abc9b0756a64b441cbc"; }; - nativeBuildInputs = [ buildPackages.pkgconfig ]; + nativeBuildInputs = [ buildPackages.pkg-config ]; buildInputs = [ pkgs.dbus TestPod TestPodCoverage ]; propagatedBuildInputs = [ XMLTwig ]; @@ -15106,6 +15121,21 @@ let doCheck = false; /* wants network */ }; + NetHTTPSNB = buildPerlPackage { + pname = "Net-HTTPS-NB"; + version = "0.15"; + src = fetchurl { + url = "mirror://cpan/authors/id/O/OL/OLEG/Net-HTTPS-NB-0.15.tar.gz"; + sha256 = "0kwc4z8pqnbc396wjnlgdmri10zdh91f2bi6saxkpfjzlm7wysba"; + }; + propagatedBuildInputs = [ IOSocketSSL NetHTTP ]; + meta = { + homepage = "https://github.com/olegwtf/p5-Net-HTTPS-NB"; + description = "Non-blocking HTTPS client"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + NetIDNEncode = buildPerlModule { pname = "Net-IDN-Encode"; version = "2.500"; @@ -16295,7 +16325,7 @@ let sha256 = "17f6i16jv6ci6459vh6y3sz94vgcvykjjszcl4xsykryakjvf8i7"; }; buildInputs = [ pkgs.pcsclite ]; - nativeBuildInputs = [ pkgs.pkgconfig ]; + nativeBuildInputs = [ pkgs.pkg-config ]; NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.pcsclite}/lib -lpcsclite"; # tests fail; look unfinished doCheck = false; @@ -17955,7 +17985,7 @@ let sha256 = "0wfdixpm3p94mnng474l0nh9mjiy8q8hbrbh2af4vwn2hmazr91f"; }; buildInputs = [ TestDeep TestDifferences TestLongString TestWarn ]; - preBuild = ''ls''; + preBuild = "ls"; meta = { homepage = "https://github.com/Sereal/Sereal"; description = "Fast, compact, powerful binary deserialization"; @@ -19023,6 +19053,7 @@ let description = "lib/Safe/Hole.pm"; license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/toddr/Safe-Hole"; + broken = stdenv.isDarwin; }; }; @@ -19225,12 +19256,12 @@ let SysVirt = buildPerlModule rec { pname = "Sys-Virt"; - version = "6.3.0"; + version = "7.0.0"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DA/DANBERR/Sys-Virt-v6.3.0.tar.gz"; - sha256 = "6333fe3c554322fec5a3e1890b08a4ea4f39b0fbb506b3592688a5785a488f39"; + url = "mirror://cpan/authors/id/D/DA/DANBERR/Sys-Virt-v7.0.0.tar.gz"; + sha256 = "1w3div7p86kz9mmcdzmap7fi8hxvzs4nfglks044ihgi5la14r1y"; }; - nativeBuildInputs = [ pkgs.pkgconfig ]; + nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ]; perlPreHook = lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' }; @@ -22898,7 +22929,7 @@ let }; buildInputs = [ pkgs.xorg.libXext pkgs.xorg.libXScrnSaver pkgs.xorg.libX11 ]; propagatedBuildInputs = [ InlineC ]; - patchPhase = ''sed -ie 's,-L/usr/X11R6/lib/,-L${pkgs.xorg.libX11.out}/lib/ -L${pkgs.xorg.libXext.out}/lib/ -L${pkgs.xorg.libXScrnSaver}/lib/,' IdleTime.pm''; + patchPhase = "sed -ie 's,-L/usr/X11R6/lib/,-L${pkgs.xorg.libX11.out}/lib/ -L${pkgs.xorg.libXext.out}/lib/ -L${pkgs.xorg.libXScrnSaver}/lib/,' IdleTime.pm"; meta = { description = "Get the idle time of X11"; }; @@ -23116,7 +23147,7 @@ let url = "mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXSLT-1.99.tar.gz"; sha256 = "1w7pn0wb88nma6biy4h05ak3j4ykma6vz1wbkrxy8qgvfyl1fzhj"; }; - buildInputs = [ pkgs.pkgconfig pkgs.zlib pkgs.libxml2 pkgs.libxslt ]; + buildInputs = [ pkgs.pkg-config pkgs.zlib pkgs.libxml2 pkgs.libxslt ]; propagatedBuildInputs = [ XMLLibXML ]; }; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index cb3cfdf7651..932c2a867f0 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, pkgs, fetchgit, phpPackage, autoconf, pkgconfig, re2c +{ stdenv, lib, pkgs, fetchgit, phpPackage, autoconf, pkg-config, re2c , gettext, bzip2, curl, libxml2, openssl, gmp, icu64, oniguruma, libsodium , html-tidy, libzip, zlib, pcre, pcre2, libxslt, aspell, openldap, cyrus_sasl , uwimap, pam, libiconv, enchant1, libXpm, gd, libwebp, libjpeg, libpng @@ -176,7 +176,7 @@ lib.makeScope pkgs.newScope (self: with self; { "--with-zmq=${pkgs.zeromq}" ]; - nativeBuildInputs = [ pkgs.pkgconfig ]; + nativeBuildInputs = [ pkgs.pkg-config ]; meta.maintainers = lib.teams.php.members; meta.broken = lib.versionAtLeast php.version "7.3"; @@ -206,7 +206,7 @@ lib.makeScope pkgs.newScope (self: with self; { sourceRoot = "php-${php.version}/ext/${name}"; enableParallelBuilding = true; - nativeBuildInputs = [ php.unwrapped autoconf pkgconfig re2c ]; + nativeBuildInputs = [ php.unwrapped autoconf pkg-config re2c ]; inherit configureFlags internalDeps buildInputs zendExtension doCheck; @@ -501,7 +501,9 @@ lib.makeScope pkgs.newScope (self: with self; { doCheck = false; } { name = "xmlreader"; buildInputs = [ libxml2 ]; - configureFlags = [ "--enable-xmlreader CFLAGS=-I../.." ] + internalDeps = [ php.extensions.dom ]; + NIX_CFLAGS_COMPILE = [ "-I../.." "-DHAVE_DOM" ]; + configureFlags = [ "--enable-xmlreader" ] # Required to build on darwin. ++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; } { name = "xmlrpc"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1a003d2a11e..6f1a18ee0ec 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -162,6 +162,10 @@ in { actdiag = callPackage ../development/python-modules/actdiag { }; + adafruit-platformdetect = callPackage ../development/python-modules/adafruit-platformdetect { }; + + adafruit-pureio = callPackage ../development/python-modules/adafruit-pureio { }; + adal = callPackage ../development/python-modules/adal { }; adb-homeassistant = callPackage ../development/python-modules/adb-homeassistant { }; @@ -174,6 +178,8 @@ in { addic7ed-cli = callPackage ../development/python-modules/addic7ed-cli { }; + adext = callPackage ../development/python-modules/adext { }; + adguardhome = callPackage ../development/python-modules/adguardhome { }; advantage-air = callPackage ../development/python-modules/advantage-air { }; @@ -194,14 +200,20 @@ in { agate-sql = callPackage ../development/python-modules/agate-sql { }; + agent-py = callPackage ../development/python-modules/agent-py { }; + aioamqp = callPackage ../development/python-modules/aioamqp { }; + aiocoap = callPackage ../development/python-modules/aiocoap { }; + aioconsole = callPackage ../development/python-modules/aioconsole { }; aiocontextvars = callPackage ../development/python-modules/aiocontextvars { }; aiodns = callPackage ../development/python-modules/aiodns { }; + aioeafm = callPackage ../development/python-modules/aioeafm { }; + aioesphomeapi = callPackage ../development/python-modules/aioesphomeapi { }; aioeventlet = callPackage ../development/python-modules/aioeventlet { }; @@ -210,6 +222,8 @@ in { aiofiles = callPackage ../development/python-modules/aiofiles { }; + aioflo = callPackage ../development/python-modules/aioflo { }; + aioftp = callPackage ../development/python-modules/aioftp { }; aioguardian = callPackage ../development/python-modules/aioguardian { }; @@ -218,6 +232,8 @@ in { aioharmony = callPackage ../development/python-modules/aioharmony { }; + aiohomekit = callPackage ../development/python-modules/aiohomekit { }; + aiohttp = callPackage ../development/python-modules/aiohttp { }; aiohttp-cors = callPackage ../development/python-modules/aiohttp-cors { }; @@ -242,6 +258,8 @@ in { aiokafka = callPackage ../development/python-modules/aiokafka { }; + aiokef = callPackage ../development/python-modules/aiokef { }; + aiolifx = callPackage ../development/python-modules/aiolifx { }; aiolifx-effects = callPackage ../development/python-modules/aiolifx-effects { }; @@ -264,12 +282,16 @@ in { aiorun = callPackage ../development/python-modules/aiorun { }; + aioshelly = callPackage ../development/python-modules/aioshelly { }; + aiosmtpd = callPackage ../development/python-modules/aiosmtpd { }; aiosqlite = callPackage ../development/python-modules/aiosqlite { }; aiostream = callPackage ../development/python-modules/aiostream { }; + aioswitcher = callPackage ../development/python-modules/aioswitcher { }; + aiounifi = callPackage ../development/python-modules/aiounifi { }; aiounittest = callPackage ../development/python-modules/aiounittest { }; @@ -304,6 +326,8 @@ in { ambiclimate = callPackage ../development/python-modules/ambiclimate { }; + amcrest = callPackage ../development/python-modules/amcrest { }; + amply = callPackage ../development/python-modules/amply { }; amqp = callPackage ../development/python-modules/amqp { }; @@ -478,6 +502,8 @@ in { asysocks = callPackage ../development/python-modules/asysocks { }; + atenpdu = callPackage ../development/python-modules/atenpdu { }; + atlassian-python-api = callPackage ../development/python-modules/atlassian-python-api { }; atom = callPackage ../development/python-modules/atom { }; @@ -529,10 +555,12 @@ in { withPython = true; }); - av = callPackage ../development/python-modules/av { inherit (pkgs) pkgconfig; }; + av = callPackage ../development/python-modules/av { inherit (pkgs) pkg-config; }; avea = callPackage ../development/python-modules/avea { }; + avion = callPackage ../development/python-modules/avion { }; + avro3k = callPackage ../development/python-modules/avro3k { }; avro = callPackage ../development/python-modules/avro { }; @@ -541,6 +569,8 @@ in { awesome-slugify = callPackage ../development/python-modules/awesome-slugify { }; + awesomeversion = callPackage ../development/python-modules/awesomeversion { }; + awkward0 = callPackage ../development/python-modules/awkward0 { }; awkward = callPackage ../development/python-modules/awkward { }; @@ -552,6 +582,10 @@ in { aws-xray-sdk = callPackage ../development/python-modules/aws-xray-sdk { }; + awsiotpythonsdk = callPackage ../development/python-modules/awsiotpythonsdk { }; + + axis = callPackage ../development/python-modules/axis { }; + azure-appconfiguration = callPackage ../development/python-modules/azure-appconfiguration { }; azure-applicationinsights = callPackage ../development/python-modules/azure-applicationinsights { }; @@ -826,6 +860,8 @@ in { baron = callPackage ../development/python-modules/baron { }; + base36 = callPackage ../development/python-modules/base36 { }; + base58 = callPackage ../development/python-modules/base58 { }; baselines = callPackage ../development/python-modules/baselines { }; @@ -848,6 +884,8 @@ in { bayespy = callPackage ../development/python-modules/bayespy { }; + bc-python-hcl2 = callPackage ../development/python-modules/bc-python-hcl2 { }; + bcdoc = callPackage ../development/python-modules/bcdoc { }; bcrypt = if pythonOlder "3.6" then @@ -891,14 +929,12 @@ in { binaryornot = callPackage ../development/python-modules/binaryornot { }; - binwalk = callPackage ../development/python-modules/binwalk { - pyqtgraph = null; - matplotlib = null; - }; + binho-host-adapter = callPackage ../development/python-modules/binho-host-adapter { }; + + binwalk = callPackage ../development/python-modules/binwalk { }; binwalk-full = appendToName "full" (self.binwalk.override { - pyqtgraph = self.pyqtgraph; - matplotlib = self.matplotlib; + visualizationSupport = true; }); biopython = callPackage ../development/python-modules/biopython { }; @@ -961,6 +997,8 @@ in { bluepy = callPackage ../development/python-modules/bluepy { }; + bluepy-devices = callPackage ../development/python-modules/bluepy-devices { }; + bme680 = callPackage ../development/python-modules/bme680 { }; bokeh = callPackage ../development/python-modules/bokeh { }; @@ -1014,6 +1052,8 @@ in { brotlipy = callPackage ../development/python-modules/brotlipy { }; + brottsplatskartan = callPackage ../development/python-modules/brottsplatskartan { }; + browser-cookie3 = callPackage ../development/python-modules/browser-cookie3 { }; browsermob-proxy = disabledIf isPy3k (callPackage ../development/python-modules/browsermob-proxy { }); @@ -1022,6 +1062,8 @@ in { bsdiff4 = callPackage ../development/python-modules/bsdiff4 { }; + bsblan = callPackage ../development/python-modules/bsblan { }; + btchip = callPackage ../development/python-modules/btchip { }; bt_proximity = callPackage ../development/python-modules/bt-proximity { }; @@ -1073,16 +1115,7 @@ in { cachelib = callPackage ../development/python-modules/cachelib { }; - cachetools = let - cachetools' = callPackage ../development/python-modules/cachetools { }; - cachetools_2 = cachetools'.overridePythonAttrs (oldAttrs: rec { - version = "3.1.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "16m69l6n6y1r1y7cklm92rr7v69ldig2n3lbl3j323w5jz7d78lf"; - }; - }); - in if isPy3k then cachetools' else cachetools_2; + cachetools = callPackage ../development/python-modules/cachetools { }; cachy = callPackage ../development/python-modules/cachy { }; @@ -1135,6 +1168,10 @@ in { catalogue = callPackage ../development/python-modules/catalogue { }; + catboost = callPackage ../development/python-modules/catboost { }; + + cattrs = callPackage ../development/python-modules/cattrs { }; + cbeams = callPackage ../misc/cbeams { }; cbor2 = callPackage ../development/python-modules/cbor2 { }; @@ -1153,10 +1190,14 @@ in { cement = callPackage ../development/python-modules/cement { }; + censys = callPackage ../development/python-modules/censys { }; + connect-box = callPackage ../development/python-modules/connect_box { }; cerberus = callPackage ../development/python-modules/cerberus { }; + cert-chain-resolver = callPackage ../development/python-modules/cert-chain-resolver { }; + certbot = callPackage ../development/python-modules/certbot { }; certbot-dns-cloudflare = callPackage ../development/python-modules/certbot-dns-cloudflare { }; @@ -1308,6 +1349,8 @@ in { cmdtest = callPackage ../development/python-modules/cmdtest { }; + cmsis-svd = callPackage ../development/python-modules/cmsis-svd { }; + cntk = callPackage ../development/python-modules/cntk { }; cnvkit = callPackage ../development/python-modules/cnvkit { }; @@ -1443,6 +1486,8 @@ in { credstash = callPackage ../development/python-modules/credstash { }; + criticality-score = callPackage ../development/python-modules/criticality-score { }; + croniter = callPackage ../development/python-modules/croniter { }; cryptacular = callPackage ../development/python-modules/cryptacular { }; @@ -1459,6 +1504,8 @@ in { crytic-compile = callPackage ../development/python-modules/crytic-compile { }; + csrmesh = callPackage ../development/python-modules/csrmesh { }; + csscompressor = callPackage ../development/python-modules/csscompressor { }; cssmin = callPackage ../development/python-modules/cssmin { }; @@ -1587,7 +1634,7 @@ in { dbus-next = callPackage ../development/python-modules/dbus-next { }; - dbus-python = callPackage ../development/python-modules/dbus { inherit (pkgs) dbus pkgconfig; }; + dbus-python = callPackage ../development/python-modules/dbus { inherit (pkgs) dbus pkg-config; }; dbutils = callPackage ../development/python-modules/dbutils { }; @@ -1605,6 +1652,8 @@ in { decorator = callPackage ../development/python-modules/decorator { }; + deep_merge = callPackage ../development/python-modules/deep_merge { }; + deepdiff = callPackage ../development/python-modules/deepdiff { }; deepmerge = callPackage ../development/python-modules/deepmerge { }; @@ -1641,6 +1690,8 @@ in { detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04 + devolo-home-control-api = callPackage ../development/python-modules/devolo-home-control-api { }; + devpi-common = callPackage ../development/python-modules/devpi-common { }; dftfit = callPackage ../development/python-modules/dftfit { }; @@ -1889,10 +1940,14 @@ in { dogtail = callPackage ../development/python-modules/dogtail { }; + doit = callPackage ../development/python-modules/doit { }; + dominate = callPackage ../development/python-modules/dominate { }; dopy = callPackage ../development/python-modules/dopy { }; + dotty-dict = callPackage ../development/python-modules/dotty-dict { }; + dot2tex = callPackage ../development/python-modules/dot2tex { inherit (pkgs) graphviz; }; dparse = callPackage ../development/python-modules/dparse { }; @@ -1945,6 +2000,8 @@ in { easywatch = callPackage ../development/python-modules/easywatch { }; + ec2instanceconnectcli = callPackage ../tools/virtualization/ec2instanceconnectcli { }; + eccodes = toPythonModule (pkgs.eccodes.override { enablePython = true; pythonPackages = self; @@ -2050,6 +2107,8 @@ in { ewmh = callPackage ../development/python-modules/ewmh { }; + exdown = callPackage ../development/python-modules/exdown { }; + exchangelib = callPackage ../development/python-modules/exchangelib { }; execnet = callPackage ../development/python-modules/execnet { }; @@ -2142,7 +2201,6 @@ in { fenics = callPackage ../development/libraries/science/math/fenics { inherit (pkgs) pkg-config; - mpi = pkgs.openmpi; pytest = self.pytest_4; }; @@ -2316,6 +2374,8 @@ in { fn = callPackage ../development/python-modules/fn { }; + fnvhash = callPackage ../development/python-modules/fnvhash { }; + folium = callPackage ../development/python-modules/folium { }; fontforge = disabledIf (!isPy3k) (toPythonModule (pkgs.fontforge.override { @@ -2335,6 +2395,8 @@ in { forbiddenfruit = callPackage ../development/python-modules/forbiddenfruit { }; + fortiosapi = callPackage ../development/python-modules/fortiosapi { }; + FormEncode = callPackage ../development/python-modules/FormEncode { }; foundationdb51 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb51; }; @@ -2381,7 +2443,7 @@ in { furl = callPackage ../development/python-modules/furl { }; - fuse = callPackage ../development/python-modules/fuse-python { inherit (pkgs) fuse pkgconfig; }; + fuse = callPackage ../development/python-modules/fuse-python { inherit (pkgs) fuse pkg-config; }; fusepy = callPackage ../development/python-modules/fusepy { }; @@ -2455,6 +2517,10 @@ in { geojson = callPackage ../development/python-modules/geojson { }; + geojson-client = callPackage ../development/python-modules/geojson-client { }; + + geomet = callPackage ../development/python-modules/geomet { }; + geopandas = callPackage ../development/python-modules/geopandas { }; geopy = if isPy3k then @@ -2485,7 +2551,7 @@ in { gipc = callPackage ../development/python-modules/gipc { }; git-annex-adapter = - callPackage ../development/python-modules/git-annex-adapter { inherit (pkgs.gitAndTools) git-annex; }; + callPackage ../development/python-modules/git-annex-adapter { }; gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14 @@ -2668,10 +2734,12 @@ in { inherit python; }); - gphoto2 = callPackage ../development/python-modules/gphoto2 { inherit (pkgs) pkgconfig; }; + gphoto2 = callPackage ../development/python-modules/gphoto2 { inherit (pkgs) pkg-config; }; gprof2dot = callPackage ../development/python-modules/gprof2dot { inherit (pkgs) graphviz; }; + gps3 = callPackage ../development/python-modules/gps3 { }; + gpsoauth = callPackage ../development/python-modules/gpsoauth { }; gpxpy = callPackage ../development/python-modules/gpxpy { }; @@ -2680,7 +2748,9 @@ in { gpyopt = callPackage ../development/python-modules/gpyopt { }; - gradient_sdk = callPackage ../development/python-modules/gradient_sdk { }; + gradient = callPackage ../development/python-modules/gradient { }; + + gradient-utils = callPackage ../development/python-modules/gradient-utils { }; gradient_statsd = callPackage ../development/python-modules/gradient_statsd { }; @@ -2720,6 +2790,8 @@ in { grequests = callPackage ../development/python-modules/grequests { }; + gremlinpython = callPackage ../development/python-modules/gremlinpython { }; + grib-api = disabledIf (!isPy27) (toPythonModule (pkgs.grib-api.override { enablePython = true; pythonPackages = self; @@ -2745,7 +2817,7 @@ in { gssapi = callPackage ../development/python-modules/gssapi { inherit (pkgs) darwin krb5Full; }; gst-python = callPackage ../development/python-modules/gst-python { - inherit (pkgs) meson pkgconfig; + inherit (pkgs) meson pkg-config; gst-plugins-base = pkgs.gst_all_1.gst-plugins-base; }; @@ -2802,12 +2874,18 @@ in { ha-ffmpeg = callPackage ../development/python-modules/ha-ffmpeg { }; + halo = callPackage ../development/python-modules/halo { }; + handout = callPackage ../development/python-modules/handout { }; HAP-python = callPackage ../development/python-modules/HAP-python { }; hass-nabucasa = callPackage ../development/python-modules/hass-nabucasa { }; + hatasmota = callPackage ../development/python-modules/hatasmota { }; + + haversine = callPackage ../development/python-modules/haversine { }; + hawkauthlib = callPackage ../development/python-modules/hawkauthlib { }; hbmqtt = callPackage ../development/python-modules/hbmqtt { }; @@ -2891,7 +2969,7 @@ in { html5lib = callPackage ../development/python-modules/html5lib { }; - html5-parser = callPackage ../development/python-modules/html5-parser { inherit (pkgs) pkgconfig; }; + html5-parser = callPackage ../development/python-modules/html5-parser { inherit (pkgs) pkg-config; }; htmllaundry = callPackage ../development/python-modules/htmllaundry { }; @@ -2950,6 +3028,8 @@ in { hydra-check = callPackage ../development/python-modules/hydra-check { }; + hydrawiser = callPackage ../development/python-modules/hydrawiser { }; + hypchat = callPackage ../development/python-modules/hypchat { }; hyperframe = callPackage ../development/python-modules/hyperframe { }; @@ -2983,6 +3063,8 @@ in { icecream = callPackage ../development/python-modules/icecream { }; + icmplib = callPackage ../development/python-modules/icmplib { }; + ics = callPackage ../development/python-modules/ics { }; identify = callPackage ../development/python-modules/identify { }; @@ -3021,6 +3103,8 @@ in { imaplib2 = callPackage ../development/python-modules/imaplib2 { }; + imap-tools = callPackage ../development/python-modules/imap-tools { }; + imbalanced-learn = if isPy27 then callPackage ../development/python-modules/imbalanced-learn/0.4.nix { } else @@ -3045,7 +3129,7 @@ in { importmagic = callPackage ../development/python-modules/importmagic { }; imread = - callPackage ../development/python-modules/imread { inherit (pkgs) pkgconfig libjpeg libpng libtiff libwebp; }; + callPackage ../development/python-modules/imread { inherit (pkgs) pkg-config libjpeg libpng libtiff libwebp; }; imutils = callPackage ../development/python-modules/imutils { }; @@ -3416,7 +3500,7 @@ in { kmsxx = toPythonModule ((callPackage ../development/libraries/kmsxx { inherit (pkgs.kmsxx) stdenv; - inherit (pkgs) pkgconfig; + inherit (pkgs) pkg-config; withPython = true; }).overrideAttrs (oldAttrs: { name = "${python.libPrefix}-${pkgs.kmsxx.name}"; })); @@ -3434,7 +3518,7 @@ in { labelbox = callPackage ../development/python-modules/labelbox { }; - lammps-cython = callPackage ../development/python-modules/lammps-cython { mpi = pkgs.openmpi; }; + lammps-cython = callPackage ../development/python-modules/lammps-cython { mpi = pkgs.mpi; }; langcodes = callPackage ../development/python-modules/langcodes { }; @@ -3504,7 +3588,7 @@ in { libarcus = callPackage ../development/python-modules/libarcus { inherit (pkgs) protobuf; }; - libasyncns = callPackage ../development/python-modules/libasyncns { inherit (pkgs) libasyncns pkgconfig; }; + libasyncns = callPackage ../development/python-modules/libasyncns { inherit (pkgs) libasyncns pkg-config; }; libcloud = if isPy27 then callPackage ../development/python-modules/libcloud/2.nix { } @@ -3612,13 +3696,13 @@ in { libusb1 = callPackage ../development/python-modules/libusb1 { inherit (pkgs) libusb1; }; - libversion = callPackage ../development/python-modules/libversion { inherit (pkgs) libversion pkgconfig; }; + libversion = callPackage ../development/python-modules/libversion { inherit (pkgs) libversion pkg-config; }; libvirt = if isPy3k then - (callPackage ../development/python-modules/libvirt { inherit (pkgs) libvirt pkgconfig; }) + (callPackage ../development/python-modules/libvirt { inherit (pkgs) libvirt pkg-config; }) else (callPackage ../development/python-modules/libvirt/5.9.0.nix { - inherit (pkgs) pkgconfig; + inherit (pkgs) pkg-config; libvirt = pkgs.libvirt_5_9_0; }); @@ -3629,7 +3713,7 @@ in { libxslt = (toPythonModule (pkgs.libxslt.override { pythonSupport = true; - inherit python; + python3 = python; inherit (self) libxml2; })).py; @@ -3674,8 +3758,8 @@ in { livestreamer-curses = callPackage ../development/python-modules/livestreamer-curses { }; llfuse = callPackage ../development/python-modules/llfuse { - inherit (pkgs) fuse pkgconfig; - }; # use "real" fuse and pkgconfig, not the python modules + inherit (pkgs) fuse pkg-config; + }; # use "real" fuse and pkg-config, not the python modules llvmlite = callPackage ../development/python-modules/llvmlite { llvm = pkgs.llvm_9; @@ -3695,6 +3779,8 @@ in { lockfile = callPackage ../development/python-modules/lockfile { }; + log-symbols = callPackage ../development/python-modules/log-symbols { }; + Logbook = callPackage ../development/python-modules/Logbook { }; logfury = callPackage ../development/python-modules/logfury { }; @@ -3861,7 +3947,7 @@ in { in callPackage path { stdenv = if stdenv.isDarwin then pkgs.clangStdenv else pkgs.stdenv; inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; - inherit (pkgs) pkgconfig; + inherit (pkgs) pkg-config; }; matrix-client = callPackage ../development/python-modules/matrix-client { }; @@ -4068,7 +4154,7 @@ in { mpd = callPackage ../development/python-modules/mpd { }; - mpi4py = callPackage ../development/python-modules/mpi4py { mpi = pkgs.openmpi; }; + mpi4py = callPackage ../development/python-modules/mpi4py { mpi = pkgs.mpi; }; mplleaflet = callPackage ../development/python-modules/mplleaflet { }; @@ -4352,6 +4438,8 @@ in { nplusone = callPackage ../development/python-modules/nplusone { }; + npyscreen = callPackage ../development/python-modules/npyscreen { }; + ntc-templates = callPackage ../development/python-modules/ntc-templates { }; ntlm-auth = callPackage ../development/python-modules/ntlm-auth { }; @@ -4434,6 +4522,10 @@ in { openapi-spec-validator = callPackage ../development/python-modules/openapi-spec-validator { }; + openbabel-bindings = callPackage ../development/python-modules/openbabel-bindings { + openbabel = (callPackage ../development/libraries/openbabel { python = self.python; }); + }; + opencv3 = toPythonModule (pkgs.opencv3.override { enablePython = true; pythonPackages = self; @@ -4493,6 +4585,8 @@ in { ortools = (toPythonModule (pkgs.or-tools.override { inherit (self) python; })).python; + orvibo = callPackage ../development/python-modules/orvibo { }; + osc = callPackage ../development/python-modules/osc { }; oscrypto = callPackage ../development/python-modules/oscrypto { }; @@ -4551,9 +4645,9 @@ in { panel = callPackage ../development/python-modules/panel { }; - papermill = callPackage ../development/python-modules/papermill { }; + panflute = callPackage ../development/python-modules/panflute { }; - paperspace = callPackage ../development/python-modules/paperspace { }; + papermill = callPackage ../development/python-modules/papermill { }; openpaperwork-core = callPackage ../applications/office/paperwork/openpaperwork-core.nix { }; openpaperwork-gtk = callPackage ../applications/office/paperwork/openpaperwork-gtk.nix { }; @@ -4662,6 +4756,8 @@ in { pdoc3 = callPackage ../development/python-modules/pdoc3 { }; + pebble = callPackage ../development/python-modules/pebble { }; + pecan = callPackage ../development/python-modules/pecan { }; peewee = callPackage ../development/python-modules/peewee { }; @@ -4757,9 +4853,14 @@ in { else callPackage ../development/python-modules/pillow { inherit (pkgs) freetype libjpeg zlib libtiff libwebp tcl lcms2 tk; - inherit (pkgs.xorg) libX11; + inherit (pkgs.xorg) libX11 libxcb; }; + pillow-simd = callPackage ../development/python-modules/pillow-simd { + inherit (pkgs) freetype libjpeg zlib libtiff libwebp tcl lcms2 tk; + inherit (pkgs.xorg) libX11; + }; + pims = callPackage ../development/python-modules/pims { }; pinboard = callPackage ../development/python-modules/pinboard { }; @@ -4788,6 +4889,8 @@ in { pkuseg = callPackage ../development/python-modules/pkuseg { }; + pynndescent = callPackage ../development/python-modules/pynndescent { }; + pysbd = callPackage ../development/python-modules/pysbd { }; python-codon-tables = callPackage ../development/python-modules/python-codon-tables { }; @@ -4796,8 +4899,6 @@ in { python-openems = callPackage ../development/python-modules/python-openems { }; - python-prjxray = callPackage ../development/python-modules/python-prjxray { }; - python-tado = callPackage ../development/python-modules/python-tado { }; pkutils = callPackage ../development/python-modules/pkutils { }; @@ -4826,6 +4927,8 @@ in { pluginbase = callPackage ../development/python-modules/pluginbase { }; + plugwise = callPackage ../development/python-modules/plugwise { }; + plumbum = callPackage ../development/python-modules/plumbum { }; ply = callPackage ../development/python-modules/ply { }; @@ -4848,7 +4951,7 @@ in { poetry-core = callPackage ../development/python-modules/poetry-core { }; - poezio = callPackage ../applications/networking/instant-messengers/poezio { inherit (pkgs) pkgconfig; }; + poezio = callPackage ../applications/networking/instant-messengers/poezio { inherit (pkgs) pkg-config; }; polib = callPackage ../development/python-modules/polib { }; @@ -4862,10 +4965,12 @@ in { pooch = callPackage ../development/python-modules/pooch { }; + poolsense = callPackage ../development/python-modules/poolsense { }; + poppler-qt5 = callPackage ../development/python-modules/poppler-qt5 { inherit (pkgs.qt5) qtbase; inherit (pkgs.libsForQt5) poppler; - inherit (pkgs) pkgconfig; + inherit (pkgs) pkg-config; }; portalocker = callPackage ../development/python-modules/portalocker { }; @@ -5005,6 +5110,10 @@ in { publicsuffix = callPackage ../development/python-modules/publicsuffix { }; + pubnub = callPackage ../development/python-modules/pubnub { }; + + pubnubsub-handler = callPackage ../development/python-modules/pubnubsub-handler { }; + pudb = callPackage ../development/python-modules/pudb { }; pulp = callPackage ../development/python-modules/pulp { }; @@ -5059,6 +5168,8 @@ in { pyaftership = callPackage ../development/python-modules/pyaftership { }; + pyahocorasick = callPackage ../development/python-modules/pyahocorasick { }; + pyairvisual = callPackage ../development/python-modules/pyairvisual { }; pyalgotrade = callPackage ../development/python-modules/pyalgotrade { }; @@ -5073,7 +5184,7 @@ in { pyarlo = callPackage ../development/python-modules/pyarlo { }; - pyarrow = callPackage ../development/python-modules/pyarrow { inherit (pkgs) arrow-cpp cmake pkgconfig; }; + pyarrow = callPackage ../development/python-modules/pyarrow { inherit (pkgs) arrow-cpp cmake pkg-config; }; pyasn1 = callPackage ../development/python-modules/pyasn1 { }; @@ -5081,7 +5192,7 @@ in { pyatmo = callPackage ../development/python-modules/pyatmo { }; - pyatspi = callPackage ../development/python-modules/pyatspi { inherit (pkgs) pkgconfig; }; + pyatspi = callPackage ../development/python-modules/pyatspi { inherit (pkgs) pkg-config; }; pyatv = callPackage ../development/python-modules/pyatv { }; @@ -5101,6 +5212,8 @@ in { pybindgen = callPackage ../development/python-modules/pybindgen { }; + pyblackbird = callPackage ../development/python-modules/pyblackbird { }; + pyblake2 = callPackage ../development/python-modules/pyblake2 { }; pyblock = callPackage ../development/python-modules/pyblock { }; @@ -5125,7 +5238,7 @@ in { py = callPackage ../development/python-modules/py { }; - pycangjie = disabledIf (!isPy3k) (callPackage ../development/python-modules/pycangjie { inherit (pkgs) pkgconfig; }); + pycangjie = disabledIf (!isPy3k) (callPackage ../development/python-modules/pycangjie { inherit (pkgs) pkg-config; }); pycapnp = callPackage ../development/python-modules/pycapnp { }; @@ -5141,6 +5254,8 @@ in { pycdio = callPackage ../development/python-modules/pycdio { }; + pycfdns = callPackage ../development/python-modules/pycfdns { }; + pychart = callPackage ../development/python-modules/pychart { }; pychef = callPackage ../development/python-modules/pychef { }; @@ -5222,8 +5337,6 @@ in { pydot = callPackage ../development/python-modules/pydot { inherit (pkgs) graphviz; }; - pydotplus = callPackage ../development/python-modules/pydotplus { }; - pydrive = callPackage ../development/python-modules/pydrive { }; pydsdl = callPackage ../development/python-modules/pydsdl { }; @@ -5234,6 +5347,8 @@ in { pyechonest = callPackage ../development/python-modules/pyechonest { }; + pyedimax = callPackage ../development/python-modules/pyedimax { }; + pyee = callPackage ../development/python-modules/pyee { }; pyelftools = callPackage ../development/python-modules/pyelftools { }; @@ -5274,8 +5389,12 @@ in { pyfftw = callPackage ../development/python-modules/pyfftw { }; + pyfido = callPackage ../development/python-modules/pyfido { }; + pyfiglet = callPackage ../development/python-modules/pyfiglet { }; + pyfnip = callPackage ../development/python-modules/pyfnip { }; + pyflakes = callPackage ../development/python-modules/pyflakes { }; pyfma = callPackage ../development/python-modules/pyfma { }; @@ -5331,19 +5450,19 @@ in { pygmt = callPackage ../development/python-modules/pygmt { }; - pygobject2 = callPackage ../development/python-modules/pygobject { inherit (pkgs) pkgconfig; }; + pygobject2 = callPackage ../development/python-modules/pygobject { inherit (pkgs) pkg-config; }; pygobject3 = if isPy3k then - callPackage ../development/python-modules/pygobject/3.nix { inherit (pkgs) meson pkgconfig; } + callPackage ../development/python-modules/pygobject/3.nix { inherit (pkgs) meson pkg-config; } else - callPackage ../development/python-modules/pygobject/3.36.nix { inherit (pkgs) meson pkgconfig; }; + callPackage ../development/python-modules/pygobject/3.36.nix { inherit (pkgs) meson pkg-config; }; pygogo = callPackage ../development/python-modules/pygogo { }; pygpgme = callPackage ../development/python-modules/pygpgme { }; pygraphviz = callPackage ../development/python-modules/pygraphviz { - inherit (pkgs) graphviz pkgconfig; + inherit (pkgs) graphviz pkg-config; }; # not the python package pygreat = callPackage ../development/python-modules/pygreat { }; @@ -5353,13 +5472,13 @@ in { pygtail = callPackage ../development/python-modules/pygtail { }; pygtk = callPackage ../development/python-modules/pygtk { - inherit (pkgs) pkgconfig; + inherit (pkgs) pkg-config; libglade = null; }; pyGtkGlade = self.pygtk.override { libglade = pkgs.gnome2.libglade; }; - pygtksourceview = callPackage ../development/python-modules/pygtksourceview { inherit (pkgs) pkgconfig; }; + pygtksourceview = callPackage ../development/python-modules/pygtksourceview { inherit (pkgs) pkg-config; }; pygtrie = callPackage ../development/python-modules/pygtrie { }; @@ -5388,6 +5507,8 @@ in { pyinputevent = callPackage ../development/python-modules/pyinputevent { }; + pyinsteon = callPackage ../development/python-modules/pyinsteon { }; + pyipp = callPackage ../development/python-modules/pyipp { }; pyiqvia = callPackage ../development/python-modules/pyiqvia { }; @@ -5412,6 +5533,8 @@ in { pykickstart = callPackage ../development/python-modules/pykickstart { }; + pykira = callPackage ../development/python-modules/pykira { }; + pykka = callPackage ../development/python-modules/pykka { }; pykwalify = callPackage ../development/python-modules/pykwalify { }; @@ -5443,6 +5566,8 @@ in { pylibmc = callPackage ../development/python-modules/pylibmc { }; + pylink-square = callPackage ../development/python-modules/pylink-square { }; + pylint-celery = callPackage ../development/python-modules/pylint-celery { }; pylint-django = callPackage ../development/python-modules/pylint-django { }; @@ -5470,12 +5595,16 @@ in { PyLTI = callPackage ../development/python-modules/pylti { }; + pylutron = callPackage ../development/python-modules/pylutron { }; + pymacaroons = callPackage ../development/python-modules/pymacaroons { }; pymaging = callPackage ../development/python-modules/pymaging { }; pymaging_png = callPackage ../development/python-modules/pymaging_png { }; + pymata-express = callPackage ../development/python-modules/pymata-express { }; + pymatgen = callPackage ../development/python-modules/pymatgen { }; pymatgen-lammps = callPackage ../development/python-modules/pymatgen-lammps { }; @@ -5518,6 +5647,8 @@ in { PyMVGLive = callPackage ../development/python-modules/pymvglive { }; + pymyq = callPackage ../development/python-modules/pymyq { }; + pymysql = callPackage ../development/python-modules/pymysql { }; pymysqlsa = callPackage ../development/python-modules/pymysqlsa { }; @@ -5577,6 +5708,8 @@ in { pyopenssl = callPackage ../development/python-modules/pyopenssl { }; + pyopnsense = callPackage ../development/python-modules/pyopnsense { }; + pyosf = callPackage ../development/python-modules/pyosf { }; pyosmium = callPackage ../development/python-modules/pyosmium { }; @@ -5644,7 +5777,9 @@ in { pyqrcode = callPackage ../development/python-modules/pyqrcode { }; - pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { inherit (pkgs) pkgconfig; }; + pyqt-builder = callPackage ../development/python-modules/pyqt-builder { }; + + pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { inherit (pkgs) pkg-config; }; pyqt5 = pkgs.libsForQt5.callPackage ../development/python-modules/pyqt/5.x.nix { pythonPackages = self; }; @@ -5785,7 +5920,7 @@ in { pysmb = callPackage ../development/python-modules/pysmb { }; - pysmbc = callPackage ../development/python-modules/pysmbc { inherit (pkgs) pkgconfig; }; + pysmbc = callPackage ../development/python-modules/pysmbc { inherit (pkgs) pkg-config; }; pysmf = callPackage ../development/python-modules/pysmf { }; @@ -5801,6 +5936,8 @@ in { pysolr = callPackage ../development/python-modules/pysolr { }; + pysoma = callPackage ../development/python-modules/pysoma { }; + py-sonic = callPackage ../development/python-modules/py-sonic { }; pysonos = callPackage ../development/python-modules/pysonos { }; @@ -5821,8 +5958,6 @@ in { pyspotify = callPackage ../development/python-modules/pyspotify { }; - pyspread = callPackage ../development/python-modules/pyspread { }; - pysptk = callPackage ../development/python-modules/pysptk { }; pysqlcipher3 = callPackage ../development/python-modules/pysqlcipher3 { @@ -5959,6 +6094,8 @@ in { pytest-httpbin = callPackage ../development/python-modules/pytest-httpbin { }; + pytest-instafail = callPackage ../development/python-modules/pytest-instafail { }; + pytest-isort = callPackage ../development/python-modules/pytest-isort { }; pytest-lazy-fixture = callPackage ../development/python-modules/pytest-lazy-fixture { }; @@ -5978,6 +6115,8 @@ in { pytest-openfiles = callPackage ../development/python-modules/pytest-openfiles { }; + pytest-order = callPackage ../development/python-modules/pytest-order { }; + pytest-ordering = callPackage ../development/python-modules/pytest-ordering { }; pytest-pep257 = callPackage ../development/python-modules/pytest-pep257 { }; @@ -6041,6 +6180,8 @@ in { pytest-twisted = callPackage ../development/python-modules/pytest-twisted { }; + pytest-vcr = callPackage ../development/python-modules/pytest-vcr { }; + pytest-virtualenv = callPackage ../development/python-modules/pytest-virtualenv { }; pytest-warnings = callPackage ../development/python-modules/pytest-warnings { }; @@ -6097,7 +6238,7 @@ in { python-editor = callPackage ../development/python-modules/python-editor { }; - pythonefl = callPackage ../development/python-modules/python-efl { inherit (pkgs) pkgconfig; }; + pythonefl = callPackage ../development/python-modules/python-efl { inherit (pkgs) pkg-config; }; python-engineio = callPackage ../development/python-modules/python-engineio { }; @@ -6117,8 +6258,12 @@ in { python-hosts = callPackage ../development/python-modules/python-hosts { }; + python-hpilo = callPackage ../development/python-modules/python-hpilo { }; + + python-http-client = callPackage ../development/python-modules/python-http-client { }; + python-igraph = callPackage ../development/python-modules/python-igraph { - pkgconfig = pkgs.pkgconfig; + pkg-config = pkgs.pkg-config; igraph = pkgs.igraph; }; @@ -6180,7 +6325,7 @@ in { pythonnet = callPackage ../development/python-modules/pythonnet { # `mono >= 4.6` required to prevent crashes encountered with earlier versions. mono = pkgs.mono4; - inherit (pkgs) pkgconfig; + inherit (pkgs) pkg-config; }; python-nomad = callPackage ../development/python-modules/python-nomad { }; @@ -6196,7 +6341,7 @@ in { python-opendata-transport = callPackage ../development/python-modules/python-opendata-transport { }; - python_openzwave = callPackage ../development/python-modules/python_openzwave { inherit (pkgs) pkgconfig; }; + python_openzwave = callPackage ../development/python-modules/python_openzwave { inherit (pkgs) pkg-config; }; python-otr = callPackage ../development/python-modules/python-otr { }; @@ -6269,6 +6414,8 @@ in { python-wifi = callPackage ../development/python-modules/python-wifi { }; + python-wink = callPackage ../development/python-modules/python-wink { }; + python-xmp-toolkit = callPackage ../development/python-modules/python-xmp-toolkit { }; pyeverlights = callPackage ../development/python-modules/pyeverlights { }; @@ -6342,12 +6489,16 @@ in { pyvcf = callPackage ../development/python-modules/pyvcf { }; + pyvera = callPackage ../development/python-modules/pyvera { }; + pyviz-comms = callPackage ../development/python-modules/pyviz-comms { }; pyvips = callPackage ../development/python-modules/pyvips { inherit (pkgs) pkg-config vips glib; }; + pyvlx = callPackage ../development/python-modules/pyvlx { }; + pyvmomi = callPackage ../development/python-modules/pyvmomi { }; pyvoro = callPackage ../development/python-modules/pyvoro { }; @@ -6386,10 +6537,14 @@ in { }); in if isPy3k then pyxattr' else pyxattr_2; + pyworld = callPackage ../development/python-modules/pyworld { }; + pyx = callPackage ../development/python-modules/pyx { }; pyxdg = callPackage ../development/python-modules/pyxdg { }; + pyxeoma = callPackage ../development/python-modules/pyxeoma { }; + pyxl3 = callPackage ../development/python-modules/pyxl3 { }; pyxml = disabledIf isPy3k (callPackage ../development/python-modules/pyxml { }); @@ -6461,6 +6616,8 @@ in { rabbitpy = callPackage ../development/python-modules/rabbitpy { }; + rachiopy = callPackage ../development/python-modules/rachiopy { }; + radicale_infcloud = callPackage ../development/python-modules/radicale_infcloud { }; radio_beam = callPackage ../development/python-modules/radio_beam { }; @@ -6517,6 +6674,8 @@ in { reflink = callPackage ../development/python-modules/reflink { }; + regenmaschine = callPackage ../development/python-modules/regenmaschine { }; + regex = callPackage ../development/python-modules/regex { }; regional = callPackage ../development/python-modules/regional { }; @@ -6579,6 +6738,8 @@ in { responses = callPackage ../development/python-modules/responses { }; + respx = callPackage ../development/python-modules/respx { }; + restrictedpython = callPackage ../development/python-modules/restrictedpython { }; restructuredtext_lint = callPackage ../development/python-modules/restructuredtext_lint { }; @@ -6626,7 +6787,7 @@ in { robomachine = callPackage ../development/python-modules/robomachine { }; roboschool = callPackage ../development/python-modules/roboschool { - inherit (pkgs) pkgconfig; # use normal pkgconfig, not the python package + inherit (pkgs) pkg-config; # use normal pkg-config, not the python package inherit (pkgs.qt5) qtbase; }; @@ -6658,6 +6819,8 @@ in { roman = callPackage ../development/python-modules/roman { }; + roombapy = callPackage ../development/python-modules/roombapy { }; + rope = callPackage ../development/python-modules/rope { }; ROPGadget = callPackage ../development/python-modules/ROPGadget { }; @@ -6858,7 +7021,7 @@ in { seccomp = callPackage ../development/python-modules/seccomp { }; - secp256k1 = callPackage ../development/python-modules/secp256k1 { inherit (pkgs) secp256k1 pkgconfig; }; + secp256k1 = callPackage ../development/python-modules/secp256k1 { inherit (pkgs) secp256k1 pkg-config; }; secretstorage = if isPy3k then callPackage ../development/python-modules/secretstorage { } @@ -6885,7 +7048,9 @@ in { send2trash = callPackage ../development/python-modules/send2trash { }; - sentencepiece = callPackage ../development/python-modules/sentencepiece { inherit (pkgs) sentencepiece pkgconfig; }; + sendgrid = callPackage ../development/python-modules/sendgrid { }; + + sentencepiece = callPackage ../development/python-modules/sentencepiece { inherit (pkgs) sentencepiece pkg-config; }; sentinel = callPackage ../development/python-modules/sentinel { }; @@ -6998,6 +7163,8 @@ in { sip = callPackage ../development/python-modules/sip { }; + sip_5 = callPackage ../development/python-modules/sip/5.x.nix { }; + sipsimple = callPackage ../development/python-modules/sipsimple { }; six = callPackage ../development/python-modules/six { }; @@ -7056,8 +7223,6 @@ in { snapcast = callPackage ../development/python-modules/snapcast { }; - snapperGUI = callPackage ../development/python-modules/snappergui { }; - snapshottest = callPackage ../development/python-modules/snapshottest { }; sniffio = callPackage ../development/python-modules/sniffio { }; @@ -7141,6 +7306,8 @@ in { sphfile = callPackage ../development/python-modules/sphfile { }; + spinners = callPackage ../development/python-modules/spinners { }; + sphinxcontrib-applehelp = callPackage ../development/python-modules/sphinxcontrib-applehelp { }; sphinxcontrib-autoapi = callPackage ../development/python-modules/sphinxcontrib-autoapi { }; @@ -7190,6 +7357,8 @@ in { sphinx-argparse = callPackage ../development/python-modules/sphinx-argparse { }; + sphinx-autobuild = callPackage ../development/python-modules/sphinx-argparse { }; + sphinx-jinja = callPackage ../development/python-modules/sphinx-jinja { }; sphinx-navtree = callPackage ../development/python-modules/sphinx-navtree { }; @@ -7273,6 +7442,8 @@ in { inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices; }; + starkbank-ecdsa = callPackage ../development/python-modules/starkbank-ecdsa { }; + staticjinja = callPackage ../development/python-modules/staticjinja { }; statistics = callPackage ../development/python-modules/statistics { }; @@ -7363,12 +7534,12 @@ in { swagger-ui-bundle = callPackage ../development/python-modules/swagger-ui-bundle { }; + swisshydrodata = callPackage ../development/python-modules/swisshydrodata { }; + swspotify = callPackage ../development/python-modules/swspotify { }; sybil = callPackage ../development/python-modules/sybil { }; - symbiflow-fasm = callPackage ../development/python-modules/symbiflow-fasm { }; - symengine = callPackage ../development/python-modules/symengine { symengine = pkgs.symengine; }; sympy = if isPy3k then @@ -7376,7 +7547,7 @@ in { else callPackage ../development/python-modules/sympy/1_5.nix { }; - systemd = callPackage ../development/python-modules/systemd { inherit (pkgs) pkgconfig systemd; }; + systemd = callPackage ../development/python-modules/systemd { inherit (pkgs) pkg-config systemd; }; sysv_ipc = callPackage ../development/python-modules/sysv_ipc { }; @@ -7486,7 +7657,9 @@ in { textfsm = callPackage ../development/python-modules/textfsm { }; - textx = callPackage ../development/python-modules/textx { }; + testing-common-database = callPackage ../development/python-modules/testing-common-database { }; + + testing-postgresql = callPackage ../development/python-modules/testing-postgresql { }; testpath = callPackage ../development/python-modules/testpath { }; @@ -7584,6 +7757,8 @@ in { tls-parser = callPackage ../development/python-modules/tls-parser { }; + tmb = callPackage ../development/python-modules/tmb { }; + tmdb3 = callPackage ../development/python-modules/tmdb3 { }; todoist = callPackage ../development/python-modules/todoist { }; @@ -7605,6 +7780,8 @@ in { else callPackage ../development/python-modules/toolz/2.nix { }; + toonapi = callPackage ../development/python-modules/toonapi { }; + toposort = callPackage ../development/python-modules/toposort { }; topydo = throw "python3Packages.topydo was moved to topydo"; # 2017-09-22 @@ -7621,7 +7798,7 @@ in { # Used by circus and grab-site, 2020-08-29 tornado_4 = callPackage ../development/python-modules/tornado/4.nix { }; - # Used by luigi, 2020-08-29 + # Used by streamlit, graphite_beacon, 2021-01-29 tornado_5 = callPackage ../development/python-modules/tornado/5.nix { }; towncrier = callPackage ../development/python-modules/towncrier { inherit (pkgs) git; }; @@ -7753,8 +7930,9 @@ in { tzlocal = callPackage ../development/python-modules/tzlocal { }; - uamqp = - callPackage ../development/python-modules/uamqp { inherit (pkgs.darwin.apple_sdk.frameworks) CFNetwork Security; }; + uamqp = callPackage ../development/python-modules/uamqp { + inherit (pkgs.darwin.apple_sdk.frameworks) CFNetwork CoreFoundation Security; + }; ua-parser = callPackage ../development/python-modules/ua-parser { }; @@ -7827,6 +8005,8 @@ in { update-dotdee = callPackage ../development/python-modules/update-dotdee { }; + upnpy = callPackage ../development/python-modules/upnpy { }; + uproot3 = callPackage ../development/python-modules/uproot3 { }; uproot3-methods = callPackage ../development/python-modules/uproot3-methods { }; @@ -7839,6 +8019,8 @@ in { uritools = callPackage ../development/python-modules/uritools { }; + url-normalize = callPackage ../development/python-modules/url-normalize { }; + urlgrabber = callPackage ../development/python-modules/urlgrabber { }; urllib3 = callPackage ../development/python-modules/urllib3 { }; @@ -7857,6 +8039,8 @@ in { userpath = callPackage ../development/python-modules/userpath { }; + utils = callPackage ../development/python-modules/utils { }; + uuid = callPackage ../development/python-modules/uuid { }; uvcclient = callPackage ../development/python-modules/uvcclient { }; @@ -7911,7 +8095,7 @@ in { vine = callPackage ../development/python-modules/vine { }; - virtkey = callPackage ../development/python-modules/virtkey { inherit (pkgs) pkgconfig; }; + virtkey = callPackage ../development/python-modules/virtkey { inherit (pkgs) pkg-config; }; virtual-display = callPackage ../development/python-modules/virtual-display { }; @@ -7943,6 +8127,8 @@ in { vsts-cd-manager = callPackage ../development/python-modules/vsts-cd-manager { }; + vsure = callPackage ../development/python-modules/vsure { }; + vtk = self.vtk_7; vtk_7 = toPythonModule (pkgs.vtk_7.override { pythonInterpreter = python; @@ -7981,6 +8167,8 @@ in { warrant = callPackage ../development/python-modules/warrant { }; + waqiasync = callPackage ../development/python-modules/waqiasync { }; + wasabi = callPackage ../development/python-modules/wasabi { }; wasm = callPackage ../development/python-modules/wasm { }; @@ -7989,6 +8177,8 @@ in { watchdog = callPackage ../development/python-modules/watchdog { }; + waterfurnace = callPackage ../development/python-modules/waterfurnace { }; + WazeRouteCalculator = callPackage ../development/python-modules/WazeRouteCalculator { }; wcwidth = callPackage ../development/python-modules/wcwidth { }; @@ -8096,11 +8286,12 @@ in { wxPython30 = callPackage ../development/python-modules/wxPython/3.0.nix { wxGTK = pkgs.wxGTK30; - inherit (pkgs) pkgconfig; + inherit (pkgs) pkg-config; }; wxPython_4_0 = callPackage ../development/python-modules/wxPython/4.0.nix { - inherit (pkgs) pkgconfig; + inherit (pkgs) pkg-config; + inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox Carbon Cocoa CoreFoundation IOKit OpenGL; wxGTK = pkgs.wxGTK30.override { withGtk2 = false; withWebKit = true; @@ -8108,7 +8299,7 @@ in { }; wxPython_4_1 = callPackage ../development/python-modules/wxPython/4.1.nix { - inherit (pkgs) pkgconfig; + inherit (pkgs) pkg-config; wxGTK = pkgs.wxGTK31.override { withGtk2 = false; withWebKit = true; @@ -8132,8 +8323,6 @@ in { xattr = callPackage ../development/python-modules/xattr { }; - xc-fasm = callPackage ../development/python-modules/xc-fasm { }; - xcaplib = callPackage ../development/python-modules/xcaplib { }; xcffib = callPackage ../development/python-modules/xcffib { }; @@ -8152,6 +8341,8 @@ in { xkcdpass = callPackage ../development/python-modules/xkcdpass { }; + xknx = callPackage ../development/python-modules/xknx { }; + xlib = callPackage ../development/python-modules/xlib { }; xlrd = callPackage ../development/python-modules/xlrd { }; @@ -8237,8 +8428,6 @@ in { phantomjsSupport = false; }; - youtube-dlc = callPackage ../development/python-modules/youtube-dlc { }; - yowsup = callPackage ../development/python-modules/yowsup { }; yq = callPackage ../development/python-modules/yq { }; @@ -8364,7 +8553,7 @@ in { zstandard = callPackage ../development/python-modules/zstandard { }; - zstd = callPackage ../development/python-modules/zstd { inherit (pkgs) zstd pkgconfig; }; + zstd = callPackage ../development/python-modules/zstd { inherit (pkgs) zstd pkg-config; }; zulip = callPackage ../development/python-modules/zulip { }; diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index df476db0a7a..639c54a8a1e 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -150,6 +150,9 @@ in x86_64-musl = mapTestOnCross lib.systems.examples.musl64 linuxCommon; + ppc64le = mapTestOnCross lib.systems.examples.powernv linuxCommon; + ppc64le-musl = mapTestOnCross lib.systems.examples.musl-power linuxCommon; + android64 = mapTestOnCross lib.systems.examples.aarch64-android-prebuilt linuxCommon; android32 = mapTestOnCross lib.systems.examples.armv7a-android-prebuilt linuxCommon; diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 5e591ec7a85..a394c4d8eee 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -126,7 +126,7 @@ with import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; }; pciutils = linux; pdf2xml = all; perl = all; - pkgconfig = all; + pkg-config = all; pmccabe = linux; procps = linux; python = unix; # Cygwin builds fail diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix index f7aecada086..1268c43c079 100644 --- a/pkgs/top-level/ruby-packages.nix +++ b/pkgs/top-level/ruby-packages.nix @@ -2631,4 +2631,4 @@ }; version = "1.4.11"; }; -} \ No newline at end of file +} diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unixtools.nix index b4f708ad565..b4f708ad565 100644 --- a/pkgs/top-level/unix-tools.nix +++ b/pkgs/top-level/unixtools.nix |